diff --git a/reactos/apps/tests/dnsapi/makefile b/reactos/apps/tests/dnsapi/makefile index a471ef48151..358a82deba0 100644 --- a/reactos/apps/tests/dnsapi/makefile +++ b/reactos/apps/tests/dnsapi/makefile @@ -13,7 +13,7 @@ TARGET_SDKLIBS = dnsapi.a ws2_32.a kernel32.a TARGET_OBJECTS = $(TARGET_NAME).o -TARGET_CFLAGS = -Wall -Werror -g +TARGET_CFLAGS = -D__USE_W32API -Wall -Werror -g include $(PATH_TO_TOP)/rules.mak diff --git a/reactos/apps/tests/dnsquery/makefile b/reactos/apps/tests/dnsquery/makefile index 62e0051a2dc..842c1ea1aab 100644 --- a/reactos/apps/tests/dnsquery/makefile +++ b/reactos/apps/tests/dnsquery/makefile @@ -13,7 +13,7 @@ TARGET_SDKLIBS = dnsapi.a ws2_32.a kernel32.a TARGET_OBJECTS = $(TARGET_NAME).o -TARGET_CFLAGS = -Wall -Werror -g +TARGET_CFLAGS = -D__USE_W32API -Wall -Werror -g include $(PATH_TO_TOP)/rules.mak diff --git a/reactos/apps/tests/nameserverlist/makefile b/reactos/apps/tests/nameserverlist/makefile index b8cd716a5f9..ee3bf913e06 100644 --- a/reactos/apps/tests/nameserverlist/makefile +++ b/reactos/apps/tests/nameserverlist/makefile @@ -13,7 +13,7 @@ TARGET_SDKLIBS = iphlpapi.a ws2_32.a kernel32.a TARGET_OBJECTS = $(TARGET_NAME).o -TARGET_CFLAGS = -Wall -Werror -g +TARGET_CFLAGS = -D__USE_W32API -Wall -Werror -g include $(PATH_TO_TOP)/rules.mak diff --git a/reactos/apps/tests/tcpsvr/makefile b/reactos/apps/tests/tcpsvr/makefile index e08f9a007db..397ba0c46a3 100644 --- a/reactos/apps/tests/tcpsvr/makefile +++ b/reactos/apps/tests/tcpsvr/makefile @@ -1,4 +1,4 @@ -# $Id: makefile,v 1.2 2003/11/14 17:13:21 weiden Exp $ +# $Id: makefile,v 1.3 2004/01/11 20:46:05 navaraf Exp $ PATH_TO_TOP = ../../.. @@ -14,7 +14,7 @@ TARGET_SDKLIBS = kernel32.a ws2_32.a TARGET_OBJECTS = $(TARGET_NAME).o -TARGET_CFLAGS = -Wall -Werror +TARGET_CFLAGS = -D__USE_W32API -Wall -Werror include $(PATH_TO_TOP)/rules.mak diff --git a/reactos/drivers/net/afd/include/afd.h b/reactos/drivers/net/afd/include/afd.h index b342b8702cb..62f75753ac9 100644 --- a/reactos/drivers/net/afd/include/afd.h +++ b/reactos/drivers/net/afd/include/afd.h @@ -9,9 +9,11 @@ #include #include +#include #include #include #include +#include #include /* Forward declarations */ diff --git a/reactos/drivers/net/afd/include/debug.h b/reactos/drivers/net/afd/include/debug.h index dc1fe317f48..b3961e098de 100644 --- a/reactos/drivers/net/afd/include/debug.h +++ b/reactos/drivers/net/afd/include/debug.h @@ -67,6 +67,7 @@ extern DWORD DebugTraceLevel; #endif /* DBG */ +#undef assert #define assert(x) ASSERT(x) #define assert_km(x) ASSERT_KM(x) #define assert_irql(x) ASSERT_IRQL(x) diff --git a/reactos/drivers/net/afd/makefile b/reactos/drivers/net/afd/makefile index 6ff2a6de576..74f7f4832d8 100644 --- a/reactos/drivers/net/afd/makefile +++ b/reactos/drivers/net/afd/makefile @@ -1,4 +1,4 @@ -# $Id: makefile,v 1.6 2003/11/14 17:13:28 weiden Exp $ +# $Id: makefile,v 1.7 2004/01/11 20:46:05 navaraf Exp $ PATH_TO_TOP = ../../.. @@ -6,7 +6,7 @@ TARGET_TYPE = driver TARGET_NAME = afd -TARGET_CFLAGS = -I./include -DDBG -Werror -Wall +TARGET_CFLAGS = -I./include -DDBG -D__USE_W32API -Werror -Wall TARGET_OBJECTS = \ afd/afd.o \ diff --git a/reactos/drivers/net/wshtcpip/debug.h b/reactos/drivers/net/wshtcpip/debug.h index 15e4d9cfebd..e53b5e3c454 100644 --- a/reactos/drivers/net/wshtcpip/debug.h +++ b/reactos/drivers/net/wshtcpip/debug.h @@ -50,6 +50,7 @@ extern DWORD DebugTraceLevel; #endif /* DBG */ +#undef assert #define assert(x) ASSERT(x) #define assert_irql(x) ASSERT_IRQL(x) diff --git a/reactos/drivers/net/wshtcpip/makefile b/reactos/drivers/net/wshtcpip/makefile index b4b6fc6d4f6..19b35f26c4f 100644 --- a/reactos/drivers/net/wshtcpip/makefile +++ b/reactos/drivers/net/wshtcpip/makefile @@ -1,4 +1,4 @@ -# $Id: makefile,v 1.10 2003/11/14 17:13:29 weiden Exp $ +# $Id: makefile,v 1.11 2004/01/11 20:46:05 navaraf Exp $ PATH_TO_TOP = ../../.. @@ -8,7 +8,7 @@ TARGET_NAME = wshtcpip TARGET_BASE = 0x777c0000 -TARGET_CFLAGS = -DUNICODE -Werror -Wall +TARGET_CFLAGS = -DUNICODE -D__USE_W32API -Werror -Wall TARGET_SDKLIBS = ntdll.a kernel32.a ws2_32.a diff --git a/reactos/include/dflat32/classdef.h b/reactos/include/dflat32/classdef.h deleted file mode 100644 index 086ee493651..00000000000 --- a/reactos/include/dflat32/classdef.h +++ /dev/null @@ -1,31 +0,0 @@ -/* ---------------- classdef.h --------------- */ - -#ifndef CLASSDEF_H -#define CLASSDEF_H - -typedef struct classdefs { - DFCLASS base; /* base window class */ - int (*wndproc)(struct window *,enum messages,PARAM,PARAM); - int attrib; -} CLASSDEFS; - -extern CLASSDEFS classdefs[]; - -#define SHADOW 0x0001 -#define MOVEABLE 0x0002 -#define SIZEABLE 0x0004 -#define HASMENUBAR 0x0008 -#define VSCROLLBAR 0x0010 -#define HSCROLLBAR 0x0020 -#define VISIBLE 0x0040 -#define SAVESELF 0x0080 -#define HASTITLEBAR 0x0100 -#define CONTROLBOX 0x0200 -#define MINMAXBOX 0x0400 -#define NOCLIP 0x0800 -#define READONLY 0x1000 -#define MULTILINE 0x2000 -#define HASBORDER 0x4000 -#define HASSTATUSBAR 0x8000 - -#endif diff --git a/reactos/include/dflat32/classes.h b/reactos/include/dflat32/classes.h deleted file mode 100644 index 653013b4353..00000000000 --- a/reactos/include/dflat32/classes.h +++ /dev/null @@ -1,56 +0,0 @@ -/* ----------- classes.h ------------ */ -/* - * Class definition source file - * Make class changes to this source file - * Other source files will adapt - * - * You must add entries to the color tables in - * CONFIG.C for new classes. - * - * Class Name Base Class Processor Attribute - * ------------ --------- --------------- ----------- - */ -ClassDef( NORMAL, -1, NormalProc, 0 ) -ClassDef( APPLICATION, NORMAL, ApplicationProc, VISIBLE | - SAVESELF | - CONTROLBOX ) -ClassDef( TEXTBOX, NORMAL, TextBoxProc, 0 ) -/* ClassDef( LISTBOX, TEXTBOX, ListBoxProc, 0 ) */ -ClassDef( EDITBOX, TEXTBOX, EditBoxProc, 0 ) -ClassDef( MENUBAR, NORMAL, MenuBarProc, NOCLIP ) -ClassDef( POPDOWNMENU, LISTBOX, PopDownProc, SAVESELF | - NOCLIP | - HASBORDER ) -#ifdef INCLUDE_PICTUREBOX -ClassDef( PICTUREBOX, TEXTBOX, PictureProc, 0 ) -#endif -ClassDef( DIALOG, NORMAL, DialogProc, SHADOW | - MOVEABLE | - CONTROLBOX| - HASBORDER | - NOCLIP ) -ClassDef( BOX, NORMAL, BoxProc, HASBORDER ) -/* ClassDef( BUTTON, TEXTBOX, ButtonProc, SHADOW ) */ -/* ClassDef( COMBOBOX, EDITBOX, ComboProc, 0 ) */ -ClassDef( TEXT, TEXTBOX, TextProc, 0 ) -ClassDef( RADIOBUTTON, TEXTBOX, RadioButtonProc, 0 ) -ClassDef( CHECKBOX, TEXTBOX, CheckBoxProc, 0 ) -ClassDef( SPINBUTTON, LISTBOX, SpinButtonProc, 0 ) -ClassDef( ERRORBOX, DIALOG, NULL, SHADOW | - HASBORDER ) -ClassDef( MESSAGEBOX, DIALOG, NULL, SHADOW | - HASBORDER ) -ClassDef( HELPBOX, DIALOG, HelpBoxProc, MOVEABLE | - SAVESELF | - HASBORDER | - NOCLIP | - CONTROLBOX ) -ClassDef( STATUSBAR, TEXTBOX, StatusBarProc, NOCLIP ) - -/* - * ========> Add new classes here <======== - */ - -/* ---------- pseudo classes to create enums, etc. ---------- */ -ClassDef( TITLEBAR, -1, NULL, 0 ) -ClassDef( DUMMY, -1, NULL, HASBORDER ) diff --git a/reactos/include/dflat32/commands.h b/reactos/include/dflat32/commands.h deleted file mode 100644 index 6850ac68f29..00000000000 --- a/reactos/include/dflat32/commands.h +++ /dev/null @@ -1,121 +0,0 @@ -/* ---------------- commands.h ----------------- */ - -/* - * Command values sent as the first parameter - * in the COMMAND message - * - * Add application-specific commands to this enum - */ - -#ifndef COMMANDS_H -#define COMMANDS_H - -enum commands { - /* --------------- File menu ---------------- */ - ID_OPEN, - ID_NEW, - ID_SAVE, - ID_SAVEAS, - ID_DELETEFILE, - ID_PRINT, - ID_PRINTSETUP, - ID_DOS, - ID_EXIT, - /* --------------- Edit menu ---------------- */ - ID_UNDO, - ID_CUT, - ID_COPY, - ID_PASTE, - ID_PARAGRAPH, - ID_CLEAR, - ID_DELETETEXT, - /* --------------- Search Menu -------------- */ - ID_SEARCH, - ID_REPLACE, - ID_SEARCHNEXT, - /* --------------- Utilities Menu ------------- */ - ID_CALENDAR, - ID_BARCHART, - /* -------------- Options menu -------------- */ - ID_INSERT, - ID_WRAP, - ID_LOG, - ID_TABS, - ID_DISPLAY, - ID_SAVEOPTIONS, - /* --------------- Window menu -------------- */ - ID_CLOSEALL, - ID_WINDOW, - ID_MOREWINDOWS, - /* --------------- Help menu ---------------- */ - ID_HELPHELP, - ID_EXTHELP, - ID_KEYSHELP, - ID_HELPINDEX, - ID_ABOUT, - ID_LOADHELP, - /* --------------- System menu -------------- */ -#ifdef INCLUDE_RESTORE - ID_SYSRESTORE, -#endif - ID_SYSMOVE, - ID_SYSSIZE, -#ifdef INCLUDE_MINIMIZE - ID_SYSMINIMIZE, -#endif -#ifdef INCLUDE_MAXIMIZE - ID_SYSMAXIMIZE, -#endif - ID_SYSCLOSE, - /* ---- FileOpen and SaveAs dialog boxes ---- */ - ID_FILENAME, - ID_FILES, - ID_DRIVE, - ID_PATH, - /* ----- Search and Replace dialog boxes ---- */ - ID_SEARCHFOR, - ID_REPLACEWITH, - ID_MATCHCASE, - ID_REPLACEALL, - /* ----------- Windows dialog box ----------- */ - ID_WINDOWLIST, - /* --------- generic command buttons -------- */ - ID_OK, - ID_CANCEL, - ID_HELP, - /* -------------- TabStops menu ------------- */ - ID_TAB2, - ID_TAB4, - ID_TAB6, - ID_TAB8, - /* ------------ Display dialog box ---------- */ - ID_BORDER, - ID_TITLE, - ID_STATUSBAR, - ID_TEXTURE, - ID_SNOWY, - ID_COLOR, - ID_MONO, - ID_REVERSE, - ID_25LINES, - ID_43LINES, - ID_50LINES, - /* ------------- Log dialog box ------------- */ - ID_LOGLIST, - ID_LOGGING, - /* ------------ HelpBox dialog box ---------- */ - ID_HELPTEXT, - ID_BACK, - ID_PREV, - ID_NEXT, - /* ---------- Print Select dialog box --------- */ - ID_PRINTERPORT, - ID_LEFTMARGIN, - ID_RIGHTMARGIN, - ID_TOPMARGIN, - ID_BOTTOMMARGIN, - /* ----------- InputBox dialog box ------------ */ - ID_INPUTTEXT -}; - -#endif diff --git a/reactos/include/dflat32/config.h b/reactos/include/dflat32/config.h deleted file mode 100644 index 7b70cf4f451..00000000000 --- a/reactos/include/dflat32/config.h +++ /dev/null @@ -1,48 +0,0 @@ -/* ---------------- config.h -------------- */ - -#ifndef CONFIG_H -#define CONFIG_H - -enum colortypes { - STD_COLOR, - SELECT_COLOR, - FRAME_COLOR, - HILITE_COLOR -}; - -enum grounds { FG, BG }; - -/* ----------- configuration parameters ----------- */ -typedef struct config { - char version[sizeof VERSION]; - BOOL InsertMode; /* Editor insert mode */ - int Tabs; /* Editor tab stops */ - BOOL WordWrap; /* True to word wrap editor */ -#ifdef INCLUDE_WINDOWOPTIONS - BOOL Border; /* True for application window border */ - BOOL Title; /* True for application window title */ - BOOL StatusBar; /* True for appl'n window status bar */ - BOOL Texture; /* True for textured appl window */ -#endif -/* int ScreenLines; */ /* Number of screen lines (25/43/50) */ - char PrinterPort[5]; - int LinesPage; /* Lines per printer page */ - int CharsLine; /* Characters per printer line */ - int LeftMargin; /* Printer margins */ - int RightMargin; - int TopMargin; - int BottomMargin; - unsigned char clr[CLASSCOUNT] [4] [2]; /* Colors */ -} CONFIG; - -extern CONFIG cfg; -extern unsigned char color[CLASSCOUNT] [4] [2]; -extern unsigned char bw[CLASSCOUNT] [4] [2]; -extern unsigned char reverse[CLASSCOUNT] [4] [2]; - -BOOL LoadConfig(void); -void SaveConfig(void); -FILE *OpenConfig(char *); - -#endif - diff --git a/reactos/include/dflat32/dflat.h b/reactos/include/dflat32/dflat.h deleted file mode 100644 index eb402cda7e1..00000000000 --- a/reactos/include/dflat32/dflat.h +++ /dev/null @@ -1,487 +0,0 @@ -/* ------------- dflat.h ----------- */ -#ifndef DFLAT_H -#define DFLAT_H - -/* #ifdef BUILD_FULL_DFLAT */ -#define INCLUDE_MULTI_WINDOWS -#define INCLUDE_LOGGING -#define INCLUDE_SHELLDOS -#define INCLUDE_WINDOWOPTIONS -#define INCLUDE_PICTUREBOX -#define INCLUDE_MINIMIZE -#define INCLUDE_MAXIMIZE -#define INCLUDE_RESTORE -#define INCLUDE_EXTENDEDSELECTIONS -/* #endif */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#ifndef VERSION -#define VERSION "Beta Version 0.3" -#endif - -void *DFcalloc(size_t, size_t); -void *DFmalloc(size_t); -void *DFrealloc(void *, size_t); - - -#define MAXMESSAGES 50 -#define DELAYTICKS 1 -#define FIRSTDELAY 7 -#define DOUBLETICKS 5 - -#define MAXTEXTLEN 65000U /* maximum text buffer */ -#define EDITLEN 1024 /* starting length for multiliner */ -#define ENTRYLEN 256 /* starting length for one-liner */ -#define GROWLENGTH 64 /* buffers grow by this much */ - -#include "system.h" -#include "config.h" -#include "rect.h" -#include "menu.h" -#include "keys.h" -#include "commands.h" -#include "dialbox.h" - -/* ------ integer type for message parameters ----- */ -typedef long PARAM; - -enum Condition -{ - ISRESTORED, ISMINIMIZED, ISMAXIMIZED, ISCLOSING -}; - -typedef struct window -{ - DFCLASS class; /* window class */ - char *title; /* window title */ - int (*wndproc)(struct window *, enum messages, PARAM, PARAM); - - /* ----------------- window colors -------------------- */ - char WindowColors[4][2]; - - /* ---------------- window dimensions ----------------- */ - DFRECT rc; /* window coordinates (0/0 to 79/24) */ - int ht, wd; /* window height and width */ - DFRECT RestoredRC; /* restored condition rect */ - - /* -------------- linked list pointers ---------------- */ - struct window *parent; /* parent window */ - struct window *firstchild; /* first child this parent */ - struct window *lastchild; /* last child this parent */ - struct window *nextsibling; /* next sibling */ - struct window *prevsibling; /* previous sibling */ - struct window *childfocus; /* child that ha(s/d) focus */ - - int attrib; /* Window attributes */ - PCHAR_INFO videosave; /* video save buffer */ - enum Condition condition; /* Restored, Maximized, - Minimized, Closing */ - enum Condition oldcondition;/* previous condition */ - int restored_attrib; /* attributes when restored */ - void *extension; /* menus, dialogs, documents, etc */ - struct window *PrevMouse; - struct window *PrevKeyboard; - struct window *MenuBarWnd;/* menu bar */ - struct window *StatusBar; /* status bar */ - int isHelping; /* > 0 when help is being displayed */ - - /* ----------------- text box fields ------------------ */ - int wlines; /* number of lines of text */ - int wtop; /* text line that is on the top display */ - unsigned char *text; /* window text */ - unsigned int textlen; /* text length */ - int wleft; /* left position in window viewport */ - int textwidth; /* width of longest line in textbox */ - int BlkBegLine; /* beginning line of marked block */ - int BlkBegCol; /* beginning column of marked block */ - int BlkEndLine; /* ending line of marked block */ - int BlkEndCol; /* ending column of marked block */ - int HScrollBox; /* position of horizontal scroll box */ - int VScrollBox; /* position of vertical scroll box */ - unsigned int *TextPointers; /* -> list of line offsets */ - - /* ----------------- list box fields ------------------ */ - int selection; /* current selection */ - BOOL AddMode; /* adding extended selections mode */ - int AnchorPoint;/* anchor point for extended selections */ - int SelectCount;/* count of selected items */ - - /* ----------------- edit box fields ------------------ */ - int CurrCol; /* Current column */ - int CurrLine; /* Current line */ - int WndRow; /* Current window row */ - BOOL TextChanged; /* TRUE if text has changed */ - unsigned char *DeletedText; /* for undo */ - unsigned DeletedLength; /* Length of deleted field */ - BOOL InsertMode; /* TRUE or FALSE for text insert */ - BOOL WordWrapMode; /* TRUE or FALSE for word wrap */ - unsigned int MaxTextLength; /* maximum text length */ - - /* ---------------- dialog box fields ----------------- */ - int ReturnCode; /* return code from a dialog box */ - BOOL Modal; /* True if a modeless dialog box */ - CTLWINDOW *ct; /* control structure */ - struct window *dfocus; /* control window that has focus */ - /* -------------- popdownmenu fields ------------------ */ - MENU *mnu; /* points to menu structure */ - MBAR *holdmenu; /* previous active menu */ - struct window *oldFocus; - - /* --------------- help box fields -------------------- */ - void *firstword; /* -> first in list of key words */ - void *lastword; /* -> last in list of key words */ - void *thisword; /* -> current in list of key words */ - /* -------------- status bar fields ------------------- */ - BOOL TimePosted; /* True if time has been posted */ -#ifdef INCLUDE_PICTUREBOX - /* ------------- picture box fields ------------------- */ - int VectorCount; /* number of vectors in vector list */ - void *VectorList; /* list of picture box vectors */ -#endif -} * DFWINDOW; - -#include "classdef.h" -#include "video.h" - -void LogMessages (DFWINDOW, DFMESSAGE, PARAM, PARAM); -void MessageLog(DFWINDOW); -/* ------- window methods ----------- */ -#define ICONHEIGHT 3 -#define ICONWIDTH 10 -#define WindowHeight(w) ((w)->ht) -#define WindowWidth(w) ((w)->wd) -#define BorderAdj(w) (TestAttribute(w,HASBORDER)?1:0) -#define BottomBorderAdj(w) (TestAttribute(w,HASSTATUSBAR)?1:BorderAdj(w)) -#define TopBorderAdj(w) ((TestAttribute(w,HASTITLEBAR) && \ - TestAttribute(w,HASMENUBAR)) ? \ - 2 : (TestAttribute(w,HASTITLEBAR | \ - HASMENUBAR | HASBORDER) ? 1 : 0)) -#define ClientWidth(w) (WindowWidth(w)-BorderAdj(w)*2) -#define ClientHeight(w) (WindowHeight(w)-TopBorderAdj(w)-\ - BottomBorderAdj(w)) -#define WindowRect(w) ((w)->rc) -#define GetTop(w) (RectTop(WindowRect(w))) -#define GetBottom(w) (RectBottom(WindowRect(w))) -#define GetLeft(w) (RectLeft(WindowRect(w))) -#define GetRight(w) (RectRight(WindowRect(w))) -#define GetClientTop(w) (GetTop(w)+TopBorderAdj(w)) -#define GetClientBottom(w) (GetBottom(w)-BottomBorderAdj(w)) -#define GetClientLeft(w) (GetLeft(w)+BorderAdj(w)) -#define GetClientRight(w) (GetRight(w)-BorderAdj(w)) -#define GetTitle(w) ((w)->title) -#define GetParent(w) ((w)->parent) -#define FirstWindow(w) ((w)->firstchild) -#define LastWindow(w) ((w)->lastchild) -#define NextWindow(w) ((w)->nextsibling) -#define PrevWindow(w) ((w)->prevsibling) -#define GetClass(w) ((w)->class) -#define GetAttribute(w) ((w)->attrib) -#define AddAttribute(w,a) (GetAttribute(w) |= a) -#define ClearAttribute(w,a) (GetAttribute(w) &= ~(a)) -#define TestAttribute(w,a) (GetAttribute(w) & (a)) -#define isHidden(w) (!(GetAttribute(w) & VISIBLE)) -#define SetVisible(w) (GetAttribute(w) |= VISIBLE) -#define ClearVisible(w) (GetAttribute(w) &= ~VISIBLE) -#define gotoxy(w,x,y) cursor(w->rc.lf+(x)+1,w->rc.tp+(y)+1) -BOOL isVisible(DFWINDOW); -DFWINDOW DfCreateWindow(DFCLASS,char *,int,int,int,int,void*,DFWINDOW, - int (*)(struct window *,enum messages,PARAM,PARAM),int); -void AddTitle(DFWINDOW, char *); -void InsertTitle(DFWINDOW, char *); -void DisplayTitle(DFWINDOW, DFRECT *); -void RepaintBorder(DFWINDOW, DFRECT *); -void PaintShadow(DFWINDOW); -void ClearWindow(DFWINDOW, DFRECT *, int); -void writeline(DFWINDOW, char *, int, int, BOOL); -void InitWindowColors(DFWINDOW); - -void SetNextFocus(void); -void SetPrevFocus(void); -void RemoveWindow(DFWINDOW); -void AppendWindow(DFWINDOW); -void ReFocus(DFWINDOW); -void SkipApplicationControls(void); - -BOOL CharInView(DFWINDOW, int, int); -void CreatePath(char *, char *, int, int); -#define SwapVideoBuffer(wnd, ish, fh) swapvideo(wnd, wnd->videosave, ish, fh) -int LineLength(char *); -DFRECT AdjustRectangle(DFWINDOW, DFRECT); -BOOL isDerivedFrom(DFWINDOW, DFCLASS); -DFWINDOW GetAncestor(DFWINDOW); -void PutWindowChar(DFWINDOW,char,int,int); -void PutWindowLine(DFWINDOW, void *,int,int); -#define BaseWndProc(class,wnd,msg,p1,p2) \ - (*classdefs[(classdefs[class].base)].wndproc)(wnd,msg,p1,p2) -#define DefaultWndProc(wnd,msg,p1,p2) \ - (classdefs[wnd->class].wndproc == NULL) ? \ - BaseWndProc(wnd->class,wnd,msg,p1,p2) : \ - (*classdefs[wnd->class].wndproc)(wnd,msg,p1,p2) -struct LinkedList { - DFWINDOW FirstWindow; - DFWINDOW LastWindow; -}; -extern DFWINDOW ApplicationWindow; -extern DFWINDOW inFocus; -extern DFWINDOW CaptureMouse; -extern DFWINDOW CaptureKeyboard; -extern int foreground, background; -extern BOOL WindowMoving; -extern BOOL WindowSizing; -extern BOOL VSliding; -extern BOOL HSliding; -extern char DFlatApplication[]; -extern char *Clipboard; -extern unsigned ClipboardLength; -extern BOOL ClipString; -/* --------- space between menubar labels --------- */ -#define MSPACE 2 -/* --------------- border characters ------------- */ -#define FOCUS_NW (unsigned char) '\xc9' -#define FOCUS_NE (unsigned char) '\xbb' -#define FOCUS_SE (unsigned char) '\xbc' -#define FOCUS_SW (unsigned char) '\xc8' -#define FOCUS_SIDE (unsigned char) '\xba' -#define FOCUS_LINE (unsigned char) '\xcd' -#define NW (unsigned char) '\xda' -#define NE (unsigned char) '\xbf' -#define SE (unsigned char) '\xd9' -#define SW (unsigned char) '\xc0' -#define SIDE (unsigned char) '\xb3' -#define LINE (unsigned char) '\xc4' -#define LEDGE (unsigned char) '\xc3' -#define REDGE (unsigned char) '\xb4' -/* ------------- scroll bar characters ------------ */ -#define UPSCROLLBOX (unsigned char) '\x1e' -#define DOWNSCROLLBOX (unsigned char) '\x1f' -#define LEFTSCROLLBOX (unsigned char) '\x11' -#define RIGHTSCROLLBOX (unsigned char) '\x10' -#define SCROLLBARCHAR (unsigned char) 176 -#define SCROLLBOXCHAR (unsigned char) 178 -/* ------------------ menu characters --------------------- */ -#define CHECKMARK (unsigned char) '\x04' /* (SCREENHEIGHT==25?251:4) */ -#define CASCADEPOINTER (unsigned char) '\x10' -/* ----------------- title bar characters ----------------- */ -#define CONTROLBOXCHAR (unsigned char) '\xf0' -#define MAXPOINTER 24 /* maximize token */ -#define MINPOINTER 25 /* minimize token */ -#define RESTOREPOINTER 18 /* restore token */ -/* --------------- text control characters ---------------- */ -#define APPLCHAR (unsigned char) 176 /* fills application window */ -#define SHORTCUTCHAR '~' /* prefix: shortcut key display */ -#define CHANGECOLOR (unsigned char) 174 /* prefix to change colors */ -#define RESETCOLOR (unsigned char) 175 /* reset colors to default */ -#define LISTSELECTOR 4 /* selected list box entry */ - -/* --------- message prototypes ----------- */ -BOOL DfInitialize (void); -void DfTerminate (void); -void DfPostMessage (DFWINDOW, DFMESSAGE, PARAM, PARAM); -int DfSendMessage (DFWINDOW, DFMESSAGE, PARAM, PARAM); -BOOL DfDispatchMessage (void); -void handshake(void); -SHORT DfGetScreenHeight (void); -SHORT DfGetScreenWidth (void); - -/* ---- standard window message processing prototypes ----- */ -int ApplicationProc(DFWINDOW, DFMESSAGE, PARAM, PARAM); -int NormalProc(DFWINDOW, DFMESSAGE, PARAM, PARAM); -int TextBoxProc(DFWINDOW, DFMESSAGE, PARAM, PARAM); -int ListBoxProc(DFWINDOW, DFMESSAGE, PARAM, PARAM); -int EditBoxProc(DFWINDOW, DFMESSAGE, PARAM, PARAM); -int PictureProc(DFWINDOW, DFMESSAGE, PARAM, PARAM); -int MenuBarProc(DFWINDOW, DFMESSAGE, PARAM, PARAM); -int PopDownProc(DFWINDOW, DFMESSAGE, PARAM, PARAM); -int ButtonProc(DFWINDOW, DFMESSAGE, PARAM, PARAM); -int ComboProc(DFWINDOW, DFMESSAGE, PARAM, PARAM); -int TextProc(DFWINDOW, DFMESSAGE, PARAM, PARAM); -int RadioButtonProc(DFWINDOW, DFMESSAGE, PARAM, PARAM); -int CheckBoxProc(DFWINDOW, DFMESSAGE, PARAM, PARAM); -int SpinButtonProc(DFWINDOW, DFMESSAGE, PARAM, PARAM); -int BoxProc(DFWINDOW, DFMESSAGE, PARAM, PARAM); -int DialogProc(DFWINDOW, DFMESSAGE, PARAM, PARAM); -int SystemMenuProc(DFWINDOW, DFMESSAGE, PARAM, PARAM); -int HelpBoxProc(DFWINDOW, DFMESSAGE, PARAM, PARAM); -int MessageBoxProc(DFWINDOW, DFMESSAGE, PARAM, PARAM); -int CancelBoxProc(DFWINDOW, DFMESSAGE, PARAM, PARAM); -int ErrorBoxProc(DFWINDOW, DFMESSAGE, PARAM, PARAM); -int YesNoBoxProc(DFWINDOW, DFMESSAGE, PARAM, PARAM); -int StatusBarProc(DFWINDOW, DFMESSAGE, PARAM, PARAM); -int WatchIconProc(DFWINDOW, DFMESSAGE, PARAM, PARAM); - -/* ------------- normal box prototypes ------------- */ -void SetStandardColor(DFWINDOW); -void SetReverseColor(DFWINDOW); -BOOL isAncestor(DFWINDOW, DFWINDOW); -#define HitControlBox(wnd, p1, p2) \ - (TestAttribute(wnd, CONTROLBOX) && \ - p1 == 2 && p2 == 0) -#define WndForeground(wnd) \ - (wnd->WindowColors [STD_COLOR] [FG]) -#define WndBackground(wnd) \ - (wnd->WindowColors [STD_COLOR] [BG]) -#define FrameForeground(wnd) \ - (wnd->WindowColors [FRAME_COLOR] [FG]) -#define FrameBackground(wnd) \ - (wnd->WindowColors [FRAME_COLOR] [BG]) -#define SelectForeground(wnd) \ - (wnd->WindowColors [SELECT_COLOR] [FG]) -#define SelectBackground(wnd) \ - (wnd->WindowColors [SELECT_COLOR] [BG]) -#define HighlightForeground(wnd) \ - (wnd->WindowColors [HILITE_COLOR] [FG]) -#define HighlightBackground(wnd) \ - (wnd->WindowColors [HILITE_COLOR] [BG]) -#define WindowClientColor(wnd, fg, bg) \ - WndForeground(wnd) = fg, WndBackground(wnd) = bg -#define WindowReverseColor(wnd, fg, bg) \ - SelectForeground(wnd) = fg, SelectBackground(wnd) = bg -#define WindowFrameColor(wnd, fg, bg) \ - FrameForeground(wnd) = fg, FrameBackground(wnd) = bg -#define WindowHighlightColor(wnd, fg, bg) \ - HighlightForeground(wnd) = fg, HighlightBackground(wnd) = bg -/* -------- text box prototypes ---------- */ -#define TextLine(wnd, sel) \ - (wnd->text + *((wnd->TextPointers) + sel)) -void WriteTextLine(DFWINDOW, DFRECT *, int, BOOL); -#define TextBlockMarked(wnd) ( wnd->BlkBegLine || \ - wnd->BlkEndLine || \ - wnd->BlkBegCol || \ - wnd->BlkEndCol) -void MarkTextBlock(DFWINDOW, int, int, int, int); -#define ClearTextBlock(wnd) wnd->BlkBegLine = wnd->BlkEndLine = \ - wnd->BlkBegCol = wnd->BlkEndCol = 0; -#define GetText(w) ((w)->text) -#define GetTextLines(w) ((w)->wlines) -void ClearTextPointers(DFWINDOW); -void BuildTextPointers(DFWINDOW); -int TextLineNumber(DFWINDOW, char *); -/* ------------ Clipboard prototypes ------------- */ -void CopyTextToClipboard(char *); -void CopyToClipboard(DFWINDOW); -#define PasteFromClipboard(wnd) PasteText(wnd,Clipboard,ClipboardLength) -BOOL PasteText(DFWINDOW, char *, unsigned); -void ClearClipboard(void); -/* --------- menu prototypes ---------- */ -int CopyCommand(unsigned char *, unsigned char *, int, int); -void PrepFileMenu(void *, struct Menu *); -void PrepEditMenu(void *, struct Menu *); -void PrepSearchMenu(void *, struct Menu *); -void PrepWindowMenu(void *, struct Menu *); -void BuildSystemMenu(DFWINDOW); -BOOL isActive(MBAR *, int); -char *GetCommandText(MBAR *, int); -BOOL isCascadedCommand(MBAR *,int); -void ActivateCommand(MBAR *,int); -void DeactivateCommand(MBAR *,int); -BOOL GetCommandToggle(MBAR *,int); -void SetCommandToggle(MBAR *,int); -void ClearCommandToggle(MBAR *,int); -void InvertCommandToggle(MBAR *,int); -int BarSelection(int); -/* ------------- list box prototypes -------------- */ -BOOL ItemSelected(DFWINDOW, int); -/* ------------- edit box prototypes ----------- */ -#define CurrChar (TextLine(wnd, wnd->CurrLine)+wnd->CurrCol) -#define WndCol (wnd->CurrCol-wnd->wleft) -#define isMultiLine(wnd) TestAttribute(wnd, MULTILINE) -void DfSearchText(DFWINDOW); -void DfReplaceText(DFWINDOW); -void DfSearchNext(DFWINDOW); -/* --------- message box prototypes -------- */ -DFWINDOW SliderBox(int, char *, char *); -BOOL InputBox(DFWINDOW, char *, char *, char *, int); -BOOL GenericMessage(DFWINDOW, char *, char *, int, - int (*)(struct window *, enum messages, PARAM, PARAM), - char *, char *, int, int, int); -#define DfTestErrorMessage(msg) \ - GenericMessage(NULL, "Error", msg, 2, ErrorBoxProc, \ - Ok, Cancel, ID_OK, ID_CANCEL, TRUE) -#define DfErrorMessage(msg) \ - GenericMessage(NULL, "Error", msg, 1, ErrorBoxProc, \ - Ok, NULL, ID_OK, 0, TRUE) -#define DfMessageBox(ttl, msg) \ - GenericMessage(NULL, ttl, msg, 1, MessageBoxProc, \ - Ok, NULL, ID_OK, 0, TRUE) -#define DfYesNoBox(msg) \ - GenericMessage(NULL, NULL, msg, 2, YesNoBoxProc, \ - Yes, No, ID_OK, ID_CANCEL, TRUE) -#define DfCancelBox(wnd, msg) \ - GenericMessage(wnd, "Wait...", msg, 1, CancelBoxProc, \ - Cancel, NULL, ID_CANCEL, 0, FALSE) -void CloseCancelBox(void); -DFWINDOW MomentaryMessage(char *); -int MsgHeight(char *); -int MsgWidth(char *); - -/* ------------- dialog box prototypes -------------- */ -BOOL DfDialogBox(DFWINDOW, DBOX *, BOOL, - int (*)(struct window *, enum messages, PARAM, PARAM)); -void ClearDialogBoxes(void); -BOOL OpenFileDialogBox(char *, char *); -BOOL SaveAsDialogBox(char *); -void GetDlgListText(DFWINDOW, char *, enum commands); -BOOL DfDlgDirList(DFWINDOW, char *, enum commands, - enum commands, unsigned); -BOOL RadioButtonSetting(DBOX *, enum commands); -void PushRadioButton(DBOX *, enum commands); -void PutItemText(DFWINDOW, enum commands, char *); -void PutComboListText(DFWINDOW, enum commands, char *); -void GetItemText(DFWINDOW, enum commands, char *, int); -char *GetDlgTextString(DBOX *, enum commands, DFCLASS); -void SetDlgTextString(DBOX *, enum commands, char *, DFCLASS); -BOOL CheckBoxSetting(DBOX *, enum commands); -CTLWINDOW *FindCommand(DBOX *, enum commands, int); -DFWINDOW ControlWindow(DBOX *, enum commands); -void SetScrollBars(DFWINDOW); -void SetRadioButton(DBOX *, CTLWINDOW *); -void ControlSetting(DBOX *, enum commands, int, int); -void SetFocusCursor(DFWINDOW); - -#define GetControl(wnd) (wnd->ct) -#define GetDlgText(db, cmd) GetDlgTextString(db, cmd, TEXT) -#define GetDlgTextBox(db, cmd) GetDlgTextString(db, cmd, TEXTBOX) -#define GetEditBoxText(db, cmd) GetDlgTextString(db, cmd, EDITBOX) -#define GetComboBoxText(db, cmd) GetDlgTextString(db, cmd, COMBOBOX) -#define SetDlgText(db, cmd, s) SetDlgTextString(db, cmd, s, TEXT) -#define SetDlgTextBox(db, cmd, s) SetDlgTextString(db, cmd, s, TEXTBOX) -#define SetEditBoxText(db, cmd, s) SetDlgTextString(db, cmd, s, EDITBOX) -#define SetComboBoxText(db, cmd, s) SetDlgTextString(db, cmd, s, COMBOBOX) -#define SetDlgTitle(db, ttl) ((db)->dwnd.title = ttl) -#define SetCheckBox(db, cmd) ControlSetting(db, cmd, CHECKBOX, ON) -#define ClearCheckBox(db, cmd) ControlSetting(db, cmd, CHECKBOX, OFF) -#define EnableButton(db, cmd) ControlSetting(db, cmd, BUTTON, ON) -#define DisableButton(db, cmd) ControlSetting(db, cmd, BUTTON, OFF) - -/* ---- types of vectors that can be in a picture box ------- */ -enum VectTypes {VECTOR, SOLIDBAR, HEAVYBAR, CROSSBAR, LIGHTBAR}; - -/* ------------- picture box prototypes ------------- */ -void DrawVector(DFWINDOW, int, int, int, int); -void DrawBox(DFWINDOW, int, int, int, int); -void DrawBar(DFWINDOW, enum VectTypes, int, int, int, int); -DFWINDOW WatchIcon(void); - -/* ------------- help box prototypes ------------- */ -void LoadHelpFile(void); -void UnLoadHelpFile(void); -BOOL DisplayHelp(DFWINDOW, char *); - -extern char *ClassNames[]; - -void BuildFileName(char *, char *); - -#endif diff --git a/reactos/include/dflat32/dflatmsg.h b/reactos/include/dflat32/dflatmsg.h deleted file mode 100644 index cfca23e4b1c..00000000000 --- a/reactos/include/dflat32/dflatmsg.h +++ /dev/null @@ -1,100 +0,0 @@ -/* ----------- dflatmsg.h ------------ */ - -/* - * message foundation file - * make message changes here - * other source files will adapt - */ - -/* -------------- process communication messages ----------- */ -DFlatMsg(DFM_START) /* start message processing */ -DFlatMsg(DFM_STOP) /* stop message processing */ -DFlatMsg(DFM_COMMAND) /* send a command to a window */ -/* -------------- window management messages --------------- */ -DFlatMsg(CREATE_WINDOW) /* create a window */ -DFlatMsg(SHOW_WINDOW) /* show a window */ -DFlatMsg(DFM_HIDE_WINDOW) /* hide a window */ -DFlatMsg(CLOSE_WINDOW) /* delete a window */ -DFlatMsg(SETFOCUS) /* set and clear the focus */ -DFlatMsg(PAINT) /* paint the window's data space*/ -DFlatMsg(BORDER) /* paint the window's border */ -DFlatMsg(TITLE) /* display the window's title */ -DFlatMsg(MOVE) /* move the window */ -DFlatMsg(DFM_SIZE) /* change the window's size */ -#ifdef INCLUDE_MAXIMIZE -DFlatMsg(MAXIMIZE) /* maximize the window */ -#endif -#ifdef INCLUDE_MINIMIZE -DFlatMsg(MINIMIZE) /* minimize the window */ -#endif -DFlatMsg(RESTORE) /* restore the window */ -DFlatMsg(INSIDE_WINDOW) /* test x/y inside a window */ -/* ---------------- clock messages ------------------------- */ -DFlatMsg(CLOCKTICK) /* the clock ticked */ -DFlatMsg(CAPTURE_CLOCK) /* capture clock into a window */ -DFlatMsg(RELEASE_CLOCK) /* release clock to the system */ -/* -------------- keyboard and screen messages ------------- */ -DFlatMsg(KEYBOARD) /* key was pressed */ -DFlatMsg(CAPTURE_KEYBOARD) /* capture keyboard into a window */ -DFlatMsg(RELEASE_KEYBOARD) /* release keyboard to system */ -DFlatMsg(KEYBOARD_CURSOR) /* position the keyboard cursor */ -DFlatMsg(CURRENT_KEYBOARD_CURSOR) /*read the cursor position */ -DFlatMsg(HIDE_CURSOR) /* hide the keyboard cursor */ -DFlatMsg(SHOW_CURSOR) /* display the keyboard cursor */ -DFlatMsg(SAVE_CURSOR) /* save the cursor's configuration*/ -DFlatMsg(RESTORE_CURSOR) /* restore the saved cursor */ -DFlatMsg(SHIFT_CHANGED) /* the shift status changed */ -DFlatMsg(WAITKEYBOARD) /* waits for a key to be released */ - -/* ---------------- mouse messages ------------------------- */ -DFlatMsg(MOUSE_TRAVEL) /* set the mouse travel */ -DFlatMsg(RIGHT_BUTTON) /* right button pressed */ -DFlatMsg(LEFT_BUTTON) /* left button pressed */ -DFlatMsg(DFM_DOUBLE_CLICK) /* left button double-clicked */ -DFlatMsg(DFM_MOUSE_MOVED) /* mouse changed position */ -DFlatMsg(DFM_BUTTON_RELEASED) /* mouse button released */ -DFlatMsg(WAITMOUSE) /* wait until button released */ -DFlatMsg(TESTMOUSE) /* test any mouse button pressed*/ -DFlatMsg(CAPTURE_MOUSE) /* capture mouse into a window */ -DFlatMsg(RELEASE_MOUSE) /* release the mouse to system */ - -/* ---------------- text box messages ---------------------- */ -DFlatMsg(ADDTEXT) /* append text to the text box */ -DFlatMsg(INSERTTEXT) /* insert line of text */ -DFlatMsg(DELETETEXT) /* delete line of text */ -DFlatMsg(CLEARTEXT) /* clear the edit box */ -DFlatMsg(SETTEXT) /* copy text to text buffer */ -DFlatMsg(SCROLL) /* vertical line scroll */ -DFlatMsg(HORIZSCROLL) /* horizontal column scroll */ -DFlatMsg(SCROLLPAGE) /* vertical page scroll */ -DFlatMsg(HORIZPAGE) /* horizontal page scroll */ -DFlatMsg(SCROLLDOC) /* scroll to beginning/end */ -/* ---------------- edit box messages ---------------------- */ -DFlatMsg(GETTEXT) /* get text from an edit box */ -DFlatMsg(SETTEXTLENGTH) /* set maximum text length */ -/* ---------------- menubar messages ----------------------- */ -DFlatMsg(BUILDMENU) /* build the menu display */ -DFlatMsg(MB_SELECTION) /* menubar selection */ -/* ---------------- popdown messages ----------------------- */ -DFlatMsg(BUILD_SELECTIONS) /* build the menu display */ -DFlatMsg(CLOSE_POPDOWN) /* tell parent popdown is closing */ -/* ---------------- list box messages ---------------------- */ -DFlatMsg(LB_SELECTION) /* sent to parent on selection */ -DFlatMsg(LB_CHOOSE) /* sent when user chooses */ -DFlatMsg(LB_CURRENTSELECTION)/* return the current selection */ -DFlatMsg(DFM_LB_GETTEXT) /* return the text of selection */ -DFlatMsg(LB_SETSELECTION) /* sets the listbox selection */ -/* ---------------- dialog box messages -------------------- */ -DFlatMsg(INITIATE_DIALOG) /* begin a dialog */ -DFlatMsg(ENTERFOCUS) /* tell DB control got focus */ -DFlatMsg(LEAVEFOCUS) /* tell DB control lost focus */ -DFlatMsg(ENDDIALOG) /* end a dialog */ -/* ---------------- help box messages ---------------------- */ -DFlatMsg(DISPLAY_HELP) -/* --------------- application window messages ------------- */ -DFlatMsg(ADDSTATUS) -/* --------------- picture box messages -------------------- */ -DFlatMsg(DRAWVECTOR) -DFlatMsg(DRAWBOX) -DFlatMsg(DRAWBAR) - diff --git a/reactos/include/dflat32/dialbox.h b/reactos/include/dflat32/dialbox.h deleted file mode 100644 index a32119d1d2a..00000000000 --- a/reactos/include/dflat32/dialbox.h +++ /dev/null @@ -1,55 +0,0 @@ -/* ----------------- dialbox.h ---------------- */ - -#ifndef DIALOG_H -#define DIALOG_H - -#include - -#define MAXCONTROLS 30 -#define MAXRADIOS 20 - -#define OFF FALSE -#define ON TRUE - -/* -------- dialog box and control window structure ------- */ -typedef struct { - char *title; /* window title */ - int x, y; /* relative coordinates */ - int h, w; /* size */ -} DIALOGWINDOW; - -/* ------ one of these for each control window ------- */ -typedef struct { - DIALOGWINDOW dwnd; - DFCLASS class; /* LISTBOX, BUTTON, etc */ - char *itext; /* initialized text */ - int command; /* command code */ - char *help; /* help mnemonic */ - BOOL isetting; /* initially ON or OFF */ - BOOL setting; /* ON or OFF */ - void *wnd; /* window handle */ -} CTLWINDOW; - -/* --------- one of these for each dialog box ------- */ -typedef struct { - char *HelpName; - DIALOGWINDOW dwnd; - CTLWINDOW ctl[MAXCONTROLS+1]; -} DBOX; - -/* -------- macros for dialog box resource compile -------- */ -#define DIALOGBOX(db) DBOX db={ #db, -#define DB_TITLE(ttl,x,y,h,w) {ttl,x,y,h,w},{ -#define CONTROL(ty,tx,x,y,h,w,c) \ - {{NULL,x,y,h,w},ty, \ - (ty==EDITBOX||ty==COMBOBOX?NULL:tx), \ - c,#c,(ty==BUTTON?ON:OFF),OFF,NULL}, - -#define ENDDB {{NULL}} }}; - -#define Cancel " Cancel " -#define Ok " OK " -#define Yes " Yes " -#define No " No " - -#endif diff --git a/reactos/include/dflat32/htree.h b/reactos/include/dflat32/htree.h deleted file mode 100644 index db25e0a3039..00000000000 --- a/reactos/include/dflat32/htree.h +++ /dev/null @@ -1,31 +0,0 @@ -/* ------------------- htree.h -------------------- */ - -#ifndef HTREE_H -#define HTREE_H - -typedef unsigned int BYTECOUNTER; - -/* ---- Huffman tree structure for building ---- */ -struct htree { - BYTECOUNTER cnt; /* character frequency */ - int parent; /* offset to parent node */ - int right; /* offset to right child node */ - int left; /* offset to left child node */ -}; - -/* ---- Huffman tree structure in compressed file ---- */ -struct htr { - int right; /* offset to right child node */ - int left; /* offset to left child node */ -}; - -extern struct htr *HelpTree; - -void buildtree(void); -FILE *OpenHelpFile(void); -void HelpFilePosition(long *, int *); -void *GetHelpLine(char *); -void SeekHelpLine(long, int); - -#endif - diff --git a/reactos/include/dflat32/keys.h b/reactos/include/dflat32/keys.h deleted file mode 100644 index 51707d889b6..00000000000 --- a/reactos/include/dflat32/keys.h +++ /dev/null @@ -1,119 +0,0 @@ -/* ----------- keys.h ------------ */ - -#ifndef KEYS_H -#define KEYS_H - -#define OFFSET 0x1000 - -#define RUBOUT 8 /* BACHSPACE KEY */ -#define BELL 7 -#define ESC 27 -#define ALT_BS (197+OFFSET) -#define ALT_DEL (184+OFFSET) -#define SHIFT_DEL (198+OFFSET) -#define CTRL_INS (186+OFFSET) -#define SHIFT_INS (185+OFFSET) -#define SHIFT_F8 (219+OFFSET) -#define F1 (187+OFFSET) -#define F2 (188+OFFSET) -#define F3 (189+OFFSET) -#define F4 (190+OFFSET) -#define F5 (191+OFFSET) -#define F6 (192+OFFSET) -#define F7 (193+OFFSET) -#define F8 (194+OFFSET) -#define F9 (195+OFFSET) -#define F10 (196+OFFSET) -#define CTRL_F1 (222+OFFSET) -#define CTRL_F2 (223+OFFSET) -#define CTRL_F3 (224+OFFSET) -#define CTRL_F4 (225+OFFSET) -#define CTRL_F5 (226+OFFSET) -#define CTRL_F6 (227+OFFSET) -#define CTRL_F7 (228+OFFSET) -#define CTRL_F8 (229+OFFSET) -#define CTRL_F9 (230+OFFSET) -#define CTRL_F10 (231+OFFSET) -#define ALT_F1 (232+OFFSET) -#define ALT_F2 (233+OFFSET) -#define ALT_F3 (234+OFFSET) -#define ALT_F4 (235+OFFSET) -#define ALT_F5 (236+OFFSET) -#define ALT_F6 (237+OFFSET) -#define ALT_F7 (238+OFFSET) -#define ALT_F8 (239+OFFSET) -#define ALT_F9 (240+OFFSET) -#define ALT_F10 (241+OFFSET) -#define HOME (199+OFFSET) -#define UP (200+OFFSET) -#define PGUP (201+OFFSET) -#define BS (203+OFFSET) /* CURSOR LEFT KEY */ -#define FWD (205+OFFSET) /* CURSOR RIGHT KEY */ -#define END (207+OFFSET) -#define DN (208+OFFSET) -#define PGDN (209+OFFSET) -#define INS (210+OFFSET) -#define DEL (211+OFFSET) -#define CTRL_HOME (247+OFFSET) -#define CTRL_PGUP (132+OFFSET) -#define CTRL_BS (243+OFFSET) -#define CTRL_FIVE (143+OFFSET) -#define CTRL_FWD (244+OFFSET) -#define CTRL_END (245+OFFSET) -#define CTRL_PGDN (246+OFFSET) -#define SHIFT_HT (143+OFFSET) -#define ALT_A (158+OFFSET) -#define ALT_B (176+OFFSET) -#define ALT_C (174+OFFSET) -#define ALT_D (160+OFFSET) -#define ALT_E (146+OFFSET) -#define ALT_F (161+OFFSET) -#define ALT_G (162+OFFSET) -#define ALT_H (163+OFFSET) -#define ALT_I (151+OFFSET) -#define ALT_J (164+OFFSET) -#define ALT_K (165+OFFSET) -#define ALT_L (166+OFFSET) -#define ALT_M (178+OFFSET) -#define ALT_N (177+OFFSET) -#define ALT_O (152+OFFSET) -#define ALT_P (153+OFFSET) -#define ALT_Q (144+OFFSET) -#define ALT_R (147+OFFSET) -#define ALT_S (159+OFFSET) -#define ALT_T (148+OFFSET) -#define ALT_U (150+OFFSET) -#define ALT_V (175+OFFSET) -#define ALT_W (145+OFFSET) -#define ALT_X (173+OFFSET) -#define ALT_Y (149+OFFSET) -#define ALT_Z (172+OFFSET) -#define ALT_1 (0xf8+OFFSET) -#define ALT_2 (0xf9+OFFSET) -#define ALT_3 (0xfa+OFFSET) -#define ALT_4 (0xfb+OFFSET) -#define ALT_5 (0xfc+OFFSET) -#define ALT_6 (0xfd+OFFSET) -#define ALT_7 (0xfe+OFFSET) -#define ALT_8 (0xff+OFFSET) -#define ALT_9 (0x80+OFFSET) -#define ALT_0 (0x81+OFFSET) -#define ALT_HYPHEN (130+OFFSET) - -#define RIGHTSHIFT 0x01 -#define LEFTSHIFT 0x02 -#define CTRLKEY 0x04 -#define ALTKEY 0x08 -#define SCROLLLOCK 0x10 -#define NUMLOCK 0x20 -#define CAPSLOCK 0x40 -#define INSERTKEY 0x80 - -struct keys { - int keycode; - char *keylabel; -}; -extern struct keys keys[]; - -#endif - diff --git a/reactos/include/dflat32/menu.h b/reactos/include/dflat32/menu.h deleted file mode 100644 index 28c509ac02c..00000000000 --- a/reactos/include/dflat32/menu.h +++ /dev/null @@ -1,63 +0,0 @@ -/* ------------ menu.h ------------- */ - -#ifndef MENU_H -#define MENU_H - -#define MAXPULLDOWNS 15 -#define MAXSELECTIONS 20 -#define MAXCASCADES 3 /* nesting level of cascaded menus */ - -/* ----------- popdown menu selection structure - one for each selection on a popdown menu --------- */ -struct PopDown { - unsigned char *SelectionTitle; /* title of the selection */ - int ActionId; /* the command executed */ - int Accelerator; /* the accelerator key */ - int Attrib; /* INACTIVE | CHECKED | TOGGLE | CASCADED*/ - char *help; /* Help mnemonic */ -}; - -/* ----------- popdown menu structure - one for each popdown menu on the menu bar -------- */ -typedef struct Menu { - char *Title; /* title on the menu bar */ - void (*PrepMenu)(void *, struct Menu *); /* function */ - char *StatusText; /* text for the status bar */ - int CascadeId; /* command id of cascading selection */ - int Selection; /* most recent selection */ - struct PopDown Selections[MAXSELECTIONS+1]; -} MENU; - -/* ----- one for each menu bar ----- */ -typedef struct MenuBar { - int ActiveSelection; - MENU PullDown[MAXPULLDOWNS+1]; -} MBAR; - -/* --------- macros to define a menu bar with - popdowns and selections ------------- */ -#define SEPCHAR "\xc4" -#define DEFMENU(m) MBAR m = {-1,{ -#define POPDOWN(ttl,func,stat) {ttl,func,stat,-1,0,{ -#define CASCADED_POPDOWN(id,func) {NULL,func,NULL,id,0,{ -#define SELECTION(stxt,acc,id,attr) {stxt,acc,id,attr,#acc}, -#define SEPARATOR {SEPCHAR}, -#define ENDPOPDOWN {NULL}}}, -#define ENDMENU {(void *)-1} }}; - -/* -------- menu selection attributes -------- */ -#define INACTIVE 1 -#define CHECKED 2 -#define TOGGLE 4 -#define CASCADED 8 - -/* --------- the standard menus ---------- */ -extern MBAR MainMenu; -extern MBAR SystemMenu; -extern MBAR *ActiveMenuBar; - -int MenuHeight(struct PopDown *); -int MenuWidth(struct PopDown *); - -#endif - diff --git a/reactos/include/dflat32/rect.h b/reactos/include/dflat32/rect.h deleted file mode 100644 index c4497e13e99..00000000000 --- a/reactos/include/dflat32/rect.h +++ /dev/null @@ -1,24 +0,0 @@ -/* ----------- rect.h ------------ */ -#ifndef RECT_H -#define RECT_H - -typedef struct { - int lf,tp,rt,bt; -} DFRECT; -#define within(p,v1,v2) ((p)>=(v1)&&(p)<=(v2)) -#define RectTop(r) (r.tp) -#define RectBottom(r) (r.bt) -#define RectLeft(r) (r.lf) -#define RectRight(r) (r.rt) -#define InsideRect(x,y,r) (within((x),RectLeft(r),RectRight(r))\ - && \ - within((y),RectTop(r),RectBottom(r))) -#define ValidRect(r) (RectRight(r) || RectLeft(r) || \ - RectTop(r) || RectBottom(r)) -#define RectWidth(r) (RectRight(r)-RectLeft(r)+1) -#define RectHeight(r) (RectBottom(r)-RectTop(r)+1) -DFRECT subRectangle(DFRECT, DFRECT); -DFRECT ClientRect(void *); -DFRECT RelativeWindowRect(void *, DFRECT); -DFRECT ClipRectangle(void *, DFRECT); -#endif diff --git a/reactos/include/dflat32/system.h b/reactos/include/dflat32/system.h deleted file mode 100644 index 5244db73b5b..00000000000 --- a/reactos/include/dflat32/system.h +++ /dev/null @@ -1,99 +0,0 @@ -/* --------------- system.h -------------- */ -#ifndef SYSTEM_H -#define SYSTEM_H - -/* #if MSC | WATCOM */ -#include -/* #else */ -/* #include */ -/* #endif */ - -#define swap(a,b){int x=a;a=b;b=x;} -/* ------- platform-dependent values ------ */ -#define KEYBOARDPORT 0x60 -#define FREQUENCY 100 -#define COUNT (1193280L / FREQUENCY) -#define ZEROFLAG 0x40 -#define MAXSAVES 50 - -/* #define SCREENWIDTH (80) */ -/* #define SCREENHEIGHT (25) */ - -HANDLE hInput; -HANDLE hOutput; - -SHORT sScreenHeight; -SHORT sScreenWidth; - - -/* ---------- keyboard prototypes -------- */ -int AltConvert(int); -void GetKey(PINPUT_RECORD); -int getshift(void); -BOOL keyhit(void); -void beep(void); - -/* ---------- cursor prototypes -------- */ -void curr_cursor(int *x, int *y); -void cursor(int x, int y); -void hidecursor(void); -void unhidecursor(void); -void savecursor(void); -void restorecursor(void); -void normalcursor(void); -void set_cursor_size(unsigned t); -void videomode(void); -void SwapCursorStack(void); - -/* ------------ timer macros -------------- */ -#define timed_out(timer) (timer==0) -#define set_timer(timer, secs) timer=(secs)*182/10+1 -#define disable_timer(timer) timer = -1 -#define timer_running(timer) (timer > 0) -#define countdown(timer) --timer -#define timer_disabled(timer) (timer == -1) - - -#ifndef TURBOC -#ifndef BCPP -/* ============= Color Macros ============ */ -#define BLACK 0 -#define BLUE 1 -#define GREEN 2 -#define CYAN 3 -#define RED 4 -#define MAGENTA 5 -#define BROWN 6 -#define LIGHTGRAY 7 -#define DARKGRAY 8 -#define LIGHTBLUE 9 -#define LIGHTGREEN 10 -#define LIGHTCYAN 11 -#define LIGHTRED 12 -#define LIGHTMAGENTA 13 -#define YELLOW 14 -#define WHITE 15 -#define keyhit kbhit -#endif -#endif - -typedef enum messages { -#ifdef WATCOM - WATCOMFIX1 = -1, -#endif - #undef DFlatMsg - #define DFlatMsg(m) m, - #include "dflatmsg.h" - MESSAGECOUNT -} DFMESSAGE; - -typedef enum window_class { -#ifdef WATCOM - WATCOMFIX2 = -1, -#endif - #define ClassDef(c,b,p,a) c, - #include "classes.h" - CLASSCOUNT -} DFCLASS; - -#endif diff --git a/reactos/include/dflat32/video.h b/reactos/include/dflat32/video.h deleted file mode 100644 index cc8996c970f..00000000000 --- a/reactos/include/dflat32/video.h +++ /dev/null @@ -1,18 +0,0 @@ -/* ---------------- video.h ----------------- */ - -#ifndef VIDEO_H -#define VIDEO_H - -#include "rect.h" - -void GetVideo(DFRECT, PCHAR_INFO); -void StoreVideo(DFRECT, PCHAR_INFO); -void wputch(DFWINDOW, int, int, int); -char GetVideoChar(int, int); -void PutVideoChar(int, int, int); -void wputs(DFWINDOW, void *, int, int); -void scroll_window(DFWINDOW, DFRECT, int); - -#define videochar(x,y) (GetVideoChar(x,y) & 0xFF) - -#endif diff --git a/reactos/include/napi/teb.h b/reactos/include/napi/teb.h index 7ea25db9c54..ac522894e8d 100644 --- a/reactos/include/napi/teb.h +++ b/reactos/include/napi/teb.h @@ -3,6 +3,7 @@ #define __INCLUDE_INTERNAL_TEB #include +#include #ifdef __USE_W32API #include @@ -232,6 +233,8 @@ typedef struct _TEB PVOID WineDebugInfo; /* Needed for WINE DLL's */ } TEB, *PTEB; +#if (!defined(__USE_W32API) || __W32API_MAJOR_VERSION < 2 || __W32API_MINOR_VERSION < 5) + /* FIXME: at least NtCurrentTeb should be defined in winnt.h */ #ifndef NtCurrentTeb @@ -288,6 +291,8 @@ unsigned __gregister_get(unsigned const regnum); #endif +#endif /* !defined(__USE_W32API) || __W32API_MAJOR_VERSION < 2 || __W32API_MINOR_VERSION < 5 */ + #ifdef _M_IX86 static inline struct _PEB * NtCurrentPeb(void) diff --git a/reactos/include/nspapi.h b/reactos/include/nspapi.h new file mode 100644 index 00000000000..463b1390255 --- /dev/null +++ b/reactos/include/nspapi.h @@ -0,0 +1,126 @@ +#ifndef _NSPAPI_H +#define _NSPAPI_H +#if __GNUC__ >=3 +#pragma GCC system_header +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +#define NS_ALL 0 + +#define NS_SAP 1 +#define NS_NDS 2 +#define NS_PEER_BROWSE 3 + +#define NS_TCPIP_LOCAL 10 +#define NS_TCPIP_HOSTS 11 +#define NS_DNS 12 +#define NS_NETBT 13 +#define NS_WINS 14 + +#define NS_NBP 20 + +#define NS_MS 30 +#define NS_STDA 31 +#define NS_NTDS 32 + +#define NS_X500 40 +#define NS_NIS 41 +#define NS_NISPLUS 42 + +#define NS_WRQ 50 + +#define SERVICE_REGISTER 1 +#define SERVICE_DEREGISTER 2 +#define SERVICE_FLUSH 3 +#define SERVICE_FLAG_HARD 0x00000002 + +#ifndef RC_INVOKED + +#if defined (_WINSOCK_H) || defined (_WINSOCK2_H) /* needed for LPSOCKADDR */ +#ifndef __CSADDR_T_DEFINED /* also in winsock2.h, but not in winsock.h */ +#define __CSADDR_T_DEFINED +typedef struct _SOCKET_ADDRESS { + LPSOCKADDR lpSockaddr; + INT iSockaddrLength; +} SOCKET_ADDRESS,*PSOCKET_ADDRESS,*LPSOCKET_ADDRESS; +typedef struct _CSADDR_INFO { + SOCKET_ADDRESS LocalAddr; + SOCKET_ADDRESS RemoteAddr; + INT iSocketType; + INT iProtocol; +} CSADDR_INFO,*PCSADDR_INFO,*LPCSADDR_INFO; +#endif +#endif + +#ifndef __BLOB_T_DEFINED /* also in wtypes.h and winsock2.h */ +#define __BLOB_T_DEFINED +typedef struct _BLOB { + ULONG cbSize; + BYTE *pBlobData; +} BLOB,*PBLOB,*LPBLOB; +#endif + +typedef struct _SERVICE_ADDRESS { + DWORD dwAddressType; + DWORD dwAddressFlags; + DWORD dwAddressLength; + DWORD dwPrincipalLength; + BYTE *lpAddress; + BYTE *lpPrincipal; +} SERVICE_ADDRESS; +typedef struct _SERVICE_ADDRESSES { + DWORD dwAddressCount; + SERVICE_ADDRESS Addresses[1]; +} SERVICE_ADDRESSES, *PSERVICE_ADDRESSES, *LPSERVICE_ADDRESSES; +typedef struct _SERVICE_INFOA { + LPGUID lpServiceType; + LPSTR lpServiceName; + LPSTR lpComment; + LPSTR lpLocale; + DWORD dwDisplayHint; + DWORD dwVersion; + DWORD dwTime; + LPSTR lpMachineName; + LPSERVICE_ADDRESSES lpServiceAddress; + BLOB ServiceSpecificInfo; +} SERVICE_INFOA, *LPSERVICE_INFOA; +typedef struct _SERVICE_INFOW { + LPGUID lpServiceType; + LPWSTR lpServiceName; + LPWSTR lpComment; + LPWSTR lpLocale; + DWORD dwDisplayHint; + DWORD dwVersion; + DWORD dwTime; + LPWSTR lpMachineName; + LPSERVICE_ADDRESSES lpServiceAddress; + BLOB ServiceSpecificInfo; +} SERVICE_INFOW, *LPSERVICE_INFOW; + +typedef void *LPSERVICE_ASYNC_INFO; +INT WINAPI SetServiceA(DWORD,DWORD,DWORD,LPSERVICE_INFOA,LPSERVICE_ASYNC_INFO,LPDWORD); +INT WINAPI SetServiceW(DWORD,DWORD,DWORD,LPSERVICE_INFOW,LPSERVICE_ASYNC_INFO,LPDWORD); +INT WINAPI GetAddressByNameA(DWORD,LPGUID,LPSTR,LPINT,DWORD,LPSERVICE_ASYNC_INFO,LPVOID,LPDWORD,LPSTR,LPDWORD); +INT WINAPI GetAddressByNameW(DWORD,LPGUID,LPWSTR,LPINT,DWORD,LPSERVICE_ASYNC_INFO,LPVOID,LPDWORD,LPWSTR,LPDWORD); + +#ifdef UNICODE +typedef SERVICE_INFOW SERVICE_INFO, *LPSERVICE_INFO; +#define _SERVICE_INFO SERVICE_INFOW +#define SetService SetServiceW +#define GetAddressByName GetAddressByNameW +#else +typedef SERVICE_INFOA SERVICE_INFO, *LPSERVICE_INFO; +#define _SERVICE_INFO SERVICE_INFOA +#define SetService SetServiceA +#define GetAddressByName GetAddressByNameA +#endif + +#endif /* RC_INVOKED */ + +#ifdef __cplusplus +} +#endif +#endif /* _NSPAPI_H */ diff --git a/reactos/include/ntos.h b/reactos/include/ntos.h index f461f9ab571..12fb30e3520 100644 --- a/reactos/include/ntos.h +++ b/reactos/include/ntos.h @@ -1,6 +1,6 @@ #ifndef _NTOS_H #define _NTOS_H -/* $Id: ntos.h,v 1.18 2004/01/06 16:05:47 ekohl Exp $ */ +/* $Id: ntos.h,v 1.19 2004/01/11 20:46:05 navaraf Exp $ */ #if defined(NTOS_MODE_USER) /* @@ -9,6 +9,7 @@ */ #include #include +#include #include "ntos/types.h" #include "ntos/cdrom.h" #include "ntos/console.h" diff --git a/reactos/include/ntsecapi.h b/reactos/include/ntsecapi.h index 1dfb7b23be6..eccd0ccd379 100644 --- a/reactos/include/ntsecapi.h +++ b/reactos/include/ntsecapi.h @@ -16,6 +16,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#ifdef __USE_W32API +#include_next +#else + #ifndef __WINE_NTSECAPI_H #define __WINE_NTSECAPI_H @@ -570,3 +574,5 @@ HANDLE NotificationEventHandle #endif /* defined(__cplusplus) */ #endif /* !defined(__WINE_NTSECAPI_H) */ + +#endif /* __USE_W32API */ diff --git a/reactos/include/services/services.h b/reactos/include/services/services.h deleted file mode 100644 index b8c59c569e3..00000000000 --- a/reactos/include/services/services.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifndef __INCLUDE_SERVICES_SERVICES_H -#define __INCLUDE_SERVICES_SERVICES_H - - -#endif /* __INCLUDE_SERVICES_SERVICES_H */ diff --git a/reactos/include/services/services.idl b/reactos/include/services/services.idl deleted file mode 100644 index f2d1fc4b8ac..00000000000 --- a/reactos/include/services/services.idl +++ /dev/null @@ -1,16 +0,0 @@ -[ -uuid(?), -version(1.0), -pointer_default(?) -] -interface SCM -{ - handle_t SvcOpenSCManagerW([in, string] wchar_t* lpMachineName, - [in, string] wchar_t* lpDatabaseName, - [in] unsigned int dwDesiredAccess); - handle_t SvcOpenSCManagerA([in, string] char* lpMachineName, - [in, string] char* lpDatabaseName, - [in] unsigned int dwDesiredAccess); - bool SvcClose([in] handle_t hSCObject); -} - diff --git a/reactos/include/wincrypt.h b/reactos/include/wincrypt.h deleted file mode 100644 index d25d6634f6a..00000000000 --- a/reactos/include/wincrypt.h +++ /dev/null @@ -1,430 +0,0 @@ -/* - * Copyright (C) 2002 Travis Michielsen - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef __WINE_WINCRYPT_H -#define __WINE_WINCRYPT_H - -/* some typedefs for function parameters */ -typedef unsigned int ALG_ID; -typedef unsigned long HCRYPTPROV; -typedef unsigned long HCRYPTKEY; -typedef unsigned long HCRYPTHASH; -typedef void *HCERTSTORE; - -/* CSP Structs */ - -typedef struct _CRYPTOAPI_BLOB { - DWORD cbData; - BYTE* pbData; -} CRYPT_INTEGER_BLOB, *PCRYPT_INTEGER_BLOB, - CRYPT_UINT_BLOB, *PCRYPT_UINT_BLOB, - CRYPT_OBJID_BLOB, *PCRYPT_OBJID_BLOB, - CERT_NAME_BLOB, *PCERT_NAME_BLOB, - CERT_RDN_VALUE_BLOB, *PCERT_RDN_VALUE_BLOB, - CERT_BLOB, *PCERT_BLOB, - CRL_BLOB, *PCRL_BLOB, - DATA_BLOB, *PDATA_BLOB, - CRYPT_DATA_BLOB, *PCRYPT_DATA_BLOB, - CRYPT_HASH_BLOB, *PCRYPT_HASH_BLOB, - CRYPT_DIGEST_BLOB, *PCRYPT_DIGEST_BLOB, - CRYPT_DER_BLOB, *PCRYPT_DER_BLOB, - CRYPT_ATTR_BLOB, *PCRYPT_ATTR_BLOB; - -typedef struct _CRYPT_ALGORITHM_IDENTIFIER { - LPSTR pszObjId; - CRYPT_OBJID_BLOB Parameters; -} CRYPT_ALGORITHM_IDENTIFIER, *PCRYPT_ALGORITHM_IDENTIFIER; - -typedef struct _CRYPT_ATTRIBUTE_TYPE_VALUE { - LPSTR pszObjId; - CRYPT_OBJID_BLOB Value; -} CRYPT_ATTRIBUTE_TYPE_VALUE, *PCRYPT_ATTRIBUTE_TYPE_VALUE; - -typedef struct _PUBLICKEYSTRUC { - BYTE bType; - BYTE bVersion; - WORD reserved; - ALG_ID aiKeyAlg; -} BLOBHEADER, PUBLICKEYSTRUC; - -typedef struct _CRYPT_BIT_BLOB { - DWORD cbData; - BYTE *pbData; - DWORD cUnusedBits; -} CRYPT_BIT_BLOB, *PCRYPT_BIT_BLOB; - -typedef struct _CERT_PUBLIC_KEY_INFO { - CRYPT_ALGORITHM_IDENTIFIER Algorithm; - CRYPT_BIT_BLOB PublicKey; -} CERT_PUBLIC_KEY_INFO, *PCERT_PUBLIC_KEY_INFO; - -typedef struct _CERT_EXTENSION { - LPSTR pszObjId; - WINBOOL fCritical; - CRYPT_OBJID_BLOB Value; -} CERT_EXTENSION, *PCERT_EXTENSION; - -typedef struct _CERT_INFO { - DWORD dwVersion; - CRYPT_INTEGER_BLOB SerialNumber; - CRYPT_ALGORITHM_IDENTIFIER SignatureAlgorithm; - CERT_NAME_BLOB Issuer; - FILETIME NotBefore; - FILETIME NotAfter; - CERT_NAME_BLOB Subject; - CERT_PUBLIC_KEY_INFO SubjectPublicKeyInfo; - CRYPT_BIT_BLOB IssuerUniqueId; - CRYPT_BIT_BLOB SubjectUniqueId; - DWORD cExtension; - PCERT_EXTENSION rgExtension; -} CERT_INFO, *PCERT_INFO; - -typedef struct _CERT_CONTEXT { - DWORD dwCertEncodingType; - BYTE *pbCertEncoded; - DWORD cbCertEncoded; - PCERT_INFO pCertInfo; - HCERTSTORE hCertStore; -} CERT_CONTEXT, *PCERT_CONTEXT; -typedef const CERT_CONTEXT *PCCERT_CONTEXT; - -typedef struct _VTableProvStruc { - DWORD Version; - FARPROC pFuncVerifyImage; - FARPROC pFuncReturnhWnd; - DWORD dwProvType; - BYTE *pbContextInfo; - DWORD cbContextInfo; - LPSTR pszProvName; -} VTableProvStruc, *PVTableProvStruc; - -/* Algorithm IDs */ - -#define GET_ALG_CLASS(x) (x & (7 << 13)) -#define GET_ALG_TYPE(x) (x & (15 << 9)) -#define GET_ALG_SID(x) (x & (511)) - -/* Algorithm Classes */ -#define ALG_CLASS_ANY (0) -#define ALG_CLASS_SIGNATURE (1 << 13) -#define ALG_CLASS_MSG_ENCRYPT (2 << 13) -#define ALG_CLASS_DATA_ENCRYPT (3 << 13) -#define ALG_CLASS_HASH (4 << 13) -#define ALG_CLASS_KEY_EXCHANGE (5 << 13) -/* Algorithm types */ -#define ALG_TYPE_ANY (0) -#define ALG_TYPE_DSS (1 << 9) -#define ALG_TYPE_RSA (2 << 9) -#define ALG_TYPE_BLOCK (3 << 9) -#define ALG_TYPE_STREAM (4 << 9) - -/* SIDs */ -#define ALG_SID_ANY (0) -/* RSA SIDs */ -#define ALG_SID_RSA_ANY 0 -#define ALG_SID_RSA_PKCS 1 -#define ALG_SID_RSA_MSATWORK 2 -#define ALG_SID_RSA_ENTRUST 3 -#define ALG_SID_RSA_PGP 4 -/* DSS SIDs */ -#define ALG_SID_DSS_ANY 0 -#define ALG_SID_DSS_PKCS 1 -#define ALG_SID_DSS_DMS 2 - -/* DES SIDs */ -#define ALG_SID_DES 1 -#define ALG_SID_3DES 3 -#define ALG_SID_DESX 4 -#define ALG_SID_IDEA 5 -#define ALG_SID_CAST 6 -#define ALG_SID_SAFERSK64 7 -#define ALD_SID_SAFERSK128 8 -/* RC2 SIDs */ -#define ALG_SID_RC4 1 -#define ALG_SID_RC2 2 -#define ALG_SID_SEAL 2 -/* Hash SIDs */ -#define ALG_SID_MD2 1 -#define ALG_SID_MD4 2 -#define ALG_SID_MD5 3 -#define ALG_SID_SHA 4 -#define ALG_SID_MAC 5 -#define ALG_SID_RIPEMD 6 -#define ALG_SID_RIPEMD160 7 -#define ALG_SID_SSL3SHAMD5 8 - -/* Algorithm Definitions */ -#define CALG_MD2 (ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_MD2) -#define CALG_MD4 (ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_MD4) -#define CALG_MD5 (ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_MD5) -#define CALG_SHA (ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_SHA) -#define CALG_MAC (ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_MAC) -#define CALG_RSA_SIGN (ALG_CLASS_SIGNATURE | ALG_TYPE_RSA | ALG_SID_RSA_ANY) -#define CALG_DSS_SIGN (ALG_CLASS_SIGNATURE | ALG_TYPE_DSS | ALG_SID_DSS_ANY) -#define CALG_RSA_KEYX (ALG_CLASS_KEY_EXCHANGE | ALG_TYPE_RSA | ALG_SID_RSA_ANY) -#define CALG_DES (ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_BLOCK | ALG_SID_DES) -#define CALG_RC2 (ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_BLOCK | ALG_SID_RC2) -#define CALG_RC4 (ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_STREAM | ALG_SID_RC4) -#define CALG_SEAL (ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_STREAM | ALG_SID_SEAL) - -/* Provider names */ -#define MS_DEF_PROV_A "Microsoft Base Cryptographic Provider v1.0" -#define MS_DEF_PROV_W L"Microsoft Base Cryptographic Provider v1.0" -#define MS_ENHANCED_PROV_A "Microsoft Enhanced Cryptographic Provider v1.0" -#define MS_ENHANCED_PROV_W L"Microsoft Enhanced Cryptographic Provider v1.0" -#define MS_STRONG_PROV_A "Microsoft Strong Cryptographic Provider" -#define MS_STRONG_PROV_W L"Microsoft Strong Cryptographic Provider" -#define MS_DEF_RSA_SIG_PROV_A "Microsoft RSA Signature Cryptographic Provider" -#define MS_DEF_RSA_SIG_PROV_W L"Microsoft RSA Signature Cryptographic Provider" -#define MS_DEF_RSA_SCHANNEL_PROV_A "Microsoft RSA SChannel Cryptographic Provider" -#define MS_DEF_RSA_SCHANNEL_PROV_W L"Microsoft RSA SChannel Cryptographic Provider" -#define MS_DEF_DSS_PROV_A "Microsoft Base DSS Cryptographic Provider" -#define MS_DEF_DSS_PROV_W L"Microsoft Base DSS Cryptographic Provider" -#define MS_DEF_DSS_DH_PROV_A "Microsoft Base DSS and Diffie-Hellman Cryptographic Provider" -#define MS_DEF_DSS_DH_PROV_W L"Microsoft Base DSS and Diffie-Hellman Cryptographic Provider" -#define MS_ENH_DSS_DH_PROV_A "Microsoft Enhanced DSS and Diffie-Hellman Cryptographic Provider" -#define MS_ENH_DSS_DH_PROV_W L"Microsoft Enhanced DSS and Diffie-Hellman Cryptographic Provider" -#define MS_DEF_DH_SCHANNEL_PROV_A "Microsoft DH SChannel Cryptographic Provider" -#define MS_DEF_DH_SCHANNEL_PROV_W L"Microsoft DH SChannel Cryptographic Provider" -#define MS_SCARD_PROV_A "Microsoft Base Smart Card Cryptographic Provider" -#define MS_SCARD_PROV_W L"Microsoft Base Smart Card Cryptographic Provider" - -/* Key Specs*/ -#define AT_KEYEXCHANGE 1 -#define AT_SIGNATURE 2 - -/* Provider Types */ -#define PROV_RSA_FULL 1 -#define PROV_RSA_SIG 2 -#define PROV_DSS 3 -#define PROV_FORTEZZA 4 -#define PROV_MS_EXCHANGE 5 -#define PROV_SSL 6 -#define PROV_RSA_SCHANNEL 12 -#define PROV_DSS_DH 13 -#define PROV_EC_ECDSA_SIG 14 -#define PROV_EC_ECNRA_SIG 15 -#define PROV_EC_ECDSA_FULL 16 -#define PROV_EC_ECNRA_FULL 17 -#define PROV_DH_SCHANNEL 18 -#define PROV_SPYRUS_LYNKS 20 -#define PROV_RNG 21 -#define PROV_INTEL_SEC 22 -#define PROV_REPLACE_OWF 23 -#define PROV_RSA_AES 24 - -/* FLAGS Section */ - -/* Provider Parameters */ -#define PP_ENUMALGS 1 -#define PP_ENUMCONTAINERS 2 -#define PP_IMPTYPE 3 -#define PP_NAME 4 -#define PP_VERSION 5 -#define PP_CONTAINER 6 - -#define CRYPT_FIRST 1 -#define CRYPT_NEXT 2 - -#define CRYPT_IMPL_HARDWARE 1 -#define CRYPT_IMPL_SOFTWARE 2 -#define CRYPT_IMPL_MIXED 3 -#define CRYPT_IMPL_UNKNOWN 4 - -/* CryptAcquireContext */ -#define CRYPT_VERIFYCONTEXT 0xF0000000 -#define CRYPT_NEWKEYSET 0x00000008 -#define CRYPT_MACHINE_KEYSET 0x00000000 -#define CRYPT_DELETEKEYSET 0x00000010 -#define CRYPT_SILENT 0x00000000 - -/* Crypt{Get|Set}Provider */ -#define CRYPT_MACHINE_DEFAULT 0x00000001 -#define CRYPT_USER_DEFAULT 0x00000002 -#define CRYPT_DELETE_DEFAULT 0x00000004 - -/* Crypt{Get/Set}ProvParam */ -#define PP_CLIENT_HWND 1 -#define PP_ENUMALGS 1 -#define PP_ENUMCONTAINERS 2 -#define PP_IMPTYPE 3 -#define PP_NAME 4 -#define PP_VERSION 5 -#define PP_CONTAINER 6 -#define PP_CHANGE_PASSWORD 7 -#define PP_KEYSET_SEC_DESCR 8 -#define PP_KEY_TYPE_SUBTYPE 10 -#define PP_CONTEXT_INFO 11 -#define PP_KEYEXCHANGE_KEYSIZE 12 -#define PP_SIGNATURE_KEYSIZE 13 -#define PP_KEYEXCHANGE_ALG 14 -#define PP_SIGNATURE_ALG 15 -#define PP_PROVTYPE 16 -#define PP_KEYSTORAGE 17 -#define PP_SYM_KEYSIZE 19 -#define PP_SESSION_KEYSIZE 20 -#define PP_UI_PROMPT 21 -#define PP_ENUMALGS_EX 22 -#define PP_DELETEKEY 24 -#define PP_ENUMMANDROOTS 25 -#define PP_ENUMELECTROOTS 26 -#define PP_KEYSET_TYPE 27 -#define PP_ADMIN_PIN 31 -#define PP_KEYEXCHANGE_PIN 32 -#define PP_SIGNATURE_PIN 33 -#define PP_SIG_KEYSIZE_INC 34 -#define PP_KEYX_KEYSIZE_INC 35 -#define PP_UNIQUE_CONTAINER 36 -#define PP_SGC_INFO 37 -#define PP_USE_HARDWARE_RNG 38 -#define PP_KEYSPEC 39 -#define PP_ENUMEX_SIGNING_PROT 40 - -/* CryptSignHash/CryptVerifySignature */ -#define CRYPT_NOHASHOID 0x00000001 -#define CRYPT_TYPE2_FORMAT 0x00000002 -#define CRYPT_X931_FORMAT 0x00000004 - -/* Crypt*Key */ -#define CRYPT_EXPORTABLE 0x00000001 -#define CRYPT_USER_PROTECTED 0x00000002 -#define CRYPT_CREATE_SALT 0x00000004 -#define CRYPT_UPDATE_KEY 0x00000008 -#define CRYPT_NO_SALT 0x00000010 -#define CRYPT_PREGEN 0x00000040 -#define CRYPT_ARCHIVABLE 0x00004000 -#define CRYPT_SSL2_FALLBACK 0x00000002 -#define CRYPT_DESTROYKEY 0x00000004 -#define CRYPT_OAEP 0x00000040 - -/* Blob Types */ -#define SIMPLEBLOB 0x1 -#define PUBLICKEYBLOB 0x6 -#define PRIVATEKEYBLOB 0x7 -#define PLAINTEXTKEYBLOB 0x8 -#define OPAQUEKEYBLOB 0x9 -#define PUBLICKEYBLOBEX 0xA -#define SYMMETRICWRAPKEYBLOB 0xB - -/* function declarations */ -/* advapi32.dll */ -WINBOOL STDCALL CryptAcquireContextA(HCRYPTPROV *phProv, LPCSTR pszContainer, - LPCSTR pszProvider, DWORD dwProvType, - DWORD dwFlags); -WINBOOL STDCALL CryptAcquireContextW (HCRYPTPROV *phProv, LPCWSTR pszContainer, - LPCWSTR pszProvider, DWORD dwProvType, DWORD dwFlags); -WINBOOL STDCALL CryptGenRandom (HCRYPTPROV hProv, DWORD dwLen, BYTE *pbBuffer); -WINBOOL STDCALL CryptContextAddRef (HCRYPTPROV hProv, DWORD *pdwReserved, DWORD dwFlags); -WINBOOL STDCALL CryptCreateHash (HCRYPTPROV hProv, ALG_ID Algid, HCRYPTKEY hKey, - DWORD dwFlags, HCRYPTHASH *phHash); -WINBOOL STDCALL CryptDecrypt (HCRYPTKEY hKey, HCRYPTHASH hHash, WINBOOL Final, - DWORD dwFlags, BYTE *pbData, DWORD *pdwDataLen); -WINBOOL STDCALL CryptDeriveKey (HCRYPTPROV hProv, ALG_ID Algid, HCRYPTHASH hBaseData, - DWORD dwFlags, HCRYPTKEY *phKey); -WINBOOL STDCALL CryptDestroyHash (HCRYPTHASH hHash); -WINBOOL STDCALL CryptDestroyKey (HCRYPTKEY hKey); -WINBOOL STDCALL CryptDuplicateKey (HCRYPTKEY hKey, DWORD *pdwReserved, DWORD dwFlags, HCRYPTKEY *phKey); -WINBOOL STDCALL CryptDuplicateHash (HCRYPTHASH hHash, DWORD *pdwReserved, - DWORD dwFlags, HCRYPTHASH *phHash); -WINBOOL STDCALL CryptEncrypt (HCRYPTKEY hKey, HCRYPTHASH hHash, WINBOOL Final, - DWORD dwFlags, BYTE *pbData, DWORD *pdwDataLen, DWORD dwBufLen); -WINBOOL STDCALL CryptEnumProvidersA (DWORD dwIndex, DWORD *pdwReserved, - DWORD dwFlags, DWORD *pdwProvType, LPSTR pszProvName, DWORD *pcbProvName); -WINBOOL STDCALL CryptEnumProvidersW (DWORD dwIndex, DWORD *pdwReserved, - DWORD dwFlags, DWORD *pdwProvType, LPWSTR pszProvName, DWORD *pcbProvName); -WINBOOL STDCALL CryptEnumProviderTypesA (DWORD dwIndex, DWORD *pdwReserved, - DWORD dwFlags, DWORD *pdwProvType, LPSTR pszTypeName, DWORD *pcbTypeName); -WINBOOL STDCALL CryptEnumProviderTypesW (DWORD dwIndex, DWORD *pdwReserved, - DWORD dwFlags, DWORD *pdwProvType, LPWSTR pszTypeName, DWORD *pcbTypeName); -WINBOOL STDCALL CryptExportKey (HCRYPTKEY hKey, HCRYPTKEY hExpKey, DWORD dwBlobType, - DWORD dwFlags, BYTE *pbData, DWORD *pdwDataLen); -WINBOOL STDCALL CryptGenKey (HCRYPTPROV hProv, ALG_ID Algid, DWORD dwFlags, HCRYPTKEY *phKey); -WINBOOL STDCALL CryptGetKeyParam (HCRYPTKEY hKey, DWORD dwParam, BYTE *pbData, - DWORD *pdwDataLen, DWORD dwFlags); -WINBOOL STDCALL CryptGetHashParam (HCRYPTHASH hHash, DWORD dwParam, BYTE *pbData, - DWORD *pdwDataLen, DWORD dwFlags); -WINBOOL STDCALL CryptGetProvParam (HCRYPTPROV hProv, DWORD dwParam, BYTE *pbData, - DWORD *pdwDataLen, DWORD dwFlags); -WINBOOL STDCALL CryptGetDefaultProviderA (DWORD dwProvType, DWORD *pdwReserved, - DWORD dwFlags, LPSTR pszProvName, DWORD *pcbProvName); -WINBOOL STDCALL CryptGetDefaultProviderW (DWORD dwProvType, DWORD *pdwReserved, - DWORD dwFlags, LPWSTR pszProvName, DWORD *pcbProvName); -WINBOOL STDCALL CryptGetUserKey (HCRYPTPROV hProv, DWORD dwKeySpec, HCRYPTKEY *phUserKey); -WINBOOL STDCALL CryptHashData (HCRYPTHASH hHash, BYTE *pbData, DWORD dwDataLen, DWORD dwFlags); -WINBOOL STDCALL CryptHashSessionKey (HCRYPTHASH hHash, HCRYPTKEY hKey, DWORD dwFlags); -WINBOOL STDCALL CryptImportKey (HCRYPTPROV hProv, BYTE *pbData, DWORD dwDataLen, - HCRYPTKEY hPubKey, DWORD dwFlags, HCRYPTKEY *phKey); -WINBOOL STDCALL CryptReleaseContext (HCRYPTPROV hProv, DWORD dwFlags); -WINBOOL STDCALL CryptSignHashA (HCRYPTHASH hHash, DWORD dwKeySpec, LPCSTR sDescription, - DWORD dwFlags, BYTE *pbSignature, DWORD *pdwSigLen); -WINBOOL STDCALL CryptSignHashW (HCRYPTHASH hHash, DWORD dwKeySpec, LPCWSTR sDescription, - DWORD dwFlags, BYTE *pbSignature, DWORD *pdwSigLen); -WINBOOL STDCALL CryptSetHashParam (HCRYPTHASH hHash, DWORD dwParam, BYTE *pbData, DWORD dwFlags); -WINBOOL STDCALL CryptSetKeyParam (HCRYPTKEY hKey, DWORD dwParam, BYTE *pbData, DWORD dwFlags); -WINBOOL STDCALL CryptSetProviderA (LPCSTR pszProvName, DWORD dwProvType); -WINBOOL STDCALL CryptSetProviderW (LPCWSTR pszProvName, DWORD dwProvType); -WINBOOL STDCALL CryptSetProviderExA (LPCSTR pszProvName, DWORD dwProvType, DWORD *pdwReserved, DWORD dwFlags); -WINBOOL STDCALL CryptSetProviderExW (LPCWSTR pszProvName, DWORD dwProvType, DWORD *pdwReserved, DWORD dwFlags); -WINBOOL STDCALL CryptSetProvParam (HCRYPTPROV hProv, DWORD dwParam, BYTE *pbData, DWORD dwFlags); -WINBOOL STDCALL CryptVerifySignatureA (HCRYPTHASH hHash, BYTE *pbSignature, DWORD dwSigLen, - HCRYPTKEY hPubKey, LPCSTR sDescription, DWORD dwFlags); -WINBOOL STDCALL CryptVerifySignatureW (HCRYPTHASH hHash, BYTE *pbSignature, DWORD dwSigLen, - HCRYPTKEY hPubKey, LPCWSTR sDescription, DWORD dwFlags); -#ifndef _DISABLE_TIDENTS -#ifdef UNICODE -#define CryptAcquireContext CryptAcquireContextW -#define CryptEnumProviders CryptEnumProvidersW -#define CryptEnumProviderTypes CryptEnumProviderTypesW -#define CryptGetDefaultProvider CryptGetDefaultProviderW -#define CryptSignHash CryptSignHashW -#define CryptSetProvider CryptSetProviderW -#define CryptSetProviderEx CryptSetProviderExW -#define CryptVerifySignature CryptVerifySignatureW -#define MS_DEF_PROV MS_DEF_PROV_W -#define MS_ENHANCED_PROV MS_ENHANCED_PROV_W -#define MS_STRONG_PROV MS_STRONG_PROV_W -#define MS_DEF_RSA_SIG_PROV MS_DEF_RSA_SIG_PROV_W -#define MS_DEF_RSA_SCHANNEL_PROV MS_DEF_RSA_SCHANNEL_PROV_W -#define MS_DEF_DSS_PROV MS_DEF_DSS_PROV_W -#define MS_DEF_DSS_DH_PROV MS_DEF_DSS_DH_PROV_W -#define MS_ENH_DSS_DH_PROV MS_ENH_DSS_DH_PROV_W -#define MS_DEF_DH_SCHANNEL_PROV MS_DEF_DH_SCHANNEL_PROV_W -#define MS_SCARD_PROV MS_SCARD_PROV_W -#else -#define CryptAcquireContext CryptAcquireContextA -#define CryptEnumProviders CryptEnumProvidersA -#define CryptEnumProviderTypes CryptEnumProviderTypesA -#define CryptGetDefaultProvider CryptGetDefaultProviderA -#define CryptSignHash CryptSignHashA -#define CryptSetProvider CryptSetProviderA -#define CryptSetProviderEx CryptSetProviderExA -#define CryptVerifySignature CryptVerifySignatureA -#define MS_DEF_PROV MS_DEF_PROV_A -#define MS_ENHANCED_PROV MS_ENHANCED_PROV_A -#define MS_STRONG_PROV MS_STRONG_PROV_A -#define MS_DEF_RSA_SIG_PROV MS_DEF_RSA_SIG_PROV_A -#define MS_DEF_RSA_SCHANNEL_PROV MS_DEF_RSA_SCHANNEL_PROV_A -#define MS_DEF_DSS_PROV MS_DEF_DSS_PROV_A -#define MS_DEF_DSS_DH_PROV MS_DEF_DSS_DH_PROV_A -#define MS_ENH_DSS_DH_PROV MS_ENH_DSS_DH_PROV_A -#define MS_DEF_DH_SCHANNEL_PROV MS_DEF_DH_SCHANNEL_PROV_A -#define MS_SCARD_PROV MS_SCARD_PROV_A -#endif -#endif - -#endif diff --git a/reactos/include/wine/winuser.h b/reactos/include/wine/winuser.h index c2c19585fa6..341836d55ec 100644 --- a/reactos/include/wine/winuser.h +++ b/reactos/include/wine/winuser.h @@ -20,9 +20,9 @@ typedef LPDLGTEMPLATE LPDLGTEMPLATEA, LPDLGTEMPLATEW; #endif #define WS_EX_TRAYWINDOW 0x80000000L -#if (__W32API_MAJOR_VERSION < 2 || __W32API_MINOR_VERSION < 5) +//#if (__W32API_MAJOR_VERSION < 2 || __W32API_MINOR_VERSION < 5) #define MIM_MENUDATA 0x00000008 -#endif /* __W32API_MAJOR_VERSION < 2 || __W32API_MINOR_VERSION < 5 */ +//#endif /* __W32API_MAJOR_VERSION < 2 || __W32API_MINOR_VERSION < 5 */ #define DCX_USESTYLE 0x00010000 #define WS_EX_MANAGED 0x40000000L /* Window managed by the window system */ diff --git a/reactos/include/winsock2.h b/reactos/include/winsock2.h deleted file mode 100644 index e3c2e9ce893..00000000000 --- a/reactos/include/winsock2.h +++ /dev/null @@ -1,1860 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Winsock 2 DLL - * FILE: include/winsock2.h - * PURPOSE: Header file for the WinSock 2 DLL - * and WinSock 2 applications - * DEFINES: UNICODE - Use unicode prototypes - * FD_SETSIZE - Maximum size of an FD_SET (default is 64) - */ -#ifndef __WINSOCK2_H -#define __WINSOCK2_H - -#ifdef __USE_W32API - -#include_next - -#else /* __USE_W32API */ - -#include -#include - -#ifdef __cplusplus -extern "C" -{ -#endif /* __cplusplus */ - -#define WSAAPI STDCALL - - -#if 0 -typedef struct _GUID { - ULONG Data1; - USHORT Data2; - USHORT Data3; - UCHAR Data4[8]; -} GUID, *PGUID, *LPGUID; -#endif - -typedef UINT SOCKET; - -#define INVALID_SOCKET ((SOCKET)~0) -#define SOCKET_ERROR (-1) - -/* Socket types */ -#define SOCK_STREAM 1 -#define SOCK_DGRAM 2 -#define SOCK_RAW 3 -#define SOCK_RDM 4 -#define SOCK_SEQPACKET 5 - -/* Per socket flags */ -#define SO_DEBUG 0x0001 -#define SO_ACCEPTCONN 0x0002 -#define SO_REUSEADDR 0x0004 -#define SO_KEEPALIVE 0x0008 -#define SO_DONTROUTE 0x0010 -#define SO_BROADCAST 0x0020 -#define SO_USELOOPBACK 0x0040 -#define SO_LINGER 0x0080 -#define SO_OOBINLINE 0x0100 - -#define SO_DONTLINGER (UINT)(~SO_LINGER) - -#define SO_SNDBUF 0x1001 -#define SO_RCVBUF 0x1002 -#define SO_SNDLOWAT 0x1003 -#define SO_RCVLOWAT 0x1004 -#define SO_SNDTIMEO 0x1005 -#define SO_RCVTIMEO 0x1006 -#define SO_ERROR 0x1007 -#define SO_TYPE 0x1008 - - -/* Address families */ -#define AF_UNSPEC 0 -#define AF_UNIX 1 -#define AF_INET 2 -#define AF_IMPLINK 3 -#define AF_PUP 4 -#define AF_CHAOS 5 -#define AF_NS 6 -#define AF_ISO 7 -#define AF_OSI AF_ISO -#define AF_ECMA 8 -#define AF_DATAKIT 9 -#define AF_CCITT 10 -#define AF_SNA 11 -#define AF_DECnet 12 -#define AF_DLI 13 -#define AF_LAT 14 -#define AF_HYLINK 15 -#define AF_APPLETALK 16 -#define AF_NETBIOS 17 - -#define AF_MAX 18 - - -/* Protocol families, same as address families */ -#define PF_UNSPEC AF_UNSPEC -#define PF_UNIX AF_UNIX -#define PF_INET AF_INET -#define PF_IMPLINK AF_IMPLINK -#define PF_PUP AF_PUP -#define PF_CHAOS AF_CHAOS -#define PF_NS AF_NS -#define PF_ISO AF_ISO -#define PF_OSI AF_OSI -#define PF_ECMA AF_ECMA -#define PF_DATAKIT AF_DATAKIT -#define PF_CCITT AF_CCITT -#define PF_SNA AF_SNA -#define PF_DECnet AF_DECnet -#define PF_DLI AF_DLI -#define PF_LAT AF_LAT -#define PF_HYLINK AF_HYLINK -#define PF_APPLETALK AF_APPLETALK - -#define PF_MAX AF_MAX - - -#define SOL_SOCKET 0xffff - -#define SOMAXCONN 5 - -#define MSG_OOB 0x1 -#define MSG_PEEK 0x2 -#define MSG_DONTROUTE 0x4 - -#define MSG_MAXIOVLEN 16 - - -#define FD_READ 0x01 -#define FD_WRITE 0x02 -#define FD_OOB 0x04 -#define FD_ACCEPT 0x08 -#define FD_CONNECT 0x10 -#define FD_CLOSE 0x20 - -#define FD_MAX_EVENTS 6 -#define FD_ALL_EVENTS ((1 << FD_MAX_EVENTS) - 1) - - -/* Error codes */ - -#define WSABASEERR 10000 - -#define WSAEINTR (WSABASEERR+4) -#define WSAEBADF (WSABASEERR+9) -#define WSAEACCES (WSABASEERR+13) -#define WSAEFAULT (WSABASEERR+14) -#define WSAEINVAL (WSABASEERR+22) -#define WSAEMFILE (WSABASEERR+24) - -#define WSAEWOULDBLOCK (WSABASEERR+35) -#define WSAEINPROGRESS (WSABASEERR+36) -#define WSAEALREADY (WSABASEERR+37) -#define WSAENOTSOCK (WSABASEERR+38) -#define WSAEDESTADDRREQ (WSABASEERR+39) -#define WSAEMSGSIZE (WSABASEERR+40) -#define WSAEPROTOTYPE (WSABASEERR+41) -#define WSAENOPROTOOPT (WSABASEERR+42) -#define WSAEPROTONOSUPPORT (WSABASEERR+43) -#define WSAESOCKTNOSUPPORT (WSABASEERR+44) -#define WSAEOPNOTSUPP (WSABASEERR+45) -#define WSAEPFNOSUPPORT (WSABASEERR+46) -#define WSAEAFNOSUPPORT (WSABASEERR+47) -#define WSAEADDRINUSE (WSABASEERR+48) -#define WSAEADDRNOTAVAIL (WSABASEERR+49) -#define WSAENETDOWN (WSABASEERR+50) -#define WSAENETUNREACH (WSABASEERR+51) -#define WSAENETRESET (WSABASEERR+52) -#define WSAECONNABORTED (WSABASEERR+53) -#define WSAECONNRESET (WSABASEERR+54) -#define WSAENOBUFS (WSABASEERR+55) -#define WSAEISCONN (WSABASEERR+56) -#define WSAENOTCONN (WSABASEERR+57) -#define WSAESHUTDOWN (WSABASEERR+58) -#define WSAETOOMANYREFS (WSABASEERR+59) -#define WSAETIMEDOUT (WSABASEERR+60) -#define WSAECONNREFUSED (WSABASEERR+61) -#define WSAELOOP (WSABASEERR+62) -#define WSAENAMETOOLONG (WSABASEERR+63) -#define WSAEHOSTDOWN (WSABASEERR+64) -#define WSAEHOSTUNREACH (WSABASEERR+65) -#define WSAENOTEMPTY (WSABASEERR+66) -#define WSAEUSERS (WSABASEERR+68) -#define WSAEDQUOT (WSABASEERR+69) -#define WSAESTALE (WSABASEERR+70) -#define WSAEREMOTE (WSABASEERR+71) - -/* Extended Windows Sockets error codes */ -#define WSASYSNOTREADY (WSABASEERR+91) -#define WSAVERNOTSUPPORTED (WSABASEERR+92) -#define WSANOTINITIALISED (WSABASEERR+93) -#define WSAEDISCON (WSABASEERR+101) -#define WSAENOMORE (WSABASEERR+102) -#define WSAECANCELLED (WSABASEERR+103) -#define WSAEINVALIDPROCTABLE (WSABASEERR+104) -#define WSAEINVALIDPROVIDER (WSABASEERR+105) -#define WSAEPROVIDERFAILEDINIT (WSABASEERR+106) -#define WSASYSCALLFAILURE (WSABASEERR+107) -#define WSASERVICE_NOT_FOUND (WSABASEERR+108) -#define WSATYPE_NOT_FOUND (WSABASEERR+109) -#define WSA_E_NO_MORE (WSABASEERR+110) -#define WSA_E_CANCELLED (WSABASEERR+111) -#define WSAEREFUSED (WSABASEERR+112) - -#define WSAHOST_NOT_FOUND (WSABASEERR+1001) -#define WSATRY_AGAIN (WSABASEERR+1002) -#define WSANO_RECOVERY (WSABASEERR+1003) -#define WSANO_DATA (WSABASEERR+1004) -#define WSANO_ADDRESS WSANO_DATA - -#define WSAEVENT HANDLE -#define LPWSAEVENT LPHANDLE - -#define WSA_IO_PENDING (ERROR_IO_PENDING) -#define WSA_IO_INCOMPLETE (ERROR_IO_INCOMPLETE) -#define WSA_INVALID_HANDLE (ERROR_INVALID_HANDLE) -#define WSA_INVALID_PARAMETER (ERROR_INVALID_PARAMETER) -#define WSA_NOT_ENOUGH_MEMORY (ERROR_NOT_ENOUGH_MEMORY) -#define WSA_OPERATION_ABORTED (ERROR_OPERATION_ABORTED) - -#define WSA_INVALID_EVENT ((WSAEVENT)NULL) -#define WSA_MAXIMUM_WAIT_EVENTS (MAXIMUM_WAIT_OBJECTS) -#define WSA_WAIT_FAILED ((DWORD)-1L) -#define WSA_WAIT_EVENT_0 (WAIT_OBJECT_0) -#define WSA_WAIT_IO_COMPLETION (WAIT_IO_COMPLETION) -#define WSA_WAIT_TIMEOUT (WAIT_TIMEOUT) -#define WSA_INFINITE (INFINITE) - -typedef enum _WSACOMPLETIONTYPE { - NSP_NOTIFY_IMMEDIATELY = 0, - NSP_NOTIFY_HWND, - NSP_NOTIFY_EVENT, - NSP_NOTIFY_PORT, - NSP_NOTIFY_APC, -} WSACOMPLETIONTYPE, *PWSACOMPLETIONTYPE, FAR * LPWSACOMPLETIONTYPE; - -#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 FIONREAD _IOR('f', 127, ULONG) -#define FIONBIO _IOW('f', 126, ULONG) -#define FIOASYNC _IOW('f', 125, ULONG) - -/* Socket I/O controls */ -#define SIOCSHIWAT _IOW('s', 0, ULONG) -#define SIOCGHIWAT _IOR('s', 1, ULONG) -#define SIOCSLOWAT _IOW('s', 2, ULONG) -#define SIOCGLOWAT _IOR('s', 3, ULONG) -#define SIOCATMARK _IOR('s', 7, ULONG) - - -typedef unsigned short u_short; -typedef unsigned long u_long; - -typedef struct in6_addr { - union { - UCHAR Byte[16]; - USHORT Word[8]; - } u; -} IN6_ADDR; -struct sockaddr_in6 { - short sin6_family; - u_short sin6_port; - u_long sin6_flowinfo; - struct in6_addr sin6_addr; - u_long sin6_scope_id; -}; - -struct in_addr { - union { - struct { UCHAR s_b1, s_b2,s_b3,s_b4; } S_un_b; - struct { USHORT s_w1,s_w2; } S_un_w; - ULONG S_addr; - } S_un; -#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 -}; - -/* - Definitions of bits in internet address integers. - NOTE: On subnets the decomposition of addresses to host and - net parts is done according to subnet mask, not the masks here. - */ -#define IN_CLASSA(i) (((long)(i) & 0x80000000) == 0) -#define IN_CLASSA_NET 0xff000000 -#define IN_CLASSA_NSHIFT 24 -#define IN_CLASSA_HOST 0x00ffffff -#define IN_CLASSA_MAX 128 - -#define IN_CLASSB(i) (((long)(i) & 0xc0000000) == 0x80000000) -#define IN_CLASSB_NET 0xffff0000 -#define IN_CLASSB_NSHIFT 16 -#define IN_CLASSB_HOST 0x0000ffff -#define IN_CLASSB_MAX 65536 - -#define IN_CLASSC(i) (((long)(i) & 0xe0000000) == 0xc0000000) -#define IN_CLASSC_NET 0xffffff00 -#define IN_CLASSC_NSHIFT 8 -#define IN_CLASSC_HOST 0x000000ff - -#define IN_CLASSD(i) (((long)(i) & 0xf0000000) == 0xe0000000) -#define IN_CLASSD_NET 0xf0000000 /* These ones aren't really */ -#define IN_CLASSD_NSHIFT 28 /* net and host fields, but */ -#define IN_CLASSD_HOST 0x0fffffff /* routing needn't know. */ -#define IN_MULTICAST(i) IN_CLASSD(i) - -#define ADDR_ANY INADDR_ANY - - -struct timeval { - LONG tv_sec; - LONG tv_usec; -}; - - -struct sockaddr { - USHORT sa_family; - CHAR sa_data[14]; -}; - - -struct linger { - USHORT l_onoff; - USHORT l_linger; -}; - - -/* IP specific */ - -struct sockaddr_in { - SHORT sin_family; - USHORT sin_port; - struct in_addr sin_addr; - CHAR sin_zero[8]; -}; - -#define INADDR_ANY ((ULONG)0x00000000) -#define INADDR_LOOPBACK ((ULONG)0x7f000001) -#define INADDR_BROADCAST ((ULONG)0xffffffff) -#define INADDR_NONE ((ULONG)0xffffffff) - -#define IPPROTO_IP 0 -#define IPPROTO_ICMP 1 -#define IPPROTO_IGMP 2 -#define IPPROTO_GGP 3 -#define IPPROTO_TCP 6 -#define IPPROTO_PUP 12 -#define IPPROTO_UDP 17 -#define IPPROTO_IDP 22 -#define IPPROTO_ND 77 -#define IPPROTO_RAW 255 -#define IPPROTO_MAX 256 - - -#ifndef FD_SETSIZE -#define FD_SETSIZE 64 -#endif /* FD_SETSIZE */ - -typedef struct fd_set { - UINT fd_count; - SOCKET fd_array[FD_SETSIZE]; -} fd_set; - -extern INT PASCAL FAR __WSAFDIsSet(SOCKET, fd_set FAR*); - -#define FD_CLR(s, set) do { \ - UINT __i; \ - for (__i = 0; __i < ((fd_set FAR*)(set))->fd_count; __i++) { \ - if (((fd_set FAR*)(set))->fd_array[__i] == s) { \ - while (__i < ((fd_set FAR*)(set))->fd_count - 1) { \ - ((fd_set FAR *)(set))->fd_array[__i] = \ - ((fd_set FAR*)(set))->fd_array[__i+1]; \ - __i++; \ - } \ - ((fd_set FAR *)(set))->fd_count--; \ - break; \ - } \ - } \ -} while(0) - -#define FD_SET(s, set) do { \ - UINT __i; \ - for (__i = 0; __i < ((fd_set FAR *)(set))->fd_count; __i++) { \ - if (((fd_set FAR *)(set))->fd_array[__i] == (s)) { \ - break; \ - } \ - } \ - if (__i == ((fd_set FAR *)(set))->fd_count) { \ - if (((fd_set FAR*)(set))->fd_count < FD_SETSIZE) { \ - ((fd_set FAR*)(set))->fd_array[__i] = (s); \ - ((fd_set FAR*)(set))->fd_count++; \ - } \ - } \ -} while(0) - -#define FD_ISSET(s, set) __WSAFDIsSet((SOCKET)(s), (fd_set FAR*)(set)) - -#define FD_ZERO(set) (((fd_set FAR*)(set))->fd_count = 0) - - -typedef struct _WSAOVERLAPPED { - DWORD Internal; /* reserved */ - DWORD InternalHigh; /* reserved */ - DWORD Offset; /* reserved */ - DWORD OffsetHigh; /* reserved */ - WSAEVENT hEvent; -} WSAOVERLAPPED, FAR* LPWSAOVERLAPPED; - -typedef struct __WSABUF { - ULONG len; /* buffer length */ - CHAR FAR* buf; /* pointer to buffer */ -} WSABUF, FAR* LPWSABUF; - - -typedef ULONG SERVICETYPE; - -#define SERVICETYPE_NOTRAFFIC 0x00000000 -#define SERVICETYPE_BESTEFFORT 0x00000001 -#define SERVICETYPE_CONTROLLEDLOAD 0x00000002 -#define SERVICETYPE_GUARANTEED 0x00000003 -#define SERVICETYPE_NETWORK_UNAVAILABLE 0x00000004 -#define SERVICETYPE_GENERAL_INFORMATION 0x00000005 -#define SERVICETYPE_NOCHANGE 0x00000006 -#define SERVICE_IMMEDIATE_TRAFFIC_CONTROL 0x00000007 - -typedef struct _flowspec { - ULONG TokenRate; /* In Bytes/sec */ - ULONG TokenBucketSize; /* In Bytes */ - ULONG PeakBandwidth; /* In Bytes/sec */ - ULONG Latency; /* In microseconds */ - ULONG DelayVariation; /* In microseconds */ - SERVICETYPE ServiceType; - ULONG MaxSduSize; /* In Bytes */ - ULONG MinimumPolicedSize; /* In Bytes */ -} FLOWSPEC, *PFLOWSPEC, FAR* LPFLOWSPEC; - - -typedef struct _QualityOfService { - FLOWSPEC SendingFlowspec; /* The flow spec for data sending */ - FLOWSPEC ReceivingFlowspec; /* The flow spec for data receiving */ - WSABUF ProviderSpecific; /* Additional provider specific stuff */ -} QOS, FAR* LPQOS; - - - -typedef struct _WSANETWORKEVENTS { - LONG lNetworkEvents; - INT iErrorCode[FD_MAX_EVENTS]; -} WSANETWORKEVENTS, FAR* LPWSANETWORKEVENTS; - - -#define MAX_PROTOCOL_CHAIN 7 - -#define BASE_PROTOCOL 1 -#define LAYERED_PROTOCOL 0 - -typedef struct _WSAPROTOCOLCHAIN { - INT ChainLen; - DWORD ChainEntries[MAX_PROTOCOL_CHAIN]; -} WSAPROTOCOLCHAIN, FAR* LPWSAPROTOCOLCHAIN; - -#define WSAPROTOCOL_LEN 255 - -typedef struct _WSAPROTOCOL_INFOA { - DWORD dwServiceFlags1; - DWORD dwServiceFlags2; - DWORD dwServiceFlags3; - DWORD dwServiceFlags4; - DWORD dwProviderFlags; - GUID ProviderId; - DWORD dwCatalogEntryId; - WSAPROTOCOLCHAIN ProtocolChain; - INT iVersion; - INT iAddressFamily; - INT iMaxSockAddr; - INT iMinSockAddr; - INT iSocketType; - INT iProtocol; - INT iProtocolMaxOffset; - INT iNetworkByteOrder; - INT iSecurityScheme; - DWORD dwMessageSize; - DWORD dwProviderReserved; - CHAR szProtocol[WSAPROTOCOL_LEN + 1]; -} WSAPROTOCOL_INFOA, FAR* LPWSAPROTOCOL_INFOA; - -typedef struct _WSAPROTOCOL_INFOW { - DWORD dwServiceFlags1; - DWORD dwServiceFlags2; - DWORD dwServiceFlags3; - DWORD dwServiceFlags4; - DWORD dwProviderFlags; - GUID ProviderId; - DWORD dwCatalogEntryId; - WSAPROTOCOLCHAIN ProtocolChain; - INT iVersion; - INT iAddressFamily; - INT iMaxSockAddr; - INT iMinSockAddr; - INT iSocketType; - INT iProtocol; - INT iProtocolMaxOffset; - INT iNetworkByteOrder; - INT iSecurityScheme; - DWORD dwMessageSize; - DWORD dwProviderReserved; - WCHAR szProtocol[WSAPROTOCOL_LEN + 1]; -} WSAPROTOCOL_INFOW, FAR * LPWSAPROTOCOL_INFOW; - -#ifndef _DISABLE_TIDENTS -#ifdef UNICODE -typedef WSAPROTOCOL_INFOW WSAPROTOCOL_INFO; -typedef LPWSAPROTOCOL_INFOW LPWSAPROTOCOL_INFO; -#else /* UNICODE */ -typedef WSAPROTOCOL_INFOA WSAPROTOCOL_INFO; -typedef LPWSAPROTOCOL_INFOA LPWSAPROTOCOL_INFO; -#endif /* UNICODE */ -#endif /* _DISABLE_TIDENTS */ - -typedef -VOID -CALLBACK (*LPSERVICE_CALLBACK_PROC) ( - IN LPARAM lParam, - IN HANDLE hAsyncTaskHandle - ); - -typedef struct _SERVICE_ASYNC_INFO { - LPSERVICE_CALLBACK_PROC lpServiceCallbackProc; - LPARAM lParam; - HANDLE hAsyncTaskHandle; -} SERVICE_ASYNC_INFO, *PSERVICE_ASYNC_INFO, FAR * LPSERVICE_ASYNC_INFO; - -/* WinSock 2 extended commands for WSAIoctl() */ - -#define IOC_UNIX 0x00000000 -#define IOC_WS2 0x08000000 -#define IOC_FAMILY 0x10000000 -#define IOC_VENDOR 0x18000000 - -#define _WSAIO (x,y) (IOC_VOID | (x) | (y)) -#define _WSAIOR (x,y) (IOC_OUT | (x) | (y)) -#define _WSAIOW (x,y) (IOC_IN | (x) | (y)) -#define _WSAIORW(x,y) (IOC_INOUT| (x) | (y)) - -#define SIO_ASSOCIATE_HANDLE _WSAIOW (IOC_WS2, 1) -#define SIO_ENABLE_CIRCULAR_QUEUEING _WSAIO (IOC_WS2, 2) -#define SIO_FIND_ROUTE _WSAIOR (IOC_WS2, 3) -#define SIO_FLUSH _WSAIO (IOC_WS2, 4) -#define SIO_GET_BROADCAST_ADDRESS -WSAIOR (IOC_WS2, 5) -#define SIO_GET_EXTENSION_FUNCTION_POINTER _WSAIORW(IOC_WS2, 6) -#define SIO_GET_QOS _WSAIORW(IOC_WS2, 7) -#define SIO_GET_GROUP_QOS _WSAIORW(IOC_WS2, 8) -#define SIO_MULTIPOINT_LOOPBACK _WSAIOW (IOC_WS2, 9) -#define SIO_MULTICAST_SCOPE _WSAIOW (IOC_WS2, 10) -#define SIO_SET_QOS _WSAIOW (IOC_WS2, 11) -#define SIO_SET_GROUP_QOS _WSAIOW (IOC_WS2, 12) -#define SIO_TRANSLATE_HANDLE _WSAIORW(IOC_WS2, 13) -#define SIO_ROUTING_INTERFACE_QUERY _WSAIORW(IOC_WS2, 20) -#define SIO_ROUTING_INTERFACE_CHANGE _WSAIOW (IOC_WS2, 21) -#define SIO_ADDRESS_LIST_QUERY _WSAIOR (IOC_WS2, 22) -#define SIO_ADDRESS_LIST_CHANGE _WSAIO (IOC_WS2, 23) -#define SIO_QUERY_TARGET_PNP_HANDLE _WSAIOR (IOC_W32, 24) - - -/* Structures for WinSock 1.1 compatible namespace resolution */ - -struct hostent { - CHAR FAR* h_name; - CHAR FAR* FAR* h_aliases; - SHORT h_addrtype; - SHORT h_length; - CHAR FAR* FAR* h_addr_list; -#define h_addr h_addr_list[0] /* Backward compatible field name */ -}; - -struct protoent { - CHAR FAR* p_name; - CHAR FAR* FAR* p_aliases; - SHORT p_proto; -}; - -struct servent { - CHAR FAR* s_name; - CHAR FAR* FAR* s_aliases; - SHORT s_port; - CHAR FAR* s_proto; -}; - -/* It is assumed here that a network number fits in 32 bits. */ -struct netent { - CHAR FAR* n_name; /* official net name */ - CHAR FAR* FAR* n_aliases; /* list of alias's */ - SHORT n_addrtype; /* network address type id */ - ULONG n_net; /* network number */ -}; - - -typedef UINT GROUP; - -typedef -INT -(CALLBACK * LPCONDITIONPROC)( - LPWSABUF lpCallerId, - LPWSABUF lpCallerData, - LPQOS lpSQOS, - LPQOS lpGQOS, - LPWSABUF lpCalleeId, - LPWSABUF lpCalleeData, - GROUP FAR* g, - DWORD dwCallbackData); - -typedef -VOID -(CALLBACK* LPWSAOVERLAPPED_COMPLETION_ROUTINE)( - DWORD dwError, - DWORD cbTransferred, - LPWSAOVERLAPPED lpOverlapped, - DWORD dwFlags); - -typedef struct _WSACOMPLETION { - WSACOMPLETIONTYPE Type; - union { - struct { - HWND hWnd; - UINT uMsg; - WPARAM context; - } WindowMessage; - struct { - LPWSAOVERLAPPED lpOverlapped; - } Event; - struct { - LPWSAOVERLAPPED lpOverlapped; - LPWSAOVERLAPPED_COMPLETION_ROUTINE lpfnCompletionProc; - } Apc; - struct { - LPWSAOVERLAPPED lpOverlapped; - HANDLE hPort; - ULONG_PTR Key; - } Port; - } Parameters; -} WSACOMPLETION, *PWSACOMPLETION, FAR *LPWSACOMPLETION; - -/* Microsoft Windows extended data types */ - -typedef struct sockaddr SOCKADDR; -typedef struct sockaddr *PSOCKADDR; -typedef struct sockaddr FAR *LPSOCKADDR; - -typedef struct sockaddr_in SOCKADDR_IN; -typedef struct sockaddr_in *PSOCKADDR_IN; -typedef struct sockaddr_in FAR *LPSOCKADDR_IN; - -typedef struct linger LINGER; -typedef struct linger *PLINGER; -typedef struct linger FAR *LPLINGER; - -typedef struct in_addr IN_ADDR; -typedef struct in_addr *PIN_ADDR; -typedef struct in_addr FAR *LPIN_ADDR; - -typedef struct fd_set FD_SET; -typedef struct fd_set *PFD_SET; -typedef struct fd_set FAR *LPFD_SET; - -typedef struct hostent HOSTENT; -typedef struct hostent *PHOSTENT; -typedef struct hostent FAR *LPHOSTENT; - -typedef struct servent SERVENT; -typedef struct servent *PSERVENT; -typedef struct servent FAR *LPSERVENT; - -typedef struct protoent PROTOENT; -typedef struct protoent *PPROTOENT; -typedef struct protoent FAR *LPPROTOENT; - -typedef struct timeval TIMEVAL; -typedef struct timeval *PTIMEVAL; -typedef struct timeval FAR *LPTIMEVAL; - -#define WSAMAKEASYNCREPLY(buflen,error) MAKELONG(buflen,error) -#define WSAMAKESELECTREPLY(event,error) MAKELONG(event,error) -#define WSAGETASYNCBUFLEN(lParam) LOWORD(lParam) -#define WSAGETASYNCERROR(lParam) HIWORD(lParam) -#define WSAGETSELECTEVENT(lParam) LOWORD(lParam) -#define WSAGETSELECTERROR(lParam) HIWORD(lParam) - - -#define WSADESCRIPTION_LEN 256 -#define WSASYS_STATUS_LEN 128 - -typedef struct WSAData { - WORD wVersion; - WORD wHighVersion; - CHAR szDescription[WSADESCRIPTION_LEN + 1]; - CHAR szSystemStatus[WSASYS_STATUS_LEN + 1]; - USHORT iMaxSockets; - USHORT iMaxUdpDg; - CHAR FAR* lpVendorInfo; -} WSADATA, FAR* LPWSADATA; - -#ifndef __BLOB_T_DEFINED -#define __BLOB_T_DEFINED -typedef struct _BLOB { - ULONG cbSize; - BYTE *pBlobData; -} BLOB, *LPBLOB; -#else -typedef BLOB *LPBLOB; -#endif - -typedef struct _SOCKET_ADDRESS { - LPSOCKADDR lpSockaddr; - INT iSockaddrLength; -} SOCKET_ADDRESS, *PSOCKET_ADDRESS, FAR* LPSOCKET_ADDRESS; - -typedef struct _SOCKET_ADDRESS_LIST { - INT iAddressCount; - SOCKET_ADDRESS Address[1]; -} SOCKET_ADDRESS_LIST, FAR* LPSOCKET_ADDRESS_LIST; - -typedef struct _CSADDR_INFO { - SOCKET_ADDRESS LocalAddr; - SOCKET_ADDRESS RemoteAddr; - INT iSocketType; - INT iProtocol; -} CSADDR_INFO, *PCSADDR_INFO, FAR* LPCSADDR_INFO; - - -/* Structures for namespace resolution */ - -typedef struct _WSANAMESPACE_INFOA { - GUID NSProviderId; - DWORD dwNameSpace; - BOOL fActive; - DWORD dwVersion; - LPSTR lpszIdentifier; -} WSANAMESPACE_INFOA, *PWSANAMESPACE_INFOA, *LPWSANAMESPACE_INFOA; - -typedef struct _WSANAMESPACE_INFOW { - GUID NSProviderId; - DWORD dwNameSpace; - BOOL fActive; - DWORD dwVersion; - LPWSTR lpszIdentifier; -} WSANAMESPACE_INFOW, *PWSANAMESPACE_INFOW, *LPWSANAMESPACE_INFOW; - -#ifndef _DISABLE_TIDENTS -#ifdef UNICODE -typedef WSANAMESPACE_INFOW WSANAMESPACE_INFO; -typedef PWSANAMESPACE_INFOW PWSANAMESPACE_INFO; -typedef LPWSANAMESPACE_INFOW LPWSANAMESPACE_INFO; -#else /* UNICODE */ -typedef WSANAMESPACE_INFOA WSANAMESPACE_INFO; -typedef PWSANAMESPACE_INFOA PWSANAMESPACE_INFO; -typedef LPWSANAMESPACE_INFOA LPWSANAMESPACE_INFO; -#endif /* UNICODE */ -#endif /* _DISABLE_TIDENTS */ - -typedef struct _TRANSMIT_FILE_BUFFERS { - LPVOID Head; - DWORD HeadLength; - LPVOID Tail; - DWORD TailLength; -} TRANSMIT_FILE_BUFFERS, *PTRANSMIT_FILE_BUFFERS, FAR *LPTRANSMIT_FILE_BUFFERS; - -typedef struct addrinfo -{ - int ai_flags; - int ai_family; - int ai_socktype; - int ai_protocol; - size_t ai_addrlen; - char * ai_canonname; - struct sockaddr * ai_addr; - struct addrinfo * ai_next; -} -ADDRINFO, *LPADDRINFO; - -typedef enum _WSAEcomparator -{ - COMP_EQUAL = 0, - COMP_NOTLESS -} WSAECOMPARATOR, *PWSAECOMPARATOR, *LPWSAECOMPARATOR; - -typedef struct _WSAVersion -{ - DWORD dwVersion; - WSAECOMPARATOR ecHow; -}WSAVERSION, *PWSAVERSION, *LPWSAVERSION; - - -typedef struct _AFPROTOCOLS { - INT iAddressFamily; - INT iProtocol; -} AFPROTOCOLS, *PAFPROTOCOLS, *LPAFPROTOCOLS; - - -typedef struct _WSAQuerySetA { - DWORD dwSize; - LPSTR lpszServiceInstanceName; - LPGUID lpServiceClassId; - LPWSAVERSION lpVersion; - LPSTR lpszComment; - DWORD dwNameSpace; - LPGUID lpNSProviderId; - LPSTR lpszContext; - DWORD dwNumberOfProtocols; - LPAFPROTOCOLS lpafpProtocols; - LPSTR lpszQueryString; - DWORD dwNumberOfCsAddrs; - LPCSADDR_INFO lpcsaBuffer; - DWORD dwOutputFlags; - LPBLOB lpBlob; -} WSAQUERYSETA, *PWSAQUERYSETA, *LPWSAQUERYSETA; - -typedef struct _WSAQuerySetW { - DWORD dwSize; - LPWSTR lpszServiceInstanceName; - LPGUID lpServiceClassId; - LPWSAVERSION lpVersion; - LPWSTR lpszComment; - DWORD dwNameSpace; - LPGUID lpNSProviderId; - LPWSTR lpszContext; - DWORD dwNumberOfProtocols; - LPAFPROTOCOLS lpafpProtocols; - LPWSTR lpszQueryString; - DWORD dwNumberOfCsAddrs; - LPCSADDR_INFO lpcsaBuffer; - DWORD dwOutputFlags; - LPBLOB lpBlob; -} WSAQUERYSETW, *PWSAQUERYSETW, *LPWSAQUERYSETW; - -#ifndef _DISABLE_TIDENTS -#ifdef UNICODE -typedef WSAQUERYSETW WSAQUERYSET; -typedef PWSAQUERYSETW PWSAQUERYSET; -typedef LPWSAQUERYSETW LPWSAQUERYSET; -#else /* UNICODE */ -typedef WSAQUERYSETA WSAQUERYSET; -typedef PWSAQUERYSETA PWSAQUERYSET; -typedef LPWSAQUERYSETA LPWSAQUERYSET; -#endif /* UNICODE */ -#endif /* _DISABLE_TIDENTS */ - - -typedef enum _WSAESETSERVICEOP { - RNRSERVICE_REGISTER = 0, - RNRSERVICE_DEREGISTER, - RNRSERVICE_DELETE -} WSAESETSERVICEOP, *PWSAESETSERVICEOP, *LPWSAESETSERVICEOP; - - -typedef struct _WSANSClassInfoA { - LPSTR lpszName; - DWORD dwNameSpace; - DWORD dwValueType; - DWORD dwValueSize; - LPVOID lpValue; -} WSANSCLASSINFOA, *PWSANSCLASSINFOA, *LPWSANSCLASSINFOA; - -typedef struct _WSANSClassInfoW { - LPWSTR lpszName; - DWORD dwNameSpace; - DWORD dwValueType; - DWORD dwValueSize; - LPVOID lpValue; -} WSANSCLASSINFOW, *PWSANSCLASSINFOW, *LPWSANSCLASSINFOW; - -#ifndef _DISABLE_TIDENTS -#ifdef UNICODE -typedef WSANSCLASSINFOW WSANSCLASSINFO; -typedef PWSANSCLASSINFOW PWSANSCLASSINFO; -typedef LPWSANSCLASSINFOW LPWSANSCLASSINFO; -#else /* UNICODE */ -typedef WSANSCLASSINFOA WSANSCLASSINFO; -typedef PWSANSCLASSINFOA PWSANSCLASSINFO; -typedef LPWSANSCLASSINFOA LPWSANSCLASSINFO; -#endif /* UNICODE */ -#endif /* _DISABLE_TIDENTS */ - -typedef struct _WSAServiceClassInfoA { - LPGUID lpServiceClassId; - LPSTR lpszServiceClassName; - DWORD dwCount; - LPWSANSCLASSINFOA lpClassInfos; -} WSASERVICECLASSINFOA, *PWSASERVICECLASSINFOA, *LPWSASERVICECLASSINFOA; - -typedef struct _WSAServiceClassInfoW { - LPGUID lpServiceClassId; - LPWSTR lpszServiceClassName; - DWORD dwCount; - LPWSANSCLASSINFOW lpClassInfos; -} WSASERVICECLASSINFOW, *PWSASERVICECLASSINFOW, *LPWSASERVICECLASSINFOW; - -#ifndef _DISABLE_TIDENTS -#ifdef UNICODE -typedef WSASERVICECLASSINFOW WSASERVICECLASSINFO; -typedef PWSASERVICECLASSINFOW PWSASERVICECLASSINFO; -typedef LPWSASERVICECLASSINFOW LPWSASERVICECLASSINFO; -#else /* UNICODE */ -typedef WSASERVICECLASSINFOA WSASERVICECLASSINFO; -typedef PWSASERVICECLASSINFOA PWSASERVICECLASSINFO; -typedef LPWSASERVICECLASSINFOA LPWSASERVICECLASSINFO; -#endif /* UNICODE */ -#endif /* _DISABLE_TIDENTS */ - - -/* WinSock 2 DLL prototypes */ - -SOCKET -WSAAPI -accept( - IN SOCKET s, - OUT LPSOCKADDR addr, - OUT INT FAR* addrlen); - -INT -WSAAPI -bind( - IN SOCKET s, - IN CONST LPSOCKADDR name, - IN INT namelen); - -INT -WSAAPI -closesocket( - IN SOCKET s); - -INT -WSAAPI -connect( - IN SOCKET s, - IN CONST LPSOCKADDR name, - IN INT namelen); - -INT -WSAAPI -getpeername( - IN SOCKET s, - OUT LPSOCKADDR name, - IN OUT INT FAR* namelen); - -INT -WSAAPI -getsockname( - IN SOCKET s, - OUT LPSOCKADDR name, - IN OUT INT FAR* namelen); - -INT -WSAAPI -getsockopt( - IN SOCKET s, - IN INT level, - IN INT optname, - OUT CHAR FAR* optval, - IN OUT INT FAR* optlen); - -ULONG -WSAAPI -htonl( - IN ULONG hostlong); - -USHORT -WSAAPI -htons( - IN USHORT hostshort); - -INT -WSAAPI -ioctlsocket( - IN SOCKET s, - IN LONG cmd, - IN OUT ULONG FAR* argp); - -INT -WSAAPI -listen( - IN SOCKET s, - IN INT backlog); - -ULONG -WSAAPI -ntohl( - IN ULONG netlong); - -USHORT -WSAAPI -ntohs( - IN USHORT netshort); - -INT -WSAAPI -recv( - IN SOCKET s, - OUT CHAR FAR* buf, - IN INT len, - IN INT flags); - -INT -WSAAPI -recvfrom( - IN SOCKET s, - OUT CHAR FAR* buf, - IN INT len, - IN INT flags, - OUT LPSOCKADDR from, - IN OUT INT FAR* fromlen); - -INT -WSAAPI -select( - IN INT nfds, - IN OUT LPFD_SET readfds, - IN OUT LPFD_SET writefds, - IN OUT LPFD_SET exceptfds, - IN CONST LPTIMEVAL timeout); - -INT -WSAAPI -send( - IN SOCKET s, - IN CONST CHAR FAR* buf, - IN INT len, - IN INT flags); - -INT -WSAAPI -sendto( - IN SOCKET s, - IN CONST CHAR FAR* buf, - IN INT len, - IN INT flags, - IN CONST LPSOCKADDR to, - IN INT tolen); - -INT -WSAAPI -setsockopt( - IN SOCKET s, - IN INT level, - IN INT optname, - IN CONST CHAR FAR* optval, - IN INT optlen); - -INT -WSAAPI -shutdown( - IN SOCKET s, - IN INT how); - -SOCKET -WSAAPI -socket( - IN INT af, - IN INT type, - IN INT protocol); - -SOCKET -WSAAPI -WSAAccept( - IN SOCKET s, - OUT LPSOCKADDR addr, - IN OUT LPINT addrlen, - IN LPCONDITIONPROC lpfnCondition, - IN DWORD dwCallbackData); - -INT -WSAAPI -WSAAsyncSelect( - IN SOCKET s, - IN HWND hWnd, - IN UINT wMsg, - IN LONG lEvent); - -INT -WSAAPI -WSACancelBlockingCall(VOID); - -INT -WSAAPI -WSACleanup(VOID); - -BOOL -WSAAPI -WSACloseEvent( - IN WSAEVENT hEvent); - -INT -WSAAPI -WSAConnect( - IN SOCKET s, - IN CONST LPSOCKADDR name, - IN INT namelen, - IN LPWSABUF lpCallerData, - OUT LPWSABUF lpCalleeData, - IN LPQOS lpSQOS, - IN LPQOS lpGQOS); - -WSAEVENT -WSAAPI -WSACreateEvent(VOID); - -INT -WSAAPI -WSADuplicateSocketA( - IN SOCKET s, - IN DWORD dwProcessId, - OUT LPWSAPROTOCOL_INFOA lpProtocolInfo); - -INT -WSAAPI -WSADuplicateSocketW( - IN SOCKET s, - IN DWORD dwProcessId, - OUT LPWSAPROTOCOL_INFOW lpProtocolInfo); - -#ifndef _DISABLE_TIDENTS -#ifdef UNICODE -#define WSADuplicateSocket WSADuplicateSocketA -#else /* UNICODE */ -#define WSADuplicateSocket WSADuplicateSocketW -#endif /* UNICODE */ -#endif /* _DISABLE_TIDENTS */ - -INT -WSAAPI -WSAEnumNetworkEvents( - IN SOCKET s, - IN WSAEVENT hEventObject, - OUT LPWSANETWORKEVENTS lpNetworkEvents); - -INT -WSAAPI -WSAEnumProtocolsA( - IN LPINT lpiProtocols, - OUT LPWSAPROTOCOL_INFOA lpProtocolBuffer, - IN OUT LPDWORD lpdwBufferLength); - -INT -WSAAPI -WSAEnumProtocolsW( - IN LPINT lpiProtocols, - OUT LPWSAPROTOCOL_INFOW lpProtocolBuffer, - IN OUT LPDWORD lpdwBufferLength); - -#ifndef _DISABLE_TIDENTS -#ifdef UNICODE -#define WSAEnumProtocols WSAEnumProtocolsA -#else /* UNICODE */ -#define WSAEnumProtocols WSAEnumProtocolsW -#endif /* UNICODE */ -#endif /* _DISABLE_TIDENTS */ - -INT -WSAAPI -WSAEventSelect( - IN SOCKET s, - IN WSAEVENT hEventObject, - IN LONG lNetworkEvents); - -INT -WSAAPI -WSAGetLastError(VOID); - -BOOL -WSAAPI -WSAGetOverlappedResult( - IN SOCKET s, - IN LPWSAOVERLAPPED lpOverlapped, - OUT LPDWORD lpcbTransfer, - IN BOOL fWait, - OUT LPDWORD lpdwFlags); - -BOOL -WSAAPI -WSAGetQOSByName( - IN SOCKET s, - IN OUT LPWSABUF lpQOSName, - OUT LPQOS lpQOS); - -INT -WSAAPI -WSAHtonl( - IN SOCKET s, - IN ULONG hostlong, - OUT ULONG FAR* lpnetlong); - -INT -WSAAPI -WSAHtons( - IN SOCKET s, - IN USHORT hostshort, - OUT USHORT FAR* lpnetshort); - -INT -WSAAPI -WSAIoctl( - IN SOCKET s, - IN DWORD dwIoControlCode, - IN LPVOID lpvInBuffer, - IN DWORD cbInBuffer, - OUT LPVOID lpvOutBuffer, - IN DWORD cbOutBuffer, - OUT LPDWORD lpcbBytesReturned, - IN LPWSAOVERLAPPED lpOverlapped, - IN LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine); - -BOOL -WSAAPI -WSAIsBlocking(VOID); - -SOCKET -WSAAPI -WSAJoinLeaf( - IN SOCKET s, - IN CONST LPSOCKADDR name, - IN INT namelen, - IN LPWSABUF lpCallerData, - OUT LPWSABUF lpCalleeData, - IN LPQOS lpSQOS, - IN LPQOS lpGQOS, - IN DWORD dwFlags); - -INT -WSAAPI -WSANtohl( - IN SOCKET s, - IN ULONG netlong, - OUT ULONG FAR* lphostlong); - -INT -WSAAPI -WSANtohs( - IN SOCKET s, - IN USHORT netshort, - OUT USHORT FAR* lphostshort); - -INT -WSAAPI -WSARecv( - IN SOCKET s, - IN OUT LPWSABUF lpBuffers, - IN DWORD dwBufferCount, - OUT LPDWORD lpNumberOfBytesRecvd, - IN OUT LPDWORD lpFlags, - IN LPWSAOVERLAPPED lpOverlapped, - IN LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine); - -INT -WSAAPI -WSARecvDisconnect( - IN SOCKET s, - OUT LPWSABUF lpInboundDisconnectData); - -INT -WSAAPI -WSARecvFrom( - IN SOCKET s, - IN OUT LPWSABUF lpBuffers, - IN DWORD dwBufferCount, - OUT LPDWORD lpNumberOfBytesRecvd, - IN OUT LPDWORD lpFlags, - OUT LPSOCKADDR lpFrom, - IN OUT LPINT lpFromlen, - IN LPWSAOVERLAPPED lpOverlapped, - IN LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine); - -BOOL -WSAAPI -WSAResetEvent( - IN WSAEVENT hEvent); - -INT -WSAAPI -WSASend( - IN SOCKET s, - IN LPWSABUF lpBuffers, - IN DWORD dwBufferCount, - OUT LPDWORD lpNumberOfBytesSent, - IN DWORD dwFlags, - IN LPWSAOVERLAPPED lpOverlapped, - IN LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine); - -INT -WSAAPI -WSASendDisconnect( - IN SOCKET s, - IN LPWSABUF lpOutboundDisconnectData); - -INT -WSAAPI -WSASendTo( - IN SOCKET s, - IN LPWSABUF lpBuffers, - IN DWORD dwBufferCount, - OUT LPDWORD lpNumberOfBytesSent, - IN DWORD dwFlags, - IN CONST LPSOCKADDR lpTo, - IN INT iToLen, - IN LPWSAOVERLAPPED lpOverlapped, - IN LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine); - -FARPROC -WSAAPI -WSASetBlockingHook( - IN FARPROC lpBlockFunc); - -BOOL -WSAAPI -WSASetEvent( - IN WSAEVENT hEvent); - -VOID -WSAAPI -WSASetLastError( - IN INT iError); - -SOCKET -WSAAPI -WSASocketA( - IN INT af, - IN INT type, - IN INT protocol, - IN LPWSAPROTOCOL_INFOA lpProtocolInfo, - IN GROUP g, - IN DWORD dwFlags); - -SOCKET -WSAAPI -WSASocketW( - IN INT af, - IN INT type, - IN INT protocol, - IN LPWSAPROTOCOL_INFOW lpProtocolInfo, - IN GROUP g, - IN DWORD dwFlags); - -#ifndef _DISABLE_TIDENTS -#ifdef UNICODE -#define WSASocket WSASocketW -#else /* UNICODE */ -#define WSASocket WSASocketA -#endif /* UNICODE */ -#endif /* _DISABLE_TIDENTS */ - -INT -WSAAPI -WSAStartup( - IN WORD wVersionRequested, - OUT LPWSADATA lpWSAData); - -INT -WSAAPI -WSAUnhookBlockingHook(VOID); - -DWORD -WSAAPI -WSAWaitForMultipleEvents( - IN DWORD cEvents, - IN CONST WSAEVENT FAR* lphEvents, - IN BOOL fWaitAll, - IN DWORD dwTimeout, - IN BOOL fAlertable); - -INT -WSAAPI -WSAProviderConfigChange( - IN OUT LPHANDLE lpNotificationHandle, - IN LPWSAOVERLAPPED lpOverlapped, - IN LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine); - -/* Name resolution APIs */ - -INT -WSAAPI -WSAAddressToStringA( - IN LPSOCKADDR lpsaAddress, - IN DWORD dwAddressLength, - IN LPWSAPROTOCOL_INFOA lpProtocolInfo, - OUT LPSTR lpszAddressString, - IN OUT LPDWORD lpdwAddressStringLength); - -INT -WSAAPI -WSAAddressToStringW( - IN LPSOCKADDR lpsaAddress, - IN DWORD dwAddressLength, - IN LPWSAPROTOCOL_INFOW lpProtocolInfo, - OUT LPWSTR lpszAddressString, - IN OUT LPDWORD lpdwAddressStringLength); - -#ifndef _DISABLE_TIDENTS -#ifdef UNICODE -#define WSAAddressToString WSAAddressToStringW -#else /* UNICODE */ -#define WSAAddressToString WSAAddressToStringA -#endif /* UNICODE */ -#endif /* _DISABLE_TIDENTS */ - -INT -WSAAPI -WSAEnumNameSpaceProvidersA( - IN OUT LPDWORD lpdwBufferLength, - OUT LPWSANAMESPACE_INFOA lpnspBuffer); - -INT -WSAAPI -WSAEnumNameSpaceProvidersW( - IN OUT LPDWORD lpdwBufferLength, - OUT LPWSANAMESPACE_INFOW lpnspBuffer); - -#ifndef _DISABLE_TIDENTS -#ifdef UNICODE -#define WSAEnumNameSpaceProviders WSAEnumNameSpaceProvidersW -#else /* UNICODE */ -#define WSAEnumNameSpaceProviders WSAEnumNameSpaceProvidersA -#endif /* UNICODE */ -#endif /* _DISABLE_TIDENTS */ - -typedef int socklen_t; - -INT -WSAAPI -WSAGetServiceClassInfoA( - IN LPGUID lpProviderId, - IN LPGUID lpServiceClassId, - IN OUT LPDWORD lpdwBufferLength, - OUT LPWSASERVICECLASSINFOA lpServiceClassInfo); - -INT -WSAAPI -WSAGetServiceClassInfoW( - IN LPGUID lpProviderId, - IN LPGUID lpServiceClassId, - IN OUT LPDWORD lpdwBufferLength, - OUT LPWSASERVICECLASSINFOW lpServiceClassInfo); - -#ifndef _DISABLE_TIDENTS -#ifdef UNICODE -#define WSAGetServiceClassInfo WSAGetServiceClassInfoW -#else /* UNICODE */ -#define WSAGetServiceClassInfo WSAGetServiceClassInfoA -#endif /* UNICODE */ -#endif /* _DISABLE_TIDENTS */ - -INT -WSAAPI -WSAGetServiceClassNameByClassIdA( - IN LPGUID lpServiceClassId, - OUT LPSTR lpszServiceClassName, - IN OUT LPDWORD lpdwBufferLength); - -INT -WSAAPI -WSAGetServiceClassNameByClassIdW( - IN LPGUID lpServiceClassId, - OUT LPWSTR lpszServiceClassName, - IN OUT LPDWORD lpdwBufferLength); - -#ifndef _DISABLE_TIDENTS -#ifdef UNICODE -#define WSAGetServiceClassNameByClassId WSAGetServiceClassNameByClassIdW -#else /* UNICODE */ -#define WSAGetServiceClassNameByClassId WSAGetServiceClassNameByClassIdA -#endif /* UNICODE */ -#endif /* _DISABLE_TIDENTS */ - -INT -WSAAPI -WSAInstallServiceClassA( - IN LPWSASERVICECLASSINFOA lpServiceClassInfo); - -INT -WSAAPI -WSAInstallServiceClassW( - IN LPWSASERVICECLASSINFOW lpServiceClassInfo); - -#ifndef _DISABLE_TIDENTS -#ifdef UNICODE -#define WSAInstallServiceClass WSAInstallServiceClassW -#else /* UNICODE */ -#define WSAInstallServiceClass WSAInstallServiceClassA -#endif /* UNICODE */ -#endif /* _DISABLE_TIDENTS */ - -INT -WSAAPI -WSALookupServiceBeginA( - IN LPWSAQUERYSETA lpqsRestrictions, - IN DWORD dwControlFlags, - OUT LPHANDLE lphLookup); - -INT -WSAAPI -WSALookupServiceBeginW( - IN LPWSAQUERYSETW lpqsRestrictions, - IN DWORD dwControlFlags, - OUT LPHANDLE lphLookup); - -#ifndef _DISABLE_TIDENTS -#ifdef UNICODE -#define WSALookupServiceBegin WSALookupServiceBeginW -#else /* UNICODE */ -#define WSALookupServiceBegin WSALookupServiceBeginA -#endif /* UNICODE */ -#endif /* _DISABLE_TIDENTS */ - -INT -WSAAPI -WSALookupServiceEnd( - IN HANDLE hLookup); - -INT -WSAAPI -WSALookupServiceNextA( - IN HANDLE hLookup, - IN DWORD dwControlFlags, - IN OUT LPDWORD lpdwBufferLength, - OUT LPWSAQUERYSETA lpqsResults); - -INT -WSAAPI -WSALookupServiceNextW( - IN HANDLE hLookup, - IN DWORD dwControlFlags, - IN OUT LPDWORD lpdwBufferLength, - OUT LPWSAQUERYSETW lpqsResults); - -#ifndef _DISABLE_TIDENTS -#ifdef UNICODE -#define WSALookupServiceNext WSALookupServiceNextW -#else /* UNICODE */ -#define WSALookupServiceNext WSALookupServiceNextA -#endif /* UNICODE */ -#endif /* _DISABLE_TIDENTS */ - -INT -WSAAPI -WSARemoveServiceClass( - IN LPGUID lpServiceClassId); - -INT -WSAAPI -WSASetServiceA( - IN LPWSAQUERYSETA lpqsRegInfo, - IN WSAESETSERVICEOP essOperation, - IN DWORD dwControlFlags); - -INT -WSAAPI -WSASetServiceW( - IN LPWSAQUERYSETW lpqsRegInfo, - IN WSAESETSERVICEOP essOperation, - IN DWORD dwControlFlags); - -#ifndef _DISABLE_TIDENTS -#ifdef UNICODE -#define WSASetService WSASetServiceW -#else /* UNICODE */ -#define WSASetService WSASetServiceA -#endif /* UNICODE */ -#endif /* _DISABLE_TIDENTS */ - -INT -WSAAPI -WSAStringToAddressA( - IN LPSTR AddressString, - IN INT AddressFamily, - IN LPWSAPROTOCOL_INFOA lpProtocolInfo, - OUT LPSOCKADDR lpAddress, - IN OUT LPINT lpAddressLength); - -INT -WSAAPI -WSAStringToAddressW( - IN LPWSTR AddressString, - IN INT AddressFamily, - IN LPWSAPROTOCOL_INFOW lpProtocolInfo, - OUT LPSOCKADDR lpAddress, - IN OUT LPINT lpAddressLength); - -#ifndef _DISABLE_TIDENTS -#ifdef UNICODE -#define WSAStringToAddress WSAStringToAddressW -#else /* UNICODE */ -#define WSAStringToAddress WSAStringToAddressA -#endif /* UNICODE */ -#endif /* _DISABLE_TIDENTS */ - -/* WinSock 1.1 compatible name resolution APIs */ - -LPHOSTENT -WSAAPI -gethostbyaddr( - IN CONST CHAR FAR* addr, - IN INT len, - IN INT type); - -LPHOSTENT -WSAAPI -gethostbyname( - IN CONST CHAR FAR* name); - -INT -WSAAPI -gethostname( - OUT CHAR FAR* name, - IN INT namelen); - -LPPROTOENT -WSAAPI -getprotobyname( - IN CONST CHAR FAR* name); - -LPPROTOENT -WSAAPI -getprotobynumber( - IN INT number); - -LPSERVENT -WSAAPI -getservbyname( - IN CONST CHAR FAR* name, - IN CONST CHAR FAR* proto); - -LPSERVENT -WSAAPI -getservbyport( - IN INT port, - IN CONST CHAR FAR* proto); - -ULONG -WSAAPI -inet_addr( - IN CONST CHAR FAR* cp); - -CHAR FAR* -WSAAPI -inet_ntoa( - IN IN_ADDR in); - -HANDLE -WSAAPI -WSAAsyncGetHostByAddr( - IN HWND hWnd, - IN UINT wMsg, - IN CONST CHAR FAR* addr, - IN INT len, - IN INT type, - OUT CHAR FAR* buf, - IN INT buflen); - -HANDLE -WSAAPI -WSAAsyncGetHostByName( - IN HWND hWnd, - IN UINT wMsg, - IN CONST CHAR FAR* name, - OUT CHAR FAR* buf, - IN INT buflen); - -HANDLE -WSAAPI -WSAAsyncGetProtoByName( - IN HWND hWnd, - IN UINT wMsg, - IN CONST CHAR FAR* name, - OUT CHAR FAR* buf, - IN INT buflen); - -HANDLE -WSAAPI -WSAAsyncGetProtoByNumber( - IN HWND hWnd, - IN UINT wMsg, - IN INT number, - OUT CHAR FAR* buf, - IN INT buflen); - -HANDLE -WSAAPI -WSAAsyncGetServByName( - IN HWND hWnd, - IN UINT wMsg, - IN CONST CHAR FAR* name, - IN CONST CHAR FAR* proto, - OUT CHAR FAR* buf, - IN INT buflen); - -HANDLE -WSAAPI -WSAAsyncGetServByPort( - IN HWND hWnd, - IN UINT wMsg, - IN INT port, - IN CONST CHAR FAR* proto, - OUT CHAR FAR* buf, - IN INT buflen); - -INT -WSAAPI -WSACancelAsyncRequest( - IN HANDLE hAsyncTaskHandle); - -INT -WSAAPI -WSANSPIoctl( - HANDLE hLookup, - DWORD dwControlCode, - LPVOID lpvInBuffer, - DWORD cbInBuffer, - LPVOID lpvOutBuffer, - DWORD cbOutBuffer, - LPDWORD lpcbBytesReturned, - LPWSACOMPLETION lpCompletion - ); - -INT -WSAAPI -WSCUpdateProvider( - LPGUID lpProviderId, - const WCHAR FAR * lpszProviderDllPath, - const LPWSAPROTOCOL_INFOW lpProtocolInfoList, - DWORD dwNumberOfEntries, - LPINT lpErrno - ); - -INT -WSAAPI -WSCWriteNameSpaceOrder ( - LPGUID lpProviderId, - DWORD dwNumberOfEntries - ); - -VOID -WSAAPI -freeaddrinfo( - LPADDRINFO pAddrInfo - ); - -INT -WSAAPI -getaddrinfo( - const char FAR * nodename, - const char FAR * servname, - const struct addrinfo FAR * hints, - struct addrinfo FAR * FAR * res - ); - -INT -WSAAPI -getnameinfo( - const struct sockaddr FAR * sa, - socklen_t salen, - char FAR * host, - DWORD hostlen, - char FAR * serv, - DWORD servlen, - INT flags - ); - -WINBOOL -STDCALL -AcceptEx(SOCKET sListenSocket,SOCKET sAcceptSocket,PVOID lpOutputBuffer,DWORD dwReceiveDataLength,DWORD dwLocalAddressLength,DWORD dwRemoteAddressLength,LPDWORD lpdwBytesReceived,LPOVERLAPPED lpOverlapped); -INT -STDCALL -EnumProtocolsA(LPINT lpiProtocols,LPVOID lpProtocolBuffer,LPDWORD lpdwBufferLength); -INT -STDCALL -EnumProtocolsW(LPINT lpiProtocols,LPVOID lpProtocolBuffer,LPDWORD lpdwBufferLength); -VOID -STDCALL -GetAcceptExSockaddrs(PVOID lpOutputBuffer,DWORD dwReceiveDataLength,DWORD dwLocalAddressLength,DWORD dwRemoteAddressLength,struct sockaddr **LocalSockaddr,LPINT LocalSockaddrLength,struct sockaddr **RemoteSockaddr,LPINT RemoteSockaddrLength); -INT -STDCALL -GetAddressByNameA(DWORD dwNameSpace,LPGUID lpServiceType,LPSTR lpServiceName,LPINT lpiProtocols,DWORD dwResolution,LPSERVICE_ASYNC_INFO lpServiceAsyncInfo,LPVOID lpCsaddrBuffer,LPDWORD lpdwBufferLength,LPSTR lpAliasBuffer,LPDWORD lpdwAliasBufferLength); -INT -STDCALL -GetAddressByNameW(DWORD dwNameSpace,LPGUID lpServiceType,LPWSTR lpServiceName,LPINT lpiProtocols,DWORD dwResolution,LPSERVICE_ASYNC_INFO lpServiceAsyncInfo,LPVOID lpCsaddrBuffer,LPDWORD lpdwBufferLength,LPWSTR lpAliasBuffer,LPDWORD lpdwAliasBufferLength); -INT -STDCALL -GetNameByTypeA(LPGUID lpServiceType,LPSTR lpServiceName,DWORD dwNameLength); -INT -STDCALL -GetNameByTypeW(LPGUID lpServiceType,LPWSTR lpServiceName,DWORD dwNameLength); -INT -STDCALL -GetServiceA(DWORD dwNameSpace,LPGUID lpGuid,LPSTR lpServiceName,DWORD dwProperties,LPVOID lpBuffer,LPDWORD lpdwBufferSize,LPSERVICE_ASYNC_INFO lpServiceAsyncInfo); -INT -STDCALL -GetServiceW(DWORD dwNameSpace,LPGUID lpGuid,LPWSTR lpServiceName,DWORD dwProperties,LPVOID lpBuffer,LPDWORD lpdwBufferSize,LPSERVICE_ASYNC_INFO lpServiceAsyncInfo); -INT -STDCALL -GetTypeByNameA(LPSTR lpServiceName,LPGUID lpServiceType); -INT -STDCALL -GetTypeByNameW(LPWSTR lpServiceName,LPGUID lpServiceType); -INT -STDCALL -SetServiceA(DWORD dwNameSpace,DWORD dwOperation,DWORD dwFlags,LPSERVICE_INFOA lpServiceInfo,LPSERVICE_ASYNC_INFO lpServiceAsyncInfo,LPDWORD lpdwStatusFlags); -INT -STDCALL -SetServiceW(DWORD dwNameSpace,DWORD dwOperation,DWORD dwFlags,LPSERVICE_INFOW lpServiceInfo,LPSERVICE_ASYNC_INFO lpServiceAsyncInfo,LPDWORD lpdwStatusFlags); -WINBOOL -STDCALL -TransmitFile(SOCKET hSocket,HANDLE hFile,DWORD nNumberOfBytesToWrite,DWORD nNumberOfBytesPerSend,LPOVERLAPPED lpOverlapped,LPTRANSMIT_FILE_BUFFERS lpTransmitBuffers,DWORD dwReserved); -INT -STDCALL -WSARecvEx(SOCKET s,LPSTR buf,INT len,LPINT flags); - -struct netent * STDCALL getnetbyname(const char *name); -void STDCALL s_perror(LPCSTR message); -UINT STDCALL inet_network(const char *cp); -BOOL STDCALL WSApSetPostRoutine(PVOID Routine); - -typedef DWORD (* LPFN_NSPAPI) (VOID ) ; - -typedef struct _NS_ROUTINE { - DWORD dwFunctionCount; - LPFN_NSPAPI *alpfnFunctions; - DWORD dwNameSpace; - DWORD dwPriority; -} NS_ROUTINE, *PNS_ROUTINE, * FAR LPNS_ROUTINE; - -INT -APIENTRY -NPLoadNameSpaces ( - IN OUT LPDWORD lpdwVersion, - IN OUT LPNS_ROUTINE nsrBuffer, - IN OUT LPDWORD lpdwBufferLength - ); - -#ifdef __cplusplus -}; -#endif /* __cplusplus */ - -#endif /* !__USE_W32API */ - -#endif /* __WINSOCK2_H */ - -/* EOF */ diff --git a/reactos/include/ws2spi.h b/reactos/include/ws2spi.h deleted file mode 100644 index 70c92af946b..00000000000 --- a/reactos/include/ws2spi.h +++ /dev/null @@ -1,566 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Winsock 2 DLL - * FILE: include/ws2spi.h - * PURPOSE: Header file for the WinSock 2 DLL - * and WinSock 2 Service Providers - */ -#ifndef __WS2SPI_H -#define __WS2SPI_H - -#include - -#ifdef __cplusplus -extern "C" -{ -#endif /* __cplusplus */ - -#define WSPAPI WSAAPI - - -#define WSPDESCRIPTION_LEN 255 - -typedef struct WSPData { - WORD wVersion; - WORD wHighVersion; - WCHAR szDescription[WSPDESCRIPTION_LEN + 1]; -} WSPDATA, FAR * LPWSPDATA; - - -typedef struct _WSATHREADID { - HANDLE ThreadHandle; - DWORD Reserved; -} WSATHREADID, FAR* LPWSATHREADID; - - -typedef BOOL (CALLBACK FAR* LPBLOCKINGCALLBACK)( - DWORD dwContext); - -typedef VOID (CALLBACK FAR* LPWSAUSERAPC)( - DWORD dwContext); - - -/* Prototypes for service provider procedure table */ - -typedef SOCKET (WSPAPI * LPWSPACCEPT)( - IN SOCKET s, - OUT LPSOCKADDR addr, - IN OUT LPINT addrlen, - IN LPCONDITIONPROC lpfnCondition, - IN DWORD dwCallbackData, - OUT LPINT lpErrno); - -typedef INT (WSPAPI * LPWSPADDRESSTOSTRING)( - IN LPSOCKADDR lpsaAddress, - IN DWORD dwAddressLength, - IN LPWSAPROTOCOL_INFOW lpProtocolInfo, - OUT LPWSTR lpszAddressString, - IN OUT LPDWORD lpdwAddressStringLength, - OUT LPINT lpErrno); - -typedef INT (WSPAPI * LPWSPASYNCSELECT)( - IN SOCKET s, - IN HWND hWnd, - IN UINT wMsg, - IN LONG lEvent, - OUT LPINT lpErrno); - -typedef INT (WSPAPI * LPWSPBIND)( - IN SOCKET s, - IN CONST LPSOCKADDR 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 LPSOCKADDR name, - IN INT namelen, - IN LPWSABUF lpCallerData, - OUT LPWSABUF lpCalleeData, - IN LPQOS lpSQOS, - IN LPQOS lpGQOS, - 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 LPSOCKADDR name, - IN OUT LPINT namelen, - OUT LPINT lpErrno); - -typedef BOOL (WSPAPI * LPWSPGETQOSBYNAME)( - IN SOCKET s, - IN OUT LPWSABUF lpQOSName, - OUT LPQOS lpQOS, - OUT LPINT lpErrno); - -typedef INT (WSPAPI * LPWSPGETSOCKNAME)( - IN SOCKET s, - OUT LPSOCKADDR 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 INT (WSPAPI * LPWSPIOCTL)( - IN SOCKET s, - IN DWORD dwIoControlCode, - IN LPVOID lpvInBuffer, - IN DWORD cbInBuffer, - OUT LPVOID lpvOutBuffer, - IN DWORD cbOutBuffer, - OUT LPDWORD lpcbBytesReturned, - IN LPWSAOVERLAPPED lpOverlapped, - IN LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine, - IN LPWSATHREADID lpThreadId, - OUT LPINT lpErrno); - -typedef SOCKET (WSPAPI * LPWSPJOINLEAF)( - IN SOCKET s, - IN CONST LPSOCKADDR name, - IN INT namelen, - IN LPWSABUF lpCallerData, - OUT LPWSABUF lpCalleeData, - IN LPQOS lpSQOS, - IN LPQOS lpGQOS, - 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 OUT LPWSABUF lpBuffers, - IN DWORD dwBufferCount, - OUT LPDWORD lpNumberOfBytesRecvd, - IN OUT LPDWORD lpFlags, - IN LPWSAOVERLAPPED lpOverlapped, - IN LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine, - IN LPWSATHREADID lpThreadId, - OUT LPINT lpErrno); - -typedef INT (WSPAPI * LPWSPRECVDISCONNECT)( - IN SOCKET s, - OUT LPWSABUF lpInboundDisconnectData, - OUT LPINT lpErrno); - -typedef INT (WSPAPI * LPWSPRECVFROM)( - IN SOCKET s, - IN OUT LPWSABUF lpBuffers, - IN DWORD dwBufferCount, - OUT LPDWORD lpNumberOfBytesRecvd, - IN OUT LPDWORD lpFlags, - OUT LPSOCKADDR lpFrom, - IN OUT LPINT lpFromlen, - IN LPWSAOVERLAPPED lpOverlapped, - IN LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine, - IN LPWSATHREADID lpThreadId, - OUT LPINT lpErrno); - -typedef INT (WSPAPI * LPWSPSELECT)( - IN INT nfds, - IN OUT LPFD_SET readfds, - IN OUT LPFD_SET writefds, - IN OUT LPFD_SET exceptfds, - IN CONST LPTIMEVAL timeout, - OUT LPINT lpErrno); - -typedef INT (WSPAPI * LPWSPSEND)( - IN SOCKET s, - IN LPWSABUF lpBuffers, - IN DWORD dwBufferCount, - OUT LPDWORD lpNumberOfBytesSent, - IN DWORD dwFlags, - IN LPWSAOVERLAPPED lpOverlapped, - IN LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine, - IN LPWSATHREADID lpThreadId, - OUT LPINT lpErrno); - -typedef INT (WSPAPI * LPWSPSENDDISCONNECT)( - IN SOCKET s, - IN LPWSABUF lpOutboundDisconnectData, - OUT LPINT lpErrno); - -typedef INT (WSPAPI * LPWSPSENDTO)( - IN SOCKET s, - IN LPWSABUF lpBuffers, - IN DWORD dwBufferCount, - OUT LPDWORD lpNumberOfBytesSent, - IN DWORD dwFlags, - IN CONST LPSOCKADDR lpTo, - IN INT iTolen, - IN LPWSAOVERLAPPED lpOverlapped, - IN LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine, - IN LPWSATHREADID lpThreadId, - OUT LPINT lpErrno); - -typedef INT (WSPAPI * LPWSPSETSOCKOPT)( - IN SOCKET s, - IN INT level, - IN INT optname, - IN CONST CHAR FAR* optval, - 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, - IN GROUP g, - IN DWORD dwFlags, - OUT LPINT lpErrno); - -typedef INT (WSPAPI * LPWSPSTRINGTOADDRESS)( - IN LPWSTR AddressString, - IN INT AddressFamily, - IN LPWSAPROTOCOL_INFOW lpProtocolInfo, - OUT LPSOCKADDR lpAddress, - IN OUT LPINT lpAddressLength, - OUT LPINT lpErrno); - - -/* Service provider procedure table */ -typedef struct _WSPPROC_TABLE { - LPWSPACCEPT lpWSPAccept; - LPWSPADDRESSTOSTRING lpWSPAddressToString; - LPWSPASYNCSELECT lpWSPAsyncSelect; - LPWSPBIND lpWSPBind; - LPWSPCANCELBLOCKINGCALL lpWSPCancelBlockingCall; - LPWSPCLEANUP lpWSPCleanup; - LPWSPCLOSESOCKET lpWSPCloseSocket; - LPWSPCONNECT lpWSPConnect; - LPWSPDUPLICATESOCKET lpWSPDuplicateSocket; - LPWSPENUMNETWORKEVENTS lpWSPEnumNetworkEvents; - LPWSPEVENTSELECT lpWSPEventSelect; - LPWSPGETOVERLAPPEDRESULT lpWSPGetOverlappedResult; - LPWSPGETPEERNAME lpWSPGetPeerName; - LPWSPGETSOCKNAME lpWSPGetSockName; - LPWSPGETSOCKOPT lpWSPGetSockOpt; - LPWSPGETQOSBYNAME lpWSPGetQOSByName; - LPWSPIOCTL lpWSPIoctl; - LPWSPJOINLEAF lpWSPJoinLeaf; - LPWSPLISTEN lpWSPListen; - LPWSPRECV lpWSPRecv; - LPWSPRECVDISCONNECT lpWSPRecvDisconnect; - LPWSPRECVFROM lpWSPRecvFrom; - LPWSPSELECT lpWSPSelect; - LPWSPSEND lpWSPSend; - LPWSPSENDDISCONNECT lpWSPSendDisconnect; - LPWSPSENDTO lpWSPSendTo; - LPWSPSETSOCKOPT lpWSPSetSockOpt; - LPWSPSHUTDOWN lpWSPShutdown; - LPWSPSOCKET lpWSPSocket; - LPWSPSTRINGTOADDRESS lpWSPStringToAddress; -} WSPPROC_TABLE, FAR* LPWSPPROC_TABLE; - - -/* Prototypes for service provider upcall procedure table */ - -typedef BOOL (WSPAPI * LPWPUCLOSEEVENT)( - IN WSAEVENT hEvent, - OUT LPINT lpErrno); - -typedef INT (WSPAPI * LPWPUCLOSESOCKETHANDLE)( - IN SOCKET s, - OUT LPINT lpErrno); - -typedef INT (WSPAPI * LPWPUCLOSETHREAD)( - IN LPWSATHREADID lpThreadId, - OUT LPINT lpErrno); - -typedef WSAEVENT (WSPAPI * LPWPUCREATEEVENT)( - OUT LPINT lpErrno); - -typedef SOCKET (WSPAPI * LPWPUCREATESOCKETHANDLE)( - IN DWORD dwCatalogEntryId, - IN DWORD dwContext, - OUT LPINT lpErrno); - -typedef SOCKET (WSPAPI * LPWPUFDISSET)( - IN SOCKET s, - IN LPFD_SET set); - -typedef INT (WSPAPI * LPWPUGETPROVIDERPATH)( - IN LPGUID lpProviderId, - OUT LPWSTR lpszProviderDllPath, - IN OUT LPINT lpProviderDllPathLen, - OUT LPINT lpErrno); - -typedef SOCKET (WSPAPI * LPWPUMODIFYIFSHANDLE)( - IN DWORD dwCatalogEntryId, - IN SOCKET ProposedHandle, - OUT LPINT lpErrno); - -typedef INT (WSPAPI * LPWPUOPENCURRENTTHREAD)( - OUT LPWSATHREADID lpThreadId, - 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 LPDWORD lpdwContext, - OUT LPINT lpErrno); - -typedef INT (WSPAPI * LPWPUQUERYSOCKETHANDLECONTEXT)( - IN SOCKET s, - OUT LPDWORD lpContext, - OUT LPINT lpErrno); - -typedef INT (WSPAPI * LPWPUQUEUEAPC)( - IN LPWSATHREADID lpThreadId, - IN LPWSAUSERAPC lpfnUserApc, - IN DWORD dwContext, - OUT LPINT lpErrno); - -typedef BOOL (WSPAPI * LPWPURESETEVENT)( - IN WSAEVENT hEvent, - OUT LPINT lpErrno); - -typedef BOOL (WSPAPI * LPWPUSETEVENT)( - IN WSAEVENT hEvent, - OUT LPINT lpErrno); - - -/* Available only directly from the DLL */ - -typedef INT (WSPAPI * LPWPUCOMPLETEOVERLAPPEDREQUEST)( - SOCKET s, - LPWSAOVERLAPPED lpOverlapped, - DWORD dwError, - DWORD cbTransferred, - LPINT lpErrno); - - -/* 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)( - IN WORD wVersionRequested, - OUT LPWSPDATA lpWSPData, - IN LPWSAPROTOCOL_INFOW lpProtocolInfo, - IN WSPUPCALLTABLE UpcallTable, - OUT LPWSPPROC_TABLE lpProcTable); - - -/* Prototypes for service provider namespace procedure table */ - -typedef INT (WSPAPI * LPNSPCLEANUP)( - IN LPGUID lpProviderId); - -typedef INT (WSPAPI * LPNSPGETSERVICECLASSINFO)( - IN LPGUID lpProviderId, - IN OUT LPDWORD lpdwBufSize, - IN OUT LPWSASERVICECLASSINFOW lpServiceClassInfo); - -typedef INT (WSPAPI * LPNSPINSTALLSERVICECLASS)( - IN LPGUID lpProviderId, - IN LPWSASERVICECLASSINFOW lpServiceClassInfo); - -typedef INT (WSPAPI * LPNSPLOOKUPSERVICEBEGIN)( - IN LPGUID lpProviderId, - IN LPWSAQUERYSETW lpqsRestrictions, - IN LPWSASERVICECLASSINFOW lpServiceClassInfo, - IN DWORD dwControlFlags, - OUT LPHANDLE lphLookup); - -typedef INT (WSPAPI * LPNSPLOOKUPSERVICEEND)( - IN HANDLE hLookup); - -typedef INT (WSPAPI * LPNSPLOOKUPSERVICENEXT)( - IN HANDLE hLookup, - IN DWORD dwControlFlags, - IN OUT LPDWORD lpdwBufferLength, - OUT LPWSAQUERYSETW lpqsResults); - -typedef INT (WSPAPI * LPNSPREMOVESERVICECLASS)( - IN LPGUID lpProviderId, - IN LPGUID lpServiceClassId); - -typedef INT (WSPAPI * LPNSPSETSERVICE)( - IN LPGUID lpProviderId, - IN LPWSASERVICECLASSINFOW lpServiceClassInfo, - IN LPWSAQUERYSETW lpqsRegInfo, - IN WSAESETSERVICEOP essOperation, - IN DWORD dwControlFlags); - - -typedef struct _NSP_ROUTINE { - DWORD cbSize; - DWORD dwMajorVersion; - DWORD dwMinorVersion; - LPNSPCLEANUP NSPCleanup; - LPNSPLOOKUPSERVICEBEGIN NSPLookupServiceBegin; - LPNSPLOOKUPSERVICENEXT NSPLookupServiceNext; - LPNSPLOOKUPSERVICEEND NSPLookupServiceEnd; - LPNSPSETSERVICE NSPSetService; - LPNSPINSTALLSERVICECLASS NSPInstallServiceClass; - LPNSPREMOVESERVICECLASS NSPRemoveServiceClass; - LPNSPGETSERVICECLASSINFO NSPGetServiceClassInfo; -} NSP_ROUTINE, *PNSP_ROUTINE, *LPNSP_ROUTINE; - - -INT -WSPAPI -NSPStartup( - IN LPGUID lpProviderId, - OUT LPNSP_ROUTINE lpNspRoutines); - - -/* WinSock 2 DLL function prototypes */ - -INT -WSPAPI -WPUCompleteOverlappedRequest( - IN SOCKET s, - IN LPWSAOVERLAPPED lpOverlapped, - IN DWORD dwError, - IN DWORD cbTransferred, - OUT LPINT lpErrno); - -INT -WSPAPI -WSPStartup( - IN WORD wVersionRequested, - OUT LPWSPDATA lpWSPData, - IN LPWSAPROTOCOL_INFOW lpProtocolInfo, - IN WSPUPCALLTABLE UpcallTable, - OUT LPWSPPROC_TABLE lpProcTable); - -INT -WSPAPI -WSCDeinstallProvider( - IN LPGUID lpProviderId, - OUT LPINT lpErrno); - -INT -WSPAPI -WSCEnumProtocols( - IN LPINT lpiProtocols, - OUT LPWSAPROTOCOL_INFOW lpProtocolBuffer, - IN OUT LPDWORD lpdwBufferLength, - OUT LPINT lpErrno); - -INT -WSPAPI -WSCGetProviderPath( - IN LPGUID lpProviderId, - OUT LPWSTR lpszProviderDllPath, - IN OUT LPINT lpProviderDllPathLen, - OUT LPINT lpErrno); - -INT -WSPAPI -WSCInstallProvider( - IN CONST LPGUID lpProviderId, - IN CONST LPWSTR lpszProviderDllPath, - IN CONST LPWSAPROTOCOL_INFOW lpProtocolInfoList, - IN DWORD dwNumberOfEntries, - OUT LPINT lpErrno); - -INT -WSPAPI -WSCEnableNSProvider( - IN LPGUID lpProviderId, - IN BOOL fEnable); - -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 -WSCWriteProviderOrder( - IN LPDWORD lpwdCatalogEntryId, - IN DWORD dwNumberOfEntries); - -#ifdef __cplusplus -}; -#endif /* __cplusplus */ - -#endif /* __WS2SPI_H */ - -/* EOF */ diff --git a/reactos/include/wsahelp.h b/reactos/include/wsahelp.h deleted file mode 100644 index e1e1b4d4297..00000000000 --- a/reactos/include/wsahelp.h +++ /dev/null @@ -1,349 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Winsock 2 DLL - * FILE: include/wsahelp.h - * PURPOSE: Header file for the WinSock 2 DLL - * and WinSock 2 Helper DLLs - */ -#ifndef __WSAHELP_H -#define __WSAHELP_H - -#include - -#ifdef __cplusplus -extern "C" -{ -#endif /* __cplusplus */ - -#define WSH_NOTIFY_BIND 0x00000001 -#define WSH_NOTIFY_LISTEN 0x00000002 -#define WSH_NOTIFY_CONNECT 0x00000004 -#define WSH_NOTIFY_ACCEPT 0x00000008 -#define WSH_NOTIFY_SHUTDOWN_RECEIVE 0x00000010 -#define WSH_NOTIFY_SHUTDOWN_SEND 0x00000020 -#define WSH_NOTIFY_SHUTDOWN_ALL 0x00000040 -#define WSH_NOTIFY_CLOSE 0x00000080 -#define WSH_NOTIFY_CONNECT_ERROR 0x00000100 - -#define SOL_INTERNAL 0xFFFE - -#define SO_CONTEXT 1 - -typedef enum _SOCKADDR_ADDRESS_INFO { - SockaddrAddressInfoNormal, - SockaddrAddressInfoWildcard, - SockaddrAddressInfoBroadcast, - SockaddrAddressInfoLoopback -} SOCKADDR_ADDRESS_INFO, *PSOCKADDR_ADDRESS_INFO; - -typedef enum _SOCKADDR_ENDPOINT_INFO { - SockaddrEndpointInfoNormal, - SockaddrEndpointInfoWildcard, - SockaddrEndpointInfoReserved, -} SOCKADDR_ENDPOINT_INFO, *PSOCKADDR_ENDPOINT_INFO; - - -typedef struct _WINSOCK_MAPPING { - DWORD Rows; - DWORD Columns; - struct { - DWORD AddressFamily; - DWORD SocketType; - DWORD Protocol; - } Mapping[1]; -} WINSOCK_MAPPING, *PWINSOCK_MAPPING; - - -typedef struct _SOCKADDR_INFO { - SOCKADDR_ADDRESS_INFO AddressInfo; - SOCKADDR_ENDPOINT_INFO EndpointInfo; -} SOCKADDR_INFO, *PSOCKADDR_INFO; - - -INT -WINAPI -WSHAddressToString( - IN LPSOCKADDR Address, - IN INT AddressLength, - IN LPWSAPROTOCOL_INFOW ProtocolInfo OPTIONAL, - OUT LPWSTR AddressString, - IN OUT LPDWORD AddressStringLength); - -INT -WINAPI -WSHEnumProtocols( - IN LPINT lpiProtocols OPTIONAL, - IN LPWSTR lpTransportKeyName, - IN OUT LPVOID lpProtocolBuffer, - IN OUT LPDWORD lpdwBufferLength); - -INT -WINAPI -WSHGetBroadcastSockaddr( - IN PVOID HelperDllSocketContext, - OUT PSOCKADDR Sockaddr, - OUT PINT SockaddrLength); - -INT -WINAPI -WSHGetProviderGuid( - IN LPWSTR ProviderName, - OUT LPGUID ProviderGuid); - -INT -WINAPI -WSHGetSockaddrType( - IN PSOCKADDR Sockaddr, - IN DWORD SockaddrLength, - OUT PSOCKADDR_INFO SockaddrInfo); - -INT -WINAPI -WSHGetSocketInformation( - IN PVOID HelperDllSocketContext, - IN SOCKET SocketHandle, - IN HANDLE TdiAddressObjectHandle, - IN HANDLE TdiConnectionObjectHandle, - IN INT Level, - IN INT OptionName, - OUT PCHAR OptionValue, - OUT INT OptionLength); - -INT -WINAPI -WSHGetWildcardSockaddr( - IN PVOID HelperDllSocketContext, - OUT PSOCKADDR Sockaddr, - OUT PINT SockaddrLength); - -DWORD -WINAPI -WSHGetWinsockMapping( - OUT PWINSOCK_MAPPING Mapping, - IN DWORD MappingLength); - -INT -WINAPI -WSHGetWSAProtocolInfo( - IN LPWSTR ProviderName, - OUT LPWSAPROTOCOL_INFOW *ProtocolInfo, - OUT LPDWORD ProtocolInfoEntries); - -INT -WINAPI -WSHIoctl( - IN PVOID HelperDllSocketContext, - IN SOCKET SocketHandle, - IN HANDLE TdiAddressObjectHandle, - IN HANDLE TdiConnectionObjectHandle, - IN DWORD IoControlCode, - IN LPVOID InputBuffer, - IN DWORD InputBufferLength, - IN LPVOID OutputBuffer, - IN DWORD OutputBufferLength, - OUT LPDWORD NumberOfBytesReturned, - IN LPWSAOVERLAPPED Overlapped, - IN LPWSAOVERLAPPED_COMPLETION_ROUTINE CompletionRoutine, - OUT LPBOOL NeedsCompletion); - -INT -WINAPI -WSHJoinLeaf( - IN PVOID HelperDllSocketContext, - IN SOCKET SocketHandle, - IN HANDLE TdiAddressObjectHandle, - IN HANDLE TdiConnectionObjectHandle, - IN PVOID LeafHelperDllSocketContext, - IN SOCKET LeafSocketHandle, - IN PSOCKADDR Sockaddr, - IN DWORD SockaddrLength, - IN LPWSABUF CallerData, - IN LPWSABUF CalleeData, - IN LPQOS SocketQOS, - IN LPQOS GroupQOS, - IN DWORD Flags); - -INT -WINAPI -WSHNotify( - IN PVOID HelperDllSocketContext, - IN SOCKET SocketHandle, - IN HANDLE TdiAddressObjectHandle, - IN HANDLE TdiConnectionObjectHandle, - IN DWORD NotifyEvent); - -INT -WINAPI -WSHOpenSocket( - IN OUT PINT AddressFamily, - IN OUT PINT SocketType, - IN OUT PINT Protocol, - OUT PUNICODE_STRING TransportDeviceName, - OUT PVOID HelperDllSocketContext, - OUT PDWORD NotificationEvents); - -INT -WINAPI -WSHOpenSocket2( - OUT PINT AddressFamily, - IN OUT PINT SocketType, - IN OUT PINT Protocol, - IN GROUP Group, - IN DWORD Flags, - OUT PUNICODE_STRING TransportDeviceName, - OUT PVOID *HelperDllSocketContext, - OUT PDWORD NotificationEvents); - -INT -WINAPI -WSHSetSocketInformation( - IN PVOID HelperDllSocketContext, - IN SOCKET SocketHandle, - IN HANDLE TdiAddressObjectHandle, - IN HANDLE TdiConnectionObjectHandle, - IN INT Level, - IN INT OptionName, - IN PCHAR OptionValue, - IN INT OptionLength); - -INT -WINAPI -WSHStringToAddress( - IN LPWSTR AddressString, - IN DWORD AddressFamily, - IN LPWSAPROTOCOL_INFOW ProtocolInfo OPTIONAL, - OUT LPSOCKADDR Address, - IN OUT LPDWORD AddressStringLength); - - - -typedef INT (WINAPI * PWSH_ADDRESS_TO_STRING)( - IN LPSOCKADDR Address, - IN INT AddressLength, - IN LPWSAPROTOCOL_INFOW ProtocolInfo OPTIONAL, - OUT LPWSTR AddressString, - IN OUT LPDWORD AddressStringLength); - -typedef INT (WINAPI * PWSH_ENUM_PROTOCOLS)( - IN LPINT lpiProtocols OPTIONAL, - IN LPWSTR lpTransportKeyName, - IN OUT LPVOID lpProtocolBuffer, - IN OUT LPDWORD lpdwBufferLength); - -typedef INT (WINAPI * PWSH_GET_BROADCAST_SOCKADDR)( - IN PVOID HelperDllSocketContext, - OUT PSOCKADDR Sockaddr, - OUT PINT SockaddrLength); - -typedef INT (WINAPI * PWSH_GET_PROVIDER_GUID)( - IN LPWSTR ProviderName, - OUT LPGUID ProviderGuid); - -typedef INT (WINAPI * PWSH_GET_SOCKADDR_TYPE)( - IN PSOCKADDR Sockaddr, - IN DWORD SockaddrLength, - OUT PSOCKADDR_INFO SockaddrInfo); - -typedef INT (WINAPI * PWSH_GET_SOCKET_INFORMATION)( - IN PVOID HelperDllSocketContext, - IN SOCKET SocketHandle, - IN HANDLE TdiAddressObjectHandle, - IN HANDLE TdiConnectionObjectHandle, - IN INT Level, - IN INT OptionName, - OUT PCHAR OptionValue, - OUT INT OptionLength); - -typedef INT (WINAPI * PWSH_GET_WILDCARD_SOCKEADDR)( - IN PVOID HelperDllSocketContext, - OUT PSOCKADDR Sockaddr, - OUT PINT SockaddrLength); - -typedef DWORD (WINAPI * PWSH_GET_WINSOCK_MAPPING)( - OUT PWINSOCK_MAPPING Mapping, - IN DWORD MappingLength); - -typedef INT (WINAPI * PWSH_GET_WSAPROTOCOL_INFO)( - IN LPWSTR ProviderName, - OUT LPWSAPROTOCOL_INFOW *ProtocolInfo, - OUT LPDWORD ProtocolInfoEntries); - -typedef INT (WINAPI * PWSH_IOCTL)( - IN PVOID HelperDllSocketContext, - IN SOCKET SocketHandle, - IN HANDLE TdiAddressObjectHandle, - IN HANDLE TdiConnectionObjectHandle, - IN DWORD IoControlCode, - IN LPVOID InputBuffer, - IN DWORD InputBufferLength, - IN LPVOID OutputBuffer, - IN DWORD OutputBufferLength, - OUT LPDWORD NumberOfBytesReturned, - IN LPWSAOVERLAPPED Overlapped, - IN LPWSAOVERLAPPED_COMPLETION_ROUTINE CompletionRoutine, - OUT LPBOOL NeedsCompletion); - -typedef INT (WINAPI * PWSH_JOIN_LEAF)( - IN PVOID HelperDllSocketContext, - IN SOCKET SocketHandle, - IN HANDLE TdiAddressObjectHandle, - IN HANDLE TdiConnectionObjectHandle, - IN PVOID LeafHelperDllSocketContext, - IN SOCKET LeafSocketHandle, - IN PSOCKADDR Sockaddr, - IN DWORD SockaddrLength, - IN LPWSABUF CallerData, - IN LPWSABUF CalleeData, - IN LPQOS SocketQOS, - IN LPQOS GroupQOS, - IN DWORD Flags); - -typedef INT (WINAPI * PWSH_NOTIFY)( - IN PVOID HelperDllSocketContext, - IN SOCKET SocketHandle, - IN HANDLE TdiAddressObjectHandle, - IN HANDLE TdiConnectionObjectHandle, - IN DWORD NotifyEvent); - -typedef INT (WINAPI * PWSH_OPEN_SOCKET)( - IN OUT PINT AddressFamily, - IN OUT PINT SocketType, - IN OUT PINT Protocol, - OUT PUNICODE_STRING TransportDeviceName, - OUT PVOID HelperDllSocketContext, - OUT PDWORD NotificationEvents); - -typedef INT (WINAPI * PWSH_OPEN_SOCKET2)( - OUT PINT AddressFamily, - IN OUT PINT SocketType, - IN OUT PINT Protocol, - IN GROUP Group, - IN DWORD Flags, - OUT PUNICODE_STRING TransportDeviceName, - OUT PVOID *HelperDllSocketContext, - OUT PDWORD NotificationEvents); - -typedef INT (WINAPI * PWSH_SET_SOCKET_INFORMATION)( - IN PVOID HelperDllSocketContext, - IN SOCKET SocketHandle, - IN HANDLE TdiAddressObjectHandle, - IN HANDLE TdiConnectionObjectHandle, - IN INT Level, - IN INT OptionName, - IN PCHAR OptionValue, - IN INT OptionLength); - -typedef INT (WINAPI * PWSH_STRING_TO_ADDRESS)( - IN LPWSTR AddressString, - IN DWORD AddressFamily, - IN LPWSAPROTOCOL_INFOW ProtocolInfo OPTIONAL, - OUT LPSOCKADDR Address, - IN OUT LPDWORD AddressStringLength); - -#ifdef __cplusplus -}; -#endif /* __cplusplus */ - -#endif /* __WSAHELP_H */ - -/* EOF */ diff --git a/reactos/lib/advapi32/makefile b/reactos/lib/advapi32/makefile index c70b628660f..cdda88404f6 100644 --- a/reactos/lib/advapi32/makefile +++ b/reactos/lib/advapi32/makefile @@ -1,4 +1,4 @@ -# $Id: makefile,v 1.30 2003/09/08 09:56:56 weiden Exp $ +# $Id: makefile,v 1.31 2004/01/11 20:46:05 navaraf Exp $ PATH_TO_TOP = ../.. @@ -11,9 +11,6 @@ TARGET_CFLAGS = \ -Werror \ -fno-builtin -# require os code to explicitly request A/W version of structs/functions -TARGET_CFLAGS += -D_DISABLE_TIDENTS - TARGET_LFLAGS = -nostartfiles -nostdlib TARGET_SDKLIBS = ntdll.a kernel32.a diff --git a/reactos/lib/iphlpapi/iphlpapi.c b/reactos/lib/iphlpapi/iphlpapi.c index 6d2f315811c..cb22399de34 100644 --- a/reactos/lib/iphlpapi/iphlpapi.c +++ b/reactos/lib/iphlpapi/iphlpapi.c @@ -15,6 +15,7 @@ #include #include +#include #include #include #include @@ -395,8 +396,8 @@ static void EnumNameServers( HANDLE RegHandle, PWCHAR Interface, */ static void EnumInterfaces( PVOID Data, EnumInterfacesFunc cb ) { - HANDLE RegHandle; - HANDLE ChildKeyHandle = 0; + HKEY RegHandle; + HKEY ChildKeyHandle = 0; PWCHAR RegKeyToEnumerate = L"SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters\\Interfaces"; PWCHAR ChildKeyName = 0; diff --git a/reactos/lib/iphlpapi/ipregprivate.h b/reactos/lib/iphlpapi/ipregprivate.h index 98b3e87654b..a7b1519d49f 100644 --- a/reactos/lib/iphlpapi/ipregprivate.h +++ b/reactos/lib/iphlpapi/ipregprivate.h @@ -4,7 +4,7 @@ int GetLongestChildKeyName( HANDLE RegHandle ); LONG OpenChildKeyRead( HANDLE RegHandle, PWCHAR ChildKeyName, - HANDLE *ReturnHandle ); + PHKEY ReturnHandle ); PWCHAR GetNthChildKeyName( HANDLE RegHandle, DWORD n ); void ConsumeChildKeyName( PWCHAR Name ); PWCHAR QueryRegistryValueString( HANDLE RegHandle, PWCHAR ValueName ); diff --git a/reactos/lib/iphlpapi/makefile b/reactos/lib/iphlpapi/makefile index 73ae38320a9..fc8bb93cba7 100644 --- a/reactos/lib/iphlpapi/makefile +++ b/reactos/lib/iphlpapi/makefile @@ -8,10 +8,7 @@ TARGET_NAME = iphlpapi TARGET_BASE = 0x777c0000 -TARGET_CFLAGS = -DUNICODE -D_UNICODE - -# require os code to explicitly request A/W version of structs/functions -TARGET_CFLAGS += -D_DISABLE_TIDENTS -Wall -Werror -g +TARGET_CFLAGS = -DUNICODE -D_UNICODE -D__USE_W32API -Wall -Werror TARGET_SDKLIBS = ntdll.a kernel32.a diff --git a/reactos/lib/iphlpapi/registry.c b/reactos/lib/iphlpapi/registry.c index 970b4d24a4b..15eeb8c7425 100644 --- a/reactos/lib/iphlpapi/registry.c +++ b/reactos/lib/iphlpapi/registry.c @@ -22,7 +22,7 @@ int GetLongestChildKeyName( HANDLE RegHandle ) { NULL, NULL, NULL); - if (Status == STATUS_SUCCESS) + if (Status == ERROR_SUCCESS) return MaxAdapterName + 1; else return -1; @@ -30,7 +30,7 @@ int GetLongestChildKeyName( HANDLE RegHandle ) { LONG OpenChildKeyRead( HANDLE RegHandle, PWCHAR ChildKeyName, - HANDLE *ReturnHandle ) { + PHKEY ReturnHandle ) { return RegOpenKeyExW( RegHandle, ChildKeyName, 0, @@ -57,7 +57,7 @@ PWCHAR GetNthChildKeyName( HANDLE RegHandle, DWORD n ) { Value = (PWCHAR)malloc( MaxAdapterName * sizeof(WCHAR) ); Status = RegEnumKeyExW( RegHandle, n, Value, &ValueLen, NULL, NULL, NULL, NULL ); - if (Status != STATUS_SUCCESS) + if (Status != ERROR_SUCCESS) return 0; else { Value[ValueLen] = 0; diff --git a/reactos/lib/msafd/include/msafd.h b/reactos/lib/msafd/include/msafd.h index 784e0745c19..ad66fc34a49 100644 --- a/reactos/lib/msafd/include/msafd.h +++ b/reactos/lib/msafd/include/msafd.h @@ -8,11 +8,12 @@ #define __MSAFD_H #include +#include +#include +#include #include #include #include -#include -#include #include #include #include diff --git a/reactos/lib/msafd/makefile b/reactos/lib/msafd/makefile index a1b11eb0241..7de028e97d3 100644 --- a/reactos/lib/msafd/makefile +++ b/reactos/lib/msafd/makefile @@ -1,4 +1,4 @@ -# $Id: makefile,v 1.11 2003/09/12 17:51:47 vizzini Exp $ +# $Id: makefile,v 1.12 2004/01/11 20:46:05 navaraf Exp $ PATH_TO_TOP = ../.. @@ -8,9 +8,6 @@ TARGET_NAME = msafd TARGET_BASE = 0x777a0000 -# require os code to explicitly request A/W version of structs/functions -TARGET_CFLAGS += -D_DISABLE_TIDENTS -Wall -Werror - TARGET_SDKLIBS = ntdll.a kernel32.a TARGET_CFLAGS = \ @@ -19,7 +16,8 @@ TARGET_CFLAGS = \ -Werror \ -fno-builtin \ -DUNICODE \ - -DDBG + -DDBG \ + -D__USE_W32API TARGET_LFLAGS = -nostartfiles -nostdlib diff --git a/reactos/lib/msafd/misc/dllmain.c b/reactos/lib/msafd/misc/dllmain.c index 70f2444c645..7c66dad326b 100644 --- a/reactos/lib/msafd/misc/dllmain.c +++ b/reactos/lib/msafd/misc/dllmain.c @@ -113,7 +113,7 @@ NTSTATUS OpenSocket( NULL, NULL); - Status = NtCreateFile( + Status = ZwCreateFile( &FileHandle, FILE_GENERIC_READ | FILE_GENERIC_WRITE, &ObjectAttributes, @@ -683,7 +683,7 @@ NTSTATUS OpenCommandChannel( NULL, NULL); - Status = NtCreateFile( + Status = ZwCreateFile( &FileHandle, FILE_GENERIC_READ | FILE_GENERIC_WRITE, &ObjectAttributes, @@ -783,11 +783,11 @@ WSPStartup( lpProcTable->lpWSPAccept = WSPAccept; lpProcTable->lpWSPAddressToString = WSPAddressToString; lpProcTable->lpWSPAsyncSelect = WSPAsyncSelect; - lpProcTable->lpWSPBind = WSPBind; + lpProcTable->lpWSPBind = (LPWSPBIND)WSPBind; lpProcTable->lpWSPCancelBlockingCall = WSPCancelBlockingCall; lpProcTable->lpWSPCleanup = WSPCleanup; lpProcTable->lpWSPCloseSocket = WSPCloseSocket; - lpProcTable->lpWSPConnect = WSPConnect; + lpProcTable->lpWSPConnect = (LPWSPCONNECT)WSPConnect; lpProcTable->lpWSPDuplicateSocket = WSPDuplicateSocket; lpProcTable->lpWSPEnumNetworkEvents = WSPEnumNetworkEvents; lpProcTable->lpWSPEventSelect = WSPEventSelect; @@ -797,7 +797,7 @@ WSPStartup( lpProcTable->lpWSPGetSockOpt = WSPGetSockOpt; lpProcTable->lpWSPGetQOSByName = WSPGetQOSByName; lpProcTable->lpWSPIoctl = WSPIoctl; - lpProcTable->lpWSPJoinLeaf = WSPJoinLeaf; + lpProcTable->lpWSPJoinLeaf = (LPWSPJOINLEAF)WSPJoinLeaf; lpProcTable->lpWSPListen = WSPListen; lpProcTable->lpWSPRecv = WSPRecv; lpProcTable->lpWSPRecvDisconnect = WSPRecvDisconnect; @@ -805,7 +805,7 @@ WSPStartup( lpProcTable->lpWSPSelect = WSPSelect; lpProcTable->lpWSPSend = WSPSend; lpProcTable->lpWSPSendDisconnect = WSPSendDisconnect; - lpProcTable->lpWSPSendTo = WSPSendTo; + lpProcTable->lpWSPSendTo = (LPWSPSENDTO)WSPSendTo; lpProcTable->lpWSPSetSockOpt = WSPSetSockOpt; lpProcTable->lpWSPShutdown = WSPShutdown; lpProcTable->lpWSPSocket = WSPSocket; diff --git a/reactos/lib/mswsock/Makefile b/reactos/lib/mswsock/Makefile index 307bd5e1cdb..4da4007311a 100644 --- a/reactos/lib/mswsock/Makefile +++ b/reactos/lib/mswsock/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.2 2003/11/19 13:16:22 navaraf Exp $ +# $Id: Makefile,v 1.3 2004/01/11 20:46:05 navaraf Exp $ PATH_TO_TOP = ../.. @@ -15,10 +15,8 @@ TARGET_CFLAGS = \ -fno-builtin \ -DUNICODE \ -DLE \ - -DDBG - -# require os code to explicitly request A/W version of structs/functions -TARGET_CFLAGS += -D_DISABLE_TIDENTS + -DDBG \ + -D__USE_W32API TARGET_LFLAGS = -nostartfiles -nostdlib diff --git a/reactos/lib/mswsock/stubs.c b/reactos/lib/mswsock/stubs.c index 413d2e9fe84..a808d37c7b5 100644 --- a/reactos/lib/mswsock/stubs.c +++ b/reactos/lib/mswsock/stubs.c @@ -1,4 +1,4 @@ -/* $Id: stubs.c,v 1.2 2003/09/13 21:15:03 vizzini Exp $ +/* $Id: stubs.c,v 1.3 2004/01/11 20:46:06 navaraf Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock DLL @@ -11,7 +11,17 @@ #include #include #include +#include #include +#include + +typedef DWORD (* LPFN_NSPAPI)(VOID); +typedef struct _NS_ROUTINE { + DWORD dwFunctionCount; + LPFN_NSPAPI *alpfnFunctions; + DWORD dwNameSpace; + DWORD dwPriority; +} NS_ROUTINE, *PNS_ROUTINE, * FAR LPNS_ROUTINE; /* * @unimplemented diff --git a/reactos/lib/packet/makefile b/reactos/lib/packet/makefile index d5d16deedfd..e5ae3e57e22 100644 --- a/reactos/lib/packet/makefile +++ b/reactos/lib/packet/makefile @@ -1,4 +1,4 @@ -# $Id: makefile,v 1.5 2003/11/14 17:13:31 weiden Exp $ +# $Id: makefile,v 1.6 2004/01/11 20:46:06 navaraf Exp $ PATH_TO_TOP = ../.. @@ -8,7 +8,7 @@ TARGET_NAME = packet TARGET_BASE = 0x77780000 -TARGET_CFLAGS = -I./include -DUNICODE -D_UNICODE -DLE -DDBG -D_DEBUG -Wall -Werror +TARGET_CFLAGS = -I./include -DUNICODE -D_UNICODE -DLE -DDBG -D_DEBUG -D__USE_W32API -Wall -Werror TARGET_SDKLIBS = ntdll.a kernel32.a advapi32.a diff --git a/reactos/lib/rosrtl/makefile b/reactos/lib/rosrtl/makefile index 6b8013c5a66..64208a4f7c5 100644 --- a/reactos/lib/rosrtl/makefile +++ b/reactos/lib/rosrtl/makefile @@ -1,4 +1,4 @@ -# $Id: makefile,v 1.10 2003/12/30 05:10:32 hyperion Exp $ +# $Id: makefile,v 1.11 2004/01/11 20:46:06 navaraf Exp $ PATH_TO_TOP = ../.. @@ -28,10 +28,7 @@ TARGET_TYPE = library TARGET_NAME = rosrtl -TARGET_CFLAGS = -Wall -Werror - -# require os code to explicitly request A/W version of structs/functions -TARGET_CFLAGS += -D_DISABLE_TIDENTS +TARGET_CFLAGS = -D__USE_W32API -Wall -Werror TARGET_OBJECTS = $(THREAD_OBJECTS) $(MISC_OBJECTS) diff --git a/reactos/lib/ws2_32/include/ws2_32.h b/reactos/lib/ws2_32/include/ws2_32.h index 6becbb6fabb..5021f6e5c35 100644 --- a/reactos/lib/ws2_32/include/ws2_32.h +++ b/reactos/lib/ws2_32/include/ws2_32.h @@ -8,9 +8,14 @@ #define __WS2_32_H #include +#include +#include +#include #include #include +#include #include +#undef assert #include /* Exported by ntdll.dll, but where is the prototype? */ diff --git a/reactos/lib/ws2_32/makefile b/reactos/lib/ws2_32/makefile index dbbf0407608..4ae2f75c270 100644 --- a/reactos/lib/ws2_32/makefile +++ b/reactos/lib/ws2_32/makefile @@ -1,4 +1,4 @@ -# $Id: makefile,v 1.12 2003/08/07 04:03:24 royce Exp $ +# $Id: makefile,v 1.13 2004/01/11 20:46:06 navaraf Exp $ PATH_TO_TOP = ../.. @@ -15,7 +15,8 @@ TARGET_CFLAGS = \ -fno-builtin \ -DUNICODE \ -DLE \ - -DDBG + -DDBG \ + -D__USE_W32API # require os code to explicitly request A/W version of structs/functions TARGET_CFLAGS += -D_DISABLE_TIDENTS diff --git a/reactos/lib/ws2_32/misc/dllmain.c b/reactos/lib/ws2_32/misc/dllmain.c index 8dce05f326e..25eba0f87ac 100644 --- a/reactos/lib/ws2_32/misc/dllmain.c +++ b/reactos/lib/ws2_32/misc/dllmain.c @@ -305,7 +305,7 @@ select( IN OUT LPFD_SET readfds, IN OUT LPFD_SET writefds, IN OUT LPFD_SET exceptfds, - IN CONST LPTIMEVAL timeout) + IN CONST struct timeval *timeout) /* * FUNCTION: Returns status of one or more sockets * ARGUMENTS: @@ -355,7 +355,7 @@ select( } Count = Provider->ProcTable.lpWSPSelect( - nfds, readfds, writefds, exceptfds, timeout, &Errno); + nfds, readfds, writefds, exceptfds, (LPTIMEVAL)timeout, &Errno); WS_DbgPrint(MAX_TRACE, ("Provider (0x%X).\n", Provider)); @@ -377,7 +377,7 @@ INT EXPORT bind( IN SOCKET s, - IN CONST LPSOCKADDR name, + IN CONST struct sockaddr *name, IN INT namelen) { PCATALOG_ENTRY Provider; @@ -503,7 +503,7 @@ INT EXPORT connect( IN SOCKET s, - IN CONST LPSOCKADDR name, + IN CONST struct sockaddr *name, IN INT namelen) { return WSAConnect(s, name, namelen, NULL, NULL, NULL, NULL); @@ -517,7 +517,7 @@ INT EXPORT WSAConnect( IN SOCKET s, - IN CONST LPSOCKADDR name, + IN CONST struct sockaddr *name, IN INT namelen, IN LPWSABUF lpCallerData, OUT LPWSABUF lpCalleeData, diff --git a/reactos/lib/ws2_32/misc/sndrcv.c b/reactos/lib/ws2_32/misc/sndrcv.c index 207a90a15f0..b92562c000d 100644 --- a/reactos/lib/ws2_32/misc/sndrcv.c +++ b/reactos/lib/ws2_32/misc/sndrcv.c @@ -100,7 +100,7 @@ sendto( IN CONST CHAR FAR* buf, IN INT len, IN INT flags, - IN CONST LPSOCKADDR to, + IN CONST struct sockaddr *to, IN INT tolen) { DWORD BytesSent; @@ -279,7 +279,7 @@ WSASendTo( IN DWORD dwBufferCount, OUT LPDWORD lpNumberOfBytesSent, IN DWORD dwFlags, - IN CONST LPSOCKADDR lpTo, + IN CONST struct sockaddr *lpTo, IN INT iToLen, IN LPWSAOVERLAPPED lpOverlapped, IN LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine) diff --git a/reactos/lib/ws2_32/misc/stubs.c b/reactos/lib/ws2_32/misc/stubs.c index d5ddbbb8c32..1b865a113d8 100644 --- a/reactos/lib/ws2_32/misc/stubs.c +++ b/reactos/lib/ws2_32/misc/stubs.c @@ -573,7 +573,7 @@ SOCKET EXPORT WSAJoinLeaf( IN SOCKET s, - IN CONST LPSOCKADDR name, + IN CONST struct sockaddr *name, IN INT namelen, IN LPWSABUF lpCallerData, OUT LPWSABUF lpCalleeData, @@ -919,7 +919,7 @@ WSCWriteNameSpaceOrder ( VOID EXPORT freeaddrinfo( - LPADDRINFO pAddrInfo + struct addrinfo *pAddrInfo ) { UNIMPLEMENTED diff --git a/reactos/lib/ws2help/debug.h b/reactos/lib/ws2help/debug.h index 714354b5b37..95adc055ce4 100644 --- a/reactos/lib/ws2help/debug.h +++ b/reactos/lib/ws2help/debug.h @@ -46,7 +46,7 @@ extern DWORD DebugTraceLevel; #endif /* DBG */ - +#undef assert #define assert(x) ASSERT(x) #define assert_irql(x) ASSERT_IRQL(x) diff --git a/reactos/lib/ws2help/makefile b/reactos/lib/ws2help/makefile index 664fde0da15..dd805e3125e 100644 --- a/reactos/lib/ws2help/makefile +++ b/reactos/lib/ws2help/makefile @@ -13,7 +13,8 @@ TARGET_CFLAGS = \ -Wall \ -Werror \ -fno-builtin \ - -DUNICODE + -DUNICODE \ + -D__USE_W32API # require os code to explicitly request A/W version of structs/functions TARGET_CFLAGS += -D_DISABLE_TIDENTS diff --git a/reactos/lib/ws2help/ws2help.h b/reactos/lib/ws2help/ws2help.h index 41ca7ea917d..0a43da9187e 100644 --- a/reactos/lib/ws2help/ws2help.h +++ b/reactos/lib/ws2help/ws2help.h @@ -8,9 +8,9 @@ #define __WS2HELP_H #include +#include #include #include -#include #include #define EXPORT STDCALL diff --git a/reactos/lib/wshirda/debug.h b/reactos/lib/wshirda/debug.h index 13a623f8fb3..1c51b67f37f 100644 --- a/reactos/lib/wshirda/debug.h +++ b/reactos/lib/wshirda/debug.h @@ -42,11 +42,13 @@ extern DWORD DebugTraceLevel; #define WSH_DbgPrint(_t_, _x_) +#undef ASSERT #define ASSERT(x) #endif /* DBG */ +#undef assert #define assert(x) ASSERT(x) #define assert_irql(x) ASSERT_IRQL(x) diff --git a/reactos/lib/wshirda/makefile b/reactos/lib/wshirda/makefile index c276240854b..e3d71ffaf22 100644 --- a/reactos/lib/wshirda/makefile +++ b/reactos/lib/wshirda/makefile @@ -8,10 +8,7 @@ TARGET_NAME = wshirda TARGET_BASE = 0x777c0000 -TARGET_CFLAGS = -DUNICODE - -# require os code to explicitly request A/W version of structs/functions -TARGET_CFLAGS += -D_DISABLE_TIDENTS -Werror -Wall +TARGET_CFLAGS = -DUNICODE -D__USE_W32API -Werror -Wall TARGET_SDKLIBS = ntdll.a kernel32.a diff --git a/reactos/lib/wshirda/wshirda.h b/reactos/lib/wshirda/wshirda.h index a403a087c52..4703aa142ca 100644 --- a/reactos/lib/wshirda/wshirda.h +++ b/reactos/lib/wshirda/wshirda.h @@ -8,9 +8,9 @@ #define __WSHIRDA_H #include +#include #include #include -#include #include #define EXPORT STDCALL diff --git a/reactos/lib/wsock32/Makefile b/reactos/lib/wsock32/Makefile index d8690695df1..c3028278b0e 100644 --- a/reactos/lib/wsock32/Makefile +++ b/reactos/lib/wsock32/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.4 2003/11/19 13:16:22 navaraf Exp $ +# $Id: Makefile,v 1.5 2004/01/11 20:46:06 navaraf Exp $ PATH_TO_TOP = ../.. @@ -15,10 +15,8 @@ TARGET_CFLAGS = \ -fno-builtin \ -DUNICODE \ -DLE \ - -DDBG - -# require os code to explicitly request A/W version of structs/functions -TARGET_CFLAGS += -D_DISABLE_TIDENTS + -DDBG \ + -D__USE_W32API TARGET_LFLAGS = -nostartfiles -nostdlib