March 2011 - Wine-commits - list.winehq.org

André Hentschel : wininet: Port numbers are unsigned.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 316f1c2e7c5c37a275cb912b777c5b5b9d698d9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=316f1c2e7c5c37a275cb912b7… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Mar 28 22:47:27 2011 +0200 wininet: Port numbers are unsigned. --- dlls/wininet/internet.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index a0db965..9b37e58 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -4068,7 +4068,7 @@ BOOL WINAPI InternetCreateUrlW(LPURL_COMPONENTSW lpUrlComponents, DWORD dwFlags, INTERNET_SCHEME nScheme; static const WCHAR slashSlashW[] = {'/','/'}; - static const WCHAR percentD[] = {'%','d',0}; + static const WCHAR fmtW[] = {'%','u',0}; TRACE("(%p,%d,%p,%p)\n", lpUrlComponents, dwFlags, lpszUrl, lpdwUrlLength); @@ -4155,7 +4155,7 @@ BOOL WINAPI InternetCreateUrlW(LPURL_COMPONENTSW lpUrlComponents, DWORD dwFlags, { WCHAR szPort[MAX_WORD_DIGITS+1]; - sprintfW(szPort, percentD, lpUrlComponents->nPort); + sprintfW(szPort, fmtW, lpUrlComponents->nPort); *lpszUrl = ':'; lpszUrl++; dwLen = strlenW(szPort);

1 0

Henri Verbeet : wined3d: Get rid of IWineD3DBaseTextureClass.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: c5bf96c95174b40cb53cc1668c6db5cdf185c190 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5bf96c95174b40cb53cc1668… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 28 21:58:42 2011 +0200 wined3d: Get rid of IWineD3DBaseTextureClass. --- dlls/wined3d/arb_program_shader.c | 15 ++- dlls/wined3d/context.c | 4 +- dlls/wined3d/device.c | 16 +- dlls/wined3d/glsl_shader.c | 23 ++- dlls/wined3d/nvidia_texture_shader.c | 2 +- dlls/wined3d/shader.c | 9 +- dlls/wined3d/state.c | 19 ++- dlls/wined3d/surface.c | 14 +- dlls/wined3d/texture.c | 283 +++++++++++++++++----------------- dlls/wined3d/utils.c | 8 +- dlls/wined3d/volume.c | 2 +- dlls/wined3d/wined3d_private.h | 34 ++--- 12 files changed, 214 insertions(+), 215 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c5bf96c95174b40cb53cc…

1 0

Henri Verbeet : wined3d: Replace "cond_np2" in wined3d_texture with a flag.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: e111acdf11673e5d985e8de1432683c69a765aa6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e111acdf11673e5d985e8de14… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 28 21:58:43 2011 +0200 wined3d: Replace "cond_np2" in wined3d_texture with a flag. --- dlls/wined3d/texture.c | 10 +++++----- dlls/wined3d/wined3d_private.h | 4 +++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 170507b..e16d72d 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -59,6 +59,7 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc texture->texture_srgb.dirty = TRUE; texture->is_srgb = FALSE; texture->pow2_matrix_identity = TRUE; + texture->flags = 0; if (texture->resource.format->flags & WINED3DFMT_FLAG_FILTERING) { @@ -262,7 +263,7 @@ void wined3d_texture_apply_state_changes(struct wined3d_texture *texture, const DWORD sampler_states[WINED3D_HIGHEST_SAMPLER_STATE + 1], const struct wined3d_gl_info *gl_info) { - BOOL cond_np2 = texture->cond_np2; + BOOL cond_np2 = texture->flags & WINED3D_TEXTURE_COND_NP2; GLenum target = texture->target; struct gl_texture *gl_tex; DWORD state; @@ -666,7 +667,7 @@ static HRESULT texture2d_bind(struct wined3d_texture *texture, * state. The same applies to filtering. Even if the texture has only * one mip level, the default LINEAR_MIPMAP_LINEAR filter causes a SW * fallback on macos. */ - if (texture->cond_np2) + if (texture->flags & WINED3D_TEXTURE_COND_NP2) { GLenum target = texture->target; @@ -1028,7 +1029,7 @@ HRESULT texture_init(struct wined3d_texture *texture, UINT width, UINT height, U texture->pow2_matrix[10] = 1.0f; texture->pow2_matrix[15] = 1.0f; texture->target = GL_TEXTURE_2D; - texture->cond_np2 = TRUE; + texture->flags |= WINED3D_TEXTURE_COND_NP2; texture->min_mip_lookup = minMipLookup_noFilter; } else if (gl_info->supported[ARB_TEXTURE_RECTANGLE] && (width != pow2_width || height != pow2_height) @@ -1043,7 +1044,7 @@ HRESULT texture_init(struct wined3d_texture *texture, UINT width, UINT height, U texture->pow2_matrix[10] = 1.0f; texture->pow2_matrix[15] = 1.0f; texture->target = GL_TEXTURE_RECTANGLE_ARB; - texture->cond_np2 = TRUE; + texture->flags |= WINED3D_TEXTURE_COND_NP2; if (texture->resource.format->flags & WINED3DFMT_FLAG_FILTERING) texture->min_mip_lookup = minMipLookup_noMip; @@ -1067,7 +1068,6 @@ HRESULT texture_init(struct wined3d_texture *texture, UINT width, UINT height, U texture->pow2_matrix[10] = 1.0f; texture->pow2_matrix[15] = 1.0f; texture->target = GL_TEXTURE_2D; - texture->cond_np2 = FALSE; } TRACE("xf(%f) yf(%f)\n", texture->pow2_matrix[0], texture->pow2_matrix[5]); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 382df9d..de50930 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1888,6 +1888,8 @@ struct wined3d_texture_ops void (*texture_sub_resource_cleanup)(struct wined3d_resource *sub_resource); }; +#define WINED3D_TEXTURE_COND_NP2 0x1 + struct wined3d_texture { struct wined3d_resource resource; @@ -1902,8 +1904,8 @@ struct wined3d_texture LONG bind_count; DWORD sampler; BOOL is_srgb; + DWORD flags; BOOL pow2_matrix_identity; - BOOL cond_np2; const struct min_lookup *min_mip_lookup; const GLenum *mag_lookup; GLenum target;

1 0

Henri Verbeet : wined3d: Replace "pow2_matrix_identity" in wined3d_texture with a flag.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 0e22aea01e768ccf7bb66fbe7088e48ee8725ea6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e22aea01e768ccf7bb66fbe7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 28 21:58:44 2011 +0200 wined3d: Replace "pow2_matrix_identity" in wined3d_texture with a flag. --- dlls/wined3d/shader.c | 2 +- dlls/wined3d/state.c | 6 ++---- dlls/wined3d/texture.c | 9 ++++----- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 1c01a42..0641b27 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2101,7 +2101,7 @@ void find_ps_compile_args(const struct wined3d_state *state, args->shadow |= 1 << i; /* Flag samplers that need NP2 texcoord fixup. */ - if (!texture->pow2_matrix_identity) + if (!(texture->flags & WINED3D_TEXTURE_POW2_MAT_IDENT)) args->np2_fixup |= (1 << i); } if (shader->baseShader.reg_maps.shader_version.major >= 3) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index e1de072..315705c 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3600,7 +3600,7 @@ static void sampler_texmatrix(DWORD state, struct wined3d_stateblock *stateblock */ if (sampler < MAX_TEXTURES) { - const BOOL texIsPow2 = !texture->pow2_matrix_identity; + const BOOL texIsPow2 = !(texture->flags & WINED3D_TEXTURE_POW2_MAT_IDENT); if (texIsPow2 || (context->lastWasPow2Texture & (1 << sampler))) { @@ -3671,10 +3671,8 @@ static void sampler(DWORD state_id, struct wined3d_stateblock *stateblock, struc } /* Trigger shader constant reloading (for NP2 texcoord fixup) */ - if (!texture->pow2_matrix_identity) - { + if (!(texture->flags & WINED3D_TEXTURE_POW2_MAT_IDENT)) device->shader_backend->shader_load_np2fixup_constants(device->shader_priv, gl_info, state); - } } else if (mapped_stage < gl_info->limits.textures) { diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index e16d72d..10edf4a 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -58,8 +58,7 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc texture->texture_rgb.dirty = TRUE; texture->texture_srgb.dirty = TRUE; texture->is_srgb = FALSE; - texture->pow2_matrix_identity = TRUE; - texture->flags = 0; + texture->flags = WINED3D_TEXTURE_POW2_MAT_IDENT; if (texture->resource.format->flags & WINED3DFMT_FLAG_FILTERING) { @@ -900,7 +899,7 @@ HRESULT cubetexture_init(struct wined3d_texture *texture, UINT edge_length, UINT texture->pow2_matrix[5] = ((float)edge_length) / ((float)pow2_edge_length); texture->pow2_matrix[10] = ((float)edge_length) / ((float)pow2_edge_length); texture->pow2_matrix[15] = 1.0f; - texture->pow2_matrix_identity = FALSE; + texture->flags &= ~WINED3D_TEXTURE_POW2_MAT_IDENT; } texture->target = GL_TEXTURE_CUBE_MAP_ARB; @@ -1037,7 +1036,7 @@ HRESULT texture_init(struct wined3d_texture *texture, UINT width, UINT height, U && wined3d_settings.rendertargetlock_mode == RTL_READTEX)) { if (width != 1 || height != 1) - texture->pow2_matrix_identity = FALSE; + texture->flags &= ~WINED3D_TEXTURE_POW2_MAT_IDENT; texture->pow2_matrix[0] = (float)width; texture->pow2_matrix[5] = (float)height; @@ -1055,9 +1054,9 @@ HRESULT texture_init(struct wined3d_texture *texture, UINT width, UINT height, U { if ((width != pow2_width) || (height != pow2_height)) { - texture->pow2_matrix_identity = FALSE; texture->pow2_matrix[0] = (((float)width) / ((float)pow2_width)); texture->pow2_matrix[5] = (((float)height) / ((float)pow2_height)); + texture->flags &= ~WINED3D_TEXTURE_POW2_MAT_IDENT; } else { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index de50930..4ec25e6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1889,6 +1889,7 @@ struct wined3d_texture_ops }; #define WINED3D_TEXTURE_COND_NP2 0x1 +#define WINED3D_TEXTURE_POW2_MAT_IDENT 0x2 struct wined3d_texture { @@ -1905,7 +1906,6 @@ struct wined3d_texture DWORD sampler; BOOL is_srgb; DWORD flags; - BOOL pow2_matrix_identity; const struct min_lookup *min_mip_lookup; const GLenum *mag_lookup; GLenum target;

1 0

Henri Verbeet : wined3d: Replace "is_srgb" in wined3d_texture with a flag.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 19e66a0dc964b839eaef4699e80208096de05c18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19e66a0dc964b839eaef4699e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 28 21:58:45 2011 +0200 wined3d: Replace "is_srgb" in wined3d_texture with a flag. --- dlls/wined3d/texture.c | 36 +++++++++++++++++++++++++----------- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 26 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 10edf4a..1d42c34 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -57,7 +57,6 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc texture->lod = 0; texture->texture_rgb.dirty = TRUE; texture->texture_srgb.dirty = TRUE; - texture->is_srgb = FALSE; texture->flags = WINED3D_TEXTURE_POW2_MAT_IDENT; if (texture->resource.format->flags & WINED3DFMT_FLAG_FILTERING) @@ -143,7 +142,12 @@ static HRESULT wined3d_texture_bind(struct wined3d_texture *texture, TRACE("texture %p, srgb %#x, set_surface_desc %p.\n", texture, srgb, set_surface_desc); - texture->is_srgb = srgb; /* sRGB mode cache for preload() calls outside drawprim. */ + /* sRGB mode cache for preload() calls outside drawprim. */ + if (srgb) + texture->flags |= WINED3D_TEXTURE_IS_SRGB; + else + texture->flags &= ~WINED3D_TEXTURE_IS_SRGB; + gl_tex = wined3d_texture_get_gl_texture(texture, gl_info, srgb); target = texture->target; @@ -270,7 +274,8 @@ void wined3d_texture_apply_state_changes(struct wined3d_texture *texture, TRACE("texture %p, sampler_states %p.\n", texture, sampler_states); - gl_tex = wined3d_texture_get_gl_texture(texture, gl_info, texture->is_srgb); + gl_tex = wined3d_texture_get_gl_texture(texture, gl_info, + texture->flags & WINED3D_TEXTURE_IS_SRGB); /* This function relies on the correct texture being bound and loaded. */ @@ -646,7 +651,8 @@ static HRESULT texture2d_bind(struct wined3d_texture *texture, if (set_gl_texture_desc && SUCCEEDED(hr)) { UINT sub_count = texture->level_count * texture->layer_count; - BOOL srgb_tex = !gl_info->supported[EXT_TEXTURE_SRGB_DECODE] && texture->is_srgb; + BOOL srgb_tex = !gl_info->supported[EXT_TEXTURE_SRGB_DECODE] + && (texture->flags & WINED3D_TEXTURE_IS_SRGB); struct gl_texture *gl_tex; UINT i; @@ -718,7 +724,7 @@ static void texture2d_preload(struct wined3d_texture *texture, enum WINED3DSRGB break; default: - srgb_mode = texture->is_srgb; + srgb_mode = texture->flags & WINED3D_TEXTURE_IS_SRGB; break; } @@ -1115,7 +1121,6 @@ static void texture3d_preload(struct wined3d_texture *texture, enum WINED3DSRGB { IWineD3DDeviceImpl *device = texture->resource.device; struct wined3d_context *context = NULL; - BOOL srgb_mode = texture->is_srgb; BOOL srgb_was_toggled = FALSE; unsigned int i; @@ -1125,9 +1130,17 @@ static void texture3d_preload(struct wined3d_texture *texture, enum WINED3DSRGB context = context_acquire(device, NULL); else if (texture->bind_count > 0) { - srgb_mode = device->stateBlock->state.sampler_states[texture->sampler][WINED3DSAMP_SRGBTEXTURE]; - srgb_was_toggled = texture->is_srgb != srgb_mode; - texture->is_srgb = srgb_mode; + BOOL texture_srgb = texture->flags & WINED3D_TEXTURE_IS_SRGB; + BOOL sampler_srgb = device->stateBlock->state.sampler_states[texture->sampler][WINED3DSAMP_SRGBTEXTURE]; + srgb_was_toggled = !texture_srgb != !sampler_srgb; + + if (srgb_was_toggled) + { + if (sampler_srgb) + texture->flags |= WINED3D_TEXTURE_IS_SRGB; + else + texture->flags &= ~WINED3D_TEXTURE_IS_SRGB; + } } /* If the texture is marked dirty or the sRGB sampler setting has changed @@ -1136,7 +1149,8 @@ static void texture3d_preload(struct wined3d_texture *texture, enum WINED3DSRGB { for (i = 0; i < texture->level_count; ++i) { - volume_load(volume_from_resource(texture->sub_resources[i]), i, srgb_mode); + volume_load(volume_from_resource(texture->sub_resources[i]), i, + texture->flags & WINED3D_TEXTURE_IS_SRGB); } } else if (srgb_was_toggled) @@ -1145,7 +1159,7 @@ static void texture3d_preload(struct wined3d_texture *texture, enum WINED3DSRGB { IWineD3DVolumeImpl *volume = volume_from_resource(texture->sub_resources[i]); volume_add_dirty_box(volume, NULL); - volume_load(volume, i, srgb_mode); + volume_load(volume, i, texture->flags & WINED3D_TEXTURE_IS_SRGB); } } else diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4ec25e6..1fe633f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1890,6 +1890,7 @@ struct wined3d_texture_ops #define WINED3D_TEXTURE_COND_NP2 0x1 #define WINED3D_TEXTURE_POW2_MAT_IDENT 0x2 +#define WINED3D_TEXTURE_IS_SRGB 0x4 struct wined3d_texture { @@ -1904,7 +1905,6 @@ struct wined3d_texture WINED3DTEXTUREFILTERTYPE filter_type; LONG bind_count; DWORD sampler; - BOOL is_srgb; DWORD flags; const struct min_lookup *min_mip_lookup; const GLenum *mag_lookup;

1 0

Henri Verbeet : wined3d: Move IWineD3DVertexShader::SetLocalConstantsF() to IWineD3DBaseShader.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 57d70bfddae578398a74acec9cbe3ed4609d5fc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57d70bfddae578398a74acec9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 28 21:58:46 2011 +0200 wined3d: Move IWineD3DVertexShader::SetLocalConstantsF() to IWineD3DBaseShader. --- dlls/wined3d/shader.c | 75 ++++++++++++++++++++++++++++++--------------- include/wine/wined3d.idl | 10 +++--- 2 files changed, 55 insertions(+), 30 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 0641b27..80ea5ea 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1572,6 +1572,33 @@ static HRESULT shader_get_function(IWineD3DBaseShaderImpl *shader, void *data, U return WINED3D_OK; } +/* Set local constants for d3d8 shaders. */ +static HRESULT shader_set_local_constants_float(IWineD3DBaseShaderImpl *shader, + UINT start_idx, const float *src_data, UINT count) +{ + UINT end_idx = start_idx + count; + UINT i; + + if (end_idx > shader->baseShader.limits.constant_float) + { + WARN("end_idx %u > float constants limit %u.\n", + end_idx, shader->baseShader.limits.constant_float); + end_idx = shader->baseShader.limits.constant_float; + } + + for (i = start_idx; i < end_idx; ++i) + { + local_constant* lconst = HeapAlloc(GetProcessHeap(), 0, sizeof(local_constant)); + if (!lconst) return E_OUTOFMEMORY; + + lconst->idx = i; + memcpy(lconst->value, src_data + (i - start_idx) * 4 /* 4 components */, 4 * sizeof(float)); + list_add_head(&shader->baseShader.constantsF, &lconst->entry); + } + + return WINED3D_OK; +} + static HRESULT shader_set_function(IWineD3DBaseShaderImpl *shader, const DWORD *byte_code, const struct wined3d_shader_signature *output_signature, DWORD float_const_count) { @@ -1679,34 +1706,13 @@ static HRESULT STDMETHODCALLTYPE vertexshader_GetFunction(IWineD3DVertexShader * return shader_get_function((IWineD3DBaseShaderImpl *)iface, data, data_size); } -/* Set local constants for d3d8 shaders. */ static HRESULT STDMETHODCALLTYPE vertexshader_SetLocalConstantsF(IWineD3DVertexShader *iface, UINT start_idx, const float *src_data, UINT count) { - IWineD3DVertexShaderImpl *shader =(IWineD3DVertexShaderImpl *)iface; - IWineD3DDeviceImpl *device = shader->baseShader.device; - UINT i, end_idx; - TRACE("iface %p, start_idx %u, src_data %p, count %u.\n", iface, start_idx, src_data, count); - end_idx = start_idx + count; - if (end_idx > device->d3d_vshader_constantF) - { - WARN("end_idx %u > float constants limit %u.\n", end_idx, device->d3d_vshader_constantF); - end_idx = device->d3d_vshader_constantF; - } - - for (i = start_idx; i < end_idx; ++i) - { - local_constant* lconst = HeapAlloc(GetProcessHeap(), 0, sizeof(local_constant)); - if (!lconst) return E_OUTOFMEMORY; - - lconst->idx = i; - memcpy(lconst->value, src_data + (i - start_idx) * 4 /* 4 components */, 4 * sizeof(float)); - list_add_head(&shader->baseShader.constantsF, &lconst->entry); - } - - return WINED3D_OK; + return shader_set_local_constants_float((IWineD3DBaseShaderImpl *)iface, + start_idx, src_data, count); } static const IWineD3DVertexShaderVtbl IWineD3DVertexShader_Vtbl = @@ -1719,7 +1725,6 @@ static const IWineD3DVertexShaderVtbl IWineD3DVertexShader_Vtbl = vertexshader_GetParent, /* IWineD3DBaseShader methods */ vertexshader_GetFunction, - /* IWineD3DVertexShader methods */ vertexshader_SetLocalConstantsF, }; @@ -1951,6 +1956,15 @@ static HRESULT STDMETHODCALLTYPE geometryshader_GetFunction(IWineD3DGeometryShad return shader_get_function((IWineD3DBaseShaderImpl *)iface, data, data_size); } +static HRESULT STDMETHODCALLTYPE geometryshader_SetLocalConstantsF(IWineD3DGeometryShader *iface, + UINT start_idx, const float *src_data, UINT count) +{ + TRACE("iface %p, start_idx %u, src_data %p, count %u.\n", iface, start_idx, src_data, count); + + return shader_set_local_constants_float((IWineD3DBaseShaderImpl *)iface, + start_idx, src_data, count); +} + static const IWineD3DGeometryShaderVtbl wined3d_geometryshader_vtbl = { /* IUnknown methods */ @@ -1961,6 +1975,7 @@ static const IWineD3DGeometryShaderVtbl wined3d_geometryshader_vtbl = geometryshader_GetParent, /* IWineD3DBaseShader methods */ geometryshader_GetFunction, + geometryshader_SetLocalConstantsF, }; HRESULT geometryshader_init(struct wined3d_geometryshader *shader, IWineD3DDeviceImpl *device, @@ -2047,6 +2062,15 @@ static HRESULT STDMETHODCALLTYPE pixelshader_GetFunction(IWineD3DPixelShader *if return shader_get_function((IWineD3DBaseShaderImpl *)iface, data, data_size); } +static HRESULT STDMETHODCALLTYPE pixelshader_SetLocalConstantsF(IWineD3DPixelShader *iface, + UINT start_idx, const float *src_data, UINT count) +{ + TRACE("iface %p, start_idx %u, src_data %p, count %u.\n", iface, start_idx, src_data, count); + + return shader_set_local_constants_float((IWineD3DBaseShaderImpl *)iface, + start_idx, src_data, count); +} + static const IWineD3DPixelShaderVtbl IWineD3DPixelShader_Vtbl = { /* IUnknown methods */ @@ -2056,7 +2080,8 @@ static const IWineD3DPixelShaderVtbl IWineD3DPixelShader_Vtbl = /* IWineD3DBase methods */ pixelshader_GetParent, /* IWineD3DBaseShader methods */ - pixelshader_GetFunction + pixelshader_GetFunction, + pixelshader_SetLocalConstantsF, }; void find_ps_compile_args(const struct wined3d_state *state, diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index bc7d588..e56aea5 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2395,6 +2395,11 @@ interface IWineD3DBaseShader : IWineD3DBase [out] void *data, [in, out] UINT *data_size ); + HRESULT SetLocalConstantsF( + [in] UINT start_idx, + [in] const float *src_data, + [in] UINT vector4f_count + ); } [ @@ -2404,11 +2409,6 @@ interface IWineD3DBaseShader : IWineD3DBase ] interface IWineD3DVertexShader : IWineD3DBaseShader { - HRESULT SetLocalConstantsF( - [in] UINT start_idx, - [in] const float *src_data, - [in] UINT vector4f_count - ); } [

1 0

Vincent Povirk : gdiplus: Use the given HPALETTE in GdipCreateBitmapFromHBITMAP.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: a7444e8e2c4dcccbfe621e8e6945cef989499d21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7444e8e2c4dcccbfe621e8e6… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Mar 28 16:03:29 2011 -0500 gdiplus: Use the given HPALETTE in GdipCreateBitmapFromHBITMAP. --- dlls/gdiplus/image.c | 56 +++++++++++++++++++++++++++++++++++++++---- dlls/gdiplus/tests/image.c | 6 +--- 2 files changed, 52 insertions(+), 10 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 1916524..35ebd29 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3524,12 +3524,6 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromHBITMAP(HBITMAP hbm, HPALETTE hpal, GpBi if(!hbm || !bitmap) return InvalidParameter; - /* TODO: Support for device-dependent bitmaps */ - if(hpal){ - FIXME("no support for device-dependent bitmaps\n"); - return NotImplemented; - } - if (GetObjectA(hbm, sizeof(bm), &bm) != sizeof(bm)) return InvalidParameter; @@ -3626,6 +3620,56 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromHBITMAP(HBITMAP hbm, HPALETTE hpal, GpBi GdipBitmapUnlockBits(*bitmap, &lockeddata); } + + if (retval == Ok && hpal) + { + WORD num_palette_entries; + PALETTEENTRY *palette_entries=NULL; + ColorPalette *palette=NULL; + int i; + + if (!GetObjectW(hpal, sizeof(num_palette_entries), &num_palette_entries)) + retval = GenericError; + + if (retval == Ok) + { + palette_entries = GdipAlloc(sizeof(PALETTEENTRY) * num_palette_entries); + palette = GdipAlloc(sizeof(ColorPalette) + sizeof(ARGB) * (num_palette_entries-1)); + + if (!palette_entries || !palette) + retval = OutOfMemory; + } + + if (retval == Ok) + { + if (!GetPaletteEntries(hpal, 0, num_palette_entries, palette_entries)) + retval = GenericError; + } + + if (retval == Ok) + { + palette->Flags = 0; + palette->Count = num_palette_entries; + + for (i=0; i<num_palette_entries; i++) + { + PALETTEENTRY * entry = &palette_entries[i]; + palette->Entries[i] = 0xff000000 | entry->peRed << 16 | + entry->peGreen << 8 | entry->peBlue; + } + + retval = GdipSetImagePalette((GpImage*)*bitmap, palette); + } + + GdipFree(palette_entries); + GdipFree(palette); + } + + if (retval != Ok) + { + GdipDisposeImage((GpImage*)*bitmap); + *bitmap = NULL; + } } return retval; diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 1e6a9e9..77aec93 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -917,10 +917,8 @@ static void test_GdipCreateBitmapFromHBITMAP(void) GdipFree(LogPal); stat = GdipCreateBitmapFromHBITMAP(hbm, hpal, &gpbm); - todo_wine - { - expect(Ok, stat); - } + expect(Ok, stat); + if (stat == Ok) GdipDisposeImage((GpImage*)gpbm);

1 0

Konrad Rzepecki : msvcrt: Implement _mbslwr_s.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 332d5954ed0335dc54040dd67942494ae942d224 URL: http://source.winehq.org/git/wine.git/?a=commit;h=332d5954ed0335dc54040dd67… Author: Konrad Rzepecki <hannibal(a)astral.lodz.pl> Date: Sun Mar 20 02:19:02 2011 +0100 msvcrt: Implement _mbslwr_s. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/mbcs.c | 40 ++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/tests/string.c | 60 +++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 104 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index a4589e1..1812407 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -921,7 +921,7 @@ @ stub _mbslen_l @ cdecl _mbslwr(str) msvcrt._mbslwr @ stub _mbslwr_l -@ stub _mbslwr_s +@ cdecl _mbslwr_s(str long) msvcrt._mbslwr_s @ stub _mbslwr_s_l @ cdecl _mbsnbcat(str str long) msvcrt._mbsnbcat @ stub _mbsnbcat_l diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index b491d87..8b58e7d 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -767,7 +767,7 @@ @ stub _mbslen_l @ cdecl _mbslwr(str) msvcrt._mbslwr @ stub _mbslwr_l -@ stub _mbslwr_s +@ cdecl _mbslwr_s(str long) msvcrt._mbslwr_s @ stub _mbslwr_s_l @ cdecl _mbsnbcat(str str long) msvcrt._mbsnbcat @ stub _mbsnbcat_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index d1cae36..d18651d 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -755,7 +755,7 @@ @ stub _mbslen_l @ cdecl _mbslwr(str) msvcrt._mbslwr @ stub _mbslwr_l -@ stub _mbslwr_s +@ cdecl _mbslwr_s(str long) msvcrt._mbslwr_s @ stub _mbslwr_s_l @ cdecl _mbsnbcat(str str long) msvcrt._mbsnbcat @ stub _mbsnbcat_l diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 081aa88..2a2ac72 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -1544,6 +1544,46 @@ unsigned char* CDECL _mbslwr(unsigned char* s) /********************************************************************* + * _mbslwr_s(MSVCRT.@) + */ +int CDECL _mbslwr_s(unsigned char* s, MSVCRT_size_t len) +{ + if (!s && !len) + { + return 0; + } + else if (!s || !len) + { + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + if (get_locale()->locinfo->mb_cur_max > 1) + { + unsigned int c; + for ( ; *s && len > 0; len--) + { + c = _mbctolower(_mbsnextc(s)); + /* Note that I assume that the size of the character is unchanged */ + if (c > 255) + { + *s++=(c>>8); + c=c & 0xff; + } + *s++=c; + } + } + else for ( ; *s && len > 0; s++, len--) *s = tolower(*s); + if (*s) + { + *s = '\0'; + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + return 0; +} + + +/********************************************************************* * _mbsupr(MSVCRT.@) */ unsigned char* CDECL _mbsupr(unsigned char* s) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index e43c3f5..103142e 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -703,7 +703,7 @@ # stub _mbslen_l @ cdecl _mbslwr(str) # stub _mbslwr_l -# stub _mbslwr_s +@ cdecl _mbslwr_s(str long) # stub _mbslwr_s_l @ cdecl _mbsnbcat(str str long) # stub _mbsnbcat_l diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index e231077..f3d8dc4 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -77,6 +77,7 @@ static unsigned char *p_mbctype; static _invalid_parameter_handler (__cdecl *p_set_invalid_parameter_handler)(_invalid_parameter_handler); static int (__cdecl *p_wcslwr_s)(wchar_t*,size_t); static errno_t (__cdecl *p_mbsupr_s)(unsigned char *str, size_t numberOfElements); +static errno_t (__cdecl *p_mbslwr_s)(unsigned char *str, size_t numberOfElements); #define SETNOFAIL(x,y) x = (void*)GetProcAddress(hMsvcrt,y) #define SET(x,y) SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y) @@ -1769,6 +1770,63 @@ static void test__mbsupr_s(void) } +static void test__mbslwr_s(void) +{ + errno_t ret; + unsigned char buffer[20]; + + if (!p_mbslwr_s) + { + win_skip("Skipping _mbslwr_s tests\n"); + return; + } + + errno = EBADF; + ret = p_mbslwr_s(NULL, 0); + ok(ret == 0, "Expected _mbslwr_s to return 0, got %d\n", ret); + + errno = EBADF; + ret = p_mbslwr_s(NULL, sizeof(buffer)); + ok(ret == EINVAL, "Expected _mbslwr_s to return EINVAL, got %d\n", ret); + ok(errno == EINVAL, "Expected errno to be EINVAL, got %d\n", errno); + + errno = EBADF; + ret = p_mbslwr_s(buffer, 0); + ok(ret == EINVAL, "Expected _mbslwr_s to return EINVAL, got %d\n", ret); + ok(errno == EINVAL, "Expected errno to be EINVAL, got %d\n", errno); + + memcpy(buffer, "ABCDEFGH", sizeof("ABCDEFGH")); + errno = EBADF; + ret = p_mbslwr_s(buffer, sizeof("ABCDEFGH")); + ok(ret == 0, "Expected _mbslwr_s to return 0, got %d\n", ret); + ok(!memcmp(buffer, "abcdefgh", sizeof("abcdefgh")), + "Expected the output buffer to be \"abcdefgh\", got \"%s\"\n", + buffer); + + memcpy(buffer, "ABCDEFGH", sizeof("ABCDEFGH")); + errno = EBADF; + ret = p_mbslwr_s(buffer, sizeof(buffer)); + ok(ret == 0, "Expected _mbslwr_s to return 0, got %d\n", ret); + ok(!memcmp(buffer, "abcdefgh", sizeof("abcdefgh")), + "Expected the output buffer to be \"abcdefgh\", got \"%s\"\n", + buffer); + + memcpy(buffer, "ABCDEFGH", sizeof("ABCDEFGH")); + errno = EBADF; + ret = p_mbslwr_s(buffer, 4); + ok(ret == EINVAL, "Expected _mbslwr_s to return EINVAL, got %d\n", ret); + ok(errno == EINVAL, "Expected errno to be EINVAL, got %d\n", errno); + + memcpy(buffer, "ABCDEFGH\0IJKLMNOP", sizeof("ABCDEFGH\0IJKLMNOP")); + errno = EBADF; + ret = p_mbslwr_s(buffer, sizeof(buffer)); + ok(ret == 0, "Expected _mbslwr_s to return 0, got %d\n", ret); + ok(!memcmp(buffer, "abcdefgh\0IJKLMNOP", sizeof("abcdefgh\0IJKLMNOP")), + "Expected the output buffer to be \"abcdefgh\\0IJKLMNOP\", got \"%s\"\n", + buffer); + +} + static void test__ultoa_s(void) { errno_t ret; @@ -1880,6 +1938,7 @@ START_TEST(string) p_set_invalid_parameter_handler = (void *) GetProcAddress(hMsvcrt, "_set_invalid_parameter_handler"); p_wcslwr_s = (void*)GetProcAddress(hMsvcrt, "_wcslwr_s"); p_mbsupr_s = (void*)GetProcAddress(hMsvcrt, "_mbsupr_s"); + p_mbslwr_s = (void*)GetProcAddress(hMsvcrt, "_mbslwr_s"); /* MSVCRT memcpy behaves like memmove for overlapping moves, MFC42 CString::Insert seems to rely on that behaviour */ @@ -1921,4 +1980,5 @@ START_TEST(string) test__ultoa_s(); test__wcslwr_s(); test__mbsupr_s(); + test__mbslwr_s(); }

1 0

Konrad Rzepecki : wined3d: Prevent crash when blit_priv is NULL.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 37aadc9e377d7840a607dbabff10de375f9fdde8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37aadc9e377d7840a607dbabf… Author: Konrad Rzepecki <hannibal(a)astral.lodz.pl> Date: Sun Mar 20 11:58:08 2011 +0100 wined3d: Prevent crash when blit_priv is NULL. --- dlls/wined3d/surface.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 104b445..ec959cc 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3924,8 +3924,8 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_Blt(IWineD3DSurface *iface, const RECT } /* Special cases for RenderTargets */ - if ((This->resource.usage & WINED3DUSAGE_RENDERTARGET) - || (src && (src->resource.usage & WINED3DUSAGE_RENDERTARGET))) + if (This->resource.device->blit_priv && ((This->resource.usage & WINED3DUSAGE_RENDERTARGET) + || (src && (src->resource.usage & WINED3DUSAGE_RENDERTARGET)))) { if (SUCCEEDED(IWineD3DSurfaceImpl_BltOverride(This, DestRect, src, SrcRect, flags, DDBltFx, Filter))) return WINED3D_OK;

1 0

Konrad Rzepecki : wined3d: Implement WINED3DFMT_YUY2 to WINED3DFMT_B5G6R5_UNORM conversion function.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: e1524883c10b63d05a82624eca7fb775c69e3cd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1524883c10b63d05a82624ec… Author: Konrad Rzepecki <hannibal(a)astral.lodz.pl> Date: Sun Mar 20 11:59:46 2011 +0100 wined3d: Implement WINED3DFMT_YUY2 to WINED3DFMT_B5G6R5_UNORM conversion function. --- dlls/wined3d/surface_base.c | 44 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 44 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index 74fa196..4239f69 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -782,6 +782,49 @@ static void convert_yuy2_x8r8g8b8(const BYTE *src, BYTE *dst, } } +static void convert_yuy2_r5g6b5(const BYTE *src, BYTE *dst, + DWORD pitch_in, DWORD pitch_out, unsigned int w, unsigned int h) +{ + unsigned int x, y; + int c2, d, e, r2 = 0, g2 = 0, b2 = 0; + + TRACE("Converting %ux%u pixels, pitches %u %u\n", w, h, pitch_in, pitch_out); + + for (y = 0; y < h; ++y) + { + const BYTE *src_line = src + y * pitch_in; + WORD *dst_line = (WORD *)(dst + y * pitch_out); + for (x = 0; x < w; ++x) + { + /* YUV to RGB conversion formulas from http://en.wikipedia.org/wiki/YUV: + * C = Y - 16; D = U - 128; E = V - 128; + * R = cliptobyte((298 * C + 409 * E + 128) >> 8); + * G = cliptobyte((298 * C - 100 * D - 208 * E + 128) >> 8); + * B = cliptobyte((298 * C + 516 * D + 128) >> 8); + * Two adjacent YUY2 pixels are stored as four bytes: Y0 U Y1 V . + * U and V are shared between the pixels. + */ + if (!(x & 1)) /* for every even pixel, read new U and V */ + { + d = (int) src_line[1] - 128; + e = (int) src_line[3] - 128; + r2 = 409 * e + 128; + g2 = - 100 * d - 208 * e + 128; + b2 = 516 * d + 128; + } + c2 = 298 * ((int) src_line[0] - 16); + dst_line[x] = (cliptobyte((c2 + r2) >> 8) >> 3) << 11 /* red */ + | (cliptobyte((c2 + g2) >> 8) >> 2) << 5 /* green */ + | (cliptobyte((c2 + b2) >> 8) >> 3); /* blue */ + /* Scale RGB values to 0..255 range, + * then clip them if still not in range (may be negative), + * then shift them within DWORD if necessary. + */ + src_line += 2; + } + } +} + struct d3dfmt_convertor_desc { enum wined3d_format_id from, to; @@ -794,6 +837,7 @@ static const struct d3dfmt_convertor_desc convertors[] = {WINED3DFMT_B5G6R5_UNORM, WINED3DFMT_B8G8R8X8_UNORM, convert_r5g6b5_x8r8g8b8}, {WINED3DFMT_B8G8R8A8_UNORM, WINED3DFMT_B8G8R8X8_UNORM, convert_a8r8g8b8_x8r8g8b8}, {WINED3DFMT_YUY2, WINED3DFMT_B8G8R8X8_UNORM, convert_yuy2_x8r8g8b8}, + {WINED3DFMT_YUY2, WINED3DFMT_B5G6R5_UNORM, convert_yuy2_r5g6b5}, }; static inline const struct d3dfmt_convertor_desc *find_convertor(enum wined3d_format_id from, enum wined3d_format_id to)

1 0