March 2022 - Wine-commits - list.winehq.org

Jacek Caban : win32u: Move NtUserDestroyWindow implementation from user32.
by Alexandre Julliard 17 Mar '22

17 Mar '22

Module: wine Branch: master Commit: 6a5ddbeedc7801dee984a5e18aba2fcde363e42c URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a5ddbeedc7801dee984a5e1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 17 15:29:30 2022 +0000 win32u: Move NtUserDestroyWindow implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/clipboard.c | 23 ---- dlls/user32/combo.c | 2 +- dlls/user32/dde_misc.c | 6 +- dlls/user32/dde_server.c | 2 +- dlls/user32/defwnd.c | 2 +- dlls/user32/dialog.c | 4 +- dlls/user32/driver.c | 7 +- dlls/user32/mdi.c | 2 +- dlls/user32/menu.c | 8 +- dlls/user32/message.c | 2 - dlls/user32/msgbox.c | 70 +++++----- dlls/user32/painting.c | 12 -- dlls/user32/user32.spec | 2 +- dlls/user32/user_main.c | 10 ++ dlls/user32/win.c | 248 +--------------------------------- dlls/user32/win.h | 1 - dlls/win32u/clipboard.c | 25 ++++ dlls/win32u/driver.c | 1 + dlls/win32u/gdiobj.c | 1 + dlls/win32u/message.c | 2 + dlls/win32u/ntuser_private.h | 4 + dlls/win32u/sysparams.c | 18 ++- dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 6 + dlls/win32u/window.c | 315 +++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/wrappers.c | 6 + include/ntuser.h | 4 +- 27 files changed, 440 insertions(+), 345 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6a5ddbeedc7801dee984…

1 0

Jacek Caban : win32u: Move get_min_max_info implementation from user32.
by Alexandre Julliard 17 Mar '22

17 Mar '22

Module: wine Branch: master Commit: a831aa1875e6a3cc6eb3d64a127c45ebb9c1ce60 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a831aa1875e6a3cc6eb3d64a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 17 15:29:31 2022 +0000 win32u: Move get_min_max_info implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/user_main.c | 1 + dlls/user32/winpos.c | 92 ++--------------------------------------- dlls/win32u/menu.c | 6 +++ dlls/win32u/ntuser_private.h | 1 + dlls/win32u/win32u_private.h | 3 ++ dlls/win32u/window.c | 97 ++++++++++++++++++++++++++++++++++++++++++++ include/ntuser.h | 1 + 7 files changed, 113 insertions(+), 88 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a831aa1875e6a3cc6eb3…

1 0

Jacek Caban : win32u: Move NtUserShowWindow implementation from user32.
by Alexandre Julliard 17 Mar '22

17 Mar '22

Module: wine Branch: master Commit: 3011f24f9321d95b6fa4ba29e233b1a6d64f671d URL: https://source.winehq.org/git/wine.git/?a=commit;h=3011f24f9321d95b6fa4ba29… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 17 15:29:32 2022 +0000 win32u: Move NtUserShowWindow implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/combo.c | 4 +- dlls/user32/defwnd.c | 2 +- dlls/user32/dialog.c | 6 +- dlls/user32/driver.c | 8 +- dlls/user32/mdi.c | 12 +- dlls/user32/message.c | 21 +- dlls/user32/nonclient.c | 6 +- dlls/user32/scroll.c | 2 +- dlls/user32/user32.spec | 4 +- dlls/user32/user_main.c | 1 - dlls/user32/win.c | 10 +- dlls/user32/win.h | 6 - dlls/user32/winpos.c | 228 +------------------- dlls/win32u/driver.c | 1 + dlls/win32u/gdiobj.c | 2 + dlls/win32u/input.c | 2 +- dlls/win32u/message.c | 3 + dlls/win32u/ntuser_private.h | 7 +- dlls/win32u/win32u.spec | 4 +- dlls/win32u/win32u_private.h | 4 + dlls/win32u/window.c | 487 ++++++++++++++++++++++++++++++++++++++++++- dlls/win32u/wrappers.c | 12 ++ include/ntuser.h | 1 + 23 files changed, 542 insertions(+), 291 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3011f24f9321d95b6fa4…

1 0

Jacek Caban : win32u: Move GetWindowContextHelpId implementation from user32.
by Alexandre Julliard 17 Mar '22

17 Mar '22

