August 2016 - Wine-Commits - list.winehq.org

Aric Stewart : ntoskrnl.exe: Implement ObReferenceObjectByName but only for loaded drivers.
by Alexandre Julliard Aug. 4, 2016

Aug. 4, 2016

Module: wine Branch: master Commit: 6a686d63ad92c80cdca08e1a67856a431031b600 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a686d63ad92c80cdca08e1a6… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Aug 4 11:53:57 2016 -0500 ntoskrnl.exe: Implement ObReferenceObjectByName but only for loaded drivers. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 25187d3..d812692 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2107,8 +2107,36 @@ NTSTATUS WINAPI ObReferenceObjectByName( UNICODE_STRING *ObjectName, void *ParseContext, void **Object) { - FIXME("stub\n"); - return STATUS_NOT_IMPLEMENTED; + struct wine_driver *driver; + struct wine_rb_entry *entry; + + TRACE("mostly-stub:%s %i %p %i %p %i %p %p\n", debugstr_us(ObjectName), + Attributes, AccessState, DesiredAccess, ObjectType, AccessMode, + ParseContext, Object); + + if (AccessState) FIXME("Unhandled AccessState\n"); + if (DesiredAccess) FIXME("Unhandled DesiredAccess\n"); + if (ParseContext) FIXME("Unhandled ParseContext\n"); + if (ObjectType) FIXME("Unhandled ObjectType\n"); + + if (AccessMode != KernelMode) + { + FIXME("UserMode access not implemented\n"); + return STATUS_NOT_IMPLEMENTED; + } + + EnterCriticalSection(&drivers_cs); + entry = wine_rb_get(&wine_drivers, ObjectName); + LeaveCriticalSection(&drivers_cs); + if (!entry) + { + FIXME("Object (%s) not found, may not be tracked.\n", debugstr_us(ObjectName)); + return STATUS_NOT_IMPLEMENTED; + } + + driver = WINE_RB_ENTRY_VALUE(entry, struct wine_driver, entry); + *Object = &driver->driver_obj; + return STATUS_SUCCESS; }

1 0

Michael Stefaniuc : cryptui: Avoid using the LPJUNK style for COM interface types.
by Alexandre Julliard Aug. 4, 2016

Aug. 4, 2016

