Ros-diffs March 2010

ros-diffs@reactos.org

19 participants
896 discussions

[cgutman] 46600: [NTOSKRNL] - Disable ACPI until the resource detection problems are resolved
by cgutman＠svn.reactos.org 30 Mar '10

30 Mar '10

Author: cgutman Date: Tue Mar 30 18:34:17 2010 New Revision: 46600 URL: http://svn.reactos.org/svn/reactos?rev=46600&view=rev Log: [NTOSKRNL] - Disable ACPI until the resource detection problems are resolved Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Tue Mar 30 18:34:17 2010 @@ -13,7 +13,7 @@ #define NDEBUG #include <debug.h> -#define ENABLE_ACPI +//#define ENABLE_ACPI /* GLOBALS *******************************************************************/

1 0

[tkreuzer] 46599: merge from amd64 branch: 38333 [INTRIN_X86] #define _alloca() to __builtin_alloca() on amd64 46388 [INTRIN_X86] - Add __stosq, __movsq, _bittest64
by tkreuzer＠svn.reactos.org 30 Mar '10

30 Mar '10

Author: tkreuzer Date: Tue Mar 30 18:25:51 2010 New Revision: 46599 URL: http://svn.reactos.org/svn/reactos?rev=46599&view=rev Log: merge from amd64 branch: 38333 [INTRIN_X86] #define _alloca() to __builtin_alloca() on amd64 46388 [INTRIN_X86] - Add __stosq, __movsq, _bittest64 Modified: trunk/reactos/include/crt/mingw32/intrin_x86.h Modified: trunk/reactos/include/crt/mingw32/intrin_x86.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/mingw32/intrin… ============================================================================== --- trunk/reactos/include/crt/mingw32/intrin_x86.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/mingw32/intrin_x86.h [iso-8859-1] Tue Mar 30 18:25:51 2010 @@ -74,6 +74,10 @@ #define _AddressOfReturnAddress() (&(((void **)(__builtin_frame_address(0)))[1])) /* TODO: __getcallerseflags but how??? */ +/* Maybe the same for x86? */ +#ifdef _x86_64 +#define _alloca(s) __builtin_alloca(s) +#endif /*** Atomic operations ***/ @@ -565,6 +569,18 @@ ); } +#ifdef _M_AMD64 +__INTRIN_INLINE void __stosq(unsigned __int64 * Dest, const unsigned __int64 Data, size_t Count) +{ + __asm__ __volatile__ + ( + "rep; stosq" : + [Dest] "=D" (Dest), [Count] "=c" (Count) : + "[Dest]" (Dest), "a" (Data), "[Count]" (Count) + ); +} +#endif + __INTRIN_INLINE void __movsb(unsigned char * Destination, const unsigned char * Source, size_t Count) { __asm__ __volatile__ @@ -594,6 +610,18 @@ "[Destination]" (Destination), "[Source]" (Source), "[Count]" (Count) ); } + +#ifdef _M_AMD64 +__INTRIN_INLINE void __movsq(unsigned long * Destination, const unsigned long * Source, size_t Count) +{ + __asm__ __volatile__ + ( + "rep; movsq" : + [Destination] "=D" (Destination), [Source] "=S" (Source), [Count] "=c" (Count) : + "[Destination]" (Destination), "[Source]" (Source), "[Count]" (Count) + ); +} +#endif #if defined(_M_AMD64) /*** GS segment addressing ***/ @@ -786,6 +814,20 @@ return retval; } + +#ifdef _M_AMD64 +__INTRIN_INLINE unsigned char _bittest64(const __int64 * const a, const __int64 b) +{ + unsigned char retval; + + if(__builtin_constant_p(b)) + __asm__("bt %[b], %[a]; setb %b[retval]" : [retval] "=q" (retval) : [a] "mr" (*(a + (b / 64))), [b] "Ir" (b % 64)); + else + __asm__("bt %[b], %[a]; setb %b[retval]" : [retval] "=q" (retval) : [a] "mr" (*a), [b] "r" (b)); + + return retval; +} +#endif __INTRIN_INLINE unsigned char _bittestandcomplement(long * const a, const long b) {

1 0

[tkreuzer] 46598: [KERNEL32] Add some amd64 exports
by tkreuzer＠svn.reactos.org 30 Mar '10

30 Mar '10

Author: tkreuzer Date: Tue Mar 30 18:17:48 2010 New Revision: 46598 URL: http://svn.reactos.org/svn/reactos?rev=46598&view=rev Log: [KERNEL32] Add some amd64 exports Modified: trunk/reactos/dll/win32/kernel32/kernel32.pspec Modified: trunk/reactos/dll/win32/kernel32/kernel32.pspec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.pspec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.pspec [iso-8859-1] Tue Mar 30 18:17:48 2010 @@ -761,11 +761,19 @@ @ stdcall ResumeThread(long) @ stdcall RtlCaptureContext(ptr) ntdll.RtlCaptureContext @ stdcall RtlCaptureStackBackTrace(long long ptr ptr) ntdll.RtlCaptureStackBackTrace +@ stdcall -arch=x86_64 RtlCompareMemory(ptr ptr ptr) +@ stdcall -arch=x86_64 RtlCopyMemory(ptr ptr ptr) +@ stdcall -arch=x86_64 RtlDeleteFunctionTable(ptr) @ stdcall RtlFillMemory(ptr long long) ntdll.RtlFillMemory +@ stdcall -arch=x86_64 RtlInstallFunctionTableCallback(double double long ptr ptr ptr) +@ stdcall -arch=x86_64 RtlLookupFunctionEntry(ptr ptr ptr) ntdll.RtlLookupFunctionEntry @ stdcall RtlMoveMemory(ptr ptr long) ntdll.RtlMoveMemory +@ stdcall -arch=x86_64 RtlPcToFileHeader(ptr ptr) ntdll.RtlPcToFileHeader +@ stdcall -arch=x86_64 RtlRaiseException(ptr) ntdll.RtlRaiseException +@ stdcall -arch=x86_64 RtlRestoreContext(ptr ptr) ntdll.RtlRestoreContext @ stdcall RtlUnwind(ptr ptr ptr long) ntdll.RtlUnwind -@ stdcall RtlVirtualUnwind(ptr ptr ptr long) ntdll.RtlVirtualUnwind -@ stdcall RtlLookupFunctionEntry(ptr ptr ptr) ntdll.RtlLookupFunctionEntry +@ stdcall -arch=x86_64 RtlUnwindEx(ptr ptr ptr ptr ptr ptr) ntdll.RtlUnwindEx +@ stdcall -arch=x86_64 RtlVirtualUnwind(ptr ptr ptr long) ntdll.RtlVirtualUnwind @ stdcall RtlZeroMemory(ptr long) ntdll.RtlZeroMemory @ stdcall ScrollConsoleScreenBufferA(long ptr ptr ptr ptr) @ stdcall ScrollConsoleScreenBufferW(long ptr ptr ptr ptr)

1 0

[tkreuzer] 46597: Merge from amd64 branch: 46478 [CRT] - define _CRTBLD - rename float_t/double_t/long_double_t to float_s/double_s/long_double_s to avoid name conflicts 46511 [FREELDR] snprintf -> _snprintf 46534 [CRT] - Set crt="static" in freeldr, rtl, bmfs, ftfd, rtl, mini_hal - define "CRTDLL" in ntdll, crtdll, msvcrt, msvcrt20, msvcrt40 46535 [CRT HEADERS] - add _mingw_mac.h from ming-w64 and include it into _mingw.h - Update _CRTIMP definition - Fix definition of _wctype - onexit is not _
by tkreuzer＠svn.reactos.org 30 Mar '10

30 Mar '10

Author: tkreuzer Date: Tue Mar 30 15:30:36 2010 New Revision: 46597 URL: http://svn.reactos.org/svn/reactos?rev=46597&view=rev Log: Merge from amd64 branch: 46478 [CRT] - define _CRTBLD - rename float_t/double_t/long_double_t to float_s/double_s/long_double_s to avoid name conflicts 46511 [FREELDR] snprintf -> _snprintf 46534 [CRT] - Set crt="static" in freeldr, rtl, bmfs, ftfd, rtl, mini_hal - define "CRTDLL" in ntdll, crtdll, msvcrt, msvcrt20, msvcrt40 46535 [CRT HEADERS] - add _mingw_mac.h from ming-w64 and include it into _mingw.h - Update _CRTIMP definition - Fix definition of _wctype - onexit is not _CRTIMP 46537 [MINGW] Update mingw library to mingw-w64 trunk (mingw-w64-src_20100325) 46538 Apply MSVC compilation fix. 46539 [MINGW] Apply MSVC compilation fixes Added: trunk/reactos/include/crt/_mingw_mac.h - copied unchanged from r46535, branches/ros-amd64-bringup/reactos/include/crt/_mingw_mac.h trunk/reactos/include/reactos/mingw-w64/reactos.diff (with props) trunk/reactos/lib/3rdparty/mingw/CRT_glob.c (with props) trunk/reactos/lib/3rdparty/mingw/CRT_noglob.c - copied unchanged from r46537, branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/CRT_noglob.c trunk/reactos/lib/3rdparty/mingw/binmode.c (with props) trunk/reactos/lib/3rdparty/mingw/crt_handler.c (with props) trunk/reactos/lib/3rdparty/mingw/crtbegin.c - copied unchanged from r46537, branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crtbegin.c trunk/reactos/lib/3rdparty/mingw/crtend.c - copied unchanged from r46537, branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crtend.c trunk/reactos/lib/3rdparty/mingw/dll_argv.c (with props) trunk/reactos/lib/3rdparty/mingw/isascii.c - copied unchanged from r46537, branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/isascii.c trunk/reactos/lib/3rdparty/mingw/iscsym.c - copied unchanged from r46537, branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/iscsym.c trunk/reactos/lib/3rdparty/mingw/iscsymf.c - copied unchanged from r46537, branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/iscsymf.c trunk/reactos/lib/3rdparty/mingw/mingw_custom.c (with props) trunk/reactos/lib/3rdparty/mingw/reactos.diff (with props) trunk/reactos/lib/3rdparty/mingw/strcasecmp.c - copied unchanged from r46537, branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/strcasecmp.c trunk/reactos/lib/3rdparty/mingw/strncasecmp.c - copied unchanged from r46537, branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/strncasecmp.c trunk/reactos/lib/3rdparty/mingw/tlsmcrt.c - copied unchanged from r46537, branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/tlsmcrt.c trunk/reactos/lib/3rdparty/mingw/tlsmthread.c - copied unchanged from r46537, branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/tlsmthread.c trunk/reactos/lib/3rdparty/mingw/tlsthrd.c - copied unchanged from r46537, branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/tlsthrd.c trunk/reactos/lib/3rdparty/mingw/toascii.c - copied unchanged from r46537, branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/toascii.c trunk/reactos/lib/3rdparty/mingw/txtmode.c (with props) trunk/reactos/lib/3rdparty/mingw/ucrtexe.c - copied unchanged from r46537, branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/ucrtexe.c trunk/reactos/lib/3rdparty/mingw/udll_argv.c - copied unchanged from r46537, branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/udll_argv.c trunk/reactos/lib/3rdparty/mingw/udllargc.c - copied unchanged from r46537, branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/udllargc.c trunk/reactos/lib/3rdparty/mingw/wcscmpi.c - copied unchanged from r46537, branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/wcscmpi.c Removed: trunk/reactos/lib/3rdparty/mingw/getopt.c Modified: trunk/reactos/ (props changed) trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild trunk/reactos/boot/freeldr/freeldr/freeldr_main.rbuild trunk/reactos/boot/freeldr/freeldr/setupldr_main.rbuild trunk/reactos/boot/freeldr/freeldr/windows/winldr.c trunk/reactos/dll/directx/bdaplgin/classfactory.cpp (props changed) trunk/reactos/dll/directx/d3d8/d3d8.spec (props changed) trunk/reactos/dll/directx/dsound_new/classfactory.c (props changed) trunk/reactos/dll/directx/dsound_new/dsound.spec (props changed) trunk/reactos/dll/directx/dsound_new/dsound_convert.c (props changed) trunk/reactos/dll/directx/dsound_new/regsvr.c (props changed) trunk/reactos/dll/ntdll/ntdll.rbuild trunk/reactos/dll/shellext/devcpux/devcpux.spec (props changed) trunk/reactos/dll/shellext/slayer/slayer.spec (props changed) trunk/reactos/dll/win32/crtdll/crtdll.rbuild trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild trunk/reactos/dll/win32/msvcrt20/msvcrt20.rbuild trunk/reactos/dll/win32/msvcrt40/msvcrt40.rbuild trunk/reactos/hal/halx86/hal_generic.rbuild trunk/reactos/include/crt/_mingw.h trunk/reactos/include/crt/crtdefs.h trunk/reactos/include/crt/stdlib.h trunk/reactos/include/ndk/amd64/ (props changed) trunk/reactos/include/ndk/amd64/asmmacro.S (props changed) trunk/reactos/include/reactos/mingw-w64/internal.h trunk/reactos/include/reactos/mingw-w64/oscalls.h trunk/reactos/include/reactos/mingw-w64/sect_attribs.h trunk/reactos/lib/3rdparty/mingw/CRT_fp10.c trunk/reactos/lib/3rdparty/mingw/CRT_fp8.c trunk/reactos/lib/3rdparty/mingw/_newmode.c trunk/reactos/lib/3rdparty/mingw/atonexit.c trunk/reactos/lib/3rdparty/mingw/charmax.c trunk/reactos/lib/3rdparty/mingw/crt0_c.c trunk/reactos/lib/3rdparty/mingw/crt0_w.c trunk/reactos/lib/3rdparty/mingw/crtdll.c trunk/reactos/lib/3rdparty/mingw/crtexe.c trunk/reactos/lib/3rdparty/mingw/dllargv.c trunk/reactos/lib/3rdparty/mingw/dllentry.c trunk/reactos/lib/3rdparty/mingw/dllmain.c trunk/reactos/lib/3rdparty/mingw/gccmain.c trunk/reactos/lib/3rdparty/mingw/gs_support.c trunk/reactos/lib/3rdparty/mingw/merr.c trunk/reactos/lib/3rdparty/mingw/mingw.rbuild trunk/reactos/lib/3rdparty/mingw/mingw_helpers.c trunk/reactos/lib/3rdparty/mingw/natstart.c trunk/reactos/lib/3rdparty/mingw/pesect.c trunk/reactos/lib/3rdparty/mingw/pseudo-reloc-list.c trunk/reactos/lib/3rdparty/mingw/pseudo-reloc.c trunk/reactos/lib/3rdparty/mingw/tlssup.c trunk/reactos/lib/3rdparty/mingw/wildcard.c trunk/reactos/lib/3rdparty/mingw/xncommod.c trunk/reactos/lib/3rdparty/mingw/xthdloc.c trunk/reactos/lib/3rdparty/mingw/xtxtmode.c trunk/reactos/lib/rtl/rtl.rbuild trunk/reactos/lib/sdk/crt/crt.rbuild trunk/reactos/lib/sdk/crt/except/xcptfil.c trunk/reactos/lib/sdk/crt/float/chgsign.c trunk/reactos/lib/sdk/crt/float/copysign.c trunk/reactos/lib/sdk/crt/float/fpclass.c trunk/reactos/lib/sdk/crt/float/isnan.c trunk/reactos/lib/sdk/crt/float/scalb.c trunk/reactos/lib/sdk/crt/include/internal/ieee.h trunk/reactos/lib/sdk/crt/libcntpr.rbuild trunk/reactos/lib/sdk/crt/math/frexp.c trunk/reactos/lib/sdk/crt/math/huge_val.c trunk/reactos/lib/sdk/crt/math/modf.c trunk/reactos/lib/sdk/crt/time/ (props changed) trunk/reactos/ntoskrnl/kdbg/ (props changed) trunk/reactos/subsystems/win32/win32k/include/engobjects.h (props changed) trunk/reactos/tools/rsym/rsym.c (props changed) trunk/reactos/tools/rsym/rsym.h (props changed) trunk/reactos/tools/rsym/rsym.mak (props changed) trunk/reactos/tools/rsym/rsym_common.c (props changed) [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_main.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… Modified: trunk/reactos/boot/freeldr/freeldr/setupldr_main.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/setup… Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… Modified: trunk/reactos/dll/ntdll/ntdll.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ntdll.rbuild?rev… Modified: trunk/reactos/dll/win32/crtdll/crtdll.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crtdll/crtdll.rb… Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.rb… Modified: trunk/reactos/dll/win32/msvcrt20/msvcrt20.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt20/msvcrt2… Modified: trunk/reactos/dll/win32/msvcrt40/msvcrt40.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt40/msvcrt4… Modified: trunk/reactos/hal/halx86/hal_generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal_generic.rbu… Modified: trunk/reactos/include/crt/_mingw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/_mingw.h?rev=4… Modified: trunk/reactos/include/crt/crtdefs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/crtdefs.h?rev=… Modified: trunk/reactos/include/crt/stdlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/stdlib.h?rev=4… Modified: trunk/reactos/include/reactos/mingw-w64/internal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mingw-w64/… Modified: trunk/reactos/include/reactos/mingw-w64/oscalls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mingw-w64/… Added: trunk/reactos/include/reactos/mingw-w64/reactos.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mingw-w64/… Modified: trunk/reactos/include/reactos/mingw-w64/sect_attribs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mingw-w64/… Modified: trunk/reactos/lib/3rdparty/mingw/CRT_fp10.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/CRT_fp1… Modified: trunk/reactos/lib/3rdparty/mingw/CRT_fp8.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/CRT_fp8… Added: trunk/reactos/lib/3rdparty/mingw/CRT_glob.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/CRT_glo… Modified: trunk/reactos/lib/3rdparty/mingw/_newmode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/_newmod… Modified: trunk/reactos/lib/3rdparty/mingw/atonexit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/atonexi… Added: trunk/reactos/lib/3rdparty/mingw/binmode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/binmode… Modified: trunk/reactos/lib/3rdparty/mingw/charmax.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/charmax… Modified: trunk/reactos/lib/3rdparty/mingw/crt0_c.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/crt0_c.… Modified: trunk/reactos/lib/3rdparty/mingw/crt0_w.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/crt0_w.… Added: trunk/reactos/lib/3rdparty/mingw/crt_handler.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/crt_han… Modified: trunk/reactos/lib/3rdparty/mingw/crtdll.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/crtdll.… Modified: trunk/reactos/lib/3rdparty/mingw/crtexe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/crtexe.… Added: trunk/reactos/lib/3rdparty/mingw/dll_argv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/dll_arg… Modified: trunk/reactos/lib/3rdparty/mingw/dllargv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/dllargv… Modified: trunk/reactos/lib/3rdparty/mingw/dllentry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/dllentr… Modified: trunk/reactos/lib/3rdparty/mingw/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/dllmain… Modified: trunk/reactos/lib/3rdparty/mingw/gccmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/gccmain… Removed: trunk/reactos/lib/3rdparty/mingw/getopt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/getopt.… Modified: trunk/reactos/lib/3rdparty/mingw/gs_support.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/gs_supp… Modified: trunk/reactos/lib/3rdparty/mingw/merr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/merr.c?… Modified: trunk/reactos/lib/3rdparty/mingw/mingw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/mingw.r… Added: trunk/reactos/lib/3rdparty/mingw/mingw_custom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/mingw_c… Modified: trunk/reactos/lib/3rdparty/mingw/mingw_helpers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/mingw_h… Modified: trunk/reactos/lib/3rdparty/mingw/natstart.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/natstar… Modified: trunk/reactos/lib/3rdparty/mingw/pesect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/pesect.… Modified: trunk/reactos/lib/3rdparty/mingw/pseudo-reloc-list.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/pseudo-… Modified: trunk/reactos/lib/3rdparty/mingw/pseudo-reloc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/pseudo-… Added: trunk/reactos/lib/3rdparty/mingw/reactos.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/reactos… Modified: trunk/reactos/lib/3rdparty/mingw/tlssup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/tlssup.… Added: trunk/reactos/lib/3rdparty/mingw/txtmode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/txtmode… Modified: trunk/reactos/lib/3rdparty/mingw/wildcard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/wildcar… Modified: trunk/reactos/lib/3rdparty/mingw/xncommod.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/xncommo… Modified: trunk/reactos/lib/3rdparty/mingw/xthdloc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/xthdloc… Modified: trunk/reactos/lib/3rdparty/mingw/xtxtmode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/xtxtmod… Modified: trunk/reactos/lib/rtl/rtl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtl.rbuild?rev=465… Modified: trunk/reactos/lib/sdk/crt/crt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.rbuild?rev… Modified: trunk/reactos/lib/sdk/crt/except/xcptfil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/xcptfil… Modified: trunk/reactos/lib/sdk/crt/float/chgsign.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/float/chgsign.… Modified: trunk/reactos/lib/sdk/crt/float/copysign.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/float/copysign… Modified: trunk/reactos/lib/sdk/crt/float/fpclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/float/fpclass.… Modified: trunk/reactos/lib/sdk/crt/float/isnan.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/float/isnan.c?… Modified: trunk/reactos/lib/sdk/crt/float/scalb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/float/scalb.c?… Modified: trunk/reactos/lib/sdk/crt/include/internal/ieee.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/include/intern… Modified: trunk/reactos/lib/sdk/crt/libcntpr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/libcntpr.rbuil… Modified: trunk/reactos/lib/sdk/crt/math/frexp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/frexp.c?r… Modified: trunk/reactos/lib/sdk/crt/math/huge_val.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/huge_val.… Modified: trunk/reactos/lib/sdk/crt/math/modf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/modf.c?re…

1 0

[akhaldi] 46596: [PSDK] - Improve ws2spi.h
by akhaldi＠svn.reactos.org 30 Mar '10

30 Mar '10

