From 3b0de86bf9c8012c2b876499a59edaed1a276ce5 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Fri, 27 Nov 2020 11:25:44 +1100 Subject: [PATCH] Rebase against 9faa5eeddd24a057d9ff522259c9dbdc6203c098. --- ...ync-file-descriptors-for-console-ser.patch | 24 ++++++------ ...d-IMFSeekInfo-GetNearestKeyFrames-st.patch | 11 +++--- ...t-MF_PD_MIME_TYPE-on-source-s-presen.patch | 12 +++--- ...ackwards-and-only-select-one-of-each.patch | 25 ++++++------ ...reimplement-OleLoadPicture-in-OleLoa.patch | 24 +++++------- ...out-stream-creation-from-OleLoadPict.patch | 27 ++++++------- patches/patchinstall.sh | 2 +- ...ct-type-behavior-for-different-windo.patch | 30 +++++++-------- ...ly-store-the-full-security-descripto.patch | 38 +++++++++---------- ...filename-if-no-path-is-set-in-cookie.patch | 22 +++++------ staging/upstream-commit | 2 +- 11 files changed, 103 insertions(+), 114 deletions(-) diff --git a/patches/eventfd_synchronization/0056-server-Create-esync-file-descriptors-for-console-ser.patch b/patches/eventfd_synchronization/0056-server-Create-esync-file-descriptors-for-console-ser.patch index b9f63dfb..03556474 100644 --- a/patches/eventfd_synchronization/0056-server-Create-esync-file-descriptors-for-console-ser.patch +++ b/patches/eventfd_synchronization/0056-server-Create-esync-file-descriptors-for-console-ser.patch @@ -1,4 +1,4 @@ -From 6202eab7a05dae145676e55f7fd7373569930cda Mon Sep 17 00:00:00 2001 +From fb450637e3b533b3dbef8792aa389ca3614bedf3 Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Sat, 17 Oct 2020 19:13:16 -0500 Subject: [PATCH] server: Create esync file descriptors for console servers. @@ -8,7 +8,7 @@ Subject: [PATCH] server: Create esync file descriptors for console servers. 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/server/console.c b/server/console.c -index c0892b251c4..99831b299b8 100644 +index dd1bf8f4119..887bba4e63c 100644 --- a/server/console.c +++ b/server/console.c @@ -42,6 +42,7 @@ @@ -19,7 +19,7 @@ index c0892b251c4..99831b299b8 100644 struct screen_buffer; -@@ -134,11 +135,13 @@ struct console_server +@@ -139,11 +140,13 @@ struct console_server int busy; /* flag if server processing an ioctl */ int term_fd; /* UNIX terminal fd */ struct termios termios; /* original termios */ @@ -31,9 +31,9 @@ index c0892b251c4..99831b299b8 100644 static int console_server_signaled( struct object *obj, struct wait_queue_entry *entry ); +static int console_server_get_esync_fd( struct object *obj, enum esync_type *type ); static struct fd *console_server_get_fd( struct object *obj ); - static struct object *console_server_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attr ); - static struct object *console_server_open_file( struct object *obj, unsigned int access, -@@ -152,7 +155,7 @@ static const struct object_ops console_server_ops = + static struct object *console_server_lookup_name( struct object *obj, struct unicode_str *name, + unsigned int attr, struct object *root ); +@@ -158,7 +161,7 @@ static const struct object_ops console_server_ops = add_queue, /* add_queue */ remove_queue, /* remove_queue */ console_server_signaled, /* signaled */ @@ -42,7 +42,7 @@ index c0892b251c4..99831b299b8 100644 no_satisfied, /* satisfied */ no_signal, /* signal */ console_server_get_fd, /* get_fd */ -@@ -427,6 +430,8 @@ static void disconnect_console_server( struct console_server *server ) +@@ -526,6 +529,8 @@ static void disconnect_console_server( struct console_server *server ) list_remove( &call->entry ); console_host_ioctl_terminate( call, STATUS_CANCELLED ); } @@ -51,7 +51,7 @@ index c0892b251c4..99831b299b8 100644 while (!list_empty( &server->read_queue )) { struct console_host_ioctl *call = LIST_ENTRY( list_head( &server->read_queue ), struct console_host_ioctl, entry ); -@@ -764,6 +769,13 @@ static int console_server_signaled( struct object *obj, struct wait_queue_entry +@@ -844,6 +849,13 @@ static int console_server_signaled( struct object *obj, struct wait_queue_entry return !server->console || !list_empty( &server->queue ); } @@ -65,7 +65,7 @@ index c0892b251c4..99831b299b8 100644 static struct fd *console_server_get_fd( struct object* obj ) { struct console_server *server = (struct console_server*)obj; -@@ -794,6 +806,10 @@ static struct object *create_console_server( void ) +@@ -874,6 +886,10 @@ static struct object *create_console_server( void ) return NULL; } allow_fd_caching(server->fd); @@ -76,7 +76,7 @@ index c0892b251c4..99831b299b8 100644 return &server->obj; } -@@ -1219,6 +1235,8 @@ DECL_HANDLER(get_next_console_request) +@@ -1388,6 +1404,8 @@ DECL_HANDLER(get_next_console_request) /* set result of previous ioctl */ ioctl = LIST_ENTRY( list_head( &server->queue ), struct console_host_ioctl, entry ); list_remove( &ioctl->entry ); @@ -85,7 +85,7 @@ index c0892b251c4..99831b299b8 100644 } if (ioctl) -@@ -1309,6 +1327,8 @@ DECL_HANDLER(get_next_console_request) +@@ -1486,6 +1504,8 @@ DECL_HANDLER(get_next_console_request) { set_error( STATUS_PENDING ); } @@ -95,5 +95,5 @@ index c0892b251c4..99831b299b8 100644 release_object( server ); } -- -2.28.0 +2.29.2 diff --git a/patches/mfplat-streaming-support/0001-winegstreamer-Add-IMFSeekInfo-GetNearestKeyFrames-st.patch b/patches/mfplat-streaming-support/0001-winegstreamer-Add-IMFSeekInfo-GetNearestKeyFrames-st.patch index e45a88c6..6679df4b 100644 --- a/patches/mfplat-streaming-support/0001-winegstreamer-Add-IMFSeekInfo-GetNearestKeyFrames-st.patch +++ b/patches/mfplat-streaming-support/0001-winegstreamer-Add-IMFSeekInfo-GetNearestKeyFrames-st.patch @@ -1,8 +1,7 @@ -From 71055ca3dfc664a37a5ecf428ba75e89648acc89 Mon Sep 17 00:00:00 2001 +From ab1e5e5535fc22d14e64d8f6b0f42188440f6884 Mon Sep 17 00:00:00 2001 From: Derek Lesho Date: Mon, 2 Nov 2020 09:56:54 -0600 -Subject: [PATCH 01/45] winegstreamer: Add IMFSeekInfo::GetNearestKeyFrames - stub. +Subject: [PATCH] winegstreamer: Add IMFSeekInfo::GetNearestKeyFrames stub. Signed-off-by: Derek Lesho --- @@ -10,7 +9,7 @@ Signed-off-by: Derek Lesho 1 file changed, 111 insertions(+) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c -index 66bdf64a669..828958e47e2 100644 +index 5c502cf3ed5..f08ab77746e 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -91,6 +91,8 @@ struct source_async_command @@ -151,7 +150,7 @@ index 66bdf64a669..828958e47e2 100644 { struct media_source *source = user; @@ -1256,6 +1365,8 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ - } + return E_OUTOFMEMORY; object->IMFMediaSource_iface.lpVtbl = &IMFMediaSource_vtbl; + object->IMFGetService_iface.lpVtbl = &IMFGetService_vtbl; @@ -160,5 +159,5 @@ index 66bdf64a669..828958e47e2 100644 object->ref = 1; object->byte_stream = bytestream; -- -2.28.0 +2.29.2 diff --git a/patches/mfplat-streaming-support/0003-winegstreamer-Set-MF_PD_MIME_TYPE-on-source-s-presen.patch b/patches/mfplat-streaming-support/0003-winegstreamer-Set-MF_PD_MIME_TYPE-on-source-s-presen.patch index 85f6912e..df993b85 100644 --- a/patches/mfplat-streaming-support/0003-winegstreamer-Set-MF_PD_MIME_TYPE-on-source-s-presen.patch +++ b/patches/mfplat-streaming-support/0003-winegstreamer-Set-MF_PD_MIME_TYPE-on-source-s-presen.patch @@ -1,8 +1,8 @@ -From 20c483cf8d0b9ca634a325239006b41b67cce3eb Mon Sep 17 00:00:00 2001 +From 0913eb045e183f568c9e3962cd09e3624a7893b9 Mon Sep 17 00:00:00 2001 From: Derek Lesho Date: Mon, 2 Nov 2020 10:18:27 -0600 -Subject: [PATCH 03/45] winegstreamer: Set MF_PD_MIME_TYPE on source's - presentation descriptor. +Subject: [PATCH] winegstreamer: Set MF_PD_MIME_TYPE on source's presentation + descriptor. Signed-off-by: Derek Lesho --- @@ -10,13 +10,13 @@ Signed-off-by: Derek Lesho 1 file changed, 13 insertions(+) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c -index 272dbfbfca6..36f995cc6ef 100644 +index a60cdbc8800..81c5c197072 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -1351,6 +1351,7 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ - struct media_source *object = heap_alloc_zero(sizeof(*object)); IMFStreamDescriptor **descriptors = NULL; + struct media_source *object; + IMFAttributes *byte_stream_attributes; gint64 total_pres_time = 0; DWORD bytestream_caps; @@ -41,5 +41,5 @@ index 272dbfbfca6..36f995cc6ef 100644 *out_media_source = object; -- -2.28.0 +2.29.2 diff --git a/patches/mfplat-streaming-support/0030-Report-streams-backwards-and-only-select-one-of-each.patch b/patches/mfplat-streaming-support/0030-Report-streams-backwards-and-only-select-one-of-each.patch index 9098c49a..8b6d4cb5 100644 --- a/patches/mfplat-streaming-support/0030-Report-streams-backwards-and-only-select-one-of-each.patch +++ b/patches/mfplat-streaming-support/0030-Report-streams-backwards-and-only-select-one-of-each.patch @@ -1,26 +1,27 @@ -From 59f92f0be3ee0737143dba49a6677cefb448785b Mon Sep 17 00:00:00 2001 +From eaa6710bbf3abb9803e44033a8c504b7c6ba4c44 Mon Sep 17 00:00:00 2001 From: Derek Lesho Date: Tue, 5 May 2020 15:35:16 -0500 -Subject: [PATCH 30/45] Report streams backwards and only select one of each - stream type. +Subject: [PATCH] Report streams backwards and only select one of each stream + type. --- - dlls/winegstreamer/media_source.c | 24 ++++++++++++++++++++++-- - 1 file changed, 22 insertions(+), 2 deletions(-) + dlls/winegstreamer/media_source.c | 25 ++++++++++++++++++++++--- + 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c -index 0fcc2ca42f3..9a6b2b8242c 100644 +index 2f74868956f..dd99afb2214 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c -@@ -1460,6 +1460,7 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ +@@ -1458,7 +1458,7 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ + { + GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE("mf_src", GST_PAD_SRC, GST_PAD_ALWAYS, GST_STATIC_CAPS_ANY); - - struct media_source *object = heap_alloc_zero(sizeof(*object)); +- + BOOL video_selected = FALSE, audio_selected = FALSE; IMFStreamDescriptor **descriptors = NULL; + struct media_source *object; IMFAttributes *byte_stream_attributes; - gint64 total_pres_time = 0; -@@ -1573,15 +1574,34 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ +@@ -1573,15 +1573,34 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ descriptors = heap_alloc(object->stream_count * sizeof(IMFStreamDescriptor*)); for (i = 0; i < object->stream_count; i++) { @@ -58,5 +59,5 @@ index 0fcc2ca42f3..9a6b2b8242c 100644 } heap_free(descriptors); -- -2.28.0 +2.29.2 diff --git a/patches/oleaut32-OleLoadPictureFile/0001-oleaut32-Do-not-reimplement-OleLoadPicture-in-OleLoa.patch b/patches/oleaut32-OleLoadPictureFile/0001-oleaut32-Do-not-reimplement-OleLoadPicture-in-OleLoa.patch index 6ec12cd3..43bfe96a 100644 --- a/patches/oleaut32-OleLoadPictureFile/0001-oleaut32-Do-not-reimplement-OleLoadPicture-in-OleLoa.patch +++ b/patches/oleaut32-OleLoadPictureFile/0001-oleaut32-Do-not-reimplement-OleLoadPicture-in-OleLoa.patch @@ -1,25 +1,19 @@ -From 1d3c7baaddc652049995ffc1fbb41e3950dcd8dc Mon Sep 17 00:00:00 2001 +From 89935f2a91305a577da2b08f80ac74235235a0d2 Mon Sep 17 00:00:00 2001 From: Dmitry Timoshkov Date: Sun, 27 Mar 2016 12:30:00 +0800 -Subject: oleaut32: Do not reimplement OleLoadPicture in OleLoadPicturePath. +Subject: [PATCH] oleaut32: Do not reimplement OleLoadPicture in + OleLoadPicturePath. punkCaller is ignored by StdPicture ClassFactory implementation anyway. --- - dlls/oleaut32/olepicture.c | 27 +-------------------------- - 1 file changed, 1 insertion(+), 26 deletions(-) + dlls/oleaut32/olepicture.c | 26 +------------------------- + 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c -index 44157de..285afba 100644 +index 7312adac1dc..373ccd61724 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c -@@ -2332,16 +2332,13 @@ HRESULT WINAPI OleLoadPicturePath( LPOLESTR szURLorPath, LPUNKNOWN punkCaller, - LPVOID *ppvRet ) - { - static const WCHAR file[] = { 'f','i','l','e',':',0 }; -- IPicture *ipicture; - HANDLE hFile; - DWORD dwFileSize; - HGLOBAL hGlobal = NULL; +@@ -2447,9 +2447,7 @@ HRESULT WINAPI OleLoadPicturePath( LPOLESTR szURLorPath, LPUNKNOWN punkCaller, DWORD dwBytesRead; IStream *stream; BOOL bRead; @@ -29,7 +23,7 @@ index 44157de..285afba 100644 WCHAR *file_candidate; WCHAR path_buf[MAX_PATH]; -@@ -2418,32 +2415,10 @@ HRESULT WINAPI OleLoadPicturePath( LPOLESTR szURLorPath, LPUNKNOWN punkCaller, +@@ -2526,32 +2524,10 @@ HRESULT WINAPI OleLoadPicturePath( LPOLESTR szURLorPath, LPUNKNOWN punkCaller, return hRes; } @@ -64,5 +58,5 @@ index 44157de..285afba 100644 } -- -2.7.1 +2.29.2 diff --git a/patches/oleaut32-OleLoadPictureFile/0002-oleaut32-Factor-out-stream-creation-from-OleLoadPict.patch b/patches/oleaut32-OleLoadPictureFile/0002-oleaut32-Factor-out-stream-creation-from-OleLoadPict.patch index 26c5e831..e6dd4615 100644 --- a/patches/oleaut32-OleLoadPictureFile/0002-oleaut32-Factor-out-stream-creation-from-OleLoadPict.patch +++ b/patches/oleaut32-OleLoadPictureFile/0002-oleaut32-Factor-out-stream-creation-from-OleLoadPict.patch @@ -1,17 +1,17 @@ -From 5032303d405720a099c0279127148d2d6e278b7b Mon Sep 17 00:00:00 2001 +From eb6e03432154b75d068cd42dfc8c8e1ba6318fa4 Mon Sep 17 00:00:00 2001 From: Dmitry Timoshkov Date: Sun, 27 Mar 2016 16:26:47 +0800 -Subject: oleaut32: Factor out stream creation from OleLoadPicturePath. +Subject: [PATCH] oleaut32: Factor out stream creation from OleLoadPicturePath. --- - dlls/oleaut32/olepicture.c | 75 +++++++++++++++++++++++++--------------------- - 1 file changed, 41 insertions(+), 34 deletions(-) + dlls/oleaut32/olepicture.c | 71 ++++++++++++++++++++++---------------- + 1 file changed, 41 insertions(+), 30 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c -index eeb3269..765711d 100644 +index 373ccd61724..ab242b7d798 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c -@@ -2324,6 +2324,45 @@ HRESULT WINAPI OleLoadPictureFile(VARIANT file, LPDISPATCH *picture) +@@ -2424,6 +2424,45 @@ HRESULT WINAPI OleLoadPictureFile(VARIANT file, LPDISPATCH *picture) return E_NOTIMPL; } @@ -57,20 +57,15 @@ index eeb3269..765711d 100644 /*********************************************************************** * OleSavePictureFile (OLEAUT32.423) */ -@@ -2341,12 +2380,7 @@ HRESULT WINAPI OleLoadPicturePath( LPOLESTR szURLorPath, LPUNKNOWN punkCaller, - LPVOID *ppvRet ) - { - static const WCHAR file[] = { 'f','i','l','e',':',0 }; -- HANDLE hFile; -- DWORD dwFileSize; -- HGLOBAL hGlobal = NULL; -- DWORD dwBytesRead; +@@ -2446,7 +2485,6 @@ HRESULT WINAPI OleLoadPicturePath( LPOLESTR szURLorPath, LPUNKNOWN punkCaller, + HGLOBAL hGlobal = NULL; + DWORD dwBytesRead; IStream *stream; - BOOL bRead; HRESULT hRes; WCHAR *file_candidate; WCHAR path_buf[MAX_PATH]; -@@ -2375,36 +2409,9 @@ HRESULT WINAPI OleLoadPicturePath( LPOLESTR szURLorPath, LPUNKNOWN punkCaller, +@@ -2475,36 +2513,9 @@ HRESULT WINAPI OleLoadPicturePath( LPOLESTR szURLorPath, LPUNKNOWN punkCaller, /* Handle candidate DOS paths separately. */ if (file_candidate[1] == ':') { @@ -110,5 +105,5 @@ index eeb3269..765711d 100644 IMoniker *pmnk; IBindCtx *pbc; -- -2.7.1 +2.29.2 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 7f928929..f4600adb 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -51,7 +51,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "40d4fbe45997a1820296e7909ba2212518bcfacc" + echo "9faa5eeddd24a057d9ff522259c9dbdc6203c098" } # Show version information diff --git a/patches/server-Object_Types/0010-ntdll-Mimic-object-type-behavior-for-different-windo.patch b/patches/server-Object_Types/0010-ntdll-Mimic-object-type-behavior-for-different-windo.patch index b44ca560..b3572623 100644 --- a/patches/server-Object_Types/0010-ntdll-Mimic-object-type-behavior-for-different-windo.patch +++ b/patches/server-Object_Types/0010-ntdll-Mimic-object-type-behavior-for-different-windo.patch @@ -1,4 +1,4 @@ -From 31de811f968861971bb6e014286cd34fb6c2f4c8 Mon Sep 17 00:00:00 2001 +From f68291cd2574c19f60ecf90bd1ab48554c579f86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Wed, 8 Mar 2017 19:39:29 +0100 Subject: [PATCH] ntdll: Mimic object type behavior for different windows @@ -11,18 +11,18 @@ Subject: [PATCH] ntdll: Mimic object type behavior for different windows 3 files changed, 82 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c -index 58fd9482720..7deb0b156d8 100644 +index 5f272f16cc5..cebac8b36c0 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c -@@ -73,6 +73,7 @@ static NTSTATUS (WINAPI *pNtQuerySystemTime)( LARGE_INTEGER * ); - static NTSTATUS (WINAPI *pRtlWaitOnAddress)( const void *, const void *, SIZE_T, const LARGE_INTEGER * ); +@@ -74,6 +74,7 @@ static NTSTATUS (WINAPI *pRtlWaitOnAddress)( const void *, const void *, SIZE_T, static void (WINAPI *pRtlWakeAddressAll)( const void * ); static void (WINAPI *pRtlWakeAddressSingle)( const void * ); + static NTSTATUS (WINAPI *pNtOpenProcess)( HANDLE *, ACCESS_MASK, const OBJECT_ATTRIBUTES *, const CLIENT_ID * ); +static NTSTATUS (WINAPI *pNtQuerySystemInformation)(SYSTEM_INFORMATION_CLASS, PVOID, ULONG, PULONG); #define KEYEDEVENT_WAIT 0x0001 #define KEYEDEVENT_WAKE 0x0002 -@@ -1508,13 +1509,31 @@ static void test_query_object(void) +@@ -1571,13 +1572,31 @@ static void test_query_object(void) pNtClose(handle); } @@ -55,7 +55,7 @@ index 58fd9482720..7deb0b156d8 100644 buffer = HeapAlloc( GetProcessHeap(), 0, sizeof(OBJECT_TYPES_INFORMATION) ); ok( buffer != NULL, "Failed to allocate memory\n" ); -@@ -1542,11 +1561,54 @@ static void test_query_object_types(void) +@@ -1605,11 +1624,54 @@ static void test_query_object_types(void) ok( type->TypeName.Length == sizeof(typeW) && !strncmpW(typeW, type->TypeName.Buffer, 4), "Expected 'Type' as first type, got %s\n", wine_dbgstr_us(&type->TypeName) ); } @@ -110,19 +110,19 @@ index 58fd9482720..7deb0b156d8 100644 } static void test_type_mismatch(void) -@@ -2138,6 +2200,7 @@ START_TEST(om) - pRtlWaitOnAddress = (void *)GetProcAddress(hntdll, "RtlWaitOnAddress"); +@@ -2252,6 +2314,7 @@ START_TEST(om) pRtlWakeAddressAll = (void *)GetProcAddress(hntdll, "RtlWakeAddressAll"); pRtlWakeAddressSingle = (void *)GetProcAddress(hntdll, "RtlWakeAddressSingle"); + pNtOpenProcess = (void *)GetProcAddress(hntdll, "NtOpenProcess"); + pNtQuerySystemInformation = (void *)GetProcAddress(hntdll, "NtQuerySystemInformation"); test_case_sensitive(); test_namespace_pipe(); diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c -index ece09c12f77..9a1659d2f66 100644 +index ab46eace617..881975e590a 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c -@@ -6591,7 +6591,10 @@ NTSTATUS WINAPI NtQueryObject( HANDLE handle, OBJECT_INFORMATION_CLASS info_clas +@@ -7600,7 +7600,10 @@ NTSTATUS WINAPI NtQueryObject( HANDLE handle, OBJECT_INFORMATION_CLASS info_clas } if (status == STATUS_SUCCESS) { @@ -135,7 +135,7 @@ index ece09c12f77..9a1659d2f66 100644 } } diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c -index 6c8e50fb88f..201e66d1759 100644 +index 92c46fd7d38..fbdc1d87ddf 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -2035,6 +2035,18 @@ static void get_timezone_info( RTL_DYNAMIC_TIME_ZONE_INFORMATION *tzi ) @@ -157,7 +157,7 @@ index 6c8e50fb88f..201e66d1759 100644 /****************************************************************************** * NtQuerySystemInformation (NTDLL.@) -@@ -2435,7 +2447,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, +@@ -2426,7 +2438,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, shi->Handle[i].OwnerPid = handle_info[i].owner; shi->Handle[i].HandleValue = handle_info[i].handle; shi->Handle[i].AccessMask = handle_info[i].access; @@ -166,7 +166,7 @@ index 6c8e50fb88f..201e66d1759 100644 /* FIXME: Fill out HandleFlags, ObjectPointer */ } } -@@ -2488,7 +2500,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, +@@ -2479,7 +2491,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, shi->Handle[i].UniqueProcessId = handle_info[i].owner; shi->Handle[i].HandleValue = handle_info[i].handle; shi->Handle[i].GrantedAccess = handle_info[i].access; @@ -175,7 +175,7 @@ index 6c8e50fb88f..201e66d1759 100644 /* FIXME: Fill out remaining fields */ } } -@@ -2724,7 +2736,6 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, +@@ -2743,7 +2755,6 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, return ret; } @@ -184,5 +184,5 @@ index 6c8e50fb88f..201e66d1759 100644 * NtQuerySystemInformationEx (NTDLL.@) */ -- -2.28.0 +2.29.2 diff --git a/patches/server-Stored_ACLs/0004-server-Temporarily-store-the-full-security-descripto.patch b/patches/server-Stored_ACLs/0004-server-Temporarily-store-the-full-security-descripto.patch index 6bf15de8..22df46e4 100644 --- a/patches/server-Stored_ACLs/0004-server-Temporarily-store-the-full-security-descripto.patch +++ b/patches/server-Stored_ACLs/0004-server-Temporarily-store-the-full-security-descripto.patch @@ -1,4 +1,4 @@ -From 20d2c00b311c73821ed572a53c1c586d7eb413dc Mon Sep 17 00:00:00 2001 +From c169fefc2fcc307cce858096028fb98f2f162959 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Mon, 30 Mar 2015 12:50:21 +0200 Subject: [PATCH] server: Temporarily store the full security descriptor for @@ -12,10 +12,10 @@ Subject: [PATCH] server: Temporarily store the full security descriptor for 4 files changed, 74 insertions(+), 41 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c -index 73a7684d995e..7e8f2443cd33 100644 +index dc1ca2d3769..4fe854668c5 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c -@@ -3685,7 +3685,6 @@ static void test_CreateDirectoryA(void) +@@ -3682,7 +3682,6 @@ static void test_CreateDirectoryA(void) ok(error == ERROR_SUCCESS, "GetNamedSecurityInfo failed with error %d\n", error); bret = GetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation); ok(bret, "GetAclInformation failed\n"); @@ -23,7 +23,7 @@ index 73a7684d995e..7e8f2443cd33 100644 ok(acl_size.AceCount == 0, "GetAclInformation returned unexpected entry count (%d != 0).\n", acl_size.AceCount); LocalFree(pSD); -@@ -3696,7 +3695,6 @@ static void test_CreateDirectoryA(void) +@@ -3693,7 +3692,6 @@ static void test_CreateDirectoryA(void) ok(error == ERROR_SUCCESS, "GetNamedSecurityInfo failed with error %d\n", error); bret = GetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation); ok(bret, "GetAclInformation failed\n"); @@ -31,7 +31,7 @@ index 73a7684d995e..7e8f2443cd33 100644 ok(acl_size.AceCount == 0, "GetAclInformation returned unexpected entry count (%d != 0).\n", acl_size.AceCount); LocalFree(pSD); -@@ -3819,7 +3817,6 @@ static void test_CreateDirectoryA(void) +@@ -3816,7 +3814,6 @@ static void test_CreateDirectoryA(void) ok(error == ERROR_SUCCESS, "GetNamedSecurityInfo failed with error %d\n", error); bret = GetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation); ok(bret, "GetAclInformation failed\n"); @@ -39,7 +39,7 @@ index 73a7684d995e..7e8f2443cd33 100644 ok(acl_size.AceCount == 0, "GetAclInformation returned unexpected entry count (%d != 0).\n", acl_size.AceCount); LocalFree(pSD); -@@ -4913,23 +4910,22 @@ static void test_GetSecurityInfo(void) +@@ -4910,23 +4907,22 @@ static void test_GetSecurityInfo(void) bret = GetAce(pDacl, 0, (VOID **)&ace); ok(bret, "Failed to get Current User ACE.\n"); bret = EqualSid(&ace->SidStart, user_sid); @@ -70,10 +70,10 @@ index 73a7684d995e..7e8f2443cd33 100644 LocalFree(pSD); CloseHandle(obj); diff --git a/server/change.c b/server/change.c -index d236573634ad..dd7197c07f17 100644 +index 0aa968697ea..85afb0cbdc5 100644 --- a/server/change.c +++ b/server/change.c -@@ -1077,7 +1077,8 @@ static int dir_add_to_existing_notify( struct dir *dir ) +@@ -1078,7 +1078,8 @@ static int dir_add_to_existing_notify( struct dir *dir ) #endif /* HAVE_SYS_INOTIFY_H */ @@ -83,7 +83,7 @@ index d236573634ad..dd7197c07f17 100644 { struct dir *dir; -@@ -1097,6 +1098,11 @@ struct object *create_dir_obj( struct fd *fd, unsigned int access, mode_t mode ) +@@ -1098,6 +1099,11 @@ struct object *create_dir_obj( struct fd *fd, unsigned int access, mode_t mode ) dir->client_process = NULL; set_fd_user( fd, &dir_fd_ops, &dir->obj ); @@ -96,10 +96,10 @@ index d236573634ad..dd7197c07f17 100644 return &dir->obj; diff --git a/server/file.c b/server/file.c -index f34bd305a9ef..9c94f9ba2bba 100644 +index 225e1297481..2f8c394dd5c 100644 --- a/server/file.c +++ b/server/file.c -@@ -176,7 +176,8 @@ struct file *create_file_for_fd_obj( struct fd *fd, unsigned int access, unsigne +@@ -178,7 +178,8 @@ struct file *create_file_for_fd_obj( struct fd *fd, unsigned int access, unsigne return file; } @@ -109,7 +109,7 @@ index f34bd305a9ef..9c94f9ba2bba 100644 { struct file *file = alloc_object( &file_ops ); -@@ -188,6 +189,12 @@ static struct object *create_file_obj( struct fd *fd, unsigned int access, mode_ +@@ -190,6 +191,12 @@ static struct object *create_file_obj( struct fd *fd, unsigned int access, mode_ list_init( &file->kernel_object ); grab_object( fd ); set_fd_user( fd, &file_fd_ops, &file->obj ); @@ -122,7 +122,7 @@ index f34bd305a9ef..9c94f9ba2bba 100644 return &file->obj; } -@@ -259,11 +266,11 @@ static struct object *create_file( struct fd *root, const char *nameptr, data_si +@@ -261,11 +268,11 @@ static struct object *create_file( struct fd *root, const char *nameptr, data_si if (!fd) goto done; if (S_ISDIR(mode)) @@ -136,7 +136,7 @@ index f34bd305a9ef..9c94f9ba2bba 100644 release_object( fd ); -@@ -562,46 +569,66 @@ mode_t sd_to_mode( const struct security_descriptor *sd, const SID *owner ) +@@ -564,46 +571,66 @@ mode_t sd_to_mode( const struct security_descriptor *sd, const SID *owner ) int set_file_sd( struct object *obj, struct fd *fd, mode_t *mode, uid_t *uid, const struct security_descriptor *sd, unsigned int set_info ) { @@ -227,8 +227,8 @@ index f34bd305a9ef..9c94f9ba2bba 100644 + return 0; } - static struct object *file_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attr ) -@@ -745,7 +772,10 @@ DECL_HANDLER(create_file) + static struct object *file_lookup_name( struct object *obj, struct unicode_str *name, +@@ -748,7 +775,10 @@ DECL_HANDLER(create_file) if ((file = create_file( root_fd, name, name_len, req->access, req->sharing, req->create, req->options, req->attrs, sd ))) { @@ -241,10 +241,10 @@ index f34bd305a9ef..9c94f9ba2bba 100644 } if (root_fd) release_object( root_fd ); diff --git a/server/file.h b/server/file.h -index 73f83d08d251..aa0c7eab4a01 100644 +index cf2a91f5a86..9139244fa66 100644 --- a/server/file.h +++ b/server/file.h -@@ -190,7 +190,8 @@ extern struct object *create_unix_device( struct object *root, const struct unic +@@ -196,7 +196,8 @@ extern struct object *create_unix_device( struct object *root, const struct unic extern void do_change_notify( int unix_fd ); extern void sigio_callback(void); @@ -255,5 +255,5 @@ index 73f83d08d251..aa0c7eab4a01 100644 /* completion */ -- -2.26.2 +2.29.2 diff --git a/patches/wininet-Cleanup/0004-wininet-Strip-filename-if-no-path-is-set-in-cookie.patch b/patches/wininet-Cleanup/0004-wininet-Strip-filename-if-no-path-is-set-in-cookie.patch index 71170a52..6b81fdcd 100644 --- a/patches/wininet-Cleanup/0004-wininet-Strip-filename-if-no-path-is-set-in-cookie.patch +++ b/patches/wininet-Cleanup/0004-wininet-Strip-filename-if-no-path-is-set-in-cookie.patch @@ -1,7 +1,7 @@ -From a283ad7a863862caf312843950b88bdfd9faeacc Mon Sep 17 00:00:00 2001 +From 20e7de7c8f73fb27f7eeffbc5de646fc27fe1bb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sat, 16 May 2015 00:24:35 +0200 -Subject: wininet: Strip filename if no path is set in cookie. +Subject: [PATCH] wininet: Strip filename if no path is set in cookie. The order of the stored cookies doesn't match in /testC, so be a bit less strict in the test. @@ -11,10 +11,10 @@ be a bit less strict in the test. 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c -index c44156c..7281512 100644 +index c770c312ba9..d95b39bd9ce 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c -@@ -764,10 +764,18 @@ static void HTTP_ProcessCookies( http_request_t *request ) +@@ -654,10 +654,18 @@ static void HTTP_ProcessCookies( http_request_t *request ) int HeaderIndex; int numCookies = 0; LPHTTPHEADERW setCookieHeader; @@ -32,8 +32,8 @@ index c44156c..7281512 100644 + EnterCriticalSection( &request->headers_section ); - while((HeaderIndex = HTTP_GetCustomHeaderIndex(request, szSet_Cookie, numCookies++, FALSE)) != -1) -@@ -786,10 +794,11 @@ static void HTTP_ProcessCookies( http_request_t *request ) + while((HeaderIndex = HTTP_GetCustomHeaderIndex(request, L"Set-Cookie", numCookies++, FALSE)) != -1) +@@ -676,10 +684,11 @@ static void HTTP_ProcessCookies( http_request_t *request ) name = substr(setCookieHeader->lpszValue, data - setCookieHeader->lpszValue); data++; @@ -47,10 +47,10 @@ index c44156c..7281512 100644 static void strip_spaces(LPWSTR start) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c -index b3826bb..910a0b4 100644 +index 510c3ac5232..b98e648c276 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c -@@ -2226,7 +2226,7 @@ static DWORD CALLBACK server_thread(LPVOID param) +@@ -2363,7 +2363,7 @@ static DWORD CALLBACK server_thread(LPVOID param) } if (strstr(buffer, "/testC")) { @@ -59,7 +59,7 @@ index b3826bb..910a0b4 100644 send(c, okmsg, sizeof okmsg-1, 0); else send(c, notokmsg, sizeof notokmsg-1, 0); -@@ -3196,7 +3196,7 @@ static void test_header_override(int port) +@@ -3351,7 +3351,7 @@ static void test_header_override(int port) ret = HttpSendRequestA(req, NULL, 0, NULL, 0); ok(ret, "HttpSendRequest failed\n"); @@ -68,7 +68,7 @@ index b3826bb..910a0b4 100644 InternetCloseHandle(req); req = HttpOpenRequestA(con, NULL, "/test_cookie_check_host_override", NULL, NULL, NULL, INTERNET_FLAG_KEEP_CONNECTION, 0); -@@ -3205,7 +3205,7 @@ static void test_header_override(int port) +@@ -3360,7 +3360,7 @@ static void test_header_override(int port) ret = HttpSendRequestA(req, NULL, 0, NULL, 0); ok(ret, "HttpSendRequest failed\n"); @@ -78,5 +78,5 @@ index b3826bb..910a0b4 100644 InternetCloseHandle(req); InternetSetCookieA("http://test.local", "foo", "bar"); -- -2.8.0 +2.29.2 diff --git a/staging/upstream-commit b/staging/upstream-commit index 4df9977f..3a0d532f 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -40d4fbe45997a1820296e7909ba2212518bcfacc +9faa5eeddd24a057d9ff522259c9dbdc6203c098