May 2018 - Wine-Commits - list.winehq.org

Daniel Lehman : server: Notify parents of registry value changes.
by Alexandre Julliard May 7, 2018

May 7, 2018

Module: wine Branch: master Commit: 1353d02904b7f88cbfab3dee29f761ab4021ed69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1353d02904b7f88cbfab3dee… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu May 3 11:49:53 2018 -0700 server: Notify parents of registry value changes. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/registry.c | 2 +- server/registry.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index d975301..d600163 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -3525,7 +3525,7 @@ static void test_RegNotifyChangeKeyValue(void) ret = RegSetValueA(subsubkey, NULL, REG_SZ, "SubSubKeyValue", 0); ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); dwret = WaitForSingleObject(event, 0); - todo_wine ok(dwret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", dwret); + ok(dwret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", dwret); /* don't watch deeper values */ RegCloseKey(key); diff --git a/server/registry.c b/server/registry.c index 734a111..8ad97d4 100644 --- a/server/registry.c +++ b/server/registry.c @@ -548,7 +548,7 @@ static void touch_key( struct key *key, unsigned int change ) /* do notifications */ check_notify( key, change, 1 ); for ( k = key->parent; k; k = k->parent ) - check_notify( k, change & ~REG_NOTIFY_CHANGE_LAST_SET, 0 ); + check_notify( k, change, 0 ); } /* try to grow the array of subkeys; return 1 if OK, 0 on error */

1 0

Zebediah Figura : rpcrt4/tests: Add a basic test for RPC_IF_AUTOLISTEN.
by Alexandre Julliard May 7, 2018

May 7, 2018

Module: wine Branch: master Commit: 9d6d2eb3ce22ca2442a96a2cfcd3ebf2e7d59493 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d6d2eb3ce22ca2442a96a2c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat May 5 14:07:47 2018 -0500 rpcrt4/tests: Add a basic test for RPC_IF_AUTOLISTEN. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/tests/server.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 5278a1d..5a61181 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -1680,6 +1680,19 @@ client(const char *test) ok(RPC_S_OK == RpcStringFreeA(&binding), "RpcStringFree\n"); ok(RPC_S_OK == RpcBindingFree(&IServer_IfHandle), "RpcBindingFree\n"); } + else if (strcmp(test, "ncalrpc_autolisten") == 0) + { + ok(RPC_S_OK == RpcStringBindingComposeA(NULL, ncalrpc, NULL, guid, NULL, &binding), "RpcStringBindingCompose\n"); + ok(RPC_S_OK == RpcBindingFromStringBindingA(binding, &IServer_IfHandle), "RpcBindingFromStringBinding\n"); + + run_tests(); + authinfo_test(RPC_PROTSEQ_LRPC, 0); +todo_wine + test_is_server_listening(IServer_IfHandle, RPC_S_NOT_LISTENING); + + ok(RPC_S_OK == RpcStringFreeA(&binding), "RpcStringFree\n"); + ok(RPC_S_OK == RpcBindingFree(&IServer_IfHandle), "RpcBindingFree\n"); + } else if (strcmp(test, "ncalrpc_secure") == 0) { ok(RPC_S_OK == RpcStringBindingComposeA(NULL, ncalrpc, NULL, guid, NULL, &binding), "RpcStringBindingCompose\n"); @@ -1790,6 +1803,19 @@ server(void) CloseHandle(stop_event); stop_event = NULL; + if (pRpcServerRegisterIfEx) + { + status = pRpcServerRegisterIfEx(s_IServer_v0_0_s_ifspec, NULL, NULL, + RPC_IF_ALLOW_CALLBACKS_WITH_NO_AUTH | RPC_IF_AUTOLISTEN, + RPC_C_LISTEN_MAX_CALLS_DEFAULT, NULL); + ok(status == RPC_S_OK, "RpcServerRegisterIf() failed: %u\n", status); + + run_client("ncalrpc_autolisten"); + + status = RpcServerUnregisterIf(s_IServer_v0_0_s_ifspec, NULL, TRUE); + ok(status == RPC_S_OK, "RpcServerUnregisterIf() failed: %u\n", status); + } + CoUninitialize(); }

1 0

Daniel Lehman : advapi32/tests: Add RegNotifyChangeKeyValue tests.
by Alexandre Julliard May 7, 2018

May 7, 2018

