wine-commits November 2020

wine-commits@winehq.org

1 participants
851 discussions

Zebediah Figura : qcap: Use wide-char string literals.
by Alexandre Julliard 27 Nov '20

27 Nov '20

Module: wine Branch: master Commit: 8f8cdc7ac7e00f4afaae7a947b8c169c5373e659 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f8cdc7ac7e00f4afaae7a94… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 26 22:34:35 2020 -0600 qcap: Use wide-char string literals. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/audiorecord.c | 3 +-- dlls/qcap/avico.c | 10 +++------- dlls/qcap/avimux.c | 13 +++---------- dlls/qcap/filewriter.c | 3 +-- dlls/qcap/qcap_main.c | 9 +++------ dlls/qcap/smartteefilter.c | 9 +++------ dlls/qcap/vfwcapture.c | 6 ++---- 7 files changed, 16 insertions(+), 37 deletions(-) diff --git a/dlls/qcap/audiorecord.c b/dlls/qcap/audiorecord.c index 7477cca6d60..0021e8dd982 100644 --- a/dlls/qcap/audiorecord.c +++ b/dlls/qcap/audiorecord.c @@ -108,12 +108,11 @@ static HRESULT WINAPI PPB_Load(IPersistPropertyBag *iface, IPropertyBag *pPropBa AudioRecord *This = impl_from_IPersistPropertyBag(iface); HRESULT hr; VARIANT var; - static const WCHAR WaveInIDW[] = {'W','a','v','e','I','n','I','D',0}; TRACE("(%p/%p)->(%p, %p)\n", iface, This, pPropBag, pErrorLog); V_VT(&var) = VT_I4; - hr = IPropertyBag_Read(pPropBag, WaveInIDW, &var, pErrorLog); + hr = IPropertyBag_Read(pPropBag, L"WaveInID", &var, pErrorLog); if (SUCCEEDED(hr)) { FIXME("FIXME: implement opening waveIn device %d\n", V_I4(&var)); diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index 01a43c9577d..f1730a394c5 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -213,12 +213,10 @@ static HRESULT WINAPI AVICompressorPropertyBag_Load(IPersistPropertyBag *iface, VARIANT v; HRESULT hres; - static const WCHAR fcc_handlerW[] = {'F','c','c','H','a','n','d','l','e','r',0}; - TRACE("(%p)->(%p %p)\n", This, pPropBag, pErrorLog); V_VT(&v) = VT_BSTR; - hres = IPropertyBag_Read(pPropBag, fcc_handlerW, &v, NULL); + hres = IPropertyBag_Read(pPropBag, L"FccHandler", &v, NULL); if(FAILED(hres)) { WARN("Could not read FccHandler: %08x\n", hres); return hres; @@ -470,8 +468,6 @@ static const struct strmbase_source_ops source_ops = HRESULT avi_compressor_create(IUnknown *outer, IUnknown **out) { - static const WCHAR source_name[] = {'O','u','t',0}; - static const WCHAR sink_name[] = {'I','n',0}; AVICompressor *object; if (!(object = heap_alloc_zero(sizeof(*object)))) @@ -480,8 +476,8 @@ HRESULT avi_compressor_create(IUnknown *outer, IUnknown **out) strmbase_filter_init(&object->filter, outer, &CLSID_AVICo, &filter_ops); object->IPersistPropertyBag_iface.lpVtbl = &PersistPropertyBagVtbl; - strmbase_sink_init(&object->sink, &object->filter, sink_name, &sink_ops, NULL); - strmbase_source_init(&object->source, &object->filter, source_name, &source_ops); + strmbase_sink_init(&object->sink, &object->filter, L"In", &sink_ops, NULL); + strmbase_source_init(&object->source, &object->filter, L"Out", &source_ops); TRACE("Created AVI compressor %p.\n", object); *out = &object->filter.IUnknown_inner; diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index 7ae2d673676..38d4bb7c88c 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -1777,15 +1777,14 @@ static const IQualityControlVtbl AviMuxIn_QualityControlVtbl = { static HRESULT create_input_pin(AviMux *avimux) { - WCHAR name[] = {'I','n','p','u','t',' ','0','0',0}; AviMuxIn *object; + WCHAR name[19]; HRESULT hr; if(avimux->input_pin_no >= MAX_PIN_NO-1) return E_FAIL; - name[7] = '0' + (avimux->input_pin_no+1) % 10; - name[6] = '0' + (avimux->input_pin_no+1) / 10; + swprintf(name, ARRAY_SIZE(name), L"Input %02u", avimux->input_pin_no + 1); if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; @@ -1824,10 +1823,7 @@ static HRESULT create_input_pin(AviMux *avimux) HRESULT avi_mux_create(IUnknown *outer, IUnknown **out) { - static const WCHAR output_name[] = {'A','V','I',' ','O','u','t',0}; - AviMux *avimux; - PIN_INFO info; HRESULT hr; if (!(avimux = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(AviMux)))) @@ -1840,10 +1836,7 @@ HRESULT avi_mux_create(IUnknown *outer, IUnknown **out) avimux->IPersistMediaPropertyBag_iface.lpVtbl = &PersistMediaPropertyBagVtbl; avimux->ISpecifyPropertyPages_iface.lpVtbl = &SpecifyPropertyPagesVtbl; - info.dir = PINDIR_OUTPUT; - info.pFilter = &avimux->filter.IBaseFilter_iface; - lstrcpyW(info.achName, output_name); - strmbase_source_init(&avimux->source, &avimux->filter, output_name, &source_ops); + strmbase_source_init(&avimux->source, &avimux->filter, L"AVI Out", &source_ops); avimux->IQualityControl_iface.lpVtbl = &AviMuxOut_QualityControlVtbl; avimux->cur_stream = 0; avimux->cur_time = 0; diff --git a/dlls/qcap/filewriter.c b/dlls/qcap/filewriter.c index c377471ed7d..c67fe263d8d 100644 --- a/dlls/qcap/filewriter.c +++ b/dlls/qcap/filewriter.c @@ -315,7 +315,6 @@ static const IAMFilterMiscFlagsVtbl misc_flags_vtbl = HRESULT file_writer_create(IUnknown *outer, IUnknown **out) { - static const WCHAR sink_name[] = {'i','n',0}; struct file_writer *object; if (!(object = heap_alloc_zero(sizeof(*object)))) @@ -325,7 +324,7 @@ HRESULT file_writer_create(IUnknown *outer, IUnknown **out) object->IFileSinkFilter_iface.lpVtbl = &filesinkfilter_vtbl; object->IAMFilterMiscFlags_iface.lpVtbl = &misc_flags_vtbl; - strmbase_sink_init(&object->sink, &object->filter, sink_name, &sink_ops, NULL); + strmbase_sink_init(&object->sink, &object->filter, L"in", &sink_ops, NULL); TRACE("Created file writer %p.\n", object); *out = &object->filter.IUnknown_inner; diff --git a/dlls/qcap/qcap_main.c b/dlls/qcap/qcap_main.c index e211b74dada..2c7c1216996 100644 --- a/dlls/qcap/qcap_main.c +++ b/dlls/qcap/qcap_main.c @@ -229,9 +229,6 @@ static const REGFILTER2 reg_file_writer = */ HRESULT WINAPI DllRegisterServer(void) { - static const WCHAR avi_muxW[] = {'A','V','I',' ','M','u','x',0}; - static const WCHAR file_writerW[] = {'F','i','l','e',' ','w','r','i','t','e','r',0}; - static const WCHAR smart_teeW[] = {'S','m','a','r','t',' ','T','e','e',0}; IFilterMapper2 *mapper; HRESULT hr; @@ -242,11 +239,11 @@ HRESULT WINAPI DllRegisterServer(void) &IID_IFilterMapper2, (void **)&mapper))) return hr; - IFilterMapper2_RegisterFilter(mapper, &CLSID_AviDest, avi_muxW, + IFilterMapper2_RegisterFilter(mapper, &CLSID_AviDest, L"AVI Mux", NULL, NULL, NULL, &reg_avi_mux); - IFilterMapper2_RegisterFilter(mapper, &CLSID_FileWriter, file_writerW, + IFilterMapper2_RegisterFilter(mapper, &CLSID_FileWriter, L"File writer", NULL, NULL, NULL, &reg_file_writer); - IFilterMapper2_RegisterFilter(mapper, &CLSID_SmartTee, smart_teeW, + IFilterMapper2_RegisterFilter(mapper, &CLSID_SmartTee, L"Smart Tee", NULL, NULL, NULL, &reg_smart_tee); IFilterMapper2_Release(mapper); diff --git a/dlls/qcap/smartteefilter.c b/dlls/qcap/smartteefilter.c index 2f6f3ab2b79..4e23e6ee467 100644 --- a/dlls/qcap/smartteefilter.c +++ b/dlls/qcap/smartteefilter.c @@ -316,9 +316,6 @@ static const struct strmbase_source_ops preview_ops = HRESULT smart_tee_create(IUnknown *outer, IUnknown **out) { - static const WCHAR captureW[] = {'C','a','p','t','u','r','e',0}; - static const WCHAR previewW[] = {'P','r','e','v','i','e','w',0}; - static const WCHAR inputW[] = {'I','n','p','u','t',0}; SmartTeeFilter *object; HRESULT hr; @@ -327,7 +324,7 @@ HRESULT smart_tee_create(IUnknown *outer, IUnknown **out) memset(object, 0, sizeof(*object)); strmbase_filter_init(&object->filter, outer, &CLSID_SmartTee, &filter_ops); - strmbase_sink_init(&object->sink, &object->filter, inputW, &sink_ops, NULL); + strmbase_sink_init(&object->sink, &object->filter, L"Input", &sink_ops, NULL); hr = CoCreateInstance(&CLSID_MemoryAllocator, NULL, CLSCTX_INPROC_SERVER, &IID_IMemAllocator, (void **)&object->sink.pAllocator); if (FAILED(hr)) @@ -337,8 +334,8 @@ HRESULT smart_tee_create(IUnknown *outer, IUnknown **out) return hr; } - strmbase_source_init(&object->capture, &object->filter, captureW, &capture_ops); - strmbase_source_init(&object->preview, &object->filter, previewW, &preview_ops); + strmbase_source_init(&object->capture, &object->filter, L"Capture", &capture_ops); + strmbase_source_init(&object->preview, &object->filter, L"Preview", &preview_ops); TRACE("Created smart tee %p.\n", object); *out = &object->filter.IUnknown_inner; diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 7b8787ef99f..ae6a9a055d1 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -530,7 +530,6 @@ static HRESULT WINAPI PPB_InitNew(IPersistPropertyBag * iface) static HRESULT WINAPI PPB_Load(IPersistPropertyBag *iface, IPropertyBag *bag, IErrorLog *error_log) { - static const OLECHAR VFWIndex[] = {'V','F','W','I','n','d','e','x',0}; struct vfw_capture *filter = impl_from_IPersistPropertyBag(iface); HRESULT hr; VARIANT var; @@ -538,7 +537,7 @@ static HRESULT WINAPI PPB_Load(IPersistPropertyBag *iface, IPropertyBag *bag, IE TRACE("filter %p, bag %p, error_log %p.\n", filter, bag, error_log); V_VT(&var) = VT_I4; - if (FAILED(hr = IPropertyBag_Read(bag, VFWIndex, &var, error_log))) + if (FAILED(hr = IPropertyBag_Read(bag, L"VFWIndex", &var, error_log))) return hr; if (!(filter->device = capture_funcs->create(V_I4(&var)))) @@ -848,7 +847,6 @@ static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; HRESULT vfw_capture_create(IUnknown *outer, IUnknown **out) { - static const WCHAR source_name[] = {'O','u','t','p','u','t',0}; struct vfw_capture *object; if (!InitOnceExecuteOnce(&init_once, load_capture_funcs, NULL, NULL) || !capture_funcs) @@ -866,7 +864,7 @@ HRESULT vfw_capture_create(IUnknown *outer, IUnknown **out) object->IPersistPropertyBag_iface.lpVtbl = &IPersistPropertyBag_VTable; object->init = FALSE; - strmbase_source_init(&object->source, &object->filter, source_name, &source_ops); + strmbase_source_init(&object->source, &object->filter, L"Output", &source_ops); object->IKsPropertySet_iface.lpVtbl = &IKsPropertySet_VTable;

1 0

Zebediah Figura : qcap: Link to strmbase.
by Alexandre Julliard 27 Nov '20

27 Nov '20

Module: wine Branch: master Commit: 69932cf76f6703f050e6039cfe9c45d962608c21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=69932cf76f6703f050e6039c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 26 22:34:34 2020 -0600 qcap: Link to strmbase. This reverts 4c2c98934154e2587348d45b1d4b05e66f253830. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/Makefile.in | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/qcap/Makefile.in b/dlls/qcap/Makefile.in index 298274accc6..417e7f332c0 100644 --- a/dlls/qcap/Makefile.in +++ b/dlls/qcap/Makefile.in @@ -1,7 +1,6 @@ MODULE = qcap.dll -IMPORTS = strmiids uuid ole32 oleaut32 gdi32 advapi32 +IMPORTS = strmbase strmiids uuid ole32 oleaut32 DELAYIMPORTS = msvfw32 -PARENTSRC = ../strmbase EXTRADLLFLAGS = -mno-cygwin @@ -11,9 +10,6 @@ C_SRCS = \ avimux.c \ capturegraph.c \ filewriter.c \ - filter.c \ - mediatype.c \ - pin.c \ qcap_main.c \ smartteefilter.c \ v4l.c \

1 0

Zebediah Figura : qcap: Build with msvcrt.
by Alexandre Julliard 27 Nov '20

27 Nov '20

Module: wine Branch: master Commit: ee7bba6a4fe4b6586e45b7b5b7952e94f453adb2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee7bba6a4fe4b6586e45b7b5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 26 22:34:33 2020 -0600 qcap: Build with msvcrt. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/Makefile.in | 2 ++ dlls/qcap/filewriter.c | 4 ++-- dlls/qcap/qcap_private.h | 1 - 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/qcap/Makefile.in b/dlls/qcap/Makefile.in index a3b6ba78fb9..298274accc6 100644 --- a/dlls/qcap/Makefile.in +++ b/dlls/qcap/Makefile.in @@ -3,6 +3,8 @@ IMPORTS = strmiids uuid ole32 oleaut32 gdi32 advapi32 DELAYIMPORTS = msvfw32 PARENTSRC = ../strmbase +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ audiorecord.c \ avico.c \ diff --git a/dlls/qcap/filewriter.c b/dlls/qcap/filewriter.c index c3ba6c4d3eb..c377471ed7d 100644 --- a/dlls/qcap/filewriter.c +++ b/dlls/qcap/filewriter.c @@ -245,9 +245,9 @@ static HRESULT WINAPI filesinkfilter_SetFileName(IFileSinkFilter *iface, if (mt) FIXME("Ignoring media type %p.\n", mt); - if (!(new_filename = heap_alloc((strlenW(filename) + 1) * sizeof(WCHAR)))) + if (!(new_filename = heap_alloc((wcslen(filename) + 1) * sizeof(WCHAR)))) return E_OUTOFMEMORY; - strcpyW(new_filename, filename); + wcscpy(new_filename, filename); heap_free(filter->filename); filter->filename = new_filename; diff --git a/dlls/qcap/qcap_private.h b/dlls/qcap/qcap_private.h index 7c27c689677..4100c8c33d7 100644 --- a/dlls/qcap/qcap_private.h +++ b/dlls/qcap/qcap_private.h @@ -28,7 +28,6 @@ #include "wine/debug.h" #include "wine/heap.h" #include "wine/strmbase.h" -#include "wine/unicode.h" extern HINSTANCE qcap_instance DECLSPEC_HIDDEN;

1 0

Zebediah Figura : qcap: Make video capture functions CDECL.
by Alexandre Julliard 27 Nov '20

27 Nov '20

Module: wine Branch: master Commit: 786d81d802a5e90497ff6421156a66d15b98df97 URL: https://source.winehq.org/git/wine.git/?a=commit;h=786d81d802a5e90497ff6421… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 26 22:34:32 2020 -0600 qcap: Make video capture functions CDECL. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/qcap_private.h | 26 ++++++++++++++------------ dlls/qcap/v4l.c | 24 ++++++++++++------------ 2 files changed, 26 insertions(+), 24 deletions(-) diff --git a/dlls/qcap/qcap_private.h b/dlls/qcap/qcap_private.h index 046821142d2..7c27c689677 100644 --- a/dlls/qcap/qcap_private.h +++ b/dlls/qcap/qcap_private.h @@ -44,21 +44,23 @@ HRESULT vfw_capture_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; struct video_capture_funcs { - 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); - void (*get_format)(struct video_capture_device *device, AM_MEDIA_TYPE *mt, VIDEOINFOHEADER *format); - HRESULT (*get_media_type)(struct video_capture_device *device, + struct video_capture_device *(CDECL *create)(USHORT index); + void (CDECL *destroy)(struct video_capture_device *device); + HRESULT (CDECL *check_format)(struct video_capture_device *device, const AM_MEDIA_TYPE *mt); + HRESULT (CDECL *set_format)(struct video_capture_device *device, const AM_MEDIA_TYPE *mt); + void (CDECL *get_format)(struct video_capture_device *device, AM_MEDIA_TYPE *mt, VIDEOINFOHEADER *format); + HRESULT (CDECL *get_media_type)(struct video_capture_device *device, unsigned int index, AM_MEDIA_TYPE *mt, VIDEOINFOHEADER *format); - void (*get_caps)(struct video_capture_device *device, LONG index, AM_MEDIA_TYPE *mt, + void (CDECL *get_caps)(struct video_capture_device *device, LONG index, AM_MEDIA_TYPE *mt, VIDEOINFOHEADER *format, VIDEO_STREAM_CONFIG_CAPS *caps); - LONG (*get_caps_count)(struct video_capture_device *device); - HRESULT (*get_prop_range)(struct video_capture_device *device, VideoProcAmpProperty property, + LONG (CDECL *get_caps_count)(struct video_capture_device *device); + HRESULT (CDECL *get_prop_range)(struct video_capture_device *device, VideoProcAmpProperty property, LONG *min, LONG *max, LONG *step, LONG *default_value, LONG *flags); - 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); + HRESULT (CDECL *get_prop)(struct video_capture_device *device, + VideoProcAmpProperty property, LONG *value, LONG *flags); + HRESULT (CDECL *set_prop)(struct video_capture_device *device, + VideoProcAmpProperty property, LONG value, LONG flags); + BOOL (CDECL *read_frame)(struct video_capture_device *device, BYTE *data); }; #endif diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index fd2c087640f..da09b2b26d6 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -119,7 +119,7 @@ static int xioctl(int fd, int request, void * arg) return r; } -static void v4l_device_destroy(struct video_capture_device *device) +static void CDECL v4l_device_destroy(struct video_capture_device *device) { if (device->fd != -1) video_close(device->fd); @@ -149,7 +149,7 @@ static const struct caps *find_caps(struct video_capture_device *device, const A return NULL; } -static HRESULT v4l_device_check_format(struct video_capture_device *device, const AM_MEDIA_TYPE *mt) +static HRESULT CDECL v4l_device_check_format(struct video_capture_device *device, const AM_MEDIA_TYPE *mt) { TRACE("device %p, mt %p.\n", device, mt); @@ -203,7 +203,7 @@ static HRESULT set_caps(struct video_capture_device *device, const struct caps * return S_OK; } -static HRESULT v4l_device_set_format(struct video_capture_device *device, const AM_MEDIA_TYPE *mt) +static HRESULT CDECL v4l_device_set_format(struct video_capture_device *device, const AM_MEDIA_TYPE *mt) { const struct caps *caps; @@ -217,13 +217,13 @@ static HRESULT v4l_device_set_format(struct video_capture_device *device, const return set_caps(device, caps); } -static void v4l_device_get_format(struct video_capture_device *device, AM_MEDIA_TYPE *mt, VIDEOINFOHEADER *format) +static void CDECL v4l_device_get_format(struct video_capture_device *device, AM_MEDIA_TYPE *mt, VIDEOINFOHEADER *format) { *mt = device->current_caps->media_type; *format = device->current_caps->video_info; } -static HRESULT v4l_device_get_media_type(struct video_capture_device *device, +static HRESULT CDECL v4l_device_get_media_type(struct video_capture_device *device, unsigned int index, AM_MEDIA_TYPE *mt, VIDEOINFOHEADER *format) { unsigned int caps_count = (device->current_caps) ? 1 : device->caps_count; @@ -262,7 +262,7 @@ static __u32 v4l2_cid_from_qcap_property(VideoProcAmpProperty property) } } -static HRESULT v4l_device_get_prop_range(struct video_capture_device *device, VideoProcAmpProperty property, +static HRESULT CDECL v4l_device_get_prop_range(struct video_capture_device *device, VideoProcAmpProperty property, LONG *min, LONG *max, LONG *step, LONG *default_value, LONG *flags) { struct v4l2_queryctrl ctrl; @@ -283,7 +283,7 @@ static HRESULT v4l_device_get_prop_range(struct video_capture_device *device, Vi return S_OK; } -static HRESULT v4l_device_get_prop(struct video_capture_device *device, +static HRESULT CDECL v4l_device_get_prop(struct video_capture_device *device, VideoProcAmpProperty property, LONG *value, LONG *flags) { struct v4l2_control ctrl; @@ -302,7 +302,7 @@ static HRESULT v4l_device_get_prop(struct video_capture_device *device, return S_OK; } -static HRESULT v4l_device_set_prop(struct video_capture_device *device, +static HRESULT CDECL v4l_device_set_prop(struct video_capture_device *device, VideoProcAmpProperty property, LONG value, LONG flags) { struct v4l2_control ctrl; @@ -338,7 +338,7 @@ static void reverse_image(struct video_capture_device *device, LPBYTE output, co } } -static BOOL v4l_device_read_frame(struct video_capture_device *device, BYTE *data) +static BOOL CDECL v4l_device_read_frame(struct video_capture_device *device, BYTE *data) { while (video_read(device->fd, device->image_data, device->image_size) < 0) { @@ -389,7 +389,7 @@ static void fill_caps(__u32 pixelformat, __u32 width, __u32 height, caps->pixelformat = pixelformat; } -static void v4l_device_get_caps(struct video_capture_device *device, LONG index, +static void CDECL v4l_device_get_caps(struct video_capture_device *device, LONG index, AM_MEDIA_TYPE *type, VIDEOINFOHEADER *format, VIDEO_STREAM_CONFIG_CAPS *vscc) { *vscc = device->caps[index].config; @@ -397,12 +397,12 @@ static void v4l_device_get_caps(struct video_capture_device *device, LONG index, *format = device->caps[index].video_info; } -static LONG v4l_device_get_caps_count(struct video_capture_device *device) +static LONG CDECL v4l_device_get_caps_count(struct video_capture_device *device) { return device->caps_count; } -struct video_capture_device *v4l_device_create(USHORT index) +struct video_capture_device * CDECL v4l_device_create(USHORT index) { struct v4l2_frmsizeenum frmsize = {0}; struct video_capture_device *device;

1 0

Zebediah Figura : qcap: Move v4l2 support to a new Unix library.
by Alexandre Julliard 27 Nov '20

27 Nov '20

Module: wine Branch: master Commit: d4ded92b024441e98b0ec80db6a11c074c2ed494 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4ded92b024441e98b0ec80d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 26 22:34:31 2020 -0600 qcap: Move v4l2 support to a new Unix library. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/qcap_main.c | 2 +- dlls/qcap/qcap_private.h | 4 ++-- dlls/qcap/v4l.c | 25 ++++++++++++++----------- dlls/qcap/vfwcapture.c | 5 +++-- 4 files changed, 20 insertions(+), 16 deletions(-) diff --git a/dlls/qcap/qcap_main.c b/dlls/qcap/qcap_main.c index 411ef41ea20..e211b74dada 100644 --- a/dlls/qcap/qcap_main.c +++ b/dlls/qcap/qcap_main.c @@ -25,7 +25,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(qcap); -static HINSTANCE qcap_instance; +HINSTANCE qcap_instance; static LONG objects_ref = 0; diff --git a/dlls/qcap/qcap_private.h b/dlls/qcap/qcap_private.h index 379d9908637..046821142d2 100644 --- a/dlls/qcap/qcap_private.h +++ b/dlls/qcap/qcap_private.h @@ -30,6 +30,8 @@ #include "wine/strmbase.h" #include "wine/unicode.h" +extern HINSTANCE qcap_instance DECLSPEC_HIDDEN; + extern DWORD ObjectRefCount(BOOL increment) DECLSPEC_HIDDEN; HRESULT audio_record_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; @@ -59,6 +61,4 @@ struct video_capture_funcs BOOL (*read_frame)(struct video_capture_device *device, BYTE *data); }; -extern const struct video_capture_funcs v4l_funcs; - #endif diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index 2ba423ea0e5..fd2c087640f 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -19,6 +19,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep unix +#endif + #define BIONIC_IOCTL_NO_SIGNEDNESS_OVERLOAD /* work around ioctl breakage on Android */ #include "config.h" @@ -47,7 +51,11 @@ #include <unistd.h> #endif +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "initguid.h" #include "qcap_private.h" +#include "winternl.h" WINE_DEFAULT_DEBUG_CHANNEL(qcap); @@ -558,17 +566,12 @@ const struct video_capture_funcs v4l_funcs = .read_frame = v4l_device_read_frame, }; -#else - -static struct video_capture_device *v4l_device_create(USHORT index) +NTSTATUS CDECL __wine_init_unix_lib(HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out) { - ERR("v4l2 was not present at compilation time.\n"); - return NULL; -} + if (reason != DLL_PROCESS_ATTACH) return STATUS_SUCCESS; -const struct video_capture_funcs v4l_funcs = -{ - .create = v4l_device_create, -}; + *(const struct video_capture_funcs **)ptr_out = &v4l_funcs; + return STATUS_SUCCESS; +} -#endif /* defined(VIDIOCMCAPTURE) */ +#endif /* HAVE_LINUX_VIDEODEV2_H */ diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 8123dc4f6f7..7b8787ef99f 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -19,6 +19,7 @@ */ #include "qcap_private.h" +#include "winternl.h" WINE_DEFAULT_DEBUG_CHANNEL(qcap); @@ -839,7 +840,7 @@ static const IAMVideoControlVtbl IAMVideoControl_VTable = static BOOL WINAPI load_capture_funcs(INIT_ONCE *once, void *param, void **context) { - capture_funcs = &v4l_funcs; + __wine_init_unix_lib(qcap_instance, DLL_PROCESS_ATTACH, NULL, &capture_funcs); return TRUE; } @@ -850,7 +851,7 @@ HRESULT vfw_capture_create(IUnknown *outer, IUnknown **out) static const WCHAR source_name[] = {'O','u','t','p','u','t',0}; struct vfw_capture *object; - if (!InitOnceExecuteOnce(&init_once, load_capture_funcs, NULL, NULL)) + if (!InitOnceExecuteOnce(&init_once, load_capture_funcs, NULL, NULL) || !capture_funcs) return E_FAIL; if (!(object = CoTaskMemAlloc(sizeof(*object))))

1 0

Zebediah Figura : qcap: Use malloc() instead of heap_alloc().
by Alexandre Julliard 27 Nov '20

27 Nov '20

Module: wine Branch: master Commit: 8bcb4466c99dcc5622bca584ca3b9a00f3e0d012 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8bcb4466c99dcc5622bca584… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 26 22:34:30 2020 -0600 qcap: Use malloc() instead of heap_alloc(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/v4l.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index b5a599eb0bc..2ba423ea0e5 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -116,9 +116,9 @@ static void v4l_device_destroy(struct video_capture_device *device) if (device->fd != -1) video_close(device->fd); if (device->caps_count) - heap_free(device->caps); - heap_free(device->image_data); - heap_free(device); + free(device->caps); + free(device->image_data); + free(device); } static const struct caps *find_caps(struct video_capture_device *device, const AM_MEDIA_TYPE *mt) @@ -167,7 +167,7 @@ static HRESULT set_caps(struct video_capture_device *device, const struct caps * height = caps->video_info.bmiHeader.biHeight; image_size = width * height * caps->video_info.bmiHeader.biBitCount / 8; - if (!(image_data = heap_alloc(image_size))) + if (!(image_data = malloc(image_size))) { ERR("Failed to allocate memory.\n"); return E_OUTOFMEMORY; @@ -183,14 +183,14 @@ static HRESULT set_caps(struct video_capture_device *device, const struct caps * || format.fmt.pix.height != height) { ERR("Failed to set pixel format: %s.\n", strerror(errno)); - heap_free(image_data); + free(image_data); return VFW_E_TYPE_NOT_ACCEPTED; } device->current_caps = caps; device->image_size = image_size; device->image_pitch = width * caps->video_info.bmiHeader.biBitCount / 8; - heap_free(device->image_data); + free(device->image_data); device->image_data = image_data; return S_OK; } @@ -407,7 +407,7 @@ struct video_capture_device *v4l_device_create(USHORT index) have_libv4l2 = video_init(); - if (!(device = heap_alloc_zero(sizeof(*device)))) + if (!(device = calloc(1, sizeof(*device)))) return NULL; sprintf(path, "/dev/video%i", index); @@ -509,7 +509,7 @@ struct video_capture_device *v4l_device_create(USHORT index) else ERR("Failed to get fps: %s.\n", strerror(errno)); - new_caps = heap_realloc(device->caps, (device->caps_count + 1) * sizeof(*device->caps)); + new_caps = realloc(device->caps, (device->caps_count + 1) * sizeof(*device->caps)); if (!new_caps) goto error; device->caps = new_caps;

1 0

Alexandre Julliard : server: Create the NLS section object for the l_intl.nls file.
by Alexandre Julliard 27 Nov '20

27 Nov '20

Module: wine Branch: master Commit: 8fa03e494acb10303fef360b510c3da61f4edc34 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8fa03e494acb10303fef360b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 27 16:41:07 2020 +0100 server: Create the NLS section object for the l_intl.nls file. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/directory.c | 16 ++++++++++------ server/file.h | 2 ++ server/main.c | 3 +-- server/mapping.c | 35 +++++++++++++++++++++++++++++++++++ server/object.h | 2 +- server/unicode.c | 20 ++++++++++++++------ server/unicode.h | 2 +- 7 files changed, 64 insertions(+), 16 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8fa03e494acb10303fef…

1 0

Alexandre Julliard : server: Use l_intl.nls for case mappings.
by Alexandre Julliard 27 Nov '20

27 Nov '20

Module: wine Branch: master Commit: 48c11f1e805ffa32e2150427ae64f9ffc0e3bafa URL: https://source.winehq.org/git/wine.git/?a=commit;h=48c11f1e805ffa32e2150427… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 27 16:40:37 2020 +0100 server: Use l_intl.nls for case mappings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/Makefile.in | 2 ++ server/main.c | 2 ++ server/unicode.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- server/unicode.h | 1 + 4 files changed, 79 insertions(+), 2 deletions(-) diff --git a/server/Makefile.in b/server/Makefile.in index e90c5d1336c..4264e3db108 100644 --- a/server/Makefile.in +++ b/server/Makefile.in @@ -50,3 +50,5 @@ MANPAGES = \ wineserver.man.in EXTRALIBS = $(LDEXECFLAGS) $(POLL_LIBS) $(RT_LIBS) $(INOTIFY_LIBS) + +unicode_EXTRADEFS = -DNLSDIR="\"${nlsdir}\"" -DBIN_TO_NLSDIR=\"`$(MAKEDEP) -R ${bindir} ${nlsdir}`\" diff --git a/server/main.c b/server/main.c index efb205f5292..5d7881a6af9 100644 --- a/server/main.c +++ b/server/main.c @@ -36,6 +36,7 @@ #include "file.h" #include "thread.h" #include "request.h" +#include "unicode.h" /* command-line options */ int debug_level = 0; @@ -143,6 +144,7 @@ int main( int argc, char *argv[] ) if (debug_level) fprintf( stderr, "wineserver: starting (pid=%ld)\n", (long) getpid() ); set_current_time(); init_signals(); + load_intl_file(); init_directories(); init_registry(); main_loop(); diff --git a/server/unicode.c b/server/unicode.c index 8d6c411cb66..0dde757313b 100644 --- a/server/unicode.c +++ b/server/unicode.c @@ -24,6 +24,7 @@ #include <ctype.h> #include <stdio.h> +#include "request.h" #include "unicode.h" /* number of following bytes in sequence based on first byte value (for bytes above 0x7f) */ @@ -45,6 +46,8 @@ static const unsigned char utf8_mask[4] = { 0x7f, 0x1f, 0x0f, 0x07 }; /* minimum Unicode value depending on UTF-8 sequence length */ static const unsigned int utf8_minval[4] = { 0x0, 0x80, 0x800, 0x10000 }; +static unsigned short *casemap; + static inline char to_hex( char ch ) { if (isdigit(ch)) return ch - '0'; @@ -53,8 +56,7 @@ static inline char to_hex( char ch ) static inline WCHAR to_lower( WCHAR ch ) { - extern const WCHAR wine_casemap_lower[]; - return ch + wine_casemap_lower[wine_casemap_lower[ch >> 8] + (ch & 0xff)]; + return ch + casemap[casemap[casemap[ch >> 8] + ((ch >> 4) & 0x0f)] + (ch & 0x0f)]; } int memicmp_strW( const WCHAR *str1, const WCHAR *str2, data_size_t len ) @@ -224,3 +226,73 @@ int dump_strW( const WCHAR *str, data_size_t len, FILE *f, const char escape[2] count += pos - buffer; return count; } + +static char *get_nls_dir(void) +{ + char *p, *dir, *ret; + const char *nlsdir = BIN_TO_NLSDIR; + +#if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) + dir = realpath( "/proc/self/exe", NULL ); +#elif defined (__FreeBSD__) || defined(__DragonFly__) + dir = realpath( "/proc/curproc/file", NULL ); +#else + dir = realpath( server_argv0, NULL ); +#endif + if (!dir) return NULL; + if (!(p = strrchr( dir, '/' ))) + { + free( dir ); + return NULL; + } + *(++p) = 0; + if (p > dir + 8 && !strcmp( p - 8, "/server/" )) nlsdir = "../nls"; /* inside build tree */ + if ((ret = malloc( strlen(dir) + strlen( nlsdir ) + 1 ))) + { + strcpy( ret, dir ); + strcat( ret, nlsdir ); + } + free( dir ); + return ret; +} + +/* load the case mapping table */ +void load_intl_file(void) +{ + static const char *nls_dirs[] = { NULL, NLSDIR, "/usr/local/share/wine/nls", "/usr/share/wine/nls" }; + unsigned int i, offset, size; + unsigned short data; + char *path; + int unix_fd = -1; + + nls_dirs[0] = get_nls_dir(); + for (i = 0; i < ARRAY_SIZE( nls_dirs ); i++) + { + if (!nls_dirs[i]) continue; + if (!(path = malloc( strlen(nls_dirs[i]) + sizeof("/l_intl.nls" )))) continue; + strcpy( path, nls_dirs[i] ); + strcat( path, "/l_intl.nls" ); + if ((unix_fd = open( path, O_RDONLY )) != -1) break; + free( path ); + } + if (unix_fd == -1) fatal_error( "failed to load l_intl.nls\n" ); + /* read initial offset */ + if (pread( unix_fd, &data, sizeof(data), 0 ) != sizeof(data) || !data) goto failed; + offset = data; + /* read size of uppercase table */ + if (pread( unix_fd, &data, sizeof(data), offset * 2 ) != sizeof(data) || !data) goto failed; + offset += data; + /* read size of lowercase table */ + if (pread( unix_fd, &data, sizeof(data), offset * 2 ) != sizeof(data) || !data) goto failed; + offset++; + size = data - 1; + /* read lowercase table */ + if (!(casemap = malloc( size * 2 ))) goto failed; + if (pread( unix_fd, casemap, size * 2, offset * 2 ) != size * 2) goto failed; + close( unix_fd ); + free( path ); + return; + +failed: + fatal_error( "invalid format for casemap table %s\n", path ); +} diff --git a/server/unicode.h b/server/unicode.h index c280fb8e7d1..ddbbe4b5cfc 100644 --- a/server/unicode.h +++ b/server/unicode.h @@ -31,5 +31,6 @@ extern unsigned int hash_strW( const WCHAR *str, data_size_t len, unsigned int h extern WCHAR *ascii_to_unicode_str( const char *str, struct unicode_str *ret ); extern int parse_strW( WCHAR *buffer, data_size_t *len, const char *src, char endchar ); extern int dump_strW( const WCHAR *str, data_size_t len, FILE *f, const char escape[2] ); +extern void load_intl_file(void); #endif /* __WINE_SERVER_UNICODE_H */

1 0

Alexandre Julliard : ntdll: Avoid closing an invalid handle on process creation failure.
by Alexandre Julliard 27 Nov '20

27 Nov '20

Module: wine Branch: master Commit: 4e6c1dff5859ab9e02446c54dc436480d1859472 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e6c1dff5859ab9e02446c54… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 27 13:05:01 2020 +0100 ntdll: Avoid closing an invalid handle on process creation failure. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index ad15a5cf66d..57bb8002dfa 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -406,6 +406,7 @@ static NTSTATUS get_pe_file_info( UNICODE_STRING *path, HANDLE *handle, pe_image OBJECT_ATTRIBUTES attr; IO_STATUS_BLOCK io; + *handle = 0; memset( info, 0, sizeof(*info) ); InitializeObjectAttributes( &attr, path, OBJ_CASE_INSENSITIVE, 0, 0 ); if ((status = NtOpenFile( handle, GENERIC_READ, &attr, &io, @@ -422,7 +423,6 @@ static NTSTATUS get_pe_file_info( UNICODE_STRING *path, HANDLE *handle, pe_image #else info->cpu = client_cpu; #endif - *handle = 0; return STATUS_SUCCESS; } return status;

1 0

Alexandre Julliard : msvcp: Use a constant string as fprintf format.
by Alexandre Julliard 27 Nov '20

27 Nov '20

Module: wine Branch: master Commit: 375278ccb7693a946b8ff5f79e8c4c489f9d9c56 URL: https://source.winehq.org/git/wine.git/?a=commit;h=375278ccb7693a946b8ff5f7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 27 11:37:21 2020 +0100 msvcp: Use a constant string as fprintf format. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp60/tests/ios.c | 2 +- dlls/msvcp90/tests/ios.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp60/tests/ios.c b/dlls/msvcp60/tests/ios.c index dc4700d518b..806090b9667 100644 --- a/dlls/msvcp60/tests/ios.c +++ b/dlls/msvcp60/tests/ios.c @@ -1467,7 +1467,7 @@ static void test_istream_tellg(void) /* filebuf */ file = fopen(testfile, "wt"); - fprintf(file, tests[i].str); + fprintf(file, "%s", tests[i].str); fclose(file); /* fstream<char> version */ diff --git a/dlls/msvcp90/tests/ios.c b/dlls/msvcp90/tests/ios.c index d9066fedd8d..6957f4ccba9 100644 --- a/dlls/msvcp90/tests/ios.c +++ b/dlls/msvcp90/tests/ios.c @@ -1969,7 +1969,7 @@ static void test_istream_tellg(void) /* filebuf */ file = fopen(testfile, "wt"); - fprintf(file, tests[i].str); + fprintf(file, "%s", tests[i].str); fclose(file); /* fstream<char> version */

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
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