June 2020 - Wine-commits - list.winehq.org

Alexandre Julliard : ntdll: Implement FSCTL_GET_OBJECT_ID to retrieve a file id.
by Alexandre Julliard 22 Jun '20

22 Jun '20

Module: wine Branch: master Commit: 251335cdf35d4ff1fcae9c73f77136c9b85e7d96 URL: https://source.winehq.org/git/wine.git/?a=commit;h=251335cdf35d4ff1fcae9c73… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jun 21 16:25:59 2020 +0200 ntdll: Implement FSCTL_GET_OBJECT_ID to retrieve a file id. It can be used instead of FileIdInformation to avoid depending on mountmgr. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 23 +++++++++++++++++++++++ include/winternl.h | 15 +++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index ca6899b50f..bf1354f46e 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -5666,6 +5666,29 @@ NTSTATUS WINAPI NtFsControlFile( HANDLE handle, HANDLE event, PIO_APC_ROUTINE ap } break; } + + case FSCTL_GET_OBJECT_ID: + { + FILE_OBJECTID_BUFFER *info = out_buffer; + int fd, needs_close; + struct stat st; + + io->Information = 0; + if (out_size >= sizeof(*info)) + { + status = server_get_unix_fd( handle, 0, &fd, &needs_close, NULL, NULL ); + if (status) break; + fstat( fd, &st ); + if (needs_close) close( fd ); + memset( info, 0, sizeof(*info) ); + memcpy( info->ObjectId, &st.st_dev, sizeof(st.st_dev) ); + memcpy( info->ObjectId + 8, &st.st_ino, sizeof(st.st_ino) ); + io->Information = sizeof(*info); + } + else status = STATUS_BUFFER_TOO_SMALL; + break; + } + case FSCTL_SET_SPARSE: TRACE("FSCTL_SET_SPARSE: Ignoring request\n"); io->Information = 0; diff --git a/include/winternl.h b/include/winternl.h index 0957561063..3ff15f28c1 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -744,6 +744,21 @@ typedef struct _FILE_PIPE_LOCAL_INFORMATION { #define FILE_PIPE_CONNECTED_STATE 0x00000003 #define FILE_PIPE_CLOSING_STATE 0x00000004 +typedef struct _FILE_OBJECTID_BUFFER +{ + BYTE ObjectId[16]; + union + { + struct + { + BYTE BirthVolumeId[16]; + BYTE BirthObjectId[16]; + BYTE DomainId[16]; + } DUMMYSTRUCTNAME; + BYTE ExtendedInfo[48]; + } DUMMYUNIONNAME; +} FILE_OBJECTID_BUFFER, *PFILE_OBJECTID_BUFFER; + typedef struct _FILE_OBJECTID_INFORMATION { LONGLONG FileReference; UCHAR ObjectId[16];

1 0

Alexandre Julliard : ntdll: Use FSCTL_GET_OBJECT_ID to compare file identities.
by Alexandre Julliard 22 Jun '20

22 Jun '20

Module: wine Branch: master Commit: 9e3893cc29dbcfd53d89abc679d0207cf2492999 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e3893cc29dbcfd53d89abc6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jun 21 16:56:05 2020 +0200 ntdll: Use FSCTL_GET_OBJECT_ID to compare file identities. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 83 +++++++++++++++++++++--------------------- dlls/ntdll/unix/loader.c | 1 - dlls/ntdll/unix/server.c | 4 +- dlls/ntdll/unix/unix_private.h | 5 +-- dlls/ntdll/unixlib.h | 4 +- 5 files changed, 47 insertions(+), 50 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9e3893cc29dbcfd53d89…

1 0

Alexandre Julliard : ntdll: Make the client cpu constant global.
by Alexandre Julliard 22 Jun '20

22 Jun '20

