wine-commits July 2018

wine-commits@winehq.org

2 participants
405 discussions

Alex Henrie : winevulkan: Correct spelling of "of" in a comment.
by Alexandre Julliard 16 Jul '18

16 Jul '18

Module: wine Branch: master Commit: a8df2c61d8d4541b7b55f50d86b59a12da2d1768 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8df2c61d8d4541b7b55f50d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Jul 15 23:28:40 2018 -0600 winevulkan: Correct spelling of "of" in a comment. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index a06cfa1..34ef457 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -30,7 +30,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(vulkan); /* For now default to 4 as it felt like a reasonable version feature wise to support. * Don't support the optional vk_icdGetPhysicalDeviceProcAddr introduced in this version * as it is unlikely we will implement physical device extensions, which the loader is not - * aware off. Version 5 adds more extensive version checks. Something to tackle later. + * aware of. Version 5 adds more extensive version checks. Something to tackle later. */ #define WINE_VULKAN_ICD_VERSION 4

1 0

Jactry Zeng : riched20: Some cleanup for CHARFORMAT convertor functions.
by Alexandre Julliard 16 Jul '18

16 Jul '18

Module: wine Branch: master Commit: 8d506cb216023996ea84fc2c336fe74c325ade56 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d506cb216023996ea84fc2c… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Fri Jul 13 17:11:35 2018 +0800 riched20: Some cleanup for CHARFORMAT convertor functions. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 18 +++++++++--------- dlls/riched20/editor.h | 4 ++-- dlls/riched20/style.c | 37 ++++++++++++++++++++----------------- 3 files changed, 31 insertions(+), 28 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 820b038..8020117 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3901,17 +3901,17 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, return editor->nEventMask; case EM_SETCHARFORMAT: { - CHARFORMAT2W buf, *p; + CHARFORMAT2W p; BOOL bRepaint = TRUE; - p = ME_ToCF2W(&buf, (CHARFORMAT2W *)lParam); - if (p == NULL) return 0; + if (!cfany_to_cf2w(&p, (CHARFORMAT2W *)lParam)) + return 0; if (wParam & SCF_ALL) { if (editor->mode & TM_PLAINTEXT) { - ME_SetDefaultCharFormat(editor, p); + ME_SetDefaultCharFormat(editor, &p); } else { ME_Cursor start; ME_SetCursorToStart(editor, &start); - ME_SetCharFormat(editor, &start, NULL, p); + ME_SetCharFormat(editor, &start, NULL, &p); editor->nModifyStep = 1; } } else if (wParam & SCF_SELECTION) { @@ -3923,13 +3923,13 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, ME_MoveCursorWords(editor, &end, +1); start = end; ME_MoveCursorWords(editor, &start, -1); - ME_SetCharFormat(editor, &start, &end, p); + ME_SetCharFormat(editor, &start, &end, &p); } bRepaint = ME_IsSelection(editor); - ME_SetSelectionCharFormat(editor, p); + ME_SetSelectionCharFormat(editor, &p); if (bRepaint) editor->nModifyStep = 1; } else { /* SCF_DEFAULT */ - ME_SetDefaultCharFormat(editor, p); + ME_SetDefaultCharFormat(editor, &p); } ME_CommitUndo(editor); if (bRepaint) @@ -3953,7 +3953,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, ME_GetDefaultCharFormat(editor, &tmp); else ME_GetSelectionCharFormat(editor, &tmp); - ME_CopyToCFAny(dst, &tmp); + cf2w_to_cfany(dst, &tmp); return tmp.dwMask; } case EM_SETPARAFORMAT: diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 0f0e56e..141c63a 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -61,8 +61,8 @@ void ME_SaveTempStyle(ME_TextEditor *editor, ME_Style *style) DECLSPEC_HIDDEN; void ME_ClearTempStyle(ME_TextEditor *editor) DECLSPEC_HIDDEN; void ME_DumpStyleToBuf(CHARFORMAT2W *pFmt, char buf[2048]) DECLSPEC_HIDDEN; void ME_DumpStyle(ME_Style *s) DECLSPEC_HIDDEN; -CHARFORMAT2W *ME_ToCF2W(CHARFORMAT2W *to, CHARFORMAT2W *from) DECLSPEC_HIDDEN; -void ME_CopyToCFAny(CHARFORMAT2W *to, CHARFORMAT2W *from) DECLSPEC_HIDDEN; +BOOL cfany_to_cf2w(CHARFORMAT2W *to, const CHARFORMAT2W *from) DECLSPEC_HIDDEN; +BOOL cf2w_to_cfany(CHARFORMAT2W *to, const CHARFORMAT2W *from) DECLSPEC_HIDDEN; void ME_CopyCharFormat(CHARFORMAT2W *pDest, const CHARFORMAT2W *pSrc) DECLSPEC_HIDDEN; /* only works with 2W structs */ void ME_CharFormatFromLogFont(HDC hDC, const LOGFONTW *lf, CHARFORMAT2W *fmt) DECLSPEC_HIDDEN; /* ditto */ diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index 0b85d69..97e98a7 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -33,7 +33,7 @@ static int all_refs = 0; * sizeof(char[AW]) */ -CHARFORMAT2W *ME_ToCF2W(CHARFORMAT2W *to, CHARFORMAT2W *from) +BOOL cfany_to_cf2w(CHARFORMAT2W *to, const CHARFORMAT2W *from) { if (from->cbSize == sizeof(CHARFORMATA)) { @@ -43,7 +43,7 @@ CHARFORMAT2W *ME_ToCF2W(CHARFORMAT2W *to, CHARFORMAT2W *from) if (f->dwMask & CFM_FACE) { MultiByteToWideChar(CP_ACP, 0, f->szFaceName, -1, to->szFaceName, sizeof(to->szFaceName)/sizeof(WCHAR)); } - return to; + return TRUE; } if (from->cbSize == sizeof(CHARFORMATW)) { @@ -52,7 +52,7 @@ CHARFORMAT2W *ME_ToCF2W(CHARFORMAT2W *to, CHARFORMAT2W *from) /* theoretically, we don't need to zero the remaining memory */ ZeroMemory(&to->wWeight, sizeof(CHARFORMAT2W)-FIELD_OFFSET(CHARFORMAT2W, wWeight)); to->cbSize = sizeof(CHARFORMAT2W); - return to; + return TRUE; } if (from->cbSize == sizeof(CHARFORMAT2A)) { @@ -65,13 +65,18 @@ CHARFORMAT2W *ME_ToCF2W(CHARFORMAT2W *to, CHARFORMAT2W *from) /* copy the rest of the 2A structure to 2W */ CopyMemory(&to->wWeight, &f->wWeight, sizeof(CHARFORMAT2A)-FIELD_OFFSET(CHARFORMAT2A, wWeight)); to->cbSize = sizeof(CHARFORMAT2W); - return to; + return TRUE; + } + if (from->cbSize == sizeof(CHARFORMAT2W)) + { + CopyMemory(to, from, sizeof(CHARFORMAT2W)); + return TRUE; } - return (from->cbSize >= sizeof(CHARFORMAT2W)) ? from : NULL; + return FALSE; } -static CHARFORMAT2W *ME_ToCFAny(CHARFORMAT2W *to, CHARFORMAT2W *from) +BOOL cf2w_to_cfany(CHARFORMAT2W *to, const CHARFORMAT2W *from) { assert(from->cbSize == sizeof(CHARFORMAT2W)); if (to->cbSize == sizeof(CHARFORMATA)) @@ -80,14 +85,14 @@ static CHARFORMAT2W *ME_ToCFAny(CHARFORMAT2W *to, CHARFORMAT2W *from) CopyMemory(t, from, FIELD_OFFSET(CHARFORMATA, szFaceName)); WideCharToMultiByte(CP_ACP, 0, from->szFaceName, -1, t->szFaceName, sizeof(t->szFaceName), NULL, NULL); t->cbSize = sizeof(*t); /* it was overwritten by CopyMemory */ - return to; + return TRUE; } if (to->cbSize == sizeof(CHARFORMATW)) { CHARFORMATW *t = (CHARFORMATW *)to; CopyMemory(t, from, sizeof(*t)); t->cbSize = sizeof(*t); /* it was overwritten by CopyMemory */ - return to; + return TRUE; } if (to->cbSize == sizeof(CHARFORMAT2A)) { @@ -99,16 +104,14 @@ static CHARFORMAT2W *ME_ToCFAny(CHARFORMAT2W *to, CHARFORMAT2W *from) /* copy the rest of the 2A structure to 2W */ CopyMemory(&t->wWeight, &from->wWeight, sizeof(CHARFORMAT2W)-FIELD_OFFSET(CHARFORMAT2W,wWeight)); t->cbSize = sizeof(*t); /* it was overwritten by CopyMemory */ - return to; + return TRUE; } - assert(to->cbSize >= sizeof(CHARFORMAT2W)); - return from; -} - -void ME_CopyToCFAny(CHARFORMAT2W *to, CHARFORMAT2W *from) -{ - if (ME_ToCFAny(to, from) == from) - CopyMemory(to, from, to->cbSize); + if (to->cbSize == sizeof(CHARFORMAT2W)) + { + CopyMemory(to, from, sizeof(CHARFORMAT2W)); + return TRUE; + } + return FALSE; } ME_Style *ME_MakeStyle(CHARFORMAT2W *style)

