mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-01-28 22:04:43 -08:00
Removed patch for stub of ntdll.RtlSetHeapInformation (accepted upstream), rebased wininet patch.
This commit is contained in:
Sebastian Lackner
parent
9efe53b3f5
commit
aeedb30ca0
@ -37,9 +37,8 @@ Wine. All those differences are also documented on the
|
||||
Included bug fixes and improvements
|
||||
===================================
|
||||
|
||||
**Bugfixes and features included in the next upcoming release [5]:**
|
||||
**Bugfixes and features included in the next upcoming release [4]:**
|
||||
|
||||
* Add stub for RtlSetHeapInformation
|
||||
* Ensure X11 input events are handled even without explicit message loop ([Wine Bug #8854](https://bugs.winehq.org/show_bug.cgi?id=8854))
|
||||
* Fix handling of subdirectory in FtpFindFirstFile ([Wine Bug #16526](https://bugs.winehq.org/show_bug.cgi?id=16526))
|
||||
* Implement ID3DXEffect::FindNextValidTechnique ([Wine Bug #34101](https://bugs.winehq.org/show_bug.cgi?id=34101))
|
||||
|
||||
1
debian/changelog
vendored
1
debian/changelog
vendored
@ -17,6 +17,7 @@ wine-staging (1.7.34) UNRELEASED; urgency=low
|
||||
* Removed patch to implement semi-stub for psapi/kernel32 K32EnumProcessModulesEx (accepted upstream).
|
||||
* Removed patch to return proper charcount for GetLocaleInfo with LOCALE_IFIRSTDAYOFWEEK (accepted upstream).
|
||||
* Removed patch to export SHILCreateFromPath by name (accepted upstream).
|
||||
* Removed patch for stub of ntdll.RtlSetHeapInformation (accepted upstream).
|
||||
* Partially removed patches for ntdll DOS attributes (accepted upstream).
|
||||
-- Sebastian Lackner <sebastian@fds-team.de> Mon, 15 Dec 2014 22:42:09 +0100
|
||||
|
||||
|
||||
@ -75,7 +75,6 @@ PATCHLIST := \
|
||||
ntdll-NtQuerySection.ok \
|
||||
ntdll-NtSetLdtEntries.ok \
|
||||
ntdll-Pipe_SpecialCharacters.ok \
|
||||
ntdll-RtlSetHeapInformation.ok \
|
||||
ntdll-ThreadTime.ok \
|
||||
ntdll-User_Shared_Data.ok \
|
||||
ntdll-WRITECOPY.ok \
|
||||
@ -1122,18 +1121,6 @@ ntdll-Pipe_SpecialCharacters.ok:
|
||||
echo '+ { "Michael Müller", "ntdll: Allow special characters in pipe names.", 1 },'; \
|
||||
) > ntdll-Pipe_SpecialCharacters.ok
|
||||
|
||||
# Patchset ntdll-RtlSetHeapInformation
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/kernel32/heap.c, dlls/ntdll/heap.c, dlls/ntdll/ntdll.spec, include/winternl.h
|
||||
# |
|
||||
.INTERMEDIATE: ntdll-RtlSetHeapInformation.ok
|
||||
ntdll-RtlSetHeapInformation.ok:
|
||||
$(call APPLY_FILE,ntdll-RtlSetHeapInformation/0001-ntdll-Add-stub-for-RtlSetHeapInformation.patch)
|
||||
@( \
|
||||
echo '+ { "Sergey Kalinichev", "ntdll: Add stub for RtlSetHeapInformation.", 1 },'; \
|
||||
) > ntdll-RtlSetHeapInformation.ok
|
||||
|
||||
# Patchset ntdll-ThreadTime
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
|
||||
@ -1,74 +0,0 @@
|
||||
From 74219272ffbf828d22c52f68a00720d8f4ab12b7 Mon Sep 17 00:00:00 2001
|
||||
From: Sergey Kalinichev <kalinichev.so.0@gmail.com>
|
||||
Date: Thu, 18 Dec 2014 23:03:58 +0400
|
||||
Subject: ntdll: Add stub for RtlSetHeapInformation.
|
||||
|
||||
---
|
||||
dlls/kernel32/heap.c | 5 +++--
|
||||
dlls/ntdll/heap.c | 10 ++++++++++
|
||||
dlls/ntdll/ntdll.spec | 2 +-
|
||||
include/winternl.h | 1 +
|
||||
4 files changed, 15 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c
|
||||
index 9037f8e..cac73ec 100644
|
||||
--- a/dlls/kernel32/heap.c
|
||||
+++ b/dlls/kernel32/heap.c
|
||||
@@ -296,8 +296,9 @@ BOOL WINAPI HeapQueryInformation( HANDLE heap, HEAP_INFORMATION_CLASS info_class
|
||||
|
||||
BOOL WINAPI HeapSetInformation( HANDLE heap, HEAP_INFORMATION_CLASS infoclass, PVOID info, SIZE_T size)
|
||||
{
|
||||
- FIXME("%p %d %p %ld\n", heap, infoclass, info, size );
|
||||
- return TRUE;
|
||||
+ NTSTATUS ret = RtlSetHeapInformation( heap, infoclass, info, size );
|
||||
+ if (ret) SetLastError( RtlNtStatusToDosError(ret) );
|
||||
+ return !ret;
|
||||
}
|
||||
|
||||
/*
|
||||
diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c
|
||||
index 3bb7a11..4537689 100644
|
||||
--- a/dlls/ntdll/heap.c
|
||||
+++ b/dlls/ntdll/heap.c
|
||||
@@ -2252,3 +2252,13 @@ NTSTATUS WINAPI RtlQueryHeapInformation( HANDLE heap, HEAP_INFORMATION_CLASS inf
|
||||
return STATUS_INVALID_INFO_CLASS;
|
||||
}
|
||||
}
|
||||
+
|
||||
+/***********************************************************************
|
||||
+ * RtlSetHeapInformation (NTDLL.@)
|
||||
+ */
|
||||
+NTSTATUS WINAPI RtlSetHeapInformation( HANDLE heap, HEAP_INFORMATION_CLASS info_class,
|
||||
+ PVOID info, SIZE_T size )
|
||||
+{
|
||||
+ FIXME("%p %d %p %ld stub\n", heap, info_class, info, size);
|
||||
+ return STATUS_SUCCESS;
|
||||
+}
|
||||
diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
|
||||
index 7e95969..791b66e 100644
|
||||
--- a/dlls/ntdll/ntdll.spec
|
||||
+++ b/dlls/ntdll/ntdll.spec
|
||||
@@ -847,7 +847,7 @@
|
||||
@ stdcall RtlSetDaclSecurityDescriptor(ptr long ptr long)
|
||||
@ stdcall RtlSetEnvironmentVariable(ptr ptr ptr)
|
||||
@ stdcall RtlSetGroupSecurityDescriptor(ptr ptr long)
|
||||
-# @ stub RtlSetHeapInformation
|
||||
+@ stdcall RtlSetHeapInformation(ptr long ptr long)
|
||||
@ stub RtlSetInformationAcl
|
||||
@ stdcall RtlSetIoCompletionCallback(long ptr long)
|
||||
@ stdcall RtlSetLastWin32Error(long)
|
||||
diff --git a/include/winternl.h b/include/winternl.h
|
||||
index 5a27f94..8ba1e89 100644
|
||||
--- a/include/winternl.h
|
||||
+++ b/include/winternl.h
|
||||
@@ -2509,6 +2509,7 @@ NTSYSAPI NTSTATUS WINAPI RtlSetDaclSecurityDescriptor(PSECURITY_DESCRIPTOR,BOOL
|
||||
NTSYSAPI NTSTATUS WINAPI RtlSetEnvironmentVariable(PWSTR*,PUNICODE_STRING,PUNICODE_STRING);
|
||||
NTSYSAPI NTSTATUS WINAPI RtlSetOwnerSecurityDescriptor(PSECURITY_DESCRIPTOR,PSID,BOOLEAN);
|
||||
NTSYSAPI NTSTATUS WINAPI RtlSetGroupSecurityDescriptor(PSECURITY_DESCRIPTOR,PSID,BOOLEAN);
|
||||
+NTSYSAPI NTSTATUS WINAPI RtlSetHeapInformation(HANDLE,HEAP_INFORMATION_CLASS,PVOID,SIZE_T);
|
||||
NTSYSAPI NTSTATUS WINAPI RtlSetIoCompletionCallback(HANDLE,PRTL_OVERLAPPED_COMPLETION_ROUTINE,ULONG);
|
||||
NTSYSAPI void WINAPI RtlSetLastWin32Error(DWORD);
|
||||
NTSYSAPI void WINAPI RtlSetLastWin32ErrorAndNtStatusFromNtStatus(NTSTATUS);
|
||||
--
|
||||
2.1.3
|
||||
|
||||
@ -1 +0,0 @@
|
||||
Fixes: Add stub for RtlSetHeapInformation
|
||||
@ -1,4 +1,4 @@
|
||||
From b8cd3a50b3b381828b3bc604a8cd6d7d69e8a9cc Mon Sep 17 00:00:00 2001
|
||||
From 183a3343682b8c76613bf3801ae5e4f384102552 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Mon, 8 Dec 2014 02:51:30 +0100
|
||||
Subject: wininet: Allow Accept-Encoding for HTTP/1.0 requests.
|
||||
@ -9,10 +9,10 @@ Subject: wininet: Allow Accept-Encoding for HTTP/1.0 requests.
|
||||
2 files changed, 47 insertions(+), 21 deletions(-)
|
||||
|
||||
diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c
|
||||
index cb30b26..3cda082 100644
|
||||
index 532b65a..ee89061 100644
|
||||
--- a/dlls/wininet/http.c
|
||||
+++ b/dlls/wininet/http.c
|
||||
@@ -219,7 +219,6 @@ static LPWSTR HTTP_build_req( LPCWSTR *list, int len );
|
||||
@@ -217,7 +217,6 @@ static LPWSTR HTTP_build_req( LPCWSTR *list, int len );
|
||||
static DWORD HTTP_HttpQueryInfoW(http_request_t*, DWORD, LPVOID, LPDWORD, LPDWORD);
|
||||
static LPWSTR HTTP_GetRedirectURL(http_request_t *req, LPCWSTR lpszUrl);
|
||||
static UINT HTTP_DecodeBase64(LPCWSTR base64, LPSTR bin);
|
||||
@ -20,7 +20,7 @@ index cb30b26..3cda082 100644
|
||||
static BOOL drain_content(http_request_t*,BOOL);
|
||||
|
||||
static CRITICAL_SECTION connection_pool_cs;
|
||||
@@ -1321,10 +1320,8 @@ static DWORD HTTP_HttpAddRequestHeadersW(http_request_t *request,
|
||||
@@ -1324,10 +1323,8 @@ static DWORD HTTP_HttpAddRequestHeadersW(http_request_t *request,
|
||||
pFieldAndValue = HTTP_InterpretHttpHeader(lpszStart);
|
||||
if (pFieldAndValue)
|
||||
{
|
||||
@ -33,7 +33,7 @@ index cb30b26..3cda082 100644
|
||||
HTTP_FreeTokens(pFieldAndValue);
|
||||
}
|
||||
|
||||
@@ -6345,21 +6342,6 @@ static BOOL HTTP_DeleteCustomHeader(http_request_t *request, DWORD index)
|
||||
@@ -6335,21 +6332,6 @@ static BOOL HTTP_DeleteCustomHeader(http_request_t *request, DWORD index)
|
||||
|
||||
|
||||
/***********************************************************************
|
||||
@ -56,10 +56,10 @@ index cb30b26..3cda082 100644
|
||||
*
|
||||
* Undocumented
|
||||
diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c
|
||||
index 98c8d62..ac1b0ba 100644
|
||||
index 92a6b8d..1582ac9 100644
|
||||
--- a/dlls/wininet/tests/http.c
|
||||
+++ b/dlls/wininet/tests/http.c
|
||||
@@ -2292,7 +2292,13 @@ static DWORD CALLBACK server_thread(LPVOID param)
|
||||
@@ -2314,7 +2314,13 @@ static DWORD CALLBACK server_thread(LPVOID param)
|
||||
}
|
||||
if (strstr(buffer, "GET /test_premature_disconnect"))
|
||||
trace("closing connection\n");
|
||||
@ -74,8 +74,8 @@ index 98c8d62..ac1b0ba 100644
|
||||
shutdown(c, 2);
|
||||
closesocket(c);
|
||||
c = -1;
|
||||
@@ -4111,6 +4117,43 @@ static void test_cache_control_verb(int port)
|
||||
InternetCloseHandle(session);
|
||||
@@ -4169,6 +4175,43 @@ static void test_request_content_length(int port)
|
||||
CloseHandle(hCompleteEvent);
|
||||
}
|
||||
|
||||
+static void test_accept_encoding(int port)
|
||||
@ -118,14 +118,14 @@ index 98c8d62..ac1b0ba 100644
|
||||
static void test_http_connection(void)
|
||||
{
|
||||
struct server_info si;
|
||||
@@ -4156,6 +4199,7 @@ static void test_http_connection(void)
|
||||
test_cache_control_verb(si.port);
|
||||
@@ -4215,6 +4258,7 @@ static void test_http_connection(void)
|
||||
test_successive_HttpSendRequest(si.port);
|
||||
test_head_request(si.port);
|
||||
test_request_content_length(si.port);
|
||||
+ test_accept_encoding(si.port);
|
||||
|
||||
/* send the basic request again to shutdown the server thread */
|
||||
test_basic_request(si.port, "GET", "/quit");
|
||||
--
|
||||
1.9.1
|
||||
2.1.3
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user