Author: akhaldi Date: Tue Mar 30 15:24:23 2010 New Revision: 46596 URL: http://svn.reactos.org/svn/reactos?rev=46596&view=rev Log: [PSDK] - Improve ws2spi.h Modified: branches/header-work/include/psdk/ws2spi.h Modified: branches/header-work/include/psdk/ws2spi.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/ws2spi… ============================================================================== --- branches/header-work/include/psdk/ws2spi.h [iso-8859-1] (original) +++ branches/header-work/include/psdk/ws2spi.h [iso-8859-1] Tue Mar 30 15:24:23 2010 @@ -15,69 +15,38 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * */ -#ifndef _WS2SPI_H +#pragma once + #define _WS2SPI_H +#ifndef _WINSOCK2API_ #include <winsock2.h> +#endif #ifdef __cplusplus extern "C" { -#endif /* __cplusplus */ +#endif + +#if !defined(_WIN64) +#include <pshpack4.h> +#endif + +#define WSPDESCRIPTION_LEN 255 + +#define WSS_OPERATION_IN_PROGRESS 0x00000103L #define WSPAPI WSAAPI -#define WSPDESCRIPTION_LEN 255 - -#ifndef RC_INVOKED typedef struct WSPData { - WORD wVersion; - WORD wHighVersion; - WCHAR szDescription[WSPDESCRIPTION_LEN+1]; + WORD wVersion; + WORD wHighVersion; + WCHAR szDescription[WSPDESCRIPTION_LEN+1]; } WSPDATA, FAR *LPWSPDATA; + typedef struct _WSATHREADID { - HANDLE ThreadHandle; - DWORD Reserved; + HANDLE ThreadHandle; + DWORD_PTR Reserved; } WSATHREADID, FAR *LPWSATHREADID; - -typedef BOOL (CALLBACK FAR *LPBLOCKINGCALLBACK)(DWORD); -typedef VOID (CALLBACK FAR *LPWSAUSERAPC)(DWORD); - -/* Prototypes for service provider procedure table */ -typedef SOCKET (WSPAPI *LPWSPACCEPT)(SOCKET,LPSOCKADDR,LPINT,LPCONDITIONPROC,DWORD,LPINT); -typedef INT (WSPAPI *LPWSPADDRESSTOSTRING)(LPSOCKADDR,DWORD,LPWSAPROTOCOL_INFOW,LPWSTR,LPDWORD,LPINT); -typedef INT (WSPAPI *LPWSPASYNCSELECT)(SOCKET,HWND,UINT,LONG,LPINT); -typedef INT (WSPAPI *LPWSPBIND)(SOCKET,const struct sockaddr*,INT,LPINT); -typedef INT (WSPAPI *LPWSPCANCELBLOCKINGCALL)(LPINT); -typedef INT (WSPAPI *LPWSPCLEANUP)(LPINT); -typedef INT (WSPAPI *LPWSPCLOSESOCKET)(SOCKET,LPINT); -typedef INT (WSPAPI *LPWSPCONNECT)(SOCKET,const struct sockaddr*,INT,LPWSABUF,LPWSABUF,LPQOS,LPQOS,LPINT); -typedef INT (WSPAPI *LPWSPDUPLICATESOCKET)(SOCKET,DWORD,LPWSAPROTOCOL_INFOW,LPINT); -typedef INT (WSPAPI *LPWSPENUMNETWORKEVENTS)(SOCKET,WSAEVENT,LPWSANETWORKEVENTS,LPINT); -typedef INT (WSPAPI *LPWSPEVENTSELECT)(SOCKET,WSAEVENT,LONG,LPINT); -typedef BOOL (WSPAPI *LPWSPGETOVERLAPPEDRESULT)(SOCKET,LPWSAOVERLAPPED,LPDWORD,BOOL,LPDWORD,LPINT); -typedef INT (WSPAPI *LPWSPGETPEERNAME)(SOCKET,LPSOCKADDR,LPINT,LPINT); -typedef BOOL (WSPAPI *LPWSPGETQOSBYNAME)(SOCKET,LPWSABUF,LPQOS,LPINT); -typedef INT (WSPAPI *LPWSPGETSOCKNAME)(SOCKET,LPSOCKADDR,LPINT,LPINT); -typedef INT (WSPAPI *LPWSPGETSOCKOPT)(SOCKET,INT,INT,CHAR FAR*,LPINT,LPINT); -typedef INT (WSPAPI *LPWSPIOCTL)(SOCKET,DWORD,LPVOID,DWORD,LPVOID,DWORD,LPDWORD, - LPWSAOVERLAPPED,LPWSAOVERLAPPED_COMPLETION_ROUTINE,LPWSATHREADID,LPINT); -typedef SOCKET (WSPAPI *LPWSPJOINLEAF)(SOCKET,const struct sockaddr*,INT,LPWSABUF,LPWSABUF,LPQOS,LPQOS,DWORD,LPINT); -typedef INT (WSPAPI *LPWSPLISTEN)(SOCKET,INT,LPINT); -typedef INT (WSPAPI *LPWSPRECV)(SOCKET,LPWSABUF,DWORD,LPDWORD,LPDWORD, -LPWSAOVERLAPPED,LPWSAOVERLAPPED_COMPLETION_ROUTINE,LPWSATHREADID,LPINT); -typedef INT (WSPAPI *LPWSPRECVDISCONNECT)(SOCKET,LPWSABUF,LPINT); -typedef INT (WSPAPI *LPWSPRECVFROM)(SOCKET,LPWSABUF,DWORD,LPDWORD,LPDWORD,LPSOCKADDR, -LPINT,LPWSAOVERLAPPED,LPWSAOVERLAPPED_COMPLETION_ROUTINE,LPWSATHREADID,LPINT); -typedef INT (WSPAPI *LPWSPSELECT)(INT,LPFD_SET,LPFD_SET,LPFD_SET,CONST LPTIMEVAL,LPINT); -typedef INT (WSPAPI *LPWSPSEND)(SOCKET,LPWSABUF,DWORD,LPDWORD,DWORD, -LPWSAOVERLAPPED,LPWSAOVERLAPPED_COMPLETION_ROUTINE,LPWSATHREADID,LPINT); -typedef INT (WSPAPI *LPWSPSENDDISCONNECT)(SOCKET,LPWSABUF,LPINT); -typedef INT (WSPAPI *LPWSPSENDTO)(SOCKET,LPWSABUF,DWORD,LPDWORD,DWORD,const struct sockaddr*, - INT,LPWSAOVERLAPPED,LPWSAOVERLAPPED_COMPLETION_ROUTINE,LPWSATHREADID,LPINT); -typedef INT (WSPAPI *LPWSPSETSOCKOPT)(SOCKET,INT,INT,CONST CHAR FAR*,INT,LPINT); -typedef INT (WSPAPI *LPWSPSHUTDOWN)(SOCKET,INT,LPINT); -typedef SOCKET (WSPAPI *LPWSPSOCKET)(INT,INT,INT,LPWSAPROTOCOL_INFOW,GROUP,DWORD,LPINT); -typedef INT (WSPAPI *LPWSPSTRINGTOADDRESS)(LPWSTR,INT,LPWSAPROTOCOL_INFOW,LPSOCKADDR,LPINT,LPINT); /* Service provider procedure table */ typedef struct _WSPPROC_TABLE { @@ -113,16 +82,48 @@ LPWSPSTRINGTOADDRESS lpWSPStringToAddress; } WSPPROC_TABLE, FAR* LPWSPPROC_TABLE; -/* Prototypes for service provider namespace procedure table */ -typedef INT (WSAAPI *LPNSPCLEANUP)(LPGUID); -typedef INT (WSAAPI *LPNSPLOOKUPSERVICEBEGIN)(LPGUID,LPWSAQUERYSETW,LPWSASERVICECLASSINFOW,DWORD,LPHANDLE); -typedef INT (WSAAPI *LPNSPLOOKUPSERVICENEXT)(HANDLE,DWORD,LPDWORD,LPWSAQUERYSETW); -typedef INT (WSAAPI *LPNSPLOOKUPSERVICEEND)(HANDLE); -typedef INT (WSAAPI *LPNSPSETSERVICE)(LPGUID,LPWSASERVICECLASSINFOW,LPWSAQUERYSETW,WSAESETSERVICEOP,DWORD); -typedef INT (WSAAPI *LPNSPINSTALLSERVICECLASS)(LPGUID,LPWSASERVICECLASSINFOW); -typedef INT (WSAAPI *LPNSPREMOVESERVICECLASS)(LPGUID,LPGUID); -typedef INT (WSAAPI *LPNSPGETSERVICECLASSINFO)(LPGUID,LPDWORD,LPWSASERVICECLASSINFOW); -typedef INT (WSAAPI *LPNSPIOCTL)(HANDLE,DWORD,LPVOID,DWORD,LPVOID,DWORD,LPDWORD,LPWSACOMPLETION,LPWSATHREADID); +/* Service Provider upcall table */ +typedef struct _WSPUPCALLTABLE { + LPWPUCLOSEEVENT lpWPUCloseEvent; + LPWPUCLOSESOCKETHANDLE lpWPUCloseSocketHandle; + LPWPUCREATEEVENT lpWPUCreateEvent; + LPWPUCREATESOCKETHANDLE lpWPUCreateSocketHandle; + LPWPUFDISSET lpWPUFDIsSet; + LPWPUGETPROVIDERPATH lpWPUGetProviderPath; + LPWPUMODIFYIFSHANDLE lpWPUModifyIFSHandle; + LPWPUPOSTMESSAGE lpWPUPostMessage; + LPWPUQUERYBLOCKINGCALLBACK lpWPUQueryBlockingCallback; + LPWPUQUERYSOCKETHANDLECONTEXT lpWPUQuerySocketHandleContext; + LPWPUQUEUEAPC lpWPUQueueApc; + LPWPURESETEVENT lpWPUResetEvent; + LPWPUSETEVENT lpWPUSetEvent; + LPWPUOPENCURRENTTHREAD lpWPUOpenCurrentThread; + LPWPUCLOSETHREAD lpWPUCloseThread; +} WSPUPCALLTABLE, FAR* LPWSPUPCALLTABLE; + +#if(_WIN32_WINNT >= 0x0600) + +#define LSP_SYSTEM 0x80000000 +#define LSP_INSPECTOR 0x00000001 +#define LSP_REDIRECTOR 0x00000002 +#define LSP_PROXY 0x00000004 +#define LSP_FIREWALL 0x00000008 +#define LSP_INBOUND_MODIFY 0x00000010 +#define LSP_OUTBOUND_MODIFY 0x00000020 +#define LSP_CRYPTO_COMPRESS 0x00000040 +#define LSP_LOCAL_CACHE 0x00000080 + +typedef enum _WSC_PROVIDER_INFO_TYPE { + ProviderInfoLspCategories, + ProviderInfoAudit +} WSC_PROVIDER_INFO_TYPE ; + +typedef struct _WSC_PROVIDER_AUDIT_INFO { + DWORD RecordSize; + PVOID Reserved; +} WSC_PROVIDER_AUDIT_INFO; + +#endif /* (_WIN32_WINNT >= 0x0600) */ typedef struct _NSP_ROUTINE { DWORD cbSize; @@ -139,80 +140,976 @@ LPNSPIOCTL NSPIoctl; } NSP_ROUTINE, *PNSP_ROUTINE, FAR* LPNSP_ROUTINE; -/* Prototypes for service provider upcall procedure table */ -typedef BOOL (WSPAPI *LPWPUCLOSEEVENT)(WSAEVENT,LPINT); -typedef INT (WSPAPI *LPWPUCLOSESOCKETHANDLE)(SOCKET,LPINT); -typedef INT (WSPAPI *LPWPUCLOSETHREAD)(LPWSATHREADID,LPINT); -typedef WSAEVENT (WSPAPI *LPWPUCREATEEVENT)(LPINT); -typedef SOCKET (WSPAPI *LPWPUCREATESOCKETHANDLE)(DWORD,DWORD_PTR,LPINT); -typedef INT (WSPAPI *LPWPUFDISSET)(SOCKET,LPFD_SET); -typedef INT (WSPAPI *LPWPUGETPROVIDERPATH)(LPGUID,LPWSTR,LPINT,LPINT); -typedef SOCKET (WSPAPI *LPWPUMODIFYIFSHANDLE)(DWORD,SOCKET,LPINT); -typedef INT (WSPAPI *LPWPUOPENCURRENTTHREAD)(LPWSATHREADID,LPINT); -typedef BOOL (WSPAPI *LPWPUPOSTMESSAGE)(HWND,UINT,WPARAM,LPARAM); -typedef INT (WSPAPI *LPWPUQUERYBLOCKINGCALLBACK)(DWORD,LPBLOCKINGCALLBACK FAR*,PDWORD_PTR,LPINT); -typedef INT (WSPAPI *LPWPUQUERYSOCKETHANDLECONTEXT)(SOCKET,PDWORD_PTR,LPINT); -typedef INT (WSPAPI *LPWPUQUEUEAPC)(LPWSATHREADID,LPWSAUSERAPC,DWORD_PTR,LPINT); -typedef BOOL (WSPAPI *LPWPURESETEVENT)(WSAEVENT,LPINT); -typedef BOOL (WSPAPI *LPWPUSETEVENT)(WSAEVENT,LPINT); -typedef INT (WSAAPI *LPNSPSTARTUP)(LPGUID,LPNSP_ROUTINE); -/* Available only directly from the DLL */ -typedef INT (WSPAPI *LPWPUCOMPLETEOVERLAPPEDREQUEST)(SOCKET,LPWSAOVERLAPPED,DWORD,DWORD,LPINT); - -/* Service Provider upcall table */ -typedef struct _WSPUPCALLTABLE { - LPWPUCLOSEEVENT lpWPUCloseEvent; - LPWPUCLOSESOCKETHANDLE lpWPUCloseSocketHandle; - LPWPUCREATEEVENT lpWPUCreateEvent; - LPWPUCREATESOCKETHANDLE lpWPUCreateSocketHandle; - LPWPUFDISSET lpWPUFDIsSet; - LPWPUGETPROVIDERPATH lpWPUGetProviderPath; - LPWPUMODIFYIFSHANDLE lpWPUModifyIFSHandle; - LPWPUPOSTMESSAGE lpWPUPostMessage; - LPWPUQUERYBLOCKINGCALLBACK lpWPUQueryBlockingCallback; - LPWPUQUERYSOCKETHANDLECONTEXT lpWPUQuerySocketHandleContext; - LPWPUQUEUEAPC lpWPUQueueApc; - LPWPURESETEVENT lpWPUResetEvent; - LPWPUSETEVENT lpWPUSetEvent; - LPWPUOPENCURRENTTHREAD lpWPUOpenCurrentThread; - LPWPUCLOSETHREAD lpWPUCloseThread; -} WSPUPCALLTABLE, FAR* LPWSPUPCALLTABLE; - -typedef INT (WSPAPI *LPWSPSTARTUP)(WORD,LPWSPDATA,LPWSAPROTOCOL_INFOW,WSPUPCALLTABLE,LPWSPPROC_TABLE); - -INT WSPAPI NSPStartup(LPGUID,LPNSP_ROUTINE); - -/* WinSock 2 DLL function prototypes */ -INT WSPAPI WPUCompleteOverlappedRequest(SOCKET,LPWSAOVERLAPPED,DWORD,DWORD,LPINT); -INT WSPAPI WSPStartup(WORD,LPWSPDATA,LPWSAPROTOCOL_INFOW,WSPUPCALLTABLE,LPWSPPROC_TABLE); -INT WSPAPI WSCDeinstallProvider(LPGUID,LPINT); -INT WSPAPI WSCEnumProtocols(LPINT,LPWSAPROTOCOL_INFOW,LPDWORD,LPINT); -INT WSPAPI WSCGetProviderPath(LPGUID,LPWSTR,LPINT,LPINT); -INT WSPAPI WSCInstallProvider(LPGUID,CONST WCHAR*,CONST LPWSAPROTOCOL_INFOW,DWORD,LPINT); -INT WSPAPI WSCEnableNSProvider(LPGUID,BOOL); -INT WSPAPI WSCInstallNameSpace(LPWSTR,LPWSTR,DWORD,DWORD,LPGUID); -INT WSPAPI WSCUnInstallNameSpace(LPGUID); -INT WSPAPI WSCWriteProviderOrder(LPDWORD,DWORD); -BOOL WSPAPI WPUPostMessage(HWND,UINT,WPARAM,LPARAM); -BOOL WSPAPI WPUCloseEvent(WSAEVENT,LPINT); -int WSPAPI WPUCloseSocketHandle(SOCKET,LPINT); -WSAEVENT WSPAPI WPUCreateEvent(LPINT); -SOCKET WSPAPI WPUModifyIFSHandle(DWORD,SOCKET,LPINT); -SOCKET WSPAPI WPUCreateSocketHandle(DWORD,DWORD_PTR,LPINT); -int WSPAPI WPUFDIsSet(SOCKET,LPFD_SET); -int WSPAPI WPUGetProviderPath(LPGUID,WCHAR FAR*,LPINT,LPINT); -int WSPAPI WPUQueryBlockingCallback(DWORD,LPBLOCKINGCALLBACK FAR*,PDWORD_PTR,LPINT); -int WSPAPI WPUQuerySocketHandleContext(SOCKET,PDWORD_PTR,LPINT); -int WSPAPI WPUQueueApc(LPWSATHREADID,LPWSAUSERAPC,DWORD_PTR,LPINT); -BOOL WSPAPI WPUResetEvent(WSAEVENT,LPINT); -BOOL WSPAPI WPUSetEvent(WSAEVENT,LPINT); -int WSPAPI WPUOpenCurrentThread(LPWSATHREADID,LPINT); -int WSPAPI WPUCloseThread(LPWSATHREADID,LPINT); - -#endif /* RC_INVOKED */ +typedef struct _NSPV2_ROUTINE { + DWORD cbSize; + DWORD dwMajorVersion; + DWORD dwMinorVersion; + LPNSPV2STARTUP NSPv2Startup; + LPNSPV2CLEANUP NSPv2Cleanup; + LPNSPV2LOOKUPSERVICEBEGIN NSPv2LookupServiceBegin; + LPNSPV2LOOKUPSERVICENEXTEX NSPv2LookupServiceNextEx; + LPNSPV2LOOKUPSERVICEEND NSPv2LookupServiceEnd; + LPNSPV2SETSERVICEEX NSPv2SetServiceEx; + LPNSPV2CLIENTSESSIONRUNDOWN NSPv2ClientSessionRundown; +} NSPV2_ROUTINE, *PNSPV2_ROUTINE, *LPNSPV2_ROUTINE; +typedef const NSPV2_ROUTINE *PCNSPV2_ROUTINE, *LPCNSPV2_ROUTINE; + +typedef BOOL +(CALLBACK FAR *LPBLOCKINGCALLBACK)( + DWORD_PTR dwContext); + +typedef VOID +(CALLBACK FAR *LPWSAUSERAPC)( + DWORD_PTR dwContext); + +typedef SOCKET +(WSPAPI *LPWSPACCEPT)( + IN SOCKET s, + OUT struct sockaddr FAR *addr OPTIONAL, + IN OUT LPINT addrlen OPTIONAL, + IN LPCONDITIONPROC lpfnCondition OPTIONAL, + IN DWORD_PTR dwCallbackData OPTIONAL, + OUT LPINT lpErrno); + +typedef INT +(WSPAPI *LPWSPADDRESSTOSTRING)( + IN LPSOCKADDR lpsaAddress, + IN DWORD dwAddressLength, + IN LPWSAPROTOCOL_INFOW lpProtocolInfo OPTIONAL, + OUT LPWSTR lpszAddressString, + IN OUT LPDWORD lpdwAddressStringLength, + OUT LPINT lpErrno); + +typedef int +(WSPAPI *LPWSPASYNCSELECT)( + IN SOCKET s, + IN HWND hWnd, + IN unsigned int wMsg, + IN long lEvent, + OUT LPINT lpErrno); + +typedef int +(WSPAPI *LPWSPBIND)( + IN SOCKET s, + IN const struct sockaddr FAR *name, + IN int namelen, + OUT LPINT lpErrno); + +typedef int +(WSPAPI *LPWSPCANCELBLOCKINGCALL)( + OUT LPINT lpErrno); + +typedef int +(WSPAPI *LPWSPCLEANUP)( + OUT LPINT lpErrno); + +typedef int +(WSPAPI *LPWSPCLOSESOCKET)( + IN SOCKET s, + OUT LPINT lpErrno); + +typedef int +(WSPAPI *LPWSPCONNECT)( + IN SOCKET s, + IN const struct sockaddr FAR *name, + IN int namelen, + IN LPWSABUF lpCallerData OPTIONAL, + OUT LPWSABUF lpCalleeData OPTIONAL, + IN LPQOS lpSQOS OPTIONAL, + IN LPQOS lpGQOS OPTIONAL, + OUT LPINT lpErrno); + +typedef int +(WSPAPI *LPWSPDUPLICATESOCKET)( + IN SOCKET s, + IN DWORD dwProcessId, + OUT LPWSAPROTOCOL_INFOW lpProtocolInfo, + OUT LPINT lpErrno); + +typedef int +(WSPAPI *LPWSPENUMNETWORKEVENTS)( + IN SOCKET s, + IN WSAEVENT hEventObject, + OUT LPWSANETWORKEVENTS lpNetworkEvents, + OUT LPINT lpErrno); + +typedef int +(WSPAPI *LPWSPEVENTSELECT)( + IN SOCKET s, + IN WSAEVENT hEventObject, + IN long lNetworkEvents, + OUT LPINT lpErrno); + +typedef BOOL +(WSPAPI *LPWSPGETOVERLAPPEDRESULT)( + IN SOCKET s, + IN LPWSAOVERLAPPED lpOverlapped, + OUT LPDWORD lpcbTransfer, + IN BOOL fWait, + OUT LPDWORD lpdwFlags, + OUT LPINT lpErrno); + +typedef int +(WSPAPI *LPWSPGETPEERNAME)( + IN SOCKET s, + OUT struct sockaddr FAR *name, + IN OUT LPINT namelen, + OUT LPINT lpErrno); + +typedef int +(WSPAPI *LPWSPGETSOCKNAME)( + IN SOCKET s, + OUT struct sockaddr FAR *name, + IN OUT LPINT namelen, + OUT LPINT lpErrno); + +typedef int +(WSPAPI *LPWSPGETSOCKOPT)( + IN SOCKET s, + IN int level, + IN int optname, + OUT char FAR *optval, + IN OUT LPINT optlen, + OUT LPINT lpErrno); + +typedef BOOL +(WSPAPI *LPWSPGETQOSBYNAME)( + IN SOCKET s, + IN LPWSABUF lpQOSName, + OUT LPQOS lpQOS, + OUT LPINT lpErrno); + +typedef int +(WSPAPI *LPWSPIOCTL)( + IN SOCKET s, + IN DWORD dwIoControlCode, + IN LPVOID lpvInBuffer OPTIONAL, + IN DWORD cbInBuffer, + OUT LPVOID lpvOutBuffer OPTIONAL, + IN DWORD cbOutBuffer, + OUT LPDWORD lpcbBytesReturned, + IN OUT LPWSAOVERLAPPED lpOverlapped OPTIONAL, + IN LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine OPTIONAL, + IN LPWSATHREADID lpThreadId OPTIONAL, + OUT LPINT lpErrno); + +typedef SOCKET +(WSPAPI *LPWSPJOINLEAF)( + IN SOCKET s, + IN const struct sockaddr FAR *name, + IN int namelen, + IN LPWSABUF lpCallerData OPTIONAL, + OUT LPWSABUF lpCalleeData OPTIONAL, + IN LPQOS lpSQOS OPTIONAL, + IN LPQOS lpGQOS OPTIONAL, + IN DWORD dwFlags, + OUT LPINT lpErrno); + +typedef int +(WSPAPI *LPWSPLISTEN)( + IN SOCKET s, + IN int backlog, + OUT LPINT lpErrno); + +typedef int +(WSPAPI *LPWSPRECV)( + IN SOCKET s, + IN LPWSABUF lpBuffers, + IN DWORD dwBufferCount, + OUT LPDWORD lpNumberOfBytesRecvd OPTIONAL, + IN OUT LPDWORD lpFlags, + IN OUT LPWSAOVERLAPPED lpOverlapped OPTIONAL, + IN LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine OPTIONAL, + IN LPWSATHREADID lpThreadId OPTIONAL, + IN LPINT lpErrno); + +typedef int +(WSPAPI *LPWSPRECVDISCONNECT)( + IN SOCKET s, + IN LPWSABUF lpInboundDisconnectData OPTIONAL, + OUT LPINT lpErrno); + +typedef int +(WSPAPI *LPWSPRECVFROM)( + IN SOCKET s, + IN LPWSABUF lpBuffers, + IN DWORD dwBufferCount, + OUT LPDWORD lpNumberOfBytesRecvd OPTIONAL, + IN OUT LPDWORD lpFlags, + OUT struct sockaddr FAR *lpFrom OPTIONAL, + IN OUT LPINT lpFromlen OPTIONAL, + IN OUT LPWSAOVERLAPPED lpOverlapped OPTIONAL, + IN LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine OPTIONAL, + IN LPWSATHREADID lpThreadId OPTIONAL, + OUT LPINT lpErrno); + +typedef int +(WSPAPI *LPWSPSELECT)( + IN int nfds, + IN OUT fd_set FAR *readfds OPTIONAL, + IN OUT fd_set FAR *writefds OPTIONAL, + IN OUT fd_set FAR *exceptfds OPTIONAL, + IN const struct timeval FAR *timeout OPTIONAL, + OUT LPINT lpErrno); + +typedef int +(WSPAPI *LPWSPSEND)( + IN SOCKET s, + IN LPWSABUF lpBuffers, + IN DWORD dwBufferCount, + OUT LPDWORD lpNumberOfBytesSent OPTIONAL, + IN DWORD dwFlags, + IN OUT LPWSAOVERLAPPED lpOverlapped OPTIONAL, + IN LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine OPTIONAL, + IN LPWSATHREADID lpThreadId OPTIONAL, + OUT LPINT lpErrno); + +typedef int +(WSPAPI *LPWSPSENDDISCONNECT)( + IN SOCKET s, + IN LPWSABUF lpOutboundDisconnectData OPTIONAL, + OUT LPINT lpErrno); + +typedef int +(WSPAPI *LPWSPSENDTO)( + IN SOCKET s, + IN LPWSABUF lpBuffers, + IN DWORD dwBufferCount, + OUT LPDWORD lpNumberOfBytesSent OPTIONAL, + IN DWORD dwFlags, + IN const struct sockaddr FAR *lpTo OPTIONAL, + IN int iTolen, + IN OUT LPWSAOVERLAPPED lpOverlapped OPTIONAL, + IN LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine OPTIONAL, + IN LPWSATHREADID lpThreadId OPTIONAL, + OUT LPINT lpErrno); + +typedef int +(WSPAPI *LPWSPSETSOCKOPT)( + IN SOCKET s, + IN int level, + IN int optname, + IN const char FAR *optval OPTIONAL, + IN int optlen, + OUT LPINT lpErrno); + +typedef int +(WSPAPI *LPWSPSHUTDOWN)( + IN SOCKET s, + IN int how, + OUT LPINT lpErrno); + +typedef SOCKET +(WSPAPI *LPWSPSOCKET)( + IN int af, + IN int type, + IN int protocol, + IN LPWSAPROTOCOL_INFOW lpProtocolInfo OPTIONAL, + IN GROUP g, + IN DWORD dwFlags, + OUT LPINT lpErrno); + +typedef INT +(WSPAPI *LPWSPSTRINGTOADDRESS)( + IN LPWSTR AddressString, + IN INT AddressFamily, + IN LPWSAPROTOCOL_INFOW lpProtocolInfo OPTIONAL, + OUT LPSOCKADDR lpAddress, + IN OUT LPINT lpAddressLength, + OUT LPINT lpErrno); + +typedef BOOL +(WSPAPI *LPWPUCLOSEEVENT)( + IN WSAEVENT hEvent, + OUT LPINT lpErrno); + +typedef int +(WSPAPI *LPWPUCLOSESOCKETHANDLE)( + IN SOCKET s, + OUT LPINT lpErrno); + +typedef WSAEVENT +(WSPAPI *LPWPUCREATEEVENT)( + OUT LPINT lpErrno); + +typedef SOCKET +(WSPAPI *LPWPUCREATESOCKETHANDLE)( + IN DWORD dwCatalogEntryId, + IN DWORD_PTR dwContext, + OUT LPINT lpErrno); + +typedef int +(WSPAPI *LPWPUFDISSET)( + IN SOCKET s, + IN fd_set FAR *fdset); + +typedef int +(WSPAPI *LPWPUGETPROVIDERPATH)( + IN LPGUID lpProviderId, + OUT WCHAR FAR *lpszProviderDllPath, + IN OUT LPINT lpProviderDllPathLen, + OUT LPINT lpErrno); + +typedef SOCKET +(WSPAPI *LPWPUMODIFYIFSHANDLE)( + IN DWORD dwCatalogEntryId, + IN SOCKET ProposedHandle, + OUT LPINT lpErrno); + +typedef BOOL +(WSPAPI *LPWPUPOSTMESSAGE)( + IN HWND hWnd, + IN UINT Msg, + IN WPARAM wParam, + IN LPARAM lParam); + +typedef int +(WSPAPI *LPWPUQUERYBLOCKINGCALLBACK)( + IN DWORD dwCatalogEntryId, + OUT LPBLOCKINGCALLBACK FAR *lplpfnCallback, + OUT PDWORD_PTR lpdwContext, + OUT LPINT lpErrno); + +typedef int +(WSPAPI *LPWPUQUERYSOCKETHANDLECONTEXT)( + IN SOCKET s, + OUT PDWORD_PTR lpContext, + OUT LPINT lpErrno); + +typedef int +(WSPAPI *LPWPUQUEUEAPC)( + IN LPWSATHREADID lpThreadId, + IN LPWSAUSERAPC lpfnUserApc, + IN DWORD_PTR dwContext, + OUT LPINT lpErrno); + +typedef BOOL +(WSPAPI *LPWPURESETEVENT)( + IN WSAEVENT hEvent, + OUT LPINT lpErrno); + +typedef BOOL +(WSPAPI *LPWPUSETEVENT)( + IN WSAEVENT hEvent, + OUT LPINT lpErrno); + +typedef int +(WSPAPI *LPWPUOPENCURRENTTHREAD)( + OUT LPWSATHREADID lpThreadId, + OUT LPINT lpErrno); + +typedef int +(WSPAPI *LPWPUCLOSETHREAD)( + IN LPWSATHREADID lpThreadId, + OUT LPINT lpErrno); + +typedef int +(WSPAPI *LPWPUCOMPLETEOVERLAPPEDREQUEST)( + IN SOCKET s, + IN OUT LPWSAOVERLAPPED lpOverlapped, + IN DWORD dwError, + IN DWORD cbTransferred, + OUT LPINT lpErrno); + +typedef int +(WSPAPI *LPWSPSTARTUP)( + IN WORD wVersionRequested, + IN LPWSPDATA lpWSPData, + IN LPWSAPROTOCOL_INFOW lpProtocolInfo, + IN WSPUPCALLTABLE UpcallTable, + OUT LPWSPPROC_TABLE lpProcTable); + +typedef int +(WSPAPI *LPWSCENUMPROTOCOLS)( + IN LPINT lpiProtocols OPTIONAL, + OUT LPWSAPROTOCOL_INFOW lpProtocolBuffer OPTIONAL, + IN OUT LPDWORD lpdwBufferLength, + OUT LPINT lpErrno); + +typedef int +(WSPAPI *LPWSCDEINSTALLPROVIDER)( + IN LPGUID lpProviderId, + OUT LPINT lpErrno); + +typedef int +(WSPAPI *LPWSCINSTALLPROVIDER)( + IN LPGUID lpProviderId, + IN const WCHAR FAR *lpszProviderDllPath, + IN const LPWSAPROTOCOL_INFOW lpProtocolInfoList, + IN DWORD dwNumberOfEntries, + OUT LPINT lpErrno); + +typedef int +(WSPAPI *LPWSCGETPROVIDERPATH)( + IN LPGUID lpProviderId, + OUT WCHAR FAR *lpszProviderDllPath, + IN OUT LPINT lpProviderDllPathLen, + OUT LPINT lpErrno); + +typedef INT +(WSPAPI *LPWSCINSTALLNAMESPACE)( + IN LPWSTR lpszIdentifier, + IN LPWSTR lpszPathName, + IN DWORD dwNameSpace, + IN DWORD dwVersion, + IN LPGUID lpProviderId); + +typedef INT +(WSPAPI *LPWSCUNINSTALLNAMESPACE)( + IN LPGUID lpProviderId); + +typedef INT +(WSPAPI *LPWSCENABLENSPROVIDER)( + IN LPGUID lpProviderId, + IN BOOL fEnable); + +typedef INT +(WSAAPI *LPNSPCLEANUP)( + IN LPGUID lpProviderId); + +typedef INT +(WSAAPI *LPNSPLOOKUPSERVICEBEGIN)( + IN LPGUID lpProviderId, + IN LPWSAQUERYSETW lpqsRestrictions, + IN LPWSASERVICECLASSINFOW lpServiceClassInfo, + IN DWORD dwControlFlags, + OUT LPHANDLE lphLookup); + +typedef INT +(WSAAPI *LPNSPLOOKUPSERVICENEXT)( + IN HANDLE hLookup, + IN DWORD dwControlFlags, + IN OUT LPDWORD lpdwBufferLength, + OUT LPWSAQUERYSETW lpqsResults); + +#if(_WIN32_WINNT >= 0x0501) +typedef INT +(WSAAPI *LPNSPIOCTL)( + IN HANDLE hLookup, + IN DWORD dwControlCode, + IN LPVOID lpvInBuffer, + IN DWORD cbInBuffer, + OUT LPVOID lpvOutBuffer, + IN DWORD cbOutBuffer, + OUT LPDWORD lpcbBytesReturned, + IN LPWSACOMPLETION lpCompletion OPTIONAL, + IN LPWSATHREADID lpThreadId); +#endif + +typedef INT +(WSAAPI *LPNSPLOOKUPSERVICEEND)( + IN HANDLE hLookup); + +typedef INT +(WSAAPI *LPNSPSETSERVICE)( + IN LPGUID lpProviderId, + IN LPWSASERVICECLASSINFOW lpServiceClassInfo, + IN LPWSAQUERYSETW lpqsRegInfo, + IN WSAESETSERVICEOP essOperation, + IN DWORD dwControlFlags); + +typedef INT +(WSAAPI *LPNSPINSTALLSERVICECLASS)( + IN LPGUID lpProviderId, + IN LPWSASERVICECLASSINFOW lpServiceClassInfo); + +typedef INT +(WSAAPI *LPNSPREMOVESERVICECLASS)( + IN LPGUID lpProviderId, + IN LPGUID lpServiceClassId); + +typedef INT +(WSAAPI *LPNSPGETSERVICECLASSINFO)( + IN LPGUID lpProviderId, + IN LPDWORD lpdwBufSize, + IN LPWSASERVICECLASSINFOW lpServiceClassInfo); + +typedef INT +(WSAAPI *LPNSPSTARTUP)( + IN LPGUID lpProviderId, + IN OUT LPNSP_ROUTINE lpnspRoutines); + +typedef INT +(WSAAPI *LPNSPV2STARTUP)( + IN LPGUID lpProviderId, + OUT LPVOID *ppvClientSessionArg); + +typedef INT +(WSAAPI *LPNSPV2CLEANUP)( + IN LPGUID lpProviderId, + IN LPVOID pvClientSessionArg); + +typedef INT +(WSAAPI *LPNSPV2LOOKUPSERVICEBEGIN)( + IN LPGUID lpProviderId, + IN LPWSAQUERYSET2W lpqsRestrictions, + IN DWORD dwControlFlags, + IN LPVOID lpvClientSessionArg, + OUT LPHANDLE lphLookup); + +typedef VOID +(WSAAPI *LPNSPV2LOOKUPSERVICENEXTEX)( + IN HANDLE hAsyncCall, + IN HANDLE hLookup, + IN DWORD dwControlFlags, + IN LPDWORD lpdwBufferLength, + OUT LPWSAQUERYSET2W lpqsResults); + +typedef INT +(WSAAPI *LPNSPV2LOOKUPSERVICEEND)( + IN HANDLE hLookup); + +typedef VOID +(WSAAPI *LPNSPV2SETSERVICEEX)( + IN HANDLE hAsyncCall, + IN LPGUID lpProviderId, + IN LPWSAQUERYSET2W lpqsRegInfo, + IN WSAESETSERVICEOP essOperation, + IN DWORD dwControlFlags, + IN LPVOID lpvClientSessionArg); + +typedef VOID +(WSAAPI *LPNSPV2CLIENTSESSIONRUNDOWN)( + IN LPGUID lpProviderId, + IN LPVOID pvClientSessionArg); + +int +WSPAPI +WSPStartup( + IN WORD wVersionRequested, + IN LPWSPDATA lpWSPData, + IN LPWSAPROTOCOL_INFOW lpProtocolInfo, + IN WSPUPCALLTABLE UpcallTable, + OUT LPWSPPROC_TABLE lpProcTable); + +int +WSPAPI +WSCEnumProtocols( + IN LPINT lpiProtocols OPTIONAL, + OUT LPWSAPROTOCOL_INFOW lpProtocolBuffer OPTIONAL, + IN OUT LPDWORD lpdwBufferLength, + OUT LPINT lpErrno); + +#if defined(_WIN32_WINNT >= 0x0501) + +int +WSPAPI +WPUOpenCurrentThread( + OUT LPWSATHREADID lpThreadId, + OUT LPINT lpErrno); + +int +WSPAPI +WPUCloseThread( + IN LPWSATHREADID lpThreadId, + OUT LPINT lpErrno); + +#define WSCEnumNameSpaceProviders WSAEnumNameSpaceProvidersW +#define LPFN_WSCENUMNAMESPACEPROVIDERS LPFN_WSAENUMNAMESPACEPROVIDERSW + +int +WSPAPI +WSCUpdateProvider( + IN LPGUID lpProviderId, + IN const WCHAR FAR *lpszProviderDllPath, + IN const LPWSAPROTOCOL_INFOW lpProtocolInfoList, + IN DWORD dwNumberOfEntries, + OUT LPINT lpErrno); + +typedef int +(WSPAPI *LPWSCUPDATEPROVIDER)( + IN LPGUID lpProviderId, + IN const WCHAR FAR *lpszProviderDllPath, + IN const LPWSAPROTOCOL_INFOW lpProtocolInfoList, + IN DWORD dwNumberOfEntries, + OUT LPINT lpErrno); + +#if defined(_WIN64) + +int +WSPAPI +WSCEnumProtocols32( + IN LPINT lpiProtocols OPTIONAL, + OUT LPWSAPROTOCOL_INFOW lpProtocolBuffer, + IN OUT LPDWORD lpdwBufferLength, + OUT LPINT lpErrno); + +int +WSPAPI +WSCDeinstallProvider32( + IN LPGUID lpProviderId, + OUT LPINT lpErrno); + +int +WSPAPI +WSCInstallProvider64_32( + IN LPGUID lpProviderId, + IN const WCHAR FAR *lpszProviderDllPath, + IN const LPWSAPROTOCOL_INFOW lpProtocolInfoList, + IN DWORD dwNumberOfEntries, + OUT LPINT lpErrno); + +int +WSPAPI +WSCGetProviderPath32( + IN LPGUID lpProviderId, + OUT WCHAR FAR *lpszProviderDllPath, + IN OUT LPINT lpProviderDllPathLen, + OUT LPINT lpErrno); + +int +WSPAPI +WSCUpdateProvider32( + IN LPGUID lpProviderId, + IN const WCHAR FAR *lpszProviderDllPath, + IN const LPWSAPROTOCOL_INFOW lpProtocolInfoList, + IN DWORD dwNumberOfEntries, + OUT LPINT lpErrno); + +INT +WSAAPI +WSCEnumNameSpaceProviders32( + IN OUT LPDWORD lpdwBufferLength, + OUT LPWSANAMESPACE_INFOW lpnspBuffer); + +INT +WSPAPI +WSCInstallNameSpace32( + IN LPWSTR lpszIdentifier, + IN LPWSTR lpszPathName, + IN DWORD dwNameSpace, + IN DWORD dwVersion, + IN LPGUID lpProviderId); + +INT +WSPAPI +WSCUnInstallNameSpace32( + IN LPGUID lpProviderId); + +INT +WSPAPI +WSCEnableNSProvider32( + IN LPGUID lpProviderId, + IN BOOL fEnable); + +#endif /* defined(_WIN64) */ + +#endif /* defined(_WIN32_WINNT >= 0x0501) */ + +int +WSPAPI +WSCDeinstallProvider( + IN LPGUID lpProviderId, + OUT LPINT lpErrno); + +int +WSPAPI +WSCInstallProvider( + IN LPGUID lpProviderId, + IN const WCHAR FAR *lpszProviderDllPath, + IN const LPWSAPROTOCOL_INFOW lpProtocolInfoList, + IN DWORD dwNumberOfEntries, + OUT LPINT lpErrno); + +int +WSPAPI +WSCGetProviderPath( + IN LPGUID lpProviderId, + OUT WCHAR FAR *lpszProviderDllPath, + IN OUT LPINT lpProviderDllPathLen, + OUT LPINT lpErrno); + +#if (_WIN32_WINNT < 0x0600) + +int +WSPAPI +WSCInstallQOSTemplate( + IN const LPGUID Guid, + IN LPWSABUF QosName, + IN LPQOS Qos); + +typedef int +(WSPAPI *LPWSCINSTALLQOSTEMPLATE)( + IN const LPGUID Guid, + IN LPWSABUF QosName, + IN LPQOS Qos); + +int +WSPAPI +WSCRemoveQOSTemplate( + IN const LPGUID Guid, + IN LPWSABUF QosName); + +typedef int +(WSPAPI *LPWSCREMOVEQOSTEMPLATE)( + IN const LPGUID Guid, + IN LPWSABUF QosName); + +#endif /* (_WIN32_WINNT < 0x0600) */ + +#if(_WIN32_WINNT >= 0x0600) + +int +WSPAPI +WSCSetProviderInfo( + IN LPGUID lpProviderId, + IN WSC_PROVIDER_INFO_TYPE InfoType, + IN PBYTE Info, + IN size_t InfoSize, + IN DWORD Flags, + OUT LPINT lpErrno); + +int +WSPAPI +WSCGetProviderInfo( + IN LPGUID lpProviderId, + IN WSC_PROVIDER_INFO_TYPE InfoType, + OUT PBYTE Info, + IN OUT *InfoSize, + IN DWORD Flags, + OUT LPINT lpErrno); + +int +WSPAPI +WSCSetApplicationCategory( + IN LPCWSTR Path, + IN DWORD PathLength, + IN LPCWSTR Extra OPTIONAL, + IN DWORD ExtraLength, + IN DWORD PermittedLspCategories, + OUT DWORD *pPrevPermLspCat OPTIONAL, + OUT LPINT lpErrno); + +int +WSPAPI +WSCGetApplicationCategory( + IN LPCWSTR Path, + IN DWORD PathLength, + IN LPCWSTR Extra OPTIONAL, + IN DWORD ExtraLength, + OUT DWORD *pPermittedLspCategories, + OUT LPINT lpErrno); + +#define WSCEnumNameSpaceProvidersEx WSAEnumNameSpaceProvidersExW +#define LPFN_WSCENUMNAMESPACEPROVIDERSEX LPFN_WSAENUMNAMESPACEPROVIDERSEXW + +INT +WSPAPI +WSCInstallNameSpaceEx( + IN LPWSTR lpszIdentifier, + IN LPWSTR lpszPathName, + IN DWORD dwNameSpace, + IN DWORD dwVersion, + IN LPGUID lpProviderId, + IN LPBLOB lpProviderSpecific); + +INT +WSAAPI +WSAAdvertiseProvider( + IN const GUID *puuidProviderId, + IN const LPCNSPV2_ROUTINE pNSPv2Routine); + +INT +WSAAPI +WSAUnadvertiseProvider( + IN const GUID *puuidProviderId); + +INT +WSAAPI +WSAProviderCompleteAsyncCall( + IN HANDLE hAsyncCall, + IN INT iRetCode); + +#if defined(_WIN64) + +int +WSPAPI +WSCSetProviderInfo32( + IN LPGUID lpProviderId, + IN WSC_PROVIDER_INFO_TYPE InfoType, + IN PBYTE Info, + IN size_t InfoSize, + IN DWORD Flags, + OUT LPINT lpErrno); + +int +WSPAPI +WSCGetProviderInfo32( + IN LPGUID lpProviderId, + IN WSC_PROVIDER_INFO_TYPE InfoType, + OUT PBYTE Info, + IN OUT size_t *InfoSize, + IN DWORD Flags, + OUT LPINT lpErrno); + +INT +WSAAPI +WSCEnumNameSpaceProvidersEx32( + IN OUT LPDWORD lpdwBufferLength, + OUT LPWSANAMESPACE_INFOEXW lpnspBuffer); + +INT +WSPAPI +WSCInstallNameSpaceEx32( + IN LPWSTR lpszIdentifier, + IN LPWSTR lpszPathName, + IN DWORD dwNameSpace, + IN DWORD dwVersion, + IN LPGUID lpProviderId, + IN LPBLOB lpProviderSpecific); + +#endif /* (_WIN64) */ + +#if defined(_WIN64) +int +WSPAPI +WSCInstallProviderAndChains64_32( +#else +int +WSPAPI +WSCInstallProviderAndChains( +#endif + IN LPGUID lpProviderId, + IN const LPWSTR lpszProviderDllPath, +#if defined(_WIN64) + IN const LPWSTR lpszProviderDllPath32, +#endif + IN const LPWSTR lpszLspName, + IN DWORD dwServiceFlags, + IN OUT LPWSAPROTOCOL_INFOW lpProtocolInfoList, + IN DWORD dwNumberOfEntries, + OUT LPDWORD lpdwCatalogEntryId OPTIONAL, + OUT LPINT lpErrno); + +#endif /* (_WIN32_WINNT >= 0x0600) */ + +BOOL +WSPAPI +WPUCloseEvent( + IN WSAEVENT hEvent, + OUT LPINT lpErrno); + +int +WSPAPI +WPUCloseSocketHandle( + IN SOCKET s, + OUT LPINT lpErrno); + +WSAEVENT +WSPAPI +WPUCreateEvent( + OUT LPINT lpErrno); + +SOCKET +WSPAPI +WPUCreateSocketHandle( + IN DWORD dwCatalogEntryId, + IN DWORD_PTR dwContext, + OUT LPINT lpErrno); + +int +WSPAPI +WPUFDIsSet( + IN SOCKET s, + IN fd_set FAR *fdset); + +int +WSPAPI +WPUGetProviderPath( + IN LPGUID lpProviderId, + OUT WCHAR FAR *lpszProviderDllPath, + IN OUT LPINT lpProviderDllPathLen, + OUT LPINT lpErrno); + +SOCKET +WSPAPI +WPUModifyIFSHandle( + IN DWORD dwCatalogEntryId, + IN SOCKET ProposedHandle, + OUT LPINT lpErrno); + +BOOL +WSPAPI +WPUPostMessage( + IN HWND hWnd, + IN UINT Msg, + IN WPARAM wParam, + IN LPARAM lParam); + +int +WSPAPI +WPUQueryBlockingCallback( + IN DWORD dwCatalogEntryId, + OUT LPBLOCKINGCALLBACK FAR *lplpfnCallback, + OUT PDWORD_PTR lpdwContext, + OUT LPINT lpErrno); + +int +WSPAPI +WPUQuerySocketHandleContext( + IN SOCKET s, + OUT PDWORD_PTR lpContext, + OUT LPINT lpErrno); + +int +WSPAPI +WPUQueueApc( + IN LPWSATHREADID lpThreadId, + IN LPWSAUSERAPC lpfnUserApc, + IN DWORD_PTR dwContext, + OUT LPINT lpErrno); + +BOOL +WSPAPI +WPUResetEvent( + IN WSAEVENT hEvent, + OUT LPINT lpErrno); + +BOOL +WSPAPI +WPUSetEvent( + IN WSAEVENT hEvent, + OUT LPINT lpErrno); + +int +WSPAPI +WPUCompleteOverlappedRequest( + IN SOCKET s, + IN OUT LPWSAOVERLAPPED lpOverlapped, + IN DWORD dwError, + IN DWORD cbTransferred, + OUT LPINT lpErrno); + +INT +WSPAPI +WSCInstallNameSpace( + IN LPWSTR lpszIdentifier, + IN LPWSTR lpszPathName, + IN DWORD dwNameSpace, + IN DWORD dwVersion, + IN LPGUID lpProviderId); + +INT +WSPAPI +WSCUnInstallNameSpace( + IN LPGUID lpProviderId); + +INT +WSPAPI +WSCEnableNSProvider( + IN LPGUID lpProviderId, + IN BOOL fEnable); + +INT +WSAAPI +NSPStartup( + IN LPGUID lpProviderId, + IN OUT LPNSP_ROUTINE lpnspRoutines); + +#if !defined(_WIN64) +#include <poppack.h> +#endif #ifdef __cplusplus } -#endif /* __cplusplus */ - -#endif /* _WS2SPI_H */ +#endif

1 0

[dreimer] 46595: - Add sound output on finished build. On PS we have one for a successful and one for a failed build. On CMD we have just one for now, because it seems to dislike my tries to get the errorlevel of make. - Made a small modification to be able to ask for help for ps commands in rosbe, too.
by dreimer＠svn.reactos.org 30 Mar '10

30 Mar '10

Author: dreimer Date: Tue Mar 30 14:54:03 2010 New Revision: 46595 URL: http://svn.reactos.org/svn/reactos?rev=46595&view=rev Log: - Add sound output on finished build. On PS we have one for a successful and one for a failed build. On CMD we have just one for now, because it seems to dislike my tries to get the errorlevel of make. - Made a small modification to be able to ask for help for ps commands in rosbe, too. Added: trunk/tools/RosBE/RosBE-Windows/Powershell/playwav.ps1 (with props) trunk/tools/RosBE/RosBE-Windows/Tools/WAV.BAS (with props) trunk/tools/RosBE/RosBE-Windows/samples/ trunk/tools/RosBE/RosBE-Windows/samples/Error.wav (with props) trunk/tools/RosBE/RosBE-Windows/samples/Notification.wav (with props) trunk/tools/RosBE/RosBE-Windows/samples/baseexplode.wav (with props) trunk/tools/RosBE/RosBE-Windows/samples/duh0.wav (with props) trunk/tools/RosBE/RosBE-Windows/samples/duh1.wav (with props) trunk/tools/RosBE/RosBE-Windows/samples/duh2.wav (with props) trunk/tools/RosBE/RosBE-Windows/samples/duh3.wav (with props) trunk/tools/RosBE/RosBE-Windows/samples/fade.wav (with props) trunk/tools/RosBE/RosBE-Windows/samples/firemissile.wav (with props) trunk/tools/RosBE/RosBE-Windows/samples/freecredit.wav (with props) trunk/tools/RosBE/RosBE-Windows/samples/insertcoin.wav (with props) trunk/tools/RosBE/RosBE-Windows/samples/invaderexplode.wav (with props) trunk/tools/RosBE/RosBE-Windows/samples/mothershipexplode.wav (with props) trunk/tools/RosBE/RosBE-Windows/samples/mothershiploop.wav (with props) trunk/tools/RosBE/RosBE-Windows/samples/shortdweep.wav (with props) trunk/tools/RosBE/RosBE-Windows/samples/shortwhite.wav (with props) Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd trunk/tools/RosBE/RosBE-Windows/RosBE.nsi Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] Tue Mar 30 14:54:03 2010 @@ -69,4 +69,15 @@ # Highlight the fact that building has ended. FlashWindow (ps -id $pid).MainWIndowHandle $true + +$sound = new-Object System.Media.SoundPlayer; + +if ($LASTEXITCODE -ne 0) { + $sound.SoundLocation="$_ROSBE_BASEDIR\samples\error.wav"; +} else { + $sound.SoundLocation="$_ROSBE_BASEDIR\samples\notification.wav"; +} + +$sound.Play(); + $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 [iso-8859-1] Tue Mar 30 14:54:03 2010 @@ -255,5 +255,5 @@ " status - Shows the recent status of available, non installed updates." } } else { - " Unknown command specified. No help available for $args." + get-help $args[0] } Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] Tue Mar 30 14:54:03 2010 @@ -110,6 +110,10 @@ set-alias MAKE "$_ROSBE_BASEDIR\Build.ps1" -scope Global function global:MAKEX {IEX "&'$_ROSBE_BASEDIR\Build.ps1' multi $args"} + if (Test-Path "$_ROSBE_BASEDIR\playwav.ps1") { + set-alias PLAYWAV "$_ROSBE_BASEDIR\playwav.ps1" -scope Global + } + if (Test-Path "$_ROSBE_BASEDIR\reladdr2line.ps1") { set-alias RADDR2LINE "$_ROSBE_BASEDIR\reladdr2line.ps1" -scope Global } Added: trunk/tools/RosBE/RosBE-Windows/Powershell/playwav.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/playwav.ps1 (added) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/playwav.ps1 [iso-8859-1] Tue Mar 30 14:54:03 2010 @@ -1,0 +1,746 @@ +################################################################################## +# PowerShell Invaders # +# # +# Released under the Creative Commons # +# Attribution-NonCommercial-ShareAlike 2.5 License # +# # +# For the full license see : http://creativecommons.org/licenses/by-nc-sa/2.5/ # +# # +# Authors: # +# # +# Adrian Milliner - ps1(a)soapyfrog.com (aka millinad) # +# Richy King - richy(a)wiredupandfiredup.com # +# Nik Crabtree - fido(a)prophecie.co.uk # +# Brian Long - brian(a)blong.com # +# # +# Dipswitches : # +# # +# If the variable $PSInvadersDipswitches is set to an integer value it # +# represents dipswitches on the PowerShell Invaders arcade game circuit board. # +# The variable is setup as a bitmask based on the options you require. # +# By default all dispswitches are off, so $PSInvadersDipswitches = 0 # +# For example, to have a more horrific death sequence for your base station: # +# # +# $PSInvadersDipswitches = 0x100 # +# # +# Dispswitch meanings: # +# # +# Switch 1 (value 0x1) = infinite lives # +# Switch 2 (value 0x2) = reserved for future expansion # +# Switch 3 (value 0x4) = reserved for future expansion # +# Switch 4 (value 0x8) = reserved for future expansion # +# Switch 5 (value 0x10) = reserved for future expansion # +# Switch 6 (value 0x20) = reserved for future expansion # +# Switch 7 (value 0x40) = reserved for future expansion # +# Switch 8 (value 0x80) = reserved for future expansion # +# Switch 9 (value 0x100) = pimp mode (horrific death sequence, etc) # +# Switch 10 (value 0x200) = reserved for future expansion # +# Switch 11 (value 0x400) = reserved for future expansion # +# Switch 12 (value 0x800) = reserved for future expansion # +################################################################################## + +#Activated DIP Switches +$PSInvadersDipswitches = 0x100 + +# $Id: psinvaders.ps1 94 2007-01-12 07:33:40Z adrian $ + +# test for dot sourcing +$global:__gtest__ = 1 +$local:__gtest__ = 2 +if ($global:__gtest__ -eq 2) { write-error "Don't run this with (.)!"; return } + + +# set up some script globals +$script:globs = @{ + #size of console used + 'screenwidth' = [int]60 + 'screenheight' = [int]30 + + # internal borders for movement + 'leftborder' = [int]1 + 'rightborder' = [int]59 + 'topborder' = [int]1 + + 'baseline' = [int]28 # where the base lives + 'motherline' = [int]2 # where the mothership flies + 'alienline' = [int]4 # top line for invaders + + # size of each wave of aliens + 'waveheight' = [int]5 + 'wavewidth' = [int]8 +} +$script:rawui = $host.UI.RawUI + +# set up some changable script globals +$script:cabinet = @{ + 'hiscores' = [int[]](3000,4000,5000,6000,7000,8000,9000,10000) + 'lastscore' = [int]0 + 'credits' = [int]0 + 'scores' = [int[]](0,0) # current player scores +} + +# get the dipswitch settings +$script:dipswitches = @{ + 'infiniteLives' = ($PSInvadersDipswitches -band 0x1) -eq 0x1 + 'switch02' = ($PSInvadersDipswitches -band 0x2) -eq 0x2 + 'switch03' = ($PSInvadersDipswitches -band 0x4) -eq 0x4 + 'switch04' = ($PSInvadersDipswitches -band 0x8) -eq 0x8 + 'switch05' = ($PSInvadersDipswitches -band 0x10) -eq 0x10 + 'switch06' = ($PSInvadersDipswitches -band 0x20) -eq 0x20 + 'switch07' = ($PSInvadersDipswitches -band 0x40) -eq 0x40 + 'switch08' = ($PSInvadersDipswitches -band 0x80) -eq 0x80 + 'pimpMode' = ($PSInvadersDipswitches -band 0x100) -eq 0x100 + 'switch10' = ($PSInvadersDipswitches -band 0x200) -eq 0x200 + 'switch11' = ($PSInvadersDipswitches -band 0x400) -eq 0x400 + 'switch12' = ($PSInvadersDipswitches -band 0x800) -eq 0x800 +} + +# load game sounds +function load-sounds { + $sounds = @("duh0","duh1","duh2","duh3","baseexplode" + "firemissile","insertcoin","invaderexplode", + "mothershiploop","mothershipexplode") + $script:soundplayers=@{} + foreach ($s in $sounds) { + $p = resolve-path "$_ROSBE_BASEDIR\samples\$s.wav" -erroraction "silentlycontinue" + if ($p) { + $pm = new-object media.soundplayer ($p.path) + $pm.load() + $script:soundplayers[$s] = $pm + } + else { + write-warning "Unable to find sound $s" + } + } +} + + +# play-sample +function play-sound([string]$sample) { + $pm = $script:soundplayers[$sample] + if ($pm) { $pm.play() } +} + +# function to create a sprite at a specific x,y position with specific image +function create-sprite { + param([int]$x, [int]$y, [string[]]$img, [string]$clr, [string]$dimg ) + if ($clr -eq $null -or $clr -eq '') { $clr='white' } + $sprite = @{ + 'x' = $x + 'y' = $y + 'ox' = -1 + 'oy' = -1 + 'img' = $img + 'eimg' = ' '*($img[0].length) + 'dimg' = $dimg + '_ioff' = 0 + 'state' = 'alive' + 'colour' = $clr + } + return $sprite +} + +# draw a sprite, erasing it from it's previous position, if any +function draw-sprite { + param($sprite) + if ($sprite.oy -ge 0) { + [Console]::SetCursorPosition($sprite.ox,$sprite.oy) + [Console]::Write($sprite.eimg) # this should be constructed based on size of image + } + [Console]::SetCursorPosition($sprite.x,$sprite.y) + $clr=$rawui.foregroundcolor + $rawui.foregroundcolor=$sprite.colour + [string]$render = '' + if ($sprite.state -eq 'alive') { $render = $sprite.img[$sprite._ioff] } + else { $render = $sprite.dimg; } + [Console]::Write( $render ) + $rawui.foregroundcolor=$clr + $sprite._ioff = ($sprite._ioff + 1) % $sprite.img.length + $sprite.ox = $sprite.x + $sprite.oy = $sprite.y +} + +# erase a sprite if it's been drawn before +function erase-sprite { + param($sprite) + if ($sprite.oy -ge 0) { + [Console]::SetCursorPosition($sprite.ox,$sprite.oy) + [Console]::Write($sprite.eimg) # this should be constructed based on size of image + } +} + +# move a sprite to an absolute position +function move-sprite { + param($sprite, [int]$x, [int]$y) + $sprite.x = $x + $sprite.y = $y + draw-sprite $sprite +} + +# move a sprite by a relative position +function delta-sprite { + param($sprite, [int]$x, [int]$y) + $sprite.x += $x + $sprite.y += $y + draw-sprite $sprite +} + + +# build invader fleet as a block of 8x5 +function build-fleet { + param([int]$level) # starts from 0 (default) + # at higher levels, the hoard starts a bit lower + if ($level -gt 4) { $level = 4 } + $offset = $globs.alienline + $level; + $invaders = @() + $clrs='red','blue','green','cyan','white' + for ($row=$globs.waveheight-1; $row -ge 0; $row--) { + for ($col=0; $col -lt 8; $col++) { + $x = 4 + $col * 4 + $y = $offset + $row * 2 + $inv = create-sprite $x $y '/#\','\#/' $clrs[$row] '>X<' + $invaders += $inv + } + } + return $invaders +} + +# wipe screen, oldskool, with a character and a duration in milliseconds +function wipe-game-screen { + param([int]$duration, [string]$ch) + if ($duration -le 0) { $duration = 500 } + if ($ch -eq '') { $ch = ' '} + + $delay = $duration / $globs.screenheight + $rawui.backgroundcolor='black' + $rawui.foregroundcolor='white' + $wipe=$ch * $globs.screenwidth + for ($row=0; $row -lt $globs.screenheight; $row++) { + [Console]::SetCursorPosition(0,$row) + [Console]::Write($wipe) + sleep -m $delay + } +} + + +# clear the screen for play +function clear-game-screen { + $rawui.backgroundcolor='darkmagenta' + cls +} + +function draw-centre-string { + param([int]$row, [string]$txt) + [int]$x = ( $globs.screenwidth - $txt.length ) / 2 + [Console]::SetCursorPosition($x,$row); + [Console]::Write($txt) +} + +function draw-left-string { + param([int]$row, [string]$txt) + [Console]::SetCursorPosition(0,$row); + [Console]::Write($txt) +} + +function draw-right-string { + param([int]$row, [string]$txt) + [int]$x = ( $globs.screenwidth - $txt.length ) + [Console]::SetCursorPosition($x,$row); + [Console]::Write($txt) +} + + + +# draw the top line of the play window +function draw-scores-etc { + $clr=$rawui.foregroundcolor + $rawui.foregroundcolor='white' + draw-left-string 0 ([string]::Format('1UP: {0:00000#}',$cabinet.scores[0])) + draw-centre-string 0 ([string]::Format('HIGH: {0:00000#}',$cabinet.hiscores[-1])) + draw-right-string 0 ([string]::Format('CREDITS: {0:0#}',$cabinet.credits)) + $rawui.foregroundcolor=$clr +} + + + + + +# main func +function play-game { + wipe-game-screen 300 '*' + wipe-game-screen 300 ' ' + [int]$seed = [DateTime]::Now.Millisecond + $random = new-object Random -argumentList $seed + + [int]$level = 10 + [int]$lives = 0 + if($dipswitches.infiniteLives){ + $lives = 999 + } + else{ + $lives = 2 + } + [int]$numshots = 0 + + # build alien fleet + $invaders = build-fleet $level + [int]$fleetsize = $invaders.Count + + # create base + [int]$basex = 20 + $globs.leftborder + [int]$basey = $globs.baseline + $base = create-sprite $basex $basey @('<@>') 'white' 'XXX' + + # create horrificdeathsequence if in pimpMode + $horrificdeathsequence = @() + if ($dipswitches.pimpMode) { + $horrificdeathsequence += create-sprite 0 0 " <*@*> " "Red" + $horrificdeathsequence += create-sprite 0 0 " . / @ \ . " "Red" + $horrificdeathsequence += create-sprite 0 0 " \ . @ . / " "Yellow" + $horrificdeathsequence += create-sprite 0 0 " / . . * . . \ " "Yellow" + $horrificdeathsequence += create-sprite 0 0 " . . . . . " "DarkYellow" + $horrificdeathsequence += create-sprite 0 0 " . . . " "DarkYellow" + $horrificdeathsequence += create-sprite 0 0 " . . . " "DarkRed" + $horrificdeathsequence += create-sprite 0 0 " . . . " "DarkRed" + $horrificdeathsequence += create-sprite 0 0 ". ." "Gray" + $horrificdeathsequence += create-sprite 0 0 " " "DarkGray" + } + #missile + $missile = 0 + + #mothership + $mothership = 0 + $frameToLaunchShip = ($numshots + 20 + $random.Next(5)) + + $bombs= @() + for ([int]$temp=0; $temp -lt 5; $temp++) { + $bomb = 0 + $bombs += $bomb + } + + $bases= @() + for ([int]$temp=0; $temp -lt 24; $temp++){ + $bbit = 0 + $bases += $bbit + } + +#draw the bases +[int]$c = 0 +for([int]$temp = 10; $temp -lt 50; $temp += 10){ + for([int]$off = 0; $off -lt 3 ; $off++){ + $bases[$c] = create-sprite ($temp+$off) ($globs.baseline-1) "#" + draw-sprite $bases[$c] + $c += 1 + $bases[$c] = create-sprite ($temp+$off) ($globs.baseline-2) "#" + draw-sprite $bases[$c] + $c += 1 + } +} + + [int]$dx = 1 + [int]$dy = 0 + [int]$xmax = 0 + [int]$xmin = 0 + [int]$ymax = 0 + [int]$basedx = 0 + + [int]$playing = 1 + $cabinet.scores[0] = 0 + [int]$framecount = 0 + [int]$duhcount = 0 + + draw-scores-etc + + while ($playing) { + $xmax = 0; $xmin = 999; $ymax = 0 + [int]$duh = ($duhcount++) % 4 + play-sound "duh$duh" + foreach ($inv in $invaders) { + # here's the main game loop + $framecount++ + + # process next alien + if ($inv.state -eq 'alive') { + delta-sprite $inv $dx $dy + # randomly self-destruct + if ($random.Next(50) -eq 1) { + for($temp=0;$temp -lt $bombs.length;$temp++){ + if($bombs[$temp] -eq 0){ + $bombs[$temp] = create-sprite ($inv.x+1) ($inv.y+1) ':','+' + break + } + } + } + } + elseif ($inv.state -eq 'dying') { + erase-sprite $inv + $inv.state = 'dead' + $fleetsize-- + if ($fleetsize -eq 0) { + $level += 1 + $invaders = build-fleet $level + [int]$fleetsize = $invaders.Count + } + } + else { # dead + continue; + } + # move missile if there + if ($missile -ne 0){ + if($missile.y -eq $globs.topborder){ + erase-sprite $missile + $missile = 0 + }else{ + delta-sprite $missile 0 -1 + } + } + + # move bombs + for($temp=0;$temp -lt $bombs.length;$temp++){ + if($bombs[$temp] -ne 0){ + if($bombs[$temp].y -eq $globs.baseline){ + erase-sprite $bombs[$temp] + $bombs[$temp]= 0 + }else{ + delta-sprite $bombs[$temp] 0 1 + } + } + } + + + #do mothership? + if($mothership -ne 0){ + if(($mothership.x + 5) -gt $globs.rightborder){ + erase-sprite $mothership + $mothership = 0 + $frameToLaunchShip = ($numshots + 20 + $random.Next(5)) + }else{ + delta-sprite $mothership 1 0 + } + }else{ + if ($numshots -eq $frameToLaunchShip){ + $mothership = create-sprite $globs.leftborder $globs.motherline @('[=O=]') 'green' '//o\\' + } + } + + # update the mins and maxes + $xmax = [Math]::Max($inv.x,$xmax) + $xmin = [Math]::Min($inv.x,$xmin) + $ymax = [Math]::Max($inv.y,$ymax) + # scan keyboard + # left/right arrow down set basedx to -1/+1 and these are + # reset on key up + # a fire event is just set when space key down is registered. + [int]$dofire = 0; + while ($rawui.KeyAvailable ) { + $rk = $rawui.ReadKey('NoEcho,IncludeKeyDown,IncludeKeyUp') + $k = $rk.VirtualKeyCode + if ($rk.KeyDown) { + switch ($k) { + 37 { $basedx = -1; break } + 39 { $basedx = 1; break } + 32 { $dofire = 1; break } + 27 { return 'quit' } + ([int][char]'C') { + if (-not $dipswitches.infiniteLives) { + $cabinet.credits++ + play-sound "insertcoin" + } + draw-scores-etc + break + } + } + } + else { + if ($k -eq 37) { $basedx = 0 } + elseif ($k -eq 39) { $basedx = 0} + } + } + + # fire missile + if ($dofire -eq 1){ + if($missile -eq 0){ + play-sound "firemissile" + $missile = create-sprite ($basex+1) ($basey-1) @('|') + $numshots += 1 + } + } + + # move the base + $basex += $basedx; + if ($basex -lt $globs.leftborder) { $basex = $globs.leftborder; $basedx = 0 } + elseif ($basex -ge ( $globs.rightborder - 3 ) ) { $basex = $globs.rightborder - 3; $basedx = 0 } + move-sprite $base $basex $basey + + # and check for collisions, change state to 'dying' etc for next loop + # did we hit an alien? + if($missile -ne 0){ + foreach ($inv in $invaders){ + if($inv.state -ne 'dead' -and $inv.state -ne 'dying' -and $inv.y -eq $missile.y -and ($missile.x -ge ($inv.x) -and $missile.x -lt ($inv.x+3))){ + play-sound "invaderexplode" + $inv.state = 'dying' + erase-sprite $missile + draw-sprite $inv + $missile = 0 + $cabinet.scores[0] += 100 + draw-scores-etc + } + } + + #oo what about a mothership + if($mothership -ne 0){ + if($missile.y -eq $mothership.y -and ($missile.x -ge ($mothership.x) -and $missile.x -lt ($mothership.x+5))){ + $mothership.state = 'dying' + erase-sprite $missile + draw-sprite $mothership + $missile = 0 + $cabinet.scores[0] += $random.Next(5) * 1000 + draw-scores-etc + erase-sprite $mothership + $mothership = 0 + } + } + } + #did we hit any bases? + if($missile -ne 0){ + for($basecount=0; $basecount -lt $bases.length; $basecount++){ + if($bases[$basecount] -ne 0){ + if($missile.y -eq $bases[$basecount].y -and $missile.x -eq $bases[$basecount].x){ + erase-sprite $missile + $missile=0 + erase-sprite $bases[$basecount] + $bases[$basecount]=0 + } + } + } + + } + #did the aliens hit any bases +for($basecount=0; $basecount -lt $bases.length; $basecount++){ + if($bases[$basecount] -ne 0){ + for($temp=0;$temp -lt $bombs.length;$temp++){ + if($bombs[$temp] -ne 0){ + + if($bombs[$temp].y -eq $bases[$basecount].y -and $bombs[$temp].x -eq $bases[$basecount].x){ + erase-sprite $bombs[$temp] + $bombs[$temp]=0 + erase-sprite $bases[$basecount] + $bases[$basecount]=0 + } + } + } + } + } + + # and did any aliens hit us? + $isdead = $false + for($temp=0;$temp -lt $bombs.length;$temp++){ + if($bombs[$temp] -ne 0){ + if($bombs[$temp].y -eq $globs.baseline-1 -and ($bombs[$temp].x -ge ($basex) -and $bombs[$temp].x -lt ($basex+3))){ + play-sound "baseexplode" + $isdead = $true + if ($dipswitches.pimpMode){ + $deathx=$basex-(($horrificdeathsequence[0].eimg.length-$base.img.length)/2) + $ferocity = 20 + foreach ($deathframe in $horrificdeathsequence) { + move-sprite $deathframe $deathx $basey + sleep -m $ferocity + $ferocity = $ferocity*1.5 + } + } + else{ + for($flash=0;$flash -lt 10; $flash++){ + $base.state = 'dying' + draw-sprite $base + sleep -m 20 + $base.state = 'alive' + draw-sprite $base + sleep -m 20 + } + } + if($lives -gt 0){ + if (-not $dipswitches.infiniteLives) { $lives -= 1 } + $basex = (20 + $globs.leftborder) + move-sprite $base $basex $basey + }else{ + $playing=0 + break + } + } + } + } + + + #if dead remove bombs... + if($isdead){ + for($temp=0;$temp -lt $bombs.length;$temp++){ + if($bombs[$temp] -ne 0){ + erase-sprite $bombs[$temp] + $bombs[$temp]= 0 + } + } + } + + + sleep -m 10 + } + # end of main game loop (invader drawing block) + # everything below is done once per movement wave + + # determine if the block as hit the edges, and if so change direction + if ($ymax -ge $globs.baseline) { $playing=0; break}; + if ($dx -eq 1) { + if ($xmax -ge ( $globs.rightborder - 3 ) ) { $dx = 0; $dy = 1 } + } + elseif ($dx -eq -1) { + if ($xmin -lt $globs.leftborder ) { $dx = 0; $dy = 1 } + } + elseif ($dx -eq 0) { + if ($xmin -lt $globs.leftborder) { + $dx = 1; + } + else { + $dx = -1; + } + $dy = 0; + } + + } + # game is over here + } + + # game intro sequence.. shows high score table, collects credits + # and waits for user to quit or choose one player game. + # returns 'quit' if prog should end, or '1up' if player 1 should start + +function play-intro { + wipe-game-screen 300 '*'; wipe-game-screen 300 ' ' + + [string]$icmsg = 'INSERT COIN' + [string]$icblank = (' ' * $icmsg.length) + + [int]$framecount = 0 + [int]$seqduration = 400 + + # max out credits if infiniteLives switch is on + if ($dipswitches.infiniteLives) { $cabinet.credits = 99 } + + while ($true) { + + # show title + $rawui.foregroundcolor='white' + draw-centre-string 5 'POWERSHELL INVADERS' + + # different things get drawn in the middle, depending on sequence + $rawui.foregroundcolor='green' + $sequence = ($framecount % $seqduration) + + if ($sequence -eq ($seqduration/2) -or $sequence -eq 0) { + # clear area on sequence change + $blank = ' ' * $globs.screenwidth + for ([int]$i = 7; $i -lt 20; $i++) { draw-centre-string $i $blank } + } + + if ($sequence -lt ($seqduration/2)) { + # high score table + draw-centre-string 8 'HIGH SCORE TABLE' + for($i = 0; $i -lt $cabinet.hiscores.Count; $i++) { + [string]$str = [string]::Format('{0} . . . . . {1:00000#}',(1+$i),$cabinet.hiscores[-1-$i]) + draw-centre-string (10+$i) $str + } + } + else { + # score advance table + draw-centre-string 8 'SCORE ADVANCE TABLE' + draw-centre-string 11 '[=O=] . . . . MYSTERY' + draw-centre-string 13 '/#\ . . . . . . . 100' + } + + $rawui.foregroundcolor='white' + draw-centre-string 21 'PRESS C FOR CREDIT - 1 FOR PLAYER 1 - ESC TO QUIT' + + draw-scores-etc + + while ( $rawui.KeyAvailable ) { + $rk = $rawui.ReadKey('NoEcho,IncludeKeyDown,IncludeKeyUp') + $k = $rk.VirtualKeyCode + if ($rk.KeyDown) { + # check for C key to add a credit + if (-not $dipswitches.infiniteLives -and $k -eq 67) { + $cabinet.credits++ + play-sound "insertcoin" + } + # check for ESC key to quit + elseif ($k -eq 27) { + return 'quit' + } + # check for '1' key to start player 1 + elseif ($k -eq 49 -and $cabinet.credits -gt 0) { + if (-not $dipswitches.infiniteLives) { $cabinet.credits-- } + return '1up' + } + } + } + + $rawui.foregroundcolor='red' + if ($cabinet.credits -eq 0 -and ($framecount % 20 -lt 10)) { + draw-centre-string 23 $icmsg : $icblank + } + else { + draw-centre-string 23 $icblank + } + + sleep -m 20 # 50 times a second loop + $framecount++ + } + +} + +# outro sequence when the game ends (due to death, usually) +function play-outro { + [int]$y = ($globs.screenheight / 2) + $rawui.foregroundcolor='yellow' + draw-centre-string ($y++) ' ' + draw-centre-string ($y++) ' G A M E O V E R ' + draw-centre-string ($y++) ' ' + $rawui.foregroundcolor='white' + # add a score, sort it, remove smallest + $cabinet.hiscores += $cabinet.scores[0] + [array]::Sort( $cabinet.hiscores ) + $cabinet.hiscores = $cabinet.hiscores[1..($cabinet.hiscores.Count-1)] + sleep 2 +} + +# program kicks off here +load-sounds +$Script:oldBClr = $rawui.backgroundcolor +$Script:oldFClr = $rawui.foregroundcolor +$Script:oldCursorSize = $rawui.CursorSize +$rawui.CursorSize = 0 +$Script:oldTitle = $rawui.WindowTitle +$rawui.WindowTitle = 'playwav' +clear-game-screen +while ($true) { + $action = '' + $action = play-intro + if ($action -eq 'quit') { break } + elseif ($action -eq '1up') { + $action = play-game + $action = play-outro + } +} +$rawui.WindowTitle = $oldTitle +$rawui.CursorSize = $oldCursorSize +$rawui.backgroundcolor = $oldBClr +$rawui.foregroundcolor = $oldFClr +cls +'Bye bye' + + +###################################### +# Issues +# +# 1) Need support for entering scores +# 2) Need support for persisting scores +# +###################################### Propchange: trunk/tools/RosBE/RosBE-Windows/Powershell/playwav.ps1 ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Bui… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd [iso-8859-1] Tue Mar 30 14:54:03 2010 @@ -62,5 +62,10 @@ :EOC :: Highlight the fact that building has ended. + +cd /d "%_ROSBE_BASEDIR%\samples" +wav.exe Notification.wav + flash.exe + title ReactOS Build Environment %_ROSBE_VERSION% Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.ns… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] Tue Mar 30 14:54:03 2010 @@ -153,6 +153,10 @@ File /r Components\Tools\iconv.exe File /r Components\Tools\m4.exe File /r Components\Tools\patch.exe + File /r Components\Tools\wav.exe + SetOutPath "$INSTDIR\samples" + SetOverwrite try + File /r Components\samples\*.* SectionEnd Section -MinGWGCCNASM SEC02 @@ -283,6 +287,7 @@ File /r Components\Powershell\chdefdir.ps1 File /r Components\Powershell\Config.ps1 File /r Components\Powershell\options.ps1 + File /r Components\Powershell\playwav.ps1 File /r Components\Powershell\Remake.ps1 File /r Components\Powershell\Remakex.ps1 File /r Components\Powershell\kdbg.ps1 @@ -396,6 +401,7 @@ ;; RMDir /r /REBOOTOK "$INSTDIR\i386" RMDir /r /REBOOTOK "$INSTDIR\Tools" + RMDir /r /REBOOTOK "$INSTDIR\samples" StrCmp $ICONS_GROUP "" NO_SHORTCUTS RMDir /r /REBOOTOK "$SMPROGRAMS\$ICONS_GROUP" NO_SHORTCUTS: @@ -425,6 +431,7 @@ Delete /REBOOTOK "$INSTDIR\Remakex.cmd" Delete /REBOOTOK "$INSTDIR\Remake.ps1" Delete /REBOOTOK "$INSTDIR\Remakex.ps1" + Delete /REBOOTOK "$INSTDIR\playwav.ps1" Delete /REBOOTOK "$INSTDIR\kdbg.cmd" Delete /REBOOTOK "$INSTDIR\kdbg.ps1" Delete /REBOOTOK "$INSTDIR\RosBE.cmd" Added: trunk/tools/RosBE/RosBE-Windows/Tools/WAV.BAS URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/WA… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/WAV.BAS (added) +++ trunk/tools/RosBE/RosBE-Windows/Tools/WAV.BAS [iso-8859-1] Tue Mar 30 14:54:03 2010 @@ -1,0 +1,42 @@ +'============================================================================== +' +' WAV.EXE - Command line .WAV file player +' Copyright (c) 1998 by PowerBASIC, Inc. All Rights Reserved. +' +'============================================================================== + +$INCLUDE "WIN32API.INC" + +FUNCTION PbMain() AS LONG + + DIM wav AS ASCIIZ * 256 + + wav = COMMAND$ + + STDOUT "WAV.EXE v1.0 - Command line .WAV file player" + STDOUT "Copyright (c) 1998 by PowerBASIC, Inc." + STDOUT "" + + IF LEN(wav) = 0 THEN + STDOUT "Usage: WAV filename.wav + + SndPlaySound BYVAL %NULL, %SND_SYNC 'stop anything currently playing + + FUNCTION = 1 + EXIT FUNCTION + END IF + + IF INSTR(wav, ".") = 0 THEN + wav = wav + ".WAV" + END IF + + IF LEN(DIR$(wav)) THEN + STDOUT "Playing " & wav + SndPlaySound wav, %SND_SYNC + ELSE + STDOUT "File not found: " & wav + FUNCTION = 1 + END IF + +END FUNCTION + Propchange: trunk/tools/RosBE/RosBE-Windows/Tools/WAV.BAS ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/tools/RosBE/RosBE-Windows/samples/Error.wav URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/samples/… ============================================================================== Binary file - no diff available. Propchange: trunk/tools/RosBE/RosBE-Windows/samples/Error.wav ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/tools/RosBE/RosBE-Windows/samples/Notification.wav URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/samples/… ============================================================================== Binary file - no diff available. Propchange: trunk/tools/RosBE/RosBE-Windows/samples/Notification.wav ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/tools/RosBE/RosBE-Windows/samples/baseexplode.wav URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/samples/… ============================================================================== Binary file - no diff available. Propchange: trunk/tools/RosBE/RosBE-Windows/samples/baseexplode.wav ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/tools/RosBE/RosBE-Windows/samples/duh0.wav URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/samples/… ============================================================================== Binary file - no diff available. Propchange: trunk/tools/RosBE/RosBE-Windows/samples/duh0.wav ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/tools/RosBE/RosBE-Windows/samples/duh1.wav URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/samples/… ============================================================================== Binary file - no diff available. Propchange: trunk/tools/RosBE/RosBE-Windows/samples/duh1.wav ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/tools/RosBE/RosBE-Windows/samples/duh2.wav URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/samples/… ============================================================================== Binary file - no diff available. Propchange: trunk/tools/RosBE/RosBE-Windows/samples/duh2.wav ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/tools/RosBE/RosBE-Windows/samples/duh3.wav URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/samples/… ============================================================================== Binary file - no diff available. Propchange: trunk/tools/RosBE/RosBE-Windows/samples/duh3.wav ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/tools/RosBE/RosBE-Windows/samples/fade.wav URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/samples/… ============================================================================== Binary file - no diff available. Propchange: trunk/tools/RosBE/RosBE-Windows/samples/fade.wav ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/tools/RosBE/RosBE-Windows/samples/firemissile.wav URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/samples/… ============================================================================== Binary file - no diff available. Propchange: trunk/tools/RosBE/RosBE-Windows/samples/firemissile.wav ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/tools/RosBE/RosBE-Windows/samples/freecredit.wav URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/samples/… ============================================================================== Binary file - no diff available. Propchange: trunk/tools/RosBE/RosBE-Windows/samples/freecredit.wav ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/tools/RosBE/RosBE-Windows/samples/insertcoin.wav URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/samples/… ============================================================================== Binary file - no diff available. Propchange: trunk/tools/RosBE/RosBE-Windows/samples/insertcoin.wav ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/tools/RosBE/RosBE-Windows/samples/invaderexplode.wav URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/samples/… ============================================================================== Binary file - no diff available. Propchange: trunk/tools/RosBE/RosBE-Windows/samples/invaderexplode.wav ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/tools/RosBE/RosBE-Windows/samples/mothershipexplode.wav URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/samples/… ============================================================================== Binary file - no diff available. Propchange: trunk/tools/RosBE/RosBE-Windows/samples/mothershipexplode.wav ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/tools/RosBE/RosBE-Windows/samples/mothershiploop.wav URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/samples/… ============================================================================== Binary file - no diff available. Propchange: trunk/tools/RosBE/RosBE-Windows/samples/mothershiploop.wav ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/tools/RosBE/RosBE-Windows/samples/shortdweep.wav URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/samples/… ============================================================================== Binary file - no diff available. Propchange: trunk/tools/RosBE/RosBE-Windows/samples/shortdweep.wav ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/tools/RosBE/RosBE-Windows/samples/shortwhite.wav URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/samples/… ============================================================================== Binary file - no diff available. Propchange: trunk/tools/RosBE/RosBE-Windows/samples/shortwhite.wav ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

