October 2018 - Wine-commits

Zebediah Figura : oleaut32/tests: Add some tests for marshalling BSTRs.
by Alexandre Julliard 30 Oct '18

30 Oct '18

Module: wine Branch: master Commit: 20749cec4c66250c6864919de56e9d116670e246 URL: https://source.winehq.org/git/wine.git/?a=commit;h=20749cec4c66250c6864919d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Oct 29 23:20:24 2018 -0500 oleaut32/tests: Add some tests for marshalling BSTRs. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/tmarshal.c | 90 ++++++++++++++++++++++++++++++++++++++++ dlls/oleaut32/tests/tmarshal.idl | 4 ++ 2 files changed, 94 insertions(+) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 0b9dc67..edc7f8e 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -44,6 +44,11 @@ static inline void release_iface_(unsigned int line, void *iface) /* ULL suffix is not portable */ #define ULL_CONST(dw1, dw2) ((((ULONGLONG)dw1) << 32) | (ULONGLONG)dw2) +static const WCHAR test_bstr1[] = {'f','o','o',0,'b','a','r'}; +static const WCHAR test_bstr2[] = {'t','e','s','t',0}; +static const WCHAR test_bstr3[] = {'q','u','x',0}; +static const WCHAR test_bstr4[] = {'a','b','c',0}; + const MYSTRUCT MYSTRUCT_BYVAL = {0x12345678, ULL_CONST(0xdeadbeef, 0x98765432), {0,1,2,3,4,5,6,7}}; const MYSTRUCT MYSTRUCT_BYPTR = {0x91827364, ULL_CONST(0x88776655, 0x44332211), {0,1,2,3,4,5,6,7}}; const MYSTRUCT MYSTRUCT_ARRAY[5] = { @@ -1193,6 +1198,37 @@ static HRESULT WINAPI Widget_iface_ptr(IWidget *iface, ISomethingFromDispatch ** return S_OK; } +static HRESULT WINAPI Widget_bstr(IWidget *iface, BSTR in, BSTR *out, BSTR *in_ptr, BSTR *in_out) +{ + UINT len; + + if (testmode == 0) + { + len = SysStringByteLen(in); + ok(len == sizeof(test_bstr1), "Got wrong length %u.\n", len); + ok(!memcmp(in, test_bstr1, len), "Got string %s.\n", wine_dbgstr_wn(in, len / sizeof(WCHAR))); +todo_wine_if(*out) + ok(!*out, "Got unexpected output %p.\n", *out); + len = SysStringLen(*in_ptr); + ok(len == lstrlenW(test_bstr2), "Got wrong length %u.\n", len); + ok(!memcmp(*in_ptr, test_bstr2, len), "Got string %s.\n", wine_dbgstr_w(*in_ptr)); + len = SysStringLen(*in_out); + ok(len == lstrlenW(test_bstr3), "Got wrong length %u.\n", len); + ok(!memcmp(*in_out, test_bstr3, len), "Got string %s.\n", wine_dbgstr_w(*in_out)); + + *out = SysAllocString(test_bstr4); + in[1] = (*in_ptr)[1] = (*in_out)[1] = 'X'; + } + else if (testmode == 1) + { + ok(!in, "Got string %s.\n", wine_dbgstr_w(in)); + ok(!*out, "Got string %s.\n", wine_dbgstr_w(*out)); + ok(!*in_ptr, "Got string %s.\n", wine_dbgstr_w(*in_ptr)); + ok(!*in_out, "Got string %s.\n", wine_dbgstr_w(*in_out)); + } + return S_OK; +} + static const struct IWidgetVtbl Widget_VTable = { Widget_QueryInterface, @@ -1241,6 +1277,7 @@ static const struct IWidgetVtbl Widget_VTable = Widget_iface_in, Widget_iface_out, Widget_iface_ptr, + Widget_bstr, }; static HRESULT WINAPI StaticWidget_QueryInterface(IStaticWidget *iface, REFIID riid, void **ppvObject) @@ -2000,6 +2037,58 @@ todo_wine { } } +static void test_marshal_bstr(IWidget *widget, IDispatch *disp) +{ + VARIANTARG arg[4]; + DISPPARAMS dispparams = {arg, NULL, ARRAY_SIZE(arg), 0}; + BSTR in, out, in_ptr, in_out; + HRESULT hr; + UINT len; + + testmode = 0; + in = SysAllocStringLen(test_bstr1, ARRAY_SIZE(test_bstr1)); + out = NULL; + in_ptr = SysAllocString(test_bstr2); + in_out = SysAllocString(test_bstr3); + + V_VT(&arg[3]) = VT_BSTR; V_BSTR(&arg[3]) = in; + V_VT(&arg[2]) = VT_BSTR|VT_BYREF; V_BSTRREF(&arg[2]) = &out; + V_VT(&arg[1]) = VT_BSTR|VT_BYREF; V_BSTRREF(&arg[1]) = &in_ptr; + V_VT(&arg[0]) = VT_BSTR|VT_BYREF; V_BSTRREF(&arg[0]) = &in_out; + hr = IDispatch_Invoke(disp, DISPID_TM_BSTR, &IID_NULL, LOCALE_NEUTRAL, + DISPATCH_METHOD, &dispparams, NULL, NULL, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(in[1] == test_bstr1[1], "[in] parameter should not be changed.\n"); + ok(in_ptr[1] == 'X', "[in] pointer should be changed.\n"); + ok(in_out[1] == 'X', "[in, out] parameter should be changed.\n"); + len = SysStringLen(out); + ok(len == lstrlenW(test_bstr4), "Got wrong length %d.\n", len); + ok(!memcmp(out, test_bstr4, len), "Got string %s.\n", wine_dbgstr_wn(out, len)); + + in[1] = test_bstr1[1]; + in_ptr[1] = test_bstr2[1]; + in_out[1] = test_bstr3[1]; + SysFreeString(out); + out = (BSTR)0xdeadbeef; + hr = IWidget_bstr(widget, in, &out, &in_ptr, &in_out); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(in[1] == test_bstr1[1], "[in] parameter should not be changed.\n"); + ok(in_ptr[1] == test_bstr2[1], "[in] pointer should not be changed.\n"); + ok(in_out[1] == 'X', "[in, out] parameter should be changed.\n"); + len = SysStringLen(out); + ok(len == lstrlenW(test_bstr4), "Got wrong length %d.\n", len); + ok(!memcmp(out, test_bstr4, len), "Got string %s.\n", wine_dbgstr_wn(out, len)); + SysFreeString(in); + SysFreeString(out); + SysFreeString(in_ptr); + SysFreeString(in_out); + + testmode = 1; + out = in_ptr = in_out = NULL; + hr = IWidget_bstr(widget, NULL, &out, &in_ptr, &in_out); + ok(hr == S_OK, "Got hr %#x.\n", hr); +} + static void test_typelibmarshal(void) { static const WCHAR szCat[] = { 'C','a','t',0 }; @@ -2612,6 +2701,7 @@ todo_wine test_marshal_basetypes(pWidget, pDispatch); test_marshal_pointer(pWidget, pDispatch); test_marshal_iface(pWidget, pDispatch); + test_marshal_bstr(pWidget, pDispatch); IDispatch_Release(pDispatch); IWidget_Release(pWidget); diff --git a/dlls/oleaut32/tests/tmarshal.idl b/dlls/oleaut32/tests/tmarshal.idl index 7e02453..3749c6a 100644 --- a/dlls/oleaut32/tests/tmarshal.idl +++ b/dlls/oleaut32/tests/tmarshal.idl @@ -62,6 +62,7 @@ enum IWidget_dispids DISPID_TM_IFACE_IN, DISPID_TM_IFACE_OUT, DISPID_TM_IFACE_PTR, + DISPID_TM_BSTR, }; static const int DISPID_TM_NEG_RESTRICTED = -26; @@ -263,6 +264,9 @@ library TestTypelib [id(DISPID_TM_IFACE_PTR)] HRESULT iface_ptr([in] ISomethingFromDispatch **in, [out] ISomethingFromDispatch **out, [in, out] ISomethingFromDispatch **in_out); + + [id(DISPID_TM_BSTR)] + HRESULT bstr([in] BSTR in, [out] BSTR *out, [in] BSTR *in_ptr, [in, out] BSTR *in_out); } [

