wine-commits December 2009

wine-commits@winehq.org

3 participants
1233 discussions

Eric Pouech : dbghelp: Create a cpu backend to store CPU dependent code, and use it for the i386 stack implementation.
by Alexandre Julliard 23 Dec '09

23 Dec '09

Module: wine Branch: master Commit: 7230659ce924327be9caae74df01d0a084095235 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7230659ce924327be9caae74d… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Dec 22 14:21:07 2009 +0100 dbghelp: Create a cpu backend to store CPU dependent code, and use it for the i386 stack implementation. --- dlls/dbghelp/Makefile.in | 1 + dlls/dbghelp/cpu_i386.c | 348 ++++++++++++++++++++++++++++++ dlls/dbghelp/dbghelp.c | 22 ++ dlls/dbghelp/dbghelp_private.h | 39 ++++ dlls/dbghelp/stack.c | 456 +++++----------------------------------- 5 files changed, 467 insertions(+), 399 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7230659ce924327be9caa…

1 0

Alexandre Julliard : user32: Avoid accessing the window structure directly in Get/SetWindowLong16.
by Alexandre Julliard 23 Dec '09

23 Dec '09

Module: wine Branch: master Commit: 388814dfa975f8c57b199ed6870f58489be58acc URL: http://source.winehq.org/git/wine.git/?a=commit;h=388814dfa975f8c57b199ed68… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 22 15:25:15 2009 +0100 user32: Avoid accessing the window structure directly in Get/SetWindowLong16. --- dlls/user32/wnd16.c | 69 +++++++++++++++++--------------------------------- 1 files changed, 24 insertions(+), 45 deletions(-) diff --git a/dlls/user32/wnd16.c b/dlls/user32/wnd16.c index dfcd71f..b4741ff 100644 --- a/dlls/user32/wnd16.c +++ b/dlls/user32/wnd16.c @@ -821,44 +821,36 @@ WORD WINAPI SetWindowWord16( HWND16 hwnd, INT16 offset, WORD newval ) /********************************************************************** * GetWindowLong (USER.135) */ -LONG WINAPI GetWindowLong16( HWND16 hwnd, INT16 offset ) +LONG WINAPI GetWindowLong16( HWND16 hwnd16, INT16 offset ) { - WND *wndPtr; + HWND hwnd = WIN_Handle32( hwnd16 ); LONG_PTR retvalue; BOOL is_winproc = (offset == GWLP_WNDPROC); if (offset >= 0) { - if (!(wndPtr = WIN_GetPtr( WIN_Handle32(hwnd) ))) - { - SetLastError( ERROR_INVALID_WINDOW_HANDLE ); - return 0; - } - if (wndPtr != WND_OTHER_PROCESS && wndPtr != WND_DESKTOP) + int cbWndExtra = GetClassLongA( hwnd, GCL_CBWNDEXTRA ); + + if (offset > (int)(cbWndExtra - sizeof(LONG))) { - if (offset > (int)(wndPtr->cbWndExtra - sizeof(LONG))) + /* + * Some programs try to access last element from 16 bit + * code using illegal offset value. Hopefully this is + * what those programs really expect. + */ + if (cbWndExtra >= 4 && offset == cbWndExtra - sizeof(WORD)) { - /* - * Some programs try to access last element from 16 bit - * code using illegal offset value. Hopefully this is - * what those programs really expect. - */ - if (wndPtr->cbWndExtra >= 4 && offset == wndPtr->cbWndExtra - sizeof(WORD)) - { - offset = wndPtr->cbWndExtra - sizeof(LONG); - } - else - { - WIN_ReleasePtr( wndPtr ); - SetLastError( ERROR_INVALID_INDEX ); - return 0; - } + offset = cbWndExtra - sizeof(LONG); + } + else + { + SetLastError( ERROR_INVALID_INDEX ); + return 0; } - is_winproc = ((offset == DWLP_DLGPROC) && (wndPtr->flags & WIN_ISDIALOG)); - WIN_ReleasePtr( wndPtr ); } + else if (offset == DWLP_DLGPROC) is_winproc = (DIALOG_get_info( hwnd, FALSE ) != NULL); } - retvalue = GetWindowLongA( WIN_Handle32(hwnd), offset ); + retvalue = GetWindowLongA( hwnd, offset ); if (is_winproc) retvalue = (LONG_PTR)WINPROC_GetProc16( (WNDPROC)retvalue, FALSE ); return retvalue; } @@ -867,33 +859,20 @@ LONG WINAPI GetWindowLong16( HWND16 hwnd, INT16 offset ) /********************************************************************** * SetWindowLong (USER.136) */ -LONG WINAPI SetWindowLong16( HWND16 hwnd, INT16 offset, LONG newval ) +LONG WINAPI SetWindowLong16( HWND16 hwnd16, INT16 offset, LONG newval ) { - WND *wndPtr; + HWND hwnd = WIN_Handle32( hwnd16 ); BOOL is_winproc = (offset == GWLP_WNDPROC); - if (offset == DWLP_DLGPROC) - { - if (!(wndPtr = WIN_GetPtr( WIN_Handle32(hwnd) ))) - { - SetLastError( ERROR_INVALID_WINDOW_HANDLE ); - return 0; - } - if (wndPtr != WND_OTHER_PROCESS && wndPtr != WND_DESKTOP) - { - is_winproc = ((wndPtr->cbWndExtra - sizeof(LONG_PTR) >= DWLP_DLGPROC) && - (wndPtr->flags & WIN_ISDIALOG)); - WIN_ReleasePtr( wndPtr ); - } - } + if (offset == DWLP_DLGPROC) is_winproc = (DIALOG_get_info( hwnd, FALSE ) != NULL); if (is_winproc) { WNDPROC new_proc = WINPROC_AllocProc16( (WNDPROC16)newval ); - WNDPROC old_proc = (WNDPROC)SetWindowLongPtrA( WIN_Handle32(hwnd), offset, (LONG_PTR)new_proc ); + WNDPROC old_proc = (WNDPROC)SetWindowLongPtrA( hwnd, offset, (LONG_PTR)new_proc ); return (LONG)WINPROC_GetProc16( old_proc, FALSE ); } - else return SetWindowLongA( WIN_Handle32(hwnd), offset, newval ); + else return SetWindowLongA( hwnd, offset, newval ); }

