- Wine-Devel - list.winehq.org

[PATCH v3 4/4] ncrypt/tests: Test for NCryptSetProperty
by Hans Leidekker Feb. 21, 2022

Feb. 21, 2022

From: Santino Mazza <mazzasantino1206(a)gmail.com> Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/ncrypt/tests/ncrypt.c | 46 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/dlls/ncrypt/tests/ncrypt.c b/dlls/ncrypt/tests/ncrypt.c index 58173fd0ff0..d1bcbbcab2a 100644 --- a/dlls/ncrypt/tests/ncrypt.c +++ b/dlls/ncrypt/tests/ncrypt.c @@ -205,6 +205,51 @@ static void test_get_property(void) NCryptFreeObject(prov); } +static void test_set_property(void) +{ + NCRYPT_PROV_HANDLE prov; + SECURITY_STATUS ret; + NCRYPT_KEY_HANDLE key; + DWORD keylength; + + ret = NCryptOpenStorageProvider(&prov, NULL, 0); + ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); + + ret = NCryptImportKey(prov, 0, BCRYPT_RSAPUBLIC_BLOB, NULL, &key, rsa_key_blob, sizeof(rsa_key_blob), 0); + ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); + + keylength = 2048; + ret = NCryptSetProperty(key, NCRYPT_LENGTH_PROPERTY, (BYTE *)&keylength, sizeof(keylength), 0); + ok(ret == ERROR_SUCCESS || broken(ret == NTE_INVALID_HANDLE), "got %#lx\n", ret); + + ret = NCryptSetProperty(0, NCRYPT_LENGTH_PROPERTY, (BYTE *)&keylength, sizeof(keylength), 0); + ok(ret == NTE_INVALID_HANDLE, "got %#lx\n", ret); + + todo_wine + { + ret = NCryptSetProperty(key, NCRYPT_NAME_PROPERTY, (BYTE *)L"Key name", sizeof(L"Key name"), 0); + ok(ret == NTE_NOT_SUPPORTED, "got %#lx\n", ret); + NCryptFreeObject(key); + + key = 0; + ret = NCryptCreatePersistedKey(prov, &key, BCRYPT_RSA_ALGORITHM, NULL, 0, 0); + ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); + ok(key, "got null handle\n"); + + keylength = 2048; + ret = NCryptSetProperty(key, NCRYPT_LENGTH_PROPERTY, (BYTE *)&keylength, sizeof(keylength), 0); + ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); + + ret = NCryptSetProperty(key, NCRYPT_NAME_PROPERTY, (BYTE *)L"Key name", sizeof(L"Key name"), 0); + ok(ret == NTE_NOT_SUPPORTED, "got %#lx\n", ret); + + ret = NCryptSetProperty(key, L"My Custom Property", (BYTE *)L"value", sizeof(L"value"), 0); + ok(ret == NTE_NOT_SUPPORTED, "got %#lx\n", ret); + } + NCryptFreeObject(key); + NCryptFreeObject(prov); +} + static void test_create_persisted_key(void) { NCRYPT_PROV_HANDLE prov; @@ -255,5 +300,6 @@ START_TEST(ncrypt) test_key_import_rsa(); test_free_object(); test_get_property(); + test_set_property(); test_create_persisted_key(); } -- 2.30.2

1 0

[PATCH v3 3/4] ncrypt/tests: Test for NCryptCreatePersistedKey.
by Hans Leidekker Feb. 21, 2022

Feb. 21, 2022

