August 2022 - Wine-Commits - list.winehq.org

Jacek Caban : user32: Remove no longer user get_hwnd_message_parent.
by Alexandre Julliard Aug. 28, 2022

Aug. 28, 2022

Module: wine Branch: master Commit: eb817e1f20d0851e964fadcc4c4d2c426bcc2104 URL: https://gitlab.winehq.org/wine/wine/-/commit/eb817e1f20d0851e964fadcc4c4d2c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 26 11:58:20 2022 +0200 user32: Remove no longer user get_hwnd_message_parent. --- dlls/user32/win.c | 14 -------------- dlls/user32/win.h | 1 - 2 files changed, 15 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 7d873155c3b..6b40f25dd46 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -85,20 +85,6 @@ static HWND *list_window_children( HDESK desktop, HWND hwnd, UNICODE_STRING *cla } -/******************************************************************* - * get_hwnd_message_parent - * - * Return the parent for HWND_MESSAGE windows. - */ -HWND get_hwnd_message_parent(void) -{ - struct ntuser_thread_info *thread_info = NtUserGetThreadInfo(); - - if (!thread_info->msg_window) GetDesktopWindow(); /* trigger creation */ - return UlongToHandle( thread_info->msg_window ); -} - - /******************************************************************* * is_desktop_window * diff --git a/dlls/user32/win.h b/dlls/user32/win.h index ae470739cbe..18774928354 100644 --- a/dlls/user32/win.h +++ b/dlls/user32/win.h @@ -24,7 +24,6 @@ #include "user_private.h" /* Window functions */ -extern HWND get_hwnd_message_parent(void) DECLSPEC_HIDDEN; extern BOOL is_desktop_window( HWND hwnd ) DECLSPEC_HIDDEN; extern HWND WIN_GetFullHandle( HWND hwnd ) DECLSPEC_HIDDEN; extern HWND WIN_IsCurrentProcess( HWND hwnd ) DECLSPEC_HIDDEN;

1 0

Gabriel Ivăncescu : mshtml: Implement getItem() for sessionStorage.
by Alexandre Julliard Aug. 28, 2022

Aug. 28, 2022

