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

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

April 10, 2019

Module: wine Branch: master Commit: 631473ffd98f6ba978082374a4aa60cf7cd7d6c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=631473ffd98f6ba978082374… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 9 23:41:07 2019 -0500 ntoskrnl.exe: Implement ExGetExclusiveWaiterCount(). 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 2d1c826..bdf2a44 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -146,7 +146,7 @@ @ stub ExFreeToPagedLookasideList @ stub ExGetCurrentProcessorCounts @ stub ExGetCurrentProcessorCpuUsage -@ stub ExGetExclusiveWaiterCount +@ stdcall ExGetExclusiveWaiterCount(ptr) @ stub ExGetPreviousMode @ stub ExGetSharedWaiterCount @ stdcall ExInitializeNPagedLookasideList(ptr ptr ptr long long long long) diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index c8cae7d..823ff2b 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -1087,3 +1087,22 @@ void WINAPI ExReleaseResourceLite( ERESOURCE *resource ) { ExReleaseResourceForThreadLite( resource, (ERESOURCE_THREAD)KeGetCurrentThread() ); } + +/*********************************************************************** + * ExGetExclusiveWaiterCount (NTOSKRNL.EXE.@) + */ +ULONG WINAPI ExGetExclusiveWaiterCount( ERESOURCE *resource ) +{ + ULONG count; + KIRQL irql; + + TRACE("resource %p.\n", resource); + + KeAcquireSpinLock( &resource->SpinLock, &irql ); + + count = resource->NumberOfExclusiveWaiters; + + KeReleaseSpinLock( &resource->SpinLock, irql ); + + return count; +} diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 41c462f..241f6d6 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1524,6 +1524,7 @@ void WINAPI ExDeleteNPagedLookasideList(PNPAGED_LOOKASIDE_LIST); NTSTATUS WINAPI ExDeleteResourceLite(ERESOURCE*); void WINAPI ExFreePool(PVOID); void WINAPI ExFreePoolWithTag(PVOID,ULONG); +ULONG WINAPI ExGetExclusiveWaiterCount(ERESOURCE*); void WINAPI ExInitializeNPagedLookasideList(PNPAGED_LOOKASIDE_LIST,PALLOCATE_FUNCTION,PFREE_FUNCTION,ULONG,SIZE_T,ULONG,USHORT); NTSTATUS WINAPI ExInitializeResourceLite(ERESOURCE*); PSLIST_ENTRY WINAPI ExInterlockedPopEntrySList(PSLIST_HEADER,PKSPIN_LOCK);

1 0

Nikolay Sivov : mfreadwrite/tests: Remove broken test.
by Alexandre Julliard April 10, 2019

April 10, 2019

