Skip to content

Commit e85d767

Browse files
fixup broken build due to backport
1 parent 02d368d commit e85d767

1 file changed

Lines changed: 16 additions & 9 deletions

File tree

patches/wine-hotfixes/pending/ntdll-prefer-native-version-resource-heuristics.patch

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 044a1ff32ed0dc049afefe0f4fe2eff899ead177 Mon Sep 17 00:00:00 2001
1+
From e446c7799a63df93beeaa83281b3f828313c5d15 Mon Sep 17 00:00:00 2001
22
From: Alexandre Julliard <julliard@winehq.org>
33
Date: Sun, 16 Aug 2026 02:24:57 -0600
44
Subject: [PATCH] ntdll: Add heuristics to prefer native dll based on the
@@ -9,16 +9,16 @@ For now checking that CompanyName is not "Microsoft".
99
Backport of Wine commit a31ec8da9572672e04ae46792a398da942649875. Include its required version-resource transport from 43ede577eab34ef8d6ccac371b768187ffdfe427 and adapt it to Proton Wine's pre-pe_mapping_info loader API.
1010
---
1111
dlls/ntdll/unix/loader.c | 9 +--
12-
dlls/ntdll/unix/loadorder.c | 116 +++++++++++++++++++++++++++++--
12+
dlls/ntdll/unix/loadorder.c | 116 ++++++++++++++++++++++++++++--
1313
dlls/ntdll/unix/unix_private.h | 5 +-
1414
dlls/ntdll/unix/virtual.c | 29 +++++---
1515
include/wine/server_protocol.h | 3 +
16-
server/mapping.c | 101 ++++++++++++++++++++++++++-
16+
server/mapping.c | 101 +++++++++++++++++++++++++-
1717
server/protocol.def | 2 +
1818
server/request_handlers.h | 5 +-
1919
server/request_trace.h | 3 +
20-
server/trace.c | 120 ++++++++++++++++++++++++++++++---
21-
10 files changed, 356 insertions(+), 37 deletions(-)
20+
server/trace.c | 127 ++++++++++++++++++++++++++++++---
21+
10 files changed, 363 insertions(+), 37 deletions(-)
2222

2323
diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c
2424
index 217357f..24ed112 100644
@@ -608,10 +608,10 @@ index 4446a6b..96f2462 100644
608608
dump_varargs_string( ", exp_name=", cur_size );
609609
}
610610
diff --git a/server/trace.c b/server/trace.c
611-
index 80621d5..3b66b39 100644
611+
index 80621d5..f7d7f1d 100644
612612
--- a/server/trace.c
613613
+++ b/server/trace.c
614-
@@ -83,6 +83,17 @@ static const char *get_status_name( unsigned int status )
614+
@@ -83,6 +83,24 @@ static const char *get_status_name( unsigned int status )
615615
return buffer;
616616
}
617617

@@ -625,11 +625,18 @@ index 80621d5..3b66b39 100644
625625
+ }
626626
+ fputc( '}', stderr );
627627
+}
628+
+
629+
+static void dump_unicode_str( const char *prefix, const WCHAR *str, data_size_t size )
630+
+{
631+
+ fprintf( stderr, "%sL\"", prefix );
632+
+ dump_strW( str, size, stderr, "\"\"" );
633+
+ fputc( '"', stderr );
634+
+}
628635
+
629636
static void dump_uints( const char *prefix, const unsigned int *ptr, int len )
630637
{
631638
fprintf( stderr, "%s{", prefix );
632-
@@ -542,16 +553,7 @@ static void dump_varargs_uints64( const char *prefix, data_size_t size )
639+
@@ -542,16 +560,7 @@ static void dump_varargs_uints64( const char *prefix, data_size_t size )
633640

634641
static void dump_varargs_ushorts( const char *prefix, data_size_t size )
635642
{
@@ -647,7 +654,7 @@ index 80621d5..3b66b39 100644
647654
remove_data( size );
648655
}
649656

650-
@@ -1387,6 +1389,104 @@ static void dump_varargs_pe_image_info( const char *prefix, data_size_t size )
657+
@@ -1387,6 +1396,104 @@ static void dump_varargs_pe_image_info( const char *prefix, data_size_t size )
651658
remove_data( min( size, sizeof(info) ));
652659
}
653660

0 commit comments

Comments
 (0)