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

[PATCH 3/9] msvcrt: Don't depend on how __lc_time_data wass allocated in _Getdays.
by Piotr Caban Dec. 4, 2019

Dec. 4, 2019

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

1 0

[PATCH 2/9] msvcrt: Factor out code for creating lc_time_data structure.
by Piotr Caban Dec. 4, 2019

Dec. 4, 2019

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(-)

1 0

[PATCH 1/9] ucrtbase: Improve strftime special test cases for %c %r formats.
by Piotr Caban Dec. 4, 2019

Dec. 4, 2019

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(+)

1 0

[PATCH] msvcrt: Optimize _strlwr implementation in C locale.
by Gijs Vermeulen Dec. 4, 2019

Dec. 4, 2019

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

2 1

[PATCH] wininet: Improve InternetGetConnectedStateExW to handle offline state.
by Gabriel Ivăncescu Dec. 4, 2019

Dec. 4, 2019

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

1 0

[PATCH] ntdll: Add DECLSPEC_HOTPATCH to NtProtectVirtualMemory().
by Paul Gofman Dec. 4, 2019

Dec. 4, 2019

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

1 0

[PATCH 1/2] comctl32/tests: Merge header items test with existing function.
by Nikolay Sivov Dec. 4, 2019

Dec. 4, 2019

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

1 1

[PATCH 1/5] winegstreamer: Fix the timeout passed to gst_element_get_state().
by Zebediah Figura Dec. 4, 2019

