wine-devel October 2018

wine-devel@winehq.org

60 participants
608 discussions

[PATCH 1/5] oleaut32/tests: Add some tests for marshalling pointers.
by Zebediah Figura 29 Oct '18

29 Oct '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/oleaut32/tests/tmarshal.c | 178 +++++++++++++++++++++++++++++++ dlls/oleaut32/tests/tmarshal.idl | 8 ++ 2 files changed, 186 insertions(+) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 68547f7e98..01df9efe3a 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -376,6 +376,8 @@ static ItestDualVtbl TestDualVtbl = { static ItestDual TestDual = { &TestDualVtbl }; static ItestDual TestDualDisp = { &TestDualVtbl }; +static int testmode; + typedef struct Widget { IWidget IWidget_iface; @@ -962,6 +964,60 @@ static HRESULT WINAPI Widget_basetypes_out(IWidget *iface, signed char *c, short return S_OK; } +static HRESULT WINAPI Widget_int_ptr(IWidget *iface, int *in, int *out, int *in_out) +{ + ok(*in == 123, "Got [in] %d.\n", *in); + if (testmode == 0) /* Invoke() */ + ok(*out == 456, "Got [out] %d.\n", *out); + else if (testmode == 1) +todo_wine + ok(!*out, "Got [out] %d.\n", *out); + ok(*in_out == 789, "Got [in, out] %d.\n", *in_out); + + *in = 987; + *out = 654; + *in_out = 321; + + return S_OK; +} + +static HRESULT WINAPI Widget_int_ptr_ptr(IWidget *iface, int **in, int **out, int **in_out) +{ +todo_wine_if(testmode == 2) + ok(!*out, "Got [out] %p.\n", *out); + if (testmode == 0) + { + ok(!*in, "Got [in] %p.\n", *in); + ok(!*in_out, "Got [in, out] %p.\n", *in_out); + } + else if (testmode == 1) + { + ok(!*in, "Got [in] %p.\n", *in); + ok(!*in_out, "Got [in, out] %p.\n", *in_out); + + *out = CoTaskMemAlloc(sizeof(int)); + **out = 654; + *in_out = CoTaskMemAlloc(sizeof(int)); + **in_out = 321; + } + else if (testmode == 2) + { + ok(**in == 123, "Got [in] %d.\n", **in); + ok(**in_out == 789, "Got [in, out] %d.\n", **in_out); + + *out = CoTaskMemAlloc(sizeof(int)); + **out = 654; + **in_out = 321; + } + else if (testmode == 3) + { + ok(**in_out == 789, "Got [in, out] %d.\n", **in_out); + *in_out = NULL; + } + + return S_OK; +} + static const struct IWidgetVtbl Widget_VTable = { Widget_QueryInterface, @@ -1005,6 +1061,8 @@ static const struct IWidgetVtbl Widget_VTable = Widget_Coclass, Widget_basetypes_in, Widget_basetypes_out, + Widget_int_ptr, + Widget_int_ptr_ptr, }; static HRESULT WINAPI StaticWidget_QueryInterface(IStaticWidget *iface, REFIID riid, void **ppvObject) @@ -1402,6 +1460,125 @@ static void test_marshal_basetypes(IWidget *widget, IDispatch *disp) ok(st == STATE_UNWIDGETIFIED, "Got state %u.\n", st); } +static void test_marshal_pointer(IWidget *widget, IDispatch *disp) +{ + VARIANTARG arg[3]; + DISPPARAMS dispparams = {arg, NULL, ARRAY_SIZE(arg), 0}; + int in, out, in_out, *in_ptr, *out_ptr, *in_out_ptr; + HRESULT hr; + + testmode = 0; + + in = 123; + out = 456; + in_out = 789; + V_VT(&arg[2]) = VT_BYREF|VT_I4; V_I4REF(&arg[2]) = &in; + V_VT(&arg[1]) = VT_BYREF|VT_I4; V_I4REF(&arg[1]) = &out; + V_VT(&arg[0]) = VT_BYREF|VT_I4; V_I4REF(&arg[0]) = &in_out; + hr = IDispatch_Invoke(disp, DISPID_TM_INT_PTR, &IID_NULL, LOCALE_NEUTRAL, + DISPATCH_METHOD, &dispparams, NULL, NULL, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(in == 987, "Got [in] %d.\n", in); + ok(out == 654, "Got [out] %d.\n", out); + ok(in_out == 321, "Got [in, out] %d.\n", in_out); + + testmode = 1; + + in = 123; + out = 456; + in_out = 789; + hr = IWidget_int_ptr(widget, &in, &out, &in_out); + ok(hr == S_OK, "Got hr %#x.\n", hr); +todo_wine + ok(in == 123, "Got [in] %d.\n", in); + ok(out == 654, "Got [out] %d.\n", out); + ok(in_out == 321, "Got [in, out] %d.\n", in_out); + +if (0) { + out = in_out = -1; + hr = IWidget_int_ptr(widget, NULL, &out, &in_out); + ok(hr == HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER), "Got hr %#x.\n", hr); + ok(!out, "[out] parameter should have been cleared.\n"); + ok(in_out == -1, "[in, out] parameter should not have been cleared.\n"); + + in = in_out = -1; + hr = IWidget_int_ptr(widget, &in, NULL, &in_out); + ok(hr == HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER), "Got hr %#x.\n", hr); + ok(in == -1, "[in] parameter should not have been cleared.\n"); + ok(in_out == -1, "[in, out] parameter should not have been cleared.\n"); + + in = out = -1; + hr = IWidget_int_ptr(widget, &in, &out, NULL); + ok(hr == HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER), "Got hr %#x.\n", hr); + ok(in == -1, "[in] parameter should not have been cleared.\n"); + ok(!out, "[out] parameter should have been cleared.\n"); +} + + /* We can't test Invoke() with double pointers, as it is not possible to fit + * more than one level of indirection into a VARIANTARG. */ + + testmode = 0; + in_ptr = out_ptr = in_out_ptr = NULL; + hr = IWidget_int_ptr_ptr(widget, &in_ptr, &out_ptr, &in_out_ptr); + ok(hr == S_OK, "Got hr %#x\n", hr); + ok(!in_ptr, "Got [in] %p.\n", in_ptr); + ok(!out_ptr, "Got [out] %p.\n", out_ptr); + ok(!in_out_ptr, "Got [in, out] %p.\n", in_out_ptr); + + testmode = 1; + hr = IWidget_int_ptr_ptr(widget, &in_ptr, &out_ptr, &in_out_ptr); + ok(hr == S_OK, "Got hr %#x\n", hr); + ok(*out_ptr == 654, "Got [out] %d.\n", *out_ptr); + ok(*in_out_ptr == 321, "Got [in, out] %d.\n", *in_out_ptr); + CoTaskMemFree(out_ptr); + CoTaskMemFree(in_out_ptr); + + testmode = 2; + in = 123; + out = 456; + in_out = 789; + in_ptr = &in; + out_ptr = &out; + in_out_ptr = &in_out; + hr = IWidget_int_ptr_ptr(widget, &in_ptr, &out_ptr, &in_out_ptr); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(out_ptr != &out, "[out] ptr should have changed.\n"); + ok(in_out_ptr == &in_out, "[in, out] ptr should not have changed.\n"); + ok(*out_ptr == 654, "Got [out] %d.\n", *out_ptr); + ok(*in_out_ptr == 321, "Got [in, out] %d.\n", *in_out_ptr); + + testmode = 3; + in_ptr = out_ptr = NULL; + in_out = 789; + in_out_ptr = &in_out; + hr = IWidget_int_ptr_ptr(widget, &in_ptr, &out_ptr, &in_out_ptr); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!in_out_ptr, "Got [in, out] %p.\n", in_out_ptr); + +if (0) { + out_ptr = &out; + in_out_ptr = &in_out; + hr = IWidget_int_ptr_ptr(widget, NULL, &out_ptr, &in_out_ptr); + ok(hr == HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER), "Got hr %#x.\n", hr); + ok(!out_ptr, "[out] parameter should have been cleared.\n"); + ok(in_out_ptr == &in_out, "[in, out] parameter should not have been cleared.\n"); + + in_ptr = &in; + in_out_ptr = &in_out; + hr = IWidget_int_ptr_ptr(widget, &in_ptr, NULL, &in_out_ptr); + ok(hr == HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER), "Got hr %#x.\n", hr); + ok(in_ptr == &in, "[in] parameter should not have been cleared.\n"); + ok(in_out_ptr == &in_out, "[in, out] parameter should not have been cleared.\n"); + + in_ptr = &in; + out_ptr = &out; + hr = IWidget_int_ptr_ptr(widget, &in_ptr, &out_ptr, NULL); + ok(hr == HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER), "Got hr %#x.\n", hr); + ok(in_ptr == &in, "[in] parameter should not have been cleared.\n"); + ok(!out_ptr, "[out] parameter should have been cleared.\n"); +} +} + static void test_typelibmarshal(void) { static const WCHAR szCat[] = { 'C','a','t',0 }; @@ -2013,6 +2190,7 @@ static void test_typelibmarshal(void) VariantClear(&varresult); test_marshal_basetypes(pWidget, pDispatch); + test_marshal_pointer(pWidget, pDispatch); IDispatch_Release(pDispatch); IWidget_Release(pWidget); diff --git a/dlls/oleaut32/tests/tmarshal.idl b/dlls/oleaut32/tests/tmarshal.idl index 2452f2d185..3cbad57085 100644 --- a/dlls/oleaut32/tests/tmarshal.idl +++ b/dlls/oleaut32/tests/tmarshal.idl @@ -57,6 +57,8 @@ enum IWidget_dispids DISPID_TM_BASETYPES_IN, DISPID_TM_BASETYPES_OUT, + DISPID_TM_INT_PTR, + DISPID_TM_INT_PTR_PTR, }; static const int DISPID_TM_NEG_RESTRICTED = -26; @@ -242,6 +244,12 @@ library TestTypelib HRESULT basetypes_out([out] signed char *c, [out] short *s, [out] int *i, [out] hyper *h, [out] unsigned char *uc, [out] unsigned short *us, [out] unsigned int *ui, [out] unsigned hyper *uh, [out] float *f, [out] double *d, [out] STATE *st); + + [id(DISPID_TM_INT_PTR)] + HRESULT int_ptr([in] int *in, [out] int *out, [in, out] int *in_out); + + [id(DISPID_TM_INT_PTR_PTR)] + HRESULT int_ptr_ptr([in] int **in, [out] int **out, [in, out] int **in_out); } [ -- 2.18.0

2 8

[PATCH] testbot: Detect if a task failed before starting the tests.
by Francois Gouget 28 Oct '18

28 Oct '18

This makes it possible to reliably report build issues as such. It also helps improve handling of build script and VM crashes. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunBuild.pl | 2 +- testbot/bin/WineRunReconfig.pl | 2 +- testbot/bin/WineRunWineTest.pl | 36 +++++++++++++++-------------- testbot/bin/build/WineTest.pl | 19 +++++++++++---- testbot/lib/WineTestBot/LogUtils.pm | 7 +++--- 5 files changed, 40 insertions(+), 26 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 21d2e8b0a2..5a3a683fbb 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -406,7 +406,7 @@ if (!defined $TA->Wait($Pid, $Task->Timeout, 60)) Debug(Elapsed($Start), " Retrieving 'Build.log'\n"); if ($TA->GetFile("Build.log", "$TaskDir/log")) { - my $Result = ParseTaskLog("$TaskDir/log"); + my ($Result, $_Type) = ParseTaskLog("$TaskDir/log"); if ($Result eq "ok") { # We must have gotten the full log and the build did succeed. diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 6dd1318266..4d50a3789a 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -388,7 +388,7 @@ if (!defined $TA->Wait($Pid, $Task->Timeout, 60)) Debug(Elapsed($Start), " Retrieving 'Reconfig.log'\n"); if ($TA->GetFile("Reconfig.log", "$TaskDir/log")) { - my $Result = ParseTaskLog("$TaskDir/log"); + my ($Result, $_Type) = ParseTaskLog("$TaskDir/log"); if ($Result eq "ok") { # We must have gotten the full log and the build did succeed. diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index f47a02413a..5b6eb33e20 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -490,14 +490,9 @@ if (!defined $TA->Wait($Pid, $Task->Timeout, 60)) if ($ErrMessage =~ /timed out waiting for the child process/) { $ErrMessage = "The task timed out\n"; - if ($Step->Type eq "build") - { - $NewStatus = "badbuild"; - } - else - { - $TaskFailures = 1; - } + # We don't know if the timeout was caused by the build or the tests. + # Until we get the task log assume it's the tests' fault. + $TaskFailures = 1; $TaskTimedOut = 1; } else @@ -511,30 +506,37 @@ if (!defined $TA->Wait($Pid, $Task->Timeout, 60)) Debug(Elapsed($Start), " Retrieving 'Task.log'\n"); if ($TA->GetFile("Task.log", "$TaskDir/log")) { - my $Result = ParseTaskLog("$TaskDir/log"); + my ($Result, $Type) = ParseTaskLog("$TaskDir/log"); if ($Result eq "ok") { - # We must have gotten the full log and the build did succeed. - # So forget any prior error. + # We must have gotten the full log and the task completed successfully + # (with or without test failures). So clear any previous errors, including + # $TaskFailures since there was not really a timeout after all. $NewStatus = "completed"; - $TAError = $ErrMessage = undef; + $TaskFailures = $TAError = $ErrMessage = $PossibleCrash = undef; } elsif ($Result eq "badpatch") { # This too is conclusive enough to ignore other errors. $NewStatus = "badpatch"; - $TAError = $ErrMessage = undef; + $TaskFailures = $TAError = $ErrMessage = $PossibleCrash = undef; } elsif ($Result =~ s/^nolog://) { FatalError("$Result\n", "retry"); } - elsif ($Result ne "missing" or $Step->Type ne "suite") + elsif ($Type eq "build") { - # There is no build and thus no result line when running WineTest. - # Otherwise if the result line is missing we probably already have an - # error message that explains why. + # The error happened before the tests started so blame the build. $NewStatus = "badbuild"; + $TaskFailures = $PossibleCrash = undef; + } + elsif (!$TaskTimedOut and !defined $TAError) + { + # Did WineTest.pl crash? + $NewStatus = "boterror"; + $TaskFailures = undef; + $PossibleCrash = 1; } } elsif (!defined $TAError) diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index c5d38df9d4..9bb78d9102 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -75,12 +75,24 @@ sub BuildWine($$) # Test helpers # +my $InTests; + +sub SetupTest($$) +{ + my ($Test, $Mission) = @_; + + LogMsg "tests\n" if (!$InTests); + $InTests = 1; + + InfoMsg "\n$Running $Test in the $Mission->{Build} Wine\n"; + SetupWineEnvironment($Mission->{Build}); +} + sub DailyWineTest($$$$) { my ($Mission, $NoSubmit, $BaseTag, $Args) = @_; - InfoMsg "\nRunning WineTest in the $Mission->{Build} Wine\n"; - SetupWineEnvironment($Mission->{Build}); + SetupTest("WineTest", $Mission); # Run WineTest. Ignore the exit code since it returns non-zero whenever # there are test failures. @@ -128,8 +140,7 @@ sub TestPatch($$) } return 1 if (!@TestList); - InfoMsg "\nRunning the tests in the $Mission->{Build} Wine\n"; - SetupWineEnvironment($Mission->{Build}); + SetupTest("the tests", $Mission); # Run WineTest. Ignore the exit code since it returns non-zero whenever # there are test failures. diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 4751f75e53..59b2d0a0fa 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -80,12 +80,13 @@ sub ParseTaskLog($) if (open(my $LogFile, "<", $FileName)) { my $Result; + my $Type = "build"; foreach my $Line (<$LogFile>) { chomp $Line; if ($Line eq "Task: tests") { - ; # Ignore it for now + $Type = "tests"; } elsif ($Line eq "Task: ok") { @@ -102,9 +103,9 @@ sub ParseTaskLog($) } } close($LogFile); - return $Result || "missing"; + return ($Result || "missing", $Type); } - return "nolog:Unable to open the task log for reading: $!"; + return ("nolog:Unable to open the task log for reading: $!", undef); } -- 2.19.1

1 0

[PATCH v5] comctl32: Implement handling of EM_SETCUEBANNER/EM_GETCUEBANNER messages.
by Sergio Gómez Del Real 28 Oct '18

28 Oct '18

Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> --- dlls/comctl32/edit.c | 61 +++++++++++++++++++++++++++++ dlls/comctl32/tests/edit.c | 78 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 139 insertions(+) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index f0180adfbe..e02ba1f8a1 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,51 @@ 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, const WCHAR *cue_text) +{ + if (es->style & ES_MULTILINE || !cue_text) + return FALSE; + + 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->cue_banner_text) + { + if (!(es->style & ES_MULTILINE) && buf && size) + *buf = 0; + return FALSE; + } + else + { + if (buf && size) + lstrcpynW(buf, es->cue_banner_text, size); + return TRUE; + } +} + /******************************************************************** * @@ -4489,6 +4541,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 +4756,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, (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 a5097d1cbb..bc44d0c240 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(); -- 2.17.1

2 4

[PATCH 1/4] rpcrt4: Add comments explaining the arguments to EmbeddedPointerUnmarshall().
by Zebediah Figura 28 Oct '18

28 Oct '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/rpcrt4/ndr_marshall.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index b48b30099b..d1edf2ca05 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -856,9 +856,9 @@ static void PointerMarshall(PMIDL_STUB_MESSAGE pStubMsg, STD_OVERFLOW_CHECK(pStubMsg); } -/*********************************************************************** - * PointerUnmarshall [internal] - */ +/* pPointer is the pointer that we will unmarshal into; pSrcPointer is the + * pointer to memory which we may attempt to reuse if non-NULL. Usually these + * are the same; for the case when they aren't, see EmbeddedPointerUnmarshall(). */ static void PointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *Buffer, unsigned char **pPointer, @@ -1228,9 +1228,14 @@ static unsigned char * EmbeddedPointerMarshall(PMIDL_STUB_MESSAGE pStubMsg, return NULL; } -/*********************************************************************** - * EmbeddedPointerUnmarshall - */ +/* rpcrt4 does something bizarre with embedded pointers: instead of copying the + * struct/array/union from the buffer to memory and then unmarshalling pointers + * into it, it unmarshals pointers into the buffer itself and then copies it to + * memory. However, it will still attempt to use a user-supplied pointer where + * appropriate (i.e. one on stack). Therefore we need to pass both pointers to + * this function and to PointerUnmarshall: the pointer (to the buffer) that we + * will actually unmarshal into (pDstBuffer), and the pointer (to memory) that + * we will attempt to use for storage if possible (pSrcMemoryPtrs). */ static unsigned char * EmbeddedPointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pDstBuffer, unsigned char *pSrcMemoryPtrs, -- 2.18.0

1 3

[PATCH v2] advapi32: add stub for RegQueryReflectionKey
by Louis Lenders 28 Oct '18

28 Oct '18

v2: I forgot to include spec file changes when i committed, now included in v2 for https://bugs.winehq.org/show_bug.cgi?id=45796 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/registry.c | 9 +++++++++ include/winreg.h | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 5845ae0878..113ee54f93 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -668,7 +668,7 @@ @ stdcall RegQueryInfoKeyW(long ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) @ stdcall RegQueryMultipleValuesA(long ptr long ptr ptr) @ stdcall RegQueryMultipleValuesW(long ptr long ptr ptr) -# @ stub RegQueryReflectionKey +@ stdcall RegQueryReflectionKey(long ptr) @ stdcall RegQueryValueA(long str ptr ptr) @ stdcall RegQueryValueExA(long str ptr ptr ptr ptr) @ stdcall RegQueryValueExW(long wstr ptr ptr ptr ptr) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index a83341fbb4..9989097ff4 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -1194,6 +1194,15 @@ LSTATUS WINAPI RegQueryInfoKeyA( HKEY hkey, LPSTR class, LPDWORD class_len, LPDW return RtlNtStatusToDosError( status ); } +/****************************************************************************** + * RegQueryReflectionKey [ADVAPI32.@] + */ +LONG WINAPI RegQueryReflectionKey( HKEY hkey, BOOL *is_reflection_disabled ) +{ + FIXME( "%p, %p stub\n", hkey, is_reflection_disabled ); + *is_reflection_disabled = TRUE; + return ERROR_CALL_NOT_IMPLEMENTED; +} /****************************************************************************** * RegCloseKey [ADVAPI32.@] diff --git a/include/winreg.h b/include/winreg.h index ddbd929378..51e9f02c3a 100644 --- a/include/winreg.h +++ b/include/winreg.h @@ -155,6 +155,7 @@ WINADVAPI LSTATUS WINAPI RegQueryInfoKeyA(HKEY,LPSTR,LPDWORD,LPDWORD,LPDWORD,L WINADVAPI LSTATUS WINAPI RegQueryMultipleValuesA(HKEY,PVALENTA,DWORD,LPSTR,LPDWORD); WINADVAPI LSTATUS WINAPI RegQueryMultipleValuesW(HKEY,PVALENTW,DWORD,LPWSTR,LPDWORD); #define RegQueryMultipleValues WINELIB_NAME_AW(RegQueryMultipleValues) +WINADVAPI LONG WINAPI RegQueryReflectionKey(HKEY,BOOL*); WINADVAPI LSTATUS WINAPI RegQueryValueA(HKEY,LPCSTR,LPSTR,LPLONG); WINADVAPI LSTATUS WINAPI RegQueryValueW(HKEY,LPCWSTR,LPWSTR,LPLONG); #define RegQueryValue WINELIB_NAME_AW(RegQueryValue) -- 2.17.1

1 0

[PATCH] ntdll: Avoid more race conditions in RtlDeregisterWaitEx.
by Stefan Dösinger 28 Oct '18

28 Oct '18

af35aada9b078f8dc71dcc85e505da8eee4571da left some issues unfixed. Instead of running the callback and returning a retval that indicates the callback is not running, we sometimes wait for it when we are not supposed to. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- WGC calls RtlDeregisterWaitEx(wait, NULL) while holding a critical section that the wait callback will try to acquire. We must not wait for the callback to finish with a NULL wait event under any circumstances, otherwise WGC will deadlock. To make matters worse, WGC manages to fairly reliably hit the racy case where the wait is signalled at the same time it is cancelled. If RtlDeregisterWaitEx thinks the callback is not running it will wait for the worker thread to finish before returning STATUS_SUCCESS. We can't return STATUS_PENDING if the callback is not running (see tests) and we must not return STATUS_SUCCESS and execute the callback. So make sure that after we decide the callback is not running the callback will not start to run. --- dlls/ntdll/threadpool.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 1b0546a7816..bf7449cdfa6 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -81,7 +81,7 @@ struct wait_work_item ULONG Flags; HANDLE CompletionEvent; LONG DeleteCount; - BOOLEAN CallbackInProgress; + int CallbackInProgress; }; struct timer_queue; @@ -530,9 +530,14 @@ static DWORD CALLBACK wait_thread_proc(LPVOID Arg) wait_work_item->Context ); TimerOrWaitFired = TRUE; } - wait_work_item->CallbackInProgress = TRUE; + interlocked_xchg( &wait_work_item->CallbackInProgress, TRUE ); + if (wait_work_item->CompletionEvent) + { + TRACE( "Work has been canceled.\n" ); + break; + } wait_work_item->Callback( wait_work_item->Context, TimerOrWaitFired ); - wait_work_item->CallbackInProgress = FALSE; + interlocked_xchg( &wait_work_item->CallbackInProgress, FALSE ); if (wait_work_item->Flags & WT_EXECUTEONLYONCE) break; @@ -546,7 +551,8 @@ static DWORD CALLBACK wait_thread_proc(LPVOID Arg) { completion_event = wait_work_item->CompletionEvent; delete_wait_work_item( wait_work_item ); - if (completion_event) NtSetEvent( completion_event, NULL ); + if (completion_event && completion_event != INVALID_HANDLE_VALUE) + NtSetEvent( completion_event, NULL ); } return 0; @@ -637,14 +643,16 @@ NTSTATUS WINAPI RtlDeregisterWaitEx(HANDLE WaitHandle, HANDLE CompletionEvent) struct wait_work_item *wait_work_item = WaitHandle; NTSTATUS status; HANDLE LocalEvent = NULL; - BOOLEAN CallbackInProgress; + int CallbackInProgress; TRACE( "(%p %p)\n", WaitHandle, CompletionEvent ); if (WaitHandle == NULL) return STATUS_INVALID_HANDLE; + interlocked_xchg_ptr( &wait_work_item->CompletionEvent, INVALID_HANDLE_VALUE ); CallbackInProgress = wait_work_item->CallbackInProgress; + TRACE( "callback in progress %u\n", CallbackInProgress ); if (CompletionEvent == INVALID_HANDLE_VALUE || !CallbackInProgress) { status = NtCreateEvent( &LocalEvent, EVENT_ALL_ACCESS, NULL, NotificationEvent, FALSE ); @@ -666,6 +674,7 @@ NTSTATUS WINAPI RtlDeregisterWaitEx(HANDLE WaitHandle, HANDLE CompletionEvent) } else if (LocalEvent) { + TRACE( "Waiting for completion event\n" ); NtWaitForSingleObject( LocalEvent, FALSE, NULL ); status = STATUS_SUCCESS; } -- 2.18.1

1 0

Wine staging 3.19 release
by Alistair Leslie-Hughes 28 Oct '18

28 Oct '18

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary of the past few weeks * Rebased to current wine 3.19 (XXX patches are applied to wine vanilla) * Reviewed and upstreamed patches. Upstreamed (Either directly from staging or fixed with a similar patch). * kernel32/tests: Fix compilation with PSDK. * kernel32/tests: Fix a bunch of access denied errors by using a dedicated TEMP directory. * kernel32/tests: Move the MoveFile test where it belongs. * kernel32: MoveFile(source, source) should succeed. * kernel32: MoveFile should make sure that it has the delete access to the source file. * include: Add natupnp.idl * hnetcfg: Register NATUPnP interface * hnetcfg: Support IUPnPNAT interface * hnetcfg: Linked to uuid * hnetcfg/tests: Add IUPnPNAT interface tests * shell32: Properly fail when a data object cannot be instantiated and expand environment strings in ShellExecute * kernel32/tests: Add some tests for GetLongPathName/GetShortPathName called with a wildcard. * kernel32: GetShortPathName should fail when called with a wildcard. * kernel32: GetLongPathName should fail when called with a wildcard. * browseui: Implement PROGDLG_AUTOTIME flag for IProgressDialog. * ntdll: Implement FileIoCompletionNotificationInformation info class * ntdll: Allow to query file IO completion notification mode * ws2_32/tests: Add test for completion notification flags * ntdll/tests: Add more tests for FileIoCompletionNotificationInformation * server: Skip async completion when possible Added * [45878] hid: Implement HidD_FlushQueue * [45992] xinput: Report SUCCESS from XInputSetState when FFB isn't available. * [42734] kernel32: Implement NormalizeString * [45868] shell32: Improve semi-stub SHGetStockIconInfo Updated * setupapi-SetupDiGetDeviceInterfaceDetail Where can you help * Run Steam/Battle.net/UPlay. * Try you favorite game: * Test your favorite applications. * Steal staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH] advapi32: add stub for RegQueryReflectionKey
by Louis Lenders 28 Oct '18

28 Oct '18

for https://bugs.winehq.org/show_bug.cgi?id=45796 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/advapi32/registry.c | 9 +++++++++ include/winreg.h | 1 + 2 files changed, 10 insertions(+) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index a83341fbb4..9989097ff4 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -1194,6 +1194,15 @@ LSTATUS WINAPI RegQueryInfoKeyA( HKEY hkey, LPSTR class, LPDWORD class_len, LPDW return RtlNtStatusToDosError( status ); } +/****************************************************************************** + * RegQueryReflectionKey [ADVAPI32.@] + */ +LONG WINAPI RegQueryReflectionKey( HKEY hkey, BOOL *is_reflection_disabled ) +{ + FIXME( "%p, %p stub\n", hkey, is_reflection_disabled ); + *is_reflection_disabled = TRUE; + return ERROR_CALL_NOT_IMPLEMENTED; +} /****************************************************************************** * RegCloseKey [ADVAPI32.@] diff --git a/include/winreg.h b/include/winreg.h index ddbd929378..51e9f02c3a 100644 --- a/include/winreg.h +++ b/include/winreg.h @@ -155,6 +155,7 @@ WINADVAPI LSTATUS WINAPI RegQueryInfoKeyA(HKEY,LPSTR,LPDWORD,LPDWORD,LPDWORD,L WINADVAPI LSTATUS WINAPI RegQueryMultipleValuesA(HKEY,PVALENTA,DWORD,LPSTR,LPDWORD); WINADVAPI LSTATUS WINAPI RegQueryMultipleValuesW(HKEY,PVALENTW,DWORD,LPWSTR,LPDWORD); #define RegQueryMultipleValues WINELIB_NAME_AW(RegQueryMultipleValues) +WINADVAPI LONG WINAPI RegQueryReflectionKey(HKEY,BOOL*); WINADVAPI LSTATUS WINAPI RegQueryValueA(HKEY,LPCSTR,LPSTR,LPLONG); WINADVAPI LSTATUS WINAPI RegQueryValueW(HKEY,LPCWSTR,LPWSTR,LPLONG); #define RegQueryValue WINELIB_NAME_AW(RegQueryValue) -- 2.17.1

1 0

[PATCH] iphlpapi: add stub for GetIpInterfaceTable
by Louis Lenders 28 Oct '18

28 Oct '18

fix https://bugs.winehq.org/show_bug.cgi?id=46015 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 9 +++++++++ include/netioapi.h | 7 +++++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index 30d9ed7efe..b4f77beced 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -105,7 +105,7 @@ @ stdcall GetIpForwardTable2( long ptr ) @ stub GetIpForwardTableFromStack #@ stub GetIpInterfaceEntry -#@ stub GetIpInterfaceTable +@ stdcall GetIpInterfaceTable( long ptr ) #@ stub GetIpNetEntry2 @ stdcall GetIpNetTable( ptr ptr long ) @ stdcall GetIpNetTable2( long ptr ) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 6273949147..5df4cd832b 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -3304,3 +3304,12 @@ DWORD WINAPI GetIpNetTable2(ADDRESS_FAMILY family, PMIB_IPNET_TABLE2 *table) if (!once++) FIXME("(%u %p): stub\n", family, table); return ERROR_NOT_SUPPORTED; } + +/****************************************************************** + * GetIpInterfaceTable (IPHLPAPI.@) + */ +DWORD WINAPI GetIpInterfaceTable(ADDRESS_FAMILY family, PMIB_IPINTERFACE_TABLE *table) +{ + FIXME("(%u %p): stub\n", family, table); + return ERROR_NOT_SUPPORTED; +} diff --git a/include/netioapi.h b/include/netioapi.h index e9de7ddf14..a41bae0968 100644 --- a/include/netioapi.h +++ b/include/netioapi.h @@ -140,6 +140,12 @@ typedef struct _MIB_IPINTERFACE_ROW BOOLEAN DisableDefaultRoutes; } MIB_IPINTERFACE_ROW, *PMIB_IPINTERFACE_ROW; +typedef struct _MIB_IPINTERFACE_TABLE +{ + ULONG NumEntries; + MIB_IPINTERFACE_ROW Table[ANY_SIZE]; +} MIB_IPINTERFACE_TABLE, *PMIB_IPINTERFACE_TABLE; + typedef struct _MIB_UNICASTIPADDRESS_ROW { SOCKADDR_INET Address; @@ -242,6 +248,7 @@ DWORD WINAPI ConvertLengthToIpv4Mask(ULONG,ULONG*); void WINAPI FreeMibTable(void*); DWORD WINAPI GetIfEntry2(MIB_IF_ROW2*); DWORD WINAPI GetIfTable2(MIB_IF_TABLE2**); +DWORD WINAPI GetIpInterfaceTable(ADDRESS_FAMILY,MIB_IPINTERFACE_TABLE**); DWORD WINAPI GetUnicastIpAddressEntry(MIB_UNICASTIPADDRESS_ROW*); PCHAR WINAPI if_indextoname(NET_IFINDEX,PCHAR); NET_IFINDEX WINAPI if_nametoindex(PCSTR); -- 2.17.1

1 0

[PATCH] dinput: Use the same GUID for Instance and Product
by Brendan McGrath 28 Oct '18

28 Oct '18

This matches the behaviour of DirectInput8 native and appears to be required for some games to recognise the mouse and keyboard as a mouse and keyboard. --- I had a game that worked correctly with dinput native but not with built-in. I wrote a simple program that ran the IDirectInput8::EnumDevices method and found that dinput8=b vs dinput8=n gave different results. One of the differences was that the Instance and Product GUID were the same in native. After applying this patch - the game started working correctly with built-in. dlls/dinput/keyboard.c | 2 +- dlls/dinput/mouse.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index a64c59c6036..fcc85a90c9c 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -179,7 +179,7 @@ static void fill_keyboard_dideviceinstanceA(LPDIDEVICEINSTANCEA lpddi, DWORD ver ddi.dwSize = dwSize; ddi.guidInstance = GUID_SysKeyboard;/* DInput's GUID */ - ddi.guidProduct = DInput_Wine_Keyboard_GUID; /* Vendor's GUID */ + ddi.guidProduct = GUID_SysKeyboard; if (version >= 0x0800) ddi.dwDevType = DI8DEVTYPE_KEYBOARD | (subtype << 8); else diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 6d3eff5d525..1d5309ee73c 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -121,7 +121,7 @@ static void fill_mouse_dideviceinstanceA(LPDIDEVICEINSTANCEA lpddi, DWORD versio ddi.dwSize = dwSize; ddi.guidInstance = GUID_SysMouse;/* DInput's GUID */ - ddi.guidProduct = DInput_Wine_Mouse_GUID; /* Vendor's GUID */ + ddi.guidProduct = GUID_SysMouse; if (version >= 0x0800) ddi.dwDevType = DI8DEVTYPE_MOUSE | (DI8DEVTYPEMOUSE_TRADITIONAL << 8); else -- 2.17.1

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
61
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel October 2018