December 2019 - Wine-Devel - list.winehq.org

[PATCH 6/9 v2] msvcrt: Don't depend on how __lc_time_data was allocated in _W_Getmonths.

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/locale.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)

Dec. 4, 2019

[PATCH 5/9 v2] msvcrt: Don't depend on how __lc_time_data was allocated in _Getmonths.

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/locale.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)

Dec. 4, 2019

[PATCH 4/9 v2] msvcrt: Don't depend on how __lc_time_data was allocated in _W_Getdays.

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/locale.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)

Dec. 4, 2019

[PATCH 3/9 v2] msvcrt: Don't depend on how __lc_time_data was allocated in _Getdays.

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/locale.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)

Dec. 4, 2019

[PATCH 2/9 v2] msvcrt: Factor out code for creating lc_time_data structure.

by Piotr Caban

From: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/locale.c | 167 ++++++++++++++++++++++--------------------- 1 file changed, 87 insertions(+), 80 deletions(-)

Dec. 4, 2019

[PATCH 1/9 v2] ucrtbase: Improve strftime special test cases for %c %r formats.

by Piotr Caban

From: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v2: - fixed typo in commit message (spotted by Gijs) dlls/ucrtbase/tests/misc.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)

Dec. 4, 2019

[PATCH 9/9] ucrtbase: Correct behavior of strftime formats %c %r.

by Piotr Caban

From: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/time.c | 14 +++++++++++++- dlls/ucrtbase/tests/misc.c | 8 ++++---- 2 files changed, 17 insertions(+), 5 deletions(-)

Dec. 4, 2019

[PATCH 8/9] msvcrt: Create global lc_time_curr and use when possible.

by Piotr Caban

From: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/locale.c | 158 ++++++++++++++++++++++++++----------------- dlls/msvcrt/msvcrt.h | 1 + 2 files changed, 97 insertions(+), 62 deletions(-)

Dec. 4, 2019

[PATCH 7/9] msvcrt: Mark __lc_time_data strings const.

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/locale.c | 2 +- dlls/msvcrt/msvcrt.h | 42 +++++++++++++++++++++--------------------- 2 files changed, 22 insertions(+), 22 deletions(-)

Dec. 4, 2019

[PATCH 6/9] msvcrt: Don't depend on how __lc_time_data wass allocated in _W_Getmonths.

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/locale.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)

Dec. 4, 2019

[PATCH 5/9] msvcrt: Don't depend on how __lc_time_data wass allocated in _Getmonths.

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/locale.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)

Dec. 4, 2019

[PATCH 4/9] msvcrt: Don't depend on how __lc_time_data wass allocated in _W_Getdays.

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/locale.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)

Dec. 4, 2019

[PATCH 3/9] msvcrt: Don't depend on how __lc_time_data wass allocated in _Getdays.

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/locale.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)

Dec. 4, 2019

[PATCH 2/9] msvcrt: Factor out code for creating lc_time_data structure.

by Piotr Caban

From: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/locale.c | 167 ++++++++++++++++++++++--------------------- 1 file changed, 87 insertions(+), 80 deletions(-)

Dec. 4, 2019

[PATCH 1/9] ucrtbase: Improve strftime special test cases for %c %r formats.

by Piotr Caban

From: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/ucrtbase/tests/misc.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)

Dec. 4, 2019

Re: [PATCH] msvcrt: Optimize _strlwr implementation in C locale.

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>

Dec. 4, 2019

[PATCH] wininet: Improve InternetGetConnectedStateExW to handle offline state.

by Gabriel Ivăncescu

