wine-commits November 2020

wine-commits@winehq.org

1 participants
851 discussions

Gijs Vermeulen : winegstreamer: Initialise type_handler to NULL in media_stream_init_desc().
by Alexandre Julliard 25 Nov '20

25 Nov '20

Module: wine Branch: master Commit: 3bcabb2422864ddb410fe522096439c8237299c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3bcabb2422864ddb410fe522… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon Nov 23 17:40:30 2020 +0100 winegstreamer: Initialise type_handler to NULL in media_stream_init_desc(). Otherwise it is used uninitialised if a failure occurs. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/media_source.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 66bdf64a669..83424719d54 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -858,7 +858,7 @@ fail: static HRESULT media_stream_init_desc(struct media_stream *stream) { GstCaps *current_caps = gst_pad_get_current_caps(stream->their_src); - IMFMediaTypeHandler *type_handler; + IMFMediaTypeHandler *type_handler = NULL; IMFMediaType **stream_types = NULL; IMFMediaType *stream_type = NULL; DWORD type_count = 0;

1 0

Daniel Lehman : msxml3: Support ISequentialStream in domdoc_transformNodeToObject.
by Alexandre Julliard 25 Nov '20

25 Nov '20

Module: wine Branch: master Commit: 4610dc7920fda455fba7c88db283c342a31ae037 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4610dc7920fda455fba7c88d… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Wed Nov 18 00:10:12 2020 -0800 msxml3: Support ISequentialStream in domdoc_transformNodeToObject. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/domdoc.c | 9 ++++++++- dlls/msxml3/node.c | 6 +++--- dlls/msxml3/tests/domdoc.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 61 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index d447bd2b1d8..80c32e9ba99 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1524,8 +1524,10 @@ static HRESULT WINAPI domdoc_transformNodeToObject( case VT_UNKNOWN: case VT_DISPATCH: { + ISequentialStream *stream; IXMLDOMDocument *doc; HRESULT hr; + BSTR str; if (!V_UNKNOWN(&output)) return E_INVALIDARG; @@ -1535,7 +1537,6 @@ static HRESULT WINAPI domdoc_transformNodeToObject( if (IUnknown_QueryInterface(V_UNKNOWN(&output), &IID_IXMLDOMDocument, (void **)&doc) == S_OK) { VARIANT_BOOL b; - BSTR str; if (FAILED(hr = node_transform_node(&This->node, stylesheet, &str))) return hr; @@ -1544,6 +1545,12 @@ static HRESULT WINAPI domdoc_transformNodeToObject( SysFreeString(str); return hr; } + else if (IUnknown_QueryInterface(V_UNKNOWN(&output), &IID_ISequentialStream, (void**)&stream) == S_OK) + { + hr = node_transform_node_params(&This->node, stylesheet, NULL, stream, NULL); + ISequentialStream_Release(stream); + return hr; + } else { FIXME("Unsupported destination type.\n"); diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 35777d65918..67f322eb0e5 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -1512,9 +1512,9 @@ HRESULT node_transform_node_params(const xmlnode *This, IXMLDOMNode *stylesheet, xmlnode *sheet; if (!libxslt_handle) return E_NOTIMPL; - if (!stylesheet || !p) return E_INVALIDARG; + if (!stylesheet || (!p && !stream)) return E_INVALIDARG; - *p = NULL; + if (p) *p = NULL; sheet = get_node_obj(stylesheet); if(!sheet) return E_FAIL; @@ -1572,7 +1572,7 @@ HRESULT node_transform_node_params(const xmlnode *This, IXMLDOMNode *stylesheet, else xmlFreeDoc(sheet_doc); - if(!*p) *p = SysAllocStringLen(NULL, 0); + if (p && !*p) *p = SysAllocStringLen(NULL, 0); return hr; #else diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 02e31b4aafb..e27754d457a 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -13030,7 +13030,12 @@ static void test_transformNodeToObject(void) { IUnknown transformdest = { &transformdestvtbl }; IXMLDOMDocument *doc, *doc2, *doc3; + ISequentialStream *sstream; + LARGE_INTEGER off; + WCHAR buffer[256]; + IStream *istream; VARIANT_BOOL b; + ULONG nread; HRESULT hr; VARIANT v; @@ -13063,6 +13068,51 @@ static void test_transformNodeToObject(void) hr = IXMLDOMDocument_transformNodeToObject(doc, (IXMLDOMNode *)doc2, v); ok(hr == S_OK, "Failed to transform node, hr %#x.\n", hr); + /* IStream */ + istream = SHCreateMemStream(NULL, 0); + V_VT(&v) = VT_UNKNOWN; + V_UNKNOWN(&v) = (IUnknown *)istream; + hr = IXMLDOMDocument_transformNodeToObject(doc, (IXMLDOMNode *)doc2, v); + ok(hr == S_OK, "Failed to transform node, hr %#x.\n", hr); + + off.QuadPart = 0; + hr = IStream_Seek(istream, off, STREAM_SEEK_SET, NULL); + ok(hr == S_OK, "Failed to seek, hr %#x.\n", hr); + + nread = 0; + memset(buffer, 0xcc, sizeof(buffer)); + hr = IStream_Read(istream, buffer, sizeof(buffer), &nread); + ok(hr == S_OK, "Failed to read, hr %#x.\n", hr); + buffer[nread/2] = 0; + ok(buffer[0] == 0xfeff, "got %x\n", buffer[0]); + ok(compareIgnoreReturns(&buffer[1], _bstr_(szTransformOutput)), "got output %s\n", wine_dbgstr_w(buffer)); + IStream_Release(istream); + + /* ISequentialStream */ + istream = SHCreateMemStream(NULL, 0); + sstream = NULL; + hr = IStream_QueryInterface(istream, &IID_ISequentialStream, (void**)&sstream); + ok(hr == S_OK, "Failed to QI, hr %#x.\n", hr); + + V_VT(&v) = VT_UNKNOWN; + V_UNKNOWN(&v) = (IUnknown *)sstream; + hr = IXMLDOMDocument_transformNodeToObject(doc, (IXMLDOMNode *)doc2, v); + ok(hr == S_OK, "Failed to transform node, hr %#x.\n", hr); + + off.QuadPart = 0; + hr = IStream_Seek(istream, off, STREAM_SEEK_SET, NULL); + ok(hr == S_OK, "Failed to seek, hr %#x.\n", hr); + + nread = 0; + memset(buffer, 0xcc, sizeof(buffer)); + hr = ISequentialStream_Read(sstream, buffer, sizeof(buffer), &nread); + ok(hr == S_OK, "Failed to read, hr %#x.\n", hr); + buffer[nread/2] = 0; + ok(buffer[0] == 0xfeff, "got %x\n", buffer[0]); + ok(compareIgnoreReturns(&buffer[1], _bstr_(szTransformOutput)), "got output %s\n", wine_dbgstr_w(buffer)); + ISequentialStream_Release(sstream); + IStream_Release(istream); + IXMLDOMDocument_Release(doc3); IXMLDOMDocument_Release(doc2); IXMLDOMDocument_Release(doc);

1 0

Daniel Lehman : shcore: Return ISequentialStream interface for memory stream.
by Alexandre Julliard 25 Nov '20

25 Nov '20

Module: wine Branch: master Commit: 16ceadd2f4677e6e295b22f14025c6849410b88b URL: https://source.winehq.org/git/wine.git/?a=commit;h=16ceadd2f4677e6e295b22f1… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Wed Nov 18 00:10:11 2020 -0800 shcore: Return ISequentialStream interface for memory stream. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shcore/main.c | 4 +++- dlls/shlwapi/tests/istream.c | 2 -- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index 32649cccd9c..dc782e8be08 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -555,7 +555,9 @@ static HRESULT WINAPI shstream_QueryInterface(IStream *iface, REFIID riid, void TRACE("(%p)->(%s, %p)\n", stream, debugstr_guid(riid), out); - if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IStream)) + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IStream) || + IsEqualIID(riid, &IID_ISequentialStream)) { *out = iface; IStream_AddRef(iface); diff --git a/dlls/shlwapi/tests/istream.c b/dlls/shlwapi/tests/istream.c index 560a822e2c2..d3e7dbb8810 100644 --- a/dlls/shlwapi/tests/istream.c +++ b/dlls/shlwapi/tests/istream.c @@ -270,7 +270,6 @@ static void test_stream_qi(IStream *stream) unk = NULL; hr = IStream_QueryInterface(stream, &IID_ISequentialStream, (void **)&unk); -todo_wine ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* XP */, "Failed to get ISequentialStream interface, hr %#x.\n", hr); if (unk) IUnknown_Release(unk); @@ -753,7 +752,6 @@ static void test_SHCreateMemStream(void) ok(stream != NULL, "Failed to create a stream.\n"); hr = IStream_QueryInterface(stream, &IID_ISequentialStream, (void **)&unk); -todo_wine ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* WinXP */, "Failed to QI, hr %#x.\n", hr); if (unk) IUnknown_Release(unk);

1 0

Brendan Shanks : wine.inf: Add UrlAssociations for FTP/HTTP/HTTPS.
by Alexandre Julliard 25 Nov '20

25 Nov '20

Module: wine Branch: master Commit: ba8638e1a4e2a31d0e62762ab29b5a0b3d63856e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba8638e1a4e2a31d0e62762a… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Nov 24 15:16:40 2020 -0800 wine.inf: Add UrlAssociations for FTP/HTTP/HTTPS. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50094 Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/assoc.c | 2 +- loader/wine.inf.in | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/tests/assoc.c b/dlls/shell32/tests/assoc.c index 5e93750229d..65334e4a739 100644 --- a/dlls/shell32/tests/assoc.c +++ b/dlls/shell32/tests/assoc.c @@ -288,7 +288,7 @@ static void test_IApplicationAssociationRegistration_QueryCurrentDefault(IApplic ok(hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION), "got 0x%x\n", hr); hr = IApplicationAssociationRegistration_QueryCurrentDefault(appreg, httpW, AT_URLPROTOCOL, AL_EFFECTIVE, &assocprog); - todo_wine ok(hr == S_OK, "got 0x%x\n", hr); + ok(hr == S_OK, "got 0x%x\n", hr); trace("%s\n", wine_dbgstr_w(assocprog)); CoTaskMemFree(assocprog); diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 5210672c295..d292b065a0e 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -780,6 +780,11 @@ HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{6BF52A52-394A-11d3-B1 HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{6BF52A52-394A-11d3-B153-00C04F79FAA6},"Locale",2,"*" HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{6BF52A52-394A-11d3-B153-00C04F79FAA6},"Version",2,"12,0,7601,18840" +; URL Associations +HKCU,Software\Microsoft\Windows\Shell\Associations\UrlAssociations\ftp\UserChoice,"ProgId",,"ftp" +HKCU,Software\Microsoft\Windows\Shell\Associations\UrlAssociations\http\UserChoice,"ProgId",,"http" +HKCU,Software\Microsoft\Windows\Shell\Associations\UrlAssociations\https\UserChoice,"ProgId",,"https" + [Nls] HKLM,System\CurrentControlSet\Control\Nls\Language,"0401",,"l_intl.nls" HKLM,System\CurrentControlSet\Control\Nls\Language,"0402",,"l_intl.nls"

1 0

Brendan Shanks : winebrowser: Prefix an invalid URL with 'http://' before opening with a browser.
by Alexandre Julliard 25 Nov '20

25 Nov '20

Module: wine Branch: master Commit: a688cb6971525e49ffd029161b9007cd748ad42f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a688cb6971525e49ffd02916… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Nov 24 15:16:39 2020 -0800 winebrowser: Prefix an invalid URL with 'http://' before opening with a browser. Fixes usage like 'winebrowser winehq.org' when xdg-open or macOS 'open' is used. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50094 Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winebrowser/main.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/programs/winebrowser/main.c b/programs/winebrowser/main.c index 9cd6812d032..c70457e50b3 100644 --- a/programs/winebrowser/main.c +++ b/programs/winebrowser/main.c @@ -184,6 +184,29 @@ static int open_mailto_url( const WCHAR *url ) return launch_app( mailers, url ); } +static int open_invalid_url( const WCHAR *url ) +{ + static const WCHAR httpW[] = + {'h','t','t','p',':','/','/',0}; + + WCHAR *url_prefixed; + int ret; + + url_prefixed = HeapAlloc( GetProcessHeap(), 0, (ARRAY_SIZE(httpW) + strlenW( url )) * sizeof(WCHAR) ); + if (!url_prefixed) + { + WINE_ERR("Out of memory\n"); + return 1; + } + + strcpyW( url_prefixed, httpW ); + strcatW( url_prefixed, url ); + + ret = open_http_url( url_prefixed ); + HeapFree( GetProcessHeap(), 0, url_prefixed ); + return ret; +} + /***************************************************************************** * DDE helper functions. */ @@ -448,8 +471,8 @@ int __cdecl wmain(int argc, WCHAR *argv[]) hres = CreateUri(url, Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME|Uri_CREATE_FILE_USE_DOS_PATH, 0, &uri); if(FAILED(hres)) { - WINE_ERR("Failed to parse URL\n"); - ret = open_http_url(url); + WINE_ERR("Failed to parse URL %s, treating as HTTP\n", wine_dbgstr_w(url)); + ret = open_invalid_url(url); HeapFree(GetProcessHeap(), 0, ddeString); return ret; }

1 0

Zebediah Figura : qcap: Move the allocator management to vfwcapture.c.
by Alexandre Julliard 25 Nov '20

25 Nov '20

Module: wine Branch: master Commit: 786451c1b6199d7e343eccb710376fc19982620f URL: https://source.winehq.org/git/wine.git/?a=commit;h=786451c1b6199d7e343eccb7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Nov 24 20:11:17 2020 -0600 qcap: Move the allocator management to vfwcapture.c. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/qcap_private.h | 4 +--- dlls/qcap/v4l.c | 40 ++-------------------------------------- dlls/qcap/vfwcapture.c | 38 ++++++++++++++++++++++++++++---------- 3 files changed, 31 insertions(+), 51 deletions(-) diff --git a/dlls/qcap/qcap_private.h b/dlls/qcap/qcap_private.h index d715219c645..1d2b49d7394 100644 --- a/dlls/qcap/qcap_private.h +++ b/dlls/qcap/qcap_private.h @@ -42,7 +42,7 @@ HRESULT vfw_capture_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; struct video_capture_funcs { - struct video_capture_device *(*create)(struct strmbase_source *pin, USHORT index); + struct video_capture_device *(*create)(USHORT index); void (*destroy)(struct video_capture_device *device); HRESULT (*check_format)(struct video_capture_device *device, const AM_MEDIA_TYPE *mt); HRESULT (*set_format)(struct video_capture_device *device, const AM_MEDIA_TYPE *mt); @@ -55,8 +55,6 @@ struct video_capture_funcs HRESULT (*get_prop)(struct video_capture_device *device, VideoProcAmpProperty property, LONG *value, LONG *flags); HRESULT (*set_prop)(struct video_capture_device *device, VideoProcAmpProperty property, LONG value, LONG flags); BOOL (*read_frame)(struct video_capture_device *device, BYTE *data); - void (*init_stream)(struct video_capture_device *device); - void (*cleanup_stream)(struct video_capture_device *device); }; extern const struct video_capture_funcs v4l_funcs; diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index e0095379b34..d525989172a 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -97,7 +97,6 @@ struct video_capture_device int image_size, image_pitch; BYTE *image_data; - struct strmbase_source *pin; int fd, mmap; }; @@ -338,37 +337,6 @@ static BOOL v4l_device_read_frame(struct video_capture_device *device, BYTE *dat return TRUE; } -static void v4l_device_init_stream(struct video_capture_device *device) -{ - ALLOCATOR_PROPERTIES req_props, ret_props; - HRESULT hr; - - req_props.cBuffers = 3; - req_props.cbBuffer = device->image_size; - req_props.cbAlign = 1; - req_props.cbPrefix = 0; - - hr = IMemAllocator_SetProperties(device->pin->pAllocator, &req_props, &ret_props); - if (FAILED(hr)) - ERR("Failed to set allocator properties (buffer size %u), hr %#x.\n", req_props.cbBuffer, hr); - - if (SUCCEEDED(hr)) - { - if (FAILED(hr = IMemAllocator_Commit(device->pin->pAllocator))) - ERR("Failed to commit allocator, hr %#x.\n", hr); - } -} - -static void v4l_device_cleanup_stream(struct video_capture_device *device) -{ - HRESULT hr; - - hr = IMemAllocator_Decommit(device->pin->pAllocator); - if (hr != S_OK && hr != VFW_E_NOT_COMMITTED) - ERR("Failed to decommit allocator, hr %#x.\n", hr); -} - - static void fill_caps(__u32 pixelformat, __u32 width, __u32 height, __u32 max_fps, __u32 min_fps, struct caps *caps) { @@ -425,7 +393,7 @@ static LONG v4l_device_get_caps_count(struct video_capture_device *device) return device->caps_count; } -struct video_capture_device *v4l_device_create(struct strmbase_source *pin, USHORT index) +struct video_capture_device *v4l_device_create(USHORT index) { struct v4l2_frmsizeenum frmsize = {0}; struct video_capture_device *device; @@ -562,8 +530,6 @@ struct video_capture_device *v4l_device_create(struct strmbase_source *pin, USHO goto error; } - device->pin = pin; - TRACE("Format: %d bpp - %dx%d.\n", device->current_caps->video_info.bmiHeader.biBitCount, device->current_caps->video_info.bmiHeader.biWidth, device->current_caps->video_info.bmiHeader.biHeight); @@ -589,13 +555,11 @@ const struct video_capture_funcs v4l_funcs = .get_prop = v4l_device_get_prop, .set_prop = v4l_device_set_prop, .read_frame = v4l_device_read_frame, - .init_stream = v4l_device_init_stream, - .cleanup_stream = v4l_device_cleanup_stream, }; #else -static struct video_capture_device *v4l_device_create(struct strmbase_source *pin, USHORT index) +static struct video_capture_device *v4l_device_create(USHORT index) { ERR("v4l2 was not present at compilation time.\n"); return NULL; diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 9fb694ba678..f0a985d5f4b 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -94,11 +94,7 @@ static void vfw_capture_destroy(struct strmbase_filter *iface) struct vfw_capture *filter = impl_from_strmbase_filter(iface); if (filter->init) - { - if (filter->filter.state != State_Stopped) - capture_funcs->cleanup_stream(filter->device); capture_funcs->destroy(filter->device); - } if (filter->source.pin.peer) { @@ -132,12 +128,17 @@ static HRESULT vfw_capture_query_interface(struct strmbase_filter *iface, REFIID return S_OK; } +static unsigned int get_image_size(struct vfw_capture *filter) +{ + const VIDEOINFOHEADER *format = (const VIDEOINFOHEADER *)filter->source.pin.mt.pbFormat; + + return format->bmiHeader.biWidth * format->bmiHeader.biHeight * format->bmiHeader.biBitCount / 8; +} + static DWORD WINAPI stream_thread(void *arg) { struct vfw_capture *filter = arg; - const VIDEOINFOHEADER *format = (const VIDEOINFOHEADER *)filter->source.pin.mt.pbFormat; - const unsigned int image_size = format->bmiHeader.biWidth - * format->bmiHeader.biHeight * format->bmiHeader.biBitCount / 8; + const unsigned int image_size = get_image_size(filter); for (;;) { @@ -188,8 +189,21 @@ static DWORD WINAPI stream_thread(void *arg) static HRESULT vfw_capture_init_stream(struct strmbase_filter *iface) { struct vfw_capture *filter = impl_from_strmbase_filter(iface); + ALLOCATOR_PROPERTIES req_props, ret_props; + HRESULT hr; - capture_funcs->init_stream(filter->device); + req_props.cBuffers = 3; + req_props.cbBuffer = get_image_size(filter); + req_props.cbAlign = 1; + req_props.cbPrefix = 0; + if (FAILED(hr = IMemAllocator_SetProperties(filter->source.pAllocator, &req_props, &ret_props))) + { + ERR("Failed to set allocator properties (buffer size %u), hr %#x.\n", req_props.cbBuffer, hr); + return hr; + } + + if (FAILED(hr = IMemAllocator_Commit(filter->source.pAllocator))) + ERR("Failed to commit allocator, hr %#x.\n", hr); EnterCriticalSection(&filter->state_cs); filter->state = State_Paused; @@ -224,6 +238,7 @@ static HRESULT vfw_capture_stop_stream(struct strmbase_filter *iface) static HRESULT vfw_capture_cleanup_stream(struct strmbase_filter *iface) { struct vfw_capture *filter = impl_from_strmbase_filter(iface); + HRESULT hr; EnterCriticalSection(&filter->state_cs); filter->state = State_Stopped; @@ -234,7 +249,10 @@ static HRESULT vfw_capture_cleanup_stream(struct strmbase_filter *iface) CloseHandle(filter->thread); filter->thread = NULL; - capture_funcs->cleanup_stream(filter->device); + hr = IMemAllocator_Decommit(filter->source.pAllocator); + if (hr != S_OK && hr != VFW_E_NOT_COMMITTED) + ERR("Failed to decommit allocator, hr %#x.\n", hr); + return S_OK; } @@ -478,7 +496,7 @@ static HRESULT WINAPI PPB_Load(IPersistPropertyBag *iface, IPropertyBag *bag, IE if (FAILED(hr = IPropertyBag_Read(bag, VFWIndex, &var, error_log))) return hr; - if (!(filter->device = capture_funcs->create(&filter->source, V_I4(&var)))) + if (!(filter->device = capture_funcs->create(V_I4(&var)))) return E_FAIL; filter->init = TRUE;

1 0

Zebediah Figura : qcap: Move the video capture streaming thread to vfwcapture.c.
by Alexandre Julliard 25 Nov '20

25 Nov '20

Module: wine Branch: master Commit: 26cbb3dd6ffbfac6b1ae0654e4fcb9bf98739635 URL: https://source.winehq.org/git/wine.git/?a=commit;h=26cbb3dd6ffbfac6b1ae0654… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Nov 24 20:11:16 2020 -0600 qcap: Move the video capture streaming thread to vfwcapture.c. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/qcap_private.h | 3 +- dlls/qcap/v4l.c | 96 ++++------------------------------------------- dlls/qcap/vfwcapture.c | 98 ++++++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 103 insertions(+), 94 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=26cbb3dd6ffbfac6b1ae…

1 0

Zebediah Figura : qcap: Move the video capture device creation function to the function table.
by Alexandre Julliard 25 Nov '20

25 Nov '20

Module: wine Branch: master Commit: db143ed080f635da7c6f0e2cd60382e9661f995b URL: https://source.winehq.org/git/wine.git/?a=commit;h=db143ed080f635da7c6f0e2c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Nov 24 20:11:15 2020 -0600 qcap: Move the video capture device creation function to the function table. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/qcap_private.h | 10 ++-- dlls/qcap/v4l.c | 121 ++++++++++++++++++++--------------------------- dlls/qcap/vfwcapture.c | 69 ++++++++++++++------------- 3 files changed, 90 insertions(+), 110 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=db143ed080f635da7c6f…

1 0

Zebediah Figura : qcap: Move the image buffer back into the video_capture_device structure.
by Alexandre Julliard 25 Nov '20

25 Nov '20

Module: wine Branch: master Commit: 3657748a1bc03df563622c0a26b75a1c477e9f70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3657748a1bc03df563622c0a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Nov 24 20:11:14 2020 -0600 qcap: Move the image buffer back into the video_capture_device structure. This undoes 7aa9a04f26be828b5db0200f2c59d00f99afa586. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/v4l.c | 48 +++++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index b1d7e68d426..cfae2b1d1ec 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -97,6 +97,7 @@ struct v4l_device LONG caps_count; int image_size, image_pitch; + BYTE *image_data; struct strmbase_source *pin; int fd, mmap; @@ -133,6 +134,7 @@ static void v4l_device_destroy(struct video_capture_device *iface) video_close(device->fd); if (device->caps_count) heap_free(device->caps); + heap_free(device->image_data); heap_free(device); } @@ -174,13 +176,21 @@ static HRESULT v4l_device_check_format(struct video_capture_device *iface, const return E_FAIL; } -static BOOL set_caps(struct v4l_device *device, const struct caps *caps) +static HRESULT set_caps(struct v4l_device *device, const struct caps *caps) { struct v4l2_format format = {0}; - LONG width, height; + LONG width, height, image_size; + BYTE *image_data; width = caps->video_info.bmiHeader.biWidth; height = caps->video_info.bmiHeader.biHeight; + image_size = width * height * caps->video_info.bmiHeader.biBitCount / 8; + + if (!(image_data = heap_alloc(image_size))) + { + ERR("Failed to allocate memory.\n"); + return E_OUTOFMEMORY; + } format.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; format.fmt.pix.pixelformat = caps->pixelformat; @@ -192,14 +202,16 @@ static BOOL set_caps(struct v4l_device *device, const struct caps *caps) || format.fmt.pix.height != height) { ERR("Failed to set pixel format: %s.\n", strerror(errno)); - return FALSE; + heap_free(image_data); + return VFW_E_TYPE_NOT_ACCEPTED; } device->current_caps = caps; - device->image_size = width * height * caps->video_info.bmiHeader.biBitCount / 8; + device->image_size = image_size; device->image_pitch = width * caps->video_info.bmiHeader.biBitCount / 8; - - return TRUE; + heap_free(device->image_data); + device->image_data = image_data; + return S_OK; } static HRESULT v4l_device_set_format(struct video_capture_device *iface, const AM_MEDIA_TYPE *mt) @@ -214,10 +226,7 @@ static HRESULT v4l_device_set_format(struct video_capture_device *iface, const A if (device->current_caps == caps) return S_OK; - if (!set_caps(device, caps)) - return VFW_E_TYPE_NOT_ACCEPTED; - - return S_OK; + return set_caps(device, caps); } static HRESULT v4l_device_get_format(struct video_capture_device *iface, AM_MEDIA_TYPE *mt) @@ -344,13 +353,7 @@ static DWORD WINAPI ReadThread(void *arg) struct v4l_device *device = arg; HRESULT hr; IMediaSample *pSample = NULL; - unsigned char *pTarget, *image_data; - - if (!(image_data = heap_alloc(device->image_size))) - { - ERR("Failed to allocate memory.\n"); - return 0; - } + unsigned char *pTarget; for (;;) { @@ -379,7 +382,7 @@ static DWORD WINAPI ReadThread(void *arg) IMediaSample_GetPointer(pSample, &pTarget); - while (video_read(device->fd, image_data, device->image_size) == -1) + while (video_read(device->fd, device->image_data, device->image_size) == -1) { if (errno != EAGAIN) { @@ -388,7 +391,7 @@ static DWORD WINAPI ReadThread(void *arg) } } - reverse_image(device, pTarget, image_data); + reverse_image(device, pTarget, device->image_data); hr = IMemInputPin_Receive(device->pin->pMemInputPin, pSample); IMediaSample_Release(pSample); } @@ -400,7 +403,6 @@ static DWORD WINAPI ReadThread(void *arg) } } - heap_free(image_data); return 0; } @@ -550,6 +552,7 @@ struct video_capture_device *v4l_device_create(struct strmbase_source *pin, USHO struct v4l_device *device; BOOL have_libv4l2; char path[20]; + HRESULT hr; int fd, i; have_libv4l2 = video_init(); @@ -671,10 +674,9 @@ struct video_capture_device *v4l_device_create(struct strmbase_source *pin, USHO for (i = 0; i < device->caps_count; ++i) device->caps[i].media_type.pbFormat = (BYTE *)&device->caps[i].video_info; - if (!set_caps(device, &device->caps[0])) + if (FAILED(hr = set_caps(device, &device->caps[0]))) { - ERR("Failed to set pixel format: %s\n", strerror(errno)); - if (!have_libv4l2) + if (hr == VFW_E_TYPE_NOT_ACCEPTED && !have_libv4l2) ERR_(winediag)("You may need libv4l2 to use this device.\n"); goto error; }

1 0

Esme Povirk : windowscodecs: Move jpeg encoding to the unix lib.
by Alexandre Julliard 24 Nov '20

24 Nov '20

Module: wine Branch: master Commit: 92fb63d7754ba56b2604d253b600284c52ab82c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=92fb63d7754ba56b2604d253… Author: Esme Povirk <esme(a)codeweavers.com> Date: Tue Nov 24 15:22:06 2020 -0600 windowscodecs: Move jpeg encoding to the unix lib. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/Makefile.in | 1 - dlls/windowscodecs/encoder.c | 14 +- dlls/windowscodecs/jpegformat.c | 920 --------------------------------- dlls/windowscodecs/libjpeg.c | 313 +++++++++++ dlls/windowscodecs/main.c | 28 + dlls/windowscodecs/unix_lib.c | 3 + dlls/windowscodecs/wincodecs_private.h | 7 + 7 files changed, 364 insertions(+), 922 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=92fb63d7754ba56b2604…

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
86
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2020