July 2018 - Wine-Commits - list.winehq.org

Piotr Caban : msvcp110: Add _Syserror_map implementation.
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: c92b71f6e80bce782139882743fd578a0ef1dfbb URL: https://source.winehq.org/git/wine.git/?a=commit;h=c92b71f6e80bce7821398827… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jul 16 16:33:01 2018 +0200 msvcp110: Add _Syserror_map implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp110/msvcp110.spec | 4 +- dlls/msvcp120/msvcp120.spec | 4 +- dlls/msvcp120_app/msvcp120_app.spec | 4 +- dlls/msvcp140/msvcp140.spec | 4 +- dlls/msvcp90/misc.c | 186 ++++++++++++++++++++++++++++++++++++ 5 files changed, 194 insertions(+), 8 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c92b71f6e80bce782139…

1 0

Zhiyi Zhang : user32/tests: Fix a memory leak.
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: 8318b11d7f0f1a50be447b515aa6d0b11eb18827 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8318b11d7f0f1a50be447b51… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jul 16 15:35:58 2018 +0800 user32/tests: Fix a memory leak. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/dialog.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index 807a85b..e1fe803 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -787,6 +787,7 @@ static void test_IsDialogMessage(void) ok (!IsDialogMessageA(msg.hwnd, &msg), "expected failure\n"); UnhookWindowsHookEx(hook); + DestroyWindow(g_hwndMain); }

1 0

Piotr Caban : include/msvcrt: Add POSIX error codes to errno.h.
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: e68944583307f8773b9323ba1c0da6f13974792d URL: https://source.winehq.org/git/wine.git/?a=commit;h=e68944583307f8773b9323ba… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jul 16 16:32:55 2018 +0200 include/msvcrt: Add POSIX error codes to errno.h. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/errno.h | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/include/msvcrt/errno.h b/include/msvcrt/errno.h index dddc013..ac56c19 100644 --- a/include/msvcrt/errno.h +++ b/include/msvcrt/errno.h @@ -63,6 +63,50 @@ # define STRUNCATE 80 +#ifndef _CRT_NO_POSIX_ERROR_CODES +# define EADDRINUSE 100 +# define EADDRNOTAVAIL 101 +# define EAFNOSUPPORT 102 +# define EALREADY 103 +# define EBADMSG 104 +# define ECANCELED 105 +# define ECONNABORTED 106 +# define ECONNREFUSED 107 +# define ECONNRESET 108 +# define EDESTADDRREQ 109 +# define EHOSTUNREACH 110 +# define EIDRM 111 +# define EINPROGRESS 112 +# define EISCONN 113 +# define ELOOP 114 +# define EMSGSIZE 115 +# define ENETDOWN 116 +# define ENETRESET 117 +# define ENETUNREACH 118 +# define ENOBUFS 119 +# define ENODATA 120 +# define ENOLINK 121 +# define ENOMSG 122 +# define ENOPROTOOPT 123 +# define ENOSR 124 +# define ENOSTR 125 +# define ENOTCONN 126 +# define ENOTRECOVERABLE 127 +# define ENOTSOCK 128 +# define ENOTSUP 129 +# define EOPNOTSUPP 130 +# define EOTHER 131 +# define EOVERFLOW 132 +# define EOWNERDEAD 133 +# define EPROTO 134 +# define EPROTONOSUPPORT 135 +# define EPROTOTYPE 136 +# define ETIME 137 +# define ETIMEDOUT 138 +# define ETXTBSY 139 +# define EWOULDBLOCK 140 +#endif + #ifdef __cplusplus extern "C" { #endif

1 0

