November 2018 - Wine-Commits

Nikolay Sivov : shcore: Add process reference API.
by Alexandre Julliard Nov. 27, 2018

Nov. 27, 2018

Module: wine Branch: master Commit: 4e22ba2627cd634805dca3b16552df9491b34548 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e22ba2627cd634805dca3b1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 27 11:55:47 2018 +0300 shcore: Add process reference API. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + .../api-ms-win-shcore-thread-l1-1-0.spec | 4 +- dlls/shcore/main.c | 29 +++++ dlls/shcore/shcore.spec | 4 +- dlls/shcore/tests/Makefile.in | 4 + dlls/shcore/tests/shcore.c | 140 +++++++++++++++++++++ 7 files changed, 179 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 7236d8b..d405d67 100755 --- a/configure +++ b/configure @@ -19792,6 +19792,7 @@ wine_fn_config_makefile dlls/setupx.dll16 enable_win16 wine_fn_config_makefile dlls/sfc enable_sfc wine_fn_config_makefile dlls/sfc_os enable_sfc_os wine_fn_config_makefile dlls/shcore enable_shcore +wine_fn_config_makefile dlls/shcore/tests enable_tests wine_fn_config_makefile dlls/shdoclc enable_shdoclc wine_fn_config_makefile dlls/shdocvw enable_shdocvw wine_fn_config_makefile dlls/shdocvw/tests enable_tests diff --git a/configure.ac b/configure.ac index 5d02058..cd1bf44 100644 --- a/configure.ac +++ b/configure.ac @@ -3655,6 +3655,7 @@ WINE_CONFIG_MAKEFILE(dlls/setupx.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/sfc) WINE_CONFIG_MAKEFILE(dlls/sfc_os) WINE_CONFIG_MAKEFILE(dlls/shcore) +WINE_CONFIG_MAKEFILE(dlls/shcore/tests) WINE_CONFIG_MAKEFILE(dlls/shdoclc) WINE_CONFIG_MAKEFILE(dlls/shdocvw) WINE_CONFIG_MAKEFILE(dlls/shdocvw/tests) diff --git a/dlls/api-ms-win-shcore-thread-l1-1-0/api-ms-win-shcore-thread-l1-1-0.spec b/dlls/api-ms-win-shcore-thread-l1-1-0/api-ms-win-shcore-thread-l1-1-0.spec index 1533005..0cbacc8 100644 --- a/dlls/api-ms-win-shcore-thread-l1-1-0/api-ms-win-shcore-thread-l1-1-0.spec +++ b/dlls/api-ms-win-shcore-thread-l1-1-0/api-ms-win-shcore-thread-l1-1-0.spec @@ -1,8 +1,8 @@ -@ stub GetProcessReference +@ stdcall GetProcessReference(ptr) shcore.GetProcessReference @ stdcall SHCreateThread(ptr ptr long ptr) shcore.SHCreateThread @ stdcall SHCreateThreadRef(ptr ptr) shcore.SHCreateThreadRef @ stub SHCreateThreadWithHandle @ stdcall SHGetThreadRef(ptr) shcore.SHGetThreadRef @ stdcall SHReleaseThreadRef() shcore.SHReleaseThreadRef @ stdcall SHSetThreadRef(ptr) shcore.SHSetThreadRef -@ stub SetProcessReference +@ stdcall SetProcessReference(ptr) shcore.SetProcessReference diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index 7f423c1..488e78e 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -36,6 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(shcore); static DWORD shcore_tls; +static IUnknown *process_ref; BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) { @@ -1261,3 +1262,31 @@ HRESULT WINAPI SHReleaseThreadRef(void) FIXME("() - stub!\n"); return S_OK; } + +/************************************************************************* + * GetProcessReference [SHCORE.@] + */ +HRESULT WINAPI GetProcessReference(IUnknown **obj) +{ + TRACE("(%p)\n", obj); + + *obj = process_ref; + + if (!process_ref) + return E_FAIL; + + if (*obj) + IUnknown_AddRef(*obj); + + return S_OK; +} + +/************************************************************************* + * SetProcessReference [SHCORE.@] + */ +void WINAPI SetProcessReference(IUnknown *obj) +{ + TRACE("(%p)\n", obj); + + process_ref = obj; +} diff --git a/dlls/shcore/shcore.spec b/dlls/shcore/shcore.spec index 568cb20..c98f2db 100644 --- a/dlls/shcore/shcore.spec +++ b/dlls/shcore/shcore.spec @@ -10,7 +10,7 @@ @ stdcall GetDpiForMonitor(long long ptr ptr) @ stub GetDpiForShellUIComponent @ stdcall GetProcessDpiAwareness(long ptr) -@ stub GetProcessReference +@ stdcall GetProcessReference(ptr) @ stub GetScaleFactorForDevice @ stub GetScaleFactorForMonitor @ stub IStream_Copy @@ -79,7 +79,7 @@ @ stdcall SHUnicodeToUnicode(wstr ptr long) shlwapi.SHUnicodeToUnicode @ stdcall SetCurrentProcessExplicitAppUserModelID(wstr) @ stdcall SetProcessDpiAwareness(long) -@ stub SetProcessReference +@ stdcall SetProcessReference(ptr) @ stub UnregisterScaleChangeEvent 100 stub @ diff --git a/dlls/shcore/tests/Makefile.in b/dlls/shcore/tests/Makefile.in new file mode 100644 index 0000000..0ea769a --- /dev/null +++ b/dlls/shcore/tests/Makefile.in @@ -0,0 +1,4 @@ +TESTDLL = shcore.dll + +C_SRCS = \ + shcore.c diff --git a/dlls/shcore/tests/shcore.c b/dlls/shcore/tests/shcore.c new file mode 100644 index 0000000..de6a921 --- /dev/null +++ b/dlls/shcore/tests/shcore.c @@ -0,0 +1,140 @@ +/* + * Copyright 2018 Nikolay Sivov 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 + */ + +#define COBJMACROS + +#include <stdarg.h> + +#include <windows.h> +#include "initguid.h" +#include "objidl.h" + +#include "wine/test.h" + +static HRESULT (WINAPI *pGetProcessReference)(IUnknown **); +static void (WINAPI *pSetProcessReference)(IUnknown *); +static HRESULT (WINAPI *pSHGetInstanceExplorer)(IUnknown **); + +static void init(HMODULE hshcore) +{ +#define X(f) p##f = (void*)GetProcAddress(hshcore, #f) + X(GetProcessReference); + X(SetProcessReference); +#undef X +} + +static HRESULT WINAPI unk_QI(IUnknown *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IUnknown_AddRef(iface); + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +struct test_unk +{ + IUnknown IUnknown_iface; + LONG refcount; +}; + +static struct test_unk *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, struct test_unk, IUnknown_iface); +} + +static ULONG WINAPI unk_AddRef(IUnknown *iface) +{ + struct test_unk *obj = impl_from_IUnknown(iface); + return InterlockedIncrement(&obj->refcount); +} + +static ULONG WINAPI unk_Release(IUnknown *iface) +{ + struct test_unk *obj = impl_from_IUnknown(iface); + return InterlockedDecrement(&obj->refcount); +} + +static const IUnknownVtbl testunkvtbl = +{ + unk_QI, + unk_AddRef, + unk_Release, +}; + +static void test_unk_init(struct test_unk *testunk) +{ + testunk->IUnknown_iface.lpVtbl = &testunkvtbl; + testunk->refcount = 1; +} + +static void test_process_reference(void) +{ + struct test_unk test_unk, test_unk2; + IUnknown *obj; + HMODULE hmod; + HRESULT hr; + + obj = (void *)0xdeadbeef; + hr = pGetProcessReference(&obj); + ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + ok(obj == NULL, "Unexpected pointer.\n"); + + test_unk_init(&test_unk); + test_unk_init(&test_unk2); + + pSetProcessReference(&test_unk.IUnknown_iface); + ok(test_unk.refcount == 1, "Unexpected refcount %u.\n", test_unk.refcount); + pSetProcessReference(&test_unk2.IUnknown_iface); + ok(test_unk.refcount == 1, "Unexpected refcount %u.\n", test_unk.refcount); + ok(test_unk2.refcount == 1, "Unexpected refcount %u.\n", test_unk2.refcount); + + hr = pGetProcessReference(&obj); + ok(hr == S_OK, "Failed to get reference, hr %#x.\n", hr); + ok(obj == &test_unk2.IUnknown_iface, "Unexpected pointer.\n"); + ok(test_unk2.refcount == 2, "Unexpected refcount %u.\n", test_unk2.refcount); + + hmod = LoadLibraryA("shell32.dll"); + + pSHGetInstanceExplorer = (void *)GetProcAddress(hmod, "SHGetInstanceExplorer"); + hr = pSHGetInstanceExplorer(&obj); +todo_wine { + ok(hr == S_OK, "Failed to get reference, hr %#x.\n", hr); + ok(obj == &test_unk2.IUnknown_iface, "Unexpected pointer.\n"); + ok(test_unk2.refcount == 3, "Unexpected refcount %u.\n", test_unk2.refcount); +} +} + +START_TEST(shcore) +{ + HMODULE hshcore = LoadLibraryA("shcore.dll"); + + if (!hshcore) + { + win_skip("Shcore.dll is not available.\n"); + return; + } + + init(hshcore); + + test_process_reference(); +}

