July 2019 - Wine-Devel - list.winehq.org

[PATCH v2 2/2] mfplat: Implement CreatePropertyStore().

by Zebediah Figura

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/mfplat/main.c | 202 +++++++++++++++++++++++++++++++++++++ dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/tests/mfplat.c | 102 +++++++++++++++++++ include/mfidl.idl | 1 + 4 files changed, 306 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index eec54ae3f6a..e946bc79f50 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -7415,3 +7415,205 @@ failed: return hr; } + +struct property_store +{ + IPropertyStore IPropertyStore_iface; + LONG refcount; + CRITICAL_SECTION cs; + size_t count, capacity; + struct + { + PROPERTYKEY key; + PROPVARIANT value; + } *values; +}; + +static struct property_store *impl_from_IPropertyStore(IPropertyStore *iface) +{ + return CONTAINING_RECORD(iface, struct property_store, IPropertyStore_iface); +} + +static HRESULT WINAPI property_store_QueryInterface(IPropertyStore *iface, REFIID riid, void **obj) +{ + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IPropertyStore) || IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IPropertyStore_AddRef(iface); + return S_OK; + } + + *obj = NULL; + WARN("Unsupported interface %s.\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI property_store_AddRef(IPropertyStore *iface) +{ + struct property_store *store = impl_from_IPropertyStore(iface); + ULONG refcount = InterlockedIncrement(&store->refcount); + + TRACE("%p, refcount %d.\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI property_store_Release(IPropertyStore *iface) +{ + struct property_store *store = impl_from_IPropertyStore(iface); + ULONG refcount = InterlockedDecrement(&store->refcount); + + TRACE("%p, refcount %d.\n", iface, refcount); + + if (!refcount) + { + DeleteCriticalSection(&store->cs); + heap_free(store->values); + heap_free(store); + } + + return refcount; +} + +static HRESULT WINAPI property_store_GetCount(IPropertyStore *iface, DWORD *count) +{ + struct property_store *store = impl_from_IPropertyStore(iface); + + TRACE("%p, %p.\n", iface, count); + + if (!count) + return E_INVALIDARG; + + EnterCriticalSection(&store->cs); + *count = store->count; + LeaveCriticalSection(&store->cs); + return S_OK; +} + +static HRESULT WINAPI property_store_GetAt(IPropertyStore *iface, DWORD index, PROPERTYKEY *key) +{ + struct property_store *store = impl_from_IPropertyStore(iface); + + TRACE("%p, %u, %p.\n", iface, index, key); + + EnterCriticalSection(&store->cs); + + if (index >= store->count) + { + LeaveCriticalSection(&store->cs); + return E_INVALIDARG; + } + + *key = store->values[index].key; + + LeaveCriticalSection(&store->cs); + return S_OK; +} + +static HRESULT WINAPI property_store_GetValue(IPropertyStore *iface, REFPROPERTYKEY key, PROPVARIANT *value) +{ + struct property_store *store = impl_from_IPropertyStore(iface); + unsigned int i; + + TRACE("%p, %p, %p.\n", iface, key, value); + + if (!value) + return E_INVALIDARG; + + if (!key) + return S_FALSE; + + EnterCriticalSection(&store->cs); + + for (i = 0; i < store->count; ++i) + { + if (!memcmp(key, &store->values[i].key, sizeof(PROPERTYKEY))) + { + PropVariantCopy(value, &store->values[i].value); + LeaveCriticalSection(&store->cs); + return S_OK; + } + } + + LeaveCriticalSection(&store->cs); + return S_FALSE; +} + +static HRESULT WINAPI property_store_SetValue(IPropertyStore *iface, REFPROPERTYKEY key, REFPROPVARIANT value) +{ + struct property_store *store = impl_from_IPropertyStore(iface); + unsigned int i; + + TRACE("%p, %p, %p.\n", iface, key, value); + + EnterCriticalSection(&store->cs); + + for (i = 0; i < store->count; ++i) + { + if (!memcmp(key, &store->values[i].key, sizeof(PROPERTYKEY))) + { + PropVariantCopy(&store->values[i].value, value); + LeaveCriticalSection(&store->cs); + return S_OK; + } + } + + if (!mf_array_reserve((void **)&store->values, &store->capacity, store->count + 1, sizeof(*store->values))) + { + LeaveCriticalSection(&store->cs); + return E_OUTOFMEMORY; + } + + store->values[store->count].key = *key; + PropVariantCopy(&store->values[store->count].value, value); + ++store->count; + + LeaveCriticalSection(&store->cs); + return S_OK; +} + +static HRESULT WINAPI property_store_Commit(IPropertyStore *iface) +{ + TRACE("%p.\n", iface); + + return E_NOTIMPL; +} + +static const IPropertyStoreVtbl property_store_vtbl = +{ + property_store_QueryInterface, + property_store_AddRef, + property_store_Release, + property_store_GetCount, + property_store_GetAt, + property_store_GetValue, + property_store_SetValue, + property_store_Commit, +}; + +/*********************************************************************** + * CreatePropertyStore (mfplat.@) + */ +HRESULT WINAPI CreatePropertyStore(IPropertyStore **store) +{ + struct property_store *object; + + TRACE("%p.\n", store); + + if (!store) + return E_INVALIDARG; + + if (!(object = heap_alloc_zero(sizeof(*object)))) + return E_OUTOFMEMORY; + + object->IPropertyStore_iface.lpVtbl = &property_store_vtbl; + object->refcount = 1; + InitializeCriticalSection(&object->cs); + + TRACE("Created store %p.\n", object); + *store = &object->IPropertyStore_iface; + + return S_OK; +} diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 1ae0927f513..2f16bbd1973 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -10,7 +10,7 @@ @ stub ValidateWaveFormat @ stub CopyPropVariant @ stub CreatePropVariant -@ stub CreatePropertyStore +@ stdcall CreatePropertyStore(ptr) @ stub DestroyPropVariant @ stub GetAMSubtypeFromD3DFormat @ stub GetD3DFormatFromMFSubtype diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index cf3099506ec..b4ba6b6c572 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -3603,6 +3603,107 @@ static void test_local_handlers(void) ok(hr == S_OK, "Failed to register stream handler, hr %#x.\n", hr); } +static void test_create_property_store(void) +{ + static const PROPERTYKEY test_pkey = {{0x12345678}, 9}; + IPropertyStore *store, *store2; + PROPVARIANT value = {0}; + PROPERTYKEY key; + ULONG refcount; + IUnknown *unk; + DWORD count; + HRESULT hr; + + hr = CreatePropertyStore(NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = CreatePropertyStore(&store); + ok(hr == S_OK, "Failed to create property store, hr %#x.\n", hr); + + hr = CreatePropertyStore(&store2); + ok(hr == S_OK, "Failed to create property store, hr %#x.\n", hr); + ok(store2 != store, "Expected different store objects.\n"); + IPropertyStore_Release(store2); + + hr = IPropertyStore_QueryInterface(store, &IID_IPropertyStoreCache, (void **)&unk); + ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + hr = IPropertyStore_QueryInterface(store, &IID_IPersistSerializedPropStorage, (void **)&unk); + ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + + hr = IPropertyStore_GetCount(store, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + count = 0xdeadbeef; + hr = IPropertyStore_GetCount(store, &count); + ok(hr == S_OK, "Failed to get count, hr %#x.\n", hr); + ok(!count, "Unexpected count %u.\n", count); + + hr = IPropertyStore_Commit(store); + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + + hr = IPropertyStore_GetAt(store, 0, &key); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IPropertyStore_GetValue(store, NULL, &value); + ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + + hr = IPropertyStore_GetValue(store, &test_pkey, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IPropertyStore_GetValue(store, &test_pkey, &value); + ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + + memset(&value, 0, sizeof(PROPVARIANT)); + value.vt = VT_I4; + value.lVal = 0xdeadbeef; + hr = IPropertyStore_SetValue(store, &test_pkey, &value); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + +if (0) +{ + /* crashes on Windows */ + hr = IPropertyStore_SetValue(store, NULL, &value); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +} + + hr = IPropertyStore_GetCount(store, &count); + ok(hr == S_OK, "Failed to get count, hr %#x.\n", hr); + ok(count == 1, "Unexpected count %u.\n", count); + + hr = IPropertyStore_Commit(store); + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + + hr = IPropertyStore_GetAt(store, 0, &key); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!memcmp(&key, &test_pkey, sizeof(PROPERTYKEY)), "Keys didn't match.\n"); + + hr = IPropertyStore_GetAt(store, 1, &key); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + memset(&value, 0xcc, sizeof(PROPVARIANT)); + hr = IPropertyStore_GetValue(store, &test_pkey, &value); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(value.vt == VT_I4, "Unexpected type %u.\n", value.vt); + ok(value.lVal == 0xdeadbeef, "Unexpected value %#x.\n", value.lVal); + + memset(&value, 0, sizeof(PROPVARIANT)); + hr = IPropertyStore_SetValue(store, &test_pkey, &value); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IPropertyStore_GetCount(store, &count); + ok(hr == S_OK, "Failed to get count, hr %#x.\n", hr); + ok(count == 1, "Unexpected count %u.\n", count); + + memset(&value, 0xcc, sizeof(PROPVARIANT)); + hr = IPropertyStore_GetValue(store, &test_pkey, &value); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(value.vt == VT_EMPTY, "Unexpected type %u.\n", value.vt); + ok(!value.lVal, "Unexpected value %#x.\n", value.lVal); + + refcount = IPropertyStore_Release(store); + ok(!refcount, "Unexpected refcount %u.\n", refcount); +} + START_TEST(mfplat) { CoInitialize(NULL); @@ -3639,6 +3740,7 @@ START_TEST(mfplat) test_MFCreateWaveFormatExFromMFMediaType(); test_async_create_file(); test_local_handlers(); + test_create_property_store(); CoUninitialize(); } diff --git a/include/mfidl.idl b/include/mfidl.idl index 1ed63bea126..5f8913384cc 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -566,6 +566,7 @@ interface IMFSampleGrabberSinkCallback2 : IMFSampleGrabberSinkCallback [in] IMFAttributes *attributes); } +cpp_quote("HRESULT WINAPI CreatePropertyStore(IPropertyStore **store);") cpp_quote("HRESULT WINAPI MFCreateMediaSession(IMFAttributes *config, IMFMediaSession **session);") cpp_quote("HRESULT WINAPI MFCreateMFByteStreamOnStream(IStream *stream, IMFByteStream **bytestream);" ) cpp_quote("HRESULT WINAPI MFCreateMFByteStreamOnStreamEx(IUnknown *stream, IMFByteStream **bytestream);") -- 2.20.1

