February 2020 - Wine-commits

Nikolay Sivov : xmllite/tests: Get rid of strcmp_wa().
by Alexandre Julliard 07 Feb '20

07 Feb '20

Module: wine Branch: master Commit: 5066a678351c6930656ef586046130d8efe64ba1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5066a678351c6930656ef586… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 7 17:52:19 2020 +0300 xmllite/tests: Get rid of strcmp_wa(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/reader.c | 395 +++++++++++++++++++++----------------------- 1 file changed, 186 insertions(+), 209 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5066a678351c6930656e…

1 0

Nikolay Sivov : shell32/tests: Get rid of strcmp_wa().
by Alexandre Julliard 07 Feb '20

07 Feb '20

Module: wine Branch: master Commit: 5b7dc90efb1aba519b9d3cc2d279580059931958 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b7dc90efb1aba519b9d3cc2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 7 19:33:06 2020 +0300 shell32/tests: Get rid of strcmp_wa(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlfolder.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 14d243a03b..c9606c6f10 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -83,13 +83,6 @@ static WCHAR *make_wstr(const char *str) return ret; } -static int strcmp_wa(LPCWSTR strw, const char *stra) -{ - CHAR buf[512]; - WideCharToMultiByte(CP_ACP, 0, strw, -1, buf, sizeof(buf), NULL, NULL); - return lstrcmpA(stra, buf); -} - static void init_function_pointers(void) { HMODULE hmod; @@ -4503,10 +4496,13 @@ static void r_verify_pidl(unsigned l, LPCITEMIDLIST pidl, const WCHAR *path) "didn't get expected path (%s), instead: %s\n", wine_dbgstr_w(path), wine_dbgstr_w(U(filename).pOleStr)); SHFree(U(filename).pOleStr); - }else if(filename.uType == STRRET_CSTR){ - ok_(__FILE__,l)(strcmp_wa(path, U(filename).cStr) == 0, - "didn't get expected path (%s), instead: %s\n", + } + else if(filename.uType == STRRET_CSTR) + { + WCHAR *strW = make_wstr(U(filename).cStr); + ok_(__FILE__,l)(!lstrcmpW(path, strW), "didn't get expected path (%s), instead: %s\n", wine_dbgstr_w(path), U(filename).cStr); + heap_free(strW); } IShellFolder_Release(parent);

1 0

Nikolay Sivov : shell32/tests: Fix some compiler warnings on sprintf() buffer sizes.
by Alexandre Julliard 07 Feb '20

07 Feb '20

Module: wine Branch: master Commit: 5d6f0de3ea47c511e3a43a7aa489466e88509f2a URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d6f0de3ea47c511e3a43a7a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 7 19:33:07 2020 +0300 shell32/tests: Fix some compiler warnings on sprintf() buffer sizes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlfolder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index c9606c6f10..e724448c7a 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -1782,7 +1782,7 @@ static void test_SHGetFolderPathAndSubDirA(void) static const char wine[] = "wine"; static const char winetemp[] = "wine\\temp"; static char appdata[MAX_PATH]; - static char testpath[MAX_PATH]; + static char testpath[2 * MAX_PATH]; static char toolongpath[MAX_PATH+1]; if(FAILED(SHGetFolderPathA(NULL, CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, appdata)))

1 0

Dmitry Timoshkov : user32/tests: Add some tests for Static/SS_BITMAP control.
by Alexandre Julliard 07 Feb '20

07 Feb '20

Module: wine Branch: master Commit: f5906a5cfb22db07a22e6ac7b4a1afcd907c0af1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5906a5cfb22db07a22e6ac7… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Feb 6 17:31:09 2020 +0800 user32/tests: Add some tests for Static/SS_BITMAP control. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/bmp1x1_32bpp.bmp | Bin 0 -> 58 bytes dlls/user32/tests/resource.rc | 3 ++ dlls/user32/tests/static.c | 60 +++++++++++++++++++++++++++++++++++++ 3 files changed, 63 insertions(+) diff --git a/dlls/user32/tests/bmp1x1_32bpp.bmp b/dlls/user32/tests/bmp1x1_32bpp.bmp new file mode 100644 index 0000000000..3b565be8c2 Binary files /dev/null and b/dlls/user32/tests/bmp1x1_32bpp.bmp differ diff --git a/dlls/user32/tests/resource.rc b/dlls/user32/tests/resource.rc index 4301af6d68..89aaf5a61c 100644 --- a/dlls/user32/tests/resource.rc +++ b/dlls/user32/tests/resource.rc @@ -249,6 +249,9 @@ FONT 8, "MS Shell Dlg" /* @makedep: test_mono.bmp */ 100 BITMAP test_mono.bmp +/* @makedep: bmp1x1_32bpp.bmp */ +101 BITMAP bmp1x1_32bpp.bmp + 1 MENU { POPUP "&File" diff --git a/dlls/user32/tests/static.c b/dlls/user32/tests/static.c index 8776c3a9e0..0c453d08a6 100644 --- a/dlls/user32/tests/static.c +++ b/dlls/user32/tests/static.c @@ -130,6 +130,65 @@ static void test_set_text(void) DestroyWindow(hStatic); } +static void test_image(HBITMAP image) +{ + BITMAP bm; + HDC hdc; + BITMAPINFO info; + BYTE bits[4]; + + GetObjectW(image, sizeof(bm), &bm); + ok(bm.bmWidth == 1, "got %d\n", bm.bmWidth); + ok(bm.bmHeight == 1, "got %d\n", bm.bmHeight); + ok(bm.bmBitsPixel == 32, "got %d\n", bm.bmBitsPixel); + ok(bm.bmBits == NULL, "bmBits is not NULL\n"); + + info.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + info.bmiHeader.biWidth = bm.bmWidth; + info.bmiHeader.biHeight = bm.bmHeight; + info.bmiHeader.biPlanes = 1; + info.bmiHeader.biBitCount = 32; + info.bmiHeader.biCompression = BI_RGB; + info.bmiHeader.biSizeImage = 4; + info.bmiHeader.biXPelsPerMeter = 0; + info.bmiHeader.biYPelsPerMeter = 0; + info.bmiHeader.biClrUsed = 0; + info.bmiHeader.biClrImportant = 0; + + hdc = CreateCompatibleDC(0); + GetDIBits(hdc, image, 0, bm.bmHeight, bits, &info, DIB_RGB_COLORS); + DeleteDC(hdc); + + ok(bits[0] == 0x11 && bits[1] == 0x22 && bits[2] == 0x33 && bits[3] == 0x44, + "bits: %02x %02x %02x %02x\n", bits[0], bits[1], bits[2], bits[3]); +} + +static void test_set_image(void) +{ + HWND hwnd = build_static(SS_BITMAP); + HBITMAP bmp, image; + + image = LoadImageW(GetModuleHandleW(NULL), MAKEINTRESOURCEW(101), IMAGE_BITMAP, 0, 0, 0); + ok(image != NULL, "LoadImage failed\n"); + + test_image(image); + + bmp = (HBITMAP)SendMessageW(hwnd, STM_SETIMAGE, IMAGE_BITMAP, (LPARAM)image); + ok(bmp == NULL, "got not NULL\n"); + + bmp = (HBITMAP)SendMessageW(hwnd, STM_GETIMAGE, IMAGE_BITMAP, 0); + ok(bmp != NULL, "got NULL\n"); + ok(bmp == image, "bmp != image\n"); + + bmp = (HBITMAP)SendMessageW(hwnd, STM_SETIMAGE, IMAGE_BITMAP, (LPARAM)image); + ok(bmp != NULL, "got NULL\n"); + ok(bmp == image, "bmp != image\n"); + test_image(image); + + DestroyWindow(hwnd); + DeleteObject(image); +} + START_TEST(static) { static const char szClassName[] = "testclass"; @@ -162,6 +221,7 @@ START_TEST(static) test_updates(SS_ETCHEDHORZ, TODO_COUNT); test_updates(SS_ETCHEDVERT, TODO_COUNT); test_set_text(); + test_set_image(); DestroyWindow(hMainWnd); }

1 0

Dmitry Timoshkov : comctl32/tests: Add some tests for Static/SS_BITMAP control.
by Alexandre Julliard 07 Feb '20

07 Feb '20

Module: wine Branch: master Commit: f909d18baf1d97831c55a1d47610427ac2084ca3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f909d18baf1d97831c55a1d4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Feb 6 17:31:16 2020 +0800 comctl32/tests: Add some tests for Static/SS_BITMAP control. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/bmp1x1_32bpp.bmp | Bin 0 -> 58 bytes dlls/comctl32/tests/resources.h | 1 + dlls/comctl32/tests/rsrc.rc | 3 ++ dlls/comctl32/tests/static.c | 92 +++++++++++++++++++++++++++++++++++ 4 files changed, 96 insertions(+) diff --git a/dlls/comctl32/tests/bmp1x1_32bpp.bmp b/dlls/comctl32/tests/bmp1x1_32bpp.bmp new file mode 100644 index 0000000000..3b565be8c2 Binary files /dev/null and b/dlls/comctl32/tests/bmp1x1_32bpp.bmp differ diff --git a/dlls/comctl32/tests/resources.h b/dlls/comctl32/tests/resources.h index 53522c0a09..c4692654ae 100644 --- a/dlls/comctl32/tests/resources.h +++ b/dlls/comctl32/tests/resources.h @@ -23,6 +23,7 @@ #define IDB_BITMAP_128x15 10 #define IDB_BITMAP_80x15 11 +#define IDB_BITMAP_1x1_32BPP 12 #define IDS_TBADD1 16 #define IDS_TBADD2 17 diff --git a/dlls/comctl32/tests/rsrc.rc b/dlls/comctl32/tests/rsrc.rc index 6eb4fe8a0a..df22053d4c 100644 --- a/dlls/comctl32/tests/rsrc.rc +++ b/dlls/comctl32/tests/rsrc.rc @@ -101,6 +101,9 @@ IDB_BITMAP_128x15 BITMAP bmp128x15.bmp /* @makedep: bmp80x15.bmp */ IDB_BITMAP_80x15 BITMAP bmp80x15.bmp +/* @makedep: bmp1x1_32bpp.bmp */ +IDB_BITMAP_1x1_32BPP BITMAP bmp1x1_32bpp.bmp + IDD_PROP_PAGE_WITH_CUSTOM_DEFAULT_BUTTON DIALOG 5, 43, 227, 215 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" diff --git a/dlls/comctl32/tests/static.c b/dlls/comctl32/tests/static.c index a65e352728..0e44c4ed7a 100644 --- a/dlls/comctl32/tests/static.c +++ b/dlls/comctl32/tests/static.c @@ -24,6 +24,7 @@ #define WIN32_LEAN_AND_MEAN #include <windows.h> #include "commctrl.h" +#include "resources.h" #include "wine/test.h" @@ -133,6 +134,96 @@ static void test_set_text(void) DestroyWindow(hStatic); } +static void test_image(HBITMAP image, BOOL is_dib, BOOL is_premult) +{ + BITMAP bm; + HDC hdc; + BITMAPINFO info; + BYTE bits[4]; + + GetObjectW(image, sizeof(bm), &bm); + ok(bm.bmWidth == 1, "got %d\n", bm.bmWidth); + ok(bm.bmHeight == 1, "got %d\n", bm.bmHeight); + ok(bm.bmBitsPixel == 32, "got %d\n", bm.bmBitsPixel); + if (is_dib) + { +todo_wine + ok(bm.bmBits != NULL, "bmBits is NULL\n"); +if (bm.bmBits) +{ + memcpy(bits, bm.bmBits, 4); + if (is_premult) + ok(bits[0] == 0x05 && bits[1] == 0x09 && bits[2] == 0x0e && bits[3] == 0x44, + "bits: %02x %02x %02x %02x\n", bits[0], bits[1], bits[2], bits[3]); + else + ok(bits[0] == 0x11 && bits[1] == 0x22 && bits[2] == 0x33 && bits[3] == 0x44, + "bits: %02x %02x %02x %02x\n", bits[0], bits[1], bits[2], bits[3]); +} + } + else + ok(bm.bmBits == NULL, "bmBits is not NULL\n"); + + info.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + info.bmiHeader.biWidth = bm.bmWidth; + info.bmiHeader.biHeight = bm.bmHeight; + info.bmiHeader.biPlanes = 1; + info.bmiHeader.biBitCount = 32; + info.bmiHeader.biCompression = BI_RGB; + info.bmiHeader.biSizeImage = 4; + info.bmiHeader.biXPelsPerMeter = 0; + info.bmiHeader.biYPelsPerMeter = 0; + info.bmiHeader.biClrUsed = 0; + info.bmiHeader.biClrImportant = 0; + + hdc = CreateCompatibleDC(0); + GetDIBits(hdc, image, 0, bm.bmHeight, bits, &info, DIB_RGB_COLORS); + DeleteDC(hdc); + + if (is_premult) +todo_wine + ok(bits[0] == 0x05 && bits[1] == 0x09 && bits[2] == 0x0e && bits[3] == 0x44, + "bits: %02x %02x %02x %02x\n", bits[0], bits[1], bits[2], bits[3]); + else + ok(bits[0] == 0x11 && bits[1] == 0x22 && bits[2] == 0x33 && bits[3] == 0x44, + "bits: %02x %02x %02x %02x\n", bits[0], bits[1], bits[2], bits[3]); +} + +static void test_set_image(void) +{ + HWND hwnd = create_static(SS_BITMAP); + HBITMAP bmp1, bmp2, image; + + image = LoadImageW(GetModuleHandleW(NULL), MAKEINTRESOURCEW(IDB_BITMAP_1x1_32BPP), IMAGE_BITMAP, 0, 0, 0); + ok(image != NULL, "LoadImage failed\n"); + + test_image(image, FALSE, FALSE); + + bmp1 = (HBITMAP)SendMessageW(hwnd, STM_GETIMAGE, IMAGE_BITMAP, 0); + ok(bmp1 == NULL, "got not NULL\n"); + + bmp1 = (HBITMAP)SendMessageW(hwnd, STM_SETIMAGE, IMAGE_BITMAP, (LPARAM)image); + ok(bmp1 == NULL, "got not NULL\n"); + + bmp1 = (HBITMAP)SendMessageW(hwnd, STM_GETIMAGE, IMAGE_BITMAP, 0); + ok(bmp1 != NULL, "got NULL\n"); +todo_wine + ok(bmp1 != image, "bmp == image\n"); + test_image(bmp1, TRUE, TRUE); + + bmp2 = (HBITMAP)SendMessageW(hwnd, STM_SETIMAGE, IMAGE_BITMAP, (LPARAM)image); + ok(bmp2 != NULL, "got NULL\n"); +todo_wine + ok(bmp2 != image, "bmp == image\n"); + ok(bmp1 == bmp2, "bmp1 != bmp2\n"); + test_image(bmp2, TRUE, TRUE); + + DestroyWindow(hwnd); + + test_image(bmp2, TRUE, TRUE); + + DeleteObject(image); +} + START_TEST(static) { static const char classname[] = "testclass"; @@ -171,6 +262,7 @@ START_TEST(static) test_updates(SS_ETCHEDHORZ, TODO_COUNT); test_updates(SS_ETCHEDVERT, TODO_COUNT); test_set_text(); + test_set_image(); DestroyWindow(hMainWnd);

1 0

Dmitry Timoshkov : ntdll: Split logic for MemoryBasicInformation into a separate function.
by Alexandre Julliard 07 Feb '20

07 Feb '20

Module: wine Branch: master Commit: bbd73667d7c7cdec6d811ee911b57c0bebc3f03e URL: https://source.winehq.org/git/wine.git/?a=commit;h=bbd73667d7c7cdec6d811ee9… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jan 24 12:19:37 2020 -0800 ntdll: Split logic for MemoryBasicInformation into a separate function. Signed-off-by: Andrew Wesie <awesie(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 65 ++++++++++++++++++++++++++++++---------------------- 1 file changed, 37 insertions(+), 28 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 5890344f7a..ad91cffd8f 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -3011,40 +3011,16 @@ static int get_free_mem_state_callback( void *start, size_t size, void *arg ) return 1; } -#define UNIMPLEMENTED_INFO_CLASS(c) \ - case c: \ - FIXME("(process=%p,addr=%p) Unimplemented information class: " #c "\n", process, addr); \ - return STATUS_INVALID_INFO_CLASS - -/*********************************************************************** - * NtQueryVirtualMemory (NTDLL.@) - * ZwQueryVirtualMemory (NTDLL.@) - */ -NTSTATUS WINAPI NtQueryVirtualMemory( HANDLE process, LPCVOID addr, - MEMORY_INFORMATION_CLASS info_class, PVOID buffer, - SIZE_T len, SIZE_T *res_len ) +/* get basic information about a memory block */ +static NTSTATUS get_basic_memory_info( HANDLE process, LPCVOID addr, + MEMORY_BASIC_INFORMATION *info, + SIZE_T len, SIZE_T *res_len ) { struct file_view *view; char *base, *alloc_base = 0, *alloc_end = working_set_limit; struct wine_rb_entry *ptr; - MEMORY_BASIC_INFORMATION *info = buffer; sigset_t sigset; - if (info_class != MemoryBasicInformation) - { - switch(info_class) - { - UNIMPLEMENTED_INFO_CLASS(MemoryWorkingSetList); - UNIMPLEMENTED_INFO_CLASS(MemorySectionName); - UNIMPLEMENTED_INFO_CLASS(MemoryBasicVlmInformation); - - default: - FIXME("(%p,%p,info_class=%d,%p,%ld,%p) Unknown information class\n", - process, addr, info_class, buffer, len, res_len); - return STATUS_INVALID_INFO_CLASS; - } - } - if (len < sizeof(MEMORY_BASIC_INFORMATION)) return STATUS_INFO_LENGTH_MISMATCH; @@ -3159,6 +3135,39 @@ NTSTATUS WINAPI NtQueryVirtualMemory( HANDLE process, LPCVOID addr, } +#define UNIMPLEMENTED_INFO_CLASS(c) \ + case c: \ + FIXME("(process=%p,addr=%p) Unimplemented information class: " #c "\n", process, addr); \ + return STATUS_INVALID_INFO_CLASS + +/*********************************************************************** + * NtQueryVirtualMemory (NTDLL.@) + * ZwQueryVirtualMemory (NTDLL.@) + */ +NTSTATUS WINAPI NtQueryVirtualMemory( HANDLE process, LPCVOID addr, + MEMORY_INFORMATION_CLASS info_class, + PVOID buffer, SIZE_T len, SIZE_T *res_len ) +{ + TRACE("(%p, %p, info_class=%d, %p, %ld, %p)\n", + process, addr, info_class, buffer, len, res_len); + + switch(info_class) + { + case MemoryBasicInformation: + return get_basic_memory_info( process, addr, buffer, len, res_len ); + + UNIMPLEMENTED_INFO_CLASS(MemoryWorkingSetList); + UNIMPLEMENTED_INFO_CLASS(MemorySectionName); + UNIMPLEMENTED_INFO_CLASS(MemoryBasicVlmInformation); + + default: + FIXME("(%p,%p,info_class=%d,%p,%ld,%p) Unknown information class\n", + process, addr, info_class, buffer, len, res_len); + return STATUS_INVALID_INFO_CLASS; + } +} + + /*********************************************************************** * NtLockVirtualMemory (NTDLL.@) * ZwLockVirtualMemory (NTDLL.@)

1 0

Andrew Wesie : ntdll: Add NtQueryVirtualMemory(MemoryWorkingSetExInformation).
by Alexandre Julliard 07 Feb '20

07 Feb '20

Module: wine Branch: master Commit: 64d70b103d65198614973e38422aec210db92360 URL: https://source.winehq.org/git/wine.git/?a=commit;h=64d70b103d65198614973e38… Author: Andrew Wesie <awesie(a)gmail.com> Date: Fri Jan 24 12:19:38 2020 -0800 ntdll: Add NtQueryVirtualMemory(MemoryWorkingSetExInformation). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45667 Signed-off-by: Andrew Wesie <awesie(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++ include/winternl.h | 21 +++++++++++++++++- 2 files changed, 80 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index ad91cffd8f..6ad2d21e01 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -3134,6 +3134,63 @@ static NTSTATUS get_basic_memory_info( HANDLE process, LPCVOID addr, return STATUS_SUCCESS; } +static NTSTATUS get_working_set_ex( HANDLE process, LPCVOID addr, + MEMORY_WORKING_SET_EX_INFORMATION *info, + SIZE_T len, SIZE_T *res_len ) +{ + FILE *f; + MEMORY_WORKING_SET_EX_INFORMATION *p; + sigset_t sigset; + + if (process != NtCurrentProcess()) + { + FIXME( "(process=%p,addr=%p) Unimplemented information class: MemoryWorkingSetExInformation\n", process, addr ); + return STATUS_INVALID_INFO_CLASS; + } + + f = fopen( "/proc/self/pagemap", "rb" ); + if (!f) + { + static int once; + if (!once++) WARN( "unable to open /proc/self/pagemap\n" ); + } + + server_enter_uninterrupted_section( &csVirtual, &sigset ); + for (p = info; (UINT_PTR)(p + 1) <= (UINT_PTR)info + len; p++) + { + BYTE vprot; + UINT64 pagemap; + struct file_view *view; + + memset( &p->VirtualAttributes, 0, sizeof(p->VirtualAttributes) ); + + /* If we don't have pagemap information, default to invalid. */ + if (!f || fseek( f, ((UINT_PTR)p->VirtualAddress >> 12) * sizeof(pagemap), SEEK_SET ) == -1 || + fread( &pagemap, sizeof(pagemap), 1, f ) != 1) + { + pagemap = 0; + } + + if ((view = VIRTUAL_FindView( p->VirtualAddress, 0 )) && + get_committed_size( view, p->VirtualAddress, &vprot ) && + (vprot & VPROT_COMMITTED)) + { + p->VirtualAttributes.Valid = !(vprot & VPROT_GUARD) && (vprot & 0x0f) && (pagemap >> 63); + p->VirtualAttributes.Shared = !is_view_valloc( view ) && ((pagemap >> 61) & 1); + if (p->VirtualAttributes.Shared && p->VirtualAttributes.Valid) + p->VirtualAttributes.ShareCount = 1; /* FIXME */ + if (p->VirtualAttributes.Valid) + p->VirtualAttributes.Win32Protection = VIRTUAL_GetWin32Prot( vprot, view->protect ); + } + } + server_leave_uninterrupted_section( &csVirtual, &sigset ); + + if (f) + fclose( f ); + if (res_len) + *res_len = (UINT_PTR)p - (UINT_PTR)info; + return STATUS_SUCCESS; +} #define UNIMPLEMENTED_INFO_CLASS(c) \ case c: \ @@ -3156,6 +3213,9 @@ NTSTATUS WINAPI NtQueryVirtualMemory( HANDLE process, LPCVOID addr, case MemoryBasicInformation: return get_basic_memory_info( process, addr, buffer, len, res_len ); + case MemoryWorkingSetExInformation: + return get_working_set_ex( process, addr, buffer, len, res_len ); + UNIMPLEMENTED_INFO_CLASS(MemoryWorkingSetList); UNIMPLEMENTED_INFO_CLASS(MemorySectionName); UNIMPLEMENTED_INFO_CLASS(MemoryBasicVlmInformation); diff --git a/include/winternl.h b/include/winternl.h index e5aed5acb1..ea6707714d 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1051,7 +1051,8 @@ typedef enum _MEMORY_INFORMATION_CLASS { MemoryBasicInformation, MemoryWorkingSetList, MemorySectionName, - MemoryBasicVlmInformation + MemoryBasicVlmInformation, + MemoryWorkingSetExInformation } MEMORY_INFORMATION_CLASS; typedef struct _MEMORY_SECTION_NAME @@ -1059,6 +1060,24 @@ typedef struct _MEMORY_SECTION_NAME UNICODE_STRING SectionFileName; } MEMORY_SECTION_NAME, *PMEMORY_SECTION_NAME; +typedef union _MEMORY_WORKING_SET_EX_BLOCK { + ULONG_PTR Flags; + struct { + ULONG_PTR Valid : 1; + ULONG_PTR ShareCount : 3; + ULONG_PTR Win32Protection : 11; + ULONG_PTR Shared : 1; + ULONG_PTR Node : 6; + ULONG_PTR Locked : 1; + ULONG_PTR LargePage : 1; + } DUMMYSTRUCTNAME; +} MEMORY_WORKING_SET_EX_BLOCK, *PMEMORY_WORKING_SET_EX_BLOCK; + +typedef struct _MEMORY_WORKING_SET_EX_INFORMATION { + PVOID VirtualAddress; + MEMORY_WORKING_SET_EX_BLOCK VirtualAttributes; +} MEMORY_WORKING_SET_EX_INFORMATION, *PMEMORY_WORKING_SET_EX_INFORMATION; + typedef enum _MUTANT_INFORMATION_CLASS { MutantBasicInformation

1 0

Andrew Wesie : kernel32: Make QueryWorkingSetEx use MemoryWorkingSetExInformation.
by Alexandre Julliard 07 Feb '20

07 Feb '20

Module: wine Branch: master Commit: f7a184e1bfcd7f34e32f5b0b7b6baaf988280628 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7a184e1bfcd7f34e32f5b0b… Author: Andrew Wesie <awesie(a)gmail.com> Date: Fri Jan 24 12:19:39 2020 -0800 kernel32: Make QueryWorkingSetEx use MemoryWorkingSetExInformation. Signed-off-by: Andrew Wesie <awesie(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 7875f3469a..5146622230 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -722,7 +722,7 @@ BOOL WINAPI K32QueryWorkingSetEx( HANDLE process, LPVOID buffer, DWORD size ) { TRACE( "(%p, %p, %d)\n", process, buffer, size ); - return set_ntstatus( NtQueryVirtualMemory( process, NULL, MemoryWorkingSetList, buffer, size, NULL )); + return set_ntstatus( NtQueryVirtualMemory( process, NULL, MemoryWorkingSetExInformation, buffer, size, NULL )); } /***********************************************************************

1 0

Andrew Wesie : psapi/tests: Test QueryWorkingSetEx.
by Alexandre Julliard 07 Feb '20

07 Feb '20

Module: wine Branch: master Commit: 533ef8d21a839eafe3539df84bbd7a1dfb157886 URL: https://source.winehq.org/git/wine.git/?a=commit;h=533ef8d21a839eafe3539df8… Author: Andrew Wesie <awesie(a)gmail.com> Date: Fri Jan 24 12:19:40 2020 -0800 psapi/tests: Test QueryWorkingSetEx. Signed-off-by: Andrew Wesie <awesie(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/psapi/tests/psapi_main.c | 91 +++++++++++++++++++++++++++++++++++++++++++ include/psapi.h | 18 +++++++++ 2 files changed, 109 insertions(+) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 9799d2ffae..0df247e9bf 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -43,6 +43,7 @@ static NTSTATUS (WINAPI *pNtQueryVirtualMemory)(HANDLE, LPCVOID, ULONG, PVOID, S static BOOL (WINAPI *pIsWow64Process)(HANDLE, BOOL *); static BOOL (WINAPI *pWow64DisableWow64FsRedirection)(void **); static BOOL (WINAPI *pWow64RevertWow64FsRedirection)(void *); +static BOOL (WINAPI *pQueryWorkingSetEx)(HANDLE, PVOID, DWORD); static BOOL wow64; @@ -53,6 +54,7 @@ static BOOL init_func_ptrs(void) pIsWow64Process = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"), "IsWow64Process"); pWow64DisableWow64FsRedirection = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"), "Wow64DisableWow64FsRedirection"); pWow64RevertWow64FsRedirection = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"), "Wow64RevertWow64FsRedirection"); + pQueryWorkingSetEx = (void *)GetProcAddress(GetModuleHandleA("psapi.dll"), "QueryWorkingSetEx"); return TRUE; } @@ -791,6 +793,94 @@ free_page: VirtualFree(addr, 0, MEM_RELEASE); } +static void check_QueryWorkingSetEx(PVOID addr, const char *desc, DWORD expected_valid, + DWORD expected_protection, DWORD expected_shared, BOOL todo, BOOL todo_shared) +{ + PSAPI_WORKING_SET_EX_INFORMATION info; + BOOL ret; + + memset(&info, 0x41, sizeof(info)); + info.VirtualAddress = addr; + ret = pQueryWorkingSetEx(GetCurrentProcess(), &info, sizeof(info)); + ok(ret, "QueryWorkingSetEx failed with %d\n", GetLastError()); + + todo_wine_if(todo) + ok(info.VirtualAttributes.Valid == expected_valid, "%s expected Valid=%u but got %u\n", + desc, expected_valid, info.VirtualAttributes.Valid); + + todo_wine_if(todo) + ok(info.VirtualAttributes.Win32Protection == expected_protection, "%s expected Win32Protection=%u but got %u\n", + desc, expected_protection, info.VirtualAttributes.Win32Protection); + + ok(info.VirtualAttributes.Node == 0, "%s expected Node=0 but got %u\n", + desc, info.VirtualAttributes.Node); + ok(info.VirtualAttributes.LargePage == 0, "%s expected LargePage=0 but got %u\n", + desc, info.VirtualAttributes.LargePage); + + todo_wine_if(todo_shared) + ok(info.VirtualAttributes.Shared == expected_shared || broken(!info.VirtualAttributes.Valid) /* w2003 */, + "%s expected Shared=%u but got %u\n", desc, expected_shared, info.VirtualAttributes.Shared); + if (info.VirtualAttributes.Valid && info.VirtualAttributes.Shared) + ok(info.VirtualAttributes.ShareCount > 0, "%s expected ShareCount > 0 but got %u\n", + desc, info.VirtualAttributes.ShareCount); + else + ok(info.VirtualAttributes.ShareCount == 0, "%s expected ShareCount == 0 but got %u\n", + desc, info.VirtualAttributes.ShareCount); +} + +static void test_QueryWorkingSetEx(void) +{ + PVOID addr; + DWORD prot; + BOOL ret; + + if (pQueryWorkingSetEx == NULL) + { + win_skip("QueryWorkingSetEx not found, skipping tests\n"); + return; + } + + addr = GetModuleHandleA(NULL); + check_QueryWorkingSetEx(addr, "exe", 1, PAGE_READONLY, 1, FALSE, TRUE); + + ret = VirtualProtect(addr, 0x1000, PAGE_NOACCESS, &prot); + ok(ret, "VirtualProtect failed with %d\n", GetLastError()); + check_QueryWorkingSetEx(addr, "exe,noaccess", 0, 0, 1, FALSE, TRUE); + + ret = VirtualProtect(addr, 0x1000, prot, &prot); + ok(ret, "VirtualProtect failed with %d\n", GetLastError()); + check_QueryWorkingSetEx(addr, "exe,readonly1", 0, 0, 1, TRUE, TRUE); + + *(volatile char *)addr; + ok(ret, "VirtualProtect failed with %d\n", GetLastError()); + check_QueryWorkingSetEx(addr, "exe,readonly2", 1, PAGE_READONLY, 1, FALSE, TRUE); + + addr = VirtualAlloc(NULL, 0x1000, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE); + ok(addr != NULL, "VirtualAlloc failed with %d\n", GetLastError()); + check_QueryWorkingSetEx(addr, "valloc", 0, 0, 0, FALSE, FALSE); + + *(volatile char *)addr; + check_QueryWorkingSetEx(addr, "valloc,read", 1, PAGE_READWRITE, 0, FALSE, FALSE); + + *(volatile char *)addr = 0x42; + check_QueryWorkingSetEx(addr, "valloc,write", 1, PAGE_READWRITE, 0, FALSE, FALSE); + + ret = VirtualProtect(addr, 0x1000, PAGE_NOACCESS, &prot); + ok(ret, "VirtualProtect failed with %d\n", GetLastError()); + check_QueryWorkingSetEx(addr, "valloc,noaccess", 0, 0, 0, FALSE, FALSE); + + ret = VirtualProtect(addr, 0x1000, prot, &prot); + ok(ret, "VirtualProtect failed with %d\n", GetLastError()); + check_QueryWorkingSetEx(addr, "valloc,readwrite1", 0, 0, 0, TRUE, FALSE); + + *(volatile char *)addr; + check_QueryWorkingSetEx(addr, "valloc,readwrite2", 1, PAGE_READWRITE, 0, FALSE, FALSE); + + ret = VirtualFree(addr, 0, MEM_RELEASE); + ok(ret, "VirtualFree failed with %d\n", GetLastError()); + check_QueryWorkingSetEx(addr, "valloc,free", FALSE, 0, 0, FALSE, FALSE); +} + START_TEST(psapi_main) { DWORD pid = GetCurrentProcessId(); @@ -818,6 +908,7 @@ START_TEST(psapi_main) test_GetProcessImageFileName(); test_GetModuleFileNameEx(); test_GetModuleBaseName(); + test_QueryWorkingSetEx(); test_ws_functions(); CloseHandle(hpSR); diff --git a/include/psapi.h b/include/psapi.h index 742bf7b574..66e660b243 100644 --- a/include/psapi.h +++ b/include/psapi.h @@ -45,6 +45,24 @@ typedef struct _PROCESS_MEMORY_COUNTERS { } PROCESS_MEMORY_COUNTERS; typedef PROCESS_MEMORY_COUNTERS *PPROCESS_MEMORY_COUNTERS; +typedef union _PSAPI_WORKING_SET_EX_BLOCK { + ULONG_PTR Flags; + struct { + ULONG_PTR Valid :1; + ULONG_PTR ShareCount :3; + ULONG_PTR Win32Protection :11; + ULONG_PTR Shared :1; + ULONG_PTR Node :6; + ULONG_PTR Locked :1; + ULONG_PTR LargePage :1; + } DUMMYSTRUCTNAME; +} PSAPI_WORKING_SET_EX_BLOCK, *PPSAPI_WORKING_SET_EX_BLOCK; + +typedef struct _PSAPI_WORKING_SET_EX_INFORMATION { + PVOID VirtualAddress; + PSAPI_WORKING_SET_EX_BLOCK VirtualAttributes; +} PSAPI_WORKING_SET_EX_INFORMATION, *PPSAPI_WORKING_SET_EX_INFORMATION; + typedef struct _PSAPI_WS_WATCH_INFORMATION { LPVOID FaultingPc; LPVOID FaultingVa;

1 0

Zebediah Figura : wined3d: Implement casting int to uint.
by Alexandre Julliard 07 Feb '20

07 Feb '20

Module: wine Branch: master Commit: 3364348e6b6c97c52d9ecc20456a3b4920474720 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3364348e6b6c97c52d9ecc20… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 6 10:42:59 2020 -0600 wined3d: Implement casting int to uint. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 25e9772325..4a2fbce553 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3125,7 +3125,7 @@ static void shader_glsl_get_swizzle(const struct wined3d_shader_src_param *param } static void shader_glsl_sprintf_cast(struct wined3d_string_buffer *dst_param, const char *src_param, - enum wined3d_data_type dst_data_type, enum wined3d_data_type src_data_type) + enum wined3d_data_type dst_data_type, enum wined3d_data_type src_data_type, unsigned int size) { if (dst_data_type == src_data_type) { @@ -3156,10 +3156,22 @@ static void shader_glsl_sprintf_cast(struct wined3d_string_buffer *dst_param, co return; } - if (src_data_type == WINED3D_DATA_INT && dst_data_type == WINED3D_DATA_FLOAT) + if (src_data_type == WINED3D_DATA_INT) { - string_buffer_sprintf(dst_param, "intBitsToFloat(%s)", src_param); - return; + switch (dst_data_type) + { + case WINED3D_DATA_FLOAT: + string_buffer_sprintf(dst_param, "intBitsToFloat(%s)", src_param); + return; + case WINED3D_DATA_UINT: + if (size == 1) + string_buffer_sprintf(dst_param, "uint(%s)", src_param); + else + string_buffer_sprintf(dst_param, "uvec%u(%s)", size, src_param); + return; + default: + break; + } } FIXME("Unhandled cast from %#x to %#x.\n", src_data_type, dst_data_type); @@ -3179,6 +3191,7 @@ static void shader_glsl_add_src_param_ext(const struct wined3d_shader_context *c enum wined3d_data_type param_data_type; BOOL is_color = FALSE; char swizzle_str[6]; + unsigned int size; glsl_src->param_str[0] = '\0'; swizzle_str[0] = '\0'; @@ -3190,24 +3203,30 @@ static void shader_glsl_add_src_param_ext(const struct wined3d_shader_context *c { case WINED3DSPR_IMMCONST: param_data_type = data_type; + size = wined3d_src->reg.immconst_type == WINED3D_IMMCONST_SCALAR ? 1 : 4; break; case WINED3DSPR_FORKINSTID: case WINED3DSPR_GSINSTID: case WINED3DSPR_JOININSTID: - case WINED3DSPR_LOCALTHREADID: case WINED3DSPR_LOCALTHREADINDEX: case WINED3DSPR_OUTPOINTID: case WINED3DSPR_PRIMID: + param_data_type = WINED3D_DATA_INT; + size = 1; + break; + case WINED3DSPR_LOCALTHREADID: case WINED3DSPR_THREADGROUPID: case WINED3DSPR_THREADID: param_data_type = WINED3D_DATA_INT; + size = 3; break; default: param_data_type = WINED3D_DATA_FLOAT; + size = 4; break; } - shader_glsl_sprintf_cast(param_str, reg_name->buffer, data_type, param_data_type); + shader_glsl_sprintf_cast(param_str, reg_name->buffer, data_type, param_data_type, size); shader_glsl_gen_modifier(wined3d_src->modifiers, param_str->buffer, swizzle_str, glsl_src->param_str); string_buffer_release(priv->string_buffers, reg_name); @@ -7520,7 +7539,7 @@ static void shader_glsl_generate_color_output(struct wined3d_string_buffer *buff dst_data_type = component_type_info[output->component_type].data_type; shader_addline(buffer, "color_out%u = ", output->semantic_idx); string_buffer_sprintf(src, "ps_out[%u]", output->semantic_idx); - shader_glsl_sprintf_cast(assignment, src->buffer, dst_data_type, WINED3D_DATA_FLOAT); + shader_glsl_sprintf_cast(assignment, src->buffer, dst_data_type, WINED3D_DATA_FLOAT, 4); swizzle = args->rt_alpha_swizzle & (1u << output->semantic_idx) ? ".argb" : ""; shader_addline(buffer, "%s%s;\n", assignment->buffer, swizzle); }

1 0