wine-devel

wine-devel@winehq.org

8 participants
84486 discussions

[PATCH] httpapi/tests: Avoid some test failures with newer Windows 10.
by Zebediah Figura 26 Dec '20

26 Dec '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/httpapi/tests/httpapi.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/httpapi/tests/httpapi.c b/dlls/httpapi/tests/httpapi.c index 5d79197505c..1d1ad56e9f6 100644 --- a/dlls/httpapi/tests/httpapi.c +++ b/dlls/httpapi/tests/httpapi.c @@ -304,7 +304,7 @@ static void test_v1_server(void) ok(req->BytesReceived == strlen(req_text), "Got %s bytes.\n", wine_dbgstr_longlong(req->BytesReceived)); ok(!req->EntityChunkCount, "Got %u entity chunks.\n", req->EntityChunkCount); ok(!req->pEntityChunks, "Got entity chunks %p.\n", req->pEntityChunks); - ok(!req->RawConnectionId, "Got SSL connection ID %s.\n", wine_dbgstr_longlong(req->RawConnectionId)); + /* req->RawConnectionId is zero until Win10 2004. */ ok(!req->pSslInfo, "Got SSL info %p.\n", req->pSslInfo); response.StatusCode = 418; @@ -1372,10 +1372,9 @@ static void test_v2_server(void) ok(req->BytesReceived == strlen(req_text), "Got %s bytes.\n", wine_dbgstr_longlong(req->BytesReceived)); ok(!req->EntityChunkCount, "Got %u entity chunks.\n", req->EntityChunkCount); ok(!req->pEntityChunks, "Got entity chunks %p.\n", req->pEntityChunks); - ok(!req->RawConnectionId, "Got SSL connection ID %s.\n", wine_dbgstr_longlong(req->RawConnectionId)); + /* req->RawConnectionId is zero until Win10 2004. */ ok(!req->pSslInfo, "Got SSL info %p.\n", req->pSslInfo); - ok(!reqv2->RequestInfoCount, "Got request info count %u.\n", reqv2->RequestInfoCount); - ok(!reqv2->pRequestInfo, "Got request info %p.\n", reqv2->pRequestInfo); + /* RequestInfoCount and pRequestInfo are zero until Win10 1909. */ response.s.StatusCode = 418; response.s.pReason = "I'm a teapot"; -- 2.29.2

1 0

[PATCH] msscript.ocx/tests: Use wide-char string literals.
by Michael Stefaniuc 26 Dec '20

