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

Alexandre Julliard : comctl32/status: Use DrawFrameControl to draw the size grip.
by Alexandre Julliard May 14, 2016

May 14, 2016

Module: wine Branch: master Commit: 7f8bf3e7bb1d7e3441e17dfc2b83a3b1963d838e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f8bf3e7bb1d7e3441e17dfc2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 14 12:38:18 2016 +0900 comctl32/status: Use DrawFrameControl to draw the size grip. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/status.c | 48 +++++++----------------------------------------- 1 file changed, 7 insertions(+), 41 deletions(-) diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index 4528e24..738c33b 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -143,60 +143,26 @@ STATUSBAR_ComputeHeight(STATUS_INFO *infoPtr) static void STATUSBAR_DrawSizeGrip (HTHEME theme, HDC hdc, LPRECT lpRect) { - HPEN hPenFace, hPenShadow, hPenHighlight, hOldPen; - POINT pt; - INT i; + RECT rc = *lpRect; TRACE("draw size grip %s\n", wine_dbgstr_rect(lpRect)); if (theme) { - RECT gripperRect; SIZE gripperSize; - gripperRect = *lpRect; if (SUCCEEDED (GetThemePartSize (theme, hdc, SP_GRIPPER, 0, lpRect, TS_DRAW, &gripperSize))) { - gripperRect.left = gripperRect.right - gripperSize.cx; - gripperRect.top = gripperRect.bottom - gripperSize.cy; - if (SUCCEEDED (DrawThemeBackground(theme, hdc, SP_GRIPPER, 0, &gripperRect, NULL))) + rc.left = rc.right - gripperSize.cx; + rc.top = rc.bottom - gripperSize.cy; + if (SUCCEEDED (DrawThemeBackground(theme, hdc, SP_GRIPPER, 0, &rc, NULL))) return; } } - pt.x = lpRect->right - 1; - pt.y = lpRect->bottom - 1; - - hPenFace = CreatePen( PS_SOLID, 1, comctl32_color.clr3dFace); - hOldPen = SelectObject( hdc, hPenFace ); - MoveToEx (hdc, pt.x - 12, pt.y, NULL); - LineTo (hdc, pt.x, pt.y); - LineTo (hdc, pt.x, pt.y - 13); - - pt.x--; - pt.y--; - - hPenShadow = CreatePen( PS_SOLID, 1, comctl32_color.clr3dShadow); - SelectObject( hdc, hPenShadow ); - for (i = 1; i < 11; i += 4) { - MoveToEx (hdc, pt.x - i, pt.y, NULL); - LineTo (hdc, pt.x + 1, pt.y - i - 1); - - MoveToEx (hdc, pt.x - i - 1, pt.y, NULL); - LineTo (hdc, pt.x + 1, pt.y - i - 2); - } - - hPenHighlight = CreatePen( PS_SOLID, 1, comctl32_color.clr3dHilight); - SelectObject( hdc, hPenHighlight ); - for (i = 3; i < 13; i += 4) { - MoveToEx (hdc, pt.x - i, pt.y, NULL); - LineTo (hdc, pt.x + 1, pt.y - i - 1); - } - - SelectObject (hdc, hOldPen); - DeleteObject( hPenFace ); - DeleteObject( hPenShadow ); - DeleteObject( hPenHighlight ); + rc.left = max( rc.left, rc.right - GetSystemMetrics(SM_CXVSCROLL) - 1 ); + rc.top = max( rc.top, rc.bottom - GetSystemMetrics(SM_CYHSCROLL) - 1 ); + DrawFrameControl( hdc, &rc, DFC_SCROLL, DFCS_SCROLLSIZEGRIP ); }

1 0

Jacek Caban : wininet: Added open_simple_request helper and use it where appropriate.
by Alexandre Julliard May 14, 2016

May 14, 2016

Module: wine Branch: master Commit: f5c97b5060a6633a5ca71efb5fdd087818ed323e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5c97b5060a6633a5ca71efb5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 13 18:48:36 2016 +0200 wininet: Added open_simple_request helper and use it where appropriate. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/http.c | 341 +++++++++++++++++----------------------------- 1 file changed, 125 insertions(+), 216 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f5c97b5060a6633a5ca71…

1 0

