wine-commits January 2012

wine-commits@winehq.org

2 participants
972 discussions

Piotr Caban : msvcp60: Added full basic_string::_Grow implementation.
by Alexandre Julliard 05 Jan '12

05 Jan '12

Module: wine Branch: master Commit: 568c3215b005fb3a428b19e31ba62f5066a2fd2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=568c3215b005fb3a428b19e31… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 5 16:04:11 2012 +0100 msvcp60: Added full basic_string::_Grow implementation. --- dlls/msvcp60/string.c | 166 +++++++++++++++++++++++++------------------------ 1 files changed, 84 insertions(+), 82 deletions(-) diff --git a/dlls/msvcp60/string.c b/dlls/msvcp60/string.c index 056f915..5b9eeb5 100644 --- a/dlls/msvcp60/string.c +++ b/dlls/msvcp60/string.c @@ -167,7 +167,48 @@ void __thiscall basic_string_char__Tidy(basic_string_char *this, MSVCP_bool buil memset(this, 0, sizeof(*this)); } -MSVCP_bool __thiscall basic_string_char__Grow(basic_string_char*, MSVCP_size_t, MSVCP_bool); +/* ?_Grow@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AAE_NI_N@Z */ +/* ?_Grow@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEAA_N_K_N@Z */ +DEFINE_THISCALL_WRAPPER(basic_string_char__Grow, 12) +MSVCP_bool __thiscall basic_string_char__Grow(basic_string_char *this, MSVCP_size_t new_size, MSVCP_bool trim) +{ + if(!new_size) { + if(trim) + basic_string_char__Tidy(this, TRUE); + else if(this->ptr) + basic_string_char__Eos(this, 0); + } else if(this->res<new_size || trim || + (this->ptr && this->ptr[-1] && (unsigned char)this->ptr[-1]!=FROZEN)) { + MSVCP_size_t new_res = new_size, len = this->size; + char *ptr; + + if(!trim && this->ptr && !this->ptr[-1]) { + new_res |= 0xf; + if(new_res/3 < this->res/2) + new_res = this->res + this->res/2; + } + + ptr = MSVCP_allocator_char_allocate(this->allocator, new_res+2); + if(!ptr) { + new_res = new_size; + ptr = MSVCP_allocator_char_allocate(this->allocator, new_size+2); + } + if(!ptr) { + ERR("Out of memory\n"); + return FALSE; + } + + *ptr = 0; + if(this->ptr) + char_traits_char__Copy_s(ptr+1, new_size, this->ptr, this->size); + basic_string_char__Tidy(this, TRUE); + this->ptr = ptr+1; + this->res = new_res; + basic_string_char__Eos(this, len>new_res ? new_res : len); + } + + return new_size>0; +} /* ?_Split@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AAEXXZ */ /* ?_Split@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEAAXXZ */ @@ -191,46 +232,6 @@ void __thiscall basic_string_char__Split(basic_string_char *this) } } -/* ?_Grow@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AAE_NI_N@Z */ -/* ?_Grow@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEAA_N_K_N@Z */ -DEFINE_THISCALL_WRAPPER(basic_string_char__Grow, 12) -MSVCP_bool __thiscall basic_string_char__Grow(basic_string_char *this, MSVCP_size_t new_size, MSVCP_bool trim) -{ - /* Fixme: grow string using one reallocation, don't ignore trim flag */ - basic_string_char__Split(this); - - if(this->res < new_size) { - MSVCP_size_t new_res = new_size, len = this->size; - char *ptr; - - new_res |= 0xf; - - if(new_res/3 < this->res/2) - new_res = this->res + this->res/2; - - ptr = MSVCP_allocator_char_allocate(this->allocator, new_res+1); - if(!ptr) - ptr = MSVCP_allocator_char_allocate(this->allocator, new_size+1); - else - new_size = new_res; - if(!ptr) { - ERR("Out of memory\n"); - basic_string_char__Tidy(this, TRUE); - return FALSE; - } - - if(this->ptr) - char_traits_char__Copy_s(ptr, new_size, this->ptr, this->size); - basic_string_char__Tidy(this, TRUE); - this->ptr = ptr; - this->res = new_size; - basic_string_char__Eos(this, len); - } else if(new_size == 0) - basic_string_char__Eos(this, 0); - - return (new_size>0); -} - /* ?_Freeze@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AAEXXZ */ /* ?_Freeze@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEAAXXZ */ DEFINE_THISCALL_WRAPPER(basic_string_char__Freeze, 4) @@ -1862,7 +1863,48 @@ void __thiscall basic_string_wchar__Tidy(basic_string_wchar *this, MSVCP_bool bu memset(this, 0, sizeof(*this)); } -MSVCP_bool __thiscall basic_string_wchar__Grow(basic_string_wchar*, MSVCP_size_t, MSVCP_bool); +/* ?_Grow@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@AAE_NI_N@Z */ +/* ?_Grow@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@AEAA_N_K_N@Z */ +DEFINE_THISCALL_WRAPPER(basic_string_wchar__Grow, 12) +MSVCP_bool __thiscall basic_string_wchar__Grow(basic_string_wchar *this, MSVCP_size_t new_size, MSVCP_bool trim) +{ + if(!new_size) { + if(trim) + basic_string_wchar__Tidy(this, TRUE); + else if(this->ptr) + basic_string_wchar__Eos(this, 0); + } else if(this->res<new_size || trim || + (this->ptr && this->ptr[-1] && (unsigned short)this->ptr[-1]!=FROZEN)) { + MSVCP_size_t new_res = new_size, len = this->size; + wchar_t *ptr; + + if(!trim && this->ptr && !this->ptr[-1]) { + new_res |= 0xf; + if(new_res/3 < this->res/2) + new_res = this->res + this->res/2; + } + + ptr = MSVCP_allocator_wchar_allocate(this->allocator, new_res+2); + if(!ptr) { + new_res = new_size; + ptr = MSVCP_allocator_wchar_allocate(this->allocator, new_size+2); + } + if(!ptr) { + ERR("Out of memory\n"); + return FALSE; + } + + *ptr = 0; + if(this->ptr) + char_traits_wchar__Copy_s(ptr+1, new_size, this->ptr, this->size); + basic_string_wchar__Tidy(this, TRUE); + this->ptr = ptr+1; + this->res = new_res; + basic_string_wchar__Eos(this, len>new_res ? new_res : len); + } + + return new_size>0; +} /* ?_Split@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@AAEXXZ */ /* ?_Split@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@AEAAXXZ */ @@ -1886,46 +1928,6 @@ void __thiscall basic_string_wchar__Split(basic_string_wchar *this) } } -/* ?_Grow@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@AAE_NI_N@Z */ -/* ?_Grow@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@AEAA_N_K_N@Z */ -DEFINE_THISCALL_WRAPPER(basic_string_wchar__Grow, 12) -MSVCP_bool __thiscall basic_string_wchar__Grow(basic_string_wchar *this, MSVCP_size_t new_size, MSVCP_bool trim) -{ - /* Fixme: grow string using one reallocation, don't ignore trim flag */ - basic_string_wchar__Split(this); - - if(this->res < new_size) { - MSVCP_size_t new_res = new_size, len = this->size; - wchar_t *ptr; - - new_res |= 0xf; - - if(new_res/3 < this->res/2) - new_res = this->res + this->res/2; - - ptr = MSVCP_allocator_wchar_allocate(this->allocator, new_res+1); - if(!ptr) - ptr = MSVCP_allocator_wchar_allocate(this->allocator, new_size+1); - else - new_size = new_res; - if(!ptr) { - ERR("Out of memory\n"); - basic_string_wchar__Tidy(this, TRUE); - return FALSE; - } - - if(this->ptr) - char_traits_wchar__Copy_s(ptr, new_size, this->ptr, this->size); - basic_string_wchar__Tidy(this, TRUE); - this->ptr = ptr; - this->res = new_size; - basic_string_wchar__Eos(this, len); - } else if(new_size == 0) - basic_string_wchar__Eos(this, 0); - - return (new_size>0); -} - /* ?_Freeze@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@AAEXXZ */ /* ?_Freeze@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@AEAAXXZ */ DEFINE_THISCALL_WRAPPER(basic_string_wchar__Freeze, 4)