1 0

Alexandre Julliard : user32: Avoid accessing the window structure directly in DispatchMessage16.
by Alexandre Julliard 23 Dec '09

23 Dec '09

Module: wine Branch: master Commit: 4e343b6f3a345912a2263fe18f5f520ae033007a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e343b6f3a345912a2263fe18… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 22 15:24:53 2009 +0100 user32: Avoid accessing the window structure directly in DispatchMessage16. --- dlls/user32/msg16.c | 14 ++------------ 1 files changed, 2 insertions(+), 12 deletions(-) diff --git a/dlls/user32/msg16.c b/dlls/user32/msg16.c index b8421d4..710dfa0 100644 --- a/dlls/user32/msg16.c +++ b/dlls/user32/msg16.c @@ -1797,7 +1797,6 @@ BOOL16 WINAPI TranslateMessage16( const MSG16 *msg ) */ LONG WINAPI DispatchMessage16( const MSG16* msg ) { - WND * wndPtr; WNDPROC16 winproc; LONG retval; HWND hwnd = WIN_Handle32( msg->hwnd ); @@ -1810,20 +1809,11 @@ LONG WINAPI DispatchMessage16( const MSG16* msg ) msg->message, msg->wParam, GetTickCount() ); } - if (!(wndPtr = WIN_GetPtr( hwnd ))) + if (!(winproc = (WNDPROC16)GetWindowLong16( msg->hwnd, GWLP_WNDPROC ))) { - if (msg->hwnd) SetLastError( ERROR_INVALID_WINDOW_HANDLE ); + SetLastError( ERROR_INVALID_WINDOW_HANDLE ); return 0; } - if (wndPtr == WND_OTHER_PROCESS || wndPtr == WND_DESKTOP) - { - if (IsWindow( hwnd )) SetLastError( ERROR_MESSAGE_SYNC_ONLY ); - else SetLastError( ERROR_INVALID_WINDOW_HANDLE ); - return 0; - } - winproc = WINPROC_GetProc16( wndPtr->winproc, wndPtr->flags & WIN_ISUNICODE ); - WIN_ReleasePtr( wndPtr ); - SPY_EnterMessage( SPY_DISPATCHMESSAGE16, hwnd, msg->message, msg->wParam, msg->lParam ); retval = CallWindowProc16( winproc, msg->hwnd, msg->message, msg->wParam, msg->lParam ); SPY_ExitMessage( SPY_RESULT_OK16, hwnd, msg->message, retval, msg->wParam, msg->lParam );