July 15, 2019

[PATCH v2 1/2] mfplat/tests: Link to uuid.

by Zebediah Figura

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/mfplat/tests/Makefile.in | 2 +- dlls/mfplat/tests/mfplat.c | 19 +++++++------------ 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/dlls/mfplat/tests/Makefile.in b/dlls/mfplat/tests/Makefile.in index 150ca6f9542..c58a0463e51 100644 --- a/dlls/mfplat/tests/Makefile.in +++ b/dlls/mfplat/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = mfplat.dll -IMPORTS = ole32 mfplat mfuuid propsys +IMPORTS = ole32 mfplat mfuuid propsys uuid C_SRCS = \ mfplat.c diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index e63efc154be..cf3099506ec 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -27,19 +27,7 @@ #include "winbase.h" #include "winuser.h" #include "winreg.h" - -#include "initguid.h" #include "ole2.h" - -DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); -DEFINE_GUID(DUMMY_CLSID, 0x12345678,0x1234,0x1234,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19); -DEFINE_GUID(DUMMY_GUID1, 0x12345678,0x1234,0x1234,0x21,0x21,0x21,0x21,0x21,0x21,0x21,0x21); -DEFINE_GUID(DUMMY_GUID2, 0x12345678,0x1234,0x1234,0x22,0x22,0x22,0x22,0x22,0x22,0x22,0x22); -DEFINE_GUID(DUMMY_GUID3, 0x12345678,0x1234,0x1234,0x23,0x23,0x23,0x23,0x23,0x23,0x23,0x23); -DEFINE_GUID(CLSID_FileSchemeHandler, 0x477ec299, 0x1421, 0x4bdd, 0x97, 0x1f, 0x7c, 0xcb, 0x93, 0x3f, 0x21, 0xad); - -#undef INITGUID -#include <guiddef.h> #include "mfapi.h" #include "mfidl.h" #include "mferror.h" @@ -50,6 +38,13 @@ DEFINE_GUID(CLSID_FileSchemeHandler, 0x477ec299, 0x1421, 0x4bdd, 0x97, 0x1f, 0x7 #include "wine/test.h" #include "wine/heap.h" +#include "initguid.h" +DEFINE_GUID(DUMMY_CLSID, 0x12345678,0x1234,0x1234,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19); +DEFINE_GUID(DUMMY_GUID1, 0x12345678,0x1234,0x1234,0x21,0x21,0x21,0x21,0x21,0x21,0x21,0x21); +DEFINE_GUID(DUMMY_GUID2, 0x12345678,0x1234,0x1234,0x22,0x22,0x22,0x22,0x22,0x22,0x22,0x22); +DEFINE_GUID(DUMMY_GUID3, 0x12345678,0x1234,0x1234,0x23,0x23,0x23,0x23,0x23,0x23,0x23,0x23); +DEFINE_GUID(CLSID_FileSchemeHandler, 0x477ec299, 0x1421, 0x4bdd, 0x97, 0x1f, 0x7c, 0xcb, 0x93, 0x3f, 0x21, 0xad); + static BOOL is_win8_plus; #define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) -- 2.20.1