1 0

Nikolay Sivov : shcore: Add ThreadRef functions.
by Alexandre Julliard Nov. 27, 2018

Nov. 27, 2018

Module: wine Branch: master Commit: e74a36f5c89294c194fd8b58b93fba0dad296b2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e74a36f5c89294c194fd8b58… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 27 11:55:46 2018 +0300 shcore: Add ThreadRef functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shcore/main.c | 138 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/shcore/shcore.spec | 8 +-- 2 files changed, 142 insertions(+), 4 deletions(-) diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index f99479d..7f423c1 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -35,6 +35,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(shcore); +static DWORD shcore_tls; + BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) { TRACE("(%p, %u, %p)\n", instance, reason, reserved); @@ -45,6 +47,12 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(instance); + shcore_tls = TlsAlloc(); + break; + case DLL_PROCESS_DETACH: + if (reserved) break; + if (shcore_tls != TLS_OUT_OF_INDEXES) + TlsFree(shcore_tls); break; } @@ -1123,3 +1131,133 @@ HRESULT WINAPI SHCreateStreamOnFileA(const char *path, DWORD mode, IStream **str return hr; } + +struct threadref +{ + IUnknown IUnknown_iface; + LONG *refcount; +}; + +static inline struct threadref *threadref_impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, struct threadref, IUnknown_iface); +} + +static HRESULT WINAPI threadref_QueryInterface(IUnknown *iface, REFIID riid, void **out) +{ + struct threadref *threadref = threadref_impl_from_IUnknown(iface); + + TRACE("(%p, %s, %p)\n", threadref, debugstr_guid(riid), out); + + if (out == NULL) + return E_POINTER; + + if (IsEqualGUID(&IID_IUnknown, riid)) + { + *out = iface; + IUnknown_AddRef(iface); + return S_OK; + } + + *out = NULL; + WARN("Interface %s not supported.\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI threadref_AddRef(IUnknown *iface) +{ + struct threadref *threadref = threadref_impl_from_IUnknown(iface); + LONG refcount = InterlockedIncrement(threadref->refcount); + + TRACE("(%p, %d)\n", threadref, refcount); + + return refcount; +} + +static ULONG WINAPI threadref_Release(IUnknown *iface) +{ + struct threadref *threadref = threadref_impl_from_IUnknown(iface); + LONG refcount = InterlockedDecrement(threadref->refcount); + + TRACE("(%p, %d)\n", threadref, refcount); + + if (!refcount) + heap_free(threadref); + + return refcount; +} + +static const IUnknownVtbl threadrefvtbl = +{ + threadref_QueryInterface, + threadref_AddRef, + threadref_Release, +}; + +/************************************************************************* + * SHCreateThreadRef [SHCORE.@] + */ +HRESULT WINAPI SHCreateThreadRef(LONG *refcount, IUnknown **out) +{ + struct threadref *threadref; + + TRACE("(%p, %p)\n", refcount, out); + + if (!refcount || !out) + return E_INVALIDARG; + + *out = NULL; + + threadref = heap_alloc(sizeof(*threadref)); + if (!threadref) + return E_OUTOFMEMORY; + threadref->IUnknown_iface.lpVtbl = &threadrefvtbl; + threadref->refcount = refcount; + + *refcount = 1; + *out = &threadref->IUnknown_iface; + + TRACE("Created %p.\n", threadref); + return S_OK; +} + +/************************************************************************* + * SHGetThreadRef [SHCORE.@] + */ +HRESULT WINAPI SHGetThreadRef(IUnknown **out) +{ + TRACE("(%p)\n", out); + + if (shcore_tls == TLS_OUT_OF_INDEXES) + return E_NOINTERFACE; + + *out = TlsGetValue(shcore_tls); + if (!*out) + return E_NOINTERFACE; + + IUnknown_AddRef(*out); + return S_OK; +} + +/************************************************************************* + * SHSetThreadRef [SHCORE.@] + */ +HRESULT WINAPI SHSetThreadRef(IUnknown *obj) +{ + TRACE("(%p)\n", obj); + + if (shcore_tls == TLS_OUT_OF_INDEXES) + return E_NOINTERFACE; + + TlsSetValue(shcore_tls, obj); + return S_OK; +} + +/************************************************************************* + * SHReleaseThreadRef [SHCORE.@] + */ +HRESULT WINAPI SHReleaseThreadRef(void) +{ + FIXME("() - stub!\n"); + return S_OK; +} diff --git a/dlls/shcore/shcore.spec b/dlls/shcore/shcore.spec index c3bb8d2..568cb20 100644 --- a/dlls/shcore/shcore.spec +++ b/dlls/shcore/shcore.spec @@ -38,7 +38,7 @@ @ stdcall SHCreateStreamOnFileEx(wstr long long long ptr ptr) @ stdcall SHCreateStreamOnFileW(wstr long ptr) @ stdcall SHCreateThread(ptr ptr long ptr) shlwapi.SHCreateThread -@ stdcall SHCreateThreadRef(ptr ptr) shlwapi.SHCreateThreadRef +@ stdcall SHCreateThreadRef(ptr ptr) @ stub SHCreateThreadWithHandle @ stdcall SHDeleteEmptyKeyA(long ptr) shlwapi.SHDeleteEmptyKeyA @ stdcall SHDeleteEmptyKeyW(long ptr) shlwapi.SHDeleteEmptyKeyW @@ -50,7 +50,7 @@ @ stdcall SHEnumKeyExW(long long wstr ptr) shlwapi.SHEnumKeyExW @ stdcall SHEnumValueA(long long str ptr ptr ptr ptr) shlwapi.SHEnumValueA @ stdcall SHEnumValueW(long long wstr ptr ptr ptr ptr) shlwapi.SHEnumValueW -@ stdcall SHGetThreadRef(ptr) shlwapi.SHGetThreadRef +@ stdcall SHGetThreadRef(ptr) @ stdcall SHGetValueA( long str str ptr ptr ptr ) shlwapi.SHGetValueA @ stdcall SHGetValueW( long wstr wstr ptr ptr ptr ) shlwapi.SHGetValueW @ stdcall SHOpenRegStream2A(long str str long) shlwapi.SHOpenRegStream2A @@ -69,8 +69,8 @@ @ stdcall SHRegGetValueW( long wstr wstr long ptr ptr ptr ) shlwapi.SHRegGetValueW @ stdcall SHRegSetPathA(long str str str long) shlwapi.SHRegSetPathA @ stdcall SHRegSetPathW(long wstr wstr wstr long) shlwapi.SHRegSetPathW -@ stdcall SHReleaseThreadRef() shlwapi.SHReleaseThreadRef -@ stdcall SHSetThreadRef(ptr) shlwapi.SHSetThreadRef +@ stdcall SHReleaseThreadRef() +@ stdcall SHSetThreadRef(ptr) @ stdcall SHSetValueA(long str str long ptr long) shlwapi.SHSetValueA @ stdcall SHSetValueW(long wstr wstr long ptr long) shlwapi.SHSetValueW @ stdcall SHStrDupA(str ptr) shlwapi.SHStrDupA

1 0

Nikolay Sivov : shell32: Forward process reference calls to shcore.
by Alexandre Julliard Nov. 27, 2018

Nov. 27, 2018

Module: wine Branch: master Commit: 444b1cb34eed7c117d7b290b3a6906770f9792ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=444b1cb34eed7c117d7b290b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 27 11:55:48 2018 +0300 shell32: Forward process reference calls to shcore. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shcore/tests/shcore.c | 2 -- dlls/shell32/shell32.spec | 4 ++-- dlls/shell32/shellord.c | 28 ---------------------------- 3 files changed, 2 insertions(+), 32 deletions(-) diff --git a/dlls/shcore/tests/shcore.c b/dlls/shcore/tests/shcore.c index de6a921..904d826 100644 --- a/dlls/shcore/tests/shcore.c +++ b/dlls/shcore/tests/shcore.c @@ -117,12 +117,10 @@ static void test_process_reference(void) pSHGetInstanceExplorer = (void *)GetProcAddress(hmod, "SHGetInstanceExplorer"); hr = pSHGetInstanceExplorer(&obj); -todo_wine { ok(hr == S_OK, "Failed to get reference, hr %#x.\n", hr); ok(obj == &test_unk2.IUnknown_iface, "Unexpected pointer.\n"); ok(test_unk2.refcount == 3, "Unexpected refcount %u.\n", test_unk2.refcount); } -} START_TEST(shcore) { diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 23243e1..bf8b512 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -165,7 +165,7 @@ 173 stdcall -ordinal SHValidateUNC(long wstr long) 174 stdcall -ordinal SHCreateShellFolderViewEx(ptr ptr) 175 stdcall -noname SHGetSpecialFolderPath(long long long long) SHGetSpecialFolderPathAW - 176 stdcall -ordinal SHSetInstanceExplorer(ptr) + 176 stdcall -ordinal SHSetInstanceExplorer(ptr) shcore.SetProcessReference 177 stub DAD_SetDragImageFromListView 178 stdcall -ordinal SHObjectProperties(long long wstr wstr) 179 stdcall -ordinal SHGetNewLinkInfoA(str str ptr ptr long) @@ -380,7 +380,7 @@ @ stdcall SHGetIconOverlayIndexA(str long) @ stdcall SHGetIconOverlayIndexW(wstr long) @ stdcall SHGetIDListFromObject(ptr ptr) -@ stdcall SHGetInstanceExplorer(ptr) +@ stdcall SHGetInstanceExplorer(ptr) shcore.GetProcessReference @ stdcall SHGetItemFromDataObject(ptr long ptr ptr) @ stdcall SHGetItemFromObject(ptr ptr ptr) @ stdcall SHGetKnownFolderIDList(ptr long ptr ptr) diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index 6fc49dc..6ed0c90 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -1103,34 +1103,6 @@ BOOL WINAPI SHRunControlPanel (LPCWSTR commandLine, HWND parent) return FALSE; } -static LPUNKNOWN SHELL32_IExplorerInterface=0; -/************************************************************************* - * SHSetInstanceExplorer [SHELL32.176] - * - * NOTES - * Sets the interface - */ -VOID WINAPI SHSetInstanceExplorer (LPUNKNOWN lpUnknown) -{ TRACE("%p\n", lpUnknown); - SHELL32_IExplorerInterface = lpUnknown; -} -/************************************************************************* - * SHGetInstanceExplorer [SHELL32.@] - * - * NOTES - * gets the interface pointer of the explorer and a reference - */ -HRESULT WINAPI SHGetInstanceExplorer (IUnknown **lpUnknown) -{ TRACE("%p\n", lpUnknown); - - *lpUnknown = SHELL32_IExplorerInterface; - - if (!SHELL32_IExplorerInterface) - return E_FAIL; - - IUnknown_AddRef(SHELL32_IExplorerInterface); - return S_OK; -} /************************************************************************* * SHFreeUnusedLibraries [SHELL32.123] *

1 0

Nikolay Sivov : shcore: Add file-based stream.
by Alexandre Julliard Nov. 27, 2018

Nov. 27, 2018

Module: wine Branch: master Commit: dd4bb9470635bd7cc2ee50472953a26d68dae455 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd4bb9470635bd7cc2ee5047… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 27 11:55:45 2018 +0300 shcore: Add file-based stream. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shcore/Makefile.in | 2 +- dlls/shcore/main.c | 327 +++++++++++++++++++++++++++++++++++++++++++++++- dlls/shcore/shcore.spec | 6 +- 3 files changed, 329 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dd4bb9470635bd7cc2ee…

1 0

Dmitry Timoshkov : user32: Add support for navigating a group of radio buttons using a keyboard.
by Alexandre Julliard Nov. 27, 2018

Nov. 27, 2018

Module: wine Branch: master Commit: b1b8fb77be5dd9a8754b04b2ef9f703bbe393d59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1b8fb77be5dd9a8754b04b2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 27 09:11:17 2018 +0300 user32: Add support for navigating a group of radio buttons using a keyboard. The patch approximates the behaviour observed in the message tests but still doesn't make the message tests pass without failures. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/dialog.c | 12 ++++++++++-- dlls/user32/tests/msg.c | 7 ------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index c5c646e..c47bd57 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -1237,8 +1237,16 @@ BOOL WINAPI IsDialogMessageW( HWND hwndDlg, LPMSG msg ) if (!(dlgCode & DLGC_WANTARROWS)) { BOOL fPrevious = (msg->wParam == VK_LEFT || msg->wParam == VK_UP); - HWND hwndNext = GetNextDlgGroupItem (hwndDlg, GetFocus(), fPrevious ); - SendMessageW( hwndDlg, WM_NEXTDLGCTL, (WPARAM)hwndNext, 1 ); + HWND hwndNext = GetNextDlgGroupItem( hwndDlg, msg->hwnd, fPrevious ); + if (hwndNext && SendMessageW( hwndNext, WM_GETDLGCODE, msg->wParam, (LPARAM)msg ) == (DLGC_BUTTON | DLGC_RADIOBUTTON)) + { + SetFocus( hwndNext ); + if ((GetWindowLongW( hwndNext, GWL_STYLE ) & BS_TYPEMASK) == BS_AUTORADIOBUTTON && + SendMessageW( hwndNext, BM_GETCHECK, 0, 0 ) != BST_CHECKED) + SendMessageW( hwndNext, BM_CLICK, 1, 0 ); + } + else + SendMessageW( hwndDlg, WM_NEXTDLGCTL, (WPARAM)hwndNext, 1 ); return TRUE; } break; diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 6e62873..f78858f 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -7057,11 +7057,9 @@ if (0) /* actual message sequence is different on every run in some Windows setu while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); ok_sequence(auto_radio_button_VK_DOWN_dialog, "IsDialogMessage(VK_DOWN)", TRUE); -todo_wine test_radio(radio1, 1, radio2, 0, radio3, 0); hwnd = GetFocus(); -todo_wine ok(hwnd == radio1, "focus should be on radio1, not on %p\n", hwnd); GetWindowRect(radio1, &rc); @@ -7076,11 +7074,9 @@ todo_wine while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); ok_sequence(auto_radio_button_VK_DOWN_radio3, "down to radio3", TRUE); -todo_wine test_radio(radio1, 1, radio2, 0, radio3, 0); hwnd = GetFocus(); -todo_wine ok(hwnd == radio1, "focus should be on radio1, not on %p\n", hwnd); flush_events(); @@ -7097,11 +7093,9 @@ todo_wine while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); ok_sequence(auto_radio_button_VK_UP_radio1, "up to radio1", TRUE); -todo_wine test_radio(radio1, 1, radio2, 0, radio3, 0); hwnd = GetFocus(); -todo_wine ok(hwnd == radio1, "focus should be on radio1, not on %p\n", hwnd); flush_events(); @@ -7119,7 +7113,6 @@ todo_wine if (0) /* actual message sequence is different on every run in some Windows setups */ ok_sequence(auto_radio_button_VK_UP_dialog, "IsDialogMessage(VK_UP) #3", FALSE); /* what really matters is that nothing has changed */ -todo_wine test_radio(radio1, 1, radio2, 0, radio3, 0); log_all_parent_messages--;

1 0

Hans Leidekker : webservices: Get rid of read_rewind.
by Alexandre Julliard Nov. 27, 2018

Nov. 27, 2018

Module: wine Branch: master Commit: 4fcb8baa615a0e32a0dce62678c0aea40e655428 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4fcb8baa615a0e32a0dce626… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 27 14:13:09 2018 +0100 webservices: Get rid of read_rewind. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index b573153..ff19254 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -939,10 +939,10 @@ static inline const unsigned char *read_current_ptr( struct reader *reader ) return &reader->read_bufptr[reader->read_pos]; } -static inline HRESULT read_peek( struct reader *reader, unsigned char *byte ) +static inline HRESULT read_peek( struct reader *reader, unsigned char *bytes, unsigned int len ) { - if (reader->read_pos >= reader->read_size) return WS_E_INVALID_FORMAT; - *byte = reader->read_bufptr[reader->read_pos]; + if (reader->read_pos + len > reader->read_size) return WS_E_INVALID_FORMAT; + memcpy( bytes, reader->read_bufptr + reader->read_pos, len ); return S_OK; } @@ -1025,11 +1025,6 @@ static inline void read_skip( struct reader *reader, unsigned int count ) reader->read_pos += count; } -static inline void read_rewind( struct reader *reader, unsigned int count ) -{ - reader->read_pos -= count; -} - static inline BOOL read_isnamechar( unsigned int ch ) { /* FIXME: incomplete */ @@ -1938,6 +1933,7 @@ static HRESULT read_element_text( struct reader *reader ) { unsigned int len = 0, ch, skip; const unsigned char *start; + unsigned char buf[2]; struct node *node = NULL, *parent; WS_XML_ELEMENT_NODE *elem; HRESULT hr; @@ -1950,13 +1946,9 @@ static HRESULT read_element_text( struct reader *reader ) return S_OK; } - if ((hr = read_cmp( reader, "<", 1 )) != S_OK) return hr; + if ((hr = read_peek( reader, buf, 2 )) != S_OK) return hr; + if (buf[0] != '<' || !read_isnamechar( buf[1] )) return WS_E_INVALID_FORMAT; read_skip( reader, 1 ); - if (!read_isnamechar( read_utf8_char( reader, &skip ))) - { - read_rewind( reader, 1 ); - return WS_E_INVALID_FORMAT; - } if (!(elem = alloc_element_pair())) return E_OUTOFMEMORY; node = (struct node *)elem; @@ -2000,7 +1992,7 @@ static HRESULT read_attributes_bin( struct reader *reader, WS_XML_ELEMENT_NODE * reader->current_attr = 0; for (;;) { - if ((hr = read_peek( reader, &type )) != S_OK) return hr; + if ((hr = read_peek( reader, &type, 1 )) != S_OK) return hr; if (!is_attribute_type( type )) break; if ((hr = read_attribute_bin( reader, &attr )) != S_OK) return hr; if ((hr = append_attribute( elem, attr )) != S_OK) @@ -2405,7 +2397,7 @@ static HRESULT read_text_bytes( struct reader *reader, unsigned char type ) node->flags |= NODE_FLAG_TEXT_WITH_IMPLICIT_END_ELEMENT; break; } - if ((hr = read_peek( reader, &type )) != S_OK) goto error; + if ((hr = read_peek( reader, &type, 1 )) != S_OK) goto error; if (type < RECORD_BYTES8_TEXT || type > RECORD_BYTES32_TEXT_WITH_ENDELEMENT) break; read_skip( reader, 1 ); } @@ -3008,7 +3000,7 @@ static HRESULT read_node_bin( struct reader *reader ) return S_OK; } - if ((hr = read_peek( reader, &type )) != S_OK) return hr; + if ((hr = read_peek( reader, &type, 1 )) != S_OK) return hr; if (type == RECORD_ENDELEMENT) { return read_endelement_bin( reader );

1 0

Hans Leidekker : webservices: Use set_blocking in more places.
by Alexandre Julliard Nov. 27, 2018

Nov. 27, 2018

Module: wine Branch: master Commit: a0f00bd6d710d5739f409a96cf3c01591f3c9b4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0f00bd6d710d5739f409a96… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 27 14:13:06 2018 +0100 webservices: Use set_blocking in more places. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index b945c7f..5394aa6 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -2245,7 +2245,6 @@ HRESULT WINAPI WsWriteMessageEnd( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_ static HRESULT sock_accept( SOCKET socket, HANDLE wait, HANDLE cancel, SOCKET *ret ) { HANDLE handles[] = { wait, cancel }; - ULONG nonblocking = 0; HRESULT hr = S_OK; if (WSAEventSelect( socket, handles[0], FD_ACCEPT )) return HRESULT_FROM_WIN32( WSAGetLastError() ); @@ -2256,7 +2255,7 @@ static HRESULT sock_accept( SOCKET socket, HANDLE wait, HANDLE cancel, SOCKET *r if ((*ret = accept( socket, NULL, NULL )) != -1) { WSAEventSelect( *ret, NULL, 0 ); - ioctlsocket( *ret, FIONBIO, &nonblocking ); + set_blocking( *ret, TRUE ); break; } hr = HRESULT_FROM_WIN32( WSAGetLastError() ); @@ -2296,7 +2295,6 @@ HRESULT channel_accept_tcp( SOCKET socket, HANDLE wait, HANDLE cancel, WS_CHANNE static HRESULT sock_wait( SOCKET socket, HANDLE wait, HANDLE cancel ) { HANDLE handles[] = { wait, cancel }; - ULONG nonblocking = 0; HRESULT hr; if (WSAEventSelect( socket, handles[0], FD_READ )) return HRESULT_FROM_WIN32( WSAGetLastError() ); @@ -2317,7 +2315,7 @@ static HRESULT sock_wait( SOCKET socket, HANDLE wait, HANDLE cancel ) } WSAEventSelect( socket, NULL, 0 ); - ioctlsocket( socket, FIONBIO, &nonblocking ); + set_blocking( socket, TRUE ); return hr; }

1 0

Dmitry Timoshkov : user32/tests: Add a test for navigating a group of buttons using keyboard events.
by Alexandre Julliard Nov. 27, 2018

Nov. 27, 2018

Module: wine Branch: master Commit: bf55f167b9c9714dcb03e90cc4cea3093e15ceb7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf55f167b9c9714dcb03e90c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 27 09:11:13 2018 +0300 user32/tests: Add a test for navigating a group of buttons using keyboard events. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 316 ++++++++++++++++++++++++++++++++++++++++++ dlls/user32/tests/resource.rc | 11 ++ 2 files changed, 327 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bf55f167b9c9714dcb03…

1 0

Zebediah Figura : ntoskrnl.exe: Implement KeClearEvent().
by Alexandre Julliard Nov. 27, 2018

Nov. 27, 2018

Module: wine Branch: master Commit: b9e556d5e8a47a23e8d3d919f73f260de8a10eb9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9e556d5e8a47a23e8d3d919… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Nov 26 19:39:21 2018 -0600 ntoskrnl.exe: Implement KeClearEvent(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 8 -------- dlls/ntoskrnl.exe/sync.c | 8 ++++++++ include/ddk/wdm.h | 1 + 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 861fb53..712681e 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3867,14 +3867,6 @@ NTSTATUS WINAPI IoCreateFile(HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBUT } /*********************************************************************** - * KeClearEvent (NTOSKRNL.EXE.@) - */ -VOID WINAPI KeClearEvent(PRKEVENT event) -{ - FIXME("stub: %p\n", event); -} - -/*********************************************************************** * KeAcquireInStackQueuedSpinLock (NTOSKRNL.EXE.@) */ #ifdef DEFINE_FASTCALL2_ENTRYPOINT diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 84cb0ce..e63c793 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -216,6 +216,14 @@ LONG WINAPI KeResetEvent( PRKEVENT event ) } /*********************************************************************** + * KeClearEvent (NTOSKRNL.EXE.@) + */ +void WINAPI KeClearEvent( PRKEVENT event ) +{ + KeResetEvent( event ); +} + +/*********************************************************************** * KeInitializeSemaphore (NTOSKRNL.EXE.@) */ void WINAPI KeInitializeSemaphore( PRKSEMAPHORE semaphore, LONG count, LONG limit ) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 831304e..f70b745 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1419,6 +1419,7 @@ void WINAPI IoReleaseCancelSpinLock(KIRQL); NTSTATUS WINAPI IoSetDeviceInterfaceState(UNICODE_STRING*,BOOLEAN); NTSTATUS WINAPI IoWMIRegistrationControl(PDEVICE_OBJECT,ULONG); +void WINAPI KeClearEvent(PRKEVENT); PKTHREAD WINAPI KeGetCurrentThread(void); void WINAPI KeInitializeEvent(PRKEVENT,EVENT_TYPE,BOOLEAN); void WINAPI KeInitializeMutex(PRKMUTEX,ULONG);

1 0

Huw Davies : dbghelp: Fix build failure on macOS.
by Alexandre Julliard Nov. 27, 2018

Nov. 27, 2018

Module: wine Branch: master Commit: 74f425e70dfbc43da1eaf9048f45bed52ef1d66c URL: https://source.winehq.org/git/wine.git/?a=commit;h=74f425e70dfbc43da1eaf904… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Nov 27 09:01:48 2018 +0000 dbghelp: Fix build failure on macOS. This was caused by commit 8d096fb5e262e5e87866d1a4a397da144a09b635. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/macho_module.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index a3f838f..a062335 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -1096,7 +1096,7 @@ static void macho_finish_stabs(struct module* module, struct hash_table* ht_symt if (ste->is_public && !(dbghelp_options & SYMOPT_NO_PUBLICS)) { - symt_new_public(module, ste->compiland, ste->ht_elt.name, ste->addr, 0); + symt_new_public(module, ste->compiland, ste->ht_elt.name, ste->is_code, ste->addr, 0); } } }

1 0