1 0

Alexandre Julliard : user32: Get rid of support for extracting icons from builtin dlls.
by Alexandre Julliard 23 Dec '09

23 Dec '09

Module: wine Branch: master Commit: 73cf431aac5856c758869088d6b784a6ba23f685 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73cf431aac5856c758869088d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 23 14:27:22 2009 +0100 user32: Get rid of support for extracting icons from builtin dlls. We now have fake dll files for all dlls, the icons can be loaded from there. --- dlls/user32/exticon.c | 101 ------------------------------------------------- 1 files changed, 0 insertions(+), 101 deletions(-) diff --git a/dlls/user32/exticon.c b/dlls/user32/exticon.c index 1d30f25..a720cf3 100644 --- a/dlls/user32/exticon.c +++ b/dlls/user32/exticon.c @@ -233,81 +233,6 @@ static BYTE * ICO_GetIconDirectory( LPBYTE peimage, LPicoICONDIR* lplpiID, ULONG return 0; } -/****************************************************************************** - * struct extract_icons_state [internal] - * - * Used to carry params and state through the iterations of EnumResourceNames in ICO_ExtractIconExW - */ -struct extract_icons_state { - INT nBaseIndex; /* Zero based index or negated integer id of the first icon to extract. */ - UINT nIcons; /* Number of icons to extract. */ - UINT cxDesired; /* Desired horizontal size in pixels (Might be two sizes in HI/LOWORD). */ - UINT cyDesired; /* Desired vertical size in pixels (Might be two sizes in HI/LOWORD). */ - UINT fuLoad; /* Flags passed to LoadImage. */ - INT cIter; /* Iteration counter. */ - HICON *pahIcon; /* Pointer to an array where the icon handles will be stored. */ - UINT *paIconId; /* Pointer to an array where the icon identifiers will be stored. */ -}; - -/****************************************************************************** - * extract_icons_callback [internal] - * - * Callback function of type ENUMRESNAMEPROC for EnumResourceNames. Used in - * ICO_ExtractIconsExW. - */ -static BOOL CALLBACK extract_icons_callback(HMODULE hModule, LPCWSTR pwszType, LPWSTR pwszName, - LONG_PTR lParam) -{ - struct extract_icons_state *pState = (struct extract_icons_state *)lParam; - INT idCurrent = LOWORD(pwszName); - - /* If the handle array pointer is NULL, we just count the number of icons in the module. */ - if (!pState->pahIcon) { - pState->cIter++; - return TRUE; - } - - /* If we didn't already start extracting icons (cIter == 0), we look if the current - * icon is the one we should start with. That's the case if nBaseIndex is negative and - * it's absolute value matches the current icon's identifier. Or if nBaseIndex is positive - * and we already omitted the first nBaseIndex icons. */ - if (pState->cIter == 0) { - if (pState->nBaseIndex < 0) { - if (!IS_INTRESOURCE(pwszName) || idCurrent != -pState->nBaseIndex) { - return TRUE; - } - } else if (pState->nBaseIndex > 0) { - pState->nBaseIndex--; - return TRUE; - } - } - - if (pState->cIter < pState->nIcons) { - /* Load the current icon with the size given in the LOWORD of cx/cyDesired */ - pState->pahIcon[pState->cIter] = - LoadImageW(hModule, pwszName, IMAGE_ICON, LOWORD(pState->cxDesired), - LOWORD(pState->cyDesired), pState->fuLoad); - /* FIXME: The resource's identifier (that is not idCurrent, which is the - * identifier of the icon directory) should be stored in paIconId, but I don't - * know how to query for it. */ - if (pState->paIconId) pState->paIconId[pState->cIter] = 0; - pState->cIter++; - - /* If there is a second desired size given in the HIWORDs of cx/cyDesired, load too. - * There seems to be an off-by-one error here, since pState->cIter might now be equal - * to pState->nIcons, but this is in fact how it works on windows. */ - if (HIWORD(pState->cxDesired) && HIWORD(pState->cyDesired)) { - pState->pahIcon[pState->cIter] = - LoadImageW(hModule, pwszName, IMAGE_ICON, HIWORD(pState->cxDesired), - HIWORD(pState->cyDesired), pState->fuLoad); - if (pState->paIconId) pState->paIconId[pState->cIter] = 0; - pState->cIter++; - } - } - - return pState->cIter < pState->nIcons; -} - /************************************************************************* * ICO_ExtractIconExW [internal] * @@ -346,34 +271,8 @@ static UINT ICO_ExtractIconExW( dwSearchReturn = SearchPathW(NULL, lpszExeFileName, NULL, sizeof(szExePath) / sizeof(szExePath[0]), szExePath, NULL); if ((dwSearchReturn == 0) || (dwSearchReturn > sizeof(szExePath) / sizeof(szExePath[0]))) { - /* This is very wine specific: If the user tries to extract icons from system dlls, - * wine's builtin *.dll.so's will not be found (Even if they would be found it wouldn't - * work, since they are not in PE-format). Thus, if the SearchPath call fails, we try - * to load the file with LoadLibrary and extract the icons with LoadImage (via - * EnumResourceNames). - */ - struct extract_icons_state state; - HMODULE hDllSo = LoadLibraryW(lpszExeFileName); - - if (!hDllSo) { WARN("File %s not found or path too long\n", debugstr_w(lpszExeFileName)); return -1; - } - - state.nBaseIndex = nIconIndex; - state.nIcons = nIcons; - state.cxDesired = cxDesired; - state.cyDesired = cyDesired; - state.fuLoad = flags; - state.cIter = 0; - state.pahIcon = RetPtr; - state.paIconId = pIconId; - - EnumResourceNamesW(hDllSo, MAKEINTRESOURCEW(RT_GROUP_ICON), extract_icons_callback, - (LONG_PTR)&state); - FreeLibrary(hDllSo); - - return state.cIter; } hFile = CreateFileW(szExePath, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0);

