December 2020 - Wine-commits

Gabriel Ivăncescu : iphlpapi: Make sure there's no gap between the ICMP_ECHO_REPLY array and the data.
by Alexandre Julliard 03 Dec '20

03 Dec '20

Module: wine Branch: master Commit: fb18f9fc6ebd09d9bb2692f1b4f26d093d0b97bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb18f9fc6ebd09d9bb2692f1… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Nov 23 15:47:44 2020 +0200 iphlpapi: Make sure there's no gap between the ICMP_ECHO_REPLY array and the data. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/icmp.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/dlls/iphlpapi/icmp.c b/dlls/iphlpapi/icmp.c index 79fd35f524c..d59bb4ba77f 100644 --- a/dlls/iphlpapi/icmp.c +++ b/dlls/iphlpapi/icmp.c @@ -309,6 +309,25 @@ static DWORD icmp_get_reply(int sid, unsigned char *buffer, DWORD send_time, voi if (res==0) SetLastError(IP_REQ_TIMED_OUT); done: + if (res) + { + /* Move the data so there's no gap between it and the ICMP_ECHO_REPLY array */ + DWORD gap_size = endbuf - (char*)ier; + + if (gap_size) + { + memmove(ier, endbuf, ((char*)reply_buf + reply_size) - endbuf); + + /* Fix the pointers */ + while (ier-- != reply_buf) + { + ier->Data = (char*)ier->Data - gap_size; + if (ier->Options.OptionsData) + ier->Options.OptionsData -= gap_size; + } + } + } + HeapFree(GetProcessHeap(), 0, buffer); TRACE("received %d replies\n",res); return res;

1 0

Gabriel Ivăncescu : iphlpapi: Store an IO_STATUS_BLOCK at the end of the reply buffer if there's enough space available.
by Alexandre Julliard 03 Dec '20

03 Dec '20

Module: wine Branch: master Commit: 1bae6b12e5a3544bafc7fcd642afeb96a27de1c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1bae6b12e5a3544bafc7fcd6… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Nov 23 15:47:45 2020 +0200 iphlpapi: Store an IO_STATUS_BLOCK at the end of the reply buffer if there's enough space available. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/icmp.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/iphlpapi/icmp.c b/dlls/iphlpapi/icmp.c index d59bb4ba77f..8ef03219e52 100644 --- a/dlls/iphlpapi/icmp.c +++ b/dlls/iphlpapi/icmp.c @@ -325,6 +325,20 @@ done: if (ier->Options.OptionsData) ier->Options.OptionsData -= gap_size; } + + /* According to MSDN, the reply buffer needs to hold space for a IO_STATUS_BLOCK, + found at the very end of the reply. This is confirmed on Windows XP, but Vista + and later do not store it anywhere and in fact don't even require it at all. + + However, in case old apps analyze this IO_STATUS_BLOCK and expect it, we mimic + it and write it out if there's enough space available in the buffer. */ + if (gap_size >= sizeof(IO_STATUS_BLOCK)) + { + IO_STATUS_BLOCK *io = (IO_STATUS_BLOCK*)((char*)reply_buf + reply_size - sizeof(IO_STATUS_BLOCK)); + + io->Pointer = NULL; /* Always NULL or STATUS_SUCCESS */ + io->Information = reply_size - gap_size; + } } }

1 0

Andrey Gusev : wined3d: Add NVIDIA GeForce GTX 1060 Mobile.
by Alexandre Julliard 03 Dec '20

03 Dec '20

Module: wine Branch: master Commit: c1c129f3b8310de8844e39efe190e849ec11f815 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1c129f3b8310de8844e39ef… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Dec 2 17:57:53 2020 +0200 wined3d: Add NVIDIA GeForce GTX 1060 Mobile. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7164b81b8ee..412842469b3 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -439,6 +439,7 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1050TI, "NVIDIA GeForce GTX 1050 Ti", DRIVER_NVIDIA_KEPLER, 4096}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1060_3GB,"NVIDIA GeForce GTX 1060 3GB", DRIVER_NVIDIA_KEPLER, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1060, "NVIDIA GeForce GTX 1060", DRIVER_NVIDIA_KEPLER, 6144}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1060M, "NVIDIA GeForce GTX 1060M", DRIVER_NVIDIA_KEPLER, 6144}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1070, "NVIDIA GeForce GTX 1070", DRIVER_NVIDIA_KEPLER, 8192}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1080, "NVIDIA GeForce GTX 1080", DRIVER_NVIDIA_KEPLER, 8192}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1080M, "NVIDIA GeForce GTX 1080M", DRIVER_NVIDIA_KEPLER, 8192}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b756c80ad8a..67caf98ead7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3012,6 +3012,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX1050TI = 0x1c82, CARD_NVIDIA_GEFORCE_GTX1060_3GB = 0x1c02, CARD_NVIDIA_GEFORCE_GTX1060 = 0x1c03, + CARD_NVIDIA_GEFORCE_GTX1060M = 0x1c20, CARD_NVIDIA_GEFORCE_GTX1070 = 0x1b81, CARD_NVIDIA_GEFORCE_GTX1080 = 0x1b80, CARD_NVIDIA_GEFORCE_GTX1080M = 0x1be0,

