wine-commits November 2015

wine-commits@winehq.org

2 participants
623 discussions

Piotr Caban : winex11.drv: Don't call IDropTarget::{DragOver, DragLeave, Drop} functions if DragEnter fails.
by Alexandre Julliard 20 Nov '15

20 Nov '15

Module: wine Branch: master Commit: a19fe8d9c8547f803ac953e705d1a937e00719c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a19fe8d9c8547f803ac953e70… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 20 11:44:26 2015 +0100 winex11.drv: Don't call IDropTarget::{DragOver,DragLeave,Drop} functions if DragEnter fails. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xdnd.c | 66 +++++++++++++++++++++++++++---------------------- 1 file changed, 36 insertions(+), 30 deletions(-) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index 59c1671..01af480 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -285,7 +285,7 @@ void X11DRV_XDND_PositionEvent( HWND hWnd, XClientMessageEvent *event ) /* Notify OLE of DragEnter. Result determines if we accept */ HWND dropTargetWindow; - if (XDNDLastDropTargetWnd) + if (XDNDAccepted && XDNDLastDropTargetWnd) { dropTarget = get_droptarget_pointer(XDNDLastDropTargetWnd); if (dropTarget) @@ -387,35 +387,38 @@ void X11DRV_XDND_DropEvent( HWND hWnd, XClientMessageEvent *event ) TRACE("\n"); /* Notify OLE of Drop */ - dropTarget = get_droptarget_pointer(XDNDLastDropTargetWnd); - if (dropTarget) + if (XDNDAccepted) { - HRESULT hr; - POINTL pointl; - - pointl.x = XDNDxy.x; - pointl.y = XDNDxy.y; - hr = IDropTarget_Drop(dropTarget, &XDNDDataObject, MK_LBUTTON, - pointl, &effect); - if (hr == S_OK) + dropTarget = get_droptarget_pointer(XDNDLastDropTargetWnd); + if (dropTarget) { - if (effect != DROPEFFECT_NONE) + HRESULT hr; + POINTL pointl; + + pointl.x = XDNDxy.x; + pointl.y = XDNDxy.y; + hr = IDropTarget_Drop(dropTarget, &XDNDDataObject, MK_LBUTTON, + pointl, &effect); + if (hr == S_OK) { - TRACE("drop succeeded\n"); - accept = 1; - drop_file = FALSE; + if (effect != DROPEFFECT_NONE) + { + TRACE("drop succeeded\n"); + accept = 1; + drop_file = FALSE; + } + else + TRACE("the application refused the drop\n"); } + else if (FAILED(hr)) + WARN("drop failed, error 0x%08X\n", hr); else - TRACE("the application refused the drop\n"); - } - else if (FAILED(hr)) - WARN("drop failed, error 0x%08X\n", hr); - else - { - WARN("drop returned 0x%08X\n", hr); - drop_file = FALSE; + { + WARN("drop returned 0x%08X\n", hr); + drop_file = FALSE; + } + IDropTarget_Release(dropTarget); } - IDropTarget_Release(dropTarget); } if (drop_file) @@ -465,13 +468,16 @@ void X11DRV_XDND_LeaveEvent( HWND hWnd, XClientMessageEvent *event ) TRACE("DND Operation canceled\n"); /* Notify OLE of DragLeave */ - dropTarget = get_droptarget_pointer(XDNDLastDropTargetWnd); - if (dropTarget) + if (XDNDAccepted) { - HRESULT hr = IDropTarget_DragLeave(dropTarget); - if (FAILED(hr)) - WARN("IDropTarget_DragLeave failed, error 0x%08X\n", hr); - IDropTarget_Release(dropTarget); + dropTarget = get_droptarget_pointer(XDNDLastDropTargetWnd); + if (dropTarget) + { + HRESULT hr = IDropTarget_DragLeave(dropTarget); + if (FAILED(hr)) + WARN("IDropTarget_DragLeave failed, error 0x%08X\n", hr); + IDropTarget_Release(dropTarget); + } } X11DRV_XDND_FreeDragDropOp();

1 0

Piotr Caban : winex11.drv: Inform x11 that we' re interested in drop if windows expects WM_DROPFILES message.
by Alexandre Julliard 20 Nov '15

20 Nov '15

