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

Nikolay Sivov : comctl32/trackbar: Don' t update page size if it was explicitly set.
by Alexandre Julliard 07 May '18

07 May '18

Module: wine Branch: master Commit: 6dc3c6ba879b79fac7e4c9c0693539a614229978 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6dc3c6ba879b79fac7e4c9c0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 5 19:18:58 2018 +0300 comctl32/trackbar: Don't update page size if it was explicitly set. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/trackbar.c | 41 +++++++++++++++++++++++++++++++++++++++++ dlls/comctl32/trackbar.c | 42 ++++++++++++++++++++++++++---------------- 2 files changed, 67 insertions(+), 16 deletions(-) diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index 7b601b8..7d66df7 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -577,6 +577,47 @@ static void test_page_size(void) hWndTrackbar = create_trackbar(defaultstyle, hWndParent); ok(hWndTrackbar != NULL, "Expected non NULL value\n"); + r = SendMessageA(hWndTrackbar, TBM_GETPAGESIZE, 0, 0); + ok(r == 20, "Unexpected page size %d.\n", r); + + SendMessageA(hWndTrackbar, TBM_SETRANGE, 0, MAKELPARAM(0, 65)); + + r = SendMessageA(hWndTrackbar, TBM_GETPAGESIZE, 0, 0); + ok(r == 13, "Unexpected page size %d.\n", r); + + SendMessageA(hWndTrackbar, TBM_SETRANGEMIN, 0, 10); + + r = SendMessageA(hWndTrackbar, TBM_GETPAGESIZE, 0, 0); + ok(r == 11, "Unexpected page size %d.\n", r); + + SendMessageA(hWndTrackbar, TBM_SETRANGEMAX, 0, 50); + + r = SendMessageA(hWndTrackbar, TBM_GETPAGESIZE, 0, 0); + ok(r == 8, "Unexpected page size %d.\n", r); + + r = SendMessageA(hWndTrackbar, TBM_SETPAGESIZE, 0, 10); + ok(r == 8, "Unexpected page size %d.\n", r); + + SendMessageA(hWndTrackbar, TBM_SETRANGE, 0, MAKELPARAM(0, 30)); + + r = SendMessageA(hWndTrackbar, TBM_GETPAGESIZE, 0, 0); + ok(r == 10, "Unexpected page size %d.\n", r); + + SendMessageA(hWndTrackbar, TBM_SETRANGEMIN, 0, 5); + + r = SendMessageA(hWndTrackbar, TBM_GETPAGESIZE, 0, 0); + ok(r == 10, "Unexpected page size %d.\n", r); + + SendMessageA(hWndTrackbar, TBM_SETRANGEMAX, 0, 40); + + r = SendMessageA(hWndTrackbar, TBM_GETPAGESIZE, 0, 0); + ok(r == 10, "Unexpected page size %d.\n", r); + + DestroyWindow(hWndTrackbar); + + hWndTrackbar = create_trackbar(defaultstyle, hWndParent); + ok(hWndTrackbar != NULL, "Failed to create trackbar window.\n"); + flush_sequences(sequences, NUM_MSG_SEQUENCE); /* test TBM_SETPAGESIZE */ diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index 92c8d9e..28ceb69 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -59,7 +59,7 @@ typedef struct HWND hwndBuddyLA; HWND hwndBuddyRB; INT fLocation; - INT flags; + DWORD flags; BOOL bUnicode; BOOL bFocussed; RECT rcChannel; @@ -78,15 +78,18 @@ typedef struct /* Used by TRACKBAR_Refresh to find out which parts of the control need to be recalculated */ -#define TB_THUMBPOSCHANGED 1 -#define TB_THUMBSIZECHANGED 2 -#define TB_THUMBCHANGED (TB_THUMBPOSCHANGED | TB_THUMBSIZECHANGED) -#define TB_SELECTIONCHANGED 4 -#define TB_DRAG_MODE 8 /* we're dragging the slider */ -#define TB_AUTO_PAGE_LEFT 16 -#define TB_AUTO_PAGE_RIGHT 32 -#define TB_AUTO_PAGE (TB_AUTO_PAGE_LEFT | TB_AUTO_PAGE_RIGHT) -#define TB_THUMB_HOT 64 /* mouse hovers above thumb */ +#define TB_THUMBPOSCHANGED 0x00000001 +#define TB_THUMBSIZECHANGED 0x00000002 +#define TB_THUMBCHANGED (TB_THUMBPOSCHANGED | TB_THUMBSIZECHANGED) +#define TB_SELECTIONCHANGED 0x00000004 +#define TB_DRAG_MODE 0x00000008 /* we're dragging the slider */ +#define TB_AUTO_PAGE_LEFT 0x00000010 +#define TB_AUTO_PAGE_RIGHT 0x00000020 +#define TB_AUTO_PAGE (TB_AUTO_PAGE_LEFT | TB_AUTO_PAGE_RIGHT) +#define TB_THUMB_HOT 0x00000040 /* mouse hovers above thumb */ + +/* Page was set with TBM_SETPAGESIZE */ +#define TB_USER_PAGE 0x00000080 /* helper defines for TRACKBAR_DrawTic */ #define TIC_EDGE 0x20 @@ -1204,6 +1207,8 @@ TRACKBAR_SetPageSize (TRACKBAR_INFO *infoPtr, LONG lPageSize) else infoPtr->lPageSize = TB_DEFAULTPAGESIZE; + infoPtr->flags |= TB_USER_PAGE; + return lTemp; } @@ -1229,6 +1234,14 @@ TRACKBAR_SetPos (TRACKBAR_INFO *infoPtr, BOOL fPosition, LONG lPosition) return 0; } +static void TRACKBAR_UpdatePageSize(TRACKBAR_INFO *infoPtr) +{ + if (infoPtr->flags & TB_USER_PAGE) + return; + + infoPtr->lPageSize = (infoPtr->lRangeMax - infoPtr->lRangeMin) / 5; + if (infoPtr->lPageSize == 0) infoPtr->lPageSize = 1; +} static inline LRESULT TRACKBAR_SetRange (TRACKBAR_INFO *infoPtr, BOOL redraw, LONG range) @@ -1246,8 +1259,7 @@ TRACKBAR_SetRange (TRACKBAR_INFO *infoPtr, BOOL redraw, LONG range) if (infoPtr->lPos > infoPtr->lRangeMax) infoPtr->lPos = infoPtr->lRangeMax; - infoPtr->lPageSize = (infoPtr->lRangeMax - infoPtr->lRangeMin) / 5; - if (infoPtr->lPageSize == 0) infoPtr->lPageSize = 1; + TRACKBAR_UpdatePageSize(infoPtr); if (changed) { if (infoPtr->dwStyle & TBS_AUTOTICKS) @@ -1273,8 +1285,7 @@ TRACKBAR_SetRangeMax (TRACKBAR_INFO *infoPtr, BOOL redraw, LONG lMax) infoPtr->flags |= TB_THUMBPOSCHANGED; } - infoPtr->lPageSize = (infoPtr->lRangeMax - infoPtr->lRangeMin) / 5; - if (infoPtr->lPageSize == 0) infoPtr->lPageSize = 1; + TRACKBAR_UpdatePageSize(infoPtr); if (changed && (infoPtr->dwStyle & TBS_AUTOTICKS)) TRACKBAR_RecalculateTics (infoPtr); @@ -1296,8 +1307,7 @@ TRACKBAR_SetRangeMin (TRACKBAR_INFO *infoPtr, BOOL redraw, LONG lMin) infoPtr->flags |= TB_THUMBPOSCHANGED; } - infoPtr->lPageSize = (infoPtr->lRangeMax - infoPtr->lRangeMin) / 5; - if (infoPtr->lPageSize == 0) infoPtr->lPageSize = 1; + TRACKBAR_UpdatePageSize(infoPtr); if (changed && (infoPtr->dwStyle & TBS_AUTOTICKS)) TRACKBAR_RecalculateTics (infoPtr);