1 0

Jactry Zeng : riched20/tests: Rewrite tests for ITextServices_TxGetNaturalSize().
by Alexandre Julliard 16 Jul '18

16 Jul '18

Module: wine Branch: master Commit: 6e264bbd1ddf0d271d4506462ecd4f20f4a20597 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e264bbd1ddf0d271d450646… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Fri Jul 13 17:11:27 2018 +0800 riched20/tests: Rewrite tests for ITextServices_TxGetNaturalSize(). Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/txtsrv.c | 130 ++++++++++++++++++++++--------------------- 1 file changed, 66 insertions(+), 64 deletions(-) diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index 88b5adf..5d312ca 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -600,6 +600,21 @@ static void setup_thiscall_wrappers(void) #endif /* __i386__ */ } +static void hf_to_cf(HFONT hf, CHARFORMAT2W *cf) +{ + LOGFONTW lf; + + GetObjectW(hf, sizeof(lf), &lf); + lstrcpyW(cf->szFaceName, lf.lfFaceName); + cf->yHeight = MulDiv(abs(lf.lfHeight), 1440, GetDeviceCaps(GetDC(NULL), LOGPIXELSY)); + if (lf.lfWeight > FW_NORMAL) cf->dwEffects |= CFE_BOLD; + if (lf.lfItalic) cf->dwEffects |= CFE_ITALIC; + if (lf.lfUnderline) cf->dwEffects |= CFE_UNDERLINE; + if (lf.lfStrikeOut) cf->dwEffects |= CFE_SUBSCRIPT; + cf->bPitchAndFamily = lf.lfPitchAndFamily; + cf->bCharSet = lf.lfCharSet; +} + /*************************************************************************/ /* Conformance test functions. */ @@ -697,81 +712,68 @@ static void test_TxSetText(void) ITextHost_Release(host); } +#define CHECK_TXGETNATURALSIZE(res,width,height,hdc,rect,string) \ + _check_txgetnaturalsize(res, width, height, hdc, rect, string, __LINE__) +static void _check_txgetnaturalsize(HRESULT res, LONG width, LONG height, HDC hdc, RECT rect, LPCWSTR string, int line) +{ + RECT expected_rect = rect; + LONG expected_width, expected_height; + + DrawTextW(hdc, string, -1, &expected_rect, DT_LEFT | DT_CALCRECT | DT_NOCLIP | DT_EDITCONTROL | DT_WORDBREAK); + expected_width = expected_rect.right - expected_rect.left; + expected_height = expected_rect.bottom - expected_rect.top; + ok_(__FILE__,line)(res == S_OK, "ITextServices_TxGetNaturalSize failed: 0x%08x.\n", res); + ok_(__FILE__,line)(width >= expected_width && width <= expected_width + 1, + "got wrong width: %d, expected: %d {+1}.\n", width, expected_width); + ok_(__FILE__,line)(height == expected_height, "got wrong height: %d, expected: %d.\n", + height, expected_height); +} + static void test_TxGetNaturalSize(void) { ITextServices *txtserv; ITextHost *host; HRESULT result; - BOOL ret; - - /* This value is used when calling TxGetNaturalSize. MSDN says - that this is not supported however a null pointer cannot be - used as it will cause a segmentation violation. The values in - the structure being pointed to are required to be INT_MAX - otherwise calculations can give wrong values. */ - const SIZEL psizelExtent = {INT_MAX,INT_MAX}; - - static const WCHAR oneA[] = {'A',0}; - - /* Results of measurements */ - LONG xdim, ydim; - - /* The device context to do the tests in */ + SIZEL extent; + static const WCHAR test_text[] = {'T','e','s','t','S','o','m','e','T','e','x','t',0}; + LONG width, height; HDC hdcDraw; - - /* Variables with the text metric information */ - INT charwidth_caps_text[26]; - TEXTMETRICA tmInfo_text; + HWND hwnd; + RECT rect; + CHARFORMAT2W cf; + LRESULT lresult; + HFONT hf; if (!init_texthost(&txtserv, &host)) return; - hdcDraw = GetDC(NULL); - SaveDC(hdcDraw); - - /* Populate the metric strucs */ - SetMapMode(hdcDraw,MM_TEXT); - GetTextMetricsA(hdcDraw, &tmInfo_text); - SetLastError(0xdeadbeef); - ret = GetCharWidth32A(hdcDraw,'A','Z',charwidth_caps_text); - if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { - win_skip("GetCharWidth32 is not available\n"); - goto cleanup; - } - - /* Make measurements in MM_TEXT */ + hwnd = CreateWindowExA(0, "static", NULL, WS_POPUP | WS_VISIBLE, + 0, 0, 100, 100, 0, 0, 0, NULL); + hdcDraw = GetDC(hwnd); SetMapMode(hdcDraw,MM_TEXT); - xdim = 0; ydim = 0; - - result = ITextServices_TxSetText(txtserv, oneA); - ok(result == S_OK, "ITextServices_TxSetText failed (result = %x)\n", result); - if (result != S_OK) { - skip("Could not set text\n"); - goto cleanup; - } - - SetLastError(0xdeadbeef); - result = ITextServices_TxGetNaturalSize(txtserv, DVASPECT_CONTENT, - hdcDraw, NULL, NULL, - TXTNS_FITTOCONTENT, &psizelExtent, - &xdim, &ydim); - todo_wine ok(result == S_OK || broken(result == E_FAIL), /* WINXP Arabic Language */ - "TxGetNaturalSize gave unexpected return value (result = %x)\n", result); - if (result == S_OK) { - todo_wine ok(ydim == tmInfo_text.tmHeight, - "Height calculated incorrectly (expected %d, got %d)\n", - tmInfo_text.tmHeight, ydim); - /* The native DLL adds one pixel extra when calculating widths. */ - todo_wine ok(xdim >= charwidth_caps_text[0] && xdim <= charwidth_caps_text[0] + 1, - "Width calculated incorrectly (expected %d {+1}, got %d)\n", - charwidth_caps_text[0], xdim); - } else - skip("TxGetNaturalSize measurements not performed (xdim = %d, ydim = %d, result = %x, error = %x)\n", - xdim, ydim, result, GetLastError()); - -cleanup: - RestoreDC(hdcDraw,1); - ReleaseDC(NULL,hdcDraw); + GetClientRect(hwnd, &rect); + + memset(&cf, 0, sizeof(cf)); + cf.cbSize = sizeof(cf); + cf.dwMask = CFM_ALL2; + hf = GetStockObject(DEFAULT_GUI_FONT); + hf_to_cf(hf, &cf); + result = ITextServices_TxSendMessage(txtserv, EM_SETCHARFORMAT, SCF_DEFAULT, (LPARAM)&cf, &lresult); + ok(result == S_OK, "ITextServices_TxSendMessage failed: 0x%08x.\n", result); + SelectObject(hdcDraw, hf); + + result = ITextServices_TxSetText(txtserv, test_text); + ok(result == S_OK, "ITextServices_TxSetText failed: 0x%08x.\n", result); + + extent.cx = -1; extent.cy = -1; + width = rect.right - rect.left; + height = 0; + result = ITextServices_TxGetNaturalSize(txtserv, DVASPECT_CONTENT, hdcDraw, NULL, NULL, + TXTNS_FITTOCONTENT, &extent, &width, &height); + todo_wine CHECK_TXGETNATURALSIZE(result, width, height, hdcDraw, rect, test_text); + + ReleaseDC(hwnd, hdcDraw); + DestroyWindow(hwnd); ITextServices_Release(txtserv); ITextHost_Release(host); }

