Ros-diffs April 2010

ros-diffs@reactos.org

22 participants
435 discussions

[tkreuzer] 46947: [NTDLL_WINETEST] - Skip broken tests
by tkreuzer＠svn.reactos.org 19 Apr '10

19 Apr '10

Author: tkreuzer Date: Mon Apr 19 21:43:18 2010 New Revision: 46947 URL: http://svn.reactos.org/svn/reactos?rev=46947&view=rev Log: [NTDLL_WINETEST] - Skip broken tests Modified: trunk/rostests/winetests/ntdll/file.c Modified: trunk/rostests/winetests/ntdll/file.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/file.c?re… ============================================================================== --- trunk/rostests/winetests/ntdll/file.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/file.c [iso-8859-1] Mon Apr 19 21:43:18 2010 @@ -1473,7 +1473,8 @@ pNtQueryDirectoryFile = (void *)GetProcAddress(hntdll, "NtQueryDirectoryFile"); create_file_test(); - open_file_test(); + ok(0, "broken test: open_file_test\n"); + //open_file_test(); delete_file_test(); read_file_test(); nt_mailslot_test(); @@ -1482,5 +1483,6 @@ test_file_all_information(); test_file_both_information(); test_file_name_information(); - test_file_all_name_information(); -} + ok(0, "broken test: test_file_all_name_information \n"); + //test_file_all_name_information(); +}

1 0

[tkreuzer] 46946: Patch by Jerome Gardou: add a bunch of tests for NtGdiBitBlt
by tkreuzer＠svn.reactos.org 19 Apr '10

19 Apr '10

Author: tkreuzer Date: Mon Apr 19 19:52:56 2010 New Revision: 46946 URL: http://svn.reactos.org/svn/reactos?rev=46946&view=rev Log: Patch by Jerome Gardou: add a bunch of tests for NtGdiBitBlt Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiBitBlt.c Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiBitBlt.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiBitBlt.c [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiBitBlt.c [iso-8859-1] Mon Apr 19 19:52:56 2010 @@ -3,6 +3,10 @@ Test_NtGdiBitBlt(PTESTINFO pti) { BOOL bRet; + HDC hdc1, hdc2; + HBITMAP hbmp1, hOldBmp1, hbmp2, hOldBmp2; + DWORD bytes1[4] = {0x00ff0000, 0x0000ff00, 0x000000ff, 0x00ffffff}; + DWORD bytes2[4] = {0x00000000, 0x0000000, 0x0000000, 0x00000000}; /* Test NULL dc */ SetLastError(ERROR_SUCCESS); @@ -15,6 +19,71 @@ bRet = NtGdiBitBlt((HDC)0x123456, 0, 0, 10, 10, (HDC)0x123456, 10, 10, SRCCOPY, 0, 0); TEST(bRet == FALSE); TEST(GetLastError() == ERROR_SUCCESS); + + hdc1 = NtGdiCreateCompatibleDC(0); + TEST(hdc1 != NULL); + + hdc2 = NtGdiCreateCompatibleDC(0); + TEST(hdc2 != NULL); + + hbmp1 = NtGdiCreateBitmap(2, 2, 1, 32, (LPBYTE)bytes1 ); + TEST(hbmp1 != NULL); + hOldBmp1 = SelectObject(hdc1, hbmp1); + + hbmp2 = NtGdiCreateBitmap(2, 2, 1, 32, (LPBYTE)bytes2 ); + TEST(hbmp2 != NULL); + hOldBmp2 = SelectObject(hdc2, hbmp2); + + bRet = NtGdiBitBlt(hdc2, 1, 1, -2, -2, hdc1, 0, 0, SRCCOPY, 0, 0); + TEST(bRet == TRUE); + TEST(GetLastError() == ERROR_SUCCESS); + TESTX(NtGdiGetPixel(hdc2, 0, 0) == 0x00000000, "Pixel[0][0] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 0, 0)); + TESTX(NtGdiGetPixel(hdc2, 0, 1) == 0x00000000, "Pixel[0][1] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 0, 1)); + TESTX(NtGdiGetPixel(hdc2, 1, 0) == 0x00000000, "Pixel[1][0] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 1, 0)); + TESTX(NtGdiGetPixel(hdc2, 1, 1) == 0x00000000, "Pixel[1][1] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 1, 1)); + + bRet = NtGdiBitBlt(hdc2, 1, 1, -2, -2, hdc1, 1, 1, SRCCOPY, 0, 0); + TEST(bRet == TRUE); + TEST(GetLastError() == ERROR_SUCCESS); + TESTX(NtGdiGetPixel(hdc2, 0, 0) == 0x000000ff, "Pixel[0][0] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 0, 0)); + TESTX(NtGdiGetPixel(hdc2, 0, 1) == 0x00000000, "Pixel[0][1] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 0, 1)); + TESTX(NtGdiGetPixel(hdc2, 1, 0) == 0x00000000, "Pixel[1][0] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 1, 0)); + TESTX(NtGdiGetPixel(hdc2, 1, 1) == 0x00000000, "Pixel[1][1] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 1, 1)); + + NtGdiSetPixel(hdc2, 0, 0, 0x00000000); + + bRet = NtGdiBitBlt(hdc2, 1, 1, -2, -2, hdc1, 0, 0, SRCCOPY, 0, 0); + TEST(bRet == TRUE); + TEST(GetLastError() == ERROR_SUCCESS); + TESTX(NtGdiGetPixel(hdc2, 0, 0) == 0x00000000, "Pixel[0][0] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 0, 0)); + TESTX(NtGdiGetPixel(hdc2, 0, 1) == 0x00000000, "Pixel[0][1] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 0, 1)); + TESTX(NtGdiGetPixel(hdc2, 1, 0) == 0x00000000, "Pixel[1][0] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 1, 0)); + TESTX(NtGdiGetPixel(hdc2, 1, 1) == 0x00000000, "Pixel[1][1] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 1, 1)); + + bRet = NtGdiBitBlt(hdc2, 1, 1, -2, -2, hdc1, 2, 2, SRCCOPY, 0, 0); + TEST(bRet == TRUE); + TEST(GetLastError() == ERROR_SUCCESS); + TESTX(NtGdiGetPixel(hdc2, 0, 0) == 0x00ffffff, "Pixel[0][0] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 0, 0)); + TESTX(NtGdiGetPixel(hdc2, 0, 1) == 0x00000000, "Pixel[0][1] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 0, 1)); + TESTX(NtGdiGetPixel(hdc2, 1, 0) == 0x00000000, "Pixel[1][0] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 1, 0)); + TESTX(NtGdiGetPixel(hdc2, 1, 1) == 0x00000000, "Pixel[1][1] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 1, 1)); + + bRet = NtGdiBitBlt(hdc2, 2, 2, -2, -2, hdc1, 2, 2, SRCCOPY, 0, 0); + TEST(bRet == TRUE); + TEST(GetLastError() == ERROR_SUCCESS); + TESTX(NtGdiGetPixel(hdc2, 0, 0) == 0x000000ff, "Pixel[0][0] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 0, 0)); + TESTX(NtGdiGetPixel(hdc2, 0, 1) == 0x00ff0000, "Pixel[0][1] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 0, 1)); + TESTX(NtGdiGetPixel(hdc2, 1, 0) == 0x0000ff00, "Pixel[1][0] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 1, 0)); + TESTX(NtGdiGetPixel(hdc2, 1, 1) == 0x00ffffff, "Pixel[1][1] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 1, 1)); + + SelectObject(hdc2, hOldBmp2); + SelectObject(hdc1, hOldBmp1); + + DeleteObject(hbmp2); + DeleteObject(hbmp1); + + DeleteDC(hdc1); + DeleteDC(hdc2); return APISTATUS_NORMAL; }

1 0

[tkreuzer] 46945: Merge changes to ketypes.h and ntimage.h from the last revert back.
by tkreuzer＠svn.reactos.org 19 Apr '10

19 Apr '10

Author: tkreuzer Date: Mon Apr 19 19:30:34 2010 New Revision: 46945 URL: http://svn.reactos.org/svn/reactos?rev=46945&view=rev Log: Merge changes to ketypes.h and ntimage.h from the last revert back. Modified: trunk/reactos/include/ddk/ntddk.h trunk/reactos/include/ddk/ntimage.h trunk/reactos/include/ddk/wdm.h trunk/reactos/include/ndk/ketypes.h Modified: trunk/reactos/include/ddk/ntddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddk.h?rev=46… ============================================================================== --- trunk/reactos/include/ddk/ntddk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntddk.h [iso-8859-1] Mon Apr 19 19:30:34 2010 @@ -71,6 +71,19 @@ typedef struct _BUS_HANDLER *PBUS_HANDLER; typedef struct _PEB *PPEB; + +#ifndef _NTIMAGE_ + +typedef struct _IMAGE_NT_HEADERS *PIMAGE_NT_HEADERS32; +typedef struct _IMAGE_NT_HEADERS64 *PIMAGE_NT_HEADERS64; + +#ifdef _WIN64 +typedef PIMAGE_NT_HEADERS64 PIMAGE_NT_HEADERS; +#else +typedef PIMAGE_NT_HEADERS32 PIMAGE_NT_HEADERS; +#endif + +#endif /* _NTIMAGE_ */ #define EXCEPTION_READ_FAULT 0 #define EXCEPTION_WRITE_FAULT 1 Modified: trunk/reactos/include/ddk/ntimage.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntimage.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/ntimage.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntimage.h [iso-8859-1] Mon Apr 19 19:30:34 2010 @@ -394,21 +394,32 @@ ULONG Signature; IMAGE_FILE_HEADER FileHeader; IMAGE_OPTIONAL_HEADER64 OptionalHeader; -} IMAGE_NT_HEADERS64, *PIMAGE_NT_HEADERS64; +} IMAGE_NT_HEADERS64; typedef struct _IMAGE_NT_HEADERS { ULONG Signature; IMAGE_FILE_HEADER FileHeader; IMAGE_OPTIONAL_HEADER32 OptionalHeader; -} IMAGE_NT_HEADERS32, *PIMAGE_NT_HEADERS32; +} IMAGE_NT_HEADERS32; #ifdef _WIN64 typedef IMAGE_NT_HEADERS64 IMAGE_NT_HEADERS; +#else +typedef IMAGE_NT_HEADERS32 IMAGE_NT_HEADERS; +#endif + +#ifndef _NTDDK_ + +typedef struct _IMAGE_NT_HEADERS *PIMAGE_NT_HEADERS32; +typedef struct _IMAGE_NT_HEADERS64 *PIMAGE_NT_HEADERS64; + +#ifdef _WIN64 typedef PIMAGE_NT_HEADERS64 PIMAGE_NT_HEADERS; #else -typedef IMAGE_NT_HEADERS32 IMAGE_NT_HEADERS; typedef PIMAGE_NT_HEADERS32 PIMAGE_NT_HEADERS; #endif + +#endif /* _NTDDK_ */ // // Retreives the first image section header from the Nt Header Modified: trunk/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=4694… ============================================================================== --- trunk/reactos/include/ddk/wdm.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/wdm.h [iso-8859-1] Mon Apr 19 19:30:34 2010 @@ -514,6 +514,34 @@ #if (NTDDI_VERSION < NTDDI_WIN7) || defined(_X86_) || !defined(NT_PROCESSOR_GROUPS) #define SINGLE_GROUP_LEGACY_API 1 #endif + +#define SEMAPHORE_QUERY_STATE (0x0001) +#define SEMAPHORE_MODIFY_STATE (0x0002) +#define SEMAPHORE_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | 0x3) + +typedef enum _LOGICAL_PROCESSOR_RELATIONSHIP { + RelationProcessorCore, + RelationNumaNode, + RelationCache, + RelationProcessorPackage, + RelationGroup, + RelationAll = 0xffff +} LOGICAL_PROCESSOR_RELATIONSHIP; + +typedef enum _PROCESSOR_CACHE_TYPE { + CacheUnified, + CacheInstruction, + CacheData, + CacheTrace +} PROCESSOR_CACHE_TYPE; + +typedef struct _CACHE_DESCRIPTOR { + UCHAR Level; + UCHAR Associativity; + USHORT LineSize; + ULONG Size; + PROCESSOR_CACHE_TYPE Type; +} CACHE_DESCRIPTOR, *PCACHE_DESCRIPTOR; /* Processor features */ #define PF_FLOATING_POINT_PRECISION_ERRATA 0 @@ -12580,10 +12608,6 @@ #define EVENT_MODIFY_STATE (0x0002) #define EVENT_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | 0x3) -#define SEMAPHORE_QUERY_STATE (0x0001) -#define SEMAPHORE_MODIFY_STATE (0x0002) -#define SEMAPHORE_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | 0x3) - #define SYMBOLIC_LINK_QUERY 0x0001 #define SYMBOLIC_LINK_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | 0x1) Modified: trunk/reactos/include/ndk/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ketypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/ketypes.h [iso-8859-1] Mon Apr 19 19:30:34 2010 @@ -547,17 +547,6 @@ } KAPC_ENVIRONMENT; // -// CPU Cache Types -// -typedef enum _PROCESSOR_CACHE_TYPE -{ - CacheUnified, - CacheInstruction, - CacheData, - CacheTrace, -} PROCESSOR_CACHE_TYPE; - -// // PRCB DPC Data // typedef struct _KDPC_DATA @@ -576,18 +565,6 @@ struct _GENERAL_LOOKASIDE *P; struct _GENERAL_LOOKASIDE *L; } PP_LOOKASIDE_LIST, *PPP_LOOKASIDE_LIST; - -// -// CPU Cache Descriptor -// -typedef struct _CACHE_DESCRIPTOR -{ - UCHAR Level; - UCHAR Associativity; - USHORT LineSize; - ULONG Size; - PROCESSOR_CACHE_TYPE Type; -} CACHE_DESCRIPTOR, *PCACHE_DESCRIPTOR; // // Architectural Types

1 0