Module: wine Branch: master Commit: 701bb45203e3e5b6924c43916b75416a94206d93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=701bb45203e3e5b6924c43916… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 20 11:44:08 2015 +0100 winex11.drv: Inform x11 that we're interested in drop if windows expects WM_DROPFILES message. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xdnd.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index 4cbefc9..59c1671 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -339,9 +339,8 @@ void X11DRV_XDND_PositionEvent( HWND hWnd, XClientMessageEvent *event ) if (XDNDAccepted) accept = 1; - else if (dropTarget == NULL && - (GetWindowLongW( hWnd, GWL_EXSTYLE ) & WS_EX_ACCEPTFILES) && - (effect & DROPEFFECT_COPY) && + else if ((GetWindowLongW( hWnd, GWL_EXSTYLE ) & WS_EX_ACCEPTFILES) && + (X11DRV_XDND_XdndActionToDROPEFFECT(event->data.l[4]) & DROPEFFECT_COPY) && X11DRV_XDND_HasHDROP()) { accept = 1;

1 0

Piotr Caban : winex11.drv: Send WM_DROPFILES if IDropTarget_Drop failed or DROPEFFECT_NONE was set.
by Alexandre Julliard 20 Nov '15

20 Nov '15

Module: wine Branch: master Commit: 5dad16510d384eccd9cd8b8d0575d02ea447c01b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dad16510d384eccd9cd8b8d0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 20 11:43:38 2015 +0100 winex11.drv: Send WM_DROPFILES if IDropTarget_Drop failed or DROPEFFECT_NONE was set. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xdnd.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index 72758a0..4cbefc9 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -383,6 +383,7 @@ void X11DRV_XDND_DropEvent( HWND hWnd, XClientMessageEvent *event ) IDropTarget *dropTarget; DWORD effect = XDNDDropEffect; int accept = 0; /* Assume we're not accepting */ + BOOL drop_file = TRUE; TRACE("\n"); @@ -397,26 +398,33 @@ void X11DRV_XDND_DropEvent( HWND hWnd, XClientMessageEvent *event ) pointl.y = XDNDxy.y; hr = IDropTarget_Drop(dropTarget, &XDNDDataObject, MK_LBUTTON, pointl, &effect); - if (SUCCEEDED(hr)) + if (hr == S_OK) { if (effect != DROPEFFECT_NONE) { TRACE("drop succeeded\n"); accept = 1; + drop_file = FALSE; } else TRACE("the application refused the drop\n"); } - else + else if (FAILED(hr)) WARN("drop failed, error 0x%08X\n", hr); + else + { + WARN("drop returned 0x%08X\n", hr); + drop_file = FALSE; + } IDropTarget_Release(dropTarget); } - else + + if (drop_file) { - /* Only send WM_DROPFILES if there is no drop target. Doing both - * causes winamp to duplicate the dropped files (#29081) */ + /* Only send WM_DROPFILES if Drop didn't succeed or DROPEFFECT_NONE was set. + * Doing both causes winamp to duplicate the dropped files (#29081) */ if ((GetWindowLongW( hWnd, GWL_EXSTYLE ) & WS_EX_ACCEPTFILES) && - (effect & DROPEFFECT_COPY) && + (XDNDDropEffect & DROPEFFECT_COPY) && X11DRV_XDND_HasHDROP()) { HRESULT hr = X11DRV_XDND_SendDropFiles( hWnd );

1 0

Alexandre Julliard : advapi32: Don't try to create the registry root.
by Alexandre Julliard 20 Nov '15

20 Nov '15

Module: wine Branch: master Commit: eafdbdd13b19d9f0ddfa3309eb38d7ec2a22986f URL: http://source.winehq.org/git/wine.git/?a=commit;h=eafdbdd13b19d9f0ddfa3309e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 20 19:56:40 2015 +0900 advapi32: Don't try to create the registry root. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/registry.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 798f93d..4f33fe6 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -141,10 +141,16 @@ static NTSTATUS create_key( HKEY *retkey, ACCESS_MASK access, OBJECT_ATTRIBUTES if (status == STATUS_OBJECT_NAME_NOT_FOUND) { + static const WCHAR registry_root[] = {'\\','R','e','g','i','s','t','r','y','\\'}; WCHAR *buffer = attr->ObjectName->Buffer; DWORD attrs, pos = 0, i = 0, len = attr->ObjectName->Length / sizeof(WCHAR); UNICODE_STRING str; + /* don't try to create registry root */ + if (!attr->RootDirectory && len > sizeof(registry_root)/sizeof(WCHAR) && + !memicmpW( buffer, registry_root, sizeof(registry_root)/sizeof(WCHAR))) + i += sizeof(registry_root)/sizeof(WCHAR); + while (i < len && buffer[i] != '\\') i++; if (i == len && !force_wow32) return status;

1 0

Alexandre Julliard : configure: Don' t allow doing a 32-bit Wow64 build from inside the source tree.
by Alexandre Julliard 20 Nov '15

20 Nov '15

Module: wine Branch: master Commit: dfe65ce13e48c2563a88f2c5687c89104f2bd391 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfe65ce13e48c2563a88f2c56… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 20 19:27:30 2015 +0900 configure: Don't allow doing a 32-bit Wow64 build from inside the source tree. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 2 ++ 2 files changed, 4 insertions(+) diff --git a/configure b/configure index 291966b..03f95ab 100755 --- a/configure +++ b/configure @@ -5069,6 +5069,8 @@ then as_fn_error $? "--enable-win64 and --with-wine64 are mutually exclusive. --enable-win64 should be used in the 64-bit build tree, --with-wine64 in the 32-bit Wow64 build tree." "$LINENO" 5 fi + test "$srcdir" != . || as_fn_error $? "--with-wine64 cannot be used when building inside the source tree. +You should create a separate build directory and run configure from there." "$LINENO" 5 enable_fonts=${enable_fonts:-no} enable_server=${enable_server:-no} elif test "x$enable_win64" = "xyes" diff --git a/configure.ac b/configure.ac index bd3db26..2d2a168 100644 --- a/configure.ac +++ b/configure.ac @@ -203,6 +203,8 @@ then AC_MSG_ERROR([--enable-win64 and --with-wine64 are mutually exclusive. --enable-win64 should be used in the 64-bit build tree, --with-wine64 in the 32-bit Wow64 build tree.]) fi + test "$srcdir" != . || AC_MSG_ERROR([--with-wine64 cannot be used when building inside the source tree. +You should create a separate build directory and run configure from there.]) enable_fonts=${enable_fonts:-no} enable_server=${enable_server:-no} elif test "x$enable_win64" = "xyes"

1 0

Bruno Jesus : user32: Don' t add scroll bars to mdiclient if the window style doesn't allow it.
by Alexandre Julliard 20 Nov '15

20 Nov '15

Module: wine Branch: master Commit: ecd814cca5e704e4ffdebd7609fa5593aed96393 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecd814cca5e704e4ffdebd760… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Nov 20 16:38:16 2015 +0800 user32: Don't add scroll bars to mdiclient if the window style doesn't allow it. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/mdi.c | 28 ++++++++++++++++++---------- dlls/user32/tests/win.c | 2 -- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index d0a472a..b5a0473 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -1709,6 +1709,7 @@ void WINAPI CalcChildScroll( HWND hwnd, INT scroll ) SCROLLINFO info; RECT childRect, clientRect; HWND *list; + DWORD style; GetClientRect( hwnd, &clientRect ); SetRectEmpty( &childRect ); @@ -1718,7 +1719,7 @@ void WINAPI CalcChildScroll( HWND hwnd, INT scroll ) int i; for (i = 0; list[i]; i++) { - DWORD style = GetWindowLongW( list[i], GWL_STYLE ); + style = GetWindowLongW( list[i], GWL_STYLE ); if (style & WS_MAXIMIZE) { HeapFree( GetProcessHeap(), 0, list ); @@ -1740,22 +1741,29 @@ void WINAPI CalcChildScroll( HWND hwnd, INT scroll ) info.cbSize = sizeof(info); info.fMask = SIF_POS | SIF_RANGE; - /* set the specific */ + /* set the specific values and apply but only if window style allows */ + style = GetWindowLongW( hwnd, GWL_STYLE ); switch( scroll ) { case SB_BOTH: case SB_HORZ: - info.nMin = childRect.left; - info.nMax = childRect.right - clientRect.right; - info.nPos = clientRect.left - childRect.left; - SetScrollInfo(hwnd, SB_HORZ, &info, TRUE); + if (style & (WS_HSCROLL | WS_VSCROLL)) + { + info.nMin = childRect.left; + info.nMax = childRect.right - clientRect.right; + info.nPos = clientRect.left - childRect.left; + SetScrollInfo(hwnd, SB_HORZ, &info, TRUE); + } if (scroll == SB_HORZ) break; /* fall through */ case SB_VERT: - info.nMin = childRect.top; - info.nMax = childRect.bottom - clientRect.bottom; - info.nPos = clientRect.top - childRect.top; - SetScrollInfo(hwnd, SB_VERT, &info, TRUE); + if (style & (WS_HSCROLL | WS_VSCROLL)) + { + info.nMin = childRect.top; + info.nMax = childRect.bottom - clientRect.bottom; + info.nPos = clientRect.top - childRect.top; + SetScrollInfo(hwnd, SB_VERT, &info, TRUE); + } break; } } diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index cf4ae36..fc6505f 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2136,7 +2136,6 @@ todo_wine ok(si.nMax != 100, "expected !100\n"); } else -todo_wine ok(!ret, "style %#x: GetScrollInfo(SB_HORZ) should fail\n", style[i]); ret = GetScrollInfo(mdi_client, SB_VERT, &si); @@ -2151,7 +2150,6 @@ todo_wine ok(si.nMax != 100, "expected !100\n"); } else -todo_wine ok(!ret, "style %#x: GetScrollInfo(SB_VERT) should fail\n", style[i]); DestroyWindow(mdi_child);

1 0

Dmitry Timoshkov : user32/tests: Add some tests for mdiclient scrolling.
by Alexandre Julliard 20 Nov '15

20 Nov '15

Module: wine Branch: master Commit: c482cda1b6d20a17c30fc4a69e3b61919ffe01d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c482cda1b6d20a17c30fc4a69… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Nov 20 16:38:10 2015 +0800 user32/tests: Add some tests for mdiclient scrolling. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 140 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 139 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 3323f67..cf4ae36 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2000,10 +2000,12 @@ static BOOL mdi_RegisterWindowClasses(void) static void test_mdi(void) { + static const DWORD style[] = { 0, WS_HSCROLL, WS_VSCROLL, WS_HSCROLL | WS_VSCROLL }; HWND mdi_hwndMain, mdi_client; CLIENTCREATESTRUCT client_cs; RECT rc; - /*MSG msg;*/ + DWORD i; + MSG msg; if (!mdi_RegisterWindowClasses()) assert(0); @@ -2020,6 +2022,142 @@ static void test_mdi(void) client_cs.hWindowMenu = 0; client_cs.idFirstChild = 1; + for (i = 0; i < sizeof(style)/sizeof(style[0]); i++) + { + HWND mdi_child; + SCROLLINFO si; + BOOL ret, gotit; + + mdi_client = CreateWindowExA(0, "mdiclient", NULL, + WS_CHILD | style[i], + 0, 0, rc.right, rc.bottom, + mdi_hwndMain, 0, 0, &client_cs); + ok(mdi_client != 0, "MDI client creation failed\n"); + + mdi_child = CreateWindowExA(WS_EX_MDICHILD, "MDI_child_Class_1", "MDI child", + 0, + CW_USEDEFAULT, CW_USEDEFAULT, + CW_USEDEFAULT, CW_USEDEFAULT, + mdi_client, 0, 0, + mdi_lParam_test_message); + ok(mdi_child != 0, "MDI child creation failed\n"); + + si.cbSize = sizeof(si); + si.fMask = SIF_ALL; + ret = GetScrollInfo(mdi_client, SB_HORZ, &si); + if (style[i] & (WS_HSCROLL | WS_VSCROLL)) + { + ok(ret, "style %#x: GetScrollInfo(SB_HORZ) failed\n", style[i]); + ok(si.nPage == 0, "expected 0\n"); + ok(si.nPos == 0, "expected 0\n"); + ok(si.nTrackPos == 0, "expected 0\n"); + ok(si.nMin == 0, "expected 0\n"); + ok(si.nMax == 100, "expected 100\n"); + } + else + ok(!ret, "style %#x: GetScrollInfo(SB_HORZ) should fail\n", style[i]); + + ret = GetScrollInfo(mdi_client, SB_VERT, &si); + if (style[i] & (WS_HSCROLL | WS_VSCROLL)) + { + ok(ret, "style %#x: GetScrollInfo(SB_VERT) failed\n", style[i]); + ok(si.nPage == 0, "expected 0\n"); + ok(si.nPos == 0, "expected 0\n"); + ok(si.nTrackPos == 0, "expected 0\n"); + ok(si.nMin == 0, "expected 0\n"); + ok(si.nMax == 100, "expected 100\n"); + } + else + ok(!ret, "style %#x: GetScrollInfo(SB_VERT) should fail\n", style[i]); + + SetWindowPos(mdi_child, 0, -100, -100, 0, 0, SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOSIZE); + + si.cbSize = sizeof(si); + si.fMask = SIF_ALL; + ret = GetScrollInfo(mdi_client, SB_HORZ, &si); + if (style[i] & (WS_HSCROLL | WS_VSCROLL)) + { + ok(ret, "style %#x: GetScrollInfo(SB_HORZ) failed\n", style[i]); + ok(si.nPage == 0, "expected 0\n"); + ok(si.nPos == 0, "expected 0\n"); + ok(si.nTrackPos == 0, "expected 0\n"); + ok(si.nMin == 0, "expected 0\n"); + ok(si.nMax == 100, "expected 100\n"); + } + else + ok(!ret, "style %#x: GetScrollInfo(SB_HORZ) should fail\n", style[i]); + + ret = GetScrollInfo(mdi_client, SB_VERT, &si); + if (style[i] & (WS_HSCROLL | WS_VSCROLL)) + { + ok(ret, "style %#x: GetScrollInfo(SB_VERT) failed\n", style[i]); + ok(si.nPage == 0, "expected 0\n"); + ok(si.nPos == 0, "expected 0\n"); + ok(si.nTrackPos == 0, "expected 0\n"); + ok(si.nMin == 0, "expected 0\n"); + ok(si.nMax == 100, "expected 100\n"); + } + else + ok(!ret, "style %#x: GetScrollInfo(SB_VERT) should fail\n", style[i]); + + gotit = FALSE; + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + { + if (msg.message == WM_MOUSEMOVE || msg.message == WM_PAINT) + { + DispatchMessageA(&msg); + continue; + } + + if (msg.message == 0x003f) /* WM_MDICALCCHILDSCROLL ??? */ + { + ok(msg.hwnd == mdi_client, "message 0x003f should be posted to mdiclient\n"); + gotit = TRUE; + } + else +todo_wine + ok(msg.hwnd != mdi_client, "message %04x should not be posted to mdiclient\n", msg.message); + DispatchMessageA(&msg); + } +todo_wine + ok(gotit, "message 0x003f should appear after SetWindowPos\n"); + + si.cbSize = sizeof(si); + si.fMask = SIF_ALL; + ret = GetScrollInfo(mdi_client, SB_HORZ, &si); + if (style[i] & (WS_HSCROLL | WS_VSCROLL)) + { + ok(ret, "style %#x: GetScrollInfo(SB_HORZ) failed\n", style[i]); +todo_wine + ok(si.nPage != 0, "expected !0\n"); + ok(si.nPos == 0, "expected 0\n"); + ok(si.nTrackPos == 0, "expected 0\n"); + ok(si.nMin != 0, "expected !0\n"); + ok(si.nMax != 100, "expected !100\n"); + } + else +todo_wine + ok(!ret, "style %#x: GetScrollInfo(SB_HORZ) should fail\n", style[i]); + + ret = GetScrollInfo(mdi_client, SB_VERT, &si); + if (style[i] & (WS_HSCROLL | WS_VSCROLL)) + { + ok(ret, "style %#x: GetScrollInfo(SB_VERT) failed\n", style[i]); +todo_wine + ok(si.nPage != 0, "expected !0\n"); + ok(si.nPos == 0, "expected 0\n"); + ok(si.nTrackPos == 0, "expected 0\n"); + ok(si.nMin != 0, "expected !0\n"); + ok(si.nMax != 100, "expected !100\n"); + } + else +todo_wine + ok(!ret, "style %#x: GetScrollInfo(SB_VERT) should fail\n", style[i]); + + DestroyWindow(mdi_child); + DestroyWindow(mdi_client); + } + /* MDIClient without MDIS_ALLCHILDSTYLES */ mdi_client = CreateWindowExA(0, "mdiclient", NULL,

1 0

Nikolay Sivov : user32/tests: Relax iCaptionWidth test to fix some failures.
by Alexandre Julliard 20 Nov '15

20 Nov '15

Module: wine Branch: master Commit: 5ab2999fbb955b957cbcb614b8562d707b740781 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ab2999fbb955b957cbcb614b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 19 17:32:31 2015 +0300 user32/tests: Relax iCaptionWidth test to fix some failures. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/sysparams.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 1ee8920..6fc24a6 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -1552,10 +1552,10 @@ static void test_SPI_SETNONCLIENTMETRICS( void ) /* 44 */ ok( Ncmcur.iSmCaptionHeight == expect, "SmCaptionHeight: %d expected %d\n", Ncmcur.iSmCaptionHeight, expect); - ok( Ncmcur.iCaptionWidth == 8 || - Ncmcur.iCaptionWidth == 12 || /* Vista, W7b */ + /* iCaptionWidth depends on a version, could be 8, 12 (Vista, Win7), 13 */ + ok( (Ncmcur.iCaptionWidth >= 8 && Ncmcur.iCaptionWidth <= 13) || Ncmcur.iCaptionWidth == Ncmstart.iCaptionWidth, /* with windows XP theme, the value never changes */ - "CaptionWidth: %d expected 8, 12 or %d\n", Ncmcur.iCaptionWidth, Ncmstart.iCaptionWidth); + "CaptionWidth: %d expected from [8, 13] or %d\n", Ncmcur.iCaptionWidth, Ncmstart.iCaptionWidth); ok( Ncmcur.iScrollWidth == 8, "ScrollWidth: %d expected 8\n", Ncmcur.iScrollWidth); ok( Ncmcur.iScrollHeight == 8,

1 0

Francois Gouget : cmd/tests: Fix the %~a check on Windows >= 8.
by Alexandre Julliard 20 Nov '15

20 Nov '15

Module: wine Branch: master Commit: 50cb282c8cdf7363dcc018de5b88c1da123b49d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50cb282c8cdf7363dcc018de5… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Nov 19 16:25:35 2015 +0100 cmd/tests: Fix the %~a check on Windows >= 8. Starting with Windows 8 %~a reports two new attributes, most likely to match the new +X and +V attrib options (integrity and no_scrub_data respectively). Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/tests/test_builtins.cmd.exp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index c2879d6..811ba9f 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -331,7 +331,7 @@ N @todo_wine@'@drive@@shortpath@ABCDEFGHIJK.LMNOP'@or_broken@'' ''@or_broken@'%~ai' ''@or_broken@'%~ai' -'--a------'@or_broken@'%~ai' +'--a------'@or_broken@'--a--------'@or_broken@'%~ai' '5'@or_broken@'%~zi' ''@or_broken@'%~ti' ''@or_broken@'%~ti'

1 0

Francois Gouget : advapi32: Fix the FILE_DIR_DISALLOWED spelling.
by Alexandre Julliard 20 Nov '15

20 Nov '15

Module: wine Branch: master Commit: cdb65950dd98541f18274b1a4a36c2d70216019b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdb65950dd98541f18274b1a4… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Nov 19 16:21:29 2015 +0100 advapi32: Fix the FILE_DIR_DISALLOWED spelling. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winbase.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/winbase.h b/include/winbase.h index f0cc23c..7216086 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -705,7 +705,7 @@ typedef struct _TIME_ZONE_INFORMATION{ #define FILE_SYSTEM_NOT_SUPPORT 6 #define FILE_USER_DISALLOWED 7 #define FILE_READ_ONLY 8 -#define FILE_DIR_DISALOWED 9 +#define FILE_DIR_DISALLOWED 9 typedef DWORD (WINAPI *PFE_EXPORT_FUNC)(PBYTE,PVOID,ULONG); typedef DWORD (WINAPI *PFE_IMPORT_FUNC)(PBYTE,PVOID,ULONG);

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
63
Older →

Jump to page:

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-commits November 2015