Module: wine Branch: master Commit: dabb0bc25f6efdda8eaeab15d82b7006f6256865 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dabb0bc25f6efdda8eaeab15… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 10 13:37:21 2019 +0300 mfreadwrite/tests: Remove broken test. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/tests/mfplat.c | 45 +++-------------------------------------- 1 file changed, 3 insertions(+), 42 deletions(-) diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index 16fa822..074c403 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -79,47 +79,6 @@ static IMFByteStream *get_resource_stream(const char *name) return bytestream; } -static void test_MFCreateSourceReaderFromByteStream(void) -{ - static const WCHAR audio[] = {'A','u','d','i','o',0}; - IMFSourceReader *reader = NULL; - IMFAttributes *attributes; - IMFByteStream *bytestream = NULL; - IStream *stream = NULL; - HRESULT hr; - - if(!pMFCreateMFByteStreamOnStream) - { - win_skip("MFCreateMFByteStreamOnStream() not found\n"); - return; - } - - hr = MFCreateAttributes( &attributes, 3 ); - ok(hr == S_OK, "got 0x%08x\n", hr); - - hr = IMFAttributes_SetString(attributes, &MF_READWRITE_MMCSS_CLASS_AUDIO, audio); - ok(hr == S_OK, "Failed to set string value, hr %#x.\n", hr); - - hr = IMFAttributes_SetUINT32(attributes, &MF_READWRITE_MMCSS_PRIORITY_AUDIO, 0); - ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); - - hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); - ok(hr == S_OK, "got 0x%08x\n", hr); - - hr = pMFCreateMFByteStreamOnStream(stream, &bytestream); - ok(hr == S_OK, "got 0x%08x\n", hr); - - hr = MFCreateSourceReaderFromByteStream(bytestream, attributes, &reader); -todo_wine - ok(hr == S_OK || hr == MF_E_UNSUPPORTED_BYTESTREAM_TYPE, "got 0x%08x\n", hr); - - IStream_Release(stream); - IMFByteStream_Release(bytestream); - IMFAttributes_Release(attributes); - if (reader) - IMFSourceReader_Release(reader); -} - static void test_factory(void) { IMFReadWriteClassFactory *factory, *factory2; @@ -237,7 +196,10 @@ static void test_source_reader(void) HRESULT hr; if (!pMFCreateMFByteStreamOnStream) + { + win_skip("MFCreateMFByteStreamOnStream() not found\n"); return; + } stream = get_resource_stream("test.wav"); @@ -379,7 +341,6 @@ START_TEST(mfplat) init_functions(); - test_MFCreateSourceReaderFromByteStream(); test_factory(); test_source_reader();

1 0

Martin Storsjo : configure: Use -Werror= unknown-warning-option in later cross tests.
by Alexandre Julliard April 10, 2019

April 10, 2019

Module: wine Branch: master Commit: 9ee154066ab571c81d4a2a7a7739c3e9841a02ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ee154066ab571c81d4a2a7a… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Apr 10 15:49:17 2019 +0300 configure: Use -Werror=unknown-warning-option in later cross tests. Previously, if detected, the option was added to EXTRACROSSFLAGS, which isn't taken into use in later WINE_TRY_CROSSCFLAGS tests. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index dd000b2..a966217 100755 --- a/configure +++ b/configure @@ -9768,7 +9768,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crosscflags__Werror_unknown_warning_option" >&5 $as_echo "$ac_cv_crosscflags__Werror_unknown_warning_option" >&6; } if test "x$ac_cv_crosscflags__Werror_unknown_warning_option" = xyes; then : - EXTRACROSSCFLAGS="$EXTRACROSSCFLAGS -Werror=unknown-warning-option" + CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -Wdeclaration-after-statement" >&5 $as_echo_n "checking whether the cross-compiler supports -Wdeclaration-after-statement... " >&6; } diff --git a/configure.ac b/configure.ac index ad4f0e0..d8ab782 100644 --- a/configure.ac +++ b/configure.ac @@ -1024,7 +1024,7 @@ then [AC_MSG_RESULT([no])]) WINE_TRY_CROSSCFLAGS([-fno-strict-aliasing]) dnl clang needs to be told to fail on unknown options - WINE_TRY_CROSSCFLAGS([-Werror=unknown-warning-option]) + WINE_TRY_CROSSCFLAGS([-Werror=unknown-warning-option],[CFLAGS="$CFLAGS -Werror=unknown-warning-option"]) WINE_TRY_CROSSCFLAGS([-Wdeclaration-after-statement]) WINE_TRY_CROSSCFLAGS([-Wempty-body]) WINE_TRY_CROSSCFLAGS([-Wignored-qualifiers])

1 0

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

April 10, 2019

Module: wine Branch: master Commit: 01566351fac63e88452fc7aa3b057b4d92d5f25e URL: https://source.winehq.org/git/wine.git/?a=commit;h=01566351fac63e88452fc7aa… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 9 23:41:08 2019 -0500 ntoskrnl.exe: Implement ExGetSharedWaiterCount(). 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 bdf2a44..3324b3b 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -148,7 +148,7 @@ @ stub ExGetCurrentProcessorCpuUsage @ stdcall ExGetExclusiveWaiterCount(ptr) @ stub ExGetPreviousMode -@ stub ExGetSharedWaiterCount +@ stdcall ExGetSharedWaiterCount(ptr) @ stdcall ExInitializeNPagedLookasideList(ptr ptr ptr long long long long) @ stdcall ExInitializePagedLookasideList(ptr ptr ptr long long long long) @ stdcall ExInitializeResourceLite(ptr) diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 823ff2b..7009c4c 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -1106,3 +1106,22 @@ ULONG WINAPI ExGetExclusiveWaiterCount( ERESOURCE *resource ) return count; } + +/*********************************************************************** + * ExGetSharedWaiterCount (NTOSKRNL.EXE.@) + */ +ULONG WINAPI ExGetSharedWaiterCount( ERESOURCE *resource ) +{ + ULONG count; + KIRQL irql; + + TRACE("resource %p.\n", resource); + + KeAcquireSpinLock( &resource->SpinLock, &irql ); + + count = resource->NumberOfSharedWaiters; + + KeReleaseSpinLock( &resource->SpinLock, irql ); + + return count; +} diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 241f6d6..a0219c4 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1525,6 +1525,7 @@ NTSTATUS WINAPI ExDeleteResourceLite(ERESOURCE*); void WINAPI ExFreePool(PVOID); void WINAPI ExFreePoolWithTag(PVOID,ULONG); ULONG WINAPI ExGetExclusiveWaiterCount(ERESOURCE*); +ULONG WINAPI ExGetSharedWaiterCount(ERESOURCE*); void WINAPI ExInitializeNPagedLookasideList(PNPAGED_LOOKASIDE_LIST,PALLOCATE_FUNCTION,PFREE_FUNCTION,ULONG,SIZE_T,ULONG,USHORT); NTSTATUS WINAPI ExInitializeResourceLite(ERESOURCE*); PSLIST_ENTRY WINAPI ExInterlockedPopEntrySList(PSLIST_HEADER,PKSPIN_LOCK);

1 0

Martin Storsjo : winebuild: Print the nm command in verbose mode.
by Alexandre Julliard April 10, 2019

April 10, 2019

Module: wine Branch: master Commit: f098cd6d3ade425e19a1cc958d75a1fd7a6cc169 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f098cd6d3ade425e19a1cc95… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Apr 10 15:49:59 2019 +0300 winebuild: Print the nm command in verbose mode. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/import.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 8838769..b82ff91 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -548,6 +548,8 @@ void read_undef_symbols( DLLSPEC *spec, char **argv ) name = ldcombine_files( spec, argv ); cmd = strmake( "%s -u %s", prog, name ); + if (verbose) + fprintf( stderr, "%s\n", cmd ); if (!(f = popen( cmd, "r" ))) fatal_error( "Cannot execute '%s'\n", cmd );

1 0

André Hentschel : ntdll: Translate signal to trap when trap code is 0 on ARM.
by Alexandre Julliard April 10, 2019

April 10, 2019

Module: wine Branch: master Commit: 4bfc2c32ffcf861fc1804c1e350152b9bef5b07c URL: https://source.winehq.org/git/wine.git/?a=commit;h=4bfc2c32ffcf861fc1804c1e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Apr 9 21:55:59 2019 +0200 ntdll: Translate signal to trap when trap code is 0 on ARM. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46187 Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index db9cb80..5db3c51 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -142,10 +142,24 @@ struct UNWIND_INFO * * Get the trap code for a signal. */ -static inline enum arm_trap_code get_trap_code( const ucontext_t *sigcontext ) +static inline enum arm_trap_code get_trap_code( int signal, const ucontext_t *sigcontext ) { #ifdef TRAP_sig - return TRAP_sig(sigcontext); + enum arm_trap_code trap = TRAP_sig(sigcontext); + if (trap) + return trap; + /* trap is 0 on arm64 kernel */ + switch (signal) + { + case SIGILL: + return TRAP_ARM_PRIVINFLT; + case SIGSEGV: + return TRAP_ARM_PAGEFLT; + case SIGBUS: + return TRAP_ARM_ALIGNFLT; + default: + return trap; + } #else return TRAP_ARM_UNKNOWN; /* unknown trap code */ #endif @@ -718,7 +732,7 @@ static void segv_handler( int signal, siginfo_t *info, void *ucontext ) ucontext_t *context = ucontext; /* check for page fault inside the thread stack */ - if (get_trap_code(context) == TRAP_ARM_PAGEFLT && + if (get_trap_code(signal, context) == TRAP_ARM_PAGEFLT && (char *)info->si_addr >= (char *)NtCurrentTeb()->DeallocationStack && (char *)info->si_addr < (char *)NtCurrentTeb()->Tib.StackBase && virtual_handle_stack_fault( info->si_addr )) @@ -735,7 +749,7 @@ static void segv_handler( int signal, siginfo_t *info, void *ucontext ) rec = setup_exception( context, raise_segv_exception ); if (rec->ExceptionCode == EXCEPTION_STACK_OVERFLOW) return; - switch(get_trap_code(context)) + switch(get_trap_code(signal, context)) { case TRAP_ARM_PRIVINFLT: /* Invalid opcode exception */ rec->ExceptionCode = EXCEPTION_ILLEGAL_INSTRUCTION; @@ -756,7 +770,7 @@ static void segv_handler( int signal, siginfo_t *info, void *ucontext ) rec->ExceptionInformation[1] = 0xffffffff; break; default: - ERR("Got unexpected trap %d\n", get_trap_code(context)); + ERR("Got unexpected trap %d\n", get_trap_code(signal, context)); rec->ExceptionCode = EXCEPTION_ILLEGAL_INSTRUCTION; break; }

1 0

Józef Kucia : include: Add definitions for versioned root signatures.
by Alexandre Julliard April 10, 2019

April 10, 2019

Module: vkd3d Branch: master Commit: 799434fc8f33a2804488eda938edcf8cf1bc53a0 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=799434fc8f33a2804488eda… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 10 17:48:51 2019 +0200 include: Add definitions for versioned root signatures. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_d3d12.idl | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index e3f9df0..3cefd1f 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -590,7 +590,11 @@ typedef struct D3D12_DESCRIPTOR_RANGE typedef enum D3D12_DESCRIPTOR_RANGE_FLAGS { - D3D12_DESCRIPTOR_RANGE_FLAG_NONE = 0, + D3D12_DESCRIPTOR_RANGE_FLAG_NONE = 0x0, + D3D12_DESCRIPTOR_RANGE_FLAG_DESCRIPTORS_VOLATILE = 0x1, + D3D12_DESCRIPTOR_RANGE_FLAG_DATA_VOLATILE = 0x2, + D3D12_DESCRIPTOR_RANGE_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE = 0x4, + D3D12_DESCRIPTOR_RANGE_FLAG_DATA_STATIC = 0x8, } D3D12_DESCRIPTOR_RANGE_FLAGS; typedef struct D3D12_DESCRIPTOR_RANGE1 @@ -630,7 +634,10 @@ typedef struct D3D12_ROOT_DESCRIPTOR typedef enum D3D12_ROOT_DESCRIPTOR_FLAGS { - D3D12_ROOT_DESCRIPTOR_FLAG_NONE = 0, + D3D12_ROOT_DESCRIPTOR_FLAG_NONE = 0x0, + D3D12_ROOT_DESCRIPTOR_FLAG_DATA_VOLATILE = 0x2, + D3D12_ROOT_DESCRIPTOR_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE = 0x4, + D3D12_ROOT_DESCRIPTOR_FLAG_DATA_STATIC = 0x8, } D3D12_ROOT_DESCRIPTOR_FLAGS; typedef struct D3D12_ROOT_DESCRIPTOR1 @@ -2298,13 +2305,36 @@ interface ID3D12RootSignatureDeserializer : IUnknown const D3D12_ROOT_SIGNATURE_DESC *GetRootSignatureDesc(); } +[ + uuid(7f91ce67-090c-4bb7-b78e-ed8ff2e31da0), + object, + local, + pointer_default(unique) +] +interface ID3D12VersionedRootSignatureDeserializer : IUnknown +{ + HRESULT GetRootSignatureDescAtVersion(D3D_ROOT_SIGNATURE_VERSION version, + const D3D12_VERSIONED_ROOT_SIGNATURE_DESC **desc); + + const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *GetUnconvertedRootSignatureDesc(); +}; + [local] HRESULT __stdcall D3D12CreateRootSignatureDeserializer( const void *data, SIZE_T data_size, REFIID iid, void **deserializer); +typedef HRESULT (__stdcall *PFN_D3D12_CREATE_VERSIONED_ROOT_SIGNATURE_DESERIALIZER)( + const void *data, SIZE_T data_size, REFIID iid, void **deserializer); + +[local] HRESULT __stdcall D3D12CreateVersionedRootSignatureDeserializer( + const void *data, SIZE_T data_size, REFIID iid, void **deserializer); + [local] HRESULT __stdcall D3D12SerializeRootSignature( const D3D12_ROOT_SIGNATURE_DESC *root_signature_desc, D3D_ROOT_SIGNATURE_VERSION version, ID3DBlob **blob, ID3DBlob **error_blob); +typedef HRESULT (__stdcall *PFN_D3D12_SERIALIZE_VERSIONED_ROOT_SIGNATURE)( + const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *desc, ID3DBlob **blob, ID3DBlob **error_blob); + [local] HRESULT __stdcall D3D12SerializeVersionedRootSignature( const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *root_signature_desc, ID3DBlob **blob, ID3DBlob **error_blob);