Module: wine Branch: master Commit: 1a5cddc1da52a95deca7383d5ced1e443352f7b0 URL: https://gitlab.winehq.org/wine/wine/-/commit/1a5cddc1da52a95deca7383d5ced1e… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Aug 26 16:38:37 2022 +0300 mshtml: Implement getItem() for sessionStorage. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlstorage.c | 15 ++++-- dlls/mshtml/tests/misc.c | 126 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 136 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlstorage.c b/dlls/mshtml/htmlstorage.c index 6e8b2190b1a..d25f8fef6a1 100644 --- a/dlls/mshtml/htmlstorage.c +++ b/dlls/mshtml/htmlstorage.c @@ -443,6 +443,7 @@ done: static HRESULT WINAPI HTMLStorage_getItem(IHTMLStorage *iface, BSTR bstrKey, VARIANT *value) { HTMLStorage *This = impl_from_IHTMLStorage(iface); + struct session_entry *session_entry; HRESULT hres; TRACE("(%p)->(%s %p)\n", This, debugstr_w(bstrKey), value); @@ -451,9 +452,17 @@ static HRESULT WINAPI HTMLStorage_getItem(IHTMLStorage *iface, BSTR bstrKey, VAR return E_POINTER; if(!This->filename) { - FIXME("session storage not supported\n"); - V_VT(value) = VT_NULL; - return S_OK; + hres = get_session_entry(This->session_storage, bstrKey, FALSE, &session_entry); + if(SUCCEEDED(hres)) { + if(!session_entry || !session_entry->value) + V_VT(value) = VT_NULL; + else { + V_VT(value) = VT_BSTR; + V_BSTR(value) = SysAllocStringLen(session_entry->value, SysStringLen(session_entry->value)); + hres = V_BSTR(value) ? S_OK : E_OUTOFMEMORY; + } + } + return hres; } WaitForSingleObject(This->mutex, INFINITE); diff --git a/dlls/mshtml/tests/misc.c b/dlls/mshtml/tests/misc.c index 045e93a9cf6..02ef7451b88 100644 --- a/dlls/mshtml/tests/misc.c +++ b/dlls/mshtml/tests/misc.c @@ -324,11 +324,32 @@ static void test_HTMLStorage(void) hres = get_sessionstorage(doc2, &storage2); ok(hres == S_OK, "got %08lx\n", hres); + key = SysAllocString(L""); + V_VT(&var) = 0xdead; + hres = IHTMLStorage_getItem(storage, key, &var); + ok(hres == S_OK, "getItem failed: %08lx\n", hres); + ok(V_VT(&var) == VT_NULL, "got %d\n", V_VT(&var)); + SysFreeString(key); + key = SysAllocString(L"undefined"); value = SysAllocString(L"null"); hres = IHTMLStorage_setItem(storage, key, value); ok(hres == S_OK, "setItem failed: %08lx\n", hres); SysFreeString(value); + + V_VT(&var) = 0xdead; + hres = IHTMLStorage_getItem(storage, key, &var); + ok(hres == S_OK, "getItem failed: %08lx\n", hres); + ok(V_VT(&var) == VT_BSTR, "got %d\n", V_VT(&var)); + ok(!wcscmp(V_BSTR(&var), L"null"), "got %s\n", wine_dbgstr_w(V_BSTR(&var))); + VariantClear(&var); + + V_VT(&var) = 0xdead; + hres = IHTMLStorage_getItem(storage2, key, &var); + ok(hres == S_OK, "getItem failed: %08lx\n", hres); + ok(V_VT(&var) == VT_BSTR, "got %d\n", V_VT(&var)); + ok(!wcscmp(V_BSTR(&var), L"null"), "got %s\n", wine_dbgstr_w(V_BSTR(&var))); + VariantClear(&var); SysFreeString(key); value = SysAllocString(L"asdf"); @@ -336,9 +357,32 @@ static void test_HTMLStorage(void) ok(hres == S_OK, "setItem failed: %08lx\n", hres); SysFreeString(value); + V_VT(&var) = 0xdead; + hres = IHTMLStorage_getItem(storage2, NULL, &var); + ok(hres == S_OK, "getItem failed: %08lx\n", hres); + ok(V_VT(&var) == VT_BSTR, "got %d\n", V_VT(&var)); + ok(!wcscmp(V_BSTR(&var), L"asdf"), "got %s\n", wine_dbgstr_w(V_BSTR(&var))); + VariantClear(&var); + + V_VT(&var) = 0xdead; + key = SysAllocString(L""); + hres = IHTMLStorage_getItem(storage2, key, &var); + ok(hres == S_OK, "getItem failed: %08lx\n", hres); + ok(V_VT(&var) == VT_BSTR, "got %d\n", V_VT(&var)); + ok(!wcscmp(V_BSTR(&var), L"asdf"), "got %s\n", wine_dbgstr_w(V_BSTR(&var))); + VariantClear(&var); + SysFreeString(key); + key = SysAllocString(L"null-value"); hres = IHTMLStorage_setItem(storage, key, NULL); ok(hres == S_OK, "setItem failed: %08lx\n", hres); + + V_VT(&var) = 0xdead; + hres = IHTMLStorage_getItem(storage2, key, &var); + ok(hres == S_OK, "getItem failed: %08lx\n", hres); + ok(V_VT(&var) == VT_BSTR, "got %d\n", V_VT(&var)); + ok(!wcscmp(V_BSTR(&var), L""), "got %s\n", wine_dbgstr_w(V_BSTR(&var))); + VariantClear(&var); SysFreeString(key); key = SysAllocString(L"aaaa"); @@ -346,19 +390,97 @@ static void test_HTMLStorage(void) hres = IHTMLStorage_setItem(storage2, key, value); ok(hres == S_OK, "setItem failed: %08lx\n", hres); SysFreeString(value); + + V_VT(&var) = 0xdead; + hres = IHTMLStorage_getItem(storage, key, &var); + ok(hres == S_OK, "getItem failed: %08lx\n", hres); + ok(V_VT(&var) == VT_BSTR, "got %d\n", V_VT(&var)); + ok(!wcscmp(V_BSTR(&var), L"bbbb"), "got %s\n", wine_dbgstr_w(V_BSTR(&var))); + VariantClear(&var); SysFreeString(key); key = SysAllocString(L"foo"); value = SysAllocString(L"bar"); hres = IHTMLStorage_setItem(storage, key, value); ok(hres == S_OK, "setItem failed: %08lx\n", hres); - SysFreeString(value); - SysFreeString(key); + + IHTMLStorage_Release(storage2); + IHTMLDocument2_Release(doc2); + + /* Case insensitive domain */ + doc2 = create_doc_from_url(L"htTp://www.CodeWeavers.com/"); + hres = get_sessionstorage(doc2, &storage2); + ok(hres == S_OK, "got %08lx\n", hres); + + V_VT(&var) = 0xdead; + hres = IHTMLStorage_getItem(storage2, key, &var); + ok(hres == S_OK, "getItem failed: %08lx\n", hres); + ok(V_VT(&var) == VT_BSTR, "got %d\n", V_VT(&var)); + ok(!wcscmp(V_BSTR(&var), L"bar"), "got %s\n", wine_dbgstr_w(V_BSTR(&var))); + VariantClear(&var); + + IHTMLStorage_Release(storage2); + IHTMLDocument2_Release(doc2); + + /* Different schemes */ + doc2 = create_doc_from_url(L"https://www.codeweavers.com/"); + hres = get_sessionstorage(doc2, &storage2); + ok(hres == S_OK, "got %08lx\n", hres); + + V_VT(&var) = 0xdead; + hres = IHTMLStorage_getItem(storage2, key, &var); + ok(hres == S_OK, "getItem failed: %08lx\n", hres); + ok(V_VT(&var) == VT_BSTR, "got %d\n", V_VT(&var)); + ok(!wcscmp(V_BSTR(&var), L"bar"), "got %s\n", wine_dbgstr_w(V_BSTR(&var))); + VariantClear(&var); + + IHTMLStorage_Release(storage2); + IHTMLDocument2_Release(doc2); + + doc2 = create_doc_from_url(L"ftp://www.codeweavers.com/"); + hres = get_sessionstorage(doc2, &storage2); + ok(hres == S_OK, "got %08lx\n", hres); + + V_VT(&var) = 0xdead; + hres = IHTMLStorage_getItem(storage2, key, &var); + ok(hres == S_OK, "getItem failed: %08lx\n", hres); + ok(V_VT(&var) == VT_NULL, "got %d\n", V_VT(&var)); + + hres = IHTMLStorage_setItem(storage2, key, value); + ok(hres == S_OK, "setItem failed: %08lx\n", hres); + + V_VT(&var) = 0xdead; + hres = IHTMLStorage_getItem(storage2, key, &var); + ok(hres == S_OK, "getItem failed: %08lx\n", hres); + ok(V_VT(&var) == VT_BSTR, "got %d\n", V_VT(&var)); + ok(!wcscmp(V_BSTR(&var), L"bar"), "got %s\n", wine_dbgstr_w(V_BSTR(&var))); + VariantClear(&var); + + IHTMLStorage_Release(storage2); + IHTMLDocument2_Release(doc2); + + /* Different domain */ + doc2 = create_doc_from_url(L"https://www.winehq.org/"); + hres = get_sessionstorage(doc2, &storage2); + ok(hres == S_OK, "got %08lx\n", hres); + + V_VT(&var) = 0xdead; + hres = IHTMLStorage_getItem(storage, key, &var); + ok(hres == S_OK, "getItem failed: %08lx\n", hres); + ok(V_VT(&var) == VT_BSTR, "got %d\n", V_VT(&var)); + ok(!wcscmp(V_BSTR(&var), L"bar"), "got %s\n", wine_dbgstr_w(V_BSTR(&var))); + VariantClear(&var); + V_VT(&var) = 0xdead; + hres = IHTMLStorage_getItem(storage2, key, &var); + ok(hres == S_OK, "getItem failed: %08lx\n", hres); + ok(V_VT(&var) == VT_NULL, "got %d\n", V_VT(&var)); IHTMLStorage_Release(storage2); IHTMLStorage_Release(storage); IHTMLDocument2_Release(doc2); IHTMLDocument2_Release(doc); + SysFreeString(value); + SysFreeString(key); } START_TEST(misc)

