June 2009 - Wine-Commits - list.winehq.org

Alexandre Julliard : comctl32/tests: Avoid size_t in traces.
by Alexandre Julliard June 5, 2009

June 5, 2009

Module: wine Branch: master Commit: 84ccadeeee55d5ee126897525a1f837204a50a2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=84ccadeeee55d5ee126897525… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 5 15:03:21 2009 +0200 comctl32/tests: Avoid size_t in traces. --- dlls/comctl32/tests/listview.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index fae24e2..9ecbeed 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -2943,7 +2943,7 @@ static void test_editbox(void) item.iItem = 0; item.iSubItem = 0; r = SendMessage(hwnd, LVM_GETITEMTEXTA, 0, (LPARAM)&item); - expect(strlen(item.pszText), r); + expect(lstrlen(item.pszText), r); ok(strcmp(buffer, testitem1A) == 0, "Expected item text to change\n"); /* end edit without saving */ r = SendMessage(hwndedit, WM_KEYDOWN, VK_ESCAPE, 0); @@ -2954,7 +2954,7 @@ static void test_editbox(void) item.iItem = 0; item.iSubItem = 0; r = SendMessage(hwnd, LVM_GETITEMTEXTA, 0, (LPARAM)&item); - expect(strlen(item.pszText), r); + expect(lstrlen(item.pszText), r); ok(strcmp(buffer, testitem1A) == 0, "Expected item text to change\n"); DestroyWindow(hwnd);

1 0

Marcus Meissner : msi: Check the correct pointers for allocation failure ( Coverity).
by Alexandre Julliard June 5, 2009

June 5, 2009

