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

Jacek Caban : ntdll/tests: Run read tests in all modes and directions.
by Alexandre Julliard March 29, 2017

March 29, 2017

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

Huw Davies : user32: Scale the scroll arrows with the menu's font size.
by Alexandre Julliard March 29, 2017

March 29, 2017

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

Huw Davies : user32: Don' t fill the background when drawing the scroll arrows.
by Alexandre Julliard March 29, 2017

March 29, 2017

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: Store the item rects as relative to the items_rect.
by Alexandre Julliard March 29, 2017

March 29, 2017

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

Hans Leidekker : webservices: Move error support to a separate file.
by Alexandre Julliard March 29, 2017

March 29, 2017

Module: wine Branch: master Commit: 55e60aab5c71ea7ba6036071622fd666565b850c URL: http://source.winehq.org/git/wine.git/?a=commit;h=55e60aab5c71ea7ba60360716… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 29 11:14:45 2017 +0200 webservices: Move error support to a separate file. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/Makefile.in | 1 + dlls/webservices/error.c | 234 +++++++++++++++++++++++++++++++++++++++++++ dlls/webservices/reader.c | 204 ------------------------------------- 3 files changed, 235 insertions(+), 204 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=55e60aab5c71ea7ba6036…

1 0

Hans Leidekker : webservices: Use a table in get_header_name.
by Alexandre Julliard March 29, 2017

March 29, 2017