1 0

Zebediah Figura : oleaut32/tests: Add some more tests for marshalling VARIANTs.
by Alexandre Julliard 30 Oct '18

30 Oct '18

Module: wine Branch: master Commit: a21a3d367bc27fd065994cc388a475ff5074f4c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a21a3d367bc27fd065994cc3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Oct 29 23:20:25 2018 -0500 oleaut32/tests: Add some more tests for marshalling VARIANTs. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/tmarshal.c | 112 +++++++++++++++++++++++++++++---------- dlls/oleaut32/tests/tmarshal.idl | 8 +-- 2 files changed, 88 insertions(+), 32 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index edc7f8e..f219742 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -776,17 +776,6 @@ static HRESULT WINAPI Widget_VariantCArray( return S_OK; } -static HRESULT WINAPI Widget_Variant( - IWidget __RPC_FAR * iface, - VARIANT var) -{ - trace("Variant()\n"); - ok(V_VT(&var) == VT_CY, "V_VT(&var) was %d\n", V_VT(&var)); - ok(S(V_CY(&var)).Hi == 0xdababe, "V_CY(&var).Hi was 0x%x\n", S(V_CY(&var)).Hi); - ok(S(V_CY(&var)).Lo == 0xdeadbeef, "V_CY(&var).Lo was 0x%x\n", S(V_CY(&var)).Lo); - return S_OK; -} - static HRESULT WINAPI Widget_VarArg( IWidget * iface, int numexpect, @@ -1229,6 +1218,36 @@ todo_wine_if(*out) return S_OK; } +static HRESULT WINAPI Widget_variant(IWidget *iface, VARIANT in, VARIANT *out, VARIANT *in_ptr, VARIANT *in_out) +{ + ok(V_VT(&in) == VT_CY, "Got wrong type %#x.\n", V_VT(&in)); + ok(V_CY(&in).Hi == 0xdababe && V_CY(&in).Lo == 0xdeadbeef, + "Got wrong value %s.\n", wine_dbgstr_longlong(V_CY(&in).int64)); + if (testmode == 0) + { + ok(V_VT(out) == VT_I4, "Got wrong type %u.\n", V_VT(out)); + ok(V_I4(out) == 1, "Got wrong value %d.\n", V_I4(out)); + } + else + ok(V_VT(out) == VT_EMPTY, "Got wrong type %u.\n", V_VT(out)); + ok(V_VT(in_ptr) == VT_I4, "Got wrong type %u.\n", V_VT(in_ptr)); + ok(V_I4(in_ptr) == -1, "Got wrong value %d.\n", V_I4(in_ptr)); + ok(V_VT(in_out) == VT_BSTR, "Got wrong type %u.\n", V_VT(in_out)); + ok(!lstrcmpW(V_BSTR(in_out), test_bstr2), "Got wrong value %s.\n", + wine_dbgstr_w(V_BSTR(in_out))); + + V_VT(&in) = VT_I4; + V_I4(&in) = 2; + V_VT(out) = VT_UI1; + V_UI1(out) = 3; + V_VT(in_ptr) = VT_I2; + V_I2(in_ptr) = 4; + VariantClear(in_out); + V_VT(in_out) = VT_I1; + V_I1(in_out) = 5; + return S_OK; +} + static const struct IWidgetVtbl Widget_VTable = { Widget_QueryInterface, @@ -1253,7 +1272,6 @@ static const struct IWidgetVtbl Widget_VTable = Widget_Array, Widget_VariantArrayPtr, Widget_VariantCArray, - Widget_Variant, Widget_VarArg, Widget_StructArgs, Widget_Error, @@ -1278,6 +1296,7 @@ static const struct IWidgetVtbl Widget_VTable = Widget_iface_out, Widget_iface_ptr, Widget_bstr, + Widget_variant, }; static HRESULT WINAPI StaticWidget_QueryInterface(IStaticWidget *iface, REFIID riid, void **ppvObject) @@ -2089,6 +2108,58 @@ static void test_marshal_bstr(IWidget *widget, IDispatch *disp) ok(hr == S_OK, "Got hr %#x.\n", hr); } +static void test_marshal_variant(IWidget *widget, IDispatch *disp) +{ + VARIANTARG arg[4]; + DISPPARAMS dispparams = {arg, NULL, ARRAY_SIZE(arg), 0}; + VARIANT out, in_ptr, in_out; + HRESULT hr; + BSTR bstr; + + testmode = 0; + V_VT(&out) = VT_I4; + V_I4(&out) = 1; + V_VT(&in_ptr) = VT_I4; + V_I4(&in_ptr) = -1; + V_VT(&in_out) = VT_BSTR; + V_BSTR(&in_out) = bstr = SysAllocString(test_bstr2); + + V_VT(&arg[3]) = VT_CY; + V_CY(&arg[3]).Hi = 0xdababe; + V_CY(&arg[3]).Lo = 0xdeadbeef; + V_VT(&arg[2]) = VT_VARIANT|VT_BYREF; V_VARIANTREF(&arg[2]) = &out; + V_VT(&arg[1]) = VT_VARIANT|VT_BYREF; V_VARIANTREF(&arg[1]) = &in_ptr; + V_VT(&arg[0]) = VT_VARIANT|VT_BYREF; V_VARIANTREF(&arg[0]) = &in_out; + hr = IDispatch_Invoke(disp, DISPID_TM_VARIANT, &IID_NULL, LOCALE_NEUTRAL, + DISPATCH_METHOD, &dispparams, NULL, NULL, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(V_VT(&arg[3]) == VT_CY, "Got wrong type %u.\n", V_VT(&arg[3])); + ok(V_VT(&out) == VT_UI1, "Got wrong type %u.\n", V_VT(&out)); + ok(V_UI1(&out) == 3, "Got wrong value %d.\n", V_UI1(&out)); + VariantClear(&out); + ok(V_VT(&in_ptr) == VT_I2, "Got wrong type %u.\n", V_VT(&in_ptr)); + ok(V_I2(&in_ptr) == 4, "Got wrong value %d.\n", V_I1(&in_ptr)); + ok(V_VT(&in_out) == VT_I1, "Got wrong type %u.\n", V_VT(&in_out)); + ok(V_I1(&in_out) == 5, "Got wrong value %d.\n", V_I1(&in_out)); + + testmode = 1; + V_VT(&out) = VT_I4; + V_I4(&out) = 1; + V_VT(&in_ptr) = VT_I4; + V_I4(&in_ptr) = -1; + V_VT(&in_out) = VT_BSTR; + V_BSTR(&in_out) = bstr = SysAllocString(test_bstr2); + hr = IWidget_variant(widget, arg[3], &out, &in_ptr, &in_out); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(V_VT(&arg[3]) == VT_CY, "Got wrong type %u.\n", V_VT(&arg[3])); + ok(V_VT(&out) == VT_UI1, "Got wrong type %u.\n", V_VT(&out)); + ok(V_UI1(&out) == 3, "Got wrong value %d.\n", V_UI1(&out)); + ok(V_VT(&in_ptr) == VT_I4, "Got wrong type %u.\n", V_VT(&in_ptr)); + ok(V_I2(&in_ptr) == -1, "Got wrong value %d.\n", V_I1(&in_ptr)); + ok(V_VT(&in_out) == VT_I1, "Got wrong type %u.\n", V_VT(&in_out)); + ok(V_I1(&in_out) == 5, "Got wrong value %d.\n", V_I1(&in_out)); +} + static void test_typelibmarshal(void) { static const WCHAR szCat[] = { 'C','a','t',0 }; @@ -2367,22 +2438,6 @@ static void test_typelibmarshal(void) ok(V_I2(&varresult) == 1234, "V_I2(&varresult) was %d instead of 1234\n", V_I2(&varresult)); VariantClear(&varresult); - /* call Variant - exercises variant copying in ITypeInfo::Invoke and - * handling of void return types */ - /* use a big type to ensure that the variant was properly copied into the - * destination function's args */ - V_VT(&vararg[0]) = VT_CY; - S(V_CY(&vararg[0])).Hi = 0xdababe; - S(V_CY(&vararg[0])).Lo = 0xdeadbeef; - dispparams.cNamedArgs = 0; - dispparams.cArgs = 1; - dispparams.rgdispidNamedArgs = NULL; - dispparams.rgvarg = vararg; - VariantInit(&varresult); - hr = IDispatch_Invoke(pDispatch, DISPID_TM_VARIANT, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, NULL, NULL, NULL); - ok_ole_success(hr, IDispatch_Invoke); - VariantClear(&varresult); - /* call Array with BSTR argument - type mismatch */ VariantInit(&vararg[0]); V_VT(&vararg[0]) = VT_BSTR; @@ -2702,6 +2757,7 @@ todo_wine test_marshal_pointer(pWidget, pDispatch); test_marshal_iface(pWidget, pDispatch); test_marshal_bstr(pWidget, pDispatch); + test_marshal_variant(pWidget, pDispatch); IDispatch_Release(pDispatch); IWidget_Release(pWidget); diff --git a/dlls/oleaut32/tests/tmarshal.idl b/dlls/oleaut32/tests/tmarshal.idl index 3749c6a..16d2f9d 100644 --- a/dlls/oleaut32/tests/tmarshal.idl +++ b/dlls/oleaut32/tests/tmarshal.idl @@ -37,7 +37,6 @@ enum IWidget_dispids DISPID_TM_ARRAY, DISPID_TM_VARARRAYPTR, DISPID_TM_VARCARRAY, - DISPID_TM_VARIANT, DISPID_TM_VARARG, DISPID_TM_STRUCTARGS, DISPID_TM_ERROR, @@ -63,6 +62,7 @@ enum IWidget_dispids DISPID_TM_IFACE_OUT, DISPID_TM_IFACE_PTR, DISPID_TM_BSTR, + DISPID_TM_VARIANT, }; static const int DISPID_TM_NEG_RESTRICTED = -26; @@ -189,9 +189,6 @@ library TestTypelib [id(DISPID_TM_VARCARRAY)] HRESULT VariantCArray([in] ULONG count, [in, out] VARIANT values[2]); - [id(DISPID_TM_VARIANT)] - HRESULT Variant([in] VARIANT var); - [vararg, id(DISPID_TM_VARARG)] HRESULT VarArg([in] int numexpect, [in] SAFEARRAY(VARIANT) values); @@ -267,6 +264,9 @@ library TestTypelib [id(DISPID_TM_BSTR)] HRESULT bstr([in] BSTR in, [out] BSTR *out, [in] BSTR *in_ptr, [in, out] BSTR *in_out); + + [id(DISPID_TM_VARIANT)] + HRESULT variant([in] VARIANT in, [out] VARIANT *out, [in] VARIANT *in_ptr, [in, out] VARIANT *in_out); } [

1 0

Alistair Leslie-Hughes : ntdll: Support TokenVirtualizationEnabled in NtQueryInformationToken.
by Alexandre Julliard 30 Oct '18

30 Oct '18

Module: wine Branch: master Commit: 84a317c738e2e59e59120ab10eaebd4f570b0867 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84a317c738e2e59e59120ab1… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Oct 29 03:59:29 2018 +0000 ntdll: Support TokenVirtualizationEnabled in NtQueryInformationToken. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index af22e58..5c711ef 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -340,7 +340,7 @@ NTSTATUS WINAPI NtQueryInformationToken( 0, /* TokenHasRestrictions */ 0, /* TokenAccessInformation */ 0, /* TokenVirtualizationAllowed */ - 0, /* TokenVirtualizationEnabled */ + sizeof(DWORD), /* TokenVirtualizationEnabled */ sizeof(TOKEN_MANDATORY_LABEL) + sizeof(SID), /* TokenIntegrityLevel [sizeof(SID) includes one SubAuthority] */ 0, /* TokenUIAccess */ 0, /* TokenMandatoryPolicy */ @@ -585,6 +585,12 @@ NTSTATUS WINAPI NtQueryInformationToken( FIXME("QueryInformationToken( ..., TokenSessionId, ...) semi-stub\n"); } break; + case TokenVirtualizationEnabled: + { + *(DWORD *)tokeninfo = 0; + TRACE("QueryInformationToken( ..., TokenVirtualizationEnabled, ...) semi-stub\n"); + } + break; case TokenIntegrityLevel: { /* report always "S-1-16-12288" (high mandatory level) for now */

1 0

Zhiyi Zhang : comctl32/taskdialog: Fix id casting.
by Alexandre Julliard 30 Oct '18

30 Oct '18

Module: wine Branch: master Commit: dcd5a37b1c3801844f53fe6c1a8545a822e6aded URL: https://source.winehq.org/git/wine.git/?a=commit;h=dcd5a37b1c3801844f53fe6c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Oct 29 15:24:59 2018 +0800 comctl32/taskdialog: Fix id casting. This fix tests on 64bit because id is a signed int. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/taskdialog.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 1d91e1d..9bfdef9 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -666,7 +666,7 @@ static void taskdialog_add_radio_buttons(struct taskdialog_info *dialog_info) textW = taskdialog_gettext(dialog_info, TRUE, taskconfig->pRadioButtons[i].pszButtonText); dialog_info->radio_buttons[i] = CreateWindowW(WC_BUTTONW, textW, i == 0 ? style | WS_GROUP : style, 0, 0, 0, 0, dialog_info->hwnd, - ULongToHandle(taskconfig->pRadioButtons[i].nButtonID), 0, NULL); + LongToHandle(taskconfig->pRadioButtons[i].nButtonID), 0, NULL); SendMessageW(dialog_info->radio_buttons[i], WM_SETFONT, (WPARAM)dialog_info->font, 0); Free(textW); } @@ -692,7 +692,7 @@ static void taskdialog_add_command_links(struct taskdialog_info *dialog_info) style = is_default ? default_style | BS_DEFCOMMANDLINK : default_style | BS_COMMANDLINK; textW = taskdialog_gettext(dialog_info, TRUE, taskconfig->pButtons[i].pszButtonText); dialog_info->command_links[i] = CreateWindowW(WC_BUTTONW, textW, style, 0, 0, 0, 0, dialog_info->hwnd, - ULongToHandle(taskconfig->pButtons[i].nButtonID), 0, NULL); + LongToHandle(taskconfig->pButtons[i].nButtonID), 0, NULL); SendMessageW(dialog_info->command_links[i], WM_SETFONT, (WPARAM)dialog_info->font, 0); Free(textW);

1 0

Zhiyi Zhang : comctl32/taskdialog: Add support for TDF_ALLOW_DIALOG_CANCELLATION.
by Alexandre Julliard 30 Oct '18

30 Oct '18

Module: wine Branch: master Commit: d61acf7ec070abd4ed3c17b302f803a7c8a69755 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d61acf7ec070abd4ed3c17b3… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Oct 29 15:25:21 2018 +0800 comctl32/taskdialog: Add support for TDF_ALLOW_DIALOG_CANCELLATION. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/taskdialog.c | 17 ++++++++++++++ dlls/comctl32/tests/taskdialog.c | 49 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 9bfdef9..0adfb2f 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -84,6 +84,7 @@ struct taskdialog_info INT selected_radio_id; BOOL verification_checked; BOOL expanded; + BOOL has_cancel; WCHAR *expanded_text; WCHAR *collapsed_text; }; @@ -1197,6 +1198,13 @@ static void taskdialog_init(struct taskdialog_info *dialog_info, HWND hwnd) id = GetWindowLongW(dialog_info->default_button, GWLP_ID); SendMessageW(dialog_info->hwnd, DM_SETDEFID, id, 0); + dialog_info->has_cancel = + (taskconfig->dwFlags & TDF_ALLOW_DIALOG_CANCELLATION) + || taskdialog_find_button(dialog_info->command_links, dialog_info->command_link_count, IDCANCEL) + || taskdialog_find_button(dialog_info->buttons, dialog_info->button_count, IDCANCEL); + + if (!dialog_info->has_cancel) DeleteMenu(GetSystemMenu(hwnd, FALSE), SC_CLOSE, MF_BYCOMMAND); + taskdialog_layout(dialog_info); } @@ -1369,6 +1377,15 @@ static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPAR RemovePropW(hwnd, taskdialog_info_propnameW); taskdialog_destroy(dialog_info); break; + case WM_CLOSE: + if (dialog_info->has_cancel) + { + if(taskdialog_notify(dialog_info, TDN_BUTTON_CLICKED, IDCANCEL, 0) == S_OK) + EndDialog(hwnd, IDCANCEL); + SetWindowLongPtrW(hwnd, DWLP_MSGRESULT, 0); + break; + } + return FALSE; default: return FALSE; } diff --git a/dlls/comctl32/tests/taskdialog.c b/dlls/comctl32/tests/taskdialog.c index 093671c..8f4c97b 100644 --- a/dlls/comctl32/tests/taskdialog.c +++ b/dlls/comctl32/tests/taskdialog.c @@ -290,6 +290,34 @@ static const struct message_info msg_return_navigated_page[] = { 0 } }; +static const struct message_info msg_send_close[] = +{ + { WM_CLOSE, 0, 0, 0}, + { 0 } +}; + +static const struct message_info msg_handle_wm_close[] = +{ + { TDN_CREATED, 0, 0, S_OK, msg_send_close }, + { TDN_BUTTON_CLICKED, IDCANCEL, 0, S_FALSE, msg_send_close }, + { TDN_BUTTON_CLICKED, IDCANCEL, 0, S_OK, NULL }, + { 0 } +}; + +static const struct message_info msg_send_close_then_ok[] = +{ + { WM_CLOSE, 0, 0, 0}, + { TDM_CLICK_BUTTON, IDOK, 0 }, + { 0 } +}; + +static const struct message_info msg_handle_wm_close_without_cancel_button[] = +{ + { TDN_CREATED, 0, 0, S_OK, msg_send_close_then_ok }, + { TDN_BUTTON_CLICKED, IDOK, 0, S_OK, NULL }, + { 0 } +}; + static void init_test_message(UINT message, WPARAM wParam, LPARAM lParam, struct message *msg) { msg->message = WM_TD_CALLBACK; @@ -739,6 +767,26 @@ static void test_navigate_page(void) run_test(&info, IDOK, ID_START_RADIO_BUTTON, TRUE, msg_return_navigated_page, "navigate page: invalid taskconfig cbSize"); } +static void test_wm_close(void) +{ + TASKDIALOGCONFIG info = {0}; + + info.cbSize = sizeof(TASKDIALOGCONFIG); + info.pfCallback = taskdialog_callback_proc; + info.lpCallbackData = test_ref_data; + + /* WM_CLOSE can end the dialog only when a cancel button is present or dwFlags has TDF_ALLOW_DIALOG_CANCELLATION */ + info.dwCommonButtons = TDCBF_OK_BUTTON; + run_test(&info, IDOK, 0, FALSE, msg_handle_wm_close_without_cancel_button, "send WM_CLOSE without cancel button"); + + info.dwFlags = TDF_ALLOW_DIALOG_CANCELLATION; + run_test(&info, IDCANCEL, 0, FALSE, msg_handle_wm_close, "send WM_CLOSE with TDF_ALLOW_DIALOG_CANCELLATION"); + + info.dwFlags = 0; + info.dwCommonButtons = TDCBF_CANCEL_BUTTON; + run_test(&info, IDCANCEL, 0, FALSE, msg_handle_wm_close, "send WM_CLOSE with a cancel button"); +} + START_TEST(taskdialog) { ULONG_PTR ctx_cookie; @@ -780,6 +828,7 @@ START_TEST(taskdialog) test_progress_bar(); test_verification_box(); test_navigate_page(); + test_wm_close(); unload_v6_module(ctx_cookie, hCtx); }

