June 2006 - Wine-commits - list.winehq.org

Ivan Gyurdiev : wined3d: Rename vertex shader constants.
by Alexandre Julliard 06 Jun '06

06 Jun '06

Module: wine Branch: refs/heads/master Commit: 0909df6711d4e39d496dd302f8bbbe209eaa1d99 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0909df6711d4e39d496dd30… Author: Ivan Gyurdiev <ivg2(a)cornell.edu> Date: Tue Jun 6 02:41:46 2006 -0400 wined3d: Rename vertex shader constants. >From const%lu to C%lu for consistency (to match pshaders). --- dlls/wined3d/vertexshader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 0c525a6..09d1f78 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -671,7 +671,7 @@ inline static void vshader_program_add_p if (param & D3DVS_ADDRMODE_RELATIVE) { FIXME("Relative addressing not expected for a named constant %lu\n", reg); } - sprintf(tmpReg, "const%lu", reg); + sprintf(tmpReg, "C%lu", reg); } else { sprintf(tmpReg, "C[%s%lu]", (param & D3DVS_ADDRMODE_RELATIVE) ? "A0.x + " : "", reg); } @@ -986,7 +986,7 @@ void vshader_hw_def(SHADER_OPCODE_ARG* a DWORD reg = arg->dst; shader_addline(buffer, - "PARAM const%lu = { %f, %f, %f, %f };\n", reg & 0xFF, + "PARAM C%lu = { %f, %f, %f, %f };\n", reg & 0xFF, *((const float *)(arg->src + 0)), *((const float *)(arg->src + 1)), *((const float *)(arg->src + 2)),

1 0

Ivan Gyurdiev : wined3d: Add limits for ps_2_x.
by Alexandre Julliard 06 Jun '06

06 Jun '06

Module: wine Branch: refs/heads/master Commit: 79029c1099178c7240c5408811e979ecfeadcbe9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=79029c1099178c7240c5408… Author: Ivan Gyurdiev <ivg2(a)cornell.edu> Date: Tue Jun 6 02:40:59 2006 -0400 wined3d: Add limits for ps_2_x. --- dlls/wined3d/pixelshader.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 30e1831..05e8c68 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -963,7 +963,8 @@ void pshader_set_version( break; /* FIXME: temporaries must match D3DPSHADERCAPS2_0.NumTemps */ - case 20: This->baseShader.limits.temporary = 32; + case 20: + case 21: This->baseShader.limits.temporary = 32; This->baseShader.limits.constant_float = 32; This->baseShader.limits.constant_int = 16; This->baseShader.limits.constant_bool = 16;

1 0

Ivan Gyurdiev : wined3d: Trace improvements.
by Alexandre Julliard 06 Jun '06

06 Jun '06

Module: wine Branch: refs/heads/master Commit: aec2e3e46df528315cb38bce618a27102ebcb514 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=aec2e3e46df528315cb38bc… Author: Ivan Gyurdiev <ivg2(a)cornell.edu> Date: Tue Jun 6 02:40:08 2006 -0400 wined3d: Trace improvements. --- dlls/wined3d/baseshader.c | 41 +++++++++++++++++++++++++++------ dlls/wined3d/pixelshader.c | 49 ++++++++++++++++++++++++++-------------- dlls/wined3d/vertexshader.c | 49 ++++++++++++++++++++++++++-------------- dlls/wined3d/wined3d_private.h | 2 ++ 4 files changed, 99 insertions(+), 42 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 7c24fa0..ee54a5e 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -160,6 +160,25 @@ int shader_skip_unrecognized( return tokens_read; } +/* Convert floating point offset relative + * to a register file to an absolute offset for float constants */ + +unsigned int shader_get_float_offset(const DWORD reg) { + + unsigned int regnum = reg & D3DSP_REGNUM_MASK; + int regtype = shader_get_regtype(reg); + + switch (regtype) { + case D3DSPR_CONST: return regnum; + case D3DSPR_CONST2: return 2048 + regnum; + case D3DSPR_CONST3: return 4096 + regnum; + case D3DSPR_CONST4: return 6144 + regnum; + default: + FIXME("Unsupported register type: %d\n", regtype); + return regnum; + } +} + /* Note that this does not count the loop register * as an address register. */ @@ -330,21 +349,23 @@ static void shader_dump_arr_entry( IWineD3DBaseShader *iface, const DWORD param, const DWORD addr_token, + unsigned int reg, int input) { - DWORD reg = param & D3DSP_REGNUM_MASK; char relative = ((param & D3DSHADER_ADDRESSMODE_MASK) == D3DSHADER_ADDRMODE_RELATIVE); - TRACE("["); if (relative) { + TRACE("["); if (addr_token) shader_dump_param(iface, addr_token, 0, input); else TRACE("a0.x"); TRACE(" + "); } - TRACE("%lu]", reg); + TRACE("%u", reg); + if (relative) + TRACE("]"); } void shader_dump_param( @@ -388,11 +409,15 @@ void shader_dump_param( TRACE("r%lu", reg); break; case D3DSPR_INPUT: - TRACE("v%lu", reg); + TRACE("v"); + shader_dump_arr_entry(iface, param, addr_token, reg, input); break; case D3DSPR_CONST: + case D3DSPR_CONST2: + case D3DSPR_CONST3: + case D3DSPR_CONST4: TRACE("c"); - shader_dump_arr_entry(iface, param, addr_token, input); + shader_dump_arr_entry(iface, param, addr_token, shader_get_float_offset(param), input); break; case D3DSPR_TEXTURE: /* vs: case D3DSPR_ADDR */ TRACE("%c%lu", (pshader? 't':'a'), reg); @@ -416,18 +441,18 @@ void shader_dump_param( if (D3DSHADER_VERSION_MAJOR(This->baseShader.hex_version) >= 3) { TRACE("o"); - shader_dump_arr_entry(iface, param, addr_token, input); + shader_dump_arr_entry(iface, param, addr_token, reg, input); } else TRACE("oT%lu", reg); break; case D3DSPR_CONSTINT: TRACE("i"); - shader_dump_arr_entry(iface, param, addr_token, input); + shader_dump_arr_entry(iface, param, addr_token, reg, input); break; case D3DSPR_CONSTBOOL: TRACE("b"); - shader_dump_arr_entry(iface, param, addr_token, input); + shader_dump_arr_entry(iface, param, addr_token, reg, input); break; case D3DSPR_LABEL: TRACE("l%lu", reg); diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index a1b1d49..30e1831 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -1424,23 +1424,38 @@ HRESULT WINAPI IWineD3DPixelShaderImpl_S pToken += 2; len += 2; - } else - if (curOpcode->opcode == D3DSIO_DEF) { - TRACE("def c%lu = ", *pToken & 0xFF); - ++pToken; - ++len; - TRACE("%f ,", *(float *)pToken); - ++pToken; - ++len; - TRACE("%f ,", *(float *)pToken); - ++pToken; - ++len; - TRACE("%f ,", *(float *)pToken); - ++pToken; - ++len; - TRACE("%f", *(float *)pToken); - ++pToken; - ++len; + } else if (curOpcode->opcode == D3DSIO_DEF) { + + unsigned int offset = shader_get_float_offset(*pToken); + + TRACE("def c%u = %f, %f, %f, %f", offset, + *(float *)(pToken + 1), + *(float *)(pToken + 2), + *(float *)(pToken + 3), + *(float *)(pToken + 4)); + + pToken += 5; + len += 5; + + } else if (curOpcode->opcode == D3DSIO_DEFI) { + + TRACE("defi i%lu = %ld, %ld, %ld, %ld", *pToken & D3DSP_REGNUM_MASK, + (long) *(pToken + 1), + (long) *(pToken + 2), + (long) *(pToken + 3), + (long) *(pToken + 4)); + + pToken += 5; + len += 5; + + } else if (curOpcode->opcode == D3DSIO_DEFB) { + + TRACE("defb b%lu = %s", *pToken & D3DSP_REGNUM_MASK, + *(pToken + 1)? "true": "false"); + + pToken += 2; + len += 2; + } else { DWORD param, addr_token; diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index d82546e..0c525a6 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -1571,23 +1571,38 @@ HRESULT WINAPI IWineD3DVertexShaderImpl_ pToken += 2; len += 2; - } else - if (curOpcode->opcode == D3DSIO_DEF) { - TRACE("def c%lu = ", *pToken & 0xFF); - ++pToken; - ++len; - TRACE("%f ,", *(float *)pToken); - ++pToken; - ++len; - TRACE("%f ,", *(float *)pToken); - ++pToken; - ++len; - TRACE("%f ,", *(float *)pToken); - ++pToken; - ++len; - TRACE("%f", *(float *)pToken); - ++pToken; - ++len; + } else if (curOpcode->opcode == D3DSIO_DEF) { + + unsigned int offset = shader_get_float_offset(*pToken); + + TRACE("def c%u = %f, %f, %f, %f", offset, + *(float *)(pToken + 1), + *(float *)(pToken + 2), + *(float *)(pToken + 3), + *(float *)(pToken + 4)); + + pToken += 5; + len += 5; + + } else if (curOpcode->opcode == D3DSIO_DEFI) { + + TRACE("defi i%lu = %ld, %ld, %ld, %ld", *pToken & D3DSP_REGNUM_MASK, + (long) *(pToken + 1), + (long) *(pToken + 2), + (long) *(pToken + 3), + (long) *(pToken + 4)); + + pToken += 5; + len += 5; + + } else if (curOpcode->opcode == D3DSIO_DEFB) { + + TRACE("defb b%lu = %s", *pToken & D3DSP_REGNUM_MASK, + *(pToken + 1)? "true": "false"); + + pToken += 2; + len += 2; + } else { DWORD param, addr_token; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0552ee4..5148c01 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1363,6 +1363,8 @@ inline static int shader_get_regtype(con ((param & D3DSP_REGTYPE_MASK2) >> D3DSP_REGTYPE_SHIFT2)); } +extern unsigned int shader_get_float_offset(const DWORD reg); + inline static BOOL shader_is_pshader_version(DWORD token) { return 0xFFFF0000 == (token & 0xFFFF0000); }

1 0

Ivan Gyurdiev : wined3d: pshader defi has 5 parameters.
by Alexandre Julliard 06 Jun '06

06 Jun '06

Module: wine Branch: refs/heads/master Commit: 2c232990ee3762ff16cbe697d415103643b213b8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2c232990ee3762ff16cbe69… Author: Ivan Gyurdiev <ivg2(a)cornell.edu> Date: Tue Jun 6 02:37:40 2006 -0400 wined3d: pshader defi has 5 parameters. --- dlls/wined3d/pixelshader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 283d1f0..a1b1d49 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -586,7 +586,7 @@ void pshader_defb(WINED3DSHADERVECTOR* d FIXME(" : Stub\n"); } -void pshader_defi(WINED3DSHADERVECTOR* d) { +void pshader_defi(WINED3DSHADERVECTOR* d, WINED3DSHADERVECTOR* s0, WINED3DSHADERVECTOR* s1, WINED3DSHADERVECTOR* s2, WINED3DSHADERVECTOR* s3) { FIXME(" : Stub\n"); } @@ -707,7 +707,7 @@ CONST SHADER_OPCODE IWineD3DPixelShaderI /* Constant definitions */ {D3DSIO_DEF, "def", "undefined", 5, pshader_def, pshader_hw_def, NULL, 0, 0}, {D3DSIO_DEFB, "defb", GLNAME_REQUIRE_GLSL, 2, pshader_defb, NULL, NULL, 0, 0}, - {D3DSIO_DEFI, "defi", GLNAME_REQUIRE_GLSL, 2, pshader_defi, NULL, NULL, 0, 0}, + {D3DSIO_DEFI, "defi", GLNAME_REQUIRE_GLSL, 5, pshader_defi, NULL, NULL, 0, 0}, /* Texture */ {D3DSIO_TEXCOORD, "texcoord", "undefined", 1, pshader_texcoord, pshader_hw_texcoord, NULL, 0, D3DPS_VERSION(1,3)},

1 0

James Hawkins : oleaut32: Only BYREF DispCallFunc args whose input args are not BYREF should be changed .
by Alexandre Julliard 06 Jun '06

06 Jun '06

Module: wine Branch: refs/heads/master Commit: 585763ffa91ba10291e2a2eff27b7dd8fd623611 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=585763ffa91ba10291e2a2e… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Jun 5 17:48:15 2006 -0500 oleaut32: Only BYREF DispCallFunc args whose input args are not BYREF should be changed. --- dlls/oleaut32/typelib.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index c4b2f56..21c69a9 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5360,9 +5360,11 @@ static HRESULT WINAPI ITypeInfo_fnInvoke { if (wParamFlags & PARAMFLAG_FOUT) { - hres = VariantChangeType(&pDispParams->rgvarg[pDispParams->cArgs - 1 - i], - &rgvarg[i], 0, - V_VT(&pDispParams->rgvarg[pDispParams->cArgs - 1 - i])); + VARIANTARG *arg = &pDispParams->rgvarg[pDispParams->cArgs - 1 - i]; + + if ((rgvt[i] == VT_BYREF) && (V_VT(arg) != VT_BYREF)) + hres = VariantChangeType(arg, &rgvarg[i], 0, V_VT(arg)); + if (FAILED(hres)) { ERR("failed to convert param %d to vt %d\n", i,

1 0

qingdoa daoo : gdi: Don't treat a NULL rect as an empty rect in ExtTextOutW .
by Alexandre Julliard 06 Jun '06

06 Jun '06

Module: wine Branch: refs/heads/master Commit: 9de7c3ae7839334ba1c9420f55d8edb8be70aae8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9de7c3ae7839334ba1c9420… Author: qingdoa daoo <qingdao33122(a)yahoo.com> Date: Tue Jun 6 11:42:45 2006 +0800 gdi: Don't treat a NULL rect as an empty rect in ExtTextOutW. --- dlls/gdi/font.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/gdi/font.c b/dlls/gdi/font.c index ed482af..33a03f6 100644 --- a/dlls/gdi/font.c +++ b/dlls/gdi/font.c @@ -1748,6 +1748,9 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, GDI_ReleaseObj( hdc ); return ret; } + + if (!lprect) + flags &= ~ETO_CLIPPED; if( !(flags & (ETO_GLYPH_INDEX | ETO_IGNORELANGUAGE)) && BidiAvail && count > 0 ) { @@ -1800,7 +1803,6 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, { if(!lprect) { - if(flags & ETO_CLIPPED) goto done; if(flags & ETO_GLYPH_INDEX) GetTextExtentPointI(hdc, glyphs, count, &sz); else

1 0

Michael Kaufmann : gdi: New tests for GetDIBits.
by Alexandre Julliard 06 Jun '06

06 Jun '06

Module: wine Branch: refs/heads/master Commit: 1660c504ca0863e06d702b14a656edb9c20974eb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1660c504ca0863e06d702b1… Author: Michael Kaufmann <hallo(a)michael-kaufmann.ch> Date: Mon Jun 5 23:18:56 2006 +0200 gdi: New tests for GetDIBits. New tests that check if GetDIBits works with a bitmap that is selected in a device context (works in Windows, should fail according to the API documentation) --- dlls/gdi/tests/bitmap.c | 232 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 232 insertions(+), 0 deletions(-) diff --git a/dlls/gdi/tests/bitmap.c b/dlls/gdi/tests/bitmap.c index 6e7a887..7409074 100644 --- a/dlls/gdi/tests/bitmap.c +++ b/dlls/gdi/tests/bitmap.c @@ -21,6 +21,7 @@ #include <stdarg.h> #include <assert.h> +#include <string.h> #include "windef.h" #include "winbase.h" @@ -1019,6 +1020,232 @@ static void test_bmBits(void) DeleteObject(hbmp); } +static void test_GetDIBits_selected_DIB(UINT bpp) +{ + HBITMAP dib; + BITMAPINFO * info; + BITMAPINFO * info2; + void * bits; + void * bits2; + UINT dib_size; + HDC dib_dc, dc; + HBITMAP old_bmp; + BOOL equalContents; + UINT i; + int res; + + /* Create a DIB section with a color table */ + + info = (BITMAPINFO *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(BITMAPINFOHEADER) + (1 << bpp) * sizeof(RGBQUAD)); + info2 = (BITMAPINFO *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(BITMAPINFOHEADER) + (1 << bpp) * sizeof(RGBQUAD)); + assert(info); + assert(info2); + + info->bmiHeader.biSize = sizeof(info->bmiHeader); + + /* Choose width and height such that the row length (in bytes) + is a multiple of 4 (makes things easier) */ + info->bmiHeader.biWidth = 32; + info->bmiHeader.biHeight = 32; + info->bmiHeader.biPlanes = 1; + info->bmiHeader.biBitCount = bpp; + info->bmiHeader.biCompression = BI_RGB; + + for (i=0; i < (1 << bpp); i++) + { + BYTE c = i * (1 << (8 - bpp)); + info->bmiColors[i].rgbRed = c; + info->bmiColors[i].rgbGreen = c; + info->bmiColors[i].rgbBlue = c; + info->bmiColors[i].rgbReserved = 0; + } + + dib = CreateDIBSection(NULL, info, DIB_RGB_COLORS, &bits, NULL, 0); + assert(dib); + dib_size = bpp * (info->bmiHeader.biWidth * info->bmiHeader.biHeight) / 8; + + /* Set the bits of the DIB section */ + for (i=0; i < dib_size; i++) + { + ((BYTE *)bits)[i] = i % 256; + } + + /* Select the DIB into a DC */ + dib_dc = CreateCompatibleDC(NULL); + old_bmp = (HBITMAP) SelectObject(dib_dc, dib); + dc = CreateCompatibleDC(NULL); + bits2 = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dib_size); + assert(bits2); + + /* Copy the DIB attributes but not the color table */ + memcpy(info2, info, sizeof(BITMAPINFOHEADER)); + + res = GetDIBits(dc, dib, 0, info->bmiHeader.biHeight, bits2, info2, DIB_RGB_COLORS); + ok(res, "GetDIBits failed\n"); + + /* Compare the color table and the bits */ + equalContents = TRUE; + for (i=0; i < (1 << bpp); i++) + { + if ((info->bmiColors[i].rgbRed != info2->bmiColors[i].rgbRed) + || (info->bmiColors[i].rgbGreen != info2->bmiColors[i].rgbGreen) + || (info->bmiColors[i].rgbBlue != info2->bmiColors[i].rgbBlue) + || (info->bmiColors[i].rgbReserved != info2->bmiColors[i].rgbReserved)) + { + equalContents = FALSE; + break; + } + } + todo_wine + { + ok(equalContents, "GetDIBits with DIB selected in DC: Invalid DIB color table\n"); + } + + equalContents = TRUE; + for (i=0; i < dib_size / sizeof(DWORD); i++) + { + if (((DWORD *)bits)[i] != ((DWORD *)bits2)[i]) + { + equalContents = FALSE; + break; + } + } + todo_wine + { + ok(equalContents, "GetDIBits with DIB selected in DC: Invalid DIB bits\n"); + } + + HeapFree(GetProcessHeap(), 0, bits2); + DeleteDC(dc); + + SelectObject(dib_dc, old_bmp); + DeleteDC(dib_dc); + DeleteObject(dib); + + HeapFree(GetProcessHeap(), 0, info2); + HeapFree(GetProcessHeap(), 0, info); +} + +static void test_GetDIBits_selected_DDB(BOOL monochrome) +{ + HBITMAP ddb; + BITMAPINFO * info; + BITMAPINFO * info2; + void * bits; + void * bits2; + HDC ddb_dc, dc; + HBITMAP old_bmp; + BOOL equalContents; + UINT width, height; + UINT bpp; + UINT i, j; + int res; + + width = height = 16; + + /* Create a DDB (device-dependent bitmap) */ + if (monochrome) + { + bpp = 1; + ddb = CreateBitmap(width, height, 1, 1, NULL); + } + else + { + HDC screen_dc = GetDC(NULL); + bpp = GetDeviceCaps(screen_dc, BITSPIXEL) * GetDeviceCaps(screen_dc, PLANES); + ddb = CreateCompatibleBitmap(screen_dc, width, height); + ReleaseDC(NULL, screen_dc); + } + + /* Set the pixels */ + ddb_dc = CreateCompatibleDC(NULL); + old_bmp = (HBITMAP) SelectObject(ddb_dc, ddb); + for (i = 0; i < width; i++) + { + for (j=0; j < height; j++) + { + BYTE c = (i * width + j) % 256; + SetPixelV(ddb_dc, i, j, RGB(c, c, c)); + } + } + SelectObject(ddb_dc, old_bmp); + + info = (BITMAPINFO *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)); + info2 = (BITMAPINFO *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)); + assert(info); + assert(info2); + + info->bmiHeader.biSize = sizeof(info->bmiHeader); + info->bmiHeader.biWidth = width; + info->bmiHeader.biHeight = height; + info->bmiHeader.biPlanes = 1; + info->bmiHeader.biBitCount = bpp; + info->bmiHeader.biCompression = BI_RGB; + + dc = CreateCompatibleDC(NULL); + + /* Fill in biSizeImage */ + GetDIBits(dc, ddb, 0, height, NULL, info, DIB_RGB_COLORS); + ok(info->bmiHeader.biSizeImage != 0, "GetDIBits failed to get the DIB attributes\n"); + + bits = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, info->bmiHeader.biSizeImage); + bits2 = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, info->bmiHeader.biSizeImage); + assert(bits); + assert(bits2); + + /* Get the bits */ + res = GetDIBits(dc, ddb, 0, height, bits, info, DIB_RGB_COLORS); + ok(res, "GetDIBits failed\n"); + + /* Copy the DIB attributes but not the color table */ + memcpy(info2, info, sizeof(BITMAPINFOHEADER)); + + /* Select the DDB into another DC */ + old_bmp = (HBITMAP) SelectObject(ddb_dc, ddb); + + /* Get the bits */ + res = GetDIBits(dc, ddb, 0, height, bits2, info2, DIB_RGB_COLORS); + ok(res, "GetDIBits failed\n"); + + /* Compare the color table and the bits */ + if (bpp <= 8) + { + equalContents = TRUE; + for (i=0; i < (1 << bpp); i++) + { + if ((info->bmiColors[i].rgbRed != info2->bmiColors[i].rgbRed) + || (info->bmiColors[i].rgbGreen != info2->bmiColors[i].rgbGreen) + || (info->bmiColors[i].rgbBlue != info2->bmiColors[i].rgbBlue) + || (info->bmiColors[i].rgbReserved != info2->bmiColors[i].rgbReserved)) + { + equalContents = FALSE; + break; + } + } + ok(equalContents, "GetDIBits with DDB selected in DC: Got a different color table\n"); + } + + equalContents = TRUE; + for (i=0; i < info->bmiHeader.biSizeImage / sizeof(DWORD); i++) + { + if (((DWORD *)bits)[i] != ((DWORD *)bits2)[i]) + { + equalContents = FALSE; + } + } + ok(equalContents, "GetDIBits with DDB selected in DC: Got different DIB bits\n"); + + HeapFree(GetProcessHeap(), 0, bits2); + HeapFree(GetProcessHeap(), 0, bits); + DeleteDC(dc); + + SelectObject(ddb_dc, old_bmp); + DeleteDC(ddb_dc); + DeleteObject(ddb); + + HeapFree(GetProcessHeap(), 0, info2); + HeapFree(GetProcessHeap(), 0, info); +} START_TEST(bitmap) { @@ -1029,4 +1256,9 @@ START_TEST(bitmap) test_mono_dibsection(); test_bitmap(); test_bmBits(); + test_GetDIBits_selected_DIB(1); + test_GetDIBits_selected_DIB(4); + test_GetDIBits_selected_DIB(8); + test_GetDIBits_selected_DDB(TRUE); + test_GetDIBits_selected_DDB(FALSE); }

1 0

James Hawkins : oleaut32: Copy BYREF args directly if they have the same variant type.
by Alexandre Julliard 06 Jun '06

06 Jun '06

Module: wine Branch: refs/heads/master Commit: 0e5bd51d28eaa3a7d72c583f7cd822218ca4b351 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0e5bd51d28eaa3a7d72c583… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Jun 5 17:47:00 2006 -0500 oleaut32: Copy BYREF args directly if they have the same variant type. --- dlls/oleaut32/typelib.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index ce4f02f..c4b2f56 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5264,6 +5264,11 @@ static HRESULT WINAPI ITypeInfo_fnInvoke V_BYREF(&rgvarg[i]) = &V_NONE(&missing_arg[i]); V_VT(&rgvarg[i]) = rgvt[i]; } + else if ((rgvt[i] & VT_BYREF) && (rgvt[i] == V_VT(src_arg))) + { + V_BYREF(&rgvarg[i]) = V_BYREF(src_arg); + V_VT(&rgvarg[i]) = rgvt[i]; + } else { /* FIXME: this doesn't work for VT_BYREF arguments if

1 0

Mike McCormack : wineconsole: Use correct prototypes for dialog procs.
by Alexandre Julliard 06 Jun '06

06 Jun '06

Module: wine Branch: refs/heads/master Commit: ce238a4087a598a2348f74cde665a6db9092714b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ce238a4087a598a2348f74c… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Jun 6 14:33:17 2006 +0900 wineconsole: Use correct prototypes for dialog procs. --- programs/wineconsole/dialog.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/wineconsole/dialog.c b/programs/wineconsole/dialog.c index 73a0987..50fd3a8 100644 --- a/programs/wineconsole/dialog.c +++ b/programs/wineconsole/dialog.c @@ -55,7 +55,7 @@ struct dialog_info * * Dialog prop for the option property sheet */ -static BOOL WINAPI WCUSER_OptionDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) +static INT_PTR WINAPI WCUSER_OptionDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) { struct dialog_info* di; unsigned idc; @@ -516,7 +516,7 @@ static BOOL fill_list_font(struct dialog * * Dialog proc for the Font property sheet */ -static BOOL WINAPI WCUSER_FontDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) +static INT_PTR WINAPI WCUSER_FontDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) { struct dialog_info* di; @@ -596,7 +596,7 @@ static BOOL WINAPI WCUSER_FontDlgProc(HW * * Dialog proc for the config property sheet */ -static BOOL WINAPI WCUSER_ConfigDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) +static INT_PTR WINAPI WCUSER_ConfigDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) { struct dialog_info* di; @@ -699,7 +699,7 @@ static BOOL WINAPI WCUSER_ConfigDlgProc( * Dialog Procedure for choosing how to handle modification to the * console settings. */ -static BOOL WINAPI WCUSER_SaveDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) +static INT_PTR WINAPI WCUSER_SaveDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) { switch (msg) {

1 0

Mike McCormack : winecfg: Make some pointer casts win64 compliant.
by Alexandre Julliard 06 Jun '06

06 Jun '06

Module: wine Branch: refs/heads/master Commit: 71a69dd81756d2b38c9175a575cd2ac0b641a5fa URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=71a69dd81756d2b38c9175a… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Jun 6 14:33:34 2006 +0900 winecfg: Make some pointer casts win64 compliant. --- programs/winecfg/audio.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c index 4997f85..b68ab7f 100644 --- a/programs/winecfg/audio.c +++ b/programs/winecfg/audio.c @@ -118,7 +118,7 @@ static void configureAudioDriver(HWND hD dci.dwDCISize = sizeof (dci); dci.lpszDCISectionName = NULL; dci.lpszDCIAliasName = NULL; - lRes = SendDriverMessage(hdrvr, DRV_CONFIGURE, 0, (LONG)&dci); + lRes = SendDriverMessage(hdrvr, DRV_CONFIGURE, 0, (LONG_PTR)&dci); } CloseDriver(hdrvr, 0, 0); } @@ -318,7 +318,7 @@ static void initAudioDeviceTree(HWND hDl WAVEOUTCAPSW caps; char szPname[MAXPNAMELEN]; - wodMessagePtr(j, WODM_GETDEVCAPS, 0, (DWORD)&caps, sizeof(caps)); + wodMessagePtr(j, WODM_GETDEVCAPS, 0, (DWORD_PTR)&caps, sizeof(caps)); WideCharToMultiByte(CP_ACP, 0, caps.szPname, -1, szPname, MAXPNAMELEN, 0, 0); insert.hParent = type; @@ -344,7 +344,7 @@ static void initAudioDeviceTree(HWND hDl WAVEINCAPSW caps; char szPname[MAXPNAMELEN]; - widMessagePtr(j, WIDM_GETDEVCAPS, 0, (DWORD)&caps, sizeof(caps)); + widMessagePtr(j, WIDM_GETDEVCAPS, 0, (DWORD_PTR)&caps, sizeof(caps)); WideCharToMultiByte(CP_ACP, 0, caps.szPname, -1, szPname, MAXPNAMELEN, 0, 0); insert.hParent = type; @@ -370,7 +370,7 @@ static void initAudioDeviceTree(HWND hDl MIDIOUTCAPSW caps; char szPname[MAXPNAMELEN]; - modMessagePtr(j, MODM_GETDEVCAPS, 0, (DWORD)&caps, sizeof(caps)); + modMessagePtr(j, MODM_GETDEVCAPS, 0, (DWORD_PTR)&caps, sizeof(caps)); WideCharToMultiByte(CP_ACP, 0, caps.szPname, -1, szPname, MAXPNAMELEN, 0, 0); insert.hParent = type; @@ -396,7 +396,7 @@ static void initAudioDeviceTree(HWND hDl MIDIINCAPSW caps; char szPname[MAXPNAMELEN]; - midMessagePtr(j, MIDM_GETDEVCAPS, 0, (DWORD)&caps, sizeof(caps)); + midMessagePtr(j, MIDM_GETDEVCAPS, 0, (DWORD_PTR)&caps, sizeof(caps)); WideCharToMultiByte(CP_ACP, 0, caps.szPname, -1, szPname, MAXPNAMELEN, 0, 0); insert.hParent = type; @@ -422,7 +422,7 @@ static void initAudioDeviceTree(HWND hDl AUXCAPSW caps; char szPname[MAXPNAMELEN]; - auxMessagePtr(j, AUXDM_GETDEVCAPS, 0, (DWORD)&caps, sizeof(caps)); + auxMessagePtr(j, AUXDM_GETDEVCAPS, 0, (DWORD_PTR)&caps, sizeof(caps)); WideCharToMultiByte(CP_ACP, 0, caps.szPname, -1, szPname, MAXPNAMELEN, 0, 0); insert.hParent = type; @@ -448,7 +448,7 @@ static void initAudioDeviceTree(HWND hDl MIXERCAPSW caps; char szPname[MAXPNAMELEN]; - mxdMessagePtr(j, MXDM_GETDEVCAPS, 0, (DWORD)&caps, sizeof(caps)); + mxdMessagePtr(j, MXDM_GETDEVCAPS, 0, (DWORD_PTR)&caps, sizeof(caps)); WideCharToMultiByte(CP_ACP, 0, caps.szPname, -1, szPname, MAXPNAMELEN, 0, 0); insert.hParent = type;

1 0