March 2017 - Wine-commits - list.winehq.org

Huw Davies : user32: Store the item rects as relative to the items_rect.
by Alexandre Julliard 29 Mar '17

29 Mar '17

Module: wine Branch: master Commit: 1bdd12f493f3eee56033f5d730a57b6122ed2854 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bdd12f493f3eee56033f5d73… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 29 10:42:03 2017 +0100 user32: Store the item rects as relative to the items_rect. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/menu.c | 82 ++++++++++++++++++++++++++---------------------------- 1 file changed, 40 insertions(+), 42 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index dafa996..da0e54b 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -76,7 +76,8 @@ typedef struct { LPWSTR dwTypeData; /* depends on fMask */ HBITMAP hbmpItem; /* bitmap */ /* ----------- Wine stuff ----------- */ - RECT rect; /* Item area (relative to menu window) */ + RECT rect; /* Item area (relative to the items_rect). + * See MENU_AdjustMenuItemRect(). */ UINT xTab; /* X position of text after Tab */ SIZE bmpsize; /* size needed for the HBMMENU_CALLBACK * bitmap */ @@ -706,13 +707,9 @@ static void MENU_FreeItemData( MENUITEM* item ) static void MENU_AdjustMenuItemRect(const POPUPMENU *menu, LPRECT rect) { - if (menu->bScrolling) - { - UINT arrow_height; + INT scroll_offset = menu->bScrolling ? menu->nScrollPos : 0; - arrow_height = get_scroll_arrow_height( menu ); - OffsetRect( rect, 0, arrow_height - menu->nScrollPos ); - } + OffsetRect( rect, menu->items_rect.left, menu->items_rect.top - scroll_offset ); } @@ -1174,7 +1171,7 @@ static void MENU_PopupMenuCalcSize( LPPOPUPMENU lppop ) int orgX, orgY, maxTab, maxTabWidth, maxHeight; lppop->Width = lppop->Height = 0; - SetRect(&lppop->items_rect, MENU_MARGIN, MENU_MARGIN, MENU_MARGIN, MENU_MARGIN); + SetRectEmpty(&lppop->items_rect); if (lppop->nItems == 0) return; hdc = GetDC( 0 ); @@ -1230,7 +1227,8 @@ static void MENU_PopupMenuCalcSize( LPPOPUPMENU lppop ) * of the bitmaps */ if( !textandbmp) lppop->textOffset = 0; - /* space for 3d border */ + /* space for the border */ + OffsetRect(&lppop->items_rect, MENU_MARGIN, MENU_MARGIN); lppop->Height = lppop->items_rect.bottom + MENU_MARGIN; lppop->Width = lppop->items_rect.right + MENU_MARGIN; @@ -1267,22 +1265,22 @@ static void MENU_MenuBarCalcSize( HDC hdc, LPRECT lprect, { MENUITEM *lpitem; UINT start, i, helpPos; - int orgX, orgY, maxY; + int orgX, orgY; if ((lprect == NULL) || (lppop == NULL)) return; if (lppop->nItems == 0) return; TRACE("lprect %p %s\n", lprect, wine_dbgstr_rect( lprect)); - lppop->Width = lprect->right - lprect->left; - lppop->Height = 0; - maxY = lprect->top+1; + /* Start with a 1 pixel top border. + This corresponds to the difference between SM_CYMENU and SM_CYMENUSIZE. */ + SetRect(&lppop->items_rect, 0, 0, lprect->right - lprect->left, 1); start = 0; helpPos = ~0U; lppop->textOffset = 0; while (start < lppop->nItems) { lpitem = &lppop->items[start]; - orgX = lprect->left; - orgY = maxY; + orgX = lppop->items_rect.left; + orgY = lppop->items_rect.bottom; /* Parse items until line break or end of menu */ for (i = start; i < lppop->nItems; i++, lpitem++) @@ -1295,29 +1293,30 @@ static void MENU_MenuBarCalcSize( HDC hdc, LPRECT lprect, debug_print_menuitem (" item: ", lpitem, ""); MENU_CalcItemSize( hdc, lpitem, hwndOwner, orgX, orgY, TRUE, lppop ); - if (lpitem->rect.right > lprect->right) + if (lpitem->rect.right > lppop->items_rect.right) { if (i != start) break; - else lpitem->rect.right = lprect->right; + else lpitem->rect.right = lppop->items_rect.right; } - maxY = max( maxY, lpitem->rect.bottom ); + lppop->items_rect.bottom = max( lppop->items_rect.bottom, lpitem->rect.bottom ); orgX = lpitem->rect.right; } /* Finish the line (set all items to the largest height found) */ - while (start < i) lppop->items[start++].rect.bottom = maxY; + while (start < i) lppop->items[start++].rect.bottom = lppop->items_rect.bottom; } - lprect->bottom = maxY; - lppop->Height = lprect->bottom - lprect->top; - lppop->items_rect = *lprect; + OffsetRect(&lppop->items_rect, lprect->left, lprect->top); + lppop->Width = lppop->items_rect.right - lppop->items_rect.left; + lppop->Height = lppop->items_rect.bottom - lppop->items_rect.top; + lprect->bottom = lppop->items_rect.bottom; /* Flush right all items between the MF_RIGHTJUSTIFY and */ /* the last item (if several lines, only move the last line) */ if (helpPos == ~0U) return; lpitem = &lppop->items[lppop->nItems-1]; orgY = lpitem->rect.top; - orgX = lprect->right; + orgX = lprect->right - lprect->left; for (i = lppop->nItems - 1; i >= helpPos; i--, lpitem--) { if (lpitem->rect.top != orgY) break; /* Other line */ if (lpitem->rect.right >= orgX) break; /* Too far right already */ @@ -1945,17 +1944,15 @@ MENU_EnsureMenuItemVisible(LPPOPUPMENU lppop, UINT wIndex, HDC hdc) const RECT *rc = &lppop->items_rect; UINT scroll_height = rc->bottom - rc->top; - /* NB the item rects include the MENU_MARGIN offset (so the first rect has - top == MENU_TOP_MARGIN) */ - if (item->rect.bottom - MENU_MARGIN > lppop->nScrollPos + scroll_height) + if (item->rect.bottom > lppop->nScrollPos + scroll_height) { - lppop->nScrollPos = item->rect.bottom - MENU_MARGIN - scroll_height; + lppop->nScrollPos = item->rect.bottom - scroll_height; ScrollWindow(lppop->hWnd, 0, nOldPos - lppop->nScrollPos, rc, rc); MENU_DrawScrollArrows(lppop, hdc); } - else if (item->rect.top - MENU_MARGIN < lppop->nScrollPos) + else if (item->rect.top < lppop->nScrollPos) { - lppop->nScrollPos = item->rect.top - MENU_MARGIN; + lppop->nScrollPos = item->rect.top; ScrollWindow(lppop->hWnd, 0, nOldPos - lppop->nScrollPos, rc, rc); MENU_DrawScrollArrows(lppop, hdc); } @@ -2360,32 +2357,32 @@ static HMENU MENU_ShowSubPopup( HWND hwndOwner, HMENU hmenu, } else { + RECT item_rect = item->rect; + + MENU_AdjustMenuItemRect(menu, &item_rect); GetWindowRect( menu->hWnd, &rect ); + if (menu->wFlags & MF_POPUP) { - RECT rc = item->rect; - - MENU_AdjustMenuItemRect(menu, &rc); - /* The first item in the popup menu has to be at the same y position as the focused menu item */ if (wFlags & TPM_LAYOUTRTL) rect.left += GetSystemMetrics(SM_CXBORDER); else - rect.left += rc.right - GetSystemMetrics(SM_CXBORDER); - rect.top += rc.top - MENU_MARGIN; - rect.right = rc.left - rc.right + GetSystemMetrics(SM_CXBORDER); - rect.bottom = rc.top - rc.bottom - 2 * MENU_MARGIN; + rect.left += item_rect.right - GetSystemMetrics(SM_CXBORDER); + rect.top += item_rect.top - MENU_MARGIN; + rect.right = item_rect.left - item_rect.right + GetSystemMetrics(SM_CXBORDER); + rect.bottom = item_rect.top - item_rect.bottom - 2 * MENU_MARGIN; } else { if (wFlags & TPM_LAYOUTRTL) - rect.left = rect.right - item->rect.left; + rect.left = rect.right - item_rect.left; else - rect.left += item->rect.left; - rect.top += item->rect.bottom; - rect.right = item->rect.right - item->rect.left; - rect.bottom = item->rect.bottom - item->rect.top; + rect.left += item_rect.left; + rect.top += item_rect.bottom; + rect.right = item_rect.right - item_rect.left; + rect.bottom = item_rect.bottom - item_rect.top; } } @@ -5118,6 +5115,7 @@ BOOL WINAPI GetMenuItemRect(HWND hwnd, HMENU hMenu, UINT uItem, RECT *rect) *rect = item->rect; + OffsetRect(rect, menu->items_rect.left, menu->items_rect.top); MapWindowPoints(hwnd, 0, (POINT *)rect, 2); return TRUE;

1 0

Huw Davies : user32: Clip painting to the items_rect.
by Alexandre Julliard 29 Mar '17

29 Mar '17

Module: wine Branch: master Commit: 79bdeceab44fdea31dd67c03baf13e786001f96d URL: http://source.winehq.org/git/wine.git/?a=commit;h=79bdeceab44fdea31dd67c03b… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 29 10:42:04 2017 +0100 user32: Clip painting to the items_rect. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/menu.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index da0e54b..28222dc 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -1402,6 +1402,7 @@ static void MENU_DrawMenuItem( HWND hwnd, HMENU hmenu, HWND hwndOwner, HDC hdc, UINT arrow_bitmap_width = 0, arrow_bitmap_height = 0; POPUPMENU *menu = MENU_GetMenu(hmenu); RECT bmprc; + HRGN old_clip = NULL, clip; debug_print_menuitem("MENU_DrawMenuItem: ", lpitem, ""); @@ -1450,6 +1451,16 @@ static void MENU_DrawMenuItem( HWND hwnd, HMENU hmenu, HWND hwndOwner, HDC hdc, rect = lpitem->rect; MENU_AdjustMenuItemRect(MENU_GetMenu(hmenu), &rect); + old_clip = CreateRectRgn( 0, 0, 0, 0 ); + if (GetClipRgn( hdc, old_clip ) <= 0) + { + DeleteObject( old_clip ); + old_clip = NULL; + } + clip = CreateRectRgnIndirect( &menu->items_rect ); + ExtSelectClipRgn( hdc, clip, RGN_AND ); + DeleteObject( clip ); + if (lpitem->fType & MF_OWNERDRAW) { /* @@ -1489,10 +1500,10 @@ static void MENU_DrawMenuItem( HWND hwnd, HMENU hmenu, HWND hwndOwner, HDC hdc, if (lpitem->fType & MF_POPUP) draw_popup_arrow( hdc, rect, arrow_bitmap_width, arrow_bitmap_height); - return; + goto done; } - if (menuBar && (lpitem->fType & MF_SEPARATOR)) return; + if (menuBar && (lpitem->fType & MF_SEPARATOR)) goto done; if (lpitem->fState & MF_HILITE) { @@ -1554,7 +1565,7 @@ static void MENU_DrawMenuItem( HWND hwnd, HMENU hmenu, HWND hwndOwner, HDC hdc, } else DrawEdge (hdc, &rc, EDGE_ETCHED, BF_TOP); - return; + goto done; } /* helper lines for debugging */ @@ -1736,6 +1747,10 @@ static void MENU_DrawMenuItem( HWND hwnd, HMENU hmenu, HWND hwndOwner, HDC hdc, if (hfontOld) SelectObject (hdc, hfontOld); } + +done: + ExtSelectClipRgn( hdc, old_clip, RGN_COPY ); + if (old_clip) DeleteObject( old_clip ); }

1 0

Huw Davies : user32: Don' t fill the background when drawing the scroll arrows.
by Alexandre Julliard 29 Mar '17

29 Mar '17

Module: wine Branch: master Commit: bd785a5ac0de154099dc9be959d23b8500132c84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd785a5ac0de154099dc9be95… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 29 10:42:05 2017 +0100 user32: Don't fill the background when drawing the scroll arrows. This is done, in the correct colour, in MENU_DrawPopupMenu(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/menu.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 28222dc..58bfe68 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -1339,7 +1339,6 @@ MENU_DrawScrollArrows(const POPUPMENU *lppop, HDC hdc) HBITMAP hOrigBitmap; UINT arrow_bitmap_width, arrow_bitmap_height; BITMAP bmp; - RECT rect; GetObjectW(get_down_arrow_bitmap(), sizeof(bmp), &bmp); arrow_bitmap_width = bmp.bmWidth; @@ -1350,13 +1349,8 @@ MENU_DrawScrollArrows(const POPUPMENU *lppop, HDC hdc) hOrigBitmap = SelectObject(hdcMem, get_up_arrow_bitmap()); else hOrigBitmap = SelectObject(hdcMem, get_up_arrow_inactive_bitmap()); - SetRect(&rect, 0, 0, lppop->Width, arrow_bitmap_height); - FillRect(hdc, &rect, GetSysColorBrush(COLOR_MENU)); BitBlt(hdc, (lppop->Width - arrow_bitmap_width) / 2, 0, arrow_bitmap_width, arrow_bitmap_height, hdcMem, 0, 0, SRCCOPY); - rect.top = lppop->Height - arrow_bitmap_height; - rect.bottom = lppop->Height; - FillRect(hdc, &rect, GetSysColorBrush(COLOR_MENU)); if (lppop->nScrollPos < lppop->nTotalHeight - (MENU_GetMaxPopupHeight(lppop) - 2 * arrow_bitmap_height)) SelectObject(hdcMem, get_down_arrow_bitmap()); else

1 0

Huw Davies : user32: Scale the scroll arrows with the menu's font size.
by Alexandre Julliard 29 Mar '17

29 Mar '17

Module: wine Branch: master Commit: 6abb7db763ef1d343c00a1a36b2c439421ea9ef6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6abb7db763ef1d343c00a1a36… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 29 10:42:06 2017 +0100 user32: Scale the scroll arrows with the menu's font size. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/menu.c | 147 +++++++++++++++++++++++++---------------------------- 1 file changed, 69 insertions(+), 78 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 58bfe68..79bef64 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -362,56 +362,9 @@ static HBITMAP get_arrow_bitmap(void) return arrow_bitmap; } -/*********************************************************************** - * get_down_arrow_bitmap - */ -static HBITMAP get_down_arrow_bitmap(void) -{ - static HBITMAP arrow_bitmap; - - if (!arrow_bitmap) arrow_bitmap = LoadBitmapW(0, MAKEINTRESOURCEW(OBM_DNARROW)); - return arrow_bitmap; -} - -/*********************************************************************** - * get_down_arrow_inactive_bitmap - */ -static HBITMAP get_down_arrow_inactive_bitmap(void) -{ - static HBITMAP arrow_bitmap; - - if (!arrow_bitmap) arrow_bitmap = LoadBitmapW(0, MAKEINTRESOURCEW(OBM_DNARROWI)); - return arrow_bitmap; -} - -/*********************************************************************** - * get_up_arrow_bitmap - */ -static HBITMAP get_up_arrow_bitmap(void) -{ - static HBITMAP arrow_bitmap; - - if (!arrow_bitmap) arrow_bitmap = LoadBitmapW(0, MAKEINTRESOURCEW(OBM_UPARROW)); - return arrow_bitmap; -} - -/*********************************************************************** - * get_up_arrow_inactive_bitmap - */ -static HBITMAP get_up_arrow_inactive_bitmap(void) -{ - static HBITMAP arrow_bitmap; - - if (!arrow_bitmap) arrow_bitmap = LoadBitmapW(0, MAKEINTRESOURCEW(OBM_UPARROWI)); - return arrow_bitmap; -} - static inline UINT get_scroll_arrow_height(const POPUPMENU *menu) { - BITMAP bmp; - - GetObjectW(get_up_arrow_bitmap(), sizeof(bmp), &bmp); - return bmp.bmHeight; + return menucharsize.cy + 4; } /*********************************************************************** @@ -1227,6 +1180,8 @@ static void MENU_PopupMenuCalcSize( LPPOPUPMENU lppop ) * of the bitmaps */ if( !textandbmp) lppop->textOffset = 0; + lppop->nTotalHeight = lppop->items_rect.bottom; + /* space for the border */ OffsetRect(&lppop->items_rect, MENU_MARGIN, MENU_MARGIN); lppop->Height = lppop->items_rect.bottom + MENU_MARGIN; @@ -1234,12 +1189,12 @@ static void MENU_PopupMenuCalcSize( LPPOPUPMENU lppop ) /* Adjust popup height if it exceeds maximum */ maxHeight = MENU_GetMaxPopupHeight(lppop); - lppop->nTotalHeight = lppop->Height - MENU_MARGIN; if (lppop->Height >= maxHeight) { lppop->Height = maxHeight; - lppop->items_rect.top += get_scroll_arrow_height(lppop); - lppop->items_rect.bottom = lppop->Height - MENU_MARGIN - get_scroll_arrow_height(lppop); + /* When the scroll arrows are present, don't add the top/bottom margin as well */ + lppop->items_rect.top += get_scroll_arrow_height(lppop) - MENU_MARGIN; + lppop->items_rect.bottom = lppop->Height - get_scroll_arrow_height(lppop); lppop->bScrolling = TRUE; } else @@ -1326,6 +1281,42 @@ static void MENU_MenuBarCalcSize( HDC hdc, LPRECT lprect, } } +static void draw_scroll_arrow(HDC hdc, int x, int top, int height, BOOL up, BOOL enabled) +{ + RECT rect, light_rect; + HBRUSH brush = GetSysColorBrush( enabled ? COLOR_BTNTEXT : COLOR_BTNSHADOW ); + HBRUSH light = GetSysColorBrush( COLOR_3DLIGHT ); + + if (!up) + { + top = top + height; + if (!enabled) + { + SetRect( &rect, x + 1, top, x + 2, top + 1); + FillRect( hdc, &rect, light ); + } + top--; + } + + SetRect( &rect, x, top, x + 1, top + 1); + while (height--) + { + FillRect( hdc, &rect, brush ); + if (!enabled && !up && height) + { + SetRect( &light_rect, rect.right, rect.top, rect.right + 2, rect.bottom ); + FillRect( hdc, &light_rect, light ); + } + InflateRect( &rect, 1, 0 ); + OffsetRect( &rect, 0, up ? 1 : -1 ); + } + + if (!enabled && up) + { + rect.left += 2; + FillRect( hdc, &rect, light ); + } +} /*********************************************************************** * MENU_DrawScrollArrows @@ -1333,33 +1324,16 @@ static void MENU_MenuBarCalcSize( HDC hdc, LPRECT lprect, * Draw scroll arrows. */ static void -MENU_DrawScrollArrows(const POPUPMENU *lppop, HDC hdc) +MENU_DrawScrollArrows(const POPUPMENU *menu, HDC hdc) { - HDC hdcMem = CreateCompatibleDC(hdc); - HBITMAP hOrigBitmap; - UINT arrow_bitmap_width, arrow_bitmap_height; - BITMAP bmp; + UINT full_height = get_scroll_arrow_height( menu ); + UINT arrow_height = full_height / 3; + BOOL at_end = menu->nScrollPos + menu->items_rect.bottom - menu->items_rect.top == menu->nTotalHeight; - GetObjectW(get_down_arrow_bitmap(), sizeof(bmp), &bmp); - arrow_bitmap_width = bmp.bmWidth; - arrow_bitmap_height = bmp.bmHeight; - - - if (lppop->nScrollPos) - hOrigBitmap = SelectObject(hdcMem, get_up_arrow_bitmap()); - else - hOrigBitmap = SelectObject(hdcMem, get_up_arrow_inactive_bitmap()); - BitBlt(hdc, (lppop->Width - arrow_bitmap_width) / 2, 0, - arrow_bitmap_width, arrow_bitmap_height, hdcMem, 0, 0, SRCCOPY); - if (lppop->nScrollPos < lppop->nTotalHeight - (MENU_GetMaxPopupHeight(lppop) - 2 * arrow_bitmap_height)) - SelectObject(hdcMem, get_down_arrow_bitmap()); - else - SelectObject(hdcMem, get_down_arrow_inactive_bitmap()); - BitBlt(hdc, (lppop->Width - arrow_bitmap_width) / 2, - lppop->Height - arrow_bitmap_height, - arrow_bitmap_width, arrow_bitmap_height, hdcMem, 0, 0, SRCCOPY); - SelectObject(hdcMem, hOrigBitmap); - DeleteDC(hdcMem); + draw_scroll_arrow( hdc, menu->Width / 3, arrow_height, arrow_height, + TRUE, menu->nScrollPos != 0); + draw_scroll_arrow( hdc, menu->Width / 3, menu->Height - 2 * arrow_height, arrow_height, + FALSE, !at_end ); } @@ -1957,13 +1931,30 @@ MENU_EnsureMenuItemVisible(LPPOPUPMENU lppop, UINT wIndex, HDC hdc) { lppop->nScrollPos = item->rect.bottom - scroll_height; ScrollWindow(lppop->hWnd, 0, nOldPos - lppop->nScrollPos, rc, rc); - MENU_DrawScrollArrows(lppop, hdc); } else if (item->rect.top < lppop->nScrollPos) { lppop->nScrollPos = item->rect.top; ScrollWindow(lppop->hWnd, 0, nOldPos - lppop->nScrollPos, rc, rc); - MENU_DrawScrollArrows(lppop, hdc); + } + + /* Invalidate the scroll arrows if necessary */ + if (nOldPos != lppop->nScrollPos) + { + RECT arrow_rect = lppop->items_rect; + if (nOldPos == 0 || lppop->nScrollPos == 0) + { + arrow_rect.top = 0; + arrow_rect.bottom = lppop->items_rect.top; + InvalidateRect(lppop->hWnd, &arrow_rect, FALSE); + } + if (nOldPos + scroll_height == lppop->nTotalHeight || + lppop->nScrollPos + scroll_height == lppop->nTotalHeight) + { + arrow_rect.top = lppop->items_rect.bottom; + arrow_rect.bottom = lppop->Height; + InvalidateRect(lppop->hWnd, &arrow_rect, FALSE); + } } } }

