- Wine-Devel - list.winehq.org

[PATCH 05/10] gdi32: Merge mfdrv/bitblt.c into metadc.c.
by Jacek Caban Aug. 18, 2021

Aug. 18, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/Makefile.in | 1 - dlls/gdi32/metadc.c | 138 +++++++++++++++++++++++++++++ dlls/gdi32/mfdrv/bitblt.c | 177 -------------------------------------- 3 files changed, 138 insertions(+), 178 deletions(-) delete mode 100644 dlls/gdi32/mfdrv/bitblt.c

2 1

[PATCH 04/10] gdi32: Merge mfdrv/objects.c into metadc.c.
by Jacek Caban Aug. 18, 2021

Aug. 18, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/Makefile.in | 1 - dlls/gdi32/metadc.c | 379 ++++++++++++++++++++++++++ dlls/gdi32/mfdrv/metafiledrv.h | 4 - dlls/gdi32/mfdrv/objects.c | 467 --------------------------------- 4 files changed, 379 insertions(+), 472 deletions(-) delete mode 100644 dlls/gdi32/mfdrv/objects.c

2 1

[PATCH 03/10] gdi32: Merge mfdrv/graphics.c into metadc.c.
by Jacek Caban Aug. 18, 2021

Aug. 18, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/Makefile.in | 1 - dlls/gdi32/metadc.c | 322 +++++++++++++++++++++++++++ dlls/gdi32/mfdrv/graphics.c | 430 ------------------------------------ 3 files changed, 322 insertions(+), 431 deletions(-) delete mode 100644 dlls/gdi32/mfdrv/graphics.c

2 1

[PATCH 02/10] gdi32: Merge mfdrv/dc.c into metadc.c.
by Jacek Caban Aug. 18, 2021

Aug. 18, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/Makefile.in | 1 - dlls/gdi32/metadc.c | 130 +++++++++++++++++++++++++++++++++++ dlls/gdi32/mfdrv/dc.c | 151 ----------------------------------------- 3 files changed, 130 insertions(+), 152 deletions(-) delete mode 100644 dlls/gdi32/mfdrv/dc.c

2 1

[PATCH 01/10] gdi32: Move mfdrv/init.c to new metadc.c file.
by Jacek Caban Aug. 18, 2021

Aug. 18, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/Makefile.in | 2 +- dlls/gdi32/{mfdrv/init.c => metadc.c} | 344 ++++++++++++-------------- 2 files changed, 158 insertions(+), 188 deletions(-) rename dlls/gdi32/{mfdrv/init.c => metadc.c} (87%)

2 1

[PATCH v2 2/2] user32: Check control type in the STM_SETIMAGE/STM_SETICON handlers before calling the helpers.
by Dmitry Timoshkov Aug. 18, 2021

