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

[PATCH 4/5] uxtheme: Support parsing more scrollbar parts and states.

by Zhiyi Zhang

From: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/stylemap.c | 27 +++++++++++++++++++++++++++ include/vsstyle.h | 1 + 2 files changed, 28 insertions(+) diff --git a/dlls/uxtheme/stylemap.c b/dlls/uxtheme/stylemap.c index 2d8ea05bb5c..b8e9eb95e43 100644 --- a/dlls/uxtheme/stylemap.c +++ b/dlls/uxtheme/stylemap.c @@ -841,41 +841,68 @@ static const MSSTYLES_CLASS_MAP classScrollbar[] = { {SBP_ARROWBTN, ABS_RIGHTHOT, L"RIGHTHOT"}, {SBP_ARROWBTN, ABS_RIGHTPRESSED, L"RIGHTPRESSED"}, {SBP_ARROWBTN, ABS_RIGHTDISABLED, L"RIGHTDISABLED"}, + {SBP_ARROWBTN, ABS_UPHOVER, L"UPHOVER"}, + {SBP_ARROWBTN, ABS_DOWNHOVER, L"DOWNHOVER"}, + {SBP_ARROWBTN, ABS_LEFTHOVER, L"LEFTHOVER"}, + {SBP_ARROWBTN, ABS_RIGHTHOVER, L"RIGHTHOVER"}, {SBP_THUMBBTNHORZ, 0, L"THUMBBTNHORZ"}, {SBP_THUMBBTNHORZ, SCRBS_NORMAL, L"NORMAL"}, {SBP_THUMBBTNHORZ, SCRBS_HOT, L"HOT"}, {SBP_THUMBBTNHORZ, SCRBS_PRESSED, L"PRESSED"}, {SBP_THUMBBTNHORZ, SCRBS_DISABLED, L"DISABLED"}, + {SBP_THUMBBTNHORZ, SCRBS_HOVER, L"HOVER"}, {SBP_THUMBBTNVERT, 0, L"THUMBBTNVERT"}, {SBP_THUMBBTNVERT, SCRBS_NORMAL, L"NORMAL"}, {SBP_THUMBBTNVERT, SCRBS_HOT, L"HOT"}, {SBP_THUMBBTNVERT, SCRBS_PRESSED, L"PRESSED"}, {SBP_THUMBBTNVERT, SCRBS_DISABLED, L"DISABLED"}, + {SBP_THUMBBTNVERT, SCRBS_HOVER, L"HOVER"}, {SBP_LOWERTRACKHORZ, 0, L"LOWERTRACKHORZ"}, {SBP_LOWERTRACKHORZ, SCRBS_NORMAL, L"NORMAL"}, {SBP_LOWERTRACKHORZ, SCRBS_HOT, L"HOT"}, {SBP_LOWERTRACKHORZ, SCRBS_PRESSED, L"PRESSED"}, {SBP_LOWERTRACKHORZ, SCRBS_DISABLED, L"DISABLED"}, + {SBP_LOWERTRACKHORZ, SCRBS_HOVER, L"HOVER"}, {SBP_UPPERTRACKHORZ, 0, L"UPPERTRACKHORZ"}, {SBP_UPPERTRACKHORZ, SCRBS_NORMAL, L"NORMAL"}, {SBP_UPPERTRACKHORZ, SCRBS_HOT, L"HOT"}, {SBP_UPPERTRACKHORZ, SCRBS_PRESSED, L"PRESSED"}, {SBP_UPPERTRACKHORZ, SCRBS_DISABLED, L"DISABLED"}, + {SBP_UPPERTRACKHORZ, SCRBS_HOVER, L"HOVER"}, {SBP_LOWERTRACKVERT, 0, L"LOWERTRACKVERT"}, {SBP_LOWERTRACKVERT, SCRBS_NORMAL, L"NORMAL"}, {SBP_LOWERTRACKVERT, SCRBS_HOT, L"HOT"}, {SBP_LOWERTRACKVERT, SCRBS_PRESSED, L"PRESSED"}, {SBP_LOWERTRACKVERT, SCRBS_DISABLED, L"DISABLED"}, + {SBP_LOWERTRACKVERT, SCRBS_HOVER, L"HOVER"}, {SBP_UPPERTRACKVERT, 0, L"UPPERTRACKVERT"}, {SBP_UPPERTRACKVERT, SCRBS_NORMAL, L"NORMAL"}, {SBP_UPPERTRACKVERT, SCRBS_HOT, L"HOT"}, {SBP_UPPERTRACKVERT, SCRBS_PRESSED, L"PRESSED"}, {SBP_UPPERTRACKVERT, SCRBS_DISABLED, L"DISABLED"}, + {SBP_UPPERTRACKVERT, SCRBS_HOVER, L"HOVER"}, {SBP_GRIPPERHORZ, 0, L"GRIPPERHORZ"}, + {SBP_GRIPPERHORZ, SCRBS_NORMAL, L"NORMAL"}, + {SBP_GRIPPERHORZ, SCRBS_HOT, L"HOT"}, + {SBP_GRIPPERHORZ, SCRBS_PRESSED, L"PRESSED"}, + {SBP_GRIPPERHORZ, SCRBS_DISABLED, L"DISABLED"}, + {SBP_GRIPPERHORZ, SCRBS_HOVER, L"HOVER"}, {SBP_GRIPPERVERT, 0, L"GRIPPERVERT"}, + {SBP_GRIPPERVERT, SCRBS_NORMAL, L"NORMAL"}, + {SBP_GRIPPERVERT, SCRBS_HOT, L"HOT"}, + {SBP_GRIPPERVERT, SCRBS_PRESSED, L"PRESSED"}, + {SBP_GRIPPERVERT, SCRBS_DISABLED, L"DISABLED"}, + {SBP_GRIPPERVERT, SCRBS_HOVER, L"HOVER"}, {SBP_SIZEBOX, 0, L"SIZEBOX"}, {SBP_SIZEBOX, SZB_RIGHTALIGN, L"RIGHTALIGN"}, {SBP_SIZEBOX, SZB_LEFTALIGN, L"LEFTALIGN"}, + {SBP_SIZEBOX, SZB_TOPRIGHTALIGN, L"TOPRIGHTALIGN"}, + {SBP_SIZEBOX, SZB_TOPLEFTALIGN, L"TOPLEFTALIGN"}, + {SBP_SIZEBOX, SZB_HALFBOTTOMRIGHTALIGN, L"HALFBOTTOMRIGHTALIGN"}, + {SBP_SIZEBOX, SZB_HALFBOTTOMLEFTALIGN, L"HALFBOTTOMLEFTALIGN"}, + {SBP_SIZEBOX, SZB_HALFTOPRIGHTALIGN, L"HALFTOPRIGHTALIGN"}, + {SBP_SIZEBOX, SZB_HALFTOPLEFTALIGN, L"HALFTOPLEFTALIGN"}, + {SBP_SIZEBOXBKGND, 0, L"SIZEBOXBKGND"}, {0, 0, L""} }; diff --git a/include/vsstyle.h b/include/vsstyle.h index 3075b4cdc08..b527c15a29a 100644 --- a/include/vsstyle.h +++ b/include/vsstyle.h @@ -1045,6 +1045,7 @@ enum SCROLLBARPARTS { SBP_GRIPPERHORZ = 8, SBP_GRIPPERVERT = 9, SBP_SIZEBOX = 10, + SBP_SIZEBOXBKGND = 11, }; #define SCROLLBARSTYLEPARTS SCROLLBARPARTS; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/297