1 0

Jacek Caban : ntdll/tests: Run read tests in all modes and directions.
by Alexandre Julliard 29 Mar '17

29 Mar '17

Module: wine Branch: master Commit: 0d6b783c8045e63b9e801366589c9cf77c5c8bf8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d6b783c8045e63b9e8013665… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 29 14:05:37 2017 +0200 ntdll/tests: Run read tests in all modes and directions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/pipe.c | 57 ++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 44 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index 2ed695d..cfff0e5 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -726,19 +726,39 @@ static void WINAPI apc( void *arg, IO_STATUS_BLOCK *iosb, ULONG reserved ) #define PIPENAME "\\\\.\\pipe\\ntdll_tests_pipe.c" -static BOOL create_pipe_pair( HANDLE *read, HANDLE *write, ULONG flags, ULONG size ) +static BOOL create_pipe_pair( HANDLE *read, HANDLE *write, ULONG flags, ULONG type, ULONG size ) { - *read = CreateNamedPipeA(PIPENAME, PIPE_ACCESS_INBOUND | flags, PIPE_TYPE_BYTE | PIPE_WAIT, - 1, size, size, NMPWAIT_USE_DEFAULT_WAIT, NULL); - ok(*read != INVALID_HANDLE_VALUE, "CreateNamedPipe failed\n"); + const BOOL server_reader = flags & PIPE_ACCESS_INBOUND; + HANDLE client, server; - *write = CreateFileA(PIPENAME, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); - ok(*write != INVALID_HANDLE_VALUE, "CreateFile failed (%d)\n", GetLastError()); + server = CreateNamedPipeA(PIPENAME, flags, PIPE_WAIT | type, + 1, size, size, NMPWAIT_USE_DEFAULT_WAIT, NULL); + ok(server != INVALID_HANDLE_VALUE, "CreateNamedPipe failed\n"); + client = CreateFileA(PIPENAME, server_reader ? GENERIC_WRITE : GENERIC_READ | FILE_WRITE_ATTRIBUTES, 0, + NULL, OPEN_EXISTING, flags & FILE_FLAG_OVERLAPPED, 0); + ok(client != INVALID_HANDLE_VALUE, "CreateFile failed (%d)\n", GetLastError()); + + if(server_reader) + { + *read = server; + *write = client; + } + else + { + if(type & PIPE_READMODE_MESSAGE) + { + DWORD read_mode = PIPE_READMODE_MESSAGE; + ok(SetNamedPipeHandleState(client, &read_mode, NULL, NULL), "Change mode\n"); + } + + *read = client; + *write = server; + } return TRUE; } -static void test_pipe_read(void) +static void read_pipe_test(ULONG pipe_flags, ULONG pipe_type) { IO_STATUS_BLOCK iosb, iosb2; HANDLE handle, read, write; @@ -749,7 +769,7 @@ static void test_pipe_read(void) BOOL ret; NTSTATUS status; - if (!create_pipe_pair( &read, &write, FILE_FLAG_OVERLAPPED, 4096 )) return; + if (!create_pipe_pair( &read, &write, FILE_FLAG_OVERLAPPED | pipe_flags, pipe_type, 4096 )) return; /* try read with no data */ U(iosb).Status = 0xdeadbabe; @@ -872,7 +892,7 @@ static void test_pipe_read(void) ok( !apc_count, "apc was called\n" ); /* disconnect while async read is in progress */ - if (!create_pipe_pair( &read, &write, FILE_FLAG_OVERLAPPED, 4096 )) return; + if (!create_pipe_pair( &read, &write, FILE_FLAG_OVERLAPPED | pipe_flags, pipe_type, 4096 )) return; apc_count = 0; U(iosb).Status = 0xdeadbabe; iosb.Information = 0xdeadbeef; @@ -884,6 +904,7 @@ static void test_pipe_read(void) ok( !apc_count, "apc was called\n" ); CloseHandle( write ); Sleep(1); /* FIXME: needed for wine to run the i/o apc */ + todo_wine_if(!(pipe_type & PIPE_TYPE_MESSAGE) && (pipe_flags & PIPE_ACCESS_OUTBOUND)) ok( U(iosb).Status == STATUS_PIPE_BROKEN, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == 0, "wrong info %lu\n", iosb.Information ); ok( is_signaled( event ), "event is not signaled\n" ); @@ -892,7 +913,7 @@ static void test_pipe_read(void) ok( apc_count == 1, "apc was not called\n" ); CloseHandle( read ); - if (!create_pipe_pair( &read, &write, FILE_FLAG_OVERLAPPED, 4096 )) return; + if (!create_pipe_pair( &read, &write, FILE_FLAG_OVERLAPPED | pipe_flags, pipe_type, 4096 )) return; ret = DuplicateHandle(GetCurrentProcess(), read, GetCurrentProcess(), &handle, 0, TRUE, DUPLICATE_SAME_ACCESS); ok(ret, "Failed to duplicate handle: %d\n", GetLastError()); @@ -947,7 +968,7 @@ static void test_pipe_read(void) if (pNtCancelIoFileEx) { /* Basic Cancel Ex */ - if (!create_pipe_pair( &read, &write, FILE_FLAG_OVERLAPPED, 4096 )) return; + if (!create_pipe_pair( &read, &write, FILE_FLAG_OVERLAPPED | pipe_flags, pipe_type, 4096 )) return; apc_count = 0; U(iosb).Status = 0xdeadbabe; @@ -1030,6 +1051,16 @@ START_TEST(pipe) trace("starting cancelio tests\n"); test_cancelio(); - trace("starting read tests\n"); - test_pipe_read(); + trace("starting byte read in byte mode client -> server\n"); + read_pipe_test(PIPE_ACCESS_INBOUND, PIPE_TYPE_BYTE); + trace("starting byte read in message mode client -> server\n"); + read_pipe_test(PIPE_ACCESS_INBOUND, PIPE_TYPE_MESSAGE); + trace("starting message read in message mode client -> server\n"); + read_pipe_test(PIPE_ACCESS_INBOUND, PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE); + trace("starting byte read in byte mode server -> client\n"); + read_pipe_test(PIPE_ACCESS_OUTBOUND, PIPE_TYPE_BYTE); + trace("starting byte read in message mode server -> client\n"); + read_pipe_test(PIPE_ACCESS_OUTBOUND, PIPE_TYPE_MESSAGE); + trace("starting message read in message mode server -> client\n"); + read_pipe_test(PIPE_ACCESS_OUTBOUND, PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE); }

