January 2018 - Wine-commits

Zebediah Figura : user32/tests: Add a helper to check clipboard sequence and messages.
by Alexandre Julliard 30 Jan '18

30 Jan '18

Module: wine Branch: master Commit: 0b63b779cc6c12d66ad91cfddcb3d54b17199b2c URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b63b779cc6c12d66ad91cfd… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 29 16:16:15 2018 -0600 user32/tests: Add a helper to check clipboard sequence and messages. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/clipboard.c | 390 ++++++------------------------------------ 1 file changed, 51 insertions(+), 339 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0b63b779cc6c12d66ad9…

1 0

Zebediah Figura : user32/tests: Wait for the WM_CLIPBOARDUPDATE message to be received.
by Alexandre Julliard 30 Jan '18

30 Jan '18

Module: wine Branch: master Commit: 318edcc94a24d7140d02b7965825c012d0303aab URL: https://source.winehq.org/git/wine.git/?a=commit;h=318edcc94a24d7140d02b796… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 29 16:16:16 2018 -0600 user32/tests: Wait for the WM_CLIPBOARDUPDATE message to be received. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/clipboard.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 4fd37fa..3d3ef8b 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -895,6 +895,7 @@ static UINT wm_renderformat; static UINT nb_formats; static BOOL cross_thread; static BOOL do_render_format; +static HANDLE update_event; static LRESULT CALLBACK clipboard_wnd_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { @@ -953,6 +954,7 @@ static LRESULT CALLBACK clipboard_wnd_proc(HWND hwnd, UINT msg, WPARAM wp, LPARA ok( msg_flags == ISMEX_NOSEND, "WM_CLIPBOARDUPDATE wrong flags %x\n", msg_flags ); EnterCriticalSection(&clipboard_cs); wm_clipboardupdate++; + SetEvent(update_event); LeaveCriticalSection(&clipboard_cs); break; case WM_USER: @@ -1011,6 +1013,9 @@ static void check_messages_(int line, HWND win, UINT seq_diff, UINT draw, UINT u while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); } + if (update && !broken(!pAddClipboardFormatListener)) + ok(WaitForSingleObject(update_event, 1000) == WAIT_OBJECT_0, "wait failed\n"); + count = SendMessageA( win, WM_USER + 1, 0, 0 ); ok_(__FILE__, line)(count == draw, "WM_DRAWCLIPBOARD %sreceived\n", draw ? "not " : ""); count = SendMessageA( win, WM_USER + 2, 0, 0 ); @@ -1274,6 +1279,7 @@ static void test_messages(void) DWORD tid; InitializeCriticalSection(&clipboard_cs); + update_event = CreateEventW(NULL, FALSE, FALSE, NULL); memset(&cls, 0, sizeof(cls)); cls.lpfnWndProc = clipboard_wnd_proc;

1 0

Bernhard Übelacker : user32: Validate DIB offset in CURSORICON_GetFileEntry.
by Alexandre Julliard 30 Jan '18

30 Jan '18

Module: wine Branch: master Commit: 9256017adf1b32564d96a745d2ba79c09f0cb02a URL: https://source.winehq.org/git/wine.git/?a=commit;h=9256017adf1b32564d96a745… Author: Bernhard Übelacker <bernhardu(a)mailbox.org> Date: Sun Jan 28 19:15:44 2018 +0100 user32: Validate DIB offset in CURSORICON_GetFileEntry. Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/cursoricon.c | 1 + dlls/user32/tests/cursoricon.c | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 1203250..8e272f0 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -678,6 +678,7 @@ static BOOL CURSORICON_GetFileEntry( LPCVOID dir, DWORD size, int n, if ((const char *)&filedir->idEntries[n + 1] - (const char *)dir > size) return FALSE; entry = &filedir->idEntries[n]; + if (entry->dwDIBOffset > size - sizeof(info->biSize)) return FALSE; info = (const BITMAPINFOHEADER *)((const char *)dir + entry->dwDIBOffset); if (info->biSize != sizeof(BITMAPCOREHEADER)) { diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 211376b..5099c08 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -1031,6 +1031,12 @@ static const unsigned char gif4pixel[42] = { 0x02,0x00,0x00,0x02,0x03,0x14,0x16,0x05,0x00,0x3b }; +/* An invalid cursor with an invalid dwDIBOffset */ +static const unsigned char invalid_dwDIBOffset[] = { + 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00 +}; + static const DWORD biSize_tests[] = { 0, sizeof(BITMAPCOREHEADER) - 1, @@ -1320,6 +1326,8 @@ static void test_LoadImage(void) test_LoadImageFile("BMP (broken biSize)", bmpimage, sizeof(bmpimage), "bmp", 0); } bitmap_header->biSize = sizeof(BITMAPINFOHEADER); + + test_LoadImageFile("Cursor (invalid dwDIBOffset)", invalid_dwDIBOffset, sizeof(invalid_dwDIBOffset), "cur", 0); } #undef ARRAY_SIZE