1 0

Nikolay Sivov : comctl32/trackbar: Remove separate field indicating focused state.
by Alexandre Julliard 07 May '18

07 May '18

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 07 May '18

07 May '18

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

Zebediah Figura : rpcrt4/tests: Add a basic test for RPC_IF_AUTOLISTEN.
by Alexandre Julliard 07 May '18

07 May '18

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

Zebediah Figura : rpcrt4: RpcServerUnregisterIf() with NULL ifspec shouldn 't unregister auto-listen interfaces.
by Alexandre Julliard 07 May '18

07 May '18

Module: wine Branch: master Commit: 950b349885c99ed51a40dd36282fc3cdb5c16e80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=950b349885c99ed51a40dd36… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat May 5 14:07:48 2018 -0500 rpcrt4: RpcServerUnregisterIf() with NULL ifspec shouldn't unregister auto-listen interfaces. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_server.c | 3 ++- dlls/rpcrt4/tests/server.c | 11 +++++++++++ dlls/rpcrt4/tests/server.idl | 1 + 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index d1b5d64..91de3b9 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -1220,7 +1220,8 @@ RPC_STATUS WINAPI RpcServerUnregisterIf( RPC_IF_HANDLE IfSpec, UUID* MgrTypeUuid EnterCriticalSection(&server_cs); LIST_FOR_EACH_ENTRY(cif, &server_interfaces, RpcServerInterface, entry) { - if ((!IfSpec || !memcmp(&If->InterfaceId, &cif->If->InterfaceId, sizeof(RPC_SYNTAX_IDENTIFIER))) && + if (((!IfSpec && !(cif->Flags & RPC_IF_AUTOLISTEN)) || + (IfSpec && !memcmp(&If->InterfaceId, &cif->If->InterfaceId, sizeof(RPC_SYNTAX_IDENTIFIER)))) && UuidEqual(MgrTypeUuid, &cif->MgrTypeUuid, &status)) { list_remove(&cif->entry); TRACE("unregistering cif %p\n", cif); diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 5a61181..dfad1ed 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -844,6 +844,14 @@ void __cdecl s_stop(void) } } +void __cdecl s_stop_autolisten(void) +{ + RPC_STATUS status; + status = RpcServerUnregisterIf(NULL, NULL, FALSE); +todo_wine + ok(status == RPC_S_UNKNOWN_MGR_TYPE, "got %u\n", status); +} + void __cdecl s_ip_test(ipu_t *a) { STATSTG st; @@ -1690,6 +1698,9 @@ client(const char *test) todo_wine test_is_server_listening(IServer_IfHandle, RPC_S_NOT_LISTENING); + stop_autolisten(); + ok(int_return() == INT_CODE, "RPC int_return\n"); + ok(RPC_S_OK == RpcStringFreeA(&binding), "RpcStringFree\n"); ok(RPC_S_OK == RpcBindingFree(&IServer_IfHandle), "RpcBindingFree\n"); } diff --git a/dlls/rpcrt4/tests/server.idl b/dlls/rpcrt4/tests/server.idl index 75d78f7..6aa7382 100644 --- a/dlls/rpcrt4/tests/server.idl +++ b/dlls/rpcrt4/tests/server.idl @@ -385,6 +385,7 @@ cpp_quote("#endif") void authinfo_test(unsigned int protseq, int secure); void stop(void); + void stop_autolisten(void); typedef union ipu switch(int t) {