July 15, 2019

[PATCH] shell32: On macOS don't link against CoreServices.

by Huw Davies

This has not been required since commit efac5d0672728f1b6d85d28aafced14223aecf16. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/shell32/Makefile.in | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in index 20365b96fb..fe49bf09f9 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -3,7 +3,6 @@ MODULE = shell32.dll IMPORTLIB = shell32 IMPORTS = uuid shlwapi user32 gdi32 advapi32 DELAYIMPORTS = ole32 oleaut32 shdocvw version comctl32 gdiplus -EXTRALIBS = $(CORESERVICES_LIBS) # AUTHORS file is in the top-level directory EXTRAINCL = -I$(top_srcdir) -- 2.18.0

July 15, 2019

Re: [PATCH] windowscodecs: Move from_sRGB_component into the same section as its sole user.

by Dmitry Timoshkov

Gerald Pfeifer <gerald(a)pfeifer.com> wrote: > -/* https://www.w3.org/Graphics/Color/srgb */ > -static inline float from_sRGB_component(float f) > -{ > - if (f <= 0.04045f) return f / 12.92f; > - return powf((f + 0.055f) / 1.055f, 2.4f); > -} > - > static inline float to_sRGB_component(float f) > { > if (f <= 0.0031308f) return 12.92f * f; > @@ -98,6 +91,13 @@ static inline float to_sRGB_component(float f) > } > > #if 0 /* FIXME: enable once needed */ > +/* https://www.w3.org/Graphics/Color/srgb */ > +static inline float from_sRGB_component(float f) > +{ > + if (f <= 0.04045f) return f / 12.92f; > + return powf((f + 0.055f) / 1.055f, 2.4f); > +} Please leave the comment where it is now, it belongs to all of these helpers, not just the moved one. -- Dmitry.

