November 2020 - Wine-Commits

Anton Baskanov : amstream: Don't crash if parent is NULL in AMAudioStream:: and AMDirectDrawStream::GetMultiMediaStream.
by Alexandre Julliard Nov. 10, 2020

Nov. 10, 2020

Module: wine Branch: stable Commit: 59adc57590b50df0eaf09d73bb5d8facc9b30a40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=59adc57590b50df0eaf09d73… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Mon May 25 14:17:33 2020 -0500 amstream: Don't crash if parent is NULL in AMAudioStream:: and AMDirectDrawStream::GetMultiMediaStream. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 4300981d6b997c0b4c70c3415d4bbcd694d1a7f1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/amstream/audiostream.c | 14 +++++++------- dlls/amstream/ddrawstream.c | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c index 911cbd4d19f..17723db6c21 100644 --- a/dlls/amstream/audiostream.c +++ b/dlls/amstream/audiostream.c @@ -259,18 +259,18 @@ static ULONG WINAPI audio_IAMMediaStream_Release(IAMMediaStream *iface) /*** IMediaStream methods ***/ static HRESULT WINAPI audio_IAMMediaStream_GetMultiMediaStream(IAMMediaStream *iface, - IMultiMediaStream** multi_media_stream) + IMultiMediaStream **mmstream) { - struct audio_stream *This = impl_from_IAMMediaStream(iface); + struct audio_stream *stream = impl_from_IAMMediaStream(iface); - TRACE("(%p/%p)->(%p)\n", This, iface, multi_media_stream); + TRACE("stream %p, mmstream %p.\n", stream, mmstream); - if (!multi_media_stream) + if (!mmstream) return E_POINTER; - IMultiMediaStream_AddRef(This->parent); - *multi_media_stream = This->parent; - + if (stream->parent) + IMultiMediaStream_AddRef(stream->parent); + *mmstream = stream->parent; return S_OK; } diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index 48ccc52d47c..671585f5d63 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -127,18 +127,18 @@ static ULONG WINAPI ddraw_IAMMediaStream_Release(IAMMediaStream *iface) /*** IMediaStream methods ***/ static HRESULT WINAPI ddraw_IAMMediaStream_GetMultiMediaStream(IAMMediaStream *iface, - IMultiMediaStream** multi_media_stream) + IMultiMediaStream **mmstream) { - struct ddraw_stream *This = impl_from_IAMMediaStream(iface); + struct ddraw_stream *stream = impl_from_IAMMediaStream(iface); - TRACE("(%p/%p)->(%p)\n", This, iface, multi_media_stream); + TRACE("stream %p, mmstream %p.\n", stream, mmstream); - if (!multi_media_stream) + if (!mmstream) return E_POINTER; - IMultiMediaStream_AddRef(This->parent); - *multi_media_stream = This->parent; - + if (stream->parent) + IMultiMediaStream_AddRef(stream->parent); + *mmstream = stream->parent; return S_OK; }

1 0

Brendan Shanks : winemac.drv: Fix warnings for constants deprecated by macOS 10.14.
by Alexandre Julliard Nov. 10, 2020

Nov. 10, 2020