Module: wine Branch: master Commit: 57c28516ee4379139d0dc9a8152187c844977387 URL: https://source.winehq.org/git/wine.git/?a=commit;h=57c28516ee4379139d0dc9a8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 17 15:29:33 2022 +0000 win32u: Move GetWindowContextHelpId implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/win.c | 12 +----------- dlls/win32u/window.c | 18 ++++++++++++++++++ include/ntuser.h | 1 + 3 files changed, 20 insertions(+), 11 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 4d4199c67fc..22227c23280 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -2249,17 +2249,7 @@ BOOL WINAPI FlashWindow( HWND hWnd, BOOL bInvert ) */ DWORD WINAPI GetWindowContextHelpId( HWND hwnd ) { - DWORD retval; - WND *wnd = WIN_GetPtr( hwnd ); - if (!wnd || wnd == WND_DESKTOP) return 0; - if (wnd == WND_OTHER_PROCESS) - { - if (IsWindow( hwnd )) FIXME( "not supported on other process window %p\n", hwnd ); - return 0; - } - retval = wnd->helpContext; - WIN_ReleasePtr( wnd ); - return retval; + return NtUserCallHwnd( hwnd, NtUserGetWindowContextHelpId ); } diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index ab69096184c..e513a13b152 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -3913,6 +3913,22 @@ BOOL WINAPI NtUserFlashWindowEx( FLASHWINFO *info ) } } +/* see GetWindowContextHelpId */ +static DWORD get_window_context_help_id( HWND hwnd ) +{ + DWORD retval; + WND *win = get_win_ptr( hwnd ); + if (!win || win == WND_DESKTOP) return 0; + if (win == WND_OTHER_PROCESS) + { + if (is_window( hwnd )) FIXME( "not supported on other process window %p\n", hwnd ); + return 0; + } + retval = win->helpContext; + release_win_ptr( win ); + return retval; +} + /*********************************************************************** * send_destroy_message */ @@ -4190,6 +4206,8 @@ ULONG_PTR WINAPI NtUserCallHwnd( HWND hwnd, DWORD code ) return get_dpi_for_window( hwnd ); case NtUserGetParent: return HandleToUlong( get_parent( hwnd )); + case NtUserGetWindowContextHelpId: + return get_window_context_help_id( hwnd ); case NtUserGetWindowDpiAwarenessContext: return (ULONG_PTR)get_window_dpi_awareness_context( hwnd ); case NtUserGetWindowTextLength: diff --git a/include/ntuser.h b/include/ntuser.h index 6526d190e28..7bcb91fcc25 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -147,6 +147,7 @@ enum { NtUserGetDpiForWindow, NtUserGetParent, + NtUserGetWindowContextHelpId, NtUserGetWindowDpiAwarenessContext, NtUserGetWindowTextLength, NtUserIsWindow,

1 0

Gabriel Ivăncescu : jscript: Pass a jsval "this" to builtin functions.
by Alexandre Julliard 17 Mar '22

17 Mar '22

Module: wine Branch: master Commit: 7a1c6453bc08d91ab35b13867089e26f157b479e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a1c6453bc08d91ab35b1386… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Mar 17 18:25:39 2022 +0200 jscript: Pass a jsval "this" to builtin functions. And get rid of vdisp_t since it's no longer needed. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/activex.c | 2 +- dlls/jscript/array.c | 250 +++++++++++++++++++++++++++------------------- dlls/jscript/bool.c | 44 ++++---- dlls/jscript/date.c | 199 ++++++++++++++++++------------------ dlls/jscript/dispex.c | 17 +--- dlls/jscript/enumerator.c | 28 +++--- dlls/jscript/error.c | 28 +++--- dlls/jscript/function.c | 51 ++++------ dlls/jscript/global.c | 34 +++---- dlls/jscript/jscript.h | 75 +------------- dlls/jscript/json.c | 4 +- dlls/jscript/jsregexp.c | 32 +++--- dlls/jscript/math.c | 36 +++---- dlls/jscript/number.c | 69 +++++++------ dlls/jscript/object.c | 182 ++++++++++++++++++++++----------- dlls/jscript/set.c | 81 +++++++++------ dlls/jscript/string.c | 180 ++++++++++++++++----------------- dlls/jscript/vbarray.c | 24 ++--- 18 files changed, 696 insertions(+), 640 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7a1c6453bc08d91ab35b…

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 17 Mar '22

17 Mar '22