Andrey Gusev : d3d9/tests: Fix a typo in skip() message.
by Alexandre Julliard May 14, 2016

May 14, 2016

Module: wine Branch: master Commit: 0a9f22facc3ebe8b1fb91979893ac95c87e08cd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a9f22facc3ebe8b1fb919798… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon May 9 18:07:56 2016 +0300 d3d9/tests: Fix a typo in skip() message. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index c337c6c..a308311 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -11751,7 +11751,7 @@ static void stream_test(void) hr = IDirect3DDevice9_CreateVertexShader(device, shader_code, &shader); ok(SUCCEEDED(hr), "IDirect3DDevice9_CreateVertexShader failed hr=%08x\n", hr); if(!shader) { - skip("Failed to create a vetex shader\n"); + skip("Failed to create a vertex shader.\n"); goto out; }

1 0

Jacek Caban : wininet: Fixed http tests on win10.
by Alexandre Julliard May 14, 2016

May 14, 2016

Module: wine Branch: master Commit: f4e68eef37615e6351f8264886c686d9980b9876 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4e68eef37615e6351f826488… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 13 18:46:40 2016 +0200 wininet: Fixed http tests on win10. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/http.c | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 3f65784..b09f20d 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -520,7 +520,7 @@ static void InternetReadFile_test(int flags, const test_data_t *test) length = sizeof(buffer); res = HttpQueryInfoA(hor, HTTP_QUERY_RAW_HEADERS, buffer, &length, 0x0); ok(res, "HttpQueryInfoA(HTTP_QUERY_RAW_HEADERS) failed with error %d\n", GetLastError()); - ok(length == 0, "HTTP_QUERY_RAW_HEADERS: expected length 0, but got %d\n", length); + ok(length == 0 || (length == 1 && !*buffer) /* win10 */, "HTTP_QUERY_RAW_HEADERS: expected length 0, but got %d\n", length); ok(!strcmp(buffer, ""), "HTTP_QUERY_RAW_HEADERS: expected string \"\", but got \"%s\"\n", buffer); CHECK_NOTIFIED(INTERNET_STATUS_HANDLE_CREATED); @@ -1759,8 +1759,8 @@ static void HttpHeaders_test(void) memset(buffer, 'x', sizeof(buffer)); ok(HttpQueryInfoA(hRequest,HTTP_QUERY_RAW_HEADERS_CRLF, buffer,&len,&index) == TRUE,"Query failed\n"); - ok(len == 2, "Expected 2, got %d\n", len); - ok(strcmp(buffer, "\r\n") == 0, "Expected CRLF, got '%s'\n", buffer); + ok(len == 2 || len == 4 /* win10 */, "Expected 2 or 4, got %d\n", len); + ok(memcmp(buffer, "\r\n\r\n", len) == 0, "Expected CRLF, got '%s'\n", buffer); ok(index == 0, "Index was incremented\n"); ok(HttpAddRequestHeadersA(hRequest,"Warning:test2",-1,HTTP_ADDREQ_FLAG_ADD), @@ -1962,8 +1962,7 @@ static const char contmsg[] = static const char expandcontmsg[] = "HTTP/1.1 100 Continue\r\n" "Server: winecontinue\r\n" -"Tag: something witty\r\n" -"\r\n"; +"Tag: something witty\r\n"; static const char okmsg[] = "HTTP/1.1 200 OK\r\n" @@ -2390,6 +2389,8 @@ static void test_basic_request(int port, const char *verb, const char *url) DWORD r, count, error; char buffer[0x100]; + trace("basic request %s %s\n", verb, url); + hi = InternetOpenA(NULL, INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); ok(hi != NULL, "open failed\n"); @@ -2403,7 +2404,7 @@ static void test_basic_request(int port, const char *verb, const char *url) r = HttpSendRequestA(hr, NULL, 0, NULL, 0); error = GetLastError(); ok(error == ERROR_SUCCESS || broken(error != ERROR_SUCCESS), "expected ERROR_SUCCESS, got %u\n", error); - ok(r, "HttpSendRequest failed\n"); + ok(r, "HttpSendRequest failed: %u\n", GetLastError()); count = 0; memset(buffer, 0, sizeof buffer); @@ -3073,14 +3074,24 @@ static void test_header_override(int port) ok(req != NULL, "HttpOpenRequest failed\n"); ret = HttpAddRequestHeadersA(req, host_header_override, ~0u, HTTP_ADDREQ_FLAG_REPLACE); - err = GetLastError(); - todo_wine ok(!ret, "HttpAddRequestHeaders succeeded\n"); - todo_wine ok(err == ERROR_HTTP_HEADER_NOT_FOUND, "Expected error ERROR_HTTP_HEADER_NOT_FOUND, got %d\n", err); + if(ret) { /* win10 returns success */ + trace("replacing host header is supported.\n"); - ret = HttpSendRequestA(req, NULL, 0, NULL, 0); - ok(ret, "HttpSendRequest failed\n"); + ret = HttpSendRequestA(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed\n"); - test_status_code_todo(req, 400); + test_status_code(req, 200); + }else { + trace("replacing host header is not supported.\n"); + + err = GetLastError(); + ok(err == ERROR_HTTP_HEADER_NOT_FOUND, "Expected error ERROR_HTTP_HEADER_NOT_FOUND, got %d\n", err); + + ret = HttpSendRequestA(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed\n"); + + test_status_code(req, 400); + } InternetCloseHandle(req); InternetCloseHandle(con);

1 0

Ken Thomases : winemac: Change macdrv_create_view() to not add the new view to a window's content view.
by Alexandre Julliard May 14, 2016

May 14, 2016

Module: wine Branch: master Commit: eef99122f7b6e9e7aa488c045269ab377ff9cfe1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eef99122f7b6e9e7aa488c045… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu May 12 18:50:43 2016 -0500 winemac: Change macdrv_create_view() to not add the new view to a window's content view. Callers can use macdrv_set_view_superview() to do that separately. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.m | 7 ++----- dlls/winemac.drv/macdrv_cocoa.h | 2 +- dlls/winemac.drv/opengl.c | 3 ++- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 29c6de9..d97eb1d 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -3212,14 +3212,13 @@ void macdrv_set_window_min_max_sizes(macdrv_window w, CGSize min_size, CGSize ma /*********************************************************************** * macdrv_create_view * - * Creates and returns a view in the specified rect of the window. The + * Creates and returns a view with the specified frame rect. The * caller is responsible for calling macdrv_dispose_view() on the view * when it is done with it. */ -macdrv_view macdrv_create_view(macdrv_window w, CGRect rect) +macdrv_view macdrv_create_view(CGRect rect) { NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; - WineWindow* window = (WineWindow*)w; __block WineContentView* view; if (CGRectIsNull(rect)) rect = CGRectZero; @@ -3238,8 +3237,6 @@ macdrv_view macdrv_create_view(macdrv_window w, CGRect rect) selector:@selector(updateGLContexts) name:NSApplicationDidChangeScreenParametersNotification object:NSApp]; - [[window contentView] addSubview:view]; - [window updateForGLSubviews]; }); [pool release]; diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index d422985..b3e9106 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -511,7 +511,7 @@ extern void macdrv_clear_window_color_key(macdrv_window w) DECLSPEC_HIDDEN; extern void macdrv_window_use_per_pixel_alpha(macdrv_window w, int use_per_pixel_alpha) DECLSPEC_HIDDEN; extern void macdrv_give_cocoa_window_focus(macdrv_window w, int activate) DECLSPEC_HIDDEN; extern void macdrv_set_window_min_max_sizes(macdrv_window w, CGSize min_size, CGSize max_size) DECLSPEC_HIDDEN; -extern macdrv_view macdrv_create_view(macdrv_window w, CGRect rect) DECLSPEC_HIDDEN; +extern macdrv_view macdrv_create_view(CGRect rect) DECLSPEC_HIDDEN; extern void macdrv_dispose_view(macdrv_view v) DECLSPEC_HIDDEN; extern void macdrv_set_view_frame(macdrv_view v, CGRect rect) DECLSPEC_HIDDEN; extern void macdrv_set_view_superview(macdrv_view v, macdrv_view s, macdrv_window w, macdrv_view p, macdrv_view n) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index ed96c7d..0e067d4 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -1600,13 +1600,14 @@ static BOOL set_win_format(struct macdrv_win_data *data, int format) return FALSE; } - data->gl_view = macdrv_create_view(cocoa_window, cgrect_from_rect(data->gl_rect)); + data->gl_view = macdrv_create_view(cgrect_from_rect(data->gl_rect)); if (!data->gl_view) { WARN("failed to create GL view for window %p rect %s\n", cocoa_window, wine_dbgstr_rect(&data->gl_rect)); return FALSE; } macdrv_set_view_hidden(data->gl_view, FALSE); + macdrv_set_view_superview(data->gl_view, NULL, cocoa_window, NULL, NULL); TRACE("created GL view %p in window %p at %s\n", data->gl_view, cocoa_window, wine_dbgstr_rect(&data->gl_rect));

1 0

Ken Thomases : winemac: Create views hidden initially and add macdrv_set_view_hidden() to change that.
by Alexandre Julliard May 14, 2016

May 14, 2016

Module: wine Branch: master Commit: ca49b8070cb0bdc2dc95ad751085b8d4be1e0f44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca49b8070cb0bdc2dc95ad751… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu May 12 18:50:42 2016 -0500 winemac: Create views hidden initially and add macdrv_set_view_hidden() to change that. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.m | 24 ++++++++++++++++++++++++ dlls/winemac.drv/macdrv_cocoa.h | 1 + dlls/winemac.drv/opengl.c | 1 + 3 files changed, 26 insertions(+) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index d0b92f1..29c6de9 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -506,6 +506,8 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi - (BOOL) _hasGLDescendant { + if ([self isHidden]) + return NO; if ([self hasGLContext]) return YES; for (WineContentView* view in [self subviews]) @@ -624,6 +626,12 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi [super willRemoveSubview:subview]; } + - (void) setHidden:(BOOL)hidden + { + [super setHidden:hidden]; + [self invalidateHasGLDescendant]; + } + /* * ---------- NSTextInputClient methods ---------- */ @@ -3221,6 +3229,7 @@ macdrv_view macdrv_create_view(macdrv_window w, CGRect rect) view = [[WineContentView alloc] initWithFrame:NSRectFromCGRect(cgrect_mac_from_win(rect))]; [view setAutoresizesSubviews:NO]; + [view setHidden:YES]; [nc addObserver:view selector:@selector(updateGLContexts) name:NSViewGlobalFrameDidChangeNotification @@ -3355,6 +3364,21 @@ void macdrv_set_view_superview(macdrv_view v, macdrv_view s, macdrv_window w, ma } /*********************************************************************** + * macdrv_set_view_hidden + */ +void macdrv_set_view_hidden(macdrv_view v, int hidden) +{ + NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; + WineContentView* view = (WineContentView*)v; + + OnMainThread(^{ + [view setHidden:hidden]; + }); + + [pool release]; +} + +/*********************************************************************** * macdrv_add_view_opengl_context * * Add an OpenGL context to the list being tracked for each view. diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 331fca7..d422985 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -515,6 +515,7 @@ extern macdrv_view macdrv_create_view(macdrv_window w, CGRect rect) DECLSPEC_HID extern void macdrv_dispose_view(macdrv_view v) DECLSPEC_HIDDEN; extern void macdrv_set_view_frame(macdrv_view v, CGRect rect) DECLSPEC_HIDDEN; extern void macdrv_set_view_superview(macdrv_view v, macdrv_view s, macdrv_window w, macdrv_view p, macdrv_view n) DECLSPEC_HIDDEN; +extern void macdrv_set_view_hidden(macdrv_view v, int hidden) DECLSPEC_HIDDEN; extern void macdrv_add_view_opengl_context(macdrv_view v, macdrv_opengl_context c) DECLSPEC_HIDDEN; extern void macdrv_remove_view_opengl_context(macdrv_view v, macdrv_opengl_context c) DECLSPEC_HIDDEN; extern int macdrv_get_view_backing_size(macdrv_view v, int backing_size[2]) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index f6a656f..ed96c7d 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -1606,6 +1606,7 @@ static BOOL set_win_format(struct macdrv_win_data *data, int format) WARN("failed to create GL view for window %p rect %s\n", cocoa_window, wine_dbgstr_rect(&data->gl_rect)); return FALSE; } + macdrv_set_view_hidden(data->gl_view, FALSE); TRACE("created GL view %p in window %p at %s\n", data->gl_view, cocoa_window, wine_dbgstr_rect(&data->gl_rect));

1 0

Ken Thomases : winemac: Change macdrv_set_view_window_and_frame() to macdrv_set_view_frame().
by Alexandre Julliard May 14, 2016

May 14, 2016

Module: wine Branch: master Commit: 587bdb8db7ea40dfcb441a602b0aac1ab1c61a4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=587bdb8db7ea40dfcb441a602… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu May 12 18:50:41 2016 -0500 winemac: Change macdrv_set_view_window_and_frame() to macdrv_set_view_frame(). Remove the no-longer-used functionality of potentially moving the view from one window to another. That has been taken over by macdrv_set_view_superview(). Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.m | 28 ++++------------------------ dlls/winemac.drv/macdrv_cocoa.h | 2 +- dlls/winemac.drv/opengl.c | 4 ++-- 3 files changed, 7 insertions(+), 27 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 7aba872..d0b92f1 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -3266,39 +3266,22 @@ void macdrv_dispose_view(macdrv_view v) } /*********************************************************************** - * macdrv_set_view_window_and_frame - * - * Move a view to a new window and/or position within its window. If w - * is NULL, leave the view in its current window and just change its - * frame. + * macdrv_set_view_frame */ -void macdrv_set_view_window_and_frame(macdrv_view v, macdrv_window w, CGRect rect) +void macdrv_set_view_frame(macdrv_view v, CGRect rect) { NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; WineContentView* view = (WineContentView*)v; - WineWindow* window = (WineWindow*)w; if (CGRectIsNull(rect)) rect = CGRectZero; OnMainThread(^{ - BOOL changedWindow = (window && window != [view window]); NSRect newFrame = NSRectFromCGRect(cgrect_mac_from_win(rect)); NSRect oldFrame = [view frame]; - BOOL needUpdateWindowForGLSubviews = FALSE; - - if (changedWindow) - { - WineWindow* oldWindow = (WineWindow*)[view window]; - [view removeFromSuperview]; - [oldWindow updateForGLSubviews]; - [[window contentView] addSubview:view]; - needUpdateWindowForGLSubviews = TRUE; - } if (!NSEqualRects(oldFrame, newFrame)) { - if (!changedWindow) - [[view superview] setNeedsDisplayInRect:oldFrame]; + [[view superview] setNeedsDisplayInRect:oldFrame]; if (NSEqualPoints(oldFrame.origin, newFrame.origin)) [view setFrameSize:newFrame.size]; else if (NSEqualSizes(oldFrame.size, newFrame.size)) @@ -3306,17 +3289,14 @@ void macdrv_set_view_window_and_frame(macdrv_view v, macdrv_window w, CGRect rec else [view setFrame:newFrame]; [view setNeedsDisplay:YES]; - needUpdateWindowForGLSubviews = TRUE; if (retina_enabled) { int backing_size[2] = { 0 }; [view wine_setBackingSize:backing_size]; } - } - - if (needUpdateWindowForGLSubviews) [(WineWindow*)[view window] updateForGLSubviews]; + } }); [pool release]; diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 6e70d6d..331fca7 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -513,7 +513,7 @@ extern void macdrv_give_cocoa_window_focus(macdrv_window w, int activate) DECLSP extern void macdrv_set_window_min_max_sizes(macdrv_window w, CGSize min_size, CGSize max_size) DECLSPEC_HIDDEN; extern macdrv_view macdrv_create_view(macdrv_window w, CGRect rect) DECLSPEC_HIDDEN; extern void macdrv_dispose_view(macdrv_view v) DECLSPEC_HIDDEN; -extern void macdrv_set_view_window_and_frame(macdrv_view v, macdrv_window w, CGRect rect) DECLSPEC_HIDDEN; +extern void macdrv_set_view_frame(macdrv_view v, CGRect rect) DECLSPEC_HIDDEN; extern void macdrv_set_view_superview(macdrv_view v, macdrv_view s, macdrv_window w, macdrv_view p, macdrv_view n) DECLSPEC_HIDDEN; extern void macdrv_add_view_opengl_context(macdrv_view v, macdrv_opengl_context c) DECLSPEC_HIDDEN; extern void macdrv_remove_view_opengl_context(macdrv_view v, macdrv_opengl_context c) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index 0039f0a..f6a656f 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -1736,7 +1736,7 @@ void set_gl_view_parent(HWND hwnd, HWND parent) } macdrv_set_view_superview(data->gl_view, NULL, cocoa_window, NULL, NULL); - macdrv_set_view_window_and_frame(data->gl_view, NULL, cgrect_from_rect(data->gl_rect)); + macdrv_set_view_frame(data->gl_view, cgrect_from_rect(data->gl_rect)); mark_contexts_for_moved_view(data->gl_view); } @@ -4430,7 +4430,7 @@ void sync_gl_view(struct macdrv_win_data *data) if (get_gl_view_window_rect(data, NULL, &rect) && memcmp(&data->gl_rect, &rect, sizeof(rect))) { TRACE("Setting GL view %p frame to %s\n", data->gl_view, wine_dbgstr_rect(&rect)); - macdrv_set_view_window_and_frame(data->gl_view, NULL, cgrect_from_rect(rect)); + macdrv_set_view_frame(data->gl_view, cgrect_from_rect(rect)); data->gl_rect = rect; mark_contexts_for_moved_view(data->gl_view); }

1 0

Ken Thomases : winemac: Add function macdrv_set_view_superview().
by Alexandre Julliard May 14, 2016

May 14, 2016

Module: wine Branch: master Commit: 8223756ba4f41f4c662a36af71c984e4415a6332 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8223756ba4f41f4c662a36af7… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu May 12 18:50:40 2016 -0500 winemac: Add function macdrv_set_view_superview(). This allows for nesting views in a hierarchy rather than only ever adding them as direct subviews of the window content view. This functionality will be used in subsequent commits. This takes over some of the functionality of macdrv_set_view_window_and_frame(), which will be removed in a subsequent commit. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.m | 52 +++++++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/macdrv_cocoa.h | 1 + dlls/winemac.drv/opengl.c | 3 ++- 3 files changed, 55 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index ec5eb2b..7aba872 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -3323,6 +3323,58 @@ void macdrv_set_view_window_and_frame(macdrv_view v, macdrv_window w, CGRect rec } /*********************************************************************** + * macdrv_set_view_superview + * + * Move a view to a new superview and position it relative to its + * siblings. If p is non-NULL, the view is ordered behind it. + * Otherwise, the view is ordered above n. If s is NULL, use the + * content view of w as the new superview. + */ +void macdrv_set_view_superview(macdrv_view v, macdrv_view s, macdrv_window w, macdrv_view p, macdrv_view n) +{ + NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; + WineContentView* view = (WineContentView*)v; + WineContentView* superview = (WineContentView*)s; + WineWindow* window = (WineWindow*)w; + WineContentView* prev = (WineContentView*)p; + WineContentView* next = (WineContentView*)n; + + if (!superview) + superview = [window contentView]; + + OnMainThread(^{ + if (superview == [view superview]) + { + NSArray* subviews = [superview subviews]; + NSUInteger index = [subviews indexOfObjectIdenticalTo:view]; + if (!prev && !next && index == 0) + return; + if (prev && index > 0 && [subviews objectAtIndex:index - 1] == prev) + return; + if (!prev && next && index + 1 < [subviews count] && [subviews objectAtIndex:index + 1] == next) + return; + } + + WineWindow* oldWindow = (WineWindow*)[view window]; + WineWindow* newWindow = (WineWindow*)[superview window]; + + [view removeFromSuperview]; + if (prev) + [superview addSubview:view positioned:NSWindowBelow relativeTo:prev]; + else + [superview addSubview:view positioned:NSWindowAbove relativeTo:next]; + + if (oldWindow != newWindow) + { + [oldWindow updateForGLSubviews]; + [newWindow updateForGLSubviews]; + } + }); + + [pool release]; +} + +/*********************************************************************** * macdrv_add_view_opengl_context * * Add an OpenGL context to the list being tracked for each view. diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 2c06bea..6e70d6d 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -514,6 +514,7 @@ extern void macdrv_set_window_min_max_sizes(macdrv_window w, CGSize min_size, CG extern macdrv_view macdrv_create_view(macdrv_window w, CGRect rect) DECLSPEC_HIDDEN; extern void macdrv_dispose_view(macdrv_view v) DECLSPEC_HIDDEN; extern void macdrv_set_view_window_and_frame(macdrv_view v, macdrv_window w, CGRect rect) DECLSPEC_HIDDEN; +extern void macdrv_set_view_superview(macdrv_view v, macdrv_view s, macdrv_window w, macdrv_view p, macdrv_view n) DECLSPEC_HIDDEN; extern void macdrv_add_view_opengl_context(macdrv_view v, macdrv_opengl_context c) DECLSPEC_HIDDEN; extern void macdrv_remove_view_opengl_context(macdrv_view v, macdrv_opengl_context c) DECLSPEC_HIDDEN; extern int macdrv_get_view_backing_size(macdrv_view v, int backing_size[2]) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index fbdc645..0039f0a 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -1735,7 +1735,8 @@ void set_gl_view_parent(HWND hwnd, HWND parent) return; } - macdrv_set_view_window_and_frame(data->gl_view, cocoa_window, cgrect_from_rect(data->gl_rect)); + macdrv_set_view_superview(data->gl_view, NULL, cocoa_window, NULL, NULL); + macdrv_set_view_window_and_frame(data->gl_view, NULL, cgrect_from_rect(data->gl_rect)); mark_contexts_for_moved_view(data->gl_view); }

1 0

Ken Thomases : winemac: Remove the assumption that OpenGL views are always immediate subviews of the window content view.
by Alexandre Julliard May 14, 2016

May 14, 2016

Module: wine Branch: master Commit: 742734b44f6d622053dca8f241c61f28ab7892c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=742734b44f6d622053dca8f24… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu May 12 18:50:39 2016 -0500 winemac: Remove the assumption that OpenGL views are always immediate subviews of the window content view. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.m | 81 +++++++++++++++++++++++++++++++++++------ 1 file changed, 70 insertions(+), 11 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index aee9981..ec5eb2b 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -290,6 +290,8 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi { NSMutableArray* glContexts; NSMutableArray* pendingGlContexts; + BOOL _cachedHasGLDescendant; + BOOL _cachedHasGLDescendantValid; BOOL clearedGlSurface; NSMutableAttributedString* markedText; @@ -454,6 +456,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi - (void) addGLContext:(WineOpenGLContext*)context { + BOOL hadContext = [self hasGLContext]; if (!glContexts) glContexts = [[NSMutableArray alloc] init]; if (!pendingGlContexts) @@ -475,13 +478,18 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi [self setNeedsDisplay:YES]; } + if (!hadContext) + [self invalidateHasGLDescendant]; [(WineWindow*)[self window] updateForGLSubviews]; } - (void) removeGLContext:(WineOpenGLContext*)context { + BOOL hadContext = [self hasGLContext]; [glContexts removeObjectIdenticalTo:context]; [pendingGlContexts removeObjectIdenticalTo:context]; + if (hadContext && ![self hasGLContext]) + [self invalidateHasGLDescendant]; [(WineWindow*)[self window] updateForGLSubviews]; } @@ -496,6 +504,40 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi return [glContexts count] || [pendingGlContexts count]; } + - (BOOL) _hasGLDescendant + { + if ([self hasGLContext]) + return YES; + for (WineContentView* view in [self subviews]) + { + if ([view hasGLDescendant]) + return YES; + } + return NO; + } + + - (BOOL) hasGLDescendant + { + if (!_cachedHasGLDescendantValid) + { + _cachedHasGLDescendant = [self _hasGLDescendant]; + _cachedHasGLDescendantValid = YES; + } + return _cachedHasGLDescendant; + } + + - (void) invalidateHasGLDescendant + { + BOOL invalidateAncestors = _cachedHasGLDescendantValid; + _cachedHasGLDescendantValid = NO; + if (invalidateAncestors && self != [[self window] contentView]) + { + WineContentView* superview = (WineContentView*)[self superview]; + if ([superview isKindOfClass:[WineContentView class]]) + [superview invalidateHasGLDescendant]; + } + } + - (void) wine_getBackingSize:(int*)outBackingSize { @synchronized(self) { @@ -560,6 +602,28 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi return NSFocusRingTypeNone; } + - (void) didAddSubview:(NSView*)subview + { + if ([subview isKindOfClass:[WineContentView class]]) + { + WineContentView* view = (WineContentView*)subview; + if (!view->_cachedHasGLDescendantValid || view->_cachedHasGLDescendant) + [self invalidateHasGLDescendant]; + } + [super didAddSubview:subview]; + } + + - (void) willRemoveSubview:(NSView*)subview + { + if ([subview isKindOfClass:[WineContentView class]]) + { + WineContentView* view = (WineContentView*)subview; + if (!view->_cachedHasGLDescendantValid || view->_cachedHasGLDescendant) + [self invalidateHasGLDescendant]; + } + [super willRemoveSubview:subview]; + } + /* * ---------- NSTextInputClient methods ---------- */ @@ -1606,7 +1670,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi - (BOOL) needsTransparency { return self.shape || self.colorKeyed || self.usePerPixelAlpha || - (gl_surface_mode == GL_SURFACE_BEHIND && [[self.contentView valueForKeyPath:@"subviews.(a)max.hasGLContext"] boolValue]); + (gl_surface_mode == GL_SURFACE_BEHIND && [(WineContentView*)self.contentView hasGLDescendant]); } - (void) checkTransparency @@ -2194,17 +2258,12 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi { NSRect contentRect = [[self contentView] frame]; BOOL coveredByGLView = FALSE; - for (WineContentView* view in [[self contentView] subviews]) + WineContentView* view = (WineContentView*)[[self contentView] hitTest:NSMakePoint(NSMidX(contentRect), NSMidY(contentRect))]; + if ([view isKindOfClass:[WineContentView class]] && [view hasGLContext]) { - if ([view hasGLContext]) - { - NSRect frame = [view convertRect:[view bounds] toView:nil]; - if (NSContainsRect(frame, contentRect)) - { - coveredByGLView = TRUE; - break; - } - } + NSRect frame = [view convertRect:[view bounds] toView:nil]; + if (NSContainsRect(frame, contentRect)) + coveredByGLView = TRUE; } if (coveredByGLView)

1 0

Andrew Eikum : powrprof: Stub PowerSetActiveScheme.
by Alexandre Julliard May 14, 2016

May 14, 2016

Module: wine Branch: master Commit: b51aaa40dc1b51f668c5c9cc806e260e45191f37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b51aaa40dc1b51f668c5c9cc8… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu May 12 14:21:47 2016 -0500 powrprof: Stub PowerSetActiveScheme. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/powrprof/powrprof.c | 6 ++++++ dlls/powrprof/powrprof.spec | 1 + 2 files changed, 7 insertions(+) diff --git a/dlls/powrprof/powrprof.c b/dlls/powrprof/powrprof.c index 7327fdf..a1d1092 100644 --- a/dlls/powrprof/powrprof.c +++ b/dlls/powrprof/powrprof.c @@ -303,6 +303,12 @@ DWORD WINAPI PowerGetActiveScheme(HKEY UserRootPowerKey, GUID **polguid) return ERROR_CALL_NOT_IMPLEMENTED; } +DWORD WINAPI PowerSetActiveScheme(HKEY UserRootPowerKey, GUID *polguid) +{ + FIXME("(%p,%s) stub!\n", UserRootPowerKey, wine_dbgstr_guid(polguid)); + return ERROR_SUCCESS; +} + DWORD WINAPI PowerReadDCValue(HKEY RootPowerKey, const GUID *Scheme, const GUID *SubGroup, const GUID *PowerSettings, PULONG Type, PUCHAR Buffer, DWORD *BufferSize) { FIXME("(%p,%s,%s,%s,%p,%p,%p) stub!\n", RootPowerKey, debugstr_guid(Scheme), debugstr_guid(SubGroup), debugstr_guid(PowerSettings), Type, Buffer, BufferSize); diff --git a/dlls/powrprof/powrprof.spec b/dlls/powrprof/powrprof.spec index cb1d487..f513f04 100644 --- a/dlls/powrprof/powrprof.spec +++ b/dlls/powrprof/powrprof.spec @@ -11,6 +11,7 @@ @ stdcall IsPwrShutdownAllowed () @ stdcall IsPwrSuspendAllowed () @ stdcall PowerGetActiveScheme (ptr ptr) +@ stdcall PowerSetActiveScheme (ptr ptr) @ stdcall PowerReadDCValue (ptr ptr ptr ptr ptr ptr ptr) @ stdcall ReadGlobalPwrPolicy (ptr) @ stdcall ReadProcessorPwrScheme (long ptr)

1 0