March 2020 - Wine-Devel - list.winehq.org

[PATCH] comctl32/toolbar: Correctly draw disabled toolbar button which contains 32 bpp bitmap with alpha channel.
by Ziqing Hui March 10, 2020

March 10, 2020

According to my tests, on v6 comctl32, here is the disabled toolbar button appearance in different situation: * 32bpp with alpha channel: Grayscale (This is not supported before v6) * 32bpp without alpha channel ("without alpha channel" means each pixel's alpha value is set to 0): Solid color * not 32bpp (maybe 24bpp, 16bpp etc.): Solid color This patch handle the first situation for wine. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=24784 Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/comctl32/toolbar.c | 37 ++++++++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 5 deletions(-)

2 1

[PATCH 1/4] quartz/acmwrapper: Reimplement the ACM wrapper directly on top of strmbase_filter.
by Zebediah Figura March 9, 2020

March 9, 2020

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/quartz/acmwrapper.c | 318 ++++++++++++++++++++++++++++----- dlls/quartz/tests/acmwrapper.c | 20 +-- 2 files changed, 288 insertions(+), 50 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index a983defa732..67bd2a20c6b 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -37,8 +37,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); struct acm_wrapper { - TransformFilter tf; + struct strmbase_filter filter; + CRITICAL_SECTION stream_cs; + struct strmbase_source source; + IQualityControl source_IQualityControl_iface; + IQualityControl *source_qc_sink; + IUnknown *seeking; + + struct strmbase_sink sink; + + AM_MEDIA_TYPE mt; HACMSTREAM has; LPWAVEFORMATEX pWfOut; @@ -46,14 +55,32 @@ struct acm_wrapper LONGLONG lasttime_sent; }; -static inline struct acm_wrapper *impl_from_TransformFilter( TransformFilter *iface ) +static inline struct acm_wrapper *impl_from_strmbase_filter(struct strmbase_filter *iface) { - return CONTAINING_RECORD(iface, struct acm_wrapper, tf); + return CONTAINING_RECORD(iface, struct acm_wrapper, filter); +} + +static HRESULT acm_wrapper_sink_query_interface(struct strmbase_pin *iface, REFIID iid, void **out) +{ + struct acm_wrapper *filter = impl_from_strmbase_filter(iface->filter); + + if (IsEqualGUID(iid, &IID_IMemInputPin)) + *out = &filter->sink.IMemInputPin_iface; + else + return E_NOINTERFACE; + + IUnknown_AddRef((IUnknown *)*out); + return S_OK; +} + +static HRESULT acm_wrapper_sink_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) +{ + return S_OK; } -static HRESULT WINAPI ACMWrapper_Receive(TransformFilter *tf, IMediaSample *pSample) +static HRESULT WINAPI acm_wrapper_sink_Receive(struct strmbase_sink *iface, IMediaSample *pSample) { - struct acm_wrapper *This = impl_from_TransformFilter(tf); + struct acm_wrapper *This = impl_from_strmbase_filter(iface->pin.filter); IMediaSample* pOutSample = NULL; DWORD cbDstStream, cbSrcStream; LPBYTE pbDstStream; @@ -65,10 +92,29 @@ static HRESULT WINAPI ACMWrapper_Receive(TransformFilter *tf, IMediaSample *pSam LONGLONG tStart = -1, tStop = -1, tMed; LONGLONG mtStart = -1, mtStop = -1, mtMed; + /* We do not expect pin connection state to change while the filter is + * running. This guarantee is necessary, since otherwise we would have to + * take the filter lock, and we can't take the filter lock from a streaming + * thread. */ + if (!This->source.pMemInputPin) + { + WARN("Source is not connected, returning VFW_E_NOT_CONNECTED.\n"); + return VFW_E_NOT_CONNECTED; + } + + if (This->filter.state == State_Stopped) + return VFW_E_WRONG_STATE; + + if (This->sink.flushing) + return S_FALSE; + + EnterCriticalSection(&This->stream_cs); + hr = IMediaSample_GetPointer(pSample, &pbSrcStream); if (FAILED(hr)) { ERR("Cannot get pointer to sample data (%x)\n", hr); + LeaveCriticalSection(&This->stream_cs); return hr; } @@ -100,10 +146,11 @@ static HRESULT WINAPI ACMWrapper_Receive(TransformFilter *tf, IMediaSample *pSam while(hr == S_OK && ash.cbSrcLength) { - hr = BaseOutputPinImpl_GetDeliveryBuffer(&This->tf.source, &pOutSample, NULL, NULL, 0); + hr = BaseOutputPinImpl_GetDeliveryBuffer(&This->source, &pOutSample, NULL, NULL, 0); if (FAILED(hr)) { ERR("Unable to get delivery buffer (%x)\n", hr); + LeaveCriticalSection(&This->stream_cs); return hr; } IMediaSample_SetPreroll(pOutSample, preroll); @@ -198,7 +245,7 @@ static HRESULT WINAPI ACMWrapper_Receive(TransformFilter *tf, IMediaSample *pSam TRACE("Sample stop time: %s\n", debugstr_time(tStart)); - hr = IMemInputPin_Receive(This->tf.source.pMemInputPin, pOutSample); + hr = IMemInputPin_Receive(This->source.pMemInputPin, pOutSample); if (hr != S_OK && hr != VFW_E_NOT_CONNECTED) { if (FAILED(hr)) ERR("Error sending sample (%x)\n", hr); @@ -220,6 +267,7 @@ error: This->lasttime_real = tStop; This->lasttime_sent = tMed; + LeaveCriticalSection(&This->stream_cs); return hr; } @@ -228,9 +276,9 @@ static BOOL is_audio_subtype(const GUID *guid) return !memcmp(&guid->Data2, &MEDIATYPE_Audio.Data2, sizeof(GUID) - sizeof(int)); } -static HRESULT acm_wrapper_connect_sink(TransformFilter *iface, const AM_MEDIA_TYPE *mt) +static HRESULT acm_wrapper_sink_connect(struct strmbase_sink *iface, IPin *peer, const AM_MEDIA_TYPE *mt) { - struct acm_wrapper *filter = impl_from_TransformFilter(iface); + struct acm_wrapper *filter = impl_from_strmbase_filter(iface->pin.filter); const WAVEFORMATEX *wfx = (WAVEFORMATEX *)mt->pbFormat; HACMSTREAM drv; MMRESULT res; @@ -240,9 +288,9 @@ static HRESULT acm_wrapper_connect_sink(TransformFilter *iface, const AM_MEDIA_T || wfx->wFormatTag == WAVE_FORMAT_PCM || wfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE) return VFW_E_TYPE_NOT_ACCEPTED; - CopyMediaType(&filter->tf.pmt, mt); - filter->tf.pmt.subtype.Data1 = WAVE_FORMAT_PCM; - filter->pWfOut = (WAVEFORMATEX *)filter->tf.pmt.pbFormat; + CopyMediaType(&filter->mt, mt); + filter->mt.subtype.Data1 = WAVE_FORMAT_PCM; + filter->pWfOut = (WAVEFORMATEX *)filter->mt.pbFormat; filter->pWfOut->wFormatTag = WAVE_FORMAT_PCM; filter->pWfOut->wBitsPerSample = 16; filter->pWfOut->nBlockAlign = filter->pWfOut->wBitsPerSample * filter->pWfOut->nChannels / 8; @@ -253,7 +301,7 @@ static HRESULT acm_wrapper_connect_sink(TransformFilter *iface, const AM_MEDIA_T if ((res = acmStreamOpen(&drv, NULL, (WAVEFORMATEX *)wfx, filter->pWfOut, NULL, 0, 0, 0))) { ERR("Failed to open stream, error %u.\n", res); - FreeMediaType(&filter->tf.pmt); + FreeMediaType(&filter->mt); return VFW_E_TYPE_NOT_ACCEPTED; } @@ -262,34 +310,74 @@ static HRESULT acm_wrapper_connect_sink(TransformFilter *iface, const AM_MEDIA_T return S_OK; } -static HRESULT WINAPI ACMWrapper_BreakConnect(TransformFilter *tf, PIN_DIRECTION dir) +static void acm_wrapper_sink_disconnect(struct strmbase_sink *iface) { - struct acm_wrapper *This = impl_from_TransformFilter(tf); + struct acm_wrapper *filter = impl_from_strmbase_filter(iface->pin.filter); - TRACE("(%p)->(%i)\n", This,dir); + if (filter->has) + acmStreamClose(filter->has, 0); + filter->has = 0; + filter->lasttime_real = filter->lasttime_sent = -1; +} - if (dir == PINDIR_INPUT) - { - if (This->has) - acmStreamClose(This->has, 0); +static const struct strmbase_sink_ops sink_ops = +{ + .base.pin_query_interface = acm_wrapper_sink_query_interface, + .base.pin_query_accept = acm_wrapper_sink_query_accept, + .base.pin_get_media_type = strmbase_pin_get_media_type, + .pfnReceive = acm_wrapper_sink_Receive, + .sink_connect = acm_wrapper_sink_connect, + .sink_disconnect = acm_wrapper_sink_disconnect, +}; - This->has = 0; - This->lasttime_real = This->lasttime_sent = -1; - } +static HRESULT acm_wrapper_source_query_interface(struct strmbase_pin *iface, REFIID iid, void **out) +{ + struct acm_wrapper *filter = impl_from_strmbase_filter(iface->filter); + + if (IsEqualGUID(iid, &IID_IQualityControl)) + *out = &filter->source_IQualityControl_iface; + else if (IsEqualGUID(iid, &IID_IMediaSeeking)) + return IUnknown_QueryInterface(filter->seeking, iid, out); + else + return E_NOINTERFACE; + IUnknown_AddRef((IUnknown *)*out); return S_OK; } -static HRESULT WINAPI ACMWrapper_DecideBufferSize(TransformFilter *tf, IMemAllocator *pAlloc, ALLOCATOR_PROPERTIES *ppropInputRequest) +static HRESULT acm_wrapper_source_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) { - struct acm_wrapper *pACM = impl_from_TransformFilter(tf); + struct acm_wrapper *filter = impl_from_strmbase_filter(iface->filter); + + if (IsEqualGUID(&mt->majortype, &filter->mt.majortype) + && (IsEqualGUID(&mt->subtype, &filter->mt.subtype) + || IsEqualGUID(&filter->mt.subtype, &GUID_NULL))) + return S_OK; + return S_FALSE; +} + +static HRESULT acm_wrapper_source_get_media_type(struct strmbase_pin *iface, + unsigned int index, AM_MEDIA_TYPE *mt) +{ + struct acm_wrapper *filter = impl_from_strmbase_filter(iface->filter); + + if (index) + return VFW_S_NO_MORE_ITEMS; + CopyMediaType(mt, &filter->mt); + return S_OK; +} + +static HRESULT WINAPI acm_wrapper_source_DecideBufferSize(struct strmbase_source *iface, + IMemAllocator *pAlloc, ALLOCATOR_PROPERTIES *ppropInputRequest) +{ + struct acm_wrapper *filter = impl_from_strmbase_filter(iface->pin.filter); ALLOCATOR_PROPERTIES actual; if (!ppropInputRequest->cbAlign) ppropInputRequest->cbAlign = 1; - if (ppropInputRequest->cbBuffer < pACM->pWfOut->nAvgBytesPerSec / 2) - ppropInputRequest->cbBuffer = pACM->pWfOut->nAvgBytesPerSec / 2; + if (ppropInputRequest->cbBuffer < filter->pWfOut->nAvgBytesPerSec / 2) + ppropInputRequest->cbBuffer = filter->pWfOut->nAvgBytesPerSec / 2; if (!ppropInputRequest->cBuffers) ppropInputRequest->cBuffers = 1; @@ -297,28 +385,178 @@ static HRESULT WINAPI ACMWrapper_DecideBufferSize(TransformFilter *tf, IMemAlloc return IMemAllocator_SetProperties(pAlloc, ppropInputRequest, &actual); } -static const TransformFilterFuncTable ACMWrapper_FuncsTable = { - .pfnDecideBufferSize = ACMWrapper_DecideBufferSize, - .pfnReceive = ACMWrapper_Receive, - .transform_connect_sink = acm_wrapper_connect_sink, - .pfnBreakConnect = ACMWrapper_BreakConnect, +static const struct strmbase_source_ops source_ops = +{ + .base.pin_query_interface = acm_wrapper_source_query_interface, + .base.pin_query_accept = acm_wrapper_source_query_accept, + .base.pin_get_media_type = acm_wrapper_source_get_media_type, + .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, + .pfnDecideAllocator = BaseOutputPinImpl_DecideAllocator, + .pfnDecideBufferSize = acm_wrapper_source_DecideBufferSize, +}; + +static struct acm_wrapper *impl_from_source_IQualityControl(IQualityControl *iface) +{ + return CONTAINING_RECORD(iface, struct acm_wrapper, source_IQualityControl_iface); +} + +static HRESULT WINAPI acm_wrapper_source_qc_QueryInterface(IQualityControl *iface, + REFIID iid, void **out) +{ + struct acm_wrapper *filter = impl_from_source_IQualityControl(iface); + return IPin_QueryInterface(&filter->source.pin.IPin_iface, iid, out); +} + +static ULONG WINAPI acm_wrapper_source_qc_AddRef(IQualityControl *iface) +{ + struct acm_wrapper *filter = impl_from_source_IQualityControl(iface); + return IPin_AddRef(&filter->source.pin.IPin_iface); +} + +static ULONG WINAPI acm_wrapper_source_qc_Release(IQualityControl *iface) +{ + struct acm_wrapper *filter = impl_from_source_IQualityControl(iface); + return IPin_Release(&filter->source.pin.IPin_iface); +} + +static HRESULT WINAPI acm_wrapper_source_qc_Notify(IQualityControl *iface, + IBaseFilter *sender, Quality q) +{ + struct acm_wrapper *filter = impl_from_source_IQualityControl(iface); + IQualityControl *peer; + HRESULT hr; + + TRACE("filter %p, sender %p, type %#x, proportion %u, late %s, timestamp %s.\n", + filter, sender, q.Type, q.Proportion, debugstr_time(q.Late), debugstr_time(q.TimeStamp)); + + if (filter->source_qc_sink) + return IQualityControl_Notify(filter->source_qc_sink, &filter->filter.IBaseFilter_iface, q); + + if (filter->sink.pin.peer + && SUCCEEDED(IPin_QueryInterface(filter->sink.pin.peer, &IID_IQualityControl, (void **)&peer))) + { + hr = IQualityControl_Notify(peer, &filter->filter.IBaseFilter_iface, q); + IQualityControl_Release(peer); + } + return hr; +} + +static HRESULT WINAPI acm_wrapper_source_qc_SetSink(IQualityControl *iface, IQualityControl *sink) +{ + struct acm_wrapper *filter = impl_from_source_IQualityControl(iface); + + TRACE("filter %p, sink %p.\n", filter, sink); + + filter->source_qc_sink = sink; + + return S_OK; +} + +static const IQualityControlVtbl source_qc_vtbl = +{ + acm_wrapper_source_qc_QueryInterface, + acm_wrapper_source_qc_AddRef, + acm_wrapper_source_qc_Release, + acm_wrapper_source_qc_Notify, + acm_wrapper_source_qc_SetSink, +}; + +static struct strmbase_pin *acm_wrapper_get_pin(struct strmbase_filter *iface, unsigned int index) +{ + struct acm_wrapper *filter = impl_from_strmbase_filter(iface); + + if (index == 0) + return &filter->sink.pin; + else if (index == 1) + return &filter->source.pin; + return NULL; +} + +static void acm_wrapper_destroy(struct strmbase_filter *iface) +{ + struct acm_wrapper *filter = impl_from_strmbase_filter(iface); + + if (filter->sink.pin.peer) + IPin_Disconnect(filter->sink.pin.peer); + IPin_Disconnect(&filter->sink.pin.IPin_iface); + + if (filter->source.pin.peer) + IPin_Disconnect(filter->source.pin.peer); + IPin_Disconnect(&filter->source.pin.IPin_iface); + + strmbase_sink_cleanup(&filter->sink); + strmbase_source_cleanup(&filter->source); + + filter->stream_cs.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&filter->stream_cs); + FreeMediaType(&filter->mt); + IUnknown_Release(filter->seeking); + strmbase_filter_cleanup(&filter->filter); + free(filter); +} + +static HRESULT acm_wrapper_init_stream(struct strmbase_filter *iface) +{ + struct acm_wrapper *filter = impl_from_strmbase_filter(iface); + + BaseOutputPinImpl_Active(&filter->source); + return S_OK; +} + +static HRESULT acm_wrapper_cleanup_stream(struct strmbase_filter *iface) +{ + struct acm_wrapper *filter = impl_from_strmbase_filter(iface); + + BaseOutputPinImpl_Inactive(&filter->source); + return S_OK; +} + +static const struct strmbase_filter_ops filter_ops = +{ + .filter_get_pin = acm_wrapper_get_pin, + .filter_destroy = acm_wrapper_destroy, + .filter_init_stream = acm_wrapper_init_stream, + .filter_cleanup_stream = acm_wrapper_cleanup_stream, }; HRESULT acm_wrapper_create(IUnknown *outer, IUnknown **out) { - struct acm_wrapper *This; + ISeekingPassThru *passthrough; + struct acm_wrapper *object; HRESULT hr; - *out = NULL; + if (!(object = calloc(1, sizeof(*object)))) + return E_OUTOFMEMORY; - hr = strmbase_transform_create(sizeof(*This), outer, &CLSID_ACMWrapper, - &ACMWrapper_FuncsTable, (IBaseFilter **)&This); + strmbase_filter_init(&object->filter, outer, &CLSID_ACMWrapper, &filter_ops); - if (FAILED(hr)) + InitializeCriticalSection(&object->stream_cs); + object->stream_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__": acm_wrapper.stream_cs"); + + strmbase_sink_init(&object->sink, &object->filter, L"In", &sink_ops, NULL); + + strmbase_source_init(&object->source, &object->filter, L"Out", &source_ops); + object->source_IQualityControl_iface.lpVtbl = &source_qc_vtbl; + + if (FAILED(hr = CoCreateInstance(&CLSID_SeekingPassThru, + (IUnknown *)&object->source.pin.IPin_iface, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void **)&object->seeking))) + { + strmbase_sink_cleanup(&object->sink); + strmbase_source_cleanup(&object->source); + strmbase_filter_cleanup(&object->filter); + free(object); return hr; + } - *out = &This->tf.filter.IUnknown_inner; - This->lasttime_real = This->lasttime_sent = -1; + IUnknown_QueryInterface(object->seeking, &IID_ISeekingPassThru, (void **)&passthrough); + ISeekingPassThru_Init(passthrough, FALSE, &object->sink.pin.IPin_iface); + ISeekingPassThru_Release(passthrough); - return hr; + object->lasttime_real = object->lasttime_sent = -1; + + TRACE("Created ACM wrapper %p.\n", object); + *out = &object->filter.IUnknown_inner; + + return S_OK; } diff --git a/dlls/quartz/tests/acmwrapper.c b/dlls/quartz/tests/acmwrapper.c index 9c4fe4d0667..31b32b53ac9 100644 --- a/dlls/quartz/tests/acmwrapper.c +++ b/dlls/quartz/tests/acmwrapper.c @@ -446,42 +446,42 @@ static void test_unconnected_filter_state(void) ok(state == State_Stopped, "Got state %u.\n", state); hr = IBaseFilter_Pause(filter); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IBaseFilter_GetState(filter, 0, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(state == State_Paused, "Got state %u.\n", state); + ok(state == State_Paused, "Got state %u.\n", state); hr = IBaseFilter_Run(filter, 0); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IBaseFilter_GetState(filter, 0, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(state == State_Running, "Got state %u.\n", state); + ok(state == State_Running, "Got state %u.\n", state); hr = IBaseFilter_Pause(filter); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IBaseFilter_GetState(filter, 0, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(state == State_Paused, "Got state %u.\n", state); + ok(state == State_Paused, "Got state %u.\n", state); hr = IBaseFilter_Stop(filter); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IBaseFilter_GetState(filter, 0, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(state == State_Stopped, "Got state %u.\n", state); hr = IBaseFilter_Run(filter, 0); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IBaseFilter_GetState(filter, 0, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(state == State_Running, "Got state %u.\n", state); + ok(state == State_Running, "Got state %u.\n", state); hr = IBaseFilter_Stop(filter); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IBaseFilter_GetState(filter, 0, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); -- 2.25.1

2 7

[PATCH 1/5] d3d10core/tests: Add a test for independent blend.
by Zebediah Figura March 9, 2020

March 9, 2020

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d10core/tests/d3d10core.c | 113 +++++++++++++++++++++++++++++++ 1 file changed, 113 insertions(+) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index c793f21b08..6b19379900 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -18177,6 +18177,118 @@ static void test_color_mask(void) release_test_context(&test_context); } +static void test_independent_blend(void) +{ + struct d3d10core_test_context test_context; + D3D10_TEXTURE2D_DESC texture_desc; + ID3D10RenderTargetView *rtvs[8]; + ID3D10BlendState *blend_state; + struct resource_readback rb; + D3D10_BLEND_DESC blend_desc; + ID3D10Texture2D *rts[8]; + ID3D10PixelShader *ps; + ID3D10Device *device; + unsigned int i; + DWORD color; + HRESULT hr; + + static const DWORD ps_code[] = + { +#if 0 + void main(float4 position : SV_Position, + out float4 t0 : SV_Target0, out float4 t1 : SV_Target1, + out float4 t2 : SV_Target2, out float4 t3 : SV_Target3, + out float4 t4 : SV_Target4, out float4 t5 : SV_Target5, + out float4 t6 : SV_Target6, out float4 t7 : SV_Target7) + { + t0 = t1 = t2 = t3 = t4 = t5 = t6 = t7 = float4(0.0f, 1.0f, 0.0f, 0.5f); + } +#endif + 0x43425844, 0x77c86d8c, 0xc729bc00, 0xa7df8ead, 0xcc87ad10, 0x00000001, 0x000002b0, 0x00000003, + 0x0000002c, 0x00000060, 0x0000013c, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, + 0x4e47534f, 0x000000d4, 0x00000008, 0x00000008, 0x000000c8, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x000000c8, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x0000000f, + 0x000000c8, 0x00000002, 0x00000000, 0x00000003, 0x00000002, 0x0000000f, 0x000000c8, 0x00000003, + 0x00000000, 0x00000003, 0x00000003, 0x0000000f, 0x000000c8, 0x00000004, 0x00000000, 0x00000003, + 0x00000004, 0x0000000f, 0x000000c8, 0x00000005, 0x00000000, 0x00000003, 0x00000005, 0x0000000f, + 0x000000c8, 0x00000006, 0x00000000, 0x00000003, 0x00000006, 0x0000000f, 0x000000c8, 0x00000007, + 0x00000000, 0x00000003, 0x00000007, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, + 0x0000016c, 0x00000040, 0x0000005b, 0x03000065, 0x001020f2, 0x00000000, 0x03000065, 0x001020f2, + 0x00000001, 0x03000065, 0x001020f2, 0x00000002, 0x03000065, 0x001020f2, 0x00000003, 0x03000065, + 0x001020f2, 0x00000004, 0x03000065, 0x001020f2, 0x00000005, 0x03000065, 0x001020f2, 0x00000006, + 0x03000065, 0x001020f2, 0x00000007, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x00000000, + 0x3f800000, 0x00000000, 0x3f000000, 0x08000036, 0x001020f2, 0x00000001, 0x00004002, 0x00000000, + 0x3f800000, 0x00000000, 0x3f000000, 0x08000036, 0x001020f2, 0x00000002, 0x00004002, 0x00000000, + 0x3f800000, 0x00000000, 0x3f000000, 0x08000036, 0x001020f2, 0x00000003, 0x00004002, 0x00000000, + 0x3f800000, 0x00000000, 0x3f000000, 0x08000036, 0x001020f2, 0x00000004, 0x00004002, 0x00000000, + 0x3f800000, 0x00000000, 0x3f000000, 0x08000036, 0x001020f2, 0x00000005, 0x00004002, 0x00000000, + 0x3f800000, 0x00000000, 0x3f000000, 0x08000036, 0x001020f2, 0x00000006, 0x00004002, 0x00000000, + 0x3f800000, 0x00000000, 0x3f000000, 0x08000036, 0x001020f2, 0x00000007, 0x00004002, 0x00000000, + 0x3f800000, 0x00000000, 0x3f000000, 0x0100003e, + }; + + static const float red[] = {1.0f, 0.0f, 0.0f, 1.0f}; + + if (!init_test_context(&test_context)) + return; + + device = test_context.device; + + hr = ID3D10Device_CreatePixelShader(device, ps_code, sizeof(ps_code), &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + ID3D10Device_PSSetShader(device, ps); + + blend_desc.AlphaToCoverageEnable = FALSE; + blend_desc.SrcBlend = D3D10_BLEND_SRC_ALPHA; + blend_desc.DestBlend = D3D10_BLEND_INV_SRC_ALPHA; + blend_desc.BlendOp = D3D10_BLEND_OP_ADD; + blend_desc.SrcBlendAlpha = D3D10_BLEND_ONE; + blend_desc.DestBlendAlpha = D3D10_BLEND_ZERO; + blend_desc.BlendOpAlpha = D3D10_BLEND_OP_ADD; + for (i = 0; i < 8; ++i) + { + blend_desc.BlendEnable[i] = i & 1; + blend_desc.RenderTargetWriteMask[i] = D3D10_COLOR_WRITE_ENABLE_ALL; + } + + hr = ID3D10Device_CreateBlendState(device, &blend_desc, &blend_state); + ok(hr == S_OK, "Failed to create blend state, hr %#x.\n", hr); + ID3D10Device_OMSetBlendState(device, blend_state, NULL, D3D10_DEFAULT_SAMPLE_MASK); + + for (i = 0; i < 8; ++i) + { + ID3D10Texture2D_GetDesc(test_context.backbuffer, &texture_desc); + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &rts[i]); + ok(hr == S_OK, "Failed to create texture %u, hr %#x.\n", i, hr); + + hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)rts[i], NULL, &rtvs[i]); + ok(hr == S_OK, "Failed to create rendertarget view %u, hr %#x.\n", i, hr); + } + + ID3D10Device_OMSetRenderTargets(device, 8, rtvs, NULL); + + for (i = 0; i < 8; ++i) + ID3D10Device_ClearRenderTargetView(device, rtvs[i], red); + draw_quad(&test_context); + + for (i = 0; i < 8; ++i) + { + get_texture_readback(rts[i], 0, &rb); + color = get_readback_color(&rb, 320, 240); + todo_wine_if (i & 1) + ok(color == ((i & 1) ? 0x80008080 : 0x8000ff00), "%u: Got unexpected color 0x%08x.\n", i, color); + release_resource_readback(&rb); + + ID3D10Texture2D_Release(rts[i]); + ID3D10RenderTargetView_Release(rtvs[i]); + } + + ID3D10BlendState_Release(blend_state); + ID3D10PixelShader_Release(ps); + release_test_context(&test_context); +} + START_TEST(d3d10core) { unsigned int argc, i; @@ -18296,6 +18408,7 @@ START_TEST(d3d10core) queue_test(test_render_a8); queue_test(test_desktop_window); queue_test(test_color_mask); + queue_test(test_independent_blend); run_queued_tests(); -- 2.25.1

2 8

[PATCH 1/3] include: Update MF resolver flags.
by Nikolay Sivov March 9, 2020

March 9, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/mfidl.idl | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/include/mfidl.idl b/include/mfidl.idl index 82f69518df..fc9173864a 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -925,13 +925,20 @@ interface IMFMediaSourceTopologyProvider : IUnknown HRESULT GetMediaSourceTopology([in] IMFPresentationDescriptor *pd, [out] IMFTopology **topology); } -cpp_quote("#define MF_RESOLUTION_MEDIASOURCE 0x00000001") -cpp_quote("#define MF_RESOLUTION_BYTESTREAM 0x00000002") -cpp_quote("#define MF_RESOLUTION_CONTENT_DOES_NOT_HAVE_TO_MATCH_EXTENSION_OR_MIME_TYPE 0x00000010") -cpp_quote("#define MF_RESOLUTION_KEEP_BYTE_STREAM_ALIVE_ON_FAIL 0x00000020") -cpp_quote("#define MF_RESOLUTION_READ 0x00010000") -cpp_quote("#define MF_RESOLUTION_WRITE 0x00020000") -cpp_quote("#define MF_RESOLUTION_DISABLE_LOCAL_PLUGINS 0x00000040") +enum +{ + MF_RESOLUTION_MEDIASOURCE = 0x00000001, + MF_RESOLUTION_BYTESTREAM = 0x00000002, + MF_RESOLUTION_CONTENT_DOES_NOT_HAVE_TO_MATCH_EXTENSION_OR_MIME_TYPE = 0x00000010, + MF_RESOLUTION_KEEP_BYTE_STREAM_ALIVE_ON_FAIL = 0x00000020, + MF_RESOLUTION_DISABLE_LOCAL_PLUGINS = 0x00000040, + MF_RESOLUTION_PLUGIN_CONTROL_POLICY_APPROVED_ONLY = 0x00000080, + MF_RESOLUTION_PLUGIN_CONTROL_POLICY_WEB_ONLY = 0x00000100, + MF_RESOLUTION_PLUGIN_CONTROL_POLICY_WEB_ONLY_EDGEMODE = 0x00000200, + MF_RESOLUTION_ENABLE_STORE_PLUGINS = 0x00000400, + MF_RESOLUTION_READ = 0x00010000, + MF_RESOLUTION_WRITE = 0x00020000, +}; cpp_quote("#ifdef __cplusplus") cpp_quote("static inline HRESULT MFSetAttributeSize(IMFAttributes *attributes, REFGUID key, UINT32 width, UINT32 height)") -- 2.25.1

3 6

[PATCH] user32: Do not delay-load setupapi.
by Zebediah Figura March 9, 2020

March 9, 2020

This fixes a deadlock in the Steel Series Engine installer, between the "user_section" lock and the loader lock. Currently user32 takes the "user_section" lock during THREAD_DETACH, i.e. while the loader lock is held. However, it is also possible for a thread to take the locks in the reverse order. The observed path is: - register_builtin() - LoadCursorA() - get_display_bpp() - get_display_dc() - CreateDCW() - GetDeviceCaps(DESKTOPHORZRES) - GetSystemMetrics(SM_CXVIRTUALSCREEN) - EnumDisplayMonitors() - update_monitor_cache() Since we now rely on setupapi for fundamental tasks such as determining screen size, it doesn't make much sense to delay-load it. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/user32/Makefile.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/Makefile.in b/dlls/user32/Makefile.in index 2bb60140d3..a570c34b53 100644 --- a/dlls/user32/Makefile.in +++ b/dlls/user32/Makefile.in @@ -1,9 +1,9 @@ EXTRADEFS = -D_USER32_ -D_WINABLE_ MODULE = user32.dll IMPORTLIB = user32 -IMPORTS = gdi32 version advapi32 kernelbase +IMPORTS = gdi32 version advapi32 kernelbase setupapi EXTRAINCL = $(PNG_CFLAGS) -DELAYIMPORTS = hid imm32 setupapi usp10 +DELAYIMPORTS = hid imm32 usp10 C_SRCS = \ button.c \ -- 2.25.1

1 0

[PATCH v2 1/6] include: Use public field names for FILE_RENAME_INFORMATION.
by Zebediah Figura March 9, 2020

March 9, 2020

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- Perhaps it would also make sense to move this definition to ddk/ntifs.h? dlls/ntdll/file.c | 4 +-- dlls/ntdll/tests/file.c | 68 ++++++++++++++++++++--------------------- include/winternl.h | 4 +-- 3 files changed, 38 insertions(+), 38 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 5dda468d74b..5ecf293820e 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -2771,14 +2771,14 @@ NTSTATUS WINAPI NtSetInformationFile(HANDLE handle, PIO_STATUS_BLOCK io, attr.Length = sizeof(attr); attr.ObjectName = &name_str; - attr.RootDirectory = info->RootDir; + attr.RootDirectory = info->RootDirectory; attr.Attributes = OBJ_CASE_INSENSITIVE; io->u.Status = nt_to_unix_file_name_attr( &attr, &unix_name, FILE_OPEN_IF ); if (io->u.Status != STATUS_SUCCESS && io->u.Status != STATUS_NO_SUCH_FILE) break; - if (!info->Replace && io->u.Status == STATUS_SUCCESS) + if (!info->ReplaceIfExists && io->u.Status == STATUS_SUCCESS) { RtlFreeAnsiString( &unix_name ); io->u.Status = STATUS_OBJECT_NAME_COLLISION; diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index dd188fd9132..561cf800433 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -1502,8 +1502,8 @@ static void test_file_rename_information(void) pRtlDosPathNameToNtPathName_U( newpath, &name_str, NULL, NULL ); DeleteFileW( newpath ); fri = HeapAlloc( GetProcessHeap(), 0, sizeof(FILE_RENAME_INFORMATION) + name_str.Length ); - fri->Replace = FALSE; - fri->RootDir = NULL; + fri->ReplaceIfExists = FALSE; + fri->RootDirectory = NULL; fri->FileNameLength = name_str.Length; memcpy( fri->FileName, name_str.Buffer, name_str.Length ); pRtlFreeUnicodeString( &name_str ); @@ -1540,8 +1540,8 @@ static void test_file_rename_information(void) ok( res != 0, "failed to create temp file\n" ); pRtlDosPathNameToNtPathName_U( newpath, &name_str, NULL, NULL ); fri = HeapAlloc( GetProcessHeap(), 0, sizeof(FILE_RENAME_INFORMATION) + name_str.Length ); - fri->Replace = FALSE; - fri->RootDir = NULL; + fri->ReplaceIfExists = FALSE; + fri->RootDirectory = NULL; fri->FileNameLength = name_str.Length; memcpy( fri->FileName, name_str.Buffer, name_str.Length ); pRtlFreeUnicodeString( &name_str ); @@ -1570,8 +1570,8 @@ static void test_file_rename_information(void) ok( res != 0, "failed to create temp file\n" ); pRtlDosPathNameToNtPathName_U( newpath, &name_str, NULL, NULL ); fri = HeapAlloc( GetProcessHeap(), 0, sizeof(FILE_RENAME_INFORMATION) + name_str.Length ); - fri->Replace = TRUE; - fri->RootDir = NULL; + fri->ReplaceIfExists = TRUE; + fri->RootDirectory = NULL; fri->FileNameLength = name_str.Length; memcpy( fri->FileName, name_str.Buffer, name_str.Length ); pRtlFreeUnicodeString( &name_str ); @@ -1603,8 +1603,8 @@ static void test_file_rename_information(void) pRtlDosPathNameToNtPathName_U( newpath, &name_str, NULL, NULL ); fri = HeapAlloc( GetProcessHeap(), 0, sizeof(FILE_RENAME_INFORMATION) + name_str.Length ); - fri->Replace = FALSE; - fri->RootDir = NULL; + fri->ReplaceIfExists = FALSE; + fri->RootDirectory = NULL; fri->FileNameLength = name_str.Length; memcpy( fri->FileName, name_str.Buffer, name_str.Length ); pRtlFreeUnicodeString( &name_str ); @@ -1637,8 +1637,8 @@ static void test_file_rename_information(void) pRtlDosPathNameToNtPathName_U( newpath, &name_str, NULL, NULL ); fri = HeapAlloc( GetProcessHeap(), 0, sizeof(FILE_RENAME_INFORMATION) + name_str.Length ); - fri->Replace = TRUE; - fri->RootDir = NULL; + fri->ReplaceIfExists = TRUE; + fri->RootDirectory = NULL; fri->FileNameLength = name_str.Length; memcpy( fri->FileName, name_str.Buffer, name_str.Length ); pRtlFreeUnicodeString( &name_str ); @@ -1672,8 +1672,8 @@ static void test_file_rename_information(void) pRtlDosPathNameToNtPathName_U( newpath, &name_str, NULL, NULL ); DeleteFileW( newpath ); fri = HeapAlloc( GetProcessHeap(), 0, sizeof(FILE_RENAME_INFORMATION) + name_str.Length ); - fri->Replace = FALSE; - fri->RootDir = NULL; + fri->ReplaceIfExists = FALSE; + fri->RootDirectory = NULL; fri->FileNameLength = name_str.Length; memcpy( fri->FileName, name_str.Buffer, name_str.Length ); pRtlFreeUnicodeString( &name_str ); @@ -1719,8 +1719,8 @@ static void test_file_rename_information(void) pRtlDosPathNameToNtPathName_U( newpath, &name_str, NULL, NULL ); DeleteFileW( newpath ); fri = HeapAlloc( GetProcessHeap(), 0, sizeof(FILE_RENAME_INFORMATION) + name_str.Length ); - fri->Replace = FALSE; - fri->RootDir = NULL; + fri->ReplaceIfExists = FALSE; + fri->RootDirectory = NULL; fri->FileNameLength = name_str.Length; memcpy( fri->FileName, name_str.Buffer, name_str.Length ); pRtlFreeUnicodeString( &name_str ); @@ -1759,8 +1759,8 @@ static void test_file_rename_information(void) ok( res != 0, "failed to create temp file\n" ); pRtlDosPathNameToNtPathName_U( newpath, &name_str, NULL, NULL ); fri = HeapAlloc( GetProcessHeap(), 0, sizeof(FILE_RENAME_INFORMATION) + name_str.Length ); - fri->Replace = FALSE; - fri->RootDir = NULL; + fri->ReplaceIfExists = FALSE; + fri->RootDirectory = NULL; fri->FileNameLength = name_str.Length; memcpy( fri->FileName, name_str.Buffer, name_str.Length ); pRtlFreeUnicodeString( &name_str ); @@ -1795,8 +1795,8 @@ static void test_file_rename_information(void) pRtlDosPathNameToNtPathName_U( newpath, &name_str, NULL, NULL ); fri = HeapAlloc( GetProcessHeap(), 0, sizeof(FILE_RENAME_INFORMATION) + name_str.Length ); - fri->Replace = FALSE; - fri->RootDir = NULL; + fri->ReplaceIfExists = FALSE; + fri->RootDirectory = NULL; fri->FileNameLength = name_str.Length; memcpy( fri->FileName, name_str.Buffer, name_str.Length ); pRtlFreeUnicodeString( &name_str ); @@ -1829,8 +1829,8 @@ static void test_file_rename_information(void) ok( res != 0, "failed to create temp file\n" ); pRtlDosPathNameToNtPathName_U( newpath, &name_str, NULL, NULL ); fri = HeapAlloc( GetProcessHeap(), 0, sizeof(FILE_RENAME_INFORMATION) + name_str.Length ); - fri->Replace = TRUE; - fri->RootDir = NULL; + fri->ReplaceIfExists = TRUE; + fri->RootDirectory = NULL; fri->FileNameLength = name_str.Length; memcpy( fri->FileName, name_str.Buffer, name_str.Length ); pRtlFreeUnicodeString( &name_str ); @@ -1865,8 +1865,8 @@ static void test_file_rename_information(void) pRtlDosPathNameToNtPathName_U( newpath, &name_str, NULL, NULL ); fri = HeapAlloc( GetProcessHeap(), 0, sizeof(FILE_RENAME_INFORMATION) + name_str.Length ); - fri->Replace = TRUE; - fri->RootDir = NULL; + fri->ReplaceIfExists = TRUE; + fri->RootDirectory = NULL; fri->FileNameLength = name_str.Length; memcpy( fri->FileName, name_str.Buffer, name_str.Length ); pRtlFreeUnicodeString( &name_str ); @@ -1902,8 +1902,8 @@ static void test_file_rename_information(void) ok( success != 0, "failed to create temp directory\n" ); pRtlDosPathNameToNtPathName_U( newpath, &name_str, NULL, NULL ); fri = HeapAlloc( GetProcessHeap(), 0, sizeof(FILE_RENAME_INFORMATION) + name_str.Length ); - fri->Replace = FALSE; - fri->RootDir = NULL; + fri->ReplaceIfExists = FALSE; + fri->RootDirectory = NULL; fri->FileNameLength = name_str.Length; memcpy( fri->FileName, name_str.Buffer, name_str.Length ); pRtlFreeUnicodeString( &name_str ); @@ -1938,8 +1938,8 @@ static void test_file_rename_information(void) ok( success != 0, "failed to create temp directory\n" ); pRtlDosPathNameToNtPathName_U( newpath, &name_str, NULL, NULL ); fri = HeapAlloc( GetProcessHeap(), 0, sizeof(FILE_RENAME_INFORMATION) + name_str.Length ); - fri->Replace = TRUE; - fri->RootDir = NULL; + fri->ReplaceIfExists = TRUE; + fri->RootDirectory = NULL; fri->FileNameLength = name_str.Length; memcpy( fri->FileName, name_str.Buffer, name_str.Length ); pRtlFreeUnicodeString( &name_str ); @@ -1977,8 +1977,8 @@ static void test_file_rename_information(void) pRtlDosPathNameToNtPathName_U( newpath, &name_str, NULL, NULL ); fri = HeapAlloc( GetProcessHeap(), 0, sizeof(FILE_RENAME_INFORMATION) + name_str.Length ); - fri->Replace = TRUE; - fri->RootDir = NULL; + fri->ReplaceIfExists = TRUE; + fri->RootDirectory = NULL; fri->FileNameLength = name_str.Length; memcpy( fri->FileName, name_str.Buffer, name_str.Length ); pRtlFreeUnicodeString( &name_str ); @@ -2011,8 +2011,8 @@ static void test_file_rename_information(void) ok( success != 0, "failed to create temp directory\n" ); pRtlDosPathNameToNtPathName_U( newpath, &name_str, NULL, NULL ); fri = HeapAlloc( GetProcessHeap(), 0, sizeof(FILE_RENAME_INFORMATION) + name_str.Length ); - fri->Replace = FALSE; - fri->RootDir = NULL; + fri->ReplaceIfExists = FALSE; + fri->RootDirectory = NULL; fri->FileNameLength = name_str.Length; memcpy( fri->FileName, name_str.Buffer, name_str.Length ); pRtlFreeUnicodeString( &name_str ); @@ -2044,8 +2044,8 @@ static void test_file_rename_information(void) ok( success != 0, "failed to create temp directory\n" ); pRtlDosPathNameToNtPathName_U( newpath, &name_str, NULL, NULL ); fri = HeapAlloc( GetProcessHeap(), 0, sizeof(FILE_RENAME_INFORMATION) + name_str.Length ); - fri->Replace = TRUE; - fri->RootDir = NULL; + fri->ReplaceIfExists = TRUE; + fri->RootDirectory = NULL; fri->FileNameLength = name_str.Length; memcpy( fri->FileName, name_str.Buffer, name_str.Length ); pRtlFreeUnicodeString( &name_str ); @@ -2079,8 +2079,8 @@ static void test_file_rename_information(void) ok( handle2 != INVALID_HANDLE_VALUE, "CreateFileW failed\n" ); fri = HeapAlloc( GetProcessHeap(), 0, sizeof(FILE_RENAME_INFORMATION) + lstrlenW(filename) * sizeof(WCHAR) ); - fri->Replace = FALSE; - fri->RootDir = handle2; + fri->ReplaceIfExists = FALSE; + fri->RootDirectory = handle2; fri->FileNameLength = lstrlenW(filename) * sizeof(WCHAR); memcpy( fri->FileName, filename, fri->FileNameLength ); diff --git a/include/winternl.h b/include/winternl.h index f55d275320a..d9809c7ad31 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -632,8 +632,8 @@ typedef struct _FILE_NAME_INFORMATION { } FILE_NAME_INFORMATION, *PFILE_NAME_INFORMATION; typedef struct _FILE_RENAME_INFORMATION { - BOOLEAN Replace; - HANDLE RootDir; + BOOLEAN ReplaceIfExists; + HANDLE RootDirectory; ULONG FileNameLength; WCHAR FileName[1]; } FILE_RENAME_INFORMATION, *PFILE_RENAME_INFORMATION; -- 2.25.1

3 7

[PATCH] ntdll: Zero init reg_tzi in find_reg_tz_info().
by Paul Gofman March 9, 2020

March 9, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48694 Zero init does not affect the search itself but the structure is also copied to input / output variable and the application seems to be unhappy with the random data beyond the end of strings. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/ntdll/time.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index 6926291bc2..a5af9f274d 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -797,6 +797,8 @@ static void find_reg_tz_info(RTL_DYNAMIC_TIME_ZONE_INFORMATION *tzi, const char* continue; \ } + memset(&reg_tzi, 0, sizeof(reg_tzi)); + if (!reg_query_value(hSubkey, mui_stdW, REG_SZ, reg_tzi.StandardName, sizeof(reg_tzi.StandardName))) get_value(hSubkey, stdW, REG_SZ, reg_tzi.StandardName, sizeof(reg_tzi.StandardName)); if (!reg_query_value(hSubkey, mui_dltW, REG_SZ, reg_tzi.DaylightName, sizeof(reg_tzi.DaylightName))) -- 2.24.1

1 0

[PATCH] whoami: Add semi-stub application to display username.
by Brendan Shanks March 9, 2020

March 9, 2020

Fixes GTA V hang experienced by some users. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- configure.ac | 1 + programs/whoami/Makefile.in | 7 +++ programs/whoami/main.c | 95 +++++++++++++++++++++++++++++++++++++ 3 files changed, 103 insertions(+) create mode 100644 programs/whoami/Makefile.in create mode 100644 programs/whoami/main.c diff --git a/configure.ac b/configure.ac index f74d539f4e..7c3c6d2b67 100644 --- a/configure.ac +++ b/configure.ac @@ -3973,6 +3973,7 @@ WINE_CONFIG_MAKEFILE(programs/uninstaller) WINE_CONFIG_MAKEFILE(programs/unlodctr) WINE_CONFIG_MAKEFILE(programs/view) WINE_CONFIG_MAKEFILE(programs/wevtutil) +WINE_CONFIG_MAKEFILE(programs/whoami) WINE_CONFIG_MAKEFILE(programs/wineboot) WINE_CONFIG_MAKEFILE(programs/winebrowser) WINE_CONFIG_MAKEFILE(programs/winecfg) diff --git a/programs/whoami/Makefile.in b/programs/whoami/Makefile.in new file mode 100644 index 0000000000..a003b0afaa --- /dev/null +++ b/programs/whoami/Makefile.in @@ -0,0 +1,7 @@ +MODULE = whoami.exe +IMPORTS = secur32 + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin + +C_SRCS = \ + main.c diff --git a/programs/whoami/main.c b/programs/whoami/main.c new file mode 100644 index 0000000000..5903bf21f5 --- /dev/null +++ b/programs/whoami/main.c @@ -0,0 +1,95 @@ +/* + * Copyright 2020 Brendan Shanks for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define SECURITY_WIN32 +#include <windows.h> +#include <security.h> + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(whoami); + +static int output_write(const WCHAR* str, int len) +{ + DWORD ret, count; + ret = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), str, len, &count, NULL); + if (!ret) + { + DWORD lenA; + char* strA; + + /* On Windows WriteConsoleW() fails if the output is redirected. So fall + * back to WriteFile(), assuming the console encoding is still the right + * one in that case. + */ + lenA = WideCharToMultiByte(GetConsoleOutputCP(), 0, str, len, + NULL, 0, NULL, NULL); + strA = HeapAlloc(GetProcessHeap(), 0, lenA); + if (!strA) + return 0; + + WideCharToMultiByte(GetConsoleOutputCP(), 0, str, len, strA, lenA, + NULL, NULL); + WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), strA, lenA, &count, FALSE); + HeapFree(GetProcessHeap(), 0, strA); + } + return count; +} + +int __cdecl wmain(int argc, WCHAR *argv[]) +{ + WCHAR *buf = NULL; + ULONG size = 0; + BOOL result; + + if (argc > 1) + { + int i; + + WINE_FIXME("unsupported arguments:"); + for (i = 0; i < argc; i++) + WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); + WINE_FIXME("\n"); + } + + result = GetUserNameExW(NameSamCompatible, NULL, &size); + if (result || GetLastError() != ERROR_MORE_DATA) + { + WINE_ERR("GetUserNameExW failed, result %d, error %d\n", result, GetLastError()); + return 1; + } + + buf = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); + if (!buf) + { + WINE_ERR("Memory allocation failed\n"); + return 1; + } + + result = GetUserNameExW(NameSamCompatible, buf, &size); + if (result) + { + output_write(buf, size); + output_write(L"\r\n", ARRAY_SIZE(L"\r\n")); + } + else + WINE_ERR("GetUserNameExW failed, error %d\n", GetLastError()); + + HeapFree(GetProcessHeap(), 0, buf); + return 0; +} -- 2.24.1

1 0

[PATCH 2/2] include: Add corecrt_wdirect.h header.
by Jacek Caban March 9, 2020

March 9, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/msvcrt/corecrt_wdirect.h | 25 +++++++++++++++++++++++++ include/msvcrt/direct.h | 11 +---------- include/msvcrt/wchar.h | 10 +--------- 3 files changed, 27 insertions(+), 19 deletions(-) create mode 100644 include/msvcrt/corecrt_wdirect.h

1 0

[PATCH 1/2] include: Add corecrt_wprocess.h header.
by Jacek Caban March 9, 2020

March 9, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/msvcrt/corecrt_wprocess.h | 37 +++++++++++++++++++++++++++++++ include/msvcrt/process.h | 22 +----------------- include/msvcrt/wchar.h | 22 +----------------- 3 files changed, 39 insertions(+), 42 deletions(-) create mode 100644 include/msvcrt/corecrt_wprocess.h

1 0