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

Rémi Bernon : msi: Avoid using pointer value after free.
by Alexandre Julliard 15 Jun '22

15 Jun '22

Module: wine Branch: master Commit: 7b44906361ab9c3fbc2d27bbdd6efdc2ae9e99f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b44906361ab9c3fbc2d27bb… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun May 22 17:13:36 2022 +0200 msi: Avoid using pointer value after free. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/msi/handle.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/handle.c b/dlls/msi/handle.c index 7be64da9bfe..f0a55956fce 100644 --- a/dlls/msi/handle.c +++ b/dlls/msi/handle.c @@ -256,8 +256,8 @@ int msiobj_release( MSIOBJECTHDR *info ) { if( info->destructor ) info->destructor( info ); - msi_free( info ); TRACE("object %p destroyed\n", info); + msi_free( info ); } return ret;

1 0

Rémi Bernon : notepad: Avoid using pointer value after free.
by Alexandre Julliard 15 Jun '22

15 Jun '22

Module: wine Branch: master Commit: e2f7f01ac8f4bcc9013b7c26c5824e1a4f899a36 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2f7f01ac8f4bcc9013b7c26… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun May 22 17:57:37 2022 +0200 notepad: Avoid using pointer value after free. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- programs/notepad/main.c | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/programs/notepad/main.c b/programs/notepad/main.c index 210ecd2bfc8..b1cdad8156d 100644 --- a/programs/notepad/main.c +++ b/programs/notepad/main.c @@ -377,10 +377,9 @@ static LPWSTR NOTEPAD_StrRStr(LPWSTR pszSource, LPWSTR pszLast, LPWSTR pszSrch) void NOTEPAD_DoFind(FINDREPLACEW *fr) { LPWSTR content; - LPWSTR found; int len = lstrlenW(fr->lpstrFindWhat); int fileLen; - DWORD pos; + SIZE_T pos; fileLen = GetWindowTextLengthW(Globals.hEdit) + 1; content = HeapAlloc(GetProcessHeap(), 0, fileLen * sizeof(WCHAR)); @@ -391,30 +390,34 @@ void NOTEPAD_DoFind(FINDREPLACEW *fr) switch (fr->Flags & (FR_DOWN|FR_MATCHCASE)) { case 0: - found = StrRStrIW(content, content+pos-len, fr->lpstrFindWhat); + pos = StrRStrIW(content, content+pos-len, fr->lpstrFindWhat) - content; + if (pos == -(SIZE_T)content) pos = ~(SIZE_T)0; break; case FR_DOWN: - found = StrStrIW(content+pos, fr->lpstrFindWhat); + pos = StrStrIW(content+pos, fr->lpstrFindWhat) - content; + if (pos == -(SIZE_T)content) pos = ~(SIZE_T)0; break; case FR_MATCHCASE: - found = NOTEPAD_StrRStr(content, content+pos-len, fr->lpstrFindWhat); + pos = NOTEPAD_StrRStr(content, content+pos-len, fr->lpstrFindWhat) - content; + if (pos == -(SIZE_T)content) pos = ~(SIZE_T)0; break; case FR_DOWN|FR_MATCHCASE: - found = StrStrW(content+pos, fr->lpstrFindWhat); + pos = StrStrW(content+pos, fr->lpstrFindWhat) - content; + if (pos == -(SIZE_T)content) pos = ~(SIZE_T)0; break; default: /* shouldn't happen */ return; } HeapFree(GetProcessHeap(), 0, content); - if (found == NULL) + if (pos == ~(SIZE_T)0) { DIALOG_StringMsgBox(Globals.hFindReplaceDlg, STRING_NOTFOUND, fr->lpstrFindWhat, MB_ICONINFORMATION|MB_OK); return; } - SendMessageW(Globals.hEdit, EM_SETSEL, found - content, found - content + len); + SendMessageW(Globals.hEdit, EM_SETSEL, pos, pos + len); } static void NOTEPAD_DoReplace(FINDREPLACEW *fr) @@ -452,10 +455,9 @@ static void NOTEPAD_DoReplace(FINDREPLACEW *fr) static void NOTEPAD_DoReplaceAll(FINDREPLACEW *fr) { LPWSTR content; - LPWSTR found; int len = lstrlenW(fr->lpstrFindWhat); int fileLen; - DWORD pos; + SIZE_T pos; SendMessageW(Globals.hEdit, EM_SETSEL, 0, 0); while(TRUE){ @@ -468,22 +470,24 @@ static void NOTEPAD_DoReplaceAll(FINDREPLACEW *fr) switch (fr->Flags & (FR_DOWN|FR_MATCHCASE)) { case FR_DOWN: - found = StrStrIW(content+pos, fr->lpstrFindWhat); + pos = StrStrIW(content+pos, fr->lpstrFindWhat) - content; + if (pos == -(SIZE_T)content) pos = ~(SIZE_T)0; break; case FR_DOWN|FR_MATCHCASE: - found = StrStrW(content+pos, fr->lpstrFindWhat); + pos = StrStrW(content+pos, fr->lpstrFindWhat) - content; + if (pos == -(SIZE_T)content) pos = ~(SIZE_T)0; break; default: /* shouldn't happen */ return; } HeapFree(GetProcessHeap(), 0, content); - if(found == NULL) + if(pos == ~(SIZE_T)0) { SendMessageW(Globals.hEdit, EM_SETSEL, 0, 0); return; } - SendMessageW(Globals.hEdit, EM_SETSEL, found - content, found - content + len); + SendMessageW(Globals.hEdit, EM_SETSEL, pos, pos + len); SendMessageW(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)fr->lpstrReplaceWith); } }

