November 2008 - Wine-Commits

Alexandre Julliard : ntdll: Do not report non-reserved memory areas as free since we don't know what' s in them.
by Alexandre Julliard Nov. 6, 2008

Nov. 6, 2008

Module: wine Branch: master Commit: 1ca7b881d744fe5003b1a00ef8a1e0d601e03caf URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ca7b881d744fe5003b1a00ef… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 6 15:00:58 2008 +0100 ntdll: Do not report non-reserved memory areas as free since we don't know what's in them. --- dlls/ntdll/virtual.c | 57 +++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 50 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 01f78eb..1eb84b8 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1764,6 +1764,43 @@ NTSTATUS WINAPI NtProtectVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T return status; } + +/* retrieve state for a free memory area; callback for wine_mmap_enum_reserved_areas */ +static int get_free_mem_state_callback( void *start, size_t size, void *arg ) +{ + MEMORY_BASIC_INFORMATION *info = arg; + void *end = (char *)start + size; + + if ((char *)info->BaseAddress + info->RegionSize < (char *)start) return 0; + + if (info->BaseAddress >= end) + { + if (info->AllocationBase < end) info->AllocationBase = end; + return 0; + } + + if (info->BaseAddress >= start) + { + /* it's a real free area */ + info->State = MEM_FREE; + info->Protect = PAGE_NOACCESS; + info->AllocationBase = 0; + info->AllocationProtect = 0; + info->Type = 0; + if ((char *)info->BaseAddress + info->RegionSize > (char *)end) + info->RegionSize = (char *)end - (char *)info->BaseAddress; + } + else /* outside of the reserved area, pretend it's allocated */ + { + info->RegionSize = (char *)start - (char *)info->BaseAddress; + info->State = MEM_RESERVE; + info->Protect = PAGE_NOACCESS; + info->AllocationProtect = PAGE_NOACCESS; + info->Type = MEM_PRIVATE; + } + return 1; +} + #define UNIMPLEMENTED_INFO_CLASS(c) \ case c: \ FIXME("(process=%p,addr=%p) Unimplemented information class: " #c "\n", process, addr); \ @@ -1861,13 +1898,20 @@ NTSTATUS WINAPI NtQueryVirtualMemory( HANDLE process, LPCVOID addr, /* Fill the info structure */ + info->AllocationBase = alloc_base; + info->BaseAddress = base; + info->RegionSize = size - (base - alloc_base); + if (!view) { - info->State = MEM_FREE; - info->Protect = PAGE_NOACCESS; - info->AllocationBase = 0; - info->AllocationProtect = 0; - info->Type = 0; + if (!wine_mmap_enum_reserved_areas( get_free_mem_state_callback, info, 0 )) + { + /* not in a reserved area at all, pretend it's allocated */ + info->State = MEM_RESERVE; + info->Protect = PAGE_NOACCESS; + info->AllocationProtect = PAGE_NOACCESS; + info->Type = MEM_PRIVATE; + } } else { @@ -1883,11 +1927,10 @@ NTSTATUS WINAPI NtQueryVirtualMemory( HANDLE process, LPCVOID addr, else info->Type = MEM_MAPPED; for (size = base - alloc_base; size < base + range_size - alloc_base; size += page_size) if (view->prot[size >> page_shift] != vprot) break; + info->RegionSize = size - (base - alloc_base); } server_leave_uninterrupted_section( &csVirtual, &sigset ); - info->BaseAddress = base; - info->RegionSize = size - (base - alloc_base); if (res_len) *res_len = sizeof(*info); return STATUS_SUCCESS; }

1 0

Paul Vriens : user32/tests: Fix some test failures on Win9x and WinMe.
by Alexandre Julliard Nov. 6, 2008

Nov. 6, 2008

