May 2019 - Wine-Devel - list.winehq.org

[PATCH 2/5] wined3d: Pass a wined3d_context_gl structure to context_bind_shader_resources().
by Henri Verbeet May 9, 2019

May 9, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 62792688258..b72f61bb02b 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3774,12 +3774,11 @@ static void context_load_shader_resources(struct wined3d_context *context, const } } -static void context_bind_shader_resources(struct wined3d_context *context, +static void wined3d_context_gl_bind_shader_resources(struct wined3d_context_gl *context_gl, const struct wined3d_state *state, enum wined3d_shader_type shader_type) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); unsigned int bind_idx, shader_sampler_count, base, count, i; - const struct wined3d_device *device = context->device; + const struct wined3d_device *device = context_gl->c.device; struct wined3d_shader_sampler_map_entry *entry; struct wined3d_shader_resource_view *view; const struct wined3d_shader *shader; @@ -3815,7 +3814,7 @@ static void context_bind_shader_resources(struct wined3d_context *context, sampler = device->default_sampler; else if (!(sampler = state->sampler[shader_type][entry->sampler_idx])) sampler = device->null_sampler; - wined3d_shader_resource_view_gl_bind(wined3d_shader_resource_view_gl(view), bind_idx, sampler, context); + wined3d_shader_resource_view_gl_bind(wined3d_shader_resource_view_gl(view), bind_idx, sampler, &context_gl->c); } } @@ -3927,6 +3926,7 @@ static BOOL context_apply_draw_state(struct wined3d_context *context, const struct wined3d_device *device, const struct wined3d_state *state) { const struct wined3d_state_entry *state_table = context->state_table; + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_fb_state *fb = state->fb; unsigned int i; @@ -4005,7 +4005,7 @@ static BOOL context_apply_draw_state(struct wined3d_context *context, if (context->update_shader_resource_bindings) { for (i = 0; i < WINED3D_SHADER_TYPE_GRAPHICS_COUNT; ++i) - context_bind_shader_resources(context, state, i); + wined3d_context_gl_bind_shader_resources(context_gl, state, i); context->update_shader_resource_bindings = 0; if (gl_info->limits.combined_samplers == gl_info->limits.graphics_samplers) context->update_compute_shader_resource_bindings = 1; @@ -4063,7 +4063,7 @@ static void context_apply_compute_state(struct wined3d_context *context, if (context->update_compute_shader_resource_bindings) { - context_bind_shader_resources(context, state, WINED3D_SHADER_TYPE_COMPUTE); + wined3d_context_gl_bind_shader_resources(wined3d_context_gl(context), state, WINED3D_SHADER_TYPE_COMPUTE); context->update_compute_shader_resource_bindings = 0; if (gl_info->limits.combined_samplers == gl_info->limits.graphics_samplers) context->update_shader_resource_bindings = 1; -- 2.11.0

1 0

[PATCH 1/5] wined3d: Pass a wined3d_context_gl structure to context_get_tex_unit_mapping().
by Henri Verbeet May 9, 2019

May 9, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 13 +++++++------ dlls/wined3d/glsl_shader.c | 10 ++++++---- dlls/wined3d/wined3d_private.h | 9 +++++++-- 3 files changed, 20 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 97d765658b0..62792688258 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2369,16 +2369,16 @@ void wined3d_context_destroy(struct wined3d_context *context) device->adapter->adapter_ops->adapter_destroy_context(context); } -const DWORD *context_get_tex_unit_mapping(const struct wined3d_context *context, +const unsigned int *wined3d_context_gl_get_tex_unit_mapping(const struct wined3d_context_gl *context_gl, const struct wined3d_shader_version *shader_version, unsigned int *base, unsigned int *count) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; if (!shader_version) { *base = 0; *count = WINED3D_MAX_TEXTURES; - return context->tex_unit_map; + return context_gl->c.tex_unit_map; } if (shader_version->major >= 4) @@ -2403,7 +2403,7 @@ const DWORD *context_get_tex_unit_mapping(const struct wined3d_context *context, *count = 0; } - return context->tex_unit_map; + return context_gl->c.tex_unit_map; } static void context_get_rt_size(const struct wined3d_context *context, SIZE *size) @@ -3777,18 +3777,19 @@ static void context_load_shader_resources(struct wined3d_context *context, const static void context_bind_shader_resources(struct wined3d_context *context, const struct wined3d_state *state, enum wined3d_shader_type shader_type) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); unsigned int bind_idx, shader_sampler_count, base, count, i; const struct wined3d_device *device = context->device; struct wined3d_shader_sampler_map_entry *entry; struct wined3d_shader_resource_view *view; const struct wined3d_shader *shader; + const unsigned int *tex_unit_map; struct wined3d_sampler *sampler; - const DWORD *tex_unit_map; if (!(shader = state->shader[shader_type])) return; - tex_unit_map = context_get_tex_unit_mapping(context, + tex_unit_map = wined3d_context_gl_get_tex_unit_mapping(context_gl, &shader->reg_maps.shader_version, &base, &count); shader_sampler_count = shader->reg_maps.sampler_map.count; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 6493e7f16c7..5ee40b00358 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -705,10 +705,11 @@ static void shader_glsl_load_samplers_range(const struct wined3d_gl_info *gl_inf static unsigned int shader_glsl_map_tex_unit(const struct wined3d_context *context, const struct wined3d_shader_version *shader_version, unsigned int sampler_idx) { - const DWORD *tex_unit_map; + const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); + const unsigned int *tex_unit_map; unsigned int base, count; - tex_unit_map = context_get_tex_unit_mapping(context, shader_version, &base, &count); + tex_unit_map = wined3d_context_gl_get_tex_unit_mapping(context_gl, shader_version, &base, &count); if (sampler_idx >= count) return WINED3D_UNMAPPED_STAGE; if (!tex_unit_map) @@ -731,9 +732,10 @@ static void shader_glsl_append_sampler_binding_qualifier(struct wined3d_string_b static void shader_glsl_load_samplers(const struct wined3d_context *context, struct shader_glsl_priv *priv, GLuint program_id, const struct wined3d_shader_reg_maps *reg_maps) { + const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_shader_version *shader_version; - const DWORD *tex_unit_map; + const unsigned int *tex_unit_map; unsigned int base, count; const char *prefix; @@ -742,7 +744,7 @@ static void shader_glsl_load_samplers(const struct wined3d_context *context, shader_version = reg_maps ? &reg_maps->shader_version : NULL; prefix = shader_glsl_get_prefix(shader_version ? shader_version->type : WINED3D_SHADER_TYPE_PIXEL); - tex_unit_map = context_get_tex_unit_mapping(context, shader_version, &base, &count); + tex_unit_map = wined3d_context_gl_get_tex_unit_mapping(context_gl, shader_version, &base, &count); shader_glsl_load_samplers_range(gl_info, priv, program_id, prefix, base, count, tex_unit_map); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a226cd4796a..fc75ddd0fd7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2049,9 +2049,16 @@ static inline struct wined3d_context_gl *wined3d_context_gl(struct wined3d_conte return CONTAINING_RECORD(context, struct wined3d_context_gl, c); } +static inline const struct wined3d_context_gl *wined3d_context_gl_const(const struct wined3d_context *context) +{ + return CONTAINING_RECORD(context, struct wined3d_context_gl, c); +} + void wined3d_context_gl_bind_texture(struct wined3d_context_gl *context_gl, GLenum target, GLuint name) DECLSPEC_HIDDEN; void wined3d_context_gl_cleanup(struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; +const unsigned int *wined3d_context_gl_get_tex_unit_mapping(const struct wined3d_context_gl *context_gl, + const struct wined3d_shader_version *shader_version, unsigned int *base, unsigned int *count) DECLSPEC_HIDDEN; HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void wined3d_context_gl_load_tex_coords(const struct wined3d_context_gl *context_gl, @@ -2231,8 +2238,6 @@ void context_free_fence(struct wined3d_fence *fence) DECLSPEC_HIDDEN; void context_free_occlusion_query(struct wined3d_occlusion_query *query) DECLSPEC_HIDDEN; struct wined3d_context *context_get_current(void) DECLSPEC_HIDDEN; GLenum context_get_offscreen_gl_buffer(const struct wined3d_context *context) DECLSPEC_HIDDEN; -const DWORD *context_get_tex_unit_mapping(const struct wined3d_context *context, - const struct wined3d_shader_version *shader_version, unsigned int *base, unsigned int *count) DECLSPEC_HIDDEN; DWORD context_get_tls_idx(void) DECLSPEC_HIDDEN; void context_gl_resource_released(struct wined3d_device *device, GLuint name, BOOL rb_namespace) DECLSPEC_HIDDEN; -- 2.11.0

1 0

[PATCH] wined3d: Apply stencil mask to stencil reference value.
by Paul Gofman May 9, 2019

May 9, 2019

This is consistent with the docs and confirmed by the test. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=28196 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/d3d9/tests/visual.c | 59 +++++++++++++++++++++------------------- dlls/wined3d/state.c | 2 +- 2 files changed, 32 insertions(+), 29 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 85c1fa1bf8..1991c0a519 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -11052,70 +11052,73 @@ static void stencil_cull_test(void) /* First pass: Fill the stencil buffer with some values... */ hr = IDirect3DDevice9_BeginScene(device); - ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CULLMODE, D3DCULL_CW); - ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0 /* MinIndex */, 4 /* NumVerts */, 1 /* PrimCount */, indices_cw, D3DFMT_INDEX16, quad1, sizeof(float) * 3); - ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0 /* MinIndex */, 4 /* NumVerts */, 1 /* PrimCount */, indices_ccw, D3DFMT_INDEX16, quad1, sizeof(float) * 3); - ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_TWOSIDEDSTENCILMODE, TRUE); - ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CULLMODE, D3DCULL_NONE); - ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0 /* MinIndex */, 4 /* NumVerts */, 1 /* PrimCount */, indices_cw, D3DFMT_INDEX16, quad2, sizeof(float) * 3); - ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0 /* MinIndex */, 4 /* NumVerts */, 1 /* PrimCount */, indices_ccw, D3DFMT_INDEX16, quad2, sizeof(float) * 3); - ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CULLMODE, D3DCULL_CW); - ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0 /* MinIndex */, 4 /* NumVerts */, 1 /* PrimCount */, indices_cw, D3DFMT_INDEX16, quad3, sizeof(float) * 3); - ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0 /* MinIndex */, 4 /* NumVerts */, 1 /* PrimCount */, indices_ccw, D3DFMT_INDEX16, quad3, sizeof(float) * 3); - ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CULLMODE, D3DCULL_CCW); - ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0 /* MinIndex */, 4 /* NumVerts */, 1 /* PrimCount */, indices_cw, D3DFMT_INDEX16, quad4, sizeof(float) * 3); - ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0 /* MinIndex */, 4 /* NumVerts */, 1 /* PrimCount */, indices_ccw, D3DFMT_INDEX16, quad4, sizeof(float) * 3); - ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_EndScene(device); - ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILZFAIL, D3DSTENCILOP_KEEP); - ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILPASS, D3DSTENCILOP_KEEP); - ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILFAIL, D3DSTENCILOP_KEEP); - ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_TWOSIDEDSTENCILMODE, FALSE); - ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CULLMODE, D3DCULL_NONE); - ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILFUNC, D3DCMP_EQUAL); - ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILMASK, 0x000000ff); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); /* 2nd pass: Make the stencil values visible */ hr = IDirect3DDevice9_BeginScene(device); - ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); - ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); for (i = 0; i < 16; ++i) { - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILREF, i); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILREF, 0x0000ff00 | i); ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); painter[0].diffuse = (i * 16); /* Creates shades of blue */ @@ -11123,13 +11126,13 @@ static void stencil_cull_test(void) painter[2].diffuse = (i * 16); painter[3].diffuse = (i * 16); hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, painter, sizeof(painter[0])); - ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); } hr = IDirect3DDevice9_EndScene(device); - ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILENABLE, FALSE); - ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); color = getPixelColor(device, 160, 420); ok(color == 0x00000030, "CCW triangle, twoside FALSE, cull cw, replace, has color 0x%08x, expected 0x00000030\n", color); @@ -11152,7 +11155,7 @@ static void stencil_cull_test(void) ok(color == 0x00000080, "CW triangle, twoside TRUE, cull cw, culled, has color 0x%08x, expected 0x00000080\n", color); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); cleanup: refcount = IDirect3DDevice9_Release(device); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index c8b85e7711..a44a4a6547 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -921,8 +921,8 @@ static void state_stencil(struct wined3d_context *context, const struct wined3d_ func = GL_ALWAYS; if (!(func_back = wined3d_gl_compare_func(state->render_states[WINED3D_RS_BACK_STENCILFUNC]))) func_back = GL_ALWAYS; - ref = state->render_states[WINED3D_RS_STENCILREF]; mask = state->render_states[WINED3D_RS_STENCILMASK]; + ref = state->render_states[WINED3D_RS_STENCILREF] & mask; stencilFail = gl_stencil_op(state->render_states[WINED3D_RS_STENCILFAIL]); depthFail = gl_stencil_op(state->render_states[WINED3D_RS_STENCILZFAIL]); stencilPass = gl_stencil_op(state->render_states[WINED3D_RS_STENCILPASS]); -- 2.21.0

2 1

[PATCH] wined3d: Fix wined3d_get_wine_vk_version().
by Józef Kucia May 9, 2019

May 9, 2019

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index d39e6514454a..85bcc5ef752a 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -453,7 +453,9 @@ static unsigned int wined3d_get_wine_vk_version(void) major = atoi(ptr); - while (isdigit(*ptr) || *ptr == '.') + while (isdigit(*ptr)) + ++ptr; + if (*ptr == '.') ++ptr; minor = atoi(ptr); -- 2.21.0

2 1

[PATCH v3 1/2] jscript: implement Enumerator()
by Andreas Maier May 9, 2019

May 9, 2019

Signed-off-by: Andreas Maier <staubim(a)quantentunnel.de> --- dlls/jscript/enumerator.c | 227 +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 216 insertions(+), 11 deletions(-) diff --git a/dlls/jscript/enumerator.c b/dlls/jscript/enumerator.c index aa7737ac52..a7cad81c8a 100644 --- a/dlls/jscript/enumerator.c +++ b/dlls/jscript/enumerator.c @@ -26,6 +26,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); typedef struct { jsdisp_t dispex; + BOOL atend; + /* IEnumVARIANT returned by _NewEnum */ + IEnumVARIANT *enumvar; + /* IEnumVARIANT current item */ + VARIANT* enumitm; } EnumeratorInstance; static const WCHAR atEndW[] = {'a','t','E','n','d',0}; @@ -33,43 +38,156 @@ static const WCHAR itemW[] = {'i','t','e','m',0}; static const WCHAR moveFirstW[] = {'m','o','v','e','F','i','r','s','t',0}; static const WCHAR moveNextW[] = {'m','o','v','e','N','e','x','t',0}; +static inline EnumeratorInstance *enumerator_from_jsdisp(jsdisp_t *jsdisp) +{ + return CONTAINING_RECORD(jsdisp, EnumeratorInstance, dispex); +} + +static inline EnumeratorInstance *enumerator_from_vdisp(vdisp_t *vdisp) +{ + return enumerator_from_jsdisp(vdisp->u.jsdisp); +} + +static inline HRESULT enumvar_get_next_item( + IEnumVARIANT* enumvar, VARIANT* enumitm, + BOOL* atend, jsval_t *r) +{ + HRESULT hres; + + /* not at end ... get next item */ + if (!(*atend)) + { + /* Assume valid variant */ + VariantClear(enumitm); + hres = IEnumVARIANT_Next(enumvar, 1, enumitm, NULL); + if (hres != S_OK) + { + VariantClear(enumitm); + *atend = TRUE; + } + } + + if (*atend) + { + if (r) + *r = jsval_undefined(); + return S_OK; + } + + if (r) + return variant_to_jsval(enumitm, r); + + return S_OK; +} + static void Enumerator_destructor(jsdisp_t *dispex) { + EnumeratorInstance *This; + TRACE("Enumerator_destructor\n"); + This = enumerator_from_jsdisp(dispex); + + if (This->enumitm) + { + VariantClear(This->enumitm); + heap_free(This->enumitm); + } + heap_free(dispex); } HRESULT Enumerator_atEnd(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - TRACE("Enumerator_atEnd\n"); + EnumeratorInstance *This; + + This = enumerator_from_vdisp(jsthis); - return E_NOTIMPL; + if (r) + *r = jsval_bool(This->atend); + + TRACE("Enumerator_atEnd %d\n", This->atend); + + return S_OK; } HRESULT Enumerator_item(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { + EnumeratorInstance *This; + HRESULT hres = E_FAIL; + TRACE("Enumerator_item\n"); - return E_NOTIMPL; + This = enumerator_from_vdisp(jsthis); + + if (This->enumvar) + { + hres = variant_to_jsval(This->enumitm, r); + } + else + { + if (r) + *r = jsval_undefined(); + hres = S_OK; + } + + return hres; } HRESULT Enumerator_moveFirst(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { + EnumeratorInstance *This; + HRESULT hres = E_FAIL; + TRACE("Enumerator_moveFirst\n"); - return E_NOTIMPL; + This = enumerator_from_vdisp(jsthis); + if (This->enumvar) + { + IEnumVARIANT_Reset(This->enumvar); + hres = enumvar_get_next_item(This->enumvar, This->enumitm, &This->atend, r); + } + else + { + if (r) + *r = jsval_undefined(); + hres = S_OK; + } + + return hres; } HRESULT Enumerator_moveNext(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { + EnumeratorInstance *This; + HRESULT hres = E_FAIL; + TRACE("Enumerator_moveNext\n"); - return E_NOTIMPL; + This = enumerator_from_vdisp(jsthis); + + if (This->atend) + { + if (r) + *r = jsval_undefined(); + return S_OK; + } + if (This->enumvar) + { + hres = enumvar_get_next_item(This->enumvar, This->enumitm, &This->atend, r); + } + else + { + if (r) + *r = jsval_undefined(); + hres = S_OK; + } + + return hres; } static const builtin_prop_t Enumerator_props[] = { @@ -101,16 +219,18 @@ static HRESULT EnumeratorConstr_value(script_ctx_t *ctx, vdisp_t *vthis, WORD fl jsval_t *r) { jsdisp_t *obj; + jsval_t *arg0; HRESULT hres; TRACE("EnumeratorConstr_value\n"); switch(flags) { case DISPATCH_CONSTRUCT: { - if (argc != 1) - return throw_syntax_error(ctx, JS_E_MISSING_ARG, NULL); + if (argc > 1) + return throw_syntax_error(ctx, JS_E_INVALIDARG, NULL); - hres = create_enumerator(ctx, &argv[0], &obj); + arg0 = (argc == 1) ? &argv[0] : 0; + hres = create_enumerator(ctx, arg0, &obj); if(FAILED(hres)) return hres; @@ -118,7 +238,7 @@ static HRESULT EnumeratorConstr_value(script_ctx_t *ctx, vdisp_t *vthis, WORD fl break; } default: - FIXME("unimplemented flags: %x\n", flags); + ERR("unimplemented flags: %x\n", flags); return E_NOTIMPL; } @@ -140,7 +260,8 @@ static HRESULT alloc_enumerator(script_ctx_t *ctx, jsdisp_t *object_prototype, E hres = init_dispex_from_constr(&enumerator->dispex, ctx, &EnumeratorInst_info, ctx->enumerator_constr); - if(FAILED(hres)) { + if(FAILED(hres)) + { heap_free(enumerator); return hres; } @@ -180,11 +301,95 @@ HRESULT create_enumerator(script_ctx_t *ctx, jsval_t *argv, jsdisp_t **ret) { EnumeratorInstance *enumerator; HRESULT hres; + IDispatch *obj; + DISPPARAMS dispparams = {NULL, NULL, 0, 0}; + VARIANT varresult; + + BOOL atend = TRUE; + IEnumVARIANT *enumvar = NULL; + VARIANT *enumitm = NULL; + + memset(&varresult, 0, sizeof(VARIANT)); + VariantInit(&varresult); + + /* new Enumerator() */ + if (argv == NULL) + { + atend = TRUE; + } + else if(is_object_instance(*argv)) + { + obj = get_object(*argv); + + /* Try to get a IEnumVARIANT by _NewEnum */ + hres = IDispatch_Invoke(obj, + DISPID_NEWENUM, &IID_NULL, LOCALE_NEUTRAL, + DISPATCH_METHOD, &dispparams, &varresult, + NULL, NULL); + if (FAILED(hres)) + { + ERR("Enumerator: no DISPID_NEWENUM.\n"); + hres = E_INVALIDARG; + goto cleanuperr; + } + + if (V_VT(&varresult) == VT_DISPATCH) + { + hres = IUnknown_QueryInterface(V_DISPATCH(&varresult), + &IID_IEnumVARIANT, (void**)&enumvar); + } + else if (V_VT(&varresult) == VT_UNKNOWN) + { + hres = IUnknown_QueryInterface(V_UNKNOWN(&varresult), + &IID_IEnumVARIANT, (void**)&enumvar); + } + else + { + ERR("Enumerator: NewEnum unexpected type of varresult (%d).\n", V_VT(&varresult)); + hres = E_INVALIDARG; + goto cleanuperr; + } + if (FAILED(hres)) + { + hres = E_INVALIDARG; + goto cleanuperr; + } + VariantClear(&varresult); + + enumitm = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(VARIANT)); + if (!enumitm) + { + hres = E_OUTOFMEMORY; + goto cleanuperr; + } + VariantInit(enumitm); + + atend = FALSE; + enumvar_get_next_item(enumvar, enumitm, &atend, NULL); + } + else + { + ERR("I don't know how to handle this type!\n"); + hres = E_NOTIMPL; + goto cleanuperr; + } hres = alloc_enumerator(ctx, NULL, &enumerator); if(FAILED(hres)) - return hres; + goto cleanuperr; + enumerator->atend = atend; + enumerator->enumvar = enumvar; + enumerator->enumitm = enumitm; *ret = &enumerator->dispex; + return S_OK; +cleanuperr: + VariantClear(&varresult); + if (enumitm) + { + VariantClear(enumitm); + HeapFree(GetProcessHeap(), 0, enumitm); + } + return hres; } -- 2.11.0

3 4

[PATCH v2 6/6] advapi32: Return required buffer size in RegLoadMUIString.
by Akihiro Sagawa May 9, 2019

May 9, 2019

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/advapi32/registry.c | 10 ++++++++-- dlls/advapi32/tests/registry.c | 14 ++++++-------- 2 files changed, 14 insertions(+), 10 deletions(-)

1 0

[PATCH v2 5/6] advapi32: Remove useless RegLoadMUIStringA implementation.
by Akihiro Sagawa May 9, 2019

May 9, 2019

This commit avoids brokeness in advance. Otherwise, it will be broken when we support ERROR_MORE_DATA in RegLoadMUIStringW. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/advapi32/registry.c | 32 ++------------------------------ dlls/advapi32/tests/registry.c | 6 +++--- 2 files changed, 5 insertions(+), 33 deletions(-)

1 0

[PATCH v2 4/6] advapi32: Improve load_string to return error code.
by Akihiro Sagawa May 9, 2019

May 9, 2019

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/advapi32/registry.c | 19 +++++++++++-------- dlls/advapi32/tests/registry.c | 2 +- 2 files changed, 12 insertions(+), 9 deletions(-)

1 0

[PATCH v2 3/6] advapi32: Improve parameter sanity checks in RegLoadMUIString.
by Akihiro Sagawa May 9, 2019

May 9, 2019

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/advapi32/registry.c | 2 +- dlls/advapi32/tests/registry.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)

1 0

[PATCH v2 2/6] advapi32: Support the base directory parameter in RegLoadMUIString.
by Akihiro Sagawa May 9, 2019

May 9, 2019

In v2, - Fix off-by-one buffer allocation error. - Add GetFileAttributes to verify that the file exists at the specified file path. In other words, we don't search the PATH for the DLL. - use GetSystemDirectoryW instead of kernel32's global variable in kernel32. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/advapi32/registry.c | 45 +++++++++++++++++++++++++++++++----------- dlls/advapi32/tests/registry.c | 4 ++-- dlls/kernel32/time.c | 4 +++- 3 files changed, 38 insertions(+), 15 deletions(-)

1 0