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

Austin English : ntoskrnl.exe: Add KdDisableDebugger/KdEnableDebugger stubs.
by Alexandre Julliard June 7, 2021

June 7, 2021

Module: wine Branch: stable Commit: d81c2f2fa7d9d326a43db6ee76637cd2c404532d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d81c2f2fa7d9d326a43db6ee… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Feb 1 15:25:41 2021 -0600 ntoskrnl.exe: Add KdDisableDebugger/KdEnableDebugger stubs. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50599 Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e8cb99466b053e4fb2c720cb56bf7ba1d4e4a4d1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 12 ++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 2e6131c32c7..9dc5809614a 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -4256,6 +4256,18 @@ void WINAPI KeUnstackDetachProcess(KAPC_STATE *apc_state) FIXME("apc_state %p stub.\n", apc_state); } +NTSTATUS WINAPI KdDisableDebugger(void) +{ + FIXME(": stub.\n"); + return STATUS_DEBUGGER_INACTIVE; +} + +NTSTATUS WINAPI KdEnableDebugger(void) +{ + FIXME(": stub.\n"); + return STATUS_DEBUGGER_INACTIVE; +} + /***************************************************** * DllMain */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index d57a2f81df6..22968913300 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -515,8 +515,8 @@ @ stub IoWriteTransferCount @ extern KdDebuggerEnabled @ stub KdDebuggerNotPresent -@ stub KdDisableDebugger -@ stub KdEnableDebugger +@ stdcall KdDisableDebugger() +@ stdcall KdEnableDebugger() @ stub KdEnteredDebugger @ stub KdPollBreakIn @ stub KdPowerTransition

1 0

Hans Leidekker : wbemprox: Fix Windows 8/8.1 caption.
by Alexandre Julliard June 7, 2021

June 7, 2021

Module: wine Branch: stable Commit: f7c5cb04ba8218160b254339269b727cf897805b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7c5cb04ba8218160b254339… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 3 10:32:32 2021 +0100 wbemprox: Fix Windows 8/8.1 caption. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50610 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit bdba6037d01acce3cd1ea299a8859f3b99d4f520) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wbemprox/builtin.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index f1cf75ab380..b86326327fb 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -3436,8 +3436,8 @@ static WCHAR *get_oscaption( OSVERSIONINFOEXW *ver ) if (!(ret = heap_alloc( len * sizeof(WCHAR) + sizeof(win2003W) ))) return NULL; memcpy( ret, windowsW, sizeof(windowsW) ); if (ver->dwMajorVersion == 10 && ver->dwMinorVersion == 0) memcpy( ret + len, win10W, sizeof(win10W) ); - else if (ver->dwMajorVersion == 6 && ver->dwMinorVersion == 3) memcpy( ret + len, win8W, sizeof(win8W) ); - else if (ver->dwMajorVersion == 6 && ver->dwMinorVersion == 2) memcpy( ret + len, win81W, sizeof(win81W) ); + else if (ver->dwMajorVersion == 6 && ver->dwMinorVersion == 3) memcpy( ret + len, win81W, sizeof(win81W) ); + else if (ver->dwMajorVersion == 6 && ver->dwMinorVersion == 2) memcpy( ret + len, win8W, sizeof(win8W) ); else if (ver->dwMajorVersion == 6 && ver->dwMinorVersion == 1) { if (ver->wProductType == VER_NT_WORKSTATION) memcpy( ret + len, win7W, sizeof(win7W) );

1 0

Henri Verbeet : wined3d: Create the backbuffer rendertarget view only after calling adapter_init_3d().
by Alexandre Julliard June 7, 2021

June 7, 2021

Module: wine Branch: stable Commit: 1eead2aaca540d0b03c99359b256739328c2ce39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1eead2aaca540d0b03c99359… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 11 11:52:15 2021 +0100 wined3d: Create the backbuffer rendertarget view only after calling adapter_init_3d(). Otherwise we may not be able to acquire a context to create the view. In practice, this is only an issue for d3d9 and earlier in combination with the Vulkan backend. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b9a440d15d84e7967f70b38291d2f85767fb7a6f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/device.c | 45 +++++++++++++++++++++------------------------ 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3c16a3c691e..a2c3bee135a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1088,6 +1088,24 @@ HRESULT wined3d_device_set_implicit_swapchain(struct wined3d_device *device, str if (device->d3d_initialized) return WINED3DERR_INVALIDCALL; + device->swapchain_count = 1; + if (!(device->swapchains = heap_calloc(device->swapchain_count, sizeof(*device->swapchains)))) + { + ERR("Failed to allocate swapchain array.\n"); + hr = E_OUTOFMEMORY; + goto err_out; + } + device->swapchains[0] = swapchain; + + for (i = 0; i < ARRAY_SIZE(device->state.fb.render_targets); ++i) + if (device->state.fb.render_targets[i]) + wined3d_rtv_bind_count_dec(device->state.fb.render_targets[i]); + + memset(device->state.fb.render_targets, 0, sizeof(device->state.fb.render_targets)); + if (FAILED(hr = device->adapter->adapter_ops->adapter_init_3d(device))) + goto err_out; + device->d3d_initialized = TRUE; + swapchain_desc = &swapchain->state.desc; if (swapchain_desc->backbuffer_count && swapchain_desc->backbuffer_bind_flags & WINED3D_BIND_RENDER_TARGET) { @@ -1104,28 +1122,12 @@ HRESULT wined3d_device_set_implicit_swapchain(struct wined3d_device *device, str NULL, &wined3d_null_parent_ops, &device->back_buffer_view))) { ERR("Failed to create rendertarget view, hr %#x.\n", hr); - return hr; + device->adapter->adapter_ops->adapter_uninit_3d(device); + device->d3d_initialized = FALSE; + goto err_out; } } - device->swapchain_count = 1; - if (!(device->swapchains = heap_calloc(device->swapchain_count, sizeof(*device->swapchains)))) - { - ERR("Failed to allocate swapchain array.\n"); - hr = E_OUTOFMEMORY; - goto err_out; - } - device->swapchains[0] = swapchain; - - for (i = 0; i < ARRAY_SIZE(device->state.fb.render_targets); ++i) - if (device->state.fb.render_targets[i]) - wined3d_rtv_bind_count_dec(device->state.fb.render_targets[i]); - - memset(device->state.fb.render_targets, 0, sizeof(device->state.fb.render_targets)); - if (FAILED(hr = device->adapter->adapter_ops->adapter_init_3d(device))) - goto err_out; - device->d3d_initialized = TRUE; - device_init_swapchain_state(device, swapchain); TRACE("All defaults now set up.\n"); @@ -1147,11 +1149,6 @@ err_out: heap_free(device->swapchains); device->swapchains = NULL; device->swapchain_count = 0; - if (device->back_buffer_view) - { - wined3d_rendertarget_view_decref(device->back_buffer_view); - device->back_buffer_view = NULL; - } return hr; }