1 0

Daniel Lehman : advapi32/tests: Add RegNotifyChangeKeyValue tests.
by Alexandre Julliard 07 May '18

07 May '18

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

Daniel Lehman : server: Notify parents of registry value changes.
by Alexandre Julliard 07 May '18

07 May '18

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

Daniel Lehman : crypt32: Clear dirty flag after flushing changes to registry.
by Alexandre Julliard 07 May '18

07 May '18

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

Guillaume Gill : shell32: Fake success in propertystore_[SetValue|Commit].
by Alexandre Julliard 07 May '18

07 May '18

Module: wine Branch: master Commit: 794d30dca65843baee7e0cd5f054e1b1fbe96a95 URL: https://source.winehq.org/git/wine.git/?a=commit;h=794d30dca65843baee7e0cd5… Author: Guillaume Gill <gillg02(a)petitchinois.net> Date: Fri May 4 14:53:45 2018 +0200 shell32: Fake success in propertystore_[SetValue|Commit]. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shelllink.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 6dca9ac..07c83d1 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -2664,14 +2664,14 @@ static HRESULT WINAPI propertystore_SetValue(IPropertyStore *iface, REFPROPERTYK { IShellLinkImpl *This = impl_from_IPropertyStore(iface); FIXME("(%p)->(%p %p): stub\n", This, key, value); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI propertystore_Commit(IPropertyStore *iface) { IShellLinkImpl *This = impl_from_IPropertyStore(iface); FIXME("(%p): stub\n", This); - return E_NOTIMPL; + return S_OK; } static const IPropertyStoreVtbl propertystorevtbl = {

1 0

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

07 May '18

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