February 2018 - Wine-devel - list.winehq.org

[PATCH] shlwapi/tests: Fix link order.
by Zebediah Figura 19 Feb '18

19 Feb '18

Some functions are declared both in shell32 and in shlwapi; we want to link to the latter. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/shlwapi/tests/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shlwapi/tests/Makefile.in b/dlls/shlwapi/tests/Makefile.in index 2ec694c..450a395 100644 --- a/dlls/shlwapi/tests/Makefile.in +++ b/dlls/shlwapi/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = shlwapi.dll -IMPORTS = shell32 shlwapi mlang oleaut32 ole32 user32 advapi32 +IMPORTS = shlwapi shell32 mlang oleaut32 ole32 user32 advapi32 C_SRCS = \ assoc.c \ -- 2.7.4

1 0

[PATCH] kernel32/tests: Handle notifications on the parent dir more gracefully.
by Zebediah Figura 19 Feb '18

19 Feb '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Fixes an intermittent test failure. The recursive watch might give us a notification on the parent dir. The test already handles this, but expects only one notification to occur and that it will precede the creation notification. However, sometimes the server will return before we receive the creation notification; additionally, sometimes inotify will give us multiple modifications on the parent dir. The point of the test is that recursive watch *works*, i.e. that we receive a notification on the subdirectory at all. So keep calling ReadDirectoryChanges() until we get it (or time out). dlls/kernel32/tests/change.c | 49 +++++++++++++++++++++++++++++--------------- 1 file changed, 32 insertions(+), 17 deletions(-) diff --git a/dlls/kernel32/tests/change.c b/dlls/kernel32/tests/change.c index 4accad0..f4abad4 100644 --- a/dlls/kernel32/tests/change.c +++ b/dlls/kernel32/tests/change.c @@ -383,6 +383,7 @@ static void test_readdirectorychanges(void) static const WCHAR szHoo[] = { '\\','h','o','o',0 }; static const WCHAR szGa[] = { '\\','h','o','o','\\','g','a',0 }; PFILE_NOTIFY_INFORMATION pfni; + BOOL got_subdir_change = FALSE; if (!pReadDirectoryChangesW) { @@ -550,26 +551,40 @@ static void test_readdirectorychanges(void) r = CreateDirectoryW( subsubdir, NULL ); ok( r == TRUE, "failed to create directory\n"); - r = WaitForSingleObject( ov.hEvent, 1000 ); - ok( r == WAIT_OBJECT_0, "should be ready\n" ); + while (1) + { + r = WaitForSingleObject( ov.hEvent, 1000 ); + ok(r == WAIT_OBJECT_0, "should be ready\n" ); + if (r == WAIT_TIMEOUT) break; - ok( (NTSTATUS)ov.Internal == STATUS_SUCCESS, "ov.Internal wrong\n"); - ok( ov.InternalHigh == 0x18 || ov.InternalHigh == 0x12 + 0x18, - "ov.InternalHigh wrong %lx\n", ov.InternalHigh); + ok((NTSTATUS) ov.Internal == STATUS_SUCCESS, "ov.Internal wrong\n"); - pfni = (PFILE_NOTIFY_INFORMATION) buffer; - if (pfni->NextEntryOffset) /* we may get a modified event on the parent dir */ - { - ok( pfni->NextEntryOffset == 0x12, "offset wrong %x\n", pfni->NextEntryOffset ); - ok( pfni->Action == FILE_ACTION_MODIFIED, "action wrong %d\n", pfni->Action ); - ok( pfni->FileNameLength == 3*sizeof(WCHAR), "len wrong\n" ); - ok( !memcmp(pfni->FileName,&szGa[1],3*sizeof(WCHAR)), "name wrong\n"); - pfni = (PFILE_NOTIFY_INFORMATION)((char *)pfni + pfni->NextEntryOffset); + pfni = (PFILE_NOTIFY_INFORMATION) buffer; + while (1) + { + /* We might get one or more modified events on the parent dir */ + if (pfni->Action == FILE_ACTION_MODIFIED) + { + ok(pfni->FileNameLength == 3 * sizeof(WCHAR), "len wrong\n" ); + ok(!memcmp(pfni->FileName, &szGa[1], 3 * sizeof(WCHAR)), "name wrong\n"); + } + else + { + ok(pfni->Action == FILE_ACTION_ADDED, "action wrong\n"); + ok(pfni->FileNameLength == 6 * sizeof(WCHAR), "len wrong\n" ); + ok(!memcmp(pfni->FileName, &szGa[1], 6 * sizeof(WCHAR)), "name wrong\n"); + got_subdir_change = TRUE; + } + if (!pfni->NextEntryOffset) break; + pfni = (PFILE_NOTIFY_INFORMATION)((char *)pfni + pfni->NextEntryOffset); + } + + if (got_subdir_change) break; + + r = pReadDirectoryChangesW(hdir,buffer,sizeof buffer,FALSE,filter,NULL,&ov,NULL); + ok(r==TRUE, "should return true\n"); } - ok( pfni->NextEntryOffset == 0, "offset wrong\n" ); - ok( pfni->Action == FILE_ACTION_ADDED, "action wrong\n" ); - ok( pfni->FileNameLength == 6*sizeof(WCHAR), "len wrong\n" ); - ok( !memcmp(pfni->FileName,&szGa[1],6*sizeof(WCHAR)), "name wrong\n" ); + ok(got_subdir_change, "didn't get subdir change\n"); r = RemoveDirectoryW( subsubdir ); ok( r == TRUE, "failed to remove directory\n"); -- 2.7.4