1 0

Rémi Bernon : dsound: Avoid using pointer value after free.
by Alexandre Julliard 15 Jun '22

15 Jun '22

Module: wine Branch: master Commit: 164a4070db0df2fa33512cf0d0fa80404c2e395b URL: https://source.winehq.org/git/wine.git/?a=commit;h=164a4070db0df2fa33512cf0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun May 22 16:49:35 2022 +0200 dsound: Avoid using pointer value after free. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dsound/buffer.c | 4 ++-- dlls/dsound/capture.c | 6 +++--- dlls/dsound/dsound.c | 4 ++-- dlls/dsound/duplex.c | 2 +- dlls/dsound/propset.c | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index eb87479b7df..799b64e0e38 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -1192,9 +1192,9 @@ void secondarybuffer_destroy(IDirectSoundBufferImpl *This) HeapFree(GetProcessHeap(), 0, This->filters); } - HeapFree(GetProcessHeap(), 0, This); - TRACE("(%p) released\n", This); + + HeapFree(GetProcessHeap(), 0, This); } BOOL secondarybuffer_is_audible(IDirectSoundBufferImpl *This) diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index a00748d95bf..2c3dd83e86d 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -109,8 +109,8 @@ static void capturebuffer_destroy(IDirectSoundCaptureBufferImpl *This) This->device->capture_buffer = NULL; HeapFree(GetProcessHeap(), 0, This->notifies); - HeapFree(GetProcessHeap(), 0, This); TRACE("(%p) released\n", This); + HeapFree(GetProcessHeap(), 0, This); } /******************************************************************************* @@ -871,8 +871,8 @@ static ULONG DirectSoundCaptureDevice_Release( HeapFree(GetProcessHeap(), 0, device->pwfx); device->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection( &(device->lock) ); + TRACE("(%p) released\n", device); HeapFree(GetProcessHeap(), 0, device); - TRACE("(%p) released\n", device); } return ref; } @@ -1099,8 +1099,8 @@ static void capture_destroy(IDirectSoundCaptureImpl *This) { if (This->device) DirectSoundCaptureDevice_Release(This->device); - HeapFree(GetProcessHeap(),0,This); TRACE("(%p) released\n", This); + HeapFree(GetProcessHeap(),0,This); } /******************************************************************************* diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 346cc4ceca3..f2aea64eeed 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -239,8 +239,8 @@ static ULONG DirectSoundDevice_Release(DirectSoundDevice * device) HeapFree(GetProcessHeap(), 0, device->buffer); device->mixlock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&device->mixlock); - HeapFree(GetProcessHeap(),0,device); TRACE("(%p) released\n", device); + HeapFree(GetProcessHeap(),0,device); } return ref; } @@ -670,8 +670,8 @@ static void directsound_destroy(IDirectSoundImpl *This) { if (This->device) DirectSoundDevice_Release(This->device); - HeapFree(GetProcessHeap(),0,This); TRACE("(%p) released\n", This); + HeapFree(GetProcessHeap(),0,This); } static inline IDirectSoundImpl *impl_from_IUnknown(IUnknown *iface) diff --git a/dlls/dsound/duplex.c b/dlls/dsound/duplex.c index a3a9a066c31..b7891caa410 100644 --- a/dlls/dsound/duplex.c +++ b/dlls/dsound/duplex.c @@ -61,8 +61,8 @@ static void fullduplex_destroy(IDirectSoundFullDuplexImpl *This) while(IDirectSoundCapture_Release(dsc8) > 0); IUnknown_Release(This->dsc8_unk); } - HeapFree(GetProcessHeap(), 0, This); TRACE("(%p) released\n", This); + HeapFree(GetProcessHeap(), 0, This); } /******************************************************************************* diff --git a/dlls/dsound/propset.c b/dlls/dsound/propset.c index 74d66cad68e..f42cfbf4163 100644 --- a/dlls/dsound/propset.c +++ b/dlls/dsound/propset.c @@ -91,8 +91,8 @@ static ULONG WINAPI IKsPrivatePropertySetImpl_Release(LPKSPROPERTYSET iface) TRACE("(%p) ref %ld\n", This, ref); if (!ref) { + TRACE("(%p) released\n", This); HeapFree(GetProcessHeap(), 0, This); - TRACE("(%p) released\n", This); } return ref; }

1 0

Rémi Bernon : d3drm: Avoid using pointer value after free.
by Alexandre Julliard 15 Jun '22

15 Jun '22

Module: wine Branch: master Commit: 902a894900a232af1b41bff953c5bb4d164e1476 URL: https://source.winehq.org/git/wine.git/?a=commit;h=902a894900a232af1b41bff9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun May 22 16:38:16 2022 +0200 d3drm: Avoid using pointer value after free. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/d3drm/d3drm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 864323053f3..cc83ae6d1f3 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -210,8 +210,8 @@ static inline struct d3drm *impl_from_IDirect3DRM3(IDirect3DRM3 *iface) static void d3drm_destroy(struct d3drm *d3drm) { - heap_free(d3drm); TRACE("d3drm object %p is being destroyed.\n", d3drm); + heap_free(d3drm); } static HRESULT WINAPI d3drm1_QueryInterface(IDirect3DRM *iface, REFIID riid, void **out)

1 0

Rémi Bernon : server: Avoid using pointer value after realloc.
by Alexandre Julliard 15 Jun '22

15 Jun '22

Module: wine Branch: master Commit: c57eda2432fc81b29a631c0296831220792c8380 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c57eda2432fc81b29a631c02… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun May 22 18:53:54 2022 +0200 server: Avoid using pointer value after realloc. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/queue.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/server/queue.c b/server/queue.c index d79add56fba..934cf358059 100644 --- a/server/queue.c +++ b/server/queue.c @@ -3348,15 +3348,14 @@ DECL_HANDLER(get_cursor_history) DECL_HANDLER(get_rawinput_buffer) { struct thread_input *input = current->queue->input; - data_size_t size = 0, next_size = 0; + data_size_t size = 0, next_size = 0, pos = 0; struct list *ptr; - char *buf, *cur, *tmp; + char *buf, *tmp; int count = 0, buf_size = 16 * sizeof(struct hardware_msg_data); if (!req->buffer_size) buf = NULL; else if (!(buf = mem_alloc( buf_size ))) return; - cur = buf; ptr = list_head( &input->msg_list ); while (ptr) { @@ -3369,31 +3368,31 @@ DECL_HANDLER(get_rawinput_buffer) next_size = req->rawinput_size + extra_size; if (size + next_size > req->buffer_size) break; - if (cur + data->size > buf + get_reply_max_size()) break; - if (cur + data->size > buf + buf_size) + if (pos + data->size > get_reply_max_size()) break; + if (pos + data->size > buf_size) { buf_size += buf_size / 2 + extra_size; if (!(tmp = realloc( buf, buf_size ))) { + free( buf ); set_error( STATUS_NO_MEMORY ); return; } - cur = tmp + (cur - buf); buf = tmp; } - memcpy( cur, data, data->size ); + memcpy( buf + pos, data, data->size ); list_remove( &msg->entry ); free_message( msg ); size += next_size; - cur += sizeof(*data); + pos += sizeof(*data); count++; } reply->next_size = next_size; reply->count = count; - set_reply_data_ptr( buf, cur - buf ); + set_reply_data_ptr( buf, pos ); } DECL_HANDLER(update_rawinput_devices)

1 0

Hans Leidekker : cryptnet: Fail CRL verification if there's no issuer certificate.
by Alexandre Julliard 15 Jun '22

15 Jun '22

Module: wine Branch: master Commit: bbb3990c9106f7e02d8bb347ba3f3ef734aec67c URL: https://source.winehq.org/git/wine.git/?a=commit;h=bbb3990c9106f7e02d8bb347… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 15 13:51:08 2022 +0200 cryptnet: Fail CRL verification if there's no issuer certificate. --- dlls/cryptnet/cryptnet_main.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index ac282f5aa82..b066821a431 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -1690,6 +1690,12 @@ static DWORD verify_cert_revocation_from_dist_points_ext(const CRYPT_DATA_BLOB * const CRL_CONTEXT *crl; DWORD timeout = 0; + if (!params || !params->pIssuerCert) + { + TRACE("no issuer certificate\n"); + return CRYPT_E_REVOCATION_OFFLINE; + } + if (!CRYPT_GetUrlFromCRLDistPointsExt(value, NULL, &url_array_size, NULL, NULL)) return GetLastError();

1 0

Hans Leidekker : cryptnet: Move revocation cache check to verify_cert_revocation_from_dist_points_ext().
by Alexandre Julliard 15 Jun '22

15 Jun '22

Module: wine Branch: master Commit: f08dcbf894943f85485f5d34a7120d52320559fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=f08dcbf894943f85485f5d34… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 15 13:57:54 2022 +0200 cryptnet: Move revocation cache check to verify_cert_revocation_from_dist_points_ext(). Paves the way for falling back from OCSP to online CRL verification. It's not clear if a cache is needed for OCSP responses, or if the wininet cache wouldn't be sufficient. --- dlls/cryptnet/cryptnet_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index b066821a431..cd06c4a3008 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -1696,6 +1696,9 @@ static DWORD verify_cert_revocation_from_dist_points_ext(const CRYPT_DATA_BLOB * return CRYPT_E_REVOCATION_OFFLINE; } + if (find_cached_revocation_status(&cert->pCertInfo->SerialNumber, time, status)) + return status->dwError; + if (!CRYPT_GetUrlFromCRLDistPointsExt(value, NULL, &url_array_size, NULL, NULL)) return GetLastError(); @@ -2143,9 +2146,6 @@ static DWORD verify_cert_revocation(const CERT_CONTEXT *cert, FILETIME *pTime, DWORD error = ERROR_SUCCESS; PCERT_EXTENSION ext; - if (find_cached_revocation_status(&cert->pCertInfo->SerialNumber, pTime, pRevStatus)) - return pRevStatus->dwError; - if ((ext = CertFindExtension(szOID_AUTHORITY_INFO_ACCESS, cert->pCertInfo->cExtension, cert->pCertInfo->rgExtension))) { error = verify_cert_revocation_from_aia_ext(&ext->Value, cert, pTime, dwFlags, pRevPara, pRevStatus);

1 0

Hans Leidekker : cryptnet: Fall back to online CRL verification if OCSP verification fails.
by Alexandre Julliard 15 Jun '22

15 Jun '22

Module: wine Branch: master Commit: 987d637e31ca087487ef26337ad081b9de9ca36a URL: https://source.winehq.org/git/wine.git/?a=commit;h=987d637e31ca087487ef2633… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 15 14:09:00 2022 +0200 cryptnet: Fall back to online CRL verification if OCSP verification fails. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53136 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53138 --- dlls/cryptnet/cryptnet_main.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index cd06c4a3008..19de1ed2d8e 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -2149,12 +2149,16 @@ static DWORD verify_cert_revocation(const CERT_CONTEXT *cert, FILETIME *pTime, if ((ext = CertFindExtension(szOID_AUTHORITY_INFO_ACCESS, cert->pCertInfo->cExtension, cert->pCertInfo->rgExtension))) { error = verify_cert_revocation_from_aia_ext(&ext->Value, cert, pTime, dwFlags, pRevPara, pRevStatus); + TRACE("verify_cert_revocation_from_aia_ext() returned %08lx\n", error); + if (error == ERROR_SUCCESS || error == CRYPT_E_REVOKED) return error; } - else if ((ext = CertFindExtension(szOID_CRL_DIST_POINTS, cert->pCertInfo->cExtension, cert->pCertInfo->rgExtension))) + if ((ext = CertFindExtension(szOID_CRL_DIST_POINTS, cert->pCertInfo->cExtension, cert->pCertInfo->rgExtension))) { error = verify_cert_revocation_from_dist_points_ext(&ext->Value, cert, pTime, dwFlags, pRevPara, pRevStatus); + TRACE("verify_cert_revocation_from_dist_points_ext() returned %08lx\n", error); + if (error == ERROR_SUCCESS || error == CRYPT_E_REVOKED) return error; } - else + if (!ext) { if (pRevPara && pRevPara->hCrlStore && pRevPara->pIssuerCert) {

1 0

Jacek Caban : win32u: Move NtUserMenuItemFromPoint implementation from user32.
by Alexandre Julliard 15 Jun '22

15 Jun '22

Module: wine Branch: master Commit: 95b76f510164ec8fbfe0f5ea9b1ed7df64f41e5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=95b76f510164ec8fbfe0f5ea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jun 11 02:14:02 2022 +0200 win32u: Move NtUserMenuItemFromPoint implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/menu.c | 14 +------ dlls/win32u/menu.c | 101 ++++++++++++++++++++++++++++++++++++++++++++---- dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 10 +++++ include/ntuser.h | 1 + 7 files changed, 110 insertions(+), 20 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 73aee6b849d..a06ef21c634 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -4321,19 +4321,9 @@ DWORD WINAPI GetMenuContextHelpId( HMENU menu ) /********************************************************************** * MenuItemFromPoint (USER32.@) */ -INT WINAPI MenuItemFromPoint(HWND hWnd, HMENU hMenu, POINT ptScreen) +INT WINAPI MenuItemFromPoint( HWND hwnd, HMENU menu, POINT pt ) { - POPUPMENU *menu = grab_menu_ptr(hMenu); - UINT pos; - - /*FIXME: Do we have to handle hWnd here? */ - if (!menu) return -1; - - if (MENU_FindItemByCoords( menu, ptScreen, &pos ) != ht_item) - pos = -1; - - release_menu_ptr(menu); - return pos; + return NtUserMenuItemFromPoint( hwnd, menu, pt.x, pt.y ); } diff --git a/dlls/win32u/menu.c b/dlls/win32u/menu.c index 8367af32395..d84af186da9 100644 --- a/dlls/win32u/menu.c +++ b/dlls/win32u/menu.c @@ -40,6 +40,15 @@ struct accelerator ACCEL table[1]; }; +enum hittest +{ + ht_nowhere, /* outside the menu */ + ht_border, /* anywhere that's not an item or a scroll arrow */ + ht_item, /* a menu item */ + ht_scroll_up, /* scroll up arrow */ + ht_scroll_down /* scroll down arrow */ +}; + /* maximum allowed depth of any branch in the menu tree. * This value is slightly larger than in windows (25) to * stay on the safe side. */ @@ -424,6 +433,76 @@ static UINT find_submenu( HMENU *handle_ptr, HMENU target ) return NO_SELECTED_ITEM; } +/* Adjust menu item rectangle according to scrolling state */ +static void adjust_menu_item_rect( const POPUPMENU *menu, RECT *rect ) +{ + INT scroll_offset = menu->bScrolling ? menu->nScrollPos : 0; + OffsetRect( rect, menu->items_rect.left, menu->items_rect.top - scroll_offset ); +} + +/*********************************************************************** + * find_item_by_coords + * + * Find the item at the specified coordinates (screen coords). Does + * not work for child windows and therefore should not be called for + * an arbitrary system menu. + * + * Returns a hittest code. *pos will contain the position of the + * item or NO_SELECTED_ITEM. If the hittest code is ht_scroll_up + * or ht_scroll_down then *pos will contain the position of the + * item that's just outside the items_rect - ie, the one that would + * be scrolled completely into view. + */ +static enum hittest find_item_by_coords( const POPUPMENU *menu, POINT pt, UINT *pos ) +{ + enum hittest ht = ht_border; + MENUITEM *item; + RECT rect; + UINT i; + + *pos = NO_SELECTED_ITEM; + + if (!get_window_rect( menu->hWnd, &rect, get_thread_dpi() ) || !PtInRect( &rect, pt )) + return ht_nowhere; + + if (get_window_long( menu->hWnd, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL) pt.x = rect.right - 1 - pt.x; + else pt.x -= rect.left; + pt.y -= rect.top; + + if (!PtInRect( &menu->items_rect, pt )) + { + if (!menu->bScrolling || pt.x < menu->items_rect.left || pt.x >= menu->items_rect.right) + return ht_border; + + /* On a scroll arrow. Update pt so that it points to the item just outside items_rect */ + if (pt.y < menu->items_rect.top) + { + ht = ht_scroll_up; + pt.y = menu->items_rect.top - 1; + } + else + { + ht = ht_scroll_down; + pt.y = menu->items_rect.bottom; + } + } + + item = menu->items; + for (i = 0; i < menu->nItems; i++, item++) + { + rect = item->rect; + adjust_menu_item_rect( menu, &rect ); + if (PtInRect( &rect, pt )) + { + *pos = i; + if (ht != ht_scroll_up && ht != ht_scroll_down) ht = ht_item; + break; + } + } + + return ht; +} + /* see GetMenu */ HMENU get_menu( HWND hwnd ) { @@ -1040,6 +1119,21 @@ static HMENU get_sub_menu( HMENU handle, INT pos ) return submenu; } +/********************************************************************** + * NtUserMenuItemFromPoint (win32u.@) + */ +INT WINAPI NtUserMenuItemFromPoint( HWND hwnd, HMENU handle, int x, int y ) +{ + POINT pt = { .x = x, .y = y }; + POPUPMENU *menu; + UINT pos; + + if (!(menu = grab_menu_ptr(handle))) return -1; + if (find_item_by_coords( menu, pt, &pos ) != ht_item) pos = -1; + release_menu_ptr(menu); + return pos; +} + /********************************************************************** * NtUserGetSystemMenu (win32u.@) */ @@ -1823,13 +1917,6 @@ got_bitmap: NtGdiDeleteObjectApp( mem_hdc ); } -/* Adjust menu item rectangle according to scrolling state */ -static void adjust_menu_item_rect( const POPUPMENU *menu, RECT *rect ) -{ - INT scroll_offset = menu->bScrolling ? menu->nScrollPos : 0; - OffsetRect( rect, menu->items_rect.left, menu->items_rect.top - scroll_offset ); -} - /* Draw a single menu item */ static void draw_menu_item( HWND hwnd, POPUPMENU *menu, HWND owner, HDC hdc, MENUITEM *item, BOOL menu_bar, UINT odaction ) diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index ac13580308d..a926049f0ed 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -151,6 +151,7 @@ static void * const syscalls[] = NtUserInternalGetWindowText, NtUserKillTimer, NtUserLockWindowUpdate, + NtUserMenuItemFromPoint, NtUserNotifyWinEvent, NtUserOpenDesktop, NtUserOpenInputDesktop, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 4dfebaa9d2d..f296f162fff 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1078,7 +1078,7 @@ @ stub NtUserMapPointsByVisualIdentifier @ stdcall NtUserMapVirtualKeyEx(long long long) @ stub NtUserMarkWindowForRawMouse -@ stub NtUserMenuItemFromPoint +@ stdcall -syscall NtUserMenuItemFromPoint(long long long long) @ stdcall NtUserMessageCall(long long long long long long long) @ stub NtUserMinInitialize @ stub NtUserMinMaximize diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index e30d367cda7..7c9627a6121 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -138,6 +138,7 @@ SYSCALL_ENTRY( NtUserInternalGetWindowText ) \ SYSCALL_ENTRY( NtUserKillTimer ) \ SYSCALL_ENTRY( NtUserLockWindowUpdate ) \ + SYSCALL_ENTRY( NtUserMenuItemFromPoint ) \ SYSCALL_ENTRY( NtUserNotifyWinEvent ) \ SYSCALL_ENTRY( NtUserOpenDesktop ) \ SYSCALL_ENTRY( NtUserOpenInputDesktop ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index c2d134626f1..51c0a5d0ed8 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -736,6 +736,16 @@ NTSTATUS WINAPI wow64_NtUserGetMenuItemRect( UINT *args ) return NtUserGetMenuItemRect( hwnd, handle, item, rect ); } +NTSTATUS WINAPI wow64_NtUserMenuItemFromPoint( UINT *args ) +{ + HWND hwnd = get_handle( &args ); + HMENU handle = get_handle( &args ); + int x = get_ulong( &args ); + int y = get_ulong( &args ); + + return NtUserMenuItemFromPoint( hwnd, handle, x, y ); +} + NTSTATUS WINAPI wow64_NtUserSetMenuContextHelpId( UINT *args ) { HMENU menu = get_handle( &args ); diff --git a/include/ntuser.h b/include/ntuser.h index 5f744c24906..0415ba076a5 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -620,6 +620,7 @@ BOOL WINAPI NtUserIsClipboardFormatAvailable( UINT format ); BOOL WINAPI NtUserKillTimer( HWND hwnd, UINT_PTR id ); BOOL WINAPI NtUserLockWindowUpdate( HWND hwnd ); 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, void *result_info, DWORD type, BOOL ansi ); BOOL WINAPI NtUserMoveWindow( HWND hwnd, INT x, INT y, INT cx, INT cy, BOOL repaint );