1 0

Gabriel Ivăncescu : mshtml: Implement clear() for Storage.
by Alexandre Julliard Aug. 28, 2022

Aug. 28, 2022

Module: wine Branch: master Commit: 102e62332a3c93fe4bc2bbb7636ae04cb189cca7 URL: https://gitlab.winehq.org/wine/wine/-/commit/102e62332a3c93fe4bc2bbb7636ae0… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Aug 26 16:38:37 2022 +0300 mshtml: Implement clear() for Storage. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlstorage.c | 17 +++++++++++++++-- dlls/mshtml/tests/misc.c | 9 +++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlstorage.c b/dlls/mshtml/htmlstorage.c index a7feba6ce69..e9498306a81 100644 --- a/dlls/mshtml/htmlstorage.c +++ b/dlls/mshtml/htmlstorage.c @@ -668,8 +668,21 @@ static HRESULT WINAPI HTMLStorage_removeItem(IHTMLStorage *iface, BSTR bstrKey) static HRESULT WINAPI HTMLStorage_clear(IHTMLStorage *iface) { HTMLStorage *This = impl_from_IHTMLStorage(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + HRESULT hres = S_OK; + + if(!This->filename) { + clear_session_storage(This->session_storage); + return S_OK; + } + + WaitForSingleObject(This->mutex, INFINITE); + if(!DeleteFileW(This->filename)) { + DWORD error = GetLastError(); + if(error != ERROR_FILE_NOT_FOUND && error != ERROR_PATH_NOT_FOUND) + hres = HRESULT_FROM_WIN32(error); + } + ReleaseMutex(This->mutex); + return hres; } static const IHTMLStorageVtbl HTMLStorageVtbl = { diff --git a/dlls/mshtml/tests/misc.c b/dlls/mshtml/tests/misc.c index 1a60ce4f70d..c2a8c87f473 100644 --- a/dlls/mshtml/tests/misc.c +++ b/dlls/mshtml/tests/misc.c @@ -415,6 +415,9 @@ static void test_HTMLStorage(void) ok(V_VT(&var) == VT_NULL, "got %d\n", V_VT(&var)); SysFreeString(key); + hres = IHTMLStorage_clear(storage2); + ok(hres == S_OK, "clear failed %08lx\n", hres); + key = SysAllocString(L"foo"); value = SysAllocString(L"bar"); hres = IHTMLStorage_setItem(storage, key, value); @@ -472,6 +475,9 @@ static void test_HTMLStorage(void) ok(!wcscmp(V_BSTR(&var), L"bar"), "got %s\n", wine_dbgstr_w(V_BSTR(&var))); VariantClear(&var); + hres = IHTMLStorage_clear(storage2); + ok(hres == S_OK, "clear failed %08lx\n", hres); + IHTMLStorage_Release(storage2); IHTMLDocument2_Release(doc2); @@ -491,6 +497,9 @@ static void test_HTMLStorage(void) ok(hres == S_OK, "getItem failed: %08lx\n", hres); ok(V_VT(&var) == VT_NULL, "got %d\n", V_VT(&var)); + hres = IHTMLStorage_clear(storage); + ok(hres == S_OK, "clear failed %08lx\n", hres); + IHTMLStorage_Release(storage2); IHTMLStorage_Release(storage); IHTMLDocument2_Release(doc2);

1 0

Gabriel Ivăncescu : mshtml: Implement setItem() for sessionStorage.
by Alexandre Julliard Aug. 28, 2022

Aug. 28, 2022

Module: wine Branch: master Commit: 3ba9c760df625e1b4482c938ecc4177915de01f2 URL: https://gitlab.winehq.org/wine/wine/-/commit/3ba9c760df625e1b4482c938ecc417… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Aug 26 16:38:36 2022 +0300 mshtml: Implement setItem() for sessionStorage. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlstorage.c | 202 ++++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/main.c | 1 + dlls/mshtml/mshtml_private.h | 3 + dlls/mshtml/task.c | 1 + dlls/mshtml/tests/misc.c | 68 ++++++++++++++- 5 files changed, 270 insertions(+), 5 deletions(-)

1 0

Jacek Caban : win32u: Introduce NtUserActivateOtherWindow.
by Alexandre Julliard Aug. 28, 2022

Aug. 28, 2022