Aug. 18, 2021

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/static.c | 7 ++- dlls/user32/tests/static.c | 121 ++++++++++++++++++++++++++++++++++++- 2 files changed, 122 insertions(+), 6 deletions(-) diff --git a/dlls/user32/static.c b/dlls/user32/static.c index 72e49e15e8f..35bdc2490c0 100644 --- a/dlls/user32/static.c +++ b/dlls/user32/static.c @@ -103,7 +103,6 @@ static HICON STATIC_SetIcon( HWND hwnd, HICON hicon, DWORD style ) HICON prevIcon; SIZE size; - if ((style & SS_TYPEMASK) != SS_ICON) return 0; if (hicon && !get_icon_size( hicon, &size )) { WARN("hicon != 0, but invalid\n"); @@ -138,7 +137,6 @@ static HBITMAP STATIC_SetBitmap( HWND hwnd, HBITMAP hBitmap, DWORD style ) { HBITMAP hOldBitmap; - if ((style & SS_TYPEMASK) != SS_BITMAP) return 0; if (hBitmap && GetObjectType(hBitmap) != OBJ_BITMAP) { WARN("hBitmap != 0, but it's not a bitmap\n"); return 0; @@ -174,7 +172,6 @@ static HBITMAP STATIC_SetBitmap( HWND hwnd, HBITMAP hBitmap, DWORD style ) */ static HENHMETAFILE STATIC_SetEnhMetaFile( HWND hwnd, HENHMETAFILE hEnhMetaFile, DWORD style ) { - if ((style & SS_TYPEMASK) != SS_ENHMETAFILE) return 0; if (hEnhMetaFile && GetObjectType(hEnhMetaFile) != OBJ_ENHMETAFILE) { WARN("hEnhMetaFile != 0, but it's not an enhanced metafile\n"); return 0; @@ -501,13 +498,16 @@ LRESULT StaticWndProc_common( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam case STM_SETIMAGE: switch(wParam) { case IMAGE_BITMAP: + if (style != SS_BITMAP) return 0; lResult = (LRESULT)STATIC_SetBitmap( hwnd, (HBITMAP)lParam, full_style ); break; case IMAGE_ENHMETAFILE: + if (style != SS_ENHMETAFILE) return 0; lResult = (LRESULT)STATIC_SetEnhMetaFile( hwnd, (HENHMETAFILE)lParam, full_style ); break; case IMAGE_ICON: case IMAGE_CURSOR: + if (style != SS_ICON) return 0; lResult = (LRESULT)STATIC_SetIcon( hwnd, (HICON)lParam, full_style ); break; default: @@ -518,6 +518,7 @@ LRESULT StaticWndProc_common( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam break; case STM_SETICON: + if (style != SS_ICON) return 0; lResult = (LRESULT)STATIC_SetIcon( hwnd, (HICON)wParam, full_style ); STATIC_TryPaintFcn( hwnd, full_style ); break; diff --git a/dlls/user32/tests/static.c b/dlls/user32/tests/static.c index 0c453d08a67..731e0f5df72 100644 --- a/dlls/user32/tests/static.c +++ b/dlls/user32/tests/static.c @@ -20,9 +20,11 @@ #include <stdarg.h> #include <stdio.h> -#define STRICT -#define WIN32_LEAN_AND_MEAN -#include <windows.h> +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#define OEMRESOURCE +#include "winuser.h" #include "wine/test.h" @@ -189,6 +191,118 @@ static void test_set_image(void) DeleteObject(image); } +static void test_STM_SETIMAGE(void) +{ + DWORD type; + HWND hwnd; + HICON icon, old_image; + HBITMAP bmp; + HENHMETAFILE emf; + HDC dc; + + icon = LoadIconW(0, (LPCWSTR)IDI_APPLICATION); + bmp = LoadBitmapW(0, (LPCWSTR)OBM_CLOSE); + dc = CreateEnhMetaFileW(0, NULL, NULL, NULL); + LineTo(dc, 1, 1); + emf = CloseEnhMetaFile(dc); + DeleteDC(dc); + + for (type = SS_LEFT; type < SS_ETCHEDFRAME; type++) + { + winetest_push_context("%u", type); + + hwnd = build_static(type); + ok(hwnd != 0, "failed to create static type %#x\n", type); + + /* set icon */ + g_nReceivedColorStatic = 0; + old_image = (HICON)SendMessageW(hwnd, STM_SETIMAGE, IMAGE_ICON, (LPARAM)icon); + ok(!old_image, "got %p\n", old_image); + if (type == SS_ICON) + ok(g_nReceivedColorStatic, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic); + else + ok(!g_nReceivedColorStatic, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic); + + g_nReceivedColorStatic = 0; + old_image = (HICON)SendMessageW(hwnd, STM_SETIMAGE, IMAGE_ICON, (LPARAM)icon); + if (type == SS_ICON) + { + ok(old_image != 0, "got %p\n", old_image); + ok(g_nReceivedColorStatic, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic); + } + else + { + ok(!old_image, "got %p\n", old_image); + ok(!g_nReceivedColorStatic, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic); + } + + g_nReceivedColorStatic = 0; + old_image = (HICON)SendMessageW(hwnd, STM_SETICON, (WPARAM)icon, 0); + if (type == SS_ICON) + { + ok(old_image != 0, "got %p\n", old_image); + ok(g_nReceivedColorStatic, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic); + } + else + { + ok(!old_image, "got %p\n", old_image); + ok(!g_nReceivedColorStatic, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic); + } + + /* set bitmap */ + g_nReceivedColorStatic = 0; + old_image = (HICON)SendMessageW(hwnd, STM_SETIMAGE, IMAGE_BITMAP, (LPARAM)bmp); + ok(!old_image, "got %p\n", old_image); + if (type == SS_BITMAP) + ok(g_nReceivedColorStatic, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic); + else + ok(!g_nReceivedColorStatic, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic); + + g_nReceivedColorStatic = 0; + old_image = (HICON)SendMessageW(hwnd, STM_SETIMAGE, IMAGE_BITMAP, (LPARAM)bmp); + if (type == SS_BITMAP) + { + ok(old_image != 0, "got %p\n", old_image); + ok(g_nReceivedColorStatic, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic); + } + else + { + ok(!old_image, "got %p\n", old_image); + ok(!g_nReceivedColorStatic, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic); + } + + /* set EMF */ + g_nReceivedColorStatic = 0; + old_image = (HICON)SendMessageW(hwnd, STM_SETIMAGE, IMAGE_ENHMETAFILE, (LPARAM)emf); + ok(!old_image, "got %p\n", old_image); + if (type == SS_ENHMETAFILE) + ok(g_nReceivedColorStatic, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic); + else + ok(!g_nReceivedColorStatic, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic); + + g_nReceivedColorStatic = 0; + old_image = (HICON)SendMessageW(hwnd, STM_SETIMAGE, IMAGE_ENHMETAFILE, (LPARAM)emf); + if (type == SS_ENHMETAFILE) + { + ok(old_image != 0, "got %p\n", old_image); + ok(g_nReceivedColorStatic, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic); + } + else + { + ok(!old_image, "got %p\n", old_image); + ok(!g_nReceivedColorStatic, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic); + } + + DestroyWindow(hwnd); + + winetest_pop_context(); + } + + DestroyIcon(icon); + DeleteObject(bmp); + DeleteEnhMetaFile(emf); +} + START_TEST(static) { static const char szClassName[] = "testclass"; @@ -222,6 +336,7 @@ START_TEST(static) test_updates(SS_ETCHEDVERT, TODO_COUNT); test_set_text(); test_set_image(); + test_STM_SETIMAGE(); DestroyWindow(hMainWnd); } -- 2.31.1

1 0

[PATCH v2 1/2] comctl32: Check control type in the STM_SETIMAGE/STM_SETICON handlers before calling the helpers.
by Dmitry Timoshkov Aug. 18, 2021

Aug. 18, 2021

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/comctl32/static.c | 7 +- dlls/comctl32/tests/static.c | 121 ++++++++++++++++++++++++++++++++++- 2 files changed, 122 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/static.c b/dlls/comctl32/static.c index 2bd2b22bc20..60af6696425 100644 --- a/dlls/comctl32/static.c +++ b/dlls/comctl32/static.c @@ -133,7 +133,6 @@ static HICON STATIC_SetIcon( HWND hwnd, HICON hicon, DWORD style ) SIZE size; struct static_extra_info *extra; - if ((style & SS_TYPEMASK) != SS_ICON) return 0; if (hicon && !get_icon_size( hicon, &size )) { WARN("hicon != 0, but invalid\n"); @@ -220,7 +219,6 @@ static HBITMAP STATIC_SetBitmap( HWND hwnd, HBITMAP hBitmap, DWORD style ) HBITMAP hOldBitmap, alpha; struct static_extra_info *extra; - if ((style & SS_TYPEMASK) != SS_BITMAP) return 0; if (hBitmap && GetObjectType(hBitmap) != OBJ_BITMAP) { WARN("hBitmap != 0, but it's not a bitmap\n"); @@ -277,7 +275,6 @@ static HENHMETAFILE STATIC_SetEnhMetaFile( HWND hwnd, HENHMETAFILE hEnhMetaFile, HENHMETAFILE old_hemf; struct static_extra_info *extra; - if ((style & SS_TYPEMASK) != SS_ENHMETAFILE) return 0; if (hEnhMetaFile && GetObjectType(hEnhMetaFile) != OBJ_ENHMETAFILE) { WARN("hEnhMetaFile != 0, but it's not an enhanced metafile\n"); @@ -594,13 +591,16 @@ static LRESULT CALLBACK STATIC_WindowProc( HWND hwnd, UINT uMsg, WPARAM wParam, switch (wParam) { case IMAGE_BITMAP: + if (style != SS_BITMAP) return 0; lResult = (LRESULT)STATIC_SetBitmap( hwnd, (HBITMAP)lParam, full_style ); break; case IMAGE_ENHMETAFILE: + if (style != SS_ENHMETAFILE) return 0; lResult = (LRESULT)STATIC_SetEnhMetaFile( hwnd, (HENHMETAFILE)lParam, full_style ); break; case IMAGE_ICON: case IMAGE_CURSOR: + if (style != SS_ICON) return 0; lResult = (LRESULT)STATIC_SetIcon( hwnd, (HICON)lParam, full_style ); break; default: @@ -611,6 +611,7 @@ static LRESULT CALLBACK STATIC_WindowProc( HWND hwnd, UINT uMsg, WPARAM wParam, break; case STM_SETICON: + if (style != SS_ICON) return 0; lResult = (LRESULT)STATIC_SetIcon( hwnd, (HICON)wParam, full_style ); STATIC_TryPaintFcn( hwnd, full_style ); break; diff --git a/dlls/comctl32/tests/static.c b/dlls/comctl32/tests/static.c index 4efb7685790..40a337b97b0 100644 --- a/dlls/comctl32/tests/static.c +++ b/dlls/comctl32/tests/static.c @@ -20,9 +20,11 @@ #include <stdarg.h> #include <stdio.h> -#define STRICT -#define WIN32_LEAN_AND_MEAN -#include <windows.h> +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#define OEMRESOURCE +#include "winuser.h" #include "commctrl.h" #include "resources.h" @@ -263,6 +265,118 @@ static void test_set_image(void) DeleteObject(image); } +static void test_STM_SETIMAGE(void) +{ + DWORD type; + HWND hwnd; + HICON icon, old_image; + HBITMAP bmp; + HENHMETAFILE emf; + HDC dc; + + icon = LoadIconW(0, (LPCWSTR)IDI_APPLICATION); + bmp = LoadBitmapW(0, (LPCWSTR)OBM_CLOSE); + dc = CreateEnhMetaFileW(0, NULL, NULL, NULL); + LineTo(dc, 1, 1); + emf = CloseEnhMetaFile(dc); + DeleteDC(dc); + + for (type = SS_LEFT; type < SS_ETCHEDFRAME; type++) + { + winetest_push_context("%u", type); + + hwnd = create_static(type); + ok(hwnd != 0, "failed to create static type %#x\n", type); + + /* set icon */ + g_nReceivedColorStatic = 0; + old_image = (HICON)SendMessageW(hwnd, STM_SETIMAGE, IMAGE_ICON, (LPARAM)icon); + ok(!old_image, "got %p\n", old_image); + if (type == SS_ICON) + ok(g_nReceivedColorStatic, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic); + else + ok(!g_nReceivedColorStatic, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic); + + g_nReceivedColorStatic = 0; + old_image = (HICON)SendMessageW(hwnd, STM_SETIMAGE, IMAGE_ICON, (LPARAM)icon); + if (type == SS_ICON) + { + ok(old_image != 0, "got %p\n", old_image); + ok(g_nReceivedColorStatic, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic); + } + else + { + ok(!old_image, "got %p\n", old_image); + ok(!g_nReceivedColorStatic, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic); + } + + g_nReceivedColorStatic = 0; + old_image = (HICON)SendMessageW(hwnd, STM_SETICON, (WPARAM)icon, 0); + if (type == SS_ICON) + { + ok(old_image != 0, "got %p\n", old_image); + ok(g_nReceivedColorStatic, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic); + } + else + { + ok(!old_image, "got %p\n", old_image); + ok(!g_nReceivedColorStatic, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic); + } + + /* set bitmap */ + g_nReceivedColorStatic = 0; + old_image = (HICON)SendMessageW(hwnd, STM_SETIMAGE, IMAGE_BITMAP, (LPARAM)bmp); + ok(!old_image, "got %p\n", old_image); + if (type == SS_BITMAP) + ok(g_nReceivedColorStatic, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic); + else + ok(!g_nReceivedColorStatic, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic); + + g_nReceivedColorStatic = 0; + old_image = (HICON)SendMessageW(hwnd, STM_SETIMAGE, IMAGE_BITMAP, (LPARAM)bmp); + if (type == SS_BITMAP) + { + ok(old_image != 0, "got %p\n", old_image); + ok(g_nReceivedColorStatic, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic); + } + else + { + ok(!old_image, "got %p\n", old_image); + ok(!g_nReceivedColorStatic, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic); + } + + /* set EMF */ + g_nReceivedColorStatic = 0; + old_image = (HICON)SendMessageW(hwnd, STM_SETIMAGE, IMAGE_ENHMETAFILE, (LPARAM)emf); + ok(!old_image, "got %p\n", old_image); + if (type == SS_ENHMETAFILE) + ok(g_nReceivedColorStatic, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic); + else + ok(!g_nReceivedColorStatic, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic); + + g_nReceivedColorStatic = 0; + old_image = (HICON)SendMessageW(hwnd, STM_SETIMAGE, IMAGE_ENHMETAFILE, (LPARAM)emf); + if (type == SS_ENHMETAFILE) + { + ok(old_image != 0, "got %p\n", old_image); + ok(g_nReceivedColorStatic, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic); + } + else + { + ok(!old_image, "got %p\n", old_image); + ok(!g_nReceivedColorStatic, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic); + } + + DestroyWindow(hwnd); + + winetest_pop_context(); + } + + DestroyIcon(icon); + DeleteObject(bmp); + DeleteEnhMetaFile(emf); +} + START_TEST(static) { static const char classname[] = "testclass"; @@ -302,6 +416,7 @@ START_TEST(static) test_updates(SS_ETCHEDVERT, TODO_COUNT); test_set_text(); test_set_image(); + test_STM_SETIMAGE(); DestroyWindow(hMainWnd); -- 2.31.1

1 0

[PATCH] [DbgHelp]: fix copy_line_W64_from_64 when A and W buffers are identical
by Eric Pouech Aug. 18, 2021

Aug. 18, 2021

As reported by Alistair, when doing Unicode conversion for FileName field from IMAGEHLP_LINE64 into IMAGEHLP_LINE64W, both structures would refer to the same buffer allocated by fetch_buffer. So properly detect and handle this situation. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/symbol.c | 35 +++++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index b2b4d578910..3b264eb9a52 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -1588,19 +1588,39 @@ static void copy_line_64_from_32(IMAGEHLP_LINE64* l64, const IMAGEHLP_LINE* l32) } /****************************************************************** - * copy_line_W64_from_32 (internal) + * copy_line_W64_from_64 (internal) * + * Note: upon return, l64w->FileName is always allocated by fetch_buffer(). + * So, if input l64->FileName has *also* been allocated by fetch_buffer() + * before calling this function, l64->FileName will be overwritten + * (as it's the same buffer returned in l64w). + * In consequence, don't use the l64 structure *after* calling this function. */ -static void copy_line_W64_from_64(struct process* pcs, IMAGEHLP_LINEW64* l64w, const IMAGEHLP_LINE64* l64) +static BOOL copy_line_W64_from_64(struct process* pcs, IMAGEHLP_LINEW64* l64w, const IMAGEHLP_LINE64* l64) { - unsigned len; + char* incoming = l64->FileName; + unsigned len = MultiByteToWideChar(CP_ACP, 0, l64->FileName, -1, NULL, 0); + + /* detect when l64->FileName has been allocated by fetch_buffer() + * and make a copy before calling fetch_buffer() again + */ + if (incoming >= (char*)pcs->buffer && incoming < (char*)pcs->buffer + pcs->buffer_size) + { + DWORD sz = strlen(incoming) + 1; + char* new = HeapAlloc(GetProcessHeap(), 0, sz); + if (!new) + return FALSE; + incoming = memcpy(new, incoming, sz); + } l64w->Key = l64->Key; l64w->LineNumber = l64->LineNumber; - len = MultiByteToWideChar(CP_ACP, 0, l64->FileName, -1, NULL, 0); - if ((l64w->FileName = fetch_buffer(pcs, len * sizeof(WCHAR)))) - MultiByteToWideChar(CP_ACP, 0, l64->FileName, -1, l64w->FileName, len); l64w->Address = l64->Address; + if (!(l64w->FileName = fetch_buffer(pcs, len * sizeof(WCHAR)))) + return FALSE; + MultiByteToWideChar(CP_ACP, 0, incoming, -1, l64w->FileName, len); + if (incoming != l64->FileName) HeapFree(GetProcessHeap(), 0, incoming); + return TRUE; } /****************************************************************** @@ -1671,8 +1691,7 @@ BOOL WINAPI SymGetLineFromAddrW64(HANDLE hProcess, DWORD64 dwAddr, il64.SizeOfStruct = sizeof(il64); if (!SymGetLineFromAddr64(hProcess, dwAddr, pdwDisplacement, &il64)) return FALSE; - copy_line_W64_from_64(process_find_by_handle(hProcess), Line, &il64); - return TRUE; + return copy_line_W64_from_64(process_find_by_handle(hProcess), Line, &il64); } /******************************************************************

1 0

[PATCH 5/5] iphlpapi: Implement GetUdpStatisticsEx() on top of nsi.
by Huw Davies Aug. 18, 2021

Aug. 18, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/Makefile.in | 4 +- dlls/iphlpapi/ifenum.c | 395 ---------------------------------- dlls/iphlpapi/ifenum.h | 66 ------ dlls/iphlpapi/iphlpapi_main.c | 48 ++++- dlls/iphlpapi/ipstats.c | 370 ------------------------------- dlls/nsi/tests/nsi.c | 1 - 6 files changed, 48 insertions(+), 836 deletions(-) delete mode 100644 dlls/iphlpapi/ifenum.c delete mode 100644 dlls/iphlpapi/ifenum.h delete mode 100644 dlls/iphlpapi/ipstats.c diff --git a/dlls/iphlpapi/Makefile.in b/dlls/iphlpapi/Makefile.in index 3797ac793e6..326cf8bf75e 100644 --- a/dlls/iphlpapi/Makefile.in +++ b/dlls/iphlpapi/Makefile.in @@ -5,8 +5,6 @@ EXTRALIBS = $(KSTAT_LIBS) $(PROCSTAT_LIBS) C_SRCS = \ icmp.c \ - ifenum.c \ - iphlpapi_main.c \ - ipstats.c + iphlpapi_main.c RC_SRCS = version.rc diff --git a/dlls/iphlpapi/ifenum.c b/dlls/iphlpapi/ifenum.c deleted file mode 100644 index 0264f621b1f..00000000000 --- a/dlls/iphlpapi/ifenum.c +++ /dev/null @@ -1,395 +0,0 @@ -/* Copyright (C) 2003,2006,2011 Juan Lang - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "config.h" - -#include <stdarg.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> - -#ifdef HAVE_UNISTD_H -#include <unistd.h> -#endif - -#include <sys/types.h> -#ifdef HAVE_SYS_PARAM_H -#include <sys/param.h> -#endif - -#ifdef HAVE_SYS_SOCKET_H -#include <sys/socket.h> -#endif - -#ifdef HAVE_NET_IF_H -#include <net/if.h> -#endif - -#ifdef HAVE_NET_IF_ARP_H -#include <net/if_arp.h> -#endif - -#ifdef HAVE_NET_ROUTE_H -#include <net/route.h> -#endif - -#ifdef HAVE_SYS_IOCTL_H -#include <sys/ioctl.h> -#endif - -#ifdef HAVE_SYS_SYSCTL_H -#include <sys/sysctl.h> -#endif - -#ifdef HAVE_SYS_SOCKIO_H -#include <sys/sockio.h> -#endif - -#ifdef HAVE_NET_IF_DL_H -#include <net/if_dl.h> -#endif - -#ifdef HAVE_NET_IF_TYPES_H -#include <net/if_types.h> -#endif - -#ifdef HAVE_NETINET_IN_H -#include <netinet/in.h> -#endif - -#ifdef HAVE_IFADDRS_H -#include <ifaddrs.h> -#endif - -#ifdef HAVE_LINUX_RTNETLINK_H -#include <linux/rtnetlink.h> -#endif - -#include "ifenum.h" -#include "ws2ipdef.h" - -#ifdef HAVE_STRUCT_SOCKADDR_SA_LEN -#define ifreq_len(ifr) \ - max(sizeof(struct ifreq), sizeof((ifr)->ifr_name)+(ifr)->ifr_addr.sa_len) -#else -#define ifreq_len(ifr) sizeof(struct ifreq) -#endif - -#ifndef ETH_ALEN -#define ETH_ALEN 6 -#endif - -#ifndef IF_NAMESIZE -#define IF_NAMESIZE 16 -#endif - -#ifndef INADDR_NONE -#define INADDR_NONE (~0U) -#endif - -#define INITIAL_INTERFACES_ASSUMED 4 - -/* Functions */ - -static BOOL isLoopbackInterface(int fd, const char *name) -{ - BOOL ret = FALSE; - - if (name) { - struct ifreq ifr; - - lstrcpynA(ifr.ifr_name, name, IFNAMSIZ); - if (ioctl(fd, SIOCGIFFLAGS, &ifr) == 0) - ret = ifr.ifr_flags & IFF_LOOPBACK; - } - return !!ret; -} - -/* The comments say MAX_ADAPTER_NAME is required, but really only IF_NAMESIZE - * bytes are necessary. - */ -static char *getInterfaceNameByIndex(IF_INDEX index, char *name) -{ - return if_indextoname(index, name); -} - -DWORD getInterfaceIndexByName(const char *name, IF_INDEX *index) -{ - DWORD ret; - unsigned int idx; - - if (!name) - return ERROR_INVALID_PARAMETER; - if (!index) - return ERROR_INVALID_PARAMETER; - idx = if_nametoindex(name); - if (idx) { - *index = idx; - ret = NO_ERROR; - } - else - ret = ERROR_INVALID_DATA; - return ret; -} - -static BOOL isIfIndexLoopback(ULONG idx) -{ - BOOL ret = FALSE; - char name[IFNAMSIZ]; - int fd; - - getInterfaceNameByIndex(idx, name); - fd = socket(PF_INET, SOCK_DGRAM, 0); - if (fd != -1) { - ret = isLoopbackInterface(fd, name); - close(fd); - } - return ret; -} - -#ifdef HAVE_IF_NAMEINDEX -DWORD get_interface_indices( BOOL skip_loopback, InterfaceIndexTable **table ) -{ - DWORD count = 0, i; - struct if_nameindex *p, *indices = if_nameindex(); - InterfaceIndexTable *ret; - - if (table) *table = NULL; - if (!indices) return 0; - - for (p = indices; p->if_name; p++) - { - if (skip_loopback && isIfIndexLoopback( p->if_index )) continue; - count++; - } - - if (table) - { - ret = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET(InterfaceIndexTable, indexes[count]) ); - if (!ret) - { - count = 0; - goto end; - } - for (p = indices, i = 0; p->if_name && i < count; p++) - { - if (skip_loopback && isIfIndexLoopback( p->if_index )) continue; - ret->indexes[i++] = p->if_index; - } - ret->numIndexes = count = i; - *table = ret; - } - -end: - if_freenameindex( indices ); - return count; -} - -#elif defined(HAVE_LINUX_RTNETLINK_H) -static int open_netlink( int *pid ) -{ - int fd = socket( AF_NETLINK, SOCK_RAW, NETLINK_ROUTE ); - struct sockaddr_nl addr; - socklen_t len; - - if (fd < 0) return fd; - - memset( &addr, 0, sizeof(addr) ); - addr.nl_family = AF_NETLINK; - - if (bind( fd, (struct sockaddr *)&addr, sizeof(addr) ) < 0) - goto fail; - - len = sizeof(addr); - if (getsockname( fd, (struct sockaddr *)&addr, &len ) < 0) - goto fail; - - *pid = addr.nl_pid; - return fd; -fail: - close( fd ); - return -1; -} - -static int send_netlink_req( int fd, int pid, int type, int *seq_no ) -{ - static LONG seq; - struct request - { - struct nlmsghdr hdr; - struct rtgenmsg gen; - } req; - struct sockaddr_nl addr; - - req.hdr.nlmsg_len = sizeof(req); - req.hdr.nlmsg_type = type; - req.hdr.nlmsg_flags = NLM_F_ROOT | NLM_F_MATCH | NLM_F_REQUEST; - req.hdr.nlmsg_pid = pid; - req.hdr.nlmsg_seq = InterlockedIncrement( &seq ); - req.gen.rtgen_family = AF_UNSPEC; - - memset( &addr, 0, sizeof(addr) ); - addr.nl_family = AF_NETLINK; - if (sendto( fd, &req, sizeof(req), 0, (struct sockaddr *)&addr, sizeof(addr) ) != sizeof(req)) - return -1; - *seq_no = req.hdr.nlmsg_seq; - return 0; -} - -struct netlink_reply -{ - struct netlink_reply *next; - int size; - struct nlmsghdr *hdr; -}; - -static void free_netlink_reply( struct netlink_reply *data ) -{ - struct netlink_reply *ptr; - while( data ) - { - ptr = data->next; - HeapFree( GetProcessHeap(), 0, data ); - data = ptr; - } -} - -static int recv_netlink_reply( int fd, int pid, int seq, struct netlink_reply **data ) -{ - int bufsize = getpagesize(); - int left, read; - BOOL done = FALSE; - socklen_t sa_len; - struct sockaddr_nl addr; - struct netlink_reply *cur, *last = NULL; - struct nlmsghdr *hdr; - char *buf; - - *data = NULL; - buf = HeapAlloc( GetProcessHeap(), 0, bufsize ); - if (!buf) return -1; - - do - { - left = read = recvfrom( fd, buf, bufsize, 0, (struct sockaddr *)&addr, &sa_len ); - if (read < 0) goto fail; - if (addr.nl_pid != 0) continue; /* not from kernel */ - - for (hdr = (struct nlmsghdr *)buf; NLMSG_OK(hdr, left); hdr = NLMSG_NEXT(hdr, left)) - { - if (hdr->nlmsg_pid != pid || hdr->nlmsg_seq != seq) continue; - if (hdr->nlmsg_type == NLMSG_DONE) - { - done = TRUE; - break; - } - } - - cur = HeapAlloc( GetProcessHeap(), 0, sizeof(*cur) + read ); - if (!cur) goto fail; - cur->next = NULL; - cur->size = read; - cur->hdr = (struct nlmsghdr *)(cur + 1); - memcpy( cur->hdr, buf, read ); - if (last) last->next = cur; - else *data = cur; - last = cur; - } while (!done); - - HeapFree( GetProcessHeap(), 0, buf ); - return 0; - -fail: - free_netlink_reply( *data ); - HeapFree( GetProcessHeap(), 0, buf ); - return -1; -} - - -static DWORD get_indices_from_reply( struct netlink_reply *reply, int pid, int seq, - BOOL skip_loopback, InterfaceIndexTable *table ) -{ - struct nlmsghdr *hdr; - struct netlink_reply *r; - int count = 0; - - for (r = reply; r; r = r->next) - { - int size = r->size; - for (hdr = r->hdr; NLMSG_OK(hdr, size); hdr = NLMSG_NEXT(hdr, size)) - { - if (hdr->nlmsg_pid != pid || hdr->nlmsg_seq != seq) continue; - if (hdr->nlmsg_type == NLMSG_DONE) break; - - if (hdr->nlmsg_type == RTM_NEWLINK) - { - struct ifinfomsg *info = NLMSG_DATA(hdr); - - if (skip_loopback && (info->ifi_flags & IFF_LOOPBACK)) continue; - if (table) table->indexes[count] = info->ifi_index; - count++; - } - } - } - return count; -} - -DWORD get_interface_indices( BOOL skip_loopback, InterfaceIndexTable **table ) -{ - int fd, pid, seq; - struct netlink_reply *reply = NULL; - DWORD count = 0; - - if (table) *table = NULL; - fd = open_netlink( &pid ); - if (fd < 0) return 0; - - if (send_netlink_req( fd, pid, RTM_GETLINK, &seq ) < 0) - goto end; - - if (recv_netlink_reply( fd, pid, seq, &reply ) < 0) - goto end; - - count = get_indices_from_reply( reply, pid, seq, skip_loopback, NULL ); - - if (table) - { - InterfaceIndexTable *ret = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET(InterfaceIndexTable, indexes[count]) ); - if (!ret) - { - count = 0; - goto end; - } - - ret->numIndexes = count; - get_indices_from_reply( reply, pid, seq, skip_loopback, ret ); - *table = ret; - } - -end: - free_netlink_reply( reply ); - close( fd ); - return count; -} - -#else -DWORD get_interface_indices( BOOL skip_loopback, InterfaceIndexTable **table ) -{ - if (table) *table = NULL; - return 0; -} -#endif diff --git a/dlls/iphlpapi/ifenum.h b/dlls/iphlpapi/ifenum.h deleted file mode 100644 index 710b493ad36..00000000000 --- a/dlls/iphlpapi/ifenum.h +++ /dev/null @@ -1,66 +0,0 @@ -/* ifenum.h - * Copyright (C) 2003,2006 Juan Lang - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * - * This module implements network interface and address enumeration. It's - * meant to hide some problematic defines like socket(), and make iphlpapi - * more portable. - * - * Like Windows, it uses a numeric index to identify an interface uniquely. - * As implemented, an interface represents a UNIX network interface, virtual - * or real, and thus can have 0 or 1 IP addresses associated with it. (This - * only supports IPv4.) - * The indexes returned are not guaranteed to be contiguous, so don't call - * getNumInterfaces() and assume the values [0,getNumInterfaces() - 1] will be - * valid indexes; use getInterfaceIndexTable() instead. - * - * See also the companion file, ipstats.h, for functions related to getting - * statistics. - */ -#ifndef WINE_IFENUM_H_ -#define WINE_IFENUM_H_ - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#define USE_WS_PREFIX -#include "iprtrmib.h" -#include "winsock2.h" - -#define MAX_INTERFACE_PHYSADDR 8 -#define MAX_INTERFACE_DESCRIPTION 256 - -/* A table of interface indexes, see get_interface_indices(). */ -typedef struct _InterfaceIndexTable { - DWORD numIndexes; - IF_INDEX indexes[1]; -} InterfaceIndexTable; - -/* Returns the count of all interface indexes and optionally a ptr to an interface table. - * HeapFree() the returned table. Will optionally ignore loopback devices. - */ -DWORD get_interface_indices( BOOL skip_loopback, InterfaceIndexTable **table ) DECLSPEC_HIDDEN; - -/* ByName/ByIndex versions of various getter functions. */ - -/* Fills index with the index of name, if found. Returns - * ERROR_INVALID_PARAMETER if name or index is NULL, ERROR_INVALID_DATA if name - * is not found, and NO_ERROR on success. - */ -DWORD getInterfaceIndexByName(const char *name, IF_INDEX *index) DECLSPEC_HIDDEN; - -#endif /* ndef WINE_IFENUM_H_ */ diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 82c63b0dfce..8a8b6b3e7cf 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -42,7 +42,6 @@ #include "ws2ipdef.h" #include "windns.h" #include "iphlpapi.h" -#include "ifenum.h" #include "ipifcons.h" #include "fltdefs.h" #include "ifdef.h" @@ -3282,6 +3281,53 @@ DWORD WINAPI AllocateAndGetTcpExTableFromStack( void **table, BOOL sort, HANDLE return allocate_tcp_table( table, sort, heap, flags, family, TCP_TABLE_OWNER_PID_ALL ); } +/****************************************************************** + * GetUdpStatistics (IPHLPAPI.@) + * + * Get the UDP statistics for the local computer. + * + * PARAMS + * stats [Out] buffer for UDP statistics + */ +DWORD WINAPI GetUdpStatistics( MIB_UDPSTATS *stats ) +{ + return GetUdpStatisticsEx( stats, WS_AF_INET ); +} + +/****************************************************************** + * GetUdpStatisticsEx (IPHLPAPI.@) + * + * Get the IPv4 and IPv6 UDP statistics for the local computer. + * + * PARAMS + * stats [Out] buffer for UDP statistics + * family [In] specifies whether IPv4 or IPv6 statistics are returned + * + * RETURNS + * Success: NO_ERROR + * Failure: error code from winerror.h + */ +DWORD WINAPI GetUdpStatisticsEx( MIB_UDPSTATS *stats, DWORD family ) +{ + struct nsi_udp_stats_dynamic dyn; + USHORT key = (USHORT)family; + DWORD err; + + if (!stats || !ip_module_id( family )) return ERROR_INVALID_PARAMETER; + memset( stats, 0, sizeof(*stats) ); + + err = NsiGetAllParameters( 1, &NPI_MS_UDP_MODULEID, NSI_UDP_STATS_TABLE, &key, sizeof(key), NULL, 0, + &dyn, sizeof(dyn), NULL, 0 ); + if (err) return err; + + stats->dwInDatagrams = dyn.in_dgrams; + stats->dwNoPorts = dyn.no_ports; + stats->dwInErrors = dyn.in_errs; + stats->dwOutDatagrams = dyn.out_dgrams; + stats->dwNumAddrs = dyn.num_addrs; + return err; +} + /****************************************************************** * GetUdpTable (IPHLPAPI.@) * diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c deleted file mode 100644 index 1a71396e388..00000000000 --- a/dlls/iphlpapi/ipstats.c +++ /dev/null @@ -1,370 +0,0 @@ -/* - * Copyright (C) 2003,2006 Juan Lang - * Copyright (C) 2007 TransGaming Technologies Inc. - * Copyright (C) 2009 Alexandre Julliard - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "config.h" -#include "wine/port.h" - -#include <stdarg.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <errno.h> -#include <sys/types.h> -#ifdef HAVE_DIRENT_H -#include <dirent.h> -#endif -#ifdef HAVE_ALIAS_H -#include <alias.h> -#endif -#ifdef HAVE_SYS_SOCKET_H -#include <sys/socket.h> -#endif -#ifdef HAVE_SYS_SOCKETVAR_H -#include <sys/socketvar.h> -#endif -#ifdef HAVE_SYS_TIMEOUT_H -#include <sys/timeout.h> -#endif -#ifdef HAVE_NETINET_IN_H -#include <netinet/in.h> -#endif -#ifdef HAVE_NETINET_IN_SYSTM_H -#include <netinet/in_systm.h> -#endif -#ifdef HAVE_ARPA_INET_H -#include <arpa/inet.h> -#endif -#ifdef HAVE_NET_IF_H -#include <net/if.h> -#endif -#ifdef HAVE_NET_IF_DL_H -#include <net/if_dl.h> -#endif -#ifdef HAVE_NET_IF_TYPES_H -#include <net/if_types.h> -#endif -#ifdef HAVE_NET_ROUTE_H -#include <net/route.h> -#endif -#ifdef HAVE_NET_IF_ARP_H -#include <net/if_arp.h> -#endif -#ifdef HAVE_NETINET_IF_ETHER_H -#include <netinet/if_ether.h> -#endif -#ifdef HAVE_NETINET_IF_INARP_H -#include <netinet/if_inarp.h> -#endif -#ifdef HAVE_NETINET_IP_H -#include <netinet/ip.h> -#endif -#ifdef HAVE_NETINET_TCP_H -#include <netinet/tcp.h> -#endif -#ifdef HAVE_NETINET_IP_VAR_H -#include <netinet/ip_var.h> -#endif -#ifdef HAVE_NETINET_TCP_FSM_H -#include <netinet/tcp_fsm.h> -#endif -#ifdef HAVE_NETINET_IN_PCB_H -#include <netinet/in_pcb.h> -#endif -#ifdef HAVE_NETINET_TCP_TIMER_H -#include <netinet/tcp_timer.h> -#endif -#ifdef HAVE_NETINET_TCP_VAR_H -#include <netinet/tcp_var.h> -#endif -#ifdef HAVE_NETINET_IP_ICMP_H -#include <netinet/ip_icmp.h> -#endif -#ifdef HAVE_NETINET_ICMP_VAR_H -#include <netinet/icmp_var.h> -#endif -#ifdef HAVE_NETINET_UDP_H -#include <netinet/udp.h> -#endif -#ifdef HAVE_NETINET_UDP_VAR_H -#include <netinet/udp_var.h> -#endif -#ifdef HAVE_SYS_PROTOSW_H -#include <sys/protosw.h> -#endif -#ifdef HAVE_SYS_SYSCTL_H -#include <sys/sysctl.h> -#endif -#ifdef HAVE_KSTAT_H -#include <kstat.h> -#endif -#ifdef HAVE_INET_MIB2_H -#include <inet/mib2.h> -#endif -#ifdef HAVE_STROPTS_H -#include <stropts.h> -#endif -#ifdef HAVE_SYS_TIHDR_H -#include <sys/tihdr.h> -#endif -#ifdef HAVE_SYS_PARAM_H -#include <sys/param.h> -#endif -#ifdef HAVE_SYS_QUEUE_H -#include <sys/queue.h> -#endif -#ifdef HAVE_SYS_USER_H -/* Make sure the definitions of struct kinfo_proc are the same. */ -#include <sys/user.h> -#endif -#ifdef HAVE_LIBPROCSTAT_H -#include <libprocstat.h> -#endif -#ifdef HAVE_LIBPROC_H -#include <libproc.h> -#endif -#ifdef HAVE_IFADDRS_H -#include <ifaddrs.h> -#endif - -#ifndef ROUNDUP -#define ROUNDUP(a) \ - ((a) > 0 ? (1 + (((a) - 1) | (sizeof(int) - 1))) : sizeof(int)) -#endif -#ifndef ADVANCE -#define ADVANCE(x, n) (x += ROUNDUP(((struct sockaddr *)n)->sa_len)) -#endif - -#include "ntstatus.h" -#define WIN32_NO_STATUS -#define NONAMELESSUNION -#define USE_WS_PREFIX -#include "winsock2.h" -#include "ws2ipdef.h" -#include "ifenum.h" -#include "iphlpapi.h" - -#include "wine/debug.h" -#include "wine/server.h" -#include "wine/unicode.h" - -#ifndef HAVE_NETINET_TCP_FSM_H -#define TCPS_ESTABLISHED 1 -#define TCPS_SYN_SENT 2 -#define TCPS_SYN_RECEIVED 3 -#define TCPS_FIN_WAIT_1 4 -#define TCPS_FIN_WAIT_2 5 -#define TCPS_TIME_WAIT 6 -#define TCPS_CLOSED 7 -#define TCPS_CLOSE_WAIT 8 -#define TCPS_LAST_ACK 9 -#define TCPS_LISTEN 10 -#define TCPS_CLOSING 11 -#endif - -#ifndef RTF_MULTICAST -#define RTF_MULTICAST 0 /* Not available on NetBSD/OpenBSD */ -#endif - -#ifndef RTF_LLINFO -#define RTF_LLINFO 0 /* Not available on FreeBSD 8 and above */ -#endif - -WINE_DEFAULT_DEBUG_CHANNEL(iphlpapi); - -#ifdef HAVE_LIBKSTAT -static DWORD kstat_get_ui32( kstat_t *ksp, const char *name ) -{ - unsigned int i; - kstat_named_t *data = ksp->ks_data; - - for (i = 0; i < ksp->ks_ndata; i++) - if (!strcmp( data[i].name, name )) return data[i].value.ui32; - return 0; -} -#endif - -/****************************************************************** - * GetUdpStatistics (IPHLPAPI.@) - * - * Get the IPv4 and IPv6 UDP statistics for the local computer. - * - * PARAMS - * stats [Out] buffer for UDP statistics - * family [In] specifies whether IPv4 or IPv6 statistics are returned - * - * RETURNS - * Success: NO_ERROR - * Failure: error code from winerror.h - */ -DWORD WINAPI GetUdpStatisticsEx(PMIB_UDPSTATS stats, DWORD family) -{ - DWORD ret = ERROR_NOT_SUPPORTED; - - if (!stats) return ERROR_INVALID_PARAMETER; - if (family != WS_AF_INET && family != WS_AF_INET6) return ERROR_INVALID_PARAMETER; - memset( stats, 0, sizeof(*stats) ); - - stats->dwNumAddrs = get_interface_indices( FALSE, NULL ); - - if (family == WS_AF_INET6) - { -#ifdef __linux__ - { - FILE *fp; - - if ((fp = fopen("/proc/net/snmp6", "r"))) - { - struct { - const char *name; - DWORD *elem; - } udpstatlist[] = { - { "Udp6InDatagrams", &stats->dwInDatagrams }, - { "Udp6NoPorts", &stats->dwNoPorts }, - { "Udp6InErrors", &stats->dwInErrors }, - { "Udp6OutDatagrams", &stats->dwOutDatagrams }, - }; - char buf[512], *ptr, *value; - DWORD res, i; - - while ((ptr = fgets(buf, sizeof(buf), fp))) - { - if (!(value = strchr(buf, ' '))) - continue; - - /* terminate the valuename */ - ptr = value - 1; - *(ptr + 1) = '\0'; - - /* and strip leading spaces from value */ - value += 1; - while (*value==' ') value++; - if ((ptr = strchr(value, '\n'))) - *ptr='\0'; - - for (i = 0; i < ARRAY_SIZE(udpstatlist); i++) - if (!_strnicmp(buf, udpstatlist[i].name, -1) && sscanf(value, "%d", &res)) - *udpstatlist[i].elem = res; - } - fclose(fp); - ret = NO_ERROR; - } - } -#else - FIXME( "unimplemented for IPv6\n" ); -#endif - return ret; - } - -#ifdef __linux__ - { - FILE *fp; - - if ((fp = fopen("/proc/net/snmp", "r"))) - { - static const char hdr[] = "Udp:"; - char buf[512], *ptr; - - while ((ptr = fgets(buf, sizeof(buf), fp))) - { - if (_strnicmp(buf, hdr, sizeof(hdr) - 1)) continue; - /* last line was a header, get another */ - if (!(ptr = fgets(buf, sizeof(buf), fp))) break; - if (!_strnicmp(buf, hdr, sizeof(hdr) - 1)) - { - ptr += sizeof(hdr); - sscanf( ptr, "%u %u %u %u %u", - &stats->dwInDatagrams, &stats->dwNoPorts, - &stats->dwInErrors, &stats->dwOutDatagrams, &stats->dwNumAddrs ); - break; - } - } - fclose(fp); - ret = NO_ERROR; - } - } -#elif defined(HAVE_LIBKSTAT) - { - static char udp[] = "udp"; - kstat_ctl_t *kc; - kstat_t *ksp; - MIB_UDPTABLE *udp_table; - - if ((kc = kstat_open()) && - (ksp = kstat_lookup( kc, udp, 0, udp )) && - kstat_read( kc, ksp, NULL ) != -1 && - ksp->ks_type == KSTAT_TYPE_NAMED) - { - stats->dwInDatagrams = kstat_get_ui32( ksp, "inDatagrams" ); - stats->dwNoPorts = 0; /* FIXME */ - stats->dwInErrors = kstat_get_ui32( ksp, "inErrors" ); - stats->dwOutDatagrams = kstat_get_ui32( ksp, "outDatagrams" ); - if (!AllocateAndGetUdpTableFromStack( &udp_table, FALSE, GetProcessHeap(), 0 )) - { - stats->dwNumAddrs = udp_table->dwNumEntries; - HeapFree( GetProcessHeap(), 0, udp_table ); - } - ret = NO_ERROR; - } - if (kc) kstat_close( kc ); - } -#elif defined(HAVE_SYS_SYSCTL_H) && defined(UDPCTL_STATS) && defined(HAVE_STRUCT_UDPSTAT_UDPS_IPACKETS) - { - int mib[] = {CTL_NET, PF_INET, IPPROTO_UDP, UDPCTL_STATS}; - struct udpstat udp_stat; - MIB_UDPTABLE *udp_table; - size_t needed = sizeof(udp_stat); - - if(sysctl(mib, ARRAY_SIZE(mib), &udp_stat, &needed, NULL, 0) != -1) - { - stats->dwInDatagrams = udp_stat.udps_ipackets; - stats->dwOutDatagrams = udp_stat.udps_opackets; - stats->dwNoPorts = udp_stat.udps_noport; - stats->dwInErrors = udp_stat.udps_hdrops + udp_stat.udps_badsum + udp_stat.udps_fullsock + udp_stat.udps_badlen; - if (!AllocateAndGetUdpTableFromStack( &udp_table, FALSE, GetProcessHeap(), 0 )) - { - stats->dwNumAddrs = udp_table->dwNumEntries; - HeapFree( GetProcessHeap(), 0, udp_table ); - } - ret = NO_ERROR; - } - else ERR ("failed to get udpstat\n"); - } -#else - FIXME( "unimplemented for IPv4\n" ); -#endif - return ret; -} - -/****************************************************************** - * GetUdpStatistics (IPHLPAPI.@) - * - * Get the UDP statistics for the local computer. - * - * PARAMS - * stats [Out] buffer for UDP statistics - * - * RETURNS - * Success: NO_ERROR - * Failure: error code from winerror.h - */ -DWORD WINAPI GetUdpStatistics(PMIB_UDPSTATS stats) -{ - return GetUdpStatisticsEx(stats, WS_AF_INET); -} diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index bd7992f6916..f1f3c4f387f 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -966,7 +966,6 @@ static void test_udp_stats( int family ) table.dwInErrors, dyn.in_errs, dyn2.in_errs ); ok( bounded( table.dwOutDatagrams, dyn.out_dgrams, dyn2.out_dgrams ), "%d vs [%I64d %I64d]\n", table.dwOutDatagrams, dyn.out_dgrams, dyn2.out_dgrams ); -todo_wine_if(!unstable(0) && table.dwNumAddrs != dyn.num_addrs) ok( unstable( table.dwNumAddrs == dyn.num_addrs ), "%d %d\n", table.dwNumAddrs, dyn.num_addrs ); winetest_pop_context(); -- 2.23.0

1 0

[PATCH 4/5] nsiproxy: Implement UDP stats get_all_parameters.
by Huw Davies Aug. 18, 2021

Aug. 18, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsi/tests/nsi.c | 36 +++++++++++ dlls/nsiproxy.sys/udp.c | 128 ++++++++++++++++++++++++++++++++++++++++ include/wine/nsi.h | 11 ++++ 3 files changed, 175 insertions(+) diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index ce09bbf8a22..bd7992f6916 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -938,6 +938,40 @@ static void test_tcp_tables( int family, int table_type ) winetest_pop_context(); } +static void test_udp_stats( int family ) +{ + DWORD err; + USHORT key = family; + struct nsi_udp_stats_dynamic dyn, dyn2; + MIB_UDPSTATS table; + + winetest_push_context( family == AF_INET ? "AF_INET" : "AF_INET6" ); + + err = NsiGetAllParameters( 1, &NPI_MS_UDP_MODULEID, NSI_UDP_STATS_TABLE, &key, sizeof(key), NULL, 0, + &dyn, sizeof(dyn), NULL, 0 ); + ok( !err, "got %x\n", err ); + + err = GetUdpStatisticsEx( &table, family ); + ok( !err, "got %d\n", err ); + + err = NsiGetAllParameters( 1, &NPI_MS_UDP_MODULEID, NSI_UDP_STATS_TABLE, &key, sizeof(key), NULL, 0, + &dyn2, sizeof(dyn2), NULL, 0 ); + ok( !err, "got %x\n", err ); + + ok( bounded( table.dwInDatagrams, dyn.in_dgrams, dyn2.in_dgrams ), "%d vs [%I64d %I64d]\n", + table.dwInDatagrams, dyn.in_dgrams, dyn2.in_dgrams ); + ok( bounded( table.dwNoPorts, dyn.no_ports, dyn2.no_ports ), "%d vs [%d %d]\n", + table.dwNoPorts, dyn.no_ports, dyn2.no_ports); + ok( bounded( table.dwInErrors, dyn.in_errs, dyn2.in_errs ), "%d vs [%d %d]\n", + table.dwInErrors, dyn.in_errs, dyn2.in_errs ); + ok( bounded( table.dwOutDatagrams, dyn.out_dgrams, dyn2.out_dgrams ), "%d vs [%I64d %I64d]\n", + table.dwOutDatagrams, dyn.out_dgrams, dyn2.out_dgrams ); +todo_wine_if(!unstable(0) && table.dwNumAddrs != dyn.num_addrs) + ok( unstable( table.dwNumAddrs == dyn.num_addrs ), "%d %d\n", table.dwNumAddrs, dyn.num_addrs ); + + winetest_pop_context(); +} + static void test_udp_tables( int family ) { DWORD i, err, count, size; @@ -1030,6 +1064,8 @@ START_TEST( nsi ) test_tcp_tables( AF_INET6, TCP_TABLE_OWNER_MODULE_CONNECTIONS ); test_tcp_tables( AF_INET6, TCP_TABLE_OWNER_MODULE_LISTENER ); + test_udp_stats( AF_INET ); + test_udp_stats( AF_INET6 ); test_udp_tables( AF_INET ); test_udp_tables( AF_INET6 ); } diff --git a/dlls/nsiproxy.sys/udp.c b/dlls/nsiproxy.sys/udp.c index 454aefe95aa..49acedcf214 100644 --- a/dlls/nsiproxy.sys/udp.c +++ b/dlls/nsiproxy.sys/udp.c @@ -73,6 +73,125 @@ WINE_DEFAULT_DEBUG_CHANNEL(nsi); +static DWORD udp_num_addrs( USHORT family ) +{ + DWORD endpoint_count = 0; + + nsi_enumerate_all( 1, 0, &NPI_MS_UDP_MODULEID, NSI_UDP_ENDPOINT_TABLE, + NULL, 0, NULL, 0, NULL, 0, NULL, 0, &endpoint_count ); + /* FIXME: actually retrieve the keys and only count endpoints which match family */ + return endpoint_count; +} + +static NTSTATUS udp_stats_get_all_parameters( const void *key, DWORD key_size, void *rw_data, DWORD rw_size, + void *dynamic_data, DWORD dynamic_size, void *static_data, DWORD static_size ) +{ + struct nsi_udp_stats_dynamic dyn; + const USHORT *family = key; + + TRACE( "%p %d %p %d %p %d %p %d\n", key, key_size, rw_data, rw_size, dynamic_data, dynamic_size, + static_data, static_size ); + + if (*family != WS_AF_INET && *family != WS_AF_INET6) return STATUS_NOT_SUPPORTED; + + memset( &dyn, 0, sizeof(dyn) ); + + dyn.num_addrs = udp_num_addrs( *family ); + +#ifdef __linux__ + if (*family == WS_AF_INET) + { + NTSTATUS status = STATUS_NOT_SUPPORTED; + static const char hdr[] = "Udp:"; + char buf[512], *ptr; + FILE *fp; + + if (!(fp = fopen( "/proc/net/snmp", "r" ))) return STATUS_NOT_SUPPORTED; + + while ((ptr = fgets( buf, sizeof(buf), fp ))) + { + if (_strnicmp( buf, hdr, sizeof(hdr) - 1) ) continue; + /* last line was a header, get another */ + if (!(ptr = fgets( buf, sizeof(buf), fp ))) break; + if (!_strnicmp(buf, hdr, sizeof(hdr) - 1)) + { + unsigned int in_dgrams, out_dgrams; + ptr += sizeof(hdr); + sscanf( ptr, "%u %u %u %u %u", + &in_dgrams, &dyn.no_ports, &dyn.in_errs, &out_dgrams, &dyn.num_addrs ); + dyn.in_dgrams = in_dgrams; + dyn.out_dgrams = out_dgrams; + if (dynamic_data) *(struct nsi_udp_stats_dynamic *)dynamic_data = dyn; + status = STATUS_SUCCESS; + break; + } + } + fclose( fp ); + return status; + } + else + { + unsigned int in_dgrams = 0, out_dgrams = 0; + struct + { + const char *name; + DWORD *elem; + } udp_stat_list[] = + { + { "Udp6InDatagrams", &in_dgrams }, + { "Udp6NoPorts", &dyn.no_ports }, + { "Udp6InErrors", &dyn.in_errs }, + { "Udp6OutDatagrams", &out_dgrams }, + }; + char buf[512], *ptr, *value; + DWORD res, i; + FILE *fp; + + if (!(fp = fopen( "/proc/net/snmp6", "r" ))) return STATUS_NOT_SUPPORTED; + + while ((ptr = fgets( buf, sizeof(buf), fp ))) + { + if (!(value = strchr( buf, ' ' ))) continue; + + /* terminate the valuename */ + ptr = value - 1; + *(ptr + 1) = '\0'; + + /* and strip leading spaces from value */ + value += 1; + while (*value==' ') value++; + if ((ptr = strchr( value, '\n' ))) *ptr='\0'; + + for (i = 0; i < ARRAY_SIZE(udp_stat_list); i++) + if (!_strnicmp( buf, udp_stat_list[i].name, -1 ) && sscanf( value, "%d", &res )) + *udp_stat_list[i].elem = res; + } + dyn.in_dgrams = in_dgrams; + dyn.out_dgrams = out_dgrams; + if (dynamic_data) *(struct nsi_udp_stats_dynamic *)dynamic_data = dyn; + fclose( fp ); + return STATUS_SUCCESS; + } +#elif defined(HAVE_SYS_SYSCTL_H) && defined(UDPCTL_STATS) && defined(HAVE_STRUCT_UDPSTAT_UDPS_IPACKETS) + { + int mib[] = { CTL_NET, PF_INET, IPPROTO_UDP, UDPCTL_STATS }; + struct udpstat udp_stat; + size_t needed = sizeof(udp_stat); + + if (sysctl( mib, ARRAY_SIZE(mib), &udp_stat, &needed, NULL, 0 ) == -1) return STATUS_NOT_SUPPORTED; + + dyn.in_dgrams = udp_stat.udps_ipackets; + dyn.out_dgrams = udp_stat.udps_opackets; + dyn.no_ports = udp_stat.udps_noport; + dyn.in_errs = udp_stat.udps_hdrops + udp_stat.udps_badsum + udp_stat.udps_fullsock + udp_stat.udps_badlen; + if (dynamic_data) *(struct nsi_udp_stats_dynamic *)dynamic_data = dyn; + return STATUS_SUCCESS; + } +#endif + FIXME( "Not implemented\n" ); + return STATUS_NOT_SUPPORTED; +} + static NTSTATUS udp_endpoint_enumerate_all( void *key_data, DWORD key_size, void *rw_data, DWORD rw_size, void *dynamic_data, DWORD dynamic_size, void *static_data, DWORD static_size, DWORD_PTR *count ) @@ -271,6 +390,15 @@ static NTSTATUS udp_endpoint_enumerate_all( void *key_data, DWORD key_size, void static struct module_table udp_tables[] = { + { + NSI_UDP_STATS_TABLE, + { + sizeof(USHORT), 0, + sizeof(struct nsi_udp_stats_dynamic), 0 + }, + NULL, + udp_stats_get_all_parameters, + }, { NSI_UDP_ENDPOINT_TABLE, { diff --git a/include/wine/nsi.h b/include/wine/nsi.h index 8bf3bc1d5d0..7b8cb29e9d5 100644 --- a/include/wine/nsi.h +++ b/include/wine/nsi.h @@ -347,8 +347,19 @@ struct nsi_tcp_conn_static }; /* Undocumented NSI UDP tables */ +#define NSI_UDP_STATS_TABLE 0 #define NSI_UDP_ENDPOINT_TABLE 1 +struct nsi_udp_stats_dynamic +{ + ULONGLONG in_dgrams; + DWORD no_ports; + DWORD in_errs; + ULONGLONG out_dgrams; + DWORD num_addrs; + DWORD unk[5]; +}; + struct nsi_udp_endpoint_key { SOCKADDR_INET local; -- 2.23.0

1 0