1 0

Józef Kucia : build: Drop hack for stripping RPC includes from widl-generated headers.
by Alexandre Julliard April 10, 2019

April 10, 2019

Module: vkd3d Branch: master Commit: 233caa2fb0d365f655ceeede599f73b289305f86 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=233caa2fb0d365f655ceeed… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 10 17:31:57 2019 +0200 build: Drop hack for stripping RPC includes from widl-generated headers. This requires widl from Wine >= 3.20: commit b7402ddbbecdfaa81daa657fbb5d37661f401434 Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Nov 19 15:07:02 2018 +0100 widl: Guard RPC includes with #ifdef _WIN32. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 6 +- configure.ac | 2 +- m4/ax_compare_version.m4 | 177 +++++++++++++++++++++++++++++++++++++++++++++++ m4/widl.m4 | 14 ++++ 4 files changed, 194 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index 9ad7b2e..2b5bca0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -170,9 +170,7 @@ vkd3d_v_widl_1 = EXTRA_DIST += $(widl_headers) $(widl_headers:.h=.idl) $(widl_headers): %.h: %.idl if HAVE_WIDL - $(VKD3D_V_WIDL)$(WIDL) -h -o $@.tmp $< - $(AM_V_at)$(SED) -e '/#include <rpc.h>/d' -e '/#include <rpcndr.h>/d' <$@.tmp >$@ - $(AM_V_at)$(RM) $@.tmp + $(VKD3D_V_WIDL)$(WIDL) -h -o $@ $< else @echo "widl is required to generate $@" endif @@ -235,7 +233,7 @@ $(CROSS32_IMPLIBS): %.cross32.a: %.cross32.def $(AM_V_GEN)$(CROSS32_DLLTOOL) -k -m i386 --as-flags=-32 -d $< -l $@ $(CROSS32_EXEFILES): %.cross32.exe: %.c $(CROSS32_IMPLIBS) $(widl_headers) - $(AM_V_CCLD)depbase=`echo $@ | sed 's![^/]*$$!$(DEPDIR)/&!;s!\.exe$$!!'`; \ + $(AM_V_CCLD)depbase=`echo $@ | $(SED) 's![^/]*$$!$(DEPDIR)/&!;s!\.exe$$!!'`; \ $(CROSS32_CC) $(CROSS_CFLAGS) -MT $@ -MD -MP -MF $$depbase.Tpo -o $@ $< $(CROSS32_IMPLIBS) -ldxgi -lgdi32 && \ $(am__mv) $$depbase.Tpo $$depbase.Po else diff --git a/configure.ac b/configure.ac index 0292781..28f2ac9 100644 --- a/configure.ac +++ b/configure.ac @@ -26,7 +26,7 @@ AC_PROG_CC AM_PROG_CC_C_O AC_PROG_SED AC_PROG_MKDIR_P -AC_CHECK_PROG([WIDL], [widl], [widl], [no]) +VKD3D_PROG_WIDL(3, 20) AS_IF([test "x$WIDL" = "xno"], [AC_MSG_WARN([widl is required to build header files.])]) AM_INIT_AUTOMAKE([1.11 foreign silent-rules subdir-objects no-dist-gzip dist-xz -Wall -Werror]) diff --git a/m4/ax_compare_version.m4 b/m4/ax_compare_version.m4 new file mode 100644 index 0000000..ffb4997 --- /dev/null +++ b/m4/ax_compare_version.m4 @@ -0,0 +1,177 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_compare_version.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_COMPARE_VERSION(VERSION_A, OP, VERSION_B, [ACTION-IF-TRUE], [ACTION-IF-FALSE]) +# +# DESCRIPTION +# +# This macro compares two version strings. Due to the various number of +# minor-version numbers that can exist, and the fact that string +# comparisons are not compatible with numeric comparisons, this is not +# necessarily trivial to do in a autoconf script. This macro makes doing +# these comparisons easy. +# +# The six basic comparisons are available, as well as checking equality +# limited to a certain number of minor-version levels. +# +# The operator OP determines what type of comparison to do, and can be one +# of: +# +# eq - equal (test A == B) +# ne - not equal (test A != B) +# le - less than or equal (test A <= B) +# ge - greater than or equal (test A >= B) +# lt - less than (test A < B) +# gt - greater than (test A > B) +# +# Additionally, the eq and ne operator can have a number after it to limit +# the test to that number of minor versions. +# +# eq0 - equal up to the length of the shorter version +# ne0 - not equal up to the length of the shorter version +# eqN - equal up to N sub-version levels +# neN - not equal up to N sub-version levels +# +# When the condition is true, shell commands ACTION-IF-TRUE are run, +# otherwise shell commands ACTION-IF-FALSE are run. The environment +# variable 'ax_compare_version' is always set to either 'true' or 'false' +# as well. +# +# Examples: +# +# AX_COMPARE_VERSION([3.15.7],[lt],[3.15.8]) +# AX_COMPARE_VERSION([3.15],[lt],[3.15.8]) +# +# would both be true. +# +# AX_COMPARE_VERSION([3.15.7],[eq],[3.15.8]) +# AX_COMPARE_VERSION([3.15],[gt],[3.15.8]) +# +# would both be false. +# +# AX_COMPARE_VERSION([3.15.7],[eq2],[3.15.8]) +# +# would be true because it is only comparing two minor versions. +# +# AX_COMPARE_VERSION([3.15.7],[eq0],[3.15]) +# +# would be true because it is only comparing the lesser number of minor +# versions of the two values. +# +# Note: The characters that separate the version numbers do not matter. An +# empty string is the same as version 0. OP is evaluated by autoconf, not +# configure, so must be a string, not a variable. +# +# The author would like to acknowledge Guido Draheim whose advice about +# the m4_case and m4_ifvaln functions make this macro only include the +# portions necessary to perform the specific comparison specified by the +# OP argument in the final configure script. +# +# LICENSE +# +# Copyright (c) 2008 Tim Toolan <toolan(a)ele.uri.edu> +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 13 + +dnl ######################################################################### +AC_DEFUN([AX_COMPARE_VERSION], [ + AC_REQUIRE([AC_PROG_AWK]) + + # Used to indicate true or false condition + ax_compare_version=false + + # Convert the two version strings to be compared into a format that + # allows a simple string comparison. The end result is that a version + # string of the form 1.12.5-r617 will be converted to the form + # 0001001200050617. In other words, each number is zero padded to four + # digits, and non digits are removed. + AS_VAR_PUSHDEF([A],[ax_compare_version_A]) + A=`echo "$1" | sed -e 's/$[[0-9]]*$/Z\1Z/g' \ + -e 's/Z$[[0-9]]$Z/Z0\1Z/g' \ + -e 's/Z$[[0-9]][[0-9]]$Z/Z0\1Z/g' \ + -e 's/Z$[[0-9]][[0-9]][[0-9]]$Z/Z0\1Z/g' \ + -e 's/[[^0-9]]//g'` + + AS_VAR_PUSHDEF([B],[ax_compare_version_B]) + B=`echo "$3" | sed -e 's/$[[0-9]]*$/Z\1Z/g' \ + -e 's/Z$[[0-9]]$Z/Z0\1Z/g' \ + -e 's/Z$[[0-9]][[0-9]]$Z/Z0\1Z/g' \ + -e 's/Z$[[0-9]][[0-9]][[0-9]]$Z/Z0\1Z/g' \ + -e 's/[[^0-9]]//g'` + + dnl # In the case of le, ge, lt, and gt, the strings are sorted as necessary + dnl # then the first line is used to determine if the condition is true. + dnl # The sed right after the echo is to remove any indented white space. + m4_case(m4_tolower($2), + [lt],[ + ax_compare_version=`echo "x$A +x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/false/;s/x${B}/true/;1q"` + ], + [gt],[ + ax_compare_version=`echo "x$A +x$B" | sed 's/^ *//' | sort | sed "s/x${A}/false/;s/x${B}/true/;1q"` + ], + [le],[ + ax_compare_version=`echo "x$A +x$B" | sed 's/^ *//' | sort | sed "s/x${A}/true/;s/x${B}/false/;1q"` + ], + [ge],[ + ax_compare_version=`echo "x$A +x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/true/;s/x${B}/false/;1q"` + ],[ + dnl Split the operator from the subversion count if present. + m4_bmatch(m4_substr($2,2), + [0],[ + # A count of zero means use the length of the shorter version. + # Determine the number of characters in A and B. + ax_compare_version_len_A=`echo "$A" | $AWK '{print(length)}'` + ax_compare_version_len_B=`echo "$B" | $AWK '{print(length)}'` + + # Set A to no more than B's length and B to no more than A's length. + A=`echo "$A" | sed "s/$.\{$ax_compare_version_len_B\}$.*/\1/"` + B=`echo "$B" | sed "s/$.\{$ax_compare_version_len_A\}$.*/\1/"` + ], + [[0-9]+],[ + # A count greater than zero means use only that many subversions + A=`echo "$A" | sed "s/$\([[0-9]]\{4\}$\{m4_substr($2,2)\}\).*/\1/"` + B=`echo "$B" | sed "s/$\([[0-9]]\{4\}$\{m4_substr($2,2)\}\).*/\1/"` + ], + [.+],[ + AC_WARNING( + [invalid OP numeric parameter: $2]) + ],[]) + + # Pad zeros at end of numbers to make same length. + ax_compare_version_tmp_A="$A`echo $B | sed 's/./0/g'`" + B="$B`echo $A | sed 's/./0/g'`" + A="$ax_compare_version_tmp_A" + + # Check for equality or inequality as necessary. + m4_case(m4_tolower(m4_substr($2,0,2)), + [eq],[ + test "x$A" = "x$B" && ax_compare_version=true + ], + [ne],[ + test "x$A" != "x$B" && ax_compare_version=true + ],[ + AC_WARNING([invalid OP parameter: $2]) + ]) + ]) + + AS_VAR_POPDEF([A])dnl + AS_VAR_POPDEF([B])dnl + + dnl # Execute ACTION-IF-TRUE / ACTION-IF-FALSE. + if test "$ax_compare_version" = "true" ; then + m4_ifvaln([$4],[$4],[:])dnl + m4_ifvaln([$5],[else $5])dnl + fi +]) dnl AX_COMPARE_VERSION diff --git a/m4/widl.m4 b/m4/widl.m4 new file mode 100644 index 0000000..2849356 --- /dev/null +++ b/m4/widl.m4 @@ -0,0 +1,14 @@ +dnl VKD3D_PROG_WIDL(major, minor) +AC_DEFUN([VKD3D_PROG_WIDL], + +[AC_CHECK_PROG([WIDL], [widl], [widl], [no]) + +AS_IF([test "x$WIDL" != "xno"], +[AC_MSG_CHECKING([checking whether widl version >= $1.$2]) +vkd3d_widl_version=`$WIDL -V | $SED -E '/version/{s/.* version (.*)/\1/;q;}'` + +AX_COMPARE_VERSION([$vkd3d_widl_version], [ge], [$1.$2], + [AC_MSG_RESULT([yes ($vkd3d_widl_version)])], + [AC_MSG_RESULT([no ($vkd3d_widl_version)]) + WIDL=no]) +])])