Module: wine Branch: master Commit: 3ba583fde872b737443e39006d902d1dd2555749 URL: https://gitlab.winehq.org/wine/wine/-/commit/3ba583fde872b737443e39006d902d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 26 11:55:13 2022 +0200 win32u: Introduce NtUserActivateOtherWindow. And use it instead of WINPOS_ActivateOtherWindow. --- dlls/user32/dialog.c | 2 +- dlls/user32/win.h | 2 -- dlls/user32/winpos.c | 62 ---------------------------------------------------- dlls/win32u/window.c | 4 ++++ include/ntuser.h | 6 +++++ 5 files changed, 11 insertions(+), 65 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index fc7ddb303ff..9773f67df13 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -949,7 +949,7 @@ BOOL WINAPI EndDialog( HWND hwnd, INT_PTR retval ) if (owner) SetForegroundWindow( owner ); else - WINPOS_ActivateOtherWindow( hwnd ); + NtUserActivateOtherWindow( hwnd ); } /* unblock dialog loop */ diff --git a/dlls/user32/win.h b/dlls/user32/win.h index 9c61d5ce0a3..ae470739cbe 100644 --- a/dlls/user32/win.h +++ b/dlls/user32/win.h @@ -35,8 +35,6 @@ extern HWND *WIN_ListChildren( HWND hwnd ) DECLSPEC_HIDDEN; extern void MDI_CalcDefaultChildPos( HWND hwndClient, INT total, LPPOINT lpPos, INT delta, UINT *id ) DECLSPEC_HIDDEN; extern HDESK open_winstation_desktop( HWINSTA hwinsta, LPCWSTR name, DWORD flags, BOOL inherit, ACCESS_MASK access ) DECLSPEC_HIDDEN; -extern void WINPOS_ActivateOtherWindow( HWND hwnd ) DECLSPEC_HIDDEN; - static inline void mirror_rect( const RECT *window_rect, RECT *rect ) { int width = window_rect->right - window_rect->left; diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index f7f4e8bb427..97a2228d00c 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -242,68 +242,6 @@ BOOL WINAPI AnimateWindow(HWND hwnd, DWORD dwTime, DWORD dwFlags) } -/******************************************************************* - * can_activate_window - * - * Check if we can activate the specified window. - */ -static BOOL can_activate_window( HWND hwnd ) -{ - LONG style; - - if (!hwnd) return FALSE; - style = GetWindowLongW( hwnd, GWL_STYLE ); - if (!(style & WS_VISIBLE)) return FALSE; - if ((style & (WS_POPUP|WS_CHILD)) == WS_CHILD) return FALSE; - return !(style & WS_DISABLED); -} - - -/******************************************************************* - * WINPOS_ActivateOtherWindow - * - * Activates window other than pWnd. - */ -void WINPOS_ActivateOtherWindow(HWND hwnd) -{ - HWND hwndTo, fg; - - if ((GetWindowLongW( hwnd, GWL_STYLE ) & WS_POPUP) && (hwndTo = GetWindow( hwnd, GW_OWNER ))) - { - hwndTo = NtUserGetAncestor( hwndTo, GA_ROOT ); - if (can_activate_window( hwndTo )) goto done; - } - - hwndTo = hwnd; - for (;;) - { - if (!(hwndTo = GetWindow( hwndTo, GW_HWNDNEXT ))) break; - if (can_activate_window( hwndTo )) goto done; - } - - hwndTo = GetTopWindow( 0 ); - for (;;) - { - if (hwndTo == hwnd) - { - hwndTo = 0; - break; - } - if (can_activate_window( hwndTo )) goto done; - if (!(hwndTo = GetWindow( hwndTo, GW_HWNDNEXT ))) break; - } - - done: - fg = NtUserGetForegroundWindow(); - TRACE("win = %p fg = %p\n", hwndTo, fg); - if (!fg || (hwnd == fg)) - { - if (SetForegroundWindow( hwndTo )) return; - } - if (!NtUserSetActiveWindow( hwndTo )) NtUserSetActiveWindow( 0 ); -} - - /*********************************************************************** * BeginDeferWindowPos (USER32.@) */ diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index d9c771e5d3d..d53dfde2fbb 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -5364,6 +5364,10 @@ ULONG_PTR WINAPI NtUserCallHwnd( HWND hwnd, DWORD code ) { switch (code) { + case NtUserCallHwnd_ActivateOtherWindow: + activate_other_window( hwnd ); + return 0; + case NtUserCallHwnd_ArrangeIconicWindows: return arrange_iconic_windows( hwnd ); diff --git a/include/ntuser.h b/include/ntuser.h index f7fa18ee983..961d34d4db6 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -1126,6 +1126,7 @@ static inline BOOL NtUserUnhookWindowsHook( INT id, HOOKPROC proc ) /* NtUserCallHwnd codes, not compatible with Windows */ enum { + NtUserCallHwnd_ActivateOtherWindow, NtUserCallHwnd_ArrangeIconicWindows, NtUserCallHwnd_DrawMenuBar, NtUserCallHwnd_GetDefaultImeWindow, @@ -1149,6 +1150,11 @@ enum NtUserIsCurrehtThreadWindow, }; +static inline void NtUserActivateOtherWindow( HWND hwnd ) +{ + NtUserCallHwnd( hwnd, NtUserCallHwnd_ActivateOtherWindow ); +} + static inline UINT NtUserArrangeIconicWindows( HWND parent ) { return NtUserCallHwnd( parent, NtUserCallHwnd_ArrangeIconicWindows );

1 0

Jacek Caban : win32u: Move NtUserPerMonitorDPIPhysicalToLogicalPoint implementation from user32.
by Alexandre Julliard Aug. 28, 2022

Aug. 28, 2022