26 Dec '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msscript.ocx/tests/msscript.c | 47 ++++++++++++------------------ 1 file changed, 18 insertions(+), 29 deletions(-) diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 4f43764234c..756c21d887b 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -34,7 +34,6 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); #define TESTSCRIPT_CLSID "{178fc164-f585-4e24-9c13-4bb7faf80746}" static const GUID CLSID_TestScript = {0x178fc164,0xf585,0x4e24,{0x9c,0x13,0x4b,0xb7,0xfa,0xf8,0x07,0x46}}; -static const WCHAR vbW[] = {'V','B','S','c','r','i','p','t',0}; #ifdef _WIN64 @@ -1371,9 +1370,6 @@ static void test_olecontrol(void) static void test_Language(void) { - static const WCHAR jsW[] = {'J','S','c','r','i','p','t',0}; - static const WCHAR vb2W[] = {'v','B','s','c','r','i','p','t',0}; - static const WCHAR dummyW[] = {'d','u','m','m','y',0}; IScriptControl *sc; HRESULT hr; BSTR str; @@ -1390,39 +1386,39 @@ static void test_Language(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(str == NULL, "got %s\n", wine_dbgstr_w(str)); - str = SysAllocString(vbW); + str = SysAllocString(L"VBScript"); hr = IScriptControl_put_Language(sc, str); ok(hr == S_OK, "got 0x%08x\n", hr); SysFreeString(str); - str = SysAllocString(vb2W); + str = SysAllocString(L"vBscript"); hr = IScriptControl_put_Language(sc, str); ok(hr == S_OK, "got 0x%08x\n", hr); SysFreeString(str); hr = IScriptControl_get_Language(sc, &str); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(!lstrcmpW(str, vbW), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, L"VBScript"), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); - str = SysAllocString(dummyW); + str = SysAllocString(L"dummy"); hr = IScriptControl_put_Language(sc, str); ok(hr == CTL_E_INVALIDPROPERTYVALUE, "got 0x%08x\n", hr); SysFreeString(str); hr = IScriptControl_get_Language(sc, &str); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(!lstrcmpW(str, vbW), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, L"VBScript"), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); - str = SysAllocString(jsW); + str = SysAllocString(L"JScript"); hr = IScriptControl_put_Language(sc, str); ok(hr == S_OK, "got 0x%08x\n", hr); SysFreeString(str); hr = IScriptControl_get_Language(sc, &str); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(!lstrcmpW(str, jsW), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, L"JScript"), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); hr = IScriptControl_put_Language(sc, NULL); @@ -1436,8 +1432,6 @@ static void test_Language(void) /* custom script engine */ if (have_custom_engine) { - static const WCHAR testscriptW[] = {'t','e','s','t','s','c','r','i','p','t',0}; - hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IScriptControl, (void**)&sc); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -1448,7 +1442,7 @@ static void test_Language(void) SET_EXPECT(QI_IActiveScriptParse); SET_EXPECT(InitNew); - str = SysAllocString(testscriptW); + str = SysAllocString(L"testscript"); hr = IScriptControl_put_Language(sc, str); ok(hr == S_OK, "got 0x%08x\n", hr); SysFreeString(str); @@ -1462,7 +1456,7 @@ static void test_Language(void) todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); if (hr == S_OK) - ok(!lstrcmpW(testscriptW, str), "%s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(L"testscript", str), "%s\n", wine_dbgstr_w(str)); SysFreeString(str); IActiveScriptSite_Release(site); @@ -1687,7 +1681,7 @@ static void test_timeout(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(val == 0, "got %d\n", val); - str = SysAllocString(vbW); + str = SysAllocString(L"VBScript"); hr = IScriptControl_put_Language(sc, str); ok(hr == S_OK, "got 0x%08x\n", hr); SysFreeString(str); @@ -1716,7 +1710,7 @@ static void test_Reset(void) hr = IScriptControl_Reset(sc); ok(hr == E_FAIL, "got 0x%08x\n", hr); - str = SysAllocString(vbW); + str = SysAllocString(L"VBScript"); hr = IScriptControl_put_Language(sc, str); ok(hr == S_OK, "got 0x%08x\n", hr); SysFreeString(str); @@ -1726,15 +1720,13 @@ static void test_Reset(void) hr = IScriptControl_get_Language(sc, &str); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(!lstrcmpW(str, vbW), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, L"VBScript"), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); IScriptControl_Release(sc); /* custom script engine */ if (have_custom_engine) { - static const WCHAR testscriptW[] = {'t','e','s','t','s','c','r','i','p','t',0}; - hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IScriptControl, (void**)&sc); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -1745,7 +1737,7 @@ static void test_Reset(void) SET_EXPECT(QI_IActiveScriptParse); SET_EXPECT(InitNew); - str = SysAllocString(testscriptW); + str = SysAllocString(L"testscript"); hr = IScriptControl_put_Language(sc, str); ok(hr == S_OK, "got 0x%08x\n", hr); SysFreeString(str); @@ -1833,7 +1825,6 @@ static IDispatch testdisp = { &dispvtbl }; static void test_AddObject(void) { - static const WCHAR oW[] = {'o',0}; IScriptControl *sc; BSTR str, objname; HRESULT hr; @@ -1842,14 +1833,14 @@ static void test_AddObject(void) &IID_IScriptControl, (void**)&sc); ok(hr == S_OK, "got 0x%08x\n", hr); - objname = SysAllocString(oW); + objname = SysAllocString(L"o"); hr = IScriptControl_AddObject(sc, objname, NULL, VARIANT_FALSE); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); hr = IScriptControl_AddObject(sc, objname, &testdisp, VARIANT_FALSE); ok(hr == E_FAIL, "got 0x%08x\n", hr); - str = SysAllocString(vbW); + str = SysAllocString(L"VBScript"); hr = IScriptControl_put_Language(sc, str); ok(hr == S_OK, "got 0x%08x\n", hr); SysFreeString(str); @@ -1867,8 +1858,6 @@ static void test_AddObject(void) /* custom script engine */ if (have_custom_engine) { - static const WCHAR testscriptW[] = {'t','e','s','t','s','c','r','i','p','t',0}; - hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IScriptControl, (void**)&sc); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -1879,7 +1868,7 @@ static void test_AddObject(void) SET_EXPECT(QI_IActiveScriptParse); SET_EXPECT(InitNew); - str = SysAllocString(testscriptW); + str = SysAllocString(L"testscript"); hr = IScriptControl_put_Language(sc, str); ok(hr == S_OK, "got 0x%08x\n", hr); SysFreeString(str); @@ -2122,7 +2111,7 @@ static void test_UseSafeSubset(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(use_safe_subset == VARIANT_TRUE, "got %d\n", use_safe_subset); - str = SysAllocString(vbW); + str = SysAllocString(L"VBScript"); hr = IScriptControl_put_Language(sc, str); ok(hr == S_OK, "got 0x%08x\n", hr); SysFreeString(str); @@ -2239,7 +2228,7 @@ static void test_State(void) hr = IScriptControl_put_State(sc, Connected); ok(hr == E_FAIL, "got 0x%08x\n", hr); - str = SysAllocString(vbW); + str = SysAllocString(L"VBScript"); hr = IScriptControl_put_Language(sc, str); ok(hr == S_OK, "got 0x%08x\n", hr); SysFreeString(str); -- 2.26.2

