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

Józef Kucia : wined3d: Use wined3d samplers unconditionally for applying legacy sampler states.
by Alexandre Julliard 20 Mar '17

20 Mar '17

Module: wine Branch: master Commit: 591a3b1be84c1f3599fdc31b26d43facbbd9781f URL: http://source.winehq.org/git/wine.git/?a=commit;h=591a3b1be84c1f3599fdc31b2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Mar 20 12:13:07 2017 +0100 wined3d: Use wined3d samplers unconditionally for applying legacy sampler states. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/state.c | 40 +++++++++++++++------------------------- 1 file changed, 15 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 8084cfb..7fcd2b9 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3611,51 +3611,41 @@ static void sampler(struct wined3d_context *context, const struct wined3d_state if (state->textures[sampler_idx]) { - struct wined3d_texture *texture = state->textures[sampler_idx]; BOOL srgb = state->sampler_states[sampler_idx][WINED3D_SAMP_SRGB_TEXTURE]; const DWORD *sampler_states = state->sampler_states[sampler_idx]; + struct wined3d_texture *texture = state->textures[sampler_idx]; + struct wined3d_device *device = context->device; struct wined3d_sampler_desc desc; + struct wined3d_sampler *sampler; + struct wine_rb_entry *entry; struct gl_texture *gl_tex; unsigned int base_level; wined3d_sampler_desc_from_sampler_states(&desc, context, sampler_states, texture); wined3d_texture_bind(texture, context, srgb); - if (!gl_info->supported[ARB_SAMPLER_OBJECTS]) + + if ((entry = wine_rb_get(&device->samplers, &desc))) { - wined3d_texture_apply_sampler_desc(texture, &desc, context); + sampler = WINE_RB_ENTRY_VALUE(entry, struct wined3d_sampler, entry); } else { - struct wined3d_device *device = context->device; - struct wined3d_sampler *sampler; - struct wine_rb_entry *entry; - - if ((entry = wine_rb_get(&device->samplers, &desc))) + if (FAILED(wined3d_sampler_create(device, &desc, NULL, &sampler))) { - sampler = WINE_RB_ENTRY_VALUE(entry, struct wined3d_sampler, entry); + ERR("Failed to create sampler.\n"); + sampler = NULL; } else { - if (FAILED(wined3d_sampler_create(device, &desc, NULL, &sampler))) - { - ERR("Failed to create sampler.\n"); - sampler = NULL; - } - else - { - if (wine_rb_put(&device->samplers, &desc, &sampler->entry) == -1) - ERR("Failed to insert sampler.\n"); - } - } - - if (sampler) - { - GL_EXTCALL(glBindSampler(mapped_stage, sampler->name)); - checkGLcall("glBindSampler"); + if (wine_rb_put(&device->samplers, &desc, &sampler->entry) == -1) + ERR("Failed to insert sampler.\n"); } } + if (sampler) + wined3d_sampler_bind(sampler, mapped_stage, texture, context); + if (texture->flags & WINED3D_TEXTURE_COND_NP2) base_level = 0; else if (desc.mip_filter == WINED3D_TEXF_NONE)

1 0

Józef Kucia : wined3d: Make wined3d samplers responsible for setting texture base level.
by Alexandre Julliard 20 Mar '17

20 Mar '17