Module: wine Branch: master Commit: bb6e59ec7ff41e5751764de9a936c5bf4f455bdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb6e59ec7ff41e5751764de9a… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Nov 6 12:11:55 2008 +0100 user32/tests: Fix some test failures on Win9x and WinMe. --- dlls/user32/tests/cursoricon.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 760348e..d488ef9 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -736,7 +736,9 @@ static void test_LoadImageFile(const unsigned char * image_data, handle = LoadImageA(NULL, filename, IMAGE_CURSOR, 0, 0, LR_LOADFROMFILE); ok(handle == NULL, "LoadImage(%s) as IMAGE_CURSOR succeeded incorrectly.\n", ext); error = GetLastError(); - ok(error == 0, "Last error: %u\n", error); + ok(error == 0 || + broken(error == ERROR_BAD_PATHNAME), /* Win9x, WinMe */ + "Last error: %u\n", error); if (handle != NULL) DestroyCursor(handle); /* Load as icon. For all tested formats, this should fail */ @@ -744,7 +746,9 @@ static void test_LoadImageFile(const unsigned char * image_data, handle = LoadImageA(NULL, filename, IMAGE_ICON, 0, 0, LR_LOADFROMFILE); ok(handle == NULL, "LoadImage(%s) as IMAGE_ICON succeeded incorrectly.\n", ext); error = GetLastError(); - ok(error == 0, "Last error: %u\n", error); + ok(error == 0 || + broken(error == ERROR_BAD_PATHNAME), /* Win9x, WinMe */ + "Last error: %u\n", error); if (handle != NULL) DestroyIcon(handle); /* Load as bitmap. Should succeed if bmp, fail for everything else */ @@ -754,7 +758,9 @@ static void test_LoadImageFile(const unsigned char * image_data, ok(handle != NULL, "LoadImage(%s) as IMAGE_BITMAP failed.\n", ext); else ok(handle == NULL, "LoadImage(%s) as IMAGE_BITMAP succeeded incorrectly.\n", ext); error = GetLastError(); - ok(error == 0, "Last error: %u\n", error); + ok(error == 0 || + error == 0xdeadbeef, /* Win9x, WinMe */ + "Last error: %u\n", error); if (handle != NULL) DeleteObject(handle); DeleteFileA(filename); @@ -815,7 +821,9 @@ static void test_LoadImage(void) handle = LoadImageA(NULL, "icon.ico", IMAGE_CURSOR, 0, 0, LR_LOADFROMFILE); ok(handle != NULL, "LoadImage() failed.\n"); error = GetLastError(); - ok(error == 0, "Last error: %u\n", error); + ok(error == 0 || + broken(error == ERROR_BAD_PATHNAME), /* Win9x, WinMe */ + "Last error: %u\n", error); /* Test the icon information. */ SetLastError(0xdeadbeef);

1 0

Alexandre Julliard : ntdll: Keep track of the current working set limit independently of system views that may be allocated beyond it .
by Alexandre Julliard Nov. 6, 2008

Nov. 6, 2008

Module: wine Branch: master Commit: eb96fbf346539aad4cd21f7e1e9c7902db626fe9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb96fbf346539aad4cd21f7e1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 6 11:42:58 2008 +0100 ntdll: Keep track of the current working set limit independently of system views that may be allocated beyond it. --- dlls/ntdll/virtual.c | 24 ++++++++---------------- 1 files changed, 8 insertions(+), 16 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 6fd8631..01f78eb 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -120,12 +120,14 @@ static RTL_CRITICAL_SECTION csVirtual = { &critsect_debug, -1, 0, 0, 0, 0 }; /* Note: these are Windows limits, you cannot change them. */ static void *address_space_limit = (void *)0xc0000000; /* top of the total available address space */ static void *user_space_limit = (void *)0x7fff0000; /* top of the user address space */ +static void *working_set_limit = (void *)0x7fff0000; /* top of the current working set */ #else static UINT page_shift; static UINT page_size; static UINT_PTR page_mask; static void * const address_space_limit = 0; /* no limit needed on other platforms */ static void * const user_space_limit = 0; /* no limit needed on other platforms */ +static void * const working_set_limit = 0; /* no limit needed on other platforms */ #endif /* __i386__ */ #define ROUND_ADDR(addr,mask) \ @@ -710,6 +712,7 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size, return STATUS_INVALID_PARAMETER; break; } + if (is_beyond_limit( ptr, size, working_set_limit )) working_set_limit = address_space_limit; } else { @@ -1461,7 +1464,7 @@ void VIRTUAL_UseLargeAddressSpace(void) { /* no large address space on win9x */ if (NtCurrentTeb()->Peb->OSPlatformId != VER_PLATFORM_WIN32_NT) return; - user_space_limit = address_space_limit; + user_space_limit = working_set_limit = address_space_limit; } @@ -1510,7 +1513,7 @@ NTSTATUS WINAPI NtAllocateVirtualMemory( HANDLE process, PVOID *ret, ULONG zero_ /* Round parameters to a page boundary */ - if (size > 0x7fc00000) return STATUS_WORKING_SET_LIMIT_RANGE; /* 2Gb - 4Mb */ + if (is_beyond_limit( 0, size, working_set_limit )) return STATUS_WORKING_SET_LIMIT_RANGE; if (*ret) { @@ -1795,8 +1798,6 @@ NTSTATUS WINAPI NtQueryVirtualMemory( HANDLE process, LPCVOID addr, return STATUS_INVALID_INFO_CLASS; } } - if (address_space_limit && addr >= address_space_limit) - return STATUS_WORKING_SET_LIMIT_RANGE; if (process != NtCurrentProcess()) { @@ -1827,6 +1828,8 @@ NTSTATUS WINAPI NtQueryVirtualMemory( HANDLE process, LPCVOID addr, base = ROUND_ADDR( addr, page_mask ); + if (is_beyond_limit( base, 1, working_set_limit )) return STATUS_WORKING_SET_LIMIT_RANGE; + /* Find the view containing the address */ server_enter_uninterrupted_section( &csVirtual, &sigset ); @@ -1835,18 +1838,7 @@ NTSTATUS WINAPI NtQueryVirtualMemory( HANDLE process, LPCVOID addr, { if (!ptr) { - /* make the address space end at the user limit, except if - * the last view was mapped beyond that */ - if (alloc_base <= (char *)user_space_limit) - { - if (user_space_limit && base >= (char *)user_space_limit) - { - server_leave_uninterrupted_section( &csVirtual, &sigset ); - return STATUS_WORKING_SET_LIMIT_RANGE; - } - size = (char *)user_space_limit - alloc_base; - } - else size = (char *)address_space_limit - alloc_base; + size = (char *)working_set_limit - alloc_base; view = NULL; break; }

1 0

Sergey Khodych : comctl32: toolbar: Calculate a correct size for empty buttons with the BTNS_AUTOSIZE style.
by Alexandre Julliard Nov. 6, 2008

Nov. 6, 2008

Module: wine Branch: master Commit: 1232b08449f7fa7c0218a23564bfa7d30fa30267 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1232b08449f7fa7c0218a2356… Author: Sergey Khodych <khodych(a)gmail.com> Date: Tue Nov 4 21:02:59 2008 +0200 comctl32: toolbar: Calculate a correct size for empty buttons with the BTNS_AUTOSIZE style. --- dlls/comctl32/tests/toolbar.c | 13 +++++++++++++ dlls/comctl32/toolbar.c | 4 ++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index e648ed8..94ee0d3 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -718,6 +718,9 @@ static tbsize_result_t tbsize_results[] = { 0, 0, 163, 38}, {163, 0, 326, 38}, {326, 0, 489, 38}, {489, 0, 652, 38}, {652, 0, 819, 38}, {819, 0, 850, 38}, }, }, + { {0, 0, 672, 100}, {239, 102}, 3, { + { 0, 2, 100, 102}, {100, 2, 139, 102}, {139, 2, 239, 102}, + }, }, }; static int tbsize_numtests = 0; @@ -943,6 +946,16 @@ static void test_sizes(void) SendMessageA(hToolbar, TB_DELETEBUTTON, 0, 0); ok(SendMessageA(hToolbar, TB_GETBUTTONSIZE, 0, 0) == MAKELONG(27, 39), "Unexpected button size\n"); + rebuild_toolbar(&hToolbar); + + ok(SendMessageA(hToolbar, TB_SETBITMAPSIZE, (WPARAM)0, (LPARAM) MAKELONG (32, 32) ) == 1, "TB_SETBITMAPSIZE failed\n"); + ok(SendMessageA(hToolbar, TB_SETBUTTONSIZE, (WPARAM)0, (LPARAM)MAKELONG(100, 100)) == 1, "TB_SETBUTTONSIZE failed\n"); + ok(SendMessageA(hToolbar, TB_ADDBUTTONS, (WPARAM)1, (LPARAM)&buttons2[0]) == 1, "TB_ADDBUTTONS failed\n"); + ok(SendMessageA(hToolbar, TB_ADDBUTTONS, (WPARAM)1, (LPARAM)&buttons3[2]) == 1, "TB_ADDBUTTONS failed\n"); + ok(SendMessageA(hToolbar, TB_ADDBUTTONS, (WPARAM)1, (LPARAM)&buttons3[0]) == 1, "TB_ADDBUTTONS failed\n"); + SendMessageA(hToolbar, TB_AUTOSIZE, (WPARAM)0, (LPARAM)0 ); + check_sizes(); + DestroyWindow(hToolbar); } diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index c2f602f..397843f 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -1598,8 +1598,8 @@ static inline SIZE TOOLBAR_MeasureButton(const TOOLBAR_INFO *infoPtr, SIZE sizeS { sizeButton.cy = sizeString.cy + infoPtr->szPadding.cy + NONLIST_NOTEXT_OFFSET; - sizeButton.cx = 2*GetSystemMetrics(SM_CXEDGE) + - infoPtr->szPadding.cx + sizeString.cx; + sizeButton.cx = infoPtr->szPadding.cx + + max(2*GetSystemMetrics(SM_CXEDGE) + sizeString.cx, infoPtr->nBitmapWidth); } } return sizeButton;

