December 2008 - Wine-commits

Francois Gouget : cabinet/tests: Make CopyProgress() static.
by Alexandre Julliard 12 Dec '08

12 Dec '08

Module: wine Branch: master Commit: 897af57deb665012b1a7fb66ad7aa3a6fc912c26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=897af57deb665012b1a7fb66a… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 12 10:20:58 2008 +0100 cabinet/tests: Make CopyProgress() static. --- dlls/cabinet/tests/fdi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/cabinet/tests/fdi.c b/dlls/cabinet/tests/fdi.c index f90b6f0..e9765ad 100644 --- a/dlls/cabinet/tests/fdi.c +++ b/dlls/cabinet/tests/fdi.c @@ -594,7 +594,7 @@ static void test_FDIIsCabinet(void) } -INT_PTR __cdecl CopyProgress (FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pfdin) +static INT_PTR __cdecl CopyProgress(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pfdin) { return 0; }

1 0

Francois Gouget : d3d9/tests: Make some functions static.
by Alexandre Julliard 12 Dec '08

12 Dec '08

Module: wine Branch: master Commit: 287dee6e78aada157af12f0c552555a8716dea45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=287dee6e78aada157af12f0c5… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 12 10:21:06 2008 +0100 d3d9/tests: Make some functions static. --- dlls/d3d9/tests/visual.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index fdf341f..9bcb42f 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -5774,7 +5774,7 @@ static void pshader_version_varying_test(IDirect3DDevice9 *device) { if(texture) IDirect3DTexture9_Release(texture); } -void test_compare_instructions(IDirect3DDevice9 *device) +static void test_compare_instructions(IDirect3DDevice9 *device) { DWORD shader_sge_vec_code[] = { 0xfffe0101, /* vs_1_1 */ @@ -5912,7 +5912,7 @@ void test_compare_instructions(IDirect3DDevice9 *device) IDirect3DVertexShader9_Release(shader_slt_scalar); } -void test_vshader_input(IDirect3DDevice9 *device) +static void test_vshader_input(IDirect3DDevice9 *device) { DWORD swapped_shader_code_3[] = { 0xfffe0300, /* vs_3_0 */

1 0

Francois Gouget : ole32: Fix the STORAGE_dump_pps_entry() description.
by Alexandre Julliard 12 Dec '08

12 Dec '08

Module: wine Branch: master Commit: ec4d74baef753edbc3d0ebc8e677fa9d23a8fd83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec4d74baef753edbc3d0ebc8e… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 12 10:20:27 2008 +0100 ole32: Fix the STORAGE_dump_pps_entry() description. --- dlls/ole32/storage.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/storage.c b/dlls/ole32/storage.c index 2e5203f..7e345dc 100644 --- a/dlls/ole32/storage.c +++ b/dlls/ole32/storage.c @@ -706,8 +706,7 @@ STORAGE_look_for_named_pps(stream_access16*str,int n,LPOLESTR name) { /****************************************************************************** * STORAGE_dump_pps_entry [Internal] * - * FIXME - * Function is unused + * This function is there to simplify debugging. It is otherwise unused. */ void STORAGE_dump_pps_entry(struct storage_pps_entry *stde) {

1 0

Francois Gouget : shell32: Add a couple of spaces in the spec file.
by Alexandre Julliard 12 Dec '08

12 Dec '08

Module: wine Branch: master Commit: ae3a8e1da229a652a0ceaa4666d27bbfab595631 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae3a8e1da229a652a0ceaa466… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 12 10:19:43 2008 +0100 shell32: Add a couple of spaces in the spec file. --- dlls/shell32/shell32.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 7e98b5f..b4761c6 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -34,7 +34,7 @@ 35 stdcall -noname PathRemoveFileSpec(ptr) PathRemoveFileSpecAW 36 stdcall -noname PathAppend(ptr ptr) PathAppendAW 37 stdcall -noname PathCombine(ptr ptr ptr) PathCombineAW - 38 stdcall -noname PathStripPath(ptr)PathStripPathAW + 38 stdcall -noname PathStripPath(ptr) PathStripPathAW 39 stdcall -noname PathIsUNC(ptr) PathIsUNCAW 40 stdcall -noname PathIsRelative(ptr) PathIsRelativeAW 41 stdcall -noname IsLFNDriveA(str) @@ -42,7 +42,7 @@ 43 stdcall -noname PathIsExe(ptr) PathIsExeAW 45 stdcall -noname PathFileExists(ptr) PathFileExistsAW 46 stdcall -noname PathMatchSpec(ptr ptr) PathMatchSpecAW - 47 stdcall -noname PathMakeUniqueName(ptr long ptr ptr ptr)PathMakeUniqueNameAW + 47 stdcall -noname PathMakeUniqueName(ptr long ptr ptr ptr) PathMakeUniqueNameAW 48 stdcall -noname PathSetDlgItemPath(long long ptr) PathSetDlgItemPathAW 49 stdcall -noname PathQualify(ptr) PathQualifyAW 50 stdcall -noname PathStripToRoot(ptr) PathStripToRootAW

1 0

Francois Gouget : msvcrt: Remove _adjust_fdiv() as it is unused.
by Alexandre Julliard 12 Dec '08

12 Dec '08

Module: wine Branch: master Commit: ade1326480e2c53fdec045b38313c2166360e93e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ade1326480e2c53fdec045b38… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 12 10:19:03 2008 +0100 msvcrt: Remove _adjust_fdiv() as it is unused. --- dlls/msvcrt/math.c | 11 ----------- 1 files changed, 0 insertions(+), 11 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 30d7956..9ea8245 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1194,17 +1194,6 @@ void _adj_fptan(void) } /*********************************************************************** - * _adjust_fdiv (MSVCRT.@) - * FIXME - * I _think_ this function should be a variable indicating whether - * Pentium fdiv bug safe code should be used. - */ -void _adjust_fdiv(void) -{ - TRACE("(): stub\n"); -} - -/*********************************************************************** * _safe_fdiv (MSVCRT.@) * FIXME * This function is likely to have the wrong number of arguments.

1 0

Francois Gouget : msvcrt/tests: Add a trailing '\n' to ok() calls.
by Alexandre Julliard 12 Dec '08

12 Dec '08

Module: wine Branch: master Commit: 33dd86d05c09d1abd1280598c513c3139b4a705a URL: http://source.winehq.org/git/wine.git/?a=commit;h=33dd86d05c09d1abd1280598c… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 12 10:16:45 2008 +0100 msvcrt/tests: Add a trailing '\n' to ok() calls. --- dlls/msvcrt/tests/file.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 8dcba00..9642d75 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -903,7 +903,7 @@ static void test_stat(void) fd = open("stat.tst", O_WRONLY | O_CREAT | O_BINARY, _S_IREAD |_S_IWRITE); if (fd >= 0) { - ok(fstat(fd, &buf) == 0, "fstat failed: errno=%d", errno); + ok(fstat(fd, &buf) == 0, "fstat failed: errno=%d\n", errno); ok((buf.st_mode & _S_IFMT) == _S_IFREG, "bad format = %06o\n", buf.st_mode); ok((buf.st_mode & 0777) == 0666, "bad st_mode = %06o\n", buf.st_mode); ok(buf.st_dev == 0, "st_dev is %d, expected 0\n", buf.st_dev); @@ -911,7 +911,7 @@ static void test_stat(void) ok(buf.st_nlink == 1, "st_nlink is %d, expected 1\n", buf.st_nlink); ok(buf.st_size == 0, "st_size is %d, expected 0\n", buf.st_size); - ok(stat("stat.tst", &buf) == 0, "stat failed: errno=%d", errno); + ok(stat("stat.tst", &buf) == 0, "stat failed: errno=%d\n", errno); ok((buf.st_mode & _S_IFMT) == _S_IFREG, "bad format = %06o\n", buf.st_mode); ok((buf.st_mode & 0777) == 0666, "bad st_mode = %06o\n", buf.st_mode); ok(buf.st_dev == buf.st_rdev, "st_dev (%d) and st_rdev (%d) differ\n", buf.st_dev, buf.st_rdev);

1 0

Henri Verbeet : wined3d: Don' t leak memory on failure in allocate_shader_constants().
by Alexandre Julliard 12 Dec '08

12 Dec '08

Module: wine Branch: master Commit: 3e035ddf05b0d6e3df4a0068c28df59fd21fafc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e035ddf05b0d6e3df4a0068c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 12 09:33:52 2008 +0100 wined3d: Don't leak memory on failure in allocate_shader_constants(). --- dlls/wined3d/stateblock.c | 31 +++++++++++++++++++++---------- 1 files changed, 21 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 1f35e82..d568de6 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -38,28 +38,39 @@ HRESULT allocate_shader_constants(IWineD3DStateBlockImpl* object) { IWineD3DStateBlockImpl *This = object; -#define WINED3D_MEMCHECK(_object) if (NULL == _object) { FIXME("Out of memory!\n"); return E_OUTOFMEMORY; } - /* Allocate space for floating point constants */ object->pixelShaderConstantF = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(float) * GL_LIMITS(pshader_constantsF) * 4); - WINED3D_MEMCHECK(object->pixelShaderConstantF); + if (!object->pixelShaderConstantF) goto fail; + object->changed.pixelShaderConstantsF = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(BOOL) * GL_LIMITS(pshader_constantsF)); - WINED3D_MEMCHECK(object->changed.pixelShaderConstantsF); + if (!object->changed.pixelShaderConstantsF) goto fail; + object->vertexShaderConstantF = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(float) * GL_LIMITS(vshader_constantsF) * 4); - WINED3D_MEMCHECK(object->vertexShaderConstantF); + if (!object->vertexShaderConstantF) goto fail; + object->changed.vertexShaderConstantsF = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(BOOL) * GL_LIMITS(vshader_constantsF)); - WINED3D_MEMCHECK(object->changed.vertexShaderConstantsF); + if (!object->changed.vertexShaderConstantsF) goto fail; + object->contained_vs_consts_f = HeapAlloc(GetProcessHeap(), 0, sizeof(DWORD) * GL_LIMITS(vshader_constantsF)); - WINED3D_MEMCHECK(object->contained_vs_consts_f); + if (!object->contained_vs_consts_f) goto fail; + object->contained_ps_consts_f = HeapAlloc(GetProcessHeap(), 0, sizeof(DWORD) * GL_LIMITS(pshader_constantsF)); - WINED3D_MEMCHECK(object->contained_ps_consts_f); + if (!object->contained_ps_consts_f) goto fail; list_init(&object->set_vconstantsF); list_init(&object->set_pconstantsF); -#undef WINED3D_MEMCHECK - return WINED3D_OK; + +fail: + ERR("Failed to allocate memory\n"); + HeapFree(GetProcessHeap(), 0, object->pixelShaderConstantF); + HeapFree(GetProcessHeap(), 0, object->changed.pixelShaderConstantsF); + HeapFree(GetProcessHeap(), 0, object->vertexShaderConstantF); + HeapFree(GetProcessHeap(), 0, object->changed.vertexShaderConstantsF); + HeapFree(GetProcessHeap(), 0, object->contained_vs_consts_f); + HeapFree(GetProcessHeap(), 0, object->contained_ps_consts_f); + return E_OUTOFMEMORY; } /** Copy all members of one stateblock to another */