Module: wine Branch: stable Commit: b4fb13cfadf0b1938a33426758f08449780cbfa4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4fb13cfadf0b1938a334267… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Jul 22 15:49:57 2020 -0700 winemac.drv: Fix warnings for constants deprecated by macOS 10.14. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f9dc364b4e76a613dde1bd0757c6c15f3030f7b5) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winemac.drv/cocoa_clipboard.m | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/winemac.drv/cocoa_clipboard.m b/dlls/winemac.drv/cocoa_clipboard.m index 39c3b8f872f..30f3097c3d2 100644 --- a/dlls/winemac.drv/cocoa_clipboard.m +++ b/dlls/winemac.drv/cocoa_clipboard.m @@ -23,6 +23,14 @@ #import "cocoa_event.h" #import "cocoa_window.h" +#if !defined(MAC_OS_X_VERSION_10_14) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_14 +/* For older SDKs, #define the new names of constants deprecated/renamed in macOS 10.14. */ +#define NSBitmapImageFileTypeBMP NSBMPFileType +#define NSBitmapImageFileTypeGIF NSGIFFileType +#define NSBitmapImageFileTypeJPEG NSJPEGFileType +#define NSBitmapImageFileTypePNG NSPNGFileType +#define NSBitmapImageFileTypeTIFF NSTIFFFileType +#endif static int owned_change_count = -1; static int change_count = -1; @@ -86,11 +94,11 @@ CFArrayRef macdrv_copy_pasteboard_types(CFTypeRef pasteboard) dispatch_once(&BitmapOutputTypesInitOnce, ^{ NSArray* bitmapFileTypes = [NSArray arrayWithObjects: - [NSNumber numberWithUnsignedInteger:NSTIFFFileType], - [NSNumber numberWithUnsignedInteger:NSPNGFileType], - [NSNumber numberWithUnsignedInteger:NSBMPFileType], - [NSNumber numberWithUnsignedInteger:NSGIFFileType], - [NSNumber numberWithUnsignedInteger:NSJPEGFileType], + [NSNumber numberWithUnsignedInteger:NSBitmapImageFileTypeTIFF], + [NSNumber numberWithUnsignedInteger:NSBitmapImageFileTypePNG], + [NSNumber numberWithUnsignedInteger:NSBitmapImageFileTypeBMP], + [NSNumber numberWithUnsignedInteger:NSBitmapImageFileTypeGIF], + [NSNumber numberWithUnsignedInteger:NSBitmapImageFileTypeJPEG], nil]; BitmapOutputTypes = [[NSArray alloc] initWithObjects:@"public.tiff", @"public.png",

1 0

Matteo Bruni : user32: Add missing WM_WINE_CLIPCURSOR message type name.
by Alexandre Julliard Nov. 10, 2020

Nov. 10, 2020

Module: wine Branch: stable Commit: 3d17a00cc13c350b6907ea49d8ac8998de9086e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d17a00cc13c350b6907ea49… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jun 5 11:47:29 2020 +0200 user32: Add missing WM_WINE_CLIPCURSOR message type name. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 61ff6c306d23ce3f2af23cda614231ded4539e65) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/spy.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/user32/spy.c b/dlls/user32/spy.c index ddd90e664fc..8a2fa430b5d 100644 --- a/dlls/user32/spy.c +++ b/dlls/user32/spy.c @@ -1150,7 +1150,7 @@ static const char * const CCMMessageTypeNames[SPY_MAX_CCMMSGNUM + 1] = "CCM_SETNOTIFYWINDOW" }; -#define SPY_MAX_WINEMSGNUM (WM_WINE_MOUSE_LL_HOOK - WM_WINE_DESTROYWINDOW) +#define SPY_MAX_WINEMSGNUM (WM_WINE_CLIPCURSOR - WM_WINE_DESTROYWINDOW) static const char * const WINEMessageTypeNames[SPY_MAX_WINEMSGNUM + 1] = { "WM_WINE_DESTROYWINDOW", @@ -1162,6 +1162,7 @@ static const char * const WINEMessageTypeNames[SPY_MAX_WINEMSGNUM + 1] = "WM_WINE_SETACTIVEWINDOW", "WM_WINE_KEYBOARD_LL_HOOK", "WM_WINE_MOUSE_LL_HOOK", + "WM_WINE_CLIPCURSOR", }; /* Virtual key names */

1 0

Jefferson Carpenter : ntoskrnl.exe: Set reserved to 0 in pnp WM_DEVICECHANGE broadcast.
by Alexandre Julliard Nov. 10, 2020

Nov. 10, 2020

