wine-commits May 2019

wine-commits@winehq.org

2 participants
1019 discussions

Jacek Caban : server: Remove IRP from device queue before terminating async.
by Alexandre Julliard 28 May '19

28 May '19

Module: wine Branch: master Commit: dc5421f9506da691dbc631fb319e8d10a0e22ce9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc5421f9506da691dbc631fb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 28 14:09:59 2019 +0200 server: Remove IRP from device queue before terminating async. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/device.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/server/device.c b/server/device.c index e123583..1cebc3b 100644 --- a/server/device.c +++ b/server/device.c @@ -378,6 +378,9 @@ static void set_irp_result( struct irp_call *irp, unsigned int status, iosb->out_size = min( iosb->out_size, out_size ); if (iosb->out_size && !(iosb->out_data = memdup( out_data, iosb->out_size ))) iosb->out_size = 0; + + /* remove it from the device queue */ + list_remove( &irp->dev_entry ); irp->file = NULL; if (irp->async) { @@ -388,8 +391,6 @@ static void set_irp_result( struct irp_call *irp, unsigned int status, } wake_up( &irp->obj, 0 ); - /* remove it from the device queue */ - list_remove( &irp->dev_entry ); release_object( irp ); /* no longer on the device queue */ release_object( file ); }

1 0

Jacek Caban : server: Store IRP client pointer on server side.
by Alexandre Julliard 28 May '19

28 May '19

Module: wine Branch: master Commit: 101da2b5127ae698e79bca4ac0bfa780c785722b URL: https://source.winehq.org/git/wine.git/?a=commit;h=101da2b5127ae698e79bca4a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 28 14:09:47 2019 +0200 server: Store IRP client pointer on server side. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 10 +++++++--- include/wine/server_protocol.h | 3 ++- server/device.c | 6 ++++++ server/protocol.def | 1 + server/request.h | 3 ++- server/trace.c | 1 + 6 files changed, 19 insertions(+), 5 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 10cf2e2..1892809 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -557,6 +557,7 @@ struct dispatch_context { irp_params_t params; HANDLE handle; + IRP *irp; ULONG in_size; void *in_buff; }; @@ -570,6 +571,7 @@ static void dispatch_irp( DEVICE_OBJECT *device, IRP *irp, struct dispatch_conte KeQueryTickCount( &count ); /* update the global KeTickCount */ + context->irp = irp; device->CurrentIrp = irp; IoCallDriver( device, irp ); device->CurrentIrp = NULL; @@ -931,9 +933,10 @@ NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ) SERVER_START_REQ( get_next_device_request ) { - req->manager = wine_server_obj_handle( manager ); - req->prev = wine_server_obj_handle( context.handle ); - req->status = status; + req->manager = wine_server_obj_handle( manager ); + req->prev = wine_server_obj_handle( context.handle ); + req->user_ptr = wine_server_client_ptr( context.irp ); + req->status = status; wine_server_set_reply( req, context.in_buff, context.in_size ); if (!(status = wine_server_call( req ))) { @@ -949,6 +952,7 @@ NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ) if (status == STATUS_BUFFER_OVERFLOW) context.in_size = reply->in_size; } + context.irp = NULL; } SERVER_END_REQ; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index a45d092..eab5755 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -5252,6 +5252,7 @@ struct get_next_device_request_request obj_handle_t manager; obj_handle_t prev; unsigned int status; + client_ptr_t user_ptr; }; struct get_next_device_request_reply { @@ -6694,6 +6695,6 @@ union generic_reply struct resume_process_reply resume_process_reply; }; -#define SERVER_PROTOCOL_VERSION 583 +#define SERVER_PROTOCOL_VERSION 584 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/device.c b/server/device.c index d6ab1c5..e123583 100644 --- a/server/device.c +++ b/server/device.c @@ -52,6 +52,7 @@ struct irp_call struct async *async; /* pending async op */ irp_params_t params; /* irp parameters */ struct iosb *iosb; /* I/O status block */ + client_ptr_t user_ptr; /* client side pointer */ }; static void irp_call_dump( struct object *obj, int verbose ); @@ -351,6 +352,7 @@ static struct irp_call *create_irp( struct device_file *file, const irp_params_t irp->async = NULL; irp->params = *params; irp->iosb = NULL; + irp->user_ptr = 0; if (async) irp->iosb = async_get_iosb( async ); if (!irp->iosb && !(irp->iosb = create_iosb( NULL, 0, 0 ))) @@ -886,13 +888,17 @@ DECL_HANDLER(get_next_device_request) if (req->prev) close_handle( current->process, req->prev ); /* avoid an extra round-trip for close */ + /* process result of previous call */ if (manager->current_call) { irp = manager->current_call; + irp->user_ptr = req->user_ptr; + if (req->status) set_irp_result( irp, req->status, NULL, 0, 0 ); else if (irp->async) set_async_pending( irp->async, irp->file && is_fd_overlapped( irp->file->fd ) ); + free_irp_params( irp ); release_object( irp ); manager->current_call = NULL; diff --git a/server/protocol.def b/server/protocol.def index 21008d7..6b6e868 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3633,6 +3633,7 @@ struct handle_info obj_handle_t manager; /* handle to the device manager */ obj_handle_t prev; /* handle to the previous irp */ unsigned int status; /* status of the previous irp */ + client_ptr_t user_ptr; /* user pointer of the previous irp */ @REPLY irp_params_t params; /* irp parameters */ obj_handle_t next; /* handle to the next irp */ diff --git a/server/request.h b/server/request.h index 07918df..1858b41 100644 --- a/server/request.h +++ b/server/request.h @@ -2287,7 +2287,8 @@ C_ASSERT( sizeof(struct delete_device_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct get_next_device_request_request, manager) == 12 ); C_ASSERT( FIELD_OFFSET(struct get_next_device_request_request, prev) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_next_device_request_request, status) == 20 ); -C_ASSERT( sizeof(struct get_next_device_request_request) == 24 ); +C_ASSERT( FIELD_OFFSET(struct get_next_device_request_request, user_ptr) == 24 ); +C_ASSERT( sizeof(struct get_next_device_request_request) == 32 ); C_ASSERT( FIELD_OFFSET(struct get_next_device_request_reply, params) == 8 ); C_ASSERT( FIELD_OFFSET(struct get_next_device_request_reply, next) == 40 ); C_ASSERT( FIELD_OFFSET(struct get_next_device_request_reply, client_tid) == 44 ); diff --git a/server/trace.c b/server/trace.c index 28bf3dd..82ea93f 100644 --- a/server/trace.c +++ b/server/trace.c @@ -4282,6 +4282,7 @@ static void dump_get_next_device_request_request( const struct get_next_device_r fprintf( stderr, " manager=%04x", req->manager ); fprintf( stderr, ", prev=%04x", req->prev ); fprintf( stderr, ", status=%08x", req->status ); + dump_uint64( ", user_ptr=", &req->user_ptr ); } static void dump_get_next_device_request_reply( const struct get_next_device_request_reply *req )

1 0

Jacek Caban : server: Use stored current kernel call to interpret IRP dispatch status.
by Alexandre Julliard 28 May '19

28 May '19

Module: wine Branch: master Commit: dfe20465e894057d34da531fcd8a6e1fe4dfc310 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dfe20465e894057d34da531f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 28 14:09:22 2019 +0200 server: Use stored current kernel call to interpret IRP dispatch status. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/device.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/server/device.c b/server/device.c index 1dcd500..d6ab1c5 100644 --- a/server/device.c +++ b/server/device.c @@ -884,20 +884,14 @@ DECL_HANDLER(get_next_device_request) 0, &device_manager_ops ))) return; - if (req->prev) - { - if ((irp = (struct irp_call *)get_handle_obj( current->process, req->prev, 0, &irp_call_ops ))) - { - set_irp_result( irp, req->status, NULL, 0, 0 ); - close_handle( current->process, req->prev ); /* avoid an extra round-trip for close */ - release_object( irp ); - } - } + if (req->prev) close_handle( current->process, req->prev ); /* avoid an extra round-trip for close */ if (manager->current_call) { irp = manager->current_call; - if (irp->async) + if (req->status) + set_irp_result( irp, req->status, NULL, 0, 0 ); + else if (irp->async) set_async_pending( irp->async, irp->file && is_fd_overlapped( irp->file->fd ) ); free_irp_params( irp ); release_object( irp );

1 0

Huw Davies : msctfp: Define the correct PROXY_CLSID.
by Alexandre Julliard 28 May '19

28 May '19

Module: wine Branch: master Commit: 1020db7938c7c3d2ce6250739dfb8df22d5a3745 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1020db7938c7c3d2ce625073… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 28 12:59:44 2019 +0100 msctfp: Define the correct PROXY_CLSID. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctfp/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msctfp/Makefile.in b/dlls/msctfp/Makefile.in index 9ff3c3d..992aeef 100644 --- a/dlls/msctfp/Makefile.in +++ b/dlls/msctfp/Makefile.in @@ -3,4 +3,4 @@ IMPORTS = rpcrt4 ole32 oleaut32 IDL_SRCS = msctfp.idl -dlldata_EXTRADEFS = -DWINE_REGISTER_DLL +dlldata_EXTRADEFS = -DWINE_REGISTER_DLL -DPROXY_CLSID=CLSID_PSFactoryBuffer

1 0

Gabriel Ivăncescu : winealsa.drv: Adjust the buffer volume before sending it to ALSA.
by Alexandre Julliard 28 May '19

28 May '19

Module: wine Branch: master Commit: 9d48b3294c0bf73f65ccefae28ed225aaba4abab URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d48b3294c0bf73f65ccefae… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon May 20 13:43:36 2019 +0300 winealsa.drv: Adjust the buffer volume before sending it to ALSA. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38182 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winealsa.drv/mmdevdrv.c | 137 ++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 130 insertions(+), 7 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 2bf4d73..91aef47 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -126,6 +126,7 @@ struct ACImpl { UINT32 lcl_offs_frames; /* offs into local_buffer where valid data starts */ UINT32 wri_offs_frames; /* where to write fresh data in local_buffer */ UINT32 hidden_frames; /* ALSA reserve to ensure continuous rendering */ + UINT32 vol_adjusted_frames; /* Frames we've already adjusted the volume of but didn't write yet */ UINT32 data_in_alsa_frames; HANDLE timer; @@ -1970,18 +1971,135 @@ static BYTE *remap_channels(ACImpl *This, BYTE *buf, snd_pcm_uframes_t frames) return This->remapping_buf; } +static void adjust_buffer_volume(const ACImpl *This, BYTE *buf, snd_pcm_uframes_t frames, BOOL mute) +{ + float vol[ARRAY_SIZE(This->alsa_channel_map)]; + BOOL adjust = FALSE; + UINT32 i, channels; + BYTE *end; + + if (This->vol_adjusted_frames >= frames) + return; + channels = This->fmt->nChannels; + + if (mute) + { + int err = snd_pcm_format_set_silence(This->alsa_format, buf, frames * channels); + if (err < 0) + WARN("Setting buffer to silence failed: %d (%s)\n", err, snd_strerror(err)); + return; + } + + /* Adjust the buffer based on the volume for each channel */ + for (i = 0; i < channels; i++) + vol[i] = This->vols[i] * This->session->master_vol; + for (i = 0; i < min(channels, This->session->channel_count); i++) + { + vol[i] *= This->session->channel_vols[i]; + adjust |= vol[i] != 1.0f; + } + while (i < channels) adjust |= vol[i++] != 1.0f; + if (!adjust) return; + + /* Skip the frames we've already adjusted before */ + end = buf + frames * This->fmt->nBlockAlign; + buf += This->vol_adjusted_frames * This->fmt->nBlockAlign; + + switch (This->alsa_format) + { +#ifndef WORDS_BIGENDIAN +#define PROCESS_BUFFER(type) do \ +{ \ + type *p = (type*)buf; \ + do \ + { \ + for (i = 0; i < channels; i++) \ + p[i] = p[i] * vol[i]; \ + p += i; \ + } while ((BYTE*)p != end); \ +} while (0) + case SND_PCM_FORMAT_S16_LE: + PROCESS_BUFFER(INT16); + break; + case SND_PCM_FORMAT_S32_LE: + PROCESS_BUFFER(INT32); + break; + case SND_PCM_FORMAT_FLOAT_LE: + PROCESS_BUFFER(float); + break; + case SND_PCM_FORMAT_FLOAT64_LE: + PROCESS_BUFFER(double); + break; +#undef PROCESS_BUFFER + case SND_PCM_FORMAT_S20_3LE: + case SND_PCM_FORMAT_S24_3LE: + { + /* Do it 12 bytes at a time until it is no longer possible */ + UINT32 *q = (UINT32*)buf, mask = ~0xff; + BYTE *p; + + /* After we adjust the volume, we need to mask out low bits */ + if (This->alsa_format == SND_PCM_FORMAT_S20_3LE) + mask = ~0x0fff; + + i = 0; + while (end - (BYTE*)q >= 12) + { + UINT32 v[4], k; + v[0] = q[0] << 8; + v[1] = q[1] << 16 | (q[0] >> 16 & ~0xff); + v[2] = q[2] << 24 | (q[1] >> 8 & ~0xff); + v[3] = q[2] & ~0xff; + for (k = 0; k < 4; k++) + { + v[k] = (INT32)((INT32)v[k] * vol[i]); + v[k] &= mask; + if (++i == channels) i = 0; + } + *q++ = v[0] >> 8 | v[1] << 16; + *q++ = v[1] >> 16 | v[2] << 8; + *q++ = v[2] >> 24 | v[3]; + } + p = (BYTE*)q; + while (p != end) + { + UINT32 v = (INT32)((INT32)(p[0] << 8 | p[1] << 16 | p[2] << 24) * vol[i]); + v &= mask; + *p++ = v >> 8 & 0xff; + *p++ = v >> 16 & 0xff; + *p++ = v >> 24; + if (++i == channels) i = 0; + } + break; + } +#endif + case SND_PCM_FORMAT_U8: + { + UINT8 *p = (UINT8*)buf; + do + { + for (i = 0; i < channels; i++) + p[i] = (int)((p[i] - 128) * vol[i]) + 128; + p += i; + } while ((BYTE*)p != end); + break; + } + default: + TRACE("Unhandled format %i, not adjusting volume.\n", This->alsa_format); + break; + } +} + static snd_pcm_sframes_t alsa_write_best_effort(ACImpl *This, BYTE *buf, snd_pcm_uframes_t frames, BOOL mute) { snd_pcm_sframes_t written; - if(mute){ - int err; - if((err = snd_pcm_format_set_silence(This->alsa_format, buf, - frames * This->fmt->nChannels)) < 0) - WARN("Setting buffer to silence failed: %d (%s)\n", err, - snd_strerror(err)); - } + adjust_buffer_volume(This, buf, frames, mute); + + /* Mark the frames we've already adjusted */ + if (This->vol_adjusted_frames < frames) + This->vol_adjusted_frames = frames; buf = remap_channels(This, buf, frames); @@ -2005,6 +2123,8 @@ static snd_pcm_sframes_t alsa_write_best_effort(ACImpl *This, BYTE *buf, written = snd_pcm_writei(This->pcm_handle, buf, frames); } + if (written > 0) + This->vol_adjusted_frames -= written; return written; } @@ -2102,7 +2222,10 @@ static void alsa_write_data(ACImpl *This) /* Add a lead-in when starting with too few frames to ensure * continuous rendering. Additional benefit: Force ALSA to start. */ if(This->data_in_alsa_frames == 0 && This->held_frames < This->alsa_period_frames) + { alsa_write_best_effort(This, This->silence_buf, This->alsa_period_frames - This->held_frames, FALSE); + This->vol_adjusted_frames = 0; + } if(This->started) max_copy_frames = data_not_in_alsa(This);

1 0

Gabriel Ivăncescu : winepulse.drv: Add support for A-law and u-law formats with volume changes.
by Alexandre Julliard 28 May '19

28 May '19

Module: wine Branch: master Commit: 1a7026136bcc11f96a42b8c3e4e65283d8f4de25 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a7026136bcc11f96a42b8c3… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon May 20 13:41:26 2019 +0300 winepulse.drv: Add support for A-law and u-law formats with volume changes. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 2016 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 2016 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1a7026136bcc11f96a42…

1 0

Gabriel Ivăncescu : winepulse.drv: Adjust the buffer volume before sending it to PulseAudio.
by Alexandre Julliard 28 May '19

28 May '19

Module: wine Branch: master Commit: cad249b6881240e287b8dddda5424b7e1036197f URL: https://source.winehq.org/git/wine.git/?a=commit;h=cad249b6881240e287b8dddd… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon May 20 13:41:25 2019 +0300 winepulse.drv: Adjust the buffer volume before sending it to PulseAudio. Only fixes the PulseAudio driver for the first bug, not ALSA. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38182 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46450 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 154 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 138 insertions(+), 16 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 8d57f1a..5f09332 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -621,6 +621,135 @@ static void silence_buffer(pa_sample_format_t format, BYTE *buffer, UINT32 bytes memset(buffer, format == PA_SAMPLE_U8 ? 0x80 : 0, bytes); } +static void pulse_free_noop(void *buf) +{ +} + +enum write_buffer_flags +{ + WINEPULSE_WRITE_NOFREE = 0x01, + WINEPULSE_WRITE_SILENT = 0x02 +}; + +static int write_buffer(const ACImpl *This, BYTE *buffer, UINT32 bytes, + enum write_buffer_flags flags) +{ + float vol[PA_CHANNELS_MAX]; + BOOL adjust = FALSE; + UINT32 i, channels; + BYTE *end; + + if (!bytes) return 0; + if (This->session->mute || (flags & WINEPULSE_WRITE_SILENT)) + { + silence_buffer(This->ss.format, buffer, bytes); + goto write; + } + + /* Adjust the buffer based on the volume for each channel */ + channels = This->ss.channels; + for (i = 0; i < channels; i++) + { + vol[i] = This->vol[i] * This->session->master_vol * This->session->channel_vols[i]; + adjust |= vol[i] != 1.0f; + } + if (!adjust) goto write; + + end = buffer + bytes; + switch (This->ss.format) + { +#ifndef WORDS_BIGENDIAN +#define PROCESS_BUFFER(type) do \ +{ \ + type *p = (type*)buffer; \ + do \ + { \ + for (i = 0; i < channels; i++) \ + p[i] = p[i] * vol[i]; \ + p += i; \ + } while ((BYTE*)p != end); \ +} while (0) + case PA_SAMPLE_S16LE: + PROCESS_BUFFER(INT16); + break; + case PA_SAMPLE_S32LE: + PROCESS_BUFFER(INT32); + break; + case PA_SAMPLE_FLOAT32LE: + PROCESS_BUFFER(float); + break; +#undef PROCESS_BUFFER + case PA_SAMPLE_S24_32LE: + { + UINT32 *p = (UINT32*)buffer; + do + { + for (i = 0; i < channels; i++) + { + p[i] = (INT32)((INT32)(p[i] << 8) * vol[i]); + p[i] >>= 8; + } + p += i; + } while ((BYTE*)p != end); + break; + } + case PA_SAMPLE_S24LE: + { + /* do it 12 bytes at a time until it is no longer possible */ + UINT32 *q = (UINT32*)buffer; + BYTE *p; + + i = 0; + while (end - (BYTE*)q >= 12) + { + UINT32 v[4], k; + v[0] = q[0] << 8; + v[1] = q[1] << 16 | (q[0] >> 16 & ~0xff); + v[2] = q[2] << 24 | (q[1] >> 8 & ~0xff); + v[3] = q[2] & ~0xff; + for (k = 0; k < 4; k++) + { + v[k] = (INT32)((INT32)v[k] * vol[i]); + if (++i == channels) i = 0; + } + *q++ = v[0] >> 8 | (v[1] & ~0xff) << 16; + *q++ = v[1] >> 16 | (v[2] & ~0xff) << 8; + *q++ = v[2] >> 24 | (v[3] & ~0xff); + } + p = (BYTE*)q; + while (p != end) + { + UINT32 v = (INT32)((INT32)(p[0] << 8 | p[1] << 16 | p[2] << 24) * vol[i]); + *p++ = v >> 8 & 0xff; + *p++ = v >> 16 & 0xff; + *p++ = v >> 24; + if (++i == channels) i = 0; + } + break; + } +#endif + case PA_SAMPLE_U8: + { + UINT8 *p = (UINT8*)buffer; + do + { + for (i = 0; i < channels; i++) + p[i] = (int)((p[i] - 128) * vol[i]) + 128; + p += i; + } while ((BYTE*)p != end); + break; + } + default: + TRACE("Unhandled format %i, not adjusting volume.\n", This->ss.format); + break; + } + +write: + return pa_stream_write(This->stream, buffer, bytes, + (flags & WINEPULSE_WRITE_NOFREE) ? pulse_free_noop : NULL, + 0, PA_SEEK_RELATIVE); +} + static void dump_attr(const pa_buffer_attr *attr) { TRACE("maxlength: %u\n", attr->maxlength); TRACE("minreq: %u\n", attr->minreq); @@ -681,7 +810,7 @@ static void pulse_wr_callback(pa_stream *s, size_t bytes, void *userdata) if(This->lcl_offs_bytes + bytes > This->bufsize_bytes){ to_write = This->bufsize_bytes - This->lcl_offs_bytes; TRACE("writing small chunk of %u bytes\n", to_write); - pa_stream_write(This->stream, buf, to_write, NULL, 0, PA_SEEK_RELATIVE); + write_buffer(This, buf, to_write, 0); This->held_bytes -= to_write; to_write = bytes - to_write; This->lcl_offs_bytes = 0; @@ -690,7 +819,7 @@ static void pulse_wr_callback(pa_stream *s, size_t bytes, void *userdata) to_write = bytes; TRACE("writing main chunk of %u bytes\n", to_write); - pa_stream_write(This->stream, buf, to_write, NULL, 0, PA_SEEK_RELATIVE); + write_buffer(This, buf, to_write, 0); This->lcl_offs_bytes += to_write; This->lcl_offs_bytes %= This->bufsize_bytes; This->held_bytes -= to_write; @@ -2126,10 +2255,6 @@ static void pulse_wrap_buffer(ACImpl *This, BYTE *buffer, UINT32 written_bytes) } } -static void pulse_free_noop(void *buf) -{ -} - static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( IAudioRenderClient *iface, UINT32 written_frames, DWORD flags) { @@ -2181,7 +2306,7 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( TRACE("pre-writing %u bytes\n", to_write); - e = pa_stream_write(This->stream, buffer, to_write, NULL, 0, PA_SEEK_RELATIVE); + e = write_buffer(This, buffer, to_write, 0); if(e) ERR("pa_stream_write failed: 0x%x\n", e); @@ -2191,15 +2316,12 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( } }else{ - if (This->locked_ptr) { - if (flags & AUDCLNT_BUFFERFLAGS_SILENT) - silence_buffer(This->ss.format, This->locked_ptr, written_bytes); - pa_stream_write(This->stream, This->locked_ptr, written_bytes, NULL, 0, PA_SEEK_RELATIVE); - } else { - if (flags & AUDCLNT_BUFFERFLAGS_SILENT) - silence_buffer(This->ss.format, This->tmp_buffer, written_bytes); - pa_stream_write(This->stream, This->tmp_buffer, written_bytes, pulse_free_noop, 0, PA_SEEK_RELATIVE); - } + enum write_buffer_flags wr_flags = 0; + + if (flags & AUDCLNT_BUFFERFLAGS_SILENT) wr_flags |= WINEPULSE_WRITE_SILENT; + if (!This->locked_ptr) wr_flags |= WINEPULSE_WRITE_NOFREE; + + write_buffer(This, This->locked_ptr ? This->locked_ptr : This->tmp_buffer, written_bytes, wr_flags); This->pad += written_bytes; }

1 0

Hans Leidekker : advapi32: Improve the SaferComputeTokenFromLevel stub.
by Alexandre Julliard 28 May '19

28 May '19

Module: wine Branch: master Commit: 17110a0a890d2bacb5b348bd9bb3cef10d144e19 URL: https://source.winehq.org/git/wine.git/?a=commit;h=17110a0a890d2bacb5b348bd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 28 09:34:10 2019 +0200 advapi32: Improve the SaferComputeTokenFromLevel stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47274 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/security.c | 2 +- include/winsafer.h | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 4b2876d..8027434 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -6172,7 +6172,7 @@ BOOL WINAPI SaferComputeTokenFromLevel(SAFER_LEVEL_HANDLE handle, HANDLE token, { FIXME("(%p, %p, %p, %x, %p) stub\n", handle, token, access_token, flags, reserved); - *access_token = (HANDLE)0xdeadbeef; + *access_token = (flags & SAFER_TOKEN_NULL_IF_EQUAL) ? NULL : (HANDLE)0xdeadbeef; return TRUE; } diff --git a/include/winsafer.h b/include/winsafer.h index 2565484..02150c5 100644 --- a/include/winsafer.h +++ b/include/winsafer.h @@ -30,6 +30,11 @@ extern "C" { DECLARE_HANDLE(SAFER_LEVEL_HANDLE); +#define SAFER_TOKEN_NULL_IF_EQUAL 0x00000001 +#define SAFER_TOKEN_COMPARE_ONLY 0x00000002 +#define SAFER_TOKEN_MAKE_INERT 0x00000004 +#define SAFER_TOKEN_WANT_FLAGS 0x00000008 + #define SAFER_MAX_HASH_SIZE 64 #include <pshpack8.h>

1 0

Alistair Leslie-Hughes : bcrypt: Add BCryptDeriveKey stub.
by Alexandre Julliard 28 May '19

28 May '19

Module: wine Branch: master Commit: eb615ea0cbe46e156a7840ad072607c2e7609732 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb615ea0cbe46e156a7840ad… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue May 28 03:32:57 2019 +0000 bcrypt: Add BCryptDeriveKey stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt.spec | 2 +- dlls/bcrypt/bcrypt_main.c | 7 +++++++ dlls/ncrypt/ncrypt.spec | 2 +- include/bcrypt.h | 15 +++++++++++++++ 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/bcrypt/bcrypt.spec b/dlls/bcrypt/bcrypt.spec index dfe08e7..4946ee5 100644 --- a/dlls/bcrypt/bcrypt.spec +++ b/dlls/bcrypt/bcrypt.spec @@ -7,7 +7,7 @@ @ stdcall BCryptCreateHash(ptr ptr ptr long ptr long long) @ stdcall BCryptDecrypt(ptr ptr long ptr ptr long ptr long ptr long) @ stub BCryptDeleteContext -@ stub BCryptDeriveKey +@ stdcall BCryptDeriveKey(ptr wstr ptr ptr long ptr long) @ stdcall BCryptDeriveKeyPBKDF2(ptr ptr long ptr long int64 ptr long long) @ stdcall BCryptDestroyHash(ptr) @ stdcall BCryptDestroyKey(ptr) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 18783f0..399626d 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1596,6 +1596,13 @@ NTSTATUS WINAPI BCryptDestroySecret(BCRYPT_SECRET_HANDLE secret) return STATUS_SUCCESS; } +NTSTATUS WINAPI BCryptDeriveKey(BCRYPT_SECRET_HANDLE secret, LPCWSTR kdf, BCryptBufferDesc *parameter, + PUCHAR derived, ULONG derived_size, ULONG *result, ULONG flags) +{ + FIXME( "%p, %s, %p, %p, %d, %p, %08x\n", secret, debugstr_w(kdf), parameter, derived, derived_size, result, flags ); + return STATUS_INTERNAL_ERROR; +} + BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) { switch (reason) diff --git a/dlls/ncrypt/ncrypt.spec b/dlls/ncrypt/ncrypt.spec index d4a32ed..d35f8a9 100644 --- a/dlls/ncrypt/ncrypt.spec +++ b/dlls/ncrypt/ncrypt.spec @@ -7,7 +7,7 @@ @ stdcall BCryptCreateHash(ptr ptr ptr long ptr long long) bcrypt.BCryptCreateHash @ stdcall BCryptDecrypt(ptr ptr long ptr ptr long ptr long ptr long) bcrypt.BCryptDecrypt @ stub BCryptDeleteContext -@ stub BCryptDeriveKey +@ stdcall BCryptDeriveKey(ptr wstr ptr ptr long ptr long) bcrypt.BCryptDeriveKey @ stub BCryptDeriveKeyCapi @ stdcall BCryptDeriveKeyPBKDF2(ptr ptr long ptr long int64 ptr long long) bcrypt.BCryptDeriveKeyPBKDF2 @ stdcall BCryptDestroyHash(ptr) bcrypt.BCryptDestroyHash diff --git a/include/bcrypt.h b/include/bcrypt.h index f0185d1..b1799d0 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h @@ -204,6 +204,20 @@ typedef struct _BCRYPT_KEY_DATA_BLOB_HEADER ULONG cbKeyData; } BCRYPT_KEY_DATA_BLOB_HEADER, *PBCRYPT_KEY_DATA_BLOB_HEADER; +typedef struct _BCryptBuffer +{ + ULONG cbBuffer; + ULONG BufferType; + void *pvBuffer; +} BCryptBuffer, *PBCryptBuffer; + +typedef struct _BCryptBufferDesc +{ + ULONG ulVersion; + ULONG cBuffers; + PBCryptBuffer pBuffers; +} BCryptBufferDesc, *PBCryptBufferDesc; + #define BCRYPT_KEY_DATA_BLOB_MAGIC 0x4d42444b #define BCRYPT_KEY_DATA_BLOB_VERSION1 1 @@ -229,6 +243,7 @@ typedef PVOID BCRYPT_SECRET_HANDLE; NTSTATUS WINAPI BCryptCloseAlgorithmProvider(BCRYPT_ALG_HANDLE, ULONG); NTSTATUS WINAPI BCryptCreateHash(BCRYPT_ALG_HANDLE, BCRYPT_HASH_HANDLE *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG); NTSTATUS WINAPI BCryptDecrypt(BCRYPT_KEY_HANDLE, PUCHAR, ULONG, VOID *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG *, ULONG); +NTSTATUS WINAPI BCryptDeriveKey(BCRYPT_SECRET_HANDLE, LPCWSTR, BCryptBufferDesc*, PUCHAR, ULONG, ULONG *, ULONG); NTSTATUS WINAPI BCryptDeriveKeyPBKDF2(BCRYPT_ALG_HANDLE, PUCHAR, ULONG, PUCHAR, ULONG, ULONGLONG, PUCHAR, ULONG, ULONG); NTSTATUS WINAPI BCryptDestroyHash(BCRYPT_HASH_HANDLE); NTSTATUS WINAPI BCryptDestroyKey(BCRYPT_KEY_HANDLE);

1 0

Alistair Leslie-Hughes : bcrypt: Add BCryptDestroySecret/ BCryptSecretAgreement stubs.
by Alexandre Julliard 28 May '19

28 May '19

Module: wine Branch: master Commit: 08bc5b0d349b40efec0fc41e60988a18de3a9d28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=08bc5b0d349b40efec0fc41e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue May 28 03:32:56 2019 +0000 bcrypt: Add BCryptDestroySecret/BCryptSecretAgreement stubs. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt.spec | 4 ++-- dlls/bcrypt/bcrypt_main.c | 16 ++++++++++++++++ dlls/ncrypt/ncrypt.spec | 4 ++-- include/bcrypt.h | 3 +++ 4 files changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/bcrypt/bcrypt.spec b/dlls/bcrypt/bcrypt.spec index 052a099..dfe08e7 100644 --- a/dlls/bcrypt/bcrypt.spec +++ b/dlls/bcrypt/bcrypt.spec @@ -11,7 +11,7 @@ @ stdcall BCryptDeriveKeyPBKDF2(ptr ptr long ptr long int64 ptr long long) @ stdcall BCryptDestroyHash(ptr) @ stdcall BCryptDestroyKey(ptr) -@ stub BCryptDestroySecret +@ stdcall BCryptDestroySecret(ptr) @ stdcall BCryptDuplicateHash(ptr ptr ptr long long) @ stdcall BCryptDuplicateKey(ptr ptr ptr long long) @ stdcall BCryptEncrypt(ptr ptr long ptr ptr long ptr long ptr long) @@ -44,7 +44,7 @@ @ stdcall BCryptRemoveContextFunction(long wstr long wstr) @ stdcall BCryptRemoveContextFunctionProvider(long wstr long wstr wstr) @ stub BCryptResolveProviders -@ stub BCryptSecretAgreement +@ stdcall BCryptSecretAgreement(ptr ptr ptr long) @ stub BCryptSetAuditingInterface @ stub BCryptSetContextFunctionProperty @ stdcall BCryptSetProperty(ptr wstr ptr long long) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index b9c51a1..18783f0 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1580,6 +1580,22 @@ NTSTATUS WINAPI BCryptDeriveKeyPBKDF2( BCRYPT_ALG_HANDLE handle, UCHAR *pwd, ULO return STATUS_SUCCESS; } +NTSTATUS WINAPI BCryptSecretAgreement(BCRYPT_KEY_HANDLE handle, BCRYPT_KEY_HANDLE key, BCRYPT_SECRET_HANDLE *secret, ULONG flags) +{ + FIXME( "%p, %p, %p, %08x\n", handle, key, secret, flags ); + + if(secret) + *secret = (BCRYPT_SECRET_HANDLE *)0xDEADFEED; + + return STATUS_SUCCESS; +} + +NTSTATUS WINAPI BCryptDestroySecret(BCRYPT_SECRET_HANDLE secret) +{ + FIXME( "%p\n", secret ); + return STATUS_SUCCESS; +} + BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) { switch (reason) diff --git a/dlls/ncrypt/ncrypt.spec b/dlls/ncrypt/ncrypt.spec index 85fa5c0..d4a32ed 100644 --- a/dlls/ncrypt/ncrypt.spec +++ b/dlls/ncrypt/ncrypt.spec @@ -12,7 +12,7 @@ @ stdcall BCryptDeriveKeyPBKDF2(ptr ptr long ptr long int64 ptr long long) bcrypt.BCryptDeriveKeyPBKDF2 @ stdcall BCryptDestroyHash(ptr) bcrypt.BCryptDestroyHash @ stdcall BCryptDestroyKey(ptr) bcrypt.BCryptDestroyKey -@ stub BCryptDestroySecret +@ stdcall BCryptDestroySecret(ptr) bcrypt.BCryptDestroySecret @ stdcall BCryptDuplicateHash(ptr ptr ptr long long) bcrypt.BCryptDuplicateHash @ stdcall BCryptDuplicateKey(ptr ptr ptr long long) bcrypt.BCryptDuplicateKey @ stdcall BCryptEncrypt(ptr ptr long ptr ptr long ptr long ptr long) bcrypt.BCryptEncrypt @@ -46,7 +46,7 @@ @ stdcall BCryptRemoveContextFunction(long wstr long wstr) bcrypt.BCryptRemoveContextFunction @ stdcall BCryptRemoveContextFunctionProvider(long wstr long wstr wstr) bcrypt.BCryptRemoveContextFunctionProvider @ stub BCryptResolveProviders -@ stub BCryptSecretAgreement +@ stdcall BCryptSecretAgreement(ptr ptr ptr long) bcrypt.BCryptSecretAgreement @ stub BCryptSetAuditingInterface @ stub BCryptSetContextFunctionProperty @ stdcall BCryptSetProperty(ptr wstr ptr long long) bcrypt.BCryptSetProperty diff --git a/include/bcrypt.h b/include/bcrypt.h index a0b0d52..f0185d1 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h @@ -211,6 +211,7 @@ typedef PVOID BCRYPT_ALG_HANDLE; typedef PVOID BCRYPT_KEY_HANDLE; typedef PVOID BCRYPT_HANDLE; typedef PVOID BCRYPT_HASH_HANDLE; +typedef PVOID BCRYPT_SECRET_HANDLE; /* Flags for BCryptGenRandom */ #define BCRYPT_RNG_USE_ENTROPY_IN_BUFFER 0x00000001 @@ -231,6 +232,7 @@ NTSTATUS WINAPI BCryptDecrypt(BCRYPT_KEY_HANDLE, PUCHAR, ULONG, VOID *, PUCHAR, NTSTATUS WINAPI BCryptDeriveKeyPBKDF2(BCRYPT_ALG_HANDLE, PUCHAR, ULONG, PUCHAR, ULONG, ULONGLONG, PUCHAR, ULONG, ULONG); NTSTATUS WINAPI BCryptDestroyHash(BCRYPT_HASH_HANDLE); NTSTATUS WINAPI BCryptDestroyKey(BCRYPT_KEY_HANDLE); +NTSTATUS WINAPI BCryptDestroySecret(BCRYPT_SECRET_HANDLE); NTSTATUS WINAPI BCryptDuplicateHash(BCRYPT_HASH_HANDLE, BCRYPT_HASH_HANDLE *, UCHAR *, ULONG, ULONG); NTSTATUS WINAPI BCryptEncrypt(BCRYPT_KEY_HANDLE, PUCHAR, ULONG, VOID *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG *, ULONG); NTSTATUS WINAPI BCryptEnumAlgorithms(ULONG, ULONG *, BCRYPT_ALGORITHM_IDENTIFIER **, ULONG); @@ -245,6 +247,7 @@ NTSTATUS WINAPI BCryptHash(BCRYPT_ALG_HANDLE, PUCHAR, ULONG, PUCHAR, ULONG, PUCH NTSTATUS WINAPI BCryptHashData(BCRYPT_HASH_HANDLE, PUCHAR, ULONG, ULONG); NTSTATUS WINAPI BCryptImportKeyPair(BCRYPT_ALG_HANDLE, BCRYPT_KEY_HANDLE, LPCWSTR, BCRYPT_KEY_HANDLE *, UCHAR *, ULONG, ULONG); NTSTATUS WINAPI BCryptOpenAlgorithmProvider(BCRYPT_ALG_HANDLE *, LPCWSTR, LPCWSTR, ULONG); +NTSTATUS WINAPI BCryptSecretAgreement(BCRYPT_KEY_HANDLE, BCRYPT_KEY_HANDLE, BCRYPT_SECRET_HANDLE *, ULONG); NTSTATUS WINAPI BCryptSetProperty(BCRYPT_HANDLE, LPCWSTR, PUCHAR, ULONG, ULONG); NTSTATUS WINAPI BCryptVerifySignature(BCRYPT_KEY_HANDLE, void *, UCHAR *, ULONG, UCHAR *, ULONG, ULONG);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2019