1 0

Alexandre Julliard : server: Allow creating image mappings for all supported CPU platforms.
by Alexandre Julliard 30 Jan '18

30 Jan '18

Module: wine Branch: master Commit: f9bd73c4d653b4483b0ec39da948787cf00916b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9bd73c4d653b4483b0ec39d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 30 10:47:32 2018 +0100 server: Allow creating image mappings for all supported CPU platforms. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 21 ++++--------- server/mapping.c | 71 +++++++++++++++++++++----------------------- server/thread.c | 6 ++++ server/thread.h | 1 + 4 files changed, 47 insertions(+), 52 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f9bd73c4d653b4483b0e…

1 0

Alexandre Julliard : ntdll: Don' t return 64-bit image info to 32-bit processes.
by Alexandre Julliard 30 Jan '18

30 Jan '18

Module: wine Branch: master Commit: 41275cbabfcaebe3bd7dde7de3681fd9f16eb3e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=41275cbabfcaebe3bd7dde7d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 30 10:58:31 2018 +0100 ntdll: Don't return 64-bit image info to 32-bit processes. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 3 --- dlls/ntdll/virtual.c | 9 +++++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 56bf1f4..38175da 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -290,15 +290,12 @@ static BOOL query_image_section( int id, const char *dll_name, const IMAGE_NT_HE entry_point = (char *)(ULONG_PTR)nt32->OptionalHeader.ImageBase + nt32->OptionalHeader.AddressOfEntryPoint; truncated = nt_header->FileHeader.SizeOfOptionalHeader < sizeof(IMAGE_OPTIONAL_HEADER32); } - todo_wine_if (entry_point == (void *)0x81231234 ) ok( (char *)image.TransferAddress == (char *)entry_point, "%u: TransferAddress wrong %p / %p (%08x)\n", id, image.TransferAddress, entry_point, nt_header->OptionalHeader.AddressOfEntryPoint ); ok( image.ZeroBits == 0, "%u: ZeroBits wrong %08x\n", id, image.ZeroBits ); - todo_wine_if (entry_point == (void *)0x81231234 ) ok( image.MaximumStackSize == max_stack || broken(truncated), "%u: MaximumStackSize wrong %lx / %lx\n", id, image.MaximumStackSize, max_stack ); - todo_wine_if (entry_point == (void *)0x81231234 ) ok( image.CommittedStackSize == commit_stack || broken(truncated), "%u: CommittedStackSize wrong %lx / %lx\n", id, image.CommittedStackSize, commit_stack ); if (truncated) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index d077eb7..2327b13 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -3215,6 +3215,15 @@ NTSTATUS WINAPI NtQuerySection( HANDLE handle, SECTION_INFORMATION_CLASS class, info->ImageFileSize = image_info.file_size; info->CheckSum = image_info.checksum; if (ret_size) *ret_size = sizeof(*info); +#ifndef _WIN64 /* don't return 64-bit values to 32-bit processes */ + if (image_info.machine == IMAGE_FILE_MACHINE_AMD64 || + image_info.machine == IMAGE_FILE_MACHINE_ARM64) + { + info->TransferAddress = (void *)0x81231234; /* sic */ + info->MaximumStackSize = 0x100000; + info->CommittedStackSize = 0x10000; + } +#endif } else status = STATUS_SECTION_NOT_IMAGE; }

1 0