June 22, 2022

[PATCH 3/5] uxtheme: Support parsing more rebar parts and states.

by Zhiyi Zhang

From: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/stylemap.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/uxtheme/stylemap.c b/dlls/uxtheme/stylemap.c index fa79c9d8840..2d8ea05bb5c 100644 --- a/dlls/uxtheme/stylemap.c +++ b/dlls/uxtheme/stylemap.c @@ -808,6 +808,18 @@ static const MSSTYLES_CLASS_MAP classRebar[] = { {RP_CHEVRON, CHEVS_HOT, L"HOT"}, {RP_CHEVRON, CHEVS_PRESSED, L"PRESSED"}, {RP_CHEVRONVERT, 0, L"CHEVRONVERT"}, + {RP_CHEVRONVERT, CHEVSV_NORMAL, L"NORMAL"}, + {RP_CHEVRONVERT, CHEVSV_HOT, L"HOT"}, + {RP_CHEVRONVERT, CHEVSV_PRESSED, L"PRESSED"}, + {RP_BACKGROUND, 0, L"BACKGROUND"}, + {RP_SPLITTER, 0, L"SPLITTER"}, + {RP_SPLITTER, SPLITS_NORMAL, L"NORMAL"}, + {RP_SPLITTER, SPLITS_HOT, L"HOT"}, + {RP_SPLITTER, SPLITS_PRESSED, L"PRESSED"}, + {RP_SPLITTERVERT, 0, L"SPLITTERVERT"}, + {RP_SPLITTERVERT, SPLITSV_NORMAL, L"NORMAL"}, + {RP_SPLITTERVERT, SPLITSV_HOT, L"HOT"}, + {RP_SPLITTERVERT, SPLITSV_PRESSED, L"PRESSED"}, {0, 0, L""} }; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/297