Dec. 4, 2019

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/gstdemux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 753286a7189..e024d271974 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1324,7 +1324,7 @@ static HRESULT gstdemux_wait_state(struct strmbase_filter *iface, DWORD timeout) return S_OK; ret = gst_element_get_state(filter->container, NULL, NULL, - timeout == INFINITE ? GST_CLOCK_TIME_NONE : timeout * 1000); + timeout == INFINITE ? GST_CLOCK_TIME_NONE : timeout * 1000000); if (ret == GST_STATE_CHANGE_FAILURE) { ERR("Failed to get state.\n"); -- 2.23.0

1 4

[PATCH 9/9] dmime/tests: Add GetParam/SetParam tests for unsupported types
by Michael Stefaniuc Dec. 3, 2019

Dec. 3, 2019

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmime/tests/dmime.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index a35470b4cd..e8fa6a596d 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -712,10 +712,20 @@ static void test_track(void) else if (class[i].clsid == &CLSID_DirectMusicWaveTrack) expect_getparam(dmt, param_types[j].type, param_types[j].name, DMUS_E_GET_UNSUPPORTED); - } else + } else { ok(hr == DMUS_E_TYPE_UNSUPPORTED, "IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n", param_types[j].name, hr); + expect_getparam(dmt, param_types[j].type, param_types[j].name, + DMUS_E_GET_UNSUPPORTED); + if (class[i].clsid == &CLSID_DirectMusicWaveTrack) + expect_setparam(dmt, param_types[j].type, param_types[j].name, + DMUS_E_TYPE_UNSUPPORTED); + else + expect_setparam(dmt, param_types[j].type, param_types[j].name, + DMUS_E_SET_UNSUPPORTED); + } + /* GetParam / SetParam for IsParamSupported supported types */ if (class[i].clsid == &CLSID_DirectMusicTimeSigTrack) { expect_getparam(dmt, &GUID_DisableTimeSig, "GUID_DisableTimeSig", -- 2.23.0

1 0

[PATCH 8/9] dmime: Tempo track supports only GUID_TempoParam in GetParam()
by Michael Stefaniuc Dec. 3, 2019

Dec. 3, 2019

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmime/tempotrack.c | 77 ++++++++++++++++++---------------------- dlls/dmime/tests/dmime.c | 5 +++ 2 files changed, 39 insertions(+), 43 deletions(-) diff --git a/dlls/dmime/tempotrack.c b/dlls/dmime/tempotrack.c index 442aec37bf..94e4430b7f 100644 --- a/dlls/dmime/tempotrack.c +++ b/dlls/dmime/tempotrack.c @@ -153,52 +153,43 @@ static HRESULT WINAPI tempo_track_Play(IDirectMusicTrack8 *iface, void *pStateDa return S_OK; } -static HRESULT WINAPI tempo_track_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, - MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam) +static HRESULT WINAPI tempo_track_GetParam(IDirectMusicTrack8 *iface, REFGUID type, MUSIC_TIME time, + MUSIC_TIME *next, void *param) { - IDirectMusicTempoTrack *This = impl_from_IDirectMusicTrack8(iface); - - HRESULT hr = S_OK; - struct list* pEntry = NULL; - LPDMUS_PRIVATE_TEMPO_ITEM pIt = NULL; - DMUS_TEMPO_PARAM* prm = pParam; - - FIXME("(%p, %s, %d, %p, %p): almost stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam); - - if (NULL == pParam) { - return E_POINTER; - } + IDirectMusicTempoTrack *This = impl_from_IDirectMusicTrack8(iface); + DMUS_PRIVATE_TEMPO_ITEM *item = NULL; + DMUS_TEMPO_PARAM *prm = param; + + TRACE("(%p, %s, %d, %p, %p)\n", This, debugstr_dmguid(type), time, next, param); + + if (!param) + return E_POINTER; + if (!IsEqualGUID(type, &GUID_TempoParam)) + return DMUS_E_GET_UNSUPPORTED; + + FIXME("Partial support for GUID_TempoParam\n"); + + if (next) + *next = 0; + prm->mtTime = 0; + prm->dblTempo = 0.123456; + + LIST_FOR_EACH_ENTRY(item, &This->Items, DMUS_PRIVATE_TEMPO_ITEM, entry) { + if (item->item.lTime <= time) { + MUSIC_TIME ofs = item->item.lTime - time; + if (ofs > prm->mtTime) { + prm->mtTime = ofs; + prm->dblTempo = item->item.dblTempo; + } + if (next && item->item.lTime > time && item->item.lTime < *next) + *next = item->item.lTime; + } + } - hr = IDirectMusicTrack_IsParamSupported (iface, rguidType); - if (FAILED(hr)) { - return hr; - } + if (0.123456 == prm->dblTempo) + return DMUS_E_NOT_FOUND; - if (NULL != pmtNext) *pmtNext = 0; - prm->mtTime = 0; - prm->dblTempo = 0.123456; - - LIST_FOR_EACH (pEntry, &This->Items) { - pIt = LIST_ENTRY(pEntry, DMUS_PRIVATE_TEMPO_ITEM, entry); - /*TRACE(" - %p -> 0x%lx,%p\n", pIt, pIt->item.lTime, pIt->item.dblTempo);*/ - if (pIt->item.lTime <= mtTime) { - MUSIC_TIME ofs = pIt->item.lTime - mtTime; - if (ofs > prm->mtTime) { - prm->mtTime = ofs; - prm->dblTempo = pIt->item.dblTempo; - } - if (NULL != pmtNext && pIt->item.lTime > mtTime) { - if (pIt->item.lTime < *pmtNext) { - *pmtNext = pIt->item.lTime; - } - } - } - } - - if (0.123456 == prm->dblTempo) { - return DMUS_E_NOT_FOUND; - } - return S_OK; + return S_OK; } static HRESULT WINAPI tempo_track_SetParam(IDirectMusicTrack8 *iface, REFGUID type, MUSIC_TIME time, diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 3e25328cd8..a35470b4cd 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -724,6 +724,11 @@ static void test_track(void) DMUS_E_GET_UNSUPPORTED); expect_setparam(dmt, &GUID_TimeSignature, "GUID_TimeSignature", DMUS_E_SET_UNSUPPORTED); + } else if (class[i].clsid == &CLSID_DirectMusicTempoTrack) { + expect_getparam(dmt, &GUID_DisableTempo, "GUID_DisableTempo", + DMUS_E_GET_UNSUPPORTED); + expect_getparam(dmt, &GUID_EnableTempo, "GUID_EnableTempo", + DMUS_E_GET_UNSUPPORTED); } } } else { -- 2.23.0

1 0