Module: wine Branch: master Commit: 8dee2df6628f301e4c936d35d69ef83b443c81c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8dee2df6628f301e4c936d35… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu May 3 11:47:58 2018 -0700 advapi32/tests: Add RegNotifyChangeKeyValue tests. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/registry.c | 44 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 6d8f90a..d975301 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -3484,7 +3484,7 @@ static DWORD WINAPI notify_change_thread(void *arg) static void test_RegNotifyChangeKeyValue(void) { struct notify_data data; - HKEY key, subkey; + HKEY key, subkey, subsubkey; HANDLE thread; HANDLE event; DWORD dwret; @@ -3495,7 +3495,7 @@ static void test_RegNotifyChangeKeyValue(void) ret = RegCreateKeyA(hkey_main, "TestKey", &key); ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); - ret = RegNotifyChangeKeyValue(key, TRUE, REG_NOTIFY_CHANGE_NAME, event, TRUE); + ret = RegNotifyChangeKeyValue(key, TRUE, REG_NOTIFY_CHANGE_NAME|REG_NOTIFY_CHANGE_LAST_SET, event, TRUE); ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); dwret = WaitForSingleObject(event, 0); ok(dwret == WAIT_TIMEOUT, "expected WAIT_TIMEOUT, got %u\n", dwret); @@ -3505,7 +3505,47 @@ static void test_RegNotifyChangeKeyValue(void) dwret = WaitForSingleObject(event, 0); ok(dwret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", dwret); + /* watching deeper keys */ + ret = RegNotifyChangeKeyValue(key, TRUE, REG_NOTIFY_CHANGE_NAME|REG_NOTIFY_CHANGE_LAST_SET, event, TRUE); + ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); + dwret = WaitForSingleObject(event, 0); + ok(dwret == WAIT_TIMEOUT, "expected WAIT_TIMEOUT, got %u\n", dwret); + + ret = RegCreateKeyA(subkey, "SubKey", &subsubkey); + ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); + dwret = WaitForSingleObject(event, 0); + ok(dwret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", dwret); + + /* watching deeper values */ + ret = RegNotifyChangeKeyValue(key, TRUE, REG_NOTIFY_CHANGE_NAME|REG_NOTIFY_CHANGE_LAST_SET, event, TRUE); + ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); + dwret = WaitForSingleObject(event, 0); + ok(dwret == WAIT_TIMEOUT, "expected WAIT_TIMEOUT, got %u\n", dwret); + + ret = RegSetValueA(subsubkey, NULL, REG_SZ, "SubSubKeyValue", 0); + ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); + dwret = WaitForSingleObject(event, 0); + todo_wine ok(dwret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", dwret); + + /* don't watch deeper values */ + RegCloseKey(key); + ret = RegOpenKeyA(hkey_main, "TestKey", &key); + ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); + + ret = RegNotifyChangeKeyValue(key, FALSE, REG_NOTIFY_CHANGE_NAME|REG_NOTIFY_CHANGE_LAST_SET, event, TRUE); + ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); + dwret = WaitForSingleObject(event, 0); + ok(dwret == WAIT_TIMEOUT, "expected WAIT_TIMEOUT, got %u\n", dwret); + + ret = RegSetValueA(subsubkey, NULL, REG_SZ, "SubSubKeyValueNEW", 0); + ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); + dwret = WaitForSingleObject(event, 0); + ok(dwret == WAIT_TIMEOUT, "expected WAIT_TIMEOUT, got %u\n", dwret); + + RegDeleteKeyA(subkey, "SubKey"); RegDeleteKeyA(key, "SubKey"); + RegCloseKey(subsubkey); + RegCloseKey(subkey); RegCloseKey(key); /* test same thread with REG_NOTIFY_THREAD_AGNOSTIC */

1 0

Alexandre Julliard : Revert "user32: SetWindowPos() should check the final window position in screen coords before adding SWP_NOMOVE. "
by Alexandre Julliard May 7, 2018

May 7, 2018

Module: wine Branch: master Commit: 1f17051028cd721b04f1829922e3525df5cd2308 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f17051028cd721b04f18299… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun May 6 11:09:33 2018 +0200 Revert "user32: SetWindowPos() should check the final window position in screen coords before adding SWP_NOMOVE." This reverts commit 38a76ecb0386d37d30b06b7947ed52be77ec9f1e. It has no effect, the coordinates are identical either way. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/winpos.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index c1b55b5..b4be7f0 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1924,7 +1924,6 @@ static BOOL fixup_flags( WINDOWPOS *winpos ) { HWND parent; RECT window_rect; - POINT pt; WND *wndPtr = WIN_GetPtr( winpos->hwnd ); BOOL ret = TRUE; @@ -1956,15 +1955,12 @@ static BOOL fixup_flags( WINDOWPOS *winpos ) if (!(winpos->flags & SWP_SHOWWINDOW)) winpos->flags |= SWP_NOREDRAW; } - WIN_GetRectangles( winpos->hwnd, COORDS_SCREEN, &window_rect, NULL ); + WIN_GetRectangles( winpos->hwnd, COORDS_PARENT, &window_rect, NULL ); if ((window_rect.right - window_rect.left == winpos->cx) && (window_rect.bottom - window_rect.top == winpos->cy)) winpos->flags |= SWP_NOSIZE; /* Already the right size */ - pt.x = winpos->x; - pt.y = winpos->y; - ClientToScreen( parent, &pt ); - if ((window_rect.left == pt.x) && (window_rect.top == pt.y)) + if ((window_rect.left == winpos->x) && (window_rect.top == winpos->y)) winpos->flags |= SWP_NOMOVE; /* Already the right position */ if ((wndPtr->dwStyle & (WS_POPUP | WS_CHILD)) != WS_CHILD)

1 0

Alexandre Julliard : user32: Avoid repeatedly fetching the window rectangles in SetWindowPos.
by Alexandre Julliard May 7, 2018

May 7, 2018

Module: wine Branch: master Commit: bc956d8aa66aa13d42d568830251e4c60f20922a URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc956d8aa66aa13d42d56883… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 7 11:49:17 2018 +0200 user32: Avoid repeatedly fetching the window rectangles in SetWindowPos. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/winpos.c | 101 +++++++++++++++++++++++++-------------------------- 1 file changed, 49 insertions(+), 52 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bc956d8aa66aa13d42d5…

1 0

Alexandre Julliard : user32: Take into account the offset between old and new parent in SetParent().
by Alexandre Julliard May 7, 2018

May 7, 2018

Module: wine Branch: master Commit: e95d0c684915c625aba0bfe4332a6c3e5259701c URL: https://source.winehq.org/git/wine.git/?a=commit;h=e95d0c684915c625aba0bfe4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 7 12:00:17 2018 +0200 user32: Take into account the offset between old and new parent in SetParent(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/message.c | 2 +- dlls/user32/tests/msg.c | 2 +- dlls/user32/user_private.h | 2 +- dlls/user32/win.c | 23 +++++++++++++++-------- dlls/user32/winpos.c | 25 +++++++++++++------------ 5 files changed, 31 insertions(+), 23 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index d2e6a75..79ea577 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -1858,7 +1858,7 @@ static LRESULT handle_internal_message( HWND hwnd, UINT msg, WPARAM wparam, LPAR return WIN_DestroyWindow( hwnd ); case WM_WINE_SETWINDOWPOS: if (is_desktop_window( hwnd )) return 0; - return USER_SetWindowPos( (WINDOWPOS *)lparam ); + return USER_SetWindowPos( (WINDOWPOS *)lparam, 0, 0 ); case WM_WINE_SHOWWINDOW: if (is_desktop_window( hwnd )) return 0; return ShowWindow( hwnd, wparam ); diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 69841d3..a0f2cbe 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -15433,7 +15433,7 @@ static void test_SetParent(void) SetParent(child, parent2); flush_events(); - ok_sequence(WmSetParentSeq_1, "SetParent() visible WS_CHILD", TRUE); + ok_sequence(WmSetParentSeq_1, "SetParent() visible WS_CHILD", FALSE); ok(GetWindowLongA(child, GWL_STYLE) & WS_VISIBLE, "WS_VISIBLE should be set\n"); ok(!IsWindowVisible(child), "IsWindowVisible() should return FALSE\n"); diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 30ab511..9699297 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -254,7 +254,7 @@ extern void SYSPARAMS_Init(void) DECLSPEC_HIDDEN; extern void USER_CheckNotLock(void) DECLSPEC_HIDDEN; extern BOOL USER_IsExitingThread( DWORD tid ) DECLSPEC_HIDDEN; -extern BOOL USER_SetWindowPos( WINDOWPOS * winpos ) DECLSPEC_HIDDEN; +extern BOOL USER_SetWindowPos( WINDOWPOS * winpos, int parent_x, int parent_y ) DECLSPEC_HIDDEN; typedef LRESULT (*winproc_callback_t)( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, LRESULT *result, void *arg ); diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 7bb0088..0d694a1 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -3014,12 +3014,13 @@ HWND WINAPI GetAncestor( HWND hwnd, UINT type ) */ HWND WINAPI SetParent( HWND hwnd, HWND parent ) { + WINDOWPOS winpos; HWND full_handle; HWND old_parent = 0; BOOL was_visible; WND *wndPtr; - POINT pt; BOOL ret; + RECT window_rect, old_screen_rect, new_screen_rect; TRACE("(%p %p)\n", hwnd, parent); @@ -3062,8 +3063,8 @@ HWND WINAPI SetParent( HWND hwnd, HWND parent ) wndPtr = WIN_GetPtr( hwnd ); if (!wndPtr || wndPtr == WND_OTHER_PROCESS || wndPtr == WND_DESKTOP) return 0; - pt.x = wndPtr->rectWindow.left; - pt.y = wndPtr->rectWindow.top; + WIN_GetRectangles( hwnd, COORDS_PARENT, &window_rect, NULL ); + WIN_GetRectangles( hwnd, COORDS_SCREEN, &old_screen_rect, NULL ); SERVER_START_REQ( set_parent ) { @@ -3082,11 +3083,17 @@ HWND WINAPI SetParent( HWND hwnd, HWND parent ) USER_Driver->pSetParent( full_handle, parent, old_parent ); - /* SetParent additionally needs to make hwnd the topmost window - in the x-order and send the expected WM_WINDOWPOSCHANGING and - WM_WINDOWPOSCHANGED notification messages. - */ - SetWindowPos( hwnd, HWND_TOP, pt.x, pt.y, 0, 0, SWP_NOSIZE ); + winpos.hwnd = hwnd; + winpos.hwndInsertAfter = HWND_TOP; + winpos.x = window_rect.left; + winpos.y = window_rect.top; + winpos.cx = 0; + winpos.cy = 0; + winpos.flags = SWP_NOSIZE; + + WIN_GetRectangles( hwnd, COORDS_SCREEN, &new_screen_rect, NULL ); + USER_SetWindowPos( &winpos, new_screen_rect.left - old_screen_rect.left, + new_screen_rect.top - old_screen_rect.top ); if (was_visible) ShowWindow( hwnd, SW_SHOW ); diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 434fe6e..19ab297 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1855,7 +1855,8 @@ done: * SWP_DoNCCalcSize */ static UINT SWP_DoNCCalcSize( WINDOWPOS *pWinpos, const RECT *old_window_rect, const RECT *old_client_rect, - const RECT *new_window_rect, RECT *new_client_rect, RECT *validRects ) + const RECT *new_window_rect, RECT *new_client_rect, RECT *validRects, + int parent_x, int parent_y ) { UINT wvrFlags = 0; @@ -1879,8 +1880,8 @@ static UINT SWP_DoNCCalcSize( WINDOWPOS *pWinpos, const RECT *old_window_rect, c wine_dbgstr_rect(old_window_rect), wine_dbgstr_rect(old_client_rect), wine_dbgstr_rect(new_window_rect), wine_dbgstr_rect(new_client_rect) ); - if (new_client_rect->left != old_client_rect->left || - new_client_rect->top != old_client_rect->top) + if (new_client_rect->left != old_client_rect->left - parent_x || + new_client_rect->top != old_client_rect->top - parent_y) pWinpos->flags &= ~SWP_NOCLIENTMOVE; if( (new_client_rect->right - new_client_rect->left != @@ -1901,8 +1902,8 @@ static UINT SWP_DoNCCalcSize( WINDOWPOS *pWinpos, const RECT *old_window_rect, c else { if (!(pWinpos->flags & SWP_NOMOVE) && - (new_client_rect->left != old_client_rect->left || - new_client_rect->top != old_client_rect->top)) + (new_client_rect->left != old_client_rect->left - parent_x || + new_client_rect->top != old_client_rect->top - parent_y)) pWinpos->flags &= ~SWP_NOCLIENTMOVE; } @@ -1917,7 +1918,7 @@ static UINT SWP_DoNCCalcSize( WINDOWPOS *pWinpos, const RECT *old_window_rect, c } /* fix redundant flags and values in the WINDOWPOS structure */ -static BOOL fixup_flags( WINDOWPOS *winpos, const RECT *old_window_rect ) +static BOOL fixup_flags( WINDOWPOS *winpos, const RECT *old_window_rect, int parent_x, int parent_y ) { HWND parent; WND *wndPtr = WIN_GetPtr( winpos->hwnd ); @@ -1955,7 +1956,7 @@ static BOOL fixup_flags( WINDOWPOS *winpos, const RECT *old_window_rect ) (old_window_rect->bottom - old_window_rect->top == winpos->cy)) winpos->flags |= SWP_NOSIZE; /* Already the right size */ - if ((old_window_rect->left == winpos->x) && (old_window_rect->top == winpos->y)) + if ((old_window_rect->left - parent_x == winpos->x) && (old_window_rect->top - parent_y == winpos->y)) winpos->flags |= SWP_NOMOVE; /* Already the right position */ if ((wndPtr->dwStyle & (WS_POPUP | WS_CHILD)) != WS_CHILD) @@ -2203,7 +2204,7 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, * * User32 internal function */ -BOOL USER_SetWindowPos( WINDOWPOS * winpos ) +BOOL USER_SetWindowPos( WINDOWPOS * winpos, int parent_x, int parent_y ) { RECT old_window_rect, old_client_rect, new_window_rect, new_client_rect, valid_rects[2]; UINT orig_flags; @@ -2251,7 +2252,7 @@ BOOL USER_SetWindowPos( WINDOWPOS * winpos ) &new_window_rect, &new_client_rect )) return FALSE; /* Fix redundant flags */ - if (!fixup_flags( winpos, &old_window_rect )) return FALSE; + if (!fixup_flags( winpos, &old_window_rect, parent_x, parent_y )) return FALSE; if((winpos->flags & (SWP_NOZORDER | SWP_HIDEWINDOW | SWP_SHOWWINDOW)) != SWP_NOZORDER) { @@ -2262,7 +2263,7 @@ BOOL USER_SetWindowPos( WINDOWPOS * winpos ) /* Common operations */ SWP_DoNCCalcSize( winpos, &old_window_rect, &old_client_rect, - &new_window_rect, &new_client_rect, valid_rects ); + &new_window_rect, &new_client_rect, valid_rects, parent_x, parent_y ); if (!set_window_pos( winpos->hwnd, winpos->hwndInsertAfter, winpos->flags, &new_window_rect, &new_client_rect, valid_rects )) @@ -2350,7 +2351,7 @@ BOOL WINAPI SetWindowPos( HWND hwnd, HWND hwndInsertAfter, winpos.flags = flags; if (WIN_IsCurrentThread( hwnd )) - return USER_SetWindowPos(&winpos); + return USER_SetWindowPos( &winpos, 0, 0 ); return SendMessageW( winpos.hwnd, WM_WINE_SETWINDOWPOS, 0, (LPARAM)&winpos ); } @@ -2499,7 +2500,7 @@ BOOL WINAPI EndDeferWindowPos( HDWP hdwp ) winpos->cx, winpos->cy, winpos->flags); if (WIN_IsCurrentThread( winpos->hwnd )) - USER_SetWindowPos( winpos ); + USER_SetWindowPos( winpos, 0, 0 ); else SendMessageW( winpos->hwnd, WM_WINE_SETWINDOWPOS, 0, (LPARAM)winpos ); }

1 0

Nikolay Sivov : comctl32/trackbar: Remove separate field indicating focused state.
by Alexandre Julliard May 7, 2018

May 7, 2018

Module: wine Branch: master Commit: 2e9b17922ebe17a807a716d4a688e3de5c87d5dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e9b17922ebe17a807a716d4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 5 19:18:59 2018 +0300 comctl32/trackbar: Remove separate field indicating focused state. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/trackbar.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index 28ceb69..762d2e1 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -61,7 +61,6 @@ typedef struct INT fLocation; DWORD flags; BOOL bUnicode; - BOOL bFocussed; RECT rcChannel; RECT rcSelection; RECT rcThumb; @@ -90,6 +89,7 @@ typedef struct /* Page was set with TBM_SETPAGESIZE */ #define TB_USER_PAGE 0x00000080 +#define TB_IS_FOCUSED 0x00000100 /* helper defines for TRACKBAR_DrawTic */ #define TIC_EDGE 0x20 @@ -999,7 +999,7 @@ TRACKBAR_Refresh (TRACKBAR_INFO *infoPtr, HDC hdcDst) } /* draw focus rectangle */ - if (infoPtr->bFocussed) { + if (infoPtr->flags & TB_IS_FOCUSED) { DrawFocusRect(hdc, &rcClient); } @@ -1570,7 +1570,7 @@ static LRESULT TRACKBAR_KillFocus (TRACKBAR_INFO *infoPtr) { TRACE("\n"); - infoPtr->bFocussed = FALSE; + infoPtr->flags &= ~TB_IS_FOCUSED; TRACKBAR_InvalidateAll(infoPtr); return 0; @@ -1657,7 +1657,7 @@ static LRESULT TRACKBAR_SetFocus (TRACKBAR_INFO *infoPtr) { TRACE("\n"); - infoPtr->bFocussed = TRUE; + infoPtr->flags |= TB_IS_FOCUSED; TRACKBAR_InvalidateAll(infoPtr); return 0;

1 0

Zebediah Figura : jscript: Avoid crash when calling stringify() with no arguments.
by Alexandre Julliard May 7, 2018

May 7, 2018

Module: wine Branch: master Commit: bf47aebdeeda0ccd16178bf0a52fd0cbd69794fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf47aebdeeda0ccd16178bf0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat May 5 14:13:12 2018 -0500 jscript: Avoid crash when calling stringify() with no arguments. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/json.c | 6 ++++++ dlls/jscript/tests/api.js | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/dlls/jscript/json.c b/dlls/jscript/json.c index fc23b54..0430d41 100644 --- a/dlls/jscript/json.c +++ b/dlls/jscript/json.c @@ -768,6 +768,12 @@ static HRESULT JSON_stringify(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un TRACE("\n"); + if(!argc) { + if(r) + *r = jsval_undefined(); + return S_OK; + } + if(argc >= 2 && is_object_instance(argv[1])) { FIXME("Replacer %s not yet supported\n", debugstr_jsval(argv[1])); return E_NOTIMPL; diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 4207f5a..f124c46 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1810,6 +1810,7 @@ ok(isNaN(tmp), "Math.tan(-Infinity) is not NaN"); return; var stringify_tests = [ + [[], undefined], [[true], "true"], [[false], "false"], [[null], "null"], @@ -1836,6 +1837,9 @@ ok(isNaN(tmp), "Math.tan(-Infinity) is not NaN"); "["+i+"] stringify(" + stringify_tests[i][0] + ") returned " + s + " expected " + stringify_tests[i][1]); } + s = JSON.stringify(); + ok(s === undefined, "stringify() returned " + s + " expected undefined"); + s = JSON.stringify(testObj); ok(s === undefined || s === "undefined" /* broken on some old versions */, "stringify(testObj) returned " + s + " expected undfined");

1 0

Daniel Lehman : crypt32: Clear dirty flag after flushing changes to registry.
by Alexandre Julliard May 7, 2018

May 7, 2018

Module: wine Branch: master Commit: e6f6e7ebda48ec7ddf2f82c11e5a8be098340f58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6f6e7ebda48ec7ddf2f82c1… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri May 4 14:38:50 2018 -0700 crypt32: Clear dirty flag after flushing changes to registry. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/regstore.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/crypt32/regstore.c b/dlls/crypt32/regstore.c index 9b81e01..7678bab 100644 --- a/dlls/crypt32/regstore.c +++ b/dlls/crypt32/regstore.c @@ -309,7 +309,11 @@ static BOOL CRYPT_RegFlushStore(WINE_REGSTOREINFO *store, BOOL force) TRACE("(%p, %d)\n", store, force); if (store->dirty || force) + { ret = CRYPT_RegWriteToReg(store); + if (ret) + store->dirty = FALSE; + } else ret = TRUE; return ret;

1 0

Zebediah Figura : testbot: Only strip '.exe' from a test executable if it' s a program.
by Alexandre Julliard May 7, 2018

May 7, 2018

Module: tools Branch: master Commit: d5ba29fd52d8dfbef0fb8ca27152cc97c893abcf URL: https://source.winehq.org/git/tools.git/?a=commit;h=d5ba29fd52d8dfbef0fb8ca… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat May 5 02:00:28 2018 +0200 testbot: Only strip '.exe' from a test executable if it's a program. Otherwise we try to build dlls/ntoskrnl/Makefile etc. and fail. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunBuild.pl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 90c261b..3a52dbd 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -332,7 +332,10 @@ foreach my $OtherStep (@{$Job->Steps->GetItems()}) if ($OtherFileName =~ m/^([\w_.]+)_test(?:64)?\.exe$/) { my $OtherBaseName = $1; - $OtherBaseName =~ s/\.exe$//; + if ($Step->FileType eq "patchprograms") + { + $OtherBaseName =~ s/\.exe$//; + } if (defined $BaseName and $BaseName ne $OtherBaseName) { FatalError("$OtherBaseName doesn't match previously found $BaseName\n");

1 0