1 0

TestBot news
by Francois Gouget 26 Dec '20

26 Dec '20

Summary: * New w1064 VM with all Windows 10 fall releases. * Rebuilt w7u VM with dual-screen and some languages. * Cleaned up wvista VM. * The cw-rx460 Linux results are back. * The vm3 SSD died, will be replaced soon. * Test PCI-passthrough VM on the development TestBot. w1064 ----- This is essentially the same as the w10pro64 VM but with test configurations for 1507, 1607, 1709, 1809, 1909 and the latest 2009. The goal is to spread the testing load across two VM hosts. So w10pro64 will handle all (or most of) the languages, while w1064 will handle the older Windows 10 releases and a few extra configurations like dual-screen and test without elevated privileges (not yet present), etc. I will try to update w10pro64 to the latest spring Windows releases while I will keep adding fall releases to w1064. So they should each get updated once a year. w7u --- I rebuilt this VM from scratch to get it on more recent QEMu virtual hardware; and only kept the latest configuration. Here is the base configuration summary: [CPU:2*IvyBridge-IBRS RAM:2GB disk:scsi-unmap eth:e1000-metered snd:ich9 GPU:vga display:spice virtio:0.1.185 testagentd:1.8] The most annoying part is getting Windows Update to work because the servers now require SHA2 but Windows 7 does not support it out of the box. So I had to find and manually install the right KB fix to get it going. Then Windows Update ran out of memory so I installed another KB fix so it would just take forever to install a measly ~160 updates. So to summarize I installed SP1 manually, added KB4474419 to add SHA2 support, KB3050265 to prevent Windows Update from running out of memory, KB2852386 to get winsxs disk cleanup options, and finally installed all updates up to 2020-11-25. Then I added a dual screen test configuration, a non-elevated privileges configuration and a few European languages. I avoided languages with tricky scripts because I was not sure if Windows 7 would support them right (Vista does not). And I decided to pick a set that does not overlap with the ones the Windows 10 VM is already testing. Let me know if you need a different set of languages. wvista ------ I flattened all the snapshots to only keep the latest version, that is all updates up to 2014-04-21. Note that Vista runs into the same Windows Update issue as Windows 7: SHA2 support is required by the servers. But there's no way to get SHA2 support on Vista which means Vista has no Windows Update support at all. I also tweaked the hardware configuration and updated the QEmu drivers. [CPU:1*SandyBridge-IBRS RAM:2GB disk:scsi-unmap eth:e1000 snd:ac97 GPU:vga display:spice virtio:0.1.185 testagentd:1.8] The new configuration seems to be working pretty well except for test_driver4() in ntoskrnl.exe:ntoskrnl which crashes Vista. So I only run WineTest without elevated privileges which forces a skip of that test. But you can still run the tests with elevated privileges if you manually submit a job. cw-rx460 Linux results ---------------------- cw-rx460 is not a TestBot VM but does run WineTest daily and has the advantage of running on real hardware. For a long time it failed to reliably submit WineTest results. Now it works again (the issue was in the wt-bot script). vm3 SSD ------- The SSD of the vm3 host died last week so I moved its VMs to vm1 and vm4. That's part of why the TestBot was slow at the start of the week. The other reasons are: * The Debian VM which is bloated and which I'm working on updating with a new libX11, * The couple older Debian configurations which I removed. * Too many VMs on vm1 (I moved some to vm4). vm4's SSD is also on the brink of death according to smartctl so they'll both get new and bigger SSDs soon. PCI-passthrough --------------- I also set up a new Windows 10 Pro VM on my development TestBot environment and added a configuration with an RX550 graphics card to it using PCI-passthrough. That seems to be working [1] so far, by which I mostly mean that besides actually running its TestBot tasks the graphics card has not locked up and required a host reboot yet. What's annoying is that this VM crashes when it runs ntdll:exception so which prevents it from submitting its test results. That is however totally unrelated to the RX550 since it also happens with QEmu's built-in vga graphics card (a test configuration which has never seen the RX550 in any shape or form). Another thing that's missing is support for screenshots but I figure that can come later (it would be great if someone wanted to tackle bug 44709). There are many PCI-passthrough recipes online, but here's mine, just for adding the passthrough to an existing Windows VM (i.e. it assumes you've configured the host already): * While still using QEmu's built-in vga card, install TightVNC (or equivalent). I prefer to avoid Windows' RDP because that uses a separate desktop with its own graphics driver, changes the resolution, and disables sound. All that means I wouldn't really know what's going on with the actual graphics card. * Then power off and virsh edit to: - replace the <domain...> line with <domain type='kvm' xmlns:qemu='http://libvirt.org/schemas/domain/qemu/1.0'> - add these lines before the closing </domain> (in fact it's likely fine anywhere) <qemu:commandline> <qemu:arg value='-set'/> <qemu:arg value='device.hostdev0.x-vga=on'/> </qemu:commandline> * Remove the Display (Spice), Video (VGA), Tablet (USB|Virtio), and Sound (ich9) devices. Add the graphics card's two PCI devices (GPU + audio). * Boot up, connect using VNC, install the graphics driver, reboot again. * All done. [1] One side effect is that whenever the RX550 configuration powers up it messes the colors of my desktop, as if it switched some palette. Fortunately all I have to do is to switch the focus to another window to fix it so I'm just putting up with it. -- Francois Gouget <fgouget(a)codeweavers.com>

1 3

[PATCH] winegstreamer: Split audio data to fit in the sample buffer.
by Anton Baskanov 24 Dec '20

24 Dec '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50355 Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- dlls/winegstreamer/gstdemux.c | 142 +++++++++++++++++++++------------- 1 file changed, 88 insertions(+), 54 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 9114e6610a3..8a9c0a84191 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -81,6 +81,7 @@ struct gstdemux_source HANDLE caps_event, eos_event; GstSegment *segment; SourceSeeking seek; + DWORD bytes_per_second; }; static inline struct gstdemux *impl_from_strmbase_filter(struct strmbase_filter *iface) @@ -801,6 +802,7 @@ static GstFlowReturn got_data_sink(GstPad *pad, GstObject *parent, GstBuffer *bu BYTE *ptr = NULL; IMediaSample *sample; GstMapInfo info; + gsize position = 0; TRACE("%p %p\n", pad, buf); @@ -809,76 +811,106 @@ static GstFlowReturn got_data_sink(GstPad *pad, GstObject *parent, GstBuffer *bu return GST_FLOW_OK; } - hr = BaseOutputPinImpl_GetDeliveryBuffer(&pin->pin, &sample, NULL, NULL, 0); - - if (hr == VFW_E_NOT_CONNECTED) { - gst_buffer_unref(buf); - return GST_FLOW_NOT_LINKED; - } + gst_buffer_map(buf, &info, GST_MAP_READ); - if (FAILED(hr)) { - gst_buffer_unref(buf); - ERR("Could not get a delivery buffer (%x), returning GST_FLOW_FLUSHING\n", hr); - return GST_FLOW_FLUSHING; - } + while (position < info.size) + { + gsize advance; - gst_buffer_map(buf, &info, GST_MAP_READ); + hr = BaseOutputPinImpl_GetDeliveryBuffer(&pin->pin, &sample, NULL, NULL, 0); - hr = IMediaSample_SetActualDataLength(sample, info.size); - if(FAILED(hr)){ - WARN("SetActualDataLength failed: %08x\n", hr); - return GST_FLOW_FLUSHING; - } + if (hr == VFW_E_NOT_CONNECTED) { + gst_buffer_unmap(buf, &info); + gst_buffer_unref(buf); + return GST_FLOW_NOT_LINKED; + } - IMediaSample_GetPointer(sample, &ptr); + if (FAILED(hr)) { + gst_buffer_unmap(buf, &info); + gst_buffer_unref(buf); + ERR("Could not get a delivery buffer (%x), returning GST_FLOW_FLUSHING\n", hr); + return GST_FLOW_FLUSHING; + } - memcpy(ptr, info.data, info.size); + advance = min(IMediaSample_GetSize(sample), info.size - position); - gst_buffer_unmap(buf, &info); + hr = IMediaSample_SetActualDataLength(sample, advance); + if(FAILED(hr)){ + gst_buffer_unmap(buf, &info); + gst_buffer_unref(buf); + WARN("SetActualDataLength failed: %08x\n", hr); + return GST_FLOW_FLUSHING; + } - if (GST_BUFFER_PTS_IS_VALID(buf)) { - REFERENCE_TIME rtStart = gst_segment_to_running_time(pin->segment, GST_FORMAT_TIME, buf->pts); - if (rtStart >= 0) - rtStart /= 100; - - if (GST_BUFFER_DURATION_IS_VALID(buf)) { - REFERENCE_TIME tStart = buf->pts / 100; - REFERENCE_TIME tStop = (buf->pts + buf->duration) / 100; - REFERENCE_TIME rtStop; - rtStop = gst_segment_to_running_time(pin->segment, GST_FORMAT_TIME, buf->pts + buf->duration); - if (rtStop >= 0) - rtStop /= 100; - TRACE("Current time on %p: %i to %i ms\n", pin, (int)(rtStart / 10000), (int)(rtStop / 10000)); - IMediaSample_SetTime(sample, &rtStart, rtStop >= 0 ? &rtStop : NULL); - IMediaSample_SetMediaTime(sample, &tStart, &tStop); + IMediaSample_GetPointer(sample, &ptr); + + memcpy(ptr, &info.data[position], advance); + + if (GST_BUFFER_PTS_IS_VALID(buf)) { + REFERENCE_TIME rtStart; + GstClockTime ptsStart = buf->pts; + if (position > 0 && pin->bytes_per_second) + ptsStart = buf->pts + gst_util_uint64_scale(position, GST_SECOND, pin->bytes_per_second); + rtStart = gst_segment_to_running_time(pin->segment, GST_FORMAT_TIME, ptsStart); + if (rtStart >= 0) + rtStart /= 100; + + if (GST_BUFFER_DURATION_IS_VALID(buf)) { + REFERENCE_TIME rtStop; + REFERENCE_TIME tStart; + REFERENCE_TIME tStop; + GstClockTime ptsStop = buf->pts + buf->duration; + if (position + advance < info.size && pin->bytes_per_second) + ptsStop = buf->pts + gst_util_uint64_scale(position + advance, GST_SECOND, pin->bytes_per_second); + tStart = ptsStart / 100; + tStop = ptsStop / 100; + rtStop = gst_segment_to_running_time(pin->segment, GST_FORMAT_TIME, ptsStop); + if (rtStop >= 0) + rtStop /= 100; + TRACE("Current time on %p: %i to %i ms\n", pin, (int)(rtStart / 10000), (int)(rtStop / 10000)); + IMediaSample_SetTime(sample, &rtStart, rtStop >= 0 ? &rtStop : NULL); + IMediaSample_SetMediaTime(sample, &tStart, &tStop); + } else { + IMediaSample_SetTime(sample, rtStart >= 0 ? &rtStart : NULL, NULL); + IMediaSample_SetMediaTime(sample, NULL, NULL); + } } else { - IMediaSample_SetTime(sample, rtStart >= 0 ? &rtStart : NULL, NULL); + IMediaSample_SetTime(sample, NULL, NULL); IMediaSample_SetMediaTime(sample, NULL, NULL); } - } else { - IMediaSample_SetTime(sample, NULL, NULL); - IMediaSample_SetMediaTime(sample, NULL, NULL); - } - IMediaSample_SetDiscontinuity(sample, GST_BUFFER_FLAG_IS_SET(buf, GST_BUFFER_FLAG_DISCONT)); - IMediaSample_SetPreroll(sample, GST_BUFFER_FLAG_IS_SET(buf, GST_BUFFER_FLAG_LIVE)); - IMediaSample_SetSyncPoint(sample, !GST_BUFFER_FLAG_IS_SET(buf, GST_BUFFER_FLAG_DELTA_UNIT)); + IMediaSample_SetDiscontinuity(sample, GST_BUFFER_FLAG_IS_SET(buf, GST_BUFFER_FLAG_DISCONT)); + IMediaSample_SetPreroll(sample, GST_BUFFER_FLAG_IS_SET(buf, GST_BUFFER_FLAG_LIVE)); + IMediaSample_SetSyncPoint(sample, !GST_BUFFER_FLAG_IS_SET(buf, GST_BUFFER_FLAG_DELTA_UNIT)); - if (!pin->pin.pin.peer) - hr = VFW_E_NOT_CONNECTED; - else - hr = IMemInputPin_Receive(pin->pin.pMemInputPin, sample); + if (!pin->pin.pin.peer) + hr = VFW_E_NOT_CONNECTED; + else + hr = IMemInputPin_Receive(pin->pin.pMemInputPin, sample); - TRACE("sending sample returned: %08x\n", hr); + TRACE("sending sample returned: %08x\n", hr); - gst_buffer_unref(buf); - IMediaSample_Release(sample); + IMediaSample_Release(sample); - if (hr == VFW_E_NOT_CONNECTED) - return GST_FLOW_NOT_LINKED; + if (hr == VFW_E_NOT_CONNECTED) + { + gst_buffer_unmap(buf, &info); + gst_buffer_unref(buf); + return GST_FLOW_NOT_LINKED; + } - if (FAILED(hr)) - return GST_FLOW_FLUSHING; + if (FAILED(hr)) + { + gst_buffer_unmap(buf, &info); + gst_buffer_unref(buf); + return GST_FLOW_FLUSHING; + } + + position += advance; + } + + gst_buffer_unmap(buf, &info); + gst_buffer_unref(buf); return GST_FLOW_OK; } @@ -2104,6 +2136,8 @@ static HRESULT WINAPI GSTOutPin_DecideBufferSize(struct strmbase_source *iface, { WAVEFORMATEX *format = (WAVEFORMATEX *)pin->pin.pin.mt.pbFormat; buffer_size = format->nAvgBytesPerSec; + + pin->bytes_per_second = format->nAvgBytesPerSec; } props->cBuffers = max(props->cBuffers, 1); -- 2.25.1

1 0

[PATCH v2] comctl32/tests: add test for getting listview data during sorting.
by Jiangyi Chen 24 Dec '20

24 Dec '20

3 2

[PATCH] comdlg32: The app might strcmp api filter.
by longchao＠uniontech.com 24 Dec '20

24 Dec '20

2 1

[PATCH] d3dx9: Avoid closing invalid handles.
by Akihiro Sagawa 23 Dec '20

23 Dec '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50373 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/d3dx9_36/util.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)

3 4

[PATCH 1/3] shell32/tests: Remove no longer used parameter.
by Dmitry Timoshkov 23 Dec '20

23 Dec '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/shell32/tests/shell32_test.h | 4 ++-- dlls/shell32/tests/shelllink.c | 23 +++++++++++------------ dlls/shell32/tests/shlexec.c | 4 ++-- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/shell32/tests/shell32_test.h b/dlls/shell32/tests/shell32_test.h index 42a74fb2d5..89d08e70c0 100644 --- a/dlls/shell32/tests/shell32_test.h +++ b/dlls/shell32/tests/shell32_test.h @@ -33,5 +33,5 @@ typedef struct WORD hotkey; } lnk_desc_t; -#define create_lnk(a,b,c) create_lnk_(__LINE__, (a), (b), (c)) -void create_lnk_(int,const WCHAR*,lnk_desc_t*,int); +#define create_lnk(a,b) create_lnk_(__LINE__, (a), (b)) +void create_lnk_(int,const WCHAR*,lnk_desc_t*); diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index e4f176237f..4f650d801d 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -386,7 +386,7 @@ static void test_get_set(void) #define lok ok_(__FILE__, line) #define check_lnk(a,b,c) check_lnk_(__LINE__, (a), (b), (c)) -void create_lnk_(int line, const WCHAR* path, lnk_desc_t* desc, int save_fails) +void create_lnk_(int line, const WCHAR* path, lnk_desc_t* desc) { HRESULT r; IShellLinkA *sl; @@ -460,8 +460,7 @@ void create_lnk_(int line, const WCHAR* path, lnk_desc_t* desc, int save_fails) lok(str == NULL, "got %p\n", str); r = IPersistFile_Save(pf, path, TRUE); - todo_wine_if (save_fails) - lok(r == S_OK, "save failed (0x%08x)\n", r); + lok(r == S_OK, "save failed (0x%08x)\n", r); /* test GetCurFile after ::Save */ r = IPersistFile_GetCurFile(pf, &str); @@ -628,7 +627,7 @@ static void test_load_save(void) /* Save an empty .lnk file */ memset(&desc, 0, sizeof(desc)); - create_lnk(lnkfile, &desc, 0); + create_lnk(lnkfile, &desc); /* It should come back as a bunch of empty strings */ desc.description=""; @@ -648,7 +647,7 @@ static void test_load_save(void) desc.icon="c:\\nonexistent\\icon\\file"; desc.icon_id=1234; desc.hotkey=0; - create_lnk(lnkfile, &desc, 0); + create_lnk(lnkfile, &desc); check_lnk(lnkfile, &desc, 0x0); r=GetModuleFileNameA(NULL, mypath, sizeof(mypath)); @@ -672,7 +671,7 @@ static void test_load_save(void) desc.icon=mypath; desc.icon_id=0; desc.hotkey=0x1234; - create_lnk(lnkfile, &desc, 0); + create_lnk(lnkfile, &desc); check_lnk(lnkfile, &desc, 0x0); /* Test omitting .exe from an absolute path */ @@ -689,7 +688,7 @@ static void test_load_save(void) desc.icon=mypath; desc.icon_id=0; desc.hotkey=0x1234; - create_lnk(lnkfile, &desc, 0); + create_lnk(lnkfile, &desc); strcat(realpath, ".exe"); check_lnk(lnkfile, &desc, 0x4); @@ -703,7 +702,7 @@ static void test_load_save(void) desc.icon=mypath; desc.icon_id=0; desc.hotkey=0x1234; - create_lnk(lnkfile, &desc, 0); + create_lnk(lnkfile, &desc); /* Check that link is created to proper location */ SearchPathA( NULL, desc.path, NULL, MAX_PATH, realpath, NULL); desc.path=realpath; @@ -719,7 +718,7 @@ static void test_load_save(void) desc.icon=mypath; desc.icon_id=0; desc.hotkey=0x1234; - create_lnk(lnkfile, &desc, 0); + create_lnk(lnkfile, &desc); /* Check that link is created to proper location */ SearchPathA( NULL, "rundll32", NULL, MAX_PATH, realpath, NULL); desc.path=realpath; @@ -750,7 +749,7 @@ static void test_load_save(void) desc.icon=mypath; desc.icon_id=0; desc.hotkey=0x1234; - create_lnk(lnkfile, &desc, 0); + create_lnk(lnkfile, &desc); check_lnk(lnkfile, &desc, 0x0); r = GetShortPathNameA(mydir, mypath, sizeof(mypath)); @@ -770,7 +769,7 @@ static void test_load_save(void) desc.icon=mypath; desc.icon_id=0; desc.hotkey=0x1234; - create_lnk(lnkfile, &desc, 0); + create_lnk(lnkfile, &desc); desc.path=realpath; check_lnk(lnkfile, &desc, 0x0); @@ -800,7 +799,7 @@ static void test_load_save(void) desc.icon=mypath; desc.icon_id=0; desc.hotkey=0x1234; - create_lnk(lnkfile, &desc, 0); + create_lnk(lnkfile, &desc); desc.path = realpath; check_lnk(lnkfile, &desc, 0x4); diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 8ee662321d..2481fb6faa 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -2742,7 +2742,7 @@ static void init_test(void) desc.icon=NULL; desc.icon_id=0; desc.hotkey=0; - create_lnk(lnkfile, &desc, 0); + create_lnk(lnkfile, &desc); sprintf(filename, "%s\\test_shortcut_exe.lnk", tmpdir); MultiByteToWideChar(CP_ACP, 0, filename, -1, lnkfile, ARRAY_SIZE(lnkfile)); @@ -2756,7 +2756,7 @@ static void init_test(void) desc.icon=NULL; desc.icon_id=0; desc.hotkey=0; - create_lnk(lnkfile, &desc, 0); + create_lnk(lnkfile, &desc); /* Create a basic association suitable for most tests */ if (!create_test_association(".shlexec")) -- 2.29.2

2 2

[PATCH 3/3] shell32: IPersistFile::Save(NULL) should use previously stored file name.
by Dmitry Timoshkov 23 Dec '20

23 Dec '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/shell32/shelllink.c | 14 ++++++++++---- dlls/shell32/tests/shelllink.c | 10 ++++++++++ 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 5b044d4be1..23c5935a7b 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -367,7 +367,10 @@ static HRESULT WINAPI IPersistFile_fnSave(IPersistFile* iface, LPCOLESTR pszFile TRACE("(%p)->(%s)\n",This,debugstr_w(pszFileName)); if (!pszFileName) - return E_FAIL; + { + pszFileName = This->filepath; + fRemember = FALSE; + } r = SHCreateStreamOnFileW( pszFileName, STGM_READWRITE | STGM_CREATE | STGM_SHARE_EXCLUSIVE, &stm ); if( SUCCEEDED( r ) ) @@ -379,9 +382,12 @@ static HRESULT WINAPI IPersistFile_fnSave(IPersistFile* iface, LPCOLESTR pszFile { StartLinkProcessor( pszFileName ); - /* update file path */ - heap_free(This->filepath); - This->filepath = strdupW(pszFileName); + if (fRemember) + { + /* update file path */ + heap_free(This->filepath); + This->filepath = strdupW(pszFileName); + } This->bDirty = FALSE; } diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index 20c48814f1..21e9107fa6 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -467,6 +467,16 @@ void create_lnk_(int line, const WCHAR* path, lnk_desc_t* desc) lok(!wcscmp(path, str), "Expected %s, got %s\n", wine_dbgstr_w(path), wine_dbgstr_w(str)); CoTaskMemFree(str); + r = IPersistFile_Save(pf, NULL, TRUE); + lok(r == S_OK, "save failed (0x%08x)\n", r); + + /* test GetCurFile after ::Save */ + r = IPersistFile_GetCurFile(pf, &str); + lok(r == S_OK, "got 0x%08x\n", r); + lok(str != NULL, "Didn't expect NULL\n"); + lok(!wcscmp(path, str), "Expected %s, got %s\n", wine_dbgstr_w(path), wine_dbgstr_w(str)); + CoTaskMemFree(str); + IPersistFile_Release(pf); } -- 2.29.2

1 0

[PATCH 2/3] shell32/tests: Remove workarounds for shell32 < 5.0.
by Dmitry Timoshkov 23 Dec '20

23 Dec '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/shell32/tests/shelllink.c | 39 +++++++--------------------------- 1 file changed, 8 insertions(+), 31 deletions(-) diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index 4f650d801d..20c48814f1 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -454,9 +454,7 @@ void create_lnk_(int line, const WCHAR* path, lnk_desc_t* desc) /* test GetCurFile before ::Save */ str = (LPWSTR)0xdeadbeef; r = IPersistFile_GetCurFile(pf, &str); - lok(r == S_FALSE || - broken(r == S_OK), /* shell32 < 5.0 */ - "got 0x%08x\n", r); + lok(r == S_FALSE, "got 0x%08x\n", r); lok(str == NULL, "got %p\n", str); r = IPersistFile_Save(pf, path, TRUE); @@ -465,16 +463,9 @@ void create_lnk_(int line, const WCHAR* path, lnk_desc_t* desc) /* test GetCurFile after ::Save */ r = IPersistFile_GetCurFile(pf, &str); lok(r == S_OK, "got 0x%08x\n", r); - lok(str != NULL || - broken(str == NULL), /* shell32 < 5.0 */ - "Didn't expect NULL\n"); - if (str) - { - lok(!wcscmp(path, str), "Expected %s, got %s\n", wine_dbgstr_w(path), wine_dbgstr_w(str)); - CoTaskMemFree(str); - } - else - win_skip("GetCurFile fails on shell32 < 5.0\n"); + lok(str != NULL, "Didn't expect NULL\n"); + lok(!wcscmp(path, str), "Expected %s, got %s\n", wine_dbgstr_w(path), wine_dbgstr_w(str)); + CoTaskMemFree(str); IPersistFile_Release(pf); } @@ -507,9 +498,7 @@ static void check_lnk_(int line, const WCHAR* path, lnk_desc_t* desc, int todo) /* test GetCurFile before ::Load */ str = (LPWSTR)0xdeadbeef; r = IPersistFile_GetCurFile(pf, &str); - lok(r == S_FALSE || - broken(r == S_OK), /* shell32 < 5.0 */ - "got 0x%08x\n", r); + lok(r == S_FALSE, "got 0x%08x\n", r); lok(str == NULL, "got %p\n", str); r = IPersistFile_Load(pf, path, STGM_READ); @@ -518,23 +507,11 @@ static void check_lnk_(int line, const WCHAR* path, lnk_desc_t* desc, int todo) /* test GetCurFile after ::Save */ r = IPersistFile_GetCurFile(pf, &str); lok(r == S_OK, "got 0x%08x\n", r); - lok(str != NULL || - broken(str == NULL), /* shell32 < 5.0 */ - "Didn't expect NULL\n"); - if (str != NULL) - { - lok(!wcscmp(path, str), "Expected %s, got %s\n", wine_dbgstr_w(path), wine_dbgstr_w(str)); - CoTaskMemFree(str); - } - else - win_skip("GetCurFile fails on shell32 < 5.0\n"); + lok(str != NULL, "Didn't expect NULL\n"); + lok(!wcscmp(path, str), "Expected %s, got %s\n", wine_dbgstr_w(path), wine_dbgstr_w(str)); + CoTaskMemFree(str); IPersistFile_Release(pf); - if (r != S_OK) - { - IShellLinkA_Release(sl); - return; - } if (desc->description) { -- 2.29.2

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel