July 2020 - Wine-Commits - list.winehq.org

Jacek Caban : wineconsole: Use IOCTL_CONDRV_SET_INPUT_INFO in WINECON_SetHistorySize.
by Alexandre Julliard July 20, 2020

July 20, 2020

Module: wine Branch: master Commit: abe5fda90d918e0efbc0f4e122eee7cf637a2e9c URL: https://source.winehq.org/git/wine.git/?a=commit;h=abe5fda90d918e0efbc0f4e1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 20 15:38:11 2020 +0200 wineconsole: Use IOCTL_CONDRV_SET_INPUT_INFO in WINECON_SetHistorySize. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/wineconsole.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index 4e0309f18b..35c2f8e92d 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -116,17 +116,9 @@ void WINECON_ResizeWithContainer(struct inner_data* data, int width, int height) */ static BOOL WINECON_SetHistorySize(HANDLE hConIn, int size) { - BOOL ret; - - SERVER_START_REQ(set_console_input_info) - { - req->handle = wine_server_obj_handle( hConIn ); - req->mask = SET_CONSOLE_INPUT_INFO_HISTORY_SIZE; - req->history_size = size; - ret = !wine_server_call_err( req ); - } - SERVER_END_REQ; - return ret; + struct condrv_input_info_params params = { SET_CONSOLE_INPUT_INFO_HISTORY_SIZE }; + params.info.history_size = size; + return DeviceIoControl(hConIn, IOCTL_CONDRV_SET_INPUT_INFO, &params, sizeof(params), NULL, 0, NULL, NULL); } /******************************************************************

1 0

Brendan Shanks : bcrypt: Improve BCryptSecretAgreement/BCryptDestroySecret/BCryptDeriveKey stubs.
by Alexandre Julliard July 20, 2020

July 20, 2020

Module: wine Branch: master Commit: e763821cf4a71109a8b16cf34a81215b502f4f04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e763821cf4a71109a8b16cf3… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Fri Jul 17 15:53:59 2020 -0700 bcrypt: Improve BCryptSecretAgreement/BCryptDestroySecret/BCryptDeriveKey stubs. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_internal.h | 6 ++++++ dlls/bcrypt/bcrypt_main.c | 35 ++++++++++++++++++++++++++++------- 2 files changed, 34 insertions(+), 7 deletions(-) diff --git a/dlls/bcrypt/bcrypt_internal.h b/dlls/bcrypt/bcrypt_internal.h index 18343a6c74..43be170d77 100644 --- a/dlls/bcrypt/bcrypt_internal.h +++ b/dlls/bcrypt/bcrypt_internal.h @@ -111,6 +111,7 @@ VOID WINAPI A_SHAFinal(SHA_CTX *ctx, PULONG result); #define MAGIC_ALG (('A' << 24) | ('L' << 16) | ('G' << 8) | '0') #define MAGIC_HASH (('H' << 24) | ('A' << 16) | ('S' << 8) | 'H') #define MAGIC_KEY (('K' << 24) | ('E' << 16) | ('Y' << 8) | '0') +#define MAGIC_SECRET (('S' << 24) | ('C' << 16) | ('R' << 8) | 'T') struct object { ULONG magic; @@ -239,6 +240,11 @@ struct key }; #endif +struct secret +{ + struct object hdr; +}; + NTSTATUS get_alg_property( const struct algorithm *, const WCHAR *, UCHAR *, ULONG, ULONG * ) DECLSPEC_HIDDEN; NTSTATUS key_set_property( struct key *, const WCHAR *, UCHAR *, ULONG, ULONG ) DECLSPEC_HIDDEN; diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index fee40ebe8d..bea2001a67 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1833,26 +1833,47 @@ 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) +NTSTATUS WINAPI BCryptSecretAgreement(BCRYPT_KEY_HANDLE privatekey, BCRYPT_KEY_HANDLE publickey, BCRYPT_SECRET_HANDLE *handle, ULONG flags) { - FIXME( "%p, %p, %p, %08x\n", handle, key, secret, flags ); + struct key *privkey = privatekey; + struct key *pubkey = publickey; + struct secret *secret; - if(secret) - *secret = (BCRYPT_SECRET_HANDLE *)0xDEADFEED; + FIXME( "%p, %p, %p, %08x\n", privatekey, publickey, handle, flags ); + if (!privkey || privkey->hdr.magic != MAGIC_KEY) return STATUS_INVALID_HANDLE; + if (!pubkey || pubkey->hdr.magic != MAGIC_KEY) return STATUS_INVALID_HANDLE; + if (!handle) return STATUS_INVALID_PARAMETER; + + if (!(secret = heap_alloc_zero( sizeof(*secret) ))) return STATUS_NO_MEMORY; + secret->hdr.magic = MAGIC_SECRET; + + *handle = secret; return STATUS_SUCCESS; } -NTSTATUS WINAPI BCryptDestroySecret(BCRYPT_SECRET_HANDLE secret) +NTSTATUS WINAPI BCryptDestroySecret(BCRYPT_SECRET_HANDLE handle) { - FIXME( "%p\n", secret ); + struct secret *secret = handle; + + FIXME( "%p\n", handle ); + + if (!secret || secret->hdr.magic != MAGIC_SECRET) return STATUS_INVALID_HANDLE; + secret->hdr.magic = 0; + heap_free( secret ); return STATUS_SUCCESS; } -NTSTATUS WINAPI BCryptDeriveKey(BCRYPT_SECRET_HANDLE secret, LPCWSTR kdf, BCryptBufferDesc *parameter, +NTSTATUS WINAPI BCryptDeriveKey(BCRYPT_SECRET_HANDLE handle, LPCWSTR kdf, BCryptBufferDesc *parameter, PUCHAR derived, ULONG derived_size, ULONG *result, ULONG flags) { + struct secret *secret = handle; + FIXME( "%p, %s, %p, %p, %d, %p, %08x\n", secret, debugstr_w(kdf), parameter, derived, derived_size, result, flags ); + + if (!secret || secret->hdr.magic != MAGIC_SECRET) return STATUS_INVALID_HANDLE; + if (!kdf) return STATUS_INVALID_PARAMETER; + return STATUS_INTERNAL_ERROR; }

1 0

Gijs Vermeulen : qcap/tests: Avoid test failures in test_seeking().
by Alexandre Julliard July 20, 2020

July 20, 2020

Module: wine Branch: master Commit: 5df591fe017df41f1774d30505869fc766585652 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5df591fe017df41f1774d305… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon Jul 20 18:19:46 2020 +0200 qcap/tests: Avoid test failures in test_seeking(). Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/avimux.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/tests/avimux.c b/dlls/qcap/tests/avimux.c index 572314f8ab..d1a67a01a1 100644 --- a/dlls/qcap/tests/avimux.c +++ b/dlls/qcap/tests/avimux.c @@ -784,11 +784,13 @@ static void test_seeking(void) hr = IMediaSeeking_GetDuration(seeking, &time); todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(!time, "Got duration %s.\n", wine_dbgstr_longlong(time)); + if (hr == S_OK) + ok(!time, "Got duration %s.\n", wine_dbgstr_longlong(time)); hr = IMediaSeeking_GetCurrentPosition(seeking, &time); todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(!time, "Got duration %s.\n", wine_dbgstr_longlong(time)); + if (hr == S_OK) + ok(!time, "Got duration %s.\n", wine_dbgstr_longlong(time)); hr = IMediaSeeking_GetStopPosition(seeking, &time); ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr);

1 0

Zebediah Figura : strmbase: Remove some no longer used callbacks.
by Alexandre Julliard July 20, 2020

July 20, 2020

Module: wine Branch: master Commit: af50b499cb776c25368224b0910778d05a066e55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af50b499cb776c25368224b0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jul 20 10:25:30 2020 -0500 strmbase: Remove some no longer used callbacks. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/renderer.c | 86 ++++++++++++++---------------------------------- include/wine/strmbase.h | 10 ------ 2 files changed, 25 insertions(+), 71 deletions(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 939811bfa9..1f0a747a2c 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -194,7 +194,6 @@ static HRESULT sink_eos(struct strmbase_sink *iface) struct strmbase_renderer *filter = impl_from_IPin(&iface->pin.IPin_iface); IFilterGraph *graph = filter->filter.graph; IMediaEventSink *event_sink; - HRESULT hr = S_OK; EnterCriticalSection(&filter->csRenderLock); @@ -210,11 +209,8 @@ static HRESULT sink_eos(struct strmbase_sink *iface) strmbase_passthrough_eos(&filter->passthrough); SetEvent(filter->state_event); - if (filter->pFuncsTable->pfnEndOfStream) - hr = filter->pFuncsTable->pfnEndOfStream(filter); - LeaveCriticalSection(&filter->csRenderLock); - return hr; + return S_OK; } static HRESULT sink_begin_flush(struct strmbase_sink *iface) @@ -229,7 +225,6 @@ static HRESULT sink_begin_flush(struct strmbase_sink *iface) static HRESULT sink_end_flush(struct strmbase_sink *iface) { struct strmbase_renderer *filter = impl_from_IPin(&iface->pin.IPin_iface); - HRESULT hr = S_OK; EnterCriticalSection(&filter->csRenderLock); @@ -238,11 +233,8 @@ static HRESULT sink_end_flush(struct strmbase_sink *iface) strmbase_passthrough_invalidate_time(&filter->passthrough); ResetEvent(filter->flush_event); - if (filter->pFuncsTable->pfnEndFlush) - hr = filter->pFuncsTable->pfnEndFlush(filter); - LeaveCriticalSection(&filter->csRenderLock); - return hr; + return S_OK; } static const struct strmbase_sink_ops sink_ops = @@ -277,9 +269,9 @@ void strmbase_renderer_cleanup(struct strmbase_renderer *filter) HRESULT WINAPI BaseRendererImpl_Receive(struct strmbase_renderer *This, IMediaSample *pSample) { - HRESULT hr = S_OK; REFERENCE_TIME start, stop; AM_MEDIA_TYPE *pmt; + HRESULT hr; TRACE("(%p)->%p\n", This, pSample); @@ -301,16 +293,6 @@ HRESULT WINAPI BaseRendererImpl_Receive(struct strmbase_renderer *This, IMediaSa DeleteMediaType(pmt); } - if (This->pFuncsTable->pfnPrepareReceive) - hr = This->pFuncsTable->pfnPrepareReceive(This, pSample); - if (FAILED(hr)) - { - if (hr == VFW_E_SAMPLE_REJECTED) - return S_OK; - else - return hr; - } - EnterCriticalSection(&This->csRenderLock); if (This->filter.state == State_Paused) SetEvent(This->state_event); @@ -318,59 +300,41 @@ HRESULT WINAPI BaseRendererImpl_Receive(struct strmbase_renderer *This, IMediaSa /* Wait for render Time */ if (This->filter.clock && SUCCEEDED(IMediaSample_GetTime(pSample, &start, &stop))) { - hr = S_FALSE; - strmbase_passthrough_update_time(&This->passthrough, start); - if (This->pFuncsTable->pfnShouldDrawSampleNow) - hr = This->pFuncsTable->pfnShouldDrawSampleNow(This, pSample, &start, &stop); - - if (hr == S_OK) - ;/* Do not wait: drop through */ - else if (hr == S_FALSE) - { - REFERENCE_TIME now; - DWORD_PTR cookie; + REFERENCE_TIME now; + DWORD_PTR cookie; - IReferenceClock_GetTime(This->filter.clock, &now); + strmbase_passthrough_update_time(&This->passthrough, start); - if (now - This->stream_start - start <= -10000) - { - HANDLE handles[2] = {This->advise_event, This->flush_event}; - DWORD ret; + IReferenceClock_GetTime(This->filter.clock, &now); - IReferenceClock_AdviseTime(This->filter.clock, This->stream_start, - start, (HEVENT)This->advise_event, &cookie); + if (now - This->stream_start - start <= -10000) + { + HANDLE handles[2] = {This->advise_event, This->flush_event}; + DWORD ret; - LeaveCriticalSection(&This->csRenderLock); + IReferenceClock_AdviseTime(This->filter.clock, This->stream_start, + start, (HEVENT)This->advise_event, &cookie); - ret = WaitForMultipleObjects(2, handles, FALSE, INFINITE); - IReferenceClock_Unadvise(This->filter.clock, cookie); + LeaveCriticalSection(&This->csRenderLock); - if (ret == 1) - { - TRACE("Flush signaled, discarding current sample.\n"); - return S_OK; - } + ret = WaitForMultipleObjects(2, handles, FALSE, INFINITE); + IReferenceClock_Unadvise(This->filter.clock, cookie); - EnterCriticalSection(&This->csRenderLock); + if (ret == 1) + { + TRACE("Flush signaled, discarding current sample.\n"); + return S_OK; } - } - else - { - LeaveCriticalSection(&This->csRenderLock); - /* Drop Sample */ - return S_OK; + + EnterCriticalSection(&This->csRenderLock); } } else start = stop = -1; - if (SUCCEEDED(hr)) - { - QualityControlRender_BeginRender(&This->qc, start, stop); - hr = This->pFuncsTable->pfnDoRenderSample(This, pSample); - QualityControlRender_EndRender(&This->qc); - } - + QualityControlRender_BeginRender(&This->qc, start, stop); + hr = This->pFuncsTable->pfnDoRenderSample(This, pSample); + QualityControlRender_EndRender(&This->qc); QualityControlRender_DoQOS(&This->qc); LeaveCriticalSection(&This->csRenderLock); diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 9c3cdc4ac5..9e0d4e7d47 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -318,12 +318,6 @@ struct strmbase_renderer typedef HRESULT (WINAPI *BaseRenderer_CheckMediaType)(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt); typedef HRESULT (WINAPI *BaseRenderer_DoRenderSample)(struct strmbase_renderer *iface, IMediaSample *sample); -typedef HRESULT (WINAPI *BaseRenderer_ShouldDrawSampleNow)(struct strmbase_renderer *iface, - IMediaSample *sample, REFERENCE_TIME *start, REFERENCE_TIME *end); -typedef HRESULT (WINAPI *BaseRenderer_PrepareReceive)(struct strmbase_renderer *iface, IMediaSample *sample); -typedef HRESULT (WINAPI *BaseRenderer_EndOfStream)(struct strmbase_renderer *iface); -typedef HRESULT (WINAPI *BaseRenderer_BeginFlush) (struct strmbase_renderer *iface); -typedef HRESULT (WINAPI *BaseRenderer_EndFlush) (struct strmbase_renderer *iface); typedef HRESULT (WINAPI *BaseRenderer_BreakConnect) (struct strmbase_renderer *iface); struct strmbase_renderer_ops @@ -333,12 +327,8 @@ struct strmbase_renderer_ops void (*renderer_init_stream)(struct strmbase_renderer *iface); void (*renderer_start_stream)(struct strmbase_renderer *iface); void (*renderer_stop_stream)(struct strmbase_renderer *iface); - BaseRenderer_ShouldDrawSampleNow pfnShouldDrawSampleNow; - BaseRenderer_PrepareReceive pfnPrepareReceive; HRESULT (*renderer_connect)(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt); BaseRenderer_BreakConnect pfnBreakConnect; - BaseRenderer_EndOfStream pfnEndOfStream; - BaseRenderer_EndFlush pfnEndFlush; void (*renderer_destroy)(struct strmbase_renderer *iface); HRESULT (*renderer_query_interface)(struct strmbase_renderer *iface, REFIID iid, void **out); HRESULT (*renderer_pin_query_interface)(struct strmbase_renderer *iface, REFIID iid, void **out);

1 0

Zebediah Figura : quartz/dsoundrender: Reimplement the DirectSound renderer directly on top of the strmbase filter.
by Alexandre Julliard July 20, 2020

July 20, 2020

Module: wine Branch: master Commit: 9f467402df4c9fb0a4e20ccd35d86d817936a8c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f467402df4c9fb0a4e20ccd… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jul 20 10:25:29 2020 -0500 quartz/dsoundrender: Reimplement the DirectSound renderer directly on top of the strmbase filter. The DirectSound renderer does a lot of things differently. To a large degree this is to be expected; it's an audio renderer and therefore needs to buffer much farther in advance. However, it also doesn't participate in quality management, doesn't block in Receive(), and has a few other mild differences in behaviour. Weighing the features implemented by the base renderer against the quirks necessary for the DirectSound renderer leads me to believe that it would be easier not to use that framework. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 438 +++++++++++++++++++++++++++++---------- dlls/quartz/tests/dsoundrender.c | 3 +- dlls/strmbase/strmbase_private.h | 4 - include/wine/strmbase.h | 4 + 4 files changed, 333 insertions(+), 116 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9f467402df4c9fb0a4e2…

1 0

Zebediah Figura : quartz/videorenderer: Render preroll samples.
by Alexandre Julliard July 20, 2020

July 20, 2020

Module: wine Branch: master Commit: 72f94724922e4db4fb932e404f2f642fef0642e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=72f94724922e4db4fb932e40… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jul 20 10:25:27 2020 -0500 quartz/videorenderer: Render preroll samples. The documentation specifies that preroll samples shouldn't be rendered, but the video renderer renders them anyway. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 3 +++ dlls/quartz/videorenderer.c | 10 ---------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index 4ae320e022..ac2cadc4b1 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -797,6 +797,9 @@ static HANDLE send_frame_time(IMemInputPin *sink, REFERENCE_TIME start_time, uns hr = IMediaSample_SetTime(sample, &start_time, &end_time); ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaSample_SetPreroll(sample, TRUE); + ok(hr == S_OK, "Got hr %#x.\n", hr); + params->sink = sink; params->sample = sample; thread = CreateThread(NULL, 0, frame_thread, params, 0, NULL); diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index f635d9eaac..eb6accf2d3 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -82,15 +82,6 @@ static void VideoRenderer_AutoShowWindow(struct video_renderer *This) ShowWindow(This->window.hwnd, SW_SHOW); } -static HRESULT WINAPI VideoRenderer_ShouldDrawSampleNow(struct strmbase_renderer *filter, - IMediaSample *pSample, REFERENCE_TIME *start, REFERENCE_TIME *end) -{ - /* Preroll means the sample isn't shown, this is used for key frames and things like that */ - if (IMediaSample_IsPreroll(pSample) == S_OK) - return E_FAIL; - return S_FALSE; -} - static HRESULT WINAPI VideoRenderer_DoRenderSample(struct strmbase_renderer *iface, IMediaSample *pSample) { struct video_renderer *filter = impl_from_strmbase_renderer(iface); @@ -253,7 +244,6 @@ static const struct strmbase_renderer_ops renderer_ops = .renderer_init_stream = video_renderer_init_stream, .renderer_start_stream = video_renderer_start_stream, .renderer_stop_stream = video_renderer_stop_stream, - .pfnShouldDrawSampleNow = VideoRenderer_ShouldDrawSampleNow, .renderer_destroy = video_renderer_destroy, .renderer_query_interface = video_renderer_query_interface, .renderer_pin_query_interface = video_renderer_pin_query_interface,

1 0

Jacek Caban : server: Remove no longer used code from set_console_input_info.
by Alexandre Julliard July 20, 2020

July 20, 2020

Module: wine Branch: master Commit: fc7dae4ba5edd734bb0ffc7318dcc659d1797f2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc7dae4ba5edd734bb0ffc73… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 20 15:39:13 2020 +0200 server: Remove no longer used code from set_console_input_info. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 40 ---------------------------------------- 1 file changed, 40 deletions(-) diff --git a/server/console.c b/server/console.c index a348ed5bca..3a3260645d 100644 --- a/server/console.c +++ b/server/console.c @@ -849,42 +849,6 @@ static int set_console_input_info( const struct set_console_input_info_request * evt.event = CONSOLE_RENDERER_TITLE_EVENT; console_input_events_append( console, &evt ); } - if (req->mask & SET_CONSOLE_INPUT_INFO_HISTORY_MODE) - { - console->history_mode = req->history_mode; - } - if ((req->mask & SET_CONSOLE_INPUT_INFO_HISTORY_SIZE) && - console->history_size != req->history_size) - { - struct history_line **mem = NULL; - int i, delta; - - if (req->history_size) - { - if (!(mem = mem_alloc( req->history_size * sizeof(*mem) ))) goto error; - memset( mem, 0, req->history_size * sizeof(*mem) ); - } - - delta = (console->history_index > req->history_size) ? - (console->history_index - req->history_size) : 0; - - for (i = delta; i < console->history_index; i++) - { - mem[i - delta] = console->history[i]; - console->history[i] = NULL; - } - console->history_index -= delta; - - for (i = 0; i < console->history_size; i++) - free( console->history[i] ); - free( console->history ); - console->history = mem; - console->history_size = req->history_size; - } - if (req->mask & SET_CONSOLE_INPUT_INFO_EDITION_MODE) - { - console->edition_mode = req->edition_mode; - } if (req->mask & SET_CONSOLE_INPUT_INFO_INPUT_CODEPAGE) { console->input_cp = req->input_cp; @@ -893,10 +857,6 @@ static int set_console_input_info( const struct set_console_input_info_request * { console->output_cp = req->output_cp; } - if (req->mask & SET_CONSOLE_INPUT_INFO_WIN) - { - console->win = req->win; - } release_object( console ); return 1; error:

1 0

Alexandre Julliard : ntdll: Move the security system calls to the Unix library.
by Alexandre Julliard July 20, 2020

July 20, 2020

Module: wine Branch: master Commit: f298db7254a42b2818083469bba0ed8080be38de URL: https://source.winehq.org/git/wine.git/?a=commit;h=f298db7254a42b2818083469… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 20 12:25:12 2020 +0200 ntdll: Move the security system calls to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 42 ---------- dlls/ntdll/ntdll.spec | 24 +++--- dlls/ntdll/om.c | 99 ----------------------- dlls/ntdll/sec.c | 186 ------------------------------------------ dlls/ntdll/unix/security.c | 197 +++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 209 insertions(+), 339 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f298db7254a42b281808…

1 0

Alexandre Julliard : ntdll: Move various stub functions to the Unix library.
by Alexandre Julliard July 20, 2020

July 20, 2020

Module: wine Branch: master Commit: 0e45f7b4cd8bbf8833737cb2f4f6aedecbe3a7de URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e45f7b4cd8bbf8833737cb2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 20 12:25:38 2020 +0200 ntdll: Move various stub functions to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/error.c | 11 ----------- dlls/ntdll/loader.c | 22 ---------------------- dlls/ntdll/nt.c | 32 -------------------------------- dlls/ntdll/ntdll.spec | 20 ++++++++++---------- dlls/ntdll/unix/system.c | 42 ++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/virtual.c | 11 +++++++++++ 6 files changed, 63 insertions(+), 75 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0e45f7b4cd8bbf883373…

1 0

Alexandre Julliard : ntdll: Move the LPC port syscall stubs to the Unix library.
by Alexandre Julliard July 20, 2020

July 20, 2020

Module: wine Branch: master Commit: a47f4daf8f70bc389fb1789e3e90df6138cf0549 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a47f4daf8f70bc389fb1789e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 20 12:19:35 2020 +0200 ntdll: Move the LPC port syscall stubs to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 149 ------------------------------------------------- dlls/ntdll/ntdll.spec | 36 ++++++------ dlls/ntdll/unix/sync.c | 104 ++++++++++++++++++++++++++++++++++ 3 files changed, 122 insertions(+), 167 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a47f4daf8f70bc389fb1…

1 0