1 0

Alexandre Julliard : user32: Don' t cache 16-bit instance resources on the 32-bit side.
by Alexandre Julliard 23 Dec '09

23 Dec '09

Module: wine Branch: master Commit: 2919c49d7ffbef6d1bf26727b0f425f4b4a46711 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2919c49d7ffbef6d1bf26727b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 23 14:26:51 2009 +0100 user32: Don't cache 16-bit instance resources on the 32-bit side. --- dlls/user32/cursoricon.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 2b2151a..188500a 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1177,10 +1177,8 @@ static HICON CURSORICON_Load(HINSTANCE hInstance, LPCWSTR name, if (!hInstance) hInstance = user32_module; /* Load OEM cursor/icon */ - /* Normalize hInstance (must be uniquely represented for icon cache) */ - - if (!HIWORD( hInstance )) - hInstance = HINSTANCE_32(GetExePtr( HINSTANCE_16(hInstance) )); + /* don't cache 16-bit instances (FIXME: should never get 16-bit instances in the first place) */ + if (!HIWORD( hInstance )) loadflags &= ~LR_SHARED; /* Get directory resource ID */

1 0

Alexandre Julliard : user32: Allocate user handles for cursors/ icons when we don't have 16-bit support.
by Alexandre Julliard 23 Dec '09

23 Dec '09