Module: wine Branch: master Commit: b07814fca4fc26d8a27b18995dd9b0afbcdf9c98 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b07814fca4fc26d8a27b1899… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Mar 17 20:33:42 2022 +0200 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 104 ++++++++++++++++++++------------------------------------------- 1 file changed, 33 insertions(+), 71 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b07814fca4fc26d8a27b…

1 0

Alex Henrie : po: Update Catalan translation.
by Alexandre Julliard 17 Mar '22

17 Mar '22

Module: wine Branch: master Commit: 6ecf25e9a8a94d8967809cb5031e6cf6d8b1e1bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ecf25e9a8a94d8967809cb5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Mar 16 23:27:10 2022 -0600 po: Update Catalan translation. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ca.po | 678 +++++++++++++++++++++++++-------------------------------------- 1 file changed, 270 insertions(+), 408 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6ecf25e9a8a94d896780…

1 0

Daniel Lehman : propsys: Implement InitVariantFromFileTime.
by Alexandre Julliard 17 Mar '22

17 Mar '22

Module: wine Branch: master Commit: f2b8ccb7b0b22b7b5d661d908f8f8ee02f22647d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2b8ccb7b0b22b7b5d661d90… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Mar 15 07:30:59 2022 -0700 propsys: Implement InitVariantFromFileTime. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/propsys.spec | 2 +- dlls/propsys/propvar.c | 15 +++++++++++++++ include/propvarutil.h | 1 + 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index 35828057264..15749952e95 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -49,7 +49,7 @@ @ stub InitVariantFromBooleanArray @ stdcall InitVariantFromBuffer(ptr long ptr) @ stub InitVariantFromDoubleArray -@ stub InitVariantFromFileTime +@ stdcall InitVariantFromFileTime(ptr ptr) @ stub InitVariantFromFileTimeArray @ stdcall InitVariantFromGUIDAsString(ptr ptr) @ stub InitVariantFromInt16Array diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index be27c5cb641..8f6c52f7aa7 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -672,6 +672,21 @@ HRESULT WINAPI InitVariantFromBuffer(const VOID *pv, UINT cb, VARIANT *pvar) return S_OK; } +HRESULT WINAPI InitVariantFromFileTime(const FILETIME *ft, VARIANT *var) +{ + SYSTEMTIME st; + + TRACE("%p, %p\n", ft, var); + + VariantInit(var); + if (!FileTimeToSystemTime(ft, &st)) + return E_INVALIDARG; + if (!SystemTimeToVariantTime(&st, &V_DATE(var))) + return E_INVALIDARG; + V_VT(var) = VT_DATE; + return S_OK; +} + static inline DWORD PROPVAR_HexToNum(const WCHAR *hex) { DWORD ret; diff --git a/include/propvarutil.h b/include/propvarutil.h index 55b64abbe4f..36a670f56e6 100644 --- a/include/propvarutil.h +++ b/include/propvarutil.h @@ -71,6 +71,7 @@ typedef int PROPVAR_COMPARE_FLAGS; HRESULT WINAPI PropVariantChangeType(PROPVARIANT *ppropvarDest, REFPROPVARIANT propvarSrc, PROPVAR_CHANGE_FLAGS flags, VARTYPE vt); HRESULT WINAPI InitPropVariantFromGUIDAsString(REFGUID guid, PROPVARIANT *ppropvar); +HRESULT WINAPI InitVariantFromFileTime(const FILETIME *ft, VARIANT *var); HRESULT WINAPI InitVariantFromGUIDAsString(REFGUID guid, VARIANT *pvar); HRESULT WINAPI InitPropVariantFromBuffer(const VOID *pv, UINT cb, PROPVARIANT *ppropvar); HRESULT WINAPI InitPropVariantFromCLSID(REFCLSID clsid, PROPVARIANT *ppropvar);

1 0

Daniel Lehman : propsys/tests: Add some InitVariantFromFileTime tests.
by Alexandre Julliard 17 Mar '22

17 Mar '22

Module: wine Branch: master Commit: 083dea7fce4372840ac18176496a7d05dadd5ad8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=083dea7fce4372840ac18176… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Mar 15 07:17:37 2022 -0700 propsys/tests: Add some InitVariantFromFileTime tests. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/tests/propsys.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index 36b1a9dca8e..124b3405bcb 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -2030,6 +2030,40 @@ static void test_PSCreatePropertyStoreFromObject(void) IPropertyStore_Release(propstore); } +static void test_InitVariantFromFileTime(void) +{ + FILETIME ft = {0}; + SYSTEMTIME st; + VARIANT var; + HRESULT hr; + double d; + + VariantInit(&var); + if (0) /* crash on Windows */ + { + InitVariantFromFileTime(&ft, NULL); + InitVariantFromFileTime(NULL, &var); + } + + ft.dwHighDateTime = -1; + ft.dwLowDateTime = -1; + V_VT(&var) = 0xdead; + V_DATE(&var) = 42.0; + hr = InitVariantFromFileTime(&ft, &var); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); + ok(V_VT(&var) == VT_EMPTY, "Unexpected VT %d\n", V_VT(&var)); + ok(V_DATE(&var) == 0.0, "got wrong value: %f, expected 0.0\n", V_DATE(&var)); + + GetSystemTimeAsFileTime(&ft); + hr = InitVariantFromFileTime(&ft, &var); + ok(V_VT(&var) == VT_DATE, "Unexpected VT %d\n", V_VT(&var)); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + FileTimeToSystemTime(&ft, &st); + SystemTimeToVariantTime(&st, &d); + ok(V_DATE(&var) == d, "got wrong value: %f, expected %f\n", V_DATE(&var), d); +} + START_TEST(propsys) { test_PSStringFromPropertyKey(); @@ -2053,4 +2087,5 @@ START_TEST(propsys) test_PSCreateMemoryPropertyStore(); test_propertystore(); test_PSCreatePropertyStoreFromObject(); + test_InitVariantFromFileTime(); }