1 0

Józef Kucia : vkd3d: Fix device features structure chain.
by Alexandre Julliard April 10, 2019

April 10, 2019

Module: vkd3d Branch: master Commit: ec458df6ff98122c7b22ccef370758a21526c00b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ec458df6ff98122c7b22cce… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 10 17:31:58 2019 +0200 vkd3d: Fix device features structure chain. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 43c6830..5c0c880 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1583,7 +1583,7 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, depth_clip_features.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_CLIP_ENABLE_FEATURES_EXT; memset(&descriptor_indexing_features, 0, sizeof(descriptor_indexing_features)); descriptor_indexing_features.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_FEATURES_EXT; - descriptor_indexing_features.pNext = &depth_clip_features.pNext; + descriptor_indexing_features.pNext = &depth_clip_features; memset(&xfb_features, 0, sizeof(xfb_features)); xfb_features.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TRANSFORM_FEEDBACK_FEATURES_EXT; xfb_features.pNext = &descriptor_indexing_features;

1 0

Józef Kucia : vkd3d: Add stubs for versioned root signatures.
by Alexandre Julliard April 10, 2019

April 10, 2019

Module: vkd3d Branch: master Commit: 3b83ccc67e2a695b61fb374bf6f8d5b9cf605b47 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3b83ccc67e2a695b61fb374… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 10 17:32:00 2019 +0200 vkd3d: Add stubs for versioned root signatures. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d.h | 13 +++++++++++++ libs/vkd3d-utils/vkd3d_utils.map | 2 ++ libs/vkd3d-utils/vkd3d_utils_main.c | 24 ++++++++++++++++++++---- libs/vkd3d/vkd3d.map | 2 ++ libs/vkd3d/vkd3d_main.c | 24 ++++++++++++++++++++---- 5 files changed, 57 insertions(+), 8 deletions(-) diff --git a/include/vkd3d.h b/include/vkd3d.h index 39c4c6b..24cb34e 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -154,9 +154,15 @@ ULONG vkd3d_resource_incref(ID3D12Resource *resource); HRESULT vkd3d_serialize_root_signature(const D3D12_ROOT_SIGNATURE_DESC *desc, D3D_ROOT_SIGNATURE_VERSION version, ID3DBlob **blob, ID3DBlob **error_blob); +HRESULT vkd3d_serialize_versioned_root_signature(const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *desc, + ID3DBlob **blob, ID3DBlob **error_blob); + HRESULT vkd3d_create_root_signature_deserializer(const void *data, SIZE_T data_size, REFIID iid, void **deserializer); +HRESULT vkd3d_create_versioned_root_signature_deserializer(const void *data, SIZE_T data_size, + REFIID iid, void **deserializer); + DXGI_FORMAT vkd3d_get_dxgi_format(VkFormat format); VkFormat vkd3d_get_vk_format(DXGI_FORMAT format); @@ -190,9 +196,16 @@ typedef ULONG (*PFN_vkd3d_resource_incref)(ID3D12Resource *resource); typedef HRESULT (*PFN_vkd3d_serialize_root_signature)(const D3D12_ROOT_SIGNATURE_DESC *desc, D3D_ROOT_SIGNATURE_VERSION version, ID3DBlob **blob, ID3DBlob **error_blob); +typedef HRESULT (*PFN_vkd3d_serialize_versioned_root_signature)(const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *desc, + ID3DBlob **blob, ID3DBlob **error_blob); + typedef HRESULT (*PFN_vkd3d_create_root_signature_deserializer)(const void *data, SIZE_T data_size, REFIID iid, void **deserializer); +typedef HRESULT (*PFN_vkd3d_create_versioned_root_signature_deserializer)(const void *data, SIZE_T data_size, + REFIID iid, void **deserializer); + +typedef DXGI_FORMAT (*PFN_vkd3d_get_dxgi_format)(VkFormat format); typedef VkFormat (*PFN_vkd3d_get_vk_format)(DXGI_FORMAT format); #ifdef __cplusplus diff --git a/libs/vkd3d-utils/vkd3d_utils.map b/libs/vkd3d-utils/vkd3d_utils.map index 79858e5..9d95a84 100644 --- a/libs/vkd3d-utils/vkd3d_utils.map +++ b/libs/vkd3d-utils/vkd3d_utils.map @@ -3,8 +3,10 @@ VKD3D_1_0 global: D3D12CreateDevice; D3D12CreateRootSignatureDeserializer; + D3D12CreateVersionedRootSignatureDeserializer; D3D12GetDebugInterface; D3D12SerializeRootSignature; + D3D12SerializeVersionedRootSignature; vkd3d_create_event; vkd3d_destroy_event; vkd3d_signal_event; diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index 03f9f52..d06a750 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -87,13 +87,29 @@ HRESULT WINAPI D3D12CreateRootSignatureDeserializer(const void *data, SIZE_T dat return vkd3d_create_root_signature_deserializer(data, data_size, iid, deserializer); } -HRESULT WINAPI D3D12SerializeRootSignature(const D3D12_ROOT_SIGNATURE_DESC *root_signature_desc, +HRESULT WINAPI D3D12CreateVersionedRootSignatureDeserializer(const void *data, SIZE_T data_size, + REFIID iid,void **deserializer) +{ + TRACE("data %p, data_size %lu, iid %s, deserializer %p.\n", + data, data_size, debugstr_guid(iid), deserializer); + + return vkd3d_create_versioned_root_signature_deserializer(data, data_size, iid, deserializer); +} + +HRESULT WINAPI D3D12SerializeRootSignature(const D3D12_ROOT_SIGNATURE_DESC *desc, D3D_ROOT_SIGNATURE_VERSION version, ID3DBlob **blob, ID3DBlob **error_blob) { - TRACE("root_signature_desc %p, version %#x, blob %p, error_blob %p.\n", - root_signature_desc, version, blob, error_blob); + TRACE("desc %p, version %#x, blob %p, error_blob %p.\n", desc, version, blob, error_blob); + + return vkd3d_serialize_root_signature(desc, version, blob, error_blob); +} + +HRESULT WINAPI D3D12SerializeVersionedRootSignature(const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *desc, + ID3DBlob **blob, ID3DBlob **error_blob) +{ + TRACE("desc %p, blob %p, error_blob %p.\n", desc, blob, error_blob); - return vkd3d_serialize_root_signature(root_signature_desc, version, blob, error_blob); + return vkd3d_serialize_versioned_root_signature(desc, blob, error_blob); } /* Events */ diff --git a/libs/vkd3d/vkd3d.map b/libs/vkd3d/vkd3d.map index f43c85c..6f1f376 100644 --- a/libs/vkd3d/vkd3d.map +++ b/libs/vkd3d/vkd3d.map @@ -6,6 +6,7 @@ global: vkd3d_create_image_resource; vkd3d_create_instance; vkd3d_create_root_signature_deserializer; + vkd3d_create_versioned_root_signature_deserializer; vkd3d_get_device_parent; vkd3d_get_dxgi_format; vkd3d_get_vk_device; @@ -20,6 +21,7 @@ global: vkd3d_resource_decref; vkd3d_resource_incref; vkd3d_serialize_root_signature; + vkd3d_serialize_versioned_root_signature; local: *; }; diff --git a/libs/vkd3d/vkd3d_main.c b/libs/vkd3d/vkd3d_main.c index 5e93a2a..8f9351b 100644 --- a/libs/vkd3d/vkd3d_main.c +++ b/libs/vkd3d/vkd3d_main.c @@ -205,6 +205,15 @@ HRESULT vkd3d_create_root_signature_deserializer(const void *data, SIZE_T data_s &IID_ID3D12RootSignatureDeserializer, iid, deserializer); } +HRESULT vkd3d_create_versioned_root_signature_deserializer(const void *data, SIZE_T data_size, + REFIID iid, void **deserializer) +{ + FIXME("data %p, data_size %lu, iid %s, deserializer %p stub!\n", + data, data_size, debugstr_guid(iid), deserializer); + + return E_NOTIMPL; +} + /* ID3DBlob */ struct d3d_blob { @@ -319,7 +328,7 @@ static HRESULT d3d_blob_create(void *buffer, SIZE_T size, struct d3d_blob **blob return S_OK; } -HRESULT vkd3d_serialize_root_signature(const D3D12_ROOT_SIGNATURE_DESC *root_signature_desc, +HRESULT vkd3d_serialize_root_signature(const D3D12_ROOT_SIGNATURE_DESC *desc, D3D_ROOT_SIGNATURE_VERSION version, ID3DBlob **blob, ID3DBlob **error_blob) { struct vkd3d_shader_code dxbc; @@ -327,8 +336,7 @@ HRESULT vkd3d_serialize_root_signature(const D3D12_ROOT_SIGNATURE_DESC *root_sig HRESULT hr; int ret; - TRACE("root_signature_desc %p, version %#x, blob %p, error_blob %p.\n", - root_signature_desc, version, blob, error_blob); + TRACE("desc %p, version %#x, blob %p, error_blob %p.\n", desc, version, blob, error_blob); if (!blob) { @@ -340,7 +348,7 @@ HRESULT vkd3d_serialize_root_signature(const D3D12_ROOT_SIGNATURE_DESC *root_sig *error_blob = NULL; if ((ret = vkd3d_shader_serialize_root_signature( - (const struct vkd3d_root_signature_desc *)root_signature_desc, + (const struct vkd3d_root_signature_desc *)desc, (enum vkd3d_root_signature_version)version, &dxbc)) < 0) { WARN("Failed to serialize root signature, vkd3d result %d.\n", ret); @@ -360,3 +368,11 @@ HRESULT vkd3d_serialize_root_signature(const D3D12_ROOT_SIGNATURE_DESC *root_sig return S_OK; } + +HRESULT vkd3d_serialize_versioned_root_signature(const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *desc, + ID3DBlob **blob, ID3DBlob **error_blob) +{ + FIXME("desc %p, blob %p, error_blob %p stub!\n", desc, blob, error_blob); + + return E_NOTIMPL; +}