1 0

Jacek Caban : win32u: Move WM_KEYF1 implementation from user32.
by Alexandre Julliard 15 Jun '22

15 Jun '22

Module: wine Branch: master Commit: dad8044f1a5a171771f9d172e12f6b39cd60eae7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dad8044f1a5a171771f9d172… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jun 11 02:39:41 2022 +0200 win32u: Move WM_KEYF1 implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/defwnd.c | 23 ----------------------- dlls/win32u/defwnd.c | 27 +++++++++++++++++++++++++++ dlls/win32u/menu.c | 6 ++++++ dlls/win32u/message.c | 2 +- dlls/win32u/win32u_private.h | 2 ++ dlls/win32u/window.c | 4 ++-- 6 files changed, 38 insertions(+), 26 deletions(-) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index df5aa9353f4..6f2c3013aaa 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -435,29 +435,6 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa SendMessageW( parent, msg, wParam, lParam ); break; } - case WM_KEYF1: - { - HELPINFO hi; - - hi.cbSize = sizeof(HELPINFO); - GetCursorPos( &hi.MousePos ); - if (MENU_IsMenuActive()) - { - hi.iContextType = HELPINFO_MENUITEM; - hi.hItemHandle = MENU_IsMenuActive(); - hi.iCtrlId = MenuItemFromPoint( hwnd, hi.hItemHandle, hi.MousePos ); - hi.dwContextId = GetMenuContextHelpId( hi.hItemHandle ); - } - else - { - hi.iContextType = HELPINFO_WINDOW; - hi.hItemHandle = hwnd; - hi.iCtrlId = GetWindowLongPtrA( hwnd, GWLP_ID ); - hi.dwContextId = GetWindowContextHelpId( hwnd ); - } - SendMessageW( hwnd, WM_HELP, 0, (LPARAM)&hi ); - break; - } case WM_INPUTLANGCHANGEREQUEST: NtUserActivateKeyboardLayout( (HKL)lParam, 0 ); diff --git a/dlls/win32u/defwnd.c b/dlls/win32u/defwnd.c index f9a23bcee3f..3705cbf8022 100644 --- a/dlls/win32u/defwnd.c +++ b/dlls/win32u/defwnd.c @@ -1766,6 +1766,33 @@ LRESULT default_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, case WM_SYSCOMMAND: result = handle_sys_command( hwnd, wparam, lparam ); break; + + case WM_KEYF1: + { + HELPINFO hi; + + hi.cbSize = sizeof(HELPINFO); + get_cursor_pos( &hi.MousePos ); + if (is_menu_active()) + { + MENUINFO info = { .cbSize = sizeof(info), .fMask = MIM_HELPID }; + hi.iContextType = HELPINFO_MENUITEM; + hi.hItemHandle = is_menu_active(); + hi.iCtrlId = NtUserMenuItemFromPoint( hwnd, hi.hItemHandle, + hi.MousePos.x, hi.MousePos.y ); + get_menu_info( hi.hItemHandle, &info ); + hi.dwContextId = info.dwContextHelpID; + } + else + { + hi.iContextType = HELPINFO_WINDOW; + hi.hItemHandle = hwnd; + hi.iCtrlId = get_window_long_ptr( hwnd, GWLP_ID, FALSE ); + hi.dwContextId = get_window_context_help_id( hwnd ); + } + send_message( hwnd, WM_HELP, 0, (LPARAM)&hi ); + break; + } } return result; diff --git a/dlls/win32u/menu.c b/dlls/win32u/menu.c index d84af186da9..8ccece38e74 100644 --- a/dlls/win32u/menu.c +++ b/dlls/win32u/menu.c @@ -2492,3 +2492,9 @@ LRESULT popup_menu_window_proc( HWND hwnd, UINT message, WPARAM wparam, LPARAM l } return 0; } + +HWND is_menu_active(void) +{ + if (!user_callbacks) return 0; + return user_callbacks->is_menu_active(); +} diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index cea1a33812a..f5315ec5dd4 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -1346,7 +1346,7 @@ static BOOL process_keyboard_message( MSG *msg, UINT hw_id, HWND hwnd_filter, else if (msg->message == WM_KEYUP) { /* Handle VK_APPS key by posting a WM_CONTEXTMENU message */ - if (msg->wParam == VK_APPS && user_callbacks && !user_callbacks->is_menu_active()) + if (msg->wParam == VK_APPS && !is_menu_active()) NtUserPostMessage( msg->hwnd, WM_CONTEXTMENU, (WPARAM)msg->hwnd, -1 ); } } diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index d3f060669a4..80fe2e027e0 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -402,6 +402,7 @@ extern BOOL get_menu_info( HMENU handle, MENUINFO *info ) DECLSPEC_HIDDEN; extern INT get_menu_item_count( HMENU handle ) DECLSPEC_HIDDEN; extern UINT get_menu_state( HMENU handle, UINT item_id, UINT flags ) DECLSPEC_HIDDEN; extern BOOL is_menu( HMENU handle ) DECLSPEC_HIDDEN; +extern HWND is_menu_active(void) DECLSPEC_HIDDEN; extern LRESULT popup_menu_window_proc( HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam ) DECLSPEC_HIDDEN; extern BOOL set_window_menu( HWND hwnd, HMENU handle ) DECLSPEC_HIDDEN; @@ -463,6 +464,7 @@ extern HWND get_parent( HWND hwnd ) DECLSPEC_HIDDEN; extern HWND get_hwnd_message_parent(void) DECLSPEC_HIDDEN; extern DPI_AWARENESS_CONTEXT get_window_dpi_awareness_context( HWND hwnd ) DECLSPEC_HIDDEN; extern MINMAXINFO get_min_max_info( HWND hwnd ) DECLSPEC_HIDDEN; +extern DWORD get_window_context_help_id( HWND hwnd ) DECLSPEC_HIDDEN; extern HWND get_window_relative( HWND hwnd, UINT rel ) DECLSPEC_HIDDEN; extern DWORD get_window_thread( HWND hwnd, DWORD *process ) DECLSPEC_HIDDEN; extern HWND is_current_process_window( HWND hwnd ) DECLSPEC_HIDDEN; diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 94f285de2bb..5575b9a0381 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -4524,7 +4524,7 @@ BOOL WINAPI NtUserFlashWindowEx( FLASHWINFO *info ) } /* see GetWindowContextHelpId */ -static DWORD get_window_context_help_id( HWND hwnd ) +DWORD get_window_context_help_id( HWND hwnd ) { DWORD retval; WND *win = get_win_ptr( hwnd ); @@ -4759,7 +4759,7 @@ BOOL WINAPI NtUserDestroyWindow( HWND hwnd ) if (call_hooks( WH_CBT, HCBT_DESTROYWND, (WPARAM)hwnd, 0, TRUE )) return FALSE; - if (user_callbacks && user_callbacks->is_menu_active() == hwnd) + if (user_callbacks && is_menu_active() == hwnd) user_callbacks->pEndMenu(); is_child = (get_window_long( hwnd, GWL_STYLE ) & WS_CHILD) != 0;

1 0