January 2018 - Wine-Commits

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

Jan. 30, 2018

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

Dmitry Timoshkov : kerberos: Add support for KerbQueryTicketCacheMessage.
by Alexandre Julliard Jan. 30, 2018

Jan. 30, 2018

Module: wine Branch: master Commit: 0e9922bd3e02f6673371a39664dd4c3597d60053 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e9922bd3e02f6673371a396… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jan 29 11:10:06 2018 +0800 kerberos: Add support for KerbQueryTicketCacheMessage. Based on the code written by George Popoff. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 417 +++++++++++++++++++++++++++++++++++++++++++++++- include/ntsecapi.h | 105 ++++++++++++ 2 files changed, 519 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0e9922bd3e02f6673371…

1 0

Alistair Leslie-Hughes : dpnet: Use the global HeapAlloc() wrappers.
by Alexandre Julliard Jan. 30, 2018

Jan. 30, 2018

Module: wine Branch: master Commit: 2f3594c1dca68755a0e326b12ed629008c74286d URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f3594c1dca68755a0e326b1… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jan 29 23:12:30 2018 +0000 dpnet: Use the global HeapAlloc() wrappers. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/dpnet_private.h | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/dlls/dpnet/dpnet_private.h b/dlls/dpnet/dpnet_private.h index 44ff289d..2e72360 100644 --- a/dlls/dpnet/dpnet_private.h +++ b/dlls/dpnet/dpnet_private.h @@ -25,6 +25,7 @@ # error You must include config.h to use this header #endif +#include "wine/heap.h" #include <wine/list.h> #include "winsock2.h" #include "wine/unicode.h" @@ -154,21 +155,6 @@ typedef struct { #define FE(x) { x, #x } #define GE(x) { &x, #x } -static inline void __WINE_ALLOC_SIZE(1) *heap_alloc( size_t len ) -{ - return HeapAlloc( GetProcessHeap(), 0, len ); -} - -static inline void __WINE_ALLOC_SIZE(2) *heap_realloc(void *mem, size_t len) -{ - return HeapReAlloc( GetProcessHeap(), 0, mem, len); -} - -static inline BOOL heap_free( void *mem ) -{ - return HeapFree( GetProcessHeap(), 0, mem ); -} - static inline WCHAR *heap_strdupW( const WCHAR *src ) { WCHAR *dst;

1 0

Henri Verbeet : d2d1: Use the global memory allocation helpers.
by Alexandre Julliard Jan. 30, 2018

Jan. 30, 2018

Module: wine Branch: master Commit: 6d8ebf1d1a9895b0e43cd0d06d39546d86afe8f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d8ebf1d1a9895b0e43cd0d0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 30 16:12:39 2018 +0330 d2d1: Use the global memory allocation helpers. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/bitmap.c | 14 +++++----- dlls/d2d1/bitmap_render_target.c | 2 +- dlls/d2d1/brush.c | 29 ++++++++++---------- dlls/d2d1/d2d1_private.h | 1 + dlls/d2d1/dc_render_target.c | 2 +- dlls/d2d1/factory.c | 32 +++++++++++----------- dlls/d2d1/geometry.c | 57 ++++++++++++++++++---------------------- dlls/d2d1/hwnd_render_target.c | 2 +- dlls/d2d1/layer.c | 4 +-- dlls/d2d1/mesh.c | 4 +-- dlls/d2d1/render_target.c | 20 +++++++------- dlls/d2d1/state_block.c | 2 +- dlls/d2d1/stroke.c | 6 ++--- dlls/d2d1/wic_render_target.c | 2 +- include/wine/heap.h | 2 +- 15 files changed, 88 insertions(+), 91 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6d8ebf1d1a9895b0e43c…

1 0

Nikolay Sivov : comctl32/tests: Enable IP address control tests on version 6.
by Alexandre Julliard Jan. 30, 2018

Jan. 30, 2018

