wine-commits September 2013

wine-commits@winehq.org

2 participants
645 discussions

Henri Verbeet : d3dx9: Avoid LPCSTR.
by Alexandre Julliard 02 Sep '13

02 Sep '13

Module: wine Branch: master Commit: 75511e351cee1514a6c1c81e66a9bac2b111555a URL: http://source.winehq.org/git/wine.git/?a=commit;h=75511e351cee1514a6c1c81e6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 2 09:45:44 2013 +0200 d3dx9: Avoid LPCSTR. --- dlls/d3dx9_36/effect.c | 4 +- dlls/d3dx9_36/shader.c | 46 +++++++++++++------------- dlls/d3dx9_36/skin.c | 18 +++++----- dlls/d3dx9_36/surface.c | 2 +- dlls/d3dx9_36/tests/asm.c | 7 ++-- dlls/d3dx9_36/tests/effect.c | 36 ++++++++++---------- dlls/d3dx9_36/tests/mesh.c | 19 ++++++---- dlls/d3dx9_36/tests/shader.c | 48 ++++++++++++++------------- include/d3dx9anim.h | 30 ++++++++-------- include/d3dx9core.h | 2 +- include/d3dx9effect.h | 75 ++++++++++++++++++++++------------------- include/d3dx9mesh.h | 4 +- include/d3dx9shader.h | 24 +++++++------ include/d3dx9tex.h | 4 +- include/d3dx9xof.h | 9 +++-- 15 files changed, 170 insertions(+), 158 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=75511e351cee1514a6c1c…

1 0

Henri Verbeet : d3dx9: Avoid LPWSTR.
by Alexandre Julliard 02 Sep '13

02 Sep '13

