April 2020 - Wine-commits - list.winehq.org

Gabriel Ivăncescu : qedit: Implement IMediaDet::get_StreamType().
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: master Commit: 9650f5a7db3737899c198fc12010cc161f6acc8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=9650f5a7db3737899c198fc1… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Apr 17 15:02:06 2020 -0500 qedit: Implement IMediaDet::get_StreamType(). Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/mediadet.c | 22 ++++++++++++++++++---- dlls/qedit/tests/mediadet.c | 19 +++++++++++++++++++ 2 files changed, 37 insertions(+), 4 deletions(-) diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c index ecfafc44cb..92c154a50a 100644 --- a/dlls/qedit/mediadet.c +++ b/dlls/qedit/mediadet.c @@ -28,6 +28,7 @@ #include "ole2.h" #include "qedit_private.h" +#include "wine/strmbase.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(qedit); @@ -280,11 +281,24 @@ static HRESULT WINAPI MediaDet_put_CurrentStream(IMediaDet* iface, LONG newVal) return S_OK; } -static HRESULT WINAPI MediaDet_get_StreamType(IMediaDet* iface, GUID *pVal) +static HRESULT WINAPI MediaDet_get_StreamType(IMediaDet *iface, GUID *majortype) { - MediaDetImpl *This = impl_from_IMediaDet(iface); - FIXME("(%p)->(%s): not implemented!\n", This, debugstr_guid(pVal)); - return E_NOTIMPL; + MediaDetImpl *detector = impl_from_IMediaDet(iface); + AM_MEDIA_TYPE mt; + HRESULT hr; + + TRACE("detector %p, majortype %p.\n", detector, majortype); + + if (!majortype) + return E_POINTER; + + if (SUCCEEDED(hr = IMediaDet_get_StreamMediaType(iface, &mt))) + { + *majortype = mt.majortype; + FreeMediaType(&mt); + } + + return hr; } static HRESULT WINAPI MediaDet_get_StreamTypeB(IMediaDet* iface, BSTR *pVal) diff --git a/dlls/qedit/tests/mediadet.c b/dlls/qedit/tests/mediadet.c index 65f5af79c7..1d8db732c8 100644 --- a/dlls/qedit/tests/mediadet.c +++ b/dlls/qedit/tests/mediadet.c @@ -192,6 +192,7 @@ static void test_mediadet(void) BSTR filename = NULL; LONG nstrms = 0; LONG strm; + GUID guid; AM_MEDIA_TYPE mt; double fps; int flags; @@ -242,6 +243,12 @@ static void test_mediadet(void) hr = IMediaDet_get_StreamMediaType(pM, NULL); ok(hr == E_POINTER, "IMediaDet_get_StreamMediaType failed: %08x\n", hr); + hr = IMediaDet_get_StreamType(pM, &guid); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + hr = IMediaDet_get_StreamType(pM, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + filename = SysAllocString(test_avi_filename); hr = IMediaDet_put_Filename(pM, filename); ok(hr == S_OK, "IMediaDet_put_Filename failed: %08x\n", hr); @@ -258,6 +265,10 @@ static void test_mediadet(void) ok(hr == S_OK, "IMediaDet_get_StreamMediaType failed: %08x\n", hr); CoTaskMemFree(mt.pbFormat); + hr = IMediaDet_get_StreamType(pM, &guid); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(IsEqualGUID(&guid, &MEDIATYPE_Video), "Got major type %s.\n", debugstr_guid(&guid)); + /* Even before get_OutputStreams. */ hr = IMediaDet_put_CurrentStream(pM, 1); ok(hr == E_INVALIDARG, "IMediaDet_put_CurrentStream failed: %08x\n", hr); @@ -311,6 +322,10 @@ static void test_mediadet(void) "IMediaDet_get_StreamMediaType\n"); CoTaskMemFree(mt.pbFormat); + hr = IMediaDet_get_StreamType(pM, &guid); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(IsEqualGUID(&guid, &MEDIATYPE_Video), "Got major type %s.\n", debugstr_guid(&guid)); + hr = IMediaDet_get_FrameRate(pM, NULL); ok(hr == E_POINTER, "IMediaDet_get_FrameRate failed: %08x\n", hr); @@ -370,6 +385,10 @@ static void test_mediadet(void) if (IsEqualGUID(&mt.majortype, &MEDIATYPE_Audio)) { + hr = IMediaDet_get_StreamType(pM, &guid); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(IsEqualGUID(&guid, &MEDIATYPE_Audio), "Got major type %s.\n", debugstr_guid(&guid)); + hr = IMediaDet_get_FrameRate(pM, &fps); ok(hr == VFW_E_INVALIDMEDIATYPE, "IMediaDet_get_FrameRate failed: %08x\n", hr); }