Module: wine Branch: master Commit: 902b004d55f68e0a7fd40a6e2efee181ab786f53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=902b004d55f68e0a7fd40a6e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 30 10:00:45 2018 +0300 comctl32/tests: Enable IP address control tests on version 6. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/ipaddress.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/comctl32/tests/ipaddress.c b/dlls/comctl32/tests/ipaddress.c index 6d8e9cc..5258189 100644 --- a/dlls/comctl32/tests/ipaddress.c +++ b/dlls/comctl32/tests/ipaddress.c @@ -22,6 +22,7 @@ #include <commctrl.h> #include "wine/test.h" +#include "v6util.h" #define expect(expected, got) ok(expected == got, "expected %d, got %d\n", expected,got) @@ -63,5 +64,15 @@ static void test_get_set_text(void) START_TEST(ipaddress) { + ULONG_PTR cookie; + HANDLE ctxt; + + test_get_set_text(); + + if (!load_v6_module(&cookie, &ctxt)) + return; + test_get_set_text(); + + unload_v6_module(cookie, ctxt); }

1 0

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

Jan. 30, 2018

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: Allow creating image mappings for all supported CPU platforms.
by Alexandre Julliard Jan. 30, 2018

Jan. 30, 2018

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

Nikolay Sivov : comctl32/tests: Enable Trackbar tests on version 6.
by Alexandre Julliard Jan. 30, 2018

Jan. 30, 2018

Module: wine Branch: master Commit: abab0a7b96011f569f7b93755abde890a83b447d URL: https://source.winehq.org/git/wine.git/?a=commit;h=abab0a7b96011f569f7b9375… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 30 10:00:46 2018 +0300 comctl32/tests: Enable Trackbar tests on version 6. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/trackbar.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index 31845d1..7b601b8 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -23,6 +23,7 @@ #include "wine/test.h" #include "msg.h" +#include "v6util.h" #define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", expected, got) #define NUM_MSG_SEQUENCE 2 @@ -1296,6 +1297,9 @@ static void test_create(void) START_TEST(trackbar) { + ULONG_PTR cookie; + HANDLE ctxt; + LoadLibraryA("comctl32.dll"); init_msg_sequences(sequences, NUM_MSG_SEQUENCE); @@ -1325,5 +1329,25 @@ START_TEST(trackbar) test_ignore_selection(); test_initial_state(); + if (!load_v6_module(&cookie, &ctxt)) + return; + + test_trackbar_buddy(); + test_line_size(); + test_page_size(); + test_position(); + test_range(); + test_selection(); + test_thumb_length(); + test_tic_settings(); + test_tic_placement(); + test_tool_tips(); + test_unicode(); + test_TBS_AUTOTICKS(); + test_ignore_selection(); + test_initial_state(); + + unload_v6_module(cookie, ctxt); + DestroyWindow(hWndParent); }

1 0

Alexandre Julliard : wineandroid: Handle additional mouse event types.
by Alexandre Julliard Jan. 30, 2018

Jan. 30, 2018

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

Michael Müller : include: Add activation.idl with IActivationFactory interface.
by Alexandre Julliard Jan. 30, 2018

Jan. 30, 2018

Module: wine Branch: master Commit: 40a1dcd591b971ed3fb11b00e65050f59fe76f98 URL: https://source.winehq.org/git/wine.git/?a=commit;h=40a1dcd591b971ed3fb11b00… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Jan 30 11:41:03 2018 +0300 include: Add activation.idl with IActivationFactory interface. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/activation.idl | 31 +++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index b975dd5..fdf736e 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -1,5 +1,6 @@ IDL_SRCS = \ access.idl \ + activation.idl \ activaut.idl \ activdbg.idl \ activscp.idl \ diff --git a/include/activation.idl b/include/activation.idl new file mode 100644 index 0000000..b86c9f6 --- /dev/null +++ b/include/activation.idl @@ -0,0 +1,31 @@ +/* + * Copyright 2016 Michael Müller + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef DO_NO_IMPORTS +import "inspectable.idl"; +#endif + +[ + object, + uuid(00000035-0000-0000-c000-000000000046), + pointer_default(unique) +] +interface IActivationFactory : IInspectable +{ + HRESULT ActivateInstance([out] IInspectable **instance); +}

1 0