Module: wine Branch: master Commit: 2a24b11af553fa472c86b6b9a0de968bbcc441be URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a24b11af553fa472c86b6b9a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 2 09:45:43 2013 +0200 d3dx9: Avoid LPWSTR. --- dlls/d3dx9_36/effect.c | 12 ++++++++---- dlls/d3dx9_36/mesh.c | 22 +++++++++++++--------- dlls/d3dx9_36/shader.c | 12 ++++++++++-- dlls/d3dx9_36/surface.c | 14 +++++++------- dlls/d3dx9_36/texture.c | 9 +++++---- 5 files changed, 43 insertions(+), 26 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 3c252e5..2b8d2aa 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -5531,11 +5531,14 @@ HRESULT WINAPI D3DXCreateEffectFromFileExA(struct IDirect3DDevice9 *device, cons const D3DXMACRO *defines, struct ID3DXInclude *include, const char *skipconstants, DWORD flags, struct ID3DXEffectPool *pool, struct ID3DXEffect **effect, struct ID3DXBuffer **compilationerrors) { - LPWSTR srcfileW; + WCHAR *srcfileW; HRESULT ret; DWORD len; - TRACE("(void): relay\n"); + TRACE("device %p, srcfile %s, defines %p, include %p, skipconstants %s, " + "flags %#x, pool %p, effect %p, compilationerrors %p.\n", + device, debugstr_a(srcfile), defines, include, debugstr_a(skipconstants), + flags, pool, effect, compilationerrors); if (!srcfile) return D3DERR_INVALIDCALL; @@ -5660,11 +5663,12 @@ HRESULT WINAPI D3DXCreateEffectCompilerFromFileW(const WCHAR *srcfile, const D3D HRESULT WINAPI D3DXCreateEffectCompilerFromFileA(const char *srcfile, const D3DXMACRO *defines, ID3DXInclude *include, DWORD flags, ID3DXEffectCompiler **effectcompiler, ID3DXBuffer **parseerrors) { - LPWSTR srcfileW; + WCHAR *srcfileW; HRESULT ret; DWORD len; - TRACE("(void): relay\n"); + TRACE("srcfile %s, defines %p, include %p, flags %#x, effectcompiler %p, parseerrors %p.\n", + debugstr_a(srcfile), defines, include, flags, effectcompiler, parseerrors); if (!srcfile) return D3DERR_INVALIDCALL; diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index f38a79e..19c92b9 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -3673,12 +3673,14 @@ HRESULT WINAPI D3DXLoadMeshHierarchyFromXA(const char *filename, DWORD options, struct ID3DXAllocateHierarchy *alloc_hier, struct ID3DXLoadUserData *load_user_data, D3DXFRAME **frame_hierarchy, struct ID3DXAnimationController **anim_controller) { + WCHAR *filenameW; HRESULT hr; int len; - LPWSTR filenameW; - TRACE("(%s, %x, %p, %p, %p, %p, %p)\n", debugstr_a(filename), options, - device, alloc_hier, load_user_data, frame_hierarchy, anim_controller); + TRACE("filename %s, options %#x, device %p, alloc_hier %p, " + "load_user_data %p, frame_hierarchy %p, anim_controller %p.\n", + debugstr_a(filename), options, device, alloc_hier, + load_user_data, frame_hierarchy, anim_controller); if (!filename) return D3DERR_INVALIDCALL; @@ -4025,12 +4027,14 @@ HRESULT WINAPI D3DXLoadMeshFromXA(const char *filename, DWORD options, struct ID struct ID3DXBuffer **adjacency, struct ID3DXBuffer **materials, struct ID3DXBuffer **effect_instances, DWORD *num_materials, struct ID3DXMesh **mesh) { + WCHAR *filenameW; HRESULT hr; int len; - LPWSTR filenameW; - TRACE("(%s, %x, %p, %p, %p, %p, %p, %p)\n", debugstr_a(filename), options, - device, adjacency, materials, effect_instances, num_materials, mesh); + TRACE("filename %s, options %#x, device %p, adjacency %p, materials %p, " + "effect_instances %p, num_materials %p, mesh %p.\n", + debugstr_a(filename), options, device, adjacency, materials, + effect_instances, num_materials, mesh); if (!filename) return D3DERR_INVALIDCALL; @@ -4943,12 +4947,12 @@ HRESULT WINAPI D3DXCreateTeapot(struct IDirect3DDevice9 *device, HRESULT WINAPI D3DXCreateTextA(struct IDirect3DDevice9 *device, HDC hdc, const char *text, float deviation, float extrusion, struct ID3DXMesh **mesh, struct ID3DXBuffer **adjacency, GLYPHMETRICSFLOAT *glyphmetrics) { + WCHAR *textW; HRESULT hr; int len; - LPWSTR textW; - TRACE("(%p, %p, %s, %f, %f, %p, %p, %p)\n", device, hdc, - debugstr_a(text), deviation, extrusion, mesh, adjacency, glyphmetrics); + TRACE("device %p, hdc %p, text %s, deviation %.8e, extrusion %.8e, mesh %p, adjacency %p, glyphmetrics %p.\n", + device, hdc, debugstr_a(text), deviation, extrusion, mesh, adjacency, glyphmetrics); if (!text) return D3DERR_INVALIDCALL; diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 66a38ab..e2c227f 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -284,10 +284,13 @@ struct D3DXIncludeImpl { HRESULT WINAPI D3DXAssembleShaderFromFileA(const char *filename, const D3DXMACRO *defines, ID3DXInclude *include, DWORD flags, ID3DXBuffer **shader, ID3DXBuffer **error_messages) { - LPWSTR filename_w = NULL; + WCHAR *filename_w; DWORD len; HRESULT ret; + TRACE("filename %s, defines %p, include %p, flags %#x, shader %p, error_messages %p.\n", + debugstr_a(filename), defines, include, flags, shader, error_messages); + if (!filename) return D3DXERR_INVALIDDATA; len = MultiByteToWideChar(CP_ACP, 0, filename, -1, NULL, 0); @@ -387,10 +390,15 @@ HRESULT WINAPI D3DXCompileShaderFromFileA(const char *filename, const D3DXMACRO ID3DXInclude *include, const char *entrypoint, const char *profile, DWORD flags, ID3DXBuffer **shader, ID3DXBuffer **error_messages, ID3DXConstantTable **constant_table) { - LPWSTR filename_w = NULL; + WCHAR *filename_w; DWORD len; HRESULT ret; + TRACE("filename %s, defines %p, include %p, entrypoint %s, profile %s, " + "flags %#x, shader %p, error_messages %p, constant_table %p.\n", + debugstr_a(filename), defines, include, debugstr_a(entrypoint), + debugstr_a(profile), flags, shader, error_messages, constant_table); + if (!filename) return D3DXERR_INVALIDDATA; len = MultiByteToWideChar(CP_ACP, 0, filename, -1, NULL, 0); diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 2f4499e..c6e0c04 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -901,11 +901,11 @@ HRESULT WINAPI D3DXGetImageInfoFromFileInMemory(const void *data, UINT datasize, */ HRESULT WINAPI D3DXGetImageInfoFromFileA(LPCSTR file, D3DXIMAGE_INFO *info) { - LPWSTR widename; + WCHAR *widename; HRESULT hr; int strlength; - TRACE("(%s, %p): relay\n", debugstr_a(file), info); + TRACE("file %s, info %p.\n", debugstr_a(file), info); if( !file ) return D3DERR_INVALIDCALL; @@ -1188,7 +1188,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromFileA(IDirect3DSurface9 *dst_surface, const PALETTEENTRY *dst_palette, const RECT *dst_rect, const char *src_file, const RECT *src_rect, DWORD filter, D3DCOLOR color_key, D3DXIMAGE_INFO *src_info) { - LPWSTR pWidename; + WCHAR *src_file_w; HRESULT hr; int strlength; @@ -1201,12 +1201,12 @@ HRESULT WINAPI D3DXLoadSurfaceFromFileA(IDirect3DSurface9 *dst_surface, return D3DERR_INVALIDCALL; strlength = MultiByteToWideChar(CP_ACP, 0, src_file, -1, NULL, 0); - pWidename = HeapAlloc(GetProcessHeap(), 0, strlength * sizeof(*pWidename)); - MultiByteToWideChar(CP_ACP, 0, src_file, -1, pWidename, strlength); + src_file_w = HeapAlloc(GetProcessHeap(), 0, strlength * sizeof(*src_file_w)); + MultiByteToWideChar(CP_ACP, 0, src_file, -1, src_file_w, strlength); hr = D3DXLoadSurfaceFromFileW(dst_surface, dst_palette, dst_rect, - pWidename, src_rect, filter, color_key, src_info); - HeapFree(GetProcessHeap(), 0, pWidename); + src_file_w, src_rect, filter, color_key, src_info); + HeapFree(GetProcessHeap(), 0, src_file_w); return hr; } diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index f0b5569..416ca13 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -719,13 +719,14 @@ HRESULT WINAPI D3DXCreateTextureFromFileExA(struct IDirect3DDevice9 *device, con D3DPOOL pool, DWORD filter, DWORD mipfilter, D3DCOLOR colorkey, D3DXIMAGE_INFO *srcinfo, PALETTEENTRY *palette, struct IDirect3DTexture9 **texture) { - LPWSTR widename; + WCHAR *widename; HRESULT hr; DWORD len; - TRACE("(%p, %s, %u, %u, %u, %x, %x, %x, %u, %u, %x, %p, %p, %p): relay\n", - device, debugstr_a(srcfile), width, height, miplevels, usage, format, pool, filter, - mipfilter, colorkey, srcinfo, palette, texture); + TRACE("device %p, srcfile %s, width %u, height %u, miplevels %u, usage %#x, format %#x, " + "pool %#x, filter %#x, mipfilter %#x, colorkey 0x%08x, srcinfo %p, palette %p, texture %p.\n", + device, debugstr_a(srcfile), width, height, miplevels, usage, format, + pool, filter, mipfilter, colorkey, srcinfo, palette, texture); if (!device || !srcfile || !texture) return D3DERR_INVALIDCALL;

1 0

Henri Verbeet : wined3d: Avoid some forward declarations.
by Alexandre Julliard 02 Sep '13

02 Sep '13

Module: wine Branch: master Commit: 0be8e524c6352498667d9cf780a570471a674782 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0be8e524c6352498667d9cf78… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 2 09:45:42 2013 +0200 wined3d: Avoid some forward declarations. --- dlls/wined3d/surface.c | 1270 ++++++++++++++++++++++++------------------------ 1 files changed, 631 insertions(+), 639 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0be8e524c6352498667d9…

1 0

Henri Verbeet : wined3d: Get rid of some leftover comments referring to the GL lock.
by Alexandre Julliard 02 Sep '13

02 Sep '13

Module: wine Branch: master Commit: b5e0c5d0529dd955b25c9ff2e0d3faef8cc096d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5e0c5d0529dd955b25c9ff2e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 2 09:45:41 2013 +0200 wined3d: Get rid of some leftover comments referring to the GL lock. --- dlls/wined3d/arb_program_shader.c | 2 -- dlls/wined3d/buffer.c | 3 --- dlls/wined3d/context.c | 5 ----- dlls/wined3d/device.c | 10 ---------- dlls/wined3d/directx.c | 3 --- dlls/wined3d/nvidia_texture_shader.c | 1 - dlls/wined3d/shader.c | 1 - dlls/wined3d/state.c | 23 +++++++++++------------ dlls/wined3d/surface.c | 11 ----------- dlls/wined3d/swapchain.c | 5 ----- dlls/wined3d/texture.c | 6 ------ dlls/wined3d/volume.c | 2 -- dlls/wined3d/wined3d_main.c | 1 - 13 files changed, 11 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b5e0c5d0529dd955b25c9…

1 0

Henri Verbeet : wined3d: Move the MAXLOCKCOUNT constant to surface.c.
by Alexandre Julliard 02 Sep '13

02 Sep '13

Module: wine Branch: master Commit: 2d2391318689831123c5ed49c2eae429413e974d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d2391318689831123c5ed49c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 2 09:45:40 2013 +0200 wined3d: Move the MAXLOCKCOUNT constant to surface.c. --- dlls/wined3d/surface.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 - 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 66f15fb..970985d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -34,6 +34,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_surface); WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); WINE_DECLARE_DEBUG_CHANNEL(d3d); +#define MAXLOCKCOUNT 50 /* After this amount of locks do not free the sysmem copy. */ + static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT *dst_rect, struct wined3d_surface *src_surface, const RECT *src_rect, DWORD flags, const WINEDDBLTFX *fx, enum wined3d_texture_filter_type filter); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2f8c6b2..688671d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2207,7 +2207,6 @@ struct wined3d_surface RECT lockedRect; RECT dirtyRect; int lockCount; -#define MAXLOCKCOUNT 50 /* After this amount of locks do not free the sysmem copy */ /* For GetDC */ struct wined3d_surface_dib dib;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2013