Module: wine Branch: master Commit: 803a5f0789740ab72ebfd2cc41aed8a9c3db6b56 URL: https://gitlab.winehq.org/wine/wine/-/commit/803a5f0789740ab72ebfd2cc41aed8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 26 11:49:36 2022 +0200 win32u: Move NtUserPerMonitorDPIPhysicalToLogicalPoint implementation from user32. --- dlls/user32/sysparams.c | 50 ------------------------------------------------- dlls/user32/user32.spec | 2 +- dlls/win32u/syscall.c | 1 + dlls/win32u/sysparams.c | 17 +++++++++++++++++ dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 8 ++++++++ include/ntuser.h | 1 + 8 files changed, 30 insertions(+), 52 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 285d7828c63..3f87702f32d 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -669,36 +669,6 @@ BOOL WINAPI EnumDisplaySettingsExW( const WCHAR *device, DWORD mode, return NtUserEnumDisplaySettings( &str, mode, dev_mode, flags ); } -/********************************************************************** - * get_win_monitor_dpi - */ -static UINT get_win_monitor_dpi( HWND hwnd ) -{ - /* FIXME: use the monitor DPI instead */ - return system_dpi; -} - -/********************************************************************** - * map_dpi_point - */ -static POINT map_dpi_point( POINT pt, UINT dpi_from, UINT dpi_to ) -{ - if (dpi_from && dpi_to && dpi_from != dpi_to) - { - pt.x = MulDiv( pt.x, dpi_to, dpi_from ); - pt.y = MulDiv( pt.y, dpi_to, dpi_from ); - } - return pt; -} - -/********************************************************************** - * point_phys_to_win_dpi - */ -static POINT point_phys_to_win_dpi( HWND hwnd, POINT pt ) -{ - return map_dpi_point( pt, get_win_monitor_dpi( hwnd ), GetDpiForWindow( hwnd )); -} - /********************************************************************** * SetProcessDpiAwarenessContext (USER32.@) */ @@ -871,26 +841,6 @@ DPI_AWARENESS_CONTEXT WINAPI SetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT return ULongToHandle( prev ); } -/********************************************************************** - * PhysicalToLogicalPointForPerMonitorDPI (USER32.@) - */ -BOOL WINAPI PhysicalToLogicalPointForPerMonitorDPI( HWND hwnd, POINT *pt ) -{ - DPI_AWARENESS_CONTEXT context; - RECT rect; - BOOL ret = FALSE; - - context = SetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE ); - if (GetWindowRect( hwnd, &rect ) && - pt->x >= rect.left && pt->y >= rect.top && pt->x <= rect.right && pt->y <= rect.bottom) - { - *pt = point_phys_to_win_dpi( hwnd, *pt ); - ret = TRUE; - } - SetThreadDpiAwarenessContext( context ); - return ret; -} - /*********************************************************************** * MonitorFromRect (USER32.@) */ diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 3a822aa380d..1bf3ebdc90d 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -565,7 +565,7 @@ @ stdcall PeekMessageA(ptr long long long long) @ stdcall PeekMessageW(ptr long long long long) @ stdcall PhysicalToLogicalPoint(long ptr) -@ stdcall PhysicalToLogicalPointForPerMonitorDPI(long ptr) +@ stdcall PhysicalToLogicalPointForPerMonitorDPI(long ptr) NtUserPerMonitorDPIPhysicalToLogicalPoint @ stub PlaySoundEvent @ stdcall PostMessageA(long long long long) @ stdcall PostMessageW(long long long long) diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index 7212f6df0b0..f9e608ed0b7 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -230,6 +230,7 @@ static void * const syscalls[] = NtUserOpenInputDesktop, NtUserOpenWindowStation, NtUserPeekMessage, + NtUserPerMonitorDPIPhysicalToLogicalPoint, NtUserPostMessage, NtUserPostThreadMessage, NtUserQueryInputContext, diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index defcaeb7f0e..848b14dbcb3 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -2461,6 +2461,23 @@ BOOL WINAPI NtUserLogicalToPerMonitorDPIPhysicalPoint( HWND hwnd, POINT *pt ) return TRUE; } +/********************************************************************** + * NtUserPerMonitorDPIPhysicalToLogicalPoint (win32u.@) + */ +BOOL WINAPI NtUserPerMonitorDPIPhysicalToLogicalPoint( HWND hwnd, POINT *pt ) +{ + RECT rect; + BOOL ret = FALSE; + + if (get_window_rect( hwnd, &rect, 0 ) && + pt->x >= rect.left && pt->y >= rect.top && pt->x <= rect.right && pt->y <= rect.bottom) + { + *pt = point_phys_to_win_dpi( hwnd, *pt ); + ret = TRUE; + } + return ret; +} + /* retrieve the cached base keys for a given entry */ static BOOL get_base_keys( enum parameter_key index, HKEY *base_key, HKEY *volatile_key ) { diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index d1339af9dcc..df722586ded 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1099,7 +1099,7 @@ @ stub NtUserPaintMenuBar @ stub NtUserPaintMonitor @ stdcall -syscall NtUserPeekMessage(ptr long long long long) -@ stub NtUserPerMonitorDPIPhysicalToLogicalPoint +@ stdcall -syscall NtUserPerMonitorDPIPhysicalToLogicalPoint(long ptr) @ stub NtUserPhysicalToLogicalDpiPointForWindow @ stub NtUserPhysicalToLogicalPoint @ stub NtUserPostKeyboardInputMessage diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index fb0c2c7de7e..009a457fe6e 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -216,6 +216,7 @@ SYSCALL_ENTRY( NtUserOpenInputDesktop ) \ SYSCALL_ENTRY( NtUserOpenWindowStation ) \ SYSCALL_ENTRY( NtUserPeekMessage ) \ + SYSCALL_ENTRY( NtUserPerMonitorDPIPhysicalToLogicalPoint ) \ SYSCALL_ENTRY( NtUserPostMessage ) \ SYSCALL_ENTRY( NtUserPostThreadMessage ) \ SYSCALL_ENTRY( NtUserQueryInputContext ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index ca8a40000dd..041285fa37f 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -3100,6 +3100,14 @@ NTSTATUS WINAPI wow64_NtUserPeekMessage( UINT *args ) return TRUE; } +NTSTATUS WINAPI wow64_NtUserPerMonitorDPIPhysicalToLogicalPoint( UINT *args ) +{ + HWND hwnd = get_handle( &args ); + POINT *pt = get_ptr( &args ); + + return NtUserPerMonitorDPIPhysicalToLogicalPoint( hwnd, pt ); +} + NTSTATUS WINAPI wow64_NtUserPostMessage( UINT *args ) { HWND hwnd = get_handle( &args ); diff --git a/include/ntuser.h b/include/ntuser.h index f1f263af7b7..f7fa18ee983 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -788,6 +788,7 @@ BOOL WINAPI NtUserOpenClipboard( HWND hwnd, ULONG unk ); HDESK WINAPI NtUserOpenDesktop( OBJECT_ATTRIBUTES *attr, DWORD flags, ACCESS_MASK access ); HDESK WINAPI NtUserOpenInputDesktop( DWORD flags, BOOL inherit, ACCESS_MASK access ); BOOL WINAPI NtUserPeekMessage( MSG *msg_out, HWND hwnd, UINT first, UINT last, UINT flags ); +BOOL WINAPI NtUserPerMonitorDPIPhysicalToLogicalPoint( HWND hwnd, POINT *pt ); BOOL WINAPI NtUserPostMessage( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ); BOOL WINAPI NtUserPostThreadMessage( DWORD thread, UINT msg, WPARAM wparam, LPARAM lparam ); UINT_PTR WINAPI NtUserQueryInputContext( HIMC handle, UINT attr );