Hugh McMaster : regedit: Do not overwrite a hex data type with REG_BINARY when modifying a value.
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: 6b620e6d615df5041918b0037fe7fd988c7b20d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b620e6d615df5041918b003… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jul 16 12:20:50 2018 +0000 regedit: Do not overwrite a hex data type with REG_BINARY when modifying a value. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/edit.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index de96ded..a3cf17b 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -40,6 +40,7 @@ struct edit_params { HKEY hkey; const WCHAR *value_name; + DWORD type; void *data; DWORD size; }; @@ -159,7 +160,7 @@ static INT_PTR CALLBACK bin_modify_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wPara data = heap_xalloc(size); SendDlgItemMessageW(hwndDlg, IDC_VALUE_DATA, HEM_GETDATA, (WPARAM)size, (LPARAM)data); - lRet = RegSetValueExW(params->hkey, params->value_name, 0, REG_BINARY, data, size); + lRet = RegSetValueExW(params->hkey, params->value_name, 0, params->type, data, size); heap_free(data); if (lRet == ERROR_SUCCESS) @@ -351,6 +352,7 @@ BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName) params.hkey = hKey; params.value_name = valueName; + params.type = type; params.data = stringValueData; params.size = len; result = DialogBoxParamW(NULL, MAKEINTRESOURCEW(IDD_EDIT_BINARY), hwnd,

1 0

Alexandre Julliard : user32: Return the full MINMAXINFO data from WINPOS_GetMinMaxInfo().
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: 1373e004009515427dea812b6052974492d157dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=1373e004009515427dea812b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 16 10:32:49 2018 +0200 user32: Return the full MINMAXINFO data from WINPOS_GetMinMaxInfo(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/win.c | 9 +++------ dlls/user32/win.h | 3 +-- dlls/user32/winpos.c | 53 ++++++++++++++++++++++++---------------------------- 3 files changed, 28 insertions(+), 37 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 1398458..3535c1b 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1569,12 +1569,9 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, cy = cs->cy; if ((cs->style & WS_THICKFRAME) || !(cs->style & (WS_POPUP | WS_CHILD))) { - POINT maxSize, maxPos, minTrack, maxTrack; - WINPOS_GetMinMaxInfo( hwnd, &maxSize, &maxPos, &minTrack, &maxTrack); - if (maxTrack.x < cx) cx = maxTrack.x; - if (maxTrack.y < cy) cy = maxTrack.y; - if (minTrack.x > cx) cx = minTrack.x; - if (minTrack.y > cy) cy = minTrack.y; + MINMAXINFO info = WINPOS_GetMinMaxInfo( hwnd ); + cx = max( min( cx, info.ptMaxTrackSize.x ), info.ptMinTrackSize.x ); + cy = max( min( cy, info.ptMaxTrackSize.y ), info.ptMinTrackSize.y ); } if (cx < 0) cx = 0; diff --git a/dlls/user32/win.h b/dlls/user32/win.h index 9794aab..15331c3 100644 --- a/dlls/user32/win.h +++ b/dlls/user32/win.h @@ -121,8 +121,7 @@ static inline void WIN_ReleasePtr( WND *ptr ) extern LRESULT HOOK_CallHooks( INT id, INT code, WPARAM wparam, LPARAM lparam, BOOL unicode ) DECLSPEC_HIDDEN; extern BOOL WINPOS_RedrawIconTitle( HWND hWnd ) DECLSPEC_HIDDEN; -extern void WINPOS_GetMinMaxInfo( HWND hwnd, POINT *maxSize, POINT *maxPos, POINT *minTrack, - POINT *maxTrack ) DECLSPEC_HIDDEN; +extern MINMAXINFO WINPOS_GetMinMaxInfo( HWND hwnd ) DECLSPEC_HIDDEN; extern LONG WINPOS_HandleWindowPosChanging(HWND hwnd, WINDOWPOS *winpos) DECLSPEC_HIDDEN; extern HWND WINPOS_WindowFromPoint( HWND hwndScope, POINT pt, INT *hittest ) DECLSPEC_HIDDEN; extern void WINPOS_ActivateOtherWindow( HWND hwnd ) DECLSPEC_HIDDEN; diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index dc2816a..ed3c105 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -740,8 +740,7 @@ static void WINPOS_ShowIconTitle( HWND hwnd, BOOL bShow ) * * Get the minimized and maximized information for a window. */ -void WINPOS_GetMinMaxInfo( HWND hwnd, POINT *maxSize, POINT *maxPos, - POINT *minTrack, POINT *maxTrack ) +MINMAXINFO WINPOS_GetMinMaxInfo( HWND hwnd ) { MINMAXINFO MinMax; HMONITOR monitor; @@ -837,10 +836,7 @@ void WINPOS_GetMinMaxInfo( HWND hwnd, POINT *maxSize, POINT *maxPos, MinMax.ptMaxTrackSize.y = max( MinMax.ptMaxTrackSize.y, MinMax.ptMinTrackSize.y ); - if (maxSize) *maxSize = MinMax.ptMaxSize; - if (maxPos) *maxPos = MinMax.ptMaxPosition; - if (minTrack) *minTrack = MinMax.ptMinTrackSize; - if (maxTrack) *maxTrack = MinMax.ptMaxTrackSize; + return MinMax; } @@ -943,8 +939,8 @@ static POINT WINPOS_FindIconPos( HWND hwnd, POINT pt ) UINT WINPOS_MinMaximize( HWND hwnd, UINT cmd, LPRECT rect ) { UINT swpFlags = 0; - POINT size; LONG old_style; + MINMAXINFO minmax; WINDOWPLACEMENT wpl; TRACE("%p %u\n", hwnd, cmd ); @@ -1006,7 +1002,7 @@ UINT WINPOS_MinMaximize( HWND hwnd, UINT cmd, LPRECT rect ) old_style = GetWindowLongW( hwnd, GWL_STYLE ); if ((old_style & WS_MAXIMIZE) && (old_style & WS_VISIBLE)) return SWP_NOSIZE | SWP_NOMOVE; - WINPOS_GetMinMaxInfo( hwnd, &size, &wpl.ptMaxPosition, NULL, NULL ); + minmax = WINPOS_GetMinMaxInfo( hwnd ); old_style = WIN_SetStyle( hwnd, WS_MAXIMIZE, WS_MINIMIZE ); if (old_style & WS_MINIMIZE) @@ -1016,8 +1012,8 @@ UINT WINPOS_MinMaximize( HWND hwnd, UINT cmd, LPRECT rect ) } if (!(old_style & WS_MAXIMIZE)) swpFlags |= SWP_STATECHANGED; - SetRect( rect, wpl.ptMaxPosition.x, wpl.ptMaxPosition.y, - wpl.ptMaxPosition.x + size.x, wpl.ptMaxPosition.y + size.y ); + SetRect( rect, minmax.ptMaxPosition.x, minmax.ptMaxPosition.y, + minmax.ptMaxPosition.x + minmax.ptMaxSize.x, minmax.ptMaxPosition.y + minmax.ptMaxSize.y ); break; case SW_SHOWNOACTIVATE: @@ -1033,11 +1029,11 @@ UINT WINPOS_MinMaximize( HWND hwnd, UINT cmd, LPRECT rect ) if (win_get_flags( hwnd ) & WIN_RESTORE_MAX) { /* Restore to maximized position */ - WINPOS_GetMinMaxInfo( hwnd, &size, &wpl.ptMaxPosition, NULL, NULL); + minmax = WINPOS_GetMinMaxInfo( hwnd ); WIN_SetStyle( hwnd, WS_MAXIMIZE, 0 ); swpFlags |= SWP_STATECHANGED; - SetRect( rect, wpl.ptMaxPosition.x, wpl.ptMaxPosition.y, - wpl.ptMaxPosition.x + size.x, wpl.ptMaxPosition.y + size.y ); + SetRect( rect, minmax.ptMaxPosition.x, minmax.ptMaxPosition.y, + minmax.ptMaxPosition.x + minmax.ptMaxSize.x, minmax.ptMaxPosition.y + minmax.ptMaxSize.y ); break; } } @@ -1597,19 +1593,18 @@ void WINPOS_ActivateOtherWindow(HWND hwnd) */ LONG WINPOS_HandleWindowPosChanging( HWND hwnd, WINDOWPOS *winpos ) { - POINT minTrack, maxTrack; LONG style = GetWindowLongW( hwnd, GWL_STYLE ); if (winpos->flags & SWP_NOSIZE) return 0; if ((style & WS_THICKFRAME) || ((style & (WS_POPUP | WS_CHILD)) == 0)) { - WINPOS_GetMinMaxInfo( hwnd, NULL, NULL, &minTrack, &maxTrack ); - if (winpos->cx > maxTrack.x) winpos->cx = maxTrack.x; - if (winpos->cy > maxTrack.y) winpos->cy = maxTrack.y; + MINMAXINFO info = WINPOS_GetMinMaxInfo( hwnd ); + winpos->cx = min( winpos->cx, info.ptMaxTrackSize.x ); + winpos->cy = min( winpos->cy, info.ptMaxTrackSize.y ); if (!(style & WS_MINIMIZE)) { - if (winpos->cx < minTrack.x ) winpos->cx = minTrack.x; - if (winpos->cy < minTrack.y ) winpos->cy = minTrack.y; + winpos->cx = max( winpos->cx, info.ptMinTrackSize.x ); + winpos->cy = max( winpos->cy, info.ptMinTrackSize.y ); } } return 0; @@ -2727,7 +2722,7 @@ void WINPOS_SysCommandSizeMove( HWND hwnd, WPARAM wParam ) LONG hittest = (LONG)(wParam & 0x0f); WPARAM syscommand = wParam & 0xfff0; HCURSOR hDragCursor = 0, hOldCursor = 0; - POINT minTrack, maxTrack; + MINMAXINFO minmax; POINT capturePoint, pt; LONG style = GetWindowLongW( hwnd, GWL_STYLE ); BOOL thickframe = HAS_THICKFRAME( style ); @@ -2770,7 +2765,7 @@ void WINPOS_SysCommandSizeMove( HWND hwnd, WPARAM wParam ) /* Get min/max info */ - WINPOS_GetMinMaxInfo( hwnd, NULL, NULL, &minTrack, &maxTrack ); + minmax = WINPOS_GetMinMaxInfo( hwnd ); WIN_GetRectangles( hwnd, COORDS_PARENT, &sizingRect, NULL ); origRect = sizingRect; if (style & WS_CHILD) @@ -2789,23 +2784,23 @@ void WINPOS_SysCommandSizeMove( HWND hwnd, WPARAM wParam ) if (ON_LEFT_BORDER(hittest)) { - mouseRect.left = max( mouseRect.left, sizingRect.right-maxTrack.x+capturePoint.x-sizingRect.left ); - mouseRect.right = min( mouseRect.right, sizingRect.right-minTrack.x+capturePoint.x-sizingRect.left ); + mouseRect.left = max( mouseRect.left, sizingRect.right-minmax.ptMaxTrackSize.x+capturePoint.x-sizingRect.left ); + mouseRect.right = min( mouseRect.right, sizingRect.right-minmax.ptMinTrackSize.x+capturePoint.x-sizingRect.left ); } else if (ON_RIGHT_BORDER(hittest)) { - mouseRect.left = max( mouseRect.left, sizingRect.left+minTrack.x+capturePoint.x-sizingRect.right ); - mouseRect.right = min( mouseRect.right, sizingRect.left+maxTrack.x+capturePoint.x-sizingRect.right ); + mouseRect.left = max( mouseRect.left, sizingRect.left+minmax.ptMinTrackSize.x+capturePoint.x-sizingRect.right ); + mouseRect.right = min( mouseRect.right, sizingRect.left+minmax.ptMaxTrackSize.x+capturePoint.x-sizingRect.right ); } if (ON_TOP_BORDER(hittest)) { - mouseRect.top = max( mouseRect.top, sizingRect.bottom-maxTrack.y+capturePoint.y-sizingRect.top ); - mouseRect.bottom = min( mouseRect.bottom,sizingRect.bottom-minTrack.y+capturePoint.y-sizingRect.top); + mouseRect.top = max( mouseRect.top, sizingRect.bottom-minmax.ptMaxTrackSize.y+capturePoint.y-sizingRect.top ); + mouseRect.bottom = min( mouseRect.bottom,sizingRect.bottom-minmax.ptMinTrackSize.y+capturePoint.y-sizingRect.top); } else if (ON_BOTTOM_BORDER(hittest)) { - mouseRect.top = max( mouseRect.top, sizingRect.top+minTrack.y+capturePoint.y-sizingRect.bottom ); - mouseRect.bottom = min( mouseRect.bottom, sizingRect.top+maxTrack.y+capturePoint.y-sizingRect.bottom ); + mouseRect.top = max( mouseRect.top, sizingRect.top+minmax.ptMinTrackSize.y+capturePoint.y-sizingRect.bottom ); + mouseRect.bottom = min( mouseRect.bottom, sizingRect.top+minmax.ptMaxTrackSize.y+capturePoint.y-sizingRect.bottom ); } /* Retrieve a default cache DC (without using the window style) */

1 0

Alexandre Julliard : oleaut32: Remove unnecessary consts.
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: 18f7ec3670375f6389b36527fbfe1216fe795e53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=18f7ec3670375f6389b36527… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 16 10:14:52 2018 +0200 oleaut32: Remove unnecessary consts. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/vartype.c | 24 ++++++++++++------------ include/oleauto.h | 24 ++++++++++++------------ 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index eeef992..37c4be5 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -3781,7 +3781,7 @@ HRESULT WINAPI VarCyFromUI8(ULONG64 ullIn, CY* pCyOut) * Success: S_OK. * Failure: DISP_E_OVERFLOW, if the value will not fit in the destination */ -HRESULT WINAPI VarCyAdd(const CY cyLeft, const CY cyRight, CY* pCyOut) +HRESULT WINAPI VarCyAdd(CY cyLeft, CY cyRight, CY* pCyOut) { double l,r; _VarR8FromCy(cyLeft, &l); @@ -3804,7 +3804,7 @@ HRESULT WINAPI VarCyAdd(const CY cyLeft, const CY cyRight, CY* pCyOut) * Success: S_OK. * Failure: DISP_E_OVERFLOW, if the value will not fit in the destination */ -HRESULT WINAPI VarCyMul(const CY cyLeft, const CY cyRight, CY* pCyOut) +HRESULT WINAPI VarCyMul(CY cyLeft, CY cyRight, CY* pCyOut) { double l,r; _VarR8FromCy(cyLeft, &l); @@ -3827,7 +3827,7 @@ HRESULT WINAPI VarCyMul(const CY cyLeft, const CY cyRight, CY* pCyOut) * Success: S_OK. * Failure: DISP_E_OVERFLOW, if the value will not fit in the destination */ -HRESULT WINAPI VarCyMulI4(const CY cyLeft, LONG lRight, CY* pCyOut) +HRESULT WINAPI VarCyMulI4(CY cyLeft, LONG lRight, CY* pCyOut) { double d; @@ -3850,7 +3850,7 @@ HRESULT WINAPI VarCyMulI4(const CY cyLeft, LONG lRight, CY* pCyOut) * Success: S_OK. * Failure: DISP_E_OVERFLOW, if the value will not fit in the destination */ -HRESULT WINAPI VarCySub(const CY cyLeft, const CY cyRight, CY* pCyOut) +HRESULT WINAPI VarCySub(CY cyLeft, CY cyRight, CY* pCyOut) { double l,r; _VarR8FromCy(cyLeft, &l); @@ -3872,7 +3872,7 @@ HRESULT WINAPI VarCySub(const CY cyLeft, const CY cyRight, CY* pCyOut) * Success: S_OK. pCyOut contains the absolute value. * Failure: DISP_E_OVERFLOW, if the value will not fit in the destination */ -HRESULT WINAPI VarCyAbs(const CY cyIn, CY* pCyOut) +HRESULT WINAPI VarCyAbs(CY cyIn, CY* pCyOut) { if (cyIn.s.Hi == (int)0x80000000 && !cyIn.s.Lo) return DISP_E_OVERFLOW; @@ -3898,7 +3898,7 @@ HRESULT WINAPI VarCyAbs(const CY cyIn, CY* pCyOut) * - The difference between this function and VarCyInt() is that VarCyInt() rounds * negative numbers away from 0, while this function rounds them towards zero. */ -HRESULT WINAPI VarCyFix(const CY cyIn, CY* pCyOut) +HRESULT WINAPI VarCyFix(CY cyIn, CY* pCyOut) { pCyOut->int64 = cyIn.int64 / CY_MULTIPLIER; pCyOut->int64 *= CY_MULTIPLIER; @@ -3922,7 +3922,7 @@ HRESULT WINAPI VarCyFix(const CY cyIn, CY* pCyOut) * - The difference between this function and VarCyFix() is that VarCyFix() rounds * negative numbers towards 0, while this function rounds them away from zero. */ -HRESULT WINAPI VarCyInt(const CY cyIn, CY* pCyOut) +HRESULT WINAPI VarCyInt(CY cyIn, CY* pCyOut) { pCyOut->int64 = cyIn.int64 / CY_MULTIPLIER; pCyOut->int64 *= CY_MULTIPLIER; @@ -3947,7 +3947,7 @@ HRESULT WINAPI VarCyInt(const CY cyIn, CY* pCyOut) * Success: S_OK. * Failure: DISP_E_OVERFLOW, if the value will not fit in the destination */ -HRESULT WINAPI VarCyNeg(const CY cyIn, CY* pCyOut) +HRESULT WINAPI VarCyNeg(CY cyIn, CY* pCyOut) { if (cyIn.s.Hi == (int)0x80000000 && !cyIn.s.Lo) return DISP_E_OVERFLOW; @@ -3970,7 +3970,7 @@ HRESULT WINAPI VarCyNeg(const CY cyIn, CY* pCyOut) * Success: S_OK. * Failure: E_INVALIDARG, if cDecimals is less than 0. */ -HRESULT WINAPI VarCyRound(const CY cyIn, int cDecimals, CY* pCyOut) +HRESULT WINAPI VarCyRound(CY cyIn, int cDecimals, CY* pCyOut) { if (cDecimals < 0) return E_INVALIDARG; @@ -4008,7 +4008,7 @@ HRESULT WINAPI VarCyRound(const CY cyIn, int cDecimals, CY* pCyOut) * compare is less, equal or greater than source respectively. * Failure: DISP_E_OVERFLOW, if overflow occurs during the comparison */ -HRESULT WINAPI VarCyCmp(const CY cyLeft, const CY cyRight) +HRESULT WINAPI VarCyCmp(CY cyLeft, CY cyRight) { HRESULT hRet; CY result; @@ -4042,7 +4042,7 @@ HRESULT WINAPI VarCyCmp(const CY cyLeft, const CY cyRight) * less than, equal to or greater than cyLeft respectively. * Failure: DISP_E_OVERFLOW, if overflow occurs during the comparison */ -HRESULT WINAPI VarCyCmpR8(const CY cyLeft, double dblRight) +HRESULT WINAPI VarCyCmpR8(CY cyLeft, double dblRight) { HRESULT hRet; CY cyRight; @@ -4069,7 +4069,7 @@ HRESULT WINAPI VarCyCmpR8(const CY cyLeft, double dblRight) * Success: S_OK. * Failure: DISP_E_OVERFLOW, if the value will not fit in the destination */ -HRESULT WINAPI VarCyMulI8(const CY cyLeft, LONG64 llRight, CY* pCyOut) +HRESULT WINAPI VarCyMulI8(CY cyLeft, LONG64 llRight, CY* pCyOut) { double d; diff --git a/include/oleauto.h b/include/oleauto.h index 07c46ad..32b3b46 100644 --- a/include/oleauto.h +++ b/include/oleauto.h @@ -561,18 +561,18 @@ HRESULT WINAPI VarDecNeg(const DECIMAL*,DECIMAL*); HRESULT WINAPI VarDecRound(const DECIMAL*,int,DECIMAL*); HRESULT WINAPI VarDecSub(const DECIMAL*,const DECIMAL*,DECIMAL*); -HRESULT WINAPI VarCyAbs(const CY,CY*); -HRESULT WINAPI VarCyAdd(const CY,const CY,CY*); -HRESULT WINAPI VarCyCmp(const CY,const CY); -HRESULT WINAPI VarCyCmpR8(const CY,DOUBLE); -HRESULT WINAPI VarCyFix(const CY,CY*); -HRESULT WINAPI VarCyInt(const CY,CY*); -HRESULT WINAPI VarCyMul(const CY,CY,CY*); -HRESULT WINAPI VarCyMulI4(const CY,LONG,CY*); -HRESULT WINAPI VarCyMulI8(const CY,LONG64,CY*); -HRESULT WINAPI VarCyNeg(const CY,CY*); -HRESULT WINAPI VarCyRound(const CY,INT,CY*); -HRESULT WINAPI VarCySub(const CY,const CY,CY*); +HRESULT WINAPI VarCyAbs(CY,CY*); +HRESULT WINAPI VarCyAdd(CY,CY,CY*); +HRESULT WINAPI VarCyCmp(CY,CY); +HRESULT WINAPI VarCyCmpR8(CY,DOUBLE); +HRESULT WINAPI VarCyFix(CY,CY*); +HRESULT WINAPI VarCyInt(CY,CY*); +HRESULT WINAPI VarCyMul(CY,CY,CY*); +HRESULT WINAPI VarCyMulI4(CY,LONG,CY*); +HRESULT WINAPI VarCyMulI8(CY,LONG64,CY*); +HRESULT WINAPI VarCyNeg(CY,CY*); +HRESULT WINAPI VarCyRound(CY,INT,CY*); +HRESULT WINAPI VarCySub(CY,CY,CY*); HRESULT WINAPI VarAdd(LPVARIANT,LPVARIANT,LPVARIANT); HRESULT WINAPI VarAnd(LPVARIANT,LPVARIANT,LPVARIANT);

1 0

Michael Müller : gdi32: Treat lpResults as optional in GetCharacterPlacement.
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: 96721e4291378f0c2dfe6948df95691752250b95 URL: https://source.winehq.org/git/wine.git/?a=commit;h=96721e4291378f0c2dfe6948… Author: Michael Müller <michael(a)fds-team.de> Date: Mon Jul 16 08:30:57 2018 +0100 gdi32: Treat lpResults as optional in GetCharacterPlacement. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 13 ++++++++++++- dlls/gdi32/tests/font.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 41ec07d..c4b7cfb 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3204,10 +3204,18 @@ GetCharacterPlacementA(HDC hdc, LPCSTR lpString, INT uCount, TRACE("%s, %d, %d, 0x%08x\n", debugstr_an(lpString, uCount), uCount, nMaxExtent, dwFlags); + lpStringW = FONT_mbtowc(hdc, lpString, uCount, &uCountW, &font_cp); + + if (!lpResults) + { + ret = GetCharacterPlacementW(hdc, lpStringW, uCountW, nMaxExtent, NULL, dwFlags); + HeapFree(GetProcessHeap(), 0, lpStringW); + return ret; + } + /* both structs are equal in size */ memcpy(&resultsW, lpResults, sizeof(resultsW)); - lpStringW = FONT_mbtowc(hdc, lpString, uCount, &uCountW, &font_cp); if(lpResults->lpOutString) resultsW.lpOutString = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*uCountW); @@ -3262,6 +3270,9 @@ GetCharacterPlacementW( TRACE("%s, %d, %d, 0x%08x\n", debugstr_wn(lpString, uCount), uCount, nMaxExtent, dwFlags); + if (!lpResults) + return GetTextExtentPoint32W(hdc, lpString, uCount, &size) ? MAKELONG(size.cx, size.cy) : 0; + TRACE("lStructSize=%d, lpOutString=%p, lpOrder=%p, lpDx=%p, lpCaretPos=%p\n" "lpClass=%p, lpGlyphs=%p, nGlyphs=%u, nMaxFit=%d\n", lpResults->lStructSize, lpResults->lpOutString, lpResults->lpOrder, diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 8f5454b..0d07709 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4939,6 +4939,39 @@ static void test_GetTextMetrics2(const char *fontname, int font_height) ok(ratio >= 90 && ratio <= 110, "expected width/height ratio 90-110, got %d\n", ratio); } +static void test_GetCharacterPlacement(void) +{ + GCP_RESULTSA result; + DWORD size, size2; + WCHAR glyphs[20]; + HDC hdc; + + hdc = CreateCompatibleDC(0); + ok(!!hdc, "CreateCompatibleDC failed\n"); + + memset(&result, 0, sizeof(result)); + result.lStructSize = sizeof(result); + result.lpGlyphs = glyphs; + result.nGlyphs = 20; + + size = GetCharacterPlacementA(hdc, "Wine Test", 9, 0, &result, 0); + ok(size, "GetCharacterPlacementA failed!\n"); + + size2 = GetCharacterPlacementA(hdc, "Wine Test", 9, 0, NULL, 0); + ok(size2, "GetCharacterPlacementA failed!\n"); + ok(size == size2, "GetCharacterPlacementA returned different result: %u vs %u\n", size2, size); + + size2 = GetCharacterPlacementA(hdc, "Wine Test", 9, 1024, NULL, GCP_REORDER); + ok(size2, "GetCharacterPlacementA failed!\n"); + ok(size == size2, "GetCharacterPlacementA returned different result: %u vs %u\n", size2, size); + + size = GetCharacterPlacementA(hdc, "Wine Test", 9, 1024, &result, GCP_REORDER); + ok(size, "GetCharacterPlacementA failed!\n"); + ok(size == size2, "GetCharacterPlacementA returned different result: %u vs %u\n", size2, size); + + DeleteDC(hdc); +} + static void test_CreateFontIndirect(void) { LOGFONTA lf, getobj_lf; @@ -6875,6 +6908,7 @@ START_TEST(font) test_GetTextMetrics2("Arial", -11); test_GetTextMetrics2("Arial", -55); test_GetTextMetrics2("Arial", -110); + test_GetCharacterPlacement(); test_CreateFontIndirect(); test_CreateFontIndirectEx(); test_oemcharset();

1 0

Andrey Gusev : po: Update Ukrainian translation.
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: bddb067d85332de8d8a403bb6b36ce6a68e9b05a URL: https://source.winehq.org/git/wine.git/?a=commit;h=bddb067d85332de8d8a403bb… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sun Jul 15 16:49:31 2018 +0300 po: Update Ukrainian translation. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/uk.po | 103 ++++++++++++++------------------------------------------------- 1 file changed, 23 insertions(+), 80 deletions(-) diff --git a/po/uk.po b/po/uk.po index 85264ed..444db62 100644 --- a/po/uk.po +++ b/po/uk.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2018-04-12 17:02+0300\n" +"PO-Revision-Date: 2018-07-15 16:35+0300\n" "Last-Translator: Andrey Gusev <andrey.goosev(a)gmail.com>\n" "Language-Team: Ukrainian\n" "Language: uk\n" @@ -3432,46 +3432,36 @@ msgid "Publishers..." msgstr "Видавці..." #: inetcpl.rc:123 -#, fuzzy -#| msgid "LAN Connection" msgid "Connections" -msgstr "Підключення по локальній мережі" +msgstr "Підключення" #: inetcpl.rc:125 -#, fuzzy -#| msgid "Wine configuration" msgid "Automatic configuration" -msgstr "Параметри Wine" +msgstr "Автоматичне налаштування" #: inetcpl.rc:126 msgid "Use Web Proxy Auto-Discovery (WPAD)" -msgstr "" +msgstr "Використовувати автоматичне виявлення веб-проксі (WPAD)" #: inetcpl.rc:127 msgid "Use Proxy Auto-Config (PAC) script" -msgstr "" +msgstr "Використовувати автоматичне налаштування проксі (PAC)" #: inetcpl.rc:128 inetcpl.rc:132 -#, fuzzy -#| msgid "Address" msgid "Address:" -msgstr "Адреса" +msgstr "Адреса:" #: inetcpl.rc:130 -#, fuzzy -#| msgid "&Local server" msgid "Proxy server" -msgstr "&Локальний сервер" +msgstr "Проксі-сервер" #: inetcpl.rc:131 msgid "Use a proxy server" -msgstr "" +msgstr "Використовувати проксі-сервер" #: inetcpl.rc:134 -#, fuzzy -#| msgid "No Ports" msgid "Port:" -msgstr "Нема портів" +msgstr "Порт:" #: inetcpl.rc:31 msgid "Internet Settings" @@ -3742,18 +3732,19 @@ msgid "" "'writable' attribute on the property descriptor cannot be set to 'true' on " "this object" msgstr "" +"Властивість 'writable' не може бути встановлена на 'true' для цього об'єкта" #: jscript.rc:70 msgid "Cannot redefine non-configurable property '|'" -msgstr "" +msgstr "Неможливо перевизначити властивість, яка не підлягає налаштуванню '|'" #: jscript.rc:71 msgid "Cannot modify non-writable property '|'" -msgstr "" +msgstr "Неможливо змінити властивість, яка не підлягає запису '|'" #: jscript.rc:72 msgid "Property cannot have both accessors and a value" -msgstr "" +msgstr "Властивість не може одночасно мати доступ і значення" #: ../../include/wine/wine_common_ver.rc:129 msgid "Wine kernel DLL" @@ -8635,10 +8626,8 @@ msgid "&Browse..." msgstr "&Огляд..." #: shell32.rc:355 shell32.rc:384 -#, fuzzy -#| msgid "File type" msgid "File type:" -msgstr "Тип файлу" +msgstr "Тип файлу:" #: shell32.rc:359 shell32.rc:392 urlmon.rc:37 explorer.rc:32 msgid "Location:" @@ -8649,14 +8638,10 @@ msgid "Size:" msgstr "Розмір:" #: shell32.rc:365 shell32.rc:398 -#, fuzzy -#| msgid "Creation date" msgid "Creation date:" -msgstr "Дата створення" +msgstr "Дата створення:" #: shell32.rc:369 shell32.rc:406 -#, fuzzy -#| msgid "&Attributes:" msgid "Attributes:" msgstr "&Властивості:" @@ -8669,28 +8654,20 @@ msgid "&Archive" msgstr "&Архівний" #: shell32.rc:386 -#, fuzzy -#| msgid "Open:" msgid "Open with:" -msgstr "Відкрити:" +msgstr "Відкрити за допомогою:" #: shell32.rc:389 -#, fuzzy -#| msgid "Change &Icon..." msgid "&Change..." -msgstr "З&мінити значок..." +msgstr "З&мінити..." #: shell32.rc:400 -#, fuzzy -#| msgid "Modified" msgid "Last modified:" -msgstr "Змінено" +msgstr "Остання зміна:" #: shell32.rc:402 -#, fuzzy -#| msgid "Last Change:" msgid "Last accessed:" -msgstr "Останні зміни:" +msgstr "Останній доступ:" #: shell32.rc:138 shell32.rc:142 winefile.rc:108 msgid "Size" @@ -12945,10 +12922,8 @@ msgid "Confirm Value Delete" msgstr "Підтвердження видалення значення" #: regedit.rc:210 -#, fuzzy -#| msgid "Are you sure you want to delete the registry value '%1'?" msgid "Are you sure you want to delete the selected registry value?" -msgstr "Ви впевнені, що хочете видалити значення реєстру '%1'?" +msgstr "Ви впевнені, що хочете видалити вибране значення реєстру?" #: regedit.rc:216 msgid "Search complete. The string '%1' was not found." @@ -14918,6 +14893,8 @@ msgid "" "A program on your system has crashed, but WineDbg was unable to attach to " "the process to obtain a backtrace." msgstr "" +"Програма зазнала збій, але WineDbg не вдалося приєднатись до процесу, щоб " +"отримати більш детальну інформацію." #: winedbg.rc:41 msgid "(unidentified)" @@ -15782,41 +15759,6 @@ msgid "D" msgstr "Д" #: xcopy.rc:81 -#, fuzzy -#| msgid "" -#| "XCOPY - Copies source files or directory trees to a destination.\n" -#| "\n" -#| "Syntax:\n" -#| "XCOPY source [destination] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n" -#| "\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n" -#| "\n" -#| "Where:\n" -#| "\n" -#| "[/I] Assume directory if destination does not exist and copying two or\n" -#| "\tmore files.\n" -#| "[/S] Copy directories and subdirectories.\n" -#| "[/E] Copy directories and subdirectories, including any empty ones.\n" -#| "[/Q] Do not list names during copy, that is be quiet.\n" -#| "[/F] Show full source and destination names during copy.\n" -#| "[/L] Simulate operation, showing names which would be copied.\n" -#| "[/W] Prompts before beginning the copy operation.\n" -#| "[/T] Creates empty directory structure but does not copy files.\n" -#| "[/Y] Suppress prompting when overwriting files.\n" -#| "[/-Y] Enable prompting when overwriting files.\n" -#| "[/P] Prompts on each source file before copying.\n" -#| "[/N] Copy using short names.\n" -#| "[/U] Copy only files which already exist in destination.\n" -#| "[/R] Overwrite any read only files.\n" -#| "[/H] Include hidden and system files in the copy.\n" -#| "[/C] Continue even if an error occurs during the copy.\n" -#| "[/A] Only copy files with archive attribute set.\n" -#| "[/M] Only copy files with archive attribute set, removes the\n" -#| "\tarchive attribute.\n" -#| "[/D | /D:m-d-y] Copy new files or those modified after the supplied " -#| "date.\n" -#| "\t\tIf no date is supplied, only copy if destination is older\n" -#| "\t\tthan source.\n" -#| "\n" msgid "" "XCOPY - Copies source files or directory trees to a destination.\n" "\n" @@ -15882,6 +15824,7 @@ msgstr "" "[/A] Копіює лише файли з властивістю АРХІВНИЙ.\n" "[/M] Копіює лише файли з властивістю АРХІВНИЙ, видаляє\n" "\tвластивість АРХІВНИЙ.\n" +"[/K] Копіює властивості файлу, без цього властивості не зберігаються.\n" "[/D | /D:m-d-y] Копіює лише нові файли або ті, які були змінені після " "вказаної дати.\n" "\tЯкщо дата не вказана, копіює лише ті файли, які новіші в початковій теці.\n"

1 0

Ken Thomases : winemac: Disable macOS' s App Nap energy-saving feature by default for Wine GUI processes.
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: 250944b64304ee85d92955d2a901268ab08b720e URL: https://source.winehq.org/git/wine.git/?a=commit;h=250944b64304ee85d92955d2… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Jul 15 22:54:15 2018 -0500 winemac: Disable macOS's App Nap energy-saving feature by default for Wine GUI processes. App Nap defers timer firings and I/O if the app is not visibly or audibly updating. An app is supposed to disable it during user-requested or background activity, but we can't know when the Windows app is engaged in such. Since it's not generally acceptable for timers or IO to be deferred, we have to disable it at all times. The user can re-enable it by setting the following registry setting: [HKEY\Software\Wine\Mac Driver] "EnableAppNap"="y" Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_app.m | 7 +++++++ dlls/winemac.drv/macdrv_cocoa.h | 1 + dlls/winemac.drv/macdrv_main.c | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 239c11f..efbd657 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -235,6 +235,13 @@ static NSString* WineLocalizedString(unsigned int stringID) [NSApp setActivationPolicy:NSApplicationActivationPolicyRegular]; [NSApp activateIgnoringOtherApps:YES]; +#if defined(MAC_OS_X_VERSION_10_9) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_9 + if (!enable_app_nap && [NSProcessInfo instancesRespondToSelector:@selector(beginActivityWithOptions:reason:)]) + { + [[[NSProcessInfo processInfo] beginActivityWithOptions:NSActivityUserInitiatedAllowingIdleSystemSleep + reason:@"Running Windows program"] retain]; // intentional leak + } +#endif mainMenu = [[[NSMenu alloc] init] autorelease]; diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index acab5df..6bad790 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -166,6 +166,7 @@ extern int gl_surface_mode DECLSPEC_HIDDEN; extern CFDictionaryRef localized_strings DECLSPEC_HIDDEN; extern int retina_enabled DECLSPEC_HIDDEN; /* Whether Retina mode is enabled via registry setting. */ extern int retina_on DECLSPEC_HIDDEN; /* Whether Retina mode is currently active (enabled and display is in default mode). */ +extern int enable_app_nap DECLSPEC_HIDDEN; static inline CGRect cgrect_mac_from_win(CGRect rect) { diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index 491ab06..4bd7411 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -60,6 +60,7 @@ int use_precise_scrolling = TRUE; int gl_surface_mode = GL_SURFACE_IN_FRONT_OPAQUE; int retina_enabled = FALSE; HMODULE macdrv_module = 0; +int enable_app_nap = FALSE; CFDictionaryRef localized_strings; @@ -197,6 +198,9 @@ static void setup_options(void) gl_surface_mode = GL_SURFACE_IN_FRONT_OPAQUE; } + if (!get_config_key(hkey, appkey, "EnableAppNap", buffer, sizeof(buffer))) + enable_app_nap = IS_OPTION_TRUE(buffer[0]); + /* Don't use appkey. The DPI and monitor sizes should be consistent for all processes in the prefix. */ if (!get_config_key(hkey, NULL, "RetinaMode", buffer, sizeof(buffer)))

1 0

Ken Thomases : winemac: Don't change the window's color space.
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: ed7e0573882d9fd36e47f6178809d5f3726f8c1c URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed7e0573882d9fd36e47f617… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sat Jul 14 14:01:37 2018 -0500 winemac: Don't change the window's color space. This was originally done to improve performance at the expense of visually- correct rendering. I've reconsidered that trade-off. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.m | 32 -------------------------------- 1 file changed, 32 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 4c59faf..4143d14 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -385,7 +385,6 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi @property (readonly, copy, nonatomic) NSArray* childWineWindows; - - (void) updateColorSpace; - (void) updateForGLSubviews; - (BOOL) becameEligibleParentOrChild; @@ -968,7 +967,6 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi [window setShowsResizeIndicator:NO]; [window setHasShadow:wf->shadow]; [window setAcceptsMouseMovedEvents:YES]; - [window setColorSpace:[NSColorSpace genericRGBColorSpace]]; [window setDelegate:window]; [window setBackgroundColor:[NSColor clearColor]]; [window setOpaque:NO]; @@ -1927,9 +1925,6 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi if (needEnableScreenUpdates) NSEnableScreenUpdates(); - if (!equalSizes) - [self updateColorSpace]; - if (!enteringFullScreen && [[NSProcessInfo processInfo] systemUptime] - enteredFullScreenTime > 1.0) nonFullscreenFrame = frame; @@ -2601,35 +2596,8 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi return [childWindows objectsAtIndexes:indexes]; } - // We normally use the generic/calibrated RGB color space for the window, - // rather than the device color space, to avoid expensive color conversion - // which slows down drawing. However, for windows displaying OpenGL, having - // a different color space than the screen greatly reduces frame rates, often - // limiting it to the display refresh rate. - // - // To avoid this, we switch back to the screen color space whenever the - // window is covered by a view with an attached OpenGL context. - - (void) updateColorSpace - { - NSRect contentRect = [[self contentView] frame]; - BOOL coveredByGLView = FALSE; - WineContentView* view = (WineContentView*)[[self contentView] hitTest:NSMakePoint(NSMidX(contentRect), NSMidY(contentRect))]; - if ([view isKindOfClass:[WineContentView class]] && view.everHadGLContext) - { - NSRect frame = [view convertRect:[view bounds] toView:nil]; - if (NSContainsRect(frame, contentRect)) - coveredByGLView = TRUE; - } - - if (coveredByGLView) - [self setColorSpace:nil]; - else - [self setColorSpace:[NSColorSpace genericRGBColorSpace]]; - } - - (void) updateForGLSubviews { - [self updateColorSpace]; if (gl_surface_mode == GL_SURFACE_BEHIND) [self checkTransparency]; }

1 0