June 2020 - Wine-Commits - list.winehq.org

Damjan Jovanovic : gdiplus: In CompositingModeSourceCopy, fully transparent pixels are drawn black.
by Alexandre Julliard June 2, 2020

June 2, 2020

Module: wine Branch: stable Commit: 79b2c4a97d6fbcd45dd8c07b4b326ad3b9ef36c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=79b2c4a97d6fbcd45dd8c07b… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Mar 5 03:35:40 2020 +0200 gdiplus: In CompositingModeSourceCopy, fully transparent pixels are drawn black. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42585 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 99a171981cc42970f0caee69e1ceb0e810d5955f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdiplus/graphics.c | 7 ++++++- dlls/gdiplus/tests/image.c | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index e485e5c99f..810300ae59 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -384,7 +384,12 @@ static GpStatus alpha_blend_bmp_pixels(GpGraphics *graphics, INT dst_x, INT dst_ src_color = ((ARGB*)(src + src_stride * y))[x]; if (comp_mode == CompositingModeSourceCopy) - GdipBitmapSetPixel(dst_bitmap, x+dst_x, y+dst_y, src_color); + { + if (!(src_color & 0xff000000)) + GdipBitmapSetPixel(dst_bitmap, x+dst_x, y+dst_y, 0); + else + GdipBitmapSetPixel(dst_bitmap, x+dst_x, y+dst_y, src_color); + } else { if (!(src_color & 0xff000000)) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 62cd79fec6..ad941d266f 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -4208,7 +4208,7 @@ static void test_DrawImage_SourceCopy(void) expect(0, dst_pixels[0]); expect(0xffff0000, dst_pixels[1]); expect(0, dst_pixels[2]); - todo_wine expect(0, dst_pixels[3]); + expect(0, dst_pixels[3]); status = GdipDeleteGraphics(graphics); expect(Ok, status);

1 0

Brendan Shanks : include: Fix size of DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY enum.
by Alexandre Julliard June 2, 2020

June 2, 2020

Module: wine Branch: stable Commit: c683d7dceac5b4f1e74240fb98c5b9d64bfe19e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c683d7dceac5b4f1e74240fb… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Feb 10 14:00:14 2020 -0800 include: Fix size of DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY enum. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48577 Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ca2ad6acbf8c6c1bcb899f9ff4137a35c8f79a06) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/wingdi.h | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/include/wingdi.h b/include/wingdi.h index bed2c70798..0a456f8230 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -3409,24 +3409,24 @@ typedef enum typedef enum { - DISPLAYCONFIG_OUTPUT_TECHNOLOGY_OTHER = -1, - DISPLAYCONFIG_OUTPUT_TECHNOLOGY_HD15 = 0, - DISPLAYCONFIG_OUTPUT_TECHNOLOGY_SVIDEO = 1, - DISPLAYCONFIG_OUTPUT_TECHNOLOGY_COMPOSITE_VIDEO = 2, - DISPLAYCONFIG_OUTPUT_TECHNOLOGY_COMPONENT_VIDEO = 3, - DISPLAYCONFIG_OUTPUT_TECHNOLOGY_DVI = 4, - DISPLAYCONFIG_OUTPUT_TECHNOLOGY_HDMI = 5, - DISPLAYCONFIG_OUTPUT_TECHNOLOGY_LVDS = 6, - DISPLAYCONFIG_OUTPUT_TECHNOLOGY_D_JPN = 8, - DISPLAYCONFIG_OUTPUT_TECHNOLOGY_SDI = 9, - DISPLAYCONFIG_OUTPUT_TECHNOLOGY_DISPLAYPORT_EXTERNAL = 10, - DISPLAYCONFIG_OUTPUT_TECHNOLOGY_DISPLAYPORT_EMBEDDED = 11, - DISPLAYCONFIG_OUTPUT_TECHNOLOGY_UDI_EXTERNAL = 12, - DISPLAYCONFIG_OUTPUT_TECHNOLOGY_UDI_EMBEDDED = 13, - DISPLAYCONFIG_OUTPUT_TECHNOLOGY_SDTVDONGLE = 14, - DISPLAYCONFIG_OUTPUT_TECHNOLOGY_MIRACAST = 15, - DISPLAYCONFIG_OUTPUT_TECHNOLOGY_INTERNAL = 0x80000000, - DISPLAYCONFIG_OUTPUT_TECHNOLOGY_FORCE_UINT32 = 0xffffffff + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_OTHER = (int) -1, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_HD15 = (int) 0, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_SVIDEO = (int) 1, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_COMPOSITE_VIDEO = (int) 2, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_COMPONENT_VIDEO = (int) 3, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_DVI = (int) 4, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_HDMI = (int) 5, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_LVDS = (int) 6, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_D_JPN = (int) 8, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_SDI = (int) 9, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_DISPLAYPORT_EXTERNAL = (int) 10, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_DISPLAYPORT_EMBEDDED = (int) 11, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_UDI_EXTERNAL = (int) 12, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_UDI_EMBEDDED = (int) 13, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_SDTVDONGLE = (int) 14, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_MIRACAST = (int) 15, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_INTERNAL = (int) 0x80000000, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_FORCE_UINT32 = (int) 0xffffffff } DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY; typedef struct DISPLAYCONFIG_2DREGION

1 0

Alexandre Julliard : ver: Use the 16-bit resource function in GetFileVersionInfo16().
by Alexandre Julliard June 2, 2020

June 2, 2020

Module: wine Branch: stable Commit: d715810b3fd8bb046f7e8210c71cd61010e81f2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=d715810b3fd8bb046f7e8210… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 24 19:15:40 2020 +0100 ver: Use the 16-bit resource function in GetFileVersionInfo16(). The 32-bit functions no longer support LZ compression. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48557 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f4ebe20b2ba33e3c366407f58cbc7421e422eea1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ver.dll16/version.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/ver.dll16/version.c b/dlls/ver.dll16/version.c index 269e2c9b2a..dac9ff28dd 100644 --- a/dlls/ver.dll16/version.c +++ b/dlls/ver.dll16/version.c @@ -30,6 +30,7 @@ #include "windef.h" #include "wine/winbase16.h" #include "winternl.h" +#include "winuser.h" #include "winver.h" #include "lzexpand.h" #include "wine/debug.h" @@ -461,22 +462,23 @@ DWORD WINAPI GetFileResource16( LPCSTR lpszFileName, LPCSTR lpszResType, /************************************************************************* * GetFileVersionInfoSize [VER.6] */ -DWORD WINAPI GetFileVersionInfoSize16( LPCSTR lpszFileName, LPDWORD lpdwHandle ) +DWORD WINAPI GetFileVersionInfoSize16( LPCSTR filename, LPDWORD handle ) { - TRACE("(%s, %p)\n", debugstr_a(lpszFileName), lpdwHandle ); - return GetFileVersionInfoSizeA( lpszFileName, lpdwHandle ); + DWORD offset; + + TRACE("(%s, %p)\n", debugstr_a(filename), handle ); + + return GetFileResourceSize16( filename, (LPCSTR)RT_VERSION, (LPCSTR)VS_VERSION_INFO, &offset ); } /************************************************************************* * GetFileVersionInfo [VER.7] */ -DWORD WINAPI GetFileVersionInfo16( LPCSTR lpszFileName, DWORD handle, - DWORD cbBuf, LPVOID lpvData ) +DWORD WINAPI GetFileVersionInfo16( LPCSTR filename, DWORD handle, DWORD datasize, LPVOID data ) { - TRACE("(%s, %08x, %d, %p)\n", - debugstr_a(lpszFileName), handle, cbBuf, lpvData ); + TRACE("(%s, %08x, %d, %p)\n", debugstr_a(filename), handle, datasize, data ); - return GetFileVersionInfoA( lpszFileName, handle, cbBuf, lpvData ); + return GetFileResource16( filename, (LPCSTR)RT_VERSION, (LPCSTR)VS_VERSION_INFO, 0, datasize, data ); } /*************************************************************************

1 0

Roman Pišl : shell32: Avoid crash on WM_WINDOWPOSCHANGING in BrsFolderDlgProc.
by Alexandre Julliard June 2, 2020

June 2, 2020

Module: wine Branch: stable Commit: afba948ba9be66b89eb0f253799f1d3be5baf0f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=afba948ba9be66b89eb0f253… Author: Roman Pišl <rpisl(a)seznam.cz> Date: Sun Feb 16 21:10:31 2020 +0100 shell32: Avoid crash on WM_WINDOWPOSCHANGING in BrsFolderDlgProc. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48510 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a10267172046fc16aaa1cd1237701f6867b92fc0) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/brsfolder.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index d71ec62099..188524d6a9 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -1109,6 +1109,8 @@ static INT_PTR CALLBACK BrsFolderDlgProc( HWND hWnd, UINT msg, WPARAM wParam, return BrsFolder_OnCreate( hWnd, (browse_info*) lParam ); info = GetPropW( hWnd, szBrowseFolderInfo ); + if (!info) + return FALSE; switch (msg) {

1 0

Aaro Altonen : kernel32/tests: Add tests for SetConsoleScreenBufferInfoEx().
by Alexandre Julliard June 2, 2020

June 2, 2020

Module: wine Branch: stable Commit: a7549d9df7cac2147981c70a58278679a96619e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7549d9df7cac2147981c70a… Author: Aaro Altonen <a.altonen(a)hotmail.com> Date: Wed Mar 4 09:47:51 2020 +0200 kernel32/tests: Add tests for SetConsoleScreenBufferInfoEx(). Signed-off-by: Aaro Altonen <a.altonen(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 723506ef4834cd9a16b890042a1c43861b39f3e1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/tests/console.c | 48 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 5f8003760d..8f19161c9c 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3142,6 +3142,53 @@ static void test_GetConsoleScreenBufferInfoEx(HANDLE std_output) ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); } +static void test_SetConsoleScreenBufferInfoEx(HANDLE std_output) +{ + BOOL ret; + HANDLE hmod; + HANDLE std_input = CreateFileA("CONIN$", GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + BOOL (WINAPI *pSetConsoleScreenBufferInfoEx)(HANDLE, CONSOLE_SCREEN_BUFFER_INFOEX *); + BOOL (WINAPI *pGetConsoleScreenBufferInfoEx)(HANDLE, CONSOLE_SCREEN_BUFFER_INFOEX *); + CONSOLE_SCREEN_BUFFER_INFOEX info; + + hmod = GetModuleHandleA("kernel32.dll"); + pSetConsoleScreenBufferInfoEx = (void *)GetProcAddress(hmod, "SetConsoleScreenBufferInfoEx"); + pGetConsoleScreenBufferInfoEx = (void *)GetProcAddress(hmod, "GetConsoleScreenBufferInfoEx"); + if (!pSetConsoleScreenBufferInfoEx || !pGetConsoleScreenBufferInfoEx) + { + win_skip("SetConsoleScreenBufferInfoEx is not available\n"); + return; + } + + memset(&info, 0, sizeof(CONSOLE_SCREEN_BUFFER_INFOEX)); + info.cbSize = sizeof(CONSOLE_SCREEN_BUFFER_INFOEX); + pGetConsoleScreenBufferInfoEx(std_output, &info); + + SetLastError(0xdeadbeef); + ret = pSetConsoleScreenBufferInfoEx(NULL, &info); + ok(!ret, "got %d, expected zero\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pSetConsoleScreenBufferInfoEx(std_output, &info); + todo_wine ok(ret, "got %d, expected one\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pSetConsoleScreenBufferInfoEx(std_input, &info); + ok(!ret, "got %d, expected zero\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE || GetLastError() == ERROR_ACCESS_DENIED, + "got %u, expected 5 or 6\n", GetLastError()); + + info.cbSize = 0; + SetLastError(0xdeadbeef); + ret = pSetConsoleScreenBufferInfoEx(std_output, &info); + ok(!ret, "got %d, expected zero\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + + CloseHandle(std_input); +} + static void test_AttachConsole_child(DWORD console_pid) { HANDLE pipe_in, pipe_out; @@ -3398,5 +3445,6 @@ START_TEST(console) test_GetConsoleFontInfo(hConOut); test_SetConsoleFont(hConOut); test_GetConsoleScreenBufferInfoEx(hConOut); + test_SetConsoleScreenBufferInfoEx(hConOut); test_AttachConsole(hConOut); }

1 0

Alistair Leslie-Hughes : dmstyle: IDirectMusicStyle8 GetDefaultBand return S_FALSE.
by Alexandre Julliard June 2, 2020

June 2, 2020

Module: wine Branch: stable Commit: b4c777d165822432569602d121fa22977f964ef0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4c777d165822432569602d1… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Feb 26 04:19:29 2020 +0000 dmstyle: IDirectMusicStyle8 GetDefaultBand return S_FALSE. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48648 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 79b91eaf28f449ce0d03dde1130cb238e064f093) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmstyle/style.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c index 3e480028b9..5a97dac079 100644 --- a/dlls/dmstyle/style.c +++ b/dlls/dmstyle/style.c @@ -151,11 +151,17 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_EnumBand(IDirectMusicStyle8 *iface, } static HRESULT WINAPI IDirectMusicStyle8Impl_GetDefaultBand(IDirectMusicStyle8 *iface, - IDirectMusicBand **ppBand) + IDirectMusicBand **band) { - IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); - FIXME("(%p, %p): stub\n", This, ppBand); - return S_OK; + IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); + FIXME("(%p, %p): stub\n", This, band); + + if (!band) + return E_POINTER; + + *band = NULL; + + return S_FALSE; } static HRESULT WINAPI IDirectMusicStyle8Impl_EnumMotif(IDirectMusicStyle8 *iface, DWORD index,

1 0

Dmitry Timoshkov : user32/tests: Add some tests for classes with non-zero low word instance.
by Alexandre Julliard June 2, 2020

June 2, 2020

Module: wine Branch: stable Commit: 9e2ca4bae54823daeede530a0c8726365055551f URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e2ca4bae54823daeede530a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Feb 19 12:29:54 2020 +0800 user32/tests: Add some tests for classes with non-zero low word instance. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e2c0f51312b367989def1c4dd850aac796bd0943) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/tests/class.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index 2702fa00b9..67c95225f4 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -98,6 +98,7 @@ static void ClassTest(HINSTANCE hInstance, BOOL global) LONG i; WCHAR str[20]; ATOM classatom; + HINSTANCE hInstance2; cls.style = CS_HREDRAW | CS_VREDRAW | (global?CS_GLOBALCLASS:0); cls.lpfnWndProc = ClassTest_WndProc; @@ -121,6 +122,26 @@ static void ClassTest(HINSTANCE hInstance, BOOL global) "RegisterClass of the same class should fail for the second time\n"); /* Setup windows */ + hInstance2 = (HINSTANCE)(((ULONG_PTR)hInstance & ~0xffff) | 0xdead); + + hTestWnd = CreateWindowW (className, winName, + WS_OVERLAPPEDWINDOW + WS_HSCROLL + WS_VSCROLL, + CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, 0, + 0, hInstance2, 0); +todo_wine_if (!global) + ok(hTestWnd != 0, "Failed to create window for hInstance %p\n", hInstance2); + +todo_wine_if (!global) + ok((HINSTANCE)GetClassLongPtrA(hTestWnd, GCLP_HMODULE) == hInstance, + "Wrong GCL instance %p != %p\n", + (HINSTANCE)GetClassLongPtrA(hTestWnd, GCLP_HMODULE), hInstance); +todo_wine_if (!global) + ok((HINSTANCE)GetWindowLongPtrA(hTestWnd, GWLP_HINSTANCE) == hInstance2, + "Wrong GWL instance %p != %p\n", + (HINSTANCE)GetWindowLongPtrA(hTestWnd, GWLP_HINSTANCE), hInstance2); + + DestroyWindow(hTestWnd); + hTestWnd = CreateWindowW (className, winName, WS_OVERLAPPEDWINDOW + WS_HSCROLL + WS_VSCROLL, CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, 0, @@ -128,6 +149,14 @@ static void ClassTest(HINSTANCE hInstance, BOOL global) ok(hTestWnd!=0, "Failed to create window\n"); + ok((HINSTANCE)GetClassLongPtrA(hTestWnd, GCLP_HMODULE) == hInstance, + "Wrong GCL instance %p/%p\n", + (HINSTANCE)GetClassLongPtrA(hTestWnd, GCLP_HMODULE), hInstance); + ok((HINSTANCE)GetWindowLongPtrA(hTestWnd, GWLP_HINSTANCE) == hInstance, + "Wrong GWL instance %p/%p\n", + (HINSTANCE)GetWindowLongPtrA(hTestWnd, GWLP_HINSTANCE), hInstance); + + /* test initial values of valid classwords */ for(i=0; i<NUMCLASSWORDS; i++) { @@ -1491,6 +1520,8 @@ START_TEST(class) ClassTest(hInstance,FALSE); ClassTest(hInstance,TRUE); + ClassTest((HANDLE)((ULONG_PTR)hInstance | 0x1234), FALSE); + ClassTest((HANDLE)((ULONG_PTR)hInstance | 0x1234), TRUE); CreateDialogParamTest(hInstance); test_styles(); test_builtinproc();

1 0

Brendan Shanks : include: Fix size of RecordCreateOptionsEnum.
by Alexandre Julliard June 2, 2020

June 2, 2020

Module: wine Branch: stable Commit: c2a28685d9d42898fb51c434fae484c4a4f58556 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2a28685d9d42898fb51c434… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Feb 11 15:57:02 2020 -0800 include: Fix size of RecordCreateOptionsEnum. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48577 Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 61d0cc78b24cf591746ab62d21259fe3b8e4d7e2) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/msado15_backcompat.idl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/msado15_backcompat.idl b/include/msado15_backcompat.idl index e4a847ab85..68fda6ab21 100644 --- a/include/msado15_backcompat.idl +++ b/include/msado15_backcompat.idl @@ -430,12 +430,12 @@ typedef [uuid(00000574-0000-0010-8000-00aa006d2ea4)] enum CopyRecordOptionsEnum typedef [uuid(00000570-0000-0010-8000-00aa006d2ea4)] enum RecordCreateOptionsEnum { - adCreateCollection = 0x00002000, - adCreateStructDoc = 0x80000000, - adCreateNonCollection = 0x00000000, - adOpenIfExists = 0x02000000, - adCreateOverwrite = 0x04000000, - adFailIfNotExists = -1 + adCreateCollection = (int) 0x00002000, + adCreateStructDoc = (int) 0x80000000, + adCreateNonCollection = (int) 0x00000000, + adOpenIfExists = (int) 0x02000000, + adCreateOverwrite = (int) 0x04000000, + adFailIfNotExists = (int) -1 } RecordCreateOptionsEnum; typedef [uuid(00000571-0000-0010-8000-00aa006d2ea4)] enum RecordOpenOptionsEnum

1 0

Rémi Bernon : dinput: Increase device buffer size to 1024.
by Alexandre Julliard June 2, 2020

June 2, 2020

Module: wine Branch: stable Commit: 2fc491c3898ad429b17a82f8cc108c8fee0f9a80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2fc491c3898ad429b17a82f8… 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 b778f6b3ea..8c5aa31883 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1398,7 +1398,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

Alistair Leslie-Hughes : qwave: Add QOSAddSocketToFlow stub.
by Alexandre Julliard June 2, 2020

June 2, 2020

Module: wine Branch: stable Commit: eb510fa5aac4ba48232ad65a9fd4dbafb9f2f492 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb510fa5aac4ba48232ad65a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Mar 5 00:09:38 2020 +0000 qwave: Add QOSAddSocketToFlow stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48580 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8641e59fe306c850f28d60edf4b25aaa2a864d7f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/qwave/main.c | 8 ++++++++ dlls/qwave/qwave.spec | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/qwave/main.c b/dlls/qwave/main.c index 685fcfb6c6..e256d1b8c6 100644 --- a/dlls/qwave/main.c +++ b/dlls/qwave/main.c @@ -50,3 +50,11 @@ BOOL WINAPI QOSCreateHandle(PQOS_VERSION version, PHANDLE handle) SetLastError(ERROR_SERVICE_ALREADY_RUNNING); return FALSE; } + +BOOL WINAPI QOSAddSocketToFlow(HANDLE handle, SOCKET socket, PSOCKADDR addr, + QOS_TRAFFIC_TYPE traffictype, DWORD flags, PQOS_FLOWID flowid) +{ + FIXME("%p, %lx, %p, %d, 0x%08x, %p stub!\n", handle, socket, addr, traffictype, flags, flowid); + SetLastError(ERROR_NOT_SUPPORTED); + return FALSE; +} diff --git a/dlls/qwave/qwave.spec b/dlls/qwave/qwave.spec index 94b62eb1d8..83dfc6787c 100644 --- a/dlls/qwave/qwave.spec +++ b/dlls/qwave/qwave.spec @@ -1,6 +1,6 @@ @ stub QDLHPathDiagnostics @ stub QDLHStartDiagnosingPath -@ stub QOSAddSocketToFlow +@ stdcall QOSAddSocketToFlow(ptr long ptr long long ptr) @ stub QOSCancel @ stub QOSCloseHandle @ stdcall QOSCreateHandle(ptr ptr)

1 0