April 2019 - Wine-Commits - list.winehq.org

Zebediah Figura : ntoskrnl.exe/tests: Add tests for ERESOURCE functions.
by Alexandre Julliard April 10, 2019

April 10, 2019

Module: wine Branch: master Commit: cc2e8d7cda1ab349dd7c67eb07dc8108def9f0dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc2e8d7cda1ab349dd7c67eb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 9 23:41:11 2019 -0500 ntoskrnl.exe/tests: Add tests for ERESOURCE functions. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver.c | 311 ++++++++++++++++++++++++++++++++++++++- include/ddk/wdm.h | 2 + 2 files changed, 312 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cc2e8d7cda1ab349dd7c…

1 0

Alexandre Julliard : msvcrt/tests: Add some function pointers to bypass gcc builtin functions.
by Alexandre Julliard April 10, 2019

April 10, 2019

Module: wine Branch: master Commit: 9a4b596ed9fa5ab545e3105cf15a04e24aa9ead3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a4b596ed9fa5ab545e3105c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 10 19:11:18 2019 +0200 msvcrt/tests: Add some function pointers to bypass gcc builtin functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/heap.c | 12 ++++-- dlls/msvcrt/tests/scanf.c | 100 ++++++++++++++++++++++++--------------------- dlls/msvcrt/tests/string.c | 12 ++++-- 3 files changed, 69 insertions(+), 55 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9a4b596ed9fa5ab545e3…

1 0

Zebediah Figura : ntoskrnl.exe: Implement ExIsResourceAcquiredExclusiveLite().
by Alexandre Julliard April 10, 2019

April 10, 2019

Module: wine Branch: master Commit: 37640f326943a24304fc6c52d174c22bee8417a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=37640f326943a24304fc6c52… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 9 23:41:09 2019 -0500 ntoskrnl.exe: Implement ExIsResourceAcquiredExclusiveLite(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/sync.c | 19 +++++++++++++++++++ include/ddk/wdm.h | 1 + 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 3324b3b..d3e6070 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -165,7 +165,7 @@ @ stub ExInterlockedPushEntryList @ stdcall ExInterlockedRemoveHeadList(ptr ptr) @ stub ExIsProcessorFeaturePresent -@ stub ExIsResourceAcquiredExclusiveLite +@ stdcall ExIsResourceAcquiredExclusiveLite(ptr) @ stub ExIsResourceAcquiredSharedLite @ stdcall ExLocalTimeToSystemTime(ptr ptr) RtlLocalTimeToSystemTime @ stub ExNotifyCallback diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 7009c4c..94b9778 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -1125,3 +1125,22 @@ ULONG WINAPI ExGetSharedWaiterCount( ERESOURCE *resource ) return count; } + +/*********************************************************************** + * ExIsResourceAcquiredExclusiveLite (NTOSKRNL.EXE.@) + */ +BOOLEAN WINAPI ExIsResourceAcquiredExclusiveLite( ERESOURCE *resource ) +{ + BOOLEAN ret; + KIRQL irql; + + TRACE("resource %p.\n", resource); + + KeAcquireSpinLock( &resource->SpinLock, &irql ); + + ret = (resource->OwnerEntry.OwnerThread == (ERESOURCE_THREAD)KeGetCurrentThread()); + + KeReleaseSpinLock( &resource->SpinLock, irql ); + + return ret; +} diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index a0219c4..5a84602 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1531,6 +1531,7 @@ NTSTATUS WINAPI ExInitializeResourceLite(ERESOURCE*); PSLIST_ENTRY WINAPI ExInterlockedPopEntrySList(PSLIST_HEADER,PKSPIN_LOCK); PSLIST_ENTRY WINAPI ExInterlockedPushEntrySList(PSLIST_HEADER,PSLIST_ENTRY,PKSPIN_LOCK); LIST_ENTRY * WINAPI ExInterlockedRemoveHeadList(LIST_ENTRY*,KSPIN_LOCK*); +BOOLEAN WINAPI ExIsResourceAcquiredExclusiveLite(ERESOURCE*); void WINAPI ExReleaseFastMutexUnsafe(PFAST_MUTEX); void WINAPI ExReleaseResourceForThreadLite(ERESOURCE*,ERESOURCE_THREAD); ULONG WINAPI ExSetTimerResolution(ULONG,BOOLEAN);