1 0

Giovanni Mascellani : mfplat/tests: Check that Lock() and Lock2D() see the same content.
by Alexandre Julliard 17 Mar '22

17 Mar '22

Module: wine Branch: master Commit: 8adb6d80d595d8aea52762fd9802385e31a5a2cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=8adb6d80d595d8aea52762fd… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Mar 15 14:29:17 2022 +0100 mfplat/tests: Check that Lock() and Lock2D() see the same content. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 83877041694..7e72abbde22 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -5725,6 +5725,8 @@ static void test_MFCreate2DMediaBuffer(void) { 1, 4, D3DFMT_A8R8G8B8, 16, 64 }, { 4, 1, D3DFMT_A8R8G8B8, 16, 64 }, }; + static const char two_aas[] = { 0xaa, 0xaa }; + static const char eight_bbs[] = { 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb }; DWORD max_length, length, length2; BYTE *buffer_start, *data, *data2; LONG pitch, pitch2, stride; @@ -5783,6 +5785,8 @@ static void test_MFCreate2DMediaBuffer(void) ok(hr == S_OK, "Failed to lock buffer, hr %#lx.\n", hr); ok(max_length == length, "Unexpected length.\n"); + memset(data, 0xaa, length); + length = 0; pMFGetPlaneSize(MAKEFOURCC('N','V','1','2'), 2, 3, &length); ok(max_length == length && length == 9, "Unexpected length %lu.\n", length); @@ -5835,6 +5839,10 @@ static void test_MFCreate2DMediaBuffer(void) ok(!!data, "Expected data pointer.\n"); ok(pitch == 64, "Unexpected pitch %ld.\n", pitch); + for (i = 0; i < 4; i++) + ok(memcmp(&data[64 * i], two_aas, sizeof(two_aas)) == 0, "Invalid data instead of 0xaa.\n"); + memset(data, 0xbb, 194); + hr = IMF2DBuffer_Lock2D(_2dbuffer, &data2, &pitch); ok(hr == S_OK, "Failed to lock buffer, hr %#lx.\n", hr); ok(data == data2, "Expected data pointer.\n"); @@ -5861,6 +5869,15 @@ static void test_MFCreate2DMediaBuffer(void) hr = IMF2DBuffer_Unlock2D(_2dbuffer); ok(hr == HRESULT_FROM_WIN32(ERROR_WAS_UNLOCKED), "Unexpected hr %#lx.\n", hr); + hr = IMFMediaBuffer_Lock(buffer, &data, NULL, NULL); + ok(hr == S_OK, "Failed to lock buffer, hr %#lx.\n", hr); + + todo_wine + ok(memcmp(data, eight_bbs, sizeof(eight_bbs)) == 0, "Invalid data instead of 0xbb.\n"); + + hr = IMFMediaBuffer_Unlock(buffer); + ok(hr == S_OK, "Failed to unlock buffer, hr %#lx.\n", hr); + hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMF2DBuffer2, (void **)&_2dbuffer2); ok(hr == S_OK || broken(hr == E_NOINTERFACE), "Failed to get interface, hr %#lx.\n", hr);

1 0