April 2021 - Wine-Commits - list.winehq.org

Francois Gouget : winetest: Allow overriding $workdir from the command line.
by Alexandre Julliard April 9, 2021

April 9, 2021

Module: tools Branch: master Commit: ff335cbef527852af9968bbf08ac4835370da9d0 URL: https://source.winehq.org/git/tools.git/?a=commit;h=ff335cbef527852af9968bb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Apr 9 11:42:44 2021 +0200 winetest: Allow overriding $workdir from the command line. $workdir is typically already set in winetest.conf and modifying that file should not be necessary to use the --workdir option. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-index | 4 ++-- winetest/dissect | 5 ++--- winetest/gather | 5 ++--- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/winetest/build-index b/winetest/build-index index 91c7c92..94453f4 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -113,7 +113,7 @@ my @groups = (\%w95, \%w98, \%me, \%nt3, \%nt4, \%w2k, \%xp, \%w2k3, \%vista, \% # Command line processing # -my $usage; +my ($opt_workdir, $usage); sub check_opt_val($$) { @@ -138,7 +138,7 @@ while (@ARGV) my $arg = shift @ARGV; if ($arg eq "--workdir") { - $workdir = check_opt_val($arg, $workdir); + $workdir = $opt_workdir = check_opt_val($arg, $opt_workdir); } elsif ($arg eq "--help") { diff --git a/winetest/dissect b/winetest/dissect index c681c7d..12df56a 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -28,7 +28,6 @@ # created to signal the change in the given build. # # To test this script: -# - Make sure $workdir is not set in winetest.conf # - Put a test report in queue/rep1/report # - Run ./dissect # - Examine the result in data/ @@ -112,7 +111,7 @@ sub short_date($) # Command line processing # -my ($update, $report, $usage); +my ($opt_workdir, $update, $report, $usage); sub check_opt_val($$) { @@ -137,7 +136,7 @@ while (@ARGV) my $arg = shift @ARGV; if ($arg eq "--workdir") { - $workdir = check_opt_val($arg, $workdir); + $workdir = $opt_workdir = check_opt_val($arg, $opt_workdir); } elsif ($arg eq "--update") { diff --git a/winetest/gather b/winetest/gather index 51d4838..ae754d9 100755 --- a/winetest/gather +++ b/winetest/gather @@ -26,7 +26,6 @@ # level. # # To test this script: -# - Make sure $workdir is not set in winetest.conf # - After running dissect, run ./gather # - Examine the result in data/ # @@ -180,7 +179,7 @@ my %idmap = (95=>\%w95, 98=>\%w98, me=>\%me, nt3=>\%nt3, nt4=>\%nt4, 2000=>\%w2k # Command line processing # -my ($builddir, $usage); +my ($opt_workdir, $builddir, $usage); sub check_opt_val($$) { @@ -205,7 +204,7 @@ while (@ARGV) my $arg = shift @ARGV; if ($arg eq "--workdir") { - $workdir = check_opt_val($arg, $workdir); + $workdir = $opt_workdir = check_opt_val($arg, $opt_workdir); } elsif ($arg eq "--update") {

1 0

Francois Gouget : winetest/gather: Use the report platform as the column header.
by Alexandre Julliard April 9, 2021

April 9, 2021

Module: tools Branch: master Commit: 4686519e3fa83b3eaa7c62b06316b73b481d4408 URL: https://source.winehq.org/git/tools.git/?a=commit;h=4686519e3fa83b3eaa7c62b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Apr 9 11:40:46 2021 +0200 winetest/gather: Use the report platform as the column header. A group index page may contain reports from different but related platforms, for instance Windows 8 and 8.1, or Windows 10 1507 and 1607. This allows immediately identifying a report's exact Windows version. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/gather | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/winetest/gather b/winetest/gather index 302def4..51d4838 100755 --- a/winetest/gather +++ b/winetest/gather @@ -295,9 +295,12 @@ foreach my $file (glob "$builddir/*/summary.txt") { next; } - my $report = { group => $group}; - $report->{tag} = @tag?"@tag":""; - $report->{dir} = $dir; + my $report = { + id => $id, + group => $group, + tag => @tag ? "@tag" : "", + dir => $dir, + }; if (!open TEST, "<$file") { error("could not open '$file' for reading: $!\n"); next; @@ -523,7 +526,7 @@ sub build_header_footer($) if (!defined $msg) { $msg = <<"EOF"; - $group->{name} + $report->{id} <a href=\"$report->{dir}/version.html\">$report->{tag}</a> EOF chop $msg;

