Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 70232: [WIN-ICONV] Update to git commit 8765259.
by akhaldi＠svn.reactos.org 02 Dec '15

02 Dec '15

Author: akhaldi Date: Wed Dec 2 11:08:51 2015 New Revision: 70232 URL: http://svn.reactos.org/svn/reactos?rev=70232&view=rev Log: [WIN-ICONV] Update to git commit 8765259. Modified: trunk/reactos/lib/3rdparty/libwin-iconv/readme.txt trunk/reactos/lib/3rdparty/libwin-iconv/win_iconv.c trunk/reactos/media/doc/3rd Party Files.txt Modified: trunk/reactos/lib/3rdparty/libwin-iconv/readme.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libwin-iconv/… ============================================================================== --- trunk/reactos/lib/3rdparty/libwin-iconv/readme.txt [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libwin-iconv/readme.txt [iso-8859-1] Wed Dec 2 11:08:51 2015 @@ -13,8 +13,8 @@ (only available when USE_LIBICONV_DLL is defined at compile time) Win32 API does not support strict encoding conversion for some codepage. -And MLang function drop or replace invalid bytes and does not return -useful error status as iconv. This implementation cannot be used for +And MLang function drops or replaces invalid bytes and does not return +useful error status as iconv does. This implementation cannot be used for encoding validation purpose. Yukihiro Nakadaira <yukihiro.nakadaira(a)gmail.com> Modified: trunk/reactos/lib/3rdparty/libwin-iconv/win_iconv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libwin-iconv/… ============================================================================== --- trunk/reactos/lib/3rdparty/libwin-iconv/win_iconv.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libwin-iconv/win_iconv.c [iso-8859-1] Wed Dec 2 11:08:51 2015 @@ -129,7 +129,7 @@ #if defined(USE_LIBICONV_DLL) static int libiconv_iconv_open(rec_iconv_t *cd, const char *tocode, const char *fromcode); static PVOID MyImageDirectoryEntryToData(LPVOID Base, BOOLEAN MappedAsImage, USHORT DirectoryEntry, PULONG Size); -static HMODULE find_imported_module_by_funcname(HMODULE hModule, const char *funcname); +static FARPROC find_imported_function(HMODULE hModule, const char *funcname); static HMODULE hwiniconv; #endif @@ -1093,7 +1093,7 @@ /* * Check if codepage is one those for which the lpUsedDefaultChar * parameter to WideCharToMultiByte() must be NULL. The docs in - * Platform SDK for for Windows Server 2003 R2 claims that this is the + * Platform SDK for Windows Server 2003 R2 claims that this is the * list below, while the MSDN docs for MSVS2008 claim that it is only * for 65000 (UTF-7) and 65001 (UTF-8). This time the earlier Platform * SDK seems to be correct, at least for XP. @@ -1147,7 +1147,6 @@ libiconv_iconv_open(rec_iconv_t *cd, const char *tocode, const char *fromcode) { HMODULE hlibiconv = NULL; - HMODULE hmsvcrt = NULL; char *dllname; const char *p; const char *e; @@ -1189,10 +1188,6 @@ if (hlibiconv == NULL) goto failed; - hmsvcrt = find_imported_module_by_funcname(hlibiconv, "_errno"); - if (hmsvcrt == NULL) - goto failed; - _iconv_open = (f_iconv_open)GetProcAddressA(hlibiconv, "libiconv_open"); if (_iconv_open == NULL) _iconv_open = (f_iconv_open)GetProcAddressA(hlibiconv, "iconv_open"); @@ -1202,7 +1197,7 @@ cd->iconv = (f_iconv)GetProcAddressA(hlibiconv, "libiconv"); if (cd->iconv == NULL) cd->iconv = (f_iconv)GetProcAddressA(hlibiconv, "iconv"); - cd->_errno = (f_errno)GetProcAddressA(hmsvcrt, "_errno"); + cd->_errno = (f_errno)find_imported_function(hlibiconv, "_errno"); if (_iconv_open == NULL || cd->iconv_close == NULL || cd->iconv == NULL || cd->_errno == NULL) goto failed; @@ -1217,7 +1212,6 @@ failed: if (hlibiconv != NULL) FreeLibrary(hlibiconv); - /* do not free hmsvcrt which is obtained by GetModuleHandle() */ return FALSE; } @@ -1247,12 +1241,13 @@ return (PVOID)((LPBYTE)Base + p->VirtualAddress); } -static HMODULE -find_imported_module_by_funcname(HMODULE hModule, const char *funcname) +static FARPROC +find_imported_function(HMODULE hModule, const char *funcname) { DWORD_PTR Base; ULONG Size; PIMAGE_IMPORT_DESCRIPTOR Imp; + PIMAGE_THUNK_DATA Address; /* Import Address Table */ PIMAGE_THUNK_DATA Name; /* Import Name Table */ PIMAGE_IMPORT_BY_NAME ImpName; @@ -1266,15 +1261,16 @@ return NULL; for ( ; Imp->OriginalFirstThunk != 0; ++Imp) { + Address = (PIMAGE_THUNK_DATA)(Base + Imp->FirstThunk); Name = (PIMAGE_THUNK_DATA)(Base + Imp->OriginalFirstThunk); - for ( ; Name->u1.Ordinal != 0; ++Name) + for ( ; Name->u1.Ordinal != 0; ++Name, ++Address) { if (!IMAGE_SNAP_BY_ORDINAL(Name->u1.Ordinal)) { ImpName = (PIMAGE_IMPORT_BY_NAME) (Base + (DWORD_PTR)Name->u1.AddressOfData); if (strcmp((char *)ImpName->Name, funcname) == 0) - return GetModuleHandleA((char *)(Base + Imp->Name)); + return (FARPROC)Address->u1.Function; } } } Modified: trunk/reactos/media/doc/3rd Party Files.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/3rd%20Party%20Fi… ============================================================================== --- trunk/reactos/media/doc/3rd Party Files.txt [iso-8859-1] (original) +++ trunk/reactos/media/doc/3rd Party Files.txt [iso-8859-1] Wed Dec 2 11:08:51 2015 @@ -71,8 +71,8 @@ Website: http://stlport.sourceforge.net/ Title: win-iconv -Used Version: r44 -Website: https://code.google.com/p/win-iconv/ +Used Version: git commit 8765259 +Website: https://github.com/win-iconv/win-iconv Title: libjpeg Used Version: 9a

1 0

[akhaldi] 70230: [PSDK] Update shldisp.idl. CORE-10536
by akhaldi＠svn.reactos.org 02 Dec '15

02 Dec '15

Author: akhaldi Date: Wed Dec 2 09:02:07 2015 New Revision: 70230 URL: http://svn.reactos.org/svn/reactos?rev=70230&view=rev Log: [PSDK] Update shldisp.idl. CORE-10536 Modified: trunk/reactos/include/psdk/shldisp.idl Modified: trunk/reactos/include/psdk/shldisp.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shldisp.idl?r… ============================================================================== --- trunk/reactos/include/psdk/shldisp.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shldisp.idl [iso-8859-1] Wed Dec 2 09:02:07 2015 @@ -492,6 +492,53 @@ HRESULT IsServiceRunning([in] BSTR service, [out, retval] VARIANT *running); HRESULT CanStartStopService([in] BSTR service, [out, retval] VARIANT *ret); HRESULT ShowBrowserBar([in] BSTR clsid, [in] VARIANT show, [out, retval] VARIANT *ret); +} + +[ + uuid(177160ca-bb5a-411c-841d-bd38facdeaa0), + oleautomation, + hidden, + dual +] +interface IShellDispatch3 : IShellDispatch2 +{ + HRESULT AddToRecent([in] VARIANT file, [in, optional] BSTR category); +} + +[ + uuid(efd84b2d-4bcf-4298-be25-eb542a59fbda), + oleautomation, + hidden, + dual +] +interface IShellDispatch4 : IShellDispatch3 +{ + HRESULT WindowsSecurity(); + HRESULT ToggleDesktop(); + HRESULT ExplorerPolicy([in] BSTR policy, [out, retval] VARIANT *value); + HRESULT GetSetting([in] long setting, [out,retval] VARIANT_BOOL *result); +} + +[ + uuid(866738b9-6cf2-4de8-8767-f794ebe74f4e), + oleautomation, + hidden, + dual +] +interface IShellDispatch5 : IShellDispatch4 +{ + HRESULT WindowSwitcher(); +} + +[ + uuid(286e6f1b-7113-4355-9562-96b7e9d64c54), + oleautomation, + hidden, + dual, +] +interface IShellDispatch6 : IShellDispatch5 +{ + HRESULT SearchCommand(void); } [ @@ -556,6 +603,120 @@ ssfPROGRAMFILESx86 = 0x30 } ShellSpecialFolderConstants; +/***************************************************************************** + * IShellFolderViewDual interface + */ +typedef +[ + uuid(742a99a0-c77e-11d0-a32c-00a0c91eedba) +] +enum ShellFolderViewOptions +{ + SFVVO_SHOWALLOBJECTS = 0x00000001, + SFVVO_SHOWEXTENSIONS = 0x00000002, + SFVVO_SHOWCOMPCOLOR = 0x00000008, + SFVVO_SHOWSYSFILES = 0x00000020, + SFVVO_WIN95CLASSIC = 0x00000040, + SFVVO_DOUBLECLICKINWEBVIEW = 0x00000080, + SFVVO_DESKTOPHTML = 0x00000200 +} ShellFolderViewOptions; + +[ + uuid(e7a1af80-4d96-11cf-960c-0080c7f4ee85), + oleautomation, + hidden, + dual +] +interface IShellFolderViewDual : IDispatch +{ + [propget] + HRESULT Application([out, retval] IDispatch **app); + + [propget] + HRESULT Parent([out, retval] IDispatch **parent); + + [propget] + HRESULT Folder([out, retval] Folder **folder); + + HRESULT SelectedItems([out, retval] FolderItems **items); + + [propget] + HRESULT FocusedItem([out, retval] FolderItem **item); + + HRESULT SelectItem([in] VARIANT *item, [in] int flags); + + HRESULT PopupItemMenu([in] FolderItem *item, + [in, optional] VARIANT vx, + [in, optional] VARIANT vy, + [out, retval] BSTR *command); + [propget] + HRESULT Script([out, retval] IDispatch **script); + + [propget] + HRESULT ViewOptions([out, retval] long *options); +} + +[ + uuid(31c147b6-0ade-4a3c-b514-ddf932ef6d17), + oleautomation, + hidden, + dual +] +interface IShellFolderViewDual2 : IShellFolderViewDual +{ + [propget] + HRESULT CurrentViewMode([out, retval] UINT *mode); + + [propput] + HRESULT CurrentViewMode([in] UINT mode); + + HRESULT SelectItemRelative([in] int relative); +} + +[ + uuid(29ec8e6c-46d3-411f-baaa-611a6c9cac66), + oleautomation, + hidden, + dual +] +interface IShellFolderViewDual3 : IShellFolderViewDual2 +{ + [propget] + HRESULT GroupBy([out, retval] BSTR *groupby); + + [propput] + HRESULT GroupBy([in] BSTR groupby); + + [propget] + HRESULT FolderFlags([out, retval] DWORD *flags); + + [propput] + HRESULT FolderFlags([in] DWORD flags); + + [propget] + HRESULT SortColumns([out, retval] BSTR *sortcolumns); + + [propput] + HRESULT SortColumns([in] BSTR sortcolumns); + + [propput] + HRESULT IconSize([in] int icon_size); + + [propget] + HRESULT IconSize([out, retval] int *icon_size); + + HRESULT FilterView([in, unique] BSTR filter_text); +} + +[ + uuid(62112aa1-ebe4-11cf-a5fb-0020afe7292d) +] +coclass ShellFolderView +{ + [default] interface IShellFolderViewDual3; + [default, source] dispinterface DShellFolderViewEvents; +} + } /* library Shell32 */ /*****************************************************************************

1 0

[gedmurphy] 70229: I forgot to put the minimalist headers back
by gedmurphy＠svn.reactos.org 01 Dec '15

01 Dec '15

Author: gedmurphy Date: Tue Dec 1 21:33:32 2015 New Revision: 70229 URL: http://svn.reactos.org/svn/reactos?rev=70229&view=rev Log: I forgot to put the minimalist headers back Modified: trunk/reactos/base/applications/charmap/precomp.h Modified: trunk/reactos/base/applications/charmap/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/precomp.h [iso-8859-1] Tue Dec 1 21:33:32 2015 @@ -1,7 +1,12 @@ #ifndef __CHARMAP_PRECOMP_H #define __CHARMAP_PRECOMP_H -#include <windows.h> +#include <stdarg.h> +#include <windef.h> +#include <winbase.h> +#include <winuser.h> +#include <wingdi.h> + #include "resource.h"

1 0