1 0

[janderwald] 46594: [BDAPLGIN, KSPROXY, MSDVBNP, MSVIDCTL] - Register DLLs when ReactOS is installed
by janderwald＠svn.reactos.org 30 Mar '10

30 Mar '10

Author: janderwald Date: Tue Mar 30 13:52:50 2010 New Revision: 46594 URL: http://svn.reactos.org/svn/reactos?rev=46594&view=rev Log: [BDAPLGIN, KSPROXY, MSDVBNP, MSVIDCTL] - Register DLLs when ReactOS is installed Modified: trunk/reactos/dll/directx/bdaplgin/bdaplgin.rbuild trunk/reactos/dll/directx/ksproxy/ksproxy.rbuild trunk/reactos/dll/directx/msdvbnp/msdvbnp.rbuild trunk/reactos/dll/directx/msvidctl/msvidctl.rbuild Modified: trunk/reactos/dll/directx/bdaplgin/bdaplgin.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/bdaplgin/bdapl… ============================================================================== --- trunk/reactos/dll/directx/bdaplgin/bdaplgin.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/bdaplgin/bdaplgin.rbuild [iso-8859-1] Tue Mar 30 13:52:50 2010 @@ -3,6 +3,7 @@ <group> <module name="bdaplgin" type="win32dll" baseaddress="${BASEADDRESS_BDAPLGIN}" installbase="system32" installname="bdaplgin.ax"> <importlibrary definition="bdaplgin.spec" /> + <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <include base="bdaplgin">.</include> <library>ntdll</library> <library>kernel32</library> Modified: trunk/reactos/dll/directx/ksproxy/ksproxy.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksproxy/ksprox… ============================================================================== --- trunk/reactos/dll/directx/ksproxy/ksproxy.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ksproxy/ksproxy.rbuild [iso-8859-1] Tue Mar 30 13:52:50 2010 @@ -3,6 +3,7 @@ <group> <module name="ksproxy" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_KSPROXY}" installbase="system32" installname="ksproxy.ax"> <importlibrary definition="ksproxy.spec" /> + <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <include base="ksproxy">.</include> <library>ntdll</library> <library>kernel32</library> Modified: trunk/reactos/dll/directx/msdvbnp/msdvbnp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/msdvbnp/msdvbn… ============================================================================== --- trunk/reactos/dll/directx/msdvbnp/msdvbnp.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/msdvbnp/msdvbnp.rbuild [iso-8859-1] Tue Mar 30 13:52:50 2010 @@ -3,6 +3,7 @@ <group> <module name="msdvbnp" type="win32dll" baseaddress="${BASEADDRESS_MSDVBNP}" installbase="system32" installname="msdvbnp.ax"> <importlibrary definition="msdvbnp.spec" /> + <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <include base="msdvbnp">.</include> <library>ntdll</library> <library>kernel32</library> Modified: trunk/reactos/dll/directx/msvidctl/msvidctl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/msvidctl/msvid… ============================================================================== --- trunk/reactos/dll/directx/msvidctl/msvidctl.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/msvidctl/msvidctl.rbuild [iso-8859-1] Tue Mar 30 13:52:50 2010 @@ -3,6 +3,7 @@ <group> <module name="msvidctl" type="win32dll" baseaddress="${BASEADDRESS_MSVIDCTL}" installbase="system32" installname="msvidctl.dll"> <importlibrary definition="msvidctl.spec" /> + <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <include base="msvidctl">.</include> <library>ntdll</library> <library>kernel32</library>

1 0

[janderwald] 46593: - Add bdasup to bootcd
by janderwald＠svn.reactos.org 30 Mar '10

30 Mar '10

Author: janderwald Date: Tue Mar 30 13:28:10 2010 New Revision: 46593 URL: http://svn.reactos.org/svn/reactos?rev=46593&view=rev Log: - Add bdasup to bootcd Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Tue Mar 30 13:28:10 2010 @@ -505,6 +505,7 @@ drivers\input\sermouse\sermouse.sys 2 drivers\ksfilter\ks\ks.sys 2 +drivers\multimedia\bdasup\bdasup.sys 2 drivers\network\afd\afd.sys 2 drivers\network\ndis\ndis.sys 2

1 0

[tkreuzer] 46592: Merge from amd64-branch: 44467, 44468, 44470, 44471, 46524 [OLDNAMES] Update moldname-msvcrt.def Add a proper oldnames lib, instead of implicitly including it with mingw. 46526 [FTP/DHCP] - remove the oldnames hack, as we now have a proper oldnames lib (included in mingw_common) - protect struct timezone from redefinition
by tkreuzer＠svn.reactos.org 30 Mar '10

30 Mar '10