1 0

Piotr Caban : msvcr110: Copy utf16 strings in _Gettnames.
by Alexandre Julliard June 7, 2021

June 7, 2021

Module: wine Branch: stable Commit: b1b8412f96ca5e302c004c7b3416c348b9724cf4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1b8412f96ca5e302c004c7b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 2 18:55:33 2021 +0100 msvcr110: Copy utf16 strings in _Gettnames. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50409 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b3fcb0f2c854311bd1604df958a6425c22c657b3) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcr120/tests/msvcr120.c | 13 ++++++++++--- dlls/msvcrt/locale.c | 12 ++++++++++++ dlls/msvcrt/tests/locale.c | 4 ++++ 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index 5976a86963a..a68870ac77b 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -171,6 +171,7 @@ static int (__cdecl *p__dpcomp)(double x, double y); static wchar_t** (CDECL *p____lc_locale_name_func)(void); static unsigned int (CDECL *p__GetConcurrency)(void); static void* (CDECL *p__W_Gettnames)(void); +static void* (CDECL *p__Gettnames)(void); static void (CDECL *p_free)(void*); static float (CDECL *p_strtof)(const char *, char **); static int (CDECL *p__finite)(double); @@ -242,6 +243,7 @@ static BOOL init(void) p____lc_locale_name_func = (void*)GetProcAddress(module, "___lc_locale_name_func"); p__GetConcurrency = (void*)GetProcAddress(module,"?_GetConcurrency(a)details@Concurrency@@YAIXZ"); p__W_Gettnames = (void*)GetProcAddress(module, "_W_Gettnames"); + p__Gettnames = (void*)GetProcAddress(module, "_Gettnames"); p_free = (void*)GetProcAddress(module, "free"); p_strtof = (void*)GetProcAddress(module, "strtof"); p__finite = (void*)GetProcAddress(module, "_finite"); @@ -531,7 +533,7 @@ static void test__GetConcurrency(void) ok(c == si.dwNumberOfProcessors, "expected %u, got %u\n", si.dwNumberOfProcessors, c); } -static void test__W_Gettnames(void) +static void test_gettnames(void* (CDECL *p_gettnames)(void)) { static const char *str[] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", @@ -557,7 +559,7 @@ static void test__W_Gettnames(void) if(!p_setlocale(LC_ALL, "english")) return; - ret = p__W_Gettnames(); + ret = p_gettnames(); size = ret->str[0]-(char*)ret; if(sizeof(void*) == 8) ok(size==0x2c0, "structure size: %x\n", size); @@ -572,6 +574,10 @@ static void test__W_Gettnames(void) ok(!lstrcmpW(ret->wstr[i], buf), "ret->wstr[%d] = %s, expected %s\n", i, wine_dbgstr_w(ret->wstr[i]), wine_dbgstr_w(buf)); } + + ok(ret->str[42] + strlen(ret->str[42])+1 == (char*)ret->wstr[0], + "ret->str[42] = %p len = %d, ret->wstr[0] = %p\n", + ret->str[42], strlen(ret->str[42]), ret->wstr[0]); p_free(ret); p_setlocale(LC_ALL, "C"); @@ -1111,7 +1117,8 @@ START_TEST(msvcr120) test__dpcomp(); test____lc_locale_name_func(); test__GetConcurrency(); - test__W_Gettnames(); + test_gettnames(p__W_Gettnames); + test_gettnames(p__Gettnames); test__strtof(); test_remainder(); test_critical_section(); diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index ba98d31d719..c064d12edd6 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -802,6 +802,10 @@ void* CDECL _Gettnames(void) for(i=0; i<ARRAY_SIZE(cur->str.str); i++) size += strlen(cur->str.str[i])+1; +#if _MSVCR_VER >= 110 + for(i=0; i<ARRAY_SIZE(cur->wstr.wstr); i++) + size += (wcslen(cur->wstr.wstr[i]) + 1) * sizeof(wchar_t); +#endif ret = malloc(size); if(!ret) @@ -815,6 +819,14 @@ void* CDECL _Gettnames(void) ret->str.str[i] = &ret->data[size]; size += len; } +#if _MSVCR_VER >= 110 + for(i=0; i<ARRAY_SIZE(cur->wstr.wstr); i++) { + len = (wcslen(cur->wstr.wstr[i]) + 1) * sizeof(wchar_t); + memcpy(&ret->data[size], cur->wstr.wstr[i], len); + ret->wstr.wstr[i] = (wchar_t*)&ret->data[size]; + size += len; + } +#endif return ret; } diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c index 176e3b5e6e4..030d65de3cb 100644 --- a/dlls/msvcrt/tests/locale.c +++ b/dlls/msvcrt/tests/locale.c @@ -733,6 +733,10 @@ static void test__Gettnames(void) ok(!strcmp(ret->str[i], buf), "ret->str[%i] = %s, expected %s\n", i, ret->str[i], buf); } + ok(ret->wstr[0] != NULL, "ret->wstr[0] = NULL\n"); + ok(ret->str[42] + strlen(ret->str[42])+1 != (char*)ret->wstr[0], + "ret->str[42] = %p len = %d, ret->wstr[0] = %p\n", + ret->str[42], strlen(ret->str[42]), ret->wstr[0]); free(ret); if(!setlocale(LC_TIME, "german"))

1 0

Piotr Caban : ucrtbase: Fix _Syserror_map behavior on unknown error.
by Alexandre Julliard June 7, 2021

June 7, 2021

Module: wine Branch: stable Commit: 66e06267c04605fb2c894ce04c0579a6f023139a URL: https://source.winehq.org/git/wine.git/?a=commit;h=66e06267c04605fb2c894ce0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 2 18:13:11 2021 +0100 ucrtbase: Fix _Syserror_map behavior on unknown error. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50407 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b54ab691a7a484b7ce3d38b2d77088fb8f946257) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 14 ++++++++++++++ dlls/msvcp140/tests/msvcp140.c | 15 +++++++++++++++ dlls/msvcp90/misc.c | 4 ++++ 3 files changed, 33 insertions(+) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 54d959b694c..35e90cfa29c 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -216,6 +216,7 @@ static void (CDECL *p__Do_call)(void *this); static short (__cdecl *p__Dtest)(double *d); static short (__cdecl *p__Dscale)(double *d, int exp); static short (__cdecl *p__FExp)(float *x, float y, int exp); +static const char* (__cdecl *p__Syserror_map)(int err); /* filesystem */ static ULONGLONG(__cdecl *p_tr2_sys__File_size)(char const*); @@ -575,6 +576,8 @@ static BOOL init(void) "?_Internal_reserve(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEAAX_K00(a)Z"); SET(p_vector_base_v4__Internal_resize, "?_Internal_resize(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEAAX_K00P6AXPEAX0(a)ZP6AX1PEBX0@Z3(a)Z"); + SET(p__Syserror_map, + "?_Syserror_map(a)std@@YAPEBDH(a)Z"); } else { SET(p_tr2_sys__File_size, "?_File_size(a)sys@tr2(a)std@@YA_KPBD(a)Z"); @@ -648,6 +651,8 @@ static BOOL init(void) "?_Mtx_unlock(a)threads@stdext@@YAXPAX(a)Z"); SET(p_vector_base_v4__Segment_index_of, "?_Segment_index_of(a)_Concurrent_vector_base_v4@details(a)Concurrency@@KAII(a)Z"); + SET(p__Syserror_map, + "?_Syserror_map(a)std@@YAPBDH(a)Z"); #ifdef __i386__ SET(p_i386_Thrd_current, "_Thrd_current"); @@ -1170,6 +1175,14 @@ static void test__FExp(void) ok(ret == FP_NORMAL, "ret = %x\n", ret); } +static void test__Syserror_map(void) +{ + const char *r; + + r = p__Syserror_map(0); + ok(!r, "_Syserror_map(0) returned %p\n", r); +} + static void test_tr2_sys__File_size(void) { ULONGLONG val; @@ -3306,6 +3319,7 @@ START_TEST(msvcp120) test__Dtest(); test__Dscale(); test__FExp(); + test__Syserror_map(); test_tr2_sys__File_size(); test_tr2_sys__Equivalent(); diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index ae21feaf9e4..8a3771842a0 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -196,6 +196,7 @@ static int (__cdecl *p_To_wide)(const char *src, WCHAR *dst); static int (__cdecl *p_Unlink)(WCHAR const*); static ULONG (__cdecl *p__Winerror_message)(ULONG, char*, ULONG); static int (__cdecl *p__Winerror_map)(int); +static const char* (__cdecl *p__Syserror_map)(int err); static BOOLEAN (WINAPI *pCreateSymbolicLinkW)(const WCHAR *, const WCHAR *, DWORD); @@ -234,6 +235,7 @@ static BOOL init(void) SET(p__Reschedule_chore, "?_Reschedule_chore(a)details@Concurrency@@YAHPEBU_Threadpool_chore(a)12@@Z"); SET(p__Release_chore, "?_Release_chore(a)details@Concurrency@@YAXPEAU_Threadpool_chore(a)12@@Z"); SET(p__Winerror_message, "?_Winerror_message(a)std@@YAKKPEADK(a)Z"); + SET(p__Syserror_map, "?_Syserror_map(a)std@@YAPEBDH(a)Z"); } else { #ifdef __arm__ SET(p_task_continuation_context_ctor, "??0task_continuation_context(a)Concurrency@@AAA(a)XZ"); @@ -264,6 +266,7 @@ static BOOL init(void) SET(p__Reschedule_chore, "?_Reschedule_chore(a)details@Concurrency@@YAHPBU_Threadpool_chore(a)12@@Z"); SET(p__Release_chore, "?_Release_chore(a)details@Concurrency@@YAXPAU_Threadpool_chore(a)12@@Z"); SET(p__Winerror_message, "?_Winerror_message(a)std@@YAKKPADK(a)Z"); + SET(p__Syserror_map, "?_Syserror_map(a)std@@YAPBDH(a)Z"); } SET(p_Close_dir, "_Close_dir"); @@ -1314,6 +1317,17 @@ static void test__Winerror_map(void) } } +static void test__Syserror_map(void) +{ + const char *r1, *r2; + + r1 = p__Syserror_map(0); + ok(r1 != NULL, "_Syserror_map(0) returned NULL\n"); + r2 = p__Syserror_map(1234); + ok(r2 != NULL, "_Syserror_map(1234) returned NULL\n"); + ok(r1 == r2, "r1 = %p(%s), r2 = %p(%s)\n", r1, r1, r2, r2); +} + static void test_Equivalent(void) { int val, i; @@ -1391,6 +1405,7 @@ START_TEST(msvcp140) test_Last_write_time(); test__Winerror_message(); test__Winerror_map(); + test__Syserror_map(); test_Equivalent(); FreeLibrary(msvcp); } diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 76f730c2344..f70de9e5600 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -2864,7 +2864,11 @@ const char* __cdecl _Syserror_map(int err) if(syserror_map[i].err == err) return syserror_map[i].str; } +#if _MSVCP_VER >= 140 + return "unknown error"; +#else return NULL; +#endif } #endif

1 0

Piotr Caban : msvcp90: Add _Wcsxfrm implementation.
by Alexandre Julliard June 7, 2021

June 7, 2021

Module: wine Branch: stable Commit: dcecdf6a4684aed56b037abf470e120a4b3c7e0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=dcecdf6a4684aed56b037abf… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 3 11:57:06 2021 +0100 msvcp90: Add _Wcsxfrm implementation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50401 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 3657c8b8293a1a026c81aa9cf4c04b1884c133cd) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcp100/msvcp100.spec | 2 +- dlls/msvcp110/msvcp110.spec | 2 +- dlls/msvcp120/msvcp120.spec | 2 +- dlls/msvcp120_app/msvcp120_app.spec | 2 +- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp71/msvcp71.spec | 2 +- dlls/msvcp80/msvcp80.spec | 2 +- dlls/msvcp90/locale.c | 37 +++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 2 +- dlls/msvcp90/tests/misc.c | 24 ++++++++++++++++++++++++ 10 files changed, 69 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index dd5ccfaf7e0..a05d20dea4e 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -2969,7 +2969,7 @@ @ cdecl _Towupper(long ptr) @ cdecl _Wcrtomb(ptr long ptr ptr) @ cdecl _Wcscoll(ptr ptr ptr ptr ptr) -@ stub _Wcsxfrm +@ cdecl _Wcsxfrm(ptr ptr ptr ptr ptr) # extern _Xbig @ stub __Wcrtomb_lk @ cdecl towctrans(long long) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 6a386237ed7..10c2216aebb 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3877,7 +3877,7 @@ @ cdecl _Unlock_shared_ptr_spin_lock() @ cdecl _Wcrtomb(ptr long ptr ptr) @ cdecl _Wcscoll(ptr ptr ptr ptr ptr) -@ stub _Wcsxfrm +@ cdecl _Wcsxfrm(ptr ptr ptr ptr ptr) # extern _Xbig @ stub _Xp_addh @ stub _Xp_addx diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index fd42183beae..6f3e7b65f92 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -3824,7 +3824,7 @@ @ cdecl _Unlock_shared_ptr_spin_lock() @ cdecl _Wcrtomb(ptr long ptr ptr) @ cdecl _Wcscoll(ptr ptr ptr ptr ptr) -@ stub _Wcsxfrm +@ cdecl _Wcsxfrm(ptr ptr ptr ptr ptr) # extern _Xbig @ stub _Xp_addh @ stub _Xp_addx diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index b7662613b94..c35dcb2d427 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -3824,7 +3824,7 @@ @ cdecl _Unlock_shared_ptr_spin_lock() msvcp120._Unlock_shared_ptr_spin_lock @ cdecl _Wcrtomb(ptr long ptr ptr) msvcp120._Wcrtomb @ cdecl _Wcscoll(ptr ptr ptr ptr ptr) msvcp120._Wcscoll -@ stub _Wcsxfrm +@ cdecl _Wcsxfrm(ptr ptr ptr ptr ptr) msvcp120._Wcsxfrm # extern _Xbig @ stub _Xp_addh @ stub _Xp_addx diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 94dd37ad4b3..dcd062aa4fc 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3747,7 +3747,7 @@ @ stub _WStoldx @ cdecl _Wcrtomb(ptr long ptr ptr) @ cdecl _Wcscoll(ptr ptr ptr ptr ptr) -@ stub _Wcsxfrm +@ cdecl _Wcsxfrm(ptr ptr ptr ptr ptr) @ cdecl _Xtime_diff_to_millis(ptr) _Xtime_diff_to_millis @ cdecl _Xtime_diff_to_millis2(ptr ptr) _Xtime_diff_to_millis2 @ cdecl -ret64 _Xtime_get_ticks() _Xtime_get_ticks diff --git a/dlls/msvcp71/msvcp71.spec b/dlls/msvcp71/msvcp71.spec index 422902375cd..0b371131613 100644 --- a/dlls/msvcp71/msvcp71.spec +++ b/dlls/msvcp71/msvcp71.spec @@ -5153,7 +5153,7 @@ @ cdecl _Towupper(long ptr) @ cdecl _Wcrtomb(ptr long ptr ptr) @ cdecl _Wcscoll(ptr ptr ptr ptr ptr) -@ stub _Wcsxfrm +@ cdecl _Wcsxfrm(ptr ptr ptr ptr ptr) # extern _Xbig # extern _Zero @ stub __Wcrtomb_lk diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec index fa4d6eaf405..6505f893b50 100644 --- a/dlls/msvcp80/msvcp80.spec +++ b/dlls/msvcp80/msvcp80.spec @@ -5779,7 +5779,7 @@ @ cdecl _Towupper(long ptr) @ cdecl _Wcrtomb(ptr long ptr ptr) @ cdecl _Wcscoll(ptr ptr ptr ptr ptr) -@ stub _Wcsxfrm +@ cdecl _Wcsxfrm(ptr ptr ptr ptr ptr) # extern _Xbig @ stub __Stodx @ stub __Stofx diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 6b547c384a4..b4ed8d5e75d 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -12701,6 +12701,43 @@ size_t __cdecl _Strxfrm(char *dest, char *dest_end, const char *src, const char return len; } +size_t __cdecl _Wcsxfrm(wchar_t *dest, wchar_t *dest_end, + const wchar_t *src, const wchar_t *src_end, _Collvec *coll) +{ + size_t dest_len = dest_end - dest; + size_t src_len = src_end - src; + _Collvec cv; + LCID lcid; + int i, len; + + TRACE("(%p %p %p %p %p)\n", dest, dest_end, src, src_end, coll); + + if (coll) cv = *coll; + else getcoll(&cv); + +#if _MSVCP_VER < 110 + lcid = cv.handle; +#else + lcid = LocaleNameToLCID(cv.lc_name, 0); +#endif + + if (!lcid) + { + if (src_len > dest_len) return src_len; + memcpy(dest, src, src_len * sizeof(wchar_t)); + return src_len; + } + + len = LCMapStringW(lcid, LCMAP_SORTKEY, src, src_len, NULL, 0); + if (!len) return INT_MAX; + if (len > dest_len) return len; + + LCMapStringW(lcid, LCMAP_SORTKEY, src, src_len, dest, dest_len); + for (i = len - 1; i >= 0; i--) + dest[i] = ((BYTE*)dest)[i]; + return len; +} + DEFINE_RTTI_DATA0(_Facet_base, 0, ".?AV_Facet_base(a)std@@") DEFINE_RTTI_DATA0(locale_facet, 0, ".?AVfacet(a)locale@std@@") DEFINE_RTTI_DATA1(locale__Locimp, 0, &locale_facet_rtti_base_descriptor, ".?AV_Locimp(a)locale@std@@") diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index c38dd041af2..1fbabe3114c 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -6554,7 +6554,7 @@ @ cdecl _Towupper(long ptr) @ cdecl _Wcrtomb(ptr long ptr ptr) @ cdecl _Wcscoll(ptr ptr ptr ptr ptr) -@ stub _Wcsxfrm +@ cdecl _Wcsxfrm(ptr ptr ptr ptr ptr) # extern _Xbig @ stub __Wcrtomb_lk @ cdecl towctrans(long long) diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c index d700b6d933c..9d6fe2b9bcc 100644 --- a/dlls/msvcp90/tests/misc.c +++ b/dlls/msvcp90/tests/misc.c @@ -106,6 +106,8 @@ static wctrans_t (__cdecl *p_wctrans)(const char*); static wint_t (__cdecl *p_towctrans)(wint_t, wctrans_t); static void (__cdecl *p_locale__Locimp__Locimp_Addfac)(locale__Locimp*,locale_facet*,size_t); static size_t (__cdecl *p__Strxfrm)(char*, char*, const char*, const char*, const MSVCP__Collvec*); +static size_t (__cdecl *p__Wcsxfrm)(wchar_t*, wchar_t*, const wchar_t*, + const wchar_t*, const MSVCP__Collvec*); #undef __thiscall #ifdef __i386__ @@ -250,6 +252,7 @@ static BOOL init(void) SET(p_wctrans, "wctrans"); SET(p_towctrans, "towctrans"); SET(p__Strxfrm, "_Strxfrm"); + SET(p__Wcsxfrm, "_Wcsxfrm"); SET(basic_ostringstream_char_vbtable, "??_8?$basic_ostringstream(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@7B@"); SET(p_std_Ctraits_float__Isnan, "?_Isnan@?$_Ctraits(a)M@std@@SA_NM(a)Z"); @@ -1110,6 +1113,26 @@ static void test__Strxfrm(void) ok(!strcmp(in, out), "out = %s\n", out); } +static void test__Wcsxfrm(void) +{ + const wchar_t in[] = L"abc"; + + MSVCP__Collvec coll; + wchar_t out[64]; + size_t ret; + + memset(&coll, 0, sizeof(coll)); + + out[0] = 'z'; + ret = p__Wcsxfrm(out, out + 1, in, in + 2, &coll); + ok(ret == 2, "ret = %d\n", (int)ret); + ok(out[0] == 'z', "out[0] = %x\n", out[0]); + + ret = p__Wcsxfrm(out, out + ARRAY_SIZE(out), in, in + 4, &coll); + ok(ret == 4, "ret = %d\n", (int)ret); + ok(!wcscmp(in, out), "out = %s\n", wine_dbgstr_w(out)); +} + START_TEST(misc) { if(!init()) @@ -1131,6 +1154,7 @@ START_TEST(misc) test_locale__Locimp__Locimp_Addfac(); test_raise_handler(); test__Strxfrm(); + test__Wcsxfrm(); ok(!invalid_parameter, "invalid_parameter_handler was invoked too many times\n");