1 0

Piotr Caban : msvcp60: Fix basic_string::rfind(char) implementation.
by Alexandre Julliard 05 Jan '12

05 Jan '12

Module: wine Branch: master Commit: 806d72cfdc30f69575e17e32af251858e538a029 URL: http://source.winehq.org/git/wine.git/?a=commit;h=806d72cfdc30f69575e17e32a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 5 14:23:15 2012 +0100 msvcp60: Fix basic_string::rfind(char) implementation. --- dlls/msvcp60/string.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp60/string.c b/dlls/msvcp60/string.c index 3d9f994..056f915 100644 --- a/dlls/msvcp60/string.c +++ b/dlls/msvcp60/string.c @@ -899,7 +899,7 @@ DEFINE_THISCALL_WRAPPER(basic_string_char_rfind_ch, 12) MSVCP_size_t __thiscall basic_string_char_rfind_ch( const basic_string_char *this, char ch, MSVCP_size_t pos) { - return basic_string_char_find_cstr_substr(this, &ch, pos, 1); + return basic_string_char_rfind_cstr_substr(this, &ch, pos, 1); } /* ?rfind@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEIPBDI@Z */ @@ -2594,7 +2594,7 @@ DEFINE_THISCALL_WRAPPER(basic_string_wchar_rfind_ch, 12) MSVCP_size_t __thiscall basic_string_wchar_rfind_ch( const basic_string_wchar *this, wchar_t ch, MSVCP_size_t pos) { - return basic_string_wchar_find_cstr_substr(this, &ch, pos, 1); + return basic_string_wchar_rfind_cstr_substr(this, &ch, pos, 1); } /* ?rfind@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QBEIPBGI@Z */

