August 2012 - Wine-Commits - list.winehq.org

Rico Schüller : d3dx9: Avoid TRUE : FALSE conditional expression.
by Alexandre Julliard Aug. 21, 2012

Aug. 21, 2012

Module: wine Branch: master Commit: 77993a610e80ca716df809d0424ac35409df7b05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77993a610e80ca716df809d04… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Aug 21 12:26:45 2012 +0200 d3dx9: Avoid TRUE : FALSE conditional expression. --- dlls/d3dx9_36/effect.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index b54c398..53c94bc 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -903,7 +903,7 @@ inline static FLOAT get_float(D3DXPARAMETER_TYPE type, LPCVOID data) static inline BOOL get_bool(LPCVOID data) { - return (*(DWORD *)data) ? TRUE : FALSE; + return (*(DWORD *)data) != 0; } static void set_number(LPVOID outdata, D3DXPARAMETER_TYPE outtype, LPCVOID indata, D3DXPARAMETER_TYPE intype) @@ -1735,7 +1735,7 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_SetBool(ID3DXBaseEffect *iface, D3DXHA if (param && !param->element_count && param->rows == 1 && param->columns == 1) { /* crop input */ - b = b ? TRUE : FALSE; + b = b != 0; set_number(param->data, param->type, &b, D3DXPT_BOOL); return D3D_OK; }

1 0

Rico Schüller : d3dx9: Remove not needed TRACE.
by Alexandre Julliard Aug. 21, 2012

Aug. 21, 2012

Module: wine Branch: master Commit: becf83fd86aea090916fc596462fb371ff308aca URL: http://source.winehq.org/git/wine.git/?a=commit;h=becf83fd86aea090916fc5964… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Aug 21 12:26:40 2012 +0200 d3dx9: Remove not needed TRACE. --- dlls/d3dx9_36/effect.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 72d44e7..b54c398 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -456,11 +456,7 @@ static struct d3dx_technique *get_technique_by_name(struct ID3DXBaseEffectImpl * { struct d3dx_technique *tech = get_technique_struct(base->technique_handles[i]); - if (!strcmp(tech->name, name)) - { - TRACE("Returning technique %p\n", tech); - return tech; - } + if (!strcmp(tech->name, name)) return tech; } return NULL;

1 0

Alexandre Julliard : gdi32: Add a helper function to find a specific driver in the DC stack.
by Alexandre Julliard Aug. 21, 2012

Aug. 21, 2012

Module: wine Branch: master Commit: 0f5cc668bada79e38e8751bcf796f5b348ed3805 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f5cc668bada79e38e8751bcf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 21 12:54:01 2012 +0200 gdi32: Add a helper function to find a specific driver in the DC stack. --- dlls/gdi32/gdi_private.h | 8 ++++++++ dlls/gdi32/path.c | 9 +++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 44d5798..78ff1a7 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -179,6 +179,14 @@ static inline PHYSDEV pop_dc_driver( DC *dc, PHYSDEV dev ) return dev; } +static inline PHYSDEV find_dc_driver( DC *dc, const struct gdi_dc_funcs *funcs ) +{ + PHYSDEV dev; + + for (dev = dc->physDev; dev; dev = dev->next) if (dev->funcs == funcs) return dev; + return NULL; +} + /* bitmap object */ typedef struct tagBITMAPOBJ diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 0a591af..a58f4e6 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -856,14 +856,15 @@ static BOOL pathdrv_DeleteDC( PHYSDEV dev ) BOOL PATH_SavePath( DC *dst, DC *src ) { - struct path_physdev *physdev; + PHYSDEV dev; if (src->path) { if (!(dst->path = copy_gdi_path( src->path ))) return FALSE; } - else if ((physdev = find_path_physdev( src ))) + else if ((dev = find_dc_driver( src, &path_driver ))) { + struct path_physdev *physdev = get_path_physdev( dev ); if (!(dst->path = copy_gdi_path( physdev->path ))) return FALSE; dst->path_open = TRUE; } @@ -880,7 +881,7 @@ BOOL PATH_RestorePath( DC *dst, DC *src ) if (!physdev) { if (!path_driver.pCreateDC( &dst->physDev, NULL, NULL, NULL, NULL )) return FALSE; - physdev = get_path_physdev( dst->physDev ); + physdev = get_path_physdev( find_dc_driver( dst, &path_driver )); } else free_gdi_path( physdev->path ); @@ -2101,7 +2102,7 @@ BOOL nulldrv_BeginPath( PHYSDEV dev ) free_gdi_path( path ); return FALSE; } - physdev = get_path_physdev( dc->physDev ); + physdev = get_path_physdev( find_dc_driver( dc, &path_driver )); physdev->path = path; if (dc->path) free_gdi_path( dc->path ); dc->path = NULL;