1 0

Zebediah Figura : winemac: Send systray messages with SendNotifyMessage().
by Alexandre Julliard June 7, 2021

June 7, 2021

Module: wine Branch: stable Commit: 2e1ba07a11b35b2a0243f4a5cbbbed86ffc37c3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e1ba07a11b35b2a0243f4a5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Jan 30 13:54:32 2021 -0600 winemac: Send systray messages with SendNotifyMessage(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50441 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 46c4facab73558af8e9d1c96093656ce06cdf51b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winemac.drv/systray.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winemac.drv/systray.c b/dlls/winemac.drv/systray.c index 75bca5e3d51..d026f0b970b 100644 --- a/dlls/winemac.drv/systray.c +++ b/dlls/winemac.drv/systray.c @@ -290,7 +290,7 @@ static BOOL notify_owner(struct tray_icon *icon, UINT msg, int x, int y) } TRACE("posting msg 0x%04x to hwnd %p id 0x%x\n", msg, icon->owner, icon->id); - if (!PostMessageW(icon->owner, icon->callback_message, wp, lp) && + if (!SendNotifyMessageW(icon->owner, icon->callback_message, wp, lp) && (GetLastError() == ERROR_INVALID_WINDOW_HANDLE)) { WARN("window %p was destroyed, removing icon 0x%x\n", icon->owner, icon->id);

1 0

Akihiro Sagawa : winmm/tests: Expect TIME_BYTES format for TIME_MS request.
by Alexandre Julliard June 7, 2021

June 7, 2021

Module: wine Branch: stable Commit: c84fb8ad7761a7a38a047835ffd96810979a6286 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c84fb8ad7761a7a38a047835… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Jan 20 22:23:40 2021 +0900 winmm/tests: Expect TIME_BYTES format for TIME_MS request. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit aa56ee08f6c436cb5d0cbebf6b2213d06570ac8a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winmm/tests/wave.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 819489e5566..079a497dd0b 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -519,14 +519,11 @@ static void check_position(int device, HWAVEOUT wout, DWORD bytes, rc=waveOutGetPosition(wout, &mmtime, sizeof(mmtime)); ok(rc==MMSYSERR_NOERROR, "waveOutGetPosition(%s): rc=%s\n",dev_name(device),wave_out_error(rc)); - if (mmtime.wType != TIME_MS && winetest_debug > 1) - trace("waveOutGetPosition(%s): TIME_MS not supported, returned %s\n", - dev_name(device), wave_time_format(mmtime.wType)); + todo_wine ok(mmtime.wType == TIME_BYTES, "(waveOutGetPosition(%s): returned %s\n", + dev_name(device), wave_time_format(mmtime.wType)); returned = time_to_bytes(&mmtime, pwfx); - ok(returned == bytes, "waveOutGetPosition(%s): returned %d ms, " - "(%d bytes), should be %d (%d bytes)\n", dev_name(device), - bytes_to_ms(returned, pwfx), returned, - bytes_to_ms(bytes, pwfx), bytes); + ok(returned == bytes, "waveOutGetPosition(%s): TIME_MS test failed\n", + dev_name(device)); mmtime.wType = TIME_SMPTE; rc=waveOutGetPosition(wout, &mmtime, sizeof(mmtime));

1 0

Akihiro Sagawa : winmm: Get rid of TIME_MS format support in waveOutGetPosition().
by Alexandre Julliard June 7, 2021

June 7, 2021

Module: wine Branch: stable Commit: e6819b0f4339ba98e14f60f71bf4a48e0a5934b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6819b0f4339ba98e14f60f7… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Jan 20 22:23:42 2021 +0900 winmm: Get rid of TIME_MS format support in waveOutGetPosition(). SofTalk (Japanese text-to-speech software) depends on this. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50515 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 37f3a078314423da4e291ccc8b09c6aab8aeb99f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winmm/tests/wave.c | 2 +- dlls/winmm/waveform.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 079a497dd0b..cb18f3e0fa4 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -519,7 +519,7 @@ static void check_position(int device, HWAVEOUT wout, DWORD bytes, rc=waveOutGetPosition(wout, &mmtime, sizeof(mmtime)); ok(rc==MMSYSERR_NOERROR, "waveOutGetPosition(%s): rc=%s\n",dev_name(device),wave_out_error(rc)); - todo_wine ok(mmtime.wType == TIME_BYTES, "(waveOutGetPosition(%s): returned %s\n", + ok(mmtime.wType == TIME_BYTES, "(waveOutGetPosition(%s): returned %s\n", dev_name(device), wave_time_format(mmtime.wType)); returned = time_to_bytes(&mmtime, pwfx); ok(returned == bytes, "waveOutGetPosition(%s): TIME_MS test failed\n", diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 9d58b78c779..876b9d3d91d 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -2038,9 +2038,6 @@ static MMRESULT WINMM_FramesToMMTime(MMTIME *time, UINT32 played_frames, case TIME_SAMPLES: time->u.sample = played_frames; return MMSYSERR_NOERROR; - case TIME_MS: - time->u.ms = (UINT64)played_frames * 1000 / sample_rate; - return MMSYSERR_NOERROR; case TIME_SMPTE: time->u.smpte.fps = 30; played_frames += sample_rate / time->u.smpte.fps - 1; /* round up */

1 0

Nikolay Sivov : explorerframe: Do not block clicks on the item button.
by Alexandre Julliard June 7, 2021

June 7, 2021

Module: wine Branch: stable Commit: 1b44efb59e796e23b12b0af24cb2a2494187f979 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b44efb59e796e23b12b0af2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 10 17:00:19 2021 +0300 explorerframe: Do not block clicks on the item button. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=28786 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7ac196aa0cc97e7730b81a4f67e65f6ca1f6cd8b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/explorerframe/nstc.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/dlls/explorerframe/nstc.c b/dlls/explorerframe/nstc.c index 0abaded85a6..b1ecace5fae 100644 --- a/dlls/explorerframe/nstc.c +++ b/dlls/explorerframe/nstc.c @@ -678,7 +678,7 @@ static LRESULT on_nm_click(NSTC2Impl *This, NMHDR *nmhdr) { TVHITTESTINFO tvhit; IShellItem *psi; - HRESULT hr; + TRACE("%p (%p)\n", This, nmhdr); GetCursorPos(&tvhit.pt); @@ -690,17 +690,7 @@ static LRESULT on_nm_click(NSTC2Impl *This, NMHDR *nmhdr) /* TVHT_ maps onto the corresponding NSTCEHT_ */ psi = shellitem_from_treeitem(This, tvhit.hItem); - hr = events_OnItemClick(This, psi, tvhit.flags, NSTCECT_LBUTTON); - - /* The expando should not be expanded unless - * double-clicked. */ - if(tvhit.flags == TVHT_ONITEMBUTTON) - return TRUE; - - if(SUCCEEDED(hr)) - return FALSE; - else - return TRUE; + return FAILED(events_OnItemClick(This, psi, tvhit.flags, NSTCECT_LBUTTON)); } static LRESULT on_wm_mbuttonup(NSTC2Impl *This, WPARAM wParam, LPARAM lParam)

1 0