1 0

Piotr Caban : msvcp60: Added basic_string<unsigned short> implementation.
by Alexandre Julliard 05 Jan '12

05 Jan '12

Module: wine Branch: master Commit: f3df1d7cdca0ba3ed33f60bf7848c3b0fdf805b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3df1d7cdca0ba3ed33f60bf7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 5 14:22:55 2012 +0100 msvcp60: Added basic_string<unsigned short> implementation. --- dlls/msvcp60/msvcp60.spec | 660 +++++++++--------- dlls/msvcp60/string.c | 1699 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 2027 insertions(+), 332 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f3df1d7cdca0ba3ed33f6…

1 0

Hans Leidekker : msi: Don' t crash on secondary root folders in msi_resolve_target_folder.
by Alexandre Julliard 05 Jan '12

05 Jan '12

Module: wine Branch: master Commit: de11a50b915bbfbb124404b3a309b6dd8e6da9be URL: http://source.winehq.org/git/wine.git/?a=commit;h=de11a50b915bbfbb124404b3a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 5 10:20:18 2012 +0100 msi: Don't crash on secondary root folders in msi_resolve_target_folder. --- dlls/msi/action.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 8505507..fb62339 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2285,8 +2285,13 @@ void msi_resolve_target_folder( MSIPACKAGE *package, const WCHAR *name, BOOL loa } else if (!load_prop || !(path = msi_dup_property( package->db, folder->Directory ))) { - parent = msi_get_loaded_folder( package, folder->Parent ); - path = msi_build_directory_name( 3, parent->ResolvedTarget, folder->TargetDefault, NULL ); + if (folder->Parent && strcmpW( folder->Directory, folder->Parent )) + { + parent = msi_get_loaded_folder( package, folder->Parent ); + path = msi_build_directory_name( 3, parent->ResolvedTarget, folder->TargetDefault, NULL ); + } + else + path = msi_build_directory_name( 2, folder->TargetDefault, NULL ); } msi_clean_path( path ); if (folder->ResolvedTarget && !strcmpiW( path, folder->ResolvedTarget ))

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DPATCHEDGESTYLE typedef.
by Alexandre Julliard 05 Jan '12

05 Jan '12