From: Santino Mazza <mazzasantino1206(a)gmail.com> Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/ncrypt/tests/ncrypt.c | 50 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 48 insertions(+), 2 deletions(-) diff --git a/dlls/ncrypt/tests/ncrypt.c b/dlls/ncrypt/tests/ncrypt.c index 7ca20b2bfa6..58173fd0ff0 100644 --- a/dlls/ncrypt/tests/ncrypt.c +++ b/dlls/ncrypt/tests/ncrypt.c @@ -136,7 +136,7 @@ static void test_key_import_rsa(void) NCryptFreeObject(prov); } -static void test_ncrypt_free_object(void) +static void test_free_object(void) { NCRYPT_PROV_HANDLE prov; NCRYPT_KEY_HANDLE key; @@ -205,9 +205,55 @@ static void test_get_property(void) NCryptFreeObject(prov); } +static void test_create_persisted_key(void) +{ + NCRYPT_PROV_HANDLE prov; + NCRYPT_KEY_HANDLE key; + SECURITY_STATUS ret; + DWORD size, keylength; + WCHAR alggroup[4]; + + ret = NCryptOpenStorageProvider(&prov, NULL, 0); + ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); + + todo_wine { + key = 0; + ret = NCryptCreatePersistedKey(0, &key, BCRYPT_RSA_ALGORITHM, NULL, 0, 0); + ok(ret == NTE_INVALID_HANDLE, "got %#lx\n", ret); + + ret = NCryptCreatePersistedKey(prov, &key, NULL, NULL, 0, 0); + ok(ret == HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER) || broken(ret == NTE_FAIL), "got %#lx\n", ret); + + ret = NCryptCreatePersistedKey(prov, &key, BCRYPT_RSA_ALGORITHM, NULL, 0, 0); + ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); + ok(key, "got null handle\n"); + + ret = NCryptGetProperty(key, NCRYPT_ALGORITHM_GROUP_PROPERTY, NULL, 0, &size, 0); + ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); + ok(size == 8, "got %lu\n", size); + + size = 0; + alggroup[0] = 0; + ret = NCryptGetProperty(key, NCRYPT_ALGORITHM_GROUP_PROPERTY, (BYTE *)alggroup, sizeof(alggroup), &size, 0); + ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); + ok(size == 8, "got %lu\n", size); + ok(!lstrcmpW(alggroup, L"RSA"), "The string doesn't match with 'RSA'\n"); + + ret = NCryptGetProperty(key, NCRYPT_LENGTH_PROPERTY, (BYTE *)&keylength, sizeof(keylength), &size, 0); + ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); + ok(size == 4, "got %lu\n", size); + ok(keylength == 1024, "got %lu\n", keylength); + + NCryptFinalizeKey(key, 0); + NCryptFreeObject(key); + NCryptFreeObject(prov); + } +} + START_TEST(ncrypt) { test_key_import_rsa(); - test_ncrypt_free_object(); + test_free_object(); test_get_property(); + test_create_persisted_key(); } -- 2.30.2

1 0

[PATCH v3 2/4] ncrypt: Check null handle when setting or getting properties.
by Hans Leidekker Feb. 21, 2022

Feb. 21, 2022

From: Santino Mazza <mazzasantino1206(a)gmail.com> Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/ncrypt/main.c | 3 +++ dlls/ncrypt/tests/ncrypt.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index f8ae2d7a796..68d9d884618 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -164,7 +164,9 @@ SECURITY_STATUS WINAPI NCryptGetProperty(NCRYPT_HANDLE handle, const WCHAR *name TRACE("(%#Ix, %s, %p, %lu, %p, %#lx)\n", handle, wine_dbgstr_w(name), output, outsize, result, flags); if (flags) FIXME("flags %#lx not supported\n", flags); + if (!object) return NTE_INVALID_HANDLE; if (!(property = get_object_property(object, name))) return NTE_INVALID_PARAMETER; + *result = property->value_size; if (!output) return ERROR_SUCCESS; if (outsize < property->value_size) return NTE_BUFFER_TOO_SMALL; @@ -376,6 +378,7 @@ SECURITY_STATUS WINAPI NCryptSetProperty(NCRYPT_HANDLE handle, const WCHAR *name TRACE("(%#Ix, %s, %p, %lu, %#lx)\n", handle, wine_dbgstr_w(name), input, insize, flags); if (flags) FIXME("flags %#lx not supported\n", flags); + if (!object) return NTE_INVALID_HANDLE; return set_object_property(object, name, input, insize); } diff --git a/dlls/ncrypt/tests/ncrypt.c b/dlls/ncrypt/tests/ncrypt.c index 891e5b60254..7ca20b2bfa6 100644 --- a/dlls/ncrypt/tests/ncrypt.c +++ b/dlls/ncrypt/tests/ncrypt.c @@ -199,6 +199,9 @@ static void test_get_property(void) ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); ok(keylength == 1024, "got %lu\n", keylength); + ret = NCryptGetProperty(0, NCRYPT_LENGTH_PROPERTY, (BYTE *)&keylength, size, &size, 0); + ok(ret == NTE_INVALID_HANDLE, "got %#lx\n", ret); + NCryptFreeObject(prov); } -- 2.30.2