1 0

Henri Verbeet : wined3d: Reference the bo in wined3d_texture_gl_upload_data().
by Alexandre Julliard 03 Dec '20

03 Dec '20

Module: wine Branch: master Commit: 17e51124f919e80485aab9572fbbca5622d219f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=17e51124f919e80485aab957… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 3 19:05:55 2020 +0330 wined3d: Reference the bo in wined3d_texture_gl_upload_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 1e410930a8b..1cf4f7eb5ca 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2481,6 +2481,7 @@ static void wined3d_texture_gl_upload_data(struct wined3d_context *context, if (bo.buffer_object) { GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0)); + wined3d_context_gl_reference_bo(context_gl, (struct wined3d_bo_gl *)bo.buffer_object); checkGLcall("glBindBuffer"); } }

1 0

Henri Verbeet : wined3d: Reference the bo in wined3d_texture_gl_download_data_slow_path().
by Alexandre Julliard 03 Dec '20

03 Dec '20

Module: wine Branch: master Commit: 6f8c918d866cf0f826ceb69614225e9a86d59441 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f8c918d866cf0f826ceb696… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 3 19:05:56 2020 +0330 wined3d: Reference the bo in wined3d_texture_gl_download_data_slow_path(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 1cf4f7eb5ca..43d75eb8ce9 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2501,7 +2501,7 @@ static void wined3d_texture_gl_upload_data(struct wined3d_context *context, static void wined3d_texture_gl_download_data_slow_path(struct wined3d_texture_gl *texture_gl, unsigned int sub_resource_idx, struct wined3d_context_gl *context_gl, const struct wined3d_bo_address *data) { - const struct wined3d_bo_gl *bo = (const struct wined3d_bo_gl *)data->buffer_object; + struct wined3d_bo_gl *bo = (struct wined3d_bo_gl *)data->buffer_object; const struct wined3d_gl_info *gl_info = context_gl->gl_info; struct wined3d_texture_sub_resource *sub_resource; unsigned int dst_row_pitch, dst_slice_pitch; @@ -2721,6 +2721,7 @@ static void wined3d_texture_gl_download_data_slow_path(struct wined3d_texture_gl if (bo) { GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, 0)); + wined3d_context_gl_reference_bo(context_gl, bo); checkGLcall("glBindBuffer"); }

1 0

Henri Verbeet : wined3d: Reference the bo in wined3d_texture_gl_download_data().
by Alexandre Julliard 03 Dec '20

03 Dec '20

Module: wine Branch: master Commit: 736ac3eaf9705f254b97e7e83dfaa16883a95089 URL: https://source.winehq.org/git/wine.git/?a=commit;h=736ac3eaf9705f254b97e7e8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 3 19:05:57 2020 +0330 wined3d: Reference the bo in wined3d_texture_gl_download_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 43d75eb8ce9..6c9627d21f8 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2841,6 +2841,7 @@ static void wined3d_texture_gl_download_data(struct wined3d_context *context, if (dst_bo) { GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, 0)); + wined3d_context_gl_reference_bo(context_gl, dst_bo); checkGLcall("glBindBuffer"); } }

1 0

Henri Verbeet : wined3d: Reference the bo in wined3d_buffer_gl_upload_ranges().
by Alexandre Julliard 03 Dec '20

03 Dec '20

Module: wine Branch: master Commit: 5333cd061202baa2beb62cbfb0486b2a829f62a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5333cd061202baa2beb62cbf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 3 19:05:58 2020 +0330 wined3d: Reference the bo in wined3d_buffer_gl_upload_ranges(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 82051453ef1..7a4e48fd9c6 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1412,6 +1412,7 @@ static void wined3d_buffer_gl_upload_ranges(struct wined3d_buffer *buffer, struc GL_EXTCALL(glBufferSubData(buffer_gl->bo.binding, range->offset, range->size, (BYTE *)data + range->offset - data_offset)); } + wined3d_context_gl_reference_bo(context_gl, &buffer_gl->bo); checkGLcall("buffer upload"); }

1 0

Henri Verbeet : wined3d: Explicitly synchronise in wined3d_context_gl_map_bo_address().
by Alexandre Julliard 03 Dec '20

03 Dec '20

Module: wine Branch: master Commit: d52a75a795dd2761ec75116e9cff1d3ff836a826 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d52a75a795dd2761ec75116e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 3 19:05:59 2020 +0330 wined3d: Explicitly synchronise in wined3d_context_gl_map_bo_address(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 7 ------- dlls/wined3d/context_gl.c | 9 +++++++++ dlls/wined3d/resource.c | 4 ++-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 7a4e48fd9c6..5dbc66449f4 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -741,7 +741,6 @@ void * CDECL wined3d_buffer_get_parent(const struct wined3d_buffer *buffer) static void wined3d_buffer_gl_sync_apple(struct wined3d_buffer_gl *buffer_gl, uint32_t flags, struct wined3d_context_gl *context_gl) { - struct wined3d_device_gl *device_gl = wined3d_device_gl(buffer_gl->b.resource.device); const struct wined3d_gl_info *gl_info = context_gl->gl_info; struct wined3d_bo_gl *bo = &buffer_gl->bo; @@ -759,12 +758,6 @@ static void wined3d_buffer_gl_sync_apple(struct wined3d_buffer_gl *buffer_gl, bo->command_fence_id = 0; return; } - - TRACE("Synchronizing buffer %p.\n", buffer_gl); - - if (bo->command_fence_id == device_gl->current_fence_id) - wined3d_context_gl_submit_command_fence(context_gl); - wined3d_context_gl_wait_command_fence(context_gl, bo->command_fence_id); } static void buffer_mark_used(struct wined3d_buffer *buffer) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 83c61834f5a..406b325cda8 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2653,6 +2653,7 @@ void wined3d_context_gl_submit_command_fence(struct wined3d_context_gl *context_ void *wined3d_context_gl_map_bo_address(struct wined3d_context_gl *context_gl, const struct wined3d_bo_address *data, size_t size, uint32_t flags) { + struct wined3d_device_gl *device_gl = wined3d_device_gl(context_gl->c.device); const struct wined3d_gl_info *gl_info; struct wined3d_bo_gl *bo; BYTE *memory; @@ -2660,6 +2661,14 @@ void *wined3d_context_gl_map_bo_address(struct wined3d_context_gl *context_gl, if (!(bo = (struct wined3d_bo_gl *)data->buffer_object)) return data->addr; + if (flags & (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE)) + goto map; + + if (bo->command_fence_id == device_gl->current_fence_id) + wined3d_context_gl_submit_command_fence(context_gl); + wined3d_context_gl_wait_command_fence(context_gl, bo->command_fence_id); + +map: gl_info = context_gl->gl_info; wined3d_context_gl_bind_bo(context_gl, bo->binding, bo->id); diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 97b8b68374d..f6e233d8057 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -451,11 +451,11 @@ GLbitfield wined3d_resource_gl_map_flags(DWORD d3d_flags) ret |= GL_MAP_WRITE_BIT | GL_MAP_FLUSH_EXPLICIT_BIT; if (d3d_flags & WINED3D_MAP_READ) ret |= GL_MAP_READ_BIT; + else if (!(d3d_flags & WINED3D_MAP_DISCARD)) + ret |= GL_MAP_UNSYNCHRONIZED_BIT; if (d3d_flags & WINED3D_MAP_DISCARD) ret |= GL_MAP_INVALIDATE_BUFFER_BIT; - if (d3d_flags & WINED3D_MAP_NOOVERWRITE) - ret |= GL_MAP_UNSYNCHRONIZED_BIT; return ret; }

1 0

Derek Lesho : winegstreamer: Use gst_audio_info_to_caps for media type translation.
by Alexandre Julliard 03 Dec '20

03 Dec '20

Module: wine Branch: master Commit: d52f2a0f995bd0bb2e813171224e6811a38f134a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d52f2a0f995bd0bb2e813171… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Wed Dec 2 17:36:30 2020 -0500 winegstreamer: Use gst_audio_info_to_caps for media type translation. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/mfplat.c | 51 +++++++++++++++++++-------------------------- 1 file changed, 22 insertions(+), 29 deletions(-) diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index 3d224a5accc..3a160d68093 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -669,31 +669,39 @@ GstCaps *caps_from_mf_media_type(IMFMediaType *type) } else if (IsEqualGUID(&major_type, &MFMediaType_Audio)) { - DWORD rate, channels, channel_mask, bitrate; + DWORD rate = -1, channels = -1, channel_mask = -1; + + if (FAILED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_SAMPLES_PER_SECOND, &rate))) + { + ERR("Sample rate not set.\n"); + return NULL; + } + if (FAILED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_NUM_CHANNELS, &channels))) + { + ERR("Channel count not set.\n"); + return NULL; + } + IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_CHANNEL_MASK, &channel_mask); if (IsEqualGUID(&subtype, &MFAudioFormat_Float)) { - output = gst_caps_new_empty_simple("audio/x-raw"); + GstAudioInfo float_info; - gst_caps_set_simple(output, "format", G_TYPE_STRING, "F32LE", NULL); - gst_caps_set_simple(output, "layout", G_TYPE_STRING, "interleaved", NULL); + gst_audio_info_set_format(&float_info, GST_AUDIO_FORMAT_F32LE, rate, channels, NULL); + output = gst_audio_info_to_caps(&float_info); } else if (IsEqualGUID(&subtype, &MFAudioFormat_PCM)) { + GstAudioFormat pcm_format; + GstAudioInfo pcm_info; DWORD bits_per_sample; if (SUCCEEDED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_BITS_PER_SAMPLE, &bits_per_sample))) { - char format[6]; - char type; - - type = bits_per_sample > 8 ? 'S' : 'U'; - - output = gst_caps_new_empty_simple("audio/x-raw"); - - sprintf(format, "%c%u%s", type, bits_per_sample, bits_per_sample > 8 ? "LE" : ""); + pcm_format = gst_audio_format_build_integer(bits_per_sample > 8, G_LITTLE_ENDIAN, bits_per_sample, bits_per_sample); - gst_caps_set_simple(output, "format", G_TYPE_STRING, format, NULL); + gst_audio_info_set_format(&pcm_info, pcm_format, rate, channels, NULL); + output = gst_audio_info_to_caps(&pcm_info); } else { @@ -707,23 +715,8 @@ GstCaps *caps_from_mf_media_type(IMFMediaType *type) return NULL; } - if (SUCCEEDED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_SAMPLES_PER_SECOND, &rate))) - { - gst_caps_set_simple(output, "rate", G_TYPE_INT, rate, NULL); - } - if (SUCCEEDED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_NUM_CHANNELS, &channels))) - { - gst_caps_set_simple(output, "channels", G_TYPE_INT, channels, NULL); - } - if (SUCCEEDED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_CHANNEL_MASK, &channel_mask))) - { + if (channel_mask != -1) gst_caps_set_simple(output, "channel-mask", GST_TYPE_BITMASK, (guint64) channel_mask, NULL); - } - - if (SUCCEEDED(IMFMediaType_GetUINT32(type, &MF_MT_AVG_BITRATE, &bitrate))) - { - gst_caps_set_simple(output, "bitrate", G_TYPE_INT, bitrate, NULL); - } return output; }

1 0

Derek Lesho : winegstreamer: Introduce audio conversion transform.
by Alexandre Julliard 03 Dec '20

03 Dec '20

Module: wine Branch: master Commit: 35c0da85ef3a9bcd7e80e55673ad13c1e7da652c URL: https://source.winehq.org/git/wine.git/?a=commit;h=35c0da85ef3a9bcd7e80e556… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Thu Dec 3 11:42:18 2020 -0500 winegstreamer: Introduce audio conversion transform. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/Makefile.in | 1 + dlls/winegstreamer/audioconvert.c | 304 +++++++++++++++++++++++++++ dlls/winegstreamer/gst_private.h | 2 + dlls/winegstreamer/mfplat.c | 3 + dlls/winegstreamer/winegstreamer_classes.idl | 6 + 5 files changed, 316 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=35c0da85ef3a9bcd7e80…

1 0