[akhaldi] 46944: [DDK] - Move nettypes.h to PSDK, introduce pragma once and apply a consistent formatting. - Remove newdev.h from DDK (it's already in PSDK). - ndisguid.h and ndiswan.h : Introduce pragma once, apply a consistent formatting and add some missing definitions. - netpnp.h : Introduce pragma once, apply a consistent formatting and mark NDIS_DEVICE_PNP_EVENT with a FIXME indicating that it belongs to ndis.h [PSDK] - newdev.h : Introduce pragma once, apply a consistent formatting, add m
by akhaldi＠svn.reactos.org 19 Apr '10

19 Apr '10

Author: akhaldi Date: Mon Apr 19 18:18:04 2010 New Revision: 46944 URL: http://svn.reactos.org/svn/reactos?rev=46944&view=rev Log: [DDK] - Move nettypes.h to PSDK, introduce pragma once and apply a consistent formatting. - Remove newdev.h from DDK (it's already in PSDK). - ndisguid.h and ndiswan.h : Introduce pragma once, apply a consistent formatting and add some missing definitions. - netpnp.h : Introduce pragma once, apply a consistent formatting and mark NDIS_DEVICE_PNP_EVENT with a FIXME indicating that it belongs to ndis.h [PSDK] - newdev.h : Introduce pragma once, apply a consistent formatting, add missing setupapi.h inclusion along with some missing definitions and guard them with the appropriate WINVER. Added: branches/header-work/include/psdk/nettypes.h - copied, changed from r46874, branches/header-work/include/ddk/nettypes.h Removed: branches/header-work/include/ddk/nettypes.h branches/header-work/include/ddk/newdev.h Modified: branches/header-work/include/ddk/ndisguid.h branches/header-work/include/ddk/ndiswan.h branches/header-work/include/ddk/netpnp.h branches/header-work/include/psdk/newdev.h Modified: branches/header-work/include/ddk/ndisguid.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/ndisgui… ============================================================================== --- branches/header-work/include/ddk/ndisguid.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/ndisguid.h [iso-8859-1] Mon Apr 19 18:18:04 2010 @@ -20,421 +20,195 @@ * */ -#ifndef __NDISGUID_H -#define __NDISGUID_H +#pragma once #include <initguid.h> - #ifdef __cplusplus extern "C" { #endif -DEFINE_GUID(GUID_DEVINTERFACE_NET, - 0xcac88484, 0x7515, 0x4c03, 0x82, 0xe6, 0x71, 0xa8, 0x7a, 0xba, 0xc3, 0x61); - -DEFINE_GUID(GUID_NDIS_LAN_CLASS, - 0xad498944, 0x762f, 0x11d0, 0x8d, 0xcb, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_ENUMERATE_ADAPTER, - 0x981f2d7f, 0xb1f3, 0x11d0, 0x8d, 0xd7, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_ENUMERATE_VC, - 0x981f2d82, 0xb1f3, 0x11d0, 0x8d, 0xd7, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_NOTIFY_ADAPTER_ARRIVAL, - 0x981f2d81, 0xb1f3, 0x11d0, 0x8d, 0xd7, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_NOTIFY_ADAPTER_REMOVAL, - 0x981f2d80, 0xb1f3, 0x11d0, 0x8d, 0xd7, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_NOTIFY_VC_ARRIVAL, - 0x182f9e0c, 0xb1f3, 0x11d0, 0x8d, 0xd7, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_NOTIFY_VC_REMOVAL, - 0x981f2d79, 0xb1f3, 0x11d0, 0x8d, 0xd7, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_NOTIFY_BIND, - 0x5413531c, 0xb1f3, 0x11d0, 0x8d, 0xd7, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_NOTIFY_UNBIND, - 0x6e3ce1ec, 0xb1f3, 0x11d0, 0x8d, 0xd7, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_WAKE_ON_MAGIC_PACKET_ONLY, - 0xa14f1c97, 0x8839, 0x4f8a, 0x99, 0x96, 0xa2, 0x89, 0x96, 0xeb, 0xbf, 0x1d); - - -DEFINE_GUID(GUID_NDIS_802_3_CURRENT_ADDRESS, - 0x44795700, 0xa61b, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_802_3_MAC_OPTIONS, - 0x44795703, 0xa61b, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_802_3_MAXIMUM_LIST_SIZE, - 0x44795702, 0xa61b, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_802_3_MULTICAST_LIST, - 0x44795701, 0xa61b, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_802_3_PERMANENT_ADDRESS, - 0x447956ff, 0xa61b, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_802_3_RCV_ERROR_ALIGNMENT, - 0x44795704, 0xa61b, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_802_3_XMIT_MORE_COLLISIONS, - 0x44795706, 0xa61b, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_802_3_XMIT_ONE_COLLISION, - 0x44795705, 0xa61b, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_802_5_CURRENT_ADDRESS, - 0x44795708, 0xa61b, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_802_5_CURRENT_FUNCTIONAL, - 0x44795709, 0xa61b, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_802_5_CURRENT_GROUP, - 0x4479570a, 0xa61b, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_802_5_CURRENT_RING_STATE, - 0xacf14032, 0xa61c, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_802_5_CURRENT_RING_STATUS, - 0x890a36ec, 0xa61c, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_802_5_LAST_OPEN_STATUS, - 0x4479570b, 0xa61b, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_802_5_PERMANENT_ADDRESS, - 0x44795707, 0xa61b, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_802_5_LINE_ERRORS, - 0xacf14033, 0xa61c, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_802_5_LOST_FRAMES, - 0xacf14034, 0xa61c, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - - -DEFINE_GUID(GUID_NDIS_802_11_ADD_WEP, - 0x4307bff0, 0x2129, 0x11d4, 0x97, 0xeb, 0x00, 0xc0, 0x4f, 0x79, 0xc4, 0x03); - -DEFINE_GUID(GUID_NDIS_802_11_AUTHENTICATION_MODE, - 0x43920a24, 0x2129, 0x11d4, 0x97, 0xeb, 0x00, 0xc0, 0x4f, 0x79, 0xc4, 0x03); - -DEFINE_GUID(GUID_NDIS_802_11_BSSID, - 0x2504b6c2, 0x1fa5, 0x11d4, 0x97, 0xeb, 0x00, 0xc0, 0x4f, 0x79, 0xc4, 0x03); - -DEFINE_GUID(GUID_NDIS_802_11_BSSID_LIST, - 0x69526f9a, 0x2062, 0x11d4, 0x97, 0xeb, 0x00, 0xc0, 0x4f, 0x79, 0xc4, 0x03); - -DEFINE_GUID(GUID_NDIS_802_11_BASIC_RATES, - 0x4a198516, 0x2068, 0x11d4, 0x97, 0xeb, 0x00, 0xc0, 0x4f, 0x79, 0xc4, 0x03); - -DEFINE_GUID(GUID_NDIS_802_11_CONFIGURATION, - 0x4a4df982, 0x2068, 0x11d4, 0x97, 0xeb, 0x00, 0xc0, 0x4f, 0x79, 0xc4, 0x03); - -DEFINE_GUID(GUID_NDIS_802_11_DESIRED_RATES, - 0x452ee08e, 0x2536, 0x11d4, 0x97, 0xeb, 0x00, 0xc0, 0x4f, 0x79, 0xc4, 0x03); - -DEFINE_GUID(GUID_NDIS_802_11_DISASSOCIATE, - 0x43671f40, 0x2129, 0x11d4, 0x97, 0xeb, 0x00, 0xc0, 0x4f, 0x79, 0xc4, 0x03); - -DEFINE_GUID(GUID_NDIS_802_11_FRAGMENTATION_THRESHOLD, - 0x69aaa7c4, 0x2062, 0x11d4, 0x97, 0xeb, 0x00, 0xc0, 0x4f, 0x79, 0xc4, 0x03); - -DEFINE_GUID(GUID_NDIS_802_11_INFRASTRUCTURE_MODE, - 0x697d5a7e, 0x2062, 0x11d4, 0x97, 0xeb, 0x00, 0xc0, 0x4f, 0x79, 0xc4, 0x03); - -DEFINE_GUID(GUID_NDIS_802_11_NETWORK_TYPES_SUPPORTED, - 0x8531d6e6, 0x2041, 0x11d4, 0x97, 0xeb, 0x00, 0xc0, 0x4f, 0x79, 0xc4, 0x03); - -DEFINE_GUID(GUID_NDIS_802_11_NETWORK_TYPE_IN_USE, - 0x857e2326, 0x2041, 0x11d4, 0x97, 0xeb, 0x00, 0xc0, 0x4f, 0x79, 0xc4, 0x03); - -DEFINE_GUID(GUID_NDIS_802_11_NUMBER_OF_ANTENNAS, - 0x01779336, 0x2064, 0x11d4, 0x97, 0xeb, 0x00, 0xc0, 0x4f, 0x79, 0xc4, 0x03); - -DEFINE_GUID(GUID_NDIS_802_11_POWER_MODE, - 0x85be837c, 0x2041, 0x11d4, 0x97, 0xeb, 0x00, 0xc0, 0x4f, 0x79, 0xc4, 0x03); - -DEFINE_GUID(GUID_NDIS_802_11_RATES_SUPPORTED, - 0x49db8722, 0x2068, 0x11d4, 0x97, 0xeb, 0x00, 0xc0, 0x4f, 0x79, 0xc4, 0x03); - -DEFINE_GUID(GUID_NDIS_802_11_REMOVE_WEP, - 0x433c345c, 0x2129, 0x11d4, 0x97, 0xeb, 0x00, 0xc0, 0x4f, 0x79, 0xc4, 0x03); - -DEFINE_GUID(GUID_NDIS_802_11_PRIVACY_FILTER, - 0x6733c4e9, 0x4792, 0x11d4, 0x97, 0xf1, 0x00, 0xc0, 0x4f, 0x79, 0xc4, 0x03); - -DEFINE_GUID(GUID_NDIS_802_11_RSSI, - 0x1507db16, 0x2053, 0x11d4, 0x97, 0xeb, 0x00, 0xc0, 0x4f, 0x79, 0xc4, 0x03); - -DEFINE_GUID(GUID_NDIS_802_11_RSSI_TRIGGER, - 0x155689b8, 0x2053, 0x11d4, 0x97, 0xeb, 0x00, 0xc0, 0x4f, 0x79, 0xc4, 0x03); - -DEFINE_GUID(GUID_NDIS_802_11_RTS_THRESHOLD, - 0x0134d07e, 0x2064, 0x11d4, 0x97, 0xeb, 0x00, 0xc0, 0x4f, 0x79, 0xc4, 0x03); - -DEFINE_GUID(GUID_NDIS_802_11_RX_ANTENNA_SELECTED, - 0x01ac07a2, 0x2064, 0x11d4, 0x97, 0xeb, 0x00, 0xc0, 0x4f, 0x79, 0xc4, 0x03); - -DEFINE_GUID(GUID_NDIS_802_11_SSID, - 0x7d2a90ea, 0x2041, 0x11d4, 0x97, 0xeb, 0x00, 0xc0, 0x4f, 0x79, 0xc4, 0x03); - -DEFINE_GUID(GUID_NDIS_802_11_STATISTICS, - 0x42bb73b0, 0x2129, 0x11d4, 0x97, 0xeb, 0x00, 0xc0, 0x4f, 0x79, 0xc4, 0x03); - -DEFINE_GUID(GUID_NDIS_802_11_TX_POWER_LEVEL, - 0x11e6ba76, 0x2053, 0x11d4, 0x97, 0xeb, 0x00, 0xc0, 0x4f, 0x79, 0xc4, 0x03); - -DEFINE_GUID(GUID_NDIS_802_11_TX_ANTENNA_SELECTED, - 0x01dbb74a, 0x2064, 0x11d4, 0x97, 0xeb, 0x00, 0xc0, 0x4f, 0x79, 0xc4, 0x03); - - -DEFINE_GUID(GUID_NDIS_ATM_HW_CURRENT_ADDRESS, - 0x791ad1a1, 0xe35c, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_ATM_MAX_AAL0_PACKET_SIZE, - 0x791ad1a5, 0xe35c, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_ATM_MAX_AAL1_PACKET_SIZE, - 0x791ad1a6, 0xe35c, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_ATM_MAX_AAL34_PACKET_SIZE, - 0x791ad1a7, 0xe35c, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_ATM_MAX_AAL5_PACKET_SIZE, - 0x791ad191, 0xe35c, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_ATM_MAX_ACTIVE_VCI_BITS, - 0x791ad1a3, 0xe35c, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_ATM_MAX_ACTIVE_VCS, - 0x791ad1a2, 0xe35c, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_ATM_MAX_ACTIVE_VPI_BITS, - 0x791ad1a4, 0xe35c, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_ATM_SUPPORTED_AAL_TYPES, - 0x791ad1a0, 0xe35c, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_ATM_SUPPORTED_SERVICE_CATEGORY, - 0x791ad19f, 0xe35c, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_ATM_SUPPORTED_VC_RATES, - 0x791ad19e, 0xe35c, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - - -DEFINE_GUID(GUID_NDIS_ATM_RCV_CELLS_DROPPED, - 0x0a21480c, 0xe35f, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_ATM_RCV_CELLS_OK, - 0x0a21480a, 0xe35f, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_ATM_XMIT_CELLS_OK, - 0x0a21480b, 0xe35f, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - - -DEFINE_GUID(GUID_NDIS_FDDI_LONG_CURRENT_ADDR, - 0xacf14036, 0xa61c, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_FDDI_LONG_MAX_LIST_SIZE, - 0xacf14038, 0xa61c, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_FDDI_LONG_MULTICAST_LIST, - 0xacf14037, 0xa61c, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_FDDI_LONG_PERMANENT_ADDR, - 0xacf14035, 0xa61c, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_FDDI_SHORT_CURRENT_ADDR, - 0xacf1403a, 0xa61c, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_FDDI_SHORT_MAX_LIST_SIZE, - 0xacf1403c, 0xa61c, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_FDDI_SHORT_MULTICAST_LIST, - 0xacf1403b, 0xa61c, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_FDDI_SHORT_PERMANENT_ADDR, - 0xacf14039, 0xa61c, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - - -DEFINE_GUID(GUID_NDIS_FDDI_ATTACHMENT_TYPE, - 0xacf1403d, 0xa61c, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_FDDI_DOWNSTREAM_NODE_LONG, - 0xacf1403f, 0xa61c, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_FDDI_FRAME_ERRORS, - 0xacf14040, 0xa61c, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_FDDI_FRAMES_LOST, - 0xacf14041, 0xa61c, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_FDDI_LCT_FAILURES, - 0xacf14043, 0xa61c, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_FDDI_LCONNECTION_STATE, - 0xacf14045, 0xa61c, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_FDDI_LEM_REJECTS, - 0xacf14044, 0xa61c, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_FDDI_RING_MGT_STATE, - 0xacf14042, 0xa61c, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_FDDI_UPSTREAM_NODE_LONG, - 0xacf1403e, 0xa61c, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - - -DEFINE_GUID(GUID_NDIS_GEN_CURRENT_LOOKAHEAD, - 0x5ec10361, 0xa61a, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_GEN_CURRENT_PACKET_FILTER, - 0x5ec10360, 0xa61a, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_GEN_DRIVER_VERSION, - 0x5ec10362, 0xa61a, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_GEN_HARDWARE_STATUS, - 0x5ec10354, 0xa61a, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_GEN_MEDIA_IN_USE, - 0x5ec10356, 0xa61a, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_GEN_MEDIA_SUPPORTED, - 0x5ec10355, 0xa61a, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_GEN_LINK_SPEED, - 0x5ec10359, 0xa61a, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_GEN_MAC_OPTIONS, - 0x5ec10365, 0xa61a, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_GEN_MAXIMUM_LOOKAHEAD, - 0x5ec10357, 0xa61a, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_GEN_MAXIMUM_FRAME_SIZE, - 0x5ec10358, 0xa61a, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_GEN_MAXIMUM_SEND_PACKETS, - 0x5ec10367, 0xa61a, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_GEN_MAXIMUM_TOTAL_SIZE, - 0x5ec10363, 0xa61a, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_GEN_MEDIA_CONNECT_STATUS, - 0x5ec10366, 0xa61a, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_GEN_RECEIVE_BLOCK_SIZE, - 0x5ec1035d, 0xa61a, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_GEN_RECEIVE_BUFFER_SPACE, - 0x5ec1035b, 0xa61a, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_GEN_TRANSMIT_BUFFER_SPACE, - 0x5ec1035a, 0xa61a, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_GEN_TRANSMIT_BLOCK_SIZE, - 0x5ec1035c, 0xa61a, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_GEN_VENDOR_DESCRIPTION, - 0x5ec1035f, 0xa61a, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_GEN_VENDOR_DRIVER_VERSION, - 0x447956f9, 0xa61b, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_GEN_VENDOR_ID, - 0x5ec1035e, 0xa61a, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - - -DEFINE_GUID(GUID_NDIS_GEN_RCV_ERROR, - 0x447956fd, 0xa61b, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_GEN_RCV_NO_BUFFER, - 0x447956fe, 0xa61b, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_GEN_RCV_OK, - 0x447956fb, 0xa61b, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_GEN_XMIT_ERROR, - 0x447956fc, 0xa61b, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_GEN_XMIT_OK, - 0x447956fa, 0xa61b, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - - -DEFINE_GUID(GUID_NDIS_GEN_CO_DRIVER_VERSION, - 0x791ad198, 0xe35c, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_GEN_CO_HARDWARE_STATUS, - 0x791ad192, 0xe35c, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_GEN_CO_LINK_SPEED, - 0x791ad195, 0xe35c, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_GEN_CO_MAC_OPTIONS, - 0x791ad19a, 0xe35c, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_GEN_CO_MEDIA_SUPPORTED, - 0x791ad193, 0xe35c, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_GEN_CO_MEDIA_IN_USE, - 0x791ad194, 0xe35c, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_GEN_CO_MEDIA_CONNECT_STATUS, - 0x791ad19b, 0xe35c, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_GEN_CO_MINIMUM_LINK_SPEED, - 0x791ad19d, 0xe35c, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_GEN_CO_VENDOR_DESCRIPTION, - 0x791ad197, 0xe35c, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_GEN_CO_VENDOR_DRIVER_VERSION, - 0x791ad19c, 0xe35c, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_GEN_CO_VENDOR_ID, - 0x791ad196, 0xe35c, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - - -DEFINE_GUID(GUID_NDIS_GEN_CO_RCV_PDUS_ERROR, - 0x0a214808, 0xe35f, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_GEN_CO_RCV_PDUS_OK, - 0x0a214806, 0xe35f, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_GEN_CO_RCV_PDUS_NO_BUFFER, - 0x0a214809, 0xe35f, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_GEN_CO_XMIT_PDUS_ERROR, - 0x0a214807, 0xe35f, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_GEN_CO_XMIT_PDUS_OK, - 0x0a214805, 0xe35f, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - - -DEFINE_GUID(GUID_NDIS_STATUS_LINK_SPEED_CHANGE, - 0x981f2d85, 0xb1f3, 0x11d0, 0x8d, 0xd7, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_STATUS_MEDIA_CONNECT, - 0x981f2d7d, 0xb1f3, 0x11d0, 0x8d, 0xd7, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_STATUS_MEDIA_DISCONNECT, - 0x981f2d7e, 0xb1f3, 0x11d0, 0x8d, 0xd7, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_STATUS_MEDIA_SPECIFIC_INDICATION, - 0x981f2d84, 0xb1f3, 0x11d0, 0x8d, 0xd7, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_STATUS_RESET_END, - 0x981f2d77, 0xb1f3, 0x11d0, 0x8d, 0xd7, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); - -DEFINE_GUID(GUID_NDIS_STATUS_RESET_START, - 0x981f2d76, 0xb1f3, 0x11d0, 0x8d, 0xd7, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); +DEFINE_GUID(GUID_DEVINTERFACE_NET, 0xcac88484, 0x7515, 0x4c03, 0x82, 0xe6, 0x71, 0xa8, 0x7a, 0xba, 0xc3, 0x61); +DEFINE_GUID(GUID_NDIS_802_11_ADD_KEY, 0xab8b5a62, 0x1d51, 0x49d8, 0xba, 0x5c, 0xfa, 0x98, 0x0b, 0xe0, 0x3a, 0x1d); +DEFINE_GUID(GUID_NDIS_802_11_ADD_WEP, 0x4307bff0, 0x2129, 0x11d4, 0x97, 0xeb, 0x00, 0xc0, 0x4f, 0x79, 0xc4, 0x03); +DEFINE_GUID(GUID_NDIS_802_11_ASSOCIATION_INFORMATION, 0xa08d4dd0, 0x960e, 0x40bd, 0x8c, 0xf6, 0xc5, 0x38, 0xaf, 0x98, 0xf2, 0xe3); +DEFINE_GUID(GUID_NDIS_802_11_AUTHENTICATION_MODE, 0x43920a24, 0x2129, 0x11d4, 0x97, 0xeb, 0x00, 0xc0, 0x4f, 0x79, 0xc4, 0x03); +DEFINE_GUID(GUID_NDIS_802_11_BSSID, 0x2504b6c2, 0x1fa5, 0x11d4, 0x97, 0xeb, 0x00, 0xc0, 0x4f, 0x79, 0xc4, 0x03); +DEFINE_GUID(GUID_NDIS_802_11_BSSID_LIST, 0x69526f9a, 0x2062, 0x11d4, 0x97, 0xeb, 0x00, 0xc0, 0x4f, 0x79, 0xc4, 0x03); +DEFINE_GUID(GUID_NDIS_802_11_BSSID_LIST_SCAN, 0x0d9e01e1, 0xba70, 0x11d4, 0xb6, 0x75, 0x00, 0x20, 0x48, 0x57, 0x03, 0x37); +DEFINE_GUID(GUID_NDIS_802_11_CONFIGURATION, 0x4a4df982, 0x2068, 0x11d4, 0x97, 0xeb, 0x00, 0xc0, 0x4f, 0x79, 0xc4, 0x03); +DEFINE_GUID(GUID_NDIS_802_11_DESIRED_RATES, 0x452ee08e, 0x2536, 0x11d4, 0x97, 0xeb, 0x00, 0xc0, 0x4f, 0x79, 0xc4, 0x03); +DEFINE_GUID(GUID_NDIS_802_11_DISASSOCIATE, 0x43671f40, 0x2129, 0x11d4, 0x97, 0xeb, 0x00, 0xc0, 0x4f, 0x79, 0xc4, 0x03); +DEFINE_GUID(GUID_NDIS_802_11_FRAGMENTATION_THRESHOLD, 0x69aaa7c4, 0x2062, 0x11d4, 0x97, 0xeb, 0x00, 0xc0, 0x4f, 0x79, 0xc4, 0x03); +DEFINE_GUID(GUID_NDIS_802_11_INFRASTRUCTURE_MODE, 0x697d5a7e, 0x2062, 0x11d4, 0x97, 0xeb, 0x00, 0xc0, 0x4f, 0x79, 0xc4, 0x03); +DEFINE_GUID(GUID_NDIS_802_11_MEDIA_STREAM_MODE, 0x0a56af66, 0xd84b, 0x49eb, 0xa2, 0x8d, 0x52, 0x82, 0xcb, 0xb6, 0xd0, 0xcd); +DEFINE_GUID(GUID_NDIS_802_11_NETWORK_TYPES_SUPPORTED, 0x8531d6e6, 0x2041, 0x11d4, 0x97, 0xeb, 0x00, 0xc0, 0x4f, 0x79, 0xc4, 0x03); +DEFINE_GUID(GUID_NDIS_802_11_NETWORK_TYPE_IN_USE, 0x857e2326, 0x2041, 0x11d4, 0x97, 0xeb, 0x00, 0xc0, 0x4f, 0x79, 0xc4, 0x03); +DEFINE_GUID(GUID_NDIS_802_11_NUMBER_OF_ANTENNAS, 0x01779336, 0x2064, 0x11d4, 0x97, 0xeb, 0x00, 0xc0, 0x4f, 0x79, 0xc4, 0x03); +DEFINE_GUID(GUID_NDIS_802_11_POWER_MODE, 0x85be837c, 0x2041, 0x11d4, 0x97, 0xeb, 0x00, 0xc0, 0x4f, 0x79, 0xc4, 0x03); +DEFINE_GUID(GUID_NDIS_802_11_PRIVACY_FILTER, 0x6733c4e9, 0x4792, 0x11d4, 0x97, 0xf1, 0x00, 0xc0, 0x4f, 0x79, 0xc4, 0x03); +DEFINE_GUID(GUID_NDIS_802_11_RELOAD_DEFAULTS, 0x748b14e8, 0x32ee, 0x4425, 0xb9, 0x1b, 0xc9, 0x84, 0x8c, 0x58, 0xb5, 0x5a); +DEFINE_GUID(GUID_NDIS_802_11_REMOVE_KEY, 0x73cb28e9, 0x3188, 0x42d5, 0xb5, 0x53, 0xb2, 0x12, 0x37, 0xe6, 0x08, 0x8c); +DEFINE_GUID(GUID_NDIS_802_11_REMOVE_WEP, 0x433c345c, 0x2129, 0x11d4, 0x97, 0xeb, 0x00, 0xc0, 0x4f, 0x79, 0xc4, 0x03); +DEFINE_GUID(GUID_NDIS_802_11_RSSI, 0x1507db16, 0x2053, 0x11d4, 0x97, 0xeb, 0x00, 0xc0, 0x4f, 0x79, 0xc4, 0x03); +DEFINE_GUID(GUID_NDIS_802_11_RSSI_TRIGGER, 0x155689b8, 0x2053, 0x11d4, 0x97, 0xeb, 0x00, 0xc0, 0x4f, 0x79, 0xc4, 0x03); +DEFINE_GUID(GUID_NDIS_802_11_RTS_THRESHOLD, 0x0134d07e, 0x2064, 0x11d4, 0x97, 0xeb, 0x00, 0xc0, 0x4f, 0x79, 0xc4, 0x03); +DEFINE_GUID(GUID_NDIS_802_11_RX_ANTENNA_SELECTED, 0x01ac07a2, 0x2064, 0x11d4, 0x97, 0xeb, 0x00, 0xc0, 0x4f, 0x79, 0xc4, 0x03); +DEFINE_GUID(GUID_NDIS_802_11_SSID, 0x7d2a90ea, 0x2041, 0x11d4, 0x97, 0xeb, 0x00, 0xc0, 0x4f, 0x79, 0xc4, 0x03); +DEFINE_GUID(GUID_NDIS_802_11_STATISTICS, 0x42bb73b0, 0x2129, 0x11d4, 0x97, 0xeb, 0x00, 0xc0, 0x4f, 0x79, 0xc4, 0x03); +DEFINE_GUID(GUID_NDIS_802_11_SUPPORTED_RATES, 0x49db8722, 0x2068, 0x11d4, 0x97, 0xeb, 0x00, 0xc0, 0x4f, 0x79, 0xc4, 0x03); +DEFINE_GUID(GUID_NDIS_802_11_TEST, 0x4b9ca16a, 0x6a60, 0x4e9d, 0x92, 0x0c, 0x63, 0x35, 0x95, 0x3f, 0xa0, 0xb5); +DEFINE_GUID(GUID_NDIS_802_11_TX_ANTENNA_SELECTED, 0x01dbb74a, 0x2064, 0x11d4, 0x97, 0xeb, 0x00, 0xc0, 0x4f, 0x79, 0xc4, 0x03); +DEFINE_GUID(GUID_NDIS_802_11_TX_POWER_LEVEL, 0x11e6ba76, 0x2053, 0x11d4, 0x97, 0xeb, 0x00, 0xc0, 0x4f, 0x79, 0xc4, 0x03); +DEFINE_GUID(GUID_NDIS_802_11_WEP_STATUS, 0xb027a21f, 0x3cfa, 0x4125, 0x80, 0x0b, 0x3f, 0x7a, 0x18, 0xfd, 0xdc, 0xdc); +DEFINE_GUID(GUID_NDIS_802_3_CURRENT_ADDRESS, 0x44795700, 0xa61b, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); +DEFINE_GUID(GUID_NDIS_802_3_MAC_OPTIONS, 0x44795703, 0xa61b, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); +DEFINE_GUID(GUID_NDIS_802_3_MAXIMUM_LIST_SIZE, 0x44795702, 0xa61b, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); +DEFINE_GUID(GUID_NDIS_802_3_MULTICAST_LIST, 0x44795701, 0xa61b, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); +DEFINE_GUID(GUID_NDIS_802_3_PERMANENT_ADDRESS, 0x447956ff, 0xa61b, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); +DEFINE_GUID(GUID_NDIS_802_3_RCV_ERROR_ALIGNMENT, 0x44795704, 0xa61b, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); +DEFINE_GUID(GUID_NDIS_802_3_XMIT_MORE_COLLISIONS, 0x44795706, 0xa61b, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); +DEFINE_GUID(GUID_NDIS_802_3_XMIT_ONE_COLLISION, 0x44795705, 0xa61b, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); +DEFINE_GUID(GUID_NDIS_802_5_CURRENT_ADDRESS, 0x44795708, 0xa61b, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); +DEFINE_GUID(GUID_NDIS_802_5_CURRENT_FUNCTIONAL, 0x44795709, 0xa61b, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); +DEFINE_GUID(GUID_NDIS_802_5_CURRENT_GROUP, 0x4479570a, 0xa61b, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); +DEFINE_GUID(GUID_NDIS_802_5_CURRENT_RING_STATE, 0xacf14032, 0xa61c, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); +DEFINE_GUID(GUID_NDIS_802_5_CURRENT_RING_STATUS, 0x890a36ec, 0xa61c, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); +DEFINE_GUID(GUID_NDIS_802_5_LAST_OPEN_STATUS, 0x4479570b, 0xa61b, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); +DEFINE_GUID(GUID_NDIS_802_5_LINE_ERRORS, 0xacf14033, 0xa61c, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); +DEFINE_GUID(GUID_NDIS_802_5_LOST_FRAMES, 0xacf14034, 0xa61c, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); +DEFINE_GUID(GUID_NDIS_802_5_PERMANENT_ADDRESS, 0x44795707, 0xa61b, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); +DEFINE_GUID(GUID_NDIS_ENUMERATE_ADAPTER, 0x981f2d7f, 0xb1f3, 0x11d0, 0x8d, 0xd7, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); +DEFINE_GUID(GUID_NDIS_ENUMERATE_ADAPTERS_EX, 0x16716917, 0x4306, 0x4be4, 0x9b, 0x5a, 0x38, 0x09, 0xae, 0x44, 0xb1, 0x25); +DEFINE_GUID(GUID_NDIS_ENUMERATE_VC, 0x981f2d82, 0xb1f3, 0x11d0, 0x8d, 0xd7, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); +DEFINE_GUID(GUID_NDIS_GEN_CO_DRIVER_VERSION, 0x791ad198, 0xe35c, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); +DEFINE_GUID(GUID_NDIS_GEN_CO_HARDWARE_STATUS, 0x791ad192, 0xe35c, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); +DEFINE_GUID(GUID_NDIS_GEN_CO_LINK_SPEED, 0x791ad195, 0xe35c, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); +DEFINE_GUID(GUID_NDIS_GEN_CO_MAC_OPTIONS, 0x791ad19a, 0xe35c, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); +DEFINE_GUID(GUID_NDIS_GEN_CO_MEDIA_CONNECT_STATUS, 0x791ad19b, 0xe35c, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); +DEFINE_GUID(GUID_NDIS_GEN_CO_MEDIA_IN_USE, 0x791ad194, 0xe35c, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); +DEFINE_GUID(GUID_NDIS_GEN_CO_MEDIA_SUPPORTED, 0x791ad193, 0xe35c, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); +DEFINE_GUID(GUID_NDIS_GEN_CO_MINIMUM_LINK_SPEED, 0x791ad19d, 0xe35c, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); +DEFINE_GUID(GUID_NDIS_GEN_CO_RCV_PDUS_ERROR, 0x0a214808, 0xe35f, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); +DEFINE_GUID(GUID_NDIS_GEN_CO_RCV_PDUS_NO_BUFFER, 0x0a214809, 0xe35f, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); +DEFINE_GUID(GUID_NDIS_GEN_CO_RCV_PDUS_OK, 0x0a214806, 0xe35f, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); +DEFINE_GUID(GUID_NDIS_GEN_CO_VENDOR_DESCRIPTION, 0x791ad197, 0xe35c, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); +DEFINE_GUID(GUID_NDIS_GEN_CO_VENDOR_DRIVER_VERSION, 0x791ad19c, 0xe35c, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); +DEFINE_GUID(GUID_NDIS_GEN_CO_VENDOR_ID, 0x791ad196, 0xe35c, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); +DEFINE_GUID(GUID_NDIS_GEN_CO_XMIT_PDUS_ERROR, 0x0a214807, 0xe35f, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); +DEFINE_GUID(GUID_NDIS_GEN_CO_XMIT_PDUS_OK, 0x0a214805, 0xe35f, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); +DEFINE_GUID(GUID_NDIS_GEN_CURRENT_LOOKAHEAD, 0x5ec10361, 0xa61a, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); +DEFINE_GUID(GUID_NDIS_GEN_CURRENT_PACKET_FILTER, 0x5ec10360, 0xa61a, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); +DEFINE_GUID(GUID_NDIS_GEN_DRIVER_VERSION, 0x5ec10362, 0xa61a, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); +DEFINE_GUID(GUID_NDIS_GEN_ENUMERATE_PORTS, 0xf1d6abe8, 0x15e4, 0x4407, 0x81, 0xb7, 0x6b, 0x83, 0x0c, 0x77, 0x7c, 0xd9); +DEFINE_GUID(GUID_NDIS_GEN_HARDWARE_STATUS, 0x5ec10354, 0xa61a, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); +DEFINE_GUID(GUID_NDIS_GEN_INTERRUPT_MODERATION, 0xd9c8eea5, 0xf16e, 0x467c, 0x84, 0xd5, 0x63, 0x45, 0xa2, 0x2c, 0xe2, 0x13); +DEFINE_GUID(GUID_NDIS_GEN_INTERRUPT_MODERATION_PARAMETERS, 0xd789adfa, 0x9c56, 0x433b, 0xad, 0x01, 0x75, 0x74, 0xf3, 0xce, 0xdb, 0xe9); +DEFINE_GUID(GUID_NDIS_GEN_LINK_PARAMETERS, 0x8c7d3579, 0x252b, 0x4614, 0x82, 0xc5, 0xa6, 0x50, 0xda, 0xa1, 0x50, 0x49); +DEFINE_GUID(GUID_NDIS_GEN_LINK_SPEED, 0x5ec10359, 0xa61a, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); +DEFINE_GUID(GUID_NDIS_GEN_LINK_STATE, 0xba1f4c14, 0xa945, 0x4762, 0xb9, 0x16, 0x0b, 0x55, 0x15, 0xb6, 0xf4, 0x3a); +DEFINE_GUID(GUID_NDIS_GEN_MAC_OPTIONS, 0x5ec10365, 0xa61a, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); +DEFINE_GUID(GUID_NDIS_GEN_MAXIMUM_FRAME_SIZE, 0x5ec10358, 0xa61a, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); +DEFINE_GUID(GUID_NDIS_GEN_MAXIMUM_LOOKAHEAD, 0x5ec10357, 0xa61a, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); +DEFINE_GUID(GUID_NDIS_GEN_MAXIMUM_SEND_PACKETS, 0x5ec10367, 0xa61a, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); +DEFINE_GUID(GUID_NDIS_GEN_MAXIMUM_TOTAL_SIZE, 0x5ec10363, 0xa61a, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); +DEFINE_GUID(GUID_NDIS_GEN_MEDIA_CONNECT_STATUS, 0x5ec10366, 0xa61a, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); +DEFINE_GUID(GUID_NDIS_GEN_MEDIA_IN_USE, 0x5ec10356, 0xa61a, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); +DEFINE_GUID(GUID_NDIS_GEN_MEDIA_SUPPORTED, 0x5ec10355, 0xa61a, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); +DEFINE_GUID(GUID_NDIS_GEN_PCI_DEVICE_CUSTOM_PROPERTIES, 0xaa39f5ab, 0xe260,0x4d01, 0x82, 0xb0, 0xb7, 0x37, 0xc8, 0x80, 0xea, 0x05); +DEFINE_GUID(GUID_NDIS_GEN_PHYSICAL_MEDIUM, 0x418ca16d, 0x3937, 0x4208, 0x94, 0x0a, 0xec, 0x61, 0x96, 0x27, 0x80, 0x85); +DEFINE_GUID(GUID_NDIS_GEN_PHYSICAL_MEDIUM_EX, 0x899e7782, 0x035b,0x43f9, 0x8b, 0xb6, 0x2b, 0x58, 0x97, 0x16, 0x12, 0xe5); +DEFINE_GUID(GUID_NDIS_GEN_PORT_AUTHENTICATION_PARAMETERS, 0xaab6ac31, 0x86fb, 0x48fb, 0x8b, 0x48, 0x63, 0xdb, 0x23, 0x5a, 0xce, 0x16); +DEFINE_GUID(GUID_NDIS_GEN_PORT_STATE, 0x6fbf2a5f, 0x8b8f, 0x4920, 0x81, 0x43, 0xe6, 0xc4, 0x60, 0xf5, 0x25, 0x24); +DEFINE_GUID(GUID_NDIS_GEN_RCV_ERROR, 0x447956fd, 0xa61b, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); +DEFINE_GUID(GUID_NDIS_GEN_RCV_NO_BUFFER, 0x447956fe, 0xa61b, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); +DEFINE_GUID(GUID_NDIS_GEN_RCV_OK, 0x447956fb, 0xa61b, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); +DEFINE_GUID(GUID_NDIS_GEN_RECEIVE_BLOCK_SIZE, 0x5ec1035d, 0xa61a, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); +DEFINE_GUID(GUID_NDIS_GEN_RECEIVE_BUFFER_SPACE, 0x5ec1035b, 0xa61a, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); +DEFINE_GUID(GUID_NDIS_GEN_STATISTICS, 0x368c45b5, 0xc129, 0x43c1, 0x93, 0x9e, 0x7e, 0xdc, 0x2d, 0x7f, 0xe6, 0x21); +DEFINE_GUID(GUID_NDIS_GEN_TRANSMIT_BLOCK_SIZE, 0x5ec1035c, 0xa61a, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); +DEFINE_GUID(GUID_NDIS_GEN_TRANSMIT_BUFFER_SPACE, 0x5ec1035a, 0xa61a, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); +DEFINE_GUID(GUID_NDIS_GEN_VENDOR_DESCRIPTION, 0x5ec1035f, 0xa61a, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); +DEFINE_GUID(GUID_NDIS_GEN_VENDOR_DRIVER_VERSION, 0x447956f9, 0xa61b, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); +DEFINE_GUID(GUID_NDIS_GEN_VENDOR_ID, 0x5ec1035e, 0xa61a, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); +DEFINE_GUID(GUID_NDIS_GEN_VLAN_ID, 0x765dc702, 0xc5e8, 0x4b67, 0x84, 0x3b, 0x3f, 0x5a, 0x4f, 0xf2, 0x64, 0x8b); +DEFINE_GUID(GUID_NDIS_GEN_XMIT_ERROR, 0x447956fc, 0xa61b, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); +DEFINE_GUID(GUID_NDIS_GEN_XMIT_OK, 0x447956fa, 0xa61b, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); +DEFINE_GUID(GUID_NDIS_HD_SPLIT_CURRENT_CONFIG, 0x81d1303c, 0xab00, 0x4e49, 0x80, 0xb1, 0x5e, 0x6e, 0x0b, 0xf9, 0xbe, 0x53); +DEFINE_GUID(GUID_NDIS_HD_SPLIT_PARAMETERS, 0x8c048bea, 0x2913, 0x4458, 0xb6, 0x8e, 0x17, 0xf6, 0xc1, 0xe5, 0xc6, 0x0e); +DEFINE_GUID(GUID_NDIS_LAN_CLASS, 0xad498944, 0x762f, 0x11d0, 0x8d, 0xcb, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); +DEFINE_GUID(GUID_NDIS_NOTIFY_ADAPTER_ARRIVAL, 0x981f2d81, 0xb1f3, 0x11d0, 0x8d, 0xd7, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); +DEFINE_GUID(GUID_NDIS_NOTIFY_ADAPTER_REMOVAL, 0x981f2d80, 0xb1f3, 0x11d0, 0x8d, 0xd7, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); +DEFINE_GUID(GUID_NDIS_NOTIFY_BIND, 0x5413531c, 0xb1f3, 0x11d0, 0x8d, 0xd7, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); +DEFINE_GUID(GUID_NDIS_NOTIFY_DEVICE_POWER_OFF, 0x81bc8189, 0xb026, 0x46ab, 0xb9, 0x64, 0xf1, 0x82, 0xe3, 0x42, 0x93, 0x4e); +DEFINE_GUID(GUID_NDIS_NOTIFY_DEVICE_POWER_OFF_EX, 0x4159353c, 0x5cd7, 0x42ce, 0x8f, 0xe4, 0xa4, 0x5a, 0x23, 0x80, 0xcc, 0x4f); +DEFINE_GUID(GUID_NDIS_NOTIFY_DEVICE_POWER_ON, 0x5f81cfd0, 0xf046, 0x4342, 0xaf, 0x61, 0x89, 0x5a, 0xce, 0xda, 0xef, 0xd9); +DEFINE_GUID(GUID_NDIS_NOTIFY_DEVICE_POWER_ON_EX, 0x2b440188, 0x92ac, 0x4f60, 0x9b, 0x2d, 0x20, 0xa3, 0x0c, 0xbb, 0x6b, 0xbe); +DEFINE_GUID(GUID_NDIS_NOTIFY_FILTER_ARRIVAL, 0x0b6d3c89, 0x5917, 0x43ca, 0xb5, 0x78, 0xd0, 0x1a, 0x79, 0x67, 0xc4, 0x1c); +DEFINE_GUID(GUID_NDIS_NOTIFY_FILTER_REMOVAL, 0x1f177cd9, 0x5955, 0x4721, 0x9f, 0x6a, 0x78, 0xeb, 0xdf, 0xae, 0xf8, 0x89); +DEFINE_GUID(GUID_NDIS_NOTIFY_UNBIND, 0x6e3ce1ec, 0xb1f3, 0x11d0, 0x8d, 0xd7, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); +DEFINE_GUID(GUID_NDIS_NOTIFY_VC_ARRIVAL, 0x182f9e0c, 0xb1f3, 0x11d0, 0x8d, 0xd7, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); +DEFINE_GUID(GUID_NDIS_NOTIFY_VC_REMOVAL, 0x981f2d79, 0xb1f3, 0x11d0, 0x8d, 0xd7, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); +DEFINE_GUID(GUID_NDIS_PM_ACTIVE_CAPABILITIES, 0xb2cf76e3, 0xb3ae, 0x4394, 0xa0, 0x1f, 0x33, 0x8c, 0x98, 0x70, 0xe9, 0x39); +DEFINE_GUID(GUID_NDIS_PM_ADMIN_CONFIG, 0x1528d111, 0x708a, 0x4ca4, 0x92, 0x15, 0xc0, 0x57, 0x71, 0x16, 0x1c, 0xda); +DEFINE_GUID(GUID_NDIS_RECEIVE_FILTER_ENUM_FILTERS, 0x3f2c141d, 0x83bc, 0x11dd, 0x94, 0xb8, 0x00, 0x1d, 0x09, 0x16, 0x2b, 0xc3); +DEFINE_GUID(GUID_NDIS_RECEIVE_FILTER_ENUM_QUEUES, 0x3f2c141b, 0x83bc, 0x11dd, 0x94, 0xb8, 0x00, 0x1d, 0x09, 0x16, 0x2b, 0xc3); +DEFINE_GUID(GUID_NDIS_RECEIVE_FILTER_GLOBAL_PARAMETERS, 0x3f2c141a, 0x83bc, 0x11dd, 0x94, 0xb8, 0x00, 0x1d, 0x09, 0x16, 0x2b, 0xc3); +DEFINE_GUID(GUID_NDIS_RECEIVE_FILTER_HARDWARE_CAPABILITIES, 0x3f2c1419, 0x83bc, 0x11dd, 0x94, 0xb8, 0x00, 0x1d, 0x09, 0x16, 0x2b, 0xc3); +DEFINE_GUID(GUID_NDIS_RECEIVE_FILTER_PARAMETERS, 0x3f2c141e, 0x83bc, 0x11dd, 0x94, 0xb8, 0x00, 0x1d, 0x09, 0x16, 0x2b, 0xc3); +DEFINE_GUID(GUID_NDIS_RECEIVE_FILTER_QUEUE_PARAMETERS, 0x3f2c141c, 0x83bc, 0x11dd, 0x94, 0xb8, 0x00, 0x1d, 0x09, 0x16, 0x2b, 0xc3); +DEFINE_GUID(GUID_NDIS_RECEIVE_SCALE_CAPABILITIES, 0x26c28774, 0x4252, 0x48fe, 0xa6, 0x10, 0xa5, 0x8a, 0x39, 0x8c, 0x0e, 0xb1); +DEFINE_GUID(GUID_NDIS_RSS_ENABLED, 0x9565cd55, 0x3402, 0x4e32, 0xa5, 0xb6, 0x2f, 0x14, 0x3f, 0x2f, 0x2c, 0x30); +DEFINE_GUID(GUID_NDIS_STATUS_DOT11_ASSOCIATION_COMPLETION, 0x458bbea7, 0x45a4, 0x4ae2, 0xb1, 0x76, 0xe5, 0x1f, 0x96, 0xfc, 0x05, 0x68); +DEFINE_GUID(GUID_NDIS_STATUS_DOT11_ASSOCIATION_START, 0x3927843b, 0x6980, 0x4b48, 0xb1, 0x5b, 0x4d, 0xe5, 0x09, 0x77, 0xac, 0x40); +DEFINE_GUID(GUID_NDIS_STATUS_DOT11_CONNECTION_COMPLETION, 0x96efd9c9, 0x7f1b, 0x4a89, 0xbc, 0x04, 0x3e, 0x9e, 0x27, 0x17, 0x65, 0xf1); +DEFINE_GUID(GUID_NDIS_STATUS_DOT11_CONNECTION_START, 0x7b74299d, 0x998f, 0x4454, 0xad, 0x08, 0xc5, 0xaf, 0x28, 0x57, 0x6d, 0x1b); +DEFINE_GUID(GUID_NDIS_STATUS_DOT11_DISASSOCIATION, 0x3fbeb6fc, 0x0fe2, 0x43fd, 0xb2, 0xad, 0xbd, 0x99, 0xb5, 0xf9, 0x3e, 0x13); +DEFINE_GUID(GUID_NDIS_STATUS_DOT11_LINK_QUALITY, 0xa3285184, 0xea99, 0x48ed, 0x82, 0x5e, 0xa4, 0x26, 0xb1, 0x1c, 0x27, 0x54); +DEFINE_GUID(GUID_NDIS_STATUS_DOT11_MPDU_MAX_LENGTH_CHANGED, 0x1d6560ec, 0x8e48, 0x4a3e, 0x9f, 0xd5, 0xa0, 0x1b, 0x69, 0x8d, 0xb6, 0xc5); +DEFINE_GUID(GUID_NDIS_STATUS_DOT11_PHY_STATE_CHANGED, 0xdeb45316, 0x71b5, 0x4736, 0xbd, 0xef, 0x0a, 0x9e, 0x9f, 0x4e, 0x62, 0xdc); +DEFINE_GUID(GUID_NDIS_STATUS_DOT11_PMKID_CANDIDATE_LIST, 0x26d8b8f6, 0xdb82, 0x49eb, 0x8b, 0xf3, 0x4c, 0x13, 0x0e, 0xf0, 0x69, 0x50); +DEFINE_GUID(GUID_NDIS_STATUS_DOT11_ROAMING_COMPLETION, 0xdd9d47d1, 0x282b, 0x41e4, 0xb9, 0x24, 0x66, 0x36, 0x88, 0x17, 0xfc, 0xd3); +DEFINE_GUID(GUID_NDIS_STATUS_DOT11_ROAMING_START, 0xb2412d0d, 0x26c8, 0x4f4e, 0x93, 0xdf, 0xf7, 0xb7, 0x05, 0xa0, 0xb4, 0x33); +DEFINE_GUID(GUID_NDIS_STATUS_DOT11_SCAN_CONFIRM, 0x8500591e, 0xa0c7, 0x4efb, 0x93, 0x42, 0xb6, 0x74, 0xb0, 0x02, 0xcb, 0xe6); +DEFINE_GUID(GUID_NDIS_STATUS_DOT11_TKIPMIC_FAILURE, 0x442c2ae4, 0x9bc5, 0x4b90, 0xa8, 0x89, 0x45, 0x5e, 0xf2, 0x20, 0xf4, 0xee); +DEFINE_GUID(GUID_NDIS_STATUS_HD_SPLIT_CURRENT_CONFIG, 0x6c744b0e, 0xee9c, 0x4205, 0x90, 0xa2, 0x01, 0x5f, 0x6d, 0x65, 0xf4, 0x03); +DEFINE_GUID(GUID_NDIS_STATUS_LINK_SPEED_CHANGE, 0x981f2d85, 0xb1f3, 0x11d0, 0x8d, 0xd7, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); +DEFINE_GUID(GUID_NDIS_STATUS_LINK_STATE, 0x64c6f797, 0x878c, 0x4311, 0x92, 0x46, 0x65, 0xdb, 0xa8, 0x9c, 0x3a, 0x61); +DEFINE_GUID(GUID_NDIS_STATUS_MEDIA_CONNECT, 0x981f2d7d, 0xb1f3, 0x11d0, 0x8d, 0xd7, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); +DEFINE_GUID(GUID_NDIS_STATUS_MEDIA_DISCONNECT, 0x981f2d7e, 0xb1f3, 0x11d0, 0x8d, 0xd7, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); +DEFINE_GUID(GUID_NDIS_STATUS_MEDIA_SPECIFIC_INDICATION, 0x981f2d84, 0xb1f3, 0x11d0, 0x8d, 0xd7, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); +DEFINE_GUID(GUID_NDIS_STATUS_NETWORK_CHANGE, 0xca8a56f9, 0xce81, 0x40e6, 0xa7, 0x0f, 0xa0, 0x67,0xa4,0x76, 0xe9, 0xe9); +DEFINE_GUID(GUID_NDIS_STATUS_OPER_STATUS, 0xf917b663, 0x845e, 0x4d3d, 0xb6, 0xd4, 0x15, 0xeb, 0x27, 0xaf, 0x81, 0xc5); +DEFINE_GUID(GUID_NDIS_STATUS_PACKET_FILTER, 0xd47c5407, 0x2e75, 0x46dd, 0x81, 0x46, 0x1d, 0x7e, 0xd2, 0xd6, 0xab, 0x1d); +DEFINE_GUID(GUID_NDIS_STATUS_PORT_STATE, 0x1dac0dfe, 0x43e5, 0x44b7, 0xb7, 0x59, 0x7b, 0xf4, 0x6d, 0xe3, 0x2e, 0x81); +DEFINE_GUID(GUID_NDIS_STATUS_RESET_END, 0x981f2d77, 0xb1f3, 0x11d0, 0x8d, 0xd7, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); +DEFINE_GUID(GUID_NDIS_STATUS_RESET_START, 0x981f2d76, 0xb1f3, 0x11d0, 0x8d, 0xd7, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c); +DEFINE_GUID(GUID_NDIS_STATUS_TASK_OFFLOAD_CURRENT_CONFIG, 0x45049fc6, 0x54d8, 0x40c8, 0x9c, 0x3d, 0xb0, 0x11, 0xc4, 0xe7, 0x15, 0xbc); +DEFINE_GUID(GUID_NDIS_STATUS_TASK_OFFLOAD_HARDWARE_CAPABILITIES, 0xb6b8158b, 0x217c, 0x4b2a, 0xbe, 0x86, 0x6a, 0x04, 0xbe, 0xea, 0x65, 0xb8); +DEFINE_GUID(GUID_NDIS_STATUS_TCP_CONNECTION_OFFLOAD_CURRENT_CONFIG, 0xf8edaeff, 0x24e4, 0x4ae6, 0xa4, 0x13, 0x0b, 0x27, 0xf7, 0x6b, 0x24, 0x3d); +DEFINE_GUID(GUID_NDIS_STATUS_TCP_CONNECTION_OFFLOAD_HARDWARE_CAPABILITIES, 0x391969b6, 0x402c, 0x43bf, 0x89, 0x22, 0x39, 0xea, 0xe0, 0xda, 0x1b, 0xb5); +DEFINE_GUID(GUID_NDIS_TCP_CONNECTION_OFFLOAD_CURRENT_CONFIG, 0x2ee6aef1, 0x0851, 0x458b, 0xbf, 0x0d, 0x79, 0x23, 0x43, 0xd1, 0xcd, 0xe1); +DEFINE_GUID(GUID_NDIS_TCP_CONNECTION_OFFLOAD_HARDWARE_CAPABILITIES, 0x8ce71f2c, 0xd63a, 0x4390, 0xa4, 0x87, 0x18, 0xfa, 0x47, 0x26, 0x2c, 0xeb); +DEFINE_GUID(GUID_NDIS_TCP_OFFLOAD_CURRENT_CONFIG, 0x68542fed, 0x5c74, 0x461e, 0x89, 0x34, 0x91, 0xc6, 0xf9, 0xc6, 0x09, 0x60); +DEFINE_GUID(GUID_NDIS_TCP_OFFLOAD_HARDWARE_CAPABILITIES, 0xcd5f1102, 0x590f, 0x4ada, 0xab, 0x65, 0x5b, 0x31, 0xb1, 0xdc, 0x01, 0x72); +DEFINE_GUID(GUID_NDIS_TCP_OFFLOAD_PARAMETERS, 0x8ead9a22, 0x7f69, 0x4bc6, 0x94, 0x9a, 0xc8, 0x18, 0x7b, 0x07, 0x4e, 0x61); +DEFINE_GUID(GUID_NDIS_WAKE_ON_MAGIC_PACKET_ONLY, 0xa14f1c97, 0x8839, 0x4f8a, 0x99, 0x96, 0xa2, 0x89, 0x96, 0xeb, 0xbf, 0x1d); +DEFINE_GUID(GUID_NIC_SWITCH_CURRENT_CAPABILITIES, 0xe76fdaf3, 0x0be7, 0x4d95, 0x87, 0xe9, 0x5a, 0xea, 0xd4, 0xb5, 0x90, 0xe9); +DEFINE_GUID(GUID_NIC_SWITCH_HARDWARE_CAPABILITIES, 0x37cab40c, 0xd1e8, 0x4301, 0x8c, 0x1d, 0x58, 0x46, 0x5e, 0x0c, 0x4c, 0x0f); +DEFINE_GUID(GUID_PM_ADD_PROTOCOL_OFFLOAD, 0x0c06c112, 0x0d93, 0x439b, 0x9e, 0x6d, 0x26, 0xbe, 0x13, 0x0c, 0x97, 0x84); +DEFINE_GUID(GUID_PM_ADD_WOL_PATTERN, 0x6fc83ba7, 0x52bc, 0x4faa, 0xac, 0x51, 0x7d, 0x2f, 0xfe, 0x63, 0xba, 0x90); +DEFINE_GUID(GUID_PM_CURRENT_CAPABILITIES, 0x3abdbd14, 0xd44a, 0x4a3f, 0x9a, 0x63, 0xa0, 0xa4, 0x2a, 0x51, 0xb1, 0x31); +DEFINE_GUID(GUID_PM_GET_PROTOCOL_OFFLOAD, 0xa6435cd9, 0x149f, 0x498e, 0x95, 0x1b, 0x2d, 0x94, 0xbe, 0xa3, 0xe3, 0xa3); +DEFINE_GUID(GUID_PM_HARDWARE_CAPABILITIES, 0xece5360d, 0x3291, 0x4a6e, 0x80, 0x44, 0x00, 0x51, 0x1f, 0xed, 0x27, 0xee); +DEFINE_GUID(GUID_PM_PARAMETERS, 0x560245d2, 0xe251, 0x409c, 0xa2, 0x80, 0x31, 0x19, 0x35, 0xbe, 0x3b, 0x28); +DEFINE_GUID(GUID_PM_PROTOCOL_OFFLOAD_LIST, 0x736ec5ab, 0xca8f, 0x4043, 0xbb, 0x58, 0xda, 0x40, 0x2a, 0x48, 0xd9, 0xcc); +DEFINE_GUID(GUID_PM_REMOVE_PROTOCOL_OFFLOAD, 0xdecd7be2, 0xa6b0, 0x43ca, 0xae, 0x45, 0xd0, 0x00, 0xd2, 0x0e, 0x52, 0x65); +DEFINE_GUID(GUID_PM_REMOVE_WOL_PATTERN, 0xa037a915, 0xc6ca, 0x4322, 0xb3, 0xe3, 0xef, 0x75, 0x4e, 0xc4, 0x98, 0xdc); +DEFINE_GUID(GUID_PM_WOL_PATTERN_LIST, 0x4022be37, 0x7ee2, 0x47be, 0xa5, 0xa5, 0x05, 0x0f, 0xc7, 0x9a, 0xfc, 0x75); +DEFINE_GUID(GUID_RECEIVE_FILTER_CURRENT_CAPABILITIES, 0x4054e80f, 0x2bc1, 0x4ccc, 0xb0, 0x33, 0x4a, 0xbc, 0x0c, 0x4a, 0x1e, 0x8c); +DEFINE_GUID(GUID_STATUS_MEDIA_SPECIFIC_INDICATION_EX, 0xaaacfca7, 0x954a, 0x4632, 0xa1, 0x6e, 0xa8, 0xa6, 0x37, 0x93, 0xa9, 0xe5); +DEFINE_GUID(UNSPECIFIED_NETWORK_GUID, 0x12ba5bde, 0x143e, 0x4c0d, 0xb6, 0x6d, 0x23, 0x79, 0xbb, 0x14, 0x19, 0x13); #ifdef __cplusplus } #endif - -#endif /* __NDISGUID_H */ Modified: branches/header-work/include/ddk/ndiswan.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/ndiswan… ============================================================================== --- branches/header-work/include/ddk/ndiswan.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/ndiswan.h [iso-8859-1] Mon Apr 19 18:18:04 2010 @@ -20,18 +20,15 @@ * */ -#ifndef __NDISWAN_H -#define __NDISWAN_H - -#include "ndis.h" +#pragma once #ifdef __cplusplus extern "C" { #endif -#define NDIS_USE_WAN_WRAPPER 0x00000001 - -#define NDIS_STATUS_TAPI_INDICATION ((NDIS_STATUS)0x40010080L) +#define NDIS_USE_WAN_WRAPPER 0x00000001 + +#define NDIS_STATUS_TAPI_INDICATION ((NDIS_STATUS)0x40010080L) /* NDIS_WAN_INFO.FramingBits constants */ #define RAS_FRAMING 0x00000001 @@ -71,177 +68,287 @@ #define TAPI_PROVIDER 0x80000000 +#define BRIDGING_FLAG_LANFCS 0x00000001 +#define BRIDGING_FLAG_LANID 0x00000002 +#define BRIDGING_FLAG_PADDING 0x00000004 + +#define BRIDGING_TINYGRAM 0x00000001 +#define BRIDGING_LANID 0x00000002 +#define BRIDGING_NO_SPANNING_TREE 0x00000004 +#define BRIDGING_8021D_SPANNING_TREE 0x00000008 +#define BRIDGING_8021G_SPANNING_TREE 0x00000010 +#define BRIDGING_SOURCE_ROUTING 0x00000020 +#define BRIDGING_DEC_LANBRIDGE 0x00000040 + +#define BRIDGING_TYPE_RESERVED 0x00000001 +#define BRIDGING_TYPE_8023_CANON 0x00000002 +#define BRIDGING_TYPE_8024_NO_CANON 0x00000004 +#define BRIDGING_TYPE_8025_NO_CANON 0x00000008 +#define BRIDGING_TYPE_FDDI_NO_CANON 0x00000010 +#define BRIDGING_TYPE_8024_CANON 0x00000400 +#define BRIDGING_TYPE_8025_CANON 0x00000800 +#define BRIDGING_TYPE_FDDI_CANON 0x00001000 + +/* NDIS_WAN_COMPRESS_INFO.MSCompType constants */ +#define NDISWAN_COMPRESSION 0x00000001 +#define NDISWAN_ENCRYPTION 0x00000010 +#define NDISWAN_40_ENCRYPTION 0x00000020 +#define NDISWAN_128_ENCRYPTION 0x00000040 +#define NDISWAN_56_ENCRYPTION 0x00000080 +#define NDISWAN_HISTORY_LESS 0x01000000 + +/* NDIS_WAN_COMPRESS_INFO.CompType constants */ +#define COMPTYPE_OUI 0 +#define COMPTYPE_NT31RAS 254 +#define COMPTYPE_NONE 255 + +#define WAN_ERROR_CRC ((ULONG)0x00000001) +#define WAN_ERROR_FRAMING ((ULONG)0x00000002) +#define WAN_ERROR_HARDWAREOVERRUN ((ULONG)0x00000004) +#define WAN_ERROR_BUFFEROVERRUN ((ULONG)0x00000008) +#define WAN_ERROR_TIMEOUT ((ULONG)0x00000010) +#define WAN_ERROR_ALIGNMENT ((ULONG)0x00000020) + +#define NdisMWanInitializeWrapper(NdisWrapperHandle, \ + SystemSpecific1, \ + SystemSpecific2, \ + SystemSpecific3) \ +{ \ + NdisMInitializeWrapper(NdisWrapperHandle, \ + SystemSpecific1, \ + SystemSpecific2, \ + SystemSpecific3); \ +} + typedef struct _NDIS_WAN_INFO { - OUT ULONG MaxFrameSize; - OUT ULONG MaxTransmit; - OUT ULONG HeaderPadding; - OUT ULONG TailPadding; - OUT ULONG Endpoints; - OUT UINT MemoryFlags; - OUT NDIS_PHYSICAL_ADDRESS HighestAcceptableAddress; - OUT ULONG FramingBits; - OUT ULONG DesiredACCM; + OUT ULONG MaxFrameSize; + OUT ULONG MaxTransmit; + OUT ULONG HeaderPadding; + OUT ULONG TailPadding; + OUT ULONG Endpoints; + OUT UINT MemoryFlags; + OUT NDIS_PHYSICAL_ADDRESS HighestAcceptableAddress; + OUT ULONG FramingBits; + OUT ULONG DesiredACCM; } NDIS_WAN_INFO, *PNDIS_WAN_INFO; typedef struct _NDIS_WAN_GET_LINK_INFO { - IN NDIS_HANDLE NdisLinkHandle; - OUT ULONG MaxSendFrameSize; - OUT ULONG MaxRecvFrameSize; - OUT ULONG HeaderPadding; - OUT ULONG TailPadding; - OUT ULONG SendFramingBits; - OUT ULONG RecvFramingBits; - OUT ULONG SendCompressionBits; - OUT ULONG RecvCompressionBits; - OUT ULONG SendACCM; - OUT ULONG RecvACCM; + IN NDIS_HANDLE NdisLinkHandle; + IN ULONG MaxSendFrameSize; + OUT ULONG MaxRecvFrameSize; + OUT ULONG HeaderPadding; + OUT ULONG TailPadding; + OUT ULONG SendFramingBits; + OUT ULONG RecvFramingBits; + OUT ULONG SendCompressionBits; + OUT ULONG RecvCompressionBits; + OUT ULONG SendACCM; + OUT ULONG RecvACCM; } NDIS_WAN_GET_LINK_INFO, *PNDIS_WAN_GET_LINK_INFO; typedef struct _NDIS_WAN_SET_LINK_INFO { - IN NDIS_HANDLE NdisLinkHandle; - IN ULONG MaxSendFrameSize; - IN ULONG MaxRecvFrameSize; - IN ULONG HeaderPadding; - IN ULONG TailPadding; - IN ULONG SendFramingBits; - IN ULONG RecvFramingBits; - IN ULONG SendCompressionBits; - IN ULONG RecvCompressionBits; - IN ULONG SendACCM; - IN ULONG RecvACCM; + IN NDIS_HANDLE NdisLinkHandle; + IN ULONG MaxSendFrameSize; + IN ULONG MaxRecvFrameSize; + IN ULONG HeaderPadding; + IN ULONG TailPadding; + IN ULONG SendFramingBits; + IN ULONG RecvFramingBits; + IN ULONG SendCompressionBits; + IN ULONG RecvCompressionBits; + IN ULONG SendACCM; + IN ULONG RecvACCM; } NDIS_WAN_SET_LINK_INFO, *PNDIS_WAN_SET_LINK_INFO; -/* NDIS_WAN_COMPRESS_INFO.MSCompType constants */ -#define NDISWAN_COMPRESSION 0x00000001 -#define NDISWAN_ENCRYPTION 0x00000010 -#define NDISWAN_40_ENCRYPTION 0x00000020 -#define NDISWAN_128_ENCRYPTION 0x00000040 -#define NDISWAN_56_ENCRYPTION 0x00000080 -#define NDISWAN_HISTORY_LESS 0x01000000 - -/* NDIS_WAN_COMPRESS_INFO.CompType constants */ -#define COMPTYPE_OUI 0 -#define COMPTYPE_NT31RAS 254 -#define COMPTYPE_NONE 255 +typedef struct _NDIS_WAN_GET_BRIDGE_INFO { + IN NDIS_HANDLE NdisLinkHandle; + OUT USHORT LanSegmentNumber; + OUT UCHAR BridgeNumber; + OUT UCHAR BridgingOptions; + OUT ULONG BridgingCapabilities; + OUT UCHAR BridgingType; + OUT UCHAR MacBytes[6]; +} NDIS_WAN_GET_BRIDGE_INFO, *PNDIS_WAN_GET_BRIDGE_INFO; + +typedef struct _NDIS_WAN_SET_BRIDGE_INFO { + IN NDIS_HANDLE NdisLinkHandle; + IN USHORT LanSegmentNumber; + IN UCHAR BridgeNumber; + IN UCHAR BridgingOptions; + IN ULONG BridgingCapabilities; + IN UCHAR BridgingType; + IN UCHAR MacBytes[6]; +} NDIS_WAN_SET_BRIDGE_INFO, *PNDIS_WAN_SET_BRIDGE_INFO; typedef struct _NDIS_WAN_COMPRESS_INFO { - UCHAR SessionKey[8]; - ULONG MSCompType; - UCHAR CompType; - USHORT CompLength; - _ANONYMOUS_UNION union { - struct { - UCHAR CompOUI[3]; - UCHAR CompSubType; - UCHAR CompValues[32]; - } Proprietary; - struct { - UCHAR CompValues[32]; - } Public; - } DUMMYUNIONNAME; -} NDIS_WAN_COMPRESS_INFO; - -typedef NDIS_WAN_COMPRESS_INFO *PNDIS_WAN_COMPRESS_INFO; + UCHAR SessionKey[8]; + ULONG MSCompType; + UCHAR CompType; + USHORT CompLength; + _ANONYMOUS_UNION union { + struct { + UCHAR CompOUI[3]; + UCHAR CompSubType; + UCHAR CompValues[32]; + } Proprietary; + struct { + UCHAR CompValues[32]; + } Public; + } DUMMYUNIONNAME; +} NDIS_WAN_COMPRESS_INFO, *PNDIS_WAN_COMPRESS_INFO; typedef struct _NDIS_WAN_GET_COMP_INFO { - IN NDIS_HANDLE NdisLinkHandle; - OUT NDIS_WAN_COMPRESS_INFO SendCapabilities; - OUT NDIS_WAN_COMPRESS_INFO RecvCapabilities; + IN NDIS_HANDLE NdisLinkHandle; + OUT NDIS_WAN_COMPRESS_INFO SendCapabilities; + OUT NDIS_WAN_COMPRESS_INFO RecvCapabilities; } NDIS_WAN_GET_COMP_INFO, *PNDIS_WAN_GET_COMP_INFO; typedef struct _NDIS_WAN_SET_COMP_INFO { - IN NDIS_HANDLE NdisLinkHandle; - IN NDIS_WAN_COMPRESS_INFO SendCapabilities; - IN NDIS_WAN_COMPRESS_INFO RecvCapabilities; + IN NDIS_HANDLE NdisLinkHandle; + IN NDIS_WAN_COMPRESS_INFO SendCapabilities; + IN NDIS_WAN_COMPRESS_INFO RecvCapabilities; } NDIS_WAN_SET_COMP_INFO, *PNDIS_WAN_SET_COMP_INFO; typedef struct _NDIS_WAN_GET_STATS_INFO { - IN NDIS_HANDLE NdisLinkHandle; - OUT ULONG BytesSent; - OUT ULONG BytesRcvd; - OUT ULONG FramesSent; - OUT ULONG FramesRcvd; - OUT ULONG CRCErrors; - OUT ULONG TimeoutErrors; - OUT ULONG AlignmentErrors; - OUT ULONG SerialOverrunErrors; - OUT ULONG FramingErrors; - OUT ULONG BufferOverrunErrors; - OUT ULONG BytesTransmittedUncompressed; - OUT ULONG BytesReceivedUncompressed; - OUT ULONG BytesTransmittedCompressed; - OUT ULONG BytesReceivedCompressed; + IN NDIS_HANDLE NdisLinkHandle; + OUT ULONG BytesSent; + OUT ULONG BytesRcvd; + OUT ULONG FramesSent; + OUT ULONG FramesRcvd; + OUT ULONG CRCErrors; + OUT ULONG TimeoutErrors; + OUT ULONG AlignmentErrors; + OUT ULONG SerialOverrunErrors; + OUT ULONG FramingErrors; + OUT ULONG BufferOverrunErrors; + OUT ULONG BytesTransmittedUncompressed; + OUT ULONG BytesReceivedUncompressed; + OUT ULONG BytesTransmittedCompressed; + OUT ULONG BytesReceivedCompressed; + OUT ULONG TunnelPacketsRecieved; + OUT ULONG TunnelRecievePacketsPending; + OUT ULONG TunnelPacketsIndicatedUp; + OUT ULONG TunnelRecievePacketsRejected; + OUT ULONG TunnelPacketsSent; + OUT ULONG TunnelPacketsSentComplete; + OUT ULONG TunnelTransmitPacketsPending; + OUT ULONG TunnelPacketsTransmitError; + OUT ULONG TunnelPacketsSentError; + OUT ULONG TunnelTransmitPacketsRejected; + OUT ULONG TunnelAcksSent; + OUT ULONG TunnelAcksSentComplete; + OUT ULONG TunnelGeneric1; + OUT ULONG TunnelGeneric2; + OUT ULONG TunnelGeneric3; } NDIS_WAN_GET_STATS_INFO, *PNDIS_WAN_GET_STATS_INFO; -#define NdisMWanInitializeWrapper(NdisWrapperHandle, \ - SystemSpecific1, \ - SystemSpecific2, \ - SystemSpecific3) \ -{ \ - NdisMInitializeWrapper(NdisWrapperHandle, \ - SystemSpecific1, \ - SystemSpecific2, \ - SystemSpecific3); \ -} +typedef struct _NDIS_MAC_LINE_UP { + IN ULONG LinkSpeed; + IN NDIS_WAN_QUALITY Quality; + IN USHORT SendWindow; + IN NDIS_HANDLE ConnectionWrapperID; + IN NDIS_HANDLE NdisLinkHandle; + OUT NDIS_HANDLE NdisLinkContext; +} NDIS_MAC_LINE_UP, *PNDIS_MAC_LINE_UP; + +typedef struct _NDIS_MAC_LINE_DOWN { + IN NDIS_HANDLE NdisLinkContext; +} NDIS_MAC_LINE_DOWN, *PNDIS_MAC_LINE_DOWN; + +typedef struct _NDIS_MAC_FRAGMENT { + IN NDIS_HANDLE NdisLinkContext; + IN ULONG Errors; +} NDIS_MAC_FRAGMENT, *PNDIS_MAC_FRAGMENT; typedef struct _NDIS_WAN_CO_INFO { - OUT ULONG MaxFrameSize; - OUT ULONG MaxSendWindow; - OUT ULONG FramingBits; - OUT ULONG DesiredACCM; + OUT ULONG MaxFrameSize; + OUT ULONG MaxSendWindow; + OUT ULONG FramingBits; + OUT ULONG DesiredACCM; } NDIS_WAN_CO_INFO, *PNDIS_WAN_CO_INFO; typedef struct _NDIS_WAN_CO_GET_LINK_INFO { - OUT ULONG MaxSendFrameSize; - OUT ULONG MaxRecvFrameSize; - OUT ULONG SendFramingBits; - OUT ULONG RecvFramingBits; - OUT ULONG SendCompressionBits; - OUT ULONG RecvCompressionBits; - OUT ULONG SendACCM; - OUT ULONG RecvACCM; + OUT ULONG MaxSendFrameSize; + OUT ULONG MaxRecvFrameSize; + OUT ULONG SendFramingBits; + OUT ULONG RecvFramingBits; + OUT ULONG SendCompressionBits; + OUT ULONG RecvCompressionBits; + OUT ULONG SendACCM; + OUT ULONG RecvACCM; } NDIS_WAN_CO_GET_LINK_INFO, *PNDIS_WAN_CO_GET_LINK_INFO; typedef struct _NDIS_WAN_CO_SET_LINK_INFO { - IN ULONG MaxSendFrameSize; - IN ULONG MaxRecvFrameSize; - IN ULONG SendFramingBits; - IN ULONG RecvFramingBits; - IN ULONG SendCompressionBits; - IN ULONG RecvCompressionBits; - IN ULONG SendACCM; - IN ULONG RecvACCM; + IN ULONG MaxSendFrameSize; + IN ULONG MaxRecvFrameSize; + IN ULONG SendFramingBits; + IN ULONG RecvFramingBits; + IN ULONG SendCompressionBits; + IN ULONG RecvCompressionBits; + IN ULONG SendACCM; + IN ULONG RecvACCM; } NDIS_WAN_CO_SET_LINK_INFO, *PNDIS_WAN_CO_SET_LINK_INFO; typedef struct _NDIS_WAN_CO_GET_COMP_INFO { - OUT NDIS_WAN_COMPRESS_INFO SendCapabilities; - OUT NDIS_WAN_COMPRESS_INFO RecvCapabilities; + OUT NDIS_WAN_COMPRESS_INFO SendCapabilities; + OUT NDIS_WAN_COMPRESS_INFO RecvCapabilities; } NDIS_WAN_CO_GET_COMP_INFO, *PNDIS_WAN_CO_GET_COMP_INFO; typedef struct _NDIS_WAN_CO_SET_COMP_INFO { - IN NDIS_WAN_COMPRESS_INFO SendCapabilities; - IN NDIS_WAN_COMPRESS_INFO RecvCapabilities; + IN NDIS_WAN_COMPRESS_INFO SendCapabilities; + IN NDIS_WAN_COMPRESS_INFO RecvCapabilities; } NDIS_WAN_CO_SET_COMP_INFO, *PNDIS_WAN_CO_SET_COMP_INFO; typedef struct _NDIS_WAN_CO_GET_STATS_INFO { - OUT ULONG BytesSent; - OUT ULONG BytesRcvd; - OUT ULONG FramesSent; - OUT ULONG FramesRcvd; - OUT ULONG CRCErrors; - OUT ULONG TimeoutErrors; - OUT ULONG AlignmentErrors; - OUT ULONG SerialOverrunErrors; - OUT ULONG FramingErrors; - OUT ULONG BufferOverrunErrors; - OUT ULONG BytesTransmittedUncompressed; - OUT ULONG BytesReceivedUncompressed; - OUT ULONG BytesTransmittedCompressed; - OUT ULONG BytesReceivedCompressed; + OUT ULONG BytesSent; + OUT ULONG BytesRcvd; + OUT ULONG FramesSent; + OUT ULONG FramesRcvd; + OUT ULONG CRCErrors; + OUT ULONG TimeoutErrors; + OUT ULONG AlignmentErrors; + OUT ULONG SerialOverrunErrors; + OUT ULONG FramingErrors; + OUT ULONG BufferOverrunErrors; + OUT ULONG BytesTransmittedUncompressed; + OUT ULONG BytesReceivedUncompressed; + OUT ULONG BytesTransmittedCompressed; + OUT ULONG BytesReceivedCompressed; + OUT ULONG TunnelPacketsRecieved; + OUT ULONG TunnelRecievePacketsPending; + OUT ULONG TunnelPacketsIndicatedUp; + OUT ULONG TunnelRecievePacketsRejected; + OUT ULONG TunnelPacketsSent; + OUT ULONG TunnelPacketsSentComplete; + OUT ULONG TunnelTransmitPacketsPending; + OUT ULONG TunnelPacketsTransmitError; + OUT ULONG TunnelPacketsSentError; + OUT ULONG TunnelTransmitPacketsRejected; + OUT ULONG TunnelAcksSent; + OUT ULONG TunnelAcksSentComplete; + OUT ULONG TunnelGeneric1; + OUT ULONG TunnelGeneric2; + OUT ULONG TunnelGeneric3; } NDIS_WAN_CO_GET_STATS_INFO, *PNDIS_WAN_CO_GET_STATS_INFO; + +typedef struct _NDIS_WAN_CO_FRAGMENT { + IN ULONG Errors; +} NDIS_WAN_CO_FRAGMENT, *PNDIS_WAN_CO_FRAGMENT; + +typedef struct _WAN_CO_LINKPARAMS { + ULONG TransmitSpeed; + ULONG ReceiveSpeed; + ULONG SendWindow; +} WAN_CO_LINKPARAMS, *PWAN_CO_LINKPARAMS; + +typedef struct _WAN_CO_MTULINKPARAMS { + ULONG Version; + ULONG TransmitSpeed; + ULONG ReceiveSpeed; + ULONG SendWindow; + ULONG MTU; +} WAN_CO_MTULINKPARAMS, *PWAN_CO_MTULINKPARAMS; #ifdef __cplusplus } #endif - -#endif /* __NDISWAN_H */ Modified: branches/header-work/include/ddk/netpnp.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/netpnp.… ============================================================================== --- branches/header-work/include/ddk/netpnp.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/netpnp.h [iso-8859-1] Mon Apr 19 18:18:04 2010 @@ -1,46 +1,46 @@ -#ifndef __NET_PNP__ +#pragma once + #define __NET_PNP__ -typedef enum _NET_DEVICE_POWER_STATE -{ - NetDeviceStateUnspecified = 0, - NetDeviceStateD0, - NetDeviceStateD1, - NetDeviceStateD2, - NetDeviceStateD3, - NetDeviceStateMaximum +typedef enum _NET_DEVICE_POWER_STATE { + NetDeviceStateUnspecified = 0, + NetDeviceStateD0, + NetDeviceStateD1, + NetDeviceStateD2, + NetDeviceStateD3, + NetDeviceStateMaximum } NET_DEVICE_POWER_STATE, *PNET_DEVICE_POWER_STATE; -typedef enum _NET_PNP_EVENT_CODE -{ - NetEventSetPower, - NetEventQueryPower, - NetEventQueryRemoveDevice, - NetEventCancelRemoveDevice, - NetEventReconfigure, - NetEventBindList, - NetEventBindsComplete, - NetEventPnPCapabilities, - NetEventMaximum +typedef enum _NET_PNP_EVENT_CODE { + NetEventSetPower, + NetEventQueryPower, + NetEventQueryRemoveDevice, + NetEventCancelRemoveDevice, + NetEventReconfigure, + NetEventBindList, + NetEventBindsComplete, + NetEventPnPCapabilities, + NetEventPause, + NetEventRestart, + NetEventPortActivation, + NetEventPortDeactivation, + NetEventIMReEnableDevice, + NetEventMaximum } NET_PNP_EVENT_CODE, *PNET_PNP_EVENT_CODE; -typedef struct _NET_PNP_EVENT -{ - NET_PNP_EVENT_CODE NetEvent; - PVOID Buffer; - ULONG BufferLength; - ULONG_PTR NdisReserved[4]; - ULONG_PTR TransportReserved[4]; - ULONG_PTR TdiReserved[4]; - ULONG_PTR TdiClientReserved[4]; +typedef struct _NET_PNP_EVENT { + NET_PNP_EVENT_CODE NetEvent; + PVOID Buffer; + ULONG BufferLength; + ULONG_PTR NdisReserved[4]; + ULONG_PTR TransportReserved[4]; + ULONG_PTR TdiReserved[4]; + ULONG_PTR TdiClientReserved[4]; } NET_PNP_EVENT, *PNET_PNP_EVENT; -typedef enum _NDIS_DEVICE_PNP_EVENT -{ - NdisDevicePnPEventSurpriseRemoved, - NdisDevicePnPEventPowerProfileChanged, - NdisDevicePnPEventMaximum +/* FIXME : This belongs to ndis.h */ +typedef enum _NDIS_DEVICE_PNP_EVENT { + NdisDevicePnPEventSurpriseRemoved, + NdisDevicePnPEventPowerProfileChanged, + NdisDevicePnPEventMaximum } NDIS_DEVICE_PNP_EVENT, *PNDIS_DEVICE_PNP_EVENT; - -#endif - Removed: branches/header-work/include/ddk/nettypes.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/nettype… ============================================================================== --- branches/header-work/include/ddk/nettypes.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/nettypes.h (removed) @@ -1,32 +1,0 @@ - -#ifndef _NETTYPES_ -#define _NETTYPES_ - -#define HARDWARE_ADDRESS_LENGTH 6 -#define NETMAN_VARTYPE_ULONG 0 -#define NETMAN_VARTYPE_HARDWARE_ADDRESS 1 -#define NETMAN_VARTYPE_STRING 2 - - -typedef ULONG OFFSET; - -typedef struct _FLAT_STRING -{ - SHORT MaximumLength; - SHORT Length; - char Buffer [1]; -} FLAT_STRING, *PFLAT_STRING; - - -typedef struct _NETWORK_NAME -{ - FLAT_STRING Name; -} NETWORK_NAME, *PNETWORK_NAME; - -typedef struct _HARDWARE_ADDRESS -{ - UCHAR Address [HARDWARE_ADDRESS_LENGTH]; -} HARDWARE_ADDRESS, *PHARDWARE_ADDRESS; - -#endif - Removed: branches/header-work/include/ddk/newdev.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/newdev.… ============================================================================== --- branches/header-work/include/ddk/newdev.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/newdev.h (removed) @@ -1,62 +1,0 @@ -/* - * newdev.h - * - * Driver installation DLL interface - * - * This file is part of the w32api package. - * - * Contributors: - * Created by Casper S. Hornstrup <chorns(a)users.sourceforge.net> - * - * THIS SOFTWARE IS NOT COPYRIGHTED - * - * This source code is offered for use in the public domain. You may - * use, modify or distribute it freely. - * - * This code is distributed in the hope that it will be useful but - * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY - * DISCLAIMED. This includes but is not limited to warranties of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * - */ - -#ifndef __NEWDEV_H -#define __NEWDEV_H - -#ifdef __cplusplus -extern "C" { -#endif - -/* UpdateDriverForPlugAndPlayDevices.InstallFlags constants */ -#define INSTALLFLAG_FORCE 0x00000001 -#define INSTALLFLAG_READONLY 0x00000002 -#define INSTALLFLAG_NONINTERACTIVE 0x00000004 -#define INSTALLFLAG_BITS 0x00000007 - -BOOL WINAPI -UpdateDriverForPlugAndPlayDevicesA( - HWND hwndParent, - LPCSTR HardwareId, - LPCSTR FullInfPath, - DWORD InstallFlags, - PBOOL bRebootRequired OPTIONAL); - -BOOL WINAPI -UpdateDriverForPlugAndPlayDevicesW( - HWND hwndParent, - LPCWSTR HardwareId, - LPCWSTR FullInfPath, - DWORD InstallFlags, - PBOOL bRebootRequired OPTIONAL); - -#ifdef UNICODE -#define UpdateDriverForPlugAndPlayDevices UpdateDriverForPlugAndPlayDevicesW -#else -#define UpdateDriverForPlugAndPlayDevices UpdateDriverForPlugAndPlayDevicesA -#endif /* UNICODE */ - -#ifdef __cplusplus -} -#endif - -#endif /* __NEWDEV_H */ Copied: branches/header-work/include/psdk/nettypes.h (from r46874, branches/header-work/include/ddk/nettypes.h) URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/nettyp… ============================================================================== --- branches/header-work/include/ddk/nettypes.h [iso-8859-1] (original) +++ branches/header-work/include/psdk/nettypes.h [iso-8859-1] Mon Apr 19 18:18:04 2010 @@ -1,32 +1,22 @@ - -#ifndef _NETTYPES_ -#define _NETTYPES_ +#pragma once #define HARDWARE_ADDRESS_LENGTH 6 #define NETMAN_VARTYPE_ULONG 0 #define NETMAN_VARTYPE_HARDWARE_ADDRESS 1 #define NETMAN_VARTYPE_STRING 2 - typedef ULONG OFFSET; -typedef struct _FLAT_STRING -{ +typedef struct _FLAT_STRING { SHORT MaximumLength; SHORT Length; char Buffer [1]; } FLAT_STRING, *PFLAT_STRING; - -typedef struct _NETWORK_NAME -{ +typedef struct _NETWORK_NAME { FLAT_STRING Name; } NETWORK_NAME, *PNETWORK_NAME; -typedef struct _HARDWARE_ADDRESS -{ +typedef struct _HARDWARE_ADDRESS { UCHAR Address [HARDWARE_ADDRESS_LENGTH]; } HARDWARE_ADDRESS, *PHARDWARE_ADDRESS; - -#endif - Modified: branches/header-work/include/psdk/newdev.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/newdev… ============================================================================== --- branches/header-work/include/psdk/newdev.h [iso-8859-1] (original) +++ branches/header-work/include/psdk/newdev.h [iso-8859-1] Mon Apr 19 18:18:04 2010 @@ -20,14 +20,15 @@ * */ -#ifndef __NEWDEV_H -#define __NEWDEV_H +#pragma once + +#include <setupapi.h> #ifdef __cplusplus extern "C" { #endif -#pragma pack(push,4) +#include <pshpack1.h> /* UpdateDriverForPlugAndPlayDevices.InstallFlags constants */ #define INSTALLFLAG_FORCE 0x00000001 @@ -35,21 +36,25 @@ #define INSTALLFLAG_NONINTERACTIVE 0x00000004 #define INSTALLFLAG_BITS 0x00000007 -BOOL WINAPI +#if (WINVER >= _WIN32_WINNT_WIN2K) + +BOOL +WINAPI UpdateDriverForPlugAndPlayDevicesA( - HWND hwndParent, - LPCSTR HardwareId, - LPCSTR FullInfPath, - DWORD InstallFlags, - PBOOL bRebootRequired OPTIONAL); + HWND hwndParent, + LPCSTR HardwareId, + LPCSTR FullInfPath, + DWORD InstallFlags, + PBOOL bRebootRequired OPTIONAL); -BOOL WINAPI +BOOL +WINAPI UpdateDriverForPlugAndPlayDevicesW( - HWND hwndParent, - LPCWSTR HardwareId, - LPCWSTR FullInfPath, - DWORD InstallFlags, - PBOOL bRebootRequired OPTIONAL); + HWND hwndParent, + LPCWSTR HardwareId, + LPCWSTR FullInfPath, + DWORD InstallFlags, + PBOOL bRebootRequired OPTIONAL); #ifdef UNICODE #define UpdateDriverForPlugAndPlayDevices UpdateDriverForPlugAndPlayDevicesW @@ -57,10 +62,96 @@ #define UpdateDriverForPlugAndPlayDevices UpdateDriverForPlugAndPlayDevicesA #endif /* UNICODE */ -#pragma pack(pop) +#endif /* (WINVER >= _WIN32_WINNT_WIN2K) */ + +#if (WINVER >= _WIN32_WINNT_VISTA) + +#define DIIDFLAG_SHOWSEARCHUI 0x00000001 +#define DIIDFLAG_NOFINISHINSTALLUI 0x00000002 +#define DIIDFLAG_INSTALLNULLDRIVER 0x00000004 +#define DIIDFLAG_BITS 0x00000007 + +#define DIIRFLAG_INF_ALREADY_COPIED 0x00000001 +#define DIIRFLAG_FORCE_INF 0x00000002 +#define DIIRFLAG_HW_USING_THE_INF 0x00000004 +#define DIIRFLAG_HOTPATCH 0x00000008 +#define DIIRFLAG_NOBACKUP 0x00000010 +#define DIIRFLAG_BITS ( DIIRFLAG_FORCE_INF | DIIRFLAG_HOTPATCH) +#define DIIRFLAG_SYSTEM_BITS ( DIIRFLAG_INF_ALREADY_COPIED |\ + DIIRFLAG_FORCE_INF |\ + DIIRFLAG_HW_USING_THE_INF |\ + DIIRFLAG_HOTPATCH |\ + DIIRFLAG_NOBACKUP ) + +#define ROLLBACK_FLAG_NO_UI 0x00000001 +#define ROLLBACK_BITS 0x00000001 + +BOOL +WINAPI +DiInstallDevice( + HWND hwndParent OPTIONAL, + HDEVINFO DeviceInfoSet, + PSP_DEVINFO_DATA DeviceInfoData, + PSP_DRVINFO_DATA DriverInfoData OPTIONAL, + DWORD Flags, + PBOOL NeedReboot OPTIONAL); + +BOOL +WINAPI +DiShowUpdateDevice( + HWND hwndParent OPTIONAL, + HDEVINFO DeviceInfoSet, + PSP_DEVINFO_DATA DeviceInfoData, + DWORD Flags, + PBOOL NeedReboot OPTIONAL); + +BOOL +WINAPI +DiRollbackDriver( + HDEVINFO DeviceInfoSet, + PSP_DEVINFO_DATA DeviceInfoData, + HWND hwndParent OPTIONAL, + DWORD Flags, + PBOOL NeedReboot OPTIONAL); + +BOOL +WINAPI +DiInstallDriverW( + HWND hwndParent OPTIONAL, + LPCWSTR InfPath, + DWORD Flags, + PBOOL NeedReboot OPTIONAL); + +BOOL +WINAPI +DiInstallDriverA( + HWND hwndParent OPTIONAL, + LPCSTR InfPath, + DWORD Flags, + PBOOL NeedReboot OPTIONAL); + + +#ifdef UNICODE +#define DiInstallDriver DiInstallDriverW +#else +#define DiInstallDriver DiInstallDriverA +#endif + +#endif /* (WINVER >= _WIN32_WINNT_VISTA) */ + +#if (WINVER >= _WIN32_WINNT_WIN7) +BOOL +WINAPI +DiUninstallDevice( + HWND hwndParent, + HDEVINFO DeviceInfoSet, + PSP_DEVINFO_DATA DeviceInfoData, + DWORD Flags, + PBOOL NeedReboot OPTIONAL); +#endif /* (WINVER >= _WIN32_WINNT_WIN7) */ + +#include <poppack.h> #ifdef __cplusplus } #endif - -#endif /* __NEWDEV_H */

1 0

[jgardou] 46943: Grotesque mistake...
by jgardou＠svn.reactos.org 19 Apr '10

19 Apr '10

Author: jgardou Date: Mon Apr 19 18:04:59 2010 New Revision: 46943 URL: http://svn.reactos.org/svn/reactos?rev=46943&view=rev Log: Grotesque mistake... Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/alphablend.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/alphablend.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/alphablend.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/alphablend.c [iso-8859-1] Mon Apr 19 18:04:59 2010 @@ -140,8 +140,8 @@ SourceStretchedRect.top = 0; SourceStretchedRect.bottom = SourceStretchedSize.cy; if (!IntEngStretchBlt(SourceStretchedObj, psoSource, NULL, NULL, NULL, - NULL, NULL, &SourceStretchedRect, &InputRect, - NULL, COLORONCOLOR)) + &SourceStretchedRect, SourceRect, + NULL, NULL, NULL, ROP3_TO_ROP4(SRCCOPY))) { DPRINT1("EngStretchBlt failed!\n"); EngFreeMem(SourceStretchedObj->pvBits);

1 0

[tkreuzer] 46942: Revert r46582, to see if it fixes the regtests
by tkreuzer＠svn.reactos.org 19 Apr '10

19 Apr '10

Author: tkreuzer Date: Mon Apr 19 17:41:21 2010 New Revision: 46942 URL: http://svn.reactos.org/svn/reactos?rev=46942&view=rev Log: Revert r46582, to see if it fixes the regtests Modified: trunk/reactos/include/ddk/ntddk.h trunk/reactos/include/ddk/ntifs.h trunk/reactos/include/ddk/ntimage.h trunk/reactos/include/ddk/wdm.h trunk/reactos/include/ndk/ketypes.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/include/ddk/ntddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddk.h?rev=46… Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=46… Modified: trunk/reactos/include/ddk/ntimage.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntimage.h?rev=… Modified: trunk/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=4694… Modified: trunk/reactos/include/ndk/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ketypes.h?rev=…

1 0

[jgardou] 46941: [WIN32K] - HW accelerated StretchBlt when possible in EngAlphaBlend
by jgardou＠svn.reactos.org 19 Apr '10

19 Apr '10

Author: jgardou Date: Mon Apr 19 17:15:17 2010 New Revision: 46941 URL: http://svn.reactos.org/svn/reactos?rev=46941&view=rev Log: [WIN32K] - HW accelerated StretchBlt when possible in EngAlphaBlend Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/alphablend.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/alphablend.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/alphablend.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/alphablend.c [iso-8859-1] Mon Apr 19 17:15:17 2010 @@ -139,12 +139,7 @@ SourceStretchedRect.right = SourceStretchedSize.cx; SourceStretchedRect.top = 0; SourceStretchedRect.bottom = SourceStretchedSize.cy; - /* FIXME: IntEngStretchBlt isn't used here atm because it results in a - try to acquire an already acquired mutex (lock the already locked source surface) */ - /*if (!IntEngStretchBlt(SourceStretchedObj, psoSource, NULL, NULL, - NULL, &SourceStretchedRect, SourceRect, NULL, - NULL, NULL, COLORONCOLOR))*/ - if (!EngStretchBlt(SourceStretchedObj, psoSource, NULL, NULL, NULL, + if (!IntEngStretchBlt(SourceStretchedObj, psoSource, NULL, NULL, NULL, NULL, NULL, &SourceStretchedRect, &InputRect, NULL, COLORONCOLOR)) {

1 0

[jgardou] 46940: [WIN32K] - Get rid of IntEngBitBltEx, it's Exness isn't needed anymore
by jgardou＠svn.reactos.org 19 Apr '10

19 Apr '10

Author: jgardou Date: Mon Apr 19 17:08:03 2010 New Revision: 46940 URL: http://svn.reactos.org/svn/reactos?rev=46940&view=rev Log: [WIN32K] - Get rid of IntEngBitBltEx, it's Exness isn't needed anymore Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/bitblt.c branches/reactos-yarotows/subsystems/win32/win32k/eng/mouse.c branches/reactos-yarotows/subsystems/win32/win32k/include/inteng.h Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/bitblt.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] Mon Apr 19 17:08:03 2010 @@ -521,7 +521,7 @@ } BOOL APIENTRY -IntEngBitBltEx( +IntEngBitBlt( SURFOBJ *psoTrg, SURFOBJ *psoSrc, SURFOBJ *psoMask, @@ -532,8 +532,7 @@ POINTL *pptlMask, BRUSHOBJ *pbo, POINTL *pptlBrush, - ROP4 rop4, - BOOL bRemoveMouse) + ROP4 rop4) { SURFACE *psurfTrg; SURFACE *psurfSrc = NULL; @@ -950,17 +949,17 @@ /* Dummy BitBlt to let driver know that it should flush its changes. This should really be done using a call to DrvSynchronizeSurface, but the VMware driver doesn't hook that call. */ - IntEngBitBltEx(psoDest, NULL, psoMask, ClipRegion, DestColorTranslation, + IntEngBitBlt(psoDest, NULL, psoMask, ClipRegion, DestColorTranslation, DestRect, pptlMask, pptlMask, pbo, BrushOrigin, - R4_NOOP, FALSE); + R4_NOOP); ret = EngMaskBitBlt(psoDest, psoMask, ClipRegion, DestColorTranslation, SourceColorTranslation, &OutputRect, &InputPoint, pbo, BrushOrigin); /* Dummy BitBlt to let driver know that something has changed. */ - IntEngBitBltEx(psoDest, NULL, psoMask, ClipRegion, DestColorTranslation, + IntEngBitBlt(psoDest, NULL, psoMask, ClipRegion, DestColorTranslation, DestRect, pptlMask, pptlMask, pbo, BrushOrigin, - R4_NOOP, FALSE); + R4_NOOP); return ret; } Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/mouse.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/mouse.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/mouse.c [iso-8859-1] Mon Apr 19 17:08:03 2010 @@ -162,7 +162,7 @@ ptlSave.x = rclDest.left - pt.x; ptlSave.y = rclDest.top - pt.y; - IntEngBitBltEx(psoDest, + IntEngBitBlt(psoDest, &pgp->psurfSave->SurfObj, NULL, NULL, @@ -172,8 +172,7 @@ &ptlSave, NULL, NULL, - ROP3_TO_ROP4(SRCCOPY), - FALSE); + ROP3_TO_ROP4(SRCCOPY)); } VOID @@ -213,7 +212,7 @@ rclPointer.bottom = min(pgp->Size.cy, psoDest->sizlBitmap.cy - pt.y); /* Copy the pixels under the cursor to temporary surface. */ - IntEngBitBltEx(&pgp->psurfSave->SurfObj, + IntEngBitBlt(&pgp->psurfSave->SurfObj, psoDest, NULL, NULL, @@ -223,13 +222,12 @@ NULL, NULL, NULL, - ROP3_TO_ROP4(SRCCOPY), - FALSE); + ROP3_TO_ROP4(SRCCOPY)); /* Blt the pointer on the screen. */ if (pgp->psurfColor) { - IntEngBitBltEx(psoDest, + IntEngBitBlt(psoDest, &pgp->psurfMask->SurfObj, NULL, NULL, @@ -239,10 +237,9 @@ NULL, NULL, NULL, - ROP3_TO_ROP4(SRCAND), - FALSE); - - IntEngBitBltEx(psoDest, + ROP3_TO_ROP4(SRCAND)); + + IntEngBitBlt(psoDest, &pgp->psurfColor->SurfObj, NULL, NULL, @@ -252,12 +249,11 @@ NULL, NULL, NULL, - ROP3_TO_ROP4(SRCINVERT), - FALSE); + ROP3_TO_ROP4(SRCINVERT)); } else { - IntEngBitBltEx(psoDest, + IntEngBitBlt(psoDest, &pgp->psurfMask->SurfObj, NULL, NULL, @@ -267,12 +263,11 @@ NULL, NULL, NULL, - ROP3_TO_ROP4(SRCAND), - FALSE); + ROP3_TO_ROP4(SRCAND)); rclPointer.top += pgp->Size.cy; - IntEngBitBltEx(psoDest, + IntEngBitBlt(psoDest, &pgp->psurfMask->SurfObj, NULL, NULL, @@ -282,8 +277,7 @@ NULL, NULL, NULL, - ROP3_TO_ROP4(SRCINVERT), - FALSE); + ROP3_TO_ROP4(SRCINVERT)); } } Modified: branches/reactos-yarotows/subsystems/win32/win32k/include/inteng.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/include/inteng.h [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/include/inteng.h [iso-8859-1] Mon Apr 19 17:08:03 2010 @@ -45,7 +45,7 @@ MIX mix); BOOL APIENTRY -IntEngBitBltEx(SURFOBJ *DestObj, +IntEngBitBlt(SURFOBJ *DestObj, SURFOBJ *SourceObj, SURFOBJ *Mask, CLIPOBJ *ClipRegion, @@ -55,14 +55,7 @@ POINTL *MaskOrigin, BRUSHOBJ *Brush, POINTL *BrushOrigin, - ROP4 Rop4, - BOOL RemoveMouse); -#define IntEngBitBlt(DestObj, SourceObj, Mask, ClipRegion, ColorTranslation, \ - DestRect, SourcePoint, MaskOrigin, Brush, BrushOrigin, \ - Rop4) \ - IntEngBitBltEx((DestObj), (SourceObj), (Mask), (ClipRegion), \ - (ColorTranslation), (DestRect), (SourcePoint), \ - (MaskOrigin), (Brush), (BrushOrigin), (Rop4), TRUE) + ROP4 Rop4); BOOL APIENTRY IntEngStretchBlt(SURFOBJ *DestObj,

1 0

[jgardou] 46939: [WIN32K] - move mouse related ppdev locking to Gre* functions Spotted by Physicus
by jgardou＠svn.reactos.org 19 Apr '10

19 Apr '10

Author: jgardou Date: Mon Apr 19 16:17:26 2010 New Revision: 46939 URL: http://svn.reactos.org/svn/reactos?rev=46939&view=rev Log: [WIN32K] - move mouse related ppdev locking to Gre* functions Spotted by Physicus Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/mouse.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/mouse.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/mouse.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/mouse.c [iso-8859-1] Mon Apr 19 16:17:26 2010 @@ -531,9 +531,7 @@ if(ppdev->SafetyRemoveLevel) return ; - EngAcquireSemaphore(ppdev->hsemDevLock); ppdev->pfnMovePointer(pso, x, y, prcl); - EngReleaseSemaphore(ppdev->hsemDevLock); } ULONG APIENTRY @@ -555,7 +553,6 @@ pfnSetPointerShape = GDIDEVFUNCS(pso).SetPointerShape; - EngAcquireSemaphore(ppdev->hsemDevLock); if (pfnSetPointerShape) { ulResult = pfnSetPointerShape(pso, @@ -593,8 +590,6 @@ ppdev->pfnMovePointer = EngMovePointer; } - EngReleaseSemaphore(ppdev->hsemDevLock); - return ulResult; } @@ -623,11 +618,13 @@ } ASSERT(pdc->dctype == DCTYPE_DIRECT); + EngAcquireSemaphore(pdc->ppdev->hsemDevLock); /* We're not sure DC surface is the good one */ psurf = pdc->ppdev->pSurface; if (!psurf) { DPRINT1("DC has no surface.\n"); + EngReleaseSemaphore(pdc->ppdev->hsemDevLock); DC_UnlockDc(pdc); return 0; } @@ -675,6 +672,8 @@ if (psurfMask) SURFACE_ShareUnlockSurface(psurfMask); + EngReleaseSemaphore(pdc->ppdev->hsemDevLock); + /* Unlock the DC */ DC_UnlockDc(pdc); @@ -701,12 +700,14 @@ } ASSERT(pdc->dctype == DCTYPE_DIRECT); + EngAcquireSemaphore(pdc->ppdev->hsemDevLock); /* Store the cursor exclude position in the PDEV */ prcl = &pdc->ppdev->Pointer.Exclude; /* Call Eng/Drv function */ IntEngMovePointer(&pdc->ppdev->pSurface->SurfObj, x, y, prcl); + EngReleaseSemaphore(pdc->ppdev->hsemDevLock); /* Unlock the DC */ DC_UnlockDc(pdc); }

1 0

[fireball] 46938: - Sync activeds, atl, avifil32, cabinet to Wine-1.1.43.
by fireball＠svn.reactos.org 19 Apr '10

19 Apr '10

Author: fireball Date: Mon Apr 19 16:03:42 2010 New Revision: 46938 URL: http://svn.reactos.org/svn/reactos?rev=46938&view=rev Log: - Sync activeds, atl, avifil32, cabinet to Wine-1.1.43. Modified: trunk/reactos/dll/win32/activeds/activeds.spec trunk/reactos/dll/win32/activeds/activeds_main.c trunk/reactos/dll/win32/atl/atl_ax.c trunk/reactos/dll/win32/avifil32/rsrc.rc trunk/reactos/dll/win32/cabinet/fdi.c trunk/reactos/dll/win32/ole32/compobj.c trunk/reactos/include/psdk/objbase.h trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/dll/win32/activeds/activeds.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/activeds/actived… ============================================================================== --- trunk/reactos/dll/win32/activeds/activeds.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/activeds/activeds.spec [iso-8859-1] Mon Apr 19 16:03:42 2010 @@ -6,7 +6,7 @@ 8 stub ADsBuildVarArrayInt 9 stdcall ADsOpenObject(wstr wstr wstr long ptr ptr) 12 stub ADsSetLastError -13 stub ADsGetLastError +13 stdcall ADsGetLastError(ptr ptr long ptr long) 14 stub AllocADsMem 15 stdcall FreeADsMem(ptr) 16 stub ReallocADsMem Modified: trunk/reactos/dll/win32/activeds/activeds_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/activeds/actived… ============================================================================== --- trunk/reactos/dll/win32/activeds/activeds_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/activeds/activeds_main.c [iso-8859-1] Mon Apr 19 16:03:42 2010 @@ -95,6 +95,15 @@ } /***************************************************** + * ADsGetLastError [ACTIVEDS.13] + */ +HRESULT WINAPI ADsGetLastError(LPDWORD perror, LPWSTR errorbuf, DWORD errorbuflen, LPWSTR namebuf, DWORD namebuflen) +{ + FIXME("(%p,%p,%d,%p,%d)!stub\n", perror, errorbuf, errorbuflen, namebuf, namebuflen); + return E_NOTIMPL; +} + +/***************************************************** * FreeADsMem [ACTIVEDS.15] */ BOOL WINAPI FreeADsMem(LPVOID pMem) Modified: trunk/reactos/dll/win32/atl/atl_ax.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/atl_ax.c?rev… ============================================================================== --- trunk/reactos/dll/win32/atl/atl_ax.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/atl/atl_ax.c [iso-8859-1] Mon Apr 19 16:03:42 2010 @@ -950,7 +950,7 @@ TRACE("(%s %p %p %p %p %p %p)\n", debugstr_w(lpszName), hWnd, pStream, ppUnkContainer, ppUnkControl, iidSink, punkSink); - hRes = CLSIDFromString( (LPOLESTR) lpszName, &controlId ); + hRes = CLSIDFromString( lpszName, &controlId ); if ( FAILED(hRes) ) hRes = CLSIDFromProgID( lpszName, &controlId ); if ( SUCCEEDED( hRes ) ) Modified: trunk/reactos/dll/win32/avifil32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/rsrc.rc… ============================================================================== --- trunk/reactos/dll/win32/avifil32/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/rsrc.rc [iso-8859-1] Mon Apr 19 16:03:42 2010 @@ -1,7 +1,7 @@ /* * Top level resource file for avifil32.dll * - * Copyright 2002 Michael Günnewig + * Copyright 2002 Michael GÃ¼nnewig * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,10 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winver.h" #include "avifile_private.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/cabinet/fdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/fdi.c?re… ============================================================================== --- trunk/reactos/dll/win32/cabinet/fdi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cabinet/fdi.c [iso-8859-1] Mon Apr 19 16:03:42 2010 @@ -77,7 +77,7 @@ struct fdi_file { struct fdi_file *next; /* next file in sequence */ - LPCSTR filename; /* output name of file */ + LPSTR filename; /* output name of file */ int fh; /* open file handle or NULL */ cab_ULONG length; /* uncompressed length of file */ cab_ULONG offset; /* uncompressed offset in folder */ @@ -2301,7 +2301,7 @@ } while (CAB(firstfile)) { file = CAB(firstfile); - if (file->filename) PFDI_FREE(hfdi, (void *)file->filename); + if (file->filename) PFDI_FREE(hfdi, file->filename); CAB(firstfile) = CAB(firstfile)->next; PFDI_FREE(hfdi, file); } Modified: trunk/reactos/dll/win32/ole32/compobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/compobj.c?… ============================================================================== --- trunk/reactos/dll/win32/ole32/compobj.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/compobj.c [iso-8859-1] Mon Apr 19 16:03:42 2010 @@ -1566,7 +1566,7 @@ /*****************************************************************************/ -HRESULT WINAPI CLSIDFromString(LPOLESTR idstr, CLSID *id ) +HRESULT WINAPI CLSIDFromString(LPCOLESTR idstr, LPCLSID id ) { HRESULT ret; Modified: trunk/reactos/include/psdk/objbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/objbase.h?rev… ============================================================================== --- trunk/reactos/include/psdk/objbase.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/objbase.h [iso-8859-1] Mon Apr 19 16:03:42 2010 @@ -225,10 +225,9 @@ #define THIS void #define interface struct -#define DECLARE_INTERFACE(iface) interface iface -#define DECLARE_INTERFACE_(iface,ibase) interface iface : public ibase -#define DECLARE_INTERFACE_IID(iface, iid) interface DECLSPEC_UUID(iid) iface -#define DECLARE_INTERFACE_IID_(iface, baseiface, iid) interface DECLSPEC_UUID(iid) iface : public baseiface +#define DECLARE_INTERFACE(iface) interface DECLSPEC_NOVTABLE iface +#define DECLARE_INTERFACE_(iface,ibase) interface DECLSPEC_NOVTABLE iface : public ibase +#define DECLARE_INTERFACE_IID_(iface, ibase, iid) interface DECLSPEC_UUID(iid) DECLSPEC_NOVTABLE iface : public ibase #define BEGIN_INTERFACE #define END_INTERFACE @@ -268,6 +267,7 @@ struct iface##Vtbl #endif #define DECLARE_INTERFACE_(iface,ibase) DECLARE_INTERFACE(iface) +#define DECLARE_INTERFACE_IID_(iface, ibase, iid) DECLARE_INTERFACE_(iface, ibase) #define BEGIN_INTERFACE #define END_INTERFACE @@ -431,7 +431,7 @@ * GUID API */ HRESULT WINAPI StringFromCLSID(REFCLSID id, LPOLESTR*); -HRESULT WINAPI CLSIDFromString(LPOLESTR, CLSID *); +HRESULT WINAPI CLSIDFromString(LPCOLESTR, LPCLSID); HRESULT WINAPI CLSIDFromProgID(LPCOLESTR progid, LPCLSID riid); HRESULT WINAPI ProgIDFromCLSID(REFCLSID clsid, LPOLESTR *lplpszProgID); Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=4… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Mon Apr 19 16:03:42 2010 @@ -61,6 +61,14 @@ #define UNALIGNED __unaligned #else #define UNALIGNED +#endif + +#ifndef DECLSPEC_NOVTABLE +# if defined(_MSC_VER) && (_MSC_VER >= 1100) && defined(__cplusplus) +# define DECLSPEC_NOVTABLE __declspec(novtable) +# else +# define DECLSPEC_NOVTABLE +# endif #endif #ifndef DECLSPEC_ADDRSAFE

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
44
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2010