December 2007 - Wine-Commits

Stefan Dösinger : wined3d: Detect the Intel GPU in macbooks.
by Alexandre Julliard Dec. 3, 2007

Dec. 3, 2007

Module: wine Branch: master Commit: 7ba04e613296f1ab2e8d3ba19b755d0bce204c90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ba04e613296f1ab2e8d3ba19… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Nov 30 16:51:32 2007 +0100 wined3d: Detect the Intel GPU in macbooks. --- dlls/wined3d/directx.c | 36 +++++++++++++++++++++++++++++++----- include/wine/wined3d_gl.h | 3 ++- 2 files changed, 33 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index efe69eb..c712bb4 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -485,8 +485,9 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { gl_info->gl_vendor = VENDOR_NVIDIA; } else if (strstr(gl_string, "ATI")) { gl_info->gl_vendor = VENDOR_ATI; - } else if (strstr(gl_string, "Intel(R)") || - strstr(gl_info->gl_renderer, "Intel(R)")) { + } else if (strstr(gl_string, "Intel(R)") || + strstr(gl_info->gl_renderer, "Intel(R)") || + strstr(gl_string, "Intel Inc.")) { gl_info->gl_vendor = VENDOR_INTEL; } else if (strstr(gl_string, "Mesa")) { gl_info->gl_vendor = VENDOR_MESA; @@ -573,7 +574,28 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { } break; - case VENDOR_INTEL: + case VENDOR_INTEL: + /* Apple and Mesa version strings look differently, but both provide intel drivers */ + if(strstr(gl_string, "APPLE")) { + /* [0-9]+.[0-9]+ APPLE-[0-9]+.[0.9]+.[0.9]+ + * We only need the first part, and use the APPLE as identification + * "1.2 APPLE-1.4.56" + */ + gl_string_cursor = gl_string; + major = atoi(gl_string_cursor); + while (*gl_string_cursor <= '9' && *gl_string_cursor >= '0') { + ++gl_string_cursor; + } + + if (*gl_string_cursor++ != '.') { + ERR_(d3d_caps)("Invalid MacOS-Intel version string: %s\n", debugstr_a(gl_string)); + break; + } + + minor = atoi(gl_string_cursor); + break; + } + case VENDOR_MESA: gl_string_cursor = strstr(gl_string, "Mesa"); gl_string_cursor = strstr(gl_string_cursor, " "); @@ -1132,7 +1154,11 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { } break; case VENDOR_INTEL: - if (strstr(gl_info->gl_renderer, "915GM")) { + if (strstr(gl_info->gl_renderer, "GMA 950")) { + /* MacOS calls the card GMA 950, but everywhere else the PCI ID is named 945GM */ + gl_info->gl_card = CARD_INTEL_I945GM; + vidmem = 64; + } else if (strstr(gl_info->gl_renderer, "915GM")) { gl_info->gl_card = CARD_INTEL_I915GM; } else if (strstr(gl_info->gl_renderer, "915G")) { gl_info->gl_card = CARD_INTEL_I915G; @@ -1165,7 +1191,7 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { else gl_info->gl_card = CARD_NVIDIA_RIVA_128; } - TRACE("FOUND (fake) card: 0x%x (vendor id), 0x%x (device id)\n", gl_info->gl_vendor, gl_info->gl_card); + TRACE_(d3d_caps)("FOUND (fake) card: 0x%x (vendor id), 0x%x (device id)\n", gl_info->gl_vendor, gl_info->gl_card); /* If we have an estimate use it, else default to 64MB; */ if(vidmem) diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index ec2edaf..86ad677 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -3126,7 +3126,8 @@ typedef enum _GL_Cards { CARD_INTEL_I855G = 0x3582, CARD_INTEL_I865G = 0x2572, CARD_INTEL_I915G = 0x2582, - CARD_INTEL_I915GM = 0x2592 + CARD_INTEL_I915GM = 0x2592, + CARD_INTEL_I945GM = 0x27a2, /* Same as GMA 950?? */ } GL_Cards; #define WINE_DEFAULT_VIDMEM 64*1024*1024

1 0

Stefan Dösinger : wined3d: mov to a0.x does a floor(), not a round to nearest.
by Alexandre Julliard Dec. 3, 2007

Dec. 3, 2007

Module: wine Branch: master Commit: 0f39b29da0d8c6ce56bae2222cd4da982df6537d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f39b29da0d8c6ce56bae2222… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Nov 30 16:20:22 2007 +0100 wined3d: mov to a0.x does a floor(), not a round to nearest. --- dlls/d3d9/tests/visual.c | 102 +++++++++++++++++++++++++++++--------------- dlls/wined3d/glsl_shader.c | 11 ++++- 2 files changed, 77 insertions(+), 36 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 545f441..c624962 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -323,13 +323,13 @@ typedef struct { } test_data_t; /* - * c7 rounded ARGB - * -2.4 -2 0x00ffff00 - * -1.6 -2 0x00ffff00 - * -0.4 0 0x0000ffff - * 0.4 0 0x0000ffff - * 1.6 2 0x00ff00ff - * 2.4 2 0x00ff00ff + * c7 mova ARGB mov ARGB + * -2.4 -2 0x00ffff00 -3 0x00ff0000 + * -1.6 -2 0x00ffff00 -2 0x00ffff00 + * -0.4 0 0x0000ffff -1 0x0000ff00 + * 0.4 0 0x0000ffff 0 0x0000ffff + * 1.6 2 0x00ff00ff 1 0x000000ff + * 2.4 2 0x00ff00ff 2 0x00ff00ff */ static void test_mova(IDirect3DDevice9 *device) { @@ -348,14 +348,39 @@ static void test_mova(IDirect3DDevice9 *device) 0x02000001, 0xc00f0000, 0x90e40000, /* mov oPos, v0 */ 0x0000ffff /* END */ }; + static const DWORD mov_test[] = { + 0xfffe0101, /* vs_1_1 */ + 0x0000001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ + 0x00000051, 0xa00f0000, 0x3f800000, 0x00000000, 0x00000000, 0x3f800000, /* def c0, 1.0, 0.0, 0.0, 1.0 */ + 0x00000051, 0xa00f0001, 0x3f800000, 0x3f800000, 0x00000000, 0x3f800000, /* def c1, 1.0, 1.0, 0.0, 1.0 */ + 0x00000051, 0xa00f0002, 0x00000000, 0x3f800000, 0x00000000, 0x3f800000, /* def c2, 0.0, 1.0, 0.0, 1.0 */ + 0x00000051, 0xa00f0003, 0x00000000, 0x3f800000, 0x3f800000, 0x3f800000, /* def c3, 0.0, 1.0, 1.0, 1.0 */ + 0x00000051, 0xa00f0004, 0x00000000, 0x00000000, 0x3f800000, 0x3f800000, /* def c4, 0.0, 0.0, 1.0, 1.0 */ + 0x00000051, 0xa00f0005, 0x3f800000, 0x00000000, 0x3f800000, 0x3f800000, /* def c5, 1.0, 0.0, 1.0, 1.0 */ + 0x00000051, 0xa00f0006, 0x3f800000, 0x3f800000, 0x3f800000, 0x3f800000, /* def c6, 1.0, 1.0, 1.0, 1.0 */ + 0x00000001, 0xb0010000, 0xa0000007, /* mov a0.x, c7.x */ + 0x00000001, 0xd00f0000, 0xa0e42003, /* mov oD0, c[a0.x + 3] */ + 0x00000001, 0xc00f0000, 0x90e40000, /* mov oPos, v0 */ + 0x0000ffff /* END */ + }; - static const test_data_t test_data[] = { - {{-2.4f, 0.0f, 0.0f, 0.0f}, 0x00ffff00}, - {{-1.6f, 0.0f, 0.0f, 0.0f}, 0x00ffff00}, - {{-0.4f, 0.0f, 0.0f, 0.0f}, 0x0000ffff}, - {{ 0.4f, 0.0f, 0.0f, 0.0f}, 0x0000ffff}, - {{ 1.6f, 0.0f, 0.0f, 0.0f}, 0x00ff00ff}, - {{ 2.4f, 0.0f, 0.0f, 0.0f}, 0x00ff00ff} + static const test_data_t test_data[2][6] = { + { + {{-2.4f, 0.0f, 0.0f, 0.0f}, 0x00ff0000}, + {{-1.6f, 0.0f, 0.0f, 0.0f}, 0x00ffff00}, + {{-0.4f, 0.0f, 0.0f, 0.0f}, 0x0000ff00}, + {{ 0.4f, 0.0f, 0.0f, 0.0f}, 0x0000ffff}, + {{ 1.6f, 0.0f, 0.0f, 0.0f}, 0x000000ff}, + {{ 2.4f, 0.0f, 0.0f, 0.0f}, 0x00ff00ff} + }, + { + {{-2.4f, 0.0f, 0.0f, 0.0f}, 0x00ffff00}, + {{-1.6f, 0.0f, 0.0f, 0.0f}, 0x00ffff00}, + {{-0.4f, 0.0f, 0.0f, 0.0f}, 0x0000ffff}, + {{ 0.4f, 0.0f, 0.0f, 0.0f}, 0x0000ffff}, + {{ 1.6f, 0.0f, 0.0f, 0.0f}, 0x00ff00ff}, + {{ 2.4f, 0.0f, 0.0f, 0.0f}, 0x00ff00ff} + } }; static const float quad[][3] = { @@ -372,43 +397,51 @@ static void test_mova(IDirect3DDevice9 *device) IDirect3DVertexDeclaration9 *vertex_declaration = NULL; IDirect3DVertexShader9 *mova_shader = NULL; + IDirect3DVertexShader9 *mov_shader = NULL; HRESULT hr; - int i; + int i, j; hr = IDirect3DDevice9_CreateVertexShader(device, mova_test, &mova_shader); ok(SUCCEEDED(hr), "CreateVertexShader failed (%08x)\n", hr); - hr = IDirect3DDevice9_SetVertexShader(device, mova_shader); - ok(SUCCEEDED(hr), "SetVertexShader failed (%08x)\n", hr); - + hr = IDirect3DDevice9_CreateVertexShader(device, mov_test, &mov_shader); + ok(SUCCEEDED(hr), "CreateVertexShader failed (%08x)\n", hr); hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements, &vertex_declaration); ok(SUCCEEDED(hr), "CreateVertexDeclaration failed (%08x)\n", hr); hr = IDirect3DDevice9_SetVertexDeclaration(device, vertex_declaration); ok(SUCCEEDED(hr), "SetVertexDeclaration failed (%08x)\n", hr); - for (i = 0; i < (sizeof(test_data) / sizeof(test_data_t)); ++i) + hr = IDirect3DDevice9_SetVertexShader(device, mov_shader); + ok(SUCCEEDED(hr), "SetVertexShader failed (%08x)\n", hr); + for(j = 0; j < 2; ++j) { - DWORD color; + for (i = 0; i < (sizeof(test_data[0]) / sizeof(test_data_t)); ++i) + { + DWORD color; - hr = IDirect3DDevice9_SetVertexShaderConstantF(device, 7, test_data[i].in, 1); - ok(SUCCEEDED(hr), "SetVertexShaderConstantF failed (%08x)\n", hr); + hr = IDirect3DDevice9_SetVertexShaderConstantF(device, 7, test_data[j][i].in, 1); + ok(SUCCEEDED(hr), "SetVertexShaderConstantF failed (%08x)\n", hr); - hr = IDirect3DDevice9_BeginScene(device); - ok(SUCCEEDED(hr), "BeginScene failed (%08x)\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "BeginScene failed (%08x)\n", hr); - hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, &quad[0], 3 * sizeof(float)); - ok(SUCCEEDED(hr), "DrawPrimitiveUP failed (%08x)\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, &quad[0], 3 * sizeof(float)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed (%08x)\n", hr); - hr = IDirect3DDevice9_EndScene(device); - ok(SUCCEEDED(hr), "EndScene failed (%08x)\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "EndScene failed (%08x)\n", hr); - hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); - ok(SUCCEEDED(hr), "Present failed (%08x)\n", hr); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Present failed (%08x)\n", hr); - color = getPixelColor(device, 320, 240); - ok(color == test_data[i].out, "Expected color %08x, got %08x (for input %f)\n", test_data[i].out, color, test_data[i].in[0]); + color = getPixelColor(device, 320, 240); + ok(color == test_data[j][i].out, "Expected color %08x, got %08x (for input %f, instruction %s)\n", + test_data[j][i].out, color, test_data[j][i].in[0], j == 0 ? "mov" : "mova"); - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0, 0.0f, 0); - ok(SUCCEEDED(hr), "Clear failed (%08x)\n", hr); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0, 0.0f, 0); + ok(SUCCEEDED(hr), "Clear failed (%08x)\n", hr); + } + hr = IDirect3DDevice9_SetVertexShader(device, mova_shader); + ok(SUCCEEDED(hr), "SetVertexShader failed (%08x)\n", hr); } hr = IDirect3DDevice9_SetVertexShader(device, NULL); @@ -416,6 +449,7 @@ static void test_mova(IDirect3DDevice9 *device) IDirect3DVertexDeclaration9_Release(vertex_declaration); IDirect3DVertexShader9_Release(mova_shader); + IDirect3DVertexShader9_Release(mov_shader); } struct sVertex { diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index dd18709..0b68c78 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1322,8 +1322,15 @@ void shader_glsl_mov(SHADER_OPCODE_ARG* arg) { * shader versions WINED3DSIO_MOVA is used for this. */ if ((WINED3DSHADER_VERSION_MAJOR(shader->baseShader.hex_version) == 1 && !shader_is_pshader_version(shader->baseShader.hex_version) && - shader_get_regtype(arg->dst) == WINED3DSPR_ADDR) || - arg->opcode->opcode == WINED3DSIO_MOVA) { + shader_get_regtype(arg->dst) == WINED3DSPR_ADDR)) { + /* This is a simple floor() */ + size_t mask_size = shader_glsl_get_write_mask_size(write_mask); + if (mask_size > 1) { + shader_addline(buffer, "ivec%d(floor(%s)));\n", mask_size, src0_param.param_str); + } else { + shader_addline(buffer, "int(floor(%s)));\n", src0_param.param_str); + } + } else if(arg->opcode->opcode == WINED3DSIO_MOVA) { /* We need to *round* to the nearest int here. */ size_t mask_size = shader_glsl_get_write_mask_size(write_mask); if (mask_size > 1) {

1 0

Andrew Riedi : user32: Add a FIXME for animated cursors.
by Alexandre Julliard Dec. 3, 2007

Dec. 3, 2007

Module: wine Branch: master Commit: 3d08d32a426b9fc22899c86599df52da99c41eac URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d08d32a426b9fc22899c8659… Author: Andrew Riedi <andrewriedi(a)gmail.com> Date: Sat Dec 1 13:31:56 2007 -0800 user32: Add a FIXME for animated cursors. --- dlls/user32/cursoricon.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 8a2a005..7c197ed 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -39,8 +39,6 @@ * the X client instead of in the server like other bitmaps; however, * some programs (notably Paint Brush) expect to be able to manipulate * the bits directly :-( - * - * FIXME: what are we going to do with animation and color (bpp > 1) cursors ?! */ #include "config.h" @@ -901,6 +899,13 @@ static HICON CURSORICON_LoadFromFile( LPCWSTR filename, if (!bits) return hIcon; + /* Check for .ani. */ + if (memcmp( bits, "RIFF", 4 ) == 0) + { + FIXME("No support for .ani cursors.\n"); + goto end; + } + dir = (CURSORICONFILEDIR*) bits; if ( filesize < sizeof(*dir) ) goto end;

1 0

Gerald Pfeifer : wined3d: Fix handling of a special case in IWineD3DImpl_FillGLCaps() and adjust type of loop variable.
by Alexandre Julliard Dec. 3, 2007

Dec. 3, 2007

Module: wine Branch: master Commit: 04cb111efc50c3169463c446a634276b1c0e87e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04cb111efc50c3169463c446a… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Dec 1 02:53:10 2007 +0100 wined3d: Fix handling of a special case in IWineD3DImpl_FillGLCaps() and adjust type of loop variable. --- dlls/wined3d/directx.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e4b5bdf..7b4ab8f 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -464,7 +464,7 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { GLfloat gl_floatv[2]; int major = 1, minor = 0; BOOL return_value = TRUE; - int i; + unsigned i; HDC hdc; unsigned int vidmem=0; @@ -792,7 +792,11 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { FIXME("OpenGL implementation supports %u vertex samplers and %u total samplers\n", gl_info->max_vertex_samplers, gl_info->max_combined_samplers); FIXME("Expected vertex samplers + MAX_TEXTURES(=8) > combined_samplers\n"); - gl_info->max_vertex_samplers = max(0, gl_info->max_combined_samplers - MAX_TEXTURES); + if( gl_info->max_combined_samplers > MAX_TEXTURES ) + gl_info->max_vertex_samplers = + gl_info->max_combined_samplers - MAX_TEXTURES; + else + gl_info->max_vertex_samplers = 0; } } else { gl_info->max_combined_samplers = gl_info->max_fragment_samplers;

1 0

Andrew Riedi : winealsa.drv: Fix a comment.
by Alexandre Julliard Dec. 3, 2007

Dec. 3, 2007

Module: wine Branch: master Commit: 0e568af828c0fd6323be5a532189b5cbd7f36fc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e568af828c0fd6323be5a532… Author: Andrew Riedi <andrewriedi(a)gmail.com> Date: Sat Dec 1 13:26:13 2007 -0800 winealsa.drv: Fix a comment. --- dlls/winealsa.drv/waveinit.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winealsa.drv/waveinit.c b/dlls/winealsa.drv/waveinit.c index 3e16c18..918ddc7 100644 --- a/dlls/winealsa.drv/waveinit.c +++ b/dlls/winealsa.drv/waveinit.c @@ -198,7 +198,7 @@ static int ALSA_RegGetBoolean(HKEY key, const char *value, BOOL *answer) } /*---------------------------------------------------------------------------- -** ALSA_RegGetBoolean +** ALSA_RegGetInt ** Get a string and interpret it as a DWORD */ static int ALSA_RegGetInt(HKEY key, const char *value, DWORD *answer)

1 0

Gerald Pfeifer : comctl32: Remove extraneous check (unsigned < 0).
by Alexandre Julliard Dec. 3, 2007

Dec. 3, 2007

Module: wine Branch: master Commit: a20f4a6bbf89270beace5cbb524f8f14b43ac44a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a20f4a6bbf89270beace5cbb5… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Dec 1 00:44:09 2007 +0100 comctl32: Remove extraneous check (unsigned < 0). --- dlls/comctl32/header.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index 64403fc..cd144e2 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -981,7 +981,7 @@ HEADER_CreateDragImage (HWND hwnd, WPARAM wParam) int height, width; HFONT hFont; - if (wParam < 0 || wParam >= infoPtr->uNumItem) + if (wParam >= infoPtr->uNumItem) return FALSE; if (!infoPtr->bRectsValid)

1 0

Ted Percival : regedit: Display REG_DWORD as unsigned with lowercase hex digits.
by Alexandre Julliard Dec. 3, 2007

Dec. 3, 2007

Module: wine Branch: master Commit: 99d14ada78ef9b7e3db7c00f80bf2093d5344276 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99d14ada78ef9b7e3db7c00f8… Author: Ted Percival <ted(a)midg3t.net> Date: Sun Dec 2 20:20:19 2007 +1000 regedit: Display REG_DWORD as unsigned with lowercase hex digits. --- programs/regedit/listview.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index 8b58eec..4798b51 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -168,7 +168,7 @@ static void AddEntryToList(HWND hwndLV, LPTSTR Name, DWORD dwValType, break; case REG_DWORD: { TCHAR buf[64]; - wsprintf(buf, _T("0x%08X (%d)"), *(DWORD*)ValBuf, *(DWORD*)ValBuf); + wsprintf(buf, _T("0x%08x (%u)"), *(DWORD*)ValBuf, *(DWORD*)ValBuf); ListView_SetItemText(hwndLV, index, 2, buf); } break;

1 0

Andrew Talbot : comctl32: Remove unneeded casts.
by Alexandre Julliard Dec. 3, 2007

Dec. 3, 2007

Module: wine Branch: master Commit: 1bf787d521e07a1dacd4976d809fa46e5ac93a25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bf787d521e07a1dacd4976d8… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Dec 1 16:14:50 2007 +0000 comctl32: Remove unneeded casts. --- dlls/comctl32/commctrl.c | 2 +- dlls/comctl32/dpa.c | 6 +++--- dlls/comctl32/dsa.c | 2 +- dlls/comctl32/propsheet.c | 4 ++-- dlls/comctl32/toolbar.c | 4 ++-- dlls/comctl32/tooltips.c | 2 +- dlls/comctl32/trackbar.c | 2 +- dlls/comctl32/treeview.c | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index 4604c0e..60ea2ef 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -343,7 +343,7 @@ MenuHelp (UINT uMsg, WPARAM wParam, LPARAM lParam, HMENU hMainMenu, else { /* menu item was selected */ if (HIWORD(wParam) & MF_POPUP) - uMenuID = (UINT)*(lpwIDs+1); + uMenuID = *(lpwIDs+1); else uMenuID = (UINT)LOWORD(wParam); TRACE("uMenuID = %u\n", uMenuID); diff --git a/dlls/comctl32/dpa.c b/dlls/comctl32/dpa.c index 4df556e..e5f98b9 100644 --- a/dlls/comctl32/dpa.c +++ b/dlls/comctl32/dpa.c @@ -443,7 +443,7 @@ HDPA WINAPI DPA_Clone (const HDPA hdpa, const HDPA hdpaNew) /* create a new pointer array */ nNewItems = hdpaTemp->nGrow * - ((INT)((hdpa->nItemCount - 1) / hdpaTemp->nGrow) + 1); + (((hdpa->nItemCount - 1) / hdpaTemp->nGrow) + 1); nSize = nNewItems * sizeof(LPVOID); hdpaTemp->ptrs = HeapAlloc (hdpaTemp->hHeap, HEAP_ZERO_MEMORY, nSize); hdpaTemp->nMaxCount = nNewItems; @@ -583,7 +583,7 @@ BOOL WINAPI DPA_SetPtr (const HDPA hdpa, INT i, LPVOID p) if (hdpa->nMaxCount <= i) { /* resize the block of memory */ INT nNewItems = - hdpa->nGrow * ((INT)(((i+1) - 1) / hdpa->nGrow) + 1); + hdpa->nGrow * ((((i+1) - 1) / hdpa->nGrow) + 1); INT nSize = nNewItems * sizeof(LPVOID); if (hdpa->ptrs) @@ -654,7 +654,7 @@ LPVOID WINAPI DPA_DeletePtr (const HDPA hdpa, INT i) return NULL; hdpa->nMaxCount = nNewItems; - hdpa->ptrs = (LPVOID*)lpDest; + hdpa->ptrs = lpDest; } return lpTemp; diff --git a/dlls/comctl32/dsa.c b/dlls/comctl32/dsa.c index 5edb4fc..13f63e2 100644 --- a/dlls/comctl32/dsa.c +++ b/dlls/comctl32/dsa.c @@ -211,7 +211,7 @@ BOOL WINAPI DSA_SetItem (const HDSA hdsa, INT nIndex, LPVOID pSrc) else { /* resize the block of memory */ nNewItems = - hdsa->nGrow * ((INT)(((nIndex + 1) - 1) / hdsa->nGrow) + 1); + hdsa->nGrow * ((((nIndex + 1) - 1) / hdsa->nGrow) + 1); nSize = hdsa->nItemSize * nNewItems; lpTemp = ReAlloc (hdsa->pData, nSize); diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index cc9242d..9828d6f 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -1527,7 +1527,7 @@ static VOID PROPSHEET_LoadWizardBitmaps(PropSheetInfo *psInfo) if ((psInfo->ppshheader.dwFlags & PSH_WATERMARK) && !(psInfo->ppshheader.dwFlags & PSH_USEHBMWATERMARK)) { - ((PropSheetInfo *)psInfo)->ppshheader.u4.hbmWatermark = + psInfo->ppshheader.u4.hbmWatermark = CreateMappedBitmap(psInfo->ppshheader.hInstance, (INT_PTR)psInfo->ppshheader.u4.pszbmWatermark, 0, NULL, 0); } @@ -1535,7 +1535,7 @@ static VOID PROPSHEET_LoadWizardBitmaps(PropSheetInfo *psInfo) if ((psInfo->ppshheader.dwFlags & PSH_HEADER) && !(psInfo->ppshheader.dwFlags & PSH_USEHBMHEADER)) { - ((PropSheetInfo *)psInfo)->ppshheader.u5.hbmHeader = + psInfo->ppshheader.u5.hbmHeader = CreateMappedBitmap(psInfo->ppshheader.hInstance, (INT_PTR)psInfo->ppshheader.u5.pszbmHeader, 0, NULL, 0); } } diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 429444e..b7a6725 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -3190,7 +3190,7 @@ TOOLBAR_Customize (HWND hwnd) (LPWSTR)RT_DIALOG))) return FALSE; - if(!(template = (LPVOID)LoadResource (COMCTL32_hModule, hRes))) + if(!(template = LoadResource (COMCTL32_hModule, hRes))) return FALSE; ret = DialogBoxIndirectParamW ((HINSTANCE)GetWindowLongPtrW(hwnd, GWLP_HINSTANCE), @@ -5893,7 +5893,7 @@ TOOLBAR_LButtonUp (HWND hwnd, WPARAM wParam, LPARAM lParam) infoPtr->nButtonDown = -1; /* Issue NM_RELEASEDCAPTURE to parent to let him know it is released */ - TOOLBAR_SendNotify ((NMHDR *) &hdr, infoPtr, + TOOLBAR_SendNotify (&hdr, infoPtr, NM_RELEASEDCAPTURE); /* native issues TBN_ENDDRAG here, if _LBUTTONDOWN issued the diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index 8740b63..401c344 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -1109,7 +1109,7 @@ TOOLTIPS_AddToolW (HWND hwnd, WPARAM wParam, LPARAM lParam) if (IS_INTRESOURCE(lpToolInfo->lpszText)) { TRACE("add string id %x\n", LOWORD(lpToolInfo->lpszText)); - toolPtr->lpszText = (LPWSTR)lpToolInfo->lpszText; + toolPtr->lpszText = lpToolInfo->lpszText; } else if (lpToolInfo->lpszText) { if (lpToolInfo->lpszText == LPSTR_TEXTCALLBACKW) { diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index f95ec5e..7b6c708 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -811,7 +811,7 @@ TRACKBAR_UpdateToolTip (const TRACKBAR_INFO *infoPtr) ClientToScreen(infoPtr->hwndSelf, &pt); SendMessageW (infoPtr->hwndToolTip, TTM_TRACKPOSITION, - 0, (LPARAM)MAKELPARAM(pt.x, pt.y)); + 0, MAKELPARAM(pt.x, pt.y)); } diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 29d5662..aa12c4f 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -3996,7 +3996,7 @@ TREEVIEW_LButtonDown(TREEVIEW_INFO *infoPtr, LPARAM lParam) if(ht.hItem && (ht.flags & TVHT_ONITEM)) { infoPtr->focusedItem = ht.hItem; - InvalidateRect(hwnd, &(((HTREEITEM)(ht.hItem))->rect), TRUE); + InvalidateRect(hwnd, &ht.hItem->rect, TRUE); if(infoPtr->selectedItem) InvalidateRect(hwnd, &(infoPtr->selectedItem->rect), TRUE);

1 0

Andrew Talbot : advapi32: Remove unneeded casts.
by Alexandre Julliard Dec. 3, 2007

Dec. 3, 2007

Module: wine Branch: master Commit: 263cb72e13795820458575b9e27c2a026d37ec42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=263cb72e13795820458575b9e… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Dec 1 16:14:25 2007 +0000 advapi32: Remove unneeded casts. --- dlls/advapi32/cred.c | 8 ++++---- dlls/advapi32/crypt.c | 2 +- dlls/advapi32/security.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/cred.c b/dlls/advapi32/cred.c index b5c99f6..e81a171 100644 --- a/dlls/advapi32/cred.c +++ b/dlls/advapi32/cred.c @@ -932,7 +932,7 @@ static void convert_PCREDENTIALW_to_PCREDENTIALA(const CREDENTIALW *CredentialW, CredentialA->Type = CredentialW->Type; if (CredentialW->TargetName) { - CredentialA->TargetName = (LPSTR)buffer; + CredentialA->TargetName = buffer; string_len = WideCharToMultiByte(CP_ACP, 0, CredentialW->TargetName, -1, CredentialA->TargetName, -1, NULL, NULL); buffer += string_len; *len += string_len; @@ -941,7 +941,7 @@ static void convert_PCREDENTIALW_to_PCREDENTIALA(const CREDENTIALW *CredentialW, CredentialA->TargetName = NULL; if (CredentialW->Comment) { - CredentialA->Comment = (LPSTR)buffer; + CredentialA->Comment = buffer; string_len = WideCharToMultiByte(CP_ACP, 0, CredentialW->Comment, -1, CredentialA->Comment, -1, NULL, NULL); buffer += string_len; *len += string_len; @@ -965,7 +965,7 @@ static void convert_PCREDENTIALW_to_PCREDENTIALA(const CREDENTIALW *CredentialW, CredentialA->Attributes = NULL; /* FIXME */ if (CredentialW->TargetAlias) { - CredentialA->TargetAlias = (LPSTR)buffer; + CredentialA->TargetAlias = buffer; string_len = WideCharToMultiByte(CP_ACP, 0, CredentialW->TargetAlias, -1, CredentialA->TargetAlias, -1, NULL, NULL); buffer += string_len; *len += string_len; @@ -974,7 +974,7 @@ static void convert_PCREDENTIALW_to_PCREDENTIALA(const CREDENTIALW *CredentialW, CredentialA->TargetAlias = NULL; if (CredentialW->UserName) { - CredentialA->UserName = (LPSTR)buffer; + CredentialA->UserName = buffer; string_len = WideCharToMultiByte(CP_ACP, 0, CredentialW->UserName, -1, CredentialA->UserName, -1, NULL, NULL); buffer += string_len; *len += string_len; diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index c6ea940..601d095 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -52,7 +52,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(crypt); static HWND crypt_hWindow; -#define CRYPT_Alloc(size) ((LPVOID)LocalAlloc(LMEM_ZEROINIT, size)) +#define CRYPT_Alloc(size) (LocalAlloc(LMEM_ZEROINIT, size)) #define CRYPT_Free(buffer) (LocalFree((HLOCAL)buffer)) static inline PWSTR CRYPT_GetProvKeyName(PCWSTR pProvName) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 9b32fdd..89498c2 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -4087,7 +4087,7 @@ BOOL WINAPI ConvertStringSidToSidW(LPCWSTR StringSid, PSID* Sid) SetLastError(ERROR_INVALID_PARAMETER); else if (ParseStringSidToSid(StringSid, NULL, &cBytes)) { - PSID pSid = *Sid = (PSID) LocalAlloc(0, cBytes); + PSID pSid = *Sid = LocalAlloc(0, cBytes); bret = ParseStringSidToSid(StringSid, pSid, &cBytes); if (!bret)

1 0

Andrew Talbot : cabinet: Remove unneeded casts.
by Alexandre Julliard Dec. 3, 2007

Dec. 3, 2007

Module: wine Branch: master Commit: b3e56e9d0b495c057867a99e4fb5776045affcb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3e56e9d0b495c057867a99e4… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Dec 1 16:14:37 2007 +0000 cabinet: Remove unneeded casts. --- dlls/cabinet/fdi.c | 34 +++++++++++++++++----------------- 1 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index 1056d5f..a522b86 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -1138,7 +1138,7 @@ static cab_LONG fdi_Zipinflate_codes(const struct Ziphuft *tl, const struct Ziph for(;;) { ZIPNEEDBITS((cab_ULONG)bl) - if((e = (t = tl + ((cab_ULONG)b & ml))->e) > 16) + if((e = (t = tl + (b & ml))->e) > 16) do { if (e == 99) @@ -1146,7 +1146,7 @@ static cab_LONG fdi_Zipinflate_codes(const struct Ziphuft *tl, const struct Ziph ZIPDUMPBITS(t->b) e -= 16; ZIPNEEDBITS(e) - } while ((e = (t = t->v.t + ((cab_ULONG)b & Zipmask[e]))->e) > 16); + } while ((e = (t = t->v.t + (b & Zipmask[e]))->e) > 16); ZIPDUMPBITS(t->b) if (e == 16) /* then it's a literal */ CAB(outbuf)[w++] = (cab_UBYTE)t->v.n; @@ -1158,22 +1158,22 @@ static cab_LONG fdi_Zipinflate_codes(const struct Ziphuft *tl, const struct Ziph /* get length of block to copy */ ZIPNEEDBITS(e) - n = t->v.n + ((cab_ULONG)b & Zipmask[e]); + n = t->v.n + (b & Zipmask[e]); ZIPDUMPBITS(e); /* decode distance of block to copy */ ZIPNEEDBITS((cab_ULONG)bd) - if ((e = (t = td + ((cab_ULONG)b & md))->e) > 16) + if ((e = (t = td + (b & md))->e) > 16) do { if (e == 99) return 1; ZIPDUMPBITS(t->b) e -= 16; ZIPNEEDBITS(e) - } while ((e = (t = t->v.t + ((cab_ULONG)b & Zipmask[e]))->e) > 16); + } while ((e = (t = t->v.t + (b & Zipmask[e]))->e) > 16); ZIPDUMPBITS(t->b) ZIPNEEDBITS(e) - d = w - t->v.n - ((cab_ULONG)b & Zipmask[e]); + d = w - t->v.n - (b & Zipmask[e]); ZIPDUMPBITS(e) do { @@ -1217,10 +1217,10 @@ static cab_LONG fdi_Zipinflate_stored(fdi_decomp_state *decomp_state) /* get the length and its complement */ ZIPNEEDBITS(16) - n = ((cab_ULONG)b & 0xffff); + n = (b & 0xffff); ZIPDUMPBITS(16) ZIPNEEDBITS(16) - if (n != (cab_ULONG)((~b) & 0xffff)) + if (n != ((~b) & 0xffff)) return 1; /* error in compressed data */ ZIPDUMPBITS(16) @@ -1312,13 +1312,13 @@ static cab_LONG fdi_Zipinflate_dynamic(fdi_decomp_state *decomp_state) /* read in table lengths */ ZIPNEEDBITS(5) - nl = 257 + ((cab_ULONG)b & 0x1f); /* number of literal/length codes */ + nl = 257 + (b & 0x1f); /* number of literal/length codes */ ZIPDUMPBITS(5) ZIPNEEDBITS(5) - nd = 1 + ((cab_ULONG)b & 0x1f); /* number of distance codes */ + nd = 1 + (b & 0x1f); /* number of distance codes */ ZIPDUMPBITS(5) ZIPNEEDBITS(4) - nb = 4 + ((cab_ULONG)b & 0xf); /* number of bit length codes */ + nb = 4 + (b & 0xf); /* number of bit length codes */ ZIPDUMPBITS(4) if(nl > 288 || nd > 32) return 1; /* bad lengths */ @@ -1327,7 +1327,7 @@ static cab_LONG fdi_Zipinflate_dynamic(fdi_decomp_state *decomp_state) for(j = 0; j < nb; j++) { ZIPNEEDBITS(3) - ll[Zipborder[j]] = (cab_ULONG)b & 7; + ll[Zipborder[j]] = b & 7; ZIPDUMPBITS(3) } for(; j < 19; j++) @@ -1349,7 +1349,7 @@ static cab_LONG fdi_Zipinflate_dynamic(fdi_decomp_state *decomp_state) while((cab_ULONG)i < n) { ZIPNEEDBITS((cab_ULONG)bl) - j = (td = tl + ((cab_ULONG)b & m))->b; + j = (td = tl + (b & m))->b; ZIPDUMPBITS(j) j = td->v.n; if (j < 16) /* length of code in bits (0..15) */ @@ -1357,7 +1357,7 @@ static cab_LONG fdi_Zipinflate_dynamic(fdi_decomp_state *decomp_state) else if (j == 16) /* repeat last length 3 to 6 times */ { ZIPNEEDBITS(2) - j = 3 + ((cab_ULONG)b & 3); + j = 3 + (b & 3); ZIPDUMPBITS(2) if((cab_ULONG)i + j > n) return 1; @@ -1367,7 +1367,7 @@ static cab_LONG fdi_Zipinflate_dynamic(fdi_decomp_state *decomp_state) else if (j == 17) /* 3 to 10 zero length codes */ { ZIPNEEDBITS(3) - j = 3 + ((cab_ULONG)b & 7); + j = 3 + (b & 7); ZIPDUMPBITS(3) if ((cab_ULONG)i + j > n) return 1; @@ -1378,7 +1378,7 @@ static cab_LONG fdi_Zipinflate_dynamic(fdi_decomp_state *decomp_state) else /* j == 18: 11 to 138 zero length codes */ { ZIPNEEDBITS(7) - j = 11 + ((cab_ULONG)b & 0x7f); + j = 11 + (b & 0x7f); ZIPDUMPBITS(7) if ((cab_ULONG)i + j > n) return 1; @@ -1436,7 +1436,7 @@ static cab_LONG fdi_Zipinflate_block(cab_LONG *e, fdi_decomp_state *decomp_state /* read in block type */ ZIPNEEDBITS(2) - t = (cab_ULONG)b & 3; + t = b & 3; ZIPDUMPBITS(2) /* restore the global bit buffer */

1 0