Module: wine Branch: master Commit: 890b5dafb6901923c254e189d8539d4653cb1ab7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=890b5dafb6901923c254e189d… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Jun 5 14:02:36 2009 +0200 msi: Check the correct pointers for allocation failure (Coverity). --- dlls/msi/database.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index 80a2c5d..bc9319e 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -1371,7 +1371,7 @@ static UINT msi_get_table_labels(MSIDATABASE *db, LPCWSTR table, LPWSTR **labels count = MSI_RecordGetFieldCount(prec); *numlabels = count + 1; *labels = msi_alloc((*numlabels)*sizeof(LPWSTR)); - if (!labels) + if (!*labels) { r = ERROR_OUTOFMEMORY; goto end; @@ -1399,7 +1399,7 @@ static UINT msi_get_query_columns(MSIQUERY *query, LPWSTR **columns, DWORD *numc count = MSI_RecordGetFieldCount(prec); *columns = msi_alloc(count*sizeof(LPWSTR)); - if (!columns) + if (!*columns) { r = ERROR_OUTOFMEMORY; goto end; @@ -1428,7 +1428,7 @@ static UINT msi_get_query_types(MSIQUERY *query, LPWSTR **types, DWORD *numtypes count = MSI_RecordGetFieldCount(prec); *types = msi_alloc(count*sizeof(LPWSTR)); - if (!types) + if (!*types) { r = ERROR_OUTOFMEMORY; goto end;

1 0

Paul Vriens : shell32/tests: Fix test failures on Win95.
by Alexandre Julliard June 5, 2009

June 5, 2009

Module: wine Branch: master Commit: e348c842da433d503282c841f333c1902083b0fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=e348c842da433d503282c841f… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Jun 5 13:08:37 2009 +0200 shell32/tests: Fix test failures on Win95. --- dlls/shell32/tests/shlexec.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 216c6d0..469e79f 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -864,7 +864,8 @@ static void test_find_executable(void) ok(rc == SE_ERR_NOASSOC /* >= win2000 */ || rc > 32 /* win98, nt4 */, "FindExecutable(NULL) returned %ld\n", rc); ok(strcmp(command, "your word") != 0, "FindExecutable(NULL) returned command=[%s]\n", command); - sprintf(filename, "%s\\test file.sfe", tmpdir); + /* Win95 can't cope with double backslashes in FindExecutableA (tmpdir has a trailing backslash) */ + sprintf(filename, "%stest file.sfe", tmpdir); rc=(INT_PTR)FindExecutableA(filename, NULL, command); ok(rc > 32, "FindExecutable(%s) returned %ld\n", filename, rc); /* Depending on the platform, command could be '%1' or 'test file.sfe' */ @@ -910,6 +911,10 @@ static void test_find_executable(void) test=filename_tests; while (test->basename) { + /* Win95 can't cope with double slashes/backslashes in FindExecutableA */ + if (tmpdir[strlen(tmpdir) - 1] == '\\') + tmpdir[strlen(tmpdir) - 1] = 0; + sprintf(filename, test->basename, tmpdir); if (strchr(filename, '/')) {

1 0

Nikolay Sivov : ntdll: Make NtQueryFullAttributesFile and NtQueryAttributesFile thin wrappers over an internal function .
by Alexandre Julliard June 5, 2009

June 5, 2009

Module: wine Branch: master Commit: e11c2496c5d40c93f5c7f67bf00d862c288d440a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e11c2496c5d40c93f5c7f67bf… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Jun 5 13:57:29 2009 +0400 ntdll: Make NtQueryFullAttributesFile and NtQueryAttributesFile thin wrappers over an internal function. --- dlls/ntdll/file.c | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 2a8f5fd..3fa6f19 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1965,10 +1965,10 @@ NTSTATUS WINAPI NtSetInformationFile(HANDLE handle, PIO_STATUS_BLOCK io, /****************************************************************************** - * NtQueryFullAttributesFile (NTDLL.@) + * FILE_QueryFullAttributesFile (internal) */ -NTSTATUS WINAPI NtQueryFullAttributesFile( const OBJECT_ATTRIBUTES *attr, - FILE_NETWORK_OPEN_INFORMATION *info ) +static NTSTATUS FILE_QueryFullAttributesFile( const OBJECT_ATTRIBUTES *attr, + FILE_NETWORK_OPEN_INFORMATION *info ) { ANSI_STRING unix_name; NTSTATUS status; @@ -2011,6 +2011,15 @@ NTSTATUS WINAPI NtQueryFullAttributesFile( const OBJECT_ATTRIBUTES *attr, return status; } +/****************************************************************************** + * NtQueryFullAttributesFile (NTDLL.@) + */ +NTSTATUS WINAPI NtQueryFullAttributesFile( const OBJECT_ATTRIBUTES *attr, + FILE_NETWORK_OPEN_INFORMATION *info ) +{ + return FILE_QueryFullAttributesFile( attr, info ); +} + /****************************************************************************** * NtQueryAttributesFile (NTDLL.@) @@ -2021,7 +2030,7 @@ NTSTATUS WINAPI NtQueryAttributesFile( const OBJECT_ATTRIBUTES *attr, FILE_BASIC FILE_NETWORK_OPEN_INFORMATION full_info; NTSTATUS status; - if (!(status = NtQueryFullAttributesFile( attr, &full_info ))) + if (!(status = FILE_QueryFullAttributesFile( attr, &full_info ))) { info->CreationTime.QuadPart = full_info.CreationTime.QuadPart; info->LastAccessTime.QuadPart = full_info.LastAccessTime.QuadPart;

1 0

Marcus Meissner : winegcc: Free two new strlists (Coverity).
by Alexandre Julliard June 5, 2009

June 5, 2009

Module: wine Branch: master Commit: 18738cf89d18c38d9494560f93ea35b14c7368d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18738cf89d18c38d9494560f9… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Jun 5 13:31:36 2009 +0200 winegcc: Free two new strlists (Coverity). --- tools/winegcc/winegcc.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index e9c11ed..e9cd671 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -768,6 +768,8 @@ static void build(struct options* opts) spawn(opts->prefix, link_args, 0); strarray_free (resources); strarray_free (link_args); + strarray_free (lib_dirs); + strarray_free (files); return; }

1 0

Nikolay Sivov : ntdll: Make NtCreateFile and NtOpenFile thin wrappers over an internal function.
by Alexandre Julliard June 5, 2009

June 5, 2009

Module: wine Branch: master Commit: 1880a786d131126220f9784d033eb57a268ebf7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1880a786d131126220f9784d0… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Jun 5 13:56:54 2009 +0400 ntdll: Make NtCreateFile and NtOpenFile thin wrappers over an internal function. --- dlls/ntdll/file.c | 116 ++++++++++++++++++++++++++++++----------------------- 1 files changed, 66 insertions(+), 50 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index ecba665..2a8f5fd 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -90,60 +90,17 @@ mode_t FILE_umask = 0; #define SECSPERDAY 86400 #define SECS_1601_TO_1970 ((369 * 365 + 89) * (ULONGLONG)SECSPERDAY) -/************************************************************************** - * NtOpenFile [NTDLL.@] - * ZwOpenFile [NTDLL.@] - * - * Open a file. - * - * PARAMS - * handle [O] Variable that receives the file handle on return - * access [I] Access desired by the caller to the file - * attr [I] Structure describing the file to be opened - * io [O] Receives details about the result of the operation - * sharing [I] Type of shared access the caller requires - * options [I] Options for the file open - * - * RETURNS - * Success: 0. FileHandle and IoStatusBlock are updated. - * Failure: An NTSTATUS error code describing the error. - */ -NTSTATUS WINAPI NtOpenFile( PHANDLE handle, ACCESS_MASK access, - POBJECT_ATTRIBUTES attr, PIO_STATUS_BLOCK io, - ULONG sharing, ULONG options ) -{ - return NtCreateFile( handle, access, attr, io, NULL, 0, - sharing, FILE_OPEN, options, NULL, 0 ); -} /************************************************************************** - * NtCreateFile [NTDLL.@] - * ZwCreateFile [NTDLL.@] - * - * Either create a new file or directory, or open an existing file, device, - * directory or volume. - * - * PARAMS - * handle [O] Points to a variable which receives the file handle on return - * access [I] Desired access to the file - * attr [I] Structure describing the file - * io [O] Receives information about the operation on return - * alloc_size [I] Initial size of the file in bytes - * attributes [I] Attributes to create the file with - * sharing [I] Type of shared access the caller would like to the file - * disposition [I] Specifies what to do, depending on whether the file already exists - * options [I] Options for creating a new file - * ea_buffer [I] Pointer to an extended attributes buffer - * ea_length [I] Length of ea_buffer + * FILE_CreateFile (internal) + * Open a file. * - * RETURNS - * Success: 0. handle and io are updated. - * Failure: An NTSTATUS error code describing the error. + * Parameter set fully identical with NtCreateFile */ -NTSTATUS WINAPI NtCreateFile( PHANDLE handle, ACCESS_MASK access, POBJECT_ATTRIBUTES attr, - PIO_STATUS_BLOCK io, PLARGE_INTEGER alloc_size, - ULONG attributes, ULONG sharing, ULONG disposition, - ULONG options, PVOID ea_buffer, ULONG ea_length ) +static NTSTATUS FILE_CreateFile( PHANDLE handle, ACCESS_MASK access, POBJECT_ATTRIBUTES attr, + PIO_STATUS_BLOCK io, PLARGE_INTEGER alloc_size, + ULONG attributes, ULONG sharing, ULONG disposition, + ULONG options, PVOID ea_buffer, ULONG ea_length ) { ANSI_STRING unix_name; int created = FALSE; @@ -248,6 +205,65 @@ NTSTATUS WINAPI NtCreateFile( PHANDLE handle, ACCESS_MASK access, POBJECT_ATTRIB return io->u.Status; } +/************************************************************************** + * NtOpenFile [NTDLL.@] + * ZwOpenFile [NTDLL.@] + * + * Open a file. + * + * PARAMS + * handle [O] Variable that receives the file handle on return + * access [I] Access desired by the caller to the file + * attr [I] Structure describing the file to be opened + * io [O] Receives details about the result of the operation + * sharing [I] Type of shared access the caller requires + * options [I] Options for the file open + * + * RETURNS + * Success: 0. FileHandle and IoStatusBlock are updated. + * Failure: An NTSTATUS error code describing the error. + */ +NTSTATUS WINAPI NtOpenFile( PHANDLE handle, ACCESS_MASK access, + POBJECT_ATTRIBUTES attr, PIO_STATUS_BLOCK io, + ULONG sharing, ULONG options ) +{ + return FILE_CreateFile( handle, access, attr, io, NULL, 0, + sharing, FILE_OPEN, options, NULL, 0 ); +} + +/************************************************************************** + * NtCreateFile [NTDLL.@] + * ZwCreateFile [NTDLL.@] + * + * Either create a new file or directory, or open an existing file, device, + * directory or volume. + * + * PARAMS + * handle [O] Points to a variable which receives the file handle on return + * access [I] Desired access to the file + * attr [I] Structure describing the file + * io [O] Receives information about the operation on return + * alloc_size [I] Initial size of the file in bytes + * attributes [I] Attributes to create the file with + * sharing [I] Type of shared access the caller would like to the file + * disposition [I] Specifies what to do, depending on whether the file already exists + * options [I] Options for creating a new file + * ea_buffer [I] Pointer to an extended attributes buffer + * ea_length [I] Length of ea_buffer + * + * RETURNS + * Success: 0. handle and io are updated. + * Failure: An NTSTATUS error code describing the error. + */ +NTSTATUS WINAPI NtCreateFile( PHANDLE handle, ACCESS_MASK access, POBJECT_ATTRIBUTES attr, + PIO_STATUS_BLOCK io, PLARGE_INTEGER alloc_size, + ULONG attributes, ULONG sharing, ULONG disposition, + ULONG options, PVOID ea_buffer, ULONG ea_length ) +{ + return FILE_CreateFile( handle, access, attr, io, alloc_size, attributes, + sharing, disposition, options, ea_buffer, ea_length ); +} + /*********************************************************************** * Asynchronous file I/O * */

1 0

Nikolay Sivov : comctl32/listview: Improve column scrolling.
by Alexandre Julliard June 5, 2009

June 5, 2009

Module: wine Branch: master Commit: 475dcb81f58ed8d479ab3a37a811567d583d7701 URL: http://source.winehq.org/git/wine.git/?a=commit;h=475dcb81f58ed8d479ab3a37a… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Jun 5 13:55:19 2009 +0400 comctl32/listview: Improve column scrolling. --- dlls/comctl32/listview.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 56b244d..dafb914 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4676,11 +4676,14 @@ static void LISTVIEW_ScrollColumns(LISTVIEW_INFO *infoPtr, INT nColumn, INT dx) rcCol.left = rcCol.right; /* adjust the other columns */ - for (nCol = nColumn; nCol < DPA_GetPtrCount(infoPtr->hdpaColumns); nCol++) + for (nCol = 0; nCol < DPA_GetPtrCount(infoPtr->hdpaColumns); nCol++) { lpColumnInfo = LISTVIEW_GetColumnInfo(infoPtr, nCol); - lpColumnInfo->rcHeader.left += dx; - lpColumnInfo->rcHeader.right += dx; + if (lpColumnInfo->rcHeader.left >= rcCol.left) + { + lpColumnInfo->rcHeader.left += dx; + lpColumnInfo->rcHeader.right += dx; + } } /* do not update screen if not in report mode */

1 0

Alexandre Julliard : winegcc: Create a stub main to work around the lack of Unicode support in Mingw.
by Alexandre Julliard June 5, 2009

June 5, 2009

Module: wine Branch: master Commit: 22fef33352c62abf25159831b097c815d0d97471 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22fef33352c62abf25159831b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 5 14:42:32 2009 +0200 winegcc: Create a stub main to work around the lack of Unicode support in Mingw. --- tools/winegcc/winegcc.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 516d2bc..e9c11ed 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -533,6 +533,19 @@ static void add_library( struct options *opts, strarray *lib_dirs, strarray *fil free(fullname); } +/* hack a main or WinMain function to work around Mingw's lack of Unicode support */ +static const char *mingw_unicode_hack( struct options *opts ) +{ + char *main_stub = get_temp_file( opts->output_name, ".c" ); + + create_file( main_stub, 0644, + "#include <stdlib.h>\n" + "extern int wmain(int,wchar_t**);\n" + "int main( int argc, char *argv[] )\n{\n" + " return wmain( argc, __wargv );\n}\n" ); + return compile_to_object( opts, main_stub, NULL ); +} + static void build(struct options* opts) { static const char *stdlibpath[] = { DLLDIR, LIBDIR, "/usr/lib", "/usr/local/lib", "/lib" }; @@ -691,6 +704,9 @@ static void build(struct options* opts) if (opts->image_base) strarray_add(link_args, strmake("-Wl,--image-base,%s", opts->image_base)); + if (opts->unicode_app && !opts->shared) + strarray_add(link_args, mingw_unicode_hack(opts)); + for ( j = 0; j < lib_dirs->size; j++ ) strarray_add(link_args, strmake("-L%s", lib_dirs->base[j]));

1 0

Nikolay Sivov : comctl32/listview: Partially revert commit 43d982fde6b363199c95037935e0f5446df8f733.
by Alexandre Julliard June 5, 2009

June 5, 2009

Module: wine Branch: master Commit: d5319303f18a1f1643612b69d31607a68c02fc3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5319303f18a1f1643612b69d… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Jun 5 13:53:28 2009 +0400 comctl32/listview: Partially revert commit 43d982fde6b363199c95037935e0f5446df8f733. --- dlls/comctl32/listview.c | 2 -- dlls/comctl32/tests/listview.c | 2 +- 2 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index b50bf2b..56b244d 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -5058,8 +5058,6 @@ static HWND LISTVIEW_EditLabelT(LISTVIEW_INFO *infoPtr, INT nItem, BOOL isW) if (~infoPtr->dwStyle & LVS_EDITLABELS) return 0; if (nItem < 0 || nItem >= infoPtr->nItemCount) return 0; - /* Edit could be created only on focused control and if isn't already created */ - if (GetFocus() != infoPtr->hwndSelf && !IsWindow(infoPtr->hwndEdit)) return 0; infoPtr->nEditLabelItem = nItem; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index a8e0b9b..fae24e2 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -2919,7 +2919,7 @@ static void test_editbox(void) /* creating label disabled when control isn't focused */ SetFocus(0); hwndedit = (HWND)SendMessage(hwnd, LVM_EDITLABEL, 0, 0); - ok(hwndedit == NULL, "Expected Edit window not to be created\n"); + todo_wine ok(hwndedit == NULL, "Expected Edit window not to be created\n"); /* check EN_KILLFOCUS handling */ memset(&item, 0, sizeof(item));

1 0

Stephan Rose : gdiplus: Add support for vertical string alignment to GdipDrawString.
by Alexandre Julliard June 5, 2009

June 5, 2009

Module: wine Branch: master Commit: eb3904d02b1d406e960854391e4a5a67d22f9ce7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb3904d02b1d406e960854391… Author: Stephan Rose <kermos(a)somrek.net> Date: Thu Jun 4 18:51:07 2009 -0400 gdiplus: Add support for vertical string alignment to GdipDrawString. --- dlls/gdiplus/graphics.c | 21 +++++++++++++++++---- 1 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 3fedc97..2698159 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2089,7 +2089,7 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string POINT corners[4]; WCHAR* stringdup; REAL angle, ang_cos, ang_sin, rel_width, rel_height; - INT sum = 0, height = 0, fit, fitcpy, save_state, i, j, lret, nwidth, + INT sum = 0, height = 0, offsety = 0, fit, fitcpy, save_state, i, j, lret, nwidth, nheight; SIZE size; RECT drawcoord; @@ -2105,9 +2105,22 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string return NotImplemented; } - if(format) + if(format){ TRACE("may be ignoring some format flags: attr %x\n", format->attr); + /* Should be no need to explicitly test for StringAlignmentNear as + * that is default behavior if no alignment is passed. */ + if(format->vertalign != StringAlignmentNear){ + RectF bounds; + GdipMeasureString(graphics, string, length, font, rect, format, &bounds, 0, 0); + + if(format->vertalign == StringAlignmentCenter) + offsety = (rect->Height - bounds.Height) / 2; + else if(format->vertalign == StringAlignmentFar) + offsety = (rect->Height - bounds.Height); + } + } + if(length == -1) length = lstrlenW(string); stringdup = GdipAlloc(length * sizeof(WCHAR)); @@ -2118,9 +2131,9 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string SetTextColor(graphics->hdc, brush->lb.lbColor); rectcpy[3].X = rectcpy[0].X = rect->X; - rectcpy[1].Y = rectcpy[0].Y = rect->Y; + rectcpy[1].Y = rectcpy[0].Y = rect->Y + offsety; rectcpy[2].X = rectcpy[1].X = rect->X + rect->Width; - rectcpy[3].Y = rectcpy[2].Y = rect->Y + rect->Height; + rectcpy[3].Y = rectcpy[2].Y = rect->Y + offsety + rect->Height; transform_and_round_points(graphics, corners, rectcpy, 4); if (roundr(rect->Width) == 0)

1 0