wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-11-21 16:46:54 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 5ea3a044b83c4cd55a3c647f5e80511a85b9f536

Browse Source
This commit is contained in:
Alistair Leslie-Hughes 2019-08-20 08:39:18 +10:00
parent fb4fcb4da6
commit 2007f010ac
8 changed files with 105 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
patches/httpapi-HttpCreateServerSession/0003-httpapi-Add-CloseUrlGroup-stub.patch
View File

@ -1,4 +1,4 @@
From 1b3f783460eb8aa93e6a8da583dfc8edd3d6de9e Mon Sep 17 00:00:00 2001
From 79377cfe32f7b5570e34fa47a5c318f8cb166b4b Mon Sep 17 00:00:00 2001
From: Esdras Tarsis <esdrastarsis@gmail.com>
Date: Sat, 30 Mar 2019 19:07:39 -0300
Subject: [PATCH] httpapi: Add CloseUrlGroup stub.
@ -10,7 +10,7 @@ Subject: [PATCH] httpapi: Add CloseUrlGroup stub.
3 files changed, 11 insertions(+)
diff --git a/dlls/httpapi/httpapi.spec b/dlls/httpapi/httpapi.spec
index bcd09e7..b7d3705 100644
index f7c7167dae3..07d378e3199 100644
--- a/dlls/httpapi/httpapi.spec
+++ b/dlls/httpapi/httpapi.spec
@@ -8,6 +8,7 @@
@ -22,13 +22,14 @@ index bcd09e7..b7d3705 100644
@ stub HttpDeleteConfigGroup
@ stdcall HttpDeleteServiceConfiguration(ptr long ptr long ptr)
diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c
index 9280fc1..eca3b00 100644
index b011131aebe..557a496748a 100644
--- a/dlls/httpapi/httpapi_main.c
+++ b/dlls/httpapi/httpapi_main.c
@@ -212,4 +212,13 @@ ULONG WINAPI HttpCreateUrlGroup( HTTP_SERVER_SESSION_ID id, HTTP_URL_GROUP_ID *u
@@ -250,5 +250,14 @@ ULONG WINAPI HttpCreateUrlGroup( HTTP_SERVER_SESSION_ID id, HTTP_URL_GROUP_ID *u
*urlgroupid = 0xdeadbeef;
return NO_ERROR;
+ return NO_ERROR;
+}
+
+/***********************************************************************
@ -37,21 +38,21 @@ index 9280fc1..eca3b00 100644
+ULONG WINAPI HttpCloseUrlGroup( HTTP_URL_GROUP_ID urlgroupid )
+{
+ FIXME( "(%s): stub!\n", wine_dbgstr_longlong(urlgroupid));
+ return NO_ERROR;
return NO_ERROR;
}
\ No newline at end of file
diff --git a/include/http.h b/include/http.h
index 50a10f8..aa490dc 100644
index e12f0aa2e72..ff0dcaed5c7 100644
--- a/include/http.h
+++ b/include/http.h
@@ -61,6 +61,7 @@ ULONG WINAPI HttpAddUrl(HANDLE,PCWSTR,PVOID);
@@ -401,6 +401,7 @@ ULONG WINAPI HttpAddUrl(HANDLE,PCWSTR,PVOID);
ULONG WINAPI HttpCreateHttpHandle(PHANDLE,ULONG);
ULONG WINAPI HttpCreateUrlGroup(HTTP_SERVER_SESSION_ID,PHTTP_URL_GROUP_ID,ULONG);
ULONG WINAPI HttpCreateServerSession(HTTPAPI_VERSION,PHTTP_SERVER_SESSION_ID,ULONG);
+ULONG WINAPI HttpCloseUrlGroup(HTTP_URL_GROUP_ID);
ULONG WINAPI HttpCloseServerSession(HTTP_SERVER_SESSION_ID);
ULONG WINAPI HttpDeleteServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,LPOVERLAPPED);
ULONG WINAPI HttpQueryServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,PVOID,ULONG,PULONG,LPOVERLAPPED);
ULONG WINAPI HttpInitialize(HTTPAPI_VERSION version, ULONG flags, void *reserved);
--
1.9.1
2.17.1

31
patches/httpapi-HttpCreateServerSession/0005-httpapi-Add-SetUrlGroupProperty-stub.patch
View File

@ -1,4 +1,4 @@
From 017787e85014a96f76f0a2a02b577d489e35f08d Mon Sep 17 00:00:00 2001
From 164adf140bfabc0b7dcdbf8524feef82fbedb4cf Mon Sep 17 00:00:00 2001
From: Esdras Tarsis <esdrastarsis@gmail.com>
Date: Sun, 31 Mar 2019 07:17:26 -0300
Subject: [PATCH] httpapi: Add SetUrlGroupProperty stub.
@ -6,11 +6,11 @@ Subject: [PATCH] httpapi: Add SetUrlGroupProperty stub.
---
dlls/httpapi/httpapi.spec | 1 +
dlls/httpapi/httpapi_main.c | 10 ++++++++++
include/http.h | 13 +++++++++++++
3 files changed, 24 insertions(+)
include/http.h | 14 ++++++++++++++
3 files changed, 25 insertions(+)
diff --git a/dlls/httpapi/httpapi.spec b/dlls/httpapi/httpapi.spec
index 235c4ac..c1d3b6e 100644
index c94cca893ad..ee1619fed04 100644
--- a/dlls/httpapi/httpapi.spec
+++ b/dlls/httpapi/httpapi.spec
@@ -50,6 +50,7 @@
@ -22,10 +22,10 @@ index 235c4ac..c1d3b6e 100644
@ stub HttpShutdownFilter
@ stdcall HttpTerminate(long ptr)
diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c
index 7c83f81..3cb349f 100644
index bde01450017..cc7c0fe066e 100644
--- a/dlls/httpapi/httpapi_main.c
+++ b/dlls/httpapi/httpapi_main.c
@@ -233,3 +233,13 @@ ULONG WINAPI HttpCreateRequestQueue( HTTPAPI_VERSION version, PCWSTR name, PSECU
@@ -272,3 +272,13 @@ ULONG WINAPI HttpCreateRequestQueue( HTTPAPI_VERSION version, PCWSTR name, PSECU
*request = (HANDLE)0xbeefdead;
return NO_ERROR;
}
@ -40,13 +40,16 @@ index 7c83f81..3cb349f 100644
+}
+
diff --git a/include/http.h b/include/http.h
index 9ad7e10..9ac7309 100644
index 71dca3df754..1696d787e65 100644
--- a/include/http.h
+++ b/include/http.h
@@ -50,6 +50,18 @@ typedef enum _HTTP_SERVICE_CONFIG_ID
@@ -65,8 +65,21 @@ typedef enum _HTTP_SERVICE_CONFIG_ID
HttpServiceConfigMax
} HTTP_SERVICE_CONFIG_ID, *PHTTP_SERVICE_CONFIG_ID;
+
#define HTTP_NULL_ID ((ULONGLONG)0)
+typedef enum _HTTP_SERVER_PROPERTY
+{
+ HttpServerAuthenticationProperty,
@ -60,16 +63,16 @@ index 9ad7e10..9ac7309 100644
+} HTTP_SERVER_PROPERTY, *PHTTP_SERVER_PROPERTY;
+
typedef ULONGLONG HTTP_OPAQUE_ID, *PHTTP_OPAQUE_ID;
typedef HTTP_OPAQUE_ID HTTP_SERVER_SESSION_ID, *PHTTP_SERVER_SESSION_ID;
typedef HTTP_OPAQUE_ID HTTP_URL_GROUP_ID, *PHTTP_URL_GROUP_ID;
@@ -67,6 +79,7 @@ ULONG WINAPI HttpCloseServerSession(HTTP_SERVER_SESSION_ID);
ULONG WINAPI HttpDeleteServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,LPOVERLAPPED);
ULONG WINAPI HttpQueryServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,PVOID,ULONG,PULONG,LPOVERLAPPED);
typedef HTTP_OPAQUE_ID HTTP_CONNECTION_ID, *PHTTP_CONNECTION_ID;
typedef HTTP_OPAQUE_ID HTTP_RAW_CONNECTION_ID, *PHTTP_RAW_CONNECTION_ID;
@@ -412,6 +425,7 @@ ULONG WINAPI HttpReceiveHttpRequest(HANDLE queue, HTTP_REQUEST_ID id, ULONG flag
ULONG WINAPI HttpRemoveUrl(HANDLE queue, const WCHAR *url);
ULONG WINAPI HttpSendHttpResponse(HANDLE queue, HTTP_REQUEST_ID id, ULONG flags, HTTP_RESPONSE *response, HTTP_CACHE_POLICY *cache_policy, ULONG *ret_size, void *reserved1, ULONG reserved2, OVERLAPPED *ovl, HTTP_LOG_DATA *log_data);
ULONG WINAPI HttpSetServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,LPOVERLAPPED);
+ULONG WINAPI HttpSetUrlGroupProperty(HTTP_URL_GROUP_ID,HTTP_SERVER_PROPERTY,void *,ULONG);
#ifdef __cplusplus
}
--
1.9.1
2.17.1

27
patches/httpapi-HttpCreateServerSession/0006-httpapi-Add-AddUrlToUrlGroup-stub.patch
View File

@ -1,4 +1,4 @@
From 6c61664a2177dcd7ed63d217e9ec6e807d998d3a Mon Sep 17 00:00:00 2001
From 77f59623245af789b1eb36eb6b09973141b01019 Mon Sep 17 00:00:00 2001
From: Esdras Tarsis <esdrastarsis@gmail.com>
Date: Sun, 31 Mar 2019 07:32:57 -0300
Subject: [PATCH] httpapi: Add AddUrlToUrlGroup stub.
@ -6,11 +6,11 @@ Subject: [PATCH] httpapi: Add AddUrlToUrlGroup stub.
---
dlls/httpapi/httpapi.spec | 1 +
dlls/httpapi/httpapi_main.c | 9 +++++++++
include/http.h | 3 ++-
3 files changed, 12 insertions(+), 1 deletion(-)
include/http.h | 1 +
3 files changed, 11 insertions(+)
diff --git a/dlls/httpapi/httpapi.spec b/dlls/httpapi/httpapi.spec
index c1d3b6e..b337696 100644
index ee1619fed04..d93f4015605 100644
--- a/dlls/httpapi/httpapi.spec
+++ b/dlls/httpapi/httpapi.spec
@@ -1,6 +1,7 @@
@ -22,10 +22,10 @@ index c1d3b6e..b337696 100644
@ stub HttpCreateAppPool
@ stub HttpCreateConfigGroup
diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c
index 3cb349f..a844139 100644
index cc7c0fe066e..3913709259e 100644
--- a/dlls/httpapi/httpapi_main.c
+++ b/dlls/httpapi/httpapi_main.c
@@ -243,3 +243,12 @@ ULONG WINAPI HttpSetUrlGroupProperty( HTTP_URL_GROUP_ID urlgroupid, HTTP_SERVER_
@@ -282,3 +282,12 @@ ULONG WINAPI HttpSetUrlGroupProperty( HTTP_URL_GROUP_ID urlgroupid, HTTP_SERVER_
return NO_ERROR;
}
@ -39,18 +39,11 @@ index 3cb349f..a844139 100644
+}
+
diff --git a/include/http.h b/include/http.h
index 9ac7309..7d86b33 100644
index 1696d787e65..71c366c7371 100644
--- a/include/http.h
+++ b/include/http.h
@@ -64,12 +64,13 @@ typedef enum _HTTP_SERVER_PROPERTY
typedef ULONGLONG HTTP_OPAQUE_ID, *PHTTP_OPAQUE_ID;
typedef HTTP_OPAQUE_ID HTTP_SERVER_SESSION_ID, *PHTTP_SERVER_SESSION_ID;
-typedef HTTP_OPAQUE_ID HTTP_URL_GROUP_ID, *PHTTP_URL_GROUP_ID;
+typedef HTTP_OPAQUE_ID HTTP_URL_GROUP_ID, *PHTTP_URL_GROUP_ID, HTTP_URL_CONTEXT, *PHTTP_URL_CONTEXT;
ULONG WINAPI HttpInitialize(HTTPAPI_VERSION,ULONG,PVOID);
ULONG WINAPI HttpTerminate(ULONG,PVOID);
@@ -411,6 +411,7 @@ typedef struct _HTTP_LOG_DATA
} HTTP_LOG_DATA, *PHTTP_LOG_DATA;
ULONG WINAPI HttpAddUrl(HANDLE,PCWSTR,PVOID);
+ULONG WINAPI HttpAddUrlToUrlGroup(HTTP_URL_GROUP_ID,PCWSTR,HTTP_URL_CONTEXT,ULONG);
@ -58,5 +51,5 @@ index 9ac7309..7d86b33 100644
ULONG WINAPI HttpCreateUrlGroup(HTTP_SERVER_SESSION_ID,PHTTP_URL_GROUP_ID,ULONG);
ULONG WINAPI HttpCreateRequestQueue(HTTPAPI_VERSION,PCWSTR,PSECURITY_ATTRIBUTES,ULONG,PHANDLE);
--
1.9.1
2.17.1

29
patches/ntdll-NtContinue/0001-ntdll-Add-stub-for-NtContinue.patch
View File

@ -1,20 +1,28 @@
From 36164f1194aca4922459b0bd65dcf1d27158839c Mon Sep 17 00:00:00 2001
From 9ea4f081689959bd393eab2caaa0ed8237846117 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Thu, 25 May 2017 05:04:26 +0200
Subject: ntdll: Add stub for NtContinue.
Subject: [PATCH] ntdll: Add stub for NtContinue.
---
dlls/ntdll/exception.c | 10 ++++++++++
dlls/ntdll/exception.c | 10 +++++++++-
dlls/ntdll/ntdll.spec | 4 ++--
2 files changed, 12 insertions(+), 2 deletions(-)
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c
index daca45aa836..4429a4217a1 100644
index c35312fd1d1..3b85f1efa04 100644
--- a/dlls/ntdll/exception.c
+++ b/dlls/ntdll/exception.c
@@ -301,6 +301,16 @@ ULONG WINAPI RtlRemoveVectoredExceptionHandler( PVOID handler )
@@ -328,7 +328,6 @@ LONG WINAPI call_unhandled_exception_filter( PEXCEPTION_POINTERS eptr )
return unhandled_exception_filter( eptr );
}
-
#if defined(__x86_64__) || defined(__arm__) || defined(__aarch64__)
struct dynamic_unwind_entry
@@ -667,6 +666,15 @@ PRUNTIME_FUNCTION WINAPI RtlLookupFunctionEntry( ULONG_PTR pc, ULONG_PTR *base,
#endif /* __x86_64__ || __arm__ || __aarch64__ */
+/*********************************************************************
+ * NtContinue (NTDLL.@)
@ -24,16 +32,15 @@ index daca45aa836..4429a4217a1 100644
+ FIXME( "(%p, %d) stub!\n", context, alert );
+ return STATUS_NOT_IMPLEMENTED;
+}
+
+
/*************************************************************
* __wine_spec_unimplemented_stub
*
diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
index 9adf1edd4a5..877a845dfa9 100644
index 81faf7fc280..d21a6f08ac2 100644
--- a/dlls/ntdll/ntdll.spec
+++ b/dlls/ntdll/ntdll.spec
@@ -128,7 +128,7 @@
@@ -150,7 +150,7 @@
@ stdcall NtCompleteConnectPort(ptr)
# @ stub NtCompressKey
@ stdcall NtConnectPort(ptr ptr ptr ptr ptr ptr ptr ptr)
@ -42,7 +49,7 @@ index 9adf1edd4a5..877a845dfa9 100644
# @ stub NtCreateDebugObject
@ stdcall NtCreateDirectoryObject(ptr long ptr)
@ stdcall NtCreateEvent(ptr long ptr long long)
@@ -1055,7 +1055,7 @@
@@ -1105,7 +1105,7 @@
@ stdcall -private ZwCompleteConnectPort(ptr) NtCompleteConnectPort
# @ stub ZwCompressKey
@ stdcall -private ZwConnectPort(ptr ptr ptr ptr ptr ptr ptr ptr) NtConnectPort
@ -52,5 +59,5 @@ index 9adf1edd4a5..877a845dfa9 100644
@ stdcall -private ZwCreateDirectoryObject(ptr long ptr) NtCreateDirectoryObject
@ stdcall -private ZwCreateEvent(ptr long ptr long long) NtCreateEvent
--
2.12.2
2.17.1

16
patches/ntdll-NtContinue/0002-Use-NtContinue-to-continue-execution-after-exception.patch
View File

@ -1,4 +1,4 @@
From a5df41839d388e3bb0f8aefde70edcc8476429b2 Mon Sep 17 00:00:00 2001
From 2c63306841e4cca19e722282efab78af21d3f5eb Mon Sep 17 00:00:00 2001
From: Andrew Wesie <awesie@gmail.com>
Date: Fri, 27 Jul 2018 01:26:56 -0500
Subject: [PATCH] Use NtContinue to continue execution after exceptions.
@ -19,10 +19,10 @@ third-party.
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c
index 664b620..236f600 100644
index 3b85f1efa04..411d2bf5b8f 100644
--- a/dlls/ntdll/exception.c
+++ b/dlls/ntdll/exception.c
@@ -311,8 +311,13 @@ ULONG WINAPI RtlRemoveVectoredExceptionHandler( PVOID handler )
@@ -671,8 +671,13 @@ PRUNTIME_FUNCTION WINAPI RtlLookupFunctionEntry( ULONG_PTR pc, ULONG_PTR *base,
*/
NTSTATUS WINAPI NtContinue( CONTEXT *context, BOOLEAN alert )
{
@ -37,12 +37,12 @@ index 664b620..236f600 100644
+ return NtSetContextThread( GetCurrentThread(), context );
}
/*************************************************************
diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c
index f0de17a..d1ae9b8 100644
index 50152370b49..59255ed7493 100644
--- a/dlls/ntdll/signal_i386.c
+++ b/dlls/ntdll/signal_i386.c
@@ -2605,6 +2605,7 @@ __ASM_STDCALL_FUNC( RtlUnwind, 16,
@@ -2589,6 +2589,7 @@ __ASM_STDCALL_FUNC( RtlUnwind, 16,
__ASM_CFI(".cfi_same_value %ebp\n\t")
"ret $16" ) /* actually never returns */
@ -50,7 +50,7 @@ index f0de17a..d1ae9b8 100644
/*******************************************************************
* NtRaiseException (NTDLL.@)
@@ -2612,7 +2613,7 @@ __ASM_STDCALL_FUNC( RtlUnwind, 16,
@@ -2596,7 +2597,7 @@ __ASM_STDCALL_FUNC( RtlUnwind, 16,
NTSTATUS WINAPI NtRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL first_chance )
{
NTSTATUS status = raise_exception( rec, context, first_chance );
@ -60,5 +60,5 @@ index f0de17a..d1ae9b8 100644
}
--
1.9.1
2.17.1

40
patches/ntdll-WRITECOPY/0003-ntdll-Setup-a-temporary-signal-handler-during-proces.patch
View File

@ -1,4 +1,4 @@
From 0b50cf88e6437b19809352533c714c4f7fcc66f4 Mon Sep 17 00:00:00 2001
From 2ccd84075a6b14f3e361f32b141283af6571a7a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sat, 4 Oct 2014 02:53:22 +0200
Subject: [PATCH] ntdll: Setup a temporary signal handler during process
@ -15,10 +15,10 @@ Subject: [PATCH] ntdll: Setup a temporary signal handler during process
7 files changed, 79 insertions(+)
diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h
index d61263c13..881843fe9 100644
index 17d1361beea..a6beec0b4d1 100644
--- a/dlls/ntdll/ntdll_misc.h
+++ b/dlls/ntdll/ntdll_misc.h
@@ -68,6 +68,7 @@ extern NTSTATUS signal_alloc_thread( TEB **teb ) DECLSPEC_HIDDEN;
@@ -74,6 +74,7 @@ extern NTSTATUS signal_alloc_thread( TEB **teb ) DECLSPEC_HIDDEN;
extern void signal_free_thread( TEB *teb ) DECLSPEC_HIDDEN;
extern void signal_init_thread( TEB *teb ) DECLSPEC_HIDDEN;
extern void signal_init_process(void) DECLSPEC_HIDDEN;
@ -27,10 +27,10 @@ index d61263c13..881843fe9 100644
extern void signal_start_process( LPTHREAD_START_ROUTINE entry, BOOL suspend ) DECLSPEC_HIDDEN;
extern void DECLSPEC_NORETURN signal_exit_thread( int status ) DECLSPEC_HIDDEN;
diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c
index 32205ea39..5c311a135 100644
index ae0b4932a9e..7adcae31393 100644
--- a/dlls/ntdll/signal_arm.c
+++ b/dlls/ntdll/signal_arm.c
@@ -1048,6 +1048,12 @@ void signal_init_process(void)
@@ -1054,6 +1054,12 @@ void signal_init_process(void)
exit(1);
}
@ -41,13 +41,13 @@ index 32205ea39..5c311a135 100644
+{
+}
/**********************************************************************
* RtlAddFunctionTable (NTDLL.@)
/***********************************************************************
* RtlUnwind (NTDLL.@)
diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c
index 94520c95c..4b97a693a 100644
index 5966259081a..ba119c865cf 100644
--- a/dlls/ntdll/signal_arm64.c
+++ b/dlls/ntdll/signal_arm64.c
@@ -927,6 +927,12 @@ void signal_init_thread( TEB *teb )
@@ -928,6 +928,12 @@ void signal_init_thread( TEB *teb )
pthread_setspecific( teb_key, teb );
}
@ -61,10 +61,10 @@ index 94520c95c..4b97a693a 100644
/**********************************************************************
* signal_init_process
diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c
index 053c87da8..868189743 100644
index 59255ed7493..72a9a0ea53c 100644
--- a/dlls/ntdll/signal_i386.c
+++ b/dlls/ntdll/signal_i386.c
@@ -2029,6 +2029,31 @@ static void WINAPI raise_generic_exception( EXCEPTION_RECORD *rec, CONTEXT *cont
@@ -2084,6 +2084,31 @@ static void WINAPI raise_generic_exception( EXCEPTION_RECORD *rec, CONTEXT *cont
}
@ -96,7 +96,7 @@ index 053c87da8..868189743 100644
/**********************************************************************
* segv_handler
*
@@ -2443,6 +2468,34 @@ void signal_init_process(void)
@@ -2500,6 +2525,34 @@ void signal_init_process(void)
exit(1);
}
@ -132,7 +132,7 @@ index 053c87da8..868189743 100644
/*******************************************************************
* RtlUnwind (NTDLL.@)
diff --git a/dlls/ntdll/signal_powerpc.c b/dlls/ntdll/signal_powerpc.c
index 86398d8f5..7b0895202 100644
index f23265445df..8e29e0cd793 100644
--- a/dlls/ntdll/signal_powerpc.c
+++ b/dlls/ntdll/signal_powerpc.c
@@ -1068,6 +1068,12 @@ void signal_init_thread( TEB *teb )
@ -149,10 +149,10 @@ index 86398d8f5..7b0895202 100644
/**********************************************************************
* signal_init_process
diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c
index 21e709887..6256a97e7 100644
index c6f16e5fae8..c23a01999ce 100644
--- a/dlls/ntdll/signal_x86_64.c
+++ b/dlls/ntdll/signal_x86_64.c
@@ -3441,6 +3441,12 @@ void signal_init_process(void)
@@ -3335,6 +3335,12 @@ void signal_init_process(void)
exit(1);
}
@ -163,13 +163,13 @@ index 21e709887..6256a97e7 100644
+{
+}
/**********************************************************************
* RtlAddFunctionTable (NTDLL.@)
static ULONG64 get_int_reg( CONTEXT *context, int reg )
{
diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c
index 40d662a76..1046bc5b1 100644
index 5c1a4c02e90..83d5b20a532 100644
--- a/dlls/ntdll/thread.c
+++ b/dlls/ntdll/thread.c
@@ -252,6 +252,7 @@ void thread_init(void)
@@ -256,6 +256,7 @@ void thread_init(void)
struct ntdll_thread_data *thread_data;
virtual_init();
@ -178,5 +178,5 @@ index 40d662a76..1046bc5b1 100644
/* reserve space for shared user data */
--
2.20.1
2.17.1

2
patches/patchinstall.sh
View File

@ -52,7 +52,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "c1e8334735f20770b6c3bf2f98112bb853f5b891"
echo "5ea3a044b83c4cd55a3c647f5e80511a85b9f536"
}
# Show version information

