On Fri, Mar 18, 2016 at 11:59:52AM -0700, Adam Buchbinder wrote:
diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 7c6c5d5..de3c7a0 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -53,6 +53,7 @@ static HWND new_window(LPCSTR lpClassName, DWORD dwStyle, HWND parent) HWND hwnd = CreateWindowA(lpClassName, NULL, dwStyle | WS_POPUP | WS_HSCROLL | WS_VSCROLL | WS_VISIBLE, 0, 0, 200, 60, parent, NULL, hmoduleRichEdit, NULL);
- ok(hwnd != NULL, "class: %s, error: %d\n", lpClassName, (int) GetLastError()); return hwnd;
}
@@ -761,6 +762,66 @@ static void test_ITextRange_GetChar(void) ITextRange_Release(txtRge); }
+/* Helper function for testing ITextRange_ScrollIntoView */ +static void check_range(HWND w, ITextDocument* doc, int first, int lim,
LONG bStart, int expected_nonzero) {
Please put the opening brace on a new line.
More importantly, I get a test failure: richole.c:785: Test failed: Moved scrollbar is at 60, should be 0. (Range 0-160.)
Huw.
On Tue, Mar 22, 2016 at 2:09 AM, Huw Davies huw@codeweavers.com wrote:
On Fri, Mar 18, 2016 at 11:59:52AM -0700, Adam Buchbinder wrote:
diff --git a/dlls/riched20/tests/richole.c
b/dlls/riched20/tests/richole.c
index 7c6c5d5..de3c7a0 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -53,6 +53,7 @@ static HWND new_window(LPCSTR lpClassName, DWORD
dwStyle, HWND parent)
HWND hwnd = CreateWindowA(lpClassName, NULL, dwStyle | WS_POPUP | WS_HSCROLL |
WS_VSCROLL | WS_VISIBLE,
0, 0, 200, 60, parent, NULL,hmoduleRichEdit, NULL);
- ok(hwnd != NULL, "class: %s, error: %d\n", lpClassName, (int)
GetLastError());
return hwnd; }
@@ -761,6 +762,66 @@ static void test_ITextRange_GetChar(void) ITextRange_Release(txtRge); }
+/* Helper function for testing ITextRange_ScrollIntoView */ +static void check_range(HWND w, ITextDocument* doc, int first, int lim,
LONG bStart, int expected_nonzero) {Please put the opening brace on a new line.
Will do, but I'm a bit confused about this:
More importantly, I get a test failure: richole.c:785: Test failed: Moved scrollbar is at 60, should be 0. (Range 0-160.)
Where? The TestBot completed okay in a variety of environments:
https://testbot.winehq.org/JobDetails.pl?Key=21524
and it works on my local workstation. The trace points to a helper function, which is being called with expected_nonzero = 0. There are four calls in test_ITextRange_ScrollIntoView which could be behind this; without logging information or a stack trace, I can't tell what's breaking.
How were you able to get the test to fail? I'd like to try and reproduce the issue myself. Thanks for the feedback, and sorry about the hassle--if there's some kind of local testing I should have done before sending it off, please let me know.
Adam Buchbinder
On Tue, Mar 22, 2016 at 03:29:10PM -0700, Adam Buchbinder wrote:
On Tue, Mar 22, 2016 at 2:09 AM, Huw Davies huw@codeweavers.com wrote: On Fri, Mar 18, 2016 at 11:59:52AM -0700, Adam Buchbinder wrote: > diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/ richole.c > index 7c6c5d5..de3c7a0 100644 > --- a/dlls/riched20/tests/richole.c > +++ b/dlls/riched20/tests/richole.c > @@ -53,6 +53,7 @@ static HWND new_window(LPCSTR lpClassName, DWORD dwStyle, HWND parent) > HWND hwnd = CreateWindowA(lpClassName, NULL, > dwStyle | WS_POPUP | WS_HSCROLL | WS_VSCROLL | WS_VISIBLE, > 0, 0, 200, 60, parent, NULL, hmoduleRichEdit, NULL); > + ok(hwnd != NULL, "class: %s, error: %d\n", lpClassName, (int) GetLastError()); > return hwnd; > } > > @@ -761,6 +762,66 @@ static void test_ITextRange_GetChar(void) > ITextRange_Release(txtRge); > } > > +/* Helper function for testing ITextRange_ScrollIntoView */ > +static void check_range(HWND w, ITextDocument* doc, int first, int lim, > + LONG bStart, int expected_nonzero) {
Please put the opening brace on a new line.Will do, but I'm a bit confused about this: More importantly, I get a test failure: richole.c:785: Test failed: Moved scrollbar is at 60, should be 0. (Range 0-160.)
Where? The TestBot completed okay in a variety of environments:
https://testbot.winehq.org/JobDetails.pl?Key=21524
and it works on my local workstation. The trace points to a helper function, which is being called with expected_nonzero = 0. There are four calls in test_ITextRange_ScrollIntoView which could be behind this; without logging information or a stack trace, I can't tell what's breaking.
It's failing for me on both OS/X and linux. Note, it's the implementation that's failing, the tests themselves are fine. Did you try running 'make test' on your local machine?
Huw.
On Wed, Mar 23, 2016 at 5:00 AM, Huw Davies huw@codeweavers.com wrote:
On Tue, Mar 22, 2016 at 03:29:10PM -0700, Adam Buchbinder wrote:
On Tue, Mar 22, 2016 at 2:09 AM, Huw Davies huw@codeweavers.com wrote: More importantly, I get a test failure: richole.c:785: Test failed: Moved scrollbar is at 60, should be 0. (Range 0-160.)
Where? The TestBot completed okay in a variety of environments:
https://testbot.winehq.org/JobDetails.pl?Key=21524
and it works on my local workstation. The trace points to a helper function, which is being called with expected_nonzero = 0. There are four calls in test_ITextRange_ScrollIntoView which could be behind this; without logging information or a stack trace, I can't tell what's breaking.
It's failing for me on both OS/X and linux. Note, it's the implementation that's failing, the tests themselves are fine. Did you try running 'make test' on your local machine?
Huw.
Aargh! That's my bad; I *thought* I'd tested it. Implementing bStart = tomEnd is proving problematic, so I've reduced the scope, and I'll be sending a v2 patch to wine-patches@ shortly. Sorry about the noise!
Adam Buchbinder
-
Adam Buchbinder -
Huw Davies