February 2021 - Wine-commits

JÃ©rÃ´me Gardou : msi: Remove read-only bit when copying the package file.
by Alexandre Julliard 16 Feb '21

16 Feb '21

Module: wine Branch: master Commit: e830975806df9ef283c89f7153b06b145dfb2cec URL: https://source.winehq.org/git/wine.git/?a=commit;h=e830975806df9ef283c89f71… Author: JÃ©rÃ´me Gardou <jerome.gardou(a)gmail.com> Date: Fri Feb 12 14:46:56 2021 +0100 msi: Remove read-only bit when copying the package file. CopyFileW also copies the file attributes, and the copy will be opened with write access later on. Signed-off-by: Jérôme Gardou <jerome.gardou(a)reactos.org> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/package.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 25e22f040a4..05f122fb545 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1371,6 +1371,8 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, DWORD dwOptions, MSIPACKAGE **pPackage) r = get_local_package( db, localfile ); if (r != ERROR_SUCCESS || GetFileAttributesW( localfile ) == INVALID_FILE_ATTRIBUTES) { + DWORD localfile_attr; + r = msi_create_empty_local_file( localfile, L".msi" ); if (r != ERROR_SUCCESS) { @@ -1387,6 +1389,11 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, DWORD dwOptions, MSIPACKAGE **pPackage) return r; } delete_on_close = TRUE; + + /* Remove read-only bit, we are opening it with write access in MSI_OpenDatabaseW below. */ + localfile_attr = GetFileAttributesW( localfile ); + if (localfile_attr & FILE_ATTRIBUTE_READONLY) + SetFileAttributesW( localfile, localfile_attr & ~FILE_ATTRIBUTE_READONLY); } else if (dwOptions & WINE_OPENPACKAGEFLAGS_RECACHE) {

1 0

Alexandre Julliard : ntdll: Reimplement local atom tables in user space.
by Alexandre Julliard 16 Feb '21

16 Feb '21

Module: wine Branch: master Commit: e941079126c5459e853ba80a7b6346e7b2b16633 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e941079126c5459e853ba80a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 16 11:01:25 2021 +0100 ntdll: Reimplement local atom tables in user space. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/atom.c | 300 +++++++++++++++++++++++++++++++----------------- dlls/ntdll/tests/atom.c | 2 + include/winternl.h | 26 ++++- 3 files changed, 215 insertions(+), 113 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e941079126c5459e853b…

1 0

Alexandre Julliard : server: Remove support for process-local handle tables.
by Alexandre Julliard 16 Feb '21

16 Feb '21

Module: wine Branch: master Commit: d3df2b12ce15e660865364efb74655b8b1b6bb44 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3df2b12ce15e660865364ef… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 16 11:13:27 2021 +0100 server: Remove support for process-local handle tables. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/sync.c | 3 -- include/wine/server_protocol.h | 61 ++------------------------ server/atom.c | 98 ++++-------------------------------------- server/protocol.def | 27 ------------ server/request.h | 29 ++----------- server/trace.c | 44 ++----------------- 6 files changed, 20 insertions(+), 242 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d3df2b12ce15e6608653…

1 0

Alexandre Julliard : server: Avoid redefining the DuplicateHandle() constants.
by Alexandre Julliard 16 Feb '21

16 Feb '21

Module: wine Branch: master Commit: 584427fc89f943d40fb6ee4d51e14ff46b0f9300 URL: https://source.winehq.org/git/wine.git/?a=commit;h=584427fc89f943d40fb6ee4d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 16 11:27:18 2021 +0100 server: Avoid redefining the DuplicateHandle() constants. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 2 +- dlls/krnl386.exe16/vxd.c | 2 +- dlls/ntdll/heap.c | 2 +- dlls/wineandroid.drv/device.c | 4 ++-- include/wine/server_protocol.h | 3 --- include/winnt.h | 3 +++ server/handle.c | 12 ++++++------ server/protocol.def | 3 --- server/thread.c | 4 ++-- server/winstation.c | 4 ++-- 10 files changed, 18 insertions(+), 21 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 085fff1454e..756d1ef3f87 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -273,7 +273,7 @@ HANDLE WINAPI ConvertToGlobalHandle(HANDLE hSrc) { HANDLE ret = INVALID_HANDLE_VALUE; DuplicateHandle( GetCurrentProcess(), hSrc, GetCurrentProcess(), &ret, 0, FALSE, - DUP_HANDLE_MAKE_GLOBAL | DUP_HANDLE_SAME_ACCESS | DUP_HANDLE_CLOSE_SOURCE ); + DUPLICATE_MAKE_GLOBAL | DUPLICATE_SAME_ACCESS | DUPLICATE_CLOSE_SOURCE ); return ret; } diff --git a/dlls/krnl386.exe16/vxd.c b/dlls/krnl386.exe16/vxd.c index ab9d916d834..c259cd60775 100644 --- a/dlls/krnl386.exe16/vxd.c +++ b/dlls/krnl386.exe16/vxd.c @@ -213,7 +213,7 @@ done: RtlLeaveCriticalSection( &vxd_section ); if (!DuplicateHandle( GetCurrentProcess(), handle, GetCurrentProcess(), &handle, 0, (sa && (sa->nLength>=sizeof(*sa)) && sa->bInheritHandle), - DUP_HANDLE_SAME_ACCESS )) + DUPLICATE_SAME_ACCESS )) handle = 0; return handle; } diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 88db935746a..2d7b229174d 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -975,7 +975,7 @@ static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, LPVOID address, DWORD flags, if (!sem) NtCreateSemaphore( &sem, SEMAPHORE_ALL_ACCESS, NULL, 0, 1 ); NtDuplicateObject( NtCurrentProcess(), sem, NtCurrentProcess(), &sem, 0, 0, - DUP_HANDLE_MAKE_GLOBAL | DUP_HANDLE_SAME_ACCESS | DUP_HANDLE_CLOSE_SOURCE ); + DUPLICATE_MAKE_GLOBAL | DUPLICATE_SAME_ACCESS | DUPLICATE_CLOSE_SOURCE ); heap->critSection.LockSemaphore = sem; RtlFreeHeap( processHeap, 0, heap->critSection.DebugInfo ); heap->critSection.DebugInfo = NULL; diff --git a/dlls/wineandroid.drv/device.c b/dlls/wineandroid.drv/device.c index 5bebc5c7901..4a16e6836ed 100644 --- a/dlls/wineandroid.drv/device.c +++ b/dlls/wineandroid.drv/device.c @@ -332,7 +332,7 @@ static int duplicate_fd( HANDLE client, int fd ) if (!wine_server_fd_to_handle( dup(fd), GENERIC_READ | SYNCHRONIZE, 0, &handle )) DuplicateHandle( GetCurrentProcess(), handle, client, &ret, - DUPLICATE_SAME_ACCESS, FALSE, DUP_HANDLE_CLOSE_SOURCE ); + 0, FALSE, DUPLICATE_SAME_ACCESS | DUPLICATE_CLOSE_SOURCE ); if (!ret) return -1; return HandleToLong( ret ); @@ -348,7 +348,7 @@ static int map_native_handle( union native_handle_buffer *dest, const native_han { HANDLE ret = 0; if (!DuplicateHandle( GetCurrentProcess(), mapping, client, &ret, - DUPLICATE_SAME_ACCESS, FALSE, DUP_HANDLE_CLOSE_SOURCE )) + 0, FALSE, DUPLICATE_SAME_ACCESS | DUPLICATE_CLOSE_SOURCE )) return -ENOSPC; dest->handle.numFds = 0; dest->handle.numInts = 1; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 416f1af9212..ec34867caf1 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1259,9 +1259,6 @@ struct dup_handle_reply int closed; char __pad_20[4]; }; -#define DUP_HANDLE_CLOSE_SOURCE DUPLICATE_CLOSE_SOURCE -#define DUP_HANDLE_SAME_ACCESS DUPLICATE_SAME_ACCESS -#define DUP_HANDLE_MAKE_GLOBAL 0x80000000 diff --git a/include/winnt.h b/include/winnt.h index 8feb2e53a4c..48f1715c3b6 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -5531,6 +5531,9 @@ typedef struct _QUOTA_LIMITS_EX { #define DUPLICATE_CLOSE_SOURCE 0x00000001 #define DUPLICATE_SAME_ACCESS 0x00000002 +#ifdef __WINESRC__ +#define DUPLICATE_MAKE_GLOBAL 0x80000000 /* Not a Windows flag */ +#endif /* File attribute flags */ #define FILE_SHARE_READ 0x00000001 diff --git a/server/handle.c b/server/handle.c index a6fcb871e2d..ef0f595bf08 100644 --- a/server/handle.c +++ b/server/handle.c @@ -566,7 +566,7 @@ obj_handle_t duplicate_handle( struct process *src, obj_handle_t src_handle, str src_access = obj->ops->map_access( obj, GENERIC_ALL ); src_access &= ~RESERVED_ALL; - if (options & DUP_HANDLE_SAME_ACCESS) + if (options & DUPLICATE_SAME_ACCESS) access = src_access; else access = obj->ops->map_access( obj, access ) & ~RESERVED_ALL; @@ -581,16 +581,16 @@ obj_handle_t duplicate_handle( struct process *src, obj_handle_t src_handle, str return 0; } - if (options & DUP_HANDLE_MAKE_GLOBAL) + if (options & DUPLICATE_MAKE_GLOBAL) res = alloc_global_handle( obj, access ); else res = alloc_handle_no_access_check( dst, obj, access, attr ); } else { - if (options & DUP_HANDLE_MAKE_GLOBAL) + if (options & DUPLICATE_MAKE_GLOBAL) res = alloc_global_handle_no_access_check( obj, access ); - else if ((options & DUP_HANDLE_CLOSE_SOURCE) && src == dst && + else if ((options & DUPLICATE_CLOSE_SOURCE) && src == dst && entry && !(entry->access & RESERVED_CLOSE_PROTECT)) { if (attr & OBJ_INHERIT) access |= RESERVED_INHERIT; @@ -665,7 +665,7 @@ DECL_HANDLER(dup_handle) reply->handle = 0; if ((src = get_process_from_handle( req->src_process, PROCESS_DUP_HANDLE ))) { - if (req->options & DUP_HANDLE_MAKE_GLOBAL) + if (req->options & DUPLICATE_MAKE_GLOBAL) { reply->handle = duplicate_handle( src, req->src_handle, NULL, req->access, req->attributes, req->options ); @@ -677,7 +677,7 @@ DECL_HANDLER(dup_handle) release_object( dst ); } /* close the handle no matter what happened */ - if ((req->options & DUP_HANDLE_CLOSE_SOURCE) && (src != dst || req->src_handle != reply->handle)) + if ((req->options & DUPLICATE_CLOSE_SOURCE) && (src != dst || req->src_handle != reply->handle)) reply->closed = !close_handle( src, req->src_handle ); reply->self = (src == current->process); release_object( src ); diff --git a/server/protocol.def b/server/protocol.def index b210a4cf7d1..fb3ee3a52de 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1122,9 +1122,6 @@ typedef struct int self; /* is the source the current process? */ int closed; /* whether the source handle has been closed */ @END -#define DUP_HANDLE_CLOSE_SOURCE DUPLICATE_CLOSE_SOURCE -#define DUP_HANDLE_SAME_ACCESS DUPLICATE_SAME_ACCESS -#define DUP_HANDLE_MAKE_GLOBAL 0x80000000 /* Not a Windows flag */ /* Make an object temporary */ diff --git a/server/thread.c b/server/thread.c index 38bc25ae5f5..3cee717e169 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1644,7 +1644,7 @@ DECL_HANDLER(select) if (apc->result.type == APC_CREATE_THREAD) /* transfer the handle to the caller process */ { obj_handle_t handle = duplicate_handle( current->process, apc->result.create_thread.handle, - apc->caller->process, 0, 0, DUP_HANDLE_SAME_ACCESS ); + apc->caller->process, 0, 0, DUPLICATE_SAME_ACCESS ); close_handle( current->process, apc->result.create_thread.handle ); apc->result.create_thread.handle = handle; clear_error(); /* ignore errors from the above calls */ @@ -1740,7 +1740,7 @@ DECL_HANDLER(queue_apc) { /* duplicate the handle into the target process */ obj_handle_t handle = duplicate_handle( current->process, apc->call.map_view.handle, - process, 0, 0, DUP_HANDLE_SAME_ACCESS ); + process, 0, 0, DUPLICATE_SAME_ACCESS ); if (handle) apc->call.map_view.handle = handle; else { diff --git a/server/winstation.c b/server/winstation.c index 0403825b575..1c7552f0687 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -376,7 +376,7 @@ void connect_process_winstation( struct process *process, struct thread *parent_ else if (parent_process->winstation) { handle = duplicate_handle( parent_process, parent_process->winstation, - process, 0, 0, DUP_HANDLE_SAME_ACCESS ); + process, 0, 0, DUPLICATE_SAME_ACCESS ); winstation = (struct winstation *)get_handle_obj( process, handle, 0, &winstation_ops ); } if (!winstation) goto done; @@ -400,7 +400,7 @@ void connect_process_winstation( struct process *process, struct thread *parent_ if (!desktop || desktop->winstation != winstation) goto done; - handle = duplicate_handle( parent_process, handle, process, 0, 0, DUP_HANDLE_SAME_ACCESS ); + handle = duplicate_handle( parent_process, handle, process, 0, 0, DUPLICATE_SAME_ACCESS ); } if (handle) set_process_default_desktop( process, desktop, handle );