Module: wine Branch: master Commit: 67949d96a7c49b95801723e8cfdf327e907822cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=67949d96a7c49b95801723e8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 22 16:16:17 2020 +0200 ntdll: Make the client cpu constant global. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/process.c | 6 ++---- dlls/ntdll/unix/server.c | 12 ------------ dlls/ntdll/unix/unix_private.h | 10 ++++++++++ 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 804985da4d..758f47a1e9 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -417,10 +417,8 @@ static NTSTATUS get_pe_file_info( UNICODE_STRING *path, HANDLE *handle, pe_image /* assume current arch */ #if defined(__i386__) || defined(__x86_64__) info->cpu = is_64bit ? CPU_x86_64 : CPU_x86; -#elif defined(__arm__) - info->cpu = CPU_ARM; -#elif defined(__aarch64__) - info->cpu = CPU_ARM64; +#else + info->cpu = client_cpu; #endif *handle = 0; return STATUS_SUCCESS; diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index d81fb3b89a..299a311496 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -100,18 +100,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(server); #define SOCKETNAME "socket" /* name of the socket file */ #define LOCKNAME "lock" /* name of the lock file */ -#ifdef __i386__ -static const enum cpu_type client_cpu = CPU_x86; -#elif defined(__x86_64__) -static const enum cpu_type client_cpu = CPU_x86_64; -#elif defined(__arm__) -static const enum cpu_type client_cpu = CPU_ARM; -#elif defined(__aarch64__) -static const enum cpu_type client_cpu = CPU_ARM64; -#else -#error Unsupported CPU -#endif - static const BOOL is_win64 = (sizeof(void *) > sizeof(int)); static const char *server_dir; diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index e353a17a7d..e0bc5a9603 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -28,6 +28,16 @@ #define InterlockedCompareExchange64(dest,xchg,cmp) RtlInterlockedCompareExchange64(dest,xchg,cmp) #endif +#ifdef __i386__ +static const enum cpu_type client_cpu = CPU_x86; +#elif defined(__x86_64__) +static const enum cpu_type client_cpu = CPU_x86_64; +#elif defined(__arm__) +static const enum cpu_type client_cpu = CPU_ARM; +#elif defined(__aarch64__) +static const enum cpu_type client_cpu = CPU_ARM64; +#endif + struct debug_info { unsigned int str_pos; /* current position in strings buffer */

1 0

Derek Lesho : ntoskrnl: Set DriverStart and DriverSize fields in DRIVER_OBJECT.
by Alexandre Julliard 22 Jun '20

22 Jun '20

Module: wine Branch: master Commit: 8f1d1c533c8988e897984f2c0fd7ad1ad2eb7228 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f1d1c533c8988e897984f2c… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Fri Jun 19 13:11:37 2020 -0500 ntoskrnl: Set DriverStart and DriverSize fields in DRIVER_OBJECT. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 2da58dc104..f952e5d53b 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3645,6 +3645,8 @@ static NTSTATUS WINAPI init_driver( DRIVER_OBJECT *driver_object, UNICODE_STRING return STATUS_DLL_INIT_FAILED; driver_object->DriverSection = find_ldr_module( module ); + driver_object->DriverStart = ((LDR_DATA_TABLE_ENTRY *)driver_object->DriverSection)->DllBase; + driver_object->DriverSize = ((LDR_DATA_TABLE_ENTRY *)driver_object->DriverSection)->SizeOfImage; nt = RtlImageNtHeader( module ); if (!nt->OptionalHeader.AddressOfEntryPoint) return STATUS_SUCCESS;

1 0

Zebediah Figura : bcrypt/tests: Fix some failures on Windows 7.
by Alexandre Julliard 22 Jun '20

22 Jun '20

Module: wine Branch: master Commit: 46eac8de74a411a5e61dde2461ebfbec3940f532 URL: https://source.winehq.org/git/wine.git/?a=commit;h=46eac8de74a411a5e61dde24… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Jun 20 10:31:54 2020 -0500 bcrypt/tests: Fix some failures on Windows 7. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/tests/bcrypt.c | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index e4a99d6304..f6e5c84e8d 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -2381,16 +2381,37 @@ static void test_BcryptDeriveKeyCapi(void) } ret = pBCryptDeriveKeyCapi(NULL, NULL, NULL, 0, 0); - ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + ok(ret == STATUS_INVALID_PARAMETER || ret == STATUS_INVALID_HANDLE /* win7 */, "got %08x\n", ret); ret = pBCryptDeriveKeyCapi(hash, NULL, NULL, 0, 0); - ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + ok(ret == STATUS_INVALID_PARAMETER || !ret /* win7 */, "got %08x\n", ret); + + ret = pBCryptDestroyHash(hash); + ok(!ret, "got %08x\n", ret); + + ret = pBCryptCreateHash(alg, &hash, NULL, 0, NULL, 0, 0); + ok(!ret, "got %08x\n", ret); ret = pBCryptDeriveKeyCapi(hash, NULL, key, 0, 0); - ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + ok(ret == STATUS_INVALID_PARAMETER || !ret /* win7 */, "got %08x\n", ret); + + ret = pBCryptDestroyHash(hash); + ok(!ret, "got %08x\n", ret); + ret = pBCryptCreateHash(alg, &hash, NULL, 0, NULL, 0, 0); + ok(!ret, "got %08x\n", ret); + + memset(key, 0, sizeof(key)); ret = pBCryptDeriveKeyCapi(hash, NULL, key, 41, 0); - ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + ok(ret == STATUS_INVALID_PARAMETER || !ret /* win7 */, "got %08x\n", ret); + if (!ret) + ok(!memcmp(key, expect, sizeof(expect) - 1), "wrong key data\n"); + + ret = pBCryptDestroyHash(hash); + ok(!ret, "got %08x\n", ret); + + ret = pBCryptCreateHash(alg, &hash, NULL, 0, NULL, 0, 0); + ok(!ret, "got %08x\n", ret); memset(key, 0, sizeof(key)); ret = pBCryptDeriveKeyCapi(hash, NULL, key, 20, 0);

1 0

Paul Gofman : ntdll: Increment num_busy_workers when queuing TP object.
by Alexandre Julliard 22 Jun '20

22 Jun '20

Module: wine Branch: master Commit: 6d712a42ca20f1273ec1958f03b35a0edbade350 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d712a42ca20f1273ec1958f… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Jun 19 19:05:39 2020 +0300 ntdll: Increment num_busy_workers when queuing TP object. Otherwise two consequative submits may have the same num_busy_workers value if threadpool_worker_proc did not have a chance to pick the work in between. A new thread is not created in tp_submit() for the second submit and if the first submit queues an (infinitely long) wait the next submitted callback is not called for indefinite time period. Fixes hang on exit in Detroit Become Human. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/threadpool.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 451d441f57..84286fbee9 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -1375,7 +1375,6 @@ static NTSTATUS tp_new_worker_thread( struct threadpool *pool ) { InterlockedIncrement( &pool->refcount ); pool->num_workers++; - pool->num_busy_workers++; NtClose( thread ); } return status; @@ -2137,6 +2136,7 @@ static void tp_object_initialize( struct threadpool_object *object, struct threa static void tp_object_prio_queue( struct threadpool_object *object ) { + ++object->pool->num_busy_workers; list_add_tail( &object->pool->pools[object->priority], &object->pool_entry ); } @@ -2330,7 +2330,6 @@ static void CALLBACK threadpool_worker_proc( void *param ) TRACE( "starting worker thread for pool %p\n", pool ); RtlEnterCriticalSection( &pool->cs ); - pool->num_busy_workers--; for (;;) { while ((ptr = threadpool_get_next_item( pool ))) @@ -2360,7 +2359,6 @@ static void CALLBACK threadpool_worker_proc( void *param ) /* Leave critical section and do the actual callback. */ object->num_associated_callbacks++; object->num_running_callbacks++; - pool->num_busy_workers++; RtlLeaveCriticalSection( &pool->cs ); /* Initialize threadpool instance struct. */ @@ -2466,6 +2464,7 @@ static void CALLBACK threadpool_worker_proc( void *param ) skip_cleanup: RtlEnterCriticalSection( &pool->cs ); + assert(pool->num_busy_workers); pool->num_busy_workers--; /* Simple callbacks are automatically shutdown after execution. */

1 0

Liam Middlebrook : winevulkan: Update to VK spec version 1.2.145.
by Alexandre Julliard 22 Jun '20

22 Jun '20

Module: wine Branch: master Commit: c80b236366120bb420d6875f93d1bfcd9e77a7fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=c80b236366120bb420d6875f… Author: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Date: Sun Jun 21 12:18:52 2020 -0700 winevulkan: Update to VK spec version 1.2.145. Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Andy Ritger <aritger(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vulkan-1/vulkan-1.spec | 28 +- dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_thunks.c | 145 +++++++-- dlls/winevulkan/vulkan_thunks.h | 52 ++- dlls/winevulkan/winevulkan.json | 2 +- dlls/winevulkan/winevulkan.spec | 28 +- include/wine/vulkan.h | 690 +++++++++++++++++++++------------------- include/wine/vulkan_driver.h | 28 +- 8 files changed, 503 insertions(+), 472 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c80b236366120bb420d6…

1 0

Jeff Smith : gdiplus: Simplify modulo 8 math used for rendering origin.
by Alexandre Julliard 22 Jun '20

22 Jun '20

Module: wine Branch: master Commit: 47b0155f96a00e201abeaa01b05aea2084923dbc URL: https://source.winehq.org/git/wine.git/?a=commit;h=47b0155f96a00e201abeaa01… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Wed Jun 17 16:39:53 2020 -0500 gdiplus: Simplify modulo 8 math used for rendering origin. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Esme Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 10 +++++----- dlls/gdiplus/tests/brush.c | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 6619be9b58..4b141e19b6 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -159,8 +159,8 @@ static HBITMAP create_hatch_bitmap(const GpHatch *hatch, INT origin_x, INT origi * degree of shading needed. */ for (y = 0; y < 8; y++) { - const int hy = (((y + origin_y) % 8) + 8) % 8; - const int hx = ((origin_x % 8) + 8) % 8; + const int hy = (y + origin_y) & 7; + const int hx = origin_x & 7; unsigned int row = (0x10101 * hatch_data[hy]) >> hx; for (x = 0; x < 8; x++, row >>= 1) @@ -1198,13 +1198,13 @@ static GpStatus brush_fill_pixels(GpGraphics *graphics, GpBrush *brush, /* See create_hatch_bitmap for an explanation of how index is derived. */ for (y = 0; y < fill_area->Height; y++, argb_pixels += cdwStride) { - const int hy = (7 - ((y + fill_area->Y - graphics->origin_y) % 8)) % 8; - const int hx = ((graphics->origin_x % 8) + 8) % 8; + const int hy = ~(y + fill_area->Y - graphics->origin_y) & 7; + const int hx = graphics->origin_x & 7; const unsigned int row = (0x10101 * hatch_data[hy]) >> hx; for (x = 0; x < fill_area->Width; x++) { - const unsigned int srow = row >> (7 - ((x + fill_area->X) % 8)); + const unsigned int srow = row >> (~(x + fill_area->X) & 7); int index; if (hatch_data[8]) index = (srow & 1) ? 2 : (srow & 0x82) ? 1 : 0; diff --git a/dlls/gdiplus/tests/brush.c b/dlls/gdiplus/tests/brush.c index 5d5280c7f9..78939e6899 100644 --- a/dlls/gdiplus/tests/brush.c +++ b/dlls/gdiplus/tests/brush.c @@ -1814,8 +1814,8 @@ static void test_renderingOrigin(void) for (i = 0; i < ARRAY_SIZE(tests); i++) { - const INT exp_x = ((tests[i][0] % 8) + 8) % 8; - const INT exp_y = ((tests[i][1] % 8) + 8) % 8; + const INT exp_x = tests[i][0] & 7; + const INT exp_y = tests[i][1] & 7; status = GdipSetRenderingOrigin(graphics_image, tests[i][0], tests[i][1]); expect(Ok, status);

1 0

Alexandre Julliard : Wine release 5.11
by Alexandre Julliard 19 Jun '20

19 Jun '20

Module: website Branch: master Commit: 435b3c26ceef83603d381127e47ad6514ce39e5a URL: https://source.winehq.org/git/website.git/?a=commit;h=435b3c26ceef83603d381… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 19 21:49:11 2020 +0200 Wine release 5.11 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2020061901.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2020061901.xml b/news/en/2020061901.xml new file mode 100644 index 00000000..20d603bd --- /dev/null +++ b/news/en/2020061901.xml @@ -0,0 +1,17 @@ +<news> +<date>June 19, 2020</date> +<title>Wine 5.11 Released</title> +<body> + The Wine development release 5.11 is now available. + <a href="{$root}/announce/5.11">What's new</a> in this release: +<ul> + <li>Wine Mono engine updated to 5.1.0, with WpfGfx library support.</li> + <li>More work on the separate Unix library for NTDLL.</li> + <li>Beginnings of a NetIO kernel driver implementation.</li> + <li>Initial support for the Print Ticket API.</li> + <li>Removal of the obsolete 32-bit PowerPC architecture.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/5.x/wine-5.11.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Paul Gofman : netio.sys: Support multiple simultaneous async operations for socket.
by Alexandre Julliard 19 Jun '20

19 Jun '20

Module: wine Branch: master Commit: b192142ec08a3d298333bd5a19bccde5c4b0baeb URL: https://source.winehq.org/git/wine.git/?a=commit;h=b192142ec08a3d298333bd5a… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Jun 19 13:13:14 2020 +0300 netio.sys: Support multiple simultaneous async operations for socket. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netio.sys/netio.c | 162 ++++++++++++++++++++++++++++++++----------------- 1 file changed, 106 insertions(+), 56 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b192142ec08a3d298333…

1 0