1 0

[PATCH] ntdll/tests: Added pipe security descriptor tests.
by Jacek Caban 19 Feb '18

19 Feb '18

Based on patch by Jonathan Doron. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/tests/Makefile.in | 2 +- dlls/ntdll/tests/pipe.c | 213 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 214 insertions(+), 1 deletion(-)

1 0

[PATCH] user.exe16: Don't open code CONTAINING_RECORD.
by Nikolay Sivov 19 Feb '18

19 Feb '18

From: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/user.exe16/user.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/user.exe16/user.c b/dlls/user.exe16/user.c index f7d41093f5..27b9279383 100644 --- a/dlls/user.exe16/user.c +++ b/dlls/user.exe16/user.c @@ -87,10 +87,7 @@ static BOOL CALLBACK gray_string_callback( HDC hdc, LPARAM param, INT len ) /* callback for 16-bit gray string proc with string pointer */ static BOOL CALLBACK gray_string_callback_ptr( HDC hdc, LPARAM param, INT len ) { - const struct gray_string_info *info; - char *str = (char *)param; - - info = (struct gray_string_info *)(str - offsetof( struct gray_string_info, str )); + const struct gray_string_info *info = CONTAINING_RECORD( (void *)param, struct gray_string_info, str ); return gray_string_callback( hdc, (LPARAM)info, len ); } -- 2.16.1

1 0

[PATCH appdb] Disable staging checkbox for new test reports
by Rosanne DiMesio 19 Feb '18

19 Feb '18