40
patches/winebuild-Fake_Dlls/0010-tools-winebuild-Add-syscall-thunks-for-64-bit.patch
View File

@ -1,4 +1,4 @@
From 53e0dc2abac3e34db45b1e491cc508e4bf655261 Mon Sep 17 00:00:00 2001
From 1a841fb1e6ab0e8fffa743bb287bb6422614f69a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Thu, 7 Sep 2017 00:38:09 +0200
Subject: [PATCH] tools/winebuild: Add syscall thunks for 64 bit.
@ -13,10 +13,10 @@ Subject: [PATCH] tools/winebuild: Add syscall thunks for 64 bit.
6 files changed, 248 insertions(+), 8 deletions(-)
diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c
index d9b349408..6f9673286 100644
index b4abbc0f59a..32b050850d2 100644
--- a/dlls/kernel32/tests/loader.c
+++ b/dlls/kernel32/tests/loader.c
@@ -1527,7 +1527,7 @@ static void test_filenames(void)
@@ -1532,7 +1532,7 @@ static void test_filenames(void)
static void test_FakeDLL(void)
{
@ -25,7 +25,7 @@ index d9b349408..6f9673286 100644
NTSTATUS (WINAPI *pNtSetEvent)(HANDLE, ULONG *) = NULL;
IMAGE_EXPORT_DIRECTORY *dir;
HMODULE module = GetModuleHandleA("ntdll.dll");
@@ -1569,8 +1569,13 @@ static void test_FakeDLL(void)
@@ -1574,8 +1574,13 @@ static void test_FakeDLL(void)
dll_func = (BYTE *)GetProcAddress(module, func_name);
ok(dll_func != NULL, "%s: GetProcAddress returned NULL\n", func_name);
@ -40,19 +40,19 @@ index d9b349408..6f9673286 100644
todo_wine ok(0, "%s: Export is a stub-function, skipping\n", func_name);
continue;
diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c
index c2151f78c..cdbc87c70 100644
index 2c26bd5604a..c6f16e5fae8 100644
--- a/dlls/ntdll/signal_x86_64.c
+++ b/dlls/ntdll/signal_x86_64.c
@@ -328,6 +328,8 @@ static inline struct amd64_thread_data *amd64_thread_data(void)
@@ -305,6 +305,8 @@ static inline struct amd64_thread_data *amd64_thread_data(void)
return (struct amd64_thread_data *)NtCurrentTeb()->SystemReserved2;
}
+extern void DECLSPEC_NORETURN __wine_syscall_dispatcher( void );
+
/***********************************************************************
* Dynamic unwind table
* Definitions for Win32 unwind tables
*/
@@ -3284,6 +3286,7 @@ NTSTATUS signal_alloc_thread( TEB **teb )
@@ -3172,6 +3174,7 @@ NTSTATUS signal_alloc_thread( TEB **teb )
{
(*teb)->Tib.Self = &(*teb)->Tib;
(*teb)->Tib.ExceptionList = (void *)~0UL;
@ -61,7 +61,7 @@ index c2151f78c..cdbc87c70 100644
return status;
}
diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c
index eeb4c1e27..1dbb54541 100644
index f7c696cdb3e..6552c486824 100644
--- a/dlls/ntdll/thread.c
+++ b/dlls/ntdll/thread.c
@@ -60,6 +60,8 @@ struct _KUSER_SHARED_DATA *user_shared_data_external;
@ -73,7 +73,7 @@ index eeb4c1e27..1dbb54541 100644
void (WINAPI *kernel32_start_process)(LPTHREAD_START_ROUTINE,void*) = NULL;
/* info passed to a starting thread */
@@ -298,6 +300,14 @@ void thread_init(void)
@@ -297,6 +299,14 @@ void thread_init(void)
InitializeListHead( &ldr.InInitializationOrderModuleList );
*(ULONG_PTR *)peb->Reserved = get_image_addr();
@ -89,7 +89,7 @@ index eeb4c1e27..1dbb54541 100644
* Starting with Vista, the first user to log on has session id 1.
* Session id 0 is for processes that don't interact with the user (like services).
diff --git a/libs/wine/loader.c b/libs/wine/loader.c
index a2eee7aa9..dbfa5ba60 100644
index b6cac2ab92c..682d18f8da6 100644
--- a/libs/wine/loader.c
+++ b/libs/wine/loader.c
@@ -467,7 +467,11 @@ static void *map_dll( const IMAGE_NT_HEADERS *nt_descr )
@ -105,10 +105,10 @@ index a2eee7aa9..dbfa5ba60 100644
sec++;
diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c
index da832de0e..a09b9954b 100644
index f440881a0ec..6e1a613ae45 100644
--- a/tools/winebuild/parser.c
+++ b/tools/winebuild/parser.c
@@ -542,7 +542,7 @@ static const char *parse_spec_flags( DLLSPEC *spec, ORDDEF *odp )
@@ -543,7 +543,7 @@ static const char *parse_spec_flags( DLLSPEC *spec, ORDDEF *odp )
static int needs_syscall( ORDDEF *odp, DLLSPEC *spec )
{
@ -118,7 +118,7 @@ index da832de0e..a09b9954b 100644
if (odp->flags & (FLAG_FORWARD | FLAG_REGISTER))
return 0;
diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c
index 997ab9963..c065c5703 100644
index 942645b5080..45503987094 100644
--- a/tools/winebuild/spec32.c
+++ b/tools/winebuild/spec32.c
@@ -372,11 +372,11 @@ static void output_relay_debug( DLLSPEC *spec )
@ -238,7 +238,7 @@ index 997ab9963..c065c5703 100644
/*******************************************************************
* output_exports
*
@@ -830,7 +926,10 @@ void output_spec32_file( DLLSPEC *spec )
@@ -883,7 +979,10 @@ void output_spec32_file( DLLSPEC *spec )
open_output_file();
output_standard_file_header();
output_module( spec );
@ -250,7 +250,7 @@ index 997ab9963..c065c5703 100644
output_stubs( spec );
output_exports( spec );
output_imports( spec );
@@ -861,7 +960,7 @@ void output_pe_module( DLLSPEC *spec )
@@ -896,7 +995,7 @@ void output_spec32_file( DLLSPEC *spec )
static int needs_stub_exports( DLLSPEC *spec )
{
@ -259,7 +259,7 @@ index 997ab9963..c065c5703 100644
return 0;
if (!(spec->characteristics & IMAGE_FILE_DLL))
return 0;
@@ -871,7 +970,7 @@ static int needs_stub_exports( DLLSPEC *spec )
@@ -906,7 +1005,7 @@ static int needs_stub_exports( DLLSPEC *spec )
}
@ -268,7 +268,7 @@ index 997ab9963..c065c5703 100644
{
int i, nr_exports = spec->base <= spec->limit ? spec->limit - spec->base + 1 : 0;
size_t rva, thunk;
@@ -1029,6 +1128,122 @@ static void create_stub_exports_text( DLLSPEC *spec )
@@ -1064,6 +1163,122 @@ static void create_stub_exports_text( DLLSPEC *spec )
}
@ -391,7 +391,7 @@ index 997ab9963..c065c5703 100644
static void create_stub_exports_data( DLLSPEC *spec )
{
int i;
@@ -1228,7 +1443,10 @@ static void output_fake_module_pass( DLLSPEC *spec )
@@ -1263,7 +1478,10 @@ static void output_fake_module_pass( DLLSPEC *spec )
if (needs_stub_exports( spec ))
{
put_label( "text_start" );
@ -404,5 +404,5 @@ index 997ab9963..c065c5703 100644
}
else
--
2.21.0
2.17.1