November 2019 - Wine-devel - list.winehq.org

[PATCH] shell32: Improve the stub for SHGetPropertyStoreForWindow.
by Hans Leidekker 01 Nov '19

01 Nov '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/shell32/shell32_main.c | 112 +++++++++++++++++++++++++++++++++++- dlls/shell32/tests/appbar.c | 32 +++++++++++ 2 files changed, 143 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 99ee110b3d..034805f6fb 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -691,13 +691,123 @@ VOID WINAPI Printers_UnregisterWindow(HANDLE hClassPidl, HWND hwnd) FIXME("(%p, %p) stub!\n", hClassPidl, hwnd); } +struct window_prop_store +{ + IPropertyStore IPropertyStore_iface; + LONG ref; +}; + +static inline struct window_prop_store *impl_from_IPropertyStore(IPropertyStore *iface) +{ + return CONTAINING_RECORD(iface, struct window_prop_store, IPropertyStore_iface); +} + +static ULONG WINAPI window_prop_store_AddRef(IPropertyStore *iface) +{ + struct window_prop_store *store = impl_from_IPropertyStore(iface); + LONG ref = InterlockedIncrement(&store->ref); + TRACE("returning %d\n", ref); + return ref; +} + +static ULONG WINAPI window_prop_store_Release(IPropertyStore *iface) +{ + struct window_prop_store *store = impl_from_IPropertyStore(iface); + LONG ref = InterlockedDecrement(&store->ref); + if (!ref) heap_free(store); + TRACE("returning %d\n", ref); + return ref; +} + +static HRESULT WINAPI window_prop_store_QueryInterface(IPropertyStore *iface, REFIID iid, void **obj) +{ + struct window_prop_store *store = impl_from_IPropertyStore(iface); + TRACE("%p, %s, %p\n", iface, debugstr_guid(iid), obj); + + if (!obj) return E_POINTER; + if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_IPropertyStore)) + { + *obj = &store->IPropertyStore_iface; + } + else + { + FIXME("no interface for %s\n", debugstr_guid(iid)); + *obj = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown *)*obj); + return S_OK; +} + +static HRESULT WINAPI window_prop_store_GetCount(IPropertyStore *iface, DWORD *count) +{ + FIXME("%p, %p\n", iface, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI window_prop_store_GetAt(IPropertyStore *iface, DWORD prop, PROPERTYKEY *key) +{ + FIXME("%p, %u,%p\n", iface, prop, key); + return E_NOTIMPL; +} + +static HRESULT WINAPI window_prop_store_GetValue(IPropertyStore *iface, const PROPERTYKEY *key, PROPVARIANT *var) +{ + FIXME("%p, {%s,%u}, %p\n", iface, debugstr_guid(&key->fmtid), key->pid, var); + return E_NOTIMPL; +} + +static HRESULT WINAPI window_prop_store_SetValue(IPropertyStore *iface, const PROPERTYKEY *key, const PROPVARIANT *var) +{ + FIXME("%p, {%s,%u}, %p\n", iface, debugstr_guid(&key->fmtid), key->pid, var); + return S_OK; +} + +static HRESULT WINAPI window_prop_store_Commit(IPropertyStore *iface) +{ + FIXME("%p\n", iface); + return S_OK; +} + +static const IPropertyStoreVtbl window_prop_store_vtbl = +{ + window_prop_store_QueryInterface, + window_prop_store_AddRef, + window_prop_store_Release, + window_prop_store_GetCount, + window_prop_store_GetAt, + window_prop_store_GetValue, + window_prop_store_SetValue, + window_prop_store_Commit +}; + +static HRESULT create_window_prop_store(IPropertyStore **obj) +{ + struct window_prop_store *store; + + if (!(store = heap_alloc(sizeof(*store)))) return E_OUTOFMEMORY; + store->IPropertyStore_iface.lpVtbl = &window_prop_store_vtbl; + store->ref = 1; + + *obj = &store->IPropertyStore_iface; + return S_OK; +} + /************************************************************************* * SHGetPropertyStoreForWindow [SHELL32.@] */ HRESULT WINAPI SHGetPropertyStoreForWindow(HWND hwnd, REFIID riid, void **ppv) { + IPropertyStore *store; + HRESULT hr; + FIXME("(%p %p %p) stub!\n", hwnd, riid, ppv); - return E_NOTIMPL; + + if ((hr = create_window_prop_store( &store )) != S_OK) return hr; + hr = IPropertyStore_QueryInterface( store, riid, ppv ); + IPropertyStore_Release( store ); + return hr; } /*************************************************************************/ diff --git a/dlls/shell32/tests/appbar.c b/dlls/shell32/tests/appbar.c index 1505a40aeb..229d616c6f 100644 --- a/dlls/shell32/tests/appbar.c +++ b/dlls/shell32/tests/appbar.c @@ -21,6 +21,8 @@ #include <windows.h> #include "shellapi.h" +#define COBJMACROS +#include "propsys.h" #include "wine/test.h" @@ -30,6 +32,7 @@ static const CHAR testwindow_class[] = "testwindow"; static HMONITOR (WINAPI *pMonitorFromWindow)(HWND, DWORD); static HRESULT (WINAPI *pGetCurrentProcessExplicitAppUserModelID)(PWSTR*); +static HRESULT (WINAPI *pSHGetPropertyStoreForWindow)(HWND, REFIID, void **); typedef BOOL (*boolean_function)(void); @@ -433,6 +436,33 @@ todo_wine ok(appid == NULL, "got %p\n", appid); } +static void test_SHGetPropertyStoreForWindow(void) +{ + HRESULT hr; + IUnknown *unk; + IPropertyStore *store = NULL; + + if (!pSHGetPropertyStoreForWindow) + { + win_skip("SHGetPropertyStoreForWindow() is not supported.\n"); + return; + } + + unk = (IUnknown *)0xdeadbeef; + hr = pSHGetPropertyStoreForWindow(GetDesktopWindow(), &IID_IDispatch, (void **)&unk); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + ok(unk == NULL, "got %p\n", unk); + + hr = pSHGetPropertyStoreForWindow(GetDesktopWindow(), &IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IUnknown_QueryInterface(unk, &IID_IPropertyStore, (void **)&store); + ok(hr == S_OK, "got 0x%08x\n", hr); + + if (store) IPropertyStore_Release(store); + if (unk) IUnknown_Release(unk); +} + START_TEST(appbar) { HMODULE huser32, hshell32; @@ -441,10 +471,12 @@ START_TEST(appbar) hshell32 = GetModuleHandleA("shell32.dll"); pMonitorFromWindow = (void*)GetProcAddress(huser32, "MonitorFromWindow"); pGetCurrentProcessExplicitAppUserModelID = (void*)GetProcAddress(hshell32, "GetCurrentProcessExplicitAppUserModelID"); + pSHGetPropertyStoreForWindow = (void*)GetProcAddress(hshell32, "SHGetPropertyStoreForWindow"); register_testwindow_class(); test_setpos(); test_appbarget(); test_GetCurrentProcessExplicitAppUserModelID(); + test_SHGetPropertyStoreForWindow(); } -- 2.20.1