1 0

Nikolay Sivov : include: Add more dbgeng interface definitions.
by Alexandre Julliard April 10, 2019

April 10, 2019

Module: wine Branch: master Commit: 810227f72efbf9ee8c6a67651bc1b5899ff4649d URL: https://source.winehq.org/git/wine.git/?a=commit;h=810227f72efbf9ee8c6a6765… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 10 13:40:32 2019 +0300 include: Add more dbgeng interface definitions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dbgeng.h | 207 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 207 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=810227f72efbf9ee8c6a…

1 0

Zebediah Figura : qcap: Get rid of no longer used YUV to RGB conversion routines.
by Alexandre Julliard April 10, 2019

April 10, 2019

Module: wine Branch: master Commit: 7ac13067149e76e24bdc4ab402c9e6c7471d16fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ac13067149e76e24bdc4ab4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 10 09:46:28 2019 -0500 qcap: Get rid of no longer used YUV to RGB conversion routines. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/Makefile.in | 3 +- dlls/qcap/qcap_main.h | 19 ----- dlls/qcap/v4l.c | 1 - dlls/qcap/yuv.c | 200 -------------------------------------------------- 4 files changed, 1 insertion(+), 222 deletions(-) diff --git a/dlls/qcap/Makefile.in b/dlls/qcap/Makefile.in index 71a785b..e161e06 100644 --- a/dlls/qcap/Makefile.in +++ b/dlls/qcap/Makefile.in @@ -11,7 +11,6 @@ C_SRCS = \ qcap_main.c \ smartteefilter.c \ v4l.c \ - vfwcapture.c \ - yuv.c + vfwcapture.c RC_SRCS = version.rc diff --git a/dlls/qcap/qcap_main.h b/dlls/qcap/qcap_main.h index 733772e..0e767bd 100644 --- a/dlls/qcap/qcap_main.h +++ b/dlls/qcap/qcap_main.h @@ -41,23 +41,4 @@ extern IUnknown * WINAPI QCAP_createAudioInputMixerPropertyPage(IUnknown *pUnkOu void dump_AM_MEDIA_TYPE(const AM_MEDIA_TYPE * pmt) DECLSPEC_HIDDEN; -enum YUV_Format { - /* Last 2 numbers give the skip info, the smaller they are the better - * Planar: - * HSKIP : VSKIP */ - YUVP_421, /* 2 : 1 */ - YUVP_422, /* 2 : 2 */ - YUVP_441, /* 4 : 1 */ - YUVP_444, /* 4 : 4 */ - ENDPLANAR, /* No format, just last planar item so we can check on it */ - - /* Non-planar */ - YUYV, /* Order: YUYV (Guess why it's named like that) */ - UYVY, /* Order: UYVY (Looks like someone got bored and swapped the Y's) */ - UYYVYY, /* YUV411 linux style, perhaps YUV420 is YYUYYV? */ -}; - -void YUV_Init(void) DECLSPEC_HIDDEN; -void YUV_To_RGB24(enum YUV_Format format, unsigned char *target, const unsigned char *source, int width, int height) DECLSPEC_HIDDEN; - #endif /* _QCAP_MAIN_H_DEFINED */ diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index ce322d0..809ce7a 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -576,7 +576,6 @@ Capture * qcap_driver_init( IPin *pOut, USHORT card ) char path[20]; int fd; - YUV_Init(); have_libv4l2 = video_init(); if (!(device = CoTaskMemAlloc(sizeof(*device)))) diff --git a/dlls/qcap/yuv.c b/dlls/qcap/yuv.c deleted file mode 100644 index 0ba78d0..0000000 --- a/dlls/qcap/yuv.c +++ /dev/null @@ -1,200 +0,0 @@ -/* DirectShow capture services (QCAP.DLL) - * - * Copyright 2005 Maarten Lankhorst - * - * This file contains the part of the vfw capture interface that - * does the actual Video4Linux(1/2) stuff required for capturing - * and setting/getting media format.. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "config.h" -#include <stdarg.h> - -#include "windef.h" -#include "wingdi.h" -#include "objbase.h" -#include "strmif.h" -#include "qcap_main.h" -#include "wine/debug.h" - -/* This is not used if V4L support is missing */ -#ifdef HAVE_LINUX_VIDEODEV2_H - -WINE_DEFAULT_DEBUG_CHANNEL(qcap); - -static int yuv_xy[256]; /* Gray value */ -static int yuv_gu[256]; /* Green U */ -static int yuv_bu[256]; /* Blue U */ -static int yuv_rv[256]; /* Red V */ -static int yuv_gv[256]; /* Green V */ -static BOOL initialised = FALSE; - -static inline int ValidRange(int in) { - if (in > 255) in = 255; - if (in < 0) in = 0; - return in; -} - -typedef struct RGB { -#if 0 /* For some reason I have to revert R and B, not sure why */ - unsigned char r, g, b; -#else - unsigned char b, g, r; -#endif -} RGB; - -static inline void YUV2RGB(const unsigned char y_, const unsigned char cb, const unsigned char cr, RGB* retval) { - retval->r = ValidRange(yuv_xy[y_] + yuv_rv[cr]); - retval->g = ValidRange(yuv_xy[y_] + yuv_gu[cb] + yuv_gv[cr]); - retval->b = ValidRange(yuv_xy[y_] + yuv_bu[cb]); -} - -void YUV_Init(void) { - float y, u, v; - int y_, cb, cr; - - if (initialised) return; - initialised = TRUE; - - for (y_ = 0; y_ <= 255; y_++) - { - y = ((float) 255 / 219) * (y_ - 16); - yuv_xy[y_] = y; - } - - for (cb = 0; cb <= 255; cb++) - { - u = ((float) 255 / 224) * (cb - 128); - yuv_gu[cb] = -0.344 * u; - yuv_bu[cb] = 1.772 * u; - } - - for (cr = 0; cr <= 255; cr++) - { - v = ((float) 255 / 224) * (cr - 128); - yuv_rv[cr] = 1.402 * v; - yuv_gv[cr] = -0.714 * v; - } - TRACE("Filled hash table\n"); -} - -static void Parse_YUYV(unsigned char *destbuffer, const unsigned char *input, int width, int height) -{ - const unsigned char *pY, *pCb, *pCr; - int togo = width * height / 2; - pY = input; - pCb = input+1; - pCr = input+3; - while (--togo) { - YUV2RGB(*pY, *pCb, *pCr, (RGB *)destbuffer); - pY += 2; destbuffer += 3; - YUV2RGB(*pY, *pCb, *pCr, (RGB *)destbuffer); - pY += 2; pCb += 4; pCr += 4; destbuffer += 3; - } -} - -static void Parse_UYVY(unsigned char *destbuffer, const unsigned char *input, int width, int height) -{ - const unsigned char *pY, *pCb, *pCr; - int togo = width * height / 2; - pY = input+1; - pCb = input; - pCr = input+2; - while (--togo) { - YUV2RGB(*pY, *pCb, *pCr, (RGB *)destbuffer); - pY += 2; destbuffer += 3; - YUV2RGB(*pY, *pCb, *pCr, (RGB *)destbuffer); - pY += 2; pCb += 4; pCr += 4; destbuffer += 3; - } -} - -static void Parse_UYYVYY(unsigned char *destbuffer, const unsigned char *input, int width, int height) -{ - const unsigned char *pY, *pCb, *pCr; - int togo = width * height / 4; - pY = input+1; - pCb = input; - pCr = input+4; - while (--togo) { - YUV2RGB(*pY, *pCb, *pCr, (RGB *)destbuffer); - destbuffer += 3; pY++; - YUV2RGB(*pY, *pCb, *pCr, (RGB *)destbuffer); - pY += 2; destbuffer += 3; - YUV2RGB(*pY, *pCb, *pCr, (RGB *)destbuffer); - destbuffer += 3; pY++; - YUV2RGB(*pY, *pCb, *pCr, (RGB *)destbuffer); - pY += 2; pCb += 6; pCr += 6; destbuffer += 3; - } -} - -static void Parse_PYUV(unsigned char *destbuffer, const unsigned char *input, int width, int height, int wstep, int hstep) -{ - /* We have 3 pointers, One to Y, one to Cb and 1 to Cr */ - -/* C19 *89* declaration block (Grr julliard for not allowing C99) */ - int ysize, uvsize; - const unsigned char *pY, *pCb, *pCr; - int swstep = 0, shstep = 0; - int ypos = 0, xpos = 0; - int indexUV = 0, cUv; -/* End of Grr */ - - ysize = width * height; - uvsize = (width / wstep) * (height / hstep); - pY = input; - pCb = pY + ysize; - pCr = pCb + uvsize; - /* Bottom down DIB */ - do { - swstep = 0; - cUv = indexUV; - for (xpos = 0; xpos < width; xpos++) { - YUV2RGB(*(pY++), pCb[cUv], pCr[cUv], (RGB *)destbuffer); - destbuffer += 3; - if (++swstep == wstep) { - cUv++; - swstep = 0; - } - } - if (++shstep == hstep) { - shstep = 0; - indexUV = cUv; - } - } while (++ypos < height); -} - -void YUV_To_RGB24(enum YUV_Format format, unsigned char *target, const unsigned char *source, int width, int height) { - int wstep, hstep; - if (format < ENDPLANAR) { - switch (format) { - case YUVP_421: wstep = 2; hstep = 1; break; - case YUVP_422: wstep = 2; hstep = 2; break; - case YUVP_441: wstep = 4; hstep = 1; break; - case YUVP_444: wstep = 4; hstep = 4; break; - default: ERR("Unhandled format \"%d\"\n", format); return; - } - Parse_PYUV(target, source, width, height, wstep, hstep); - } else { - switch (format) { - case YUYV: Parse_YUYV(target, source, width, height); return; - case UYVY: Parse_UYVY(target, source, width, height); return; - case UYYVYY: Parse_UYYVYY(target, source, width, height); return; - default: ERR("Unhandled format \"%d\"\n", format); return; - } - } -} -#endif

1 0

Zebediah Figura : qcap: Require libv4l2 to perform pixel format translation.
by Alexandre Julliard April 10, 2019

April 10, 2019

Module: wine Branch: master Commit: 0423d5e65a6c7094d829d2a215fcf6a44bf57714 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0423d5e65a6c7094d829d2a2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 10 09:46:27 2019 -0500 qcap: Require libv4l2 to perform pixel format translation. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/v4l.c | 165 +++++++------------------------------------------------- 1 file changed, 20 insertions(+), 145 deletions(-) diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index 04f9718..ce322d0 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -94,8 +94,6 @@ static BOOL video_init(void) #endif } -typedef void (* Renderer)(const Capture *, LPBYTE bufferin, const BYTE *stream); - struct _Capture { UINT width, height, bitDepth, fps, outputwidth, outputheight; @@ -107,36 +105,10 @@ struct _Capture int fd, mmap; BOOL iscommitted, stopped; - __u32 pixelformat; - int depth; - int image_size; unsigned char *image_data; HANDLE thread; - Renderer renderer; -}; - -static void renderer_RGB(const Capture *capBox, LPBYTE bufferin, const BYTE *stream); -static void renderer_YUV(const Capture *capBox, LPBYTE bufferin, const BYTE *stream); - -static const struct -{ - int depth; - __u32 pixelformat; - Renderer renderer; -} -renderlist_V4l[] = -{ - {24, V4L2_PIX_FMT_BGR24, renderer_RGB}, - {32, V4L2_PIX_FMT_BGR32, renderer_RGB}, - {16, V4L2_PIX_FMT_YUYV, renderer_YUV}, - {16, V4L2_PIX_FMT_UYVY, renderer_YUV}, - {12, V4L2_PIX_FMT_Y41P, renderer_YUV}, - {16, V4L2_PIX_FMT_YUV422P, renderer_YUV}, - {12, V4L2_PIX_FMT_YUV411P, renderer_YUV}, - {12, V4L2_PIX_FMT_YUV420, renderer_YUV}, - {10, V4L2_PIX_FMT_YUV410, renderer_YUV}, }; static int xioctl(int fd, int request, void * arg) @@ -153,7 +125,7 @@ static int xioctl(int fd, int request, void * arg) /* Prepare the capture buffers */ static HRESULT V4l_Prepare(Capture *device) { - device->image_size = device->depth * device->height * device->width / 8; + device->image_size = device->height * device->width * 3; if (!(device->image_data = heap_alloc(device->image_size))) return E_OUTOFMEMORY; return S_OK; @@ -347,70 +319,6 @@ HRESULT qcap_driver_set_prop(Capture *device, VideoProcAmpProperty property, return S_OK; } -static void renderer_RGB(const Capture *device, BYTE *bufferin, const BYTE *stream) -{ - int size = device->height * device->width * device->depth / 8; - int pointer, offset; - - switch (device->pixelformat) - { - case V4L2_PIX_FMT_BGR24: - memcpy(bufferin, stream, size); - break; - case V4L2_PIX_FMT_BGR32: - pointer = 0; - offset = 1; - while (pointer + offset <= size) - { - bufferin[pointer] = stream[pointer + offset]; - pointer++; - bufferin[pointer] = stream[pointer + offset]; - pointer++; - bufferin[pointer] = stream[pointer + offset]; - pointer++; - offset++; - } - break; - default: - FIXME("Unhandled pixel format %#x.\n", device->pixelformat); - return; - } -} - -static void renderer_YUV(const Capture *device, BYTE *bufferin, const BYTE *stream) -{ - enum YUV_Format format; - - switch (device->pixelformat) - { - case V4L2_PIX_FMT_YUYV: - format = YUYV; - break; - case V4L2_PIX_FMT_UYVY: - format = UYVY; - break; - case V4L2_PIX_FMT_Y41P: - format = UYYVYY; - break; - case V4L2_PIX_FMT_YUV422P: - format = YUVP_421; - break; - case V4L2_PIX_FMT_YUV411P: - format = YUVP_441; - break; - case V4L2_PIX_FMT_YUV420: - format = YUVP_422; - break; - case V4L2_PIX_FMT_YUV410: - format = YUVP_444; - break; - default: - FIXME("Unhandled pixel format %#x.\n", device->pixelformat); - return; - } - YUV_To_RGB24(format, bufferin, stream, device->width, device->height); -} - static void Resize(const Capture * capBox, LPBYTE output, const BYTE *input) { /* the whole image needs to be reversed, @@ -522,7 +430,7 @@ static DWORD WINAPI ReadThread(LPVOID lParam) IMediaSample_GetPointer(pSample, &pTarget); /* FIXME: Check return values.. */ V4l_GetFrame(capBox, &pInput); - capBox->renderer(capBox, pOutput, pInput); + memcpy(pOutput, pInput, len); Resize(capBox, pTarget, pOutput); hr = BaseOutputPinImpl_Deliver((BaseOutputPin *)capBox->pOut, pSample); TRACE("%p -> Frame %u: %x\n", capBox, ++framecount, hr); @@ -659,57 +567,10 @@ HRESULT qcap_driver_stop(Capture *capBox, FILTER_STATE *state) return S_OK; } -static int negotiate_format(Capture *device) -{ - struct v4l2_format format = {0}; - int fd = device->fd; - unsigned int i; - - format.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; - - if (xioctl(fd, VIDIOC_G_FMT, &format) == -1) - { - ERR("Failed to get device format: %s\n", strerror(errno)); - return -1; - } - - for (i = 0; i < ARRAY_SIZE(renderlist_V4l); ++i) - { - if (renderlist_V4l[i].pixelformat == format.fmt.pix.pixelformat) - { - TRACE("Using device-reported format %#x.\n", format.fmt.pix.pixelformat); - device->depth = renderlist_V4l[i].depth; - device->renderer = renderlist_V4l[i].renderer; - device->pixelformat = format.fmt.pix.pixelformat; - device->width = format.fmt.pix.width; - device->height = format.fmt.pix.height; - return 0; - } - } - - for (i = 0; i < ARRAY_SIZE(renderlist_V4l); ++i) - { - format.fmt.pix.pixelformat = renderlist_V4l[i].pixelformat; - if (!xioctl(fd, VIDIOC_S_FMT, &format) - && format.fmt.pix.pixelformat == renderlist_V4l[i].pixelformat) - { - TRACE("Using format %#x.\n", format.fmt.pix.pixelformat); - device->depth = renderlist_V4l[i].depth; - device->renderer = renderlist_V4l[i].renderer; - device->pixelformat = format.fmt.pix.pixelformat; - device->width = format.fmt.pix.width; - device->height = format.fmt.pix.height; - return 0; - } - } - - FIXME("Could not negotiate an acceptable format.\n"); - return -1; -} - Capture * qcap_driver_init( IPin *pOut, USHORT card ) { struct v4l2_capability caps = {{0}}; + struct v4l2_format format = {0}; Capture *device = NULL; BOOL have_libv4l2; char path[20]; @@ -762,11 +623,25 @@ Capture * qcap_driver_init( IPin *pOut, USHORT card ) goto error; } - if (negotiate_format(device) == -1) + format.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; + if (xioctl(fd, VIDIOC_G_FMT, &format) == -1) + { + ERR("Failed to get device format: %s\n", strerror(errno)); + goto error; + } + + format.fmt.pix.pixelformat = V4L2_PIX_FMT_BGR24; + if (xioctl(fd, VIDIOC_S_FMT, &format) == -1 + || format.fmt.pix.pixelformat != V4L2_PIX_FMT_BGR24) + { + ERR("Failed to set pixel format: %s\n", strerror(errno)); + if (!have_libv4l2) + ERR_(winediag)("You may need libv4l2 to use this device.\n"); goto error; + } - device->outputwidth = device->width; - device->outputheight = device->height; + device->outputwidth = device->width = format.fmt.pix.width; + device->outputheight = device->height = format.fmt.pix.height; device->swresize = FALSE; device->bitDepth = 24; device->pOut = pOut;

1 0

Zebediah Figura : qcap: Port to libv4l2.
by Alexandre Julliard April 10, 2019

April 10, 2019

Module: wine Branch: master Commit: 34ef3c89ad15d4d1f552acbf2e1c131f79f22082 URL: https://source.winehq.org/git/wine.git/?a=commit;h=34ef3c89ad15d4d1f552acbf… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 10 09:46:25 2019 -0500 qcap: Port to libv4l2. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 61 +++-- configure.ac | 14 +- dlls/qcap/qcap_main.h | 1 + dlls/qcap/v4l.c | 614 ++++++++++++++++++++------------------------------ dlls/qcap/yuv.c | 2 +- include/config.h.in | 10 +- 6 files changed, 284 insertions(+), 418 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=34ef3c89ad15d4d1f552…

1 0

Michael Stefaniuc : gdi32/tests: Avoid the comma operator.
by Alexandre Julliard April 10, 2019

April 10, 2019

Module: wine Branch: master Commit: 89327da738f3edc8ba69bdbf1e8e7423bae5e316 URL: https://source.winehq.org/git/wine.git/?a=commit;h=89327da738f3edc8ba69bdbf… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Apr 10 10:50:50 2019 +0200 gdi32/tests: Avoid the comma operator. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/bitmap.c | 156 +++++++++++++++++++++++----------------------- dlls/gdi32/tests/pen.c | 2 +- 2 files changed, 79 insertions(+), 79 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=89327da738f3edc8ba69…

1 0

Alistair Leslie-Hughes : winejoystick.drv: Remove support for linux kernels older than 2.2.
by Alexandre Julliard April 10, 2019

April 10, 2019

Module: wine Branch: master Commit: 59b08c3af371dbafd90b08e034c2674cefec5d92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=59b08c3af371dbafd90b08e0… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Apr 10 04:33:55 2019 +0000 winejoystick.drv: Remove support for linux kernels older than 2.2. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winejoystick.drv/joystick_linux.c | 62 ++-------------------------------- 1 file changed, 2 insertions(+), 60 deletions(-) diff --git a/dlls/winejoystick.drv/joystick_linux.c b/dlls/winejoystick.drv/joystick_linux.c index 287f4be..85ad2fe 100644 --- a/dlls/winejoystick.drv/joystick_linux.c +++ b/dlls/winejoystick.drv/joystick_linux.c @@ -38,7 +38,7 @@ #include "config.h" #include "wine/port.h" -#ifdef HAVE_LINUX_JOYSTICK_H +#ifdef HAVE_LINUX_22_JOYSTICK_API #ifdef HAVE_UNISTD_H # include <unistd.h> @@ -174,11 +174,7 @@ static int JSTCK_OpenDevice(WINE_JSTCK* jstick) return -1; last_attempt = now; -#ifdef HAVE_LINUX_22_JOYSTICK_API flags = O_RDONLY | O_NONBLOCK; -#else - flags = O_RDONLY; -#endif /* The first joystick may not be at /dev/input/js0, find the correct * first or second device. For example the driver for XBOX 360 wireless @@ -203,10 +199,9 @@ static int JSTCK_OpenDevice(WINE_JSTCK* jstick) close(fd); } -#ifdef HAVE_LINUX_22_JOYSTICK_API if (jstick->dev > 0) ioctl(jstick->dev, JSIOCGAXMAP, jstick->axesMap); -#endif + return jstick->dev; } @@ -217,21 +212,16 @@ static int JSTCK_OpenDevice(WINE_JSTCK* jstick) LRESULT driver_joyGetDevCaps(DWORD_PTR dwDevID, LPJOYCAPSW lpCaps, DWORD dwSize) { WINE_JSTCK* jstck; -#ifdef HAVE_LINUX_22_JOYSTICK_API int dev; char nrOfAxes; char nrOfButtons; char identString[MAXPNAMELEN]; int i; int driverVersion; -#else -static const WCHAR ini[] = {'W','i','n','e',' ','J','o','y','s','t','i','c','k',' ','D','r','i','v','e','r',0}; -#endif if ((jstck = JSTCK_drvGet(dwDevID)) == NULL) return MMSYSERR_NODRIVER; -#ifdef HAVE_LINUX_22_JOYSTICK_API if ((dev = JSTCK_OpenDevice(jstck)) < 0) return JOYERR_PARMS; ioctl(dev, JSIOCGAXES, &nrOfAxes); ioctl(dev, JSIOCGBUTTONS, &nrOfButtons); @@ -310,33 +300,6 @@ static const WCHAR ini[] = {'W','i','n','e',' ','J','o','y','s','t','i','c','k', } } } -#else - lpCaps->wMid = MM_MICROSOFT; - lpCaps->wPid = MM_PC_JOYSTICK; - strcpyW(lpCaps->szPname, ini); /* joystick product name */ - lpCaps->wXmin = 0; - lpCaps->wXmax = 0xFFFF; - lpCaps->wYmin = 0; - lpCaps->wYmax = 0xFFFF; - lpCaps->wZmin = 0; - lpCaps->wZmax = 0; - lpCaps->wNumButtons = 2; - if (dwSize == sizeof(JOYCAPSW)) { - /* complete 95 structure */ - lpCaps->wRmin = 0; - lpCaps->wRmax = 0; - lpCaps->wUmin = 0; - lpCaps->wUmax = 0; - lpCaps->wVmin = 0; - lpCaps->wVmax = 0; - lpCaps->wCaps = 0; - lpCaps->wMaxAxes = 2; - lpCaps->wNumAxes = 2; - lpCaps->wMaxButtons = 4; - lpCaps->szRegKey[0] = 0; - lpCaps->szOEMVxD[0] = 0; - } -#endif return JOYERR_NOERROR; } @@ -348,19 +311,13 @@ LRESULT driver_joyGetPosEx(DWORD_PTR dwDevID, LPJOYINFOEX lpInfo) { WINE_JSTCK* jstck; int dev; -#ifdef HAVE_LINUX_22_JOYSTICK_API struct js_event ev; -#else - struct js_status js; - int dev_stat; -#endif if ((jstck = JSTCK_drvGet(dwDevID)) == NULL) return MMSYSERR_NODRIVER; if ((dev = JSTCK_OpenDevice(jstck)) < 0) return JOYERR_PARMS; -#ifdef HAVE_LINUX_22_JOYSTICK_API while ((read(dev, &ev, sizeof(struct js_event))) > 0) { if (ev.type == (JS_EVENT_AXIS)) { switch (jstck->axesMap[ev.number]) { @@ -467,21 +424,6 @@ LRESULT driver_joyGetPosEx(DWORD_PTR dwDevID, LPJOYINFOEX lpInfo) lpInfo->dwPOV = JOY_POVCENTERED; /* Center */ } -#else - dev_stat = read(dev, &js, sizeof(js)); - if (dev_stat != sizeof(js)) { - return JOYERR_UNPLUGGED; /* FIXME: perhaps wrong, but what should I return else ? */ - } - js.x = js.x<<8; - js.y = js.y<<8; - if (lpInfo->dwFlags & JOY_RETURNX) - lpInfo->dwXpos = js.x; /* FIXME: perhaps multiply it somehow ? */ - if (lpInfo->dwFlags & JOY_RETURNY) - lpInfo->dwYpos = js.y; - if (lpInfo->dwFlags & JOY_RETURNBUTTONS) - lpInfo->dwButtons = js.buttons; -#endif - TRACE("x: %d, y: %d, z: %d, r: %d, u: %d, v: %d, buttons: 0x%04x, flags: 0x%04x (fd %d)\n", lpInfo->dwXpos, lpInfo->dwYpos, lpInfo->dwZpos, lpInfo->dwRpos, lpInfo->dwUpos, lpInfo->dwVpos,

1 0

André Hentschel : include: Fix vararg standard call types for ARM.
by Alexandre Julliard April 10, 2019

April 10, 2019

Module: wine Branch: master Commit: 49abdbcda972f959949945f4cd8b16d645c93728 URL: https://source.winehq.org/git/wine.git/?a=commit;h=49abdbcda972f959949945f4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Apr 9 21:55:47 2019 +0200 include: Fix vararg standard call types for ARM. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/basetyps.h | 8 ++++---- include/winnt.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/basetyps.h b/include/basetyps.h index d55005f..9487533 100644 --- a/include/basetyps.h +++ b/include/basetyps.h @@ -26,10 +26,10 @@ # define EXTERN_C extern #endif -#define STDMETHODCALLTYPE __stdcall -#define STDMETHODVCALLTYPE __cdecl -#define STDAPICALLTYPE __stdcall -#define STDAPIVCALLTYPE __cdecl +#define STDMETHODCALLTYPE WINAPI +#define STDMETHODVCALLTYPE WINAPIV +#define STDAPICALLTYPE WINAPI +#define STDAPIVCALLTYPE WINAPIV #define STDAPI EXTERN_C HRESULT STDAPICALLTYPE #define STDAPI_(t) EXTERN_C t STDAPICALLTYPE #define STDMETHODIMP HRESULT STDMETHODCALLTYPE diff --git a/include/winnt.h b/include/winnt.h index 29a7372..bdcd90a 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -412,10 +412,10 @@ extern "C++" { \ # define EXTERN_C extern #endif -#define STDMETHODCALLTYPE __stdcall -#define STDMETHODVCALLTYPE __cdecl -#define STDAPICALLTYPE __stdcall -#define STDAPIVCALLTYPE __cdecl +#define STDMETHODCALLTYPE WINAPI +#define STDMETHODVCALLTYPE WINAPIV +#define STDAPICALLTYPE WINAPI +#define STDAPIVCALLTYPE WINAPIV #define STDAPI EXTERN_C HRESULT STDAPICALLTYPE #define STDAPI_(type) EXTERN_C type STDAPICALLTYPE

1 0