1 0

Hugh McMaster : reg: Allow /reg:32 and /reg:64 switches to be passed via the command line.
by Alexandre Julliard April 8, 2021

April 8, 2021

1 0

Alistair Leslie-Hughes : ntdll: Stub NtQuerySystemInformation(SystemCodeIntegrityInformation).
by Alexandre Julliard April 8, 2021

April 8, 2021

Module: wine Branch: master Commit: 3269da9b46eaec8e3ea263fc8ecfcd24d3d8b6e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3269da9b46eaec8e3ea263fc… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Apr 7 23:44:38 2021 -0500 ntdll: Stub NtQuerySystemInformation(SystemCodeIntegrityInformation). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49192 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/system.c | 15 +++++++++++++++ include/winternl.h | 21 +++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 2b316095f4a..d3e380b8c32 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -2827,6 +2827,21 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, break; } + case SystemCodeIntegrityInformation: + { + SYSTEM_CODEINTEGRITY_INFORMATION *integrity_info = info; + + FIXME("SystemCodeIntegrityInformation, size %u, info %p, stub!\n", size, info); + + len = sizeof(SYSTEM_CODEINTEGRITY_INFORMATION); + + if (size < len) + integrity_info->CodeIntegrityOptions = CODEINTEGRITY_OPTION_ENABLED; + else + ret = STATUS_INFO_LENGTH_MISMATCH; + break; + } + default: FIXME( "(0x%08x,%p,0x%08x,%p) stub\n", class, info, size, ret_size ); diff --git a/include/winternl.h b/include/winternl.h index 298ebbc2d36..7632cfcb999 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1698,6 +1698,27 @@ typedef enum _SYSTEM_INFORMATION_CLASS { #endif } SYSTEM_INFORMATION_CLASS, *PSYSTEM_INFORMATION_CLASS; +typedef struct _SYSTEM_CODEINTEGRITY_INFORMATION +{ + ULONG Length; + ULONG CodeIntegrityOptions; +} SYSTEM_CODEINTEGRITY_INFORMATION, *PSYSTEM_CODEINTEGRITY_INFORMATION; + +#define CODEINTEGRITY_OPTION_ENABLED 0x0001 +#define CODEINTEGRITY_OPTION_TESTSIGN 0x0002 +#define CODEINTEGRITY_OPTION_UMCI_ENABLED 0x0004 +#define CODEINTEGRITY_OPTION_UMCI_AUDITMODE_ENABLED 0x0008 +#define CODEINTEGRITY_OPTION_UMCI_EXCLUSIONPATHS_ENABLED 0x0010 +#define CODEINTEGRITY_OPTION_TEST_BUILD 0x0020 +#define CODEINTEGRITY_OPTION_PREPRODUCTION_BUILD 0x0040 +#define CODEINTEGRITY_OPTION_DEBUGMODE_ENABLED 0x0080 +#define CODEINTEGRITY_OPTION_FLIGHT_BUILD 0x0100 +#define CODEINTEGRITY_OPTION_FLIGHTING_ENABLED 0x0200 +#define CODEINTEGRITY_OPTION_HVCI_KMCI_ENABLED 0x0400 +#define CODEINTEGRITY_OPTION_HVCI_KMCI_AUDITMODE_ENABLED 0x0800 +#define CODEINTEGRITY_OPTION_HVCI_KMCI_STRICTMODE_ENABLED 0x1000 +#define CODEINTEGRITY_OPTION_HVCI_IUM_ENABLED 0x2000 + typedef enum _THREADINFOCLASS { ThreadBasicInformation = 0, ThreadTimes,

1 0

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_cs_emit_generate_mipmaps().
by Alexandre Julliard April 8, 2021

April 8, 2021

Module: wine Branch: master Commit: 88456957fb05ef2e67012a6f30f66565c0ba2bf1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=88456957fb05ef2e67012a6f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 7 21:19:59 2021 -0500 wined3d: Pass a wined3d_device_context to wined3d_cs_emit_generate_mipmaps(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 7 ++++--- dlls/wined3d/view.c | 2 +- dlls/wined3d/wined3d_private.h | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index fb8411b3048..16a8385c0b4 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2650,17 +2650,18 @@ static void wined3d_cs_exec_generate_mipmaps(struct wined3d_cs *cs, const void * wined3d_resource_release(view->resource); } -void wined3d_cs_emit_generate_mipmaps(struct wined3d_cs *cs, struct wined3d_shader_resource_view *view) +void wined3d_device_context_emit_generate_mipmaps(struct wined3d_device_context *context, + struct wined3d_shader_resource_view *view) { struct wined3d_cs_generate_mipmaps *op; - op = wined3d_device_context_require_space(&cs->c, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_GENERATE_MIPMAPS; op->view = view; wined3d_resource_acquire(view->resource); - wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_DEFAULT); + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_emit_stop(struct wined3d_cs *cs) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index f0833ff9e49..d386ebe1866 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1423,7 +1423,7 @@ void CDECL wined3d_shader_resource_view_generate_mipmaps(struct wined3d_shader_r return; } - wined3d_cs_emit_generate_mipmaps(view->resource->device->cs, view); + wined3d_device_context_emit_generate_mipmaps(&view->resource->device->cs->c, view); } ULONG CDECL wined3d_unordered_access_view_incref(struct wined3d_unordered_access_view *view) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 38f19b21fbf..5fee3bf14aa 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4730,7 +4730,6 @@ void wined3d_cs_emit_clear_rendertarget_view(struct wined3d_cs *cs, struct wined void wined3d_cs_emit_clear_unordered_access_view_uint(struct wined3d_cs *cs, struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value) DECLSPEC_HIDDEN; void wined3d_cs_emit_flush(struct wined3d_cs *cs) DECLSPEC_HIDDEN; -void wined3d_cs_emit_generate_mipmaps(struct wined3d_cs *cs, struct wined3d_shader_resource_view *view) DECLSPEC_HIDDEN; void wined3d_cs_emit_preload_resource(struct wined3d_cs *cs, struct wined3d_resource *resource) DECLSPEC_HIDDEN; void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *swapchain, const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, unsigned int swap_interval, DWORD flags) DECLSPEC_HIDDEN; @@ -4788,6 +4787,8 @@ void wined3d_device_context_emit_draw(struct wined3d_device_context *context, enum wined3d_primitive_type primitive_type, unsigned int patch_vertex_count, int base_vertex_idx, unsigned int start_idx, unsigned int index_count, unsigned int start_instance, unsigned int instance_count, bool indexed) DECLSPEC_HIDDEN; +void wined3d_device_context_emit_generate_mipmaps(struct wined3d_device_context *context, + struct wined3d_shader_resource_view *view) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_blend_state(struct wined3d_device_context *context, struct wined3d_blend_state *state, const struct wined3d_color *blend_factor, unsigned int sample_mask) DECLSPEC_HIDDEN;

1 0

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_device_clear_rendertarget_view().
by Alexandre Julliard April 8, 2021

April 8, 2021

Module: wine Branch: master Commit: fbd1e2eb6ba49e2f6b240664b70a702b3721cb26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fbd1e2eb6ba49e2f6b240664… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 7 21:20:03 2021 -0500 wined3d: Pass a wined3d_device_context to wined3d_device_clear_rendertarget_view(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 16 ++++++++-------- dlls/d3d9/device.c | 2 +- dlls/ddraw/surface.c | 13 +++++++------ dlls/wined3d/device.c | 12 ++++++------ dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 6 +++--- 6 files changed, 26 insertions(+), 25 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fbd1e2eb6ba49e2f6b24…

1 0

Alexandre Julliard : ntdll: Add a WINEBOOTSTRAPMODE environment variable to allow loading non-existent builtins.
by Alexandre Julliard April 8, 2021

April 8, 2021

Module: wine Branch: master Commit: 446f7e3aa8a906c9213d92f1572e8373286c543a URL: https://source.winehq.org/git/wine.git/?a=commit;h=446f7e3aa8a906c9213d92f1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 8 12:22:25 2021 +0200 ntdll: Add a WINEBOOTSTRAPMODE environment variable to allow loading non-existent builtins. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50905 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 12 ++++++------ dlls/ntdll/unix/env.c | 31 +++++++++++++++++++++++++------ dlls/ntdll/unix/loader.c | 16 ++++------------ dlls/ntdll/unix/unix_private.h | 1 + 4 files changed, 36 insertions(+), 24 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index e1810bc5ab9..e919d7e2671 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1926,14 +1926,10 @@ static NTSTATUS build_module( LPCWSTR load_path, const UNICODE_STRING *nt_name, static void build_ntdll_module(void) { MEMORY_BASIC_INFORMATION meminfo; - FILE_BASIC_INFORMATION basic_info; UNICODE_STRING nt_name; - OBJECT_ATTRIBUTES attr; WINE_MODREF *wm; RtlInitUnicodeString( &nt_name, L"\\??\\C:\\windows\\system32\\ntdll.dll" ); - InitializeObjectAttributes( &attr, &nt_name, OBJ_CASE_INSENSITIVE, 0, NULL ); - is_prefix_bootstrap = NtQueryAttributesFile( &attr, &basic_info) != STATUS_SUCCESS; NtQueryVirtualMemory( GetCurrentProcess(), build_ntdll_module, MemoryBasicInformation, &meminfo, sizeof(meminfo), NULL ); wm = alloc_module( meminfo.AllocationBase, &nt_name, TRUE ); @@ -2672,7 +2668,7 @@ static NTSTATUS search_dll_file( LPCWSTR paths, LPCWSTR search, UNICODE_STRING * if (found_image) status = STATUS_IMAGE_MACHINE_TYPE_MISMATCH; - else if (is_prefix_bootstrap && !wcspbrk( search, L":/\\" )) + else if (is_prefix_bootstrap && !contains_path( search )) status = find_builtin_without_file( search, nt_name, pwm, mapping, image_info, id ); done: @@ -3498,10 +3494,14 @@ static void process_breakpoint(void) static void load_global_options(void) { OBJECT_ATTRIBUTES attr; - UNICODE_STRING name_str; + UNICODE_STRING name_str, val_str; HANDLE hkey; ULONG value; + RtlInitUnicodeString( &name_str, L"WINEBOOTSTRAPMODE" ); + val_str.MaximumLength = 0; + is_prefix_bootstrap = RtlQueryEnvironmentVariable_U( NULL, &name_str, &val_str ) != STATUS_VARIABLE_NOT_FOUND; + attr.Length = sizeof(attr); attr.RootDirectory = 0; attr.ObjectName = &name_str; diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 10089a740c2..01d4f3ea418 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -64,6 +64,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(environ); USHORT *uctable = NULL, *lctable = NULL; SIZE_T startup_info_size = 0; +BOOL is_prefix_bootstrap = FALSE; + +static const WCHAR bootstrapW[] = {'W','I','N','E','B','O','O','T','S','T','R','A','P','M','O','D','E'}; int main_argc = 0; char **main_argv = NULL; @@ -1211,6 +1214,18 @@ static WCHAR *find_env_var( WCHAR *env, SIZE_T size, const WCHAR *name, SIZE_T n return NULL; } +static WCHAR *get_env_var( WCHAR *env, SIZE_T size, const WCHAR *name, SIZE_T namelen ) +{ + WCHAR *ret = NULL, *var = find_env_var( env, size, name, namelen ); + + if (var) + { + var += namelen + 1; /* skip name */ + if ((ret = malloc( (wcslen(var) + 1) * sizeof(WCHAR) ))) wcscpy( ret, var ); + } + return ret; +} + /* set an environment variable, replacing it if it exists */ static void set_env_var( WCHAR **env, SIZE_T *pos, SIZE_T *size, const WCHAR *name, SIZE_T namelen, const WCHAR *value ) @@ -1889,29 +1904,32 @@ static inline WCHAR *get_dos_path( WCHAR *nt_path ) */ static RTL_USER_PROCESS_PARAMETERS *build_initial_params(void) { + static const WCHAR valueW[] = {'1',0}; static const WCHAR pathW[] = {'P','A','T','H'}; RTL_USER_PROCESS_PARAMETERS *params = NULL; SIZE_T size, env_pos, env_size; - WCHAR *dst, *image, *cmdline, *p, *path = NULL; + WCHAR *dst, *image, *cmdline, *path, *bootstrap; WCHAR *env = get_initial_environment( &env_pos, &env_size ); WCHAR *curdir = get_initial_directory(); void *module = NULL; NTSTATUS status; /* store the initial PATH value */ - if ((p = find_env_var( env, env_pos, pathW, 4 ))) - { - path = malloc( (wcslen(p + 5) + 1) * sizeof(WCHAR) ); - wcscpy( path, p + 5 ); - } + path = get_env_var( env, env_pos, pathW, 4 ); add_dynamic_environment( &env, &env_pos, &env_size ); add_registry_environment( &env, &env_pos, &env_size ); + bootstrap = get_env_var( env, env_pos, bootstrapW, ARRAY_SIZE(bootstrapW) ); + set_env_var( &env, &env_pos, &env_size, bootstrapW, ARRAY_SIZE(bootstrapW), valueW ); + is_prefix_bootstrap = TRUE; env[env_pos] = 0; run_wineboot( env, env_pos ); /* reload environment now that wineboot has run */ set_env_var( &env, &env_pos, &env_size, pathW, 4, path ); /* reset PATH */ free( path ); + set_env_var( &env, &env_pos, &env_size, bootstrapW, ARRAY_SIZE(bootstrapW), bootstrap ); + is_prefix_bootstrap = !!bootstrap; + free( bootstrap ); add_registry_environment( &env, &env_pos, &env_size ); env[env_pos++] = 0; @@ -2012,6 +2030,7 @@ void init_startup_info(void) memcpy( env, (char *)info + info_size, env_size * sizeof(WCHAR) ); env_pos = env_size - 1; add_dynamic_environment( &env, &env_pos, &env_size ); + is_prefix_bootstrap = !!find_env_var( env, env_pos, bootstrapW, ARRAY_SIZE(bootstrapW) ); env[env_pos++] = 0; size = (sizeof(*params) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index e362f5eb4db..cbafa0d8882 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1387,10 +1387,10 @@ BOOL is_builtin_path( const UNICODE_STRING *path, WORD *machine ) { static const WCHAR wow64W[] = {'\\','?','?','\\','c',':','\\','w','i','n','d','o','w','s','\\', 's','y','s','w','o','w','6','4'}; - BOOL is_prefix_bootstrap; unsigned int len; - struct stat st; - char *ntdll; + + /* only fake builtin existence during prefix bootstrap */ + if (!is_prefix_bootstrap) return FALSE; *machine = current_machine; if (path->Length > wcslen(system_dir) * sizeof(WCHAR) && @@ -1413,15 +1413,7 @@ found: len = wcslen(system_dir); while (len < path->Length / sizeof(WCHAR) && path->Buffer[len] == '\\') len++; while (len < path->Length / sizeof(WCHAR) && path->Buffer[len] != '\\') len++; - if (len != path->Length / sizeof(WCHAR)) return FALSE; - - /* if the corresponding ntdll exists, don't fake the existence of the builtin */ - ntdll = build_path( config_dir, *machine == IMAGE_FILE_MACHINE_I386 ? - "dosdevices/c:/windows/syswow64/ntdll.dll" : - "dosdevices/c:/windows/system32/ntdll.dll" ); - is_prefix_bootstrap = stat( ntdll, &st ) == -1; - free( ntdll ); - return is_prefix_bootstrap; + return (len == path->Length / sizeof(WCHAR)); } diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index d0fa7a54f49..0f14e69f2be 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -120,6 +120,7 @@ extern const char **dll_paths DECLSPEC_HIDDEN; extern USHORT *uctable DECLSPEC_HIDDEN; extern USHORT *lctable DECLSPEC_HIDDEN; extern SIZE_T startup_info_size DECLSPEC_HIDDEN; +extern BOOL is_prefix_bootstrap DECLSPEC_HIDDEN; extern SECTION_IMAGE_INFORMATION main_image_info DECLSPEC_HIDDEN; extern int main_argc DECLSPEC_HIDDEN; extern char **main_argv DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : makefiles: Only allow includes and defines in pkg-config flags.
by Alexandre Julliard April 8, 2021

April 8, 2021

Module: wine Branch: master Commit: 4f04994ef47b5077e13c1b770ed0f818f59adcd5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f04994ef47b5077e13c1b77… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 8 11:43:13 2021 +0200 makefiles: Only allow includes and defines in pkg-config flags. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50811 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 11 +---------- configure.ac | 11 +---------- tools/makedep.c | 2 +- 3 files changed, 3 insertions(+), 21 deletions(-) diff --git a/configure b/configure index 7d0cd5580fe..6b183eb4898 100755 --- a/configure +++ b/configure @@ -14620,16 +14620,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: gstreamer-1.0 gstreamer-video-1.0 gstream $as_echo "$as_me:${as_lineno-$LINENO}: gstreamer-1.0 gstreamer-video-1.0 gstreamer-audio-1.0 libs: $GSTREAMER_LIBS" >&5 ac_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $GSTREAMER_CFLAGS" -ac_gst_incl="" - for i in $GSTREAMER_CFLAGS - do - case "$i" in - -I*) ac_gst_incl="$ac_gst_incl $i";; - esac - done - GSTREAMER_CFLAGS=$ac_gst_incl - CPPFLAGS="$ac_save_CPPFLAGS $GSTREAMER_CFLAGS" - ac_fn_c_check_header_mongrel "$LINENO" "gst/gst.h" "ac_cv_header_gst_gst_h" "$ac_includes_default" +ac_fn_c_check_header_mongrel "$LINENO" "gst/gst.h" "ac_cv_header_gst_gst_h" "$ac_includes_default" if test "x$ac_cv_header_gst_gst_h" = xyes; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gint64 defined by gst/gst.h is indeed 64-bit" >&5 $as_echo_n "checking whether gint64 defined by gst/gst.h is indeed 64-bit... " >&6; } diff --git a/configure.ac b/configure.ac index cc63766a398..5c364bef0d9 100644 --- a/configure.ac +++ b/configure.ac @@ -1608,16 +1608,7 @@ dnl **** Check for gstreamer **** if test "x$with_gstreamer" != "xno" then WINE_PACKAGE_FLAGS(GSTREAMER,[gstreamer-1.0 gstreamer-video-1.0 gstreamer-audio-1.0],,,, - [ac_gst_incl="" - for i in $GSTREAMER_CFLAGS - do - case "$i" in - -I*) ac_gst_incl="$ac_gst_incl $i";; - esac - done - GSTREAMER_CFLAGS=$ac_gst_incl - CPPFLAGS="$ac_save_CPPFLAGS $GSTREAMER_CFLAGS" - AC_CHECK_HEADER([gst/gst.h], + [AC_CHECK_HEADER([gst/gst.h], [AC_MSG_CHECKING([whether gint64 defined by gst/gst.h is indeed 64-bit]) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <gst/gst.h>]], [[static int a[sizeof(gint64) > 4 ? 1 : -1]; if (a[0]) return 0;]])], diff --git a/tools/makedep.c b/tools/makedep.c index 8245a324279..0eef646479b 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -4263,7 +4263,7 @@ static void load_sources( struct makefile *make ) for (i = 0; i < value.count; i++) if (!strncmp( value.str[i], "-I", 2 )) strarray_add_uniq( &make->include_paths, value.str[i] + 2 ); - else + else if (!strncmp( value.str[i], "-D", 2 ) || !strncmp( value.str[i], "-U", 2 )) strarray_add_uniq( &make->define_args, value.str[i] ); strarray_addall( &make->define_args, get_expanded_make_var_array( make, "EXTRADEFS" ));

1 0

Alexandre Julliard : configure: Fix package name for FAudio.
by Alexandre Julliard April 8, 2021

April 8, 2021

Module: wine Branch: master Commit: f126809ec017570325b98abd797356ceba17e15e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f126809ec017570325b98abd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 8 11:45:18 2021 +0200 configure: Fix package name for FAudio. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50436 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 12 ++++++------ configure.ac | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/configure b/configure index ccbbd943cfe..7d0cd5580fe 100755 --- a/configure +++ b/configure @@ -2728,8 +2728,8 @@ Some influential environment variables: SDL2_CFLAGS C compiler flags for sdl2, overriding pkg-config SDL2_LIBS Linker flags for sdl2, overriding pkg-config FAUDIO_CFLAGS - C compiler flags for faudio, overriding pkg-config - FAUDIO_LIBS Linker flags for faudio, overriding pkg-config + C compiler flags for FAudio, overriding pkg-config + FAUDIO_LIBS Linker flags for FAudio, overriding pkg-config CAPI20_CFLAGS C compiler flags for capi20, overriding pkg-config CAPI20_LIBS Linker flags for capi20, overriding pkg-config @@ -15145,19 +15145,19 @@ if test "x$with_faudio" != "xno" then if ${FAUDIO_CFLAGS:+false} :; then : if ${PKG_CONFIG+:} false; then : - FAUDIO_CFLAGS=`$PKG_CONFIG --cflags faudio 2>/dev/null` + FAUDIO_CFLAGS=`$PKG_CONFIG --cflags FAudio 2>/dev/null` fi fi if ${FAUDIO_LIBS:+false} :; then : if ${PKG_CONFIG+:} false; then : - FAUDIO_LIBS=`$PKG_CONFIG --libs faudio 2>/dev/null` + FAUDIO_LIBS=`$PKG_CONFIG --libs FAudio 2>/dev/null` fi fi FAUDIO_LIBS=${FAUDIO_LIBS:-"-lFAudio"} -$as_echo "$as_me:${as_lineno-$LINENO}: faudio cflags: $FAUDIO_CFLAGS" >&5 -$as_echo "$as_me:${as_lineno-$LINENO}: faudio libs: $FAUDIO_LIBS" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: FAudio cflags: $FAUDIO_CFLAGS" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: FAudio libs: $FAUDIO_LIBS" >&5 ac_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $FAUDIO_CFLAGS" for ac_header in FAudio.h diff --git a/configure.ac b/configure.ac index 59e20dfb029..cc63766a398 100644 --- a/configure.ac +++ b/configure.ac @@ -1724,7 +1724,7 @@ WINE_NOTICE_WITH(sdl,[test "x$ac_cv_lib_soname_SDL2" = "x"], dnl **** Check for FAudio **** if test "x$with_faudio" != "xno" then - WINE_PACKAGE_FLAGS(FAUDIO,[faudio],[-lFAudio],,, + WINE_PACKAGE_FLAGS(FAUDIO,[FAudio],[-lFAudio],,, [AC_CHECK_HEADERS([FAudio.h], [WINE_CHECK_SONAME(FAudio,FAudioCreate,,,[$FAUDIO_LIBS],[[libFAudio*]])]) WINE_CHECK_LIB_FUNCS([FAudio_CommitOperationSet \

1 0

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_cs_emit_clear_rendertarget_view().
by Alexandre Julliard April 8, 2021

April 8, 2021

Module: wine Branch: master Commit: 4880afdc8e20bd3a8fdf31e139e6703601aa8c0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=4880afdc8e20bd3a8fdf31e1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 7 21:20:02 2021 -0500 wined3d: Pass a wined3d_device_context to wined3d_cs_emit_clear_rendertarget_view(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 11 ++++++----- dlls/wined3d/device.c | 2 +- dlls/wined3d/wined3d_private.h | 5 +++-- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 16a8385c0b4..a0b462b714a 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -728,14 +728,15 @@ void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT * wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_DEFAULT); } -void wined3d_cs_emit_clear_rendertarget_view(struct wined3d_cs *cs, struct wined3d_rendertarget_view *view, - const RECT *rect, DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) +void wined3d_device_context_emit_clear_rendertarget_view(struct wined3d_device_context *context, + struct wined3d_rendertarget_view *view, const RECT *rect, unsigned int flags, + const struct wined3d_color *color, float depth, unsigned int stencil) { struct wined3d_cs_clear *op; size_t size; size = FIELD_OFFSET(struct wined3d_cs_clear, rects[1]) + sizeof(struct wined3d_fb_state); - op = wined3d_device_context_require_space(&cs->c, size, WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_device_context_require_space(context, size, WINED3D_CS_QUEUE_DEFAULT); op->fb = (void *)&op->rects[1]; op->opcode = WINED3D_CS_OP_CLEAR; @@ -761,9 +762,9 @@ void wined3d_cs_emit_clear_rendertarget_view(struct wined3d_cs *cs, struct wined wined3d_resource_acquire(view->resource); - wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_DEFAULT); + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); if (flags & WINED3DCLEAR_SYNCHRONOUS) - wined3d_cs_finish(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_device_context_finish(context, WINED3D_CS_QUEUE_DEFAULT); } static void acquire_shader_resources(const struct wined3d_state *state, unsigned int shader_mask) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e21e22a46f7..e0eb5968df6 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5237,7 +5237,7 @@ HRESULT CDECL wined3d_device_clear_rendertarget_view(struct wined3d_device *devi return hr; } - wined3d_cs_emit_clear_rendertarget_view(device->cs, view, rect, flags, color, depth, stencil); + wined3d_device_context_emit_clear_rendertarget_view(&device->cs->c, view, rect, flags, color, depth, stencil); return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5fee3bf14aa..bc541a654e6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4725,8 +4725,6 @@ void wined3d_cs_emit_add_dirty_texture_region(struct wined3d_cs *cs, struct wined3d_texture *texture, unsigned int layer) DECLSPEC_HIDDEN; void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT *rects, DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) DECLSPEC_HIDDEN; -void wined3d_cs_emit_clear_rendertarget_view(struct wined3d_cs *cs, struct wined3d_rendertarget_view *view, - const RECT *rect, DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) DECLSPEC_HIDDEN; void wined3d_cs_emit_clear_unordered_access_view_uint(struct wined3d_cs *cs, struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value) DECLSPEC_HIDDEN; void wined3d_cs_emit_flush(struct wined3d_cs *cs) DECLSPEC_HIDDEN; @@ -4780,6 +4778,9 @@ void wined3d_device_context_emit_blt_sub_resource(struct wined3d_device_context struct wined3d_resource *dst_resource, unsigned int dst_sub_resource_idx, const struct wined3d_box *dst_box, struct wined3d_resource *src_resource, unsigned int src_sub_resource_idx, const struct wined3d_box *src_box, unsigned int flags, const struct wined3d_blt_fx *fx, enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN; +void wined3d_device_context_emit_clear_rendertarget_view(struct wined3d_device_context *context, + struct wined3d_rendertarget_view *view, const RECT *rect, unsigned int flags, + const struct wined3d_color *color, float depth, unsigned int stencil) DECLSPEC_HIDDEN; void wined3d_device_context_emit_copy_uav_counter(struct wined3d_device_context *context, struct wined3d_buffer *dst_buffer, unsigned int offset, struct wined3d_unordered_access_view *uav) DECLSPEC_HIDDEN;

1 0