1 0

Sergey Khodych : comctl32: toolbar: Use a cx field for buttons in TOOLBAR_WrapToolbar.
by Alexandre Julliard Nov. 6, 2008

Nov. 6, 2008

Module: wine Branch: master Commit: 7f25cd993c5cdafd51cba449e7dc87f986122804 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f25cd993c5cdafd51cba449e… Author: Sergey Khodych <khodych(a)gmail.com> Date: Wed Nov 5 03:26:49 2008 +0200 comctl32: toolbar: Use a cx field for buttons in TOOLBAR_WrapToolbar. --- dlls/comctl32/tests/toolbar.c | 16 ++++++++++++++++ dlls/comctl32/toolbar.c | 2 +- 2 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index aebf8e5..a0c061c 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -727,6 +727,9 @@ static tbsize_result_t tbsize_results[] = { {0, 0, 672, 42}, {67, 40}, 1, { { 0, 2, 67, 40}, }, }, + { {0, 0, 672, 42}, {67, 41}, 2, { + { 0, 2, 672, 41}, { 0, 41, 672, 80}, + }, }, }; static int tbsize_numtests = 0; @@ -775,6 +778,7 @@ static void test_sizes(void) { HWND hToolbar = NULL; HIMAGELIST himl; + TBBUTTONINFO tbinfo; int style; int i; @@ -980,6 +984,18 @@ static void test_sizes(void) SendMessageA(hToolbar, TB_AUTOSIZE, (WPARAM)0, (LPARAM)0 ); check_sizes(); + rebuild_toolbar(&hToolbar); + SetWindowLong(hToolbar, GWL_STYLE, TBSTYLE_WRAPABLE | GetWindowLong(hToolbar, GWL_STYLE)); + ok(SendMessageA(hToolbar, TB_ADDBUTTONS, (WPARAM)1, (LPARAM)&buttons3[3]) == 1, "TB_ADDBUTTONS failed\n"); + ok(SendMessageA(hToolbar, TB_ADDBUTTONS, (WPARAM)1, (LPARAM)&buttons3[3]) == 1, "TB_ADDBUTTONS failed\n"); + tbinfo.cx = 672; + tbinfo.cbSize = sizeof(TBBUTTONINFO); + tbinfo.dwMask = TBIF_SIZE | TBIF_BYINDEX; + ok(SendMessageA(hToolbar, TB_SETBUTTONINFO, (WPARAM)0, (LPARAM)&tbinfo) != 0, "TB_SETBUTTONINFO failed\n"); + ok(SendMessageA(hToolbar, TB_SETBUTTONINFO, (WPARAM)1, (LPARAM)&tbinfo) != 0, "TB_SETBUTTONINFO failed\n"); + SendMessageA(hToolbar, TB_AUTOSIZE, (WPARAM)0, (LPARAM)0); + check_sizes(); + DestroyWindow(hToolbar); } diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 317b21c..8e30df0 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -1329,7 +1329,7 @@ TOOLBAR_WrapToolbar( HWND hwnd, DWORD dwStyle ) cx = (btnPtr[i].iBitmap > 0) ? btnPtr[i].iBitmap : SEPARATOR_WIDTH; else - cx = infoPtr->nButtonWidth; + cx = (btnPtr[i].cx) ? btnPtr[i].cx : infoPtr->nButtonWidth; /* Two or more adjacent separators form a separator group. */ /* The first separator in a group should be wrapped to the */

