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

Austin English : ntoskrnl.exe: Add a stub for KeFlushQueuedDpcs.
by Alexandre Julliard July 16, 2018

July 16, 2018

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

Jactry Zeng : riched20/tests: Rewrite tests for ITextServices_TxGetNaturalSize().
by Alexandre Julliard July 16, 2018

July 16, 2018

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

Jacek Caban : mshtml: Use DWORD for event id argument in node-specific event handlers.
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: a660f673cb7d6d04e0f2a9a98cff439b5403365b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a660f673cb7d6d04e0f2a9a9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 16 12:28:18 2018 +0200 mshtml: Use DWORD for event id argument in node-specific event handlers. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlanchor.c | 2 +- dlls/mshtml/htmlarea.c | 2 +- dlls/mshtml/htmlform.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index 7c845bb..2f53a3b 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -727,7 +727,7 @@ static HRESULT HTMLAnchorElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) return HTMLElement_QI(&This->element.node, riid, ppv); } -static HRESULT HTMLAnchorElement_handle_event(HTMLDOMNode *iface, eventid_t eid, nsIDOMEvent *event, BOOL *prevent_default) +static HRESULT HTMLAnchorElement_handle_event(HTMLDOMNode *iface, DWORD eid, nsIDOMEvent *event, BOOL *prevent_default) { HTMLAnchorElement *This = impl_from_HTMLDOMNode(iface); nsAString href_str, target_str; diff --git a/dlls/mshtml/htmlarea.c b/dlls/mshtml/htmlarea.c index 4fe03bf..a5ebfe7 100644 --- a/dlls/mshtml/htmlarea.c +++ b/dlls/mshtml/htmlarea.c @@ -403,7 +403,7 @@ static HRESULT HTMLAreaElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) return S_OK; } -static HRESULT HTMLAreaElement_handle_event(HTMLDOMNode *iface, eventid_t eid, nsIDOMEvent *event, BOOL *prevent_default) +static HRESULT HTMLAreaElement_handle_event(HTMLDOMNode *iface, DWORD eid, nsIDOMEvent *event, BOOL *prevent_default) { HTMLAreaElement *This = impl_from_HTMLDOMNode(iface); nsAString href_str, target_str; diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index c22fa9e..4b1b6f6 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -781,7 +781,7 @@ static HRESULT HTMLFormElement_invoke(HTMLDOMNode *iface, return S_OK; } -static HRESULT HTMLFormElement_handle_event(HTMLDOMNode *iface, eventid_t eid, nsIDOMEvent *event, BOOL *prevent_default) +static HRESULT HTMLFormElement_handle_event(HTMLDOMNode *iface, DWORD eid, nsIDOMEvent *event, BOOL *prevent_default) { HTMLFormElement *This = impl_from_HTMLDOMNode(iface);

1 0

Jactry Zeng : riched20: Some cleanup for CHARFORMAT convertor functions.
by Alexandre Julliard July 16, 2018

July 16, 2018

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

Ken Thomases : winemac: Interpret Windows bitmap data, especially window surfaces, as sRGB.
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: 650997d71db173c59a6480998168d5b89b7688c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=650997d71db173c59a648099… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Jul 15 13:52:57 2018 -0500 winemac: Interpret Windows bitmap data, especially window surfaces, as sRGB. This makes the display match that of native apps. For example, the UI of Mac Steam vs. Windows Steam or a PNG shown in iexplore.exe vs. Preview. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/image.c | 2 +- dlls/winemac.drv/mouse.c | 2 +- dlls/winemac.drv/surface.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winemac.drv/image.c b/dlls/winemac.drv/image.c index 4090350..e5f3a4c 100644 --- a/dlls/winemac.drv/image.c +++ b/dlls/winemac.drv/image.c @@ -85,7 +85,7 @@ CGImageRef create_cgimage_from_icon_bitmaps(HDC hdc, HANDLE icon, HBITMAP hbmCol else alpha_format = kCGImageAlphaNoneSkipFirst; - colorspace = CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB); + colorspace = CGColorSpaceCreateWithName(kCGColorSpaceSRGB); if (!colorspace) { WARN("failed to create colorspace\n"); diff --git a/dlls/winemac.drv/mouse.c b/dlls/winemac.drv/mouse.c index 67e0dce..91c5b88 100644 --- a/dlls/winemac.drv/mouse.c +++ b/dlls/winemac.drv/mouse.c @@ -357,7 +357,7 @@ CFArrayRef create_monochrome_cursor(HDC hdc, const ICONINFOEXW *icon, int width, for (i = 0; i < count; i++) data_bits[i] ^= xor_bits[i]; - colorspace = CGColorSpaceCreateWithName(kCGColorSpaceGenericGray); + colorspace = CGColorSpaceCreateWithName(kCGColorSpaceGenericGrayGamma2_2); if (!colorspace) { WARN("failed to create colorspace\n"); diff --git a/dlls/winemac.drv/surface.c b/dlls/winemac.drv/surface.c index 1230bbe..73daeca 100644 --- a/dlls/winemac.drv/surface.c +++ b/dlls/winemac.drv/surface.c @@ -384,7 +384,7 @@ CGImageRef create_surface_image(void *window_surface, CGRect *rect, int copy_dat visrect = CGRectOffset(*rect, -surface->header.rect.left, -surface->header.rect.top); - colorspace = CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB); + colorspace = CGColorSpaceCreateWithName(kCGColorSpaceSRGB); bytes_per_row = get_dib_stride(width, 32); offset = CGRectGetMinX(visrect) * 4 + (height - CGRectGetMaxY(visrect)) * bytes_per_row; size = min(CGRectGetHeight(visrect) * bytes_per_row,

1 0

Jason Edmeades : cmd: Fix handle leak in if exists.
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: f634fe15db1d6f09615505eb445b9e748720dbeb URL: https://source.winehq.org/git/wine.git/?a=commit;h=f634fe15db1d6f09615505eb… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Sun Jul 15 23:15:26 2018 +0100 cmd: Fix handle leak in if exists. Fixes regression in f53d57c8549dc439eb73354bfd37acd1e4e86cfd. Signed-off-by: Jason Edmeades <us(a)edmeades.me.uk> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/builtins.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 57a41c4..ff58484 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2844,7 +2844,7 @@ void WCMD_if (WCHAR *p, CMD_LIST **cmdList) WIN32_FIND_DATAW fd; HANDLE hff = FindFirstFileW(WCMD_parameter(p, 1+negate, NULL, FALSE, FALSE), &fd); test = (hff != INVALID_HANDLE_VALUE ); - if (!test) FindClose(hff); + if (test) FindClose(hff); WCMD_parameter(p, 2+negate, &command, FALSE, FALSE); }

1 0

Józef Kucia : d3d11/tests: Add more tests for multisample resolve.
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: 73b782c9877b84f7ff07c61415040de0dbca0ef0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=73b782c9877b84f7ff07c614… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jul 13 13:52:24 2018 +0200 d3d11/tests: Add more tests for multisample resolve. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index be7c907..5e324b1 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -27036,6 +27036,47 @@ static void test_multisample_resolve(void) DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, &color, 0xffbf7f40, TRUE}, + + {DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_UNORM, + DXGI_FORMAT_R8G8B8A8_UNORM, + &green, 0xff00ff00, TRUE}, + {DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_UNORM, + DXGI_FORMAT_R8G8B8A8_UNORM, + &color, 0xffbf7f40, TRUE}, + {DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + &green, 0xff00ff00, TRUE}, + {DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + &color, 0xffe1bc89, TRUE}, + {DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_UNORM, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + &green, 0xff00ff00, TRUE}, + {DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_UNORM, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + &color, 0xffe1bc89, TRUE}, + {DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + DXGI_FORMAT_R8G8B8A8_UNORM, + &green, 0xff00ff00, TRUE}, + {DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + DXGI_FORMAT_R8G8B8A8_UNORM, + &color, 0xffbf7f40, TRUE}, }; if (!init_test_context(&test_context, NULL))

1 0

Michael Stefaniuc : dmloader: Reimplement ParseDescriptor() for DirectMusicContainer.
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: cb403450ebf66a178e70f6d487b492a6591f741f URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb403450ebf66a178e70f6d4… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Jul 15 21:08:47 2018 +0200 dmloader: Reimplement ParseDescriptor() for DirectMusicContainer. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmloader/container.c | 197 +++++++------------------------------------ dlls/dmloader/tests/loader.c | 17 +++- 2 files changed, 44 insertions(+), 170 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cb403450ebf66a178e70…

1 0

Józef Kucia : wined3d: Separate feature level checks from shader model checks.
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: a622fbf9f332b624842df6a0377009c342667293 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a622fbf9f332b624842df6a0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jul 13 13:52:22 2018 +0200 wined3d: Separate feature level checks from shader model checks. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 21 ++++++++++++++------- dlls/wined3d/glsl_shader.c | 4 ---- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 9ecc4ed..e422005 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1844,13 +1844,20 @@ static enum wined3d_pci_vendor wined3d_guess_card_vendor(const char *gl_vendor_s return HW_VENDOR_NVIDIA; } -static enum wined3d_feature_level feature_level_from_caps(const struct shader_caps *shader_caps, - const struct fragment_caps *fragment_caps) +static enum wined3d_feature_level feature_level_from_caps(const struct wined3d_gl_info *gl_info, + const struct shader_caps *shader_caps, const struct fragment_caps *fragment_caps) { - if (shader_caps->vs_version >= 5) - return WINED3D_FEATURE_LEVEL_11; - if (shader_caps->vs_version == 4) - return WINED3D_FEATURE_LEVEL_10; + if (gl_info->supported[WINED3D_GL_VERSION_3_2] && gl_info->supported[ARB_SAMPLER_OBJECTS]) + { + if (shader_caps->vs_version >= 5 + && gl_info->supported[ARB_DRAW_INDIRECT] + && gl_info->supported[ARB_TEXTURE_COMPRESSION_BPTC]) + return WINED3D_FEATURE_LEVEL_11; + + if (shader_caps->vs_version == 4) + return WINED3D_FEATURE_LEVEL_10; + } + if (shader_caps->vs_version == 3) return WINED3D_FEATURE_LEVEL_9_SM3; if (shader_caps->vs_version == 2) @@ -4306,7 +4313,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, d3d_info->limits.ffp_textures = fragment_caps.MaxSimultaneousTextures; d3d_info->shader_color_key = fragment_caps.wined3d_caps & WINED3D_FRAGMENT_CAP_COLOR_KEY; d3d_info->wined3d_creation_flags = wined3d_creation_flags; - d3d_info->feature_level = feature_level_from_caps(&shader_caps, &fragment_caps); + d3d_info->feature_level = feature_level_from_caps(gl_info, &shader_caps, &fragment_caps); TRACE("Max texture stages: %u.\n", d3d_info->limits.ffp_blend_stages); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 1e922c8..0c73aba 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -11242,8 +11242,6 @@ static void shader_glsl_init_context_state(struct wined3d_context *context) static unsigned int shader_glsl_get_shader_model(const struct wined3d_gl_info *gl_info) { BOOL shader_model_4 = gl_info->glsl_version >= MAKEDWORD_VERSION(1, 50) - && gl_info->supported[WINED3D_GL_VERSION_3_2] - && gl_info->supported[ARB_SAMPLER_OBJECTS] && gl_info->supported[ARB_SHADER_BIT_ENCODING] && gl_info->supported[ARB_TEXTURE_SWIZZLE]; @@ -11251,14 +11249,12 @@ static unsigned int shader_glsl_get_shader_model(const struct wined3d_gl_info *g && gl_info->supported[ARB_COMPUTE_SHADER] && gl_info->supported[ARB_CULL_DISTANCE] && gl_info->supported[ARB_DERIVATIVE_CONTROL] - && gl_info->supported[ARB_DRAW_INDIRECT] && gl_info->supported[ARB_GPU_SHADER5] && gl_info->supported[ARB_SHADER_ATOMIC_COUNTERS] && gl_info->supported[ARB_SHADER_IMAGE_LOAD_STORE] && gl_info->supported[ARB_SHADER_IMAGE_SIZE] && gl_info->supported[ARB_SHADING_LANGUAGE_PACKING] && gl_info->supported[ARB_TESSELLATION_SHADER] - && gl_info->supported[ARB_TEXTURE_COMPRESSION_BPTC] && gl_info->supported[ARB_TEXTURE_GATHER] && gl_info->supported[ARB_TRANSFORM_FEEDBACK3]) return 5;

1 0

Michael Stefaniuc : dmusic: Sync up the dmobject.[ch] files.
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: 7028142771f43b41858e6fd6bb1c7738ae6bcf4b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7028142771f43b41858e6fd6… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Jul 15 21:08:43 2018 +0200 dmusic: Sync up the dmobject.[ch] files. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmband/dmobject.c | 212 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/dmband/dmobject.h | 53 ++++++++++++ dlls/dmcompos/dmobject.c | 212 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/dmcompos/dmobject.h | 53 ++++++++++++ dlls/dmloader/dmobject.c | 212 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/dmloader/dmobject.h | 53 ++++++++++++ dlls/dmscript/dmobject.c | 212 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/dmscript/dmobject.h | 53 ++++++++++++ dlls/dmstyle/dmobject.c | 212 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/dmstyle/dmobject.h | 53 ++++++++++++ dlls/dmusic/dmobject.c | 212 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/dmusic/dmobject.h | 53 ++++++++++++ dlls/dswave/dmobject.c | 212 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/dswave/dmobject.h | 53 ++++++++++++ 14 files changed, 1855 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7028142771f43b41858e…

1 0