1 0

[PATCH v3 1/4] ncrypt: Validate existence of property before creating one.
by Hans Leidekker Feb. 21, 2022

Feb. 21, 2022

From: Santino Mazza <mazzasantino1206(a)gmail.com> v3: Fix realloc() usage. Various small cleanups. Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/ncrypt/main.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index 4f9a2f357bd..f8ae2d7a796 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -144,12 +144,12 @@ SECURITY_STATUS WINAPI NCryptFreeObject(NCRYPT_HANDLE handle) return ret; } -static const struct object_property *get_object_property(struct object *object, const WCHAR *name) +static struct object_property *get_object_property(struct object *object, const WCHAR *name) { unsigned int i; for (i = 0; i < object->num_properties; i++) { - const struct object_property *property = &object->properties[i]; + struct object_property *property = &object->properties[i]; if (!lstrcmpW(property->key, name)) return property; } return NULL; @@ -181,17 +181,16 @@ static struct object *allocate_object(enum object_type type) return ret; } -static SECURITY_STATUS set_object_property(struct object *object, const WCHAR *name, BYTE *value, DWORD value_size) +struct object_property *add_object_property(struct object *object, const WCHAR *name) { struct object_property *property; - FIXME("check duplicates\n"); if (!object->num_properties) { if (!(object->properties = malloc(sizeof(*property)))) { ERR("Error allocating memory.\n"); - return NTE_NO_MEMORY; + return NULL; } property = &object->properties[object->num_properties++]; } @@ -201,7 +200,7 @@ static SECURITY_STATUS set_object_property(struct object *object, const WCHAR *n if (!(tmp = realloc(object->properties, sizeof(*property) * (object->num_properties + 1)))) { ERR("Error allocating memory.\n"); - return NTE_NO_MEMORY; + return NULL; } object->properties = tmp; property = &object->properties[object->num_properties++]; @@ -211,12 +210,22 @@ static SECURITY_STATUS set_object_property(struct object *object, const WCHAR *n if (!(property->key = malloc((lstrlenW(name) + 1) * sizeof(WCHAR)))) { ERR("Error allocating memory.\n"); - return NTE_NO_MEMORY; + return NULL; } lstrcpyW(property->key, name); + return property; +} + +static SECURITY_STATUS set_object_property(struct object *object, const WCHAR *name, BYTE *value, DWORD value_size) +{ + struct object_property *property = get_object_property(object, name); + void *tmp; + + if (!property && !(property = add_object_property(object, name))) return NTE_NO_MEMORY; + property->value_size = value_size; - if (!(property->value = malloc(value_size))) + if (!(tmp = realloc(property->value, value_size))) { ERR("Error allocating memory.\n"); free(property->key); @@ -224,7 +233,9 @@ static SECURITY_STATUS set_object_property(struct object *object, const WCHAR *n return NTE_NO_MEMORY; } + property->value = tmp; memcpy(property->value, value, value_size); + return ERROR_SUCCESS; } -- 2.30.2

1 0

[PATCH 1/2] makedep: Build Unix libraries with WINE_NO_LONG_TYPES.
by Jacek Caban Feb. 21, 2022

Feb. 21, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- I don't know if there are other plans for unix libs, but it seems to me that WINE_NO_LONG_TYPES fits them well. dlls/bcrypt/gnutls.c | 4 ++-- tools/makedep.c | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-)

3 4

[PATCH] windowscodecs: Correctly handle 8bpp custom conversions
by Alistair Leslie-Hughes Feb. 21, 2022

Feb. 21, 2022

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/windowscodecs/converter.c | 2 +- dlls/windowscodecs/tests/converter.c | 34 ++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index c321627885b..b27d478f717 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -1703,7 +1703,7 @@ static HRESULT WINAPI FormatConverter_Initialize(IWICFormatConverter *iface, case WICBitmapPaletteTypeCustom: IWICPalette_Release(palette); palette = NULL; - if (bpp <= 8) return E_INVALIDARG; + if (bpp < 8) return E_INVALIDARG; break; case WICBitmapPaletteTypeMedianCut: diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index df6528afa71..456b3502c77 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -637,6 +637,39 @@ static void test_default_converter(void) DeleteTestBitmap(src_obj); } +static void test_converter_8bppGray(void) +{ + BitmapTestSrc *src_obj; + IWICFormatConverter *converter; + BOOL can_convert = TRUE; + HRESULT hr; + + CreateTestBitmap(&testdata_32bppBGRA, &src_obj); + + hr = CoCreateInstance(&CLSID_WICDefaultFormatConverter, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICFormatConverter, (void**)&converter); + ok(SUCCEEDED(hr), "CoCreateInstance failed, hr=%x\n", hr); + if (SUCCEEDED(hr)) + { + hr = IWICFormatConverter_CanConvert(converter, &GUID_WICPixelFormat32bppBGRA, + &GUID_WICPixelFormat8bppGray, &can_convert); + ok(SUCCEEDED(hr), "CanConvert returned %x\n", hr); + ok(can_convert, "expected TRUE, got %i\n", can_convert); + + hr = IWICFormatConverter_Initialize(converter, &src_obj->IWICBitmapSource_iface, + &GUID_WICPixelFormat8bppGray, WICBitmapDitherTypeNone, NULL, 0.0, + WICBitmapPaletteTypeCustom); + ok(SUCCEEDED(hr), "Initialize returned %x\n", hr); + + if (SUCCEEDED(hr)) + compare_bitmap_data(&testdata_32bppBGRA, &testdata_8bppGray, (IWICBitmapSource*)converter, "8bppGray converter"); + + IWICFormatConverter_Release(converter); + } + + DeleteTestBitmap(src_obj); +} + typedef struct property_opt_test_data { LPCOLESTR name; @@ -1922,6 +1955,7 @@ START_TEST(converter) test_invalid_conversion(); test_default_converter(); + test_converter_8bppGray(); test_converter_8bppIndexed(); test_encoder(&testdata_8bppIndexed, &CLSID_WICGifEncoder, -- 2.34.1

3 3

Minimal custom build for win64 Server app
by dravion＠mail.de Feb. 21, 2022

Feb. 21, 2022

Hello everyone, I tried to read the docs and researched the Forum and Stackoverflow for some pointers but right know i think only a Developer can answer this build specific Question. My Project: Right know, iam trying to package a Server App (hMailServer) for Debian but also for MacOS which can run headless on WINE right now. It only needs the Console Subsystem or can run as Windows Service, so there is really no X11 or GUI stuff going on. The server simply starts with wine c:\hMailServer\Bin\hMailServer.exe or it can be register itself as Windows Service by running c:\hMailServer\Bin\hMailServer.exe /Register Right now, it runs on Debian11 Bullseye AMD64 and MacOS 12 Monterey this way in 64-Bit mode (AMD64/x86_64) just fine. Now i want to package it as Debian *.deb package and MacOS *.pkg Installer package but i dont want to interfere with a existing WINE Installation on the target System nor i want the User for example to Setup WINE on MacOS with brew or on Linux with apt-get ect. hMailServer is a very popular and easy to use Windows 32 and 64-Bit Software and i want it to stay it that way, even on Linux and MacOS. Long story short: I want to package hMailServer for Linux and MacOS and have all dependencies for WINE aboard. I want the User to install the package so it just runs, like it does for Windows. So i tried to built my custom WINE Version to make it as small as possible ./configure CFLAGS="-Os" --verbose --without-x --prefix=/opt/build/wine --disable-win16 --disable-tests --without-freetype --without-gstreamer --without-openal --without-gettext --without-ldap --without-vkd3d --without-netapi --without-oss --without-opencl --without-pulse --without-usb --without-pcap --without-vulkan --without-sane --without-sdl --without-cups --without-krb5 --without-gphoto --without-capi --without-fontconfig --without-udev --without-dbus --without-mingw --without-gnutls --without-opengl -disable-win64 --without-x --disable-winemenubuilder make & make install But even then, the resulted WINE binaries in "/opt/build/wine" are hugh (over 700 MBytes whyle hMailServer is only 20 MBytes in total!) I think thats way to big and i want to cut it down even more. My question: Is there a clean way or undocumented build switches so i can only bring the console Subsystem up and running without the whole other stuff like DirectX ect? Just console subsystem running "bare streams" without X11, DirectX, Vulkan3D ect, ect. Ok, i hope some experienced WINE Developer can give me some hints how to cut down this 700 MByte Monster even a bit more down. Please; Dont give me tips like, let the user install WINE completely, thats not what i want. I just want the required dependencies for running a Windows Console (CUI) into my installer package, thats all. Thanks in advance, Dravion

4 10

[PATCH v3 5/5] comctl32: LVM_INSERTITEM handler should send notifications with uChanged = LVIF_STATE.
by Dmitry Timoshkov Feb. 21, 2022

Feb. 21, 2022

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/comctl32/listview.c | 8 +++++++- dlls/comctl32/tests/listview.c | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 5c3b1a1636c..a961c8d4032 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4257,7 +4257,13 @@ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL nmlv.uNewState = (item.state & ~stateMask) | (lpLVItem->state & stateMask); nmlv.uOldState = item.state; } - nmlv.uChanged = uChanged ? uChanged : lpLVItem->mask; + /* According to the tests uChanged in the notification for a new item + * has only LVIF_STATE flag set. + */ + if (isNew) + nmlv.uChanged = LVIF_STATE; + else + nmlv.uChanged = uChanged ? uChanged : lpLVItem->mask; nmlv.lParam = item.lParam; /* Send LVN_ITEMCHANGING notification if the item is not being diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 92e11685331..3810cd8f4bc 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -6023,7 +6023,7 @@ static void test_LVM_INSERTITEM(void) if ((insert_item[i].mask & LVIF_STATE) && (insert_item[i].state & (LVIS_FOCUSED | LVIS_SELECTED))) { sprintf(buf, "%d: insert focused", i); - ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_focused0_seq, buf, insert_item[i].mask != LVIF_STATE); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_focused0_seq, buf, FALSE); } else { @@ -6100,7 +6100,7 @@ static void test_insertitem(void) item.lParam = 0xdeadbeef; ret = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); ok(ret == 3, "got %d\n", ret); - ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_selected_seq, "insert selected", TRUE); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_selected_seq, "insert selected", FALSE); /* insert item 4 */ item.mask = LVIF_PARAM; -- 2.35.1

2 4

[PATCH] dlls/oleaut32: Do not skip the first character
by David Kahurani Feb. 21, 2022

Feb. 21, 2022

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52476 Signed-off-by: David Kahurani <k.kahurani(a)gmail.com> --- dlls/oleaut32/variant.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index bf8f041..66bd905 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -1633,7 +1633,7 @@ HRESULT WINAPI VarParseNumFromStr(const OLECHAR *lpszStr, LCID lcid, ULONG dwFla /* If we have no digits so far, skip leading zeros */ if (!pNumprs->cDig) { - while (lpszStr[1] == '0') + while (lpszStr[0] == '0') { dwState |= B_LEADING_ZERO; cchUsed++; -- 2.25.1

2 1

[PATCH v3 4/5] comctl32: LVM_INSERTITEM handler should send LVN_ITEMCHANGING/LVN_ITEMCHANGED notifications when the item state includes LVIS_FOCUSED | LVIS_SELECTED.
by Dmitry Timoshkov Feb. 21, 2022

Feb. 21, 2022

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/comctl32/listview.c | 10 ++++++---- dlls/comctl32/tests/listview.c | 6 +++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index cd7fec28e27..5c3b1a1636c 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4260,11 +4260,12 @@ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL nmlv.uChanged = uChanged ? uChanged : lpLVItem->mask; nmlv.lParam = item.lParam; - /* Send LVN_ITEMCHANGING notification, if the item is not being inserted + /* Send LVN_ITEMCHANGING notification if the item is not being + inserted or its state includes LVIS_FOCUSED | LVIS_SELECTED, and we are _NOT_ virtual (LVS_OWNERDATA), and change notifications are enabled. Even nothing really changed we still need to send this, in this case uChanged mask is just set to passed item mask. */ - if (lpItem && !isNew && (infoPtr->notify_mask & NOTIFY_MASK_ITEM_CHANGE)) + if (lpItem && (!isNew || ((uChanged & LVIF_STATE) && (lpLVItem->state & (LVIS_FOCUSED | LVIS_SELECTED)))) && (infoPtr->notify_mask & NOTIFY_MASK_ITEM_CHANGE)) { HWND hwndSelf = infoPtr->hwndSelf; @@ -4352,8 +4353,9 @@ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL } } - /* if we're inserting the item, we're done */ - if (isNew) return TRUE; + /* if we're inserting the item and its state doesn't specify LVIS_FOCUSED | LVIS_SELECTED, we're done */ + if (isNew && !((uChanged & LVIF_STATE) && (lpLVItem->state & (LVIS_FOCUSED | LVIS_SELECTED)))) + return TRUE; /* send LVN_ITEMCHANGED notification */ if (lpLVItem->mask & LVIF_PARAM) nmlv.lParam = lpLVItem->lParam; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 4c2dd534dbd..92e11685331 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -6023,7 +6023,7 @@ static void test_LVM_INSERTITEM(void) if ((insert_item[i].mask & LVIF_STATE) && (insert_item[i].state & (LVIS_FOCUSED | LVIS_SELECTED))) { sprintf(buf, "%d: insert focused", i); - ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_focused0_seq, buf, TRUE); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_focused0_seq, buf, insert_item[i].mask != LVIF_STATE); } else { @@ -6060,7 +6060,7 @@ static void test_insertitem(void) item.iSubItem = 0; ret = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); ok(ret == 0, "got %d\n", ret); - ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_focused0_seq, "insert focused 0", TRUE); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_focused0_seq, "insert focused 0", FALSE); state = SendMessageA(hwnd, LVM_GETITEMSTATE, 0, LVIS_FOCUSED); ok(state == LVIS_FOCUSED, "got %x\n", state); @@ -6073,7 +6073,7 @@ static void test_insertitem(void) item.iSubItem = 0; ret = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); ok(ret == 1, "got %d\n", ret); - ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_focused1_seq, "insert focused 1", TRUE); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_focused1_seq, "insert focused 1", FALSE); state = SendMessageA(hwnd, LVM_GETITEMSTATE, 1, LVIS_FOCUSED); ok(state == LVIS_FOCUSED, "got %x\n", state); -- 2.35.1

2 2