1 0

Nikolay Sivov : wineoss: Fix variable types so pointer is not truncated on 64bit.
by Alexandre Julliard Aug. 21, 2012

Aug. 21, 2012

Module: wine Branch: master Commit: d96cd05efe8bbdd7a97a88fdc4be1139a65760c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d96cd05efe8bbdd7a97a88fdc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 21 07:55:45 2012 +0400 wineoss: Fix variable types so pointer is not truncated on 64bit. --- dlls/wineoss.drv/midi.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 318af94..1c28a76 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -401,10 +401,10 @@ static LRESULT OSS_MidiExit(void) static void MIDI_NotifyClient(UINT wDevID, WORD wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2) { - DWORD dwCallBack; + DWORD_PTR dwCallBack; UINT uFlags; HANDLE hDev; - DWORD dwInstance; + DWORD_PTR dwInstance; TRACE("wDevID = %04X wMsg = %d dwParm1 = %04lX dwParam2 = %04lX\n", wDevID, wMsg, dwParam1, dwParam2);

1 0

Nikolay Sivov : winecoreaudio: Fix variable types so pointer is not truncated on 64bit.
by Alexandre Julliard Aug. 21, 2012

Aug. 21, 2012

Module: wine Branch: master Commit: d05757d29ae76f7b63898738c68b4efbf5e742b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d05757d29ae76f7b63898738c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 21 07:54:50 2012 +0400 winecoreaudio: Fix variable types so pointer is not truncated on 64bit. --- dlls/winecoreaudio.drv/midi.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index e7b78a7..e84e6de 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -225,10 +225,10 @@ LONG CoreAudio_MIDIRelease(void) */ static void MIDI_NotifyClient(UINT wDevID, WORD wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2) { - DWORD dwCallBack; + DWORD_PTR dwCallBack; UINT uFlags; HANDLE hDev; - DWORD dwInstance; + DWORD_PTR dwInstance; TRACE("wDevID=%d wMsg=%d dwParm1=%04lX dwParam2=%04lX\n", wDevID, wMsg, dwParam1, dwParam2);

1 0

Józef Kucia : d3dx9: ID3DXConstantTable:: SetVector shouldn't change the value of matrix constants.
by Alexandre Julliard Aug. 21, 2012

Aug. 21, 2012

Module: wine Branch: master Commit: 2f73fd6ed506111633bb0c3515539ef261233d17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f73fd6ed506111633bb0c351… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Tue Aug 21 14:52:15 2012 +0200 d3dx9: ID3DXConstantTable::SetVector shouldn't change the value of matrix constants. --- dlls/d3dx9_36/shader.c | 3 +++ dlls/d3dx9_36/tests/shader.c | 21 +++++++++++++++++++++ 2 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index faab0a4..d5d5018 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -921,6 +921,9 @@ static HRESULT set_vector_array(ID3DXConstantTable *iface, IDirect3DDevice9 *dev return D3DERR_INVALIDCALL; } + if (desc.Class == D3DXPC_MATRIX_ROWS || desc.Class == D3DXPC_MATRIX_COLUMNS) + return D3D_OK; + switch (desc.RegisterSet) { case D3DXRS_FLOAT4: diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index 916136e..12725f2 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -646,6 +646,27 @@ static void test_setting_basic_table(IDirect3DDevice9 *device) "The variable f was not set correctly by ID3DXConstantTable_SetMatrix, got %f, should be %f\n", out[0], U(S(mvp))._11); + /* Clear registers */ + memset(out, 0, sizeof(out)); + IDirect3DDevice9_SetVertexShaderConstantF(device, 0, out, 4); + + /* SetVector shouldn't change the value of a matrix constant */ + res = ID3DXConstantTable_SetVector(ctable, device, "mvp", &f4); + ok(res == D3D_OK, "ID3DXConstantTable_SetVector failed on variable f: 0x%08x\n", res); + + IDirect3DDevice9_GetVertexShaderConstantF(device, 0, out, 4); + ok(out[0] == 0.0f && out[1] == 0.0f && out[2] == 0.0f && out[3] == 0.0f + && out[4] == 0.0f && out[5] == 0.0f && out[6] == 0.0f && out[7] == 0.0f + && out[8] == 0.0f && out[9] == 0.0f && out[10] == 0.0f && out[11] == 0.0f + && out[12] == 0.0f && out[13] == 0.0f && out[14] == 0.0f && out[15] == 0.0f, + "The variable mvp was not set correctly by ID3DXConstantTable_SetVector, " + "got {%f, %f, %f, %f; %f, %f, %f, %f; %f, %f, %f %f; %f, %f, %f, %f}, " + "should be all 0.0f\n", + out[0], out[1], out[2], out[3], + out[4], out[5], out[6], out[7], + out[8], out[9], out[10], out[11], + out[12], out[13], out[14], out[15]); + refcnt = ID3DXConstantTable_Release(ctable); ok(refcnt == 0, "The constant table reference count was %u, should be 0\n", refcnt); }

1 0

Dmitry Timoshkov : gdiplus: Rename roundr() to gdip_round() to make it clearer that it's an internal helper.
by Alexandre Julliard Aug. 21, 2012

Aug. 21, 2012

Module: wine Branch: master Commit: 10c84dfe3ba9bb2d0057d05d615397be6076b7a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10c84dfe3ba9bb2d0057d05d6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Aug 21 11:02:06 2012 +0900 gdiplus: Rename roundr() to gdip_round() to make it clearer that it's an internal helper. --- dlls/gdiplus/brush.c | 20 +++++++++--------- dlls/gdiplus/gdiplus.c | 6 ++-- dlls/gdiplus/gdiplus_private.h | 2 +- dlls/gdiplus/graphics.c | 42 ++++++++++++++++++++-------------------- dlls/gdiplus/graphicspath.c | 14 ++++++------ dlls/gdiplus/image.c | 8 +++--- dlls/gdiplus/matrix.c | 8 +++--- dlls/gdiplus/region.c | 10 ++++---- 8 files changed, 55 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=10c84dfe3ba9bb2d0057d…

1 0

Nikolay Sivov : winealsa: Fix variable types so pointer is not truncated on 64bit.
by Alexandre Julliard Aug. 21, 2012

Aug. 21, 2012

Module: wine Branch: master Commit: 72452b10151085afc92c9bfb5f5d224d68dc2de8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72452b10151085afc92c9bfb5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 21 07:53:00 2012 +0400 winealsa: Fix variable types so pointer is not truncated on 64bit. --- dlls/winealsa.drv/midi.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index ff762eb..7c496c5 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -176,10 +176,10 @@ static int MIDI_AlsaToWindowsDeviceType(unsigned int type) static void MIDI_NotifyClient(UINT wDevID, WORD wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2) { - DWORD dwCallBack; + DWORD_PTR dwCallBack; UINT uFlags; HANDLE hDev; - DWORD dwInstance; + DWORD_PTR dwInstance; TRACE("wDevID = %04X wMsg = %d dwParm1 = %04lX dwParam2 = %04lX\n", wDevID, wMsg, dwParam1, dwParam2);

1 0

Matteo Bruni : wined3d: Force ARB shader programs reselection on bool/ int constant changes.
by Alexandre Julliard Aug. 21, 2012

Aug. 21, 2012

Module: wine Branch: master Commit: 7cc4f47afe2dbb112b0a84cb557160872e71c016 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cc4f47afe2dbb112b0a84cb5… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Aug 20 22:34:58 2012 +0200 wined3d: Force ARB shader programs reselection on bool/int constant changes. The ARB shader backend hardcodes some constant-dependent state in the shader itself (e.g. branch taken/not taken). So, we have to make sure to update the selected ARB shader when the application modifies non-float constants. --- dlls/wined3d/arb_program_shader.c | 38 ++++++++++++++++++++++++++++++++++-- 1 files changed, 35 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index c8799df..c1a0718 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -625,6 +625,8 @@ static void shader_arb_vs_local_constants(const struct arb_vs_compiled_shader *g checkGLcall("Load vs int consts"); } +static void shader_arb_select(const struct wined3d_context *context, BOOL usePS, BOOL useVS); + /** * Loads the app-supplied constants into the currently set ARB_[vertex/fragment]_programs. * @@ -632,13 +634,38 @@ static void shader_arb_vs_local_constants(const struct arb_vs_compiled_shader *g * worry about the Integers or Booleans */ /* GL locking is done by the caller (state handler) */ -static void shader_arb_load_constants(const struct wined3d_context *context, char usePixelShader, char useVertexShader) +static void shader_arb_load_constants_internal(const struct wined3d_context *context, + char usePixelShader, char useVertexShader, BOOL from_shader_select) { struct wined3d_device *device = context->swapchain->device; - const struct wined3d_state *state = &device->stateBlock->state; + const struct wined3d_stateblock *stateblock = device->stateBlock; + const struct wined3d_state *state = &stateblock->state; const struct wined3d_gl_info *gl_info = context->gl_info; struct shader_arb_priv *priv = device->shader_priv; + if (!from_shader_select) + { + const struct wined3d_shader *vshader = state->vertex_shader, *pshader = state->pixel_shader; + if (vshader + && (stateblock->changed.vertexShaderConstantsB & vshader->reg_maps.boolean_constants + || (!gl_info->supported[NV_VERTEX_PROGRAM2_OPTION] + && (stateblock->changed.vertexShaderConstantsI + & vshader->reg_maps.integer_constants & ~vshader->reg_maps.local_int_consts)))) + { + TRACE("bool/integer vertex shader constants potentially modified, forcing shader reselection.\n"); + shader_arb_select(context, usePixelShader, useVertexShader); + } + else if (pshader + && (stateblock->changed.pixelShaderConstantsB & pshader->reg_maps.boolean_constants + || (!gl_info->supported[NV_FRAGMENT_PROGRAM_OPTION] + && (stateblock->changed.pixelShaderConstantsI + & pshader->reg_maps.integer_constants & ~pshader->reg_maps.local_int_consts)))) + { + TRACE("bool/integer pixel shader constants potentially modified, forcing shader reselection.\n"); + shader_arb_select(context, usePixelShader, useVertexShader); + } + } + if (context != priv->last_context) { memset(priv->vshader_const_dirty, 1, @@ -676,6 +703,11 @@ static void shader_arb_load_constants(const struct wined3d_context *context, cha } } +static void shader_arb_load_constants(const struct wined3d_context *context, char ps, char vs) +{ + shader_arb_load_constants_internal(context, ps, vs, FALSE); +} + static void shader_arb_update_float_vertex_constants(struct wined3d_device *device, UINT start, UINT count) { struct wined3d_context *context = context_get_current(); @@ -4662,7 +4694,7 @@ static void shader_arb_select(const struct wined3d_context *context, BOOL usePS, priv->pshader_const_dirty[i] = 1; } /* Also takes care of loading local constants */ - shader_arb_load_constants(context, TRUE, FALSE); + shader_arb_load_constants_internal(context, TRUE, FALSE, TRUE); } else {

1 0

Matteo Bruni : wined3d: Fix blending test expected results.
by Alexandre Julliard Aug. 21, 2012

Aug. 21, 2012

Module: wine Branch: master Commit: f89f30e0c01f60e67c5a004068deccbfcd60fbe2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f89f30e0c01f60e67c5a00406… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Aug 20 22:34:57 2012 +0200 wined3d: Fix blending test expected results. --- dlls/wined3d/utils.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 4f8108f..8db556d 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1138,9 +1138,9 @@ static void check_fbo_compat(const struct wined3d_gl_info *gl_info, struct wined a = color >> 24; r = (color & 0x00ff0000) >> 16; - r_range = format->red_size < 8 ? 1 << (8 - format->red_size - 1) : 1; - a_range = format->alpha_size < 8 ? 1 << (8 - format->alpha_size - 1) : 1; - if (format->red_size && (r < 0x80 - r_range || r > 0x80 + r_range)) + r_range = format->red_size < 8 ? 1 << (8 - format->red_size) : 1; + a_range = format->alpha_size < 8 ? 1 << (8 - format->alpha_size) : 1; + if (format->red_size && (r < 0x7f - r_range || r > 0x7f + r_range)) match = FALSE; else if (format->alpha_size > 1 && (a < 0xbf - a_range || a > 0xbf + a_range)) match = FALSE;

1 0