June 2015 - Wine-Commits - list.winehq.org

Matteo Bruni : wined3d: Clamp per-vertex point size in vertex shaders.
by Alexandre Julliard June 3, 2015

June 3, 2015

Module: wine Branch: master Commit: c186939f32b749508c191b8f27c36c999c296ee4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c186939f32b749508c191b8f2… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jun 2 16:39:47 2015 +0200 wined3d: Clamp per-vertex point size in vertex shaders. --- dlls/wined3d/glsl_shader.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e4bef5b..87ff576 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4925,7 +4925,7 @@ static void handle_ps3_input(struct shader_glsl_priv *priv, /* Context activation is done by the caller. */ static GLuint generate_param_reorder_function(struct shader_glsl_priv *priv, const struct wined3d_shader *vs, const struct wined3d_shader *ps, - const struct wined3d_gl_info *gl_info) + BOOL per_vertex_point_size, const struct wined3d_gl_info *gl_info) { struct wined3d_string_buffer *buffer = &priv->shader_buffer; GLuint ret = 0; @@ -4939,6 +4939,14 @@ static GLuint generate_param_reorder_function(struct shader_glsl_priv *priv, shader_addline(buffer, "%s\n", shader_glsl_get_version(gl_info, &vs->reg_maps.shader_version)); + if (per_vertex_point_size) + { + shader_addline(buffer, "uniform struct\n{\n"); + shader_addline(buffer, " float size_min;\n"); + shader_addline(buffer, " float size_max;\n"); + shader_addline(buffer, "} ffp_point;\n"); + } + if (ps_major < 3) { shader_addline(buffer, "void order_ps_input(in vec4 vs_out[%u])\n{\n", vs->limits->packed_output); @@ -4983,9 +4991,10 @@ static GLuint generate_param_reorder_function(struct shader_glsl_priv *priv, shader_addline(buffer, "gl_TexCoord[%u].w = 1.0;\n", semantic_idx); } } - else if (shader_match_semantic(semantic_name, WINED3D_DECL_USAGE_PSIZE)) + else if (shader_match_semantic(semantic_name, WINED3D_DECL_USAGE_PSIZE) && per_vertex_point_size) { - shader_addline(buffer, "gl_PointSize = vs_out[%u].%c;\n", output->register_idx, reg_mask[1]); + shader_addline(buffer, "gl_PointSize = clamp(vs_out[%u].%c, ffp_point.size_min, ffp_point.size_max);\n", + output->register_idx, reg_mask[1]); } else if (shader_match_semantic(semantic_name, WINED3D_DECL_USAGE_FOG)) { @@ -5019,9 +5028,10 @@ static GLuint generate_param_reorder_function(struct shader_glsl_priv *priv, shader_addline(buffer, "gl_Position%s = vs_out[%u]%s;\n", reg_mask, output->register_idx, reg_mask); } - else if (shader_match_semantic(semantic_name, WINED3D_DECL_USAGE_PSIZE)) + else if (shader_match_semantic(semantic_name, WINED3D_DECL_USAGE_PSIZE) && per_vertex_point_size) { - shader_addline(buffer, "gl_PointSize = vs_out[%u].%c;\n", output->register_idx, reg_mask[1]); + shader_addline(buffer, "gl_PointSize = clamp(vs_out[%u].%c, ffp_point.size_min, ffp_point.size_max);\n", + output->register_idx, reg_mask[1]); } } @@ -6711,7 +6721,8 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const WORD map = vshader->reg_maps.input_registers; struct wined3d_string_buffer *tmp_name = string_buffer_get(&priv->string_buffers); - reorder_shader_id = generate_param_reorder_function(priv, vshader, pshader, gl_info); + reorder_shader_id = generate_param_reorder_function(priv, vshader, pshader, + state->gl_primitive_type == GL_POINTS && vshader->reg_maps.point_size, gl_info); TRACE("Attaching GLSL shader object %u to program %u.\n", reorder_shader_id, program_id); GL_EXTCALL(glAttachShader(program_id, reorder_shader_id)); checkGLcall("glAttachShader");

1 0

Nikolay Sivov : riched20: Return 0x0 size for NULL objects.
by Alexandre Julliard June 3, 2015

June 3, 2015

Module: wine Branch: master Commit: 2a2446abdb5020535b65a4523329f9b953a3aae3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a2446abdb5020535b65a4523… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 2 17:26:15 2015 +0300 riched20: Return 0x0 size for NULL objects. --- dlls/riched20/richole.c | 10 ++++++++++ dlls/riched20/tests/richole.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index f3a4a01..7af3ae2 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -1420,8 +1420,12 @@ static HRESULT WINAPI IRichEditOle_fnInsertObject(IRichEditOle *me, REOBJECT *reo) { IRichEditOleImpl *This = impl_from_IRichEditOle(me); + TRACE("(%p,%p)\n", This, reo); + if (!reo) + return E_INVALIDARG; + if (reo->cbStruct < sizeof(*reo)) return STG_E_INVALIDPARAMETER; ME_InsertOLEFromCursor(This->editor, reo, 0); @@ -5037,6 +5041,12 @@ void ME_GetOLEObjectSize(const ME_Context *c, ME_Run *run, SIZE *pSize) return; } + if (!run->ole_obj->poleobj) + { + pSize->cx = pSize->cy = 0; + return; + } + if (IOleObject_QueryInterface(run->ole_obj->poleobj, &IID_IDataObject, (void**)&ido) != S_OK) { FIXME("Query Interface IID_IDataObject failed!\n"); diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 318b386..101896e 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -3072,6 +3072,42 @@ static void test_SetFont(void) ITextSelection_Release(selection); } +static void test_InsertObject(void) +{ + IRichEditOle *reole = NULL; + ITextDocument *doc = NULL; + IOleClientSite *clientsite; + REOBJECT reo; + HRESULT hr; + HWND hwnd; + + create_interfaces(&hwnd, &reole, &doc, NULL); + + hr = IRichEditOle_InsertObject(reole, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IRichEditOle_GetClientSite(reole, &clientsite); + ok(hr == S_OK, "got 0x%08x\n", hr); + + reo.cbStruct = sizeof(reo); + reo.cp = 0; + memset(&reo.clsid, 0, sizeof(reo.clsid)); + reo.poleobj = NULL; + reo.pstg = NULL; + reo.polesite = clientsite; + reo.sizel.cx = 10; + reo.sizel.cy = 10; + reo.dvaspect = DVASPECT_CONTENT; + reo.dwFlags = 0; + reo.dwUser = 0; + + hr = IRichEditOle_InsertObject(reole, &reo); + ok(hr == S_OK, "got 0x%08x\n", hr); + + IOleClientSite_Release(clientsite); + release_interfaces(&hwnd, &reole, &doc, NULL); +} + START_TEST(richole) { /* Must explicitly LoadLibrary(). The test has no references to functions in @@ -3104,4 +3140,5 @@ START_TEST(richole) test_Select(); test_GetStoryType(); test_SetFont(); + test_InsertObject(); }

1 0

Alexandre Julliard : server: Store the clipboard windows as full handles.
by Alexandre Julliard June 3, 2015

June 3, 2015

Module: wine Branch: master Commit: e99c3f0c4b07e5413fc1cc52676895c9fff1b71b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e99c3f0c4b07e5413fc1cc526… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 3 18:38:23 2015 +0900 server: Store the clipboard windows as full handles. --- server/clipboard.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/server/clipboard.c b/server/clipboard.c index 7e92121..f144ea1 100644 --- a/server/clipboard.c +++ b/server/clipboard.c @@ -137,6 +137,7 @@ void cleanup_clipboard_thread(struct thread *thread) static int open_clipboard( struct clipboard *clipboard, user_handle_t win ) { + win = get_user_full_handle( win ); if (clipboard->open_thread && clipboard->open_thread != current) { set_error(STATUS_WAS_LOCKED); @@ -166,7 +167,7 @@ static int set_clipboard_owner( struct clipboard *clipboard, user_handle_t win ) set_error(STATUS_WAS_LOCKED); return 0; } - clipboard->owner_win = win; + clipboard->owner_win = get_user_full_handle( win ); clipboard->owner_thread = current; return 1; } @@ -223,7 +224,7 @@ DECL_HANDLER(set_clipboard_info) if (!release_clipboard_owner( clipboard )) return; } - if (req->flags & SET_CB_VIEWER) clipboard->viewer = req->viewer; + if (req->flags & SET_CB_VIEWER) clipboard->viewer = get_user_full_handle( req->viewer ); if (req->flags & SET_CB_SEQNO) clipboard->seqno++;

1 0

Alexandre Julliard : server: Use separate helper functions for setting and resetting clipboard windows.
by Alexandre Julliard June 3, 2015

June 3, 2015

Module: wine Branch: master Commit: b8fac8adbfecc221731dda0c13c6fd4e593dff42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8fac8adbfecc221731dda0c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 3 18:37:16 2015 +0900 server: Use separate helper functions for setting and resetting clipboard windows. --- server/clipboard.c | 66 +++++++++++++++++++++++++----------------------------- 1 file changed, 30 insertions(+), 36 deletions(-) diff --git a/server/clipboard.c b/server/clipboard.c index 8f26703..7e92121 100644 --- a/server/clipboard.c +++ b/server/clipboard.c @@ -135,44 +135,51 @@ void cleanup_clipboard_thread(struct thread *thread) release_object( winstation ); } -static int set_clipboard_window( struct clipboard *clipboard, user_handle_t win, int clear ) +static int open_clipboard( struct clipboard *clipboard, user_handle_t win ) { if (clipboard->open_thread && clipboard->open_thread != current) { set_error(STATUS_WAS_LOCKED); return 0; } - else if (!clear) - { - clipboard->open_win = win; - clipboard->open_thread = current; - } - else + clipboard->open_win = win; + clipboard->open_thread = current; + return 1; +} + +static int close_clipboard( struct clipboard *clipboard ) +{ + if (clipboard->open_thread != current) { - clipboard->open_thread = NULL; - clipboard->open_win = 0; + set_win32_error( ERROR_CLIPBOARD_NOT_OPEN ); + return 0; } + clipboard->open_thread = NULL; + clipboard->open_win = 0; return 1; } - -static int set_clipboard_owner( struct clipboard *clipboard, user_handle_t win, int clear ) +static int set_clipboard_owner( struct clipboard *clipboard, user_handle_t win ) { if (clipboard->open_thread && clipboard->open_thread->process != current->process) { set_error(STATUS_WAS_LOCKED); return 0; } - else if (!clear) - { - clipboard->owner_win = win; - clipboard->owner_thread = current; - } - else + clipboard->owner_win = win; + clipboard->owner_thread = current; + return 1; +} + +static int release_clipboard_owner( struct clipboard *clipboard ) +{ + if (clipboard->open_thread && clipboard->open_thread->process != current->process) { - clipboard->owner_win = 0; - clipboard->owner_thread = NULL; + set_error(STATUS_WAS_LOCKED); + return 0; } + clipboard->owner_win = 0; + clipboard->owner_thread = NULL; return 1; } @@ -200,33 +207,20 @@ DECL_HANDLER(set_clipboard_info) if (req->flags & SET_CB_OPEN) { - if (clipboard->open_thread) - { - /* clipboard already opened */ - set_error(STATUS_WAS_LOCKED); - return; - } - - if (!set_clipboard_window( clipboard, req->clipboard, 0 )) return; + if (!open_clipboard( clipboard, req->clipboard )) return; } else if (req->flags & SET_CB_CLOSE) { - if (clipboard->open_thread != current) - { - set_win32_error(ERROR_CLIPBOARD_NOT_OPEN); - return; - } - - if (!set_clipboard_window( clipboard, 0, 1 )) return; + if (!close_clipboard( clipboard )) return; } if (req->flags & SET_CB_OWNER) { - if (!set_clipboard_owner( clipboard, req->owner, 0 )) return; + if (!set_clipboard_owner( clipboard, req->owner )) return; } else if (req->flags & SET_CB_RELOWNER) { - if (!set_clipboard_owner( clipboard, 0, 1 )) return; + if (!release_clipboard_owner( clipboard )) return; } if (req->flags & SET_CB_VIEWER) clipboard->viewer = req->viewer;

1 0

Jacek Caban : mshtml: Fixed leak in HTMLCurrentStyle_Create.
by Alexandre Julliard June 3, 2015

June 3, 2015

Module: wine Branch: master Commit: f5066488e9cb1ea5c7459f397e7da1598f22aa54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5066488e9cb1ea5c7459f397… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 2 16:01:20 2015 +0200 mshtml: Fixed leak in HTMLCurrentStyle_Create. --- dlls/mshtml/htmlcurstyle.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index f0b0d98..bf46cfc 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -1338,6 +1338,7 @@ HRESULT HTMLCurrentStyle_Create(HTMLElement *elem, IHTMLCurrentStyle **p) nsAString_Init(&nsempty_str, NULL); nsres = nsIDOMWindow_GetComputedStyle(nsview, (nsIDOMElement*)elem->nselem, &nsempty_str, &nsstyle); nsAString_Finish(&nsempty_str); + nsIDOMWindow_Release(nsview); if(NS_FAILED(nsres)) { ERR("GetComputedStyle failed: %08x\n", nsres); return E_FAIL;

1 0

Alexandre Julliard : user32: Get rid of the unused parameter in the EmptyClipboard driver entry point.
by Alexandre Julliard June 3, 2015

June 3, 2015

Module: wine Branch: master Commit: b7c340de730eec2f3546f5cb63328d6f8cb8c042 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7c340de730eec2f3546f5cb6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 3 16:38:44 2015 +0900 user32: Get rid of the unused parameter in the EmptyClipboard driver entry point. --- dlls/user32/clipboard.c | 3 +-- dlls/user32/driver.c | 6 +++--- dlls/user32/user_private.h | 2 +- dlls/winemac.drv/clipboard.c | 4 ++-- dlls/winemac.drv/winemac.drv.spec | 2 +- dlls/winex11.drv/clipboard.c | 25 ++++++++++++++----------- dlls/winex11.drv/winex11.drv.spec | 2 +- 7 files changed, 23 insertions(+), 21 deletions(-) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index de1ec60..666acf0 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -299,8 +299,7 @@ BOOL WINAPI EmptyClipboard(void) * to clear its cache. */ USER_Driver->pAcquireClipboard(cbinfo.hWndOpen); - /* Empty the local cache */ - USER_Driver->pEmptyClipboard(FALSE); + USER_Driver->pEmptyClipboard(); bCBHasChanged = TRUE; diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index e0bc38c..400d30a 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -344,7 +344,7 @@ static BOOL CDECL nulldrv_CountClipboardFormats(void) return 0; } -static void CDECL nulldrv_EmptyClipboard( BOOL keepunowned ) +static void CDECL nulldrv_EmptyClipboard(void) { } @@ -684,9 +684,9 @@ static BOOL CDECL loaderdrv_CountClipboardFormats(void) return load_driver()->pCountClipboardFormats(); } -static void CDECL loaderdrv_EmptyClipboard( BOOL keepunowned ) +static void CDECL loaderdrv_EmptyClipboard(void) { - load_driver()->pEmptyClipboard( keepunowned ); + load_driver()->pEmptyClipboard(); } static void CDECL loaderdrv_EndClipboardUpdate(void) diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 445fd40..01b9728 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -82,7 +82,7 @@ typedef struct tagUSER_DRIVER { /* clipboard functions */ INT (CDECL *pAcquireClipboard)(HWND); /* Acquire selection */ BOOL (CDECL *pCountClipboardFormats)(void); /* Count available clipboard formats */ - void (CDECL *pEmptyClipboard)(BOOL); /* Empty clipboard data */ + void (CDECL *pEmptyClipboard)(void); /* Empty clipboard data */ void (CDECL *pEndClipboardUpdate)(void); /* End clipboard update */ UINT (CDECL *pEnumClipboardFormats)(UINT); /* Enumerate clipboard formats */ HANDLE (CDECL *pGetClipboardData)(UINT); /* Get specified selection data */ diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index fe42023..3851d23 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -1952,9 +1952,9 @@ INT CDECL macdrv_CountClipboardFormats(void) * * Empty cached clipboard data. */ -void CDECL macdrv_EmptyClipboard(BOOL keepunowned) +void CDECL macdrv_EmptyClipboard(void) { - TRACE("keepunowned %d\n", keepunowned); + TRACE("()\n"); macdrv_clear_pasteboard(); } diff --git a/dlls/winemac.drv/winemac.drv.spec b/dlls/winemac.drv/winemac.drv.spec index 58a894b..a7dbb30 100644 --- a/dlls/winemac.drv/winemac.drv.spec +++ b/dlls/winemac.drv/winemac.drv.spec @@ -14,7 +14,7 @@ @ cdecl CreateWindow(long) macdrv_CreateWindow @ cdecl DestroyCursorIcon(long) macdrv_DestroyCursorIcon @ cdecl DestroyWindow(long) macdrv_DestroyWindow -@ cdecl EmptyClipboard(long) macdrv_EmptyClipboard +@ cdecl EmptyClipboard() macdrv_EmptyClipboard @ cdecl EndClipboardUpdate() macdrv_EndClipboardUpdate @ cdecl EnumClipboardFormats(long) macdrv_EnumClipboardFormats @ cdecl EnumDisplayMonitors(long ptr ptr long) macdrv_EnumDisplayMonitors diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index a460e0a..073e7cb 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -129,7 +129,6 @@ static int selectionAcquired = 0; /* Contains the current selection static Window selectionWindow = None; /* The top level X window which owns the selection */ static Atom selectionCacheSrc = XA_PRIMARY; /* The selection source from which the clipboard cache was filled */ -void CDECL X11DRV_EmptyClipboard(BOOL keepunowned); void CDECL X11DRV_EndClipboardUpdate(void); static HANDLE X11DRV_CLIPBOARD_ImportClipboardData(Display *d, Window w, Atom prop); static HANDLE X11DRV_CLIPBOARD_ImportEnhMetaFile(Display *d, Window w, Atom prop); @@ -171,6 +170,7 @@ static BOOL X11DRV_CLIPBOARD_RenderSynthesizedDIB(Display *display); static BOOL X11DRV_CLIPBOARD_RenderSynthesizedBitmap(Display *display); static BOOL X11DRV_CLIPBOARD_RenderSynthesizedEnhMetaFile(Display *display); static void X11DRV_HandleSelectionRequest( HWND hWnd, XSelectionRequestEvent *event, BOOL bIsMultiple ); +static void empty_clipboard( BOOL keepunowned ); /* Clipboard formats */ @@ -621,7 +621,7 @@ static BOOL X11DRV_CLIPBOARD_UpdateCache(void) } else if (wSeqNo < seqno) { - X11DRV_EmptyClipboard(TRUE); + empty_clipboard( TRUE ); if (X11DRV_CLIPBOARD_QueryAvailableData(thread_init_display()) < 0) { @@ -2862,7 +2862,7 @@ static void X11DRV_CLIPBOARD_ReleaseSelection(Display *display, Atom selType, Wi selectionWindow = None; - X11DRV_EmptyClipboard(FALSE); + empty_clipboard( FALSE ); /* Reset the selection flags now that we are done */ selectionAcquired = S_NOSELECTION; @@ -2982,12 +2982,7 @@ int CDECL X11DRV_AcquireClipboard(HWND hWndClipWindow) } -/************************************************************************** - * X11DRV_EmptyClipboard - * - * Empty cached clipboard data. - */ -void CDECL X11DRV_EmptyClipboard(BOOL keepunowned) +static void empty_clipboard(BOOL keepunowned) { WINE_CLIPDATA *data, *next; @@ -3003,7 +2998,15 @@ void CDECL X11DRV_EmptyClipboard(BOOL keepunowned) TRACE(" %d entries remaining in cache.\n", ClipDataCount); } - +/************************************************************************** + * X11DRV_EmptyClipboard + * + * Empty cached clipboard data. + */ +void CDECL X11DRV_EmptyClipboard(void) +{ + empty_clipboard( FALSE ); +} /************************************************************************** * X11DRV_SetClipboardData @@ -3154,7 +3157,7 @@ void X11DRV_ResetSelectionOwner(void) WARN("Failed to find another thread to take selection ownership. Clipboard data will be lost.\n"); X11DRV_CLIPBOARD_ReleaseOwnership(); - X11DRV_EmptyClipboard(FALSE); + empty_clipboard( FALSE ); } diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index b6e5c05..ce084b5 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -28,7 +28,7 @@ @ cdecl CreateDesktopWindow(long) X11DRV_CreateDesktopWindow @ cdecl CreateWindow(long) X11DRV_CreateWindow @ cdecl DestroyWindow(long) X11DRV_DestroyWindow -@ cdecl EmptyClipboard(long) X11DRV_EmptyClipboard +@ cdecl EmptyClipboard() X11DRV_EmptyClipboard @ cdecl EndClipboardUpdate() X11DRV_EndClipboardUpdate @ cdecl EnumClipboardFormats(long) X11DRV_EnumClipboardFormats @ cdecl GetClipboardData(long) X11DRV_GetClipboardData

1 0

Nikolay Sivov : dwrite: Fix potential null pointer dereference in GetInlineObject() (Coverity).
by Alexandre Julliard June 2, 2015

June 2, 2015

Module: wine Branch: master Commit: 9351596538d012c6ed11c59576246f524f90aa3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9351596538d012c6ed11c5957… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 31 15:11:56 2015 +0300 dwrite: Fix potential null pointer dereference in GetInlineObject() (Coverity). --- dlls/dwrite/layout.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index cb191b0..365f0b2 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -2016,8 +2016,11 @@ static HRESULT WINAPI dwritetextlayout_GetInlineObject(IDWriteTextLayout2 *iface TRACE("(%p)->(%u %p %p)\n", This, position, object, r); + if (position >= This->len) + return S_OK; + range = get_layout_range_by_pos(This, position); - *object = range ? range->object : NULL; + *object = range->object; if (*object) IDWriteInlineObject_AddRef(*object);

1 0

Akihiro Sagawa : mciqtz32: Watch the player thread while waiting a player task.
by Alexandre Julliard June 2, 2015

June 2, 2015

Module: wine Branch: master Commit: 998af35a3e587c8ce4a5f3fb130f9d942df72bda URL: http://source.winehq.org/git/wine.git/?a=commit;h=998af35a3e587c8ce4a5f3fb1… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Jun 2 01:22:09 2015 +0900 mciqtz32: Watch the player thread while waiting a player task. --- dlls/mciqtz32/mciqtz.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index 413c2f6..d018a54 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -75,6 +75,8 @@ static LRESULT MCIQTZ_relayTaskMessage(DWORD_PTR dwDevID, UINT wMsg, { WINE_MCIQTZ *wma; LRESULT res; + HANDLE handles[2]; + DWORD ret; TRACE("(%08lX, %08x, %08x, %08lx)\n", dwDevID, wMsg, dwFlags, lpParms); wma = MCIQTZ_mciGetOpenDev(dwDevID); @@ -86,7 +88,11 @@ static LRESULT MCIQTZ_relayTaskMessage(DWORD_PTR dwDevID, UINT wMsg, wma->task.flags = dwFlags; wma->task.parms = lpParms; SetEvent(wma->task.notify); - if (WaitForSingleObject(wma->task.done, INFINITE) == WAIT_OBJECT_0) + handles[0] = wma->task.done; + handles[1] = wma->task.thread; + ret = WaitForMultipleObjects(sizeof(handles)/sizeof(handles[0]), handles, + FALSE, INFINITE); + if (ret == WAIT_OBJECT_0) res = wma->task.res; else res = MCIERR_INTERNAL;

1 0

Akihiro Sagawa : shell32/tests: Make tests run on win2k again.
by Alexandre Julliard June 2, 2015

June 2, 2015

Module: wine Branch: master Commit: 4c31892ea50eede74b91078e67af3f2119f8b24a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c31892ea50eede74b91078e6… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Jun 2 01:22:04 2015 +0900 shell32/tests: Make tests run on win2k again. --- dlls/shell32/tests/shlfolder.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 1b457bb..822acf6 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -75,6 +75,7 @@ static UINT (WINAPI *pGetSystemWow64DirectoryW)(LPWSTR, UINT); static HRESULT (WINAPI *pSHCreateDefaultContextMenu)(const DEFCONTEXTMENU*,REFIID,void**); static HRESULT (WINAPI *pSHCreateShellFolderView)(const SFV_CREATE *pcsfv, IShellView **ppsv); static HRESULT (WINAPI *pSHCreateShellFolderViewEx)(LPCSFV psvcbi, IShellView **ppv); +static HRESULT (WINAPI *pSHILCreateFromPath)(LPCWSTR, LPITEMIDLIST *,DWORD*); static WCHAR *make_wstr(const char *str) { @@ -140,6 +141,7 @@ static void init_function_pointers(void) MAKEFUNC_ORD(ILFindLastID, 16); MAKEFUNC_ORD(ILIsEqual, 21); MAKEFUNC_ORD(ILCombine, 25); + MAKEFUNC_ORD(SHILCreateFromPath, 28); MAKEFUNC_ORD(ILFree, 155); MAKEFUNC_ORD(SHSimpleIDListFromPathAW, 162); #undef MAKEFUNC_ORD @@ -4974,9 +4976,9 @@ static void test_SHChangeNotify(BOOL test_new_delivery) entries[0].pidl = NULL; if(has_unicode) - hr = SHILCreateFromPath(root_dirW, (LPITEMIDLIST*)&entries[0].pidl, 0); + hr = pSHILCreateFromPath(root_dirW, (LPITEMIDLIST*)&entries[0].pidl, 0); else - hr = SHILCreateFromPath((LPCVOID)root_dirA, (LPITEMIDLIST*)&entries[0].pidl, 0); + hr = pSHILCreateFromPath((LPCVOID)root_dirA, (LPITEMIDLIST*)&entries[0].pidl, 0); ok(hr == S_OK, "SHILCreateFromPath failed: 0x%08x\n", hr); entries[0].fRecursive = TRUE;

1 0

Nikolay Sivov : riched20: Reduce code duplication in WM_SETTEXT/ WM_CREATE handler.
by Alexandre Julliard June 2, 2015

June 2, 2015

Module: wine Branch: master Commit: 0b94369bb757305926aa46199e533d4ecc284625 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b94369bb757305926aa46199… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 30 09:14:18 2015 +0300 riched20: Reduce code duplication in WM_SETTEXT/WM_CREATE handler. --- dlls/riched20/editor.c | 152 ++++++++++++++++++++++++------------------------- 1 file changed, 74 insertions(+), 78 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 8d878a4..38861fd 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3158,13 +3158,84 @@ void ME_ReplaceSel(ME_TextEditor *editor, BOOL can_undo, const WCHAR *str, int l ME_UpdateRepaint(editor, FALSE); } +static void ME_SetText(ME_TextEditor *editor, void *text, BOOL unicode) +{ + LONG codepage = unicode ? CP_UNICODE : CP_ACP; + int textLen; + + LPWSTR wszText = ME_ToUnicode(codepage, text, &textLen); + + if (textLen > 0) + { + int len = -1; + + /* uses default style! */ + if (!(editor->styleFlags & ES_MULTILINE)) + { + WCHAR *p = wszText; + + while (*p != '\0' && *p != '\r' && *p != '\n') p++; + len = p - wszText; + } + ME_InsertTextFromCursor(editor, 0, wszText, len, editor->pBuffer->pDefaultStyle); + } + ME_EndToUnicode(codepage, wszText); +} + +static LRESULT ME_WmCreate(ME_TextEditor *editor, LPARAM lParam, BOOL unicode) +{ + CREATESTRUCTW *createW = (CREATESTRUCTW*)lParam; + CREATESTRUCTA *createA = (CREATESTRUCTA*)lParam; + void *text = NULL; + INT max; + + if (lParam) + text = unicode ? (void*)createW->lpszName : (void*)createA->lpszName; + + ME_SetDefaultFormatRect(editor); + + max = (editor->styleFlags & ES_DISABLENOSCROLL) ? 1 : 0; + if (~editor->styleFlags & ES_DISABLENOSCROLL || editor->styleFlags & WS_VSCROLL) + ITextHost_TxSetScrollRange(editor->texthost, SB_VERT, 0, max, TRUE); + + if (~editor->styleFlags & ES_DISABLENOSCROLL || editor->styleFlags & WS_HSCROLL) + ITextHost_TxSetScrollRange(editor->texthost, SB_HORZ, 0, max, TRUE); + + if (editor->styleFlags & ES_DISABLENOSCROLL) + { + if (editor->styleFlags & WS_VSCROLL) + { + ITextHost_TxEnableScrollBar(editor->texthost, SB_VERT, ESB_DISABLE_BOTH); + ITextHost_TxShowScrollBar(editor->texthost, SB_VERT, TRUE); + } + if (editor->styleFlags & WS_HSCROLL) + { + ITextHost_TxEnableScrollBar(editor->texthost, SB_HORZ, ESB_DISABLE_BOTH); + ITextHost_TxShowScrollBar(editor->texthost, SB_HORZ, TRUE); + } + } + + if (text) + { + ME_SetText(editor, text, unicode); + ME_SetCursorToStart(editor, &editor->pCursors[0]); + ME_SetCursorToStart(editor, &editor->pCursors[1]); + } + + ME_CommitUndo(editor); + ME_WrapMarkedParagraphs(editor); + ME_MoveCaret(editor); + return 0; +} + + #define UNSUPPORTED_MSG(e) \ case e: \ FIXME(#e ": stub\n"); \ *phresult = S_FALSE; \ return 0; -/* Handle messages for windowless and windoweded richedit controls. +/* Handle messages for windowless and windowed richedit controls. * * The LRESULT that is returned is a return value for window procs, * and the phresult parameter is the COM return code needed by the @@ -3689,28 +3760,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, ME_StreamInRTFString(editor, 0, (char *)lParam); } else - { - int textLen; - LONG codepage = unicode ? CP_UNICODE : CP_ACP; - LPWSTR wszText = ME_ToUnicode(codepage, (void *)lParam, &textLen); - TRACE("WM_SETTEXT - %s\n", debugstr_w(wszText)); /* debugstr_w() */ - if (textLen > 0) - { - int len = -1; - - /* uses default style! */ - if (!(editor->styleFlags & ES_MULTILINE)) - { - WCHAR * p; - - p = wszText; - while (*p != '\0' && *p != '\r' && *p != '\n') p++; - len = p - wszText; - } - ME_InsertTextFromCursor(editor, 0, wszText, len, editor->pBuffer->pDefaultStyle); - } - ME_EndToUnicode(codepage, wszText); - } + ME_SetText(editor, (void*)lParam, unicode); } else TRACE("WM_SETTEXT - NULL\n"); @@ -4065,61 +4115,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, return (wParam >= 0x40000) ? 0 : MAKELONG( pt.x, pt.y ); } case WM_CREATE: - { - void *text = NULL; - INT max; - - ME_SetDefaultFormatRect(editor); - - max = (editor->styleFlags & ES_DISABLENOSCROLL) ? 1 : 0; - if (~editor->styleFlags & ES_DISABLENOSCROLL || editor->styleFlags & WS_VSCROLL) - ITextHost_TxSetScrollRange(editor->texthost, SB_VERT, 0, max, TRUE); - - if (~editor->styleFlags & ES_DISABLENOSCROLL || editor->styleFlags & WS_HSCROLL) - ITextHost_TxSetScrollRange(editor->texthost, SB_HORZ, 0, max, TRUE); - - if (editor->styleFlags & ES_DISABLENOSCROLL) - { - if (editor->styleFlags & WS_VSCROLL) - { - ITextHost_TxEnableScrollBar(editor->texthost, SB_VERT, ESB_DISABLE_BOTH); - ITextHost_TxShowScrollBar(editor->texthost, SB_VERT, TRUE); - } - if (editor->styleFlags & WS_HSCROLL) - { - ITextHost_TxEnableScrollBar(editor->texthost, SB_HORZ, ESB_DISABLE_BOTH); - ITextHost_TxShowScrollBar(editor->texthost, SB_HORZ, TRUE); - } - } - - if (lParam) - { - text = (unicode ? (void*)((CREATESTRUCTW*)lParam)->lpszName - : (void*)((CREATESTRUCTA*)lParam)->lpszName); - } - if (text) - { - WCHAR *textW; - int len; - LONG codepage = unicode ? CP_UNICODE : CP_ACP; - textW = ME_ToUnicode(codepage, text, &len); - if (!(editor->styleFlags & ES_MULTILINE)) - { - len = 0; - while(textW[len] != '\0' && textW[len] != '\r' && textW[len] != '\n') - len++; - } - ME_InsertTextFromCursor(editor, 0, textW, len, editor->pBuffer->pDefaultStyle); - ME_EndToUnicode(codepage, textW); - ME_SetCursorToStart(editor, &editor->pCursors[0]); - ME_SetCursorToStart(editor, &editor->pCursors[1]); - } - - ME_CommitUndo(editor); - ME_WrapMarkedParagraphs(editor); - ME_MoveCaret(editor); - return 0; - } + return ME_WmCreate(editor, lParam, unicode); case WM_DESTROY: ME_DestroyEditor(editor); return 0;

1 0