1 0

Jacek Caban : ntdll/tests: Added tests of partial reads and reads with invalid wait handle.
by Alexandre Julliard 29 Mar '17

29 Mar '17

Module: wine Branch: master Commit: e024094b75df417c9943a154c378d90bcf650f28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e024094b75df417c9943a154c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 29 14:05:47 2017 +0200 ntdll/tests: Added tests of partial reads and reads with invalid wait handle. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/pipe.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index cfff0e5..e242cb4 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -840,6 +840,43 @@ static void read_pipe_test(ULONG pipe_flags, ULONG pipe_type) SleepEx( 1, TRUE ); /* alertable sleep */ ok( apc_count == 1, "apc not called\n" ); + /* now partial read with data ready */ + apc_count = 0; + U(iosb).Status = 0xdeadbabe; + iosb.Information = 0xdeadbeef; + ResetEvent( event ); + ret = WriteFile( write, buffer, 2, &written, NULL ); + ok(ret && written == 2, "WriteFile error %d\n", GetLastError()); + status = NtReadFile( read, event, apc, &apc_count, &iosb, buffer, 1, NULL, NULL ); + if (pipe_type & PIPE_READMODE_MESSAGE) + { + ok( status == STATUS_BUFFER_OVERFLOW, "wrong status %x\n", status ); + ok( U(iosb).Status == STATUS_BUFFER_OVERFLOW, "wrong status %x\n", U(iosb).Status ); + } + else + { + ok( status == STATUS_SUCCESS, "wrong status %x\n", status ); + ok( U(iosb).Status == 0, "wrong status %x\n", U(iosb).Status ); + } + ok( iosb.Information == 1, "wrong info %lu\n", iosb.Information ); + ok( is_signaled( event ), "event is not signaled\n" ); + ok( !apc_count, "apc was called\n" ); + SleepEx( 1, FALSE ); /* non-alertable sleep */ + ok( !apc_count, "apc was called\n" ); + SleepEx( 1, TRUE ); /* alertable sleep */ + ok( apc_count == 1, "apc not called\n" ); + apc_count = 0; + status = NtReadFile( read, event, apc, &apc_count, &iosb, buffer, 1, NULL, NULL ); + ok( status == STATUS_SUCCESS, "wrong status %x\n", status ); + ok( U(iosb).Status == 0, "wrong status %x\n", U(iosb).Status ); + ok( iosb.Information == 1, "wrong info %lu\n", iosb.Information ); + ok( is_signaled( event ), "event is not signaled\n" ); + ok( !apc_count, "apc was called\n" ); + SleepEx( 1, FALSE ); /* non-alertable sleep */ + ok( !apc_count, "apc was called\n" ); + SleepEx( 1, TRUE ); /* alertable sleep */ + ok( apc_count == 1, "apc not called\n" ); + /* try read with no data */ apc_count = 0; U(iosb).Status = 0xdeadbabe; @@ -877,6 +914,19 @@ static void read_pipe_test(ULONG pipe_flags, ULONG pipe_type) ok( !apc_count, "apc was called\n" ); CloseHandle( read ); + /* read from disconnected pipe, with invalid event handle */ + apc_count = 0; + U(iosb).Status = 0xdeadbabe; + iosb.Information = 0xdeadbeef; + status = NtReadFile( read, (HANDLE)0xdeadbeef, apc, &apc_count, &iosb, buffer, 1, NULL, NULL ); + ok( status == STATUS_INVALID_HANDLE, "wrong status %x\n", status ); + ok( U(iosb).Status == 0xdeadbabe, "wrong status %x\n", U(iosb).Status ); + ok( iosb.Information == 0xdeadbeef, "wrong info %lu\n", iosb.Information ); + ok( !apc_count, "apc was called\n" ); + SleepEx( 1, TRUE ); /* alertable sleep */ + ok( !apc_count, "apc was called\n" ); + CloseHandle( read ); + /* read from closed handle */ apc_count = 0; U(iosb).Status = 0xdeadbabe;

