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

Huw Davies : user32: Disable scrolling for multi-column menus.
by Alexandre Julliard 30 Mar '17

30 Mar '17

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

Huw Davies : user32: Limit the menu height to that of the work area.
by Alexandre Julliard 30 Mar '17

30 Mar '17

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

Hugh McMaster : regedit: Make "Unknown Type" translatable.
by Alexandre Julliard 30 Mar '17

30 Mar '17

1 0

Austin English : d3d10: Sync spec file to Windows 10.
by Alexandre Julliard 30 Mar '17

30 Mar '17

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 30 Mar '17

30 Mar '17

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

Henri Verbeet : wined3d: Pass a wined3d_rendertarget_view to surface_cpu_blt_colour_fill().
by Alexandre Julliard 30 Mar '17

30 Mar '17

Module: wine Branch: master Commit: 493502b54bfcca8f9210bfe72f0c548612848018 URL: http://source.winehq.org/git/wine.git/?a=commit;h=493502b54bfcca8f9210bfe72… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 29 23:17:31 2017 +0200 wined3d: Pass a wined3d_rendertarget_view to surface_cpu_blt_colour_fill(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 6c6f26f..e6a635f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3258,28 +3258,28 @@ release: return hr; } -static HRESULT surface_cpu_blt_colour_fill(struct wined3d_texture *texture, unsigned int sub_resource_idx, - const struct wined3d_box *box, DWORD c) +static HRESULT surface_cpu_blt_colour_fill(struct wined3d_rendertarget_view *view, + const struct wined3d_box *box, const struct wined3d_color *colour) { - struct wined3d_resource *resource = &texture->resource; unsigned int x, y, w, h, bpp; struct wined3d_map_desc map; BYTE *row; + DWORD c; - TRACE("texture %p, sub_resource_idx %u, box %s, colour 0x%08x.\n", - texture, sub_resource_idx, debug_box(box), c); + TRACE("view %p, box %s, colour %s.\n", view, debug_box(box), debug_color(colour)); - if (resource->format_flags & WINED3DFMT_FLAG_BLOCKS) + if (view->format_flags & WINED3DFMT_FLAG_BLOCKS) { - FIXME("Not implemented for format %s.\n", debug_d3dformat(resource->format->id)); + FIXME("Not implemented for format %s.\n", debug_d3dformat(view->format->id)); return E_NOTIMPL; } - bpp = resource->format->byte_count; + c = wined3d_format_convert_from_float(view->format, colour); + bpp = view->format->byte_count; w = box->right - box->left; h = box->bottom - box->top; - wined3d_resource_map(resource, sub_resource_idx, &map, box, 0); + wined3d_resource_map(view->resource, view->sub_resource_idx, &map, box, 0); switch (bpp) { @@ -3317,7 +3317,7 @@ static HRESULT surface_cpu_blt_colour_fill(struct wined3d_texture *texture, unsi default: FIXME("Not implemented for bpp %u.\n", bpp); - wined3d_resource_unmap(resource, sub_resource_idx); + wined3d_resource_unmap(view->resource, view->sub_resource_idx); return WINED3DERR_NOTAVAILABLE; } @@ -3327,7 +3327,7 @@ static HRESULT surface_cpu_blt_colour_fill(struct wined3d_texture *texture, unsi row += map.row_pitch; memcpy(row, map.data, w * bpp); } - wined3d_resource_unmap(resource, sub_resource_idx); + wined3d_resource_unmap(view->resource, view->sub_resource_idx); return WINED3D_OK; } @@ -3336,11 +3336,8 @@ static HRESULT cpu_blit_color_fill(struct wined3d_device *device, struct wined3d const RECT *rect, const struct wined3d_color *color) { const struct wined3d_box box = {rect->left, rect->top, rect->right, rect->bottom, 0, 1}; - DWORD c; - c = wined3d_format_convert_from_float(view->format, color); - return surface_cpu_blt_colour_fill(texture_from_resource(view->resource), - view->sub_resource_idx, &box, c); + return surface_cpu_blt_colour_fill(view, &box, color); } static HRESULT cpu_blit_depth_fill(struct wined3d_device *device, @@ -3349,7 +3346,6 @@ static HRESULT cpu_blit_depth_fill(struct wined3d_device *device, { const struct wined3d_box box = {rect->left, rect->top, rect->right, rect->bottom, 0, 1}; struct wined3d_color color = {depth, 0.0f, 0.0f, 0.0f}; - DWORD c; if (clear_flags != WINED3DCLEAR_ZBUFFER) { @@ -3357,9 +3353,7 @@ static HRESULT cpu_blit_depth_fill(struct wined3d_device *device, return WINED3DERR_INVALIDCALL; } - c = wined3d_format_convert_from_float(view->format, &color); - return surface_cpu_blt_colour_fill(texture_from_resource(view->resource), - view->sub_resource_idx, &box, c); + return surface_cpu_blt_colour_fill(view, &box, &color); } static void cpu_blit_blit_surface(struct wined3d_device *device, enum wined3d_blit_op op,