Alexandre Julliard : server: Implement the ImageContainsCode flag for image mappings.
by Alexandre Julliard 30 Jan '18

30 Jan '18

Module: wine Branch: master Commit: 0810e6a68827a864bd9062c63094f5ad072b2697 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0810e6a68827a864bd9062c6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 30 11:03:09 2018 +0100 server: Implement the ImageContainsCode flag for image mappings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 13 ++++++------- server/mapping.c | 12 ++++++++++-- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 38175da..bd23a1c 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -49,6 +49,7 @@ struct PROCESS_BASIC_INFORMATION_PRIVATE static LONG *child_failures; static WORD cb_count; static DWORD page_size; +static BOOL is_win64 = sizeof(void *) > sizeof(int); static BOOL is_wow64; static NTSTATUS (WINAPI *pNtCreateSection)(HANDLE *, ACCESS_MASK, const OBJECT_ATTRIBUTES *, @@ -267,8 +268,8 @@ static BOOL query_image_section( int id, const char *dll_name, const IMAGE_NT_HE status = pNtQuerySection( mapping, SectionImageInformation, &image, sizeof(image), &info_size ); ok( !status, "%u: NtQuerySection failed err %x\n", id, status ); ok( info_size == sizeof(image), "%u: NtQuerySection wrong size %lu\n", id, info_size ); - if (nt_header->OptionalHeader.Magic == (sizeof(void *) > sizeof(int) ? IMAGE_NT_OPTIONAL_HDR64_MAGIC - : IMAGE_NT_OPTIONAL_HDR32_MAGIC)) + if (nt_header->OptionalHeader.Magic == (is_win64 ? IMAGE_NT_OPTIONAL_HDR64_MAGIC + : IMAGE_NT_OPTIONAL_HDR32_MAGIC)) { max_stack = nt_header->OptionalHeader.SizeOfStackReserve; commit_stack = nt_header->OptionalHeader.SizeOfStackCommit; @@ -327,13 +328,11 @@ static BOOL query_image_section( int id, const char *dll_name, const IMAGE_NT_HE ok( image.CheckSum == nt_header->OptionalHeader.CheckSum, "%u: CheckSum wrong %08x / %08x\n", id, image.CheckSum, nt_header->OptionalHeader.CheckSum ); if (nt_header->OptionalHeader.SizeOfCode || nt_header->OptionalHeader.AddressOfEntryPoint) - todo_wine ok( image.ImageContainsCode == TRUE, "%u: ImageContainsCode wrong %u\n", id, image.ImageContainsCode ); else if ((nt_header->OptionalHeader.SectionAlignment % page_size) || (nt_header->FileHeader.NumberOfSections == 1 && (section.Characteristics & IMAGE_SCN_MEM_EXECUTE))) - todo_wine ok( image.ImageContainsCode == TRUE || broken(!image.ImageContainsCode), /* <= win8 */ "%u: ImageContainsCode wrong %u\n", id, image.ImageContainsCode ); else @@ -416,8 +415,8 @@ static NTSTATUS map_image_section( const IMAGE_NT_HEADERS *nt_header, int line ) info.Size.u.HighPart, info.Size.u.LowPart, file_size ); has_code = query_image_section( line, dll_name, nt_header ); /* test loading dll of wrong 32/64 bitness */ - if (nt_header->OptionalHeader.Magic == (sizeof(void *) > sizeof(int) ? IMAGE_NT_OPTIONAL_HDR32_MAGIC - : IMAGE_NT_OPTIONAL_HDR64_MAGIC)) + if (nt_header->OptionalHeader.Magic == (is_win64 ? IMAGE_NT_OPTIONAL_HDR32_MAGIC + : IMAGE_NT_OPTIONAL_HDR64_MAGIC)) { SetLastError( 0xdeadbeef ); mod = LoadLibraryExA( dll_name, 0, DONT_RESOLVE_DLL_REFERENCES ); @@ -425,7 +424,7 @@ static NTSTATUS map_image_section( const IMAGE_NT_HEADERS *nt_header, int line ) { ok( mod != NULL, "%u: loading failed err %u\n", line, GetLastError() ); } - else todo_wine_if (is_wow64) + else todo_wine_if (is_win64 || is_wow64) { ok( !mod, "%u: loading succeeded\n", line ); ok( GetLastError() == ERROR_BAD_EXE_FORMAT, "%u: wrong error %u\n", line, GetLastError() ); diff --git a/server/mapping.c b/server/mapping.c index b86ac9a..d863d08 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -539,7 +539,7 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s } nt; off_t pos; int size; - unsigned int cpu_mask = get_supported_cpu_mask(); + unsigned int i, cpu_mask = get_supported_cpu_mask(); /* load the headers */ @@ -587,6 +587,9 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s mapping->image.subsystem_low = nt.opt.hdr32.MinorSubsystemVersion; mapping->image.subsystem_high = nt.opt.hdr32.MajorSubsystemVersion; mapping->image.dll_charact = nt.opt.hdr32.DllCharacteristics; + mapping->image.contains_code = (nt.opt.hdr32.SizeOfCode || + nt.opt.hdr32.AddressOfEntryPoint || + nt.opt.hdr32.SectionAlignment & page_mask); mapping->image.loader_flags = nt.opt.hdr32.LoaderFlags; mapping->image.header_size = nt.opt.hdr32.SizeOfHeaders; mapping->image.checksum = nt.opt.hdr32.CheckSum; @@ -614,6 +617,9 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s mapping->image.subsystem_low = nt.opt.hdr64.MinorSubsystemVersion; mapping->image.subsystem_high = nt.opt.hdr64.MajorSubsystemVersion; mapping->image.dll_charact = nt.opt.hdr64.DllCharacteristics; + mapping->image.contains_code = (nt.opt.hdr64.SizeOfCode || + nt.opt.hdr64.AddressOfEntryPoint || + nt.opt.hdr64.SectionAlignment & page_mask); mapping->image.loader_flags = nt.opt.hdr64.LoaderFlags; mapping->image.header_size = nt.opt.hdr64.SizeOfHeaders; mapping->image.checksum = nt.opt.hdr64.CheckSum; @@ -627,7 +633,6 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s mapping->image.machine = nt.FileHeader.Machine; mapping->image.zerobits = 0; /* FIXME */ mapping->image.gp = 0; /* FIXME */ - mapping->image.contains_code = 0; /* FIXME */ mapping->image.image_flags = 0; /* FIXME */ mapping->image.file_size = file_size; @@ -642,6 +647,9 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s if (!(sec = malloc( size ))) goto error; if (pread( unix_fd, sec, size, pos ) != size) goto error; + for (i = 0; i < nt.FileHeader.NumberOfSections && !mapping->image.contains_code; i++) + if (sec[i].Characteristics & IMAGE_SCN_MEM_EXECUTE) mapping->image.contains_code = 1; + if (!build_shared_mapping( mapping, unix_fd, sec, nt.FileHeader.NumberOfSections )) goto error; free( sec );

1 0

Alexandre Julliard : ntdll: Move file mapping functionality to a helper function.
by Alexandre Julliard 30 Jan '18

30 Jan '18

Module: wine Branch: master Commit: 60e6331520bf0a99c41d607f211c5470ddc4dcc1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=60e6331520bf0a99c41d607f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 30 14:16:23 2018 +0100 ntdll: Move file mapping functionality to a helper function. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll_misc.h | 3 + dlls/ntdll/virtual.c | 326 +++++++++++++++++++++++++----------------------- 2 files changed, 175 insertions(+), 154 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=60e6331520bf0a99c41d…

1 0

Alexandre Julliard : ntdll: Check for file mappings that cannot be loaded as dlls.
by Alexandre Julliard 30 Jan '18

30 Jan '18

Module: wine Branch: master Commit: a8a74134e852fa4dbf4d0fd59e4b82ae6b728d92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8a74134e852fa4dbf4d0fd5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 30 14:16:34 2018 +0100 ntdll: Check for file mappings that cannot be loaded as dlls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 2 +- dlls/ntdll/loader.c | 46 ++++++++++++++++++++++++++++++++++---------- 2 files changed, 37 insertions(+), 11 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index bd23a1c..a954de2 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -424,7 +424,7 @@ static NTSTATUS map_image_section( const IMAGE_NT_HEADERS *nt_header, int line ) { ok( mod != NULL, "%u: loading failed err %u\n", line, GetLastError() ); } - else todo_wine_if (is_win64 || is_wow64) + else { ok( !mod, "%u: loading succeeded\n", line ); ok( GetLastError() == ERROR_BAD_EXE_FORMAT, "%u: wrong error %u\n", line, GetLastError() ); diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 2b0fefc..77a16b3 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1761,6 +1761,27 @@ static NTSTATUS perform_relocations( void *module, SIZE_T len ) return STATUS_SUCCESS; } + +/* On WoW64 setups, an image mapping can also be created for the other 32/64 CPU */ +/* but it cannot necessarily be loaded as a dll, so we need some additional checks */ +static BOOL is_valid_binary( const pe_image_info_t *info ) +{ +#ifdef __i386__ + return info->machine == IMAGE_FILE_MACHINE_I386; +#elif defined(__x86_64__) + return info->machine == IMAGE_FILE_MACHINE_AMD64 || !info->contains_code; +#elif defined(__arm__) + return info->machine == IMAGE_FILE_MACHINE_ARM || + info->machine == IMAGE_FILE_MACHINE_THUMB || + info->machine == IMAGE_FILE_MACHINE_ARMNT; +#elif defined(__aarch64__) + return info->machine == IMAGE_FILE_MACHINE_ARM64 || !info->contains_code; +#else + return FALSE; /* no wow64 support on other platforms */ +#endif +} + + /****************************************************************************** * load_native_dll (internal) */ @@ -1774,6 +1795,7 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, HANDLE file, SIZE_T len = 0; WINE_MODREF *wm; NTSTATUS status; + pe_image_info_t image_info; TRACE("Trying native dll %s\n", debugstr_w(name)); @@ -1784,8 +1806,15 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, HANDLE file, if (status != STATUS_SUCCESS) return status; module = NULL; - status = NtMapViewOfSection( mapping, NtCurrentProcess(), - &module, 0, 0, &size, &len, ViewShare, 0, PAGE_EXECUTE_READ ); + status = virtual_map_section( mapping, &module, 0, 0, NULL, &len, PAGE_EXECUTE_READ, &image_info ); + NtClose( mapping ); + + if ((status == STATUS_SUCCESS || status == STATUS_IMAGE_NOT_AT_BASE) && + !is_valid_binary( &image_info )) + { + NtUnmapViewOfSection( NtCurrentProcess(), module ); + return STATUS_INVALID_IMAGE_FORMAT; + } /* perform base relocation, if necessary */ @@ -1795,15 +1824,15 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, HANDLE file, if (status != STATUS_SUCCESS) { if (module) NtUnmapViewOfSection( NtCurrentProcess(), module ); - goto done; + return status; } /* create the MODREF */ if (!(wm = alloc_module( module, name ))) { - status = STATUS_NO_MEMORY; - goto done; + if (module) NtUnmapViewOfSection( NtCurrentProcess(), module ); + return STATUS_NO_MEMORY; } set_security_cookie( module, len ); @@ -1829,7 +1858,7 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, HANDLE file, * around with no problems, so we don't care. * As these might reference our wm, we don't free it. */ - goto done; + return status; } } @@ -1852,10 +1881,7 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, HANDLE file, wm->ldr.LoadCount = 1; *pwm = wm; - status = STATUS_SUCCESS; -done: - NtClose( mapping ); - return status; + return STATUS_SUCCESS; }

1 0

Alexandre Julliard : wineandroid: Handle additional mouse event types.
by Alexandre Julliard 30 Jan '18

30 Jan '18

Module: wine Branch: master Commit: e29678dae684fc75acc2d02b878317bb55539c9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e29678dae684fc75acc2d02b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 30 12:38:56 2018 +0100 wineandroid: Handle additional mouse event types. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/window.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index 22e2181..7d2049d 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -285,9 +285,12 @@ jboolean motion_event( JNIEnv *env, jobject obj, jint win, jint action, jint x, if (!( mask == AMOTION_EVENT_ACTION_DOWN || mask == AMOTION_EVENT_ACTION_UP || + mask == AMOTION_EVENT_ACTION_CANCEL || mask == AMOTION_EVENT_ACTION_SCROLL || mask == AMOTION_EVENT_ACTION_MOVE || - mask == AMOTION_EVENT_ACTION_HOVER_MOVE )) + mask == AMOTION_EVENT_ACTION_HOVER_MOVE || + mask == AMOTION_EVENT_ACTION_BUTTON_PRESS || + mask == AMOTION_EVENT_ACTION_BUTTON_RELEASE )) return JNI_FALSE; prev_state = InterlockedExchange( &button_state, state ); @@ -304,6 +307,7 @@ jboolean motion_event( JNIEnv *env, jobject obj, jint win, jint action, jint x, switch (action & AMOTION_EVENT_ACTION_MASK) { case AMOTION_EVENT_ACTION_DOWN: + case AMOTION_EVENT_ACTION_BUTTON_PRESS: if ((state & ~prev_state) & AMOTION_EVENT_BUTTON_PRIMARY) data.motion.input.u.mi.dwFlags |= MOUSEEVENTF_LEFTDOWN; if ((state & ~prev_state) & AMOTION_EVENT_BUTTON_SECONDARY) @@ -314,6 +318,8 @@ jboolean motion_event( JNIEnv *env, jobject obj, jint win, jint action, jint x, data.motion.input.u.mi.dwFlags |= MOUSEEVENTF_LEFTDOWN; break; case AMOTION_EVENT_ACTION_UP: + case AMOTION_EVENT_ACTION_CANCEL: + case AMOTION_EVENT_ACTION_BUTTON_RELEASE: if ((prev_state & ~state) & AMOTION_EVENT_BUTTON_PRIMARY) data.motion.input.u.mi.dwFlags |= MOUSEEVENTF_LEFTUP; if ((prev_state & ~state) & AMOTION_EVENT_BUTTON_SECONDARY)

1 0

Henri Verbeet : wined3d: Use the resource access flags in buffer_init().
by Alexandre Julliard 30 Jan '18

30 Jan '18

Module: wine Branch: master Commit: c26c9badc4a5c97cf877801f505af6d580d9994b URL: https://source.winehq.org/git/wine.git/?a=commit;h=c26c9badc4a5c97cf877801f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 30 16:12:36 2018 +0330 wined3d: Use the resource access flags in buffer_init(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 7 ++++--- dlls/wined3d/wined3d_private.h | 5 +++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 49b189e..fd26611 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1365,7 +1365,8 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device buffer, buffer->resource.size, buffer->resource.usage, debug_d3dformat(buffer->resource.format->id), buffer->resource.heap_memory); - if (device->create_parms.flags & WINED3DCREATE_SOFTWARE_VERTEXPROCESSING || pool == WINED3D_POOL_MANAGED) + if (device->create_parms.flags & WINED3DCREATE_SOFTWARE_VERTEXPROCESSING + || wined3d_resource_access_is_managed(buffer->resource.access)) { /* SWvp and managed buffers always return the same pointer in buffer * maps and retain data in DISCARD maps. Keep a system memory copy of @@ -1383,9 +1384,9 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device { TRACE("Not creating a BO because GL_ARB_vertex_buffer is not supported.\n"); } - else if (buffer->resource.pool == WINED3D_POOL_SYSTEM_MEM) + else if (!(buffer->resource.access & WINED3D_RESOURCE_ACCESS_GPU)) { - TRACE("Not creating a BO because the buffer is in system memory.\n"); + TRACE("Not creating a BO because the buffer is not GPU accessible.\n"); } else if (!dynamic_buffer_ok && (buffer->resource.usage & WINED3DUSAGE_DYNAMIC)) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 082c1ec..f95330f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2965,6 +2965,11 @@ static inline BOOL isStateDirty(const struct wined3d_context *context, DWORD sta #define WINED3D_RESOURCE_ACCESS_CPU 0x2u #define WINED3D_RESOURCE_ACCESS_MAP 0x4u +static inline BOOL wined3d_resource_access_is_managed(unsigned int access) +{ + return !(~access & (WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_CPU)); +} + struct wined3d_resource_ops { ULONG (*resource_incref)(struct wined3d_resource *resource);

1 0