1 0

Henri Verbeet : wined3d: Get rid of the textureDimensions field in the state block.
by Alexandre Julliard 12 Dec '08

12 Dec '08

Module: wine Branch: master Commit: 70ed814b95f7719d52fa5b18a375d566a185a9ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=70ed814b95f7719d52fa5b18a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 12 09:33:51 2008 +0100 wined3d: Get rid of the textureDimensions field in the state block. --- dlls/wined3d/device.c | 14 +-- dlls/wined3d/nvidia_texture_shader.c | 2 +- dlls/wined3d/state.c | 140 +++++++++++++++++++--------------- dlls/wined3d/stateblock.c | 2 - dlls/wined3d/utils.c | 57 ++++++++------ dlls/wined3d/wined3d_private.h | 1 - 6 files changed, 119 insertions(+), 97 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=70ed814b95f7719d52fa5…

1 0

Henri Verbeet : wined3d: Use a simpler way to calculate the number of texture levels.
by Alexandre Julliard 12 Dec '08

12 Dec '08

Module: wine Branch: master Commit: 7d29aecd6fa0fb3c541f318ad50a442f47e0c732 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d29aecd6fa0fb3c541f318ad… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 12 09:33:52 2008 +0100 wined3d: Use a simpler way to calculate the number of texture levels. It's probably slightly faster too. --- dlls/wined3d/device.c | 28 +++------------------------- dlls/wined3d/utils.c | 26 ++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 30 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d091b58..a99ff56 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -855,15 +855,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateTexture(IWineD3DDevice *iface, U } object->baseTexture.levels = 1; } else if (Levels == 0) { - TRACE("calculating levels %d\n", object->baseTexture.levels); - object->baseTexture.levels++; - tmpW = Width; - tmpH = Height; - while (tmpW > 1 || tmpH > 1) { - tmpW = max(1, tmpW >> 1); - tmpH = max(1, tmpH >> 1); - object->baseTexture.levels++; - } + object->baseTexture.levels = wined3d_log2i(max(Width, Height)) + 1; TRACE("Calculated levels = %d\n", object->baseTexture.levels); } @@ -958,16 +950,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVolumeTexture(IWineD3DDevice *ifa } object->baseTexture.levels = 1; } else if (Levels == 0) { - object->baseTexture.levels++; - tmpW = Width; - tmpH = Height; - tmpD = Depth; - while (tmpW > 1 || tmpH > 1 || tmpD > 1) { - tmpW = max(1, tmpW >> 1); - tmpH = max(1, tmpH >> 1); - tmpD = max(1, tmpD >> 1); - object->baseTexture.levels++; - } + object->baseTexture.levels = wined3d_log2i(max(max(Width, Height), Depth)) + 1; TRACE("Calculated levels = %d\n", object->baseTexture.levels); } @@ -1117,12 +1100,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateCubeTexture(IWineD3DDevice *iface } object->baseTexture.levels = 1; } else if (Levels == 0) { - object->baseTexture.levels++; - tmpW = EdgeLength; - while (tmpW > 1) { - tmpW = max(1, tmpW >> 1); - object->baseTexture.levels++; - } + object->baseTexture.levels = wined3d_log2i(EdgeLength) + 1; TRACE("Calculated levels = %d\n", object->baseTexture.levels); } diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 7fc874b..f65bcdc 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2245,3 +2245,29 @@ BOOL ffp_frag_program_key_compare(const void *keya, const void *keyb) return memcmp(ka, kb, sizeof(*ka)) == 0; } + +UINT wined3d_log2i(UINT32 x) +{ + static const BYTE l[] = + { + 0, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + }; + UINT32 i; + + return (i = x >> 16) ? (x = i >> 8) ? l[x] + 24 : l[i] + 16 : (i = x >> 8) ? l[i] + 8 : l[x]; +} diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e28bb6d..0b444bb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2031,6 +2031,7 @@ BOOL getDepthStencilBits(WINED3DFORMAT fmt, short *depthSize, short *stencilSize /* Math utils */ void multiply_matrix(WINED3DMATRIX *dest, const WINED3DMATRIX *src1, const WINED3DMATRIX *src2); unsigned int count_bits(unsigned int mask); +UINT wined3d_log2i(UINT32 x); /***************************************************************************** * To enable calling of inherited functions, requires prototypes

1 0

Henri Verbeet : wined3d: Don' t reparse the entire shader just to update the sampler types.
by Alexandre Julliard 12 Dec '08

12 Dec '08

Module: wine Branch: master Commit: fb475c7c29f8d23ecdd3c3c633c04be347013a41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb475c7c29f8d23ecdd3c3c63… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 12 09:33:51 2008 +0100 wined3d: Don't reparse the entire shader just to update the sampler types. --- dlls/wined3d/baseshader.c | 32 ++--------------- dlls/wined3d/device.c | 3 +- dlls/wined3d/pixelshader.c | 76 +++++++++++++++++++++++++--------------- dlls/wined3d/vertexshader.c | 2 +- dlls/wined3d/wined3d_private.h | 12 ++---- include/wine/wined3d.idl | 2 - 6 files changed, 58 insertions(+), 69 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fb475c7c29f8d23ecdd3c…

1 0