1 0

Jacek Caban : xmllite/tests: Added read_node helper.
by Alexandre Julliard 30 Mar '17

30 Mar '17

Module: wine Branch: master Commit: 8e344469bce5d7928e83968eea1055bb9984e1d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e344469bce5d7928e83968ee… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 29 19:45:25 2017 +0200 xmllite/tests: Added read_node 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 | 62 ++++++++++++++++++--------------------------- 1 file changed, 24 insertions(+), 38 deletions(-) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 40873a4..53b975b 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -234,6 +234,20 @@ static void _set_input_string(unsigned line, IXmlReader *reader, const char *xml IStream_Release(stream); } +#define read_node(a,b) _read_node(__LINE__,a,b) +static void _read_node(unsigned line, IXmlReader *reader, XmlNodeType expected_type) +{ + XmlNodeType type; + HRESULT hr; + + hr = IXmlReader_Read(reader, &type); + if (expected_type == XmlNodeType_None) + ok_(__FILE__,line)(hr == S_FALSE, "Read returned %08x, expected S_FALSE\n", hr); + else + ok_(__FILE__,line)(hr == S_OK, "Read returned %08x\n", hr); + ok_(__FILE__,line)(type == expected_type, "read type %d, expected %d\n", type, expected_type); +} + static void test_read_state(IXmlReader *reader, XmlReadState expected, XmlReadState exp_broken, int line) { @@ -776,11 +790,8 @@ static void test_read_xmldeclaration(void) TEST_READER_POSITION(reader, 0, 0); - type = -1; - hr = IXmlReader_Read(reader, &type); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(type == XmlNodeType_XmlDeclaration, - "Expected XmlNodeType_XmlDeclaration, got %s\n", type_to_str(type)); + read_node(reader, XmlNodeType_XmlDeclaration); + /* new version 1.2.x and 1.3.x properly update position for <?xml ?> */ TEST_READER_POSITION2(reader, 1, 3, ~0u, 55); @@ -873,10 +884,7 @@ todo_wine { hr = IXmlReader_SetInput(reader, (IUnknown *)stream); ok(hr == S_OK, "expected S_OK, got %08x\n", hr); - type = -1; - hr = IXmlReader_Read(reader, &type); - ok(hr == S_OK, "expected S_OK, got %08x\n", hr); - ok(type == XmlNodeType_XmlDeclaration, "expected XmlDeclaration, got %s\n", type_to_str(type)); + read_node(reader, XmlNodeType_XmlDeclaration); TEST_READER_POSITION2(reader, 1, 3, ~0u, 21); TEST_READER_STATE(reader, XmlReadState_Interactive); @@ -915,10 +923,7 @@ todo_wine { hr = IXmlReader_MoveToNextAttribute(reader); ok(hr == S_FALSE, "expected S_FALSE, got %08x\n", hr); - type = -1; - hr = IXmlReader_Read(reader, &type); - ok(hr == S_OK, "expected S_OK, got %08x\n", hr); - ok(type == XmlNodeType_Element, "expected Element, got %s\n", type_to_str(type)); + read_node(reader, XmlNodeType_Element); TEST_READER_POSITION2(reader, 1, 23, ~0u, 40); TEST_READER_STATE(reader, XmlReadState_Interactive); @@ -1193,7 +1198,6 @@ static void test_read_full(void) struct nodes_test *test = &misc_test; IXmlReader *reader; const WCHAR *value; - XmlNodeType type; ULONG len; HRESULT hr; int i; @@ -1204,16 +1208,9 @@ static void test_read_full(void) set_input_string(reader, test->xml); i = 0; - type = ~0u; do { - hr = IXmlReader_Read(reader, &type); - if (test->nodes[i].type != XmlNodeType_None) - ok(hr == S_OK, "Read returned %08x\n", hr); - else - ok(hr == S_FALSE, "Read returned %08x\n", hr); - - ok(type == test->nodes[i].type, "%d: got wrong type %d, expected %d\n", i, type, test->nodes[i].type); + read_node(reader, test->nodes[i].type); len = 0xdeadbeef; hr = IXmlReader_GetValue(reader, &value, &len); @@ -1255,10 +1252,7 @@ static void test_read_public_dtd(void) hr = IXmlReader_SetInput(reader, (IUnknown*)stream); ok(hr == S_OK, "got %08x\n", hr); - type = XmlNodeType_None; - hr = IXmlReader_Read(reader, &type); - ok(hr == S_OK, "got 0x%8x\n", hr); - ok(type == XmlNodeType_DocumentType, "got type %d\n", type); + read_node(reader, XmlNodeType_DocumentType); count = 0; hr = IXmlReader_GetAttributeCount(reader, &count); @@ -1358,10 +1352,7 @@ static void test_read_system_dtd(void) hr = IXmlReader_SetInput(reader, (IUnknown*)stream); ok(hr == S_OK, "got %08x\n", hr); - type = XmlNodeType_None; - hr = IXmlReader_Read(reader, &type); - ok(hr == S_OK, "got 0x%8x\n", hr); - ok(type == XmlNodeType_DocumentType, "got type %d\n", type); + read_node(reader, XmlNodeType_DocumentType); count = 0; hr = IXmlReader_GetAttributeCount(reader, &count); @@ -1409,10 +1400,8 @@ todo_wine { ok(len == lstrlenW(dtdnameW), "got %u\n", len); ok(!lstrcmpW(str, dtdnameW), "got %s\n", wine_dbgstr_w(str)); } - type = XmlNodeType_None; - hr = IXmlReader_Read(reader, &type); - ok(hr == S_OK, "got 0x%8x\n", hr); - ok(type == XmlNodeType_Comment, "got type %d\n", type); + + read_node(reader, XmlNodeType_Comment); IStream_Release(stream); IXmlReader_Release(reader); @@ -1589,10 +1578,7 @@ static void test_read_element(void) /* start/end tag mismatch */ set_input_string(reader, "<a></b>"); - type = XmlNodeType_None; - hr = IXmlReader_Read(reader, &type); - ok(hr == S_OK, "got %08x\n", hr); - ok(type == XmlNodeType_Element, "got %d\n", type); + read_node(reader, XmlNodeType_Element); type = XmlNodeType_Element; hr = IXmlReader_Read(reader, &type);