1 0

Jacek Caban : win32u: Move NtUserLogicalToPerMonitorDPIPhysicalPoint implementation from user32.
by Alexandre Julliard Aug. 28, 2022

Aug. 28, 2022

Module: wine Branch: master Commit: 352e24dcdf02f8745bfecd3189ebbdb5d8921fd0 URL: https://gitlab.winehq.org/wine/wine/-/commit/352e24dcdf02f8745bfecd3189ebbd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 26 11:31:52 2022 +0200 win32u: Move NtUserLogicalToPerMonitorDPIPhysicalPoint implementation from user32. --- dlls/user32/sysparams.c | 21 --------------------- dlls/user32/user32.spec | 2 +- dlls/win32u/syscall.c | 1 + dlls/win32u/sysparams.c | 21 +++++++++++++++++++++ dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 8 ++++++++ include/ntuser.h | 1 + 8 files changed, 34 insertions(+), 23 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 46b85c0b102..285d7828c63 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -691,14 +691,6 @@ static POINT map_dpi_point( POINT pt, UINT dpi_from, UINT dpi_to ) return pt; } -/********************************************************************** - * point_win_to_phys_dpi - */ -static POINT point_win_to_phys_dpi( HWND hwnd, POINT pt ) -{ - return map_dpi_point( pt, GetDpiForWindow( hwnd ), get_win_monitor_dpi( hwnd ) ); -} - /********************************************************************** * point_phys_to_win_dpi */ @@ -879,19 +871,6 @@ DPI_AWARENESS_CONTEXT WINAPI SetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT return ULongToHandle( prev ); } -/********************************************************************** - * LogicalToPhysicalPointForPerMonitorDPI (USER32.@) - */ -BOOL WINAPI LogicalToPhysicalPointForPerMonitorDPI( HWND hwnd, POINT *pt ) -{ - RECT rect; - - if (!GetWindowRect( hwnd, &rect )) return FALSE; - if (pt->x < rect.left || pt->y < rect.top || pt->x > rect.right || pt->y > rect.bottom) return FALSE; - *pt = point_win_to_phys_dpi( hwnd, *pt ); - return TRUE; -} - /********************************************************************** * PhysicalToLogicalPointForPerMonitorDPI (USER32.@) */ diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 800dc4a9240..3a822aa380d 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -513,7 +513,7 @@ @ stdcall LockWindowUpdate(long) NtUserLockWindowUpdate @ stdcall LockWorkStation() @ stdcall LogicalToPhysicalPoint(long ptr) -@ stdcall LogicalToPhysicalPointForPerMonitorDPI(long ptr) +@ stdcall LogicalToPhysicalPointForPerMonitorDPI(long ptr) NtUserLogicalToPerMonitorDPIPhysicalPoint @ stdcall LookupIconIdFromDirectory(ptr long) @ stdcall LookupIconIdFromDirectoryEx(ptr long long long long) @ stub MBToWCSEx diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index 5f78d8c6ab9..7212f6df0b0 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -218,6 +218,7 @@ static void * const syscalls[] = NtUserIsClipboardFormatAvailable, NtUserKillTimer, NtUserLockWindowUpdate, + NtUserLogicalToPerMonitorDPIPhysicalPoint, NtUserMapVirtualKeyEx, NtUserMenuItemFromPoint, NtUserMessageCall, diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index be68a2cff32..defcaeb7f0e 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1720,6 +1720,14 @@ POINT map_dpi_point( POINT pt, UINT dpi_from, UINT dpi_to ) return pt; } +/********************************************************************** + * point_win_to_phys_dpi + */ +static POINT point_win_to_phys_dpi( HWND hwnd, POINT pt ) +{ + return map_dpi_point( pt, get_dpi_for_window( hwnd ), get_win_monitor_dpi( hwnd ) ); +} + /********************************************************************** * point_phys_to_win_dpi */ @@ -2440,6 +2448,19 @@ BOOL WINAPI NtUserGetDpiForMonitor( HMONITOR monitor, UINT type, UINT *x, UINT * return TRUE; } +/********************************************************************** + * LogicalToPhysicalPointForPerMonitorDPI (win32u.@) + */ +BOOL WINAPI NtUserLogicalToPerMonitorDPIPhysicalPoint( HWND hwnd, POINT *pt ) +{ + RECT rect; + + if (!get_window_rect( hwnd, &rect, get_thread_dpi() )) return FALSE; + if (pt->x < rect.left || pt->y < rect.top || pt->x > rect.right || pt->y > rect.bottom) return FALSE; + *pt = point_win_to_phys_dpi( hwnd, *pt ); + return TRUE; +} + /* retrieve the cached base keys for a given entry */ static BOOL get_base_keys( enum parameter_key index, HKEY *base_key, HKEY *volatile_key ) { diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 3054bed8347..d1339af9dcc 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1067,7 +1067,7 @@ @ stub NtUserLockWindowStation @ stdcall -syscall NtUserLockWindowUpdate(long) @ stub NtUserLockWorkStation -@ stub NtUserLogicalToPerMonitorDPIPhysicalPoint +@ stdcall -syscall NtUserLogicalToPerMonitorDPIPhysicalPoint(long ptr) @ stub NtUserLogicalToPhysicalDpiPointForWindow @ stub NtUserLogicalToPhysicalPoint @ stub NtUserMNDragLeave diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 3c59dd00b3e..fb0c2c7de7e 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -204,6 +204,7 @@ SYSCALL_ENTRY( NtUserIsClipboardFormatAvailable ) \ SYSCALL_ENTRY( NtUserKillTimer ) \ SYSCALL_ENTRY( NtUserLockWindowUpdate ) \ + SYSCALL_ENTRY( NtUserLogicalToPerMonitorDPIPhysicalPoint ) \ SYSCALL_ENTRY( NtUserMapVirtualKeyEx ) \ SYSCALL_ENTRY( NtUserMenuItemFromPoint ) \ SYSCALL_ENTRY( NtUserMessageCall ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 38024f50548..ca8a40000dd 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -2665,6 +2665,14 @@ NTSTATUS WINAPI wow64_NtUserLockWindowUpdate( UINT *args ) return NtUserLockWindowUpdate( hwnd ); } +NTSTATUS WINAPI wow64_NtUserLogicalToPerMonitorDPIPhysicalPoint( UINT *args ) +{ + HWND hwnd = get_handle( &args ); + POINT *pt = get_ptr( &args ); + + return NtUserLogicalToPerMonitorDPIPhysicalPoint( hwnd, pt ); +} + NTSTATUS WINAPI wow64_NtUserMapVirtualKeyEx( UINT *args ) { UINT code = get_ulong( &args ); diff --git a/include/ntuser.h b/include/ntuser.h index 963b02dfd8c..f1f263af7b7 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -773,6 +773,7 @@ BOOL WINAPI NtUserInvalidateRect( HWND hwnd, const RECT *rect, BOOL erase ); BOOL WINAPI NtUserInvalidateRgn( HWND hwnd, HRGN hrgn, BOOL erase ); BOOL WINAPI NtUserKillTimer( HWND hwnd, UINT_PTR id ); BOOL WINAPI NtUserLockWindowUpdate( HWND hwnd ); +BOOL WINAPI NtUserLogicalToPerMonitorDPIPhysicalPoint( HWND hwnd, POINT *pt ); UINT WINAPI NtUserMapVirtualKeyEx( UINT code, UINT type, HKL layout ); INT WINAPI NtUserMenuItemFromPoint( HWND hwnd, HMENU handle, int x, int y ); LRESULT WINAPI NtUserMessageCall( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam,

