March 2017 - Wine-Commits - list.winehq.org

Huw Davies : user32: Disable scrolling for multi-column menus.
by Alexandre Julliard March 30, 2017

March 30, 2017

Module: wine Branch: master Commit: 1d4992282d8e36cf4c4836045d042c983a3d6f0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d4992282d8e36cf4c4836045… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 30 10:58:32 2017 +0100 user32: Disable scrolling for multi-column menus. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/menu.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index dd62063..543e0c1 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -1159,7 +1159,7 @@ static void MENU_PopupMenuCalcSize( LPPOPUPMENU lppop ) MENUITEM *lpitem; HDC hdc; UINT start, i; - BOOL textandbmp = FALSE; + BOOL textandbmp = FALSE, multi_col = FALSE; int orgX, orgY, maxTab, maxTabWidth, maxHeight; lppop->Width = lppop->Height = 0; @@ -1186,8 +1186,11 @@ static void MENU_PopupMenuCalcSize( LPPOPUPMENU lppop ) /* Parse items until column break or end of menu */ for (i = start; i < lppop->nItems; i++, lpitem++) { - if ((i != start) && - (lpitem->fType & (MF_MENUBREAK | MF_MENUBARBREAK))) break; + if (lpitem->fType & (MF_MENUBREAK | MF_MENUBARBREAK)) + { + multi_col = TRUE; + if (i != start) break; + } MENU_CalcItemSize( hdc, lpitem, lppop->hwndOwner, orgX, orgY, FALSE, lppop ); lppop->items_rect.right = max( lppop->items_rect.right, lpitem->rect.right ); @@ -1231,10 +1234,13 @@ static void MENU_PopupMenuCalcSize( LPPOPUPMENU lppop ) if (lppop->Height >= maxHeight) { lppop->Height = maxHeight; + lppop->bScrolling = !multi_col; /* When the scroll arrows are present, don't add the top/bottom margin as well */ - lppop->items_rect.top += get_scroll_arrow_height(lppop) - MENU_MARGIN; - lppop->items_rect.bottom = lppop->Height - get_scroll_arrow_height(lppop); - lppop->bScrolling = TRUE; + if (lppop->bScrolling) + { + lppop->items_rect.top = get_scroll_arrow_height(lppop); + lppop->items_rect.bottom = lppop->Height - get_scroll_arrow_height(lppop); + } } else {

1 0

Hugh McMaster : regedit: Make "Unknown Type" translatable.
by Alexandre Julliard March 30, 2017

March 30, 2017

1 0

Huw Davies : user32: Limit the menu height to that of the work area.
by Alexandre Julliard March 30, 2017

March 30, 2017

Module: wine Branch: master Commit: 3c0ddd59716dab6408a540c90f4cef19c6d2f1d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c0ddd59716dab6408a540c90… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 30 10:58:33 2017 +0100 user32: Limit the menu height to that of the work area. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/menu.c | 34 +++++++++++++--------------------- 1 file changed, 13 insertions(+), 21 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 543e0c1..e2ab09c 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -1136,31 +1136,18 @@ static void MENU_CalcItemSize( HDC hdc, MENUITEM *lpitem, HWND hwndOwner, TRACE("%s\n", wine_dbgstr_rect( &lpitem->rect)); } - -/*********************************************************************** - * MENU_GetMaxPopupHeight - */ -static UINT -MENU_GetMaxPopupHeight(const POPUPMENU *lppop) -{ - if (lppop->cyMax) - return lppop->cyMax; - return GetSystemMetrics(SM_CYSCREEN) - GetSystemMetrics(SM_CYBORDER); -} - - /*********************************************************************** * MENU_PopupMenuCalcSize * * Calculate the size of a popup menu. */ -static void MENU_PopupMenuCalcSize( LPPOPUPMENU lppop ) +static void MENU_PopupMenuCalcSize( LPPOPUPMENU lppop, UINT max_height ) { MENUITEM *lpitem; HDC hdc; UINT start, i; BOOL textandbmp = FALSE, multi_col = FALSE; - int orgX, orgY, maxTab, maxTabWidth, maxHeight; + int orgX, orgY, maxTab, maxTabWidth; lppop->Width = lppop->Height = 0; SetRectEmpty(&lppop->items_rect); @@ -1230,10 +1217,9 @@ static void MENU_PopupMenuCalcSize( LPPOPUPMENU lppop ) lppop->Width = lppop->items_rect.right + MENU_MARGIN; /* Adjust popup height if it exceeds maximum */ - maxHeight = MENU_GetMaxPopupHeight(lppop); - if (lppop->Height >= maxHeight) + if (lppop->Height >= max_height) { - lppop->Height = maxHeight; + lppop->Height = max_height; lppop->bScrolling = !multi_col; /* When the scroll arrows are present, don't add the top/bottom margin as well */ if (lppop->bScrolling) @@ -1894,6 +1880,7 @@ static BOOL MENU_ShowPopup( HWND hwndOwner, HMENU hmenu, UINT id, UINT flags, POINT pt; HMONITOR monitor; MONITORINFO info; + UINT max_height; TRACE("owner=%p hmenu=%p id=0x%04x x=0x%04x y=0x%04x xa=0x%04x ya=0x%04x\n", hwndOwner, hmenu, id, x, y, xanchor, yanchor); @@ -1906,9 +1893,6 @@ static BOOL MENU_ShowPopup( HWND hwndOwner, HMENU hmenu, UINT id, UINT flags, } menu->nScrollPos = 0; - MENU_PopupMenuCalcSize( menu ); - - /* adjust popup menu pos so that it fits within the desktop */ /* FIXME: should use item rect */ pt.x = x; @@ -1917,6 +1901,14 @@ static BOOL MENU_ShowPopup( HWND hwndOwner, HMENU hmenu, UINT id, UINT flags, info.cbSize = sizeof(info); GetMonitorInfoW( monitor, &info ); + max_height = info.rcWork.bottom - info.rcWork.top; + if (menu->cyMax) + max_height = min( max_height, menu->cyMax ); + + MENU_PopupMenuCalcSize( menu, max_height ); + + /* adjust popup menu pos so that it fits within the desktop */ + if (flags & TPM_LAYOUTRTL) flags ^= TPM_RIGHTALIGN;

1 0

Austin English : d3d10: Sync spec file to Windows 10.
by Alexandre Julliard March 30, 2017

March 30, 2017

Module: wine Branch: master Commit: 12a7b2b41c6ec692b01d079d6726c85ea00e71e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12a7b2b41c6ec692b01d079d6… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Mar 28 15:41:10 2017 -0500 d3d10: Sync spec file to Windows 10. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/d3d10.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3d10/d3d10.spec b/dlls/d3d10/d3d10.spec index db42511..62dd94d 100644 --- a/dlls/d3d10/d3d10.spec +++ b/dlls/d3d10/d3d10.spec @@ -1,3 +1,4 @@ +# 1 stub RevertToOldImplementation @ stdcall D3D10CompileEffectFromMemory(ptr long ptr ptr ptr long long ptr ptr) @ stdcall D3D10CompileShader(ptr long str ptr ptr str str long ptr ptr) @ stdcall D3D10CreateBlob(long ptr) d3dcompiler_43.D3DCreateBlob

1 0

André Hentschel : iphlpapi: Implement GetUnicastIpAddressTable.
by Alexandre Julliard March 30, 2017

March 30, 2017

Module: wine Branch: master Commit: eda35423f4f52a1e9a2cb93219a4dd6c280baedf URL: http://source.winehq.org/git/wine.git/?a=commit;h=eda35423f4f52a1e9a2cb9321… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Mar 27 22:48:00 2017 +0200 iphlpapi: Implement GetUnicastIpAddressTable. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Bruno Jesus <bjesus(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 78 ++++++++++++++++++++++++++++++++++++++++++ dlls/iphlpapi/tests/iphlpapi.c | 56 ++++++++++++++++++++++++++++++ include/netioapi.h | 6 ++++ 4 files changed, 141 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index d69b80e..4e01926 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -148,7 +148,7 @@ @ stdcall GetUdpTable( ptr ptr long ) @ stub GetUdpTableFromStack @ stdcall GetUnicastIpAddressEntry( ptr ) -#@ stub GetUnicastIpAddressTable +@ stdcall GetUnicastIpAddressTable(long ptr) @ stdcall GetUniDirectionalAdapterInfo( ptr ptr ) @ stdcall Icmp6CreateFile() #@ stub Icmp6ParseReplies diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 6f16807..1407bfb 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -2534,6 +2534,84 @@ DWORD WINAPI GetUnicastIpAddressEntry(MIB_UNICASTIPADDRESS_ROW *row) return ret; } +DWORD WINAPI GetUnicastIpAddressTable(ADDRESS_FAMILY family, MIB_UNICASTIPADDRESS_TABLE **table) +{ + IP_ADAPTER_ADDRESSES *aa, *ptr; + MIB_UNICASTIPADDRESS_TABLE *data; + DWORD ret, count = 0; + ULONG size, flags; + + TRACE("%u, %p\n", family, table); + + if (!table || (family != WS_AF_INET && family != WS_AF_INET6 && family != WS_AF_UNSPEC)) + return ERROR_INVALID_PARAMETER; + + flags = GAA_FLAG_SKIP_ANYCAST | + GAA_FLAG_SKIP_MULTICAST | + GAA_FLAG_SKIP_DNS_SERVER | + GAA_FLAG_SKIP_FRIENDLY_NAME; + + ret = GetAdaptersAddresses(family, flags, NULL, NULL, &size); + if (ret != ERROR_BUFFER_OVERFLOW) + return ret; + if (!(ptr = HeapAlloc(GetProcessHeap(), 0, size))) + return ERROR_OUTOFMEMORY; + if ((ret = GetAdaptersAddresses(family, flags, NULL, ptr, &size))) + { + HeapFree(GetProcessHeap(), 0, ptr); + return ret; + } + + for (aa = ptr; aa; aa = aa->Next) + { + IP_ADAPTER_UNICAST_ADDRESS *ua = aa->FirstUnicastAddress; + while (ua) + { + count++; + ua = ua->Next; + } + } + + if (!(data = HeapAlloc(GetProcessHeap(), 0, sizeof(*data) + (count - 1) * sizeof(data->Table[0])))) + { + HeapFree(GetProcessHeap(), 0, ptr); + return ERROR_OUTOFMEMORY; + } + + data->NumEntries = 0; + for (aa = ptr; aa; aa = aa->Next) + { + IP_ADAPTER_UNICAST_ADDRESS *ua = aa->FirstUnicastAddress; + while (ua) + { + MIB_UNICASTIPADDRESS_ROW *row = &data->Table[data->NumEntries]; + memcpy(&row->Address, ua->Address.lpSockaddr, ua->Address.iSockaddrLength); + memcpy(&row->InterfaceLuid, &aa->Luid, sizeof(aa->Luid)); + row->InterfaceIndex = aa->u.s.IfIndex; + row->PrefixOrigin = ua->PrefixOrigin; + row->SuffixOrigin = ua->SuffixOrigin; + row->ValidLifetime = ua->ValidLifetime; + row->PreferredLifetime = ua->PreferredLifetime; + row->OnLinkPrefixLength = ua->OnLinkPrefixLength; + row->SkipAsSource = 0; + row->DadState = ua->DadState; + if (row->Address.si_family == WS_AF_INET6) + row->ScopeId.u.Value = row->Address.Ipv6.sin6_scope_id; + else + row->ScopeId.u.Value = 0; + NtQuerySystemTime(&row->CreationTimeStamp); + + data->NumEntries++; + ua = ua->Next; + } + } + + HeapFree(GetProcessHeap(), 0, ptr); + + *table = data; + return ret; +} + /****************************************************************** * GetUniDirectionalAdapterInfo (IPHLPAPI.@) * diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index bc99660..9deccc2 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -76,6 +76,7 @@ static DWORD (WINAPI *pGetUdpTable)(PMIB_UDPTABLE,PDWORD,BOOL); static DWORD (WINAPI *pGetPerAdapterInfo)(ULONG,PIP_PER_ADAPTER_INFO,PULONG); static DWORD (WINAPI *pGetAdaptersAddresses)(ULONG,ULONG,PVOID,PIP_ADAPTER_ADDRESSES,PULONG); static DWORD (WINAPI *pGetUnicastIpAddressEntry)(MIB_UNICASTIPADDRESS_ROW*); +static DWORD (WINAPI *pGetUnicastIpAddressTable)(ADDRESS_FAMILY,MIB_UNICASTIPADDRESS_TABLE**); static DWORD (WINAPI *pNotifyAddrChange)(PHANDLE,LPOVERLAPPED); static BOOL (WINAPI *pCancelIPChangeNotify)(LPOVERLAPPED); static DWORD (WINAPI *pGetExtendedTcpTable)(PVOID,PDWORD,BOOL,ULONG,TCP_TABLE_CLASS,ULONG); @@ -125,6 +126,7 @@ static void loadIPHlpApi(void) pGetPerAdapterInfo = (void *)GetProcAddress(hLibrary, "GetPerAdapterInfo"); pGetAdaptersAddresses = (void *)GetProcAddress(hLibrary, "GetAdaptersAddresses"); pGetUnicastIpAddressEntry = (void *)GetProcAddress(hLibrary, "GetUnicastIpAddressEntry"); + pGetUnicastIpAddressTable = (void *)GetProcAddress(hLibrary, "GetUnicastIpAddressTable"); pNotifyAddrChange = (void *)GetProcAddress(hLibrary, "NotifyAddrChange"); pCancelIPChangeNotify = (void *)GetProcAddress(hLibrary, "CancelIPChangeNotify"); pGetExtendedTcpTable = (void *)GetProcAddress(hLibrary, "GetExtendedTcpTable"); @@ -2095,6 +2097,59 @@ static void test_GetUnicastIpAddressEntry(void) HeapFree(GetProcessHeap(), 0, ptr); } +static void test_GetUnicastIpAddressTable(void) +{ + MIB_UNICASTIPADDRESS_TABLE *table; + DWORD ret; + ULONG i; + + if (!pGetUnicastIpAddressTable) + { + win_skip( "GetUnicastIpAddressTable not available\n" ); + return; + } + + ret = pGetUnicastIpAddressTable(AF_UNSPEC, NULL); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + + ret = pGetUnicastIpAddressTable(AF_BAN, &table); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + + ret = pGetUnicastIpAddressTable(AF_INET, &table); + ok( ret == NO_ERROR, "got %u\n", ret ); + trace("GetUnicastIpAddressTable(AF_INET): NumEntries %u\n", table->NumEntries); + pFreeMibTable(table); + + ret = pGetUnicastIpAddressTable(AF_INET6, &table); + ok( ret == NO_ERROR, "got %u\n", ret ); + trace("GetUnicastIpAddressTable(AF_INET6): NumEntries %u\n", table->NumEntries); + pFreeMibTable(table); + + ret = pGetUnicastIpAddressTable(AF_UNSPEC, &table); + ok( ret == NO_ERROR, "got %u\n", ret ); + trace("GetUnicastIpAddressTable(AF_UNSPEC): NumEntries %u\n", table->NumEntries); + for (i = 0; i < table->NumEntries && winetest_debug > 1; i++) + { + trace("Index %u:\n", i); + trace("Address.si_family: %u\n", table->Table[i].Address.si_family); + trace("InterfaceLuid.Info.Reserved: %u\n", table->Table[i].InterfaceLuid.Info.Reserved); + trace("InterfaceLuid.Info.NetLuidIndex: %u\n", table->Table[i].InterfaceLuid.Info.NetLuidIndex); + trace("InterfaceLuid.Info.IfType: %u\n", table->Table[i].InterfaceLuid.Info.IfType); + trace("InterfaceIndex: %u\n", table->Table[i].InterfaceIndex); + trace("PrefixOrigin: %u\n", table->Table[i].PrefixOrigin); + trace("SuffixOrigin: %u\n", table->Table[i].SuffixOrigin); + trace("ValidLifetime: %u seconds\n", table->Table[i].ValidLifetime); + trace("PreferredLifetime: %u seconds\n", table->Table[i].PreferredLifetime); + trace("OnLinkPrefixLength: %u\n", table->Table[i].OnLinkPrefixLength); + trace("SkipAsSource: %u\n", table->Table[i].SkipAsSource); + trace("DadState: %u\n", table->Table[i].DadState); + trace("ScopeId.Value: %u\n", table->Table[i].ScopeId.Value); + trace("CreationTimeStamp: %08x%08x\n", table->Table[i].CreationTimeStamp.HighPart, table->Table[i].CreationTimeStamp.LowPart); + } + + pFreeMibTable(table); +} + START_TEST(iphlpapi) { @@ -2120,6 +2175,7 @@ START_TEST(iphlpapi) test_GetIfEntry2(); test_GetIfTable2(); test_GetUnicastIpAddressEntry(); + test_GetUnicastIpAddressTable(); freeIPHlpApi(); } } diff --git a/include/netioapi.h b/include/netioapi.h index b34d019..cabfe9e 100644 --- a/include/netioapi.h +++ b/include/netioapi.h @@ -145,6 +145,12 @@ typedef struct _MIB_UNICASTIPADDRESS_ROW LARGE_INTEGER CreationTimeStamp; } MIB_UNICASTIPADDRESS_ROW, *PMIB_UNICASTIPADDRESS_ROW; +typedef struct _MIB_UNICASTIPADDRESS_TABLE +{ + ULONG NumEntries; + MIB_UNICASTIPADDRESS_ROW Table[1]; +} MIB_UNICASTIPADDRESS_TABLE, *PMIB_UNICASTIPADDRESS_TABLE; + typedef VOID (WINAPI *PIPINTERFACE_CHANGE_CALLBACK)(PVOID, PMIB_IPINTERFACE_ROW, MIB_NOTIFICATION_TYPE); typedef VOID (WINAPI *PUNICAST_IPADDRESS_CHANGE_CALLBACK)(PVOID, PMIB_UNICASTIPADDRESS_ROW,

1 0

Huw Davies : user32: Don' t finish tracking when the menu borders or scroll arrows are clicked.
by Alexandre Julliard March 30, 2017

March 30, 2017

Module: wine Branch: master Commit: d4544f7feda2c8249b32c2062ff194436c7cb385 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4544f7feda2c8249b32c2062… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 30 10:58:31 2017 +0100 user32: Don't finish tracking when the menu borders or scroll arrows are clicked. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/menu.c | 119 +++++++++++++++++++++++++++++++++++------------------ 1 file changed, 78 insertions(+), 41 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 79bef64..dd62063 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -665,6 +665,14 @@ MENU_AdjustMenuItemRect(const POPUPMENU *menu, LPRECT rect) OffsetRect( rect, menu->items_rect.left, menu->items_rect.top - scroll_offset ); } +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 */ +}; /*********************************************************************** * MENU_FindItemByCoords @@ -672,30 +680,61 @@ MENU_AdjustMenuItemRect(const POPUPMENU *menu, LPRECT rect) * 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 MENUITEM *MENU_FindItemByCoords( const POPUPMENU *menu, - POINT pt, UINT *pos ) +static enum hittest MENU_FindItemByCoords( const POPUPMENU *menu, POINT pt, UINT *pos ) { MENUITEM *item; UINT i; RECT rect; + enum hittest ht = ht_border; + + *pos = NO_SELECTED_ITEM; + + if (!GetWindowRect(menu->hWnd, &rect) || !PtInRect(&rect, pt)) + return ht_nowhere; - if (!GetWindowRect(menu->hWnd, &rect)) return NULL; if (GetWindowLongW( 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; MENU_AdjustMenuItemRect(menu, &rect); - if (PtInRect(&rect, pt)) - { - if (pos) *pos = i; - return item; - } + if (PtInRect(&rect, pt)) + { + *pos = i; + if (ht != ht_scroll_up && ht != ht_scroll_down) ht = ht_item; + break; + } } - return NULL; + + return ht; } @@ -2549,29 +2588,28 @@ static BOOL MENU_ButtonDown( MTRACKER* pmt, HMENU hPtMenu, UINT wFlags ) if (hPtMenu) { - UINT id = 0; - POPUPMENU *ptmenu = MENU_GetMenu( hPtMenu ); - MENUITEM *item; + UINT pos; + POPUPMENU *ptmenu = MENU_GetMenu( hPtMenu ); + enum hittest ht = ht_nowhere; - if( IS_SYSTEM_MENU(ptmenu) ) - item = ptmenu->items; - else - item = MENU_FindItemByCoords( ptmenu, pmt->pt, &id ); + if( IS_SYSTEM_MENU(ptmenu) ) + pos = 0; + else + ht = MENU_FindItemByCoords( ptmenu, pmt->pt, &pos ); - if( item ) - { - if( ptmenu->FocusedItem != id ) - MENU_SwitchTracking( pmt, hPtMenu, id, wFlags ); + if (pos != NO_SELECTED_ITEM) + { + if (ptmenu->FocusedItem != pos) + MENU_SwitchTracking( pmt, hPtMenu, pos, wFlags ); - /* If the popup menu is not already "popped" */ - if(!(item->fState & MF_MOUSESELECT )) - { - pmt->hCurrentMenu = MENU_ShowSubPopup( pmt->hOwnerWnd, hPtMenu, FALSE, wFlags ); - } + /* If the popup menu is not already "popped" */ + if (!(ptmenu->items[pos].fState & MF_MOUSESELECT)) + pmt->hCurrentMenu = MENU_ShowSubPopup( pmt->hOwnerWnd, hPtMenu, FALSE, wFlags ); + } - return TRUE; - } - /* Else the click was on the menu bar, finish the tracking */ + /* A click on an item or anywhere on a popup keeps tracking going */ + if (ht == ht_item || ((ptmenu->wFlags & MF_POPUP) && ht != ht_nowhere)) + return TRUE; } return FALSE; } @@ -2590,20 +2628,19 @@ static INT MENU_ButtonUp( MTRACKER* pmt, HMENU hPtMenu, UINT wFlags) if (hPtMenu) { - UINT id = 0; + UINT pos; POPUPMENU *ptmenu = MENU_GetMenu( hPtMenu ); - MENUITEM *item; if( IS_SYSTEM_MENU(ptmenu) ) - item = ptmenu->items; - else - item = MENU_FindItemByCoords( ptmenu, pmt->pt, &id ); + pos = 0; + else if (MENU_FindItemByCoords( ptmenu, pmt->pt, &pos ) != ht_item) + pos = NO_SELECTED_ITEM; - if( item && (ptmenu->FocusedItem == id )) + if (pos != NO_SELECTED_ITEM && (ptmenu->FocusedItem == pos)) { - debug_print_menuitem ("FocusedItem: ", item, ""); + debug_print_menuitem ("FocusedItem: ", &ptmenu->items[pos], ""); - if( !(item->fType & MF_POPUP) ) + if (!(ptmenu->items[pos].fType & MF_POPUP)) { INT executedMenuId = MENU_ExecFocusedItem( pmt, hPtMenu, wFlags); if (executedMenuId == -1 || executedMenuId == -2) return -1; @@ -2638,8 +2675,8 @@ static BOOL MENU_MouseMove( MTRACKER* pmt, HMENU hPtMenu, UINT wFlags ) ptmenu = MENU_GetMenu( hPtMenu ); if( IS_SYSTEM_MENU(ptmenu) ) id = 0; - else - MENU_FindItemByCoords( ptmenu, pmt->pt, &id ); + else if (MENU_FindItemByCoords( ptmenu, pmt->pt, &id ) != ht_item) + id = NO_SELECTED_ITEM; } if( id == NO_SELECTED_ITEM ) @@ -2650,8 +2687,8 @@ static BOOL MENU_MouseMove( MTRACKER* pmt, HMENU hPtMenu, UINT wFlags ) } else if( ptmenu->FocusedItem != id ) { - MENU_SwitchTracking( pmt, hPtMenu, id, wFlags ); - pmt->hCurrentMenu = MENU_ShowSubPopup(pmt->hOwnerWnd, hPtMenu, FALSE, wFlags); + MENU_SwitchTracking( pmt, hPtMenu, id, wFlags ); + pmt->hCurrentMenu = MENU_ShowSubPopup(pmt->hOwnerWnd, hPtMenu, FALSE, wFlags); } return TRUE; } @@ -5254,7 +5291,7 @@ INT WINAPI MenuItemFromPoint(HWND hWnd, HMENU hMenu, POINT ptScreen) /*FIXME: Do we have to handle hWnd here? */ if (!menu) return -1; - if (!MENU_FindItemByCoords(menu, ptScreen, &pos)) return -1; + if (MENU_FindItemByCoords( menu, ptScreen, &pos ) != ht_item) return -1; return pos; }

1 0

Jacek Caban : xmllite/tests: Added tests for returned string pointers.
by Alexandre Julliard March 30, 2017

March 30, 2017

Module: wine Branch: master Commit: 261aa667d4e71eae52953d76f635fa4941d17afd URL: http://source.winehq.org/git/wine.git/?a=commit;h=261aa667d4e71eae52953d76f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 29 20:51:47 2017 +0200 xmllite/tests: Added tests for returned string pointers. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/reader.c | 112 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 112 insertions(+) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 0e8a0f5..666432e 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -2495,6 +2495,117 @@ static void test_reader_position(void) IXmlReader_Release(reader); } +static void test_string_pointers(void) +{ + const WCHAR *ns, *nsq, *empty, *xmlns_ns, *xmlns_name, *name, *p, *q, *xml, *ptr; + IXmlReader *reader; + HRESULT hr; + + hr = CreateXmlReader(&IID_IXmlReader, (void **)&reader, NULL); + ok(hr == S_OK, "S_OK, got %08x\n", hr); + + set_input_string(reader, "<elem xmlns=\"myns\">myns<elem2 /></elem>"); + + read_node(reader, XmlNodeType_Element); + empty = reader_value(reader, ""); + ok(empty == reader_prefix(reader, ""), "empty != prefix\n"); + name = reader_name(reader, "elem"); + ok(name == reader_qname(reader, "elem"), "name != qname\n"); + ns = reader_namespace(reader, "myns"); + + next_attribute(reader); + ptr = reader_value(reader, "myns"); + if (ns != ptr) + { + win_skip("attr value is different than namespace pointer, assuming old xmllite\n"); + IXmlReader_Release(reader); + return; + } + ok(ns == ptr, "ns != value\n"); + ok(empty == reader_prefix(reader, ""), "empty != prefix\n"); + xmlns_ns = reader_namespace(reader, "http://www.w3.org/2000/xmlns/"); + xmlns_name = reader_name(reader, "xmlns"); + ok(xmlns_name == reader_qname(reader, "xmlns"), "xmlns_name != qname\n"); + + read_node(reader, XmlNodeType_Text); + ok(ns != reader_value(reader, "myns"), "ns == value\n"); + ok(empty == reader_prefix(reader, ""), "empty != prefix\n"); + ok(empty == reader_namespace(reader, ""), "empty != namespace\n"); + ok(empty == reader_name(reader, ""), "empty != name\n"); + ok(empty == reader_qname(reader, ""), "empty != qname\n"); + + read_node(reader, XmlNodeType_Element); + ok(empty == reader_prefix(reader, ""), "empty != prefix\n"); + ok(ns == reader_namespace(reader, "myns"), "empty != namespace\n"); + + read_node(reader, XmlNodeType_EndElement); + ok(empty == reader_prefix(reader, ""), "empty != prefix\n"); + ok(name == reader_name(reader, "elem"), "empty != name\n"); + ok(name == reader_qname(reader, "elem"), "empty != qname\n"); + ok(ns == reader_namespace(reader, "myns"), "empty != namespace\n"); + + set_input_string(reader, "<elem xmlns:p=\"myns\" xmlns:q=\"mynsq\"><p:elem2 q:attr=\"\"></p:elem2></elem>"); + + read_node(reader, XmlNodeType_Element); + ok(empty == reader_prefix(reader, ""), "empty != prefix\n"); + name = reader_name(reader, "elem"); + ok(empty == reader_namespace(reader, ""), "empty != namespace\n"); + + next_attribute(reader); + ns = reader_value(reader, "myns"); + ok(xmlns_name == reader_prefix(reader, "xmlns"), "xmlns_name != prefix\n"); + p = reader_name(reader, "p"); + ok(xmlns_ns == reader_namespace(reader, "http://www.w3.org/2000/xmlns/"), "xmlns_ns != namespace\n"); + + next_attribute(reader); + nsq = reader_value(reader, "mynsq"); + ok(xmlns_name == reader_prefix(reader, "xmlns"), "xmlns_name != prefix\n"); + q = reader_name(reader, "q"); + ok(xmlns_ns == reader_namespace(reader, "http://www.w3.org/2000/xmlns/"), "xmlns_ns != namespace\n"); + + read_node(reader, XmlNodeType_Element); + ptr = reader_prefix(reader, "p"); todo_wine ok(p == ptr, "p != prefix\n"); + ok(ns == reader_namespace(reader, "myns"), "empty != namespace\n"); + name = reader_qname(reader, "p:elem2"); + + next_attribute(reader); + ok(empty != reader_value(reader, ""), "empty == value\n"); + ptr = reader_prefix(reader, "q"); todo_wine ok(q == ptr, "q != prefix\n"); + ok(nsq == reader_namespace(reader, "mynsq"), "nsq != namespace\n"); + + read_node(reader, XmlNodeType_EndElement); + ptr = reader_qname(reader, "p:elem2"); todo_wine ok(name != ptr, "q == qname\n"); + + set_input_string(reader, "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n"); + + read_node(reader, XmlNodeType_XmlDeclaration); + ok(empty == reader_value(reader, ""), "empty != value\n"); + ok(empty == reader_prefix(reader, ""), "empty != prefix\n"); + xml = reader_name(reader, "xml"); + ptr = reader_qname(reader, "xml"); todo_wine ok(xml == ptr, "xml != qname\n"); + ok(empty == reader_namespace(reader, ""), "empty != namespace\n"); + + next_attribute(reader); + ok(empty == reader_prefix(reader, ""), "empty != prefix\n"); + ok(empty == reader_namespace(reader, ""), "empty != namespace\n"); + + set_input_string(reader, "<elem xmlns:p=\"myns\"><p:elem2 attr=\"\" /></elem>"); + + read_node(reader, XmlNodeType_Element); + next_attribute(reader); + read_value_char(reader, 'm'); + IXmlReader_GetValue(reader, &p, NULL); + todo_wine + ok(!strcmp_wa(p, "yns"), "value = %s\n", wine_dbgstr_w(p)); + + read_node(reader, XmlNodeType_Element); + ns = reader_namespace(reader, "myns"); + todo_wine + ok(ns+1 == p, "ns+1 != p\n"); + + IXmlReader_Release(reader); +} + START_TEST(reader) { test_reader_create(); @@ -2521,4 +2632,5 @@ START_TEST(reader) test_endoffile(); test_max_element_depth(); test_reader_position(); + test_string_pointers(); }

1 0

Jacek Caban : xmllite/tests: Added read_value_char helper.
by Alexandre Julliard March 30, 2017

March 30, 2017

Module: wine Branch: master Commit: 82f95833495a23f9ac331e86a8502ad1b7fd9f73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82f95833495a23f9ac331e86a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 29 19:46:48 2017 +0200 xmllite/tests: Added read_value_char helper. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/reader.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 497b31d..0e8a0f5 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -347,6 +347,19 @@ static const WCHAR *_reader_qname(IXmlReader *reader, const char *expect, unsign return str; } +#define read_value_char(a,b) _read_value_char(a,b,__LINE__) +static void _read_value_char(IXmlReader *reader, WCHAR expected_char, unsigned line) +{ + WCHAR c = 0xffff; + UINT count = 0; + HRESULT hr; + + hr = IXmlReader_ReadValueChunk(reader, &c, 1, &count); + ok_(__FILE__,line)(hr == S_OK, "got %08x\n", hr); + ok_(__FILE__,line)(count == 1, "got %u\n", c); + ok_(__FILE__,line)(c == expected_char, "got %x\n", c); +} + typedef struct _testinput { IUnknown IUnknown_iface; @@ -1611,19 +1624,8 @@ static void test_readvaluechunk(void) ok(hr == S_OK, "got %08x\n", hr); ok(type == XmlNodeType_Comment, "type = %u\n", type); - c = 0; - b = 0; - hr = IXmlReader_ReadValueChunk(reader, &b, 1, &c); - ok(hr == S_OK, "got %08x\n", hr); - ok(c == 1, "got %u\n", c); - ok(b == ' ', "got %x\n", b); - - c = 0; - b = 0xffff; - hr = IXmlReader_ReadValueChunk(reader, &b, 1, &c); - ok(hr == S_OK, "got %08x\n", hr); - ok(c == 1, "got %u\n", c); - ok(b == 'c', "got %x\n", b); + read_value_char(reader, ' '); + read_value_char(reader, 'c'); /* portion read as chunk is skipped from resulting node value */ reader_value(reader, "omment1 "); @@ -1644,9 +1646,7 @@ static void test_readvaluechunk(void) reader_value(reader, "omment1 "); /* read comment2 */ - hr = IXmlReader_Read(reader, &type); - ok(hr == S_OK, "got %08x\n", hr); - ok(type == XmlNodeType_Comment, "type = %u\n", type); + read_node(reader, XmlNodeType_Comment); c = 0xdeadbeef; hr = IXmlReader_ReadValueChunk(reader, buf, 0, &c);

1 0

Jacek Caban : xmllite/tests: Added reader_prefix helper.
by Alexandre Julliard March 30, 2017

March 30, 2017

Module: wine Branch: master Commit: b581c8f68b9f9bb3cd6f0f66e4c0e502bb2b60a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b581c8f68b9f9bb3cd6f0f66e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 29 19:46:19 2017 +0200 xmllite/tests: Added reader_prefix helper. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/reader.c | 44 ++++++++++++++++++-------------------------- 1 file changed, 18 insertions(+), 26 deletions(-) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 46e839e..9e27e9c 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -305,6 +305,20 @@ static const WCHAR *_reader_name(unsigned line, IXmlReader *reader, const char * return str; } +#define reader_prefix(a,b) _reader_prefix(__LINE__,a,b) +static const WCHAR *_reader_prefix(unsigned line, IXmlReader *reader, const char *expect) +{ + const WCHAR *str = (void*)0xdeadbeef; + ULONG len = 0xdeadbeef; + HRESULT hr; + + hr = IXmlReader_GetPrefix(reader, &str, &len); + ok_(__FILE__,line)(hr == S_OK, "GetPrefix returned %08x\n", hr); + ok_(__FILE__,line)(len == lstrlenW(str), "len = %u\n", len); + ok_(__FILE__,line)(!strcmp_wa(str, expect), "prefix = %s\n", wine_dbgstr_w(str)); + return str; +} + typedef struct _testinput { IUnknown IUnknown_iface; @@ -1982,9 +1996,7 @@ static void test_prefix(void) ok(hr == S_OK, "S_OK, got %08x\n", hr); for (i = 0; i < sizeof(prefix_tests)/sizeof(prefix_tests[0]); i++) { - const WCHAR *prefix; XmlNodeType type; - WCHAR *expected; IStream *stream; stream = create_stream_on_data(prefix_tests[i].xml, strlen(prefix_tests[i].xml) + 1); @@ -1995,12 +2007,7 @@ static void test_prefix(void) ok(hr == S_OK, "Read() failed, %#x\n", hr); ok(type == XmlNodeType_Element, "Unexpected node type %d.\n", type); - expected = a2w(prefix_tests[i].prefix1); - hr = IXmlReader_GetPrefix(reader, &prefix, NULL); - ok(hr == S_OK, "GetPrefix() failed, %#x.\n", hr); - ok(!lstrcmpW(prefix, expected), "Unexpected prefix %s, expected %s.\n", wine_dbgstr_w(prefix), - wine_dbgstr_w(expected)); - free_str(expected); + reader_prefix(reader, prefix_tests[i].prefix1); hr = IXmlReader_MoveToFirstAttribute(reader); ok(hr == S_OK, "MoveToFirstAttribute() failed, %#x.\n", hr); @@ -2009,12 +2016,7 @@ static void test_prefix(void) ok(hr == S_OK, "GetNodeType() failed, %#x.\n", hr); ok(type == XmlNodeType_Attribute, "Unexpected node type %d.\n", type); - expected = a2w(prefix_tests[i].prefix2); - hr = IXmlReader_GetPrefix(reader, &prefix, NULL); - ok(hr == S_OK, "GetPrefix() failed, %#x.\n", hr); - ok(!lstrcmpW(prefix, expected), "Unexpected prefix %s, expected %s.\n", wine_dbgstr_w(prefix), - wine_dbgstr_w(expected)); - free_str(expected); + reader_prefix(reader, prefix_tests[i].prefix2); next_attribute(reader); @@ -2022,23 +2024,13 @@ static void test_prefix(void) ok(hr == S_OK, "GetNodeType() failed, %#x.\n", hr); ok(type == XmlNodeType_Attribute, "Unexpected node type %d.\n", type); - expected = a2w(prefix_tests[i].prefix3); - hr = IXmlReader_GetPrefix(reader, &prefix, NULL); - ok(hr == S_OK, "GetPrefix() failed, %#x.\n", hr); - ok(!lstrcmpW(prefix, expected), "Unexpected prefix %s, expected %s.\n", wine_dbgstr_w(prefix), - wine_dbgstr_w(expected)); - free_str(expected); + reader_prefix(reader, prefix_tests[i].prefix3); /* back to the element, check prefix */ hr = IXmlReader_MoveToElement(reader); ok(hr == S_OK, "MoveToElement() failed, %#x.\n", hr); - expected = a2w(prefix_tests[i].prefix1); - hr = IXmlReader_GetPrefix(reader, &prefix, NULL); - ok(hr == S_OK, "GetPrefix() failed, %#x.\n", hr); - ok(!lstrcmpW(prefix, expected), "Unexpected prefix %s, expected %s.\n", wine_dbgstr_w(prefix), - wine_dbgstr_w(expected)); - free_str(expected); + reader_prefix(reader, prefix_tests[i].prefix1); IStream_Release(stream); }

1 0

Jacek Caban : xmllite/tests: Added reader_name helper.
by Alexandre Julliard March 30, 2017

March 30, 2017

Module: wine Branch: master Commit: c84f494c5f2ffcf43126c5c032312e2f16b4cbf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c84f494c5f2ffcf43126c5c03… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 29 19:46:02 2017 +0200 xmllite/tests: Added reader_name helper. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/reader.c | 92 ++++++++++++--------------------------------- 1 file changed, 24 insertions(+), 68 deletions(-) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index d2752df..46e839e 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -291,6 +291,20 @@ static const WCHAR *_reader_value(unsigned line, IXmlReader *reader, const char return str; } +#define reader_name(a,b) _reader_name(__LINE__,a,b) +static const WCHAR *_reader_name(unsigned line, IXmlReader *reader, const char *expect) +{ + const WCHAR *str = (void*)0xdeadbeef; + ULONG len = 0xdeadbeef; + HRESULT hr; + + hr = IXmlReader_GetLocalName(reader, &str, &len); + ok_(__FILE__,line)(hr == S_OK, "GetLocalName returned %08x\n", hr); + ok_(__FILE__,line)(len == lstrlenW(str), "len = %u\n", len); + ok_(__FILE__,line)(!strcmp_wa(str, expect), "name = %s\n", wine_dbgstr_w(str)); + return str; +} + typedef struct _testinput { IUnknown IUnknown_iface; @@ -769,7 +783,6 @@ static void test_reader_depth(IXmlReader *reader, UINT depth, UINT brk, int line static void test_read_xmldeclaration(void) { static const WCHAR xmlW[] = {'x','m','l',0}; - static const WCHAR RegistrationInfoW[] = {'R','e','g','i','s','t','r','a','t','i','o','n','I','n','f','o',0}; static const struct { WCHAR name[12]; @@ -913,11 +926,7 @@ todo_wine { ok(!ret, "element should not be empty\n"); reader_value(reader, ""); - - val = NULL; - hr = IXmlReader_GetLocalName(reader, &val, NULL); - ok(hr == S_OK, "expected S_OK, got %08x\n", hr); - ok(!lstrcmpW(val, xmlW), "got %s\n", wine_dbgstr_w(val)); + reader_name(reader, "xml"); val = NULL; hr = IXmlReader_GetQualifiedName(reader, &val, NULL); @@ -949,10 +958,7 @@ todo_wine { ok(ret, "element should be empty\n"); reader_value(reader, ""); - - hr = IXmlReader_GetLocalName(reader, &val, NULL); - ok(hr == S_OK, "expected S_OK, got %08x\n", hr); - ok(!lstrcmpW(val, RegistrationInfoW), "got %s\n", wine_dbgstr_w(val)); + reader_name(reader, "RegistrationInfo"); type = -1; hr = IXmlReader_Read(reader, &type); @@ -1037,12 +1043,7 @@ static void test_read_comment(void) ok(type == XmlNodeType_Comment, "got %d for %s\n", type, test->xml); - len = 1; - str = NULL; - hr = IXmlReader_GetLocalName(reader, &str, &len); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(len == 0, "got %u\n", len); - ok(*str == 0, "got %s\n", wine_dbgstr_w(str)); + reader_name(reader, ""); str = NULL; hr = IXmlReader_GetLocalName(reader, &str, NULL); @@ -1114,14 +1115,7 @@ static void test_read_pi(void) ok(type == XmlNodeType_ProcessingInstruction, "got %d for %s\n", type, test->xml); - len = 0; - str = NULL; - hr = IXmlReader_GetLocalName(reader, &str, &len); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(len == strlen(test->name), "got %u\n", len); - str_exp = a2w(test->name); - ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); - free_str(str_exp); + reader_name(reader, test->name); len = 0; str = NULL; @@ -1218,8 +1212,6 @@ static const char test_public_dtd[] = static void test_read_public_dtd(void) { static const WCHAR dtdnameW[] = {'t','e','s','t','d','t','d',0}; - static const WCHAR sysW[] = {'S','Y','S','T','E','M',0}; - static const WCHAR pubW[] = {'P','U','B','L','I','C',0}; IXmlReader *reader; const WCHAR *str; XmlNodeType type; @@ -1252,13 +1244,7 @@ static void test_read_public_dtd(void) ok(hr == S_OK, "got %08x\n", hr); ok(type == XmlNodeType_Attribute, "got %d\n", type); - len = 0; - str = NULL; - hr = IXmlReader_GetLocalName(reader, &str, &len); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(len == lstrlenW(pubW), "got %u\n", len); - ok(!lstrcmpW(str, pubW), "got %s\n", wine_dbgstr_w(str)); - + reader_name(reader, "PUBLIC"); reader_value(reader, "pubid"); next_attribute(reader); @@ -1268,13 +1254,7 @@ static void test_read_public_dtd(void) ok(hr == S_OK, "got %08x\n", hr); ok(type == XmlNodeType_Attribute, "got %d\n", type); - len = 0; - str = NULL; - hr = IXmlReader_GetLocalName(reader, &str, &len); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(len == lstrlenW(sysW), "got %u\n", len); - ok(!lstrcmpW(str, sysW), "got %s\n", wine_dbgstr_w(str)); - + reader_name(reader, "SYSTEM"); reader_value(reader, "externalid uri"); hr = IXmlReader_MoveToElement(reader); @@ -1307,7 +1287,6 @@ static const char test_system_dtd[] = static void test_read_system_dtd(void) { static const WCHAR dtdnameW[] = {'t','e','s','t','d','t','d',0}; - static const WCHAR sysW[] = {'S','Y','S','T','E','M',0}; IXmlReader *reader; const WCHAR *str; XmlNodeType type; @@ -1340,13 +1319,7 @@ static void test_read_system_dtd(void) ok(hr == S_OK, "got %08x\n", hr); ok(type == XmlNodeType_Attribute, "got %d\n", type); - len = 0; - str = NULL; - hr = IXmlReader_GetLocalName(reader, &str, &len); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(len == lstrlenW(sysW), "got %u\n", len); - ok(!lstrcmpW(str, sysW), "got %s\n", wine_dbgstr_w(str)); - + reader_name(reader, "SYSTEM"); reader_value(reader, "externalid uri"); hr = IXmlReader_MoveToElement(reader); @@ -1727,12 +1700,7 @@ static void test_read_cdata(void) ok(type == XmlNodeType_CDATA, "got %d for %s\n", type, test->xml); - len = 1; - str = NULL; - hr = IXmlReader_GetLocalName(reader, &str, &len); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(len == 0, "got %u\n", len); - ok(*str == 0, "got %s\n", wine_dbgstr_w(str)); + reader_name(reader, ""); str = NULL; hr = IXmlReader_GetLocalName(reader, &str, NULL); @@ -1805,12 +1773,7 @@ static void test_read_text(void) ok(type == XmlNodeType_Text, "got %d for %s\n", type, test->xml); - len = 1; - str = NULL; - hr = IXmlReader_GetLocalName(reader, &str, &len); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(len == 0, "got %u\n", len); - ok(*str == 0, "got %s\n", wine_dbgstr_w(str)); + reader_name(reader, ""); str = NULL; hr = IXmlReader_GetLocalName(reader, &str, NULL); @@ -1948,14 +1911,7 @@ static void test_read_attribute(void) hr = IXmlReader_MoveToFirstAttribute(reader); ok(hr == S_OK, "got 0x%08x\n", hr); - len = 1; - str = NULL; - hr = IXmlReader_GetLocalName(reader, &str, &len); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(len == strlen(test->name), "got %u\n", len); - str_exp = a2w(test->name); - ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); - free_str(str_exp); + reader_name(reader, test->name); len = 1; str = NULL;

1 0