May 2018 - Wine-devel - list.winehq.org

[PATCH 4/6] urlmon: Support querying interfaces from aggregated handlers in BindProtocol.
by Jacek Caban 09 May '18

09 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/urlmon/bindprot.c | 5 +++++ 1 file changed, 5 insertions(+)

1 0

[PATCH 2/6] urlmon: Use COM aggregation for urlmon protocols in BindProtocol::StartEx.
by Jacek Caban 09 May '18

09 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/urlmon/binding.c | 2 +- dlls/urlmon/bindprot.c | 30 ++++++++++-------------------- dlls/urlmon/session.c | 2 +- dlls/urlmon/tests/url.c | 4 ++-- dlls/urlmon/urlmon_main.h | 3 +-- 5 files changed, 15 insertions(+), 26 deletions(-)

1 0

[PATCH 1/6] urlmon: Use protocol handler's IUnknown to query other interfaces in BindProtocol.
by Jacek Caban 09 May '18

09 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/urlmon/bindprot.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)

1 0

[v4 PATCH] user32/menu: Return locked menu data when looking for menu items.
by Nikolay Sivov 09 May '18

09 May '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v4: changed helper interface, simplified insertion point logic a bit. dlls/user32/menu.c | 556 ++++++++++++++++++++++++++++----------------- 1 file changed, 348 insertions(+), 208 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 537c2ebe1a..98f1fce506 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -584,26 +584,25 @@ static UINT MENU_GetStartOfPrevColumn( return i; } - - -/*********************************************************************** - * MENU_FindItem - * - * Find a menu item. Return a pointer on the item, and modifies *hmenu - * in case the item was in a sub-menu. - */ -static MENUITEM *MENU_FindItem( HMENU *hmenu, UINT *nPos, UINT wFlags ) +static POPUPMENU *find_menu_item(HMENU hmenu, UINT id, UINT flags, UINT *pos) { + UINT fallback_pos = ~0u, i; POPUPMENU *menu; - MENUITEM *fallback = NULL; - UINT fallback_pos = 0; - UINT i; - if ((*hmenu == (HMENU)0xffff) || (!(menu = MENU_GetMenu(*hmenu)))) return NULL; - if (wFlags & MF_BYPOSITION) + menu = grab_menu_ptr(hmenu); + if (!menu) + return NULL; + + if (flags & MF_BYPOSITION) { - if (*nPos >= menu->nItems) return NULL; - return &menu->items[*nPos]; + if (id >= menu->nItems) + { + release_menu_ptr(menu); + return NULL; + } + + if (pos) *pos = id; + return menu; } else { @@ -612,32 +611,36 @@ static MENUITEM *MENU_FindItem( HMENU *hmenu, UINT *nPos, UINT wFlags ) { if (item->fType & MF_POPUP) { - HMENU hsubmenu = item->hSubMenu; - MENUITEM *subitem = MENU_FindItem( &hsubmenu, nPos, wFlags ); - if (subitem) - { - *hmenu = hsubmenu; - return subitem; - } - else if (item->wID == *nPos) + POPUPMENU *submenu = find_menu_item(item->hSubMenu, id, flags, pos); + + if (submenu) + { + release_menu_ptr(menu); + return submenu; + } + else if (item->wID == id) { /* fallback to this item if nothing else found */ fallback_pos = i; - fallback = item; } } - else if (item->wID == *nPos) + else if (item->wID == id) { - *nPos = i; - return item; + if (pos) *pos = i; + return menu; } } } - if (fallback) - *nPos = fallback_pos; + if (fallback_pos != ~0u) + *pos = fallback_pos; + else + { + release_menu_ptr(menu); + menu = NULL; + } - return fallback; + return menu; } /*********************************************************************** @@ -2131,30 +2134,22 @@ static void MENU_MoveSelection( HWND hwndOwner, HMENU hmenu, INT offset ) /********************************************************************** - * MENU_InsertItem + * insert_menu_item * * Insert (allocate) a new item into a menu. */ -static MENUITEM *MENU_InsertItem( HMENU hMenu, UINT pos, UINT flags ) +static POPUPMENU *insert_menu_item(HMENU hMenu, UINT id, UINT flags, UINT *ret_pos) { MENUITEM *newItems; POPUPMENU *menu; - - if (!(menu = MENU_GetMenu(hMenu))) - return NULL; + UINT pos = id; /* Find where to insert new item */ - - if (flags & MF_BYPOSITION) { - if (pos > menu->nItems) - pos = menu->nItems; - } else { - if (!MENU_FindItem( &hMenu, &pos, flags )) - pos = menu->nItems; - else { - if (!(menu = MENU_GetMenu( hMenu ))) - return NULL; - } + if (!(menu = find_menu_item(hMenu, id, flags, &pos))) + { + if (!(menu = grab_menu_ptr(hMenu))) + return NULL; + pos = menu->nItems; } /* Make sure that MDI system buttons stay on the right side. @@ -2172,6 +2167,7 @@ static MENUITEM *MENU_InsertItem( HMENU hMenu, UINT pos, UINT flags ) newItems = HeapAlloc( GetProcessHeap(), 0, sizeof(MENUITEM) * (menu->nItems+1) ); if (!newItems) { + release_menu_ptr(menu); WARN("allocation failed\n" ); return NULL; } @@ -2187,7 +2183,9 @@ static MENUITEM *MENU_InsertItem( HMENU hMenu, UINT pos, UINT flags ) menu->nItems++; memset( &newItems[pos], 0, sizeof(*newItems) ); menu->Height = 0; /* force size recalculate */ - return &newItems[pos]; + + *ret_pos = pos; + return menu; } @@ -3706,13 +3704,19 @@ BOOL WINAPI ChangeMenuW( HMENU hMenu, UINT pos, LPCWSTR data, */ DWORD WINAPI CheckMenuItem( HMENU hMenu, UINT id, UINT flags ) { + POPUPMENU *menu; MENUITEM *item; DWORD ret; + UINT pos; + + if (!(menu = find_menu_item(hMenu, id, flags, &pos))) + return -1; + item = &menu->items[pos]; - if (!(item = MENU_FindItem( &hMenu, &id, flags ))) return -1; ret = item->fState & MF_CHECKED; if (flags & MF_CHECKED) item->fState |= MF_CHECKED; else item->fState &= ~MF_CHECKED; + release_menu_ptr(menu); return ret; } @@ -3720,42 +3724,48 @@ DWORD WINAPI CheckMenuItem( HMENU hMenu, UINT id, UINT flags ) /********************************************************************** * EnableMenuItem (USER32.@) */ -BOOL WINAPI EnableMenuItem( HMENU hMenu, UINT wItemID, UINT wFlags ) +BOOL WINAPI EnableMenuItem( HMENU hMenu, UINT id, UINT wFlags ) { - UINT oldflags; - MENUITEM *item; + UINT oldflags, pos; POPUPMENU *menu; + MENUITEM *item; - TRACE("(%p, %04x, %04x) !\n", hMenu, wItemID, wFlags); + TRACE("(%p, %04x, %04x)\n", hMenu, id, wFlags); /* Get the Popupmenu to access the owner menu */ - if (!(menu = MENU_GetMenu(hMenu))) - return (UINT)-1; - - if (!(item = MENU_FindItem( &hMenu, &wItemID, wFlags ))) + if (!(menu = find_menu_item(hMenu, id, wFlags, &pos))) return (UINT)-1; + item = &menu->items[pos]; oldflags = item->fState & (MF_GRAYED | MF_DISABLED); item->fState ^= (oldflags ^ wFlags) & (MF_GRAYED | MF_DISABLED); /* If the close item in the system menu change update the close button */ - if((item->wID == SC_CLOSE) && (oldflags != wFlags)) + if ((item->wID == SC_CLOSE) && (oldflags != wFlags)) { - if (menu->hSysMenuOwner != 0) + if (menu->hSysMenuOwner) { RECT rc; POPUPMENU* parentMenu; + HWND hwnd; /* Get the parent menu to access*/ - if (!(parentMenu = MENU_GetMenu(menu->hSysMenuOwner))) - return (UINT)-1; + parentMenu = grab_menu_ptr(menu->hSysMenuOwner); + release_menu_ptr(menu); + if (!parentMenu) + return (UINT)-1; + + hwnd = parentMenu->hWnd; + release_menu_ptr(parentMenu); /* Refresh the frame to reflect the change */ - WIN_GetRectangles( parentMenu->hWnd, COORDS_CLIENT, &rc, NULL ); + WIN_GetRectangles( hwnd, COORDS_CLIENT, &rc, NULL ); rc.bottom = 0; - RedrawWindow(parentMenu->hWnd, &rc, 0, RDW_FRAME | RDW_INVALIDATE | RDW_NOCHILDREN); + RedrawWindow(hwnd, &rc, 0, RDW_FRAME | RDW_INVALIDATE | RDW_NOCHILDREN); } } + else + release_menu_ptr(menu); return oldflags; } @@ -3770,21 +3780,37 @@ INT WINAPI GetMenuStringA( LPSTR str, /* [out] outbuffer. If NULL, func returns entry length*/ INT nMaxSiz, /* [in] length of buffer. if 0, func returns entry len*/ UINT wFlags /* [in] MF_ flags */ -) { +) +{ + POPUPMENU *menu; MENUITEM *item; + UINT pos; + INT ret; TRACE("menu=%p item=%04x ptr=%p len=%d flags=%04x\n", hMenu, wItemID, str, nMaxSiz, wFlags ); if (str && nMaxSiz) str[0] = '\0'; - if (!(item = MENU_FindItem( &hMenu, &wItemID, wFlags ))) { + + if (!(menu = find_menu_item(hMenu, wItemID, wFlags, &pos))) + { SetLastError( ERROR_MENU_ITEM_NOT_FOUND); return 0; } - if (!item->text) return 0; - if (!str || !nMaxSiz) return WideCharToMultiByte( CP_ACP, 0, item->text, -1, NULL, 0, NULL, NULL ); - if (!WideCharToMultiByte( CP_ACP, 0, item->text, -1, str, nMaxSiz, NULL, NULL )) - str[nMaxSiz-1] = 0; + item = &menu->items[pos]; + + if (!item->text) + ret = 0; + else if (!str || !nMaxSiz) + ret = WideCharToMultiByte( CP_ACP, 0, item->text, -1, NULL, 0, NULL, NULL ); + else + { + if (!WideCharToMultiByte( CP_ACP, 0, item->text, -1, str, nMaxSiz, NULL, NULL )) + str[nMaxSiz-1] = 0; + ret = strlen(str); + } + release_menu_ptr(menu); + TRACE("returning %s\n", debugstr_a(str)); - return strlen(str); + return ret; } @@ -3794,22 +3820,37 @@ INT WINAPI GetMenuStringA( INT WINAPI GetMenuStringW( HMENU hMenu, UINT wItemID, LPWSTR str, INT nMaxSiz, UINT wFlags ) { + POPUPMENU *menu; MENUITEM *item; + UINT pos; + INT ret; TRACE("menu=%p item=%04x ptr=%p len=%d flags=%04x\n", hMenu, wItemID, str, nMaxSiz, wFlags ); if (str && nMaxSiz) str[0] = '\0'; - if (!(item = MENU_FindItem( &hMenu, &wItemID, wFlags ))) { + + if (!(menu = find_menu_item(hMenu, wItemID, wFlags, &pos))) + { SetLastError( ERROR_MENU_ITEM_NOT_FOUND); return 0; } - if (!str || !nMaxSiz) return item->text ? strlenW(item->text) : 0; - if( !(item->text)) { + item = &menu->items[pos]; + + if (!str || !nMaxSiz) + ret = item->text ? strlenW(item->text) : 0; + else if (!item->text) + { str[0] = 0; - return 0; + ret = 0; + } + else + { + lstrcpynW( str, item->text, nMaxSiz ); + ret = strlenW(str); } - lstrcpynW( str, item->text, nMaxSiz ); + release_menu_ptr(menu); + TRACE("returning %s\n", debugstr_w(str)); - return strlenW(str); + return ret; } @@ -3819,13 +3860,19 @@ INT WINAPI GetMenuStringW( HMENU hMenu, UINT wItemID, BOOL WINAPI HiliteMenuItem( HWND hWnd, HMENU hMenu, UINT wItemID, UINT wHilite ) { - LPPOPUPMENU menu; + POPUPMENU *menu; + UINT pos; + TRACE("(%p, %p, %04x, %04x);\n", hWnd, hMenu, wItemID, wHilite); - if (!MENU_FindItem( &hMenu, &wItemID, wHilite )) return FALSE; - if (!(menu = MENU_GetMenu(hMenu))) return FALSE; - if (menu->FocusedItem == wItemID) return TRUE; - MENU_HideSubPopups( hWnd, hMenu, FALSE, 0 ); - MENU_SelectItem( hWnd, hMenu, wItemID, TRUE, 0 ); + + if (!(menu = find_menu_item(hMenu, wItemID, wHilite, &pos))) return FALSE; + + if (menu->FocusedItem != pos) + { + MENU_HideSubPopups( hWnd, menu->obj.handle, FALSE, 0 ); + MENU_SelectItem( hWnd, menu->obj.handle, pos, TRUE, 0 ); + } + release_menu_ptr(menu); return TRUE; } @@ -3835,23 +3882,35 @@ BOOL WINAPI HiliteMenuItem( HWND hWnd, HMENU hMenu, UINT wItemID, */ UINT WINAPI GetMenuState( HMENU hMenu, UINT wItemID, UINT wFlags ) { + POPUPMENU *menu; + UINT state, pos; MENUITEM *item; + TRACE("(menu=%p, id=%04x, flags=%04x);\n", hMenu, wItemID, wFlags); - if (!(item = MENU_FindItem( &hMenu, &wItemID, wFlags ))) return -1; + + if (!(menu = find_menu_item(hMenu, wItemID, wFlags, &pos))) + return -1; + + item = &menu->items[pos]; debug_print_menuitem (" item: ", item, ""); if (item->fType & MF_POPUP) { - POPUPMENU *menu = MENU_GetMenu( item->hSubMenu ); - if (!menu) return -1; - else return (menu->nItems << 8) | ((item->fState|item->fType) & 0xff); + POPUPMENU *submenu = grab_menu_ptr(item->hSubMenu); + if (submenu) + state = (submenu->nItems << 8) | ((item->fState | item->fType) & 0xff); + else + state = -1; + release_menu_ptr(submenu); } else { /* We used to (from way back then) mask the result to 0xff. */ /* I don't know why and it seems wrong as the documented */ /* return flag MF_SEPARATOR is outside that mask. */ - return (item->fType | item->fState); + state = (item->fType | item->fState); } + release_menu_ptr(menu); + return state; } @@ -3877,12 +3936,15 @@ INT WINAPI GetMenuItemCount( HMENU hMenu ) */ UINT WINAPI GetMenuItemID( HMENU hMenu, INT nPos ) { - MENUITEM * lpmi; + POPUPMENU *menu; + UINT id, pos; - if (!(lpmi = MENU_FindItem(&hMenu,(UINT*)&nPos,MF_BYPOSITION))) return -1; - if (lpmi->fType & MF_POPUP) return -1; - return lpmi->wID; + if (!(menu = find_menu_item(hMenu, nPos, MF_BYPOSITION, &pos))) + return -1; + id = menu->items[pos].fType & MF_POPUP ? -1 : menu->items[pos].wID; + release_menu_ptr(menu); + return id; } @@ -3935,8 +3997,11 @@ static void MENU_mnu2mnuii( UINT flags, UINT_PTR id, LPCWSTR str, BOOL WINAPI InsertMenuW( HMENU hMenu, UINT pos, UINT flags, UINT_PTR id, LPCWSTR str ) { - MENUITEM *item; MENUITEMINFOW mii; + POPUPMENU *menu; + MENUITEM *item; + UINT newpos; + BOOL ret; if (IS_STRING_ITEM(flags) && str) TRACE("hMenu %p, pos %d, flags %08x, id %04lx, str %s\n", @@ -3944,16 +4009,20 @@ BOOL WINAPI InsertMenuW( HMENU hMenu, UINT pos, UINT flags, else TRACE("hMenu %p, pos %d, flags %08x, id %04lx, str %p (not a string)\n", hMenu, pos, flags, id, str ); - if (!(item = MENU_InsertItem( hMenu, pos, flags ))) return FALSE; + if (!(menu = insert_menu_item(hMenu, pos, flags, &newpos))) + return FALSE; + MENU_mnu2mnuii( flags, id, str, &mii); - if (!(SetMenuItemInfo_common( item, &mii, TRUE))) - { + + item = &menu->items[newpos]; + ret = SetMenuItemInfo_common( item, &mii, TRUE); + if (ret) + item->hCheckBit = item->hUnCheckBit = 0; + else RemoveMenu( hMenu, pos, flags ); - return FALSE; - } + release_menu_ptr(menu); - item->hCheckBit = item->hUnCheckBit = 0; - return TRUE; + return ret; } @@ -4006,16 +4075,16 @@ BOOL WINAPI AppendMenuW( HMENU hMenu, UINT flags, */ BOOL WINAPI RemoveMenu( HMENU hMenu, UINT nPos, UINT wFlags ) { - LPPOPUPMENU menu; - MENUITEM *item; + POPUPMENU *menu; + UINT pos; TRACE("(menu=%p pos=%04x flags=%04x)\n",hMenu, nPos, wFlags); - if (!(item = MENU_FindItem( &hMenu, &nPos, wFlags ))) return FALSE; - if (!(menu = MENU_GetMenu(hMenu))) return FALSE; - /* Remove item */ + if (!(menu = find_menu_item(hMenu, nPos, wFlags, &pos))) + return FALSE; - MENU_FreeItemData( item ); + /* Remove item */ + MENU_FreeItemData( &menu->items[pos] ); if (--menu->nItems == 0) { @@ -4024,17 +4093,19 @@ BOOL WINAPI RemoveMenu( HMENU hMenu, UINT nPos, UINT wFlags ) } else { - MENUITEM *new_items; - while(nPos < menu->nItems) + MENUITEM *new_items, *item = &menu->items[pos]; + + while (nPos < menu->nItems) { *item = *(item+1); item++; nPos++; } - new_items = HeapReAlloc( GetProcessHeap(), 0, menu->items, - menu->nItems * sizeof(MENUITEM) ); + new_items = HeapReAlloc( GetProcessHeap(), 0, menu->items, menu->nItems * sizeof(MENUITEM) ); if (new_items) menu->items = new_items; } + release_menu_ptr(menu); + return TRUE; } @@ -4044,11 +4115,17 @@ BOOL WINAPI RemoveMenu( HMENU hMenu, UINT nPos, UINT wFlags ) */ BOOL WINAPI DeleteMenu( HMENU hMenu, UINT nPos, UINT wFlags ) { - MENUITEM *item = MENU_FindItem( &hMenu, &nPos, wFlags ); - if (!item) return FALSE; - if (item->fType & MF_POPUP) DestroyMenu( item->hSubMenu ); - /* nPos is now the position of the item */ - RemoveMenu( hMenu, nPos, wFlags | MF_BYPOSITION ); + POPUPMENU *menu; + UINT pos; + + if (!(menu = find_menu_item(hMenu, nPos, wFlags, &pos))) + return FALSE; + + if (menu->items[pos].fType & MF_POPUP) + DestroyMenu(menu->items[pos].hSubMenu); + + RemoveMenu(menu->obj.handle, pos, wFlags | MF_BYPOSITION); + release_menu_ptr(menu); return TRUE; } @@ -4059,23 +4136,27 @@ BOOL WINAPI DeleteMenu( HMENU hMenu, UINT nPos, UINT wFlags ) BOOL WINAPI ModifyMenuW( HMENU hMenu, UINT pos, UINT flags, UINT_PTR id, LPCWSTR str ) { - MENUITEM *item; MENUITEMINFOW mii; + POPUPMENU *menu; + UINT item_pos; + BOOL ret; if (IS_STRING_ITEM(flags)) TRACE("%p %d %04x %04lx %s\n", hMenu, pos, flags, id, debugstr_w(str) ); else TRACE("%p %d %04x %04lx %p\n", hMenu, pos, flags, id, str ); - if (!(item = MENU_FindItem( &hMenu, &pos, flags ))) + if (!(menu = find_menu_item(hMenu, pos, flags, &item_pos))) { /* workaround for Word 95: pretend that SC_TASKLIST item exists */ if (pos == SC_TASKLIST && !(flags & MF_BYPOSITION)) return TRUE; return FALSE; } - MENU_GetMenu(hMenu)->Height = 0; /* force size recalculate */ + menu->Height = 0; /* force size recalculate */ MENU_mnu2mnuii( flags, id, str, &mii); - return SetMenuItemInfo_common( item, &mii, TRUE); + ret = SetMenuItemInfo_common(&menu->items[item_pos], &mii, TRUE); + release_menu_ptr(menu); + return ret; } @@ -4134,20 +4215,26 @@ DWORD WINAPI GetMenuCheckMarkDimensions(void) BOOL WINAPI SetMenuItemBitmaps( HMENU hMenu, UINT nPos, UINT wFlags, HBITMAP hNewUnCheck, HBITMAP hNewCheck) { + POPUPMENU *menu; MENUITEM *item; + UINT pos; - if (!(item = MENU_FindItem( &hMenu, &nPos, wFlags ))) return FALSE; + if (!(menu = find_menu_item(hMenu, nPos, wFlags, &pos))) + return FALSE; + item = &menu->items[pos]; if (!hNewCheck && !hNewUnCheck) { - item->fState &= ~MF_USECHECKBITMAPS; + item->fState &= ~MF_USECHECKBITMAPS; } else /* Install new bitmaps */ { - item->hCheckBit = hNewCheck; - item->hUnCheckBit = hNewUnCheck; - item->fState |= MF_USECHECKBITMAPS; + item->hCheckBit = hNewCheck; + item->hUnCheckBit = hNewUnCheck; + item->fState |= MF_USECHECKBITMAPS; } + release_menu_ptr(menu); + return TRUE; } @@ -4418,11 +4505,20 @@ BOOL WINAPI SetMenu( HWND hWnd, HMENU hMenu ) */ HMENU WINAPI GetSubMenu( HMENU hMenu, INT nPos ) { - MENUITEM * lpmi; + POPUPMENU *menu; + HMENU submenu; + UINT pos; + + if (!(menu = find_menu_item(hMenu, nPos, MF_BYPOSITION, &pos))) + return 0; - if (!(lpmi = MENU_FindItem(&hMenu,(UINT*)&nPos,MF_BYPOSITION))) return 0; - if (!(lpmi->fType & MF_POPUP)) return 0; - return lpmi->hSubMenu; + if (menu->items[pos].fType & MF_POPUP) + submenu = menu->items[pos].hSubMenu; + else + submenu = 0; + + release_menu_ptr(menu); + return submenu; } @@ -4631,31 +4727,39 @@ BOOL WINAPI IsMenu(HMENU hmenu) * GetMenuItemInfo_common */ -static BOOL GetMenuItemInfo_common ( HMENU hmenu, UINT item, BOOL bypos, +static BOOL GetMenuItemInfo_common ( HMENU hmenu, UINT id, BOOL bypos, LPMENUITEMINFOW lpmii, BOOL unicode) { - MENUITEM *menu = MENU_FindItem (&hmenu, &item, bypos ? MF_BYPOSITION : 0); + POPUPMENU *menu; + MENUITEM *item; + UINT pos; - debug_print_menuitem("GetMenuItemInfo_common: ", menu, ""); + menu = find_menu_item(hmenu, id, bypos ? MF_BYPOSITION : 0, &pos); - if (!menu) { + item = menu ? &menu->items[pos] : NULL; + + debug_print_menuitem("GetMenuItemInfo_common: ", item, ""); + + if (!menu) + { SetLastError( ERROR_MENU_ITEM_NOT_FOUND); return FALSE; } if( lpmii->fMask & MIIM_TYPE) { if( lpmii->fMask & ( MIIM_STRING | MIIM_FTYPE | MIIM_BITMAP)) { + release_menu_ptr(menu); WARN("invalid combination of fMask bits used\n"); /* this does not happen on Win9x/ME */ SetLastError( ERROR_INVALID_PARAMETER); return FALSE; } - lpmii->fType = menu->fType & MENUITEMINFO_TYPE_MASK; - if (menu->hbmpItem && !IS_MAGIC_BITMAP(menu->hbmpItem)) + lpmii->fType = item->fType & MENUITEMINFO_TYPE_MASK; + if (item->hbmpItem && !IS_MAGIC_BITMAP(item->hbmpItem)) lpmii->fType |= MFT_BITMAP; - lpmii->hbmpItem = menu->hbmpItem; /* not on Win9x/ME */ + lpmii->hbmpItem = item->hbmpItem; /* not on Win9x/ME */ if( lpmii->fType & MFT_BITMAP) { - lpmii->dwTypeData = (LPWSTR) menu->hbmpItem; + lpmii->dwTypeData = (LPWSTR) item->hbmpItem; lpmii->cch = 0; } else if( lpmii->fType & (MFT_OWNERDRAW | MFT_SEPARATOR)) { /* this does not happen on Win9x/ME */ @@ -4666,7 +4770,7 @@ static BOOL GetMenuItemInfo_common ( HMENU hmenu, UINT item, BOOL bypos, /* copy the text string */ if ((lpmii->fMask & (MIIM_TYPE|MIIM_STRING))) { - if( !menu->text ) { + if (!item->text) { if(lpmii->dwTypeData && lpmii->cch) { if( unicode) *((WCHAR *)lpmii->dwTypeData) = 0; @@ -4678,16 +4782,16 @@ static BOOL GetMenuItemInfo_common ( HMENU hmenu, UINT item, BOOL bypos, int len; if (unicode) { - len = strlenW(menu->text); + len = strlenW(item->text); if(lpmii->dwTypeData && lpmii->cch) - lstrcpynW(lpmii->dwTypeData, menu->text, lpmii->cch); + lstrcpynW(lpmii->dwTypeData, item->text, lpmii->cch); } else { - len = WideCharToMultiByte( CP_ACP, 0, menu->text, -1, NULL, + len = WideCharToMultiByte( CP_ACP, 0, item->text, -1, NULL, 0, NULL, NULL ) - 1; if(lpmii->dwTypeData && lpmii->cch) - if (!WideCharToMultiByte( CP_ACP, 0, menu->text, -1, + if (!WideCharToMultiByte( CP_ACP, 0, item->text, -1, (LPSTR)lpmii->dwTypeData, lpmii->cch, NULL, NULL )) ((LPSTR)lpmii->dwTypeData)[lpmii->cch - 1] = 0; } @@ -4706,19 +4810,19 @@ static BOOL GetMenuItemInfo_common ( HMENU hmenu, UINT item, BOOL bypos, } if (lpmii->fMask & MIIM_FTYPE) - lpmii->fType = menu->fType & MENUITEMINFO_TYPE_MASK; + lpmii->fType = item->fType & MENUITEMINFO_TYPE_MASK; if (lpmii->fMask & MIIM_BITMAP) - lpmii->hbmpItem = menu->hbmpItem; + lpmii->hbmpItem = item->hbmpItem; if (lpmii->fMask & MIIM_STATE) - lpmii->fState = menu->fState & MENUITEMINFO_STATE_MASK; + lpmii->fState = item->fState & MENUITEMINFO_STATE_MASK; if (lpmii->fMask & MIIM_ID) - lpmii->wID = menu->wID; + lpmii->wID = item->wID; if (lpmii->fMask & MIIM_SUBMENU) - lpmii->hSubMenu = menu->hSubMenu; + lpmii->hSubMenu = item->hSubMenu; else { /* hSubMenu is always cleared * (not on Win9x/ME ) */ @@ -4726,13 +4830,14 @@ static BOOL GetMenuItemInfo_common ( HMENU hmenu, UINT item, BOOL bypos, } if (lpmii->fMask & MIIM_CHECKMARKS) { - lpmii->hbmpChecked = menu->hCheckBit; - lpmii->hbmpUnchecked = menu->hUnCheckBit; + lpmii->hbmpChecked = item->hCheckBit; + lpmii->hbmpUnchecked = item->hUnCheckBit; } if (lpmii->fMask & MIIM_DATA) - lpmii->dwItemData = menu->dwItemData; + lpmii->dwItemData = item->dwItemData; - return TRUE; + release_menu_ptr(menu); + return TRUE; } /********************************************************************** @@ -4949,20 +5054,24 @@ static BOOL MENU_NormalizeMenuItemInfoStruct( const MENUITEMINFOW *pmii_in, BOOL WINAPI SetMenuItemInfoA(HMENU hmenu, UINT item, BOOL bypos, const MENUITEMINFOA *lpmii) { - MENUITEM *menuitem; MENUITEMINFOW mii; + POPUPMENU *menu; + UINT pos; + BOOL ret; TRACE("hmenu %p, item %u, by pos %d, info %p\n", hmenu, item, bypos, lpmii); if (!MENU_NormalizeMenuItemInfoStruct( (const MENUITEMINFOW *)lpmii, &mii )) return FALSE; - if (!(menuitem = MENU_FindItem( &hmenu, &item, bypos? MF_BYPOSITION : 0 ))) + if (!(menu = find_menu_item(hmenu, item, bypos ? MF_BYPOSITION : 0, &pos))) { /* workaround for Word 95: pretend that SC_TASKLIST item exists */ if (item == SC_TASKLIST && !bypos) return TRUE; return FALSE; } - return SetMenuItemInfo_common( menuitem, &mii, FALSE ); + ret = SetMenuItemInfo_common(&menu->items[pos], &mii, FALSE); + release_menu_ptr(menu); + return ret; } /********************************************************************** @@ -4971,19 +5080,25 @@ BOOL WINAPI SetMenuItemInfoA(HMENU hmenu, UINT item, BOOL bypos, BOOL WINAPI SetMenuItemInfoW(HMENU hmenu, UINT item, BOOL bypos, const MENUITEMINFOW *lpmii) { - MENUITEM *menuitem; MENUITEMINFOW mii; + POPUPMENU *menu; + BOOL ret; + UINT pos; TRACE("hmenu %p, item %u, by pos %d, info %p\n", hmenu, item, bypos, lpmii); if (!MENU_NormalizeMenuItemInfoStruct( lpmii, &mii )) return FALSE; - if (!(menuitem = MENU_FindItem( &hmenu, &item, bypos? MF_BYPOSITION : 0 ))) + + if (!(menu = find_menu_item(hmenu, item, bypos ? MF_BYPOSITION : 0, &pos))) { /* workaround for Word 95: pretend that SC_TASKLIST item exists */ if (item == SC_TASKLIST && !bypos) return TRUE; return FALSE; } - return SetMenuItemInfo_common( menuitem, &mii, TRUE ); + + ret = SetMenuItemInfo_common(&menu->items[pos], &mii, TRUE); + release_menu_ptr(menu); + return ret; } static BOOL set_menu_default_item(POPUPMENU *menu, UINT uItem, UINT bypos) @@ -5090,15 +5205,21 @@ UINT WINAPI GetMenuDefaultItem(HMENU hmenu, UINT bypos, UINT flags) BOOL WINAPI InsertMenuItemA(HMENU hMenu, UINT uItem, BOOL bypos, const MENUITEMINFOA *lpmii) { - MENUITEM *item; MENUITEMINFOW mii; + POPUPMENU *menu; + UINT pos; + BOOL ret; TRACE("hmenu %p, item %04x, by pos %d, info %p\n", hMenu, uItem, bypos, lpmii); if (!MENU_NormalizeMenuItemInfoStruct( (const MENUITEMINFOW *)lpmii, &mii )) return FALSE; - item = MENU_InsertItem(hMenu, uItem, bypos ? MF_BYPOSITION : 0 ); - return SetMenuItemInfo_common(item, &mii, FALSE); + if (!(menu = insert_menu_item(hMenu, uItem, bypos ? MF_BYPOSITION : 0, &pos))) + return FALSE; + + ret = SetMenuItemInfo_common(&menu->items[pos], &mii, FALSE); + release_menu_ptr(menu); + return ret; } @@ -5108,64 +5229,77 @@ BOOL WINAPI InsertMenuItemA(HMENU hMenu, UINT uItem, BOOL bypos, BOOL WINAPI InsertMenuItemW(HMENU hMenu, UINT uItem, BOOL bypos, const MENUITEMINFOW *lpmii) { - MENUITEM *item; MENUITEMINFOW mii; + POPUPMENU *menu; + UINT pos; + BOOL ret; TRACE("hmenu %p, item %04x, by pos %d, info %p\n", hMenu, uItem, bypos, lpmii); if (!MENU_NormalizeMenuItemInfoStruct( lpmii, &mii )) return FALSE; - item = MENU_InsertItem(hMenu, uItem, bypos ? MF_BYPOSITION : 0 ); - return SetMenuItemInfo_common(item, &mii, TRUE); + if (!(menu = insert_menu_item(hMenu, uItem, bypos ? MF_BYPOSITION : 0, &pos))) + return FALSE; + + ret = SetMenuItemInfo_common(&menu->items[pos], &mii, TRUE); + release_menu_ptr(menu); + return ret; } /********************************************************************** * CheckMenuRadioItem (USER32.@) */ -BOOL WINAPI CheckMenuRadioItem(HMENU hMenu, - UINT first, UINT last, UINT check, - UINT bypos) +BOOL WINAPI CheckMenuRadioItem(HMENU hMenu, UINT first, UINT last, + UINT check, UINT flags) { + POPUPMENU *first_menu = NULL, *check_menu = NULL; + UINT i, first_pos, check_pos; BOOL done = FALSE; - UINT i; - MENUITEM *mi_first = NULL, *mi_check; - HMENU m_first, m_check; for (i = first; i <= last; i++) { - UINT pos = i; + MENUITEM *item; - if (!mi_first) + if (!first_menu) { - m_first = hMenu; - mi_first = MENU_FindItem(&m_first, &pos, bypos); - if (!mi_first) continue; - mi_check = mi_first; - m_check = m_first; + if (!(first_menu = find_menu_item(hMenu, i, flags, &first_pos))) + continue; + + check_pos = first_pos; + check_menu = grab_menu_ptr(first_menu->obj.handle); } else { - m_check = hMenu; - mi_check = MENU_FindItem(&m_check, &pos, bypos); - if (!mi_check) continue; + if (!(check_menu = find_menu_item(hMenu, i, flags, &check_pos))) + continue; } - if (m_first != m_check) continue; - if (mi_check->fType == MFT_SEPARATOR) continue; - - if (i == check) + if (first_menu != check_menu) { - mi_check->fType |= MFT_RADIOCHECK; - mi_check->fState |= MFS_CHECKED; - done = TRUE; + release_menu_ptr(check_menu); + continue; } - else + + item = &check_menu->items[check_pos]; + if (item->fType != MFT_SEPARATOR) { - /* MSDN is wrong, Windows does not remove MFT_RADIOCHECK */ - mi_check->fState &= ~MFS_CHECKED; + if (i == check) + { + item->fType |= MFT_RADIOCHECK; + item->fState |= MFS_CHECKED; + done = TRUE; + } + else + { + /* MSDN is wrong, Windows does not remove MFT_RADIOCHECK */ + item->fState &= ~MFS_CHECKED; + } } + + release_menu_ptr(check_menu); } + release_menu_ptr(first_menu); return done; } @@ -5181,27 +5315,30 @@ BOOL WINAPI CheckMenuRadioItem(HMENU hMenu, */ BOOL WINAPI GetMenuItemRect(HWND hwnd, HMENU hMenu, UINT uItem, RECT *rect) { - POPUPMENU *menu; - MENUITEM *item; - - TRACE("(%p,%p,%d,%p)\n", hwnd, hMenu, uItem, rect); + POPUPMENU *menu; + UINT pos; - item = MENU_FindItem (&hMenu, &uItem, MF_BYPOSITION); - if ((rect == NULL) || (item == NULL)) - return FALSE; + TRACE("(%p,%p,%d,%p)\n", hwnd, hMenu, uItem, rect); - menu = MENU_GetMenu(hMenu); - if (!menu) return FALSE; + if (!rect) + return FALSE; - if (!hwnd) hwnd = menu->hWnd; - if (!hwnd) return FALSE; + if (!(menu = find_menu_item(hMenu, uItem, MF_BYPOSITION, &pos))) + return FALSE; - *rect = item->rect; + if (!hwnd) hwnd = menu->hWnd; + if (!hwnd) + { + release_menu_ptr(menu); + return FALSE; + } - OffsetRect(rect, menu->items_rect.left, menu->items_rect.top); - MapWindowPoints(hwnd, 0, (POINT *)rect, 2); + *rect = menu->items[pos].rect; + OffsetRect(rect, menu->items_rect.left, menu->items_rect.top); + release_menu_ptr(menu); - return TRUE; + MapWindowPoints(hwnd, 0, (POINT *)rect, 2); + return TRUE; } /********************************************************************** @@ -5415,16 +5552,18 @@ static BOOL translate_accelerator( HWND hWnd, UINT message, WPARAM wParam, LPARA { HMENU hMenu, hSubMenu, hSysMenu; UINT uSysStat = (UINT)-1, uStat = (UINT)-1, nPos; + POPUPMENU *menu; hMenu = (GetWindowLongW( hWnd, GWL_STYLE ) & WS_CHILD) ? 0 : GetMenu(hWnd); hSysMenu = get_win_sys_menu( hWnd ); /* find menu item and ask application to initialize it */ /* 1. in the system menu */ - hSubMenu = hSysMenu; - nPos = cmd; - if(MENU_FindItem(&hSubMenu, &nPos, MF_BYCOMMAND)) + if ((menu = find_menu_item(hSysMenu, cmd, MF_BYCOMMAND, NULL))) { + hSubMenu = menu->obj.handle; + release_menu_ptr(menu); + if (GetCapture()) mesg = 2; if (!IsWindowEnabled(hWnd)) @@ -5443,10 +5582,11 @@ static BOOL translate_accelerator( HWND hWnd, UINT message, WPARAM wParam, LPARA } else /* 2. in the window's menu */ { - hSubMenu = hMenu; - nPos = cmd; - if(MENU_FindItem(&hSubMenu, &nPos, MF_BYCOMMAND)) + if ((menu = find_menu_item(hMenu, cmd, MF_BYCOMMAND, NULL))) { + hSubMenu = menu->obj.handle; + release_menu_ptr(menu); + if (GetCapture()) mesg = 2; if (!IsWindowEnabled(hWnd)) -- 2.17.0

2 2

[PATCH 2/2] ntdll/tests: Add tests for NtCreateToken.
by Hans Leidekker 09 May '18

09 May '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/ntdll/tests/om.c | 220 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 220 insertions(+) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 43c5ee46d7..91007d4646 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -69,6 +69,19 @@ static NTSTATUS (WINAPI *pNtWaitForKeyedEvent)( HANDLE, const void *, BOOLEAN, c static NTSTATUS (WINAPI *pNtReleaseKeyedEvent)( HANDLE, const void *, BOOLEAN, const LARGE_INTEGER * ); static NTSTATUS (WINAPI *pNtCreateIoCompletion)(PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES, ULONG); static NTSTATUS (WINAPI *pNtOpenIoCompletion)( PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES ); +static NTSTATUS (WINAPI *pNtCreateToken)( PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES, TOKEN_TYPE, PLUID, PLARGE_INTEGER, + PTOKEN_USER, PTOKEN_GROUPS, PTOKEN_PRIVILEGES, PTOKEN_OWNER, + PTOKEN_PRIMARY_GROUP, PTOKEN_DEFAULT_DACL, PTOKEN_SOURCE ); +static NTSTATUS (WINAPI *pNtOpenProcessToken)( HANDLE, DWORD, HANDLE * ); +static NTSTATUS (WINAPI *pNtQueryInformationToken)( HANDLE, TOKEN_INFORMATION_CLASS, PVOID, ULONG, PULONG ); +static NTSTATUS (WINAPI *pRtlAdjustPrivilege)( ULONG, BOOLEAN, BOOLEAN, PBOOLEAN ); +static NTSTATUS (WINAPI *pRtlAllocateAndInitializeSid)( PSID_IDENTIFIER_AUTHORITY, BYTE, DWORD, DWORD, DWORD, DWORD, + DWORD, DWORD, DWORD, DWORD, PSID * ); +static NTSTATUS (WINAPI *pNtAllocateLocallyUniqueId)( PLUID ); +static PVOID (WINAPI *pRtlAllocateHeap)( HANDLE, ULONG, SIZE_T ); +static BOOLEAN (WINAPI *pRtlFreeHeap)( HANDLE, ULONG, PVOID ); +static BOOLEAN (WINAPI *pRtlEqualSid)( PSID, PSID ); +static NTSTATUS (WINAPI *pRtlFreeSid)( PSID ); #define KEYEDEVENT_WAIT 0x0001 #define KEYEDEVENT_WAKE 0x0002 @@ -1979,6 +1992,202 @@ static void test_mutant(void) NtClose( mutant ); } +static void test_token(void) +{ + char buf[512]; + NTSTATUS status; + HANDLE token; + OBJECT_ATTRIBUTES attrs; + LUID session; + LARGE_INTEGER expiration; + SID_IDENTIFIER_AUTHORITY authority = {{ 0, 1, 2, 3, 4, 5 }}; + TOKEN_USER token_user, *token_user2; + TOKEN_GROUPS token_groups, *token_groups2; + TOKEN_PRIVILEGES token_privs, *token_privs2; + TOKEN_OWNER token_owner, *token_owner2; + TOKEN_PRIMARY_GROUP token_primary_group, *token_primary_group2; + TOKEN_SOURCE token_source, token_source2; + TOKEN_ORIGIN token_origin; + TOKEN_DEFAULT_DACL *token_default_dacl; + TOKEN_TYPE token_type; + BOOLEAN enabled; + ULONG len; + + if (pRtlAdjustPrivilege( SE_CREATE_TOKEN_PRIVILEGE, TRUE, FALSE, &enabled )) + { + /* This privilege is not assigned by default. Use the policy editor to assign it + to the Administrators group and reboot. Then elevate and re-run the test. */ + skip( "can't enable SeCreateTokenPrivilege\n" ); + return; + } + + status = pNtOpenProcessToken( NtCurrentProcess(), TOKEN_QUERY, &token ); + ok( !status, "got %08x\n", status ); + len = 0; + status = pNtQueryInformationToken( token, TokenDefaultDacl, NULL, 0, &len ); + ok( status == STATUS_BUFFER_TOO_SMALL, "got %08x\n", status ); + token_default_dacl = pRtlAllocateHeap( GetProcessHeap(), 0, len ); + status = pNtQueryInformationToken( token, TokenDefaultDacl, token_default_dacl, len, &len ); + ok( !status, "got %08x\n", status ); + ok( token_default_dacl->DefaultDacl != NULL, "NULL DefaultDacl\n" ); + status = pNtQueryInformationToken( token, TokenOrigin, &token_origin, sizeof(token_origin), &len ); + todo_wine ok( !status, "got %08x\n", status ); + pNtClose( token ); + + status = pRtlAllocateAndInitializeSid( &authority, 8, 1, 1, 1, 1, 1, 1, 1, 1, &token_user.User.Sid ); + ok( !status, "got %08x\n", status ); + status = pRtlAllocateAndInitializeSid( &authority, 8, 2, 2, 2, 2, 2, 2, 2, 2, &token_owner.Owner ); + ok( !status, "got %08x\n", status ); + status = pRtlAllocateAndInitializeSid( &authority, 8, 3, 3, 3, 3, 3, 3, 3, 3, &token_primary_group.PrimaryGroup ); + ok( !status, "got %08x\n", status ); + status = pRtlAllocateAndInitializeSid( &authority, 8, 3, 3, 3, 3, 3, 3, 3, 3, &token_groups.Groups[0].Sid ); + ok( !status, "got %08x\n", status ); + + /* all arguments are required except default dacl */ + status = pNtCreateToken( NULL, 0, NULL, 0, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL ); + ok( status == STATUS_ACCESS_VIOLATION, "got %08x\n", status ); + + status = pNtCreateToken( NULL, TOKEN_ALL_ACCESS, NULL, TokenPrimary, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL ); + ok( status == STATUS_ACCESS_VIOLATION, "got %08x\n", status ); + + status = pNtCreateToken( &token, TOKEN_ALL_ACCESS, NULL, TokenPrimary, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL ); + ok( status == STATUS_ACCESS_VIOLATION, "got %08x\n", status ); + + InitializeObjectAttributes( &attrs, NULL, 0, 0, NULL ); + status = pNtCreateToken( &token, TOKEN_ALL_ACCESS, &attrs, TokenPrimary, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL ); + ok( status == STATUS_ACCESS_VIOLATION, "got %08x\n", status ); + + pNtAllocateLocallyUniqueId( &session ); + status = pNtCreateToken( &token, TOKEN_ALL_ACCESS, &attrs, TokenPrimary, &session, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL ); + ok( status == STATUS_ACCESS_VIOLATION, "got %08x\n", status ); + + expiration.LowPart = 0; + expiration.HighPart = 0; + status = pNtCreateToken( &token, TOKEN_ALL_ACCESS, &attrs, TokenPrimary, &session, &expiration, NULL, + NULL, NULL, NULL, NULL, NULL, NULL ); + ok( status == STATUS_ACCESS_VIOLATION, "got %08x\n", status ); + + token_user.User.Attributes = 0; + status = pNtCreateToken( &token, TOKEN_ALL_ACCESS, &attrs, TokenPrimary, &session, &expiration, &token_user, + NULL, NULL, NULL, NULL, NULL, NULL ); + ok( status == STATUS_ACCESS_VIOLATION, "got %08x\n", status ); + + token_groups.GroupCount = 0; + status = pNtCreateToken( &token, TOKEN_ALL_ACCESS, &attrs, TokenPrimary, &session, &expiration, &token_user, + &token_groups, NULL, NULL, NULL, NULL, NULL ); + ok( status == STATUS_ACCESS_VIOLATION, "got %08x\n", status ); + + token_privs.PrivilegeCount = 1; + token_privs.Privileges[0].Luid.LowPart = SE_BACKUP_PRIVILEGE; + token_privs.Privileges[0].Luid.HighPart = 0; + token_privs.Privileges[0].Attributes = 0; + status = pNtCreateToken( &token, TOKEN_ALL_ACCESS, &attrs, TokenPrimary, &session, &expiration, &token_user, + &token_groups, &token_privs, NULL, NULL, NULL, NULL ); + ok( status == STATUS_ACCESS_VIOLATION, "got %08x\n", status ); + + status = pNtCreateToken( &token, TOKEN_ALL_ACCESS, &attrs, TokenPrimary, &session, &expiration, &token_user, + &token_groups, &token_privs, &token_owner, NULL, NULL, NULL ); + ok( status == STATUS_ACCESS_VIOLATION, "got %08x\n", status ); + + status = pNtCreateToken( &token, TOKEN_ALL_ACCESS, &attrs, TokenPrimary, &session, &expiration, &token_user, + &token_groups, &token_privs, &token_owner, &token_primary_group, NULL, NULL ); + ok( status == STATUS_ACCESS_VIOLATION, "got %08x\n", status ); + + memcpy( token_source.SourceName, "winetest", sizeof("winetest") - 1 ); + token_source.SourceIdentifier.LowPart = 1; + token_source.SourceIdentifier.HighPart = 1; + status = pNtCreateToken( &token, TOKEN_ALL_ACCESS, &attrs, TokenPrimary, &session, &expiration, &token_user, + &token_groups, &token_privs, &token_owner, &token_primary_group, NULL, &token_source ); + ok( status == STATUS_INVALID_PRIMARY_GROUP, "got %08x\n", status ); + + token_groups.GroupCount = 1; + token_groups.Groups[0].Attributes = 0; + status = pNtCreateToken( &token, TOKEN_ALL_ACCESS, &attrs, TokenPrimary, &session, &expiration, &token_user, + &token_groups, &token_privs, &token_owner, &token_primary_group, NULL, &token_source ); + ok( status == STATUS_INVALID_OWNER, "got %08x\n", status ); + + pRtlFreeSid( token_owner.Owner ); + /* same SID as user */ + status = pRtlAllocateAndInitializeSid( &authority, 8, 1, 1, 1, 1, 1, 1, 1, 1, &token_owner.Owner ); + ok( !status, "got %08x\n", status ); + status = pNtCreateToken( &token, TOKEN_ALL_ACCESS, &attrs, TokenPrimary, &session, &expiration, &token_user, + &token_groups, &token_privs, &token_owner, &token_primary_group, NULL, &token_source ); + todo_wine ok( status == STATUS_NO_SUCH_LOGON_SESSION, "got %08x\n", status ); + if (!status) pNtClose( token ); + + /* same logon session as current process token */ + status = pNtCreateToken( &token, TOKEN_ALL_ACCESS, &attrs, TokenPrimary, &token_origin.OriginatingLogonSession, + &expiration, &token_user, &token_groups, &token_privs, &token_owner, &token_primary_group, + token_default_dacl, &token_source ); + ok( !status, "got %08x\n", status ); + + /* check if token attributes were correctly set */ + token_type = 0; + status = pNtQueryInformationToken( token, TokenType, &token_type, sizeof(token_type), &len ); + ok( !status, "got %08x\n", status ); + ok( token_type == TokenPrimary, "got %u\n", token_type ); + + memset( buf, 0, sizeof(buf) ); + status = pNtQueryInformationToken( token, TokenUser, buf, sizeof(buf), &len ); + ok( !status, "got %08x\n", status ); + token_user2 = (TOKEN_USER *)buf; + ok( pRtlEqualSid( token_user.User.Sid, token_user2->User.Sid ), "user SIDs not equal\n" ); + ok( token_user.User.Attributes == token_user2->User.Attributes, "user attributes not equal\n" ); + + memset( buf, 0, sizeof(buf) ); + status = pNtQueryInformationToken( token, TokenGroups, buf, sizeof(buf), &len ); + ok( !status, "got %08x\n", status ); + token_groups2 = (TOKEN_GROUPS *)buf; + ok( token_groups.GroupCount == token_groups2->GroupCount, "group count not equal\n" ); + ok( pRtlEqualSid( token_groups.Groups[0].Sid, token_groups2->Groups[0].Sid ), "group SIDs not equal\n" ); + ok( token_groups.Groups[0].Attributes == token_groups2->Groups[0].Attributes, + "group attributes not equal\n" ); + + memset( buf, 0, sizeof(buf) ); + status = pNtQueryInformationToken( token, TokenPrivileges, buf, sizeof(buf), &len ); + ok( !status, "got %08x\n", status ); + token_privs2 = (TOKEN_PRIVILEGES *)buf; + ok( token_privs.PrivilegeCount == token_privs2->PrivilegeCount, "privilege count not equal\n" ); + ok( !memcmp( &token_privs.Privileges[0].Luid, &token_privs2->Privileges[0].Luid, sizeof(LUID) ), + "privilege LUIDS not equal\n" ); + ok( token_privs.Privileges[0].Attributes == token_privs2->Privileges[0].Attributes, + "privilege attributes not equal\n" ); + + memset( buf, 0, sizeof(buf) ); + status = pNtQueryInformationToken( token, TokenOwner, buf, sizeof(buf), &len ); + ok( !status, "got %08x\n", status ); + token_owner2 = (TOKEN_OWNER *)buf; + ok( pRtlEqualSid( token_owner.Owner, token_owner2->Owner ), "owner SIDs not equal\n" ); + + memset( buf, 0, sizeof(buf) ); + status = pNtQueryInformationToken( token, TokenPrimaryGroup, buf, sizeof(buf), &len ); + ok( !status, "got %08x\n", status ); + token_primary_group2 = (TOKEN_PRIMARY_GROUP *)buf; + ok( pRtlEqualSid( token_primary_group.PrimaryGroup, token_primary_group2->PrimaryGroup ), + "primary group SIDs not equal\n" ); + + memset( &token_source2, 0, sizeof(token_source2) ); + status = pNtQueryInformationToken( token, TokenSource, &token_source2, sizeof(token_source2), &len ); + todo_wine ok( !status, "got %08x\n", status ); + todo_wine ok( !memcmp( token_source.SourceName, token_source2.SourceName, sizeof(token_source.SourceName) ), + "source name not equal\n" ); + todo_wine ok( !memcmp( &token_source.SourceIdentifier, &token_source2.SourceIdentifier, + sizeof(token_source.SourceIdentifier) ), "source identifier not equal\n" ); + + pRtlFreeSid( token_user.User.Sid ); + pRtlFreeSid( token_owner.Owner ); + pRtlFreeSid( token_primary_group.PrimaryGroup ); + pRtlFreeSid( token_groups.Groups[0].Sid ); + pNtClose( token ); + pRtlAdjustPrivilege( SE_CREATE_TOKEN_PRIVILEGE, enabled, FALSE, &enabled ); + pRtlFreeHeap( GetProcessHeap(), 0, token_default_dacl ); +} + START_TEST(om) { HMODULE hntdll = GetModuleHandleA("ntdll.dll"); @@ -2031,6 +2240,16 @@ START_TEST(om) pNtReleaseKeyedEvent = (void *)GetProcAddress(hntdll, "NtReleaseKeyedEvent"); pNtCreateIoCompletion = (void *)GetProcAddress(hntdll, "NtCreateIoCompletion"); pNtOpenIoCompletion = (void *)GetProcAddress(hntdll, "NtOpenIoCompletion"); + pNtCreateToken = (void *)GetProcAddress(hntdll, "NtCreateToken"); + pNtOpenProcessToken = (void *)GetProcAddress(hntdll, "NtOpenProcessToken"); + pNtQueryInformationToken = (void *)GetProcAddress(hntdll, "NtQueryInformationToken"); + pRtlAdjustPrivilege = (void *)GetProcAddress(hntdll, "RtlAdjustPrivilege"); + pRtlAllocateAndInitializeSid = (void *)GetProcAddress(hntdll, "RtlAllocateAndInitializeSid"); + pNtAllocateLocallyUniqueId = (void *)GetProcAddress(hntdll, "NtAllocateLocallyUniqueId"); + pRtlAllocateHeap = (void *)GetProcAddress(hntdll, "RtlAllocateHeap"); + pRtlFreeHeap = (void *)GetProcAddress(hntdll, "RtlFreeHeap"); + pRtlEqualSid = (void *)GetProcAddress(hntdll, "RtlEqualSid"); + pRtlFreeSid = (void *)GetProcAddress(hntdll, "RtlFreeSid"); test_case_sensitive(); test_namespace_pipe(); @@ -2044,4 +2263,5 @@ START_TEST(om) test_mutant(); test_keyed_events(); test_null_device(); + test_token(); } -- 2.11.0

1 0

[PATCH] user32: Pass the modifiable string buffer directly to TEXT_NextLineW().
by Huw Davies 09 May '18

09 May '18

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/user32/text.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/user32/text.c b/dlls/user32/text.c index 3ba4a129cf..8a2c247d8d 100644 --- a/dlls/user32/text.c +++ b/dlls/user32/text.c @@ -606,7 +606,7 @@ static BOOL remainder_is_none_or_newline (int num_chars, const WCHAR *str) */ static const WCHAR *TEXT_NextLineW( HDC hdc, const WCHAR *str, int *count, WCHAR *dest, int *len, int width, DWORD format, - SIZE *retsize, int last_line, WCHAR **p_retstr, + SIZE *retsize, int last_line, WCHAR *modstr, int tabwidth, int *pprefix_offset, ellipsis_data *pellip) { @@ -722,7 +722,7 @@ static const WCHAR *TEXT_NextLineW( HDC hdc, const WCHAR *str, int *count, if (!line_fits && (format & DT_PATH_ELLIPSIS)) { TEXT_PathEllipsify (hdc, dest + seg_j, maxl-seg_j, &j_in_seg, - max_seg_width, &size, *p_retstr, pellip); + max_seg_width, &size, modstr, pellip); line_fits = (size.cx <= max_seg_width); ellipsified = TRUE; } @@ -735,7 +735,7 @@ static const WCHAR *TEXT_NextLineW( HDC hdc, const WCHAR *str, int *count, { int before, len_ellipsis; TEXT_Ellipsify (hdc, dest + seg_j, maxl-seg_j, &j_in_seg, - max_seg_width, &size, *p_retstr, &before, &len_ellipsis); + max_seg_width, &size, modstr, &before, &len_ellipsis); if (before > pellip->before) { /* We must have done a path ellipsis too */ @@ -872,7 +872,7 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, { SIZE size; const WCHAR *strPtr; - WCHAR *retstr, *p_retstr; + WCHAR *retstr; size_t size_retstr; WCHAR line[MAX_BUFFER]; int len, lh, count=i_count; @@ -968,7 +968,6 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, size_retstr = 0; retstr = NULL; } - p_retstr = retstr; do { @@ -977,7 +976,7 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, last_line = !(flags & DT_NOCLIP) && y - ((flags & DT_EDITCONTROL) ? 2*lh-1 : lh) < rect->bottom; else last_line = !(flags & DT_NOCLIP) && y + ((flags & DT_EDITCONTROL) ? 2*lh-1 : lh) > rect->bottom; - strPtr = TEXT_NextLineW(hdc, strPtr, &count, line, &len, width, flags, &size, last_line, &p_retstr, tabwidth, &prefix_offset, &ellip); + strPtr = TEXT_NextLineW(hdc, strPtr, &count, line, &len, width, flags, &size, last_line, retstr, tabwidth, &prefix_offset, &ellip); if (flags & DT_CENTER) x = (rect->left + rect->right - size.cx) / 2; -- 2.16.2

1 0

[PATCH] msi: Avoid leaking custom action data.
by Zebediah Figura 09 May '18

09 May '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msi/custom.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 956b3e9..07916ac 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -609,6 +609,7 @@ static DWORD WINAPI DllThread( LPVOID arg ) info = find_action_by_guid(guid); ret = GetBinaryTypeW(info->source, &arch); + release_custom_action_data(info); if (sizeof(void *) == 8 && ret && arch == SCS_32BIT_BINARY) GetSystemWow64DirectoryW(buffer, MAX_PATH - sizeof(msiexecW)/sizeof(WCHAR)); -- 2.7.4

2 1

[PATCH 2/2] gdi32: Check that emf records are within the file.
by Vincent Povirk 09 May '18

09 May '18

Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> --- dlls/gdi32/enhmetafile.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index f2e2930d9ea..c4b1ee1ce4e 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -2470,6 +2470,14 @@ BOOL WINAPI EnumEnhMetaFile( { emr = (ENHMETARECORD *)((char *)emh + offset); + if (offset + 8 > emh->nBytes || + offset > offset + emr->nSize || + offset + emr->nSize > emh->nBytes) + { + WARN("record truncated\n"); + break; + } + /* In Win9x mode we update the xform if the record will produce output */ if (hdc && IS_WIN9X() && emr_produces_output(emr->iType)) EMF_Update_MF_Xform(hdc, info); -- 2.14.1

2 1

[PATCH 1/2] gdi32: Check for truncated EMF files.
by Vincent Povirk 09 May '18

09 May '18

Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> --- There were several bounds-checking bugs filed recently against EMF code. This doesn't address everything, but it's a start. dlls/gdi32/enhmetafile.c | 23 ++++++++++++++++++----- dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 2 +- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index 37edc231a37..f2e2930d9ea 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -246,11 +246,16 @@ static inline BOOL is_dib_monochrome( const BITMAPINFO* info ) /**************************************************************************** * EMF_Create_HENHMETAFILE */ -HENHMETAFILE EMF_Create_HENHMETAFILE(ENHMETAHEADER *emh, BOOL on_disk ) +HENHMETAFILE EMF_Create_HENHMETAFILE(ENHMETAHEADER *emh, DWORD filesize, BOOL on_disk ) { HENHMETAFILE hmf; ENHMETAFILEOBJ *metaObj; + if (filesize < sizeof(*emh)) + { + WARN("File too small for emf header\n"); + return 0; + } if (emh->iType != EMR_HEADER) { SetLastError(ERROR_INVALID_DATA); @@ -263,6 +268,11 @@ HENHMETAFILE EMF_Create_HENHMETAFILE(ENHMETAHEADER *emh, BOOL on_disk ) emh->iType, emh->dSignature); return 0; } + if (filesize < emh->nBytes) + { + WARN("File truncated (got %u bytes, header says %u)\n", emh->nBytes, filesize); + return 0; + } if (!(metaObj = HeapAlloc( GetProcessHeap(), 0, sizeof(*metaObj) ))) return 0; @@ -318,6 +328,9 @@ static HENHMETAFILE EMF_GetEnhMetaFile( HANDLE hFile ) ENHMETAHEADER *emh; HANDLE hMapping; HENHMETAFILE hemf; + DWORD filesize; + + filesize = GetFileSize( hFile, NULL ); hMapping = CreateFileMappingA( hFile, NULL, PAGE_READONLY, 0, 0, NULL ); emh = MapViewOfFile( hMapping, FILE_MAP_READ, 0, 0, 0 ); @@ -325,7 +338,7 @@ static HENHMETAFILE EMF_GetEnhMetaFile( HANDLE hFile ) if (!emh) return 0; - hemf = EMF_Create_HENHMETAFILE( emh, TRUE ); + hemf = EMF_Create_HENHMETAFILE( emh, filesize, TRUE ); if (!hemf) UnmapViewOfFile( emh ); return hemf; @@ -468,7 +481,7 @@ HENHMETAFILE WINAPI SetEnhMetaFileBits(UINT bufsize, const BYTE *buf) ENHMETAHEADER *emh = HeapAlloc( GetProcessHeap(), 0, bufsize ); HENHMETAFILE hmf; memmove(emh, buf, bufsize); - hmf = EMF_Create_HENHMETAFILE( emh, FALSE ); + hmf = EMF_Create_HENHMETAFILE( emh, bufsize, FALSE ); if (!hmf) HeapFree( GetProcessHeap(), 0, emh ); return hmf; @@ -2562,7 +2575,7 @@ HENHMETAFILE WINAPI CopyEnhMetaFileA( if (!file) { emrDst = HeapAlloc( GetProcessHeap(), 0, emrSrc->nBytes ); memcpy( emrDst, emrSrc, emrSrc->nBytes ); - hmfDst = EMF_Create_HENHMETAFILE( emrDst, FALSE ); + hmfDst = EMF_Create_HENHMETAFILE( emrDst, emrSrc->nBytes, FALSE ); if (!hmfDst) HeapFree( GetProcessHeap(), 0, emrDst ); } else { @@ -2604,7 +2617,7 @@ HENHMETAFILE WINAPI CopyEnhMetaFileW( if (!file) { emrDst = HeapAlloc( GetProcessHeap(), 0, emrSrc->nBytes ); memcpy( emrDst, emrSrc, emrSrc->nBytes ); - hmfDst = EMF_Create_HENHMETAFILE( emrDst, FALSE ); + hmfDst = EMF_Create_HENHMETAFILE( emrDst, emrSrc->nBytes, FALSE ); if (!hmfDst) HeapFree( GetProcessHeap(), 0, emrDst ); } else { diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 35803bcc336..8ff0e6c9f21 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -529,7 +529,7 @@ HENHMETAFILE WINAPI CloseEnhMetaFile(HDC hdc) /* [in] metafile DC */ CloseHandle( physDev->hFile ); } - hmf = EMF_Create_HENHMETAFILE( physDev->emh, (physDev->hFile != 0) ); + hmf = EMF_Create_HENHMETAFILE( physDev->emh, physDev->emh->nBytes, (physDev->hFile != 0) ); physDev->emh = NULL; /* So it won't be deleted */ free_dc_ptr( dc ); return hmf; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index c5e42319b61..5b09b848466 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -268,7 +268,7 @@ extern const struct gdi_dc_funcs *DRIVER_load_driver( LPCWSTR name ) DECLSPEC_HI extern BOOL DRIVER_GetDriverName( LPCWSTR device, LPWSTR driver, DWORD size ) DECLSPEC_HIDDEN; /* enhmetafile.c */ -extern HENHMETAFILE EMF_Create_HENHMETAFILE(ENHMETAHEADER *emh, BOOL on_disk ) DECLSPEC_HIDDEN; +extern HENHMETAFILE EMF_Create_HENHMETAFILE(ENHMETAHEADER *emh, DWORD filesize, BOOL on_disk ) DECLSPEC_HIDDEN; /* freetype.c */ -- 2.14.1

2 1

[PATCH] comctl32/toolbar: Handle resource strings returned for tooltip text.
by Nikolay Sivov 09 May '18

09 May '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- For https://bugs.winehq.org/show_bug.cgi?id=45157. dlls/comctl32/toolbar.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index e1cb7b7169..6a51ad7fc1 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -6248,6 +6248,9 @@ static LRESULT TOOLBAR_TTGetDispInfo (TOOLBAR_INFO *infoPtr, NMTTDISPINFOW *lpnm TRACE("TTN_GETDISPINFOW - got string %s\n", debugstr_w(lpnmtdi->lpszText)); + if (IS_INTRESOURCE(lpnmtdi->lpszText)) + return ret; + if (lpnmtdi->lpszText && *lpnmtdi->lpszText) return ret; } @@ -6265,6 +6268,16 @@ static LRESULT TOOLBAR_TTGetDispInfo (TOOLBAR_INFO *infoPtr, NMTTDISPINFOW *lpnm TRACE("TTN_GETDISPINFOA - got string %s\n", debugstr_a(nmtdi.lpszText)); + lpnmtdi->hinst = nmtdi.hinst; + lpnmtdi->uFlags = nmtdi.uFlags; + lpnmtdi->lParam = nmtdi.lParam; + + if (IS_INTRESOURCE(nmtdi.lpszText)) + { + lpnmtdi->lpszText = (WCHAR *)nmtdi.lpszText; + return ret; + } + if (!nmtdi.lpszText || !*nmtdi.lpszText) return ret; -- 2.17.0

1 0