1 0

Zhiyi Zhang : comctl32/taskdialog: Handle button clicks better.
by Alexandre Julliard 30 Oct '18

30 Oct '18

Module: wine Branch: master Commit: 589cbf3bcc6fbf6e9415bddd322a8d5810f4c804 URL: https://source.winehq.org/git/wine.git/?a=commit;h=589cbf3bcc6fbf6e9415bddd… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Oct 29 15:25:43 2018 +0800 comctl32/taskdialog: Handle button clicks better. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/taskdialog.c | 34 +++++++++++------- dlls/comctl32/tests/taskdialog.c | 77 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 99 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 0adfb2f..5645d53 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -95,7 +95,8 @@ struct button_layout_info LONG line; }; -static void taskdialog_on_button_click(struct taskdialog_info *dialog_info, HWND hwnd); +static HRESULT taskdialog_notify(struct taskdialog_info *dialog_info, UINT notification, WPARAM wparam, LPARAM lparam); +static void taskdialog_on_button_click(struct taskdialog_info *dialog_info, HWND hwnd, WORD id); static void taskdialog_layout(struct taskdialog_info *dialog_info); static void taskdialog_du_to_px(struct taskdialog_info *dialog_info, LONG *width, LONG *height) @@ -209,9 +210,7 @@ static void taskdialog_enable_button(const struct taskdialog_info *dialog_info, static void taskdialog_click_button(struct taskdialog_info *dialog_info, INT id) { - HWND hwnd = taskdialog_find_button(dialog_info->command_links, dialog_info->command_link_count, id); - if (!hwnd) hwnd = taskdialog_find_button(dialog_info->buttons, dialog_info->button_count, id); - if (hwnd) taskdialog_on_button_click(dialog_info, hwnd); + if (taskdialog_notify(dialog_info, TDN_BUTTON_CLICKED, id, 0) == S_OK) EndDialog(dialog_info->hwnd, id); } static void taskdialog_button_set_shield(const struct taskdialog_info *dialog_info, INT id, BOOL elevate) @@ -303,19 +302,22 @@ static void taskdialog_toggle_expando_control(struct taskdialog_info *dialog_inf } } -static void taskdialog_on_button_click(struct taskdialog_info *dialog_info, HWND hwnd) +static void taskdialog_on_button_click(struct taskdialog_info *dialog_info, HWND hwnd, WORD id) { - INT command_id = GetWindowLongW(hwnd, GWLP_ID); - HWND radio_button; + INT command_id; + HWND button, radio_button; + + /* Prefer the id from hwnd because the id from WM_COMMAND is truncated to WORD */ + command_id = hwnd ? GetWindowLongW(hwnd, GWLP_ID) : id; - if (hwnd == dialog_info->expando_button) + if (hwnd && hwnd == dialog_info->expando_button) { taskdialog_toggle_expando_control(dialog_info); taskdialog_notify(dialog_info, TDN_EXPANDO_BUTTON_CLICKED, dialog_info->expanded, 0); return; } - if (hwnd == dialog_info->verification_box) + if (hwnd && hwnd == dialog_info->verification_box) { dialog_info->verification_checked = !dialog_info->verification_checked; taskdialog_notify(dialog_info, TDN_VERIFICATION_CLICKED, dialog_info->verification_checked, 0); @@ -330,7 +332,15 @@ static void taskdialog_on_button_click(struct taskdialog_info *dialog_info, HWND return; } - if (taskdialog_notify(dialog_info, TDN_BUTTON_CLICKED, command_id, 0) == S_OK) + button = taskdialog_find_button(dialog_info->command_links, dialog_info->command_link_count, command_id); + if (!button) button = taskdialog_find_button(dialog_info->buttons, dialog_info->button_count, command_id); + if (!button && command_id == IDOK) + { + button = dialog_info->command_link_count > 0 ? dialog_info->command_links[0] : dialog_info->buttons[0]; + command_id = GetWindowLongW(button, GWLP_ID); + } + + if (button && taskdialog_notify(dialog_info, TDN_BUTTON_CLICKED, command_id, 0) == S_OK) EndDialog(dialog_info->hwnd, command_id); } @@ -582,7 +592,7 @@ static void taskdialog_check_default_radio_buttons(struct taskdialog_info *dialo if (default_button) { SendMessageW(default_button, BM_SETCHECK, BST_CHECKED, 0); - taskdialog_on_button_click(dialog_info, default_button); + taskdialog_on_button_click(dialog_info, default_button, 0); } } @@ -1332,7 +1342,7 @@ static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPAR case WM_COMMAND: if (HIWORD(wParam) == BN_CLICKED) { - taskdialog_on_button_click(dialog_info, (HWND)lParam); + taskdialog_on_button_click(dialog_info, (HWND)lParam, LOWORD(wParam)); break; } return FALSE; diff --git a/dlls/comctl32/tests/taskdialog.c b/dlls/comctl32/tests/taskdialog.c index 8f4c97b..d25c67f 100644 --- a/dlls/comctl32/tests/taskdialog.c +++ b/dlls/comctl32/tests/taskdialog.c @@ -229,6 +229,66 @@ static const struct message_info msg_return_press_negative_id_radio_button[] = { 0 } }; +static const struct message_info msg_send_all_common_button_click[] = +{ + { TDM_CLICK_BUTTON, IDOK, 0 }, + { TDM_CLICK_BUTTON, IDYES, 0 }, + { TDM_CLICK_BUTTON, IDNO, 0 }, + { TDM_CLICK_BUTTON, IDCANCEL, 0 }, + { TDM_CLICK_BUTTON, IDRETRY, 0 }, + { TDM_CLICK_BUTTON, IDCLOSE, 0 }, + { TDM_CLICK_BUTTON, ID_START_BUTTON + 99, 0 }, + { 0 } +}; + +static const struct message_info msg_press_nonexistent_buttons[] = +{ + { TDN_CREATED, 0, 0, S_OK, msg_send_all_common_button_click }, + { TDN_BUTTON_CLICKED, IDOK, 0, S_FALSE, NULL }, + { TDN_BUTTON_CLICKED, IDYES, 0, S_FALSE, NULL }, + { TDN_BUTTON_CLICKED, IDNO, 0, S_FALSE, NULL }, + { TDN_BUTTON_CLICKED, IDCANCEL, 0, S_FALSE, NULL }, + { TDN_BUTTON_CLICKED, IDRETRY, 0, S_FALSE, NULL }, + { TDN_BUTTON_CLICKED, IDCLOSE, 0, S_FALSE, NULL }, + { TDN_BUTTON_CLICKED, ID_START_BUTTON + 99, 0, S_OK, NULL }, + { 0 } +}; + +static const struct message_info msg_send_all_common_button_click_with_command[] = +{ + { WM_COMMAND, MAKEWORD(IDOK, BN_CLICKED), 0 }, + { WM_COMMAND, MAKEWORD(IDYES, BN_CLICKED), 0 }, + { WM_COMMAND, MAKEWORD(IDNO, BN_CLICKED), 0 }, + { WM_COMMAND, MAKEWORD(IDCANCEL, BN_CLICKED), 0 }, + { WM_COMMAND, MAKEWORD(IDRETRY, BN_CLICKED), 0 }, + { WM_COMMAND, MAKEWORD(IDCLOSE, BN_CLICKED), 0 }, + { WM_COMMAND, MAKEWORD(ID_START_BUTTON + 99, BN_CLICKED), 0 }, + { WM_COMMAND, MAKEWORD(IDOK, BN_CLICKED), 0 }, + { 0 } +}; + +static const struct message_info msg_press_nonexistent_buttons_with_command[] = +{ + { TDN_CREATED, 0, 0, S_OK, msg_send_all_common_button_click_with_command }, + { TDN_BUTTON_CLICKED, ID_START_BUTTON, 0, S_FALSE, NULL }, + { TDN_BUTTON_CLICKED, ID_START_BUTTON, 0, S_OK, NULL }, + { 0 } +}; + +static const struct message_info msg_send_nonexistent_radio_button_click[] = +{ + { TDM_CLICK_RADIO_BUTTON, ID_START_RADIO_BUTTON + 99, 0 }, + { TDM_CLICK_BUTTON, IDOK, 0 }, + { 0 } +}; + +static const struct message_info msg_press_nonexistent_radio_button[] = +{ + { TDN_CREATED, 0, 0, S_OK, msg_send_nonexistent_radio_button_click }, + { TDN_BUTTON_CLICKED, IDOK, 0, S_OK, NULL }, + { 0 } +}; + static const struct message_info msg_return_default_verification_unchecked[] = { { TDN_CREATED, 0, 0, S_OK, msg_send_click_ok }, @@ -568,6 +628,23 @@ static void test_buttons(void) info.dwFlags = TDF_NO_DEFAULT_RADIO_BUTTON; run_test(&info, IDOK, -2, FALSE, msg_return_press_negative_id_radio_button, "radio button: manually click radio button with negative id"); + + /* Test sending clicks to non-existent buttons. Notification of non-existent buttons will be sent */ + info.cButtons = TEST_NUM_BUTTONS; + info.pButtons = custom_buttons; + info.cRadioButtons = TEST_NUM_RADIO_BUTTONS; + info.pRadioButtons = radio_buttons; + info.dwCommonButtons = 0; + info.dwFlags = TDF_NO_DEFAULT_RADIO_BUTTON; + run_test(&info, ID_START_BUTTON + 99, 0, FALSE, msg_press_nonexistent_buttons, "sends click to non-existent buttons"); + + /* Non-existent button clicks sent by WM_COMMAND won't generate TDN_BUTTON_CLICKED except IDOK. + * And will get the first existent button identifier instead of IDOK */ + run_test(&info, ID_START_BUTTON, 0, FALSE, msg_press_nonexistent_buttons_with_command, + "sends click to non-existent buttons with WM_COMMAND"); + + /* Non-existent radio button won't get notifications */ + run_test(&info, IDOK, 0, FALSE, msg_press_nonexistent_radio_button, "sends click to non-existent radio buttons"); } static void test_help(void)