Author: tkreuzer Date: Tue Mar 30 13:09:21 2010 New Revision: 46592 URL: http://svn.reactos.org/svn/reactos?rev=46592&view=rev Log: Merge from amd64-branch: 44467, 44468, 44470, 44471, 46524 [OLDNAMES] Update moldname-msvcrt.def Add a proper oldnames lib, instead of implicitly including it with mingw. 46526 [FTP/DHCP] - remove the oldnames hack, as we now have a proper oldnames lib (included in mingw_common) - protect struct timezone from redefinition Modified: trunk/reactos/ (props changed) trunk/reactos/ReactOS-amd64.rbuild trunk/reactos/base/applications/network/ftp/fake.h trunk/reactos/base/applications/network/ftp/ftp.rbuild trunk/reactos/base/services/dhcp/dhcp.rbuild trunk/reactos/dll/directx/bdaplgin/classfactory.cpp (props changed) trunk/reactos/dll/directx/d3d8/d3d8.spec (props changed) trunk/reactos/dll/directx/dsound_new/classfactory.c (props changed) trunk/reactos/dll/directx/dsound_new/dsound.spec (props changed) trunk/reactos/dll/directx/dsound_new/dsound_convert.c (props changed) trunk/reactos/dll/directx/dsound_new/regsvr.c (props changed) trunk/reactos/dll/shellext/devcpux/devcpux.spec (props changed) trunk/reactos/dll/shellext/slayer/slayer.spec (props changed) trunk/reactos/include/ndk/amd64/ (props changed) trunk/reactos/include/ndk/amd64/asmmacro.S (props changed) trunk/reactos/lib/3rdparty/mingw/mingw.rbuild trunk/reactos/lib/3rdparty/mingw/moldname-msvcrt.def trunk/reactos/lib/sdk/crt/time/ (props changed) trunk/reactos/ntoskrnl/kdbg/ (props changed) trunk/reactos/subsystems/win32/win32k/include/engobjects.h (props changed) trunk/reactos/tools/rsym/rsym.c (props changed) trunk/reactos/tools/rsym/rsym.h (props changed) trunk/reactos/tools/rsym/rsym.mak (props changed) trunk/reactos/tools/rsym/rsym_common.c (props changed) Propchange: trunk/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Mar 30 13:09:21 2010 @@ -1,3 +1,3 @@ /branches/header-work:45691-46463 /branches/ros-amd64-bringup:36852 -/branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36397,36445,36502-36503,36505,36570,36614,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40927-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479,41484-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44772,45124,45126-45127,46394 +/branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36397,36445,36502-36503,36505,36570,36614,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40927-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479,41484-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44772,45124,45126-45127,46394,46524,46526,46589 Modified: trunk/reactos/ReactOS-amd64.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-amd64.rbuild?rev=4… ============================================================================== --- trunk/reactos/ReactOS-amd64.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-amd64.rbuild [iso-8859-1] Tue Mar 30 13:09:21 2010 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> -<project name="ReactOS" makefile="makefile-amd64.auto" xmlns:xi="http://www.w3.org/2001/XInclude"> +<project name="ReactOS" makefile="makefile-amd64.auto" xmlns:xi="http://www.w3.org/2001/XInclude" allowwarnings="true"> <xi:include href="config-amd64.rbuild"> <xi:fallback> <xi:include href="config-amd64.template.rbuild" /> @@ -28,12 +28,14 @@ <compilerflag>-ftracer</compilerflag> <compilerflag>-momit-leaf-frame-pointer</compilerflag> </if> + <compilerflag>-fms-extensions</compilerflag> <compilerflag>-mpreferred-stack-boundary=4</compilerflag> <compilerflag compiler="midl">-m64 --win64</compilerflag>   <compilerflag>-U_X86_</compilerflag> <compilerflag>-Wno-format</compilerflag> + <compilerflag>-fno-leading-underscore</compilerflag> </group> <group linkerset="ld"> Modified: trunk/reactos/base/applications/network/ftp/fake.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ftp/fake.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ftp/fake.h [iso-8859-1] Tue Mar 30 13:09:21 2010 @@ -9,9 +9,12 @@ #define strcasecmp _stricmp #define strncasecmp _strnicmp +#ifndef _TIMEZONE_DEFINED /* also in sys/time.h */ +#define _TIMEZONE_DEFINED struct timezone { - int tz_minuteswest; /* minutes W of Greenwich */ - int tz_dsttime; /* type of dst correction */ + int tz_minuteswest; + int tz_dsttime; }; -int gettimeofday(struct timeval *tv, struct timezone *tz); + extern int __cdecl gettimeofday (struct timeval *p, struct timezone *z); +#endif Modified: trunk/reactos/base/applications/network/ftp/ftp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ftp/ftp.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ftp/ftp.rbuild [iso-8859-1] Tue Mar 30 13:09:21 2010 @@ -4,19 +4,9 @@ <include base="ftp">.</include> <define name="lint" /> -  - <define name="chdir">_chdir</define> - <define name="getcwd">_getcwd</define> - <define name="mktemp">_mktemp</define> - <define name="unlink">_unlink</define> - <define name="close">_close</define> - <define name="fileno">_fileno</define> - <define name="read">_read</define> - <define name="write">_write</define> - <define name="lseek">_lseek</define> - <library>ws2_32</library> <library>iphlpapi</library> + <library>oldnames</library> <file>cmds.c</file> <file>cmdtab.c</file> <file>domacro.c</file> Modified: trunk/reactos/base/services/dhcp/dhcp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/dhcp.rb… ============================================================================== --- trunk/reactos/base/services/dhcp/dhcp.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/services/dhcp/dhcp.rbuild [iso-8859-1] Tue Mar 30 13:09:21 2010 @@ -4,16 +4,11 @@ <include base="dhcp">.</include> <include base="dhcp">include</include> -  - <define name="tzset">_tzset</define> - <define name="close">_close</define> - <define name="read">_read</define> - <define name="write">_write</define> - <library>ntdll</library> <library>ws2_32</library> <library>iphlpapi</library> <library>advapi32</library> + <library>oldnames</library> <file>adapter.c</file> <file>alloc.c</file> <file>api.c</file> Propchange: trunk/reactos/dll/directx/bdaplgin/classfactory.cpp ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Mar 30 13:09:21 2010 @@ -1,3 +1,3 @@ /branches/header-work/dll/directx/bdaplgin/classfactory.cpp:45691-46463 -/branches/ros-amd64-bringup/reactos/dll/directx/bdaplgin/classfactory.cpp:34741,34870,36969,40927,41070,41500,44339,44501,44503-44504,44506,44511-44512,44521,44523-44526,45124,45126-45127,46394 +/branches/ros-amd64-bringup/reactos/dll/directx/bdaplgin/classfactory.cpp:34741,34870,36969,40927,41070,41500,44339,44467-44468,44470-44471,44501,44503-44504,44506,44511-44512,44521,44523-44526,45124,45126-45127,46394,46524,46526,46589 /branches/ros-amd64-bringup/reactos/dll/directx/ksproxy/classfactory.cpp:34711-34712,34743,34780-34782,34812,34839,34842,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35683,35739,35746,35762,35771,35777,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36172,36360,36388-36389,36445,36502-36503,36505,36570,36614,36899,36930,36936,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148-38151,38264-38265,38268,38355,39151,39333,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41082-41086,41097-41098,41101,41449,41479,41484-41485,41499,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 Propchange: trunk/reactos/dll/directx/d3d8/d3d8.spec ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Mar 30 13:09:21 2010 @@ -1,2 +1,2 @@ /branches/header-work/dll/directx/d3d8/d3d8.spec:45691-46463 -/branches/ros-amd64-bringup/reactos/dll/directx/d3d8/d3d8.spec:34741,34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36380,36397,36445,36502-36503,36505,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36992,38092,38100,38148-38151,38264-38265,38268,38355,39333,39335,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40927-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41029,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479,41484-41485,41500,41502,41531,41536,41540,41546-41547,41549,43080,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44772,45124,45126-45127,46394 +/branches/ros-amd64-bringup/reactos/dll/directx/d3d8/d3d8.spec:34741,34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36380,36397,36445,36502-36503,36505,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36992,38092,38100,38148-38151,38264-38265,38268,38355,39333,39335,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40927-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41029,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479,41484-41485,41500,41502,41531,41536,41540,41546-41547,41549,43080,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44772,45124,45126-45127,46394,46524,46526,46589 Propchange: trunk/reactos/dll/directx/dsound_new/classfactory.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Mar 30 13:09:21 2010 @@ -1,3 +1,3 @@ /branches/header-work/dll/directx/dsound_new/classfactory.c:45691-46463 -/branches/ros-amd64-bringup/reactos/dll/directx/dsound_new/classfactory.c:34741,34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36380,36397,36502-36503,36505,36898,36936,36949,36951,36958,36961,36964,36969,36972,36992,38092,38100,38149-38150,38264,38355,39335,39639,40122-40123,40125,40155,40247,40324,40753,40927,40986-40987,40989,40993,40995-40996,41001,41029,41044-41045,41047-41049,41070,41098,41101,41449,41479,41484-41485,41500,41502,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43836,43838-43840,43857,43860,43905,43907,43969,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44772,45124,45126-45127,46394 +/branches/ros-amd64-bringup/reactos/dll/directx/dsound_new/classfactory.c:34741,34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36380,36397,36502-36503,36505,36898,36936,36949,36951,36958,36961,36964,36969,36972,36992,38092,38100,38149-38150,38264,38355,39335,39639,40122-40123,40125,40155,40247,40324,40753,40927,40986-40987,40989,40993,40995-40996,41001,41029,41044-41045,41047-41049,41070,41098,41101,41449,41479,41484-41485,41500,41502,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43836,43838-43840,43857,43860,43905,43907,43969,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44772,45124,45126-45127,46394,46524,46526,46589 /branches/ros-amd64-bringup/reactos/dll/win32/netshell/classfactory.c:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41030,41050,41052,41082-41086,41499,41549,43080,43426,43454,43677,43682 Propchange: trunk/reactos/dll/directx/dsound_new/dsound.spec ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Mar 30 13:09:21 2010 @@ -1,3 +1,3 @@ /branches/header-work/dll/directx/dsound_new/dsound.spec:45691-46463 /branches/ros-amd64-bringup/reactos/dll/directx/dsound/dsound.spec:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41030,41050,41052,41082-41086,41499,41549,43080,43426,43454,43677,43682 -/branches/ros-amd64-bringup/reactos/dll/directx/dsound_new/dsound.spec:34741,34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36380,36397,36502-36503,36505,36898,36936,36949,36951,36958,36961,36964,36969,36972,36992,38092,38100,38149-38150,38264,38355,39335,39639,40122-40123,40125,40155,40247,40324,40753,40927,40986-40987,40989,40993,40995-40996,41001,41029,41044-41045,41047-41049,41070,41098,41101,41449,41479,41484-41485,41500,41502,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43836,43838-43840,43857,43860,43905,43907,43969,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44772,45124,45126-45127,46394 +/branches/ros-amd64-bringup/reactos/dll/directx/dsound_new/dsound.spec:34741,34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36380,36397,36502-36503,36505,36898,36936,36949,36951,36958,36961,36964,36969,36972,36992,38092,38100,38149-38150,38264,38355,39335,39639,40122-40123,40125,40155,40247,40324,40753,40927,40986-40987,40989,40993,40995-40996,41001,41029,41044-41045,41047-41049,41070,41098,41101,41449,41479,41484-41485,41500,41502,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43836,43838-43840,43857,43860,43905,43907,43969,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44772,45124,45126-45127,46394,46524,46526,46589 Propchange: trunk/reactos/dll/directx/dsound_new/dsound_convert.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Mar 30 13:09:21 2010 @@ -1,3 +1,3 @@ /branches/header-work/dll/directx/dsound_new/dsound_convert.c:45691-46463 /branches/ros-amd64-bringup/reactos/dll/directx/dsound/dsound_convert.c:34711-34712,34743,34780-34782,34812,34839,34842,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35683,35739,35746,35762,35771,35777,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36172,36360,36388-36389,36445,36502-36503,36505,36570,36614,36899,36930,36936,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148-38151,38264-38265,38268,38355,39151,39333,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41082-41086,41097-41098,41101,41449,41479,41484-41485,41499,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 -/branches/ros-amd64-bringup/reactos/dll/directx/dsound_new/dsound_convert.c:34741,34870,36969,40927,41070,41500,44339,44501,44503-44504,44506,44511-44512,44521,44523-44526,45124,45126-45127,46394 +/branches/ros-amd64-bringup/reactos/dll/directx/dsound_new/dsound_convert.c:34741,34870,36969,40927,41070,41500,44339,44467-44468,44470-44471,44501,44503-44504,44506,44511-44512,44521,44523-44526,45124,45126-45127,46394,46524,46526,46589 Propchange: trunk/reactos/dll/directx/dsound_new/regsvr.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Mar 30 13:09:21 2010 @@ -1,3 +1,3 @@ /branches/header-work/dll/directx/dsound_new/regsvr.c:45691-46463 /branches/ros-amd64-bringup/reactos/dll/directx/dsound/regsvr.c:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41030,41050,41052,41082-41086,41499,41549,43080,43426,43454,43677,43682 -/branches/ros-amd64-bringup/reactos/dll/directx/dsound_new/regsvr.c:34741,34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36380,36397,36502-36503,36505,36898,36936,36949,36951,36958,36961,36964,36969,36972,36992,38092,38100,38149-38150,38264,38355,39335,39639,40122-40123,40125,40155,40247,40324,40753,40927,40986-40987,40989,40993,40995-40996,41001,41029,41044-41045,41047-41049,41070,41098,41101,41449,41479,41484-41485,41500,41502,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43836,43838-43840,43857,43860,43905,43907,43969,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44772,45124,45126-45127,46394 +/branches/ros-amd64-bringup/reactos/dll/directx/dsound_new/regsvr.c:34741,34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36380,36397,36502-36503,36505,36898,36936,36949,36951,36958,36961,36964,36969,36972,36992,38092,38100,38149-38150,38264,38355,39335,39639,40122-40123,40125,40155,40247,40324,40753,40927,40986-40987,40989,40993,40995-40996,41001,41029,41044-41045,41047-41049,41070,41098,41101,41449,41479,41484-41485,41500,41502,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43836,43838-43840,43857,43860,43905,43907,43969,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44772,45124,45126-45127,46394,46524,46526,46589 Propchange: trunk/reactos/dll/shellext/devcpux/devcpux.spec ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Mar 30 13:09:21 2010 @@ -1,2 +1,2 @@ /branches/header-work/dll/shellext/devcpux/devcpux.spec:45691-46463 -/branches/ros-amd64-bringup/reactos/dll/shellext/devcpux/devcpux.spec:34741,34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36380,36397,36445,36502-36503,36505,36898-36899,36936,36949,36951,36958,36961,36964,36969,36972,36992,38092,38100,38149-38150,38264,38268,38355,39333,39335,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40927-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41029,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479,41484-41485,41500,41502,41531,41536,41540,41546-41547,41549,43080,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44772,45124,45126-45127,46394 +/branches/ros-amd64-bringup/reactos/dll/shellext/devcpux/devcpux.spec:34741,34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36380,36397,36445,36502-36503,36505,36898-36899,36936,36949,36951,36958,36961,36964,36969,36972,36992,38092,38100,38149-38150,38264,38268,38355,39333,39335,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40927-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41029,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479,41484-41485,41500,41502,41531,41536,41540,41546-41547,41549,43080,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44772,45124,45126-45127,46394,46524,46526,46589 Propchange: trunk/reactos/dll/shellext/slayer/slayer.spec ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Mar 30 13:09:21 2010 @@ -1,2 +1,2 @@ /branches/header-work/dll/shellext/slayer/slayer.spec:45691-46463 -/branches/ros-amd64-bringup/reactos/dll/shellext/slayer/slayer.spec:34741,34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36380,36397,36445,36502-36503,36505,36898-36899,36936,36949,36951,36958,36961,36964,36969,36972,36992,38092,38100,38149-38150,38264,38268,38355,39333,39335,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40927-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41029,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479,41484-41485,41500,41502,41531,41536,41540,41546-41547,41549,43080,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44772,45124,45126-45127,46394 +/branches/ros-amd64-bringup/reactos/dll/shellext/slayer/slayer.spec:34741,34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36380,36397,36445,36502-36503,36505,36898-36899,36936,36949,36951,36958,36961,36964,36969,36972,36992,38092,38100,38149-38150,38264,38268,38355,39333,39335,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40927-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41029,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479,41484-41485,41500,41502,41531,41536,41540,41546-41547,41549,43080,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44772,45124,45126-45127,46394,46524,46526,46589 Propchange: trunk/reactos/include/ndk/amd64/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Mar 30 13:09:21 2010 @@ -1,2 +1,2 @@ /branches/header-work/include/ndk/amd64:45691-46463 -/branches/ros-amd64-bringup/reactos/include/ndk/amd64:34741,34780-34782,34803,34864,34870,34874,34877,34908-34909,34925,34965,34967,34970,35323-35324,35347-35348,35361,35436,35509,35588,35655,35683,35739,35762,35777,35781,35805,35823,35827,35952,35966,36011-36012,36172,36360,36380,36397,36445,36502-36503,36505,36898-36899,36936,36949,36951,36958,36961,36964,36969,36972,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37990,38013-38014,38092,38100,38149-38150,38264,38355,39335,39338,39347,39639,40088,40122-40123,40125,40128,40155,40247,40324,40753,40927-40928,40986-40987,40989,40993,40995-40996,41001,41029-41030,41044-41045,41047-41049,41070-41071,41097-41098,41101,41449,41479,41484-41485,41500,41502,41531,41536,41540,41546-41547,43426,43447,43454,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43777,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44178,44205,44218,44238,44294,44338-44339,44389,44391,44426,44460,44491,44499-44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44623,44631,44772,45124,45126-45127,46394 +/branches/ros-amd64-bringup/reactos/include/ndk/amd64:34741,34780-34782,34803,34864,34870,34874,34877,34908-34909,34925,34965,34967,34970,35323-35324,35347-35348,35361,35436,35509,35588,35655,35683,35739,35762,35777,35781,35805,35823,35827,35952,35966,36011-36012,36172,36360,36380,36397,36445,36502-36503,36505,36898-36899,36936,36949,36951,36958,36961,36964,36969,36972,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37990,38013-38014,38092,38100,38149-38150,38264,38355,39335,39338,39347,39639,40088,40122-40123,40125,40128,40155,40247,40324,40753,40927-40928,40986-40987,40989,40993,40995-40996,41001,41029-41030,41044-41045,41047-41049,41070-41071,41097-41098,41101,41449,41479,41484-41485,41500,41502,41531,41536,41540,41546-41547,43426,43447,43454,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43777,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44178,44205,44218,44238,44294,44338-44339,44389,44391,44426,44460,44467-44468,44470-44471,44491,44499-44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44623,44631,44772,45124,45126-45127,46394,46524,46526,46589 Propchange: trunk/reactos/include/ndk/amd64/asmmacro.S ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Mar 30 13:09:21 2010 @@ -1,2 +1,2 @@ /branches/header-work/include/ndk/amd64/asmmacro.S:45691-46463 -/branches/ros-amd64-bringup/reactos/include/ndk/amd64/asmmacro.S:34741,34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36380,36397,36445,36502-36503,36505,36898-36899,36936,36949,36951,36958,36961,36964,36969,36972,36992,37475,37536,37820-37821,37868-37869,37990,38013-38014,38092,38100,38149-38150,38264,38355,39335,39338,39347,39639,40088,40122-40123,40125,40128,40155,40247,40324,40753,40927-40928,40986-40987,40989,40993,40995-40996,41001,41029-41030,41044-41045,41047-41049,41070-41071,41097-41098,41101,41449,41479,41484-41485,41500,41502,41531,41536,41540,41546-41547,43426,43447,43454,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43777,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44178,44205,44218,44238,44294,44338-44339,44389,44391,44426,44460,44491,44499-44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44623,44631,44772,45124,45126-45127,46394 +/branches/ros-amd64-bringup/reactos/include/ndk/amd64/asmmacro.S:34741,34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36380,36397,36445,36502-36503,36505,36898-36899,36936,36949,36951,36958,36961,36964,36969,36972,36992,37475,37536,37820-37821,37868-37869,37990,38013-38014,38092,38100,38149-38150,38264,38355,39335,39338,39347,39639,40088,40122-40123,40125,40128,40155,40247,40324,40753,40927-40928,40986-40987,40989,40993,40995-40996,41001,41029-41030,41044-41045,41047-41049,41070-41071,41097-41098,41101,41449,41479,41484-41485,41500,41502,41531,41536,41540,41546-41547,43426,43447,43454,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43777,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44178,44205,44218,44238,44294,44338-44339,44389,44391,44426,44460,44467-44468,44470-44471,44491,44499-44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44623,44631,44772,45124,45126-45127,46394,46524,46526,46589 Modified: trunk/reactos/lib/3rdparty/mingw/mingw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/mingw.r… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/mingw.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/mingw.rbuild [iso-8859-1] Tue Mar 30 13:09:21 2010 @@ -3,8 +3,12 @@ <group> <module name="mingw_common" type="staticlibrary" isstartuplib="true" crt="dll"> <define name="_CRTBLD" /> + +  + <define name="_M_CEE_PURE" /> + <include base="ReactOS">include/reactos/mingw-w64</include> - <library>kernel32</library> + <library>kernel32</library> <file>_newmode.c</file> <file>atonexit.c</file> <file>charmax.c</file> @@ -50,4 +54,8 @@ <file>crtdll.c</file> <file>dllargv.c</file> </module> +<module name="oldnames" type="staticlibrary"> + <define name="_CRTBLD" /> + <importlibrary definition="moldname-msvcrt.def" dllname="msvcrt.dll" /> +</module> </group> Modified: trunk/reactos/lib/3rdparty/mingw/moldname-msvcrt.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/moldnam… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/moldname-msvcrt.def [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/moldname-msvcrt.def [iso-8859-1] Tue Mar 30 13:09:21 2010 @@ -1,118 +1,121 @@ +LIBRARY msvcrt.dll + EXPORTS -access -chdir -chmod -chsize -close -creat -cwait -daylight DATA -dup -dup2 -ecvt -eof -execl -execle -execlp -execlpe -execv -execve -execvp -execvpe -fcvt -fdopen -fgetchar -fgetwchar -filelength -fileno -; fpreset -fputchar -fputwchar -;fstat -ftime -gcvt -getch -getche -getcwd -getpid -getw -heapwalk -isatty -itoa -kbhit -lfind -lsearch -lseek -ltoa -memccpy -memicmp -mkdir -mktemp -open -pclose -popen -putch -putenv -putw -read -rmdir -rmtmp -searchenv -setmode -sopen -spawnl -spawnle -spawnlp -spawnlpe -spawnv -spawnve -spawnvp -spawnvpe -;stat -strcmpi -strdup -stricmp -stricoll -strlwr -strnicmp -strnset -strrev -strset -strupr -swab -tell -tempnam -timezone DATA -tzname DATA -tzset -umask -ungetch -unlink -utime -wcsdup -wcsicmp -wcsicoll -wcslwr -wcsnicmp -wcsnset -wcsrev -wcsset -wcsupr -wpopen -write +access==_access +chdir==_chdir +chmod==_chmod +chsize==_chsize +close==_close +creat==_creat +cwait==_cwait +daylight==_daylight +dup==_dup +dup2==_dup2 +ecvt==_ecvt +eof==_eof +execl==_execl +execle==_execle +execlp==_execlp +execlpe==_execlpe +execv==_execv +execve==_execve +execvp==_execvp +execvpe==_execvpe +fcvt==_fcvt +fdopen==_fdopen +fgetchar==_fgetchar +fgetwchar==_fgetwchar +filelength==_filelength +fileno==_fileno +fpreset==_fpreset +fputchar==_fputchar +fputwchar==_fputwchar +fstat==_fstat +ftime==_ftime +gcvt==_gcvt +getch==_getch +getche==_getche +getcwd==_getcwd +getpid==_getpid +getw==_getw +heapwalk==_heapwalk +isatty==_isatty +itoa==_itoa +kbhit==_kbhit +lfind==_lfind +lsearch==_lsearch +lseek==_lseek +ltoa==_ltoa +memccpy==_memccpy +memicmp==_memicmp +mkdir==_mkdir +mktemp==_mktemp +open==_open +pclose==_pclose +popen==_popen +putch==_putch +putenv==_putenv +putw==_putw +read==_read +rmdir==_rmdir +rmtmp==_rmtmp +searchenv==_searchenv +setmode==_setmode +snprintf=_snprintf +sopen==_sopen +spawnl==_spawnl +spawnle==_spawnle +spawnlp==_spawnlp +spawnlpe==_spawnlpe +spawnv==_spawnv +spawnve==_spawnve +spawnvp==_spawnvp +spawnvpe==_spawnvpe +stat==_stat +strcmpi==_strcmpi +strdup==_strdup +stricmp==_stricmp +stricoll==_stricoll +strlwr==_strlwr +strnicmp==_strnicmp +strnset==_strnset +strrev==_strrev +strset==_strset +strupr==_strupr +swab==_swab +tell==_tell +tempnam==_tempnam +timezone==_timezone +tzname==_tzname +tzset==_tzset +umask==_umask +ungetch==_ungetch +unlink==_unlink +utime==_utime +wcsdup==_wcsdup +wcsicmp==_wcsicmp +wcsicoll==_wcsicoll +wcslwr==_wcslwr +wcsnicmp==_wcsnicmp +wcsnset==_wcsnset +wcsrev==_wcsrev +wcsset==_wcsset +wcsupr==_wcsupr +wpopen==_wpopen +write==_write ; non-ANSI functions declared in math.h -j0 -j1 -jn -y0 -y1 -yn -chgsign -;scalb -finite -fpclass +j0==_j0 +j1==_j1 +jn==_jn +y0==_y0 +y1==_y1 +yn==_yn +chgsign==_chgsign +scalb==_scalb +finite==_finite +fpclass==_fpclass ; C99 functions -cabs -hypot -logb -nextafter +cabs==_cabs +hypot==_hypot +logb==_logb +nextafter==_nextafter Propchange: trunk/reactos/lib/sdk/crt/time/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Mar 30 13:09:21 2010 @@ -1,4 +1,4 @@ /branches/header-work/lib/sdk/crt/time:45691-46463 -/branches/ros-amd64-bringup/reactos/lib/sdk/crt/time:34741,34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36380,36397,36445,36502-36503,36505,36898-36899,36936,36949,36951,36958,36961,36964,36969,36972,36992,38092,38100,38149-38150,38264,38268,38355,39335,39639,40122-40123,40125,40128,40155,40247,40324,40753,40927-40928,40986-40987,40989,40993,40995-40996,41001,41028-41029,41044-41045,41047-41049,41070,41097-41098,41101,41449,41479,41484-41485,41500,41502,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44772,45124,45126-45127,46394 +/branches/ros-amd64-bringup/reactos/lib/sdk/crt/time:34741,34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36380,36397,36445,36502-36503,36505,36898-36899,36936,36949,36951,36958,36961,36964,36969,36972,36992,38092,38100,38149-38150,38264,38268,38355,39335,39639,40122-40123,40125,40128,40155,40247,40324,40753,40927-40928,40986-40987,40989,40993,40995-40996,41001,41028-41029,41044-41045,41047-41049,41070,41097-41098,41101,41449,41479,41484-41485,41500,41502,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44772,45124,45126-45127,46394,46524,46526,46589 /branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new:42414 /trunk/reactos/lib/sdk/crt/time_new:39350-42241 Propchange: trunk/reactos/ntoskrnl/kdbg/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Mar 30 13:09:21 2010 @@ -1,2 +1,2 @@ /branches/header-work/ntoskrnl/kdbg:45691-46463 -/branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg:34711-34712,34741,34743,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,34969,34986,35323-35324,35347-35348,35361,35436,35444,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,35968,35970-35971,36011-36013,36172,36332,36360,36380,36388-36389,36397,36445,36502-36503,36505,36570,36614,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36992,37323,37433-37435,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38099-38100,38148-38151,38264-38265,38268,38355,39151,39160,39333,39335,39345,39522,39639,40122-40123,40125,40128,40155,40247,40324,40753,40927-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479,41484-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44772,45124,45126-45127,46394 +/branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg:34711-34712,34741,34743,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,34969,34986,35323-35324,35347-35348,35361,35436,35444,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,35968,35970-35971,36011-36013,36172,36332,36360,36380,36388-36389,36397,36445,36502-36503,36505,36570,36614,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36992,37323,37433-37435,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38099-38100,38148-38151,38264-38265,38268,38355,39151,39160,39333,39335,39345,39522,39639,40122-40123,40125,40128,40155,40247,40324,40753,40927-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479,41484-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44772,45124,45126-45127,46394,46524,46526,46589 Propchange: trunk/reactos/subsystems/win32/win32k/include/engobjects.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Mar 30 13:09:21 2010 @@ -1,2 +1,2 @@ /branches/header-work/subsystems/win32/win32k/include/engobjects.h:45691-46463 -/branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/engobjects.h:34741,34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36380,36397,36445,36502-36503,36505,36898-36899,36936,36949,36951,36958,36961,36964,36969,36972,36992,38092,38100,38149-38150,38264,38268,38355,39335,39639,40095,40122-40123,40125,40128,40155,40247,40324,40753,40927-40928,40986-40987,40989,40993,40995-40996,41001,41028-41029,41044-41045,41047-41049,41070,41097-41098,41101,41449,41479,41484-41485,41500,41502,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44772,45124,45126-45127,46394 +/branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/engobjects.h:34741,34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36380,36397,36445,36502-36503,36505,36898-36899,36936,36949,36951,36958,36961,36964,36969,36972,36992,38092,38100,38149-38150,38264,38268,38355,39335,39639,40095,40122-40123,40125,40128,40155,40247,40324,40753,40927-40928,40986-40987,40989,40993,40995-40996,41001,41028-41029,41044-41045,41047-41049,41070,41097-41098,41101,41449,41479,41484-41485,41500,41502,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44772,45124,45126-45127,46394,46524,46526,46589 Propchange: trunk/reactos/tools/rsym/rsym.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Mar 30 13:09:21 2010 @@ -1,2 +1,2 @@ /branches/header-work/tools/rsym/rsym.c:45691-46463 -/branches/ros-amd64-bringup/reactos/tools/rsym/rsym.c:34741,34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36380,36397,36445,36502-36503,36505,36898-36899,36936,36949,36951,36958,36961,36964,36969,36972,36992,37291,37302,37305,37320,37329,37462,37895,38092,38100,38129,38149-38150,38264,38268,38330-38331,38341,38355,38947,38973,39072,39114,39121,39335,39639,40122-40123,40125,40128,40155,40247,40324,40605,40753,40927-40928,40986-40987,40989,40993,40995-40996,41001,41028-41029,41044-41045,41047-41049,41070,41097-41098,41101,41449,41479,41484-41485,41500,41502,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44772,45124,45126-45127,46394 +/branches/ros-amd64-bringup/reactos/tools/rsym/rsym.c:34741,34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36380,36397,36445,36502-36503,36505,36898-36899,36936,36949,36951,36958,36961,36964,36969,36972,36992,37291,37302,37305,37320,37329,37462,37895,38092,38100,38129,38149-38150,38264,38268,38330-38331,38341,38355,38947,38973,39072,39114,39121,39335,39639,40122-40123,40125,40128,40155,40247,40324,40605,40753,40927-40928,40986-40987,40989,40993,40995-40996,41001,41028-41029,41044-41045,41047-41049,41070,41097-41098,41101,41449,41479,41484-41485,41500,41502,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44772,45124,45126-45127,46394,46524,46526,46589 Propchange: trunk/reactos/tools/rsym/rsym.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Mar 30 13:09:21 2010 @@ -1,2 +1,2 @@ /branches/header-work/tools/rsym/rsym.h:45691-46463 -/branches/ros-amd64-bringup/reactos/tools/rsym/rsym.h:34741,34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36380,36397,36445,36502-36503,36505,36898-36899,36936,36949,36951,36958,36961,36964,36969,36972,36992,37291,37302,37305,37320,37329,37462,37895,38092,38100,38129,38149-38150,38264,38268,38330-38331,38341,38355,38947,38973,39072,39114,39121,39335,39639,40122-40123,40125,40128,40155,40247,40324,40605,40753,40927-40928,40986-40987,40989,40993,40995-40996,41001,41028-41029,41044-41045,41047-41049,41070,41097-41098,41101,41449,41479,41484-41485,41500,41502,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44772,45124,45126-45127,46394 +/branches/ros-amd64-bringup/reactos/tools/rsym/rsym.h:34741,34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36380,36397,36445,36502-36503,36505,36898-36899,36936,36949,36951,36958,36961,36964,36969,36972,36992,37291,37302,37305,37320,37329,37462,37895,38092,38100,38129,38149-38150,38264,38268,38330-38331,38341,38355,38947,38973,39072,39114,39121,39335,39639,40122-40123,40125,40128,40155,40247,40324,40605,40753,40927-40928,40986-40987,40989,40993,40995-40996,41001,41028-41029,41044-41045,41047-41049,41070,41097-41098,41101,41449,41479,41484-41485,41500,41502,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44772,45124,45126-45127,46394,46524,46526,46589 Propchange: trunk/reactos/tools/rsym/rsym.mak ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Mar 30 13:09:21 2010 @@ -1,2 +1,2 @@ /branches/header-work/tools/rsym/rsym.mak:45691-46463 -/branches/ros-amd64-bringup/reactos/tools/rsym/rsym.mak:34741,34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36380,36397,36445,36502-36503,36505,36898-36899,36936,36949,36951,36958,36961,36964,36969,36972,36992,37291,37302,37305,37320,37329,37462,37895,38092,38100,38129,38149-38150,38264,38268,38330-38331,38341,38355,38947,38973,39072,39114,39121,39335,39639,40122-40123,40125,40128,40155,40247,40324,40605,40753,40927-40928,40986-40987,40989,40993,40995-40996,41001,41028-41029,41044-41045,41047-41049,41070,41097-41098,41101,41449,41479,41484-41485,41500,41502,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44772,45124,45126-45127,46394 +/branches/ros-amd64-bringup/reactos/tools/rsym/rsym.mak:34741,34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36380,36397,36445,36502-36503,36505,36898-36899,36936,36949,36951,36958,36961,36964,36969,36972,36992,37291,37302,37305,37320,37329,37462,37895,38092,38100,38129,38149-38150,38264,38268,38330-38331,38341,38355,38947,38973,39072,39114,39121,39335,39639,40122-40123,40125,40128,40155,40247,40324,40605,40753,40927-40928,40986-40987,40989,40993,40995-40996,41001,41028-41029,41044-41045,41047-41049,41070,41097-41098,41101,41449,41479,41484-41485,41500,41502,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44772,45124,45126-45127,46394,46524,46526,46589 Propchange: trunk/reactos/tools/rsym/rsym_common.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Mar 30 13:09:21 2010 @@ -1,2 +1,2 @@ /branches/header-work/tools/rsym/rsym_common.c:45691-46463 -/branches/ros-amd64-bringup/reactos/tools/rsym/rsym_common.c:34741,34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36380,36397,36445,36502-36503,36505,36898-36899,36936,36949,36951,36958,36961,36964,36969,36972,36992,37291,37302,37305,37320,37329,37462,37895,38092,38100,38129,38149-38150,38264,38268,38330-38331,38341,38355,38947,38973,39072,39114,39121,39335,39639,40122-40123,40125,40128,40155,40247,40324,40605,40753,40927-40928,40986-40987,40989,40993,40995-40996,41001,41028-41029,41044-41045,41047-41049,41070,41097-41098,41101,41449,41479,41484-41485,41500,41502,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44772,45124,45126-45127,46394 +/branches/ros-amd64-bringup/reactos/tools/rsym/rsym_common.c:34741,34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36380,36397,36445,36502-36503,36505,36898-36899,36936,36949,36951,36958,36961,36964,36969,36972,36992,37291,37302,37305,37320,37329,37462,37895,38092,38100,38129,38149-38150,38264,38268,38330-38331,38341,38355,38947,38973,39072,39114,39121,39335,39639,40122-40123,40125,40128,40155,40247,40324,40605,40753,40927-40928,40986-40987,40989,40993,40995-40996,41001,41028-41029,41044-41045,41047-41049,41070,41097-41098,41101,41449,41479,41484-41485,41500,41502,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44772,45124,45126-45127,46394,46524,46526,46589

1 0

[akhaldi] 46591: [PSDK] - Add missing ws2ipdef.h definitions. - Group related definitions.
by akhaldi＠svn.reactos.org 30 Mar '10

30 Mar '10

