wine-commits June 2015

wine-commits@winehq.org

2 participants
610 discussions

Matteo Bruni : wined3d: Clamp per-vertex point size in vertex shaders.
by Alexandre Julliard 03 Jun '15

03 Jun '15

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

Matteo Bruni : wined3d: Always enable GL_PROGRAM_POINT_SIZE in the GLSL backend.
by Alexandre Julliard 03 Jun '15

03 Jun '15

Module: wine Branch: master Commit: e8cb3bdba5dfefb9a1bf0e858dd755ca6637149a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8cb3bdba5dfefb9a1bf0e858… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jun 2 16:39:46 2015 +0200 wined3d: Always enable GL_PROGRAM_POINT_SIZE in the GLSL backend. Core contexts don't support clamping the point size to GL_POINT_SIZE_MIN / GL_POINT_SIZE_MAX. Incidentally this mostly fixes per-vertex point sizes for vertex shader version 1 and 2. --- dlls/wined3d/arb_program_shader.c | 3 ++ dlls/wined3d/context.c | 1 + dlls/wined3d/glsl_shader.c | 67 +++++++++++++++++++-------------------- dlls/wined3d/shader.c | 8 +++++ dlls/wined3d/state.c | 8 ++--- dlls/wined3d/wined3d_private.h | 24 +++++++------- 6 files changed, 59 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e8cb3bdba5dfefb9a1bf0…

1 0

Nikolay Sivov : d3d8: Fix token type checks in convert_to_wined3d_declaration (Coverity).
by Alexandre Julliard 03 Jun '15

03 Jun '15

