February 2017 - Wine-commits

Huw Davies : dssenh/tests: Fix a failing test on Windows 7.
by Alexandre Julliard 03 Feb '17

03 Feb '17

Module: wine Branch: master Commit: 95e2059387badcb2e097839da611cf257bdfc4ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=95e2059387badcb2e097839da… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Feb 3 11:22:28 2017 +0000 dssenh/tests: Fix a failing test on Windows 7. This makes it symmetric with the test directly preceding it. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dssenh/tests/dssenh.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index f07b0d3..ccb7dcd 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -1174,15 +1174,14 @@ static void test_keyExchange_baseDSS(HCRYPTPROV hProv, const struct keyExchange_ ok((!result && GetLastError() == ERROR_INVALID_PARAMETER) || broken(!result && GetLastError() == NTE_BAD_DATA) || /* Vista.64 */ broken(!result && GetLastError() == NTE_BAD_TYPE) || /* Win2K-W2K8, Win7.64 */ - broken(!result && GetLastError() == NTE_BAD_ALGID) || /* W7SP164 (32 bit dssenh) */ - broken(result), /* WinNT4 */ + broken(!result && GetLastError() == NTE_BAD_ALGID), /* W7SP164 (32 bit dssenh) */ "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError()); result = CryptImportKey(hProv, pubKeyBuffer1, pubKeyLen1, privKey2, 0, &sessionKey2); ok((!result && GetLastError() == ERROR_INVALID_PARAMETER) || + broken(!result && GetLastError() == NTE_BAD_DATA) || /* Win 7 */ broken(!result && GetLastError() == NTE_BAD_TYPE) || /* Win2K-W2K8, Win7.64 */ - broken(!result && GetLastError() == NTE_BAD_ALGID) || /* W7SP164 (32 bit dssenh) */ - broken(result), /* WinNT4 */ + broken(!result && GetLastError() == NTE_BAD_ALGID), /* W7SP164 (32 bit dssenh) */ "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError()); /* Set the shared key parameters to matching type */

1 0

Huw Davies : dmcompos/tests: Fix a failing test on Windows 8.
by Alexandre Julliard 03 Feb '17

03 Feb '17

Module: wine Branch: master Commit: 960cef83076aafbcda4842d0ba505dbbd79caf81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=960cef83076aafbcda4842d0b… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Feb 3 11:45:25 2017 +0000 dmcompos/tests: Fix a failing test on Windows 8. The dirty bit is most likely uninitialized, so sometimes this returns S_OK. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmcompos/tests/dmcompos.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dmcompos/tests/dmcompos.c b/dlls/dmcompos/tests/dmcompos.c index 4e9a80d..fd68ac3 100644 --- a/dlls/dmcompos/tests/dmcompos.c +++ b/dlls/dmcompos/tests/dmcompos.c @@ -252,7 +252,7 @@ static void test_chordmap(void) /* Unimplemented IPersistStream methods */ hr = IPersistStream_IsDirty(ps); - ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); + ok(hr == S_FALSE || broken(hr == S_OK), "IPersistStream_IsDirty failed: %08x\n", hr); hr = IPersistStream_GetSizeMax(ps, &size); ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %08x\n", hr); hr = IPersistStream_Save(ps, NULL, TRUE);

1 0

Nikolay Sivov : dwrite: Get rid of assignment to self.
by Alexandre Julliard 03 Feb '17

03 Feb '17

