December 2019 - Wine-devel - list.winehq.org

[PATCH 2/5] wined3d: Destroy GPU resources from the CS thread in adapter_vk_uninit_3d().
by Henri Verbeet 12 Dec '19

12 Dec '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 4a501292824..94eb1382c56 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -448,27 +448,42 @@ static HRESULT adapter_vk_init_3d(struct wined3d_device *device) return WINED3D_OK; } -static void adapter_vk_uninit_3d(struct wined3d_device *device) +static void adapter_vk_uninit_3d_cs(void *object) { + struct wined3d_device_vk *device_vk = object; struct wined3d_context_vk *context_vk; + struct wined3d_device *device; struct wined3d_shader *shader; - TRACE("device %p.\n", device); + TRACE("device_vk %p.\n", device_vk); - context_vk = &wined3d_device_vk(device)->context_vk; + context_vk = &device_vk->context_vk; + device = &device_vk->d; LIST_FOR_EACH_ENTRY(shader, &device->shaders, struct wined3d_shader, shader_list_entry) { device->shader_backend->shader_destroy(shader); } + device->blitter->ops->blitter_destroy(device->blitter, NULL); + device->shader_backend->shader_free_private(device, &context_vk->c); wined3d_device_destroy_default_samplers(device, &context_vk->c); +} - device->blitter->ops->blitter_destroy(device->blitter, NULL); +static void adapter_vk_uninit_3d(struct wined3d_device *device) +{ + struct wined3d_context_vk *context_vk; + struct wined3d_device_vk *device_vk; + + TRACE("device %p.\n", device); + device_vk = wined3d_device_vk(device); + context_vk = &device_vk->context_vk; + + wined3d_cs_destroy_object(device->cs, adapter_vk_uninit_3d_cs, device_vk); wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); + device_context_remove(device, &context_vk->c); - device->shader_backend->shader_free_private(device, NULL); wined3d_context_vk_cleanup(context_vk); } -- 2.11.0

1 0

[PATCH 1/5] wined3d: Pass a pointer to the counter buffer to wined3d_view_gl_destroy().
by Henri Verbeet 12 Dec '19

12 Dec '19

If adapter_gl_destroy_unordered_access_view() is called before wined3d_unordered_access_view_gl_cs_init() has finished executing, the "counter_bo" field may still be 0. More generally, we shouldn't access the "counter_bo" field from outside the CS thread. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index a8a8e93c0b2..7e6f8a2817c 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4801,7 +4801,7 @@ struct wined3d_view_gl_destroy_ctx { struct wined3d_device *device; const struct wined3d_gl_view *gl_view; - GLuint counter_bo; + GLuint *counter_bo; void *object; struct wined3d_view_gl_destroy_ctx *free; }; @@ -4825,7 +4825,7 @@ static void wined3d_view_gl_destroy_object(void *object) gl_info->gl_ops.gl.p_glDeleteTextures(1, &ctx->gl_view->name); } if (ctx->counter_bo) - GL_EXTCALL(glDeleteBuffers(1, &ctx->counter_bo)); + GL_EXTCALL(glDeleteBuffers(1, ctx->counter_bo)); checkGLcall("delete resources"); context_release(context); } @@ -4835,7 +4835,7 @@ static void wined3d_view_gl_destroy_object(void *object) } static void wined3d_view_gl_destroy(struct wined3d_device *device, - const struct wined3d_gl_view *gl_view, GLuint counter_bo, void *object) + const struct wined3d_gl_view *gl_view, GLuint *counter_bo, void *object) { struct wined3d_view_gl_destroy_ctx *ctx, c; @@ -4867,7 +4867,7 @@ static void adapter_gl_destroy_rendertarget_view(struct wined3d_rendertarget_vie if (swapchain_count) wined3d_device_incref(device); wined3d_rendertarget_view_cleanup(&view_gl->v); - wined3d_view_gl_destroy(device, &view_gl->gl_view, 0, view_gl); + wined3d_view_gl_destroy(device, &view_gl->gl_view, NULL, view_gl); if (swapchain_count) wined3d_device_decref(device); } @@ -4913,7 +4913,7 @@ static void adapter_gl_destroy_shader_resource_view(struct wined3d_shader_resour if (swapchain_count) wined3d_device_incref(device); wined3d_shader_resource_view_cleanup(&view_gl->v); - wined3d_view_gl_destroy(device, &view_gl->gl_view, 0, view_gl); + wined3d_view_gl_destroy(device, &view_gl->gl_view, NULL, view_gl); if (swapchain_count) wined3d_device_decref(device); } @@ -4959,7 +4959,7 @@ static void adapter_gl_destroy_unordered_access_view(struct wined3d_unordered_ac if (swapchain_count) wined3d_device_incref(device); wined3d_unordered_access_view_cleanup(&view_gl->v); - wined3d_view_gl_destroy(device, &view_gl->gl_view, view_gl->counter_bo, view_gl); + wined3d_view_gl_destroy(device, &view_gl->gl_view, &view_gl->counter_bo, view_gl); if (swapchain_count) wined3d_device_decref(device); } -- 2.11.0