1 0

Henri Verbeet : wined3d: Create the logo texture with WINED3D_TEXTURE_CREATE_GET_DC.
by Alexandre Julliard 29 Mar '17

29 Mar '17

Module: wine Branch: master Commit: b5da9ea38294d9bae124291eef2c61de5005d851 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5da9ea38294d9bae124291ee… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 28 23:37:35 2017 +0200 wined3d: Create the logo texture with WINED3D_TEXTURE_CREATE_GET_DC. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b058d45..4f8faa1 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -575,7 +575,8 @@ static void device_load_logo(struct wined3d_device *device, const char *filename desc.height = bm.bmHeight; desc.depth = 1; desc.size = 0; - if (FAILED(hr = wined3d_texture_create(device, &desc, 1, 1, WINED3D_TEXTURE_CREATE_MAPPABLE, + if (FAILED(hr = wined3d_texture_create(device, &desc, 1, 1, + WINED3D_TEXTURE_CREATE_MAPPABLE | WINED3D_TEXTURE_CREATE_GET_DC, NULL, NULL, &wined3d_null_parent_ops, &device->logo_texture))) { ERR("Wine logo requested, but failed to create texture, hr %#x.\n", hr);

1 0

Henri Verbeet : wined3d: Recreate the logo texture if needed in wined3d_device_reset().
by Alexandre Julliard 29 Mar '17

29 Mar '17

Module: wine Branch: master Commit: 74492d78572e99712d4ee6801d3f247469a9f898 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74492d78572e99712d4ee6801… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 28 23:37:36 2017 +0200 wined3d: Recreate the logo texture if needed in wined3d_device_reset(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4f8faa1..d52df27 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4751,6 +4751,8 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, device->update_state = &device->state; device_init_swapchain_state(device, swapchain); + if (wined3d_settings.logo) + device_load_logo(device, wined3d_settings.logo); } else if (device->back_buffer_view) {

1 0

Henri Verbeet : wined3d: Just print a message if loading the logo bitmap failed.
by Alexandre Julliard 29 Mar '17

29 Mar '17

Module: wine Branch: master Commit: b44b2c2dce370b32bc07b1dfe7121cf3604c13a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b44b2c2dce370b32bc07b1dfe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 28 23:37:37 2017 +0200 wined3d: Just print a message if loading the logo bitmap failed. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 51 ++++++++++++++++++--------------------------------- 1 file changed, 18 insertions(+), 33 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d52df27..627a4a7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -35,6 +35,7 @@ #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); +WINE_DECLARE_DEBUG_CHANNEL(winediag); /* Define the default light parameters as specified by MSDN. */ const struct wined3d_light WINED3D_default_light = @@ -547,23 +548,16 @@ static void device_load_logo(struct wined3d_device *device, const char *filename HRESULT hr; HDC dcb = NULL, dcs = NULL; - hbm = LoadImageA(NULL, filename, IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE | LR_CREATEDIBSECTION); - if(hbm) + if (!(hbm = LoadImageA(NULL, filename, IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE | LR_CREATEDIBSECTION))) { - GetObjectA(hbm, sizeof(BITMAP), &bm); - dcb = CreateCompatibleDC(NULL); - if(!dcb) goto out; - SelectObject(dcb, hbm); - } - else - { - /* Create a 32x32 white surface to indicate that wined3d is used, but the specified image - * couldn't be loaded - */ - memset(&bm, 0, sizeof(bm)); - bm.bmWidth = 32; - bm.bmHeight = 32; + ERR_(winediag)("Failed to load logo %s.\n", wine_dbgstr_a(filename)); + return; } + GetObjectA(hbm, sizeof(BITMAP), &bm); + + if (!(dcb = CreateCompatibleDC(NULL))) + goto out; + SelectObject(dcb, hbm); desc.resource_type = WINED3D_RTYPE_TEXTURE_2D; desc.format = WINED3DFMT_B5G6R5_UNORM; @@ -583,27 +577,18 @@ static void device_load_logo(struct wined3d_device *device, const char *filename goto out; } - if (dcb) + if (FAILED(hr = wined3d_texture_get_dc(device->logo_texture, 0, &dcs))) { - if (FAILED(hr = wined3d_texture_get_dc(device->logo_texture, 0, &dcs))) - goto out; - BitBlt(dcs, 0, 0, bm.bmWidth, bm.bmHeight, dcb, 0, 0, SRCCOPY); - wined3d_texture_release_dc(device->logo_texture, 0, dcs); - - color_key.color_space_low_value = 0; - color_key.color_space_high_value = 0; - wined3d_texture_set_color_key(device->logo_texture, WINED3D_CKEY_SRC_BLT, &color_key); + wined3d_texture_decref(device->logo_texture); + device->logo_texture = NULL; + goto out; } - else - { - const struct wined3d_color c = {1.0f, 1.0f, 1.0f, 1.0f}; - const RECT rect = {0, 0, desc.width, desc.height}; - struct wined3d_surface *surface; + BitBlt(dcs, 0, 0, bm.bmWidth, bm.bmHeight, dcb, 0, 0, SRCCOPY); + wined3d_texture_release_dc(device->logo_texture, 0, dcs); - /* Fill the surface with a white color to show that wined3d is there */ - surface = device->logo_texture->sub_resources[0].u.surface; - surface_color_fill(surface, &rect, &c); - } + color_key.color_space_low_value = 0; + color_key.color_space_high_value = 0; + wined3d_texture_set_color_key(device->logo_texture, WINED3D_CKEY_SRC_BLT, &color_key); out: if (dcb) DeleteDC(dcb);

1 0

Henri Verbeet : wined3d: Introduce a separate function for doing colour fills in the CPU blitter.
by Alexandre Julliard 29 Mar '17

29 Mar '17

Module: wine Branch: master Commit: 4bb1565a54507d58a40d1667539deee4c6fd9cce URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bb1565a54507d58a40d16675… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 28 23:37:38 2017 +0200 wined3d: Introduce a separate function for doing colour fills in the CPU blitter. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 159 ++++++++++++++++++++++++++----------------------- 1 file changed, 84 insertions(+), 75 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 135e02d..64f6024 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1454,64 +1454,6 @@ static struct wined3d_texture *surface_convert_format(struct wined3d_texture *sr return dst_texture; } -static HRESULT _Blt_ColorFill(BYTE *buf, unsigned int width, unsigned int height, - unsigned int bpp, UINT pitch, DWORD color) -{ - BYTE *first; - unsigned int x, y; - - /* Do first row */ - -#define COLORFILL_ROW(type) \ -do { \ - type *d = (type *)buf; \ - for (x = 0; x < width; ++x) \ - d[x] = (type)color; \ -} while(0) - - switch (bpp) - { - case 1: - COLORFILL_ROW(BYTE); - break; - - case 2: - COLORFILL_ROW(WORD); - break; - - case 3: - { - BYTE *d = buf; - for (x = 0; x < width; ++x, d += 3) - { - d[0] = (color ) & 0xff; - d[1] = (color >> 8) & 0xff; - d[2] = (color >> 16) & 0xff; - } - break; - } - case 4: - COLORFILL_ROW(DWORD); - break; - - default: - FIXME("Color fill not implemented for bpp %u!\n", bpp * 8); - return WINED3DERR_NOTAVAILABLE; - } - -#undef COLORFILL_ROW - - /* Now copy first row. */ - first = buf; - for (y = 1; y < height; ++y) - { - buf += pitch; - memcpy(buf, first, width * bpp); - } - - return WINED3D_OK; -} - static void read_from_framebuffer(struct wined3d_surface *surface, struct wined3d_context *old_ctx, DWORD dst_location) { @@ -3032,13 +2974,6 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int goto release; } - /* First, all the 'source-less' blits */ - if (flags & (WINED3D_BLT_COLOR_FILL | WINED3D_BLT_DEPTH_FILL)) - { - hr = _Blt_ColorFill(dbuf, dst_width, dst_height, bpp, dst_map.row_pitch, fx->fill_color); - flags &= ~(WINED3D_BLT_COLOR_FILL | WINED3D_BLT_DEPTH_FILL); - } - /* Now the 'with source' blits. */ if (src_texture) { @@ -3393,16 +3328,89 @@ release: return hr; } +static HRESULT surface_cpu_blt_colour_fill(struct wined3d_texture *texture, unsigned int sub_resource_idx, + const struct wined3d_box *box, DWORD c) +{ + struct wined3d_resource *resource = &texture->resource; + unsigned int x, y, w, h, bpp; + struct wined3d_map_desc map; + BYTE *row; + + TRACE("texture %p, sub_resource_idx %u, box %s, colour 0x%08x.\n", + texture, sub_resource_idx, debug_box(box), c); + + if (resource->format_flags & WINED3DFMT_FLAG_BLOCKS) + { + FIXME("Not implemented for format %s.\n", debug_d3dformat(resource->format->id)); + return E_NOTIMPL; + } + + bpp = resource->format->byte_count; + w = box->right - box->left; + h = box->bottom - box->top; + + wined3d_resource_map(resource, sub_resource_idx, &map, box, 0); + + switch (bpp) + { + case 1: + for (x = 0; x < w; ++x) + { + ((BYTE *)map.data)[x] = c; + } + break; + + case 2: + for (x = 0; x < w; ++x) + { + ((WORD *)map.data)[x] = c; + } + break; + + case 3: + { + row = map.data; + for (x = 0; x < w; ++x, row += 3) + { + row[0] = (c ) & 0xff; + row[1] = (c >> 8) & 0xff; + row[2] = (c >> 16) & 0xff; + } + break; + } + case 4: + for (x = 0; x < w; ++x) + { + ((DWORD *)map.data)[x] = c; + } + break; + + default: + FIXME("Not implemented for bpp %u.\n", bpp); + wined3d_resource_unmap(resource, sub_resource_idx); + return WINED3DERR_NOTAVAILABLE; + } + + row = map.data; + for (y = 1; y < h; ++y) + { + row += map.row_pitch; + memcpy(row, map.data, w * bpp); + } + wined3d_resource_unmap(resource, sub_resource_idx); + + return WINED3D_OK; +} + static HRESULT cpu_blit_color_fill(struct wined3d_device *device, struct wined3d_rendertarget_view *view, const RECT *rect, const struct wined3d_color *color) { const struct wined3d_box box = {rect->left, rect->top, rect->right, rect->bottom, 0, 1}; - static const struct wined3d_box src_box; - struct wined3d_blt_fx fx; + DWORD c; - fx.fill_color = wined3d_format_convert_from_float(view->format, color); - return surface_cpu_blt(texture_from_resource(view->resource), view->sub_resource_idx, - &box, NULL, 0, &src_box, WINED3D_BLT_COLOR_FILL, &fx, WINED3D_TEXF_POINT); + c = wined3d_format_convert_from_float(view->format, color); + return surface_cpu_blt_colour_fill(texture_from_resource(view->resource), + view->sub_resource_idx, &box, c); } static HRESULT cpu_blit_depth_fill(struct wined3d_device *device, @@ -3411,8 +3419,7 @@ static HRESULT cpu_blit_depth_fill(struct wined3d_device *device, { const struct wined3d_box box = {rect->left, rect->top, rect->right, rect->bottom, 0, 1}; struct wined3d_color color = {depth, 0.0f, 0.0f, 0.0f}; - static const struct wined3d_box src_box; - struct wined3d_blt_fx fx; + DWORD c; if (clear_flags != WINED3DCLEAR_ZBUFFER) { @@ -3420,9 +3427,9 @@ static HRESULT cpu_blit_depth_fill(struct wined3d_device *device, return WINED3DERR_INVALIDCALL; } - fx.fill_color = wined3d_format_convert_from_float(view->format, &color); - return surface_cpu_blt(texture_from_resource(view->resource), view->sub_resource_idx, - &box, NULL, 0, &src_box, WINED3D_BLT_DEPTH_FILL, &fx, WINED3D_TEXF_POINT); + c = wined3d_format_convert_from_float(view->format, &color); + return surface_cpu_blt_colour_fill(texture_from_resource(view->resource), + view->sub_resource_idx, &box, c); } static void cpu_blit_blit_surface(struct wined3d_device *device, enum wined3d_blit_op op, @@ -3742,6 +3749,8 @@ fallback: return WINED3D_OK; cpu: + if (flags & (WINED3D_BLT_COLOR_FILL | WINED3D_BLT_DEPTH_FILL)) + return surface_cpu_blt_colour_fill(dst_texture, dst_sub_resource_idx, &dst_box, fx->fill_color); return surface_cpu_blt(dst_texture, dst_sub_resource_idx, &dst_box, src_texture, src_sub_resource_idx, &src_box, flags, fx, filter); }

1 0