Module: wine Branch: master Commit: ec1da699d947d077ce4fe22a8119a7528296a1da URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec1da699d947d077ce4fe22a8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Mar 20 12:13:08 2017 +0100 wined3d: Make wined3d samplers responsible for setting texture base level. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/state.c | 1 + dlls/wined3d/device.c | 1 + dlls/wined3d/sampler.c | 28 ++++++++++++++++++++++++++++ dlls/wined3d/state.c | 22 +--------------------- include/wine/wined3d.h | 1 + 5 files changed, 32 insertions(+), 21 deletions(-) diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 77c8e55..0a16e58 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -1205,6 +1205,7 @@ HRESULT d3d_sampler_state_init(struct d3d_sampler_state *state, struct d3d_devic wined3d_desc.lod_bias = desc->MipLODBias; wined3d_desc.min_lod = desc->MinLOD; wined3d_desc.max_lod = desc->MaxLOD; + wined3d_desc.mip_base_level = 0; wined3d_desc.max_anisotropy = D3D11_DECODE_IS_ANISOTROPIC_FILTER(desc->Filter) ? desc->MaxAnisotropy : 1; wined3d_desc.compare = wined3d_texture_compare_from_d3d11(desc->Filter); wined3d_desc.comparison_func = wined3d_cmp_func_from_d3d11(desc->ComparisonFunc); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a34cb97..9b0fcfb 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -788,6 +788,7 @@ static void create_default_samplers(struct wined3d_device *device, struct wined3 desc.lod_bias = 0.0f; desc.min_lod = -1000.0f; desc.max_lod = 1000.0f; + desc.mip_base_level = 0; desc.max_anisotropy = 1; desc.compare = FALSE; desc.comparison_func = WINED3D_CMP_NEVER; diff --git a/dlls/wined3d/sampler.c b/dlls/wined3d/sampler.c index c1364c2..294d766 100644 --- a/dlls/wined3d/sampler.c +++ b/dlls/wined3d/sampler.c @@ -151,6 +151,31 @@ HRESULT CDECL wined3d_sampler_create(struct wined3d_device *device, const struct return WINED3D_OK; } +static void texture_apply_base_level(struct wined3d_texture *texture, + const struct wined3d_sampler_desc *desc, const struct wined3d_gl_info *gl_info) +{ + struct gl_texture *gl_tex; + unsigned int base_level; + + if (texture->flags & WINED3D_TEXTURE_COND_NP2) + base_level = 0; + else if (desc->mip_filter == WINED3D_TEXF_NONE) + base_level = texture->lod; + else + base_level = min(max(desc->mip_base_level, texture->lod), texture->level_count - 1); + + gl_tex = wined3d_texture_get_gl_texture(texture, texture->flags & WINED3D_TEXTURE_IS_SRGB); + if (base_level != gl_tex->base_level) + { + /* Note that WINED3D_SAMP_MAX_MIP_LEVEL specifies the largest mipmap + * (default 0), while GL_TEXTURE_MAX_LEVEL specifies the smallest + * mipmap used (default 1000). So WINED3D_SAMP_MAX_MIP_LEVEL + * corresponds to GL_TEXTURE_BASE_LEVEL. */ + gl_info->gl_ops.gl.p_glTexParameteri(texture->target, GL_TEXTURE_BASE_LEVEL, base_level); + gl_tex->base_level = base_level; + } +} + /* This function relies on the correct texture being bound and loaded. */ void wined3d_sampler_bind(struct wined3d_sampler *sampler, unsigned int unit, struct wined3d_texture *texture, const struct wined3d_context *context) @@ -170,4 +195,7 @@ void wined3d_sampler_bind(struct wined3d_sampler *sampler, unsigned int unit, { ERR("Could not apply sampler state.\n"); } + + if (texture) + texture_apply_base_level(texture, &sampler->desc, gl_info); } diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 7fcd2b9..409c161 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3562,6 +3562,7 @@ static void wined3d_sampler_desc_from_sampler_states(struct wined3d_sampler_desc desc->lod_bias = lod_bias.f; desc->min_lod = -1000.0f; desc->max_lod = 1000.0f; + desc->mip_base_level = sampler_states[WINED3D_SAMP_MAX_MIP_LEVEL]; desc->max_anisotropy = sampler_states[WINED3D_SAMP_MAX_ANISOTROPY]; if ((sampler_states[WINED3D_SAMP_MAG_FILTER] != WINED3D_TEXF_ANISOTROPIC && sampler_states[WINED3D_SAMP_MIN_FILTER] != WINED3D_TEXF_ANISOTROPIC @@ -3618,8 +3619,6 @@ static void sampler(struct wined3d_context *context, const struct wined3d_state struct wined3d_sampler_desc desc; struct wined3d_sampler *sampler; struct wine_rb_entry *entry; - struct gl_texture *gl_tex; - unsigned int base_level; wined3d_sampler_desc_from_sampler_states(&desc, context, sampler_states, texture); @@ -3646,25 +3645,6 @@ static void sampler(struct wined3d_context *context, const struct wined3d_state if (sampler) wined3d_sampler_bind(sampler, mapped_stage, texture, context); - if (texture->flags & WINED3D_TEXTURE_COND_NP2) - base_level = 0; - else if (desc.mip_filter == WINED3D_TEXF_NONE) - base_level = texture->lod; - else - base_level = min(max(sampler_states[WINED3D_SAMP_MAX_MIP_LEVEL], - texture->lod), texture->level_count - 1); - - gl_tex = wined3d_texture_get_gl_texture(texture, texture->flags & WINED3D_TEXTURE_IS_SRGB); - if (base_level != gl_tex->base_level) - { - /* Note that WINED3D_SAMP_MAX_MIP_LEVEL specifies the largest mipmap - * (default 0), while GL_TEXTURE_MAX_LEVEL specifies the smallest - * mipmap used (default 1000). So WINED3D_SAMP_MAX_MIP_LEVEL - * corresponds to GL_TEXTURE_BASE_LEVEL. */ - gl_info->gl_ops.gl.p_glTexParameteri(texture->target, GL_TEXTURE_BASE_LEVEL, base_level); - gl_tex->base_level = base_level; - } - /* Trigger shader constant reloading (for NP2 texcoord fixup) */ if (!(texture->flags & WINED3D_TEXTURE_POW2_MAT_IDENT)) context->constant_update_mask |= WINED3D_SHADER_CONST_PS_NP2_FIXUP; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index acdb4f3..3b0f6db 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1942,6 +1942,7 @@ struct wined3d_sampler_desc float lod_bias; float min_lod; float max_lod; + unsigned int mip_base_level; unsigned int max_anisotropy; BOOL compare; enum wined3d_cmp_func comparison_func;

1 0

Józef Kucia : wined3d: Abort state application when there is problem with newly created sampler object.
by Alexandre Julliard 20 Mar '17

20 Mar '17

Module: wine Branch: master Commit: de0a88538c9f8554a8658a90c5d4175121647aaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=de0a88538c9f8554a8658a90c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Mar 20 12:13:09 2017 +0100 wined3d: Abort state application when there is problem with newly created sampler object. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/state.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 409c161..8ff1b46 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3633,17 +3633,17 @@ static void sampler(struct wined3d_context *context, const struct wined3d_state if (FAILED(wined3d_sampler_create(device, &desc, NULL, &sampler))) { ERR("Failed to create sampler.\n"); - sampler = NULL; + return; } - else + if (wine_rb_put(&device->samplers, &desc, &sampler->entry) == -1) { - if (wine_rb_put(&device->samplers, &desc, &sampler->entry) == -1) - ERR("Failed to insert sampler.\n"); + ERR("Failed to insert sampler.\n"); + wined3d_sampler_decref(sampler); + return; } } - if (sampler) - wined3d_sampler_bind(sampler, mapped_stage, texture, context); + wined3d_sampler_bind(sampler, mapped_stage, texture, context); /* Trigger shader constant reloading (for NP2 texcoord fixup) */ if (!(texture->flags & WINED3D_TEXTURE_POW2_MAT_IDENT))

1 0

Józef Kucia : wined3d: Remove irrelevant comment.
by Alexandre Julliard 20 Mar '17

20 Mar '17

Module: wine Branch: master Commit: 2c7381e3296e424350ec009c0ae127dff38defa8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c7381e3296e424350ec009c0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Mar 20 12:13:10 2017 +0100 wined3d: Remove irrelevant comment. The transform_texture() function calls context_active_texture(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/state.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 8ff1b46..7ad98b8 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3494,10 +3494,7 @@ static void sampler_texmatrix(struct wined3d_context *context, const struct wine /* The fixed function np2 texture emulation uses the texture matrix to fix up the coordinates * wined3d_texture_apply_state_changes() multiplies the set matrix with a fixup matrix. Before the - * scaling is reapplied or removed, the texture matrix has to be reapplied - * - * The mapped stage is already active because the sampler() function below, which is part of the - * misc pipeline + * scaling is reapplied or removed, the texture matrix has to be reapplied. */ if (sampler < MAX_TEXTURES) { @@ -3599,7 +3596,6 @@ static void sampler(struct wined3d_context *context, const struct wined3d_state TRACE("Sampler %u.\n", sampler_idx); - if (mapped_stage == WINED3D_UNMAPPED_STAGE) { TRACE("No sampler mapped to stage %u. Returning.\n", sampler_idx);

1 0

Akihiro Sagawa : regsvr32: Use neutral language for the version resource.
by Alexandre Julliard 20 Mar '17

20 Mar '17

Module: wine Branch: master Commit: cd37c6e13b3632af2f0a5f4b11f94e492369d967 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd37c6e13b3632af2f0a5f4b1… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Mar 20 21:44:03 2017 +0900 regsvr32: Use neutral language for the version resource. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regsvr32/regsvr32.rc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/programs/regsvr32/regsvr32.rc b/programs/regsvr32/regsvr32.rc index 3169b71..c7fc2c3 100644 --- a/programs/regsvr32/regsvr32.rc +++ b/programs/regsvr32/regsvr32.rc @@ -50,6 +50,8 @@ Options:\n\ STRING_UNINSTALL_SUCCESSFUL, "regsvr32: Successfully uninstalled DLL '%1'\n" } +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + #define WINE_FILEDESCRIPTION_STR "Wine Register Server" #define WINE_FILENAME_STR "REGSVR32.EXE" #define WINE_FILETYPE VFT_APP

1 0

Akihiro Sagawa : explorer: Use neutral language for the version resource.
by Alexandre Julliard 20 Mar '17

20 Mar '17

Module: wine Branch: master Commit: ecd34e5896ba8c9900fdc5e0ef40a4f6737da57f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecd34e5896ba8c9900fdc5e0e… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Mar 20 21:44:04 2017 +0900 explorer: Use neutral language for the version resource. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/explorer.rc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/programs/explorer/explorer.rc b/programs/explorer/explorer.rc index 53224a8..b9ca5d8 100644 --- a/programs/explorer/explorer.rc +++ b/programs/explorer/explorer.rc @@ -33,6 +33,8 @@ STRINGTABLE IDS_RUN "&Run..." } +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + #define WINE_FILEDESCRIPTION_STR "Wine Explorer" #define WINE_FILENAME_STR "explorer.exe" #define WINE_FILEVERSION 6,1,7601,17567

1 0

Gijs Vermeulen : msvcrt: Add stub for Concurrency::Alloc.
by Alexandre Julliard 20 Mar '17

20 Mar '17

Module: wine Branch: master Commit: 32a4bec9099676ce1ade3fbd2871195f9596686c URL: http://source.winehq.org/git/wine.git/?a=commit;h=32a4bec9099676ce1ade3fbd2… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Sat Mar 18 12:27:44 2017 +0100 msvcrt: Add stub for Concurrency::Alloc. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/concrt140.spec | 4 ++-- dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr110/msvcr110.spec | 4 ++-- dlls/msvcr120/msvcr120.spec | 4 ++-- dlls/msvcr120_app/msvcr120_app.spec | 4 ++-- dlls/msvcrt/heap.c | 9 +++++++++ 6 files changed, 19 insertions(+), 10 deletions(-) diff --git a/dlls/concrt140/concrt140.spec b/dlls/concrt140/concrt140.spec index dd8d13a..d510a3b 100644 --- a/dlls/concrt140/concrt140.spec +++ b/dlls/concrt140/concrt140.spec @@ -217,8 +217,8 @@ @ stub -arch=i386 ??_F_Scheduler(a)details@Concurrency@@QAEXXZ @ stub -arch=win64 ??_F_Scheduler(a)details@Concurrency@@QEAAXXZ # extern ?AgentEventGuid(a)Concurrency@@3U_GUID@@B -@ stub -arch=win32 ?Alloc(a)Concurrency@@YAPAXI(a)Z -@ stub -arch=win64 ?Alloc(a)Concurrency@@YAPEAX_K(a)Z +@ cdecl -arch=win32 ?Alloc(a)Concurrency@@YAPAXI(a)Z(long) msvcr120.?Alloc(a)Concurrency@@YAPAXI(a)Z +@ cdecl -arch=win64 ?Alloc(a)Concurrency@@YAPEAX_K(a)Z(long) msvcr120.?Alloc(a)Concurrency@@YAPEAX_K(a)Z @ stub -arch=win64 ?Block(a)Context@Concurrency@@SAXXZ # extern ?ChoreEventGuid(a)Concurrency@@3U_GUID@@B # extern ?ConcRTEventGuid(a)Concurrency@@3U_GUID@@B diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 729d16f..3875304 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -242,8 +242,8 @@ @ cdecl -arch=win64 ??_U(a)YAPEAX_KHPEBDH@Z(long long str long) MSVCRT_operator_new_dbg @ cdecl -arch=win32 ??_V(a)YAXPAX@Z(ptr) MSVCRT_operator_delete @ cdecl -arch=win64 ??_V(a)YAXPEAX@Z(ptr) MSVCRT_operator_delete -@ stub -arch=win32 ?Alloc(a)Concurrency@@YAPAXI(a)Z -@ stub -arch=win64 ?Alloc(a)Concurrency@@YAPEAX_K(a)Z +@ cdecl -arch=win32 ?Alloc(a)Concurrency@@YAPAXI(a)Z(long) Concurrency_Alloc +@ cdecl -arch=win64 ?Alloc(a)Concurrency@@YAPEAX_K(a)Z(long) Concurrency_Alloc @ stub ?Block(a)Context@Concurrency@@SAXXZ @ stub -arch=win32 ?Create(a)CurrentScheduler@Concurrency@@SAXABVSchedulerPolicy(a)2@@Z @ stub -arch=win64 ?Create(a)CurrentScheduler@Concurrency@@SAXAEBVSchedulerPolicy(a)2@@Z diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index fa3206d..4026b1b 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -400,8 +400,8 @@ @ cdecl -arch=win64 ??_V(a)YAXPEAX@Z(ptr) MSVCRT_operator_delete @ stub -arch=win32 ??_V(a)YAXPAXHPBDH@Z @ stub -arch=win64 ??_V(a)YAXPEAXHPEBDH@Z -@ stub -arch=win32 ?Alloc(a)Concurrency@@YAPAXI(a)Z -@ stub -arch=win64 ?Alloc(a)Concurrency@@YAPEAX_K(a)Z +@ cdecl -arch=win32 ?Alloc(a)Concurrency@@YAPAXI(a)Z(long) Concurrency_Alloc +@ cdecl -arch=win64 ?Alloc(a)Concurrency@@YAPEAX_K(a)Z(long) Concurrency_Alloc @ stub ?Block(a)Context@Concurrency@@SAXXZ @ stub -arch=win32 ?Create(a)CurrentScheduler@Concurrency@@SAXABVSchedulerPolicy(a)2@@Z @ stub -arch=win64 ?Create(a)CurrentScheduler@Concurrency@@SAXAEBVSchedulerPolicy(a)2@@Z diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 84edf51..27c800b 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -396,8 +396,8 @@ @ cdecl -arch=win64 ??_V(a)YAXPEAX@Z(ptr) MSVCRT_operator_delete @ stub -arch=win32 ??_V(a)YAXPAXHPBDH@Z @ stub -arch=win64 ??_V(a)YAXPEAXHPEBDH@Z -@ stub -arch=win32 ?Alloc(a)Concurrency@@YAPAXI(a)Z -@ stub -arch=win64 ?Alloc(a)Concurrency@@YAPEAX_K(a)Z +@ cdecl -arch=win32 ?Alloc(a)Concurrency@@YAPAXI(a)Z(long) Concurrency_Alloc +@ cdecl -arch=win64 ?Alloc(a)Concurrency@@YAPEAX_K(a)Z(long) Concurrency_Alloc @ stub ?Block(a)Context@Concurrency@@SAXXZ @ stub -arch=win32 ?CaptureCallstack(a)platform@details(a)Concurrency@@YAIPAPAXII(a)Z @ stub -arch=win64 ?CaptureCallstack(a)platform@details(a)Concurrency@@YA_KPEAPEAX_K1(a)Z diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 46a76da..dcb391c 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -393,8 +393,8 @@ @ cdecl -arch=win64 ??_V(a)YAXPEAX@Z(ptr) msvcr120.??_V(a)YAXPEAX@Z @ stub -arch=win32 ??_V(a)YAXPAXHPBDH@Z @ stub -arch=win64 ??_V(a)YAXPEAXHPEBDH@Z -@ stub -arch=win32 ?Alloc(a)Concurrency@@YAPAXI(a)Z -@ stub -arch=win64 ?Alloc(a)Concurrency@@YAPEAX_K(a)Z +@ cdecl -arch=win32 ?Alloc(a)Concurrency@@YAPAXI(a)Z(long) msvcr120.?Alloc(a)Concurrency@@YAPAXI(a)Z +@ cdecl -arch=win64 ?Alloc(a)Concurrency@@YAPEAX_K(a)Z(long) msvcr120.?Alloc(a)Concurrency@@YAPEAX_K(a)Z @ stub ?Block(a)Context@Concurrency@@SAXXZ @ stub ?CaptureCallstack(a)platform@details(a)Concurrency@@YAIPAPAXII(a)Z @ stub -arch=win32 ?Create(a)CurrentScheduler@Concurrency@@SAXABVSchedulerPolicy(a)2@@Z diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index 3ae2599..f99f9c3 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -864,3 +864,12 @@ void msvcrt_destroy_heap(void) if(sb_heap) HeapDestroy(sb_heap); } + +/* ?Alloc(a)Concurrency@@YAPAXI(a)Z */ +/* ?Alloc(a)Concurrency@@YAPEAX_K(a)Z */ +void * CDECL Concurrency_Alloc(MSVCRT_size_t size) +{ + void *p = MSVCRT_malloc(size); + FIXME("(%ld) returning %p\n", size, p); + return p; +}

1 0

Gijs Vermeulen : msvcrt: Add stub for Concurrency::Free.
by Alexandre Julliard 20 Mar '17

20 Mar '17

Module: wine Branch: master Commit: 9b6455359acc2b28a7a61afc67ab0990e5f55ee7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b6455359acc2b28a7a61afc6… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Sat Mar 18 00:12:16 2017 +0100 msvcrt: Add stub for Concurrency::Free. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/concrt140.spec | 4 ++-- dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr110/msvcr110.spec | 4 ++-- dlls/msvcr120/msvcr120.spec | 4 ++-- dlls/msvcr120_app/msvcr120_app.spec | 4 ++-- dlls/msvcrt/heap.c | 8 ++++++++ 6 files changed, 18 insertions(+), 10 deletions(-) diff --git a/dlls/concrt140/concrt140.spec b/dlls/concrt140/concrt140.spec index d510a3b..855e366 100644 --- a/dlls/concrt140/concrt140.spec +++ b/dlls/concrt140/concrt140.spec @@ -239,8 +239,8 @@ @ stub -arch=win64 ?Detach(a)CurrentScheduler@Concurrency@@SAXXZ @ stub -arch=win64 ?DisableTracing(a)Concurrency@@YAJXZ @ stub -arch=win64 ?EnableTracing(a)Concurrency@@YAJXZ -@ stub -arch=win32 ?Free(a)Concurrency@@YAXPAX(a)Z -@ stub -arch=win64 ?Free(a)Concurrency@@YAXPEAX(a)Z +@ cdecl -arch=win32 ?Free(a)Concurrency@@YAXPAX(a)Z(ptr) msvcr120.?Free(a)Concurrency@@YAXPAX(a)Z +@ cdecl -arch=win64 ?Free(a)Concurrency@@YAXPEAX(a)Z(ptr) msvcr120.?Free(a)Concurrency@@YAXPEAX(a)Z @ stub -arch=win32 ?Get(a)CurrentScheduler@Concurrency@@SAPAVScheduler(a)2@XZ @ stub -arch=win64 ?Get(a)CurrentScheduler@Concurrency@@SAPEAVScheduler(a)2@XZ @ stub -arch=win64 ?GetExecutionContextId(a)Concurrency@@YAIXZ diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 3875304..d60c2c2 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -258,8 +258,8 @@ @ stub ?Detach(a)CurrentScheduler@Concurrency@@SAXXZ @ stub ?DisableTracing(a)Concurrency@@YAJXZ @ stub ?EnableTracing(a)Concurrency@@YAJXZ -@ stub -arch=win32 ?Free(a)Concurrency@@YAXPAX(a)Z -@ stub -arch=win64 ?Free(a)Concurrency@@YAXPEAX(a)Z +@ cdecl -arch=win32 ?Free(a)Concurrency@@YAXPAX(a)Z(ptr) Concurrency_Free +@ cdecl -arch=win64 ?Free(a)Concurrency@@YAXPEAX(a)Z(ptr) Concurrency_Free @ stub -arch=win32 ?Get(a)CurrentScheduler@Concurrency@@SAPAVScheduler(a)2@XZ @ stub -arch=win64 ?Get(a)CurrentScheduler@Concurrency@@SAPEAVScheduler(a)2@XZ @ stub ?GetExecutionContextId(a)Concurrency@@YAIXZ diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 4026b1b..f9b6613 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -418,8 +418,8 @@ @ stub ?Detach(a)CurrentScheduler@Concurrency@@SAXXZ @ stub ?DisableTracing(a)Concurrency@@YAJXZ @ stub ?EnableTracing(a)Concurrency@@YAJXZ -@ stub -arch=win32 ?Free(a)Concurrency@@YAXPAX(a)Z -@ stub -arch=win64 ?Free(a)Concurrency@@YAXPEAX(a)Z +@ cdecl -arch=win32 ?Free(a)Concurrency@@YAXPAX(a)Z(ptr) Concurrency_Free +@ cdecl -arch=win64 ?Free(a)Concurrency@@YAXPEAX(a)Z(ptr) Concurrency_Free @ stub -arch=win32 ?Get(a)CurrentScheduler@Concurrency@@SAPAVScheduler(a)2@XZ @ stub -arch=win64 ?Get(a)CurrentScheduler@Concurrency@@SAPEAVScheduler(a)2@XZ @ stub ?GetExecutionContextId(a)Concurrency@@YAIXZ diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 27c800b..48129f6 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -416,8 +416,8 @@ @ stub ?Detach(a)CurrentScheduler@Concurrency@@SAXXZ @ stub ?DisableTracing(a)Concurrency@@YAJXZ @ stub ?EnableTracing(a)Concurrency@@YAJXZ -@ stub -arch=win32 ?Free(a)Concurrency@@YAXPAX(a)Z -@ stub -arch=win64 ?Free(a)Concurrency@@YAXPEAX(a)Z +@ cdecl -arch=win32 ?Free(a)Concurrency@@YAXPAX(a)Z(ptr) Concurrency_Free +@ cdecl -arch=win64 ?Free(a)Concurrency@@YAXPEAX(a)Z(ptr) Concurrency_Free @ stub -arch=win32 ?Get(a)CurrentScheduler@Concurrency@@SAPAVScheduler(a)2@XZ @ stub -arch=win64 ?Get(a)CurrentScheduler@Concurrency@@SAPEAVScheduler(a)2@XZ @ stub ?GetCurrentThreadId(a)platform@details(a)Concurrency@@YAJXZ diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index dcb391c..7242cb9 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -412,8 +412,8 @@ @ stub ?Detach(a)CurrentScheduler@Concurrency@@SAXXZ @ stub ?DisableTracing(a)Concurrency@@YAJXZ @ stub ?EnableTracing(a)Concurrency@@YAJXZ -@ stub -arch=win32 ?Free(a)Concurrency@@YAXPAX(a)Z -@ stub -arch=win64 ?Free(a)Concurrency@@YAXPEAX(a)Z +@ cdecl -arch=win32 ?Free(a)Concurrency@@YAXPAX(a)Z(ptr) msvcr120.?Free(a)Concurrency@@YAXPAX(a)Z +@ cdecl -arch=win64 ?Free(a)Concurrency@@YAXPEAX(a)Z(ptr) msvcr120.?Free(a)Concurrency@@YAXPEAX(a)Z @ stub -arch=win32 ?Get(a)CurrentScheduler@Concurrency@@SAPAVScheduler(a)2@XZ @ stub -arch=win64 ?Get(a)CurrentScheduler@Concurrency@@SAPEAVScheduler(a)2@XZ @ stub ?GetCurrentThreadId(a)platform@details(a)Concurrency@@YAJXZ diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index f99f9c3..ba07bb0 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -873,3 +873,11 @@ void * CDECL Concurrency_Alloc(MSVCRT_size_t size) FIXME("(%ld) returning %p\n", size, p); return p; } + +/* ?Free(a)Concurrency@@YAXPAX(a)Z */ +/* ?Free(a)Concurrency@@YAXPEAX(a)Z */ +void CDECL Concurrency_Free(void* mem) +{ + FIXME("(%p) stub\n", mem); + MSVCRT_free(mem); +}

1 0

Daniel Lehman : msvcrt: Add _Trace_ppl_function stub.
by Alexandre Julliard 20 Mar '17

20 Mar '17

Module: wine Branch: master Commit: 4db4d61bbb1a89b5f87ecb8efe32b3c31b863e2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4db4d61bbb1a89b5f87ecb8ef… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu Sep 29 16:57:04 2016 -0700 msvcrt: Add _Trace_ppl_function stub. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/concrt140.spec | 4 ++-- dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr110/msvcr110.spec | 4 ++-- dlls/msvcr120/msvcr120.spec | 4 ++-- dlls/msvcr120_app/msvcr120_app.spec | 4 ++-- dlls/msvcrt/cpp.c | 21 +++++++++++++++++++++ 6 files changed, 31 insertions(+), 10 deletions(-) diff --git a/dlls/concrt140/concrt140.spec b/dlls/concrt140/concrt140.spec index 855e366..e6ebe4e 100644 --- a/dlls/concrt140/concrt140.spec +++ b/dlls/concrt140/concrt140.spec @@ -456,8 +456,8 @@ @ stub -arch=i386 ?_Stop(a)_Timer@details(a)Concurrency@@IAEXXZ @ stub -arch=win64 ?_Stop(a)_Timer@details(a)Concurrency@@IEAAXXZ @ stub -arch=win64 ?_Trace_agents(a)Concurrency@@YAXW4Agents_EventType(a)1@_JZZ -@ stub ?_Trace_ppl_function(a)Concurrency@@YAXABU_GUID@@EW4ConcRT_EventType(a)1@@Z -@ stub ?_Trace_ppl_function(a)Concurrency@@YAXAEBU_GUID@@EW4ConcRT_EventType(a)1@@Z +@ cdecl -arch=win32 ?_Trace_ppl_function(a)Concurrency@@YAXABU_GUID@@EW4ConcRT_EventType(a)1@@Z(ptr long long) msvcr120.?_Trace_ppl_function(a)Concurrency@@YAXABU_GUID@@EW4ConcRT_EventType(a)1@@Z +@ cdecl -arch=win64 ?_Trace_ppl_function(a)Concurrency@@YAXAEBU_GUID@@EW4ConcRT_EventType(a)1@@Z(ptr long long) msvcr120.?_Trace_ppl_function(a)Concurrency@@YAXAEBU_GUID@@EW4ConcRT_EventType(a)1@@Z @ thiscall -arch=i386 ?_TryAcquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QAE_NXZ(ptr) msvcr120.?_TryAcquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QAE_NXZ @ cdecl -arch=win64 ?_TryAcquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QEAA_NXZ(ptr) msvcr120.?_TryAcquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QEAA_NXZ @ thiscall -arch=i386 ?_TryAcquire(a)_ReentrantBlockingLock@details(a)Concurrency@@QAE_NXZ(ptr) msvcr120.?_TryAcquire(a)_ReentrantBlockingLock@details(a)Concurrency@@QAE_NXZ diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index d60c2c2..303e1b7 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -386,8 +386,8 @@ @ stub -arch=win64 ?_Stop(a)_Timer@details(a)Concurrency@@IEAAXXZ @ stub -arch=win32 ?_Tidy(a)exception@std@@AAEXXZ @ stub -arch=win64 ?_Tidy(a)exception@std@@AEAAXXZ -@ stub -arch=win32 ?_Trace_ppl_function(a)Concurrency@@YAXABU_GUID@@EW4ConcRT_EventType(a)1@@Z -@ stub -arch=win64 ?_Trace_ppl_function(a)Concurrency@@YAXAEBU_GUID@@EW4ConcRT_EventType(a)1@@Z +@ cdecl -arch=win32 ?_Trace_ppl_function(a)Concurrency@@YAXABU_GUID@@EW4ConcRT_EventType(a)1@@Z(ptr long long) Concurrency__Trace_ppl_function +@ cdecl -arch=win64 ?_Trace_ppl_function(a)Concurrency@@YAXAEBU_GUID@@EW4ConcRT_EventType(a)1@@Z(ptr long long) Concurrency__Trace_ppl_function @ thiscall -arch=win32 ?_TryAcquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QAE_NXZ(ptr) _ReentrantBlockingLock__TryAcquire @ cdecl -arch=win64 ?_TryAcquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QEAA_NXZ(ptr) _ReentrantBlockingLock__TryAcquire @ thiscall -arch=win32 ?_TryAcquire(a)_ReentrantBlockingLock@details(a)Concurrency@@QAE_NXZ(ptr) _ReentrantBlockingLock__TryAcquire diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index f9b6613..8aa390e 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -658,8 +658,8 @@ @ stub -arch=i386 ?_Tidy(a)exception@std@@AAEXXZ @ stub -arch=win64 ?_Tidy(a)exception@std@@AEAAXXZ @ stub ?_Trace_agents(a)Concurrency@@YAXW4Agents_EventType(a)1@_JZZ -@ stub -arch=win32 ?_Trace_ppl_function(a)Concurrency@@YAXABU_GUID@@EW4ConcRT_EventType(a)1@@Z -@ stub -arch=win64 ?_Trace_ppl_function(a)Concurrency@@YAXAEBU_GUID@@EW4ConcRT_EventType(a)1@@Z +@ cdecl -arch=win32 ?_Trace_ppl_function(a)Concurrency@@YAXABU_GUID@@EW4ConcRT_EventType(a)1@@Z(ptr long long) Concurrency__Trace_ppl_function +@ cdecl -arch=win64 ?_Trace_ppl_function(a)Concurrency@@YAXAEBU_GUID@@EW4ConcRT_EventType(a)1@@Z(ptr long long) Concurrency__Trace_ppl_function @ cdecl -arch=arm ?_TryAcquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QAA_NXZ(ptr) _ReentrantBlockingLock__TryAcquire @ thiscall -arch=i386 ?_TryAcquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QAE_NXZ(ptr) _ReentrantBlockingLock__TryAcquire @ cdecl -arch=win64 ?_TryAcquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QEAA_NXZ(ptr) _ReentrantBlockingLock__TryAcquire diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 48129f6..7a3a831 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -640,8 +640,8 @@ @ stub -arch=i386 ?_Tidy(a)exception@std@@AAEXXZ @ stub -arch=win64 ?_Tidy(a)exception@std@@AEAAXXZ @ stub ?_Trace_agents(a)Concurrency@@YAXW4Agents_EventType(a)1@_JZZ -@ stub -arch=win32 ?_Trace_ppl_function(a)Concurrency@@YAXABU_GUID@@EW4ConcRT_EventType(a)1@@Z -@ stub -arch=win64 ?_Trace_ppl_function(a)Concurrency@@YAXAEBU_GUID@@EW4ConcRT_EventType(a)1@@Z +@ cdecl -arch=win32 ?_Trace_ppl_function(a)Concurrency@@YAXABU_GUID@@EW4ConcRT_EventType(a)1@@Z(ptr long long) Concurrency__Trace_ppl_function +@ cdecl -arch=win64 ?_Trace_ppl_function(a)Concurrency@@YAXAEBU_GUID@@EW4ConcRT_EventType(a)1@@Z(ptr long long) Concurrency__Trace_ppl_function @ cdecl -arch=arm ?_TryAcquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QAA_NXZ(ptr) _ReentrantBlockingLock__TryAcquire @ thiscall -arch=i386 ?_TryAcquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QAE_NXZ(ptr) _ReentrantBlockingLock__TryAcquire @ cdecl -arch=win64 ?_TryAcquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QEAA_NXZ(ptr) _ReentrantBlockingLock__TryAcquire diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 7242cb9..62926d4 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -636,8 +636,8 @@ @ stub -arch=i386 ?_Tidy(a)exception@std@@AAEXXZ @ stub -arch=win64 ?_Tidy(a)exception@std@@AEAAXXZ @ stub ?_Trace_agents(a)Concurrency@@YAXW4Agents_EventType(a)1@_JZZ -@ stub -arch=win32 ?_Trace_ppl_function(a)Concurrency@@YAXABU_GUID@@EW4ConcRT_EventType(a)1@@Z -@ stub -arch=win64 ?_Trace_ppl_function(a)Concurrency@@YAXAEBU_GUID@@EW4ConcRT_EventType(a)1@@Z +@ cdecl -arch=win32 ?_Trace_ppl_function(a)Concurrency@@YAXABU_GUID@@EW4ConcRT_EventType(a)1@@Z(ptr long long) msvcr120.?_Trace_ppl_function(a)Concurrency@@YAXABU_GUID@@EW4ConcRT_EventType(a)1@@Z +@ cdecl -arch=win64 ?_Trace_ppl_function(a)Concurrency@@YAXAEBU_GUID@@EW4ConcRT_EventType(a)1@@Z(ptr long long) msvcr120.?_Trace_ppl_function(a)Concurrency@@YAXAEBU_GUID@@EW4ConcRT_EventType(a)1@@Z @ cdecl -arch=arm ?_TryAcquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QAA_NXZ(ptr) msvcr120.?_TryAcquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QAA_NXZ @ thiscall -arch=i386 ?_TryAcquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QAE_NXZ(ptr) msvcr120.?_TryAcquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QAE_NXZ @ cdecl -arch=win64 ?_TryAcquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QEAA_NXZ(ptr) msvcr120.?_TryAcquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QEAA_NXZ diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index daf7aee..a86048a 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -1700,3 +1700,24 @@ MSVCRT_size_t CDECL MSVCRT_type_info_hash(const type_info140 *ti) return hash; } #endif + +#if _MSVCR_VER >= 100 +enum ConcRT_EventType +{ + CONCRT_EVENT_GENERIC, + CONCRT_EVENT_START, + CONCRT_EVENT_END, + CONCRT_EVENT_BLOCK, + CONCRT_EVENT_UNBLOCK, + CONCRT_EVENT_YIELD, + CONCRT_EVENT_ATTACH, + CONCRT_EVENT_DETACH +}; + +/* ?_Trace_ppl_function(a)Concurrency@@YAXABU_GUID@@EW4ConcRT_EventType(a)1@@Z */ +/* ?_Trace_ppl_function(a)Concurrency@@YAXAEBU_GUID@@EW4ConcRT_EventType(a)1@@Z */ +void __cdecl Concurrency__Trace_ppl_function(const GUID *guid, unsigned char level, enum ConcRT_EventType type) +{ + FIXME("(%s %u %i) stub\n", debugstr_guid(guid), level, type); +} +#endif

1 0

Daniel Lehman : msvcrt: Implement Concurrency::event.
by Alexandre Julliard 20 Mar '17

20 Mar '17

Module: wine Branch: master Commit: dfd28affe34f8a87e251fdd02e590c425b90ca6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfd28affe34f8a87e251fdd02… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Dec 12 16:44:44 2016 -0800 msvcrt: Implement Concurrency::event. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/lock.c | 190 +++++++++++++++++++++++++++++++++++++++++++++++---- dlls/msvcrt/msvcrt.h | 15 ++++ 2 files changed, 193 insertions(+), 12 deletions(-) diff --git a/dlls/msvcrt/lock.c b/dlls/msvcrt/lock.c index d9fe05d..8ae9511 100644 --- a/dlls/msvcrt/lock.c +++ b/dlls/msvcrt/lock.c @@ -550,19 +550,128 @@ unsigned int __cdecl _GetConcurrency(void) return val; } +#define EVT_RUNNING (void*)1 +#define EVT_WAITING NULL + +struct thread_wait; +typedef struct thread_wait_entry +{ + struct thread_wait *wait; + struct thread_wait_entry *next; + struct thread_wait_entry *prev; +} thread_wait_entry; + +typedef struct thread_wait +{ + void *signaled; + int pending_waits; + thread_wait_entry entries[1]; +} thread_wait; + typedef struct { - volatile void *wait; - void *reset; + thread_wait_entry *waiters; + INT_PTR signaled; critical_section cs; } event; +static inline PLARGE_INTEGER evt_timeout(PLARGE_INTEGER pTime, unsigned int timeout) +{ + if(timeout == COOPERATIVE_TIMEOUT_INFINITE) return NULL; + pTime->QuadPart = (ULONGLONG)timeout * -10000; + return pTime; +} + +static void evt_add_queue(thread_wait_entry **head, thread_wait_entry *entry) +{ + if(*head) { + entry->next = *head; + entry->prev = (*head)->prev; + (*head)->prev->next = entry; + (*head)->prev = entry; + } else { + entry->next = entry; + entry->prev = entry; + *head = entry; + } +} + +static void evt_remove(thread_wait_entry **head, thread_wait_entry *entry) +{ + entry->next->prev = entry->prev; + entry->prev->next = entry->next; + if(*head == entry) + *head = entry->next == entry ? NULL : entry->next; +} + +static MSVCRT_size_t evt_end_wait(thread_wait *wait, event **events, int count) +{ + MSVCRT_size_t i, ret = COOPERATIVE_WAIT_TIMEOUT; + + for(i = 0; i < count; i++) { + critical_section_lock(&events[i]->cs); + if(events[i] == wait->signaled) ret = i; + evt_remove(&events[i]->waiters, &wait->entries[i]); + critical_section_unlock(&events[i]->cs); + } + + return ret; +} + +static inline int evt_transition(void **state, void *from, void *to) +{ + return InterlockedCompareExchangePointer(state, to, from) == from; +} + +static MSVCRT_size_t evt_wait(thread_wait *wait, event **events, int count, MSVCRT_bool wait_all, unsigned int timeout) +{ + int i; + NTSTATUS status; + LARGE_INTEGER ntto; + + wait->signaled = EVT_RUNNING; + wait->pending_waits = wait_all ? count : 1; + for(i = 0; i < count; i++) { + wait->entries[i].wait = wait; + + critical_section_lock(&events[i]->cs); + evt_add_queue(&events[i]->waiters, &wait->entries[i]); + if(events[i]->signaled) { + if(!InterlockedDecrement(&wait->pending_waits)) { + wait->signaled = events[i]; + critical_section_unlock(&events[i]->cs); + + return evt_end_wait(wait, events, i+1); + } + } + critical_section_unlock(&events[i]->cs); + } + + if(!timeout) + return evt_end_wait(wait, events, count); + + if(!evt_transition(&wait->signaled, EVT_RUNNING, EVT_WAITING)) + return evt_end_wait(wait, events, count); + + status = NtWaitForKeyedEvent(keyed_event, wait, 0, evt_timeout(&ntto, timeout)); + + if(status && !evt_transition(&wait->signaled, EVT_WAITING, EVT_RUNNING)) + NtWaitForKeyedEvent(keyed_event, wait, 0, NULL); + + return evt_end_wait(wait, events, count); +} + /* ??0event(a)Concurrency@@QAE(a)XZ */ /* ??0event(a)Concurrency@@QEAA(a)XZ */ DEFINE_THISCALL_WRAPPER(event_ctor, 4) event* __thiscall event_ctor(event *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); + + this->waiters = NULL; + this->signaled = FALSE; + critical_section_ctor(&this->cs); + return this; } @@ -571,7 +680,10 @@ event* __thiscall event_ctor(event *this) DEFINE_THISCALL_WRAPPER(event_dtor, 4) void __thiscall event_dtor(event *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); + critical_section_dtor(&this->cs); + if(this->waiters) + ERR("there's a wait on destroyed event\n"); } /* ?reset(a)event@Concurrency@@QAEXXZ */ @@ -579,7 +691,22 @@ void __thiscall event_dtor(event *this) DEFINE_THISCALL_WRAPPER(event_reset, 4) void __thiscall event_reset(event *this) { - FIXME("(%p) stub\n", this); + thread_wait_entry *entry; + + TRACE("(%p)\n", this); + + critical_section_lock(&this->cs); + if(this->signaled) { + this->signaled = FALSE; + if(this->waiters) { + entry = this->waiters; + do { + InterlockedIncrement(&entry->wait->pending_waits); + entry = entry->next; + } while (entry != this->waiters); + } + } + critical_section_unlock(&this->cs); } /* ?set(a)event@Concurrency@@QAEXXZ */ @@ -587,26 +714,65 @@ void __thiscall event_reset(event *this) DEFINE_THISCALL_WRAPPER(event_set, 4) void __thiscall event_set(event *this) { - FIXME("(%p) stub\n", this); + thread_wait_entry *entry; + + TRACE("(%p)\n", this); + + critical_section_lock(&this->cs); + if(!this->signaled) { + this->signaled = TRUE; + if(this->waiters) { + entry = this->waiters; + do { + if(!InterlockedDecrement(&entry->wait->pending_waits)) { + if(InterlockedExchangePointer(&entry->wait->signaled, this) == EVT_WAITING) + NtReleaseKeyedEvent(keyed_event, entry->wait, 0, NULL); + } + entry = entry->next; + } while (entry != this->waiters); + } + } + critical_section_unlock(&this->cs); } /* ?wait(a)event@Concurrency@@QAEII(a)Z */ /* ?wait(a)event@Concurrency@@QEAA_KI(a)Z */ DEFINE_THISCALL_WRAPPER(event_wait, 8) -size_t __thiscall event_wait(event *this, unsigned int timeout) +MSVCRT_size_t __thiscall event_wait(event *this, unsigned int timeout) { - FIXME("(%p %u) stub\n", this, timeout); - return COOPERATIVE_WAIT_TIMEOUT; + thread_wait wait; + MSVCRT_size_t signaled; + + TRACE("(%p %u)\n", this, timeout); + + critical_section_lock(&this->cs); + signaled = this->signaled; + critical_section_unlock(&this->cs); + + if(!timeout) return signaled ? 0 : COOPERATIVE_WAIT_TIMEOUT; + return signaled ? 0 : evt_wait(&wait, &this, 1, FALSE, timeout); } /* ?wait_for_multiple(a)event@Concurrency@@SAIPAPAV12(a)I_NI@Z */ /* ?wait_for_multiple(a)event@Concurrency@@SA_KPEAPEAV12(a)_K_NI@Z */ int __cdecl event_wait_for_multiple(event **events, MSVCRT_size_t count, MSVCRT_bool wait_all, unsigned int timeout) { - FIXME("(%p %ld %d %u) stub\n", events, count, wait_all, timeout); - return COOPERATIVE_WAIT_TIMEOUT; -} + thread_wait *wait; + MSVCRT_size_t ret; + + TRACE("(%p %ld %d %u)\n", events, count, wait_all, timeout); + + if(count == 0) + return 0; + wait = heap_alloc(FIELD_OFFSET(thread_wait, entries[count])); + if(!wait) + throw_bad_alloc("bad allocation"); + ret = evt_wait(wait, events, count, wait_all, timeout); + heap_free(wait); + + return ret; +} #endif #if _MSVCR_VER >= 110 diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 3caa43c..cee8113 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -1181,6 +1181,7 @@ extern char* __cdecl __unDName(char *,const char*,int,malloc_func_t,free_func_t, #define UCRTBASE_SCANF_MASK (0x0007) +#define COOPERATIVE_TIMEOUT_INFINITE ((unsigned int)-1) #define COOPERATIVE_WAIT_TIMEOUT ~0 typedef enum { @@ -1380,4 +1381,18 @@ typedef struct { _FPIEEE_VALUE Result; } _FPIEEE_RECORD, *_PFPIEEE_RECORD; +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) +{ + return HeapAlloc(GetProcessHeap(), 0, len); +} + +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t len) +{ + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); +} + +static inline BOOL heap_free(void *mem) +{ + return HeapFree(GetProcessHeap(), 0, mem); +} #endif /* __WINE_MSVCRT_H */

1 0