1 0

Alexandre Julliard : user32: Retrieve the screen metrics from the monitor information.
by Alexandre Julliard 16 Jul '18

16 Jul '18

Module: wine Branch: master Commit: 56dfe6708b4ed7fea06f3fd69756e7795be0a4dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=56dfe6708b4ed7fea06f3fd6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 16 15:06:38 2018 +0200 user32: Retrieve the screen metrics from the monitor information. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 50 +++++++++++++++++++++---------------------------- 1 file changed, 21 insertions(+), 29 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 6a22f95..5f08640 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -458,20 +458,26 @@ static void SYSPARAMS_NonClientMetrics32ATo32W( const NONCLIENTMETRICSA* lpnm32A struct monitor_info { int count; + RECT primary_rect; RECT virtual_rect; }; static BOOL CALLBACK monitor_info_proc( HMONITOR monitor, HDC hdc, LPRECT rect, LPARAM lp ) { + MONITORINFO mi; struct monitor_info *info = (struct monitor_info *)lp; info->count++; UnionRect( &info->virtual_rect, &info->virtual_rect, rect ); + mi.cbSize = sizeof(mi); + if (GetMonitorInfoW( monitor, &mi ) && (mi.dwFlags & MONITORINFOF_PRIMARY)) + info->primary_rect = mi.rcMonitor; return TRUE; } static void get_monitors_info( struct monitor_info *info ) { info->count = 0; + SetRectEmpty( &info->primary_rect ); SetRectEmpty( &info->virtual_rect ); EnumDisplayMonitors( 0, NULL, monitor_info_proc, (LPARAM)info ); } @@ -2527,6 +2533,7 @@ BOOL WINAPI SystemParametersInfoA( UINT uiAction, UINT uiParam, */ INT WINAPI GetSystemMetrics( INT index ) { + struct monitor_info info; NONCLIENTMETRICSW ncm; MINIMIZEDMETRICS mm; ICONMETRICSW im; @@ -2536,16 +2543,6 @@ INT WINAPI GetSystemMetrics( INT index ) /* some metrics are dynamic */ switch (index) { - case SM_CXSCREEN: - hdc = get_display_dc(); - ret = GetDeviceCaps( hdc, HORZRES ); - release_display_dc( hdc ); - return ret; - case SM_CYSCREEN: - hdc = get_display_dc(); - ret = GetDeviceCaps( hdc, VERTRES ); - release_display_dc( hdc ); - return ret; case SM_CXVSCROLL: case SM_CYHSCROLL: ncm.cbSize = sizeof(ncm); @@ -2749,32 +2746,27 @@ INT WINAPI GetSystemMetrics( INT index ) return 0; /* FIXME */ case SM_MOUSEWHEELPRESENT: return 1; + case SM_CXSCREEN: + get_monitors_info( &info ); + return info.primary_rect.right - info.primary_rect.left; + case SM_CYSCREEN: + get_monitors_info( &info ); + return info.primary_rect.bottom - info.primary_rect.top; case SM_XVIRTUALSCREEN: - { - RECT rect = get_virtual_screen_rect(); - return rect.left; - } + get_monitors_info( &info ); + return info.virtual_rect.left; case SM_YVIRTUALSCREEN: - { - RECT rect = get_virtual_screen_rect(); - return rect.top; - } + get_monitors_info( &info ); + return info.virtual_rect.top; case SM_CXVIRTUALSCREEN: - { - RECT rect = get_virtual_screen_rect(); - return rect.right - rect.left; - } + get_monitors_info( &info ); + return info.virtual_rect.right - info.virtual_rect.left; case SM_CYVIRTUALSCREEN: - { - RECT rect = get_virtual_screen_rect(); - return rect.bottom - rect.top; - } + get_monitors_info( &info ); + return info.virtual_rect.bottom - info.virtual_rect.top; case SM_CMONITORS: - { - struct monitor_info info; get_monitors_info( &info ); return info.count; - } case SM_SAMEDISPLAYFORMAT: return 1; case SM_IMMENABLED:

1 0

Alexandre Julliard : user32: Return the full MINMAXINFO data from WINPOS_GetMinMaxInfo().
by Alexandre Julliard 16 Jul '18

16 Jul '18

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 16 Jul '18

16 Jul '18

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

Austin English : ntoskrnl.exe: Add a stub for KeFlushQueuedDpcs.
by Alexandre Julliard 16 Jul '18

16 Jul '18

Module: wine Branch: master Commit: af00d2cc1f8dde41b39426d7fc968205a30cf68a URL: https://source.winehq.org/git/wine.git/?a=commit;h=af00d2cc1f8dde41b39426d7… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Jul 13 18:10:04 2018 -0500 ntoskrnl.exe: Add a stub for KeFlushQueuedDpcs. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45448 Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 5 +++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 41f3862..a061241 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3546,3 +3546,8 @@ BOOLEAN WINAPI SeSinglePrivilegeCheck(LUID privilege, KPROCESSOR_MODE mode) FIXME("stub: %08x%08x %u\n", privilege.HighPart, privilege.LowPart, mode); return TRUE; } + +void WINAPI KeFlushQueuedDpcs(void) +{ + FIXME("stub!\n"); +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 64597c4..907fba8 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -532,7 +532,7 @@ @ stub KeFindConfigurationEntry @ stub KeFindConfigurationNextEntry @ stub KeFlushEntireTb -@ stub KeFlushQueuedDpcs +@ stdcall KeFlushQueuedDpcs() @ stdcall KeGetCurrentThread() @ stub KeGetPreviousMode @ stub KeGetRecommendedSharedDataAlignment

1 0

Michael Müller : gdi32: Treat lpResults as optional in GetCharacterPlacement.
by Alexandre Julliard 16 Jul '18

16 Jul '18

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 16 Jul '18

16 Jul '18

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 16 Jul '18

16 Jul '18

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

← Newer
1
...
10
11
12
13
14
15
16
...
41
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2018