1 0

Huw Davies : wow64: Fix another ARM32 machine type.
by Alexandre Julliard Aug. 28, 2022

Aug. 28, 2022

Module: wine Branch: master Commit: d6dce27e4244e61b2e81c323003db63af045abdc URL: https://gitlab.winehq.org/wine/wine/-/commit/d6dce27e4244e61b2e81c323003db6… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Aug 26 07:24:24 2022 +0100 wow64: Fix another ARM32 machine type. --- dlls/wow64/syscall.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 0f9e64fd53b..eb48f066b92 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -391,7 +391,7 @@ static DWORD get_syscall_num( const BYTE *syscall ) id = *(DWORD *)(syscall + 1); break; - case IMAGE_FILE_MACHINE_ARM: + case IMAGE_FILE_MACHINE_ARMNT: if (*(WORD *)syscall == 0xb40f) { DWORD inst = *(DWORD *)((WORD *)syscall + 1);

1 0

Jacek Caban : user32: Remove no longer used DPI functions.
by Alexandre Julliard Aug. 28, 2022

Aug. 28, 2022

Module: wine Branch: master Commit: fd382909181c8da98c59a64ffff715798fbc2fde URL: https://gitlab.winehq.org/wine/wine/-/commit/fd382909181c8da98c59a64ffff715… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 26 11:25:06 2022 +0200 user32: Remove no longer used DPI functions. --- dlls/user32/sysparams.c | 44 +++----------------------------------------- dlls/user32/win.h | 7 ------- 2 files changed, 3 insertions(+), 48 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 36b166c627c..46b85c0b102 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -672,29 +672,16 @@ BOOL WINAPI EnumDisplaySettingsExW( const WCHAR *device, DWORD mode, /********************************************************************** * get_win_monitor_dpi */ -UINT get_win_monitor_dpi( HWND hwnd ) +static UINT get_win_monitor_dpi( HWND hwnd ) { /* FIXME: use the monitor DPI instead */ return system_dpi; } -/********************************************************************** - * get_thread_dpi - */ -UINT get_thread_dpi(void) -{ - switch (GetAwarenessFromDpiAwarenessContext( GetThreadDpiAwarenessContext() )) - { - case DPI_AWARENESS_UNAWARE: return USER_DEFAULT_SCREEN_DPI; - case DPI_AWARENESS_SYSTEM_AWARE: return system_dpi; - default: return 0; /* no scaling */ - } -} - /********************************************************************** * map_dpi_point */ -POINT map_dpi_point( POINT pt, UINT dpi_from, UINT dpi_to ) +static POINT map_dpi_point( POINT pt, UINT dpi_from, UINT dpi_to ) { if (dpi_from && dpi_to && dpi_from != dpi_to) { @@ -707,7 +694,7 @@ POINT map_dpi_point( POINT pt, UINT dpi_from, UINT dpi_to ) /********************************************************************** * point_win_to_phys_dpi */ -POINT point_win_to_phys_dpi( HWND hwnd, POINT pt ) +static POINT point_win_to_phys_dpi( HWND hwnd, POINT pt ) { return map_dpi_point( pt, GetDpiForWindow( hwnd ), get_win_monitor_dpi( hwnd ) ); } @@ -720,31 +707,6 @@ static POINT point_phys_to_win_dpi( HWND hwnd, POINT pt ) return map_dpi_point( pt, get_win_monitor_dpi( hwnd ), GetDpiForWindow( hwnd )); } -/********************************************************************** - * map_dpi_rect - */ -RECT map_dpi_rect( RECT rect, UINT dpi_from, UINT dpi_to ) -{ - if (dpi_from && dpi_to && dpi_from != dpi_to) - { - rect.left = MulDiv( rect.left, dpi_to, dpi_from ); - rect.top = MulDiv( rect.top, dpi_to, dpi_from ); - rect.right = MulDiv( rect.right, dpi_to, dpi_from ); - rect.bottom = MulDiv( rect.bottom, dpi_to, dpi_from ); - } - return rect; -} - -/********************************************************************** - * rect_win_to_thread_dpi - */ -RECT rect_win_to_thread_dpi( HWND hwnd, RECT rect ) -{ - UINT dpi = get_thread_dpi(); - if (!dpi) dpi = get_win_monitor_dpi( hwnd ); - return map_dpi_rect( rect, GetDpiForWindow( hwnd ), dpi ); -} - /********************************************************************** * SetProcessDpiAwarenessContext (USER32.@) */ diff --git a/dlls/user32/win.h b/dlls/user32/win.h index ffd4f37d5f0..9c61d5ce0a3 100644 --- a/dlls/user32/win.h +++ b/dlls/user32/win.h @@ -37,13 +37,6 @@ extern HDESK open_winstation_desktop( HWINSTA hwinsta, LPCWSTR name, DWORD flags extern void WINPOS_ActivateOtherWindow( HWND hwnd ) DECLSPEC_HIDDEN; -extern UINT get_win_monitor_dpi( HWND hwnd ) DECLSPEC_HIDDEN; -extern UINT get_thread_dpi(void) DECLSPEC_HIDDEN; -extern POINT map_dpi_point( POINT pt, UINT dpi_from, UINT dpi_to ) DECLSPEC_HIDDEN; -extern POINT point_win_to_phys_dpi( HWND hwnd, POINT pt ) DECLSPEC_HIDDEN; -extern RECT map_dpi_rect( RECT rect, UINT dpi_from, UINT dpi_to ) DECLSPEC_HIDDEN; -extern RECT rect_win_to_thread_dpi( HWND hwnd, RECT rect ) DECLSPEC_HIDDEN; - static inline void mirror_rect( const RECT *window_rect, RECT *rect ) { int width = window_rect->right - window_rect->left;