1 0

Jacek Caban : xmllite/tests: Added next_attribute helper.
by Alexandre Julliard 30 Mar '17

30 Mar '17

Module: wine Branch: master Commit: 99d2d5e44c79ce5fe1a51d769b7ddc992ead5855 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99d2d5e44c79ce5fe1a51d769… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 29 19:45:32 2017 +0200 xmllite/tests: Added next_attribute 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 53b975b..263a6a5 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -248,6 +248,14 @@ static void _read_node(unsigned line, IXmlReader *reader, XmlNodeType expected_t ok_(__FILE__,line)(type == expected_type, "read type %d, expected %d\n", type, expected_type); } +#define next_attribute(a) _next_attribute(__LINE__,a) +static void _next_attribute(unsigned line, IXmlReader *reader) +{ + HRESULT hr; + hr = IXmlReader_MoveToNextAttribute(reader); + ok_(__FILE__,line)(hr == S_OK, "MoveToNextAttribute returned %08x\n", hr); +} + static void test_read_state(IXmlReader *reader, XmlReadState expected, XmlReadState exp_broken, int line) { @@ -803,8 +811,7 @@ static void test_read_xmldeclaration(void) ok(*val == 0, "got %s\n", wine_dbgstr_w(val)); /* check attributes */ - hr = IXmlReader_MoveToNextAttribute(reader); - ok(hr == S_OK, "got %08x\n", hr); + next_attribute(reader); TEST_DEPTH(reader, 1); @@ -816,10 +823,8 @@ static void test_read_xmldeclaration(void) TEST_READER_POSITION2(reader, 1, 7, ~0u, 55); /* try to move from last attribute */ - hr = IXmlReader_MoveToNextAttribute(reader); - ok(hr == S_OK, "got %08x\n", hr); - hr = IXmlReader_MoveToNextAttribute(reader); - ok(hr == S_OK, "got %08x\n", hr); + next_attribute(reader); + next_attribute(reader); hr = IXmlReader_MoveToNextAttribute(reader); ok(hr == S_FALSE, "got %08x\n", hr); @@ -910,8 +915,7 @@ todo_wine { ok(!lstrcmpW(val, xmlW), "got %s\n", wine_dbgstr_w(val)); /* check attributes */ - hr = IXmlReader_MoveToNextAttribute(reader); - ok(hr == S_OK, "expected S_OK, got %08x\n", hr); + next_attribute(reader); type = -1; hr = IXmlReader_GetNodeType(reader, &type); @@ -1281,8 +1285,7 @@ static void test_read_public_dtd(void) ok(len == lstrlenW(pubvalW), "got %u\n", len); ok(!lstrcmpW(str, pubvalW), "got %s\n", wine_dbgstr_w(str)); - hr = IXmlReader_MoveToNextAttribute(reader); - ok(hr == S_OK, "got %08x\n", hr); + next_attribute(reader); type = XmlNodeType_None; hr = IXmlReader_GetNodeType(reader, &type); @@ -2143,8 +2146,7 @@ static void test_prefix(void) wine_dbgstr_w(expected)); free_str(expected); - hr = IXmlReader_MoveToNextAttribute(reader); - ok(hr == S_OK, "MoveToNextAttribute() failed, %#x.\n", hr); + next_attribute(reader); hr = IXmlReader_GetNodeType(reader, &type); ok(hr == S_OK, "GetNodeType() failed, %#x.\n", hr); @@ -2593,12 +2595,10 @@ static void test_reader_position(void) ok(type == XmlNodeType_Element, "got type %d\n", type); TEST_READER_POSITION2(reader, 1, 2, ~0u, 34); - hr = IXmlReader_MoveToNextAttribute(reader); - ok(hr == S_OK, "got %08x\n", hr); + next_attribute(reader); TEST_READER_POSITION2(reader, 1, 6, ~0u, 34); - hr = IXmlReader_MoveToNextAttribute(reader); - ok(hr == S_OK, "got %08x\n", hr); + next_attribute(reader); TEST_READER_POSITION2(reader, 1, 24, ~0u, 34); hr = IXmlReader_MoveToElement(reader);

1 0

Jacek Caban : xmllite/tests: Added reader_value helper.
by Alexandre Julliard 30 Mar '17

30 Mar '17

Module: wine Branch: master Commit: 0c91228bb005b486cd49aac99606a21908e82fe0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c91228bb005b486cd49aac99… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 29 19:45:50 2017 +0200 xmllite/tests: Added reader_value 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 | 152 ++++++++++---------------------------------- 1 file changed, 33 insertions(+), 119 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0c91228bb005b486cd49a…

1 0

Jacek Caban : xmllite/tests: Added reader_name helper.
by Alexandre Julliard 30 Mar '17

30 Mar '17

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