Prevents users from submitting new test reports for nonexistant staging versions. Current data is retained and the checkbox is still active for existing reports in case they need to be edited by an admin or maintainer. This change can be easily reverted if the branch is officially revived by WineHQ. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> --- include/testData.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/include/testData.php b/include/testData.php index 1083cfb..cec7fec 100644 --- a/include/testData.php +++ b/include/testData.php @@ -921,11 +921,14 @@ class testData{ echo "<span>Version not listed? Your Wine is too old, <a href=\"//winehq.org/download\">upgrade!</a></span><br>"; // Checkbox for Wine-staging echo '<label class="btn btn-secondary">'; - if($this->iStaging != 0) - echo '<input type="checkbox" name="iStaging" value="1" checked>'; + if($this->sState != 'accepted') + echo '<input type="checkbox" name="iStaging" value="1" disabled>'; else - echo '<input type="checkbox" name="iStaging" value="1">'; - echo ' Wine-staging'; + if($this->iStaging != 0) + echo '<input type="checkbox" name="iStaging" value="1" checked>'; + else + echo '<input type="checkbox" name="iStaging" value="1">'; + echo ' Wine-staging <i>(discontinued; last official release was 2.21)</i>'; echo '</label>'; echo '</td></tr>',"\n"; -- 2.12.3

1 0

Incorrect tooltip size
by Roman Pišl 19 Feb '18

19 Feb '18

Hi, our appliction is affected by this bug https://bugs.winehq.org/show_bug.cgi?id=14336. Would you please give me a hint and point me to the right direction? I am ready to fix this, if it doesn't require to rewrite the component completely ;) Roman

2 1

[PATCH 4/5] usp10: Avoid leaking "open_stack" and "stack_index" in case of 0 "pair_count" in computeBracketPairs().
by Henri Verbeet 19 Feb '18

19 Feb '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/usp10/bidi.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/bidi.c b/dlls/usp10/bidi.c index d94dc7b..8f94ede 100644 --- a/dlls/usp10/bidi.c +++ b/dlls/usp10/bidi.c @@ -741,6 +741,10 @@ static BracketPair *computeBracketPairs(IsolatedRun *iso_run) } } } + + heap_free(open_stack); + heap_free(stack_index); + if (pair_count == 0) { heap_free(out); @@ -749,8 +753,6 @@ static BracketPair *computeBracketPairs(IsolatedRun *iso_run) else if (pair_count > 1) qsort(out, pair_count, sizeof(BracketPair), compr); - heap_free(open_stack); - heap_free(stack_index); return out; } -- 2.1.4

2 1

[PATCH 3/5] usp10/tests: Also restore the previous font when the finger print matches in _find_font_for_range().
by Henri Verbeet 19 Feb '18

19 Feb '18

Otherwise the subsequent SelectObject() call will set *origFont to *hfont. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/usp10/tests/usp10.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 5c04441..de91cb8 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -1289,11 +1289,12 @@ static int _find_font_for_range(HDC hdc, const CHAR *recommended, BYTE range, co if (*hfont) { winetest_trace("using font %s\n",lParam.lf.lfFaceName); - *origFont = SelectObject(hdc,*hfont); if (fingerprint) { WORD output[10]; int i; + + *origFont = SelectObject(hdc,*hfont); if (GetGlyphIndicesW(hdc, fingerprint->check, 10, output, 0) != GDI_ERROR) { for (i=0; i < 10; i++) @@ -1307,6 +1308,7 @@ static int _find_font_for_range(HDC hdc, const CHAR *recommended, BYTE range, co } if (i == 10) rc = 1; } + SelectObject(hdc, *origFont); } else rc = 1; } -- 2.1.4

2 1

[PATCH 1/2] mmdevapi/tests: Fix capture test that consistently fails on Windows 10
by Alex Henrie 19 Feb '18

19 Feb '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/mmdevapi/tests/capture.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/mmdevapi/tests/capture.c b/dlls/mmdevapi/tests/capture.c index 3cdfda1a37..27a5cdc33f 100644 --- a/dlls/mmdevapi/tests/capture.c +++ b/dlls/mmdevapi/tests/capture.c @@ -308,20 +308,17 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) hr==S_OK ? (UINT)pos : -1, pad, flags, frames); if(hr == S_OK){ - /* The discontinuity is reported here, but is this an old or new packet? */ - todo_wine_if(!(flags & AUDCLNT_BUFFERFLAGS_DATA_DISCONTINUITY)) { - /* FIXME: Some drivers fail */ - ok(flags & AUDCLNT_BUFFERFLAGS_DATA_DISCONTINUITY, "expect DISCONTINUITY %x\n", flags); + if(flags & AUDCLNT_BUFFERFLAGS_DATA_DISCONTINUITY){ /* Native's position is one period further than what we read. * Perhaps that's precisely the meaning of DATA_DISCONTINUITY: * signal when the position jump left a gap. */ - ok(pos == sum + frames, "Position %u gap %d\n", (UINT)pos, (UINT)pos - sum); + ok(pos == sum + frames, "Position %u last %u frames %u\n", (UINT)pos, sum, frames); + sum = pos; + }else{ /* win10 */ + ok(pos == sum, "Position %u last %u frames %u\n", (UINT)pos, sum, frames); } ok(pad == next, "GCP %u vs. BufferSize %u\n", (UINT32)pad, next); - - if(flags & AUDCLNT_BUFFERFLAGS_DATA_DISCONTINUITY) - sum = pos; } hr = IAudioCaptureClient_ReleaseBuffer(acc, frames); -- 2.16.1

3 6

[PATCH 2/2 v2] msvcrt/tests: Add tests for _searchenv, _searchenv_s, _wsearchenv, _wsearchenv_s
by Piotr Caban 19 Feb '18

19 Feb '18

From: Kirill Erofeev <erofeev.info(a)gmail.com> Signed-off-by: Kirill Erofeev <erofeev.info(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v2: - added test with not found file - moved test files to temp directory dlls/msvcrt/tests/dir.c | 195 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 195 insertions(+)

1 0