June 22, 2022

[PATCH 2/5] uxtheme: Support parsing navigation class.

by Zhiyi Zhang

From: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/stylemap.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/uxtheme/stylemap.c b/dlls/uxtheme/stylemap.c index 146df4f254a..fa79c9d8840 100644 --- a/dlls/uxtheme/stylemap.c +++ b/dlls/uxtheme/stylemap.c @@ -728,6 +728,25 @@ static const MSSTYLES_CLASS_MAP classMenuband[] = { {0, 0, L""} }; +static const MSSTYLES_CLASS_MAP classNavigation[] = { + {NAV_BACKBUTTON, 0, L"BACKBUTTON"}, + {NAV_BACKBUTTON, NAV_BB_NORMAL, L"NORMAL"}, + {NAV_BACKBUTTON, NAV_BB_HOT, L"HOT"}, + {NAV_BACKBUTTON, NAV_BB_PRESSED, L"PRESSED"}, + {NAV_BACKBUTTON, NAV_BB_DISABLED, L"DISABLED"}, + {NAV_FORWARDBUTTON, 0, L"FORWARDBUTTON"}, + {NAV_FORWARDBUTTON, NAV_FB_NORMAL, L"NORMAL"}, + {NAV_FORWARDBUTTON, NAV_FB_HOT, L"HOT"}, + {NAV_FORWARDBUTTON, NAV_FB_PRESSED, L"PRESSED"}, + {NAV_FORWARDBUTTON, NAV_FB_DISABLED, L"DISABLED"}, + {NAV_MENUBUTTON, 0, L"MENUBUTTON"}, + {NAV_MENUBUTTON, NAV_MB_NORMAL, L"NORMAL"}, + {NAV_MENUBUTTON, NAV_MB_HOT, L"HOT"}, + {NAV_MENUBUTTON, NAV_MB_PRESSED, L"PRESSED"}, + {NAV_MENUBUTTON, NAV_MB_DISABLED, L"DISABLED"}, + {0, 0, L""} +}; + static const MSSTYLES_CLASS_MAP classPage[] = { {PGRP_UP, 0, L"UP"}, {PGRP_UP, UPS_NORMAL, L"NORMAL"}, @@ -1253,6 +1272,7 @@ static const MSSTYLES_CLASS_NAME mapClass[] = { {classListview, L"LISTVIEW"}, {classMenu, L"MENU"}, {classMenuband, L"MENUBAND"}, + {classNavigation, L"NAVIGATION"}, {classPage, L"PAGE"}, {classProgress, L"PROGRESS"}, {classRebar, L"REBAR"}, -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/297

June 22, 2022

[PATCH 1/5] uxtheme: Support parsing more listview parts and states.

by Zhiyi Zhang

From: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/stylemap.c | 43 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/dlls/uxtheme/stylemap.c b/dlls/uxtheme/stylemap.c index 17fae04968b..146df4f254a 100644 --- a/dlls/uxtheme/stylemap.c +++ b/dlls/uxtheme/stylemap.c @@ -617,6 +617,49 @@ static const MSSTYLES_CLASS_MAP classListview[] = { {LVP_LISTDETAIL, 0, L"LISTDETAIL"}, {LVP_LISTSORTEDDETAIL, 0, L"LISTSORTEDDETAIL"}, {LVP_EMPTYTEXT, 0, L"EMPTYTEXT"}, + {LVP_GROUPHEADER, 0, L"GROUPHEADER"}, + {LVP_GROUPHEADER, LVGH_OPEN, L"OPEN"}, + {LVP_GROUPHEADER, LVGH_OPENHOT, L"OPENHOT"}, + {LVP_GROUPHEADER, LVGH_OPENSELECTED, L"OPENSELECTED"}, + {LVP_GROUPHEADER, LVGH_OPENSELECTEDHOT, L"OPENSELECTEDHOT"}, + {LVP_GROUPHEADER, LVGH_OPENSELECTEDNOTFOCUSED, L"OPENSELECTEDNOTFOCUSED"}, + {LVP_GROUPHEADER, LVGH_OPENSELECTEDNOTFOCUSEDHOT, L"OPENSELECTEDNOTFOCUSEDHOT"}, + {LVP_GROUPHEADER, LVGH_OPENMIXEDSELECTION, L"OPENMIXEDSELECTION"}, + {LVP_GROUPHEADER, LVGH_OPENMIXEDSELECTIONHOT, L"OPENMIXEDSELECTIONHOT"}, + {LVP_GROUPHEADER, LVGH_CLOSE, L"CLOSE"}, + {LVP_GROUPHEADER, LVGH_CLOSEHOT, L"CLOSEHOT"}, + {LVP_GROUPHEADER, LVGH_CLOSESELECTED, L"CLOSESELECTED"}, + {LVP_GROUPHEADER, LVGH_CLOSESELECTEDHOT, L"CLOSESELECTEDHOT"}, + {LVP_GROUPHEADER, LVGH_CLOSESELECTEDNOTFOCUSED, L"CLOSESELECTEDNOTFOCUSED"}, + {LVP_GROUPHEADER, LVGH_CLOSESELECTEDNOTFOCUSEDHOT, L"CLOSESELECTEDNOTFOCUSEDHOT"}, + {LVP_GROUPHEADER, LVGH_CLOSEMIXEDSELECTION, L"CLOSEMIXEDSELECTION"}, + {LVP_GROUPHEADER, LVGH_CLOSEMIXEDSELECTIONHOT, L"CLOSEMIXEDSELECTIONHOT"}, + {LVP_GROUPHEADERLINE, 0, L"GROUPHEADERLINE"}, + {LVP_GROUPHEADERLINE, LVGHL_OPEN, L"OPEN"}, + {LVP_GROUPHEADERLINE, LVGHL_OPENHOT, L"OPENHOT"}, + {LVP_GROUPHEADERLINE, LVGHL_OPENSELECTED, L"OPENSELECTED"}, + {LVP_GROUPHEADERLINE, LVGHL_OPENSELECTEDHOT, L"OPENSELECTEDHOT"}, + {LVP_GROUPHEADERLINE, LVGHL_OPENSELECTEDNOTFOCUSED, L"OPENSELECTEDNOTFOCUSED"}, + {LVP_GROUPHEADERLINE, LVGHL_OPENSELECTEDNOTFOCUSEDHOT, L"OPENSELECTEDNOTFOCUSEDHOT"}, + {LVP_GROUPHEADERLINE, LVGHL_OPENMIXEDSELECTION, L"OPENMIXEDSELECTION"}, + {LVP_GROUPHEADERLINE, LVGHL_OPENMIXEDSELECTIONHOT, L"OPENMIXEDSELECTIONHOT"}, + {LVP_GROUPHEADERLINE, LVGHL_CLOSE, L"CLOSE"}, + {LVP_GROUPHEADERLINE, LVGHL_CLOSEHOT, L"CLOSEHOT"}, + {LVP_GROUPHEADERLINE, LVGHL_CLOSESELECTED, L"CLOSESELECTED"}, + {LVP_GROUPHEADERLINE, LVGHL_CLOSESELECTEDHOT, L"CLOSESELECTEDHOT"}, + {LVP_GROUPHEADERLINE, LVGHL_CLOSESELECTEDNOTFOCUSED, L"CLOSESELECTEDNOTFOCUSED"}, + {LVP_GROUPHEADERLINE, LVGHL_CLOSESELECTEDNOTFOCUSEDHOT, L"CLOSESELECTEDNOTFOCUSEDHOT"}, + {LVP_GROUPHEADERLINE, LVGHL_CLOSEMIXEDSELECTION, L"CLOSEMIXEDSELECTION"}, + {LVP_GROUPHEADERLINE, LVGHL_CLOSEMIXEDSELECTIONHOT, L"CLOSEMIXEDSELECTIONHOT"}, + {LVP_EXPANDBUTTON, 0, L"EXPANDBUTTON"}, + {LVP_EXPANDBUTTON, LVEB_NORMAL, L"NORMAL"}, + {LVP_EXPANDBUTTON, LVEB_HOVER, L"HOVER"}, + {LVP_EXPANDBUTTON, LVEB_PUSHED, L"PUSHED"}, + {LVP_COLLAPSEBUTTON, 0, L"COLLAPSEBUTTON"}, + {LVP_COLLAPSEBUTTON, LVCB_NORMAL, L"NORMAL"}, + {LVP_COLLAPSEBUTTON, LVCB_HOVER, L"HOVER"}, + {LVP_COLLAPSEBUTTON, LVCB_PUSHED, L"PUSHED"}, + {LVP_COLUMNDETAIL, 0, L"COLUMNDETAIL"}, {0, 0, L""} }; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/297

June 22, 2022

[PATCH 0/5] MR297: uxtheme: Support parsing more listview parts and states.

by Zhiyi Zhang (＠zhiyi)

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/297

June 22, 2022

[PATCH 1/1] nsiproxy.sys: Add static ARP entries which are always present on Windows.

by Paul Gofman

From: Paul Gofman <pgofman(a)codeweavers.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53175 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/iphlpapi/tests/iphlpapi.c | 29 +++++++++++++++++++++++- dlls/nsi/tests/nsi.c | 6 +++++ dlls/nsiproxy.sys/ip.c | 40 ++++++++++++++++++++++++++++++++++ 3 files changed, 74 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 84d5143ba8e..6645326d845 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -369,7 +369,9 @@ static void testGetIpForwardTable(void) static void testGetIpNetTable(void) { - DWORD apiReturn; + const DWORD static_addr1 = 0x160000e0, static_addr2 = 0xfaffffef; + BOOL addr1_found, addr2_found; + DWORD apiReturn, prev_idx; ULONG dwSize = 0; unsigned int i; @@ -406,6 +408,31 @@ static void testGetIpNetTable(void) ok(ntohl(buf->table[i].dwAddr) <= ntohl(buf->table[i + 1].dwAddr), "Entries are not sorted by address, i %u.\n", i ); } + + addr1_found = addr2_found = FALSE; + prev_idx = ~0ul; + for (i = 0; i < buf->dwNumEntries; ++i) + { + if (buf->table[i].dwIndex != prev_idx) + { + if (prev_idx != ~0ul) + { + ok( addr1_found, "%s not found, iface index %lu.\n", ntoa( static_addr1 ), prev_idx); + ok( addr2_found || broken(!addr2_found) /* 239.255.255.250 is always present since Win10 */, + "%s not found.\n", ntoa( static_addr2 )); + } + prev_idx = buf->table[i].dwIndex; + addr1_found = addr2_found = FALSE; + } + if (buf->table[i].dwAddr == static_addr1) + addr1_found = TRUE; + else if (buf->table[i].dwAddr == static_addr2) + addr2_found = TRUE; + } + ok( addr1_found, "%s not found.\n", ntoa( static_addr1 )); + ok( addr2_found || broken(!addr2_found) /* 239.255.255.250 is always present since Win10 */, + "%s not found.\n", ntoa( static_addr2 )); + } if (apiReturn == NO_ERROR && winetest_debug > 1) diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index b6dd8f2416d..9ffdf9fba8d 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -663,6 +663,12 @@ static void test_ip_neighbour( int family ) ok( key4->luid.Value == row->InterfaceLuid.Value, "%s vs %s\n", wine_dbgstr_longlong( key4->luid.Value ), wine_dbgstr_longlong( row->InterfaceLuid.Value ) ); ok( key4->luid2.Value == row->InterfaceLuid.Value, "mismatch\n" ); + if (key4->addr.s_addr == 0x160000e0 || key4->addr.s_addr == 0xfaffffef) + { + ok( dyn->state == NlnsPermanent, "got state %d.\n", dyn->state ); + ok( !dyn->flags.is_router, "is_router is set.\n" ); + ok( !dyn->flags.is_unreachable, "is_unreachable is set.\n" ); + } } else if (family == AF_INET6) { diff --git a/dlls/nsiproxy.sys/ip.c b/dlls/nsiproxy.sys/ip.c index 79f3bd80bfe..59d9143e908 100644 --- a/dlls/nsiproxy.sys/ip.c +++ b/dlls/nsiproxy.sys/ip.c @@ -59,6 +59,10 @@ #include <netinet6/ip6_var.h> #endif +#ifdef HAVE_NET_IF_H +#include <net/if.h> +#endif + #ifdef __APPLE__ /* For reasons unknown, Mac OS doesn't export <netinet6/ip6_var.h> to user- * space. We'll have to define the needed struct ourselves. @@ -1004,6 +1008,7 @@ static NTSTATUS ipv4_neighbour_enumerate_all( void *key_data, UINT key_size, voi void *dynamic_data, UINT dynamic_size, void *static_data, UINT static_size, UINT_PTR *count ) { + struct if_nameindex *iface_indices, *iface; UINT num = 0; NTSTATUS status = STATUS_SUCCESS; BOOL want_data = key_size || rw_size || dynamic_size || static_size; @@ -1139,6 +1144,41 @@ static NTSTATUS ipv4_neighbour_enumerate_all( void *key_data, UINT key_size, voi return STATUS_NOT_IMPLEMENTED; #endif + if (!want_data || num <= *count) + { + iface_indices = if_nameindex(); + for (iface = iface_indices; iface->if_index; iface++) + { + if (num <= *count) + { + memset( &entry, 0, sizeof(entry) ); + entry.if_index = iface->if_index; + convert_index_to_luid( entry.if_index, &entry.luid ); + entry.state = NlnsPermanent; + entry.addr.s_addr = inet_addr( "224.0.0.22" ); + ipv4_neighbour_fill_entry( &entry, key_data, rw_data, dynamic_data, static_data ); + + if (key_data) key_data = (BYTE *)key_data + key_size; + if (rw_data) rw_data = (BYTE *)rw_data + rw_size; + if (dynamic_data) dynamic_data = (BYTE *)dynamic_data + dynamic_size; + if (static_data) static_data = (BYTE *)static_data + static_size; + } + num++; + if (num <= *count) + { + entry.addr.s_addr = inet_addr( "239.255.255.250" ); + ipv4_neighbour_fill_entry( &entry, key_data, rw_data, dynamic_data, static_data ); + + if (key_data) key_data = (BYTE *)key_data + key_size; + if (rw_data) rw_data = (BYTE *)rw_data + rw_size; + if (dynamic_data) dynamic_data = (BYTE *)dynamic_data + dynamic_size; + if (static_data) static_data = (BYTE *)static_data + static_size; + } + num++; + } + if_freenameindex( iface_indices ); + } + if (!want_data || num <= *count) *count = num; else status = STATUS_BUFFER_OVERFLOW; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/296

June 22, 2022

[PATCH 0/1] MR296: nsiproxy.sys: Add static ARP entries which are always present on Windows.

by Paul Gofman (＠gofman)

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53175 Split off from MR https://gitlab.winehq.org/wine/wine/-/merge_requests/286. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/296

June 22, 2022

Re: [PATCH v2 1/1] d3drm: Implement IDirect3DRMFrame{1/2/3}::SetSceneBackgroundImage

by Zebediah Figura

On 6/21/22 17:12, Alistair Leslie-Hughes wrote: > > > On 22/6/22 04:37, Zebediah Figura wrote: >> On 6/21/22 06:53, Alistair Leslie-Hughes wrote: >>> From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> >>> >>> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> >>> --- >>> dlls/d3drm/d3drm_private.h | 1 + >>> dlls/d3drm/frame.c | 38 +++++++++++++++++++++++++++++++------- >>> 2 files changed, 32 insertions(+), 7 deletions(-) >>> >> >> In general I'm concerned about these commits adding state tracking >> code that's never actually used. Most notably, it means we can't test >> anything but the state tracking, and while there's not *likely* to be >> anything wrong with the state tracking as it is, it's not impossible >> either. >> >> It's also going to make it harder to implement the real workhorse >> methods. Once you finally get to the point where you need to implement >> IDirect3DRMViewport::Render() [and, although it hasn't been stated, >> I'm guessing you're dealing with a d3drm application that is >> eventually going to call it], you'll have a whole lot of state that >> you'll suddenly need to implement, or else basically have methods that >> silently return success without doing anything useful, which is not >> good for debugging. > Yes, IDirect3DRMViewport::Render will be the have to be implemented at > some point and I understand the point your making. > > For reference: Star Wars Rebellion > > Currently this just crashes when starting a battle. If I just fixed the > crash (have a patch for it already), then it displays a dialog for every > function that doesn't return success. There is about 9 more patches to > stop all the scenarios, and in my opinion the crash is just as bad as 9+ > MessageBox's every render cycle. > > My thought was to implement the infrastructure as much as possible > first, then take on Render. Maybe starting to implement Render next > might be good idea. Sure, that kind of iteration is probably fine for local debugging, i.e. stub things out until you have a good idea of what all is going to be necessary. For upstream I think it's probably better to get to a state where we can properly render things, and then start implementing other states. I recognize that implementing the entire workhorse parts of d3drm is probably a much more daunting task than filling out the state tracking. Accordingly please don't hesitate to reach out for assistance :-)

June 21, 2022

Re: [PATCH v2 1/1] d3drm: Implement IDirect3DRMFrame{1/2/3}::SetSceneBackgroundImage

by Alistair Leslie-Hughes

On 22/6/22 04:37, Zebediah Figura wrote: > On 6/21/22 06:53, Alistair Leslie-Hughes wrote: >> From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> >> >> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> >> --- >> dlls/d3drm/d3drm_private.h | 1 + >> dlls/d3drm/frame.c | 38 +++++++++++++++++++++++++++++++------- >> 2 files changed, 32 insertions(+), 7 deletions(-) >> > > In general I'm concerned about these commits adding state tracking code > that's never actually used. Most notably, it means we can't test > anything but the state tracking, and while there's not *likely* to be > anything wrong with the state tracking as it is, it's not impossible > either. > > It's also going to make it harder to implement the real workhorse > methods. Once you finally get to the point where you need to implement > IDirect3DRMViewport::Render() [and, although it hasn't been stated, I'm > guessing you're dealing with a d3drm application that is eventually > going to call it], you'll have a whole lot of state that you'll suddenly > need to implement, or else basically have methods that silently return > success without doing anything useful, which is not good for debugging. Yes, IDirect3DRMViewport::Render will be the have to be implemented at some point and I understand the point your making. For reference: Star Wars Rebellion Currently this just crashes when starting a battle. If I just fixed the crash (have a patch for it already), then it displays a dialog for every function that doesn't return success. There is about 9 more patches to stop all the scenarios, and in my opinion the crash is just as bad as 9+ MessageBox's every render cycle. My thought was to implement the infrastructure as much as possible first, then take on Render. Maybe starting to implement Render next might be good idea. Regards Alistair.

June 21, 2022

Re: [PATCH v2 4/5] iphlpapi/tests: Factor out interface identifier conversion with invalid parameters.

by Marvin

Hi, It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated. The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=117414 Your paranoid android. === w8adm (32 bit report) === iphlpapi: iphlpapi.c:1692: Test failed: expected 2780, got 2820 iphlpapi.c:1696: Test failed: expected ERROR_SUCCESS got 111

June 21, 2022