Module: wine Branch: master Commit: bdbab7b63a46d1a1689ba447196ee09734cc3349 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdbab7b63a46d1a1689ba4471… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 29 11:14:44 2017 +0200 webservices: Use a table in get_header_name. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index 5e425ee..d15ab85 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -457,24 +457,24 @@ static HRESULT get_addr_namespace( WS_ADDRESSING_VERSION ver, WS_XML_STRING *str static const WS_XML_STRING *get_header_name( WS_HEADER_TYPE type ) { - static const WS_XML_STRING action = {6, (BYTE *)"Action"}, to = {2, (BYTE *)"To"}; - static const WS_XML_STRING msgid = {9, (BYTE *)"MessageID"}, relto = {9, (BYTE *)"RelatesTo"}; - static const WS_XML_STRING from = {4, (BYTE *)"From"}, replyto = {7, (BYTE *)"ReplyTo"}; - static const WS_XML_STRING faultto = {7, (BYTE *)"FaultTo"}; + static const WS_XML_STRING headers[] = + { + {6, (BYTE *)"Action"}, + {2, (BYTE *)"To"}, + {9, (BYTE *)"MessageID"}, + {9, (BYTE *)"RelatesTo"}, + {4, (BYTE *)"From"}, + {7, (BYTE *)"ReplyTo"}, + {7, (BYTE *)"FaultTo"}, + }; - switch (type) + if (type < WS_ACTION_HEADER || type > WS_FAULT_TO_HEADER) { - case WS_ACTION_HEADER: return &action; - case WS_TO_HEADER: return &to; - case WS_MESSAGE_ID_HEADER: return &msgid; - case WS_RELATES_TO_HEADER: return &relto; - case WS_FROM_HEADER: return &from; - case WS_REPLY_TO_HEADER: return &replyto; - case WS_FAULT_TO_HEADER: return &faultto; - default: ERR( "unknown type %u\n", type ); return NULL; } + + return &headers[type - 1]; } static HRESULT write_headers( struct msg *msg, const WS_XML_STRING *ns_env, const WS_XML_STRING *ns_addr,

1 0

Alistair Leslie-Hughes : dpnet: Share message handler between IDirectPlay8ThreadPool objects.
by Alexandre Julliard March 29, 2017

March 29, 2017

Module: wine Branch: master Commit: 072c58e322fddba772bd87bc79dcf9f7938a1c57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=072c58e322fddba772bd87bc7… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Mar 23 01:57:05 2017 +0000 dpnet: Share message handler between IDirectPlay8ThreadPool objects. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/dpnet_private.h | 4 ---- dlls/dpnet/tests/thread.c | 8 ++++---- dlls/dpnet/threadpool.c | 17 ++++++++++++----- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/dlls/dpnet/dpnet_private.h b/dlls/dpnet/dpnet_private.h index 7b6de4a..44ff289d 100644 --- a/dlls/dpnet/dpnet_private.h +++ b/dlls/dpnet/dpnet_private.h @@ -122,10 +122,6 @@ struct IDirectPlay8ThreadPoolImpl { IDirectPlay8ThreadPool IDirectPlay8ThreadPool_iface; LONG ref; - - PFNDPNMESSAGEHANDLER msghandler; - DWORD flags; - void *usercontext; }; /** diff --git a/dlls/dpnet/tests/thread.c b/dlls/dpnet/tests/thread.c index 99de2be..78515f8 100644 --- a/dlls/dpnet/tests/thread.c +++ b/dlls/dpnet/tests/thread.c @@ -70,7 +70,7 @@ static void create_threadpool(void) ok(hr == S_OK, "got 0x%08x\n", hr); hr = IDirectPlay8ThreadPool_Initialize(pool2, NULL, &DirectPlayThreadHandler, 0); - todo_wine ok(hr == DPNERR_ALREADYINITIALIZED, "got 0x%08x\n", hr); + ok(hr == DPNERR_ALREADYINITIALIZED, "got 0x%08x\n", hr); hr = IDirectPlay8ThreadPool_GetThreadCount(pool1, -1, &threadcnt, 0); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -103,7 +103,7 @@ static void create_threadpool(void) ok(hr == S_OK, "got 0x%08x\n", hr); hr = IDirectPlay8ThreadPool_Close(pool2, 0); - todo_wine ok(hr == DPNERR_UNINITIALIZED, "got 0x%08x\n", hr); + ok(hr == DPNERR_UNINITIALIZED, "got 0x%08x\n", hr); IDirectPlay8ThreadPool_Release(pool1); IDirectPlay8ThreadPool_Release(pool2); @@ -226,13 +226,13 @@ static void test_singleton(void) ok(hr == S_OK, "got 0x%08x\n", hr); hr = IDirectPlay8ThreadPool_Initialize(pool2, NULL, &DirectPlayThreadHandler, 0); - todo_wine ok(hr == DPNERR_ALREADYINITIALIZED, "got 0x%08x\n", hr); + ok(hr == DPNERR_ALREADYINITIALIZED, "got 0x%08x\n", hr); hr = IDirectPlay8ThreadPool_Close(pool1, 0); ok(hr == S_OK, "got 0x%08x\n", hr); hr = IDirectPlay8ThreadPool_Close(pool2, 0); - todo_wine ok(hr == DPNERR_UNINITIALIZED, "got 0x%08x\n", hr); + ok(hr == DPNERR_UNINITIALIZED, "got 0x%08x\n", hr); IDirectPlay8ThreadPool_Release(pool1); IDirectPlay8ThreadPool_Release(pool2); diff --git a/dlls/dpnet/threadpool.c b/dlls/dpnet/threadpool.c index 37a05e2..7e84a5a 100644 --- a/dlls/dpnet/threadpool.c +++ b/dlls/dpnet/threadpool.c @@ -36,6 +36,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(dpnet); +static PFNDPNMESSAGEHANDLER threadpool_msghandler = NULL; +static DWORD threadpool_flags = 0; +static void *threadpool_usercontext = NULL; + static inline IDirectPlay8ThreadPoolImpl *impl_from_IDirectPlay8ThreadPool(IDirectPlay8ThreadPool *iface) { return CONTAINING_RECORD(iface, IDirectPlay8ThreadPoolImpl, IDirectPlay8ThreadPool_iface); @@ -89,12 +93,12 @@ static HRESULT WINAPI IDirectPlay8ThreadPoolImpl_Initialize(IDirectPlay8ThreadPo if(!pfn) return DPNERR_INVALIDPARAM; - if(This->msghandler) + if(threadpool_msghandler) return DPNERR_ALREADYINITIALIZED; - This->msghandler = pfn; - This->flags = dwFlags; - This->usercontext = pvUserContext; + threadpool_msghandler = pfn; + threadpool_flags = dwFlags; + threadpool_usercontext = pvUserContext; return DPN_OK; } @@ -106,7 +110,10 @@ static HRESULT WINAPI IDirectPlay8ThreadPoolImpl_Close(IDirectPlay8ThreadPool *i FIXME("(%p)->(%x)\n", This, dwFlags); - This->msghandler = NULL; + if(!threadpool_msghandler) + return DPNERR_UNINITIALIZED; + + threadpool_msghandler = NULL; return DPN_OK; }

1 0

Hugh McMaster : regedit: Do not select/ highlight a listview item on refresh.
by Alexandre Julliard March 29, 2017

March 29, 2017

Module: wine Branch: master Commit: 5aaa77c9bb70e2669e1f1b8282bec7c62b16326e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5aaa77c9bb70e2669e1f1b828… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Mar 29 05:25:56 2017 +0000 regedit: Do not select/highlight a listview item on refresh. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/listview.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index b9366e5..fc234d4 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -138,7 +138,7 @@ static void AddEntryToList(HWND hwndLV, LPWSTR Name, DWORD dwValType, item.pszText = Name ? Name : LPSTR_TEXTCALLBACKW; item.cchTextMax = Name ? lstrlenW(item.pszText) : 0; if (bHighlight) { - item.stateMask = item.state = LVIS_FOCUSED | LVIS_SELECTED; + item.stateMask = item.state = LVIS_FOCUSED; } switch (dwValType) {

1 0

Hugh McMaster : regedit: Do not use REG_NONE as the default data type on import error.
by Alexandre Julliard March 29, 2017

March 29, 2017

Module: wine Branch: master Commit: 6d89696121f738edba59246c02c40b86aa405c33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d89696121f738edba59246c0… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Mar 29 05:25:43 2017 +0000 regedit: Do not use REG_NONE as the default data type on import error. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index a54a96f..751a3a5 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -193,6 +193,8 @@ static BYTE* convertHexCSVToHex(WCHAR *str, DWORD *size) return data; } +#define REG_UNKNOWN_TYPE 99 + /****************************************************************************** * This function returns the HKEY associated with the data type encoded in the * value. It modifies the input parameter (key value) in order to skip this @@ -242,8 +244,8 @@ static DWORD getDataType(LPWSTR *lpValue, DWORD* parse_type) } return type; } - *parse_type=REG_NONE; - return REG_NONE; + *parse_type = REG_UNKNOWN_TYPE; + return REG_UNKNOWN_TYPE; } /****************************************************************************** @@ -343,6 +345,7 @@ static const WCHAR type_dword[] = {'R','E','G','_','D','W','O','R','D',0}; static const WCHAR type_dword_le[] = {'R','E','G','_','D','W','O','R','D','_','L','I','T','T','L','E','_','E','N','D','I','A','N',0}; static const WCHAR type_dword_be[] = {'R','E','G','_','D','W','O','R','D','_','B','I','G','_','E','N','D','I','A','N',0}; static const WCHAR type_multi_sz[] = {'R','E','G','_','M','U','L','T','I','_','S','Z',0}; +static const WCHAR unknown_type[] = {'U','n','k','n','o','w','n',' ','T','y','p','e',0}; static const struct { @@ -359,6 +362,7 @@ type_rels[] = {REG_DWORD_LITTLE_ENDIAN, type_dword_le}, {REG_DWORD_BIG_ENDIAN, type_dword_be}, {REG_MULTI_SZ, type_multi_sz}, + {REG_UNKNOWN_TYPE, unknown_type} }; static const WCHAR *reg_type_to_wchar(DWORD type)

1 0

Huw Davies : user32: Clip painting to the items_rect.
by Alexandre Julliard March 29, 2017

March 29, 2017

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