Module: wine Branch: stable Commit: c553517e08cdceccbc398ed547def8619935c57f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c553517e08cdceccbc398ed5… Author: Jefferson Carpenter <jeffersoncarpenter2(a)gmail.com> Date: Tue Jun 30 17:10:00 2020 +0000 ntoskrnl.exe: Set reserved to 0 in pnp WM_DEVICECHANGE broadcast. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49488 Signed-off-by: Jefferson Carpenter <jeffersoncarpenter2(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ab6f8ba0d1ad6d3f825f22b2153dc5969dbd97a2) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntoskrnl.exe/pnp.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index 863e1d9d538..7ac351048ad 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -752,9 +752,10 @@ NTSTATUS WINAPI IoSetDeviceInterfaceState( UNICODE_STRING *name, BOOLEAN enable if ((broadcast = heap_alloc( len ))) { - broadcast->dbcc_size = len; + broadcast->dbcc_size = len; broadcast->dbcc_devicetype = DBT_DEVTYP_DEVICEINTERFACE; - broadcast->dbcc_classguid = iface->interface_class; + broadcast->dbcc_reserved = 0; + broadcast->dbcc_classguid = iface->interface_class; lstrcpynW( broadcast->dbcc_name, name->Buffer, namelen + 1 ); BroadcastSystemMessageW( BSF_FORCEIFHUNG | BSF_QUERY, NULL, WM_DEVICECHANGE, enable ? DBT_DEVICEARRIVAL : DBT_DEVICEREMOVECOMPLETE, (LPARAM)broadcast );

1 0

Nikolay Sivov : comctl32/listview: Rename helper argument.
by Alexandre Julliard Nov. 10, 2020

Nov. 10, 2020

Module: wine Branch: stable Commit: c0b3272553781c494a1267ac0922d641c2cb0c85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0b3272553781c494a1267ac… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 16 13:38:20 2020 +0300 comctl32/listview: Rename helper argument. Rpcndr.h defines "small" as char. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f6802b7a318a749540e00ca4a68772cc2ac280e5) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/listview.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index f1f09d201e0..1092a6ce9b0 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -8740,7 +8740,7 @@ static DWORD LISTVIEW_SetIconSpacing(LISTVIEW_INFO *infoPtr, INT cx, INT cy) return oldspacing; } -static inline void set_icon_size(SIZE *size, HIMAGELIST himl, BOOL small) +static inline void set_icon_size(SIZE *size, HIMAGELIST himl, BOOL is_small) { INT cx, cy; @@ -8751,8 +8751,8 @@ static inline void set_icon_size(SIZE *size, HIMAGELIST himl, BOOL small) } else { - size->cx = GetSystemMetrics(small ? SM_CXSMICON : SM_CXICON); - size->cy = GetSystemMetrics(small ? SM_CYSMICON : SM_CYICON); + size->cx = GetSystemMetrics(is_small ? SM_CXSMICON : SM_CXICON); + size->cy = GetSystemMetrics(is_small ? SM_CYSMICON : SM_CYICON); } }

1 0

Matteo Bruni : wined3d: Add GPU information for AMD Raven Ridge.
by Alexandre Julliard Nov. 10, 2020

Nov. 10, 2020

Module: wine Branch: stable Commit: 367ae2ac42b29c4d50c6717bebd1c7cb058c7716 URL: https://source.winehq.org/git/wine.git/?a=commit;h=367ae2ac42b29c4d50c6717b… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jul 16 18:50:05 2020 +0200 wined3d: Add GPU information for AMD Raven Ridge. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 435f7fb2f2c511068b1e64c373fb0f1900ddd669) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f777a1635e7..8f21fe50c46 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -484,6 +484,7 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_480, "Radeon (TM) RX 480 Graphics", DRIVER_AMD_RX, 4096}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_VEGA_10, "Radeon RX Vega", DRIVER_AMD_RX, 8192}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_VEGA_12, "Radeon Pro Vega 20", DRIVER_AMD_RX, 4096}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_RAVEN, "AMD Radeon(TM) Vega 10 Mobile Graphics", DRIVER_AMD_RX, 1024}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_VEGA_20, "Radeon RX Vega 20", DRIVER_AMD_RX, 4096}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_NAVI_10, "Radeon RX 5700 / 5700 XT", DRIVER_AMD_RX, 8192}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index acabc912bec..fb220a9b95f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2411,6 +2411,7 @@ enum wined3d_pci_device CARD_AMD_RADEON_RX_480 = 0x67df, CARD_AMD_RADEON_RX_VEGA_10 = 0x687f, CARD_AMD_RADEON_RX_VEGA_12 = 0x69af, + CARD_AMD_RADEON_RAVEN = 0x15dd, CARD_AMD_RADEON_RX_VEGA_20 = 0x66af, CARD_AMD_RADEON_RX_NAVI_10 = 0x731f,