July 15, 2019

[PATCH] windowscodecs: Move from_sRGB_component into the same section as its sole user.

by Gerald Pfeifer

This quells one compiler warning I've been getting (with Clang, but GCC should warn as well). Right now there are so many warnings, it's hard to find new or more serious ones. Gerald --- dlls/windowscodecs/converter.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index 0d7a3b745f..48cb3dcef2 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -84,13 +84,6 @@ typedef struct FormatConverter { CRITICAL_SECTION lock; /* must be held when initialized */ } FormatConverter; -/* https://www.w3.org/Graphics/Color/srgb */ -static inline float from_sRGB_component(float f) -{ - if (f <= 0.04045f) return f / 12.92f; - return powf((f + 0.055f) / 1.055f, 2.4f); -} - static inline float to_sRGB_component(float f) { if (f <= 0.0031308f) return 12.92f * f; @@ -98,6 +91,13 @@ static inline float to_sRGB_component(float f) } #if 0 /* FIXME: enable once needed */ +/* https://www.w3.org/Graphics/Color/srgb */ +static inline float from_sRGB_component(float f) +{ + if (f <= 0.04045f) return f / 12.92f; + return powf((f + 0.055f) / 1.055f, 2.4f); +} + static void from_sRGB(BYTE *bgr) { float r, g, b; -- 2.21.0