Some applications (e.g. Deus Ex Human Revolution: Director's Cut) use the output from this function to determine whether they should connect (for DXHR it happens on exit and it hangs retrying, even on Windows, if there's an internet connection). This makes it have Windows behavior when there's no connection, to help at least in those cases. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/wininet/Makefile.in | 2 +- dlls/wininet/internet.c | 38 +++++++++++++++++++++++++++++++++----- 2 files changed, 34 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/Makefile.in b/dlls/wininet/Makefile.in index 88b7046..be598da 100644 --- a/dlls/wininet/Makefile.in +++ b/dlls/wininet/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -D_WINX32_ MODULE = wininet.dll IMPORTLIB = wininet -IMPORTS = mpr shlwapi shell32 user32 ws2_32 advapi32 +IMPORTS = ole32 mpr shlwapi shell32 user32 ws2_32 advapi32 DELAYIMPORTS = secur32 crypt32 cryptui dhcpcsvc iphlpapi EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 16dc200..e307142 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -37,8 +37,10 @@ #include <assert.h> #include <wchar.h> +#define COBJMACROS #include "windef.h" #include "winbase.h" +#include "initguid.h" #include "winreg.h" #include "winuser.h" #include "wininet.h" @@ -51,6 +53,7 @@ #include "winternl.h" #include "iphlpapi.h" #include "dhcpcsdk.h" +#include "netlistmgr.h" #include "wine/exception.h" @@ -1198,25 +1201,50 @@ BOOL WINAPI InternetGetConnectedState(LPDWORD lpdwStatus, DWORD dwReserved) BOOL WINAPI InternetGetConnectedStateExW(LPDWORD lpdwStatus, LPWSTR lpszConnectionName, DWORD dwNameLen, DWORD dwReserved) { + NLM_CONNECTIVITY connectivity; + INetworkListManager *mgr; + VARIANT_BOOL connected; + DWORD status; + TRACE("(%p, %p, %d, 0x%08x)\n", lpdwStatus, lpszConnectionName, dwNameLen, dwReserved); /* Must be zero */ if(dwReserved) return FALSE; - if (lpdwStatus) { - WARN("always returning LAN connection.\n"); - *lpdwStatus = INTERNET_CONNECTION_LAN; + CoInitialize(NULL); + + status = INTERNET_CONNECTION_CONFIGURED | INTERNET_CONNECTION_OFFLINE; + + if (CoCreateInstance(&CLSID_NetworkListManager, NULL, CLSCTX_INPROC_SERVER, + &IID_INetworkListManager, (void**)&mgr) == S_OK) + { + if (SUCCEEDED(INetworkListManager_IsConnectedToInternet(mgr, &connected)) && + connected == VARIANT_TRUE && + SUCCEEDED(INetworkListManager_GetConnectivity(mgr, &connectivity)) && + connectivity != NLM_CONNECTIVITY_DISCONNECTED) + { + status &= ~INTERNET_CONNECTION_OFFLINE; + + WARN("always returning LAN connection.\n"); + status |= INTERNET_CONNECTION_LAN; + } + INetworkListManager_Release(mgr); } + CoUninitialize(); + + if (lpdwStatus) *lpdwStatus = status; + /* When the buffer size is zero LoadStringW fills the buffer with a pointer to * the resource, avoid it as we must not change the buffer in this case */ if(lpszConnectionName && dwNameLen) { *lpszConnectionName = '\0'; - LoadStringW(WININET_hModule, IDS_LANCONNECTION, lpszConnectionName, dwNameLen); + if (status & INTERNET_CONNECTION_LAN) + LoadStringW(WININET_hModule, IDS_LANCONNECTION, lpszConnectionName, dwNameLen); } - return TRUE; + return !(status & INTERNET_CONNECTION_OFFLINE); } -- 2.21.0

Dec. 4, 2019

[PATCH] ntdll: Add DECLSPEC_HOTPATCH to NtProtectVirtualMemory().

by Paul Gofman

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48077 Also spotted in https://bugs.winehq.org/show_bug.cgi?id=47817. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/ntdll/virtual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index ba5eb9b7bc..35f1503675 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -2844,7 +2844,7 @@ NTSTATUS WINAPI NtFreeVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T *si * NtProtectVirtualMemory (NTDLL.@) * ZwProtectVirtualMemory (NTDLL.@) */ -NTSTATUS WINAPI NtProtectVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T *size_ptr, +NTSTATUS WINAPI DECLSPEC_HOTPATCH NtProtectVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T *size_ptr, ULONG new_prot, ULONG *old_prot ) { struct file_view *view; -- 2.23.0

