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

Alexandre Julliard : gdi32: Move the whole DC restoring functionality into set_dc_state, and rename it to restore_dc_state.
by Alexandre Julliard 08 Apr '09

08 Apr '09

Module: wine Branch: master Commit: d4c54be2722d9717e9c12ce38f837ede2e08133f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4c54be2722d9717e9c12ce38… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 7 20:28:08 2009 +0200 gdi32: Move the whole DC restoring functionality into set_dc_state, and rename it to restore_dc_state. --- dlls/gdi32/dc.c | 82 ++++++++++++++++++++++++++------------------- dlls/gdi32/gdi_private.h | 2 +- 2 files changed, 48 insertions(+), 36 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 9f0c9f6..ae58479 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -443,27 +443,45 @@ INT save_dc_state( HDC hdc ) /*********************************************************************** - * set_dc_state (Not a Windows API) + * restore_dc_state */ -void set_dc_state( HDC hdc, HDC hdcs ) +BOOL restore_dc_state( HDC hdc, INT level ) { + HDC hdcs, first_dcs; DC *dc, *dcs; + INT save_level; + + if (!(dc = get_dc_ptr( hdc ))) return FALSE; + + /* find the state level to restore */ + + if (level < 0) level = dc->saveLevel + level + 1; + first_dcs = dc->saved_dc; + for (hdcs = first_dcs, save_level = dc->saveLevel; save_level > level; save_level--) + { + if (!(dcs = get_dc_ptr( hdcs ))) + { + release_dc_ptr( dc ); + return FALSE; + } + hdcs = dcs->saved_dc; + release_dc_ptr( dcs ); + } + + /* restore the state */ - if (!(dc = get_dc_ptr( hdc ))) return; if (!(dcs = get_dc_ptr( hdcs ))) { release_dc_ptr( dc ); - return; + return FALSE; } - if (!(dcs->flags & DC_SAVED)) + if (!PATH_AssignGdiPath( &dc->path, &dcs->path )) { - release_dc_ptr( dc ); release_dc_ptr( dcs ); - return; + release_dc_ptr( dc ); + return FALSE; } - TRACE("%p %p\n", hdc, hdcs ); - update_dc( dc ); dc->flags = dcs->flags & ~DC_SAVED; dc->layout = dcs->layout; dc->hDevice = dcs->hDevice; @@ -531,8 +549,24 @@ void set_dc_state( HDC hdc, HDC hdcs ) SetBkColor( hdc, dcs->backgroundColor); SetTextColor( hdc, dcs->textColor); GDISelectPalette( hdc, dcs->hPalette, FALSE ); - release_dc_ptr( dc ); + + dc->saved_dc = dcs->saved_dc; + dcs->saved_dc = 0; + dc->saveLevel = save_level - 1; + release_dc_ptr( dcs ); + + /* now destroy all the saved DCs */ + + while (first_dcs) + { + if (!(dcs = get_dc_ptr( first_dcs ))) break; + hdcs = dcs->saved_dc; + free_dc_ptr( dcs ); + first_dcs = hdcs; + } + release_dc_ptr( dc ); + return TRUE; } @@ -567,11 +601,12 @@ INT WINAPI SaveDC( HDC hdc ) */ BOOL WINAPI RestoreDC( HDC hdc, INT level ) { - DC * dc, * dcs; + DC *dc; BOOL success; TRACE("%p %d\n", hdc, level ); if (!(dc = get_dc_ptr( hdc ))) return FALSE; + update_dc( dc ); if(abs(level) > dc->saveLevel || level == 0) { @@ -579,8 +614,6 @@ BOOL WINAPI RestoreDC( HDC hdc, INT level ) return FALSE; } - update_dc( dc ); - if(dc->funcs->pRestoreDC) { success = dc->funcs->pRestoreDC( dc->physDev, level ); @@ -591,28 +624,7 @@ BOOL WINAPI RestoreDC( HDC hdc, INT level ) return success; } - if (level < 0) level = dc->saveLevel + level + 1; - success=TRUE; - while (dc->saveLevel >= level) - { - HDC hdcs = dc->saved_dc; - if (!(dcs = get_dc_ptr( hdcs ))) - { - success = FALSE; - break; - } - dc->saved_dc = dcs->saved_dc; - dcs->saved_dc = 0; - if (--dc->saveLevel < level) - { - set_dc_state( hdc, hdcs ); - if (!PATH_AssignGdiPath( &dc->path, &dcs->path )) - /* FIXME: This might not be quite right, since we're - * returning FALSE but still destroying the saved DC state */ - success=FALSE; - } - free_dc_ptr( dcs ); - } + success = restore_dc_state( hdc, level ); release_dc_ptr( dc ); return success; } diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index c585eaf..da66ade 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -384,7 +384,7 @@ extern void update_dc( DC *dc ) DECLSPEC_HIDDEN; extern void DC_InitDC( DC * dc ) DECLSPEC_HIDDEN; extern void DC_UpdateXforms( DC * dc ) DECLSPEC_HIDDEN; extern INT save_dc_state( HDC hdc ) DECLSPEC_HIDDEN; -extern void set_dc_state( HDC hdc, HDC hdcs ) DECLSPEC_HIDDEN; +extern BOOL restore_dc_state( HDC hdc, INT level ) DECLSPEC_HIDDEN; /* dib.c */ extern int DIB_GetDIBWidthBytes( int width, int depth ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : gdi32: Completely implement SaveDC in the driver, having it call save_dc_state if necessary.
by Alexandre Julliard 08 Apr '09

08 Apr '09

Module: wine Branch: master Commit: bbb1626bf8629e20778b514c2aed26a7a341f553 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbb1626bf8629e20778b514c2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 7 20:32:58 2009 +0200 gdi32: Completely implement SaveDC in the driver, having it call save_dc_state if necessary. --- dlls/gdi32/dc.c | 12 +++--------- dlls/gdi32/enhmfdrv/dc.c | 13 ++++++++++--- dlls/gdi32/tests/metafile.c | 26 ++++++++++++++++++++------ 3 files changed, 33 insertions(+), 18 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index ae58479..4694c3e 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -578,19 +578,13 @@ INT WINAPI SaveDC( HDC hdc ) DC * dc; INT ret; - dc = get_dc_ptr( hdc ); - if (!dc) return 0; + if (!(dc = get_dc_ptr( hdc ))) return 0; if(dc->funcs->pSaveDC) - { ret = dc->funcs->pSaveDC( dc->physDev ); - if(ret) - ret = ++dc->saveLevel; - release_dc_ptr( dc ); - return ret; - } + else + ret = save_dc_state( hdc ); - ret = save_dc_state( hdc ); release_dc_ptr( dc ); return ret; } diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index f08b17d..bd5dbd5 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -25,10 +25,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(enhmetafile); INT CDECL EMFDRV_SaveDC( PHYSDEV dev ) { + EMFDRV_PDEVICE* physDev = (EMFDRV_PDEVICE*)dev; + INT ret = save_dc_state( physDev->hdc ); EMRSAVEDC emr; - emr.emr.iType = EMR_SAVEDC; - emr.emr.nSize = sizeof(emr); - return EMFDRV_WriteRecord( dev, &emr.emr ); + + if (ret) + { + emr.emr.iType = EMR_SAVEDC; + emr.emr.nSize = sizeof(emr); + EMFDRV_WriteRecord( dev, &emr.emr ); + } + return ret; } BOOL CDECL EMFDRV_RestoreDC( PHYSDEV dev, INT level ) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 63c2cc4..2524af1 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -643,6 +643,11 @@ static void test_SaveDC(void) todo_wine ok(hFontOld == hFontCheck && hFontCheck != hFont && hFontCheck != hFont2, "Font not reverted with DC Restore\n"); + ret = RestoreDC(hdcMetafile, -20); + ok(!ret, "ret = %d\n", ret); + ret = RestoreDC(hdcMetafile, 20); + ok(!ret, "ret = %d\n", ret); + hMetafile = CloseEnhMetaFile(hdcMetafile); ok(hMetafile != 0, "CloseEnhMetaFile error %d\n", GetLastError()); @@ -702,7 +707,7 @@ static void test_mf_SaveDC(void) SetPixelV(hdcMetafile, 50, 50, 0); ret = SaveDC(hdcMetafile); - todo_wine ok(ret == 1, "ret = %d\n", ret); + ok(ret == 1, "ret = %d\n", ret); SetWindowOrgEx(hdcMetafile, -2, -2, NULL); SetViewportOrgEx(hdcMetafile, 20, 20, NULL); @@ -715,7 +720,7 @@ static void test_mf_SaveDC(void) SetBkColor( hdcMetafile, 0 ); ret = SaveDC(hdcMetafile); - todo_wine ok(ret == 1, "ret = %d\n", ret); + ok(ret == 1, "ret = %d\n", ret); SetWindowOrgEx(hdcMetafile, -3, -3, NULL); SetViewportOrgEx(hdcMetafile, 30, 30, NULL); @@ -731,10 +736,10 @@ static void test_mf_SaveDC(void) SetPixelV(hdcMetafile, 50, 50, 0); ret = RestoreDC(hdcMetafile, -1); - ok(ret, "ret = %d\n", ret); + todo_wine ok(ret, "ret = %d\n", ret); ret = SaveDC(hdcMetafile); - todo_wine ok(ret == 1, "ret = %d\n", ret); + ok(ret == 1, "ret = %d\n", ret); ret = RestoreDC(hdcMetafile, 1); todo_wine ok(ret, "ret = %d\n", ret); @@ -748,10 +753,10 @@ static void test_mf_SaveDC(void) SetPixelV(hdcMetafile, 50, 50, 0); ret = SaveDC(hdcMetafile); - todo_wine ok(ret == 1, "ret = %d\n", ret); + ok(ret == 1, "ret = %d\n", ret); ret = SaveDC(hdcMetafile); - todo_wine ok(ret == 1, "ret = %d\n", ret); + ok(ret == 1, "ret = %d\n", ret); memset(&orig_lf, 0, sizeof(orig_lf)); orig_lf.lfCharSet = ANSI_CHARSET; @@ -774,10 +779,19 @@ static void test_mf_SaveDC(void) SetPixelV(hdcMetafile, 50, 50, 0); ret = RestoreDC(hdcMetafile, 1); + todo_wine ok(ret, "ret = %d\n", ret); hFontCheck = SelectObject(hdcMetafile, hFontOld); ok(hFontOld != hFontCheck && hFontCheck == hFont2, "Font incorrectly reverted with DC Restore\n"); + /* restore level is ignored */ + ret = RestoreDC(hdcMetafile, -20); + todo_wine ok(ret, "ret = %d\n", ret); + ret = RestoreDC(hdcMetafile, 20); + todo_wine ok(ret, "ret = %d\n", ret); + ret = RestoreDC(hdcMetafile, 0); + todo_wine ok(ret, "ret = %d\n", ret); + hMetafile = CloseMetaFile(hdcMetafile); ok(hMetafile != 0, "CloseEnhMetaFile error %d\n", GetLastError());