July 14, 2019

[PATCH v2 resend 6/6] wtsapi32/tests: Add test for WTSRegisterSessionNotification().

by Patrick Hibbs

From: Patrick Hibbs <hibbsncc1701(a)yahoo.com> Signed-off-by: Patrick Hibbs <hibbsncc1701(a)gmail.com> --- v2: Fix test for Windows XP. --- dlls/wtsapi32/tests/wtsapi.c | 87 ++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) diff --git a/dlls/wtsapi32/tests/wtsapi.c b/dlls/wtsapi32/tests/wtsapi.c index 67f56bbd7f..1686c077ea 100644 --- a/dlls/wtsapi32/tests/wtsapi.c +++ b/dlls/wtsapi32/tests/wtsapi.c @@ -22,9 +22,12 @@ #include <winbase.h> #include <winternl.h> #include <wtsapi32.h> +#include <windows.h> #include "wine/test.h" +static const CHAR testwindow_class[] = "testwindow"; + static void test_WTSEnumerateProcessesW(void) { BOOL found = FALSE, ret; @@ -115,9 +118,93 @@ static void test_WTSQueryUserToken(void) ok(GetLastError()==ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got: %d\n", GetLastError()); } +static LRESULT CALLBACK testwindow_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + /* TODO: Actually check for WM_WTSSESSION_CHANGE messages. + */ + return DefWindowProcA(hwnd, msg, wparam, lparam); +} + +static void register_testwindow_class(void) +{ + WNDCLASSEXA cls; + + ZeroMemory(&cls, sizeof(cls)); + cls.cbSize = sizeof(cls); + cls.style = 0; + cls.lpfnWndProc = testwindow_wndproc; + cls.hInstance = NULL; + cls.hCursor = LoadCursorA(0, (LPSTR)IDC_ARROW); + cls.hbrBackground = (HBRUSH) COLOR_WINDOW; + cls.lpszClassName = testwindow_class; + + RegisterClassExA(&cls); +} + +typedef BOOL (WINAPI *RegFunc)(HWND, DWORD); +typedef BOOL (WINAPI *UnRegFunc)(HWND); + +static void test_WTSRegisterSessionNotification(void) +{ + BOOL ret; + HWND hwnd0; + HWND hwnd1; + HANDLE lib; + RegFunc regFunc; + UnRegFunc unRegFunc; + + register_testwindow_class(); + + hwnd0 = CreateWindowExA(WS_EX_TOOLWINDOW|WS_EX_TOPMOST, + testwindow_class, testwindow_class, WS_POPUP|WS_VISIBLE, 0, 0, 0, 0, + NULL, NULL, NULL, NULL); + ok(hwnd0 != NULL, "couldn't create window\n"); + + hwnd1 = CreateWindowExA(WS_EX_TOOLWINDOW|WS_EX_TOPMOST, + testwindow_class, testwindow_class, WS_POPUP|WS_VISIBLE, 0, 0, 0, 0, + NULL, NULL, NULL, NULL); + ok(hwnd1 != NULL, "couldn't create window\n"); + + lib = LoadLibraryA("WTSAPI32.DLL"); + if (lib != NULL) + { + regFunc = (RegFunc) GetProcAddress(lib, "WTSRegisterSessionNotification"); + unRegFunc = (UnRegFunc) GetProcAddress(lib, "WTSUnRegisterSessionNotification"); + if (regFunc && unRegFunc) + { + ret = regFunc(hwnd0, 0); + ok(ret, "WTSRegisterSessionNotification: Initial call, no registered windows.\n"); + ret = regFunc(hwnd0, 0); + ok(ret, "WTSRegisterSessionNotification: Re-register a window.\n"); + ret = regFunc(hwnd0, 1); + ok(ret, + "WTSRegisterSessionNotification: Re-register a window with diff flags.\n"); + ret = regFunc(hwnd1, 0); + ok(ret, "WTSRegisterSessionNotification: Register additional window.\n"); + ret = regFunc(hwnd1, 0); + ok(ret, "WTSRegisterSessionNotification: Re-register window2.\n"); + ret = regFunc(hwnd1, 1); + ok(ret, + "WTSRegisterSessionNotification: Re-register window2 with diff flags.\n"); + ret = unRegFunc(hwnd0); + ok(ret, "WTSUnRegisterSessionNotification: Initial call with first window.\n"); + ret = unRegFunc(hwnd0); + ok(ret, "WTSUnRegisterSessionNotification: Repeat call with first window.\n"); + ret = unRegFunc(hwnd1); + ok(ret, "WTSUnRegisterSessionNotification: Initial call with second window.\n"); + ret = unRegFunc(hwnd1); + ok(ret, "WTSUnRegisterSessionNotification: Repeat call with second window.\n"); + } + } + + DestroyWindow(hwnd0); + DestroyWindow(hwnd1); +} + START_TEST (wtsapi) { test_WTSEnumerateProcessesW(); test_WTSQuerySessionInformationW(); test_WTSQueryUserToken(); + test_WTSRegisterSessionNotification(); } -- 2.22.0

