wine-devel May 2020

wine-devel@winehq.org

79 participants
626 discussions

[PATCH resend] gdi32: Skip edge processing when the area is empty.
by Gabriel Ivăncescu 04 Jun '20

04 Jun '20

Fixes a regression introduced by 9bc6f004ceccf3963584a4f7f4681b5c0578c214, which caused the assert to fail under specific circumstances, and break some apps. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- The patch just indents the code to skip it if nb_points is zero. dlls/gdi32/region.c | 181 ++++++++++++++++++++++---------------------- 1 file changed, 92 insertions(+), 89 deletions(-) diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index 93238b5..3a3138a 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -2631,79 +2631,28 @@ HRGN create_polypolygon_region( const POINT *Pts, const INT *Count, INT nbpolygo if (!(obj = alloc_region( nb_points / 2 ))) goto done; - if (clip_rect) ET.ymax = min( ET.ymax, clip_rect->bottom ); - list_init( &AET ); - pSLL = ET.scanlines.next; - if (mode != WINDING) { - /* - * for each scanline - */ - for (y = ET.ymin; y < ET.ymax; y++) { + if (nb_points) + { + if (clip_rect) ET.ymax = min( ET.ymax, clip_rect->bottom ); + list_init( &AET ); + pSLL = ET.scanlines.next; + if (mode != WINDING) { /* - * Add a new edge to the active edge table when we - * get to the next edge. + * for each scanline */ - if (pSLL != NULL && y == pSLL->scanline) { - REGION_loadAET(&AET, &pSLL->edgelist); - pSLL = pSLL->next; - } - - if (!clip_rect || y >= clip_rect->top) - { - LIST_FOR_EACH_ENTRY( active, &AET, struct edge_table_entry, entry ) - { - if (first) - { - obj->rects[obj->numRects].left = active->bres.minor_axis; - obj->rects[obj->numRects].top = y; - } - else if (obj->rects[obj->numRects].left != active->bres.minor_axis) - { - obj->rects[obj->numRects].right = active->bres.minor_axis; - obj->rects[obj->numRects].bottom = y + 1; - obj->numRects++; - } - first = !first; + for (y = ET.ymin; y < ET.ymax; y++) { + /* + * Add a new edge to the active edge table when we + * get to the next edge. + */ + if (pSLL != NULL && y == pSLL->scanline) { + REGION_loadAET(&AET, &pSLL->edgelist); + pSLL = pSLL->next; } - } - - next_scanline( &AET, y ); - if (obj->numRects) - { - prev_band = REGION_Coalesce( obj, prev_band, cur_band ); - cur_band = obj->numRects; - } - } - } - else { - /* - * for each scanline - */ - for (y = ET.ymin; y < ET.ymax; y++) { - /* - * Add a new edge to the active edge table when we - * get to the next edge. - */ - if (pSLL != NULL && y == pSLL->scanline) { - REGION_loadAET(&AET, &pSLL->edgelist); - REGION_computeWAET( &AET, &WETE ); - pSLL = pSLL->next; - } - pWETE = list_head( &WETE ); - - /* - * for each active edge - */ - if (!clip_rect || y >= clip_rect->top) - { - LIST_FOR_EACH_ENTRY( active, &AET, struct edge_table_entry, entry ) + if (!clip_rect || y >= clip_rect->top) { - /* - * add to the buffer only those edges that - * are in the Winding active edge table. - */ - if (pWETE == &active->winding_entry) + LIST_FOR_EACH_ENTRY( active, &AET, struct edge_table_entry, entry ) { if (first) { @@ -2717,40 +2666,94 @@ HRGN create_polypolygon_region( const POINT *Pts, const INT *Count, INT nbpolygo obj->numRects++; } first = !first; - pWETE = list_next( &WETE, pWETE ); } } - } + next_scanline( &AET, y ); + + if (obj->numRects) + { + prev_band = REGION_Coalesce( obj, prev_band, cur_band ); + cur_band = obj->numRects; + } + } + } + else { /* - * recompute the winding active edge table if - * we just resorted or have exited an edge. + * for each scanline */ - if (next_scanline( &AET, y )) REGION_computeWAET( &AET, &WETE ); + for (y = ET.ymin; y < ET.ymax; y++) { + /* + * Add a new edge to the active edge table when we + * get to the next edge. + */ + if (pSLL != NULL && y == pSLL->scanline) { + REGION_loadAET(&AET, &pSLL->edgelist); + REGION_computeWAET( &AET, &WETE ); + pSLL = pSLL->next; + } + pWETE = list_head( &WETE ); - if (obj->numRects) - { - prev_band = REGION_Coalesce( obj, prev_band, cur_band ); - cur_band = obj->numRects; + /* + * for each active edge + */ + if (!clip_rect || y >= clip_rect->top) + { + LIST_FOR_EACH_ENTRY( active, &AET, struct edge_table_entry, entry ) + { + /* + * add to the buffer only those edges that + * are in the Winding active edge table. + */ + if (pWETE == &active->winding_entry) + { + if (first) + { + obj->rects[obj->numRects].left = active->bres.minor_axis; + obj->rects[obj->numRects].top = y; + } + else if (obj->rects[obj->numRects].left != active->bres.minor_axis) + { + obj->rects[obj->numRects].right = active->bres.minor_axis; + obj->rects[obj->numRects].bottom = y + 1; + obj->numRects++; + } + first = !first; + pWETE = list_next( &WETE, pWETE ); + } + } + } + + /* + * recompute the winding active edge table if + * we just resorted or have exited an edge. + */ + if (next_scanline( &AET, y )) REGION_computeWAET( &AET, &WETE ); + + if (obj->numRects) + { + prev_band = REGION_Coalesce( obj, prev_band, cur_band ); + cur_band = obj->numRects; + } } } - } - assert( obj->numRects <= nb_points / 2 ); + assert( obj->numRects <= nb_points / 2 ); - if (obj->numRects) - { - obj->extents.left = INT_MAX; - obj->extents.right = INT_MIN; - obj->extents.top = obj->rects[0].top; - obj->extents.bottom = obj->rects[obj->numRects-1].bottom; - for (i = 0; i < obj->numRects; i++) + if (obj->numRects) { - obj->extents.left = min( obj->extents.left, obj->rects[i].left ); - obj->extents.right = max( obj->extents.right, obj->rects[i].right ); + obj->extents.left = INT_MAX; + obj->extents.right = INT_MIN; + obj->extents.top = obj->rects[0].top; + obj->extents.bottom = obj->rects[obj->numRects-1].bottom; + for (i = 0; i < obj->numRects; i++) + { + obj->extents.left = min( obj->extents.left, obj->rects[i].left ); + obj->extents.right = max( obj->extents.right, obj->rects[i].right ); + } } + REGION_compact( obj ); } - REGION_compact( obj ); if (!(hrgn = alloc_gdi_handle( obj, OBJ_REGION, &region_funcs ))) free_region( obj ); -- 2.21.0

2 3

[PATCH 08/12] winmm/tests: Introduce compare_uint helper.
by Jacek Caban 03 Jun '20

03 Jun '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winmm/tests/mixer.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)

2 1

[PATCH 09/12] winmm: Introduce compare_uint helper.
by Jacek Caban 03 Jun '20

03 Jun '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winmm/joystick.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)

3 2

[PATCH] ntdll: Add support for FileFsFullSizeInformation class in NtQueryVolumeInformationFile
by Alistair Leslie-Hughes 02 Jun '20

02 Jun '20

From: Jianqiu Zhang <zhangjianqiu_133(a)yeah.net> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ntdll/file.c | 54 ++++++++++++++++++++++++++++++++++++++++- dlls/ntdll/tests/file.c | 8 +----- 2 files changed, 54 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 31e0f1680b..99076791d5 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -3485,7 +3485,59 @@ NTSTATUS WINAPI NtQueryVolumeInformationFile( HANDLE handle, PIO_STATUS_BLOCK io FIXME( "%p: control info not supported\n", handle ); break; case FileFsFullSizeInformation: - FIXME( "%p: full size info not supported\n", handle ); + if (length < sizeof(FILE_FS_FULL_SIZE_INFORMATION)) + io->u.Status = STATUS_BUFFER_TOO_SMALL; + else + { + FILE_FS_FULL_SIZE_INFORMATION *info = buffer; + + if (fstat( fd, &st ) < 0) + { + io->u.Status = FILE_GetNtStatus(); + break; + } + if (!S_ISREG(st.st_mode) && !S_ISDIR(st.st_mode)) + { + io->u.Status = STATUS_INVALID_DEVICE_REQUEST; + } + else + { + ULONGLONG bsize; +#if !defined(linux) || !defined(HAVE_FSTATFS) + struct statvfs stfs; + + if (fstatvfs( fd, &stfs ) < 0) + { + io->u.Status = FILE_GetNtStatus(); + break; + } + bsize = stfs.f_frsize; +#else + struct statfs stfs; + if (fstatfs( fd, &stfs ) < 0) + { + io->u.Status = FILE_GetNtStatus(); + break; + } + bsize = stfs.f_bsize; +#endif + if (bsize == 2048) /* assume CD-ROM */ + { + info->BytesPerSector = 2048; + info->SectorsPerAllocationUnit = 1; + } + else + { + info->BytesPerSector = 512; + info->SectorsPerAllocationUnit = 8; + } + info->TotalAllocationUnits.QuadPart = bsize * stfs.f_blocks / (info->BytesPerSector * info->SectorsPerAllocationUnit); + info->CallerAvailableAllocationUnits.QuadPart = bsize * stfs.f_bavail / (info->BytesPerSector * info->SectorsPerAllocationUnit); + info->ActualAvailableAllocationUnits.QuadPart = bsize * stfs.f_bfree / (info->BytesPerSector * info->SectorsPerAllocationUnit); + io->Information = sizeof(*info); + io->u.Status = STATUS_SUCCESS; + } + } break; case FileFsObjectIdInformation: FIXME( "%p: object id info not supported\n", handle ); diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 31c18454f0..99c4a5cdc7 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -1265,7 +1265,7 @@ static void test_file_full_size_information(void) /* Assume No Quota Settings configured on Wine Testbot */ res = pNtQueryVolumeInformationFile(h, &io, &ffsi, sizeof ffsi, FileFsFullSizeInformation); - todo_wine ok(res == STATUS_SUCCESS, "cannot get attributes, res %x\n", res); + ok(res == STATUS_SUCCESS, "cannot get attributes, res %x\n", res); res = pNtQueryVolumeInformationFile(h, &io, &fsi, sizeof fsi, FileFsSizeInformation); ok(res == STATUS_SUCCESS, "cannot get attributes, res %x\n", res); @@ -1281,8 +1281,6 @@ static void test_file_full_size_information(void) ok(fsi.BytesPerSector == 512, "[fsi] BytesPerSector expected 512, got %d\n",fsi.BytesPerSector); ok(fsi.SectorsPerAllocationUnit == 8, "[fsi] SectorsPerAllocationUnit expected 8, got %d\n",fsi.SectorsPerAllocationUnit); - todo_wine - { ok(ffsi.TotalAllocationUnits.QuadPart > 0, "[ffsi] TotalAllocationUnits expected positive, got negative value 0x%s\n", wine_dbgstr_longlong(ffsi.TotalAllocationUnits.QuadPart)); @@ -1300,14 +1298,10 @@ static void test_file_full_size_information(void) "[ffsi] CallerAvailableAllocationUnits error fsi:0x%s, ffsi: 0x%s\n", wine_dbgstr_longlong(fsi.AvailableAllocationUnits.QuadPart), wine_dbgstr_longlong(ffsi.CallerAvailableAllocationUnits.QuadPart)); - } /* Assume file system is NTFS */ - todo_wine - { ok(ffsi.BytesPerSector == 512, "[ffsi] BytesPerSector expected 512, got %d\n",ffsi.BytesPerSector); ok(ffsi.SectorsPerAllocationUnit == 8, "[ffsi] SectorsPerAllocationUnit expected 8, got %d\n",ffsi.SectorsPerAllocationUnit); - } CloseHandle( h ); } -- 2.26.2

2 1

[PATCH v2 1/2] kernel32: Use RtlAnsiStringToUnicodeString() in OpenMutexA.
by Akihiro Sagawa 02 Jun '20

02 Jun '20

v2: No updates for kernel32/sync.c. Just remove a test part. This commit makes consistent with the commit 2db497e89e8e4a37a8bd569b8691b9b87ae63606, which introduces RtlAnsiStringToUnicodeString() into CreateMutexA(). Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/kernel32/sync.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)

2 1

[PATCH v2 1/3] api-ms-win-downlevel-shell32-l1-1-0: Is win32 only.
by Serge Gautherie 01 Jun '20

01 Jun '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- See https://testbot.winehq.org/JobDetails.pl?Key=71897 --- .../api-ms-win-downlevel-shell32-l1-1-0.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-downlevel-shell32-l1-1-0/api-ms-win-downlevel-shell32-l1-1-0.spec b/dlls/api-ms-win-downlevel-shell32-l1-1-0/api-ms-win-downlevel-shell32-l1-1-0.spec index 9d03c03..72e51bc 100644 --- a/dlls/api-ms-win-downlevel-shell32-l1-1-0/api-ms-win-downlevel-shell32-l1-1-0.spec +++ b/dlls/api-ms-win-downlevel-shell32-l1-1-0/api-ms-win-downlevel-shell32-l1-1-0.spec @@ -1,3 +1,3 @@ -@ stdcall CommandLineToArgvW(wstr ptr) shell32.CommandLineToArgvW -@ stdcall GetCurrentProcessExplicitAppUserModelID(ptr) shell32.GetCurrentProcessExplicitAppUserModelID -@ stdcall SetCurrentProcessExplicitAppUserModelID(wstr) shell32.SetCurrentProcessExplicitAppUserModelID +@ stdcall -arch=win32 CommandLineToArgvW(wstr ptr) shell32.CommandLineToArgvW +@ stdcall -arch=win32 GetCurrentProcessExplicitAppUserModelID(ptr) shell32.GetCurrentProcessExplicitAppUserModelID +@ stdcall -arch=win32 SetCurrentProcessExplicitAppUserModelID(wstr) shell32.SetCurrentProcessExplicitAppUserModelID -- 2.10.0.windows.1

4 6

[PATCH] ntdll/tests: Make RtlIpv6AddressToString test data static and constant
by Alex Henrie 01 Jun '20

01 Jun '20

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/ntdll/tests/rtl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 94c6b582f3..7a62670ea0 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -1711,7 +1711,7 @@ static void test_RtlIpv6AddressToString(void) LPCSTR result; IN6_ADDR ip; DWORD_PTR len; - struct + static const struct { PCSTR address; int ip[8]; @@ -1835,7 +1835,7 @@ static void test_RtlIpv6AddressToStringEx(void) NTSTATUS res; IN6_ADDR ip; ULONG len; - struct + static const struct { PCSTR address; ULONG scopeid; -- 2.26.2

2 4

[PATCH] winspool.drv: Implement AddPrintProcessorA via AddPrintProcessorW
by Vijay Kiran Kamuju 01 Jun '20

01 Jun '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=26171 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

2 1

[PATCH v2] winex11.drv: Avoid using the mailing list address in error messages.
by Francois Gouget 31 May '20

31 May '20

Also let users decide whether to report bugs and let them figure out how. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- Otherwise every ERR(), WARN() and FIXME() should tell them to report bugs. dlls/winex11.drv/wintab.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index 06a1427a196..92f957cf8d7 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -619,7 +619,7 @@ BOOL CDECL X11DRV_LoadTabletInfo(HWND hwnddefault) if (! is_tablet_cursor(target->name, device_type)) { - WARN("Skipping device %d [name %s|type %s]; not apparently a tablet cursor type device. If this is wrong, please report it to wine-devel(a)winehq.org\n", + WARN("Skipping device %d [name %s|type %s]; not apparently a tablet cursor type device\n", loop, devices[loop].name, debugstr_a(device_type)); break; } -- 2.20.1

1 0

[PATCH 03/12] gdiplus: Introduce absdiff helper.
by Jacek Caban 31 May '20

31 May '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdiplus/image.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)

3 4

Jump to page:

2025

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 May 2020