- wine-devel - winehq.org

[PATCH] gdiplus/tests: Don't ignore successful tests.
by Zebediah Figura 21 Nov '17

21 Nov '17

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/gdiplus/tests/image.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 0b444effb1..9aed7919a7 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -4397,7 +4397,7 @@ static void test_DrawImage_scale(void) { 1.2, PixelOffsetModeHalf, image_120_half, TRUE }, { 1.5, PixelOffsetModeHalf, image_150_half, TRUE }, { 1.8, PixelOffsetModeHalf, image_180 }, - { 2.0, PixelOffsetModeHalf, image_200_half, TRUE }, + { 2.0, PixelOffsetModeHalf, image_200_half }, { 2.5, PixelOffsetModeHalf, image_250_half, TRUE }, { 0.8, PixelOffsetModeHighQuality, image_080 }, /* 21 */ @@ -4405,7 +4405,7 @@ static void test_DrawImage_scale(void) { 1.2, PixelOffsetModeHighQuality, image_120_half, TRUE }, { 1.5, PixelOffsetModeHighQuality, image_150_half, TRUE }, { 1.8, PixelOffsetModeHighQuality, image_180 }, - { 2.0, PixelOffsetModeHighQuality, image_200_half, TRUE }, + { 2.0, PixelOffsetModeHighQuality, image_200_half }, { 2.5, PixelOffsetModeHighQuality, image_250_half, TRUE }, }; BYTE src_2x1[6] = { 0x80,0x80,0x80,0x80,0x80,0x80 }; @@ -4450,15 +4450,15 @@ static void test_DrawImage_scale(void) expect(Ok, status); match = memcmp(dst_8x1, td[i].image, sizeof(dst_8x1)) == 0; - todo_wine_if (!match && td[i].todo) - ok(match, "%d: data should match\n", i); + todo_wine_if (td[i].todo) + ok(match, "%d: data didn't match:", i); if (!match) { UINT i, size = sizeof(dst_8x1); const BYTE *bits = dst_8x1; for (i = 0; i < size; i++) - trace(" %02x", bits[i]); - trace("\n"); + printf(" %02x", bits[i]); + printf("\n"); } } -- 2.15.0

3 4

[PATCH v2] user32: Reimplement TrackMouseEvent.
by Rafał Harabień 21 Nov '17

21 Nov '17

Improvements: - Don't use timer for TME_LEAVE and react immediately on mouse motion. It improves user experience for controls depending on this API like toolbar. - Fail when called with invalid flags - Hold tracking info for each win32 thread independently - Merge tracking requests if possible (leave+hover) - Return hover time 0 when hover tracking is disabled Patch v2 fixes compiler warnings and some style issues. Signed-off-by: Rafał Harabień <rafalh1992(a)o2.pl> --- dlls/user32/input.c | 234 ++++++++++++++++++++++++--------------------- dlls/user32/message.c | 5 + dlls/user32/tests/msg.c | 165 ++++++++++++++++++++++++++++++++ dlls/user32/user_private.h | 11 +++ dlls/winex11.drv/event.c | 2 +- dlls/winex11.drv/mouse.c | 29 ++++++ dlls/winex11.drv/window.c | 2 +- dlls/winex11.drv/x11drv.h | 1 + 8 files changed, 337 insertions(+), 112 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index c475b19..5b589a5 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -1243,48 +1243,59 @@ BOOL WINAPI UnloadKeyboardLayout(HKL hkl) return USER_Driver->pUnloadKeyboardLayout(hkl); } -typedef struct __TRACKINGLIST { - TRACKMOUSEEVENT tme; - POINT pos; /* center of hover rectangle */ -} _TRACKINGLIST; -/* FIXME: move tracking stuff into a per thread data */ -static _TRACKINGLIST tracking_info; -static UINT_PTR timer; +void maybe_clean_tracking_info(struct tracking_info *tracking_info) +{ + if (!(tracking_info->tme.dwFlags & (TME_HOVER | TME_LEAVE))) + { + tracking_info->tme.hwndTrack = 0; + tracking_info->tme.dwFlags = 0; + } + if (!(tracking_info->tme.dwFlags & TME_HOVER)) + tracking_info->tme.dwHoverTime = 0; +} -static void check_mouse_leave(HWND hwnd, int hittest) +void check_mouse_leave(HWND hwnd, int hittest) { - if (tracking_info.tme.hwndTrack != hwnd) + struct tracking_info *tracking_info = &get_user_thread_info()->tracking_info; + + TRACE("hwnd %p hittest %d\n", hwnd, hittest); + + if (!(tracking_info->tme.dwFlags & TME_LEAVE)) + return; + + if (tracking_info->tme.hwndTrack != hwnd) { - if (tracking_info.tme.dwFlags & TME_NONCLIENT) - PostMessageW(tracking_info.tme.hwndTrack, WM_NCMOUSELEAVE, 0, 0); + if (tracking_info->tme.dwFlags & TME_NONCLIENT) + PostMessageW(tracking_info->tme.hwndTrack, WM_NCMOUSELEAVE, 0, 0); else - PostMessageW(tracking_info.tme.hwndTrack, WM_MOUSELEAVE, 0, 0); + PostMessageW(tracking_info->tme.hwndTrack, WM_MOUSELEAVE, 0, 0); /* remove the TME_LEAVE flag */ - tracking_info.tme.dwFlags &= ~TME_LEAVE; + tracking_info->tme.dwFlags &= ~TME_LEAVE; } else { if (hittest == HTCLIENT) { - if (tracking_info.tme.dwFlags & TME_NONCLIENT) + if (tracking_info->tme.dwFlags & TME_NONCLIENT) { - PostMessageW(tracking_info.tme.hwndTrack, WM_NCMOUSELEAVE, 0, 0); + PostMessageW(tracking_info->tme.hwndTrack, WM_NCMOUSELEAVE, 0, 0); /* remove the TME_LEAVE flag */ - tracking_info.tme.dwFlags &= ~TME_LEAVE; + tracking_info->tme.dwFlags &= ~TME_LEAVE; } } else { - if (!(tracking_info.tme.dwFlags & TME_NONCLIENT)) + if (!(tracking_info->tme.dwFlags & TME_NONCLIENT)) { - PostMessageW(tracking_info.tme.hwndTrack, WM_MOUSELEAVE, 0, 0); + PostMessageW(tracking_info->tme.hwndTrack, WM_MOUSELEAVE, 0, 0); /* remove the TME_LEAVE flag */ - tracking_info.tme.dwFlags &= ~TME_LEAVE; + tracking_info->tme.dwFlags &= ~TME_LEAVE; } } } + maybe_clean_tracking_info(tracking_info); } static void CALLBACK TrackMouseEventProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, @@ -1292,6 +1303,7 @@ static void CALLBACK TrackMouseEventProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, { POINT pos; INT hoverwidth = 0, hoverheight = 0, hittest; + struct tracking_info *tracking_info = &get_user_thread_info()->tracking_info; TRACE("hwnd %p, msg %04x, id %04lx, time %u\n", hwnd, uMsg, idEvent, dwTime); @@ -1304,31 +1316,24 @@ static void CALLBACK TrackMouseEventProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, SystemParametersInfoW(SPI_GETMOUSEHOVERHEIGHT, 0, &hoverheight, 0); TRACE("tracked pos %s, current pos %s, hover width %d, hover height %d\n", - wine_dbgstr_point(&tracking_info.pos), wine_dbgstr_point(&pos), + wine_dbgstr_point(&tracking_info->pos), wine_dbgstr_point(&pos), hoverwidth, hoverheight); - /* see if this tracking event is looking for TME_LEAVE and that the */ - /* mouse has left the window */ - if (tracking_info.tme.dwFlags & TME_LEAVE) - { - check_mouse_leave(hwnd, hittest); - } - - if (tracking_info.tme.hwndTrack != hwnd) + if (tracking_info->tme.hwndTrack != hwnd) { /* mouse is gone, stop tracking mouse hover */ - tracking_info.tme.dwFlags &= ~TME_HOVER; + tracking_info->tme.dwFlags &= ~TME_HOVER; } /* see if we are tracking hovering for this hwnd */ - if (tracking_info.tme.dwFlags & TME_HOVER) + if (tracking_info->tme.dwFlags & TME_HOVER) { /* has the cursor moved outside the rectangle centered around pos? */ - if ((abs(pos.x - tracking_info.pos.x) > (hoverwidth / 2)) || - (abs(pos.y - tracking_info.pos.y) > (hoverheight / 2))) + if ((abs(pos.x - tracking_info->pos.x) > (hoverwidth / 2)) || + (abs(pos.y - tracking_info->pos.y) > (hoverheight / 2))) { /* record this new position as the current position */ - tracking_info.pos = pos; + tracking_info->pos = pos; } else { @@ -1337,29 +1342,88 @@ static void CALLBACK TrackMouseEventProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, ScreenToClient(hwnd, &pos); TRACE("client cursor pos %s\n", wine_dbgstr_point(&pos)); - PostMessageW(tracking_info.tme.hwndTrack, WM_MOUSEHOVER, + PostMessageW(tracking_info->tme.hwndTrack, WM_MOUSEHOVER, get_key_state(), MAKELPARAM( pos.x, pos.y )); } else { - if (tracking_info.tme.dwFlags & TME_NONCLIENT) - PostMessageW(tracking_info.tme.hwndTrack, WM_NCMOUSEHOVER, + if (tracking_info->tme.dwFlags & TME_NONCLIENT) + PostMessageW(tracking_info->tme.hwndTrack, WM_NCMOUSEHOVER, hittest, MAKELPARAM( pos.x, pos.y )); } /* stop tracking mouse hover */ - tracking_info.tme.dwFlags &= ~TME_HOVER; + tracking_info->tme.dwFlags &= ~TME_HOVER; } } /* stop the timer if the tracking list is empty */ - if (!(tracking_info.tme.dwFlags & (TME_HOVER | TME_LEAVE))) + if (!(tracking_info->tme.dwFlags & TME_HOVER)) + { + KillSystemTimer(tracking_info->tme.hwndTrack, tracking_info->timer); + tracking_info->timer = 0; + } + maybe_clean_tracking_info(tracking_info); +} + +void track_mouse_event_internal(HWND hwnd_track, DWORD flags, DWORD hover_time) +{ + HWND hwnd; + POINT pos; + INT hittest; + struct tracking_info *tracking_info = &get_user_thread_info()->tracking_info; + + if (flags & TME_HOVER) + { + /* if HOVER_DEFAULT or 0 was specified replace this with the system's current value. */ + if (hover_time == HOVER_DEFAULT || hover_time == 0) + SystemParametersInfoW(SPI_GETMOUSEHOVERTIME, 0, &hover_time, 0); + } + + if (flags & TME_CANCEL) + { + if (tracking_info->tme.hwndTrack == hwnd_track) + { + /* cancel old tracking request */ + tracking_info->tme.dwFlags &= ~(flags & ~TME_CANCEL); + + /* if we aren't tracking on hover or leave remove this entry */ + if (!(tracking_info->tme.dwFlags & TME_HOVER) && tracking_info->timer) + { + KillSystemTimer(tracking_info->tme.hwndTrack, tracking_info->timer); + tracking_info->timer = 0; + } + maybe_clean_tracking_info(tracking_info); + } + } + else { - KillSystemTimer(tracking_info.tme.hwndTrack, timer); - timer = 0; - tracking_info.tme.hwndTrack = 0; - tracking_info.tme.dwFlags = 0; - tracking_info.tme.dwHoverTime = 0; + /* check what window is under cursor */ + GetCursorPos(&pos); + hwnd = WINPOS_WindowFromPoint(hwnd_track, pos, &hittest); + TRACE("point %s hwnd %p hittest %d\n", wine_dbgstr_point(&pos), hwnd, hittest); + + if (hwnd_track != hwnd) + PostMessageW(hwnd_track, WM_MOUSELEAVE, 0, 0); + else + { + /* save tracking request */ + tracking_info->tme.hwndTrack = hwnd_track; + tracking_info->tme.dwFlags |= flags; + if (flags & TME_HOVER) + tracking_info->tme.dwHoverTime = hover_time; + + /* Initialize HoverInfo variables even if not hover tracking */ + tracking_info->pos = pos; + + if (flags & TME_HOVER) + { + /* recreate timer */ + if (tracking_info->timer) + KillSystemTimer(tracking_info->tme.hwndTrack, tracking_info->timer); + tracking_info->timer = SetSystemTimer(tracking_info->tme.hwndTrack, (UINT_PTR)&tracking_info->tme, hover_time, TrackMouseEventProc); + } + } } } @@ -1389,23 +1453,30 @@ static void CALLBACK TrackMouseEventProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, BOOL WINAPI TrackMouseEvent (TRACKMOUSEEVENT *ptme) { - HWND hwnd; - POINT pos; - DWORD hover_time; - INT hittest; + DWORD invalid_flags; + struct tracking_info *tracking_info = &get_user_thread_info()->tracking_info; TRACE("%x, %x, %p, %u\n", ptme->cbSize, ptme->dwFlags, ptme->hwndTrack, ptme->dwHoverTime); - if (ptme->cbSize != sizeof(TRACKMOUSEEVENT)) { + if (ptme->cbSize != sizeof(TRACKMOUSEEVENT)) + { WARN("wrong TRACKMOUSEEVENT size from app\n"); SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } + invalid_flags = ptme->dwFlags & ~(TME_QUERY | TME_CANCEL | TME_HOVER | TME_LEAVE | TME_NONCLIENT); + if (invalid_flags != 0) + { + WARN("Unknown flag(s) %08x\n", invalid_flags); + SetLastError(ERROR_INVALID_FLAGS); + return FALSE; + } + /* fill the TRACKMOUSEEVENT struct with the current tracking for the given hwnd */ - if (ptme->dwFlags & TME_QUERY ) + if (ptme->dwFlags & TME_QUERY) { - *ptme = tracking_info.tme; + *ptme = tracking_info->tme; /* set cbSize in the case it's not initialized yet */ ptme->cbSize = sizeof(TRACKMOUSEEVENT); @@ -1418,68 +1489,11 @@ TrackMouseEvent (TRACKMOUSEEVENT *ptme) return FALSE; } - hover_time = (ptme->dwFlags & TME_HOVER) ? ptme->dwHoverTime : HOVER_DEFAULT; - - /* if HOVER_DEFAULT was specified replace this with the system's current value. - * TME_LEAVE doesn't need to specify hover time so use default */ - if (hover_time == HOVER_DEFAULT || hover_time == 0) - SystemParametersInfoW(SPI_GETMOUSEHOVERTIME, 0, &hover_time, 0); - - GetCursorPos(&pos); - hwnd = WINPOS_WindowFromPoint(ptme->hwndTrack, pos, &hittest); - TRACE("point %s hwnd %p hittest %d\n", wine_dbgstr_point(&pos), hwnd, hittest); - - if (ptme->dwFlags & ~(TME_CANCEL | TME_HOVER | TME_LEAVE | TME_NONCLIENT)) - FIXME("Unknown flag(s) %08x\n", ptme->dwFlags & ~(TME_CANCEL | TME_HOVER | TME_LEAVE | TME_NONCLIENT)); - - if (ptme->dwFlags & TME_CANCEL) - { - if (tracking_info.tme.hwndTrack == ptme->hwndTrack) - { - tracking_info.tme.dwFlags &= ~(ptme->dwFlags & ~TME_CANCEL); - - /* if we aren't tracking on hover or leave remove this entry */ - if (!(tracking_info.tme.dwFlags & (TME_HOVER | TME_LEAVE))) - { - KillSystemTimer(tracking_info.tme.hwndTrack, timer); - timer = 0; - tracking_info.tme.hwndTrack = 0; - tracking_info.tme.dwFlags = 0; - tracking_info.tme.dwHoverTime = 0; - } - } - } else { - /* In our implementation it's possible that another window will receive a - * WM_MOUSEMOVE and call TrackMouseEvent before TrackMouseEventProc is - * called. In such a situation post the WM_MOUSELEAVE now */ - if (tracking_info.tme.dwFlags & TME_LEAVE && tracking_info.tme.hwndTrack != NULL) - check_mouse_leave(hwnd, hittest); - - if (timer) - { - KillSystemTimer(tracking_info.tme.hwndTrack, timer); - timer = 0; - tracking_info.tme.hwndTrack = 0; - tracking_info.tme.dwFlags = 0; - tracking_info.tme.dwHoverTime = 0; - } - - if (ptme->hwndTrack == hwnd) - { - /* Adding new mouse event to the tracking list */ - tracking_info.tme = *ptme; - tracking_info.tme.dwHoverTime = hover_time; - - /* Initialize HoverInfo variables even if not hover tracking */ - tracking_info.pos = pos; - - timer = SetSystemTimer(tracking_info.tme.hwndTrack, (UINT_PTR)&tracking_info.tme, hover_time, TrackMouseEventProc); - } - } - - return TRUE; + /* use internal message to get access to user_thread_info for tracked window */ + return SendNotifyMessageW(ptme->hwndTrack, WM_WINE_TRACKMOUSEEVENT, ptme->dwFlags, ptme->dwHoverTime); } + /*********************************************************************** * GetMouseMovePointsEx [USER32] * diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 406eff3..21710c3 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -1888,6 +1888,9 @@ static LRESULT handle_internal_message( HWND hwnd, UINT msg, WPARAM wparam, LPAR return USER_Driver->pClipCursor( &rect ); } return USER_Driver->pClipCursor( NULL ); + case WM_WINE_TRACKMOUSEEVENT: + track_mouse_event_internal(hwnd, (DWORD)wparam, (DWORD)lparam); + return 0; default: if (msg >= WM_WINE_FIRST_DRIVER_MSG && msg <= WM_WINE_LAST_DRIVER_MSG) return USER_Driver->pWindowMessage( hwnd, msg, wparam, lparam ); @@ -2503,6 +2506,8 @@ static BOOL process_mouse_message( MSG *msg, UINT hw_id, ULONG_PTR extra_info, H else { msg->hwnd = WINPOS_WindowFromPoint( msg->hwnd, msg->pt, &hittest ); + /* TrackMouseEvent support */ + check_mouse_leave(msg->hwnd, hittest); } if (!msg->hwnd || !WIN_IsCurrentThread( msg->hwnd )) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 64c7967..0c7eb8e 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -7817,6 +7817,18 @@ static DWORD WINAPI thread_proc(void *param) while (GetMessageA(&msg, 0, 0, 0)) { + if ((msg.message == WM_TIMER || msg.message == WM_SYSTIMER) && msg.lParam) + { + struct recvd_message s_msg; + + s_msg.hwnd = msg.hwnd; + s_msg.message = msg.message; + s_msg.flags = sent|wparam|lparam; + s_msg.wParam = msg.wParam; + s_msg.lParam = msg.lParam; + s_msg.descr = "msg_loop"; + add_message(&s_msg); + } TranslateMessage(&msg); DispatchMessageA(&msg); } @@ -11938,6 +11950,11 @@ static const struct message WmMouseHoverSeq[] = { { 0 } }; +static const struct message WmMouseLeaveSeq[] = { + { WM_MOUSELEAVE, sent|wparam, 0 }, + { 0 } +}; + static void pump_msg_loop_timeout(DWORD timeout, BOOL inject_mouse_move) { MSG msg; @@ -11989,6 +12006,9 @@ static void test_TrackMouseEvent(void) HWND hwnd, hchild; RECT rc_parent, rc_child; UINT default_hover_time, hover_width = 0, hover_height = 0; + struct wnd_event wnd_event; + HANDLE hthread; + DWORD tid; #define track_hover(track_hwnd, track_hover_time) \ tme.cbSize = sizeof(tme); \ @@ -11999,6 +12019,15 @@ static void test_TrackMouseEvent(void) ret = pTrackMouseEvent(&tme); \ ok(ret, "TrackMouseEvent(TME_HOVER) error %d\n", GetLastError()) +#define track_leave(track_hwnd) \ + tme.cbSize = sizeof(tme); \ + tme.dwFlags = TME_LEAVE; \ + tme.hwndTrack = track_hwnd; \ + tme.dwHoverTime = 0xdeadbeef; \ + SetLastError(0xdeadbeef); \ + ret = pTrackMouseEvent(&tme); \ + ok(ret, "TrackMouseEvent(TME_LEAVE) error %d\n", GetLastError()); + #define track_query(expected_track_flags, expected_track_hwnd, expected_hover_time) \ tme.cbSize = sizeof(tme); \ tme.dwFlags = TME_QUERY; \ @@ -12024,6 +12053,15 @@ static void test_TrackMouseEvent(void) ret = pTrackMouseEvent(&tme); \ ok(ret, "TrackMouseEvent(TME_HOVER | TME_CANCEL) error %d\n", GetLastError()) +#define track_leave_cancel(track_hwnd) \ + tme.cbSize = sizeof(tme); \ + tme.dwFlags = TME_LEAVE | TME_CANCEL; \ + tme.hwndTrack = track_hwnd; \ + tme.dwHoverTime = 0xdeadbeef; \ + SetLastError(0xdeadbeef); \ + ret = pTrackMouseEvent(&tme); \ + ok(ret, "TrackMouseEvent(TME_LEAVE | TME_CANCEL) error %d\n", GetLastError()) + default_hover_time = 0xdeadbeef; SetLastError(0xdeadbeef); ret = SystemParametersInfoA(SPI_GETMOUSEHOVERTIME, 0, &default_hover_time, 0); @@ -12090,6 +12128,17 @@ static void test_TrackMouseEvent(void) ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE || broken(GetLastError() == 0xdeadbeef), "not expected error %u\n", GetLastError()); + /* Invalid flags */ + tme.cbSize = sizeof(tme); + tme.dwFlags = ~TME_CANCEL; + tme.hwndTrack = hwnd; + tme.dwHoverTime = HOVER_DEFAULT; + SetLastError(0xdeadbeef); + ret = pTrackMouseEvent(&tme); + ok(!ret, "TrackMouseEvent should fail\n"); + ok(GetLastError() == ERROR_INVALID_FLAGS, "not expected error %u\n", GetLastError()); + track_query(0, NULL, 0); + GetWindowRect(hwnd, &rc_parent); GetWindowRect(hchild, &rc_child); SetCursorPos(rc_child.left - 10, rc_child.top - 10); @@ -12159,11 +12208,127 @@ static void test_TrackMouseEvent(void) track_query(TME_HOVER, hwnd, default_hover_time); track_hover_cancel(hwnd); + /* cursor is over child window */ + mouse_event(MOUSEEVENTF_MOVE, 20, 20, 0, 0); /* rc_child.left + 10, rc_child.top + 10 */ + flush_events(); + flush_sequence(); + + /* cancel TME_LEAVE */ + track_leave(hchild); + ok(GetLastError() == 0xdeadbeef, "not expected error %u\n", GetLastError()); + track_query(TME_LEAVE, hchild, 0); + track_leave_cancel(hchild); + track_query(0, NULL, 0); + pump_msg_loop_timeout(default_hover_time, FALSE); + ok_sequence(WmEmptySeq, "WmEmptySeq", FALSE); + + /* requests for the same window are merged */ + track_hover(hchild, HOVER_DEFAULT); + track_query(TME_HOVER, hchild, default_hover_time); + track_leave(hchild); + ok(GetLastError() == 0xdeadbeef, "not expected error %u\n", GetLastError()); + track_query(TME_LEAVE|TME_HOVER, hchild, default_hover_time); + track_hover_cancel(hchild); + track_query(TME_LEAVE, hchild, 0); + /* TME_LEAVE for window not being under cursor doesn't change TME_QUERY result */ + track_leave(hwnd); + track_query(TME_LEAVE, hchild, 0); + track_leave_cancel(hchild); + track_query(0, NULL, 0); + flush_events(); + flush_sequence(); + + /* try changing hover time */ + track_hover(hchild, 0); + track_query(TME_HOVER, hchild, default_hover_time); + track_hover(hchild, 1); + track_query(TME_HOVER, hchild, 1); + track_hover(hchild, HOVER_DEFAULT); + track_query(TME_HOVER, hchild, default_hover_time); + track_hover(hchild, default_hover_time*2); + track_query(TME_HOVER, hchild, default_hover_time*2); + track_hover_cancel(hchild); + + /* test TME_LEAVE */ + track_leave(hchild); + ok(GetLastError() == 0xdeadbeef, "not expected error %u\n", GetLastError()); + track_query(TME_LEAVE, hchild, 0); + ok(!GetCapture(), "expected NULL\n"); + mouse_event(MOUSEEVENTF_MOVE, -20, 0, 0, 0); /* rc_child.left - 10, rc_child.top + 10 */ + pump_msg_loop_timeout(0, FALSE); + ok_sequence(WmMouseLeaveSeq, "WmMouseLeaveSeq", FALSE); + track_query(0, NULL, 0); + + /* window is not under cursor - immediate WM_MOUSELEAVE is expected */ + track_leave(hchild); + ok(GetLastError() == 0xdeadbeef, "not expected error %u\n", GetLastError()); + track_query(0, NULL, 0); + pump_msg_loop_timeout(0, FALSE); + ok_sequence(WmMouseLeaveSeq, "WmMouseLeaveSeq", FALSE); + + mouse_event(MOUSEEVENTF_MOVE, 20, 0, 0, 0); /* rc_child.left + 10, rc_child.top + 10 */ + flush_events(); + flush_sequence(); + + /* move cursor outside top-window */ + track_leave(hchild); + track_query(TME_LEAVE, hchild, 0); + mouse_event(MOUSEEVENTF_MOVE, 500, 0, 0, 0); /* rc_child.left + 510, rc_child.top + 10 */ + pump_msg_loop_timeout(0, FALSE); + ok_sequence(WmMouseLeaveSeq, "WmMouseLeaveSeq", FALSE); + track_query(0, NULL, 0); + DestroyWindow(hwnd); + /* Try tracking cursor over window from other thread */ + wnd_event.start_event = CreateEventW(NULL, 0, 0, NULL); + if (!wnd_event.start_event) + { + win_skip("CreateEventW failed\n"); + return; + } + hthread = CreateThread(NULL, 0, thread_proc, &wnd_event, 0, &tid); + ok(hthread != NULL, "CreateThread failed, error %d\n", GetLastError()); + ok(WaitForSingleObject(wnd_event.start_event, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + CloseHandle(wnd_event.start_event); + SetCursorPos(150, 150); + ShowWindow(wnd_event.hwnd, SW_SHOW); + flush_events(); + flush_sequence(); + + /* window is under cursor */ + track_hover(wnd_event.hwnd, HOVER_DEFAULT); + track_query(0, NULL, 0); + pump_msg_loop_timeout(default_hover_time, TRUE); + ok_sequence(WmMouseHoverSeq, "WmMouseHoverSeq", FALSE); + + track_leave(wnd_event.hwnd); + ok(GetLastError() == 0xdeadbeef, "not expected error %u\n", GetLastError()); + track_query(0, NULL, 0); + pump_msg_loop_timeout(default_hover_time, FALSE); + ok_sequence(WmEmptySeq, "WmEmptySeq", FALSE); + + /* window is not under cursor */ + SetCursorPos(600, 150); + pump_msg_loop_timeout(default_hover_time, FALSE); + ok_sequence(WmMouseLeaveSeq, "WmMouseLeaveSeq", FALSE); + + track_leave(wnd_event.hwnd); + ok(GetLastError() == 0xdeadbeef, "not expected error %u\n", GetLastError()); + track_query(0, NULL, 0); + pump_msg_loop_timeout(default_hover_time, FALSE); + ok_sequence(WmMouseLeaveSeq, "WmMouseLeaveSeq", FALSE); + + ret = PostMessageA(wnd_event.hwnd, WM_QUIT, 0, 0); + ok( ret, "PostMessageA(WM_QUIT) error %d\n", GetLastError()); + ok(WaitForSingleObject(hthread, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + CloseHandle(hthread); + #undef track_hover #undef track_query +#undef track_leave #undef track_hover_cancel +#undef track_leave_cancel } diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 052fdd8..efff279 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -53,6 +53,7 @@ enum wine_internal_message WM_WINE_KEYBOARD_LL_HOOK, WM_WINE_MOUSE_LL_HOOK, WM_WINE_CLIPCURSOR, + WM_WINE_TRACKMOUSEEVENT, WM_WINE_FIRST_DRIVER_MSG = 0x80001000, /* range of messages reserved for the USER driver */ WM_WINE_LAST_DRIVER_MSG = 0x80001fff }; @@ -163,6 +164,13 @@ struct wm_char_mapping_data MSG get_msg; }; +/* data for TrackMouseEvent */ +struct tracking_info { + TRACKMOUSEEVENT tme; + POINT pos; /* center of hover rectangle */ + UINT_PTR timer; +}; + /* this is the structure stored in TEB->Win32ClientInfo */ /* no attempt is made to keep the layout compatible with the Windows one */ struct user_thread_info @@ -185,6 +193,7 @@ struct user_thread_info HWND top_window; /* Desktop window */ HWND msg_window; /* HWND_MESSAGE parent window */ RAWINPUT *rawinput; + struct tracking_info tracking_info; }; C_ASSERT( sizeof(struct user_thread_info) <= sizeof(((TEB *)0)->Win32ClientInfo) ); @@ -225,6 +234,8 @@ struct tagWND; extern void CLIPBOARD_ReleaseOwner( HWND hwnd ) DECLSPEC_HIDDEN; extern BOOL FOCUS_MouseActivate( HWND hwnd ) DECLSPEC_HIDDEN; extern BOOL set_capture_window( HWND hwnd, UINT gui_flags, HWND *prev_ret ) DECLSPEC_HIDDEN; +extern void check_mouse_leave(HWND hwnd, int hittest) DECLSPEC_HIDDEN; +extern void track_mouse_event_internal(HWND hwnd, DWORD flags, DWORD hover_time) DECLSPEC_HIDDEN; extern void free_dce( struct dce *dce, HWND hwnd ) DECLSPEC_HIDDEN; extern void invalidate_dce( struct tagWND *win, const RECT *rect ) DECLSPEC_HIDDEN; extern void erase_now( HWND hwnd, UINT rdw_flags ) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index a0bfe05..cc8dac8 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -114,7 +114,7 @@ static x11drv_event_handler handlers[MAX_EVENT_HANDLERS] = X11DRV_ButtonRelease, /* 5 ButtonRelease */ X11DRV_MotionNotify, /* 6 MotionNotify */ X11DRV_EnterNotify, /* 7 EnterNotify */ - NULL, /* 8 LeaveNotify */ + X11DRV_LeaveNotify, /* 8 LeaveNotify */ X11DRV_FocusIn, /* 9 FocusIn */ X11DRV_FocusOut, /* 10 FocusOut */ X11DRV_KeymapNotify, /* 11 KeymapNotify */ diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 5ace405..092c381 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -1447,6 +1447,7 @@ BOOL CDECL X11DRV_GetCursorPos(LPPOINT pos) *pos = root_to_virtual_screen( winX, winY ); TRACE( "pointer at %s server pos %s\n", wine_dbgstr_point(pos), wine_dbgstr_point(&old) ); } + return ret; } @@ -1690,6 +1691,34 @@ BOOL X11DRV_EnterNotify( HWND hwnd, XEvent *xev ) return TRUE; } +/*********************************************************************** + * X11DRV_LeaveNotify + */ +BOOL X11DRV_LeaveNotify( HWND hwnd, XEvent *xev ) +{ + XCrossingEvent *event = &xev->xcrossing; + INPUT input; + + TRACE( "hwnd %p/%lx pos %d,%d detail %d\n", hwnd, event->window, event->x, event->y, event->detail ); + + if (event->detail == NotifyVirtual) return FALSE; + if (hwnd == x11drv_thread_data()->grab_hwnd) return FALSE; + + /* simulate a mouse motion event - needed for TrackMouseEvent */ + input.u.mi.dx = event->x; + input.u.mi.dy = event->y; + input.u.mi.mouseData = 0; + input.u.mi.dwFlags = MOUSEEVENTF_MOVE | MOUSEEVENTF_ABSOLUTE; + input.u.mi.time = EVENT_x11_time_to_win32_time( event->time ); + input.u.mi.dwExtraInfo = 0; + + /* Note: not calling is_old_motion_event because leave message is not simulated when warping cursor */ + + send_mouse_input( hwnd, event->window, event->state, &input ); + return TRUE; +} + + #ifdef HAVE_X11_EXTENSIONS_XINPUT2_H /*********************************************************************** diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index d35328c..2626c93 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -326,7 +326,7 @@ static int get_window_attributes( struct x11drv_win_data *data, XSetWindowAttrib attr->backing_store = NotUseful; attr->border_pixel = 0; attr->event_mask = (ExposureMask | PointerMotionMask | - ButtonPressMask | ButtonReleaseMask | EnterWindowMask | + ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | KeyPressMask | KeyReleaseMask | FocusChangeMask | KeymapStateMask | StructureNotifyMask); if (data->managed) attr->event_mask |= PropertyChangeMask; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 938ff22..1ee1c15 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -508,6 +508,7 @@ extern BOOL X11DRV_ButtonPress( HWND hwnd, XEvent *event ) DECLSPEC_HIDDEN; extern BOOL X11DRV_ButtonRelease( HWND hwnd, XEvent *event ) DECLSPEC_HIDDEN; extern BOOL X11DRV_MotionNotify( HWND hwnd, XEvent *event ) DECLSPEC_HIDDEN; extern BOOL X11DRV_EnterNotify( HWND hwnd, XEvent *event ) DECLSPEC_HIDDEN; +extern BOOL X11DRV_LeaveNotify( HWND hwnd, XEvent *event ) DECLSPEC_HIDDEN; extern BOOL X11DRV_KeyEvent( HWND hwnd, XEvent *event ) DECLSPEC_HIDDEN; extern BOOL X11DRV_KeymapNotify( HWND hwnd, XEvent *event ) DECLSPEC_HIDDEN; extern BOOL X11DRV_DestroyNotify( HWND hwnd, XEvent *event ) DECLSPEC_HIDDEN; -- 2.7.4

2 1

[PATCH v2] comctl32/tests: Detect and handle an RTL locale.
by Alex Henrie 21 Nov '17

21 Nov '17

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Fixes failures on Arabic and Hebrew Windows. v2: Use LOCALE_IREADINGLAYOUT, a Windows 7 feature, to detect RTL locales because it looks like Hebrew and Arabic propsheet resources didn't exist until Windows 7 anyway. --- dlls/comctl32/tests/propsheet.c | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index a3f910d2d5..ec53e6bc7c 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -29,11 +29,19 @@ static HWND parenthwnd; static HWND sheethwnd; +static BOOL rtl; static LONG active_page = -1; #define IDC_APPLY_BUTTON 12321 +static void detect_locale(void) +{ + DWORD reading_layout; + rtl = GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_IREADINGLAYOUT | LOCALE_RETURN_NUMBER, + (void *)&reading_layout, sizeof(reading_layout)) && reading_layout == 1; +} + /* try to make sure pending X events have been processed before continuing */ static void flush_events(void) { @@ -496,19 +504,28 @@ static void test_buttons(void) button = GetDlgItem(hdlg, IDCANCEL); GetWindowRect(button, &rc); ok(rc.top == top, "Cancel button should have same top as OK button\n"); - ok(rc.left > prevRight, "Cancel button should be to the right of OK button\n"); + if (rtl) + ok(rc.left < prevRight, "Cancel button should be to the left of OK button\n"); + else + ok(rc.left > prevRight, "Cancel button should be to the right of OK button\n"); prevRight = rc.right; button = GetDlgItem(hdlg, IDC_APPLY_BUTTON); GetWindowRect(button, &rc); ok(rc.top == top, "Apply button should have same top as OK button\n"); - ok(rc.left > prevRight, "Apply button should be to the right of Cancel button\n"); + if (rtl) + ok(rc.left < prevRight, "Apply button should be to the left of Cancel button\n"); + else + ok(rc.left > prevRight, "Apply button should be to the right of Cancel button\n"); prevRight = rc.right; button = GetDlgItem(hdlg, IDHELP); GetWindowRect(button, &rc); ok(rc.top == top, "Help button should have same top as OK button\n"); - ok(rc.left > prevRight, "Help button should be to the right of Apply button\n"); + if (rtl) + ok(rc.left < prevRight, "Help button should be to the left of Apply button\n"); + else + ok(rc.left > prevRight, "Help button should be to the right of Apply button\n"); DestroyWindow(hdlg); } @@ -1124,6 +1141,15 @@ static void test_CreatePropertySheetPage(void) START_TEST(propsheet) { + detect_locale(); + if (rtl) + { + /* use locale-specific RTL resources when on an RTL locale */ + /* without this, propsheets on RTL locales use English LTR resources */ + trace("RTL locale detected\n"); + SetProcessDefaultLayout(LAYOUT_RTL); + } + test_title(); test_nopage(); test_disableowner(); -- 2.15.0

1 0

[PATCH] comctl32/tests: Detect and handle an RTL locale.
by Alex Henrie 21 Nov '17

21 Nov '17

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Fixes failures on Arabic and Hebrew Windows. I decided to check LOCALE_FONTSIGNATURE instead of LOCALE_IREADINGLAYOUT because LOCALE_FONTSIGNATURE is available on Windows XP. --- dlls/comctl32/tests/propsheet.c | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index a3f910d2d5..15ea083b63 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -29,11 +29,19 @@ static HWND parenthwnd; static HWND sheethwnd; +static BOOL rtl; static LONG active_page = -1; #define IDC_APPLY_BUTTON 12321 +static void detect_locale() +{ + LOCALESIGNATURE locale_sig; + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_FONTSIGNATURE, (void *)&locale_sig, sizeof(locale_sig)/sizeof(WCHAR)); + rtl = !!(locale_sig.lsUsb[3] & 0x08000000); +} + /* try to make sure pending X events have been processed before continuing */ static void flush_events(void) { @@ -496,19 +504,28 @@ static void test_buttons(void) button = GetDlgItem(hdlg, IDCANCEL); GetWindowRect(button, &rc); ok(rc.top == top, "Cancel button should have same top as OK button\n"); - ok(rc.left > prevRight, "Cancel button should be to the right of OK button\n"); + if (rtl) + ok(rc.left < prevRight, "Cancel button should be to the left of OK button\n"); + else + ok(rc.left > prevRight, "Cancel button should be to the right of OK button\n"); prevRight = rc.right; button = GetDlgItem(hdlg, IDC_APPLY_BUTTON); GetWindowRect(button, &rc); ok(rc.top == top, "Apply button should have same top as OK button\n"); - ok(rc.left > prevRight, "Apply button should be to the right of Cancel button\n"); + if (rtl) + ok(rc.left < prevRight, "Apply button should be to the left of Cancel button\n"); + else + ok(rc.left > prevRight, "Apply button should be to the right of Cancel button\n"); prevRight = rc.right; button = GetDlgItem(hdlg, IDHELP); GetWindowRect(button, &rc); ok(rc.top == top, "Help button should have same top as OK button\n"); - ok(rc.left > prevRight, "Help button should be to the right of Apply button\n"); + if (rtl) + ok(rc.left < prevRight, "Help button should be to the left of Apply button\n"); + else + ok(rc.left > prevRight, "Help button should be to the right of Apply button\n"); DestroyWindow(hdlg); } @@ -1124,6 +1141,15 @@ static void test_CreatePropertySheetPage(void) START_TEST(propsheet) { + detect_locale(); + if (rtl) + { + /* use locale-specific RTL resources when on an RTL locale */ + /* without this, propsheets on RTL locales use English LTR resources */ + trace("RTL locale detected\n"); + SetProcessDefaultLayout(LAYOUT_RTL); + } + test_title(); test_nopage(); test_disableowner(); -- 2.15.0

2 1

[PATCH 1/3] winemac: Keep the result string in the IME UI window procedure.
by Akihiro Sagawa 20 Nov '17

20 Nov '17

This is winemac.drv port from winex11.drv. Please refer b8dc1e7cde64c212882958c0806b50911a360fb9. I've not tested this code, but I believe it works. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winemac.drv/ime.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)

3 4

[PATCH] wbemprox: Support NULL tests that use equality operators.
by Hans Leidekker 20 Nov '17

20 Nov '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/tests/query.c | 8 +++++++- dlls/wbemprox/wql.y | 24 ++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 083a717185..79b09c0966 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -106,8 +106,14 @@ static void test_select( IWbemServices *services ) {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', 'W','i','n','3','2','_','V','i','d','e','o','C','o','n','t','r','o','l','l','e','r',' ','w','h','e','r','e',' ', 'a','v','a','i','l','a','b','i','l','i','t','y',' ','=',' ','\'','3','\'',0}; + static const WCHAR query12[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_','B','I','O','S', + ' ','W','H','E','R','E',' ','N','A','M','E',' ','<','>',' ','N','U','L','L', 0}; + static const WCHAR query13[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_','B','I','O','S', + ' ','W','H','E','R','E',' ','N','U','L','L',' ','=',' ','N','A','M','E', 0}; static const WCHAR *test[] = { query1, query2, query3, query4, query5, query6, query7, query8, query9, query10, - query11 }; + query11, query12, query13 }; HRESULT hr; IEnumWbemClassObject *result; BSTR wql = SysAllocString( wqlW ); diff --git a/dlls/wbemprox/wql.y b/dlls/wbemprox/wql.y index 98b0378677..88da2b9b0f 100644 --- a/dlls/wbemprox/wql.y +++ b/dlls/wbemprox/wql.y @@ -414,6 +414,30 @@ expr: if (!$$) YYABORT; } + | prop_val TK_EQ TK_NULL + { + $$ = expr_unary( ctx, $1, OP_ISNULL ); + if (!$$) + YYABORT; + } + | TK_NULL TK_EQ prop_val + { + $$ = expr_unary( ctx, $3, OP_ISNULL ); + if (!$$) + YYABORT; + } + | prop_val TK_NE TK_NULL + { + $$ = expr_unary( ctx, $1, OP_NOTNULL ); + if (!$$) + YYABORT; + } + | TK_NULL TK_NE prop_val + { + $$ = expr_unary( ctx, $3, OP_NOTNULL ); + if (!$$) + YYABORT; + } ; string_val: -- 2.11.0

1 0

Re: [v1] kernel32/tests: Test suspended process with new thread
by Marvin 20 Nov '17

20 Nov '17

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=34265 Your paranoid android. === w7u (32 bit process) === process.c:2868: Test failed: WaitForSingleObject returned 258

1 0

[PATCH v2] comctl32: Don't create a masked imagelist if CLR_NONE is specified.
by Huw Davies 20 Nov '17

20 Nov '17

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/comctl32/imagelist.c | 3 ++- dlls/comctl32/tests/imagelist.c | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 157344c633..70457c78f5 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -2037,7 +2037,8 @@ ImageList_LoadImageW (HINSTANCE hi, LPCWSTR lpbmp, INT cx, INT cGrow, nImageCount = dib.dsBm.bmWidth / cx; - himl = ImageList_Create (cx, dib.dsBm.bmHeight, ILC_MASK | color, nImageCount, cGrow); + if (clrMask != CLR_NONE) color |= ILC_MASK; + himl = ImageList_Create (cx, dib.dsBm.bmHeight, color, nImageCount, cGrow); if (!himl) { DeleteObject (handle); return NULL; diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 20be1ea02f..a489176e01 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -39,6 +39,7 @@ #include "wine/test.h" #include "v6util.h" +#include "resources.h" #define IMAGELIST_MAGIC (('L' << 8) | 'I') @@ -67,6 +68,7 @@ static HRESULT (WINAPI *pImageList_CoCreateInstance)(REFCLSID,const IUnknown *, REFIID,void **); static HRESULT (WINAPI *pHIMAGELIST_QueryInterface)(HIMAGELIST,REFIID,void **); static int (WINAPI *pImageList_SetColorTable)(HIMAGELIST,int,int,RGBQUAD*); +static DWORD (WINAPI *pImageList_GetFlags)(HIMAGELIST); static HINSTANCE hinst; @@ -2237,6 +2239,26 @@ static void test_copy(void) ImageList_Destroy(src); } +static void test_loadimage(void) +{ + HIMAGELIST list; + DWORD flags; + + list = ImageList_LoadImageW( hinst, MAKEINTRESOURCEW(IDB_BITMAP_128x15), 16, 1, CLR_DEFAULT, + IMAGE_BITMAP, LR_CREATEDIBSECTION ); + ok( list != NULL, "got %p\n", list ); + flags = pImageList_GetFlags( list ); + ok( flags == (ILC_COLOR4 | ILC_MASK), "got %08x\n", flags ); + ImageList_Destroy( list ); + + list = ImageList_LoadImageW( hinst, MAKEINTRESOURCEW(IDB_BITMAP_128x15), 16, 1, CLR_NONE, + IMAGE_BITMAP, LR_CREATEDIBSECTION ); + ok( list != NULL, "got %p\n", list ); + flags = pImageList_GetFlags( list ); + ok( flags == ILC_COLOR4, "got %08x\n", flags ); + ImageList_Destroy( list ); +} + static void test_IImageList_Clone(void) { IImageList *imgl, *imgl2; @@ -2370,6 +2392,7 @@ START_TEST(imagelist) pImageList_DrawIndirect = (void*)GetProcAddress(hComCtl32, "ImageList_DrawIndirect"); pImageList_SetImageCount = (void*)GetProcAddress(hComCtl32, "ImageList_SetImageCount"); pImageList_SetColorTable = (void*)GetProcAddress(hComCtl32, (const char*)390); + pImageList_GetFlags = (void*)GetProcAddress(hComCtl32, "ImageList_GetFlags"); hinst = GetModuleHandleA(NULL); @@ -2388,6 +2411,7 @@ START_TEST(imagelist) test_color_table(ILC_COLOR4); test_color_table(ILC_COLOR8); test_copy(); + test_loadimage(); FreeLibrary(hComCtl32); -- 2.12.0

1 0

[PATCH] comctl32: Don't create a masked imagelist if CLR_NONE is specified.
by Huw Davies 20 Nov '17

20 Nov '17

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/comctl32/imagelist.c | 9 +++++---- dlls/comctl32/tests/imagelist.c | 24 ++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 157344c633..49151145cf 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -2018,10 +2018,10 @@ ImageList_LoadImageW (HINSTANCE hi, LPCWSTR lpbmp, INT cx, INT cGrow, if (uType == IMAGE_BITMAP) { DIBSECTION dib; - UINT color; + UINT flags; - if (GetObjectW (handle, sizeof(dib), &dib) == sizeof(BITMAP)) color = ILC_COLOR; - else color = dib.dsBm.bmBitsPixel; + if (GetObjectW (handle, sizeof(dib), &dib) == sizeof(BITMAP)) flags = ILC_COLOR; + else flags = dib.dsBm.bmBitsPixel; /* To match windows behavior, if cx is set to zero and the flag DI_DEFAULTSIZE is specified, cx becomes the @@ -2037,7 +2037,8 @@ ImageList_LoadImageW (HINSTANCE hi, LPCWSTR lpbmp, INT cx, INT cGrow, nImageCount = dib.dsBm.bmWidth / cx; - himl = ImageList_Create (cx, dib.dsBm.bmHeight, ILC_MASK | color, nImageCount, cGrow); + if (clrMask != CLR_NONE) flags |= ILC_MASK; + himl = ImageList_Create (cx, dib.dsBm.bmHeight, flags, nImageCount, cGrow); if (!himl) { DeleteObject (handle); return NULL; diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 20be1ea02f..a489176e01 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -39,6 +39,7 @@ #include "wine/test.h" #include "v6util.h" +#include "resources.h" #define IMAGELIST_MAGIC (('L' << 8) | 'I') @@ -67,6 +68,7 @@ static HRESULT (WINAPI *pImageList_CoCreateInstance)(REFCLSID,const IUnknown *, REFIID,void **); static HRESULT (WINAPI *pHIMAGELIST_QueryInterface)(HIMAGELIST,REFIID,void **); static int (WINAPI *pImageList_SetColorTable)(HIMAGELIST,int,int,RGBQUAD*); +static DWORD (WINAPI *pImageList_GetFlags)(HIMAGELIST); static HINSTANCE hinst; @@ -2237,6 +2239,26 @@ static void test_copy(void) ImageList_Destroy(src); } +static void test_loadimage(void) +{ + HIMAGELIST list; + DWORD flags; + + list = ImageList_LoadImageW( hinst, MAKEINTRESOURCEW(IDB_BITMAP_128x15), 16, 1, CLR_DEFAULT, + IMAGE_BITMAP, LR_CREATEDIBSECTION ); + ok( list != NULL, "got %p\n", list ); + flags = pImageList_GetFlags( list ); + ok( flags == (ILC_COLOR4 | ILC_MASK), "got %08x\n", flags ); + ImageList_Destroy( list ); + + list = ImageList_LoadImageW( hinst, MAKEINTRESOURCEW(IDB_BITMAP_128x15), 16, 1, CLR_NONE, + IMAGE_BITMAP, LR_CREATEDIBSECTION ); + ok( list != NULL, "got %p\n", list ); + flags = pImageList_GetFlags( list ); + ok( flags == ILC_COLOR4, "got %08x\n", flags ); + ImageList_Destroy( list ); +} + static void test_IImageList_Clone(void) { IImageList *imgl, *imgl2; @@ -2370,6 +2392,7 @@ START_TEST(imagelist) pImageList_DrawIndirect = (void*)GetProcAddress(hComCtl32, "ImageList_DrawIndirect"); pImageList_SetImageCount = (void*)GetProcAddress(hComCtl32, "ImageList_SetImageCount"); pImageList_SetColorTable = (void*)GetProcAddress(hComCtl32, (const char*)390); + pImageList_GetFlags = (void*)GetProcAddress(hComCtl32, "ImageList_GetFlags"); hinst = GetModuleHandleA(NULL); @@ -2388,6 +2411,7 @@ START_TEST(imagelist) test_color_table(ILC_COLOR4); test_color_table(ILC_COLOR8); test_copy(); + test_loadimage(); FreeLibrary(hComCtl32); -- 2.12.0

1 1

[PATCH] comctl32/tests: Fix propsheet template buffer size test on RTL locales
by Alex Henrie 20 Nov '17

20 Nov '17

Fixes test failures on Arabic and Hebrew Windows. For some reason, on these locales Windows uses a different formula for allocating the template buffer, allocating a little more than 2 times the resource size on Hebrew and a little less on Arabic. Because we don't know how exactly the buffer size is determined on these locales, just accept a size near 2 times the resource size. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/comctl32/tests/propsheet.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index a3f910d2d5..68dce519bb 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -58,16 +58,21 @@ static int CALLBACK sheet_callback(HWND hwnd, UINT msg, LPARAM lparam) case PSCB_PRECREATE: { HMODULE module = GetModuleHandleA("comctl32.dll"); + HMODULE kernel32 = GetModuleHandleA("kernel32.dll"); + LANGID (WINAPI *pGetThreadUILanguage)(void) = (void *)GetProcAddress(kernel32, "GetThreadUILanguage"); DWORD size, buffer_size; HRSRC hrsrc; + int reading_layout; hrsrc = FindResourceA(module, MAKEINTRESOURCEA(1006 /* IDD_PROPSHEET */), (LPSTR)RT_DIALOG); size = SizeofResource(module, hrsrc); ok(size != 0, "Failed to get size of propsheet dialog resource\n"); buffer_size = HeapSize(GetProcessHeap(), 0, (void *)lparam); - ok(buffer_size == 2 * size, "Unexpected template buffer size %u, resource size %u\n", - buffer_size, size); + GetLocaleInfoA(pGetThreadUILanguage ? pGetThreadUILanguage() : GetUserDefaultUILanguage(), + LOCALE_IREADINGLAYOUT | LOCALE_RETURN_NUMBER, (void *)&reading_layout, sizeof(reading_layout)); + ok(reading_layout == 2 /* RTL */ ? abs(buffer_size - 2 * size) <= 32 : buffer_size == 2 * size, + "Unexpected template buffer size %u, resource size %u\n", buffer_size, size); break; } case PSCB_INITIALIZED: -- 2.15.0

4 7

[PATCH v4 1/2] gdi32: In AddFaceToList allow fonts with long names and add tests
by Fabian Maurer 19 Nov '17

19 Nov '17

v4 remove global variable don't check if functions are available fix RemoveFontResourceExA test properly release dc add another test for completeness sake Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/gdi32/freetype.c | 9 ++--- dlls/gdi32/tests/font.c | 54 ++++++++++++++++++++++++++++++ dlls/gdi32/tests/resource.rc | 3 ++ dlls/gdi32/tests/wine_longname.sfd | 66 +++++++++++++++++++++++++++++++++++++ dlls/gdi32/tests/wine_longname.ttf | Bin 0 -> 2252 bytes 5 files changed, 128 insertions(+), 4 deletions(-) create mode 100644 dlls/gdi32/tests/wine_longname.sfd create mode 100644 dlls/gdi32/tests/wine_longname.ttf diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 346e21dc21..8be1bfe22e 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1571,6 +1571,9 @@ static BOOL insert_face_in_family_list( Face *face, Family *family ) face->family = family; family->refcount++; face->refcount++; + /* GDI32 can't deal with long names, truncate them */ + if (face->FullName && lstrlenW(face->FullName) > LF_FACESIZE - 1) + face->FullName[LF_FACESIZE - 1] = 0; return TRUE; } @@ -2143,10 +2146,8 @@ static void AddFaceToList(FT_Face ft_face, const char *file, void *font_data_ptr family = get_family( ft_face, flags & ADDFONT_VERTICAL_FONT ); if (strlenW(family->FamilyName) >= LF_FACESIZE) { - WARN("Ignoring %s because name is too long\n", debugstr_w(family->FamilyName)); - release_face( face ); - release_family( family ); - return; + WARN("Truncating %s because name is too long\n", debugstr_w(family->FamilyName)); + family->FamilyName[LF_FACESIZE - 1] = 0; } if (insert_face_in_family_list( face, family )) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 299fadbab1..bd04a8b6b1 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -6679,6 +6679,59 @@ static void test_GetCharWidthI(void) ReleaseDC(0, hdc); } +static INT CALLBACK long_enum_proc(const LOGFONTA *lf, const TEXTMETRICA *tm, DWORD type, LPARAM lparam) +{ + BOOL *found_font = (BOOL *)lparam; + *found_font = TRUE; + return 1; +} + +static void test_long_names(void) +{ + char ttf_name[MAX_PATH]; + LOGFONTA font = {0}; + HFONT handle_font; + BOOL found_font; + int ret; + HDC dc; + + if (!write_ttf_file("wine_longname.ttf", ttf_name)) + { + skip("Failed to create ttf file for testing\n"); + return; + } + + dc = GetDC(NULL); + + ret = AddFontResourceExA(ttf_name, FR_PRIVATE, 0); + ok(ret, "AddFontResourceEx() failed\n"); + + strcpy(font.lfFaceName, "wine_3_this_is_a_very_long_name"); + found_font = FALSE; + EnumFontFamiliesExA(dc, &font, long_enum_proc, (LPARAM)&found_font, 0); + ok(found_font == TRUE, "EnumFontFamiliesExA didn't find font.\n"); + + strcpy(font.lfFaceName, "wine_2_this_is_a_very_long_name"); + found_font = FALSE; + EnumFontFamiliesExA(dc, &font, long_enum_proc, (LPARAM)&found_font, 0); + ok(found_font == TRUE, "EnumFontFamiliesExA didn't find font.\n"); + + strcpy(font.lfFaceName, "wine_1_this_is_a_very_long_name"); + found_font = FALSE; + EnumFontFamiliesExA(dc, &font, long_enum_proc, (LPARAM)&found_font, 0); + ok(found_font == FALSE, "EnumFontFamiliesExA must not find font.\n"); + + handle_font = CreateFontIndirectA(&font); + ok(handle_font != NULL, "CreateFontIndirectA failed\n"); + DeleteObject(handle_font); + + ret = RemoveFontResourceExA(ttf_name, FR_PRIVATE, 0); + ok(ret, "RemoveFontResourceEx() failed\n"); + + DeleteFileA(ttf_name); + ReleaseDC(NULL, dc); +} + START_TEST(font) { init(); @@ -6742,6 +6795,7 @@ START_TEST(font) test_fake_bold_font(); test_bitmap_font_glyph_index(); test_GetCharWidthI(); + test_long_names(); /* These tests should be last test until RemoveFontResource * is properly implemented. diff --git a/dlls/gdi32/tests/resource.rc b/dlls/gdi32/tests/resource.rc index fdd95f687a..6dcbd42ab5 100644 --- a/dlls/gdi32/tests/resource.rc +++ b/dlls/gdi32/tests/resource.rc @@ -28,3 +28,6 @@ wine_vdmx.ttf RCDATA wine_vdmx.ttf /* @makedep: vertical.ttf */ vertical.ttf RCDATA vertical.ttf + +/* @makedep: wine_longname.ttf */ +wine_longname.ttf RCDATA wine_longname.ttf diff --git a/dlls/gdi32/tests/wine_longname.sfd b/dlls/gdi32/tests/wine_longname.sfd new file mode 100644 index 0000000000..998d7cc01f --- /dev/null +++ b/dlls/gdi32/tests/wine_longname.sfd @@ -0,0 +1,66 @@ +SplineFontDB: 3.0 +FontName: wine_1_this_is_a_very_long_name_that_might_be_too_long_for_gdi32 +FullName: wine_2_this_is_a_very_long_name_that_might_be_too_long_for_gdi32 +FamilyName: wine_3_this_is_a_very_long_name_that_might_be_too_long_for_gdi32 +Weight: Regular +Copyright: Copyright (c) 2017, Fabian Maurer +UComments: "2017-11-17: Created with FontForge (http://fontforge.org)" +Version: 001.000 +ItalicAngle: 0 +UnderlinePosition: -102.4 +UnderlineWidth: 51.2 +Ascent: 819 +Descent: 205 +InvalidEm: 0 +LayerCount: 2 +Layer: 0 0 "Back" 1 +Layer: 1 0 "Fore" 0 +XUID: [1021 48 28337276 3092883] +OS2Version: 0 +OS2_WeightWidthSlopeOnly: 0 +OS2_UseTypoMetrics: 1 +CreationTime: 1510948643 +ModificationTime: 1510949092 +OS2TypoAscent: 0 +OS2TypoAOffset: 1 +OS2TypoDescent: 0 +OS2TypoDOffset: 1 +OS2TypoLinegap: 0 +OS2WinAscent: 0 +OS2WinAOffset: 1 +OS2WinDescent: 0 +OS2WinDOffset: 1 +HheadAscent: 0 +HheadAOffset: 1 +HheadDescent: 0 +HheadDOffset: 1 +OS2Vendor: 'PfEd' +MarkAttachClasses: 1 +DEI: 91125 +Encoding: ISO8859-1 +UnicodeInterp: none +NameList: AGL For New Fonts +DisplaySize: -48 +AntiAlias: 1 +FitToEm: 0 +WinInfo: 64 16 4 +BeginPrivate: 0 +EndPrivate +BeginChars: 256 1 + +StartChar: at +Encoding: 64 64 0 +Width: 1024 +VWidth: 0 +Flags: HW +LayerCount: 2 +Fore +SplineSet +259 332 m 29 + 468 664 l 29 + 514 332 l 29 + 259 332 l 29 +EndSplineSet +EndChar +EndChars +EndSplineFont diff --git a/dlls/gdi32/tests/wine_longname.ttf b/dlls/gdi32/tests/wine_longname.ttf new file mode 100644 index 0000000000000000000000000000000000000000..59d9517560592e9578f1510f99f4fb65065c1195 GIT binary patch literal 2252 zcmdT`J!~6Q9RIz$vy(ze6NyY%=$Z!6pv1io)Gv83{V*L80j0`9(dA;F&nMYF>wHP- zEn;Fof`I`fHnvbz#A0FuAu(hCArJ#BOqEKh7`jo+@4dUk$yy{T-ueID|MR{7*WEJ& zfGKQ4$6Bp+W96OM-;M#3pOag9^~%*6X7McP4<-HDn`fNWg1-fb7U{Km$M4}p@gC`) z376`dsfju5T|h5UZiIfnHyUwgOuk2YGHef;-|P-8$`?uZT7lnq=Jxy@;=dElw#X<P zGYZ^mp7eaHlioTG@dD{@Nl&-qx{r0-puI`@sg8fEhikY%`8CpJ*Y5=DvzvRAf5PLx z>c#zZw1cxedX4gzAY&y=efL?(J5hOvrwuZIpI(0OX}12^z#O1y+79VSXp+l88^yVq z>1&$WDU)Thp*Y5YjkFYsS4CN=7*zQHj7|Gkqlb7uTg5%Nf*IFP;G7TX=fQZrd9}g% zR8iI4k&Bzk6Xnx^iU~o_=sBZSAeeKRcLk-~+X^YUbBRhOSA&nFtE`clM_=cf5XJEU zLdGKD@Hpb(VZj)e$N$fV>Sgwge9ki#P3BlQtbmRQly?QrRE84<?mN51!Y`Gft`Wtq zF4+ai9!?a+UzH(Kc;9hnPR_jO&YYSP(|_#kX*-Wr=d>ob6S`Pt$9*JoES@9zeOWAv z<-fm>$(zER{hHt;uH?8t6?b!7!-Tky<2v3Jk8<2VRr@u^3z*icIbLKR{UAHRko|Uv zkl}(o*35AYQ(_^<b$lsa$#DbQ+FLnZfT=&9<3()iZ{RXw^e{kz2q9WX*=46u#{yRe z7HpiuBJmpJTO4ujl3L-qL7RYp%W-dzL}4p6PuCYr$Fk2Ynl*nt^1J4WzmWt~*`j5a z+8$g&%5x(0iDk1-Y*XzuAl9ZwUHam2_R&#R(!!^mM|$5+kN(IVQ|iY@?3$z#azZqy z?J^E*Mcu%2y|fkeJ^p-eGe`zrJMM;_`~Xqlr(Q<};jNR3<4o3!6EAE;E_b-j!$Jn# zrX!5#dJt~3eIhmGZmQOV8i7h&nW-~zkuVP3QO^F?p=Vy$d=-{hOq=t5Sy79-X)R8| zz;w!%dC^o!avncP+`>M;WZO%!2M!ng$wZzN{a?fbtg@U5J2g^8Hd$2pM#$pI$D~4# z^rN_IT9#e5EQ_3Rz3nGb?<{Kj@vF#>%l^$V+UDEC51eEj8S=ss)H<cOf_KsQc0JDj V9#YOPqq5Ab)%@daq1MB9_dm8?dc^<$ literal 0 HcmV?d00001 -- 2.15.0

2 2

[PATCH v2] include: Add optional ANSI color codes for winetests and debug macros.
by Rafał Harabień 19 Nov '17

19 Nov '17

By default colors are disabled. Use WINETEST_COLOR=1 to enable colors in tests. Use WINEDEBUG_COLOR=1 to enable colors in debug messages. Second version of the patch fixes compiler warnings. Signed-off-by: Rafał Harabień <rafalh1992(a)o2.pl> --- include/wine/test.h | 14 ++++++++++++++ libs/wine/debug.c | 14 +++++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/include/wine/test.h b/include/wine/test.h index 4ec66d5..3388414 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -206,6 +206,9 @@ const char *winetest_platform = "windows"; /* report successful tests (BOOL) */ static int report_success = 0; +/* use ANSI escape codes for output coloring */ +static int winetest_color = 0; + /* passing arguments around */ static int winetest_argc; static char** winetest_argv; @@ -303,14 +306,20 @@ int broken( int condition ) int winetest_vok( int condition, const char *msg, __winetest_va_list args ) { struct tls_data *data = get_tls_data(); + const char *color_red = "\e[91m"; + const char *color_reset = "\e[39m"; if (data->todo_level) { if (condition) { + if (winetest_color) + printf("%s", color_red); printf( "%s:%d: Test succeeded inside todo block: ", data->current_file, data->current_line ); vprintf(msg, args); + if (winetest_color) + printf("%s", color_reset); InterlockedIncrement(&todo_failures); return 0; } @@ -330,9 +339,13 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) { if (!condition) { + if (winetest_color) + printf("%s", color_red); printf( "%s:%d: Test failed: ", data->current_file, data->current_line ); vprintf(msg, args); + if (winetest_color) + printf("%s", color_reset); InterlockedIncrement(&failures); return 0; } @@ -669,6 +682,7 @@ int main( int argc, char **argv ) if (GetEnvironmentVariableA( "WINETEST_DEBUG", p, sizeof(p) )) winetest_debug = atoi(p); if (GetEnvironmentVariableA( "WINETEST_INTERACTIVE", p, sizeof(p) )) winetest_interactive = atoi(p); if (GetEnvironmentVariableA( "WINETEST_REPORT_SUCCESS", p, sizeof(p) )) report_success = atoi(p); + if (GetEnvironmentVariableA( "WINETEST_COLOR", p, sizeof(p) )) winetest_color = atoi(p); if (!strcmp( winetest_platform, "windows" )) SetUnhandledExceptionFilter( exc_filter ); if (!winetest_interactive) SetErrorMode( SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX ); diff --git a/libs/wine/debug.c b/libs/wine/debug.c index 8b04ef9..af84e67 100644 --- a/libs/wine/debug.c +++ b/libs/wine/debug.c @@ -39,12 +39,14 @@ WINE_DECLARE_DEBUG_CHANNEL(pid); #endif static const char * const debug_classes[] = { "fixme", "err", "warn", "trace" }; +static const char * const debug_classes_color[] = { "\e[93m", "\e[91m", "\e[93m", "" }; #define MAX_DEBUG_OPTIONS 256 static unsigned char default_flags = (1 << __WINE_DBCL_ERR) | (1 << __WINE_DBCL_FIXME); static int nb_debug_options = -1; static struct __wine_debug_channel debug_options[MAX_DEBUG_OPTIONS]; +static int debug_color = 0; static struct __wine_debug_functions funcs; @@ -193,7 +195,7 @@ static void debug_usage(void) /* initialize all options at startup */ static void debug_init(void) { - char *wine_debug; + char *wine_debug, *color; struct stat st1, st2; if (nb_debug_options != -1) return; /* already initialized */ @@ -212,6 +214,8 @@ static void debug_init(void) if (!strcmp( wine_debug, "help" )) debug_usage(); parse_options( wine_debug ); } + color = getenv("WINEDEBUG_COLOR"); + if (color != NULL) debug_color = atoi(color); } /* varargs wrapper for funcs.dbg_vprintf */ @@ -406,6 +410,7 @@ static int default_dbg_vlog( enum __wine_debug_class cls, struct __wine_debug_ch const char *func, const char *format, va_list args ) { int ret = 0; + const char *color_reset = "\e[39m"; #if defined(__MINGW32__) || defined(_MSC_VER) if (TRACE_ON(pid)) @@ -414,9 +419,16 @@ static int default_dbg_vlog( enum __wine_debug_class cls, struct __wine_debug_ch ret += wine_dbg_printf( "%04x:", GetCurrentThreadId() ); #endif if (cls < sizeof(debug_classes)/sizeof(debug_classes[0])) + { + if (debug_color) + ret += wine_dbg_printf( "%s", debug_classes_color[cls] ); ret += wine_dbg_printf( "%s:%s:%s ", debug_classes[cls], channel->name, func ); + } if (format) ret += funcs.dbg_vprintf( format, args ); + if (debug_color) + ret += wine_dbg_printf( "%s", color_reset ); + return ret; } -- 2.7.4

1 0

[PATCH v2 1/2] gdi32: In AddFaceToList allow fonts with long names and add tests
by Fabian Maurer 19 Nov '17

19 Nov '17

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/gdi32/freetype.c | 9 ++--- dlls/gdi32/tests/font.c | 51 ++++++++++++++++++++++++++++ dlls/gdi32/tests/resource.rc | 3 ++ dlls/gdi32/tests/wine_longname.sfd | 66 +++++++++++++++++++++++++++++++++++++ dlls/gdi32/tests/wine_longname.ttf | Bin 0 -> 2252 bytes 5 files changed, 125 insertions(+), 4 deletions(-) create mode 100644 dlls/gdi32/tests/wine_longname.sfd create mode 100644 dlls/gdi32/tests/wine_longname.ttf diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 346e21dc21..8be1bfe22e 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1571,6 +1571,9 @@ static BOOL insert_face_in_family_list( Face *face, Family *family ) face->family = family; family->refcount++; face->refcount++; + /* GDI32 can't deal with long names, truncate them */ + if (face->FullName && lstrlenW(face->FullName) > LF_FACESIZE - 1) + face->FullName[LF_FACESIZE - 1] = 0; return TRUE; } @@ -2143,10 +2146,8 @@ static void AddFaceToList(FT_Face ft_face, const char *file, void *font_data_ptr family = get_family( ft_face, flags & ADDFONT_VERTICAL_FONT ); if (strlenW(family->FamilyName) >= LF_FACESIZE) { - WARN("Ignoring %s because name is too long\n", debugstr_w(family->FamilyName)); - release_face( face ); - release_family( family ); - return; + WARN("Truncating %s because name is too long\n", debugstr_w(family->FamilyName)); + family->FamilyName[LF_FACESIZE - 1] = 0; } if (insert_face_in_family_list( face, family )) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 299fadbab1..acdaa02123 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -6679,10 +6679,61 @@ static void test_GetCharWidthI(void) ReleaseDC(0, hdc); } +static BOOL found_font; +static INT CALLBACK long_enum_proc(const LOGFONTA *lf, const TEXTMETRICA *tm, DWORD type, LPARAM lparam) +{ + found_font = TRUE; + return 1; +} + +static void test_long_names(void) +{ + char ttf_name[MAX_PATH]; + LOGFONTA font = {0}; + HFONT handle_font; + int ret; + + if (!pAddFontResourceExA || !pRemoveFontResourceExA) + { + win_skip("AddFontResourceExA is not available on this platform\n"); + return; + } + + if (!write_ttf_file("wine_longname.ttf", ttf_name)) + { + skip("Failed to create ttf file for testing\n"); + return; + } + + ret = pAddFontResourceExA(ttf_name, FR_PRIVATE, 0); + ok(ret, "AddFontResourceEx() failed\n"); + + strcpy(font.lfFaceName, "wine_3_this_is_a_very_long_name"); + found_font = FALSE; + EnumFontFamiliesExA(GetDC(0), &font, long_enum_proc, 0, 0); + ok(found_font == TRUE, "EnumFontFamiliesExA didn't find font.\n"); + + strcpy(font.lfFaceName, "wine_2_this_is_a_very_long_name"); + found_font = FALSE; + EnumFontFamiliesExA(GetDC(0), &font, long_enum_proc, 0, 0); + ok(found_font == TRUE, "EnumFontFamiliesExA didn't find font.\n"); + + handle_font = CreateFontIndirectA(&font); + ok(handle_font != NULL, "CreateFontIndirectA failed\n"); + DeleteObject(handle_font); + + + ret = pRemoveFontResourceExA(ttf_name, 0, 0); + ok(!ret, "RemoveFontResourceEx() should fail\n"); + + DeleteFileA(ttf_name); +} + START_TEST(font) { init(); + test_long_names(); test_stock_fonts(); test_logfont(); test_bitmap_font(); diff --git a/dlls/gdi32/tests/resource.rc b/dlls/gdi32/tests/resource.rc index fdd95f687a..6dcbd42ab5 100644 --- a/dlls/gdi32/tests/resource.rc +++ b/dlls/gdi32/tests/resource.rc @@ -28,3 +28,6 @@ wine_vdmx.ttf RCDATA wine_vdmx.ttf /* @makedep: vertical.ttf */ vertical.ttf RCDATA vertical.ttf + +/* @makedep: wine_longname.ttf */ +wine_longname.ttf RCDATA wine_longname.ttf diff --git a/dlls/gdi32/tests/wine_longname.sfd b/dlls/gdi32/tests/wine_longname.sfd new file mode 100644 index 0000000000..998d7cc01f --- /dev/null +++ b/dlls/gdi32/tests/wine_longname.sfd @@ -0,0 +1,66 @@ +SplineFontDB: 3.0 +FontName: wine_1_this_is_a_very_long_name_that_might_be_too_long_for_gdi32 +FullName: wine_2_this_is_a_very_long_name_that_might_be_too_long_for_gdi32 +FamilyName: wine_3_this_is_a_very_long_name_that_might_be_too_long_for_gdi32 +Weight: Regular +Copyright: Copyright (c) 2017, Fabian Maurer +UComments: "2017-11-17: Created with FontForge (http://fontforge.org)" +Version: 001.000 +ItalicAngle: 0 +UnderlinePosition: -102.4 +UnderlineWidth: 51.2 +Ascent: 819 +Descent: 205 +InvalidEm: 0 +LayerCount: 2 +Layer: 0 0 "Back" 1 +Layer: 1 0 "Fore" 0 +XUID: [1021 48 28337276 3092883] +OS2Version: 0 +OS2_WeightWidthSlopeOnly: 0 +OS2_UseTypoMetrics: 1 +CreationTime: 1510948643 +ModificationTime: 1510949092 +OS2TypoAscent: 0 +OS2TypoAOffset: 1 +OS2TypoDescent: 0 +OS2TypoDOffset: 1 +OS2TypoLinegap: 0 +OS2WinAscent: 0 +OS2WinAOffset: 1 +OS2WinDescent: 0 +OS2WinDOffset: 1 +HheadAscent: 0 +HheadAOffset: 1 +HheadDescent: 0 +HheadDOffset: 1 +OS2Vendor: 'PfEd' +MarkAttachClasses: 1 +DEI: 91125 +Encoding: ISO8859-1 +UnicodeInterp: none +NameList: AGL For New Fonts +DisplaySize: -48 +AntiAlias: 1 +FitToEm: 0 +WinInfo: 64 16 4 +BeginPrivate: 0 +EndPrivate +BeginChars: 256 1 + +StartChar: at +Encoding: 64 64 0 +Width: 1024 +VWidth: 0 +Flags: HW +LayerCount: 2 +Fore +SplineSet +259 332 m 29 + 468 664 l 29 + 514 332 l 29 + 259 332 l 29 +EndSplineSet +EndChar +EndChars +EndSplineFont diff --git a/dlls/gdi32/tests/wine_longname.ttf b/dlls/gdi32/tests/wine_longname.ttf new file mode 100644 index 0000000000000000000000000000000000000000..59d9517560592e9578f1510f99f4fb65065c1195 GIT binary patch literal 2252 zcmdT`J!~6Q9RIz$vy(ze6NyY%=$Z!6pv1io)Gv83{V*L80j0`9(dA;F&nMYF>wHP- zEn;Fof`I`fHnvbz#A0FuAu(hCArJ#BOqEKh7`jo+@4dUk$yy{T-ueID|MR{7*WEJ& zfGKQ4$6Bp+W96OM-;M#3pOag9^~%*6X7McP4<-HDn`fNWg1-fb7U{Km$M4}p@gC`) z376`dsfju5T|h5UZiIfnHyUwgOuk2YGHef;-|P-8$`?uZT7lnq=Jxy@;=dElw#X<P zGYZ^mp7eaHlioTG@dD{@Nl&-qx{r0-puI`@sg8fEhikY%`8CpJ*Y5=DvzvRAf5PLx z>c#zZw1cxedX4gzAY&y=efL?(J5hOvrwuZIpI(0OX}12^z#O1y+79VSXp+l88^yVq z>1&$WDU)Thp*Y5YjkFYsS4CN=7*zQHj7|Gkqlb7uTg5%Nf*IFP;G7TX=fQZrd9}g% zR8iI4k&Bzk6Xnx^iU~o_=sBZSAeeKRcLk-~+X^YUbBRhOSA&nFtE`clM_=cf5XJEU zLdGKD@Hpb(VZj)e$N$fV>Sgwge9ki#P3BlQtbmRQly?QrRE84<?mN51!Y`Gft`Wtq zF4+ai9!?a+UzH(Kc;9hnPR_jO&YYSP(|_#kX*-Wr=d>ob6S`Pt$9*JoES@9zeOWAv z<-fm>$(zER{hHt;uH?8t6?b!7!-Tky<2v3Jk8<2VRr@u^3z*icIbLKR{UAHRko|Uv zkl}(o*35AYQ(_^<b$lsa$#DbQ+FLnZfT=&9<3()iZ{RXw^e{kz2q9WX*=46u#{yRe z7HpiuBJmpJTO4ujl3L-qL7RYp%W-dzL}4p6PuCYr$Fk2Ynl*nt^1J4WzmWt~*`j5a z+8$g&%5x(0iDk1-Y*XzuAl9ZwUHam2_R&#R(!!^mM|$5+kN(IVQ|iY@?3$z#azZqy z?J^E*Mcu%2y|fkeJ^p-eGe`zrJMM;_`~Xqlr(Q<};jNR3<4o3!6EAE;E_b-j!$Jn# zrX!5#dJt~3eIhmGZmQOV8i7h&nW-~zkuVP3QO^F?p=Vy$d=-{hOq=t5Sy79-X)R8| zz;w!%dC^o!avncP+`>M;WZO%!2M!ng$wZzN{a?fbtg@U5J2g^8Hd$2pM#$pI$D~4# z^rN_IT9#e5EQ_3Rz3nGb?<{Kj@vF#>%l^$V+UDEC51eEj8S=ss)H<cOf_KsQc0JDj V9#YOPqq5Ab)%@daq1MB9_dm8?dc^<$ literal 0 HcmV?d00001 -- 2.15.0

4 11

[PATCH v3 1/2] gdi32: In AddFaceToList allow fonts with long names and add tests
by Fabian Maurer 18 Nov '17

18 Nov '17

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/gdi32/freetype.c | 9 ++--- dlls/gdi32/tests/font.c | 51 ++++++++++++++++++++++++++++ dlls/gdi32/tests/resource.rc | 3 ++ dlls/gdi32/tests/wine_longname.sfd | 66 +++++++++++++++++++++++++++++++++++++ dlls/gdi32/tests/wine_longname.ttf | Bin 0 -> 2252 bytes 5 files changed, 125 insertions(+), 4 deletions(-) create mode 100644 dlls/gdi32/tests/wine_longname.sfd create mode 100644 dlls/gdi32/tests/wine_longname.ttf diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 346e21dc21..8be1bfe22e 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1571,6 +1571,9 @@ static BOOL insert_face_in_family_list( Face *face, Family *family ) face->family = family; family->refcount++; face->refcount++; + /* GDI32 can't deal with long names, truncate them */ + if (face->FullName && lstrlenW(face->FullName) > LF_FACESIZE - 1) + face->FullName[LF_FACESIZE - 1] = 0; return TRUE; } @@ -2143,10 +2146,8 @@ static void AddFaceToList(FT_Face ft_face, const char *file, void *font_data_ptr family = get_family( ft_face, flags & ADDFONT_VERTICAL_FONT ); if (strlenW(family->FamilyName) >= LF_FACESIZE) { - WARN("Ignoring %s because name is too long\n", debugstr_w(family->FamilyName)); - release_face( face ); - release_family( family ); - return; + WARN("Truncating %s because name is too long\n", debugstr_w(family->FamilyName)); + family->FamilyName[LF_FACESIZE - 1] = 0; } if (insert_face_in_family_list( face, family )) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 299fadbab1..acdaa02123 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -6679,10 +6679,61 @@ static void test_GetCharWidthI(void) ReleaseDC(0, hdc); } +static BOOL found_font; +static INT CALLBACK long_enum_proc(const LOGFONTA *lf, const TEXTMETRICA *tm, DWORD type, LPARAM lparam) +{ + found_font = TRUE; + return 1; +} + +static void test_long_names(void) +{ + char ttf_name[MAX_PATH]; + LOGFONTA font = {0}; + HFONT handle_font; + int ret; + + if (!pAddFontResourceExA || !pRemoveFontResourceExA) + { + win_skip("AddFontResourceExA is not available on this platform\n"); + return; + } + + if (!write_ttf_file("wine_longname.ttf", ttf_name)) + { + skip("Failed to create ttf file for testing\n"); + return; + } + + ret = pAddFontResourceExA(ttf_name, FR_PRIVATE, 0); + ok(ret, "AddFontResourceEx() failed\n"); + + strcpy(font.lfFaceName, "wine_3_this_is_a_very_long_name"); + found_font = FALSE; + EnumFontFamiliesExA(GetDC(0), &font, long_enum_proc, 0, 0); + ok(found_font == TRUE, "EnumFontFamiliesExA didn't find font.\n"); + + strcpy(font.lfFaceName, "wine_2_this_is_a_very_long_name"); + found_font = FALSE; + EnumFontFamiliesExA(GetDC(0), &font, long_enum_proc, 0, 0); + ok(found_font == TRUE, "EnumFontFamiliesExA didn't find font.\n"); + + handle_font = CreateFontIndirectA(&font); + ok(handle_font != NULL, "CreateFontIndirectA failed\n"); + DeleteObject(handle_font); + + + ret = pRemoveFontResourceExA(ttf_name, 0, 0); + ok(!ret, "RemoveFontResourceEx() should fail\n"); + + DeleteFileA(ttf_name); +} + START_TEST(font) { init(); + test_long_names(); test_stock_fonts(); test_logfont(); test_bitmap_font(); diff --git a/dlls/gdi32/tests/resource.rc b/dlls/gdi32/tests/resource.rc index fdd95f687a..6dcbd42ab5 100644 --- a/dlls/gdi32/tests/resource.rc +++ b/dlls/gdi32/tests/resource.rc @@ -28,3 +28,6 @@ wine_vdmx.ttf RCDATA wine_vdmx.ttf /* @makedep: vertical.ttf */ vertical.ttf RCDATA vertical.ttf + +/* @makedep: wine_longname.ttf */ +wine_longname.ttf RCDATA wine_longname.ttf diff --git a/dlls/gdi32/tests/wine_longname.sfd b/dlls/gdi32/tests/wine_longname.sfd new file mode 100644 index 0000000000..998d7cc01f --- /dev/null +++ b/dlls/gdi32/tests/wine_longname.sfd @@ -0,0 +1,66 @@ +SplineFontDB: 3.0 +FontName: wine_1_this_is_a_very_long_name_that_might_be_too_long_for_gdi32 +FullName: wine_2_this_is_a_very_long_name_that_might_be_too_long_for_gdi32 +FamilyName: wine_3_this_is_a_very_long_name_that_might_be_too_long_for_gdi32 +Weight: Regular +Copyright: Copyright (c) 2017, Fabian Maurer +UComments: "2017-11-17: Created with FontForge (http://fontforge.org)" +Version: 001.000 +ItalicAngle: 0 +UnderlinePosition: -102.4 +UnderlineWidth: 51.2 +Ascent: 819 +Descent: 205 +InvalidEm: 0 +LayerCount: 2 +Layer: 0 0 "Back" 1 +Layer: 1 0 "Fore" 0 +XUID: [1021 48 28337276 3092883] +OS2Version: 0 +OS2_WeightWidthSlopeOnly: 0 +OS2_UseTypoMetrics: 1 +CreationTime: 1510948643 +ModificationTime: 1510949092 +OS2TypoAscent: 0 +OS2TypoAOffset: 1 +OS2TypoDescent: 0 +OS2TypoDOffset: 1 +OS2TypoLinegap: 0 +OS2WinAscent: 0 +OS2WinAOffset: 1 +OS2WinDescent: 0 +OS2WinDOffset: 1 +HheadAscent: 0 +HheadAOffset: 1 +HheadDescent: 0 +HheadDOffset: 1 +OS2Vendor: 'PfEd' +MarkAttachClasses: 1 +DEI: 91125 +Encoding: ISO8859-1 +UnicodeInterp: none +NameList: AGL For New Fonts +DisplaySize: -48 +AntiAlias: 1 +FitToEm: 0 +WinInfo: 64 16 4 +BeginPrivate: 0 +EndPrivate +BeginChars: 256 1 + +StartChar: at +Encoding: 64 64 0 +Width: 1024 +VWidth: 0 +Flags: HW +LayerCount: 2 +Fore +SplineSet +259 332 m 29 + 468 664 l 29 + 514 332 l 29 + 259 332 l 29 +EndSplineSet +EndChar +EndChars +EndSplineFont diff --git a/dlls/gdi32/tests/wine_longname.ttf b/dlls/gdi32/tests/wine_longname.ttf new file mode 100644 index 0000000000000000000000000000000000000000..59d9517560592e9578f1510f99f4fb65065c1195 GIT binary patch literal 2252 zcmdT`J!~6Q9RIz$vy(ze6NyY%=$Z!6pv1io)Gv83{V*L80j0`9(dA;F&nMYF>wHP- zEn;Fof`I`fHnvbz#A0FuAu(hCArJ#BOqEKh7`jo+@4dUk$yy{T-ueID|MR{7*WEJ& zfGKQ4$6Bp+W96OM-;M#3pOag9^~%*6X7McP4<-HDn`fNWg1-fb7U{Km$M4}p@gC`) z376`dsfju5T|h5UZiIfnHyUwgOuk2YGHef;-|P-8$`?uZT7lnq=Jxy@;=dElw#X<P zGYZ^mp7eaHlioTG@dD{@Nl&-qx{r0-puI`@sg8fEhikY%`8CpJ*Y5=DvzvRAf5PLx z>c#zZw1cxedX4gzAY&y=efL?(J5hOvrwuZIpI(0OX}12^z#O1y+79VSXp+l88^yVq z>1&$WDU)Thp*Y5YjkFYsS4CN=7*zQHj7|Gkqlb7uTg5%Nf*IFP;G7TX=fQZrd9}g% zR8iI4k&Bzk6Xnx^iU~o_=sBZSAeeKRcLk-~+X^YUbBRhOSA&nFtE`clM_=cf5XJEU zLdGKD@Hpb(VZj)e$N$fV>Sgwge9ki#P3BlQtbmRQly?QrRE84<?mN51!Y`Gft`Wtq zF4+ai9!?a+UzH(Kc;9hnPR_jO&YYSP(|_#kX*-Wr=d>ob6S`Pt$9*JoES@9zeOWAv z<-fm>$(zER{hHt;uH?8t6?b!7!-Tky<2v3Jk8<2VRr@u^3z*icIbLKR{UAHRko|Uv zkl}(o*35AYQ(_^<b$lsa$#DbQ+FLnZfT=&9<3()iZ{RXw^e{kz2q9WX*=46u#{yRe z7HpiuBJmpJTO4ujl3L-qL7RYp%W-dzL}4p6PuCYr$Fk2Ynl*nt^1J4WzmWt~*`j5a z+8$g&%5x(0iDk1-Y*XzuAl9ZwUHam2_R&#R(!!^mM|$5+kN(IVQ|iY@?3$z#azZqy z?J^E*Mcu%2y|fkeJ^p-eGe`zrJMM;_`~Xqlr(Q<};jNR3<4o3!6EAE;E_b-j!$Jn# zrX!5#dJt~3eIhmGZmQOV8i7h&nW-~zkuVP3QO^F?p=Vy$d=-{hOq=t5Sy79-X)R8| zz;w!%dC^o!avncP+`>M;WZO%!2M!ng$wZzN{a?fbtg@U5J2g^8Hd$2pM#$pI$D~4# z^rN_IT9#e5EQ_3Rz3nGb?<{Kj@vF#>%l^$V+UDEC51eEj8S=ss)H<cOf_KsQc0JDj V9#YOPqq5Ab)%@daq1MB9_dm8?dc^<$ literal 0 HcmV?d00001 -- 2.15.0

3 3

[PATCH] po: Update Lithuanian translation
by Aurimas Fišeras 18 Nov '17

18 Nov '17

1 0

[PATCH] po: Update Russian translation
by Nikolay Sivov 18 Nov '17

18 Nov '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- po/ru.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/ru.po b/po/ru.po index c807f01858..33c03756e7 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-11-15 17:25+0300\n" +"PO-Revision-Date: 2017-11-18 12:12+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" @@ -8922,10 +8922,8 @@ msgid " sec" msgstr " сек" #: twain.rc:29 -#, fuzzy -#| msgid "Select Folder" msgid "Select Source" -msgstr "Выберите папку" +msgstr "Выберите источник" #: urlmon.rc:32 wininet.rc:77 msgid "Security Warning" -- 2.15.0

1 0

[PATCH 2/2] gphoto2.ds: Set supported groups.
by Vincent Povirk 18 Nov '17

18 Nov '17

Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> --- dlls/gphoto2.ds/gphoto2_main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/gphoto2.ds/gphoto2_main.c b/dlls/gphoto2.ds/gphoto2_main.c index 437709001a5..acc3aa67892 100644 --- a/dlls/gphoto2.ds/gphoto2_main.c +++ b/dlls/gphoto2.ds/gphoto2_main.c @@ -1086,6 +1086,7 @@ GPHOTO2_GetIdentity( pTW_IDENTITY pOrigin, pTW_IDENTITY self) { TRACE("%d cameras detected.\n", count); self->ProtocolMajor = TWON_PROTOCOLMAJOR; self->ProtocolMinor = TWON_PROTOCOLMINOR; + self->SupportedGroups = DG_CONTROL | DG_IMAGE; lstrcpynA (self->Manufacturer, "The Wine Team", sizeof(self->Manufacturer) - 1); lstrcpynA (self->ProductFamily, "GPhoto2 Camera", sizeof(self->ProductFamily) - 1); -- 2.11.0

2 1

What causes .NET Framework 4.5 to "subtly fail" on Windows Vista and higher?
by Alex Henrie 18 Nov '17

18 Nov '17

Hello, This question is mostly for Austin, but I am CC'ing the list in case anyone else knows the answer. I am trying to open a file created by ProPresenter <https://renewedvision.com/propresenter/download/>, a freely downloadable .NET Framework 4.5 app that requires Windows 8 or later. Mono is not good enough for this program. When Winetricks installs .NET 4.5 or 4.5.2, it prints the warning "Setting Windows version to 2003, otherwise applications using .NET 4.5 will subtly fail" <https://github.com/Winetricks/winetricks/blob/master/src/winetricks#L7095>. Indeed, setting the Windows version to 2003 allows ProPresenter to run just long enough to complain that Windows 8 or later is required and exit. With the Windows version set to 8, ProPresenter goes into an infinite loop calling Context_CC_ContextCallback. What is the subtle bug here? Does it have to do with Context_CC_ContextCallback, or is that just a distraction? -Alex

2 2

[PATCH] advapi32: add initial Perf* stubs (try 2)
by Austin English 17 Nov '17

17 Nov '17

This time, with missing perflib.h Signed-off-by: Austin English <austinenglish(a)gmail.com> --- dlls/advapi32/Makefile.in | 1 + dlls/advapi32/advapi32.spec | 14 ++++----- dlls/advapi32/perf.c | 71 +++++++++++++++++++++++++++++++++++++++++++++ include/perflib.h | 63 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 142 insertions(+), 7 deletions(-) create mode 100644 dlls/advapi32/perf.c create mode 100644 include/perflib.h diff --git a/dlls/advapi32/Makefile.in b/dlls/advapi32/Makefile.in index ff6452a91b..224286f28c 100644 --- a/dlls/advapi32/Makefile.in +++ b/dlls/advapi32/Makefile.in @@ -16,6 +16,7 @@ C_SRCS = \ crypt_sha.c \ eventlog.c \ lsa.c \ + perf.c \ registry.c \ security.c \ service.c \ diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 359efc9ad1..4645f3c573 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -553,11 +553,11 @@ # @ stub OperationStart # @ stub PerfAddCounters # @ stub PerfCloseQueryHandle -# @ stub PerfCreateInstance +@ stdcall PerfCreateInstance(long ptr wstr long) # @ stub PerfDecrementULongCounterValue # @ stub PerfDecrementULongLongCounterValue # @ stub PerfDeleteCounters -# @ stub PerfDeleteInstance +@ stdcall PerfDeleteInstance(long ptr) # @ stub PerfEnumerateCounterSet # @ stub PerfEnumerateCounterSetInstances # @ stub PerfIncrementULongCounterValue @@ -573,13 +573,13 @@ # @ stub PerfRegQueryInfoKey # @ stub PerfRegQueryValue # @ stub PerfRegSetValue -# @ stub PerfSetCounterRefValue -# @ stub PerfSetCounterSetInfo +@ stdcall PerfSetCounterRefValue(long ptr long ptr) +@ stdcall PerfSetCounterSetInfo(long ptr long) # @ stub PerfSetULongCounterValue # @ stub PerfSetULongLongCounterValue -# @ stub PerfStartProvider -# @ stub PerfStartProviderEx -# @ stub PerfStopProvider +@ stdcall PerfStartProvider(ptr ptr ptr) +@ stdcall PerfStartProviderEx(ptr ptr ptr) +@ stdcall PerfStopProvider(long) @ stdcall PrivilegeCheck(ptr ptr ptr) @ stdcall PrivilegedServiceAuditAlarmA(str str long ptr long) @ stdcall PrivilegedServiceAuditAlarmW(wstr wstr long ptr long) diff --git a/dlls/advapi32/perf.c b/dlls/advapi32/perf.c new file mode 100644 index 0000000000..754af2a89b --- /dev/null +++ b/dlls/advapi32/perf.c @@ -0,0 +1,71 @@ +/* + * advapi32 perf functions + * + * Copyright 2017 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdio.h> + +#include "windef.h" +#include "winbase.h" +#include "perflib.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(advapi); + +PPERF_COUNTERSET_INSTANCE WINAPI PerfCreateInstance(HANDLE handle, LPCGUID guid, const WCHAR *name, ULONG id) +{ + FIXME("%p %s %s %u: stub\n", handle, debugstr_guid(guid), debugstr_w(name), id); + return NULL; +} + +ULONG WINAPI PerfDeleteInstance(HANDLE provider, PPERF_COUNTERSET_INSTANCE block) +{ + FIXME("%p %p: stub\n", provider, block); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +ULONG WINAPI PerfSetCounterSetInfo(HANDLE handle, PPERF_COUNTERSET_INFO template, ULONG size) +{ + FIXME("%p %p %u: stub\n", handle, template, size); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +ULONG WINAPI PerfSetCounterRefValue(HANDLE provider, PPERF_COUNTERSET_INSTANCE instance, ULONG counterid, void *address) +{ + FIXME("%p %p %u %p: stub\n", provider, instance, counterid, address); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +ULONG WINAPI PerfStartProvider(GUID *guid, PERFLIBREQUEST callback, HANDLE *provider) +{ + FIXME("%s %p %p: stub\n", debugstr_guid(guid), callback, provider); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +ULONG WINAPI PerfStartProviderEx(GUID *guid, PPERF_PROVIDER_CONTEXT context, HANDLE *provider) +{ + FIXME("%s %p %p: stub\n", debugstr_guid(guid), context, provider); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +ULONG WINAPI PerfStopProvider(HANDLE handle) +{ + FIXME("%p: stub\n", handle); + return ERROR_CALL_NOT_IMPLEMENTED; +} diff --git a/include/perflib.h b/include/perflib.h new file mode 100644 index 0000000000..9a4d8db64b --- /dev/null +++ b/include/perflib.h @@ -0,0 +1,63 @@ +/* + * Copyright (C) 2017 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _PERFLIB_H_ +#define _PERFLIB_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +typedef LPVOID (* PERF_MEM_ALLOC)(IN SIZE_T AllocSize, IN LPVOID pContext); +typedef void (* PERF_MEM_FREE)(IN LPVOID pBuffer, IN LPVOID pContext); + +typedef ULONG (WINAPI* PERFLIBREQUEST)( + IN ULONG RequestCode, + IN PVOID Buffer, + IN ULONG BufferSize +); + +typedef struct _PERF_COUNTERSET_INFO { + GUID CounterSetGuid; + GUID ProviderGuid; + ULONG NumCounters; + ULONG InstanceType; +} PERF_COUNTERSET_INFO, * PPERF_COUNTERSET_INFO; + +typedef struct _PERF_COUNTERSET_INSTANCE { + GUID CounterSetGuid; + ULONG dwSize; + ULONG InstanceId; + ULONG InstanceNameOffset; + ULONG InstanceNameSize; +} PERF_COUNTERSET_INSTANCE, * PPERF_COUNTERSET_INSTANCE; + +typedef struct _PROVIDER_CONTEXT { + DWORD ContextSize; + DWORD Reserved; + PERFLIBREQUEST ControlCallback; + PERF_MEM_ALLOC MemAllocRoutine; + PERF_MEM_FREE MemFreeRoutine; + LPVOID pMemContext; +} PERF_PROVIDER_CONTEXT, * PPERF_PROVIDER_CONTEXT; + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /* _PERFLIB_H_ */ -- 2.13.6

1 0

[PATCH] gdiplus: In GdipPrivateAddMemoryFont allow loading fonts with long names
by Fabian Maurer 17 Nov '17

17 Nov '17

Fixes Bug 43956. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/gdiplus/font.c | 38 ++++++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index ccf93ed395..f99b026b25 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -1393,33 +1393,36 @@ static int match_name_table_language( const tt_name_record *name, LANGID lang ) return 0; } -static WCHAR *copy_name_table_string( const tt_name_record *name, const BYTE *data, WCHAR *ret, DWORD len ) +static WCHAR *copy_name_table_string( const tt_name_record *name, const BYTE *data ) { WORD name_len = GET_BE_WORD(name->length); WORD codepage; + WCHAR *ret; + int len; switch (GET_BE_WORD(name->platform_id)) { case TT_PLATFORM_APPLE_UNICODE: case TT_PLATFORM_MICROSOFT: - if (name_len >= len*sizeof(WCHAR)) - return NULL; + ret = heap_alloc((name_len / 2 + 1) * sizeof(WCHAR)); for (len = 0; len < name_len / 2; len++) ret[len] = (data[len * 2] << 8) | data[len * 2 + 1]; ret[len] = 0; return ret; case TT_PLATFORM_MACINTOSH: codepage = get_mac_code_page( name ); - len = MultiByteToWideChar( codepage, 0, (char *)data, name_len, ret, len-1 ); + len = MultiByteToWideChar( codepage, 0, (char *)data, name_len, NULL, 0 ) + 1; if (!len) return NULL; + ret = heap_alloc(len * sizeof(WCHAR)); + len = MultiByteToWideChar( codepage, 0, (char *)data, name_len, ret, len - 1 ); ret[len] = 0; return ret; } return NULL; } -static WCHAR *load_ttf_name_id( const BYTE *mem, DWORD_PTR size, DWORD id, WCHAR *ret, DWORD len ) +static WCHAR *load_ttf_name_id( const BYTE *mem, DWORD_PTR size, DWORD id ) { LANGID lang = GetSystemDefaultLangID(); const tt_header *header; @@ -1480,8 +1483,9 @@ static WCHAR *load_ttf_name_id( const BYTE *mem, DWORD_PTR size, DWORD id, WCHAR if (best_lang) { + WCHAR *ret; name_record = (const tt_name_record*)(name_table + 1) + best_index; - ret = copy_name_table_string( name_record, mem+ofs+GET_BE_WORD(name_record->offset), ret, len ); + ret = copy_name_table_string( name_record, mem+ofs+GET_BE_WORD(name_record->offset) ); TRACE( "name %u found platform %u lang %04x %s\n", GET_BE_WORD(name_record->name_id), GET_BE_WORD(name_record->platform_id), GET_BE_WORD(name_record->language_id), debugstr_w( ret )); return ret; @@ -1497,43 +1501,45 @@ static INT CALLBACK add_font_proc(const LOGFONTW *lfw, const TEXTMETRICW *ntm, D GpStatus WINGDIPAPI GdipPrivateAddMemoryFont(GpFontCollection* fontCollection, GDIPCONST void* memory, INT length) { - WCHAR buf[32], *name; + WCHAR *name; DWORD count = 0; HANDLE font; + GpStatus ret = Ok; TRACE("%p, %p, %d\n", fontCollection, memory, length); if (!fontCollection || !memory || !length) return InvalidParameter; - name = load_ttf_name_id(memory, length, NAME_ID_FULL_FONT_NAME, buf, sizeof(buf)/sizeof(*buf)); + name = load_ttf_name_id(memory, length, NAME_ID_FULL_FONT_NAME); if (!name) return OutOfMemory; font = AddFontMemResourceEx((void*)memory, length, NULL, &count); TRACE("%s: %p/%u\n", debugstr_w(name), font, count); if (!font || !count) - return InvalidParameter; - - if (count) + ret = InvalidParameter; + else { HDC hdc; LOGFONTW lfw; hdc = CreateCompatibleDC(0); + /* Truncate name if necessary, GDI32 can't deal with long names */ + if(lstrlenW(name) > LF_FACESIZE - 1) + name[LF_FACESIZE - 1] = 0; + lfw.lfCharSet = DEFAULT_CHARSET; lstrcpyW(lfw.lfFaceName, name); lfw.lfPitchAndFamily = 0; if (!EnumFontFamiliesExW(hdc, &lfw, add_font_proc, (LPARAM)fontCollection, 0)) - { - DeleteDC(hdc); - return OutOfMemory; - } + ret = OutOfMemory; DeleteDC(hdc); } - return Ok; + heap_free(name); + return ret; } /***************************************************************************** -- 2.15.0

2 2

[PATCH v2] shell32/tests: Add test for IAutoComplete2 with custom source
by Fabian Maurer 17 Nov '17

17 Nov '17

v2: Send more characters to fix timing issues Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/shell32/tests/autocomplete.c | 173 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 173 insertions(+) diff --git a/dlls/shell32/tests/autocomplete.c b/dlls/shell32/tests/autocomplete.c index 63a2eb2b11..7dcecb2088 100644 --- a/dlls/shell32/tests/autocomplete.c +++ b/dlls/shell32/tests/autocomplete.c @@ -225,6 +225,177 @@ static void createMainWnd(void) CW_USEDEFAULT, CW_USEDEFAULT, 130, 105, NULL, NULL, GetModuleHandleA(NULL), 0); } +struct string_enumerator +{ + IEnumString IEnumString_iface; + LONG ref; + WCHAR **data; + int data_len; + int cur; +}; + +static struct string_enumerator *impl_from_IEnumString(IEnumString *iface) +{ + return CONTAINING_RECORD(iface, struct string_enumerator, IEnumString_iface); +} + +static HRESULT WINAPI string_enumerator_QueryInterface(IEnumString *iface, REFIID riid, void **ppv) +{ + if (IsEqualGUID(riid, &IID_IEnumString) || IsEqualGUID(riid, &IID_IUnknown)) + { + IUnknown_AddRef(iface); + *ppv = iface; + return S_OK; + } + + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI string_enumerator_AddRef(IEnumString *iface) +{ + struct string_enumerator *this = impl_from_IEnumString(iface); + + ULONG ref = InterlockedIncrement(&this->ref); + + return ref; +} + +static ULONG WINAPI string_enumerator_Release(IEnumString *iface) +{ + struct string_enumerator *this = impl_from_IEnumString(iface); + + ULONG ref = InterlockedDecrement(&this->ref); + + if (!ref) + HeapFree(GetProcessHeap(), 0, this); + + return ref; +} + +static HRESULT WINAPI string_enumerator_Next(IEnumString *iface, ULONG num, LPOLESTR *strings, ULONG *num_returned) +{ + struct string_enumerator *this = impl_from_IEnumString(iface); + int i, len; + + *num_returned = 0; + for (i = 0; i < num; i++) + { + if (this->cur >= this->data_len) + return S_FALSE; + + len = lstrlenW(this->data[this->cur]) + 1; + + strings[i] = CoTaskMemAlloc(len * sizeof(WCHAR)); + memcpy(strings[i], this->data[this->cur], len * sizeof(WCHAR)); + + (*num_returned)++; + this->cur++; + } + + return S_OK; +} + +static HRESULT WINAPI string_enumerator_Reset(IEnumString *iface) +{ + struct string_enumerator *this = impl_from_IEnumString(iface); + + this->cur = 0; + + return S_OK; +} + +static HRESULT WINAPI string_enumerator_Skip(IEnumString *iface, ULONG num) +{ + struct string_enumerator *this = impl_from_IEnumString(iface); + + this->cur += num; + + return S_OK; +} + +static HRESULT WINAPI string_enumerator_Clone(IEnumString *iface, IEnumString **out) +{ + *out = NULL; + return E_NOTIMPL; +} + +static IEnumStringVtbl string_enumerator_vtlb = +{ + string_enumerator_QueryInterface, + string_enumerator_AddRef, + string_enumerator_Release, + string_enumerator_Next, + string_enumerator_Skip, + string_enumerator_Reset, + string_enumerator_Clone +}; + +static HRESULT string_enumerator_create(void **ppv, WCHAR **suggestions, int count) +{ + struct string_enumerator *object; + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if (!object) + return E_OUTOFMEMORY; + + object->IEnumString_iface.lpVtbl = &string_enumerator_vtlb; + object->ref = 1; + object->data = suggestions; + object->data_len = count; + object->cur = 0; + + *ppv = &object->IEnumString_iface; + + return S_OK; +} + +static void test_custom_source(void) +{ + static WCHAR str_alpha[] = {'t','e','s','t','1',0}; + static WCHAR str_alpha2[] = {'t','e','s','t','2',0}; + static WCHAR str_beta[] = {'a','u','t','o',' ','c','o','m','p','l','e','t','e',0}; + static WCHAR *suggestions[] = { str_alpha, str_alpha2, str_beta }; + IUnknown *enumerator; + IAutoComplete2 *autocomplete; + HWND hwnd_edit; + WCHAR buffer[20]; + HRESULT hr; + MSG msg; + + ShowWindow(hMainWnd, SW_SHOW); + + hwnd_edit = CreateWindowA("Edit", "", WS_OVERLAPPED | WS_VISIBLE | WS_CHILD | WS_BORDER, 50, 5, 200, 20, hMainWnd, 0, NULL, 0); + + hr = CoCreateInstance(&CLSID_AutoComplete, NULL, CLSCTX_INPROC_SERVER, &IID_IAutoComplete2, (void**)&autocomplete); + ok(hr == S_OK, "CoCreateInstance failed: %x\n", hr); + + string_enumerator_create((void**)&enumerator, suggestions, sizeof(suggestions) / sizeof(*suggestions)); + + hr = IAutoComplete2_SetOptions(autocomplete, ACO_AUTOSUGGEST | ACO_AUTOAPPEND); + ok(hr == S_OK, "IAutoComplete2_SetOptions failed: %x\n", hr); + hr = IAutoComplete2_Init(autocomplete, hwnd_edit, enumerator, NULL, NULL); + ok(hr == S_OK, "IAutoComplete_Init failed: %x\n", hr); + + /* Send a few characters to make sure autocomplete is always activated */ + SendMessageW(hwnd_edit, WM_CHAR, 'a', 1); + SendMessageW(hwnd_edit, WM_CHAR, 'u', 1); + SendMessageW(hwnd_edit, WM_CHAR, 't', 1); + SendMessageW(hwnd_edit, WM_CHAR, 'o', 1); + /* Send a random keyup message since wine doesn't handle WM_CHAR yet */ + SendMessageW(hwnd_edit, WM_KEYUP, 'x', 1); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + { + TranslateMessage(&msg); + DispatchMessageA(&msg); + } + SendMessageW(hwnd_edit, WM_GETTEXT, sizeof(buffer) / sizeof(*buffer), (LPARAM)buffer); + ok(lstrcmpW(str_beta, buffer) == 0, "Expected %s, got %s\n", wine_dbgstr_w(str_beta), wine_dbgstr_w(buffer)); + + ShowWindow(hMainWnd, SW_HIDE); + DestroyWindow(hwnd_edit); +} + START_TEST(autocomplete) { HRESULT r; @@ -246,6 +417,8 @@ START_TEST(autocomplete) goto cleanup; test_killfocus(); + test_custom_source(); + PostQuitMessage(0); while(GetMessageA(&msg,0,0,0)) { TranslateMessage(&msg); -- 2.15.0

2 1

[PATCH v5 2/2] combase: Add RoGetParameterizedTypeInstanceIID stub
by Alex Henrie 17 Nov '17

17 Nov '17

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Fixes https://bugs.winehq.org/show_bug.cgi?id=42701 v5: Trace GUID as a pointer instead of as a string --- .../api-ms-win-core-winrt-roparameterizediid-l1-1-0.spec | 2 +- dlls/combase/Makefile.in | 2 +- dlls/combase/combase.spec | 2 +- dlls/combase/roapi.c | 14 ++++++++++++++ 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-winrt-roparameterizediid-l1-1-0/api-ms-win-core-winrt-roparameterizediid-l1-1-0.spec b/dlls/api-ms-win-core-winrt-roparameterizediid-l1-1-0/api-ms-win-core-winrt-roparameterizediid-l1-1-0.spec index 9fb16ab225..68db3e90a9 100644 --- a/dlls/api-ms-win-core-winrt-roparameterizediid-l1-1-0/api-ms-win-core-winrt-roparameterizediid-l1-1-0.spec +++ b/dlls/api-ms-win-core-winrt-roparameterizediid-l1-1-0/api-ms-win-core-winrt-roparameterizediid-l1-1-0.spec @@ -1,3 +1,3 @@ @ stub RoFreeParameterizedTypeExtra -@ stub RoGetParameterizedTypeInstanceIID +@ stdcall RoGetParameterizedTypeInstanceIID(long ptr ptr ptr ptr) combase.RoGetParameterizedTypeInstanceIID @ stub RoParameterizedTypeExtraGetTypeSignature diff --git a/dlls/combase/Makefile.in b/dlls/combase/Makefile.in index c5ab8d205d..b1d759e49a 100644 --- a/dlls/combase/Makefile.in +++ b/dlls/combase/Makefile.in @@ -1,5 +1,5 @@ MODULE = combase.dll -IMPORTS = ole32 +IMPORTS = ole32 uuid C_SRCS = \ roapi.c \ diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 493e7968d1..c238eb82db 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -253,7 +253,7 @@ @ stub RoGetApartmentIdentifier @ stub RoGetErrorReportingFlags @ stub RoGetMatchingRestrictedErrorInfo -@ stub RoGetParameterizedTypeInstanceIID +@ stdcall RoGetParameterizedTypeInstanceIID(long ptr ptr ptr ptr) @ stub RoGetServerActivatableClasses @ stdcall RoInitialize(long) @ stub RoInspectCapturedStackBackTrace diff --git a/dlls/combase/roapi.c b/dlls/combase/roapi.c index a2dfd548f2..a2d625202d 100644 --- a/dlls/combase/roapi.c +++ b/dlls/combase/roapi.c @@ -18,6 +18,7 @@ #include "objbase.h" #include "roapi.h" +#include "roparameterizediid.h" #include "hstring.h" #include "wine/debug.h" @@ -55,3 +56,16 @@ HRESULT WINAPI RoGetActivationFactory(HSTRING classid, REFIID iid, void **factor FIXME("stub: %p %p %p\n", classid, iid, factory); return E_NOTIMPL; } + +/*********************************************************************** + * RoGetParameterizedTypeInstanceIID (combase.@) + */ +HRESULT WINAPI RoGetParameterizedTypeInstanceIID(UINT32 name_element_count, const WCHAR **name_elements, + const IRoMetaDataLocator *meta_data_locator, GUID *iid, + ROPARAMIIDHANDLE *hiid) +{ + FIXME("stub: %d %p %p %p %p\n", name_element_count, name_elements, meta_data_locator, iid, hiid); + if (iid) *iid = GUID_NULL; + if (hiid) *hiid = INVALID_HANDLE_VALUE; + return E_NOTIMPL; +} -- 2.15.0

1 0

[PATCH] mshtml: Merge olewnd.c into oleobj.c.
by Jacek Caban 17 Nov '17

17 Nov '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/Makefile.in | 1 - dlls/mshtml/htmldoc.c | 1 - dlls/mshtml/mshtml_private.h | 1 - dlls/mshtml/oleobj.c | 246 +++++++++++++++++++++++++++++++++++++ dlls/mshtml/olewnd.c | 286 ------------------------------------------- 5 files changed, 246 insertions(+), 289 deletions(-) delete mode 100644 dlls/mshtml/olewnd.c

1 0

[PATCH v4 1/2] include: Add roparameterizediid.idl
by Alex Henrie 17 Nov '17

17 Nov '17

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- v4: Removed "ns_prefix" and corrected function order. This is what I get for trying to write a header file based solely on MSDN... --- include/Makefile.in | 1 + include/roparameterizediid.idl | 95 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+) create mode 100644 include/roparameterizediid.idl diff --git a/include/Makefile.in b/include/Makefile.in index cc42f66ebd..d453dc8568 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -146,6 +146,7 @@ IDL_SRCS = \ pstore.idl \ qedit.idl \ richole.idl \ + roparameterizediid.idl \ row.idl \ rowchg.idl \ rowpos.idl \ diff --git a/include/roparameterizediid.idl b/include/roparameterizediid.idl new file mode 100644 index 0000000000..85ee57d6f9 --- /dev/null +++ b/include/roparameterizediid.idl @@ -0,0 +1,95 @@ +/* + * Copyright 2017 Alex Henrie + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifdef __WIDL__ +#pragma winrt +#endif + +import "wtypes.idl"; + +typedef void *ROPARAMIIDHANDLE; + +[ + object +] +interface IRoSimpleMetaDataBuilder +{ + HRESULT SetWinRtInterface( + GUID iid + ); + + HRESULT SetDelegate( + GUID iid + ); + + HRESULT SetInterfaceGroupSimpleDefault( + const WCHAR *typename, + const WCHAR *default_name, + const GUID *default_iid + ); + + HRESULT SetInterfaceGroupParameterizedDefault( + const WCHAR *typename, + UINT32 name_element_count, + const WCHAR **name_elements + ); + + HRESULT SetRuntimeClassSimpleDefault( + const WCHAR *typename, + const WCHAR *default_name, + const GUID *default_iid + ); + + HRESULT SetRuntimeClassParameterizedDefault( + const WCHAR *typename, + UINT32 name_element_count, + const WCHAR **name_elements + ); + + HRESULT SetStruct( + const WCHAR *typename, + UINT32 field_count, + const WCHAR **field_typenames + ); + + HRESULT SetEnum( + const WCHAR *typename, + const WCHAR *base_type + ); + + HRESULT SetParameterizedInterface( + GUID iid, + UINT32 arg_count + ); + + HRESULT SetParameterizedDelegate( + GUID iid, + UINT32 arg_count + ); +} + +[ + object +] +interface IRoMetaDataLocator +{ + HRESULT Locate( + const WCHAR *typename, + IRoSimpleMetaDataBuilder *out + ); +} -- 2.15.0

2 3

[PATCH 3/3] advapi32: Fix parsing empty DACL/SACL security descriptor strings.
by Hans Leidekker 17 Nov '17

17 Nov '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/advapi32/security.c | 4 ++-- dlls/advapi32/tests/security.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index a762d5a826..7281e01d79 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -4314,7 +4314,7 @@ static DWORD ParseAclStringFlags(LPCWSTR* StringAcl) DWORD flags = 0; LPCWSTR szAcl = *StringAcl; - while (*szAcl != '(') + while (*szAcl && *szAcl != '(') { if (*szAcl == 'P') { @@ -4625,7 +4625,7 @@ static BOOL ParseStringAclToAcl(LPCWSTR StringAcl, LPDWORD lpdwFlags, pAcl->AclRevision = ACL_REVISION; pAcl->Sbz1 = 0; pAcl->AclSize = length; - pAcl->AceCount = acecount++; + pAcl->AceCount = acecount; pAcl->Sbz2 = 0; } return TRUE; diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 08d3705771..e86fe21fed 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4101,6 +4101,8 @@ static void test_ConvertStringSecurityDescriptor(void) PSECURITY_DESCRIPTOR pSD; static const WCHAR Blank[] = { 0 }; unsigned int i; + ULONG size; + ACL *acl; static const struct { const char *sidstring; @@ -4211,6 +4213,33 @@ static void test_ConvertStringSecurityDescriptor(void) ok(ret || broken(!ret && GetLastError() == ERROR_INVALID_DATATYPE) /* win2k */, "ConvertStringSecurityDescriptorToSecurityDescriptor failed with error %u\n", GetLastError()); if (ret) LocalFree(pSD); + + /* empty DACL */ + size = 0; + SetLastError(0xdeadbeef); + ret = pConvertStringSecurityDescriptorToSecurityDescriptorA("D:", SDDL_REVISION_1, &pSD, &size); + ok(ret, "unexpected error %u\n", GetLastError()); + ok(size == sizeof(SECURITY_DESCRIPTOR_RELATIVE) + sizeof(ACL), "got %u\n", size); + acl = (ACL *)((char *)pSD + sizeof(SECURITY_DESCRIPTOR_RELATIVE)); + ok(acl->AclRevision == ACL_REVISION, "got %u\n", acl->AclRevision); + ok(!acl->Sbz1, "got %u\n", acl->Sbz1); + ok(acl->AclSize == sizeof(*acl), "got %u\n", acl->AclSize); + ok(!acl->AceCount, "got %u\n", acl->AceCount); + ok(!acl->Sbz2, "got %u\n", acl->Sbz2); + LocalFree(pSD); + + /* empty SACL */ + size = 0; + SetLastError(0xdeadbeef); + ret = pConvertStringSecurityDescriptorToSecurityDescriptorA("S:", SDDL_REVISION_1, &pSD, &size); + ok(ret, "unexpected error %u\n", GetLastError()); + ok(size == sizeof(SECURITY_DESCRIPTOR_RELATIVE) + sizeof(ACL), "got %u\n", size); + acl = (ACL *)((char *)pSD + sizeof(SECURITY_DESCRIPTOR_RELATIVE)); + ok(!acl->Sbz1, "got %u\n", acl->Sbz1); + ok(acl->AclSize == sizeof(*acl), "got %u\n", acl->AclSize); + ok(!acl->AceCount, "got %u\n", acl->AceCount); + ok(!acl->Sbz2, "got %u\n", acl->Sbz2); + LocalFree(pSD); } static void test_ConvertSecurityDescriptorToString(void) -- 2.11.0

1 0

[PATCH 2/3] advapi32: Add traces to ConvertStringSecurityDescriptorToSecurityDescriptorA/W.
by Hans Leidekker 17 Nov '17

17 Nov '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/advapi32/security.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index bd15a027b9..a762d5a826 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -4793,6 +4793,9 @@ BOOL WINAPI ConvertStringSecurityDescriptorToSecurityDescriptorA( BOOL ret; LPWSTR StringSecurityDescriptorW; + TRACE("%s, %u, %p, %p\n", debugstr_a(StringSecurityDescriptor), StringSDRevision, + SecurityDescriptor, SecurityDescriptorSize); + if(!StringSecurityDescriptor) return FALSE; @@ -4818,7 +4821,8 @@ BOOL WINAPI ConvertStringSecurityDescriptorToSecurityDescriptorW( SECURITY_DESCRIPTOR* psd; BOOL bret = FALSE; - TRACE("%s\n", debugstr_w(StringSecurityDescriptor)); + TRACE("%s, %u, %p, %p\n", debugstr_w(StringSecurityDescriptor), StringSDRevision, + SecurityDescriptor, SecurityDescriptorSize); if (GetVersion() & 0x80000000) { -- 2.11.0

1 0

[PATCH 1/3] advapi32; Remove unused foward declarations.
by Hans Leidekker 17 Nov '17

17 Nov '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/advapi32/security.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index ae9d6bdeb1..bd15a027b9 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -48,16 +48,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(advapi); static BOOL ParseStringSidToSid(LPCWSTR StringSid, PSID pSid, LPDWORD cBytes); -static BOOL ParseStringAclToAcl(LPCWSTR StringAcl, LPDWORD lpdwFlags, - PACL pAcl, LPDWORD cBytes); -static BYTE ParseAceStringFlags(LPCWSTR* StringAcl); -static BYTE ParseAceStringType(LPCWSTR* StringAcl); -static DWORD ParseAceStringRights(LPCWSTR* StringAcl); -static BOOL ParseStringSecurityDescriptorToSecurityDescriptor( - LPCWSTR StringSecurityDescriptor, - SECURITY_DESCRIPTOR_RELATIVE* SecurityDescriptor, - LPDWORD cBytes); -static DWORD ParseAclStringFlags(LPCWSTR* StringAcl); typedef struct _ACEFLAG { -- 2.11.0

1 0

[PATCH] ucrtbase: Always return the full string length in __stdio_common_vs[w]printf for a NULL buffer
by Martin Storsjo 17 Nov '17

17 Nov '17

If the target is a NULL buffer (with a zero length), we should always return the full size the format would have needed, even if UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR isn't specified. Signed-off-by: Martin Storsjo <martin(a)martin.st> --- I know the subject line should be shorter - feel free to change it to a shorter form. --- dlls/msvcrt/wcs.c | 4 ++++ dlls/ucrtbase/tests/printf.c | 11 +++++++++++ 2 files changed, 15 insertions(+) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 88f52e0..0c54800 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -764,6 +764,8 @@ int CDECL MSVCRT__stdio_common_vsprintf( unsigned __int64 options, char *str, MS &ctx, format, locale, options & UCRTBASE_PRINTF_MASK, arg_clbk_valist, NULL, &valist); puts_clbk_str_a(&ctx, 1, &nullbyte); + if(!str) + return ret; if(options & UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION) return ret>len ? -1 : ret; if(ret>=len) { @@ -1282,6 +1284,8 @@ int CDECL MSVCRT__stdio_common_vswprintf( unsigned __int64 options, &ctx, format, locale, options & UCRTBASE_PRINTF_MASK, arg_clbk_valist, NULL, &valist); puts_clbk_str_w(&ctx, 1, &nullbyte); + if(!str) + return ret; if(options & UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION) return ret>len ? -1 : ret; if(ret>=len) { diff --git a/dlls/ucrtbase/tests/printf.c b/dlls/ucrtbase/tests/printf.c index 77fb560..0e38003 100644 --- a/dlls/ucrtbase/tests/printf.c +++ b/dlls/ucrtbase/tests/printf.c @@ -215,6 +215,10 @@ static void test_snprintf (void) ok (vsprintf_wrapper (UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR, NULL, 0, "abcd") == 4, "Failure to snprintf to NULL\n"); + ok (vsprintf_wrapper (UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION, NULL, 0, "abcd") == 4, + "Failure to snprintf to NULL\n"); + ok (vsprintf_wrapper (0, NULL, 0, "abcd") == 4, + "Failure to snprintf to NULL\n"); } static int WINAPIV vswprintf_wrapper(unsigned __int64 options, wchar_t *str, @@ -289,6 +293,13 @@ static void test_swprintf (void) ok (buffer[valid] == '\0', "\"%s\": Missing null termination (ret %d) - is %d\n", narrow_fmt, n, buffer[valid]); } + + ok (vswprintf_wrapper (UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR, NULL, 0, str_short) == 5, + "Failure to swprintf to NULL\n"); + ok (vswprintf_wrapper (UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION, NULL, 0, str_short) == 5, + "Failure to swprintf to NULL\n"); + ok (vswprintf_wrapper (0, NULL, 0, str_short) == 5, + "Failure to swprintf to NULL\n"); } static int WINAPIV vfprintf_wrapper(FILE *file, -- 2.7.4

2 1

Re: [PATCH] V3 msvcrt : add arm implementation for _control87
by Piotr Caban 17 Nov '17

17 Nov '17

Hi, On 11/12/17 16:13, Vijay Kiran Kamuju wrote: > + __asm__ __volatile__( "vmrs %0, fpscr" : "=r" (fpword) ); > + if (fpword & 0x1) flags |= MSVCRT__EM_INVALID; > + if (fpword & 0x2) flags |= MSVCRT__EM_ZERODIVIDE; > + if (fpword & 0x4) flags |= MSVCRT__EM_OVERFLOW; > + if (fpword & 0x8) flags |= MSVCRT__EM_UNDERFLOW; > + if (fpword & 0x10) flags |= MSVCRT__EM_INEXACT; The fpword&0x1f seems to be used for status word. The exception trap enable bits are in fpword&0x1f00. The meaning of flag being set on arm is different then on i386 (enable trap vs mask). > + if (fpword & 0x80) flags |= MSVCRT__EM_DENORMAL; As far as I can see ARM doesn't support _EM_DENORMAL. The documentation says that 0x80 bit of fpword should not be modified unless you know what VFP coprocessor is used. Some other bits should also not be modified (like e.g. status word). > + switch (flags & MSVCRT__MCW_RC) > + { > + case MSVCRT__RC_UP|MSVCRT__RC_DOWN: fpword |= 0xc00000; break; > + case MSVCRT__RC_DOWN: fpword |= 0x800000; break; > + case MSVCRT__RC_UP: fpword |= 0x200000; break; The _RC_UP case is broken. Thanks, Piotr

2 2

[PATCH] include: Add optional ANSI color codes for winetests and debug macros.
by Rafał Harabień 17 Nov '17

17 Nov '17

By default colors are disabled. Use WINETEST_COLOR=1 to enable colors in tests. Use WINEDEBUG_COLOR=1 to enable colors in debug messages. Signed-off-by: Rafał Harabień <rafalh1992(a)o2.pl> --- include/wine/test.h | 14 ++++++++++++++ libs/wine/debug.c | 14 +++++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/include/wine/test.h b/include/wine/test.h index 4ec66d5..17d6056 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -206,6 +206,9 @@ const char *winetest_platform = "windows"; /* report successful tests (BOOL) */ static int report_success = 0; +/* use ANSI escape codes for output coloring */ +static int winetest_color = 0; + /* passing arguments around */ static int winetest_argc; static char** winetest_argv; @@ -303,14 +306,20 @@ int broken( int condition ) int winetest_vok( int condition, const char *msg, __winetest_va_list args ) { struct tls_data *data = get_tls_data(); + const char *color_red = "\e[91m"; + const char *color_reset = "\e[39m"; if (data->todo_level) { if (condition) { + if (winetest_color) + printf(color_red); printf( "%s:%d: Test succeeded inside todo block: ", data->current_file, data->current_line ); vprintf(msg, args); + if (winetest_color) + printf(color_reset); InterlockedIncrement(&todo_failures); return 0; } @@ -330,9 +339,13 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) { if (!condition) { + if (winetest_color) + printf(color_red); printf( "%s:%d: Test failed: ", data->current_file, data->current_line ); vprintf(msg, args); + if (winetest_color) + printf(color_reset); InterlockedIncrement(&failures); return 0; } @@ -669,6 +682,7 @@ int main( int argc, char **argv ) if (GetEnvironmentVariableA( "WINETEST_DEBUG", p, sizeof(p) )) winetest_debug = atoi(p); if (GetEnvironmentVariableA( "WINETEST_INTERACTIVE", p, sizeof(p) )) winetest_interactive = atoi(p); if (GetEnvironmentVariableA( "WINETEST_REPORT_SUCCESS", p, sizeof(p) )) report_success = atoi(p); + if (GetEnvironmentVariableA( "WINETEST_COLOR", p, sizeof(p) )) winetest_color = atoi(p); if (!strcmp( winetest_platform, "windows" )) SetUnhandledExceptionFilter( exc_filter ); if (!winetest_interactive) SetErrorMode( SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX ); diff --git a/libs/wine/debug.c b/libs/wine/debug.c index 8b04ef9..58d39c3 100644 --- a/libs/wine/debug.c +++ b/libs/wine/debug.c @@ -39,12 +39,14 @@ WINE_DECLARE_DEBUG_CHANNEL(pid); #endif static const char * const debug_classes[] = { "fixme", "err", "warn", "trace" }; +static const char * const debug_classes_color[] = { "\e[93m", "\e[91m", "\e[93m", "" }; #define MAX_DEBUG_OPTIONS 256 static unsigned char default_flags = (1 << __WINE_DBCL_ERR) | (1 << __WINE_DBCL_FIXME); static int nb_debug_options = -1; static struct __wine_debug_channel debug_options[MAX_DEBUG_OPTIONS]; +static int debug_color = 0; static struct __wine_debug_functions funcs; @@ -193,7 +195,7 @@ static void debug_usage(void) /* initialize all options at startup */ static void debug_init(void) { - char *wine_debug; + char *wine_debug, *var; struct stat st1, st2; if (nb_debug_options != -1) return; /* already initialized */ @@ -212,6 +214,8 @@ static void debug_init(void) if (!strcmp( wine_debug, "help" )) debug_usage(); parse_options( wine_debug ); } + var = getenv("WINEDEBUG_COLOR"); + if (var != NULL) debug_color = atoi(var); } /* varargs wrapper for funcs.dbg_vprintf */ @@ -406,6 +410,7 @@ static int default_dbg_vlog( enum __wine_debug_class cls, struct __wine_debug_ch const char *func, const char *format, va_list args ) { int ret = 0; + const char *color_reset = "\e[39m"; #if defined(__MINGW32__) || defined(_MSC_VER) if (TRACE_ON(pid)) @@ -414,9 +419,16 @@ static int default_dbg_vlog( enum __wine_debug_class cls, struct __wine_debug_ch ret += wine_dbg_printf( "%04x:", GetCurrentThreadId() ); #endif if (cls < sizeof(debug_classes)/sizeof(debug_classes[0])) + { + if (debug_color) + ret += wine_dbg_printf( "%s", debug_classes_color[cls] ); ret += wine_dbg_printf( "%s:%s:%s ", debug_classes[cls], channel->name, func ); + } if (format) ret += funcs.dbg_vprintf( format, args ); + if (debug_color) + ret += wine_dbg_printf( color_reset ); + return ret; } -- 2.7.4

3 6

[PATCH] po: Update German translation.
by Julian Rüger 17 Nov '17

17 Nov '17

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[PATCH 1/5] kernel32: Advertise junction points in GetVolumeInformationW.
by Daniel Lehman 17 Nov '17

17 Nov '17

Patch 0004 Fixes issue with Boost Filesystem class Taken from wine-staging: https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_wine-2Dcomp… With some modifications: - some rearrangement and merging of patches (so tests run if applied one-by-one) - additional argument checks - additional tests - temporary link made in same directory as final link instead of /tmp

2 1

[website] German translation for release 2.21
by Julian Rüger 17 Nov '17

17 Nov '17

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 2.20
by Julian Rüger 17 Nov '17

17 Nov '17

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 2.0.3
by Julian Rüger 17 Nov '17

17 Nov '17

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 2.19
by Julian Rüger 17 Nov '17

17 Nov '17

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[PATCH v2] webservices: Stub WsAbortChannel().
by Zebediah Figura 17 Nov '17

17 Nov '17

Powerpoint 2016 calls this while loading some themes. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v2: fix trace parameters, use E_NOTIMPL dlls/webservices/channel.c | 9 +++++++++ dlls/webservices/webservices.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 2662cd7cf7a..95bfe95bdc4 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -1271,3 +1271,12 @@ HRESULT channel_accept_udp( SOCKET socket, HANDLE wait, HANDLE cancel, WS_CHANNE LeaveCriticalSection( &channel->cs ); return hr; } + +/************************************************************************** + * WsAbortChannel [webservices.@] + */ +HRESULT WINAPI WsAbortChannel( WS_CHANNEL *handle, WS_ERROR *error ) +{ + FIXME( "%p %p: stub!\n", handle, error ); + return E_NOTIMPL; +} diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 8aa9fe9ad33..3469fedbfe6 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -1,6 +1,6 @@ @ stub WsAbandonCall @ stub WsAbandonMessage -@ stub WsAbortChannel +@ stdcall WsAbortChannel(ptr ptr) @ stub WsAbortListener @ stub WsAbortServiceHost @ stdcall WsAbortServiceProxy(ptr ptr) -- 2.15.0

2 1

[PATCH v2 1/2] kernel32/tests: Trace thread IDs in hexadecimal.
by Zebediah Figura 17 Nov '17

17 Nov '17

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/kernel32/tests/loader.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 1f6f317..6d532eb 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1523,7 +1523,7 @@ static DWORD WINAPI mutex_thread_proc(void *param) wait_list[2] = peb_lock_event; wait_list[3] = heap_lock_event; - trace("%04u: mutex_thread_proc: starting\n", GetCurrentThreadId()); + trace("%04x: mutex_thread_proc: starting\n", GetCurrentThreadId()); while (1) { ret = WaitForMultipleObjects(sizeof(wait_list)/sizeof(wait_list[0]), wait_list, FALSE, 50); @@ -1531,7 +1531,7 @@ static DWORD WINAPI mutex_thread_proc(void *param) else if (ret == WAIT_OBJECT_0 + 1) { ULONG_PTR loader_lock_magic; - trace("%04u: mutex_thread_proc: Entering loader lock\n", GetCurrentThreadId()); + trace("%04x: mutex_thread_proc: Entering loader lock\n", GetCurrentThreadId()); ret = pLdrLockLoaderLock(0, NULL, &loader_lock_magic); ok(!ret, "LdrLockLoaderLock error %#x\n", ret); inside_loader_lock++; @@ -1539,21 +1539,21 @@ static DWORD WINAPI mutex_thread_proc(void *param) } else if (ret == WAIT_OBJECT_0 + 2) { - trace("%04u: mutex_thread_proc: Entering PEB lock\n", GetCurrentThreadId()); + trace("%04x: mutex_thread_proc: Entering PEB lock\n", GetCurrentThreadId()); pRtlAcquirePebLock(); inside_peb_lock++; SetEvent(ack_event); } else if (ret == WAIT_OBJECT_0 + 3) { - trace("%04u: mutex_thread_proc: Entering heap lock\n", GetCurrentThreadId()); + trace("%04x: mutex_thread_proc: Entering heap lock\n", GetCurrentThreadId()); HeapLock(GetProcessHeap()); inside_heap_lock++; SetEvent(ack_event); } } - trace("%04u: mutex_thread_proc: exiting\n", GetCurrentThreadId()); + trace("%04x: mutex_thread_proc: exiting\n", GetCurrentThreadId()); return 196; } @@ -1569,11 +1569,11 @@ static DWORD WINAPI semaphore_thread_proc(void *param) while (1) { if (winetest_debug > 1) - trace("%04u: semaphore_thread_proc: still alive\n", GetCurrentThreadId()); + trace("%04x: semaphore_thread_proc: still alive\n", GetCurrentThreadId()); if (WaitForSingleObject(stop_event, 50) != WAIT_TIMEOUT) break; } - trace("%04u: semaphore_thread_proc: exiting\n", GetCurrentThreadId()); + trace("%04x: semaphore_thread_proc: exiting\n", GetCurrentThreadId()); return 196; } @@ -1585,7 +1585,7 @@ static DWORD WINAPI noop_thread_proc(void *param) InterlockedIncrement(noop_thread_started); } - trace("%04u: noop_thread_proc: exiting\n", GetCurrentThreadId()); + trace("%04x: noop_thread_proc: exiting\n", GetCurrentThreadId()); return 195; } -- 2.7.4

1 1

[PATCH 1/2] kernel32/tests: Trace thread IDs in hexadecimal.
by Zebediah Figura 17 Nov '17

17 Nov '17

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/kernel32/tests/loader.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 1f6f317..6d532eb 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1523,7 +1523,7 @@ static DWORD WINAPI mutex_thread_proc(void *param) wait_list[2] = peb_lock_event; wait_list[3] = heap_lock_event; - trace("%04u: mutex_thread_proc: starting\n", GetCurrentThreadId()); + trace("%04x: mutex_thread_proc: starting\n", GetCurrentThreadId()); while (1) { ret = WaitForMultipleObjects(sizeof(wait_list)/sizeof(wait_list[0]), wait_list, FALSE, 50); @@ -1531,7 +1531,7 @@ static DWORD WINAPI mutex_thread_proc(void *param) else if (ret == WAIT_OBJECT_0 + 1) { ULONG_PTR loader_lock_magic; - trace("%04u: mutex_thread_proc: Entering loader lock\n", GetCurrentThreadId()); + trace("%04x: mutex_thread_proc: Entering loader lock\n", GetCurrentThreadId()); ret = pLdrLockLoaderLock(0, NULL, &loader_lock_magic); ok(!ret, "LdrLockLoaderLock error %#x\n", ret); inside_loader_lock++; @@ -1539,21 +1539,21 @@ static DWORD WINAPI mutex_thread_proc(void *param) } else if (ret == WAIT_OBJECT_0 + 2) { - trace("%04u: mutex_thread_proc: Entering PEB lock\n", GetCurrentThreadId()); + trace("%04x: mutex_thread_proc: Entering PEB lock\n", GetCurrentThreadId()); pRtlAcquirePebLock(); inside_peb_lock++; SetEvent(ack_event); } else if (ret == WAIT_OBJECT_0 + 3) { - trace("%04u: mutex_thread_proc: Entering heap lock\n", GetCurrentThreadId()); + trace("%04x: mutex_thread_proc: Entering heap lock\n", GetCurrentThreadId()); HeapLock(GetProcessHeap()); inside_heap_lock++; SetEvent(ack_event); } } - trace("%04u: mutex_thread_proc: exiting\n", GetCurrentThreadId()); + trace("%04x: mutex_thread_proc: exiting\n", GetCurrentThreadId()); return 196; } @@ -1569,11 +1569,11 @@ static DWORD WINAPI semaphore_thread_proc(void *param) while (1) { if (winetest_debug > 1) - trace("%04u: semaphore_thread_proc: still alive\n", GetCurrentThreadId()); + trace("%04x: semaphore_thread_proc: still alive\n", GetCurrentThreadId()); if (WaitForSingleObject(stop_event, 50) != WAIT_TIMEOUT) break; } - trace("%04u: semaphore_thread_proc: exiting\n", GetCurrentThreadId()); + trace("%04x: semaphore_thread_proc: exiting\n", GetCurrentThreadId()); return 196; } @@ -1585,7 +1585,7 @@ static DWORD WINAPI noop_thread_proc(void *param) InterlockedIncrement(noop_thread_started); } - trace("%04u: noop_thread_proc: exiting\n", GetCurrentThreadId()); + trace("%04x: noop_thread_proc: exiting\n", GetCurrentThreadId()); return 195; } -- 2.7.4

2 3

[PATCH 2/2] libwine: Reserve memory areas for ARM64 in case we don't have a preloader
by André Hentschel 16 Nov '17

16 Nov '17

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- libs/wine/mmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/wine/mmap.c b/libs/wine/mmap.c index 1a3ca59..458cc13 100644 --- a/libs/wine/mmap.c +++ b/libs/wine/mmap.c @@ -398,7 +398,7 @@ void mmap_init(void) } reserve_dos_area(); -#elif defined(__x86_64__) +#elif defined(__x86_64__) || defined(__aarch64__) if (!list_head( &reserved_areas )) { -- 2.7.4

1 0

[PATCH 1/2] loader: We now have a preloader on ARM64
by André Hentschel 16 Nov '17

16 Nov '17

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- loader/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/loader/main.c b/loader/main.c index a560ec3..0a25272 100644 --- a/loader/main.c +++ b/loader/main.c @@ -195,11 +195,11 @@ static int pre_exec(void) #endif } -#elif defined(__linux__) && defined(__x86_64__) +#elif defined(__linux__) && (defined(__x86_64__) || defined(__aarch64__)) static int pre_exec(void) { - return 1; /* we have a preloader on x86-64 */ + return 1; /* we have a preloader on x86-64/arm64 */ } #elif (defined(__FreeBSD__) || defined (__FreeBSD_kernel__) || defined(__DragonFly__)) -- 2.7.4

1 0

[PATCH 1/2] twain_32: Implement source selection dialog.
by Vincent Povirk 16 Nov '17

16 Nov '17

Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> --- dlls/twain_32/Makefile.in | 2 + dlls/twain_32/dsm_ctrl.c | 114 ++++++++++++++++++++++++++++++++++++++----- dlls/twain_32/resource.h | 25 ++++++++++ dlls/twain_32/twain.rc | 34 +++++++++++++ dlls/twain_32/twain32_main.c | 18 +++++++ dlls/twain_32/twain_i.h | 2 + 6 files changed, 182 insertions(+), 13 deletions(-) create mode 100644 dlls/twain_32/resource.h create mode 100644 dlls/twain_32/twain.rc diff --git a/dlls/twain_32/Makefile.in b/dlls/twain_32/Makefile.in index cadaf8081d8..c82b5a74453 100644 --- a/dlls/twain_32/Makefile.in +++ b/dlls/twain_32/Makefile.in @@ -4,3 +4,5 @@ IMPORTS = user32 C_SRCS = \ dsm_ctrl.c \ twain32_main.c + +RC_SRCS = twain.rc diff --git a/dlls/twain_32/dsm_ctrl.c b/dlls/twain_32/dsm_ctrl.c index 9b878676656..bfd0651cb46 100644 --- a/dlls/twain_32/dsm_ctrl.c +++ b/dlls/twain_32/dsm_ctrl.c @@ -30,6 +30,7 @@ #include "winuser.h" #include "twain.h" #include "twain_i.h" +#include "resource.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(twain); @@ -345,24 +346,111 @@ TW_UINT16 TWAIN_OpenDS (pTW_IDENTITY pOrigin, TW_MEMREF pData) return TWRC_SUCCESS; } +typedef struct { + pTW_IDENTITY origin; + pTW_IDENTITY result; +} userselect_data; + +INT_PTR CALLBACK userselect_dlgproc (HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + switch (msg) + { + case WM_INITDIALOG: + { + userselect_data *data = (userselect_data*)lparam; + int i; + HWND sourcelist; + BOOL any_devices = FALSE; + + SetWindowLongPtrW(hwnd, DWLP_USER, (LONG_PTR)data); + + sourcelist = GetDlgItem(hwnd, IDC_LISTSOURCE); + + for (i=0; i<nrdevices; i++) + { + TW_IDENTITY *id = &devices[i].identity; + LRESULT index; + + if ((id->SupportedGroups & data->origin->SupportedGroups) == 0) + continue; + + index = SendMessageA(sourcelist, LB_ADDSTRING, 0, (LPARAM)id->ProductName); + SendMessageW(sourcelist, LB_SETITEMDATA, (WPARAM)index, (LPARAM)i); + any_devices = TRUE; + } + + if (any_devices) + { + EnableWindow(GetDlgItem(hwnd, IDOK), TRUE); + + /* FIXME: Select the supplied product name or default source. */ + SendMessageW(sourcelist, LB_SETCURSEL, 0, 0); + } + + return TRUE; + } + case WM_CLOSE: + EndDialog(hwnd, 0); + return TRUE; + case WM_COMMAND: + if (wparam == MAKEWPARAM(IDCANCEL, BN_CLICKED)) + { + EndDialog(hwnd, 0); + return TRUE; + } + else if (wparam == MAKEWPARAM(IDOK, BN_CLICKED) || + wparam == MAKEWPARAM(IDC_LISTSOURCE, LBN_DBLCLK)) + { + userselect_data *data = (userselect_data*)GetWindowLongPtrW(hwnd, DWLP_USER); + HWND sourcelist; + LRESULT index; + + sourcelist = GetDlgItem(hwnd, IDC_LISTSOURCE); + + index = SendMessageW(sourcelist, LB_GETCURSEL, 0, 0); + + if (index == LB_ERR) + return TRUE; + + index = SendMessageW(sourcelist, LB_GETITEMDATA, (WPARAM)index, 0); + + *data->result = devices[index].identity; + + /* FIXME: Save this as the default source */ + + EndDialog(hwnd, 1); + return TRUE; + } + break; + } + return FALSE; +} + /* DG_CONTROL/DAT_IDENTITY/MSG_USERSELECT */ TW_UINT16 TWAIN_UserSelect (pTW_IDENTITY pOrigin, TW_MEMREF pData) { - pTW_IDENTITY selected = (pTW_IDENTITY)pData; + userselect_data param = {pOrigin, pData}; + HWND parent = DSM_parent; - TRACE("DG_CONTROL/DAT_IDENTITY/MSG_USERSELECT SupportedGroups=0x%x ProductName=%s\n", - selected->SupportedGroups, wine_dbgstr_a(selected->ProductName)); + TRACE("DG_CONTROL/DAT_IDENTITY/MSG_USERSELECT SupportedGroups=0x%x ProductName=%s\n", + pOrigin->SupportedGroups, wine_dbgstr_a(param.result->ProductName)); - twain_autodetect(); - if (!nrdevices) { - TRACE("<-- TWRC_FAILURE\n"); - DSM_twCC = TWCC_OPERATIONERROR; - return TWRC_FAILURE; - } - *selected = devices[0].identity; - TRACE("<-- %s\n", wine_dbgstr_a(selected->ProductName)); - DSM_twCC = TWCC_SUCCESS; - return TWRC_SUCCESS; + twain_autodetect(); + + if (!IsWindow(parent)) + parent = NULL; + + if (DialogBoxParamW(DSM_hinstance, MAKEINTRESOURCEW(DLG_USERSELECT), + parent, userselect_dlgproc, (LPARAM)&param) == 0) + { + TRACE("canceled\n"); + DSM_twCC = TWCC_SUCCESS; + return TWRC_CANCEL; + } + + TRACE("<-- %s\n", wine_dbgstr_a(param.result->ProductName)); + DSM_twCC = TWCC_SUCCESS; + return TWRC_SUCCESS; } /* DG_CONTROL/DAT_PARENT/MSG_CLOSEDSM */ diff --git a/dlls/twain_32/resource.h b/dlls/twain_32/resource.h new file mode 100644 index 00000000000..366f52f181c --- /dev/null +++ b/dlls/twain_32/resource.h @@ -0,0 +1,25 @@ +/* + * Copyright 2017 Vincent Povirk for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <windef.h> +#include <winuser.h> + +#define DLG_USERSELECT 1 + +#define IDC_LISTSOURCE 1001 + diff --git a/dlls/twain_32/twain.rc b/dlls/twain_32/twain.rc new file mode 100644 index 00000000000..2c5939308d5 --- /dev/null +++ b/dlls/twain_32/twain.rc @@ -0,0 +1,34 @@ +/* + * Copyright 2017 Vincent Povirk for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resource.h" + +#pragma makedep po + +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT + +DLG_USERSELECT DIALOG 0, 0, 140, 140 +STYLE DS_MODALFRAME | DS_3DLOOK | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_NOIDLEMSG +FONT 8, "MS Shell Dlg" +CAPTION "Select Source" +{ + LISTBOX IDC_LISTSOURCE, 7, 7, 126, 104 + DEFPUSHBUTTON "OK", IDOK, 29, 118, 50, 15, BS_DEFPUSHBUTTON|WS_TABSTOP|WS_DISABLED + PUSHBUTTON "Cancel", IDCANCEL, 83, 118, 50, 15 +} + diff --git a/dlls/twain_32/twain32_main.c b/dlls/twain_32/twain32_main.c index d1977b4d75f..016680b96eb 100644 --- a/dlls/twain_32/twain32_main.c +++ b/dlls/twain_32/twain32_main.c @@ -31,6 +31,24 @@ WINE_DEFAULT_DEBUG_CHANNEL(twain); +extern HINSTANCE DSM_hinstance; + +BOOL WINAPI DllMain (HINSTANCE hinstance, DWORD reason, LPVOID reserved) +{ + TRACE("%p,%x,%p\n", hinstance, reason, reserved); + + switch (reason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstance); + DSM_hinstance = hinstance; + break; + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +} + /* A helper function that looks up a destination identity in the active source list */ static activeDS *TWAIN_LookupSource (const TW_IDENTITY *pDest) diff --git a/dlls/twain_32/twain_i.h b/dlls/twain_32/twain_i.h index f46999c6fa1..4d33135344e 100644 --- a/dlls/twain_32/twain_i.h +++ b/dlls/twain_32/twain_i.h @@ -53,6 +53,8 @@ TW_UINT16 DSM_twCC DECLSPEC_HIDDEN; /* current condition code of Sou activeDS *activeSources DECLSPEC_HIDDEN; /* list of active data sources */ +HINSTANCE DSM_hinstance DECLSPEC_HIDDEN; + /* Implementation of operation triplets (From Application to Source Manager) */ extern TW_UINT16 TWAIN_CloseDS (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; -- 2.11.0

1 0

[PATCH] advapi32: add initial Perf* stubs
by Austin English 16 Nov '17

16 Nov '17

Signed-off-by: Austin English <austinenglish(a)gmail.com> --- dlls/advapi32/Makefile.in | 1 + dlls/advapi32/advapi32.spec | 14 ++++----- dlls/advapi32/perf.c | 71 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 79 insertions(+), 7 deletions(-) create mode 100644 dlls/advapi32/perf.c diff --git a/dlls/advapi32/Makefile.in b/dlls/advapi32/Makefile.in index ff6452a91b..224286f28c 100644 --- a/dlls/advapi32/Makefile.in +++ b/dlls/advapi32/Makefile.in @@ -16,6 +16,7 @@ C_SRCS = \ crypt_sha.c \ eventlog.c \ lsa.c \ + perf.c \ registry.c \ security.c \ service.c \ diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 359efc9ad1..4645f3c573 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -553,11 +553,11 @@ # @ stub OperationStart # @ stub PerfAddCounters # @ stub PerfCloseQueryHandle -# @ stub PerfCreateInstance +@ stdcall PerfCreateInstance(long ptr wstr long) # @ stub PerfDecrementULongCounterValue # @ stub PerfDecrementULongLongCounterValue # @ stub PerfDeleteCounters -# @ stub PerfDeleteInstance +@ stdcall PerfDeleteInstance(long ptr) # @ stub PerfEnumerateCounterSet # @ stub PerfEnumerateCounterSetInstances # @ stub PerfIncrementULongCounterValue @@ -573,13 +573,13 @@ # @ stub PerfRegQueryInfoKey # @ stub PerfRegQueryValue # @ stub PerfRegSetValue -# @ stub PerfSetCounterRefValue -# @ stub PerfSetCounterSetInfo +@ stdcall PerfSetCounterRefValue(long ptr long ptr) +@ stdcall PerfSetCounterSetInfo(long ptr long) # @ stub PerfSetULongCounterValue # @ stub PerfSetULongLongCounterValue -# @ stub PerfStartProvider -# @ stub PerfStartProviderEx -# @ stub PerfStopProvider +@ stdcall PerfStartProvider(ptr ptr ptr) +@ stdcall PerfStartProviderEx(ptr ptr ptr) +@ stdcall PerfStopProvider(long) @ stdcall PrivilegeCheck(ptr ptr ptr) @ stdcall PrivilegedServiceAuditAlarmA(str str long ptr long) @ stdcall PrivilegedServiceAuditAlarmW(wstr wstr long ptr long) diff --git a/dlls/advapi32/perf.c b/dlls/advapi32/perf.c new file mode 100644 index 0000000000..0f23c92fdd --- /dev/null +++ b/dlls/advapi32/perf.c @@ -0,0 +1,71 @@ +/* + * win32 advapi perf functions + * + * Copyright 2017 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdio.h> + +#include "windef.h" +#include "winbase.h" +#include "perflib.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(advapi); + +PPERF_COUNTERSET_INSTANCE WINAPI PerfCreateInstance(HANDLE handle, LPCGUID guid, const WCHAR *name, ULONG id) +{ + FIXME("%p %s %s %u: stub\n", handle, debugstr_guid(guid), debugstr_w(name), id); + return NULL; +} + +ULONG WINAPI PerfDeleteInstance(HANDLE provider, PPERF_COUNTERSET_INSTANCE block) +{ + FIXME("%p %p: stub\n", provider, block); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +ULONG WINAPI PerfSetCounterSetInfo(HANDLE handle, PPERF_COUNTERSET_INFO template, ULONG size) +{ + FIXME("%p %p %u: stub\n", handle, template, size); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +ULONG WINAPI PerfSetCounterRefValue(HANDLE provider, PPERF_COUNTERSET_INSTANCE instance, ULONG counterid, void *address) +{ + FIXME("%p %p %u %p: stub\n", provider, instance, counterid, address); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +ULONG WINAPI PerfStartProvider(GUID *guid, PERFLIBREQUEST callback, HANDLE *provider) +{ + FIXME("%s %p %p: stub\n", debugstr_guid(guid), callback, provider); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +ULONG WINAPI PerfStartProviderEx(GUID *guid, PPERF_PROVIDER_CONTEXT context, HANDLE *provider) +{ + FIXME("%s %p %p: stub\n", debugstr_guid(guid), context, provider); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +ULONG WINAPI PerfStopProvider(HANDLE handle) +{ + FIXME("%p: stub\n", handle); + return ERROR_CALL_NOT_IMPLEMENTED; +} -- 2.13.6

1 0

[PATCH] webservices: Stub WsAbortChannel().
by Zebediah Figura 16 Nov '17

16 Nov '17

Powerpoint 2016 calls this while loading some themes. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/webservices/channel.c | 9 +++++++++ dlls/webservices/webservices.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 2662cd7cf7a..9b4fa8142b3 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -1271,3 +1271,12 @@ HRESULT channel_accept_udp( SOCKET socket, HANDLE wait, HANDLE cancel, WS_CHANNE LeaveCriticalSection( &channel->cs ); return hr; } + +/************************************************************************** + * WsAbortChannel [webservices.@] + */ +HRESULT WINAPI WsAbortChannel( WS_CHANNEL *handle, WS_ERROR *error ) +{ + FIXME( "%p %p: stub!\n" ); + return WS_E_NOT_SUPPORTED; +} diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 8aa9fe9ad33..3469fedbfe6 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -1,6 +1,6 @@ @ stub WsAbandonCall @ stub WsAbandonMessage -@ stub WsAbortChannel +@ stdcall WsAbortChannel(ptr ptr) @ stub WsAbortListener @ stub WsAbortServiceHost @ stdcall WsAbortServiceProxy(ptr ptr) -- 2.15.0

1 0

Re: [v3] cmd: Added support for "&&" and "||" condition checking.
by Jacek Caban 16 Nov '17

16 Nov '17

Hi Alexander, On 06.11.2017 02:51, Alexander Coffin wrote: > Fixes: https://bugs.winehq.org/show_bug.cgi?id=32679 > > This version (v3) is now completely c89 compliant. The previous > had a one line issue that was not. > > Before "&&" and "||" were supported, but they also didn't check if past > commands had failed. This commit removes direct access to errorlevel. > Now errorlevel can only be accessed using getters and setters, but the > it seemed like the most efficient solution. Also please note I added one > TODO task. Currently this commit doesn't replicate a certain windows > bug with setting errorlevel to 1 in some cases. See test_builtins.cmd > for more details. > > I would have checked the success/failure of commands that don't set the > errorlevel if that was possible, but Winows doesn't do that. It doesn't > care about the most recent statement, it only cares about the > errorlevel if it changes, otherwise it assumes success (if the > errorlevel doesn't change). I must admit that depending on the fact if errorlevel changed looks questionable to me. You probably mostly want to handle cases of successes that don't end up clearing errorlevel, but there are other ways to do that. While looking for info about this, I found a very nice answer on Stackoverflow: https://stackoverflow.com/questions/34936240/batch-goto-loses-errorlevel/34… What I like about this is that it covers everything with tests (although I didn't verify results myself). It seems to prove that the actual success of commands is separated from errorlevel and should be handled separately. I think it would make sense to preserve actual command result and handle it separately from errorlevel. Then we could use that to decide on failure/success in || and && operators. Implementing that is a bit more work than this patch. I think we'd want WCMD_execute to return int representing executed command return code (that means that WCMD_if, WCMD_for, WCMD_move, ECMD_run_program and alike will also have to do it). Once you have that, you can simply use returned value to properly handle && and || operators. How does that sound to you? Thanks, Jacek

1 0

[PATCH 4/4] ntdll: Limit address space to 512GB on ARM64
by André Hentschel 16 Nov '17

16 Nov '17

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/ntdll/virtual.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index d28b138..2518c82 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1582,7 +1582,9 @@ void virtual_init(void) assert( !(page_size & page_mask) ); page_shift = 0; while ((1 << page_shift) != page_size) page_shift++; -#ifdef _WIN64 +#ifdef __aarch64__ + address_space_limit = (void *)(((1UL << 39) - 1) & ~page_mask); +#elif defined(_WIN64) address_space_limit = (void *)(((1UL << 47) - 1) & ~page_mask); #else address_space_limit = (void *)~page_mask; -- 2.7.4

2 2

[PATCH v3 1/2] include: Add roparameterizediid.idl
by Alex Henrie 16 Nov '17

16 Nov '17

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- v3: Imported wtypes.idl to fix compilation error. --- include/Makefile.in | 1 + include/roparameterizediid.idl | 95 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+) create mode 100644 include/roparameterizediid.idl diff --git a/include/Makefile.in b/include/Makefile.in index cc42f66ebd..d453dc8568 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -146,6 +146,7 @@ IDL_SRCS = \ pstore.idl \ qedit.idl \ richole.idl \ + roparameterizediid.idl \ row.idl \ rowchg.idl \ rowpos.idl \ diff --git a/include/roparameterizediid.idl b/include/roparameterizediid.idl new file mode 100644 index 0000000000..b133ba4c7a --- /dev/null +++ b/include/roparameterizediid.idl @@ -0,0 +1,95 @@ +/* + * Copyright 2017 Alex Henrie + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "wtypes.idl"; + +typedef void *ROPARAMIIDHANDLE; + +[ + object +] +interface IRoSimpleMetaDataBuilder +{ + HRESULT SetDelegate( + GUID iid + ); + + HRESULT SetEnum( + const WCHAR *typename, + const WCHAR *basetype + ); + + HRESULT SetInterfaceGroupParameterizedDefault( + const WCHAR *typename, + UINT32 name_element_count, + const WCHAR **name_elements + ); + + HRESULT SetInterfaceGroupSimpleDefault( + const WCHAR *typename, + const WCHAR *default_name, + const GUID *default_iid + ); + + HRESULT SetParameterizedDelegate( + GUID iid, + UINT32 arg_count + ); + + HRESULT SetParameterizedInterface( + GUID iid, + UINT32 arg_count + ); + + HRESULT SetRuntimeClassParameterizedDefault( + GUID iid, + UINT32 name_element_count, + const WCHAR **name_elements + ); + + HRESULT SetRuntimeClassSimpleDefault( + const WCHAR *typename, + const WCHAR *default_name, + const GUID *default_iid + ); + + HRESULT SetStruct( + const WCHAR *typename, + UINT32 field_count, + const WCHAR **field_typenames + ); + + HRESULT SetWinRtInterface( + GUID iid + ); +} + +[ + object +] +interface IRoMetaDataLocator +{ + HRESULT Locate( + const WCHAR *typename, + IRoSimpleMetaDataBuilder *out + ); +} -- 2.15.0

2 1

[PATCH 3/3] user32: Send WM_IME_CHAR messages from DefWindowProc.
by Akihiro Sagawa 16 Nov '17

16 Nov '17

In native, default IME window doesn't handle WM_IME_COMPOSITION(GCS_RESULTSTR). Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/imm32/tests/imm32.c | 8 +----- dlls/user32/defwnd.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++-- dlls/winemac.drv/ime.c | 58 +--------------------------------------- dlls/winex11.drv/ime.c | 60 +---------------------------------------- 4 files changed, 70 insertions(+), 125 deletions(-)

2 1

[PATCH 2/3] imm32/tests: Add more WM_IME_CHAR message tests.
by Akihiro Sagawa 16 Nov '17

16 Nov '17

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/imm32/tests/imm32.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-)

2 1

[PATCH] msvcp: Trace delimiter characters as single char strings
by Nikolay Sivov 16 Nov '17

16 Nov '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Otherwise newline delimiter causes actual newline to be inserted in trace message, splitting it to next line. dlls/msvcp60/ios.c | 16 ++++++++-------- dlls/msvcp90/ios.c | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index f5dabbfa42..fea2adee16 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -7932,7 +7932,7 @@ basic_istream_char* __thiscall basic_istream_char_get_str_delim(basic_istream_ch basic_ios_char *base = basic_istream_char_get_basic_ios(this); int ch = delim; - TRACE("(%p %p %s %c)\n", this, str, wine_dbgstr_longlong(count), delim); + TRACE("(%p %p %s %s)\n", this, str, wine_dbgstr_longlong(count), debugstr_an(&delim, 1)); this->count = 0; @@ -7978,7 +7978,7 @@ basic_istream_char* __thiscall basic_istream_char_get_streambuf_delim(basic_istr basic_ios_char *base = basic_istream_char_get_basic_ios(this); int ch = delim; - TRACE("(%p %p %c)\n", this, strbuf, delim); + TRACE("(%p %p %s)\n", this, strbuf, debugstr_an(&delim, 1)); this->count = 0; @@ -8022,7 +8022,7 @@ basic_istream_char* __thiscall basic_istream_char_getline_delim(basic_istream_ch basic_ios_char *base = basic_istream_char_get_basic_ios(this); int ch = (unsigned char)delim; - TRACE("(%p %p %s %c)\n", this, str, wine_dbgstr_longlong(count), delim); + TRACE("(%p %p %s %s)\n", this, str, wine_dbgstr_longlong(count), debugstr_an(&delim, 1)); this->count = 0; @@ -8724,7 +8724,7 @@ basic_istream_char* __cdecl basic_istream_char_getline_bstr_delim( IOSB_iostate state = IOSTATE_goodbit; int c = (unsigned char)delim; - TRACE("(%p %p %c)\n", istream, str, delim); + TRACE("(%p %p %s)\n", istream, str, debugstr_an(&delim, 1)); MSVCP_basic_string_char_clear(str); if(basic_istream_char_sentry_create(istream, TRUE)) { @@ -9400,7 +9400,7 @@ basic_istream_wchar* __thiscall basic_istream_wchar_get_str_delim(basic_istream_ basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this); unsigned short ch = delim; - TRACE("(%p %p %s %c)\n", this, str, wine_dbgstr_longlong(count), delim); + TRACE("(%p %p %s %s)\n", this, str, wine_dbgstr_longlong(count), debugstr_wn(&delim, 1)); this->count = 0; @@ -9450,7 +9450,7 @@ basic_istream_wchar* __thiscall basic_istream_wchar_get_streambuf_delim(basic_is basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this); unsigned short ch = delim; - TRACE("(%p %p %c)\n", this, strbuf, delim); + TRACE("(%p %p %s)\n", this, strbuf, debugstr_wn(&delim, 1)); this->count = 0; @@ -9498,7 +9498,7 @@ basic_istream_wchar* __thiscall basic_istream_wchar_getline_delim(basic_istream_ basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this); unsigned short ch = delim; - TRACE("(%p %p %s %c)\n", this, str, wine_dbgstr_longlong(count), delim); + TRACE("(%p %p %s %s)\n", this, str, wine_dbgstr_longlong(count), debugstr_wn(&delim, 1)); this->count = 0; @@ -10397,7 +10397,7 @@ basic_istream_wchar* __cdecl basic_istream_wchar_getline_bstr_delim( IOSB_iostate state = IOSTATE_goodbit; int c = delim; - TRACE("(%p %p %c)\n", istream, str, delim); + TRACE("(%p %p %s)\n", istream, str, debugstr_wn(&delim, 1)); MSVCP_basic_string_wchar_clear(str); if(basic_istream_wchar_sentry_create(istream, TRUE)) { diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 5d2f0ca9c6..9ae9e65b93 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -8414,7 +8414,7 @@ basic_istream_char* __thiscall basic_istream_char_get_str_delim(basic_istream_ch basic_ios_char *base = basic_istream_char_get_basic_ios(this); int ch = delim; - TRACE("(%p %p %s %c)\n", this, str, wine_dbgstr_longlong(count), delim); + TRACE("(%p %p %s %s)\n", this, str, wine_dbgstr_longlong(count), debugstr_an(&delim, 1)); this->count = 0; @@ -8460,7 +8460,7 @@ basic_istream_char* __thiscall basic_istream_char_get_streambuf_delim(basic_istr basic_ios_char *base = basic_istream_char_get_basic_ios(this); int ch = delim; - TRACE("(%p %p %c)\n", this, strbuf, delim); + TRACE("(%p %p %s)\n", this, strbuf, debugstr_an(&delim, 1)); this->count = 0; @@ -8504,7 +8504,7 @@ basic_istream_char* __thiscall basic_istream_char_getline_delim(basic_istream_ch basic_ios_char *base = basic_istream_char_get_basic_ios(this); int ch = (unsigned char)delim; - TRACE("(%p %p %s %c)\n", this, str, wine_dbgstr_longlong(count), delim); + TRACE("(%p %p %s %s)\n", this, str, wine_dbgstr_longlong(count), debugstr_an(&delim, 1)); this->count = 0; @@ -9271,7 +9271,7 @@ basic_istream_char* __cdecl basic_istream_char_getline_bstr_delim( IOSB_iostate state = IOSTATE_goodbit; int c = (unsigned char)delim; - TRACE("(%p %p %c)\n", istream, str, delim); + TRACE("(%p %p %s)\n", istream, str, debugstr_an(&delim, 1)); if(basic_istream_char_sentry_create(istream, TRUE)) { basic_streambuf_char *strbuf = basic_ios_char_rdbuf_get(base); @@ -9957,7 +9957,7 @@ basic_istream_wchar* __thiscall basic_istream_wchar_get_str_delim(basic_istream_ basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this); unsigned short ch = delim; - TRACE("(%p %p %s %c)\n", this, str, wine_dbgstr_longlong(count), delim); + TRACE("(%p %p %s %s)\n", this, str, wine_dbgstr_longlong(count), debugstr_wn(&delim, 1)); this->count = 0; @@ -10007,7 +10007,7 @@ basic_istream_wchar* __thiscall basic_istream_wchar_get_streambuf_delim(basic_is basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this); unsigned short ch = delim; - TRACE("(%p %p %c)\n", this, strbuf, delim); + TRACE("(%p %p %s)\n", this, strbuf, debugstr_wn(&delim, 1)); this->count = 0; @@ -10055,7 +10055,7 @@ basic_istream_wchar* __thiscall basic_istream_wchar_getline_delim(basic_istream_ basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this); unsigned short ch = delim; - TRACE("(%p %p %s %c)\n", this, str, wine_dbgstr_longlong(count), delim); + TRACE("(%p %p %s %s)\n", this, str, wine_dbgstr_longlong(count), debugstr_wn(&delim, 1)); this->count = 0; @@ -11018,7 +11018,7 @@ basic_istream_wchar* __cdecl basic_istream_wchar_getline_bstr_delim( IOSB_iostate state = IOSTATE_goodbit; int c = delim; - TRACE("(%p %p %c)\n", istream, str, delim); + TRACE("(%p %p %s)\n", istream, str, debugstr_wn(&delim, 1)); if(basic_istream_wchar_sentry_create(istream, TRUE)) { basic_streambuf_wchar *strbuf = basic_ios_wchar_rdbuf_get(base); -- 2.15.0

2 1

[PATCH] rsaenh: CALG_AES is not supported.
by Huw Davies 16 Nov '17

16 Nov '17

This is the correct fix for what commit f5c687e3652004e4efebe9352aadd02d179603cf was trying to fix. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/rsaenh/rsaenh.c | 13 +------------ dlls/rsaenh/tests/rsaenh.c | 9 +++++++++ 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index f2f5960fee..fdf410a4ed 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -242,7 +242,6 @@ static const PROV_ENUMALGS_EX aProvEnumAlgsEx[5][RSAENH_MAX_ENUMALGS+1] = {CALG_DES, 56, 56, 56, 0, S("DES"), S("Data Encryption Standard (DES)")}, {CALG_3DES_112, 112, 112, 112, 0, S("3DES TWO KEY"), S("Two Key Triple DES")}, {CALG_3DES, 168, 168, 168, 0, S("3DES"), S("Three Key Triple DES")}, - {CALG_AES, 128, 128, 128, 0, S("AES"), S("Advanced Encryption Standard (AES)")}, {CALG_AES_128, 128, 128, 128, 0, S("AES-128"), S("Advanced Encryption Standard (AES-128)")}, {CALG_AES_192, 192, 192, 192, 0, S("AES-192"), S("Advanced Encryption Standard (AES-192)")}, {CALG_AES_256, 256, 256, 256, 0, S("AES-256"), S("Advanced Encryption Standard (AES-256)")}, @@ -791,7 +790,7 @@ static HCRYPTKEY new_key(HCRYPTPROV hProv, ALG_ID aiAlgid, DWORD dwFlags, CRYPTK { HCRYPTKEY hCryptKey; CRYPTKEY *pCryptKey; - DWORD dwKeyLen = HIWORD(dwFlags), bKeyLen = dwKeyLen; + DWORD dwKeyLen = HIWORD(dwFlags); const PROV_ENUMALGS_EX *peaAlgidInfo; *ppCryptKey = NULL; @@ -850,14 +849,6 @@ static HCRYPTKEY new_key(HCRYPTPROV hProv, ALG_ID aiAlgid, DWORD dwFlags, CRYPTK */ break; - case CALG_AES: - if (!bKeyLen) - { - TRACE("missing key len for CALG_AES\n"); - SetLastError(NTE_BAD_ALGID); - return (HCRYPTKEY)INVALID_HANDLE_VALUE; - } - /* fall through */ default: if (dwKeyLen % 8 || dwKeyLen > peaAlgidInfo->dwMaxLen || @@ -924,7 +915,6 @@ static HCRYPTKEY new_key(HCRYPTPROV hProv, ALG_ID aiAlgid, DWORD dwFlags, CRYPTK pCryptKey->dwMode = CRYPT_MODE_CBC; break; - case CALG_AES: case CALG_AES_128: case CALG_AES_192: case CALG_AES_256: @@ -3197,7 +3187,6 @@ BOOL WINAPI RSAENH_CPGenKey(HCRYPTPROV hProv, ALG_ID Algid, DWORD dwFlags, HCRYP case CALG_DES: case CALG_3DES_112: case CALG_3DES: - case CALG_AES: case CALG_AES_128: case CALG_AES_192: case CALG_AES_256: diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index c9532b2bcc..bc8e798cdd 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -224,6 +224,15 @@ static BOOL init_aes_environment(void) result = CryptGenKey(hProv, AT_SIGNATURE, 0, &hKey); ok(result, "%08x\n", GetLastError()); if (result) CryptDestroyKey(hKey); + + /* CALG_AES is not supported, but CALG_AES_128 is */ + result = CryptGenKey(hProv, CALG_AES, 0, &hKey); + ok(!result && GetLastError() == NTE_BAD_ALGID, "%d %08x\n", result, GetLastError()); + result = CryptGenKey(hProv, CALG_AES, 128 << 16, &hKey); + ok(!result && GetLastError() == NTE_BAD_ALGID, "%d %08x\n", result, GetLastError()); + result = CryptGenKey(hProv, CALG_AES_128, 0, &hKey); + ok(result, "%08x\n", GetLastError()); + if (result) CryptDestroyKey(hKey); } return TRUE; } -- 2.12.0

1 0

[PATCH v4 1/4] winex11.drv: Preserve last error in x11drv_thread_data().
by Rafał Harabień 16 Nov '17

16 Nov '17

Issue was caused by TlsGetValue always resetting error to ERROR_SUCCESS. This change fixes GetCursorPos resetting last-error randomly. Signed-off-by: Rafał Harabień <rafalh1992(a)o2.pl> --- dlls/user32/dialog.c | 1 + dlls/user32/menu.c | 3 +++ dlls/user32/tests/input.c | 11 ++++++++++- dlls/user32/tests/win.c | 7 +++++++ dlls/winex11.drv/x11drv.h | 7 ++++++- 5 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index c2aad8d..46220b0 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -283,6 +283,7 @@ static BOOL DIALOG_CreateControls32( HWND hwnd, LPCSTR template, const DLG_TEMPL WARN("control %s %s creation failed\n", debugstr_w(info.className), debugstr_w(info.windowName)); if (dlgTemplate->style & DS_NOFAILCREATE) continue; + SetLastError(0); return FALSE; } diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index a5f2317..1ba9638 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -3505,8 +3505,10 @@ BOOL WINAPI TrackPopupMenuEx( HMENU hMenu, UINT wFlags, INT x, INT y, GetClassLongW( hWnd, GCL_STYLE)); if (MENU_ShowPopup( hWnd, hMenu, 0, wFlags, x, y, 0, 0 )) + { ret = MENU_TrackMenu( hMenu, wFlags | TPM_POPUPMENU, 0, 0, hWnd, lpTpm ? &lpTpm->rcExclude : NULL ); + } MENU_ExitTracking(hWnd, TRUE); if (menu->hWnd) @@ -3518,6 +3520,7 @@ BOOL WINAPI TrackPopupMenuEx( HMENU hMenu, UINT wFlags, INT x, INT y, SendMessageW( hWnd, WM_UNINITMENUPOPUP, (WPARAM)hMenu, MAKELPARAM(0, IS_SYSTEM_MENU(menu)) ); } + SetLastError(0); } return ret; diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 8f2576d..6ce03f8 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1928,8 +1928,17 @@ static void test_Input_mouse(void) DWORD thread_id; POINT pt, pt_org; MSG msg; + BOOL ret; - GetCursorPos(&pt_org); + SetLastError(0xdeadbeef); + ret = GetCursorPos(NULL); + ok(!ret, "GetCursorPos succeed\n"); + ok(GetLastError() == 0xdeadbeef || GetLastError() == ERROR_NOACCESS, "error %lu\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = GetCursorPos(&pt_org); + ok(ret, "GetCursorPos failed\n"); + ok(GetLastError() == 0xdeadbeef, "error %lu\n", GetLastError()); button_win = CreateWindowA("button", "button", WS_VISIBLE | WS_POPUP, 100, 100, 100, 100, 0, NULL, NULL, NULL); diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index b529284..dae34e4 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -6261,6 +6261,13 @@ static void test_CreateWindow(void) ok( rc.bottom <= expected_cy, "invalid rect bottom %u\n", rc.bottom ); DestroyWindow(hwnd); + /* invalid class */ + SetLastError(0xdeadbeef); + hwnd = CreateWindowExA(0, "INVALID_CLASS", NULL, WS_CHILD, 10, 10, 100, 100, parent, 0, 0, NULL); + ok(hwnd == 0, "CreateWindowEx succeeded\n"); + ok(GetLastError() == ERROR_CLASS_DOES_NOT_EXIST, "CreateWindowEx error %d\n", GetLastError()); + DestroyWindow(hwnd); + if (pGetLayout && pSetLayout) { HDC hdc = GetDC( parent ); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 721c082..6786a08 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -345,7 +345,12 @@ extern DWORD thread_data_tls_index DECLSPEC_HIDDEN; static inline struct x11drv_thread_data *x11drv_thread_data(void) { - return TlsGetValue( thread_data_tls_index ); + /* TlsGetValue always resets last error */ + unsigned long err = GetLastError(); + struct x11drv_thread_data *data = TlsGetValue( thread_data_tls_index ); + if (err != ERROR_SUCCESS && GetLastError() == ERROR_SUCCESS) + SetLastError(err); + return data; } /* retrieve the thread display, or NULL if not created yet */ -- 2.7.4

2 3

[PATCH 3/5] ntdll: Add support for junction point creation.
by Daniel Lehman 16 Nov '17

16 Nov '17

1 0

[PATCH 4/5] ntdll: Add support for reading junction points.
by Daniel Lehman 16 Nov '17

16 Nov '17

1 0

[PATCH 5/5] ntdll: Add support for deleting junction points.
by Daniel Lehman 16 Nov '17

16 Nov '17

1 0

[PATCH 2/5] kernel32: Add support for deleting junction points with RemoveDirectory.
by Daniel Lehman 16 Nov '17

16 Nov '17

1 0

[PATCH v2 1/2] d3d10core/tests: Introduce a format compatibility test.
by Henri Verbeet 15 Nov '17

15 Nov '17

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- As it turns out, the testbot doesn't handle the NULL source box particularly well. I think we'll still want to match the hardware behaviour in Wine. This supersedes patch 138601. --- dlls/d3d10core/tests/device.c | 130 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 130 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index f947811..316a84e 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -12929,6 +12929,135 @@ static void test_stream_output_resume(void) release_test_context(&test_context); } +static void test_format_compatibility(void) +{ + ID3D10Texture2D *dst_texture, *src_texture; + D3D10_SUBRESOURCE_DATA resource_data; + D3D10_TEXTURE2D_DESC texture_desc; + struct resource_readback rb; + DWORD colour, expected; + ID3D10Device *device; + unsigned int i, j; + ULONG refcount; + HRESULT hr; + + static const struct + { + DXGI_FORMAT src_format; + DXGI_FORMAT dst_format; + size_t texel_size; + BOOL success; + } + test_data[] = + { + {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, 4, TRUE}, + {DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, 4, TRUE}, + {DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UINT, 4, TRUE}, + {DXGI_FORMAT_R8G8B8A8_UINT, DXGI_FORMAT_R8G8B8A8_SNORM, 4, TRUE}, + {DXGI_FORMAT_R8G8B8A8_SNORM, DXGI_FORMAT_R8G8B8A8_SINT, 4, TRUE}, + {DXGI_FORMAT_R8G8B8A8_SINT, DXGI_FORMAT_R8G8B8A8_TYPELESS, 4, TRUE}, + {DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_B8G8R8A8_UNORM, 4, FALSE}, + {DXGI_FORMAT_R8G8B8A8_UINT, DXGI_FORMAT_R16G16_UINT, 4, FALSE}, + {DXGI_FORMAT_R16G16_TYPELESS, DXGI_FORMAT_R16G16_FLOAT, 4, TRUE}, + {DXGI_FORMAT_R16G16_FLOAT, DXGI_FORMAT_R16G16_UNORM, 4, TRUE}, + {DXGI_FORMAT_R16G16_UNORM, DXGI_FORMAT_R16G16_UINT, 4, TRUE}, + {DXGI_FORMAT_R16G16_UINT, DXGI_FORMAT_R16G16_SNORM, 4, TRUE}, + {DXGI_FORMAT_R16G16_SNORM, DXGI_FORMAT_R16G16_SINT, 4, TRUE}, + {DXGI_FORMAT_R16G16_SINT, DXGI_FORMAT_R16G16_TYPELESS, 4, TRUE}, + {DXGI_FORMAT_R16G16_TYPELESS, DXGI_FORMAT_R32_TYPELESS, 4, FALSE}, + {DXGI_FORMAT_R32G32_TYPELESS, DXGI_FORMAT_R32G32_FLOAT, 8, TRUE}, + {DXGI_FORMAT_R32G32_FLOAT, DXGI_FORMAT_R32G32_UINT, 8, TRUE}, + {DXGI_FORMAT_R32G32_UINT, DXGI_FORMAT_R32G32_SINT, 8, TRUE}, + {DXGI_FORMAT_R32G32_SINT, DXGI_FORMAT_R32G32_TYPELESS, 8, TRUE}, + }; + static const DWORD initial_data[16] = {0}; + static const DWORD bitmap_data[] = + { + 0xff0000ff, 0xff00ffff, 0xff00ff00, 0xffffff00, + 0xffff0000, 0xffff00ff, 0xff000000, 0xff7f7f7f, + 0xffffffff, 0xffffffff, 0xffffffff, 0xff000000, + 0xffffffff, 0xff000000, 0xff000000, 0xff000000, + }; + + if (!(device = create_device())) + { + skip("Failed to create device.\n"); + return; + } + + texture_desc.Height = 4; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.BindFlags = D3D10_BIND_SHADER_RESOURCE; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + + for (i = 0; i < ARRAY_SIZE(test_data); ++i) + { + unsigned int x, y, texel_dwords; + D3D10_BOX box; + + texture_desc.Width = sizeof(bitmap_data) / (texture_desc.Height * test_data[i].texel_size); + texture_desc.Format = test_data[i].src_format; + texture_desc.Usage = D3D10_USAGE_IMMUTABLE; + + resource_data.pSysMem = bitmap_data; + resource_data.SysMemPitch = texture_desc.Width * test_data[i].texel_size; + resource_data.SysMemSlicePitch = 0; + + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, &resource_data, &src_texture); + ok(SUCCEEDED(hr), "Failed to create source texture, hr %#x.\n", hr); + + texture_desc.Format = test_data[i].dst_format; + texture_desc.Usage = D3D10_USAGE_DEFAULT; + + resource_data.pSysMem = initial_data; + + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, &resource_data, &dst_texture); + ok(SUCCEEDED(hr), "Failed to create destination texture, hr %#x.\n", hr); + + set_box(&box, 0, 0, 0, texture_desc.Width - 1, texture_desc.Height - 1, 1); + ID3D10Device_CopySubresourceRegion(device, (ID3D10Resource *)dst_texture, 0, 1, 1, 0, + (ID3D10Resource *)src_texture, 0, &box); + + texel_dwords = test_data[i].texel_size / sizeof(DWORD); + get_texture_readback(dst_texture, 0, &rb); + for (j = 0; j < ARRAY_SIZE(bitmap_data); ++j) + { + x = j % 4; + y = j / 4; + colour = get_readback_color(&rb, x, y); + expected = test_data[i].success && x >= texel_dwords && y + ? bitmap_data[j - (4 + texel_dwords)] : initial_data[j]; + ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n", + i, colour, x, y, expected); + } + release_resource_readback(&rb); + + ID3D10Device_CopyResource(device, (ID3D10Resource *)dst_texture, (ID3D10Resource *)src_texture); + + get_texture_readback(dst_texture, 0, &rb); + for (j = 0; j < ARRAY_SIZE(bitmap_data); ++j) + { + x = j % 4; + y = j / 4; + colour = get_readback_color(&rb, x, y); + expected = test_data[i].success ? bitmap_data[j] : initial_data[j]; + ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n", + i, colour, x, y, expected); + } + release_resource_readback(&rb); + + ID3D10Texture2D_Release(dst_texture); + ID3D10Texture2D_Release(src_texture); + } + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(device) { test_feature_level(); @@ -13001,4 +13130,5 @@ START_TEST(device) test_geometry_shader(); test_stream_output(); test_stream_output_resume(); + test_format_compatibility(); } -- 2.1.4

2 1

[PATCH v2 2/2] d3d11/tests: Introduce a format compatibility test.
by Henri Verbeet 15 Nov '17

15 Nov '17

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 138600. --- dlls/d3d11/tests/d3d11.c | 133 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 133 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 5474be4..59f2e6e 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -22315,6 +22315,138 @@ static void test_conservative_depth_output(void) release_test_context(&test_context); } +static void test_format_compatibility(void) +{ + ID3D11Texture2D *dst_texture, *src_texture; + D3D11_SUBRESOURCE_DATA resource_data; + D3D11_TEXTURE2D_DESC texture_desc; + ID3D11DeviceContext *context; + struct resource_readback rb; + DWORD colour, expected; + ID3D11Device *device; + unsigned int i, j; + ULONG refcount; + HRESULT hr; + + static const struct + { + DXGI_FORMAT src_format; + DXGI_FORMAT dst_format; + size_t texel_size; + BOOL success; + } + test_data[] = + { + {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, 4, TRUE}, + {DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, 4, TRUE}, + {DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UINT, 4, TRUE}, + {DXGI_FORMAT_R8G8B8A8_UINT, DXGI_FORMAT_R8G8B8A8_SNORM, 4, TRUE}, + {DXGI_FORMAT_R8G8B8A8_SNORM, DXGI_FORMAT_R8G8B8A8_SINT, 4, TRUE}, + {DXGI_FORMAT_R8G8B8A8_SINT, DXGI_FORMAT_R8G8B8A8_TYPELESS, 4, TRUE}, + {DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_B8G8R8A8_UNORM, 4, FALSE}, + {DXGI_FORMAT_R8G8B8A8_UINT, DXGI_FORMAT_R16G16_UINT, 4, FALSE}, + {DXGI_FORMAT_R16G16_TYPELESS, DXGI_FORMAT_R16G16_FLOAT, 4, TRUE}, + {DXGI_FORMAT_R16G16_FLOAT, DXGI_FORMAT_R16G16_UNORM, 4, TRUE}, + {DXGI_FORMAT_R16G16_UNORM, DXGI_FORMAT_R16G16_UINT, 4, TRUE}, + {DXGI_FORMAT_R16G16_UINT, DXGI_FORMAT_R16G16_SNORM, 4, TRUE}, + {DXGI_FORMAT_R16G16_SNORM, DXGI_FORMAT_R16G16_SINT, 4, TRUE}, + {DXGI_FORMAT_R16G16_SINT, DXGI_FORMAT_R16G16_TYPELESS, 4, TRUE}, + {DXGI_FORMAT_R16G16_TYPELESS, DXGI_FORMAT_R32_TYPELESS, 4, FALSE}, + {DXGI_FORMAT_R32G32_TYPELESS, DXGI_FORMAT_R32G32_FLOAT, 8, TRUE}, + {DXGI_FORMAT_R32G32_FLOAT, DXGI_FORMAT_R32G32_UINT, 8, TRUE}, + {DXGI_FORMAT_R32G32_UINT, DXGI_FORMAT_R32G32_SINT, 8, TRUE}, + {DXGI_FORMAT_R32G32_SINT, DXGI_FORMAT_R32G32_TYPELESS, 8, TRUE}, + }; + static const DWORD initial_data[16] = {0}; + static const DWORD bitmap_data[] = + { + 0xff0000ff, 0xff00ffff, 0xff00ff00, 0xffffff00, + 0xffff0000, 0xffff00ff, 0xff000000, 0xff7f7f7f, + 0xffffffff, 0xffffffff, 0xffffffff, 0xff000000, + 0xffffffff, 0xff000000, 0xff000000, 0xff000000, + }; + + if (!(device = create_device(NULL))) + { + skip("Failed to create device.\n"); + return; + } + ID3D11Device_GetImmediateContext(device, &context); + + texture_desc.Height = 4; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.BindFlags = D3D11_BIND_SHADER_RESOURCE; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + + for (i = 0; i < ARRAY_SIZE(test_data); ++i) + { + unsigned int x, y, texel_dwords; + D3D11_BOX box; + + texture_desc.Width = sizeof(bitmap_data) / (texture_desc.Height * test_data[i].texel_size); + texture_desc.Format = test_data[i].src_format; + texture_desc.Usage = D3D11_USAGE_IMMUTABLE; + + resource_data.pSysMem = bitmap_data; + resource_data.SysMemPitch = texture_desc.Width * test_data[i].texel_size; + resource_data.SysMemSlicePitch = 0; + + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, &resource_data, &src_texture); + ok(SUCCEEDED(hr), "Failed to create source texture, hr %#x.\n", hr); + + texture_desc.Format = test_data[i].dst_format; + texture_desc.Usage = D3D11_USAGE_DEFAULT; + + resource_data.pSysMem = initial_data; + + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, &resource_data, &dst_texture); + ok(SUCCEEDED(hr), "Failed to create destination texture, hr %#x.\n", hr); + + set_box(&box, 0, 0, 0, texture_desc.Width - 1, texture_desc.Height - 1, 1); + ID3D11DeviceContext_CopySubresourceRegion(context, (ID3D11Resource *)dst_texture, 0, 1, 1, 0, + (ID3D11Resource *)src_texture, 0, &box); + + texel_dwords = test_data[i].texel_size / sizeof(DWORD); + get_texture_readback(dst_texture, 0, &rb); + for (j = 0; j < ARRAY_SIZE(bitmap_data); ++j) + { + x = j % 4; + y = j / 4; + colour = get_readback_color(&rb, x, y); + expected = test_data[i].success && x >= texel_dwords && y + ? bitmap_data[j - (4 + texel_dwords)] : initial_data[j]; + ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n", + i, colour, x, y, expected); + } + release_resource_readback(&rb); + + ID3D11DeviceContext_CopyResource(context, (ID3D11Resource *)dst_texture, (ID3D11Resource *)src_texture); + + get_texture_readback(dst_texture, 0, &rb); + for (j = 0; j < ARRAY_SIZE(bitmap_data); ++j) + { + x = j % 4; + y = j / 4; + colour = get_readback_color(&rb, x, y); + expected = test_data[i].success ? bitmap_data[j] : initial_data[j]; + ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n", + i, colour, x, y, expected); + } + release_resource_readback(&rb); + + ID3D11Texture2D_Release(dst_texture); + ID3D11Texture2D_Release(src_texture); + } + + ID3D11DeviceContext_Release(context); + refcount = ID3D11Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(d3d11) { test_create_device(); @@ -22420,4 +22552,5 @@ START_TEST(d3d11) test_fractional_viewports(); test_early_depth_stencil(); test_conservative_depth_output(); + test_format_compatibility(); } -- 2.1.4

1 0

[PATCH 3/4] loader: loader: Setup the TLS register on ARM64
by André Hentschel 15 Nov '17

15 Nov '17

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- loader/preloader.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/loader/preloader.c b/loader/preloader.c index e519457..725926e 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -457,6 +457,8 @@ SYSCALL_NOERR( wld_getegid, 108 /* SYS_getegid */ ); #elif defined(__aarch64__) +void *thread_data[256]; + /* * The _start function is the entry and exit point of this program * @@ -469,6 +471,8 @@ __ASM_GLOBAL_FUNC(_start, "mov x0, SP\n\t" "sub SP, SP, #144\n\t" /* allocate some space for extra aux values */ "str x0, [SP]\n\t" /* orig stack pointer */ + "ldr x0, =thread_data\n\t" + "msr tpidr_el0, x0\n\t" "mov x0, SP\n\t" /* ptr to orig stack pointer */ "bl wld_start\n\t" "ldr x1, [SP]\n\t" /* new stack pointer */ -- 2.7.4

1 0

[PATCH 2/4] loader: Remove dead code
by André Hentschel 15 Nov '17

15 Nov '17

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- loader/preloader.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/loader/preloader.c b/loader/preloader.c index 5a4bb16..e519457 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -469,10 +469,8 @@ __ASM_GLOBAL_FUNC(_start, "mov x0, SP\n\t" "sub SP, SP, #144\n\t" /* allocate some space for extra aux values */ "str x0, [SP]\n\t" /* orig stack pointer */ - "str x30, [SP, #8]\n\t" "mov x0, SP\n\t" /* ptr to orig stack pointer */ "bl wld_start\n\t" - "ldr x30, [SP, #8]\n\t" "ldr x1, [SP]\n\t" /* new stack pointer */ "mov SP, x1\n\t" "mov x30, x0\n\t" -- 2.7.4

1 0

[PATCH 1/4] configure: Set the main loader base address on ARM64
by André Hentschel 15 Nov '17

15 Nov '17

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Fixes https://bugs.winehq.org/show_bug.cgi?id=43946 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 29f4cd1..ee1f82d 100644 --- a/configure.ac +++ b/configure.ac @@ -920,7 +920,7 @@ case $host_os in [LDRPATH_INSTALL="$LDRPATH_INSTALL -Wl,--enable-new-dtags"]) case $host_cpu in - *i[[3456789]]86* | x86_64) + *i[[3456789]]86* | x86_64 | *aarch64*) WINE_TRY_CFLAGS([-Wl,-Ttext-segment=0x7bc00000], [case $host_os in freebsd* | kfreebsd*-gnu) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-Ttext-segment=0x60000000" ;; -- 2.7.4

1 0

[PATCH 1/3] wined3d: Show the device window when changing fullscreen resolutions (v3).
by Stefan Dösinger 15 Nov '17

15 Nov '17

World of Warplanes calls SetWindowLong(window, GWL_STYLE, WS_POPUP) before calling reset, effectively hiding the window. It does not call SetWindowPos(SWP_FRAMECHANGED), so the effect isn't visible and the game displays fine after the reset. However, after the next mouse click WINPOS_WindowFromPoint skips the window because it doesn't have WS_VISIBLE and returns the desktop window. This in turn triggers a focus loss and d3d9 minimizes the game. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- Version 3: Use SW_SHOW instead of SW_SHOWNORMAL to avoid knocking ddraw test windows out of WS_MAXIMIZED state. I originally thought SW_SHOWNORMAL is needed to create a WINDOWPOS structure that matches that of Windows, but that was apparently wrong. Version 2: Don't check the MoveWindow() WINDOWPOS structure. It differs between Windows versions - Windows 10 17.03 changed the behavior. The message that causes the window to be re-shown is consistent among all versions. I am quite sure the new Windows behavior breaks a game or two, but I haven't tested my game collection yet... --- dlls/d3d9/tests/d3d9ex.c | 118 +++++++++++++++++++++++++++++++++++++++++++-- dlls/d3d9/tests/device.c | 121 +++++++++++++++++++++++++++++++++++++++++++++-- dlls/wined3d/swapchain.c | 1 + 3 files changed, 232 insertions(+), 8 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 648d17bac4..c965af7264 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -2468,6 +2468,7 @@ struct message enum message_window window; BOOL check_wparam; WPARAM expect_wparam; + WINDOWPOS *store_wp; }; static const struct message *expect_messages; @@ -2516,6 +2517,9 @@ static LRESULT CALLBACK test_proc(HWND hwnd, UINT message, WPARAM wparam, LPARAM "Got unexpected wparam %lx for message %x, expected %lx.\n", wparam, message, expect_messages->expect_wparam); + if (expect_messages->store_wp) + *expect_messages->store_wp = *(WINDOWPOS *)lparam; + ++expect_messages; } } @@ -2583,9 +2587,10 @@ static void test_wndproc(void) D3DDISPLAYMODE d3ddm; DWORD d3d_width = 0, d3d_height = 0, user32_width = 0, user32_height = 0; DEVMODEW devmode; - LONG change_ret; + LONG change_ret, device_style; BOOL ret; IDirect3D9Ex *d3d9ex; + WINDOWPOS windowpos; static const struct message create_messages[] = { @@ -2678,16 +2683,59 @@ static void test_wndproc(void) /* WM_SIZE(SIZE_MAXIMIZED) is unreliable on native. */ {0, 0, FALSE, 0}, }; - static const struct + struct message mode_change_messages[] = + { + {WM_WINDOWPOSCHANGING, DEVICE_WINDOW, FALSE, 0}, + {WM_WINDOWPOSCHANGED, DEVICE_WINDOW, FALSE, 0}, + {WM_SIZE, DEVICE_WINDOW, FALSE, 0}, + /* TODO: WM_DISPLAYCHANGE is sent to the focus window too, but the order is + * differs between Wine and Windows. */ + /* TODO 2: Windows sends a second WM_WINDOWPOSCHANGING(SWP_NOMOVE | SWP_NOSIZE + * | SWP_NOACTIVATE) in this situation, suggesting a difference in their ShowWindow + * implementation. This SetWindowPos call could in theory affect the Z order. Wine's + * ShowWindow does not send such a message because the window is already visible. */ + {0, 0, FALSE, 0}, + }; + struct message mode_change_messages_hidden[] = + { + {WM_WINDOWPOSCHANGING, DEVICE_WINDOW, FALSE, 0}, + {WM_WINDOWPOSCHANGED, DEVICE_WINDOW, FALSE, 0}, + {WM_SIZE, DEVICE_WINDOW, FALSE, 0}, + {WM_SHOWWINDOW, DEVICE_WINDOW, FALSE, 0}, + {WM_WINDOWPOSCHANGING, DEVICE_WINDOW, FALSE, 0, &windowpos}, + {WM_WINDOWPOSCHANGED, DEVICE_WINDOW, FALSE, 0}, + /* TODO: WM_DISPLAYCHANGE is sent to the focus window too, but the order is + * differs between Wine and Windows. */ + {0, 0, FALSE, 0}, + }; + static const struct message mode_change_messages_nowc[] = + { + {WM_DISPLAYCHANGE, FOCUS_WINDOW, FALSE, 0}, + {0, 0, FALSE, 0}, + }; + struct { DWORD create_flags; const struct message *focus_loss_messages; + const struct message *mode_change_messages, *mode_change_messages_hidden; BOOL iconic; } tests[] = { - {0, focus_loss_messages, TRUE}, - {CREATE_DEVICE_NOWINDOWCHANGES, focus_loss_messages_nowc, FALSE}, + { + 0, + focus_loss_messages, + mode_change_messages, + mode_change_messages_hidden, + TRUE + }, + { + CREATE_DEVICE_NOWINDOWCHANGES, + focus_loss_messages_nowc, + mode_change_messages_nowc, + mode_change_messages_nowc, + FALSE + }, }; hr = pDirect3DCreate9Ex(D3D_SDK_VERSION, &d3d9ex); @@ -3051,6 +3099,68 @@ static void test_wndproc(void) skip("Failed to create a D3D device, skipping tests.\n"); goto done; } + filter_messages = NULL; + flush_events(); + + device_desc.width = user32_width; + device_desc.height = user32_height; + + expect_messages = tests[i].mode_change_messages; + filter_messages = focus_window; + hr = reset_device(device, &device_desc); + ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); + filter_messages = NULL; + + /* The WINDOWPOS structure passed to the first WM_WINDOWPOSCHANGING differs between windows versions. + * Prior to Win10 17.03 it is consistent with a MoveWindow(0, 0, width, height) call. Since Windows + * 10 17.03 it has x = 0, y = 0, width = 0, height = 0, flags = SWP_NOCLIENTMOVE | SWP_NOCLIENTSIZE + * | SWP_NOACTIVATE | SWP_FRAMECHANGED | SWP_NOSIZE | SWP_NOMOVE | SWP_NOZORDER (0x1837). Visually + * it is clear that the window has not been resized. In previous Windows version the window is resized. */ + + flush_events(); + ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it, i=%u.\n", + expect_messages->message, expect_messages->window, i); + + /* World of Warplanes hides the window by removing WS_VISIBLE and expects Reset() to show it again. */ + device_style = GetWindowLongA(device_window, GWL_STYLE); + SetWindowLongA(device_window, GWL_STYLE, device_style & ~WS_VISIBLE); + + flush_events(); + device_desc.width = d3d_width; + device_desc.height = d3d_height; + memset(&windowpos, 0, sizeof(windowpos)); + + expect_messages = tests[i].mode_change_messages_hidden; + filter_messages = focus_window; + hr = reset_device(device, &device_desc); + ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); + filter_messages = NULL; + + flush_events(); + ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it, i=%u.\n", + expect_messages->message, expect_messages->window, i); + + if (!(tests[i].create_flags & CREATE_DEVICE_NOWINDOWCHANGES)) + { + ok(windowpos.hwnd == device_window && !windowpos.hwndInsertAfter + && !windowpos.x && !windowpos.y && !windowpos.cx && !windowpos.cy + && windowpos.flags == (SWP_SHOWWINDOW | SWP_NOMOVE | SWP_NOSIZE), + "Got unexpected WINDOWPOS hwnd=%p, insertAfter=%p, x=%d, y=%d, cx=%d, cy=%d, flags=%x\n", + windowpos.hwnd, windowpos.hwndInsertAfter, windowpos.x, windowpos.y, windowpos.cx, + windowpos.cy, windowpos.flags); + } + + device_style = GetWindowLongA(device_window, GWL_STYLE); + if (tests[i].create_flags & CREATE_DEVICE_NOWINDOWCHANGES) + { + todo_wine ok(!(device_style & WS_VISIBLE), "Expected the device window to be hidden, i=%u.\n", i); + ShowWindow(device_window, SW_MINIMIZE); + ShowWindow(device_window, SW_RESTORE); + } + else + { + ok(device_style & WS_VISIBLE, "Expected the device window to be visible, i=%u.\n", i); + } proc = SetWindowLongPtrA(focus_window, GWLP_WNDPROC, (LONG_PTR)DefWindowProcA); ok(proc != (LONG_PTR)test_proc, "Expected wndproc != %#lx.\n", diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 82ced8372b..388cda1d7a 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -3401,6 +3401,7 @@ struct message enum message_window window; BOOL check_wparam; WPARAM expect_wparam; + WINDOWPOS *store_wp; }; static const struct message *expect_messages; @@ -3449,6 +3450,9 @@ static LRESULT CALLBACK test_proc(HWND hwnd, UINT message, WPARAM wparam, LPARAM "Got unexpected wparam %lx for message %x, expected %lx.\n", wparam, message, expect_messages->expect_wparam); + if (expect_messages->store_wp) + *expect_messages->store_wp = *(WINDOWPOS *)lparam; + ++expect_messages; } } @@ -3517,8 +3521,9 @@ static void test_wndproc(void) D3DDISPLAYMODE d3ddm; DWORD d3d_width = 0, d3d_height = 0, user32_width = 0, user32_height = 0; DEVMODEW devmode; - LONG change_ret; + LONG change_ret, device_style; BOOL ret; + WINDOWPOS windowpos; static const struct message create_messages[] = { @@ -3631,16 +3636,61 @@ static void test_wndproc(void) /* WM_SIZE(SIZE_MAXIMIZED) is unreliable on native. */ {0, 0, FALSE, 0}, }; - static const struct + struct message mode_change_messages[] = + { + {WM_WINDOWPOSCHANGING, DEVICE_WINDOW, FALSE, 0}, + {WM_WINDOWPOSCHANGED, DEVICE_WINDOW, FALSE, 0}, + {WM_SIZE, DEVICE_WINDOW, FALSE, 0}, + /* TODO: WM_DISPLAYCHANGE is sent to the focus window too, but the order is + * differs between Wine and Windows. */ + /* TODO 2: Windows sends a second WM_WINDOWPOSCHANGING(SWP_NOMOVE | SWP_NOSIZE + * | SWP_NOACTIVATE) in this situation, suggesting a difference in their ShowWindow + * implementation. This SetWindowPos call could in theory affect the Z order. Wine's + * ShowWindow does not send such a message because the window is already visible. */ + {0, 0, FALSE, 0}, + }; + struct message mode_change_messages_hidden[] = + { + {WM_WINDOWPOSCHANGING, DEVICE_WINDOW, FALSE, 0}, + {WM_WINDOWPOSCHANGED, DEVICE_WINDOW, FALSE, 0}, + {WM_SIZE, DEVICE_WINDOW, FALSE, 0}, + {WM_SHOWWINDOW, DEVICE_WINDOW, FALSE, 0}, + {WM_WINDOWPOSCHANGING, DEVICE_WINDOW, FALSE, 0, &windowpos}, + {WM_WINDOWPOSCHANGED, DEVICE_WINDOW, FALSE, 0}, + /* TODO: WM_DISPLAYCHANGE is sent to the focus window too, but the order is + * differs between Wine and Windows. */ + {0, 0, FALSE, 0}, + }; + static const struct message mode_change_messages_nowc[] = + { + {WM_DISPLAYCHANGE, FOCUS_WINDOW, FALSE, 0}, + {0, 0, FALSE, 0}, + }; + struct { DWORD create_flags; const struct message *focus_loss_messages, *reactivate_messages; + const struct message *mode_change_messages, *mode_change_messages_hidden; BOOL iconic; } tests[] = { - {0, focus_loss_messages, reactivate_messages, TRUE}, - {CREATE_DEVICE_NOWINDOWCHANGES, focus_loss_messages_nowc, reactivate_messages_nowc, FALSE}, + { + 0, + focus_loss_messages, + reactivate_messages, + mode_change_messages, + mode_change_messages_hidden, + TRUE + }, + { + CREATE_DEVICE_NOWINDOWCHANGES, + focus_loss_messages_nowc, + reactivate_messages_nowc, + mode_change_messages_nowc, + mode_change_messages_nowc, + FALSE + }, }; d3d9 = Direct3DCreate9(D3D_SDK_VERSION); @@ -4026,11 +4076,74 @@ static void test_wndproc(void) skip("Failed to create a D3D device, skipping tests.\n"); goto done; } + filter_messages = NULL; + flush_events(); + + device_desc.width = user32_width; + device_desc.height = user32_height; + + expect_messages = tests[i].mode_change_messages; + filter_messages = focus_window; + hr = reset_device(device, &device_desc); + ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); + filter_messages = NULL; + + /* The WINDOWPOS structure passed to the first WM_WINDOWPOSCHANGING differs between windows versions. + * Prior to Win10 17.03 it is consistent with a MoveWindow(0, 0, width, height) call. Since Windows + * 10 17.03 it has x = 0, y = 0, width = 0, height = 0, flags = SWP_NOCLIENTMOVE | SWP_NOCLIENTSIZE + * | SWP_NOACTIVATE | SWP_FRAMECHANGED | SWP_NOSIZE | SWP_NOMOVE | SWP_NOZORDER (0x1837). Visually + * it is clear that the window has not been resized. In previous Windows version the window is resized. */ + + flush_events(); + ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it, i=%u.\n", + expect_messages->message, expect_messages->window, i); + + /* World of Warplanes hides the window by removing WS_VISIBLE and expects Reset() to show it again. */ + device_style = GetWindowLongA(device_window, GWL_STYLE); + SetWindowLongA(device_window, GWL_STYLE, device_style & ~WS_VISIBLE); + + flush_events(); + device_desc.width = d3d_width; + device_desc.height = d3d_height; + memset(&windowpos, 0, sizeof(windowpos)); + + expect_messages = tests[i].mode_change_messages_hidden; + filter_messages = focus_window; + hr = reset_device(device, &device_desc); + ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); + filter_messages = NULL; + + flush_events(); + ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it, i=%u.\n", + expect_messages->message, expect_messages->window, i); + + if (!(tests[i].create_flags & CREATE_DEVICE_NOWINDOWCHANGES)) + { + ok(windowpos.hwnd == device_window && !windowpos.hwndInsertAfter + && !windowpos.x && !windowpos.y && !windowpos.cx && !windowpos.cy + && windowpos.flags == (SWP_SHOWWINDOW | SWP_NOMOVE | SWP_NOSIZE), + "Got unexpected WINDOWPOS hwnd=%p, insertAfter=%p, x=%d, y=%d, cx=%d, cy=%d, flags=%x\n", + windowpos.hwnd, windowpos.hwndInsertAfter, windowpos.x, windowpos.y, windowpos.cx, + windowpos.cy, windowpos.flags); + } + + device_style = GetWindowLongA(device_window, GWL_STYLE); + if (tests[i].create_flags & CREATE_DEVICE_NOWINDOWCHANGES) + { + todo_wine ok(!(device_style & WS_VISIBLE), "Expected the device window to be hidden, i=%u.\n", i); + ShowWindow(device_window, SW_MINIMIZE); + ShowWindow(device_window, SW_RESTORE); + } + else + { + ok(device_style & WS_VISIBLE, "Expected the device window to be visible, i=%u.\n", i); + } proc = SetWindowLongPtrA(focus_window, GWLP_WNDPROC, (LONG_PTR)DefWindowProcA); ok(proc != (LONG_PTR)test_proc, "Expected wndproc != %#lx, i=%u.\n", (LONG_PTR)test_proc, i); + filter_messages = focus_window; ref = IDirect3DDevice9_Release(device); ok(ref == 0, "The device was not properly freed: refcount %u, i=%u.\n", ref, i); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index e23e99b67b..dd3655f61c 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1429,6 +1429,7 @@ HRESULT CDECL wined3d_swapchain_set_fullscreen(struct wined3d_swapchain *swapcha device->filter_messages = TRUE; MoveWindow(swapchain->device_window, 0, 0, width, height, TRUE); + ShowWindow(swapchain->device_window, SW_SHOW); device->filter_messages = filter_messages; } -- 2.13.6

1 2

[PATCH 9/9] d3d11/tests: Introduce a format compatibility test.
by Henri Verbeet 15 Nov '17

15 Nov '17

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 131 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 131 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 5474be4..efe0fb8 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -22315,6 +22315,136 @@ static void test_conservative_depth_output(void) release_test_context(&test_context); } +static void test_format_compatibility(void) +{ + ID3D11Texture2D *dst_texture, *src_texture; + D3D11_SUBRESOURCE_DATA resource_data; + D3D11_TEXTURE2D_DESC texture_desc; + ID3D11DeviceContext *context; + struct resource_readback rb; + DWORD colour, expected; + ID3D11Device *device; + unsigned int i, j; + ULONG refcount; + HRESULT hr; + + static const struct + { + DXGI_FORMAT src_format; + DXGI_FORMAT dst_format; + size_t texel_size; + BOOL success; + } + test_data[] = + { + {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, 4, TRUE}, + {DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, 4, TRUE}, + {DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UINT, 4, TRUE}, + {DXGI_FORMAT_R8G8B8A8_UINT, DXGI_FORMAT_R8G8B8A8_SNORM, 4, TRUE}, + {DXGI_FORMAT_R8G8B8A8_SNORM, DXGI_FORMAT_R8G8B8A8_SINT, 4, TRUE}, + {DXGI_FORMAT_R8G8B8A8_SINT, DXGI_FORMAT_R8G8B8A8_TYPELESS, 4, TRUE}, + {DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_B8G8R8A8_UNORM, 4, FALSE}, + {DXGI_FORMAT_R8G8B8A8_UINT, DXGI_FORMAT_R16G16_UINT, 4, FALSE}, + {DXGI_FORMAT_R16G16_TYPELESS, DXGI_FORMAT_R16G16_FLOAT, 4, TRUE}, + {DXGI_FORMAT_R16G16_FLOAT, DXGI_FORMAT_R16G16_UNORM, 4, TRUE}, + {DXGI_FORMAT_R16G16_UNORM, DXGI_FORMAT_R16G16_UINT, 4, TRUE}, + {DXGI_FORMAT_R16G16_UINT, DXGI_FORMAT_R16G16_SNORM, 4, TRUE}, + {DXGI_FORMAT_R16G16_SNORM, DXGI_FORMAT_R16G16_SINT, 4, TRUE}, + {DXGI_FORMAT_R16G16_SINT, DXGI_FORMAT_R16G16_TYPELESS, 4, TRUE}, + {DXGI_FORMAT_R16G16_TYPELESS, DXGI_FORMAT_R32_TYPELESS, 4, FALSE}, + {DXGI_FORMAT_R32G32_TYPELESS, DXGI_FORMAT_R32G32_FLOAT, 8, TRUE}, + {DXGI_FORMAT_R32G32_FLOAT, DXGI_FORMAT_R32G32_UINT, 8, TRUE}, + {DXGI_FORMAT_R32G32_UINT, DXGI_FORMAT_R32G32_SINT, 8, TRUE}, + {DXGI_FORMAT_R32G32_SINT, DXGI_FORMAT_R32G32_TYPELESS, 8, TRUE}, + }; + static const DWORD initial_data[16] = {0}; + static const DWORD bitmap_data[] = + { + 0xff0000ff, 0xff00ffff, 0xff00ff00, 0xffffff00, + 0xffff0000, 0xffff00ff, 0xff000000, 0xff7f7f7f, + 0xffffffff, 0xffffffff, 0xffffffff, 0xff000000, + 0xffffffff, 0xff000000, 0xff000000, 0xff000000, + }; + + if (!(device = create_device(NULL))) + { + skip("Failed to create device.\n"); + return; + } + ID3D11Device_GetImmediateContext(device, &context); + + texture_desc.Height = 4; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.BindFlags = D3D11_BIND_SHADER_RESOURCE; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + + for (i = 0; i < ARRAY_SIZE(test_data); ++i) + { + unsigned int x, y, texel_dwords; + + texture_desc.Width = sizeof(bitmap_data) / (texture_desc.Height * test_data[i].texel_size); + texture_desc.Format = test_data[i].src_format; + texture_desc.Usage = D3D11_USAGE_IMMUTABLE; + + resource_data.pSysMem = bitmap_data; + resource_data.SysMemPitch = texture_desc.Width * test_data[i].texel_size; + resource_data.SysMemSlicePitch = 0; + + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, &resource_data, &src_texture); + ok(SUCCEEDED(hr), "Failed to create source texture, hr %#x.\n", hr); + + texture_desc.Format = test_data[i].dst_format; + texture_desc.Usage = D3D11_USAGE_DEFAULT; + + resource_data.pSysMem = initial_data; + + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, &resource_data, &dst_texture); + ok(SUCCEEDED(hr), "Failed to create destination texture, hr %#x.\n", hr); + + ID3D11DeviceContext_CopySubresourceRegion(context, (ID3D11Resource *)dst_texture, 0, 1, 1, 0, + (ID3D11Resource *)src_texture, 0, NULL); + + texel_dwords = test_data[i].texel_size / sizeof(DWORD); + get_texture_readback(dst_texture, 0, &rb); + for (j = 0; j < ARRAY_SIZE(bitmap_data); ++j) + { + x = j % 4; + y = j / 4; + colour = get_readback_color(&rb, x, y); + expected = test_data[i].success && x >= texel_dwords && y + ? bitmap_data[j - (4 + texel_dwords)] : initial_data[j]; + ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n", + i, colour, x, y, expected); + } + release_resource_readback(&rb); + + ID3D11DeviceContext_CopyResource(context, (ID3D11Resource *)dst_texture, (ID3D11Resource *)src_texture); + + get_texture_readback(dst_texture, 0, &rb); + for (j = 0; j < ARRAY_SIZE(bitmap_data); ++j) + { + x = j % 4; + y = j / 4; + colour = get_readback_color(&rb, x, y); + expected = test_data[i].success ? bitmap_data[j] : initial_data[j]; + ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n", + i, colour, x, y, expected); + } + release_resource_readback(&rb); + + ID3D11Texture2D_Release(dst_texture); + ID3D11Texture2D_Release(src_texture); + } + + ID3D11DeviceContext_Release(context); + refcount = ID3D11Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(d3d11) { test_create_device(); @@ -22420,4 +22550,5 @@ START_TEST(d3d11) test_fractional_viewports(); test_early_depth_stencil(); test_conservative_depth_output(); + test_format_compatibility(); } -- 2.1.4

2 1

[PATCH 8/9] d3d10core/tests: Introduce a format compatibility test.
by Henri Verbeet 15 Nov '17

15 Nov '17

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d10core/tests/device.c | 128 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 128 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index f947811..33ac7b7 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -12929,6 +12929,133 @@ static void test_stream_output_resume(void) release_test_context(&test_context); } +static void test_format_compatibility(void) +{ + ID3D10Texture2D *dst_texture, *src_texture; + D3D10_SUBRESOURCE_DATA resource_data; + D3D10_TEXTURE2D_DESC texture_desc; + struct resource_readback rb; + DWORD colour, expected; + ID3D10Device *device; + unsigned int i, j; + ULONG refcount; + HRESULT hr; + + static const struct + { + DXGI_FORMAT src_format; + DXGI_FORMAT dst_format; + size_t texel_size; + BOOL success; + } + test_data[] = + { + {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, 4, TRUE}, + {DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, 4, TRUE}, + {DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UINT, 4, TRUE}, + {DXGI_FORMAT_R8G8B8A8_UINT, DXGI_FORMAT_R8G8B8A8_SNORM, 4, TRUE}, + {DXGI_FORMAT_R8G8B8A8_SNORM, DXGI_FORMAT_R8G8B8A8_SINT, 4, TRUE}, + {DXGI_FORMAT_R8G8B8A8_SINT, DXGI_FORMAT_R8G8B8A8_TYPELESS, 4, TRUE}, + {DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_B8G8R8A8_UNORM, 4, FALSE}, + {DXGI_FORMAT_R8G8B8A8_UINT, DXGI_FORMAT_R16G16_UINT, 4, FALSE}, + {DXGI_FORMAT_R16G16_TYPELESS, DXGI_FORMAT_R16G16_FLOAT, 4, TRUE}, + {DXGI_FORMAT_R16G16_FLOAT, DXGI_FORMAT_R16G16_UNORM, 4, TRUE}, + {DXGI_FORMAT_R16G16_UNORM, DXGI_FORMAT_R16G16_UINT, 4, TRUE}, + {DXGI_FORMAT_R16G16_UINT, DXGI_FORMAT_R16G16_SNORM, 4, TRUE}, + {DXGI_FORMAT_R16G16_SNORM, DXGI_FORMAT_R16G16_SINT, 4, TRUE}, + {DXGI_FORMAT_R16G16_SINT, DXGI_FORMAT_R16G16_TYPELESS, 4, TRUE}, + {DXGI_FORMAT_R16G16_TYPELESS, DXGI_FORMAT_R32_TYPELESS, 4, FALSE}, + {DXGI_FORMAT_R32G32_TYPELESS, DXGI_FORMAT_R32G32_FLOAT, 8, TRUE}, + {DXGI_FORMAT_R32G32_FLOAT, DXGI_FORMAT_R32G32_UINT, 8, TRUE}, + {DXGI_FORMAT_R32G32_UINT, DXGI_FORMAT_R32G32_SINT, 8, TRUE}, + {DXGI_FORMAT_R32G32_SINT, DXGI_FORMAT_R32G32_TYPELESS, 8, TRUE}, + }; + static const DWORD initial_data[16] = {0}; + static const DWORD bitmap_data[] = + { + 0xff0000ff, 0xff00ffff, 0xff00ff00, 0xffffff00, + 0xffff0000, 0xffff00ff, 0xff000000, 0xff7f7f7f, + 0xffffffff, 0xffffffff, 0xffffffff, 0xff000000, + 0xffffffff, 0xff000000, 0xff000000, 0xff000000, + }; + + if (!(device = create_device())) + { + skip("Failed to create device.\n"); + return; + } + + texture_desc.Height = 4; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.BindFlags = D3D10_BIND_SHADER_RESOURCE; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + + for (i = 0; i < ARRAY_SIZE(test_data); ++i) + { + unsigned int x, y, texel_dwords; + + texture_desc.Width = sizeof(bitmap_data) / (texture_desc.Height * test_data[i].texel_size); + texture_desc.Format = test_data[i].src_format; + texture_desc.Usage = D3D10_USAGE_IMMUTABLE; + + resource_data.pSysMem = bitmap_data; + resource_data.SysMemPitch = texture_desc.Width * test_data[i].texel_size; + resource_data.SysMemSlicePitch = 0; + + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, &resource_data, &src_texture); + ok(SUCCEEDED(hr), "Failed to create source texture, hr %#x.\n", hr); + + texture_desc.Format = test_data[i].dst_format; + texture_desc.Usage = D3D10_USAGE_DEFAULT; + + resource_data.pSysMem = initial_data; + + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, &resource_data, &dst_texture); + ok(SUCCEEDED(hr), "Failed to create destination texture, hr %#x.\n", hr); + + ID3D10Device_CopySubresourceRegion(device, (ID3D10Resource *)dst_texture, 0, 1, 1, 0, + (ID3D10Resource *)src_texture, 0, NULL); + + texel_dwords = test_data[i].texel_size / sizeof(DWORD); + get_texture_readback(dst_texture, 0, &rb); + for (j = 0; j < ARRAY_SIZE(bitmap_data); ++j) + { + x = j % 4; + y = j / 4; + colour = get_readback_color(&rb, x, y); + expected = test_data[i].success && x >= texel_dwords && y + ? bitmap_data[j - (4 + texel_dwords)] : initial_data[j]; + ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n", + i, colour, x, y, expected); + } + release_resource_readback(&rb); + + ID3D10Device_CopyResource(device, (ID3D10Resource *)dst_texture, (ID3D10Resource *)src_texture); + + get_texture_readback(dst_texture, 0, &rb); + for (j = 0; j < ARRAY_SIZE(bitmap_data); ++j) + { + x = j % 4; + y = j / 4; + colour = get_readback_color(&rb, x, y); + expected = test_data[i].success ? bitmap_data[j] : initial_data[j]; + ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n", + i, colour, x, y, expected); + } + release_resource_readback(&rb); + + ID3D10Texture2D_Release(dst_texture); + ID3D10Texture2D_Release(src_texture); + } + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(device) { test_feature_level(); @@ -13001,4 +13128,5 @@ START_TEST(device) test_geometry_shader(); test_stream_output(); test_stream_output_resume(); + test_format_compatibility(); } -- 2.1.4

2 1

[PATCH 7/9] wined3d: Add format class information for WINED3DFMT_R8G8B8A8_SNORM.
by Henri Verbeet 15 Nov '17

15 Nov '17

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/utils.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 0e00203..5eda92a 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -232,6 +232,7 @@ static const struct wined3d_typed_format_info typed_formats[] = {WINED3DFMT_R10G10B10A2_UNORM, WINED3DFMT_R10G10B10A2_TYPELESS, "uuuu"}, {WINED3DFMT_R8G8B8A8_UINT, WINED3DFMT_R8G8B8A8_TYPELESS, "UUUU"}, {WINED3DFMT_R8G8B8A8_SINT, WINED3DFMT_R8G8B8A8_TYPELESS, "IIII"}, + {WINED3DFMT_R8G8B8A8_SNORM, WINED3DFMT_R8G8B8A8_TYPELESS, "iiii"}, {WINED3DFMT_R8G8B8A8_UNORM_SRGB, WINED3DFMT_R8G8B8A8_TYPELESS, "uuuu"}, {WINED3DFMT_R8G8B8A8_UNORM, WINED3DFMT_R8G8B8A8_TYPELESS, "uuuu"}, {WINED3DFMT_R16G16_UNORM, WINED3DFMT_R16G16_TYPELESS, "uu"}, -- 2.1.4

1 0

[PATCH 6/9] wined3d: Clamp NULL source boxes in wined3d_device_copy_sub_resource_region().
by Henri Verbeet 15 Nov '17

15 Nov '17

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/device.c | 10 ++++++---- dlls/wined3d/device.c | 17 ++++++++++++++--- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 3b0b483..f6086bf 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1400,9 +1400,6 @@ static HRESULT WINAPI d3d9_device_UpdateSurface(IDirect3DDevice9Ex *iface, TRACE("iface %p, src_surface %p, src_rect %p, dst_surface %p, dst_point %p.\n", iface, src_surface, src_rect, dst_surface, dst_point); - if (src_rect) - wined3d_box_set(&src_box, src_rect->left, src_rect->top, src_rect->right, src_rect->bottom, 0, 1); - wined3d_mutex_lock(); wined3d_texture_get_sub_resource_desc(src->wined3d_texture, src->sub_resource_idx, &src_desc); @@ -1416,10 +1413,15 @@ static HRESULT WINAPI d3d9_device_UpdateSurface(IDirect3DDevice9Ex *iface, return D3DERR_INVALIDCALL; } + if (src_rect) + wined3d_box_set(&src_box, src_rect->left, src_rect->top, src_rect->right, src_rect->bottom, 0, 1); + else + wined3d_box_set(&src_box, 0, 0, src_desc.width, src_desc.height, 0, 1); + hr = wined3d_device_copy_sub_resource_region(device->wined3d_device, wined3d_texture_get_resource(dst->wined3d_texture), dst->sub_resource_idx, dst_point ? dst_point->x : 0, dst_point ? dst_point->y : 0, 0, wined3d_texture_get_resource(src->wined3d_texture), - src->sub_resource_idx, src_rect ? &src_box : NULL); + src->sub_resource_idx, &src_box); wined3d_mutex_unlock(); if (FAILED(hr)) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9fbf3b0..de6f1c5 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4125,7 +4125,10 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev if (!src_box) { - wined3d_box_set(&b, 0, 0, src_resource->size, 1, 0, 1); + unsigned int dst_w; + + dst_w = dst_resource->size - dst_x; + wined3d_box_set(&b, 0, 0, min(src_resource->size, dst_w), 1, 0, 1); src_box = &b; } else if ((src_box->left >= src_box->right @@ -4178,8 +4181,16 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev if (!src_box) { - wined3d_box_set(&b, 0, 0, wined3d_texture_get_level_width(src_texture, src_level), - wined3d_texture_get_level_height(src_texture, src_level), 0, 1); + unsigned int src_w, src_h, dst_w, dst_h, dst_level; + + src_w = wined3d_texture_get_level_width(src_texture, src_level); + src_h = wined3d_texture_get_level_height(src_texture, src_level); + + dst_level = dst_sub_resource_idx % dst_texture->level_count; + dst_w = wined3d_texture_get_level_width(dst_texture, dst_level) - dst_x; + dst_h = wined3d_texture_get_level_height(dst_texture, dst_level) - dst_y; + + wined3d_box_set(&b, 0, 0, min(src_w, dst_w), min(src_h, dst_h), 0, 1); src_box = &b; } else if (FAILED(wined3d_texture_check_box_dimensions(src_texture, src_level, src_box))) -- 2.1.4

1 0

[PATCH 5/9] wined3d: Allow copies between compatible formats in wined3d_device_copy_sub_resource_region().
by Henri Verbeet 15 Nov '17

15 Nov '17

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/device.c | 13 +++++++++++++ dlls/wined3d/device.c | 5 +++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 50bba6b..3b0b483 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1393,6 +1393,7 @@ static HRESULT WINAPI d3d9_device_UpdateSurface(IDirect3DDevice9Ex *iface, struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); struct d3d9_surface *src = unsafe_impl_from_IDirect3DSurface9(src_surface); struct d3d9_surface *dst = unsafe_impl_from_IDirect3DSurface9(dst_surface); + struct wined3d_sub_resource_desc src_desc, dst_desc; struct wined3d_box src_box; HRESULT hr; @@ -1403,6 +1404,18 @@ static HRESULT WINAPI d3d9_device_UpdateSurface(IDirect3DDevice9Ex *iface, wined3d_box_set(&src_box, src_rect->left, src_rect->top, src_rect->right, src_rect->bottom, 0, 1); wined3d_mutex_lock(); + + wined3d_texture_get_sub_resource_desc(src->wined3d_texture, src->sub_resource_idx, &src_desc); + wined3d_texture_get_sub_resource_desc(dst->wined3d_texture, dst->sub_resource_idx, &dst_desc); + if (src_desc.format != dst_desc.format) + { + wined3d_mutex_unlock(); + WARN("Surface formats (%#x/%#x) don't match.\n", + d3dformat_from_wined3dformat(src_desc.format), + d3dformat_from_wined3dformat(dst_desc.format)); + return D3DERR_INVALIDCALL; + } + hr = wined3d_device_copy_sub_resource_region(device->wined3d_device, wined3d_texture_get_resource(dst->wined3d_texture), dst->sub_resource_idx, dst_point ? dst_point->x : 0, dst_point ? dst_point->y : 0, 0, wined3d_texture_get_resource(src->wined3d_texture), diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1995a50..9fbf3b0 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4100,9 +4100,10 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev return WINED3DERR_INVALIDCALL; } - if (src_resource->format->id != dst_resource->format->id) + if (src_resource->format->typeless_id != dst_resource->format->typeless_id + || (!src_resource->format->typeless_id && src_resource->format->id != dst_resource->format->id)) { - WARN("Resource formats (%s / %s) don't match.\n", + WARN("Resource formats %s and %s are incompatible.\n", debug_d3dformat(dst_resource->format->id), debug_d3dformat(src_resource->format->id)); return WINED3DERR_INVALIDCALL; -- 2.1.4

1 0

[PATCH 4/9] wined3d: Allow copies between compatible formats in wined3d_device_copy_resource().
by Henri Verbeet 15 Nov '17

15 Nov '17

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/device.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 342905c..1995a50 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4029,9 +4029,10 @@ void CDECL wined3d_device_copy_resource(struct wined3d_device *device, return; } - if (src_resource->format->id != dst_resource->format->id) + if (src_resource->format->typeless_id != dst_resource->format->typeless_id + || (!src_resource->format->typeless_id && src_resource->format->id != dst_resource->format->id)) { - WARN("Resource formats (%s / %s) don't match.\n", + WARN("Resource formats %s and %s are incompatible.\n", debug_d3dformat(dst_resource->format->id), debug_d3dformat(src_resource->format->id)); return; -- 2.1.4

1 0

[PATCH 3/9] wined3d: Use raw blits in wined3d_device_copy_sub_resource_region().
by Henri Verbeet 15 Nov '17

15 Nov '17

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d19f279..342905c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4202,7 +4202,7 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev } wined3d_cs_emit_blt_sub_resource(device->cs, dst_resource, dst_sub_resource_idx, &dst_box, - src_resource, src_sub_resource_idx, src_box, 0, NULL, WINED3D_TEXF_POINT); + src_resource, src_sub_resource_idx, src_box, WINED3D_BLT_RAW, NULL, WINED3D_TEXF_POINT); return WINED3D_OK; } -- 2.1.4

1 0

[PATCH 2/9] wined3d: Use raw blits in wined3d_device_copy_resource().
by Henri Verbeet 15 Nov '17

15 Nov '17

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/cs.c | 4 ++-- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/surface.c | 8 +++++--- include/wine/wined3d.h | 1 + 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 104e4c4..f7c943e 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2045,14 +2045,14 @@ static void wined3d_cs_exec_blt_sub_resource(struct wined3d_cs *cs, const void * struct wined3d_context *context; struct wined3d_bo_address addr; - if (op->flags) + if (op->flags & ~WINED3D_BLT_RAW) { FIXME("Flags %#x not implemented for %s resources.\n", op->flags, debug_d3dresourcetype(op->dst_resource->type)); goto error; } - if (op->src_resource->format != op->dst_resource->format) + if (!(op->flags & WINED3D_BLT_RAW) && op->src_resource->format != op->dst_resource->format) { FIXME("Format conversion not implemented for %s resources.\n", debug_d3dresourcetype(op->dst_resource->type)); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3963105..d19f279 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4041,7 +4041,7 @@ void CDECL wined3d_device_copy_resource(struct wined3d_device *device, { wined3d_box_set(&box, 0, 0, src_resource->size, 1, 0, 1); wined3d_cs_emit_blt_sub_resource(device->cs, dst_resource, 0, &box, - src_resource, 0, &box, 0, NULL, WINED3D_TEXF_POINT); + src_resource, 0, &box, WINED3D_BLT_RAW, NULL, WINED3D_TEXF_POINT); return; } @@ -4068,7 +4068,7 @@ void CDECL wined3d_device_copy_resource(struct wined3d_device *device, unsigned int idx = j * dst_texture->level_count + i; wined3d_cs_emit_blt_sub_resource(device->cs, dst_resource, idx, &box, - src_resource, idx, &box, 0, NULL, WINED3D_TEXF_POINT); + src_resource, idx, &box, WINED3D_BLT_RAW, NULL, WINED3D_TEXF_POINT); } } } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 379fa6a..02e0c70 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3073,7 +3073,7 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int same_sub_resource = FALSE; dst_format = dst_texture->resource.format; dst_fmt_flags = dst_texture->resource.format_flags; - if (dst_texture->resource.format->id != src_texture->resource.format->id) + if (!(flags & WINED3D_BLT_RAW) && dst_texture->resource.format->id != src_texture->resource.format->id) { if (!(converted_texture = surface_convert_format(src_texture, src_sub_resource_idx, dst_format))) { @@ -3108,6 +3108,7 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int dst_map.data = context_map_bo_address(context, &dst_data, dst_texture->sub_resources[dst_sub_resource_idx].size, GL_PIXEL_UNPACK_BUFFER, 0); } + flags &= ~WINED3D_BLT_RAW; bpp = dst_format->byte_count; src_height = src_box->bottom - src_box->top; @@ -3737,7 +3738,8 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst static const DWORD simple_blit = WINED3D_BLT_SRC_CKEY | WINED3D_BLT_SRC_CKEY_OVERRIDE - | WINED3D_BLT_ALPHA_TEST; + | WINED3D_BLT_ALPHA_TEST + | WINED3D_BLT_RAW; TRACE("dst_surface %p, dst_rect %s, src_surface %p, src_rect %s, flags %#x, fx %p, filter %s.\n", dst_surface, wine_dbgstr_rect(dst_rect), src_surface, wine_dbgstr_rect(src_rect), @@ -3908,7 +3910,7 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst return WINED3D_OK; } - else if (!scale && !convert) + else if ((flags & WINED3D_BLT_RAW) || (!scale && !convert)) { blit_op = WINED3D_BLIT_OP_RAW_BLIT; } diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 131bbf4..f35d980 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1342,6 +1342,7 @@ enum wined3d_shader_byte_code_format #define WINED3D_BLT_SRC_CKEY_OVERRIDE 0x00010000 #define WINED3D_BLT_WAIT 0x01000000 #define WINED3D_BLT_DO_NOT_WAIT 0x08000000 +#define WINED3D_BLT_RAW 0x20000000 #define WINED3D_BLT_SYNCHRONOUS 0x40000000 #define WINED3D_BLT_ALPHA_TEST 0x80000000 #define WINED3D_BLT_MASK 0x0901e800 -- 2.1.4

1 0

[PATCH 1/9] wined3d: Introduce a blitter based on ARB_copy_image.
by Henri Verbeet 15 Nov '17

15 Nov '17

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/arb_program_shader.c | 8 ++ dlls/wined3d/device.c | 1 + dlls/wined3d/directx.c | 4 + dlls/wined3d/surface.c | 164 ++++++++++++++++++++++++++++++++++++-- dlls/wined3d/wined3d_gl.h | 1 + dlls/wined3d/wined3d_private.h | 3 + 6 files changed, 176 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index f4e23d0..6941a2b 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7705,6 +7705,14 @@ static BOOL arbfp_blit_supported(const struct wined3d_gl_info *gl_info, if (!gl_info->supported[ARB_FRAGMENT_PROGRAM]) return FALSE; + if (blit_op == WINED3D_BLIT_OP_RAW_BLIT && dst_format->id == src_format->id) + { + if (dst_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL)) + blit_op = WINED3D_BLIT_OP_DEPTH_BLIT; + else + blit_op = WINED3D_BLIT_OP_COLOR_BLIT; + } + switch (blit_op) { case WINED3D_BLIT_OP_COLOR_BLIT_CKEY: diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3691bd0..3963105 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1030,6 +1030,7 @@ static void wined3d_device_create_primary_opengl_context_cs(void *object) wined3d_ffp_blitter_create(&device->blitter, &device->adapter->gl_info); wined3d_arbfp_blitter_create(&device->blitter, device); wined3d_fbo_blitter_create(&device->blitter, &device->adapter->gl_info); + wined3d_raw_blitter_create(&device->blitter, &device->adapter->gl_info); swapchain = device->swapchains[0]; target = swapchain->back_buffers ? swapchain->back_buffers[0] : swapchain->front_buffer; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index ee04b12..e0bf986 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -118,6 +118,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_compute_shader", ARB_COMPUTE_SHADER }, {"GL_ARB_conservative_depth", ARB_CONSERVATIVE_DEPTH }, {"GL_ARB_copy_buffer", ARB_COPY_BUFFER }, + {"GL_ARB_copy_image", ARB_COPY_IMAGE }, {"GL_ARB_debug_output", ARB_DEBUG_OUTPUT }, {"GL_ARB_depth_buffer_float", ARB_DEPTH_BUFFER_FLOAT }, {"GL_ARB_depth_texture", ARB_DEPTH_TEXTURE }, @@ -2708,6 +2709,8 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glDispatchComputeIndirect) /* GL_ARB_copy_buffer */ USE_GL_FUNC(glCopyBufferSubData) + /* GL_ARB_copy_image */ + USE_GL_FUNC(glCopyImageSubData) /* GL_ARB_debug_output */ USE_GL_FUNC(glDebugMessageCallbackARB) USE_GL_FUNC(glDebugMessageControlARB) @@ -3898,6 +3901,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, {ARB_CLEAR_BUFFER_OBJECT, MAKEDWORD_VERSION(4, 3)}, {ARB_COMPUTE_SHADER, MAKEDWORD_VERSION(4, 3)}, + {ARB_COPY_IMAGE, MAKEDWORD_VERSION(4, 3)}, {ARB_DEBUG_OUTPUT, MAKEDWORD_VERSION(4, 3)}, {ARB_ES3_COMPATIBILITY, MAKEDWORD_VERSION(4, 3)}, {ARB_FRAGMENT_LAYER_VIEWPORT, MAKEDWORD_VERSION(4, 3)}, diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index bd36aa9..379fa6a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2417,9 +2417,18 @@ static DWORD fbo_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit struct wined3d_resource *src_resource = &src_surface->container->resource; struct wined3d_resource *dst_resource = &dst_surface->container->resource; struct wined3d_device *device = dst_resource->device; + enum wined3d_blit_op blit_op = op; struct wined3d_blitter *next; - if (!fbo_blitter_supported(&device->adapter->gl_info, op, + if (blit_op == WINED3D_BLIT_OP_RAW_BLIT && dst_resource->format->id == src_resource->format->id) + { + if (dst_resource->format_flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL)) + blit_op = WINED3D_BLIT_OP_DEPTH_BLIT; + else + blit_op = WINED3D_BLIT_OP_COLOR_BLIT; + } + + if (!fbo_blitter_supported(&device->adapter->gl_info, blit_op, src_resource->usage, src_resource->pool, src_resource->format, src_location, src_resource->usage, dst_resource->pool, dst_resource->format, dst_location)) { @@ -2428,7 +2437,7 @@ static DWORD fbo_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit src_rect, dst_surface, dst_location, dst_rect, colour_key, filter); } - if (op == WINED3D_BLIT_OP_COLOR_BLIT) + if (blit_op == WINED3D_BLIT_OP_COLOR_BLIT) { TRACE("Colour blit.\n"); surface_blt_fbo(device, context, filter, src_surface, src_location, @@ -2436,14 +2445,14 @@ static DWORD fbo_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit return dst_location; } - if (op == WINED3D_BLIT_OP_DEPTH_BLIT) + if (blit_op == WINED3D_BLIT_OP_DEPTH_BLIT) { TRACE("Depth/stencil blit.\n"); surface_depth_blt_fbo(device, src_surface, src_location, src_rect, dst_surface, dst_location, dst_rect); return dst_location; } - ERR("This blitter does not implement blit op %#x.\n", op); + ERR("This blitter does not implement blit op %#x.\n", blit_op); return dst_location; } @@ -2472,6 +2481,138 @@ void wined3d_fbo_blitter_create(struct wined3d_blitter **next, const struct wine } /* Context activation is done by the caller. */ +static void raw_blitter_destroy(struct wined3d_blitter *blitter, struct wined3d_context *context) +{ + struct wined3d_blitter *next; + + if ((next = blitter->next)) + next->ops->blitter_destroy(next, context); + + HeapFree(GetProcessHeap(), 0, blitter); +} + +/* Context activation is done by the caller. */ +static void raw_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_device *device, + unsigned int rt_count, const struct wined3d_fb_state *fb, unsigned int rect_count, const RECT *clear_rects, + const RECT *draw_rect, DWORD flags, const struct wined3d_color *colour, float depth, DWORD stencil) +{ + struct wined3d_blitter *next; + + if (!(next = blitter->next)) + { + ERR("No blitter to handle clear.\n"); + return; + } + + TRACE("Forwarding to blitter %p.\n", next); + next->ops->blitter_clear(next, device, rt_count, fb, rect_count, + clear_rects, draw_rect, flags, colour, depth, stencil); +} + +/* Context activation is done by the caller. */ +static DWORD raw_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit_op op, + struct wined3d_context *context, struct wined3d_surface *src_surface, DWORD src_location, + const RECT *src_rect, struct wined3d_surface *dst_surface, DWORD dst_location, const RECT *dst_rect, + const struct wined3d_color_key *colour_key, enum wined3d_texture_filter_type filter) +{ + const struct wined3d_gl_info *gl_info = context->gl_info; + unsigned int src_sub_resource_idx, dst_sub_resource_idx; + struct wined3d_texture *src_texture, *dst_texture; + struct wined3d_blitter *next; + GLuint src_name, dst_name; + DWORD location; + + src_texture = src_surface->container; + dst_texture = dst_surface->container; + + /* If we would need to copy from a renderbuffer or drawable, we'd probably + * be better of using the FBO blitter directly, since we'd need to use it + * to copy the resource contents to the texture anyway. */ + if (op != WINED3D_BLIT_OP_RAW_BLIT + || (src_texture->resource.format->id == dst_texture->resource.format->id + && (!(src_location & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB)) + || !(dst_location & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB))))) + { + if (!(next = blitter->next)) + { + ERR("No blitter to handle blit op %#x.\n", op); + return dst_location; + } + + TRACE("Forwarding to blitter %p.\n", next); + return next->ops->blitter_blit(next, op, context, src_surface, src_location, + src_rect, dst_surface, dst_location, dst_rect, colour_key, filter); + } + + TRACE("Blit using ARB_copy_image.\n"); + + src_sub_resource_idx = surface_get_sub_resource_idx(src_surface); + dst_sub_resource_idx = surface_get_sub_resource_idx(dst_surface); + + location = src_location & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB); + if (!location) + location = src_texture->flags & WINED3D_TEXTURE_IS_SRGB + ? WINED3D_LOCATION_TEXTURE_SRGB : WINED3D_LOCATION_TEXTURE_RGB; + if (!wined3d_texture_load_location(src_texture, src_sub_resource_idx, context, location)) + ERR("Failed to load the source sub-resource into %s.\n", wined3d_debug_location(location)); + src_name = wined3d_texture_get_texture_name(src_texture, context, location == WINED3D_LOCATION_TEXTURE_SRGB); + + location = dst_location & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB); + if (!location) + location = dst_texture->flags & WINED3D_TEXTURE_IS_SRGB + ? WINED3D_LOCATION_TEXTURE_SRGB : WINED3D_LOCATION_TEXTURE_RGB; + if (surface_is_full_rect(dst_surface, dst_rect)) + { + if (!wined3d_texture_prepare_location(dst_texture, dst_sub_resource_idx, context, location)) + ERR("Failed to prepare the destination sub-resource into %s.\n", wined3d_debug_location(location)); + } + else + { + if (!wined3d_texture_load_location(dst_texture, dst_sub_resource_idx, context, location)) + ERR("Failed to load the destination sub-resource into %s.\n", wined3d_debug_location(location)); + } + dst_name = wined3d_texture_get_texture_name(dst_texture, context, location == WINED3D_LOCATION_TEXTURE_SRGB); + + GL_EXTCALL(glCopyImageSubData(src_name, src_texture->target, src_surface->texture_level, + src_rect->left, src_rect->top, src_surface->texture_layer, + dst_name, dst_texture->target, dst_surface->texture_level, + dst_rect->left, dst_rect->top, dst_surface->texture_layer, + src_rect->right - src_rect->left, src_rect->bottom - src_rect->top, 1)); + checkGLcall("copy image data"); + + wined3d_texture_validate_location(dst_texture, dst_sub_resource_idx, location); + wined3d_texture_invalidate_location(dst_texture, dst_sub_resource_idx, ~location); + if (!wined3d_texture_load_location(dst_texture, dst_sub_resource_idx, context, dst_location)) + ERR("Failed to load the destination sub-resource into %s.\n", wined3d_debug_location(dst_location)); + + return dst_location | location; +} + +static const struct wined3d_blitter_ops raw_blitter_ops = +{ + raw_blitter_destroy, + raw_blitter_clear, + raw_blitter_blit, +}; + +void wined3d_raw_blitter_create(struct wined3d_blitter **next, const struct wined3d_gl_info *gl_info) +{ + struct wined3d_blitter *blitter; + + if (!gl_info->supported[ARB_COPY_IMAGE]) + return; + + if (!(blitter = HeapAlloc(GetProcessHeap(), 0, sizeof(*blitter)))) + return; + + TRACE("Created blitter %p.\n", blitter); + + blitter->ops = &raw_blitter_ops; + blitter->next = *next; + *next = blitter; +} + +/* Context activation is done by the caller. */ static void ffp_blitter_destroy(struct wined3d_blitter *blitter, struct wined3d_context *context) { struct wined3d_blitter *next; @@ -2497,6 +2638,14 @@ static BOOL ffp_blit_supported(const struct wined3d_gl_info *gl_info, return FALSE; } + if (blit_op == WINED3D_BLIT_OP_RAW_BLIT && dst_format->id == src_format->id) + { + if (dst_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL)) + blit_op = WINED3D_BLIT_OP_DEPTH_BLIT; + else + blit_op = WINED3D_BLIT_OP_COLOR_BLIT; + } + switch (blit_op) { case WINED3D_BLIT_OP_COLOR_BLIT_CKEY: @@ -2540,7 +2689,7 @@ static BOOL ffp_blit_supported(const struct wined3d_gl_info *gl_info, return TRUE; default: - TRACE("Unsupported blit_op=%d\n", blit_op); + TRACE("Unsupported blit operation %#x.\n", blit_op); return FALSE; } } @@ -3521,6 +3670,7 @@ static DWORD cpu_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit { case WINED3D_BLIT_OP_COLOR_BLIT: case WINED3D_BLIT_OP_DEPTH_BLIT: + case WINED3D_BLIT_OP_RAW_BLIT: break; case WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST: flags |= WINED3D_BLT_ALPHA_TEST; @@ -3758,6 +3908,10 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst return WINED3D_OK; } + else if (!scale && !convert) + { + blit_op = WINED3D_BLIT_OP_RAW_BLIT; + } if (dst_texture->resource.pool == WINED3D_POOL_SYSTEM_MEM) dst_location = dst_texture->resource.map_binding; diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index f676b2f..455f415 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -51,6 +51,7 @@ enum wined3d_gl_extension ARB_COMPUTE_SHADER, ARB_CONSERVATIVE_DEPTH, ARB_COPY_BUFFER, + ARB_COPY_IMAGE, ARB_DEBUG_OUTPUT, ARB_DEPTH_BUFFER_FLOAT, ARB_DEPTH_TEXTURE, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5368be4..3a9ac2e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2083,6 +2083,7 @@ enum wined3d_blit_op WINED3D_BLIT_OP_COLOR_FILL, WINED3D_BLIT_OP_DEPTH_FILL, WINED3D_BLIT_OP_DEPTH_BLIT, + WINED3D_BLIT_OP_RAW_BLIT, }; struct wined3d_blitter @@ -2110,6 +2111,8 @@ void wined3d_fbo_blitter_create(struct wined3d_blitter **next, const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; void wined3d_ffp_blitter_create(struct wined3d_blitter **next, const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; +void wined3d_raw_blitter_create(struct wined3d_blitter **next, + const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; BOOL wined3d_clip_blit(const RECT *clip_rect, RECT *clipped, RECT *other) DECLSPEC_HIDDEN; -- 2.1.4

1 0

[PATCH] po: Update Lithuanian translation
by Aurimas Fišeras 15 Nov '17

15 Nov '17

1 0

[PATCH v3 1/3] winex11.drv: Preserve last error in x11drv_thread_data().
by Rafał Harabień 15 Nov '17

15 Nov '17

Issue was caused by TlsGetValue always resetting error to ERROR_SUCCESS. This change fixes GetCursorPos resetting last-error randomly. Signed-off-by: Rafał Harabień <rafalh1992(a)o2.pl> --- dlls/user32/tests/input.c | 11 ++++++++++- dlls/winex11.drv/x11drv.h | 7 ++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 8f2576d..6ce03f8 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1928,8 +1928,17 @@ static void test_Input_mouse(void) DWORD thread_id; POINT pt, pt_org; MSG msg; + BOOL ret; - GetCursorPos(&pt_org); + SetLastError(0xdeadbeef); + ret = GetCursorPos(NULL); + ok(!ret, "GetCursorPos succeed\n"); + ok(GetLastError() == 0xdeadbeef || GetLastError() == ERROR_NOACCESS, "error %lu\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = GetCursorPos(&pt_org); + ok(ret, "GetCursorPos failed\n"); + ok(GetLastError() == 0xdeadbeef, "error %lu\n", GetLastError()); button_win = CreateWindowA("button", "button", WS_VISIBLE | WS_POPUP, 100, 100, 100, 100, 0, NULL, NULL, NULL); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 721c082..6786a08 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -345,7 +345,12 @@ extern DWORD thread_data_tls_index DECLSPEC_HIDDEN; static inline struct x11drv_thread_data *x11drv_thread_data(void) { - return TlsGetValue( thread_data_tls_index ); + /* TlsGetValue always resets last error */ + unsigned long err = GetLastError(); + struct x11drv_thread_data *data = TlsGetValue( thread_data_tls_index ); + if (err != ERROR_SUCCESS && GetLastError() == ERROR_SUCCESS) + SetLastError(err); + return data; } /* retrieve the thread display, or NULL if not created yet */ -- 2.7.4

2 1

Wine tests
by Jeremy White 15 Nov '17

15 Nov '17

Hey all, I thought I would start my annual harangue a little bit early this year. I thought I'd summarize the lens I see things with and then see if there is anything constructive we can do now, and then again when we meet in person. Then we'll also have drink to turn to if we end with nothing but despair. The ideal is that this page: http://test.winehq.org/data/ be covered entirely in green. That would indicate that our unit tests ran successfully on all tested systems. A further ideal is that it would have 'Mac' and 'Android' columns that were also green. The holy dream we all crave is that a 'make test' would work in a rational fashion. And the ultimate fantasy is that every patch sent would be tested not only on Windows if the tests change, but on Linux, Mac, and Android as well. (Alexandre does that by hand now, but it'd be nice to automate that test). A more reasonable ideal is that all of our tests would run successfully on a well curated list of 'rigorous' test machines. I don't believe that we have an official page for that; I maintain an unofficial one here: https://www.winehq.org/~jwhite/latest.html That is all of the 'newtb' Windows VMs excluding Windows 2000, Windows 8, and Windows 10. That list of failures has fluctuated; starting at about 40, and once getting down to as few as a dozen. It now stands at about 20, where it's been for a while. Nicely (?), we're down to only intermittent failures :-/. I think the instinct has been to fix all of the Windows tests; that once those are consistently green, then it would make sense to go after a well defined Linux rig and push it to green. CodeWeavers has a rack of hardware and we're happy to put any flavor of system in there (and have done so, with standard rigs for testing AMD and NVidia Linux boxes). A quick scan suggests that those rigs stand at about the same number of failures; low to mid teens. I think we are lacking several things: 1. Some help for Francois. He's basically doing all of this on his own. We could use some people willing to fight through Perl to help extend our capabilities. 2. The ability (will?) to drive the Windows tests to green. Is it time to articulate a kind of test that is expected to periodically fail? In other words, do we have tests that 'reasonably' fail, and so we should redefine that failure? Many years in the past, we had constructive sessions where I forcibly prevented people from going to the pub until we flipped a whole lot more bits to green. I can remember times when that worked quite nicely. But we haven't been as productive with that lately. Is it worth dedicating another block of time to it at the Wine conference? Would it work better if we prepared ahead of time? For example, let me suggest this: that developers start right now running winetest on machines they plan to bring to Wineconf. Then we can have that body of information available to us at the conference, and we can choose to attack issues that show commonality. Does that make sense? Any other prep work we should do? (Jacek and Piotr assure me that there will be plenty of beer for drowning sorrows, so that seems to be covered). Cheers, Jeremy

5 7

[PATCH] po: Update Russian translation
by Nikolay Sivov 15 Nov '17

15 Nov '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- po/ru.po | 58 ++++++++++++++-------------------------------------------- 1 file changed, 14 insertions(+), 44 deletions(-) diff --git a/po/ru.po b/po/ru.po index 1f8bb23df3..7d35265c29 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,14 +5,14 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-08-21 15:10+0300\n" +"PO-Revision-Date: 2017-11-15 17:25+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.0.3\n" +"X-Generator: Poedit 2.0.4\n" #: appwiz.rc:58 msgid "Install/Uninstall" @@ -10589,6 +10589,16 @@ msgid "" "link_name is the name of the new symbolic link.\n" "target is the path that link_name points to.\n" msgstr "" +"Создаёт символическую ссылку.\n" +"\n" +"Синтаксис: MKLINK [опции] имя_ссылки цель\n" +"\n" +"Опции:\n" +"/d Создать ссылку на директорию.\n" +"/h Создать жёсткую ссылку.\n" +"/j Создать точку соединения директорий.\n" +"Имя новой ссылки задаётся с помощью «имя_ссылки».\n" +"Созданная ссылка указывает на путь «цель».\n" #: cmd.rc:312 msgid "" @@ -10599,47 +10609,6 @@ msgstr "" "или оболочку из которой был запущен cmd.\n" #: cmd.rc:364 -#, fuzzy -#| msgid "" -#| "CMD built-in commands are:\n" -#| "ASSOC\t\tShow or modify file extension associations\n" -#| "ATTRIB\t\tShow or change DOS file attributes\n" -#| "CALL\t\tInvoke a batch file from inside another\n" -#| "CD (CHDIR)\tChange current default directory\n" -#| "CHOICE\t\tWait for an keypress from a selectable list\n" -#| "CLS\t\tClear the console screen\n" -#| "COPY\t\tCopy file\n" -#| "CTTY\t\tChange input/output device\n" -#| "DATE\t\tShow or change the system date\n" -#| "DEL (ERASE)\tDelete a file or set of files\n" -#| "DIR\t\tList the contents of a directory\n" -#| "ECHO\t\tCopy text directly to the console output\n" -#| "ENDLOCAL\tEnd localization of environment changes in a batch file\n" -#| "FTYPE\t\tShow or modify open commands associated with file types\n" -#| "HELP\t\tShow brief help details on a topic\n" -#| "MD (MKDIR)\tCreate a subdirectory\n" -#| "MORE\t\tDisplay output in pages\n" -#| "MOVE\t\tMove a file, set of files or directory tree\n" -#| "PATH\t\tSet or show the search path\n" -#| "PAUSE\t\tSuspend execution of a batch file\n" -#| "POPD\t\tRestore the directory to the last one saved with PUSHD\n" -#| "PROMPT\t\tChange the command prompt\n" -#| "PUSHD\t\tChange to a new directory, saving the current one\n" -#| "REN (RENAME)\tRename a file\n" -#| "RD (RMDIR)\tDelete a subdirectory\n" -#| "SET\t\tSet or show environment variables\n" -#| "SETLOCAL\tStart localization of environment changes in a batch file\n" -#| "START\t\tStart a program, or open a document in the associated program\n" -#| "TIME\t\tSet or show the current system time\n" -#| "TITLE\t\tSet the window title for the CMD session\n" -#| "TYPE\t\tType the contents of a text file\n" -#| "VER\t\tShow the current version of CMD\n" -#| "VOL\t\tShow the volume label of a disk device\n" -#| "XCOPY\t\tCopy source files or directory trees to a destination\n" -#| "EXIT\t\tClose down CMD\n" -#| "\n" -#| "Enter HELP <command> for further information on any of the above " -#| "commands.\n" msgid "" "CMD built-in commands are:\n" "ASSOC\t\tShow or modify file extension associations\n" @@ -10698,6 +10667,7 @@ msgstr "" "FTYPE\t\tВыводит или изменяет команды открытия, связанные с типами файлов\n" "HELP\t\tПоказывает краткую подсказку по команде\n" "MD (MKDIR)\tСоздаёт каталог\n" +"MKLINK\tСоздаёт символическую ссылку\n" "MORE\t\tВыводит данные по страницам\n" "MOVE\t\tПеремещает файл, несколько файлов или дерево каталогов\n" "PATH\t\tПоказывает или изменяет путь поиска программ\n" @@ -14986,7 +14956,7 @@ msgstr "Число мин" #: winemine.rc:34 msgid "All results will be lost. Are you sure?" -msgstr "" +msgstr "Все результаты будут утеряны. Вы уверены?" #: winemine.rc:30 msgid "WineMine" -- 2.15.0

1 0

[PATCH] mshtml: fixed a crash due to missing typelib marshalling on 64bit
by Marcus Meissner 15 Nov '17

15 Nov '17

Signed-off-by: Marcus Meissner <meissner(a)suse.de> --- dlls/mshtml/tests/htmldoc.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 7ec3f6001a..a03d0105a9 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -6301,6 +6301,10 @@ static void test_open_window(IHTMLDocument2 *doc, BOOL do_block) CHECK_CALLED(EvaluateNewWindow); ok(hres == S_OK, "open failed: %08x\n", hres); + if (hres != S_OK) { + IHTMLWindow2_Release(window); + return; + } if(do_block) { ok(!new_window, "new_window != NULL\n"); -- 2.15.0

2 1

[PATCH v2] riched20: Protect against pasting multi-line text in single-line control.
by Rafał Harabień 15 Nov '17

15 Nov '17

Signed-off-by: Rafał Harabień <rafalh1992(a)o2.pl> --- dlls/riched20/caret.c | 4 +++ dlls/riched20/editor.c | 18 ++--------- dlls/riched20/tests/editor.c | 72 ++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 76 insertions(+), 18 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 26af743..8a99394 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -551,6 +551,10 @@ void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, ME_DisplayItem *tp, *end_run, *run, *prev; int eol_len = 0; + /* Check if new line is allowed for this control */ + if (!(editor->styleFlags & ES_MULTILINE)) + break; + /* Find number of CR and LF in end of paragraph run */ if (*pos =='\r') { diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 88e3d8e..daafe80 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -176,7 +176,7 @@ + ES_DISABLENOSCROLL (scrollbar is always visible) - ES_EX_NOCALLOLEINIT + ES_LEFT - - ES_MULTILINE (currently single line controls aren't supported) + + ES_MULTILINE - ES_NOIME - ES_READONLY (I'm not sure if beeping is the proper behaviour) + ES_RIGHT @@ -3421,21 +3421,7 @@ static void ME_SetText(ME_TextEditor *editor, void *text, BOOL unicode) int textLen; LPWSTR wszText = ME_ToUnicode(codepage, text, &textLen); - - if (textLen > 0) - { - int len = -1; - - /* uses default style! */ - if (!(editor->styleFlags & ES_MULTILINE)) - { - WCHAR *p = wszText; - - while (*p != '\0' && *p != '\r' && *p != '\n') p++; - len = p - wszText; - } - ME_InsertTextFromCursor(editor, 0, wszText, len, editor->pBuffer->pDefaultStyle); - } + ME_InsertTextFromCursor(editor, 0, wszText, textLen, editor->pBuffer->pDefaultStyle); ME_EndToUnicode(codepage, wszText); } diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index a19ec85..9bfbf45 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -70,6 +70,10 @@ static HWND new_richedit(HWND parent) { return new_window(RICHEDIT_CLASS20A, ES_MULTILINE, parent); } +static HWND new_richedit_with_style(HWND parent, DWORD style) { + return new_window(RICHEDIT_CLASS20A, style, parent); +} + static HWND new_richeditW(HWND parent) { return new_windowW(RICHEDIT_CLASS20W, ES_MULTILINE, parent); } @@ -3748,6 +3752,20 @@ static void test_WM_SETTEXT(void) TEST_SETTEXTW(urtftextW, urtftextW) /* interpreted as ascii text */ DestroyWindow(hwndRichEdit); #undef TEST_SETTEXTW + + /* Single-line richedit */ + hwndRichEdit = new_richedit_with_style(NULL, 0); + result = SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"line1\r\nline2"); + ok(result == 1, "WM_SETTEXT returned %ld, expected 12\n", result); + result = SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buf); + ok(result == 5, "WM_GETTEXT returned %ld, expected 5\n", result); + ok(!strcmp(buf, "line1"), "WM_GETTEXT returned incorrect string '%s'\n", buf); + result = SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"{\\rtf1 ABC\\rtlpar\\par DEF\\par HIJ\\pard\\par}"); + ok(result == 1, "WM_SETTEXT returned %ld, expected 1\n", result); + result = SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buf); + ok(result == 3, "WM_GETTEXT returned %ld, expected 3\n", result); + ok(!strcmp(buf, "ABC"), "WM_GETTEXT returned incorrect string '%s'\n", buf); + DestroyWindow(hwndRichEdit); } /* Set *pcb to one to show that the remaining cb-1 bytes are not @@ -4406,6 +4424,17 @@ static void test_EM_SETTEXTEX(void) } DestroyWindow(hwndRichEdit); + + /* Single-line richedit */ + hwndRichEdit = new_richedit_with_style(NULL, 0); + setText.flags = ST_DEFAULT; + setText.codepage = CP_ACP; + result = SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)"line1\r\nline2"); + ok(result == 1, "EM_SETTEXTEX incorrectly returned %d, expected 1\n", result); + result = SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)bufACP); + ok(result == 5, "WM_GETTEXT incorrectly returned %d, expected 5\n", result); + ok(!strcmp(bufACP, "line1"), "EM_SETTEXTEX: Test single-line text: Result: %s\n", bufACP); + DestroyWindow(hwndRichEdit); } static void test_EM_LIMITTEXT(void) @@ -5351,6 +5380,15 @@ static void test_EM_REPLACESEL(int redraw) SendMessageA(hwndRichEdit, WM_SETREDRAW, TRUE, 0); DestroyWindow(hwndRichEdit); + + /* Single-line richedit */ + hwndRichEdit = new_richedit_with_style(NULL, 0); + r = SendMessageA(hwndRichEdit, EM_REPLACESEL, 0, (LPARAM)"line1\r\nline2"); + ok(r == 12, "EM_REPLACESEL returned %d, expected 12\n", r); + r = SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); + ok(r == 5, "WM_GETTEXT returned %d, expected 5\n", r); + ok(!strcmp(buffer, "line1"), "WM_GETTEXT returned incorrect string '%s'\n", buffer); + DestroyWindow(hwndRichEdit); } /* Native riched20 inspects the keyboard state (e.g. GetKeyState) @@ -5498,21 +5536,39 @@ static void test_WM_PASTE(void) "test paste: strcmp = %i, actual = '%s'\n", result, buffer); release_key(VK_CONTROL); + /* Copy multiline text to clipboard for future use */ + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text3); + SendMessageA(hwndRichEdit, EM_SETSEL, 0, -1); + SendMessageA(hwndRichEdit, WM_COPY, 0, 0); + SendMessageA(hwndRichEdit, EM_SETSEL, 0, 0); + /* Paste into read-only control */ result = SendMessageA(hwndRichEdit, EM_SETREADONLY, TRUE, 0); SendMessageA(hwndRichEdit, WM_PASTE, 0, 0); SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); - result = strcmp(buffer,"cut\r\n"); + result = strcmp(buffer, text3); ok(result == 0, "test paste: strcmp = %i, actual = '%s'\n", result, buffer); /* Cut from read-only control */ SendMessageA(hwndRichEdit, EM_SETSEL, 0, -1); SendMessageA(hwndRichEdit, WM_CUT, 0, 0); - result = strcmp(buffer,"cut\r\n"); + SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); + result = strcmp(buffer, text3); ok(result == 0, "test paste: strcmp = %i, actual = '%s'\n", result, buffer); + /* FIXME: Wine doesn't flush Ole clipboard when window is destroyed so do it manually */ + OleFlushClipboard(); + DestroyWindow(hwndRichEdit); + + /* Paste multi-line text into single-line control */ + hwndRichEdit = new_richedit_with_style(NULL, 0); + SendMessageA(hwndRichEdit, WM_PASTE, 0, 0); + SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); + result = strcmp(buffer, "testing paste"); + ok(result == 0, + "test paste: strcmp = %i, actual = '%s'\n", result, buffer); DestroyWindow(hwndRichEdit); } @@ -5973,6 +6029,18 @@ static void test_EM_STREAMIN(void) ok(es.dwError == 0, "EM_STREAMIN: Test 5 set error %d, expected %d\n", es.dwError, 0); DestroyWindow(hwndRichEdit); + + /* Single-line richedit */ + hwndRichEdit = new_richedit_with_style(NULL, 0); + ptr = "line1\r\nline2"; + es.dwCookie = (DWORD_PTR)&ptr; + es.dwError = 0; + es.pfnCallback = test_EM_STREAMIN_esCallback; + result = SendMessageA(hwndRichEdit, EM_STREAMIN, SF_TEXT, (LPARAM)&es); + ok(result == 12, "got %ld, expected %d\n", result, 12); + result = SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); + ok (!strcmp(buffer, "line1"), + "EM_STREAMIN: Unexpected text '%s'\n", buffer); } static void test_EM_StreamIn_Undo(void) -- 2.7.4

2 1

[PATCH 4/4] msvcrt: Fix write() behaviour on "no console" file descriptors
by Piotr Caban 15 Nov '17

15 Nov '17

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/file.c | 11 ++++++----- dlls/msvcrt/tests/file.c | 20 ++++++++++++++++++++ 2 files changed, 26 insertions(+), 5 deletions(-)

1 0

[PATCH 3/4] msvcrt: Fix read() behaviour on "no console" file descriptors
by Piotr Caban 15 Nov '17

15 Nov '17

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/file.c | 20 ++++++++++++++++---- dlls/msvcrt/tests/file.c | 16 ++++++++++++++++ 2 files changed, 32 insertions(+), 4 deletions(-)

1 0

[PATCH 2/4] msvcrt: Fix close() behaviour on "no console" file descriptors
by Piotr Caban 15 Nov '17

15 Nov '17

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/file.c | 6 +++++- dlls/msvcrt/tests/file.c | 16 ++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-)

1 0

[PATCH 1/4] msvcrt: Fix IO initialization when invalid handles are passed
by Piotr Caban 15 Nov '17

15 Nov '17

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/file.c | 42 +++++++++++++++++++++++++----- dlls/msvcrt/msvcrt.h | 3 +++ dlls/msvcrt/tests/Makefile.in | 1 + dlls/msvcrt/tests/file.c | 59 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 98 insertions(+), 7 deletions(-)

1 0

[PATCH] sane.ds: Send events to applications through the DSM.
by Vincent Povirk 14 Nov '17

14 Nov '17

Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> --- Supersedes 138548 dlls/sane.ds/ds_ctrl.c | 19 ++++--------------- dlls/sane.ds/sane_i.h | 5 +++-- dlls/sane.ds/sane_main.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++- dlls/sane.ds/ui.c | 6 ++---- include/twain.h | 24 ++++++++++++++++++++++++ 5 files changed, 81 insertions(+), 22 deletions(-) diff --git a/dlls/sane.ds/ds_ctrl.c b/dlls/sane.ds/ds_ctrl.c index 713f311c565..b7d283725c8 100644 --- a/dlls/sane.ds/ds_ctrl.c +++ b/dlls/sane.ds/ds_ctrl.c @@ -184,13 +184,7 @@ TW_UINT16 SANE_ProcessEvent (pTW_IDENTITY pOrigin, TRACE("DG_CONTROL/DAT_EVENT/MSG_PROCESSEVENT msg 0x%x, wParam 0x%lx\n", pMsg->message, pMsg->wParam); activeDS.twCC = TWCC_SUCCESS; - if (pMsg->message == activeDS.windowMessage && activeDS.windowMessage) - { - twRC = TWRC_DSEVENT; - pEvent->TWMessage = pMsg->wParam; - } - else - pEvent->TWMessage = MSG_NULL; /* no message to the application */ + pEvent->TWMessage = MSG_NULL; /* no message to the application */ if (activeDS.currentState < 5 || activeDS.currentState > 7) { @@ -232,8 +226,7 @@ TW_UINT16 SANE_PendingXfersEndXfer (pTW_IDENTITY pOrigin, pPendingXfers->Count = 0; activeDS.currentState = 5; /* Notify the application that it can close the data source */ - if (activeDS.windowMessage) - PostMessageA(activeDS.hwndOwner, activeDS.windowMessage, MSG_CLOSEDSREQ, 0); + SANE_Notify(MSG_CLOSEDSREQ); } else activeDS.sane_started = TRUE; @@ -403,8 +396,6 @@ TW_UINT16 SANE_EnableDSUserInterface (pTW_IDENTITY pOrigin, else { activeDS.hwndOwner = pUserInterface->hParent; - if (! activeDS.windowMessage) - activeDS.windowMessage = RegisterWindowMessageA("SANE.DS ACTIVITY MESSAGE"); if (pUserInterface->ShowUI) { BOOL rc; @@ -413,8 +404,7 @@ TW_UINT16 SANE_EnableDSUserInterface (pTW_IDENTITY pOrigin, pUserInterface->ModalUI = TRUE; if (!rc) { - if (activeDS.windowMessage) - PostMessageA(activeDS.hwndOwner, activeDS.windowMessage, MSG_CLOSEDSREQ, 0); + SANE_Notify(MSG_CLOSEDSREQ); } #ifdef SONAME_LIBSANE else @@ -428,8 +418,7 @@ TW_UINT16 SANE_EnableDSUserInterface (pTW_IDENTITY pOrigin, { /* no UI will be displayed, so source is ready to transfer data */ activeDS.currentState = 6; /* Transitions to state 6 directly */ - if (activeDS.windowMessage) - PostMessageA(activeDS.hwndOwner, activeDS.windowMessage, MSG_XFERREADY, 0); + SANE_Notify(MSG_XFERREADY); } twRC = TWRC_SUCCESS; diff --git a/dlls/sane.ds/sane_i.h b/dlls/sane.ds/sane_i.h index ae58159d596..941e8b9e1b9 100644 --- a/dlls/sane.ds/sane_i.h +++ b/dlls/sane.ds/sane_i.h @@ -62,10 +62,10 @@ extern HINSTANCE SANE_instance DECLSPEC_HIDDEN; struct tagActiveDS { struct tagActiveDS *next; /* next active DS */ - TW_IDENTITY identity; /* identity */ + TW_IDENTITY identity; /* identity of the DS */ TW_UINT16 currentState; /* current state */ - UINT windowMessage; /* message to use to send status */ TW_UINT16 twCC; /* condition code */ + TW_IDENTITY appIdentity; /* identity of the app */ HWND hwndOwner; /* window handle of the app */ HWND progressWnd; /* window handle of the scanning window */ #ifdef SONAME_LIBSANE @@ -89,6 +89,7 @@ struct tagActiveDS /* Helper functions */ extern TW_UINT16 SANE_SaneCapability (pTW_CAPABILITY pCapability, TW_UINT16 action) DECLSPEC_HIDDEN; extern TW_UINT16 SANE_SaneSetDefaults (void) DECLSPEC_HIDDEN; +extern void SANE_Notify (TW_UINT16 message) DECLSPEC_HIDDEN; /* Implementation of operation triplets * From Application to Source (Control Information) */ diff --git a/dlls/sane.ds/sane_main.c b/dlls/sane.ds/sane_main.c index 5c0f56f6c38..7af0a2321ac 100644 --- a/dlls/sane.ds/sane_main.c +++ b/dlls/sane.ds/sane_main.c @@ -30,6 +30,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(twain); +DSMENTRYPROC SANE_dsmentry; + #ifdef SONAME_LIBSANE HINSTANCE SANE_instance; @@ -113,6 +115,8 @@ static TW_UINT16 SANE_OpenDS( pTW_IDENTITY, pTW_IDENTITY); #endif /* SONAME_LIBSANE */ +static TW_UINT16 SANE_SetEntryPoint (pTW_IDENTITY pOrigin, TW_MEMREF pData); + static TW_UINT16 SANE_SourceControlHandler ( pTW_IDENTITY pOrigin, TW_UINT16 DAT, @@ -181,6 +185,17 @@ static TW_UINT16 SANE_SourceControlHandler ( } break; + case DAT_ENTRYPOINT: + if (MSG == MSG_SET) + twRC = SANE_SetEntryPoint (pOrigin, pData); + else + { + twRC = TWRC_FAILURE; + activeDS.twCC = TWCC_CAPBADOPERATION; + FIXME("unrecognized operation triplet\n"); + } + break; + case DAT_EVENT: if (MSG == MSG_PROCESSEVENT) twRC = SANE_ProcessEvent (pOrigin, pData); @@ -380,6 +395,21 @@ DS_Entry ( pTW_IDENTITY pOrigin, return twRC; } +void SANE_Notify (TW_UINT16 message) +{ + SANE_dsmentry (&activeDS.identity, &activeDS.appIdentity, DG_CONTROL, DAT_NULL, message, NULL); +} + +/* DG_CONTROL/DAT_ENTRYPOINT/MSG_SET */ +TW_UINT16 SANE_SetEntryPoint (pTW_IDENTITY pOrigin, TW_MEMREF pData) +{ + TW_ENTRYPOINT *entry = (TW_ENTRYPOINT*)pData; + + SANE_dsmentry = entry->DSM_Entry; + + return TWRC_SUCCESS; +} + #ifdef SONAME_LIBSANE /* Sane returns device names that are longer than the 32 bytes allowed by TWAIN. However, it colon separates them, and the last bit is @@ -432,7 +462,7 @@ SANE_GetIdentity( pTW_IDENTITY pOrigin, pTW_IDENTITY self) { return TWRC_FAILURE; self->ProtocolMajor = TWON_PROTOCOLMAJOR; self->ProtocolMinor = TWON_PROTOCOLMINOR; - self->SupportedGroups = DG_CONTROL | DG_IMAGE; + self->SupportedGroups = DG_CONTROL | DG_IMAGE | DF_DS2; copy_sane_short_name(sane_devlist[cursanedev]->name, self->ProductName, sizeof(self->ProductName) - 1); lstrcpynA (self->Manufacturer, sane_devlist[cursanedev]->vendor, sizeof(self->Manufacturer) - 1); lstrcpynA (self->ProductFamily, sane_devlist[cursanedev]->model, sizeof(self->ProductFamily) - 1); @@ -451,6 +481,21 @@ static TW_UINT16 SANE_OpenDS( pTW_IDENTITY pOrigin, pTW_IDENTITY self) { SANE_Status status; int i; + if (SANE_dsmentry == NULL) + { + static const WCHAR twain32W[] = {'t','w','a','i','n','_','3','2',0}; + HMODULE moddsm = GetModuleHandleW(twain32W); + + if (moddsm) + SANE_dsmentry = (void*)GetProcAddress(moddsm, "DSM_Entry"); + + if (!SANE_dsmentry) + { + ERR("can't find DSM entry point\n"); + return TWRC_FAILURE; + } + } + detect_sane_devices(); if (!sane_devlist[0]) { ERR("No scanners? We should not get to OpenDS?\n"); @@ -481,6 +526,8 @@ static TW_UINT16 SANE_OpenDS( pTW_IDENTITY pOrigin, pTW_IDENTITY self) { activeDS.twCC = SANE_SaneSetDefaults(); if (activeDS.twCC == TWCC_SUCCESS) { activeDS.currentState = 4; + activeDS.identity.Id = self->Id; + activeDS.appIdentity = *pOrigin; return TWRC_SUCCESS; } else diff --git a/dlls/sane.ds/ui.c b/dlls/sane.ds/ui.c index 9a9bcb0347e..fe1988a88ad 100644 --- a/dlls/sane.ds/ui.c +++ b/dlls/sane.ds/ui.c @@ -1034,13 +1034,11 @@ static INT_PTR CALLBACK DialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM if (psn->lParam) { activeDS.currentState = 6; - if (activeDS.windowMessage) - PostMessageA(activeDS.hwndOwner, activeDS.windowMessage, MSG_XFERREADY, 0); + SANE_Notify(MSG_XFERREADY); } break; case PSN_QUERYCANCEL: - if (activeDS.windowMessage) - PostMessageA(activeDS.hwndOwner, activeDS.windowMessage, MSG_CLOSEDSREQ, 0); + SANE_Notify(MSG_CLOSEDSREQ); break; case PSN_SETACTIVE: InitializeDialog(hwndDlg); diff --git a/include/twain.h b/include/twain.h index bdbda4761e4..28eaddf0840 100644 --- a/include/twain.h +++ b/include/twain.h @@ -1843,6 +1843,30 @@ typedef TW_UINT16 (*DSENTRYPROC)(pTW_IDENTITY, } #endif /* cplusplus */ +/* Definitions from TWAIN 2.x used by our builtin data sources */ +#define DAT_ENTRYPOINT 0x0403 +#define DF_DS2 0x40000000 + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ +typedef TW_HANDLE (PASCAL *DSM_MEMALLOCATE)(TW_UINT32 _size); +typedef void (PASCAL *DSM_MEMFREE)(TW_HANDLE _handle); +typedef TW_MEMREF (PASCAL *DSM_MEMLOCK)(TW_HANDLE _handle); +typedef void (PASCAL *DSM_MEMUNLOCK)(TW_HANDLE _handle); +#ifdef __cplusplus +} +#endif /* cplusplus */ + +typedef struct { + TW_UINT32 Size; + DSMENTRYPROC DSM_Entry; + DSM_MEMALLOCATE DSM_MemAllocate; + DSM_MEMFREE DSM_MemFree; + DSM_MEMLOCK DSM_MemLock; + DSM_MEMUNLOCK DSM_MemUnlock; +} TW_ENTRYPOINT; + /* The Twain structures must be packed on 2 byte alignment */ #include "poppack.h" -- 2.11.0

1 0

Re: [PATCH] shell32/tests: Add test for IAutoComplete2 with custom source
by Marvin 14 Nov '17

14 Nov '17

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=34144 Your paranoid android. === w2008s64 (32 bit autocomplete) === autocomplete.c:388: Test failed: Expected L"beta", got L"b" === w7pro64 (32 bit autocomplete) === autocomplete.c:388: Test failed: Expected L"beta", got L"b" === w8 (32 bit autocomplete) === autocomplete.c:388: Test failed: Expected L"beta", got L"b" === w1064 (32 bit autocomplete) === autocomplete.c:388: Test failed: Expected L"beta", got L"b" === wvistau64 (64 bit autocomplete) === autocomplete.c:388: Test failed: Expected L"beta", got L"b" === w2008s64 (64 bit autocomplete) === autocomplete.c:388: Test failed: Expected L"beta", got L"b" === w7pro64 (64 bit autocomplete) === autocomplete.c:388: Test failed: Expected L"beta", got L"b" === w864 (64 bit autocomplete) === autocomplete.c:388: Test failed: Expected L"beta", got L"b" === w1064 (64 bit autocomplete) === autocomplete.c:388: Test failed: Expected L"beta", got L"b"

2 1

[PATCH] shell32/tests: Add test for IAutoComplete2 with custom source
by Fabian Maurer 14 Nov '17

14 Nov '17

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/shell32/tests/autocomplete.c | 168 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 168 insertions(+) diff --git a/dlls/shell32/tests/autocomplete.c b/dlls/shell32/tests/autocomplete.c index 63a2eb2b11..781ced804a 100644 --- a/dlls/shell32/tests/autocomplete.c +++ b/dlls/shell32/tests/autocomplete.c @@ -225,6 +225,172 @@ static void createMainWnd(void) CW_USEDEFAULT, CW_USEDEFAULT, 130, 105, NULL, NULL, GetModuleHandleA(NULL), 0); } +struct string_enumerator +{ + IEnumString IEnumString_iface; + LONG ref; + WCHAR **data; + int data_len; + int cur; +}; + +static struct string_enumerator *impl_from_IEnumString(IEnumString *iface) +{ + return CONTAINING_RECORD(iface, struct string_enumerator, IEnumString_iface); +} + +static HRESULT WINAPI string_enumerator_QueryInterface(IEnumString *iface, REFIID riid, void **ppv) +{ + if (IsEqualGUID(riid, &IID_IEnumString) || IsEqualGUID(riid, &IID_IUnknown)) + { + IUnknown_AddRef(iface); + *ppv = iface; + return S_OK; + } + + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI string_enumerator_AddRef(IEnumString *iface) +{ + struct string_enumerator *this = impl_from_IEnumString(iface); + + ULONG ref = InterlockedIncrement(&this->ref); + + return ref; +} + +static ULONG WINAPI string_enumerator_Release(IEnumString *iface) +{ + struct string_enumerator *this = impl_from_IEnumString(iface); + + ULONG ref = InterlockedDecrement(&this->ref); + + if (!ref) + HeapFree(GetProcessHeap(), 0, this); + + return ref; +} + +static HRESULT WINAPI string_enumerator_Next(IEnumString *iface, ULONG num, LPOLESTR *strings, ULONG *num_returned) +{ + struct string_enumerator *this = impl_from_IEnumString(iface); + int i, len; + + *num_returned = 0; + for (i = 0; i < num; i++) + { + if (this->cur >= this->data_len) + return S_FALSE; + + len = lstrlenW(this->data[this->cur]) + 1; + + strings[i] = CoTaskMemAlloc(len * sizeof(WCHAR)); + memcpy(strings[i], this->data[this->cur], len * sizeof(WCHAR)); + + (*num_returned)++; + this->cur++; + } + + return S_OK; +} + +static HRESULT WINAPI string_enumerator_Reset(IEnumString *iface) +{ + struct string_enumerator *this = impl_from_IEnumString(iface); + + this->cur = 0; + + return S_OK; +} + +static HRESULT WINAPI string_enumerator_Skip(IEnumString *iface, ULONG num) +{ + struct string_enumerator *this = impl_from_IEnumString(iface); + + this->cur += num; + + return S_OK; +} + +static HRESULT WINAPI string_enumerator_Clone(IEnumString *iface, IEnumString **out) +{ + *out = NULL; + return E_NOTIMPL; +} + +static IEnumStringVtbl string_enumerator_vtlb = +{ + string_enumerator_QueryInterface, + string_enumerator_AddRef, + string_enumerator_Release, + string_enumerator_Next, + string_enumerator_Skip, + string_enumerator_Reset, + string_enumerator_Clone +}; + +static HRESULT string_enumerator_create(void **ppv, WCHAR **suggestions, int count) +{ + struct string_enumerator *object; + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if (!object) + return E_OUTOFMEMORY; + + object->IEnumString_iface.lpVtbl = &string_enumerator_vtlb; + object->ref = 1; + object->data = suggestions; + object->data_len = count; + object->cur = 0; + + *ppv = &object->IEnumString_iface; + + return S_OK; +} + +static void test_custom_source(void) +{ + static WCHAR str_alpha[] = {'a','l','p','h','a',0}; + static WCHAR str_alpha2[] = {'a','l','p','h','a','2',0}; + static WCHAR str_beta[] = {'b','e','t','a',0}; + static WCHAR *suggestions[] = { str_alpha, str_alpha2, str_beta }; + IUnknown *enumerator; + IAutoComplete2 *autocomplete; + HWND hwnd_edit; + WCHAR buffer[20]; + HRESULT hr; + MSG msg; + + ShowWindow(hMainWnd, SW_SHOW); + + hwnd_edit = CreateWindowA("Edit", "", WS_OVERLAPPED | WS_VISIBLE | WS_CHILD | WS_BORDER, 50, 5, 200, 20, hMainWnd, 0, NULL, 0); + + hr = CoCreateInstance(&CLSID_AutoComplete, NULL, CLSCTX_INPROC_SERVER, &IID_IAutoComplete2, (void**)&autocomplete); + ok(hr == S_OK, "CoCreateInstance failed: %x\n", hr); + + string_enumerator_create((void**)&enumerator, suggestions, sizeof(suggestions) / sizeof(*suggestions)); + + hr = IAutoComplete2_SetOptions(autocomplete, ACO_AUTOSUGGEST | ACO_AUTOAPPEND); + ok(hr == S_OK, "IAutoComplete2_SetOptions failed: %x\n", hr); + hr = IAutoComplete2_Init(autocomplete, hwnd_edit, enumerator, NULL, NULL); + ok(hr == S_OK, "IAutoComplete_Init failed: %x\n", hr); + + SendMessageW(hwnd_edit, WM_CHAR, 'b', 1); + SendMessageW(hwnd_edit, WM_KEYUP, 'e', 1); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + { + TranslateMessage(&msg); + DispatchMessageA(&msg); + } + SendMessageW(hwnd_edit, WM_GETTEXT, sizeof(buffer) / sizeof(*buffer), (LPARAM)buffer); + ok(lstrcmpW(str_beta, buffer) == 0, "Expected %s, got %s\n", wine_dbgstr_w(str_beta), wine_dbgstr_w(buffer)); + + ShowWindow(hMainWnd, SW_HIDE); + DestroyWindow(hwnd_edit); +} + START_TEST(autocomplete) { HRESULT r; @@ -246,6 +412,8 @@ START_TEST(autocomplete) goto cleanup; test_killfocus(); + test_custom_source(); + PostQuitMessage(0); while(GetMessageA(&msg,0,0,0)) { TranslateMessage(&msg); -- 2.15.0

1 0

[PATCH] po: Update Lithuanian translation
by Aurimas Fišeras 14 Nov '17

14 Nov '17

1 0

[PATCH] sane.ds: Send events to applications through the DSM.
by Vincent Povirk 14 Nov '17

14 Nov '17

Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> --- dlls/sane.ds/ds_ctrl.c | 19 ++++--------------- dlls/sane.ds/sane_i.h | 5 +++-- dlls/sane.ds/sane_main.c | 48 +++++++++++++++++++++++++++++++++++++++++++++++- dlls/sane.ds/ui.c | 6 ++---- include/twain.h | 24 ++++++++++++++++++++++++ 5 files changed, 80 insertions(+), 22 deletions(-) diff --git a/dlls/sane.ds/ds_ctrl.c b/dlls/sane.ds/ds_ctrl.c index 713f311c565..b7d283725c8 100644 --- a/dlls/sane.ds/ds_ctrl.c +++ b/dlls/sane.ds/ds_ctrl.c @@ -184,13 +184,7 @@ TW_UINT16 SANE_ProcessEvent (pTW_IDENTITY pOrigin, TRACE("DG_CONTROL/DAT_EVENT/MSG_PROCESSEVENT msg 0x%x, wParam 0x%lx\n", pMsg->message, pMsg->wParam); activeDS.twCC = TWCC_SUCCESS; - if (pMsg->message == activeDS.windowMessage && activeDS.windowMessage) - { - twRC = TWRC_DSEVENT; - pEvent->TWMessage = pMsg->wParam; - } - else - pEvent->TWMessage = MSG_NULL; /* no message to the application */ + pEvent->TWMessage = MSG_NULL; /* no message to the application */ if (activeDS.currentState < 5 || activeDS.currentState > 7) { @@ -232,8 +226,7 @@ TW_UINT16 SANE_PendingXfersEndXfer (pTW_IDENTITY pOrigin, pPendingXfers->Count = 0; activeDS.currentState = 5; /* Notify the application that it can close the data source */ - if (activeDS.windowMessage) - PostMessageA(activeDS.hwndOwner, activeDS.windowMessage, MSG_CLOSEDSREQ, 0); + SANE_Notify(MSG_CLOSEDSREQ); } else activeDS.sane_started = TRUE; @@ -403,8 +396,6 @@ TW_UINT16 SANE_EnableDSUserInterface (pTW_IDENTITY pOrigin, else { activeDS.hwndOwner = pUserInterface->hParent; - if (! activeDS.windowMessage) - activeDS.windowMessage = RegisterWindowMessageA("SANE.DS ACTIVITY MESSAGE"); if (pUserInterface->ShowUI) { BOOL rc; @@ -413,8 +404,7 @@ TW_UINT16 SANE_EnableDSUserInterface (pTW_IDENTITY pOrigin, pUserInterface->ModalUI = TRUE; if (!rc) { - if (activeDS.windowMessage) - PostMessageA(activeDS.hwndOwner, activeDS.windowMessage, MSG_CLOSEDSREQ, 0); + SANE_Notify(MSG_CLOSEDSREQ); } #ifdef SONAME_LIBSANE else @@ -428,8 +418,7 @@ TW_UINT16 SANE_EnableDSUserInterface (pTW_IDENTITY pOrigin, { /* no UI will be displayed, so source is ready to transfer data */ activeDS.currentState = 6; /* Transitions to state 6 directly */ - if (activeDS.windowMessage) - PostMessageA(activeDS.hwndOwner, activeDS.windowMessage, MSG_XFERREADY, 0); + SANE_Notify(MSG_XFERREADY); } twRC = TWRC_SUCCESS; diff --git a/dlls/sane.ds/sane_i.h b/dlls/sane.ds/sane_i.h index ae58159d596..941e8b9e1b9 100644 --- a/dlls/sane.ds/sane_i.h +++ b/dlls/sane.ds/sane_i.h @@ -62,10 +62,10 @@ extern HINSTANCE SANE_instance DECLSPEC_HIDDEN; struct tagActiveDS { struct tagActiveDS *next; /* next active DS */ - TW_IDENTITY identity; /* identity */ + TW_IDENTITY identity; /* identity of the DS */ TW_UINT16 currentState; /* current state */ - UINT windowMessage; /* message to use to send status */ TW_UINT16 twCC; /* condition code */ + TW_IDENTITY appIdentity; /* identity of the app */ HWND hwndOwner; /* window handle of the app */ HWND progressWnd; /* window handle of the scanning window */ #ifdef SONAME_LIBSANE @@ -89,6 +89,7 @@ struct tagActiveDS /* Helper functions */ extern TW_UINT16 SANE_SaneCapability (pTW_CAPABILITY pCapability, TW_UINT16 action) DECLSPEC_HIDDEN; extern TW_UINT16 SANE_SaneSetDefaults (void) DECLSPEC_HIDDEN; +extern void SANE_Notify (TW_UINT16 message) DECLSPEC_HIDDEN; /* Implementation of operation triplets * From Application to Source (Control Information) */ diff --git a/dlls/sane.ds/sane_main.c b/dlls/sane.ds/sane_main.c index 5c0f56f6c38..80a0baf9217 100644 --- a/dlls/sane.ds/sane_main.c +++ b/dlls/sane.ds/sane_main.c @@ -32,6 +32,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(twain); #ifdef SONAME_LIBSANE +DSMENTRYPROC SANE_dsmentry; + HINSTANCE SANE_instance; static void *libsane_handle; @@ -109,6 +111,7 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) } static TW_UINT16 SANE_GetIdentity( pTW_IDENTITY, pTW_IDENTITY); +static TW_UINT16 SANE_SetEntryPoint (pTW_IDENTITY pOrigin, TW_MEMREF pData); static TW_UINT16 SANE_OpenDS( pTW_IDENTITY, pTW_IDENTITY); #endif /* SONAME_LIBSANE */ @@ -181,6 +184,17 @@ static TW_UINT16 SANE_SourceControlHandler ( } break; + case DAT_ENTRYPOINT: + if (MSG == MSG_SET) + twRC = SANE_SetEntryPoint (pOrigin, pData); + else + { + twRC = TWRC_FAILURE; + activeDS.twCC = TWCC_CAPBADOPERATION; + FIXME("unrecognized operation triplet\n"); + } + break; + case DAT_EVENT: if (MSG == MSG_PROCESSEVENT) twRC = SANE_ProcessEvent (pOrigin, pData); @@ -432,7 +446,7 @@ SANE_GetIdentity( pTW_IDENTITY pOrigin, pTW_IDENTITY self) { return TWRC_FAILURE; self->ProtocolMajor = TWON_PROTOCOLMAJOR; self->ProtocolMinor = TWON_PROTOCOLMINOR; - self->SupportedGroups = DG_CONTROL | DG_IMAGE; + self->SupportedGroups = DG_CONTROL | DG_IMAGE | DF_DS2; copy_sane_short_name(sane_devlist[cursanedev]->name, self->ProductName, sizeof(self->ProductName) - 1); lstrcpynA (self->Manufacturer, sane_devlist[cursanedev]->vendor, sizeof(self->Manufacturer) - 1); lstrcpynA (self->ProductFamily, sane_devlist[cursanedev]->model, sizeof(self->ProductFamily) - 1); @@ -447,10 +461,40 @@ SANE_GetIdentity( pTW_IDENTITY pOrigin, pTW_IDENTITY self) { return TWRC_SUCCESS; } +void SANE_Notify (TW_UINT16 message) +{ + SANE_dsmentry (&activeDS.identity, &activeDS.appIdentity, DG_CONTROL, DAT_NULL, message, NULL); +} + +/* DG_CONTROL/DAT_ENTRYPOINT/MSG_SET */ +TW_UINT16 SANE_SetEntryPoint (pTW_IDENTITY pOrigin, TW_MEMREF pData) +{ + TW_ENTRYPOINT *entry = (TW_ENTRYPOINT*)pData; + + SANE_dsmentry = entry->DSM_Entry; + + return TWRC_SUCCESS; +} + static TW_UINT16 SANE_OpenDS( pTW_IDENTITY pOrigin, pTW_IDENTITY self) { SANE_Status status; int i; + if (SANE_dsmentry == NULL) + { + static const WCHAR twain32W[] = {'t','w','a','i','n','_','3','2',0}; + HMODULE moddsm = GetModuleHandleW(twain32W); + + if (moddsm) + SANE_dsmentry = (void*)GetProcAddress(moddsm, "DSM_Entry"); + + if (!SANE_dsmentry) + { + ERR("can't find DSM entry point\n"); + return TWRC_FAILURE; + } + } + detect_sane_devices(); if (!sane_devlist[0]) { ERR("No scanners? We should not get to OpenDS?\n"); @@ -481,6 +525,8 @@ static TW_UINT16 SANE_OpenDS( pTW_IDENTITY pOrigin, pTW_IDENTITY self) { activeDS.twCC = SANE_SaneSetDefaults(); if (activeDS.twCC == TWCC_SUCCESS) { activeDS.currentState = 4; + activeDS.identity.Id = self->Id; + activeDS.appIdentity = *pOrigin; return TWRC_SUCCESS; } else diff --git a/dlls/sane.ds/ui.c b/dlls/sane.ds/ui.c index 9a9bcb0347e..fe1988a88ad 100644 --- a/dlls/sane.ds/ui.c +++ b/dlls/sane.ds/ui.c @@ -1034,13 +1034,11 @@ static INT_PTR CALLBACK DialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM if (psn->lParam) { activeDS.currentState = 6; - if (activeDS.windowMessage) - PostMessageA(activeDS.hwndOwner, activeDS.windowMessage, MSG_XFERREADY, 0); + SANE_Notify(MSG_XFERREADY); } break; case PSN_QUERYCANCEL: - if (activeDS.windowMessage) - PostMessageA(activeDS.hwndOwner, activeDS.windowMessage, MSG_CLOSEDSREQ, 0); + SANE_Notify(MSG_CLOSEDSREQ); break; case PSN_SETACTIVE: InitializeDialog(hwndDlg); diff --git a/include/twain.h b/include/twain.h index bdbda4761e4..28eaddf0840 100644 --- a/include/twain.h +++ b/include/twain.h @@ -1843,6 +1843,30 @@ typedef TW_UINT16 (*DSENTRYPROC)(pTW_IDENTITY, } #endif /* cplusplus */ +/* Definitions from TWAIN 2.x used by our builtin data sources */ +#define DAT_ENTRYPOINT 0x0403 +#define DF_DS2 0x40000000 + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ +typedef TW_HANDLE (PASCAL *DSM_MEMALLOCATE)(TW_UINT32 _size); +typedef void (PASCAL *DSM_MEMFREE)(TW_HANDLE _handle); +typedef TW_MEMREF (PASCAL *DSM_MEMLOCK)(TW_HANDLE _handle); +typedef void (PASCAL *DSM_MEMUNLOCK)(TW_HANDLE _handle); +#ifdef __cplusplus +} +#endif /* cplusplus */ + +typedef struct { + TW_UINT32 Size; + DSMENTRYPROC DSM_Entry; + DSM_MEMALLOCATE DSM_MemAllocate; + DSM_MEMFREE DSM_MemFree; + DSM_MEMLOCK DSM_MemLock; + DSM_MEMUNLOCK DSM_MemUnlock; +} TW_ENTRYPOINT; + /* The Twain structures must be packed on 2 byte alignment */ #include "poppack.h" -- 2.11.0

2 1

[PATCH] ieproxy: Added IPersistHistory proxy/stub.
by Jacek Caban 14 Nov '17

14 Nov '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ieproxy/Makefile.in | 7 ++++--- dlls/ieproxy/ieproxy_perhist.idl | 30 ++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 dlls/ieproxy/ieproxy_perhist.idl

1 0

[PATCH 2/3] imm32/tests: Add more composition string tests.
by Akihiro Sagawa 14 Nov '17

14 Nov '17

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/imm32/tests/imm32.c | 140 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 140 insertions(+)

2 1

[PATCH 1/3] imm32/tests: Add a skip message when composition string isn't available.
by Akihiro Sagawa 14 Nov '17

14 Nov '17

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/imm32/tests/imm32.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)

2 1

[PATCH 3/3] winex11: Keep the result string in the IME UI window procedure.
by Akihiro Sagawa 14 Nov '17

14 Nov '17

Fixes bug 43904. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/imm32/tests/imm32.c | 1 - dlls/winex11.drv/ime.c | 11 +++++------ 2 files changed, 5 insertions(+), 7 deletions(-)

1 0

[PATCH] comctl32: Simplify handling of the marquee highlight.
by Huw Davies 14 Nov '17

14 Nov '17

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/comctl32/listview.c | 82 ++++++++++++++++++------------------------------ 1 file changed, 31 insertions(+), 51 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 35877976d8..4cb1f0d53a 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -3843,33 +3843,44 @@ static LRESULT LISTVIEW_MouseHover(LISTVIEW_INFO *infoPtr, INT x, INT y) * None. */ static void LISTVIEW_MarqueeHighlight(LISTVIEW_INFO *infoPtr, const POINT *coords_orig, - const POINT *coords_offs, const POINT *offset, INT scroll) { BOOL controlDown = FALSE; LVITEMW item; ITERATOR old_elems, new_elems; RECT rect; + POINT coords_offs, offset; - if (coords_offs->x > infoPtr->marqueeOrigin.x) + /* Ensure coordinates are within client bounds */ + coords_offs.x = max(min(coords_orig->x, infoPtr->rcList.right), 0); + coords_offs.y = max(min(coords_orig->y, infoPtr->rcList.bottom), 0); + + /* Get offset */ + LISTVIEW_GetOrigin(infoPtr, &offset); + + /* Offset coordinates by the appropriate amount */ + coords_offs.x -= offset.x; + coords_offs.y -= offset.y; + + if (coords_offs.x > infoPtr->marqueeOrigin.x) { rect.left = infoPtr->marqueeOrigin.x; - rect.right = coords_offs->x; + rect.right = coords_offs.x; } else { - rect.left = coords_offs->x; + rect.left = coords_offs.x; rect.right = infoPtr->marqueeOrigin.x; } - if (coords_offs->y > infoPtr->marqueeOrigin.y) + if (coords_offs.y > infoPtr->marqueeOrigin.y) { rect.top = infoPtr->marqueeOrigin.y; - rect.bottom = coords_offs->y; + rect.bottom = coords_offs.y; } else { - rect.top = coords_offs->y; + rect.top = coords_offs.y; rect.bottom = infoPtr->marqueeOrigin.y; } @@ -3895,7 +3906,7 @@ static void LISTVIEW_MarqueeHighlight(LISTVIEW_INFO *infoPtr, const POINT *coord infoPtr->marqueeRect = rect; infoPtr->marqueeDrawRect = rect; - OffsetRect(&infoPtr->marqueeDrawRect, offset->x, offset->y); + OffsetRect(&infoPtr->marqueeDrawRect, offset.x, offset.y); iterator_frameditems_absolute(&new_elems, infoPtr, &infoPtr->marqueeRect); iterator_remove_common_items(&old_elems, &new_elems); @@ -3960,9 +3971,7 @@ static VOID CALLBACK LISTVIEW_ScrollTimer(HWND hWnd, UINT uMsg, UINT_PTR idEvent { LISTVIEW_INFO *infoPtr; SCROLLINFO scrollInfo; - POINT coords_orig; - POINT coords_offs; - POINT offset; + POINT coords; INT scroll = 0; infoPtr = (LISTVIEW_INFO *) idEvent; @@ -3971,19 +3980,8 @@ static VOID CALLBACK LISTVIEW_ScrollTimer(HWND hWnd, UINT uMsg, UINT_PTR idEvent return; /* Get the current cursor position and convert to client coordinates */ - GetCursorPos(&coords_orig); - ScreenToClient(hWnd, &coords_orig); - - /* Ensure coordinates are within client bounds */ - coords_offs.x = max(min(coords_orig.x, infoPtr->rcList.right), 0); - coords_offs.y = max(min(coords_orig.y, infoPtr->rcList.bottom), 0); - - /* Get offset */ - LISTVIEW_GetOrigin(infoPtr, &offset); - - /* Offset coordinates by the appropriate amount */ - coords_offs.x -= offset.x; - coords_offs.y -= offset.y; + GetCursorPos(&coords); + ScreenToClient(hWnd, &coords); scrollInfo.cbSize = sizeof(SCROLLINFO); scrollInfo.fMask = SIF_ALL; @@ -4007,12 +4005,12 @@ static VOID CALLBACK LISTVIEW_ScrollTimer(HWND hWnd, UINT uMsg, UINT_PTR idEvent scroll |= SCROLL_RIGHT; } - if (((coords_orig.x <= 0) && (scroll & SCROLL_LEFT)) || - ((coords_orig.y <= 0) && (scroll & SCROLL_UP)) || - ((coords_orig.x >= infoPtr->rcList.right) && (scroll & SCROLL_RIGHT)) || - ((coords_orig.y >= infoPtr->rcList.bottom) && (scroll & SCROLL_DOWN))) + if (((coords.x <= 0) && (scroll & SCROLL_LEFT)) || + ((coords.y <= 0) && (scroll & SCROLL_UP)) || + ((coords.x >= infoPtr->rcList.right) && (scroll & SCROLL_RIGHT)) || + ((coords.y >= infoPtr->rcList.bottom) && (scroll & SCROLL_DOWN))) { - LISTVIEW_MarqueeHighlight(infoPtr, &coords_orig, &coords_offs, &offset, scroll); + LISTVIEW_MarqueeHighlight(infoPtr, &coords, scroll); } } @@ -4034,6 +4032,9 @@ static LRESULT LISTVIEW_MouseMove(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, IN RECT rect; POINT pt; + pt.x = x; + pt.y = y; + if (!(fwKeys & MK_LBUTTON)) infoPtr->bLButtonDown = FALSE; @@ -4046,24 +4047,6 @@ static LRESULT LISTVIEW_MouseMove(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, IN if (infoPtr->bMarqueeSelect) { - POINT coords_orig; - POINT coords_offs; - POINT offset; - - coords_orig.x = x; - coords_orig.y = y; - - /* Get offset */ - LISTVIEW_GetOrigin(infoPtr, &offset); - - /* Ensure coordinates are within client bounds */ - coords_offs.x = max(min(x, infoPtr->rcList.right), 0); - coords_offs.y = max(min(y, infoPtr->rcList.bottom), 0); - - /* Offset coordinates by the appropriate amount */ - coords_offs.x -= offset.x; - coords_offs.y -= offset.y; - /* Enable the timer if we're going outside our bounds, in case the user doesn't move the mouse again */ @@ -4082,13 +4065,10 @@ static LRESULT LISTVIEW_MouseMove(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, IN KillTimer(infoPtr->hwndSelf, (UINT_PTR) infoPtr); } - LISTVIEW_MarqueeHighlight(infoPtr, &coords_orig, &coords_offs, &offset, 0); + LISTVIEW_MarqueeHighlight(infoPtr, &pt, 0); return 0; } - pt.x = x; - pt.y = y; - ht.pt = pt; LISTVIEW_HitTest(infoPtr, &ht, TRUE, TRUE); -- 2.12.0

1 0

Re: [PATCH v2] winex11.drv: Preserve last error in x11drv_thread_data().
by Marvin 14 Nov '17

14 Nov '17

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=34138 Your paranoid android. === wvistau64 (32 bit input) === input.c:1940: Test failed: error 998 === w2008s64 (32 bit input) === input.c:1940: Test failed: error 998 === w7u (32 bit input) === input.c:1940: Test failed: error 998 === w7pro64 (32 bit input) === input.c:1940: Test failed: error 998 === w8 (32 bit input) === input.c:1940: Test failed: error 998 === w864 (32 bit input) === input.c:1940: Test failed: error 998 === w1064 (32 bit input) === input.c:1940: Test failed: error 998 === wvistau64 (64 bit input) === input.c:1940: Test failed: error 998 === w2008s64 (64 bit input) === input.c:1940: Test failed: error 998 === w7pro64 (64 bit input) === input.c:1940: Test failed: error 998 === w864 (64 bit input) === input.c:1940: Test failed: error 998 === w1064 (64 bit input) === input.c:1940: Test failed: error 998

1 0

[PATCH] msxml3/httpreq: Return S_OK from setTimeouts()
by Nikolay Sivov 14 Nov '17

14 Nov '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/msxml3/httprequest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 72234ee999..e3b521c2d6 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -1978,7 +1978,7 @@ static HRESULT WINAPI ServerXMLHTTPRequest_setTimeouts(IServerXMLHTTPRequest *if { serverhttp *This = impl_from_IServerXMLHTTPRequest( iface ); FIXME("(%p)->(%d %d %d %d): stub\n", This, resolveTimeout, connectTimeout, sendTimeout, receiveTimeout); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI ServerXMLHTTPRequest_waitForResponse(IServerXMLHTTPRequest *iface, VARIANT timeout, VARIANT_BOOL *isSuccessful) -- 2.15.0

1 0

[PATCH] widl: Generate header macros even for aggregate return methods.
by Dmitry Timoshkov 14 Nov '17

14 Nov '17

A generated macro has a clear suggestion what to do (#define WIDL_C_INLINE_WRAPPERS) instead of completely omitting the macro and leaving one wondering what is going on. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- tools/widl/header.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index b5fe2326d6..9f92127d06 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -960,7 +960,7 @@ static void write_method_macro(FILE *header, const type_t *iface, const type_t * if (is_override_method(iface, child, func)) continue; - if (!is_callas(func->attrs) && !is_aggregate_return(func)) { + if (!is_callas(func->attrs)) { const var_t *arg; fprintf(header, "#define %s_%s(This", name, get_name(func)); @@ -969,6 +969,12 @@ static void write_method_macro(FILE *header, const type_t *iface, const type_t * fprintf(header, ",%s", arg->name); fprintf(header, ") "); + if (is_aggregate_return(func)) + { + fprintf(header, "%s_%s_define_WIDL_C_INLINE_WRAPPERS_for_aggregate_return_support\n", name, get_name(func)); + continue; + } + fprintf(header, "(This)->lpVtbl->%s(This", get_vtbl_entry_name(iface, func)); if (type_get_function_args(func->type)) LIST_FOR_EACH_ENTRY( arg, type_get_function_args(func->type), const var_t, entry ) -- 2.15.0

1 0

[PATCH 1/3] urlmon: Added user marshaling implementation for OnDataAvailable.
by Jacek Caban 13 Nov '17

13 Nov '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/urlmon/usrmarshal.c | 155 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 151 insertions(+), 4 deletions(-)

2 2

[PATCH 1/3 v2] urlmon: Added user marshaling implementation for OnDataAvailable.
by Jacek Caban 13 Nov '17

13 Nov '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/urlmon/usrmarshal.c | 155 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 151 insertions(+), 4 deletions(-)

1 0

[PATCH] libport: Fix typo in rintf.
by Alex Henrie 13 Nov '17

13 Nov '17

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Spotted by Joris Huizer. --- libs/port/rint.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/port/rint.c b/libs/port/rint.c index a99c00be43..2c0d22294c 100644 --- a/libs/port/rint.c +++ b/libs/port/rint.c @@ -33,7 +33,7 @@ double rint(double x) #ifndef HAVE_RINTF float rintf(float x) { - return rintf(x); + return rint(x); } #endif -- 2.15.0

1 0

[PATCH 3/3] urlmon/tests: Added IBindStatusCallback marshaling tests.
by Jacek Caban 13 Nov '17

13 Nov '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/urlmon/tests/misc.c | 723 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 723 insertions(+)

1 0

[PATCH 2/3] urlmon: Added user marshaling implementation for GetBindInfo[Ex].
by Jacek Caban 13 Nov '17

13 Nov '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/urlmon/usrmarshal.c | 113 +++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 99 insertions(+), 14 deletions(-)

1 0

[PATCH 3/3] mlang: Correct wrong code pages data.
by Ziqing Hui 13 Nov '17

13 Nov '17

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/mlang/mlang.c | 94 +++++++++++++++++++++++++----------------------- dlls/mlang/tests/mlang.c | 23 +----------- 2 files changed, 50 insertions(+), 67 deletions(-)

2 1

[PATCH] quartz/tests: Add a couple of tests for return values (Coverity)
by Nikolay Sivov 13 Nov '17

13 Nov '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/quartz/tests/avisplitter.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/tests/avisplitter.c b/dlls/quartz/tests/avisplitter.c index 23167b59b8..8bafb14157 100644 --- a/dlls/quartz/tests/avisplitter.c +++ b/dlls/quartz/tests/avisplitter.c @@ -422,8 +422,10 @@ static void test_filter_graph(void) } ok(hr == S_OK, "Could not create null renderer: %08x\n", hr); - IBaseFilter_EnumPins(pnull, &nullenum); - IEnumPins_Next(nullenum, 1, &nullpin, NULL); + hr = IBaseFilter_EnumPins(pnull, &nullenum); + ok(hr == S_OK, "Failed to enum pins, hr %#x.\n", hr); + hr = IEnumPins_Next(nullenum, 1, &nullpin, NULL); + ok(hr == S_OK, "Failed to get next pin, hr %#x.\n", hr); IEnumPins_Release(nullenum); IPin_QueryDirection(nullpin, &dir); @@ -489,7 +491,9 @@ fail2: if (dir == PINDIR_OUTPUT) { PIN_INFO info; - IPin_QueryPinInfo(to, &info); + + hr = IPin_QueryPinInfo(to, &info); + ok(hr == S_OK, "Failed to query pin info, hr %#x.\n", hr); /* Release twice: Once normal, second from the * previous while loop -- 2.15.0

1 0

[PATCH] shell32: avoid a crash in testsuite
by Marcus Meissner 13 Nov '17

13 Nov '17

This happens on wow32 builds, we try to call a 64bit program via the generic typelib marshalling and disp is NULL. We still fail, just do not pop up the crash dialog. Signed-off-by: Marcus Meissner <meissner(a)suse.de> --- dlls/shell32/tests/shelldispatch.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 9825c3a4e9..92562650f3 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -1088,6 +1088,9 @@ todo_wine { IUnknown *unk; ok(disp != NULL, "got %p\n", disp); + + if (disp == NULL) goto skip_disp_tests; + ok(ret != HandleToUlong(hwnd), "got %d\n", ret); /* IDispatch-related tests */ @@ -1165,6 +1168,7 @@ if (hr == S_OK) { IServiceProvider_Release(sp); IDispatch_Release(disp); } +skip_disp_tests: disp = (void*)0xdeadbeef; ret = 0xdead; -- 2.15.0

2 1

[PATCH v2 1/2] include: Add roparameterizediid.idl
by Alex Henrie 13 Nov '17

13 Nov '17

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- v2: Added winrt pragma and removed inheritance from IUnknown. --- include/Makefile.in | 1 + include/roparameterizediid.idl | 93 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+) create mode 100644 include/roparameterizediid.idl diff --git a/include/Makefile.in b/include/Makefile.in index cc42f66ebd..d453dc8568 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -146,6 +146,7 @@ IDL_SRCS = \ pstore.idl \ qedit.idl \ richole.idl \ + roparameterizediid.idl \ row.idl \ rowchg.idl \ rowpos.idl \ diff --git a/include/roparameterizediid.idl b/include/roparameterizediid.idl new file mode 100644 index 0000000000..a975f884fb --- /dev/null +++ b/include/roparameterizediid.idl @@ -0,0 +1,93 @@ +/* + * Copyright 2017 Alex Henrie + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +typedef void *ROPARAMIIDHANDLE; + +[ + object +] +interface IRoSimpleMetaDataBuilder +{ + HRESULT SetDelegate( + GUID iid + ); + + HRESULT SetEnum( + const WCHAR *typename, + const WCHAR *basetype + ); + + HRESULT SetInterfaceGroupParameterizedDefault( + const WCHAR *typename, + UINT32 name_element_count, + const WCHAR **name_elements + ); + + HRESULT SetInterfaceGroupSimpleDefault( + const WCHAR *typename, + const WCHAR *default_name, + const GUID *default_iid + ); + + HRESULT SetParameterizedDelegate( + GUID iid, + UINT32 arg_count + ); + + HRESULT SetParameterizedInterface( + GUID iid, + UINT32 arg_count + ); + + HRESULT SetRuntimeClassParameterizedDefault( + GUID iid, + UINT32 name_element_count, + const WCHAR **name_elements + ); + + HRESULT SetRuntimeClassSimpleDefault( + const WCHAR *typename, + const WCHAR *default_name, + const GUID *default_iid + ); + + HRESULT SetStruct( + const WCHAR *typename, + UINT32 field_count, + const WCHAR **field_typenames + ); + + HRESULT SetWinRtInterface( + GUID iid + ); +} + +[ + object +] +interface IRoMetaDataLocator +{ + HRESULT Locate( + const WCHAR *typename, + IRoSimpleMetaDataBuilder *out + ); +} -- 2.15.0

1 0

[PATCH 1/2] include: Add roparameterizediid.idl
by Alex Henrie 13 Nov '17

13 Nov '17

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Microsoft only distributes the header file, so I wrote the IDL based on MSDN documentation. --- include/Makefile.in | 1 + include/roparameterizediid.idl | 91 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 92 insertions(+) create mode 100644 include/roparameterizediid.idl diff --git a/include/Makefile.in b/include/Makefile.in index cc42f66ebd..d453dc8568 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -146,6 +146,7 @@ IDL_SRCS = \ pstore.idl \ qedit.idl \ richole.idl \ + roparameterizediid.idl \ row.idl \ rowchg.idl \ rowpos.idl \ diff --git a/include/roparameterizediid.idl b/include/roparameterizediid.idl new file mode 100644 index 0000000000..5c3ffd7b5c --- /dev/null +++ b/include/roparameterizediid.idl @@ -0,0 +1,91 @@ +/* + * Copyright 2017 Alex Henrie + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "unknwn.idl"; + +typedef void *ROPARAMIIDHANDLE; + +[ + object +] +interface IRoSimpleMetaDataBuilder : IUnknown +{ + HRESULT SetDelegate( + GUID iid + ); + + HRESULT SetEnum( + const WCHAR *typename, + const WCHAR *basetype + ); + + HRESULT SetInterfaceGroupParameterizedDefault( + const WCHAR *typename, + UINT32 name_element_count, + const WCHAR **name_elements + ); + + HRESULT SetInterfaceGroupSimpleDefault( + const WCHAR *typename, + const WCHAR *default_name, + const GUID *default_iid + ); + + HRESULT SetParameterizedDelegate( + GUID iid, + UINT32 arg_count + ); + + HRESULT SetParameterizedInterface( + GUID iid, + UINT32 arg_count + ); + + HRESULT SetRuntimeClassParameterizedDefault( + GUID iid, + UINT32 name_element_count, + const WCHAR **name_elements + ); + + HRESULT SetRuntimeClassSimpleDefault( + const WCHAR *typename, + const WCHAR *default_name, + const GUID *default_iid + ); + + HRESULT SetStruct( + const WCHAR *typename, + UINT32 field_count, + const WCHAR **field_typenames + ); + + HRESULT SetWinRtInterface( + GUID iid + ); +} + +[ + object +] +interface IRoMetaDataLocator : IUnknown +{ + HRESULT Locate( + const WCHAR *typename, + IRoSimpleMetaDataBuilder *out + ); +} -- 2.15.0

2 3

[PATCH] msvcrt/tests: Rewrite clock() tests
by Piotr Caban 13 Nov '17

13 Nov '17

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/tests/time.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)

1 0

[PATCH] xaudio2: Add support for float formats with more than 2 channels.
by Kimmo Myllyvirta 13 Nov '17

13 Nov '17

Fixes https://bugs.winehq.org/show_bug.cgi?id=42414 See also http://openal.org/pipermail/openal/2014-December/000287.html

2 1

[PATCH] msxml3: deep-copy properties in attach_xmldoc
by Marcus Meissner 13 Nov '17

13 Nov '17

The 64bit msxml3:domdoc testcase always crash, the properties are freed twice. It seems this was due to attach_xmldoc not creating a copy of the properties, but using the same instance. Signed-off-by: Marcus Meissner <meissner(a)suse.de> --- dlls/msxml3/domdoc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index a40fac2106..12309e6e28 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -689,7 +689,7 @@ static HRESULT attach_xmldoc(domdoc *This, xmlDocPtr xml ) if(This->node.node) { xmldoc_add_ref(get_doc(This)); - priv_from_xmlDocPtr(get_doc(This))->properties = This->properties; + priv_from_xmlDocPtr(get_doc(This))->properties = copy_properties(This->properties); } return S_OK; -- 2.15.0

1 0

[PATCH] loader: Don't reserve heap range on ARM64
by André Hentschel 13 Nov '17

13 Nov '17

bug: 43946 Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- loader/preloader.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/loader/preloader.c b/loader/preloader.c index 5a4bb16..6736dd8 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -113,11 +113,18 @@ static struct wine_preload_info preload_info[] = { (void *)0x00010000, 0x00100000 }, /* DOS area */ { (void *)0x00110000, 0x67ef0000 }, /* low memory area */ { (void *)0x7f000000, 0x03000000 }, /* top-down allocations + shared heap + virtual heap */ -#else +#elif defined(__x86_64__) { (void *)0x000000010000, 0x00100000 }, /* DOS area */ { (void *)0x000000110000, 0x67ef0000 }, /* low memory area */ { (void *)0x00007ff00000, 0x000f0000 }, /* shared user data */ { (void *)0x7ffffe000000, 0x01ff0000 }, /* top-down allocations + virtual heap */ +#elif defined(__aarch64__) + { (void *)0x000000010000, 0x00100000 }, /* DOS area */ + { (void *)0x000000600000, 0x67ef0000 }, /* low memory area */ + { (void *)0x00007ff00000, 0x000f0000 }, /* shared user data */ + { (void *)0x7ffffe000000, 0x01ff0000 }, /* top-down allocations + virtual heap */ +#else +#error preloader not implemented for this CPU #endif { 0, 0 }, /* PE exe range set with WINEPRELOADRESERVE */ { 0, 0 } /* end of list */ -- 2.7.4

2 1

[PATCH] uxtheme: Return NULL file handle on OpenThemeFile() failure
by Nikolay Sivov 13 Nov '17

13 Nov '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/uxtheme/msstyles.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index 16cfbf5f07..e471c3cc0c 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -188,6 +188,7 @@ HRESULT MSSTYLES_OpenThemeFile(LPCWSTR lpThemeFile, LPCWSTR pszColorName, LPCWST return S_OK; invalid_theme: + *tf = NULL; if(hTheme) FreeLibrary(hTheme); return hr; } -- 2.15.0

1 0

[PATCH 5/5] user32/tests: Add a bunch of WS_EX_TOPMOST tests.
by Dmitry Timoshkov 13 Nov '17

13 Nov '17

The tests most of the time pass cleanly here under MATE environment, but sometimes there are intermittent failures (like in some other tests) without visible reason, and another 'make test' runs cleanly again. Alexandre, feel free to add/remove todo statements to make the tests pass in your WM. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/tests/win.c | 388 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 382 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index d9491f5ab7..3b64515241 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -9861,24 +9861,395 @@ static BOOL is_topmost(HWND hwnd) return (GetWindowLongA(hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST) != 0; } +static void pump_messages(void) +{ + MSG msg; + + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); +} + static void swp_after(HWND hwnd, HWND after) { BOOL ret; ret = SetWindowPos(hwnd, after, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); ok(ret, "SetWindowPos failed\n"); + + pump_messages(); } -static void test_topmost(HWND hwnd) +static void reset_window_state(HWND *state, int n) { - ok(!is_topmost(hwnd), "WS_EX_TOPMOST should not be set\n"); + int i; + + for (i = 0; i < n; i++) + { + if (state[i]) + { + swp_after(state[i], HWND_NOTOPMOST); + todo_wine_if(i == 5) /* FIXME: remove once Wine is fixed */ + ok(!is_topmost(state[i]), "%d: hwnd %p is still topmost\n", i, state[i]); + swp_after(state[i], HWND_TOP); + } + } +} + +static void test_topmost(void) +{ + HWND owner, hwnd, hwnd2, hwnd_child, hwnd_child2, hwnd_grandchild, state[6] = { 0 }; + BOOL is_wine = !strcmp(winetest_platform, "wine"); + + owner = create_tool_window(WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | + WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE, 0); + ok(owner != 0, "Failed to create owner window (%d)\n", GetLastError()); + + /* Give current thread foreground state otherwise the tests may fail. */ + if (!SetForegroundWindow(owner)) + { + DestroyWindow(owner); + skip("SetForegroundWindow not working\n"); + return; + } + + hwnd = create_tool_window(WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | + WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE, owner); + ok(hwnd != 0, "Failed to create popup window (%d)\n", GetLastError()); + hwnd2 = create_tool_window(WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | + WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE, owner); + ok(hwnd2 != 0, "Failed to create popup window (%d)\n", GetLastError()); + + pump_messages(); + + trace("owner %p, hwnd %p, hwnd2 %p\n", owner, hwnd, hwnd2); + state[0] = owner; + state[1] = hwnd; + state[2] = hwnd2; + + ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); + ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); + check_z_order(hwnd, 0, hwnd2, owner, FALSE); swp_after(hwnd, HWND_TOPMOST); - ok(is_topmost(hwnd), "WS_EX_TOPMOST should be set\n"); + ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); + ok(is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); + check_z_order(hwnd, hwnd2, 0, owner, TRUE); swp_after(hwnd, HWND_TOP); - ok(is_topmost(hwnd), "WS_EX_TOPMOST should be set\n"); + ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); + ok(is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); + check_z_order(hwnd, hwnd2, 0, owner, TRUE); + swp_after(hwnd, HWND_NOTOPMOST); + ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); + ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); + check_z_order(hwnd, hwnd2, 0, owner, FALSE); + reset_window_state(state, sizeof(state)/sizeof(state[0])); + + swp_after(hwnd, HWND_TOPMOST); + ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); + ok(is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); + check_z_order(hwnd, hwnd2, 0, owner, TRUE); + swp_after(hwnd2, hwnd); + ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); + ok(is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); + check_z_order(hwnd, hwnd2, 0, owner, TRUE); + swp_after(hwnd, hwnd2); + ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); + ok(is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); + check_z_order(hwnd, hwnd2, 0, owner, TRUE); + swp_after(hwnd2, HWND_TOP); + ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); + ok(is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); + check_z_order(hwnd, hwnd2, 0, owner, TRUE); + swp_after(owner, HWND_TOPMOST); +todo_wine + ok(is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); + ok(is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); +todo_wine + ok(is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); + swp_after(hwnd, HWND_NOTOPMOST); + ok(!is_topmost(owner) || broken(is_topmost(owner)) /*win7 64-bit*/, "hwnd %p topmost state is wrong\n", owner); + ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(!is_topmost(hwnd2) || broken(is_topmost(hwnd2)) /*win7 64-bit*/, "hwnd %p topmost state is wrong\n", hwnd2); + if (0) /*win7 64-bit is broken*/ + check_z_order(hwnd, hwnd2, 0, owner, FALSE); + swp_after(hwnd2, HWND_NOTOPMOST); + ok(!is_topmost(owner) || broken(is_topmost(owner)) /*win7 64-bit*/, "hwnd %p topmost state is wrong\n", owner); + ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); +if (!is_wine) /* FIXME: remove once Wine is fixed */ + check_z_order(hwnd, 0, hwnd2, owner, FALSE); + reset_window_state(state, sizeof(state)/sizeof(state[0])); + + swp_after(hwnd, HWND_TOPMOST); + ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); + ok(is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); + check_z_order(hwnd, hwnd2, 0, owner, TRUE); + swp_after(hwnd, HWND_BOTTOM); + ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); +todo_wine + ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); +if (!is_wine) /* FIXME: remove once Wine is fixed */ + check_z_order(hwnd, 0, hwnd2, owner, FALSE); + reset_window_state(state, sizeof(state)/sizeof(state[0])); + + swp_after(hwnd, HWND_TOPMOST); + ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); + ok(is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); + check_z_order(hwnd, hwnd2, 0, owner, TRUE); + swp_after(hwnd, hwnd2); + ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); +todo_wine + ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); +if (!is_wine) /* FIXME: remove once Wine is fixed */ + check_z_order(hwnd, 0, hwnd2, owner, FALSE); + /* FIXME: compensate todo_wine above */ + swp_after(hwnd, HWND_NOTOPMOST); + ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); + ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); +if (!is_wine) /* FIXME: remove once Wine is fixed */ + check_z_order(hwnd, 0, hwnd2, owner, FALSE); + reset_window_state(state, sizeof(state)/sizeof(state[0])); + + hwnd_child2 = create_tool_window(WS_VISIBLE|WS_POPUP, hwnd); + ok(hwnd_child2 != 0, "Failed to create popup window (%d)\n", GetLastError()); + hwnd_child = create_tool_window(WS_VISIBLE|WS_POPUP, hwnd); + ok(hwnd_child != 0, "Failed to create popup window (%d)\n", GetLastError()); + hwnd_grandchild = create_tool_window(WS_VISIBLE|WS_POPUP, hwnd_child); + ok(hwnd_grandchild != 0, "Failed to create popup window (%d)\n", GetLastError()); + + pump_messages(); + + trace("hwnd_child %p, hwnd_child2 %p, hwnd_grandchild %p\n", hwnd_child, hwnd_child2, hwnd_grandchild); + state[3] = hwnd_child2; + state[4] = hwnd_child; + state[5] = hwnd_grandchild; + + ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); + ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); + ok(!is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); + ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); + ok(!is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); +if (!is_wine) /* FIXME: remove once Wine is fixed */ + check_z_order(hwnd, hwnd2, 0, owner, FALSE); + check_z_order(hwnd_child, hwnd_child2, 0, hwnd, FALSE); + + swp_after(hwnd, HWND_TOPMOST); + ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); + ok(is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); +todo_wine + ok(is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); +todo_wine + ok(is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); +todo_wine + ok(is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); +if (!is_wine) /* FIXME: remove once Wine is fixed */ + check_z_order(hwnd, hwnd2, 0, owner, TRUE); +if (!is_wine) /* FIXME: remove once Wine is fixed */ + check_z_order(hwnd_child, hwnd_child2, 0, hwnd, TRUE); + swp_after(hwnd, HWND_NOTOPMOST); + ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); + ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(!is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); + ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); + ok(!is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); +if (!is_wine) /* FIXME: remove once Wine is fixed */ + check_z_order(hwnd, hwnd2, 0, owner, FALSE); + check_z_order(hwnd_child, hwnd_child2, 0, hwnd, FALSE); + reset_window_state(state, sizeof(state)/sizeof(state[0])); + + swp_after(hwnd, HWND_TOPMOST); + ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); +todo_wine + ok(is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); +todo_wine + ok(is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); +todo_wine + ok(is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); + ok(is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); +if (!is_wine) /* FIXME: remove once Wine is fixed */ + check_z_order(hwnd, hwnd2, 0, owner, TRUE); +if (!is_wine) /* FIXME: remove once Wine is fixed */ + check_z_order(hwnd_child, hwnd_child2, 0, hwnd, TRUE); + swp_after(hwnd_child, HWND_NOTOPMOST); + ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); + ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(!is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); + ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); +todo_wine + ok(!is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); + check_z_order(hwnd, hwnd2, 0, owner, FALSE); + check_z_order(hwnd_child, hwnd_child2, 0, hwnd, FALSE); + reset_window_state(state, sizeof(state)/sizeof(state[0])); + + swp_after(hwnd, HWND_TOPMOST); + ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); +todo_wine + ok(is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); +todo_wine + ok(is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); +todo_wine + ok(is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); + ok(is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); +if (!is_wine) /* FIXME: remove once Wine is fixed */ + check_z_order(hwnd, hwnd2, 0, owner, TRUE); +if (!is_wine) /* FIXME: remove once Wine is fixed */ + check_z_order(hwnd_child, hwnd_child2, 0, hwnd, TRUE); + swp_after(hwnd_grandchild, HWND_NOTOPMOST); + ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); + ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(!is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); + ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); +todo_wine + ok(!is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); + check_z_order(hwnd, hwnd2, 0, owner, FALSE); + check_z_order(hwnd_child, hwnd_child2, 0, hwnd, FALSE); + reset_window_state(state, sizeof(state)/sizeof(state[0])); + + swp_after(hwnd_child, HWND_TOPMOST); + ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); + ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); +todo_wine + ok(is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); + ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); + ok(is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); +if (!is_wine) /* FIXME: remove once Wine is fixed */ + check_z_order(hwnd, hwnd2, 0, owner, FALSE); +if (!is_wine) /* FIXME: remove once Wine is fixed */ + check_z_order(hwnd_child, hwnd_child2, 0, hwnd, TRUE); + swp_after(hwnd_child, HWND_TOP); + ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); + ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); +todo_wine + ok(is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); + ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); + ok(is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); +if (!is_wine) /* FIXME: remove once Wine is fixed */ + check_z_order(hwnd, hwnd2, 0, owner, FALSE); +if (!is_wine) /* FIXME: remove once Wine is fixed */ + check_z_order(hwnd_child, hwnd_child2, 0, hwnd, TRUE); + swp_after(hwnd, HWND_NOTOPMOST); + ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); + ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(!is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); + ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); +todo_wine + ok(!is_topmost(hwnd_grandchild) || broken(is_topmost(hwnd_grandchild))/*win2008 64-bit*/, "hwnd %p topmost state is wrong\n", hwnd_grandchild); +if (!is_wine) /* FIXME: remove once Wine is fixed */ + check_z_order(hwnd, hwnd2, 0, owner, FALSE); + check_z_order(hwnd_child, hwnd_child2, 0, hwnd, FALSE); + reset_window_state(state, sizeof(state)/sizeof(state[0])); + + swp_after(hwnd_child, HWND_TOPMOST); + ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); + ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); +todo_wine + ok(is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); + ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); + ok(is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); +if (!is_wine) /* FIXME: remove once Wine is fixed */ + check_z_order(hwnd, hwnd2, 0, owner, FALSE); +if (!is_wine) /* FIXME: remove once Wine is fixed */ + check_z_order(hwnd_child, hwnd_child2, 0, hwnd, TRUE); swp_after(hwnd, HWND_NOTOPMOST); - ok(!is_topmost(hwnd), "WS_EX_TOPMOST should not be set\n"); + ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); + ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(!is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); + ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); +todo_wine + ok(!is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); +if (!is_wine) /* FIXME: remove once Wine is fixed */ + check_z_order(hwnd, hwnd2, 0, owner, FALSE); + check_z_order(hwnd_child, hwnd_child2, 0, hwnd, FALSE); + reset_window_state(state, sizeof(state)/sizeof(state[0])); + + swp_after(hwnd_grandchild, HWND_TOPMOST); + ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); + ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(!is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); + ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); + ok(is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); +if (!is_wine) /* FIXME: remove once Wine is fixed */ + check_z_order(hwnd, hwnd2, 0, owner, FALSE); + check_z_order(hwnd_child, hwnd_child2, 0, hwnd, FALSE); + swp_after(hwnd_child2, HWND_NOTOPMOST); + ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); + ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(!is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); + ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); + ok(is_topmost(hwnd_grandchild) || broken(!is_topmost(hwnd_grandchild)) /* win8+ */, "hwnd %p topmost state is wrong\n", hwnd_grandchild); +if (!is_wine) /* FIXME: remove once Wine is fixed */ + check_z_order(hwnd, hwnd2, 0, owner, FALSE); +if (!is_wine) /* FIXME: remove once Wine is fixed */ + check_z_order(hwnd_child, 0, hwnd_child2, hwnd, FALSE); + reset_window_state(state, sizeof(state)/sizeof(state[0])); + + swp_after(hwnd_child, HWND_TOPMOST); + ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); + ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); +todo_wine + ok(is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); + ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); + ok(is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); +if (!is_wine) /* FIXME: remove once Wine is fixed */ + check_z_order(hwnd, hwnd2, 0, owner, FALSE); +if (!is_wine) /* FIXME: remove once Wine is fixed */ + check_z_order(hwnd_child, hwnd_child2, 0, hwnd, TRUE); + swp_after(hwnd_child, HWND_BOTTOM); + ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); + ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(!is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); + ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); +todo_wine + ok(!is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); +if (!is_wine) /* FIXME: remove once Wine is fixed */ + check_z_order(hwnd, 0, hwnd2, owner, FALSE); +if (!is_wine) /* FIXME: remove once Wine is fixed */ + check_z_order(hwnd_child, 0, hwnd_child2, hwnd, FALSE); + reset_window_state(state, sizeof(state)/sizeof(state[0])); + + swp_after(hwnd_child, HWND_TOPMOST); + ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); + ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); +todo_wine + ok(is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); + ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); + ok(is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); +if (!is_wine) /* FIXME: remove once Wine is fixed */ + check_z_order(hwnd, hwnd2, 0, owner, FALSE); +if (!is_wine) /* FIXME: remove once Wine is fixed */ + check_z_order(hwnd_child, hwnd_child2, 0, hwnd, TRUE); + swp_after(hwnd_child, hwnd_child2); + ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); + ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(!is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); + ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); +todo_wine + ok(!is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); +if (!is_wine) /* FIXME: remove once Wine is fixed */ + check_z_order(hwnd, hwnd2, 0, owner, FALSE); +if (!is_wine) /* FIXME: remove once Wine is fixed */ + check_z_order(hwnd_child, 0, hwnd_child2, hwnd, FALSE); + reset_window_state(state, sizeof(state)/sizeof(state[0])); + + DestroyWindow(hwnd_grandchild); + DestroyWindow(hwnd_child); + DestroyWindow(hwnd_child2); + DestroyWindow(hwnd); + DestroyWindow(hwnd2); + DestroyWindow(owner); } START_TEST(win) @@ -9958,7 +10329,6 @@ START_TEST(win) our_pid = GetWindowThreadProcessId(hwndMain, NULL); /* Add the tests below this line */ - test_topmost(hwndMain); test_child_window_from_point(); test_window_from_point(argv[0]); test_thick_child_size(hwndMain); @@ -10037,4 +10407,10 @@ START_TEST(win) DestroyWindow(hwndMain2); DestroyWindow(hwndMain); + + /* Make sure that following tests are executed last, under Windows they + * tend to break the tests which are sensitive to z-order and activation + * state of hwndMain and hwndMain2 windows. + */ + test_topmost(); } -- 2.15.0

1 0

[PATCH 4/5] user32/tests: Make WS_EX_TOPMOST tests more generic.
by Dmitry Timoshkov 13 Nov '17

13 Nov '17

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/tests/win.c | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index fdfdf9215a..d9491f5ab7 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -9856,20 +9856,29 @@ static void test_desktop( void ) } } -static void test_topmost(HWND hwnd) +static BOOL is_topmost(HWND hwnd) +{ + return (GetWindowLongA(hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST) != 0; +} + +static void swp_after(HWND hwnd, HWND after) { BOOL ret; - ok(!(GetWindowLongA(hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST), "WS_EX_TOPMOST should not be set\n"); - ret = SetWindowPos(hwnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); - ok(ret, "Got %d\n", ret); - ok(GetWindowLongA(hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST, "WS_EX_TOPMOST should be set\n"); - ret = SetWindowPos(hwnd, HWND_TOP, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); - ok(ret, "Got %d\n", ret); - ok(GetWindowLongA(hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST, "WS_EX_TOPMOST should be set\n"); - ret = SetWindowPos(hwnd, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); - ok(ret, "Got %d\n", ret); - ok(!(GetWindowLongA(hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST), "WS_EX_TOPMOST should not be set\n"); + ret = SetWindowPos(hwnd, after, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); + ok(ret, "SetWindowPos failed\n"); +} + +static void test_topmost(HWND hwnd) +{ + ok(!is_topmost(hwnd), "WS_EX_TOPMOST should not be set\n"); + + swp_after(hwnd, HWND_TOPMOST); + ok(is_topmost(hwnd), "WS_EX_TOPMOST should be set\n"); + swp_after(hwnd, HWND_TOP); + ok(is_topmost(hwnd), "WS_EX_TOPMOST should be set\n"); + swp_after(hwnd, HWND_NOTOPMOST); + ok(!is_topmost(hwnd), "WS_EX_TOPMOST should not be set\n"); } START_TEST(win) -- 2.15.0

1 0

[PATCH 3/5] user32/tests: Separate WS_EX_TOPMOST tests from SetWindowPos ones.
by Dmitry Timoshkov 13 Nov '17

13 Nov '17

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/tests/win.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 992fbf4979..fdfdf9215a 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2573,17 +2573,6 @@ static void test_SetWindowPos(HWND hwnd, HWND hwnd2) orig_win_rc.right, orig_win_rc.bottom, 0); ok(ret, "Got %d\n", ret); - ok(!(GetWindowLongA(hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST), "WS_EX_TOPMOST should not be set\n"); - ret = SetWindowPos(hwnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); - ok(ret, "Got %d\n", ret); - ok(GetWindowLongA(hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST, "WS_EX_TOPMOST should be set\n"); - ret = SetWindowPos(hwnd, HWND_TOP, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); - ok(ret, "Got %d\n", ret); - ok(GetWindowLongA(hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST, "WS_EX_TOPMOST should be set\n"); - ret = SetWindowPos(hwnd, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); - ok(ret, "Got %d\n", ret); - ok(!(GetWindowLongA(hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST), "WS_EX_TOPMOST should not be set\n"); - hwnd_desktop = GetDesktopWindow(); ok(!!hwnd_desktop, "Failed to get hwnd_desktop window (%d).\n", GetLastError()); hwnd_child = create_tool_window(WS_VISIBLE|WS_CHILD, hwnd); @@ -9867,6 +9856,22 @@ static void test_desktop( void ) } } +static void test_topmost(HWND hwnd) +{ + BOOL ret; + + ok(!(GetWindowLongA(hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST), "WS_EX_TOPMOST should not be set\n"); + ret = SetWindowPos(hwnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); + ok(ret, "Got %d\n", ret); + ok(GetWindowLongA(hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST, "WS_EX_TOPMOST should be set\n"); + ret = SetWindowPos(hwnd, HWND_TOP, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); + ok(ret, "Got %d\n", ret); + ok(GetWindowLongA(hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST, "WS_EX_TOPMOST should be set\n"); + ret = SetWindowPos(hwnd, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); + ok(ret, "Got %d\n", ret); + ok(!(GetWindowLongA(hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST), "WS_EX_TOPMOST should not be set\n"); +} + START_TEST(win) { char **argv; @@ -9944,6 +9949,7 @@ START_TEST(win) our_pid = GetWindowThreadProcessId(hwndMain, NULL); /* Add the tests below this line */ + test_topmost(hwndMain); test_child_window_from_point(); test_window_from_point(argv[0]); test_thick_child_size(hwndMain); -- 2.15.0

1 0

[PATCH 2/5] user32/tests: Fix test failures under Windows.
by Dmitry Timoshkov 13 Nov '17

13 Nov '17

Without SetForegroundWindow() these tests fail in some testbot runs. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/tests/win.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index eace140388..992fbf4979 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2909,6 +2909,13 @@ static void test_popup_zorder(HWND hwnd_D, HWND hwnd_E, DWORD style) { HWND hwnd_A, hwnd_B, hwnd_C, hwnd_F; + /* Give current thread foreground state otherwise the tests may fail. */ + if (!SetForegroundWindow(hwnd_D)) + { + skip("SetForegroundWindow not working\n"); + return; + } + trace("hwnd_D %p, hwnd_E %p\n", hwnd_D, hwnd_E); SetWindowPos(hwnd_E, hwnd_D, 0,0,0,0, SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE); -- 2.15.0

1 0

[PATCH 1/5] user32/tests: Don't leave a stray test window behind.
by Dmitry Timoshkov 13 Nov '17

13 Nov '17

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/tests/win.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index feca2bee51..eace140388 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -4932,6 +4932,7 @@ static void test_dialog_parent(void) ok(!IsWindowEnabled(other), "other is enabled\n"); EnableWindow(other, TRUE); + DestroyWindow(other); DestroyWindow(parent); } -- 2.15.0

1 0

[PATCH] riched20: Protect against pasting multi-line text in single-line control.
by Rafał Harabień 13 Nov '17

13 Nov '17

Signed-off-by: Rafał Harabień <rafalh1992(a)o2.pl> --- dlls/riched20/caret.c | 4 ++++ dlls/riched20/tests/editor.c | 14 ++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 26af743..8a99394 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -551,6 +551,10 @@ void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, ME_DisplayItem *tp, *end_run, *run, *prev; int eol_len = 0; + /* Check if new line is allowed for this control */ + if (!(editor->styleFlags & ES_MULTILINE)) + break; + /* Find number of CR and LF in end of paragraph run */ if (*pos =='\r') { diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index a19ec85..d5fd8c0 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -70,6 +70,10 @@ static HWND new_richedit(HWND parent) { return new_window(RICHEDIT_CLASS20A, ES_MULTILINE, parent); } +static HWND new_richedit_with_style(HWND parent, DWORD style) { + return new_window(RICHEDIT_CLASS20A, style, parent); +} + static HWND new_richeditW(HWND parent) { return new_windowW(RICHEDIT_CLASS20W, ES_MULTILINE, parent); } @@ -5509,10 +5513,20 @@ static void test_WM_PASTE(void) /* Cut from read-only control */ SendMessageA(hwndRichEdit, EM_SETSEL, 0, -1); SendMessageA(hwndRichEdit, WM_CUT, 0, 0); + SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); result = strcmp(buffer,"cut\r\n"); ok(result == 0, "test paste: strcmp = %i, actual = '%s'\n", result, buffer); + OleFlushClipboard(); /* flush is needed because of broken OleClipboard implementation */ + DestroyWindow(hwndRichEdit); + /* Paste multi-line text into single-line control */ + hwndRichEdit = new_richedit_with_style(NULL, 0); + SendMessageA(hwndRichEdit, WM_PASTE, 0, 0); + SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); + result = strcmp(buffer,"cut"); + ok(result == 0, + "test paste: strcmp = %i, actual = '%s'\n", result, buffer); DestroyWindow(hwndRichEdit); } -- 2.7.4

2 1

[PATCH v2] winex11.drv: Preserve last error in x11drv_thread_data().
by Rafał Harabień 13 Nov '17

13 Nov '17

Issue was caused by TlsGetValue always resetting error to ERROR_SUCCESS. This change fixes GetCursorPos resetting last-error randomly. Signed-off-by: Rafał Harabień <rafalh1992(a)o2.pl> --- dlls/user32/tests/input.c | 10 +++++++++- dlls/winex11.drv/x11drv.h | 7 ++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 8f2576d..0b72835 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1928,8 +1928,16 @@ static void test_Input_mouse(void) DWORD thread_id; POINT pt, pt_org; MSG msg; + BOOL ret; - GetCursorPos(&pt_org); + SetLastError(0xdeadbeef); + ret = GetCursorPos(NULL); + ok(!ret, "GetCursorPos succeed\n"); + ok(GetLastError() == 0xdeadbeef || GetLastError() == ERROR_NOACCESS, "error %lu\n", GetLastError()); + + ret = GetCursorPos(&pt_org); + ok(ret, "GetCursorPos failed\n"); + ok(GetLastError() == 0xdeadbeef, "error %lu\n", GetLastError()); button_win = CreateWindowA("button", "button", WS_VISIBLE | WS_POPUP, 100, 100, 100, 100, 0, NULL, NULL, NULL); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 721c082..6786a08 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -345,7 +345,12 @@ extern DWORD thread_data_tls_index DECLSPEC_HIDDEN; static inline struct x11drv_thread_data *x11drv_thread_data(void) { - return TlsGetValue( thread_data_tls_index ); + /* TlsGetValue always resets last error */ + unsigned long err = GetLastError(); + struct x11drv_thread_data *data = TlsGetValue( thread_data_tls_index ); + if (err != ERROR_SUCCESS && GetLastError() == ERROR_SUCCESS) + SetLastError(err); + return data; } /* retrieve the thread display, or NULL if not created yet */ -- 2.7.4

1 0

Re: [PATCH 1/4] winex11.drv: Preserve last error in x11drv_thread_data().
by Marvin 13 Nov '17

13 Nov '17

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=34115 Your paranoid android. === wvistau64 (32 bit input) === input.c:1936: Test failed: error 998 input.c:1940: Test failed: error 998 === w2008s64 (32 bit input) === input.c:1936: Test failed: error 998 input.c:1940: Test failed: error 998 === w7u (32 bit input) === input.c:1936: Test failed: error 998 input.c:1940: Test failed: error 998 === w7pro64 (32 bit input) === input.c:1936: Test failed: error 998 input.c:1940: Test failed: error 998 === w8 (32 bit input) === input.c:1936: Test failed: error 998 input.c:1940: Test failed: error 998 === w864 (32 bit input) === input.c:1936: Test failed: error 998 input.c:1940: Test failed: error 998 === w1064 (32 bit input) === input.c:1936: Test failed: error 998 input.c:1940: Test failed: error 998 === wvistau64 (64 bit input) === input.c:1936: Test failed: error 998 input.c:1940: Test failed: error 998 === w2008s64 (64 bit input) === input.c:1936: Test failed: error 998 input.c:1940: Test failed: error 998 === w7pro64 (64 bit input) === input.c:1936: Test failed: error 998 input.c:1940: Test failed: error 998 === w864 (64 bit input) === input.c:1936: Test failed: error 998 input.c:1940: Test failed: error 998 === w1064 (64 bit input) === input.c:1936: Test failed: error 998 input.c:1940: Test failed: error 998

1 0

[PATCH 1/4] winex11.drv: Preserve last error in x11drv_thread_data().
by Rafał Harabień 12 Nov '17

12 Nov '17

Issue was caused by TlsGetValue always resetting error to ERROR_SUCCESS. This change fixes GetCursorPos resetting last-error randomly. Signed-off-by: Rafał Harabień <rafalh1992(a)o2.pl> --- dlls/user32/tests/input.c | 10 +++++++++- dlls/winex11.drv/x11drv.h | 7 ++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 8f2576d..0f0f137 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1928,8 +1928,16 @@ static void test_Input_mouse(void) DWORD thread_id; POINT pt, pt_org; MSG msg; + BOOL ret; - GetCursorPos(&pt_org); + SetLastError(0xdeadbeef); + ret = GetCursorPos(NULL); + ok(!ret, "GetCursorPos succeed\n"); + ok(GetLastError() == 0xdeadbeef, "error %lu\n", GetLastError()); + + ret = GetCursorPos(&pt_org); + ok(ret, "GetCursorPos failed\n"); + ok(GetLastError() == 0xdeadbeef, "error %lu\n", GetLastError()); button_win = CreateWindowA("button", "button", WS_VISIBLE | WS_POPUP, 100, 100, 100, 100, 0, NULL, NULL, NULL); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 721c082..6786a08 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -345,7 +345,12 @@ extern DWORD thread_data_tls_index DECLSPEC_HIDDEN; static inline struct x11drv_thread_data *x11drv_thread_data(void) { - return TlsGetValue( thread_data_tls_index ); + /* TlsGetValue always resets last error */ + unsigned long err = GetLastError(); + struct x11drv_thread_data *data = TlsGetValue( thread_data_tls_index ); + if (err != ERROR_SUCCESS && GetLastError() == ERROR_SUCCESS) + SetLastError(err); + return data; } /* retrieve the thread display, or NULL if not created yet */ -- 2.7.4

1 3

[PATCH] ws2_32: avoid crashes on flaky/non-present network
by Marcus Meissner 12 Nov '17

12 Nov '17

Signed-off-by: Marcus Meissner <meissner(a)suse.de> --- dlls/ws2_32/tests/sock.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 179ace4c6a..cefc62326e 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7657,10 +7657,12 @@ static void test_GetAddrInfoExW(void) ok(overlapped.Internal == ERROR_SUCCESS, "overlapped.Internal = %lx\n", overlapped.Internal); ok(overlapped.Pointer == &result, "overlapped.Pointer != &result\n"); ok(result != NULL, "result == NULL\n"); - ok(!result->ai_blob, "ai_blob != NULL\n"); - ok(!result->ai_bloblen, "ai_bloblen != 0\n"); - ok(!result->ai_provider, "ai_provider = %s\n", wine_dbgstr_guid(result->ai_provider)); - pFreeAddrInfoExW(result); + if (result != NULL) { + ok(!result->ai_blob, "ai_blob != NULL\n"); + ok(!result->ai_bloblen, "ai_bloblen != 0\n"); + ok(!result->ai_provider, "ai_provider = %s\n", wine_dbgstr_guid(result->ai_provider)); + pFreeAddrInfoExW(result); + } result = (void*)0xdeadbeef; memset(&overlapped, 0xcc, sizeof(overlapped)); -- 2.15.0

1 0

[PATCH] gdi32: change negative values in OS2 struct to 0
by Marcus Meissner 12 Nov '17

12 Nov '17

fixes gdiplus:font testcase with Goha-Tibeb Zemen font. Signed-off-by: Marcus Meissner <meissner(a)suse.de> --- dlls/gdi32/freetype.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 346e21dc21..0e85f98169 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -7928,8 +7928,26 @@ static BOOL get_outline_text_metrics(GdiFont *font) font->potm->otmAscent = SCALE_Y(pOS2->sTypoAscender); font->potm->otmDescent = SCALE_Y(pOS2->sTypoDescender); font->potm->otmLineGap = SCALE_Y(pOS2->sTypoLineGap); - font->potm->otmsCapEmHeight = SCALE_Y(pOS2->sCapHeight); - font->potm->otmsXHeight = SCALE_Y(pOS2->sxHeight); + /* There is one font which has 0x8000 in it, which would be -32768 and not map + * to an unsigned integer */ + if (pOS2->sCapHeight < 0) + { + font->potm->otmsCapEmHeight = 0; + WARN("%s sCapHeight=%d\n",debugstr_w(font->name), pOS2->sCapHeight); + } + else + { + font->potm->otmsCapEmHeight = SCALE_Y(pOS2->sCapHeight); + } + if (pOS2->sxHeight < 0) + { + font->potm->otmsXHeight = 0; + WARN("%s sxHeight=%d\n",debugstr_w(font->name), pOS2->sxHeight); + } + else + { + font->potm->otmsXHeight = SCALE_Y(pOS2->sxHeight); + } font->potm->otmrcFontBox.left = SCALE_X(ft_face->bbox.xMin); font->potm->otmrcFontBox.right = SCALE_X(ft_face->bbox.xMax); font->potm->otmrcFontBox.top = SCALE_Y(ft_face->bbox.yMax); -- 2.15.0

2 1

[PATCH] V3 msvcrt : add arm implementation for _control87
by Vijay Kiran Kamuju 12 Nov '17

12 Nov '17

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/msvcrt/math.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index b7288cf6cf..9b4298c89f 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1233,6 +1233,48 @@ unsigned int CDECL _control87(unsigned int newval, unsigned int mask) if ((x86_cw ^ sse2_cw) & (MSVCRT__MCW_EM | MSVCRT__MCW_RC)) x86_cw |= MSVCRT__EM_AMBIGUOUS; return x86_cw; +#elif defined(__arm__) + unsigned long fpword; + unsigned int flags = 0; + + __asm__ __volatile__( "vmrs %0, fpscr" : "=r" (fpword) ); + if (fpword & 0x1) flags |= MSVCRT__EM_INVALID; + if (fpword & 0x2) flags |= MSVCRT__EM_ZERODIVIDE; + if (fpword & 0x4) flags |= MSVCRT__EM_OVERFLOW; + if (fpword & 0x8) flags |= MSVCRT__EM_UNDERFLOW; + if (fpword & 0x10) flags |= MSVCRT__EM_INEXACT; + if (fpword & 0x80) flags |= MSVCRT__EM_DENORMAL; + switch (fpword & 0xc00000) + { + case 0xc00000: flags |= MSVCRT__RC_UP|MSVCRT__RC_DOWN; break; + case 0x800000: flags |= MSVCRT__RC_DOWN; break; + case 0x400000: flags |= MSVCRT__RC_UP; break; + } + if (fpword & 0x1000000) flags |= MSVCRT__DN_FLUSH; + + TRACE( "arm flags=%08x newval=%08x mask=%08x\n", flags, newval, mask ); + if (mask) + { + flags = (flags & ~mask) | (newval & mask); + + /* Convert (masked) value back to fp word */ + fpword = 0; + if (flags & MSVCRT__EM_INVALID) fpword |= 0x1; + if (flags & MSVCRT__EM_ZERODIVIDE) fpword |= 0x2; + if (flags & MSVCRT__EM_OVERFLOW) fpword |= 0x4; + if (flags & MSVCRT__EM_UNDERFLOW) fpword |= 0x8; + if (flags & MSVCRT__EM_INEXACT) fpword |= 0x10; + if (flags & MSVCRT__EM_DENORMAL) fpword |= 0x80; + switch (flags & MSVCRT__MCW_RC) + { + case MSVCRT__RC_UP|MSVCRT__RC_DOWN: fpword |= 0xc00000; break; + case MSVCRT__RC_DOWN: fpword |= 0x800000; break; + case MSVCRT__RC_UP: fpword |= 0x200000; break; + } + if (flags & MSVCRT__DN_FLUSH) fpword |= 0x1000000; + __asm__ __volatile__( "vmsr fpscr, %0" : : "r" (fpword) ); + } + return flags; #else FIXME( "not implemented\n" ); return 0; -- 2.15.0

1 0

[PATCH] V2 msvcrt : add arm implementation for _control87
by Vijay Kiran Kamuju 12 Nov '17

12 Nov '17

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/msvcrt/math.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index b7288cf6cf..9b4298c89f 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1233,6 +1233,48 @@ unsigned int CDECL _control87(unsigned int newval, unsigned int mask) if ((x86_cw ^ sse2_cw) & (MSVCRT__MCW_EM | MSVCRT__MCW_RC)) x86_cw |= MSVCRT__EM_AMBIGUOUS; return x86_cw; +#elif defined(__arm__) + unsigned long fpword; + unsigned int flags = 0; + + __asm__ __volatile__( "vmrs %0, fpscr" : "=r" (fpword) ); + if (fpword & 0x1) flags |= MSVCRT__EM_INVALID; + if (fpword & 0x2) flags |= MSVCRT__EM_ZERODIVIDE; + if (fpword & 0x4) flags |= MSVCRT__EM_OVERFLOW; + if (fpword & 0x8) flags |= MSVCRT__EM_UNDERFLOW; + if (fpword & 0x10) flags |= MSVCRT__EM_INEXACT; + if (fpword & 0x40) flags |= MSVCRT__EM_DENORMAL; + switch (fpword & 0xc00000) + { + case 0xc00000: flags |= MSVCRT__RC_UP|MSVCRT__RC_DOWN; break; + case 0x800000: flags |= MSVCRT__RC_DOWN; break; + case 0x400000: flags |= MSVCRT__RC_UP; break; + } + if (fpword & 0x1000000) flags |= MSVCRT__DN_FLUSH; + + TRACE( "arm flags=%08x newval=%08x mask=%08x\n", flags, newval, mask ); + if (mask) + { + flags = (flags & ~mask) | (newval & mask); + + /* Convert (masked) value back to fp word */ + fpword = 0; + if (flags & MSVCRT__EM_INVALID) fpword |= 0x1; + if (flags & MSVCRT__EM_ZERODIVIDE) fpword |= 0x2; + if (flags & MSVCRT__EM_OVERFLOW) fpword |= 0x4; + if (flags & MSVCRT__EM_UNDERFLOW) fpword |= 0x8; + if (flags & MSVCRT__EM_INEXACT) fpword |= 0x10; + if (flags & MSVCRT__EM_DENORMAL) fpword |= 0x40; + switch (flags & MSVCRT__MCW_RC) + { + case MSVCRT__RC_UP|MSVCRT__RC_DOWN: fpword |= 0xc00000; break; + case MSVCRT__RC_DOWN: fpword |= 0x800000; break; + case MSVCRT__RC_UP: fpword |= 0x200000; break; + } + if (flags & MSVCRT__DN_FLUSH) fpword |= 0x1000000; + __asm__ __volatile__( "vmsr fpscr, %0" : : "r" (fpword) ); + } + return flags; #else FIXME( "not implemented\n" ); return 0; -- 2.15.0

1 0

[PATCH 1/2] user32/tests: Test manually setting WS_VSCROLL on combobox listbox
by Fabian Maurer 11 Nov '17

11 Nov '17

A test to narrow down the problem from Bug 43465 wrong. Proves my hack I attached there wrong. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/user32/tests/combo.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/dlls/user32/tests/combo.c b/dlls/user32/tests/combo.c index 03fc412e41..0519ace51c 100644 --- a/dlls/user32/tests/combo.c +++ b/dlls/user32/tests/combo.c @@ -806,11 +806,54 @@ static void test_listbox_size(DWORD style) } } +void test_WS_VSCROLL(void) +{ + BOOL (WINAPI *pGetComboBoxInfo)(HWND, PCOMBOBOXINFO); + HWND hCombo, hList; + COMBOBOXINFO info; + DWORD style; + BOOL ret; + int i; + + pGetComboBoxInfo = (void *)GetProcAddress(GetModuleHandleA("user32.dll"), "GetComboBoxInfo"); + if (!pGetComboBoxInfo) + { + win_skip("GetComboBoxInfo is not available\n"); + return; + } + info.cbSize = sizeof(info); + hCombo = build_combo(CBS_DROPDOWNLIST); + + SetLastError(0xdeadbeef); + ret = pGetComboBoxInfo(hCombo, &info); + ok(ret, "Failed to get COMBOBOXINFO structure; LastError: %u\n", GetLastError()); + hList = info.hwndList; + + for(i = 0; i < 3; i++) + { + char buffer[2]; + sprintf(buffer, "%d", i); + SendMessageA(hCombo, CB_ADDSTRING, 0, (LPARAM)buffer); + } + + style = GetWindowLongA(info.hwndList, GWL_STYLE); + SetWindowLongA(hList, GWL_STYLE, style | WS_VSCROLL); + + SendMessageA(hCombo, CB_SHOWDROPDOWN, TRUE, 0); + SendMessageA(hCombo, CB_SHOWDROPDOWN, FALSE, 0); + + style = GetWindowLongA(hList, GWL_STYLE); + ok((style & WS_VSCROLL) != 0, "Style does not include WS_VSCROLL\n"); + + DestroyWindow(hCombo); +} + START_TEST(combo) { hMainWnd = CreateWindowA("static", "Test", WS_OVERLAPPEDWINDOW, 10, 10, 300, 300, NULL, NULL, NULL, 0); ShowWindow(hMainWnd, SW_SHOW); + test_WS_VSCROLL(); test_setfont(CBS_DROPDOWN); test_setfont(CBS_DROPDOWNLIST); test_setitemheight(CBS_DROPDOWN); -- 2.15.0

1 1

[PATCH] V2 msvcrt : add arm implementation for _control87
by Vijay Kiran Kamuju 11 Nov '17

11 Nov '17

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/msvcrt/math.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index b7288cf6cf..9b4298c89f 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1233,6 +1233,48 @@ unsigned int CDECL _control87(unsigned int newval, unsigned int mask) if ((x86_cw ^ sse2_cw) & (MSVCRT__MCW_EM | MSVCRT__MCW_RC)) x86_cw |= MSVCRT__EM_AMBIGUOUS; return x86_cw; +#elif defined(__arm__) + unsigned long fpword; + unsigned int flags = 0; + + __asm__ __volatile__( "vmrs %0, fpscr" : "=r" (fpword) ); + if (fpword & 0x1) flags |= MSVCRT__EM_INVALID; + if (fpword & 0x2) flags |= MSVCRT__EM_ZERODIVIDE; + if (fpword & 0x4) flags |= MSVCRT__EM_OVERFLOW; + if (fpword & 0x8) flags |= MSVCRT__EM_UNDERFLOW; + if (fpword & 0x10) flags |= MSVCRT__EM_INEXACT; + if (fpword & 0x40) flags |= MSVCRT__EM_DENORMAL; + switch (fpword & 0xc00000) + { + case 0xc00000: flags |= MSVCRT__RC_UP|MSVCRT__RC_DOWN; break; + case 0x800000: flags |= MSVCRT__RC_DOWN; break; + case 0x400000: flags |= MSVCRT__RC_UP; break; + } + if (fpword & 0x1000000) flags |= MSVCRT__DN_FLUSH; + + TRACE( "arm flags=%08x newval=%08x mask=%08x\n", flags, newval, mask ); + if (mask) + { + flags = (flags & ~mask) | (newval & mask); + + /* Convert (masked) value back to fp word */ + fpword = 0; + if (flags & MSVCRT__EM_INVALID) fpword |= 0x1; + if (flags & MSVCRT__EM_ZERODIVIDE) fpword |= 0x2; + if (flags & MSVCRT__EM_OVERFLOW) fpword |= 0x4; + if (flags & MSVCRT__EM_UNDERFLOW) fpword |= 0x8; + if (flags & MSVCRT__EM_INEXACT) fpword |= 0x10; + if (flags & MSVCRT__EM_DENORMAL) fpword |= 0x40; + switch (flags & MSVCRT__MCW_RC) + { + case MSVCRT__RC_UP|MSVCRT__RC_DOWN: fpword |= 0xc00000; break; + case MSVCRT__RC_DOWN: fpword |= 0x800000; break; + case MSVCRT__RC_UP: fpword |= 0x200000; break; + } + if (flags & MSVCRT__DN_FLUSH) fpword |= 0x1000000; + __asm__ __volatile__( "vmsr fpscr, %0" : : "r" (fpword) ); + } + return flags; #else FIXME( "not implemented\n" ); return 0; -- 2.15.0

1 0

[PATCH] msvcrt : add arm implementation for _control87
by Vijay Kiran Kamuju 11 Nov '17

11 Nov '17

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/msvcrt/math.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index b7288cf6cf..a5967b7b6c 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1233,6 +1233,48 @@ unsigned int CDECL _control87(unsigned int newval, unsigned int mask) if ((x86_cw ^ sse2_cw) & (MSVCRT__MCW_EM | MSVCRT__MCW_RC)) x86_cw |= MSVCRT__EM_AMBIGUOUS; return x86_cw; +#elif defined(__arm__) + unsigned long fpword; + unsigned int flags = 0; + + __asm__ __volatile__( "vmrs %0, fpscr" : "=r" (fpword) ); + if (fpword & 0x1) flags |= MSVCRT__EM_INVALID; + if (fpword & 0x2) flags |= MSVCRT__EM_ZERODIVIDE; + if (fpword & 0x4) flags |= MSVCRT__EM_OVERFLOW; + if (fpword & 0x8) flags |= MSVCRT__EM_UNDERFLOW; + if (fpword & 0x10) flags |= MSVCRT__EM_INEXACT; + if (fpword & 0x40) flags |= MSVCRT__EM_DENORMAL; + switch (fpword & 0x60000) + { + case 0x60000: flags |= MSVCRT__RC_UP|MSVCRT__RC_DOWN; break; + case 0x40000: flags |= MSVCRT__RC_DOWN; break; + case 0x20000: flags |= MSVCRT__RC_UP; break; + } + if (fpword & 0x80000) flags |= MSVCRT__DN_FLUSH; + + TRACE( "arm flags=%08x newval=%08x mask=%08x\n", flags, newval, mask ); + if (mask) + { + flags = (flags & ~mask) | (newval & mask); + + /* Convert (masked) value back to fp word */ + fpword = 0; + if (flags & MSVCRT__EM_INVALID) fpword |= 0x1; + if (flags & MSVCRT__EM_ZERODIVIDE) fpword |= 0x2; + if (flags & MSVCRT__EM_OVERFLOW) fpword |= 0x4; + if (flags & MSVCRT__EM_UNDERFLOW) fpword |= 0x8; + if (flags & MSVCRT__EM_INEXACT) fpword |= 0x10; + if (flags & MSVCRT__EM_DENORMAL) fpword |= 0x40; + switch (flags & MSVCRT__MCW_RC) + { + case MSVCRT__RC_UP|MSVCRT__RC_DOWN: fpword |= 0x60000; break; + case MSVCRT__RC_DOWN: fpword |= 0x40000; break; + case MSVCRT__RC_UP: fpword |= 0x20000; break; + } + if (flags & MSVCRT__DN_FLUSH) fpword |= 0x80000; + __asm__ __volatile__( "vmsr fpscr, %0" : : "r" (fpword) ); + } + return flags; #else FIXME( "not implemented\n" ); return 0; -- 2.15.0

1 0

[PATCH] msvcrt : add arm implementation for _control87
by Vijay Kiran Kamuju 11 Nov '17

11 Nov '17

--- dlls/msvcrt/math.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index b7288cf6cf..a5967b7b6c 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1233,6 +1233,48 @@ unsigned int CDECL _control87(unsigned int newval, unsigned int mask) if ((x86_cw ^ sse2_cw) & (MSVCRT__MCW_EM | MSVCRT__MCW_RC)) x86_cw |= MSVCRT__EM_AMBIGUOUS; return x86_cw; +#elif defined(__arm__) + unsigned long fpword; + unsigned int flags = 0; + + __asm__ __volatile__( "vmrs %0, fpscr" : "=r" (fpword) ); + if (fpword & 0x1) flags |= MSVCRT__EM_INVALID; + if (fpword & 0x2) flags |= MSVCRT__EM_ZERODIVIDE; + if (fpword & 0x4) flags |= MSVCRT__EM_OVERFLOW; + if (fpword & 0x8) flags |= MSVCRT__EM_UNDERFLOW; + if (fpword & 0x10) flags |= MSVCRT__EM_INEXACT; + if (fpword & 0x40) flags |= MSVCRT__EM_DENORMAL; + switch (fpword & 0x60000) + { + case 0x60000: flags |= MSVCRT__RC_UP|MSVCRT__RC_DOWN; break; + case 0x40000: flags |= MSVCRT__RC_DOWN; break; + case 0x20000: flags |= MSVCRT__RC_UP; break; + } + if (fpword & 0x80000) flags |= MSVCRT__DN_FLUSH; + + TRACE( "arm flags=%08x newval=%08x mask=%08x\n", flags, newval, mask ); + if (mask) + { + flags = (flags & ~mask) | (newval & mask); + + /* Convert (masked) value back to fp word */ + fpword = 0; + if (flags & MSVCRT__EM_INVALID) fpword |= 0x1; + if (flags & MSVCRT__EM_ZERODIVIDE) fpword |= 0x2; + if (flags & MSVCRT__EM_OVERFLOW) fpword |= 0x4; + if (flags & MSVCRT__EM_UNDERFLOW) fpword |= 0x8; + if (flags & MSVCRT__EM_INEXACT) fpword |= 0x10; + if (flags & MSVCRT__EM_DENORMAL) fpword |= 0x40; + switch (flags & MSVCRT__MCW_RC) + { + case MSVCRT__RC_UP|MSVCRT__RC_DOWN: fpword |= 0x60000; break; + case MSVCRT__RC_DOWN: fpword |= 0x40000; break; + case MSVCRT__RC_UP: fpword |= 0x20000; break; + } + if (flags & MSVCRT__DN_FLUSH) fpword |= 0x80000; + __asm__ __volatile__( "vmsr fpscr, %0" : : "r" (fpword) ); + } + return flags; #else FIXME( "not implemented\n" ); return 0; -- 2.15.0

1 0

[PATCH] kernel32: Handle zh-Hant and zh-Hans in LocaleNameToLCID.
by Zhiyi Zhang 11 Nov '17

11 Nov '17

I extended get_default_sublang() to work with LCIDs that have a script but no country. I also made a change in parse_locale_name(), because <LANG>-<SCRIPTS> is also a valid locale name form. Thanks to Alexandre for the suggestion. Signed-off-by: Zhiyi Zhang <yi.gd.cn(a)gmail.com> --- dlls/kernel32/locale.c | 34 ++++++++++++++++++++++++---------- dlls/kernel32/tests/locale.c | 24 +++++++++++------------- 2 files changed, 35 insertions(+), 23 deletions(-)

1 0

[PATCH] comdlg32/fontdlg: Allow setting value by typing it into the edit fields
by Fabian Maurer 11 Nov '17

11 Nov '17

The font-dialog allows the user to select a value from the combobox by typing it into its edit field. This operation seems unique to the fontdialog. It works case-insensitive and doesn't change the selection in the edit field. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/comdlg32/fontdlg.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c index c08b246e12..82992cb5a4 100644 --- a/dlls/comdlg32/fontdlg.c +++ b/dlls/comdlg32/fontdlg.c @@ -940,14 +940,37 @@ static LRESULT CFn_WMCommand(HWND hDlg, WPARAM wParam, LPARAM lParam, LPCHOOSEFO int i; long l; HDC hdc; + BOOL cmb_selected_by_edit = FALSE; if (!lpcf) return FALSE; + if(HIWORD(wParam) == CBN_EDITCHANGE) + { + int idx; + WCHAR str_edit[256], str_cmb[256]; + int cmb = LOWORD(wParam); + + GetDlgItemTextW(hDlg, cmb, str_edit, sizeof(str_edit) / sizeof(str_edit[0])); + idx = SendDlgItemMessageW(hDlg, cmb, CB_FINDSTRING, -1, (LPARAM)str_edit); + if(idx != -1) + { + SendDlgItemMessageW(hDlg, cmb, CB_GETLBTEXT, idx, (LPARAM)str_cmb); + + /* Select listbox entry only if we have an exact match */ + if(lstrcmpiW(str_edit, str_cmb) == 0) + { + SendDlgItemMessageW(hDlg, cmb, CB_SETCURSEL, idx, 0); + SendDlgItemMessageW(hDlg, cmb, CB_SETEDITSEL, 0, -1); /* Remove edit field selection */ + cmb_selected_by_edit = TRUE; + } + } + } + TRACE("WM_COMMAND wParam=%08X lParam=%08lX\n", (LONG)wParam, lParam); switch (LOWORD(wParam)) { case cmb1: - if (HIWORD(wParam)==CBN_SELCHANGE) + if (HIWORD(wParam) == CBN_SELCHANGE || cmb_selected_by_edit) { INT pointsize; /* save current pointsize */ LONG pstyle; /* save current style */ @@ -998,7 +1021,7 @@ static LRESULT CFn_WMCommand(HWND hDlg, WPARAM wParam, LPARAM lParam, LPCHOOSEFO case cmb2: case cmb3: case cmb5: - if (HIWORD(wParam)==CBN_SELCHANGE || HIWORD(wParam)== BN_CLICKED ) + if (HIWORD(wParam) == CBN_SELCHANGE || HIWORD(wParam) == BN_CLICKED || cmb_selected_by_edit) { WCHAR str[256]; WINDOWINFO wininfo; -- 2.15.0

1 0

[PATCH 2/2] webservices/tests: Implement floating point handling for ARM (try 3)
by André Hentschel 11 Nov '17

11 Nov '17

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/webservices/tests/writer.c | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index 79b60d1..36cd967 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -2203,28 +2203,35 @@ static void test_text_types(void) WsFreeWriter( writer ); } -static BOOL get_fpword( unsigned short *ret ) +static BOOL get_fpword( unsigned long *ret ) { #if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) - unsigned short fpword; + unsigned long fpword; __asm__ __volatile__( "fstcw %0" : "=m" (fpword) ); + *ret = LOWORD(fpword); + return TRUE; +#elif defined(__arm__) + unsigned long fpword; + __asm__ __volatile__( "vmrs %0, fpscr" : "=r" (fpword) ); *ret = fpword; return TRUE; #endif return FALSE; } -static void set_fpword( unsigned short fpword ) +static void set_fpword( unsigned long fpword ) { #if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) __asm__ __volatile__( "fldcw %0" : : "m" (fpword) ); +#elif defined(__arm__) + __asm__ __volatile__( "vmsr fpscr, %0" : : "r" (fpword) ); #endif } static void test_double(void) { WS_XML_STRING localname = {1, (BYTE *)"t"}, ns = {0, NULL}; - unsigned short fpword; + unsigned long fpword; static const struct { double val; @@ -2318,10 +2325,17 @@ static void test_double(void) WsFreeWriter( writer ); return; } - ok( fpword == 0x27f, "got %04x\n", fpword ); +#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) + ok( fpword == 0x27f, "got %04lx\n", fpword ); set_fpword( 0x1f7f ); get_fpword( &fpword ); - ok( fpword == 0x1f7f, "got %04x\n", fpword ); + ok( fpword == 0x1f7f, "got %04lx\n", fpword ); +#elif defined(__arm__) + ok( fpword == 0, "got %08lx\n", fpword ); + set_fpword( 0x00c00000 ); + get_fpword( &fpword ); + ok( fpword == 0x00c00000, "got %08lx\n", fpword ); +#endif hr = set_output( writer ); ok( hr == S_OK, "got %08x\n", hr ); @@ -2337,8 +2351,13 @@ static void test_double(void) check_output( writer, "<t>100000000000000</t>", __LINE__ ); get_fpword( &fpword ); - ok( fpword == 0x1f7f, "got %04x\n", fpword ); +#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) + ok( fpword == 0x1f7f, "got %04lx\n", fpword ); set_fpword( 0x27f ); +#elif defined(__arm__) + ok( fpword == 0x00c00000, "got %08lx\n", fpword ); + set_fpword( 0 ); +#endif WsFreeWriter( writer ); } -- 2.7.4

1 0

[PATCH 2/2] webservices/tests: Implement floating point handling for ARM (try 2)
by André Hentschel 11 Nov '17

11 Nov '17

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/webservices/tests/writer.c | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index 79b60d1..9254be9 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -2203,28 +2203,35 @@ static void test_text_types(void) WsFreeWriter( writer ); } -static BOOL get_fpword( unsigned short *ret ) +static BOOL get_fpword( unsigned long *ret ) { #if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) - unsigned short fpword; + unsigned long fpword; __asm__ __volatile__( "fstcw %0" : "=m" (fpword) ); + *ret = fpword & 0xffff; + return TRUE; +#elif defined(__arm__) + unsigned long fpword; + __asm__ __volatile__( "vmrs %0, fpscr" : "=r" (fpword) ); *ret = fpword; return TRUE; #endif return FALSE; } -static void set_fpword( unsigned short fpword ) +static void set_fpword( unsigned long fpword ) { #if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) __asm__ __volatile__( "fldcw %0" : : "m" (fpword) ); +#elif defined(__arm__) + __asm__ __volatile__( "vmsr fpscr, %0" : : "r" (fpword) ); #endif } static void test_double(void) { WS_XML_STRING localname = {1, (BYTE *)"t"}, ns = {0, NULL}; - unsigned short fpword; + unsigned long fpword; static const struct { double val; @@ -2318,10 +2325,17 @@ static void test_double(void) WsFreeWriter( writer ); return; } - ok( fpword == 0x27f, "got %04x\n", fpword ); +#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) + ok( fpword == 0x27f, "got %04lx\n", fpword ); set_fpword( 0x1f7f ); get_fpword( &fpword ); - ok( fpword == 0x1f7f, "got %04x\n", fpword ); + ok( fpword == 0x1f7f, "got %04lx\n", fpword ); +#elif defined(__arm__) + ok( fpword == 0, "got %08lx\n", fpword ); + set_fpword( 0x00c00000 ); + get_fpword( &fpword ); + ok( fpword == 0x00c00000, "got %08lx\n", fpword ); +#endif hr = set_output( writer ); ok( hr == S_OK, "got %08x\n", hr ); @@ -2337,8 +2351,13 @@ static void test_double(void) check_output( writer, "<t>100000000000000</t>", __LINE__ ); get_fpword( &fpword ); - ok( fpword == 0x1f7f, "got %04x\n", fpword ); +#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) + ok( fpword == 0x1f7f, "got %04lx\n", fpword ); set_fpword( 0x27f ); +#elif defined(__arm__) + ok( fpword == 0x00c00000, "got %08lx\n", fpword ); + set_fpword( 0 ); +#endif WsFreeWriter( writer ); } -- 2.7.4

1 0

[PATCH 2/3] mlang: Fix font name of code page families.
by Ziqing Hui 11 Nov '17

11 Nov '17

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/mlang/mlang.c | 24 ++++++++--------- dlls/mlang/tests/mlang.c | 69 ++++++++++++------------------------------------ 2 files changed, 29 insertions(+), 64 deletions(-)

1 1

[PATCH 1/3] mlang/tests: Add more code pages test data.
by Ziqing Hui 11 Nov '17

11 Nov '17

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/mlang/tests/mlang.c | 2086 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 2086 insertions(+)

1 0

[1/3] mlang/tests: Add more code pages test data.
by Ziqing Hui 11 Nov '17

11 Nov '17

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/mlang/tests/mlang.c | 2086 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 2086 insertions(+)

1 0

[PATCH 1/3] mlang/tests: Add more code pages test data.
by Ziqing Hui 11 Nov '17

11 Nov '17

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/mlang/tests/mlang.c | 2086 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 2086 insertions(+)

1 0

Re: [PATCH 2/2] webservices/tests: Implement floating point handling for ARM
by Marvin 11 Nov '17

11 Nov '17

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=34102 Your paranoid android. === w7u (32 bit writer) === writer.c:2329: Test failed: got 63027f writer.c:2332: Test failed: got 631f7f writer.c:2355: Test failed: got 631f7f === w7pro64 (32 bit writer) === writer.c:2329: Test failed: got 92027f writer.c:2332: Test failed: got 921f7f writer.c:2355: Test failed: got 921f7f === w8 (32 bit writer) === writer.c:2329: Test failed: got 28027f writer.c:2332: Test failed: got 281f7f writer.c:2355: Test failed: got 281f7f === w864 (32 bit writer) === writer.c:2329: Test failed: got 56027f writer.c:2332: Test failed: got 561f7f writer.c:2355: Test failed: got 561f7f === w1064 (32 bit writer) === writer.c:2329: Test failed: got 706d027f writer.c:2332: Test failed: got 706d1f7f writer.c:2355: Test failed: got 706d1f7f

1 0

[PATCH 2/2] webservices/tests: Implement floating point handling for ARM
by André Hentschel 11 Nov '17

11 Nov '17

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/webservices/tests/writer.c | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index 79b60d1..be3da9c 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -2203,28 +2203,35 @@ static void test_text_types(void) WsFreeWriter( writer ); } -static BOOL get_fpword( unsigned short *ret ) +static BOOL get_fpword( unsigned long *ret ) { #if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) - unsigned short fpword; + unsigned long fpword; __asm__ __volatile__( "fstcw %0" : "=m" (fpword) ); *ret = fpword; return TRUE; +#elif defined(__arm__) + unsigned long fpword; + __asm__ __volatile__( "vmrs %0, fpscr" : "=r" (fpword) ); + *ret = fpword; + return TRUE; #endif return FALSE; } -static void set_fpword( unsigned short fpword ) +static void set_fpword( unsigned long fpword ) { #if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) __asm__ __volatile__( "fldcw %0" : : "m" (fpword) ); +#elif defined(__arm__) + __asm__ __volatile__( "vmsr fpscr, %0" : : "r" (fpword) ); #endif } static void test_double(void) { WS_XML_STRING localname = {1, (BYTE *)"t"}, ns = {0, NULL}; - unsigned short fpword; + unsigned long fpword; static const struct { double val; @@ -2318,10 +2325,17 @@ static void test_double(void) WsFreeWriter( writer ); return; } - ok( fpword == 0x27f, "got %04x\n", fpword ); +#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) + ok( fpword == 0x27f, "got %04lx\n", fpword ); set_fpword( 0x1f7f ); get_fpword( &fpword ); - ok( fpword == 0x1f7f, "got %04x\n", fpword ); + ok( fpword == 0x1f7f, "got %04lx\n", fpword ); +#elif defined(__arm__) + ok( fpword == 0, "got %08lx\n", fpword ); + set_fpword( 0x00c00000 ); + get_fpword( &fpword ); + ok( fpword == 0x00c00000, "got %08lx\n", fpword ); +#endif hr = set_output( writer ); ok( hr == S_OK, "got %08x\n", hr ); @@ -2337,8 +2351,13 @@ static void test_double(void) check_output( writer, "<t>100000000000000</t>", __LINE__ ); get_fpword( &fpword ); - ok( fpword == 0x1f7f, "got %04x\n", fpword ); +#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) + ok( fpword == 0x1f7f, "got %04lx\n", fpword ); set_fpword( 0x27f ); +#elif defined(__arm__) + ok( fpword == 0x00c00000, "got %08lx\n", fpword ); + set_fpword( 0 ); +#endif WsFreeWriter( writer ); } -- 2.7.4

1 0

[PATCH 1/2] webservices: Implement floating point handling for ARM
by André Hentschel 11 Nov '17

11 Nov '17

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/webservices/reader.c | 22 ++++++++++++++++------ dlls/webservices/webservices_private.h | 4 ++-- dlls/webservices/writer.c | 4 ++-- 3 files changed, 20 insertions(+), 10 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 9d024a3..81f1bb6 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -3596,26 +3596,36 @@ static HRESULT str_to_uint64( const unsigned char *str, ULONG len, UINT64 max, U return S_OK; } -BOOL set_fpword( unsigned short new, unsigned short *old ) +BOOL init_fpword( unsigned long *old ) { #if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) - unsigned short fpword; + unsigned long fpword; __asm__ __volatile__( "fstcw %0" : "=m" (fpword) ); *old = fpword; - fpword = new; + fpword = 0x37f; __asm__ __volatile__( "fldcw %0" : : "m" (fpword) ); return TRUE; +#elif defined(__arm__) + unsigned long fpword; + + __asm__ __volatile__( "vmrs %0, fpscr" : "=r" (fpword) ); + *old = fpword; + fpword = 0; + __asm__ __volatile__( "vmsr fpscr, %0" : : "r" (fpword) ); + return TRUE; #else FIXME( "not implemented\n" ); return FALSE; #endif } -void restore_fpword( unsigned short fpword ) +void restore_fpword( unsigned long fpword ) { #if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) __asm__ __volatile__( "fldcw %0" : : "m" (fpword) ); +#elif defined(__arm__) + __asm__ __volatile__( "vmsr fpscr, %0" : : "r" (fpword) ); #else FIXME( "not implemented\n" ); #endif @@ -3631,7 +3641,7 @@ static HRESULT str_to_double( const unsigned char *str, ULONG len, double *ret ) int sign = 1, exp_sign = 1, exp = 0, exp_tmp = 0, neg_exp, i, nb_digits, have_digits; unsigned __int64 val = 0, tmp; long double exp_val = 1.0, exp_mul = 10.0; - unsigned short fpword; + unsigned long fpword; while (len && read_isspace( *p )) { p++; len--; } while (len && read_isspace( p[len - 1] )) { len--; } @@ -3662,7 +3672,7 @@ static HRESULT str_to_double( const unsigned char *str, ULONG len, double *ret ) else if (*p == '+') { p++; len--; }; if (!len) return S_OK; - if (!set_fpword( 0x37f, &fpword )) return E_NOTIMPL; + if (!init_fpword( &fpword )) return E_NOTIMPL; q = p; while (len && isdigit( *q )) { q++; len--; } diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index f8cc6d9..cf7d480 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -60,8 +60,8 @@ void free_xml_string( WS_XML_STRING * ) DECLSPEC_HIDDEN; HRESULT append_attribute( WS_XML_ELEMENT_NODE *, WS_XML_ATTRIBUTE * ) DECLSPEC_HIDDEN; void free_attribute( WS_XML_ATTRIBUTE * ) DECLSPEC_HIDDEN; WS_TYPE map_value_type( WS_VALUE_TYPE ) DECLSPEC_HIDDEN; -BOOL set_fpword( unsigned short, unsigned short * ) DECLSPEC_HIDDEN; -void restore_fpword( unsigned short ) DECLSPEC_HIDDEN; +BOOL init_fpword( unsigned long * ) DECLSPEC_HIDDEN; +void restore_fpword( unsigned long ) DECLSPEC_HIDDEN; ULONG get_type_size( WS_TYPE, const void * ) DECLSPEC_HIDDEN; HRESULT read_header( WS_XML_READER *, const WS_XML_STRING *, const WS_XML_STRING *, WS_TYPE, const void *, WS_READ_OPTION, WS_HEAP *, void *, ULONG ) DECLSPEC_HIDDEN; diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index f6917c6..f30d5d6 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -2159,10 +2159,10 @@ static HRESULT text_to_utf8text( const WS_XML_TEXT *text, const WS_XML_UTF8_TEXT { const WS_XML_DOUBLE_TEXT *double_text = (const WS_XML_DOUBLE_TEXT *)text; unsigned char buf[32]; /* "-1.1111111111111111E-308", oversized to address Valgrind limitations */ - unsigned short fpword; + unsigned long fpword; ULONG len; - if (!set_fpword( 0x37f, &fpword )) return E_NOTIMPL; + if (!init_fpword( &fpword )) return E_NOTIMPL; len = format_double( &double_text->value, buf ); restore_fpword( fpword ); if (!len) return E_NOTIMPL; -- 2.7.4

1 0

[PATCH] winemine: Add confirmation to reset results button
by Vijay Kiran Kamuju 10 Nov '17

10 Nov '17

From: Andrey Semakin <and-semakin(a)ya.ru> Without translations. Signed-off-by: Andrey Semakin <and-semakin(a)ya.ru> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- programs/winemine/dialog.c | 8 ++++++++ programs/winemine/resource.h | 3 +++ programs/winemine/winemine.rc | 8 +++++--- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/programs/winemine/dialog.c b/programs/winemine/dialog.c index 1f55f73e90..27558b1203 100644 --- a/programs/winemine/dialog.c +++ b/programs/winemine/dialog.c @@ -88,6 +88,8 @@ INT_PTR CALLBACK TimesDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPara { static BOARD *p_board; unsigned i; + int confirm_msgbox_result; + WCHAR confirm_title[256], confirm_text[256]; switch( uMsg ) { case WM_INITDIALOG: @@ -105,6 +107,12 @@ INT_PTR CALLBACK TimesDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPara case WM_COMMAND: switch( LOWORD( wParam ) ) { case IDC_RESET: + LoadStringW( NULL, IDC_CONFIRMTITLE, confirm_title, sizeof(confirm_title)/sizeof(WCHAR) ); + LoadStringW( NULL, IDC_CONFIRMTEXT, confirm_text, sizeof(confirm_text)/sizeof(WCHAR) ); + confirm_msgbox_result = MessageBoxW( NULL, confirm_text, confirm_title, MB_OKCANCEL | MB_DEFBUTTON2 | MB_ICONWARNING ); + if( confirm_msgbox_result != IDOK ) + break; + /* reset best names and times */ ResetResults( p_board ); diff --git a/programs/winemine/resource.h b/programs/winemine/resource.h index 22e4128fc8..7a576a6564 100644 --- a/programs/winemine/resource.h +++ b/programs/winemine/resource.h @@ -48,6 +48,9 @@ #define IDC_EDITMINES 1033 #define IDC_RESET 1041 +#define IDC_CONFIRMTITLE 1042 +#define IDC_CONFIRMTEXT 1043 + #define IDS_APPNAME 1101 #define IDS_NOBODY 1102 #define IDS_ABOUT 1103 diff --git a/programs/winemine/winemine.rc b/programs/winemine/winemine.rc index ddf43db11e..ce1dca740a 100644 --- a/programs/winemine/winemine.rc +++ b/programs/winemine/winemine.rc @@ -26,9 +26,11 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE { - IDS_APPNAME, "WineMine" - IDS_NOBODY, "Nobody" - IDS_ABOUT, "Copyright 2000 Joshua Thielen" + IDS_APPNAME, "WineMine" + IDS_NOBODY, "Nobody" + IDS_ABOUT, "Copyright 2000 Joshua Thielen" + IDC_CONFIRMTITLE, "Reset Results" + IDC_CONFIRMTEXT, "All results will be lost. Are you sure?" } IDM_WINEMINE MENU -- 2.15.0

1 0

[PATCH] advapi32: Implement GetExplicitEntriesFromAclW.
by Vincent Povirk 10 Nov '17

10 Nov '17

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> --- This is from the wine-staging patchset advapi32-GetExplicitEntriesFromAclW. I haven't been able to figure out why it's marked as a "semi-stub" in staging. Every implemented ACE type is fully translated, and the default case has a FIXME. So I changed the main debug line to a TRACE. dlls/advapi32/security.c | 81 ++++++++++++++++++++++- dlls/advapi32/tests/security.c | 142 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 221 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index c9d5cfaffad..d21946d4e5d 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -4214,8 +4214,85 @@ DWORD WINAPI GetExplicitEntriesFromAclA( PACL pacl, PULONG pcCountOfExplicitEntr DWORD WINAPI GetExplicitEntriesFromAclW( PACL pacl, PULONG pcCountOfExplicitEntries, PEXPLICIT_ACCESSW* pListOfExplicitEntries) { - FIXME("%p %p %p\n",pacl, pcCountOfExplicitEntries, pListOfExplicitEntries); - return ERROR_CALL_NOT_IMPLEMENTED; + ACL_SIZE_INFORMATION sizeinfo; + EXPLICIT_ACCESSW* entries; + MAX_SID *sid_entries; + ACE_HEADER *ace; + NTSTATUS status; + int i; + + TRACE("%p %p %p\n",pacl, pcCountOfExplicitEntries, pListOfExplicitEntries); + + if (!pcCountOfExplicitEntries || !pListOfExplicitEntries) + return ERROR_INVALID_PARAMETER; + + status = RtlQueryInformationAcl(pacl, &sizeinfo, sizeof(sizeinfo), AclSizeInformation); + if (status) return RtlNtStatusToDosError(status); + + if (!sizeinfo.AceCount) + { + *pcCountOfExplicitEntries = 0; + *pListOfExplicitEntries = NULL; + return ERROR_SUCCESS; + } + + entries = LocalAlloc(LMEM_FIXED | LMEM_ZEROINIT, (sizeof(EXPLICIT_ACCESSW) + sizeof(MAX_SID)) * sizeinfo.AceCount); + if (!entries) return ERROR_OUTOFMEMORY; + sid_entries = (MAX_SID*)((char*)entries + sizeof(EXPLICIT_ACCESSW) * sizeinfo.AceCount); + + for (i = 0; i < sizeinfo.AceCount; i++) + { + status = RtlGetAce(pacl, i, (void**)&ace); + if (status) goto error; + + switch (ace->AceType) + { + case ACCESS_ALLOWED_ACE_TYPE: + { + ACCESS_ALLOWED_ACE *allow = (ACCESS_ALLOWED_ACE *)ace; + entries[i].grfAccessMode = GRANT_ACCESS; + entries[i].grfInheritance = ace->AceFlags; + entries[i].grfAccessPermissions = allow->Mask; + + CopySid(sizeof(MAX_SID), (PSID)&sid_entries[i], (PSID)&allow->SidStart); + entries[i].Trustee.pMultipleTrustee = NULL; + entries[i].Trustee.MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE; + entries[i].Trustee.TrusteeForm = TRUSTEE_IS_SID; + entries[i].Trustee.TrusteeType = TRUSTEE_IS_UNKNOWN; + entries[i].Trustee.ptstrName = (WCHAR *)&sid_entries[i]; + break; + } + + case ACCESS_DENIED_ACE_TYPE: + { + ACCESS_DENIED_ACE *deny = (ACCESS_DENIED_ACE *)ace; + entries[i].grfAccessMode = DENY_ACCESS; + entries[i].grfInheritance = ace->AceFlags; + entries[i].grfAccessPermissions = deny->Mask; + + CopySid(sizeof(MAX_SID), (PSID)&sid_entries[i], (PSID)&deny->SidStart); + entries[i].Trustee.pMultipleTrustee = NULL; + entries[i].Trustee.MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE; + entries[i].Trustee.TrusteeForm = TRUSTEE_IS_SID; + entries[i].Trustee.TrusteeType = TRUSTEE_IS_UNKNOWN; + entries[i].Trustee.ptstrName = (WCHAR *)&sid_entries[i]; + break; + } + + default: + FIXME("Unhandled ace type %d\n", ace->AceType); + entries[i].grfAccessMode = NOT_USED_ACCESS; + continue; + } + } + + *pcCountOfExplicitEntries = sizeinfo.AceCount; + *pListOfExplicitEntries = entries; + return ERROR_SUCCESS; + +error: + LocalFree(entries); + return RtlNtStatusToDosError(status); } /****************************************************************************** diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 73fd7524776..08d3705771b 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -133,6 +133,7 @@ static BOOL (WINAPI *pGetWindowsAccountDomainSid)(PSID,PSID,DWORD*); static void (WINAPI *pRtlInitAnsiString)(PANSI_STRING,PCSZ); static NTSTATUS (WINAPI *pRtlFreeUnicodeString)(PUNICODE_STRING); static PSID_IDENTIFIER_AUTHORITY (WINAPI *pGetSidIdentifierAuthority)(PSID); +static DWORD (WINAPI *pGetExplicitEntriesFromAclW)(PACL,PULONG,PEXPLICIT_ACCESSW*); static HMODULE hmod; static int myARGC; @@ -227,6 +228,7 @@ static void init(void) pGetWindowsAccountDomainSid = (void *)GetProcAddress(hmod, "GetWindowsAccountDomainSid"); pGetSidIdentifierAuthority = (void *)GetProcAddress(hmod, "GetSidIdentifierAuthority"); pDuplicateTokenEx = (void *)GetProcAddress(hmod, "DuplicateTokenEx"); + pGetExplicitEntriesFromAclW = (void *)GetProcAddress(hmod, "GetExplicitEntriesFromAclW"); myARGC = winetest_get_mainargs( &myARGV ); } @@ -7098,6 +7100,145 @@ static void test_child_token_sd(void) HeapFree(GetProcessHeap(), 0, sd); } +static void test_GetExplicitEntriesFromAclW(void) +{ + static const WCHAR wszCurrentUser[] = { 'C','U','R','R','E','N','T','_','U','S','E','R','\0'}; + SID_IDENTIFIER_AUTHORITY SIDAuthWorld = { SECURITY_WORLD_SID_AUTHORITY }; + SID_IDENTIFIER_AUTHORITY SIDAuthNT = { SECURITY_NT_AUTHORITY }; + PSID everyone_sid = NULL, users_sid = NULL; + EXPLICIT_ACCESSW access; + EXPLICIT_ACCESSW *access2; + PACL new_acl, old_acl = NULL; + ULONG count; + DWORD res; + + if (!pGetExplicitEntriesFromAclW) + { + win_skip("GetExplicitEntriesFromAclW is not available\n"); + return; + } + + if (!pSetEntriesInAclW) + { + win_skip("SetEntriesInAclW is not available\n"); + return; + } + + old_acl = HeapAlloc(GetProcessHeap(), 0, 256); + res = InitializeAcl(old_acl, 256, ACL_REVISION); + if(!res && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("ACLs not implemented - skipping tests\n"); + HeapFree(GetProcessHeap(), 0, old_acl); + return; + } + ok(res, "InitializeAcl failed with error %d\n", GetLastError()); + + res = AllocateAndInitializeSid(&SIDAuthWorld, 1, SECURITY_WORLD_RID, 0, 0, 0, 0, 0, 0, 0, &everyone_sid); + ok(res, "AllocateAndInitializeSid failed with error %d\n", GetLastError()); + + res = AllocateAndInitializeSid(&SIDAuthNT, 2, SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_USERS, 0, 0, 0, 0, 0, 0, &users_sid); + ok(res, "AllocateAndInitializeSid failed with error %d\n", GetLastError()); + + res = AddAccessAllowedAce(old_acl, ACL_REVISION, KEY_READ, users_sid); + ok(res, "AddAccessAllowedAce failed with error %d\n", GetLastError()); + + access2 = NULL; + res = pGetExplicitEntriesFromAclW(old_acl, &count, &access2); + ok(res == ERROR_SUCCESS, "GetExplicitEntriesFromAclW failed with error %d\n", GetLastError()); + ok(count == 1, "Expected count == 1, got %d\n", count); + ok(access2[0].grfAccessMode == GRANT_ACCESS, "Expected GRANT_ACCESS, got %d\n", access2[0].grfAccessMode); + ok(access2[0].grfAccessPermissions == KEY_READ, "Expected KEY_READ, got %d\n", access2[0].grfAccessPermissions); + ok(access2[0].Trustee.TrusteeForm == TRUSTEE_IS_SID, "Expected SID trustee, got %d\n", access2[0].Trustee.TrusteeForm); + ok(access2[0].grfInheritance == NO_INHERITANCE, "Expected NO_INHERITANCE, got %x\n", access2[0].grfInheritance); + ok(EqualSid(access2[0].Trustee.ptstrName, users_sid), "Expected equal SIDs\n"); + LocalFree(access2); + + access.Trustee.MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE; + access.Trustee.pMultipleTrustee = NULL; + + access.grfAccessPermissions = KEY_WRITE; + access.grfAccessMode = GRANT_ACCESS; + access.grfInheritance = NO_INHERITANCE; + access.Trustee.TrusteeType = TRUSTEE_IS_WELL_KNOWN_GROUP; + access.Trustee.TrusteeForm = TRUSTEE_IS_SID; + access.Trustee.ptstrName = everyone_sid; + res = pSetEntriesInAclW(1, &access, old_acl, &new_acl); + ok(res == ERROR_SUCCESS, "SetEntriesInAclW failed: %u\n", res); + ok(new_acl != NULL, "returned acl was NULL\n"); + + access2 = NULL; + res = pGetExplicitEntriesFromAclW(new_acl, &count, &access2); + ok(res == ERROR_SUCCESS, "GetExplicitEntriesFromAclW failed with error %d\n", GetLastError()); + ok(count == 2, "Expected count == 2, got %d\n", count); + ok(access2[0].grfAccessMode == GRANT_ACCESS, "Expected GRANT_ACCESS, got %d\n", access2[0].grfAccessMode); + ok(access2[0].grfAccessPermissions == KEY_WRITE, "Expected KEY_WRITE, got %d\n", access2[0].grfAccessPermissions); + ok(access2[0].Trustee.TrusteeType == TRUSTEE_IS_UNKNOWN, + "Expected TRUSTEE_IS_UNKNOWN trustee type, got %d\n", access2[0].Trustee.TrusteeType); + ok(access2[0].Trustee.TrusteeForm == TRUSTEE_IS_SID, "Expected SID trustee, got %d\n", access2[0].Trustee.TrusteeForm); + ok(access2[0].grfInheritance == NO_INHERITANCE, "Expected NO_INHERITANCE, got %x\n", access2[0].grfInheritance); + ok(EqualSid(access2[0].Trustee.ptstrName, everyone_sid), "Expected equal SIDs\n"); + LocalFree(access2); + LocalFree(new_acl); + + access.Trustee.TrusteeType = TRUSTEE_IS_UNKNOWN; + res = pSetEntriesInAclW(1, &access, old_acl, &new_acl); + ok(res == ERROR_SUCCESS, "SetEntriesInAclW failed: %u\n", res); + ok(new_acl != NULL, "returned acl was NULL\n"); + + access2 = NULL; + res = pGetExplicitEntriesFromAclW(new_acl, &count, &access2); + ok(res == ERROR_SUCCESS, "GetExplicitEntriesFromAclW failed with error %d\n", GetLastError()); + ok(count == 2, "Expected count == 2, got %d\n", count); + ok(access2[0].grfAccessMode == GRANT_ACCESS, "Expected GRANT_ACCESS, got %d\n", access2[0].grfAccessMode); + ok(access2[0].grfAccessPermissions == KEY_WRITE, "Expected KEY_WRITE, got %d\n", access2[0].grfAccessPermissions); + ok(access2[0].Trustee.TrusteeType == TRUSTEE_IS_UNKNOWN, + "Expected TRUSTEE_IS_UNKNOWN trustee type, got %d\n", access2[0].Trustee.TrusteeType); + ok(access2[0].Trustee.TrusteeForm == TRUSTEE_IS_SID, "Expected SID trustee, got %d\n", access2[0].Trustee.TrusteeForm); + ok(access2[0].grfInheritance == NO_INHERITANCE, "Expected NO_INHERITANCE, got %x\n", access2[0].grfInheritance); + ok(EqualSid(access2[0].Trustee.ptstrName, everyone_sid), "Expected equal SIDs\n"); + LocalFree(access2); + LocalFree(new_acl); + + access.Trustee.TrusteeForm = TRUSTEE_IS_NAME; + access.Trustee.ptstrName = (LPWSTR)wszCurrentUser; + res = pSetEntriesInAclW(1, &access, old_acl, &new_acl); + ok(res == ERROR_SUCCESS, "SetEntriesInAclW failed: %u\n", res); + ok(new_acl != NULL, "returned acl was NULL\n"); + + access2 = NULL; + res = pGetExplicitEntriesFromAclW(new_acl, &count, &access2); + ok(res == ERROR_SUCCESS, "GetExplicitEntriesFromAclW failed with error %d\n", GetLastError()); + ok(count == 2, "Expected count == 2, got %d\n", count); + ok(access2[0].grfAccessMode == GRANT_ACCESS, "Expected GRANT_ACCESS, got %d\n", access2[0].grfAccessMode); + ok(access2[0].grfAccessPermissions == KEY_WRITE, "Expected KEY_WRITE, got %d\n", access2[0].grfAccessPermissions); + ok(access2[0].Trustee.TrusteeType == TRUSTEE_IS_UNKNOWN, + "Expected TRUSTEE_IS_UNKNOWN trustee type, got %d\n", access2[0].Trustee.TrusteeType); + ok(access2[0].Trustee.TrusteeForm == TRUSTEE_IS_SID, "Expected SID trustee, got %d\n", access2[0].Trustee.TrusteeForm); + ok(access2[0].grfInheritance == NO_INHERITANCE, "Expected NO_INHERITANCE, got %x\n", access2[0].grfInheritance); + LocalFree(access2); + LocalFree(new_acl); + + access.grfAccessMode = REVOKE_ACCESS; + access.Trustee.TrusteeForm = TRUSTEE_IS_SID; + access.Trustee.ptstrName = users_sid; + res = pSetEntriesInAclW(1, &access, old_acl, &new_acl); + ok(res == ERROR_SUCCESS, "SetEntriesInAclW failed: %u\n", res); + ok(new_acl != NULL, "returned acl was NULL\n"); + + access2 = (void *)0xdeadbeef; + res = pGetExplicitEntriesFromAclW(new_acl, &count, &access2); + ok(res == ERROR_SUCCESS, "GetExplicitEntriesFromAclW failed with error %d\n", GetLastError()); + ok(count == 0, "Expected count == 0, got %d\n", count); + ok(access2 == NULL, "access2 was not NULL\n"); + LocalFree(new_acl); + + FreeSid(users_sid); + FreeSid(everyone_sid); + HeapFree(GetProcessHeap(), 0, old_acl); +} + START_TEST(security) { init(); @@ -7151,6 +7292,7 @@ START_TEST(security) test_pseudo_tokens(); test_maximum_allowed(); test_token_label(); + test_GetExplicitEntriesFromAclW(); /* Must be the last test, modifies process token */ test_token_security_descriptor(); -- 2.11.0

1 0

[PATCH] d3dx9/tests: Use a helper function to set matrix values in math tests
by Alex Henrie 10 Nov '17

10 Nov '17

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- This gets the line lengths down to something reasonable as requested. I also made the whitespace more consistent. --- dlls/d3dx9_36/tests/math.c | 361 +++++++++++++++++++++++++-------------------- 1 file changed, 204 insertions(+), 157 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index ec07348685..0fb19c7561 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -195,6 +195,18 @@ static void expect_vec4_array_(unsigned int line, unsigned int count, const D3DX } } +static void set_matrix(D3DXMATRIX* mat, + float x0, float x1, float x2, float x3, + float y0, float y1, float y2, float y3, + float z0, float z1, float z2, float z3, + float w0, float w1, float w2, float w3) +{ + U(mat)->m[0][0] = x0; U(mat)->m[0][1] = x1; U(mat)->m[0][2] = x2; U(mat)->m[0][3] = x3; + U(mat)->m[1][0] = y0; U(mat)->m[1][1] = y1; U(mat)->m[1][2] = y2; U(mat)->m[1][3] = y3; + U(mat)->m[2][0] = z0; U(mat)->m[2][1] = z1; U(mat)->m[2][2] = z2; U(mat)->m[2][3] = z3; + U(mat)->m[3][0] = w0; U(mat)->m[3][1] = w1; U(mat)->m[3][2] = w2; U(mat)->m[3][3] = w3; +} + static void D3DXColorTest(void) { D3DXCOLOR color, color1, color2, expected, got; @@ -346,10 +358,11 @@ static void D3DXMatrixTest(void) angle = D3DX_PI/3.0f; /*____________D3DXMatrixAffineTransformation______*/ - U(expectedmat).m[0][0] = -459.239990f; U(expectedmat).m[0][1] = -576.719971f; U(expectedmat).m[0][2] = -263.440002f; U(expectedmat).m[0][3] = 0.0f; - U(expectedmat).m[1][0] = 519.760010f; U(expectedmat).m[1][1] = -352.440002f; U(expectedmat).m[1][2] = -277.679993f; U(expectedmat).m[1][3] = 0.0f; - U(expectedmat).m[2][0] = 363.119995f; U(expectedmat).m[2][1] = -121.040001f; U(expectedmat).m[2][2] = -117.479996f; U(expectedmat).m[2][3] = 0.0f; - U(expectedmat).m[3][0] = -1239.0f; U(expectedmat).m[3][1] = 667.0f; U(expectedmat).m[3][2] = 567.0f; U(expectedmat).m[3][3] = 1.0f; + set_matrix(&expectedmat, + -459.239990f, -576.719971f, -263.440002f, 0.0f, + 519.760010f, -352.440002f, -277.679993f, 0.0f, + 363.119995f, -121.040001f, -117.479996f, 0.0f, + -1239.0f, 667.0f, 567.0f, 1.0f); D3DXMatrixAffineTransformation(&gotmat, 3.56f, &at, &q, &axis); expect_matrix(&expectedmat, &gotmat, 0); @@ -366,10 +379,11 @@ static void D3DXMatrixTest(void) D3DXMatrixAffineTransformation(&gotmat, 3.56f, NULL, &q, NULL); expect_matrix(&expectedmat, &gotmat, 0); - U(expectedmat).m[0][0] = 3.56f; U(expectedmat).m[0][1] = 0.0f; U(expectedmat).m[0][2] = 0.0f; U(expectedmat).m[0][3] = 0.0f; - U(expectedmat).m[1][0] = 0.0f; U(expectedmat).m[1][1] = 3.56f; U(expectedmat).m[1][2] = 0.0f; U(expectedmat).m[1][3] = 0.0f; - U(expectedmat).m[2][0] = 0.0f; U(expectedmat).m[2][1] = 0.0f; U(expectedmat).m[2][2] = 3.56f; U(expectedmat).m[2][3] = 0.0f; - U(expectedmat).m[3][0] = 1.0f; U(expectedmat).m[3][1] = -3.0f; U(expectedmat).m[3][2] = 7.0f; U(expectedmat).m[3][3] = 1.0f; + set_matrix(&expectedmat, + 3.56f, 0.0f, 0.0f, 0.0f, + 0.0f, 3.56f, 0.0f, 0.0f, + 0.0f, 0.0f, 3.56f, 0.0f, + 1.0f, -3.0f, 7.0f, 1.0f); D3DXMatrixAffineTransformation(&gotmat, 3.56f, NULL, NULL, &axis); expect_matrix(&expectedmat, &gotmat, 0); @@ -389,11 +403,12 @@ static void D3DXMatrixTest(void) ok(equal, "Got unexpected determinant %.8e.\n", determinant); /*____________D3DXMatrixInverse______________*/ - U(expectedmat).m[0][0] = 16067.0f/73944.0f; U(expectedmat).m[0][1] = -10165.0f/147888.0f; U(expectedmat).m[0][2] = -2729.0f/147888.0f; U(expectedmat).m[0][3] = -1631.0f/49296.0f; - U(expectedmat).m[1][0] = -565.0f/36972.0f; U(expectedmat).m[1][1] = 2723.0f/73944.0f; U(expectedmat).m[1][2] = -1073.0f/73944.0f; U(expectedmat).m[1][3] = 289.0f/24648.0f; - U(expectedmat).m[2][0] = -389.0f/2054.0f; U(expectedmat).m[2][1] = 337.0f/4108.0f; U(expectedmat).m[2][2] = 181.0f/4108.0f; U(expectedmat).m[2][3] = 317.0f/4108.0f; - U(expectedmat).m[3][0] = 163.0f/5688.0f; U(expectedmat).m[3][1] = -101.0f/11376.0f; U(expectedmat).m[3][2] = -73.0f/11376.0f; U(expectedmat).m[3][3] = -127.0f/3792.0f; - D3DXMatrixInverse(&gotmat,&determinant,&mat); + set_matrix(&expectedmat, + 16067.0f/73944.0f, -10165.0f/147888.0f, -2729.0f/147888.0f, -1631.0f/49296.0f, + -565.0f/36972.0f, 2723.0f/73944.0f, -1073.0f/73944.0f, 289.0f/24648.0f, + -389.0f/2054.0f, 337.0f/4108.0f, 181.0f/4108.0f, 317.0f/4108.0f, + 163.0f/5688.0f, -101.0f/11376.0f, -73.0f/11376.0f, -127.0f/3792.0f); + D3DXMatrixInverse(&gotmat, &determinant, &mat); expect_matrix(&expectedmat, &gotmat, 1); equal = compare_float(determinant, -147888.0f, 0); ok(equal, "Got unexpected determinant %.8e.\n", determinant); @@ -419,211 +434,237 @@ static void D3DXMatrixTest(void) ok(expected == got, "Expected : %d, Got : %d\n", expected, got); /*____________D3DXMatrixLookAtLH_______________*/ - U(expectedmat).m[0][0] = -0.82246518f; U(expectedmat).m[0][1] = -0.40948939f; U(expectedmat).m[0][2] = -0.39480308f; U(expectedmat).m[0][3] = 0.0f; - U(expectedmat).m[1][0] = -0.55585691f; U(expectedmat).m[1][1] = 0.43128574f; U(expectedmat).m[1][2] = 0.71064550f; U(expectedmat).m[1][3] = 0.0f; - U(expectedmat).m[2][0] = -0.12072885f; U(expectedmat).m[2][1] = 0.80393475f; U(expectedmat).m[2][2] = -0.58233452f; U(expectedmat).m[2][3] = 0.0f; - U(expectedmat).m[3][0] = 4.4946337f; U(expectedmat).m[3][1] = 0.80971903f; U(expectedmat).m[3][2] = 10.060076f; U(expectedmat).m[3][3] = 1.0f; - D3DXMatrixLookAtLH(&gotmat,&eye,&at,&axis); + set_matrix(&expectedmat, + -0.82246518f, -0.40948939f, -0.39480308f, 0.0f, + -0.55585691f, 0.43128574f, 0.71064550f, 0.0f, + -0.12072885f, 0.80393475f, -0.58233452f, 0.0f, + 4.4946337f, 0.80971903f, 10.060076f, 1.0f); + D3DXMatrixLookAtLH(&gotmat, &eye, &at, &axis); expect_matrix(&expectedmat, &gotmat, 32); /*____________D3DXMatrixLookAtRH_______________*/ - U(expectedmat).m[0][0] = 0.82246518f; U(expectedmat).m[0][1] = -0.40948939f; U(expectedmat).m[0][2] = 0.39480308f; U(expectedmat).m[0][3] = 0.0f; - U(expectedmat).m[1][0] = 0.55585691f; U(expectedmat).m[1][1] = 0.43128574f; U(expectedmat).m[1][2] = -0.71064550f; U(expectedmat).m[1][3] = 0.0f; - U(expectedmat).m[2][0] = 0.12072885f; U(expectedmat).m[2][1] = 0.80393475f; U(expectedmat).m[2][2] = 0.58233452f; U(expectedmat).m[2][3] = 0.0f; - U(expectedmat).m[3][0] = -4.4946337f; U(expectedmat).m[3][1] = 0.80971903f; U(expectedmat).m[3][2] = -10.060076f; U(expectedmat).m[3][3] = 1.0f; - D3DXMatrixLookAtRH(&gotmat,&eye,&at,&axis); + set_matrix(&expectedmat, + 0.82246518f, -0.40948939f, 0.39480308f, 0.0f, + 0.55585691f, 0.43128574f, -0.71064550f, 0.0f, + 0.12072885f, 0.80393475f, 0.58233452f, 0.0f, + -4.4946337f, 0.80971903f, -10.060076f, 1.0f); + D3DXMatrixLookAtRH(&gotmat, &eye, &at, &axis); expect_matrix(&expectedmat, &gotmat, 32); /*____________D3DXMatrixMultiply______________*/ - U(expectedmat).m[0][0] = 73.0f; U(expectedmat).m[0][1] = 193.0f; U(expectedmat).m[0][2] = -197.0f; U(expectedmat).m[0][3] = -77.0f; - U(expectedmat).m[1][0] = 231.0f; U(expectedmat).m[1][1] = 551.0f; U(expectedmat).m[1][2] = -489.0f; U(expectedmat).m[1][3] = -169.0; - U(expectedmat).m[2][0] = 239.0f; U(expectedmat).m[2][1] = 523.0f; U(expectedmat).m[2][2] = -400.0f; U(expectedmat).m[2][3] = -116.0f; - U(expectedmat).m[3][0] = -164.0f; U(expectedmat).m[3][1] = -320.0f; U(expectedmat).m[3][2] = 187.0f; U(expectedmat).m[3][3] = 31.0f; - D3DXMatrixMultiply(&gotmat,&mat,&mat2); + set_matrix(&expectedmat, + 73.0f, 193.0f, -197.0f, -77.0f, + 231.0f, 551.0f, -489.0f, -169.0f, + 239.0f, 523.0f, -400.0f, -116.0f, + -164.0f, -320.0f, 187.0f, 31.0f); + D3DXMatrixMultiply(&gotmat, &mat, &mat2); expect_matrix(&expectedmat, &gotmat, 0); /*____________D3DXMatrixMultiplyTranspose____*/ - U(expectedmat).m[0][0] = 73.0f; U(expectedmat).m[0][1] = 231.0f; U(expectedmat).m[0][2] = 239.0f; U(expectedmat).m[0][3] = -164.0f; - U(expectedmat).m[1][0] = 193.0f; U(expectedmat).m[1][1] = 551.0f; U(expectedmat).m[1][2] = 523.0f; U(expectedmat).m[1][3] = -320.0; - U(expectedmat).m[2][0] = -197.0f; U(expectedmat).m[2][1] = -489.0f; U(expectedmat).m[2][2] = -400.0f; U(expectedmat).m[2][3] = 187.0f; - U(expectedmat).m[3][0] = -77.0f; U(expectedmat).m[3][1] = -169.0f; U(expectedmat).m[3][2] = -116.0f; U(expectedmat).m[3][3] = 31.0f; - D3DXMatrixMultiplyTranspose(&gotmat,&mat,&mat2); + set_matrix(&expectedmat, + 73.0f, 231.0f, 239.0f, -164.0f, + 193.0f, 551.0f, 523.0f, -320.0f, + -197.0f, -489.0f, -400.0f, 187.0f, + -77.0f, -169.0f, -116.0f, 31.0f); + D3DXMatrixMultiplyTranspose(&gotmat, &mat, &mat2); expect_matrix(&expectedmat, &gotmat, 0); /*____________D3DXMatrixOrthoLH_______________*/ - U(expectedmat).m[0][0] = 0.8f; U(expectedmat).m[0][1] = 0.0f; U(expectedmat).m[0][2] = 0.0f; U(expectedmat).m[0][3] = 0.0f; - U(expectedmat).m[1][0] = 0.0f; U(expectedmat).m[1][1] = 0.27027027f; U(expectedmat).m[1][2] = 0.0f; U(expectedmat).m[1][3] = 0.0f; - U(expectedmat).m[2][0] = 0.0f; U(expectedmat).m[2][1] = 0.0f; U(expectedmat).m[2][2] = -0.15151515f; U(expectedmat).m[2][3] = 0.0f; - U(expectedmat).m[3][0] = 0.0f; U(expectedmat).m[3][1] = 0.0f; U(expectedmat).m[3][2] = -0.48484848f; U(expectedmat).m[3][3] = 1.0f; + set_matrix(&expectedmat, + 0.8f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.27027027f, 0.0f, 0.0f, + 0.0f, 0.0f, -0.15151515f, 0.0f, + 0.0f, 0.0f, -0.48484848f, 1.0f); D3DXMatrixOrthoLH(&gotmat, 2.5f, 7.4f, -3.2f, -9.8f); expect_matrix(&expectedmat, &gotmat, 16); /*____________D3DXMatrixOrthoOffCenterLH_______________*/ - U(expectedmat).m[0][0] = 3.6363636f; U(expectedmat).m[0][1] = 0.0f; U(expectedmat).m[0][2] = 0.0f; U(expectedmat).m[0][3] = 0.0f; - U(expectedmat).m[1][0] = 0.0f; U(expectedmat).m[1][1] = 0.18018018f; U(expectedmat).m[1][2] = 0.0f; U(expectedmat).m[1][3] = 0.0f; - U(expectedmat).m[2][0] = 0.0f; U(expectedmat).m[2][1] = 0.0f; U(expectedmat).m[2][2] = -0.045662100f; U(expectedmat).m[2][3] = 0.0f; - U(expectedmat).m[3][0] = -1.7272727f; U(expectedmat).m[3][1] = -0.56756757f; U(expectedmat).m[3][2] = 0.42465753f; U(expectedmat).m[3][3] = 1.0f; + set_matrix(&expectedmat, + 3.6363636f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.18018018f, 0.0f, 0.0f, + 0.0f, 0.0f, -0.045662100f, 0.0f, + -1.7272727f, -0.56756757f, 0.42465753f, 1.0f); D3DXMatrixOrthoOffCenterLH(&gotmat, 0.2f, 0.75f, -2.4f, 8.7f, 9.3, -12.6); expect_matrix(&expectedmat, &gotmat, 32); /*____________D3DXMatrixOrthoOffCenterRH_______________*/ - U(expectedmat).m[0][0] = 3.6363636f; U(expectedmat).m[0][1] = 0.0f; U(expectedmat).m[0][2] = 0.0f; U(expectedmat).m[0][3] = 0.0f; - U(expectedmat).m[1][0] = 0.0f; U(expectedmat).m[1][1] = 0.18018018f; U(expectedmat).m[1][2] = 0.0f; U(expectedmat).m[1][3] = 0.0f; - U(expectedmat).m[2][0] = 0.0f; U(expectedmat).m[2][1] = 0.0f; U(expectedmat).m[2][2] = 0.045662100f; U(expectedmat).m[2][3] = 0.0f; - U(expectedmat).m[3][0] = -1.7272727f; U(expectedmat).m[3][1] = -0.56756757f; U(expectedmat).m[3][2] = 0.42465753f; U(expectedmat).m[3][3] = 1.0f; + set_matrix(&expectedmat, + 3.6363636f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.18018018f, 0.0f, 0.0f, + 0.0f, 0.0f, 0.045662100f, 0.0f, + -1.7272727f, -0.56756757f, 0.42465753f, 1.0f); D3DXMatrixOrthoOffCenterRH(&gotmat, 0.2f, 0.75f, -2.4f, 8.7f, 9.3, -12.6); expect_matrix(&expectedmat, &gotmat, 32); /*____________D3DXMatrixOrthoRH_______________*/ - U(expectedmat).m[0][0] = 0.8f; U(expectedmat).m[0][1] = 0.0f; U(expectedmat).m[0][2] = 0.0f; U(expectedmat).m[0][3] = 0.0f; - U(expectedmat).m[1][0] = 0.0f; U(expectedmat).m[1][1] = 0.27027027f; U(expectedmat).m[1][2] = 0.0f; U(expectedmat).m[1][3] = 0.0f; - U(expectedmat).m[2][0] = 0.0f; U(expectedmat).m[2][1] = 0.0f; U(expectedmat).m[2][2] = 0.15151515f; U(expectedmat).m[2][3] = 0.0f; - U(expectedmat).m[3][0] = 0.0f; U(expectedmat).m[3][1] = 0.0f; U(expectedmat).m[3][2] = -0.48484848f; U(expectedmat).m[3][3] = 1.0f; + set_matrix(&expectedmat, + 0.8f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.27027027f, 0.0f, 0.0f, + 0.0f, 0.0f, 0.15151515f, 0.0f, + 0.0f, 0.0f, -0.48484848f, 1.0f); D3DXMatrixOrthoRH(&gotmat, 2.5f, 7.4f, -3.2f, -9.8f); expect_matrix(&expectedmat, &gotmat, 16); /*____________D3DXMatrixPerspectiveFovLH_______________*/ - U(expectedmat).m[0][0] = 13.288858f; U(expectedmat).m[0][1] = 0.0f; U(expectedmat).m[0][2] = 0.0f; U(expectedmat).m[0][3] = 0.0f; - U(expectedmat).m[1][0] = 0.0f; U(expectedmat).m[1][1] = 9.9666444f; U(expectedmat).m[1][2] = 0.0f; U(expectedmat).m[1][3] = 0.0f; - U(expectedmat).m[2][0] = 0.0f; U(expectedmat).m[2][1] = 0.0f; U(expectedmat).m[2][2] = 0.78378378f; U(expectedmat).m[2][3] = 1.0f; - U(expectedmat).m[3][0] = 0.0f; U(expectedmat).m[3][1] = 0.0f; U(expectedmat).m[3][2] = 1.8810811f; U(expectedmat).m[3][3] = 0.0f; + set_matrix(&expectedmat, + 13.288858f, 0.0f, 0.0f, 0.0f, + 0.0f, 9.9666444f, 0.0f, 0.0f, + 0.0f, 0.0f, 0.78378378f, 1.0f, + 0.0f, 0.0f, 1.8810811f, 0.0f); D3DXMatrixPerspectiveFovLH(&gotmat, 0.2f, 0.75f, -2.4f, 8.7f); expect_matrix(&expectedmat, &gotmat, 4); /*____________D3DXMatrixPerspectiveFovRH_______________*/ - U(expectedmat).m[0][0] = 13.288858f; U(expectedmat).m[0][1] = 0.0f; U(expectedmat).m[0][2] = 0.0f; U(expectedmat).m[0][3] = 0.0f; - U(expectedmat).m[1][0] = 0.0f; U(expectedmat).m[1][1] = 9.9666444f; U(expectedmat).m[1][2] = 0.0f; U(expectedmat).m[1][3] = 0.0f; - U(expectedmat).m[2][0] = 0.0f; U(expectedmat).m[2][1] = 0.0f; U(expectedmat).m[2][2] = -0.78378378f; U(expectedmat).m[2][3] = -1.0f; - U(expectedmat).m[3][0] = 0.0f; U(expectedmat).m[3][1] = 0.0f; U(expectedmat).m[3][2] = 1.8810811f; U(expectedmat).m[3][3] = 0.0f; + set_matrix(&expectedmat, + 13.288858f, 0.0f, 0.0f, 0.0f, + 0.0f, 9.9666444f, 0.0f, 0.0f, + 0.0f, 0.0f, -0.78378378f, -1.0f, + 0.0f, 0.0f, 1.8810811f, 0.0f); D3DXMatrixPerspectiveFovRH(&gotmat, 0.2f, 0.75f, -2.4f, 8.7f); expect_matrix(&expectedmat, &gotmat, 4); /*____________D3DXMatrixPerspectiveLH_______________*/ - U(expectedmat).m[0][0] = -24.0f; U(expectedmat).m[0][1] = 0.0f; U(expectedmat).m[0][2] = 0.0f; U(expectedmat).m[0][3] = 0.0f; - U(expectedmat).m[1][0] = 0.0f; U(expectedmat).m[1][1] = -6.4f; U(expectedmat).m[1][2] = 0.0f; U(expectedmat).m[1][3] = 0.0f; - U(expectedmat).m[2][0] = 0.0f; U(expectedmat).m[2][1] = 0.0f; U(expectedmat).m[2][2] = 0.78378378f; U(expectedmat).m[2][3] = 1.0f; - U(expectedmat).m[3][0] = 0.0f; U(expectedmat).m[3][1] = 0.0f; U(expectedmat).m[3][2] = 1.8810811f; U(expectedmat).m[3][3] = 0.0f; + set_matrix(&expectedmat, + -24.0f, 0.0f, 0.0f, 0.0f, + 0.0f, -6.4f, 0.0f, 0.0f, + 0.0f, 0.0f, 0.78378378f, 1.0f, + 0.0f, 0.0f, 1.8810811f, 0.0f); D3DXMatrixPerspectiveLH(&gotmat, 0.2f, 0.75f, -2.4f, 8.7f); expect_matrix(&expectedmat, &gotmat, 4); /*____________D3DXMatrixPerspectiveOffCenterLH_______________*/ - U(expectedmat).m[0][0] = 11.636364f; U(expectedmat).m[0][1] = 0.0f; U(expectedmat).m[0][2] = 0.0f; U(expectedmat).m[0][3] = 0.0f; - U(expectedmat).m[1][0] = 0.0f; U(expectedmat).m[1][1] = 0.57657658f; U(expectedmat).m[1][2] = 0.0f; U(expectedmat).m[1][3] = 0.0f; - U(expectedmat).m[2][0] = -1.7272727f; U(expectedmat).m[2][1] = -0.56756757f; U(expectedmat).m[2][2] = 0.84079602f; U(expectedmat).m[2][3] = 1.0f; - U(expectedmat).m[3][0] = 0.0f; U(expectedmat).m[3][1] = 0.0f; U(expectedmat).m[3][2] = -2.6905473f; U(expectedmat).m[3][3] = 0.0f; + set_matrix(&expectedmat, + 11.636364f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.57657658f, 0.0f, 0.0f, + -1.7272727f, -0.56756757f, 0.84079602f, 1.0f, + 0.0f, 0.0f, -2.6905473f, 0.0f); D3DXMatrixPerspectiveOffCenterLH(&gotmat, 0.2f, 0.75f, -2.4f, 8.7f, 3.2f, -16.9f); expect_matrix(&expectedmat, &gotmat, 8); /*____________D3DXMatrixPerspectiveOffCenterRH_______________*/ - U(expectedmat).m[0][0] = 11.636364f; U(expectedmat).m[0][1] = 0.0f; U(expectedmat).m[0][2] = 0.0f; U(expectedmat).m[0][3] = 0.0f; - U(expectedmat).m[1][0] = 0.0f; U(expectedmat).m[1][1] = 0.57657658f; U(expectedmat).m[1][2] = 0.0f; U(expectedmat).m[1][3] = 0.0f; - U(expectedmat).m[2][0] = 1.7272727f; U(expectedmat).m[2][1] = 0.56756757f; U(expectedmat).m[2][2] = -0.84079602f; U(expectedmat).m[2][3] = -1.0f; - U(expectedmat).m[3][0] = 0.0f; U(expectedmat).m[3][1] = 0.0f; U(expectedmat).m[3][2] = -2.6905473f; U(expectedmat).m[3][3] = 0.0f; + set_matrix(&expectedmat, + 11.636364f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.57657658f, 0.0f, 0.0f, + 1.7272727f, 0.56756757f, -0.84079602f, -1.0f, + 0.0f, 0.0f, -2.6905473f, 0.0f); D3DXMatrixPerspectiveOffCenterRH(&gotmat, 0.2f, 0.75f, -2.4f, 8.7f, 3.2f, -16.9f); expect_matrix(&expectedmat, &gotmat, 8); /*____________D3DXMatrixPerspectiveRH_______________*/ - U(expectedmat).m[0][0] = -24.0f; U(expectedmat).m[0][1] = -0.0f; U(expectedmat).m[0][2] = 0.0f; U(expectedmat).m[0][3] = 0.0f; - U(expectedmat).m[1][0] = 0.0f; U(expectedmat).m[1][1] = -6.4f; U(expectedmat).m[1][2] = 0.0f; U(expectedmat).m[1][3] = 0.0f; - U(expectedmat).m[2][0] = 0.0f; U(expectedmat).m[2][1] = 0.0f; U(expectedmat).m[2][2] = -0.78378378f; U(expectedmat).m[2][3] = -1.0f; - U(expectedmat).m[3][0] = 0.0f; U(expectedmat).m[3][1] = 0.0f; U(expectedmat).m[3][2] = 1.8810811f; U(expectedmat).m[3][3] = 0.0f; + set_matrix(&expectedmat, + -24.0f, -0.0f, 0.0f, 0.0f, + 0.0f, -6.4f, 0.0f, 0.0f, + 0.0f, 0.0f, -0.78378378f, -1.0f, + 0.0f, 0.0f, 1.8810811f, 0.0f); D3DXMatrixPerspectiveRH(&gotmat, 0.2f, 0.75f, -2.4f, 8.7f); expect_matrix(&expectedmat, &gotmat, 4); /*____________D3DXMatrixReflect______________*/ - U(expectedmat).m[0][0] = 0.30769235f; U(expectedmat).m[0][1] = -0.23076922f; U(expectedmat).m[0][2] = 0.92307687f; U(expectedmat).m[0][3] = 0.0f; - U(expectedmat).m[1][0] = -0.23076922; U(expectedmat).m[1][1] = 0.92307693f; U(expectedmat).m[1][2] = 0.30769232f; U(expectedmat).m[1][3] = 0.0f; - U(expectedmat).m[2][0] = 0.92307687f; U(expectedmat).m[2][1] = 0.30769232f; U(expectedmat).m[2][2] = -0.23076922f; U(expectedmat).m[2][3] = 0.0f; - U(expectedmat).m[3][0] = 1.6153846f; U(expectedmat).m[3][1] = 0.53846157f; U(expectedmat).m[3][2] = -2.1538463f; U(expectedmat).m[3][3] = 1.0f; - D3DXMatrixReflect(&gotmat,&plane); + set_matrix(&expectedmat, + 0.30769235f, -0.23076922f, 0.92307687f, 0.0f, + -0.23076922, 0.92307693f, 0.30769232f, 0.0f, + 0.92307687f, 0.30769232f, -0.23076922f, 0.0f, + 1.6153846f, 0.53846157f, -2.1538463f, 1.0f); + D3DXMatrixReflect(&gotmat, &plane); expect_matrix(&expectedmat, &gotmat, 32); /*____________D3DXMatrixRotationAxis_____*/ - U(expectedmat).m[0][0] = 0.50847453f; U(expectedmat).m[0][1] = 0.76380461f; U(expectedmat).m[0][2] = 0.39756277f; U(expectedmat).m[0][3] = 0.0f; - U(expectedmat).m[1][0] = -0.81465209f; U(expectedmat).m[1][1] = 0.57627118f; U(expectedmat).m[1][2] = -0.065219201f; U(expectedmat).m[1][3] = 0.0f; - U(expectedmat).m[2][0] = -0.27891868f; U(expectedmat).m[2][1] = -0.29071301f; U(expectedmat).m[2][2] = 0.91525424f; U(expectedmat).m[2][3] = 0.0f; - U(expectedmat).m[3][0] = 0.0f; U(expectedmat).m[3][1] = 0.0f; U(expectedmat).m[3][2] = 0.0f; U(expectedmat).m[3][3] = 1.0f; - D3DXMatrixRotationAxis(&gotmat,&axis,angle); + set_matrix(&expectedmat, + 0.50847453f, 0.76380461f, 0.39756277f, 0.0f, + -0.81465209f, 0.57627118f, -0.065219201f, 0.0f, + -0.27891868f, -0.29071301f, 0.91525424f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f); + D3DXMatrixRotationAxis(&gotmat, &axis, angle); expect_matrix(&expectedmat, &gotmat, 32); /*____________D3DXMatrixRotationQuaternion______________*/ - U(expectedmat).m[0][0] = -129.0f; U(expectedmat).m[0][1] = -162.0f; U(expectedmat).m[0][2] = -74.0f; U(expectedmat).m[0][3] = 0.0f; - U(expectedmat).m[1][0] = 146.0f; U(expectedmat).m[1][1] = -99.0f; U(expectedmat).m[1][2] = -78.0f; U(expectedmat).m[1][3] = 0.0f; - U(expectedmat).m[2][0] = 102.0f; U(expectedmat).m[2][1] = -34.0f; U(expectedmat).m[2][2] = -33.0f; U(expectedmat).m[2][3] = 0.0f; - U(expectedmat).m[3][0] = 0.0f; U(expectedmat).m[3][1] = 0.0f; U(expectedmat).m[3][2] = 0.0f; U(expectedmat).m[3][3] = 1.0f; - D3DXMatrixRotationQuaternion(&gotmat,&q); + set_matrix(&expectedmat, + -129.0f, -162.0f, -74.0f, 0.0f, + 146.0f, -99.0f, -78.0f, 0.0f, + 102.0f, -34.0f, -33.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f); + D3DXMatrixRotationQuaternion(&gotmat, &q); expect_matrix(&expectedmat, &gotmat, 0); /*____________D3DXMatrixRotationX______________*/ - U(expectedmat).m[0][0] = 1.0f; U(expectedmat).m[0][1] = 0.0f; U(expectedmat).m[0][2] = 0.0f; U(expectedmat).m[0][3] = 0.0f; - U(expectedmat).m[1][0] = 0.0f; U(expectedmat).m[1][1] = 0.5f; U(expectedmat).m[1][2] = sqrt(3.0f)/2.0f; U(expectedmat).m[1][3] = 0.0f; - U(expectedmat).m[2][0] = 0.0f; U(expectedmat).m[2][1] = -sqrt(3.0f)/2.0f; U(expectedmat).m[2][2] = 0.5f; U(expectedmat).m[2][3] = 0.0f; - U(expectedmat).m[3][0] = 0.0f; U(expectedmat).m[3][1] = 0.0f; U(expectedmat).m[3][2] = 0.0f; U(expectedmat).m[3][3] = 1.0f; - D3DXMatrixRotationX(&gotmat,angle); + set_matrix(&expectedmat, + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.5f, sqrt(3.0f)/2.0f, 0.0f, + 0.0f, -sqrt(3.0f)/2.0f, 0.5f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f); + D3DXMatrixRotationX(&gotmat, angle); expect_matrix(&expectedmat, &gotmat, 1); /*____________D3DXMatrixRotationY______________*/ - U(expectedmat).m[0][0] = 0.5f; U(expectedmat).m[0][1] = 0.0f; U(expectedmat).m[0][2] = -sqrt(3.0f)/2.0f; U(expectedmat).m[0][3] = 0.0f; - U(expectedmat).m[1][0] = 0.0f; U(expectedmat).m[1][1] = 1.0f; U(expectedmat).m[1][2] = 0.0f; U(expectedmat).m[1][3] = 0.0f; - U(expectedmat).m[2][0] = sqrt(3.0f)/2.0f; U(expectedmat).m[2][1] = 0.0f; U(expectedmat).m[2][2] = 0.5f; U(expectedmat).m[2][3] = 0.0f; - U(expectedmat).m[3][0] = 0.0f; U(expectedmat).m[3][1] = 0.0f; U(expectedmat).m[3][2] = 0.0f; U(expectedmat).m[3][3] = 1.0f; - D3DXMatrixRotationY(&gotmat,angle); + set_matrix(&expectedmat, + 0.5f, 0.0f, -sqrt(3.0f)/2.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + sqrt(3.0f)/2.0f, 0.0f, 0.5f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f); + D3DXMatrixRotationY(&gotmat, angle); expect_matrix(&expectedmat, &gotmat, 1); /*____________D3DXMatrixRotationYawPitchRoll____*/ - U(expectedmat).m[0][0] = 0.88877726f; U(expectedmat).m[0][1] = 0.091874748f; U(expectedmat).m[0][2] = -0.44903678f; U(expectedmat).m[0][3] = 0.0f; - U(expectedmat).m[1][0] = 0.35171318f; U(expectedmat).m[1][1] = 0.49148652f; U(expectedmat).m[1][2] = 0.79670501f; U(expectedmat).m[1][3] = 0.0f; - U(expectedmat).m[2][0] = 0.29389259f; U(expectedmat).m[2][1] = -0.86602545f; U(expectedmat).m[2][2] = 0.40450847f; U(expectedmat).m[2][3] = 0.0f; - U(expectedmat).m[3][0] = 0.0f; U(expectedmat).m[3][1] = 0.0f; U(expectedmat).m[3][2] = 0.0f; U(expectedmat).m[3][3] = 1.0f; + set_matrix(&expectedmat, + 0.88877726f, 0.091874748f, -0.44903678f, 0.0f, + 0.35171318f, 0.49148652f, 0.79670501f, 0.0f, + 0.29389259f, -0.86602545f, 0.40450847f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f); D3DXMatrixRotationYawPitchRoll(&gotmat, 3.0f*angle/5.0f, angle, 3.0f*angle/17.0f); expect_matrix(&expectedmat, &gotmat, 64); /*____________D3DXMatrixRotationZ______________*/ - U(expectedmat).m[0][0] = 0.5f; U(expectedmat).m[0][1] = sqrt(3.0f)/2.0f; U(expectedmat).m[0][2] = 0.0f; U(expectedmat).m[0][3] = 0.0f; - U(expectedmat).m[1][0] = -sqrt(3.0f)/2.0f; U(expectedmat).m[1][1] = 0.5f; U(expectedmat).m[1][2] = 0.0f; U(expectedmat).m[1][3] = 0.0f; - U(expectedmat).m[2][0] = 0.0f; U(expectedmat).m[2][1] = 0.0f; U(expectedmat).m[2][2] = 1.0f; U(expectedmat).m[2][3] = 0.0f; - U(expectedmat).m[3][0] = 0.0f; U(expectedmat).m[3][1] = 0.0f; U(expectedmat).m[3][2] = 0.0f; U(expectedmat).m[3][3] = 1.0f; - D3DXMatrixRotationZ(&gotmat,angle); + set_matrix(&expectedmat, + 0.5f, sqrt(3.0f)/2.0f, 0.0f, 0.0f, + -sqrt(3.0f)/2.0f, 0.5f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f); + D3DXMatrixRotationZ(&gotmat, angle); expect_matrix(&expectedmat, &gotmat, 1); /*____________D3DXMatrixScaling______________*/ - U(expectedmat).m[0][0] = 0.69f; U(expectedmat).m[0][1] = 0.0f; U(expectedmat).m[0][2] = 0.0f; U(expectedmat).m[0][3] = 0.0f; - U(expectedmat).m[1][0] = 0.0f; U(expectedmat).m[1][1] = 0.53f; U(expectedmat).m[1][2] = 0.0f; U(expectedmat).m[1][3] = 0.0f; - U(expectedmat).m[2][0] = 0.0f; U(expectedmat).m[2][1] = 0.0f; U(expectedmat).m[2][2] = 4.11f; U(expectedmat).m[2][3] = 0.0f; - U(expectedmat).m[3][0] = 0.0f; U(expectedmat).m[3][1] = 0.0f; U(expectedmat).m[3][2] = 0.0f; U(expectedmat).m[3][3] = 1.0f; - D3DXMatrixScaling(&gotmat,0.69f,0.53f,4.11f); + set_matrix(&expectedmat, + 0.69f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.53f, 0.0f, 0.0f, + 0.0f, 0.0f, 4.11f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f); + D3DXMatrixScaling(&gotmat, 0.69f, 0.53f, 4.11f); expect_matrix(&expectedmat, &gotmat, 0); /*____________D3DXMatrixShadow______________*/ - U(expectedmat).m[0][0] = 12.786773f; U(expectedmat).m[0][1] = 5.0009613f; U(expectedmat).m[0][2] = 4.3537784f; U(expectedmat).m[0][3] = 3.7065949f; - U(expectedmat).m[1][0] = 1.8827150f; U(expectedmat).m[1][1] = 8.8056154f; U(expectedmat).m[1][2] = 1.4512594f; U(expectedmat).m[1][3] = 1.2355317f; - U(expectedmat).m[2][0] = -7.5308599f; U(expectedmat).m[2][1] = -6.6679487f; U(expectedmat).m[2][2] = 1.3335901f; U(expectedmat).m[2][3] = -4.9421268f; - U(expectedmat).m[3][0] = -13.179006f; U(expectedmat).m[3][1] = -11.668910f; U(expectedmat).m[3][2] = -10.158816f; U(expectedmat).m[3][3] = -1.5100943f; - D3DXMatrixShadow(&gotmat,&light,&plane); + set_matrix(&expectedmat, + 12.786773f, 5.0009613f, 4.3537784f, 3.7065949f, + 1.8827150f, 8.8056154f, 1.4512594f, 1.2355317f, + -7.5308599f, -6.6679487f, 1.3335901f, -4.9421268f, + -13.179006f, -11.668910f, -10.158816f, -1.5100943f); + D3DXMatrixShadow(&gotmat, &light, &plane); expect_matrix(&expectedmat, &gotmat, 8); /*____________D3DXMatrixTransformation______________*/ - U(expectedmat).m[0][0] = -0.21480007f; U(expectedmat).m[0][1] = 1.3116000f; U(expectedmat).m[0][2] = 0.47520003f; U(expectedmat).m[0][3] = 0.0f; - U(expectedmat).m[1][0] = 0.95040143f; U(expectedmat).m[1][1] = -0.88360137f; U(expectedmat).m[1][2] = 0.92439979f; U(expectedmat).m[1][3] = 0.0f; - U(expectedmat).m[2][0] = 1.0212044f; U(expectedmat).m[2][1] = 0.19359307f; U(expectedmat).m[2][2] = -1.3588026f; U(expectedmat).m[2][3] = 0.0f; - U(expectedmat).m[3][0] = 18.298532f; U(expectedmat).m[3][1] = -29.624001f; U(expectedmat).m[3][2] = 15.683499f; U(expectedmat).m[3][3] = 1.0f; - D3DXMatrixTransformation(&gotmat,&at,&q,NULL,&eye,&r,&last); + set_matrix(&expectedmat, + -0.21480007f, 1.3116000f, 0.47520003f, 0.0f, + 0.95040143f, -0.88360137f, 0.92439979f, 0.0f, + 1.0212044f, 0.19359307f, -1.3588026f, 0.0f, + 18.298532f, -29.624001f, 15.683499f, 1.0f); + D3DXMatrixTransformation(&gotmat, &at, &q, NULL, &eye, &r, &last); expect_matrix(&expectedmat, &gotmat, 512); /*____________D3DXMatrixTranslation______________*/ - U(expectedmat).m[0][0] = 1.0f; U(expectedmat).m[0][1] = 0.0f; U(expectedmat).m[0][2] = 0.0f; U(expectedmat).m[0][3] = 0.0f; - U(expectedmat).m[1][0] = 0.0f; U(expectedmat).m[1][1] = 1.0f; U(expectedmat).m[1][2] = 0.0f; U(expectedmat).m[1][3] = 0.0f; - U(expectedmat).m[2][0] = 0.0f; U(expectedmat).m[2][1] = 0.0f; U(expectedmat).m[2][2] = 1.0f; U(expectedmat).m[2][3] = 0.0f; - U(expectedmat).m[3][0] = 0.69f; U(expectedmat).m[3][1] = 0.53f; U(expectedmat).m[3][2] = 4.11f; U(expectedmat).m[3][3] = 1.0f; - D3DXMatrixTranslation(&gotmat,0.69f,0.53f,4.11f); + set_matrix(&expectedmat, + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.69f, 0.53f, 4.11f, 1.0f); + D3DXMatrixTranslation(&gotmat, 0.69f, 0.53f, 4.11f); expect_matrix(&expectedmat, &gotmat, 0); /*____________D3DXMatrixTranspose______________*/ - U(expectedmat).m[0][0] = 10.0f; U(expectedmat).m[0][1] = 11.0f; U(expectedmat).m[0][2] = 19.0f; U(expectedmat).m[0][3] = 2.0f; - U(expectedmat).m[1][0] = 5.0f; U(expectedmat).m[1][1] = 20.0f; U(expectedmat).m[1][2] = -21.0f; U(expectedmat).m[1][3] = 3.0f; - U(expectedmat).m[2][0] = 7.0f; U(expectedmat).m[2][1] = 16.0f; U(expectedmat).m[2][2] = 30.f; U(expectedmat).m[2][3] = -4.0f; - U(expectedmat).m[3][0] = 8.0f; U(expectedmat).m[3][1] = 33.0f; U(expectedmat).m[3][2] = 43.0f; U(expectedmat).m[3][3] = -40.0f; - D3DXMatrixTranspose(&gotmat,&mat); + set_matrix(&expectedmat, + 10.0f, 11.0f, 19.0f, 2.0f, + 5.0f, 20.0f, -21.0f, 3.0f, + 7.0f, 16.0f, 30.f, -4.0f, + 8.0f, 33.0f, 43.0f, -40.0f); + D3DXMatrixTranspose(&gotmat, &mat); expect_matrix(&expectedmat, &gotmat, 0); } @@ -1134,10 +1175,11 @@ static void D3DXVector2Test(void) w.x = 4.0f; w.y = -3.0f; x.x = 2.0f; x.y = -11.0f; - U(mat).m[0][0] = 1.0f; U(mat).m[0][1] = 2.0f; U(mat).m[0][2] = 3.0f; U(mat).m[0][3] = 4.0f; - U(mat).m[1][0] = 5.0f; U(mat).m[1][1] = 6.0f; U(mat).m[1][2] = 7.0f; U(mat).m[1][3] = 8.0f; - U(mat).m[2][0] = 9.0f; U(mat).m[2][1] = 10.0f; U(mat).m[2][2] = 11.0f; U(mat).m[2][3] = 12.0f; - U(mat).m[3][0] = 13.0f; U(mat).m[3][1] = 14.0f; U(mat).m[3][2] = 15.0f; U(mat).m[3][3] = 16.0f; + set_matrix(&mat, + 1.0f, 2.0f, 3.0f, 4.0f, + 5.0f, 6.0f, 7.0f, 8.0f, + 9.0f, 10.0f, 11.0f, 12.0f, + 13.0f, 14.0f, 15.0f, 16.0f); coeff1 = 2.0f; coeff2 = 5.0f; scale = -6.5f; @@ -1309,10 +1351,11 @@ static void D3DXVector3Test(void) viewport.Width = 800; viewport.MinZ = 0.2f; viewport.X = 10; viewport.Height = 680; viewport.MaxZ = 0.9f; viewport.Y = 5; - U(mat).m[0][0] = 1.0f; U(mat).m[0][1] = 2.0f; U(mat).m[0][2] = 3.0f; U(mat).m[0][3] = 4.0f; - U(mat).m[1][0] = 5.0f; U(mat).m[1][1] = 6.0f; U(mat).m[1][2] = 7.0f; U(mat).m[1][3] = 8.0f; - U(mat).m[2][0] = 9.0f; U(mat).m[2][1] = 10.0f; U(mat).m[2][2] = 11.0f; U(mat).m[2][3] = 12.0f; - U(mat).m[3][0] = 13.0f; U(mat).m[3][1] = 14.0f; U(mat).m[3][2] = 15.0f; U(mat).m[3][3] = 16.0f; + set_matrix(&mat, + 1.0f, 2.0f, 3.0f, 4.0f, + 5.0f, 6.0f, 7.0f, 8.0f, + 9.0f, 10.0f, 11.0f, 12.0f, + 13.0f, 14.0f, 15.0f, 16.0f); U(view).m[0][1] = 5.0f; U(view).m[0][2] = 7.0f; U(view).m[0][3] = 8.0f; U(view).m[1][0] = 11.0f; U(view).m[1][2] = 16.0f; U(view).m[1][3] = 33.0f; @@ -1321,10 +1364,11 @@ static void D3DXVector3Test(void) U(view).m[0][0] = 10.0f; U(view).m[1][1] = 20.0f; U(view).m[2][2] = 30.0f; U(view).m[3][3] = -40.0f; - U(world).m[0][0] = 21.0f; U(world).m[0][1] = 2.0f; U(world).m[0][2] = 3.0f; U(world).m[0][3] = 4.0; - U(world).m[1][0] = 5.0f; U(world).m[1][1] = 23.0f; U(world).m[1][2] = 7.0f; U(world).m[1][3] = 8.0f; - U(world).m[2][0] = -8.0f; U(world).m[2][1] = -7.0f; U(world).m[2][2] = 25.0f; U(world).m[2][3] = -5.0f; - U(world).m[3][0] = -4.0f; U(world).m[3][1] = -3.0f; U(world).m[3][2] = -2.0f; U(world).m[3][3] = 27.0f; + set_matrix(&world, + 21.0f, 2.0f, 3.0f, 4.0f, + 5.0f, 23.0f, 7.0f, 8.0f, + -8.0f, -7.0f, 25.0f, -5.0f, + -4.0f, -3.0f, -2.0f, 27.0f); coeff1 = 2.0f; coeff2 = 5.0f; scale = -6.5f; @@ -1542,10 +1586,11 @@ static void D3DXVector4Test(void) w.x = 4.0f; w.y =6.0f; w.z = -2.0f; w.w = 1.0f; x.x = 6.0f; x.y = -7.0f; x.z =8.0f; x.w = -9.0f; - U(mat).m[0][0] = 1.0f; U(mat).m[0][1] = 2.0f; U(mat).m[0][2] = 3.0f; U(mat).m[0][3] = 4.0f; - U(mat).m[1][0] = 5.0f; U(mat).m[1][1] = 6.0f; U(mat).m[1][2] = 7.0f; U(mat).m[1][3] = 8.0f; - U(mat).m[2][0] = 9.0f; U(mat).m[2][1] = 10.0f; U(mat).m[2][2] = 11.0f; U(mat).m[2][3] = 12.0f; - U(mat).m[3][0] = 13.0f; U(mat).m[3][1] = 14.0f; U(mat).m[3][2] = 15.0f; U(mat).m[3][3] = 16.0f; + set_matrix(&mat, + 1.0f, 2.0f, 3.0f, 4.0f, + 5.0f, 6.0f, 7.0f, 8.0f, + 9.0f, 10.0f, 11.0f, 12.0f, + 13.0f, 14.0f, 15.0f, 16.0f); coeff1 = 2.0f; coeff2 = 5.0; scale = -6.5f; @@ -2319,12 +2364,13 @@ static void test_D3DXVec_Array(void) inp_plane[i].b = inp_plane[i].d = inp_vec[i].y = inp_vec[i].w = ARRAY_SIZE(inp_vec) - i; } - U(mat).m[0][0] = 1.0f; U(mat).m[0][1] = 2.0f; U(mat).m[0][2] = 3.0f; U(mat).m[0][3] = 4.0f; - U(mat).m[1][0] = 5.0f; U(mat).m[1][1] = 6.0f; U(mat).m[1][2] = 7.0f; U(mat).m[1][3] = 8.0f; - U(mat).m[2][0] = 9.0f; U(mat).m[2][1] = 10.0f; U(mat).m[2][2] = 11.0f; U(mat).m[2][3] = 12.0f; - U(mat).m[3][0] = 13.0f; U(mat).m[3][1] = 14.0f; U(mat).m[3][2] = 15.0f; U(mat).m[3][3] = 16.0f; + set_matrix(&mat, + 1.0f, 2.0f, 3.0f, 4.0f, + 5.0f, 6.0f, 7.0f, 8.0f, + 9.0f, 10.0f, 11.0f, 12.0f, + 13.0f, 14.0f, 15.0f, 16.0f); - D3DXMatrixPerspectiveFovLH(&projection,D3DX_PI/4.0f,20.0f/17.0f,1.0f,1000.0f); + D3DXMatrixPerspectiveFovLH(&projection, D3DX_PI/4.0f, 20.0f/17.0f, 1.0f, 1000.0f); U(view).m[0][1] = 5.0f; U(view).m[0][2] = 7.0f; U(view).m[0][3] = 8.0f; U(view).m[1][0] = 11.0f; U(view).m[1][2] = 16.0f; U(view).m[1][3] = 33.0f; @@ -2333,10 +2379,11 @@ static void test_D3DXVec_Array(void) U(view).m[0][0] = 10.0f; U(view).m[1][1] = 20.0f; U(view).m[2][2] = 30.0f; U(view).m[3][3] = -40.0f; - U(world).m[0][0] = 21.0f; U(world).m[0][1] = 2.0f; U(world).m[0][2] = 3.0f; U(world).m[0][3] = 4.0; - U(world).m[1][0] = 5.0f; U(world).m[1][1] = 23.0f; U(world).m[1][2] = 7.0f; U(world).m[1][3] = 8.0f; - U(world).m[2][0] = -8.0f; U(world).m[2][1] = -7.0f; U(world).m[2][2] = 25.0f; U(world).m[2][3] = -5.0f; - U(world).m[3][0] = -4.0f; U(world).m[3][1] = -3.0f; U(world).m[3][2] = -2.0f; U(world).m[3][3] = 27.0f; + set_matrix(&world, + 21.0f, 2.0f, 3.0f, 4.0f, + 5.0f, 23.0f, 7.0f, 8.0f, + -8.0f, -7.0f, 25.0f, -5.0f, + -4.0f, -3.0f, -2.0f, 27.0f); /* D3DXVec2TransformCoordArray */ exp_vec[1].x = 6.78571403e-01f; exp_vec[1].y = 7.85714269e-01f; -- 2.15.0

2 1

Re: [PATCH] d3dx11: Change D3DX11CompileFromMemory spec entry.
by Matteo Bruni 10 Nov '17

10 Nov '17

Same here. Regardless: Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>

1 0

Re: [PATCH] d3dx10: Change D3DX10CompileFromMemory and D3DX10PreprocessShaderFromMemory spec entries.
by Matteo Bruni 10 Nov '17

10 Nov '17

I'd use "Fix" rather than the generic "Change" in the patch subject. Either way: Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>

1 0

Re: [PATCH] d3dx9: Zero constantinfo_reserved on error in get_constants_desc().
by Matteo Bruni 10 Nov '17

10 Nov '17

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>

1 0

Re: [PATCH] d3dx9/tests: Relax D3DXQuaternionToAxisAngle test stringency a bit
by Matteo Bruni 10 Nov '17

10 Nov '17

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>

1 0

Switch to wine-devel for patch submissions
by Alexandre Julliard 10 Nov '17

10 Nov '17

Folks, The wine-devel list can now be used for submitting patches. Please start using it instead of wine-patches for all patch submissions and signoff replies. For the time being, both lists feed into the patch tracker. Once we have confirmed that everything works, wine-patches will be retired. The tracker should be able to figure out which mails are patches, but for the benefit of human readers, please add a [PATCH] notice in the subject line of your mails. Please let me know if you notice anything broken. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [PATCH] d3dx9/tests: Use a macro to initialize matrix rows in math tests
by Henri Verbeet 10 Nov '17

10 Nov '17

On 10 November 2017 at 08:06, Alex Henrie <alexhenrie24(a)gmail.com> wrote: > diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c > index ec07348685..409e3cb650 100644 > --- a/dlls/d3dx9_36/tests/math.c > +++ b/dlls/d3dx9_36/tests/math.c > @@ -25,6 +25,8 @@ > > #define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) > > +#define SET_ARRAY4(array, a, b, c, d) array[0] = a; array[1] = b; array[2] = c; array[3] = d You don't need a macro for that.

2 2

Re: [Resend PATCH] kernel32: Handle zh-Hant and zh-Hans in LocaleNameToLCID.
by Alexandre Julliard 10 Nov '17

10 Nov '17

Zhiyi Zhang <yi.gd.cn(a)gmail.com> writes: > Superseded patch 138395. > > LocaleNameToLCID now can handle zh-Hant and zh-Hans correctly with > get_default_children().get_default_children() acts as a map from a > parent language to its default child language.Since zh-Hant and > zh-Hans are not actual locale identifiers. All locale info of zh-Hant > and zh-Hans are directly mapped to its own child language, zh-HK and zh-CN. The LOCALE_SPARENT data is a good addition, but this could be split to a separate patch. Also you should be able to extend the existing get_default_sublang() logic instead of adding another table of defaults. -- Alexandre Julliard julliard(a)winehq.org

2 2

[PATCH] kernel32/nls: Add LOCALE_SPARENT entries.
by Zhiyi Zhang 10 Nov '17

10 Nov '17

1 0

Re: [PATCH v2] d3dx9: Reduce rounding error in D3DXQuaternionToAxisAngle
by Henri Verbeet 10 Nov '17

10 Nov '17

On 9 November 2017 at 20:04, Alex Henrie <alexhenrie24(a)gmail.com> wrote: > v2: Change 2.0f to simply 2.0 to make it clear that truncation is done > after multiplication. Mostly for what it's worth, note that that makes no difference for a multiplication by two. The exponent is incremented, the significand stays the same.

2 1

Re: [PATCH] d3dx10: Add D3DX10PreprocessShaderFromMemory stub.
by Henri Verbeet 09 Nov '17

09 Nov '17

On 9 November 2017 at 17:55, Andrey Gusev <andrey.goosev(a)gmail.com> wrote: > +HRESULT WINAPI D3DX10PreprocessShaderFromMemory(const char *data, SIZE_T data_size, const char *filename, > + const D3D10_SHADER_MACRO *defines, ID3DInclude *include, ID3DX10ThreadPump *pump, ID3D10Blob **shader_text, > + ID3D10Blob **errors, HRESULT *hresult) > +{ > + FIXME("data %s, data_size %lu, filename %s, defines %p, include %p, pump %p, shader_text %p, errors %p, " > + "hresult %p stub!\n", > + debugstr_a(data), data_size, debugstr_a(filename), defines, include, pump, shader_text, errors, hresult); It's questionable how useful debugstr_a() is for "data", but it's also wrong. "data" is not necessarily \0 terminated, "data_size" specifies its length. > -@ stub D3DX10PreprocessShaderFromMemory(str long str ptr ptr ptr ptr ptr) > +@ stdcall D3DX10PreprocessShaderFromMemory(str long str ptr ptr ptr ptr ptr ptr) Likewise.

2 1

Re: d3dx9_36: Silence an uninitialized compiler warning (GCC 8).
by Paul Gofman 09 Nov '17

09 Nov '17

There is actually no usage of uninitialized variable there, though it is probably not exactly straightforward for compiler to guess. Why it does not complain that 'cdesc[index]' may be used uninitialized while it is handled the same way? AFAIK GCC 8 is not released yet, maybe this will change before final release? If still to change that, does the attached patch fixes the warning as well (sorry, I don't have gcc 8 in hands to test)? If yes, I would suggest that would be a tiny bit nicer way to silence the warning. On 11/07/2017 01:22 AM, Gerald Pfeifer wrote: > There are more of this in d3dx9_36, but at least this is one down. > > Gerald > > > Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> > --- > dlls/d3dx9_36/preshader.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c > index e3e91c643b..ed22dc4045 100644 > --- a/dlls/d3dx9_36/preshader.c > +++ b/dlls/d3dx9_36/preshader.c > @@ -888,7 +888,7 @@ static HRESULT get_constants_desc(unsigned int *byte_code, struct d3dx_const_tab > for (i = 0; i < desc.Constants; ++i) > { > unsigned int index = out->input_count; > - WORD constantinfo_reserved; > + WORD constantinfo_reserved = 0; > > hc = ID3DXConstantTable_GetConstant(ctab, NULL, i); > if (!hc)

3 5

Re: [PATCH v2] d3dx9: Reduce rounding error in D3DXQuaternionToAxisAngle
by Matteo Bruni 09 Nov '17

09 Nov '17

2017-11-09 17:34 GMT+01:00 Alex Henrie <alexhenrie24(a)gmail.com>: > Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> > --- > Fixes test failure on 64-bit Linux. > > v2: Change 2.0f to simply 2.0 to make it clear that truncation is done > after multiplication. > --- > dlls/d3dx9_36/math.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c > index 8f5f5b2413..1b4edf82cf 100644 > --- a/dlls/d3dx9_36/math.c > +++ b/dlls/d3dx9_36/math.c > @@ -1651,7 +1651,7 @@ void WINAPI D3DXQuaternionToAxisAngle(const D3DXQUATERNION *pq, D3DXVECTOR3 *pax > paxis->z = pq->z; > } > if (pangle) > - *pangle = 2.0f * acosf(pq->w); > + *pangle = 2.0 * acos(pq->w); /* acosf has too much rounding error */ > } > > /*_________________D3DXVec2_____________________*/ > -- > 2.14.2 I think just relaxing the test a tiny bit, allowing 1 ULP of error margin, is preferable in this case.

1 0

Re: [PATCH] d3dx9/tests: Provide 8 significant digits in matrix reference values
by Henri Verbeet 09 Nov '17

09 Nov '17

Thanks for fixing these. 2017-11-09 6:10 GMT+01:00 Alex Henrie <alexhenrie24(a)gmail.com>: > Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> > --- > Fixes test failures on 64-bit Linux. > > A 32-bit float can hold 7.2 decimal digits, so it's best to provide 8 to > make sure that the correct values are accurately represented. > If it were up to me, I'd prefer these to be in the same %.8e format the failure messages use. > The correct outputs of functions that take simple floats as inputs were > computed by feeding equations into Wolfram Alpha. I think that's probably fine, but note that we don't care about the "correct" values so much as "whatever Windows produces". Hopefully those would be reasonably close, but they're by no means guaranteed to be the same.

3 2

Re: [PATCH] d3dx9: Reduce rounding error in D3DXQuaternionToAxisAngle
by Henri Verbeet 09 Nov '17

09 Nov '17

On 9 November 2017 at 16:45, Alex Henrie <alexhenrie24(a)gmail.com> wrote: > - *pangle = 2.0f * acosf(pq->w); > + *pangle = 2.0f * acos(pq->w); /* acosf has too much rounding error */ Does that rounding error by any chance get better if you replace "acosf(x)" with "atan2f(sqrtf((1.0f - x) * (1.0f + x)), x)"?

3 3

Re: [PATCH 3/3] quartz/tests: Add test AVI and MPG files.
by Marvin 09 Nov '17

09 Nov '17

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=34047 Your paranoid android. === w2008s64 (32 bit avisplitter) === avisplitter.c:420: Test failed: Could not create null renderer: 80040154 0b98:avisplitter: unhandled exception c0000005 at 00402884 === w2008s64 (64 bit avisplitter) === avisplitter.c:420: Test failed: Could not create null renderer: 80040154 07ec:avisplitter: unhandled exception c0000005 at 0000000000402489

1 0

Re: [PATCH] ws2_32: Divide values returned for SO_RCVBUF and SO_SNDBUF by two.
by Alexandre Julliard 08 Nov '17

08 Nov '17

Alex Henrie <alexhenrie24(a)gmail.com> writes: > From: Sebastian Lackner <sebastian(a)fds-team.de> > > Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> > --- > Patch from Wine Staging. It looks perfectly reasonable to me, and it > fixes a couple of tests. The right way is to store that information in the server (or in a local cache) so that it's fixed for other platforms too. This was discussed on wine-devel a while back. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH] make_unicode: Update unicode collation to version 10.0.0.
by Alexandre Julliard 08 Nov '17

08 Nov '17

Jens Reyer <jre.winesim(a)gmail.com> writes: > @@ -757,13 +757,12 @@ sub READ_SORTKEYS_FILE() > } > close $INPUT; > > - # compress the keys to 32 bit: > - # key 1 to 16 bits, key 2 to 8 bits, key 3 to 4 bits, key 4 to 1 bit > + # compress the keys to 16 bit: > + # key 1 to 8 bits, key 2 to 4 bits, key 3 to 2 bits There's no matching code change, why are you changing this comment? -- Alexandre Julliard julliard(a)winehq.org

2 1

WineConf action items
by Alexandre Julliard 08 Nov '17

08 Nov '17

Folks, We've had many good discussions at WineConf, and decided to make a number of changes. Here are the resulting action items on my plate. I'll be working on putting these changes into place over the next days/weeks: * We'll merge the wine-devel and wine-patches mailing lists, with wine-devel becoming the single channel for both patches and discussions. * We'll be hosting vkd3d, the D3D12->Vulkan library, on winehq.org in its own git repository. * We'll create a new mailing list for AppDB maintainers. * We'll start to use more detailed git commit messages, including bug references. Jeremy volunteered to research best practices from other projects so we can come up with some standards for what the messages should look like. * We'll start building binary packages for Android. * We'll continue to assign reviewers at random from the maintainer pool for patches that don't have a specific maintainer. I was concerned that this wasn't working so well, but the general consensus was that it's worth trying some more. * Code freeze for 3.0 will start around the end of November, with a final release around the end of the year. -- Alexandre Julliard julliard(a)winehq.org

8 9

Re: [PATCH 1/4] oleaut32: Initial preparation to make marshalling compatible with x86_64.
by Sebastian Lackner 08 Nov '17

08 Nov '17

On 05.11.2017 16:00, Marcus Meissner wrote: > From: Sebastian Lackner <sebastian(a)fds-team.de> > > Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> > Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> > --- > dlls/oleaut32/tmarshal.c | 94 ++++++++++++++++++++++++++---------------------- > dlls/oleaut32/typelib.c | 8 ++--- > dlls/oleaut32/typelib.h | 2 +- > 3 files changed, 57 insertions(+), 47 deletions(-) Thanks for reviewing the patches. I don't care in this case, but please note that adding Signed-off-by for other people is still not allowed (unless this was changed in the last WineConf).

2 1

Re: [PATCH] kernel32: Fix LocaleNameToLCID can not handle zh-Hant and, zh-Hans.
by Marvin 08 Nov '17

08 Nov '17

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=34034 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: When to mark a bug as STAGED
by KKing 08 Nov '17

08 Nov '17

<< IMO, the real question is why dead-end hacks are being included in staging in the first place. >> IMO: If not in staging, then there should be an alternative place for such hacks or patches, ideally that the AppDb can point to. People go to the AppdDb to see if an app they want or need can run ... They'll be more impressed and potentially get involved in Wine more in some way if it helps them. You can make all sorts of usual disclaimers about not part of pure process and may break at anytime etc. Accepting such hacks (somewhere) can potentially introduce a wider developer (of varying Wine based aptitude) base to draw from. The hack could provide a basis for either progressing/converting it to non dead end approach by either mentoring the original author(s) Or providing stimulus for another to take on and submit a more acceptable patch. The hack may also allow sight of further bugs down the line in the app(s) it was intended for, which sometimes helps with tackling the original issue(s) and the solution approach. << IMO if the patch solves the bug for a user, and the patch is in staging, it should be marked STAGED. The whole point of staging is that the patches may not be up to par, but are good enough for some purpose. If Office works and it didn't before, I'd say that standard is met. >> +1 Ken.

3 3

Re: V3 msvcp100: add time_get::get function with format parameters, add missing arm exports for time_get::get functions
by Piotr Caban 07 Nov '17

07 Nov '17

Hi, > On 7 Nov 2017, at 21:37, Vijay Kiran Kamuju <infyquest(a)gmail.com> wrote: > > Changes from V2: fix the msvcp100 spec for 64bit. > Changes from V1: rewrite based on updated spec file. > > The 64 bit spec entry for the functions have the same parameters count > as 32 bit spec entry > <0001-V3-msvcp100-add-time_get-get-function-with-format-pa.patch> The 64-bit spec file entries still look wrong. The entries should look like this: @ cdecl -arch=win64 ?get@?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@QEBA?AV?$istreambuf_iterator@DU?$char_traits@D@std@@@2@V32@0AEAVios_base@2@AEAHPEAUtm@@PEBD4@Z(ptr ptr ptr ptr ptr ptr ptr ptr ptr) time_get_char_get_fmt Thanks, Piotr

1 0

Re: V2 msvcp100: add time_get::get function with format parameters, add missing arm exports for time_get::get functions
by Piotr Caban 07 Nov '17

07 Nov '17

Hi, On 11/07/17 12:01, Vijay Kiran Kamuju wrote: > +@ cdecl -arch=win64 ?get@?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@QEBA?AV?$istreambuf_iterator@DU?$char_traits@D@std@@@2@V32@0AEAVios_base@2@AEAHPEAUtm@@PEBD4@Z(ptr ptr ptr long ptr long ptr ptr ptr ptr ptr) time_get_char_get_fmt You have missed the win64 change in msvcp100.spec file. > +@ cdecl -arch=win64 ?get@?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@QEBA?AV?$istreambuf_iterator@DU?$char_traits@D@std@@@2@V32@0AEAVios_base@2@AEAHPEAUtm@@PEBD4@Z(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) time_get_char_get_fmt The function is taking 9 ptr parameters in 64-bit case (not 11). Thanks, Piotr

2 3

Re: [PATCH 2/3] wined3d: Show the device window when changing fullscreen resolutions (v2).
by Henri Verbeet 07 Nov '17

07 Nov '17

On 6 November 2017 at 21:33, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c > index e23e99b67b..a26185ae4d 100644 > --- a/dlls/wined3d/swapchain.c > +++ b/dlls/wined3d/swapchain.c > @@ -1429,6 +1429,7 @@ HRESULT CDECL wined3d_swapchain_set_fullscreen(struct wined3d_swapchain *swapcha > device->filter_messages = TRUE; > > MoveWindow(swapchain->device_window, 0, 0, width, height, TRUE); > + ShowWindow(swapchain->device_window, SW_SHOWNORMAL); > This breaks the ddraw tests: ddraw1.c:2683: Test failed: Expected (0,0)-(2880,1620), got (0,0)-(2048,1536). ddraw1.c:2690: Test failed: Expected (0,0)-(2880,1620), got (0,0)-(2048,1536). ddraw1.c:2716: Test failed: Expected (0,0)-(2880,1620), got (0,0)-(2048,1536). ddraw1.c:2739: Test failed: Expected (0,0)-(2880,1620), got (0,0)-(2048,1536). ddraw1.c:2768: Test failed: Expected (0,0)-(2880,1620), got (0,0)-(2048,1536). ddraw1.c:2794: Test failed: Expected (0,0)-(2880,1620), got (0,0)-(2048,1536). ddraw1.c:2814: Test failed: Expected (0,0)-(2880,1620), got (0,0)-(2048,1536). ddraw1.c:2850: Test failed: Expected (0,0)-(2880,1620), got (0,0)-(2048,1536).

1 0

Re: [PATCH 2/9] winemine: Update faces.bmp with one from ReactOS project
by Alexandre Julliard 07 Nov '17

07 Nov '17

"Yandex Mail" <and-semakin(a)ya.ru> writes: > From 4cef6694e5153202a119c01a2d88ef617543d7cc Mon Sep 17 00:00:00 2001 > From: Andrey Semakin <and-semakin(a)ya.ru> > Date: Mon, 6 Nov 2017 13:08:53 +0500 > Subject: [PATCH 2/9] winemine: Update faces.bmp with one from ReactOS project > > Signed-off-by: Andrey Semakin <and-semakin(a)ya.ru> > --- > programs/winemine/faces.bmp | Bin 1558 -> 1558 bytes > 1 file changed, 0 insertions(+), 0 deletions(-) It would be better to redesign these using SVG files, so we can make them scale properly for high-DPI. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [v2 PATCH] msvcrt: Implement _memicmp_l()
by Marvin 07 Nov '17

07 Nov '17

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=33995 Your paranoid android. === wvistau64 (32 bit string) === string.c:178: Test failed: errno = 0, expected EINVAL string.c:185: Test failed: errno = 0, expected EINVAL string.c:192: Test failed: errno = 0, expected EINVAL string.c:221: Test failed: errno = 0, expected EINVAL string.c:228: Test failed: errno = 0, expected EINVAL string.c:235: Test failed: errno = 0, expected EINVAL === w7u (32 bit string) === string.c:178: Test failed: errno = 0, expected EINVAL string.c:185: Test failed: errno = 0, expected EINVAL string.c:192: Test failed: errno = 0, expected EINVAL string.c:221: Test failed: errno = 0, expected EINVAL string.c:228: Test failed: errno = 0, expected EINVAL string.c:235: Test failed: errno = 0, expected EINVAL === w1064 (32 bit string) === string.c:178: Test failed: errno = 0, expected EINVAL string.c:185: Test failed: errno = 0, expected EINVAL string.c:192: Test failed: errno = 0, expected EINVAL string.c:221: Test failed: errno = 0, expected EINVAL string.c:228: Test failed: errno = 0, expected EINVAL string.c:235: Test failed: errno = 0, expected EINVAL === wvistau64 (64 bit string) === string.c:178: Test failed: errno = 0, expected EINVAL string.c:185: Test failed: errno = 0, expected EINVAL string.c:192: Test failed: errno = 0, expected EINVAL string.c:221: Test failed: errno = 0, expected EINVAL string.c:228: Test failed: errno = 0, expected EINVAL string.c:235: Test failed: errno = 0, expected EINVAL === w1064 (64 bit string) === string.c:178: Test failed: errno = 0, expected EINVAL string.c:185: Test failed: errno = 0, expected EINVAL string.c:192: Test failed: errno = 0, expected EINVAL string.c:221: Test failed: errno = 0, expected EINVAL string.c:228: Test failed: errno = 0, expected EINVAL string.c:235: Test failed: errno = 0, expected EINVAL

1 0

Re: [v2 PATCH 1/3] gdiplus/metafile: Support linear gradient brushes in playback
by Dmitry Timoshkov 07 Nov '17

07 Nov '17

Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > + status = GdipCreateLineBrush(&startpoint, &endpoint, data->BrushData.lineargradient.StartColor, > + data->BrushData.lineargradient.EndColor, data->BrushData.lineargradient.WrapMode, &gradient); > + if (status == Ok && transform) > + status = GdipSetLineTransform(gradient, (const GpMatrix *)transform); Result of the above calls is ignored. > + if (brushflags & BrushDataPresetColors) > + status = GdipSetLinePresetBlend(gradient, (ARGB *)(record_data + offset + position_count * sizeof(REAL)), > + (REAL *)(record_data + offset), position_count); > + else if (brushflags & BrushDataBlendFactorsH) > + status = GdipSetLineBlend(gradient, (REAL *)(record_data + offset + position_count * sizeof(REAL)), > + (REAL *)(record_data + offset), position_count); > + > + if (brushflags & BrushDataIsGammaCorrected) > + FIXME("BrushDataIsGammaCorrected is not handled.\n"); > + > + if (status == Ok) > + *brush = (GpBrush *)gradient; > + else > + GdipDeleteBrush((GpBrush *)gradient); > + > + break; > + } -- Dmitry.

1 0

Re: [PATCH 3/4] oleaut32: Implement asm proxys for x86_64.
by Alexandre Julliard 07 Nov '17

07 Nov '17

Marcus Meissner <marcus(a)jet.franken.de> writes: > From: Sebastian Lackner <sebastian(a)fds-team.de> > > Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> > Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> > --- > dlls/oleaut32/tmarshal.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++-- > 1 file changed, 52 insertions(+), 2 deletions(-) The existing code is ugly, and instead of trying to retrofit 64-bit support into it, I'd suggest looking into reusing the rpcrt4 routines which already handle pretty much all of this in a more correct way. -- Alexandre Julliard julliard(a)winehq.org

3 3

Re: [PATCH 1/9] vulkan: Add initial Wine vulkan header.
by Sebastian Lackner 07 Nov '17

07 Nov '17

On 06.11.2017 09:08, Roderick Colenbrander wrote: > This file is directly generated from Vulkan's vk.xml. For now it contains Core > Vulkan types and functions. Will be extended with extensions when we support them. > Note there are 4 lines of C++ style comments, but these directly come from the spec > and appear in the regular headers as well. > > Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> > --- > include/wine/vulkan.h | 2367 +++++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 2367 insertions(+) > create mode 100644 include/wine/vulkan.h I'm not sure if you are already aware that the struct sizes/alignments do not match between Linux and Windows. There are many structs which have to be defined twice and converted on-the-fly to be compatible with 32-bit.

2 3

Re: [PATCH v4 2/2] quartz/tests: Add test AVI and MPG files.
by Marvin 07 Nov '17

07 Nov '17

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=33983 Your paranoid android. === wxppro (32 bit avisplitter) === avisplitter.c:527: Test failed: The thread count should be 3 not 4 === w2003std (32 bit avisplitter) === avisplitter.c:527: Test failed: The thread count should be 4 not 5 === wvistau64 (32 bit avisplitter) === avisplitter.c:527: Test failed: The thread count should be 3 not 4 === w2008s64 (32 bit avisplitter) === avisplitter.c:475: Test failed: Could not create null renderer: 80040154 === w7pro64 (32 bit avisplitter) === avisplitter.c:527: Test failed: The thread count should be 3 not 4 === w1064 (32 bit avisplitter) === avisplitter.c:527: Test failed: The thread count should be 5 not 6 === wvistau64 (64 bit avisplitter) === avisplitter.c:527: Test failed: The thread count should be 3 not 4 === w2008s64 (64 bit avisplitter) === avisplitter.c:475: Test failed: Could not create null renderer: 80040154 === w7pro64 (64 bit avisplitter) === avisplitter.c:527: Test failed: The thread count should be 3 not 4 === w864 (64 bit avisplitter) === avisplitter.c:527: Test failed: The thread count should be 3 not 4 === w1064 (64 bit avisplitter) === avisplitter.c:527: Test failed: The thread count should be 5 not 6

1 0

Re: [PATCH v3 2/2] quartz/tests: Add test AVI and MPG files.
by Marvin 07 Nov '17

07 Nov '17

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=33980 Your paranoid android. === wxppro (32 bit avisplitter) === avisplitter.c:525: Test failed: The thread count should be 3 not 4 === w2003std (32 bit avisplitter) === avisplitter.c:525: Test failed: The thread count should be 4 not 5 === wvistau64 (32 bit avisplitter) === avisplitter.c:525: Test failed: The thread count should be 3 not 4 === w2008s64 (32 bit avisplitter) === avisplitter.c:473: Test failed: Could not create null renderer: 80040154 === w7pro64 (32 bit avisplitter) === avisplitter.c:525: Test failed: The thread count should be 3 not 4 === w864 (32 bit avisplitter) === avisplitter.c:525: Test failed: The thread count should be 3 not 4 === w1064 (32 bit avisplitter) === avisplitter.c:525: Test failed: The thread count should be 5 not 7 === wvistau64 (64 bit avisplitter) === avisplitter.c:525: Test failed: The thread count should be 3 not 4 === w2008s64 (64 bit avisplitter) === avisplitter.c:473: Test failed: Could not create null renderer: 80040154 === w7pro64 (64 bit avisplitter) === avisplitter.c:525: Test failed: The thread count should be 3 not 4 === w864 (64 bit avisplitter) === avisplitter.c:525: Test failed: The thread count should be 3 not 4 === w1064 (64 bit avisplitter) === avisplitter.c:525: Test failed: The thread count should be 5 not 6

1 0

Re: [PATCH 2/2] quartz/tests: Add test AVI and MPG files.
by Marvin 07 Nov '17

07 Nov '17

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=33978 Your paranoid android. === wxppro (32 bit avisplitter) === avisplitter.c:525: Test failed: The thread count should be 3 not 4 === w2003std (32 bit avisplitter) === avisplitter.c:525: Test failed: The thread count should be 4 not 5 === wvistau64 (32 bit avisplitter) === avisplitter.c:525: Test failed: The thread count should be 3 not 4 === w2008s64 (32 bit avisplitter) === avisplitter.c:473: Test failed: Could not create null renderer: 80040154 === w7pro64 (32 bit avisplitter) === avisplitter.c:525: Test failed: The thread count should be 3 not 4 === w864 (32 bit avisplitter) === avisplitter.c:525: Test failed: The thread count should be 3 not 4 === w1064 (32 bit avisplitter) === avisplitter.c:525: Test failed: The thread count should be 5 not 7 === wvistau64 (64 bit avisplitter) === avisplitter.c:525: Test failed: The thread count should be 3 not 4 === w2008s64 (64 bit avisplitter) === avisplitter.c:473: Test failed: Could not create null renderer: 80040154 === w7pro64 (64 bit avisplitter) === avisplitter.c:525: Test failed: The thread count should be 3 not 4 === w864 (64 bit avisplitter) === avisplitter.c:525: Test failed: The thread count should be 3 not 4 === w1064 (64 bit avisplitter) === avisplitter.c:525: Test failed: The thread count should be 5 not 6

1 0

Re: [PATCH 2/2] quartz/tests: Add test AVI and MPG files.
by Dmitry Timoshkov 07 Nov '17

07 Nov '17

Zebediah Figura <z.figura12(a)gmail.com> wrote: > --- a/dlls/quartz/tests/avisplitter.c > +++ b/dlls/quartz/tests/avisplitter.c ... > + WCHAR *filename = load_resource(avifile); ... > if (file == INVALID_HANDLE_VALUE) > { > - skip("Could not read test file \"%s\", skipping test\n", afile); > + skip("Could not read test file \"%s\", skipping test\n", wine_dbgstr_w(filename)); > return; > } etc. > --- a/dlls/quartz/tests/filtergraph.c > +++ b/dlls/quartz/tests/filtergraph.c ... > + WCHAR *filename = load_resource(file); ... > + hr = IGraphBuilder_RenderFile(pgraph, filename, NULL); > + if (hr == VFW_E_CANNOT_RENDER) > + skip("%s: codec not supported; skipping test\n", wine_dbgstr_w(file)); > + else > + { > + ok(hr == S_OK || hr == VFW_S_AUDIO_NOT_RENDERED, "RenderFile failed: %x\n", hr); > + rungraph(); > + } > > releasefiltergraph(); > > /* check reference leaks */ > - h = CreateFileW(file, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); > + h = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); > ok(h != INVALID_HANDLE_VALUE, "CreateFile failed: err=%d\n", GetLastError()); > CloseHandle(h); > } It seems that new tests leave the temporary created files behind. -- Dmitry.

2 2

When to mark a bug as STAGED
by Josh DuBois 06 Nov '17

06 Nov '17

I was recently looking at bug 18070 in relation to a problem I had installing Office 2010: https://bugs.winehq.org/show_bug.cgi?id=18070 The last comment asks whether the bug can be marked STAGED. In talking with Sebastian he questioned whether it would make sense in this case, because the patch in the staging tree which improves behavior is clearly a hack as opposed to something which is progress toward a more permanent solution. To me it made sense to go ahead and mark the bug as STAGED anyhow, to record the fact that one of the patches in the stating tree addresses the behavior. Perhaps this is one way to help associate patchsets with bugs so that we can tell the motivation for a particular patchset in staging. (In this case, a URL on the bug also has information about the motivation, here: https://dev.wine-staging.com/patches/132/ ). So the question: If a staging patchset is more along the lines of a dead-end hack than it is progress toward a long-term solution, should bugs which are fixed by the patchset still be marked STAGED? My gut differed from Sebastian's, so I thought it best to ask here to reach a consensus. (I can see the value either way - just looking for a standard approach.)

3 2

Re: [PATCH 3/5] gdiplus/metafile: Support linear gradient brushes in playback
by Vincent Povirk 06 Nov '17

06 Nov '17

+ GpLineGradient *gradient; ... + if (status == Ok) + *brush = (GpBrush *)gradient; + else + GdipDeleteBrush((GpBrush *)gradient); This can free gradient without initializing it.

1 0

Re: [PATCH 3/3] quartz/tests: Add test AVI and MPG files.
by Alexandre Julliard 06 Nov '17

06 Nov '17

Zebediah Figura <z.figura12(a)gmail.com> writes: > Generated with ffmpeg using the following commands: > > ffmpeg -f lavfi -i smptebars -t 1 -r 1 -f avi -vcodec rawvideo -pix_fmt yuv420p -vf scale=32x24 test.avi > > ffmpeg -f lavfi -i smptebars -f lavfi -i "sine=frequency=1000" -t 0.04 -r 25 -f mpeg -vcodec mpeg1video -vf scale=32x24 -acodec mp2 test.mpg > > Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> > --- > dlls/quartz/tests/Makefile.in | 3 +++ > dlls/quartz/tests/filtergraph.c | 42 +++++++++++++++++++++++++++++++++++----- > dlls/quartz/tests/rsrc.rc | 27 ++++++++++++++++++++++++++ > dlls/quartz/tests/test.avi | Bin 0 -> 6938 bytes > dlls/quartz/tests/test.mpg | Bin 0 -> 6144 bytes > 5 files changed, 67 insertions(+), 5 deletions(-) > create mode 100644 dlls/quartz/tests/rsrc.rc > create mode 100644 dlls/quartz/tests/test.avi > create mode 100644 dlls/quartz/tests/test.mpg It doesn't work here: ../../../tools/runtest -q -P wine -T ../../.. -M quartz.dll -p quartz_test.exe.so avisplitter && touch avisplitter.ok avisplitter.c:498: Test failed: The thread count should be 3 not 2 avisplitter.c:574: Test succeeded inside todo block: The thread count should be 1 not 1 Makefile:194: recipe for target 'avisplitter.ok' failed make: *** [avisplitter.ok] Error 2 -- Alexandre Julliard julliard(a)winehq.org

2 1

FOSDEM participation - talk?
by Marcus Meissner 06 Nov '17

06 Nov '17

Hi, We can still consider a FOSDEM participation in scope of a Talk/Lecture. We could fit to the Retrocomputing DevRoom with a winky smiley: - Emulation of old systems to run videogames, legacy software, etc - Open source software emulation/simulation - Open hardware - Operating systems/executives for retrocomputers/retrosystems - Uses of retrocomputing today - Other retrosystems topics - Opportunities in retrocomputing https://fosdem.org/2018/schedule/track/retrocomputing/ https://lists.fosdem.org/pipermail/fosdem/2017-October/002623.html Cfp runs until Nov 25. Ciao, Marcus

3 3

Re: [PATCH 2/2] riched20: Protect read-only Richedit against pasting and cutting data.
by Huw Davies 06 Nov '17

06 Nov '17

This looks good apart from some style issues - see inline below. On Sun, Nov 05, 2017 at 07:28:39PM +0100, Rafał Harabień wrote: > Signed-off-by: Rafał Harabień <rafalh1992(a)o2.pl> > --- > dlls/riched20/editor.c | 60 +++++++++++++++++++++++--------------------- > dlls/riched20/tests/editor.c | 15 +++++++++++ > 2 files changed, 47 insertions(+), 28 deletions(-) > > diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c > index a7b1bc7..3da19fa 100644 > --- a/dlls/riched20/editor.c > +++ b/dlls/riched20/editor.c > @@ -2294,6 +2294,13 @@ static BOOL paste_special(ME_TextEditor *editor, UINT cf, REPASTESPECIAL *ps, BO > struct paste_format *format; > IDataObject *data; > > + /* Protect read-only edit control from modification */ > + if (editor->styleFlags & ES_READONLY) { Please put the open brace on a new line matching the rest of the function. > + if (!check_only) > + MessageBeep(MB_ICONERROR); > + return FALSE; > + } > + > init_paste_formats(); > > if (ps && ps->dwAspect != DVASPECT_CONTENT) > @@ -2351,6 +2358,29 @@ static BOOL ME_Copy(ME_TextEditor *editor, const ME_Cursor *start, int nChars) > return SUCCEEDED(hr); > } > > +static BOOL copy_or_cut(ME_TextEditor *editor, BOOL cut) > +{ > + BOOL result; > + int nOfs, nChars; > + int nStartCur = ME_GetSelectionOfs(editor, &nOfs, &nChars); > + ME_Cursor *selStart = &editor->pCursors[nStartCur]; Let's take the opportunity to use lower case variable names. How about offs, num_chars, start_cursor and sel_start. > + > + if (cut && (editor->styleFlags & ES_READONLY)) { Again, opening brace to new line. > + MessageBeep(MB_ICONERROR); > + return FALSE; > + } > + > + nChars -= nOfs; > + result = ME_Copy(editor, selStart, nChars); > + if (result && cut) > + { > + ME_InternalDeleteText(editor, selStart, nChars, FALSE); Indent this block 4 spaces. > + ME_CommitUndo(editor); > + ME_UpdateRepaint(editor, TRUE); > + } > + return result; > +} > + Huw.

1 0

Re: [v2] comctl32/taskdialog: Implement nDefaultButton and add tests
by Fabian Maurer 06 Nov '17

06 Nov '17

I reworked my patch according to your suggestions. >>> We already iterate over custom buttons and check every common button >>> flag before this point, so it shouldn't be necessary to have another loop. >> >> I'm open to suggestion, but how would you do that? >> >> We could add three checks each time before taskdialog_init_button is called, >> or alternatively one check in taskdialog_init_button. Like giving it a pointer >> to default_button, and checking if the id equal the taskdialog default button. >> But I find my current solution to be cleaner to be honest, what's your >> suggestion? >Yes, something like that. taskdialog_init_button() has all the info to > do that. In the beginning I wanted to have default_button be -1 if no button was found yet, but as the tests show this is impossible since windows accepts a negative ID. Now we have to pass 2 pointers around.. Your thoughts on that? I find that the second loop makes things a lot cleaner. Regards, Fabian Maurer

2 1

Re: [PATCH] msvcp100: add time_get::get function with format
by Piotr Caban 06 Nov '17

06 Nov '17

Hi, On 11/05/17 13:26, Vijay Kiran Kamuju wrote: > diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec > index bf54ac5f53..efb13361ff 100644 > --- a/dlls/msvcp110/msvcp110.spec > +++ b/dlls/msvcp110/msvcp110.spec > @@ -2599,8 +2599,8 @@ > @ thiscall -arch=i386 ?get@?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@QBE?AV?$istreambuf_iterator@DU?$char_traits@D@std@@@2@V32@0AAVios_base@2@AAHPAUtm@@DD@Z(ptr ptr ptr long ptr long ptr ptr ptr long long) time_get_char_get > @ cdecl -arch=win64 ?get@?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@QEBA?AV?$istreambuf_iterator@DU?$char_traits@D@std@@@2@V32@0AEAVios_base@2@AEAHPEAUtm@@DD@Z(ptr ptr ptr long ptr long ptr ptr ptr long long) time_get_char_get > @ stub -arch=arm ?get@?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@QBA?AV?$istreambuf_iterator@DU?$char_traits@D@std@@@2@V32@0AAVios_base@2@AAHPAUtm@@PBD4@Z > -@ stub -arch=i386 ?get@?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@QBE?AV?$istreambuf_iterator@DU?$char_traits@D@std@@@2@V32@0AAVios_base@2@AAHPAUtm@@PBD4@Z > -@ stub -arch=win64 ?get@?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@QEBA?AV?$istreambuf_iterator@DU?$char_traits@D@std@@@2@V32@0AEAVios_base@2@AEAHPEAUtm@@PEBD4@Z > +@ thiscall -arch=i386 ?get@?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@QBE?AV?$istreambuf_iterator@DU?$char_traits@D@std@@@2@V32@0AAVios_base@2@AAHPAUtm@@PBD4@Z(ptr ptr ptr long ptr long ptr ptr ptr ptr ptr) time_get_char_get_fmt > +@ cdecl -arch=win64 ?get@?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@QEBA?AV?$istreambuf_iterator@DU?$char_traits@D@std@@@2@V32@0AEAVios_base@2@AEAHPEAUtm@@PEBD4@Z(ptr ptr ptr long ptr long ptr ptr ptr ptr ptr) time_get_char_get_fmt Please also add arm export. Also win64 arguments needs fixing (structures are passed as pointers in this case). > +istreambuf_iterator_char* __thiscall time_get_char_get_fmt(const time_get_char *this, > + istreambuf_iterator_char *ret, istreambuf_iterator_char s, istreambuf_iterator_char e, > + ios_base *base, int *err, struct tm *t, char *fmtstart, char *fmtend) The fmtstart and fmtend arguments should be const. Thanks, Piotr

1 0

Re: [v2 PATCH] cmd: Implement builtin mklink command
by Alexandre Julliard 06 Nov '17

06 Nov '17

Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> writes: > @@ -310,6 +310,15 @@ CHOICE is mainly used to build a menu selection in a batch file.\n" > "EXIT terminates the current command session and returns to the operating\n\ > system or shell from which you invoked cmd.\n" > > + WCMD_MKLINK, > +"Creates a symbolic link.\n\ > +MKLINK [[/D] | [/H] | [/J]] Link Target\n\ > +/D Creates a directory symbolic link. Default is a file symbolic link.\n\ > +/H Creates a hard link instead of a symbolic link.\n\ > +/J Creates a Directory Junction.\n\ > +Link specifies the new symbolic link name.\n\ > +Target specifies the path (relative or absolute) that the new link refers to.\n" This is a straight copy from the Microsoft version. Not only is this not allowed, it also doesn't fit in with the description style of the other commands. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH] user32: check GetClipboardFormatName length
by Marvin 06 Nov '17

06 Nov '17

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=33944 Your paranoid android. === w8 (32 bit clipboard) === clipboard.c:402: Test failed: GlobalGetAtomNameA should fail clipboard.c:403: Test failed: err -559038737

2 1

Re: [v3] cmd: Added support for "&&" and "||" condition checking.
by Marvin 06 Nov '17

06 Nov '17

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=33950 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH] ole32: handle length=0 in save datacache
by Dmitry Timoshkov 05 Nov '17

05 Nov '17

Marcus Meissner <marcus(a)jet.franken.de> wrote: > The ole2 test crashes for me, reason is that length is 0 > and we use length-1 for accessing whats returned. ... > + if (!length) > + return DV_E_CLIPFORMAT; The test intentionally creates the storage streams with length field set to 0, and as the tests show this is not an error. So the fix should be probably different. -- Dmitry.

2 1

Re: [PATCH] comctl32/taskdialog: Implement nDefaultButton and add tests
by Nikolay Sivov 05 Nov '17

05 Nov '17

On 04.11.2017 18:22, Fabian Maurer wrote: > Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> > --- > dlls/comctl32/taskdialog.c | 21 +++++-- > dlls/comctl32/tests/taskdialog.c | 115 +++++++++++++++++++++++++++++++++++++++ > 2 files changed, 130 insertions(+), 6 deletions(-) > > diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c > index 5c4af2ab03..4f80311a61 100644 > --- a/dlls/comctl32/taskdialog.c > +++ b/dlls/comctl32/taskdialog.c > @@ -151,7 +151,7 @@ static void taskdialog_get_text_extent(const struct taskdialog_template_desc *de > } > > static unsigned int taskdialog_add_control(struct taskdialog_template_desc *desc, WORD id, const WCHAR *class, > - HINSTANCE hInstance, const WCHAR *text, short x, short y, short cx, short cy) > + HINSTANCE hInstance, const WCHAR *text, DWORD style, short x, short y, short cx, short cy) > { > struct taskdialog_control *control = Alloc(sizeof(*control)); > unsigned int size, class_size, text_size; > @@ -178,7 +178,7 @@ static unsigned int taskdialog_add_control(struct taskdialog_template_desc *desc > control->template = template = Alloc(size); > control->template_size = size; > > - template->style = WS_VISIBLE; > + template->style = WS_VISIBLE | style; > template->dwExtendedStyle = 0; > template->x = x; > template->y = y; > @@ -206,7 +206,7 @@ static unsigned int taskdialog_add_static_label(struct taskdialog_template_desc > taskdialog_get_text_extent(desc, str, TRUE, &sz); > > desc->dialog_height += DIALOG_SPACING; > - size = taskdialog_add_control(desc, id, WC_STATICW, desc->taskconfig->hInstance, str, DIALOG_SPACING, > + size = taskdialog_add_control(desc, id, WC_STATICW, desc->taskconfig->hInstance, str, 0, DIALOG_SPACING, > desc->dialog_height, sz.cx, sz.cy); > desc->dialog_height += sz.cy + DIALOG_SPACING; > return size; > @@ -268,6 +268,7 @@ static unsigned int taskdialog_add_buttons(struct taskdialog_template_desc *desc > unsigned int location_x, *line_widths, alignment = ~0u; > const TASKDIALOGCONFIG *taskconfig = desc->taskconfig; > struct taskdialog_button_desc *buttons; > + int default_button; > > /* Allocate enough memory for the custom and the default buttons. Maximum 6 default buttons possible. */ > buttons_size = 6; > @@ -340,18 +341,26 @@ static unsigned int taskdialog_add_buttons(struct taskdialog_template_desc *desc > alignment = new_alignment; > } > > + /* Check if the default button is actually valid, if no default to the first created button */ > + default_button = buttons[0].id; > + for (i = 0; i < count; i++) > + if (buttons[i].id == taskconfig->nDefaultButton) > + default_button = taskconfig->nDefaultButton; > + We already iterate over custom buttons and check every common button flag before this point, so it shouldn't be necessary to have another loop. > @@ -583,7 +592,7 @@ HRESULT WINAPI TaskDialogIndirect(const TASKDIALOGCONFIG *taskconfig, int *butto > Free(template); > > if (button) *button = ret; > - if (radio_button) *radio_button = taskconfig->nDefaultButton; > + if (radio_button) *radio_button = FALSE; > if (verification_flag_checked) *verification_flag_checked = TRUE; > Same as with verification flag, we don't implement radio buttons currently so it's better to leave it as is to avoid possible regressions until we add support for them. Also you're supposed to return button id, not binary flags. > > +static TASKDIALOG_BUTTON* buttons_make(void) > +{ > + static const WCHAR str_format[] = {'%','0','2','d',0}; > + static TASKDIALOG_BUTTON buttons[TEST_NUM_BUTTONS]; > + static WCHAR titles[TEST_NUM_BUTTONS * 3]; /* Each button has two digits as title, plus null-terminator */ > + int i; > + > + for (i = 0; i < TEST_NUM_BUTTONS; i++) > + { > + WCHAR *text = &titles[i * 3]; > + wsprintfW(text, str_format, i); > + > + buttons[i].pszButtonText = text; > + buttons[i].nButtonID = ID_START_BUTTON + i; > + } > + return buttons; > +} > + Please merge this to test function.

2 2

Unhandled exception
by Ran Shalit 05 Nov '17

05 Nov '17

Hello, I have an issue trying to run application with wine, in which I get the below exception. It first (before getting this exception) said that mfc100u.dll is required, so I had to download and put it in the same folder as .exe, but then trying to run the application, I got this exception. I use wine 1.8. Thank you for any suggestion. user@user-VirtualBox:~/2.1.2$ wine record_channels.exe system.reg is not a valid registry file userdef.reg is not a valid registry file user.reg is not a valid registry file err:ole:marshal_object couldn't get IPSFactory buffer for interface {00000131-0000-0000-c000-000000000046} err:ole:marshal_object couldn't get IPSFactory buffer for interface {6d5140c1-7436-11ce-8034-00aa006009fa} err:ole:StdMarshalImpl_MarshalInterface Failed to create ifstub, hres=0x80004002 err:ole:CoMarshalInterface Failed to marshal the interface {6d5140c1-7436-11ce-8034-00aa006009fa}, 80004002 err:ole:get_local_server_stream Failed: 80004002 fixme:thread:GetThreadPreferredUILanguages 52, 0x32f9d8, 0x32fc54 0x32f9e0 fixme:heap:RtlSetHeapInformation (nil) 1 (nil) 0 stub fixme:thread:GetThreadPreferredUILanguages 52, 0x32f680, 0x32f8fc 0x32f688 wine: Unhandled exception 0xc06d007e in thread 12 at address 0x7b83c3ae (thread 0012), starting debugger... Unhandled exception: 0xc06d007e in 32-bit code (0x7b83c3ae). Register dump: CS:0073 SS:007b DS:007b ES:007b FS:0033 GS:003b EIP:7b83c3ae ESP:0086dfc4 EBP:0086e038 EFLAGS:00000287( - -- I S - -P-C) EAX:7b827a69 EBX:7b8c0000 ECX:0086e060 EDX:0086dfe4 ESI:c06d007e EDI:00000000 Stack dump: 0x0086dfc4: 0086e0b0 00000004 7b85ac31 c06d007e 0x0086dfd4: 00000000 00000000 7b83c3ae 00000001 0x0086dfe4: 0086e060 00000000 00000000 4d430003 0x0086dff4: 7b85abfc 0086e020 7b8c0000 0043db3c 0x0086e004: 00000000 0086e038 7b85ac9d 00000000 0x0086e014: 00000000 0086e038 7b85ac9d 0042d7b0 Backtrace: =>0 0x7b83c3ae in kernel32 (+0x2c3ae) (0x0086e038) 1 0x00411033 in record_channels (+0x11032) (0x0086e0a4) 2 0x00410e0e in record_channels (+0x10e0d) (0x0086e600) 3 0x00427e10 in record_channels (+0x27e0f) (0x0086e7a0) 4 0x004285f6 in record_channels (+0x285f5) (0x0086e9cc) 5 0x00428e09 in record_channels (+0x28e08) (0x0086e9d8) 6 0x7bc84470 call_thread_func_wrapper+0xb() in ntdll (0x0086e9e8) 7 0x7bc8763d call_thread_func+0x7c() in ntdll (0x0086eab8) 8 0x7bc8444e RtlRaiseException+0x21() in ntdll (0x0086ead8) 9 0x7bc8fe69 in ntdll (+0x7fe68) (0x0086f358) 10 0xb74fff70 start_thread+0xcf() in libpthread.so.0 (0x0086f428) 11 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 12 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 13 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 14 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 15 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 16 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 17 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 18 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 19 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 20 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 21 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 22 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 23 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 24 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 25 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 26 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 27 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 28 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 29 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 30 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 31 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 32 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 33 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 34 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 35 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 36 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 37 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 38 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 39 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 40 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 41 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 42 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 43 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 44 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 45 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 46 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 47 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 48 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 49 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 50 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 51 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 52 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 53 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 54 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 55 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 56 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 57 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 58 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 59 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 60 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 61 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 62 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 63 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 64 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 65 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 66 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 67 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 68 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 69 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 70 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 71 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 72 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 73 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 74 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 75 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 76 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 77 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 78 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 79 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 80 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 81 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 82 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 83 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 84 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 85 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 86 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 87 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 88 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 89 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 90 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 91 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 92 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 93 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 94 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 95 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 96 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 97 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 98 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 99 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 100 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 101 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 102 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 103 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 104 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 105 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 106 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 107 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 108 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 109 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 110 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 111 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 112 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 113 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 114 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 115 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 116 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 117 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 118 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 119 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 120 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 121 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 122 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 123 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 124 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 125 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 126 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 127 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 128 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 129 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 130 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 131 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 132 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 133 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 134 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 135 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 136 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 137 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 138 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 139 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 140 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 141 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 142 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 143 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 144 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 145 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 146 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 147 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 148 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 149 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 150 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 151 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 152 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 153 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 154 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 155 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 156 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 157 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 158 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 159 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 160 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 161 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 162 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 163 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 164 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 165 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 166 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 167 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 168 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 169 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 170 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 171 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 172 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 173 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 174 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 175 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 176 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 177 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 178 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 179 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 180 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 181 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 182 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 183 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 184 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 185 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 186 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 187 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 188 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 189 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 190 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 191 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 192 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 193 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 194 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 195 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 196 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 197 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 198 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 199 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 200 0xb743050e __clone+0x5d() in libc.so.6 (0x00000000) 0x7b83c3ae: subl $4,%esp Modules: Module Address Debug info Name (79 modules) PE 400000- 44d000 Export record_channels PE 10000000-1000a000 Deferred recordings_channels_dll PE 785f0000-78a22000 Deferred mfc100u ELF 7b800000-7ba6a000 Dwarf kernel32<elf> \-PE 7b810000-7ba6a000 \ kernel32 ELF 7bc00000-7bcf3000 Dwarf ntdll<elf> \-PE 7bc10000-7bcf3000 \ ntdll ELF 7bf00000-7bf04000 Deferred <wine-loader> ELF 7dacc000-7db10000 Deferred usp10<elf> \-PE 7dad0000-7db10000 \ usp10 ELF 7db9a000-7dbd3000 Deferred uxtheme<elf> \-PE 7dba0000-7dbd3000 \ uxtheme ELF 7dbd3000-7dbd9000 Deferred libxfixes.so.3 ELF 7dbd9000-7dbe4000 Deferred libxcursor.so.1 ELF 7dbe4000-7dbf4000 Deferred libxi.so.6 ELF 7dbf4000-7dbf8000 Deferred libxcomposite.so.1 ELF 7dbf8000-7dc03000 Deferred libxrandr.so.2 ELF 7dc03000-7dc0e000 Deferred libxrender.so.1 ELF 7dc0e000-7dc14000 Deferred libxxf86vm.so.1 ELF 7dc14000-7dc18000 Deferred libxinerama.so.1 ELF 7dc18000-7dc1f000 Deferred libxdmcp.so.6 ELF 7dc1f000-7dc23000 Deferred libxau.so.6 ELF 7dc23000-7dc45000 Deferred libxcb.so.1 ELF 7dc45000-7dd79000 Deferred libx11.so.6 ELF 7dd79000-7dd8c000 Deferred libxext.so.6 ELF 7dd90000-7dda6000 Deferred dwmapi<elf> \-PE 7dda0000-7dda6000 \ dwmapi ELF 7dda8000-7de3c000 Deferred winex11<elf> \-PE 7ddb0000-7de3c000 \ winex11 ELF 7de3c000-7de61000 Deferred imm32<elf> \-PE 7de40000-7de61000 \ imm32 ELF 7dffa000-7e023000 Deferred libexpat.so.1 ELF 7e023000-7e05e000 Deferred libfontconfig.so.1 ELF 7e05e000-7e086000 Deferred libpng12.so.0 ELF 7e086000-7e0a0000 Deferred libz.so.1 ELF 7e0a0000-7e140000 Deferred libfreetype.so.6 ELF 7e140000-7e162000 Deferred libtinfo.so.5 ELF 7e162000-7e187000 Deferred libncurses.so.5 ELF 7e1a3000-7e1df000 Deferred ws2_32<elf> \-PE 7e1b0000-7e1df000 \ ws2_32 ELF 7e201000-7e310000 Deferred msvcp100<elf> \-PE 7e240000-7e310000 \ msvcp100 ELF 7e310000-7e55e000 Deferred shell32<elf> \-PE 7e320000-7e55e000 \ shell32 ELF 7e55e000-7e572000 Deferred msimg32<elf> \-PE 7e560000-7e572000 \ msimg32 ELF 7e572000-7e67e000 Deferred comctl32<elf> \-PE 7e580000-7e67e000 \ comctl32 ELF 7e67e000-7e6f9000 Deferred shlwapi<elf> \-PE 7e690000-7e6f9000 \ shlwapi ELF 7e6f9000-7e7c2000 Deferred msvcr100<elf> \-PE 7e710000-7e7c2000 \ msvcr100 ELF 7e7c2000-7e7ed000 Deferred msacm32<elf> \-PE 7e7d0000-7e7ed000 \ msacm32 ELF 7e7ed000-7e872000 Deferred rpcrt4<elf> \-PE 7e800000-7e872000 \ rpcrt4 ELF 7e872000-7e9b7000 Deferred ole32<elf> \-PE 7e890000-7e9b7000 \ ole32 ELF 7e9b7000-7ea33000 Deferred advapi32<elf> \-PE 7e9c0000-7ea33000 \ advapi32 ELF 7ea33000-7eb54000 Deferred gdi32<elf> \-PE 7ea40000-7eb54000 \ gdi32 ELF 7eb54000-7ecb1000 Deferred user32<elf> \-PE 7eb70000-7ecb1000 \ user32 ELF 7ecb1000-7ed6c000 Deferred winmm<elf> \-PE 7ecc0000-7ed6c000 \ winmm ELF 7ef6c000-7ef79000 Deferred libnss_files.so.2 ELF 7ef79000-7ef85000 Deferred libnss_nis.so.2 ELF 7ef85000-7ef9e000 Deferred libnsl.so.1 ELF 7ef9e000-7efe4000 Deferred libm.so.6 ELF 7efe6000-7f000000 Deferred version<elf> \-PE 7eff0000-7f000000 \ version ELF b7344000-b74f3000 Dwarf libc.so.6 ELF b74f3000-b74f8000 Deferred libdl.so.2 ELF b74f9000-b7515000 Dwarf libpthread.so.0 ELF b7517000-b7520000 Deferred libnss_compat.so.2 ELF b7531000-b76e7000 Dwarf libwine.so.1 ELF b76e9000-b770b000 Deferred ld-linux.so.2 ELF b770b000-b770c000 Deferred [vdso].so Threads: process tid prio (all id:s are in hex) 00000008 (D) Z:\home\user\2.1.2\record_channels.exe 00000013 0 <== 00000012 0 00000009 0 0000000c services.exe 0000000f 0 0000000e 0 0000000d 0 00000010 explorer.exe 00000011 0 System information: Wine build: wine-1.8 Platform: i386 Version: Windows XP Host system: Linux Host version: 3.16.0-30-generic user@user-VirtualBox:~/2.1.2$ Best Regards, Ran

1 1

Re: xmllite: Avoid warning in test_read_state related to -1 not being in XmlReadState.
by Nikolay Sivov 05 Nov '17

05 Nov '17

On 11/03/2017 01:26 AM, Gerald Pfeifer wrote: > Hi Nikolay and others, > > the patch below avoids a warning of the kind > > reader.c:276:20: warning: comparison of constant -1 with expression of type > 'XmlReadState' (aka 'enum XmlReadState') is always false > [-Wtautological-constant-out-of-range-compare] > if (exp_broken == -1) > ~~~~~~~~~~ ^ ~~ > > which clang issues, so I hope it can be included? > > Gerald > > > Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> > --- > dlls/xmllite/tests/reader.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c > index 0f03c3b42e..2a93a76ddb 100644 > --- a/dlls/xmllite/tests/reader.c > +++ b/dlls/xmllite/tests/reader.c > @@ -273,7 +273,7 @@ static void test_read_state(IXmlReader *reader, XmlReadState expected, > state = -1; /* invalid state value */ > IXmlReader_GetProperty(reader, XmlReaderProperty_ReadState, &state); > > - if (exp_broken == -1) > + if (exp_broken == (XmlReadState)-1) > broken_state = FALSE; > else > broken_state = broken(exp_broken == state); Hi, Gerald. Is this warning enabled by default in some release clang version? I'm not necessarily opposed in silencing it like that, but I imagine you'll see many more instances like that, and if it's not default set of warnings I don't know if we should bother.

2 3

Re: [PATCH] oleaut32: fixed 64bit crash on tmarshal test
by Donna Whisnant 04 Nov '17

04 Nov '17

> On 04.11.2017 17:28, Marcus Meissner wrote: > >> > >> Any idea why is this specific to 64 bit? > > > > Well, the call fails in because we have no 64bit typelib threaded marshaller. > > > > ... > > > > We could exit PSFacBuf_CreateProxy earlier on x86_64 with a different error. > > > > (or implement the typelib marshaller ;) > > Right, there is a fix for that linked from bug > https://bugs.winehq.org/show_bug.cgi?id=26768. It would be nice to have > that for 3.0. > And while you guys are working on it, it would also be nice to have typelib marshaller support for ARM in 3.0 too. ;-)

1 0

Re: [PATCH] oleaut32: fixed 64bit crash on tmarshal test
by Nikolay Sivov 04 Nov '17

04 Nov '17

On 03.11.2017 14:15, Marcus Meissner wrote: > Test will fail now, but no longer crash. > > Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> > --- > dlls/oleaut32/tests/tmarshal.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c > index d2b8dc92d6..f19cbf451b 100644 > --- a/dlls/oleaut32/tests/tmarshal.c > +++ b/dlls/oleaut32/tests/tmarshal.c > @@ -2010,7 +2010,8 @@ static void test_external_connection(void) > todo_wine > ok(external_connections == 2, "external_connections = %d\n", external_connections); > > - ITestSecondDisp_Release(second); > + if (hres == S_OK) > + ITestSecondDisp_Release(second); > todo_wine > ok(external_connections == 2, "external_connections = %d\n", external_connections); > > Any idea why is this specific to 64 bit?

2 2

Re: ws2_32/tests: Add some tests for sockets bound to a completion port.
by Alexandre Julliard 04 Nov '17

04 Nov '17

Dmitry Timoshkov <dmitry(a)baikal.ru> writes: > + if (pNtClose) > + { > + pNtClose((HANDLE)src); > + break; > + } > + win_skip("NtClose is not available on this platform"); > + how_to_close = 1; The test and skip are not necessary, we no longer support win9x in tests. > + ok(ovl_iocp->Internal == STATUS_CONNECTION_ABORTED || STATUS_LOCAL_DISCONNECT /* XP */, "got %#lx\n", ovl_iocp->Internal); The second part of the || is always true so this is not testing anything. > + ok(ovl_iocp->Internal == STATUS_CONNECTION_ABORTED || STATUS_LOCAL_DISCONNECT /* XP */, "got %#lx\n", ovl_iocp->Internal); Same here. -- Alexandre Julliard julliard(a)winehq.org

2 1

Setting a source directory in winedbg
by Mihai Todor 03 Nov '17

03 Nov '17

Hi Everyone, I noticed that I can set the source directory via the `dir` command in winedbg, but, for some reason, it rejects absolute paths, like Z:\bla\blah, claiming that ":" is a syntax error. I tried to enclose the path in quotes / double quotes, but then the quote / double quote is rejected as a syntax error. I don't have sufficient knowledge of bison to grok the code in programs/winedbg/dbg.y, so is there a way to escape the colon symbol? As a workaround, I mapped my build directory under Wine, but that is really annoying. Thank you, Mihai Todor

1 1

Re: [PATCH v2] kernel32/tests: Detect and handle a redirected stdin.
by Zebediah Figura 03 Nov '17

03 Nov '17

On 11/03/2017 05:43 AM, Alex Henrie wrote: > Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> > --- > v2: Simply skip the tests if the input is redirected. > --- > dlls/kernel32/tests/console.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c > index a14bc45034..926c052686 100644 > --- a/dlls/kernel32/tests/console.c > +++ b/dlls/kernel32/tests/console.c > @@ -2582,6 +2582,11 @@ static void test_ReadConsole(void) > > SetLastError(0xdeadbeef); > ret = GetFileSize(std_input, NULL); > + if (GetLastError() == 0xdeadbeef) > + { > + skip("stdin is redirected\n"); > + return; > + } > ok(ret == INVALID_FILE_SIZE, "expected INVALID_FILE_SIZE, got %#x\n", ret); > ok(GetLastError() == ERROR_INVALID_HANDLE || > GetLastError() == ERROR_INVALID_FUNCTION, /* Win 8, 10 */ > Couldn't we just skip those two tests? The others don't seem to fail under that circumstance.

2 1

Re: Józef Kucia : wined3d: Implement indirect draws.
by Ken Thomases 03 Nov '17

03 Nov '17

Hi Józef, On Nov 2, 2017, at 5:28 PM, Alexandre Julliard <julliard(a)winehq.org> wrote: > > Module: wine > Branch: master > Commit: f4aa2911a689f95783fe2061a516440dc3d3f39e > URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4aa2911a689f95783fe2061a… > > Author: Józef Kucia <jkucia(a)codeweavers.com> > Date: Wed Nov 1 22:08:42 2017 +0100 > > wined3d: Implement indirect draws. If I'm reading this commit correctly, the new indexed indirect draw code does not make use of state->index_offset (via idx_data, for example). Is that how it should be? Or should DrawIndexedInstancedIndirect() respect the index buffer offset? Thanks, Ken

2 1

Re: [PATCH] ieframe: avoid crash on missing IID_IWebBrowser2 interface
by Jacek Caban 03 Nov '17

03 Nov '17

On 03.11.2017 12:21, Marcus Meissner wrote: > diff --git a/dlls/ieframe/tests/ie.c b/dlls/ieframe/tests/ie.c > index ac055e248d..459854cb64 100644 > --- a/dlls/ieframe/tests/ie.c > +++ b/dlls/ieframe/tests/ie.c > @@ -264,6 +264,8 @@ static void test_InternetExplorer(void) > > hres = IUnknown_QueryInterface(unk, &IID_IWebBrowser2, (void**)&wb); > ok(hres == S_OK, "Could not get IWebBrowser2 interface: %08x\n", hres); > + if (hres != S_OK) > + return; You leak unk and don't unadvise connection point here. I think that moving QueryInterface() call before advise_cp() call and properly releasing unk in error case would do the trick. Thanks, Jacek

1 0

Learning C and Wine
by Luke Short 03 Nov '17

03 Nov '17

Greetings everyone, I am looking to learn how to program in C and, more specifically, want to focus on how to do so with Wine development. I've already been contributing to this project via testing applications and updating/submitting bug reports and I hope to contribute even more. As a developer, I've been professionally making Python programs for years now and I figure it's about time I really learn C. Ideally I will eventually contribute more of my time and code back into the Wine project. Beyond just Wine, knowing C should also help give me an edge on creating high-performance functions using Python's C API. My question is: are there any recommended resources for learning C from the ground up and also using that knowledge to help with Wine? What are some materials that you have used to get yourself started with C and/or Wine beyond the Wine Developer's Guide? I understand that learning C will be more of a gradual thing over the course of many years. And, like most things, mastery is an ongoing process. I am looking to get my feet wet so that I can eventually dive into the Wine development pool. Thank you guys for any advice you can give to a newcomer! Sincerely, Luke Short

2 1

RFC winevulkan design
by Roderick Colenbrander 03 Nov '17

03 Nov '17

Hi all, Based on conversations on IRC, I reconsidered the design of the ICD. The idea is to have a thin winevulkan proxy library. It hosts the thunks and loads the appropriate ICD based the HWND similar how opengl32 operates. In general the driver (e.g. winex11) is responsible for loading the required function pointers used by the thunks. These function pointers are stored in the Vulkan objects (Vulkan operates exactly the same way). The driver can decide by itself for which APIs it needs to provide a custom implementation. Usually this are at least vkCreateInstance, vkCreateDevice and others. I wrote some pseudo code into this RFC patch to illustrate the design. Here and there I added some detailed comments and questions. The code obviously does not compile and variable/function names are just for illustration purposes. Let me know your thoughts. Thanks, Roderick --- dlls/winevulkan/vulkan.c | 100 ++++++++++++++++++++++++++++++++++++++ dlls/winevulkan/vulkan_thunks.c | 80 ++++++++++++++++++++++++++++++ dlls/winex11.drv/vulkan.c | 77 +++++++++++++++++++++++++++++ dlls/winex11.drv/winex11.drv.spec | 4 ++ include/wine/vulkan_driver.h | 78 +++++++++++++++++++++++++++++ 5 files changed, 339 insertions(+) create mode 100644 dlls/winevulkan/vulkan.c create mode 100644 dlls/winevulkan/vulkan_thunks.c create mode 100644 dlls/winex11.drv/vulkan.c create mode 100644 include/wine/vulkan_driver.h diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c new file mode 100644 index 0000000000..fd73acaf10 --- /dev/null +++ b/dlls/winevulkan/vulkan.c @@ -0,0 +1,100 @@ +#include "wine/vulkan.h" +#include "wine/vulkan_driver.h" + +/* Vulkan global functions. Stateless functions of which there very few, + * but which we need to call directly outside of dispatch table to the driver. + */ + +MAKE_FUNCPTR(vkCreateInstance) +MAKE_FUNCPTR(vkEnumerateInstanceExtensionProperties) +MAKE_FUNCPTR(vkGetInstanceProcAddr) + +const struct vulkan_func vk_global_dispatch_table[] = { + {"vkCreateInstance", NULL, &wine_vkCreateInstance}, + {"vkEnumerateInstanceExtensionProperties", NULL, &wine_vkEnumerateInstanceExtensionProperties}, + {"vkGetInstanceProcAddr", NULL, &wine_vkGetInstanceProcAddr}, +}; +const int vk_global_dispatch_table_size = 3; + +void* wine_vk_get_global_proc_addr(pName) +{ + //search global dispatch table +} + + +static BOOL vulkan_initialized = FALSE; +static struct vulkan_icd_funcs *icd_funcs = NULL; + +static BOOL wine_vk_init(void) +{ + HDC hdc = GetDC(0) + vulkan_funcs = __wine_get_vk_driver(hdc); + if (!icd_funcs) + { + ReleaseDC(hdc); + return FALSE; + } + +#define LOAD_FUNCPTR(x) icd_funcs->vk_icdGetInstanceProcAddr(x) + LOAD_FUNCPTR(vkCreateInstance) + LOAD_FUNCPTR(vkEnumerateInstanceExtensionProperties) + LOAD_FUNCPTR(vkGetInstanceProcAddr) + + ReleaseDC(hdc) + return TRUE; +} + + +/* Implementation of global Vulkan functions, which are state-less. + * There are only a handful of these. */ + +static PFN_vkVoidFunction WINE_VKAPI wine_vkGetInstanceProcAddr(VkInstance instance, const char* pName) +{ + return wine_vk_icdGetInstanceProcAddr(instance, pName) +} + +static VkResult WINE_VKAPI wine_vkCreateInstance(..) +{ + return icd_funcs->vkCreateInstance(..) +} + +static VkResult WINE_VKAPI wine_vkEnumerateInstanceExtensionProperties(const char *pLayerName, uint32_t *pPropertyCount, + VkExtensionProperties* pProperties) +{ + return icd_funcs->vkEnumerateInstanceExtensionProperties(..) +} + + +/* ICD entry points, only 2 exist these days. */ + +void* WINAPI vk_icdGetInstanceProcAddr(VkInstance instance, const char* pName) +{ + if (!wine_vk_init()) + return NULL; + + if (!instance) + { + return wine_vk_get_global_proc_addr(pName); + } + + /* Now find any instance function. */ + func = wine_vk_get_instance_proc_addr(pName); + if (func) + return func; + + func = wine_vk_get_device_proc_addr(pName); + if (func) + return func; + + TRACE("Function %s not found\n", pName); + return NULL; +} + +VkResult WINAPI vk_icdNegotiateLoaderICDInterfaceVersion(uint32_t* pSupportedVersion) +{ + if (!wine_vk_init()) + return VK_ERROR_INCOMPATIBLE_DRIVER; + + *pSupportedVersion = min(*pSupportedVersion, WINE_VULKAN_ICD_VERSION); + return VK_SUCCESS; +} diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c new file mode 100644 index 0000000000..0dfb5ac7fd --- /dev/null +++ b/dlls/winevulkan/vulkan_thunks.c @@ -0,0 +1,80 @@ +/* Automatically generated from Vulkan vk.xml; DO NOT EDIT! */ + +#include "wine/debug.h" +#include "wine/vulkan.h" +#include "vulkan_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(vulkan); + +static VkResult WINAPI wine_vkAllocateCommandBuffers(VkDevice device, const VkCommandBufferAllocateInfo * pAllocateInfo, VkCommandBuffer * pCommandBuffers) +{ + TRACE(" %p, %p, %p\n", device, pAllocateInfo, pCommandBuffers); + /* Vulkan excepts dispatch tables to stored in 'dispatchable' objects. + * Each object will have a dispatch table to either the 'instance' or 'device' table. + * This helps us as the graphics driver winex11 will fill this function table. + * Another nice benefit is that the native libvulkan-1.so as used by winex11 may + * load multiple ICDs behind our back in a multi-gpu system, but we don't have to bother + * with any of the details as the function pointers will always be right as they are per object. + */ + return device->funcs->vkAllocateCommandBuffers(device, pAllocateInfo, pCommandBuffers); +} +.. +.. +static void WINAPI X11DRV_vkGetPhysicalDeviceFeatures(VkPhysicalDevice physicalDevice, VkPhysicalDeviceFeatures * pFeatures) +{ + TRACE("%p, %p\n", physicalDevice, pFeatures); + physicalDevice->funcs.p_vkGetPhysicalDeviceFeatures(physicalDevice->phys_dev, pFeatures); +} + + +const struct vulkan_func vk_device_dispatch_table[] = { + {"vkAllocateCommandBuffers", NULL, &wine_vkAllocateCommandBuffers}, + .. + {"vkWaitForFences", NULL, &wine_vkWaitForFences}, +}; +const int vk_device_dispatch_table_size = 120; + +const struct vulkan_func vk_instance_dispatch_table[] = { + {"vkCreateDevice", NULL, &wine_vkCreateDevice}, + {"vkDestroyInstance", NULL, &wine_vkDestroyInstance}, + {"vkEnumerateDeviceExtensionProperties", NULL, &wine_vkEnumerateDeviceExtensionProperties}, + {"vkEnumerateDeviceLayerProperties", NULL, &wine_vkEnumerateDeviceLayerProperties}, + {"vkEnumeratePhysicalDevices", NULL, &wine_vkEnumeratePhysicalDevices}, + {"vkGetDeviceProcAddr", NULL, &wine_vkGetDeviceProcAddr}, + {"vkGetPhysicalDeviceFeatures", NULL, &wine_vkGetPhysicalDeviceFeatures}, + {"vkGetPhysicalDeviceFormatProperties", NULL, &wine_vkGetPhysicalDeviceFormatProperties}, + {"vkGetPhysicalDeviceImageFormatProperties", NULL, &wine_vkGetPhysicalDeviceImageFormatProperties}, + {"vkGetPhysicalDeviceMemoryProperties", NULL, &wine_vkGetPhysicalDeviceMemoryProperties}, + {"vkGetPhysicalDeviceProperties", NULL, &wine_vkGetPhysicalDeviceProperties}, + {"vkGetPhysicalDeviceQueueFamilyProperties", NULL, &wine_vkGetPhysicalDeviceQueueFamilyProperties}, + {"vkGetPhysicalDeviceSparseImageFormatProperties", NULL, &wine_vkGetPhysicalDeviceSparseImageFormatProperties}, +}; +const int vk_instance_dispatch_table_size = 13; + +void* wine_vk_get_device_proc_addr(const char* name) +{ + int i; + for (i = 0; i < vk_device_dispatch_table_size; i++) + { + if (strcmp(name, vk_device_dispatch_table[i].name) == 0) + { + TRACE("Found pName=%s in device table\n", name); + return vk_device_dispatch_table[i].func; + } + } + return NULL; +} + +void* wine_vk_get_instance_proc_addr(const char* name) +{ + int i; + for (i = 0; i < vk_instance_dispatch_table_size; i++) + { + if (strcmp(name, vk_instance_dispatch_table[i].name) == 0) + { + TRACE("Found pName=%s in instance table\n", name); + return vk_instance_dispatch_table[i].func; + } + } + return NULL; +} diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c new file mode 100644 index 0000000000..5b83d43360 --- /dev/null +++ b/dlls/winex11.drv/vulkan.c @@ -0,0 +1,77 @@ +struct vk_global_functions = +{ + {"vkCreateInstance", X11DRV_vkCreateInstance}, + .. +} + +/* Functions creating dispatchable objects and a few others (e.g. vkGetDeviceQueue) + * need special implementations. */ +struct vk_overrides = +{ + {"vkCreateDevice", X11DRV_vkCreateDevice} + .. +} + +struct winex11_vkinstance +{ + struct VkInstance_T; + + /* Native instance */ + VkInstance *instance; +}; + +static VkResult WINE_VKAPI X11DRV_vkCreateInstance(..) +{ + instance = wine_vk_alloc_dispatchable_object(..); + + pvkCreateInstance(,, &instance->instance); + + /* Load all instance functions we are aware of. Note the loader takes care + * of any filtering for extensions which were not requested, but which the + * ICD may support. + */ +#define USE_VK_FUNC(name) \ + instance->funcs.p_##name = (void*)pvkGetInstanceProcAddr(instance->instance, #name); + ALL_VK_INSTANCE_FUNCS() +#undef USE_VK_FUNC + + return VK_SUCCESS; +} + + +static VkResult WINE_VKAPI X11DRV_vkCreateDevice(..) +{ + device = wine_vk_alloc_dispatchable_object(..); + + pvkCreateDevice(,, &device->device); + + /* Just load all function pointers we are aware off. The loader takes care of filtering. */ +#define USE_VK_FUNC(name) \ + device->funcs.p_##name = (void*)pvkGetDeviceProcAddr(device->device, #name); \ + if (device->funcs.p_##name == NULL) \ + TRACE("Not found %s\n", #name); + ALL_VK_DEVICE_FUNCS() +#undef USE_VK_FUNC + + return VK_SUCCESS; +} + +void* X11DRV_vk_icdGetInstanceProcAddr(VkInstance instance, const char* pName) +{ + if (!instance) + { + // search vk_global_functions + } + + // search table of overrides + + /* Ask the native ICD library. Since VkInstance is a dispatchable object + * retrieve the native instance and pass it down. + */ + return native_vkGetInstanceProcAddr(instance->native_instance, pName); +} + +VkResult X11DRV_vk_icdNegotiateLoaderICDInterfaceVersion(uint32_t* pSupportedVersion) +{ + return VK_INCOMPLETE; +} diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index 614f0b90f4..d701488b31 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -78,3 +78,7 @@ @ stdcall ImeProcessKey(long long long ptr) @ stdcall ImeGetRegisterWordStyle(long ptr) @ stdcall ImeGetImeMenuItems(long long long ptr ptr long) + +# Vulkan +@ cdecl vk_icdGetInstanceProcAddr(ptr str) X11DRV_vk_icdGetInstanceProcAddr +@ cdecl vk_icdNegotiateLoaderICDInterfaceVersion(ptr) X11DRV_vk_icdNegotiateLoaderICDInterfaceVersion diff --git a/include/wine/vulkan_driver.h b/include/wine/vulkan_driver.h new file mode 100644 index 0000000000..eb3159f098 --- /dev/null +++ b/include/wine/vulkan_driver.h @@ -0,0 +1,78 @@ +/* I'm thinking of using 'WINE_VKAPI' as the calling convention for all calls implemented + * by winex11/android. This convention should be the same as the calling convention used + * by the native Vulkan library. + */ +#define WINE_VKAPI + +/* Struct returned by gdi32 back to winevulkan. */ +struct vulkan_icd_funcs +{ + /* To use WINE_VKAPI calling convention? */ + Function Pointer to vk_icdGetInstanceProcAddr + /* Technically this is an ICD export, but we may not need, will see. */ + Function Pointer to vk_icdNegotiateLoaderICDInterfaceVersion +}; + +struct vulkan_device_funcs +{ + vkAllocateCommandBuffers; + .. + vkWaitForFences; +}; + +struct vulkan_instance_funcs +{ + vkCreateDevice; + .. + vkGetPhysicalDeviceSparseImageFormatProperties; +}; + +#define ALL_VK_DEVICE_FUNCS() \ + USE_VK_FUNC(vkAllocateCommandBuffers) \ + USE_VK_FUNC(vkAllocateDescriptorSets) \ + USE_VK_FUNC(vkAllocateMemory) \ + .. + + +#define ALL_VK_INSTANCE_FUNCS() \ + USE_VK_FUNC(vkCreateDevice)\ + USE_VK_FUNC(vkDestroyInstance)\ + USE_VK_FUNC(vkEnumerateDeviceExtensionProperties)\ + .. + + +/* Magic value defined by Vulkan ICD / Loader spec */ +#define VULKAN_ICD_MAGIC_VALUE 0x01CDC0DE + +/* Base 'class' for our Vulkan dispatchable objects such as VkDevice and VkInstance. + * This structure MUST be the first element of a dispatchable object as the ICD + * loader depends on it. For now only contains loader_magic, but over time more common + * functionality is expected. + */ +struct wine_vk_base +{ + /* Special section in each dispatchable object for use by the ICD loader for + * storing dispatch tables. The start contains a magical value '0x01CDC0DE'. + */ + uintptr_t loader_magic; +}; + +/* Vulkan defines handles for objects through VK_DEFINE_HANDLE. As part of this + * it defines forward declarations for structs '_T', which the implementor (us) + * can use. + */ +struct VkDevice_T +{ + struct wine_vk_base base; + struct vulkan_device_funcs funcs; + + /* driver private data */ +}; + +struct VkInstance_T +{ + struct wine_vk_base base; + struct vulkan_instance_funcs funcs; + + /* driver private data */ +}; -- 2.13.6

1 0

Re: [PATCH] kernel32/tests: Test console input instead of stdin in test_ReadConsole.
by Marvin 02 Nov '17

02 Nov '17

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=33874 Your paranoid android. === wxppro (32 bit console) === console.c:2582: Test failed: expected INVALID_FILE_SIZE, got 0 console.c:2583: Test failed: expected ERROR_INVALID_HANDLE, got -559038737 === wvistau64 (32 bit console) === console.c:2582: Test failed: expected INVALID_FILE_SIZE, got 0x6000 console.c:2583: Test failed: expected ERROR_INVALID_HANDLE, got -559038737 === w2008s64 (32 bit console) === console.c:2582: Test failed: expected INVALID_FILE_SIZE, got 0x4000 console.c:2583: Test failed: expected ERROR_INVALID_HANDLE, got -559038737 === w7pro64 (64 bit console) === console.c:2582: Test failed: expected INVALID_FILE_SIZE, got 0x1000 console.c:2583: Test failed: expected ERROR_INVALID_HANDLE, got -559038737

1 0

Re: [PATCH] kernel32/tests: Detect and handle a redirected stdin.
by Alexandre Julliard 02 Nov '17

02 Nov '17

Alex Henrie <alexhenrie24(a)gmail.com> writes: > @@ -2572,7 +2572,7 @@ static void test_ReadConsoleOutputAttribute(HANDLE output_handle) > ok(count == 1, "Expected count to be 1, got %u\n", count); > } > > -static void test_ReadConsole(void) > +static void test_ReadConsole(HANDLE input_handle) > { > HANDLE std_input; > DWORD ret, bytes; > @@ -2582,6 +2582,13 @@ static void test_ReadConsole(void) > > SetLastError(0xdeadbeef); > ret = GetFileSize(std_input, NULL); > + if (GetLastError() == 0xdeadbeef) > + { > + /* print a warning and cheat a little so that the tests can continue */ > + skip("stdin appears to be redirected; if it's not then this is an error"); > + std_input = input_handle; > + ret = GetFileSize(std_input, NULL); > + } I'm not sure why we'd need to use stdin at all then, we might as well always use the proper console handle. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [PATCH] iphlpapi: Remove check for negative value.
by Alexandre Julliard 02 Nov '17

02 Nov '17

Andrey Gusev <andrey.goosev(a)gmail.com> writes: > +++ b/dlls/iphlpapi/ipstats.c > @@ -2056,7 +2056,7 @@ static unsigned int find_owning_pid( struct pid_map *map, unsigned int num_entri > for (i = 0; i < num_entries; i++) > { > fd_len = proc_pidinfo( map[i].unix_pid, PROC_PIDLISTFDS, 0, NULL, 0 ); > - if (fd_len <= 0) continue; > + if (fd_len == 0) continue; The function returns int, probably the variable type should be changed instead. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [v3] oleaut32: Add ARM support to DispCallFunc().
by Alexandre Julliard 02 Nov '17

02 Nov '17

Donna Whisnant <dewhisna(a)dewtronics.com> writes: > Adds ARM ABI support to DispCallFunc() to allow IDispatch invoke calls > to succeed on ARM platforms. This change specifically targets only > 32-bit little-endian (ARMEL) platform CPUs. It's believed to likely be > compatible with big-endian (ARMEB) platforms, but testing for that > platform should be completed before enabling. > > Tested on Raspbian Stretch 2017-09-07 RPi image using a Qemu systemd > container to compile and run it on an x86-64 Host.. When running on > Raspberry Pi hardware, a 3G/1G split kernel needs to be used for Wine > to function. It breaks the Android build: arm-linux-androideabi-gcc -c -o typelib.o ../../../wine/dlls/oleaut32/typelib.c -I. -I../../../wine/dlls/oleaut32 \ -I../../include -I../../../wine/include -D__WINESRC__ -D_OLEAUT32_ -D_REENTRANT -fPIC -Wall -pipe \ -fno-strict-aliasing -Wdeclaration-after-statement -Wempty-body -Wignored-qualifiers \ -Wstrict-prototypes -Wtype-limits -Wunused-but-set-parameter -Wvla -Wwrite-strings -Wpointer-arith \ -Wlogical-op -gdwarf-2 -gstrict-dwarf -g -O2 -fno-diagnostics-show-caret -D__ANDROID_API__=26 -marm {standard input}: Assembler messages: {standard input}:32: Error: selected processor does not support ARM mode `vldm r3!,{s0-s15}' Makefile:516: recipe for target 'typelib.o' failed make: *** [typelib.o] Error 1 -- Alexandre Julliard julliard(a)winehq.org

3 5

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel