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

[PATCH v3 1/3] strmbase: Also match a GUID_NULL formattype as a wildcard in source_Connect().
by Zebediah Figura Feb. 17, 2020

Feb. 17, 2020

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/qcap/tests/smartteefilter.c | 16 +++------------- dlls/qedit/tests/samplegrabber.c | 22 +++++++--------------- dlls/quartz/tests/avisplit.c | 15 +++++---------- dlls/quartz/tests/filesource.c | 2 +- dlls/quartz/tests/mpegsplit.c | 10 +++------- dlls/quartz/tests/videorenderer.c | 3 --- dlls/quartz/tests/vmr7.c | 3 --- dlls/quartz/tests/vmr9.c | 3 --- dlls/strmbase/pin.c | 9 ++++++++- 9 files changed, 27 insertions(+), 56 deletions(-) diff --git a/dlls/qcap/tests/smartteefilter.c b/dlls/qcap/tests/smartteefilter.c index c4fa3a69549..4602d137386 100644 --- a/dlls/qcap/tests/smartteefilter.c +++ b/dlls/qcap/tests/smartteefilter.c @@ -2831,29 +2831,19 @@ static void test_source_connection(AM_MEDIA_TYPE req_mt, IFilterGraph2 *graph, req_mt.formattype = FORMAT_WaveFormatEx; hr = IFilterGraph2_ConnectDirect(graph, source, &testsink->sink.pin.IPin_iface, &req_mt); - todo_wine ok(hr == VFW_E_NO_ACCEPTABLE_TYPES, "Got hr %#x.\n", hr); - if (hr == S_OK) - { - IFilterGraph2_Disconnect(graph, source); - IFilterGraph2_Disconnect(graph, &testsink->sink.pin.IPin_iface); - } + ok(hr == VFW_E_NO_ACCEPTABLE_TYPES, "Got hr %#x.\n", hr); req_mt = sink_mt; req_mt.formattype = GUID_NULL; hr = IFilterGraph2_ConnectDirect(graph, source, &testsink->sink.pin.IPin_iface, &req_mt); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(compare_media_types(&testsink->sink.pin.mt, &sink_mt), "Media types didn't match.\n"); + ok(compare_media_types(&testsink->sink.pin.mt, &sink_mt), "Media types didn't match.\n"); IFilterGraph2_Disconnect(graph, source); IFilterGraph2_Disconnect(graph, &testsink->sink.pin.IPin_iface); req_mt.subtype = MEDIASUBTYPE_RGB32; hr = IFilterGraph2_ConnectDirect(graph, source, &testsink->sink.pin.IPin_iface, &req_mt); - todo_wine ok(hr == VFW_E_NO_ACCEPTABLE_TYPES, "Got hr %#x.\n", hr); - if (hr == S_OK) - { - IFilterGraph2_Disconnect(graph, source); - IFilterGraph2_Disconnect(graph, &testsink->sink.pin.IPin_iface); - } + ok(hr == VFW_E_NO_ACCEPTABLE_TYPES, "Got hr %#x.\n", hr); req_mt.subtype = GUID_NULL; hr = IFilterGraph2_ConnectDirect(graph, source, &testsink->sink.pin.IPin_iface, &req_mt); diff --git a/dlls/qedit/tests/samplegrabber.c b/dlls/qedit/tests/samplegrabber.c index 04842211414..b3f325dd051 100644 --- a/dlls/qedit/tests/samplegrabber.c +++ b/dlls/qedit/tests/samplegrabber.c @@ -939,29 +939,21 @@ static void test_connect_pin(void) req_mt.formattype = FORMAT_None; hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); - todo_wine ok(hr == VFW_E_NO_ACCEPTABLE_TYPES, "Got hr %#x.\n", hr); - if (hr == S_OK) - { - IFilterGraph2_Disconnect(graph, source); - IFilterGraph2_Disconnect(graph, &testsink.sink.pin.IPin_iface); - } + ok(hr == VFW_E_NO_ACCEPTABLE_TYPES, "Got hr %#x.\n", hr); req_mt.majortype = MEDIATYPE_Video; req_mt.subtype = MEDIASUBTYPE_RGB8; req_mt.formattype = GUID_NULL; hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - if (hr == S_OK) - { - ok(compare_media_types(&testsink.sink.pin.mt, &testsource.source_mt), "Media types didn't match.\n"); - ok(compare_media_types(&testsource.source.pin.mt, &testsink.sink.pin.mt), "Media types didn't match.\n"); - IFilterGraph2_Disconnect(graph, source); - IFilterGraph2_Disconnect(graph, &testsink.sink.pin.IPin_iface); - } + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(compare_media_types(&testsink.sink.pin.mt, &testsource.source_mt), "Media types didn't match.\n"); + ok(compare_media_types(&testsource.source.pin.mt, &testsink.sink.pin.mt), "Media types didn't match.\n"); + IFilterGraph2_Disconnect(graph, source); + IFilterGraph2_Disconnect(graph, &testsink.sink.pin.IPin_iface); req_mt.subtype = MEDIASUBTYPE_RGB32; hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); - todo_wine ok(hr == VFW_E_NO_ACCEPTABLE_TYPES, "Got hr %#x.\n", hr); + ok(hr == VFW_E_NO_ACCEPTABLE_TYPES, "Got hr %#x.\n", hr); req_mt.subtype = GUID_NULL; hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); diff --git a/dlls/quartz/tests/avisplit.c b/dlls/quartz/tests/avisplit.c index fa10f54a7c4..240938fdc04 100644 --- a/dlls/quartz/tests/avisplit.c +++ b/dlls/quartz/tests/avisplit.c @@ -1073,6 +1073,7 @@ static void test_connect_pin(void) { .majortype = MEDIATYPE_Stream, .subtype = MEDIASUBTYPE_Avi, + .formattype = FORMAT_None, .lSampleSize = 888, }; IBaseFilter *filter = create_avi_splitter(), *reader; @@ -1235,26 +1236,20 @@ static void test_connect_pin(void) req_mt.formattype = FORMAT_None; hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); - todo_wine ok(hr == VFW_E_NO_ACCEPTABLE_TYPES, "Got hr %#x.\n", hr); - if (hr == S_OK) - { - IFilterGraph2_Disconnect(graph, source); - IFilterGraph2_Disconnect(graph, &testsink.sink.pin.IPin_iface); - } + ok(hr == VFW_E_NO_ACCEPTABLE_TYPES, "Got hr %#x.\n", hr); req_mt.majortype = MEDIATYPE_Video; req_mt.subtype = MEDIASUBTYPE_I420; req_mt.formattype = GUID_NULL; hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - if (hr == S_OK) - ok(compare_media_types(&testsink.sink.pin.mt, source_mt), "Media types didn't match.\n"); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(compare_media_types(&testsink.sink.pin.mt, source_mt), "Media types didn't match.\n"); IFilterGraph2_Disconnect(graph, source); IFilterGraph2_Disconnect(graph, &testsink.sink.pin.IPin_iface); req_mt.subtype = MEDIASUBTYPE_RGB32; hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); - todo_wine ok(hr == VFW_E_NO_ACCEPTABLE_TYPES, "Got hr %#x.\n", hr); + ok(hr == VFW_E_NO_ACCEPTABLE_TYPES, "Got hr %#x.\n", hr); req_mt.subtype = GUID_NULL; hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); diff --git a/dlls/quartz/tests/filesource.c b/dlls/quartz/tests/filesource.c index 6fe19bf2c9c..067d7d463c0 100644 --- a/dlls/quartz/tests/filesource.c +++ b/dlls/quartz/tests/filesource.c @@ -1398,7 +1398,7 @@ static void test_connect_pin(void) req_mt.formattype = GUID_NULL; hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.pin.pin.IPin_iface, &req_mt); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(compare_media_types(&testsink.pin.pin.mt, source_mt), "Media types didn't match.\n"); + ok(compare_media_types(&testsink.pin.pin.mt, source_mt), "Media types didn't match.\n"); IFilterGraph2_Disconnect(graph, source); IFilterGraph2_Disconnect(graph, &testsink.pin.pin.IPin_iface); diff --git a/dlls/quartz/tests/mpegsplit.c b/dlls/quartz/tests/mpegsplit.c index 4d7ef7d5823..ff86dd5acc3 100644 --- a/dlls/quartz/tests/mpegsplit.c +++ b/dlls/quartz/tests/mpegsplit.c @@ -1310,6 +1310,7 @@ static void test_connect_pin(void) { .majortype = MEDIATYPE_Stream, .subtype = MEDIASUBTYPE_MPEG1Audio, + .formattype = FORMAT_WaveFormatEx, .lSampleSize = 888, }; IBaseFilter *filter = create_mpeg_splitter(), *reader; @@ -1471,12 +1472,7 @@ static void test_connect_pin(void) req_mt.formattype = FORMAT_None; hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); - todo_wine ok(hr == VFW_E_NO_ACCEPTABLE_TYPES, "Got hr %#x.\n", hr); - if (hr == S_OK) - { - IFilterGraph2_Disconnect(graph, source); - IFilterGraph2_Disconnect(graph, &testsink.sink.pin.IPin_iface); - } + ok(hr == VFW_E_NO_ACCEPTABLE_TYPES, "Got hr %#x.\n", hr); req_mt.majortype = MEDIATYPE_Audio; req_mt.subtype = MEDIASUBTYPE_MPEG1AudioPayload; @@ -1490,7 +1486,7 @@ static void test_connect_pin(void) req_mt.subtype = MEDIASUBTYPE_PCM; hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); - todo_wine ok(hr == VFW_E_NO_ACCEPTABLE_TYPES, "Got hr %#x.\n", hr); + ok(hr == VFW_E_NO_ACCEPTABLE_TYPES, "Got hr %#x.\n", hr); req_mt.subtype = GUID_NULL; hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index dae4d7ed66c..fcb5f3d2277 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -1206,9 +1206,6 @@ static void test_connect_pin(void) req_mt.formattype = FORMAT_None; hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &req_mt); ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); - req_mt.formattype = GUID_NULL; - hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &req_mt); - ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); req_mt.formattype = FORMAT_VideoInfo; peer = (IPin *)0xdeadbeef; diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index 6d578e80cf0..3357a3b6577 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -1411,9 +1411,6 @@ static void test_connect_pin(void) req_mt.formattype = FORMAT_None; hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &req_mt); ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); - req_mt.formattype = GUID_NULL; - hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &req_mt); - ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); req_mt.formattype = FORMAT_VideoInfo; req_mt.subtype = MEDIASUBTYPE_RGB8; diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 2bb1166cba4..85304fce41c 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -1405,9 +1405,6 @@ static void test_connect_pin(void) req_mt.formattype = FORMAT_None; hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &req_mt); ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); - req_mt.formattype = GUID_NULL; - hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &req_mt); - ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); req_mt.formattype = FORMAT_VideoInfo; req_mt.subtype = MEDIASUBTYPE_RGB8; diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 305310fbc4d..19485abb5c5 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -437,6 +437,11 @@ static BOOL compare_media_types(const AM_MEDIA_TYPE *a, const AM_MEDIA_TYPE *b) && !IsEqualGUID(&b->subtype, &GUID_NULL)) return FALSE; + if (!IsEqualGUID(&a->formattype, &b->formattype) + && !IsEqualGUID(&a->formattype, &GUID_NULL) + && !IsEqualGUID(&b->formattype, &GUID_NULL)) + return FALSE; + return TRUE; } @@ -477,7 +482,9 @@ static HRESULT WINAPI source_Connect(IPin *iface, IPin *peer, const AM_MEDIA_TYP return VFW_E_NOT_STOPPED; } - if (mt && !IsEqualGUID(&mt->majortype, &GUID_NULL) && !IsEqualGUID(&mt->subtype, &GUID_NULL)) + if (mt && !IsEqualGUID(&mt->majortype, &GUID_NULL) + && !IsEqualGUID(&mt->subtype, &GUID_NULL) + && !IsEqualGUID(&mt->formattype, &GUID_NULL)) { hr = pin->pFuncsTable->pfnAttemptConnection(pin, peer, mt); LeaveCriticalSection(&pin->pin.filter->csFilter); -- 2.25.0

2 3

[PATCH 1/2] user32/tests: Add some tests for classes with non-zero low word instance.
by Dmitry Timoshkov Feb. 16, 2020

Feb. 16, 2020

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/tests/class.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index 2702fa00b9..b07ff8548f 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -98,6 +98,7 @@ static void ClassTest(HINSTANCE hInstance, BOOL global) LONG i; WCHAR str[20]; ATOM classatom; + HINSTANCE hInstance2; cls.style = CS_HREDRAW | CS_VREDRAW | (global?CS_GLOBALCLASS:0); cls.lpfnWndProc = ClassTest_WndProc; @@ -121,6 +122,26 @@ static void ClassTest(HINSTANCE hInstance, BOOL global) "RegisterClass of the same class should fail for the second time\n"); /* Setup windows */ + hInstance2 = (HINSTANCE)(((ULONG_PTR)hInstance & ~0xffff) | 0xdead); + + hTestWnd = CreateWindowW (className, winName, + WS_OVERLAPPEDWINDOW + WS_HSCROLL + WS_VSCROLL, + CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, 0, + 0, hInstance2, 0); +todo_wine_if (!global) + ok(hTestWnd != 0, "Failed to create window for hInstance %p\n", hInstance2); + +todo_wine_if (!global) + ok((HINSTANCE)GetClassLongPtrA(hTestWnd, GCLP_HMODULE) == hInstance, + "Wrong GCL instance %p != %p\n", + (HINSTANCE)GetClassLongPtrA(hTestWnd, GCLP_HMODULE), hInstance); +todo_wine_if (!global) + ok((HINSTANCE)GetWindowLongPtrA(hTestWnd, GWLP_HINSTANCE) == hInstance2, + "Wrong GWL instance %p != %p\n", + (HINSTANCE)GetWindowLongPtrA(hTestWnd, GWLP_HINSTANCE), hInstance2); + + DestroyWindow(hTestWnd); + hTestWnd = CreateWindowW (className, winName, WS_OVERLAPPEDWINDOW + WS_HSCROLL + WS_VSCROLL, CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, 0, @@ -128,6 +149,14 @@ static void ClassTest(HINSTANCE hInstance, BOOL global) ok(hTestWnd!=0, "Failed to create window\n"); + ok((HINSTANCE)GetClassLongPtrA(hTestWnd, GCLP_HMODULE) == hInstance, + "Wrong GCL instance %p/%p\n", + (HINSTANCE)GetClassLongPtrA(hTestWnd, GCLP_HMODULE), hInstance); + ok((HINSTANCE)GetWindowLongPtrA(hTestWnd, GWLP_HINSTANCE) == hInstance, + "Wrong GWL instance %p/%p for window %s\n", + (HINSTANCE)GetWindowLongPtrA(hTestWnd, GWLP_HINSTANCE), hInstance); + + /* test initial values of valid classwords */ for(i=0; i<NUMCLASSWORDS; i++) { @@ -1491,6 +1520,8 @@ START_TEST(class) ClassTest(hInstance,FALSE); ClassTest(hInstance,TRUE); + ClassTest((HANDLE)((ULONG_PTR)hInstance | 0x1234), FALSE); + ClassTest((HANDLE)((ULONG_PTR)hInstance | 0x1234), TRUE); CreateDialogParamTest(hInstance); test_styles(); test_builtinproc(); -- 2.20.1

2 1

[PATCH v3 1/6] d3d10: Allocate buffers for effect interface local_buffers.
by Connor McAdams Feb. 16, 2020

Feb. 16, 2020

Create ID3D10Buffer interfaces for the constant buffers within the effect shader. Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> --- dlls/d3d10/d3d10_private.h | 10 ++++++ dlls/d3d10/effect.c | 62 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 96020cd4a0..5c6c7a2d72 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -114,6 +114,15 @@ struct d3d10_effect_state_object_variable } object; }; +struct d3d10_effect_buffer_variable +{ + ID3D10Buffer *buffer; + ID3D10ShaderResourceView *resource_view; + + UINT changed; + char *local_buffer; +}; + /* ID3D10EffectType */ struct d3d10_effect_type { @@ -169,6 +178,7 @@ struct d3d10_effect_variable { struct d3d10_effect_state_object_variable state; struct d3d10_effect_shader_variable shader; + struct d3d10_effect_buffer_variable buffer; } u; }; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 91e713bdf5..b62b7c0d3a 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -2096,6 +2096,53 @@ static HRESULT parse_fx10_local_variable(const char *data, size_t data_size, return S_OK; } +static HRESULT create_variable_buffer(struct d3d10_effect_variable *l, D3D10_CBUFFER_TYPE d3d10_cbuffer_type) +{ + D3D10_BUFFER_DESC buffer_desc; + D3D10_SUBRESOURCE_DATA subresource_data; + D3D10_SHADER_RESOURCE_VIEW_DESC srv_desc; + ID3D10Device *device = l->effect->device; + HRESULT hr; + + if (!(l->u.buffer.local_buffer = heap_calloc(l->type->size_unpacked, sizeof(unsigned char)))) + { + ERR("Failed to allocate local constant buffer memory.\n"); + return E_OUTOFMEMORY; + } + + buffer_desc.ByteWidth = l->type->size_unpacked; + buffer_desc.Usage = D3D10_USAGE_DEFAULT; + buffer_desc.CPUAccessFlags = 0; + buffer_desc.MiscFlags = 0; + if (d3d10_cbuffer_type == D3D10_CT_CBUFFER) + buffer_desc.BindFlags = D3D10_BIND_CONSTANT_BUFFER; + else if (d3d10_cbuffer_type == D3D10_CT_TBUFFER) + buffer_desc.BindFlags = D3D10_BIND_SHADER_RESOURCE; + + subresource_data.pSysMem = (const void *)l->u.buffer.local_buffer; + subresource_data.SysMemPitch = 0; + subresource_data.SysMemSlicePitch = 0; + + if (FAILED(hr = ID3D10Device_CreateBuffer(device, &buffer_desc, &subresource_data, &l->u.buffer.buffer))) + return hr; + + if (d3d10_cbuffer_type == D3D10_CT_TBUFFER) + { + srv_desc.Format = DXGI_FORMAT_R32G32B32A32_UINT; + srv_desc.ViewDimension = D3D_SRV_DIMENSION_BUFFER; + srv_desc.Buffer.ElementOffset = 0; + srv_desc.Buffer.ElementWidth = l->type->size_unpacked / 16; + + if (FAILED(hr = ID3D10Device_CreateShaderResourceView(device, (ID3D10Resource *)l->u.buffer.buffer, + (const D3D10_SHADER_RESOURCE_VIEW_DESC *)&srv_desc, &l->u.buffer.resource_view))) + return hr; + } + else + l->u.buffer.resource_view = NULL; + + return S_OK; +} + static HRESULT parse_fx10_local_buffer(const char *data, size_t data_size, const char **ptr, struct d3d10_effect_variable *l) { @@ -2282,6 +2329,12 @@ static HRESULT parse_fx10_local_buffer(const char *data, size_t data_size, TRACE("\tBasetype: %s.\n", debug_d3d10_shader_variable_type(l->type->basetype)); TRACE("\tTypeclass: %s.\n", debug_d3d10_shader_variable_class(l->type->type_class)); + if (l->type->size_unpacked) + { + if (FAILED(hr = create_variable_buffer(l, d3d10_cbuffer_type))) + return hr; + } + return S_OK; } @@ -2760,6 +2813,15 @@ static void d3d10_effect_local_buffer_destroy(struct d3d10_effect_variable *l) } heap_free(l->annotations); } + + if (l->u.buffer.buffer) + ID3D10Buffer_Release(l->u.buffer.buffer); + + if (l->u.buffer.local_buffer) + heap_free(l->u.buffer.local_buffer); + + if (l->u.buffer.resource_view) + ID3D10ShaderResourceView_Release(l->u.buffer.resource_view); } /* IUnknown methods */ -- 2.20.1

1 5

[PATCH] msi: Avoid an uninitialized compiler warning in InstallerImpl_SummaryInformation.
by Gerald Pfeifer Feb. 16, 2020

Feb. 16, 2020

According to my visually tracing to the sources this looks like a false positive, alas a tricky one, and GCC 10 warns, hence this straightforward approach to silence it - which is conservative programming in any case. Gerald Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> --- dlls/msi/automation.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index ba3a068a74..489adc96a9 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -1837,7 +1837,7 @@ static HRESULT InstallerImpl_SummaryInformation(WORD wFlags, UINT ret; HRESULT hr; MSIHANDLE hsuminfo; - IDispatch *dispatch; + IDispatch *dispatch = 0; VARIANTARG varg0, varg1; if (!(wFlags & DISPATCH_PROPERTYGET)) -- 2.25.0

1 0

[PATCH v2] shell32: Avoid crash on WM_WINDOWPOSCHANGING in BrsFolderDlgProc.
by Roman Pišl Feb. 16, 2020

Feb. 16, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48510 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> --- dlls/shell32/brsfolder.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index d71ec62099..188524d6a9 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -1109,6 +1109,8 @@ static INT_PTR CALLBACK BrsFolderDlgProc( HWND hWnd, UINT msg, WPARAM wParam, return BrsFolder_OnCreate( hWnd, (browse_info*) lParam ); info = GetPropW( hWnd, szBrowseFolderInfo ); + if (!info) + return FALSE; switch (msg) { -- 2.20.1

1 0

[PATCH] shell32: Avoid crash on WM_WINDOWPOSCHANGING in BrsFolderDlgProc.
by Roman Pišl Feb. 16, 2020

Feb. 16, 2020

Also checks are added to all other paths where info is used. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48510 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> --- dlls/shell32/brsfolder.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index d71ec62099..f226c97822 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -1113,15 +1113,19 @@ static INT_PTR CALLBACK BrsFolderDlgProc( HWND hWnd, UINT msg, WPARAM wParam, switch (msg) { case WM_NOTIFY: + if (!info) return FALSE; return BrsFolder_OnNotify( info, (UINT)wParam, (LPNMHDR)lParam); case WM_COMMAND: + if (!info) return FALSE; return BrsFolder_OnCommand( info, wParam ); case WM_WINDOWPOSCHANGING: + if (!info) return FALSE; return BrsFolder_OnWindowPosChanging( info, (WINDOWPOS *)lParam); case WM_SIZE: + if (!info) return FALSE; if (info->layout) /* new style dialogs */ LayoutUpdate(hWnd, info->layout, g_layout_info, ARRAY_SIZE(g_layout_info)); return 0; @@ -1147,18 +1151,23 @@ static INT_PTR CALLBACK BrsFolderDlgProc( HWND hWnd, UINT msg, WPARAM wParam, break; case BFFM_SETSELECTIONA: + if (!info) return FALSE; return BrsFolder_OnSetSelectionA(info, (LPVOID)lParam, (BOOL)wParam); case BFFM_SETSELECTIONW: + if (!info) return FALSE; return BrsFolder_OnSetSelectionW(info, (LPVOID)lParam, (BOOL)wParam); case BFFM_SETEXPANDED: /* unicode only */ + if (!info) return FALSE; return BrsFolder_OnSetExpanded(info, (LPVOID)lParam, (BOOL)wParam, NULL); case SHV_CHANGE_NOTIFY: + if (!info) return FALSE; return BrsFolder_OnChange(info, (const LPCITEMIDLIST*)wParam, (LONG)lParam); case WM_DESTROY: + if (!info) return FALSE; return BrsFolder_OnDestroy(info); } return FALSE; -- 2.20.1

2 1

[PATCH v2 1/6] d3d10: Allocate buffers for effect interface local_buffers.
by Connor McAdams Feb. 15, 2020

Feb. 15, 2020

Create ID3D10Buffer interfaces for the constant buffers within the effect shader. Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> --- dlls/d3d10/d3d10_private.h | 10 ++++++ dlls/d3d10/effect.c | 62 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 96020cd4a0..5c6c7a2d72 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -114,6 +114,15 @@ struct d3d10_effect_state_object_variable } object; }; +struct d3d10_effect_buffer_variable +{ + ID3D10Buffer *buffer; + ID3D10ShaderResourceView *resource_view; + + UINT changed; + char *local_buffer; +}; + /* ID3D10EffectType */ struct d3d10_effect_type { @@ -169,6 +178,7 @@ struct d3d10_effect_variable { struct d3d10_effect_state_object_variable state; struct d3d10_effect_shader_variable shader; + struct d3d10_effect_buffer_variable buffer; } u; }; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 91e713bdf5..b62b7c0d3a 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -2096,6 +2096,53 @@ static HRESULT parse_fx10_local_variable(const char *data, size_t data_size, return S_OK; } +static HRESULT create_variable_buffer(struct d3d10_effect_variable *l, D3D10_CBUFFER_TYPE d3d10_cbuffer_type) +{ + D3D10_BUFFER_DESC buffer_desc; + D3D10_SUBRESOURCE_DATA subresource_data; + D3D10_SHADER_RESOURCE_VIEW_DESC srv_desc; + ID3D10Device *device = l->effect->device; + HRESULT hr; + + if (!(l->u.buffer.local_buffer = heap_calloc(l->type->size_unpacked, sizeof(unsigned char)))) + { + ERR("Failed to allocate local constant buffer memory.\n"); + return E_OUTOFMEMORY; + } + + buffer_desc.ByteWidth = l->type->size_unpacked; + buffer_desc.Usage = D3D10_USAGE_DEFAULT; + buffer_desc.CPUAccessFlags = 0; + buffer_desc.MiscFlags = 0; + if (d3d10_cbuffer_type == D3D10_CT_CBUFFER) + buffer_desc.BindFlags = D3D10_BIND_CONSTANT_BUFFER; + else if (d3d10_cbuffer_type == D3D10_CT_TBUFFER) + buffer_desc.BindFlags = D3D10_BIND_SHADER_RESOURCE; + + subresource_data.pSysMem = (const void *)l->u.buffer.local_buffer; + subresource_data.SysMemPitch = 0; + subresource_data.SysMemSlicePitch = 0; + + if (FAILED(hr = ID3D10Device_CreateBuffer(device, &buffer_desc, &subresource_data, &l->u.buffer.buffer))) + return hr; + + if (d3d10_cbuffer_type == D3D10_CT_TBUFFER) + { + srv_desc.Format = DXGI_FORMAT_R32G32B32A32_UINT; + srv_desc.ViewDimension = D3D_SRV_DIMENSION_BUFFER; + srv_desc.Buffer.ElementOffset = 0; + srv_desc.Buffer.ElementWidth = l->type->size_unpacked / 16; + + if (FAILED(hr = ID3D10Device_CreateShaderResourceView(device, (ID3D10Resource *)l->u.buffer.buffer, + (const D3D10_SHADER_RESOURCE_VIEW_DESC *)&srv_desc, &l->u.buffer.resource_view))) + return hr; + } + else + l->u.buffer.resource_view = NULL; + + return S_OK; +} + static HRESULT parse_fx10_local_buffer(const char *data, size_t data_size, const char **ptr, struct d3d10_effect_variable *l) { @@ -2282,6 +2329,12 @@ static HRESULT parse_fx10_local_buffer(const char *data, size_t data_size, TRACE("\tBasetype: %s.\n", debug_d3d10_shader_variable_type(l->type->basetype)); TRACE("\tTypeclass: %s.\n", debug_d3d10_shader_variable_class(l->type->type_class)); + if (l->type->size_unpacked) + { + if (FAILED(hr = create_variable_buffer(l, d3d10_cbuffer_type))) + return hr; + } + return S_OK; } @@ -2760,6 +2813,15 @@ static void d3d10_effect_local_buffer_destroy(struct d3d10_effect_variable *l) } heap_free(l->annotations); } + + if (l->u.buffer.buffer) + ID3D10Buffer_Release(l->u.buffer.buffer); + + if (l->u.buffer.local_buffer) + heap_free(l->u.buffer.local_buffer); + + if (l->u.buffer.resource_view) + ID3D10ShaderResourceView_Release(l->u.buffer.resource_view); } /* IUnknown methods */ -- 2.20.1

1 5

[PATCH] ntdll: Add missing spec file entry for TpStartAsyncIoOperation().
by Nikolay Sivov Feb. 15, 2020

Feb. 15, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ntdll/ntdll.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 7aa953ca6c..57055ae34e 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1083,6 +1083,7 @@ @ stdcall TpSetTimer(ptr ptr long long) @ stdcall TpSetWait(ptr long ptr) @ stdcall TpSimpleTryPost(ptr ptr ptr) +@ stdcall TpStartAsyncIoOperation(ptr) @ stdcall TpWaitForTimer(ptr long) @ stdcall TpWaitForWait(ptr long) @ stdcall TpWaitForWork(ptr long) -- 2.25.0

1 0

[PATCH v2] gdiplus: Each pen dash array element must be greater than zero.
by Jeff Smith Feb. 15, 2020

Feb. 15, 2020

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/gdiplus/pen.c | 5 +---- dlls/gdiplus/tests/pen.c | 3 ++- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index 8bcb91819a..156f90a19d 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -598,13 +598,10 @@ GpStatus WINGDIPAPI GdipSetPenDashArray(GpPen *pen, GDIPCONST REAL *dash, for(i = 0; i < count; i++){ sum += dash[i]; - if(dash[i] < 0.0) + if(dash[i] <= 0.0) return InvalidParameter; } - if(sum == 0.0 && count) - return InvalidParameter; - heap_free(pen->dashes); pen->dashes = NULL; diff --git a/dlls/gdiplus/tests/pen.c b/dlls/gdiplus/tests/pen.c index ceab92acff..85528a3700 100644 --- a/dlls/gdiplus/tests/pen.c +++ b/dlls/gdiplus/tests/pen.c @@ -175,7 +175,7 @@ static void test_dasharray(void) dashes[4] = 14.0; dashes[5] = -100.0; dashes[6] = -100.0; - dashes[7] = dashes[8] = dashes[9] = dashes[10] = dashes[11] = 0.0; + dashes[7] = dashes[8] = dashes[9] = dashes[10] = dashes[11] = 1.0; /* setting the array sets the type to custom */ GdipGetPenDashStyle(pen, &style); @@ -217,6 +217,7 @@ static void test_dasharray(void) expectf(-100.0, dashes[6]); /* Some invalid array values. */ + dashes[9] = 0.0; status = GdipSetPenDashArray(pen, &dashes[7], 5); expect(InvalidParameter, status); dashes[9] = -1.0; -- 2.23.0

2 1

[PATCH 1/3] ntdll: Add threadpool stack information exports.
by Nikolay Sivov Feb. 15, 2020

Feb. 15, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Stack sizes are only stored as pool parameters for now. These are meant to replace 178405 and 178406. dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/tests/threadpool.c | 32 ++++++++++++++++++++++ dlls/ntdll/threadpool.c | 50 ++++++++++++++++++++++++++++++++--- include/winternl.h | 2 ++ 4 files changed, 82 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index fe36235bda..7aa953ca6c 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1070,6 +1070,7 @@ @ stdcall TpDisassociateCallback(ptr) @ stdcall TpIsTimerSet(ptr) @ stdcall TpPostWork(ptr) +@ stdcall TpQueryPoolStackInformation(ptr ptr) @ stdcall TpReleaseCleanupGroup(ptr) @ stdcall TpReleaseCleanupGroupMembers(ptr long ptr) @ stdcall TpReleasePool(ptr) @@ -1078,6 +1079,7 @@ @ stdcall TpReleaseWork(ptr) @ stdcall TpSetPoolMaxThreads(ptr long) @ stdcall TpSetPoolMinThreads(ptr long) +@ stdcall TpSetPoolStackInformation(ptr ptr) @ stdcall TpSetTimer(ptr ptr long long) @ stdcall TpSetWait(ptr long ptr) @ stdcall TpSimpleTryPost(ptr ptr ptr) diff --git a/dlls/ntdll/tests/threadpool.c b/dlls/ntdll/tests/threadpool.c index bf5493cac0..912a77b82a 100644 --- a/dlls/ntdll/tests/threadpool.c +++ b/dlls/ntdll/tests/threadpool.c @@ -30,6 +30,7 @@ static NTSTATUS (WINAPI *pTpCallbackMayRunLong)(TP_CALLBACK_INSTANCE *); static VOID (WINAPI *pTpCallbackReleaseSemaphoreOnCompletion)(TP_CALLBACK_INSTANCE *,HANDLE,DWORD); static VOID (WINAPI *pTpDisassociateCallback)(TP_CALLBACK_INSTANCE *); static BOOL (WINAPI *pTpIsTimerSet)(TP_TIMER *); +static NTSTATUS (WINAPI *pTpQueryPoolStackInformation)(TP_POOL *, TP_POOL_STACK_INFORMATION *info); static VOID (WINAPI *pTpReleaseWait)(TP_WAIT *); static VOID (WINAPI *pTpPostWork)(TP_WORK *); static VOID (WINAPI *pTpReleaseCleanupGroup)(TP_CLEANUP_GROUP *); @@ -37,6 +38,7 @@ static VOID (WINAPI *pTpReleaseCleanupGroupMembers)(TP_CLEANUP_GROUP *,BOOL, static VOID (WINAPI *pTpReleasePool)(TP_POOL *); static VOID (WINAPI *pTpReleaseTimer)(TP_TIMER *); static VOID (WINAPI *pTpReleaseWork)(TP_WORK *); +static NTSTATUS (WINAPI *pTpSetPoolStackInformation)(TP_POOL *, TP_POOL_STACK_INFORMATION *info); static VOID (WINAPI *pTpSetPoolMaxThreads)(TP_POOL *,DWORD); static VOID (WINAPI *pTpSetTimer)(TP_TIMER *,LARGE_INTEGER *,LONG,LONG); static VOID (WINAPI *pTpSetWait)(TP_WAIT *,HANDLE,LARGE_INTEGER *); @@ -72,12 +74,14 @@ static BOOL init_threadpool(void) NTDLL_GET_PROC(TpDisassociateCallback); NTDLL_GET_PROC(TpIsTimerSet); NTDLL_GET_PROC(TpPostWork); + NTDLL_GET_PROC(TpQueryPoolStackInformation); NTDLL_GET_PROC(TpReleaseCleanupGroup); NTDLL_GET_PROC(TpReleaseCleanupGroupMembers); NTDLL_GET_PROC(TpReleasePool); NTDLL_GET_PROC(TpReleaseTimer); NTDLL_GET_PROC(TpReleaseWait); NTDLL_GET_PROC(TpReleaseWork); + NTDLL_GET_PROC(TpSetPoolStackInformation); NTDLL_GET_PROC(TpSetPoolMaxThreads); NTDLL_GET_PROC(TpSetTimer); NTDLL_GET_PROC(TpSetWait); @@ -601,6 +605,7 @@ static void CALLBACK work2_cb(TP_CALLBACK_INSTANCE *instance, void *userdata, TP static void test_tp_work(void) { + TP_POOL_STACK_INFORMATION stack_info, stack_info2; TP_CALLBACK_ENVIRON environment; TP_WORK *work; TP_POOL *pool; @@ -615,6 +620,33 @@ static void test_tp_work(void) ok(pool != NULL, "expected pool != NULL\n"); pTpSetPoolMaxThreads(pool, 1); + if (pTpQueryPoolStackInformation) + { + status = pTpQueryPoolStackInformation(pool, NULL); + ok(status == STATUS_INVALID_PARAMETER, "Unexpected status %#x.\n", status); + + status = pTpSetPoolStackInformation(pool, NULL); + ok(status == STATUS_INVALID_PARAMETER, "Unexpected status %#x.\n", status); + + status = pTpQueryPoolStackInformation(pool, &stack_info); + ok(!status, "Failed to get stack information, status %#x.\n", status); + ok(stack_info.StackReserve > 0 && stack_info.StackCommit > 0, "Unexpected stack info.\n"); + + stack_info2.StackReserve = 0; + stack_info2.StackCommit = 0; + status = pTpSetPoolStackInformation(pool, &stack_info2); + ok(!status, "Failed to get stack information, status %#x.\n", status); + + memset(&stack_info2, 0xcc, sizeof(stack_info2)); + status = pTpQueryPoolStackInformation(pool, &stack_info2); + ok(!status, "Failed to get stack information, status %#x.\n", status); + ok(!stack_info2.StackReserve && !stack_info2.StackCommit, "Unexpected stack info.\n"); + + /* Restore to original default values. */ + status = pTpSetPoolStackInformation(pool, &stack_info); + ok(!status, "Failed to get stack information, status %#x.\n", status); + } + /* allocate new work item */ work = NULL; memset(&environment, 0, sizeof(environment)); diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index a7ad321a8b..b7a096f981 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -131,6 +131,7 @@ struct threadpool int min_workers; int num_workers; int num_busy_workers; + TP_POOL_STACK_INFORMATION stack_info; }; enum threadpool_objtype @@ -1648,6 +1649,7 @@ static void tp_waitqueue_unlock( struct threadpool_object *wait ) */ static NTSTATUS tp_threadpool_alloc( struct threadpool **out ) { + IMAGE_NT_HEADERS *nt = RtlImageNtHeader( NtCurrentTeb()->Peb->ImageBaseAddress ); struct threadpool *pool; unsigned int i; @@ -1666,10 +1668,12 @@ static NTSTATUS tp_threadpool_alloc( struct threadpool **out ) list_init( &pool->pools[i] ); RtlInitializeConditionVariable( &pool->update_event ); - pool->max_workers = 500; - pool->min_workers = 0; - pool->num_workers = 0; - pool->num_busy_workers = 0; + pool->max_workers = 500; + pool->min_workers = 0; + pool->num_workers = 0; + pool->num_busy_workers = 0; + pool->stack_info.StackReserve = nt->OptionalHeader.SizeOfStackReserve; + pool->stack_info.StackCommit = nt->OptionalHeader.SizeOfStackCommit; TRACE( "allocated threadpool %p\n", pool ); @@ -2989,3 +2993,41 @@ VOID WINAPI TpWaitForWork( TP_WORK *work, BOOL cancel_pending ) tp_object_cancel( this ); tp_object_wait( this, FALSE ); } + +/*********************************************************************** + * TpSetPoolStackInformation (NTDLL.@) + */ +NTSTATUS WINAPI TpSetPoolStackInformation( TP_POOL *pool, TP_POOL_STACK_INFORMATION *stack_info ) +{ + struct threadpool *this = impl_from_TP_POOL( pool ); + + TRACE( "%p %p\n", pool, stack_info ); + + if (!stack_info) + return STATUS_INVALID_PARAMETER; + + RtlEnterCriticalSection( &this->cs ); + this->stack_info = *stack_info; + RtlLeaveCriticalSection( &this->cs ); + + return STATUS_SUCCESS; +} + +/*********************************************************************** + * TpQueryPoolStackInformation (NTDLL.@) + */ +NTSTATUS WINAPI TpQueryPoolStackInformation( TP_POOL *pool, TP_POOL_STACK_INFORMATION *stack_info ) +{ + struct threadpool *this = impl_from_TP_POOL( pool ); + + TRACE( "%p %p\n", pool, stack_info ); + + if (!stack_info) + return STATUS_INVALID_PARAMETER; + + RtlEnterCriticalSection( &this->cs ); + *stack_info = this->stack_info; + RtlLeaveCriticalSection( &this->cs ); + + return STATUS_SUCCESS; +} diff --git a/include/winternl.h b/include/winternl.h index ea6707714d..5298eaa0f7 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3021,6 +3021,7 @@ NTSYSAPI void WINAPI TpCallbackUnloadDllOnCompletion(TP_CALLBACK_INSTANCE * NTSYSAPI void WINAPI TpDisassociateCallback(TP_CALLBACK_INSTANCE *); NTSYSAPI BOOL WINAPI TpIsTimerSet(TP_TIMER *); NTSYSAPI void WINAPI TpPostWork(TP_WORK *); +NTSYSAPI NTSTATUS WINAPI TpQueryPoolStackInformation(TP_POOL *, TP_POOL_STACK_INFORMATION *stack_info); NTSYSAPI void WINAPI TpReleaseCleanupGroup(TP_CLEANUP_GROUP *); NTSYSAPI void WINAPI TpReleaseCleanupGroupMembers(TP_CLEANUP_GROUP *,BOOL,PVOID); NTSYSAPI void WINAPI TpReleasePool(TP_POOL *); @@ -3029,6 +3030,7 @@ NTSYSAPI void WINAPI TpReleaseWait(TP_WAIT *); NTSYSAPI void WINAPI TpReleaseWork(TP_WORK *); NTSYSAPI void WINAPI TpSetPoolMaxThreads(TP_POOL *,DWORD); NTSYSAPI BOOL WINAPI TpSetPoolMinThreads(TP_POOL *,DWORD); +NTSYSAPI NTSTATUS WINAPI TpSetPoolStackInformation(TP_POOL *, TP_POOL_STACK_INFORMATION *stack_info); NTSYSAPI void WINAPI TpSetTimer(TP_TIMER *, LARGE_INTEGER *,LONG,LONG); NTSYSAPI void WINAPI TpSetWait(TP_WAIT *,HANDLE,LARGE_INTEGER *); NTSYSAPI NTSTATUS WINAPI TpSimpleTryPost(PTP_SIMPLE_CALLBACK,PVOID,TP_CALLBACK_ENVIRON *); -- 2.25.0

4 8