1 0

Sergio Gómez Del Real : comctl32: Implement handling of EM_SETCUEBANNER/EM_GETCUEBANNER messages.
by Alexandre Julliard 30 Oct '18

30 Oct '18

Module: wine Branch: master Commit: 0d4a1f7bee1ba859dfe8a95267772ba0222dbbbf URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d4a1f7bee1ba859dfe8a952… Author: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Date: Mon Oct 29 22:10:10 2018 -0500 comctl32: Implement handling of EM_SETCUEBANNER/EM_GETCUEBANNER messages. Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/edit.c | 67 +++++++++++++++++++++++++++++++++++++++ dlls/comctl32/tests/edit.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 145 insertions(+) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index f0180ad..aeba9f7 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -131,6 +131,7 @@ typedef struct should be sent to the first parent. */ HWND hwndListBox; /* handle of ComboBox's listbox or NULL */ INT wheelDeltaRemainder; /* scroll wheel delta left over after scrolling whole lines */ + WCHAR *cue_banner_text; /* * only for multi line controls */ @@ -2181,6 +2182,12 @@ static void EDIT_PaintLine(EDITSTATE *es, HDC dc, INT line, BOOL rev) x += EDIT_PaintText(es, dc, x, y, line, e - li, li + ll - e, FALSE); } else x += EDIT_PaintText(es, dc, x, y, line, 0, ll, FALSE); + + if (es->cue_banner_text && es->text_length == 0 && !(es->flags & EF_FOCUSED)) + { + SetTextColor(dc, GetSysColor(COLOR_GRAYTEXT)); + TextOutW(dc, x, y, es->cue_banner_text, strlenW(es->cue_banner_text)); + } } @@ -4152,6 +4159,57 @@ static LRESULT EDIT_EM_GetThumb(EDITSTATE *es) EDIT_WM_HScroll(es, EM_GETTHUMB, 0)); } +static inline WCHAR *heap_strdupW(const WCHAR *str) +{ + int len = strlenW(str) + 1; + WCHAR *ret = heap_alloc(len * sizeof(WCHAR)); + strcpyW(ret, str); + return ret; +} + +/********************************************************************* + * + * EM_SETCUEBANNER + * + */ +static BOOL EDIT_EM_SetCueBanner(EDITSTATE *es, BOOL focus, const WCHAR *cue_text) +{ + if (es->style & ES_MULTILINE || !cue_text) + return FALSE; + + if (focus) + FIXME("cue banner for focused control not implemented.\n"); + + heap_free(es->cue_banner_text); + es->cue_banner_text = heap_strdupW(cue_text); + + return TRUE; +} + +/********************************************************************* + * + * EM_GETCUEBANNER + * + */ +static BOOL EDIT_EM_GetCueBanner(EDITSTATE *es, WCHAR *buf, DWORD size) +{ + if (es->style & ES_MULTILINE) + return FALSE; + + if (!es->cue_banner_text) + { + if (buf && size) + *buf = 0; + return FALSE; + } + else + { + if (buf) + lstrcpynW(buf, es->cue_banner_text, size); + return TRUE; + } +} + /******************************************************************** * @@ -4489,6 +4547,7 @@ static LRESULT EDIT_WM_NCDestroy(EDITSTATE *es) SetWindowLongPtrW( es->hwndSelf, 0, 0 ); heap_free(es->undo_text); + heap_free(es->cue_banner_text); heap_free(es); return 0; @@ -4703,6 +4762,14 @@ static LRESULT CALLBACK EDIT_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR result = EDIT_EM_CharFromPos(es, (short)LOWORD(lParam), (short)HIWORD(lParam)); break; + case EM_SETCUEBANNER: + result = EDIT_EM_SetCueBanner(es, (BOOL)wParam, (const WCHAR *)lParam); + break; + + case EM_GETCUEBANNER: + result = EDIT_EM_GetCueBanner(es, (WCHAR *)wParam, (DWORD)lParam); + break; + /* End of the EM_ messages which were in numerical order; what order * are these in? vaguely alphabetical? */ diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index a5097d1..bc44d0c 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -3061,6 +3061,83 @@ static const struct message killfocus_combined_seq[] = { 0 } }; +static void test_cue_banner(void) +{ + HWND hwnd_edit; + BOOL ret; + static WCHAR getcuetestW[5] = {'T',0}; + static const WCHAR testcmp1W[] = {'T','e','s','t',0}; + static const WCHAR testcmp2W[] = {'T','e','s',0}; + static const WCHAR emptyW[] = {0}; + + hwnd_edit = create_editcontrolW(ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + + ret = SendMessageW(hwnd_edit, EM_GETCUEBANNER, (WPARAM)getcuetestW, 5); + if (lstrcmpW(getcuetestW, emptyW) != 0) + { + win_skip("skipping for Win XP and 2003 Server.\n"); + DestroyWindow(hwnd_edit); + return; + } + ok(lstrcmpW(getcuetestW, emptyW) == 0, "First char is %c\n", getcuetestW[0]); + ok(ret == FALSE, "EM_GETCUEBANNER should have returned FALSE.\n"); + + lstrcpyW(getcuetestW, testcmp1W); + ret = SendMessageW(hwnd_edit, EM_GETCUEBANNER, (WPARAM)getcuetestW, 0); + ok(lstrcmpW(getcuetestW, testcmp1W) == 0, "String was %s.\n", wine_dbgstr_w(getcuetestW)); + ok(ret == FALSE, "EM_GETCUEBANNER should have returned FALSE.\n"); + + ret = SendMessageW(hwnd_edit, EM_GETCUEBANNER, 0, 0); + ok(ret == FALSE, "EM_GETCUEBANNER should have returned FALSE.\n"); + + ret = SendMessageW(hwnd_edit, EM_SETCUEBANNER, 0, 0); + ok(ret == FALSE, "EM_SETCUEBANNER should have returned FALSE.\n"); + + ret = SendMessageW(hwnd_edit, EM_GETCUEBANNER, 0, 0); + ok(ret == FALSE, "EM_GETCUEBANNER should have returned FALSE.\n"); + + lstrcpyW(getcuetestW, testcmp1W); + ret = SendMessageW(hwnd_edit, EM_SETCUEBANNER, 0, (LPARAM)getcuetestW); + ok(ret == TRUE, "EM_SETCUEBANNER should have returned TRUE.\n"); + + ret = SendMessageW(hwnd_edit, EM_GETCUEBANNER, 0, 5); + ok(ret == TRUE, "EM_GETCUEBANNER should have returned TRUE.\n"); + + ret = SendMessageW(hwnd_edit, EM_GETCUEBANNER, (WPARAM)getcuetestW, 5); + ok(ret == TRUE, "EM_GETCUEBANNER should have returned TRUE.\n"); + ok(lstrcmpW(getcuetestW, testcmp1W) == 0, "EM_GETCUEBANNER returned string %s.\n", wine_dbgstr_w(getcuetestW)); + + ret = SendMessageW(hwnd_edit, EM_SETCUEBANNER, 0, (LPARAM)emptyW); + ok(ret == TRUE, "EM_SETCUEBANNER should have returned TRUE.\n"); + + ret = SendMessageW(hwnd_edit, EM_GETCUEBANNER, (WPARAM)getcuetestW, 5); + ok(ret == TRUE, "EM_GETCUEBANNER should have returned TRUE.\n"); + ok(lstrcmpW(getcuetestW, emptyW) == 0, "EM_GETCUEBANNER returned string %s.\n", wine_dbgstr_w(getcuetestW)); + + /* EM_GETCUEBANNER's buffer size includes null char */ + ret = SendMessageW(hwnd_edit, EM_SETCUEBANNER, 0, (LPARAM)testcmp1W); + ok(ret == TRUE, "EM_SETCUEBANNER should have returned TRUE.\n"); + memset(getcuetestW, 0, lstrlenW(testcmp1W)*sizeof(WCHAR)); + ret = SendMessageW(hwnd_edit, EM_GETCUEBANNER, (WPARAM)getcuetestW, (LPARAM)lstrlenW(testcmp1W)+1); + ok(ret == TRUE, "EM_GETCUEBANNER should have returned TRUE.\n"); + ok(lstrcmpW(getcuetestW, testcmp1W) == 0, "EM_GETCUEBANNER returned string %s.\n", wine_dbgstr_w(getcuetestW)); + memset(getcuetestW, 0, lstrlenW(testcmp1W)*sizeof(WCHAR)); + ret = SendMessageW(hwnd_edit, EM_GETCUEBANNER, (WPARAM)getcuetestW, (LPARAM)lstrlenW(testcmp1W)); + ok(lstrcmpW(getcuetestW, testcmp2W) == 0, "EM_GETCUEBANNER returned string %s.\n", wine_dbgstr_w(getcuetestW)); + DestroyWindow(hwnd_edit); + + /* setting cue banner fails for multi-line edit controls */ + hwnd_edit = create_editcontrolW(ES_AUTOHSCROLL | ES_AUTOVSCROLL | ES_MULTILINE, 0); + lstrcpyW(getcuetestW, testcmp1W); + ret = SendMessageW(hwnd_edit, EM_GETCUEBANNER, (WPARAM)getcuetestW, 5); + ok(ret == FALSE, "EM_SETCUEBANNER.\n"); + ok(lstrcmpW(getcuetestW, testcmp1W) == 0, "String was %s.\n", wine_dbgstr_w(getcuetestW)); + ret = SendMessageW(hwnd_edit, EM_SETCUEBANNER, 0, (LPARAM)getcuetestW); + ok(ret == FALSE, "EM_SETCUEBANNER.\n"); + + DestroyWindow(hwnd_edit); +} + static void test_change_focus(void) { HWND hwnd, parent_wnd; @@ -3138,6 +3215,7 @@ START_TEST(edit) test_EM_GETLINE(); test_wordbreak_proc(); test_change_focus(); + test_cue_banner(); UnregisterWindowClasses();

1 0

Zhiyi Zhang : kernel32: Implement FindStringOrdinal.
by Alexandre Julliard 30 Oct '18

30 Oct '18

Module: wine Branch: master Commit: 3ebd2f0be30611e6cf00468c2980c5092f91b5b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ebd2f0be30611e6cf00468c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Oct 30 14:31:57 2018 +0800 kernel32: Implement FindStringOrdinal. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46035 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-libraryloader-l1-1-0.spec | 2 +- .../api-ms-win-core-libraryloader-l1-1-1.spec | 2 +- .../api-ms-win-core-libraryloader-l1-2-0.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/locale.c | 49 +++++++++++++++ dlls/kernel32/tests/locale.c | 70 ++++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 2 +- include/libloaderapi.h | 1 + 8 files changed, 125 insertions(+), 5 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3ebd2f0be30611e6cf00…

1 0

Henri Verbeet : wined3d: Move the OpenGL textures from struct wined3d_texture to struct wined3d_texture_gl.
by Alexandre Julliard 30 Oct '18

30 Oct '18

Module: wine Branch: master Commit: 5f9740762a389fb4686da624cdc4c6a2663d0c76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f9740762a389fb4686da624… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 30 13:36:43 2018 +0330 wined3d: Move the OpenGL textures from struct wined3d_texture to struct wined3d_texture_gl. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 3 +- dlls/wined3d/context.c | 48 ++++++++--------- dlls/wined3d/cs.c | 4 +- dlls/wined3d/glsl_shader.c | 3 +- dlls/wined3d/sampler.c | 22 ++++---- dlls/wined3d/state.c | 10 ++-- dlls/wined3d/surface.c | 93 +++++++++++++++++---------------- dlls/wined3d/swapchain.c | 6 +-- dlls/wined3d/texture.c | 106 +++++++++++++++++++------------------- dlls/wined3d/view.c | 80 ++++++++++++++-------------- dlls/wined3d/wined3d_private.h | 67 ++++++++++++------------ 11 files changed, 227 insertions(+), 215 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5f9740762a389fb4686d…

1 0

Henri Verbeet : wined3d: Move the "target" field from struct wined3d_texture to struct wined3d_texture_gl.
by Alexandre Julliard 30 Oct '18

30 Oct '18

Module: wine Branch: master Commit: 961a94ac046644004718c56bfeeb81740cb73793 URL: https://source.winehq.org/git/wine.git/?a=commit;h=961a94ac046644004718c56b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 30 13:36:44 2018 +0330 wined3d: Move the "target" field from struct wined3d_texture to struct wined3d_texture_gl. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 29 +++--- dlls/wined3d/context.c | 6 +- dlls/wined3d/cs.c | 2 +- dlls/wined3d/glsl_shader.c | 25 +++--- dlls/wined3d/nvidia_texture_shader.c | 7 +- dlls/wined3d/sampler.c | 2 +- dlls/wined3d/shader.c | 8 +- dlls/wined3d/state.c | 30 ++++--- dlls/wined3d/surface.c | 64 +++++++------ dlls/wined3d/texture.c | 169 +++++++++++++++++------------------ dlls/wined3d/utils.c | 10 +-- dlls/wined3d/view.c | 28 +++--- dlls/wined3d/wined3d_private.h | 43 ++++----- 13 files changed, 213 insertions(+), 210 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=961a94ac046644004718…

1 0