Dec. 4, 2019

[PATCH 2/2] comctl32/listview: Fix LVM_GETITEM for out-of-range iSubItem case.

by Nikolay Sivov

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44842 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/listview.c | 41 ++++++++--------- dlls/comctl32/tests/listview.c | 81 +++++++++++++++++++++++++++++++++- 2 files changed, 99 insertions(+), 23 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index acf6f31fe6..eb42526f57 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -6674,11 +6674,11 @@ static HIMAGELIST LISTVIEW_GetImageList(const LISTVIEW_INFO *infoPtr, INT nImage static BOOL LISTVIEW_GetItemT(const LISTVIEW_INFO *infoPtr, LPLVITEMW lpLVItem, BOOL isW) { ITEMHDR callbackHdr = { LPSTR_TEXTCALLBACKW, I_IMAGECALLBACK }; + BOOL is_subitem_invalid = FALSE; NMLVDISPINFOW dispInfo; ITEM_INFO *lpItem; ITEMHDR* pItemHdr; HDPA hdpaSubItems; - INT isubitem; TRACE("(item=%s, isW=%d)\n", debuglvitem_t(lpLVItem, isW), isW); @@ -6688,10 +6688,7 @@ static BOOL LISTVIEW_GetItemT(const LISTVIEW_INFO *infoPtr, LPLVITEMW lpLVItem, if (lpLVItem->mask == 0) return TRUE; TRACE("mask=%x\n", lpLVItem->mask); - /* make a local copy */ - isubitem = lpLVItem->iSubItem; - - if (isubitem && (lpLVItem->mask & LVIF_STATE)) + if (lpLVItem->iSubItem && (lpLVItem->mask & LVIF_STATE)) lpLVItem->state = 0; /* a quick optimization if all we're asked is the focus state @@ -6701,7 +6698,7 @@ static BOOL LISTVIEW_GetItemT(const LISTVIEW_INFO *infoPtr, LPLVITEMW lpLVItem, !(infoPtr->uCallbackMask & LVIS_FOCUSED) ) { lpLVItem->state = 0; - if (infoPtr->nFocusedItem == lpLVItem->iItem && isubitem == 0) + if (infoPtr->nFocusedItem == lpLVItem->iItem && !lpLVItem->iSubItem) lpLVItem->state |= LVIS_FOCUSED; return TRUE; } @@ -6723,7 +6720,7 @@ static BOOL LISTVIEW_GetItemT(const LISTVIEW_INFO *infoPtr, LPLVITEMW lpLVItem, * depend on the uninitialized fields being 0 */ dispInfo.item.mask = lpLVItem->mask & ~LVIF_PARAM; dispInfo.item.iItem = lpLVItem->iItem; - dispInfo.item.iSubItem = isubitem; + dispInfo.item.iSubItem = lpLVItem->iSubItem; if (lpLVItem->mask & LVIF_TEXT) { if (lpLVItem->mask & LVIF_NORECOMPUTE) @@ -6770,7 +6767,7 @@ static BOOL LISTVIEW_GetItemT(const LISTVIEW_INFO *infoPtr, LPLVITEMW lpLVItem, lpLVItem->pszText = LPSTR_TEXTCALLBACKW; /* we store only a little state, so if we're not asked, we're done */ - if (!(lpLVItem->mask & LVIF_STATE) || isubitem) return TRUE; + if (!(lpLVItem->mask & LVIF_STATE) || lpLVItem->iSubItem) return TRUE; /* if focus is handled by us, report it */ if ( lpLVItem->stateMask & ~infoPtr->uCallbackMask & LVIS_FOCUSED ) @@ -6796,21 +6793,22 @@ static BOOL LISTVIEW_GetItemT(const LISTVIEW_INFO *infoPtr, LPLVITEMW lpLVItem, lpItem = DPA_GetPtr(hdpaSubItems, 0); assert (lpItem); - if (isubitem) + if (lpLVItem->iSubItem) { - SUBITEM_INFO *lpSubItem = LISTVIEW_GetSubItemPtr(hdpaSubItems, isubitem); - pItemHdr = lpSubItem ? &lpSubItem->hdr : &callbackHdr; - if (!lpSubItem) + SUBITEM_INFO *lpSubItem = LISTVIEW_GetSubItemPtr(hdpaSubItems, lpLVItem->iSubItem); + if (lpSubItem) + pItemHdr = &lpSubItem->hdr; + else { - WARN(" iSubItem invalid (%08x), ignored.\n", isubitem); - isubitem = 0; + pItemHdr = &callbackHdr; + is_subitem_invalid = TRUE; } } else pItemHdr = &lpItem->hdr; /* Do we need to query the state from the app? */ - if ((lpLVItem->mask & LVIF_STATE) && infoPtr->uCallbackMask && isubitem == 0) + if ((lpLVItem->mask & LVIF_STATE) && infoPtr->uCallbackMask && (!lpLVItem->iSubItem || is_subitem_invalid)) { dispInfo.item.mask |= LVIF_STATE; dispInfo.item.stateMask = infoPtr->uCallbackMask; @@ -6818,15 +6816,14 @@ static BOOL LISTVIEW_GetItemT(const LISTVIEW_INFO *infoPtr, LPLVITEMW lpLVItem, /* Do we need to enquire about the image? */ if ((lpLVItem->mask & LVIF_IMAGE) && pItemHdr->iImage == I_IMAGECALLBACK && - (isubitem == 0 || (infoPtr->dwLvExStyle & LVS_EX_SUBITEMIMAGES))) + (!lpLVItem->iSubItem || (infoPtr->dwLvExStyle & LVS_EX_SUBITEMIMAGES))) { dispInfo.item.mask |= LVIF_IMAGE; dispInfo.item.iImage = I_IMAGECALLBACK; } /* Only items support indentation */ - if ((lpLVItem->mask & LVIF_INDENT) && lpItem->iIndent == I_INDENTCALLBACK && - (isubitem == 0)) + if ((lpLVItem->mask & LVIF_INDENT) && lpItem->iIndent == I_INDENTCALLBACK && !lpLVItem->iSubItem) { dispInfo.item.mask |= LVIF_INDENT; dispInfo.item.iIndent = I_INDENTCALLBACK; @@ -6847,14 +6844,14 @@ static BOOL LISTVIEW_GetItemT(const LISTVIEW_INFO *infoPtr, LPLVITEMW lpLVItem, if (dispInfo.item.mask) { dispInfo.item.iItem = lpLVItem->iItem; - dispInfo.item.iSubItem = lpLVItem->iSubItem; /* yes: the original subitem */ + dispInfo.item.iSubItem = lpLVItem->iSubItem; dispInfo.item.lParam = lpItem->lParam; notify_dispinfoT(infoPtr, LVN_GETDISPINFOW, &dispInfo, isW); TRACE(" getdispinfo(2):item=%s\n", debuglvitem_t(&dispInfo.item, isW)); } /* we should not store values for subitems */ - if (isubitem) dispInfo.item.mask &= ~LVIF_DI_SETITEM; + if (lpLVItem->iSubItem) dispInfo.item.mask &= ~LVIF_DI_SETITEM; /* Now, handle the iImage field */ if (dispInfo.item.mask & LVIF_IMAGE) @@ -6865,7 +6862,7 @@ static BOOL LISTVIEW_GetItemT(const LISTVIEW_INFO *infoPtr, LPLVITEMW lpLVItem, } else if (lpLVItem->mask & LVIF_IMAGE) { - if(isubitem == 0 || (infoPtr->dwLvExStyle & LVS_EX_SUBITEMIMAGES)) + if (!lpLVItem->iSubItem || (infoPtr->dwLvExStyle & LVS_EX_SUBITEMIMAGES)) lpLVItem->iImage = pItemHdr->iImage; else lpLVItem->iImage = 0; @@ -6897,7 +6894,7 @@ static BOOL LISTVIEW_GetItemT(const LISTVIEW_INFO *infoPtr, LPLVITEMW lpLVItem, lpLVItem->lParam = lpItem->lParam; /* if this is a subitem, we're done */ - if (isubitem) return TRUE; + if (lpLVItem->iSubItem) return TRUE; /* ... the state field (this one is different due to uCallbackmask) */ if (lpLVItem->mask & LVIF_STATE) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index dc923c0b6e..87f644abd1 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -956,6 +956,37 @@ static void test_images(void) ok(EqualRect(&r1, &r2), "rectangle should be the same\n"); DestroyWindow(hwnd); + + /* I_IMAGECALLBACK set for item, try to get image with invalid subitem. */ + hwnd = create_listview_control(LVS_REPORT); + ok(hwnd != NULL, "Failed to create listview.\n"); + + memset(&item, 0, sizeof(item)); + item.mask = LVIF_IMAGE; + item.iImage = I_IMAGECALLBACK; + r = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); + ok(!r, "Failed to insert item.\n"); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + memset(&item, 0, sizeof(item)); + item.mask = LVIF_IMAGE; + r = SendMessageA(hwnd, LVM_GETITEMA, 0, (LPARAM)&item); + ok(r, "Failed to get item.\n"); + + ok_sequence(sequences, PARENT_SEQ_INDEX, single_getdispinfo_parent_seq, "get image dispinfo 1", FALSE); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + memset(&item, 0, sizeof(item)); + item.mask = LVIF_IMAGE; + item.iSubItem = 1; + r = SendMessageA(hwnd, LVM_GETITEMA, 0, (LPARAM)&item); + ok(r, "Failed to get item.\n"); + + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "get image dispinfo 2", FALSE); + + DestroyWindow(hwnd); } static void test_checkboxes(void) @@ -4551,6 +4582,17 @@ static void test_indentation(void) ok_sequence(sequences, PARENT_SEQ_INDEX, single_getdispinfo_parent_seq, "get indent dispinfo", FALSE); + /* Ask for iIndent with invalid subitem. */ + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + memset(&item, 0, sizeof(item)); + item.mask = LVIF_INDENT; + item.iSubItem = 1; + r = SendMessageA(hwnd, LVM_GETITEMA, 0, (LPARAM)&item); + ok(r, "Failed to get item.\n"); + + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "get indent dispinfo 2", FALSE); + DestroyWindow(hwnd); } @@ -6058,6 +6100,44 @@ static void test_callback_mask(void) mask = SendMessageA(hwnd, LVM_GETCALLBACKMASK, 0, 0); ok(mask == ~0u, "got 0x%08x\n", mask); + /* Ask for state, invalid subitem. */ + insert_item(hwnd, 0); + + ret = SendMessageA(hwnd, LVM_SETCALLBACKMASK, LVIS_FOCUSED, 0); + ok(ret, "Failed to set callback mask.\n"); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + memset(&item, 0, sizeof(item)); + item.iSubItem = 1; + item.mask = LVIF_STATE; + item.stateMask = LVIS_SELECTED; + ret = SendMessageA(hwnd, LVM_GETITEMA, 0, (LPARAM)&item); + ok(ret, "Failed to get item data.\n"); + + memset(&item, 0, sizeof(item)); + item.mask = LVIF_STATE; + item.stateMask = LVIS_SELECTED; + ret = SendMessageA(hwnd, LVM_GETITEMA, 0, (LPARAM)&item); + ok(ret, "Failed to get item data.\n"); + + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "parent seq, callback mask/invalid subitem 1", TRUE); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + memset(&item, 0, sizeof(item)); + memset(&g_itema, 0, sizeof(g_itema)); + item.iSubItem = 1; + item.mask = LVIF_STATE; + item.stateMask = LVIS_FOCUSED | LVIS_SELECTED; + ret = SendMessageA(hwnd, LVM_GETITEMA, 0, (LPARAM)&item); + ok(ret, "Failed to get item data.\n"); + ok(g_itema.iSubItem == 1, "Unexpected LVN_DISPINFO subitem %d.\n", g_itema.iSubItem); + ok(g_itema.stateMask == LVIS_FOCUSED, "Unexpected state mask %#x.\n", g_itema.stateMask); + + ok_sequence(sequences, PARENT_SEQ_INDEX, single_getdispinfo_parent_seq, + "parent seq, callback mask/invalid subitem 2", FALSE); + DestroyWindow(hwnd); /* LVS_OWNERDATA, mask LVIS_FOCUSED */ @@ -6271,7 +6351,6 @@ static void test_state_image(void) item.iSubItem = 2; r = SendMessageA(hwnd, LVM_GETITEMA, 0, (LPARAM)&item); ok(r, "Failed to get subitem state.\n"); - todo_wine ok(item.state == 0, "Unexpected state %#x.\n", item.state); item.mask = LVIF_TEXT; -- 2.24.0

Dec. 4, 2019

[PATCH 1/2] comctl32/tests: Merge header items test with existing function.

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/tests/listview.c | 34 +++++++++++++--------------------- 1 file changed, 13 insertions(+), 21 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 48cd614380..dc923c0b6e 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -1546,6 +1546,19 @@ static void test_columns(void) "get subitem text after column added", FALSE); DestroyWindow(hwnd); + + /* Columns are not created right away. */ + hwnd = create_listview_control(LVS_REPORT); + ok(hwnd != NULL, "Failed to create a listview window.\n"); + + insert_item(hwnd, 0); + + header = (HWND)SendMessageA(hwnd, LVM_GETHEADER, 0, 0); + ok(IsWindow(header), "Expected header handle.\n"); + rc = SendMessageA(header, HDM_GETITEMCOUNT, 0, 0); + ok(!rc, "Unexpected column count.\n"); + + DestroyWindow(hwnd); } /* test setting imagelist between WM_NCCREATE and WM_CREATE */ @@ -3939,25 +3952,6 @@ static void test_getitemposition(void) DestroyWindow(hwnd); } -static void test_columnscreation(void) -{ - HWND hwnd, header; - DWORD r; - - hwnd = create_listview_control(LVS_REPORT); - ok(hwnd != NULL, "failed to create a listview window\n"); - - insert_item(hwnd, 0); - - /* headers columns aren't created automatically */ - header = (HWND)SendMessageA(hwnd, LVM_GETHEADER, 0, 0); - ok(IsWindow(header), "Expected header handle\n"); - r = SendMessageA(header, HDM_GETITEMCOUNT, 0, 0); - expect(0, r); - - DestroyWindow(hwnd); -} - static void test_getitemrect(void) { HWND hwnd; @@ -6577,7 +6571,6 @@ START_TEST(listview) test_hittest(); test_getviewrect(); test_getitemposition(); - test_columnscreation(); test_editbox(); test_notifyformat(); test_indentation(); @@ -6632,7 +6625,6 @@ START_TEST(listview) test_ownerdata(); test_norecompute(); test_nosortheader(); - test_columnscreation(); test_indentation(); test_finditem(); test_hover(); -- 2.24.0

Dec. 4, 2019

[PATCH] msvcrt: Optimize _strlwr implementation in C locale.

by Gijs Vermeulen

Tests by Ambrož Bizjak. Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com> --- dlls/msvcrt/string.c | 24 +++++++++++++++++++++--- dlls/msvcrt/tests/string.c | 8 ++++++++ 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index fa5f7022c1..b78d93a917 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -56,6 +56,7 @@ char* CDECL MSVCRT__strdup(const char* str) */ int CDECL MSVCRT__strlwr_s_l(char *str, MSVCRT_size_t len, MSVCRT__locale_t locale) { + MSVCRT_pthreadlocinfo locinfo; char *ptr = str; if (!str || !len) @@ -77,10 +78,27 @@ int CDECL MSVCRT__strlwr_s_l(char *str, MSVCRT_size_t len, MSVCRT__locale_t loca return MSVCRT_EINVAL; } - while (*str) + if(!locale) + locinfo = get_locinfo(); + else + locinfo = locale->locinfo; + + if(!locinfo->lc_handle[MSVCRT_LC_CTYPE]) { - *str = MSVCRT__tolower_l((unsigned char)*str, locale); - str++; + while (*str) + { + if (*str >= 'A' && *str <= 'Z') + *str -= 'A' - 'a'; + str++; + } + } + else + { + while (*str) + { + *str = MSVCRT__tolower_l((unsigned char)*str, locale); + str++; + } } return 0; diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index d14c7f009c..f4c4657791 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -2411,6 +2411,9 @@ static void test__strlwr_s(void) ok(!memcmp(buffer, "gorrister\0ELLEN", sizeof("gorrister\0ELLEN")), "Expected the output buffer to be \"gorrister\\0ELLEN\", got \"%s\"\n", buffer); + + ret = p_strlwr_s((char *)"already_lowercase", sizeof("already_lowercase")); + ok(ret == 0, "Expected _strlwr_s to return 0, got %d\n", ret); } static void test_wcsncat_s(void) @@ -3596,6 +3599,7 @@ static void test__memicmp_l(void) static void test__strupr(void) { const char str[] = "123"; + const char *const_p; char str2[4]; char *mem, *p; DWORD prot; @@ -3614,6 +3618,10 @@ static void test__strupr(void) ok(p == mem, "_strupr returned %p\n", p); ok(!strcmp(mem, "123"), "mem = %s\n", mem); + const_p = "ALREADY_UPPERCASE"; + p = _strupr((char *)const_p); + ok(p == const_p, "_strupr returned %p\n", p); + if(!setlocale(LC_ALL, "english")) { VirtualFree(mem, sizeof(str), MEM_RELEASE); win_skip("English locale _strupr tests\n"); -- 2.24.0

Dec. 4, 2019

[PATCH 4/4] d3d8: Update the primary stateblock in d3d8_device_MultiplyTransform().

by Zebediah Figura

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d8/device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 62c75baae06..d4fc80272eb 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1662,6 +1662,7 @@ static HRESULT WINAPI d3d8_device_MultiplyTransform(IDirect3DDevice8 *iface, /* Note: D3DMATRIX is compatible with struct wined3d_matrix. */ wined3d_mutex_lock(); + wined3d_stateblock_multiply_transform(device->state, state, (const struct wined3d_matrix *)matrix); wined3d_device_multiply_transform(device->wined3d_device, state, (const struct wined3d_matrix *)matrix); wined3d_mutex_unlock(); -- 2.23.0

Dec. 4, 2019

[PATCH 3/4] d3d9: Update the primary stateblock in d3d9_device_MultiplyTransform().

by Zebediah Figura

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d9/device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 871f87af052..0ddff26c73f 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2122,6 +2122,7 @@ static HRESULT WINAPI d3d9_device_MultiplyTransform(IDirect3DDevice9Ex *iface, /* Note: D3DMATRIX is compatible with struct wined3d_matrix. */ wined3d_mutex_lock(); + wined3d_stateblock_multiply_transform(device->state, state, (const struct wined3d_matrix *)matrix); wined3d_device_multiply_transform(device->wined3d_device, state, (const struct wined3d_matrix *)matrix); wined3d_mutex_unlock(); -- 2.23.0

Dec. 4, 2019

[PATCH 2/4] ddraw: Update the primary stateblock in d3d_device7_MultiplyTransform().

by Zebediah Figura

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ddraw/device.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index d4dd74f8ae3..0999c01cb2d 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -3349,6 +3349,8 @@ static HRESULT d3d_device7_MultiplyTransform(IDirect3DDevice7 *iface, /* Note: D3DMATRIX is compatible with struct wined3d_matrix. */ wined3d_mutex_lock(); + wined3d_stateblock_multiply_transform(device->state, + wined3d_state, (struct wined3d_matrix *)matrix); wined3d_device_multiply_transform(device->wined3d_device, wined3d_state, (struct wined3d_matrix *)matrix); wined3d_mutex_unlock(); -- 2.23.0

Dec. 4, 2019

[PATCH 1/4] wined3d: Introduce wined3d_stateblock_multiply_transform().

by Zebediah Figura

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Alternatively, this could be done using wined3d_stateblock_get_state() plus wined3d_stateblock_set_transform(). dlls/wined3d/stateblock.c | 14 ++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 17 insertions(+) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 24134b8f3ef..f6d36f8c259 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1505,6 +1505,20 @@ void CDECL wined3d_stateblock_set_transform(struct wined3d_stateblock *statebloc stateblock->changed.transform[d3dts >> 5] |= 1u << (d3dts & 0x1f); } +void CDECL wined3d_stateblock_multiply_transform(struct wined3d_stateblock *stateblock, + enum wined3d_transform_state d3dts, const struct wined3d_matrix *matrix) +{ + struct wined3d_matrix *mat = &stateblock->stateblock_state.transforms[d3dts]; + + TRACE("stateblock %p, state %s, matrix %p.\n", stateblock, debug_d3dtstype(d3dts), matrix); + TRACE("%.8e %.8e %.8e %.8e\n", matrix->_11, matrix->_12, matrix->_13, matrix->_14); + TRACE("%.8e %.8e %.8e %.8e\n", matrix->_21, matrix->_22, matrix->_23, matrix->_24); + TRACE("%.8e %.8e %.8e %.8e\n", matrix->_31, matrix->_32, matrix->_33, matrix->_34); + TRACE("%.8e %.8e %.8e %.8e\n", matrix->_41, matrix->_42, matrix->_43, matrix->_44); + + multiply_matrix(mat, mat, matrix); +} + HRESULT CDECL wined3d_stateblock_set_clip_plane(struct wined3d_stateblock *stateblock, UINT plane_idx, const struct wined3d_vec4 *plane) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index e10095c796d..c8ef442c72d 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -263,6 +263,7 @@ @ cdecl wined3d_stateblock_get_state(ptr) @ cdecl wined3d_stateblock_incref(ptr) @ cdecl wined3d_stateblock_init_contained_states(ptr) +@ cdecl wined3d_stateblock_multiply_transform(ptr long ptr) @ cdecl wined3d_stateblock_reset(ptr) @ cdecl wined3d_stateblock_set_base_vertex_index(ptr long) @ cdecl wined3d_stateblock_set_clip_plane(ptr long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 89c1d898cd5..650fc52a046 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2725,6 +2725,8 @@ ULONG __cdecl wined3d_stateblock_decref(struct wined3d_stateblock *stateblock); const struct wined3d_stateblock_state * __cdecl wined3d_stateblock_get_state(const struct wined3d_stateblock *stateblock); ULONG __cdecl wined3d_stateblock_incref(struct wined3d_stateblock *stateblock); void __cdecl wined3d_stateblock_init_contained_states(struct wined3d_stateblock *stateblock); +void __cdecl wined3d_stateblock_multiply_transform(struct wined3d_stateblock *stateblock, + enum wined3d_transform_state state, const struct wined3d_matrix *matrix); void __cdecl wined3d_stateblock_reset(struct wined3d_stateblock *stateblock); void __cdecl wined3d_stateblock_set_base_vertex_index(struct wined3d_stateblock *stateblock, INT base_index); HRESULT __cdecl wined3d_stateblock_set_clip_plane(struct wined3d_stateblock *stateblock, -- 2.23.0

Dec. 4, 2019