[gedmurphy] 70228: [CHARMAP] - Hackfix the existing charmap for the 0.4 release (just in case I don't get time to finish the new one). This fixes showing invalid glyphs and also removes the advance...
by gedmurphy＠svn.reactos.org 01 Dec '15

01 Dec '15

Author: gedmurphy Date: Tue Dec 1 21:29:12 2015 New Revision: 70228 URL: http://svn.reactos.org/svn/reactos?rev=70228&view=rev Log: [CHARMAP] - Hackfix the existing charmap for the 0.4 release (just in case I don't get time to finish the new one). This fixes showing invalid glyphs and also removes the advanced section as it was unimplemented. Modified: trunk/reactos/base/applications/charmap/charmap.c trunk/reactos/base/applications/charmap/map.c trunk/reactos/base/applications/charmap/precomp.h Modified: trunk/reactos/base/applications/charmap/charmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/charmap.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/charmap.c [iso-8859-1] Tue Dec 1 21:29:12 2015 @@ -12,6 +12,8 @@ #include <commctrl.h> #include <richedit.h> +#define REMOVE_ADVANCED + #define ID_ABOUT 0x1 HINSTANCE hInstance; @@ -237,7 +239,7 @@ SendMessage(hText, WM_CHAR, (WPARAM)ch, 0); } - +#ifndef REMOVE_ADVANCED static void UpdateSettings(HWND hDlg) @@ -245,20 +247,24 @@ if (hDlg == hCharmapDlg) { Settings.IsAdvancedView = - SendDlgItemMessage(hDlg, IDC_CHECK_ADVANCED, BM_GETCHECK, 0, 0); + SendDlgItemMessage(hDlg, IDC_CHECK_ADVANCED, BM_GETCHECK, 0, 0); + } if (hDlg == hAdvancedDlg) { } } +#endif static void ChangeView(HWND hWnd) { RECT rcCharmap; +#ifndef REMOVE_ADVANCED RECT rcAdvanced; +#endif RECT rcPanelExt; RECT rcPanelInt; RECT rcStatus; @@ -268,7 +274,9 @@ UINT DeskTopWidth, DeskTopHeight; GetClientRect(hCharmapDlg, &rcCharmap); +#ifndef REMOVE_ADVANCED GetClientRect(hAdvancedDlg, &rcAdvanced); +#endif GetWindowRect(hWnd, &rcPanelExt); GetClientRect(hWnd, &rcPanelInt); GetClientRect(hStatusWnd, &rcStatus); @@ -280,19 +288,19 @@ DeY = (rcPanelExt.bottom - rcPanelExt.top) - rcPanelInt.bottom; MoveWindow(hCharmapDlg, 0, 0, rcCharmap.right, rcCharmap.bottom, FALSE); +#ifndef REMOVE_ADVANCED MoveWindow(hAdvancedDlg, 0, rcCharmap.bottom, rcAdvanced.right, rcAdvanced.bottom, FALSE); - ShowWindow(hAdvancedDlg, (Settings.IsAdvancedView) ? SW_SHOW : SW_HIDE); - +#endif xPos = rcPanelExt.left; yPos = rcPanelExt.top; Width = DeX + rcCharmap.right; Height = DeY + rcCharmap.bottom + rcStatus.bottom; - +#ifndef REMOVE_ADVANCED if (Settings.IsAdvancedView) Height += rcAdvanced.bottom; - +#endif if ((xPos + Width) > DeskTopWidth) xPos += DeskTopWidth - (xPos + Width); @@ -318,6 +326,9 @@ case WM_INITDIALOG: { DWORD evMask; +#ifdef REMOVE_ADVANCED + HWND hAdv; +#endif FillFontStyleComboList(GetDlgItem(hDlg, IDC_FONTCOMBO)); @@ -328,7 +339,10 @@ evMask = SendDlgItemMessage(hDlg, IDC_TEXTBOX, EM_GETEVENTMASK, 0, 0); evMask |= ENM_CHANGE; SendDlgItemMessage(hDlg, IDC_TEXTBOX, EM_SETEVENTMASK, 0, (LPARAM)evMask); - +#ifdef REMOVE_ADVANCED + hAdv = GetDlgItem(hDlg, IDC_CHECK_ADVANCED); + ShowWindow(hAdv, SW_HIDE); +#endif return TRUE; } @@ -370,11 +384,12 @@ case IDC_COPY: CopyCharacters(hDlg); break; - +#ifndef REMOVE_ADVANCED case IDC_CHECK_ADVANCED: UpdateSettings(hDlg); ChangeView(GetParent(hDlg)); break; +#endif } } break; @@ -385,7 +400,7 @@ return FALSE; } - +#ifndef REMOVE_ADVANCED static INT_PTR CALLBACK @@ -405,7 +420,7 @@ return FALSE; } - +#endif static int OnCreate(HWND hWnd, WPARAM wParam, LPARAM lParam) { @@ -416,12 +431,12 @@ MAKEINTRESOURCE(IDD_CHARMAP), hWnd, CharMapDlgProc); - +#ifndef REMOVE_ADVANCED hAdvancedDlg = CreateDialog(hInstance, - MAKEINTRESOURCE(IDD_ADVANCED), - hWnd, - AdvancedDlgProc); - + MAKEINTRESOURCE(IDD_ADVANCED), + hWnd, + AdvancedDlgProc); +#endif hStatusWnd = CreateWindow(STATUSCLASSNAME, NULL, WS_CHILD | WS_VISIBLE, Modified: trunk/reactos/base/applications/charmap/map.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/map.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/map.c [iso-8859-1] Tue Dec 1 21:29:12 2015 @@ -16,14 +16,6 @@ #define MAX_ROWS (0xFFFF / XCELLS) + 1 - YCELLS -static -VOID -TagFontToCell(PCELL pCell, - WCHAR ch) -{ - pCell->ch = ch; -} - static VOID @@ -107,33 +99,47 @@ INT x, y; RECT rc; PCELL Cell; + INT i, added; hOldFont = SelectObject(ps->hdc, infoPtr->hFont); - for (y = 0; y < YCELLS; y++) - for (x = 0; x < XCELLS; x++) - { + i = XCELLS * infoPtr->iYStart; + + added = 0; + x = y = 0; + while ((y <= YCELLS) && (x <= XCELLS)) + { + ch = (WCHAR)infoPtr->ValidGlyphs[i]; + Cell = &infoPtr->Cells[y][x]; - if (!IntersectRect(&rc, - &ps->rcPaint, - &Cell->CellExt)) - { - continue; - } - - ch = (WCHAR)((XCELLS * (y + infoPtr->iYStart)) + x); - - TagFontToCell(Cell, ch); - - DrawTextW(ps->hdc, - &ch, - 1, - &Cell->CellInt, - DT_CENTER | DT_VCENTER | DT_SINGLELINE); - } - + if (IntersectRect(&rc, + &ps->rcPaint, + &Cell->CellExt)) + { + Cell->ch = ch; + + DrawTextW(ps->hdc, + &ch, + 1, + &Cell->CellInt, + DT_CENTER | DT_VCENTER | DT_SINGLELINE); + + added++; + } + + i++; + ch = (WCHAR)i; + + // move to the next cell + x++; + if (x > XCELLS - 1) + { + x = 0; + y++; + } + } SelectObject(ps->hdc, hOldFont); } @@ -213,6 +219,9 @@ LPWSTR lpFontName) { HDC hdc; + WCHAR ch[MAX_GLYPHS]; + WORD out[MAX_GLYPHS]; + DWORD i, j, Rows; /* Destroy Zoom window, since it was created with older font */ DestroyWindow(infoPtr->hLrgWnd); @@ -225,9 +234,7 @@ sizeof(LOGFONTW)); hdc = GetDC(infoPtr->hMapWnd); - infoPtr->CurrentFont.lfHeight = GetDeviceCaps(hdc, - LOGPIXELSY) / 5; - ReleaseDC(infoPtr->hMapWnd, hdc); + infoPtr->CurrentFont.lfHeight = GetDeviceCaps(hdc, LOGPIXELSY) / 5; infoPtr->CurrentFont.lfCharSet = DEFAULT_CHARSET; wcsncpy(infoPtr->CurrentFont.lfFaceName, @@ -246,6 +253,39 @@ { CreateLargeCell(infoPtr); } + + // Get all the valid glyphs in this font + + SelectObject(hdc, infoPtr->hFont); + + for (i = 0; i < MAX_GLYPHS; i++) + ch[i] = (WCHAR)i; + + if (GetGlyphIndicesW(hdc, + ch, + MAX_GLYPHS, + out, + GGI_MARK_NONEXISTING_GLYPHS) != GDI_ERROR) + { + j = 0; + for (i = 0; i < MAX_GLYPHS; i++) + { + if (out[i] != 0xffff) + { + infoPtr->ValidGlyphs[j] = ch[i]; + j++; + } + } + infoPtr->NumValidGlyphs = j; + } + + ReleaseDC(infoPtr->hMapWnd, hdc); + + Rows = infoPtr->NumValidGlyphs / XCELLS; + if (infoPtr->NumValidGlyphs % XCELLS) + Rows += 1; + + SetScrollRange(infoPtr->hMapWnd, SB_VERT, 0, Rows - YCELLS, FALSE); } @@ -379,8 +419,7 @@ SetGrid(infoPtr); - SetScrollRange(hwnd, SB_VERT, 0, MAX_ROWS, FALSE); - SetScrollPos(hwnd, SB_VERT, 0, TRUE); + SetScrollPos(infoPtr->hParent, SB_VERT, 0, TRUE); Ret = TRUE; } @@ -424,8 +463,7 @@ break; } - infoPtr->iYStart = max(0, - min(infoPtr->iYStart, MAX_ROWS)); + infoPtr->iYStart = max(0, min(infoPtr->iYStart, MAX_ROWS)); iYDiff = iOldYStart - infoPtr->iYStart; if (iYDiff) Modified: trunk/reactos/base/applications/charmap/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/precomp.h [iso-8859-1] Tue Dec 1 21:29:12 2015 @@ -1,15 +1,13 @@ #ifndef __CHARMAP_PRECOMP_H #define __CHARMAP_PRECOMP_H -#include <stdarg.h> -#include <windef.h> -#include <winbase.h> -#include <winuser.h> -#include <wingdi.h> +#include <windows.h> #include "resource.h" #define SIZEOF(_v) (sizeof(_v) / sizeof(*_v)) + +#define MAX_GLYPHS 65536 #define XCELLS 20 #define YCELLS 10 @@ -44,6 +42,10 @@ HFONT hFont; LOGFONTW CurrentFont; INT iYStart; + + USHORT ValidGlyphs[MAX_GLYPHS]; + USHORT NumValidGlyphs; + } MAP, *PMAP; typedef struct {

1 0

[akhaldi] 70227: [PSDK] Add missing EBO_NOBORDER and EBO_NO.
by akhaldi＠svn.reactos.org 01 Dec '15

01 Dec '15

Author: akhaldi Date: Tue Dec 1 18:09:05 2015 New Revision: 70227 URL: http://svn.reactos.org/svn/reactos?rev=70227&view=rev Log: [PSDK] Add missing EBO_NOBORDER and EBO_NO. Modified: trunk/reactos/include/psdk/shobjidl.idl Modified: trunk/reactos/include/psdk/shobjidl.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shobjidl.idl?… ============================================================================== --- trunk/reactos/include/psdk/shobjidl.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shobjidl.idl [iso-8859-1] Tue Dec 1 18:09:05 2015 @@ -2733,7 +2733,9 @@ EBO_ALWAYSNAVIGATE = 0x04, EBO_NOTRAVELLOG = 0x08, EBO_NOWRAPPERWINDOW = 0x10, - EBO_HTMLSHAREPOINTVIEW = 0x20 + EBO_HTMLSHAREPOINTVIEW = 0x20, + EBO_NOBORDER = 0x40, + EBO_NOPERSISTVIEWSTATE = 0x80, } EXPLORER_BROWSER_OPTIONS; cpp_quote("#define SID_SExplorerBrowserFrame IID_ICommDlgBrowser")

1 0

[tfaber] 70226: [KMTESTS:FSRTL] - Add tests for FsRtlDissectName/FsRtlDissectDbcs and FsRtlIsFatDbcsLegal/FsRtlIsHpfsDbcsLegal
by tfaber＠svn.reactos.org 01 Dec '15

01 Dec '15

Author: tfaber Date: Tue Dec 1 14:22:17 2015 New Revision: 70226 URL: http://svn.reactos.org/svn/reactos?rev=70226&view=rev Log: [KMTESTS:FSRTL] - Add tests for FsRtlDissectName/FsRtlDissectDbcs and FsRtlIsFatDbcsLegal/FsRtlIsHpfsDbcsLegal Added: trunk/rostests/kmtests/ntos_fsrtl/FsRtlDissect.c (with props) trunk/rostests/kmtests/ntos_fsrtl/FsRtlLegal.c (with props) Modified: trunk/rostests/kmtests/CMakeLists.txt trunk/rostests/kmtests/kmtest_drv/testlist.c Modified: trunk/rostests/kmtests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/CMakeLists.txt?re… ============================================================================== --- trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] Tue Dec 1 14:22:17 2015 @@ -47,7 +47,9 @@ ntos_ex/ExSequencedList.c ntos_ex/ExSingleList.c ntos_ex/ExTimer.c + ntos_fsrtl/FsRtlDissect.c ntos_fsrtl/FsRtlExpression.c + ntos_fsrtl/FsRtlLegal.c ntos_fsrtl/FsRtlMcb.c ntos_fsrtl/FsRtlTunnel.c ntos_io/IoCreateFile.c Modified: trunk/rostests/kmtests/kmtest_drv/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kmtest_drv/testli… ============================================================================== --- trunk/rostests/kmtests/kmtest_drv/testlist.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/kmtest_drv/testlist.c [iso-8859-1] Tue Dec 1 14:22:17 2015 @@ -20,7 +20,9 @@ KMT_TESTFUNC Test_ExSequencedList; KMT_TESTFUNC Test_ExSingleList; KMT_TESTFUNC Test_ExTimer; +KMT_TESTFUNC Test_FsRtlDissect; KMT_TESTFUNC Test_FsRtlExpression; +KMT_TESTFUNC Test_FsRtlLegal; KMT_TESTFUNC Test_FsRtlMcb; KMT_TESTFUNC Test_FsRtlTunnel; KMT_TESTFUNC Test_IoCreateFile; @@ -85,7 +87,9 @@ { "ExSingleList", Test_ExSingleList }, { "-ExTimer", Test_ExTimer }, { "Example", Test_Example }, + { "FsRtlDissect", Test_FsRtlDissect }, { "FsRtlExpression", Test_FsRtlExpression }, + { "FsRtlLegal", Test_FsRtlLegal }, { "FsRtlMcb", Test_FsRtlMcb }, { "FsRtlTunnel", Test_FsRtlTunnel }, { "IoCreateFile", Test_IoCreateFile }, Added: trunk/rostests/kmtests/ntos_fsrtl/FsRtlDissect.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_fsrtl/FsRtlD… ============================================================================== --- trunk/rostests/kmtests/ntos_fsrtl/FsRtlDissect.c (added) +++ trunk/rostests/kmtests/ntos_fsrtl/FsRtlDissect.c [iso-8859-1] Tue Dec 1 14:22:17 2015 @@ -0,0 +1,123 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Test for FsRtlDissectName/FsRtlDissectDbcs + * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> + */ + +#include <kmt_test.h> + +static struct +{ + PCSTR Name; + INT Offset1; + INT Offset2; + INT Length1; + INT Length2; +} Tests[] = +{ + { NULL, -1, -1 }, + { "", -1, -1 }, + { "a", 0, -1, 1, 1 }, + { "a\\b", 0, 2, 1, 1 }, + { "a\\", 0, 2, 1, 0 }, + { "\\b", 1, -1, 1 }, + { "\\", 1, -1, 0 }, + { "a\\b\\c", 0, 2, 1, 3 }, + { "\\a\\b\\c", 1, 3, 1, 3 }, + /* Forward slashes are not separators */ + { "/", 0, -1, 1 }, + { "/a", 0, -1, 2 }, + { "/a/b", 0, -1, 4 }, + /* Normal parsing cycle */ + { "Good Morning!\\Good Evening!\\Good Night", 0, 14, 13, 24 }, + { "Good Evening!\\Good Night", 0, 14, 13, 10 }, + { "Good Night", 0, -1, 10 }, + /* Double backslashes */ + { "\\\\", 1, 2, 0, 0 }, + { "a\\\\", 0, 2, 1, 1 }, + { "\\\\b", 1, 2, 0, 1 }, + { "a\\\\b", 0, 2, 1, 2 }, + /* Even more backslashes */ + { "\\\\\\", 1, 2, 0, 1 }, + { "a\\\\\\", 0, 2, 1, 2 }, + { "\\\\\\b", 1, 2, 0, 2 }, + { "a\\\\\\b", 0, 2, 1, 3 }, + { "a\\\\\\\\b", 0, 2, 1, 4 }, +}; + +START_TEST(FsRtlDissect) +{ + NTSTATUS Status; + ANSI_STRING NameA; + ANSI_STRING FirstA; + ANSI_STRING RemainingA; + UNICODE_STRING NameU; + UNICODE_STRING FirstU; + UNICODE_STRING RemainingU; + ULONG i; + + for (i = 0; i < RTL_NUMBER_OF(Tests); i++) + { + RtlInitAnsiString(&NameA, Tests[i].Name); + RtlFillMemory(&FirstA, sizeof(FirstA), 0x55); + RtlFillMemory(&RemainingA, sizeof(RemainingA), 0x55); + FsRtlDissectDbcs(NameA, &FirstA, &RemainingA); + if (Tests[i].Offset1 == -1) + { + ok(FirstA.Buffer == NULL, "[%s] First=%p, expected NULL\n", Tests[i].Name, FirstA.Buffer); + ok(FirstA.Length == 0, "[%s] FirstLen=%u, expected 0\n", Tests[i].Name, FirstA.Length); + ok(FirstA.MaximumLength == 0, "[%s] FirstMaxLen=%u, expected 0\n", Tests[i].Name, FirstA.MaximumLength); + } + else + { + ok(FirstA.Buffer == NameA.Buffer + Tests[i].Offset1, "[%s] First=%p, expected %p\n", Tests[i].Name, FirstA.Buffer, NameA.Buffer + Tests[i].Offset1); + ok(FirstA.Length == Tests[i].Length1, "[%s] FirstLen=%u, expected %d\n", Tests[i].Name, FirstA.Length, Tests[i].Length1); + ok(FirstA.MaximumLength == Tests[i].Length1, "[%s] FirstMaxLen=%u, expected %d\n", Tests[i].Name, FirstA.MaximumLength, Tests[i].Length1); + } + if (Tests[i].Offset2 == -1) + { + ok(RemainingA.Buffer == NULL, "[%s] Remaining=%p, expected NULL\n", Tests[i].Name, RemainingA.Buffer); + ok(RemainingA.Length == 0, "[%s] RemainingLen=%u, expected 0\n", Tests[i].Name, RemainingA.Length); + ok(RemainingA.MaximumLength == 0, "[%s] RemainingMaxLen=%u, expected 0\n", Tests[i].Name, RemainingA.MaximumLength); + } + else + { + ok(RemainingA.Buffer == NameA.Buffer + Tests[i].Offset2, "[%s] Remaining=%p, expected %p\n", Tests[i].Name, RemainingA.Buffer, NameA.Buffer + Tests[i].Offset2); + ok(RemainingA.Length == Tests[i].Length2, "[%s] RemainingLen=%u, expected %d\n", Tests[i].Name, RemainingA.Length, Tests[i].Length2); + ok(RemainingA.MaximumLength == Tests[i].Length2, "[%s] RemainingMaxLen=%u, expected %d\n", Tests[i].Name, RemainingA.MaximumLength, Tests[i].Length2); + } + + Status = RtlAnsiStringToUnicodeString(&NameU, &NameA, TRUE); + if (skip(NT_SUCCESS(Status), "Conversion failed with %lx\n", Status)) + continue; + RtlFillMemory(&FirstU, sizeof(FirstU), 0x55); + RtlFillMemory(&RemainingU, sizeof(RemainingU), 0x55); + FsRtlDissectName(NameU, &FirstU, &RemainingU); + if (Tests[i].Offset1 == -1) + { + ok(FirstU.Buffer == NULL, "[%s] First=%p, expected NULL\n", Tests[i].Name, FirstU.Buffer); + ok(FirstU.Length == 0, "[%s] FirstLen=%u, expected 0\n", Tests[i].Name, FirstU.Length); + ok(FirstU.MaximumLength == 0, "[%s] FirstMaxLen=%u, expected 0\n", Tests[i].Name, FirstU.MaximumLength); + } + else + { + ok(FirstU.Buffer == NameU.Buffer + Tests[i].Offset1, "[%s] First=%p, expected %p\n", Tests[i].Name, FirstU.Buffer, NameU.Buffer + Tests[i].Offset1); + ok(FirstU.Length == Tests[i].Length1 * sizeof(WCHAR), "[%s] FirstLen=%u, expected %d\n", Tests[i].Name, FirstU.Length, Tests[i].Length1 * sizeof(WCHAR)); + ok(FirstU.MaximumLength == Tests[i].Length1 * sizeof(WCHAR), "[%s] FirstMaxLen=%u, expected %d\n", Tests[i].Name, FirstU.MaximumLength, Tests[i].Length1 * sizeof(WCHAR)); + } + if (Tests[i].Offset2 == -1) + { + ok(RemainingU.Buffer == NULL, "[%s] Remaining=%p, expected NULL\n", Tests[i].Name, RemainingU.Buffer); + ok(RemainingU.Length == 0, "[%s] RemainingLen=%u, expected 0\n", Tests[i].Name, RemainingU.Length); + ok(RemainingU.MaximumLength == 0, "[%s] RemainingMaxLen=%u, expected 0\n", Tests[i].Name, RemainingU.MaximumLength); + } + else + { + ok(RemainingU.Buffer == NameU.Buffer + Tests[i].Offset2, "[%s] Remaining=%p, expected %p\n", Tests[i].Name, RemainingU.Buffer, NameU.Buffer + Tests[i].Offset2); + ok(RemainingU.Length == Tests[i].Length2 * sizeof(WCHAR), "[%s] RemainingLen=%u, expected %d\n", Tests[i].Name, RemainingU.Length, Tests[i].Length2 * sizeof(WCHAR)); + ok(RemainingU.MaximumLength == Tests[i].Length2 * sizeof(WCHAR), "[%s] RemainingMaxLen=%u, expected %d\n", Tests[i].Name, RemainingU.MaximumLength, Tests[i].Length2 * sizeof(WCHAR)); + } + RtlFreeUnicodeString(&NameU); + } +} Propchange: trunk/rostests/kmtests/ntos_fsrtl/FsRtlDissect.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/kmtests/ntos_fsrtl/FsRtlLegal.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_fsrtl/FsRtlL… ============================================================================== --- trunk/rostests/kmtests/ntos_fsrtl/FsRtlLegal.c (added) +++ trunk/rostests/kmtests/ntos_fsrtl/FsRtlLegal.c [iso-8859-1] Tue Dec 1 14:22:17 2015 @@ -0,0 +1,146 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Test for FsRtlIsFatDbcsLegal/FsRtlIsHpfsDbcsLegal + * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> + */ + +#include <kmt_test.h> + +static struct +{ + PCSTR Dbcs; + BOOLEAN LegalFat; + BOOLEAN LegalHpfs; + BOOLEAN HasWildCards; + BOOLEAN IsPath; + BOOLEAN LeadingBackslash; +} Tests[] = +{ + { "", FALSE, FALSE }, + { "a", TRUE, TRUE, FALSE, FALSE, FALSE }, + { "A", TRUE, TRUE, FALSE, FALSE, FALSE }, + { ".", TRUE, TRUE, TRUE, FALSE, FALSE }, + { "..", TRUE, TRUE, TRUE, FALSE, FALSE }, + { "...", FALSE, FALSE }, + { "A ", FALSE, FALSE }, + { " ", FALSE, FALSE }, + { " A", TRUE, TRUE, FALSE, FALSE, FALSE }, + { " A ", FALSE, FALSE }, + { "A.", FALSE, FALSE }, + { ".A", FALSE, TRUE, FALSE, FALSE, FALSE }, + { ".A.", FALSE, FALSE }, + { "*", TRUE, TRUE, TRUE, FALSE, FALSE }, + { "?", TRUE, TRUE, TRUE, FALSE, FALSE }, + { "????????.???", TRUE, TRUE, TRUE, FALSE, FALSE }, + { "????????????", TRUE, TRUE, TRUE, FALSE, FALSE }, + { "????????.????", TRUE, TRUE, TRUE, FALSE, FALSE }, + { "??????????????????", TRUE, TRUE, TRUE, FALSE, FALSE }, + { "?*?*?*?*?*?*?*?*?*", TRUE, TRUE, TRUE, FALSE, FALSE }, + { "ABCDEFGHIJKLMNOPQ*", TRUE, TRUE, TRUE, FALSE, FALSE }, + { "ABCDEFGHI\\*", FALSE, TRUE, TRUE, TRUE, FALSE }, + { "*\\ABCDEFGHI", FALSE, TRUE, TRUE, TRUE, FALSE }, + { "?.?.?", TRUE, TRUE, TRUE, FALSE, FALSE }, + { "?..?", TRUE, TRUE, TRUE, FALSE, FALSE }, + { "? ", TRUE, FALSE, TRUE, FALSE, FALSE }, + { " ?", TRUE, TRUE, TRUE, FALSE, FALSE }, + { "?.", TRUE, FALSE, TRUE, FALSE, FALSE }, + { ".?", TRUE, TRUE, TRUE, FALSE, FALSE }, + { "? .?", TRUE, TRUE, TRUE, FALSE, FALSE }, + { "A?A", TRUE, TRUE, TRUE, FALSE, FALSE }, + { "A*A", TRUE, TRUE, TRUE, FALSE, FALSE }, + { "A<A", TRUE, TRUE, TRUE, FALSE, FALSE }, + { "A>A", TRUE, TRUE, TRUE, FALSE, FALSE }, + { "A\"A", TRUE, TRUE, TRUE, FALSE, FALSE }, + { "A'A", TRUE, TRUE, FALSE, FALSE, FALSE }, + { "A:A", FALSE, FALSE }, + { "A\x1fG", FALSE, FALSE }, + { "A\x01G", FALSE, FALSE }, + { "A\x0aG", FALSE, FALSE }, + { "A\x0dG", FALSE, FALSE }, + { "\x7f", TRUE, TRUE, FALSE, FALSE, FALSE }, + /* FIXME: these two are probably locale-specific */ + { "\x80", TRUE, TRUE, FALSE, FALSE, FALSE }, + { "\xff", TRUE, TRUE, FALSE, FALSE, FALSE }, + { "ABCDEFGH.IJK", TRUE, TRUE, FALSE, FALSE, FALSE }, + { "ABCDEFGHX.IJK", FALSE, TRUE, FALSE, FALSE, FALSE }, + { "ABCDEFGHX.IJ", FALSE, TRUE, FALSE, FALSE, FALSE }, + { "ABCDEFGH.IJKX", FALSE, TRUE, FALSE, FALSE, FALSE }, + { "ABCDEFG.IJKX", FALSE, TRUE, FALSE, FALSE, FALSE }, + { "ABCDEFGH", TRUE, TRUE, FALSE, FALSE, FALSE }, + { "ABCDEFGHX", FALSE, TRUE, FALSE, FALSE, FALSE }, + { "A.B", TRUE, TRUE, FALSE, FALSE, FALSE }, + { "A..B", FALSE, TRUE, FALSE, FALSE, FALSE }, + { "A.B.", FALSE, FALSE }, + { "A.B.C", FALSE, TRUE, FALSE, FALSE, FALSE }, + { "A .B", FALSE, TRUE, FALSE, FALSE, FALSE }, + { " A .B", FALSE, TRUE, FALSE, FALSE, FALSE }, + { "A. B", TRUE, TRUE, FALSE, FALSE, FALSE }, + { "A. B ", FALSE, FALSE }, + { "A. B ", FALSE, FALSE }, + { " A . B", FALSE, TRUE, FALSE, FALSE, FALSE }, + { " A . B ", FALSE, FALSE }, + { "\\ABCDEFGH.IJK", TRUE, TRUE, FALSE, FALSE, TRUE }, + { "ABCDEFGH.IJK\\", TRUE, TRUE, FALSE, TRUE, FALSE }, + { "\\ABCDEFGH.IJK\\", TRUE, TRUE, FALSE, TRUE, TRUE }, + { "\\", TRUE, TRUE, FALSE, FALSE, TRUE }, + { "\\\\", FALSE, FALSE }, + { "\\\\B", FALSE, FALSE }, + { "A\\", TRUE, TRUE, FALSE, TRUE, FALSE }, + { "A\\B", TRUE, TRUE, FALSE, TRUE, FALSE }, + { "A\\\\", FALSE, FALSE }, + { "A\\\\B", FALSE, FALSE }, + /* We can exceed MAX_PATH (260) characters */ + { "0BCDEF.HI\\1BCDEF.HI\\2BCDEF.HI\\3BCDEF.HI\\4BCDEF.HI\\5BCDEF.HI\\6BCDEF.HI\\7BCDEF.HI\\8BCDEF.HI\\9BCDEF.HI\\0BCDEF.HI\\1BCDEF.HI\\2BCDEF.HI\\3BCDEF.HI\\4BCDEF.HI\\5BCDEF.HI\\6BCDEF.HI\\7BCDEF.HI\\8BCDEF.HI\\9BCDEF.HI\\0BCDEF.HI\\1BCDEF.HI\\2BCDEF.HI\\3BCDEF.HI\\4BCDEF.HI\\5BCDEF.HI\\6BCDEF.HI", TRUE, TRUE, FALSE, TRUE, FALSE }, + { "0BCDEF.HI\\1BCDEF.HI\\2BCDEF.HI\\3BCDEF.HI\\4BCDEF.HI\\5BCDEF.HI\\6BCDEF.HI\\7BCDEF.HI\\8BCDEF.HI\\9BCDEF.HI\\0BCDEF.HI\\1BCDEF.HI\\2BCDEF.HI\\3BCDEF.HI\\4BCDEF.HI\\5BCDEF.HI\\6BCDEF.HI\\7BCDEF.HI\\8BCDEF.HI\\9BCDEF.HI\\0BCDEF.HI\\1BCDEF.HI\\2BCDEF.HI\\3BCDEF.HI\\4BCDEF.HI\\5BCDEF.HI\\6BCDEF.HI\\", TRUE, TRUE, FALSE, TRUE, FALSE }, + { "0BCDEF.HI\\1BCDEF.HI\\2BCDEF.HI\\3BCDEF.HI\\4BCDEF.HI\\5BCDEF.HI\\6BCDEF.HI\\7BCDEF.HI\\8BCDEF.HI\\9BCDEF.HI\\0BCDEF.HI\\1BCDEF.HI\\2BCDEF.HI\\3BCDEF.HI\\4BCDEF.HI\\5BCDEF.HI\\6BCDEF.HI\\7BCDEF.HI\\8BCDEF.HI\\9BCDEF.HI\\0BCDEF.HI\\1BCDEF.HI\\2BCDEF.HI\\3BCDEF.HI\\4BCDEF.HI\\5BCDEF.HI\\6BCDEF.HI\\7", TRUE, TRUE, FALSE, TRUE, FALSE }, + /* Max component length for HPFS is 255 characters */ + { "ABCDEFGHI1ABCDEFGHI2ABCDEFGHI3ABCDEFGHI4ABCDEFGHI5ABCDEFGHI6ABCDEFGHI7ABCDEFGHI8ABCDEFGHI9ABCDEFGHI0ABCDEFGHI1ABCDEFGHI2ABCDEFGHI3ABCDEFGHI4ABCDEFGHI5ABCDEFGHI6ABCDEFGHI7ABCDEFGHI8ABCDEFGHI9ABCDEFGHI0ABCDEFGHI1ABCDEFGHI2ABCDEFGHI3ABCDEFGHI4ABCDEFGHI5ABCDE", FALSE, TRUE, FALSE, FALSE, FALSE }, + { "ABCDEFGHI1ABCDEFGHI2ABCDEFGHI3ABCDEFGHI4ABCDEFGHI5ABCDEFGHI6ABCDEFGHI7ABCDEFGHI8ABCDEFGHI9ABCDEFGHI0ABCDEFGHI1ABCDEFGHI2ABCDEFGHI3ABCDEFGHI4ABCDEFGHI5ABCDEFGHI6ABCDEFGHI7ABCDEFGHI8ABCDEFGHI9ABCDEFGHI0ABCDEFGHI1ABCDEFGHI2ABCDEFGHI3ABCDEFGHI4ABCDEFGHI5ABCDEF", FALSE, FALSE }, + { "ABCDEFGHI1ABCDEFGHI2ABCDEFGHI3ABCDEFGHI4ABCDEFGHI5ABCDEFGHI6ABCDEFGHI7ABCDEFGHI8ABCDEFGHI9ABCDEFGHI0ABCDEFGHI1ABCDEFGHI2ABCDEFGHI3ABCDEFGHI4ABCDEFGHI5ABCDEFGHI6ABCDEFGHI7ABCDEFGHI8ABCDEFGHI9ABCDEFGHI0ABCDEFGHI1ABCDEFGHI2ABCDEFGHI3ABCDEFGHI4ABCDEFGHI5ABCDE\\ABC", FALSE, TRUE, FALSE, TRUE, FALSE }, +}; + +START_TEST(FsRtlLegal) +{ + ULONG i; + BOOLEAN Result; + ANSI_STRING DbcsName; + ULONG Flags; + + for (i = 0; i < RTL_NUMBER_OF(Tests); i++) + { + RtlInitAnsiString(&DbcsName, Tests[i].Dbcs); + for (Flags = 0; Flags < 8; Flags++) + { + Result = FsRtlIsFatDbcsLegal(DbcsName, + BooleanFlagOn(Flags, 1), + BooleanFlagOn(Flags, 2), + BooleanFlagOn(Flags, 4)); + if (Tests[i].HasWildCards && !FlagOn(Flags, 1)) + ok(Result == FALSE, "[%s] Result = %u but has wildcards\n", Tests[i].Dbcs, Result); + else if (Tests[i].IsPath && !FlagOn(Flags, 2)) + ok(Result == FALSE, "[%s] Result = %u but is path\n", Tests[i].Dbcs, Result); + else if (Tests[i].LeadingBackslash && !FlagOn(Flags, 4)) + ok(Result == FALSE, "[%s] Result = %u but has leading backslash\n", Tests[i].Dbcs, Result); + else if (!Tests[i].LegalFat) + ok(Result == FALSE, "[%s] Result = %u but is NOT legal FAT\n", Tests[i].Dbcs, Result); + else + ok(Result == TRUE, "[%s] Result = %u but IS legal FAT\n", Tests[i].Dbcs, Result); + + Result = FsRtlIsHpfsDbcsLegal(DbcsName, + BooleanFlagOn(Flags, 1), + BooleanFlagOn(Flags, 2), + BooleanFlagOn(Flags, 4)); + if (Tests[i].HasWildCards && !FlagOn(Flags, 1)) + ok(Result == FALSE, "[%s] Result = %u but has wildcards\n", Tests[i].Dbcs, Result); + else if (Tests[i].IsPath && !FlagOn(Flags, 2)) + ok(Result == FALSE, "[%s] Result = %u but is path\n", Tests[i].Dbcs, Result); + else if (Tests[i].LeadingBackslash && !FlagOn(Flags, 4)) + ok(Result == FALSE, "[%s] Result = %u but has leading backslash\n", Tests[i].Dbcs, Result); + else if (!Tests[i].LegalHpfs) + ok(Result == FALSE, "[%s] Result = %u but is NOT legal HPFS\n", Tests[i].Dbcs, Result); + else + ok(Result == TRUE, "[%s] Result = %u but IS legal HPFS\n", Tests[i].Dbcs, Result); + } + } +} Propchange: trunk/rostests/kmtests/ntos_fsrtl/FsRtlLegal.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 70225: [FREETYPE] Update to v2.6.2. CORE-10614
by akhaldi＠svn.reactos.org 01 Dec '15

01 Dec '15

Author: akhaldi Date: Tue Dec 1 10:36:24 2015 New Revision: 70225 URL: http://svn.reactos.org/svn/reactos?rev=70225&view=rev Log: [FREETYPE] Update to v2.6.2. CORE-10614 Modified: trunk/reactos/lib/3rdparty/freetype/CMakeLists.txt trunk/reactos/lib/3rdparty/freetype/ChangeLog trunk/reactos/lib/3rdparty/freetype/README trunk/reactos/lib/3rdparty/freetype/devel/ftoption.h trunk/reactos/lib/3rdparty/freetype/include/freetype/config/ftoption.h trunk/reactos/lib/3rdparty/freetype/include/freetype/freetype.h trunk/reactos/lib/3rdparty/freetype/include/freetype/ftautoh.h trunk/reactos/lib/3rdparty/freetype/include/freetype/ftcffdrv.h trunk/reactos/lib/3rdparty/freetype/include/freetype/fterrdef.h trunk/reactos/lib/3rdparty/freetype/include/freetype/ftlcdfil.h trunk/reactos/lib/3rdparty/freetype/include/freetype/ftmm.h trunk/reactos/lib/3rdparty/freetype/include/freetype/ftmodapi.h trunk/reactos/lib/3rdparty/freetype/include/freetype/internal/ftcalc.h trunk/reactos/lib/3rdparty/freetype/include/freetype/internal/ftobjs.h trunk/reactos/lib/3rdparty/freetype/include/freetype/internal/tttypes.h trunk/reactos/lib/3rdparty/freetype/src/autofit/afcjk.c trunk/reactos/lib/3rdparty/freetype/src/autofit/afdummy.c trunk/reactos/lib/3rdparty/freetype/src/autofit/afglobal.c trunk/reactos/lib/3rdparty/freetype/src/autofit/afglobal.h trunk/reactos/lib/3rdparty/freetype/src/autofit/afhints.c trunk/reactos/lib/3rdparty/freetype/src/autofit/afindic.c trunk/reactos/lib/3rdparty/freetype/src/autofit/aflatin.c trunk/reactos/lib/3rdparty/freetype/src/autofit/aflatin.h trunk/reactos/lib/3rdparty/freetype/src/autofit/aflatin2.c trunk/reactos/lib/3rdparty/freetype/src/autofit/afloader.c trunk/reactos/lib/3rdparty/freetype/src/autofit/afloader.h trunk/reactos/lib/3rdparty/freetype/src/autofit/afmodule.c trunk/reactos/lib/3rdparty/freetype/src/autofit/afmodule.h trunk/reactos/lib/3rdparty/freetype/src/autofit/aftypes.h trunk/reactos/lib/3rdparty/freetype/src/base/ftdbgmem.c trunk/reactos/lib/3rdparty/freetype/src/base/ftglyph.c trunk/reactos/lib/3rdparty/freetype/src/base/ftlcdfil.c trunk/reactos/lib/3rdparty/freetype/src/base/ftobjs.c trunk/reactos/lib/3rdparty/freetype/src/base/ftoutln.c trunk/reactos/lib/3rdparty/freetype/src/bdf/bdfdrivr.c trunk/reactos/lib/3rdparty/freetype/src/bdf/bdflib.c trunk/reactos/lib/3rdparty/freetype/src/cache/ftccache.c trunk/reactos/lib/3rdparty/freetype/src/cff/cf2ft.c trunk/reactos/lib/3rdparty/freetype/src/cff/cf2ft.h trunk/reactos/lib/3rdparty/freetype/src/cff/cf2hints.c trunk/reactos/lib/3rdparty/freetype/src/cff/cf2intrp.c trunk/reactos/lib/3rdparty/freetype/src/cff/cffdrivr.c trunk/reactos/lib/3rdparty/freetype/src/cff/cffobjs.c trunk/reactos/lib/3rdparty/freetype/src/cid/cidgload.c trunk/reactos/lib/3rdparty/freetype/src/cid/cidload.c trunk/reactos/lib/3rdparty/freetype/src/cid/cidriver.c trunk/reactos/lib/3rdparty/freetype/src/gxvalid/gxvmod.c trunk/reactos/lib/3rdparty/freetype/src/gzip/ftgzip.c trunk/reactos/lib/3rdparty/freetype/src/otvalid/otvmod.c trunk/reactos/lib/3rdparty/freetype/src/pcf/pcf.h trunk/reactos/lib/3rdparty/freetype/src/pcf/pcfdrivr.c trunk/reactos/lib/3rdparty/freetype/src/pcf/pcfread.c trunk/reactos/lib/3rdparty/freetype/src/pfr/pfrcmap.c trunk/reactos/lib/3rdparty/freetype/src/pfr/pfrdrivr.c trunk/reactos/lib/3rdparty/freetype/src/pfr/pfrgload.c trunk/reactos/lib/3rdparty/freetype/src/pfr/pfrload.c trunk/reactos/lib/3rdparty/freetype/src/pfr/pfrload.h trunk/reactos/lib/3rdparty/freetype/src/pfr/pfrobjs.c trunk/reactos/lib/3rdparty/freetype/src/pfr/pfrsbit.c trunk/reactos/lib/3rdparty/freetype/src/psaux/t1decode.c trunk/reactos/lib/3rdparty/freetype/src/psnames/psmodule.c trunk/reactos/lib/3rdparty/freetype/src/sfnt/sfdriver.c trunk/reactos/lib/3rdparty/freetype/src/sfnt/sfobjs.c trunk/reactos/lib/3rdparty/freetype/src/sfnt/ttcmap.c trunk/reactos/lib/3rdparty/freetype/src/sfnt/ttsbit.c trunk/reactos/lib/3rdparty/freetype/src/smooth/ftgrays.c trunk/reactos/lib/3rdparty/freetype/src/tools/docmaker/content.py trunk/reactos/lib/3rdparty/freetype/src/tools/docmaker/formatter.py trunk/reactos/lib/3rdparty/freetype/src/tools/docmaker/sources.py trunk/reactos/lib/3rdparty/freetype/src/tools/docmaker/tohtml.py trunk/reactos/lib/3rdparty/freetype/src/truetype/ttdriver.c trunk/reactos/lib/3rdparty/freetype/src/truetype/ttgload.c trunk/reactos/lib/3rdparty/freetype/src/truetype/ttgxvar.c trunk/reactos/lib/3rdparty/freetype/src/truetype/ttgxvar.h trunk/reactos/lib/3rdparty/freetype/src/truetype/ttinterp.c trunk/reactos/lib/3rdparty/freetype/src/truetype/ttobjs.c trunk/reactos/lib/3rdparty/freetype/src/truetype/ttpload.c trunk/reactos/lib/3rdparty/freetype/src/type1/t1afm.c trunk/reactos/lib/3rdparty/freetype/src/type1/t1driver.c trunk/reactos/lib/3rdparty/freetype/src/type1/t1load.c trunk/reactos/lib/3rdparty/freetype/src/type42/t42drivr.c trunk/reactos/lib/3rdparty/freetype/src/type42/t42parse.c trunk/reactos/lib/3rdparty/freetype/src/winfonts/winfnt.c trunk/reactos/media/doc/3rd Party Files.txt [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/lib/3rdparty/freetype/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/CMak… Modified: trunk/reactos/lib/3rdparty/freetype/ChangeLog URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/Chan… Modified: trunk/reactos/lib/3rdparty/freetype/README URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/READ… Modified: trunk/reactos/lib/3rdparty/freetype/devel/ftoption.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/deve… Modified: trunk/reactos/lib/3rdparty/freetype/include/freetype/config/ftoption.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/incl… Modified: trunk/reactos/lib/3rdparty/freetype/include/freetype/freetype.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/incl… Modified: trunk/reactos/lib/3rdparty/freetype/include/freetype/ftautoh.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/incl… Modified: trunk/reactos/lib/3rdparty/freetype/include/freetype/ftcffdrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/incl… Modified: trunk/reactos/lib/3rdparty/freetype/include/freetype/fterrdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/incl… Modified: trunk/reactos/lib/3rdparty/freetype/include/freetype/ftlcdfil.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/incl… Modified: trunk/reactos/lib/3rdparty/freetype/include/freetype/ftmm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/incl… Modified: trunk/reactos/lib/3rdparty/freetype/include/freetype/ftmodapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/incl… Modified: trunk/reactos/lib/3rdparty/freetype/include/freetype/internal/ftcalc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/incl… Modified: trunk/reactos/lib/3rdparty/freetype/include/freetype/internal/ftobjs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/incl… Modified: trunk/reactos/lib/3rdparty/freetype/include/freetype/internal/tttypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/incl… Modified: trunk/reactos/lib/3rdparty/freetype/src/autofit/afcjk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/autofit/afdummy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/autofit/afglobal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/autofit/afglobal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/autofit/afhints.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/autofit/afindic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/autofit/aflatin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/autofit/aflatin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/autofit/aflatin2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/autofit/afloader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/autofit/afloader.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/autofit/afmodule.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/autofit/afmodule.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/autofit/aftypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/base/ftdbgmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/base/ftglyph.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/base/ftlcdfil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/base/ftobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/base/ftoutln.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/bdf/bdfdrivr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/bdf/bdflib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/cache/ftccache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/cff/cf2ft.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/cff/cf2ft.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/cff/cf2hints.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/cff/cf2intrp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/cff/cffdrivr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/cff/cffobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/cid/cidgload.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/cid/cidload.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/cid/cidriver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/gxvalid/gxvmod.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/gzip/ftgzip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/otvalid/otvmod.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/pcf/pcf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/pcf/pcfdrivr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/pcf/pcfread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/pfr/pfrcmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/pfr/pfrdrivr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/pfr/pfrgload.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/pfr/pfrload.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/pfr/pfrload.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/pfr/pfrobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/pfr/pfrsbit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/psaux/t1decode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/psnames/psmodule.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/sfnt/sfdriver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/sfnt/sfobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/sfnt/ttcmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/sfnt/ttsbit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/smooth/ftgrays.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/tools/docmaker/content.py URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/tools/docmaker/formatter.py URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/tools/docmaker/sources.py URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/tools/docmaker/tohtml.py URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/truetype/ttdriver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/truetype/ttgload.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/truetype/ttgxvar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/truetype/ttgxvar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/truetype/ttinterp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/truetype/ttobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/truetype/ttpload.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/type1/t1afm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/type1/t1driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/type1/t1load.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/type42/t42drivr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/type42/t42parse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/winfonts/winfnt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/media/doc/3rd Party Files.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/3rd%20Party%20Fi…

1 0

[akhaldi] 70224: [SETUPAPI_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 30 Nov '15

30 Nov '15

Author: akhaldi Date: Mon Nov 30 22:25:50 2015 New Revision: 70224 URL: http://svn.reactos.org/svn/reactos?rev=70224&view=rev Log: [SETUPAPI_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536 Added: trunk/rostests/winetests/setupapi/dialog.c (with props) Modified: trunk/rostests/winetests/setupapi/CMakeLists.txt trunk/rostests/winetests/setupapi/install.c trunk/rostests/winetests/setupapi/testlist.c Modified: trunk/rostests/winetests/setupapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/setupapi/CMakeL… ============================================================================== --- trunk/rostests/winetests/setupapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/setupapi/CMakeLists.txt [iso-8859-1] Mon Nov 30 22:25:50 2015 @@ -1,6 +1,7 @@ list(APPEND SOURCE devinst.c + dialog.c diskspace.c install.c misc.c Added: trunk/rostests/winetests/setupapi/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/setupapi/dialog… ============================================================================== --- trunk/rostests/winetests/setupapi/dialog.c (added) +++ trunk/rostests/winetests/setupapi/dialog.c [iso-8859-1] Mon Nov 30 22:25:50 2015 @@ -0,0 +1,107 @@ +/* + * Unit tests for SetupPromptForDisk + * + * Copyright 2014 Michael MÃ¼ller + * + * 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 <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "winreg.h" +#include "guiddef.h" +#include "setupapi.h" + +#include "wine/test.h" + +static void test_SetupPromptForDiskA(void) +{ + char path[] = "C:\\windows\\system32"; + char file[] = "kernel32.dll"; + char buffer[MAX_PATH]; + UINT ret; + DWORD length; + + memset(buffer, 0, sizeof(buffer)); + ret = SetupPromptForDiskA(0, "Test", "Testdisk", path, file, 0, IDF_CHECKFIRST, buffer, sizeof(buffer) - 1, &length); + ok(ret == DPROMPT_SUCCESS, "Expected DPROMPT_SUCCESS, got %u\n", ret); + ok(length == strlen(path)+1, "Expect length %u, got %u\n", (DWORD)strlen(path) + 1, length); + ok(strcmp(path, buffer) == 0, "Expected path %s, got %s\n", path, buffer); + + memset(buffer, 0, sizeof(buffer)); + ret = SetupPromptForDiskA(0, "Test", "Testdisk", path, file, 0, IDF_CHECKFIRST, 0, 0, &length); + ok(ret == DPROMPT_SUCCESS, "Expected DPROMPT_SUCCESS, got %d\n", ret); + ok(length == strlen(path)+1, "Expect length %u, got %u\n", (DWORD)strlen(path) + 1, length); + + memset(buffer, 0, sizeof(buffer)); + ret = SetupPromptForDiskA(0, "Test", "Testdisk", path, file, 0, IDF_CHECKFIRST, buffer, 1, &length); + ok(ret == DPROMPT_BUFFERTOOSMALL, "Expected DPROMPT_BUFFERTOOSMALL, got %u\n", ret); + + memset(buffer, 0, sizeof(buffer)); + ret = SetupPromptForDiskA(0, "Test", "Testdisk", path, file, 0, IDF_CHECKFIRST, buffer, strlen(path), &length); + ok(ret == DPROMPT_BUFFERTOOSMALL, "Expected DPROMPT_BUFFERTOOSMALL, got %u\n", ret); + + memset(buffer, 0, sizeof(buffer)); + ret = SetupPromptForDiskA(0, "Test", "Testdisk", path, file, 0, IDF_CHECKFIRST, buffer, strlen(path)+1, &length); + ok(ret == DPROMPT_SUCCESS, "Expected DPROMPT_SUCCESS, got %u\n", ret); + ok(length == strlen(path)+1, "Expect length %u, got %u\n", (DWORD)strlen(path) + 1, length); + ok(strcmp(path, buffer) == 0, "Expected path %s, got %s\n", path, buffer); +} + +static void test_SetupPromptForDiskW(void) +{ + WCHAR path[] = {'C',':','\\','w','i','n','d','o','w','s','\\','s','y','s','t','e','m','3','2','\0'}; + WCHAR file[] = {'k','e','r','n','e','l','3','2','.','d','l','l','\0'}; + WCHAR title[] = {'T','e','s','t','\0'}; + WCHAR disk[] = {'T','e','s','t','d','i','s','k','\0'}; + WCHAR buffer[MAX_PATH]; + UINT ret; + DWORD length; + + memset(buffer, 0, sizeof(buffer)); + ret = SetupPromptForDiskW(0, title, disk, path, file, 0, IDF_CHECKFIRST, buffer, MAX_PATH-1, &length); + ok(ret == DPROMPT_SUCCESS, "Expected DPROMPT_SUCCESS, got %u\n", ret); + ok(length == lstrlenW(path)+1, "Expect length %u, got %u\n", lstrlenW(path)+1, length); + ok(lstrcmpW(path, buffer) == 0, "Expected path %s, got %s\n", wine_dbgstr_w(path), wine_dbgstr_w(buffer)); + + memset(buffer, 0, sizeof(buffer)); + ret = SetupPromptForDiskW(0, title, disk, path, file, 0, IDF_CHECKFIRST, 0, 0, &length); + ok(ret == DPROMPT_SUCCESS, "Expected DPROMPT_SUCCESS, got %d\n", ret); + ok(length == lstrlenW(path)+1, "Expect length %u, got %u\n", lstrlenW(path)+1, length); + + memset(buffer, 0, sizeof(buffer)); + ret = SetupPromptForDiskW(0, title, disk, path, file, 0, IDF_CHECKFIRST, buffer, 1, &length); + ok(ret == DPROMPT_BUFFERTOOSMALL, "Expected DPROMPT_BUFFERTOOSMALL, got %u\n", ret); + + memset(buffer, 0, sizeof(buffer)); + ret = SetupPromptForDiskW(0, title, disk, path, file, 0, IDF_CHECKFIRST, buffer, lstrlenW(path), &length); + ok(ret == DPROMPT_BUFFERTOOSMALL, "Expected DPROMPT_BUFFERTOOSMALL, got %u\n", ret); + + memset(buffer, 0, sizeof(buffer)); + ret = SetupPromptForDiskW(0, title, disk, path, file, 0, IDF_CHECKFIRST, buffer, lstrlenW(path)+1, &length); + ok(ret == DPROMPT_SUCCESS, "Expected DPROMPT_SUCCESS, got %u\n", ret); + ok(length == lstrlenW(path)+1, "Expect length %u, got %u\n", lstrlenW(path)+1, length); + ok(lstrcmpW(path, buffer) == 0, "Expected path %s, got %s\n", wine_dbgstr_w(path), wine_dbgstr_w(buffer)); +} + +START_TEST(dialog) +{ + test_SetupPromptForDiskA(); + test_SetupPromptForDiskW(); +} Propchange: trunk/rostests/winetests/setupapi/dialog.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/winetests/setupapi/install.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/setupapi/instal… ============================================================================== --- trunk/rostests/winetests/setupapi/install.c [iso-8859-1] (original) +++ trunk/rostests/winetests/setupapi/install.c [iso-8859-1] Mon Nov 30 22:25:50 2015 @@ -63,10 +63,12 @@ static void create_inf_file(LPCSTR filename, const char *data) { DWORD res; + BOOL ret; HANDLE handle = CreateFileA(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); assert(handle != INVALID_HANDLE_VALUE); - assert(WriteFile(handle, data, strlen(data), &res, NULL)); + ret = WriteFile(handle, data, strlen(data), &res, NULL); + assert(ret != 0); CloseHandle(handle); } @@ -718,6 +720,64 @@ RemoveDirectoryA(dirA); } +static const char dirid_inf[] = "[Version]\n" + "Signature=\"$Chicago$\"\n" + "[DefaultInstall]\n" + "AddReg=Add.Settings\n" + "[Add.Settings]\n" + "HKCU,Software\\Wine\\setupapitest,dirid,,%%%i%%\n"; + +static void check_dirid(int dirid, LPCSTR expected) +{ + char buffer[sizeof(dirid_inf)+11]; + char path[MAX_PATH], actual[MAX_PATH]; + LONG ret; + DWORD size, type; + HKEY key; + + sprintf(buffer, dirid_inf, dirid); + + create_inf_file(inffile, buffer); + + sprintf(path, "%s\\%s", CURR_DIR, inffile); + run_cmdline("DefaultInstall", 128, path); + + size = sizeof(actual); + actual[0] = '\0'; + ret = RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\setupapitest", &key); + if (ret == ERROR_SUCCESS) + { + ret = RegQueryValueExA(key, "dirid", NULL, &type, (BYTE*)&actual, &size); + RegCloseKey(key); + if (type != REG_SZ) + ret = ERROR_FILE_NOT_FOUND; + } + + ok(ret == ERROR_SUCCESS, "Failed getting value for dirid %i, err=%d\n", dirid, ret); + ok(!strcmp(actual, expected), "Expected path for dirid %i was \"%s\", got \"%s\"\n", dirid, expected, actual); + + ok_registry(TRUE); + ret = DeleteFileA(inffile); + ok(ret, "Expected source inf to exist, last error was %d\n", GetLastError()); +} + +/* Test dirid values */ +static void test_dirid(void) +{ + char expected[MAX_PATH]; + + check_dirid(DIRID_NULL, ""); + + GetWindowsDirectoryA(expected, MAX_PATH); + check_dirid(DIRID_WINDOWS, expected); + + GetSystemDirectoryA(expected, MAX_PATH); + check_dirid(DIRID_SYSTEM, expected); + + strcat(expected, "\\unknown"); + check_dirid(40, expected); +} + START_TEST(install) { HMODULE hsetupapi = GetModuleHandleA("setupapi.dll"); @@ -768,6 +828,7 @@ test_registry(); test_install_svc_from(); test_driver_install(); + test_dirid(); UnhookWindowsHookEx(hhook); Modified: trunk/rostests/winetests/setupapi/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/setupapi/testli… ============================================================================== --- trunk/rostests/winetests/setupapi/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/setupapi/testlist.c [iso-8859-1] Mon Nov 30 22:25:50 2015 @@ -4,6 +4,7 @@ #include <wine/test.h> extern void func_devinst(void); +extern void func_dialog(void); extern void func_diskspace(void); extern void func_install(void); extern void func_misc(void); @@ -15,6 +16,7 @@ const struct test winetest_testlist[] = { { "devinst", func_devinst }, + { "dialog", func_dialog }, { "diskspace", func_diskspace }, { "install", func_install }, { "misc", func_misc },

1 0

[akhaldi] 70223: [PSDK] Update d3d9types.h. CORE-10536
by akhaldi＠svn.reactos.org 30 Nov '15

30 Nov '15

Author: akhaldi Date: Mon Nov 30 21:55:07 2015 New Revision: 70223 URL: http://svn.reactos.org/svn/reactos?rev=70223&view=rev Log: [PSDK] Update d3d9types.h. CORE-10536 Modified: trunk/reactos/include/psdk/d3d9types.h Modified: trunk/reactos/include/psdk/d3d9types.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3d9types.h?r… ============================================================================== --- trunk/reactos/include/psdk/d3d9types.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/d3d9types.h [iso-8859-1] Mon Nov 30 21:55:07 2015 @@ -21,6 +21,10 @@ #ifndef __WINE_D3D9TYPES_H #define __WINE_D3D9TYPES_H +#ifdef __i386__ +#include <pshpack4.h> +#endif + /***************************************************************************** * Direct 3D v9 #defines */ @@ -56,10 +60,10 @@ #define D3DCS_PLANE5 0x800L #define D3DCS_ALL 0xFFFL -#define D3DFVF_TEXTUREFORMAT1 3 -#define D3DFVF_TEXTUREFORMAT2 0 -#define D3DFVF_TEXTUREFORMAT3 1 -#define D3DFVF_TEXTUREFORMAT4 2 +#define D3DFVF_TEXTUREFORMAT1 3u +#define D3DFVF_TEXTUREFORMAT2 0u +#define D3DFVF_TEXTUREFORMAT3 1u +#define D3DFVF_TEXTUREFORMAT4 2u #define D3DFVF_TEXCOORDSIZE1(CoordIndex) (D3DFVF_TEXTUREFORMAT1 << (CoordIndex*2 + 16)) #define D3DFVF_TEXCOORDSIZE2(CoordIndex) (D3DFVF_TEXTUREFORMAT2) #define D3DFVF_TEXCOORDSIZE3(CoordIndex) (D3DFVF_TEXTUREFORMAT3 << (CoordIndex*2 + 16)) @@ -174,8 +178,8 @@ #define D3DPV_DONOTCOPYDATA (1 << 0) -#define D3DSTREAMSOURCE_INDEXEDDATA (1 << 30) -#define D3DSTREAMSOURCE_INSTANCEDATA (2 << 30) +#define D3DSTREAMSOURCE_INDEXEDDATA (1u << 30) +#define D3DSTREAMSOURCE_INSTANCEDATA (2u << 30) #define D3D_MAX_SIMULTANEOUS_RENDERTARGETS 4 @@ -206,7 +210,6 @@ #define D3DPRESENTFLAG_NOAUTOROTATE 0x00000020 /* d3d9ex, ignore display rotation */ #define D3DPRESENTFLAG_UNPRUNEDMODE 0x00000040 /* d3d9ex, specify invalid display modes */ -#define D3DPRESENT_BACK_BUFFERS_MAX 3L #define D3DPRESENT_RATE_DEFAULT 0x00000000 /**************************** @@ -642,8 +645,6 @@ D3DBACKBUFFER_TYPE_FORCE_DWORD = 0x7fffffff } D3DBACKBUFFER_TYPE; - -#define D3DPRESENT_BACK_BUFFER_MAX 3L typedef enum _D3DBASISTYPE { D3DBASIS_BEZIER = 0, @@ -1583,4 +1584,8 @@ D3DSPC_RESERVED1, } D3DSHADER_COMPARISON; +#ifdef __i386__ +#include <poppack.h> +#endif + #endif /* __WINE_D3D9TYPES_H */

1 0

[akhaldi] 70222: [IPHLPAPI_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 30 Nov '15

30 Nov '15

Author: akhaldi Date: Mon Nov 30 21:47:40 2015 New Revision: 70222 URL: http://svn.reactos.org/svn/reactos?rev=70222&view=rev Log: [IPHLPAPI_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/rostests/winetests/iphlpapi/iphlpapi.c Modified: trunk/rostests/winetests/iphlpapi/iphlpapi.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/iphlpapi/iphlpa… ============================================================================== --- trunk/rostests/winetests/iphlpapi/iphlpapi.c [iso-8859-1] (original) +++ trunk/rostests/winetests/iphlpapi/iphlpapi.c [iso-8859-1] Mon Nov 30 21:47:40 2015 @@ -38,11 +38,15 @@ #include "winsock2.h" #include "windef.h" #include "winbase.h" +#include "ws2tcpip.h" #include "iphlpapi.h" #include "iprtrmib.h" +#include "netioapi.h" #include "wine/test.h" #include <stdio.h> #include <stdlib.h> + +#define ICMP_MINLEN 8 /* copied from dlls/iphlpapi/ip_icmp.h file */ #undef htonl #undef htons @@ -56,117 +60,100 @@ static HMODULE hLibrary = NULL; -typedef DWORD (WINAPI *GetNumberOfInterfacesFunc)(PDWORD); -typedef DWORD (WINAPI *GetIpAddrTableFunc)(PMIB_IPADDRTABLE,PULONG,BOOL); -typedef DWORD (WINAPI *GetIfEntryFunc)(PMIB_IFROW); -typedef DWORD (WINAPI *GetFriendlyIfIndexFunc)(DWORD); -typedef DWORD (WINAPI *GetIfTableFunc)(PMIB_IFTABLE,PULONG,BOOL); -typedef DWORD (WINAPI *GetIpForwardTableFunc)(PMIB_IPFORWARDTABLE,PULONG,BOOL); -typedef DWORD (WINAPI *GetIpNetTableFunc)(PMIB_IPNETTABLE,PULONG,BOOL); -typedef DWORD (WINAPI *GetInterfaceInfoFunc)(PIP_INTERFACE_INFO,PULONG); -typedef DWORD (WINAPI *GetAdaptersInfoFunc)(PIP_ADAPTER_INFO,PULONG); -typedef DWORD (WINAPI *GetNetworkParamsFunc)(PFIXED_INFO,PULONG); -typedef DWORD (WINAPI *GetIcmpStatisticsFunc)(PMIB_ICMP); -typedef DWORD (WINAPI *GetIpStatisticsFunc)(PMIB_IPSTATS); -typedef DWORD (WINAPI *GetTcpStatisticsFunc)(PMIB_TCPSTATS); -typedef DWORD (WINAPI *GetUdpStatisticsFunc)(PMIB_UDPSTATS); -typedef DWORD (WINAPI *GetTcpTableFunc)(PMIB_TCPTABLE,PDWORD,BOOL); -typedef DWORD (WINAPI *GetUdpTableFunc)(PMIB_UDPTABLE,PDWORD,BOOL); -typedef DWORD (WINAPI *GetPerAdapterInfoFunc)(ULONG,PIP_PER_ADAPTER_INFO,PULONG); -typedef DWORD (WINAPI *GetAdaptersAddressesFunc)(ULONG,ULONG,PVOID,PIP_ADAPTER_ADDRESSES,PULONG); -typedef DWORD (WINAPI *NotifyAddrChangeFunc)(PHANDLE,LPOVERLAPPED); -typedef BOOL (WINAPI *CancelIPChangeNotifyFunc)(LPOVERLAPPED); - -static GetNumberOfInterfacesFunc gGetNumberOfInterfaces = NULL; -static GetIpAddrTableFunc gGetIpAddrTable = NULL; -static GetIfEntryFunc gGetIfEntry = NULL; -static GetFriendlyIfIndexFunc gGetFriendlyIfIndex = NULL; -static GetIfTableFunc gGetIfTable = NULL; -static GetIpForwardTableFunc gGetIpForwardTable = NULL; -static GetIpNetTableFunc gGetIpNetTable = NULL; -static GetInterfaceInfoFunc gGetInterfaceInfo = NULL; -static GetAdaptersInfoFunc gGetAdaptersInfo = NULL; -static GetNetworkParamsFunc gGetNetworkParams = NULL; -static GetIcmpStatisticsFunc gGetIcmpStatistics = NULL; -static GetIpStatisticsFunc gGetIpStatistics = NULL; -static GetTcpStatisticsFunc gGetTcpStatistics = NULL; -static GetUdpStatisticsFunc gGetUdpStatistics = NULL; -static GetTcpTableFunc gGetTcpTable = NULL; -static GetUdpTableFunc gGetUdpTable = NULL; -static GetPerAdapterInfoFunc gGetPerAdapterInfo = NULL; -static GetAdaptersAddressesFunc gGetAdaptersAddresses = NULL; -static NotifyAddrChangeFunc gNotifyAddrChange = NULL; -static CancelIPChangeNotifyFunc gCancelIPChangeNotify = NULL; +static DWORD (WINAPI *pGetNumberOfInterfaces)(PDWORD); +static DWORD (WINAPI *pGetIpAddrTable)(PMIB_IPADDRTABLE,PULONG,BOOL); +static DWORD (WINAPI *pGetIfEntry)(PMIB_IFROW); +static DWORD (WINAPI *pGetIfEntry2)(PMIB_IF_ROW2); +static DWORD (WINAPI *pGetFriendlyIfIndex)(DWORD); +static DWORD (WINAPI *pGetIfTable)(PMIB_IFTABLE,PULONG,BOOL); +static DWORD (WINAPI *pGetIfTable2)(PMIB_IF_TABLE2*); +static DWORD (WINAPI *pGetIpForwardTable)(PMIB_IPFORWARDTABLE,PULONG,BOOL); +static DWORD (WINAPI *pGetIpNetTable)(PMIB_IPNETTABLE,PULONG,BOOL); +static DWORD (WINAPI *pGetInterfaceInfo)(PIP_INTERFACE_INFO,PULONG); +static DWORD (WINAPI *pGetAdaptersInfo)(PIP_ADAPTER_INFO,PULONG); +static DWORD (WINAPI *pGetNetworkParams)(PFIXED_INFO,PULONG); +static DWORD (WINAPI *pGetIcmpStatistics)(PMIB_ICMP); +static DWORD (WINAPI *pGetIpStatistics)(PMIB_IPSTATS); +static DWORD (WINAPI *pGetTcpStatistics)(PMIB_TCPSTATS); +static DWORD (WINAPI *pGetUdpStatistics)(PMIB_UDPSTATS); +static DWORD (WINAPI *pGetIcmpStatisticsEx)(PMIB_ICMP_EX,DWORD); +static DWORD (WINAPI *pGetIpStatisticsEx)(PMIB_IPSTATS,DWORD); +static DWORD (WINAPI *pGetTcpStatisticsEx)(PMIB_TCPSTATS,DWORD); +static DWORD (WINAPI *pGetUdpStatisticsEx)(PMIB_UDPSTATS,DWORD); +static DWORD (WINAPI *pGetTcpTable)(PMIB_TCPTABLE,PDWORD,BOOL); +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 *pNotifyAddrChange)(PHANDLE,LPOVERLAPPED); +static BOOL (WINAPI *pCancelIPChangeNotify)(LPOVERLAPPED); +static DWORD (WINAPI *pGetExtendedTcpTable)(PVOID,PDWORD,BOOL,ULONG,TCP_TABLE_CLASS,ULONG); +static DWORD (WINAPI *pGetExtendedUdpTable)(PVOID,PDWORD,BOOL,ULONG,UDP_TABLE_CLASS,ULONG); +static DWORD (WINAPI *pSetTcpEntry)(PMIB_TCPROW); +static HANDLE(WINAPI *pIcmpCreateFile)(VOID); +static DWORD (WINAPI *pIcmpSendEcho)(HANDLE,IPAddr,LPVOID,WORD,PIP_OPTION_INFORMATION,LPVOID,DWORD,DWORD); +static DWORD (WINAPI *pCreateSortedAddressPairs)(const PSOCKADDR_IN6,ULONG,const PSOCKADDR_IN6,ULONG,ULONG, + PSOCKADDR_IN6_PAIR*,ULONG*); +static void (WINAPI *pFreeMibTable)(void*); +static DWORD (WINAPI *pConvertInterfaceGuidToLuid)(const GUID*,NET_LUID*); +static DWORD (WINAPI *pConvertInterfaceIndexToLuid)(NET_IFINDEX,NET_LUID*); +static DWORD (WINAPI *pConvertInterfaceLuidToGuid)(const NET_LUID*,GUID*); +static DWORD (WINAPI *pConvertInterfaceLuidToIndex)(const NET_LUID*,NET_IFINDEX*); +static DWORD (WINAPI *pConvertInterfaceLuidToNameW)(const NET_LUID*,WCHAR*,SIZE_T); +static DWORD (WINAPI *pConvertInterfaceLuidToNameA)(const NET_LUID*,char*,SIZE_T); +static DWORD (WINAPI *pConvertInterfaceNameToLuidA)(const char*,NET_LUID*); +static DWORD (WINAPI *pConvertInterfaceNameToLuidW)(const WCHAR*,NET_LUID*); static void loadIPHlpApi(void) { hLibrary = LoadLibraryA("iphlpapi.dll"); if (hLibrary) { - gGetNumberOfInterfaces = (GetNumberOfInterfacesFunc)GetProcAddress( - hLibrary, "GetNumberOfInterfaces"); - gGetIpAddrTable = (GetIpAddrTableFunc)GetProcAddress( - hLibrary, "GetIpAddrTable"); - gGetIfEntry = (GetIfEntryFunc)GetProcAddress( - hLibrary, "GetIfEntry"); - gGetFriendlyIfIndex = (GetFriendlyIfIndexFunc)GetProcAddress( - hLibrary, "GetFriendlyIfIndex"); - gGetIfTable = (GetIfTableFunc)GetProcAddress( - hLibrary, "GetIfTable"); - gGetIpForwardTable = (GetIpForwardTableFunc)GetProcAddress( - hLibrary, "GetIpForwardTable"); - gGetIpNetTable = (GetIpNetTableFunc)GetProcAddress( - hLibrary, "GetIpNetTable"); - gGetInterfaceInfo = (GetInterfaceInfoFunc)GetProcAddress( - hLibrary, "GetInterfaceInfo"); - gGetAdaptersInfo = (GetAdaptersInfoFunc)GetProcAddress( - hLibrary, "GetAdaptersInfo"); - gGetNetworkParams = (GetNetworkParamsFunc)GetProcAddress( - hLibrary, "GetNetworkParams"); - gGetIcmpStatistics = (GetIcmpStatisticsFunc)GetProcAddress( - hLibrary, "GetIcmpStatistics"); - gGetIpStatistics = (GetIpStatisticsFunc)GetProcAddress( - hLibrary, "GetIpStatistics"); - gGetTcpStatistics = (GetTcpStatisticsFunc)GetProcAddress( - hLibrary, "GetTcpStatistics"); - gGetUdpStatistics = (GetUdpStatisticsFunc)GetProcAddress( - hLibrary, "GetUdpStatistics"); - gGetTcpTable = (GetTcpTableFunc)GetProcAddress( - hLibrary, "GetTcpTable"); - gGetUdpTable = (GetUdpTableFunc)GetProcAddress( - hLibrary, "GetUdpTable"); - gGetPerAdapterInfo = (GetPerAdapterInfoFunc)GetProcAddress(hLibrary, "GetPerAdapterInfo"); - gGetAdaptersAddresses = (GetAdaptersAddressesFunc)GetProcAddress(hLibrary, "GetAdaptersAddresses"); - gNotifyAddrChange = (NotifyAddrChangeFunc)GetProcAddress( - hLibrary, "NotifyAddrChange"); - gCancelIPChangeNotify = (CancelIPChangeNotifyFunc)GetProcAddress( - hLibrary, "CancelIPChangeNotify"); + pGetNumberOfInterfaces = (void *)GetProcAddress(hLibrary, "GetNumberOfInterfaces"); + pGetIpAddrTable = (void *)GetProcAddress(hLibrary, "GetIpAddrTable"); + pGetIfEntry = (void *)GetProcAddress(hLibrary, "GetIfEntry"); + pGetIfEntry2 = (void *)GetProcAddress(hLibrary, "GetIfEntry2"); + pGetFriendlyIfIndex = (void *)GetProcAddress(hLibrary, "GetFriendlyIfIndex"); + pGetIfTable = (void *)GetProcAddress(hLibrary, "GetIfTable"); + pGetIfTable2 = (void *)GetProcAddress(hLibrary, "GetIfTable2"); + pGetIpForwardTable = (void *)GetProcAddress(hLibrary, "GetIpForwardTable"); + pGetIpNetTable = (void *)GetProcAddress(hLibrary, "GetIpNetTable"); + pGetInterfaceInfo = (void *)GetProcAddress(hLibrary, "GetInterfaceInfo"); + pGetAdaptersInfo = (void *)GetProcAddress(hLibrary, "GetAdaptersInfo"); + pGetNetworkParams = (void *)GetProcAddress(hLibrary, "GetNetworkParams"); + pGetIcmpStatistics = (void *)GetProcAddress(hLibrary, "GetIcmpStatistics"); + pGetIpStatistics = (void *)GetProcAddress(hLibrary, "GetIpStatistics"); + pGetTcpStatistics = (void *)GetProcAddress(hLibrary, "GetTcpStatistics"); + pGetUdpStatistics = (void *)GetProcAddress(hLibrary, "GetUdpStatistics"); + pGetIcmpStatisticsEx = (void *)GetProcAddress(hLibrary, "GetIcmpStatisticsEx"); + pGetIpStatisticsEx = (void *)GetProcAddress(hLibrary, "GetIpStatisticsEx"); + pGetTcpStatisticsEx = (void *)GetProcAddress(hLibrary, "GetTcpStatisticsEx"); + pGetUdpStatisticsEx = (void *)GetProcAddress(hLibrary, "GetUdpStatisticsEx"); + pGetTcpTable = (void *)GetProcAddress(hLibrary, "GetTcpTable"); + pGetUdpTable = (void *)GetProcAddress(hLibrary, "GetUdpTable"); + pGetPerAdapterInfo = (void *)GetProcAddress(hLibrary, "GetPerAdapterInfo"); + pGetAdaptersAddresses = (void *)GetProcAddress(hLibrary, "GetAdaptersAddresses"); + pNotifyAddrChange = (void *)GetProcAddress(hLibrary, "NotifyAddrChange"); + pCancelIPChangeNotify = (void *)GetProcAddress(hLibrary, "CancelIPChangeNotify"); + pGetExtendedTcpTable = (void *)GetProcAddress(hLibrary, "GetExtendedTcpTable"); + pGetExtendedUdpTable = (void *)GetProcAddress(hLibrary, "GetExtendedUdpTable"); + pSetTcpEntry = (void *)GetProcAddress(hLibrary, "SetTcpEntry"); + pIcmpCreateFile = (void *)GetProcAddress(hLibrary, "IcmpCreateFile"); + pIcmpSendEcho = (void *)GetProcAddress(hLibrary, "IcmpSendEcho"); + pCreateSortedAddressPairs = (void *)GetProcAddress(hLibrary, "CreateSortedAddressPairs"); + pFreeMibTable = (void *)GetProcAddress(hLibrary, "FreeMibTable"); + pConvertInterfaceGuidToLuid = (void *)GetProcAddress(hLibrary, "ConvertInterfaceGuidToLuid"); + pConvertInterfaceIndexToLuid = (void *)GetProcAddress(hLibrary, "ConvertInterfaceIndexToLuid"); + pConvertInterfaceLuidToGuid = (void *)GetProcAddress(hLibrary, "ConvertInterfaceLuidToGuid"); + pConvertInterfaceLuidToIndex = (void *)GetProcAddress(hLibrary, "ConvertInterfaceLuidToIndex"); + pConvertInterfaceLuidToNameA = (void *)GetProcAddress(hLibrary, "ConvertInterfaceLuidToNameA"); + pConvertInterfaceLuidToNameW = (void *)GetProcAddress(hLibrary, "ConvertInterfaceLuidToNameW"); + pConvertInterfaceNameToLuidA = (void *)GetProcAddress(hLibrary, "ConvertInterfaceNameToLuidA"); + pConvertInterfaceNameToLuidW = (void *)GetProcAddress(hLibrary, "ConvertInterfaceNameToLuidW"); } } static void freeIPHlpApi(void) { - if (hLibrary) { - gGetNumberOfInterfaces = NULL; - gGetIpAddrTable = NULL; - gGetIfEntry = NULL; - gGetFriendlyIfIndex = NULL; - gGetIfTable = NULL; - gGetIpForwardTable = NULL; - gGetIpNetTable = NULL; - gGetInterfaceInfo = NULL; - gGetAdaptersInfo = NULL; - gGetNetworkParams = NULL; - gGetIcmpStatistics = NULL; - gGetIpStatistics = NULL; - gGetTcpStatistics = NULL; - gGetUdpStatistics = NULL; - gGetTcpTable = NULL; - gGetUdpTable = NULL; - gNotifyAddrChange = NULL; - gCancelIPChangeNotify = NULL; FreeLibrary(hLibrary); - hLibrary = NULL; - } } /* replacement for inet_ntoa */ @@ -177,6 +164,16 @@ ip = htonl(ip); sprintf( buffer, "%u.%u.%u.%u", (ip >> 24) & 0xff, (ip >> 16) & 0xff, (ip >> 8) & 0xff, ip & 0xff ); return buffer; +} + +static inline const char* debugstr_longlong(ULONGLONG ll) +{ + static char string[17]; + if (sizeof(ll) > sizeof(unsigned long) && ll >> 32) + sprintf(string, "%lx%08lx", (unsigned long)(ll >> 32), (unsigned long)ll); + else + sprintf(string, "%lx", (unsigned long)ll); + return string; } /* @@ -189,12 +186,12 @@ static void testGetNumberOfInterfaces(void) { - if (gGetNumberOfInterfaces) { + if (pGetNumberOfInterfaces) { DWORD apiReturn, numInterfaces; /* Crashes on Vista */ if (0) { - apiReturn = gGetNumberOfInterfaces(NULL); + apiReturn = pGetNumberOfInterfaces(NULL); if (apiReturn == ERROR_NOT_SUPPORTED) return; ok(apiReturn == ERROR_INVALID_PARAMETER, @@ -202,7 +199,7 @@ apiReturn); } - apiReturn = gGetNumberOfInterfaces(&numInterfaces); + apiReturn = pGetNumberOfInterfaces(&numInterfaces); if (apiReturn == ERROR_NOT_SUPPORTED) { skip("GetNumberOfInterfaces is not supported\n"); return; @@ -214,12 +211,12 @@ static void testGetIfEntry(DWORD index) { - if (gGetIfEntry) { + if (pGetIfEntry) { DWORD apiReturn; MIB_IFROW row; memset(&row, 0, sizeof(row)); - apiReturn = gGetIfEntry(NULL); + apiReturn = pGetIfEntry(NULL); if (apiReturn == ERROR_NOT_SUPPORTED) { skip("GetIfEntry is not supported\n"); return; @@ -228,13 +225,13 @@ "GetIfEntry(NULL) returned %d, expected ERROR_INVALID_PARAMETER\n", apiReturn); row.dwIndex = -1; /* hope that's always bogus! */ - apiReturn = gGetIfEntry(&row); + apiReturn = pGetIfEntry(&row); ok(apiReturn == ERROR_INVALID_DATA || apiReturn == ERROR_FILE_NOT_FOUND /* Vista */, "GetIfEntry(bogus row) returned %d, expected ERROR_INVALID_DATA or ERROR_FILE_NOT_FOUND\n", apiReturn); row.dwIndex = index; - apiReturn = gGetIfEntry(&row); + apiReturn = pGetIfEntry(&row); ok(apiReturn == NO_ERROR, "GetIfEntry returned %d, expected NO_ERROR\n", apiReturn); } @@ -242,11 +239,11 @@ static void testGetIpAddrTable(void) { - if (gGetIpAddrTable) { + if (pGetIpAddrTable) { DWORD apiReturn; ULONG dwSize = 0; - apiReturn = gGetIpAddrTable(NULL, NULL, FALSE); + apiReturn = pGetIpAddrTable(NULL, NULL, FALSE); if (apiReturn == ERROR_NOT_SUPPORTED) { skip("GetIpAddrTable is not supported\n"); return; @@ -254,19 +251,28 @@ ok(apiReturn == ERROR_INVALID_PARAMETER, "GetIpAddrTable(NULL, NULL, FALSE) returned %d, expected ERROR_INVALID_PARAMETER\n", apiReturn); - apiReturn = gGetIpAddrTable(NULL, &dwSize, FALSE); + apiReturn = pGetIpAddrTable(NULL, &dwSize, FALSE); ok(apiReturn == ERROR_INSUFFICIENT_BUFFER, "GetIpAddrTable(NULL, &dwSize, FALSE) returned %d, expected ERROR_INSUFFICIENT_BUFFER\n", apiReturn); if (apiReturn == ERROR_INSUFFICIENT_BUFFER) { PMIB_IPADDRTABLE buf = HeapAlloc(GetProcessHeap(), 0, dwSize); - apiReturn = gGetIpAddrTable(buf, &dwSize, FALSE); + apiReturn = pGetIpAddrTable(buf, &dwSize, FALSE); ok(apiReturn == NO_ERROR, "GetIpAddrTable(buf, &dwSize, FALSE) returned %d, expected NO_ERROR\n", apiReturn); if (apiReturn == NO_ERROR && buf->dwNumEntries) + { + int i; testGetIfEntry(buf->table[0].dwIndex); + for (i = 0; i < buf->dwNumEntries; i++) + { + ok (buf->table[i].wType != 0, "Test[%d]: expected wType > 0\n", i); + trace("Entry[%d]: addr %s, dwIndex %u, wType 0x%x\n", i, + ntoa(buf->table[i].dwAddr), buf->table[i].dwIndex, buf->table[i].wType); + } + } HeapFree(GetProcessHeap(), 0, buf); } } @@ -274,11 +280,11 @@ static void testGetIfTable(void) { - if (gGetIfTable) { + if (pGetIfTable) { DWORD apiReturn; ULONG dwSize = 0; - apiReturn = gGetIfTable(NULL, NULL, FALSE); + apiReturn = pGetIfTable(NULL, NULL, FALSE); if (apiReturn == ERROR_NOT_SUPPORTED) { skip("GetIfTable is not supported\n"); return; @@ -286,14 +292,14 @@ ok(apiReturn == ERROR_INVALID_PARAMETER, "GetIfTable(NULL, NULL, FALSE) returned %d, expected ERROR_INVALID_PARAMETER\n", apiReturn); - apiReturn = gGetIfTable(NULL, &dwSize, FALSE); + apiReturn = pGetIfTable(NULL, &dwSize, FALSE); ok(apiReturn == ERROR_INSUFFICIENT_BUFFER, "GetIfTable(NULL, &dwSize, FALSE) returned %d, expected ERROR_INSUFFICIENT_BUFFER\n", apiReturn); if (apiReturn == ERROR_INSUFFICIENT_BUFFER) { PMIB_IFTABLE buf = HeapAlloc(GetProcessHeap(), 0, dwSize); - apiReturn = gGetIfTable(buf, &dwSize, FALSE); + apiReturn = pGetIfTable(buf, &dwSize, FALSE); ok(apiReturn == NO_ERROR, "GetIfTable(buf, &dwSize, FALSE) returned %d, expected NO_ERROR\n\n", apiReturn); @@ -328,11 +334,11 @@ static void testGetIpForwardTable(void) { - if (gGetIpForwardTable) { + if (pGetIpForwardTable) { DWORD apiReturn; ULONG dwSize = 0; - apiReturn = gGetIpForwardTable(NULL, NULL, FALSE); + apiReturn = pGetIpForwardTable(NULL, NULL, FALSE); if (apiReturn == ERROR_NOT_SUPPORTED) { skip("GetIpForwardTable is not supported\n"); return; @@ -340,14 +346,14 @@ ok(apiReturn == ERROR_INVALID_PARAMETER, "GetIpForwardTable(NULL, NULL, FALSE) returned %d, expected ERROR_INVALID_PARAMETER\n", apiReturn); - apiReturn = gGetIpForwardTable(NULL, &dwSize, FALSE); + apiReturn = pGetIpForwardTable(NULL, &dwSize, FALSE); ok(apiReturn == ERROR_INSUFFICIENT_BUFFER, "GetIpForwardTable(NULL, &dwSize, FALSE) returned %d, expected ERROR_INSUFFICIENT_BUFFER\n", apiReturn); if (apiReturn == ERROR_INSUFFICIENT_BUFFER) { PMIB_IPFORWARDTABLE buf = HeapAlloc(GetProcessHeap(), 0, dwSize); - apiReturn = gGetIpForwardTable(buf, &dwSize, FALSE); + apiReturn = pGetIpForwardTable(buf, &dwSize, FALSE); ok(apiReturn == NO_ERROR, "GetIpForwardTable(buf, &dwSize, FALSE) returned %d, expected NO_ERROR\n", apiReturn); @@ -359,12 +365,12 @@ trace( "IP forward table: %u entries\n", buf->dwNumEntries ); for (i = 0; i < buf->dwNumEntries; i++) { - char buffer[40]; + char buffer[100]; sprintf( buffer, "dest %s", ntoa( buf->table[i].dwForwardDest )); sprintf( buffer + strlen(buffer), " mask %s", ntoa( buf->table[i].dwForwardMask )); trace( "%u: %s gw %s if %u type %u\n", i, buffer, ntoa( buf->table[i].dwForwardNextHop ), - buf->table[i].dwForwardIfIndex, buf->table[i].dwForwardType ); + buf->table[i].dwForwardIfIndex, U1(buf->table[i]).dwForwardType ); } } HeapFree(GetProcessHeap(), 0, buf); @@ -374,11 +380,11 @@ static void testGetIpNetTable(void) { - if (gGetIpNetTable) { + if (pGetIpNetTable) { DWORD apiReturn; ULONG dwSize = 0; - apiReturn = gGetIpNetTable(NULL, NULL, FALSE); + apiReturn = pGetIpNetTable(NULL, NULL, FALSE); if (apiReturn == ERROR_NOT_SUPPORTED) { skip("GetIpNetTable is not supported\n"); return; @@ -386,7 +392,7 @@ ok(apiReturn == ERROR_INVALID_PARAMETER, "GetIpNetTable(NULL, NULL, FALSE) returned %d, expected ERROR_INVALID_PARAMETER\n", apiReturn); - apiReturn = gGetIpNetTable(NULL, &dwSize, FALSE); + apiReturn = pGetIpNetTable(NULL, &dwSize, FALSE); ok(apiReturn == ERROR_NO_DATA || apiReturn == ERROR_INSUFFICIENT_BUFFER, "GetIpNetTable(NULL, &dwSize, FALSE) returned %d, expected ERROR_NO_DATA or ERROR_INSUFFICIENT_BUFFER\n", apiReturn); @@ -395,7 +401,7 @@ else if (apiReturn == ERROR_INSUFFICIENT_BUFFER) { PMIB_IPNETTABLE buf = HeapAlloc(GetProcessHeap(), 0, dwSize); - apiReturn = gGetIpNetTable(buf, &dwSize, FALSE); + apiReturn = pGetIpNetTable(buf, &dwSize, FALSE); ok(apiReturn == NO_ERROR || apiReturn == ERROR_NO_DATA, /* empty ARP table's okay */ "GetIpNetTable(buf, &dwSize, FALSE) returned %d, expected NO_ERROR\n", @@ -409,7 +415,7 @@ for (i = 0; i < buf->dwNumEntries; i++) { trace( "%u: idx %u type %u addr %s phys", - i, buf->table[i].dwIndex, buf->table[i].dwType, ntoa( buf->table[i].dwAddr )); + i, buf->table[i].dwIndex, U(buf->table[i]).dwType, ntoa( buf->table[i].dwAddr )); for (j = 0; j < buf->table[i].dwPhysAddrLen; j++) printf( " %02x", buf->table[i].bPhysAddr[j] ); printf( "\n" ); @@ -422,13 +428,13 @@ static void testGetIcmpStatistics(void) { - if (gGetIcmpStatistics) { + if (pGetIcmpStatistics) { DWORD apiReturn; MIB_ICMP stats; /* Crashes on Vista */ if (0) { - apiReturn = gGetIcmpStatistics(NULL); + apiReturn = pGetIcmpStatistics(NULL); if (apiReturn == ERROR_NOT_SUPPORTED) return; ok(apiReturn == ERROR_INVALID_PARAMETER, @@ -436,7 +442,7 @@ apiReturn); } - apiReturn = gGetIcmpStatistics(&stats); + apiReturn = pGetIcmpStatistics(&stats); if (apiReturn == ERROR_NOT_SUPPORTED) { skip("GetIcmpStatistics is not supported\n"); @@ -466,11 +472,11 @@ static void testGetIpStatistics(void) { - if (gGetIpStatistics) { + if (pGetIpStatistics) { DWORD apiReturn; MIB_IPSTATS stats; - apiReturn = gGetIpStatistics(NULL); + apiReturn = pGetIpStatistics(NULL); if (apiReturn == ERROR_NOT_SUPPORTED) { skip("GetIpStatistics is not supported\n"); return; @@ -478,13 +484,13 @@ ok(apiReturn == ERROR_INVALID_PARAMETER, "GetIpStatistics(NULL) returned %d, expected ERROR_INVALID_PARAMETER\n", apiReturn); - apiReturn = gGetIpStatistics(&stats); + apiReturn = pGetIpStatistics(&stats); ok(apiReturn == NO_ERROR, "GetIpStatistics returned %d, expected NO_ERROR\n", apiReturn); if (apiReturn == NO_ERROR && winetest_debug > 1) { trace( "IP stats:\n" ); - trace( " dwForwarding: %u\n", stats.dwForwarding ); + trace( " dwForwarding: %u\n", U(stats).dwForwarding ); trace( " dwDefaultTTL: %u\n", stats.dwDefaultTTL ); trace( " dwInReceives: %u\n", stats.dwInReceives ); trace( " dwInHdrErrors: %u\n", stats.dwInHdrErrors ); @@ -513,11 +519,11 @@ static void testGetTcpStatistics(void) { - if (gGetTcpStatistics) { + if (pGetTcpStatistics) { DWORD apiReturn; MIB_TCPSTATS stats; - apiReturn = gGetTcpStatistics(NULL); + apiReturn = pGetTcpStatistics(NULL); if (apiReturn == ERROR_NOT_SUPPORTED) { skip("GetTcpStatistics is not supported\n"); return; @@ -525,13 +531,13 @@ ok(apiReturn == ERROR_INVALID_PARAMETER, "GetTcpStatistics(NULL) returned %d, expected ERROR_INVALID_PARAMETER\n", apiReturn); - apiReturn = gGetTcpStatistics(&stats); + apiReturn = pGetTcpStatistics(&stats); ok(apiReturn == NO_ERROR, "GetTcpStatistics returned %d, expected NO_ERROR\n", apiReturn); if (apiReturn == NO_ERROR && winetest_debug > 1) { trace( "TCP stats:\n" ); - trace( " dwRtoAlgorithm: %u\n", stats.dwRtoAlgorithm ); + trace( " dwRtoAlgorithm: %u\n", U(stats).dwRtoAlgorithm ); trace( " dwRtoMin: %u\n", stats.dwRtoMin ); trace( " dwRtoMax: %u\n", stats.dwRtoMax ); trace( " dwMaxConn: %u\n", stats.dwMaxConn ); @@ -552,11 +558,11 @@ static void testGetUdpStatistics(void) { - if (gGetUdpStatistics) { + if (pGetUdpStatistics) { DWORD apiReturn; MIB_UDPSTATS stats; - apiReturn = gGetUdpStatistics(NULL); + apiReturn = pGetUdpStatistics(NULL); if (apiReturn == ERROR_NOT_SUPPORTED) { skip("GetUdpStatistics is not supported\n"); return; @@ -564,7 +570,7 @@ ok(apiReturn == ERROR_INVALID_PARAMETER, "GetUdpStatistics(NULL) returned %d, expected ERROR_INVALID_PARAMETER\n", apiReturn); - apiReturn = gGetUdpStatistics(&stats); + apiReturn = pGetUdpStatistics(&stats); ok(apiReturn == NO_ERROR, "GetUdpStatistics returned %d, expected NO_ERROR\n", apiReturn); if (apiReturn == NO_ERROR && winetest_debug > 1) @@ -579,13 +585,252 @@ } } +static void testGetIcmpStatisticsEx(void) +{ + DWORD apiReturn; + MIB_ICMP_EX stats; + + if (!pGetIcmpStatisticsEx) + { + win_skip( "GetIcmpStatisticsEx not available\n" ); + return; + } + + /* Crashes on Vista */ + if (1) { + apiReturn = pGetIcmpStatisticsEx(NULL, AF_INET); + ok(apiReturn == ERROR_INVALID_PARAMETER, + "GetIcmpStatisticsEx(NULL, AF_INET) returned %d, expected ERROR_INVALID_PARAMETER\n", apiReturn); + } + + apiReturn = pGetIcmpStatisticsEx(&stats, AF_BAN); + ok(apiReturn == ERROR_INVALID_PARAMETER, + "GetIcmpStatisticsEx(&stats, AF_BAN) returned %d, expected ERROR_INVALID_PARAMETER\n", apiReturn); + + apiReturn = pGetIcmpStatisticsEx(&stats, AF_INET); + ok(apiReturn == NO_ERROR, "GetIcmpStatisticsEx returned %d, expected NO_ERROR\n", apiReturn); + if (apiReturn == NO_ERROR && winetest_debug > 1) + { + INT i; + trace( "ICMP IPv4 Ex stats: %8s %8s\n", "in", "out" ); + trace( " dwMsgs: %8u %8u\n", stats.icmpInStats.dwMsgs, stats.icmpOutStats.dwMsgs ); + trace( " dwErrors: %8u %8u\n", stats.icmpInStats.dwErrors, stats.icmpOutStats.dwErrors ); + for (i = 0; i < 256; i++) + trace( " rgdwTypeCount[%3i]: %8u %8u\n", i, stats.icmpInStats.rgdwTypeCount[i], stats.icmpOutStats.rgdwTypeCount[i] ); + } + + apiReturn = pGetIcmpStatisticsEx(&stats, AF_INET6); + ok(apiReturn == NO_ERROR || broken(apiReturn == ERROR_NOT_SUPPORTED), + "GetIcmpStatisticsEx returned %d, expected NO_ERROR\n", apiReturn); + if (apiReturn == NO_ERROR && winetest_debug > 1) + { + INT i; + trace( "ICMP IPv6 Ex stats: %8s %8s\n", "in", "out" ); + trace( " dwMsgs: %8u %8u\n", stats.icmpInStats.dwMsgs, stats.icmpOutStats.dwMsgs ); + trace( " dwErrors: %8u %8u\n", stats.icmpInStats.dwErrors, stats.icmpOutStats.dwErrors ); + for (i = 0; i < 256; i++) + trace( " rgdwTypeCount[%3i]: %8u %8u\n", i, stats.icmpInStats.rgdwTypeCount[i], stats.icmpOutStats.rgdwTypeCount[i] ); + } +} + +static void testGetIpStatisticsEx(void) +{ + DWORD apiReturn; + MIB_IPSTATS stats; + + if (!pGetIpStatisticsEx) + { + win_skip( "GetIpStatisticsEx not available\n" ); + return; + } + + apiReturn = pGetIpStatisticsEx(NULL, AF_INET); + ok(apiReturn == ERROR_INVALID_PARAMETER, + "GetIpStatisticsEx(NULL, AF_INET) returned %d, expected ERROR_INVALID_PARAMETER\n", apiReturn); + + apiReturn = pGetIpStatisticsEx(&stats, AF_BAN); + ok(apiReturn == ERROR_INVALID_PARAMETER, + "GetIpStatisticsEx(&stats, AF_BAN) returned %d, expected ERROR_INVALID_PARAMETER\n", apiReturn); + + apiReturn = pGetIpStatisticsEx(&stats, AF_INET); + ok(apiReturn == NO_ERROR, "GetIpStatisticsEx returned %d, expected NO_ERROR\n", apiReturn); + if (apiReturn == NO_ERROR && winetest_debug > 1) + { + trace( "IP IPv4 Ex stats:\n" ); + trace( " dwForwarding: %u\n", U(stats).dwForwarding ); + trace( " dwDefaultTTL: %u\n", stats.dwDefaultTTL ); + trace( " dwInReceives: %u\n", stats.dwInReceives ); + trace( " dwInHdrErrors: %u\n", stats.dwInHdrErrors ); + trace( " dwInAddrErrors: %u\n", stats.dwInAddrErrors ); + trace( " dwForwDatagrams: %u\n", stats.dwForwDatagrams ); + trace( " dwInUnknownProtos: %u\n", stats.dwInUnknownProtos ); + trace( " dwInDiscards: %u\n", stats.dwInDiscards ); + trace( " dwInDelivers: %u\n", stats.dwInDelivers ); + trace( " dwOutRequests: %u\n", stats.dwOutRequests ); + trace( " dwRoutingDiscards: %u\n", stats.dwRoutingDiscards ); + trace( " dwOutDiscards: %u\n", stats.dwOutDiscards ); + trace( " dwOutNoRoutes: %u\n", stats.dwOutNoRoutes ); + trace( " dwReasmTimeout: %u\n", stats.dwReasmTimeout ); + trace( " dwReasmReqds: %u\n", stats.dwReasmReqds ); + trace( " dwReasmOks: %u\n", stats.dwReasmOks ); + trace( " dwReasmFails: %u\n", stats.dwReasmFails ); + trace( " dwFragOks: %u\n", stats.dwFragOks ); + trace( " dwFragFails: %u\n", stats.dwFragFails ); + trace( " dwFragCreates: %u\n", stats.dwFragCreates ); + trace( " dwNumIf: %u\n", stats.dwNumIf ); + trace( " dwNumAddr: %u\n", stats.dwNumAddr ); + trace( " dwNumRoutes: %u\n", stats.dwNumRoutes ); + } + + apiReturn = pGetIpStatisticsEx(&stats, AF_INET6); + ok(apiReturn == NO_ERROR || broken(apiReturn == ERROR_NOT_SUPPORTED), + "GetIpStatisticsEx returned %d, expected NO_ERROR\n", apiReturn); + if (apiReturn == NO_ERROR && winetest_debug > 1) + { + trace( "IP IPv6 Ex stats:\n" ); + trace( " dwForwarding: %u\n", U(stats).dwForwarding ); + trace( " dwDefaultTTL: %u\n", stats.dwDefaultTTL ); + trace( " dwInReceives: %u\n", stats.dwInReceives ); + trace( " dwInHdrErrors: %u\n", stats.dwInHdrErrors ); + trace( " dwInAddrErrors: %u\n", stats.dwInAddrErrors ); + trace( " dwForwDatagrams: %u\n", stats.dwForwDatagrams ); + trace( " dwInUnknownProtos: %u\n", stats.dwInUnknownProtos ); + trace( " dwInDiscards: %u\n", stats.dwInDiscards ); + trace( " dwInDelivers: %u\n", stats.dwInDelivers ); + trace( " dwOutRequests: %u\n", stats.dwOutRequests ); + trace( " dwRoutingDiscards: %u\n", stats.dwRoutingDiscards ); + trace( " dwOutDiscards: %u\n", stats.dwOutDiscards ); + trace( " dwOutNoRoutes: %u\n", stats.dwOutNoRoutes ); + trace( " dwReasmTimeout: %u\n", stats.dwReasmTimeout ); + trace( " dwReasmReqds: %u\n", stats.dwReasmReqds ); + trace( " dwReasmOks: %u\n", stats.dwReasmOks ); + trace( " dwReasmFails: %u\n", stats.dwReasmFails ); + trace( " dwFragOks: %u\n", stats.dwFragOks ); + trace( " dwFragFails: %u\n", stats.dwFragFails ); + trace( " dwFragCreates: %u\n", stats.dwFragCreates ); + trace( " dwNumIf: %u\n", stats.dwNumIf ); + trace( " dwNumAddr: %u\n", stats.dwNumAddr ); + trace( " dwNumRoutes: %u\n", stats.dwNumRoutes ); + } +} + +static void testGetTcpStatisticsEx(void) +{ + DWORD apiReturn; + MIB_TCPSTATS stats; + + if (!pGetTcpStatisticsEx) + { + win_skip( "GetTcpStatisticsEx not available\n" ); + return; + } + + apiReturn = pGetTcpStatisticsEx(NULL, AF_INET); + ok(apiReturn == ERROR_INVALID_PARAMETER, + "GetTcpStatisticsEx(NULL, AF_INET); returned %d, expected ERROR_INVALID_PARAMETER\n", apiReturn); + + apiReturn = pGetTcpStatisticsEx(&stats, AF_BAN); + ok(apiReturn == ERROR_INVALID_PARAMETER || apiReturn == ERROR_NOT_SUPPORTED, + "GetTcpStatisticsEx(&stats, AF_BAN) returned %d, expected ERROR_INVALID_PARAMETER\n", apiReturn); + + apiReturn = pGetTcpStatisticsEx(&stats, AF_INET); + ok(apiReturn == NO_ERROR, "GetTcpStatisticsEx returned %d, expected NO_ERROR\n", apiReturn); + if (apiReturn == NO_ERROR && winetest_debug > 1) + { + trace( "TCP IPv4 Ex stats:\n" ); + trace( " dwRtoAlgorithm: %u\n", U(stats).dwRtoAlgorithm ); + trace( " dwRtoMin: %u\n", stats.dwRtoMin ); + trace( " dwRtoMax: %u\n", stats.dwRtoMax ); + trace( " dwMaxConn: %u\n", stats.dwMaxConn ); + trace( " dwActiveOpens: %u\n", stats.dwActiveOpens ); + trace( " dwPassiveOpens: %u\n", stats.dwPassiveOpens ); + trace( " dwAttemptFails: %u\n", stats.dwAttemptFails ); + trace( " dwEstabResets: %u\n", stats.dwEstabResets ); + trace( " dwCurrEstab: %u\n", stats.dwCurrEstab ); + trace( " dwInSegs: %u\n", stats.dwInSegs ); + trace( " dwOutSegs: %u\n", stats.dwOutSegs ); + trace( " dwRetransSegs: %u\n", stats.dwRetransSegs ); + trace( " dwInErrs: %u\n", stats.dwInErrs ); + trace( " dwOutRsts: %u\n", stats.dwOutRsts ); + trace( " dwNumConns: %u\n", stats.dwNumConns ); + } + + apiReturn = pGetTcpStatisticsEx(&stats, AF_INET6); + todo_wine ok(apiReturn == NO_ERROR || broken(apiReturn == ERROR_NOT_SUPPORTED), + "GetTcpStatisticsEx returned %d, expected NO_ERROR\n", apiReturn); + if (apiReturn == NO_ERROR && winetest_debug > 1) + { + trace( "TCP IPv6 Ex stats:\n" ); + trace( " dwRtoAlgorithm: %u\n", U(stats).dwRtoAlgorithm ); + trace( " dwRtoMin: %u\n", stats.dwRtoMin ); + trace( " dwRtoMax: %u\n", stats.dwRtoMax ); + trace( " dwMaxConn: %u\n", stats.dwMaxConn ); + trace( " dwActiveOpens: %u\n", stats.dwActiveOpens ); + trace( " dwPassiveOpens: %u\n", stats.dwPassiveOpens ); + trace( " dwAttemptFails: %u\n", stats.dwAttemptFails ); + trace( " dwEstabResets: %u\n", stats.dwEstabResets ); + trace( " dwCurrEstab: %u\n", stats.dwCurrEstab ); + trace( " dwInSegs: %u\n", stats.dwInSegs ); + trace( " dwOutSegs: %u\n", stats.dwOutSegs ); + trace( " dwRetransSegs: %u\n", stats.dwRetransSegs ); + trace( " dwInErrs: %u\n", stats.dwInErrs ); + trace( " dwOutRsts: %u\n", stats.dwOutRsts ); + trace( " dwNumConns: %u\n", stats.dwNumConns ); + } +} + +static void testGetUdpStatisticsEx(void) +{ + DWORD apiReturn; + MIB_UDPSTATS stats; + + if (!pGetUdpStatisticsEx) + { + win_skip( "GetUdpStatisticsEx not available\n" ); + return; + } + + apiReturn = pGetUdpStatisticsEx(NULL, AF_INET); + ok(apiReturn == ERROR_INVALID_PARAMETER, + "GetUdpStatisticsEx(NULL, AF_INET); returned %d, expected ERROR_INVALID_PARAMETER\n", apiReturn); + + apiReturn = pGetUdpStatisticsEx(&stats, AF_BAN); + ok(apiReturn == ERROR_INVALID_PARAMETER || apiReturn == ERROR_NOT_SUPPORTED, + "GetUdpStatisticsEx(&stats, AF_BAN) returned %d, expected ERROR_INVALID_PARAMETER\n", apiReturn); + + apiReturn = pGetUdpStatisticsEx(&stats, AF_INET); + ok(apiReturn == NO_ERROR, "GetUdpStatisticsEx returned %d, expected NO_ERROR\n", apiReturn); + if (apiReturn == NO_ERROR && winetest_debug > 1) + { + trace( "UDP IPv4 Ex stats:\n" ); + trace( " dwInDatagrams: %u\n", stats.dwInDatagrams ); + trace( " dwNoPorts: %u\n", stats.dwNoPorts ); + trace( " dwInErrors: %u\n", stats.dwInErrors ); + trace( " dwOutDatagrams: %u\n", stats.dwOutDatagrams ); + trace( " dwNumAddrs: %u\n", stats.dwNumAddrs ); + } + + apiReturn = pGetUdpStatisticsEx(&stats, AF_INET6); + ok(apiReturn == NO_ERROR || broken(apiReturn == ERROR_NOT_SUPPORTED), + "GetUdpStatisticsEx returned %d, expected NO_ERROR\n", apiReturn); + if (apiReturn == NO_ERROR && winetest_debug > 1) + { + trace( "UDP IPv6 Ex stats:\n" ); + trace( " dwInDatagrams: %u\n", stats.dwInDatagrams ); + trace( " dwNoPorts: %u\n", stats.dwNoPorts ); + trace( " dwInErrors: %u\n", stats.dwInErrors ); + trace( " dwOutDatagrams: %u\n", stats.dwOutDatagrams ); + trace( " dwNumAddrs: %u\n", stats.dwNumAddrs ); + } +} + static void testGetTcpTable(void) { - if (gGetTcpTable) { + if (pGetTcpTable) { DWORD apiReturn; ULONG dwSize = 0; - apiReturn = gGetTcpTable(NULL, &dwSize, FALSE); + apiReturn = pGetTcpTable(NULL, &dwSize, FALSE); if (apiReturn == ERROR_NOT_SUPPORTED) { skip("GetTcpTable is not supported\n"); return; @@ -597,7 +842,7 @@ if (apiReturn == ERROR_INSUFFICIENT_BUFFER) { PMIB_TCPTABLE buf = HeapAlloc(GetProcessHeap(), 0, dwSize); - apiReturn = gGetTcpTable(buf, &dwSize, FALSE); + apiReturn = pGetTcpTable(buf, &dwSize, FALSE); ok(apiReturn == NO_ERROR, "GetTcpTable(buf, &dwSize, FALSE) returned %d, expected NO_ERROR\n", apiReturn); @@ -613,7 +858,7 @@ ntoa(buf->table[i].dwLocalAddr), ntohs(buf->table[i].dwLocalPort) ); trace( "%u: %s remote %s:%u state %u\n", i, buffer, ntoa( buf->table[i].dwRemoteAddr ), - ntohs(buf->table[i].dwRemotePort), buf->table[i].dwState ); + ntohs(buf->table[i].dwRemotePort), U(buf->table[i]).dwState ); } } HeapFree(GetProcessHeap(), 0, buf); @@ -623,11 +868,11 @@ static void testGetUdpTable(void) { - if (gGetUdpTable) { + if (pGetUdpTable) { DWORD apiReturn; ULONG dwSize = 0; - apiReturn = gGetUdpTable(NULL, &dwSize, FALSE); + apiReturn = pGetUdpTable(NULL, &dwSize, FALSE); if (apiReturn == ERROR_NOT_SUPPORTED) { skip("GetUdpTable is not supported\n"); return; @@ -638,7 +883,7 @@ if (apiReturn == ERROR_INSUFFICIENT_BUFFER) { PMIB_UDPTABLE buf = HeapAlloc(GetProcessHeap(), 0, dwSize); - apiReturn = gGetUdpTable(buf, &dwSize, FALSE); + apiReturn = pGetUdpTable(buf, &dwSize, FALSE); ok(apiReturn == NO_ERROR, "GetUdpTable(buf, &dwSize, FALSE) returned %d, expected NO_ERROR\n", apiReturn); @@ -654,6 +899,200 @@ HeapFree(GetProcessHeap(), 0, buf); } } +} + +static void testSetTcpEntry(void) +{ + DWORD ret; + MIB_TCPROW row; + + memset(&row, 0, sizeof(row)); + if(0) /* This test crashes in OS >= VISTA */ + { + ret = pSetTcpEntry(NULL); + ok( ret == ERROR_INVALID_PARAMETER, "got %u, expected %u\n", ret, ERROR_INVALID_PARAMETER); + } + + ret = pSetTcpEntry(&row); + if (ret == ERROR_NETWORK_ACCESS_DENIED) + { + win_skip("SetTcpEntry failed with access error. Skipping test.\n"); + return; + } + todo_wine ok( ret == ERROR_INVALID_PARAMETER, "got %u, expected %u\n", ret, ERROR_INVALID_PARAMETER); + + U(row).dwState = MIB_TCP_STATE_DELETE_TCB; + ret = pSetTcpEntry(&row); + todo_wine ok( ret == ERROR_MR_MID_NOT_FOUND || broken(ret == ERROR_INVALID_PARAMETER), + "got %u, expected %u\n", ret, ERROR_MR_MID_NOT_FOUND); +} + +static void testIcmpSendEcho(void) +{ + HANDLE icmp; + char senddata[32], replydata[sizeof(senddata) + sizeof(ICMP_ECHO_REPLY)]; + DWORD ret, error, replysz = sizeof(replydata); + IPAddr address; + + if (!pIcmpSendEcho || !pIcmpCreateFile) + { + win_skip( "IcmpSendEcho or IcmpCreateFile not available\n" ); + return; + } + memset(senddata, 0, sizeof(senddata)); + + address = htonl(INADDR_LOOPBACK); + SetLastError(0xdeadbeef); + ret = pIcmpSendEcho(INVALID_HANDLE_VALUE, address, senddata, sizeof(senddata), NULL, replydata, replysz, 1000); + error = GetLastError(); + ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); +todo_wine + ok (error == ERROR_INVALID_PARAMETER + || broken(error == ERROR_INVALID_HANDLE) /* <= 2003 */, + "expected 87, got %d\n", error); + + icmp = pIcmpCreateFile(); + if (icmp == INVALID_HANDLE_VALUE) + { + error = GetLastError(); + if (error == ERROR_ACCESS_DENIED) + { + skip ("ICMP is not available.\n"); + return; + } + } + ok (icmp != INVALID_HANDLE_VALUE, "IcmpCreateFile failed unexpectedly with error %d\n", GetLastError()); + + address = 0; + SetLastError(0xdeadbeef); + ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, replydata, replysz, 1000); + error = GetLastError(); + ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); + ok (error == ERROR_INVALID_NETNAME + || broken(error == IP_BAD_DESTINATION) /* <= 2003 */, + "expected 1214, got %d\n", error); + + address = htonl(INADDR_LOOPBACK); + if (0) /* crashes in XP */ + { + ret = pIcmpSendEcho(icmp, address, NULL, sizeof(senddata), NULL, replydata, replysz, 1000); + ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); + } + + SetLastError(0xdeadbeef); + ret = pIcmpSendEcho(icmp, address, senddata, 0, NULL, replydata, replysz, 1000); + error = GetLastError(); + ok (ret, "IcmpSendEcho failed unexpectedly with error %d\n", error); + + SetLastError(0xdeadbeef); + ret = pIcmpSendEcho(icmp, address, NULL, 0, NULL, replydata, replysz, 1000); + error = GetLastError(); + ok (ret, "IcmpSendEcho failed unexpectedly with error %d\n", error); + + if (0) /* crashes in wine, remove IF when fixed */ + { + SetLastError(0xdeadbeef); + ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, NULL, replysz, 1000); + error = GetLastError(); + ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); + ok (error == ERROR_INVALID_PARAMETER, "expected 87, got %d\n", error); + } + + SetLastError(0xdeadbeef); + ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, replydata, 0, 1000); + error = GetLastError(); + ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); +todo_wine + ok (error == ERROR_INVALID_PARAMETER + || broken(error == ERROR_INSUFFICIENT_BUFFER) /* <= 2003 */, + "expected 87, got %d\n", error); + + SetLastError(0xdeadbeef); + ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, NULL, 0, 1000); + error = GetLastError(); + ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); +todo_wine + ok (error == ERROR_INVALID_PARAMETER + || broken(error == ERROR_INSUFFICIENT_BUFFER) /* <= 2003 */, + "expected 87, got %d\n", error); + + SetLastError(0xdeadbeef); + replysz = sizeof(replydata) - 1; + ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, replydata, replysz, 1000); + error = GetLastError(); + todo_wine { + ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); + ok (error == IP_GENERAL_FAILURE + || broken(error == IP_BUF_TOO_SMALL) /* <= 2003 */, + "expected 11050, got %d\n", error); + } + + SetLastError(0xdeadbeef); + replysz = sizeof(ICMP_ECHO_REPLY); + ret = pIcmpSendEcho(icmp, address, senddata, 0, NULL, replydata, replysz, 1000); + error = GetLastError(); +todo_wine + ok (ret, "IcmpSendEcho failed unexpectedly with error %d\n", error); + + SetLastError(0xdeadbeef); + replysz = sizeof(ICMP_ECHO_REPLY) + ICMP_MINLEN; + ret = pIcmpSendEcho(icmp, address, senddata, ICMP_MINLEN, NULL, replydata, replysz, 1000); + error = GetLastError(); +todo_wine + ok (ret, "IcmpSendEcho failed unexpectedly with error %d\n", error); + + SetLastError(0xdeadbeef); + replysz = sizeof(ICMP_ECHO_REPLY) + ICMP_MINLEN; + ret = pIcmpSendEcho(icmp, address, senddata, ICMP_MINLEN + 1, NULL, replydata, replysz, 1000); + error = GetLastError(); + ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); +todo_wine + ok (error == IP_GENERAL_FAILURE + || broken(error == IP_BUF_TOO_SMALL) /* <= 2003 */, + "expected 11050, got %d\n", error); + + SetLastError(0xdeadbeef); + ret = pIcmpSendEcho(icmp, address, senddata, ICMP_MINLEN, NULL, replydata, replysz - 1, 1000); + error = GetLastError(); + ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); +todo_wine + ok (error == IP_GENERAL_FAILURE + || broken(error == IP_BUF_TOO_SMALL) /* <= 2003 */, + "expected 11050, got %d\n", error); + + /* in windows >= vista the timeout can't be invalid */ + SetLastError(0xdeadbeef); + replysz = sizeof(replydata); + ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, replydata, replysz, 0); + error = GetLastError(); + if (!ret) ok(error == ERROR_INVALID_PARAMETER, "expected 87, got %d\n", error); + + SetLastError(0xdeadbeef); + ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, replydata, replysz, -1); + error = GetLastError(); + if (!ret) ok(error == ERROR_INVALID_PARAMETER, "expected 87, got %d\n", error); + + /* real ping test */ + SetLastError(0xdeadbeef); + address = htonl(INADDR_LOOPBACK); + ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, replydata, replysz, 1000); + error = GetLastError(); + if (ret) + { + PICMP_ECHO_REPLY pong = (PICMP_ECHO_REPLY) replydata; + trace ("send addr : %s\n", ntoa(address)); + trace ("reply addr : %s\n", ntoa(pong->Address)); + trace ("reply size : %u\n", replysz); + trace ("roundtrip : %u ms\n", pong->RoundTripTime); + trace ("status : %u\n", pong->Status); + trace ("recv size : %u\n", pong->DataSize); + trace ("ttl : %u\n", pong->Options.Ttl); + trace ("flags : 0x%x\n", pong->Options.Flags); + } + else + { + skip ("Failed to ping with error %d, is lo interface down?.\n", error); + } } /* @@ -669,7 +1108,6 @@ SetIpNetEntry SetIpStatistics SetIpTTL -SetTcpEntry */ static void testWinNT4Functions(void) { @@ -682,17 +1120,23 @@ testGetIpStatistics(); testGetTcpStatistics(); testGetUdpStatistics(); + testGetIcmpStatisticsEx(); + testGetIpStatisticsEx(); + testGetTcpStatisticsEx(); + testGetUdpStatisticsEx(); testGetTcpTable(); testGetUdpTable(); + testSetTcpEntry(); + testIcmpSendEcho(); } static void testGetInterfaceInfo(void) { - if (gGetInterfaceInfo) { + if (pGetInterfaceInfo) { DWORD apiReturn; ULONG len = 0; - apiReturn = gGetInterfaceInfo(NULL, NULL); + apiReturn = pGetInterfaceInfo(NULL, NULL); if (apiReturn == ERROR_NOT_SUPPORTED) { skip("GetInterfaceInfo is not supported\n"); return; @@ -700,14 +1144,14 @@ ok(apiReturn == ERROR_INVALID_PARAMETER, "GetInterfaceInfo returned %d, expected ERROR_INVALID_PARAMETER\n", apiReturn); - apiReturn = gGetInterfaceInfo(NULL, &len); + apiReturn = pGetInterfaceInfo(NULL, &len); ok(apiReturn == ERROR_INSUFFICIENT_BUFFER, "GetInterfaceInfo returned %d, expected ERROR_INSUFFICIENT_BUFFER\n", apiReturn); if (apiReturn == ERROR_INSUFFICIENT_BUFFER) { PIP_INTERFACE_INFO buf = HeapAlloc(GetProcessHeap(), 0, len); - apiReturn = gGetInterfaceInfo(buf, &len); + apiReturn = pGetInterfaceInfo(buf, &len); ok(apiReturn == NO_ERROR, "GetInterfaceInfo(buf, &dwSize) returned %d, expected NO_ERROR\n", apiReturn); @@ -718,11 +1162,11 @@ static void testGetAdaptersInfo(void) { - if (gGetAdaptersInfo) { + if (pGetAdaptersInfo) { DWORD apiReturn; ULONG len = 0; - apiReturn = gGetAdaptersInfo(NULL, NULL); + apiReturn = pGetAdaptersInfo(NULL, NULL); if (apiReturn == ERROR_NOT_SUPPORTED) { skip("GetAdaptersInfo is not supported\n"); return; @@ -730,19 +1174,27 @@ ok(apiReturn == ERROR_INVALID_PARAMETER, "GetAdaptersInfo returned %d, expected ERROR_INVALID_PARAMETER\n", apiReturn); - apiReturn = gGetAdaptersInfo(NULL, &len); + apiReturn = pGetAdaptersInfo(NULL, &len); ok(apiReturn == ERROR_NO_DATA || apiReturn == ERROR_BUFFER_OVERFLOW, "GetAdaptersInfo returned %d, expected ERROR_NO_DATA or ERROR_BUFFER_OVERFLOW\n", apiReturn); if (apiReturn == ERROR_NO_DATA) ; /* no adapter's, that's okay */ else if (apiReturn == ERROR_BUFFER_OVERFLOW) { - PIP_ADAPTER_INFO buf = HeapAlloc(GetProcessHeap(), 0, len); - - apiReturn = gGetAdaptersInfo(buf, &len); + PIP_ADAPTER_INFO ptr, buf = HeapAlloc(GetProcessHeap(), 0, len); + + apiReturn = pGetAdaptersInfo(buf, &len); ok(apiReturn == NO_ERROR, "GetAdaptersInfo(buf, &dwSize) returned %d, expected NO_ERROR\n", apiReturn); + ptr = buf; + while (ptr) { + ok(ptr->IpAddressList.IpAddress.String[0], "A valid IP must be present\n"); + ok(ptr->IpAddressList.IpMask.String[0], "A valid mask must be present\n"); + trace("Adapter '%s', IP %s, Mask %s\n", ptr->AdapterName, + ptr->IpAddressList.IpAddress.String, ptr->IpAddressList.IpMask.String); + ptr = ptr->Next; + } HeapFree(GetProcessHeap(), 0, buf); } } @@ -750,11 +1202,11 @@ static void testGetNetworkParams(void) { - if (gGetNetworkParams) { + if (pGetNetworkParams) { DWORD apiReturn; ULONG len = 0; - apiReturn = gGetNetworkParams(NULL, NULL); + apiReturn = pGetNetworkParams(NULL, NULL); if (apiReturn == ERROR_NOT_SUPPORTED) { skip("GetNetworkParams is not supported\n"); return; @@ -762,14 +1214,14 @@ ok(apiReturn == ERROR_INVALID_PARAMETER, "GetNetworkParams returned %d, expected ERROR_INVALID_PARAMETER\n", apiReturn); - apiReturn = gGetNetworkParams(NULL, &len); + apiReturn = pGetNetworkParams(NULL, &len); ok(apiReturn == ERROR_BUFFER_OVERFLOW, "GetNetworkParams returned %d, expected ERROR_BUFFER_OVERFLOW\n", apiReturn); if (apiReturn == ERROR_BUFFER_OVERFLOW) { PFIXED_INFO buf = HeapAlloc(GetProcessHeap(), 0, len); - apiReturn = gGetNetworkParams(buf, &len); + apiReturn = pGetNetworkParams(buf, &len); ok(apiReturn == NO_ERROR, "GetNetworkParams(buf, &dwSize) returned %d, expected NO_ERROR\n", apiReturn); @@ -798,20 +1250,20 @@ DWORD ret, needed; void *buffer; - if (!gGetPerAdapterInfo) return; - ret = gGetPerAdapterInfo(1, NULL, NULL); + if (!pGetPerAdapterInfo) return; + ret = pGetPerAdapterInfo(1, NULL, NULL); if (ret == ERROR_NOT_SUPPORTED) { skip("GetPerAdapterInfo is not supported\n"); return; } ok( ret == ERROR_INVALID_PARAMETER, "got %u instead of ERROR_INVALID_PARAMETER\n", ret ); needed = 0xdeadbeef; - ret = gGetPerAdapterInfo(1, NULL, &needed); + ret = pGetPerAdapterInfo(1, NULL, &needed); if (ret == ERROR_NO_DATA) return; /* no such adapter */ ok( ret == ERROR_BUFFER_OVERFLOW, "got %u instead of ERROR_BUFFER_OVERFLOW\n", ret ); ok( needed != 0xdeadbeef, "needed not set\n" ); buffer = HeapAlloc( GetProcessHeap(), 0, needed ); - ret = gGetPerAdapterInfo(1, buffer, &needed); + ret = pGetPerAdapterInfo(1, buffer, &needed); ok( ret == NO_ERROR, "got %u instead of NO_ERROR\n", ret ); HeapFree( GetProcessHeap(), 0, buffer ); } @@ -823,12 +1275,12 @@ HANDLE handle; BOOL success; - if (!gNotifyAddrChange) + if (!pNotifyAddrChange) { win_skip("NotifyAddrChange not present\n"); return; } - if (!gCancelIPChangeNotify) + if (!pCancelIPChangeNotify) { win_skip("CancelIPChangeNotify not present\n"); return; @@ -836,7 +1288,7 @@ handle = NULL; ZeroMemory(&overlapped, sizeof(overlapped)); - ret = gNotifyAddrChange(&handle, &overlapped); + ret = pNotifyAddrChange(&handle, &overlapped); if (ret == ERROR_NOT_SUPPORTED) { win_skip("NotifyAddrChange is not supported\n"); @@ -845,34 +1297,34 @@ ok(ret == ERROR_IO_PENDING, "NotifyAddrChange returned %d, expected ERROR_IO_PENDING\n", ret); ret = GetLastError(); todo_wine ok(ret == ERROR_IO_PENDING, "GetLastError returned %d, expected ERROR_IO_PENDING\n", ret); - success = gCancelIPChangeNotify(&overlapped); + success = pCancelIPChangeNotify(&overlapped); todo_wine ok(success == TRUE, "CancelIPChangeNotify returned FALSE, expected TRUE\n"); ZeroMemory(&overlapped, sizeof(overlapped)); - success = gCancelIPChangeNotify(&overlapped); + success = pCancelIPChangeNotify(&overlapped); ok(success == FALSE, "CancelIPChangeNotify returned TRUE, expected FALSE\n"); handle = NULL; ZeroMemory(&overlapped, sizeof(overlapped)); - overlapped.hEvent = CreateEvent(NULL, FALSE, FALSE, NULL); - ret = gNotifyAddrChange(&handle, &overlapped); + overlapped.hEvent = CreateEventW(NULL, FALSE, FALSE, NULL); + ret = pNotifyAddrChange(&handle, &overlapped); ok(ret == ERROR_IO_PENDING, "NotifyAddrChange returned %d, expected ERROR_IO_PENDING\n", ret); todo_wine ok(handle != INVALID_HANDLE_VALUE, "NotifyAddrChange returned invalid file handle\n"); success = GetOverlappedResult(handle, &overlapped, &bytes, FALSE); ok(success == FALSE, "GetOverlappedResult returned TRUE, expected FALSE\n"); ret = GetLastError(); ok(ret == ERROR_IO_INCOMPLETE, "GetLastError returned %d, expected ERROR_IO_INCOMPLETE\n", ret); - success = gCancelIPChangeNotify(&overlapped); + success = pCancelIPChangeNotify(&overlapped); todo_wine ok(success == TRUE, "CancelIPChangeNotify returned FALSE, expected TRUE\n"); if (winetest_interactive) { handle = NULL; ZeroMemory(&overlapped, sizeof(overlapped)); - overlapped.hEvent = CreateEvent(NULL, FALSE, FALSE, NULL); + overlapped.hEvent = CreateEventW(NULL, FALSE, FALSE, NULL); trace("Testing asynchronous ipv4 address change notification. Please " "change the ipv4 address of one of your network interfaces\n"); - ret = gNotifyAddrChange(&handle, &overlapped); + ret = pNotifyAddrChange(&handle, &overlapped); ok(ret == ERROR_IO_PENDING, "NotifyAddrChange returned %d, expected NO_ERROR\n", ret); success = GetOverlappedResult(handle, &overlapped, &bytes, TRUE); ok(success == TRUE, "GetOverlappedResult returned FALSE, expected TRUE\n"); @@ -883,7 +1335,7 @@ { trace("Testing synchronous ipv4 address change notification. Please " "change the ipv4 address of one of your network interfaces\n"); - ret = gNotifyAddrChange(NULL, NULL); + ret = pNotifyAddrChange(NULL, NULL); todo_wine ok(ret == NO_ERROR, "NotifyAddrChange returned %d, expected NO_ERROR\n", ret); } } @@ -909,38 +1361,50 @@ static void test_GetAdaptersAddresses(void) { - ULONG ret, size; + ULONG ret, size, osize, i; IP_ADAPTER_ADDRESSES *aa, *ptr; IP_ADAPTER_UNICAST_ADDRESS *ua; - if (!gGetAdaptersAddresses) + if (!pGetAdaptersAddresses) { win_skip("GetAdaptersAddresses not present\n"); return; } - ret = gGetAdaptersAddresses(AF_UNSPEC, 0, NULL, NULL, NULL); + ret = pGetAdaptersAddresses(AF_UNSPEC, 0, NULL, NULL, NULL); ok(ret == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got %u\n", ret); /* size should be ignored and overwritten if buffer is NULL */ size = 0x7fffffff; - ret = gGetAdaptersAddresses(AF_UNSPEC, 0, NULL, NULL, &size); + ret = pGetAdaptersAddresses(AF_UNSPEC, 0, NULL, NULL, &size); ok(ret == ERROR_BUFFER_OVERFLOW, "expected ERROR_BUFFER_OVERFLOW, got %u\n", ret); if (ret != ERROR_BUFFER_OVERFLOW) return; ptr = HeapAlloc(GetProcessHeap(), 0, size); - ret = gGetAdaptersAddresses(AF_UNSPEC, 0, NULL, ptr, &size); + ret = pGetAdaptersAddresses(AF_UNSPEC, 0, NULL, ptr, &size); ok(!ret, "expected ERROR_SUCCESS got %u\n", ret); + HeapFree(GetProcessHeap(), 0, ptr); + + /* higher size must not be changed to lower size */ + size *= 2; + osize = size; + ptr = HeapAlloc(GetProcessHeap(), 0, osize); + ret = pGetAdaptersAddresses(AF_UNSPEC, 0, NULL, ptr, &osize); + ok(!ret, "expected ERROR_SUCCESS got %u\n", ret); + ok(osize == size, "expected %d, got %d\n", size, osize); for (aa = ptr; !ret && aa; aa = aa->Next) { + char temp[128]; + + ok(S(U(*aa)).Length == sizeof(IP_ADAPTER_ADDRESSES_LH) || + S(U(*aa)).Length == sizeof(IP_ADAPTER_ADDRESSES_XP), + "Unknown structure size of %u bytes\n", S(U(*aa)).Length); ok(aa->DnsSuffix != NULL, "DnsSuffix is not a valid pointer\n"); ok(aa->Description != NULL, "Description is not a valid pointer\n"); ok(aa->FriendlyName != NULL, "FriendlyName is not a valid pointer\n"); - if (winetest_debug <= 1) - continue; - + trace("\n"); trace("Length: %u\n", S(U(*aa)).Length); trace("IfIndex: %u\n", S(U(*aa)).IfIndex); trace("Next: %p\n", aa->Next); @@ -949,6 +1413,21 @@ ua = aa->FirstUnicastAddress; while (ua) { + ok(ua->PrefixOrigin != IpPrefixOriginOther, + "bad address config value %d\n", ua->PrefixOrigin); + ok(ua->SuffixOrigin != IpSuffixOriginOther, + "bad address config value %d\n", ua->PrefixOrigin); + /* Address configured manually or from DHCP server? */ + if (ua->PrefixOrigin == IpPrefixOriginManual || + ua->PrefixOrigin == IpPrefixOriginDhcp) + { + ok(ua->ValidLifetime, "expected non-zero value\n"); + ok(ua->PreferredLifetime, "expected non-zero value\n"); + ok(ua->LeaseLifetime, "expected non-zero\n"); + } + /* Is the address ok in the network (not duplicated)? */ + ok(ua->DadState != IpDadStateInvalid && ua->DadState != IpDadStateDuplicate, + "bad address duplication value %d\n", ua->DadState); trace("\tLength: %u\n", S(U(*ua)).Length); trace("\tFlags: 0x%08x\n", S(U(*ua)).Flags); trace("\tNext: %p\n", ua->Next); @@ -957,27 +1436,468 @@ trace("\tPrefixOrigin: %u\n", ua->PrefixOrigin); trace("\tSuffixOrigin: %u\n", ua->SuffixOrigin); trace("\tDadState: %u\n", ua->DadState); - trace("\tValidLifetime: 0x%08x\n", ua->ValidLifetime); - trace("\tPreferredLifetime: 0x%08x\n", ua->PreferredLifetime); - trace("\tLeaseLifetime: 0x%08x\n", ua->LeaseLifetime); + trace("\tValidLifetime: %u seconds\n", ua->ValidLifetime); + trace("\tPreferredLifetime: %u seconds\n", ua->PreferredLifetime); + trace("\tLeaseLifetime: %u seconds\n", ua->LeaseLifetime); trace("\n"); ua = ua->Next; } trace("FirstAnycastAddress: %p\n", aa->FirstAnycastAddress); trace("FirstMulticastAddress: %p\n", aa->FirstMulticastAddress); trace("FirstDnsServerAddress: %p\n", aa->FirstDnsServerAddress); - trace("DnsSuffix: %p\n", aa->DnsSuffix); - trace("Description: %p\n", aa->Description); - trace("FriendlyName: %p\n", aa->FriendlyName); - trace("PhysicalAddress: %02x\n", aa->PhysicalAddress[0]); + trace("DnsSuffix: %s %p\n", wine_dbgstr_w(aa->DnsSuffix), aa->DnsSuffix); + trace("Description: %s %p\n", wine_dbgstr_w(aa->Description), aa->Description); + trace("FriendlyName: %s %p\n", wine_dbgstr_w(aa->FriendlyName), aa->FriendlyName); trace("PhysicalAddressLength: %u\n", aa->PhysicalAddressLength); + for (i = 0; i < aa->PhysicalAddressLength; i++) + sprintf(temp + i * 3, "%02X-", aa->PhysicalAddress[i]); + temp[i ? i * 3 - 1 : 0] = '\0'; + trace("PhysicalAddress: %s\n", temp); trace("Flags: 0x%08x\n", aa->Flags); trace("Mtu: %u\n", aa->Mtu); trace("IfType: %u\n", aa->IfType); trace("OperStatus: %u\n", aa->OperStatus); + trace("Ipv6IfIndex: %u\n", aa->Ipv6IfIndex); + for (i = 0, temp[0] = '\0'; i < sizeof(aa->ZoneIndices) / sizeof(aa->ZoneIndices[0]); i++) + sprintf(temp + strlen(temp), "%d ", aa->ZoneIndices[i]); + trace("ZoneIndices: %s\n", temp); + trace("FirstPrefix: %p\n", aa->FirstPrefix); + + if (S(U(*aa)).Length < sizeof(IP_ADAPTER_ADDRESSES_LH)) continue; +#ifndef __REACTOS__ + trace("TransmitLinkSpeed: %s\n", debugstr_longlong(aa->TransmitLinkSpeed)); + trace("ReceiveLinkSpeed: %s\n", debugstr_longlong(aa->ReceiveLinkSpeed)); + trace("FirstWinsServerAddress:%p\n", aa->FirstWinsServerAddress); + trace("FirstGatewayAddress: %p\n", aa->FirstGatewayAddress); + trace("Ipv4Metric: %u\n", aa->Ipv4Metric); + trace("Ipv6Metric: %u\n", aa->Ipv6Metric); + trace("Luid: %p\n", &aa->Luid); + trace("Dhcpv4Server: %p\n", &aa->Dhcpv4Server); + trace("CompartmentId: %u\n", aa->CompartmentId); + trace("NetworkGuid: %s\n", wine_dbgstr_guid((GUID*) &aa->NetworkGuid)); + trace("ConnectionType: %u\n", aa->ConnectionType); + trace("TunnelType: %u\n", aa->TunnelType); + trace("Dhcpv6Server: %p\n", &aa->Dhcpv6Server); + trace("Dhcpv6ClientDuidLength:%u\n", aa->Dhcpv6ClientDuidLength); + trace("Dhcpv6ClientDuid: %p\n", aa->Dhcpv6ClientDuid); + trace("Dhcpv6Iaid: %u\n", aa->Dhcpv6Iaid); + trace("FirstDnsSuffix: %p\n", aa->FirstDnsSuffix); trace("\n"); +#endif } HeapFree(GetProcessHeap(), 0, ptr); +} + +static void test_GetExtendedTcpTable(void) +{ + DWORD ret, size; + MIB_TCPTABLE *table; + MIB_TCPTABLE_OWNER_PID *table_pid; + MIB_TCPTABLE_OWNER_MODULE *table_module; + + if (!pGetExtendedTcpTable) + { + win_skip("GetExtendedTcpTable not available\n"); + return; + } + ret = pGetExtendedTcpTable( NULL, NULL, TRUE, AF_INET, TCP_TABLE_BASIC_ALL, 0 ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + + size = 0; + ret = pGetExtendedTcpTable( NULL, &size, TRUE, AF_INET, TCP_TABLE_BASIC_ALL, 0 ); + ok( ret == ERROR_INSUFFICIENT_BUFFER, "got %u\n", ret ); + + table = HeapAlloc( GetProcessHeap(), 0, size ); + ret = pGetExtendedTcpTable( table, &size, TRUE, AF_INET, TCP_TABLE_BASIC_ALL, 0 ); + ok( ret == ERROR_SUCCESS, "got %u\n", ret ); + HeapFree( GetProcessHeap(), 0, table ); + + size = 0; + ret = pGetExtendedTcpTable( NULL, &size, TRUE, AF_INET, TCP_TABLE_BASIC_LISTENER, 0 ); + ok( ret == ERROR_INSUFFICIENT_BUFFER, "got %u\n", ret ); + + table = HeapAlloc( GetProcessHeap(), 0, size ); + ret = pGetExtendedTcpTable( table, &size, TRUE, AF_INET, TCP_TABLE_BASIC_LISTENER, 0 ); + ok( ret == ERROR_SUCCESS, "got %u\n", ret ); + HeapFree( GetProcessHeap(), 0, table ); + + size = 0; + ret = pGetExtendedTcpTable( NULL, &size, TRUE, AF_INET, TCP_TABLE_OWNER_PID_ALL, 0 ); + ok( ret == ERROR_INSUFFICIENT_BUFFER, "got %u\n", ret ); + + table_pid = HeapAlloc( GetProcessHeap(), 0, size ); + ret = pGetExtendedTcpTable( table_pid, &size, TRUE, AF_INET, TCP_TABLE_OWNER_PID_ALL, 0 ); + ok( ret == ERROR_SUCCESS, "got %u\n", ret ); + HeapFree( GetProcessHeap(), 0, table_pid ); + + size = 0; + ret = pGetExtendedTcpTable( NULL, &size, TRUE, AF_INET, TCP_TABLE_OWNER_PID_LISTENER, 0 ); + ok( ret == ERROR_INSUFFICIENT_BUFFER, "got %u\n", ret ); + + table_pid = HeapAlloc( GetProcessHeap(), 0, size ); + ret = pGetExtendedTcpTable( table_pid, &size, TRUE, AF_INET, TCP_TABLE_OWNER_PID_LISTENER, 0 ); + ok( ret == ERROR_SUCCESS, "got %u\n", ret ); + HeapFree( GetProcessHeap(), 0, table_pid ); + + size = 0; + ret = pGetExtendedTcpTable( NULL, &size, TRUE, AF_INET, TCP_TABLE_OWNER_MODULE_ALL, 0 ); + ok( ret == ERROR_INSUFFICIENT_BUFFER, "got %u\n", ret ); + + table_module = HeapAlloc( GetProcessHeap(), 0, size ); + ret = pGetExtendedTcpTable( table_module, &size, TRUE, AF_INET, TCP_TABLE_OWNER_MODULE_ALL, 0 ); + ok( ret == ERROR_SUCCESS, "got %u\n", ret ); + HeapFree( GetProcessHeap(), 0, table_module ); + + size = 0; + ret = pGetExtendedTcpTable( NULL, &size, TRUE, AF_INET, TCP_TABLE_OWNER_MODULE_LISTENER, 0 ); + ok( ret == ERROR_INSUFFICIENT_BUFFER, "got %u\n", ret ); + + table_module = HeapAlloc( GetProcessHeap(), 0, size ); + ret = pGetExtendedTcpTable( table_module, &size, TRUE, AF_INET, TCP_TABLE_OWNER_MODULE_LISTENER, 0 ); + ok( ret == ERROR_SUCCESS, "got %u\n", ret ); + HeapFree( GetProcessHeap(), 0, table_module ); +} + +static void test_GetExtendedUdpTable(void) +{ + DWORD ret, size; + MIB_UDPTABLE *table; + MIB_UDPTABLE_OWNER_PID *table_pid; + MIB_UDPTABLE_OWNER_MODULE *table_module; + + if (!pGetExtendedUdpTable) + { + win_skip("GetExtendedUdpTable not available\n"); + return; + } + ret = pGetExtendedUdpTable( NULL, NULL, TRUE, AF_INET, UDP_TABLE_BASIC, 0 ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + + size = 0; + ret = pGetExtendedUdpTable( NULL, &size, TRUE, AF_INET, UDP_TABLE_BASIC, 0 ); + ok( ret == ERROR_INSUFFICIENT_BUFFER, "got %u\n", ret ); + + table = HeapAlloc( GetProcessHeap(), 0, size ); + ret = pGetExtendedUdpTable( table, &size, TRUE, AF_INET, UDP_TABLE_BASIC, 0 ); + ok( ret == ERROR_SUCCESS, "got %u\n", ret ); + HeapFree( GetProcessHeap(), 0, table ); + + size = 0; + ret = pGetExtendedUdpTable( NULL, &size, TRUE, AF_INET, UDP_TABLE_OWNER_PID, 0 ); + ok( ret == ERROR_INSUFFICIENT_BUFFER, "got %u\n", ret ); + + table_pid = HeapAlloc( GetProcessHeap(), 0, size ); + ret = pGetExtendedUdpTable( table_pid, &size, TRUE, AF_INET, UDP_TABLE_OWNER_PID, 0 ); + ok( ret == ERROR_SUCCESS, "got %u\n", ret ); + HeapFree( GetProcessHeap(), 0, table_pid ); + + size = 0; + ret = pGetExtendedUdpTable( NULL, &size, TRUE, AF_INET, UDP_TABLE_OWNER_MODULE, 0 ); + ok( ret == ERROR_INSUFFICIENT_BUFFER, "got %u\n", ret ); + + table_module = HeapAlloc( GetProcessHeap(), 0, size ); + ret = pGetExtendedUdpTable( table_module, &size, TRUE, AF_INET, UDP_TABLE_OWNER_MODULE, 0 ); + ok( ret == ERROR_SUCCESS, "got %u\n", ret ); + HeapFree( GetProcessHeap(), 0, table_module ); +} + +static void test_CreateSortedAddressPairs(void) +{ + SOCKADDR_IN6 dst[2]; + SOCKADDR_IN6_PAIR *pair; + ULONG pair_count; + DWORD ret; + + if (!pCreateSortedAddressPairs) + { + win_skip( "CreateSortedAddressPairs not available\n" ); + return; + } + + memset( dst, 0, sizeof(dst) ); + dst[0].sin6_family = AF_INET6; + dst[0].sin6_addr.u.Word[5] = 0xffff; + dst[0].sin6_addr.u.Word[6] = 0x0808; + dst[0].sin6_addr.u.Word[7] = 0x0808; + + pair_count = 0xdeadbeef; + ret = pCreateSortedAddressPairs( NULL, 0, dst, 1, 0, NULL, &pair_count ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + ok( pair_count == 0xdeadbeef, "got %u\n", pair_count ); + + pair = (SOCKADDR_IN6_PAIR *)0xdeadbeef; + pair_count = 0xdeadbeef; + ret = pCreateSortedAddressPairs( NULL, 0, NULL, 1, 0, &pair, &pair_count ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + ok( pair == (SOCKADDR_IN6_PAIR *)0xdeadbeef, "got %p\n", pair ); + ok( pair_count == 0xdeadbeef, "got %u\n", pair_count ); + + pair = NULL; + pair_count = 0xdeadbeef; + ret = pCreateSortedAddressPairs( NULL, 0, dst, 1, 0, &pair, &pair_count ); + ok( ret == NO_ERROR, "got %u\n", ret ); + ok( pair != NULL, "pair not set\n" ); + ok( pair_count >= 1, "got %u\n", pair_count ); + ok( pair[0].SourceAddress != NULL, "src address not set\n" ); + ok( pair[0].DestinationAddress != NULL, "dst address not set\n" ); + pFreeMibTable( pair ); + + dst[1].sin6_family = AF_INET6; + dst[1].sin6_addr.u.Word[5] = 0xffff; + dst[1].sin6_addr.u.Word[6] = 0x0404; + dst[1].sin6_addr.u.Word[7] = 0x0808; + + pair = NULL; + pair_count = 0xdeadbeef; + ret = pCreateSortedAddressPairs( NULL, 0, dst, 2, 0, &pair, &pair_count ); + ok( ret == NO_ERROR, "got %u\n", ret ); + ok( pair != NULL, "pair not set\n" ); + ok( pair_count >= 2, "got %u\n", pair_count ); + ok( pair[0].SourceAddress != NULL, "src address not set\n" ); + ok( pair[0].DestinationAddress != NULL, "dst address not set\n" ); + ok( pair[1].SourceAddress != NULL, "src address not set\n" ); + ok( pair[1].DestinationAddress != NULL, "dst address not set\n" ); + pFreeMibTable( pair ); +} + +static DWORD get_interface_index(void) +{ + DWORD size = 0, ret = 0; + IP_ADAPTER_ADDRESSES *buf, *aa; + + if (pGetAdaptersAddresses( AF_UNSPEC, 0, NULL, NULL, &size ) != ERROR_BUFFER_OVERFLOW) + return 0; + + buf = HeapAlloc( GetProcessHeap(), 0, size ); + pGetAdaptersAddresses( AF_UNSPEC, 0, NULL, buf, &size ); + for (aa = buf; aa; aa = aa->Next) + { + if (aa->IfType == IF_TYPE_ETHERNET_CSMACD) + { + ret = aa->IfIndex; + break; + } + } + HeapFree( GetProcessHeap(), 0, buf ); + return ret; +} + +static void test_interface_identifier_conversion(void) +{ + DWORD ret; + NET_LUID luid; + GUID guid; + SIZE_T len; + WCHAR nameW[IF_MAX_STRING_SIZE + 1]; + char nameA[IF_MAX_STRING_SIZE + 1]; + NET_IFINDEX index; + + if (!pConvertInterfaceIndexToLuid) + { + win_skip( "ConvertInterfaceIndexToLuid not available\n" ); + return; + } + if (!(index = get_interface_index())) + { + skip( "no suitable interface found\n" ); + return; + } + + /* ConvertInterfaceIndexToLuid */ + ret = pConvertInterfaceIndexToLuid( 0, NULL ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + + memset( &luid, 0xff, sizeof(luid) ); + ret = pConvertInterfaceIndexToLuid( 0, &luid ); + ok( ret == ERROR_FILE_NOT_FOUND, "got %u\n", ret ); + ok( !luid.Info.Reserved, "got %x\n", luid.Info.Reserved ); + ok( !luid.Info.NetLuidIndex, "got %u\n", luid.Info.NetLuidIndex ); + ok( !luid.Info.IfType, "got %u\n", luid.Info.IfType ); + + luid.Info.Reserved = luid.Info.NetLuidIndex = luid.Info.IfType = 0xdead; + ret = pConvertInterfaceIndexToLuid( index, &luid ); + ok( !ret, "got %u\n", ret ); + ok( !luid.Info.Reserved, "got %x\n", luid.Info.Reserved ); + ok( luid.Info.NetLuidIndex != 0xdead, "index not set\n" ); + ok( luid.Info.IfType == IF_TYPE_ETHERNET_CSMACD, "got %u\n", luid.Info.IfType ); + + /* ConvertInterfaceLuidToIndex */ + ret = pConvertInterfaceLuidToIndex( NULL, NULL ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + + ret = pConvertInterfaceLuidToIndex( NULL, &index ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + + ret = pConvertInterfaceLuidToIndex( &luid, NULL ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + + ret = pConvertInterfaceLuidToIndex( &luid, &index ); + ok( !ret, "got %u\n", ret ); + + /* ConvertInterfaceLuidToGuid */ + ret = pConvertInterfaceLuidToGuid( NULL, NULL ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + + memset( &guid, 0xff, sizeof(guid) ); + ret = pConvertInterfaceLuidToGuid( NULL, &guid ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + ok( guid.Data1 == 0xffffffff, "got %x\n", guid.Data1 ); + + ret = pConvertInterfaceLuidToGuid( &luid, NULL ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + + memset( &guid, 0, sizeof(guid) ); + ret = pConvertInterfaceLuidToGuid( &luid, &guid ); + ok( !ret, "got %u\n", ret ); + ok( guid.Data1, "got %x\n", guid.Data1 ); + + /* ConvertInterfaceGuidToLuid */ + ret = pConvertInterfaceGuidToLuid( NULL, NULL ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + + luid.Info.NetLuidIndex = 1; + ret = pConvertInterfaceGuidToLuid( NULL, &luid ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + ok( luid.Info.NetLuidIndex == 1, "got %u\n", luid.Info.NetLuidIndex ); + + ret = pConvertInterfaceGuidToLuid( &guid, NULL ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + + luid.Info.Reserved = luid.Info.NetLuidIndex = luid.Info.IfType = 0xdead; + ret = pConvertInterfaceGuidToLuid( &guid, &luid ); + ok( !ret, "got %u\n", ret ); + ok( !luid.Info.Reserved, "got %x\n", luid.Info.Reserved ); + ok( luid.Info.NetLuidIndex != 0xdead, "index not set\n" ); + ok( luid.Info.IfType == IF_TYPE_ETHERNET_CSMACD, "got %u\n", luid.Info.IfType ); + + /* ConvertInterfaceLuidToNameW */ + ret = pConvertInterfaceLuidToNameW( NULL, NULL, 0 ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + + ret = pConvertInterfaceLuidToNameW( &luid, NULL, 0 ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + + ret = pConvertInterfaceLuidToNameW( NULL, nameW, 0 ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + + ret = pConvertInterfaceLuidToNameW( &luid, nameW, 0 ); + ok( ret == ERROR_NOT_ENOUGH_MEMORY, "got %u\n", ret ); + + nameW[0] = 0; + len = sizeof(nameW)/sizeof(nameW[0]); + ret = pConvertInterfaceLuidToNameW( &luid, nameW, len ); + ok( !ret, "got %u\n", ret ); + ok( nameW[0], "name not set\n" ); + + /* ConvertInterfaceLuidToNameA */ + ret = pConvertInterfaceLuidToNameA( NULL, NULL, 0 ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + + ret = pConvertInterfaceLuidToNameA( &luid, NULL, 0 ); + ok( ret == ERROR_NOT_ENOUGH_MEMORY, "got %u\n", ret ); + + ret = pConvertInterfaceLuidToNameA( NULL, nameA, 0 ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + + ret = pConvertInterfaceLuidToNameA( &luid, nameA, 0 ); + ok( ret == ERROR_NOT_ENOUGH_MEMORY, "got %u\n", ret ); + + nameA[0] = 0; + len = sizeof(nameA)/sizeof(nameA[0]); + ret = pConvertInterfaceLuidToNameA( &luid, nameA, len ); + ok( !ret, "got %u\n", ret ); + ok( nameA[0], "name not set\n" ); + + /* ConvertInterfaceNameToLuidW */ + ret = pConvertInterfaceNameToLuidW( NULL, NULL ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + + luid.Info.Reserved = luid.Info.NetLuidIndex = luid.Info.IfType = 0xdead; + ret = pConvertInterfaceNameToLuidW( NULL, &luid ); + ok( ret == ERROR_INVALID_NAME, "got %u\n", ret ); + ok( !luid.Info.Reserved, "got %x\n", luid.Info.Reserved ); + ok( luid.Info.NetLuidIndex != 0xdead, "index not set\n" ); + ok( !luid.Info.IfType, "got %u\n", luid.Info.IfType ); + + ret = pConvertInterfaceNameToLuidW( nameW, NULL ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + + luid.Info.Reserved = luid.Info.NetLuidIndex = luid.Info.IfType = 0xdead; + ret = pConvertInterfaceNameToLuidW( nameW, &luid ); + ok( !ret, "got %u\n", ret ); + ok( !luid.Info.Reserved, "got %x\n", luid.Info.Reserved ); + ok( luid.Info.NetLuidIndex != 0xdead, "index not set\n" ); + ok( luid.Info.IfType == IF_TYPE_ETHERNET_CSMACD, "got %u\n", luid.Info.IfType ); + + /* ConvertInterfaceNameToLuidA */ + ret = pConvertInterfaceNameToLuidA( NULL, NULL ); + ok( ret == ERROR_INVALID_NAME, "got %u\n", ret ); + + luid.Info.Reserved = luid.Info.NetLuidIndex = luid.Info.IfType = 0xdead; + ret = pConvertInterfaceNameToLuidA( NULL, &luid ); + ok( ret == ERROR_INVALID_NAME, "got %u\n", ret ); + ok( luid.Info.Reserved == 0xdead, "reserved set\n" ); + ok( luid.Info.NetLuidIndex == 0xdead, "index set\n" ); + ok( luid.Info.IfType == 0xdead, "type set\n" ); + + ret = pConvertInterfaceNameToLuidA( nameA, NULL ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + + luid.Info.Reserved = luid.Info.NetLuidIndex = luid.Info.IfType = 0xdead; + ret = pConvertInterfaceNameToLuidA( nameA, &luid ); + ok( !ret, "got %u\n", ret ); + ok( !luid.Info.Reserved, "got %x\n", luid.Info.Reserved ); + ok( luid.Info.NetLuidIndex != 0xdead, "index not set\n" ); + ok( luid.Info.IfType == IF_TYPE_ETHERNET_CSMACD, "got %u\n", luid.Info.IfType ); +} + +static void test_GetIfEntry2(void) +{ + DWORD ret; + MIB_IF_ROW2 row; + NET_IFINDEX index; + + if (!pGetIfEntry2) + { + win_skip( "GetIfEntry2 not available\n" ); + return; + } + if (!(index = get_interface_index())) + { + skip( "no suitable interface found\n" ); + return; + } + + ret = pGetIfEntry2( NULL ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + + memset( &row, 0, sizeof(row) ); + ret = pGetIfEntry2( &row ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + + memset( &row, 0, sizeof(row) ); + row.InterfaceIndex = index; + ret = pGetIfEntry2( &row ); + ok( ret == NO_ERROR, "got %u\n", ret ); + ok( row.InterfaceIndex == index, "got %u\n", index ); +} + +static void test_GetIfTable2(void) +{ + DWORD ret; + MIB_IF_TABLE2 *table; + + if (!pGetIfTable2) + { + win_skip( "GetIfTable2 not available\n" ); + return; + } + + table = NULL; + ret = pGetIfTable2( &table ); + ok( ret == NO_ERROR, "got %u\n", ret ); + ok( table != NULL, "table not set\n" ); + pFreeMibTable( table ); } START_TEST(iphlpapi) @@ -997,6 +1917,12 @@ testWin2KFunctions(); test_GetAdaptersAddresses(); + test_GetExtendedTcpTable(); + test_GetExtendedUdpTable(); + test_CreateSortedAddressPairs(); + test_interface_identifier_conversion(); + test_GetIfEntry2(); + test_GetIfTable2(); freeIPHlpApi(); } }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs