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

Huw Davies : user32: Scale the check mark drawn with DrawFrameControl().
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: master Commit: 94a87819c5266323f15c3fee461222bdf2d14762 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94a87819c5266323f15c3fee4… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Aug 22 08:58:29 2016 +0100 user32: Scale the check mark drawn with DrawFrameControl(). Based on a patch by Alexandre Julliard. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/uitools.c | 40 +++++++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/dlls/user32/uitools.c b/dlls/user32/uitools.c index c0a5629..73ec34b 100644 --- a/dlls/user32/uitools.c +++ b/dlls/user32/uitools.c @@ -717,7 +717,7 @@ static BOOL UITOOLS95_DFC_ButtonPush(HDC dc, LPRECT r, UINT uFlags) static BOOL UITOOLS95_DFC_ButtonCheck(HDC dc, LPRECT r, UINT uFlags) { - RECT myr, bar; + RECT myr; UINT flags = BF_RECT | BF_ADJUST; UITOOLS_MakeSquareRect(r, &myr); @@ -739,20 +739,30 @@ static BOOL UITOOLS95_DFC_ButtonCheck(HDC dc, LPRECT r, UINT uFlags) if(uFlags & DFCS_CHECKED) { - int i, k; - i = (uFlags & DFCS_INACTIVE) || (uFlags & 0xff) == DFCS_BUTTON3STATE ? - COLOR_BTNSHADOW : COLOR_WINDOWTEXT; - - /* draw 7 bars, with h=3w to form the check */ - bar.left = myr.left; - bar.top = myr.top + 2; - for (k = 0; k < 7; k++) { - bar.left = bar.left + 1; - bar.top = (k < 3) ? bar.top + 1 : bar.top - 1; - bar.bottom = bar.top + 3; - bar.right = bar.left + 1; - FillRect(dc, &bar, GetSysColorBrush(i)); - } + POINT pt[6]; + HPEN old_pen; + HBRUSH old_brush; + int color = (uFlags & DFCS_INACTIVE) || (uFlags & 0xff) == DFCS_BUTTON3STATE ? + COLOR_BTNSHADOW : COLOR_WINDOWTEXT; + + pt[0].x = myr.right - 1; + pt[0].y = myr.top; + pt[1].x = pt[0].x; + pt[1].y = pt[0].y + (myr.bottom - myr.top) / 3; + pt[2].x = myr.left + (myr.right - myr.left) / 3; + pt[2].y = myr.bottom - 1; + pt[3].x = myr.left + 1; + pt[3].y = pt[2].y - (pt[2].x - pt[3].x); + pt[4].x = pt[3].x; + pt[4].y = pt[3].y - (myr.bottom - myr.top) / 3; + pt[5].x = pt[2].x; + pt[5].y = pt[2].y - (myr.bottom - myr.top) / 3; + + old_brush = SelectObject( dc, GetSysColorBrush( color ) ); + old_pen = SelectObject( dc, GetStockObject( NULL_PEN )); + Polygon( dc, pt, 6 ); + SelectObject( dc, old_brush ); + SelectObject( dc, old_pen ); } return TRUE; }

1 0

Huw Davies : user32: Scale the edge thickness of check boxes drawn with DrawFrameControl().
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: master Commit: e06f3cd12c2a773f15323dc2ce96f7d22d8098b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e06f3cd12c2a773f15323dc2c… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Aug 22 08:58:28 2016 +0100 user32: Scale the edge thickness of check boxes drawn with DrawFrameControl(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/uitools.c | 105 +++++++++++++++++++++++--------------------------- 1 file changed, 49 insertions(+), 56 deletions(-) diff --git a/dlls/user32/uitools.c b/dlls/user32/uitools.c index c3cd755..c0a5629 100644 --- a/dlls/user32/uitools.c +++ b/dlls/user32/uitools.c @@ -392,6 +392,7 @@ static BOOL UITOOLS95_DrawDiagEdge(HDC hdc, LPRECT rc, * UITOOLS_DrawRectEdge * * Same as DrawEdge invoked without BF_DIAGONAL + * The width parameter sets the width of each outer and inner edge. * * 23-Nov-1997: Changed by Bertho Stultiens * @@ -463,26 +464,18 @@ static BOOL UITOOLS95_DrawDiagEdge(HDC hdc, LPRECT rc, static BOOL UITOOLS95_DrawRectEdge(HDC hdc, LPRECT rc, - UINT uType, UINT uFlags) + UINT uType, UINT uFlags, UINT width) { signed char LTInnerI, LTOuterI; signed char RBInnerI, RBOuterI; - HPEN LTInnerPen, LTOuterPen; - HPEN RBInnerPen, RBOuterPen; - RECT InnerRect = *rc; - POINT SavePoint; - HPEN SavePen; - int LBpenplus = 0; - int LTpenplus = 0; - int RTpenplus = 0; - int RBpenplus = 0; + HBRUSH lti_brush, lto_brush, rbi_brush, rbo_brush; + RECT InnerRect = *rc, fill_rect; + int lbi_offset = 0, lti_offset = 0, rti_offset = 0, rbi_offset = 0; BOOL retval = !( ((uType & BDR_INNER) == BDR_INNER || (uType & BDR_OUTER) == BDR_OUTER) && !(uFlags & (BF_FLAT|BF_MONO)) ); - /* Init some vars */ - LTInnerPen = LTOuterPen = RBInnerPen = RBOuterPen = GetStockObject(NULL_PEN); - SavePen = SelectObject(hdc, LTInnerPen); + lti_brush = lto_brush = rbi_brush = rbo_brush = GetStockObject(NULL_BRUSH); /* Determine the colors of the edges */ if(uFlags & BF_MONO) @@ -512,70 +505,72 @@ static BOOL UITOOLS95_DrawRectEdge(HDC hdc, LPRECT rc, RBOuterI = RBOuterNormal[uType & (BDR_INNER|BDR_OUTER)]; } - if((uFlags & BF_BOTTOMLEFT) == BF_BOTTOMLEFT) LBpenplus = 1; - if((uFlags & BF_TOPRIGHT) == BF_TOPRIGHT) RTpenplus = 1; - if((uFlags & BF_BOTTOMRIGHT) == BF_BOTTOMRIGHT) RBpenplus = 1; - if((uFlags & BF_TOPLEFT) == BF_TOPLEFT) LTpenplus = 1; + if((uFlags & BF_BOTTOMLEFT) == BF_BOTTOMLEFT) lbi_offset = width; + if((uFlags & BF_TOPRIGHT) == BF_TOPRIGHT) rti_offset = width; + if((uFlags & BF_BOTTOMRIGHT) == BF_BOTTOMRIGHT) rbi_offset = width; + if((uFlags & BF_TOPLEFT) == BF_TOPLEFT) lti_offset = width; - if(LTInnerI != -1) LTInnerPen = SYSCOLOR_GetPen(LTInnerI); - if(LTOuterI != -1) LTOuterPen = SYSCOLOR_GetPen(LTOuterI); - if(RBInnerI != -1) RBInnerPen = SYSCOLOR_GetPen(RBInnerI); - if(RBOuterI != -1) RBOuterPen = SYSCOLOR_GetPen(RBOuterI); - - MoveToEx(hdc, 0, 0, &SavePoint); + if(LTInnerI != -1) lti_brush = GetSysColorBrush(LTInnerI); + if(LTOuterI != -1) lto_brush = GetSysColorBrush(LTOuterI); + if(RBInnerI != -1) rbi_brush = GetSysColorBrush(RBInnerI); + if(RBOuterI != -1) rbo_brush = GetSysColorBrush(RBOuterI); /* Draw the outer edge */ - SelectObject(hdc, LTOuterPen); if(uFlags & BF_TOP) { - MoveToEx(hdc, InnerRect.left, InnerRect.top, NULL); - LineTo(hdc, InnerRect.right, InnerRect.top); + fill_rect = InnerRect; + fill_rect.bottom = fill_rect.top + width; + FillRect( hdc, &fill_rect, lto_brush ); } if(uFlags & BF_LEFT) { - MoveToEx(hdc, InnerRect.left, InnerRect.top, NULL); - LineTo(hdc, InnerRect.left, InnerRect.bottom); + fill_rect = InnerRect; + fill_rect.right = fill_rect.left + width; + FillRect( hdc, &fill_rect, lto_brush ); } - SelectObject(hdc, RBOuterPen); if(uFlags & BF_BOTTOM) { - MoveToEx(hdc, InnerRect.left, InnerRect.bottom-1, NULL); - LineTo(hdc, InnerRect.right, InnerRect.bottom-1); + fill_rect = InnerRect; + fill_rect.top = fill_rect.bottom - width; + FillRect( hdc, &fill_rect, rbo_brush ); } if(uFlags & BF_RIGHT) { - MoveToEx(hdc, InnerRect.right-1, InnerRect.top, NULL); - LineTo(hdc, InnerRect.right-1, InnerRect.bottom); + fill_rect = InnerRect; + fill_rect.left = fill_rect.right - width; + FillRect( hdc, &fill_rect, rbo_brush ); } /* Draw the inner edge */ - SelectObject(hdc, LTInnerPen); if(uFlags & BF_TOP) { - MoveToEx(hdc, InnerRect.left+LTpenplus, InnerRect.top+1, NULL); - LineTo(hdc, InnerRect.right-RTpenplus, InnerRect.top+1); + SetRect( &fill_rect, InnerRect.left + lti_offset, InnerRect.top + width, + InnerRect.right - rti_offset, InnerRect.top + 2 * width ); + FillRect( hdc, &fill_rect, lti_brush ); } if(uFlags & BF_LEFT) { - MoveToEx(hdc, InnerRect.left+1, InnerRect.top+LTpenplus, NULL); - LineTo(hdc, InnerRect.left+1, InnerRect.bottom-LBpenplus); + SetRect( &fill_rect, InnerRect.left + width, InnerRect.top + lti_offset, + InnerRect.left + 2 * width, InnerRect.bottom - lbi_offset ); + FillRect( hdc, &fill_rect, lti_brush ); } - SelectObject(hdc, RBInnerPen); if(uFlags & BF_BOTTOM) { - MoveToEx(hdc, InnerRect.left+LBpenplus, InnerRect.bottom-2, NULL); - LineTo(hdc, InnerRect.right-RBpenplus, InnerRect.bottom-2); + SetRect( &fill_rect, InnerRect.left + lbi_offset, InnerRect.bottom - 2 * width, + InnerRect.right - rbi_offset, InnerRect.bottom - width ); + FillRect( hdc, &fill_rect, rbi_brush ); } if(uFlags & BF_RIGHT) { - MoveToEx(hdc, InnerRect.right-2, InnerRect.top+RTpenplus, NULL); - LineTo(hdc, InnerRect.right-2, InnerRect.bottom-RBpenplus); + SetRect( &fill_rect, InnerRect.right - 2 * width, InnerRect.top + rti_offset, + InnerRect.right - width, InnerRect.bottom - rbi_offset ); + FillRect( hdc, &fill_rect, rbi_brush ); } if( ((uFlags & BF_MIDDLE) && retval) || (uFlags & BF_ADJUST) ) { - int add = (LTRBInnerMono[uType & (BDR_INNER|BDR_OUTER)] != -1 ? 1 : 0) - + (LTRBOuterMono[uType & (BDR_INNER|BDR_OUTER)] != -1 ? 1 : 0); + int add = (LTRBInnerMono[uType & (BDR_INNER|BDR_OUTER)] != -1 ? width : 0) + + (LTRBOuterMono[uType & (BDR_INNER|BDR_OUTER)] != -1 ? width : 0); if(uFlags & BF_LEFT) InnerRect.left += add; if(uFlags & BF_RIGHT) InnerRect.right -= add; @@ -592,9 +587,6 @@ static BOOL UITOOLS95_DrawRectEdge(HDC hdc, LPRECT rc, *rc = InnerRect; } - /* Cleanup */ - SelectObject(hdc, SavePen); - MoveToEx(hdc, SavePoint.x, SavePoint.y, NULL); return retval; } @@ -609,7 +601,7 @@ BOOL WINAPI DrawEdge( HDC hdc, LPRECT rc, UINT edge, UINT flags ) if(flags & BF_DIAGONAL) return UITOOLS95_DrawDiagEdge(hdc, rc, edge, flags); else - return UITOOLS95_DrawRectEdge(hdc, rc, edge, flags); + return UITOOLS95_DrawRectEdge(hdc, rc, edge, flags, 1); } @@ -683,9 +675,9 @@ static BOOL UITOOLS95_DFC_ButtonPush(HDC dc, LPRECT r, UINT uFlags) if(uFlags & DFCS_CHECKED) { if(uFlags & DFCS_MONO) - UITOOLS95_DrawRectEdge(dc, &myr, edge, BF_MONO|BF_RECT|BF_ADJUST); + UITOOLS95_DrawRectEdge(dc, &myr, edge, BF_MONO|BF_RECT|BF_ADJUST, 1); else - UITOOLS95_DrawRectEdge(dc, &myr, edge, (uFlags&DFCS_FLAT)|BF_RECT|BF_SOFT|BF_ADJUST); + UITOOLS95_DrawRectEdge(dc, &myr, edge, (uFlags&DFCS_FLAT)|BF_RECT|BF_SOFT|BF_ADJUST, 1); if (!(uFlags & DFCS_TRANSPARENT)) UITOOLS_DrawCheckedRect( dc, &myr ); @@ -694,13 +686,14 @@ static BOOL UITOOLS95_DFC_ButtonPush(HDC dc, LPRECT r, UINT uFlags) { if(uFlags & DFCS_MONO) { - UITOOLS95_DrawRectEdge(dc, &myr, edge, BF_MONO|BF_RECT|BF_ADJUST); + UITOOLS95_DrawRectEdge(dc, &myr, edge, BF_MONO|BF_RECT|BF_ADJUST, 1); if (!(uFlags & DFCS_TRANSPARENT)) FillRect(dc, &myr, GetSysColorBrush(COLOR_BTNFACE)); } else { - UITOOLS95_DrawRectEdge(dc, r, edge, (uFlags & DFCS_FLAT) | ((uFlags & DFCS_TRANSPARENT) ? 0 : BF_MIDDLE) | BF_RECT | BF_SOFT); + UITOOLS95_DrawRectEdge(dc, r, edge, (uFlags & DFCS_FLAT) | + ((uFlags & DFCS_TRANSPARENT) ? 0 : BF_MIDDLE) | BF_RECT | BF_SOFT, 1); } } @@ -732,7 +725,7 @@ static BOOL UITOOLS95_DFC_ButtonCheck(HDC dc, LPRECT r, UINT uFlags) if(uFlags & DFCS_FLAT) flags |= BF_FLAT; else if(uFlags & DFCS_MONO) flags |= BF_MONO; - UITOOLS95_DrawRectEdge( dc, &myr, EDGE_SUNKEN, flags ); + UITOOLS95_DrawRectEdge( dc, &myr, EDGE_SUNKEN, flags, max( (myr.right - myr.left + 8) / 16, 1) ); if (!(uFlags & DFCS_TRANSPARENT)) { @@ -1023,7 +1016,7 @@ static BOOL UITOOLS95_DrawFrameScroll(HDC dc, LPRECT r, UINT uFlags) case DFCS_SCROLLSIZEGRIP: /* This one breaks the flow... */ - UITOOLS95_DrawRectEdge(dc, r, EDGE_BUMP, BF_MIDDLE | ((uFlags&(DFCS_MONO|DFCS_FLAT)) ? BF_MONO : 0)); + UITOOLS95_DrawRectEdge(dc, r, EDGE_BUMP, BF_MIDDLE | ((uFlags&(DFCS_MONO|DFCS_FLAT)) ? BF_MONO : 0), 1); hpsave = SelectObject(dc, GetStockObject(NULL_PEN)); hbsave = SelectObject(dc, GetStockObject(NULL_BRUSH)); if(uFlags & (DFCS_MONO|DFCS_FLAT)) @@ -1104,7 +1097,7 @@ static BOOL UITOOLS95_DrawFrameScroll(HDC dc, LPRECT r, UINT uFlags) if( ! (uFlags & (0xff00 & ~DFCS_ADJUSTRECT)) ) /* UITOOLS95_DFC_ButtonPush always uses BF_SOFT which we don't */ /* want for the normal scroll-arrow button. */ - UITOOLS95_DrawRectEdge( dc, r, EDGE_RAISED, (uFlags&DFCS_ADJUSTRECT) | BF_MIDDLE | BF_RECT); + UITOOLS95_DrawRectEdge( dc, r, EDGE_RAISED, (uFlags&DFCS_ADJUSTRECT) | BF_MIDDLE | BF_RECT, 1); else UITOOLS95_DFC_ButtonPush(dc, r, (uFlags & 0xff00) );

1 0

Keno Fischer : ntdll: Tolerate null handle in DeregisterWait.
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: master Commit: 90173ce448e5afe55627c2cbece28fb4f6bae99d URL: http://source.winehq.org/git/wine.git/?a=commit;h=90173ce448e5afe55627c2cbe… Author: Keno Fischer <keno(a)juliacomputing.com> Date: Fri Aug 19 17:24:44 2016 -0400 ntdll: Tolerate null handle in DeregisterWait. Signed-off-by: Keno Fischer <keno(a)juliacomputing.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/thread.c | 4 ++++ dlls/ntdll/threadpool.c | 3 +++ 2 files changed, 7 insertions(+) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index a9a04df..0a5f0d3 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -1245,6 +1245,10 @@ static void test_RegisterWaitForSingleObject(void) ret = pUnregisterWait(wait_handle); ok(ret, "UnregisterWait failed with error %d\n", GetLastError()); + + ret = pUnregisterWait(0); + ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, + "UnregisterWait failed with unexpected error %d\n", GetLastError()); } static DWORD LS_main; diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 04790aa..173e865 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -637,6 +637,9 @@ NTSTATUS WINAPI RtlDeregisterWaitEx(HANDLE WaitHandle, HANDLE CompletionEvent) TRACE( "(%p)\n", WaitHandle ); + if (WaitHandle == NULL) + return STATUS_INVALID_HANDLE; + NtSetEvent( wait_work_item->CancelEvent, NULL ); if (wait_work_item->CallbackInProgress) {

1 0

Huw Davies : user32: The offset between the button and the text is half the digit width.
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: master Commit: b0ec8a6675d4e49f4b779137328abb62b21ffa08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0ec8a6675d4e49f4b7791373… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Aug 22 08:58:30 2016 +0100 user32: The offset between the button and the text is half the digit width. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/button.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index 5ed9c92..b8a1cee 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -851,7 +851,7 @@ static void CB_Paint( HWND hwnd, HDC hDC, UINT action ) { RECT rbox, rtext, client; HBRUSH hBrush; - int delta; + int delta, text_offset; UINT dtFlags; HFONT hFont; LONG state = get_button_state( hwnd ); @@ -869,6 +869,8 @@ static void CB_Paint( HWND hwnd, HDC hDC, UINT action ) rbox = rtext = client; if ((hFont = get_button_font( hwnd ))) SelectObject( hDC, hFont ); + GetCharWidthW( hDC, '0', '0', &text_offset ); + text_offset /= 2; parent = GetParent(hwnd); if (!parent) parent = hwnd; @@ -881,14 +883,12 @@ static void CB_Paint( HWND hwnd, HDC hDC, UINT action ) if (style & BS_LEFTTEXT) { - /* magic +4 is what CTL3D expects */ - - rtext.right -= checkBoxWidth + 4; + rtext.right -= checkBoxWidth + text_offset; rbox.left = rbox.right - checkBoxWidth; } else { - rtext.left += checkBoxWidth + 4; + rtext.left += checkBoxWidth + text_offset; rbox.right = checkBoxWidth; }

1 0

Józef Kucia : d3d10core/tests: Modify existing test to cover case-insensitive input elements matching.
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: master Commit: e7a568259c4e517e7c45a9eafcda3e9402f3b74b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7a568259c4e517e7c45a9eaf… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Aug 21 23:18:00 2016 +0200 d3d10core/tests: Modify existing test to cover case-insensitive input elements matching. 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/d3d10core/tests/device.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 43abcf7..625928c 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -6157,17 +6157,18 @@ static void test_il_append_aligned(void) DWORD color; HRESULT hr; + /* Semantic names are case-insensitive. */ static const D3D10_INPUT_ELEMENT_DESC layout_desc[] = { - {"COLOR", 2, DXGI_FORMAT_R32G32_FLOAT, 1, D3D10_APPEND_ALIGNED_ELEMENT, + {"CoLoR", 2, DXGI_FORMAT_R32G32_FLOAT, 1, D3D10_APPEND_ALIGNED_ELEMENT, D3D10_INPUT_PER_INSTANCE_DATA, 2}, - {"COLOR", 3, DXGI_FORMAT_R32G32_FLOAT, 2, D3D10_APPEND_ALIGNED_ELEMENT, + {"ColoR", 3, DXGI_FORMAT_R32G32_FLOAT, 2, D3D10_APPEND_ALIGNED_ELEMENT, D3D10_INPUT_PER_INSTANCE_DATA, 1}, {"POSITION", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, D3D10_APPEND_ALIGNED_ELEMENT, D3D10_INPUT_PER_VERTEX_DATA, 0}, - {"COLOR", 0, DXGI_FORMAT_R32G32_FLOAT, 2, D3D10_APPEND_ALIGNED_ELEMENT, + {"ColoR", 0, DXGI_FORMAT_R32G32_FLOAT, 2, D3D10_APPEND_ALIGNED_ELEMENT, D3D10_INPUT_PER_INSTANCE_DATA, 1}, - {"COLOR", 1, DXGI_FORMAT_R32G32_FLOAT, 1, D3D10_APPEND_ALIGNED_ELEMENT, + {"cOLOr", 1, DXGI_FORMAT_R32G32_FLOAT, 1, D3D10_APPEND_ALIGNED_ELEMENT, D3D10_INPUT_PER_INSTANCE_DATA, 2}, }; static const DWORD vs_code[] =

1 0

Józef Kucia : d3d11/tests: Modify existing test to cover case-insensitive input elements matching.
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: master Commit: 04de570cd024596285ec068ef1d0e4a51fb8df7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=04de570cd024596285ec068ef… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Aug 21 23:17:59 2016 +0200 d3d11/tests: Modify existing test to cover case-insensitive input elements matching. 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 | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 115600b..8624ef5 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -6420,17 +6420,18 @@ static void test_il_append_aligned(void) DWORD color; HRESULT hr; + /* Semantic names are case-insensitive. */ static const D3D11_INPUT_ELEMENT_DESC layout_desc[] = { - {"COLOR", 2, DXGI_FORMAT_R32G32_FLOAT, 1, D3D11_APPEND_ALIGNED_ELEMENT, + {"CoLoR", 2, DXGI_FORMAT_R32G32_FLOAT, 1, D3D11_APPEND_ALIGNED_ELEMENT, D3D11_INPUT_PER_INSTANCE_DATA, 2}, - {"COLOR", 3, DXGI_FORMAT_R32G32_FLOAT, 2, D3D11_APPEND_ALIGNED_ELEMENT, + {"ColoR", 3, DXGI_FORMAT_R32G32_FLOAT, 2, D3D11_APPEND_ALIGNED_ELEMENT, D3D11_INPUT_PER_INSTANCE_DATA, 1}, {"POSITION", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, D3D11_APPEND_ALIGNED_ELEMENT, D3D11_INPUT_PER_VERTEX_DATA, 0}, - {"COLOR", 0, DXGI_FORMAT_R32G32_FLOAT, 2, D3D11_APPEND_ALIGNED_ELEMENT, + {"ColoR", 0, DXGI_FORMAT_R32G32_FLOAT, 2, D3D11_APPEND_ALIGNED_ELEMENT, D3D11_INPUT_PER_INSTANCE_DATA, 1}, - {"COLOR", 1, DXGI_FORMAT_R32G32_FLOAT, 1, D3D11_APPEND_ALIGNED_ELEMENT, + {"cOLOr", 1, DXGI_FORMAT_R32G32_FLOAT, 1, D3D11_APPEND_ALIGNED_ELEMENT, D3D11_INPUT_PER_INSTANCE_DATA, 2}, }; static const DWORD vs_code[] =

1 0

Józef Kucia : d3d11: Compare semantic names ignoring case.
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: master Commit: ce63bd29457e42edb501df8104aff9435e1e1cb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce63bd29457e42edb501df810… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Aug 21 23:17:58 2016 +0200 d3d11: Compare semantic names ignoring case. 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/inputlayout.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/d3d11/inputlayout.c b/dlls/d3d11/inputlayout.c index 69ef985..7604f05 100644 --- a/dlls/d3d11/inputlayout.c +++ b/dlls/d3d11/inputlayout.c @@ -44,11 +44,10 @@ static HRESULT d3d11_input_layout_to_wined3d_declaration(const D3D11_INPUT_ELEME struct wined3d_vertex_element **wined3d_elements) { struct wined3d_shader_signature is; + unsigned int i; HRESULT hr; - UINT i; - hr = parse_dxbc(shader_byte_code, shader_byte_code_length, isgn_handler, &is); - if (FAILED(hr)) + if (FAILED(hr = parse_dxbc(shader_byte_code, shader_byte_code_length, isgn_handler, &is))) { ERR("Failed to parse input signature.\n"); return E_FAIL; @@ -65,7 +64,7 @@ static HRESULT d3d11_input_layout_to_wined3d_declaration(const D3D11_INPUT_ELEME { struct wined3d_vertex_element *e = &(*wined3d_elements)[i]; const D3D11_INPUT_ELEMENT_DESC *f = &element_descs[i]; - UINT j; + unsigned int j; e->format = wined3dformat_from_dxgi_format(f->Format); e->input_slot = f->InputSlot; @@ -79,13 +78,16 @@ static HRESULT d3d11_input_layout_to_wined3d_declaration(const D3D11_INPUT_ELEME for (j = 0; j < is.element_count; ++j) { - if (!strcmp(element_descs[i].SemanticName, is.elements[j].semantic_name) + if (!strcasecmp(element_descs[i].SemanticName, is.elements[j].semantic_name) && element_descs[i].SemanticIndex == is.elements[j].semantic_idx) { e->output_slot = is.elements[j].register_idx; break; } } + + if (e->output_slot == WINED3D_OUTPUT_SLOT_UNUSED) + WARN("Unused input element %u.\n", i); } shader_free_signature(&is);

1 0

Alexandre Julliard : user32: Get rid of the CLIPBOARDINFO structure.
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: master Commit: 67ee1d3fd8659aa4ac32021de9381feeb284addf URL: http://source.winehq.org/git/wine.git/?a=commit;h=67ee1d3fd8659aa4ac32021de… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 22 20:22:52 2016 +0900 user32: Get rid of the CLIPBOARDINFO structure. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/clipboard.c | 43 +++++++++++-------------------------------- 1 file changed, 11 insertions(+), 32 deletions(-) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index dcb3172..454d035 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -55,15 +55,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(clipboard); -#define CF_REGFORMATBASE 0xC000 - -typedef struct -{ - HWND hWndOpen; - HWND hWndOwner; - UINT flags; -} CLIPBOARDINFO, *LPCLIPBOARDINFO; - /* * Indicates if data has changed since open. */ @@ -71,26 +62,19 @@ static BOOL bCBHasChanged = FALSE; /************************************************************************** - * CLIPBOARD_GetClipboardInfo + * get_clipboard_flags */ -static BOOL CLIPBOARD_GetClipboardInfo(LPCLIPBOARDINFO cbInfo) +static UINT get_clipboard_flags(void) { - BOOL bRet; + UINT ret = 0; SERVER_START_REQ( set_clipboard_info ) { - req->flags = 0; - - if (((bRet = !wine_server_call_err( req )))) - { - cbInfo->hWndOpen = wine_server_ptr_handle( reply->old_clipboard ); - cbInfo->hWndOwner = wine_server_ptr_handle( reply->old_owner ); - cbInfo->flags = reply->flags; - } + if (!wine_server_call_err( req )) ret = reply->flags; } SERVER_END_REQ; - return bRet; + return ret; } @@ -353,8 +337,8 @@ BOOL WINAPI ChangeClipboardChain( HWND hwnd, HWND next ) */ HANDLE WINAPI SetClipboardData(UINT wFormat, HANDLE hData) { - CLIPBOARDINFO cbinfo; HANDLE hResult = 0; + UINT flags; TRACE("(%04X, %p) !\n", wFormat, hData); @@ -366,14 +350,14 @@ HANDLE WINAPI SetClipboardData(UINT wFormat, HANDLE hData) /* If it's not owned, data can only be set if the format isn't available and its rendering is not delayed */ - if (!CLIPBOARD_GetClipboardInfo(&cbinfo) || - (!(cbinfo.flags & CB_OWNER) && !hData)) + flags = get_clipboard_flags(); + if (!(flags & CB_OWNER) && !hData) { WARN("Clipboard not owned by calling task. Operation failed.\n"); return 0; } - if (USER_Driver->pSetClipboardData(wFormat, hData, cbinfo.flags & CB_OWNER)) + if (USER_Driver->pSetClipboardData(wFormat, hData, flags & CB_OWNER)) { hResult = hData; bCBHasChanged = TRUE; @@ -399,12 +383,9 @@ INT WINAPI CountClipboardFormats(void) */ UINT WINAPI EnumClipboardFormats(UINT wFormat) { - CLIPBOARDINFO cbinfo; - TRACE("(%04X)\n", wFormat); - if (!CLIPBOARD_GetClipboardInfo(&cbinfo) || - (~cbinfo.flags & CB_OPEN)) + if (!(get_clipboard_flags() & CB_OPEN)) { WARN("Clipboard not opened by calling task.\n"); SetLastError(ERROR_CLIPBOARD_NOT_OPEN); @@ -431,12 +412,10 @@ BOOL WINAPI IsClipboardFormatAvailable(UINT wFormat) HANDLE WINAPI GetClipboardData(UINT wFormat) { HANDLE hData = 0; - CLIPBOARDINFO cbinfo; TRACE("%04x\n", wFormat); - if (!CLIPBOARD_GetClipboardInfo(&cbinfo) || - (~cbinfo.flags & CB_OPEN)) + if (!(get_clipboard_flags() & CB_OPEN)) { WARN("Clipboard not opened by calling task.\n"); SetLastError(ERROR_CLIPBOARD_NOT_OPEN);

1 0

Alexandre Julliard : server: Add separate requests for opening and closing the clipboard.
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: master Commit: 7258793169e34a1efc239f01b6e99b1d338a8b6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7258793169e34a1efc239f01b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 22 15:31:21 2016 +0900 server: Add separate requests for opening and closing the clipboard. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/clipboard.c | 43 +++++++++--------------- include/wine/server_protocol.h | 40 +++++++++++++++++++--- server/clipboard.c | 76 +++++++++++++++++++++++------------------- server/protocol.def | 21 +++++++++--- server/request.h | 21 +++++++++--- server/trace.c | 29 ++++++++++++++-- 6 files changed, 153 insertions(+), 77 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7258793169e34a1efc239…

1 0

Andrew Eikum : mshtml: Don't crash creating a URI if we have no document.
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: master Commit: 22783dfef88acd506587ce183f8e9f791c31aa70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22783dfef88acd506587ce183… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Aug 19 08:27:20 2016 -0500 mshtml: Don't crash creating a URI if we have no document. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsio.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 88164d0..0e2a748 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -3463,7 +3463,8 @@ HRESULT create_doc_uri(HTMLOuterWindow *window, IUri *iuri, nsWineURI **ret) nsWineURI *uri; nsresult nsres; - nsres = create_nsuri(iuri, window, window->doc_obj->nscontainer, NULL, &uri); + nsres = create_nsuri(iuri, window, window->doc_obj ? window->doc_obj->nscontainer : NULL, + NULL, &uri); if(NS_FAILED(nsres)) return E_FAIL;

1 0