1 0

Alexandre Julliard : ntdll: Use the SECTION_IMAGE_INFORMATION bitfields where possible.
by Alexandre Julliard 16 Feb '21

16 Feb '21

Module: wine Branch: master Commit: c2c57e8dba92f54aba4e1e52d2f0a5ea4831dff4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2c57e8dba92f54aba4e1e52… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 16 11:37:08 2021 +0100 ntdll: Use the SECTION_IMAGE_INFORMATION bitfields where possible. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 16 ++++++++-------- dlls/ntdll/unix/loader.c | 2 +- include/winternl.h | 5 +++++ 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 4eb6bb1144f..9403cdb89fd 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1877,12 +1877,12 @@ static NTSTATUS build_module( LPCWSTR load_path, const UNICODE_STRING *nt_name, /* create the MODREF */ - if (!(wm = alloc_module( *module, nt_name, (image_info->u.ImageFlags & IMAGE_FLAGS_WineBuiltin) ))) + if (!(wm = alloc_module( *module, nt_name, (image_info->u.s.WineBuiltin) ))) return STATUS_NO_MEMORY; if (id) wm->id = *id; if (image_info->LoaderFlags) wm->ldr.Flags |= LDR_COR_IMAGE; - if (image_info->u.ImageFlags & IMAGE_FLAGS_ComPlusILOnly) wm->ldr.Flags |= LDR_COR_ILONLY; + if (image_info->u.s.ComPlusILOnly) wm->ldr.Flags |= LDR_COR_ILONLY; set_security_cookie( *module, map_size ); @@ -1916,7 +1916,7 @@ static NTSTATUS build_module( LPCWSTR load_path, const UNICODE_STRING *nt_name, TRACE( "loaded %s %p %p\n", debugstr_us(nt_name), wm, *module ); - if (image_info->u.ImageFlags & IMAGE_FLAGS_WineBuiltin) + if (image_info->u.s.WineBuiltin) { if (TRACE_ON(relay)) RELAY_SetupDLL( *module ); } @@ -1926,7 +1926,7 @@ static NTSTATUS build_module( LPCWSTR load_path, const UNICODE_STRING *nt_name, } TRACE_(loaddll)( "Loaded %s at %p: %s\n", debugstr_w(wm->ldr.FullDllName.Buffer), *module, - (image_info->u.ImageFlags & IMAGE_FLAGS_WineBuiltin) ? "builtin" : "native" ); + (image_info->u.s.WineBuiltin) ? "builtin" : "native" ); wm->ldr.LoadCount = 1; *pwm = wm; @@ -1946,7 +1946,7 @@ static NTSTATUS build_builtin_module( const WCHAR *load_path, const UNICODE_STRI NTSTATUS status; SECTION_IMAGE_INFORMATION image_info = { 0 }; - image_info.u.ImageFlags = IMAGE_FLAGS_WineBuiltin; + image_info.u.s.WineBuiltin = 1; status = build_module( load_path, nt_name, &module, &image_info, NULL, flags, pwm ); if (status && module) unix_funcs->unload_builtin_dll( module ); return status; @@ -2062,7 +2062,7 @@ static BOOL is_valid_binary( HANDLE file, const SECTION_IMAGE_INFORMATION *info if (info->Machine == IMAGE_FILE_MACHINE_ARM64) return TRUE; #endif if (!info->ImageContainsCode) return TRUE; - if (!(info->u.ImageFlags & IMAGE_FLAGS_ComPlusNativeReady)) + if (!(info->u.s.ComPlusNativeReady)) { IMAGE_COR20_HEADER cor_header; if (!get_cor_header( file, info, &cor_header )) return FALSE; @@ -2673,7 +2673,7 @@ static NTSTATUS load_dll( const WCHAR *load_path, const WCHAR *libname, const WC break; case STATUS_SUCCESS: /* valid PE file */ - if (image_info.u.ImageFlags & IMAGE_FLAGS_WineBuiltin) + if (image_info.u.s.WineBuiltin) { switch (loadorder) { @@ -2691,7 +2691,7 @@ static NTSTATUS load_dll( const WCHAR *load_path, const WCHAR *libname, const WC } break; } - if (!(image_info.u.ImageFlags & IMAGE_FLAGS_WineFakeDll)) + if (!(image_info.u.s.WineFakeDll)) { switch (loadorder) { diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 92bf3b08620..9aa1eeda88b 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1225,7 +1225,7 @@ static NTSTATUS open_dll_file( const char *name, OBJECT_ATTRIBUTES *attr, HANDLE NtQuerySection( *mapping, SectionImageInformation, image_info, sizeof(*image_info), NULL ); /* ignore non-builtins */ - if (!(image_info->u.ImageFlags & IMAGE_FLAGS_WineBuiltin)) + if (!(image_info->u.s.WineBuiltin)) { WARN( "%s found in WINEDLLPATH but not a builtin, ignoring\n", debugstr_a(name) ); status = STATUS_DLL_NOT_FOUND; diff --git a/include/winternl.h b/include/winternl.h index a65d21b9e3e..61bcd0f1d92 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2490,7 +2490,12 @@ typedef struct _SECTION_IMAGE_INFORMATION { UCHAR ImageMappedFlat : 1; UCHAR BaseBelow4gb : 1; UCHAR ComPlusPrefer32bit : 1; +#ifdef __WINESRC__ /* Wine extensions */ + UCHAR WineBuiltin : 1; + UCHAR WineFakeDll : 1; +#else UCHAR Reserved : 2; +#endif } DUMMYSTRUCTNAME; } DUMMYUNIONNAME; ULONG LoaderFlags;

1 0

Alexandre Julliard : ntdll: Don't use wine/server.h from the PE side.
by Alexandre Julliard 16 Feb '21

16 Feb '21

Module: wine Branch: master Commit: 58eceff167ad13530f4841b2b606472d34bb392c URL: https://source.winehq.org/git/wine.git/?a=commit;h=58eceff167ad13530f4841b2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 16 11:37:38 2021 +0100 ntdll: Don't use wine/server.h from the PE side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/actctx.c | 1 + dlls/ntdll/atom.c | 2 -- dlls/ntdll/directory.c | 1 - dlls/ntdll/exception.c | 1 - dlls/ntdll/heap.c | 1 - dlls/ntdll/loader.c | 1 + dlls/ntdll/nt.c | 1 - dlls/ntdll/ntdll_misc.h | 1 - dlls/ntdll/sync.c | 1 - dlls/ntdll/thread.c | 1 - dlls/ntdll/threadpool.c | 7 +++---- dlls/ntdll/unix/registry.c | 1 + dlls/ntdll/unix/security.c | 1 + dlls/ntdll/unix/unix_private.h | 1 + dlls/ntdll/unixlib.h | 1 - dlls/ntdll/virtual.c | 1 - 16 files changed, 8 insertions(+), 15 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 5db464a383e..5032f1b0cc4 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -24,6 +24,7 @@ #include <stdarg.h> #include <stdio.h> +#include <stdlib.h> #include "ntstatus.h" #define WIN32_NO_STATUS diff --git a/dlls/ntdll/atom.c b/dlls/ntdll/atom.c index ab8d7ee317f..adde3208e88 100644 --- a/dlls/ntdll/atom.c +++ b/dlls/ntdll/atom.c @@ -28,8 +28,6 @@ #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" - -#include "wine/server.h" #include "ntdll_misc.h" #include "wine/debug.h" diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index cfb4595d457..fb2f25d35bc 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -36,7 +36,6 @@ #include "winternl.h" #include "ddk/wdm.h" #include "ntdll_misc.h" -#include "wine/server.h" #include "wine/list.h" #include "wine/debug.h" #include "wine/exception.h" diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index 4594d12f8a0..d5b3042c491 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -32,7 +32,6 @@ #include "winternl.h" #include "ddk/wdm.h" #include "wine/exception.h" -#include "wine/server.h" #include "wine/list.h" #include "wine/debug.h" #include "excpt.h" diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 2d7b229174d..cae41cba0d9 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -36,7 +36,6 @@ #include "ntdll_misc.h" #include "wine/list.h" #include "wine/debug.h" -#include "wine/server.h" WINE_DEFAULT_DEBUG_CHANNEL(heap); diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 9403cdb89fd..a67c326d875 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -21,6 +21,7 @@ #include <assert.h> #include <stdarg.h> +#include <stdlib.h> #include "ntstatus.h" #define WIN32_NO_STATUS diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index dc3eb73e976..3d7063caa1d 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -33,7 +33,6 @@ #include "windef.h" #include "winternl.h" #include "ntdll_misc.h" -#include "wine/server.h" #include "ddk/wdm.h" WINE_DEFAULT_DEBUG_CHANNEL(ntdll); diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 60b8ffc46d6..67696f80db3 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -26,7 +26,6 @@ #include "winnt.h" #include "winternl.h" #include "unixlib.h" -#include "wine/server.h" #include "wine/asm.h" #define DECLARE_CRITICAL_SECTION(cs) \ diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 8df7015df9f..f1263ae33fd 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -33,7 +33,6 @@ #define NONAMELESSUNION #include "windef.h" #include "winternl.h" -#include "wine/server.h" #include "wine/debug.h" #include "ntdll_misc.h" diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 425e8770294..25496609f08 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -27,7 +27,6 @@ #include "ntstatus.h" #define WIN32_NO_STATUS #include "winternl.h" -#include "wine/server.h" #include "wine/debug.h" #include "ntdll_misc.h" #include "ddk/wdm.h" diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index bdc1ebddd7d..1b51a191979 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -1090,8 +1090,7 @@ static void CALLBACK timerqueue_thread_proc( void *param ) } } - timeout_lower = TIMEOUT_INFINITE; - timeout_upper = TIMEOUT_INFINITE; + timeout_lower = timeout_upper = MAXLONGLONG; /* Determine next timeout and use the window length to optimize wakeup times. */ LIST_FOR_EACH_ENTRY( other_timer, &timerqueue.pending_timers, @@ -1247,7 +1246,7 @@ static void CALLBACK waitqueue_thread_proc( void *param ) for (;;) { NtQuerySystemTime( &now ); - timeout.QuadPart = TIMEOUT_INFINITE; + timeout.QuadPart = MAXLONGLONG; num_handles = 0; LIST_FOR_EACH_ENTRY_SAFE( wait, next, &bucket->waiting, struct threadpool_object, @@ -2985,7 +2984,7 @@ VOID WINAPI TpSetTimer( TP_TIMER *timer, LARGE_INTEGER *timeout, LONG period, LO VOID WINAPI TpSetWait( TP_WAIT *wait, HANDLE handle, LARGE_INTEGER *timeout ) { struct threadpool_object *this = impl_from_TP_WAIT( wait ); - ULONGLONG timestamp = TIMEOUT_INFINITE; + ULONGLONG timestamp = MAXLONGLONG; TRACE( "%p %p %p\n", wait, handle, timeout ); diff --git a/dlls/ntdll/unix/registry.c b/dlls/ntdll/unix/registry.c index f94c8ff98ee..c0897033609 100644 --- a/dlls/ntdll/unix/registry.c +++ b/dlls/ntdll/unix/registry.c @@ -30,6 +30,7 @@ #include "ntstatus.h" #define WIN32_NO_STATUS +#include "winternl.h" #include "unix_private.h" #include "wine/debug.h" diff --git a/dlls/ntdll/unix/security.c b/dlls/ntdll/unix/security.c index 8838ca13ee4..fc9cc9d4572 100644 --- a/dlls/ntdll/unix/security.c +++ b/dlls/ntdll/unix/security.c @@ -30,6 +30,7 @@ #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" +#include "winternl.h" #include "unix_private.h" #include "wine/debug.h" diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 6ab96397412..1a864b6fb5d 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -24,6 +24,7 @@ #include <pthread.h> #include <signal.h> #include "unixlib.h" +#include "wine/server.h" #include "wine/list.h" #ifdef __i386__ diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index 8dc42320f18..0439a5a937b 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -21,7 +21,6 @@ #ifndef __NTDLL_UNIXLIB_H #define __NTDLL_UNIXLIB_H -#include "wine/server.h" #include "wine/debug.h" struct _DISPATCHER_CONTEXT; diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index e0435181e95..8e512c5d85a 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -31,7 +31,6 @@ #define NONAMELESSUNION #include "windef.h" #include "winternl.h" -#include "wine/server.h" #include "wine/debug.h" #include "ntdll_misc.h"

1 0

Henri Verbeet : vkd3d-shader: Store the output buffer in struct vkd3d_d3d_asm_compiler.
by Alexandre Julliard 16 Feb '21

16 Feb '21

Module: vkd3d Branch: master Commit: cee390d755fcffca8c63cda497a5cbdc3154a6a7 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=cee390d755fcffca8c63cda… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 16 14:58:25 2021 +0100 vkd3d-shader: Store the output buffer in struct vkd3d_d3d_asm_compiler. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/trace.c | 247 +++++++++++++++++++++++++--------------------- 1 file changed, 134 insertions(+), 113 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=cee390d755fcffca8c6…

1 0

Henri Verbeet : vkd3d-shader: Introduce a helper to print d3d-asm opcodes.
by Alexandre Julliard 16 Feb '21

16 Feb '21

Module: vkd3d Branch: master Commit: a5f98f260125f288e0467034c12b8c0b201bf92c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a5f98f260125f288e046703… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 16 14:58:26 2021 +0100 vkd3d-shader: Introduce a helper to print d3d-asm opcodes. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/trace.c | 98 ++++++++++++++++++++++------------------------- 1 file changed, 46 insertions(+), 52 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=a5f98f260125f288e04…

1 0

Henri Verbeet : vkd3d-shader: Add some colour to d3d-asm opcodes.
by Alexandre Julliard 16 Feb '21

16 Feb '21

Module: vkd3d Branch: master Commit: 6680d9e8651c1b0d1a0e9773ab180835cd454130 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6680d9e8651c1b0d1a0e977… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 16 14:58:27 2021 +0100 vkd3d-shader: Add some colour to d3d-asm opcodes. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/trace.c | 51 ++++++++++++++++++++++++++++---- libs/vkd3d-shader/vkd3d_shader_main.c | 2 +- libs/vkd3d-shader/vkd3d_shader_private.h | 3 +- 3 files changed, 49 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 18e80e5..fb5370a 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -300,10 +300,17 @@ shader_input_sysval_semantic_names[] = {VKD3D_SIV_LINE_DENSITY_TESS_FACTOR, "finalLineDensityTessFactor"}, }; +struct vkd3d_d3d_asm_colours +{ + const char *reset; + const char *opcode; +}; + struct vkd3d_d3d_asm_compiler { struct vkd3d_string_buffer buffer; struct vkd3d_shader_version shader_version; + struct vkd3d_d3d_asm_colours colours; }; static int shader_ver_ge(const struct vkd3d_shader_version *v, int major, int minor) @@ -1334,7 +1341,8 @@ static void shader_dump_register_space(struct vkd3d_d3d_asm_compiler *compiler, static void shader_print_opcode(struct vkd3d_d3d_asm_compiler *compiler, enum vkd3d_shader_opcode opcode) { - vkd3d_string_buffer_printf(&compiler->buffer, "%s", shader_opcode_names[opcode]); + vkd3d_string_buffer_printf(&compiler->buffer, "%s%s%s", compiler->colours.opcode, + shader_opcode_names[opcode], compiler->colours.reset); } static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler, @@ -1360,9 +1368,10 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler, { case VKD3DSIH_DCL: case VKD3DSIH_DCL_UAV_TYPED: + vkd3d_string_buffer_printf(buffer, "%s", compiler->colours.opcode); shader_dump_decl_usage(compiler, &ins->declaration.semantic, ins->flags); shader_dump_ins_modifiers(compiler, &ins->declaration.semantic.resource.reg); - shader_addline(buffer, " "); + vkd3d_string_buffer_printf(buffer, "%s ", compiler->colours.reset); shader_dump_register(compiler, &ins->declaration.semantic.resource.reg.reg); shader_dump_register_space(compiler, ins->declaration.semantic.resource.register_space); break; @@ -1602,21 +1611,53 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler, shader_addline(buffer, "\n"); } -enum vkd3d_result vkd3d_dxbc_binary_to_text(void *data, struct vkd3d_shader_code *out) +enum vkd3d_result vkd3d_dxbc_binary_to_text(void *data, + const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out) { + enum vkd3d_shader_compile_option_formatting_flags formatting; struct vkd3d_shader_version *shader_version; struct vkd3d_d3d_asm_compiler compiler; enum vkd3d_result result = VKD3D_OK; struct vkd3d_string_buffer *buffer; const DWORD *ptr; + unsigned int i; void *code; + static const struct vkd3d_d3d_asm_colours no_colours = + { + .reset = "", + .opcode = "", + }; + static const struct vkd3d_d3d_asm_colours colours = + { + .reset = "\x1b[m", + .opcode = "\x1b[96;1m", + }; + + formatting = VKD3D_SHADER_COMPILE_OPTION_FORMATTING_INDENT + | VKD3D_SHADER_COMPILE_OPTION_FORMATTING_HEADER; + if (compile_info) + { + for (i = 0; i < compile_info->option_count; ++i) + { + const struct vkd3d_shader_compile_option *option = &compile_info->options[i]; + + if (option->name == VKD3D_SHADER_COMPILE_OPTION_FORMATTING) + formatting = option->value; + } + } + + if (formatting & VKD3D_SHADER_COMPILE_OPTION_FORMATTING_COLOUR) + compiler.colours = colours; + else + compiler.colours = no_colours; + buffer = &compiler.buffer; vkd3d_string_buffer_init(buffer); shader_version = &compiler.shader_version; shader_sm4_read_header(data, &ptr, shader_version); - vkd3d_string_buffer_printf(buffer, "%s_%u_%u\n", + vkd3d_string_buffer_printf(buffer, "%s%s_%u_%u\n", compiler.colours.reset, shader_get_type_prefix(shader_version->type), shader_version->major, shader_version->minor); while (!shader_sm4_is_end(data, &ptr)) @@ -1656,7 +1697,7 @@ void vkd3d_shader_trace(void *data) const char *p, *q, *end; struct vkd3d_shader_code code; - if (vkd3d_dxbc_binary_to_text(data, &code) != VKD3D_OK) + if (vkd3d_dxbc_binary_to_text(data, NULL, &code) != VKD3D_OK) return; end = (const char *)code.code + code.size; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index c1306ca..6f1482a 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -920,7 +920,7 @@ static int compile_dxbc_tpf(const struct vkd3d_shader_compile_info *compile_info if (compile_info->target_type == VKD3D_SHADER_TARGET_D3D_ASM) { vkd3d_shader_free_scan_descriptor_info(&scan_descriptor_info); - ret = vkd3d_dxbc_binary_to_text(parser.data, out); + ret = vkd3d_dxbc_binary_to_text(parser.data, compile_info, out); vkd3d_shader_parser_destroy(&parser); return ret; } diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 1975848..e9e10ba 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -851,7 +851,8 @@ struct vkd3d_string_buffer unsigned int content_size; }; -enum vkd3d_result vkd3d_dxbc_binary_to_text(void *data, struct vkd3d_shader_code *out) DECLSPEC_HIDDEN; +enum vkd3d_result vkd3d_dxbc_binary_to_text(void *data, + const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out) DECLSPEC_HIDDEN; void vkd3d_string_buffer_cleanup(struct vkd3d_string_buffer *buffer) DECLSPEC_HIDDEN; void vkd3d_string_buffer_init(struct vkd3d_string_buffer *buffer) DECLSPEC_HIDDEN; int vkd3d_string_buffer_printf(struct vkd3d_string_buffer *buffer,

1 0

Zebediah Figura : vkd3d-shader: Replace "parse_status" with a boolean variable.
by Alexandre Julliard 16 Feb '21

16 Feb '21

Module: vkd3d Branch: master Commit: 193218f54ed50e79760dd9ac49103debc5c97eb3 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=193218f54ed50e79760dd9a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Feb 12 14:38:46 2021 -0600 vkd3d-shader: Replace "parse_status" with a boolean variable. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 4 +--- libs/vkd3d-shader/hlsl.h | 17 +---------------- libs/vkd3d-shader/hlsl.y | 6 +++--- 3 files changed, 5 insertions(+), 22 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index a129e84..4151c84 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -35,14 +35,12 @@ void hlsl_error(struct hlsl_ctx *ctx, const struct vkd3d_shader_location loc, co { /* FIXME */ - set_parse_status(&ctx->status, PARSE_ERR); + ctx->failed = true; } void hlsl_warning(struct hlsl_ctx *ctx, const struct vkd3d_shader_location loc, const char *fmt, ...) { /* FIXME */ - - set_parse_status(&ctx->status, PARSE_WARN); } bool hlsl_add_var(struct hlsl_ctx *ctx, struct hlsl_ir_var *decl, bool local_var) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 067aae8..88e7df5 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -23,13 +23,6 @@ #include "vkd3d_shader_private.h" #include "rbtree.h" -enum parse_status -{ - PARSE_SUCCESS = 0, - PARSE_WARN = 1, - PARSE_ERR = 2 -}; - /* The general IR structure is inspired by Mesa GLSL hir, even though the code * ends up being quite different in practice. Anyway, here comes the relevant * licensing information. @@ -396,8 +389,8 @@ struct hlsl_ctx const char **source_files; unsigned int source_files_count; struct vkd3d_shader_location location; - enum parse_status status; struct vkd3d_shader_message_context *message_context; + bool failed; void *scanner; @@ -501,14 +494,6 @@ static inline void hlsl_src_remove(struct hlsl_src *src) src->node = NULL; } -static inline void set_parse_status(enum parse_status *current, enum parse_status update) -{ - if (update == PARSE_ERR) - *current = PARSE_ERR; - else if (update == PARSE_WARN && *current == PARSE_SUCCESS) - *current = PARSE_WARN; -} - const char *hlsl_base_type_to_string(const struct hlsl_type *type) DECLSPEC_HIDDEN; const char *debug_hlsl_type(const struct hlsl_type *type) DECLSPEC_HIDDEN; const char *hlsl_debug_modifiers(DWORD modifiers) DECLSPEC_HIDDEN; diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index d7201f5..2fda89e 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2006,7 +2006,7 @@ param_list: if (!add_func_parameter(ctx, $$, &$1, @1)) { ERR("Error adding function parameter %s.\n", $1.name); - set_parse_status(&ctx->status, PARSE_ERR); + ctx->failed = true; YYABORT; } } @@ -3111,7 +3111,7 @@ int hlsl_parser_compile(struct hlsl_ctx *ctx, const char *entrypoint) yyparse(ctx->scanner, ctx); - if (ctx->status == PARSE_ERR) + if (ctx->failed) return VKD3D_ERROR_INVALID_SHADER; if (!(entry_func = get_func_entry(ctx, entrypoint))) @@ -3140,7 +3140,7 @@ int hlsl_parser_compile(struct hlsl_ctx *ctx, const char *entrypoint) compute_liveness(ctx, entry_func); - if (ctx->status == PARSE_ERR) + if (ctx->failed) return VKD3D_ERROR_INVALID_SHADER; return VKD3D_ERROR_NOT_IMPLEMENTED; }

1 0