1 0

Alexandre Julliard : gdi32: Allow the visible region to be zero since this is the case for metafiles.
by Alexandre Julliard 08 Apr '09

08 Apr '09

Module: wine Branch: master Commit: e2f888a617f6344d9676694603edcfd173fbb9c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2f888a617f6344d967669460… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 7 20:41:30 2009 +0200 gdi32: Allow the visible region to be zero since this is the case for metafiles. --- dlls/gdi32/clipping.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/clipping.c b/dlls/gdi32/clipping.c index 8e80207..4e294b6 100644 --- a/dlls/gdi32/clipping.c +++ b/dlls/gdi32/clipping.c @@ -51,12 +51,6 @@ void CLIPPING_UpdateGCRegion( DC * dc ) { HRGN clip_rgn; - if (!dc->hVisRgn) - { - ERR("hVisRgn is zero. Please report this.\n" ); - exit(1); - } - /* update the intersection of meta and clip regions */ if (dc->hMetaRgn && dc->hClipRgn) {

1 0

Alexandre Julliard : gdi32: Completely implement RestoreDC in the driver, having it call restore_dc_state if necessary.
by Alexandre Julliard 08 Apr '09

08 Apr '09

Module: wine Branch: master Commit: eceed527f6dc7cdb34c4669358f9b004b3daf91a URL: http://source.winehq.org/git/wine.git/?a=commit;h=eceed527f6dc7cdb34c466935… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 7 20:41:41 2009 +0200 gdi32: Completely implement RestoreDC in the driver, having it call restore_dc_state if necessary. --- dlls/gdi32/dc.c | 21 +++++++-------------- dlls/gdi32/enhmfdrv/dc.c | 10 +++++++--- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 + dlls/gdi32/enhmfdrv/graphics.c | 6 ++++++ dlls/gdi32/enhmfdrv/init.c | 1 + dlls/gdi32/enhmfdrv/objects.c | 8 ++++++++ dlls/gdi32/mfdrv/dc.c | 1 - dlls/gdi32/tests/metafile.c | 32 ++++++++++++++++---------------- 8 files changed, 46 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eceed527f6dc7cdb34c46…

1 0

Alexandre Julliard : gdi32: Fix SetEnhMetaFileBits last error handling.
by Alexandre Julliard 08 Apr '09

08 Apr '09

Module: wine Branch: master Commit: 55fc90220fea198ff9a62154e8a411b6de78e928 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55fc90220fea198ff9a62154e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 7 20:44:12 2009 +0200 gdi32: Fix SetEnhMetaFileBits last error handling. --- dlls/gdi32/enhmetafile.c | 8 ++++++-- dlls/gdi32/tests/metafile.c | 2 -- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index 9ca8517..25b3389 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -252,12 +252,16 @@ HENHMETAFILE EMF_Create_HENHMETAFILE(ENHMETAHEADER *emh, BOOL on_disk ) HENHMETAFILE hmf; ENHMETAFILEOBJ *metaObj; - if (emh->iType != EMR_HEADER || emh->dSignature != ENHMETA_SIGNATURE || + if (emh->iType != EMR_HEADER) + { + SetLastError(ERROR_INVALID_DATA); + return 0; + } + if (emh->dSignature != ENHMETA_SIGNATURE || (emh->nBytes & 3)) /* refuse to load unaligned EMF as Windows does */ { WARN("Invalid emf header type 0x%08x sig 0x%08x.\n", emh->iType, emh->dSignature); - SetLastError(ERROR_INVALID_DATA); return 0; } diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 233d1e9..077977e 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -2349,7 +2349,6 @@ static void test_SetEnhMetaFileBits(void) ok(!hemf || broken(hemf != NULL), /* Win9x, WinMe */ "SetEnhMetaFileBits should fail\n"); - todo_wine ok(GetLastError() == 0xdeadbeef, "Expected deadbeef, got %u\n", GetLastError()); DeleteEnhMetaFile(hemf); @@ -2360,7 +2359,6 @@ static void test_SetEnhMetaFileBits(void) ok(!hemf || broken(hemf != NULL), /* Win9x, WinMe */ "SetEnhMetaFileBits should fail\n"); - todo_wine ok(GetLastError() == 0xdeadbeef, "Expected deadbeef, got %u\n", GetLastError()); DeleteEnhMetaFile(hemf); }

1 0

Stefan Dösinger : d3d8, d3d9: Don' t rely on the wined3d buffer type.
by Alexandre Julliard 08 Apr '09

08 Apr '09

Module: wine Branch: master Commit: bc07ad057921745c0b064ee6eaf06e2b9174c617 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc07ad057921745c0b064ee6e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Apr 6 16:44:00 2009 +0200 d3d8, d3d9: Don't rely on the wined3d buffer type. --- dlls/d3d8/directx.c | 14 +++++++++++++- dlls/d3d8/indexbuffer.c | 13 ++++++------- dlls/d3d8/vertexbuffer.c | 13 ++++++------- dlls/d3d9/device.c | 24 +++++++++++++----------- dlls/d3d9/directx.c | 14 +++++++++++++- dlls/d3d9/vertexbuffer.c | 14 +++++++------- dlls/wined3d/device.c | 29 ++++++++++++----------------- dlls/wined3d/directx.c | 2 +- dlls/wined3d/utils.c | 2 -- 9 files changed, 71 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bc07ad057921745c0b064…

1 0

Nicolas Le Cam : shell32/tests: Fix wrong comment and update test accordingly.
by Alexandre Julliard 07 Apr '09

07 Apr '09

Module: wine Branch: master Commit: 4ea0b382657192c2f72a2101cc0f53cadd1258a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ea0b382657192c2f72a2101c… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Mon Apr 6 19:56:45 2009 +0200 shell32/tests: Fix wrong comment and update test accordingly. --- dlls/shell32/tests/shlfolder.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index de28267..5492b84 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -769,10 +769,6 @@ static void test_GetAttributesOf(void) /* Windows sets the SFGAO_CANLINK flag, when MyComputer is queried via the Desktop * folder object. It doesn't do this, if MyComputer is queried directly (see below). - * SFGAO_CANLINK is the same as DROPEFFECT_LINK, which MSDN says means: "Drag source - * should create a link to the original data". You can't create links on MyComputer on - * Windows, so this flag shouldn't be set. Seems like a bug in Windows. As long as nobody - * depends on this bug, we probably shouldn't imitate it. */ dwFlags = 0xffffffff; hr = IShellFolder_GetAttributesOf(psfDesktop, 1, (LPCITEMIDLIST*)&pidlMyComputer, &dwFlags); @@ -780,9 +776,10 @@ static void test_GetAttributesOf(void) for (i = 0, foundFlagsMatch = FALSE; !foundFlagsMatch && i < sizeof(myComputerFlags) / sizeof(myComputerFlags[0]); i++) { - if (myComputerFlags[i] == (dwFlags & ~(DWORD)SFGAO_CANLINK)) + if ((myComputerFlags[i] | SFGAO_CANLINK) == dwFlags) foundFlagsMatch = TRUE; } + todo_wine ok (foundFlagsMatch, "Wrong MyComputer attributes: %08x\n", dwFlags); hr = IShellFolder_BindToObject(psfDesktop, pidlMyComputer, NULL, &IID_IShellFolder, (LPVOID*)&psfMyComputer);

1 0

Henri Verbeet : wined3d: Explicitly pass register type and index to shader_is_scalar().
by Alexandre Julliard 07 Apr '09

07 Apr '09

Module: wine Branch: master Commit: f7f61a58f45e362a63f5a08fc65f9cad093d4584 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7f61a58f45e362a63f5a08fc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 7 11:09:11 2009 +0200 wined3d: Explicitly pass register type and index to shader_is_scalar(). --- dlls/wined3d/glsl_shader.c | 8 +++++--- dlls/wined3d/wined3d_private.h | 19 ++++++++----------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 7c0ea51..e24b951 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1184,7 +1184,8 @@ static DWORD shader_glsl_get_write_mask(const DWORD param, char *write_mask) { char *ptr = write_mask; DWORD mask = param & WINED3DSP_WRITEMASK_ALL; - if (shader_is_scalar(param)) { + if (shader_is_scalar(shader_get_regtype(param), param & WINED3DSP_REGNUM_MASK)) + { mask = WINED3DSP_WRITEMASK_0; } else { *ptr++ = '.'; @@ -1218,7 +1219,8 @@ static void shader_glsl_get_swizzle(const DWORD param, BOOL fixup, DWORD mask, c const char *swizzle_chars = fixup ? "zyxw" : "xyzw"; char *ptr = swizzle_str; - if (!shader_is_scalar(param)) { + if (!shader_is_scalar(shader_get_regtype(param), param & WINED3DSP_REGNUM_MASK)) + { *ptr++ = '.'; /* swizzle bits fields: wwzzyyxx */ if (mask & WINED3DSP_WRITEMASK_0) *ptr++ = swizzle_chars[swizzle & 0x03]; @@ -1900,7 +1902,7 @@ static void shader_glsl_cmp(const struct wined3d_shader_instruction *ins) char mask_char[6]; BOOL temp_destination = FALSE; - if (shader_is_scalar(ins->src[0])) + if (shader_is_scalar(shader_get_regtype(ins->src[0]), ins->src[0] & WINED3DSP_REGNUM_MASK)) { write_mask = shader_glsl_append_dst(ins->buffer, ins); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ccc681f..070a590 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2386,16 +2386,13 @@ static inline BOOL shader_is_comment(DWORD token) { return WINED3DSIO_COMMENT == (token & WINED3DSI_OPCODE_MASK); } -static inline BOOL shader_is_scalar(DWORD param) { - DWORD reg_type = shader_get_regtype(param); - DWORD reg_num; - - switch (reg_type) { +static inline BOOL shader_is_scalar(WINED3DSHADER_PARAM_REGISTER_TYPE register_type, UINT register_idx) +{ + switch (register_type) + { case WINED3DSPR_RASTOUT: - if ((param & WINED3DSP_REGNUM_MASK) != 0) { - /* oFog & oPts */ - return TRUE; - } + /* oFog & oPts */ + if (register_idx != 0) return TRUE; /* oPos */ return FALSE; @@ -2406,8 +2403,8 @@ static inline BOOL shader_is_scalar(DWORD param) { return TRUE; case WINED3DSPR_MISCTYPE: - reg_num = param & WINED3DSP_REGNUM_MASK; - switch(reg_num) { + switch(register_idx) + { case 0: /* vPos */ return FALSE; case 1: /* vFace */

1 0

Henri Verbeet : wined3d: Store the register type in struct wined3d_shader_dst_param.
by Alexandre Julliard 07 Apr '09

07 Apr '09

Module: wine Branch: master Commit: 0f92bbc6bcda944681397610feaaac37c1b01620 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f92bbc6bcda944681397610f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 7 11:09:11 2009 +0200 wined3d: Store the register type in struct wined3d_shader_dst_param. --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/baseshader.c | 2 ++ dlls/wined3d/glsl_shader.c | 4 ++-- dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 42af755..5d3bd76 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1019,7 +1019,7 @@ static void shader_hw_mov(const struct wined3d_shader_instruction *ins) if ((WINED3DSHADER_VERSION_MAJOR(ins->reg_maps->shader_version) == 1 && !shader_is_pshader_version(ins->reg_maps->shader_version) - && shader_get_regtype(ins->dst[0].token) == WINED3DSPR_ADDR) + && ins->dst[0].register_type == WINED3DSPR_ADDR) || ins->handler_idx == WINED3DSIH_MOVA) { SHADER_BUFFER *buffer = ins->buffer; diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index db3ab1e..57f65a4 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -850,6 +850,8 @@ 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_type = ((dst_param.token & WINED3DSP_REGTYPE_MASK) >> WINED3DSP_REGTYPE_SHIFT) + | ((dst_param.token & WINED3DSP_REGTYPE_MASK2) >> WINED3DSP_REGTYPE_SHIFT2); dst_param.register_idx = dst_param.token & WINED3DSP_REGNUM_MASK; dst_param.write_mask = dst_param.token & WINED3DSP_WRITEMASK_ALL; dst_param.modifiers = dst_param.token & WINED3DSP_DSTMOD_MASK; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e24b951..16f1f57 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1601,7 +1601,7 @@ static void shader_glsl_mov(const struct wined3d_shader_instruction *ins) * shader versions WINED3DSIO_MOVA is used for this. */ if ((WINED3DSHADER_VERSION_MAJOR(ins->reg_maps->shader_version) == 1 && !shader_is_pshader_version(ins->reg_maps->shader_version) - && shader_get_regtype(ins->dst[0].token) == WINED3DSPR_ADDR)) + && ins->dst[0].register_type == WINED3DSPR_ADDR)) { /* This is a simple floor() */ unsigned int mask_size = shader_glsl_get_write_mask_size(write_mask); @@ -1920,7 +1920,7 @@ static void shader_glsl_cmp(const struct wined3d_shader_instruction *ins) DWORD src1regtype = shader_get_regtype(ins->src[1]); DWORD src2regtype = shader_get_regtype(ins->src[2]); DWORD dstreg = ins->dst[0].register_idx; - DWORD dstregtype = shader_get_regtype(ins->dst[0].token); + DWORD dstregtype = ins->dst[0].register_type; /* Cycle through all source0 channels */ for (i=0; i<4; i++) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 070a590..6593908 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -452,6 +452,7 @@ typedef struct SHADER_OPCODE struct wined3d_shader_dst_param { + WINED3DSHADER_PARAM_REGISTER_TYPE register_type; UINT register_idx; DWORD write_mask; DWORD modifiers;

1 0

Henri Verbeet : wined3d: Simplify shader_glsl_color_correction().
by Alexandre Julliard 07 Apr '09

07 Apr '09

Module: wine Branch: master Commit: a374ba54e56a580946834e7d376aa4273f2859ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=a374ba54e56a580946834e7d3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 7 11:09:12 2009 +0200 wined3d: Simplify shader_glsl_color_correction(). --- dlls/wined3d/glsl_shader.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 16f1f57..2080121 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1437,11 +1437,11 @@ static void shader_glsl_append_fixup_arg(char *arguments, const char *reg_name, static void shader_glsl_color_correction(const struct wined3d_shader_instruction *ins, struct color_fixup_desc fixup) { + struct wined3d_shader_dst_param dst; unsigned int mask_size, remaining; glsl_dst_param_t dst_param; char arguments[256]; DWORD mask; - BOOL dummy; mask = 0; if (fixup.x_sign_fixup || fixup.x_source != CHANNEL_SOURCE_X) mask |= WINED3DSP_WRITEMASK_0; @@ -1461,11 +1461,10 @@ static void shader_glsl_color_correction(const struct wined3d_shader_instruction mask_size = shader_glsl_get_write_mask_size(mask); - dst_param.mask_str[0] = '\0'; - shader_glsl_get_write_mask(mask, dst_param.mask_str); - - dst_param.reg_name[0] = '\0'; - shader_glsl_get_register_name(ins->dst[0].token, ins->dst[0].addr_token, dst_param.reg_name, &dummy, ins); + dst = ins->dst[0]; + dst.write_mask = mask; + dst.token = (dst.token & ~WINED3DSP_WRITEMASK_ALL) | dst.write_mask; + shader_glsl_add_dst_param(ins, &dst, &dst_param); arguments[0] = '\0'; remaining = mask_size;

1 0