1 0

Alexandre Julliard : Wine release 4.0.4
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: website Branch: master Commit: b95d2d97a41ddf792b1f13d891861ce61d33cf7d URL: https://source.winehq.org/git/website.git/?a=commit;h=b95d2d97a41ddf792b1f1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 20 22:02:04 2020 +0200 Wine release 4.0.4 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2020042001.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/en/2020042001.xml b/news/en/2020042001.xml new file mode 100644 index 00000000..16915207 --- /dev/null +++ b/news/en/2020042001.xml @@ -0,0 +1,12 @@ +<news> +<date>April 20, 2020</date> +<title>Wine 4.0.4 Released</title> +<body> + The Wine maintenance release 4.0.4 is now available. + <a href="{$root}/announce/4.0.4">What's new</a> in this release: +<ul> + <li>Various bug fixes</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/4.0/wine-4.0.4.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Zebediah Figura : qedit/mediadet: Check for failure from IEnumPins::Next().
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: oldstable Commit: 1c47ee7afa7b7144752d40a61871b5e9111d3b17 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c47ee7afa7b7144752d40a6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Oct 31 23:33:32 2019 -0500 qedit/mediadet: Check for failure from IEnumPins::Next(). Fixes a test crash when gstreamer is not present. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9defa529fcc98dad5387a0a6c2a7ea40a8966808) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/qedit/mediadet.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c index b7a5abb80c..1d70a86a5a 100644 --- a/dlls/qedit/mediadet.c +++ b/dlls/qedit/mediadet.c @@ -456,7 +456,12 @@ static HRESULT GetSplitter(MediaDetImpl *This) IPin_Release(source_pin); goto retry; } - IEnumPins_Next(pins, 1, &splitter_pin, NULL); + if (IEnumPins_Next(pins, 1, &splitter_pin, NULL) != S_OK) + { + IEnumPins_Release(pins); + IPin_Release(source_pin); + goto retry; + } IEnumPins_Release(pins); hr = IPin_Connect(source_pin, splitter_pin, NULL);

1 0

Piotr Caban : ntdll: Work around futimens weak linking problem in set_file_times.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: oldstable Commit: 67672080bab1d0ab5a59339096a26922fabb7f92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=67672080bab1d0ab5a593390… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 7 16:24:34 2019 +0100 ntdll: Work around futimens weak linking problem in set_file_times. Newer XCode versions are weak linking to futimens function. Because of that Wine will crash trying to execute the function on Mac OS <= 10.12. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b4ec4028597c06bbdbf283b4a5f5957dd2c1b809) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/file.c | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index a26c85509e..6614465490 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1914,10 +1914,9 @@ static int futimens( int fd, const struct timespec spec[2] ) #define UTIME_OMIT ((1 << 30) - 2) #endif -static NTSTATUS set_file_times( int fd, const LARGE_INTEGER *mtime, const LARGE_INTEGER *atime ) +static BOOL set_file_times_precise( int fd, const LARGE_INTEGER *mtime, + const LARGE_INTEGER *atime, NTSTATUS *status ) { - NTSTATUS status = STATUS_SUCCESS; - #ifdef HAVE_FUTIMENS struct timespec tv[2]; @@ -1933,12 +1932,29 @@ static NTSTATUS set_file_times( int fd, const LARGE_INTEGER *mtime, const LARGE_ tv[1].tv_sec = mtime->QuadPart / 10000000 - SECS_1601_TO_1970; tv[1].tv_nsec = (mtime->QuadPart % 10000000) * 100; } - if (futimens( fd, tv ) == -1) status = FILE_GetNtStatus(); +#ifdef __APPLE__ + if (!&futimens) return FALSE; +#endif + if (futimens( fd, tv ) == -1) *status = FILE_GetNtStatus(); + else *status = STATUS_SUCCESS; + return TRUE; +#else + return FALSE; +#endif +} -#elif defined(HAVE_FUTIMES) || defined(HAVE_FUTIMESAT) +static NTSTATUS set_file_times( int fd, const LARGE_INTEGER *mtime, const LARGE_INTEGER *atime ) +{ + NTSTATUS status = STATUS_SUCCESS; +#if defined(HAVE_FUTIMES) || defined(HAVE_FUTIMESAT) struct timeval tv[2]; struct stat st; +#endif + + if (set_file_times_precise( fd, mtime, atime, &status )) + return status; +#if defined(HAVE_FUTIMES) || defined(HAVE_FUTIMESAT) if (!atime->QuadPart || !mtime->QuadPart) {