Module: wine Branch: master Commit: edba9a5ef5666c8bafbd3313d4136eb2c7347f7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=edba9a5ef5666c8bafbd3313d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Aug 4 18:53:56 2016 +0200 cryptui: Avoid using the LPJUNK style for COM interface types. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cryptui/main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 616ccf7..a652239 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -1792,16 +1792,16 @@ static void add_cert_string_to_control(HWND hwnd, PCCERT_CONTEXT pCertContext, static void add_icon_to_control(HWND hwnd, int id) { HRESULT hr; - LPRICHEDITOLE richEditOle = NULL; - LPOLEOBJECT object = NULL; + IRichEditOle *richEditOle = NULL; + IOleObject *object = NULL; CLSID clsid; LPOLECACHE oleCache = NULL; FORMATETC formatEtc; DWORD conn; - LPDATAOBJECT dataObject = NULL; + IDataObject *dataObject = NULL; HBITMAP bitmap = NULL; STGMEDIUM stgm; - LPOLECLIENTSITE clientSite = NULL; + IOleClientSite *clientSite = NULL; REOBJECT reObject; TRACE("(%p, %d)\n", hwnd, id);

1 0

Piotr Caban : ucrtbase: Add initial __std_type_info tests.
by Alexandre Julliard Aug. 4, 2016

Aug. 4, 2016

Module: wine Branch: master Commit: f45db432ce1bc9e26f386278a73ed98760e6de25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f45db432ce1bc9e26f386278a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 4 16:29:06 2016 +0200 ucrtbase: Add initial __std_type_info tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/cpp.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/dlls/ucrtbase/tests/cpp.c b/dlls/ucrtbase/tests/cpp.c index 12b0422..168cd21 100644 --- a/dlls/ucrtbase/tests/cpp.c +++ b/dlls/ucrtbase/tests/cpp.c @@ -33,8 +33,25 @@ typedef struct { MSVCRT_bool dofree; } __std_exception_data; +typedef struct +{ + char *name; + char mangled[32]; +} type_info140; + +typedef struct _type_info_list +{ + SLIST_ENTRY entry; + char name[1]; +} type_info_list; + +static void* (CDECL *p_malloc)(size_t); static void (CDECL *p___std_exception_copy)(const __std_exception_data*, __std_exception_data*); static void (CDECL *p___std_exception_destroy)(__std_exception_data*); +static int (CDECL *p___std_type_info_compare)(const type_info140*, const type_info140*); +static const char* (CDECL *p___std_type_info_name)(type_info140*, SLIST_HEADER*); +static void (CDECL *p___std_type_info_destroy_list)(SLIST_HEADER*); + static BOOL init(void) { @@ -47,8 +64,12 @@ static BOOL init(void) return FALSE; } + p_malloc = (void*)GetProcAddress(module, "malloc"); p___std_exception_copy = (void*)GetProcAddress(module, "__std_exception_copy"); p___std_exception_destroy = (void*)GetProcAddress(module, "__std_exception_destroy"); + p___std_type_info_compare = (void*)GetProcAddress(module, "__std_type_info_compare"); + p___std_type_info_name = (void*)GetProcAddress(module, "__std_type_info_name"); + p___std_type_info_destroy_list = (void*)GetProcAddress(module, "__std_type_info_destroy_list"); return TRUE; } @@ -96,8 +117,48 @@ static void test___std_exception(void) ok(!dst.dofree, "dst.dofree != FALSE\n"); } +static void test___std_type_info(void) +{ + type_info140 ti1 = { NULL, ".?AVa@@" }; + type_info140 ti2 = { NULL, ".?AVb@@" }; + type_info140 ti3 = ti1; + SLIST_HEADER header; + type_info_list *elem; + const char *ret; + int eq; + + + InitializeSListHead(&header); + p___std_type_info_destroy_list(&header); + + elem = p_malloc(sizeof(*elem)); + memset(elem, 0, sizeof(*elem)); + InterlockedPushEntrySList(&header, &elem->entry); + p___std_type_info_destroy_list(&header); + ok(!InterlockedPopEntrySList(&header), "list is not empty\n"); + + ret = p___std_type_info_name(&ti1, &header); + ok(!strcmp(ret, "class a"), "__std_type_info_name(&ti1) = %s\n", ret); + ok(ti1.name == ret, "ti1.name = %p, ret = %p\n", ti1.name, ret); + + p___std_type_info_destroy_list(&header); + ok(!InterlockedPopEntrySList(&header), "list is not empty\n"); + ok(ti1.name == ret, "ti1.name = %p, ret = %p\n", ti1.name, ret); + ti1.name = NULL; + + eq = p___std_type_info_compare(&ti1, &ti1); + ok(eq == 0, "__std_type_info_compare(&ti1, &ti1) = %d\n", eq); + + eq = p___std_type_info_compare(&ti1, &ti2); + ok(eq == -1, "__std_type_info_compare(&ti1, &ti2) = %d\n", eq); + + eq = p___std_type_info_compare(&ti1, &ti3); + ok(eq == 0, "__std_type_info_compare(&ti1, &ti3) = %d\n", eq); +} + START_TEST(cpp) { if (!init()) return; test___std_exception(); + test___std_type_info(); }

1 0

Jacek Caban : jscript: Don't use OP_var_set.
by Alexandre Julliard Aug. 4, 2016

Aug. 4, 2016

Module: wine Branch: master Commit: 7694afff4bb33b25fd5899d07ffce4f31d12474f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7694afff4bb33b25fd5899d07… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 4 13:39:53 2016 +0200 jscript: Don't use OP_var_set. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/compile.c | 9 ++++++++- dlls/jscript/engine.c | 15 --------------- dlls/jscript/engine.h | 1 - 3 files changed, 8 insertions(+), 17 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index e911373..0087459 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -1095,11 +1095,18 @@ static HRESULT compile_variable_list(compiler_ctx_t *ctx, variable_declaration_t if(!iter->expr) continue; + hres = push_instr_bstr_uint(ctx, OP_identid, iter->identifier, 0); + if(FAILED(hres)) + return hres; + hres = compile_expression(ctx, iter->expr, TRUE); if(FAILED(hres)) return hres; - hres = push_instr_bstr(ctx, OP_var_set, iter->identifier); + if(!push_instr(ctx, OP_assign)) + return E_OUTOFMEMORY; + + hres = push_instr_uint(ctx, OP_pop, 1); if(FAILED(hres)) return hres; } diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index bc8eb5b..2305998 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -728,21 +728,6 @@ static inline void jmp_abs(script_ctx_t *ctx, unsigned dst) ctx->call_ctx->ip = dst; } -/* ECMA-262 3rd Edition 12.2 */ -static HRESULT interp_var_set(script_ctx_t *ctx) -{ - const BSTR name = get_op_bstr(ctx, 0); - jsval_t val; - HRESULT hres; - - TRACE("%s\n", debugstr_w(name)); - - val = stack_pop(ctx); - hres = jsdisp_propput_name(ctx->call_ctx->variable_obj, name, val); - jsval_release(val); - return hres; -} - /* ECMA-262 3rd Edition 12.6.4 */ static HRESULT interp_forin(script_ctx_t *ctx) { diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 0434ff1..2aaf831 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -89,7 +89,6 @@ X(setret, 1, 0,0) \ X(sub, 1, 0,0) \ X(undefined, 1, 0,0) \ - X(var_set, 1, ARG_BSTR, 0) \ X(void, 1, 0,0) \ X(xor, 1, 0,0)