1 0

Alex Henrie : urlmon: Call parse_host in combine_uri to set related parse_data fields.
by Alexandre Julliard Nov. 10, 2020

Nov. 10, 2020

Module: wine Branch: stable Commit: 318a68b03016e2bca2c59f8ea72540dab24729ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=318a68b03016e2bca2c59f8e… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 12 14:09:56 2020 +0200 urlmon: Call parse_host in combine_uri to set related parse_data fields. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49662 Signed-off-by: Alex Henrie <alexhenrie24(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 c474c1ab3f698ffefa7ff779061620f3af63a69e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/urlmon/tests/uri.c | 29 ++++++++++++++++++++++++++++- dlls/urlmon/uri.c | 7 +++---- 2 files changed, 31 insertions(+), 5 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 29a70ad4813..b1390a35bf4 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -7595,7 +7595,34 @@ static const uri_combine_test uri_combine_tests[] = { {URL_SCHEME_MAILTO,S_OK}, {URLZONE_INVALID,E_NOTIMPL} } - } + }, + { "http://[::1]",0, + "/",Uri_CREATE_ALLOW_RELATIVE, + 0,S_OK,FALSE, + { + {"http://[::1]/",S_OK}, + {"[::1]",S_OK}, + {"http://[::1]/",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"::1",S_OK}, + {"",S_FALSE}, + {"/",S_OK}, + {"/",S_OK}, + {"",S_FALSE}, + {"http://[::1]/",S_OK}, + {"http",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_IPV6,S_OK}, + {80,S_OK,FALSE,TRUE}, + {URL_SCHEME_HTTP,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } + }, }; typedef struct _uri_parse_test { diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index bec7ce16a59..7f5dc155027 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -3387,7 +3387,7 @@ static HRESULT canonicalize_uri(const parse_data *data, Uri *uri, DWORD flags) { uri->scheme_type = data->scheme_type; if(!canonicalize_hierpart(data, uri, flags, FALSE)) { - ERR("(%p %p %x): Unable to canonicalize the heirpart of the URI\n", data, uri, flags); + ERR("(%p %p %x): Unable to canonicalize the hierpart of the URI\n", data, uri, flags); return E_INVALIDARG; } @@ -6512,9 +6512,8 @@ static HRESULT combine_uri(Uri *base, Uri *relative, DWORD flags, IUri **result, } if(proc_uri->host_start > -1) { - data.host = proc_uri->canon_uri+proc_uri->host_start; - data.host_len = proc_uri->host_len; - data.host_type = proc_uri->host_type; + const WCHAR *host = proc_uri->canon_uri+proc_uri->host_start; + parse_host(&host, &data, 0); } if(proc_uri->has_port) {

1 0

Zhiyi Zhang : dwmapi: Check NULL parameter in DwmIsCompositionEnabled().
by Alexandre Julliard Nov. 10, 2020

Nov. 10, 2020

Module: wine Branch: stable Commit: fb92baa3d1cfd3a6f645b1e37abf8e58bca4a104 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb92baa3d1cfd3a6f645b1e3… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sat Aug 8 00:02:25 2020 +0800 dwmapi: Check NULL parameter in DwmIsCompositionEnabled(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49664 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1ec8bf9b739f1528b742169670eac2350b33a7d4) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/dwmapi/dwmapi_main.c | 3 +++ dlls/dwmapi/tests/Makefile.in | 5 +++++ dlls/dwmapi/tests/dwmapi.c | 39 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 49 insertions(+) diff --git a/configure b/configure index 8ae79bf336d..f60401a0f7e 100755 --- a/configure +++ b/configure @@ -20414,6 +20414,7 @@ wine_fn_config_makefile dlls/dssenh/tests enable_tests wine_fn_config_makefile dlls/dswave enable_dswave wine_fn_config_makefile dlls/dswave/tests enable_tests wine_fn_config_makefile dlls/dwmapi enable_dwmapi +wine_fn_config_makefile dlls/dwmapi/tests enable_tests wine_fn_config_makefile dlls/dwrite enable_dwrite wine_fn_config_makefile dlls/dwrite/tests enable_tests wine_fn_config_makefile dlls/dx8vb enable_dx8vb diff --git a/configure.ac b/configure.ac index 6a28988a542..c8ef570a60d 100644 --- a/configure.ac +++ b/configure.ac @@ -3223,6 +3223,7 @@ WINE_CONFIG_MAKEFILE(dlls/dssenh/tests) WINE_CONFIG_MAKEFILE(dlls/dswave) WINE_CONFIG_MAKEFILE(dlls/dswave/tests) WINE_CONFIG_MAKEFILE(dlls/dwmapi) +WINE_CONFIG_MAKEFILE(dlls/dwmapi/tests) WINE_CONFIG_MAKEFILE(dlls/dwrite) WINE_CONFIG_MAKEFILE(dlls/dwrite/tests) WINE_CONFIG_MAKEFILE(dlls/dx8vb) diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index 6378a091f0b..8408a2efed1 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -60,6 +60,9 @@ HRESULT WINAPI DwmIsCompositionEnabled(BOOL *enabled) else TRACE("%p\n", enabled); + if (!enabled) + return E_INVALIDARG; + *enabled = FALSE; return S_OK; } diff --git a/dlls/dwmapi/tests/Makefile.in b/dlls/dwmapi/tests/Makefile.in new file mode 100644 index 00000000000..6c6130401d6 --- /dev/null +++ b/dlls/dwmapi/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = dwmapi.dll +IMPORTS = dwmapi + +C_SRCS = \ + dwmapi.c diff --git a/dlls/dwmapi/tests/dwmapi.c b/dlls/dwmapi/tests/dwmapi.c new file mode 100644 index 00000000000..1904e283bba --- /dev/null +++ b/dlls/dwmapi/tests/dwmapi.c @@ -0,0 +1,39 @@ +/* + * Copyright 2020 Zhiyi Zhang for CodeWeavers + * + * 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 "dwmapi.h" +#include "wine/test.h" + +static void test_DwmIsCompositionEnabled(void) +{ + BOOL enabled; + HRESULT hr; + + hr = DwmIsCompositionEnabled(NULL); + ok(hr == E_INVALIDARG, "Expected %#x, got %#x.\n", E_INVALIDARG, hr); + + enabled = -1; + hr = DwmIsCompositionEnabled(&enabled); + ok(hr == S_OK, "Expected %#x, got %#x.\n", S_OK, hr); + ok(enabled == TRUE || enabled == FALSE, "Got unexpected %#x.\n", enabled); +} + +START_TEST(dwmapi) +{ + test_DwmIsCompositionEnabled(); +}

1 0

Brendan Shanks : ntdll: Pad HEAP structure so 'flags' offset matches recent Windows.
by Alexandre Julliard Nov. 10, 2020

Nov. 10, 2020

Module: wine Branch: stable Commit: f1bb5e6a5d09a4c1990f4cd2f95b856c24852f60 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1bb5e6a5d09a4c1990f4cd2… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Fri Aug 7 11:40:52 2020 -0700 ntdll: Pad HEAP structure so 'flags' offset matches recent Windows. Needed for Red Dead Redemption 2 to pass anti-debugger checks, it accesses 'flags' and 'force_flags' at a fixed offset of the ProcessHeap. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49666 Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit fd80e0300cbec55fe637714d3b02128616cdd570) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/heap.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index d7232b47d66..2d6b6d3aac0 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -151,7 +151,13 @@ typedef struct tagSUBHEAP typedef struct tagHEAP { DWORD_PTR unknown1[2]; - DWORD unknown2; + DWORD unknown2[2]; + DWORD_PTR unknown3[4]; + DWORD unknown4; + DWORD_PTR unknown5[2]; + DWORD unknown6[3]; + DWORD_PTR unknown7[2]; + /* For Vista through 10, 'flags' is at offset 0x40 (x86) / 0x70 (x64) */ DWORD flags; /* Heap flags */ DWORD force_flags; /* Forced heap flags for debugging */ SUBHEAP subheap; /* First sub-heap */

1 0

Nikolay Sivov : comctl32/listview: Use case-insensitive compare in LVM_FINDITEM.
by Alexandre Julliard Nov. 10, 2020

Nov. 10, 2020

Module: wine Branch: stable Commit: b86feadc3fd4ccf31317ab18c39b32271a4c0fd2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b86feadc3fd4ccf31317ab18… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 16 13:38:21 2020 +0300 comctl32/listview: Use case-insensitive compare in LVM_FINDITEM. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ab81945d6568569ac23fad56b1bc895687feeb55) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/Makefile.in | 2 +- dlls/comctl32/listview.c | 10 +++++++--- dlls/comctl32/tests/listview.c | 13 +++++++++++++ 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/Makefile.in b/dlls/comctl32/Makefile.in index 9a56e36e137..9719302cde3 100644 --- a/dlls/comctl32/Makefile.in +++ b/dlls/comctl32/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -D_COMCTL32_ MODULE = comctl32.dll IMPORTLIB = comctl32 -IMPORTS = uuid user32 gdi32 advapi32 usp10 imm32 +IMPORTS = uuid user32 gdi32 advapi32 usp10 imm32 kernelbase DELAYIMPORTS = winmm uxtheme EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 1092a6ce9b0..6cee291dd69 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -140,6 +140,7 @@ #include "commctrl.h" #include "comctl32.h" #include "uxtheme.h" +#include "shlwapi.h" #include "wine/debug.h" @@ -6313,6 +6314,7 @@ static INT LISTVIEW_FindItemW(const LISTVIEW_INFO *infoPtr, INT nStart, INT nItem = nStart + 1, nLast = infoPtr->nItemCount, nNearestItem = -1; ULONG xdist, ydist, dist, mindist = 0x7fffffff; POINT Position, Destination; + int search_len = 0; LVITEMW lvItem; /* Search in virtual listviews should be done by application, not by @@ -6378,6 +6380,9 @@ static INT LISTVIEW_FindItemW(const LISTVIEW_INFO *infoPtr, INT nStart, nItem = bNearest ? -1 : nStart + 1; + if (lpFindInfo->flags & (LVFI_PARTIAL | LVFI_SUBSTRING)) + search_len = lstrlenW(lpFindInfo->psz); + again: for (; nItem < nLast; nItem++) { @@ -6398,12 +6403,11 @@ again: { if (lpFindInfo->flags & (LVFI_PARTIAL | LVFI_SUBSTRING)) { - WCHAR *p = wcsstr(lvItem.pszText, lpFindInfo->psz); - if (!p || p != lvItem.pszText) continue; + if (StrCmpNIW(lvItem.pszText, lpFindInfo->psz, search_len)) continue; } else { - if (lstrcmpW(lvItem.pszText, lpFindInfo->psz) != 0) continue; + if (StrCmpIW(lvItem.pszText, lpFindInfo->psz)) continue; } } diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 20b9873d30d..c19de7f03f9 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -5366,6 +5366,19 @@ static void test_finditem(void) r = SendMessageA(hwnd, LVM_FINDITEMA, -1, (LPARAM)&fi); expect(0, r); + /* Case sensitivity. */ + strcpy(f, "Foo"); + fi.flags = LVFI_STRING; + fi.psz = f; + r = SendMessageA(hwnd, LVM_FINDITEMA, -1, (LPARAM)&fi); + ok(!r, "Unexpected item index %d.\n", r); + + strcpy(f, "F"); + fi.flags = LVFI_SUBSTRING; + fi.psz = f; + r = SendMessageA(hwnd, LVM_FINDITEMA, -1, (LPARAM)&fi); + ok(!r, "Unexpected item index %d.\n", r); + DestroyWindow(hwnd); }

1 0