From 5c173216a26e69f2b35a6b8f4e6990292a876466 Mon Sep 17 00:00:00 2001 From: Steven Edwards Date: Mon, 9 May 2005 01:50:07 +0000 Subject: [PATCH] strip whitespace from end of lines svn path=/trunk/; revision=15173 --- reactos/w32api/include/GL/gl.h | 2 +- reactos/w32api/include/GL/glext.h | 8 +- reactos/w32api/include/GL/glu.h | 8 +- reactos/w32api/include/GdiPlus.h | 2 +- reactos/w32api/include/accctrl.h | 10 +- reactos/w32api/include/aclui.h | 2 +- reactos/w32api/include/basetyps.h | 2 +- reactos/w32api/include/commctrl.h | 36 +-- reactos/w32api/include/commdlg.h | 2 +- reactos/w32api/include/dde.h | 8 +- reactos/w32api/include/ddk/afilter.h | 2 +- reactos/w32api/include/ddk/atm.h | 10 +- reactos/w32api/include/ddk/cfgmgr32.h | 2 +- reactos/w32api/include/ddk/hidpi.h | 2 +- reactos/w32api/include/ddk/minitape.h | 32 +-- reactos/w32api/include/ddk/ndis.h | 68 ++--- reactos/w32api/include/ddk/ndistapi.h | 394 +++++++++++++------------- reactos/w32api/include/ddk/ndiswan.h | 84 +++--- reactos/w32api/include/ddk/ntagp.h | 2 +- reactos/w32api/include/ddk/ntapi.h | 14 +- reactos/w32api/include/ddk/ntddcdrm.h | 2 +- reactos/w32api/include/ddk/ntddpcm.h | 24 +- reactos/w32api/include/ddk/ntddstor.h | 14 +- reactos/w32api/include/ddk/ntifs.h | 28 +- reactos/w32api/include/ddk/ntpoapi.h | 2 +- reactos/w32api/include/ddk/ntstatus.h | 106 +++---- reactos/w32api/include/ddk/parallel.h | 6 +- reactos/w32api/include/ddk/pfhook.h | 14 +- reactos/w32api/include/ddk/prntfont.h | 4 +- reactos/w32api/include/ddk/scsi.h | 168 +++++------ reactos/w32api/include/ddk/scsiwmi.h | 4 +- reactos/w32api/include/ddk/srb.h | 112 ++++---- reactos/w32api/include/ddk/tdi.h | 2 +- reactos/w32api/include/ddk/tdikrnl.h | 14 +- reactos/w32api/include/ddk/usb.h | 44 +-- reactos/w32api/include/ddk/usb100.h | 16 +- reactos/w32api/include/ddk/usbcamdi.h | 12 +- reactos/w32api/include/ddk/usbdi.h | 14 +- reactos/w32api/include/ddk/usbioctl.h | 2 +- reactos/w32api/include/ddk/usbiodef.h | 4 +- reactos/w32api/include/ddk/usbscan.h | 10 +- reactos/w32api/include/ddk/usbuser.h | 20 +- reactos/w32api/include/ddk/win2k.h | 2 +- reactos/w32api/include/ddk/winddi.h | 2 +- reactos/w32api/include/ddk/winddk.h | 278 +++++++++--------- reactos/w32api/include/ddk/winnt4.h | 2 +- reactos/w32api/include/ddk/ws2san.h | 6 +- reactos/w32api/include/icmpapi.h | 4 +- reactos/w32api/include/imagehlp.h | 196 ++++++------- reactos/w32api/include/intshcut.h | 12 +- reactos/w32api/include/iprtrmib.h | 24 +- reactos/w32api/include/iptypes.h | 4 +- reactos/w32api/include/lmaccess.h | 20 +- reactos/w32api/include/lmaudit.h | 2 +- reactos/w32api/include/lmbrowsr.h | 2 +- reactos/w32api/include/lmchdev.h | 2 +- reactos/w32api/include/lmconfig.h | 2 +- reactos/w32api/include/lmerr.h | 4 +- reactos/w32api/include/lmerrlog.h | 14 +- reactos/w32api/include/lmmsg.h | 2 +- reactos/w32api/include/lmremutl.h | 6 +- reactos/w32api/include/lmrepl.h | 2 +- reactos/w32api/include/lmserver.h | 14 +- reactos/w32api/include/lmshare.h | 12 +- reactos/w32api/include/lmstats.h | 2 +- reactos/w32api/include/lmsvc.h | 10 +- reactos/w32api/include/lmuse.h | 2 +- reactos/w32api/include/lmuseflg.h | 2 +- reactos/w32api/include/lmwksta.h | 16 +- reactos/w32api/include/mswsock.h | 6 +- reactos/w32api/include/ntdef.h | 4 +- reactos/w32api/include/oaidl.h | 26 +- reactos/w32api/include/objidl.h | 2 +- reactos/w32api/include/ocidl.h | 2 +- reactos/w32api/include/odbcinst.h | 26 +- reactos/w32api/include/oleacc.h | 4 +- reactos/w32api/include/olectl.h | 6 +- reactos/w32api/include/oledlg.h | 56 ++-- reactos/w32api/include/oleidl.h | 20 +- reactos/w32api/include/powrprof.h | 4 +- reactos/w32api/include/rapi.h | 8 +- reactos/w32api/include/ras.h | 8 +- reactos/w32api/include/rasdlg.h | 2 +- reactos/w32api/include/richedit.h | 2 +- reactos/w32api/include/secext.h | 20 +- reactos/w32api/include/setupapi.h | 6 +- reactos/w32api/include/shlobj.h | 6 +- reactos/w32api/include/shlwapi.h | 4 +- reactos/w32api/include/shtypes.h | 2 +- reactos/w32api/include/snmp.h | 28 +- reactos/w32api/include/sql.h | 20 +- reactos/w32api/include/sqlext.h | 22 +- reactos/w32api/include/sqlucode.h | 8 +- reactos/w32api/include/sspi.h | 2 +- reactos/w32api/include/subauth.h | 4 +- reactos/w32api/include/tlhelp32.h | 4 +- reactos/w32api/include/uxtheme.h | 2 +- reactos/w32api/include/vfw.h | 4 +- reactos/w32api/include/winbase.h | 20 +- reactos/w32api/include/wincon.h | 2 +- reactos/w32api/include/windef.h | 2 +- reactos/w32api/include/windns.h | 66 ++--- reactos/w32api/include/winfax.h | 6 +- reactos/w32api/include/wingdi.h | 100 +++---- reactos/w32api/include/winioctl.h | 4 +- reactos/w32api/include/winldap.h | 4 +- reactos/w32api/include/winnls.h | 12 +- reactos/w32api/include/winnt.h | 38 +-- reactos/w32api/include/winperf.h | 8 +- reactos/w32api/include/winsnmp.h | 12 +- reactos/w32api/include/winsock.h | 8 +- reactos/w32api/include/winsock2.h | 14 +- reactos/w32api/include/winuser.h | 12 +- reactos/w32api/include/ws2spi.h | 2 +- reactos/w32api/include/ws2tcpip.h | 26 +- 115 files changed, 1300 insertions(+), 1300 deletions(-) diff --git a/reactos/w32api/include/GL/gl.h b/reactos/w32api/include/GL/gl.h index cd2d724db49..8a1129a0fcf 100644 --- a/reactos/w32api/include/GL/gl.h +++ b/reactos/w32api/include/GL/gl.h @@ -1452,7 +1452,7 @@ GLAPI void APIENTRY glSamplePass( GLenum pass ); /* Include external definitions of OpenGL extensions */ /* Removed, see this bug report for reference: * http://sourceforge.net/tracker/index.php?func=detail&aid=610178&group_id=2435&atid=102435 - * + * * #include */ diff --git a/reactos/w32api/include/GL/glext.h b/reactos/w32api/include/GL/glext.h index c4b4baa0930..d6a834b0f34 100644 --- a/reactos/w32api/include/GL/glext.h +++ b/reactos/w32api/include/GL/glext.h @@ -13,21 +13,21 @@ extern "C" { ** this file except in compliance with the License. You may obtain a copy ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600 ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at: -** +** ** http://oss.sgi.com/projects/FreeB -** +** ** Note that, as provided in the License, the Software is distributed on an ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT. -** +** ** Original Code. The Original Code is: OpenGL Sample Implementation, ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics, ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc. ** Copyright in any portions created by third parties is as indicated ** elsewhere herein. All Rights Reserved. -** +** ** Additional Notice Provisions: This software was created using the ** OpenGL(R) version 1.2.1 Sample Implementation published by SGI, but has ** not been independently verified as being compliant with the OpenGL(R) diff --git a/reactos/w32api/include/GL/glu.h b/reactos/w32api/include/GL/glu.h index 7c6ee748ba8..e324501e01d 100644 --- a/reactos/w32api/include/GL/glu.h +++ b/reactos/w32api/include/GL/glu.h @@ -6,21 +6,21 @@ ** this file except in compliance with the License. You may obtain a copy ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600 ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at: -** +** ** http://oss.sgi.com/projects/FreeB -** +** ** Note that, as provided in the License, the Software is distributed on an ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT. -** +** ** Original Code. The Original Code is: OpenGL Sample Implementation, ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics, ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc. ** Copyright in any portions created by third parties is as indicated ** elsewhere herein. All Rights Reserved. -** +** ** Additional Notice Provisions: This software was created using the ** OpenGL(R) version 1.2.1 Sample Implementation published by SGI, but has ** not been independently verified as being compliant with the OpenGL(R) diff --git a/reactos/w32api/include/GdiPlus.h b/reactos/w32api/include/GdiPlus.h index 05dd98722cf..c3a4b226c49 100644 --- a/reactos/w32api/include/GdiPlus.h +++ b/reactos/w32api/include/GdiPlus.h @@ -42,7 +42,7 @@ namespace Gdiplus }; #include "GdiplusBase.h" - + #include "GdiplusEnums.h" #include "GdiplusTypes.h" #include "GdiplusInit.h" diff --git a/reactos/w32api/include/accctrl.h b/reactos/w32api/include/accctrl.h index db0217f545f..94ef89a3cfb 100644 --- a/reactos/w32api/include/accctrl.h +++ b/reactos/w32api/include/accctrl.h @@ -237,7 +237,7 @@ typedef struct _ACTRL_ALISTW { ULONG cEntries; PACTRL_PROPERTY_ENTRYW pPropertyAccessList; } ACTRL_ACCESSW, *PACTRL_ACCESSW, ACTRL_AUDITW, *PACTRL_AUDITW; -typedef struct _TRUSTEE_ACCESSA { +typedef struct _TRUSTEE_ACCESSA { LPSTR lpProperty; ACCESS_RIGHTS Access; ULONG fAccessFlags; @@ -341,9 +341,9 @@ typedef struct _SI_INHERIT_TYPE } SI_INHERIT_TYPE, *PSI_INHERIT_TYPE; typedef enum _SI_PAGE_TYPE { - SI_PAGE_PERM = 0, - SI_PAGE_ADVPERM, - SI_PAGE_AUDIT, + SI_PAGE_PERM = 0, + SI_PAGE_ADVPERM, + SI_PAGE_AUDIT, SI_PAGE_OWNER } SI_PAGE_TYPE; @@ -391,4 +391,4 @@ typedef INHERITED_FROMA INHERITED_FROM, *PINHERITED_FROM; #ifdef __cplusplus } #endif -#endif +#endif diff --git a/reactos/w32api/include/aclui.h b/reactos/w32api/include/aclui.h index a85329f0b00..48d2eb4c845 100644 --- a/reactos/w32api/include/aclui.h +++ b/reactos/w32api/include/aclui.h @@ -55,7 +55,7 @@ DECLARE_INTERFACE_(ISecurityInformation,IUnknown) STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE; STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; - + /* ISecurityInformation */ STDMETHOD(GetObjectInformation)(THIS_ PSI_OBJECT_INFO) PURE; STDMETHOD(GetSecurity)(THIS_ SECURITY_INFORMATION,PSECURITY_DESCRIPTOR*,BOOL) PURE; diff --git a/reactos/w32api/include/basetyps.h b/reactos/w32api/include/basetyps.h index c4249cb2e79..ea110a11915 100644 --- a/reactos/w32api/include/basetyps.h +++ b/reactos/w32api/include/basetyps.h @@ -9,7 +9,7 @@ # define EXTERN_C extern "C" # else # define EXTERN_C extern -# endif /* __cplusplus */ +# endif /* __cplusplus */ # ifndef __int64 # define __int64 long long # endif diff --git a/reactos/w32api/include/commctrl.h b/reactos/w32api/include/commctrl.h index c50adfe18d1..86755ab4259 100644 --- a/reactos/w32api/include/commctrl.h +++ b/reactos/w32api/include/commctrl.h @@ -731,8 +731,8 @@ extern "C" { #define TTM_GETCURRENTTOOLW (WM_USER+59) #define TTM_WINDOWFROMPOINT (WM_USER+16) #if (_WIN32_IE >= 0x0300) -#define TTM_TRACKACTIVATE (WM_USER+17) -#define TTM_TRACKPOSITION (WM_USER+18) +#define TTM_TRACKACTIVATE (WM_USER+17) +#define TTM_TRACKPOSITION (WM_USER+18) #define TTM_SETTIPBKCOLOR (WM_USER+19) #define TTM_SETTIPTEXTCOLOR (WM_USER+20) #define TTM_GETDELAYTIME (WM_USER+21) @@ -740,8 +740,8 @@ extern "C" { #define TTM_GETTIPTEXTCOLOR (WM_USER+23) #define TTM_SETMAXTIPWIDTH (WM_USER+24) #define TTM_GETMAXTIPWIDTH (WM_USER+25) -#define TTM_SETMARGIN (WM_USER+26) -#define TTM_GETMARGIN (WM_USER+27) +#define TTM_SETMARGIN (WM_USER+26) +#define TTM_GETMARGIN (WM_USER+27) #define TTM_POP (WM_USER+28) #endif /* _WIN32_IE */ #if (_WIN32_IE >= 0x0400) /* IE4.0 ??? */ @@ -883,7 +883,7 @@ extern "C" { #define TBM_SETTIPSIDE (WM_USER+31) #define TBM_SETBUDDY (WM_USER+32) #define TBM_GETBUDDY (WM_USER+33) -#define TBM_GETUNICODEFORMAT CCM_GETUNICODEFORMAT +#define TBM_GETUNICODEFORMAT CCM_GETUNICODEFORMAT #define TBM_SETUNICODEFORMAT CCM_SETUNICODEFORMAT #define TB_LINEUP 0 #define TB_LINEDOWN 1 @@ -1134,7 +1134,7 @@ extern "C" { #if (_WIN32_IE >= 0x0300) #define LVCFMT_BITMAP_ON_RIGHT 4096 #define LVCFMT_COL_HAS_IMAGES 32768 -#define LVCFMT_IMAGE 2048 +#define LVCFMT_IMAGE 2048 #endif #define LVM_GETCOLUMNA (LVM_FIRST+25) #define LVM_GETCOLUMNW (LVM_FIRST+95) @@ -1493,7 +1493,7 @@ extern "C" { #if (_WIN32_WINNT >= 0x0501) #define CCM_SETWINDOWTHEME 0x200b #define CCM_DPISCALE 0x200c -#endif +#endif #define ICC_LISTVIEW_CLASSES 1 #define ICC_TREEVIEW_CLASSES 2 #define ICC_BAR_CLASSES 4 @@ -1557,13 +1557,13 @@ extern "C" { #define DTN_USERSTRINGW ((UINT)-745) #define DTN_WMKEYDOWNA ((UINT)-757) #define DTN_WMKEYDOWNW ((UINT)-744) -#define DTN_FORMATA ((UINT)-756) +#define DTN_FORMATA ((UINT)-756) #define DTN_FORMATW ((UINT)-743) -#define DTN_FORMATQUERYA ((UINT)-755) +#define DTN_FORMATQUERYA ((UINT)-755) #define DTN_FORMATQUERYW ((UINT)-742) -#define DTN_DROPDOWN ((UINT)-754) -#define DTN_CLOSEUP ((UINT)-753) -#define DTN_DATETIMECHANGE ((UINT)-759) +#define DTN_DROPDOWN ((UINT)-754) +#define DTN_CLOSEUP ((UINT)-753) +#define DTN_DATETIMECHANGE ((UINT)-759) #define MCM_GETCURSEL 0x1001 #define MCM_SETCURSEL 0x1002 #define MCM_GETMAXSELCOUNT 0x1003 @@ -2033,7 +2033,7 @@ typedef struct { DWORD dwFlags; } TBINSERTMARK, *LPTBINSERTMARK; typedef struct tagLVBKIMAGEA { - ULONG ulFlags; + ULONG ulFlags; HBITMAP hbm; LPSTR pszImage; UINT cchImageMax; @@ -2041,7 +2041,7 @@ typedef struct tagLVBKIMAGEA { int yOffsetPercent; } LVBKIMAGEA, *LPLVBKIMAGEA; typedef struct tagLVBKIMAGEW { - ULONG ulFlags; + ULONG ulFlags; HBITMAP hbm; LPWSTR pszImage; UINT cchImageMax; @@ -2401,8 +2401,8 @@ typedef struct tagNMLINK } NMLINK, *PNMLINK; #endif /* for backward compatability */ -#define NM_UPDOWN NMUPDOWN -#define LPNM_UPDOWN LPNMUPDOWN +#define NM_UPDOWN NMUPDOWN +#define LPNM_UPDOWN LPNMUPDOWN typedef struct _LVITEMA { UINT mask; int iItem; @@ -2851,8 +2851,8 @@ typedef struct tagIMAGELISTDRAWPARAMS { int y; int cx; int cy; - int xBitmap; - int yBitmap; + int xBitmap; + int yBitmap; COLORREF rgbBk; COLORREF rgbFg; UINT fStyle; diff --git a/reactos/w32api/include/commdlg.h b/reactos/w32api/include/commdlg.h index afe2a0cb710..939d00f9e78 100644 --- a/reactos/w32api/include/commdlg.h +++ b/reactos/w32api/include/commdlg.h @@ -441,7 +441,7 @@ typedef struct tagPDW { HANDLE hSetupTemplate; } PRINTDLGW,*LPPRINTDLGW; #if (WINVER >= 0x0500) && !defined (__OBJC__) -#include /* for LPUNKNOWN */ +#include /* for LPUNKNOWN */ #include /* for HPROPSHEETPAGE */ typedef struct tagPRINTPAGERANGE { DWORD nFromPage; diff --git a/reactos/w32api/include/dde.h b/reactos/w32api/include/dde.h index b13e9ce3982..8422db86d87 100644 --- a/reactos/w32api/include/dde.h +++ b/reactos/w32api/include/dde.h @@ -52,10 +52,10 @@ typedef struct { } DDEUP; BOOL WINAPI DdeSetQualityOfService(HWND,const SECURITY_QUALITY_OF_SERVICE*,PSECURITY_QUALITY_OF_SERVICE); BOOL WINAPI ImpersonateDdeClientWindow(HWND,HWND); -LPARAM WINAPI PackDDElParam(UINT,UINT_PTR,UINT_PTR); -BOOL WINAPI UnpackDDElParam(UINT,LPARAM,PUINT_PTR,PUINT_PTR); -BOOL WINAPI FreeDDElParam(UINT,LPARAM); -LPARAM WINAPI ReuseDDElParam(LPARAM,UINT,UINT,UINT_PTR,UINT_PTR); +LPARAM WINAPI PackDDElParam(UINT,UINT_PTR,UINT_PTR); +BOOL WINAPI UnpackDDElParam(UINT,LPARAM,PUINT_PTR,PUINT_PTR); +BOOL WINAPI FreeDDElParam(UINT,LPARAM); +LPARAM WINAPI ReuseDDElParam(LPARAM,UINT,UINT,UINT_PTR,UINT_PTR); #endif #ifdef __cplusplus diff --git a/reactos/w32api/include/ddk/afilter.h b/reactos/w32api/include/ddk/afilter.h index 362e8528993..1c631c9ea5d 100644 --- a/reactos/w32api/include/ddk/afilter.h +++ b/reactos/w32api/include/ddk/afilter.h @@ -169,7 +169,7 @@ VOID DDKAPI ArcFreeNdisPacket( IN PARC_PACKET Packet); - + VOID DDKAPI ArcFilterDoIndication( diff --git a/reactos/w32api/include/ddk/atm.h b/reactos/w32api/include/ddk/atm.h index d3022938517..234ac444b9b 100644 --- a/reactos/w32api/include/ddk/atm.h +++ b/reactos/w32api/include/ddk/atm.h @@ -146,7 +146,7 @@ typedef struct _ATM_AAL_OOB_INFO UCHAR UserToUserIndication; UCHAR CommonPartIndicator; } ATM_AAL5_INFO; - + struct _ATM_AAL0_INFO { BOOLEAN CellLossPriority; UCHAR PayLoadTypeIdentifier; @@ -158,10 +158,10 @@ typedef struct _ATM_AAL_OOB_INFO #endif } ATM_AAL_OOB_INFO, *PATM_AAL_OOB_INFO; -typedef struct _ATM_ADDRESS { - ATM_ADDRESSTYPE AddressType; - ULONG NumberOfDigits; - UCHAR Address[ATM_ADDRESS_LENGTH]; +typedef struct _ATM_ADDRESS { + ATM_ADDRESSTYPE AddressType; + ULONG NumberOfDigits; + UCHAR Address[ATM_ADDRESS_LENGTH]; } ATM_ADDRESS, *PATM_ADDRESS; /* ATM_BHLI_IE.HighLayerInfoType constants */ diff --git a/reactos/w32api/include/ddk/cfgmgr32.h b/reactos/w32api/include/ddk/cfgmgr32.h index 5249a22fc3e..24b41be1fd1 100644 --- a/reactos/w32api/include/ddk/cfgmgr32.h +++ b/reactos/w32api/include/ddk/cfgmgr32.h @@ -697,7 +697,7 @@ CMAPI CONFIGRET WINAPI CM_Disconnect_Machine( - IN HMACHINE hMachine); + IN HMACHINE hMachine); /* FIXME: Obsolete CM_Enable_DevNode */ /* FIXME: Obsolete CM_Enable_DevNodeEx */ diff --git a/reactos/w32api/include/ddk/hidpi.h b/reactos/w32api/include/ddk/hidpi.h index a9ac5bc9df8..70c2a65e4b9 100644 --- a/reactos/w32api/include/ddk/hidpi.h +++ b/reactos/w32api/include/ddk/hidpi.h @@ -528,7 +528,7 @@ NTSTATUS DDKAPI HidP_SetScaledUsageValue( IN HIDP_REPORT_TYPE ReportType, - IN USAGE UsagePage, + IN USAGE UsagePage, IN USHORT LinkCollection OPTIONAL, IN USAGE Usage, IN LONG UsageValue, diff --git a/reactos/w32api/include/ddk/minitape.h b/reactos/w32api/include/ddk/minitape.h index 7540dea625c..0136298eb94 100644 --- a/reactos/w32api/include/ddk/minitape.h +++ b/reactos/w32api/include/ddk/minitape.h @@ -49,7 +49,7 @@ typedef enum _TAPE_STATUS { TAPE_STATUS_INSUFFICIENT_RESOURCES, TAPE_STATUS_NOT_IMPLEMENTED, TAPE_STATUS_INVALID_DEVICE_REQUEST, - TAPE_STATUS_INVALID_PARAMETER, + TAPE_STATUS_INVALID_PARAMETER, TAPE_STATUS_MEDIA_CHANGED, TAPE_STATUS_BUS_RESET, TAPE_STATUS_SETMARK_DETECTED, @@ -187,27 +187,27 @@ typedef TAPE_STATUS DDKAPI #define IGNORE_ERRORS 0x00010000 #define RETURN_ERRORS 0x00020000 -typedef struct _TAPE_INIT_DATA { +typedef struct _TAPE_INIT_DATA { TAPE_VERIFY_INQUIRY_ROUTINE VerifyInquiry; - BOOLEAN QueryModeCapabilitiesPage; - ULONG MinitapeExtensionSize; + BOOLEAN QueryModeCapabilitiesPage; + ULONG MinitapeExtensionSize; TAPE_EXTENSION_INIT_ROUTINE ExtensionInit; ULONG DefaultTimeOutValue; TAPE_ERROR_ROUTINE TapeError; ULONG CommandExtensionSize; - TAPE_PROCESS_COMMAND_ROUTINE CreatePartition; - TAPE_PROCESS_COMMAND_ROUTINE Erase; - TAPE_PROCESS_COMMAND_ROUTINE GetDriveParameters; - TAPE_PROCESS_COMMAND_ROUTINE GetMediaParameters; - TAPE_PROCESS_COMMAND_ROUTINE GetPosition; - TAPE_PROCESS_COMMAND_ROUTINE GetStatus; - TAPE_PROCESS_COMMAND_ROUTINE Prepare; - TAPE_PROCESS_COMMAND_ROUTINE SetDriveParameters; - TAPE_PROCESS_COMMAND_ROUTINE SetMediaParameters; - TAPE_PROCESS_COMMAND_ROUTINE SetPosition; - TAPE_PROCESS_COMMAND_ROUTINE WriteMarks; + TAPE_PROCESS_COMMAND_ROUTINE CreatePartition; + TAPE_PROCESS_COMMAND_ROUTINE Erase; + TAPE_PROCESS_COMMAND_ROUTINE GetDriveParameters; + TAPE_PROCESS_COMMAND_ROUTINE GetMediaParameters; + TAPE_PROCESS_COMMAND_ROUTINE GetPosition; + TAPE_PROCESS_COMMAND_ROUTINE GetStatus; + TAPE_PROCESS_COMMAND_ROUTINE Prepare; + TAPE_PROCESS_COMMAND_ROUTINE SetDriveParameters; + TAPE_PROCESS_COMMAND_ROUTINE SetMediaParameters; + TAPE_PROCESS_COMMAND_ROUTINE SetPosition; + TAPE_PROCESS_COMMAND_ROUTINE WriteMarks; TAPE_PROCESS_COMMAND_ROUTINE PreProcessReadWrite; /* optional */ -} TAPE_INIT_DATA, *PTAPE_INIT_DATA; +} TAPE_INIT_DATA, *PTAPE_INIT_DATA; typedef struct _TAPE_PHYS_POSITION { ULONG SeekBlockAddress; diff --git a/reactos/w32api/include/ddk/ndis.h b/reactos/w32api/include/ddk/ndis.h index 3b645480485..63fe9461515 100644 --- a/reactos/w32api/include/ddk/ndis.h +++ b/reactos/w32api/include/ddk/ndis.h @@ -678,15 +678,15 @@ typedef enum _NDIS_PNP_DEVICE_STATE { /* OID_GEN_NETWORK_LAYER_ADDRESSES */ typedef struct _NETWORK_ADDRESS { - USHORT AddressLength; - USHORT AddressType; - UCHAR Address[1]; + USHORT AddressLength; + USHORT AddressType; + UCHAR Address[1]; } NETWORK_ADDRESS, *PNETWORK_ADDRESS; typedef struct _NETWORK_ADDRESS_LIST { - LONG AddressCount; - USHORT AddressType; - NETWORK_ADDRESS Address[1]; + LONG AddressCount; + USHORT AddressType; + NETWORK_ADDRESS Address[1]; } NETWORK_ADDRESS_LIST, *PNETWORK_ADDRESS_LIST; /* Protocol types supported by NDIS */ @@ -700,8 +700,8 @@ typedef struct _NETWORK_ADDRESS_LIST { /* OID_GEN_TRANSPORT_HEADER_OFFSET */ typedef struct _TRANSPORT_HEADER_OFFSET { - USHORT ProtocolType; - USHORT HeaderOffset; + USHORT ProtocolType; + USHORT HeaderOffset; } TRANSPORT_HEADER_OFFSET, *PTRANSPORT_HEADER_OFFSET; @@ -926,7 +926,7 @@ typedef struct _NDIS_TASK_IPSEC { ULONG V4_OPTIONS; ULONG RESERVED; } Supported; - + struct { ULONG MD5 : 1; ULONG SHA_1 : 1; @@ -935,7 +935,7 @@ typedef struct _NDIS_TASK_IPSEC { ULONG Send : 1; ULONG Receive : 1; } V4AH; - + struct { ULONG DES : 1; ULONG RESERVED : 1; @@ -986,7 +986,7 @@ typedef struct _NDIS_TASK_TCP_IP_CHECKSUM { ULONG UdpChecksum:1; ULONG IpChecksum:1; } V4Transmit; - + struct { ULONG IpOptionsSupported : 1; ULONG TcpOptionsSupported : 1; @@ -994,14 +994,14 @@ typedef struct _NDIS_TASK_TCP_IP_CHECKSUM { ULONG UdpChecksum : 1; ULONG IpChecksum : 1; } V4Receive; - + struct { ULONG IpOptionsSupported : 1; ULONG TcpOptionsSupported : 1; ULONG TcpChecksum : 1; ULONG UdpChecksum : 1; } V6Transmit; - + struct { ULONG IpOptionsSupported : 1; ULONG TcpOptionsSupported : 1; @@ -1027,7 +1027,7 @@ typedef struct _NDIS_TCP_IP_CHECKSUM_PACKET_INFO { ULONG NdisPacketUdpChecksum : 1; ULONG NdisPacketIpChecksum : 1; } Transmit; - + struct { ULONG NdisPacketTcpChecksumFailed : 1; ULONG NdisPacketUdpChecksumFailed : 1; @@ -1051,9 +1051,9 @@ typedef struct _NDIS_WAN_FRAGMENT { } NDIS_WAN_FRAGMENT, *PNDIS_WAN_FRAGMENT; typedef struct _WAN_CO_LINKPARAMS { - ULONG TransmitSpeed; - ULONG ReceiveSpeed; - ULONG SendWindow; + ULONG TransmitSpeed; + ULONG ReceiveSpeed; + ULONG SendWindow; } WAN_CO_LINKPARAMS, *PWAN_CO_LINKPARAMS; @@ -1450,7 +1450,7 @@ typedef VOID DDKAPI BIND_HANDLER BindAdapterHandler; \ UNBIND_HANDLER UnbindAdapterHandler; \ PNP_EVENT_HANDLER PnPEventHandler; \ - UNLOAD_PROTOCOL_HANDLER UnloadHandler; + UNLOAD_PROTOCOL_HANDLER UnloadHandler; #else /* !__cplusplus */ @@ -1460,7 +1460,7 @@ typedef VOID DDKAPI BIND_HANDLER BindAdapterHandler; \ UNBIND_HANDLER UnbindAdapterHandler; \ PNP_EVENT_HANDLER PnPEventHandler; \ - UNLOAD_PROTOCOL_HANDLER UnloadHandler; + UNLOAD_PROTOCOL_HANDLER UnloadHandler; #endif /* __cplusplus */ @@ -1920,7 +1920,7 @@ NdisQueryBufferOffset( /* * UINT * NdisGetPacketFlags( - * IN PNDIS_PACKET Packet); + * IN PNDIS_PACKET Packet); */ #define NdisGetPacketFlags(Packet)(Packet)->Private.Flags; @@ -2029,7 +2029,7 @@ NdisQueryBufferOffset( (PNDIS_PACKET_OOB_DATA)((PUCHAR)(_Packet) + \ (_Packet)->Private.NdisPacketOobOffset) - + /* * VOID * NdisQueryPacket( @@ -2162,7 +2162,7 @@ NdisQueryBufferOffset( * VOID * NdisSetPacketFlags( * IN PNDIS_PACKET Packet, - * IN UINT Flags); + * IN UINT Flags); */ #define NdisSetPacketFlags(Packet, Flags) \ (Packet)->Private.Flags |= (Flags); @@ -2481,7 +2481,7 @@ NdisUpdateSharedMemory( * VOID * NDIS_PHYSICAL_ADDRESS_CONST( * IN ULONG Low, - * IN LONG High); + * IN LONG High); */ #define NDIS_PHYSICAL_ADDRESS_CONST(Low, High) \ { {(ULONG)(Low), (LONG)(High)} } @@ -2531,7 +2531,7 @@ NdisUpdateSharedMemory( * VOID * NdisStoreUlong( * IN PULONG DestinationAddress, - * IN ULONG Value); + * IN ULONG Value); */ #define NdisStoreUlong(DestinationAddress, Value) \ RtlStoreUlong(DestinationAddress, Value) @@ -2597,7 +2597,7 @@ NdisReadPciSlotInformation( IN ULONG Length); NDISAPI -ULONG +ULONG DDKAPI NdisWritePciSlotInformation( IN NDIS_HANDLE NdisAdapterHandle, @@ -3084,7 +3084,7 @@ NdisGetCurrentProcessorCpuUsage( /* * VOID - * NDIS_PAGABLE_FUNCTION(FunctionName) + * NDIS_PAGABLE_FUNCTION(FunctionName) */ #define NDIS_PAGEABLE_FUNCTION(FunctionName) \ alloc_text(page, FunctionName) @@ -3406,7 +3406,7 @@ NdisClMakeCall( OUT PNDIS_HANDLE NdisPartyHandle OPTIONAL); NDISAPI -NDIS_STATUS +NDIS_STATUS DDKAPI NdisClModifyCallQoS( IN NDIS_HANDLE NdisVcHandle, @@ -3710,7 +3710,7 @@ NdisMCoRequestComplete( IN PNDIS_REQUEST Request); NDISAPI -VOID +VOID DDKAPI NdisMCoSendComplete( IN NDIS_STATUS Status, @@ -3728,7 +3728,7 @@ NdisIMAssociateMiniport( IN NDIS_HANDLE ProtocolHandle); NDISAPI -NDIS_STATUS +NDIS_STATUS DDKAPI NdisIMCancelInitializeDeviceInstance( IN NDIS_HANDLE DriverHandle, @@ -4541,11 +4541,11 @@ struct _NDIS_MINIPORT_BLOCK { } DUMMYUNIONNAME2; PVOID SavedSendPacketsHandler; PVOID SavedCancelSendPacketsHandler; - W_SEND_PACKETS_HANDLER WSendPacketsHandler; + W_SEND_PACKETS_HANDLER WSendPacketsHandler; ULONG MiniportAttributes; PDMA_ADAPTER SavedSystemAdapterObject; USHORT NumOpens; - USHORT CFHangXTicks; + USHORT CFHangXTicks; ULONG RequestCount; ULONG IndicatedPacketsCount; ULONG PhysicalMediumType; @@ -5060,14 +5060,14 @@ NdisMCancelTimer( AdapterType) NDISAPI -VOID +VOID DDKAPI NdisMSetAttributesEx( IN NDIS_HANDLE MiniportAdapterHandle, IN NDIS_HANDLE MiniportAdapterContext, IN UINT CheckForHangTimeInSeconds OPTIONAL, IN ULONG AttributeFlags, - IN NDIS_INTERFACE_TYPE AdapterType); + IN NDIS_INTERFACE_TYPE AdapterType); /* * VOID @@ -5227,7 +5227,7 @@ NDISAPI NTSTATUS DDKAPI NdisUpcaseUnicodeString( - OUT PUNICODE_STRING DestinationString, + OUT PUNICODE_STRING DestinationString, IN PUNICODE_STRING SourceString); diff --git a/reactos/w32api/include/ddk/ndistapi.h b/reactos/w32api/include/ddk/ndistapi.h index 97bd442bd8c..de03b0ee664 100644 --- a/reactos/w32api/include/ddk/ndistapi.h +++ b/reactos/w32api/include/ddk/ndistapi.h @@ -603,9 +603,9 @@ typedef ULONG_PTR HDRV_CALL; #define LINETRANSLATERESULT_VOICEDETECT 0x00000400 #endif -#if (NDIS_TAPI_CURRENT_VERSION >= 0x00030000) +#if (NDIS_TAPI_CURRENT_VERSION >= 0x00030000) #define LINETRANSLATERESULT_NOTRANSLATION 0x00000800 -#endif +#endif typedef struct _NDIS_VAR_DATA_DESC { @@ -956,52 +956,52 @@ typedef struct _LINE_EXTENSION_ID { typedef struct _VAR_STRING { ULONG ulTotalSize; ULONG ulNeededSize; - ULONG ulUsedSize; + ULONG ulUsedSize; ULONG ulStringFormat; ULONG ulStringSize; ULONG ulStringOffset; } VAR_STRING, *PVAR_STRING; -typedef struct _NDIS_TAPI_ANSWER { - IN ULONG ulRequestID; - IN HDRV_CALL hdCall; - IN ULONG ulUserUserInfoSize; - IN UCHAR UserUserInfo[1]; -} NDIS_TAPI_ANSWER, *PNDIS_TAPI_ANSWER; +typedef struct _NDIS_TAPI_ANSWER { + IN ULONG ulRequestID; + IN HDRV_CALL hdCall; + IN ULONG ulUserUserInfoSize; + IN UCHAR UserUserInfo[1]; +} NDIS_TAPI_ANSWER, *PNDIS_TAPI_ANSWER; -typedef struct _NDIS_TAPI_CLOSE { +typedef struct _NDIS_TAPI_CLOSE { IN ULONG ulRequestID; IN HDRV_LINE hdLine; } NDIS_TAPI_CLOSE, *PNDIS_TAPI_CLOSE; -typedef struct _NDIS_TAPI_CLOSE_CALL { - IN ULONG ulRequestID; - IN HDRV_CALL hdCall; -} NDIS_TAPI_CLOSE_CALL, *PNDIS_TAPI_CLOSE_CALL; +typedef struct _NDIS_TAPI_CLOSE_CALL { + IN ULONG ulRequestID; + IN HDRV_CALL hdCall; +} NDIS_TAPI_CLOSE_CALL, *PNDIS_TAPI_CLOSE_CALL; -typedef struct _NDIS_TAPI_CONDITIONAL_MEDIA_DETECTION { - IN ULONG ulRequestID; - IN HDRV_LINE hdLine; - IN ULONG ulMediaModes; - IN LINE_CALL_PARAMS LineCallParams; -} NDIS_TAPI_CONDITIONAL_MEDIA_DETECTION, *PNDIS_TAPI_CONDITIONAL_MEDIA_DETECTION; +typedef struct _NDIS_TAPI_CONDITIONAL_MEDIA_DETECTION { + IN ULONG ulRequestID; + IN HDRV_LINE hdLine; + IN ULONG ulMediaModes; + IN LINE_CALL_PARAMS LineCallParams; +} NDIS_TAPI_CONDITIONAL_MEDIA_DETECTION, *PNDIS_TAPI_CONDITIONAL_MEDIA_DETECTION; -typedef struct _NDIS_TAPI_DROP { - IN ULONG ulRequestID; - IN HDRV_CALL hdCall; - IN ULONG ulUserUserInfoSize; - IN UCHAR UserUserInfo[1]; -} NDIS_TAPI_DROP, *PNDIS_TAPI_DROP; +typedef struct _NDIS_TAPI_DROP { + IN ULONG ulRequestID; + IN HDRV_CALL hdCall; + IN ULONG ulUserUserInfoSize; + IN UCHAR UserUserInfo[1]; +} NDIS_TAPI_DROP, *PNDIS_TAPI_DROP; -typedef struct _NDIS_TAPI_PROVIDER_SHUTDOWN { - IN ULONG ulRequestID; -} NDIS_TAPI_PROVIDER_SHUTDOWN, *PNDIS_TAPI_PROVIDER_SHUTDOWN; +typedef struct _NDIS_TAPI_PROVIDER_SHUTDOWN { + IN ULONG ulRequestID; +} NDIS_TAPI_PROVIDER_SHUTDOWN, *PNDIS_TAPI_PROVIDER_SHUTDOWN; -typedef struct _NDIS_TAPI_SET_APP_SPECIFIC { - IN ULONG ulRequestID; - IN HDRV_CALL hdCall; - IN ULONG ulAppSpecific; -} NDIS_TAPI_SET_APP_SPECIFIC, *PNDIS_TAPI_SET_APP_SPECIFIC; +typedef struct _NDIS_TAPI_SET_APP_SPECIFIC { + IN ULONG ulRequestID; + IN HDRV_CALL hdCall; + IN ULONG ulAppSpecific; +} NDIS_TAPI_SET_APP_SPECIFIC, *PNDIS_TAPI_SET_APP_SPECIFIC; typedef struct _NDIS_TAPI_SET_CALL_PARAMS { IN ULONG ulRequestID; @@ -1011,49 +1011,49 @@ typedef struct _NDIS_TAPI_SET_CALL_PARAMS { IN ULONG ulMaxRate; IN BOOLEAN bSetLineDialParams; IN LINE_DIAL_PARAMS LineDialParams; -} NDIS_TAPI_SET_CALL_PARAMS, *PNDIS_TAPI_SET_CALL_PARAMS; +} NDIS_TAPI_SET_CALL_PARAMS, *PNDIS_TAPI_SET_CALL_PARAMS; -typedef struct _NDIS_TAPI_SET_DEFAULT_MEDIA_DETECTION { - IN ULONG ulRequestID; - IN HDRV_LINE hdLine; - IN ULONG ulMediaModes; +typedef struct _NDIS_TAPI_SET_DEFAULT_MEDIA_DETECTION { + IN ULONG ulRequestID; + IN HDRV_LINE hdLine; + IN ULONG ulMediaModes; } NDIS_TAPI_SET_DEFAULT_MEDIA_DETECTION, *PNDIS_TAPI_SET_DEFAULT_MEDIA_DETECTION; -typedef struct _NDIS_TAPI_SET_DEV_CONFIG { - IN ULONG ulRequestID; - IN ULONG ulDeviceID; - IN ULONG ulDeviceClassSize; - IN ULONG ulDeviceClassOffset; - IN ULONG ulDeviceConfigSize; - IN UCHAR DeviceConfig[1]; -} NDIS_TAPI_SET_DEV_CONFIG, *PNDIS_TAPI_SET_DEV_CONFIG; +typedef struct _NDIS_TAPI_SET_DEV_CONFIG { + IN ULONG ulRequestID; + IN ULONG ulDeviceID; + IN ULONG ulDeviceClassSize; + IN ULONG ulDeviceClassOffset; + IN ULONG ulDeviceConfigSize; + IN UCHAR DeviceConfig[1]; +} NDIS_TAPI_SET_DEV_CONFIG, *PNDIS_TAPI_SET_DEV_CONFIG; -typedef struct _NDIS_TAPI_SET_MEDIA_MODE { - IN ULONG ulRequestID; - IN HDRV_CALL hdCall; - IN ULONG ulMediaMode; -} NDIS_TAPI_SET_MEDIA_MODE, *PNDIS_TAPI_SET_MEDIA_MODE; +typedef struct _NDIS_TAPI_SET_MEDIA_MODE { + IN ULONG ulRequestID; + IN HDRV_CALL hdCall; + IN ULONG ulMediaMode; +} NDIS_TAPI_SET_MEDIA_MODE, *PNDIS_TAPI_SET_MEDIA_MODE; -typedef struct _NDIS_TAPI_SET_STATUS_MESSAGES { - IN ULONG ulRequestID; - IN HDRV_LINE hdLine; - IN ULONG ulLineStates; - IN ULONG ulAddressStates; -} NDIS_TAPI_SET_STATUS_MESSAGES, *PNDIS_TAPI_SET_STATUS_MESSAGES; +typedef struct _NDIS_TAPI_SET_STATUS_MESSAGES { + IN ULONG ulRequestID; + IN HDRV_LINE hdLine; + IN ULONG ulLineStates; + IN ULONG ulAddressStates; +} NDIS_TAPI_SET_STATUS_MESSAGES, *PNDIS_TAPI_SET_STATUS_MESSAGES; -typedef struct _NDIS_TAPI_ACCEPT { - IN ULONG ulRequestID; - IN HDRV_CALL hdCall; - IN ULONG ulUserUserInfoSize; - IN UCHAR UserUserInfo[1]; -} NDIS_TAPI_ACCEPT, *PNDIS_TAPI_ACCEPT; +typedef struct _NDIS_TAPI_ACCEPT { + IN ULONG ulRequestID; + IN HDRV_CALL hdCall; + IN ULONG ulUserUserInfoSize; + IN UCHAR UserUserInfo[1]; +} NDIS_TAPI_ACCEPT, *PNDIS_TAPI_ACCEPT; -typedef struct _NDIS_TAPI_DIAL { - IN ULONG ulRequestID; - IN HDRV_CALL hdCall; - IN ULONG ulDestAddressSize; - IN CHAR szDestAddress[1]; -} NDIS_TAPI_DIAL, *PNDIS_TAPI_DIAL; +typedef struct _NDIS_TAPI_DIAL { + IN ULONG ulRequestID; + IN HDRV_CALL hdCall; + IN ULONG ulDestAddressSize; + IN CHAR szDestAddress[1]; +} NDIS_TAPI_DIAL, *PNDIS_TAPI_DIAL; typedef struct _NDIS_TAPI_EVENT { IN HTAPI_LINE htLine; @@ -1064,156 +1064,156 @@ typedef struct _NDIS_TAPI_EVENT { IN ULONG ulParam3; } NDIS_TAPI_EVENT, *PNDIS_TAPI_EVENT; -typedef struct _NDIS_TAPI_OPEN { - IN ULONG ulRequestID; - IN ULONG ulDeviceID; - IN HTAPI_LINE htLine; - OUT HDRV_LINE hdLine; -} NDIS_TAPI_OPEN, *PNDIS_TAPI_OPEN; +typedef struct _NDIS_TAPI_OPEN { + IN ULONG ulRequestID; + IN ULONG ulDeviceID; + IN HTAPI_LINE htLine; + OUT HDRV_LINE hdLine; +} NDIS_TAPI_OPEN, *PNDIS_TAPI_OPEN; -typedef struct _NDIS_TAPI_SECURE_CALL { - IN ULONG ulRequestID; - IN HDRV_CALL hdCall; -} NDIS_TAPI_SECURE_CALL, *PNDIS_TAPI_SECURE_CALL; +typedef struct _NDIS_TAPI_SECURE_CALL { + IN ULONG ulRequestID; + IN HDRV_CALL hdCall; +} NDIS_TAPI_SECURE_CALL, *PNDIS_TAPI_SECURE_CALL; -typedef struct _NDIS_TAPI_SELECT_EXT_VERSION { - IN ULONG ulRequestID; - IN HDRV_LINE hdLine; - IN ULONG ulExtVersion; -} NDIS_TAPI_SELECT_EXT_VERSION, *PNDIS_TAPI_SELECT_EXT_VERSION; +typedef struct _NDIS_TAPI_SELECT_EXT_VERSION { + IN ULONG ulRequestID; + IN HDRV_LINE hdLine; + IN ULONG ulExtVersion; +} NDIS_TAPI_SELECT_EXT_VERSION, *PNDIS_TAPI_SELECT_EXT_VERSION; -typedef struct _NDIS_TAPI_SEND_USER_USER_INFO { - IN ULONG ulRequestID; - IN HDRV_CALL hdCall; - IN ULONG ulUserUserInfoSize; - IN UCHAR UserUserInfo[1]; -} NDIS_TAPI_SEND_USER_USER_INFO, *PNDIS_TAPI_SEND_USER_USER_INFO; +typedef struct _NDIS_TAPI_SEND_USER_USER_INFO { + IN ULONG ulRequestID; + IN HDRV_CALL hdCall; + IN ULONG ulUserUserInfoSize; + IN UCHAR UserUserInfo[1]; +} NDIS_TAPI_SEND_USER_USER_INFO, *PNDIS_TAPI_SEND_USER_USER_INFO; -typedef struct _NDIS_TAPI_CONFIG_DIALOG { - IN ULONG ulRequestID; - IN ULONG ulDeviceID; - IN ULONG ulDeviceClassSize; - IN ULONG ulDeviceClassOffset; - IN ULONG ulLibraryNameTotalSize; - OUT ULONG ulLibraryNameNeededSize; - OUT CHAR szLibraryName[1]; -} NDIS_TAPI_CONFIG_DIALOG, *PNDIS_TAPI_CONFIG_DIALOG; +typedef struct _NDIS_TAPI_CONFIG_DIALOG { + IN ULONG ulRequestID; + IN ULONG ulDeviceID; + IN ULONG ulDeviceClassSize; + IN ULONG ulDeviceClassOffset; + IN ULONG ulLibraryNameTotalSize; + OUT ULONG ulLibraryNameNeededSize; + OUT CHAR szLibraryName[1]; +} NDIS_TAPI_CONFIG_DIALOG, *PNDIS_TAPI_CONFIG_DIALOG; -typedef struct _NDIS_TAPI_DEV_SPECIFIC { - IN ULONG ulRequestID; - IN HDRV_LINE hdLine; - IN ULONG ulAddressID; - IN HDRV_CALL hdCall; - IN OUT ULONG ulParamsSize; - IN OUT UCHAR Params[1]; -} NDIS_TAPI_DEV_SPECIFIC, *PNDIS_TAPI_DEV_SPECIFIC; +typedef struct _NDIS_TAPI_DEV_SPECIFIC { + IN ULONG ulRequestID; + IN HDRV_LINE hdLine; + IN ULONG ulAddressID; + IN HDRV_CALL hdCall; + IN OUT ULONG ulParamsSize; + IN OUT UCHAR Params[1]; +} NDIS_TAPI_DEV_SPECIFIC, *PNDIS_TAPI_DEV_SPECIFIC; -typedef struct _NDIS_TAPI_GET_ADDRESS_CAPS { - IN ULONG ulRequestID; - IN ULONG ulDeviceID; - IN ULONG ulAddressID; - IN ULONG ulExtVersion; - OUT LINE_ADDRESS_CAPS LineAddressCaps; -} NDIS_TAPI_GET_ADDRESS_CAPS, *PNDIS_TAPI_GET_ADDRESS_CAPS; +typedef struct _NDIS_TAPI_GET_ADDRESS_CAPS { + IN ULONG ulRequestID; + IN ULONG ulDeviceID; + IN ULONG ulAddressID; + IN ULONG ulExtVersion; + OUT LINE_ADDRESS_CAPS LineAddressCaps; +} NDIS_TAPI_GET_ADDRESS_CAPS, *PNDIS_TAPI_GET_ADDRESS_CAPS; -typedef struct _NDIS_TAPI_GET_ADDRESS_ID { - IN ULONG ulRequestID; - IN HDRV_LINE hdLine; - OUT ULONG ulAddressID; - IN ULONG ulAddressMode; - IN ULONG ulAddressSize; - IN CHAR szAddress[1]; -} NDIS_TAPI_GET_ADDRESS_ID, *PNDIS_TAPI_GET_ADDRESS_ID; +typedef struct _NDIS_TAPI_GET_ADDRESS_ID { + IN ULONG ulRequestID; + IN HDRV_LINE hdLine; + OUT ULONG ulAddressID; + IN ULONG ulAddressMode; + IN ULONG ulAddressSize; + IN CHAR szAddress[1]; +} NDIS_TAPI_GET_ADDRESS_ID, *PNDIS_TAPI_GET_ADDRESS_ID; -typedef struct _NDIS_TAPI_GET_ADDRESS_STATUS { - IN ULONG ulRequestID; - IN HDRV_LINE hdLine; - IN ULONG ulAddressID; - OUT LINE_ADDRESS_STATUS LineAddressStatus; -} NDIS_TAPI_GET_ADDRESS_STATUS, *PNDIS_TAPI_GET_ADDRESS_STATUS; +typedef struct _NDIS_TAPI_GET_ADDRESS_STATUS { + IN ULONG ulRequestID; + IN HDRV_LINE hdLine; + IN ULONG ulAddressID; + OUT LINE_ADDRESS_STATUS LineAddressStatus; +} NDIS_TAPI_GET_ADDRESS_STATUS, *PNDIS_TAPI_GET_ADDRESS_STATUS; -typedef struct _NDIS_TAPI_GET_CALL_ADDRESS_ID { - IN ULONG ulRequestID; - IN HDRV_CALL hdCall; - OUT ULONG ulAddressID; -} NDIS_TAPI_GET_CALL_ADDRESS_ID, *PNDIS_TAPI_GET_CALL_ADDRESS_ID; +typedef struct _NDIS_TAPI_GET_CALL_ADDRESS_ID { + IN ULONG ulRequestID; + IN HDRV_CALL hdCall; + OUT ULONG ulAddressID; +} NDIS_TAPI_GET_CALL_ADDRESS_ID, *PNDIS_TAPI_GET_CALL_ADDRESS_ID; -typedef struct _NDIS_TAPI_GET_CALL_INFO { - ULONG ulRequestID; - IN HDRV_CALL hdCall; - OUT LINE_CALL_INFO LineCallInfo; -} NDIS_TAPI_GET_CALL_INFO, *PNDIS_TAPI_GET_CALL_INFO; +typedef struct _NDIS_TAPI_GET_CALL_INFO { + ULONG ulRequestID; + IN HDRV_CALL hdCall; + OUT LINE_CALL_INFO LineCallInfo; +} NDIS_TAPI_GET_CALL_INFO, *PNDIS_TAPI_GET_CALL_INFO; -typedef struct _NDIS_TAPI_GET_CALL_STATUS { - IN ULONG ulRequestID; - IN HDRV_CALL hdCall; - OUT LINE_CALL_STATUS LineCallStatus; -} NDIS_TAPI_GET_CALL_STATUS, *PNDIS_TAPI_GET_CALL_STATUS; +typedef struct _NDIS_TAPI_GET_CALL_STATUS { + IN ULONG ulRequestID; + IN HDRV_CALL hdCall; + OUT LINE_CALL_STATUS LineCallStatus; +} NDIS_TAPI_GET_CALL_STATUS, *PNDIS_TAPI_GET_CALL_STATUS; -typedef struct _NDIS_TAPI_GET_DEV_CAPS { - IN ULONG ulRequestID; - IN ULONG ulDeviceID; - IN ULONG ulExtVersion; - OUT LINE_DEV_CAPS LineDevCaps; +typedef struct _NDIS_TAPI_GET_DEV_CAPS { + IN ULONG ulRequestID; + IN ULONG ulDeviceID; + IN ULONG ulExtVersion; + OUT LINE_DEV_CAPS LineDevCaps; } NDIS_TAPI_GET_DEV_CAPS, *PNDIS_TAPI_GET_DEV_CAPS; -typedef struct _NDIS_TAPI_GET_DEV_CONFIG { - IN ULONG ulRequestID; - IN ULONG ulDeviceID; - IN ULONG ulDeviceClassSize; - IN ULONG ulDeviceClassOffset; - OUT VAR_STRING DeviceConfig; -} NDIS_TAPI_GET_DEV_CONFIG, *PNDIS_TAPI_GET_DEV_CONFIG; +typedef struct _NDIS_TAPI_GET_DEV_CONFIG { + IN ULONG ulRequestID; + IN ULONG ulDeviceID; + IN ULONG ulDeviceClassSize; + IN ULONG ulDeviceClassOffset; + OUT VAR_STRING DeviceConfig; +} NDIS_TAPI_GET_DEV_CONFIG, *PNDIS_TAPI_GET_DEV_CONFIG; -typedef struct _NDIS_TAPI_GET_EXTENSION_ID { - IN ULONG ulRequestID; - IN ULONG ulDeviceID; - OUT LINE_EXTENSION_ID LineExtensionID; +typedef struct _NDIS_TAPI_GET_EXTENSION_ID { + IN ULONG ulRequestID; + IN ULONG ulDeviceID; + OUT LINE_EXTENSION_ID LineExtensionID; } NDIS_TAPI_GET_EXTENSION_ID, *PNDIS_TAPI_GET_EXTENSION_ID; -typedef struct _NDIS_TAPI_GET_ID { - IN ULONG ulRequestID; - IN HDRV_LINE hdLine; - IN ULONG ulAddressID; - IN HDRV_CALL hdCall; - IN ULONG ulSelect; - IN ULONG ulDeviceClassSize; - IN ULONG ulDeviceClassOffset; - OUT VAR_STRING DeviceID; -} NDIS_TAPI_GET_ID, *PNDIS_TAPI_GET_ID; +typedef struct _NDIS_TAPI_GET_ID { + IN ULONG ulRequestID; + IN HDRV_LINE hdLine; + IN ULONG ulAddressID; + IN HDRV_CALL hdCall; + IN ULONG ulSelect; + IN ULONG ulDeviceClassSize; + IN ULONG ulDeviceClassOffset; + OUT VAR_STRING DeviceID; +} NDIS_TAPI_GET_ID, *PNDIS_TAPI_GET_ID; -typedef struct _NDIS_TAPI_GET_LINE_DEV_STATUS { - IN ULONG ulRequestID; - IN HDRV_LINE hdLine; - OUT LINE_DEV_STATUS LineDevStatus; -} NDIS_TAPI_GET_LINE_DEV_STATUS, *PNDIS_TAPI_GET_LINE_DEV_STATUS; +typedef struct _NDIS_TAPI_GET_LINE_DEV_STATUS { + IN ULONG ulRequestID; + IN HDRV_LINE hdLine; + OUT LINE_DEV_STATUS LineDevStatus; +} NDIS_TAPI_GET_LINE_DEV_STATUS, *PNDIS_TAPI_GET_LINE_DEV_STATUS; -typedef struct _NDIS_TAPI_MAKE_CALL { - IN ULONG ulRequestID; - IN HDRV_LINE hdLine; - IN HTAPI_CALL htCall; - OUT HDRV_CALL hdCall; - IN ULONG ulDestAddressSize; - IN ULONG ulDestAddressOffset; - IN BOOLEAN bUseDefaultLineCallParams; - IN LINE_CALL_PARAMS LineCallParams; +typedef struct _NDIS_TAPI_MAKE_CALL { + IN ULONG ulRequestID; + IN HDRV_LINE hdLine; + IN HTAPI_CALL htCall; + OUT HDRV_CALL hdCall; + IN ULONG ulDestAddressSize; + IN ULONG ulDestAddressOffset; + IN BOOLEAN bUseDefaultLineCallParams; + IN LINE_CALL_PARAMS LineCallParams; } NDIS_TAPI_MAKE_CALL, *PNDIS_TAPI_MAKE_CALL; -typedef struct _NDIS_TAPI_NEGOTIATE_EXT_VERSION { - IN ULONG ulRequestID; - IN ULONG ulDeviceID; - IN ULONG ulLowVersion; - IN ULONG ulHighVersion; - OUT ULONG ulExtVersion; -} NDIS_TAPI_NEGOTIATE_EXT_VERSION, *PNDIS_TAPI_NEGOTIATE_EXT_VERSION; +typedef struct _NDIS_TAPI_NEGOTIATE_EXT_VERSION { + IN ULONG ulRequestID; + IN ULONG ulDeviceID; + IN ULONG ulLowVersion; + IN ULONG ulHighVersion; + OUT ULONG ulExtVersion; +} NDIS_TAPI_NEGOTIATE_EXT_VERSION, *PNDIS_TAPI_NEGOTIATE_EXT_VERSION; -typedef struct _NDIS_TAPI_PROVIDER_INITIALIZE { - IN ULONG ulRequestID; - IN ULONG ulDeviceIDBase; - OUT ULONG ulNumLineDevs; - OUT ULONG ulProviderID; -} NDIS_TAPI_PROVIDER_INITIALIZE, *PNDIS_TAPI_PROVIDER_INITIALIZE; +typedef struct _NDIS_TAPI_PROVIDER_INITIALIZE { + IN ULONG ulRequestID; + IN ULONG ulDeviceIDBase; + OUT ULONG ulNumLineDevs; + OUT ULONG ulProviderID; +} NDIS_TAPI_PROVIDER_INITIALIZE, *PNDIS_TAPI_PROVIDER_INITIALIZE; #define CO_TAPI_VERSION NDIS_TAPI_CURRENT_VERSION diff --git a/reactos/w32api/include/ddk/ndiswan.h b/reactos/w32api/include/ddk/ndiswan.h index 66fb0de6edb..97599f57bb3 100644 --- a/reactos/w32api/include/ddk/ndiswan.h +++ b/reactos/w32api/include/ddk/ndiswan.h @@ -76,44 +76,44 @@ extern "C" { #define TAPI_PROVIDER 0x80000000 typedef struct _NDIS_WAN_INFO { - OUT ULONG MaxFrameSize; - OUT ULONG MaxTransmit; - OUT ULONG HeaderPadding; - OUT ULONG TailPadding; - OUT ULONG Endpoints; - OUT UINT MemoryFlags; - OUT NDIS_PHYSICAL_ADDRESS HighestAcceptableAddress; - OUT ULONG FramingBits; - OUT ULONG DesiredACCM; + OUT ULONG MaxFrameSize; + OUT ULONG MaxTransmit; + OUT ULONG HeaderPadding; + OUT ULONG TailPadding; + OUT ULONG Endpoints; + OUT UINT MemoryFlags; + OUT NDIS_PHYSICAL_ADDRESS HighestAcceptableAddress; + OUT ULONG FramingBits; + OUT ULONG DesiredACCM; } NDIS_WAN_INFO, *PNDIS_WAN_INFO; -typedef struct _NDIS_WAN_GET_LINK_INFO { - IN NDIS_HANDLE NdisLinkHandle; - OUT ULONG MaxSendFrameSize; - OUT ULONG MaxRecvFrameSize; - OUT ULONG HeaderPadding; - OUT ULONG TailPadding; - OUT ULONG SendFramingBits; - OUT ULONG RecvFramingBits; - OUT ULONG SendCompressionBits; - OUT ULONG RecvCompressionBits; - OUT ULONG SendACCM; - OUT ULONG RecvACCM; +typedef struct _NDIS_WAN_GET_LINK_INFO { + IN NDIS_HANDLE NdisLinkHandle; + OUT ULONG MaxSendFrameSize; + OUT ULONG MaxRecvFrameSize; + OUT ULONG HeaderPadding; + OUT ULONG TailPadding; + OUT ULONG SendFramingBits; + OUT ULONG RecvFramingBits; + OUT ULONG SendCompressionBits; + OUT ULONG RecvCompressionBits; + OUT ULONG SendACCM; + OUT ULONG RecvACCM; } NDIS_WAN_GET_LINK_INFO, *PNDIS_WAN_GET_LINK_INFO; -typedef struct _NDIS_WAN_SET_LINK_INFO { - IN NDIS_HANDLE NdisLinkHandle; - IN ULONG MaxSendFrameSize; - IN ULONG MaxRecvFrameSize; - IN ULONG HeaderPadding; - IN ULONG TailPadding; - IN ULONG SendFramingBits; - IN ULONG RecvFramingBits; - IN ULONG SendCompressionBits; - IN ULONG RecvCompressionBits; - IN ULONG SendACCM; - IN ULONG RecvACCM; -} NDIS_WAN_SET_LINK_INFO, *PNDIS_WAN_SET_LINK_INFO; +typedef struct _NDIS_WAN_SET_LINK_INFO { + IN NDIS_HANDLE NdisLinkHandle; + IN ULONG MaxSendFrameSize; + IN ULONG MaxRecvFrameSize; + IN ULONG HeaderPadding; + IN ULONG TailPadding; + IN ULONG SendFramingBits; + IN ULONG RecvFramingBits; + IN ULONG SendCompressionBits; + IN ULONG RecvCompressionBits; + IN ULONG SendACCM; + IN ULONG RecvACCM; +} NDIS_WAN_SET_LINK_INFO, *PNDIS_WAN_SET_LINK_INFO; /* NDIS_WAN_COMPRESS_INFO.MSCompType constants */ #define NDISWAN_COMPRESSION 0x00000001 @@ -147,10 +147,10 @@ typedef struct _NDIS_WAN_COMPRESS_INFO { typedef NDIS_WAN_COMPRESS_INFO *PNDIS_WAN_COMPRESS_INFO; -typedef struct _NDIS_WAN_GET_COMP_INFO { - IN NDIS_HANDLE NdisLinkHandle; - OUT NDIS_WAN_COMPRESS_INFO SendCapabilities; - OUT NDIS_WAN_COMPRESS_INFO RecvCapabilities; +typedef struct _NDIS_WAN_GET_COMP_INFO { + IN NDIS_HANDLE NdisLinkHandle; + OUT NDIS_WAN_COMPRESS_INFO SendCapabilities; + OUT NDIS_WAN_COMPRESS_INFO RecvCapabilities; } NDIS_WAN_GET_COMP_INFO, *PNDIS_WAN_GET_COMP_INFO; typedef struct _NDIS_WAN_SET_COMP_INFO { @@ -217,10 +217,10 @@ typedef struct _NDIS_WAN_CO_SET_LINK_INFO { IN ULONG RecvACCM; } NDIS_WAN_CO_SET_LINK_INFO, *PNDIS_WAN_CO_SET_LINK_INFO; -typedef struct _NDIS_WAN_CO_GET_COMP_INFO { - OUT NDIS_WAN_COMPRESS_INFO SendCapabilities; - OUT NDIS_WAN_COMPRESS_INFO RecvCapabilities; -} NDIS_WAN_CO_GET_COMP_INFO, *PNDIS_WAN_CO_GET_COMP_INFO; +typedef struct _NDIS_WAN_CO_GET_COMP_INFO { + OUT NDIS_WAN_COMPRESS_INFO SendCapabilities; + OUT NDIS_WAN_COMPRESS_INFO RecvCapabilities; +} NDIS_WAN_CO_GET_COMP_INFO, *PNDIS_WAN_CO_GET_COMP_INFO; typedef struct _NDIS_WAN_CO_SET_COMP_INFO { IN NDIS_WAN_COMPRESS_INFO SendCapabilities; diff --git a/reactos/w32api/include/ddk/ntagp.h b/reactos/w32api/include/ddk/ntagp.h index 36472056f62..06a8f428e60 100644 --- a/reactos/w32api/include/ddk/ntagp.h +++ b/reactos/w32api/include/ddk/ntagp.h @@ -89,7 +89,7 @@ typedef struct _AGP_BUS_INTERFACE_STANDARD { PVOID AgpContext; PINTERFACE_REFERENCE InterfaceReference; PINTERFACE_DEREFERENCE InterfaceDereference; - + ULONG Capabilities; PAGP_BUS_RESERVE_MEMORY ReserveMemory; PAGP_BUS_RELEASE_MEMORY ReleaseMemory; diff --git a/reactos/w32api/include/ddk/ntapi.h b/reactos/w32api/include/ddk/ntapi.h index f3506aef87e..64c2c2daf0a 100644 --- a/reactos/w32api/include/ddk/ntapi.h +++ b/reactos/w32api/include/ddk/ntapi.h @@ -93,7 +93,7 @@ typedef enum _SYSTEM_INFORMATION_CLASS { SystemVdmInstemulInformation = 19, SystemInstructionEmulationCounts = 19, SystemVdmBopInformation = 20, - SystemInvalidInfoClass1 = 20, + SystemInvalidInfoClass1 = 20, SystemFileCacheInformation = 21, SystemCacheInformation = 21, SystemPoolTagInformation = 22, @@ -628,7 +628,7 @@ typedef struct _SYSTEM_MEMORY_USAGE_INFORMATION { } SYSTEM_MEMORY_USAGE_INFORMATION, *PSYSTEM_MEMORY_USAGE_INFORMATION; // SystemProcessThreadInfo (5) -typedef struct _SYSTEM_THREAD_INFORMATION +typedef struct _SYSTEM_THREAD_INFORMATION { LARGE_INTEGER KernelTime; LARGE_INTEGER UserTime; @@ -660,9 +660,9 @@ typedef struct _SYSTEM_PROCESS_INFORMATION ULONG HandleCount; ULONG SessionId; ULONG PageDirectoryFrame; - - /* - * This part corresponds to VM_COUNTERS_EX. + + /* + * This part corresponds to VM_COUNTERS_EX. * NOTE: *NOT* THE SAME AS VM_COUNTERS! */ ULONG PeakVirtualSize; @@ -677,7 +677,7 @@ typedef struct _SYSTEM_PROCESS_INFORMATION ULONG PagefileUsage; ULONG PeakPagefileUsage; ULONG PrivateUsage; - + /* This part corresponds to IO_COUNTERS */ LARGE_INTEGER ReadOperationCount; LARGE_INTEGER WriteOperationCount; @@ -685,7 +685,7 @@ typedef struct _SYSTEM_PROCESS_INFORMATION LARGE_INTEGER ReadTransferCount; LARGE_INTEGER WriteTransferCount; LARGE_INTEGER OtherTransferCount; - + /* Finally, the array of Threads */ SYSTEM_THREAD_INFORMATION TH[1]; } SYSTEM_PROCESS_INFORMATION, *PSYSTEM_PROCESS_INFORMATION; diff --git a/reactos/w32api/include/ddk/ntddcdrm.h b/reactos/w32api/include/ddk/ntddcdrm.h index 49cf29dd2c5..756c7b5812b 100644 --- a/reactos/w32api/include/ddk/ntddcdrm.h +++ b/reactos/w32api/include/ddk/ntddcdrm.h @@ -128,7 +128,7 @@ typedef struct _CDROM_PLAY_AUDIO_MSF { typedef struct _CDROM_READ_TOC_EX { UCHAR Format : 4; - UCHAR Reserved1 : 3; + UCHAR Reserved1 : 3; UCHAR Msf : 1; UCHAR SessionTrack; UCHAR Reserved2; diff --git a/reactos/w32api/include/ddk/ntddpcm.h b/reactos/w32api/include/ddk/ntddpcm.h index 22ef5dd9525..9e25c1b9009 100644 --- a/reactos/w32api/include/ddk/ntddpcm.h +++ b/reactos/w32api/include/ddk/ntddpcm.h @@ -59,18 +59,18 @@ typedef enum _PCMCIA_CONTROLLER_CLASS { PcmciaIntelCompatible, PcmciaCardBusCompatible, PcmciaElcController, - PcmciaDatabook, + PcmciaDatabook, PcmciaPciPcmciaBridge, - PcmciaCirrusLogic, - PcmciaTI, - PcmciaTopic, - PcmciaRicoh, - PcmciaDatabookCB, - PcmciaOpti, - PcmciaTrid, - PcmciaO2Micro, - PcmciaNEC, - PcmciaNEC_98 + PcmciaCirrusLogic, + PcmciaTI, + PcmciaTopic, + PcmciaRicoh, + PcmciaDatabookCB, + PcmciaOpti, + PcmciaTrid, + PcmciaO2Micro, + PcmciaNEC, + PcmciaNEC_98 } PCMCIA_CONTROLLER_CLASS, *PPCMCIA_CONTROLLER_CLASS; typedef struct _PCMCIA_SOCKET_INFORMATION { @@ -116,7 +116,7 @@ typedef struct _PCMCIA_BUS_INTERFACE_STANDARD { PVOID Context; PINTERFACE_REFERENCE InterfaceReference; PINTERFACE_DEREFERENCE InterfaceDereference; - PPCMCIA_READ_WRITE_CONFIG ReadConfig; + PPCMCIA_READ_WRITE_CONFIG ReadConfig; PPCMCIA_READ_WRITE_CONFIG WriteConfig; } PCMCIA_BUS_INTERFACE_STANDARD, *PPCMCIA_BUS_INTERFACE_STANDARD; diff --git a/reactos/w32api/include/ddk/ntddstor.h b/reactos/w32api/include/ddk/ntddstor.h index 232834aab09..c6a8de71123 100644 --- a/reactos/w32api/include/ddk/ntddstor.h +++ b/reactos/w32api/include/ddk/ntddstor.h @@ -217,7 +217,7 @@ typedef struct _DEVICE_MEDIA_INFO { ULONG SectorsPerTrack; ULONG BytesPerSector; ULONG NumberMediaSides; - ULONG MediaCharacteristics; + ULONG MediaCharacteristics; } DiskInfo; struct { LARGE_INTEGER Cylinders; @@ -226,11 +226,11 @@ typedef struct _DEVICE_MEDIA_INFO { ULONG SectorsPerTrack; ULONG BytesPerSector; ULONG NumberMediaSides; - ULONG MediaCharacteristics; + ULONG MediaCharacteristics; } RemovableDiskInfo; struct { STORAGE_MEDIA_TYPE MediaType; - ULONG MediaCharacteristics; + ULONG MediaCharacteristics; ULONG CurrentBlockSize; STORAGE_BUS_TYPE BusType; union { @@ -314,10 +314,10 @@ typedef enum _STORAGE_PROPERTY_ID { } STORAGE_PROPERTY_ID, *PSTORAGE_PROPERTY_ID; typedef enum _STORAGE_QUERY_TYPE { - PropertyStandardQuery = 0, - PropertyExistsQuery, - PropertyMaskQuery, - PropertyQueryMaxDefined + PropertyStandardQuery = 0, + PropertyExistsQuery, + PropertyMaskQuery, + PropertyQueryMaxDefined } STORAGE_QUERY_TYPE, *PSTORAGE_QUERY_TYPE; typedef struct _STORAGE_PROPERTY_QUERY { diff --git a/reactos/w32api/include/ddk/ntifs.h b/reactos/w32api/include/ddk/ntifs.h index 013a50e94ed..272f8fdbc4a 100644 --- a/reactos/w32api/include/ddk/ntifs.h +++ b/reactos/w32api/include/ddk/ntifs.h @@ -67,7 +67,7 @@ extern PACL SeSystemDefaultDacl; #define ACCESS_DENIED_ACE_TYPE (0x1) #define SYSTEM_AUDIT_ACE_TYPE (0x2) #define SYSTEM_ALARM_ACE_TYPE (0x3) - + #define COMPRESSION_FORMAT_NONE (0x0000) #define COMPRESSION_FORMAT_DEFAULT (0x0001) #define COMPRESSION_FORMAT_LZNT1 (0x0002) @@ -259,7 +259,7 @@ extern PACL SeSystemDefaultDacl; #define MEM_DOS_LIM 0x40000000 /* also in winnt.h */ #define MEM_IMAGE SEC_IMAGE -/* end winnt.h */ +/* end winnt.h */ #define OB_TYPE_TYPE 1 #define OB_TYPE_DIRECTORY 2 #define OB_TYPE_SYMBOLIC_LINK 3 @@ -656,7 +656,7 @@ typedef struct _DEVICE_MAP { ULONG ReferenceCount; ULONG DriveMap; UCHAR DriveType[32]; -} DEVICE_MAP, *PDEVICE_MAP; +} DEVICE_MAP, *PDEVICE_MAP; #if (VER_PRODUCTBUILD >= 2600) @@ -1244,12 +1244,12 @@ typedef struct _MBCB { } MBCB, *PMBCB; typedef struct _MOVEFILE_DESCRIPTOR { - HANDLE FileHandle; - ULONG Reserved; - LARGE_INTEGER StartVcn; + HANDLE FileHandle; + ULONG Reserved; + LARGE_INTEGER StartVcn; LARGE_INTEGER TargetLcn; - ULONG NumVcns; - ULONG Reserved1; + ULONG NumVcns; + ULONG Reserved1; } MOVEFILE_DESCRIPTOR, *PMOVEFILE_DESCRIPTOR; typedef struct _NAMED_PIPE_CREATE_PARAMETERS { @@ -2306,7 +2306,7 @@ FsRtlFastUnlockAllByKey ( IN PEPROCESS Process, IN ULONG Key, IN PVOID Context OPTIONAL -); +); /* ret: STATUS_RANGE_NOT_LOCKED */ NTKERNELAPI @@ -2321,7 +2321,7 @@ FsRtlFastUnlockSingle ( IN ULONG Key, IN PVOID Context OPTIONAL, IN BOOLEAN AlreadySynchronized -); +); /* ret: STATUS_RANGE_NOT_LOCKED */ NTKERNELAPI @@ -2583,7 +2583,7 @@ FsRtlOplockIsFastIoPossible ( ret: IoStatus->Status: STATUS_PENDING, STATUS_LOCK_NOT_GRANTED - Internals: + Internals: -Calls IoCompleteRequest if Irp -Uses exception handling / ExRaiseStatus with STATUS_INSUFFICIENT_RESOURCES */ @@ -2597,9 +2597,9 @@ FsRtlPrivateLock ( IN PLARGE_INTEGER Length, IN PEPROCESS Process, IN ULONG Key, - IN BOOLEAN FailImmediately, + IN BOOLEAN FailImmediately, IN BOOLEAN ExclusiveLock, - OUT PIO_STATUS_BLOCK IoStatus, + OUT PIO_STATUS_BLOCK IoStatus, IN PIRP Irp OPTIONAL, IN PVOID Context, IN BOOLEAN AlreadySynchronized @@ -2614,7 +2614,7 @@ FsRtlPrivateLock ( -STATUS_PENDING, STATUS_LOCK_NOT_GRANTED from FsRtlPrivateLock (redirected IoStatus->Status). - Internals: + Internals: -switch ( Irp->CurrentStackLocation->MinorFunction ) lock: return FsRtlPrivateLock; unlocksingle: return FsRtlFastUnlockSingle; diff --git a/reactos/w32api/include/ddk/ntpoapi.h b/reactos/w32api/include/ddk/ntpoapi.h index 48c1e5ca332..c120d67f802 100644 --- a/reactos/w32api/include/ddk/ntpoapi.h +++ b/reactos/w32api/include/ddk/ntpoapi.h @@ -154,7 +154,7 @@ typedef struct _PROCESSOR_STATE_HANDLER2 { UCHAR NumPerfStates; PROCESSOR_PERF_LEVEL PerfLevel[1]; } PROCESSOR_STATE_HANDLER2, *PPROCESSOR_STATE_HANDLER2; - + typedef struct _PROCESSOR_POWER_STATE { PVOID IdleFunction; ULONG Idle0KernelTimeLimit; diff --git a/reactos/w32api/include/ddk/ntstatus.h b/reactos/w32api/include/ddk/ntstatus.h index d325d9f1144..61b04fbd858 100644 --- a/reactos/w32api/include/ddk/ntstatus.h +++ b/reactos/w32api/include/ddk/ntstatus.h @@ -1,7 +1,7 @@ /* * ntstatus.h * - * Windows NT status codes + * Windows NT status codes * * This file is part of the w32api package. * @@ -32,7 +32,7 @@ extern "C" { #endif #if !defined(STATUS_SUCCESS) -#define STATUS_SUCCESS ((NTSTATUS)0x00000000L) +#define STATUS_SUCCESS ((NTSTATUS)0x00000000L) #endif /* !STATUS_SUCCESS */ #define FACILITY_DEBUGGER 0x1 #define FACILITY_RPC_RUNTIME 0x2 @@ -55,13 +55,13 @@ extern "C" { #define STATUS_WAIT_3 ((NTSTATUS)0x00000003L) #define STATUS_WAIT_63 ((NTSTATUS)0x0000003FL) #define STATUS_ABANDONED ((NTSTATUS)0x00000080L) -#define STATUS_ABANDONED_WAIT_0 ((NTSTATUS)0x00000080L) +#define STATUS_ABANDONED_WAIT_0 ((NTSTATUS)0x00000080L) #define STATUS_ABANDONED_WAIT_63 ((NTSTATUS)0x000000BFL) -#define STATUS_USER_APC ((NTSTATUS)0x000000C0L) +#define STATUS_USER_APC ((NTSTATUS)0x000000C0L) #define STATUS_KERNEL_APC ((NTSTATUS)0x00000100L) #define STATUS_ALERTED ((NTSTATUS)0x00000101L) -#define STATUS_TIMEOUT ((NTSTATUS)0x00000102L) -#define STATUS_PENDING ((NTSTATUS)0x00000103L) +#define STATUS_TIMEOUT ((NTSTATUS)0x00000102L) +#define STATUS_PENDING ((NTSTATUS)0x00000103L) #define STATUS_REPARSE ((NTSTATUS)0x00000104L) #define STATUS_MORE_ENTRIES ((NTSTATUS)0x00000105L) #define STATUS_NOT_ALL_ASSIGNED ((NTSTATUS)0x00000106L) @@ -93,7 +93,7 @@ extern "C" { #define STATUS_WORKING_SET_LIMIT_RANGE ((NTSTATUS)0x40000002L) #define STATUS_IMAGE_NOT_AT_BASE ((NTSTATUS)0x40000003L) #define STATUS_RXACT_STATE_CREATED ((NTSTATUS)0x40000004L) -#define STATUS_SEGMENT_NOTIFICATION ((NTSTATUS)0x40000005L) +#define STATUS_SEGMENT_NOTIFICATION ((NTSTATUS)0x40000005L) #define STATUS_LOCAL_USER_SESSION_KEY ((NTSTATUS)0x40000006L) #define STATUS_BAD_CURRENT_DIRECTORY ((NTSTATUS)0x40000007L) #define STATUS_SERIAL_MORE_WRITES ((NTSTATUS)0x40000008L) @@ -130,12 +130,12 @@ extern "C" { #define STATUS_CARDBUS_NOT_SUPPORTED ((NTSTATUS)0x40000027L) #define STATUS_WX86_CREATEWX86TIB ((NTSTATUS)0x40000028L) #define STATUS_MP_PROCESSOR_MISMATCH ((NTSTATUS)0x40000029L) -#define STATUS_HIBERNATED ((NTSTATUS)0x4000002AL) -#define STATUS_RESUME_HIBERNATION ((NTSTATUS)0x4000002BL) -#define STATUS_GUARD_PAGE_VIOLATION ((NTSTATUS)0x80000001L) -#define STATUS_DATATYPE_MISALIGNMENT ((NTSTATUS)0x80000002L) -#define STATUS_BREAKPOINT ((NTSTATUS)0x80000003L) -#define STATUS_SINGLE_STEP ((NTSTATUS)0x80000004L) +#define STATUS_HIBERNATED ((NTSTATUS)0x4000002AL) +#define STATUS_RESUME_HIBERNATION ((NTSTATUS)0x4000002BL) +#define STATUS_GUARD_PAGE_VIOLATION ((NTSTATUS)0x80000001L) +#define STATUS_DATATYPE_MISALIGNMENT ((NTSTATUS)0x80000002L) +#define STATUS_BREAKPOINT ((NTSTATUS)0x80000003L) +#define STATUS_SINGLE_STEP ((NTSTATUS)0x80000004L) #define STATUS_BUFFER_OVERFLOW ((NTSTATUS)0x80000005L) #define STATUS_NO_MORE_FILES ((NTSTATUS)0x80000006L) #define STATUS_WAKE_SYSTEM_DEBUGGER ((NTSTATUS)0x80000007L) @@ -177,12 +177,12 @@ extern "C" { #define STATUS_CLUSTER_NODE_ALREADY_MEMBER ((NTSTATUS)0x80130005L) #define STATUS_UNSUCCESSFUL ((NTSTATUS)0xC0000001L) #define STATUS_NOT_IMPLEMENTED ((NTSTATUS)0xC0000002L) -#define STATUS_INVALID_INFO_CLASS ((NTSTATUS)0xC0000003L) +#define STATUS_INVALID_INFO_CLASS ((NTSTATUS)0xC0000003L) #define STATUS_INFO_LENGTH_MISMATCH ((NTSTATUS)0xC0000004L) -#define STATUS_ACCESS_VIOLATION ((NTSTATUS)0xC0000005L) -#define STATUS_IN_PAGE_ERROR ((NTSTATUS)0xC0000006L) +#define STATUS_ACCESS_VIOLATION ((NTSTATUS)0xC0000005L) +#define STATUS_IN_PAGE_ERROR ((NTSTATUS)0xC0000006L) #define STATUS_PAGEFILE_QUOTA ((NTSTATUS)0xC0000007L) -#define STATUS_INVALID_HANDLE ((NTSTATUS)0xC0000008L) +#define STATUS_INVALID_HANDLE ((NTSTATUS)0xC0000008L) #define STATUS_BAD_INITIAL_STACK ((NTSTATUS)0xC0000009L) #define STATUS_BAD_INITIAL_PC ((NTSTATUS)0xC000000AL) #define STATUS_INVALID_CID ((NTSTATUS)0xC000000BL) @@ -197,13 +197,13 @@ extern "C" { #define STATUS_UNRECOGNIZED_MEDIA ((NTSTATUS)0xC0000014L) #define STATUS_NONEXISTENT_SECTOR ((NTSTATUS)0xC0000015L) #define STATUS_MORE_PROCESSING_REQUIRED ((NTSTATUS)0xC0000016L) -#define STATUS_NO_MEMORY ((NTSTATUS)0xC0000017L) +#define STATUS_NO_MEMORY ((NTSTATUS)0xC0000017L) #define STATUS_CONFLICTING_ADDRESSES ((NTSTATUS)0xC0000018L) #define STATUS_NOT_MAPPED_VIEW ((NTSTATUS)0xC0000019L) #define STATUS_UNABLE_TO_FREE_VM ((NTSTATUS)0xC000001AL) #define STATUS_UNABLE_TO_DELETE_SECTION ((NTSTATUS)0xC000001BL) #define STATUS_INVALID_SYSTEM_SERVICE ((NTSTATUS)0xC000001CL) -#define STATUS_ILLEGAL_INSTRUCTION ((NTSTATUS)0xC000001DL) +#define STATUS_ILLEGAL_INSTRUCTION ((NTSTATUS)0xC000001DL) #define STATUS_INVALID_LOCK_SEQUENCE ((NTSTATUS)0xC000001EL) #define STATUS_INVALID_VIEW_SIZE ((NTSTATUS)0xC000001FL) #define STATUS_INVALID_FILE_FOR_SECTION ((NTSTATUS)0xC0000020L) @@ -211,8 +211,8 @@ extern "C" { #define STATUS_ACCESS_DENIED ((NTSTATUS)0xC0000022L) #define STATUS_BUFFER_TOO_SMALL ((NTSTATUS)0xC0000023L) #define STATUS_OBJECT_TYPE_MISMATCH ((NTSTATUS)0xC0000024L) -#define STATUS_NONCONTINUABLE_EXCEPTION ((NTSTATUS)0xC0000025L) -#define STATUS_INVALID_DISPOSITION ((NTSTATUS)0xC0000026L) +#define STATUS_NONCONTINUABLE_EXCEPTION ((NTSTATUS)0xC0000025L) +#define STATUS_INVALID_DISPOSITION ((NTSTATUS)0xC0000026L) #define STATUS_UNWIND ((NTSTATUS)0xC0000027L) #define STATUS_BAD_STACK ((NTSTATUS)0xC0000028L) #define STATUS_INVALID_UNWIND_TARGET ((NTSTATUS)0xC0000029L) @@ -273,21 +273,21 @@ extern "C" { #define STATUS_PRIVILEGE_NOT_HELD ((NTSTATUS)0xC0000061L) #define STATUS_INVALID_ACCOUNT_NAME ((NTSTATUS)0xC0000062L) #define STATUS_USER_EXISTS ((NTSTATUS)0xC0000063L) -#define STATUS_NO_SUCH_USER ((NTSTATUS)0xC0000064L) +#define STATUS_NO_SUCH_USER ((NTSTATUS)0xC0000064L) #define STATUS_GROUP_EXISTS ((NTSTATUS)0xC0000065L) #define STATUS_NO_SUCH_GROUP ((NTSTATUS)0xC0000066L) #define STATUS_MEMBER_IN_GROUP ((NTSTATUS)0xC0000067L) #define STATUS_MEMBER_NOT_IN_GROUP ((NTSTATUS)0xC0000068L) #define STATUS_LAST_ADMIN ((NTSTATUS)0xC0000069L) -#define STATUS_WRONG_PASSWORD ((NTSTATUS)0xC000006AL) +#define STATUS_WRONG_PASSWORD ((NTSTATUS)0xC000006AL) #define STATUS_ILL_FORMED_PASSWORD ((NTSTATUS)0xC000006BL) -#define STATUS_PASSWORD_RESTRICTION ((NTSTATUS)0xC000006CL) -#define STATUS_LOGON_FAILURE ((NTSTATUS)0xC000006DL) -#define STATUS_ACCOUNT_RESTRICTION ((NTSTATUS)0xC000006EL) -#define STATUS_INVALID_LOGON_HOURS ((NTSTATUS)0xC000006FL) -#define STATUS_INVALID_WORKSTATION ((NTSTATUS)0xC0000070L) -#define STATUS_PASSWORD_EXPIRED ((NTSTATUS)0xC0000071L) -#define STATUS_ACCOUNT_DISABLED ((NTSTATUS)0xC0000072L) +#define STATUS_PASSWORD_RESTRICTION ((NTSTATUS)0xC000006CL) +#define STATUS_LOGON_FAILURE ((NTSTATUS)0xC000006DL) +#define STATUS_ACCOUNT_RESTRICTION ((NTSTATUS)0xC000006EL) +#define STATUS_INVALID_LOGON_HOURS ((NTSTATUS)0xC000006FL) +#define STATUS_INVALID_WORKSTATION ((NTSTATUS)0xC0000070L) +#define STATUS_PASSWORD_EXPIRED ((NTSTATUS)0xC0000071L) +#define STATUS_ACCOUNT_DISABLED ((NTSTATUS)0xC0000072L) #define STATUS_NONE_MAPPED ((NTSTATUS)0xC0000073L) #define STATUS_TOO_MANY_LUIDS_REQUESTED ((NTSTATUS)0xC0000074L) #define STATUS_LUIDS_EXHAUSTED ((NTSTATUS)0xC0000075L) @@ -313,21 +313,21 @@ extern "C" { #define STATUS_RESOURCE_DATA_NOT_FOUND ((NTSTATUS)0xC0000089L) #define STATUS_RESOURCE_TYPE_NOT_FOUND ((NTSTATUS)0xC000008AL) #define STATUS_RESOURCE_NAME_NOT_FOUND ((NTSTATUS)0xC000008BL) -#define STATUS_ARRAY_BOUNDS_EXCEEDED ((NTSTATUS)0xC000008CL) -#define STATUS_FLOAT_DENORMAL_OPERAND ((NTSTATUS)0xC000008DL) -#define STATUS_FLOAT_DIVIDE_BY_ZERO ((NTSTATUS)0xC000008EL) -#define STATUS_FLOAT_INEXACT_RESULT ((NTSTATUS)0xC000008FL) -#define STATUS_FLOAT_INVALID_OPERATION ((NTSTATUS)0xC0000090L) -#define STATUS_FLOAT_OVERFLOW ((NTSTATUS)0xC0000091L) -#define STATUS_FLOAT_STACK_CHECK ((NTSTATUS)0xC0000092L) -#define STATUS_FLOAT_UNDERFLOW ((NTSTATUS)0xC0000093L) -#define STATUS_INTEGER_DIVIDE_BY_ZERO ((NTSTATUS)0xC0000094L) -#define STATUS_INTEGER_OVERFLOW ((NTSTATUS)0xC0000095L) -#define STATUS_PRIVILEGED_INSTRUCTION ((NTSTATUS)0xC0000096L) +#define STATUS_ARRAY_BOUNDS_EXCEEDED ((NTSTATUS)0xC000008CL) +#define STATUS_FLOAT_DENORMAL_OPERAND ((NTSTATUS)0xC000008DL) +#define STATUS_FLOAT_DIVIDE_BY_ZERO ((NTSTATUS)0xC000008EL) +#define STATUS_FLOAT_INEXACT_RESULT ((NTSTATUS)0xC000008FL) +#define STATUS_FLOAT_INVALID_OPERATION ((NTSTATUS)0xC0000090L) +#define STATUS_FLOAT_OVERFLOW ((NTSTATUS)0xC0000091L) +#define STATUS_FLOAT_STACK_CHECK ((NTSTATUS)0xC0000092L) +#define STATUS_FLOAT_UNDERFLOW ((NTSTATUS)0xC0000093L) +#define STATUS_INTEGER_DIVIDE_BY_ZERO ((NTSTATUS)0xC0000094L) +#define STATUS_INTEGER_OVERFLOW ((NTSTATUS)0xC0000095L) +#define STATUS_PRIVILEGED_INSTRUCTION ((NTSTATUS)0xC0000096L) #define STATUS_TOO_MANY_PAGING_FILES ((NTSTATUS)0xC0000097L) #define STATUS_FILE_INVALID ((NTSTATUS)0xC0000098L) #define STATUS_ALLOTTED_SPACE_EXCEEDED ((NTSTATUS)0xC0000099L) -#define STATUS_INSUFFICIENT_RESOURCES ((NTSTATUS)0xC000009AL) +#define STATUS_INSUFFICIENT_RESOURCES ((NTSTATUS)0xC000009AL) #define STATUS_DFS_EXIT_PATH_FOUND ((NTSTATUS)0xC000009BL) #define STATUS_DEVICE_DATA_ERROR ((NTSTATUS)0xC000009CL) #define STATUS_DEVICE_NOT_CONNECTED ((NTSTATUS)0xC000009DL) @@ -426,7 +426,7 @@ extern "C" { #define STATUS_INVALID_PARAMETER_12 ((NTSTATUS)0xC00000FAL) #define STATUS_REDIRECTOR_NOT_STARTED ((NTSTATUS)0xC00000FBL) #define STATUS_REDIRECTOR_STARTED ((NTSTATUS)0xC00000FCL) -#define STATUS_STACK_OVERFLOW ((NTSTATUS)0xC00000FDL) +#define STATUS_STACK_OVERFLOW ((NTSTATUS)0xC00000FDL) #define STATUS_NO_SUCH_PACKAGE ((NTSTATUS)0xC00000FEL) #define STATUS_BAD_FUNCTION_TABLE ((NTSTATUS)0xC00000FFL) #define STATUS_VARIABLE_NOT_FOUND ((NTSTATUS)0xC0000100L) @@ -487,7 +487,7 @@ extern "C" { #define STATUS_IO_PRIVILEGE_FAILED ((NTSTATUS)0xC0000137L) #define STATUS_ORDINAL_NOT_FOUND ((NTSTATUS)0xC0000138L) #define STATUS_ENTRYPOINT_NOT_FOUND ((NTSTATUS)0xC0000139L) -#define STATUS_CONTROL_C_EXIT ((NTSTATUS)0xC000013AL) +#define STATUS_CONTROL_C_EXIT ((NTSTATUS)0xC000013AL) #define STATUS_LOCAL_DISCONNECT ((NTSTATUS)0xC000013BL) #define STATUS_REMOTE_DISCONNECT ((NTSTATUS)0xC000013CL) #define STATUS_REMOTE_RESOURCES ((NTSTATUS)0xC000013DL) @@ -572,7 +572,7 @@ extern "C" { #define STATUS_TRUST_FAILURE ((NTSTATUS)0xC0000190L) #define STATUS_MUTANT_LIMIT_EXCEEDED ((NTSTATUS)0xC0000191L) #define STATUS_NETLOGON_NOT_STARTED ((NTSTATUS)0xC0000192L) -#define STATUS_ACCOUNT_EXPIRED ((NTSTATUS)0xC0000193L) +#define STATUS_ACCOUNT_EXPIRED ((NTSTATUS)0xC0000193L) #define STATUS_POSSIBLE_DEADLOCK ((NTSTATUS)0xC0000194L) #define STATUS_NETWORK_CREDENTIAL_CONFLICT ((NTSTATUS)0xC0000195L) #define STATUS_REMOTE_SESSION_LIMIT ((NTSTATUS)0xC0000196L) @@ -616,7 +616,7 @@ extern "C" { #define STATUS_IMAGE_CHECKSUM_MISMATCH ((NTSTATUS)0xC0000221L) #define STATUS_LOST_WRITEBEHIND_DATA ((NTSTATUS)0xC0000222L) #define STATUS_CLIENT_SERVER_PARAMETERS_INVALID ((NTSTATUS)0xC0000223L) -#define STATUS_PASSWORD_MUST_CHANGE ((NTSTATUS)0xC0000224L) +#define STATUS_PASSWORD_MUST_CHANGE ((NTSTATUS)0xC0000224L) #define STATUS_NOT_FOUND ((NTSTATUS)0xC0000225L) #define STATUS_NOT_TINY_STREAM ((NTSTATUS)0xC0000226L) #define STATUS_RECOVERY_FAILURE ((NTSTATUS)0xC0000227L) @@ -632,7 +632,7 @@ extern "C" { #define STATUS_MARSHALL_OVERFLOW ((NTSTATUS)0xC0000231L) #define STATUS_INVALID_VARIANT ((NTSTATUS)0xC0000232L) #define STATUS_DOMAIN_CONTROLLER_NOT_FOUND ((NTSTATUS)0xC0000233L) -#define STATUS_ACCOUNT_LOCKED_OUT ((NTSTATUS)0xC0000234L) +#define STATUS_ACCOUNT_LOCKED_OUT ((NTSTATUS)0xC0000234L) #define STATUS_HANDLE_NOT_CLOSABLE ((NTSTATUS)0xC0000235L) #define STATUS_CONNECTION_REFUSED ((NTSTATUS)0xC0000236L) #define STATUS_GRACEFUL_DISCONNECT ((NTSTATUS)0xC0000237L) @@ -746,8 +746,8 @@ extern "C" { #define STATUS_DIRECTORY_SERVICE_REQUIRED ((NTSTATUS)0xC00002B1L) #define STATUS_REPARSE_ATTRIBUTE_CONFLICT ((NTSTATUS)0xC00002B2L) #define STATUS_CANT_ENABLE_DENY_ONLY ((NTSTATUS)0xC00002B3L) -#define STATUS_FLOAT_MULTIPLE_FAULTS ((NTSTATUS)0xC00002B4L) -#define STATUS_FLOAT_MULTIPLE_TRAPS ((NTSTATUS)0xC00002B5L) +#define STATUS_FLOAT_MULTIPLE_FAULTS ((NTSTATUS)0xC00002B4L) +#define STATUS_FLOAT_MULTIPLE_TRAPS ((NTSTATUS)0xC00002B5L) #define STATUS_DEVICE_REMOVED ((NTSTATUS)0xC00002B6L) #define STATUS_JOURNAL_DELETE_IN_PROGRESS ((NTSTATUS)0xC00002B7L) #define STATUS_JOURNAL_NOT_ACTIVE ((NTSTATUS)0xC00002B8L) @@ -756,11 +756,11 @@ extern "C" { #define STATUS_DRIVER_FAILED_SLEEP ((NTSTATUS)0xC00002C2L) #define STATUS_MUTUAL_AUTHENTICATION_FAILED ((NTSTATUS)0xC00002C3L) #define STATUS_CORRUPT_SYSTEM_FILE ((NTSTATUS)0xC00002C4L) -#define STATUS_DATATYPE_MISALIGNMENT_ERROR ((NTSTATUS)0xC00002C5L) +#define STATUS_DATATYPE_MISALIGNMENT_ERROR ((NTSTATUS)0xC00002C5L) #define STATUS_WMI_READ_ONLY ((NTSTATUS)0xC00002C6L) #define STATUS_WMI_SET_FAILURE ((NTSTATUS)0xC00002C7L) #define STATUS_COMMITMENT_MINIMUM ((NTSTATUS)0xC00002C8L) -#define STATUS_REG_NAT_CONSUMPTION ((NTSTATUS)0xC00002C9L) +#define STATUS_REG_NAT_CONSUMPTION ((NTSTATUS)0xC00002C9L) #define STATUS_TRANSPORT_FULL ((NTSTATUS)0xC00002CAL) #define STATUS_DS_SAM_INIT_FAILURE ((NTSTATUS)0xC00002CBL) #define STATUS_ONLY_IF_CONNECTED ((NTSTATUS)0xC00002CCL) @@ -1069,8 +1069,8 @@ extern "C" { #define STATUS_SXS_ASSEMBLY_MISSING ((NTSTATUS)0xC015000CL) #define STATUS_SXS_RELEASE_ACTIVATION_CONTEXT ((NTSTATUS)0x4015000DL) #define STATUS_SXS_PROCESS_DEFAULT_ALREADY_SET ((NTSTATUS)0xC015000EL) -#define STATUS_SXS_EARLY_DEACTIVATION ((NTSTATUS)0xC015000FL) -#define STATUS_SXS_INVALID_DEACTIVATION ((NTSTATUS)0xC0150010L) +#define STATUS_SXS_EARLY_DEACTIVATION ((NTSTATUS)0xC015000FL) +#define STATUS_SXS_INVALID_DEACTIVATION ((NTSTATUS)0xC0150010L) #define STATUS_SXS_MULTIPLE_DEACTIVATION ((NTSTATUS)0xC0150011L) #define STATUS_SXS_SYSTEM_DEFAULT_ACTIVATION_CONTEXT_EMPTY ((NTSTATUS)0xC0150012L) #define STATUS_SXS_PROCESS_TERMINATION_REQUESTED ((NTSTATUS)0xC0150013L) diff --git a/reactos/w32api/include/ddk/parallel.h b/reactos/w32api/include/ddk/parallel.h index d6a2429aff3..1d9ce71286c 100644 --- a/reactos/w32api/include/ddk/parallel.h +++ b/reactos/w32api/include/ddk/parallel.h @@ -38,7 +38,7 @@ extern "C" { #define DD_PARALLEL_PORT_BASE_NAME_U L"ParallelPort" #define IOCTL_INTERNAL_DESELECT_DEVICE \ - CTL_CODE (FILE_DEVICE_PARALLEL_PORT, 24, METHOD_BUFFERED, FILE_ANY_ACCESS) + CTL_CODE (FILE_DEVICE_PARALLEL_PORT, 24, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_INTERNAL_GET_MORE_PARALLEL_PORT_INFO \ CTL_CODE (FILE_DEVICE_PARALLEL_PORT, 17, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_INTERNAL_GET_PARALLEL_PNP_INFO \ @@ -216,7 +216,7 @@ typedef NTSTATUS DDKAPI typedef NTSTATUS DDKAPI (*PTERMINATE_IEEE_MODE)( IN PVOID Context); - + typedef NTSTATUS DDKAPI (*PPARALLEL_IEEE_FWD_TO_REV)( IN PVOID Context); @@ -232,7 +232,7 @@ typedef NTSTATUS DDKAPI IN ULONG NumBytesToRead, OUT PULONG NumBytesRead, IN UCHAR Channel); - + typedef NTSTATUS DDKAPI (*PPARALLEL_WRITE)( IN PVOID Context, diff --git a/reactos/w32api/include/ddk/pfhook.h b/reactos/w32api/include/ddk/pfhook.h index 57e3973bb28..1700fbd1d5a 100644 --- a/reactos/w32api/include/ddk/pfhook.h +++ b/reactos/w32api/include/ddk/pfhook.h @@ -50,15 +50,15 @@ typedef enum _PF_FORWARD_ACTION { typedef PF_FORWARD_ACTION STDCALL (*PacketFilterExtensionPtr)( IN unsigned char *PacketHeader, - IN unsigned char *Packet, - IN unsigned int PacketLength, - IN unsigned int RecvInterfaceIndex, - IN unsigned int SendInterfaceIndex, - IN IPAddr RecvLinkNextHop, - IN IPAddr SendLinkNextHop); + IN unsigned char *Packet, + IN unsigned int PacketLength, + IN unsigned int RecvInterfaceIndex, + IN unsigned int SendInterfaceIndex, + IN IPAddr RecvLinkNextHop, + IN IPAddr SendLinkNextHop); typedef struct _PF_SET_EXTENSION_HOOK_INFO { - PacketFilterExtensionPtr ExtensionPointer; + PacketFilterExtensionPtr ExtensionPointer; } PF_SET_EXTENSION_HOOK_INFO, *PPF_SET_EXTENSION_HOOK_INFO; #define FSCTL_IPFLTRDRVR_BASE FILE_DEVICE_NETWORK diff --git a/reactos/w32api/include/ddk/prntfont.h b/reactos/w32api/include/ddk/prntfont.h index d6b944ebe23..c63e9a63498 100644 --- a/reactos/w32api/include/ddk/prntfont.h +++ b/reactos/w32api/include/ddk/prntfont.h @@ -141,8 +141,8 @@ typedef struct _UNIDRVINFO WORD wYRes; SHORT sYAdjust; SHORT sYMoved; - WORD wPrivateData; - SHORT sShift; + WORD wPrivateData; + SHORT sShift; INVOC SelectFont; INVOC UnSelectFont; WORD wReserved[4]; diff --git a/reactos/w32api/include/ddk/scsi.h b/reactos/w32api/include/ddk/scsi.h index 65adcdd3a90..6f1779c080b 100644 --- a/reactos/w32api/include/ddk/scsi.h +++ b/reactos/w32api/include/ddk/scsi.h @@ -45,7 +45,7 @@ typedef union _CDB { UCHAR Reserved : 4; UCHAR VendorUnique : 2; } CDB6GENERIC, *PCDB6GENERIC; - + struct _CDB6READWRITE { UCHAR OperationCode; UCHAR LogicalBlockMsb1 : 5; @@ -55,7 +55,7 @@ typedef union _CDB { UCHAR TransferBlocks; UCHAR Control; } CDB6READWRITE, *PCDB6READWRITE; - + struct _CDB6INQUIRY { UCHAR OperationCode; UCHAR Reserved1 : 5; @@ -65,7 +65,7 @@ typedef union _CDB { UCHAR AllocationLength; UCHAR Control; } CDB6INQUIRY, *PCDB6INQUIRY; - + struct _CDB6INQUIRY3 { UCHAR OperationCode; UCHAR EnableVitalProductData : 1; @@ -76,7 +76,7 @@ typedef union _CDB { UCHAR AllocationLength; UCHAR Control; } CDB6INQUIRY3, *PCDB6INQUIRY3; - + struct _CDB6VERIFY { UCHAR OperationCode; UCHAR Fixed : 1; @@ -87,7 +87,7 @@ typedef union _CDB { UCHAR VerificationLength[3]; UCHAR Control; } CDB6VERIFY, *PCDB6VERIFY; - + struct _CDB6FORMAT { UCHAR OperationCode; UCHAR FormatControl : 5; @@ -97,7 +97,7 @@ typedef union _CDB { UCHAR InterleaveLsb; UCHAR FReserved2; } CDB6FORMAT, *PCDB6FORMAT; - + struct _CDB10 { UCHAR OperationCode; UCHAR RelativeAddress : 1; @@ -114,7 +114,7 @@ typedef union _CDB { UCHAR TransferBlocksLsb; UCHAR Control; } CDB10, *PCDB10; - + struct _CDB12 { UCHAR OperationCode; UCHAR RelativeAddress : 1; @@ -127,7 +127,7 @@ typedef union _CDB { UCHAR Reserved2; UCHAR Control; } CDB12, *PCDB12; - + struct _PAUSE_RESUME { UCHAR OperationCode; UCHAR Reserved1 : 5; @@ -136,7 +136,7 @@ typedef union _CDB { UCHAR Action; UCHAR Control; } PAUSE_RESUME, *PPAUSE_RESUME; - + struct _READ_TOC { UCHAR OperationCode; UCHAR Reserved0 : 1; @@ -151,7 +151,7 @@ typedef union _CDB { UCHAR Control : 6; UCHAR Format : 2; } READ_TOC, *PREAD_TOC; - + struct _READ_DISK_INFORMATION { UCHAR OperationCode; UCHAR Reserved1 : 5; @@ -160,7 +160,7 @@ typedef union _CDB { UCHAR AllocationLength[2]; UCHAR Control; } READ_DISK_INFORMATION, *PREAD_DISK_INFORMATION; - + struct _READ_TRACK_INFORMATION { UCHAR OperationCode; UCHAR Track : 1; @@ -172,14 +172,14 @@ typedef union _CDB { UCHAR AllocationLength[2]; UCHAR Control; } READ_TRACK_INFORMATION, *PREAD_TRACK_INFORMATION; - + struct _RESERVE_TRACK_RZONE { UCHAR OperationCode; UCHAR Reserved1[4]; UCHAR ReservationSize[4]; UCHAR Control; } RESERVE_TRACK_RZONE, *PRESERVE_TRACK_RZONE; - + struct _SEND_OPC_INFORMATION { UCHAR OperationCode; UCHAR DoOpc : 1; @@ -188,7 +188,7 @@ typedef union _CDB { UCHAR ParameterListLength[2]; UCHAR Reserved2; } SEND_OPC_INFORMATION, *PSEND_OPC_INFORMATION; - + struct _CLOSE_TRACK { UCHAR OperationCode; UCHAR Immediate : 1; @@ -201,14 +201,14 @@ typedef union _CDB { UCHAR Reserved4[3]; UCHAR Control; } CLOSE_TRACK, *PCLOSE_TRACK; - + struct _SEND_CUE_SHEET { UCHAR OperationCode; UCHAR Reserved[5]; UCHAR CueSheetSize[3]; UCHAR Control; } SEND_CUE_SHEET, *PSEND_CUE_SHEET; - + struct _READ_HEADER { UCHAR OperationCode; UCHAR Reserved1 : 1; @@ -220,7 +220,7 @@ typedef union _CDB { UCHAR AllocationLength[2]; UCHAR Control; } READ_HEADER, *PREAD_HEADER; - + struct _PLAY_AUDIO { UCHAR OperationCode; UCHAR Reserved1 : 5; @@ -230,8 +230,8 @@ typedef union _CDB { UCHAR PlayLength[2]; UCHAR Control; } PLAY_AUDIO, *PPLAY_AUDIO; - - struct _PLAY_AUDIO_MSF { + + struct _PLAY_AUDIO_MSF { UCHAR OperationCode; UCHAR Reserved1 : 5; UCHAR LogicalUnitNumber : 3; @@ -244,10 +244,10 @@ typedef union _CDB { UCHAR EndingF; UCHAR Control; } PLAY_AUDIO_MSF, *PPLAY_AUDIO_MSF; - + /* FIXME: Should the union be anonymous in C++ too? If so, can't define named types _LBA and _MSF within anonymous union - for C++. */ + for C++. */ struct _PLAY_CD { UCHAR OperationCode; UCHAR Reserved1 : 1; @@ -262,7 +262,7 @@ typedef union _CDB { UCHAR StartingBlockAddress[4]; UCHAR PlayLength[4]; } LBA; - + struct _MSF { UCHAR Reserved1; UCHAR StartingM; @@ -278,7 +278,7 @@ typedef union _CDB { #else }u; #endif - + UCHAR Audio : 1; UCHAR Composite : 1; UCHAR Port1 : 1; @@ -287,7 +287,7 @@ typedef union _CDB { UCHAR Speed : 1; UCHAR Control; } PLAY_CD, *PPLAY_CD; - + struct _SCAN_CD { UCHAR OperationCode; UCHAR RelativeAddress : 1; @@ -301,7 +301,7 @@ typedef union _CDB { UCHAR Reserved4; UCHAR Control; } SCAN_CD, *PSCAN_CD; - + struct _STOP_PLAY_SCAN { UCHAR OperationCode; UCHAR Reserved1 : 5; @@ -309,7 +309,7 @@ typedef union _CDB { UCHAR Reserved2[7]; UCHAR Control; } STOP_PLAY_SCAN, *PSTOP_PLAY_SCAN; - + struct _SUBCHANNEL { UCHAR OperationCode; UCHAR Reserved0 : 1; @@ -325,8 +325,8 @@ typedef union _CDB { UCHAR AllocationLength[2]; UCHAR Control; } SUBCHANNEL, *PSUBCHANNEL; - - struct _READ_CD { + + struct _READ_CD { UCHAR OperationCode; UCHAR RelativeAddress : 1; UCHAR Reserved0 : 1; @@ -344,7 +344,7 @@ typedef union _CDB { UCHAR Reserved3 : 5; UCHAR Control; } READ_CD, *PREAD_CD; - + struct _READ_CD_MSF { UCHAR OperationCode; UCHAR RelativeAddress : 1; @@ -369,7 +369,7 @@ typedef union _CDB { UCHAR Reserved5 : 5; UCHAR Control; } READ_CD_MSF, *PREAD_CD_MSF; - + struct _PLXTR_READ_CDDA { UCHAR OperationCode; UCHAR Reserved0 : 5; @@ -385,7 +385,7 @@ typedef union _CDB { UCHAR SubCode; UCHAR Control; } PLXTR_READ_CDDA, *PPLXTR_READ_CDDA; - + struct _NEC_READ_CDDA { UCHAR OperationCode; UCHAR Reserved0; @@ -398,7 +398,7 @@ typedef union _CDB { UCHAR TransferBlockByte1; UCHAR Control; } NEC_READ_CDDA, *PNEC_READ_CDDA; - + struct _MODE_SENSE { UCHAR OperationCode; UCHAR Reserved1 : 3; @@ -411,7 +411,7 @@ typedef union _CDB { UCHAR AllocationLength; UCHAR Control; } MODE_SENSE, *PMODE_SENSE; - + struct _MODE_SENSE10 { UCHAR OperationCode; UCHAR Reserved1 : 3; @@ -424,7 +424,7 @@ typedef union _CDB { UCHAR AllocationLength[2]; UCHAR Control; } MODE_SENSE10, *PMODE_SENSE10; - + struct _MODE_SELECT { UCHAR OperationCode; UCHAR SPBit : 1; @@ -435,7 +435,7 @@ typedef union _CDB { UCHAR ParameterListLength; UCHAR Control; } MODE_SELECT, *PMODE_SELECT; - + struct _MODE_SELECT10 { UCHAR OperationCode; UCHAR SPBit : 1; @@ -446,7 +446,7 @@ typedef union _CDB { UCHAR ParameterListLength[2]; UCHAR Control; } MODE_SELECT10, *PMODE_SELECT10; - + struct _LOCATE { UCHAR OperationCode; UCHAR Immediate : 1; @@ -460,7 +460,7 @@ typedef union _CDB { UCHAR Partition; UCHAR Control; } LOCATE, *PLOCATE; - + struct _LOGSENSE { UCHAR OperationCode; UCHAR SPBit : 1; @@ -475,7 +475,7 @@ typedef union _CDB { UCHAR AllocationLength[2]; UCHAR Control; } LOGSENSE, *PLOGSENSE; - + struct _LOGSELECT { UCHAR OperationCode; UCHAR SPBit : 1; @@ -488,7 +488,7 @@ typedef union _CDB { UCHAR ParameterListLength[2]; UCHAR Control; } LOGSELECT, *PLOGSELECT; - + struct _PRINT { UCHAR OperationCode; UCHAR Reserved : 5; @@ -496,7 +496,7 @@ typedef union _CDB { UCHAR TransferLength[3]; UCHAR Control; } PRINT, *PPRINT; - + struct _SEEK { UCHAR OperationCode; UCHAR Reserved1 : 5; @@ -505,7 +505,7 @@ typedef union _CDB { UCHAR Reserved2[3]; UCHAR Control; } SEEK, *PSEEK; - + struct _ERASE { UCHAR OperationCode; UCHAR Long : 1; @@ -515,7 +515,7 @@ typedef union _CDB { UCHAR Reserved2[3]; UCHAR Control; } ERASE, *PERASE; - + struct _START_STOP { UCHAR OperationCode; UCHAR Immediate: 1; @@ -527,20 +527,20 @@ typedef union _CDB { UCHAR Reserved3 : 6; UCHAR Control; } START_STOP, *PSTART_STOP; - + struct _MEDIA_REMOVAL { UCHAR OperationCode; UCHAR Reserved1 : 5; UCHAR LogicalUnitNumber : 3; UCHAR Reserved2[2]; - + UCHAR Prevent : 1; UCHAR Persistant : 1; UCHAR Reserved3 : 6; - + UCHAR Control; } MEDIA_REMOVAL, *PMEDIA_REMOVAL; - + struct _SEEK_BLOCK { UCHAR OperationCode; UCHAR Immediate : 1; @@ -551,7 +551,7 @@ typedef union _CDB { UCHAR Reserved2 : 4; UCHAR VendorUnique : 2; } SEEK_BLOCK, *PSEEK_BLOCK; - + struct _REQUEST_BLOCK_ADDRESS { UCHAR OperationCode; UCHAR Reserved1[3]; @@ -561,7 +561,7 @@ typedef union _CDB { UCHAR Reserved2 : 4; UCHAR VendorUnique : 2; } REQUEST_BLOCK_ADDRESS, *PREQUEST_BLOCK_ADDRESS; - + struct _PARTITION { UCHAR OperationCode; UCHAR Immediate : 1; @@ -570,7 +570,7 @@ typedef union _CDB { UCHAR Reserved1[3]; UCHAR Control; } PARTITION, *PPARTITION; - + struct _WRITE_TAPE_MARKS { UCHAR OperationCode; UCHAR Immediate : 1; @@ -580,7 +580,7 @@ typedef union _CDB { UCHAR TransferLength[3]; UCHAR Control; } WRITE_TAPE_MARKS, *PWRITE_TAPE_MARKS; - + struct _SPACE_TAPE_MARKS { UCHAR OperationCode; UCHAR Code : 3; @@ -599,7 +599,7 @@ typedef union _CDB { } Fields; } Byte6; } SPACE_TAPE_MARKS, *PSPACE_TAPE_MARKS; - + struct _READ_POSITION { UCHAR Operation; UCHAR BlockType : 1; @@ -608,7 +608,7 @@ typedef union _CDB { UCHAR Reserved2[7]; UCHAR Control; } READ_POSITION, *PREAD_POSITION; - + struct _CDB6READWRITETAPE { UCHAR OperationCode; UCHAR VendorSpecific : 5; @@ -621,7 +621,7 @@ typedef union _CDB { UCHAR Reserved1 : 4; UCHAR VendorUnique : 2; } CDB6READWRITETAPE, *PCDB6READWRITETAPE; - + struct _INIT_ELEMENT_STATUS { UCHAR OperationCode; UCHAR Reserved1 : 5; @@ -630,7 +630,7 @@ typedef union _CDB { UCHAR Reserved3 : 7; UCHAR NoBarCode : 1; } INIT_ELEMENT_STATUS, *PINIT_ELEMENT_STATUS; - + struct _INITIALIZE_ELEMENT_RANGE { UCHAR OperationCode; UCHAR Range : 1; @@ -643,7 +643,7 @@ typedef union _CDB { UCHAR Reserved4 : 7; UCHAR NoBarCode : 1; } INITIALIZE_ELEMENT_RANGE, *PINITIALIZE_ELEMENT_RANGE; - + struct _POSITION_TO_ELEMENT { UCHAR OperationCode; UCHAR Reserved1 : 5; @@ -655,7 +655,7 @@ typedef union _CDB { UCHAR Reserved3 : 7; UCHAR Control; } POSITION_TO_ELEMENT, *PPOSITION_TO_ELEMENT; - + struct _MOVE_MEDIUM { UCHAR OperationCode; UCHAR Reserved1 : 5; @@ -668,7 +668,7 @@ typedef union _CDB { UCHAR Reserved3 : 7; UCHAR Control; } MOVE_MEDIUM, *PMOVE_MEDIUM; - + struct _EXCHANGE_MEDIUM { UCHAR OperationCode; UCHAR Reserved1 : 5; @@ -682,7 +682,7 @@ typedef union _CDB { UCHAR Reserved3 : 6; UCHAR Control; } EXCHANGE_MEDIUM, *PEXCHANGE_MEDIUM; - + struct _READ_ELEMENT_STATUS { UCHAR OperationCode; UCHAR ElementType : 4; @@ -695,7 +695,7 @@ typedef union _CDB { UCHAR Reserved2; UCHAR Control; } READ_ELEMENT_STATUS, *PREAD_ELEMENT_STATUS; - + struct _SEND_VOLUME_TAG { UCHAR OperationCode; UCHAR ElementType : 4; @@ -710,7 +710,7 @@ typedef union _CDB { UCHAR Reserved5; UCHAR Control; } SEND_VOLUME_TAG, *PSEND_VOLUME_TAG; - + struct _REQUEST_VOLUME_ELEMENT_ADDRESS { UCHAR OperationCode; UCHAR ElementType : 4; @@ -723,7 +723,7 @@ typedef union _CDB { UCHAR Reserved2; UCHAR Control; } REQUEST_VOLUME_ELEMENT_ADDRESS, *PREQUEST_VOLUME_ELEMENT_ADDRESS; - + struct _LOAD_UNLOAD { UCHAR OperationCode; UCHAR Immediate : 1; @@ -737,7 +737,7 @@ typedef union _CDB { UCHAR Slot; UCHAR Reserved5[3]; } LOAD_UNLOAD, *PLOAD_UNLOAD; - + struct _MECH_STATUS { UCHAR OperationCode; UCHAR Reserved : 5; @@ -747,37 +747,37 @@ typedef union _CDB { UCHAR Reserved2[1]; UCHAR Control; } MECH_STATUS, *PMECH_STATUS; - + struct _SYNCHRONIZE_CACHE10 { - + UCHAR OperationCode; - + UCHAR RelAddr : 1; UCHAR Immediate : 1; UCHAR Reserved : 3; UCHAR Lun : 3; - + UCHAR LogicalBlockAddress[4]; UCHAR Reserved2; UCHAR BlockCount[2]; UCHAR Control; } SYNCHRONIZE_CACHE10, *PSYNCHRONIZE_CACHE10; - + struct _GET_EVENT_STATUS_NOTIFICATION { UCHAR OperationCode; - + UCHAR Immediate : 1; UCHAR Reserved : 4; UCHAR Lun : 3; - + UCHAR Reserved2[2]; UCHAR NotificationClassRequest; UCHAR Reserved3[2]; UCHAR EventListLength[2]; - + UCHAR Control; } GET_EVENT_STATUS_NOTIFICATION, *PGET_EVENT_STATUS_NOTIFICATION; - + struct _READ_DVD_STRUCTURE { UCHAR OperationCode; UCHAR Reserved1 : 5; @@ -790,7 +790,7 @@ typedef union _CDB { UCHAR AGID : 2; UCHAR Control; } READ_DVD_STRUCTURE, *PREAD_DVD_STRUCTURE; - + struct _SEND_DVD_STRUCTURE { UCHAR OperationCode; UCHAR Reserved1 : 5; @@ -801,7 +801,7 @@ typedef union _CDB { UCHAR Reserved3; UCHAR Control; } SEND_DVD_STRUCTURE, *PSEND_DVD_STRUCTURE; - + struct _SEND_KEY { UCHAR OperationCode; UCHAR Reserved1 : 5; @@ -812,7 +812,7 @@ typedef union _CDB { UCHAR AGID : 2; UCHAR Control; } SEND_KEY, *PSEND_KEY; - + struct _REPORT_KEY { UCHAR OperationCode; UCHAR Reserved1 : 5; @@ -824,7 +824,7 @@ typedef union _CDB { UCHAR AGID : 2; UCHAR Control; } REPORT_KEY, *PREPORT_KEY; - + struct _SET_READ_AHEAD { UCHAR OperationCode; UCHAR Reserved1 : 5; @@ -834,7 +834,7 @@ typedef union _CDB { UCHAR Reserved2; UCHAR Control; } SET_READ_AHEAD, *PSET_READ_AHEAD; - + struct _READ_FORMATTED_CAPACITIES { UCHAR OperationCode; UCHAR Reserved1 : 5; @@ -843,7 +843,7 @@ typedef union _CDB { UCHAR AllocationLength[2]; UCHAR Control; } READ_FORMATTED_CAPACITIES, *PREAD_FORMATTED_CAPACITIES; - + struct _REPORT_LUNS { UCHAR OperationCode; UCHAR Reserved1[5]; @@ -851,7 +851,7 @@ typedef union _CDB { UCHAR Reserved2[1]; UCHAR Control; } REPORT_LUNS, *PREPORT_LUNS; - + struct _PERSISTENT_RESERVE_IN { UCHAR OperationCode; UCHAR ServiceAction : 5; @@ -860,7 +860,7 @@ typedef union _CDB { UCHAR AllocationLength[2]; UCHAR Control; } PERSISTENT_RESERVE_IN, *PPERSISTENT_RESERVE_IN; - + struct _PERSISTENT_RESERVE_OUT { UCHAR OperationCode; UCHAR ServiceAction : 5; @@ -871,7 +871,7 @@ typedef union _CDB { UCHAR ParameterListLength[2]; UCHAR Control; } PERSISTENT_RESERVE_OUT, *PPERSISTENT_RESERVE_OUT; - + struct _GET_CONFIGURATION { UCHAR OperationCode; UCHAR RequestType : 1; @@ -881,7 +881,7 @@ typedef union _CDB { UCHAR AllocationLength[2]; UCHAR Control; } GET_CONFIGURATION, *PGET_CONFIGURATION; - + struct _SET_CD_SPEED { UCHAR OperationCode; UCHAR Reserved1; @@ -890,7 +890,7 @@ typedef union _CDB { UCHAR Reserved2[5]; UCHAR Control; } SET_CD_SPEED, *PSET_CD_SPEED; - + ULONG AsUlong[4]; UCHAR AsByte[16]; } CDB, *PCDB; @@ -1358,11 +1358,11 @@ typedef struct _MODE_CDROM_WRITE_PARAMETERS_PAGE { UCHAR FixedPacket : 1; UCHAR MultiSession : 2; UCHAR DataBlockType : 4; - UCHAR Reserved3 : 4; + UCHAR Reserved3 : 4; UCHAR LinkSize; UCHAR Reserved4; UCHAR HostApplicationCode : 6; - UCHAR Reserved5 : 2; + UCHAR Reserved5 : 2; UCHAR SessionFormat; UCHAR Reserved6; UCHAR PacketSize[4]; diff --git a/reactos/w32api/include/ddk/scsiwmi.h b/reactos/w32api/include/ddk/scsiwmi.h index 79bd142d75a..79a6c5bdfef 100644 --- a/reactos/w32api/include/ddk/scsiwmi.h +++ b/reactos/w32api/include/ddk/scsiwmi.h @@ -173,10 +173,10 @@ ScsiPortWmiDispatchFunction( #define ScsiPortWmiGetReturnSize(RequestContext) \ ((RequestContext)->ReturnSize) -/* UCHAR +/* UCHAR * ScsiPortWmiGetReturnStatus( * PSCSIWMI_REQUEST_CONTEXT RequestContext); - */ + */ #define ScsiPortWmiGetReturnStatus(RequestContext) \ ((RequestContext)->ReturnStatus) diff --git a/reactos/w32api/include/ddk/srb.h b/reactos/w32api/include/ddk/srb.h index 052d1682bad..8ffecaa09a5 100644 --- a/reactos/w32api/include/ddk/srb.h +++ b/reactos/w32api/include/ddk/srb.h @@ -167,42 +167,42 @@ typedef PHYSICAL_ADDRESS SCSI_PHYSICAL_ADDRESS, *PSCSI_PHYSICAL_ADDRESS; #define SRB_FLAGS_PORT_DRIVER_RESERVED 0x0F000000 #define SRB_FLAGS_CLASS_DRIVER_RESERVED 0xF0000000 -typedef struct _SCSI_REQUEST_BLOCK { - USHORT Length; - UCHAR Function; - UCHAR SrbStatus; - UCHAR ScsiStatus; - UCHAR PathId; - UCHAR TargetId; - UCHAR Lun; - UCHAR QueueTag; - UCHAR QueueAction; - UCHAR CdbLength; - UCHAR SenseInfoBufferLength; - ULONG SrbFlags; - ULONG DataTransferLength; - ULONG TimeOutValue; - PVOID DataBuffer; - PVOID SenseInfoBuffer; - struct _SCSI_REQUEST_BLOCK *NextSrb; - PVOID OriginalRequest; - PVOID SrbExtension; +typedef struct _SCSI_REQUEST_BLOCK { + USHORT Length; + UCHAR Function; + UCHAR SrbStatus; + UCHAR ScsiStatus; + UCHAR PathId; + UCHAR TargetId; + UCHAR Lun; + UCHAR QueueTag; + UCHAR QueueAction; + UCHAR CdbLength; + UCHAR SenseInfoBufferLength; + ULONG SrbFlags; + ULONG DataTransferLength; + ULONG TimeOutValue; + PVOID DataBuffer; + PVOID SenseInfoBuffer; + struct _SCSI_REQUEST_BLOCK *NextSrb; + PVOID OriginalRequest; + PVOID SrbExtension; _ANONYMOUS_UNION union { ULONG InternalStatus; ULONG QueueSortKey; - } DUMMYUNIONNAME; + } DUMMYUNIONNAME; #if defined(_WIN64) ULONG Reserved; #endif - UCHAR Cdb[16]; -} SCSI_REQUEST_BLOCK, *PSCSI_REQUEST_BLOCK; + UCHAR Cdb[16]; +} SCSI_REQUEST_BLOCK, *PSCSI_REQUEST_BLOCK; #define SCSI_REQUEST_BLOCK_SIZE sizeof(SCSI_REQUEST_BLOCK) -typedef struct _ACCESS_RANGE { - SCSI_PHYSICAL_ADDRESS RangeStart; - ULONG RangeLength; - BOOLEAN RangeInMemory; +typedef struct _ACCESS_RANGE { + SCSI_PHYSICAL_ADDRESS RangeStart; + ULONG RangeLength; + BOOLEAN RangeInMemory; } ACCESS_RANGE, *PACCESS_RANGE; /* PORT_CONFIGURATION_INFORMATION.Dma64BitAddresses constants */ @@ -353,37 +353,37 @@ typedef VOID DDKAPI (*PHW_TIMER)( IN PVOID DeviceExtension); -typedef struct _HW_INITIALIZATION_DATA { - ULONG HwInitializationDataSize; - INTERFACE_TYPE AdapterInterfaceType; - PHW_INITIALIZE HwInitialize; - PHW_STARTIO HwStartIo; - PHW_INTERRUPT HwInterrupt; - PHW_FIND_ADAPTER HwFindAdapter; - PHW_RESET_BUS HwResetBus; - PHW_DMA_STARTED HwDmaStarted; - PHW_ADAPTER_STATE HwAdapterState; - ULONG DeviceExtensionSize; - ULONG SpecificLuExtensionSize; - ULONG SrbExtensionSize; - ULONG NumberOfAccessRanges; - PVOID Reserved; - BOOLEAN MapBuffers; - BOOLEAN NeedPhysicalAddresses; - BOOLEAN TaggedQueuing; - BOOLEAN AutoRequestSense; - BOOLEAN MultipleRequestPerLu; - BOOLEAN ReceiveEvent; - USHORT VendorIdLength; - PVOID VendorId; - USHORT ReservedUshort; - USHORT DeviceIdLength; - PVOID DeviceId; +typedef struct _HW_INITIALIZATION_DATA { + ULONG HwInitializationDataSize; + INTERFACE_TYPE AdapterInterfaceType; + PHW_INITIALIZE HwInitialize; + PHW_STARTIO HwStartIo; + PHW_INTERRUPT HwInterrupt; + PHW_FIND_ADAPTER HwFindAdapter; + PHW_RESET_BUS HwResetBus; + PHW_DMA_STARTED HwDmaStarted; + PHW_ADAPTER_STATE HwAdapterState; + ULONG DeviceExtensionSize; + ULONG SpecificLuExtensionSize; + ULONG SrbExtensionSize; + ULONG NumberOfAccessRanges; + PVOID Reserved; + BOOLEAN MapBuffers; + BOOLEAN NeedPhysicalAddresses; + BOOLEAN TaggedQueuing; + BOOLEAN AutoRequestSense; + BOOLEAN MultipleRequestPerLu; + BOOLEAN ReceiveEvent; + USHORT VendorIdLength; + PVOID VendorId; + USHORT ReservedUshort; + USHORT DeviceIdLength; + PVOID DeviceId; PHW_ADAPTER_CONTROL HwAdapterControl; -} HW_INITIALIZATION_DATA, *PHW_INITIALIZATION_DATA; +} HW_INITIALIZATION_DATA, *PHW_INITIALIZATION_DATA; SCSIPORTAPI -VOID +VOID DDKAPI ScsiPortCompleteRequest( IN PVOID HwDeviceExtension, @@ -400,7 +400,7 @@ ScsiPortCompleteRequest( #define ScsiPortConvertPhysicalAddressToUlong(Address) ((Address).LowPart) SCSIPORTAPI -SCSI_PHYSICAL_ADDRESS +SCSI_PHYSICAL_ADDRESS DDKAPI ScsiPortConvertUlongToPhysicalAddress( IN ULONG UlongAddress); diff --git a/reactos/w32api/include/ddk/tdi.h b/reactos/w32api/include/ddk/tdi.h index 0a48b41a2f6..920777c7e72 100644 --- a/reactos/w32api/include/ddk/tdi.h +++ b/reactos/w32api/include/ddk/tdi.h @@ -214,7 +214,7 @@ typedef struct _TDI_ENDPOINT_INFO { typedef struct _TDI_CONNECTION_INFO { ULONG State; - ULONG Event; + ULONG Event; ULONG TransmittedTsdus; ULONG ReceivedTsdus; ULONG TransmissionErrors; diff --git a/reactos/w32api/include/ddk/tdikrnl.h b/reactos/w32api/include/ddk/tdikrnl.h index a019e7d23b3..d3345f18182 100644 --- a/reactos/w32api/include/ddk/tdikrnl.h +++ b/reactos/w32api/include/ddk/tdikrnl.h @@ -493,7 +493,7 @@ TdiDefaultSendPossibleHandler( * IN PVOID Contxt, * IN PLARGE_INTEGER Time, * IN PTDI_CONNECTION_INFORMATION RequestConnectionInfo, - * OUT PTDI_CONNECTION_INFORMATION ReturnConnectionInfo); + * OUT PTDI_CONNECTION_INFORMATION ReturnConnectionInfo); */ #define TdiBuildConnect( \ Irp, DevObj, FileObj, CompRoutine, Contxt, \ @@ -544,7 +544,7 @@ TdiDefaultSendPossibleHandler( * IN PLARGE_INTEGER Time, * IN PULONG Flags, * IN PTDI_CONNECTION_INFORMATION RequestConnectionInfo, - * OUT PTDI_CONNECTION_INFORMATION ReturnConnectionInfo); + * OUT PTDI_CONNECTION_INFORMATION ReturnConnectionInfo); */ #define TdiBuildDisconnect( \ Irp, DevObj, FileObj, CompRoutine, Contxt, Time, \ @@ -592,7 +592,7 @@ TdiDefaultSendPossibleHandler( * IN PVOID Contxt, * IN ULONG Flags, * IN PTDI_CONNECTION_INFORMATION RequestConnectionInfo, - * OUT PTDI_CONNECTION_INFORMATION ReturnConnectionInfo); + * OUT PTDI_CONNECTION_INFORMATION ReturnConnectionInfo); */ #define TdiBuildListen( \ Irp, DevObj, FileObj, CompRoutine, Contxt, \ @@ -665,8 +665,8 @@ TdiBuildNetbiosAddressEa( * IN PVOID CompRoutine, * IN PVOID Contxt, * IN PMDL MdlAddr, - * IN ULONG InFlags, - * IN ULONG ReceiveLen); + * IN ULONG InFlags, + * IN ULONG ReceiveLen); */ #define TdiBuildReceive( \ Irp, DevObj, FileObj, CompRoutine, Contxt, \ @@ -698,7 +698,7 @@ TdiBuildNetbiosAddressEa( * IN ULONG ReceiveLen, * IN PTDI_CONNECTION_INFORMATION ReceiveDatagramInfo, * OUT PTDI_CONNECTION_INFORMATION ReturnInfo, - * ULONG InFlags); + * ULONG InFlags); */ #define TdiBuildReceiveDatagram( \ Irp, DevObj, FileObj, CompRoutine, Contxt, MdlAddr, \ @@ -760,7 +760,7 @@ TdiBuildNetbiosAddressEa( * IN PVOID Contxt, * IN PMDL MdlAddr, * IN ULONG SendLen, - * IN PTDI_CONNECTION_INFORMATION SendDatagramInfo); + * IN PTDI_CONNECTION_INFORMATION SendDatagramInfo); */ #define TdiBuildSendDatagram( \ Irp, DevObj, FileObj, CompRoutine, Contxt, \ diff --git a/reactos/w32api/include/ddk/usb.h b/reactos/w32api/include/ddk/usb.h index 18dac4c8ffd..64377843906 100644 --- a/reactos/w32api/include/ddk/usb.h +++ b/reactos/w32api/include/ddk/usb.h @@ -80,7 +80,7 @@ typedef PVOID USBD_INTERFACE_HANDLE; #define USBD_STATUS_INAVLID_CONFIGURATION_DESCRIPTOR \ ((USBD_STATUS)0xC0000F00L) #define USBD_STATUS_INSUFFICIENT_RESOURCES \ - ((USBD_STATUS)0xC0001000L) + ((USBD_STATUS)0xC0001000L) #define USBD_STATUS_SET_CONFIG_FAILED ((USBD_STATUS)0xC0002000L) #define USBD_STATUS_BUFFER_TOO_SMALL ((USBD_STATUS)0xC0003000L) #define USBD_STATUS_INTERFACE_NOT_FOUND ((USBD_STATUS)0xC0004000L) @@ -90,9 +90,9 @@ typedef PVOID USBD_INTERFACE_HANDLE; #define USBD_STATUS_STATUS_NOT_MAPPED ((USBD_STATUS)0xC0008000L) #define USBD_STATUS_CANCELED ((USBD_STATUS)0xC0010000L) #define USBD_STATUS_ISO_NOT_ACCESSED_BY_HW \ - ((USBD_STATUS)0xC0020000L) -#define USBD_STATUS_ISO_TD_ERROR ((USBD_STATUS)0xC0030000L) -#define USBD_STATUS_ISO_NA_LATE_USBPORT ((USBD_STATUS)0xC0040000L) + ((USBD_STATUS)0xC0020000L) +#define USBD_STATUS_ISO_TD_ERROR ((USBD_STATUS)0xC0030000L) +#define USBD_STATUS_ISO_NA_LATE_USBPORT ((USBD_STATUS)0xC0040000L) #define USBD_STATUS_ISO_NOT_ACCESSED_LATE ((USBD_STATUS)0xC0050000L) #define USBD_SUCCESS(Status) ((USBD_STATUS)(Status) >= 0) @@ -101,7 +101,7 @@ typedef PVOID USBD_INTERFACE_HANDLE; /* URB TransferFlags constants */ #define USBD_TRANSFER_DIRECTION(x) ((x) & USBD_TRANSFER_DIRECTION_IN) -#define USBD_TRANSFER_DIRECTION_OUT 0 +#define USBD_TRANSFER_DIRECTION_OUT 0 #define USBD_TRANSFER_DIRECTION_BIT 0 #define USBD_TRANSFER_DIRECTION_IN (1 << USBD_TRANSFER_DIRECTION_BIT) #define USBD_SHORT_TRANSFER_OK_BIT 1 @@ -142,7 +142,7 @@ typedef enum _USB_CONTROLLER_FLAVOR { EHCI_Lucent = 3000 } USB_CONTROLLER_FLAVOR; -struct _URB_HEADER { +struct _URB_HEADER { USHORT Length; USHORT Function; USBD_STATUS Status; @@ -170,7 +170,7 @@ struct _URB_BULK_OR_INTERRUPT_TRANSFER { struct _URB_HCD_AREA hca; }; -struct _URB_CONTROL_DESCRIPTOR_REQUEST { +struct _URB_CONTROL_DESCRIPTOR_REQUEST { struct _URB_HEADER Hdr; PVOID Reserved; ULONG Reserved0; @@ -186,7 +186,7 @@ struct _URB_CONTROL_DESCRIPTOR_REQUEST { USHORT Reserved2; }; -struct _URB_CONTROL_FEATURE_REQUEST { +struct _URB_CONTROL_FEATURE_REQUEST { struct _URB_HEADER Hdr; PVOID Reserved; ULONG Reserved2; @@ -210,10 +210,10 @@ struct _URB_CONTROL_GET_CONFIGURATION_REQUEST { PMDL TransferBufferMDL; struct _URB *UrbLink; struct _URB_HCD_AREA hca; - UCHAR Reserved1[8]; + UCHAR Reserved1[8]; }; -struct _URB_CONTROL_GET_INTERFACE_REQUEST { +struct _URB_CONTROL_GET_INTERFACE_REQUEST { struct _URB_HEADER Hdr; PVOID Reserved; ULONG Reserved0; @@ -227,7 +227,7 @@ struct _URB_CONTROL_GET_INTERFACE_REQUEST { USHORT Reserved2; }; -struct _URB_CONTROL_GET_STATUS_REQUEST { +struct _URB_CONTROL_GET_STATUS_REQUEST { struct _URB_HEADER Hdr; PVOID Reserved; ULONG Reserved0; @@ -241,7 +241,7 @@ struct _URB_CONTROL_GET_STATUS_REQUEST { USHORT Reserved2; }; -struct _URB_CONTROL_TRANSFER { +struct _URB_CONTROL_TRANSFER { struct _URB_HEADER Hdr; USBD_PIPE_HANDLE PipeHandle; ULONG TransferFlags; @@ -290,8 +290,8 @@ typedef struct _USBD_ISO_PACKET_DESCRIPTOR { USBD_STATUS Status; } USBD_ISO_PACKET_DESCRIPTOR, *PUSBD_ISO_PACKET_DESCRIPTOR; -struct _URB_ISOCH_TRANSFER { - struct _URB_HEADER Hdr; +struct _URB_ISOCH_TRANSFER { + struct _URB_HEADER Hdr; USBD_PIPE_HANDLE PipeHandle; ULONG TransferFlags; ULONG TransferBufferLength; @@ -323,7 +323,7 @@ typedef struct _USBD_PIPE_INFORMATION { } USBD_PIPE_INFORMATION, *PUSBD_PIPE_INFORMATION ; #define USBD_PIPE_DIRECTION_IN(pipeInformation) \ - ((pipeInformation)->EndpointAddress & USB_ENDPOINT_DIRECTION_MASK) + ((pipeInformation)->EndpointAddress & USB_ENDPOINT_DIRECTION_MASK) typedef struct _USBD_INTERFACE_INFORMATION { USHORT Length; @@ -338,13 +338,13 @@ typedef struct _USBD_INTERFACE_INFORMATION { USBD_PIPE_INFORMATION Pipes[1]; } USBD_INTERFACE_INFORMATION, *PUSBD_INTERFACE_INFORMATION; -struct _URB_SELECT_INTERFACE { +struct _URB_SELECT_INTERFACE { struct _URB_HEADER Hdr; USBD_CONFIGURATION_HANDLE ConfigurationHandle; USBD_INTERFACE_INFORMATION Interface; }; -struct _URB_SELECT_CONFIGURATION { +struct _URB_SELECT_CONFIGURATION { struct _URB_HEADER Hdr; PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor; USBD_CONFIGURATION_HANDLE ConfigurationHandle; @@ -362,7 +362,7 @@ struct _URB_SET_FRAME_LENGTH { LONG FrameLengthDelta; }; -typedef struct _URB { +typedef struct _URB { _ANONYMOUS_UNION union { struct _URB_HEADER UrbHeader; struct _URB_SELECT_INTERFACE UrbSelectInterface; @@ -438,9 +438,9 @@ typedef struct _URB { #define URB_FUNCTION_SYNC_CLEAR_STALL 0x0031 #define USBD_PF_CHANGE_MAX_PACKET 0x00000001 -#define USBD_PF_SHORT_PACKET_OPT 0x00000002 -#define USBD_PF_ENABLE_RT_THREAD_ACCESS 0x00000004 -#define USBD_PF_MAP_ADD_TRANSFERS 0x00000008 +#define USBD_PF_SHORT_PACKET_OPT 0x00000002 +#define USBD_PF_ENABLE_RT_THREAD_ACCESS 0x00000004 +#define USBD_PF_MAP_ADD_TRANSFERS 0x00000008 #define USBD_PF_VALID_MASK (USBD_PF_CHANGE_MAX_PACKET | \ USBD_PF_SHORT_PACKET_OPT | \ @@ -467,5 +467,5 @@ typedef struct _OS_STRING { #endif #endif /* defined __USBDI_H */ - + #endif /* __USB_H */ diff --git a/reactos/w32api/include/ddk/usb100.h b/reactos/w32api/include/ddk/usb100.h index 53b774ba296..250beff1f7a 100644 --- a/reactos/w32api/include/ddk/usb100.h +++ b/reactos/w32api/include/ddk/usb100.h @@ -99,7 +99,7 @@ typedef struct _USB_COMMON_DESCRIPTOR { #define USB_CONFIG_REMOTE_WAKEUP 0x20 #include -typedef struct _USB_CONFIGURATION_DESCRIPTOR { +typedef struct _USB_CONFIGURATION_DESCRIPTOR { UCHAR bLength; UCHAR bDescriptorType; USHORT wTotalLength; @@ -111,7 +111,7 @@ typedef struct _USB_CONFIGURATION_DESCRIPTOR { } USB_CONFIGURATION_DESCRIPTOR, *PUSB_CONFIGURATION_DESCRIPTOR; #include -typedef struct _USB_DEVICE_DESCRIPTOR { +typedef struct _USB_DEVICE_DESCRIPTOR { UCHAR bLength; UCHAR bDescriptorType; USHORT bcdUSB; @@ -141,7 +141,7 @@ typedef struct _USB_DEVICE_DESCRIPTOR { #define USB_ENDPOINT_TYPE_INTERRUPT 0x03 #include -typedef struct _USB_ENDPOINT_DESCRIPTOR { +typedef struct _USB_ENDPOINT_DESCRIPTOR { UCHAR bLength; UCHAR bDescriptorType; UCHAR bEndpointAddress; @@ -154,7 +154,7 @@ typedef struct _USB_ENDPOINT_DESCRIPTOR { #define USB_FEATURE_ENDPOINT_STALL 0x0000 #define USB_FEATURE_REMOTE_WAKEUP 0x0001 -typedef struct _USB_INTERFACE_DESCRIPTOR { +typedef struct _USB_INTERFACE_DESCRIPTOR { UCHAR bLength; UCHAR bDescriptorType; UCHAR bInterfaceNumber; @@ -200,9 +200,9 @@ typedef struct _USB_CONFIGURATION_POWER_DESCRIPTOR { UCHAR bBusPowerSavingD1; UCHAR bSelfPowerSavingD1; UCHAR bBusPowerSavingD2; - UCHAR bSelfPowerSavingD2; + UCHAR bSelfPowerSavingD2; UCHAR bBusPowerSavingD3; - UCHAR bSelfPowerSavingD3; + UCHAR bSelfPowerSavingD3; USHORT TransitionTimeFromD1; USHORT TransitionTimeFromD2; USHORT TransitionTimeFromD3; @@ -221,9 +221,9 @@ typedef struct _USB_INTERFACE_POWER_DESCRIPTOR { UCHAR bBusPowerSavingD1; UCHAR bSelfPowerSavingD1; UCHAR bBusPowerSavingD2; - UCHAR bSelfPowerSavingD2; + UCHAR bSelfPowerSavingD2; UCHAR bBusPowerSavingD3; - UCHAR bSelfPowerSavingD3; + UCHAR bSelfPowerSavingD3; USHORT TransitionTimeFromD1; USHORT TransitionTimeFromD2; USHORT TransitionTimeFromD3; diff --git a/reactos/w32api/include/ddk/usbcamdi.h b/reactos/w32api/include/ddk/usbcamdi.h index 5d96435d86a..e27f52cfb7a 100644 --- a/reactos/w32api/include/ddk/usbcamdi.h +++ b/reactos/w32api/include/ddk/usbcamdi.h @@ -52,9 +52,9 @@ typedef PVOID PHW_STREAM_REQUEST_BLOCK; DEFINE_GUID(GUID_USBCAMD_INTERFACE, 0x2bcb75c0, 0xb27f, 0x11d1, 0xba, 0x41, 0x0, 0xa0, 0xc9, 0xd, 0x2b, 0x5); -#define USBCAMD_PROCESSPACKETEX_DropFrame 0x0002 -#define USBCAMD_PROCESSPACKETEX_NextFrameIsStill 0x0004 -#define USBCAMD_PROCESSPACKETEX_CurrentFrameIsStill 0x0008 +#define USBCAMD_PROCESSPACKETEX_DropFrame 0x0002 +#define USBCAMD_PROCESSPACKETEX_NextFrameIsStill 0x0004 +#define USBCAMD_PROCESSPACKETEX_CurrentFrameIsStill 0x0008 #define USBCAMD_DATA_PIPE 0x0001 #define USBCAMD_MULTIPLEX_PIPE 0x0002 @@ -133,7 +133,7 @@ typedef NTSTATUS DDKAPI typedef VOID DDKAPI (*PCAM_NEW_FRAME_ROUTINE)( PVOID DeviceContext, - PVOID FrameContext); + PVOID FrameContext); typedef VOID DDKAPI (*PCAM_NEW_FRAME_ROUTINE_EX)( @@ -178,7 +178,7 @@ typedef ULONG DDKAPI PUSBD_ISO_PACKET_DESCRIPTOR DataPacket, PVOID DataBuffer, PBOOLEAN FrameComplete, - PBOOLEAN NextFrameIsStill); + PBOOLEAN NextFrameIsStill); typedef ULONG DDKAPI (*PCAM_PROCESS_PACKET_ROUTINE_EX)( @@ -287,7 +287,7 @@ typedef NTSTATUS DDKAPI IN ULONG PipeIndex); typedef NTSTATUS DDKAPI -(*PFNUSBCAMD_SetVideoFormat)( +(*PFNUSBCAMD_SetVideoFormat)( IN PVOID DeviceContext, IN PHW_STREAM_REQUEST_BLOCK pSrb); diff --git a/reactos/w32api/include/ddk/usbdi.h b/reactos/w32api/include/ddk/usbdi.h index 99d24754146..126522dcf14 100644 --- a/reactos/w32api/include/ddk/usbdi.h +++ b/reactos/w32api/include/ddk/usbdi.h @@ -140,9 +140,9 @@ typedef PVOID USBD_INTERFACE_HANDLE; #define USBD_STATUS_CANCELING ((USBD_STATUS)0x00020000L) #define USBD_PIPE_DIRECTION_IN(pipeInformation) \ - ((pipeInformation)->EndpointAddress & USB_ENDPOINT_DIRECTION_MASK) + ((pipeInformation)->EndpointAddress & USB_ENDPOINT_DIRECTION_MASK) -struct _URB_HEADER { +struct _URB_HEADER { USHORT Length; USHORT Function; USBD_STATUS Status; @@ -210,7 +210,7 @@ struct _URB_CONTROL_GET_CONFIGURATION_REQUEST { PMDL TransferBufferMDL; struct _URB *UrbLink; struct _URB_HCD_AREA hca; - UCHAR Reserved1[8]; + UCHAR Reserved1[8]; }; struct _URB_CONTROL_GET_INTERFACE_REQUEST { @@ -302,7 +302,7 @@ struct _URB_ISOCH_TRANSFER { ULONG StartFrame; ULONG NumberOfPackets; ULONG ErrorCount; - USBD_ISO_PACKET_DESCRIPTOR IsoPacket[1]; + USBD_ISO_PACKET_DESCRIPTOR IsoPacket[1]; }; struct _URB_PIPE_REQUEST { @@ -331,8 +331,8 @@ typedef enum _USBD_PIPE_TYPE { /* USBD_PIPE_INFORMATION.PipeFlags constants */ #define USBD_PF_CHANGE_MAX_PACKET 0x00000001 -#define USBD_PF_DOUBLE_BUFFER 0x00000002 -#define USBD_PF_ENABLE_RT_THREAD_ACCESS 0x00000004 +#define USBD_PF_DOUBLE_BUFFER 0x00000002 +#define USBD_PF_ENABLE_RT_THREAD_ACCESS 0x00000004 #define USBD_PF_MAP_ADD_TRANSFERS 0x00000008 typedef struct _USBD_PIPE_INFORMATION { @@ -354,7 +354,7 @@ typedef struct _USBD_INTERFACE_INFORMATION { UCHAR Protocol; UCHAR Reserved; USBD_INTERFACE_HANDLE InterfaceHandle; - ULONG NumberOfPipes; + ULONG NumberOfPipes; USBD_PIPE_INFORMATION Pipes[1]; } USBD_INTERFACE_INFORMATION, *PUSBD_INTERFACE_INFORMATION; diff --git a/reactos/w32api/include/ddk/usbioctl.h b/reactos/w32api/include/ddk/usbioctl.h index abd30b6ada8..a5fc06600a3 100644 --- a/reactos/w32api/include/ddk/usbioctl.h +++ b/reactos/w32api/include/ddk/usbioctl.h @@ -333,7 +333,7 @@ typedef struct _USB_BUS_NOTIFICATION { typedef struct _USB_CONNECTION_NOTIFICATION { USB_NOTIFICATION_TYPE NotificationType; ULONG ConnectionNumber; - ULONG RequestedBandwidth; + ULONG RequestedBandwidth; ULONG EnumerationFailReason; ULONG PowerRequested; ULONG HubNameLength; diff --git a/reactos/w32api/include/ddk/usbiodef.h b/reactos/w32api/include/ddk/usbiodef.h index 5faa3443154..9c2959e24dd 100644 --- a/reactos/w32api/include/ddk/usbiodef.h +++ b/reactos/w32api/include/ddk/usbiodef.h @@ -41,12 +41,12 @@ DEFINE_GUID(GUID_DEVINTERFACE_USB_DEVICE, DEFINE_GUID(GUID_DEVINTERFACE_USB_HOST_CONTROLLER, 0x3abf6f2d, 0x71c4, 0x462a, 0x8a, 0x92, 0x1e, 0x68, 0x61, 0xe6, 0xaf, 0x27); - + DEFINE_GUID(GUID_USB_WMI_STD_DATA, 0x4E623B20L, 0xCB14, 0x11D1, 0xB3, 0x31, 0x00, 0xA0, 0xC9, 0x59, 0xBB, 0xD2); DEFINE_GUID(GUID_USB_WMI_STD_NOTIFICATION, - 0x4E623B20L, 0xCB14, 0x11D1, 0xB3, 0x31, 0x00, 0xA0, 0xC9, 0x59, 0xBB, 0xD2); + 0x4E623B20L, 0xCB14, 0x11D1, 0xB3, 0x31, 0x00, 0xA0, 0xC9, 0x59, 0xBB, 0xD2); #define GUID_CLASS_USBHUB GUID_DEVINTERFACE_USB_HUB #define GUID_CLASS_USB_DEVICE GUID_DEVINTERFACE_USB_DEVICE diff --git a/reactos/w32api/include/ddk/usbscan.h b/reactos/w32api/include/ddk/usbscan.h index d9a0b8ab16f..6b244bedf19 100644 --- a/reactos/w32api/include/ddk/usbscan.h +++ b/reactos/w32api/include/ddk/usbscan.h @@ -84,16 +84,16 @@ typedef struct _CHANNEL_INFO { }CHANNEL_INFO, *PCHANNEL_INFO; typedef struct _DEVICE_DESCRIPTOR { - OUT USHORT usVendorId; - OUT USHORT usProductId; - OUT USHORT usBcdDevice; - OUT USHORT usLanguageId; + OUT USHORT usVendorId; + OUT USHORT usProductId; + OUT USHORT usBcdDevice; + OUT USHORT usLanguageId; } DEVICE_DESCRIPTOR, *PDEVICE_DESCRIPTOR; typedef struct _DRV_VERSION { OUT ULONG major; OUT ULONG minor; - OUT ULONG internal; + OUT ULONG internal; } DRV_VERSION, *PDRV_VERSION; typedef struct _IO_BLOCK { diff --git a/reactos/w32api/include/ddk/usbuser.h b/reactos/w32api/include/ddk/usbuser.h index 4c4b9e9a80d..44b8c9438c5 100644 --- a/reactos/w32api/include/ddk/usbuser.h +++ b/reactos/w32api/include/ddk/usbuser.h @@ -42,17 +42,17 @@ extern "C" { #define IOCTL_USB_USER_REQUEST USB_CTL(HCD_USER_REQUEST) #ifndef IOCTL_USB_DIAGNOSTIC_MODE_ON -#define IOCTL_USB_DIAGNOSTIC_MODE_ON USB_CTL(HCD_DIAGNOSTIC_MODE_ON) +#define IOCTL_USB_DIAGNOSTIC_MODE_ON USB_CTL(HCD_DIAGNOSTIC_MODE_ON) #endif #ifndef IOCTL_USB_DIAGNOSTIC_MODE_OFF -#define IOCTL_USB_DIAGNOSTIC_MODE_OFF USB_CTL(HCD_DIAGNOSTIC_MODE_OFF) +#define IOCTL_USB_DIAGNOSTIC_MODE_OFF USB_CTL(HCD_DIAGNOSTIC_MODE_OFF) #endif #ifndef IOCTL_USB_GET_ROOT_HUB_NAME -#define IOCTL_USB_GET_ROOT_HUB_NAME USB_CTL(HCD_GET_ROOT_HUB_NAME) +#define IOCTL_USB_GET_ROOT_HUB_NAME USB_CTL(HCD_GET_ROOT_HUB_NAME) #endif #ifndef IOCTL_GET_HCD_DRIVERKEY_NAME -#define IOCTL_GET_HCD_DRIVERKEY_NAME USB_CTL(HCD_GET_DRIVERKEY_NAME) +#define IOCTL_GET_HCD_DRIVERKEY_NAME USB_CTL(HCD_GET_DRIVERKEY_NAME) #endif typedef enum _USB_USER_ERROR_CODE { @@ -193,7 +193,7 @@ typedef struct _USB_CONTROLLER_INFO_0 { typedef struct _USBUSER_CONTROLLER_INFO_0 { USBUSER_REQUEST_HEADER Header; - USB_CONTROLLER_INFO_0 Info0; + USB_CONTROLLER_INFO_0 Info0; } USBUSER_CONTROLLER_INFO_0, *PUSBUSER_CONTROLLER_INFO_0; typedef struct _USB_DRIVER_VERSION_PARAMETERS { @@ -207,7 +207,7 @@ typedef struct _USB_DRIVER_VERSION_PARAMETERS { typedef struct _USBUSER_GET_DRIVER_VERSION { USBUSER_REQUEST_HEADER Header; - USB_DRIVER_VERSION_PARAMETERS Parameters; + USB_DRIVER_VERSION_PARAMETERS Parameters; } USBUSER_GET_DRIVER_VERSION, *PUSBUSER_GET_DRIVER_VERSION; typedef struct _USB_OPEN_RAW_DEVICE_PARAMETERS { @@ -217,7 +217,7 @@ typedef struct _USB_OPEN_RAW_DEVICE_PARAMETERS { typedef struct _USBUSER_OPEN_RAW_DEVICE { USBUSER_REQUEST_HEADER Header; - USB_OPEN_RAW_DEVICE_PARAMETERS Parameters; + USB_OPEN_RAW_DEVICE_PARAMETERS Parameters; } USBUSER_OPEN_RAW_DEVICE, *PUSBUSER_OPEN_RAW_DEVICE; typedef enum _WDMUSB_POWER_STATE { @@ -240,11 +240,11 @@ typedef struct _USB_POWER_INFO { WDMUSB_POWER_STATE SystemState; WDMUSB_POWER_STATE HcDevicePowerState; WDMUSB_POWER_STATE HcDeviceWake; - WDMUSB_POWER_STATE HcSystemWake; + WDMUSB_POWER_STATE HcSystemWake; WDMUSB_POWER_STATE RhDevicePowerState; WDMUSB_POWER_STATE RhDeviceWake; - WDMUSB_POWER_STATE RhSystemWake; - WDMUSB_POWER_STATE LastSystemSleepState; + WDMUSB_POWER_STATE RhSystemWake; + WDMUSB_POWER_STATE LastSystemSleepState; BOOLEAN CanWakeup; BOOLEAN IsPowered; } USB_POWER_INFO, *PUSB_POWER_INFO; diff --git a/reactos/w32api/include/ddk/win2k.h b/reactos/w32api/include/ddk/win2k.h index 97577c13be9..c23fd49927d 100644 --- a/reactos/w32api/include/ddk/win2k.h +++ b/reactos/w32api/include/ddk/win2k.h @@ -89,7 +89,7 @@ IoWritePartitionTable( /* * PVOID MmGetSystemAddressForMdl( - * IN PMDL Mdl); + * IN PMDL Mdl); */ #define MmGetSystemAddressForMdl(Mdl) \ (((Mdl)->MdlFlags & (MDL_MAPPED_TO_SYSTEM_VA | \ diff --git a/reactos/w32api/include/ddk/winddi.h b/reactos/w32api/include/ddk/winddi.h index 3aa8f346d71..757a3affeff 100644 --- a/reactos/w32api/include/ddk/winddi.h +++ b/reactos/w32api/include/ddk/winddi.h @@ -2526,7 +2526,7 @@ FONTOBJ_pjOpenTypeTablePointer( WIN32KAPI PFD_GLYPHATTR -DDKAPI +DDKAPI FONTOBJ_pQueryGlyphAttrs( IN FONTOBJ *pfo, IN ULONG iMode); diff --git a/reactos/w32api/include/ddk/winddk.h b/reactos/w32api/include/ddk/winddk.h index 0862e51c415..6ae1955b38b 100644 --- a/reactos/w32api/include/ddk/winddk.h +++ b/reactos/w32api/include/ddk/winddk.h @@ -311,7 +311,7 @@ typedef struct _FILE_GET_QUOTA_INFORMATION *PFILE_GET_QUOTA_INFORMATION; #define DIRECTORY_CREATE_OBJECT (0x0004) #define DIRECTORY_CREATE_SUBDIRECTORY (0x0008) #define DIRECTORY_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | 0xF) - + /* Exported object types */ extern NTOSAPI POBJECT_TYPE ExDesktopObjectType; extern NTOSAPI POBJECT_TYPE ExEventObjectType; @@ -504,13 +504,13 @@ typedef NTSTATUS VOID); typedef NTSTATUS -(DDKAPI *PDRIVER_ENTRY)( - IN struct _DRIVER_OBJECT *DriverObject, - IN PUNICODE_STRING RegistryPath); +(DDKAPI *PDRIVER_ENTRY)( + IN struct _DRIVER_OBJECT *DriverObject, + IN PUNICODE_STRING RegistryPath); typedef NTSTATUS (DDKAPI *PDRIVER_INITIALIZE)( - IN struct _DRIVER_OBJECT *DriverObject, + IN struct _DRIVER_OBJECT *DriverObject, IN PUNICODE_STRING RegistryPath); typedef BOOLEAN @@ -524,10 +524,10 @@ typedef VOID IN PVOID Context); typedef VOID -(DDKAPI *PDRIVER_REINITIALIZE)( - IN struct _DRIVER_OBJECT *DriverObject, - IN PVOID Context, - IN ULONG Count); +(DDKAPI *PDRIVER_REINITIALIZE)( + IN struct _DRIVER_OBJECT *DriverObject, + IN PVOID Context, + IN ULONG Count); typedef VOID (DDKAPI *PDRIVER_STARTIO)( @@ -539,8 +539,8 @@ typedef BOOLEAN IN PVOID SynchronizeContext); typedef VOID -(DDKAPI *PDRIVER_UNLOAD)( - IN struct _DRIVER_OBJECT *DriverObject); +(DDKAPI *PDRIVER_UNLOAD)( + IN struct _DRIVER_OBJECT *DriverObject); @@ -654,11 +654,11 @@ typedef struct _INTERFACE { PVOID Context; PINTERFACE_REFERENCE InterfaceReference; PINTERFACE_DEREFERENCE InterfaceDereference; -} INTERFACE, *PINTERFACE; +} INTERFACE, *PINTERFACE; typedef struct _PLUGPLAY_NOTIFICATION_HEADER { - USHORT Version; - USHORT Size; + USHORT Version; + USHORT Size; GUID Event; } PLUGPLAY_NOTIFICATION_HEADER, *PPLUGPLAY_NOTIFICATION_HEADER; @@ -770,9 +770,9 @@ typedef VOID DDKAPI #define DUPLICATE_SAME_ATTRIBUTES 0x00000004 /* end winnt.h */ -typedef struct _OBJECT_NAME_INFORMATION { - UNICODE_STRING Name; -} OBJECT_NAME_INFORMATION, *POBJECT_NAME_INFORMATION; +typedef struct _OBJECT_NAME_INFORMATION { + UNICODE_STRING Name; +} OBJECT_NAME_INFORMATION, *POBJECT_NAME_INFORMATION; typedef VOID DDKAPI (*PIO_APC_ROUTINE)( @@ -1596,7 +1596,7 @@ typedef struct _DEVICE_DESCRIPTION { BOOLEAN IgnoreCount; BOOLEAN Reserved1; BOOLEAN Dma64BitAddresses; - ULONG BusNumber; + ULONG BusNumber; ULONG DmaChannel; INTERFACE_TYPE InterfaceType; DMA_WIDTH DmaWidth; @@ -1628,21 +1628,21 @@ typedef struct _VPB { /* DEVICE_OBJECT.Flags */ -#define DO_VERIFY_VOLUME 0x00000002 -#define DO_BUFFERED_IO 0x00000004 -#define DO_EXCLUSIVE 0x00000008 -#define DO_DIRECT_IO 0x00000010 -#define DO_MAP_IO_BUFFER 0x00000020 -#define DO_DEVICE_HAS_NAME 0x00000040 -#define DO_DEVICE_INITIALIZING 0x00000080 -#define DO_SYSTEM_BOOT_PARTITION 0x00000100 -#define DO_LONG_TERM_REQUESTS 0x00000200 -#define DO_NEVER_LAST_DEVICE 0x00000400 -#define DO_SHUTDOWN_REGISTERED 0x00000800 -#define DO_BUS_ENUMERATED_DEVICE 0x00001000 -#define DO_POWER_PAGABLE 0x00002000 -#define DO_POWER_INRUSH 0x00004000 -#define DO_LOW_PRIORITY_FILESYSTEM 0x00010000 +#define DO_VERIFY_VOLUME 0x00000002 +#define DO_BUFFERED_IO 0x00000004 +#define DO_EXCLUSIVE 0x00000008 +#define DO_DIRECT_IO 0x00000010 +#define DO_MAP_IO_BUFFER 0x00000020 +#define DO_DEVICE_HAS_NAME 0x00000040 +#define DO_DEVICE_INITIALIZING 0x00000080 +#define DO_SYSTEM_BOOT_PARTITION 0x00000100 +#define DO_LONG_TERM_REQUESTS 0x00000200 +#define DO_NEVER_LAST_DEVICE 0x00000400 +#define DO_SHUTDOWN_REGISTERED 0x00000800 +#define DO_BUS_ENUMERATED_DEVICE 0x00001000 +#define DO_POWER_PAGABLE 0x00002000 +#define DO_POWER_INRUSH 0x00004000 +#define DO_LOW_PRIORITY_FILESYSTEM 0x00010000 /* DEVICE_OBJECT.Characteristics */ @@ -1778,8 +1778,8 @@ typedef struct _DEVICE_RELATIONS { } DEVICE_RELATIONS, *PDEVICE_RELATIONS; typedef struct _SCATTER_GATHER_ELEMENT { - PHYSICAL_ADDRESS Address; - ULONG Length; + PHYSICAL_ADDRESS Address; + ULONG Length; ULONG_PTR Reserved; } SCATTER_GATHER_ELEMENT, *PSCATTER_GATHER_ELEMENT; @@ -2146,18 +2146,18 @@ typedef enum _FILE_INFORMATION_CLASS { FileMaximumInformation } FILE_INFORMATION_CLASS, *PFILE_INFORMATION_CLASS; -typedef struct _FILE_POSITION_INFORMATION { - LARGE_INTEGER CurrentByteOffset; -} FILE_POSITION_INFORMATION, *PFILE_POSITION_INFORMATION; +typedef struct _FILE_POSITION_INFORMATION { + LARGE_INTEGER CurrentByteOffset; +} FILE_POSITION_INFORMATION, *PFILE_POSITION_INFORMATION; typedef struct _FILE_ALIGNMENT_INFORMATION { ULONG AlignmentRequirement; } FILE_ALIGNMENT_INFORMATION; -typedef struct _FILE_NAME_INFORMATION { - ULONG FileNameLength; - WCHAR FileName[1]; -} FILE_NAME_INFORMATION, *PFILE_NAME_INFORMATION; +typedef struct _FILE_NAME_INFORMATION { + ULONG FileNameLength; + WCHAR FileName[1]; +} FILE_NAME_INFORMATION, *PFILE_NAME_INFORMATION; #include typedef struct _FILE_BASIC_INFORMATION { @@ -2177,32 +2177,32 @@ typedef struct _FILE_STANDARD_INFORMATION { BOOLEAN Directory; } FILE_STANDARD_INFORMATION, *PFILE_STANDARD_INFORMATION; -typedef struct _FILE_NETWORK_OPEN_INFORMATION { - LARGE_INTEGER CreationTime; - LARGE_INTEGER LastAccessTime; - LARGE_INTEGER LastWriteTime; - LARGE_INTEGER ChangeTime; - LARGE_INTEGER AllocationSize; - LARGE_INTEGER EndOfFile; - ULONG FileAttributes; -} FILE_NETWORK_OPEN_INFORMATION, *PFILE_NETWORK_OPEN_INFORMATION; +typedef struct _FILE_NETWORK_OPEN_INFORMATION { + LARGE_INTEGER CreationTime; + LARGE_INTEGER LastAccessTime; + LARGE_INTEGER LastWriteTime; + LARGE_INTEGER ChangeTime; + LARGE_INTEGER AllocationSize; + LARGE_INTEGER EndOfFile; + ULONG FileAttributes; +} FILE_NETWORK_OPEN_INFORMATION, *PFILE_NETWORK_OPEN_INFORMATION; -typedef struct _FILE_ATTRIBUTE_TAG_INFORMATION { - ULONG FileAttributes; - ULONG ReparseTag; +typedef struct _FILE_ATTRIBUTE_TAG_INFORMATION { + ULONG FileAttributes; + ULONG ReparseTag; } FILE_ATTRIBUTE_TAG_INFORMATION, *PFILE_ATTRIBUTE_TAG_INFORMATION; -typedef struct _FILE_DISPOSITION_INFORMATION { - BOOLEAN DeleteFile; -} FILE_DISPOSITION_INFORMATION, *PFILE_DISPOSITION_INFORMATION; - -typedef struct _FILE_END_OF_FILE_INFORMATION { - LARGE_INTEGER EndOfFile; -} FILE_END_OF_FILE_INFORMATION, *PFILE_END_OF_FILE_INFORMATION; - -typedef struct _FILE_VALID_DATA_LENGTH_INFORMATION { - LARGE_INTEGER ValidDataLength; -} FILE_VALID_DATA_LENGTH_INFORMATION, *PFILE_VALID_DATA_LENGTH_INFORMATION; +typedef struct _FILE_DISPOSITION_INFORMATION { + BOOLEAN DeleteFile; +} FILE_DISPOSITION_INFORMATION, *PFILE_DISPOSITION_INFORMATION; + +typedef struct _FILE_END_OF_FILE_INFORMATION { + LARGE_INTEGER EndOfFile; +} FILE_END_OF_FILE_INFORMATION, *PFILE_END_OF_FILE_INFORMATION; + +typedef struct _FILE_VALID_DATA_LENGTH_INFORMATION { + LARGE_INTEGER ValidDataLength; +} FILE_VALID_DATA_LENGTH_INFORMATION, *PFILE_VALID_DATA_LENGTH_INFORMATION; typedef enum _FSINFOCLASS { FileFsVolumeInformation = 1, @@ -4362,7 +4362,7 @@ static __inline VOID InsertHeadList( IN PLIST_ENTRY ListHead, IN PLIST_ENTRY Entry) -{ +{ PLIST_ENTRY OldFlink; OldFlink = ListHead->Flink; Entry->Flink = OldFlink; @@ -4375,7 +4375,7 @@ static __inline VOID InsertTailList( IN PLIST_ENTRY ListHead, IN PLIST_ENTRY Entry) -{ +{ PLIST_ENTRY OldBlink; OldBlink = ListHead->Blink; Entry->Flink = ListHead; @@ -4430,7 +4430,7 @@ RemoveEntryList( return (OldFlink == OldBlink); } -static __inline PLIST_ENTRY +static __inline PLIST_ENTRY RemoveHeadList( IN PLIST_ENTRY ListHead) { @@ -4531,7 +4531,7 @@ DDKAPI RtlAreBitsClear( IN PRTL_BITMAP BitMapHeader, IN ULONG StartingIndex, - IN ULONG Length); + IN ULONG Length); NTOSAPI BOOLEAN @@ -4539,7 +4539,7 @@ DDKAPI RtlAreBitsSet( IN PRTL_BITMAP BitMapHeader, IN ULONG StartingIndex, - IN ULONG Length); + IN ULONG Length); NTOSAPI NTSTATUS @@ -4554,7 +4554,7 @@ ULONG DDKAPI RtlCheckBit( IN PRTL_BITMAP BitMapHeader, - IN ULONG BitPosition); + IN ULONG BitPosition); NTOSAPI NTSTATUS @@ -4567,7 +4567,7 @@ NTOSAPI VOID DDKAPI RtlClearAllBits( - IN PRTL_BITMAP BitMapHeader); + IN PRTL_BITMAP BitMapHeader); NTOSAPI VOID @@ -4582,7 +4582,7 @@ DDKAPI RtlClearBits( IN PRTL_BITMAP BitMapHeader, IN ULONG StartingIndex, - IN ULONG NumberToClear); + IN ULONG NumberToClear); NTOSAPI SIZE_T @@ -4717,7 +4717,7 @@ RtlDeleteRegistryValue( /* * BOOLEAN - * RtlEqualLuid( + * RtlEqualLuid( * IN PLUID Luid1, * IN PLUID Luid2) */ @@ -4772,7 +4772,7 @@ DDKAPI RtlFindClearBits( IN PRTL_BITMAP BitMapHeader, IN ULONG NumberToFind, - IN ULONG HintIndex); + IN ULONG HintIndex); NTOSAPI ULONG @@ -4780,15 +4780,15 @@ DDKAPI RtlFindClearBitsAndSet( IN PRTL_BITMAP BitMapHeader, IN ULONG NumberToFind, - IN ULONG HintIndex); + IN ULONG HintIndex); NTOSAPI ULONG DDKAPI -RtlFindClearRuns( - IN PRTL_BITMAP BitMapHeader, - OUT PRTL_BITMAP_RUN RunArray, - IN ULONG SizeOfRunArray, +RtlFindClearRuns( + IN PRTL_BITMAP BitMapHeader, + OUT PRTL_BITMAP_RUN RunArray, + IN ULONG SizeOfRunArray, IN BOOLEAN LocateLongestRuns); NTOSAPI @@ -4802,9 +4802,9 @@ NTOSAPI ULONG DDKAPI RtlFindLastBackwardRunClear( - IN PRTL_BITMAP BitMapHeader, - IN ULONG FromIndex, - OUT PULONG StartingRunIndex); + IN PRTL_BITMAP BitMapHeader, + IN ULONG FromIndex, + OUT PULONG StartingRunIndex); NTOSAPI CCHAR @@ -4817,7 +4817,7 @@ ULONG DDKAPI RtlFindLongestRunClear( IN PRTL_BITMAP BitMapHeader, - OUT PULONG StartingIndex); + OUT PULONG StartingIndex); NTOSAPI CCHAR @@ -4829,8 +4829,8 @@ NTOSAPI ULONG DDKAPI RtlFindNextForwardRunClear( - IN PRTL_BITMAP BitMapHeader, - IN ULONG FromIndex, + IN PRTL_BITMAP BitMapHeader, + IN ULONG FromIndex, OUT PULONG StartingRunIndex); NTOSAPI @@ -4854,7 +4854,7 @@ DDKAPI RtlFindSetBits( IN PRTL_BITMAP BitMapHeader, IN ULONG NumberToFind, - IN ULONG HintIndex); + IN ULONG HintIndex); NTOSAPI ULONG @@ -4862,7 +4862,7 @@ DDKAPI RtlFindSetBitsAndClear( IN PRTL_BITMAP BitMapHeader, IN ULONG NumberToFind, - IN ULONG HintIndex); + IN ULONG HintIndex); NTOSAPI VOID @@ -4924,8 +4924,8 @@ RtlGetNextRange( NTOSAPI NTSTATUS DDKAPI -RtlGUIDFromString( - IN PUNICODE_STRING GuidString, +RtlGUIDFromString( + IN PUNICODE_STRING GuidString, OUT GUID *Guid); NTOSAPI @@ -4950,7 +4950,7 @@ DDKAPI RtlInitializeBitMap( IN PRTL_BITMAP BitMapHeader, IN PULONG BitMapBuffer, - IN ULONG SizeOfBitMap); + IN ULONG SizeOfBitMap); NTOSAPI VOID @@ -5065,7 +5065,7 @@ NTOSAPI ULONG DDKAPI RtlNumberOfSetBits( - IN PRTL_BITMAP BitMapHeader); + IN PRTL_BITMAP BitMapHeader); NTOSAPI VOID @@ -5077,9 +5077,9 @@ RtlPrefetchMemoryNonTemporal( NTOSAPI BOOLEAN DDKAPI -RtlPrefixUnicodeString( - IN PUNICODE_STRING String1, - IN PUNICODE_STRING String2, +RtlPrefixUnicodeString( + IN PUNICODE_STRING String1, + IN PUNICODE_STRING String2, IN BOOLEAN CaseInSensitive); NTOSAPI @@ -5110,7 +5110,7 @@ NTOSAPI VOID DDKAPI RtlSetAllBits( - IN PRTL_BITMAP BitMapHeader); + IN PRTL_BITMAP BitMapHeader); NTOSAPI VOID @@ -5125,7 +5125,7 @@ DDKAPI RtlSetBits( IN PRTL_BITMAP BitMapHeader, IN ULONG StartingIndex, - IN ULONG NumberToSet); + IN ULONG NumberToSet); NTOSAPI NTSTATUS @@ -5167,8 +5167,8 @@ RtlStoreUshort( NTOSAPI NTSTATUS DDKAPI -RtlStringFromGUID( - IN REFGUID Guid, +RtlStringFromGUID( + IN REFGUID Guid, OUT PUNICODE_STRING GuidString); NTOSAPI @@ -5229,7 +5229,7 @@ RtlUnicodeStringToInteger( NTOSAPI WCHAR DDKAPI -RtlUpcaseUnicodeChar( +RtlUpcaseUnicodeChar( IN WCHAR SourceCharacter); NTOSAPI @@ -5243,7 +5243,7 @@ RtlUpcaseUnicodeString( NTOSAPI CHAR DDKAPI -RtlUpperChar( +RtlUpperChar( IN CHAR Character); NTOSAPI @@ -5549,7 +5549,7 @@ ExGetExclusiveWaiterCount( NTOSAPI KPROCESSOR_MODE DDKAPI -ExGetPreviousMode( +ExGetPreviousMode( VOID); NTOSAPI @@ -5649,7 +5649,7 @@ ExInterlockedCompareExchange64( IN OUT PLONGLONG Destination, IN PLONGLONG Exchange, IN PLONGLONG Comparand, - IN PKSPIN_LOCK Lock); + IN PKSPIN_LOCK Lock); NTOSAPI PSINGLE_LIST_ENTRY @@ -5816,7 +5816,7 @@ ExReleaseResourceLite( NTOSAPI VOID DDKAPI -ExSetResourceOwnerPointer( +ExSetResourceOwnerPointer( IN PERESOURCE Resource, IN PVOID OwnerPointer); @@ -6175,21 +6175,21 @@ IoAllocateDriverObjectExtension( IN ULONG DriverObjectExtensionSize, OUT PVOID *DriverObjectExtension); -typedef struct _IO_ERROR_LOG_PACKET { - UCHAR MajorFunctionCode; - UCHAR RetryCount; - USHORT DumpDataSize; - USHORT NumberOfStrings; - USHORT StringOffset; - USHORT EventCategory; - NTSTATUS ErrorCode; - ULONG UniqueErrorValue; - NTSTATUS FinalStatus; - ULONG SequenceNumber; - ULONG IoControlCode; - LARGE_INTEGER DeviceOffset; - ULONG DumpData[1]; -} IO_ERROR_LOG_PACKET, *PIO_ERROR_LOG_PACKET; +typedef struct _IO_ERROR_LOG_PACKET { + UCHAR MajorFunctionCode; + UCHAR RetryCount; + USHORT DumpDataSize; + USHORT NumberOfStrings; + USHORT StringOffset; + USHORT EventCategory; + NTSTATUS ErrorCode; + ULONG UniqueErrorValue; + NTSTATUS FinalStatus; + ULONG SequenceNumber; + ULONG IoControlCode; + LARGE_INTEGER DeviceOffset; + ULONG DumpData[1]; +} IO_ERROR_LOG_PACKET, *PIO_ERROR_LOG_PACKET; NTOSAPI PVOID @@ -6595,7 +6595,7 @@ IoGetBootDiskInformation( NTOSAPI PCONFIGURATION_INFORMATION DDKAPI -IoGetConfigurationInformation( +IoGetConfigurationInformation( VOID); NTOSAPI @@ -7163,9 +7163,9 @@ NTOSAPI VOID DDKAPI IoSetStartIoAttributes( - IN PDEVICE_OBJECT DeviceObject, - IN BOOLEAN DeferredStartIo, - IN BOOLEAN NonCancelable); + IN PDEVICE_OBJECT DeviceObject, + IN BOOLEAN DeferredStartIo, + IN BOOLEAN NonCancelable); NTOSAPI NTSTATUS @@ -7777,7 +7777,7 @@ KeReleaseSpinLock( NTOSAPI PKDEVICE_QUEUE_ENTRY -DDKAPI +DDKAPI KeRemoveByKeyDeviceQueue( IN PKDEVICE_QUEUE DeviceQueue, IN ULONG SortKey); @@ -8484,7 +8484,7 @@ DDKAPI ObGetObjectSecurity( IN PVOID Object, OUT PSECURITY_DESCRIPTOR *SecurityDescriptor, - OUT PBOOLEAN MemoryAllocated); + OUT PBOOLEAN MemoryAllocated); NTOSAPI NTSTATUS @@ -8890,12 +8890,12 @@ NTSTATUS DDKAPI NtDeviceIoControlFile( IN HANDLE DeviceHandle, - IN HANDLE Event OPTIONAL, - IN PIO_APC_ROUTINE UserApcRoutine OPTIONAL, - IN PVOID UserApcContext OPTIONAL, - OUT PIO_STATUS_BLOCK IoStatusBlock, + IN HANDLE Event OPTIONAL, + IN PIO_APC_ROUTINE UserApcRoutine OPTIONAL, + IN PVOID UserApcContext OPTIONAL, + OUT PIO_STATUS_BLOCK IoStatusBlock, IN ULONG IoControlCode, - IN PVOID InputBuffer, + IN PVOID InputBuffer, IN ULONG InputBufferSize, OUT PVOID OutputBuffer, IN ULONG OutputBufferSize); @@ -8905,12 +8905,12 @@ NTSTATUS DDKAPI ZwDeviceIoControlFile( IN HANDLE DeviceHandle, - IN HANDLE Event OPTIONAL, - IN PIO_APC_ROUTINE UserApcRoutine OPTIONAL, - IN PVOID UserApcContext OPTIONAL, - OUT PIO_STATUS_BLOCK IoStatusBlock, + IN HANDLE Event OPTIONAL, + IN PIO_APC_ROUTINE UserApcRoutine OPTIONAL, + IN PVOID UserApcContext OPTIONAL, + OUT PIO_STATUS_BLOCK IoStatusBlock, IN ULONG IoControlCode, - IN PVOID InputBuffer, + IN PVOID InputBuffer, IN ULONG InputBufferSize, OUT PVOID OutputBuffer, IN ULONG OutputBufferSize); @@ -9252,7 +9252,7 @@ NTSTATUS DDKAPI PoRequestPowerIrp( IN PDEVICE_OBJECT DeviceObject, - IN UCHAR MinorFunction, + IN UCHAR MinorFunction, IN POWER_STATE PowerState, IN PREQUEST_POWER_COMPLETE CompletionFunction, IN PVOID Context, @@ -9268,7 +9268,7 @@ NTOSAPI VOID DDKAPI PoSetDeviceBusy( - PULONG IdlePointer); + PULONG IdlePointer); NTOSAPI POWER_STATE @@ -9315,10 +9315,10 @@ NTSTATUS DDKAPI WmiFireEvent( IN PDEVICE_OBJECT DeviceObject, - IN LPGUID Guid, + IN LPGUID Guid, IN ULONG InstanceIndex, IN ULONG EventDataSize, - IN PVOID EventData); + IN PVOID EventData); NTOSAPI NTSTATUS diff --git a/reactos/w32api/include/ddk/winnt4.h b/reactos/w32api/include/ddk/winnt4.h index 3f842438137..7cb8092750e 100644 --- a/reactos/w32api/include/ddk/winnt4.h +++ b/reactos/w32api/include/ddk/winnt4.h @@ -245,7 +245,7 @@ HalGetBusDataByOffset( NTOSAPI ULONG DDKAPI -HalGetDmaAlignmentRequirement( +HalGetDmaAlignmentRequirement( VOID); NTOSAPI diff --git a/reactos/w32api/include/ddk/ws2san.h b/reactos/w32api/include/ddk/ws2san.h index de392c0fa42..4e23ab9431c 100644 --- a/reactos/w32api/include/ddk/ws2san.h +++ b/reactos/w32api/include/ddk/ws2san.h @@ -69,9 +69,9 @@ typedef WSPUPCALLTABLEEX *LPWSPUPCALLTABLEEX; {0xE5DA4AF8, 0xD824, 0x48CD, {0xA7, 0x99, 0x63, 0x37, 0xA9, 0x8E, 0xD2, 0xAF}} typedef struct _WSABUFEX { - u_long len; - char FAR *buf; - HANDLE handle; + u_long len; + char FAR *buf; + HANDLE handle; } WSABUFEX, FAR * LPWSABUFEX; #if 0 diff --git a/reactos/w32api/include/icmpapi.h b/reactos/w32api/include/icmpapi.h index dfb95bc8e31..7a242e5b16c 100644 --- a/reactos/w32api/include/icmpapi.h +++ b/reactos/w32api/include/icmpapi.h @@ -45,7 +45,7 @@ DWORD STDCALL IcmpSendEcho( ); DWORD -STDCALL +STDCALL IcmpSendEcho2( HANDLE IcmpHandle, HANDLE Event, @@ -61,7 +61,7 @@ IcmpSendEcho2( ); DWORD -STDCALL +STDCALL Icmp6SendEcho2( HANDLE IcmpHandle, HANDLE Event, diff --git a/reactos/w32api/include/imagehlp.h b/reactos/w32api/include/imagehlp.h index 537a269f005..5e64e7d46f4 100644 --- a/reactos/w32api/include/imagehlp.h +++ b/reactos/w32api/include/imagehlp.h @@ -3,7 +3,7 @@ Written by Mumit Khan - This file is part of a free library for the Win32 API. + This file is part of a free library for the Win32 API. NOTE: This strictly does not belong in the Win32 API since it's really part of Platform SDK. However,GDB needs it and we might @@ -29,7 +29,7 @@ extern "C" { #define BIND_NO_BOUND_IMPORTS 0x00000001 #define BIND_NO_UPDATE 0x00000002 #define BIND_ALL_IMAGES 0x00000004 -#define BIND_CACHE_IMPORT_DLLS 0x00000008 +#define BIND_CACHE_IMPORT_DLLS 0x00000008 #define CBA_DEFERRED_SYMBOL_LOAD_START 1 #define CBA_DEFERRED_SYMBOL_LOAD_COMPLETE 2 #define CBA_DEFERRED_SYMBOL_LOAD_FAILURE 3 @@ -58,17 +58,17 @@ extern "C" { #define SYMOPT_LOAD_LINES 16 #define SYMOPT_OMAP_FIND_NEAREST 32 #define UNDNAME_COMPLETE 0 -#define UNDNAME_NO_LEADING_UNDERSCORES 1 -#define UNDNAME_NO_MS_KEYWORDS 2 -#define UNDNAME_NO_FUNCTION_RETURNS 4 -#define UNDNAME_NO_ALLOCATION_MODEL 8 +#define UNDNAME_NO_LEADING_UNDERSCORES 1 +#define UNDNAME_NO_MS_KEYWORDS 2 +#define UNDNAME_NO_FUNCTION_RETURNS 4 +#define UNDNAME_NO_ALLOCATION_MODEL 8 #define UNDNAME_NO_ALLOCATION_LANGUAGE 16 #define UNDNAME_NO_MS_THISTYPE 32 #define UNDNAME_NO_CV_THISTYPE 64 #define UNDNAME_NO_THISTYPE 96 #define UNDNAME_NO_ACCESS_SPECIFIERS 128 #define UNDNAME_NO_THROW_SIGNATURES 256 -#define UNDNAME_NO_MEMBER_TYPE 512 +#define UNDNAME_NO_MEMBER_TYPE 512 #define UNDNAME_NO_RETURN_UDT_MODEL 1024 #define UNDNAME_32_BIT_DECODE 2048 #define UNDNAME_NAME_ONLY 4096 @@ -163,20 +163,20 @@ typedef struct _KDHELP { DWORD SystemRangeStart; } KDHELP,*PKDHELP; typedef struct _tagSTACKFRAME { - ADDRESS AddrPC; - ADDRESS AddrReturn; - ADDRESS AddrFrame; - ADDRESS AddrStack; - LPVOID FuncTableEntry; - DWORD Params[4]; - BOOL Far; - BOOL Virtual; + ADDRESS AddrPC; + ADDRESS AddrReturn; + ADDRESS AddrFrame; + ADDRESS AddrStack; + LPVOID FuncTableEntry; + DWORD Params[4]; + BOOL Far; + BOOL Virtual; DWORD Reserved[3]; KDHELP KdHelp; } STACKFRAME,*LPSTACKFRAME; -typedef BOOL(STDCALL*PREAD_PROCESS_MEMORY_ROUTINE)(HANDLE ,LPCVOID,LPVOID,DWORD,LPDWORD); -typedef LPVOID(STDCALL*PFUNCTION_TABLE_ACCESS_ROUTINE)(HANDLE,DWORD); -typedef DWORD(STDCALL*PGET_MODULE_BASE_ROUTINE)(HANDLE,DWORD); +typedef BOOL(STDCALL*PREAD_PROCESS_MEMORY_ROUTINE)(HANDLE ,LPCVOID,LPVOID,DWORD,LPDWORD); +typedef LPVOID(STDCALL*PFUNCTION_TABLE_ACCESS_ROUTINE)(HANDLE,DWORD); +typedef DWORD(STDCALL*PGET_MODULE_BASE_ROUTINE)(HANDLE,DWORD); typedef DWORD(STDCALL*PTRANSLATE_ADDRESS_ROUTINE)(HANDLE,HANDLE,LPADDRESS); typedef struct API_VERSION { USHORT MajorVersion; @@ -184,7 +184,7 @@ typedef struct API_VERSION { USHORT Revision; USHORT Reserved; } API_VERSION,*LPAPI_VERSION; -typedef BOOL(CALLBACK*PSYM_ENUMMODULES_CALLBACK)(LPSTR,ULONG,PVOID); +typedef BOOL(CALLBACK*PSYM_ENUMMODULES_CALLBACK)(LPSTR,ULONG,PVOID); typedef BOOL(CALLBACK*PSYM_ENUMSYMBOLS_CALLBACK)(LPSTR,ULONG,ULONG,PVOID); typedef BOOL(CALLBACK*PENUMLOADED_MODULES_CALLBACK)(LPSTR,ULONG,ULONG,PVOID); typedef BOOL(CALLBACK*PSYMBOL_REGISTERED_CALLBACK)(HANDLE,ULONG,PVOID,PVOID); @@ -195,48 +195,48 @@ typedef enum { SymPdb, SymExport, SymDeferred, - SymSym + SymSym } SYM_TYPE; typedef struct _IMAGEHLP_SYMBOL { - DWORD SizeOfStruct; - DWORD Address; - DWORD Size; - DWORD Flags; - DWORD MaxNameLength; - CHAR Name[1]; + DWORD SizeOfStruct; + DWORD Address; + DWORD Size; + DWORD Flags; + DWORD MaxNameLength; + CHAR Name[1]; } IMAGEHLP_SYMBOL,*PIMAGEHLP_SYMBOL; typedef struct _IMAGEHLP_MODULE { - DWORD SizeOfStruct; - DWORD BaseOfImage; - DWORD ImageSize; - DWORD TimeDateStamp; - DWORD CheckSum; - DWORD NumSyms; - SYM_TYPE SymType; - CHAR ModuleName[32]; - CHAR ImageName[256]; - CHAR LoadedImageName[256]; + DWORD SizeOfStruct; + DWORD BaseOfImage; + DWORD ImageSize; + DWORD TimeDateStamp; + DWORD CheckSum; + DWORD NumSyms; + SYM_TYPE SymType; + CHAR ModuleName[32]; + CHAR ImageName[256]; + CHAR LoadedImageName[256]; } IMAGEHLP_MODULE,*PIMAGEHLP_MODULE; typedef struct _IMAGEHLP_LINE { - DWORD SizeOfStruct; - DWORD Key; - DWORD LineNumber; - PCHAR FileName; - DWORD Address; + DWORD SizeOfStruct; + DWORD Key; + DWORD LineNumber; + PCHAR FileName; + DWORD Address; } IMAGEHLP_LINE,*PIMAGEHLP_LINE; typedef struct _IMAGEHLP_DEFERRED_SYMBOL_LOAD { - DWORD SizeOfStruct; - DWORD BaseOfImage; - DWORD CheckSum; - DWORD TimeDateStamp; - CHAR FileName[MAX_PATH]; - BOOLEAN Reparse; + DWORD SizeOfStruct; + DWORD BaseOfImage; + DWORD CheckSum; + DWORD TimeDateStamp; + CHAR FileName[MAX_PATH]; + BOOLEAN Reparse; } IMAGEHLP_DEFERRED_SYMBOL_LOAD,*PIMAGEHLP_DEFERRED_SYMBOL_LOAD; typedef struct _IMAGEHLP_DUPLICATE_SYMBOL { - DWORD SizeOfStruct; - DWORD NumberOfDups; - PIMAGEHLP_SYMBOL Symbol; - ULONG SelectedSymbol; + DWORD SizeOfStruct; + DWORD NumberOfDups; + PIMAGEHLP_SYMBOL Symbol; + ULONG SelectedSymbol; } IMAGEHLP_DUPLICATE_SYMBOL,*PIMAGEHLP_DUPLICATE_SYMBOL; typedef PVOID DIGEST_HANDLE; typedef BOOL(WINAPI*DIGEST_FUNCTION)(DIGEST_HANDLE refdata,PBYTE pData,DWORD dwLength); @@ -244,75 +244,75 @@ typedef BOOL(WINAPI*DIGEST_FUNCTION)(DIGEST_HANDLE refdata,PBYTE pData,DWORD dwL PIMAGE_NT_HEADERS _IMAGEHLPAPI CheckSumMappedFile(LPVOID,DWORD,LPDWORD,LPDWORD); DWORD _IMAGEHLPAPI MapFileAndCheckSumA(LPSTR,LPDWORD,LPDWORD); DWORD _IMAGEHLPAPI MapFileAndCheckSumW(PWSTR,LPDWORD,LPDWORD); -BOOL _IMAGEHLPAPI TouchFileTimes(HANDLE,LPSYSTEMTIME); -BOOL _IMAGEHLPAPI SplitSymbols(LPSTR,LPSTR,LPSTR,DWORD); -HANDLE _IMAGEHLPAPI FindDebugInfoFile(LPSTR,LPSTR,LPSTR); +BOOL _IMAGEHLPAPI TouchFileTimes(HANDLE,LPSYSTEMTIME); +BOOL _IMAGEHLPAPI SplitSymbols(LPSTR,LPSTR,LPSTR,DWORD); +HANDLE _IMAGEHLPAPI FindDebugInfoFile(LPSTR,LPSTR,LPSTR); HANDLE _IMAGEHLPAPI FindExecutableImage(LPSTR,LPSTR,LPSTR); -BOOL _IMAGEHLPAPI UpdateDebugInfoFile(LPSTR,LPSTR,LPSTR,PIMAGE_NT_HEADERS); -BOOL _IMAGEHLPAPI UpdateDebugInfoFileEx(LPSTR,LPSTR,LPSTR,PIMAGE_NT_HEADERS,DWORD); -BOOL _IMAGEHLPAPI BindImage(IN LPSTR,IN LPSTR,IN LPSTR); -BOOL _IMAGEHLPAPI BindImageEx(IN DWORD,IN LPSTR,IN LPSTR,IN LPSTR,IN PIMAGEHLP_STATUS_ROUTINE); +BOOL _IMAGEHLPAPI UpdateDebugInfoFile(LPSTR,LPSTR,LPSTR,PIMAGE_NT_HEADERS); +BOOL _IMAGEHLPAPI UpdateDebugInfoFileEx(LPSTR,LPSTR,LPSTR,PIMAGE_NT_HEADERS,DWORD); +BOOL _IMAGEHLPAPI BindImage(IN LPSTR,IN LPSTR,IN LPSTR); +BOOL _IMAGEHLPAPI BindImageEx(IN DWORD,IN LPSTR,IN LPSTR,IN LPSTR,IN PIMAGEHLP_STATUS_ROUTINE); BOOL _IMAGEHLPAPI ReBaseImage(IN LPSTR,IN LPSTR,IN BOOL, IN BOOL,IN BOOL, IN ULONG, OUT ULONG*, OUT ULONG*, OUT ULONG*, IN OUT ULONG*, IN ULONG); -PLOADED_IMAGE _IMAGEHLPAPI ImageLoad(LPSTR,LPSTR); -BOOL _IMAGEHLPAPI ImageUnload(PLOADED_IMAGE); -PIMAGE_NT_HEADERS _IMAGEHLPAPI ImageNtHeader(IN PVOID); -PVOID _IMAGEHLPAPI ImageDirectoryEntryToData(IN PVOID,IN BOOLEAN,IN USHORT,OUT PULONG); +PLOADED_IMAGE _IMAGEHLPAPI ImageLoad(LPSTR,LPSTR); +BOOL _IMAGEHLPAPI ImageUnload(PLOADED_IMAGE); +PIMAGE_NT_HEADERS _IMAGEHLPAPI ImageNtHeader(IN PVOID); +PVOID _IMAGEHLPAPI ImageDirectoryEntryToData(IN PVOID,IN BOOLEAN,IN USHORT,OUT PULONG); PVOID _IMAGEHLPAPI ImageDirectoryEntryToDataEx(IN PVOID Base, IN BOOLEAN MappedAsImage, IN USHORT DirectoryEntry, OUT PULONG Size, OUT PIMAGE_SECTION_HEADER *FoundSection OPTIONAL); PVOID _IMAGEHLPAPI ImageDirectoryEntryToData32(PVOID Base, BOOLEAN MappedAsImage, USHORT DirectoryEntry, PULONG Size, PIMAGE_SECTION_HEADER *FoundHeader OPTIONAL, PIMAGE_FILE_HEADER FileHeader, PIMAGE_OPTIONAL_HEADER OptionalHeader); -PIMAGE_SECTION_HEADER _IMAGEHLPAPI ImageRvaToSection(IN PIMAGE_NT_HEADERS,IN PVOID,IN ULONG); -PVOID _IMAGEHLPAPI ImageRvaToVa(IN PIMAGE_NT_HEADERS,IN PVOID,IN ULONG,IN OUT PIMAGE_SECTION_HEADER*); -BOOL _IMAGEHLPAPI MapAndLoad(LPSTR,LPSTR,PLOADED_IMAGE,BOOL,BOOL); -BOOL _IMAGEHLPAPI GetImageConfigInformation(PLOADED_IMAGE,PIMAGE_LOAD_CONFIG_DIRECTORY); +PIMAGE_SECTION_HEADER _IMAGEHLPAPI ImageRvaToSection(IN PIMAGE_NT_HEADERS,IN PVOID,IN ULONG); +PVOID _IMAGEHLPAPI ImageRvaToVa(IN PIMAGE_NT_HEADERS,IN PVOID,IN ULONG,IN OUT PIMAGE_SECTION_HEADER*); +BOOL _IMAGEHLPAPI MapAndLoad(LPSTR,LPSTR,PLOADED_IMAGE,BOOL,BOOL); +BOOL _IMAGEHLPAPI GetImageConfigInformation(PLOADED_IMAGE,PIMAGE_LOAD_CONFIG_DIRECTORY); DWORD _IMAGEHLPAPI GetImageUnusedHeaderBytes(PLOADED_IMAGE,LPDWORD); BOOL _IMAGEHLPAPI SetImageConfigInformation(PLOADED_IMAGE,PIMAGE_LOAD_CONFIG_DIRECTORY); -BOOL _IMAGEHLPAPI UnMapAndLoad(PLOADED_IMAGE); -PIMAGE_DEBUG_INFORMATION _IMAGEHLPAPI MapDebugInformation(HANDLE,LPSTR,LPSTR,DWORD); -BOOL _IMAGEHLPAPI UnmapDebugInformation(PIMAGE_DEBUG_INFORMATION); -HANDLE _IMAGEHLPAPI FindExecutableImage(LPSTR,LPSTR,LPSTR); +BOOL _IMAGEHLPAPI UnMapAndLoad(PLOADED_IMAGE); +PIMAGE_DEBUG_INFORMATION _IMAGEHLPAPI MapDebugInformation(HANDLE,LPSTR,LPSTR,DWORD); +BOOL _IMAGEHLPAPI UnmapDebugInformation(PIMAGE_DEBUG_INFORMATION); +HANDLE _IMAGEHLPAPI FindExecutableImage(LPSTR,LPSTR,LPSTR); BOOL _IMAGEHLPAPI SearchTreeForFile(LPSTR,LPSTR,LPSTR); BOOL _IMAGEHLPAPI MakeSureDirectoryPathExists(LPCSTR); -DWORD _IMAGEHLPAPI WINAPI UnDecorateSymbolName(LPCSTR,LPSTR,DWORD, DWORD); +DWORD _IMAGEHLPAPI WINAPI UnDecorateSymbolName(LPCSTR,LPSTR,DWORD, DWORD); BOOL _IMAGEHLPAPI StackWalk(DWORD,HANDLE,HANDLE,LPSTACKFRAME,LPVOID,PREAD_PROCESS_MEMORY_ROUTINE,PFUNCTION_TABLE_ACCESS_ROUTINE,PGET_MODULE_BASE_ROUTINE,PTRANSLATE_ADDRESS_ROUTINE); -LPAPI_VERSION _IMAGEHLPAPI ImagehlpApiVersion(VOID); +LPAPI_VERSION _IMAGEHLPAPI ImagehlpApiVersion(VOID); LPAPI_VERSION _IMAGEHLPAPI ImagehlpApiVersionEx(LPAPI_VERSION); -DWORD _IMAGEHLPAPI GetTimestampForLoadedLibrary(HMODULE); -BOOL _IMAGEHLPAPI RemovePrivateCvSymbolic(PCHAR,PCHAR*,ULONG*); +DWORD _IMAGEHLPAPI GetTimestampForLoadedLibrary(HMODULE); +BOOL _IMAGEHLPAPI RemovePrivateCvSymbolic(PCHAR,PCHAR*,ULONG*); VOID _IMAGEHLPAPI RemoveRelocations(PCHAR); -DWORD _IMAGEHLPAPI SymSetOptions(IN DWORD); -DWORD _IMAGEHLPAPI SymGetOptions(VOID); -BOOL _IMAGEHLPAPI SymCleanup(IN HANDLE); +DWORD _IMAGEHLPAPI SymSetOptions(IN DWORD); +DWORD _IMAGEHLPAPI SymGetOptions(VOID); +BOOL _IMAGEHLPAPI SymCleanup(IN HANDLE); BOOL _IMAGEHLPAPI SymEnumerateModules(IN HANDLE,IN PSYM_ENUMMODULES_CALLBACK,IN PVOID); BOOL _IMAGEHLPAPI SymEnumerateSymbols(IN HANDLE,IN DWORD,IN PSYM_ENUMSYMBOLS_CALLBACK,IN PVOID); BOOL _IMAGEHLPAPI EnumerateLoadedModules(IN HANDLE,IN PENUMLOADED_MODULES_CALLBACK,IN PVOID); LPVOID _IMAGEHLPAPI SymFunctionTableAccess(HANDLE,DWORD); -BOOL _IMAGEHLPAPI SymGetModuleInfo(IN HANDLE,IN DWORD,OUT PIMAGEHLP_MODULE); -DWORD _IMAGEHLPAPI SymGetModuleBase(IN HANDLE,IN DWORD); -BOOL _IMAGEHLPAPI SymGetSymFromAddr(IN HANDLE,IN DWORD,OUT PDWORD,OUT PIMAGEHLP_SYMBOL); +BOOL _IMAGEHLPAPI SymGetModuleInfo(IN HANDLE,IN DWORD,OUT PIMAGEHLP_MODULE); +DWORD _IMAGEHLPAPI SymGetModuleBase(IN HANDLE,IN DWORD); +BOOL _IMAGEHLPAPI SymGetSymFromAddr(IN HANDLE,IN DWORD,OUT PDWORD,OUT PIMAGEHLP_SYMBOL); BOOL _IMAGEHLPAPI SymGetSymFromName(IN HANDLE,IN LPSTR,OUT PIMAGEHLP_SYMBOL); -BOOL _IMAGEHLPAPI SymGetSymNext(IN HANDLE,IN OUT PIMAGEHLP_SYMBOL); -BOOL _IMAGEHLPAPI SymGetSymPrev(IN HANDLE,IN OUT PIMAGEHLP_SYMBOL); +BOOL _IMAGEHLPAPI SymGetSymNext(IN HANDLE,IN OUT PIMAGEHLP_SYMBOL); +BOOL _IMAGEHLPAPI SymGetSymPrev(IN HANDLE,IN OUT PIMAGEHLP_SYMBOL); BOOL _IMAGEHLPAPI SymGetLineFromAddr(IN HANDLE,IN DWORD,OUT PDWORD,OUT PIMAGEHLP_LINE); BOOL _IMAGEHLPAPI SymGetLineFromName(IN HANDLE,IN LPSTR,IN LPSTR,IN DWORD,OUT PLONG,IN OUT PIMAGEHLP_LINE); -BOOL _IMAGEHLPAPI SymGetLineNext(IN HANDLE,IN OUT PIMAGEHLP_LINE); -BOOL _IMAGEHLPAPI SymGetLinePrev(IN HANDLE,IN OUT PIMAGEHLP_LINE); +BOOL _IMAGEHLPAPI SymGetLineNext(IN HANDLE,IN OUT PIMAGEHLP_LINE); +BOOL _IMAGEHLPAPI SymGetLinePrev(IN HANDLE,IN OUT PIMAGEHLP_LINE); BOOL _IMAGEHLPAPI SymMatchFileName(IN LPSTR,IN LPSTR,OUT LPSTR*,OUT LPSTR*); -BOOL _IMAGEHLPAPI SymInitialize(IN HANDLE,IN LPSTR,IN BOOL); -BOOL _IMAGEHLPAPI SymGetSearchPath(IN HANDLE,OUT LPSTR,IN DWORD); -BOOL _IMAGEHLPAPI SymSetSearchPath(IN HANDLE,IN LPSTR); -BOOL _IMAGEHLPAPI SymLoadModule(IN HANDLE,IN HANDLE,IN PSTR,IN PSTR,IN DWORD,IN DWORD); -BOOL _IMAGEHLPAPI SymUnloadModule(IN HANDLE,IN DWORD); -BOOL _IMAGEHLPAPI SymUnDName(IN PIMAGEHLP_SYMBOL,OUT LPSTR,IN DWORD); +BOOL _IMAGEHLPAPI SymInitialize(IN HANDLE,IN LPSTR,IN BOOL); +BOOL _IMAGEHLPAPI SymGetSearchPath(IN HANDLE,OUT LPSTR,IN DWORD); +BOOL _IMAGEHLPAPI SymSetSearchPath(IN HANDLE,IN LPSTR); +BOOL _IMAGEHLPAPI SymLoadModule(IN HANDLE,IN HANDLE,IN PSTR,IN PSTR,IN DWORD,IN DWORD); +BOOL _IMAGEHLPAPI SymUnloadModule(IN HANDLE,IN DWORD); +BOOL _IMAGEHLPAPI SymUnDName(IN PIMAGEHLP_SYMBOL,OUT LPSTR,IN DWORD); BOOL _IMAGEHLPAPI SymRegisterCallback(IN HANDLE,IN PSYMBOL_REGISTERED_CALLBACK,IN PVOID); -BOOL _IMAGEHLPAPI ImageGetDigestStream(IN HANDLE,IN DWORD,IN DIGEST_FUNCTION,IN DIGEST_HANDLE); -//BOOL _IMAGEHLPAPI ImageAddCertificate(IN HANDLE,IN LPWIN_CERTIFICATE,OUT PDWORD); -BOOL _IMAGEHLPAPI ImageRemoveCertificate(IN HANDLE,IN DWORD); -BOOL _IMAGEHLPAPI ImageEnumerateCertificates(IN HANDLE,IN WORD,OUT PDWORD,IN OUT PDWORD OPTIONAL,IN OUT DWORD OPTIONAL); -//BOOL _IMAGEHLPAPI ImageGetCertificateData(IN HANDLE,IN DWORD,OUT LPWIN_CERTIFICATE,IN OUT PDWORD); -//BOOL _IMAGEHLPAPI ImageGetCertificateHeader(IN HANDLE,IN DWORD,IN OUT LPWIN_CERTIFICATE); -BOOL _IMAGEHLPAPI CopyPdb(CHAR const*,CHAR const*,BOOL); +BOOL _IMAGEHLPAPI ImageGetDigestStream(IN HANDLE,IN DWORD,IN DIGEST_FUNCTION,IN DIGEST_HANDLE); +//BOOL _IMAGEHLPAPI ImageAddCertificate(IN HANDLE,IN LPWIN_CERTIFICATE,OUT PDWORD); +BOOL _IMAGEHLPAPI ImageRemoveCertificate(IN HANDLE,IN DWORD); +BOOL _IMAGEHLPAPI ImageEnumerateCertificates(IN HANDLE,IN WORD,OUT PDWORD,IN OUT PDWORD OPTIONAL,IN OUT DWORD OPTIONAL); +//BOOL _IMAGEHLPAPI ImageGetCertificateData(IN HANDLE,IN DWORD,OUT LPWIN_CERTIFICATE,IN OUT PDWORD); +//BOOL _IMAGEHLPAPI ImageGetCertificateHeader(IN HANDLE,IN DWORD,IN OUT LPWIN_CERTIFICATE); +BOOL _IMAGEHLPAPI CopyPdb(CHAR const*,CHAR const*,BOOL); BOOL _IMAGEHLPAPI RemovePrivateCvSymbolicEx(PCHAR,ULONG,PCHAR*,ULONG*); #endif /* RC_INVOKED */ @@ -321,7 +321,7 @@ BOOL _IMAGEHLPAPI RemovePrivateCvSymbolicEx(PCHAR,ULONG,PCHAR*,ULONG*); #define MapFileAndCheckSum MapFileAndCheckSumW #else #define MapFileAndCheckSum MapFileAndCheckSumA -#endif +#endif #ifdef __cplusplus } diff --git a/reactos/w32api/include/intshcut.h b/reactos/w32api/include/intshcut.h index 9742ff917e0..637d6635fc4 100644 --- a/reactos/w32api/include/intshcut.h +++ b/reactos/w32api/include/intshcut.h @@ -6,8 +6,8 @@ #include #ifdef __cplusplus -extern "C" { -#endif +extern "C" { +#endif #define INTSHCUTAPI DECLSPEC_IMPORT #define E_FLAGS MAKE_SCODE(SEVERITY_ERROR,FACILITY_ITF,0x1000) #define IS_E_EXEC_FAILED MAKE_SCODE(SEVERITY_ERROR,FACILITY_ITF,0x2002) @@ -75,8 +75,8 @@ HRESULT WINAPI URLAssociationDialogW(HWND,DWORD,PCWSTR,PCWSTR,PWSTR,UINT); #define TranslateURL TranslateURLA #define MIMEAssociationDialog MIMEAssociationDialogA #define URLAssociationDialog URLAssociationDialogA -#endif +#endif #ifdef __cplusplus -} -#endif -#endif +} +#endif +#endif diff --git a/reactos/w32api/include/iprtrmib.h b/reactos/w32api/include/iprtrmib.h index f897ecbfaa8..269a53ffde7 100644 --- a/reactos/w32api/include/iprtrmib.h +++ b/reactos/w32api/include/iprtrmib.h @@ -24,18 +24,18 @@ extern "C" { #define MIB_TCP_RTO_CONSTANT 2 #define MIB_TCP_RTO_RSRE 3 #define MIB_TCP_RTO_VANJ 4 -#define MIB_TCP_STATE_CLOSED 1 -#define MIB_TCP_STATE_LISTEN 2 -#define MIB_TCP_STATE_SYN_SENT 3 -#define MIB_TCP_STATE_SYN_RCVD 4 -#define MIB_TCP_STATE_ESTAB 5 -#define MIB_TCP_STATE_FIN_WAIT1 6 -#define MIB_TCP_STATE_FIN_WAIT2 7 -#define MIB_TCP_STATE_CLOSE_WAIT 8 -#define MIB_TCP_STATE_CLOSING 9 -#define MIB_TCP_STATE_LAST_ACK 10 -#define MIB_TCP_STATE_TIME_WAIT 11 -#define MIB_TCP_STATE_DELETE_TCB 12 +#define MIB_TCP_STATE_CLOSED 1 +#define MIB_TCP_STATE_LISTEN 2 +#define MIB_TCP_STATE_SYN_SENT 3 +#define MIB_TCP_STATE_SYN_RCVD 4 +#define MIB_TCP_STATE_ESTAB 5 +#define MIB_TCP_STATE_FIN_WAIT1 6 +#define MIB_TCP_STATE_FIN_WAIT2 7 +#define MIB_TCP_STATE_CLOSE_WAIT 8 +#define MIB_TCP_STATE_CLOSING 9 +#define MIB_TCP_STATE_LAST_ACK 10 +#define MIB_TCP_STATE_TIME_WAIT 11 +#define MIB_TCP_STATE_DELETE_TCB 12 #define MIB_USE_CURRENT_TTL ((DWORD)-1) #define MIB_USE_CURRENT_FORWARDING ((DWORD)-1) #define MIB_TCP_MAXCONN_DYNAMIC ((DWORD)-1) diff --git a/reactos/w32api/include/iptypes.h b/reactos/w32api/include/iptypes.h index c2c361c8e97..4f880b0ed64 100644 --- a/reactos/w32api/include/iptypes.h +++ b/reactos/w32api/include/iptypes.h @@ -114,7 +114,7 @@ typedef enum { typedef struct _IP_ADAPTER_UNICAST_ADDRESS { union { ULONGLONG Alignment; - struct { + struct { ULONG Length; DWORD Flags; }; @@ -131,7 +131,7 @@ typedef struct _IP_ADAPTER_UNICAST_ADDRESS { typedef struct _IP_ADAPTER_ANYCAST_ADDRESS { union { ULONGLONG Alignment; - struct { + struct { ULONG Length; DWORD Flags; }; diff --git a/reactos/w32api/include/lmaccess.h b/reactos/w32api/include/lmaccess.h index 044a7a6074a..877bac2f326 100644 --- a/reactos/w32api/include/lmaccess.h +++ b/reactos/w32api/include/lmaccess.h @@ -7,18 +7,18 @@ #ifdef __cplusplus extern "C" { #endif -#include +#include #define GROUP_SPECIALGRP_USERS L"USERS" #define GROUP_SPECIALGRP_ADMINS L"ADMINS" #define GROUP_SPECIALGRP_GUESTS L"GUESTS" #define GROUP_SPECIALGRP_LOCAL L"LOCAL" #define ACCESS_LETTERS "RWCXDAP " -#define NETLOGON_CONTROL_QUERY 1 -#define NETLOGON_CONTROL_REPLICATE 2 -#define NETLOGON_CONTROL_SYNCHRONIZE 3 -#define NETLOGON_CONTROL_PDC_REPLICATE 4 -#define NETLOGON_CONTROL_REDISCOVER 5 -#define NETLOGON_CONTROL_TC_QUERY 6 +#define NETLOGON_CONTROL_QUERY 1 +#define NETLOGON_CONTROL_REPLICATE 2 +#define NETLOGON_CONTROL_SYNCHRONIZE 3 +#define NETLOGON_CONTROL_PDC_REPLICATE 4 +#define NETLOGON_CONTROL_REDISCOVER 5 +#define NETLOGON_CONTROL_TC_QUERY 6 #define NETLOGON_CONTROL_BACKUP_CHANGE_LOG 65532 #define NETLOGON_CONTROL_TRUNCATE_LOG 65533 #define NETLOGON_CONTROL_SET_DBFLAG 65534 @@ -79,7 +79,7 @@ extern "C" { #define USER_COUNTRY_CODE_PARMNUM 24 #define USER_CODE_PAGE_PARMNUM 25 #define USER_PRIMARY_GROUP_PARMNUM 51 -#define USER_PROFILE 52 +#define USER_PROFILE 52 #define USER_PROFILE_PARMNUM 52 #define USER_HOME_DIR_DRIVE_PARMNUM 53 #define USER_NAME_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+USER_NAME_PARMNUM) @@ -153,7 +153,7 @@ extern "C" { #define MODALS_PRIMARY_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+MODALS_PRIMARY_PARMNUM) #define MODALS_DOMAIN_NAME_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+MODALS_DOMAIN_NAME_PARMNUM) #define MODALS_DOMAIN_ID_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+MODALS_DOMAIN_ID_PARMNUM) -#define GROUPIDMASK 0x8000 +#define GROUPIDMASK 0x8000 #define GROUP_ALL_PARMNUM 0 #define GROUP_NAME_PARMNUM 1 #define GROUP_COMMENT_PARMNUM 2 @@ -607,4 +607,4 @@ NET_API_STATUS WINAPI I_NetLogonControl2(LPCWSTR,DWORD,DWORD,PBYTE,PBYTE*); #ifdef __cplusplus } #endif -#endif +#endif diff --git a/reactos/w32api/include/lmaudit.h b/reactos/w32api/include/lmaudit.h index 4a97baaa52e..036677343be 100644 --- a/reactos/w32api/include/lmaudit.h +++ b/reactos/w32api/include/lmaudit.h @@ -214,7 +214,7 @@ typedef struct _AE_GENERIC { DWORD ae_ge_param8; DWORD ae_ge_param9; } AE_GENERIC,*PAE_GENERIC,*LPAE_GENERIC; -NET_API_STATUS WINAPI NetAuditClear(LPCWSTR,LPCWSTR,LPCWSTR); +NET_API_STATUS WINAPI NetAuditClear(LPCWSTR,LPCWSTR,LPCWSTR); NET_API_STATUS WINAPI NetAuditRead(LPTSTR,LPTSTR,LPHLOG,DWORD,PDWORD,DWORD,DWORD,PBYTE*,DWORD,PDWORD,PDWORD); NET_API_STATUS WINAPI NetAuditWrite(DWORD,PBYTE,DWORD,LPTSTR,PBYTE); diff --git a/reactos/w32api/include/lmbrowsr.h b/reactos/w32api/include/lmbrowsr.h index 66078c67d7e..e6f47969e5f 100644 --- a/reactos/w32api/include/lmbrowsr.h +++ b/reactos/w32api/include/lmbrowsr.h @@ -71,4 +71,4 @@ NET_API_STATUS I_BrowserDebugTrace(PWCHAR,PCHAR); #ifdef __cplusplus } #endif -#endif +#endif diff --git a/reactos/w32api/include/lmchdev.h b/reactos/w32api/include/lmchdev.h index 3a4096881e8..2a648909f73 100644 --- a/reactos/w32api/include/lmchdev.h +++ b/reactos/w32api/include/lmchdev.h @@ -58,4 +58,4 @@ NET_API_STATUS WINAPI NetHandleSetInfo(HANDLE,DWORD,PBYTE,DWORD,PDWORD); #ifdef __cplusplus } #endif -#endif +#endif diff --git a/reactos/w32api/include/lmconfig.h b/reactos/w32api/include/lmconfig.h index b75c6ab9cb3..a9c7d38a191 100644 --- a/reactos/w32api/include/lmconfig.h +++ b/reactos/w32api/include/lmconfig.h @@ -18,4 +18,4 @@ NET_API_STATUS WINAPI NetConfigSet(LPCWSTR,LPCWSTR,LPCWSTR,DWORD,DWORD,PBYTE,DWO #ifdef __cplusplus } #endif -#endif +#endif diff --git a/reactos/w32api/include/lmerr.h b/reactos/w32api/include/lmerr.h index 58b1484920c..26ad21fb808 100644 --- a/reactos/w32api/include/lmerr.h +++ b/reactos/w32api/include/lmerr.h @@ -5,7 +5,7 @@ #endif #include -#define NERR_Success 0 +#define NERR_Success 0 #define NERR_BASE 2100 #define NERR_NetNotStarted (NERR_BASE+2) #define NERR_UnknownServer (NERR_BASE+3) @@ -303,4 +303,4 @@ #define NERR_DfsChildOrParentInDfs (NERR_BASE+583) #define NERR_DfsInternalError (NERR_BASE+590) #define MAX_NERR (NERR_BASE+899) -#endif +#endif diff --git a/reactos/w32api/include/lmerrlog.h b/reactos/w32api/include/lmerrlog.h index 2f4160369fd..76894c8a190 100644 --- a/reactos/w32api/include/lmerrlog.h +++ b/reactos/w32api/include/lmerrlog.h @@ -8,7 +8,7 @@ extern "C" { #endif #define ERRLOG_BASE 3100 -#define ERRLOG2_BASE 5700 +#define ERRLOG2_BASE 5700 #define LOGFLAGS_FORWARD 0 #define LOGFLAGS_BACKWARD 1 #define LOGFLAGS_SEEK 2 @@ -196,11 +196,11 @@ typedef struct _ERROR_LOG { DWORD el_reserved; DWORD el_time; DWORD el_error; - LPWSTR el_name; - LPWSTR el_text; - LPBYTE el_data; - DWORD el_data_size; - DWORD el_nstrings; + LPWSTR el_name; + LPWSTR el_text; + LPBYTE el_data; + DWORD el_data_size; + DWORD el_nstrings; } ERROR_LOG,*PERROR_LOG,*LPERROR_LOG; NET_API_STATUS WINAPI NetErrorLogClear(LPCWSTR,LPCWSTR,LPBYTE); NET_API_STATUS WINAPI NetErrorLogRead(LPCWSTR,LPWSTR,LPHLOG,DWORD,LPDWORD,DWORD,DWORD,LPBYTE*,DWORD,LPDWORD,LPDWORD); @@ -208,4 +208,4 @@ NET_API_STATUS WINAPI NetErrorLogWrite(LPBYTE,DWORD,LPCWSTR,LPBYTE,DWORD,LPBYTE, #ifdef __cplusplus } #endif -#endif +#endif diff --git a/reactos/w32api/include/lmmsg.h b/reactos/w32api/include/lmmsg.h index 9a4ea643471..6857ad13c2c 100644 --- a/reactos/w32api/include/lmmsg.h +++ b/reactos/w32api/include/lmmsg.h @@ -24,4 +24,4 @@ NET_API_STATUS WINAPI NetMessageNameGetInfo(LPCWSTR,LPCWSTR,DWORD,PBYTE*); #ifdef __cplusplus } #endif -#endif +#endif diff --git a/reactos/w32api/include/lmremutl.h b/reactos/w32api/include/lmremutl.h index 0609240af52..deb21799fcf 100644 --- a/reactos/w32api/include/lmremutl.h +++ b/reactos/w32api/include/lmremutl.h @@ -18,9 +18,9 @@ extern "C" { #define USE_SPECIFIC_TRANSPORT 0x80000000 #ifndef DESC_CHAR_UNICODE typedef CHAR DESC_CHAR; -#else +#else typedef WCHAR DESC_CHAR; -#endif +#endif typedef DESC_CHAR *LPDESC; typedef struct _TIME_OF_DAY_INFO { DWORD tod_elapsedt; @@ -42,4 +42,4 @@ NET_API_STATUS RxRemoteApi(DWORD,LPCWSTR,LPDESC,LPDESC,LPDESC,LPDESC,LPDESC,LPDE #ifdef __cplusplus } #endif -#endif +#endif diff --git a/reactos/w32api/include/lmrepl.h b/reactos/w32api/include/lmrepl.h index 0cef98ce93f..e0faa5a96c7 100644 --- a/reactos/w32api/include/lmrepl.h +++ b/reactos/w32api/include/lmrepl.h @@ -91,4 +91,4 @@ NET_API_STATUS WINAPI NetReplImportDirUnlock(LPCWSTR,LPCWSTR,DWORD); #ifdef __cplusplus } #endif -#endif +#endif diff --git a/reactos/w32api/include/lmserver.h b/reactos/w32api/include/lmserver.h index 71197143028..e9dd9ae6b2b 100644 --- a/reactos/w32api/include/lmserver.h +++ b/reactos/w32api/include/lmserver.h @@ -362,7 +362,7 @@ BOOL SetServiceBits(SERVICE_STATUS_HANDLE,DWORD,BOOL,BOOL); #define SV_MAX_CMD_LEN PATHLEN #define SW_AUTOPROF_LOAD_MASK 1 #define SW_AUTOPROF_SAVE_MASK 2 -#define SV_MAX_SRV_HEUR_LEN 32 +#define SV_MAX_SRV_HEUR_LEN 32 #define SV_USERS_PER_LICENSE 5 #define SV_PLATFORM_ID_OS2 400 #define SV_PLATFORM_ID_NT 500 @@ -390,12 +390,12 @@ BOOL SetServiceBits(SERVICE_STATUS_HANDLE,DWORD,BOOL,BOOL); #define SV_TYPE_DOMAIN_MASTER 0x80000 #define SV_TYPE_SERVER_OSF 0x100000 #define SV_TYPE_SERVER_VMS 0x200000 -#define SV_TYPE_WINDOWS 0x400000 -#define SV_TYPE_ALTERNATE_XPORT 0x20000000 -#define SV_TYPE_LOCAL_LIST_ONLY 0x40000000 +#define SV_TYPE_WINDOWS 0x400000 +#define SV_TYPE_ALTERNATE_XPORT 0x20000000 +#define SV_TYPE_LOCAL_LIST_ONLY 0x40000000 #define SV_TYPE_DOMAIN_ENUM 0x80000000 -#define SV_TYPE_ALL 0xFFFFFFFF -#define SV_NODISC (-1) +#define SV_TYPE_ALL 0xFFFFFFFF +#define SV_NODISC (-1) #define SV_USERSECURITY 1 #define SV_SHARESECURITY 0 #define SV_HIDDEN 1 @@ -603,4 +603,4 @@ BOOL SetServiceBits(SERVICE_STATUS_HANDLE,DWORD,BOOL,BOOL); #ifdef __cplusplus } #endif -#endif +#endif diff --git a/reactos/w32api/include/lmshare.h b/reactos/w32api/include/lmshare.h index 07fe9270bd5..9603667bdb0 100644 --- a/reactos/w32api/include/lmshare.h +++ b/reactos/w32api/include/lmshare.h @@ -7,7 +7,7 @@ #ifdef __cplusplus extern "C" { #endif -#include +#include #define SHARE_NETNAME_PARMNUM 1 #define SHARE_TYPE_PARMNUM 3 #define SHARE_REMARK_PARMNUM 4 @@ -84,7 +84,7 @@ typedef struct _SHARE_INFO_1501 { } SHARE_INFO_1501,*PSHARE_INFO_1501,*LPSHARE_INFO_1501; typedef struct _SESSION_INFO_0 { LPWSTR sesi0_cname; } SESSION_INFO_0,*PSESSION_INFO_0,*LPSESSION_INFO_0; typedef struct _SESSION_INFO_1 { - LPTSTR sesi1_cname; + LPTSTR sesi1_cname; LPTSTR sesi1_username; DWORD sesi1_num_opens; DWORD sesi1_time; @@ -92,7 +92,7 @@ typedef struct _SESSION_INFO_1 { DWORD sesi1_user_flags; } SESSION_INFO_1,*PSESSION_INFO_1,*LPSESSION_INFO_1; typedef struct _SESSION_INFO_2 { - LPTSTR sesi2_cname; + LPTSTR sesi2_cname; LPTSTR sesi2_username; DWORD sesi2_num_opens; DWORD sesi2_time; @@ -101,13 +101,13 @@ typedef struct _SESSION_INFO_2 { LPWSTR sesi2_cltype_name; } SESSION_INFO_2,*PSESSION_INFO_2,*LPSESSION_INFO_2; typedef struct _SESSION_INFO_10 { - LPWSTR sesi10_cname; + LPWSTR sesi10_cname; LPWSTR sesi10_username; DWORD sesi10_time; DWORD sesi10_idle_time; } SESSION_INFO_10,*PSESSION_INFO_10,*LPSESSION_INFO_10; typedef struct _SESSION_INFO_502 { - LPWSTR sesi502_cname; + LPWSTR sesi502_cname; LPWSTR sesi502_username; DWORD sesi502_num_opens; DWORD sesi502_time; @@ -144,4 +144,4 @@ NET_API_STATUS WINAPI NetFileGetInfo(LPWSTR,DWORD,DWORD,PBYTE*); #ifdef __cplusplus } #endif -#endif +#endif diff --git a/reactos/w32api/include/lmstats.h b/reactos/w32api/include/lmstats.h index 2a4a2c2e366..67ad171fd0f 100644 --- a/reactos/w32api/include/lmstats.h +++ b/reactos/w32api/include/lmstats.h @@ -111,4 +111,4 @@ NET_API_STATUS WINAPI NetStatisticsGet(LPWSTR,LPWSTR,DWORD,DWORD,PBYTE*); #ifdef __cplusplus } #endif -#endif +#endif diff --git a/reactos/w32api/include/lmsvc.h b/reactos/w32api/include/lmsvc.h index bb19ee058f8..d4f41660ca2 100644 --- a/reactos/w32api/include/lmsvc.h +++ b/reactos/w32api/include/lmsvc.h @@ -68,10 +68,10 @@ extern "C" { #define SERVICE_UIC_CONFLPARM (SERVICE_BASE+13) #define SERVICE_UIC_FILE (SERVICE_BASE+14) #define SERVICE_UIC_M_NULL 0 -#define SERVICE_UIC_M_MEMORY (SERVICE_BASE+20) -#define SERVICE_UIC_M_DISK (SERVICE_BASE+21) -#define SERVICE_UIC_M_THREADS (SERVICE_BASE+22) -#define SERVICE_UIC_M_PROCESSES (SERVICE_BASE+23) +#define SERVICE_UIC_M_MEMORY (SERVICE_BASE+20) +#define SERVICE_UIC_M_DISK (SERVICE_BASE+21) +#define SERVICE_UIC_M_THREADS (SERVICE_BASE+22) +#define SERVICE_UIC_M_PROCESSES (SERVICE_BASE+23) #define SERVICE_UIC_M_SECURITY (SERVICE_BASE+24) #define SERVICE_UIC_M_LANROOT (SERVICE_BASE+25) #define SERVICE_UIC_M_REDIR (SERVICE_BASE+26) @@ -131,4 +131,4 @@ NET_API_STATUS WINAPI NetServiceInstall(LPCWSTR,LPCWSTR,DWORD,LPCWSTR*,PBYTE*); #ifdef __cplusplus } #endif -#endif +#endif diff --git a/reactos/w32api/include/lmuse.h b/reactos/w32api/include/lmuse.h index a63a71f3c8c..f5c497826dd 100644 --- a/reactos/w32api/include/lmuse.h +++ b/reactos/w32api/include/lmuse.h @@ -57,4 +57,4 @@ NET_API_STATUS WINAPI NetUseGetInfo(LPWSTR,LPWSTR,DWORD,PBYTE*); #ifdef __cplusplus } #endif -#endif +#endif diff --git a/reactos/w32api/include/lmuseflg.h b/reactos/w32api/include/lmuseflg.h index 34162e4e556..e8c6735cbf3 100644 --- a/reactos/w32api/include/lmuseflg.h +++ b/reactos/w32api/include/lmuseflg.h @@ -7,4 +7,4 @@ #define USE_NOFORCE 0 #define USE_FORCE 1 #define USE_LOTS_OF_FORCE 2 -#endif +#endif diff --git a/reactos/w32api/include/lmwksta.h b/reactos/w32api/include/lmwksta.h index a8c6ccbcd5e..2a1e8c30a46 100644 --- a/reactos/w32api/include/lmwksta.h +++ b/reactos/w32api/include/lmwksta.h @@ -7,7 +7,7 @@ #ifdef __cplusplus extern "C" { #endif -#include +#include #define WKSTA_PLATFORM_ID_PARMNUM 100 #define WKSTA_COMPUTERNAME_PARMNUM 1 #define WKSTA_LANGROUP_PARMNUM 2 @@ -17,9 +17,9 @@ extern "C" { #define WKSTA_LANROOT_PARMNUM 7 #define WKSTA_LOGON_DOMAIN_PARMNUM 8 #define WKSTA_LOGON_SERVER_PARMNUM 9 -#define WKSTA_CHARWAIT_PARMNUM 10 -#define WKSTA_CHARTIME_PARMNUM 11 -#define WKSTA_CHARCOUNT_PARMNUM 12 +#define WKSTA_CHARWAIT_PARMNUM 10 +#define WKSTA_CHARTIME_PARMNUM 11 +#define WKSTA_CHARCOUNT_PARMNUM 12 #define WKSTA_KEEPCONN_PARMNUM 13 #define WKSTA_KEEPSEARCH_PARMNUM 14 #define WKSTA_MAXCMDS_PARMNUM 15 @@ -31,12 +31,12 @@ extern "C" { #define WKSTA_NUMSERVICES_PARMNUM 21 #define WKSTA_NUMCHARBUF_PARMNUM 22 #define WKSTA_SIZCHARBUF_PARMNUM 23 -#define WKSTA_ERRLOGSZ_PARMNUM 27 -#define WKSTA_PRINTBUFTIME_PARMNUM 28 +#define WKSTA_ERRLOGSZ_PARMNUM 27 +#define WKSTA_PRINTBUFTIME_PARMNUM 28 #define WKSTA_SIZWORKBUF_PARMNUM 29 #define WKSTA_MAILSLOTS_PARMNUM 30 #define WKSTA_NUMDGRAMBUF_PARMNUM 31 -#define WKSTA_WRKHEURISTICS_PARMNUM 32 +#define WKSTA_WRKHEURISTICS_PARMNUM 32 #define WKSTA_MAXTHREADS_PARMNUM 33 #define WKSTA_LOCKQUOTA_PARMNUM 41 #define WKSTA_LOCKINCREMENT_PARMNUM 42 @@ -230,4 +230,4 @@ NET_API_STATUS WINAPI NetWkstaTransportEnum(LPWSTR,DWORD,PBYTE*,DWORD,PDWORD,PDW #ifdef __cplusplus } #endif -#endif +#endif diff --git a/reactos/w32api/include/mswsock.h b/reactos/w32api/include/mswsock.h index fa1e7307a18..452463b8cd3 100644 --- a/reactos/w32api/include/mswsock.h +++ b/reactos/w32api/include/mswsock.h @@ -8,7 +8,7 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. */ - + #ifndef _MSWSOCK_H #define _MSWSOCK_H #if __GNUC__ >=3 @@ -68,7 +68,7 @@ typedef VOID (PASCAL *LPFN_GETACCEPTEXSOCKADDRS)(PVOID,DWORD,DWORD,DWORD,struct #define TP_ELEMENT_MEMORY 2 #define TP_ELEMENT_EOP 4 -typedef struct _TRANSMIT_PACKETS_ELEMENT { +typedef struct _TRANSMIT_PACKETS_ELEMENT { ULONG dwElFlags; ULONG cLength; _ANONYMOUS_UNION @@ -79,7 +79,7 @@ typedef struct _TRANSMIT_PACKETS_ELEMENT { }; PVOID pBuffer; }; -} TRANSMIT_PACKETS_ELEMENT; +} TRANSMIT_PACKETS_ELEMENT; typedef struct _WSAMSG { LPSOCKADDR name; diff --git a/reactos/w32api/include/ntdef.h b/reactos/w32api/include/ntdef.h index 82fd9c18b80..79f91b26fb3 100644 --- a/reactos/w32api/include/ntdef.h +++ b/reactos/w32api/include/ntdef.h @@ -57,8 +57,8 @@ typedef struct _OBJECT_ATTRIBUTES { ULONG Length; HANDLE RootDirectory; PUNICODE_STRING ObjectName; - ULONG Attributes; - PVOID SecurityDescriptor; + ULONG Attributes; + PVOID SecurityDescriptor; PVOID SecurityQualityOfService; } OBJECT_ATTRIBUTES, *POBJECT_ATTRIBUTES; #endif diff --git a/reactos/w32api/include/oaidl.h b/reactos/w32api/include/oaidl.h index f33f0fba779..7700e271928 100644 --- a/reactos/w32api/include/oaidl.h +++ b/reactos/w32api/include/oaidl.h @@ -301,7 +301,7 @@ typedef struct _wireVARIANT { INT *pintVal; UINT *puintVal; } DUMMYUNIONNAME; -} *wireVARIANT; +} *wireVARIANT; typedef LONG DISPID; typedef DISPID MEMBERID; typedef DWORD HREFTYPE; @@ -858,17 +858,17 @@ DECLARE_INTERFACE_(ICreateTypeInfo2,IUnknown) STDMETHOD(DeleteFuncDesc)(THIS_ UINT) PURE; STDMETHOD(DeleteFuncDescByMemId)(THIS_ MEMBERID, INVOKEKIND) PURE; STDMETHOD(DeleteVarDesc)(THIS_ UINT) PURE; - STDMETHOD(DeleteVarDescByMemId)(THIS_ MEMBERID) PURE; - STDMETHOD(DeleteImplType)(THIS_ UINT) PURE; - STDMETHOD(SetCustData)(THIS_ REFGUID, VARIANT*) PURE; - STDMETHOD(SetFuncCustData)(THIS_ UINT, REFGUID, VARIANT*) PURE; - STDMETHOD(SetParamCustData)(THIS_ UINT, UINT, REFGUID, VARIANT*) PURE; - STDMETHOD(SetVarCustData)(THIS_ UINT, REFGUID, VARIANT*) PURE; - STDMETHOD(SetImplTypeCustData)(THIS_ UINT, REFGUID, VARIANT*) PURE; - STDMETHOD(SetHelpStringContext)(THIS_ ULONG) PURE; - STDMETHOD(SetFuncHelpStringContext)(THIS_ UINT, ULONG) PURE; - STDMETHOD(SetVarHelpStringContext)(THIS_ UINT, ULONG) PURE; - STDMETHOD(Invalidate)(THIS) PURE; + STDMETHOD(DeleteVarDescByMemId)(THIS_ MEMBERID) PURE; + STDMETHOD(DeleteImplType)(THIS_ UINT) PURE; + STDMETHOD(SetCustData)(THIS_ REFGUID, VARIANT*) PURE; + STDMETHOD(SetFuncCustData)(THIS_ UINT, REFGUID, VARIANT*) PURE; + STDMETHOD(SetParamCustData)(THIS_ UINT, UINT, REFGUID, VARIANT*) PURE; + STDMETHOD(SetVarCustData)(THIS_ UINT, REFGUID, VARIANT*) PURE; + STDMETHOD(SetImplTypeCustData)(THIS_ UINT, REFGUID, VARIANT*) PURE; + STDMETHOD(SetHelpStringContext)(THIS_ ULONG) PURE; + STDMETHOD(SetFuncHelpStringContext)(THIS_ UINT, ULONG) PURE; + STDMETHOD(SetVarHelpStringContext)(THIS_ UINT, ULONG) PURE; + STDMETHOD(Invalidate)(THIS) PURE; STDMETHOD(SetName)(THIS_ LPOLESTR) PURE; }; #undef INTERFACE @@ -970,7 +970,7 @@ DECLARE_INTERFACE_(ICreateTypeLib2,IUnknown) STDMETHOD(SaveAllChanges)(THIS) PURE; STDMETHOD(DeleteTypeInfo)(THIS_ LPOLESTR) PURE; STDMETHOD(SetCustData)(THIS_ REFGUID, VARIANT*) PURE; - STDMETHOD(SetHelpStringContext)(THIS_ ULONG) PURE; + STDMETHOD(SetHelpStringContext)(THIS_ ULONG) PURE; STDMETHOD(SetHelpStringDll)(THIS_ LPOLESTR) PURE; }; #undef INTERFACE diff --git a/reactos/w32api/include/objidl.h b/reactos/w32api/include/objidl.h index 4e11e6d0980..76b69786801 100644 --- a/reactos/w32api/include/objidl.h +++ b/reactos/w32api/include/objidl.h @@ -309,7 +309,7 @@ typedef struct tagPROPVARIANT { VARIANT_BOOL boolVal; #if 0 /* bool is a standard type in C++, and a standard macro expanding - to the _Bool type in C99 (see stdbool.h) */ + to the _Bool type in C99 (see stdbool.h) */ _VARIANT_BOOL bool; #endif long lVal; diff --git a/reactos/w32api/include/ocidl.h b/reactos/w32api/include/ocidl.h index 43f0dce8eda..499c8687670 100644 --- a/reactos/w32api/include/ocidl.h +++ b/reactos/w32api/include/ocidl.h @@ -850,7 +850,7 @@ DECLARE_INTERFACE_(IEnumOleUndoUnits,IUnknown) STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE; STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; - STDMETHOD(Next)(THIS_ ULONG,IOleUndoUnit**,ULONG*) PURE; + STDMETHOD(Next)(THIS_ ULONG,IOleUndoUnit**,ULONG*) PURE; STDMETHOD(Skip)(THIS_ ULONG) PURE; STDMETHOD(Reset)(THIS) PURE; STDMETHOD(Clone)(THIS_ IEnumOleUndoUnits**) PURE; diff --git a/reactos/w32api/include/odbcinst.h b/reactos/w32api/include/odbcinst.h index b90464f272a..b995ec1578c 100644 --- a/reactos/w32api/include/odbcinst.h +++ b/reactos/w32api/include/odbcinst.h @@ -18,7 +18,7 @@ extern "C" { #define ODBC_ADD_SYS_DSN 4 #define ODBC_CONFIG_SYS_DSN 5 #define ODBC_REMOVE_SYS_DSN 6 -#define ODBC_INSTALL_INQUIRY 1 +#define ODBC_INSTALL_INQUIRY 1 #define ODBC_INSTALL_COMPLETE 2 #define ODBC_INSTALL_DRIVER 1 #define ODBC_REMOVE_DRIVER 2 @@ -86,7 +86,7 @@ BOOL INSTAPI SQLWriteDSNToIni(LPCSTR,LPCSTR); BOOL INSTAPI SQLWriteDSNToIniW(LPCWSTR,LPCWSTR); BOOL INSTAPI SQLWritePrivateProfileString(LPCSTR,LPCSTR,LPCSTR,LPCSTR); BOOL INSTAPI SQLWritePrivateProfileStringW(LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR); -#if(ODBCVER >= 0x0250) +#if(ODBCVER >= 0x0250) BOOL INSTAPI ConfigDriver(HWND,WORD,LPCSTR,LPCSTR,LPSTR,WORD,WORD*); BOOL INSTAPI ConfigDriverW(HWND,WORD,LPCWSTR,LPCWSTR,LPWSTR,WORD,WORD*); BOOL INSTAPI SQLConfigDriver(HWND,WORD,LPCSTR,LPCSTR,LPSTR,WORD,WORD*); @@ -98,8 +98,8 @@ BOOL INSTAPI SQLRemoveDriverManager(LPDWORD); BOOL INSTAPI SQLRemoveDriverW(LPCWSTR,BOOL,LPDWORD); BOOL INSTAPI SQLRemoveTranslator(LPCSTR,LPDWORD); BOOL INSTAPI SQLRemoveTranslatorW(LPCWSTR,LPDWORD); -#endif /* ODBCVER >= 0x0250 */ -#if (ODBCVER >= 0x0300) +#endif /* ODBCVER >= 0x0250 */ +#if (ODBCVER >= 0x0300) BOOL INSTAPI SQLGetConfigMode(UWORD*); BOOL INSTAPI SQLInstallDriverEx(LPCSTR,LPCSTR,LPSTR,WORD,WORD*,WORD,LPDWORD); BOOL INSTAPI SQLInstallDriverExW(LPCWSTR,LPCWSTR,LPWSTR,WORD,WORD*,WORD,LPDWORD); @@ -114,30 +114,30 @@ BOOL INSTAPI SQLReadFileDSNW(LPCWSTR,LPCWSTR,LPCWSTR,LPWSTR,WORD,WORD*); BOOL INSTAPI SQLSetConfigMode(UWORD); BOOL INSTAPI SQLWriteFileDSN(LPCSTR,LPCSTR,LPCSTR,LPCSTR); BOOL INSTAPI SQLWriteFileDSNW(LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR); -#endif /* ODBCVER >= 0x0300 */ +#endif /* ODBCVER >= 0x0300 */ #if defined (UNICODE) && !defined (SQL_NOUNICODEMAP) #define SQLConfigDataSource SQLConfigDataSourceW #define SQLConfigDriver SQLConfigDriverW -#define SQLCreateDataSource SQLCreateDataSourceW -#define SQLGetAvailableDrivers SQLGetAvailableDriversW +#define SQLCreateDataSource SQLCreateDataSourceW +#define SQLGetAvailableDrivers SQLGetAvailableDriversW #define SQLGetInstalledDrivers SQLGetInstalledDriversW #define SQLGetPrivateProfileString SQLGetPrivateProfileStringW -#define SQLGetTranslator SQLGetTranslatorW -#define SQLInstallDriver SQLInstallDriverW +#define SQLGetTranslator SQLGetTranslatorW +#define SQLInstallDriver SQLInstallDriverW #define SQLInstallDriverEx SQLInstallDriverExW #define SQLInstallDriverManager SQLInstallDriverManagerW #define SQLInstallerError SQLInstallerErrorW -#define SQLInstallODBC SQLInstallODBCW +#define SQLInstallODBC SQLInstallODBCW #define SQLInstallTranslator SQLInstallTranslatorW #define SQLInstallTranslatorEx SQLInstallTranslatorExW #define SQLPostInstallerError SQLPostInstallerErrorW #define SQLReadFileDSN SQLReadFileDSNW #define SQLRemoveDriver SQLRemoveDriverW -#define SQLRemoveDSNFromIni SQLRemoveDSNFromIniW +#define SQLRemoveDSNFromIni SQLRemoveDSNFromIniW #define SQLRemoveTranslator SQLRemoveTranslatorW -#define SQLValidDSN SQLValidDSNW -#define SQLWriteDSNToIni SQLWriteDSNToIniW +#define SQLValidDSN SQLValidDSNW +#define SQLWriteDSNToIni SQLWriteDSNToIniW #define SQLWriteFileDSN SQLWriteFileDSNW #define SQLWritePrivateProfileString SQLWritePrivateProfileStringW #endif /* UNICODE && !SQL_NOUNICODEMAP */ diff --git a/reactos/w32api/include/oleacc.h b/reactos/w32api/include/oleacc.h index c1a2825a167..af5d813ac13 100644 --- a/reactos/w32api/include/oleacc.h +++ b/reactos/w32api/include/oleacc.h @@ -132,7 +132,7 @@ extern "C" { #define STATE_SYSTEM_ALERT_HIGH 0x10000000 #define STATE_SYSTEM_VALID 0x1fffffff -typedef enum tagSELFLAG +typedef enum tagSELFLAG { SELFLAG_NONE = 0, SELFLAG_TAKEFOCUS = 1, @@ -140,7 +140,7 @@ typedef enum tagSELFLAG SELFLAG_EXTENDSELECTION = 4, SELFLAG_ADDSELECTION = 8, SELFLAG_REMOVESELECTION = 16 -} SELFLAG; +} SELFLAG; #define SELFLAG_VALID 0x0000001F diff --git a/reactos/w32api/include/olectl.h b/reactos/w32api/include/olectl.h index f0b86bc321f..c6c95e78c29 100644 --- a/reactos/w32api/include/olectl.h +++ b/reactos/w32api/include/olectl.h @@ -134,8 +134,8 @@ extern "C" { #define OCM_VSCROLL (OCM__BASE+WM_VSCROLL) #define OCM_PARENTNOTIFY (OCM__BASE+WM_PARENTNOTIFY) #define OCM_NOTIFY (OCM__BASE+WM_NOTIFY) -#define CTRLINFO_EATS_RETURN 1 -#define CTRLINFO_EATS_ESCAPE 2 +#define CTRLINFO_EATS_RETURN 1 +#define CTRLINFO_EATS_ESCAPE 2 #define XFORMCOORDS_POSITION 1 #define XFORMCOORDS_SIZE 2 #define XFORMCOORDS_HIMETRICTOCONTAINER 4 @@ -320,4 +320,4 @@ STDAPI OleTranslateColor(OLE_COLOR,HPALETTE,COLORREF*); #ifdef __cplusplus } #endif -#endif +#endif diff --git a/reactos/w32api/include/oledlg.h b/reactos/w32api/include/oledlg.h index 30f999e9e05..6daab959f74 100644 --- a/reactos/w32api/include/oledlg.h +++ b/reactos/w32api/include/oledlg.h @@ -39,8 +39,8 @@ extern "C" { #define IDC_IO_RESULTIMAGE 2108 #define IDC_IO_RESULTTEXT 2109 #define IDC_IO_ICONDISPLAY 2110 -#define IDC_IO_OBJECTTYPETEXT 2111 -#define IDC_IO_FILETEXT 2112 +#define IDC_IO_OBJECTTYPETEXT 2111 +#define IDC_IO_FILETEXT 2112 #define IDC_IO_FILETYPE 2113 #define IDC_IO_INSERTCONTROL 2114 #define IDC_IO_ADDCONTROL 2115 @@ -48,15 +48,15 @@ extern "C" { #define IDC_PS_PASTE 500 #define IDC_PS_PASTELINK 501 #define IDC_PS_SOURCETEXT 502 -#define IDC_PS_PASTELIST 503 -#define IDC_PS_PASTELINKLIST 504 +#define IDC_PS_PASTELIST 503 +#define IDC_PS_PASTELINKLIST 504 #define IDC_PS_DISPLAYLIST 505 #define IDC_PS_DISPLAYASICON 506 #define IDC_PS_ICONDISPLAY 507 #define IDC_PS_CHANGEICON 508 #define IDC_PS_RESULTIMAGE 509 #define IDC_PS_RESULTTEXT 510 -#define IDC_CI_GROUP 120 +#define IDC_CI_GROUP 120 #define IDC_CI_CURRENT 121 #define IDC_CI_CURRENTICON 122 #define IDC_CI_DEFAULT 123 @@ -64,7 +64,7 @@ extern "C" { #define IDC_CI_FROMFILE 125 #define IDC_CI_FROMFILEEDIT 126 #define IDC_CI_ICONLIST 127 -#define IDC_CI_LABEL 128 +#define IDC_CI_LABEL 128 #define IDC_CI_LABELEDIT 129 #define IDC_CI_BROWSE 130 #define IDC_CI_ICONDISPLAY 131 @@ -86,26 +86,26 @@ extern "C" { #define IDC_EL_LINKSOURCE 216 #define IDC_EL_LINKTYPE 217 #define IDC_EL_LINKSLISTBOX 206 -#define IDC_EL_COL1 220 -#define IDC_EL_COL2 221 -#define IDC_EL_COL3 222 +#define IDC_EL_COL1 220 +#define IDC_EL_COL2 221 +#define IDC_EL_COL3 222 #define IDC_BZ_RETRY 600 #define IDC_BZ_ICON 601 -#define IDC_BZ_MESSAGE1 602 +#define IDC_BZ_MESSAGE1 602 #define IDC_BZ_SWITCHTO 604 -#define IDC_UL_METER 1029 -#define IDC_UL_STOP 1030 -#define IDC_UL_PERCENT 1031 -#define IDC_UL_PROGRESS 1032 -#define IDC_PU_LINKS 900 -#define IDC_PU_TEXT 901 -#define IDC_PU_CONVERT 902 -#define IDC_PU_ICON 908 +#define IDC_UL_METER 1029 +#define IDC_UL_STOP 1030 +#define IDC_UL_PERCENT 1031 +#define IDC_UL_PROGRESS 1032 +#define IDC_PU_LINKS 900 +#define IDC_PU_TEXT 901 +#define IDC_PU_CONVERT 902 +#define IDC_PU_ICON 908 #define IDC_GP_OBJECTNAME 1009 #define IDC_GP_OBJECTTYPE 1010 #define IDC_GP_OBJECTSIZE 1011 #define IDC_GP_CONVERT 1013 -#define IDC_GP_OBJECTICON 1014 +#define IDC_GP_OBJECTICON 1014 #define IDC_GP_OBJECTLOCATION 1022 #define IDC_VP_PERCENT 1000 #define IDC_VP_CHANGEICON 1001 @@ -153,11 +153,11 @@ extern "C" { #define ID_BROWSE_ADDCONTROL 3 #define ID_BROWSE_CHANGESOURCE 4 #define OLEUI_FALSE 0 -#define OLEUI_SUCCESS 1 -#define OLEUI_OK 1 -#define OLEUI_CANCEL 2 +#define OLEUI_SUCCESS 1 +#define OLEUI_OK 1 +#define OLEUI_CANCEL 2 #define OLEUI_ERR_STANDARDMIN 100 -#define OLEUI_ERR_STRUCTURENULL 101 +#define OLEUI_ERR_STRUCTURENULL 101 #define OLEUI_ERR_STRUCTUREINVALID 102 #define OLEUI_ERR_CBSTRUCTINCORRECT 103 #define OLEUI_ERR_HWNDOWNERINVALID 104 @@ -166,14 +166,14 @@ extern "C" { #define OLEUI_ERR_HINSTANCEINVALID 107 #define OLEUI_ERR_LPSZTEMPLATEINVALID 108 #define OLEUI_ERR_HRESOURCEINVALID 109 -#define OLEUI_ERR_FINDTEMPLATEFAILURE 110 +#define OLEUI_ERR_FINDTEMPLATEFAILURE 110 #define OLEUI_ERR_LOADTEMPLATEFAILURE 111 #define OLEUI_ERR_DIALOGFAILURE 112 #define OLEUI_ERR_LOCALMEMALLOC 113 #define OLEUI_ERR_GLOBALMEMALLOC 114 #define OLEUI_ERR_LOADSTRING 115 #define OLEUI_ERR_OLEMEMALLOC 116 -#define OLEUI_ERR_STANDARDMAX 116 +#define OLEUI_ERR_STANDARDMAX 116 #define OPF_OBJECTISLINK 1 #define OPF_NOFILLDEFAULT 2 #define OPF_SHOWHELP 4 @@ -201,7 +201,7 @@ extern "C" { #define OLEUI_OPERR_OBJINFOINVALID (OLEUI_ERR_STANDARDMAX+20) #define OLEUI_OPERR_LINKINFOINVALID (OLEUI_ERR_STANDARDMAX+21) #define OLEUI_QUERY_GETCLASSID 65280 -#define OLEUI_QUERY_LINKBROKEN 65281 +#define OLEUI_QUERY_LINKBROKEN 65281 #define IOF_SHOWHELP 1 #define IOF_SELECTCREATENEW 2 #define IOF_SELECTCREATEFROMFILE 4 @@ -357,7 +357,7 @@ typedef enum tagOLEUIPASTEFLAG { OLEUIPASTE_LINKTYPE8=128, OLEUIPASTE_PASTE=512, OLEUIPASTE_LINKANYTYPE=1024, - OLEUIPASTE_ENABLEICON=2048 + OLEUIPASTE_ENABLEICON=2048 } OLEUIPASTEFLAG; typedef struct tagOLEUIPASTEENTRYW { FORMATETC fmtetc; @@ -932,4 +932,4 @@ STDAPI_(BOOL) OleUIUpdateLinksA(LPOLEUILINKCONTAINERA,HWND,LPSTR,int); #ifdef __cplusplus } #endif -#endif +#endif diff --git a/reactos/w32api/include/oleidl.h b/reactos/w32api/include/oleidl.h index 6b920159653..2d32f7d453f 100644 --- a/reactos/w32api/include/oleidl.h +++ b/reactos/w32api/include/oleidl.h @@ -56,7 +56,7 @@ typedef enum tagUSERCLASSTYPE { } USERCLASSTYPE; #ifdef __GNUC__ -__extension__ /* IS0 C says enums limited to range of int */ +__extension__ /* IS0 C says enums limited to range of int */ #endif typedef enum tagDROPEFFECT { DROPEFFECT_NONE=0, @@ -525,10 +525,10 @@ DECLARE_INTERFACE_(IOleCache,IUnknown) STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; STDMETHOD(Cache)(THIS_ FORMATETC*,DWORD,DWORD*) PURE; - STDMETHOD(Uncache)(THIS_ DWORD) PURE; - STDMETHOD(EnumCache)(THIS_ IEnumSTATDATA**); - STDMETHOD(InitCache)(THIS_ LPDATAOBJECT); - STDMETHOD(SetData)(THIS_ FORMATETC*,STGMEDIUM*,BOOL); + STDMETHOD(Uncache)(THIS_ DWORD) PURE; + STDMETHOD(EnumCache)(THIS_ IEnumSTATDATA**); + STDMETHOD(InitCache)(THIS_ LPDATAOBJECT); + STDMETHOD(SetData)(THIS_ FORMATETC*,STGMEDIUM*,BOOL); }; #undef INTERFACE @@ -551,11 +551,11 @@ DECLARE_INTERFACE_(IOleCache2,IOleCache) STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; STDMETHOD(Cache)(THIS_ FORMATETC*,DWORD,DWORD*) PURE; - STDMETHOD(Uncache)(THIS_ DWORD) PURE; - STDMETHOD(EnumCache)(THIS_ IEnumSTATDATA**) PURE; - STDMETHOD(InitCache)(THIS_ LPDATAOBJECT) PURE; - STDMETHOD(SetData)(THIS_ FORMATETC*,STGMEDIUM*,BOOL) PURE; - STDMETHOD(UpdateCache)(THIS_ LPDATAOBJECT,DWORD,LPVOID) PURE; + STDMETHOD(Uncache)(THIS_ DWORD) PURE; + STDMETHOD(EnumCache)(THIS_ IEnumSTATDATA**) PURE; + STDMETHOD(InitCache)(THIS_ LPDATAOBJECT) PURE; + STDMETHOD(SetData)(THIS_ FORMATETC*,STGMEDIUM*,BOOL) PURE; + STDMETHOD(UpdateCache)(THIS_ LPDATAOBJECT,DWORD,LPVOID) PURE; STDMETHOD(DiscardCache)(THIS_ DWORD) PURE; }; #undef INTERFACE diff --git a/reactos/w32api/include/powrprof.h b/reactos/w32api/include/powrprof.h index dc7d1f356f8..c5f07cd0f4c 100644 --- a/reactos/w32api/include/powrprof.h +++ b/reactos/w32api/include/powrprof.h @@ -56,8 +56,8 @@ typedef struct _MACHINE_POWER_POLICY{ } MACHINE_POWER_POLICY, *PMACHINE_POWER_POLICY; typedef struct _MACHINE_PROCESSOR_POWER_POLICY { ULONG Revision; - PROCESSOR_POWER_POLICY ProcessorPolicyAc; - PROCESSOR_POWER_POLICY ProcessorPolicyDc; + PROCESSOR_POWER_POLICY ProcessorPolicyAc; + PROCESSOR_POWER_POLICY ProcessorPolicyDc; } MACHINE_PROCESSOR_POWER_POLICY, *PMACHINE_PROCESSOR_POWER_POLICY; typedef struct _USER_POWER_POLICY{ ULONG Revision; diff --git a/reactos/w32api/include/rapi.h b/reactos/w32api/include/rapi.h index 4cf6515b488..9a7843e7ed4 100644 --- a/reactos/w32api/include/rapi.h +++ b/reactos/w32api/include/rapi.h @@ -45,10 +45,10 @@ STDAPI_(BOOL) CeCreateProcess (LPCWSTR, LPCWSTR, LPSECURITY_ATTRIBUTES, LPSECURI STDAPI CeRapiUninit (void); STDAPI_(BOOL) CeWriteFile (HANDLE, LPCVOID, DWORD, LPDWORD, LPOVERLAPPED); -STDAPI_(HANDLE) CeCreateFile (LPCWSTR, DWORD, DWORD, LPSECURITY_ATTRIBUTES, DWORD, DWORD, HANDLE); -STDAPI_(BOOL) CeCreateDirectory (LPCWSTR, LPSECURITY_ATTRIBUTES); +STDAPI_(HANDLE) CeCreateFile (LPCWSTR, DWORD, DWORD, LPSECURITY_ATTRIBUTES, DWORD, DWORD, HANDLE); +STDAPI_(BOOL) CeCreateDirectory (LPCWSTR, LPSECURITY_ATTRIBUTES); STDAPI_(DWORD) CeGetLastError (void); -STDAPI_(BOOL) CeGetFileTime (HANDLE, LPFILETIME, LPFILETIME, LPFILETIME); -STDAPI_(BOOL) CeCloseHandle (HANDLE); +STDAPI_(BOOL) CeGetFileTime (HANDLE, LPFILETIME, LPFILETIME, LPFILETIME); +STDAPI_(BOOL) CeCloseHandle (HANDLE); #endif /* _RAPI_H */ diff --git a/reactos/w32api/include/ras.h b/reactos/w32api/include/ras.h index 2799be3b703..2158d91a6f9 100644 --- a/reactos/w32api/include/ras.h +++ b/reactos/w32api/include/ras.h @@ -222,7 +222,7 @@ typedef struct tagRASCONNW { DWORD dwSize; HRASCONN hrasconn; WCHAR szEntryName[RAS_MaxEntryName + 1]; -#if (WINVER >= 0x400) +#if (WINVER >= 0x400) WCHAR szDeviceType[RAS_MaxDeviceType + 1]; WCHAR szDeviceName[RAS_MaxDeviceName + 1]; #endif @@ -244,7 +244,7 @@ typedef struct tagRASCONNA { DWORD dwSize; HRASCONN hrasconn; CHAR szEntryName[RAS_MaxEntryName + 1]; -#if (WINVER >= 0x400) +#if (WINVER >= 0x400) CHAR szDeviceType[RAS_MaxDeviceType + 1]; CHAR szDeviceName[RAS_MaxDeviceName + 1]; #endif @@ -705,7 +705,7 @@ typedef RASDIALPARAMSW RASDIALPARAMS, *LPRASDIALPARAMS; typedef RASAMBW RASAMB, *LPRASAM; typedef RASPPPNBFW RASPPPNBF, *LPRASPPPNBF; typedef RASPPPIPXW RASPPPIPX, *LPRASPPPIPX; -typedef RASPPPIPW RASPPPIP, *LPRASPPPIP; +typedef RASPPPIPW RASPPPIP, *LPRASPPPIP; typedef RASPPPLCPW RASPPPLCP, *LPRASPPPLCP; typedef RASSLIPW RASSLIP, *LPRASSLIP; typedef RASDEVINFOW RASDEVINFO, *LPRASDEVINFO; @@ -963,4 +963,4 @@ VOID APIENTRY RasFreeEapUserIdentityA (LPRASEAPUSERIDENTITYA); } #endif #include -#endif /* _RAS_H */ +#endif /* _RAS_H */ diff --git a/reactos/w32api/include/rasdlg.h b/reactos/w32api/include/rasdlg.h index b0f4c141703..7127f1bac00 100644 --- a/reactos/w32api/include/rasdlg.h +++ b/reactos/w32api/include/rasdlg.h @@ -13,7 +13,7 @@ extern "C" { #define RASPBDEVENT_EditGlobals 5 #define RASPBDEVENT_NoUser 6 #define RASPBDEVENT_NoUserEdit 7 - + #define RASPBDFLAG_PositionDlg 1 #define RASPBDFLAG_ForceCloseOnDial 2 #define RASPBDFLAG_NoUser 16 diff --git a/reactos/w32api/include/richedit.h b/reactos/w32api/include/richedit.h index 42744bae02d..6d135a55ecf 100644 --- a/reactos/w32api/include/richedit.h +++ b/reactos/w32api/include/richedit.h @@ -9,7 +9,7 @@ extern "C" { #endif #pragma pack(push,4) -#ifdef UNICODE +#ifdef UNICODE #define RICHEDIT_CLASS L"RichEdit20W" #else #define RICHEDIT_CLASS "RichEdit20A" diff --git a/reactos/w32api/include/secext.h b/reactos/w32api/include/secext.h index 1919f4fefe5..82fb277011f 100644 --- a/reactos/w32api/include/secext.h +++ b/reactos/w32api/include/secext.h @@ -6,17 +6,17 @@ #ifndef RC_INVOKED #if (_WIN32_WINNT >= 0x0500) -typedef enum +typedef enum { - NameUnknown = 0, - NameFullyQualifiedDN = 1, - NameSamCompatible = 2, - NameDisplay = 3, - NameUniqueId = 6, - NameCanonical = 7, - NameUserPrincipal = 8, - NameCanonicalEx = 9, - NameServicePrincipal = 10, + NameUnknown = 0, + NameFullyQualifiedDN = 1, + NameSamCompatible = 2, + NameDisplay = 3, + NameUniqueId = 6, + NameCanonical = 7, + NameUserPrincipal = 8, + NameCanonicalEx = 9, + NameServicePrincipal = 10, NameDnsDomain = 12 } EXTENDED_NAME_FORMAT, *PEXTENDED_NAME_FORMAT; diff --git a/reactos/w32api/include/setupapi.h b/reactos/w32api/include/setupapi.h index 90e0cf7adc2..575245ebdc6 100644 --- a/reactos/w32api/include/setupapi.h +++ b/reactos/w32api/include/setupapi.h @@ -1336,7 +1336,7 @@ WINSETUPAPI BOOL WINAPI SetupTerminateFileLog(HSPFILELOG); #define SetupDiOpenInterfaceDeviceA SetupDiOpenDeviceInterfaceA #define SetupDiGetInterfaceDeviceDetailA SetupDiGetDeviceInterfaceDetailA -#ifdef UNICODE +#ifdef UNICODE #define PSP_FILE_CALLBACK PSP_FILE_CALLBACK_W #define SetupAddInstallSectionToDiskSpaceList SetupAddInstallSectionToDiskSpaceListW #define SetupAddSectionToDiskSpaceList SetupAddSectionToDiskSpaceListW @@ -1455,7 +1455,7 @@ WINSETUPAPI BOOL WINAPI SetupTerminateFileLog(HSPFILELOG); #define SetupSetFileQueueAlternatePlatform SetupSetFileQueueAlternatePlatformW #define SetupSetPlatformPathOverride SetupSetPlatformPathOverrideW #define SetupSetSourceList SetupSetSourceListW -#else +#else #define PSP_FILE_CALLBACK PSP_FILE_CALLBACK_A #define SetupAddInstallSectionToDiskSpaceList SetupAddInstallSectionToDiskSpaceListA #define SetupAddSectionToDiskSpaceList SetupAddSectionToDiskSpaceListA @@ -1575,7 +1575,7 @@ WINSETUPAPI BOOL WINAPI SetupTerminateFileLog(HSPFILELOG); #define SetupSetFileQueueAlternatePlatform SetupSetFileQueueAlternatePlatformA #define SetupSetPlatformPathOverride SetupSetPlatformPathOverrideA #define SetupSetSourceList SetupSetSourceListA -#endif /* UNICODE */ +#endif /* UNICODE */ #endif /* RC_INVOKED */ diff --git a/reactos/w32api/include/shlobj.h b/reactos/w32api/include/shlobj.h index 6af4cb12ff2..55c74769f6b 100644 --- a/reactos/w32api/include/shlobj.h +++ b/reactos/w32api/include/shlobj.h @@ -759,7 +759,7 @@ typedef enum RESTRICTIONS REST_ALLOWUNHASHEDWEBVIEW, REST_ALLOWLEGACYWEBVIEW, REST_REVERTWEBVIEWSECURITY, - + REST_INHERITCONSOLEHANDLES = 0x40000086, REST_NODISCONNECT = 0x41000001, @@ -1715,7 +1715,7 @@ HRESULT WINAPI SHLoadInProc(REFCLSID); #if (_WIN32_IE >= 0x0400) BOOL WINAPI SHGetSpecialFolderPathA(HWND,LPSTR,int,BOOL); BOOL WINAPI SHGetSpecialFolderPathW(HWND,LPWSTR,int,BOOL); -#endif +#endif /* SHGetFolderPath in shfolder.dll on W9x, NT4, also in shell32.dll on W2K */ HRESULT WINAPI SHGetFolderPathA(HWND,int,HANDLE,DWORD,LPSTR); HRESULT WINAPI SHGetFolderPathW(HWND,int,HANDLE,DWORD,LPWSTR); @@ -1772,7 +1772,7 @@ typedef BROWSEINFOW BROWSEINFO,*PBROWSEINFO,*LPBROWSEINFO; #if (_WIN32_IE >= 0x0400) #define SHGetSpecialFolderPath SHGetSpecialFolderPathW #endif -#define SHGetFolderPath SHGetFolderPathW +#define SHGetFolderPath SHGetFolderPathW #if (_WIN32_WINNT >= 0x0500) #define SHCreateDirectoryEx SHCreateDirectoryExW #endif diff --git a/reactos/w32api/include/shlwapi.h b/reactos/w32api/include/shlwapi.h index 98a3517fffa..8d867329e50 100644 --- a/reactos/w32api/include/shlwapi.h +++ b/reactos/w32api/include/shlwapi.h @@ -477,7 +477,7 @@ WINSHLWAPI HRESULT WINAPI AssocQueryStringA(ASSOCF,ASSOCSTR,LPCSTR,LPCSTR,LPSTR, WINSHLWAPI HRESULT WINAPI AssocQueryStringByKeyA(ASSOCF,ASSOCSTR,HKEY,LPCSTR,LPSTR,DWORD*); WINSHLWAPI HRESULT WINAPI AssocQueryStringByKeyW(ASSOCF,ASSOCSTR,HKEY,LPCWSTR,LPWSTR,DWORD*); WINSHLWAPI HRESULT WINAPI AssocQueryStringW(ASSOCF,ASSOCSTR,LPCWSTR,LPCWSTR,LPWSTR,DWORD*); - + WINSHLWAPI HRESULT WINAPI UrlApplySchemeA(LPCSTR,LPSTR,LPDWORD,DWORD); WINSHLWAPI HRESULT WINAPI UrlApplySchemeW(LPCWSTR,LPWSTR,LPDWORD,DWORD); WINSHLWAPI HRESULT WINAPI UrlCanonicalizeA(LPCSTR,LPSTR,LPDWORD,DWORD); @@ -544,7 +544,7 @@ WINSHLWAPI HRESULT WINAPI HashData(LPBYTE,DWORD,LPBYTE,DWORD); WINSHLWAPI HPALETTE WINAPI SHCreateShellPalette(HDC); WINSHLWAPI COLORREF WINAPI ColorHLSToRGB(WORD,WORD,WORD); WINSHLWAPI COLORREF WINAPI ColorAdjustLuma(COLORREF,int,BOOL); -WINSHLWAPI void WINAPI ColorRGBToHLS(COLORREF,WORD*,WORD*,WORD*); +WINSHLWAPI void WINAPI ColorRGBToHLS(COLORREF,WORD*,WORD*,WORD*); WINSHLWAPI int __cdecl wnsprintfA(LPSTR,int,LPCSTR,...); WINSHLWAPI int __cdecl wnsprintfW(LPWSTR,int,LPCWSTR,...); WINSHLWAPI int WINAPI wvnsprintfA(LPSTR,int,LPCSTR,va_list); diff --git a/reactos/w32api/include/shtypes.h b/reactos/w32api/include/shtypes.h index 427fa3ffca3..51c1d858862 100644 --- a/reactos/w32api/include/shtypes.h +++ b/reactos/w32api/include/shtypes.h @@ -28,7 +28,7 @@ typedef struct _STRRET { } STRRET,*LPSTRRET; typedef struct _SHELLDETAILS { - int fmt; + int fmt; int cxChar; STRRET str; } SHELLDETAILS, *LPSHELLDETAILS; diff --git a/reactos/w32api/include/snmp.h b/reactos/w32api/include/snmp.h index f35a2be0818..9d24ebcff43 100644 --- a/reactos/w32api/include/snmp.h +++ b/reactos/w32api/include/snmp.h @@ -50,7 +50,7 @@ extern "C" { #define SNMP_PDU_GETBULK (ASN_CONTEXT | ASN_CONSTRUCTOR | 4) #define SNMP_PDU_V1TRAP (ASN_CONTEXT | ASN_CONSTRUCTOR | 4) #define SNMP_PDU_INFORM (ASN_CONTEXT | ASN_CONSTRUCTOR | 6) -#define SNMP_PDU_TRAP (ASN_CONTEXT | ASN_CONSTRUCTOR | 7) +#define SNMP_PDU_TRAP (ASN_CONTEXT | ASN_CONSTRUCTOR | 7) #define SNMP_PDU_REPORT (ASN_CONTEXT | ASN_CONSTRUCTOR | 8) #endif /* _SNMP_ASN_DEFINED */ #define ASN_INTEGER (ASN_UNIVERSAL | ASN_PRIMITIVE | 2) @@ -119,7 +119,7 @@ extern "C" { #define SNMP_LOG_VERBOSE 5 #define SNMP_OUTPUT_TO_CONSOLE 1 #define SNMP_OUTPUT_TO_LOGFILE 2 -#define SNMP_OUTPUT_TO_EVENTLOG 4 +#define SNMP_OUTPUT_TO_EVENTLOG 4 #define SNMP_OUTPUT_TO_DEBUGGER 8 #define SNMP_MAX_OID_LEN 128 #define SNMP_MEM_ALLOC_ERROR 1 @@ -156,18 +156,18 @@ typedef struct { typedef struct { BYTE asnType; union { - AsnInteger32 number; - AsnUnsigned32 unsigned32; - AsnCounter64 counter64; - AsnOctetString string; - AsnBits bits; - AsnObjectIdentifier object; - AsnSequence sequence; - AsnIPAddress address; - AsnCounter32 counter; - AsnGauge32 gauge; - AsnTimeticks ticks; - AsnOpaque arbitrary; + AsnInteger32 number; + AsnUnsigned32 unsigned32; + AsnCounter64 counter64; + AsnOctetString string; + AsnBits bits; + AsnObjectIdentifier object; + AsnSequence sequence; + AsnIPAddress address; + AsnCounter32 counter; + AsnGauge32 gauge; + AsnTimeticks ticks; + AsnOpaque arbitrary; } asnValue; } AsnAny, AsnObjectSyntax; typedef struct { diff --git a/reactos/w32api/include/sql.h b/reactos/w32api/include/sql.h index 2f0391b759f..496164d2e0c 100644 --- a/reactos/w32api/include/sql.h +++ b/reactos/w32api/include/sql.h @@ -198,8 +198,8 @@ extern "C" { #define SQL_OJ_NOT_ORDERED 16 #define SQL_OJ_INNER 32 #define SQL_OJ_ALL_COMPARISON_OPS 64 -#endif /* ODBCVER >= 0x0201 */ -#if (ODBCVER >= 0x0300) +#endif /* ODBCVER >= 0x0201 */ +#if (ODBCVER >= 0x0300) #define SQL_AM_CONNECTION 1 #define SQL_AM_NONE 0 #define SQL_AM_STATEMENT 2 @@ -354,7 +354,7 @@ SQLRETURN SQL_API SQLExecute(SQLHSTMT); SQLRETURN SQL_API SQLFetch(SQLHSTMT); SQLRETURN SQL_API SQLFreeConnect(SQLHDBC); /* deprecated */ SQLRETURN SQL_API SQLFreeEnv(SQLHENV); /* deprecated */ -SQLRETURN SQL_API SQLFreeStmt(SQLHSTMT,SQLUSMALLINT); +SQLRETURN SQL_API SQLFreeStmt(SQLHSTMT,SQLUSMALLINT); SQLRETURN SQL_API SQLGetCursorName(SQLHSTMT,SQLCHAR*,SQLSMALLINT,SQLSMALLINT*); SQLRETURN SQL_API SQLNumResultCols(SQLHSTMT,SQLSMALLINT*); SQLRETURN SQL_API SQLPrepare(SQLHSTMT,SQLCHAR*,SQLINTEGER); @@ -380,24 +380,24 @@ SQLRETURN SQL_API SQLDataSources(SQLHENV,SQLUSMALLINT,SQLCHAR*,SQLSMALLINT,SQLSM #if (ODBCVER >= 0x0300) SQLRETURN SQL_API SQLAllocHandle(SQLSMALLINT,SQLHANDLE,SQLHANDLE*); SQLRETURN SQL_API SQLBindParam(SQLHSTMT,SQLUSMALLINT,SQLSMALLINT,SQLSMALLINT,SQLULEN,SQLSMALLINT,SQLPOINTER,SQLLEN*); -SQLRETURN SQL_API SQLCloseCursor(SQLHSTMT); +SQLRETURN SQL_API SQLCloseCursor(SQLHSTMT); SQLRETURN SQL_API SQLColAttribute(SQLHSTMT,SQLUSMALLINT,SQLUSMALLINT,SQLPOINTER,SQLSMALLINT,SQLSMALLINT*,SQLPOINTER); SQLRETURN SQL_API SQLCopyDesc(SQLHDESC,SQLHDESC); SQLRETURN SQL_API SQLEndTran(SQLSMALLINT,SQLHANDLE,SQLSMALLINT); SQLRETURN SQL_API SQLFetchScroll(SQLHSTMT,SQLSMALLINT,SQLROWOFFSET); SQLRETURN SQL_API SQLFreeHandle(SQLSMALLINT,SQLHANDLE); SQLRETURN SQL_API SQLGetConnectAttr(SQLHDBC,SQLINTEGER,SQLPOINTER,SQLINTEGER,SQLINTEGER*); -SQLRETURN SQL_API SQLGetDescField(SQLHDESC,SQLSMALLINT,SQLSMALLINT,SQLPOINTER,SQLINTEGER,SQLINTEGER*); +SQLRETURN SQL_API SQLGetDescField(SQLHDESC,SQLSMALLINT,SQLSMALLINT,SQLPOINTER,SQLINTEGER,SQLINTEGER*); SQLRETURN SQL_API SQLGetDescRec(SQLHDESC,SQLSMALLINT,SQLCHAR*,SQLSMALLINT,SQLSMALLINT*, - SQLSMALLINT*,SQLSMALLINT*,SQLLEN*,SQLSMALLINT*,SQLSMALLINT*,SQLSMALLINT*); -SQLRETURN SQL_API SQLGetDiagField(SQLSMALLINT,SQLHANDLE,SQLSMALLINT,SQLSMALLINT,SQLPOINTER,SQLSMALLINT,SQLSMALLINT*); -SQLRETURN SQL_API SQLGetDiagRec(SQLSMALLINT,SQLHANDLE,SQLSMALLINT,SQLCHAR*,SQLINTEGER*,SQLCHAR*,SQLSMALLINT,SQLSMALLINT*); + SQLSMALLINT*,SQLSMALLINT*,SQLLEN*,SQLSMALLINT*,SQLSMALLINT*,SQLSMALLINT*); +SQLRETURN SQL_API SQLGetDiagField(SQLSMALLINT,SQLHANDLE,SQLSMALLINT,SQLSMALLINT,SQLPOINTER,SQLSMALLINT,SQLSMALLINT*); +SQLRETURN SQL_API SQLGetDiagRec(SQLSMALLINT,SQLHANDLE,SQLSMALLINT,SQLCHAR*,SQLINTEGER*,SQLCHAR*,SQLSMALLINT,SQLSMALLINT*); SQLRETURN SQL_API SQLGetEnvAttr(SQLHENV,SQLINTEGER,SQLPOINTER,SQLINTEGER,SQLINTEGER*); SQLRETURN SQL_API SQLGetStmtAttr(SQLHSTMT,SQLINTEGER,SQLPOINTER,SQLINTEGER,SQLINTEGER*); SQLRETURN SQL_API SQLSetConnectAttr(SQLHDBC,SQLINTEGER,SQLPOINTER,SQLINTEGER); -SQLRETURN SQL_API SQLSetDescField(SQLHDESC,SQLSMALLINT,SQLSMALLINT,SQLPOINTER,SQLINTEGER); +SQLRETURN SQL_API SQLSetDescField(SQLHDESC,SQLSMALLINT,SQLSMALLINT,SQLPOINTER,SQLINTEGER); SQLRETURN SQL_API SQLSetDescRec(SQLHDESC,SQLSMALLINT,SQLSMALLINT,SQLSMALLINT,SQLLEN,SQLSMALLINT, - SQLSMALLINT,SQLPOINTER,SQLLEN*,SQLLEN*); + SQLSMALLINT,SQLPOINTER,SQLLEN*,SQLLEN*); SQLRETURN SQL_API SQLSetEnvAttr(SQLHENV,SQLINTEGER,SQLPOINTER,SQLINTEGER); SQLRETURN SQL_API SQLSetStmtAttr(SQLHSTMT,SQLINTEGER,SQLPOINTER,SQLINTEGER); #endif /* (ODBCVER >= 0x0300) */ diff --git a/reactos/w32api/include/sqlext.h b/reactos/w32api/include/sqlext.h index 884260781de..800bcadf454 100644 --- a/reactos/w32api/include/sqlext.h +++ b/reactos/w32api/include/sqlext.h @@ -437,12 +437,12 @@ extern "C" { #define SQL_SC_NON_UNIQUE 0UL #define SQL_SC_TRY_UNIQUE 1UL #define SQL_SC_UNIQUE 2UL -#define SQL_SCCO_OPT_TIMESTAMP SQL_SCCO_OPT_ROWVER /* deprecated */ -#define SQL_SCROLL_DYNAMIC (-2L) /* deprecated */ -#define SQL_SCROLL_FORWARD_ONLY 0L /* deprecated */ -#define SQL_SCROLL_KEYSET_DRIVEN (-1L) /* deprecated */ +#define SQL_SCCO_OPT_TIMESTAMP SQL_SCCO_OPT_ROWVER /* deprecated */ +#define SQL_SCROLL_DYNAMIC (-2L) /* deprecated */ +#define SQL_SCROLL_FORWARD_ONLY 0L /* deprecated */ +#define SQL_SCROLL_KEYSET_DRIVEN (-1L) /* deprecated */ #define SQL_SCROLL_OPTIONS 44 -#define SQL_SCROLL_STATIC (-3L) /* deprecated */ +#define SQL_SCROLL_STATIC (-3L) /* deprecated */ #define SQL_SEARCHABLE 3 #define SQL_SET_NULL 2 #define SQL_SETPARAM_VALUE_MAX (-1L) @@ -489,7 +489,7 @@ extern "C" { #define SQL_UNION 96 #define SQL_UNSEARCHABLE 0 #define SQL_UNSIGNED_OFFSET (-22) -#define SQL_UPDATE 2 +#define SQL_UPDATE 2 #define SQL_USE_BOOKMARKS 12 #define SQL_VARBINARY (-3) #define SQL_POSITION_TO(s,r) SQLSetPos(s,r,SQL_POSITION,SQL_LOCK_NO_CHANGE) @@ -526,7 +526,7 @@ extern "C" { #define SQL_INTERVAL_HOUR_TO_MINUTE (-90) #define SQL_INTERVAL_HOUR_TO_SECOND (-91) #define SQL_INTERVAL_MINUTE_TO_SECOND (-92) -#else +#else #define SQL_NO_DATA_FOUND SQL_NO_DATA #define SQL_CODE_YEAR 1 #define SQL_CODE_MONTH 2 @@ -547,7 +547,7 @@ extern "C" { #define SQL_INTERVAL_HOUR (100 + SQL_CODE_DAY_TO_MINUTE) #define SQL_INTERVAL_MINUTE (100 + SQL_CODE_DAY_TO_SECOND) #define SQL_INTERVAL_SECOND (100 + SQL_CODE_HOUR_TO_MINUTE) -#define SQL_INTERVAL_YEAR_TO_MONTH (100 + SQL_CODE_HOUR_TO_SECOND) +#define SQL_INTERVAL_YEAR_TO_MONTH (100 + SQL_CODE_HOUR_TO_SECOND) #define SQL_INTERVAL_DAY_TO_HOUR (100 + SQL_CODE_MINUTE_TO_SECOND) #define SQL_INTERVAL_DAY_TO_MINUTE (100 + SQL_CODE_DAY_TO_MINUTE) #define SQL_INTERVAL_DAY_TO_SECOND (100 + SQL_CODE_DAY_TO_SECOND) @@ -568,8 +568,8 @@ extern "C" { #define SQL_UNICODE_CHAR SQL_WCHAR #endif -#if (ODBCVER >= 0x0201) && (ODBCVER < 0x0300) -#define SQL_OJ_CAPABILITIES 65003 +#if (ODBCVER >= 0x0201) && (ODBCVER < 0x0300) +#define SQL_OJ_CAPABILITIES 65003 #endif /* ODBCVER < 0x0300 */ #if (ODBCVER >= 0x0250) @@ -901,7 +901,7 @@ extern "C" { #define SQL_EXT_API_START 40 #define SQL_FETCH_BY_BOOKMARK 7 #define SQL_FETCH_FIRST_SYSTEM 32 -#define SQL_FETCH_FIRST_USER 31 +#define SQL_FETCH_FIRST_USER 31 #define SQL_FN_CVT_CAST 0x00000002L #define SQL_FN_STR_BIT_LENGTH 0x00080000L #define SQL_FN_STR_CHAR_LENGTH 0x00100000L diff --git a/reactos/w32api/include/sqlucode.h b/reactos/w32api/include/sqlucode.h index 688ced2c7a8..8c4feacdac6 100644 --- a/reactos/w32api/include/sqlucode.h +++ b/reactos/w32api/include/sqlucode.h @@ -17,12 +17,12 @@ extern "C" { #define SQL_C_TCHAR SQL_C_WCHAR #else #define SQL_C_TCHAR SQL_C_CHAR -#endif +#endif #ifndef RC_INVOKED SQLRETURN SQL_API SQLBrowseConnectA(SQLHDBC,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT,SQLSMALLINT*); SQLRETURN SQL_API SQLBrowseConnectW(SQLHDBC,SQLWCHAR*,SQLSMALLINT,SQLWCHAR*,SQLSMALLINT,SQLSMALLINT*); -SQLRETURN SQL_API SQLColAttributeA(SQLHSTMT,SQLSMALLINT,SQLSMALLINT,SQLPOINTER,SQLSMALLINT,SQLSMALLINT*,SQLPOINTER); -SQLRETURN SQL_API SQLColAttributeW(SQLHSTMT,SQLUSMALLINT,SQLUSMALLINT,SQLPOINTER,SQLSMALLINT,SQLSMALLINT*,SQLPOINTER); +SQLRETURN SQL_API SQLColAttributeA(SQLHSTMT,SQLSMALLINT,SQLSMALLINT,SQLPOINTER,SQLSMALLINT,SQLSMALLINT*,SQLPOINTER); +SQLRETURN SQL_API SQLColAttributeW(SQLHSTMT,SQLUSMALLINT,SQLUSMALLINT,SQLPOINTER,SQLSMALLINT,SQLSMALLINT*,SQLPOINTER); SQLRETURN SQL_API SQLColAttributesA(SQLHSTMT,SQLUSMALLINT,SQLUSMALLINT,SQLPOINTER,SQLSMALLINT,SQLSMALLINT*,SQLLEN*); SQLRETURN SQL_API SQLColAttributesW(SQLHSTMT,SQLUSMALLINT,SQLUSMALLINT,SQLPOINTER,SQLSMALLINT,SQLSMALLINT*,SQLLEN*); SQLRETURN SQL_API SQLColumnPrivilegesA( SQLHSTMT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT ,SQLCHAR*,SQLSMALLINT ); @@ -96,7 +96,7 @@ SQLRETURN SQL_API SQLSetStmtAttrA(SQLHSTMT,SQLINTEGER,SQLPOINTER,SQLINTEGER); SQLRETURN SQL_API SQLSetStmtAttrW(SQLHSTMT,SQLINTEGER,SQLPOINTER,SQLINTEGER); #endif /* (ODBCVER >= 0x0300) */ -#if defined (UNICODE) && !defined (SQL_NOUNICODEMAP) +#if defined (UNICODE) && !defined (SQL_NOUNICODEMAP) #define SQLBrowseConnect SQLBrowseConnectW #define SQLColAttribute SQLColAttributeW #define SQLColAttributes SQLColAttributesW diff --git a/reactos/w32api/include/sspi.h b/reactos/w32api/include/sspi.h index 7f63e1ca7be..c1c5502a5b4 100644 --- a/reactos/w32api/include/sspi.h +++ b/reactos/w32api/include/sspi.h @@ -180,7 +180,7 @@ typedef SECURITY_STATUS (WINAPI *QUERY_SECURITY_PACKAGE_INFO_FN_W)(SEC_WCHAR*,PS typedef SECURITY_STATUS (WINAPI *ENCRYPT_MESSAGE_FN)(PCtxtHandle,ULONG,PSecBufferDesc,ULONG); typedef SECURITY_STATUS (WINAPI *DECRYPT_MESSAGE_FN)(PCtxtHandle,PSecBufferDesc,ULONG,PULONG); -/* No, it really is FreeCredentialsHandle, see the thread beginning +/* No, it really is FreeCredentialsHandle, see the thread beginning * http://sourceforge.net/mailarchive/message.php?msg_id=4321080 for a * discovery discussion. */ typedef struct _SECURITY_FUNCTION_TABLEW { diff --git a/reactos/w32api/include/subauth.h b/reactos/w32api/include/subauth.h index 2c87f288fd2..112b62f039a 100644 --- a/reactos/w32api/include/subauth.h +++ b/reactos/w32api/include/subauth.h @@ -9,7 +9,7 @@ extern "C" { #endif #ifndef NT_SUCCESS #define NT_SUCCESS(x) ((x)>=0) -#define STATUS_SUCCESS 0 +#define STATUS_SUCCESS 0 #endif #define CYPHER_BLOCK_LENGTH 8 #define USER_SESSION_KEY_LENGTH (CYPHER_BLOCK_LENGTH*2) @@ -82,7 +82,7 @@ typedef struct _STRING { PCHAR Buffer; } STRING, *PSTRING; #endif -typedef PVOID SAM_HANDLE, *PSAM_HANDLE; +typedef PVOID SAM_HANDLE, *PSAM_HANDLE; typedef struct _OLD_LARGE_INTEGER { ULONG LowPart; LONG HighPart; diff --git a/reactos/w32api/include/tlhelp32.h b/reactos/w32api/include/tlhelp32.h index e92838006c0..99540d4665f 100644 --- a/reactos/w32api/include/tlhelp32.h +++ b/reactos/w32api/include/tlhelp32.h @@ -3,7 +3,7 @@ Written by Mumit Khan - This file is part of a free library for the Win32 API. + This file is part of a free library for the Win32 API. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -89,7 +89,7 @@ typedef struct tagMODULEENTRY32W { DWORD ProccntUsage; BYTE *modBaseAddr; DWORD modBaseSize; - HMODULE hModule; + HMODULE hModule; WCHAR szModule[MAX_MODULE_NAME32 + 1]; WCHAR szExePath[MAX_PATH]; } MODULEENTRY32W,*PMODULEENTRY32W,*LPMODULEENTRY32W; diff --git a/reactos/w32api/include/uxtheme.h b/reactos/w32api/include/uxtheme.h index 8014bfb7586..9dc278a5421 100644 --- a/reactos/w32api/include/uxtheme.h +++ b/reactos/w32api/include/uxtheme.h @@ -23,7 +23,7 @@ extern "C" { #define STAP_ALLOW_NONCLIENT 0x00000001 #define STAP_ALLOW_CONTROLS 0x00000002 #define STAP_ALLOW_WEBCONTENT 0x00000004 -#define HTTB_BACKGROUNDSEG 0x0000 +#define HTTB_BACKGROUNDSEG 0x0000 #define HTTB_FIXEDBORDER 0x0002 #define HTTB_CAPTION 0x0004 #define HTTB_RESIZINGBORDER_LEFT 0x0010 diff --git a/reactos/w32api/include/vfw.h b/reactos/w32api/include/vfw.h index b151c713ab5..76fff0de5c9 100644 --- a/reactos/w32api/include/vfw.h +++ b/reactos/w32api/include/vfw.h @@ -668,7 +668,7 @@ DECLARE_INTERFACE_(IAVIStreaming, IUnknown) STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE; STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; - STDMETHOD(Begin)(THIS_ LONG,LONG,LONG) PURE; + STDMETHOD(Begin)(THIS_ LONG,LONG,LONG) PURE; STDMETHOD(End)(THIS) PURE; }; #undef INTERFACE @@ -997,7 +997,7 @@ ICSetStatusProc(HIC hic,DWORD dwFlags,LRESULT lParam,LONG (CALLBACK *fpfnStatus) ic.Status = fpfnStatus; return ICSendMessage(hic,ICM_SET_STATUS_PROC,(DWORD)&ic,sizeof(ic)); } -static __inline LRESULT +static __inline LRESULT ICDecompressEx(HIC hic,DWORD dwFlags,LPBITMAPINFOHEADER lpbiSrc,LPVOID lpSrc,INT xSrc,INT ySrc,INT dxSrc,INT dySrc,LPBITMAPINFOHEADER lpbiDst,LPVOID lpDst,INT xDst,INT yDst,INT dxDst,INT dyDst) { ICDECOMPRESSEX ic; diff --git a/reactos/w32api/include/winbase.h b/reactos/w32api/include/winbase.h index ddeab7e1824..0ffe27de823 100644 --- a/reactos/w32api/include/winbase.h +++ b/reactos/w32api/include/winbase.h @@ -1005,14 +1005,14 @@ typedef enum { #endif /* (_WIN32_WINNT >= 0x0501) */ #if (_WIN32_WINNT >= 0x0500) typedef enum _COMPUTER_NAME_FORMAT { - ComputerNameNetBIOS, - ComputerNameDnsHostname, - ComputerNameDnsDomain, - ComputerNameDnsFullyQualified, - ComputerNamePhysicalNetBIOS, - ComputerNamePhysicalDnsHostname, - ComputerNamePhysicalDnsDomain, - ComputerNamePhysicalDnsFullyQualified, + ComputerNameNetBIOS, + ComputerNameDnsHostname, + ComputerNameDnsDomain, + ComputerNameDnsFullyQualified, + ComputerNamePhysicalNetBIOS, + ComputerNamePhysicalDnsHostname, + ComputerNamePhysicalDnsDomain, + ComputerNamePhysicalDnsFullyQualified, ComputerNameMax } COMPUTER_NAME_FORMAT; #endif /* (_WIN32_WINNT >= 0x0500) */ @@ -1036,7 +1036,7 @@ typedef PTOP_LEVEL_EXCEPTION_FILTER LPTOP_LEVEL_EXCEPTION_FILTER; typedef void(APIENTRY *PAPCFUNC)(DWORD); typedef void(CALLBACK *PTIMERAPCROUTINE)(PVOID,DWORD,DWORD); #if (_WIN32_WINNT >= 0x0500) -typedef void(CALLBACK *WAITORTIMERCALLBACK)(PVOID,BOOLEAN); +typedef void(CALLBACK *WAITORTIMERCALLBACK)(PVOID,BOOLEAN); #endif #define MAKEINTATOM(i) (LPTSTR)((DWORD)((WORD)(i))) /* Functions */ @@ -1550,7 +1550,7 @@ BOOL WINAPI GlobalMemoryStatusEx(LPMEMORYSTATUSEX); HGLOBAL WINAPI GlobalReAlloc(HGLOBAL,DWORD,UINT); DWORD WINAPI GlobalSize(HGLOBAL); VOID WINAPI GlobalUnfix(HGLOBAL); /* Obsolete: Has no effect. */ -BOOL WINAPI GlobalUnlock(HGLOBAL); +BOOL WINAPI GlobalUnlock(HGLOBAL); BOOL WINAPI GlobalUnWire(HGLOBAL); /* Obsolete: Has no effect. */ PVOID WINAPI GlobalWire(HGLOBAL); /* Obsolete: Has no effect. */ #define HasOverlappedIoCompleted(lpOverlapped) ((lpOverlapped)->Internal != STATUS_PENDING) diff --git a/reactos/w32api/include/wincon.h b/reactos/w32api/include/wincon.h index 6c92f09ce04..09fa0e97c0f 100644 --- a/reactos/w32api/include/wincon.h +++ b/reactos/w32api/include/wincon.h @@ -94,7 +94,7 @@ typedef struct _KEY_EVENT_RECORD { CHAR AsciiChar; } uChar; DWORD dwControlKeyState; -} +} #ifdef __GNUC__ /* gcc's alignment is not what win32 expects */ PACKED diff --git a/reactos/w32api/include/windef.h b/reactos/w32api/include/windef.h index ffc09debf9b..0fc53b6f5ac 100644 --- a/reactos/w32api/include/windef.h +++ b/reactos/w32api/include/windef.h @@ -151,7 +151,7 @@ extern "C" { #ifdef __GNUC__ #ifndef NONAMELESSUNION -#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) +#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) #define _ANONYMOUS_UNION __extension__ #define _ANONYMOUS_STRUCT __extension__ #else diff --git a/reactos/w32api/include/windns.h b/reactos/w32api/include/windns.h index 3eb8f245b5b..43f7907b6b4 100644 --- a/reactos/w32api/include/windns.h +++ b/reactos/w32api/include/windns.h @@ -55,52 +55,52 @@ enum { }; typedef enum _DNS_CHARSET { - DnsCharSetUnknown, - DnsCharSetUnicode, - DnsCharSetUtf8, + DnsCharSetUnknown, + DnsCharSetUnicode, + DnsCharSetUtf8, DnsCharSetAnsi } DNS_CHARSET; -typedef enum +typedef enum { - DnsConfigPrimaryDomainName_W, - DnsConfigPrimaryDomainName_A, - DnsConfigPrimaryDomainName_UTF8, - DnsConfigAdapterDomainName_W, - DnsConfigAdapterDomainName_A, - DnsConfigAdapterDomainName_UTF8, - DnsConfigDnsServerList, - DnsConfigSearchList, - DnsConfigAdapterInfo, - DnsConfigPrimaryHostNameRegistrationEnabled, - DnsConfigAdapterHostNameRegistrationEnabled, - DnsConfigAddressRegistrationMaxCount, - DnsConfigHostName_W, - DnsConfigHostName_A, - DnsConfigHostName_UTF8, - DnsConfigFullHostName_W, - DnsConfigFullHostName_A, + DnsConfigPrimaryDomainName_W, + DnsConfigPrimaryDomainName_A, + DnsConfigPrimaryDomainName_UTF8, + DnsConfigAdapterDomainName_W, + DnsConfigAdapterDomainName_A, + DnsConfigAdapterDomainName_UTF8, + DnsConfigDnsServerList, + DnsConfigSearchList, + DnsConfigAdapterInfo, + DnsConfigPrimaryHostNameRegistrationEnabled, + DnsConfigAdapterHostNameRegistrationEnabled, + DnsConfigAddressRegistrationMaxCount, + DnsConfigHostName_W, + DnsConfigHostName_A, + DnsConfigHostName_UTF8, + DnsConfigFullHostName_W, + DnsConfigFullHostName_A, DnsConfigFullHostName_UTF8 } DNS_CONFIG_TYPE; -typedef enum +typedef enum { - DnsFreeFlat = 0, - DnsFreeRecordList, + DnsFreeFlat = 0, + DnsFreeRecordList, DnsFreeParsedMessageFields } DNS_FREE_TYPE; typedef enum _DNS_NAME_FORMAT { - DnsNameDomain, - DnsNameDomainLabel, - DnsNameHostnameFull, - DnsNameHostnameLabel, - DnsNameWildcard, + DnsNameDomain, + DnsNameDomainLabel, + DnsNameHostnameFull, + DnsNameHostnameLabel, + DnsNameWildcard, DnsNameSrvRecord } DNS_NAME_FORMAT; -typedef enum +typedef enum { - DnsSectionQuestion, - DnsSectionAnswer, - DnsSectionAuthority, + DnsSectionQuestion, + DnsSectionAnswer, + DnsSectionAuthority, DnsSectionAdditional } DNS_SECTION; typedef struct _IP4_ARRAY { diff --git a/reactos/w32api/include/winfax.h b/reactos/w32api/include/winfax.h index 96722d6f6be..034612bea08 100644 --- a/reactos/w32api/include/winfax.h +++ b/reactos/w32api/include/winfax.h @@ -163,7 +163,7 @@ typedef struct _FAX_COVERAGE_INFOA LPCSTR CoverPageName; BOOL UseServerCoverPage; - + LPCSTR RecName; LPCSTR RecFaxNumber; LPCSTR RecCompany; @@ -177,7 +177,7 @@ typedef struct _FAX_COVERAGE_INFOA LPCSTR RecOfficeLocation; LPCSTR RecHomePhone; LPCSTR RecOfficePhone; - + LPCSTR SdrName; LPCSTR SdrFaxNumber; LPCSTR SdrCompany; @@ -187,7 +187,7 @@ typedef struct _FAX_COVERAGE_INFOA LPCSTR SdrOfficeLocation; LPCSTR SdrHomePhone; LPCSTR SdrOfficePhone; - + LPCSTR Node; LPCSTR Subject; SYSTEMTIME TimeSent; diff --git a/reactos/w32api/include/wingdi.h b/reactos/w32api/include/wingdi.h index bf25f1f19bc..8ae6ad60357 100644 --- a/reactos/w32api/include/wingdi.h +++ b/reactos/w32api/include/wingdi.h @@ -1344,45 +1344,45 @@ typedef struct tagCOLORADJUSTMENT { SHORT caColorfulness; SHORT caRedGreenTint; } COLORADJUSTMENT,*LPCOLORADJUSTMENT; -typedef struct _devicemodeA { - BYTE dmDeviceName[CCHDEVICENAME]; - WORD dmSpecVersion; - WORD dmDriverVersion; - WORD dmSize; - WORD dmDriverExtra; - DWORD dmFields; +typedef struct _devicemodeA { + BYTE dmDeviceName[CCHDEVICENAME]; + WORD dmSpecVersion; + WORD dmDriverVersion; + WORD dmSize; + WORD dmDriverExtra; + DWORD dmFields; _ANONYMOUS_UNION union { _ANONYMOUS_STRUCT struct { short dmOrientation; short dmPaperSize; short dmPaperLength; short dmPaperWidth; - short dmScale; - short dmCopies; - short dmDefaultSource; - short dmPrintQuality; + short dmScale; + short dmCopies; + short dmDefaultSource; + short dmPrintQuality; } DUMMYSTRUCTNAME; POINTL dmPosition; DWORD dmDisplayOrientation; DWORD dmDisplayFixedOutput; } DUMMYUNIONNAME; - short dmColor; - short dmDuplex; - short dmYResolution; - short dmTTOption; - short dmCollate; - BYTE dmFormName[CCHFORMNAME]; - WORD dmLogPixels; - DWORD dmBitsPerPel; - DWORD dmPelsWidth; - DWORD dmPelsHeight; + short dmColor; + short dmDuplex; + short dmYResolution; + short dmTTOption; + short dmCollate; + BYTE dmFormName[CCHFORMNAME]; + WORD dmLogPixels; + DWORD dmBitsPerPel; + DWORD dmPelsWidth; + DWORD dmPelsHeight; _ANONYMOUS_UNION union { - DWORD dmDisplayFlags; + DWORD dmDisplayFlags; DWORD dmNup; } DUMMYUNIONNAME2; - DWORD dmDisplayFrequency; -#if(WINVER >= 0x0400) + DWORD dmDisplayFrequency; +#if(WINVER >= 0x0400) DWORD dmICMMethod; DWORD dmICMIntent; DWORD dmMediaType; @@ -1395,45 +1395,45 @@ typedef struct _devicemodeA { #endif #endif /* WINVER >= 0x0400 */ } DEVMODEA,*LPDEVMODEA,*PDEVMODEA; -typedef struct _devicemodeW { - WCHAR dmDeviceName[CCHDEVICENAME]; - WORD dmSpecVersion; - WORD dmDriverVersion; - WORD dmSize; - WORD dmDriverExtra; - DWORD dmFields; +typedef struct _devicemodeW { + WCHAR dmDeviceName[CCHDEVICENAME]; + WORD dmSpecVersion; + WORD dmDriverVersion; + WORD dmSize; + WORD dmDriverExtra; + DWORD dmFields; _ANONYMOUS_UNION union { _ANONYMOUS_STRUCT struct { short dmOrientation; short dmPaperSize; short dmPaperLength; short dmPaperWidth; - short dmScale; - short dmCopies; - short dmDefaultSource; - short dmPrintQuality; + short dmScale; + short dmCopies; + short dmDefaultSource; + short dmPrintQuality; } DUMMYSTRUCTNAME; POINTL dmPosition; DWORD dmDisplayOrientation; DWORD dmDisplayFixedOutput; } DUMMYUNIONNAME; - short dmColor; - short dmDuplex; - short dmYResolution; - short dmTTOption; - short dmCollate; - WCHAR dmFormName[CCHFORMNAME]; - WORD dmLogPixels; - DWORD dmBitsPerPel; - DWORD dmPelsWidth; - DWORD dmPelsHeight; + short dmColor; + short dmDuplex; + short dmYResolution; + short dmTTOption; + short dmCollate; + WCHAR dmFormName[CCHFORMNAME]; + WORD dmLogPixels; + DWORD dmBitsPerPel; + DWORD dmPelsWidth; + DWORD dmPelsHeight; _ANONYMOUS_UNION union { - DWORD dmDisplayFlags; + DWORD dmDisplayFlags; DWORD dmNup; } DUMMYUNIONNAME2; - DWORD dmDisplayFrequency; -#if(WINVER >= 0x0400) + DWORD dmDisplayFrequency; +#if(WINVER >= 0x0400) DWORD dmICMMethod; DWORD dmICMIntent; DWORD dmMediaType; @@ -2457,8 +2457,8 @@ typedef struct _BLENDFUNCTION { BYTE BlendOp; BYTE BlendFlags; BYTE SourceConstantAlpha; - BYTE AlphaFormat; -} BLENDFUNCTION,*PBLENDFUNCTION,*LPBLENDFUNCTION; + BYTE AlphaFormat; +} BLENDFUNCTION,*PBLENDFUNCTION,*LPBLENDFUNCTION; #define MM_MAX_NUMAXES 16 typedef struct _DESIGNVECTOR { DWORD dvReserved; diff --git a/reactos/w32api/include/winioctl.h b/reactos/w32api/include/winioctl.h index ca3c4820790..2ade0b24bfe 100644 --- a/reactos/w32api/include/winioctl.h +++ b/reactos/w32api/include/winioctl.h @@ -210,8 +210,8 @@ typedef struct _BIN_RESULTS { BIN_COUNT BinCounts[1]; } BIN_RESULTS,*PBIN_RESULTS; typedef enum _PARTITION_STYLE { - PARTITION_STYLE_MBR, - PARTITION_STYLE_GPT, + PARTITION_STYLE_MBR, + PARTITION_STYLE_GPT, PARTITION_STYLE_RAW } PARTITION_STYLE; typedef struct { diff --git a/reactos/w32api/include/winldap.h b/reactos/w32api/include/winldap.h index 36b86268d2c..fbbc890a85b 100644 --- a/reactos/w32api/include/winldap.h +++ b/reactos/w32api/include/winldap.h @@ -93,7 +93,7 @@ extern "C" { #define LDAP_UNWILLING_TO_PERFORM 0x35 #define LDAP_LOOP_DETECT 0x36 #define LDAP_NAMING_VIOLATION 0x40 -#define LDAP_OBJECT_CLASS_VIOLATION 0x41 +#define LDAP_OBJECT_CLASS_VIOLATION 0x41 #define LDAP_NOT_ALLOWED_ON_NONLEAF 0x42 #define LDAP_NOT_ALLOWED_ON_RDN 0x43 #define LDAP_ALREADY_EXISTS 0x44 @@ -702,7 +702,7 @@ WINLDAPAPI INT LdapUTF8ToUnicode(LPCSTR,int,LPWSTR,int); #define ldap_rename_s ldap_rename_ext_sA #define ldap_rename_ext ldap_rename_extA #define ldap_rename_ext_s ldap_rename_ext_sA -#endif +#endif #ifdef __cplusplus } diff --git a/reactos/w32api/include/winnls.h b/reactos/w32api/include/winnls.h index a4b4b26c392..c092f083692 100644 --- a/reactos/w32api/include/winnls.h +++ b/reactos/w32api/include/winnls.h @@ -422,7 +422,7 @@ extern "C" { #endif /* (WINVER >= 0x0500) */ #ifndef _BASETSD_H typedef long LONG_PTR; -#endif +#endif #ifndef RC_INVOKED typedef DWORD LCTYPE; @@ -517,11 +517,11 @@ typedef struct _currencyfmtW { UINT PositiveOrder; LPWSTR lpCurrencySymbol; } CURRENCYFMTW,*LPCURRENCYFMTW; -typedef struct nlsversioninfo { - DWORD dwNLSVersionInfoSize; - DWORD dwNLSVersion; - DWORD dwDefinedVersion; -} NLSVERSIONINFO,*LPNLSVERSIONINFO; +typedef struct nlsversioninfo { + DWORD dwNLSVersionInfoSize; + DWORD dwNLSVersion; + DWORD dwDefinedVersion; +} NLSVERSIONINFO,*LPNLSVERSIONINFO; typedef struct _numberfmtA { UINT NumDigits; UINT LeadingZero; diff --git a/reactos/w32api/include/winnt.h b/reactos/w32api/include/winnt.h index d5038b0766c..1d637647b7b 100644 --- a/reactos/w32api/include/winnt.h +++ b/reactos/w32api/include/winnt.h @@ -113,7 +113,7 @@ typedef const TCHAR *LPCTSTR; * The corresponding macros _TEXT() and _T() for mapping _UNICODE strings * passed to C runtime functions are defined in mingw/tchar.h */ -#define TEXT(q) __TEXT(q) +#define TEXT(q) __TEXT(q) typedef SHORT *PSHORT; typedef LONG *PLONG; #ifdef STRICT @@ -232,7 +232,7 @@ typedef DWORD FLONG; #define FILE_SHARE_WRITE 0x00000002 #define FILE_SHARE_DELETE 0x00000004 #define FILE_SHARE_VALID_FLAGS 0x00000007 - + #define FILE_ATTRIBUTE_READONLY 0x00000001 #define FILE_ATTRIBUTE_HIDDEN 0x00000002 #define FILE_ATTRIBUTE_SYSTEM 0x00000004 @@ -249,15 +249,15 @@ typedef DWORD FLONG; #define FILE_ATTRIBUTE_ENCRYPTED 0x00004000 #define FILE_ATTRIBUTE_VALID_FLAGS 0x00007fb7 #define FILE_ATTRIBUTE_VALID_SET_FLAGS 0x000031a7 - + #define FILE_COPY_STRUCTURED_STORAGE 0x00000041 #define FILE_STRUCTURED_STORAGE 0x00000441 - + #define FILE_VALID_OPTION_FLAGS 0x00ffffff #define FILE_VALID_PIPE_OPTION_FLAGS 0x00000032 #define FILE_VALID_MAILSLOT_OPTION_FLAGS 0x00000032 #define FILE_VALID_SET_FLAGS 0x00000036 - + #define FILE_SUPERSEDE 0x00000000 #define FILE_OPEN 0x00000001 #define FILE_CREATE 0x00000002 @@ -265,7 +265,7 @@ typedef DWORD FLONG; #define FILE_OVERWRITE 0x00000004 #define FILE_OVERWRITE_IF 0x00000005 #define FILE_MAXIMUM_DISPOSITION 0x00000005 - + #define FILE_DIRECTORY_FILE 0x00000001 #define FILE_WRITE_THROUGH 0x00000002 #define FILE_SEQUENTIAL_ONLY 0x00000004 @@ -1287,14 +1287,14 @@ typedef DWORD FLONG; #define VER_SUITE_DATACENTER 128 #define VER_SUITE_PERSONAL 512 #define VER_SUITE_BLADE 1024 -#define WT_EXECUTEDEFAULT 0x00000000 -#define WT_EXECUTEINIOTHREAD 0x00000001 -#define WT_EXECUTEINWAITTHREAD 0x00000004 -#define WT_EXECUTEONLYONCE 0x00000008 -#define WT_EXECUTELONGFUNCTION 0x00000010 -#define WT_EXECUTEINTIMERTHREAD 0x00000020 -#define WT_EXECUTEINPERSISTENTTHREAD 0x00000080 -#define WT_TRANSFER_IMPERSONATION 0x00000100 +#define WT_EXECUTEDEFAULT 0x00000000 +#define WT_EXECUTEINIOTHREAD 0x00000001 +#define WT_EXECUTEINWAITTHREAD 0x00000004 +#define WT_EXECUTEONLYONCE 0x00000008 +#define WT_EXECUTELONGFUNCTION 0x00000010 +#define WT_EXECUTEINTIMERTHREAD 0x00000020 +#define WT_EXECUTEINPERSISTENTTHREAD 0x00000080 +#define WT_TRANSFER_IMPERSONATION 0x00000100 #if (_WIN32_WINNT >= 0x0501) #define ACTIVATION_CONTEXT_SECTION_ASSEMBLY_INFORMATION 1 #define ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION 2 @@ -1914,18 +1914,18 @@ typedef struct _CONTEXT { typedef struct _CONTEXT { /* The flags values within this flag control the contents of a CONTEXT record. - + If the context record is used as an input parameter, then for each portion of the context record controlled by a flag whose value is set, it is assumed that that portion of the context record contains valid context. If the context record is being used to modify a thread's context, then only that portion of the threads context will be modified. - + If the context record is used as an IN OUT parameter to capture the context of a thread, then only those portions of the thread's context corresponding to set flags will be returned. - + The context record is never used as an OUT only parameter. */ ULONG ContextFlags; @@ -2997,7 +2997,7 @@ typedef struct _JOBOBJECT_JOBSET_INFORMATION { DWORD MemberLevel; } JOBOBJECT_JOBSET_INFORMATION,*PJOBOBJECT_JOBSET_INFORMATION; -/* Fixme: Making these defines conditional on WINVER will break ddk includes */ +/* Fixme: Making these defines conditional on WINVER will break ddk includes */ #if 1 /* (WINVER >= 0x0500) */ #include @@ -3358,7 +3358,7 @@ extern PVOID GetFiberData(void); "mov eax, [eax]" \ value [eax] \ modify [eax]; - + #endif /* __GNUC__ */ #endif /* RC_INVOKED */ diff --git a/reactos/w32api/include/winperf.h b/reactos/w32api/include/winperf.h index 75e29a8ec72..5afeb070b3e 100644 --- a/reactos/w32api/include/winperf.h +++ b/reactos/w32api/include/winperf.h @@ -9,7 +9,7 @@ extern "C" { #endif #define PERF_DATA_VERSION 1 #define PERF_DATA_REVISION 1 -#define PERF_NO_INSTANCES -1 +#define PERF_NO_INSTANCES -1 #define PERF_SIZE_DWORD 0 #define PERF_SIZE_LARGE 256 #define PERF_SIZE_ZERO 512 @@ -61,9 +61,9 @@ extern "C" { #define PERF_SAMPLE_COUNTER (PERF_SIZE_DWORD|PERF_TYPE_COUNTER|PERF_COUNTER_RATE|PERF_TIMER_TICK|PERF_DELTA_COUNTER|PERF_DISPLAY_NO_SUFFIX) #define PERF_COUNTER_NODATA (PERF_SIZE_ZERO|PERF_DISPLAY_NOSHOW) #define PERF_COUNTER_TIMER_INV (PERF_SIZE_LARGE|PERF_TYPE_COUNTER|PERF_COUNTER_RATE|PERF_TIMER_TICK|PERF_DELTA_COUNTER|PERF_INVERSE_COUNTER|PERF_DISPLAY_PERCENT) -#define PERF_SAMPLE_BASE (PERF_SIZE_DWORD|PERF_TYPE_COUNTER|PERF_COUNTER_BASE|PERF_DISPLAY_NOSHOW|1) +#define PERF_SAMPLE_BASE (PERF_SIZE_DWORD|PERF_TYPE_COUNTER|PERF_COUNTER_BASE|PERF_DISPLAY_NOSHOW|1) #define PERF_AVERAGE_TIMER (PERF_SIZE_DWORD|PERF_TYPE_COUNTER|PERF_COUNTER_FRACTION|PERF_DISPLAY_SECONDS) -#define PERF_AVERAGE_BASE (PERF_SIZE_DWORD|PERF_TYPE_COUNTER|PERF_COUNTER_BASE|PERF_DISPLAY_NOSHOW|2) +#define PERF_AVERAGE_BASE (PERF_SIZE_DWORD|PERF_TYPE_COUNTER|PERF_COUNTER_BASE|PERF_DISPLAY_NOSHOW|2) #define PERF_AVERAGE_BULK (PERF_SIZE_LARGE|PERF_TYPE_COUNTER|PERF_COUNTER_FRACTION|PERF_DISPLAY_NOSHOW) #define PERF_100NSEC_TIMER (PERF_SIZE_LARGE|PERF_TYPE_COUNTER|PERF_COUNTER_RATE|PERF_TIMER_100NS|PERF_DELTA_COUNTER|PERF_DISPLAY_PERCENT) #define PERF_100NSEC_TIMER_INV (PERF_SIZE_LARGE|PERF_TYPE_COUNTER|PERF_COUNTER_RATE|PERF_TIMER_100NS|PERF_DELTA_COUNTER|PERF_INVERSE_COUNTER|PERF_DISPLAY_PERCENT) @@ -136,4 +136,4 @@ typedef DWORD(CALLBACK PM_CLOSE_PROC)(void); #ifdef __cplusplus } #endif -#endif +#endif diff --git a/reactos/w32api/include/winsnmp.h b/reactos/w32api/include/winsnmp.h index bfed3864c19..62ae68073b3 100644 --- a/reactos/w32api/include/winsnmp.h +++ b/reactos/w32api/include/winsnmp.h @@ -59,7 +59,7 @@ extern "C" { #define SNMP_PDU_GETBULK (ASN_CONTEXT | ASN_CONSTRUCTOR | 4) #define SNMP_PDU_V1TRAP (ASN_CONTEXT | ASN_CONSTRUCTOR | 4) #define SNMP_PDU_INFORM (ASN_CONTEXT | ASN_CONSTRUCTOR | 6) -#define SNMP_PDU_TRAP (ASN_CONTEXT | ASN_CONSTRUCTOR | 7) +#define SNMP_PDU_TRAP (ASN_CONTEXT | ASN_CONSTRUCTOR | 7) #define SNMP_PDU_REPORT (ASN_CONTEXT | ASN_CONSTRUCTOR | 8) #endif /* _SNMP_ASN_DEFINED */ #define SNMP_SYNTAX_SEQUENCE (ASN_UNIVERSAL | ASN_CONSTRUCTOR | 0x10) @@ -197,12 +197,12 @@ typedef const smiLPOCTETS smiLPCOCTETS; typedef struct { smiUINT32 len; smiLPUINT32 ptr; -} smiOID, *smiLPOID; +} smiOID, *smiLPOID; typedef const smiLPOID smiLPCOID; typedef struct { smiUINT32 hipart; smiUINT32 lopart; -} smiCNTR64, *smiLPCNTR64; +} smiCNTR64, *smiLPCNTR64; typedef struct { smiUINT32 syntax; union { @@ -213,15 +213,15 @@ typedef struct { smiOID oid; smiBYTE empty; } value; -} smiVALUE, *smiLPVALUE; +} smiVALUE, *smiLPVALUE; typedef const smiLPVALUE smiLPCVALUE; typedef struct { CHAR vendorName[MAXVENDORINFO*2]; CHAR vendorContact[MAXVENDORINFO*2]; CHAR vendorVersionId[MAXVENDORINFO]; CHAR vendorVersionDate[MAXVENDORINFO]; - smiUINT32 vendorEnterprise; -} smiVENDORINFO, FAR *smiLPVENDORINFO; + smiUINT32 vendorEnterprise; +} smiVENDORINFO, FAR *smiLPVENDORINFO; typedef SNMPAPI_STATUS (CALLBACK *SNMPAPI_CALLBACK)(HSNMP_SESSION,HWND,UINT,WPARAM,LPARAM,LPVOID); typedef struct { diff --git a/reactos/w32api/include/winsock.h b/reactos/w32api/include/winsock.h index 36eb713e496..c9d5ff2dc8f 100644 --- a/reactos/w32api/include/winsock.h +++ b/reactos/w32api/include/winsock.h @@ -1,7 +1,7 @@ /* Definitions for winsock 1.1 - + Portions Copyright (c) 1980, 1983, 1988, 1993 The Regents of the University of California. All rights reserved. @@ -79,7 +79,7 @@ for (__i = 0; __i < ((fd_set *)(set))->fd_count ; __i++) {\ #endif #elif !defined(USE_SYS_TYPES_FD_SET) #warning "fd_set and associated macros have been defined in sys/types. \ - This can cause runtime problems with W32 sockets" + This can cause runtime problems with W32 sockets" #endif /* ndef _SYS_TYPES_FD_SET */ #if !(defined (__INSIDE_CYGWIN__) || defined (__INSIDE_MSYS__)) @@ -264,7 +264,7 @@ typedef WSADATA *LPWSADATA; * Note that the next 5 IP defines are specific to WinSock 1.1 (wsock32.dll). * They will cause errors or unexpected results if used with the * (gs)etsockopts exported from the WinSock 2 lib, ws2_32.dll. Refer ws2tcpip.h. - */ + */ #define IP_MULTICAST_IF 2 #define IP_MULTICAST_TTL 3 #define IP_MULTICAST_LOOP 4 @@ -527,7 +527,7 @@ typedef struct timeval *LPTIMEVAL; * When linking against the WinSock 1.1 lib, wsock32.dll, the mswsock functions * are automatically routed to mswsock.dll (on platforms with support). * The WinSock 2 lib, ws2_32.dll, does not contain any references to - * the mswsock extensions. + * the mswsock extensions. */ #include diff --git a/reactos/w32api/include/winsock2.h b/reactos/w32api/include/winsock2.h index 3cae8a93587..a23000b0608 100644 --- a/reactos/w32api/include/winsock2.h +++ b/reactos/w32api/include/winsock2.h @@ -3,7 +3,7 @@ Definitions for winsock 2 Initially taken from the Wine project. - + Portions Copyright (c) 1980, 1983, 1988, 1993 The Regents of the University of California. All rights reserved. @@ -45,7 +45,7 @@ typedef u_int SOCKET; #ifndef _SYS_TYPES_FD_SET /* fd_set may be defined by the newlib - * if __USE_W32_SOCKETS not defined. + * if __USE_W32_SOCKETS not defined. */ #ifdef fd_set #undef fd_set @@ -93,7 +93,7 @@ if (__i == ((fd_set *)(set))->fd_count) {\ #endif #elif !defined (USE_SYS_TYPES_FD_SET) #warning "fd_set and associated macros have been defined in sys/types. \ - This may cause runtime problems with W32 sockets" + This may cause runtime problems with W32 sockets" #endif /* ndef _SYS_TYPES_FD_SET */ #if !(defined (__INSIDE_CYGWIN__) || (__INSIDE_MSYS__)) #ifndef _TIMEVAL_DEFINED /* also in sys/time.h */ @@ -321,7 +321,7 @@ typedef WSADATA *LPWSADATA; #define AF_CLUSTER 24 #define AF_12844 25 #define AF_IRDA 26 -#define AF_NETDES 28 +#define AF_NETDES 28 #if !(defined (__INSIDE_CYGWIN__) || defined (__INSIDE_MSYS__)) #define AF_MAX 29 struct sockaddr { @@ -382,7 +382,7 @@ struct sockproto { #define MAXGETHOSTSTRUCT 1024 #define FD_READ_BIT 0 -#define FD_READ (1 << FD_READ_BIT) +#define FD_READ (1 << FD_READ_BIT) #define FD_WRITE_BIT 1 #define FD_WRITE (1 << FD_WRITE_BIT) #define FD_OOB_BIT 2 @@ -414,7 +414,7 @@ struct sockproto { #define WSAEINVAL (WSABASEERR+22) #define WSAEMFILE (WSABASEERR+24) #define WSAEWOULDBLOCK (WSABASEERR+35) -#define WSAEINPROGRESS (WSABASEERR+36) /* deprecated on WinSock2 */ +#define WSAEINPROGRESS (WSABASEERR+36) /* deprecated on WinSock2 */ #define WSAEALREADY (WSABASEERR+37) #define WSAENOTSOCK (WSABASEERR+38) #define WSAEDESTADDRREQ (WSABASEERR+39) @@ -471,7 +471,7 @@ struct sockproto { #define WSA_E_NO_MORE (WSABASEERR+110) #define WSA_E_CANCELLED (WSABASEERR+111) #define WSAEREFUSED (WSABASEERR+112) - + /* WS QualityofService errors */ #define WSA_QOS_RECEIVERS (WSABASEERR + 1005) #define WSA_QOS_SENDERS (WSABASEERR + 1006) diff --git a/reactos/w32api/include/winuser.h b/reactos/w32api/include/winuser.h index 0329313029f..7c6ee862588 100644 --- a/reactos/w32api/include/winuser.h +++ b/reactos/w32api/include/winuser.h @@ -1162,7 +1162,7 @@ extern "C" { #define SPI_GETSOUNDSENTRY 64 #define SPI_GETSTICKYKEYS 58 #define SPI_GETTOGGLEKEYS 52 -#define SPI_GETWHEELSCROLLLINES 104 +#define SPI_GETWHEELSCROLLLINES 104 #define SPI_GETWINDOWSEXTENSION 92 #define SPI_GETWORKAREA 48 #define SPI_ICONHORIZONTALSPACING 13 @@ -2276,10 +2276,10 @@ extern "C" { #define GA_ROOT 2 #define GA_ROOTOWNER 3 #if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0410) -#define MONITOR_DEFAULTTONULL 0 -#define MONITOR_DEFAULTTOPRIMARY 1 -#define MONITOR_DEFAULTTONEAREST 2 -#define MONITORINFOF_PRIMARY 1 +#define MONITOR_DEFAULTTONULL 0 +#define MONITOR_DEFAULTTOPRIMARY 1 +#define MONITOR_DEFAULTTONEAREST 2 +#define MONITORINFOF_PRIMARY 1 #define EDS_RAWMODE 0x00000002 #define ISMEX_NOSEND 0x00000000 #define ISMEX_CALLBACK 0x00000004 @@ -2954,7 +2954,7 @@ typedef struct tagHELPWININFOW { int wMax; WCHAR rgchMember[2]; } HELPWININFOW,*PHELPWININFOW,*LPHELPWININFOW; -typedef struct tagSTYLESTRUCT { +typedef struct tagSTYLESTRUCT { DWORD styleOld; DWORD styleNew; } STYLESTRUCT,*LPSTYLESTRUCT; diff --git a/reactos/w32api/include/ws2spi.h b/reactos/w32api/include/ws2spi.h index 49b7c4afc93..dc317de1466 100644 --- a/reactos/w32api/include/ws2spi.h +++ b/reactos/w32api/include/ws2spi.h @@ -175,7 +175,7 @@ typedef struct _NSP_ROUTINE { LPNSPINSTALLSERVICECLASS NSPInstallServiceClass; LPNSPREMOVESERVICECLASS NSPRemoveServiceClass; LPNSPGETSERVICECLASSINFO NSPGetServiceClassInfo; -} NSP_ROUTINE, *PNSP_ROUTINE, *LPNSP_ROUTINE; +} NSP_ROUTINE, *PNSP_ROUTINE, *LPNSP_ROUTINE; INT WSPAPI NSPStartup(LPGUID,LPNSP_ROUTINE); diff --git a/reactos/w32api/include/ws2tcpip.h b/reactos/w32api/include/ws2tcpip.h index ac66fb0be6e..259237f92cd 100644 --- a/reactos/w32api/include/ws2tcpip.h +++ b/reactos/w32api/include/ws2tcpip.h @@ -21,7 +21,7 @@ extern "C" { #endif -/* +/* * The IP_* macros are also defined in winsock.h, but some values are different there. * The values defined in winsock.h for 1.1 and used in wsock32.dll are consistent * with the original values Steve Deering defined in his document "IP Multicast Extensions @@ -70,9 +70,9 @@ extern "C" { #define IPV6_LEAVE_GROUP IPV6_DROP_MEMBERSHIP #define IPV6_PKTINFO 19 -#define IP_DEFAULT_MULTICAST_TTL 1 -#define IP_DEFAULT_MULTICAST_LOOP 1 -#define IP_MAX_MEMBERSHIPS 20 +#define IP_DEFAULT_MULTICAST_TTL 1 +#define IP_DEFAULT_MULTICAST_LOOP 1 +#define IP_MAX_MEMBERSHIPS 20 #define TCP_EXPEDITED_1122 2 @@ -90,7 +90,7 @@ extern "C" { #define INET_ADDRSTRLEN 16 #define INET6_ADDRSTRLEN 46 -/* getnameinfo constants */ +/* getnameinfo constants */ #define NI_MAXHOST 1025 #define NI_MAXSERV 32 @@ -119,7 +119,7 @@ extern "C" { /* * ip_mreq also in winsock.h for WinSock1.1, * but online msdn docs say it is defined here for WinSock2. - */ + */ struct ip_mreq { struct in_addr imr_multiaddr; @@ -151,7 +151,7 @@ struct in_pktinfo { typedef struct in_pktinfo IN_PKTINFO; -/* ipv6 */ +/* ipv6 */ /* These require XP or .NET Server or use of add-on IPv6 stacks on NT 4 or higher */ @@ -160,7 +160,7 @@ typedef struct in_pktinfo IN_PKTINFO; is some consistency in MS docs. In this file, we only use the in6_addr structure start address, with casts to get the right offsets when testing addresses */ - + struct in6_addr { union { u_char _S6_u8[16]; @@ -171,7 +171,7 @@ struct in6_addr { /* s6_addr is the standard name */ #define s6_addr _S6_un._S6_u8 -/* These are GLIBC names */ +/* These are GLIBC names */ #define s6_addr16 _S6_un._S6_u16 #define s6_addr32 _S6_un._S6_u16 @@ -193,7 +193,7 @@ typedef struct sockaddr_in6 SOCKADDR_IN6, *PSOCKADDR_IN6, *LPSOCKADDR_IN6; extern const struct in6_addr in6addr_any; extern const struct in6_addr in6addr_loopback; -/* the above can get initialised using: */ +/* the above can get initialised using: */ #define IN6ADDR_ANY_INIT { 0 } #define IN6ADDR_LOOPBACK_INIT { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } @@ -203,11 +203,11 @@ extern const struct in6_addr in6addr_loopback; (memcmp ((void*)(a), (void*)(b), sizeof (struct in6_addr)) == 0) -/* Address Testing Macros +/* Address Testing Macros These macro functions all take const struct in6_addr* as arg. Static inlines would allow type checking, but RFC 2553 says they - macros. + macros. NB: These are written specifically for little endian host */ #define IN6_IS_ADDR_UNSPECIFIED(_addr) \ @@ -250,7 +250,7 @@ extern const struct in6_addr in6addr_loopback; #define IN6_IS_ADDR_MC_NODELOCAL(_addr) \ ( IN6_IS_ADDR_MULTICAST(_addr) \ - && ((((const u_char *)(_addr))[1] & 0xf) == 0x1)) + && ((((const u_char *)(_addr))[1] & 0xf) == 0x1)) #define IN6_IS_ADDR_MC_LINKLOCAL(_addr) \ ( IN6_IS_ADDR_MULTICAST (_addr) \