Module: wine Branch: master Commit: cecb3a993c156b7aef91f719beec4901597095cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=cecb3a993c156b7aef91f719b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 22 17:16:50 2009 +0100 user32: Allocate user handles for cursors/icons when we don't have 16-bit support. --- dlls/user32/user_private.h | 1 + dlls/user32/winproc.c | 20 ++++++++++++++------ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 41379f0..c383b48 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -129,6 +129,7 @@ enum user_obj_type USER_WINDOW = 1, /* window */ USER_MENU, /* menu */ USER_ACCEL, /* accelerator */ + USER_ICON, /* icon or cursor */ USER_DWP /* DeferWindowPos structure */ }; diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index bcb6853..354efe0 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -1123,24 +1123,32 @@ static LRESULT WINAPI StaticWndProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM static HICON alloc_icon_handle( unsigned int size ) { - HGLOBAL16 handle = GlobalAlloc16( GMEM_MOVEABLE, size ); - FarSetOwner16( handle, 0 ); - return HICON_32( handle ); + struct user_object *obj = HeapAlloc( GetProcessHeap(), 0, sizeof(*obj) + size ); + if (!obj) return 0; + return alloc_user_handle( obj, USER_ICON ); } static struct tagCURSORICONINFO *get_icon_ptr( HICON handle ) { - return GlobalLock16( HICON_16(handle) ); + struct user_object *obj = get_user_handle_ptr( handle, USER_ICON ); + if (obj == OBJ_OTHER_PROCESS) + { + WARN( "cursor handle %p from other process\n", handle ); + obj = NULL; + } + return obj ? (struct tagCURSORICONINFO *)(obj + 1) : NULL; } static void release_icon_ptr( HICON handle, struct tagCURSORICONINFO *ptr ) { - GlobalUnlock16( HICON_16(handle) ); + release_user_handle_ptr( (struct user_object *)ptr - 1 ); } static int free_icon_handle( HICON handle ) { - return GlobalFree16( HICON_16(handle) ); + struct user_object *obj = free_user_handle( handle, USER_ICON ); + HeapFree( GetProcessHeap(), 0, obj ); + return !obj; }

1 0

Alexandre Julliard : user32: Don't assume global handles in CopyIcon.
by Alexandre Julliard 23 Dec '09

23 Dec '09

Module: wine Branch: master Commit: 0f511f3c8e3105b00953648a8a072bfaada94ea3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f511f3c8e3105b00953648a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 22 17:13:49 2009 +0100 user32: Don't assume global handles in CopyIcon. --- dlls/user32/cursoricon.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 90f8356..2b2151a 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1451,11 +1451,12 @@ HICON WINAPI CopyIcon( HICON hIcon ) { CURSORICONINFO *ptrOld, *ptrNew; int size; - HICON16 hOld = HICON_16(hIcon); HICON hNew; if (!(ptrOld = wow_handlers.get_icon_ptr( hIcon ))) return 0; - size = GlobalSize16( hOld ); + size = sizeof(CURSORICONINFO); + size += ptrOld->nHeight * get_bitmap_width_bytes( ptrOld->nWidth, 1 ); /* and bitmap */ + size += ptrOld->nHeight * ptrOld->nWidthBytes; /* xor bitmap */ hNew = wow_handlers.alloc_icon_handle( size ); ptrNew = wow_handlers.get_icon_ptr( hNew ); memcpy( ptrNew, ptrOld, size );

1 0

Alexandre Julliard : user32: Call the cursor/ icon handle allocation functions through the WoW handlers table.
by Alexandre Julliard 23 Dec '09

23 Dec '09

Module: wine Branch: master Commit: b36ca4860803aa076e138537347edaa872da9c72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b36ca4860803aa076e1385373… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 22 17:06:50 2009 +0100 user32: Call the cursor/icon handle allocation functions through the WoW handlers table. --- dlls/user32/controls.h | 4 ++ dlls/user32/cursoricon.c | 75 ++++++++++++++++----------------------------- dlls/user32/msg16.c | 33 +++++++++++++++++++- dlls/user32/winproc.c | 28 ++++++++++++++++- 4 files changed, 90 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b36ca4860803aa076e138…

1 0

Alexandre Julliard : user32: Add wrapper functions for manipulation of cursor/icon handles.
by Alexandre Julliard 23 Dec '09

23 Dec '09

