August 2021 - Wine-commits - list.winehq.org

Ziqing Hui : d2d1: Implement d2d_effect_GetValue().
by Alexandre Julliard 10 Aug '21

10 Aug '21

Module: wine Branch: master Commit: 77930f1fe2544eb24390e9f8be3ab9a1a633ca70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=77930f1fe2544eb24390e9f8… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Aug 10 12:05:14 2021 +0800 d2d1: Implement d2d_effect_GetValue(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/effect.c | 38 +++++++++++++++++++++++++++++++++++--- dlls/d2d1/tests/d2d1.c | 8 +++++--- 2 files changed, 40 insertions(+), 6 deletions(-) diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index ef1189ba042..5f334d19f71 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -164,10 +164,42 @@ static HRESULT STDMETHODCALLTYPE d2d_effect_GetValueByName(ID2D1Effect *iface, c static HRESULT STDMETHODCALLTYPE d2d_effect_GetValue(ID2D1Effect *iface, UINT32 index, D2D1_PROPERTY_TYPE type, BYTE *value, UINT32 value_size) { - FIXME("iface %p, index %u, type %#x, value %p, value_size %u stub!\n", iface, index, type, - value, value_size); + struct d2d_effect *effect = impl_from_ID2D1Effect(iface); + const void *src; - return E_NOTIMPL; + TRACE("iface %p, index %u, type %#x, value %p, value_size %u.\n", iface, index, type, value, value_size); + + switch (index) + { + case D2D1_PROPERTY_CLSID: + if ((type != D2D1_PROPERTY_TYPE_UNKNOWN && type != D2D1_PROPERTY_TYPE_CLSID) + || value_size != sizeof(*effect->info->clsid)) + return E_INVALIDARG; + src = effect->info->clsid; + break; + case D2D1_PROPERTY_MIN_INPUTS: + if ((type != D2D1_PROPERTY_TYPE_UNKNOWN && type != D2D1_PROPERTY_TYPE_UINT32) + || value_size != sizeof(effect->info->min_inputs)) + return E_INVALIDARG; + src = &effect->info->min_inputs; + break; + case D2D1_PROPERTY_MAX_INPUTS: + if ((type != D2D1_PROPERTY_TYPE_UNKNOWN && type != D2D1_PROPERTY_TYPE_UINT32) + || value_size != sizeof(effect->info->max_inputs)) + return E_INVALIDARG; + src = &effect->info->max_inputs; + break; + default: + if (index < D2D1_PROPERTY_CLSID) + FIXME("Custom properties are not supported.\n"); + else if (index <= D2D1_PROPERTY_MAX_INPUTS) + FIXME("Standard property %#x is not supported.\n", index); + return D2DERR_INVALID_PROPERTY; + } + + memcpy(value, src, value_size); + + return S_OK; } static UINT32 STDMETHODCALLTYPE d2d_effect_GetValueSize(ID2D1Effect *iface, UINT32 index) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index f655274754e..343a2363e14 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9738,8 +9738,6 @@ static void test_effect(BOOL d3d11) ID2D1Image_Release(image_b); ID2D1Image_Release(image_a); - todo_wine - { hr = ID2D1Effect_GetValue(effect, 0xdeadbeef, D2D1_PROPERTY_TYPE_CLSID, (BYTE *)&clsid, sizeof(clsid)); ok(hr == D2DERR_INVALID_PROPERTY, "Got unexpected hr %#x.\n", hr); @@ -9751,11 +9749,14 @@ static void test_effect(BOOL d3d11) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_DISPLAYNAME, D2D1_PROPERTY_TYPE_STRING, buffer, sizeof(buffer)); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); str_size = (wcslen((WCHAR *)buffer) + 1) * sizeof(WCHAR); hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_DISPLAYNAME, D2D1_PROPERTY_TYPE_STRING, buffer, str_size); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_DISPLAYNAME, D2D1_PROPERTY_TYPE_STRING, buffer, str_size - 1); + todo_wine ok(hr == D2DERR_INSUFFICIENT_BUFFER, "Got unexpected hr %#x.\n", hr); hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_CLSID, 0xdeadbeef, (BYTE *)&clsid, sizeof(clsid)); @@ -9776,12 +9777,14 @@ static void test_effect(BOOL d3d11) hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_CACHED, D2D1_PROPERTY_TYPE_BOOL, (BYTE *)&cached, sizeof(cached)); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); if (hr == S_OK) ok(cached == FALSE, "Got unexpected cached %d.\n", cached); hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_PRECISION, D2D1_PROPERTY_TYPE_ENUM, (BYTE *)&precision, sizeof(precision)); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); if (hr == S_OK) ok(precision == D2D1_BUFFER_PRECISION_UNKNOWN, "Got unexpected precision %u.\n", precision); @@ -9799,7 +9802,6 @@ static void test_effect(BOOL d3d11) if (hr == S_OK) ok(max_inputs == test->max_inputs, "Got unexpected max inputs %u, expected %u.\n", max_inputs, test->max_inputs); - } input_count = ID2D1Effect_GetInputCount(effect); ok (input_count == test->default_input_count, "Got unexpected input count %u, expected %u.\n",

1 0

Alistair Leslie-Hughes : hid: Validate preparsed data pointer passed in HidP functions.
by Alexandre Julliard 10 Aug '21

10 Aug '21

Module: wine Branch: master Commit: 656691feb7d3ff979f255ac3c730ac357e4cbccd URL: https://source.winehq.org/git/wine.git/?a=commit;h=656691feb7d3ff979f255ac3… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Aug 10 11:31:13 2021 +0200 hid: Validate preparsed data pointer passed in HidP functions. Power Rangers: Battle for the Grid. 0514:trace:hidp:HidP_GetCaps preparsed_data 000000004C9566B0, caps 000000000010EF00. 0514:trace:hidp:HidP_GetCaps preparsed_data 0000000000000000, caps 000000000010F020. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 6259e0f56a9..37715ccfbca 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -39,7 +39,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(hidp); static NTSTATUS get_value_caps_range( WINE_HIDP_PREPARSED_DATA *preparsed, HIDP_REPORT_TYPE report_type, ULONG report_len, const struct hid_value_caps **caps, const struct hid_value_caps **caps_end ) { - if (preparsed->magic != HID_MAGIC) return HIDP_STATUS_INVALID_PREPARSED_DATA; + if (!preparsed || preparsed->magic != HID_MAGIC) return HIDP_STATUS_INVALID_PREPARSED_DATA; switch (report_type) { @@ -167,7 +167,7 @@ NTSTATUS WINAPI HidP_GetCaps( PHIDP_PREPARSED_DATA preparsed_data, HIDP_CAPS *ca TRACE( "preparsed_data %p, caps %p.\n", preparsed_data, caps ); - if (preparsed->magic != HID_MAGIC) return HIDP_STATUS_INVALID_PREPARSED_DATA; + if (!preparsed || preparsed->magic != HID_MAGIC) return HIDP_STATUS_INVALID_PREPARSED_DATA; *caps = preparsed->caps; return HIDP_STATUS_SUCCESS; @@ -787,7 +787,7 @@ NTSTATUS WINAPI HidP_GetLinkCollectionNodes( HIDP_LINK_COLLECTION_NODE *nodes, U TRACE( "nodes %p, nodes_len %p, preparsed_data %p.\n", nodes, nodes_len, preparsed_data ); - if (preparsed->magic != HID_MAGIC) return HIDP_STATUS_INVALID_PREPARSED_DATA; + if (!preparsed || preparsed->magic != HID_MAGIC) return HIDP_STATUS_INVALID_PREPARSED_DATA; count = *nodes_len = preparsed->caps.NumberLinkCollectionNodes; if (capacity < count) return HIDP_STATUS_BUFFER_TOO_SMALL;

1 0

Rémi Bernon : hidclass.sys: Rename WINE_HIDP_PREPARSED_DATA to struct hid_preparsed_data.
by Alexandre Julliard 10 Aug '21

10 Aug '21

Module: wine Branch: master Commit: 2e3a0dac84e545a6454f2175b00aa22ab09ba81f URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e3a0dac84e545a6454f2175… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Aug 10 11:31:14 2021 +0200 hidclass.sys: Rename WINE_HIDP_PREPARSED_DATA to struct hid_preparsed_data. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 36 ++++++++++++++++++------------------ dlls/hidclass.sys/descriptor.c | 14 +++++++------- dlls/hidclass.sys/device.c | 28 ++++++++++++++-------------- dlls/hidclass.sys/hid.h | 4 ++-- dlls/hidclass.sys/pnp.c | 2 +- dlls/user32/rawinput.c | 2 +- include/wine/hid.h | 6 +++--- 7 files changed, 46 insertions(+), 46 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2e3a0dac84e545a6454f…

1 0

Rémi Bernon : hidclass.sys: Create separate report queue for each opened handle.
by Alexandre Julliard 10 Aug '21

10 Aug '21

Module: wine Branch: master Commit: 3a3e0ed2e9525667b9839ea2f218183182350022 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a3e0ed2e9525667b9839ea2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Aug 10 11:31:15 2021 +0200 hidclass.sys: Create separate report queue for each opened handle. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 127 ++++++++++++++++++++++++------------- dlls/hidclass.sys/hid.h | 10 ++- dlls/hidclass.sys/pnp.c | 7 +- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 4 +- 4 files changed, 95 insertions(+), 53 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3a3e0ed2e9525667b983…

1 0

Rémi Bernon : hidclass.sys: Process pending IRP queue using last read packet.
by Alexandre Julliard 10 Aug '21

10 Aug '21

Module: wine Branch: master Commit: 0a104844eb4ab402be7c419f05b430f107fc0763 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a104844eb4ab402be7c419f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Aug 10 11:31:16 2021 +0200 hidclass.sys: Process pending IRP queue using last read packet. Instead of requiring the ring buffer to keep previously read packets. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/buffer.c | 34 ---------------------------------- dlls/hidclass.sys/device.c | 45 ++++++++++++++++++--------------------------- dlls/hidclass.sys/hid.h | 1 - 3 files changed, 18 insertions(+), 62 deletions(-) diff --git a/dlls/hidclass.sys/buffer.c b/dlls/hidclass.sys/buffer.c index 720ca4eeb20..59c0edf29f9 100644 --- a/dlls/hidclass.sys/buffer.c +++ b/dlls/hidclass.sys/buffer.c @@ -154,40 +154,6 @@ void RingBuffer_ReadNew(struct ReportRingBuffer *ring, UINT index, void *output, } } -void RingBuffer_Read(struct ReportRingBuffer *ring, UINT index, void *output, UINT *size) -{ - int pointer; - void *ret = NULL; - - EnterCriticalSection(&ring->lock); - if (index >= ring->pointer_alloc || ring->pointers[index] == POINTER_UNUSED - || ring->end == ring->start) - { - LeaveCriticalSection(&ring->lock); - *size = 0; - return; - } - - pointer = ring->pointers[index]; - - if (pointer == ring->end) - pointer--; - - if (pointer < 0) - pointer = ring->size - 1; - - ret = &ring->buffer[pointer * ring->buffer_size]; - memcpy(output, ret, ring->buffer_size); - if (pointer == ring->pointers[index]) - { - ring->pointers[index]++; - if (ring->pointers[index] == ring->size) - ring->pointers[index] = 0; - } - LeaveCriticalSection(&ring->lock); - *size = ring->buffer_size; -} - UINT RingBuffer_AddPointer(struct ReportRingBuffer *ring) { UINT idx; diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index a3c82d03269..8510f25ae41 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -82,10 +82,13 @@ static void WINAPI read_cancel_routine(DEVICE_OBJECT *device, IRP *irp) static void hid_device_queue_input( DEVICE_OBJECT *device, HID_XFER_PACKET *packet ) { BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; + struct hid_preparsed_data *preparsed = ext->u.pdo.preparsed_data; + HID_XFER_PACKET *read_packet, *last_packet = packet; struct hid_report_queue *queue; RAWINPUT *rawinput; ULONG size; KIRQL irql; + IRP *irp; size = offsetof( RAWINPUT, data.hid.bRawData[packet->reportBufferLen] ); if (!(rawinput = malloc( size ))) ERR( "Failed to allocate rawinput data!\n" ); @@ -114,37 +117,27 @@ static void hid_device_queue_input( DEVICE_OBJECT *device, HID_XFER_PACKET *pack LIST_FOR_EACH_ENTRY( queue, &ext->u.pdo.report_queues, struct hid_report_queue, entry ) RingBuffer_Write( queue->buffer, packet ); KeReleaseSpinLock( &ext->u.pdo.report_queues_lock, irql ); -} - -static void HID_Device_processQueue(DEVICE_OBJECT *device) -{ - BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; - struct hid_preparsed_data *preparsed = ext->u.pdo.preparsed_data; - struct hid_report_queue *queue; - HID_XFER_PACKET *packet; - UINT buffer_size; - IRP *irp; - packet = malloc( sizeof(*packet) + preparsed->caps.InputReportByteLength ); + if (!(read_packet = malloc( sizeof(*packet) + preparsed->caps.InputReportByteLength ))) + { + ERR( "Failed to allocate read_packet!\n" ); + return; + } - while((irp = pop_irp_from_queue(ext))) + while ((irp = pop_irp_from_queue( ext ))) { queue = irp->Tail.Overlay.OriginalFileObject->FsContext; - RingBuffer_Read( queue->buffer, 0, packet, &buffer_size ); - if (buffer_size) - { - memcpy( irp->AssociatedIrp.SystemBuffer, packet + 1, preparsed->caps.InputReportByteLength ); - irp->IoStatus.Information = packet->reportBufferLen; - irp->IoStatus.Status = STATUS_SUCCESS; - } - else - { - irp->IoStatus.Information = 0; - irp->IoStatus.Status = STATUS_UNSUCCESSFUL; - } + RingBuffer_ReadNew( queue->buffer, 0, read_packet, &size ); + if (!size) packet = last_packet; + else packet = read_packet; + + memcpy( irp->AssociatedIrp.SystemBuffer, packet + 1, preparsed->caps.InputReportByteLength ); + irp->IoStatus.Information = packet->reportBufferLen; + irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest( irp, IO_NO_INCREMENT ); } - free(packet); + + free( read_packet ); } static DWORD CALLBACK hid_device_thread(void *args) @@ -187,7 +180,6 @@ static DWORD CALLBACK hid_device_thread(void *args) packet->reportBufferLen = io.Information; hid_device_queue_input( device, packet ); - HID_Device_processQueue(device); } rc = WaitForSingleObject(ext->u.pdo.halt_event, @@ -229,7 +221,6 @@ static DWORD CALLBACK hid_device_thread(void *args) packet->reportBufferLen = io.Information; hid_device_queue_input( device, packet ); - HID_Device_processQueue(device); } if (exit_now) diff --git a/dlls/hidclass.sys/hid.h b/dlls/hidclass.sys/hid.h index d886672ec10..6bfba100007 100644 --- a/dlls/hidclass.sys/hid.h +++ b/dlls/hidclass.sys/hid.h @@ -96,7 +96,6 @@ struct hid_report_queue void RingBuffer_Write(struct ReportRingBuffer *buffer, void *data) DECLSPEC_HIDDEN; UINT RingBuffer_AddPointer(struct ReportRingBuffer *buffer) DECLSPEC_HIDDEN; void RingBuffer_RemovePointer(struct ReportRingBuffer *ring, UINT index) DECLSPEC_HIDDEN; -void RingBuffer_Read(struct ReportRingBuffer *ring, UINT index, void *output, UINT *size) DECLSPEC_HIDDEN; void RingBuffer_ReadNew(struct ReportRingBuffer *buffer, UINT index, void *output, UINT *size) DECLSPEC_HIDDEN; UINT RingBuffer_GetBufferSize(struct ReportRingBuffer *buffer) DECLSPEC_HIDDEN; UINT RingBuffer_GetSize(struct ReportRingBuffer *buffer) DECLSPEC_HIDDEN;

1 0

Rémi Bernon : hidclass.sys: Use a simpler ring buffer with ref-counted reports.
by Alexandre Julliard 10 Aug '21

10 Aug '21

Module: wine Branch: master Commit: 325984ded50b354686e5a454aa5aca3aafa81432 URL: https://source.winehq.org/git/wine.git/?a=commit;h=325984ded50b354686e5a454… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Aug 10 11:31:17 2021 +0200 hidclass.sys: Use a simpler ring buffer with ref-counted reports. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/Makefile.in | 1 - dlls/hidclass.sys/buffer.c | 204 ------------------------------------------ dlls/hidclass.sys/device.c | 162 +++++++++++++++++++++++++-------- dlls/hidclass.sys/hid.h | 25 +++--- 4 files changed, 136 insertions(+), 256 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=325984ded50b354686e5…

1 0

Rémi Bernon : ntoskrnl.exe/tests: Restore default mute threshold.
by Alexandre Julliard 10 Aug '21

10 Aug '21

Module: wine Branch: master Commit: ae01a6f6adcbe59913c6338b7ec2bc8422c49d91 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae01a6f6adcbe59913c6338b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Aug 10 11:31:18 2021 +0200 ntoskrnl.exe/tests: Restore default mute threshold. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/utils.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/tests/utils.h b/dlls/ntoskrnl.exe/tests/utils.h index aa84890f6af..f73f6f938ca 100644 --- a/dlls/ntoskrnl.exe/tests/utils.h +++ b/dlls/ntoskrnl.exe/tests/utils.h @@ -51,7 +51,7 @@ static int winetest_debug; static int winetest_report_success; /* silence todos and skips above this threshold */ -static int winetest_mute_threshold = 1; +static int winetest_mute_threshold = 42; /* counts how many times a given line printed a message */ static LONG line_counters[16384];

1 0

Luke Deller : msvcrt: Translate file open access pattern hints.
by Alexandre Julliard 10 Aug '21

10 Aug '21

Module: wine Branch: master Commit: 1ca67c8ba20886e1a71bb4a2aa94638beaba4534 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ca67c8ba20886e1a71bb4a2… Author: Luke Deller <luke(a)deller.id.au> Date: Wed Aug 4 21:29:34 2021 +1000 msvcrt: Translate file open access pattern hints. Translate access pattern hints supplied to fopen / _open into the corresponding attributes for the lower level CreateFileW call. Signed-off-by: Luke Deller <luke(a)deller.id.au> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/file.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 6e955099090..b0eeaf2a351 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -22,8 +22,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * - * TODO - * Use the file flag hints O_SEQUENTIAL, O_RANDOM, O_SHORT_LIVED */ #include <direct.h> @@ -1609,8 +1607,12 @@ static int msvcrt_get_flags(const wchar_t* mode, int *open_flags, int* stream_fl case 'w': break; case 'S': + if (!(*open_flags & _O_RANDOM)) + *open_flags |= _O_SEQUENTIAL; + break; case 'R': - FIXME("ignoring cache optimization flag: %c\n", mode[-1]); + if (!(*open_flags & _O_SEQUENTIAL)) + *open_flags |= _O_RANDOM; break; default: ERR("incorrect mode flag: %c\n", mode[-1]); @@ -2269,6 +2271,13 @@ int CDECL _wsopen_dispatch( const wchar_t* path, int oflags, int shflags, int pm sharing |= FILE_SHARE_DELETE; } + if (oflags & _O_RANDOM) + attrib |= FILE_FLAG_RANDOM_ACCESS; + if (oflags & _O_SEQUENTIAL) + attrib |= FILE_FLAG_SEQUENTIAL_SCAN; + if (oflags & _O_SHORT_LIVED) + attrib |= FILE_ATTRIBUTE_TEMPORARY; + sa.nLength = sizeof( SECURITY_ATTRIBUTES ); sa.lpSecurityDescriptor = NULL; sa.bInheritHandle = !(oflags & _O_NOINHERIT);

1 0

Luke Deller : kernelbase: Translate FILE_FLAG_SEQUENTIAL_SCAN.
by Alexandre Julliard 10 Aug '21

10 Aug '21

Module: wine Branch: master Commit: 8294b2c8adc127794b6f16580059721abc4d4589 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8294b2c8adc127794b6f1658… Author: Luke Deller <luke(a)deller.id.au> Date: Wed Aug 4 21:29:35 2021 +1000 kernelbase: Translate FILE_FLAG_SEQUENTIAL_SCAN. Translate FILE_FLAG_SEQUENTIAL_SCAN into the corresponding flag for NtCreateFile options Signed-off-by: Luke Deller <luke(a)deller.id.au> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/file.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index e0a75c2ad08..d21ad299d1f 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -723,6 +723,8 @@ static UINT get_nt_file_options( DWORD attributes ) options |= FILE_SYNCHRONOUS_IO_NONALERT; if (attributes & FILE_FLAG_RANDOM_ACCESS) options |= FILE_RANDOM_ACCESS; + if (attributes & FILE_FLAG_SEQUENTIAL_SCAN) + options |= FILE_SEQUENTIAL_ONLY; if (attributes & FILE_FLAG_WRITE_THROUGH) options |= FILE_WRITE_THROUGH; return options; @@ -3227,6 +3229,7 @@ HANDLE WINAPI DECLSPEC_HOTPATCH OpenFileById( HANDLE handle, LPFILE_ID_DESCRIPTO if (flags & FILE_FLAG_NO_BUFFERING) options |= FILE_NO_INTERMEDIATE_BUFFERING; if (!(flags & FILE_FLAG_OVERLAPPED)) options |= FILE_SYNCHRONOUS_IO_NONALERT; if (flags & FILE_FLAG_RANDOM_ACCESS) options |= FILE_RANDOM_ACCESS; + if (flags & FILE_FLAG_SEQUENTIAL_SCAN) options |= FILE_SEQUENTIAL_ONLY; flags &= FILE_ATTRIBUTE_VALID_FLAGS; objectName.Length = sizeof(ULONGLONG);

1 0

Andrew Boyarshin : include: Fix IRequestDictionary IID.
by Alexandre Julliard 10 Aug '21

10 Aug '21

Module: wine Branch: master Commit: 32ec7d7b94d1c2a476553c1e50f59ac6ecb5c8f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=32ec7d7b94d1c2a476553c1e… Author: Andrew Boyarshin <andrew.boyarshin(a)gmail.com> Date: Fri Jul 23 14:49:36 2021 +0700 include: Fix IRequestDictionary IID. IRequestDictionary had the wrong UUID specified (IResponse one). Found by using MIDL instead of WIDL to compile Wine headers: duplicated IID caused compilation error in MIDL. Signed-off-by: Andrew Boyarshin <andrew.boyarshin(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/domdoc.c | 2 +- include/asptlb.idl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index df30104a156..a7890d56f71 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -13170,7 +13170,7 @@ static HRESULT WINAPI transformdest_QueryInterface(IUnknown *iface, REFIID riid, IsEqualIID(riid, &IID_IServiceProvider) || IsEqualIID(riid, &IID_IStream) || IsEqualIID(riid, &IID_ISequentialStream) || - IsEqualIID(riid, &IID_IRequestDictionary); + IsEqualIID(riid, &IID_IResponse); todo_wine_if(IsEqualIID(riid, &IID_IXMLDOMDocument)) ok(known_iid, "Unexpected riid %s\n", wine_dbgstr_guid(riid)); diff --git a/include/asptlb.idl b/include/asptlb.idl index b38bc5d1fe9..07f250702dd 100644 --- a/include/asptlb.idl +++ b/include/asptlb.idl @@ -23,7 +23,7 @@ import "oaidl.idl"; [ object, dual, - uuid(D97A6DA0-A864-11cf-83BE-00A0C90C2BD8) + uuid(D97A6DA0-A85F-11DF-83AE-00A0C90C2BD8) ] interface IRequestDictionary : IDispatch {

1 0