Module: wine Branch: master Commit: 3d6ee7e5b9fa22e844eaa6177bf146aad4a05777 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d6ee7e5b9fa22e844eaa6177… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 3 11:45:25 2015 +0300 d3d8: Fix token type checks in convert_to_wined3d_declaration (Coverity). --- dlls/d3d8/vertexdeclaration.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/vertexdeclaration.c b/dlls/d3d8/vertexdeclaration.c index 4be9127..968b76b 100644 --- a/dlls/d3d8/vertexdeclaration.c +++ b/dlls/d3d8/vertexdeclaration.c @@ -275,7 +275,7 @@ static UINT convert_to_wined3d_declaration(const DWORD *d3d8_elements, DWORD *d3 { stream = ((*token & D3DVSD_STREAMNUMBERMASK) >> D3DVSD_STREAMNUMBERSHIFT); offset = 0; - } else if (token_type == D3DVSD_TOKEN_STREAMDATA && !(token_type & 0x10000000)) { + } else if (token_type == D3DVSD_TOKEN_STREAMDATA && !(*token & D3DVSD_DATALOADTYPEMASK)) { DWORD type = ((*token & D3DVSD_DATATYPEMASK) >> D3DVSD_DATATYPESHIFT); DWORD reg = ((*token & D3DVSD_VERTEXREGMASK) >> D3DVSD_VERTEXREGSHIFT); @@ -293,7 +293,7 @@ static UINT convert_to_wined3d_declaration(const DWORD *d3d8_elements, DWORD *d3 element->usage_idx = wined3d_usage_lookup[reg].usage_idx; offset += wined3d_type_sizes[type]; - } else if (token_type == D3DVSD_TOKEN_STREAMDATA && (token_type & 0x10000000)) { + } else if (token_type == D3DVSD_TOKEN_STREAMDATA && (*token & D3DVSD_DATALOADTYPEMASK)) { TRACE(" 0x%08x SKIP(%u)\n", token_type, ((token_type & D3DVSD_SKIPCOUNTMASK) >> D3DVSD_SKIPCOUNTSHIFT)); offset += sizeof(DWORD) * ((token_type & D3DVSD_SKIPCOUNTMASK) >> D3DVSD_SKIPCOUNTSHIFT); }

1 0

Nikolay Sivov : comctl32/toolbar: Remove always true condition (Coverity).
by Alexandre Julliard 03 Jun '15

03 Jun '15

Module: wine Branch: master Commit: b7969dfd9413ab21ccf0a36d085f78077cb351e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7969dfd9413ab21ccf0a36d0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 3 11:10:24 2015 +0300 comctl32/toolbar: Remove always true condition (Coverity). --- dlls/comctl32/toolbar.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index ecf0604..2c7ed63 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -3347,8 +3347,7 @@ TOOLBAR_GetButtonInfoT(const TOOLBAR_INFO *infoPtr, INT Id, LPTBBUTTONINFOW lpTb if (nIndex == -1) return -1; - if (!(btnPtr = &infoPtr->buttons[nIndex])) return -1; - + btnPtr = &infoPtr->buttons[nIndex]; if (lpTbInfo->dwMask & TBIF_COMMAND) lpTbInfo->idCommand = btnPtr->idCommand; if (lpTbInfo->dwMask & TBIF_IMAGE)

1 0

Nikolay Sivov : riched20: Return 0x0 size for NULL objects.
by Alexandre Julliard 03 Jun '15

03 Jun '15

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: Check for the current owner window on the server side for releases.
by Alexandre Julliard 03 Jun '15

03 Jun '15

Module: wine Branch: master Commit: 25d9fc3ecc0bd283437e5d52e3c4ba3b7ed1b303 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25d9fc3ecc0bd283437e5d52e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 3 18:46:01 2015 +0900 server: Check for the current owner window on the server side for releases. --- dlls/user32/clipboard.c | 17 +++-------------- dlls/user32/user_private.h | 2 +- dlls/user32/win.c | 3 +-- server/clipboard.c | 9 +++++---- 4 files changed, 10 insertions(+), 21 deletions(-) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index c55b830..cd3fdd75 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -121,26 +121,15 @@ static BOOL CLIPBOARD_GetClipboardInfo(LPCLIPBOARDINFO cbInfo) /************************************************************************** * CLIPBOARD_ReleaseOwner */ -BOOL CLIPBOARD_ReleaseOwner(void) +void CLIPBOARD_ReleaseOwner( HWND hwnd ) { - BOOL bRet = FALSE; - SERVER_START_REQ( set_clipboard_info ) { req->flags = SET_CB_RELOWNER | SET_CB_SEQNO; - - if (wine_server_call_err( req )) - { - ERR("Failed to set clipboard.\n"); - } - else - { - bRet = TRUE; - } + req->owner = wine_server_user_handle( hwnd ); + wine_server_call( req ); } SERVER_END_REQ; - - return bRet; } diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index e0c1b43..1fbecb9 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -222,7 +222,7 @@ extern HMODULE user32_module DECLSPEC_HIDDEN; struct dce; struct tagWND; -extern BOOL CLIPBOARD_ReleaseOwner(void) DECLSPEC_HIDDEN; +extern void CLIPBOARD_ReleaseOwner( HWND hwnd ) DECLSPEC_HIDDEN; extern BOOL FOCUS_MouseActivate( HWND hwnd ) DECLSPEC_HIDDEN; extern BOOL set_capture_window( HWND hwnd, UINT gui_flags, HWND *prev_ret ) DECLSPEC_HIDDEN; extern void free_dce( struct dce *dce, HWND hwnd ) DECLSPEC_HIDDEN; diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 7090cb0..7a3f484 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1875,8 +1875,7 @@ BOOL WINAPI DestroyWindow( HWND hwnd ) WIN_SendDestroyMsg( hwnd ); if (!IsWindow( hwnd )) return TRUE; - if (GetClipboardOwner() == hwnd) - CLIPBOARD_ReleaseOwner(); + CLIPBOARD_ReleaseOwner( hwnd ); /* Destroy the window storage */ diff --git a/server/clipboard.c b/server/clipboard.c index 7a77ed2..9acee98 100644 --- a/server/clipboard.c +++ b/server/clipboard.c @@ -172,11 +172,12 @@ static int set_clipboard_owner( struct clipboard *clipboard, user_handle_t win ) return 1; } -static int release_clipboard_owner( struct clipboard *clipboard ) +static int release_clipboard_owner( struct clipboard *clipboard, user_handle_t win ) { - if (clipboard->open_thread && clipboard->open_thread->process != current->process) + if ((clipboard->open_thread && clipboard->open_thread->process != current->process) || + (win && clipboard->owner_win != get_user_full_handle( win ))) { - set_error(STATUS_WAS_LOCKED); + set_win32_error( ERROR_CLIPBOARD_NOT_OPEN ); return 0; } clipboard->owner_win = 0; @@ -221,7 +222,7 @@ DECL_HANDLER(set_clipboard_info) } else if (req->flags & SET_CB_RELOWNER) { - if (!release_clipboard_owner( clipboard )) return; + if (!release_clipboard_owner( clipboard, req->owner )) return; } if (req->flags & SET_CB_VIEWER) clipboard->viewer = get_user_full_handle( req->viewer );

1 0

Alexandre Julliard : server: Allow opening the clipboard again with the same owner.
by Alexandre Julliard 03 Jun '15

03 Jun '15

Module: wine Branch: master Commit: bdf3f413afc2efae68b7545083d6eb0893cd2687 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdf3f413afc2efae68b754508… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 3 18:39:18 2015 +0900 server: Allow opening the clipboard again with the same owner. --- dlls/user32/tests/clipboard.c | 3 ++- server/clipboard.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index f12e0cd..a9aef84 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -51,11 +51,12 @@ static void test_ClipboardOwner(void) ok(OpenClipboard(0), "OpenClipboard failed\n"); ok(!GetClipboardOwner(), "clipboard should still be not owned\n"); ok(!OpenClipboard(hWnd1), "OpenClipboard should fail since clipboard already opened\n"); + ok(OpenClipboard(0), "OpenClipboard again failed\n"); ret = CloseClipboard(); ok( ret, "CloseClipboard error %d\n", GetLastError()); ok(OpenClipboard(hWnd1), "OpenClipboard failed\n"); - todo_wine ok(OpenClipboard(hWnd1), "OpenClipboard second time in the same hwnd failed\n"); + ok(OpenClipboard(hWnd1), "OpenClipboard second time in the same hwnd failed\n"); SetLastError(0xdeadbeef); ret = OpenClipboard(hWnd2); diff --git a/server/clipboard.c b/server/clipboard.c index f144ea1..7a77ed2 100644 --- a/server/clipboard.c +++ b/server/clipboard.c @@ -138,7 +138,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) + if (clipboard->open_thread && (clipboard->open_thread != current || clipboard->open_win != win)) { set_error(STATUS_WAS_LOCKED); return 0;

1 0

Alexandre Julliard : server: Store the clipboard windows as full handles.
by Alexandre Julliard 03 Jun '15

03 Jun '15

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 03 Jun '15

03 Jun '15

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

Alexandre Julliard : server: Use a standard timestamp for the clipboard.
by Alexandre Julliard 03 Jun '15

03 Jun '15

Module: wine Branch: master Commit: b7f79bae86e62dd642f52145c0f480ba44e56a79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7f79bae86e62dd642f52145c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 3 16:02:11 2015 +0900 server: Use a standard timestamp for the clipboard. --- server/clipboard.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/server/clipboard.c b/server/clipboard.c index 0c39319..8f26703 100644 --- a/server/clipboard.c +++ b/server/clipboard.c @@ -30,6 +30,7 @@ #define WIN32_NO_STATUS #include "request.h" #include "object.h" +#include "file.h" #include "process.h" #include "user.h" #include "winuser.h" @@ -44,7 +45,7 @@ struct clipboard user_handle_t owner_win; /* window that owns the clipboard data */ user_handle_t viewer; /* first window in clipboard viewer list */ unsigned int seqno; /* clipboard change sequence number */ - time_t seqno_timestamp; /* time stamp of last seqno increment */ + timeout_t seqno_timestamp; /* time stamp of last seqno increment */ }; static void clipboard_dump( struct object *obj, int verbose ); @@ -70,7 +71,7 @@ static const struct object_ops clipboard_ops = }; -#define MINUPDATELAPSE 2 +#define MINUPDATELAPSE (2 * TICKS_PER_SEC) /* dump a clipboard object */ static void clipboard_dump( struct object *obj, int verbose ) @@ -178,11 +179,9 @@ static int set_clipboard_owner( struct clipboard *clipboard, user_handle_t win, static int get_seqno( struct clipboard *clipboard ) { - time_t tm = time(NULL); - - if (!clipboard->owner_thread && (tm > (clipboard->seqno_timestamp + MINUPDATELAPSE))) + if (!clipboard->owner_thread && (current_time - clipboard->seqno_timestamp > MINUPDATELAPSE)) { - clipboard->seqno_timestamp = tm; + clipboard->seqno_timestamp = current_time; clipboard->seqno++; } return clipboard->seqno;

1 0

← Newer
1
...
53
54
55
56
57
58
59
60
61
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2015