1 0

[PATCH] wined3d: Fix the spelling of some comments.
by Francois Gouget 12 Dec '19

12 Dec '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/context.c | 2 +- dlls/wined3d/vertexdeclaration.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 34c3f061a94..9d98c79ce51 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1472,7 +1472,7 @@ static void shader_hw_sample(const struct wined3d_shader_instruction *ins, DWORD if(ins->dst[0].modifiers & WINED3DSPDM_SATURATE) mod = "_SAT"; else mod = ""; - /* Fragment samplers always have indentity mapping */ + /* Fragment samplers always have identity mapping */ if(sampler_idx >= WINED3D_MAX_FRAGMENT_SAMPLERS) { sampler_idx = priv->cur_vs_args->vertex.samplers[sampler_idx - WINED3D_MAX_FRAGMENT_SAMPLERS]; diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index c5d2eeaa477..95769014af6 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -4487,7 +4487,7 @@ static void wined3d_context_gl_draw_primitive_arrays(struct wined3d_context_gl * * this for now. * * Shouldn't be too hard to support with OpenGL, in theory just call - * glDrawArrays() instead of drawElements(). But the stream fequency value + * glDrawArrays() instead of drawElements(). But the stream frequency value * has a different meaning in that situation. */ if (!idx_size) { diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index 81032745a06..c5df45541e4 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -216,7 +216,7 @@ static HRESULT vertexdeclaration_init(struct wined3d_vertex_declaration *declara declaration->position_transformed = TRUE; /* Find the streams used in the declaration. The vertex buffers have - * to be loaded when drawing, but filter tesselation pseudo streams. */ + * to be loaded when drawing, but filter tessellation pseudo streams. */ if (e->input_slot >= WINED3D_MAX_STREAMS) continue; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 60ddf74a0ec..b73d5c7fecf 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3132,7 +3132,7 @@ struct wined3d_state struct wined3d_vertex_declaration *vertex_declaration; struct wined3d_stream_output stream_output[WINED3D_MAX_STREAM_OUTPUT_BUFFERS]; - struct wined3d_stream_state streams[WINED3D_MAX_STREAMS + 1 /* tesselated pseudo-stream */]; + struct wined3d_stream_state streams[WINED3D_MAX_STREAMS + 1 /* tessellated pseudo-stream */]; struct wined3d_buffer *index_buffer; enum wined3d_format_id index_format; unsigned int index_offset; -- 2.20.1

2 1

[PATCH] ieframe/tests: Fix a typo in ok() message.
by Andrey Gusev 12 Dec '19

12 Dec '19

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/ieframe/tests/webbrowser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 9ec54a7077..0195851bda 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -2665,7 +2665,7 @@ static void test_Extent(IWebBrowser2 *unk) trace("dpi: %d / %d\n", dpi_y, dpi_y); hres = IWebBrowser2_QueryInterface(unk, &IID_IOleObject, (void**)&oleobj); - ok(hres == S_OK, "Could not get IOleObkect: %08x\n", hres); + ok(hres == S_OK, "Could not get IOleObject: %08x\n", hres); if(FAILED(hres)) return; -- 2.23.0

2 1

[PATCH v4 1/9] jscript: Store the necessary function and variable info in the TypeInfo.
by Gabriel Ivăncescu 12 Dec '19

12 Dec '19

The TypeInfo is built when it is retrieved and frozen at that moment, even if the script changes after that and more identifiers are added to it, or existing ones deleted. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/dispex.c | 110 ++++++++++++++++++++++++++++++++++++++++ dlls/jscript/function.c | 31 +++++++++++ dlls/jscript/jscript.h | 1 + 3 files changed, 142 insertions(+) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 92e9b96..6c6d25a 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -19,6 +19,7 @@ #include <assert.h> #include "jscript.h" +#include "engine.h" #include "wine/debug.h" @@ -70,6 +71,20 @@ static inline dispex_prop_t *get_prop(jsdisp_t *This, DISPID id) return This->props+id; } +static inline BOOL is_function_prop(dispex_prop_t *prop) +{ + BOOL ret = FALSE; + + if (is_object_instance(prop->u.val)) + { + jsdisp_t *jsdisp = iface_to_jsdisp(get_object(prop->u.val)); + + if (jsdisp) ret = is_class(jsdisp, JSCLASS_FUNCTION); + jsdisp_release(jsdisp); + } + return ret; +} + static DWORD get_flags(jsdisp_t *This, dispex_prop_t *prop) { if(prop->type == PROP_PROTREF) { @@ -590,9 +605,21 @@ static HRESULT fill_protrefs(jsdisp_t *This) return S_OK; } +struct typeinfo_func { + dispex_prop_t *prop; + function_code_t *code; +}; + typedef struct { ITypeInfo ITypeInfo_iface; LONG ref; + + UINT num_funcs; + UINT num_vars; + struct typeinfo_func *funcs; + dispex_prop_t **vars; + + jsdisp_t *jsdisp; } ScriptTypeInfo; static inline ScriptTypeInfo *ScriptTypeInfo_from_ITypeInfo(ITypeInfo *iface) @@ -632,11 +659,17 @@ static ULONG WINAPI ScriptTypeInfo_Release(ITypeInfo *iface) { ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); LONG ref = InterlockedDecrement(&This->ref); + UINT i; TRACE("(%p) ref=%d\n", This, ref); if (!ref) { + for (i = This->num_funcs; i--;) + release_bytecode(This->funcs[i].code->bytecode); + IDispatchEx_Release(&This->jsdisp->IDispatchEx_iface); + heap_free(This->funcs); + heap_free(This->vars); heap_free(This); } return ref; @@ -897,17 +930,94 @@ static HRESULT WINAPI DispatchEx_GetTypeInfo(IDispatchEx *iface, UINT iTInfo, LC ITypeInfo **ppTInfo) { jsdisp_t *This = impl_from_IDispatchEx(iface); + dispex_prop_t *prop, *cur, *end, **typevar; + UINT num_funcs = 0, num_vars = 0; + struct typeinfo_func *typefunc; + function_code_t *func_code; ScriptTypeInfo *typeinfo; + unsigned pos; TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); if (iTInfo != 0) return DISP_E_BADINDEX; + for (prop = This->props, end = prop + This->prop_cnt; prop != end; prop++) + { + if (!prop->name || prop->type != PROP_JSVAL || !(prop->flags & PROPF_ENUMERABLE)) + continue; + + /* If two identifiers differ only by case, the TypeInfo fails */ + pos = This->props[get_props_idx(This, prop->hash)].bucket_head; + while (pos) + { + cur = This->props + pos; + + if (prop->hash == cur->hash && prop != cur && + cur->type == PROP_JSVAL && (cur->flags & PROPF_ENUMERABLE) && + !wcsicmp(prop->name, cur->name)) + { + return TYPE_E_AMBIGUOUSNAME; + } + pos = cur->bucket_next; + } + + if (is_function_prop(prop)) + { + if (Function_get_code(as_jsdisp(get_object(prop->u.val)))) + num_funcs++; + } + else num_vars++; + } + if (!(typeinfo = heap_alloc(sizeof(*typeinfo)))) return E_OUTOFMEMORY; typeinfo->ITypeInfo_iface.lpVtbl = &ScriptTypeInfoVtbl; typeinfo->ref = 1; + typeinfo->num_vars = num_vars; + typeinfo->num_funcs = num_funcs; + typeinfo->jsdisp = This; + + typeinfo->funcs = heap_alloc(sizeof(*typeinfo->funcs) * num_funcs); + if (!typeinfo->funcs) + { + heap_free(typeinfo); + return E_OUTOFMEMORY; + } + + typeinfo->vars = heap_alloc(sizeof(*typeinfo->vars) * num_vars); + if (!typeinfo->vars) + { + heap_free(typeinfo->funcs); + heap_free(typeinfo); + return E_OUTOFMEMORY; + } + + typefunc = typeinfo->funcs; + typevar = typeinfo->vars; + for (prop = This->props; prop != end; prop++) + { + if (!prop->name || prop->type != PROP_JSVAL || !(prop->flags & PROPF_ENUMERABLE)) + continue; + + if (is_function_prop(prop)) + { + func_code = Function_get_code(as_jsdisp(get_object(prop->u.val))); + if (!func_code) continue; + + typefunc->prop = prop; + typefunc->code = func_code; + typefunc++; + + /* The function may be deleted, so keep a ref */ + bytecode_addref(func_code->bytecode); + } + else + *typevar++ = prop; + } + + /* Keep a ref to the props and their names */ + IDispatchEx_AddRef(&This->IDispatchEx_iface); *ppTInfo = &typeinfo->ITypeInfo_iface; return S_OK; diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 7a44f50..52c1267 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -37,6 +37,7 @@ typedef struct { struct _function_vtbl_t { HRESULT (*call)(script_ctx_t*,FunctionInstance*,IDispatch*,unsigned,unsigned,jsval_t*,jsval_t*); HRESULT (*toString)(FunctionInstance*,jsstr_t**); + function_code_t* (*get_code)(FunctionInstance*); void (*destructor)(FunctionInstance*); }; @@ -524,6 +525,16 @@ static HRESULT Function_get_arguments(script_ctx_t *ctx, jsdisp_t *jsthis, jsval return S_OK; } +function_code_t *Function_get_code(jsdisp_t *jsthis) +{ + FunctionInstance *function; + + assert(is_class(jsthis, JSCLASS_FUNCTION)); + function = function_from_jsdisp(jsthis); + + return function->vtbl->get_code(function); +} + static void Function_destructor(jsdisp_t *dispex) { FunctionInstance *function = function_from_jsdisp(dispex); @@ -638,6 +649,11 @@ static HRESULT NativeFunction_toString(FunctionInstance *func, jsstr_t **ret) return S_OK; } +static function_code_t *NativeFunction_get_code(FunctionInstance *function) +{ + return NULL; +} + static void NativeFunction_destructor(FunctionInstance *function) { } @@ -645,6 +661,7 @@ static void NativeFunction_destructor(FunctionInstance *function) static const function_vtbl_t NativeFunctionVtbl = { NativeFunction_call, NativeFunction_toString, + NativeFunction_get_code, NativeFunction_destructor }; @@ -749,6 +766,13 @@ static HRESULT InterpretedFunction_toString(FunctionInstance *func, jsstr_t **re return *ret ? S_OK : E_OUTOFMEMORY; } +static function_code_t *InterpretedFunction_get_code(FunctionInstance *func) +{ + InterpretedFunction *function = (InterpretedFunction*)func; + + return function->func_code; +} + static void InterpretedFunction_destructor(FunctionInstance *func) { InterpretedFunction *function = (InterpretedFunction*)func; @@ -761,6 +785,7 @@ static void InterpretedFunction_destructor(FunctionInstance *func) static const function_vtbl_t InterpretedFunctionVtbl = { InterpretedFunction_call, InterpretedFunction_toString, + InterpretedFunction_get_code, InterpretedFunction_destructor }; @@ -842,6 +867,11 @@ static HRESULT BindFunction_toString(FunctionInstance *function, jsstr_t **ret) return *ret ? S_OK : E_OUTOFMEMORY; } +static function_code_t *BindFunction_get_code(FunctionInstance *function) +{ + return NULL; +} + static void BindFunction_destructor(FunctionInstance *func) { BindFunction *function = (BindFunction*)func; @@ -858,6 +888,7 @@ static void BindFunction_destructor(FunctionInstance *func) static const function_vtbl_t BindFunctionVtbl = { BindFunction_call, BindFunction_toString, + BindFunction_get_code, BindFunction_destructor }; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 5d635b7..7174db8 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -307,6 +307,7 @@ HRESULT Function_invoke(jsdisp_t*,IDispatch*,WORD,unsigned,jsval_t*,jsval_t*) DE HRESULT Function_value(script_ctx_t*,vdisp_t*,WORD,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN; HRESULT Function_get_value(script_ctx_t*,jsdisp_t*,jsval_t*) DECLSPEC_HIDDEN; +struct _function_code_t *Function_get_code(jsdisp_t*) DECLSPEC_HIDDEN; #define DEFAULT_FUNCTION_VALUE {NULL, Function_value,0, Function_get_value} HRESULT throw_eval_error(script_ctx_t*,HRESULT,const WCHAR*) DECLSPEC_HIDDEN; -- 2.21.0

4 29

[PATCH] ntoskrnl.exe/tests: Fix typos in ok() messages.
by Andrey Gusev 12 Dec '19

12 Dec '19

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/ntoskrnl.exe/tests/driver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 6827b74a3c..10f3865515 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -800,7 +800,7 @@ static void test_call_driver(DEVICE_OBJECT *device) ok(irpsp->MajorFunction == IRP_MJ_FLUSH_BUFFERS, "MajorFunction = %u\n", irpsp->MajorFunction); ok(!irpsp->DeviceObject, "DeviceObject = %u\n", irpsp->DeviceObject); ok(!irpsp->FileObject, "FileObject = %u\n", irpsp->FileObject); - ok(!irpsp->CompletionRoutine, "CompletionRouptine = %p\n", irpsp->CompletionRoutine); + ok(!irpsp->CompletionRoutine, "CompletionRoutine = %p\n", irpsp->CompletionRoutine); status = IoCallDriver(device, irp); ok(status == STATUS_PENDING, "IoCallDriver returned %#x\n", status); @@ -824,7 +824,7 @@ static void test_call_driver(DEVICE_OBJECT *device) ok(irpsp->MajorFunction == IRP_MJ_FLUSH_BUFFERS, "MajorFunction = %u\n", irpsp->MajorFunction); ok(!irpsp->DeviceObject, "DeviceObject = %u\n", irpsp->DeviceObject); ok(!irpsp->FileObject, "FileObject = %u\n", irpsp->FileObject); - ok(!irpsp->CompletionRoutine, "CompletionRouptine = %p\n", irpsp->CompletionRoutine); + ok(!irpsp->CompletionRoutine, "CompletionRoutine = %p\n", irpsp->CompletionRoutine); status = wait_single(&event, 0); ok(status == STATUS_TIMEOUT, "got %#x\n", status); -- 2.23.0

2 1

[PATCH] ole32: Fix typos in comments.
by Andrey Gusev 12 Dec '19

12 Dec '19

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/ole32/compobj.c | 2 +- dlls/ole32/storage32.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index a91067fcb7..daa405356f 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -4763,7 +4763,7 @@ HRESULT WINAPI CoWaitForMultipleHandles(DWORD dwFlags, DWORD dwTimeout, * PARAMS * pszName [I] String representing the object. * pBindOptions [I] Parameters affecting the binding to the named object. - * riid [I] Interface to bind to on the objecct. + * riid [I] Interface to bind to on the object. * ppv [O] On output, the interface riid of the object represented * by pszName. * diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 515880ec36..6b05669a5e 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -8622,7 +8622,7 @@ end: * pwcsName [ I] Unicode string with filename (can be relative or NULL) * grfMode [ I] Access mode for opening the new storage object (see STGM_ constants) * reserved [ ?] unused?, usually 0 - * ppstgOpen [IO] A pointer to IStorage pointer to the new onject + * ppstgOpen [IO] A pointer to IStorage pointer to the new object * * RETURNS * S_OK if the file was successfully created -- 2.23.0

1 0

[PATCH 5/5] msado15: Implement _Recordset_Open and _Recordset_Close.
by Hans Leidekker 12 Dec '19

12 Dec '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msado15/recordset.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index b214f9d077..e854b3e824 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -901,8 +901,13 @@ static HRESULT WINAPI recordset_CancelUpdate( _Recordset *iface ) static HRESULT WINAPI recordset_Close( _Recordset *iface ) { - FIXME( "%p\n", iface ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + + TRACE( "%p\n", recordset ); + + close_recordset( recordset ); + recordset->state = adStateClosed; + return S_OK; } static HRESULT WINAPI recordset_Delete( _Recordset *iface, AffectEnum affect_records ) @@ -950,9 +955,13 @@ static HRESULT WINAPI recordset_MoveLast( _Recordset *iface ) static HRESULT WINAPI recordset_Open( _Recordset *iface, VARIANT source, VARIANT active_connection, CursorTypeEnum cursor_type, LockTypeEnum lock_type, LONG options ) { - FIXME( "%p, %s, %s, %d, %d, %d\n", iface, debugstr_variant(&source), debugstr_variant(&active_connection), + struct recordset *recordset = impl_from_Recordset( iface ); + + FIXME( "%p, %s, %s, %d, %d, %d\n", recordset, debugstr_variant(&source), debugstr_variant(&active_connection), cursor_type, lock_type, options ); - return E_NOTIMPL; + + recordset->state = adStateOpen; + return S_OK; } static HRESULT WINAPI recordset_Requery( _Recordset *iface, LONG options ) -- 2.20.1

1 0

[PATCH 4/5] msado15: Implement Field_get_Value and Field_put_Value.
by Hans Leidekker 12 Dec '19

12 Dec '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msado15/recordset.c | 67 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 62 insertions(+), 5 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index b262243d89..b214f9d077 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -36,7 +36,12 @@ struct recordset { _Recordset Recordset_iface; LONG refs; + LONG state; struct fields *fields; + LONG count; + LONG allocated; + LONG index; + VARIANT *data; }; struct fields @@ -187,16 +192,51 @@ static HRESULT WINAPI field_get_Type( Field *iface, DataTypeEnum *type ) return S_OK; } +static LONG get_column_count( struct recordset *recordset ) +{ + return recordset->fields->count; +} + static HRESULT WINAPI field_get_Value( Field *iface, VARIANT *val ) { - FIXME( "%p, %p\n", iface, val ); - return E_NOTIMPL; + struct field *field = impl_from_Field( iface ); + ULONG row = field->recordset->index, col = field->index, col_count; + VARIANT copy; + HRESULT hr; + + TRACE( "%p, %p\n", field, val ); + + if (field->recordset->state == adStateClosed) return MAKE_ADO_HRESULT( adErrObjectClosed ); + if (field->recordset->index < 0) return MAKE_ADO_HRESULT( adErrNoCurrentRecord ); + + col_count = get_column_count( field->recordset ); + + VariantInit( &copy ); + if ((hr = VariantCopy( &copy, &field->recordset->data[row * col_count + col] )) != S_OK) return hr; + + *val = copy; + return S_OK; } static HRESULT WINAPI field_put_Value( Field *iface, VARIANT val ) { - FIXME( "%p, %s\n", iface, debugstr_variant(&val) ); - return E_NOTIMPL; + struct field *field = impl_from_Field( iface ); + ULONG row = field->recordset->index, col = field->index, col_count; + VARIANT copy; + HRESULT hr; + + TRACE( "%p, %s\n", field, debugstr_variant(&val) ); + + if (field->recordset->state == adStateClosed) return MAKE_ADO_HRESULT( adErrObjectClosed ); + if (field->recordset->index < 0) return MAKE_ADO_HRESULT( adErrNoCurrentRecord ); + + col_count = get_column_count( field->recordset ); + + VariantInit( &copy ); + if ((hr = VariantCopy( &copy, &val )) != S_OK) return hr; + + field->recordset->data[row * col_count + col] = copy; + return S_OK; } static HRESULT WINAPI field_get_Precision( Field *iface, unsigned char *precision ) @@ -614,6 +654,22 @@ static ULONG WINAPI recordset_AddRef( _Recordset *iface ) return refs; } +static void close_recordset( struct recordset *recordset ) +{ + ULONG row, col, col_count = get_column_count( recordset ); + + recordset->fields->recordset = NULL; + Fields_Release( &recordset->fields->Fields_iface ); + recordset->fields = NULL; + + for (row = 0; row < recordset->count; row++) + for (col = 0; col < col_count; col++) VariantClear( &recordset->data[row * col_count + col] ); + + recordset->count = recordset->allocated = recordset->index = 0; + heap_free( recordset->data ); + recordset->data = NULL; +} + static ULONG WINAPI recordset_Release( _Recordset *iface ) { struct recordset *recordset = impl_from_Recordset( iface ); @@ -622,7 +678,7 @@ static ULONG WINAPI recordset_Release( _Recordset *iface ) if (!refs) { TRACE( "destroying %p\n", recordset ); - recordset->fields->recordset = NULL; + close_recordset( recordset ); heap_free( recordset ); } return refs; @@ -1264,6 +1320,7 @@ HRESULT Recordset_create( void **obj ) if (!(recordset = heap_alloc_zero( sizeof(*recordset) ))) return E_OUTOFMEMORY; recordset->Recordset_iface.lpVtbl = &recordset_vtbl; recordset->refs = 1; + recordset->index = -1; *obj = &recordset->Recordset_iface; TRACE( "returning iface %p\n", *obj ); -- 2.20.1

1 0

[PATCH 3/5] msado15: Implement Field_get_Attributes and Field_get_DefinedSize.
by Hans Leidekker 12 Dec '19

12 Dec '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msado15/recordset.c | 16 ++++++++++++---- dlls/msado15/tests/msado15.c | 22 +++++++++++++++++++++- 2 files changed, 33 insertions(+), 5 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index ff06b8789a..b262243d89 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -147,14 +147,22 @@ static HRESULT WINAPI field_get_ActualSize( Field *iface, LONG *size ) static HRESULT WINAPI field_get_Attributes( Field *iface, LONG *attrs ) { - TRACE( "%p, %p\n", iface, attrs ); - return E_NOTIMPL; + struct field *field = impl_from_Field( iface ); + + TRACE( "%p, %p\n", field, attrs ); + + *attrs = field->attrs; + return S_OK; } static HRESULT WINAPI field_get_DefinedSize( Field *iface, LONG *size ) { - FIXME( "%p, %p\n", iface, size ); - return E_NOTIMPL; + struct field *field = impl_from_Field( iface ); + + TRACE( "%p, %p\n", field, size ); + + *size = field->defined_size; + return S_OK; } static HRESULT WINAPI field_get_Name( Field *iface, BSTR *str ) diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 800eb236fe..f9a5377c50 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -101,7 +101,9 @@ static void test_Fields(void) Field *field, *field2; VARIANT val, index; BSTR name; - LONG refs, count; + LONG refs, count, size; + DataTypeEnum type; + FieldAttributeEnum attrs; HRESULT hr; hr = CoCreateInstance( &CLSID_Recordset, NULL, CLSCTX_INPROC_SERVER, &IID__Recordset, (void **)&recordset ); @@ -164,6 +166,24 @@ static void test_Fields(void) Field_Release( field2 ); SysFreeString( name ); + /* verify values set with _Append */ + hr = Field_get_Name( field, &name ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !lstrcmpW( name, L"field" ), "got %s\n", wine_dbgstr_w(name) ); + SysFreeString( name ); + type = 0xdead; + hr = Field_get_Type( field, &type ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( type == adInteger, "got %d\n", type ); + size = -1; + hr = Field_get_DefinedSize( field, &size ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( size == 4, "got %d\n", size ); + attrs = 0xdead; + hr = Field_get_Attributes( field, &attrs ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !attrs, "got %d\n", attrs ); + Field_Release( field ); Fields_Release( fields ); _Recordset_Release( recordset ); -- 2.20.1

1 0