April 2009 - Wine-commits - list.winehq.org

Paul Vriens : urlmon/tests: Fix a test by using a better default registry key.
by Alexandre Julliard 06 Apr '09

06 Apr '09

Module: wine Branch: master Commit: 7c8d07bc1052d64a80b6e8b756d099bf71bc8b87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c8d07bc1052d64a80b6e8b75… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Apr 6 11:13:06 2009 +0200 urlmon/tests: Fix a test by using a better default registry key. --- dlls/urlmon/tests/misc.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 7702e1e..64ed937 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -851,7 +851,10 @@ static void test_url_action(IInternetSecurityManager *secmgr, IInternetZoneManag HKEY hkey; HRESULT hres; - res = RegOpenKeyA(HKEY_LOCAL_MACHINE, + /* FIXME: HKEY_CURRENT_USER is most of the time the default but this can be changed on a system. + * The test should be changed to cope with that, if need be. + */ + res = RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings\\Zones\\3", &hkey); if(res != ERROR_SUCCESS) { ok(0, "Could not open zone key\n");

1 0

Marcus Meissner : oleaut32: IPropertyBag_Read_Proxy return on unknown type (Coverity 892).
by Alexandre Julliard 06 Apr '09

06 Apr '09

Module: wine Branch: master Commit: a9c0c247edf0ace58bbdd9b21737f3c6380ad405 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9c0c247edf0ace58bbdd9b21… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Apr 4 18:15:16 2009 +0200 oleaut32: IPropertyBag_Read_Proxy return on unknown type (Coverity 892). --- dlls/oleaut32/usrmarshal.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index a119c28..14c655c 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -2041,7 +2041,8 @@ HRESULT CALLBACK IPropertyBag_Read_Proxy( FIXME("Safearray support not yet implemented.\n"); return E_NOTIMPL; default: - break; + FIXME("Unknown V_VT %d - support not yet implemented.\n", V_VT(pVar)); + return E_NOTIMPL; } return IPropertyBag_RemoteRead_Proxy(This, pszPropName, pVar, pErrorLog,

1 0

Dmitry Timoshkov : gdi32: Add a couple of SetGraphicsMode/ SetWorldTransform tests, make them pass under Wine.
by Alexandre Julliard 06 Apr '09

06 Apr '09

Module: wine Branch: master Commit: 301b5d27726c0cf883ad3ff4805ec064fa22305d URL: http://source.winehq.org/git/wine.git/?a=commit;h=301b5d27726c0cf883ad3ff48… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Apr 6 17:16:34 2009 +0900 gdi32: Add a couple of SetGraphicsMode/SetWorldTransform tests, make them pass under Wine. --- dlls/gdi32/dc.c | 9 +++++++-- dlls/gdi32/tests/mapping.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 4d10f22..aa8fbc5 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -1200,10 +1200,12 @@ BOOL WINAPI GetTransform( HDC hdc, DWORD unknown, LPXFORM xform ) BOOL WINAPI SetWorldTransform( HDC hdc, const XFORM *xform ) { BOOL ret = FALSE; - DC *dc = get_dc_ptr( hdc ); + DC *dc; + + if (!xform) return FALSE; + dc = get_dc_ptr( hdc ); if (!dc) return FALSE; - if (!xform) goto done; /* Check that graphics mode is GM_ADVANCED */ if (dc->GraphicsMode!=GM_ADVANCED) goto done; @@ -1211,6 +1213,9 @@ BOOL WINAPI SetWorldTransform( HDC hdc, const XFORM *xform ) TRACE("eM11 %f eM12 %f eM21 %f eM22 %f eDx %f eDy %f\n", xform->eM11, xform->eM12, xform->eM21, xform->eM22, xform->eDx, xform->eDy); + /* The transform must conform to (eM11 * eM22 != eM12 * eM21) requirement */ + if (xform->eM11 * xform->eM22 == xform->eM12 * xform->eM21) goto done; + if (dc->funcs->pSetWorldTransform) { ret = dc->funcs->pSetWorldTransform(dc->physDev, xform); diff --git a/dlls/gdi32/tests/mapping.c b/dlls/gdi32/tests/mapping.c index f3a92e5..ffb92cb 100644 --- a/dlls/gdi32/tests/mapping.c +++ b/dlls/gdi32/tests/mapping.c @@ -85,6 +85,15 @@ static void test_world_transform(void) hdc = CreateCompatibleDC(0); + xform.eM11 = 1.0f; + xform.eM12 = 0.0f; + xform.eM21 = 0.0f; + xform.eM22 = 1.0f; + xform.eDx = 0.0f; + xform.eDy = 0.0f; + ret = SetWorldTransform(hdc, &xform); + ok(!ret, "SetWorldTransform should fail in GM_COMPATIBLE mode\n"); + size_cx = GetDeviceCaps(hdc, HORZSIZE); size_cy = GetDeviceCaps(hdc, VERTSIZE); res_x = GetDeviceCaps(hdc, HORZRES); @@ -144,6 +153,16 @@ static void test_world_transform(void) expect_world_trasform(hdc, 1.0, 1.0); expect_LPtoDP(hdc, 1000, 1000); + /* The transform must conform to (eM11 * eM22 != eM12 * eM21) requirement */ + xform.eM11 = 1.0f; + xform.eM12 = 2.0f; + xform.eM21 = 1.0f; + xform.eM22 = 2.0f; + xform.eDx = 0.0f; + xform.eDy = 0.0f; + ret = SetWorldTransform(hdc, &xform); + ok(!ret, "SetWorldTransform should fail with an invalid xform\n"); + xform.eM11 = 20.0f; xform.eM12 = 0.0f; xform.eM21 = 0.0f; @@ -183,6 +202,16 @@ static void test_world_transform(void) expect_world_trasform(hdc, 20.0, 20.0); expect_LPtoDP(hdc, 20000, 20000); + ret = SetGraphicsMode(hdc, GM_COMPATIBLE); + ok(ret, "SetGraphicsMode(GM_COMPATIBLE) should not fail if DC has't an identity transform\n"); + ret = GetGraphicsMode(hdc); + ok(ret == GM_COMPATIBLE, "expected GM_COMPATIBLE, got %d\n", ret); + + expect_viewport_ext(hdc, 1, 1); + expect_window_ext(hdc, 1, 1); + expect_world_trasform(hdc, 20.0, 20.0); + expect_LPtoDP(hdc, 20000, 20000); + DeleteDC(hdc); }

1 0

Dmitry Timoshkov : gdi32: Cache current font code page in the DC structure.
by Alexandre Julliard 06 Apr '09

06 Apr '09

Module: wine Branch: master Commit: 4bb8d9c1c2f16c107c869131744cf879d3c83f43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bb8d9c1c2f16c107c8691317… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Apr 6 17:16:40 2009 +0900 gdi32: Cache current font code page in the DC structure. --- dlls/gdi32/dc.c | 1 + dlls/gdi32/font.c | 89 +++++++++++++++++++++++++++------------------- dlls/gdi32/gdi_private.h | 1 + 3 files changed, 54 insertions(+), 37 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index aa8fbc5..fd28663 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -110,6 +110,7 @@ DC *alloc_dc_ptr( const DC_FUNCTIONS *funcs, WORD magic ) dc->hDevice = 0; dc->hPalette = GetStockObject( DEFAULT_PALETTE ); dc->gdiFont = 0; + dc->font_code_page = CP_ACP; dc->ROPmode = R2_COPYPEN; dc->polyFillMode = ALTERNATE; dc->stretchBltMode = BLACKONWHITE; diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 107536e..14de327 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -247,45 +247,13 @@ static void FONT_NewTextMetricExWToA(const NEWTEXTMETRICEXW *ptmW, NEWTEXTMETRIC DWORD WINAPI GdiGetCodePage( HDC hdc ) { UINT cp = CP_ACP; - CHARSETINFO csi; - int charset = GetTextCharset(hdc); - - /* Hmm, nicely designed api this one! */ - if(TranslateCharsetInfo(ULongToPtr(charset), &csi, TCI_SRCCHARSET)) - cp = csi.ciACP; - else { - switch(charset) { - case OEM_CHARSET: - cp = GetOEMCP(); - break; - case DEFAULT_CHARSET: - cp = GetACP(); - break; - - case VISCII_CHARSET: - case TCVN_CHARSET: - case KOI8_CHARSET: - case ISO3_CHARSET: - case ISO4_CHARSET: - case ISO10_CHARSET: - case CELTIC_CHARSET: - /* FIXME: These have no place here, but because x11drv - enumerates fonts with these (made up) charsets some apps - might use them and then the FIXME below would become - annoying. Now we could pick the intended codepage for - each of these, but since it's broken anyway we'll just - use CP_ACP and hope it'll go away... - */ - cp = CP_ACP; - break; + DC *dc = get_dc_ptr( hdc ); - default: - FIXME("Can't find codepage for charset %d\n", charset); - break; - } + if (dc) + { + cp = dc->font_code_page; + release_dc_ptr( dc ); } - - TRACE("charset %d => cp %d\n", charset, cp); return cp; } @@ -465,6 +433,52 @@ HFONT WINAPI CreateFontW( INT height, INT width, INT esc, return CreateFontIndirectW( &logfont ); } +static void update_font_code_page( DC *dc ) +{ + CHARSETINFO csi; + int charset = DEFAULT_CHARSET; + + if (dc->gdiFont) + charset = WineEngGetTextCharsetInfo( dc->gdiFont, NULL, 0 ); + + /* Hmm, nicely designed api this one! */ + if (TranslateCharsetInfo( ULongToPtr(charset), &csi, TCI_SRCCHARSET) ) + dc->font_code_page = csi.ciACP; + else { + switch(charset) { + case OEM_CHARSET: + dc->font_code_page = GetOEMCP(); + break; + case DEFAULT_CHARSET: + dc->font_code_page = GetACP(); + break; + + case VISCII_CHARSET: + case TCVN_CHARSET: + case KOI8_CHARSET: + case ISO3_CHARSET: + case ISO4_CHARSET: + case ISO10_CHARSET: + case CELTIC_CHARSET: + /* FIXME: These have no place here, but because x11drv + enumerates fonts with these (made up) charsets some apps + might use them and then the FIXME below would become + annoying. Now we could pick the intended codepage for + each of these, but since it's broken anyway we'll just + use CP_ACP and hope it'll go away... + */ + dc->font_code_page = CP_ACP; + break; + + default: + FIXME("Can't find codepage for charset %d\n", charset); + dc->font_code_page = CP_ACP; + break; + } + } + + TRACE("charset %d => cp %d\n", charset, dc->font_code_page); +} /*********************************************************************** * FONT_SelectObject @@ -506,6 +520,7 @@ static HGDIOBJ FONT_SelectObject( HGDIOBJ handle, HDC hdc ) { ret = dc->hFont; dc->hFont = handle; + update_font_code_page( dc ); GDI_dec_ref_count( ret ); } release_dc_ptr( dc ); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index bc22741..a21fc76 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -281,6 +281,7 @@ typedef struct tagDC GdiFont *gdiFont; GdiPath path; + UINT font_code_page; WORD ROPmode; WORD polyFillMode; WORD stretchBltMode;

1 0

Dmitry Timoshkov : gdi32: Use GdiGetCodePage() instead of duplicating its functionality.
by Alexandre Julliard 06 Apr '09

06 Apr '09

Module: wine Branch: master Commit: 95156d1b5f30ed144c28330e3f4195eebf03098c URL: http://source.winehq.org/git/wine.git/?a=commit;h=95156d1b5f30ed144c28330e3… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Apr 6 17:16:48 2009 +0900 gdi32: Use GdiGetCodePage() instead of duplicating its functionality. --- dlls/gdi32/font.c | 20 +++++++------------- 1 files changed, 7 insertions(+), 13 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 14de327..c81a9c8 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2483,8 +2483,7 @@ BOOL WINAPI CreateScalableFontResourceW( DWORD fHidden, DWORD WINAPI GetKerningPairsA( HDC hDC, DWORD cPairs, LPKERNINGPAIR kern_pairA ) { - INT charset; - CHARSETINFO csi; + UINT cp; CPINFO cpi; DWORD i, total_kern_pairs, kern_pairs_copied = 0; KERNINGPAIR *kern_pairW; @@ -2495,22 +2494,17 @@ DWORD WINAPI GetKerningPairsA( HDC hDC, DWORD cPairs, return 0; } - charset = GetTextCharset(hDC); - if (!TranslateCharsetInfo(ULongToPtr(charset), &csi, TCI_SRCCHARSET)) - { - FIXME("Can't find codepage for charset %d\n", charset); - return 0; - } + cp = GdiGetCodePage(hDC); + /* GetCPInfo() will fail on CP_SYMBOL, and WideCharToMultiByte is supposed * to fail on an invalid character for CP_SYMBOL. */ cpi.DefaultChar[0] = 0; - if (csi.ciACP != CP_SYMBOL && !GetCPInfo(csi.ciACP, &cpi)) + if (cp != CP_SYMBOL && !GetCPInfo(cp, &cpi)) { - FIXME("Can't find codepage %u info\n", csi.ciACP); + FIXME("Can't find codepage %u info\n", cp); return 0; } - TRACE("charset %d => codepage %u\n", charset, csi.ciACP); total_kern_pairs = GetKerningPairsW(hDC, 0, NULL); if (!total_kern_pairs) return 0; @@ -2522,10 +2516,10 @@ DWORD WINAPI GetKerningPairsA( HDC hDC, DWORD cPairs, { char first, second; - if (!WideCharToMultiByte(csi.ciACP, 0, &kern_pairW[i].wFirst, 1, &first, 1, NULL, NULL)) + if (!WideCharToMultiByte(cp, 0, &kern_pairW[i].wFirst, 1, &first, 1, NULL, NULL)) continue; - if (!WideCharToMultiByte(csi.ciACP, 0, &kern_pairW[i].wSecond, 1, &second, 1, NULL, NULL)) + if (!WideCharToMultiByte(cp, 0, &kern_pairW[i].wSecond, 1, &second, 1, NULL, NULL)) continue; if (first == cpi.DefaultChar[0] || second == cpi.DefaultChar[0])

1 0

Henri Verbeet : wined3d: Unset the current GLSL program when it's destroyed .
by Alexandre Julliard 06 Apr '09

06 Apr '09

Module: wine Branch: master Commit: 1120f0f58539d5dc8a1fbdc025ce7230aa4f1ae4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1120f0f58539d5dc8a1fbdc02… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 6 10:10:05 2009 +0200 wined3d: Unset the current GLSL program when it's destroyed. --- dlls/wined3d/glsl_shader.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 9ea193e..965f688 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3766,9 +3766,13 @@ static void shader_glsl_destroy(IWineD3DBaseShader *iface) { if(pshader) { ps = (IWineD3DPixelShaderImpl *) This; if(ps->num_gl_shaders == 0) return; + if (priv->glsl_program && (IWineD3DBaseShader *)priv->glsl_program->pshader == iface) + shader_glsl_select(This->baseShader.device, FALSE, FALSE); } else { vs = (IWineD3DVertexShaderImpl *) This; if(vs->num_gl_shaders == 0) return; + if (priv->glsl_program && (IWineD3DBaseShader *)priv->glsl_program->vshader == iface) + shader_glsl_select(This->baseShader.device, FALSE, FALSE); } linked_programs = &This->baseShader.linked_programs;

1 0

Henri Verbeet : wined3d: Use a more appropriate mask for masking out the write mask.
by Alexandre Julliard 06 Apr '09

06 Apr '09

Module: wine Branch: master Commit: 91305b1f49c430b65be19642b3121469e8406dea URL: http://source.winehq.org/git/wine.git/?a=commit;h=91305b1f49c430b65be19642b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 6 10:10:05 2009 +0200 wined3d: Use a more appropriate mask for masking out the write mask. --- dlls/wined3d/glsl_shader.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 965f688..9f79950 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1940,14 +1940,14 @@ static void shader_glsl_cmp(const struct wined3d_shader_instruction *ins) (src1reg == dstreg && src1regtype == dstregtype) || (src2reg == dstreg && src2regtype == dstregtype)) { - write_mask = shader_glsl_get_write_mask(ins->dst[0].token & (~WINED3DSP_SWIZZLE_MASK | write_mask), + write_mask = shader_glsl_get_write_mask(ins->dst[0].token & (~WINED3DSP_WRITEMASK_ALL | write_mask), mask_char); if (!write_mask) continue; shader_addline(ins->buffer, "tmp0%s = (", mask_char); temp_destination = TRUE; } else { write_mask = shader_glsl_append_dst_ext(ins->buffer, ins, - ins->dst[0].token & (~WINED3DSP_SWIZZLE_MASK | write_mask)); + ins->dst[0].token & (~WINED3DSP_WRITEMASK_ALL | write_mask)); if (!write_mask) continue; } @@ -2008,7 +2008,7 @@ static void shader_glsl_cnd(const struct wined3d_shader_instruction *ins) } } write_mask = shader_glsl_append_dst_ext(ins->buffer, ins, - ins->dst[0].token & (~WINED3DSP_SWIZZLE_MASK | write_mask)); + ins->dst[0].token & (~WINED3DSP_WRITEMASK_ALL | write_mask)); if (!write_mask) continue; shader_glsl_add_src_param(ins, ins->src[0], ins->src_addr[0], cmp_channel, &src0_param);

1 0

Henri Verbeet : wined3d: Pass a pointer to struct wined3d_shader_dst_param to shader_glsl_append_dst_ext ().
by Alexandre Julliard 06 Apr '09

06 Apr '09

Module: wine Branch: master Commit: 72aff27e0e3d35e2e4f2a6261fb072671f408d30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72aff27e0e3d35e2e4f2a6261… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 6 10:10:06 2009 +0200 wined3d: Pass a pointer to struct wined3d_shader_dst_param to shader_glsl_append_dst_ext(). --- dlls/wined3d/glsl_shader.c | 29 ++++++++++++++++------------- 1 files changed, 16 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 9f79950..84d44d9 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1266,17 +1266,17 @@ static DWORD shader_glsl_add_dst_param(const struct wined3d_shader_instruction * /* Append the destination part of the instruction to the buffer, return the effective write mask */ static DWORD shader_glsl_append_dst_ext(SHADER_BUFFER *buffer, - const struct wined3d_shader_instruction *ins, const DWORD param) + const struct wined3d_shader_instruction *ins, const struct wined3d_shader_dst_param *dst) { - glsl_dst_param_t dst_param; + glsl_dst_param_t glsl_dst; DWORD mask; int shift; - mask = shader_glsl_add_dst_param(ins, param, ins->dst[0].addr_token, &dst_param); - - if(mask) { - shift = (param & WINED3DSP_DSTSHIFT_MASK) >> WINED3DSP_DSTSHIFT_SHIFT; - shader_addline(buffer, "%s%s = %s(", dst_param.reg_name, dst_param.mask_str, shift_glsl_tab[shift]); + mask = shader_glsl_add_dst_param(ins, dst->token, dst->addr_token, &glsl_dst); + if (mask) + { + shift = (dst->token & WINED3DSP_DSTSHIFT_MASK) >> WINED3DSP_DSTSHIFT_SHIFT; + shader_addline(buffer, "%s%s = %s(", glsl_dst.reg_name, glsl_dst.mask_str, shift_glsl_tab[shift]); } return mask; @@ -1285,7 +1285,7 @@ static DWORD shader_glsl_append_dst_ext(SHADER_BUFFER *buffer, /* Append the destination part of the instruction to the buffer, return the effective write mask */ static DWORD shader_glsl_append_dst(SHADER_BUFFER *buffer, const struct wined3d_shader_instruction *ins) { - return shader_glsl_append_dst_ext(buffer, ins, ins->dst[0].token); + return shader_glsl_append_dst_ext(buffer, ins, &ins->dst[0]); } /** Process GLSL instruction modifiers */ @@ -1946,8 +1946,9 @@ static void shader_glsl_cmp(const struct wined3d_shader_instruction *ins) shader_addline(ins->buffer, "tmp0%s = (", mask_char); temp_destination = TRUE; } else { - write_mask = shader_glsl_append_dst_ext(ins->buffer, ins, - ins->dst[0].token & (~WINED3DSP_WRITEMASK_ALL | write_mask)); + struct wined3d_shader_dst_param dst = ins->dst[0]; + dst.token &= ~WINED3DSP_WRITEMASK_ALL | write_mask; + write_mask = shader_glsl_append_dst_ext(ins->buffer, ins, &dst); if (!write_mask) continue; } @@ -1961,7 +1962,7 @@ static void shader_glsl_cmp(const struct wined3d_shader_instruction *ins) if(temp_destination) { shader_glsl_get_write_mask(ins->dst[0].token, mask_char); - shader_glsl_append_dst_ext(ins->buffer, ins, ins->dst[0].token); + shader_glsl_append_dst(ins->buffer, ins); shader_addline(ins->buffer, "tmp0%s);\n", mask_char); } } @@ -1998,6 +1999,7 @@ static void shader_glsl_cnd(const struct wined3d_shader_instruction *ins) } /* Cycle through all source0 channels */ for (i=0; i<4; i++) { + struct wined3d_shader_dst_param dst; write_mask = 0; /* Find the destination channels which use the current source0 channel */ for (j=0; j<4; j++) { @@ -2007,8 +2009,9 @@ static void shader_glsl_cnd(const struct wined3d_shader_instruction *ins) cmp_channel = WINED3DSP_WRITEMASK_0 << j; } } - write_mask = shader_glsl_append_dst_ext(ins->buffer, ins, - ins->dst[0].token & (~WINED3DSP_WRITEMASK_ALL | write_mask)); + dst = ins->dst[0]; + dst.token &= ~WINED3DSP_WRITEMASK_ALL | write_mask; + write_mask = shader_glsl_append_dst_ext(ins->buffer, ins, &dst); if (!write_mask) continue; shader_glsl_add_src_param(ins, ins->src[0], ins->src_addr[0], cmp_channel, &src0_param);

1 0

Henri Verbeet : wined3d: Pass a pointer to struct wined3d_shader_dst_param to shader_glsl_add_dst_param ().
by Alexandre Julliard 06 Apr '09

06 Apr '09

Module: wine Branch: master Commit: decc1cec9dcb6b3dbb94bf21ec11844d594d1ed2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=decc1cec9dcb6b3dbb94bf21e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 6 10:10:06 2009 +0200 wined3d: Pass a pointer to struct wined3d_shader_dst_param to shader_glsl_add_dst_param(). --- dlls/wined3d/glsl_shader.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 84d44d9..db9c702 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1253,15 +1253,15 @@ static void shader_glsl_add_src_param(const struct wined3d_shader_instruction *i * Also, return the actual register name and swizzle in case the * caller needs this information as well. */ static DWORD shader_glsl_add_dst_param(const struct wined3d_shader_instruction *ins, - const DWORD param, const DWORD addr_token, glsl_dst_param_t *dst_param) + const struct wined3d_shader_dst_param *wined3d_dst, glsl_dst_param_t *glsl_dst) { BOOL is_color = FALSE; - dst_param->mask_str[0] = '\0'; - dst_param->reg_name[0] = '\0'; + glsl_dst->mask_str[0] = '\0'; + glsl_dst->reg_name[0] = '\0'; - shader_glsl_get_register_name(param, addr_token, dst_param->reg_name, &is_color, ins); - return shader_glsl_get_write_mask(param, dst_param->mask_str); + shader_glsl_get_register_name(wined3d_dst->token, wined3d_dst->addr_token, glsl_dst->reg_name, &is_color, ins); + return shader_glsl_get_write_mask(wined3d_dst->token, glsl_dst->mask_str); } /* Append the destination part of the instruction to the buffer, return the effective write mask */ @@ -1272,7 +1272,7 @@ static DWORD shader_glsl_append_dst_ext(SHADER_BUFFER *buffer, DWORD mask; int shift; - mask = shader_glsl_add_dst_param(ins, dst->token, dst->addr_token, &glsl_dst); + mask = shader_glsl_add_dst_param(ins, dst, &glsl_dst); if (mask) { shift = (dst->token & WINED3DSP_DSTSHIFT_MASK) >> WINED3DSP_DSTSHIFT_SHIFT; @@ -1299,7 +1299,7 @@ void shader_glsl_add_instruction_modifiers(const struct wined3d_shader_instructi mask = ins->dst[0].token & WINED3DSP_DSTMOD_MASK; if (!mask) return; - shader_glsl_add_dst_param(ins, ins->dst[0].token, 0, &dst_param); + shader_glsl_add_dst_param(ins, &ins->dst[0], &dst_param); if (mask & WINED3DSPDM_SATURATE) { @@ -2624,7 +2624,7 @@ static void pshader_glsl_texdepth(const struct wined3d_shader_instruction *ins) { glsl_dst_param_t dst_param; - shader_glsl_add_dst_param(ins, ins->dst[0].token, 0, &dst_param); + shader_glsl_add_dst_param(ins, &ins->dst[0], &dst_param); /* Tests show that texdepth never returns anything below 0.0, and that r5.y is clamped to 1.0. * Negative input is accepted, -0.25 / -0.5 returns 0.5. GL should clamp gl_FragDepth to [0;1], but @@ -2863,7 +2863,7 @@ static void pshader_glsl_texbem(const struct wined3d_shader_instruction *ins) glsl_dst_param_t dst_param; shader_glsl_add_src_param(ins, ins->src[0], ins->src_addr[0], WINED3DSP_WRITEMASK_2, &luminance_param); - shader_glsl_add_dst_param(ins, ins->dst[0].token, ins->dst[0].addr_token, &dst_param); + shader_glsl_add_dst_param(ins, &ins->dst[0], &dst_param); shader_addline(ins->buffer, "%s%s *= (%s * luminancescale%d + luminanceoffset%d);\n", dst_param.reg_name, dst_param.mask_str, @@ -2942,7 +2942,7 @@ static void pshader_glsl_texkill(const struct wined3d_shader_instruction *ins) glsl_dst_param_t dst_param; /* The argument is a destination parameter, and no writemasks are allowed */ - shader_glsl_add_dst_param(ins, ins->dst[0].token, 0, &dst_param); + shader_glsl_add_dst_param(ins, &ins->dst[0], &dst_param); if ((ins->reg_maps->shader_version >= WINED3DPS_VERSION(2,0))) { /* 2.0 shaders compare all 4 components in texkill */

1 0

Henri Verbeet : wined3d: Store the destination modifiers in struct wined3d_shader_dst_param.
by Alexandre Julliard 06 Apr '09

06 Apr '09

Module: wine Branch: master Commit: f0de1622d046ff0dcce8aedb6d797e673aa3c025 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0de1622d046ff0dcce8aedb6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 6 10:10:08 2009 +0200 wined3d: Store the destination modifiers in struct wined3d_shader_dst_param. --- dlls/wined3d/arb_program_shader.c | 26 ++++++++++++++------------ dlls/wined3d/baseshader.c | 1 + dlls/wined3d/glsl_shader.c | 13 +++++++------ dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 23 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index bca567d..794f1e3 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -814,7 +814,7 @@ static void pshader_hw_cnd(const struct wined3d_shader_instruction *ins) char dst_wmask[20]; char dst_name[50]; char src_name[3][50]; - BOOL sat = (ins->dst[0].token & WINED3DSP_DSTMOD_MASK) & WINED3DSPDM_SATURATE; + BOOL sat = ins->dst[0].modifiers & WINED3DSPDM_SATURATE; DWORD shift = (ins->dst[0].token & WINED3DSP_DSTSHIFT_MASK) >> WINED3DSP_DSTSHIFT_SHIFT; /* FIXME: support output modifiers */ @@ -848,7 +848,7 @@ static void pshader_hw_cmp(const struct wined3d_shader_instruction *ins) char dst_name[50]; char src_name[3][50]; DWORD shift = (ins->dst[0].token & WINED3DSP_DSTSHIFT_MASK) >> WINED3DSP_DSTSHIFT_SHIFT; - BOOL sat = (ins->dst[0].token & WINED3DSP_DSTMOD_MASK) & WINED3DSPDM_SATURATE; + BOOL sat = ins->dst[0].modifiers & WINED3DSPDM_SATURATE; /* FIXME: support output modifiers */ @@ -877,7 +877,7 @@ static void pshader_hw_dp2add(const struct wined3d_shader_instruction *ins) char dst_name[50]; char src_name[3][50]; DWORD shift = (ins->dst[0].token & WINED3DSP_DSTSHIFT_MASK) >> WINED3DSP_DSTSHIFT_SHIFT; - BOOL sat = (ins->dst[0].token & WINED3DSP_DSTMOD_MASK) & WINED3DSPDM_SATURATE; + BOOL sat = ins->dst[0].modifiers & WINED3DSPDM_SATURATE; pshader_get_register_name(ins->shader, ins->dst[0].token, dst_name); shader_arb_get_write_mask(ins, ins->dst[0].token, dst_wmask); @@ -900,7 +900,6 @@ static void pshader_hw_dp2add(const struct wined3d_shader_instruction *ins) static void shader_hw_map2gl(const struct wined3d_shader_instruction *ins) { SHADER_BUFFER *buffer = ins->buffer; - DWORD dst = ins->dst[0].token; const DWORD *src = ins->src; const char *instruction; char arguments[256]; @@ -939,6 +938,7 @@ static void shader_hw_map2gl(const struct wined3d_shader_instruction *ins) if (shader_is_pshader_version(ins->reg_maps->shader_version)) { /* Output token related */ + const struct wined3d_shader_dst_param *dst; char output_rname[256]; char output_wmask[20]; char operands[4][100]; @@ -953,11 +953,12 @@ static void shader_hw_map2gl(const struct wined3d_shader_instruction *ins) ERR("Opcode \"%#x\" has no parameters\n", ins->handler_idx); return; } + dst = &ins->dst[0]; /* Process modifiers */ - if (dst & WINED3DSP_DSTMOD_MASK) + if (dst->modifiers) { - DWORD mask = dst & WINED3DSP_DSTMOD_MASK; + DWORD mask = dst->modifiers; saturate = mask & WINED3DSPDM_SATURATE; centroid = mask & WINED3DSPDM_MSAMPCENTROID; @@ -969,7 +970,7 @@ static void shader_hw_map2gl(const struct wined3d_shader_instruction *ins) if (centroid) FIXME("Unhandled modifier(%#x)\n", mask >> WINED3DSP_DSTMOD_SHIFT); } - shift = (dst & WINED3DSP_DSTSHIFT_MASK) >> WINED3DSP_DSTSHIFT_SHIFT; + shift = (dst->token & WINED3DSP_DSTSHIFT_MASK) >> WINED3DSP_DSTSHIFT_SHIFT; modifier = (saturate && !shift) ? "_SAT" : ""; /* Generate input register names (with modifiers) */ @@ -979,9 +980,9 @@ static void shader_hw_map2gl(const struct wined3d_shader_instruction *ins) } /* Handle output register */ - pshader_get_register_name(ins->shader, dst, output_rname); + pshader_get_register_name(ins->shader, dst->token, output_rname); strcpy(operands[0], output_rname); - shader_arb_get_write_mask(ins, dst, output_wmask); + shader_arb_get_write_mask(ins, dst->token, output_wmask); strcat(operands[0], output_wmask); arguments[0] = '\0'; @@ -1001,7 +1002,7 @@ static void shader_hw_map2gl(const struct wined3d_shader_instruction *ins) arguments[0] = '\0'; if (ins->dst_count) { - vshader_program_add_param(ins, dst, FALSE, arguments); + vshader_program_add_param(ins, ins->dst[0].token, FALSE, arguments); for (i = 0; i < ins->src_count; ++i) { strcat(arguments, ","); @@ -1585,6 +1586,7 @@ static void shader_hw_mnxn(const struct wined3d_shader_instruction *ins) for (i = 0; i < nComponents; i++) { tmp_dst.register_idx = ins->dst[0].register_idx; + tmp_dst.modifiers = ins->dst[0].modifiers; tmp_dst.token = ((ins->dst[0].token) & ~WINED3DSP_WRITEMASK_ALL) | (WINED3DSP_WRITEMASK_0 << i); tmp_ins.src[1] = ins->src[1]+i; shader_hw_map2gl(&tmp_ins); @@ -1631,7 +1633,7 @@ static void shader_hw_nrm(const struct wined3d_shader_instruction *ins) char src_name[50]; char dst_wmask[20]; DWORD shift = (ins->dst[0].token & WINED3DSP_DSTSHIFT_MASK) >> WINED3DSP_DSTSHIFT_SHIFT; - BOOL sat = (ins->dst[0].token & WINED3DSP_DSTMOD_MASK) & WINED3DSPDM_SATURATE; + BOOL sat = ins->dst[0].modifiers & WINED3DSPDM_SATURATE; pshader_get_register_name(ins->shader, ins->dst[0].token, dst_name); shader_arb_get_write_mask(ins, ins->dst[0].token, dst_wmask); @@ -1658,7 +1660,7 @@ static void shader_hw_sincos(const struct wined3d_shader_instruction *ins) char src_name[50]; char dst_wmask[20]; DWORD shift = (ins->dst[0].token & WINED3DSP_DSTSHIFT_MASK) >> WINED3DSP_DSTSHIFT_SHIFT; - BOOL sat = (ins->dst[0].token & WINED3DSP_DSTMOD_MASK) & WINED3DSPDM_SATURATE; + BOOL sat = ins->dst[0].modifiers & WINED3DSPDM_SATURATE; pshader_get_register_name(ins->shader, ins->dst[0].token, dst_name); shader_arb_get_write_mask(ins, ins->dst[0].token, dst_wmask); diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 39120d4..ed6c069 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -851,6 +851,7 @@ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER* buffer, dst_param.addr_token = 0; pToken += shader_get_param(pToken, shader_version, &dst_param.token, &dst_param.addr_token); dst_param.register_idx = dst_param.token & WINED3DSP_REGNUM_MASK; + dst_param.modifiers = dst_param.token & WINED3DSP_DSTMOD_MASK; } /* Predication token */ diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index db9c702..e18224d 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1292,28 +1292,28 @@ static DWORD shader_glsl_append_dst(SHADER_BUFFER *buffer, const struct wined3d_ void shader_glsl_add_instruction_modifiers(const struct wined3d_shader_instruction *ins) { glsl_dst_param_t dst_param; - DWORD mask; + DWORD modifiers; if (!ins->dst_count) return; - mask = ins->dst[0].token & WINED3DSP_DSTMOD_MASK; - if (!mask) return; + modifiers = ins->dst[0].modifiers; + if (!modifiers) return; shader_glsl_add_dst_param(ins, &ins->dst[0], &dst_param); - if (mask & WINED3DSPDM_SATURATE) + if (modifiers & WINED3DSPDM_SATURATE) { /* _SAT means to clamp the value of the register to between 0 and 1 */ shader_addline(ins->buffer, "%s%s = clamp(%s%s, 0.0, 1.0);\n", dst_param.reg_name, dst_param.mask_str, dst_param.reg_name, dst_param.mask_str); } - if (mask & WINED3DSPDM_MSAMPCENTROID) + if (modifiers & WINED3DSPDM_MSAMPCENTROID) { FIXME("_centroid modifier not handled\n"); } - if (mask & WINED3DSPDM_PARTIALPRECISION) + if (modifiers & WINED3DSPDM_PARTIALPRECISION) { /* MSDN says this modifier can be safely ignored, so that's what we'll do. */ } @@ -2090,6 +2090,7 @@ static void shader_glsl_mnxn(const struct wined3d_shader_instruction *ins) for (i = 0; i < nComponents; ++i) { tmp_dst.register_idx = ins->dst[0].register_idx; + tmp_dst.modifiers = ins->dst[0].modifiers; tmp_dst.token = ((ins->dst[0].token) & ~WINED3DSP_WRITEMASK_ALL) | (WINED3DSP_WRITEMASK_0 << i); tmp_ins.src[1] = ins->src[1] + i; shader_glsl_dot(&tmp_ins); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9319aa9..ff03d3d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -453,6 +453,7 @@ typedef struct SHADER_OPCODE struct wined3d_shader_dst_param { UINT register_idx; + DWORD modifiers; DWORD token; DWORD addr_token; };

1 0