2 1

[PATCH V2] ucrtbase/tests: add tests for strftime formats %r and %V
by Vijay Kiran Kamuju 01 Nov '19

01 Nov '19

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/ucrtbase/tests/misc.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 8a6fb7b8e11b..391cff79f81b 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -904,6 +904,7 @@ static void test_strftime(void) { const struct tm epoch = { 0, 0, 0, 1, 0, 70, 4, 0, 0 }; const struct tm tm1 = { 0, 0, 0, 1, 0, 117, 0, 0, 0 }; + const struct tm tm2 = { 0, 0, 14, 1, 0, 121, 6, 0, 0 }; char bufA[256]; size_t retA; int i; @@ -964,6 +965,14 @@ static void test_strftime(void) ok(retA == 1, "expected 1, got %d\n", (int)retA); ok(!strcmp(bufA, "\n"), "got %s\n", bufA); + retA = p_strftime(bufA, sizeof(bufA), "%r", &epoch); + todo_wine ok(retA == 11, "expected 11, got %d\n", (int)retA); + todo_wine ok(!strcmp(bufA, "12:00:00 AM"), "got %s\n", bufA); + + retA = p_strftime(bufA, sizeof(bufA), "%r", &tm2); + todo_wine ok(retA == 11, "expected 11, got %d\n", (int)retA); + todo_wine ok(!strcmp(bufA, "02:00:00 PM"), "got %s\n", bufA); + retA = p_strftime(bufA, sizeof(bufA), "%t", &epoch); ok(retA == 1, "expected 1, got %d\n", (int)retA); ok(!strcmp(bufA, "\t"), "got %s\n", bufA); @@ -984,6 +993,18 @@ static void test_strftime(void) ok(retA == 4, "expected 4, got %d\n", (int)retA); ok(!strcmp(bufA, "2016"), "got %s\n", bufA); + retA = p_strftime(bufA, sizeof(bufA), "%V", &epoch); + todo_wine ok(retA == 2, "expected 2, got %d\n", (int)retA); + todo_wine ok(!strcmp(bufA, "01"), "got %s\n", bufA); + + retA = p_strftime(bufA, sizeof(bufA), "%V", &tm1); + todo_wine ok(retA == 2, "expected 2, got %d\n", (int)retA); + todo_wine ok(!strcmp(bufA, "52"), "got %s\n", bufA); + + retA = p_strftime(bufA, sizeof(bufA), "%V", &tm2); + todo_wine ok(retA == 2, "expected 2, got %d\n", (int)retA); + todo_wine ok(!strcmp(bufA, "53"), "got %s\n", bufA); + for(i=0; i<14; i++) { __time32_t t = (365*2 + i - 7) * 24 * 60 * 60; -- 2.21.0

2 1

[PATCH 1/5] msvcrt: Simplify printf tests table.
by Piotr Caban 01 Nov '19

01 Nov '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/tests/printf.c | 253 ++++++++++++++++++------------------- 1 file changed, 126 insertions(+), 127 deletions(-)

2 1

[PATCH 6/6] vbscript: Support using function return value in expressions.
by Jacek Caban 01 Nov '19

01 Nov '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/interp.c | 5 ++--- dlls/vbscript/tests/lang.vbs | 9 +++++++++ 2 files changed, 11 insertions(+), 3 deletions(-)

1 0

[PATCH 4/6] vbscript: Add interpreter support for redim statement.
by Jacek Caban 01 Nov '19

01 Nov '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/compile.c | 20 +++++++++++++ dlls/vbscript/interp.c | 65 ++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/vbscript.h | 1 + 3 files changed, 86 insertions(+)

1 0

[PATCH 3/6] vbscript: Add parser support for redim statement.
by Jacek Caban 01 Nov '19

01 Nov '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/lex.c | 2 ++ dlls/vbscript/parse.h | 8 ++++++++ dlls/vbscript/parser.y | 28 ++++++++++++++++++++++++++-- 3 files changed, 36 insertions(+), 2 deletions(-)

1 0

[PATCH 1/6] vbscript: Add support for parametrized set statements.
by Jacek Caban 01 Nov '19

01 Nov '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/interp.c | 15 +++++---------- dlls/vbscript/tests/run.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 10 deletions(-)

1 0

[PATCH v4 7/7] ddraw/tests: Port TnLHal device test to ddraw7.c
by David Adam 01 Nov '19

01 Nov '19

2 1

[PATCH] faulrep/tests: Fix some memory leaks (Valgrind).
by Gijs Vermeulen 01 Nov '19

01 Nov '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=36404 Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com> --- dlls/faultrep/tests/faultrep.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/faultrep/tests/faultrep.c b/dlls/faultrep/tests/faultrep.c index d45c606f1e..d0b30f70cf 100644 --- a/dlls/faultrep/tests/faultrep.c +++ b/dlls/faultrep/tests/faultrep.c @@ -64,6 +64,7 @@ static BOOL is_process_limited(void) trace("Could not check if the current user is an administrator\n"); return FALSE; } + FreeSid(Group); if (!IsInGroup) { if (!AllocateAndInitializeSid(&NtAuthority, 2, @@ -75,6 +76,7 @@ static BOOL is_process_limited(void) trace("Could not check if the current user is a power user\n"); return FALSE; } + FreeSid(Group); if (!IsInGroup) { /* Only administrators and power users can be powerful */ -- 2.23.0

1 0

[PATCH v5 6/7] ddraw/tests: Port the test that RGB device is enumerated
by David Adam 01 Nov '19

01 Nov '19

2 1