April 2022 - Wine-devel - list.winehq.org

[PATCH v2 3/6] user32: Avoid internal structs in post_dde_message.
by Jacek Caban 01 Apr '22

01 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 53 ++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 28 deletions(-)

3 2

[PATCH v2 2/6] win32u: Move NtUserWaitForInputIdle implementation from user32.
by Jacek Caban 01 Apr '22

01 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 48 ++-------------------------- dlls/user32/user_main.c | 1 - dlls/win32u/gdiobj.c | 1 + dlls/win32u/message.c | 61 ++++++++++++++++++++++++++++++------ dlls/win32u/ntuser_private.h | 1 - dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 6 ++++ 8 files changed, 63 insertions(+), 58 deletions(-)

3 2

[PATCH v2 1/6] win32u: Move NtUserMsgWaitForMultipleObjectsEx implementation from user32.
by Jacek Caban 01 Apr '22

01 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 66 ++---------------------------------- dlls/user32/user32.spec | 2 +- dlls/win32u/gdiobj.c | 1 + dlls/win32u/message.c | 23 +++++++++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 2 ++ dlls/win32u/wrappers.c | 7 ++++ include/ntuser.h | 2 ++ 8 files changed, 40 insertions(+), 65 deletions(-)

3 2

[v6 PATCH 1/2] propsys: Implement VariantToStringWithDefault.
by Nikolay Sivov 01 Apr '22

01 Apr '22

From: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v6: removed unrelated inline helper, this is guarded differently in SDK. dlls/propsys/propsys.spec | 2 +- dlls/propsys/propvar.c | 16 ++++++++++++++++ include/propvarutil.h | 1 + 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index 15749952e95..7391cf4aaa2 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -194,7 +194,7 @@ @ stub VariantToStringAlloc @ stub VariantToStringArray @ stub VariantToStringArrayAlloc -@ stub VariantToStringWithDefault +@ stdcall VariantToStringWithDefault(ptr wstr) @ stub VariantToUInt16 @ stub VariantToUInt16Array @ stub VariantToUInt16ArrayAlloc diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index 8f6c52f7aa7..cd92912fde5 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -416,6 +416,22 @@ PCWSTR WINAPI PropVariantToStringWithDefault(REFPROPVARIANT propvarIn, LPCWSTR p return pszDefault; } +/****************************************************************** + * VariantToStringWithDefault (PROPSYS.@) + */ +PCWSTR WINAPI VariantToStringWithDefault(const VARIANT *pvar, const WCHAR *default_value) +{ + TRACE("%s, %s.\n", debugstr_variant(pvar), debugstr_w(default_value)); + + if (V_VT(pvar) == (VT_BYREF | VT_VARIANT)) pvar = V_VARIANTREF(pvar); + if (V_VT(pvar) == (VT_BYREF | VT_BSTR) || V_VT(pvar) == VT_BSTR) + { + BSTR ret = V_ISBYREF(pvar) ? *V_BSTRREF(pvar) : V_BSTR(pvar); + return ret ? ret : L""; + } + + return default_value; +} /****************************************************************** * PropVariantChangeType (PROPSYS.@) diff --git a/include/propvarutil.h b/include/propvarutil.h index 36a670f56e6..fcc532fd623 100644 --- a/include/propvarutil.h +++ b/include/propvarutil.h @@ -93,6 +93,7 @@ HRESULT WINAPI PropVariantToBoolean(REFPROPVARIANT propvarIn, BOOL *ret); HRESULT WINAPI PropVariantToBuffer(REFPROPVARIANT propvarIn, void *ret, UINT cb); HRESULT WINAPI PropVariantToString(REFPROPVARIANT propvarIn, PWSTR ret, UINT cch); PCWSTR WINAPI PropVariantToStringWithDefault(REFPROPVARIANT propvarIn, LPCWSTR pszDefault); +PCWSTR WINAPI VariantToStringWithDefault(const VARIANT *pvar, LPCWSTR pszDefault); HRESULT WINAPI PropVariantToStringAlloc(REFPROPVARIANT propvarIn, WCHAR **ret); -- 2.35.1

1 1

[PATCH 6/6] win32u: Move NtUserSendInput implementation from user32.
by Jacek Caban 01 Apr '22

01 Apr '22

2 1

[PATCH 5/6] win32u: Move __wine_send_input implementation from user32.
by Jacek Caban 01 Apr '22

01 Apr '22

2 1

[PATCH 4/6] win32u: Move send_internal_message_timeout implementation from user32.
by Jacek Caban 01 Apr '22

01 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 43 +- dlls/user32/user_main.c | 2 +- dlls/user32/user_private.h | 5 +- dlls/win32u/hook.c | 14 +- dlls/win32u/message.c | 768 +++++++++++++++++++++++++++++++++++ dlls/win32u/ntuser_private.h | 3 +- dlls/win32u/win32u_private.h | 3 + 7 files changed, 783 insertions(+), 55 deletions(-)

2 1

[PATCH 3/6] user32: Avoid internal structs in post_dde_message.
by Jacek Caban 01 Apr '22

01 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 53 ++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 28 deletions(-)

2 1

[PATCH 2/6] win32u: Move NtUserWaitForInputIdle implementation from user32.
by Jacek Caban 01 Apr '22

01 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 48 ++-------------------------- dlls/user32/user_main.c | 1 - dlls/win32u/gdiobj.c | 1 + dlls/win32u/message.c | 61 ++++++++++++++++++++++++++++++------ dlls/win32u/ntuser_private.h | 1 - dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 6 ++++ 8 files changed, 63 insertions(+), 58 deletions(-)

2 1

[PATCH 1/6] win32u: Move NtUserMsgWaitForMultipleObjectsEx implementation from user32.
by Jacek Caban 01 Apr '22

01 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 66 ++---------------------------------- dlls/user32/user32.spec | 2 +- dlls/win32u/gdiobj.c | 1 + dlls/win32u/message.c | 23 +++++++++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 2 ++ dlls/win32u/wrappers.c | 7 ++++ include/ntuser.h | 2 ++ 8 files changed, 40 insertions(+), 65 deletions(-)

2 1