1 0

Sergey Khodych : comctl32: toolbar: Improve text layout in TBSTYLE_LIST toolbars.
by Alexandre Julliard Nov. 6, 2008

Nov. 6, 2008

Module: wine Branch: master Commit: 65e9a6e02e16d6c98721984a64c1ca7d64fd0a5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=65e9a6e02e16d6c98721984a6… Author: Sergey Khodych <khodych(a)gmail.com> Date: Tue Nov 4 21:22:18 2008 +0200 comctl32: toolbar: Improve text layout in TBSTYLE_LIST toolbars. --- dlls/comctl32/tests/toolbar.c | 24 ++++++++++++++++++++++++ dlls/comctl32/toolbar.c | 17 ++++++----------- 2 files changed, 30 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 94ee0d3..aebf8e5 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -721,6 +721,12 @@ static tbsize_result_t tbsize_results[] = { {0, 0, 672, 100}, {239, 102}, 3, { { 0, 2, 100, 102}, {100, 2, 139, 102}, {139, 2, 239, 102}, }, }, + { {0, 0, 672, 42}, {183, 40}, 3, { + { 0, 2, 75, 40}, {75, 2, 118, 40}, {118, 2, 183, 40}, + }, }, + { {0, 0, 672, 42}, {67, 40}, 1, { + { 0, 2, 67, 40}, + }, }, }; static int tbsize_numtests = 0; @@ -956,6 +962,24 @@ static void test_sizes(void) SendMessageA(hToolbar, TB_AUTOSIZE, (WPARAM)0, (LPARAM)0 ); check_sizes(); + rebuild_toolbar(&hToolbar); + SetWindowLong(hToolbar, GWL_STYLE, TBSTYLE_LIST | GetWindowLong(hToolbar, GWL_STYLE)); + ok(SendMessageA(hToolbar, TB_SETBITMAPSIZE, (WPARAM)0, (LPARAM) MAKELONG (32, 32) ) == 1, "TB_SETBITMAPSIZE failed\n"); + ok(SendMessageA(hToolbar, TB_SETBUTTONSIZE, (WPARAM)0, (LPARAM)MAKELONG(100, 100)) == 1, "TB_SETBUTTONSIZE failed\n"); + ok(SendMessageA(hToolbar, TB_ADDBUTTONS, (WPARAM)1, (LPARAM)&buttons2[0]) == 1, "TB_ADDBUTTONS failed\n"); + ok(SendMessageA(hToolbar, TB_ADDBUTTONS, (WPARAM)1, (LPARAM)&buttons3[2]) == 1, "TB_ADDBUTTONS failed\n"); + ok(SendMessageA(hToolbar, TB_ADDBUTTONS, (WPARAM)1, (LPARAM)&buttons3[3]) == 1, "TB_ADDBUTTONS failed\n"); + SendMessageA(hToolbar, TB_AUTOSIZE, (WPARAM)0, (LPARAM)0 ); + check_sizes_todo(0xff); + + rebuild_toolbar(&hToolbar); + SetWindowLong(hToolbar, GWL_STYLE, TBSTYLE_LIST | GetWindowLong(hToolbar, GWL_STYLE)); + ok(SendMessageA(hToolbar, TB_SETBITMAPSIZE, (WPARAM)0, (LPARAM) MAKELONG (32, 32) ) == 1, "TB_SETBITMAPSIZE failed\n"); + ok(SendMessageA(hToolbar, TB_SETBUTTONSIZE, (WPARAM)0, (LPARAM)MAKELONG(100, 100)) == 1, "TB_SETBUTTONSIZE failed\n"); + ok(SendMessageA(hToolbar, TB_ADDBUTTONS, (WPARAM)1, (LPARAM)&buttons3[3]) == 1, "TB_ADDBUTTONS failed\n"); + SendMessageA(hToolbar, TB_AUTOSIZE, (WPARAM)0, (LPARAM)0 ); + check_sizes(); + DestroyWindow(hToolbar); } diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 397843f..317b21c 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -912,8 +912,7 @@ TOOLBAR_DrawButton (HWND hwnd, TBUTTON_INFO *btnPtr, HDC hdc, DWORD dwBaseCustDr rcText.right -= GetSystemMetrics(SM_CXEDGE); if (dwStyle & TBSTYLE_LIST) { - if (TOOLBAR_IsValidBitmapIndex(infoPtr,btnPtr->iBitmap)) - rcText.left += infoPtr->nBitmapWidth + infoPtr->iListGap + 2; + rcText.left += infoPtr->nBitmapWidth + infoPtr->iListGap + 2; } else { @@ -1574,15 +1573,11 @@ static inline SIZE TOOLBAR_MeasureButton(const TOOLBAR_INFO *infoPtr, SIZE sizeS sizeButton.cy += infoPtr->szPadding.cy; /* calculate button width */ - if (bHasBitmap) - { - sizeButton.cx = 2*GetSystemMetrics(SM_CXEDGE) + - infoPtr->nBitmapWidth + infoPtr->iListGap; - if (sizeString.cx > 0) - sizeButton.cx += sizeString.cx + infoPtr->szPadding.cx; - } - else - sizeButton.cx = sizeString.cx + infoPtr->szPadding.cx; + sizeButton.cx = 2*GetSystemMetrics(SM_CXEDGE) + + infoPtr->nBitmapWidth + infoPtr->iListGap; + if (sizeString.cx > 0) + sizeButton.cx += sizeString.cx + infoPtr->szPadding.cx; + } else {

1 0

Alexandre Julliard : kernel32/tests: Fix a few more errors on Win9x.
by Alexandre Julliard Nov. 6, 2008

Nov. 6, 2008

Module: wine Branch: master Commit: cc49f6ba8b61ed1be22470afbf8094a0edb5bcfe URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc49f6ba8b61ed1be22470afb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 6 11:23:16 2008 +0100 kernel32/tests: Fix a few more errors on Win9x. --- dlls/kernel32/tests/virtual.c | 90 +++++++++++++++++++++++++++++----------- 1 files changed, 65 insertions(+), 25 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 2c30973..3e09362 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -529,21 +529,42 @@ static void test_MapViewOfFile(void) ok(ret, "VirtualQuery failed with error %d\n", GetLastError()); ok(info.BaseAddress == ptr, "BaseAddress should have been %p but was %p instead\n", ptr, info.BaseAddress); ok(info.AllocationBase == ptr, "AllocationBase should have been %p but was %p instead\n", ptr, info.AllocationBase); - ok(info.AllocationProtect == PAGE_READWRITE, "AllocationProtect should have been PAGE_READWRITE but was 0x%x\n", info.AllocationProtect); ok(info.RegionSize == MAPPING_SIZE, "RegionSize should have been 0x%x but was 0x%x\n", MAPPING_SIZE, (unsigned int)info.RegionSize); ok(info.State == MEM_RESERVE, "State should have been MEM_RESERVE instead of 0x%x\n", info.State); - ok(info.Protect == 0, "Protect should have been 0 instead of 0x%x\n", info.Protect); - ok(info.Type == MEM_MAPPED, "Type should have been MEM_MAPPED instead of 0x%x\n", info.Type); + if (info.Type == MEM_PRIVATE) /* win9x is different for uncommitted mappings */ + { + ok(info.AllocationProtect == PAGE_NOACCESS, + "AllocationProtect should have been PAGE_NOACCESS but was 0x%x\n", info.AllocationProtect); + ok(info.Protect == PAGE_NOACCESS, + "Protect should have been PAGE_NOACCESS instead of 0x%x\n", info.Protect); + } + else + { + ok(info.AllocationProtect == PAGE_READWRITE, + "AllocationProtect should have been PAGE_READWRITE but was 0x%x\n", info.AllocationProtect); + ok(info.Protect == 0, "Protect should have been 0 instead of 0x%x\n", info.Protect); + ok(info.Type == MEM_MAPPED, "Type should have been MEM_MAPPED instead of 0x%x\n", info.Type); + } - ret = VirtualQuery(ptr2, &info, sizeof(info)); - ok(ret, "VirtualQuery failed with error %d\n", GetLastError()); - ok(info.BaseAddress == ptr2, "BaseAddress should have been %p but was %p instead\n", ptr2, info.BaseAddress); - ok(info.AllocationBase == ptr2, "AllocationBase should have been %p but was %p instead\n", ptr2, info.AllocationBase); - ok(info.AllocationProtect == PAGE_READWRITE, "AllocationProtect should have been PAGE_READWRITE but was 0x%x\n", info.AllocationProtect); - ok(info.RegionSize == MAPPING_SIZE, "RegionSize should have been 0x%x but was 0x%x\n", MAPPING_SIZE, (unsigned int)info.RegionSize); - ok(info.State == MEM_RESERVE, "State should have been MEM_RESERVE instead of 0x%x\n", info.State); - ok(info.Protect == 0, "Protect should have been 0 instead of 0x%x\n", info.Protect); - ok(info.Type == MEM_MAPPED, "Type should have been MEM_MAPPED instead of 0x%x\n", info.Type); + if (ptr != ptr2) + { + ret = VirtualQuery(ptr2, &info, sizeof(info)); + ok(ret, "VirtualQuery failed with error %d\n", GetLastError()); + ok(info.BaseAddress == ptr2, + "BaseAddress should have been %p but was %p instead\n", ptr2, info.BaseAddress); + ok(info.AllocationBase == ptr2, + "AllocationBase should have been %p but was %p instead\n", ptr2, info.AllocationBase); + ok(info.AllocationProtect == PAGE_READWRITE, + "AllocationProtect should have been PAGE_READWRITE but was 0x%x\n", info.AllocationProtect); + ok(info.RegionSize == MAPPING_SIZE, + "RegionSize should have been 0x%x but was 0x%x\n", MAPPING_SIZE, (unsigned int)info.RegionSize); + ok(info.State == MEM_RESERVE, + "State should have been MEM_RESERVE instead of 0x%x\n", info.State); + ok(info.Protect == 0, + "Protect should have been 0 instead of 0x%x\n", info.Protect); + ok(info.Type == MEM_MAPPED, + "Type should have been MEM_MAPPED instead of 0x%x\n", info.Type); + } ptr = VirtualAlloc(ptr, 0x10000, MEM_COMMIT, PAGE_READONLY); ok(ptr != NULL, "VirtualAlloc failed with error %d\n", GetLastError()); @@ -552,28 +573,47 @@ static void test_MapViewOfFile(void) ok(ret, "VirtualQuery failed with error %d\n", GetLastError()); ok(info.BaseAddress == ptr, "BaseAddress should have been %p but was %p instead\n", ptr, info.BaseAddress); ok(info.AllocationBase == ptr, "AllocationBase should have been %p but was %p instead\n", ptr, info.AllocationBase); - ok(info.AllocationProtect == PAGE_READWRITE, "AllocationProtect should have been PAGE_READWRITE but was 0x%x\n", info.AllocationProtect); ok(info.RegionSize == 0x10000, "RegionSize should have been 0x10000 but was 0x%x\n", (unsigned int)info.RegionSize); ok(info.State == MEM_COMMIT, "State should have been MEM_RESERVE instead of 0x%x\n", info.State); ok(info.Protect == PAGE_READONLY, "Protect should have been 0 instead of 0x%x\n", info.Protect); - ok(info.Type == MEM_MAPPED, "Type should have been MEM_MAPPED instead of 0x%x\n", info.Type); + if (info.Type == MEM_PRIVATE) /* win9x is different for uncommitted mappings */ + { + ok(info.AllocationProtect == PAGE_NOACCESS, + "AllocationProtect should have been PAGE_NOACCESS but was 0x%x\n", info.AllocationProtect); + } + else + { + ok(info.AllocationProtect == PAGE_READWRITE, + "AllocationProtect should have been PAGE_READWRITE but was 0x%x\n", info.AllocationProtect); + ok(info.Type == MEM_MAPPED, "Type should have been MEM_MAPPED instead of 0x%x\n", info.Type); + } /* shows that the VirtualAlloc above affects the mapping, not just the * virtual memory in this process - it also affects all other processes * with a view of the mapping, but that isn't tested here */ - ret = VirtualQuery(ptr2, &info, sizeof(info)); - ok(ret, "VirtualQuery failed with error %d\n", GetLastError()); - ok(info.BaseAddress == ptr2, "BaseAddress should have been %p but was %p instead\n", ptr2, info.BaseAddress); - ok(info.AllocationBase == ptr2, "AllocationBase should have been %p but was %p instead\n", ptr2, info.AllocationBase); - ok(info.AllocationProtect == PAGE_READWRITE, "AllocationProtect should have been PAGE_READWRITE but was 0x%x\n", info.AllocationProtect); - ok(info.RegionSize == 0x10000, "RegionSize should have been 0x10000 but was 0x%x\n", (unsigned int)info.RegionSize); - ok(info.State == MEM_COMMIT, "State should have been MEM_RESERVE instead of 0x%x\n", info.State); - ok(info.Protect == PAGE_READWRITE, "Protect should have been 0 instead of 0x%x\n", info.Protect); - ok(info.Type == MEM_MAPPED, "Type should have been MEM_MAPPED instead of 0x%x\n", info.Type); + if (ptr != ptr2) + { + ret = VirtualQuery(ptr2, &info, sizeof(info)); + ok(ret, "VirtualQuery failed with error %d\n", GetLastError()); + ok(info.BaseAddress == ptr2, + "BaseAddress should have been %p but was %p instead\n", ptr2, info.BaseAddress); + ok(info.AllocationBase == ptr2, + "AllocationBase should have been %p but was %p instead\n", ptr2, info.AllocationBase); + ok(info.AllocationProtect == PAGE_READWRITE, + "AllocationProtect should have been PAGE_READWRITE but was 0x%x\n", info.AllocationProtect); + ok(info.RegionSize == 0x10000, + "RegionSize should have been 0x10000 but was 0x%x\n", (unsigned int)info.RegionSize); + ok(info.State == MEM_COMMIT, + "State should have been MEM_RESERVE instead of 0x%x\n", info.State); + ok(info.Protect == PAGE_READWRITE, + "Protect should have been 0 instead of 0x%x\n", info.Protect); + ok(info.Type == MEM_MAPPED, "Type should have been MEM_MAPPED instead of 0x%x\n", info.Type); + } ret = VirtualFree( ptr, 0x10000, MEM_DECOMMIT ); - ok( !ret, "VirtualFree succeeded\n" ); - ok( GetLastError() == ERROR_INVALID_PARAMETER, "VirtualFree failed with %u\n", GetLastError() ); + ok( !ret || broken(ret) /* win9x */, "VirtualFree succeeded\n" ); + if (!ret) + ok( GetLastError() == ERROR_INVALID_PARAMETER, "VirtualFree failed with %u\n", GetLastError() ); ret = UnmapViewOfFile(ptr2); ok(ret, "UnmapViewOfFile failed with error %d\n", GetLastError());

1 0

Paul Vriens : rsaenh/tests: Fix a test failure on NT4 and below.
by Alexandre Julliard Nov. 6, 2008

Nov. 6, 2008

Module: wine Branch: master Commit: 9a2fdfd66b11cf611f674fea0d6a1f0ccdd0162d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a2fdfd66b11cf611f674fea0… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Nov 6 09:52:02 2008 +0100 rsaenh/tests: Fix a test failure on NT4 and below. --- dlls/rsaenh/tests/rsaenh.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 3755323..c1ab31d 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -379,7 +379,10 @@ static void test_hashes(void) /* Can't add data after the hash been retrieved */ SetLastError(0xdeadbeef); result = CryptHashData(hHash, (BYTE*)pbData, sizeof(pbData), 0); - ok(!result && GetLastError() == NTE_BAD_HASH_STATE, "%08x\n", GetLastError()); + ok(!result, "Expected failure\n"); + ok(GetLastError() == NTE_BAD_HASH_STATE || + GetLastError() == NTE_BAD_ALGID, /* Win9x, WinMe, NT4 */ + "Expected NTE_BAD_HASH_STATE or NTE_BAD_ALGID, got %08x\n", GetLastError()); /* You can still retrieve the hash, its value just hasn't changed */ result = CryptGetHashParam(hHash, HP_HASHVAL, pbHashValue, &len, 0);

1 0

Jeff Zaroyko : ws2_32: Test WSAAccept optional callback parameter before trying to use it.
by Alexandre Julliard Nov. 6, 2008

Nov. 6, 2008

Module: wine Branch: master Commit: 75e511f3a7ac27418116fed1d2f9179ad93b557c URL: http://source.winehq.org/git/wine.git/?a=commit;h=75e511f3a7ac27418116fed1d… Author: Jeff Zaroyko <jeffz(a)jeffz.name> Date: Thu Nov 6 19:35:43 2008 +1100 ws2_32: Test WSAAccept optional callback parameter before trying to use it. --- dlls/ws2_32/socket.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index afa33ac..bc971f1 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4386,6 +4386,8 @@ SOCKET WINAPI WSAAccept( SOCKET s, struct WS_sockaddr *addr, LPINT addrlen, if (cs == SOCKET_ERROR) return SOCKET_ERROR; + if (!lpfnCondition) return cs; + CallerId.buf = (char *)&src_addr; CallerId.len = sizeof(src_addr); @@ -4428,7 +4430,7 @@ SOCKET WINAPI WSAAccept( SOCKET s, struct WS_sockaddr *addr, LPINT addrlen, FIXME("Unknown return type from Condition function\n"); SetLastError(WSAENOTSOCK); return SOCKET_ERROR; - } + } } /***********************************************************************

1 0

Dmitry Timoshkov : gdi32: Fix a broken test.
by Alexandre Julliard Nov. 6, 2008

Nov. 6, 2008

Module: wine Branch: master Commit: 25a180372055d468e5c0503c044f828da17390c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25a180372055d468e5c0503c0… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Nov 6 15:10:17 2008 +0800 gdi32: Fix a broken test. --- dlls/gdi32/tests/font.c | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 48a8fe5..f2fde19 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1589,10 +1589,12 @@ static INT CALLBACK arial_enum_proc(const LOGFONT *lf, const TEXTMETRIC *tm, DWO { struct enum_font_data *efd = (struct enum_font_data *)lParam; + ok(lf->lfHeight == tm->tmHeight, "lfHeight %d != tmHeight %d\n", lf->lfHeight, tm->tmHeight); + if (type != TRUETYPE_FONTTYPE) return 1; #if 0 - trace("enumed font \"%s\", charset %d, weight %d, italic %d\n", - lf->lfFaceName, lf->lfCharSet, lf->lfWeight, lf->lfItalic); + trace("enumed font \"%s\", charset %d, height %d, weight %d, italic %d\n", + lf->lfFaceName, lf->lfCharSet, lf->lfHeight, lf->lfWeight, lf->lfItalic); #endif if (efd->total < MAX_ENUM_FONTS) efd->lf[efd->total++] = *lf; @@ -1606,8 +1608,13 @@ static INT CALLBACK arial_enum_procw(const LOGFONTW *lf, const TEXTMETRICW *tm, { struct enum_font_dataW *efd = (struct enum_font_dataW *)lParam; - if (type != TRUETYPE_FONTTYPE) return 1; + ok(lf->lfHeight == tm->tmHeight, "lfHeight %d != tmHeight %d\n", lf->lfHeight, tm->tmHeight); + if (type != TRUETYPE_FONTTYPE) return 1; +#if 0 + trace("enumed font \"%s\", charset %d, height %d, weight %d, italic %d\n", + lf->lfFaceName, lf->lfCharSet, lf->lfHeight, lf->lfWeight, lf->lfItalic); +#endif if (efd->total < MAX_ENUM_FONTS) efd->lf[efd->total++] = *lf; else @@ -1697,7 +1704,7 @@ static void test_EnumFontFamilies(const char *font_name, INT font_charset) * Use EnumFontFamiliesW since win98 crashes when the * second parameter is NULL using EnumFontFamilies */ - efd.total = 0; + efdw.total = 0; SetLastError(0xdeadbeef); ret = EnumFontFamiliesW(hdc, NULL, arial_enum_procw, (LPARAM)&efdw); ok(ret || GetLastError() == ERROR_CALL_NOT_IMPLEMENTED, "EnumFontFamiliesW error %u\n", GetLastError()); @@ -1706,13 +1713,13 @@ static void test_EnumFontFamilies(const char *font_name, INT font_charset) get_charset_statsW(&efdw, &ansi_charset, &symbol_charset, &russian_charset); trace("enumerated ansi %d, symbol %d, russian %d fonts for NULL\n", ansi_charset, symbol_charset, russian_charset); - ok(efd.total == 0, "fonts enumerated: NULL\n"); + ok(efdw.total > 0, "fonts enumerated: NULL\n"); ok(ansi_charset > 0, "NULL family should enumerate ANSI_CHARSET\n"); ok(symbol_charset > 0, "NULL family should enumerate SYMBOL_CHARSET\n"); ok(russian_charset > 0, "NULL family should enumerate RUSSIAN_CHARSET\n"); } - efd.total = 0; + efdw.total = 0; SetLastError(0xdeadbeef); ret = EnumFontFamiliesExW(hdc, NULL, arial_enum_procw, (LPARAM)&efdw, 0); ok(ret || GetLastError() == ERROR_CALL_NOT_IMPLEMENTED, "EnumFontFamiliesExW error %u\n", GetLastError()); @@ -1721,7 +1728,7 @@ static void test_EnumFontFamilies(const char *font_name, INT font_charset) get_charset_statsW(&efdw, &ansi_charset, &symbol_charset, &russian_charset); trace("enumerated ansi %d, symbol %d, russian %d fonts for NULL\n", ansi_charset, symbol_charset, russian_charset); - ok(efd.total == 0, "fonts enumerated: NULL\n"); + ok(efdw.total > 0, "fonts enumerated: NULL\n"); ok(ansi_charset > 0, "NULL family should enumerate ANSI_CHARSET\n"); ok(symbol_charset > 0, "NULL family should enumerate SYMBOL_CHARSET\n"); ok(russian_charset > 0, "NULL family should enumerate RUSSIAN_CHARSET\n");

1 0