Module: wine Branch: master Commit: c77b414787de984c7088326786a96111b2495136 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c77b414787de984c708832678… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 4 23:34:56 2012 +0100 wined3d: Get rid of the WINED3DPATCHEDGESTYLE typedef. --- dlls/wined3d/state.c | 2 +- dlls/wined3d/stateblock.c | 2 +- include/wine/wined3d.h | 9 ++++----- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 3c5220e..1bcecfd 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1826,7 +1826,7 @@ static void state_multisampmask(struct wined3d_context *context, const struct wi static void state_patchedgestyle(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - if (state->render_states[WINED3D_RS_PATCHEDGESTYLE] != WINED3DPATCHEDGE_DISCRETE) + if (state->render_states[WINED3D_RS_PATCHEDGESTYLE] != WINED3D_PATCH_EDGE_DISCRETE) FIXME("WINED3D_RS_PATCHEDGESTYLE %#x not yet implemented.\n", state->render_states[WINED3D_RS_PATCHEDGESTYLE]); } diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 1dd6b9c..d48464c 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1197,7 +1197,7 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock) state->render_states[WINED3D_RS_POINTSCALE_C] = tmpfloat.d; state->render_states[WINED3D_RS_MULTISAMPLEANTIALIAS] = TRUE; state->render_states[WINED3D_RS_MULTISAMPLEMASK] = 0xffffffff; - state->render_states[WINED3D_RS_PATCHEDGESTYLE] = WINED3DPATCHEDGE_DISCRETE; + state->render_states[WINED3D_RS_PATCHEDGESTYLE] = WINED3D_PATCH_EDGE_DISCRETE; tmpfloat.f = 1.0f; state->render_states[WINED3D_RS_PATCHSEGMENTS] = tmpfloat.d; state->render_states[WINED3D_RS_DEBUGMONITORTOKEN] = 0xbaadcafe; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 254a839..6cc8a05 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -488,12 +488,11 @@ enum wined3d_material_color_source WINED3D_MCS_COLOR2 = 2, }; -typedef enum _WINED3DPATCHEDGESTYLE +enum wined3d_patch_edge_style { - WINED3DPATCHEDGE_DISCRETE = 0, - WINED3DPATCHEDGE_CONTINUOUS = 1, - WINED3DPATCHEDGE_FORCE_DWORD = 0x7fffffff -} WINED3DPATCHEDGESTYLE; + WINED3D_PATCH_EDGE_DISCRETE = 0, + WINED3D_PATCH_EDGE_CONTINUOUS = 1, +}; typedef enum _WINED3DBACKBUFFER_TYPE {

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DMATERIALCOLORSOURCE typedef.
by Alexandre Julliard 05 Jan '12

05 Jan '12

Module: wine Branch: master Commit: c3cc92e472b59a9b7727d18151af42f2b368f9ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3cc92e472b59a9b7727d1815… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 4 23:34:55 2012 +0100 wined3d: Get rid of the WINED3DMATERIALCOLORSOURCE typedef. --- dlls/wined3d/state.c | 20 ++++++++++---------- dlls/wined3d/stateblock.c | 8 ++++---- include/wine/wined3d.h | 11 +++++------ 3 files changed, 19 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index a68fae9..3c5220e 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1264,47 +1264,47 @@ static void state_colormat(struct wined3d_context *context, const struct wined3d state->render_states[WINED3D_RS_EMISSIVEMATERIALSOURCE], state->render_states[WINED3D_RS_SPECULARMATERIALSOURCE]); - if (state->render_states[WINED3D_RS_DIFFUSEMATERIALSOURCE] == WINED3DMCS_COLOR1) + if (state->render_states[WINED3D_RS_DIFFUSEMATERIALSOURCE] == WINED3D_MCS_COLOR1) { - if (state->render_states[WINED3D_RS_AMBIENTMATERIALSOURCE] == WINED3DMCS_COLOR1) + if (state->render_states[WINED3D_RS_AMBIENTMATERIALSOURCE] == WINED3D_MCS_COLOR1) Parm = GL_AMBIENT_AND_DIFFUSE; else Parm = GL_DIFFUSE; - if (state->render_states[WINED3D_RS_EMISSIVEMATERIALSOURCE] == WINED3DMCS_COLOR1) + if (state->render_states[WINED3D_RS_EMISSIVEMATERIALSOURCE] == WINED3D_MCS_COLOR1) { context->untracked_materials[context->num_untracked_materials] = GL_EMISSION; context->num_untracked_materials++; } - if (state->render_states[WINED3D_RS_SPECULARMATERIALSOURCE] == WINED3DMCS_COLOR1) + if (state->render_states[WINED3D_RS_SPECULARMATERIALSOURCE] == WINED3D_MCS_COLOR1) { context->untracked_materials[context->num_untracked_materials] = GL_SPECULAR; context->num_untracked_materials++; } } - else if (state->render_states[WINED3D_RS_AMBIENTMATERIALSOURCE] == WINED3DMCS_COLOR1) + else if (state->render_states[WINED3D_RS_AMBIENTMATERIALSOURCE] == WINED3D_MCS_COLOR1) { Parm = GL_AMBIENT; - if (state->render_states[WINED3D_RS_EMISSIVEMATERIALSOURCE] == WINED3DMCS_COLOR1) + if (state->render_states[WINED3D_RS_EMISSIVEMATERIALSOURCE] == WINED3D_MCS_COLOR1) { context->untracked_materials[context->num_untracked_materials] = GL_EMISSION; context->num_untracked_materials++; } - if (state->render_states[WINED3D_RS_SPECULARMATERIALSOURCE] == WINED3DMCS_COLOR1) + if (state->render_states[WINED3D_RS_SPECULARMATERIALSOURCE] == WINED3D_MCS_COLOR1) { context->untracked_materials[context->num_untracked_materials] = GL_SPECULAR; context->num_untracked_materials++; } } - else if (state->render_states[WINED3D_RS_EMISSIVEMATERIALSOURCE] == WINED3DMCS_COLOR1) + else if (state->render_states[WINED3D_RS_EMISSIVEMATERIALSOURCE] == WINED3D_MCS_COLOR1) { Parm = GL_EMISSION; - if (state->render_states[WINED3D_RS_SPECULARMATERIALSOURCE] == WINED3DMCS_COLOR1) + if (state->render_states[WINED3D_RS_SPECULARMATERIALSOURCE] == WINED3D_MCS_COLOR1) { context->untracked_materials[context->num_untracked_materials] = GL_SPECULAR; context->num_untracked_materials++; } } - else if (state->render_states[WINED3D_RS_SPECULARMATERIALSOURCE] == WINED3DMCS_COLOR1) + else if (state->render_states[WINED3D_RS_SPECULARMATERIALSOURCE] == WINED3D_MCS_COLOR1) { Parm = GL_SPECULAR; } diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 0f9d07c..1dd6b9c 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1176,10 +1176,10 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock) state->render_states[WINED3D_RS_COLORVERTEX] = TRUE; state->render_states[WINED3D_RS_LOCALVIEWER] = TRUE; state->render_states[WINED3D_RS_NORMALIZENORMALS] = FALSE; - state->render_states[WINED3D_RS_DIFFUSEMATERIALSOURCE] = WINED3DMCS_COLOR1; - state->render_states[WINED3D_RS_SPECULARMATERIALSOURCE] = WINED3DMCS_COLOR2; - state->render_states[WINED3D_RS_AMBIENTMATERIALSOURCE] = WINED3DMCS_MATERIAL; - state->render_states[WINED3D_RS_EMISSIVEMATERIALSOURCE] = WINED3DMCS_MATERIAL; + state->render_states[WINED3D_RS_DIFFUSEMATERIALSOURCE] = WINED3D_MCS_COLOR1; + state->render_states[WINED3D_RS_SPECULARMATERIALSOURCE] = WINED3D_MCS_COLOR2; + state->render_states[WINED3D_RS_AMBIENTMATERIALSOURCE] = WINED3D_MCS_MATERIAL; + state->render_states[WINED3D_RS_EMISSIVEMATERIALSOURCE] = WINED3D_MCS_MATERIAL; state->render_states[WINED3D_RS_VERTEXBLEND] = WINED3D_VBF_DISABLE; state->render_states[WINED3D_RS_CLIPPLANEENABLE] = 0; state->render_states[WINED3D_RS_SOFTWAREVERTEXPROCESSING] = FALSE; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index cb09168..254a839 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -481,13 +481,12 @@ enum wined3d_stencil_op WINED3D_STENCIL_OP_DECR = 8, }; -typedef enum _WINED3DMATERIALCOLORSOURCE +enum wined3d_material_color_source { - WINED3DMCS_MATERIAL = 0, - WINED3DMCS_COLOR1 = 1, - WINED3DMCS_COLOR2 = 2, - WINED3DMCS_FORCE_DWORD = 0x7fffffff -} WINED3DMATERIALCOLORSOURCE; + WINED3D_MCS_MATERIAL = 0, + WINED3D_MCS_COLOR1 = 1, + WINED3D_MCS_COLOR2 = 2, +}; typedef enum _WINED3DPATCHEDGESTYLE {

1 0

Henri Verbeet : ddraw: Disallow clipped blits in ddraw_surface7_BltFast().
by Alexandre Julliard 05 Jan '12

05 Jan '12

Module: wine Branch: master Commit: 223b0736c0f6683c244c652d0857b774731f9bf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=223b0736c0f6683c244c652d0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 4 23:34:54 2012 +0100 ddraw: Disallow clipped blits in ddraw_surface7_BltFast(). --- dlls/ddraw/surface.c | 15 ++++++++++++++- dlls/ddraw/tests/ddraw1.c | 2 +- dlls/ddraw/tests/ddraw2.c | 2 +- dlls/ddraw/tests/ddraw4.c | 2 +- dlls/ddraw/tests/ddraw7.c | 2 +- 5 files changed, 18 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 04e8c52..0b9248c 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -3869,7 +3869,20 @@ static HRESULT WINAPI ddraw_surface7_BltFast(IDirectDrawSurface7 *iface, DWORD d flags |= WINEDDBLT_DONOTWAIT; wined3d_mutex_lock(); - hr = ddraw_surface_blt_clipped(This, &dst_rect, src, rsrc, flags, NULL, WINED3DTEXF_POINT); + if (This->clipper) + { + wined3d_mutex_unlock(); + WARN("Destination surface has a clipper set, returning DDERR_BLTFASTCANTCLIP.\n"); + return DDERR_BLTFASTCANTCLIP; + } + + if (src->surface_desc.ddsCaps.dwCaps & DDSCAPS_FRONTBUFFER) + hr = ddraw_surface_update_frontbuffer(src, rsrc, TRUE); + if (SUCCEEDED(hr)) + hr = wined3d_surface_blt(This->wined3d_surface, &dst_rect, + src->wined3d_surface, rsrc, flags, NULL, WINED3DTEXF_POINT); + if (SUCCEEDED(hr) && (This->surface_desc.ddsCaps.dwCaps & DDSCAPS_FRONTBUFFER)) + hr = ddraw_surface_update_frontbuffer(This, &dst_rect, FALSE); wined3d_mutex_unlock(); switch(hr) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index fdfa11f..e700919 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -332,7 +332,7 @@ static void test_clipper_blt(void) } hr = IDirectDrawSurface_BltFast(dst_surface, 0, 0, src_surface, NULL, DDBLTFAST_WAIT); - todo_wine ok(hr == DDERR_BLTFASTCANTCLIP || broken(hr == E_NOTIMPL /* NT4 */), "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_BLTFASTCANTCLIP || broken(hr == E_NOTIMPL /* NT4 */), "Got unexpected hr %#x.\n", hr); IDirectDrawSurface_Release(dst_surface); IDirectDrawSurface_Release(src_surface); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 7b046be..f99d480 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -339,7 +339,7 @@ static void test_clipper_blt(void) } hr = IDirectDrawSurface_BltFast(dst_surface, 0, 0, src_surface, NULL, DDBLTFAST_WAIT); - todo_wine ok(hr == DDERR_BLTFASTCANTCLIP || broken(hr == E_NOTIMPL /* NT4 */), "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_BLTFASTCANTCLIP || broken(hr == E_NOTIMPL /* NT4 */), "Got unexpected hr %#x.\n", hr); IDirectDrawSurface_Release(dst_surface); IDirectDrawSurface_Release(src_surface); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 26f5a0c..e2687fb 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -634,7 +634,7 @@ static void test_clipper_blt(void) } hr = IDirectDrawSurface4_BltFast(dst_surface, 0, 0, src_surface, NULL, DDBLTFAST_WAIT); - todo_wine ok(hr == DDERR_BLTFASTCANTCLIP, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_BLTFASTCANTCLIP, "Got unexpected hr %#x.\n", hr); IDirectDrawSurface4_Release(dst_surface); IDirectDrawSurface4_Release(src_surface); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 9e5e564..3dcb007 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -627,7 +627,7 @@ static void test_clipper_blt(void) } hr = IDirectDrawSurface7_BltFast(dst_surface, 0, 0, src_surface, NULL, DDBLTFAST_WAIT); - todo_wine ok(hr == DDERR_BLTFASTCANTCLIP, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_BLTFASTCANTCLIP, "Got unexpected hr %#x.\n", hr); IDirectDrawSurface7_Release(dst_surface); IDirectDrawSurface7_Release(src_surface);

1 0

Henri Verbeet : ddraw: Refuse to set a clip list if a clipper is already tracking a window.
by Alexandre Julliard 05 Jan '12

05 Jan '12

Module: wine Branch: master Commit: 99e5e3ac0d3c8161968eaa781e8ecd6f1b9a9887 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99e5e3ac0d3c8161968eaa781… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 4 23:34:53 2012 +0100 ddraw: Refuse to set a clip list if a clipper is already tracking a window. --- dlls/ddraw/clipper.c | 5 +++++ dlls/ddraw/tests/ddraw1.c | 2 +- dlls/ddraw/tests/ddraw2.c | 2 +- dlls/ddraw/tests/ddraw4.c | 2 +- dlls/ddraw/tests/ddraw7.c | 2 +- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/clipper.c b/dlls/ddraw/clipper.c index c67a951..b3482e7 100644 --- a/dlls/ddraw/clipper.c +++ b/dlls/ddraw/clipper.c @@ -180,8 +180,13 @@ static HRESULT WINAPI ddraw_clipper_GetClipList(IDirectDrawClipper *iface, RECT *****************************************************************************/ static HRESULT WINAPI ddraw_clipper_SetClipList(IDirectDrawClipper *iface, RGNDATA *region, DWORD flags) { + struct ddraw_clipper *clipper = impl_from_IDirectDrawClipper(iface); + FIXME("iface %p, region %p, flags %#x stub!\n", iface, region, flags); + if (clipper->window) + return DDERR_CLIPPERISUSINGHWND; + return DD_OK; } diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index e419e62..fdfa11f 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -248,7 +248,7 @@ static void test_clipper_blt(void) DeleteObject(r1); hr = IDirectDrawClipper_SetClipList(clipper, rgn_data, 0); - todo_wine ok(hr == DDERR_CLIPPERISUSINGHWND, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_CLIPPERISUSINGHWND, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawClipper_SetHWnd(clipper, 0, NULL); ok(SUCCEEDED(hr), "Failed to set clipper window, hr %#x.\n", hr); hr = IDirectDrawClipper_SetClipList(clipper, rgn_data, 0); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 5fb47c0..7b046be 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -255,7 +255,7 @@ static void test_clipper_blt(void) DeleteObject(r1); hr = IDirectDrawClipper_SetClipList(clipper, rgn_data, 0); - todo_wine ok(hr == DDERR_CLIPPERISUSINGHWND, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_CLIPPERISUSINGHWND, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawClipper_SetHWnd(clipper, 0, NULL); ok(SUCCEEDED(hr), "Failed to set clipper window, hr %#x.\n", hr); hr = IDirectDrawClipper_SetClipList(clipper, rgn_data, 0); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 134af22..26f5a0c 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -550,7 +550,7 @@ static void test_clipper_blt(void) DeleteObject(r1); hr = IDirectDrawClipper_SetClipList(clipper, rgn_data, 0); - todo_wine ok(hr == DDERR_CLIPPERISUSINGHWND, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_CLIPPERISUSINGHWND, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawClipper_SetHWnd(clipper, 0, NULL); ok(SUCCEEDED(hr), "Failed to set clipper window, hr %#x.\n", hr); hr = IDirectDrawClipper_SetClipList(clipper, rgn_data, 0); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 14477c1..9e5e564 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -543,7 +543,7 @@ static void test_clipper_blt(void) DeleteObject(r1); hr = IDirectDrawClipper_SetClipList(clipper, rgn_data, 0); - todo_wine ok(hr == DDERR_CLIPPERISUSINGHWND, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_CLIPPERISUSINGHWND, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawClipper_SetHWnd(clipper, 0, NULL); ok(SUCCEEDED(hr), "Failed to set clipper window, hr %#x.\n", hr); hr = IDirectDrawClipper_SetClipList(clipper, rgn_data, 0);

1 0

Henri Verbeet : ddraw/tests: Add some clipper tests.
by Alexandre Julliard 05 Jan '12

05 Jan '12

Module: wine Branch: master Commit: 3997457574a0e3f1c2fa095e230ab6d71211e892 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3997457574a0e3f1c2fa095e2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 4 23:34:52 2012 +0100 ddraw/tests: Add some clipper tests. --- dlls/ddraw/tests/ddraw1.c | 217 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 217 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 216 ++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 216 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 866 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3997457574a0e3f1c2fa0…

1 0

Dmitry Timoshkov : user32: Add an invalid window check to SetActiveWindow.
by Alexandre Julliard 05 Jan '12

05 Jan '12

Module: wine Branch: master Commit: 98e2bf4e1ccd5ffa4fbadf08a951754ff1cc7945 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98e2bf4e1ccd5ffa4fbadf08a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jan 5 17:58:30 2012 +0800 user32: Add an invalid window check to SetActiveWindow. --- dlls/user32/focus.c | 12 +++++++++--- dlls/user32/tests/msg.c | 3 +-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/user32/focus.c b/dlls/user32/focus.c index 9fdae25..6b5312f 100644 --- a/dlls/user32/focus.c +++ b/dlls/user32/focus.c @@ -232,12 +232,18 @@ HWND WINAPI SetActiveWindow( HWND hwnd ) if (hwnd) { - LONG style = GetWindowLongW( hwnd, GWL_STYLE ); + LONG style; + hwnd = WIN_GetFullHandle( hwnd ); + if (!IsWindow( hwnd )) + { + SetLastError( ERROR_INVALID_WINDOW_HANDLE ); + return 0; + } + + style = GetWindowLongW( hwnd, GWL_STYLE ); if ((style & (WS_POPUP|WS_CHILD)) == WS_CHILD) return GetActiveWindow(); /* Windows doesn't seem to return an error here */ - - hwnd = WIN_GetFullHandle( hwnd ); } if (!set_active_window( hwnd, &prev, FALSE, TRUE )) return 0; diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 6fa4d10..6f40a0b 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -13602,10 +13602,9 @@ static void test_SetFocus(void) SetLastError(0xdeadbeef); old_active = SetActiveWindow((HWND)0xdeadbeef); -todo_wine ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "expected ERROR_INVALID_WINDOW_HANDLE, got %d\n", GetLastError()); while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) DispatchMessage(&msg); - ok_sequence(WmEmptySeq, "SetActiveWindow on an invalid window", TRUE); + ok_sequence(WmEmptySeq, "SetActiveWindow on an invalid window", FALSE); ok(old_active == 0, "expected old focus 0, got %p\n", old_active); ok(GetActiveWindow() == parent, "expected active %p, got %p\n", parent, GetActiveWindow()); ok(GetFocus() == parent, "expected focus %p, got %p\n", parent, GetFocus());

1 0

← Newer
1
...
83
84
85
86
87
88
89
...
98
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2012