1 0

Nikolay Sivov : mfplat: Partially implement MFInitMediaTypeFromAMMediaType().
by Alexandre Julliard Aug. 28, 2022

Aug. 28, 2022

Module: wine Branch: master Commit: 4690a7df51d2b34eceff75665563539b8212a0bd URL: https://gitlab.winehq.org/wine/wine/-/commit/4690a7df51d2b34eceff7566556353… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 26 06:58:23 2022 +0300 mfplat: Partially implement MFInitMediaTypeFromAMMediaType(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/mediatype.c | 63 +++++++++++++++++++++++++++++++++++++++++++++- dlls/mfplat/tests/mfplat.c | 6 ----- 2 files changed, 62 insertions(+), 7 deletions(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index 84f6ef4f81d..c1c8d0048c3 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -21,6 +21,7 @@ #include "mfplat_private.h" #include "dxva2api.h" +#include "uuids.h" #include "initguid.h" #include "ks.h" #include "ksmedia.h" @@ -3575,6 +3576,19 @@ static HRESULT mf_get_stride_for_bitmap_info_header(DWORD fourcc, const BITMAPIN return hr; } +static const GUID * get_mf_subtype_for_am_subtype(const GUID *subtype) +{ + static const GUID null; + + if (IsEqualGUID(subtype, &MEDIASUBTYPE_RGB32)) + return &MFVideoFormat_RGB32; + else + { + FIXME("Unknown subtype %s.\n", debugstr_guid(subtype)); + return &null; + } +} + /*********************************************************************** * MFCreateVideoMediaTypeFromVideoInfoHeader (mfplat.@) */ @@ -3632,7 +3646,54 @@ HRESULT WINAPI MFInitMediaTypeFromVideoInfoHeader(IMFMediaType *media_type, cons */ HRESULT WINAPI MFInitMediaTypeFromAMMediaType(IMFMediaType *media_type, const AM_MEDIA_TYPE *am_type) { - FIXME("%p, %p.\n", media_type, am_type); + HRESULT hr = S_OK; + + TRACE("%p, %p.\n", media_type, am_type); + + IMFMediaType_DeleteAllItems(media_type); + + if (IsEqualGUID(&am_type->majortype, &MEDIATYPE_Video)) + { + if (IsEqualGUID(&am_type->formattype, &FORMAT_VideoInfo)) + { + const VIDEOINFOHEADER *vih = (const VIDEOINFOHEADER *)am_type->pbFormat; + const GUID *subtype; + DWORD height; + LONG stride; + + subtype = get_mf_subtype_for_am_subtype(&am_type->subtype); + height = abs(vih->bmiHeader.biHeight); + + mediatype_set_guid(media_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Video, &hr); + mediatype_set_guid(media_type, &MF_MT_SUBTYPE, subtype, &hr); + mediatype_set_uint64(media_type, &MF_MT_PIXEL_ASPECT_RATIO, 1, 1, &hr); + mediatype_set_uint32(media_type, &MF_MT_INTERLACE_MODE, MFVideoInterlace_Progressive, &hr); + mediatype_set_uint64(media_type, &MF_MT_FRAME_SIZE, vih->bmiHeader.biWidth, height, &hr); + mediatype_set_uint32(media_type, &MF_MT_ALL_SAMPLES_INDEPENDENT, 1, &hr); + + if (SUCCEEDED(mf_get_stride_for_bitmap_info_header(subtype->Data1, &vih->bmiHeader, &stride))) + { + mediatype_set_uint32(media_type, &MF_MT_DEFAULT_STRIDE, stride, &hr); + mediatype_set_uint32(media_type, &MF_MT_SAMPLE_SIZE, abs(stride) * height, &hr); + mediatype_set_uint32(media_type, &MF_MT_FIXED_SIZE_SAMPLES, 1, &hr); + } + else + { + if (am_type->bFixedSizeSamples) + mediatype_set_uint32(media_type, &MF_MT_FIXED_SIZE_SAMPLES, 1, &hr); + if (am_type->lSampleSize) + mediatype_set_uint32(media_type, &MF_MT_SAMPLE_SIZE, am_type->lSampleSize, &hr); + } + + return hr; + } + else + { + FIXME("Unsupported format type %s.\n", debugstr_guid(&am_type->formattype)); + } + } + else + FIXME("Unsupported major type %s.\n", debugstr_guid(&am_type->majortype)); return E_NOTIMPL; } diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 44f3f9036cc..83d2aacf843 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -8375,13 +8375,7 @@ static void test_MFInitMediaTypeFromAMMediaType(void) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = MFInitMediaTypeFromAMMediaType(media_type, &mt); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - if (FAILED(hr)) - { - IMFMediaType_Release(media_type); - return; - } hr = IMFMediaType_GetGUID(media_type, &MF_MT_MAJOR_TYPE, &guid); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);

1 0