Author: akhaldi Date: Tue Mar 30 12:39:52 2010 New Revision: 46591 URL: http://svn.reactos.org/svn/reactos?rev=46591&view=rev Log: [PSDK] - Add missing ws2ipdef.h definitions. - Group related definitions. Modified: branches/header-work/include/psdk/mswsock.h branches/header-work/include/psdk/winsock.h branches/header-work/include/psdk/winsock2.h branches/header-work/include/psdk/ws2bth.h branches/header-work/include/psdk/ws2def.h branches/header-work/include/psdk/ws2ipdef.h Modified: branches/header-work/include/psdk/mswsock.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/mswsoc… ============================================================================== --- branches/header-work/include/psdk/mswsock.h [iso-8859-1] (original) +++ branches/header-work/include/psdk/mswsock.h [iso-8859-1] Tue Mar 30 12:39:52 2010 @@ -299,7 +299,7 @@ OUT char FAR *buf, IN int len, IN OUT int FAR *flags); -#else //(_WIN32_WINNT < 0x0600) +#else INT PASCAL FAR @@ -308,7 +308,7 @@ OUT CHAR FAR *buf, IN INT len, IN OUT INT FAR *flags); -#endif //(_WIN32_WINNT < 0x0600) +#endif /* (_WIN32_WINNT < 0x0600) */ BOOL PASCAL Modified: branches/header-work/include/psdk/winsock.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/winsoc… ============================================================================== --- branches/header-work/include/psdk/winsock.h [iso-8859-1] (original) +++ branches/header-work/include/psdk/winsock.h [iso-8859-1] Tue Mar 30 12:39:52 2010 @@ -314,38 +314,9 @@ #define INADDR_BROADCAST (u_long)0xffffffff #define INADDR_NONE 0xffffffff -struct sockaddr_in { - short sin_family; - u_short sin_port; - struct in_addr sin_addr; - char sin_zero[8]; -}; - #define WSADESCRIPTION_LEN 256 #define WSASYS_STATUS_LEN 128 -typedef struct WSAData { - WORD wVersion; - WORD wHighVersion; -#ifdef _WIN64 - unsigned short iMaxSockets; - unsigned short iMaxUdpDg; - char *lpVendorInfo; - char szDescription[WSADESCRIPTION_LEN+1]; - char szSystemStatus[WSASYS_STATUS_LEN+1]; -#else - char szDescription[WSADESCRIPTION_LEN+1]; - char szSystemStatus[WSASYS_STATUS_LEN+1]; - unsigned short iMaxSockets; - unsigned short iMaxUdpDg; - char *lpVendorInfo; -} WSADATA, FAR *LPWSADATA; - -/* - * Note that the next 5 IP defines are specific to WinSock 1.1 (wsock32.dll). - * They will cause errors or unexpected results if used with the - * (gs)etsockopts exported from the WinSock 2 lib, ws2_32.dll. Refer ws2tcpip.h. - */ #define IP_MULTICAST_IF 2 #define IP_MULTICAST_TTL 3 #define IP_MULTICAST_LOOP 4 @@ -358,11 +329,6 @@ #define IP_DEFAULT_MULTICAST_TTL 1 #define IP_DEFAULT_MULTICAST_LOOP 1 #define IP_MAX_MEMBERSHIPS 20 - -struct ip_mreq { - struct in_addr imr_multiaddr; - struct in_addr imr_interface; -}; #define INVALID_SOCKET (SOCKET)(~0) #define SOCKET_ERROR (-1) @@ -402,11 +368,6 @@ #define AF_BAN 21 #define AF_ATM 22 #define AF_INET6 23 - -struct sockproto { - u_short sp_family; - u_short sp_protocol; -}; #define PF_UNSPEC AF_UNSPEC #define PF_UNIX AF_UNIX @@ -510,365 +471,9 @@ #define WSANO_ADDRESS WSANO_DATA -SOCKET -PASCAL FAR -accept( - IN SOCKET s, - OUT struct sockaddr FAR *addr OPTIONAL, - IN OUT int FAR *addrlen OPTIONAL); - -int -PASCAL FAR -bind( - IN SOCKET s, - IN const struct sockaddr FAR *addr, - IN int namelen); - -int -PASCAL FAR -closesocket( - IN SOCKET s); - -int -PASCAL FAR -connect( - IN SOCKET s, - IN const struct sockaddr FAR *name, - IN int namelen); - -int -PASCAL FAR -ioctlsocket( - IN SOCKET s, - IN long cmd, - IN OUT u_long FAR *argp); - -int -PASCAL FAR -getpeername( - IN SOCKET s, - OUT struct sockaddr FAR *name, - IN OUT int FAR *namelen); - -int -PASCAL FAR -getsockname( - IN SOCKET s, - OUT struct sockaddr FAR *name, - IN OUT int FAR *namelen); - -int -PASCAL FAR -getsockopt( - IN SOCKET s, - IN int level, - IN int optname, - OUT char FAR *optval, - IN OUT int FAR *optlen); - -u_long -PASCAL FAR -htonl( - IN u_long hostlong); - -u_short -PASCAL FAR -htons( - IN u_short hostshort); - -unsigned long -PASCAL FAR -inet_addr( - IN const char FAR *cp); - -char FAR -*PASCAL FAR -inet_ntoa( - IN struct in_addr in); - -int -PASCAL FAR -listen( - IN SOCKET s, - IN int backlog); - -u_long -PASCAL FAR -ntohl( - IN u_long netlong); - -u_short -PASCAL FAR -ntohs( - IN u_short netshort); - -int -PASCAL FAR -recv( - IN SOCKET s, - OUT char FAR *buf, - IN int len, - IN int flags); - -int -PASCAL FAR -recvfrom( - IN SOCKET s, - OUT char FAR *buf, - IN int len, - IN int flags, - OUT struct sockaddr FAR *from OPTIONAL, - IN OUY int FAR * fromlen OPTIONAL); - -int -PASCAL FAR -select( - IN int nfds, - IN OUT fd_set FAR *readfds OPTIONAL, - IN OUT fd_set FAR *writefds OPTIONAL, - IN OUT fd_set FAR *exceptfds OPTIONAL, - IN const struct timeval FAR *timeout OPTIONAL); - -int -PASCAL FAR -send( - IN SOCKET s, - IN const char FAR *buf, - IN int len, - IN int flags); - -int -PASCAL FAR -sendto( - IN SOCKET s, - IN const char FAR *buf, - IN int len, - IN int flags, - IN const struct sockaddr FAR *to OPTIONAL, - IN int tolen); - -int -PASCAL FAR -setsockopt( - IN SOCKET s, - IN int level, - IN int optname, - IN const char FAR *optval OPTIONAL, - IN int optlen); - -int -PASCAL FAR -shutdown( - IN SOCKET s, - IN int how); - -SOCKET -PASCAL FAR -socket( - IN int af, - IN int type, - IN int protocol); - -struct hostent FAR -*PASCAL FAR -gethostbyaddr( - IN const char FAR *addr, - IN int len, - IN int type); - -struct hostent FAR -*PASCAL FAR -gethostbyname( - IN const char FAR *name); - -int -PASCAL FAR -gethostname( - OUT char FAR *name, - IN int namelen); - -struct servent FAR -*PASCAL FAR -getservbyport( - IN int port, - IN const char FAR *proto); - -struct servent FAR -*PASCAL FAR -getservbyname( - IN const char FAR *name, - IN const char FAR *proto); - -struct protoent FAR -*PASCAL FAR -getprotobynumber( - IN int number); - -struct protoent FAR -*PASCAL FAR -getprotobyname( - IN const char FAR *name); - -int -PASCAL FAR -WSAStartup( - IN WORD wVersionRequired, - OUT LPWSADATA lpWSAData); - -int -PASCAL FAR -WSACleanup(void); - -void -PASCAL FAR -WSASetLastError( - IN int iError); - -int -PASCAL FAR -WSAGetLastError(void); - -BOOL -PASCAL FAR -WSAIsBlocking(void); - -int -PASCAL FAR -WSAUnhookBlockingHook(void); - -FARPROC -PASCAL FAR -WSASetBlockingHook( - IN FARPROC lpBlockFunc); - -int -PASCAL FAR -WSACancelBlockingCall(void); - -HANDLE -PASCAL FAR -WSAAsyncGetServByName( - IN HWND hWnd, - IN u_int wMsg, - IN const char FAR *name, - IN const char FAR *proto, - OUT char FAR *buf, - IN int buflen); - -HANDLE -PASCAL FAR -WSAAsyncGetServByPort( - IN HWND hWnd, - IN u_int wMsg, - IN int port, - IN const char FAR *proto, - OUT char FAR *buf, - IN int buflen); - -HANDLE -PASCAL FAR -WSAAsyncGetProtoByName( - IN HWND hWnd, - IN u_int wMsg, - IN const char FAR *name, - OUT char FAR *buf, - IN int buflen); - -HANDLE -PASCAL FAR -WSAAsyncGetProtoByNumber( - IN HWND hWnd, - IN u_int wMsg, - IN int number, - OUT char FAR *buf, - IN int buflen); - -HANDLE -PASCAL FAR -WSAAsyncGetHostByName( - IN HWND hWnd, - IN u_int wMsg, - IN const char FAR *name, - OUT char FAR *buf, - IN int buflen); - -HANDLE -PASCAL FAR -WSAAsyncGetHostByAddr( - IN HWND hWnd, - IN u_int wMsg, - IN const char FAR *addr, - IN int len, - IN int type, - OUT char FAR *buf, - IN int buflen); - -int -PASCAL FAR -WSACancelAsyncRequest( - IN HANDLE hAsyncTaskHandle); - -int -PASCAL FAR -WSAAsyncSelect( - IN SOCKET s, - IN HWND hWnd, - IN u_int wMsg, - IN long lEvent); - -int -PASCAL FAR -WSARecvEx( - IN SOCKET s, - OUT char FAR *buf, - IN int len, - IN OUT int FAR *flags); - -typedef struct _TRANSMIT_FILE_BUFFERS { - PVOID Head; - DWORD HeadLength; - PVOID Tail; - DWORD TailLength; -} TRANSMIT_FILE_BUFFERS, *PTRANSMIT_FILE_BUFFERS, *LPTRANSMIT_FILE_BUFFERS; - #define TF_DISCONNECT 0x01 #define TF_REUSE_SOCKET 0x02 #define TF_WRITE_BEHIND 0x04 - -BOOL -PASCAL FAR -TransmitFile( - IN SOCKET hSocket, - IN HANDLE hFile, - IN DWORD nNumberOfBytesToWrite, - IN DWORD nNumberOfBytesPerSend, - IN OUT LPOVERLAPPED lpOverlapped OPTIONAL, - IN LPTRANSMIT_FILE_BUFFERS lpTransmitBuffers OPTIONAL, - IN DWORD dwReserved); - -BOOL -PASCAL FAR -AcceptEx( - IN SOCKET sListenSocket, - IN SOCKET sAcceptSocket, - OUT PVOID lpOutputBuffer, - IN DWORD dwReceiveDataLength, - IN DWORD dwLocalAddressLength, - IN DWORD dwRemoteAddressLength, - OUT LPDWORD lpdwBytesReceived, - IN OUT LPOVERLAPPED lpOverlapped); - -VOID -PASCAL FAR -GetAcceptExSockaddrs( - IN PVOID lpOutputBuffer, - IN DWORD dwReceiveDataLength, - IN DWORD dwLocalAddressLength, - IN DWORD dwRemoteAddressLength, - OUT struct sockaddr **LocalSockaddr, - OUT LPINT LocalSockaddrLength, - OUT struct sockaddr **RemoteSockaddr, - OUT LPINT RemoteSockaddrLength); #define WSAMAKEASYNCREPLY(b,e) MAKELONG(b,e) #define WSAMAKESELECTREPLY(e,error) MAKELONG(e,error) @@ -905,6 +510,396 @@ typedef struct timeval *PTIMEVAL; typedef struct timeval *LPTIMEVAL; +struct sockaddr_in { + short sin_family; + u_short sin_port; + struct in_addr sin_addr; + char sin_zero[8]; +}; + +typedef struct WSAData { + WORD wVersion; + WORD wHighVersion; +#ifdef _WIN64 + unsigned short iMaxSockets; + unsigned short iMaxUdpDg; + char *lpVendorInfo; + char szDescription[WSADESCRIPTION_LEN+1]; + char szSystemStatus[WSASYS_STATUS_LEN+1]; +#else + char szDescription[WSADESCRIPTION_LEN+1]; + char szSystemStatus[WSASYS_STATUS_LEN+1]; + unsigned short iMaxSockets; + unsigned short iMaxUdpDg; + char *lpVendorInfo; +} WSADATA, FAR *LPWSADATA; + +struct ip_mreq { + struct in_addr imr_multiaddr; + struct in_addr imr_interface; +}; + +struct sockproto { + u_short sp_family; + u_short sp_protocol; +}; + +SOCKET +PASCAL FAR +accept( + IN SOCKET s, + OUT struct sockaddr FAR *addr OPTIONAL, + IN OUT int FAR *addrlen OPTIONAL); + +int +PASCAL FAR +bind( + IN SOCKET s, + IN const struct sockaddr FAR *addr, + IN int namelen); + +int +PASCAL FAR +closesocket( + IN SOCKET s); + +int +PASCAL FAR +connect( + IN SOCKET s, + IN const struct sockaddr FAR *name, + IN int namelen); + +int +PASCAL FAR +ioctlsocket( + IN SOCKET s, + IN long cmd, + IN OUT u_long FAR *argp); + +int +PASCAL FAR +getpeername( + IN SOCKET s, + OUT struct sockaddr FAR *name, + IN OUT int FAR *namelen); + +int +PASCAL FAR +getsockname( + IN SOCKET s, + OUT struct sockaddr FAR *name, + IN OUT int FAR *namelen); + +int +PASCAL FAR +getsockopt( + IN SOCKET s, + IN int level, + IN int optname, + OUT char FAR *optval, + IN OUT int FAR *optlen); + +u_long +PASCAL FAR +htonl( + IN u_long hostlong); + +u_short +PASCAL FAR +htons( + IN u_short hostshort); + +unsigned long +PASCAL FAR +inet_addr( + IN const char FAR *cp); + +char FAR +*PASCAL FAR +inet_ntoa( + IN struct in_addr in); + +int +PASCAL FAR +listen( + IN SOCKET s, + IN int backlog); + +u_long +PASCAL FAR +ntohl( + IN u_long netlong); + +u_short +PASCAL FAR +ntohs( + IN u_short netshort); + +int +PASCAL FAR +recv( + IN SOCKET s, + OUT char FAR *buf, + IN int len, + IN int flags); + +int +PASCAL FAR +recvfrom( + IN SOCKET s, + OUT char FAR *buf, + IN int len, + IN int flags, + OUT struct sockaddr FAR *from OPTIONAL, + IN OUY int FAR * fromlen OPTIONAL); + +int +PASCAL FAR +select( + IN int nfds, + IN OUT fd_set FAR *readfds OPTIONAL, + IN OUT fd_set FAR *writefds OPTIONAL, + IN OUT fd_set FAR *exceptfds OPTIONAL, + IN const struct timeval FAR *timeout OPTIONAL); + +int +PASCAL FAR +send( + IN SOCKET s, + IN const char FAR *buf, + IN int len, + IN int flags); + +int +PASCAL FAR +sendto( + IN SOCKET s, + IN const char FAR *buf, + IN int len, + IN int flags, + IN const struct sockaddr FAR *to OPTIONAL, + IN int tolen); + +int +PASCAL FAR +setsockopt( + IN SOCKET s, + IN int level, + IN int optname, + IN const char FAR *optval OPTIONAL, + IN int optlen); + +int +PASCAL FAR +shutdown( + IN SOCKET s, + IN int how); + +SOCKET +PASCAL FAR +socket( + IN int af, + IN int type, + IN int protocol); + +struct hostent FAR +*PASCAL FAR +gethostbyaddr( + IN const char FAR *addr, + IN int len, + IN int type); + +struct hostent FAR +*PASCAL FAR +gethostbyname( + IN const char FAR *name); + +int +PASCAL FAR +gethostname( + OUT char FAR *name, + IN int namelen); + +struct servent FAR +*PASCAL FAR +getservbyport( + IN int port, + IN const char FAR *proto); + +struct servent FAR +*PASCAL FAR +getservbyname( + IN const char FAR *name, + IN const char FAR *proto); + +struct protoent FAR +*PASCAL FAR +getprotobynumber( + IN int number); + +struct protoent FAR +*PASCAL FAR +getprotobyname( + IN const char FAR *name); + +int +PASCAL FAR +WSAStartup( + IN WORD wVersionRequired, + OUT LPWSADATA lpWSAData); + +int +PASCAL FAR +WSACleanup(void); + +void +PASCAL FAR +WSASetLastError( + IN int iError); + +int +PASCAL FAR +WSAGetLastError(void); + +BOOL +PASCAL FAR +WSAIsBlocking(void); + +int +PASCAL FAR +WSAUnhookBlockingHook(void); + +FARPROC +PASCAL FAR +WSASetBlockingHook( + IN FARPROC lpBlockFunc); + +int +PASCAL FAR +WSACancelBlockingCall(void); + +HANDLE +PASCAL FAR +WSAAsyncGetServByName( + IN HWND hWnd, + IN u_int wMsg, + IN const char FAR *name, + IN const char FAR *proto, + OUT char FAR *buf, + IN int buflen); + +HANDLE +PASCAL FAR +WSAAsyncGetServByPort( + IN HWND hWnd, + IN u_int wMsg, + IN int port, + IN const char FAR *proto, + OUT char FAR *buf, + IN int buflen); + +HANDLE +PASCAL FAR +WSAAsyncGetProtoByName( + IN HWND hWnd, + IN u_int wMsg, + IN const char FAR *name, + OUT char FAR *buf, + IN int buflen); + +HANDLE +PASCAL FAR +WSAAsyncGetProtoByNumber( + IN HWND hWnd, + IN u_int wMsg, + IN int number, + OUT char FAR *buf, + IN int buflen); + +HANDLE +PASCAL FAR +WSAAsyncGetHostByName( + IN HWND hWnd, + IN u_int wMsg, + IN const char FAR *name, + OUT char FAR *buf, + IN int buflen); + +HANDLE +PASCAL FAR +WSAAsyncGetHostByAddr( + IN HWND hWnd, + IN u_int wMsg, + IN const char FAR *addr, + IN int len, + IN int type, + OUT char FAR *buf, + IN int buflen); + +int +PASCAL FAR +WSACancelAsyncRequest( + IN HANDLE hAsyncTaskHandle); + +int +PASCAL FAR +WSAAsyncSelect( + IN SOCKET s, + IN HWND hWnd, + IN u_int wMsg, + IN long lEvent); + +int +PASCAL FAR +WSARecvEx( + IN SOCKET s, + OUT char FAR *buf, + IN int len, + IN OUT int FAR *flags); + +typedef struct _TRANSMIT_FILE_BUFFERS { + PVOID Head; + DWORD HeadLength; + PVOID Tail; + DWORD TailLength; +} TRANSMIT_FILE_BUFFERS, *PTRANSMIT_FILE_BUFFERS, *LPTRANSMIT_FILE_BUFFERS; + +BOOL +PASCAL FAR +TransmitFile( + IN SOCKET hSocket, + IN HANDLE hFile, + IN DWORD nNumberOfBytesToWrite, + IN DWORD nNumberOfBytesPerSend, + IN OUT LPOVERLAPPED lpOverlapped OPTIONAL, + IN LPTRANSMIT_FILE_BUFFERS lpTransmitBuffers OPTIONAL, + IN DWORD dwReserved); + +BOOL +PASCAL FAR +AcceptEx( + IN SOCKET sListenSocket, + IN SOCKET sAcceptSocket, + OUT PVOID lpOutputBuffer, + IN DWORD dwReceiveDataLength, + IN DWORD dwLocalAddressLength, + IN DWORD dwRemoteAddressLength, + OUT LPDWORD lpdwBytesReceived, + IN OUT LPOVERLAPPED lpOverlapped); + +VOID +PASCAL FAR +GetAcceptExSockaddrs( + IN PVOID lpOutputBuffer, + IN DWORD dwReceiveDataLength, + IN DWORD dwLocalAddressLength, + IN DWORD dwRemoteAddressLength, + OUT struct sockaddr **LocalSockaddr, + OUT LPINT LocalSockaddrLength, + OUT struct sockaddr **RemoteSockaddr, + OUT LPINT RemoteSockaddrLength); + #if(_WIN32_WINNT >= 0x0501) #ifdef IPV6STRICT Modified: branches/header-work/include/psdk/winsock2.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/winsoc… ============================================================================== --- branches/header-work/include/psdk/winsock2.h [iso-8859-1] (original) +++ branches/header-work/include/psdk/winsock2.h [iso-8859-1] Tue Mar 30 12:39:52 2010 @@ -270,46 +270,10 @@ #define IMPLINK_LOWEXPER 156 #define IMPLINK_HIGHEXPER 158 -#ifndef s_addr - -#define s_addr S_un.S_addr -#define s_host S_un.S_un_b.s_b2 -#define s_net S_un.S_un_b.s_b1 -#define s_imp S_un.S_un_w.s_w2 -#define s_impno S_un.S_un_b.s_b4 -#define s_lh S_un.S_un_b.s_b3 - -typedef struct in_addr { - union { - struct { u_char s_b1,s_b2,s_b3,s_b4; } S_un_b; - struct { u_short s_w1,s_w2; } S_un_w; - u_long S_addr; - } S_un; -} IN_ADDR, *PIN_ADDR; - -#endif /* s_addr */ - #define ADDR_ANY INADDR_ANY #define WSADESCRIPTION_LEN 256 #define WSASYS_STATUS_LEN 128 - -typedef struct WSAData { - WORD wVersion; - WORD wHighVersion; -#ifdef _WIN64 - unsigned short iMaxSockets; - unsigned short iMaxUdpDg; - char *lpVendorInfo; - char szDescription[WSADESCRIPTION_LEN+1]; - char szSystemStatus[WSASYS_STATUS_LEN+1]; -#else - char szDescription[WSADESCRIPTION_LEN+1]; - char szSystemStatus[WSASYS_STATUS_LEN+1]; - unsigned short iMaxSockets; - unsigned short iMaxUdpDg; - char *lpVendorInfo; -} WSADATA, FAR *LPWSADATA; #define INVALID_SOCKET (SOCKET)(~0) @@ -355,11 +319,6 @@ #define SO_PROTOCOL_INFO SO_PROTOCOL_INFOA #endif #define PVD_CONFIG 0x3001 - -struct sockproto { - u_short sp_family; - u_short sp_protocol; -}; #define PF_UNSPEC AF_UNSPEC #define PF_UNIX AF_UNIX @@ -517,6 +476,211 @@ #endif /* !WSABASEERR */ +#define CF_ACCEPT 0x0000 +#define CF_REJECT 0x0001 +#define CF_DEFER 0x0002 +#define SD_RECEIVE 0x00 +#define SD_SEND 0x01 +#define SD_BOTH 0x02 + +#define SG_UNCONSTRAINED_GROUP 0x01 +#define SG_CONSTRAINED_GROUP 0x02 + +#define MAX_PROTOCOL_CHAIN 7 + +#define BASE_PROTOCOL 1 +#define LAYERED_PROTOCOL 0 + +#define WSAPROTOCOL_LEN 255 + +#define PFL_MULTIPLE_PROTO_ENTRIES 0x00000001 +#define PFL_RECOMMENDED_PROTO_ENTRY 0x00000002 +#define PFL_HIDDEN 0x00000004 +#define PFL_MATCHES_PROTOCOL_ZERO 0x00000008 +#define PFL_NETWORKDIRECT_PROVIDER 0x00000010 + +#define XP1_CONNECTIONLESS 0x00000001 +#define XP1_GUARANTEED_DELIVERY 0x00000002 +#define XP1_GUARANTEED_ORDER 0x00000004 +#define XP1_MESSAGE_ORIENTED 0x00000008 +#define XP1_PSEUDO_STREAM 0x00000010 +#define XP1_GRACEFUL_CLOSE 0x00000020 +#define XP1_EXPEDITED_DATA 0x00000040 +#define XP1_CONNECT_DATA 0x00000080 +#define XP1_DISCONNECT_DATA 0x00000100 +#define XP1_SUPPORT_BROADCAST 0x00000200 +#define XP1_SUPPORT_MULTIPOINT 0x00000400 +#define XP1_MULTIPOINT_CONTROL_PLANE 0x00000800 +#define XP1_MULTIPOINT_DATA_PLANE 0x00001000 +#define XP1_QOS_SUPPORTED 0x00002000 +#define XP1_INTERRUPT 0x00004000 +#define XP1_UNI_SEND 0x00008000 +#define XP1_UNI_RECV 0x00010000 +#define XP1_IFS_HANDLES 0x00020000 +#define XP1_PARTIAL_MESSAGE 0x00040000 +#define XP1_SAN_SUPPORT_SDP 0x00080000 + +#define BIGENDIAN 0x0000 +#define LITTLEENDIAN 0x0001 + +#define SECURITY_PROTOCOL_NONE 0x0000 + +#define JL_SENDER_ONLY 0x01 +#define JL_RECEIVER_ONLY 0x02 +#define JL_BOTH 0x04 + +#define WSA_FLAG_OVERLAPPED 0x01 +#define WSA_FLAG_MULTIPOINT_C_ROOT 0x02 +#define WSA_FLAG_MULTIPOINT_C_LEAF 0x04 +#define WSA_FLAG_MULTIPOINT_D_ROOT 0x08 +#define WSA_FLAG_MULTIPOINT_D_LEAF 0x10 +#define WSA_FLAG_ACCESS_SYSTEM_SECURITY 0x40 + +#define TH_NETDEV 0x00000001 +#define TH_TAPI 0x00000002 + +#define SERVICE_MULTIPLE 0x00000001 + +#define NS_ALL 0 +#define NS_SAP 1 +#define NS_NDS 2 +#define NS_PEER_BROWSE 3 +#define NS_SLP 5 +#define NS_DHCP 6 +#define NS_TCPIP_LOCAL 10 +#define NS_TCPIP_HOSTS 11 +#define NS_DNS 12 +#define NS_NETBT 13 +#define NS_WINS 14 +#if(_WIN32_WINNT >= 0x0501) +#define NS_NLA 15 +#endif +#if(_WIN32_WINNT >= 0x0600) +#define NS_BTH 16 +#endif +#define NS_NBP 20 +#define NS_MS 30 +#define NS_STDA 31 +#define NS_NTDS 32 +#if(_WIN32_WINNT >= 0x0600) +#define NS_EMAIL 37 +#define NS_PNRPNAME 38 +#define NS_PNRPCLOUD 39 +#endif +#define NS_X500 40 +#define NS_NIS 41 +#define NS_NISPLUS 42 +#define NS_WRQ 50 +#define NS_NETDES 60 + +#define RES_UNUSED_1 0x00000001 +#define RES_FLUSH_CACHE 0x00000002 +#ifndef RES_SERVICE +#define RES_SERVICE 0x00000004 +#endif + +#define SERVICE_TYPE_VALUE_IPXPORTA "IpxSocket" +#define SERVICE_TYPE_VALUE_IPXPORTW L"IpxSocket" +#define SERVICE_TYPE_VALUE_SAPIDA "SapId" +#define SERVICE_TYPE_VALUE_SAPIDW L"SapId" + +#define SERVICE_TYPE_VALUE_TCPPORTA "TcpPort" +#define SERVICE_TYPE_VALUE_TCPPORTW L"TcpPort" + +#define SERVICE_TYPE_VALUE_UDPPORTA "UdpPort" +#define SERVICE_TYPE_VALUE_UDPPORTW L"UdpPort" + +#define SERVICE_TYPE_VALUE_OBJECTIDA "ObjectId" +#define SERVICE_TYPE_VALUE_OBJECTIDW L"ObjectId" + +#ifdef UNICODE +#define SERVICE_TYPE_VALUE_SAPID SERVICE_TYPE_VALUE_SAPIDW +#define SERVICE_TYPE_VALUE_TCPPORT SERVICE_TYPE_VALUE_TCPPORTW +#define SERVICE_TYPE_VALUE_UDPPORT SERVICE_TYPE_VALUE_UDPPORTW +#define SERVICE_TYPE_VALUE_OBJECTID SERVICE_TYPE_VALUE_OBJECTIDW +#else +#define SERVICE_TYPE_VALUE_SAPID SERVICE_TYPE_VALUE_SAPIDA +#define SERVICE_TYPE_VALUE_TCPPORT SERVICE_TYPE_VALUE_TCPPORTA +#define SERVICE_TYPE_VALUE_UDPPORT SERVICE_TYPE_VALUE_UDPPORTA +#define SERVICE_TYPE_VALUE_OBJECTID SERVICE_TYPE_VALUE_OBJECTIDA +#endif + +#define LUP_DEEP 0x0001 +#define LUP_CONTAINERS 0x0002 +#define LUP_NOCONTAINERS 0x0004 +#define LUP_NEAREST 0x0008 +#define LUP_RETURN_NAME 0x0010 +#define LUP_RETURN_TYPE 0x0020 +#define LUP_RETURN_VERSION 0x0040 +#define LUP_RETURN_COMMENT 0x0080 +#define LUP_RETURN_ADDR 0x0100 +#define LUP_RETURN_BLOB 0x0200 +#define LUP_RETURN_ALIASES 0x0400 +#define LUP_RETURN_QUERY_STRING 0x0800 +#define LUP_RETURN_ALL 0x0FF0 +#define LUP_RES_SERVICE 0x8000 +#define LUP_FLUSHCACHE 0x1000 +#define LUP_FLUSHPREVIOUS 0x2000 +#define LUP_NON_AUTHORITATIVE 0x4000 +#define LUP_SECURE 0x8000 +#define LUP_RETURN_PREFERRED_NAMES 0x10000 +#define LUP_ADDRCONFIG 0x00100000 +#define LUP_DUAL_ADDR 0x00200000 +#define LUP_FILESERVER 0x00400000 + +#define RESULT_IS_ALIAS 0x0001 +#if(_WIN32_WINNT >= 0x0501) +#define RESULT_IS_ADDED 0x0010 +#define RESULT_IS_CHANGED 0x0020 +#define RESULT_IS_DELETED 0x0040 +#endif + + + + + + +#ifndef s_addr + +#define s_addr S_un.S_addr +#define s_host S_un.S_un_b.s_b2 +#define s_net S_un.S_un_b.s_b1 +#define s_imp S_un.S_un_w.s_w2 +#define s_impno S_un.S_un_b.s_b4 +#define s_lh S_un.S_un_b.s_b3 + +typedef struct in_addr { + union { + struct { u_char s_b1,s_b2,s_b3,s_b4; } S_un_b; + struct { u_short s_w1,s_w2; } S_un_w; + u_long S_addr; + } S_un; +} IN_ADDR, *PIN_ADDR; + +#endif /* s_addr */ + +typedef struct WSAData { + WORD wVersion; + WORD wHighVersion; +#ifdef _WIN64 + unsigned short iMaxSockets; + unsigned short iMaxUdpDg; + char *lpVendorInfo; + char szDescription[WSADESCRIPTION_LEN+1]; + char szSystemStatus[WSASYS_STATUS_LEN+1]; +#else + char szDescription[WSADESCRIPTION_LEN+1]; + char szSystemStatus[WSASYS_STATUS_LEN+1]; + unsigned short iMaxSockets; + unsigned short iMaxUdpDg; + char *lpVendorInfo; +} WSADATA, FAR *LPWSADATA; + +struct sockproto { + u_short sp_family; + u_short sp_protocol; +}; + #ifdef WIN32 #define WSAAPI FAR PASCAL @@ -575,17 +739,7 @@ WSABUF ProviderSpecific; } QOS, *LPQOS; -#define CF_ACCEPT 0x0000 -#define CF_REJECT 0x0001 -#define CF_DEFER 0x0002 -#define SD_RECEIVE 0x00 -#define SD_SEND 0x01 -#define SD_BOTH 0x02 - typedef unsigned int GROUP; - -#define SG_UNCONSTRAINED_GROUP 0x01 -#define SG_CONSTRAINED_GROUP 0x02 typedef struct _WSANETWORKEVENTS { LONG lNetworkEvents; @@ -596,17 +750,10 @@ #include <guiddef.h> #endif -#define MAX_PROTOCOL_CHAIN 7 - -#define BASE_PROTOCOL 1 -#define LAYERED_PROTOCOL 0 - typedef struct _WSAPROTOCOLCHAIN { int ChainLen; DWORD ChainEntries[MAX_PROTOCOL_CHAIN]; } WSAPROTOCOLCHAIN, *LPWSAPROTOCOLCHAIN; - -#define WSAPROTOCOL_LEN 255 typedef struct _WSAPROTOCOL_INFOA { DWORD dwServiceFlags1; @@ -662,49 +809,6 @@ typedef LPWSAPROTOCOL_INFOA LPWSAPROTOCOL_INFO; #endif -#define PFL_MULTIPLE_PROTO_ENTRIES 0x00000001 -#define PFL_RECOMMENDED_PROTO_ENTRY 0x00000002 -#define PFL_HIDDEN 0x00000004 -#define PFL_MATCHES_PROTOCOL_ZERO 0x00000008 -#define PFL_NETWORKDIRECT_PROVIDER 0x00000010 - -#define XP1_CONNECTIONLESS 0x00000001 -#define XP1_GUARANTEED_DELIVERY 0x00000002 -#define XP1_GUARANTEED_ORDER 0x00000004 -#define XP1_MESSAGE_ORIENTED 0x00000008 -#define XP1_PSEUDO_STREAM 0x00000010 -#define XP1_GRACEFUL_CLOSE 0x00000020 -#define XP1_EXPEDITED_DATA 0x00000040 -#define XP1_CONNECT_DATA 0x00000080 -#define XP1_DISCONNECT_DATA 0x00000100 -#define XP1_SUPPORT_BROADCAST 0x00000200 -#define XP1_SUPPORT_MULTIPOINT 0x00000400 -#define XP1_MULTIPOINT_CONTROL_PLANE 0x00000800 -#define XP1_MULTIPOINT_DATA_PLANE 0x00001000 -#define XP1_QOS_SUPPORTED 0x00002000 -#define XP1_INTERRUPT 0x00004000 -#define XP1_UNI_SEND 0x00008000 -#define XP1_UNI_RECV 0x00010000 -#define XP1_IFS_HANDLES 0x00020000 -#define XP1_PARTIAL_MESSAGE 0x00040000 -#define XP1_SAN_SUPPORT_SDP 0x00080000 - -#define BIGENDIAN 0x0000 -#define LITTLEENDIAN 0x0001 - -#define SECURITY_PROTOCOL_NONE 0x0000 - -#define JL_SENDER_ONLY 0x01 -#define JL_RECEIVER_ONLY 0x02 -#define JL_BOTH 0x04 - -#define WSA_FLAG_OVERLAPPED 0x01 -#define WSA_FLAG_MULTIPOINT_C_ROOT 0x02 -#define WSA_FLAG_MULTIPOINT_C_LEAF 0x04 -#define WSA_FLAG_MULTIPOINT_D_ROOT 0x08 -#define WSA_FLAG_MULTIPOINT_D_LEAF 0x10 -#define WSA_FLAG_ACCESS_SYSTEM_SECURITY 0x40 - typedef int (CALLBACK *LPCONDITIONPROC)( IN LPWSABUF lpCallerId, @@ -760,9 +864,6 @@ #endif /* (_WIN32_WINNT >= 0x0501) */ -#define TH_NETDEV 0x00000001 -#define TH_TAPI 0x00000002 - #ifndef __BLOB_T_DEFINED /* also in wtypes.h and nspapi.h */ #define __BLOB_T_DEFINED /* wine is using a diff define */ @@ -779,72 +880,6 @@ #endif /* _tagBLOB_DEFINED */ #endif /* __BLOB_T_DEFINED */ - -#define SERVICE_MULTIPLE 0x00000001 - -#define NS_ALL 0 -#define NS_SAP 1 -#define NS_NDS 2 -#define NS_PEER_BROWSE 3 -#define NS_SLP 5 -#define NS_DHCP 6 -#define NS_TCPIP_LOCAL 10 -#define NS_TCPIP_HOSTS 11 -#define NS_DNS 12 -#define NS_NETBT 13 -#define NS_WINS 14 -#if(_WIN32_WINNT >= 0x0501) -#define NS_NLA 15 -#endif -#if(_WIN32_WINNT >= 0x0600) -#define NS_BTH 16 -#endif -#define NS_NBP 20 -#define NS_MS 30 -#define NS_STDA 31 -#define NS_NTDS 32 -#if(_WIN32_WINNT >= 0x0600) -#define NS_EMAIL 37 -#define NS_PNRPNAME 38 -#define NS_PNRPCLOUD 39 -#endif -#define NS_X500 40 -#define NS_NIS 41 -#define NS_NISPLUS 42 -#define NS_WRQ 50 -#define NS_NETDES 60 - -#define RES_UNUSED_1 0x00000001 -#define RES_FLUSH_CACHE 0x00000002 -#ifndef RES_SERVICE -#define RES_SERVICE 0x00000004 -#endif - -#define SERVICE_TYPE_VALUE_IPXPORTA "IpxSocket" -#define SERVICE_TYPE_VALUE_IPXPORTW L"IpxSocket" -#define SERVICE_TYPE_VALUE_SAPIDA "SapId" -#define SERVICE_TYPE_VALUE_SAPIDW L"SapId" - -#define SERVICE_TYPE_VALUE_TCPPORTA "TcpPort" -#define SERVICE_TYPE_VALUE_TCPPORTW L"TcpPort" - -#define SERVICE_TYPE_VALUE_UDPPORTA "UdpPort" -#define SERVICE_TYPE_VALUE_UDPPORTW L"UdpPort" - -#define SERVICE_TYPE_VALUE_OBJECTIDA "ObjectId" -#define SERVICE_TYPE_VALUE_OBJECTIDW L"ObjectId" - -#ifdef UNICODE -#define SERVICE_TYPE_VALUE_SAPID SERVICE_TYPE_VALUE_SAPIDW -#define SERVICE_TYPE_VALUE_TCPPORT SERVICE_TYPE_VALUE_TCPPORTW -#define SERVICE_TYPE_VALUE_UDPPORT SERVICE_TYPE_VALUE_UDPPORTW -#define SERVICE_TYPE_VALUE_OBJECTID SERVICE_TYPE_VALUE_OBJECTIDW -#else -#define SERVICE_TYPE_VALUE_SAPID SERVICE_TYPE_VALUE_SAPIDA -#define SERVICE_TYPE_VALUE_TCPPORT SERVICE_TYPE_VALUE_TCPPORTA -#define SERVICE_TYPE_VALUE_UDPPORT SERVICE_TYPE_VALUE_UDPPORTA -#define SERVICE_TYPE_VALUE_OBJECTID SERVICE_TYPE_VALUE_OBJECTIDA -#endif typedef struct _AFPROTOCOLS { INT iAddressFamily; @@ -946,36 +981,6 @@ typedef PWSAQUERYSET2A PWSAQUERYSET2; typedef LPWSAQUERYSET2A LPWSAQUERYSET2; #endif /* UNICODE */ - -#define LUP_DEEP 0x0001 -#define LUP_CONTAINERS 0x0002 -#define LUP_NOCONTAINERS 0x0004 -#define LUP_NEAREST 0x0008 -#define LUP_RETURN_NAME 0x0010 -#define LUP_RETURN_TYPE 0x0020 -#define LUP_RETURN_VERSION 0x0040 -#define LUP_RETURN_COMMENT 0x0080 -#define LUP_RETURN_ADDR 0x0100 -#define LUP_RETURN_BLOB 0x0200 -#define LUP_RETURN_ALIASES 0x0400 -#define LUP_RETURN_QUERY_STRING 0x0800 -#define LUP_RETURN_ALL 0x0FF0 -#define LUP_RES_SERVICE 0x8000 -#define LUP_FLUSHCACHE 0x1000 -#define LUP_FLUSHPREVIOUS 0x2000 -#define LUP_NON_AUTHORITATIVE 0x4000 -#define LUP_SECURE 0x8000 -#define LUP_RETURN_PREFERRED_NAMES 0x10000 -#define LUP_ADDRCONFIG 0x00100000 -#define LUP_DUAL_ADDR 0x00200000 -#define LUP_FILESERVER 0x00400000 - -#define RESULT_IS_ALIAS 0x0001 -#if(_WIN32_WINNT >= 0x0501) -#define RESULT_IS_ADDED 0x0010 -#define RESULT_IS_CHANGED 0x0020 -#define RESULT_IS_DELETED 0x0040 -#endif typedef enum _WSAESETSERVICEOP { RNRSERVICE_REGISTER=0, Modified: branches/header-work/include/psdk/ws2bth.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/ws2bth… ============================================================================== --- branches/header-work/include/psdk/ws2bth.h [iso-8859-1] (original) +++ branches/header-work/include/psdk/ws2bth.h [iso-8859-1] Tue Mar 30 12:39:52 2010 @@ -20,13 +20,6 @@ #ifndef NS_BTH #define NS_BTH 16 #endif - -typedef struct _SOCKADDR_BTH { - USHORT addressFamily; - BTH_ADDR btAddr; - GUID serviceClassId; - ULONG port; -} SOCKADDR_BTH, *PSOCKADDR_BTH; DEFINE_GUID(SVCID_BTH_PROVIDER, 0x6aa63e0, 0x7d60, 0x41ff, 0xaf, 0xb2, 0x3e, 0xe6, 0xd2, 0xd9, 0x39, 0x2d); @@ -50,15 +43,6 @@ #define BTH_SDP_VERSION 1 -typedef struct _BTH_SET_SERVICE { - PULONG pSdpVersion; - HANDLE *pRecordHandle; - ULONG fCodService; - ULONG Reserved[5]; - ULONG ulRecordLength; - UCHAR pRecord[1]; -} BTH_SET_SERVICE, *PBTH_SET_SERVICE; - #define SDP_DEFAULT_INQUIRY_SECONDS 6 #define SDP_MAX_INQUIRY_SECONDS 60 @@ -67,19 +51,6 @@ #define SDP_SERVICE_SEARCH_REQUEST 1 #define SDP_SERVICE_ATTRIBUTE_REQUEST 2 #define SDP_SERVICE_SEARCH_ATTRIBUTE_REQUEST 3 - -typedef struct _BTH_QUERY_DEVICE { - ULONG LAP; - UCHAR length; -} BTH_QUERY_DEVICE, *PBTH_QUERY_DEVICE; - -typedef struct _BTH_QUERY_SERVICE { - ULONG type; - ULONG serviceHandle; - SdpQueryUuid uuids[MAX_UUIDS_IN_QUERY]; - ULONG numRange; - SdpAttributeRange pRange[1]; -} BTH_QUERY_SERVICE, *PBTH_QUERY_SERVICE; #define BTHNS_RESULT_DEVICE_CONNECTED 0x00010000 #define BTHNS_RESULT_DEVICE_REMEMBERED 0x00020000 @@ -108,19 +79,10 @@ #define MSC_BREAK_BIT BIT(1) #define MSC_SET_BREAK_LENGTH(b, l) ((b) = ((b)&0x3) | (((l)&0xf) << 4)) -typedef struct _RFCOMM_MSC_DATA { - UCHAR Signals; - UCHAR Break; -} RFCOMM_MSC_DATA, *PRFCOMM_MSC_DATA; - #define RLS_ERROR 0x01 #define RLS_OVERRUN 0x02 #define RLS_PARITY 0x04 #define RLS_FRAMING 0x08 - -typedef struct _RFCOMM_RLS_DATA { - UCHAR LineStatus; -} RFCOMM_RLS_DATA, *PRFCOMM_RLS_DATA; #define RPN_BAUD_2400 0 #define RPN_BAUD_4800 1 @@ -174,6 +136,50 @@ #define RFCOMM_CMD_RPN_REQUEST 4 #define RFCOMM_CMD_RPN_RESPONSE 5 + + + + + + +typedef struct _SOCKADDR_BTH { + USHORT addressFamily; + BTH_ADDR btAddr; + GUID serviceClassId; + ULONG port; +} SOCKADDR_BTH, *PSOCKADDR_BTH; + +typedef struct _BTH_SET_SERVICE { + PULONG pSdpVersion; + HANDLE *pRecordHandle; + ULONG fCodService; + ULONG Reserved[5]; + ULONG ulRecordLength; + UCHAR pRecord[1]; +} BTH_SET_SERVICE, *PBTH_SET_SERVICE; + +typedef struct _BTH_QUERY_DEVICE { + ULONG LAP; + UCHAR length; +} BTH_QUERY_DEVICE, *PBTH_QUERY_DEVICE; + +typedef struct _BTH_QUERY_SERVICE { + ULONG type; + ULONG serviceHandle; + SdpQueryUuid uuids[MAX_UUIDS_IN_QUERY]; + ULONG numRange; + SdpAttributeRange pRange[1]; +} BTH_QUERY_SERVICE, *PBTH_QUERY_SERVICE; + +typedef struct _RFCOMM_MSC_DATA { + UCHAR Signals; + UCHAR Break; +} RFCOMM_MSC_DATA, *PRFCOMM_MSC_DATA; + +typedef struct _RFCOMM_RLS_DATA { + UCHAR LineStatus; +} RFCOMM_RLS_DATA, *PRFCOMM_RLS_DATA; + typedef struct _RFCOMM_RPN_DATA { UCHAR Baud; UCHAR Data; Modified: branches/header-work/include/psdk/ws2def.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/ws2def… ============================================================================== --- branches/header-work/include/psdk/ws2def.h [iso-8859-1] (original) +++ branches/header-work/include/psdk/ws2def.h [iso-8859-1] Tue Mar 30 12:39:52 2010 @@ -130,43 +130,6 @@ #define TCP_NODELAY 0x0001 -typedef struct sockaddr { -#if (_WIN32_WINNT < 0x0600) - u_short sa_family; -#else - ADDRESS_FAMILY sa_family; -#endif - CHAR sa_data[14]; -} SOCKADDR, *PSOCKADDR, FAR *LPSOCKADDR; - -#ifndef __CSADDR_DEFINED__ -#define __CSADDR_DEFINED__ - -typedef struct _SOCKET_ADDRESS { - LPSOCKADDR lpSockaddr; - INT iSockaddrLength; -} SOCKET_ADDRESS, *PSOCKET_ADDRESS, *LPSOCKET_ADDRESS; - -typedef struct _SOCKET_ADDRESS_LIST { - INT iAddressCount; - SOCKET_ADDRESS Address[1]; -} SOCKET_ADDRESS_LIST, *PSOCKET_ADDRESS_LIST, FAR *LPSOCKET_ADDRESS_LIST; - -#if (_WIN32_WINNT >= 0x0600) -#define SIZEOF_SOCKET_ADDRESS_LIST(AddressCount) \ - (FIELD_OFFSET(SOCKET_ADDRESS_LIST, Address) + \ - AddressCount * sizeof(SOCKET_ADDRESS)) -#endif - -typedef struct _CSADDR_INFO { - SOCKET_ADDRESS LocalAddr; - SOCKET_ADDRESS RemoteAddr; - INT iSocketType; - INT iProtocol; -} CSADDR_INFO, *PCSADDR_INFO, FAR *LPCSADDR_INFO ; - -#endif /* __CSADDR_DEFINED__ */ - #define _SS_MAXSIZE 128 #define _SS_ALIGNSIZE (sizeof(__int64)) @@ -179,32 +142,6 @@ #define _SS_PAD1SIZE (_SS_ALIGNSIZE - sizeof (short)) #define _SS_PAD2SIZE (_SS_MAXSIZE - (sizeof (short) + _SS_PAD1SIZE + _SS_ALIGNSIZE)) - -#endif /* (_WIN32_WINNT >= 0x0600) */ - -typedef struct sockaddr_storage { - ADDRESS_FAMILY ss_family; - CHAR __ss_pad1[_SS_PAD1SIZE]; - __int64 __ss_align; - CHAR __ss_pad2[_SS_PAD2SIZE]; -} SOCKADDR_STORAGE_LH, *PSOCKADDR_STORAGE_LH, FAR *LPSOCKADDR_STORAGE_LH; - -typedef struct sockaddr_storage_xp { - short ss_family; - CHAR __ss_pad1[_SS_PAD1SIZE]; - __int64 __ss_align; - CHAR __ss_pad2[_SS_PAD2SIZE]; -} SOCKADDR_STORAGE_XP, *PSOCKADDR_STORAGE_XP, FAR *LPSOCKADDR_STORAGE_XP; - -#if (_WIN32_WINNT >= 0x0600) - -typedef SOCKADDR_STORAGE_LH SOCKADDR_STORAGE; -typedef SOCKADDR_STORAGE *PSOCKADDR_STORAGE, FAR *LPSOCKADDR_STORAGE; - -#elif (_WIN32_WINNT >= 0x0501) - -typedef SOCKADDR_STORAGE_XP SOCKADDR_STORAGE; -typedef SOCKADDR_STORAGE *PSOCKADDR_STORAGE, FAR *LPSOCKADDR_STORAGE; #endif /* (_WIN32_WINNT >= 0x0600) */ @@ -252,59 +189,6 @@ #define IPPROTO_IP 0 -typedef enum { -#if (_WIN32_WINNT >= 0x0501) - IPPROTO_HOPOPTS = 0, -#endif - IPPROTO_ICMP = 1, - IPPROTO_IGMP = 2, - IPPROTO_GGP = 3, -#if (_WIN32_WINNT >= 0x0501) - IPPROTO_IPV4 = 4, -#endif -#if (_WIN32_WINNT >= 0x0600) - IPPROTO_ST = 5, -#endif - IPPROTO_TCP = 6, -#if (_WIN32_WINNT >= 0x0600) - IPPROTO_CBT = 7, - IPPROTO_EGP = 8, - IPPROTO_IGP = 9, -#endif - IPPROTO_PUP = 12, - IPPROTO_UDP = 17, - IPPROTO_IDP = 22, -#if (_WIN32_WINNT >= 0x0600) - IPPROTO_RDP = 27, -#endif -#if (_WIN32_WINNT >= 0x0501) - IPPROTO_IPV6 = 41, - IPPROTO_ROUTING = 43, - IPPROTO_FRAGMENT = 44, - IPPROTO_ESP = 50, - IPPROTO_AH = 51, - IPPROTO_ICMPV6 = 58, - IPPROTO_NONE = 59, - IPPROTO_DSTOPTS = 60, -#endif /* (_WIN32_WINNT >= 0x0501) */ - IPPROTO_ND = 77, -#if(_WIN32_WINNT >= 0x0501) - IPPROTO_ICLFXBM = 78, -#endif -#if (_WIN32_WINNT >= 0x0600) - IPPROTO_PIM = 103, - IPPROTO_PGM = 113, - IPPROTO_L2TP = 115, - IPPROTO_SCTP = 132, -#endif /* (_WIN32_WINNT >= 0x0600) */ - IPPROTO_RAW = 255, - IPPROTO_MAX = 256, - IPPROTO_RESERVED_RAW = 257, - IPPROTO_RESERVED_IPSEC = 258, - IPPROTO_RESERVED_IPSECOFFLOAD = 259, - IPPROTO_RESERVED_MAX = 260 -} IPPROTO, *PIPROTO; - #define IPPORT_TCPMUX 1 #define IPPORT_ECHO 7 #define IPPORT_DISCARD 9 @@ -389,6 +273,206 @@ #define INADDR_BROADCAST (ULONG)0xffffffff #define INADDR_NONE 0xffffffff +#define SCOPEID_UNSPECIFIED_INIT {0} + +#define IOCPARM_MASK 0x7f +#define IOC_VOID 0x20000000 +#define IOC_OUT 0x40000000 +#define IOC_IN 0x80000000 +#define IOC_INOUT (IOC_IN|IOC_OUT) + +#define _IO(x,y) (IOC_VOID|((x)<<8)|(y)) +#define _IOR(x,y,t) (IOC_OUT|(((long)sizeof(t)&IOCPARM_MASK)<<16)|((x)<<8)|(y)) +#define _IOW(x,y,t) (IOC_IN|(((long)sizeof(t)&IOCPARM_MASK)<<16)|((x)<<8)|(y)) + +#define MSG_TRUNC 0x0100 +#define MSG_CTRUNC 0x0200 +#define MSG_BCAST 0x0400 +#define MSG_MCAST 0x0800 + +#define AI_PASSIVE 0x00000001 +#define AI_CANONNAME 0x00000002 +#define AI_NUMERICHOST 0x00000004 +#define AI_NUMERICSERV 0x00000008 + +#define AI_ALL 0x00000100 +#define AI_ADDRCONFIG 0x00000400 +#define AI_V4MAPPED 0x00000800 + +#define AI_NON_AUTHORITATIVE 0x00004000 +#define AI_SECURE 0x00008000 +#define AI_RETURN_PREFERRED_NAMES 0x00010000 + +#define AI_FQDN 0x00020000 +#define AI_FILESERVER 0x00040000 + +#define NS_ALL 0 + +#define NS_SAP 1 +#define NS_NDS 2 +#define NS_PEER_BROWSE 3 +#define NS_SLP 5 +#define NS_DHCP 6 + +#define NS_TCPIP_LOCAL 10 +#define NS_TCPIP_HOSTS 11 +#define NS_DNS 12 +#define NS_NETBT 13 +#define NS_WINS 14 + +#if(_WIN32_WINNT >= 0x0501) +#define NS_NLA 15 +#endif + +#if(_WIN32_WINNT >= 0x0600) +#define NS_BTH 16 +#endif + +#define NS_NBP 20 + +#define NS_MS 30 +#define NS_STDA 31 +#define NS_NTDS 32 + +#if(_WIN32_WINNT >= 0x0600) +#define NS_EMAIL 37 +#define NS_PNRPNAME 38 +#define NS_PNRPCLOUD 39 +#endif + +#define NS_X500 40 +#define NS_NIS 41 +#define NS_NISPLUS 42 + +#define NS_WRQ 50 + +#define NS_NETDES 60 + +#define NI_NOFQDN 0x01 +#define NI_NUMERICHOST 0x02 +#define NI_NAMEREQD 0x04 +#define NI_NUMERICSERV 0x08 +#define NI_DGRAM 0x10 + +#define NI_MAXHOST 1025 +#define NI_MAXSERV 32 + +typedef struct sockaddr { +#if (_WIN32_WINNT < 0x0600) + u_short sa_family; +#else + ADDRESS_FAMILY sa_family; +#endif + CHAR sa_data[14]; +} SOCKADDR, *PSOCKADDR, FAR *LPSOCKADDR; + +#ifndef __CSADDR_DEFINED__ +#define __CSADDR_DEFINED__ + +typedef struct _SOCKET_ADDRESS { + LPSOCKADDR lpSockaddr; + INT iSockaddrLength; +} SOCKET_ADDRESS, *PSOCKET_ADDRESS, *LPSOCKET_ADDRESS; + +typedef struct _SOCKET_ADDRESS_LIST { + INT iAddressCount; + SOCKET_ADDRESS Address[1]; +} SOCKET_ADDRESS_LIST, *PSOCKET_ADDRESS_LIST, FAR *LPSOCKET_ADDRESS_LIST; + +#if (_WIN32_WINNT >= 0x0600) +#define SIZEOF_SOCKET_ADDRESS_LIST(AddressCount) \ + (FIELD_OFFSET(SOCKET_ADDRESS_LIST, Address) + \ + AddressCount * sizeof(SOCKET_ADDRESS)) +#endif + +typedef struct _CSADDR_INFO { + SOCKET_ADDRESS LocalAddr; + SOCKET_ADDRESS RemoteAddr; + INT iSocketType; + INT iProtocol; +} CSADDR_INFO, *PCSADDR_INFO, FAR *LPCSADDR_INFO ; + +#endif /* __CSADDR_DEFINED__ */ + +typedef struct sockaddr_storage { + ADDRESS_FAMILY ss_family; + CHAR __ss_pad1[_SS_PAD1SIZE]; + __int64 __ss_align; + CHAR __ss_pad2[_SS_PAD2SIZE]; +} SOCKADDR_STORAGE_LH, *PSOCKADDR_STORAGE_LH, FAR *LPSOCKADDR_STORAGE_LH; + +typedef struct sockaddr_storage_xp { + short ss_family; + CHAR __ss_pad1[_SS_PAD1SIZE]; + __int64 __ss_align; + CHAR __ss_pad2[_SS_PAD2SIZE]; +} SOCKADDR_STORAGE_XP, *PSOCKADDR_STORAGE_XP, FAR *LPSOCKADDR_STORAGE_XP; + +#if (_WIN32_WINNT >= 0x0600) + +typedef SOCKADDR_STORAGE_LH SOCKADDR_STORAGE; +typedef SOCKADDR_STORAGE *PSOCKADDR_STORAGE, FAR *LPSOCKADDR_STORAGE; + +#elif (_WIN32_WINNT >= 0x0501) + +typedef SOCKADDR_STORAGE_XP SOCKADDR_STORAGE; +typedef SOCKADDR_STORAGE *PSOCKADDR_STORAGE, FAR *LPSOCKADDR_STORAGE; + +#endif /* (_WIN32_WINNT >= 0x0600) */ + +typedef enum { +#if (_WIN32_WINNT >= 0x0501) + IPPROTO_HOPOPTS = 0, +#endif + IPPROTO_ICMP = 1, + IPPROTO_IGMP = 2, + IPPROTO_GGP = 3, +#if (_WIN32_WINNT >= 0x0501) + IPPROTO_IPV4 = 4, +#endif +#if (_WIN32_WINNT >= 0x0600) + IPPROTO_ST = 5, +#endif + IPPROTO_TCP = 6, +#if (_WIN32_WINNT >= 0x0600) + IPPROTO_CBT = 7, + IPPROTO_EGP = 8, + IPPROTO_IGP = 9, +#endif + IPPROTO_PUP = 12, + IPPROTO_UDP = 17, + IPPROTO_IDP = 22, +#if (_WIN32_WINNT >= 0x0600) + IPPROTO_RDP = 27, +#endif +#if (_WIN32_WINNT >= 0x0501) + IPPROTO_IPV6 = 41, + IPPROTO_ROUTING = 43, + IPPROTO_FRAGMENT = 44, + IPPROTO_ESP = 50, + IPPROTO_AH = 51, + IPPROTO_ICMPV6 = 58, + IPPROTO_NONE = 59, + IPPROTO_DSTOPTS = 60, +#endif /* (_WIN32_WINNT >= 0x0501) */ + IPPROTO_ND = 77, +#if(_WIN32_WINNT >= 0x0501) + IPPROTO_ICLFXBM = 78, +#endif +#if (_WIN32_WINNT >= 0x0600) + IPPROTO_PIM = 103, + IPPROTO_PGM = 113, + IPPROTO_L2TP = 115, + IPPROTO_SCTP = 132, +#endif /* (_WIN32_WINNT >= 0x0600) */ + IPPROTO_RAW = 255, + IPPROTO_MAX = 256, + IPPROTO_RESERVED_RAW = 257, + IPPROTO_RESERVED_IPSEC = 258, + IPPROTO_RESERVED_IPSECOFFLOAD = 259, + IPPROTO_RESERVED_MAX = 260 +} IPPROTO, *PIPROTO; + typedef enum { ScopeLevelInterface = 1, ScopeLevelLink = 2, @@ -410,8 +494,6 @@ }; } SCOPE_ID, *PSCOPE_ID; -#define SCOPEID_UNSPECIFIED_INIT {0} - typedef struct sockaddr_in { #if(_WIN32_WINNT < 0x0600) short sin_family; @@ -430,16 +512,6 @@ UCHAR sdl_zero[4]; } SOCKADDR_DL, *PSOCKADDR_DL; #endif - -#define IOCPARM_MASK 0x7f -#define IOC_VOID 0x20000000 -#define IOC_OUT 0x40000000 -#define IOC_IN 0x80000000 -#define IOC_INOUT (IOC_IN|IOC_OUT) - -#define _IO(x,y) (IOC_VOID|((x)<<8)|(y)) -#define _IOR(x,y,t) (IOC_OUT|(((long)sizeof(t)&IOCPARM_MASK)<<16)|((x)<<8)|(y)) -#define _IOW(x,y,t) (IOC_IN|(((long)sizeof(t)&IOCPARM_MASK)<<16)|((x)<<8)|(y)) typedef struct _WSABUF { ULONG len; @@ -587,27 +659,6 @@ #define CMSG_LEN WSA_CMSG_LEN #endif -#define MSG_TRUNC 0x0100 -#define MSG_CTRUNC 0x0200 -#define MSG_BCAST 0x0400 -#define MSG_MCAST 0x0800 - -#define AI_PASSIVE 0x00000001 -#define AI_CANONNAME 0x00000002 -#define AI_NUMERICHOST 0x00000004 -#define AI_NUMERICSERV 0x00000008 - -#define AI_ALL 0x00000100 -#define AI_ADDRCONFIG 0x00000400 -#define AI_V4MAPPED 0x00000800 - -#define AI_NON_AUTHORITATIVE 0x00004000 -#define AI_SECURE 0x00008000 -#define AI_RETURN_PREFERRED_NAMES 0x00010000 - -#define AI_FQDN 0x00020000 -#define AI_FILESERVER 0x00040000 - typedef struct addrinfo { int ai_flags; int ai_family; @@ -662,57 +713,6 @@ #endif /* (_WIN32_WINNT >= 0x0600) */ -#define NS_ALL 0 - -#define NS_SAP 1 -#define NS_NDS 2 -#define NS_PEER_BROWSE 3 -#define NS_SLP 5 -#define NS_DHCP 6 - -#define NS_TCPIP_LOCAL 10 -#define NS_TCPIP_HOSTS 11 -#define NS_DNS 12 -#define NS_NETBT 13 -#define NS_WINS 14 - -#if(_WIN32_WINNT >= 0x0501) -#define NS_NLA 15 -#endif - -#if(_WIN32_WINNT >= 0x0600) -#define NS_BTH 16 -#endif - -#define NS_NBP 20 - -#define NS_MS 30 -#define NS_STDA 31 -#define NS_NTDS 32 - -#if(_WIN32_WINNT >= 0x0600) -#define NS_EMAIL 37 -#define NS_PNRPNAME 38 -#define NS_PNRPCLOUD 39 -#endif - -#define NS_X500 40 -#define NS_NIS 41 -#define NS_NISPLUS 42 - -#define NS_WRQ 50 - -#define NS_NETDES 60 - -#define NI_NOFQDN 0x01 -#define NI_NUMERICHOST 0x02 -#define NI_NAMEREQD 0x04 -#define NI_NUMERICSERV 0x08 -#define NI_DGRAM 0x10 - -#define NI_MAXHOST 1025 -#define NI_MAXSERV 32 - #ifdef __cplusplus } #endif Modified: branches/header-work/include/psdk/ws2ipdef.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/ws2ipd… ============================================================================== --- branches/header-work/include/psdk/ws2ipdef.h [iso-8859-1] (original) +++ branches/header-work/include/psdk/ws2ipdef.h [iso-8859-1] Tue Mar 30 12:39:52 2010 @@ -1,15 +1,593 @@ -#ifndef _WS2IPDEF_ +#pragma once + #define _WS2IPDEF_ #ifdef __cplusplus extern "C" { #endif - - +#ifndef WS2IPDEF_ASSERT +#define WS2IPDEF_ASSERT(exp) ((VOID) 0) +#endif + +#ifdef _MSC_VER +#define WS2TCPIP_INLINE __inline +#else +#define WS2TCPIP_INLINE extern inline +#endif + +#include <in6addr.h> + +#define IFF_UP 0x00000001 +#define IFF_BROADCAST 0x00000002 +#define IFF_LOOPBACK 0x00000004 +#define IFF_POINTTOPOINT 0x00000008 +#define IFF_MULTICAST 0x00000010 + +#define IP_OPTIONS 1 +#define IP_HDRINCL 2 +#define IP_TOS 3 +#define IP_TTL 4 +#define IP_MULTICAST_IF 9 +#define IP_MULTICAST_TTL 10 +#define IP_MULTICAST_LOOP 11 +#define IP_ADD_MEMBERSHIP 12 +#define IP_DROP_MEMBERSHIP 13 +#define IP_DONTFRAGMENT 14 +#define IP_ADD_SOURCE_MEMBERSHIP 15 +#define IP_DROP_SOURCE_MEMBERSHIP 16 +#define IP_BLOCK_SOURCE 17 +#define IP_UNBLOCK_SOURCE 18 +#define IP_PKTINFO 19 +#define IP_HOPLIMIT 21 +#define IP_RECEIVE_BROADCAST 22 +#define IP_RECVIF 24 +#define IP_RECVDSTADDR 25 +#define IP_IFLIST 28 +#define IP_ADD_IFLIST 29 +#define IP_DEL_IFLIST 30 +#define IP_UNICAST_IF 31 +#define IP_RTHDR 32 +#define IP_RECVRTHDR 38 +#define IP_TCLASS 39 +#define IP_RECVTCLASS 40 +#define IP_ORIGINAL_ARRIVAL_IF 47 + +#define IP_UNSPECIFIED_TYPE_OF_SERVICE -1 + +#define IPV6_ADDRESS_BITS RTL_BITS_OF(IN6_ADDR) + +#define SS_PORT(ssp) (((PSOCKADDR_IN)(ssp))->sin_port) + +#define SIO_GET_INTERFACE_LIST _IOR('t', 127, ULONG) +#define SIO_GET_INTERFACE_LIST_EX _IOR('t', 126, ULONG) +#define SIO_SET_MULTICAST_FILTER _IOW('t', 125, ULONG) +#define SIO_GET_MULTICAST_FILTER _IOW('t', 124 | IOC_IN, ULONG) +#define SIOCSIPMSFILTER SIO_SET_MULTICAST_FILTER +#define SIOCGIPMSFILTER SIO_GET_MULTICAST_FILTER + +#define SIOCSMSFILTER _IOW('t', 126, ULONG) +#define SIOCGMSFILTER _IOW('t', 127 | IOC_IN, ULONG) + +#if (NTDDI_VERSION >= NTDDI_VISTASP1) + +#define IDEAL_SEND_BACKLOG_IOCTLS + +#define SIO_IDEAL_SEND_BACKLOG_QUERY _IOR('t', 123, ULONG) +#define SIO_IDEAL_SEND_BACKLOG_CHANGE _IO('t', 122) + +#endif /* (NTDDI_VERSION >= NTDDI_VISTASP1) */ + +#define MCAST_JOIN_GROUP 41 +#define MCAST_LEAVE_GROUP 42 +#define MCAST_BLOCK_SOURCE 43 +#define MCAST_UNBLOCK_SOURCE 44 +#define MCAST_JOIN_SOURCE_GROUP 45 +#define MCAST_LEAVE_SOURCE_GROUP 46 + +#define IP_MSFILTER_SIZE(NumSources) \ + (sizeof(IP_MSFILTER) - sizeof(IN_ADDR) + (NumSources) * sizeof(IN_ADDR)) + +#define IPV6_HOPOPTS 1 +#define IPV6_HDRINCL 2 +#define IPV6_UNICAST_HOPS 4 +#define IPV6_MULTICAST_IF 9 +#define IPV6_MULTICAST_HOPS 10 +#define IPV6_MULTICAST_LOOP 11 +#define IPV6_ADD_MEMBERSHIP 12 +#define IPV6_JOIN_GROUP IPV6_ADD_MEMBERSHIP +#define IPV6_DROP_MEMBERSHIP 13 +#define IPV6_LEAVE_GROUP IPV6_DROP_MEMBERSHIP +#define IPV6_DONTFRAG 14 +#define IPV6_PKTINFO 19 +#define IPV6_HOPLIMIT 21 +#define IPV6_PROTECTION_LEVEL 23 +#define IPV6_RECVIF 24 +#define IPV6_RECVDSTADDR 25 +#define IPV6_CHECKSUM 26 +#define IPV6_V6ONLY 27 +#define IPV6_IFLIST 28 +#define IPV6_ADD_IFLIST 29 +#define IPV6_DEL_IFLIST 30 +#define IPV6_UNICAST_IF 31 +#define IPV6_RTHDR 32 +#define IPV6_RECVRTHDR 38 +#define IPV6_TCLASS 39 +#define IPV6_RECVTCLASS 40 + +#define IP_UNSPECIFIED_HOP_LIMIT -1 + +#define IP_PROTECTION_LEVEL IPV6_PROTECTION_LEVEL +#define PROTECTION_LEVEL_UNRESTRICTED 10 +#define PROTECTION_LEVEL_EDGERESTRICTED 20 +#define PROTECTION_LEVEL_RESTRICTED 30 + +#if (NTDDI_VERSION < NTDDI_VISTA) +#define PROTECTION_LEVEL_DEFAULT PROTECTION_LEVEL_EDGERESTRICTED +#else +#define PROTECTION_LEVEL_DEFAULT ((UINT)-1) +#endif + +#define INET_ADDRSTRLEN 22 +#define INET6_ADDRSTRLEN 65 + +#define TCP_OFFLOAD_NO_PREFERENCE 0 +#define TCP_OFFLOAD_NOT_PREFERRED 1 +#define TCP_OFFLOAD_PREFERRED 2 + +#define TCP_EXPEDITED_1122 0x0002 +#define TCP_KEEPALIVE 3 +#define TCP_MAXSEG 4 +#define TCP_MAXRT 5 +#define TCP_STDURG 6 +#define TCP_NOURG 7 +#define TCP_ATMARK 8 +#define TCP_NOSYNRETRIES 9 +#define TCP_TIMESTAMPS 10 +#define TCP_OFFLOAD_PREFERENCE 11 +#define TCP_CONGESTION_ALGORITHM 12 +#define TCP_DELAY_FIN_ACK 13 + +struct sockaddr_in6_old { + SHORT sin6_family; + USHORT sin6_port; + ULONG sin6_flowinfo; + IN6_ADDR sin6_addr; +}; + +typedef union sockaddr_gen { + struct sockaddr Address; + struct sockaddr_in AddressIn; + struct sockaddr_in6_old AddressIn6; +} sockaddr_gen; + +typedef struct _INTERFACE_INFO { + ULONG iiFlags; + sockaddr_gen iiAddress; + sockaddr_gen iiBroadcastAddress; + sockaddr_gen iiNetmask; +} INTERFACE_INFO, FAR *LPINTERFACE_INFO; + +typedef struct _INTERFACE_INFO_EX { + ULONG iiFlags; + SOCKET_ADDRESS iiAddress; + SOCKET_ADDRESS iiBroadcastAddress; + SOCKET_ADDRESS iiNetmask; +} INTERFACE_INFO_EX, FAR *LPINTERFACE_INFO_EX; + +typedef struct sockaddr_in6 { + ADDRESS_FAMILY sin6_family; + USHORT sin6_port; + ULONG sin6_flowinfo; + IN6_ADDR sin6_addr; + union { + ULONG sin6_scope_id; + SCOPE_ID sin6_scope_struct; + }; +} SOCKADDR_IN6_LH, *PSOCKADDR_IN6_LH, FAR *LPSOCKADDR_IN6_LH; + +typedef struct sockaddr_in6_w2ksp1 { + short sin6_family; + USHORT sin6_port; + ULONG sin6_flowinfo; + struct in6_addr sin6_addr; + ULONG sin6_scope_id; +} SOCKADDR_IN6_W2KSP1, *PSOCKADDR_IN6_W2KSP1, FAR *LPSOCKADDR_IN6_W2KSP1; + +#if (NTDDI_VERSION >= NTDDI_VISTA) + +typedef SOCKADDR_IN6_LH SOCKADDR_IN6; +typedef SOCKADDR_IN6_LH *PSOCKADDR_IN6; +typedef SOCKADDR_IN6_LH FAR *LPSOCKADDR_IN6; + +#elif(NTDDI_VERSION >= NTDDI_WIN2KSP1) + +typedef SOCKADDR_IN6_W2KSP1 SOCKADDR_IN6; +typedef SOCKADDR_IN6_W2KSP1 *PSOCKADDR_IN6; +typedef SOCKADDR_IN6_W2KSP1 FAR *LPSOCKADDR_IN6; + +#else + +typedef SOCKADDR_IN6_LH SOCKADDR_IN6; +typedef SOCKADDR_IN6_LH *PSOCKADDR_IN6; +typedef SOCKADDR_IN6_LH FAR *LPSOCKADDR_IN6; + +#endif /* (NTDDI_VERSION >= NTDDI_VISTA) */ + +typedef union _SOCKADDR_INET { + SOCKADDR_IN Ipv4; + SOCKADDR_IN6 Ipv6; + ADDRESS_FAMILY si_family; +} SOCKADDR_INET, *PSOCKADDR_INET; + +typedef struct _sockaddr_in6_pair { + PSOCKADDR_IN6 SourceAddress; + PSOCKADDR_IN6 DestinationAddress; +} SOCKADDR_IN6_PAIR, *PSOCKADDR_IN6_PAIR; + +#if (NTDDI_VERSION >= NTDDI_WIN2KSP1) + +#define IN6ADDR_ANY_INIT {0} +#define IN6ADDR_LOOPBACK_INIT {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1} +#define IN6ADDR_ALLNODESONNODE_INIT {0xff, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01} +#define IN6ADDR_ALLNODESONLINK_INIT {0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01} +#define IN6ADDR_ALLROUTERSONLINK_INIT {0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02} +#define IN6ADDR_ALLMLDV2ROUTERSONLINK_INIT {0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16} +#define IN6ADDR_TEREDOINITIALLINKLOCALADDRESS_INIT {0xfe, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe} +#define IN6ADDR_TEREDOOLDLINKLOCALADDRESSXP_INIT {0xfe, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 'T', 'E', 'R', 'E', 'D', 'O'} +#define IN6ADDR_TEREDOOLDLINKLOCALADDRESSVISTA_INIT {0xfe, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff} +#define IN6ADDR_LINKLOCALPREFIX_INIT {0xfe, 0x80, } +#define IN6ADDR_MULTICASTPREFIX_INIT {0xff, 0x00, } +#define IN6ADDR_SOLICITEDNODEMULTICASTPREFIX_INIT {0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xff, } +#define IN6ADDR_V4MAPPEDPREFIX_INIT {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, } +#define IN6ADDR_6TO4PREFIX_INIT {0x20, 0x02, } +#define IN6ADDR_TEREDOPREFIX_INIT {0x20, 0x01, 0x00, 0x00, } +#define IN6ADDR_TEREDOPREFIX_INIT_OLD {0x3f, 0xfe, 0x83, 0x1f, } + +#define IN6ADDR_LINKLOCALPREFIX_LENGTH 64 +#define IN6ADDR_MULTICASTPREFIX_LENGTH 8 +#define IN6ADDR_SOLICITEDNODEMULTICASTPREFIX_LENGTH 104 +#define IN6ADDR_V4MAPPEDPREFIX_LENGTH 96 +#define IN6ADDR_6TO4PREFIX_LENGTH 16 +#define IN6ADDR_TEREDOPREFIX_LENGTH 32 + +extern CONST SCOPE_ID scopeid_unspecified; + +extern CONST IN_ADDR in4addr_any; +extern CONST IN_ADDR in4addr_loopback; +extern CONST IN_ADDR in4addr_broadcast; +extern CONST IN_ADDR in4addr_allnodesonlink; +extern CONST IN_ADDR in4addr_allroutersonlink; +extern CONST IN_ADDR in4addr_alligmpv3routersonlink; +extern CONST IN_ADDR in4addr_allteredohostsonlink; +extern CONST IN_ADDR in4addr_linklocalprefix; +extern CONST IN_ADDR in4addr_multicastprefix; + +extern CONST IN6_ADDR in6addr_any; +extern CONST IN6_ADDR in6addr_loopback; +extern CONST IN6_ADDR in6addr_allnodesonnode; +extern CONST IN6_ADDR in6addr_allnodesonlink; +extern CONST IN6_ADDR in6addr_allroutersonlink; +extern CONST IN6_ADDR in6addr_allmldv2routersonlink; +extern CONST IN6_ADDR in6addr_teredoinitiallinklocaladdress; +extern CONST IN6_ADDR in6addr_linklocalprefix; +extern CONST IN6_ADDR in6addr_multicastprefix; +extern CONST IN6_ADDR in6addr_solicitednodemulticastprefix; +extern CONST IN6_ADDR in6addr_v4mappedprefix; +extern CONST IN6_ADDR in6addr_6to4prefix; +extern CONST IN6_ADDR in6addr_teredoprefix; +extern CONST IN6_ADDR in6addr_teredoprefix_old; + +#ifndef __midl + +WS2TCPIP_INLINE +BOOLEAN +IN6_ADDR_EQUAL(CONST IN6_ADDR *x, CONST IN6_ADDR *y) { + __int64 UNALIGNED *a; + __int64 UNALIGNED *b; + + a = (__int64 UNALIGNED *)x; + b = (__int64 UNALIGNED *)y; + return (BOOLEAN)((a[1] == b[1]) && (a[0] == b[0])); +} + +#define IN6_ARE_ADDR_EQUAL IN6_ADDR_EQUAL + +WS2TCPIP_INLINE +BOOLEAN +IN6_IS_ADDR_UNSPECIFIED(CONST IN6_ADDR *a) { + return (BOOLEAN)((a->s6_words[0] == 0) && + (a->s6_words[1] == 0) && + (a->s6_words[2] == 0) && + (a->s6_words[3] == 0) && + (a->s6_words[4] == 0) && + (a->s6_words[5] == 0) && + (a->s6_words[6] == 0) && + (a->s6_words[7] == 0)); +} + +WS2TCPIP_INLINE +BOOLEAN +IN6_IS_ADDR_LOOPBACK(CONST IN6_ADDR *a) { + return (BOOLEAN)((a->s6_words[0] == 0) && + (a->s6_words[1] == 0) && + (a->s6_words[2] == 0) && + (a->s6_words[3] == 0) && + (a->s6_words[4] == 0) && + (a->s6_words[5] == 0) && + (a->s6_words[6] == 0) && + (a->s6_words[7] == 0x0100)); +} + +WS2TCPIP_INLINE +BOOLEAN +IN6_IS_ADDR_MULTICAST(CONST IN6_ADDR *a) { + return (BOOLEAN)(a->s6_bytes[0] == 0xff); +} + +WS2TCPIP_INLINE +BOOLEAN +IN6_IS_ADDR_EUI64(CONST IN6_ADDR *a) { + return (BOOLEAN)(((a->s6_bytes[0] & 0xe0) != 0) && + !IN6_IS_ADDR_MULTICAST(a)); +} + +WS2TCPIP_INLINE +BOOLEAN +IN6_IS_ADDR_SUBNET_ROUTER_ANYCAST(CONST IN6_ADDR *a) { + return (BOOLEAN)(IN6_IS_ADDR_EUI64(a) && + (a->s6_words[4] == 0) && + (a->s6_words[5] == 0) && + (a->s6_words[6] == 0) && + (a->s6_words[7] == 0)); +} + +WS2TCPIP_INLINE +BOOLEAN +IN6_IS_ADDR_SUBNET_RESERVED_ANYCAST(CONST IN6_ADDR *a) { + return (BOOLEAN)(IN6_IS_ADDR_EUI64(a) && + (a->s6_words[4] == 0xfffd) && + (a->s6_words[5] == 0xffff) && + (a->s6_words[6] == 0xffff) && + ((a->s6_words[7] & 0x80ff) == 0x80ff)); +} + +WS2TCPIP_INLINE +BOOLEAN +IN6_IS_ADDR_ANYCAST(CONST IN6_ADDR *a) { + return (IN6_IS_ADDR_SUBNET_RESERVED_ANYCAST(a) || + IN6_IS_ADDR_SUBNET_ROUTER_ANYCAST(a)); +} + +WS2TCPIP_INLINE +BOOLEAN +IN6_IS_ADDR_LINKLOCAL(CONST IN6_ADDR *a) { + return (BOOLEAN)((a->s6_bytes[0] == 0xfe) && + ((a->s6_bytes[1] & 0xc0) == 0x80)); +} + +WS2TCPIP_INLINE +BOOLEAN +IN6_IS_ADDR_SITELOCAL(CONST IN6_ADDR *a) { + return (BOOLEAN)((a->s6_bytes[0] == 0xfe) && + ((a->s6_bytes[1] & 0xc0) == 0xc0)); +} + +WS2TCPIP_INLINE +BOOLEAN +IN6_IS_ADDR_GLOBAL(CONST IN6_ADDR *a) { + ULONG High = (a->s6_bytes[0] & 0xf0); + return (BOOLEAN)((High != 0) && (High != 0xf0)); +} + +WS2TCPIP_INLINE +BOOLEAN +IN6_IS_ADDR_V4MAPPED(CONST IN6_ADDR *a) { + return (BOOLEAN)((a->s6_words[0] == 0) && + (a->s6_words[1] == 0) && + (a->s6_words[2] == 0) && + (a->s6_words[3] == 0) && + (a->s6_words[4] == 0) && + (a->s6_words[5] == 0xffff)); +} + +WS2TCPIP_INLINE +BOOLEAN +IN6_IS_ADDR_V4COMPAT(CONST IN6_ADDR *a) { + return (BOOLEAN)((a->s6_words[0] == 0) && + (a->s6_words[1] == 0) && + (a->s6_words[2] == 0) && + (a->s6_words[3] == 0) && + (a->s6_words[4] == 0) && + (a->s6_words[5] == 0) && + !((a->s6_words[6] == 0) && + (a->s6_addr[14] == 0) && + ((a->s6_addr[15] == 0) || (a->s6_addr[15] == 1)))); +} + +WS2TCPIP_INLINE +BOOLEAN +IN6_IS_ADDR_V4TRANSLATED(CONST IN6_ADDR *a) { + return (BOOLEAN)((a->s6_words[0] == 0) && + (a->s6_words[1] == 0) && + (a->s6_words[2] == 0) && + (a->s6_words[3] == 0) && + (a->s6_words[4] == 0xffff) && + (a->s6_words[5] == 0)); +} + +WS2TCPIP_INLINE +BOOLEAN +IN6_IS_ADDR_MC_NODELOCAL(CONST IN6_ADDR *a) { + return (BOOLEAN)(IN6_IS_ADDR_MULTICAST(a) && + ((a->s6_bytes[1] & 0xf) == 1)); +} + +WS2TCPIP_INLINE +BOOLEAN +IN6_IS_ADDR_MC_LINKLOCAL(CONST IN6_ADDR *a) { + return (BOOLEAN)(IN6_IS_ADDR_MULTICAST(a) && + ((a->s6_bytes[1] & 0xf) == 2)); +} + +WS2TCPIP_INLINE +BOOLEAN +IN6_IS_ADDR_MC_SITELOCAL(CONST IN6_ADDR *a) { + return (BOOLEAN)(IN6_IS_ADDR_MULTICAST(a) && + ((a->s6_bytes[1] & 0xf) == 5)); +} + +WS2TCPIP_INLINE +BOOLEAN +IN6_IS_ADDR_MC_ORGLOCAL(CONST IN6_ADDR *a) { + return (BOOLEAN)(IN6_IS_ADDR_MULTICAST(a) && + ((a->s6_bytes[1] & 0xf) == 8)); +} + +WS2TCPIP_INLINE +BOOLEAN +IN6_IS_ADDR_MC_GLOBAL(CONST IN6_ADDR *a) { + return (BOOLEAN)(IN6_IS_ADDR_MULTICAST(a) && + ((a->s6_bytes[1] & 0xf) == 0xe)); +} + +WS2TCPIP_INLINE +VOID +IN6_SET_ADDR_UNSPECIFIED(PIN6_ADDR a) { + memset(a->s6_bytes, 0, sizeof(IN6_ADDR)); +} + +WS2TCPIP_INLINE +VOID +IN6_SET_ADDR_LOOPBACK(PIN6_ADDR a) { + memset(a->s6_bytes, 0, sizeof(IN6_ADDR)); + a->s6_bytes[15] = 1; +} + +WS2TCPIP_INLINE +VOID +IN6ADDR_SETANY(PSOCKADDR_IN6 a) { + a->sin6_family = AF_INET6; + a->sin6_port = 0; + a->sin6_flowinfo = 0; + IN6_SET_ADDR_UNSPECIFIED(&a->sin6_addr); + a->sin6_scope_id = 0; +} + +WS2TCPIP_INLINE +VOID +IN6ADDR_SETLOOPBACK(PSOCKADDR_IN6 a) { + a->sin6_family = AF_INET6; + a->sin6_port = 0; + a->sin6_flowinfo = 0; + IN6_SET_ADDR_LOOPBACK(&a->sin6_addr); + a->sin6_scope_id = 0; +} + +WS2TCPIP_INLINE +BOOLEAN +IN6ADDR_ISANY(CONST SOCKADDR_IN6 *a) { + WS2IPDEF_ASSERT(a->sin6_family == AF_INET6); + return IN6_IS_ADDR_UNSPECIFIED(&a->sin6_addr); +} + +WS2TCPIP_INLINE +BOOLEAN +IN6ADDR_ISLOOPBACK(CONST SOCKADDR_IN6 *a) { + WS2IPDEF_ASSERT(a->sin6_family == AF_INET6); + return IN6_IS_ADDR_LOOPBACK(&a->sin6_addr); +} + +WS2TCPIP_INLINE +BOOLEAN +IN6ADDR_ISEQUAL(CONST SOCKADDR_IN6 *a, CONST SOCKADDR_IN6 *b) { + WS2IPDEF_ASSERT(a->sin6_family == AF_INET6); + return (BOOLEAN)(a->sin6_scope_id == b->sin6_scope_id && + IN6_ADDR_EQUAL(&a->sin6_addr, &b->sin6_addr)); +} + +WS2TCPIP_INLINE +BOOLEAN +IN6ADDR_ISUNSPECIFIED(CONST SOCKADDR_IN6 *a) { + WS2IPDEF_ASSERT(a->sin6_family == AF_INET6); + return (BOOLEAN)(a->sin6_scope_id == 0 && + IN6_IS_ADDR_UNSPECIFIED(&a->sin6_addr)); +} + +#endif /* __midl */ + +#endif /* (NTDDI_VERSION >= NTDDI_WIN2KSP1) */ + +typedef enum _MULTICAST_MODE_TYPE { + MCAST_INCLUDE = 0, + MCAST_EXCLUDE +} MULTICAST_MODE_TYPE; + +typedef struct ip_mreq { + IN_ADDR imr_multiaddr; + IN_ADDR imr_interface; +} IP_MREQ, *PIP_MREQ; + +typedef struct ip_mreq_source { + IN_ADDR imr_multiaddr; + IN_ADDR imr_sourceaddr; + IN_ADDR imr_interface; +} IP_MREQ_SOURCE, *PIP_MREQ_SOURCE; + +typedef struct ip_msfilter { + IN_ADDR imsf_multiaddr; + IN_ADDR imsf_interface; + MULTICAST_MODE_TYPE imsf_fmode; + ULONG imsf_numsrc; + IN_ADDR imsf_slist[1]; +} IP_MSFILTER, *PIP_MSFILTER; + +typedef struct ipv6_mreq { + IN6_ADDR ipv6mr_multiaddr; + ULONG ipv6mr_interface; +} IPV6_MREQ, *PIPV6_MREQ; + +#if (NTDDI_VERSION >= NTDDI_WINXP) + +typedef struct group_req { + ULONG gr_interface; + SOCKADDR_STORAGE gr_group; +} GROUP_REQ, *PGROUP_REQ; + +typedef struct group_source_req { + ULONG gsr_interface; + SOCKADDR_STORAGE gsr_group; + SOCKADDR_STORAGE gsr_source; +} GROUP_SOURCE_REQ, *PGROUP_SOURCE_REQ; + +typedef struct group_filter { + ULONG gf_interface; + SOCKADDR_STORAGE gf_group; + MULTICAST_MODE_TYPE gf_fmode; + ULONG gf_numsrc; + SOCKADDR_STORAGE gf_slist[1]; +} GROUP_FILTER, *PGROUP_FILTER; + +#define GROUP_FILTER_SIZE(numsrc) \ + (sizeof(GROUP_FILTER) - sizeof(SOCKADDR_STORAGE) \ + + (numsrc) * sizeof(SOCKADDR_STORAGE)) + +#endif /* (NTDDI_VERSION >= NTDDI_WINXP) */ + +typedef struct in_pktinfo { + IN_ADDR ipi_addr; + ULONG ipi_ifindex; +} IN_PKTINFO, *PIN_PKTINFO; + +C_ASSERT(sizeof(IN_PKTINFO) == 8); + +typedef struct in6_pktinfo { + IN6_ADDR ipi6_addr; + ULONG ipi6_ifindex; +} IN6_PKTINFO, *PIN6_PKTINFO; + +C_ASSERT(sizeof(IN6_PKTINFO) == 20); #ifdef __cplusplus } #endif - -#endif

1 0

← Newer
1
2
3
4
5
6
7
...
90
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 March 2010