July 14, 2019

[PATCH v2 resend 5/6] wtsapi32: Keep WTSUnRegisterSessionNotification() consistant.

by Patrick Hibbs

From: Patrick Hibbs <hibbsncc1701(a)yahoo.com> Forward calls from WTSUnRegisterSessionNotification() to WTSUnRegisterSessionNotificationEx(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47433 Signed-off-by: Patrick Hibbs <hibbsncc1701(a)yahoo.com> --- dlls/wtsapi32/wtsapi32.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wtsapi32/wtsapi32.c b/dlls/wtsapi32/wtsapi32.c index 8bc7348fca..00dfae0226 100644 --- a/dlls/wtsapi32/wtsapi32.c +++ b/dlls/wtsapi32/wtsapi32.c @@ -446,8 +446,9 @@ BOOL WINAPI WTSTerminateProcess(HANDLE hServer, DWORD ProcessId, DWORD ExitCode) */ BOOL WINAPI WTSUnRegisterSessionNotification(HWND hWnd) { - FIXME("Stub %p\n", hWnd); - return FALSE; + /* Forward to WTSUnRegisterSessionNotificationEx. + */ + return WTSUnRegisterSessionNotificationEx(WTS_CURRENT_SERVER_HANDLE, hWnd); } /************************************************************ -- 2.22.0

July 14, 2019

[PATCH v2 resend 4/6] wtsapi32: Allow deregistering windows in WTSUnRegisterSessionNotificationEx().

by Patrick Hibbs

From: Patrick Hibbs <hibbsncc1701(a)yahoo.com> Ensure the heap doesn't run out of space, and return the proper status codes. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47433 Signed-off-by: Patrick Hibbs <hibbsncc1701(a)yahoo.com> --- v2: Fix status code based on tests, make mismatched message a trace. --- dlls/wtsapi32/wtsapi32.c | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/wtsapi32/wtsapi32.c b/dlls/wtsapi32/wtsapi32.c index dccd5ec1a1..8bc7348fca 100644 --- a/dlls/wtsapi32/wtsapi32.c +++ b/dlls/wtsapi32/wtsapi32.c @@ -451,12 +451,35 @@ BOOL WINAPI WTSUnRegisterSessionNotification(HWND hWnd) } /************************************************************ - * WTSUnRegisterSessionNotification (WTSAPI32.@) + * WTSUnRegisterSessionNotificationEx (WTSAPI32.@) */ BOOL WINAPI WTSUnRegisterSessionNotificationEx(HANDLE hServer, HWND hWnd) { - FIXME("Stub %p %p\n", hServer, hWnd); - return FALSE; + BOOL found = FALSE; + WTSAPI32InternalRegMNGTStr *mgntStr, *cursor2; + FIXME("Simi-Stub %p %p\n", hServer, hWnd); + + /* Only deregister a window if it was registered previously. + */ + LIST_FOR_EACH_ENTRY_SAFE(mgntStr, cursor2, &RegisteredWindowsToNotifiy, + WTSAPI32InternalRegMNGTStr, entry) + { + if ((mgntStr != NULL) && (mgntStr->hServer == hServer) && (mgntStr->hWnd == hWnd)) + { + found = TRUE; + list_remove(&mgntStr->entry); + HeapFree(GetProcessHeap(), 0, mgntStr); + } + } + + /* Log mismatched UnRegister calls. + */ + if (!found) + { + TRACE("Mismatched WTSUnRegisterSessionNotification\n"); + } + + return TRUE; } -- 2.22.0

July 14, 2019

[PATCH v2 resend 3/6] wtsapi32: Keep WTSRegisterSessionNotification() consistant.

by Patrick Hibbs

From: Patrick Hibbs <hibbsncc1701(a)yahoo.com> Forward the calls from WTSRegisterSessionNotification() to WTSRegisterSessionNotificationEx(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47433 Signed-off-by: Patrick Hibbs <hibbsncc1701(a)yahoo.com> --- dlls/wtsapi32/wtsapi32.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wtsapi32/wtsapi32.c b/dlls/wtsapi32/wtsapi32.c index 8ece1d2b37..dccd5ec1a1 100644 --- a/dlls/wtsapi32/wtsapi32.c +++ b/dlls/wtsapi32/wtsapi32.c @@ -307,8 +307,9 @@ BOOL WINAPI WTSQueryUserConfigW(LPWSTR pServerName, LPWSTR pUserName, WTS_CONFIG */ BOOL WINAPI WTSRegisterSessionNotification(HWND hWnd, DWORD dwFlags) { - FIXME("Stub %p 0x%08x\n", hWnd, dwFlags); - return TRUE; + /* Forward to WTSRegisterSessionNotificationEx. + */ + return WTSRegisterSessionNotificationEx(WTS_CURRENT_SERVER_HANDLE, hWnd, dwFlags); } /************************************************************ -- 2.22.0

July 14, 2019

[PATCH v2 resend 2/6] wtsapi32: Make WTSRegisterSessionNotificationEx() keep track of registered windows.

by Patrick Hibbs

From: Patrick Hibbs <hibbsncc1701(a)yahoo.com> Callers expect valid status codes even from stubs. Keeping track of window registrations is required to do that. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47433 Signed-off-by: Patrick Hibbs <hibbsncc1701(a)yahoo.com> --- v2: Fix return status based on tests. --- dlls/wtsapi32/wtsapi32.c | 40 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/wtsapi32/wtsapi32.c b/dlls/wtsapi32/wtsapi32.c index 3d944943b4..8ece1d2b37 100644 --- a/dlls/wtsapi32/wtsapi32.c +++ b/dlls/wtsapi32/wtsapi32.c @@ -316,8 +316,44 @@ BOOL WINAPI WTSRegisterSessionNotification(HWND hWnd, DWORD dwFlags) */ BOOL WINAPI WTSRegisterSessionNotificationEx(HANDLE hServer, HWND hWnd, DWORD dwFlags) { - FIXME("Stub %p %p 0x%08x\n", hServer, hWnd, dwFlags); - return FALSE; + BOOL ret = TRUE; + BOOL found = FALSE; + WTSAPI32InternalRegMNGTStr *mgntStr; + + FIXME("Simi-Stub %p %p 0x%08x\n", hServer, hWnd, dwFlags); + + /* Keep track of the registration attempts. + */ + LIST_FOR_EACH_ENTRY(mgntStr, &RegisteredWindowsToNotifiy, WTSAPI32InternalRegMNGTStr, entry) + { + /* MSDN says that if the window is already registered, + * the dwFlags value is ignored. + */ + if ((mgntStr != NULL) && (mgntStr->hServer == hServer) && (mgntStr->hWnd == hWnd)) + { + found = TRUE; + } + } + + /* Only create the registration if needed. */ + if (!found) + { + mgntStr = NULL; + mgntStr = HeapAlloc(GetProcessHeap(),0, sizeof(WTSAPI32InternalRegMNGTStr)); + if (mgntStr != NULL) + { + mgntStr->hServer = hServer; + mgntStr->hWnd = hWnd; + mgntStr->dwFlags = dwFlags; + list_add_head( &RegisteredWindowsToNotifiy, &mgntStr->entry ); + } + else + { + ret = FALSE; + } + } + + return ret; } -- 2.22.0

July 14, 2019