Module: wine Branch: master Commit: 9c238307cc2d17645d9c969cafa5b503e568e12a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c238307cc2d17645d9c969ca… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 3 15:20:27 2017 +0300 dwrite: Get rid of assignment to self. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 08d3aba..f850c95 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -2002,12 +2002,10 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) } i = min(i, layout->cluster_count - 1); - if (overflow) { - /* Overflown on whitespace, ignore it */ - if (layout->clustermetrics[i].isWhitespace && layout_can_wrap_after(layout, i)) - i = i; + /* Ignore if overflown on whitespace */ + if (overflow && !(layout->clustermetrics[i].isWhitespace && layout_can_wrap_after(layout, i))) { /* Use most recently found breaking point */ - else if (last_breaking_point != ~0u) { + if (last_breaking_point != ~0u) { i = last_breaking_point; last_breaking_point = ~0u; }

1 0

Nikolay Sivov : dwrite: Fix rendering mode enum conversion warnings.
by Alexandre Julliard 03 Feb '17

03 Feb '17

Module: wine Branch: master Commit: e35e0f2b022c0f6fafe31dfb8af94dad2f17cada URL: http://source.winehq.org/git/wine.git/?a=commit;h=e35e0f2b022c0f6fafe31dfb8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 3 15:20:28 2017 +0300 dwrite: Fix rendering mode enum conversion warnings. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/main.c | 37 +++++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index a493578..9b5de8a 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -141,16 +141,29 @@ static DWRITE_PIXEL_GEOMETRY WINAPI renderingparams_GetPixelGeometry(IDWriteRend return This->geometry; } +static DWRITE_RENDERING_MODE rendering_mode_from_mode1(DWRITE_RENDERING_MODE1 mode) +{ + static const DWRITE_RENDERING_MODE rendering_modes[] = { + DWRITE_RENDERING_MODE_DEFAULT, /* DWRITE_RENDERING_MODE1_DEFAULT */ + DWRITE_RENDERING_MODE_ALIASED, /* DWRITE_RENDERING_MODE1_ALIASED */ + DWRITE_RENDERING_MODE_GDI_CLASSIC, /* DWRITE_RENDERING_MODE1_GDI_CLASSIC */ + DWRITE_RENDERING_MODE_GDI_NATURAL, /* DWRITE_RENDERING_MODE1_GDI_NATURAL */ + DWRITE_RENDERING_MODE_NATURAL, /* DWRITE_RENDERING_MODE1_NATURAL */ + DWRITE_RENDERING_MODE_NATURAL_SYMMETRIC, /* DWRITE_RENDERING_MODE1_NATURAL_SYMMETRIC */ + DWRITE_RENDERING_MODE_OUTLINE, /* DWRITE_RENDERING_MODE1_OUTLINE */ + DWRITE_RENDERING_MODE_NATURAL_SYMMETRIC, /* DWRITE_RENDERING_MODE1_NATURAL_SYMMETRIC_DOWNSAMPLED */ + }; + + return rendering_modes[mode]; +} + static DWRITE_RENDERING_MODE WINAPI renderingparams_GetRenderingMode(IDWriteRenderingParams3 *iface) { struct renderingparams *This = impl_from_IDWriteRenderingParams3(iface); TRACE("(%p)\n", This); - if (This->mode == DWRITE_RENDERING_MODE1_NATURAL_SYMMETRIC_DOWNSAMPLED) - return DWRITE_RENDERING_MODE_NATURAL_SYMMETRIC; - - return This->mode; + return rendering_mode_from_mode1(This->mode); } static FLOAT WINAPI renderingparams1_GetGrayscaleEnhancedContrast(IDWriteRenderingParams3 *iface) @@ -189,7 +202,7 @@ static const struct IDWriteRenderingParams3Vtbl renderingparamsvtbl = { }; static HRESULT create_renderingparams(FLOAT gamma, FLOAT contrast, FLOAT grayscalecontrast, FLOAT cleartype_level, - DWRITE_PIXEL_GEOMETRY geometry, DWRITE_RENDERING_MODE mode, DWRITE_GRID_FIT_MODE gridfit, IDWriteRenderingParams3 **params) + DWRITE_PIXEL_GEOMETRY geometry, DWRITE_RENDERING_MODE1 mode, DWRITE_GRID_FIT_MODE gridfit, IDWriteRenderingParams3 **params) { struct renderingparams *This; @@ -966,8 +979,8 @@ static HRESULT WINAPI dwritefactory_CreateMonitorRenderingParams(IDWriteFactory4 if (!fixme_once++) FIXME("(%p): monitor setting ignored\n", monitor); - hr = IDWriteFactory4_CreateCustomRenderingParams(iface, 0.0f, 0.0f, 1.0f, 0.0f, DWRITE_PIXEL_GEOMETRY_FLAT, DWRITE_RENDERING_MODE_DEFAULT, - DWRITE_GRID_FIT_MODE_DEFAULT, &params3); + hr = IDWriteFactory4_CreateCustomRenderingParams(iface, 0.0f, 0.0f, 1.0f, 0.0f, DWRITE_PIXEL_GEOMETRY_FLAT, + DWRITE_RENDERING_MODE1_DEFAULT, DWRITE_GRID_FIT_MODE_DEFAULT, &params3); *params = (IDWriteRenderingParams*)params3; return hr; } @@ -982,7 +995,7 @@ static HRESULT WINAPI dwritefactory_CreateCustomRenderingParams(IDWriteFactory4 TRACE("(%p)->(%f %f %f %d %d %p)\n", This, gamma, enhancedContrast, cleartype_level, geometry, mode, params); hr = IDWriteFactory4_CreateCustomRenderingParams(iface, gamma, enhancedContrast, 1.0f, cleartype_level, geometry, - mode, DWRITE_GRID_FIT_MODE_DEFAULT, &params3); + (DWRITE_RENDERING_MODE1)mode, DWRITE_GRID_FIT_MODE_DEFAULT, &params3); *params = (IDWriteRenderingParams*)params3; return hr; } @@ -1162,7 +1175,7 @@ static HRESULT WINAPI dwritefactory_CreateGlyphRunAnalysis(IDWriteFactory4 *ifac desc.run = run; desc.ppdip = ppdip; desc.transform = transform; - desc.rendering_mode = rendering_mode; + desc.rendering_mode = (DWRITE_RENDERING_MODE1)rendering_mode; desc.measuring_mode = measuring_mode; desc.gridfit_mode = DWRITE_GRID_FIT_MODE_DEFAULT; desc.aa_mode = DWRITE_TEXT_ANTIALIAS_MODE_CLEARTYPE; @@ -1204,7 +1217,7 @@ static HRESULT WINAPI dwritefactory1_CreateCustomRenderingParams(IDWriteFactory4 TRACE("(%p)->(%.2f %.2f %.2f %.2f %d %d %p)\n", This, gamma, enhcontrast, enhcontrast_grayscale, cleartype_level, geometry, mode, params); hr = IDWriteFactory4_CreateCustomRenderingParams(iface, gamma, enhcontrast, enhcontrast_grayscale, - cleartype_level, geometry, mode, DWRITE_GRID_FIT_MODE_DEFAULT, &params3); + cleartype_level, geometry, (DWRITE_RENDERING_MODE1)mode, DWRITE_GRID_FIT_MODE_DEFAULT, &params3); *params = (IDWriteRenderingParams1*)params3; return hr; } @@ -1257,7 +1270,7 @@ static HRESULT WINAPI dwritefactory2_CreateCustomRenderingParams(IDWriteFactory4 geometry, mode, gridfit, params); hr = IDWriteFactory4_CreateCustomRenderingParams(iface, gamma, contrast, grayscalecontrast, - cleartype_level, geometry, mode, DWRITE_GRID_FIT_MODE_DEFAULT, &params3); + cleartype_level, geometry, (DWRITE_RENDERING_MODE1)mode, DWRITE_GRID_FIT_MODE_DEFAULT, &params3); *params = (IDWriteRenderingParams2*)params3; return hr; } @@ -1276,7 +1289,7 @@ static HRESULT WINAPI dwritefactory2_CreateGlyphRunAnalysis(IDWriteFactory4 *ifa desc.run = run; desc.ppdip = 1.0f; desc.transform = transform; - desc.rendering_mode = rendering_mode; + desc.rendering_mode = (DWRITE_RENDERING_MODE1)rendering_mode; desc.measuring_mode = measuring_mode; desc.gridfit_mode = gridfit_mode; desc.aa_mode = aa_mode;

1 0

André Hentschel : winex11: Remove dead code (clang).
by Alexandre Julliard 03 Feb '17

03 Feb '17

Module: wine Branch: master Commit: b1257da6585b33063a55cb0ca159d6a5c2b2418c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1257da6585b33063a55cb0ca… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Feb 2 21:48:32 2017 +0100 winex11: Remove dead code (clang). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xim.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index e51169d..f6af293 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -334,7 +334,7 @@ static void X11DRV_DestroyIM(XIM xim, XPointer p, XPointer data) static BOOL open_xim( Display *display ) { struct x11drv_thread_data *thread_data = x11drv_thread_data(); - XIMStyle ximStyleCallback, ximStyleNone; + XIMStyle ximStyleNone; XIMStyles *ximStyles = NULL; INT i; XIM xim; @@ -371,7 +371,6 @@ static BOOL open_xim( Display *display ) ximStyleRoot = 0; ximStyleNone = 0; - ximStyleCallback = 0; for (i = 0; i < ximStyles->count_styles; ++i) { @@ -394,12 +393,6 @@ static BOOL open_xim( Display *display ) ximStyleRoot = STYLE_ROOT; TRACE("Setting Style: ximStyleRoot = STYLE_ROOT\n"); } - else if (!ximStyleCallback &&(ximStyles->supported_styles[i] == - STYLE_CALLBACK)) - { - ximStyleCallback = STYLE_CALLBACK; - TRACE("Setting Style: ximStyleCallback = STYLE_CALLBACK\n"); - } else if (!ximStyleNone && (ximStyles->supported_styles[i] == STYLE_NONE)) { @@ -414,13 +407,6 @@ static BOOL open_xim( Display *display ) if (ximStyle == 0) ximStyle = ximStyleNone; - - if (ximStyleCallback == 0) - { - TRACE("No callback style available\n"); - ximStyleCallback = ximStyle; - } - } thread_data->xim = xim;

1 0

Henri Verbeet : d2d1: Avoid degenerate line segments.
by Alexandre Julliard 03 Feb '17

03 Feb '17

Module: wine Branch: master Commit: ac3824fe6369bc6ef8e8a024238b1fea3482260c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac3824fe6369bc6ef8e8a0242… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 3 13:37:08 2017 +0100 d2d1: Avoid degenerate line segments. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 35b1aef..c1ec461 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -498,6 +498,12 @@ static BOOL d2d_figure_insert_vertex(struct d2d_figure *figure, size_t idx, D2D1 static BOOL d2d_figure_add_vertex(struct d2d_figure *figure, D2D1_POINT_2F vertex) { + size_t last = figure->vertex_count - 1; + + if (figure->vertex_count && figure->vertex_types[last] == D2D_VERTEX_TYPE_LINE + && !memcmp(&figure->vertices[last], &vertex, sizeof(vertex))) + return TRUE; + if (!d2d_array_reserve((void **)&figure->vertices, &figure->vertices_size, figure->vertex_count + 1, sizeof(*figure->vertices))) { @@ -1181,7 +1187,7 @@ static BOOL d2d_path_geometry_point_inside(const struct d2d_geometry *geometry, const D2D1_POINT_2F *p0, *p1; D2D1_POINT_2F v_p, v_probe; unsigned int score; - size_t i, j; + size_t i, j, last; for (i = 0, score = 0; i < geometry->u.path.figure_count; ++i) { @@ -1191,8 +1197,14 @@ static BOOL d2d_path_geometry_point_inside(const struct d2d_geometry *geometry, || probe->y < figure->bounds.top || probe->y > figure->bounds.bottom) continue; - p0 = &figure->vertices[figure->vertex_count - 1]; - for (j = 0; j < figure->vertex_count; ++j) + last = figure->vertex_count - 1; + if (!triangles_only) + { + while (last && figure->vertex_types[last] == D2D_VERTEX_TYPE_NONE) + --last; + } + p0 = &figure->vertices[last]; + for (j = 0; j <= last; ++j) { if (!triangles_only && figure->vertex_types[j] == D2D_VERTEX_TYPE_NONE) continue; @@ -1431,6 +1443,10 @@ static BOOL d2d_cdt_insert_segments(struct d2d_cdt *cdt, struct d2d_geometry *ge { figure = &geometry->u.path.figures[i]; + /* Degenerate figure. */ + if (figure->vertex_count < 2) + continue; + p = bsearch(&figure->vertices[figure->vertex_count - 1], cdt->vertices, geometry->fill.vertex_count, sizeof(*p), d2d_cdt_compare_vertices); start_vertex = p - cdt->vertices; @@ -1880,8 +1896,9 @@ static void STDMETHODCALLTYPE d2d_geometry_sink_EndFigure(ID2D1GeometrySink *ifa figure = &geometry->u.path.figures[geometry->u.path.figure_count - 1]; figure->vertex_types[figure->vertex_count - 1] = D2D_VERTEX_TYPE_LINE; - if (figure_end != D2D1_FIGURE_END_CLOSED) - FIXME("Ignoring figure_end %#x.\n", figure_end); + if (figure_end == D2D1_FIGURE_END_CLOSED && !memcmp(&figure->vertices[0], + &figure->vertices[figure->vertex_count - 1], sizeof(*figure->vertices))) + --figure->vertex_count; geometry->u.path.state = D2D_GEOMETRY_STATE_OPEN; }

1 0

Ken Thomases : winemac: Ignore clipboard updates provoked by our own call to GetClipboardData().
by Alexandre Julliard 03 Feb '17

03 Feb '17

Module: wine Branch: master Commit: c95d2de3dd41d1da6fb96191dfb74b7a412ba362 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c95d2de3dd41d1da6fb96191d… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Feb 2 14:51:45 2017 -0600 winemac: Ignore clipboard updates provoked by our own call to GetClipboardData(). During a call to GetClipboardData(), the app may be asked to render the data for a promised format. This will cause us to receive WM_CLIPBOARDUPDATE. Almost always, the app will have just rendered the requested format and not made any other changes. Therefore, we don't need to rebuild the Mac pasteboard from the Win32 clipboard. Doing so can cause a race with the other Mac app which is querying the pasteboard (for a paste operation, for example). We basically delete the data we _just_ added and rebuild the list of available types. The symptom is that the other Mac app sees the available types change and maybe be incomplete. In theory, the Windows app could make other changes to the clipboard and this change would cause us to fail to convey them to the Mac pasteboard. I consider that very unlikely and the tradeoff to improve the common case is worth it. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/clipboard.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 7115c3b..53f01d5 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -200,6 +200,7 @@ static BOOL is_clipboard_owner; static macdrv_window clipboard_cocoa_window; static UINT rendered_formats; static ULONG64 last_clipboard_update; +static DWORD last_get_seqno; static WINE_CLIPFORMAT **current_mac_formats; static unsigned int nb_current_mac_formats; static WCHAR clipboard_pipe_name[256]; @@ -1819,6 +1820,7 @@ static LRESULT CALLBACK clipboard_wndproc(HWND hwnd, UINT msg, WPARAM wp, LPARAM return TRUE; case WM_CLIPBOARDUPDATE: if (is_clipboard_owner) break; /* ignore our own changes */ + if ((LONG)(GetClipboardSequenceNumber() - last_get_seqno) <= 0) break; set_mac_pasteboard_types_from_win32_clipboard(); break; case WM_RENDERFORMAT: @@ -2220,6 +2222,8 @@ BOOL query_pasteboard_data(HWND hwnd, CFStringRef type) } } + last_get_seqno = GetClipboardSequenceNumber(); + CloseClipboard(); return ret;

1 0

Ken Thomases : winemac: Reattach OpenGL contexts to a view after it has been hidden and unhidden.
by Alexandre Julliard 03 Feb '17

03 Feb '17

Module: wine Branch: master Commit: 2128125cbfe2893e65b1093b583b15084261f265 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2128125cbfe2893e65b1093b5… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Feb 2 15:16:27 2017 -0600 winemac: Reattach OpenGL contexts to a view after it has been hidden and unhidden. Hiding a view seems to semi-detach any attached OpenGL contexts such that rendering no longer works. There's no GL surface for the view. Calling -[NSOpenGLContext update] is not sufficient to reattach the context. So, fully detach the contexts and reattach them. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_opengl.h | 2 ++ dlls/winemac.drv/cocoa_opengl.m | 15 +++++++++++++-- dlls/winemac.drv/cocoa_window.m | 35 ++++++++++++++++++++++++++++------- 3 files changed, 43 insertions(+), 9 deletions(-) diff --git a/dlls/winemac.drv/cocoa_opengl.h b/dlls/winemac.drv/cocoa_opengl.h index e7e1686..bcd257f 100644 --- a/dlls/winemac.drv/cocoa_opengl.h +++ b/dlls/winemac.drv/cocoa_opengl.h @@ -25,12 +25,14 @@ { NSView* latentView; BOOL needsUpdate; + BOOL needsReattach; BOOL shouldClearToBlack; GLint backing_size[2]; } @property BOOL needsUpdate; +(a)property BOOL needsReattach; @property BOOL shouldClearToBlack; @end diff --git a/dlls/winemac.drv/cocoa_opengl.m b/dlls/winemac.drv/cocoa_opengl.m index debeb78..5a097a1 100644 --- a/dlls/winemac.drv/cocoa_opengl.m +++ b/dlls/winemac.drv/cocoa_opengl.m @@ -35,7 +35,7 @@ @implementation WineOpenGLContext -(a)synthesize latentView, needsUpdate, shouldClearToBlack; +(a)synthesize latentView, needsUpdate, needsReattach, shouldClearToBlack; - (void) dealloc { @@ -215,6 +215,7 @@ [self setLatentView:nil]; } needsUpdate = FALSE; + needsReattach = FALSE; } @end @@ -279,6 +280,7 @@ void macdrv_make_context_current(macdrv_opengl_context c, macdrv_view v, CGRect if (context.needsUpdate) { context.needsUpdate = FALSE; + context.needsReattach = FALSE; if (context.view) [context setView:[[context class] dummyView]]; [context wine_updateBackingSize:&r.size]; @@ -328,7 +330,9 @@ void macdrv_update_opengl_context(macdrv_opengl_context c) if (context.needsUpdate) { + BOOL reattach = context.needsReattach; context.needsUpdate = FALSE; + context.needsReattach = FALSE; if (context.latentView) { [context setView:context.latentView]; @@ -339,7 +343,14 @@ void macdrv_update_opengl_context(macdrv_opengl_context c) } else { - [context update]; + if (reattach) + { + NSView* view = [[context.view retain] autorelease]; + [context clearDrawableLeavingSurfaceOnScreen]; + context.view = view; + } + else + [context update]; [context resetSurfaceIfBackingSizeChanged]; } } diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 57587d9..118bf3c 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -500,10 +500,19 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi [(WineWindow*)[self window] updateForGLSubviews]; } - - (void) updateGLContexts + - (void) updateGLContexts:(BOOL)reattach { for (WineOpenGLContext* context in glContexts) + { context.needsUpdate = TRUE; + if (reattach) + context.needsReattach = TRUE; + } + } + + - (void) updateGLContexts + { + [self updateGLContexts:NO]; } - (BOOL) hasGLContext @@ -605,6 +614,23 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi return NO; } + - (void) viewDidHide + { + [super viewDidHide]; + if ([self hasGLContext]) + [self invalidateHasGLDescendant]; + } + + - (void) viewDidUnhide + { + [super viewDidUnhide]; + if ([self hasGLContext]) + { + [self updateGLContexts:YES]; + [self invalidateHasGLDescendant]; + } + } + - (void) completeText:(NSString*)text { macdrv_event* event; @@ -651,12 +677,6 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi [super willRemoveSubview:subview]; } - - (void) setHidden:(BOOL)hidden - { - [super setHidden:hidden]; - [self invalidateHasGLDescendant]; - } - /* * ---------- NSTextInputClient methods ---------- */ @@ -3432,6 +3452,7 @@ void macdrv_set_view_hidden(macdrv_view v, int hidden) OnMainThreadAsync(^{ [view setHidden:hidden]; + [(WineWindow*)view.window updateForGLSubviews]; }); [pool release];

1 0

Sebastian Lackner : ntdll: Mark ZwLoadKey2 export as private.
by Alexandre Julliard 03 Feb '17

03 Feb '17

Module: wine Branch: master Commit: beab000a534ddbb8520cd0ba006505b726cf3dc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=beab000a534ddbb8520cd0ba0… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Feb 3 09:28:05 2017 +0100 ntdll: Mark ZwLoadKey2 export as private. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 4cbc3b0..6e99af9 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1123,7 +1123,7 @@ # @ stub ZwIsSystemResumeAutomatic @ stdcall -private ZwListenPort(ptr ptr) NtListenPort @ stdcall -private ZwLoadDriver(ptr) NtLoadDriver -@ stdcall ZwLoadKey2(ptr ptr long) NtLoadKey2 +@ stdcall -private ZwLoadKey2(ptr ptr long) NtLoadKey2 @ stdcall -private ZwLoadKey(ptr ptr) NtLoadKey @ stdcall -private ZwLockFile(long long ptr ptr ptr ptr ptr ptr long long) NtLockFile # @ stub ZwLockProductActivationKeys

1 0

Michael Müller : msvideo.dll16: Check if any 16 bit thunks have been allocated before accessing pointer.
by Alexandre Julliard 03 Feb '17

03 Feb '17

Module: wine Branch: master Commit: ea7cc6fc553ba25fe8acfc6d5a694c54cdbf9c68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea7cc6fc553ba25fe8acfc6d5… Author: Michael Müller <michael(a)fds-team.de> Date: Fri Feb 3 09:36:45 2017 +0100 msvideo.dll16: Check if any 16 bit thunks have been allocated before accessing pointer. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvideo.dll16/msvideo16.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/msvideo.dll16/msvideo16.c b/dlls/msvideo.dll16/msvideo16.c index 28f126c..d390020 100644 --- a/dlls/msvideo.dll16/msvideo16.c +++ b/dlls/msvideo.dll16/msvideo16.c @@ -771,6 +771,9 @@ static struct msvideo_thunk* MSVIDEO_HasThunk(HIC16 hic) { struct msvideo_thunk* thunk; + if (!MSVIDEO_Thunks) + return NULL; + for (thunk = MSVIDEO_Thunks; thunk < &MSVIDEO_Thunks[MAX_THUNKS]; thunk++) { if (thunk->hIC16 == hic) return thunk;

1 0