1 0

Nikolay Sivov : mfreadwrite/tests: Add some tests for source reader.
by Alexandre Julliard April 9, 2019

April 9, 2019

Module: wine Branch: master Commit: 1d2567e03ac67bb476d33074cb95e696132043c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d2567e03ac67bb476d33074… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 9 13:45:10 2019 +0300 mfreadwrite/tests: Add some tests for source reader. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/tests/Makefile.in | 2 + dlls/mfreadwrite/tests/mfplat.c | 273 ++++++++++++++++++++++++++++++++++++- dlls/mfreadwrite/tests/resource.rc | 22 +++ dlls/mfreadwrite/tests/test.wav | Bin 0 -> 4488 bytes 4 files changed, 293 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1d2567e03ac67bb476d3…

1 0

Piotr Caban : d3dx9: Don't use strcasecmp.
by Alexandre Julliard April 9, 2019

April 9, 2019

Module: wine Branch: master Commit: 5c5a8ae23ff7fe9c103de4e3dfce06bf1b8778c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c5a8ae23ff7fe9c103de4e3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 8 14:30:47 2019 +0200 d3dx9: Don't use strcasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 269f75e..a4bce69 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -25,6 +25,7 @@ #include "d3dx9_private.h" #include "d3dcompiler.h" +#include "winternl.h" /* Constants for special INT/FLOAT conversation */ #define INT_FLOAT_MULTI 255.0f @@ -2024,7 +2025,7 @@ static D3DXHANDLE WINAPI d3dx_effect_GetParameterBySemantic(ID3DXEffect *iface, continue; } - if (!strcasecmp(temp_param->semantic, semantic)) + if (!_strnicmp(temp_param->semantic, semantic, -1)) { TRACE("Returning parameter %p\n", temp_param); return get_parameter_handle(temp_param); @@ -2047,7 +2048,7 @@ static D3DXHANDLE WINAPI d3dx_effect_GetParameterBySemantic(ID3DXEffect *iface, continue; } - if (!strcasecmp(temp_param->semantic, semantic)) + if (!_strnicmp(temp_param->semantic, semantic, -1)) { TRACE("Returning parameter %p\n", temp_param); return get_parameter_handle(temp_param);