1 0

Ken Thomases : winemac: Only manipulate an NSOpenGLContext's view on the main thread.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: oldstable Commit: ed092ee074279ac3c41a5e7631a13a8639b28895 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed092ee074279ac3c41a5e76… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Dec 11 11:49:47 2019 -0600 winemac: Only manipulate an NSOpenGLContext's view on the main thread. I was seeing a crash due to an assert about manipulating it on a background thread. I can't recall where I was seeing that. I think it's new in Catalina. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1261589c2cc68061d4bd9d41a387cd4979d7073c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winemac.drv/cocoa_opengl.m | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/winemac.drv/cocoa_opengl.m b/dlls/winemac.drv/cocoa_opengl.m index 5a097a12d2..e60b0b388b 100644 --- a/dlls/winemac.drv/cocoa_opengl.m +++ b/dlls/winemac.drv/cocoa_opengl.m @@ -79,8 +79,10 @@ macdrv_set_view_backing_size((macdrv_view)self.view, view_backing); NSView* save = self.view; - [super clearDrawable]; - [super setView:save]; + OnMainThread(^{ + [super clearDrawable]; + [super setView:save]; + }); shouldClearToBlack = TRUE; } } @@ -122,7 +124,11 @@ - (void) setView:(NSView*)newView { NSView* oldView = [self view]; - [super setView:newView]; + if ([NSThread isMainThread]) + [super setView:newView]; + else OnMainThread(^{ + [super setView:newView]; + }); [newView retain]; [oldView release]; } @@ -130,7 +136,11 @@ - (void) clearDrawable { NSView* oldView = [self view]; - [super clearDrawable]; + if ([NSThread isMainThread]) + [super clearDrawable]; + else OnMainThread(^{ + [super clearDrawable]; + }); [oldView release]; [self wine_updateBackingSize:NULL];

1 0

Isira Seneviratne : jscript: Replace '%pure-parser' with '%define api.pure'.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: oldstable Commit: 3c16e4a7d0c9dfcd62dbb42e37c2cf564d6c578b URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c16e4a7d0c9dfcd62dbb42e… Author: Isira Seneviratne <isirasen96(a)gmail.com> Date: Sun Aug 18 16:47:06 2019 +0530 jscript: Replace '%pure-parser' with '%define api.pure'. Signed-off-by: Isira Seneviratne <isirasen96(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e0e57b140a02c4a665510cba7fc8c32084c00f68) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/jscript/cc_parser.y | 2 +- dlls/jscript/parser.y | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/cc_parser.y b/dlls/jscript/cc_parser.y index 18c1cb1c38..4bc6260f19 100644 --- a/dlls/jscript/cc_parser.y +++ b/dlls/jscript/cc_parser.y @@ -30,7 +30,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); %lex-param { parser_ctx_t *ctx } %parse-param { parser_ctx_t *ctx } -%pure-parser +%define api.pure %start CCExpr %union { diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 157bc187b1..e60ff7df0a 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -141,7 +141,7 @@ static source_elements_t *source_elements_add_statement(source_elements_t*,state %lex-param { parser_ctx_t *ctx } %parse-param { parser_ctx_t *ctx } -%pure-parser +%define api.pure %start Program %union {

1 0

Michael Stefaniuc : Release 4.0.4.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: oldstable Commit: 0aceab5884ec31f16e09b47f5363aa399e82892e URL: https://source.winehq.org/git/wine.git/?a=commit;h=0aceab5884ec31f16e09b47f… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Apr 8 23:48:53 2020 +0200 Release 4.0.4. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 485 +++++++++++++++++++++++++++++--------------------------------- AUTHORS | 8 ++ VERSION | 2 +- configure | 18 +-- 4 files changed, 241 insertions(+), 272 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0aceab5884ec31f16e09…

1 0

Tag wine-4.0.4 : Alexandre Julliard : Release 4.0.4
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: refs/tags/wine-4.0.4 Tag: 45e7efeba403ec4339514da7be2a435704c26f0e URL: https://source.winehq.org/git/wine.git/?a=tag;h=45e7efeba403ec4339514da7be2… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 20 22:00:01 2020 +0200 Release 4.0.4

1 0

Alistair Leslie-Hughes : dinput: Cap the buffer size to 20.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: oldstable Commit: b37845dbcc20bb3534db63ba08b9b73d044578e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b37845dbcc20bb3534db63ba… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Jan 12 22:33:24 2020 +0000 dinput: Cap the buffer size to 20. When a program calls SetProperty with DIPROP_BUFFERSIZE, dinput records this value for GetProperty but only uses it when the device can support that number of buffers otherwise a max value. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45732 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8d052561724f9c8d9e7770964bfaebdd01e98e60) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dinput/device.c | 10 ++++++---- dlls/dinput/device_private.h | 3 ++- dlls/dinput/tests/device.c | 25 +++++++++++++++++++++++++ 3 files changed, 33 insertions(+), 5 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 6c446163d1..b9e67c01d8 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1305,7 +1305,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface, if (pdiph->dwSize != sizeof(DIPROPDWORD)) return DIERR_INVALIDPARAM; - pd->dwData = This->queue_len; + pd->dwData = This->buffersize; TRACE("buffersize = %d\n", pd->dwData); break; } @@ -1394,12 +1394,14 @@ HRESULT WINAPI IDirectInputDevice2WImpl_SetProperty( TRACE("buffersize = %d\n", pd->dwData); EnterCriticalSection(&This->crit); + + This->buffersize = pd->dwData; + This->queue_len = min(This->buffersize, 20); HeapFree(GetProcessHeap(), 0, This->data_queue); - This->data_queue = !pd->dwData ? NULL : HeapAlloc(GetProcessHeap(), 0, - pd->dwData * sizeof(DIDEVICEOBJECTDATA)); + This->data_queue = !This->queue_len ? NULL : HeapAlloc(GetProcessHeap(), 0, + This->queue_len * sizeof(DIDEVICEOBJECTDATA)); This->queue_head = This->queue_tail = This->overflow = 0; - This->queue_len = pd->dwData; LeaveCriticalSection(&This->crit); break; diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index d9e2997eaa..64bdfeb8c7 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -71,10 +71,11 @@ struct IDirectInputDeviceImpl DI_EVENT_PROC event_proc; /* function to receive mouse & keyboard events */ LPDIDEVICEOBJECTDATA data_queue; /* buffer for 'GetDeviceData'. */ - int queue_len; /* size of the queue - set in 'SetProperty' */ + int queue_len; /* valid size of the queue */ int queue_head; /* position to write new event into queue */ int queue_tail; /* next event to read from queue */ BOOL overflow; /* return DI_BUFFEROVERFLOW in 'GetDeviceData' */ + DWORD buffersize; /* size of the queue - set in 'SetProperty' */ DataFormat data_format; /* user data format and wine to user format converter */ diff --git a/dlls/dinput/tests/device.c b/dlls/dinput/tests/device.c index fa9b6f1436..b036be102b 100644 --- a/dlls/dinput/tests/device.c +++ b/dlls/dinput/tests/device.c @@ -25,6 +25,8 @@ #include "windef.h" #include "dinput.h" +#include <limits.h> + static const DIOBJECTDATAFORMAT obj_data_format[] = { { &GUID_YAxis, 16, DIDFT_OPTIONAL|DIDFT_AXIS |DIDFT_MAKEINSTANCE(1), 0}, { &GUID_Button,15, DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(3), 0}, @@ -106,8 +108,22 @@ static void test_object_info(IDirectInputDeviceA *device, HWND hwnd) dp.diph.dwHeaderSize = sizeof(DIPROPHEADER); dp.diph.dwHow = DIPH_DEVICE; dp.diph.dwObj = 0; + dp.dwData = UINT_MAX; + + hr = IDirectInputDevice_GetProperty(device, DIPROP_BUFFERSIZE, &dp.diph); + ok(hr == DI_OK, "Failed: %08x\n", hr); + ok(dp.dwData == 0, "got %d\n", dp.dwData); + + dp.dwData = UINT_MAX; + hr = IDirectInputDevice_SetProperty(device, DIPROP_BUFFERSIZE, (LPCDIPROPHEADER)&dp.diph); + ok(hr == DI_OK, "SetProperty() failed: %08x\n", hr); + dp.dwData = 0; + hr = IDirectInputDevice_GetProperty(device, DIPROP_BUFFERSIZE, &dp.diph); + ok(hr == DI_OK, "Failed: %08x\n", hr); + ok(dp.dwData == UINT_MAX, "got %d\n", dp.dwData); + dp.dwData = 0; hr = IDirectInputDevice_SetProperty(device, DIPROP_BUFFERSIZE, (LPCDIPROPHEADER)&dp.diph); ok(hr == DI_OK, "SetProperty() failed: %08x\n", hr); cnt = 5; @@ -166,6 +182,15 @@ static void test_object_info(IDirectInputDeviceA *device, HWND hwnd) hr = IDirectInputDevice_Unacquire(device); ok(hr == DI_OK, "Unacquire() failed: %08x\n", hr); } + + /* Reset buffer size */ + dp.diph.dwSize = sizeof(DIPROPDWORD); + dp.diph.dwHeaderSize = sizeof(DIPROPHEADER); + dp.diph.dwHow = DIPH_DEVICE; + dp.diph.dwObj = 0; + dp.dwData = 0; + hr = IDirectInputDevice_SetProperty(device, DIPROP_BUFFERSIZE, (LPCDIPROPHEADER)&dp.diph); + ok(hr == DI_OK, "SetProperty() failed: %08x\n", hr); } struct enum_data

1 0

Rémi Bernon : dinput: Increase device buffer size to 1024.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: oldstable Commit: e11718fba0d4cdbebe973ef85f50c84aa43b4ba9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e11718fba0d4cdbebe973ef8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Feb 14 11:01:39 2020 +0100 dinput: Increase device buffer size to 1024. The buffer size was previously limited to 20 in: 8d052561724f9c8d9e7770964bfaebdd01e98e60 Testing shows that it is somewhere around 1024 on Windows, and using a smaller buffer causes some input data to be lost with high polling rate mouses. It can be spotted in Wolfenstein II: New Colossus menus. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 50440e28bb1611377df841ee267c0fa7bef515cc) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dinput/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index b9e67c01d8..e170b1c123 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1396,7 +1396,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_SetProperty( EnterCriticalSection(&This->crit); This->buffersize = pd->dwData; - This->queue_len = min(This->buffersize, 20); + This->queue_len = min(This->buffersize, 1024); HeapFree(GetProcessHeap(), 0, This->data_queue); This->data_queue = !This->queue_len ? NULL : HeapAlloc(GetProcessHeap(), 0,

1 0