1 0

Henri Verbeet : wined3d: Use wined3d_texture_load_location() in swapchain_gl_frontbuffer_updated().
by Alexandre Julliard Aug. 4, 2016

Aug. 4, 2016

Module: wine Branch: master Commit: f80ba28a1552db3d455cb88ed063c87bcc72c58f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f80ba28a1552db3d455cb88ed… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 4 12:06:59 2016 +0200 wined3d: Use wined3d_texture_load_location() in swapchain_gl_frontbuffer_updated(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 52f3e71..802e2bc 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -637,12 +637,11 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, static void swapchain_gl_frontbuffer_updated(struct wined3d_swapchain *swapchain) { - struct wined3d_surface *surface; + struct wined3d_texture *front_buffer = swapchain->front_buffer; struct wined3d_context *context; - surface = swapchain->front_buffer->sub_resources[0].u.surface; - context = context_acquire(swapchain->device, surface); - surface_load_location(surface, context, surface->container->resource.draw_binding); + context = context_acquire(swapchain->device, front_buffer->sub_resources[0].u.surface); + wined3d_texture_load_location(front_buffer, 0, context, front_buffer->resource.draw_binding); context_release(context); SetRectEmpty(&swapchain->front_buffer_update); }

1 0

Henri Verbeet : wined3d: Use wined3d_texture_load_location() in swapchain_gl_present().
by Alexandre Julliard Aug. 4, 2016

Aug. 4, 2016

Module: wine Branch: master Commit: 398f0d024f49ff2fd0958242b92c1461a0b64f6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=398f0d024f49ff2fd0958242b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 4 12:06:58 2016 +0200 wined3d: Use wined3d_texture_load_location() in swapchain_gl_present(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 13106bf..52f3e71 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -483,14 +483,14 @@ static void wined3d_swapchain_rotate(struct wined3d_swapchain *swapchain, struct static void swapchain_gl_present(struct wined3d_swapchain *swapchain, const RECT *src_rect, const RECT *dst_rect, DWORD flags) { - struct wined3d_surface *back_buffer = swapchain->back_buffers[0]->sub_resources[0].u.surface; + struct wined3d_texture *back_buffer = swapchain->back_buffers[0]; const struct wined3d_fb_state *fb = &swapchain->device->fb; const struct wined3d_gl_info *gl_info; struct wined3d_texture *logo_texture; struct wined3d_context *context; BOOL render_to_fbo; - context = context_acquire(swapchain->device, back_buffer); + context = context_acquire(swapchain->device, back_buffer->sub_resources[0].u.surface); if (!context->valid) { context_release(context); @@ -505,7 +505,7 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, RECT rect = {0, 0, logo_texture->resource.width, logo_texture->resource.height}; /* Blit the logo into the upper left corner of the drawable. */ - wined3d_texture_blt(swapchain->back_buffers[0], 0, &rect, logo_texture, 0, &rect, + wined3d_texture_blt(back_buffer, 0, &rect, logo_texture, 0, &rect, WINED3D_BLT_ALPHA_TEST, NULL, WINED3D_TEXF_POINT); } @@ -525,16 +525,14 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, swapchain->device->cursor_texture->resource.width, swapchain->device->cursor_texture->resource.height }; - const RECT clip_rect = {0, 0, - swapchain->back_buffers[0]->resource.width, - swapchain->back_buffers[0]->resource.height}; + const RECT clip_rect = {0, 0, back_buffer->resource.width, back_buffer->resource.height}; TRACE("Rendering the software cursor.\n"); if (swapchain->desc.windowed) MapWindowPoints(NULL, swapchain->win_handle, (POINT *)&dst_rect, 2); if (wined3d_clip_blit(&clip_rect, &dst_rect, &src_rect)) - wined3d_texture_blt(swapchain->back_buffers[0], 0, &dst_rect, + wined3d_texture_blt(back_buffer, 0, &dst_rect, swapchain->device->cursor_texture, 0, &src_rect, WINED3D_BLT_ALPHA_TEST, NULL, WINED3D_TEXF_POINT); } @@ -559,14 +557,14 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, */ if (!swapchain->render_to_fbo && render_to_fbo && wined3d_settings.offscreen_rendering_mode == ORM_FBO) { - surface_load_location(back_buffer, context, WINED3D_LOCATION_TEXTURE_RGB); - wined3d_texture_invalidate_location(back_buffer->container, 0, WINED3D_LOCATION_DRAWABLE); + wined3d_texture_load_location(back_buffer, 0, context, WINED3D_LOCATION_TEXTURE_RGB); + wined3d_texture_invalidate_location(back_buffer, 0, WINED3D_LOCATION_DRAWABLE); swapchain->render_to_fbo = TRUE; swapchain_update_draw_bindings(swapchain); } else { - surface_load_location(back_buffer, context, back_buffer->container->resource.draw_binding); + wined3d_texture_load_location(back_buffer, 0, context, back_buffer->resource.draw_binding); } if (swapchain->render_to_fbo)

1 0

Henri Verbeet : wined3d: Use wined3d_texture_load_location() in wined3d_surface_blt().
by Alexandre Julliard Aug. 4, 2016

Aug. 4, 2016

Module: wine Branch: master Commit: 140220375936ea4f2c5393d46027ed2d7de1d7a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=140220375936ea4f2c5393d46… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 4 12:06:55 2016 +0200 wined3d: Use wined3d_texture_load_location() in wined3d_surface_blt(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8ba63fd..efdea87 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4226,7 +4226,8 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst if (!wined3d_resource_is_offscreen(&dst_texture->resource)) { struct wined3d_context *context = context_acquire(device, dst_surface); - surface_load_location(dst_surface, context, dst_texture->resource.draw_binding); + wined3d_texture_load_location(dst_texture, dst_sub_resource_idx, + context, dst_texture->resource.draw_binding); context_release(context); } return WINED3D_OK;

1 0

Nikolay Sivov : mshtml: Remove dead assignment (Coverity).
by Alexandre Julliard Aug. 4, 2016

Aug. 4, 2016

Module: wine Branch: master Commit: 0b0a63b4336935b631d0deb20f5ce49ad078834c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b0a63b4336935b631d0deb20… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 4 09:06:17 2016 +0300 mshtml: Remove dead assignment (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsembed.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 958b619..e343dde 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -959,7 +959,7 @@ static HRESULT nsnode_to_nsstring_rec(nsIContentSerializer *serializer, nsIDOMNo nsIContentSerializer_AppendText(serializer, nscontent, 0, -1, str); break; case COMMENT_NODE: - nsres = nsIContentSerializer_AppendComment(serializer, nscontent, 0, -1, str); + nsIContentSerializer_AppendComment(serializer, nscontent, 0, -1, str); break; case DOCUMENT_NODE: { nsIDocument *nsdoc;

1 0

Nikolay Sivov : comctl32/listview: Return earlier on allocation failure ( Coverity).
by Alexandre Julliard Aug. 4, 2016

Aug. 4, 2016

Module: wine Branch: master Commit: 622a24046f9c06078e1e7b27726f90b6fa9b1e0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=622a24046f9c06078e1e7b277… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 4 10:57:47 2016 +0300 comctl32/listview: Return earlier on allocation failure (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 6ab360b..cc1721b 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -5863,13 +5863,15 @@ static BOOL LISTVIEW_EndEditLabelT(LISTVIEW_INFO *infoPtr, BOOL storeText, BOOL { DWORD len = isW ? GetWindowTextLengthW(infoPtr->hwndEdit) : GetWindowTextLengthA(infoPtr->hwndEdit); - if (len) + if (len++) { - if ((pszText = Alloc((len+1) * (isW ? sizeof(WCHAR) : sizeof(CHAR))))) - { - if (isW) GetWindowTextW(infoPtr->hwndEdit, pszText, len+1); - else GetWindowTextA(infoPtr->hwndEdit, (CHAR*)pszText, len+1); - } + if (!(pszText = Alloc(len * (isW ? sizeof(WCHAR) : sizeof(CHAR))))) + return FALSE; + + if (isW) + GetWindowTextW(infoPtr->hwndEdit, pszText, len); + else + GetWindowTextA(infoPtr->hwndEdit, (CHAR*)pszText, len); } }

1 0

Aric Stewart : winedevice: Use IoCreateDriver and IoDeleteDriver.
by Alexandre Julliard Aug. 4, 2016

Aug. 4, 2016

Module: wine Branch: master Commit: 3b37db88e93ee8aeb42bd4256fb1a4d2bbeb8bbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b37db88e93ee8aeb42bd4256… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Aug 4 18:59:50 2016 +0200 winedevice: Use IoCreateDriver and IoDeleteDriver. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedevice/device.c | 176 ++++++++++++++++++++++--------------------- 1 file changed, 90 insertions(+), 86 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3b37db88e93ee8aeb42bd…

1 0