Module: wine Branch: master Commit: 0280f058f9b2f9ec761e46efd10bcac950dd178e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0280f058f9b2f9ec761e46efd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 22 17:04:33 2009 +0100 user32: Add wrapper functions for manipulation of cursor/icon handles. --- dlls/user32/cursoricon.c | 110 ++++++++++++++++++++++++++++----------------- dlls/user32/user16.c | 53 +++++++++++++++------- 2 files changed, 105 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0280f058f9b2f9ec761e4…

1 0

Alexandre Julliard : user32: Reimplement MENU_FindSubMenu on the 16-bit side using only exported functions .
by Alexandre Julliard 23 Dec '09

23 Dec '09

Module: wine Branch: master Commit: 00e75f2b9eb117b95e9024c16fa916c3b3f7460d URL: http://source.winehq.org/git/wine.git/?a=commit;h=00e75f2b9eb117b95e9024c16… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 22 17:00:12 2009 +0100 user32: Reimplement MENU_FindSubMenu on the 16-bit side using only exported functions. --- dlls/user32/controls.h | 1 - dlls/user32/menu.c | 2 +- dlls/user32/msg16.c | 22 ++++++++++++++++++++-- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index f9752ee..9392cbe 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -158,7 +158,6 @@ extern void MENU_TrackMouseMenuBar( HWND hwnd, INT ht, POINT pt ) DECLSPEC_HIDDE extern void MENU_TrackKbdMenuBar( HWND hwnd, UINT wParam, WCHAR wChar ) DECLSPEC_HIDDEN; extern UINT MENU_DrawMenuBar( HDC hDC, LPRECT lprect, HWND hwnd, BOOL suppress_draw ) DECLSPEC_HIDDEN; -extern UINT MENU_FindSubMenu( HMENU *hmenu, HMENU hSubTarget ) DECLSPEC_HIDDEN; extern void MENU_EndMenu(HWND) DECLSPEC_HIDDEN; /* nonclient area */ diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 9205146..0f083ff 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -656,7 +656,7 @@ static MENUITEM *MENU_FindItem( HMENU *hmenu, UINT *nPos, UINT wFlags ) * *hmenu in case it is found in another sub-menu. * If the submenu cannot be found, NO_SELECTED_ITEM is returned. */ -UINT MENU_FindSubMenu( HMENU *hmenu, HMENU hSubTarget ) +static UINT MENU_FindSubMenu( HMENU *hmenu, HMENU hSubTarget ) { POPUPMENU *menu; UINT i; diff --git a/dlls/user32/msg16.c b/dlls/user32/msg16.c index 0866875..672e4a2 100644 --- a/dlls/user32/msg16.c +++ b/dlls/user32/msg16.c @@ -587,6 +587,24 @@ static HANDLE16 convert_handle_32_to_16(UINT_PTR src, unsigned int flags) return dst; } +static int find_sub_menu( HMENU *hmenu, HMENU16 target ) +{ + int i, pos, count = GetMenuItemCount( *hmenu ); + + for (i = 0; i < count; i++) + { + HMENU sub = GetSubMenu( *hmenu, i ); + if (!sub) continue; + if (HMENU_16(sub) == target) return i; + if ((pos = find_sub_menu( &sub, target )) != -1) + { + *hmenu = sub; + return pos; + } + } + return -1; +} + /********************************************************************** * WINPROC_CallProc16To32A */ @@ -825,8 +843,8 @@ LRESULT WINPROC_CallProc16To32A( winproc_callback_t callback, HWND16 hwnd, UINT1 if((LOWORD(lParam) & MF_POPUP) && (LOWORD(lParam) != 0xFFFF)) { HMENU hmenu = HMENU_32(HIWORD(lParam)); - UINT pos = MENU_FindSubMenu( &hmenu, HMENU_32(wParam) ); - if (pos == 0xffff) pos = 0; /* NO_SELECTED_ITEM */ + int pos = find_sub_menu( &hmenu, wParam ); + if (pos == -1) pos = 0; wParam = pos; } ret = callback( hwnd32, msg, MAKEWPARAM( wParam, LOWORD(lParam) ),

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2009