1 0

Paul Gofman : wined3d: Use ARB_shader_bit_encoding for storing local constants when available.
by Alexandre Julliard April 9, 2019

April 9, 2019

Module: wine Branch: master Commit: 5ed7a61de7e72ecf4cf6ef76d4044f32640b93cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ed7a61de7e72ecf4cf6ef76… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Apr 8 20:41:50 2019 +0300 wined3d: Use ARB_shader_bit_encoding for storing local constants when available. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 7c41158..ce4c0d8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -420,7 +420,8 @@ static void shader_glsl_add_version_declaration(struct wined3d_string_buffer *bu shader_addline(buffer, "#version %u\n", shader_glsl_get_version(gl_info)); } -static void shader_glsl_append_imm_vec4(struct wined3d_string_buffer *buffer, const float *values) +static void shader_glsl_append_imm_vec4(struct wined3d_string_buffer *buffer, const float *values, + const struct wined3d_gl_info *gl_info) { char str[4][17]; @@ -428,7 +429,17 @@ static void shader_glsl_append_imm_vec4(struct wined3d_string_buffer *buffer, co wined3d_ftoa(values[1], str[1]); wined3d_ftoa(values[2], str[2]); wined3d_ftoa(values[3], str[3]); - shader_addline(buffer, "vec4(%s, %s, %s, %s)", str[0], str[1], str[2], str[3]); + + if (gl_info->supported[ARB_SHADER_BIT_ENCODING]) + { + const unsigned int *uint_values = (const unsigned int *)values; + + shader_addline(buffer, "uintBitsToFloat(uvec4(%#xu, %#xu, %#xu, %#xu))\n" + " /* %s, %s, %s, %s */", uint_values[0], uint_values[1], + uint_values[2], uint_values[3], str[0], str[1], str[2], str[3]); + } + else + shader_addline(buffer, "vec4(%s, %s, %s, %s)", str[0], str[1], str[2], str[3]); } static void shader_glsl_append_imm_ivec(struct wined3d_string_buffer *buffer, @@ -2785,7 +2796,7 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont LIST_FOR_EACH_ENTRY(lconst, &shader->constantsF, struct wined3d_shader_lconst, entry) { shader_addline(buffer, "const vec4 %s_lc%u = ", prefix, lconst->idx); - shader_glsl_append_imm_vec4(buffer, (const float *)lconst->value); + shader_glsl_append_imm_vec4(buffer, (const float *)lconst->value, gl_info); shader_addline(buffer, ";\n"); } } @@ -7957,10 +7968,10 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context if (args->srgb_correction) { shader_addline(buffer, "const vec4 srgb_const0 = "); - shader_glsl_append_imm_vec4(buffer, wined3d_srgb_const0); + shader_glsl_append_imm_vec4(buffer, wined3d_srgb_const0, gl_info); shader_addline(buffer, ";\n"); shader_addline(buffer, "const vec4 srgb_const1 = "); - shader_glsl_append_imm_vec4(buffer, wined3d_srgb_const1); + shader_glsl_append_imm_vec4(buffer, wined3d_srgb_const1, gl_info); shader_addline(buffer, ";\n"); } if (reg_maps->vpos || reg_maps->usesdsy) @@ -9814,10 +9825,10 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * if (settings->sRGB_write) { shader_addline(buffer, "const vec4 srgb_const0 = "); - shader_glsl_append_imm_vec4(buffer, wined3d_srgb_const0); + shader_glsl_append_imm_vec4(buffer, wined3d_srgb_const0, gl_info); shader_addline(buffer, ";\n"); shader_addline(buffer, "const vec4 srgb_const1 = "); - shader_glsl_append_imm_vec4(buffer, wined3d_srgb_const1); + shader_glsl_append_imm_vec4(buffer, wined3d_srgb_const1, gl_info); shader_addline(buffer, ";\n"); }

1 0

Piotr Caban : d3dcompiler: Don't use strcasecmp.
by Alexandre Julliard April 9, 2019

April 9, 2019

Module: wine Branch: master Commit: 1b56d13da3f180a2e383deb02e646cec88163ab2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b56d13da3f180a2e383deb0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 9 18:48:21 2019 +0200 d3dcompiler: Don't use strcasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/reflection.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index d10d0b1..24190f6 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -23,6 +23,7 @@ #include "initguid.h" #include "d3dcompiler_private.h" +#include "winternl.h" WINE_DEFAULT_DEBUG_CHANNEL(d3dcompiler); @@ -1627,10 +1628,14 @@ static HRESULT d3dcompiler_parse_signature(struct d3dcompiler_shader_signature * if (d[i].Register == 0xffffffff) { - if (!strcasecmp(d[i].SemanticName, "sv_depth")) d[i].SystemValueType = D3D_NAME_DEPTH; - if (!strcasecmp(d[i].SemanticName, "sv_coverage")) d[i].SystemValueType = D3D_NAME_COVERAGE; - if (!strcasecmp(d[i].SemanticName, "sv_depthgreaterequal")) d[i].SystemValueType = D3D_NAME_DEPTH_GREATER_EQUAL; - if (!strcasecmp(d[i].SemanticName, "sv_depthlessequal")) d[i].SystemValueType = D3D_NAME_DEPTH_LESS_EQUAL; + if (!_strnicmp(d[i].SemanticName, "sv_depth", -1)) + d[i].SystemValueType = D3D_NAME_DEPTH; + else if (!_strnicmp(d[i].SemanticName, "sv_coverage", -1)) + d[i].SystemValueType = D3D_NAME_COVERAGE; + else if (!_strnicmp(d[i].SemanticName, "sv_depthgreaterequal", -1)) + d[i].SystemValueType = D3D_NAME_DEPTH_GREATER_EQUAL; + else if (!_strnicmp(d[i].SemanticName, "sv_depthlessequal", -1)) + d[i].SystemValueType = D3D_NAME_DEPTH_LESS_EQUAL; } else {

1 0

Nikolay Sivov : mfreadwrite: Set url hint for WAVE audio streams.
by Alexandre Julliard April 9, 2019

April 9, 2019

Module: wine Branch: master Commit: 23b9b1ceb637f7b8011322403a9312bbdd59e7d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=23b9b1ceb637f7b801132240… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 9 13:45:11 2019 +0300 mfreadwrite: Set url hint for WAVE audio streams. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index e6ddce0..fd9062f 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -839,23 +839,28 @@ failed: static HRESULT bytestream_get_url_hint(IMFByteStream *stream, WCHAR const **url) { static const UINT8 asfmagic[] = {0x30,0x26,0xb2,0x75,0x8e,0x66,0xcf,0x11,0xa6,0xd9,0x00,0xaa,0x00,0x62,0xce,0x6c}; + static const UINT8 wavmagic[] = { 'R', 'I', 'F', 'F',0x00,0x00,0x00,0x00, 'W', 'A', 'V', 'E', 'f', 'm', 't', ' '}; + static const UINT8 wavmask[] = {0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff}; static const WCHAR asfW[] = {'.','a','s','f',0}; + static const WCHAR wavW[] = {'.','w','a','v',0}; static const struct stream_content_url_hint { const UINT8 *magic; UINT32 magic_len; const WCHAR *url; + const UINT8 *mask; } url_hints[] = { { asfmagic, sizeof(asfmagic), asfW }, + { wavmagic, sizeof(wavmagic), wavW, wavmask }, }; + UINT8 buffer[4 * sizeof(unsigned int)]; IMFAttributes *attributes; UINT32 length = 0; - UINT8 buffer[16]; + unsigned int i, j; DWORD caps = 0; QWORD position; - unsigned int i; HRESULT hr; *url = NULL; @@ -888,6 +893,15 @@ static HRESULT bytestream_get_url_hint(IMFByteStream *stream, WCHAR const **url) for (i = 0; i < ARRAY_SIZE(url_hints); ++i) { + if (url_hints[i].mask) + { + unsigned int *mask = (unsigned int *)url_hints[i].mask; + unsigned int *data = (unsigned int *)buffer; + + for (j = 0; j < sizeof(buffer) / sizeof(unsigned int); ++j) + data[j] &= mask[j]; + + } if (!memcmp(buffer, url_hints[i].magic, min(url_hints[i].magic_len, length))) { *url = url_hints[i].url;

1 0