8 changes: 5 additions & 3 deletions src/core/sys/windows/commdlg.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
*/
module core.sys.windows.commdlg;
version (Windows):

version (ANSI) {} else version = Unicode;
pragma(lib, "comdlg32");

private import core.sys.windows.w32api;
Expand Down Expand Up @@ -208,7 +210,7 @@ enum : DWORD {
PD_RESULT_APPLY
}

const DWORD START_PAGE_GENERAL = 0xFFFFFFFF;
enum DWORD START_PAGE_GENERAL = 0xFFFFFFFF;
//}

enum {
Expand Down Expand Up @@ -249,7 +251,7 @@ enum : int {
CD_LBSELADD
}

const WORD DN_DEFAULTPRN = 1;
enum WORD DN_DEFAULTPRN = 1;

/+
// Both MinGW and the windows docs indicate that there are macros for the send messages
Expand Down Expand Up @@ -466,7 +468,7 @@ struct OPENFILENAMEW {
}
alias OPENFILENAMEW* LPOPENFILENAMEW;

const size_t OPENFILENAME_SIZE_VERSION_400 = 76;
enum size_t OPENFILENAME_SIZE_VERSION_400 = 76;

struct OFNOTIFYA {
NMHDR hdr;
Expand Down
2 changes: 2 additions & 0 deletions src/core/sys/windows/cpl.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
module core.sys.windows.cpl;
version (Windows):

version (ANSI) {} else version = Unicode;

private import core.sys.windows.windef, core.sys.windows.winuser;

enum : uint {
Expand Down
6 changes: 4 additions & 2 deletions src/core/sys/windows/custcntl.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,14 @@
module core.sys.windows.custcntl;
version (Windows):

version (ANSI) {} else version = Unicode;

private import core.sys.windows.windef;

// FIXME: check type
const CCF_NOTEXT = 1;
enum CCF_NOTEXT = 1;

const size_t
enum size_t
CCHCCCLASS = 32,
CCHCCDESC = 32,
CCHCCTEXT = 256;
Expand Down
6 changes: 3 additions & 3 deletions src/core/sys/windows/dbghelp.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ extern(System)
alias BOOL function(DWORD MachineType, HANDLE hProcess, HANDLE hThread, STACKFRAME64 *StackFrame, PVOID ContextRecord,
ReadProcessMemoryProc64 ReadMemoryRoutine, FunctionTableAccessProc64 FunctoinTableAccess,
GetModuleBaseProc64 GetModuleBaseRoutine, TranslateAddressProc64 TranslateAddress) StackWalk64Func;
alias BOOL function(HANDLE hProcess, DWORD64 dwAddr, PDWORD pdwDisplacement, IMAGEHLP_LINE64 *line) SymGetLineFromAddr64Func;
alias BOOL function(HANDLE hProcess, DWORD64 dwAddr, PDWORD pdwDisplacement, IMAGEHLP_LINEA64 *line) SymGetLineFromAddr64Func;
alias DWORD64 function(HANDLE hProcess, DWORD64 dwAddr) SymGetModuleBase64Func;
alias BOOL function(HANDLE hProcess, DWORD64 dwAddr, IMAGEHLP_MODULE64 *ModuleInfo) SymGetModuleInfo64Func;
alias BOOL function(HANDLE hProcess, DWORD64 Address, DWORD64 *Displacement, IMAGEHLP_SYMBOL64 *Symbol) SymGetSymFromAddr64Func;
alias BOOL function(HANDLE hProcess, DWORD64 dwAddr, IMAGEHLP_MODULEA64 *ModuleInfo) SymGetModuleInfo64Func;
alias BOOL function(HANDLE hProcess, DWORD64 Address, DWORD64 *Displacement, IMAGEHLP_SYMBOLA64 *Symbol) SymGetSymFromAddr64Func;
alias DWORD function(PCTSTR DecoratedName, PTSTR UnDecoratedName, DWORD UndecoratedLength, DWORD Flags) UnDecorateSymbolNameFunc;
alias DWORD64 function(HANDLE hProcess, HANDLE hFile, PCSTR ImageName, PCSTR ModuleName, DWORD64 BaseOfDll, DWORD SizeOfDll) SymLoadModule64Func;
alias BOOL function(HANDLE HProcess, PTSTR SearchPath, DWORD SearchPathLength) SymGetSearchPathFunc;
Expand Down
86 changes: 76 additions & 10 deletions src/core/sys/windows/dbghelp_types.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
module core.sys.windows.dbghelp_types;
version (Windows):

version (ANSI) {} else version = Unicode;

import core.sys.windows.windows;

public import core.sys.windows.winnt : TCHAR;
Expand Down Expand Up @@ -81,12 +83,20 @@ struct STACKFRAME64

public import core.sys.windows.winnt : IMAGE_FILE_MACHINE_I386, IMAGE_FILE_MACHINE_IA64, IMAGE_FILE_MACHINE_AMD64;

struct IMAGEHLP_LINE64
struct IMAGEHLP_LINEA64
{
DWORD SizeOfStruct;
PVOID Key;
DWORD LineNumber;
PCSTR FileName;
DWORD64 Address;
}
struct IMAGEHLP_LINEW64
{
DWORD SizeOfStruct;
PVOID Key;
DWORD LineNumber;
PTSTR FileName;
PWSTR FileName;
DWORD64 Address;
}

Expand All @@ -104,7 +114,7 @@ enum SYM_TYPE : int
NumSymTypes,
}

struct IMAGEHLP_MODULE64
struct IMAGEHLP_MODULEA64
{
DWORD SizeOfStruct;
DWORD64 BaseOfImage;
Expand All @@ -113,15 +123,49 @@ struct IMAGEHLP_MODULE64
DWORD CheckSum;
DWORD NumSyms;
SYM_TYPE SymType;
TCHAR[32] ModuleName;
TCHAR[256] ImageName;
TCHAR[256] LoadedImageName;
CHAR[32] ModuleName;
CHAR[256] ImageName;
CHAR[256] LoadedImageName;
// new elements: 07-Jun-2002
version (none)
{
TCHAR[256] LoadedPdbName;
CHAR[256] LoadedPdbName;
DWORD CVSig;
TCHAR[MAX_PATH*3] CVData;
CHAR[MAX_PATH*3] CVData;
DWORD PdbSig;
GUID PdbSig70;
DWORD PdbAge;
BOOL PdbUnmatched;
BOOL DbgUnmachted;
BOOL LineNumbers;
BOOL GlobalSymbols;
BOOL TypeInfo;
}
// new elements: 17-Dec-2003
version (none)
{
BOOL SourceIndexed;
BOOL Publics;
}
}
struct IMAGEHLP_MODULEW64
{
DWORD SizeOfStruct;
DWORD64 BaseOfImage;
DWORD ImageSize;
DWORD TimeDateStamp;
DWORD CheckSum;
DWORD NumSyms;
SYM_TYPE SymType;
WCHAR[32] ModuleName;
WCHAR[256] ImageName;
WCHAR[256] LoadedImageName;
// new elements: 07-Jun-2002
version (none)
{
WCHAR[256] LoadedPdbName;
DWORD CVSig;
WCHAR[MAX_PATH*3] CVData;
DWORD PdbSig;
GUID PdbSig70;
DWORD PdbAge;
Expand All @@ -139,14 +183,23 @@ struct IMAGEHLP_MODULE64
}
}

struct IMAGEHLP_SYMBOL64
struct IMAGEHLP_SYMBOLA64
{
DWORD SizeOfStruct;
DWORD64 Address;
DWORD Size;
DWORD Flags;
DWORD MaxNameLength;
TCHAR[1] Name;
CHAR[1] Name;
}
struct IMAGEHLP_SYMBOLW64
{
DWORD SizeOfStruct;
DWORD64 Address;
DWORD Size;
DWORD Flags;
DWORD MaxNameLength;
WCHAR[1] Name;
}


Expand All @@ -165,3 +218,16 @@ struct API_VERSION
USHORT Revision;
USHORT Reserved;
}

version (Unicode)
{
alias IMAGEHLP_LINEW64 IMAGEHLP_LINE64;
alias IMAGEHLP_MODULEW64 IMAGEHLP_MODULE64;
alias IMAGEHLP_SYMBOLW64 IMAGEHLP_SYMBOL64;
}
else
{
alias IMAGEHLP_LINEA64 IMAGEHLP_LINE64;
alias IMAGEHLP_MODULEA64 IMAGEHLP_MODULE64;
alias IMAGEHLP_SYMBOLA64 IMAGEHLP_SYMBOL64;
}
2 changes: 2 additions & 0 deletions src/core/sys/windows/dbt.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
module core.sys.windows.dbt;
version (Windows):

version (ANSI) {} else version = Unicode;

import core.sys.windows.w32api, core.sys.windows.windef;
import core.sys.windows.basetyps; // for GUID

Expand Down
4 changes: 3 additions & 1 deletion src/core/sys/windows/ddeml.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
*/
module core.sys.windows.ddeml;
version (Windows):

version (ANSI) {} else version = Unicode;
pragma(lib, "user32");

private import core.sys.windows.basetsd, core.sys.windows.windef, core.sys.windows.winnt;
Expand Down Expand Up @@ -135,7 +137,7 @@ enum : UINT {
#define CBR_BLOCK ((HDDEDATA)0xffffffff)
+/

const DWORD
enum DWORD
APPCLASS_STANDARD = 0,
APPCLASS_MONITOR = 0x00000001,
APPCLASS_MASK = 0x0000000F,
Expand Down
6 changes: 3 additions & 3 deletions src/core/sys/windows/dhcpcsdk.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ or WindowsVista is set");*/
//#if (_WIN32_WINNT >= 0x500)

// FIXME: check type
const DHCPCAPI_REGISTER_HANDLE_EVENT = 1;
const DHCPCAPI_REQUEST_PERSISTENT = 1;
const DHCPCAPI_REQUEST_SYNCHRONOUS = 2;
enum DHCPCAPI_REGISTER_HANDLE_EVENT = 1;
enum DHCPCAPI_REQUEST_PERSISTENT = 1;
enum DHCPCAPI_REQUEST_SYNCHRONOUS = 2;

struct DHCPCAPI_CLASSID {
ULONG Flags;
Expand Down
2 changes: 2 additions & 0 deletions src/core/sys/windows/errorrep.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
module core.sys.windows.errorrep;
version (Windows):

version (ANSI) {} else version = Unicode;

private import core.sys.windows.w32api, core.sys.windows.windef;

static assert (_WIN32_WINNT >= 0x501,
Expand Down
76 changes: 39 additions & 37 deletions src/core/sys/windows/imagehlp.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
module core.sys.windows.imagehlp;
version (Windows):

version (ANSI) {} else version = Unicode;

/* Comment from MinGW
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
Expand All @@ -20,12 +22,12 @@ private import core.sys.windows.winbase, core.sys.windows.windef;

// FIXME: check types of constants

const API_VERSION_NUMBER = 7;
enum API_VERSION_NUMBER = 7;

const BIND_NO_BOUND_IMPORTS = 1;
const BIND_NO_UPDATE = 2;
const BIND_ALL_IMAGES = 4;
const BIND_CACHE_IMPORT_DLLS = 8;
enum BIND_NO_BOUND_IMPORTS = 1;
enum BIND_NO_UPDATE = 2;
enum BIND_ALL_IMAGES = 4;
enum BIND_CACHE_IMPORT_DLLS = 8;

enum {
CBA_DEFERRED_SYMBOL_LOAD_START = 1,
Expand All @@ -35,12 +37,12 @@ enum {
CBA_DUPLICATE_SYMBOL
}

const CERT_PE_IMAGE_DIGEST_DEBUG_INFO = 1;
const CERT_PE_IMAGE_DIGEST_RESOURCES = 2;
const CERT_PE_IMAGE_DIGEST_ALL_IMPORT_INFO = 4;
const CERT_PE_IMAGE_DIGEST_NON_PE_INFO = 8;
enum CERT_PE_IMAGE_DIGEST_DEBUG_INFO = 1;
enum CERT_PE_IMAGE_DIGEST_RESOURCES = 2;
enum CERT_PE_IMAGE_DIGEST_ALL_IMPORT_INFO = 4;
enum CERT_PE_IMAGE_DIGEST_NON_PE_INFO = 8;

const CERT_SECTION_TYPE_ANY = 255;
enum CERT_SECTION_TYPE_ANY = 255;

enum {
CHECKSUM_SUCCESS = 0,
Expand All @@ -50,19 +52,19 @@ enum {
CHECKSUM_UNICODE_FAILURE
}

const IMAGE_SEPARATION = 65536;
enum IMAGE_SEPARATION = 65536;

const SPLITSYM_REMOVE_PRIVATE = 1;
const SPLITSYM_EXTRACT_ALL = 2;
const SPLITSYM_SYMBOLPATH_IS_SRC = 4;
enum SPLITSYM_REMOVE_PRIVATE = 1;
enum SPLITSYM_EXTRACT_ALL = 2;
enum SPLITSYM_SYMBOLPATH_IS_SRC = 4;

const SYMF_OMAP_GENERATED = 1;
const SYMF_OMAP_MODIFIED = 2;
enum SYMF_OMAP_GENERATED = 1;
enum SYMF_OMAP_MODIFIED = 2;

const SYMOPT_CASE_INSENSITIVE = 1;
const SYMOPT_UNDNAME = 2;
const SYMOPT_DEFERRED_LOADS = 4;
const SYMOPT_NO_CPP = 8;
enum SYMOPT_CASE_INSENSITIVE = 1;
enum SYMOPT_UNDNAME = 2;
enum SYMOPT_DEFERRED_LOADS = 4;
enum SYMOPT_NO_CPP = 8;
//const SYMOPT_LOAD_LINES = 16;
//const SYMOPT_OMAP_FIND_NEAREST = 32;
public import core.sys.windows.dbghelp_types :
Expand All @@ -71,23 +73,23 @@ public import core.sys.windows.dbghelp_types :
SYMOPT_LOAD_LINES,
SYMOPT_DEBUG;

const UNDNAME_COMPLETE = 0;
const UNDNAME_NO_LEADING_UNDERSCORES = 1;
const UNDNAME_NO_MS_KEYWORDS = 2;
const UNDNAME_NO_FUNCTION_RETURNS = 4;
const UNDNAME_NO_ALLOCATION_MODEL = 8;
const UNDNAME_NO_ALLOCATION_LANGUAGE = 16;
const UNDNAME_NO_MS_THISTYPE = 32;
const UNDNAME_NO_CV_THISTYPE = 64;
const UNDNAME_NO_THISTYPE = 96;
const UNDNAME_NO_ACCESS_SPECIFIERS = 128;
const UNDNAME_NO_THROW_SIGNATURES = 256;
const UNDNAME_NO_MEMBER_TYPE = 512;
const UNDNAME_NO_RETURN_UDT_MODEL = 1024;
const UNDNAME_32_BIT_DECODE = 2048;
const UNDNAME_NAME_ONLY = 4096;
const UNDNAME_NO_ARGUMENTS = 8192;
const UNDNAME_NO_SPECIAL_SYMS = 16384;
enum UNDNAME_COMPLETE = 0;
enum UNDNAME_NO_LEADING_UNDERSCORES = 1;
enum UNDNAME_NO_MS_KEYWORDS = 2;
enum UNDNAME_NO_FUNCTION_RETURNS = 4;
enum UNDNAME_NO_ALLOCATION_MODEL = 8;
enum UNDNAME_NO_ALLOCATION_LANGUAGE = 16;
enum UNDNAME_NO_MS_THISTYPE = 32;
enum UNDNAME_NO_CV_THISTYPE = 64;
enum UNDNAME_NO_THISTYPE = 96;
enum UNDNAME_NO_ACCESS_SPECIFIERS = 128;
enum UNDNAME_NO_THROW_SIGNATURES = 256;
enum UNDNAME_NO_MEMBER_TYPE = 512;
enum UNDNAME_NO_RETURN_UDT_MODEL = 1024;
enum UNDNAME_32_BIT_DECODE = 2048;
enum UNDNAME_NAME_ONLY = 4096;
enum UNDNAME_NO_ARGUMENTS = 8192;
enum UNDNAME_NO_SPECIAL_SYMS = 16384;

enum IMAGEHLP_STATUS_REASON {
BindOutOfMemory,
Expand Down
516 changes: 259 additions & 257 deletions src/core/sys/windows/imm.d
View file

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions src/core/sys/windows/intshcut.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
module core.sys.windows.intshcut;
version (Windows):

version (ANSI) {} else version = Unicode;

private import core.sys.windows.unknwn, core.sys.windows.windef;

enum : SCODE {
Expand Down
6 changes: 3 additions & 3 deletions src/core/sys/windows/ipexport.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ version (Windows):

private import core.sys.windows.windef;

const size_t MAX_ADAPTER_NAME = 128;
enum size_t MAX_ADAPTER_NAME = 128;

// IP STATUS flags
enum : IP_STATUS {
Expand Down Expand Up @@ -46,7 +46,7 @@ enum : IP_STATUS {
}

// IP header Flags values
const byte IP_FLAG_DF = 2;
enum byte IP_FLAG_DF = 2;

// IP Option types
enum : ubyte {
Expand All @@ -61,7 +61,7 @@ enum : ubyte {
IP_OPT_ROUTER_ALERT = 0x94
}

const ubyte MAX_OPT_SIZE = 40;
enum ubyte MAX_OPT_SIZE = 40;

alias uint IPAddr, IPMask, IP_STATUS;

Expand Down
4 changes: 2 additions & 2 deletions src/core/sys/windows/iprtrmib.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ private import core.sys.windows.windef;

// FIXME: check types of constants

const size_t
enum size_t
MAXLEN_PHYSADDR = 8,
MAXLEN_IFDESCR = 256,
MAX_INTERFACE_NAME_LEN = 256;
Expand Down Expand Up @@ -49,7 +49,7 @@ enum {
MIB_TCP_STATE_DELETE_TCB // = 12
}

const DWORD
enum DWORD
MIB_USE_CURRENT_TTL = -1,
MIB_USE_CURRENT_FORWARDING = -1,
MIB_TCP_MAXCONN_DYNAMIC = -1;
Expand Down
4 changes: 2 additions & 2 deletions src/core/sys/windows/iptypes.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ version(Tango){
}
//#include <sys/types.h>

const size_t
enum size_t
DEFAULT_MINIMUM_ENTITIES = 32,
MAX_ADAPTER_ADDRESS_LENGTH = 8,
MAX_ADAPTER_DESCRIPTION_LENGTH = 128,
Expand All @@ -30,7 +30,7 @@ const size_t
MAX_HOSTNAME_LEN = 128,
MAX_SCOPE_ID_LEN = 256;

const UINT
enum UINT
BROADCAST_NODETYPE = 1,
PEER_TO_PEER_NODETYPE = 2,
MIXED_NODETYPE = 4,
Expand Down
402 changes: 201 additions & 201 deletions src/core/sys/windows/lmaccess.d
View file

Large diffs are not rendered by default.

28 changes: 14 additions & 14 deletions src/core/sys/windows/lmalert.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,20 +23,20 @@ const TCHAR[]

//MACRO #define ALERT_VAR_DATA(p) ((PBYTE)(p)+sizeof(*p))

const PRJOB_QSTATUS = 3;
const PRJOB_DEVSTATUS = 508;
const PRJOB_COMPLETE = 4;
const PRJOB_INTERV = 8;
const PRJOB_ = 16;
const PRJOB_DESTOFFLINE = 32;
const PRJOB_DESTPAUSED = 64;
const PRJOB_NOTIFY = 128;
const PRJOB_DESTNOPAPER = 256;
const PRJOB_DELETED = 32768;
const PRJOB_QS_QUEUED = 0;
const PRJOB_QS_PAUSED = 1;
const PRJOB_QS_SPOOLING = 2;
const PRJOB_QS_PRINTING = 3;
enum PRJOB_QSTATUS = 3;
enum PRJOB_DEVSTATUS = 508;
enum PRJOB_COMPLETE = 4;
enum PRJOB_INTERV = 8;
enum PRJOB_ = 16;
enum PRJOB_DESTOFFLINE = 32;
enum PRJOB_DESTPAUSED = 64;
enum PRJOB_NOTIFY = 128;
enum PRJOB_DESTNOPAPER = 256;
enum PRJOB_DELETED = 32768;
enum PRJOB_QS_QUEUED = 0;
enum PRJOB_QS_PAUSED = 1;
enum PRJOB_QS_SPOOLING = 2;
enum PRJOB_QS_PRINTING = 3;

struct ADMIN_OTHER_INFO{
DWORD alrtad_errcode;
Expand Down
14 changes: 7 additions & 7 deletions src/core/sys/windows/lmat.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ pragma(lib, "netapi32");

private import core.sys.windows.lmcons, core.sys.windows.windef;

const JOB_RUN_PERIODICALLY = 1;
const JOB_EXEC_ERROR = 2;
const JOB_RUNS_TODAY = 4;
const JOB_ADD_CURRENT_DATE = 8;
const JOB_NONINTERACTIVE = 16;
const JOB_INPUT_FLAGS = JOB_RUN_PERIODICALLY | JOB_ADD_CURRENT_DATE
enum JOB_RUN_PERIODICALLY = 1;
enum JOB_EXEC_ERROR = 2;
enum JOB_RUNS_TODAY = 4;
enum JOB_ADD_CURRENT_DATE = 8;
enum JOB_NONINTERACTIVE = 16;
enum JOB_INPUT_FLAGS = JOB_RUN_PERIODICALLY | JOB_ADD_CURRENT_DATE
| JOB_NONINTERACTIVE;
const JOB_OUTPUT_FLAGS = JOB_RUN_PERIODICALLY | JOB_EXEC_ERROR
enum JOB_OUTPUT_FLAGS = JOB_RUN_PERIODICALLY | JOB_EXEC_ERROR
| JOB_RUNS_TODAY | JOB_NONINTERACTIVE;

struct AT_ENUM {
Expand Down
192 changes: 96 additions & 96 deletions src/core/sys/windows/lmaudit.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,82 +12,82 @@ version (Windows):

private import core.sys.windows.lmcons, core.sys.windows.windef;

const LOGFLAGS_FORWARD = 0;
const LOGFLAGS_BACKWARD = 1;
const LOGFLAGS_SEEK = 2;
enum LOGFLAGS_FORWARD = 0;
enum LOGFLAGS_BACKWARD = 1;
enum LOGFLAGS_SEEK = 2;

const ACTION_LOCKOUT = 0;
const ACTION_ADMINUNLOCK = 1;
enum ACTION_LOCKOUT = 0;
enum ACTION_ADMINUNLOCK = 1;

const AE_GUEST=0;
const AE_USER=1;
const AE_ADMIN=2;
const AE_NORMAL=0;
const AE_USERLIMIT=0;
const AE_GENERAL=0;
const AE_ERROR=1;
const AE_SESSDIS=1;
const AE_BADPW=1;
const AE_AUTODIS=2;
const AE_UNSHARE=2;
const AE_ADMINPRIVREQD=2;
const AE_ADMINDIS=3;
const AE_NOACCESSPERM=3;
const AE_ACCRESTRICT=4;
const AE_NORMAL_CLOSE=0;
const AE_SES_CLOSE=1;
const AE_ADMIN_CLOSE=2;
const AE_LIM_UNKNOWN=0;
const AE_LIM_LOGONHOURS=1;
const AE_LIM_EXPIRED=2;
const AE_LIM_INVAL_WKSTA=3;
const AE_LIM_DISABLED=4;
const AE_LIM_DELETED=5;
const AE_MOD=0;
const AE_DELETE=1;
const AE_ADD=2;
enum AE_GUEST=0;
enum AE_USER=1;
enum AE_ADMIN=2;
enum AE_NORMAL=0;
enum AE_USERLIMIT=0;
enum AE_GENERAL=0;
enum AE_ERROR=1;
enum AE_SESSDIS=1;
enum AE_BADPW=1;
enum AE_AUTODIS=2;
enum AE_UNSHARE=2;
enum AE_ADMINPRIVREQD=2;
enum AE_ADMINDIS=3;
enum AE_NOACCESSPERM=3;
enum AE_ACCRESTRICT=4;
enum AE_NORMAL_CLOSE=0;
enum AE_SES_CLOSE=1;
enum AE_ADMIN_CLOSE=2;
enum AE_LIM_UNKNOWN=0;
enum AE_LIM_LOGONHOURS=1;
enum AE_LIM_EXPIRED=2;
enum AE_LIM_INVAL_WKSTA=3;
enum AE_LIM_DISABLED=4;
enum AE_LIM_DELETED=5;
enum AE_MOD=0;
enum AE_DELETE=1;
enum AE_ADD=2;

const AE_UAS_USER = 0;
const AE_UAS_GROUP = 1;
const AE_UAS_MODALS = 2;
enum AE_UAS_USER = 0;
enum AE_UAS_GROUP = 1;
enum AE_UAS_MODALS = 2;

const SVAUD_SERVICE = 1;
const SVAUD_GOODSESSLOGON = 6;
const SVAUD_BADSESSLOGON = 24;
const SVAUD_SESSLOGON = SVAUD_GOODSESSLOGON|SVAUD_BADSESSLOGON;
const SVAUD_GOODNETLOGON = 96;
const SVAUD_BADNETLOGON = 384;
const SVAUD_NETLOGON = SVAUD_GOODNETLOGON|SVAUD_BADNETLOGON;
const SVAUD_LOGON = SVAUD_NETLOGON|SVAUD_SESSLOGON;
const SVAUD_GOODUSE = 0x600;
const SVAUD_BADUSE = 0x1800;
const SVAUD_USE = SVAUD_GOODUSE|SVAUD_BADUSE;
const SVAUD_USERLIST = 8192;
const SVAUD_PERMISSIONS = 16384;
const SVAUD_RESOURCE = 32768;
const SVAUD_LOGONLIM = 65536;
enum SVAUD_SERVICE = 1;
enum SVAUD_GOODSESSLOGON = 6;
enum SVAUD_BADSESSLOGON = 24;
enum SVAUD_SESSLOGON = SVAUD_GOODSESSLOGON|SVAUD_BADSESSLOGON;
enum SVAUD_GOODNETLOGON = 96;
enum SVAUD_BADNETLOGON = 384;
enum SVAUD_NETLOGON = SVAUD_GOODNETLOGON|SVAUD_BADNETLOGON;
enum SVAUD_LOGON = SVAUD_NETLOGON|SVAUD_SESSLOGON;
enum SVAUD_GOODUSE = 0x600;
enum SVAUD_BADUSE = 0x1800;
enum SVAUD_USE = SVAUD_GOODUSE|SVAUD_BADUSE;
enum SVAUD_USERLIST = 8192;
enum SVAUD_PERMISSIONS = 16384;
enum SVAUD_RESOURCE = 32768;
enum SVAUD_LOGONLIM = 65536;

const AA_AUDIT_ALL=1;
const AA_A_OWNER=4;
const AA_CLOSE=8;
const AA_S_OPEN=16;
const AA_S_WRITE=32;
const AA_S_CREATE=32;
const AA_S_DELETE=64;
const AA_S_ACL=128;
const AA_S_ALL=253;
const AA_F_OPEN=256;
const AA_F_WRITE=512;
const AA_F_CREATE=512;
const AA_F_DELETE=1024;
const AA_F_ACL=2048;
const AA_F_ALL = AA_F_OPEN|AA_F_WRITE|AA_F_DELETE|AA_F_ACL;
const AA_A_OPEN=2048;
const AA_A_WRITE=4096;
const AA_A_CREATE=8192;
const AA_A_DELETE=16384;
const AA_A_ACL=32768;
const AA_A_ALL = AA_F_OPEN|AA_F_WRITE|AA_F_DELETE|AA_F_ACL;
enum AA_AUDIT_ALL=1;
enum AA_A_OWNER=4;
enum AA_CLOSE=8;
enum AA_S_OPEN=16;
enum AA_S_WRITE=32;
enum AA_S_CREATE=32;
enum AA_S_DELETE=64;
enum AA_S_ACL=128;
enum AA_S_ALL=253;
enum AA_F_OPEN=256;
enum AA_F_WRITE=512;
enum AA_F_CREATE=512;
enum AA_F_DELETE=1024;
enum AA_F_ACL=2048;
enum AA_F_ALL = AA_F_OPEN|AA_F_WRITE|AA_F_DELETE|AA_F_ACL;
enum AA_A_OPEN=2048;
enum AA_A_WRITE=4096;
enum AA_A_CREATE=8192;
enum AA_A_DELETE=16384;
enum AA_A_ACL=32768;
enum AA_A_ALL = AA_F_OPEN|AA_F_WRITE|AA_F_DELETE|AA_F_ACL;

struct AUDIT_ENTRY{
DWORD ae_len;
Expand Down Expand Up @@ -274,29 +274,29 @@ NET_API_STATUS NetAuditWrite(DWORD,PBYTE,DWORD,LPTSTR,PBYTE);

/+
/* MinGW: These conflict with struct typedefs, why? */
const AE_SRVSTATUS=0;
const AE_SESSLOGON=1;
const AE_SESSLOGOFF=2;
const AE_SESSPWERR=3;
const AE_CONNSTART=4;
const AE_CONNSTOP=5;
const AE_CONNREJ=6;
const AE_RESACCESS=7;
const AE_RESACCESSREJ=8;
const AE_CLOSEFILE=9;
const AE_SERVICESTAT=11;
const AE_ACLMOD=12;
const AE_UASMOD=13;
const AE_NETLOGON=14;
const AE_NETLOGOFF=15;
const AE_NETLOGDENIED=16;
const AE_ACCLIMITEXCD=17;
const AE_RESACCESS2=18;
const AE_ACLMODFAIL=19;
const AE_LOCKOUT=20;
const AE_GENERIC_TYPE=21;
const AE_SRVSTART=0;
const AE_SRVPAUSED=1;
const AE_SRVCONT=2;
const AE_SRVSTOP=3;
enum AE_SRVSTATUS=0;
enum AE_SESSLOGON=1;
enum AE_SESSLOGOFF=2;
enum AE_SESSPWERR=3;
enum AE_CONNSTART=4;
enum AE_CONNSTOP=5;
enum AE_CONNREJ=6;
enum AE_RESACCESS=7;
enum AE_RESACCESSREJ=8;
enum AE_CLOSEFILE=9;
enum AE_SERVICESTAT=11;
enum AE_ACLMOD=12;
enum AE_UASMOD=13;
enum AE_NETLOGON=14;
enum AE_NETLOGOFF=15;
enum AE_NETLOGDENIED=16;
enum AE_ACCLIMITEXCD=17;
enum AE_RESACCESS2=18;
enum AE_ACLMODFAIL=19;
enum AE_LOCKOUT=20;
enum AE_GENERIC_TYPE=21;
enum AE_SRVSTART=0;
enum AE_SRVPAUSED=1;
enum AE_SRVCONT=2;
enum AE_SRVSTOP=3;
+/
4 changes: 2 additions & 2 deletions src/core/sys/windows/lmbrowsr.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ version (Windows):

private import core.sys.windows.lmcons, core.sys.windows.windef;

const BROWSER_ROLE_PDC = 1;
const BROWSER_ROLE_BDC = 2;
enum BROWSER_ROLE_PDC = 1;
enum BROWSER_ROLE_BDC = 2;

struct BROWSER_STATISTICS {
LARGE_INTEGER StatisticsStartTime;
Expand Down
34 changes: 17 additions & 17 deletions src/core/sys/windows/lmchdev.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,25 +13,25 @@ version (Windows):

private import core.sys.windows.lmcons, core.sys.windows.windef;

const CHARDEVQ_NO_REQUESTS = -1;
const CHARDEV_CLOSE = 0;
const CHARDEVQ_MAX_PRIORITY = 1;
const CHARDEVQ_DEV_PARMNUM = 1;
enum CHARDEVQ_NO_REQUESTS = -1;
enum CHARDEV_CLOSE = 0;
enum CHARDEVQ_MAX_PRIORITY = 1;
enum CHARDEVQ_DEV_PARMNUM = 1;

const HANDLE_INFO_LEVEL_1 = 1;
const HANDLE_CHARTIME_PARMNUM = 1;
const HANDLE_CHARCOUNT_PARMNUM = 2;
enum HANDLE_INFO_LEVEL_1 = 1;
enum HANDLE_CHARTIME_PARMNUM = 1;
enum HANDLE_CHARCOUNT_PARMNUM = 2;

const CHARDEV_STAT_OPENED = 2;
const CHARDEVQ_PRIORITY_PARMNUM = 2;
const CHARDEVQ_DEVS_PARMNUM = 3;
const CHARDEV_STAT_ERROR = 4;
const CHARDEVQ_NUMUSERS_PARMNUM = 4;
const CHARDEVQ_NUMAHEAD_PARMNUM = 5;
const CHARDEVQ_DEF_PRIORITY = 5;
const CHARDEVQ_PRIORITY_INFOLEVEL = PARMNUM_BASE_INFOLEVEL+CHARDEVQ_PRIORITY_PARMNUM;
const CHARDEVQ_DEVS_INFOLEVEL = PARMNUM_BASE_INFOLEVEL+CHARDEVQ_DEVS_PARMNUM;
const CHARDEVQ_MIN_PRIORITY = 9;
enum CHARDEV_STAT_OPENED = 2;
enum CHARDEVQ_PRIORITY_PARMNUM = 2;
enum CHARDEVQ_DEVS_PARMNUM = 3;
enum CHARDEV_STAT_ERROR = 4;
enum CHARDEVQ_NUMUSERS_PARMNUM = 4;
enum CHARDEVQ_NUMAHEAD_PARMNUM = 5;
enum CHARDEVQ_DEF_PRIORITY = 5;
enum CHARDEVQ_PRIORITY_INFOLEVEL = PARMNUM_BASE_INFOLEVEL+CHARDEVQ_PRIORITY_PARMNUM;
enum CHARDEVQ_DEVS_INFOLEVEL = PARMNUM_BASE_INFOLEVEL+CHARDEVQ_DEVS_PARMNUM;
enum CHARDEVQ_MIN_PRIORITY = 9;

struct CHARDEV_INFO_0 {
LPWSTR ch0_dev;
Expand Down
104 changes: 53 additions & 51 deletions src/core/sys/windows/lmcons.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
module core.sys.windows.lmcons;
version (Windows):

version (ANSI) {} else version = Unicode;

private import core.sys.windows.windef;
private import core.sys.windows.lmerr; // for NERR_BASE

Expand All @@ -19,62 +21,62 @@ const TCHAR[]

alias DWORD NET_API_STATUS, API_RET_TYPE;

const MIN_LANMAN_MESSAGE_ID = NERR_BASE;
const MAX_LANMAN_MESSAGE_ID = 5799;
enum MIN_LANMAN_MESSAGE_ID = NERR_BASE;
enum MAX_LANMAN_MESSAGE_ID = 5799;

const CNLEN = 15; /* also in nddeapi.h */
const UNCLEN = CNLEN + 2;
enum CNLEN = 15; /* also in nddeapi.h */
enum UNCLEN = CNLEN + 2;

const DNLEN = 15;
const LM20_CNLEN = 15;
const LM20_DNLEN = 15;
const LM20_SNLEN = 15;
const LM20_STXTLEN = 63;
const LM20_UNCLEN = LM20_CNLEN + 2;
const LM20_NNLEN = 12;
const LM20_RMLEN = LM20_UNCLEN + 1 + LM20_NNLEN;
const NNLEN = 80;
const RMLEN = UNCLEN + 1 + NNLEN;
const SNLEN = 80;
const STXTLEN = 256;
const PATHLEN = 256;
const LM20_PATHLEN = 256;
const DEVLEN = 80;
const LM20_DEVLEN = 8;
const EVLEN = 16;
const UNLEN = 256;
const LM20_UNLEN = 20;
const GNLEN = UNLEN;
const LM20_GNLEN = LM20_UNLEN;
const PWLEN = 256;
const LM20_PWLEN = 14;
const SHPWLEN = 8;
const CLTYPE_LEN = 12;
const QNLEN = NNLEN;
const LM20_QNLEN = LM20_NNLEN;
enum DNLEN = 15;
enum LM20_CNLEN = 15;
enum LM20_DNLEN = 15;
enum LM20_SNLEN = 15;
enum LM20_STXTLEN = 63;
enum LM20_UNCLEN = LM20_CNLEN + 2;
enum LM20_NNLEN = 12;
enum LM20_RMLEN = LM20_UNCLEN + 1 + LM20_NNLEN;
enum NNLEN = 80;
enum RMLEN = UNCLEN + 1 + NNLEN;
enum SNLEN = 80;
enum STXTLEN = 256;
enum PATHLEN = 256;
enum LM20_PATHLEN = 256;
enum DEVLEN = 80;
enum LM20_DEVLEN = 8;
enum EVLEN = 16;
enum UNLEN = 256;
enum LM20_UNLEN = 20;
enum GNLEN = UNLEN;
enum LM20_GNLEN = LM20_UNLEN;
enum PWLEN = 256;
enum LM20_PWLEN = 14;
enum SHPWLEN = 8;
enum CLTYPE_LEN = 12;
enum QNLEN = NNLEN;
enum LM20_QNLEN = LM20_NNLEN;

const MAXCOMMENTSZ = 256;
const LM20_MAXCOMMENTSZ = 48;
const ALERTSZ = 128;
const MAXDEVENTRIES = 32;// (sizeof(int)*8);
const NETBIOS_NAME_LEN = 16;
const DWORD MAX_PREFERRED_LENGTH = -1;
const CRYPT_KEY_LEN = 7;
const CRYPT_TXT_LEN = 8;
const ENCRYPTED_PWLEN = 16;
const SESSION_PWLEN = 24;
const SESSION_CRYPT_KLEN = 21;
enum MAXCOMMENTSZ = 256;
enum LM20_MAXCOMMENTSZ = 48;
enum ALERTSZ = 128;
enum MAXDEVENTRIES = 32;// (sizeof(int)*8);
enum NETBIOS_NAME_LEN = 16;
enum DWORD MAX_PREFERRED_LENGTH = -1;
enum CRYPT_KEY_LEN = 7;
enum CRYPT_TXT_LEN = 8;
enum ENCRYPTED_PWLEN = 16;
enum SESSION_PWLEN = 24;
enum SESSION_CRYPT_KLEN = 21;

const PARMNUM_ALL = 0;
const DWORD PARM_ERROR_UNKNOWN = -1;
const PARM_ERROR_NONE = 0;
const PARMNUM_BASE_INFOLEVEL = 1000;
enum PARMNUM_ALL = 0;
enum DWORD PARM_ERROR_UNKNOWN = -1;
enum PARM_ERROR_NONE = 0;
enum PARMNUM_BASE_INFOLEVEL = 1000;

const PLATFORM_ID_DOS = 300;
const PLATFORM_ID_OS2 = 400;
const PLATFORM_ID_NT = 500;
const PLATFORM_ID_OSF = 600;
const PLATFORM_ID_VMS = 700;
enum PLATFORM_ID_DOS = 300;
enum PLATFORM_ID_OS2 = 400;
enum PLATFORM_ID_NT = 500;
enum PLATFORM_ID_OSF = 600;
enum PLATFORM_ID_VMS = 700;

// this is a new typedef in W2K, but it should be harmless for earlier Windows versions.
version (Unicode) {
Expand Down
366 changes: 183 additions & 183 deletions src/core/sys/windows/lmerrlog.d
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions src/core/sys/windows/lmmsg.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ static assert (_WIN32_WINNT >= 0x501,
"core.sys.windows.lmmsg is available only if version WindowsXP, Windows2003 "
"or WindowsVista is set");

const MSGNAME_NOT_FORWARDED = 0;
const MSGNAME_FORWARDED_TO = 4;
const MSGNAME_FORWARDED_FROM = 16;
enum MSGNAME_NOT_FORWARDED = 0;
enum MSGNAME_FORWARDED_TO = 4;
enum MSGNAME_FORWARDED_FROM = 16;

struct MSG_INFO_0 {
LPWSTR msgi0_name;
Expand Down
20 changes: 10 additions & 10 deletions src/core/sys/windows/lmremutl.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@ pragma(lib, "netapi32");

private import core.sys.windows.lmcons, core.sys.windows.windef;

const SUPPORTS_REMOTE_ADMIN_PROTOCOL = 2;
const SUPPORTS_RPC = 4;
const SUPPORTS_SAM_PROTOCOL = 8;
const SUPPORTS_UNICODE = 16;
const SUPPORTS_LOCAL = 32;
const SUPPORTS_ANY = 0xFFFFFFFF;

const NO_PERMISSION_REQUIRED = 1;
const ALLOCATE_RESPONSE = 2;
const USE_SPECIFIC_TRANSPORT = 0x80000000;
enum SUPPORTS_REMOTE_ADMIN_PROTOCOL = 2;
enum SUPPORTS_RPC = 4;
enum SUPPORTS_SAM_PROTOCOL = 8;
enum SUPPORTS_UNICODE = 16;
enum SUPPORTS_LOCAL = 32;
enum SUPPORTS_ANY = 0xFFFFFFFF;

enum NO_PERMISSION_REQUIRED = 1;
enum ALLOCATE_RESPONSE = 2;
enum USE_SPECIFIC_TRANSPORT = 0x80000000;

//[Yes] #ifndef DESC_CHAR_UNICODE
//alias CHAR DESC_CHAR;
Expand Down
44 changes: 22 additions & 22 deletions src/core/sys/windows/lmrepl.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,28 +12,28 @@ pragma(lib, "netapi32");

private import core.sys.windows.lmcons, core.sys.windows.windef;

const REPL_ROLE_EXPORT=1;
const REPL_ROLE_IMPORT=2;
const REPL_ROLE_BOTH=3;

const REPL_INTERVAL_INFOLEVEL = PARMNUM_BASE_INFOLEVEL+0;
const REPL_PULSE_INFOLEVEL = PARMNUM_BASE_INFOLEVEL+1;
const REPL_GUARDTIME_INFOLEVEL = PARMNUM_BASE_INFOLEVEL+2;
const REPL_RANDOM_INFOLEVEL = PARMNUM_BASE_INFOLEVEL+3;

const REPL_UNLOCK_NOFORCE=0;
const REPL_UNLOCK_FORCE=1;
const REPL_STATE_OK=0;
const REPL_STATE_NO_MASTER=1;
const REPL_STATE_NO_SYNC=2;
const REPL_STATE_NEVER_REPLICATED=3;
const REPL_INTEGRITY_FILE=1;
const REPL_INTEGRITY_TREE=2;
const REPL_EXTENT_FILE=1;
const REPL_EXTENT_TREE=2;

const REPL_EXPORT_INTEGRITY_INFOLEVEL = PARMNUM_BASE_INFOLEVEL+0;
const REPL_EXPORT_EXTENT_INFOLEVEL = PARMNUM_BASE_INFOLEVEL+1;
enum REPL_ROLE_EXPORT=1;
enum REPL_ROLE_IMPORT=2;
enum REPL_ROLE_BOTH=3;

enum REPL_INTERVAL_INFOLEVEL = PARMNUM_BASE_INFOLEVEL+0;
enum REPL_PULSE_INFOLEVEL = PARMNUM_BASE_INFOLEVEL+1;
enum REPL_GUARDTIME_INFOLEVEL = PARMNUM_BASE_INFOLEVEL+2;
enum REPL_RANDOM_INFOLEVEL = PARMNUM_BASE_INFOLEVEL+3;

enum REPL_UNLOCK_NOFORCE=0;
enum REPL_UNLOCK_FORCE=1;
enum REPL_STATE_OK=0;
enum REPL_STATE_NO_MASTER=1;
enum REPL_STATE_NO_SYNC=2;
enum REPL_STATE_NEVER_REPLICATED=3;
enum REPL_INTEGRITY_FILE=1;
enum REPL_INTEGRITY_TREE=2;
enum REPL_EXTENT_FILE=1;
enum REPL_EXTENT_TREE=2;

enum REPL_EXPORT_INTEGRITY_INFOLEVEL = PARMNUM_BASE_INFOLEVEL+0;
enum REPL_EXPORT_EXTENT_INFOLEVEL = PARMNUM_BASE_INFOLEVEL+1;

struct REPL_INFO_0 {
DWORD rp0_role;
Expand Down
488 changes: 244 additions & 244 deletions src/core/sys/windows/lmserver.d
View file

Large diffs are not rendered by default.

66 changes: 33 additions & 33 deletions src/core/sys/windows/lmshare.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,39 +14,39 @@ import core.sys.windows.lmcons;
private import core.sys.windows.w32api, core.sys.windows.windef;


const SHARE_NETNAME_PARMNUM = 1;
const SHARE_TYPE_PARMNUM = 3;
const SHARE_REMARK_PARMNUM = 4;
const SHARE_PERMISSIONS_PARMNUM = 5;
const SHARE_MAX_USES_PARMNUM = 6;
const SHARE_CURRENT_USES_PARMNUM = 7;
const SHARE_PATH_PARMNUM = 8;
const SHARE_PASSWD_PARMNUM = 9;
const SHARE_FILE_SD_PARMNUM = 501;
const SHARE_REMARK_INFOLEVEL = PARMNUM_BASE_INFOLEVEL + SHARE_REMARK_PARMNUM;
const SHARE_MAX_USES_INFOLEVEL = PARMNUM_BASE_INFOLEVEL + SHARE_MAX_USES_PARMNUM;
const SHARE_FILE_SD_INFOLEVEL = PARMNUM_BASE_INFOLEVEL + SHARE_FILE_SD_PARMNUM;

const SHI1_NUM_ELEMENTS = 4;
const SHI2_NUM_ELEMENTS = 10;

const STYPE_DISKTREE = 0;
const STYPE_PRINTQ = 1;
const STYPE_DEVICE = 2;
const STYPE_IPC = 3;
const STYPE_DFS = 100;
const STYPE_SPECIAL = 0x80000000;

const DWORD SHI_USES_UNLIMITED = -1;

const SESS_GUEST = 1;
const SESS_NOENCRYPTION = 2;
const SESI1_NUM_ELEMENTS = 8;
const SESI2_NUM_ELEMENTS = 9;

const PERM_FILE_READ = 1;
const PERM_FILE_WRITE = 2;
const PERM_FILE_CREATE = 4;
enum SHARE_NETNAME_PARMNUM = 1;
enum SHARE_TYPE_PARMNUM = 3;
enum SHARE_REMARK_PARMNUM = 4;
enum SHARE_PERMISSIONS_PARMNUM = 5;
enum SHARE_MAX_USES_PARMNUM = 6;
enum SHARE_CURRENT_USES_PARMNUM = 7;
enum SHARE_PATH_PARMNUM = 8;
enum SHARE_PASSWD_PARMNUM = 9;
enum SHARE_FILE_SD_PARMNUM = 501;
enum SHARE_REMARK_INFOLEVEL = PARMNUM_BASE_INFOLEVEL + SHARE_REMARK_PARMNUM;
enum SHARE_MAX_USES_INFOLEVEL = PARMNUM_BASE_INFOLEVEL + SHARE_MAX_USES_PARMNUM;
enum SHARE_FILE_SD_INFOLEVEL = PARMNUM_BASE_INFOLEVEL + SHARE_FILE_SD_PARMNUM;

enum SHI1_NUM_ELEMENTS = 4;
enum SHI2_NUM_ELEMENTS = 10;

enum STYPE_DISKTREE = 0;
enum STYPE_PRINTQ = 1;
enum STYPE_DEVICE = 2;
enum STYPE_IPC = 3;
enum STYPE_DFS = 100;
enum STYPE_SPECIAL = 0x80000000;

enum DWORD SHI_USES_UNLIMITED = -1;

enum SESS_GUEST = 1;
enum SESS_NOENCRYPTION = 2;
enum SESI1_NUM_ELEMENTS = 8;
enum SESI2_NUM_ELEMENTS = 9;

enum PERM_FILE_READ = 1;
enum PERM_FILE_WRITE = 2;
enum PERM_FILE_CREATE = 4;

struct FILE_INFO_2 {
DWORD fi2_id;
Expand Down
2 changes: 1 addition & 1 deletion src/core/sys/windows/lmstats.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ pragma(lib, "netapi32");

private import core.sys.windows.lmcons, core.sys.windows.windef;

const ULONG
enum ULONG
STATSOPT_CLR = 1,
STATS_NO_VALUE = -1,
STATS_OVERFLOW = -2;
Expand Down
184 changes: 92 additions & 92 deletions src/core/sys/windows/lmsvc.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,99 +20,99 @@ private import core.sys.windows.lmcons, core.sys.windows.lmsname, core.sys.windo

const TCHAR[] SERVICE_DOS_ENCRYPTION = "ENCRYPT";

const SERVICE_UNINSTALLED=0;
const SERVICE_INSTALL_PENDING=1;
const SERVICE_UNINSTALL_PENDING=2;
const SERVICE_INSTALLED=3;
const SERVICE_INSTALL_STATE=3;
const SERVICE_PAUSE_STATE=18;
const LM20_SERVICE_ACTIVE=0;
const LM20_SERVICE_CONTINUE_PENDING=4;
const LM20_SERVICE_PAUSE_PENDING=8;
const LM20_SERVICE_PAUSED=18;
const SERVICE_NOT_UNINSTALLABLE=0;
const SERVICE_UNINSTALLABLE=16;
const SERVICE_NOT_PAUSABLE=0;
const SERVICE_PAUSABLE=32;
const SERVICE_REDIR_PAUSED=0x700;
const SERVICE_REDIR_DISK_PAUSED=256;
const SERVICE_REDIR_PRINT_PAUSED=512;
const SERVICE_REDIR_COMM_PAUSED=1024;
const SERVICE_CTRL_INTERROGATE=0;
const SERVICE_CTRL_PAUSE=1;
const SERVICE_CTRL_CONTINUE=2;
const SERVICE_CTRL_UNINSTALL=3;
const SERVICE_CTRL_REDIR_DISK=1;
const SERVICE_CTRL_REDIR_PRINT=2;
const SERVICE_CTRL_REDIR_COMM=4;
const SERVICE_IP_NO_HINT=0;
const SERVICE_CCP_NO_HINT=0;
const SERVICE_IP_QUERY_HINT=0x10000;
const SERVICE_CCP_QUERY_HINT=0x10000;
const SERVICE_IP_CHKPT_NUM=255;
const SERVICE_CCP_CHKPT_NUM=255;
const SERVICE_IP_WAIT_TIME=0xFF00;
const SERVICE_CCP_WAIT_TIME=0xFF00;
const SERVICE_IP_WAITTIME_SHIFT=8;
const SERVICE_NTIP_WAITTIME_SHIFT=12;
const UPPER_HINT_MASK=0xFF00;
const LOWER_HINT_MASK=255;
const UPPER_GET_HINT_MASK=0xFF00000;
const LOWER_GET_HINT_MASK=0xFF00;
const SERVICE_NT_MAXTIME=0xFFFF;
const SERVICE_RESRV_MASK=0x1FFFF;
const SERVICE_MAXTIME=255;
const SERVICE_BASE=3050;
const SERVICE_UIC_NORMAL=0;
enum SERVICE_UNINSTALLED=0;
enum SERVICE_INSTALL_PENDING=1;
enum SERVICE_UNINSTALL_PENDING=2;
enum SERVICE_INSTALLED=3;
enum SERVICE_INSTALL_STATE=3;
enum SERVICE_PAUSE_STATE=18;
enum LM20_SERVICE_ACTIVE=0;
enum LM20_SERVICE_CONTINUE_PENDING=4;
enum LM20_SERVICE_PAUSE_PENDING=8;
enum LM20_SERVICE_PAUSED=18;
enum SERVICE_NOT_UNINSTALLABLE=0;
enum SERVICE_UNINSTALLABLE=16;
enum SERVICE_NOT_PAUSABLE=0;
enum SERVICE_PAUSABLE=32;
enum SERVICE_REDIR_PAUSED=0x700;
enum SERVICE_REDIR_DISK_PAUSED=256;
enum SERVICE_REDIR_PRINT_PAUSED=512;
enum SERVICE_REDIR_COMM_PAUSED=1024;
enum SERVICE_CTRL_INTERROGATE=0;
enum SERVICE_CTRL_PAUSE=1;
enum SERVICE_CTRL_CONTINUE=2;
enum SERVICE_CTRL_UNINSTALL=3;
enum SERVICE_CTRL_REDIR_DISK=1;
enum SERVICE_CTRL_REDIR_PRINT=2;
enum SERVICE_CTRL_REDIR_COMM=4;
enum SERVICE_IP_NO_HINT=0;
enum SERVICE_CCP_NO_HINT=0;
enum SERVICE_IP_QUERY_HINT=0x10000;
enum SERVICE_CCP_QUERY_HINT=0x10000;
enum SERVICE_IP_CHKPT_NUM=255;
enum SERVICE_CCP_CHKPT_NUM=255;
enum SERVICE_IP_WAIT_TIME=0xFF00;
enum SERVICE_CCP_WAIT_TIME=0xFF00;
enum SERVICE_IP_WAITTIME_SHIFT=8;
enum SERVICE_NTIP_WAITTIME_SHIFT=12;
enum UPPER_HINT_MASK=0xFF00;
enum LOWER_HINT_MASK=255;
enum UPPER_GET_HINT_MASK=0xFF00000;
enum LOWER_GET_HINT_MASK=0xFF00;
enum SERVICE_NT_MAXTIME=0xFFFF;
enum SERVICE_RESRV_MASK=0x1FFFF;
enum SERVICE_MAXTIME=255;
enum SERVICE_BASE=3050;
enum SERVICE_UIC_NORMAL=0;

const SERVICE_UIC_BADPARMVAL = SERVICE_BASE+1;
const SERVICE_UIC_MISSPARM = SERVICE_BASE+2;
const SERVICE_UIC_UNKPARM = SERVICE_BASE+3;
const SERVICE_UIC_RESOURCE = SERVICE_BASE+4;
const SERVICE_UIC_CONFIG = SERVICE_BASE+5;
const SERVICE_UIC_SYSTEM = SERVICE_BASE+6;
const SERVICE_UIC_INTERNAL = SERVICE_BASE+7;
const SERVICE_UIC_AMBIGPARM = SERVICE_BASE+8;
const SERVICE_UIC_DUPPARM = SERVICE_BASE+9;
const SERVICE_UIC_KILL = SERVICE_BASE+10;
const SERVICE_UIC_EXEC = SERVICE_BASE+11;
const SERVICE_UIC_SUBSERV = SERVICE_BASE+12;
const SERVICE_UIC_CONFLPARM = SERVICE_BASE+13;
const SERVICE_UIC_FILE = SERVICE_BASE+14;
const SERVICE_UIC_M_NULL=0;
const SERVICE_UIC_M_MEMORY = SERVICE_BASE+20;
const SERVICE_UIC_M_DISK = SERVICE_BASE+21;
const SERVICE_UIC_M_THREADS = SERVICE_BASE+22;
const SERVICE_UIC_M_PROCESSES = SERVICE_BASE+23;
const SERVICE_UIC_M_SECURITY = SERVICE_BASE+24;
const SERVICE_UIC_M_LANROOT = SERVICE_BASE+25;
const SERVICE_UIC_M_REDIR = SERVICE_BASE+26;
const SERVICE_UIC_M_SERVER = SERVICE_BASE+27;
const SERVICE_UIC_M_SEC_FILE_ERR = SERVICE_BASE+28;
const SERVICE_UIC_M_FILES = SERVICE_BASE+29;
const SERVICE_UIC_M_LOGS = SERVICE_BASE+30;
const SERVICE_UIC_M_LANGROUP = SERVICE_BASE+31;
const SERVICE_UIC_M_MSGNAME = SERVICE_BASE+32;
const SERVICE_UIC_M_ANNOUNCE = SERVICE_BASE+33;
const SERVICE_UIC_M_UAS = SERVICE_BASE+34;
const SERVICE_UIC_M_SERVER_SEC_ERR = SERVICE_BASE+35;
const SERVICE_UIC_M_WKSTA = SERVICE_BASE+37;
const SERVICE_UIC_M_ERRLOG = SERVICE_BASE+38;
const SERVICE_UIC_M_FILE_UW = SERVICE_BASE+39;
const SERVICE_UIC_M_ADDPAK = SERVICE_BASE+40;
const SERVICE_UIC_M_LAZY = SERVICE_BASE+41;
const SERVICE_UIC_M_UAS_MACHINE_ACCT = SERVICE_BASE+42;
const SERVICE_UIC_M_UAS_SERVERS_NMEMB = SERVICE_BASE+43;
const SERVICE_UIC_M_UAS_SERVERS_NOGRP = SERVICE_BASE+44;
const SERVICE_UIC_M_UAS_INVALID_ROLE = SERVICE_BASE+45;
const SERVICE_UIC_M_NETLOGON_NO_DC = SERVICE_BASE+46;
const SERVICE_UIC_M_NETLOGON_DC_CFLCT = SERVICE_BASE+47;
const SERVICE_UIC_M_NETLOGON_AUTH = SERVICE_BASE+48;
const SERVICE_UIC_M_UAS_PROLOG = SERVICE_BASE+49;
const SERVICE2_BASE=5600;
const SERVICE_UIC_M_NETLOGON_MPATH = SERVICE2_BASE+0;
const SERVICE_UIC_M_LSA_MACHINE_ACCT = SERVICE2_BASE+1;
const SERVICE_UIC_M_DATABASE_ERROR = SERVICE2_BASE+2;
enum SERVICE_UIC_BADPARMVAL = SERVICE_BASE+1;
enum SERVICE_UIC_MISSPARM = SERVICE_BASE+2;
enum SERVICE_UIC_UNKPARM = SERVICE_BASE+3;
enum SERVICE_UIC_RESOURCE = SERVICE_BASE+4;
enum SERVICE_UIC_CONFIG = SERVICE_BASE+5;
enum SERVICE_UIC_SYSTEM = SERVICE_BASE+6;
enum SERVICE_UIC_INTERNAL = SERVICE_BASE+7;
enum SERVICE_UIC_AMBIGPARM = SERVICE_BASE+8;
enum SERVICE_UIC_DUPPARM = SERVICE_BASE+9;
enum SERVICE_UIC_KILL = SERVICE_BASE+10;
enum SERVICE_UIC_EXEC = SERVICE_BASE+11;
enum SERVICE_UIC_SUBSERV = SERVICE_BASE+12;
enum SERVICE_UIC_CONFLPARM = SERVICE_BASE+13;
enum SERVICE_UIC_FILE = SERVICE_BASE+14;
enum SERVICE_UIC_M_NULL=0;
enum SERVICE_UIC_M_MEMORY = SERVICE_BASE+20;
enum SERVICE_UIC_M_DISK = SERVICE_BASE+21;
enum SERVICE_UIC_M_THREADS = SERVICE_BASE+22;
enum SERVICE_UIC_M_PROCESSES = SERVICE_BASE+23;
enum SERVICE_UIC_M_SECURITY = SERVICE_BASE+24;
enum SERVICE_UIC_M_LANROOT = SERVICE_BASE+25;
enum SERVICE_UIC_M_REDIR = SERVICE_BASE+26;
enum SERVICE_UIC_M_SERVER = SERVICE_BASE+27;
enum SERVICE_UIC_M_SEC_FILE_ERR = SERVICE_BASE+28;
enum SERVICE_UIC_M_FILES = SERVICE_BASE+29;
enum SERVICE_UIC_M_LOGS = SERVICE_BASE+30;
enum SERVICE_UIC_M_LANGROUP = SERVICE_BASE+31;
enum SERVICE_UIC_M_MSGNAME = SERVICE_BASE+32;
enum SERVICE_UIC_M_ANNOUNCE = SERVICE_BASE+33;
enum SERVICE_UIC_M_UAS = SERVICE_BASE+34;
enum SERVICE_UIC_M_SERVER_SEC_ERR = SERVICE_BASE+35;
enum SERVICE_UIC_M_WKSTA = SERVICE_BASE+37;
enum SERVICE_UIC_M_ERRLOG = SERVICE_BASE+38;
enum SERVICE_UIC_M_FILE_UW = SERVICE_BASE+39;
enum SERVICE_UIC_M_ADDPAK = SERVICE_BASE+40;
enum SERVICE_UIC_M_LAZY = SERVICE_BASE+41;
enum SERVICE_UIC_M_UAS_MACHINE_ACCT = SERVICE_BASE+42;
enum SERVICE_UIC_M_UAS_SERVERS_NMEMB = SERVICE_BASE+43;
enum SERVICE_UIC_M_UAS_SERVERS_NOGRP = SERVICE_BASE+44;
enum SERVICE_UIC_M_UAS_INVALID_ROLE = SERVICE_BASE+45;
enum SERVICE_UIC_M_NETLOGON_NO_DC = SERVICE_BASE+46;
enum SERVICE_UIC_M_NETLOGON_DC_CFLCT = SERVICE_BASE+47;
enum SERVICE_UIC_M_NETLOGON_AUTH = SERVICE_BASE+48;
enum SERVICE_UIC_M_UAS_PROLOG = SERVICE_BASE+49;
enum SERVICE2_BASE=5600;
enum SERVICE_UIC_M_NETLOGON_MPATH = SERVICE2_BASE+0;
enum SERVICE_UIC_M_LSA_MACHINE_ACCT = SERVICE2_BASE+1;
enum SERVICE_UIC_M_DATABASE_ERROR = SERVICE2_BASE+2;

struct SERVICE_INFO_0 {
LPWSTR svci0_name;
Expand Down
2 changes: 1 addition & 1 deletion src/core/sys/windows/lmuse.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ enum {
USE_RECONN
}

const DWORD USE_WILDCARD = -1;
enum DWORD USE_WILDCARD = -1;

enum {
USE_DISKDEV,
Expand Down
2 changes: 2 additions & 0 deletions src/core/sys/windows/lzexpand.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
*/
module core.sys.windows.lzexpand;
version (Windows):

version (ANSI) {} else version = Unicode;
pragma(lib, "lz32");

private import core.sys.windows.winbase, core.sys.windows.windef;
Expand Down
38 changes: 19 additions & 19 deletions src/core/sys/windows/mapi.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,25 +54,25 @@ enum {
MAPI_BCC
}

const MAPI_LOGON_UI = 0x0001;
const MAPI_NEW_SESSION = 0x0002;
const MAPI_FORCE_DOWNLOAD = 0x1000;
const MAPI_LOGOFF_SHARED = 0x0001;
const MAPI_LOGOFF_UI = 0x0002;
const MAPI_DIALOG = 0x0008;
const MAPI_UNREAD_ONLY = 0x0020;
const MAPI_LONG_MSGID = 0x4000;
const MAPI_GUARANTEE_FIFO = 0x0100;
const MAPI_ENVELOPE_ONLY = 0x0040;
const MAPI_PEEK = 0x0080;
const MAPI_BODY_AS_FILE = 0x0200;
const MAPI_SUPPRESS_ATTACH = 0x0800;
const MAPI_AB_NOMODIFY = 0x0400;
const MAPI_OLE = 0x0001;
const MAPI_OLE_STATIC = 0x0002;
const MAPI_UNREAD = 0x0001;
const MAPI_RECEIPT_REQUESTED = 0x0002;
const MAPI_SENT = 0x0004;
enum MAPI_LOGON_UI = 0x0001;
enum MAPI_NEW_SESSION = 0x0002;
enum MAPI_FORCE_DOWNLOAD = 0x1000;
enum MAPI_LOGOFF_SHARED = 0x0001;
enum MAPI_LOGOFF_UI = 0x0002;
enum MAPI_DIALOG = 0x0008;
enum MAPI_UNREAD_ONLY = 0x0020;
enum MAPI_LONG_MSGID = 0x4000;
enum MAPI_GUARANTEE_FIFO = 0x0100;
enum MAPI_ENVELOPE_ONLY = 0x0040;
enum MAPI_PEEK = 0x0080;
enum MAPI_BODY_AS_FILE = 0x0200;
enum MAPI_SUPPRESS_ATTACH = 0x0800;
enum MAPI_AB_NOMODIFY = 0x0400;
enum MAPI_OLE = 0x0001;
enum MAPI_OLE_STATIC = 0x0002;
enum MAPI_UNREAD = 0x0001;
enum MAPI_RECEIPT_REQUESTED = 0x0002;
enum MAPI_SENT = 0x0004;

alias uint FLAGS, LHANDLE;
alias uint* LPLHANDLE, LPULONG;
Expand Down
6 changes: 3 additions & 3 deletions src/core/sys/windows/mciavi.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ private import core.sys.windows.mmsystem;

// FIXME: check types and grouping of constants

const MCI_MCIAVI_PLAY_WINDOW = 0x01000000;
const MCI_MCIAVI_PLAY_FULLSCREEN = 0x02000000;
const MCI_MCIAVI_PLAY_FULLBY2 = 0x04000000;
enum MCI_MCIAVI_PLAY_WINDOW = 0x01000000;
enum MCI_MCIAVI_PLAY_FULLSCREEN = 0x02000000;
enum MCI_MCIAVI_PLAY_FULLBY2 = 0x04000000;

enum {
MCI_AVI_STATUS_FRAMES_SKIPPED = 0x00008001,
Expand Down
8 changes: 4 additions & 4 deletions src/core/sys/windows/mcx.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ version (Windows):

private import core.sys.windows.windef;

const DWORD
enum DWORD
DIALOPTION_BILLING = 64,
DIALOPTION_QUIET = 128,
DIALOPTION_DIALTONE = 256;

const DWORD
enum DWORD
MDMVOLFLAG_LOW = 1,
MDMVOLFLAG_MEDIUM = 2,
MDMVOLFLAG_HIGH = 4;
Expand All @@ -28,7 +28,7 @@ enum : DWORD {
MDMVOL_HIGH = 2
}

const DWORD
enum DWORD
MDMSPKRFLAG_OFF = 1,
MDMSPKRFLAG_DIAL = 2,
MDMSPKRFLAG_ON = 4,
Expand All @@ -41,7 +41,7 @@ enum : DWORD {
MDMSPKR_CALLSETUP
}

const DWORD
enum DWORD
MDM_COMPRESSION = 0x0001,
MDM_ERROR_CONTROL = 0x0002,
MDM_FORCED_EC = 0x0004,
Expand Down
2 changes: 1 addition & 1 deletion src/core/sys/windows/mgmtapi.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ enum {
SNMP_MGMTAPI_INVALID_BUFFER // = 48
}

const MGMCTL_SETAGENTPORT = 1;
enum MGMCTL_SETAGENTPORT = 1;

alias PVOID LPSNMP_MGR_SESSION;

Expand Down
1,432 changes: 717 additions & 715 deletions src/core/sys/windows/mmsystem.d
View file

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions src/core/sys/windows/msacm.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
module core.sys.windows.msacm;
version (Windows):

version (ANSI) {} else version = Unicode;

private import core.sys.windows.basetsd, core.sys.windows.mmsystem, core.sys.windows.windef;

mixin DECLARE_HANDLE!("HACMDRIVERID");
Expand All @@ -19,7 +21,7 @@ alias HACMDRIVER* LPHACMDRIVER;
/* Comment from MinGW
found through experimentation
*/
const size_t
enum size_t
ACMDRIVERDETAILS_SHORTNAME_CHARS = 32,
ACMDRIVERDETAILS_LONGNAME_CHARS = 128,
ACMDRIVERDETAILS_COPYRIGHT_CHARS = 80,
Expand All @@ -28,7 +30,7 @@ const size_t
/* Comment from MinGW
I don't know the right values for these macros
*/
const size_t
enum size_t
ACMFORMATDETAILS_FORMAT_CHARS = 256,
ACMFORMATTAGDETAILS_FORMATTAG_CHARS = 256,
ACMDRIVERDETAILS_FEATURES_CHARS = 256;
Expand Down
20 changes: 10 additions & 10 deletions src/core/sys/windows/mshtml.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -290,10 +290,10 @@ interface IHTMLElement : IDispatch {
HRESULT getAttribute(BSTR,LONG,VARIANT*);
HRESULT removeAttribute(BSTR,LONG,VARIANT_BOOL*);
HRESULT put_className(BSTR);
HRESULT get_className(ref BSTR);
HRESULT get_className(BSTR*);
HRESULT put_id(BSTR);
HRESULT get_id(ref BSTR);
HRESULT get_tagName(ref BSTR);
HRESULT get_id(BSTR*);
HRESULT get_tagName(BSTR*);
HRESULT get_parentElement(LPHTMLELEMENT*);
HRESULT get_style(LPHTMLSTYLE*);
HRESULT put_onhelp(VARIANT);
Expand All @@ -320,30 +320,30 @@ interface IHTMLElement : IDispatch {
HRESULT get_onmouseup(VARIANT*);
HRESULT get_document(IDispatch*);
HRESULT put_title(BSTR);
HRESULT get_title(ref BSTR);
HRESULT get_title(BSTR*);
HRESULT put_language(BSTR);
HRESULT get_language(ref BSTR);
HRESULT get_language(BSTR*);
HRESULT put_onselectstart(VARIANT);
HRESULT get_onselectstart(VARIANT*);
HRESULT scrollIntoView(VARIANT);
HRESULT contains(LPHTMLELEMENT,VARIANT_BOOL*);
HRESULT get_source3Index(LONG*);
HRESULT get_recordNumber(VARIANT*);
HRESULT put_lang(BSTR);
HRESULT get_lang(ref BSTR);
HRESULT get_lang(BSTR*);
HRESULT get_offsetLeft(LONG*);
HRESULT get_offsetTop(LONG*);
HRESULT get_offsetWidth(LONG*);
HRESULT get_offsetHeight(LONG*);
HRESULT get_offsetParent(LPHTMLELEMENT*);
HRESULT put_innerHTML(BSTR);
HRESULT get_innerHTML(ref BSTR);
HRESULT get_innerHTML(BSTR*);
HRESULT put_innerText(BSTR);
HRESULT get_innerText(ref BSTR);
HRESULT get_innerText(BSTR*);
HRESULT put_outerHTML(BSTR);
HRESULT get_outerHTML(ref BSTR);
HRESULT get_outerHTML(BSTR*);
HRESULT put_outerText(BSTR);
HRESULT get_outerText(ref BSTR);
HRESULT get_outerText(BSTR*);
HRESULT insertAdjacentHTML(BSTR,BSTR);
HRESULT insertAdjacentText(BSTR,BSTR);
HRESULT get_parentTextEdit(LPHTMLELEMENT*);
Expand Down
4 changes: 2 additions & 2 deletions src/core/sys/windows/mswsock.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,10 @@ extern(Windows) {
/* WinNT3.51+
ms-help://MS.MSDNQTR.2003FEB.1033/winsock/winsock/acceptex_2.htm */
alias BOOL function(SOCKET, SOCKET, PVOID, DWORD, DWORD, DWORD, LPDWORD, LPOVERLAPPED) LPFN_ACCEPTEX;
const GUID WSAID_ACCEPTEX = {0xb5367df1,0xcbac,0x11cf,[0x95,0xca,0x00,0x80,0x5f,0x48,0xa1,0x92]};
enum GUID WSAID_ACCEPTEX = {0xb5367df1,0xcbac,0x11cf,[0x95,0xca,0x00,0x80,0x5f,0x48,0xa1,0x92]};

alias BOOL function(SOCKET, SOCKADDR*, int, PVOID, DWORD, LPDWORD, LPOVERLAPPED) LPFN_CONNECTEX;
const GUID WSAID_CONNECTEX = {0x25a207b9,0xddf3,0x4660,[0x8e,0xe9,0x76,0xe5,0x8c,0x74,0x06,0x3e]};
enum GUID WSAID_CONNECTEX = {0x25a207b9,0xddf3,0x4660,[0x8e,0xe9,0x76,0xe5,0x8c,0x74,0x06,0x3e]};
}

version(Win32_Winsock1) {
Expand Down
6 changes: 3 additions & 3 deletions src/core/sys/windows/nb30.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ version (Windows):

private import core.sys.windows.windef;

const size_t
enum size_t
NCBNAMSZ = 16,
MAX_LANA = 254;

Expand All @@ -37,7 +37,7 @@ enum : UCHAR {
SESSION_ABORTED // = 6
}

const char[4]
enum char[4]
ALL_TRANSPORTS = "M\0\0\0",
MS_NBF = "MNBF";

Expand Down Expand Up @@ -70,7 +70,7 @@ enum : UCHAR {
NCBTRACE // = 0x79
}

const UCHAR ASYNCH = 0x80;
enum UCHAR ASYNCH = 0x80;

enum : UCHAR {
NRC_GOODRET = 0x00,
Expand Down
22 changes: 12 additions & 10 deletions src/core/sys/windows/nddeapi.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
module core.sys.windows.nddeapi;
version (Windows):

version (ANSI) {} else version = Unicode;

private import core.sys.windows.windef;

// FIXME: check types and grouping of constants
Expand All @@ -21,9 +23,9 @@ private import core.sys.windows.windef;
#endif
+/

const char SEP_CHAR = ',';
enum char SEP_CHAR = ',';
const char[] BAR_CHAR = "|";
const wchar SEP_WCHAR = ',';
enum wchar SEP_WCHAR = ',';
const wchar[] BAR_WCHAR = "|";

enum {
Expand Down Expand Up @@ -57,23 +59,23 @@ enum {
NDDE_TRUST_SHARE_FAIL
}

const size_t
enum size_t
MAX_NDDESHARENAME = 256,
MAX_DOMAINNAME = 15,
MAX_USERNAME = 15,
MAX_APPNAME = 255,
MAX_TOPICNAME = 255,
MAX_ITEMNAME = 255;

const NDDEF_NOPASSWORDPROMPT = 1;
const NDDEF_NOCACHELOOKUP = 2;
const NDDEF_STRIP_NDDE = 4;
enum NDDEF_NOPASSWORDPROMPT = 1;
enum NDDEF_NOCACHELOOKUP = 2;
enum NDDEF_STRIP_NDDE = 4;

const SHARE_TYPE_OLD = 1;
const SHARE_TYPE_NEW = 2;
const SHARE_TYPE_STATIC = 4;
enum SHARE_TYPE_OLD = 1;
enum SHARE_TYPE_NEW = 2;
enum SHARE_TYPE_STATIC = 4;

const uint
enum uint
NDDE_CMD_SHOW_MASK = 0x0000FFFF,
NDDE_TRUST_CMD_SHOW = 0x10000000,
NDDE_TRUST_SHARE_DEL = 0x20000000,
Expand Down
2 changes: 2 additions & 0 deletions src/core/sys/windows/nspapi.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
module core.sys.windows.nspapi;
version (Windows):

version (ANSI) {} else version = Unicode;

private import core.sys.windows.basetyps, core.sys.windows.windef;

// FIXME: check types of constants
Expand Down
2 changes: 1 addition & 1 deletion src/core/sys/windows/ntdef.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ version (Windows):

private import core.sys.windows.basetsd, core.sys.windows.subauth, core.sys.windows.windef, core.sys.windows.winnt;

const uint
enum uint
OBJ_INHERIT = 0x0002,
OBJ_PERMANENT = 0x0010,
OBJ_EXCLUSIVE = 0x0020,
Expand Down
6 changes: 4 additions & 2 deletions src/core/sys/windows/ntldap.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
module core.sys.windows.ntldap;
version (Windows):

version (ANSI) {} else version = Unicode;

/* TOTHINKABOUT: These constants don't have ANSI/Unicode versioned
* aliases. Should we merge them anyway?
*/
Expand Down Expand Up @@ -54,5 +56,5 @@ const wchar[]
LDAP_SERVER_PERMISSIVE_MODIFY_OID_W = "1.2.840.113556.1.4.1413",
LDAP_SERVER_CROSSDOM_MOVE_TARGET_OID_W = "1.2.840.113556.1.4.521";

const SERVER_SEARCH_FLAG_DOMAIN_SCOPE = 1;
const SERVER_SEARCH_FLAG_PHANTOM_ROOT = 2;
enum SERVER_SEARCH_FLAG_DOMAIN_SCOPE = 1;
enum SERVER_SEARCH_FLAG_PHANTOM_ROOT = 2;
117 changes: 60 additions & 57 deletions src/core/sys/windows/ntsecapi.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,26 +9,29 @@
*/
module core.sys.windows.ntsecapi;
version (Windows):
pragma(lib, "advapi32");

version (ANSI) {} else version = Unicode;

private import
core.sys.windows.basetyps, core.sys.windows.ntdef, core.sys.windows.windef, core.sys.windows.winnt, core.sys.windows.w32api;

// FIXME: check types and grouping of constants
// FIXME: check Windows version support

const KERB_WRAP_NO_ENCRYPT = 0x80000001;
enum KERB_WRAP_NO_ENCRYPT = 0x80000001;

const LOGON_GUEST = 0x00000001;
const LOGON_NOENCRYPTION = 0x00000002;
const LOGON_CACHED_ACCOUNT = 0x00000004;
const LOGON_USED_LM_PASSWORD = 0x00000008;
const LOGON_EXTRA_SIDS = 0x00000020;
const LOGON_SUBAUTH_SESSION_KEY = 0x00000040;
const LOGON_SERVER_TRUST_ACCOUNT = 0x00000080;
const LOGON_NTLMV2_ENABLED = 0x00000100;
const LOGON_RESOURCE_GROUPS = 0x00000200;
const LOGON_PROFILE_PATH_RETURNED = 0x00000400;
const LOGON_GRACE_LOGON = 0x01000000;
enum LOGON_GUEST = 0x00000001;
enum LOGON_NOENCRYPTION = 0x00000002;
enum LOGON_CACHED_ACCOUNT = 0x00000004;
enum LOGON_USED_LM_PASSWORD = 0x00000008;
enum LOGON_EXTRA_SIDS = 0x00000020;
enum LOGON_SUBAUTH_SESSION_KEY = 0x00000040;
enum LOGON_SERVER_TRUST_ACCOUNT = 0x00000080;
enum LOGON_NTLMV2_ENABLED = 0x00000100;
enum LOGON_RESOURCE_GROUPS = 0x00000200;
enum LOGON_PROFILE_PATH_RETURNED = 0x00000400;
enum LOGON_GRACE_LOGON = 0x01000000;

enum {
LSA_MODE_PASSWORD_PROTECTED = 1,
Expand All @@ -47,18 +50,18 @@ const wchar[] MICROSOFT_KERBEROS_NAME_W = "Kerberos";
const char[] MSV1_0_PACKAGE_NAME = "MICROSOFT_AUTHENTICATION_PACKAGE_V1_0";
const wchar[] MSV1_0_PACKAGE_NAMEW = "MICROSOFT_AUTHENTICATION_PACKAGE_V1_0";

const MSV1_0_ALLOW_SERVER_TRUST_ACCOUNT = 32;
const MSV1_0_ALLOW_WORKSTATION_TRUST_ACCOUNT = 2048;
const MSV1_0_CLEARTEXT_PASSWORD_ALLOWED = 2;
const MSV1_0_CRED_LM_PRESENT = 1;
const MSV1_0_CRED_NT_PRESENT = 2;
const MSV1_0_CRED_VERSION = 0;
const MSV1_0_DONT_TRY_GUEST_ACCOUNT = 16;
const MSV1_0_MAX_NTLM3_LIFE = 1800;
const MSV1_0_MAX_AVL_SIZE = 64000;
const MSV1_0_MNS_LOGON = 16777216;

const size_t
enum MSV1_0_ALLOW_SERVER_TRUST_ACCOUNT = 32;
enum MSV1_0_ALLOW_WORKSTATION_TRUST_ACCOUNT = 2048;
enum MSV1_0_CLEARTEXT_PASSWORD_ALLOWED = 2;
enum MSV1_0_CRED_LM_PRESENT = 1;
enum MSV1_0_CRED_NT_PRESENT = 2;
enum MSV1_0_CRED_VERSION = 0;
enum MSV1_0_DONT_TRY_GUEST_ACCOUNT = 16;
enum MSV1_0_MAX_NTLM3_LIFE = 1800;
enum MSV1_0_MAX_AVL_SIZE = 64000;
enum MSV1_0_MNS_LOGON = 16777216;

enum size_t
MSV1_0_CHALLENGE_LENGTH = 8,
MSV1_0_LANMAN_SESSION_KEY_LENGTH = 8,
MSV1_0_NTLM3_RESPONSE_LENGTH = 16,
Expand All @@ -69,27 +72,27 @@ const size_t
MSV1_0_PACKAGE_NAMEW_LENGTH = MSV1_0_PACKAGE_NAMEW.sizeof
- WCHAR.sizeof;

const MSV1_0_RETURN_USER_PARAMETERS = 8;
const MSV1_0_RETURN_PASSWORD_EXPIRY = 64;
const MSV1_0_RETURN_PROFILE_PATH = 512;
const MSV1_0_SUBAUTHENTICATION_DLL_EX = 1048576;
const MSV1_0_SUBAUTHENTICATION_DLL = 0xff000000;
const MSV1_0_SUBAUTHENTICATION_DLL_SHIFT = 24;
const MSV1_0_SUBAUTHENTICATION_DLL_RAS = 2;
const MSV1_0_SUBAUTHENTICATION_DLL_IIS = 132;
const MSV1_0_SUBAUTHENTICATION_FLAGS = 0xff000000;
const MSV1_0_TRY_GUEST_ACCOUNT_ONLY = 256;
const MSV1_0_TRY_SPECIFIED_DOMAIN_ONLY = 1024;
const MSV1_0_UPDATE_LOGON_STATISTICS = 4;
const MSV1_0_USE_CLIENT_CHALLENGE = 128;
const MSV1_0_USER_SESSION_KEY_LENGTH = 16;
enum MSV1_0_RETURN_USER_PARAMETERS = 8;
enum MSV1_0_RETURN_PASSWORD_EXPIRY = 64;
enum MSV1_0_RETURN_PROFILE_PATH = 512;
enum MSV1_0_SUBAUTHENTICATION_DLL_EX = 1048576;
enum MSV1_0_SUBAUTHENTICATION_DLL = 0xff000000;
enum MSV1_0_SUBAUTHENTICATION_DLL_SHIFT = 24;
enum MSV1_0_SUBAUTHENTICATION_DLL_RAS = 2;
enum MSV1_0_SUBAUTHENTICATION_DLL_IIS = 132;
enum MSV1_0_SUBAUTHENTICATION_FLAGS = 0xff000000;
enum MSV1_0_TRY_GUEST_ACCOUNT_ONLY = 256;
enum MSV1_0_TRY_SPECIFIED_DOMAIN_ONLY = 1024;
enum MSV1_0_UPDATE_LOGON_STATISTICS = 4;
enum MSV1_0_USE_CLIENT_CHALLENGE = 128;
enum MSV1_0_USER_SESSION_KEY_LENGTH = 16;

const char[]
MSV1_0_SUBAUTHENTICATION_KEY
= `System\CurrentControlSet\Control\Lsa\MSV1_0`,
MSV1_0_SUBAUTHENTICATION_VALUE = "Auth";

const ACCESS_MASK
enum ACCESS_MASK
POLICY_VIEW_LOCAL_INFORMATION = 0x0001,
POLICY_VIEW_AUDIT_INFORMATION = 0x0002,
POLICY_GET_PRIVATE_INFORMATION = 0x0004,
Expand All @@ -108,11 +111,11 @@ const ACCESS_MASK
POLICY_EXECUTE = STANDARD_RIGHTS_EXECUTE | 0x0801,
POLICY_ALL_ACCESS = STANDARD_RIGHTS_REQUIRED | 0x0FFF;

const POLICY_AUDIT_EVENT_UNCHANGED = 0;
const POLICY_AUDIT_EVENT_SUCCESS = 1;
const POLICY_AUDIT_EVENT_FAILURE = 2;
const POLICY_AUDIT_EVENT_NONE = 4;
const POLICY_AUDIT_EVENT_MASK = 7;
enum POLICY_AUDIT_EVENT_UNCHANGED = 0;
enum POLICY_AUDIT_EVENT_SUCCESS = 1;
enum POLICY_AUDIT_EVENT_FAILURE = 2;
enum POLICY_AUDIT_EVENT_NONE = 4;
enum POLICY_AUDIT_EVENT_MASK = 7;

enum {
POLICY_LOCATION_LOCAL = 1,
Expand All @@ -127,19 +130,19 @@ enum : uint {
}


const POLICY_QOS_SCHANEL_REQUIRED = 0x0001;
const POLICY_QOS_OUTBOUND_INTEGRITY = 0x0002;
const POLICY_QOS_OUTBOUND_CONFIDENTIALITY = 0x0004;
const POLICY_QOS_INBOUND_INTEGREITY = 0x0008;
const POLICY_QOS_INBOUND_CONFIDENTIALITY = 0x0010;
const POLICY_QOS_ALLOW_LOCAL_ROOT_CERT_STORE = 0x0020;
const POLICY_QOS_RAS_SERVER_ALLOWED = 0x0040;
const POLICY_QOS_DHCP_SERVER_ALLOWD = 0x0080;
enum POLICY_QOS_SCHANEL_REQUIRED = 0x0001;
enum POLICY_QOS_OUTBOUND_INTEGRITY = 0x0002;
enum POLICY_QOS_OUTBOUND_CONFIDENTIALITY = 0x0004;
enum POLICY_QOS_INBOUND_INTEGREITY = 0x0008;
enum POLICY_QOS_INBOUND_CONFIDENTIALITY = 0x0010;
enum POLICY_QOS_ALLOW_LOCAL_ROOT_CERT_STORE = 0x0020;
enum POLICY_QOS_RAS_SERVER_ALLOWED = 0x0040;
enum POLICY_QOS_DHCP_SERVER_ALLOWD = 0x0080;

const POLICY_KERBEROS_FORWARDABLE = 1;
const POLICY_KERBEROS_PROXYABLE = 2;
const POLICY_KERBEROS_RENEWABLE = 4;
const POLICY_KERBEROS_POSTDATEABLE = 8;
enum POLICY_KERBEROS_FORWARDABLE = 1;
enum POLICY_KERBEROS_PROXYABLE = 2;
enum POLICY_KERBEROS_RENEWABLE = 4;
enum POLICY_KERBEROS_POSTDATEABLE = 8;

const char[]
SAM_PASSWORD_CHANGE_NOTIFY_ROUTINE = "PasswordChangeNotify",
Expand Down Expand Up @@ -494,7 +497,7 @@ struct MSV1_0_SUBAUTH_RESPONSE {
}
alias MSV1_0_SUBAUTH_RESPONSE* PMSV1_0_SUBAUTH_RESPONSE;

const MSV1_0_DERIVECRED_TYPE_SHA1 = 0;
enum MSV1_0_DERIVECRED_TYPE_SHA1 = 0;

struct MSV1_0_DERIVECRED_REQUEST {
MSV1_0_PROTOCOL_MESSAGE_TYPE MessageType;
Expand Down
84 changes: 42 additions & 42 deletions src/core/sys/windows/oaidl.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,48 +11,48 @@ version (Windows):

private import core.sys.windows.basetyps, core.sys.windows.unknwn, core.sys.windows.windef, core.sys.windows.wtypes;

const DISPID_UNKNOWN = -1;
const DISPID_VALUE = 0;
const DISPID_PROPERTYPUT = -3;
const DISPID_NEWENUM = -4;
const DISPID_EVALUATE = -5;
const DISPID_CONSTRUCTOR = -6;
const DISPID_DESTRUCTOR = -7;
const DISPID_COLLECT = -8;

const FADF_AUTO = 1;
const FADF_STATIC = 2;
const FADF_EMBEDDED = 4;
const FADF_FIXEDSIZE = 16;
const FADF_RECORD = 32;
const FADF_HAVEIID = 64;
const FADF_HAVEVARTYPE = 128;
const FADF_BSTR = 256;
const FADF_UNKNOWN = 512;
const FADF_DISPATCH = 1024;
const FADF_VARIANT = 2048;
const FADF_RESERVED = 0xf0e8;
const FADF_DATADELETED = 0x1000;
const FADF_CREATEVECTOR = 0x2000;

const PARAMFLAG_NONE = 0;
const PARAMFLAG_FIN = 1;
const PARAMFLAG_FOUT = 2;
const PARAMFLAG_FLCID = 4;
const PARAMFLAG_FRETVAL = 8;
const PARAMFLAG_FOPT = 16;
const PARAMFLAG_FHASDEFAULT = 32;

const IDLFLAG_NONE = PARAMFLAG_NONE;
const IDLFLAG_FIN = PARAMFLAG_FIN;
const IDLFLAG_FOUT = PARAMFLAG_FOUT;
const IDLFLAG_FLCID = PARAMFLAG_FLCID;
const IDLFLAG_FRETVAL = PARAMFLAG_FRETVAL;

const IMPLTYPEFLAG_FDEFAULT = 1;
const IMPLTYPEFLAG_FSOURCE = 2;
const IMPLTYPEFLAG_FRESTRICTED = 4;
const IMPLTYPEFLAG_FDEFAULTVTABLE = 8;
enum DISPID_UNKNOWN = -1;
enum DISPID_VALUE = 0;
enum DISPID_PROPERTYPUT = -3;
enum DISPID_NEWENUM = -4;
enum DISPID_EVALUATE = -5;
enum DISPID_CONSTRUCTOR = -6;
enum DISPID_DESTRUCTOR = -7;
enum DISPID_COLLECT = -8;

enum FADF_AUTO = 1;
enum FADF_STATIC = 2;
enum FADF_EMBEDDED = 4;
enum FADF_FIXEDSIZE = 16;
enum FADF_RECORD = 32;
enum FADF_HAVEIID = 64;
enum FADF_HAVEVARTYPE = 128;
enum FADF_BSTR = 256;
enum FADF_UNKNOWN = 512;
enum FADF_DISPATCH = 1024;
enum FADF_VARIANT = 2048;
enum FADF_RESERVED = 0xf0e8;
enum FADF_DATADELETED = 0x1000;
enum FADF_CREATEVECTOR = 0x2000;

enum PARAMFLAG_NONE = 0;
enum PARAMFLAG_FIN = 1;
enum PARAMFLAG_FOUT = 2;
enum PARAMFLAG_FLCID = 4;
enum PARAMFLAG_FRETVAL = 8;
enum PARAMFLAG_FOPT = 16;
enum PARAMFLAG_FHASDEFAULT = 32;

enum IDLFLAG_NONE = PARAMFLAG_NONE;
enum IDLFLAG_FIN = PARAMFLAG_FIN;
enum IDLFLAG_FOUT = PARAMFLAG_FOUT;
enum IDLFLAG_FLCID = PARAMFLAG_FLCID;
enum IDLFLAG_FRETVAL = PARAMFLAG_FRETVAL;

enum IMPLTYPEFLAG_FDEFAULT = 1;
enum IMPLTYPEFLAG_FSOURCE = 2;
enum IMPLTYPEFLAG_FRESTRICTED = 4;
enum IMPLTYPEFLAG_FDEFAULTVTABLE = 8;


enum SYSKIND {
Expand Down
74 changes: 37 additions & 37 deletions src/core/sys/windows/objbase.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,42 +18,42 @@ private import core.sys.windows.basetyps, core.sys.windows.objfwd, core.sys.wind
//MACRO #define LISet32(li, v) ((li).HighPart=(v)<0?-1:0, (li).LowPart=(v))
//MACRO #define ULISet32(li, v) ((li).HighPart=0, (li).LowPart=(v))

const CLSCTX_ALL = CLSCTX.CLSCTX_INPROC_SERVER|CLSCTX.CLSCTX_INPROC_HANDLER|CLSCTX.CLSCTX_LOCAL_SERVER;
const CLSCTX_INPROC = CLSCTX.CLSCTX_INPROC_SERVER|CLSCTX.CLSCTX_INPROC_HANDLER;
const CLSCTX_SERVER = CLSCTX.CLSCTX_INPROC_SERVER|CLSCTX.CLSCTX_LOCAL_SERVER|CLSCTX.CLSCTX_REMOTE_SERVER;
const MARSHALINTERFACE_MIN=500;
const CWCSTORAGENAME=32;

const STGM_DIRECT = 0;
const STGM_TRANSACTED = 0x10000L;
const STGM_SIMPLE = 0x8000000L;
const STGM_READ = 0;
const STGM_WRITE = 1;
const STGM_READWRITE = 2;
const STGM_SHARE_DENY_NONE = 0x40;
const STGM_SHARE_DENY_READ = 0x30;
const STGM_SHARE_DENY_WRITE = 0x20;
const STGM_SHARE_EXCLUSIVE = 0x10;
const STGM_PRIORITY = 0x40000L;
const STGM_DELETEONRELEASE = 0x4000000;
const STGM_NOSCRATCH = 0x100000;
const STGM_CREATE = 0x1000;
const STGM_CONVERT = 0x20000;
const STGM_NOSNAPSHOT = 0x200000;
const STGM_FAILIFTHERE = 0;

const ASYNC_MODE_COMPATIBILITY = 1;
const ASYNC_MODE_DEFAULT = 0;

const STGTY_REPEAT = 256;
const STG_TOEND = 0xFFFFFFFF;
const STG_LAYOUT_SEQUENTIAL = 0;
const STG_LAYOUT_INTERLEAVED = 1;

const COM_RIGHTS_EXECUTE = 1;
const COM_RIGHTS_SAFE_FOR_SCRIPTING = 2;

const STGOPTIONS_VERSION = 2;
enum CLSCTX_ALL = CLSCTX.CLSCTX_INPROC_SERVER|CLSCTX.CLSCTX_INPROC_HANDLER|CLSCTX.CLSCTX_LOCAL_SERVER;
enum CLSCTX_INPROC = CLSCTX.CLSCTX_INPROC_SERVER|CLSCTX.CLSCTX_INPROC_HANDLER;
enum CLSCTX_SERVER = CLSCTX.CLSCTX_INPROC_SERVER|CLSCTX.CLSCTX_LOCAL_SERVER|CLSCTX.CLSCTX_REMOTE_SERVER;
enum MARSHALINTERFACE_MIN=500;
enum CWCSTORAGENAME=32;

enum STGM_DIRECT = 0;
enum STGM_TRANSACTED = 0x10000L;
enum STGM_SIMPLE = 0x8000000L;
enum STGM_READ = 0;
enum STGM_WRITE = 1;
enum STGM_READWRITE = 2;
enum STGM_SHARE_DENY_NONE = 0x40;
enum STGM_SHARE_DENY_READ = 0x30;
enum STGM_SHARE_DENY_WRITE = 0x20;
enum STGM_SHARE_EXCLUSIVE = 0x10;
enum STGM_PRIORITY = 0x40000L;
enum STGM_DELETEONRELEASE = 0x4000000;
enum STGM_NOSCRATCH = 0x100000;
enum STGM_CREATE = 0x1000;
enum STGM_CONVERT = 0x20000;
enum STGM_NOSNAPSHOT = 0x200000;
enum STGM_FAILIFTHERE = 0;

enum ASYNC_MODE_COMPATIBILITY = 1;
enum ASYNC_MODE_DEFAULT = 0;

enum STGTY_REPEAT = 256;
enum STG_TOEND = 0xFFFFFFFF;
enum STG_LAYOUT_SEQUENTIAL = 0;
enum STG_LAYOUT_INTERLEAVED = 1;

enum COM_RIGHTS_EXECUTE = 1;
enum COM_RIGHTS_SAFE_FOR_SCRIPTING = 2;

enum STGOPTIONS_VERSION = 2;

enum STGFMT {
STGFMT_STORAGE = 0,
Expand All @@ -66,7 +66,7 @@ struct STGOPTIONS {
USHORT usVersion;
USHORT reserved;
ULONG ulSectorSize;
const(WCHAR)* pwcsTemplateFile;
const(WCHAR)* pwcsTemplateFile;
}

enum REGCLS {
Expand Down
6 changes: 3 additions & 3 deletions src/core/sys/windows/objidl.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ enum EXTCONN {
}

struct MULTI_QI {
const(IID)* pIID;
const(IID)* pIID;
IUnknown pItf;
HRESULT hr;
}
Expand Down Expand Up @@ -474,7 +474,7 @@ struct SOLE_AUTHENTICATION_SERVICE {
HRESULT hr;
}

const OLECHAR* COLE_DEFAULT_PRINCIPAL = cast ( OLECHAR* )(-1);
enum OLECHAR* COLE_DEFAULT_PRINCIPAL = cast ( OLECHAR* )(-1);

enum EOLE_AUTHENTICATION_CAPABILITIES {
EOAC_NONE = 0,
Expand All @@ -500,7 +500,7 @@ struct SOLE_AUTHENTICATION_INFO {
void* pAuthInfo;
}

const void* COLE_DEFAULT_AUTHINFO = cast( void* )(-1 );
enum void* COLE_DEFAULT_AUTHINFO = cast( void* )(-1 );

struct SOLE_AUTHENTICATION_LIST {
DWORD cAuthInfo;
Expand Down
2 changes: 2 additions & 0 deletions src/core/sys/windows/odbcinst.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
module core.sys.windows.odbcinst;
version (Windows):

version (ANSI) {} else version = Unicode;

import core.sys.windows.sql;
private import core.sys.windows.windef;

Expand Down
9 changes: 5 additions & 4 deletions src/core/sys/windows/ole.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
*/
module core.sys.windows.ole;
version (Windows):
pragma(lib, "ole32");

private import core.sys.windows.windef, core.sys.windows.wingdi, core.sys.windows.uuid;

Expand All @@ -23,10 +24,10 @@ enum {
OT_STATIC
}

const OLEVERB_PRIMARY = 0;
const OF_SET = 1;
const OF_GET = 2;
const OF_HANDLER = 4;
enum OLEVERB_PRIMARY = 0;
enum OF_SET = 1;
enum OF_GET = 2;
enum OF_HANDLER = 4;

struct OLETARGETDEVICE {
USHORT otdDeviceNameOffset;
Expand Down
12 changes: 6 additions & 6 deletions src/core/sys/windows/ole2.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ public import core.sys.windows.basetyps, core.sys.windows.objbase, core.sys.wind
private import core.sys.windows.objfwd, core.sys.windows.objidl, core.sys.windows.windef, core.sys.windows.wtypes;
private import core.sys.windows.winuser; // for LPMSG

const E_DRAW = VIEW_E_DRAW;
enum E_DRAW = VIEW_E_DRAW;

const DATA_E_FORMATETC = DV_E_FORMATETC;
enum DATA_E_FORMATETC = DV_E_FORMATETC;

enum {
OLEIVERB_PRIMARY = 0,
Expand All @@ -29,10 +29,10 @@ enum {
OLEIVERB_DISCARDUNDOSTATE = -6
}

const EMBDHLP_INPROC_HANDLER = 0x0000L;
const EMBDHLP_INPROC_SERVER = 0x0001L;
const EMBDHLP_CREATENOW = 0x00000000L;
const EMBDHLP_DELAYCREATE = 0x00010000L;
enum EMBDHLP_INPROC_HANDLER = 0x0000L;
enum EMBDHLP_INPROC_SERVER = 0x0001L;
enum EMBDHLP_CREATENOW = 0x00000000L;
enum EMBDHLP_DELAYCREATE = 0x00010000L;

align(8):
struct OLESTREAM {
Expand Down
4 changes: 2 additions & 2 deletions src/core/sys/windows/ole2ver.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ module core.sys.windows.ole2ver;
version (Windows):

// These are apparently not documented on the MSDN site
const rmm = 23;
const rup = 639;
enum rmm = 23;
enum rup = 639;
4 changes: 3 additions & 1 deletion src/core/sys/windows/oleacc.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
*/
module core.sys.windows.oleacc;
version (Windows):

version (ANSI) {} else version = Unicode;
pragma(lib, "oleacc");

private import core.sys.windows.basetyps, core.sys.windows.oaidl, core.sys.windows.unknwn, core.sys.windows.wtypes,
Expand Down Expand Up @@ -153,7 +155,7 @@ enum SELFLAG
SELFLAG_REMOVESELECTION = 16
}

const SELFLAG_VALID = 0x0000001F;
enum SELFLAG_VALID = 0x0000001F;


interface IAccessible : IDispatch {
Expand Down
124 changes: 62 additions & 62 deletions src/core/sys/windows/oleauto.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,31 +15,31 @@ private import core.sys.windows.basetyps, core.sys.windows.unknwn, core.sys.wind
private import core.sys.windows.winbase; // for SYSTEMTIME

align(8):
const STDOLE_MAJORVERNUM = 1;
const STDOLE_MINORVERNUM = 0;
const STDOLE_LCID = 0;

const VARIANT_NOVALUEPROP = 0x01;
const VARIANT_ALPHABOOL = 0x02;
const VARIANT_NOUSEOVERRIDE = 0x04;
const VARIANT_LOCALBOOL = 0x08;

const VAR_TIMEVALUEONLY = 0x0001;
const VAR_DATEVALUEONLY = 0x0002;
const VAR_VALIDDATE = 0x0004;
const VAR_CALENDAR_HIJRI = 0x0008;
const VAR_LOCALBOOL = 0x0010;
const VAR_FORMAT_NOSUBSTITUTE = 0x0020;
const VAR_FOURDIGITYEARS = 0x0040;
const VAR_CALENDAR_THAI = 0x0080;
const VAR_CALENDAR_GREGORIAN = 0x0100;

const MEMBERID_NIL = DISPID_UNKNOWN;
const ID_DEFAULTINST = -2;
const DISPATCH_METHOD = 1;
const DISPATCH_PROPERTYGET = 2;
const DISPATCH_PROPERTYPUT = 4;
const DISPATCH_PROPERTYPUTREF = 8;
enum STDOLE_MAJORVERNUM = 1;
enum STDOLE_MINORVERNUM = 0;
enum STDOLE_LCID = 0;

enum VARIANT_NOVALUEPROP = 0x01;
enum VARIANT_ALPHABOOL = 0x02;
enum VARIANT_NOUSEOVERRIDE = 0x04;
enum VARIANT_LOCALBOOL = 0x08;

enum VAR_TIMEVALUEONLY = 0x0001;
enum VAR_DATEVALUEONLY = 0x0002;
enum VAR_VALIDDATE = 0x0004;
enum VAR_CALENDAR_HIJRI = 0x0008;
enum VAR_LOCALBOOL = 0x0010;
enum VAR_FORMAT_NOSUBSTITUTE = 0x0020;
enum VAR_FOURDIGITYEARS = 0x0040;
enum VAR_CALENDAR_THAI = 0x0080;
enum VAR_CALENDAR_GREGORIAN = 0x0100;

enum MEMBERID_NIL = DISPID_UNKNOWN;
enum ID_DEFAULTINST = -2;
enum DISPATCH_METHOD = 1;
enum DISPATCH_PROPERTYGET = 2;
enum DISPATCH_PROPERTYPUT = 4;
enum DISPATCH_PROPERTYPUTREF = 8;

//ULONG LHashValOfName(LCID l, OLECHAR* n) { return LHashValOfNameSys(SYSKIND.SYS_WIN32, l, n); }

Expand Down Expand Up @@ -126,43 +126,43 @@ enum {
VARCMP_NULL // = 3
}

const LOCALE_USE_NLS = 0x10000000;

const VARIANT_NOUSEROVERRIDE = 0x04;
const VARIANT_CALENDAR_HIJRI = 0x08;
const VARIANT_CALENDAR_THAI = 0x20;
const VARIANT_CALENDAR_GREGORIAN = 0x40;
const VARIANT_USE_NLS = 0x80;

const NUMPRS_LEADING_WHITE = 0x00001;
const NUMPRS_TRAILING_WHITE = 0x00002;
const NUMPRS_LEADING_PLUS = 0x00004;
const NUMPRS_TRAILING_PLUS = 0x00008;
const NUMPRS_LEADING_MINUS = 0x00010;
const NUMPRS_TRAILING_MINUS = 0x00020;
const NUMPRS_HEX_OCT = 0x00040;
const NUMPRS_PARENS = 0x00080;
const NUMPRS_DECIMAL = 0x00100;
const NUMPRS_THOUSANDS = 0x00200;
const NUMPRS_CURRENCY = 0x00400;
const NUMPRS_EXPONENT = 0x00800;
const NUMPRS_USE_ALL = 0x01000;
const NUMPRS_STD = 0x01FFF;
const NUMPRS_NEG = 0x10000;
const NUMPRS_INEXACT = 0x20000;

const VTBIT_I1 = 1 << VARENUM.VT_I1;
const VTBIT_UI1 = 1 << VARENUM.VT_UI1;
const VTBIT_I2 = 1 << VARENUM.VT_I2;
const VTBIT_UI2 = 1 << VARENUM.VT_UI2;
const VTBIT_I4 = 1 << VARENUM.VT_I4;
const VTBIT_UI4 = 1 << VARENUM.VT_UI4;
const VTBIT_I8 = 1 << VARENUM.VT_I8;
const VTBIT_UI8 = 1 << VARENUM.VT_UI8;
const VTBIT_R4 = 1 << VARENUM.VT_R4;
const VTBIT_R8 = 1 << VARENUM.VT_R8;
const VTBIT_CY = 1 << VARENUM.VT_CY;
const VTBIT_DECIMAL = 1 << VARENUM.VT_DECIMAL;
enum LOCALE_USE_NLS = 0x10000000;

enum VARIANT_NOUSEROVERRIDE = 0x04;
enum VARIANT_CALENDAR_HIJRI = 0x08;
enum VARIANT_CALENDAR_THAI = 0x20;
enum VARIANT_CALENDAR_GREGORIAN = 0x40;
enum VARIANT_USE_NLS = 0x80;

enum NUMPRS_LEADING_WHITE = 0x00001;
enum NUMPRS_TRAILING_WHITE = 0x00002;
enum NUMPRS_LEADING_PLUS = 0x00004;
enum NUMPRS_TRAILING_PLUS = 0x00008;
enum NUMPRS_LEADING_MINUS = 0x00010;
enum NUMPRS_TRAILING_MINUS = 0x00020;
enum NUMPRS_HEX_OCT = 0x00040;
enum NUMPRS_PARENS = 0x00080;
enum NUMPRS_DECIMAL = 0x00100;
enum NUMPRS_THOUSANDS = 0x00200;
enum NUMPRS_CURRENCY = 0x00400;
enum NUMPRS_EXPONENT = 0x00800;
enum NUMPRS_USE_ALL = 0x01000;
enum NUMPRS_STD = 0x01FFF;
enum NUMPRS_NEG = 0x10000;
enum NUMPRS_INEXACT = 0x20000;

enum VTBIT_I1 = 1 << VARENUM.VT_I1;
enum VTBIT_UI1 = 1 << VARENUM.VT_UI1;
enum VTBIT_I2 = 1 << VARENUM.VT_I2;
enum VTBIT_UI2 = 1 << VARENUM.VT_UI2;
enum VTBIT_I4 = 1 << VARENUM.VT_I4;
enum VTBIT_UI4 = 1 << VARENUM.VT_UI4;
enum VTBIT_I8 = 1 << VARENUM.VT_I8;
enum VTBIT_UI8 = 1 << VARENUM.VT_UI8;
enum VTBIT_R4 = 1 << VARENUM.VT_R4;
enum VTBIT_R8 = 1 << VARENUM.VT_R8;
enum VTBIT_CY = 1 << VARENUM.VT_CY;
enum VTBIT_DECIMAL = 1 << VARENUM.VT_DECIMAL;


enum REGKIND{
Expand Down
50 changes: 25 additions & 25 deletions src/core/sys/windows/olectl.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,19 +24,19 @@ private {
// These replace C macros.
template ITF_ERROR_SCODE_FOR_D(int c)
{
const SCODE ITF_ERROR_SCODE_FOR_D
enum SCODE ITF_ERROR_SCODE_FOR_D
= (SEVERITY_ERROR << 31) | (FACILITY_ITF << 16) | c;
}

template ITF_SUCCESS_SCODE_FOR_D(int c)
{
const SCODE ITF_SUCCESS_SCODE_FOR_D
enum SCODE ITF_SUCCESS_SCODE_FOR_D
= (SEVERITY_SUCCESS << 31) | (FACILITY_ITF << 16) | c;
}

template STD_CTL_SCODE(int c)
{
const SCODE STD_CTL_SCODE
enum SCODE STD_CTL_SCODE
= (SEVERITY_ERROR << 31) | (FACILITY_CONTROL << 16) | c;
}
}
Expand Down Expand Up @@ -85,7 +85,7 @@ enum : SCODE {
CTL_E_CUSTOM_FIRST = STD_CTL_SCODE!(600)
}

const SCODE CLASS_E_NOTLICENSED = CLASSFACTORY_E_FIRST+2;
enum SCODE CLASS_E_NOTLICENSED = CLASSFACTORY_E_FIRST+2;

enum : SCODE {
CONNECT_E_FIRST = ITF_ERROR_SCODE_FOR_D!(0x200),
Expand Down Expand Up @@ -135,26 +135,26 @@ enum {
OLEMISC_WANTSTOMENUMERGE = 0x100000,
OLEMISC_SUPPORTSMULTILEVELUNDO = 0x200000
}
const OLEIVERB_PROPERTIES = -7;

const VT_STREAMED_PROPSET = 73;
const VT_STORED_PROPSET = 74;
const VT_BLOB_PROPSET = 75;
const VT_VERBOSE_ENUM = 76;
const VT_COLOR = VARENUM.VT_I4;
const VT_XPOS_PIXELS = VARENUM.VT_I4;
const VT_YPOS_PIXELS = VARENUM.VT_I4;
const VT_XSIZE_PIXELS = VARENUM.VT_I4;
const VT_YSIZE_PIXELS = VARENUM.VT_I4;
const VT_XPOS_HIMETRIC = VARENUM.VT_I4;
const VT_YPOS_HIMETRIC = VARENUM.VT_I4;
const VT_XSIZE_HIMETRIC = VARENUM.VT_I4;
const VT_YSIZE_HIMETRIC = VARENUM.VT_I4;
const VT_TRISTATE = VARENUM.VT_I2;
const VT_OPTEXCLUSIVE = VARENUM.VT_BOOL;
const VT_FONT = VARENUM.VT_DISPATCH;
const VT_PICTURE = VARENUM.VT_DISPATCH;
const VT_HANDLE = VARENUM.VT_I4;
enum OLEIVERB_PROPERTIES = -7;

enum VT_STREAMED_PROPSET = 73;
enum VT_STORED_PROPSET = 74;
enum VT_BLOB_PROPSET = 75;
enum VT_VERBOSE_ENUM = 76;
enum VT_COLOR = VARENUM.VT_I4;
enum VT_XPOS_PIXELS = VARENUM.VT_I4;
enum VT_YPOS_PIXELS = VARENUM.VT_I4;
enum VT_XSIZE_PIXELS = VARENUM.VT_I4;
enum VT_YSIZE_PIXELS = VARENUM.VT_I4;
enum VT_XPOS_HIMETRIC = VARENUM.VT_I4;
enum VT_YPOS_HIMETRIC = VARENUM.VT_I4;
enum VT_XSIZE_HIMETRIC = VARENUM.VT_I4;
enum VT_YSIZE_HIMETRIC = VARENUM.VT_I4;
enum VT_TRISTATE = VARENUM.VT_I2;
enum VT_OPTEXCLUSIVE = VARENUM.VT_BOOL;
enum VT_FONT = VARENUM.VT_DISPATCH;
enum VT_PICTURE = VARENUM.VT_DISPATCH;
enum VT_HANDLE = VARENUM.VT_I4;

enum {
OCM__BASE = WM_USER + 0x1c00,
Expand Down Expand Up @@ -190,7 +190,7 @@ enum {
XFORMCOORDS_CONTAINERTOHIMETRIC = 8
}

const GUIDKIND_DEFAULT_SOURCE_DISP_IID = 1;
enum GUIDKIND_DEFAULT_SOURCE_DISP_IID = 1;

enum {
PROPPAGESTATUS_DIRTY = 1,
Expand Down
558 changes: 280 additions & 278 deletions src/core/sys/windows/oledlg.d
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/core/sys/windows/oleidl.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ private import core.sys.windows.basetyps, core.sys.windows.objidl, core.sys.wind
private import core.sys.windows.objfwd; // for LPMONIKER
private import core.sys.windows.wingdi; // for LPLOGPALETTE

const MK_ALT = 32;
enum MK_ALT = 32;

enum BINDSPEED {
BINDSPEED_INDEFINITE = 1,
Expand Down
2 changes: 1 addition & 1 deletion src/core/sys/windows/pbt.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ enum : WPARAM {
PBT_APMOEMEVENT // = 11
}

const LPARAM PBTF_APMRESUMEFROMFAILURE = 1;
enum LPARAM PBTF_APMRESUMEFROMFAILURE = 1;
4 changes: 2 additions & 2 deletions src/core/sys/windows/powrprof.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ private import core.sys.windows.ntdef;

// FIXME: look up Windows version support

const ULONG
enum ULONG
EnableSysTrayBatteryMeter = 1,
EnableMultiBatteryDisplay = 2,
EnablePasswordLogon = 4,
EnableWakeOnRing = 8,
EnableVideoDimDisplay = 16;

const UINT NEWSCHEME = -1;
enum UINT NEWSCHEME = -1;

struct GLOBAL_MACHINE_POWER_POLICY {
ULONG Revision;
Expand Down
4 changes: 3 additions & 1 deletion src/core/sys/windows/prsht.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,13 @@
*/
module core.sys.windows.prsht;
version (Windows):

version (ANSI) {} else version = Unicode;
pragma(lib, "comctl32");

private import core.sys.windows.w32api, core.sys.windows.windef, core.sys.windows.winuser;

const MAXPROPPAGES = 100;
enum MAXPROPPAGES = 100;

enum {
PSP_DEFAULT = 0x00000000,
Expand Down
2 changes: 2 additions & 0 deletions src/core/sys/windows/psapi.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
module core.sys.windows.psapi;
version (Windows):

version (ANSI) {} else version = Unicode;

private import core.sys.windows.w32api;
private import core.sys.windows.winbase;
private import core.sys.windows.windef;
Expand Down
272 changes: 137 additions & 135 deletions src/core/sys/windows/ras.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,72 +8,74 @@
*/
module core.sys.windows.ras;
version (Windows):

version (ANSI) {} else version = Unicode;
pragma(lib, "rasapi32");

private import core.sys.windows.basetyps, core.sys.windows.lmcons, core.sys.windows.w32api, core.sys.windows.windef;

align(4):

const RAS_MaxDeviceType = 16;
const RAS_MaxPhoneNumber = 128;
const RAS_MaxIpAddress = 15;
const RAS_MaxIpxAddress = 21;
const RAS_MaxEntryName = 256;
const RAS_MaxDeviceName = 128;
const RAS_MaxCallbackNumber = RAS_MaxPhoneNumber;
const RAS_MaxAreaCode = 10;
const RAS_MaxPadType = 32;
const RAS_MaxX25Address = 200;
const RAS_MaxFacilities = 200;
const RAS_MaxUserData = 200;
const RAS_MaxReplyMessage = 1024;

const RDEOPT_UsePrefixSuffix = 0x00000001;
const RDEOPT_PausedStates = 0x00000002;
const RDEOPT_IgnoreModemSpeaker = 0x00000004;
const RDEOPT_SetModemSpeaker = 0x00000008;
const RDEOPT_IgnoreSoftwareCompression = 0x00000010;
const RDEOPT_SetSoftwareCompression = 0x00000020;
const RDEOPT_DisableConnectedUI = 0x00000040;
const RDEOPT_DisableReconnectUI = 0x00000080;
const RDEOPT_DisableReconnect = 0x00000100;
const RDEOPT_NoUser = 0x00000200;
const RDEOPT_PauseOnScript = 0x00000400;
const RDEOPT_Router = 0x00000800;

const REN_User = 0x00000000;
const REN_AllUsers = 0x00000001;
const VS_Default = 0;
const VS_PptpOnly = 1;
const VS_PptpFirst = 2;
const VS_L2tpOnly = 3;
const VS_L2tpFirst = 4;

const RASDIALEVENT = "RasDialEvent";
const WM_RASDIALEVENT = 0xCCCD;

const RASEO_UseCountryAndAreaCodes = 0x00000001;
const RASEO_SpecificIpAddr = 0x00000002;
const RASEO_SpecificNameServers = 0x00000004;
const RASEO_IpHeaderCompression = 0x00000008;
const RASEO_RemoteDefaultGateway = 0x00000010;
const RASEO_DisableLcpExtensions = 0x00000020;
const RASEO_TerminalBeforeDial = 0x00000040;
const RASEO_TerminalAfterDial = 0x00000080;
const RASEO_ModemLights = 0x00000100;
const RASEO_SwCompression = 0x00000200;
const RASEO_RequireEncryptedPw = 0x00000400;
const RASEO_RequireMsEncryptedPw = 0x00000800;
const RASEO_RequireDataEncryption = 0x00001000;
const RASEO_NetworkLogon = 0x00002000;
const RASEO_UseLogonCredentials = 0x00004000;
const RASEO_PromoteAlternates = 0x00008000;
const RASNP_NetBEUI = 0x00000001;
const RASNP_Ipx = 0x00000002;
const RASNP_Ip = 0x00000004;
const RASFP_Ppp = 0x00000001;
const RASFP_Slip = 0x00000002;
const RASFP_Ras = 0x00000004;
enum RAS_MaxDeviceType = 16;
enum RAS_MaxPhoneNumber = 128;
enum RAS_MaxIpAddress = 15;
enum RAS_MaxIpxAddress = 21;
enum RAS_MaxEntryName = 256;
enum RAS_MaxDeviceName = 128;
enum RAS_MaxCallbackNumber = RAS_MaxPhoneNumber;
enum RAS_MaxAreaCode = 10;
enum RAS_MaxPadType = 32;
enum RAS_MaxX25Address = 200;
enum RAS_MaxFacilities = 200;
enum RAS_MaxUserData = 200;
enum RAS_MaxReplyMessage = 1024;

enum RDEOPT_UsePrefixSuffix = 0x00000001;
enum RDEOPT_PausedStates = 0x00000002;
enum RDEOPT_IgnoreModemSpeaker = 0x00000004;
enum RDEOPT_SetModemSpeaker = 0x00000008;
enum RDEOPT_IgnoreSoftwareCompression = 0x00000010;
enum RDEOPT_SetSoftwareCompression = 0x00000020;
enum RDEOPT_DisableConnectedUI = 0x00000040;
enum RDEOPT_DisableReconnectUI = 0x00000080;
enum RDEOPT_DisableReconnect = 0x00000100;
enum RDEOPT_NoUser = 0x00000200;
enum RDEOPT_PauseOnScript = 0x00000400;
enum RDEOPT_Router = 0x00000800;

enum REN_User = 0x00000000;
enum REN_AllUsers = 0x00000001;
enum VS_Default = 0;
enum VS_PptpOnly = 1;
enum VS_PptpFirst = 2;
enum VS_L2tpOnly = 3;
enum VS_L2tpFirst = 4;

enum RASDIALEVENT = "RasDialEvent";
enum WM_RASDIALEVENT = 0xCCCD;

enum RASEO_UseCountryAndAreaCodes = 0x00000001;
enum RASEO_SpecificIpAddr = 0x00000002;
enum RASEO_SpecificNameServers = 0x00000004;
enum RASEO_IpHeaderCompression = 0x00000008;
enum RASEO_RemoteDefaultGateway = 0x00000010;
enum RASEO_DisableLcpExtensions = 0x00000020;
enum RASEO_TerminalBeforeDial = 0x00000040;
enum RASEO_TerminalAfterDial = 0x00000080;
enum RASEO_ModemLights = 0x00000100;
enum RASEO_SwCompression = 0x00000200;
enum RASEO_RequireEncryptedPw = 0x00000400;
enum RASEO_RequireMsEncryptedPw = 0x00000800;
enum RASEO_RequireDataEncryption = 0x00001000;
enum RASEO_NetworkLogon = 0x00002000;
enum RASEO_UseLogonCredentials = 0x00004000;
enum RASEO_PromoteAlternates = 0x00008000;
enum RASNP_NetBEUI = 0x00000001;
enum RASNP_Ipx = 0x00000002;
enum RASNP_Ip = 0x00000004;
enum RASFP_Ppp = 0x00000001;
enum RASFP_Slip = 0x00000002;
enum RASFP_Ras = 0x00000004;

const TCHAR[]
RASDT_Modem = "modem",
Expand All @@ -90,87 +92,87 @@ const TCHAR[]
RASDT_Irda = "IRDA",
RASDT_Parallel = "PARALLEL";

const RASET_Phone = 1;
const RASET_Vpn = 2;
const RASET_Direct = 3;
const RASET_Internet = 4;
enum RASET_Phone = 1;
enum RASET_Vpn = 2;
enum RASET_Direct = 3;
enum RASET_Internet = 4;

static if (_WIN32_WINNT >= 0x401) {
const RASEO_SecureLocalFiles = 0x00010000;
const RASCN_Connection = 0x00000001;
const RASCN_Disconnection = 0x00000002;
const RASCN_BandwidthAdded = 0x00000004;
const RASCN_BandwidthRemoved = 0x00000008;
const RASEDM_DialAll = 1;
const RASEDM_DialAsNeeded = 2;
const RASIDS_Disabled = 0xffffffff;
const RASIDS_UseGlobalValue = 0;
const RASADFLG_PositionDlg = 0x00000001;
const RASCM_UserName = 0x00000001;
const RASCM_Password = 0x00000002;
const RASCM_Domain = 0x00000004;
const RASADP_DisableConnectionQuery = 0;
const RASADP_LoginSessionDisable = 1;
const RASADP_SavedAddressesLimit = 2;
const RASADP_FailedConnectionTimeout = 3;
const RASADP_ConnectionQueryTimeout = 4;
enum RASEO_SecureLocalFiles = 0x00010000;
enum RASCN_Connection = 0x00000001;
enum RASCN_Disconnection = 0x00000002;
enum RASCN_BandwidthAdded = 0x00000004;
enum RASCN_BandwidthRemoved = 0x00000008;
enum RASEDM_DialAll = 1;
enum RASEDM_DialAsNeeded = 2;
enum RASIDS_Disabled = 0xffffffff;
enum RASIDS_UseGlobalValue = 0;
enum RASADFLG_PositionDlg = 0x00000001;
enum RASCM_UserName = 0x00000001;
enum RASCM_Password = 0x00000002;
enum RASCM_Domain = 0x00000004;
enum RASADP_DisableConnectionQuery = 0;
enum RASADP_LoginSessionDisable = 1;
enum RASADP_SavedAddressesLimit = 2;
enum RASADP_FailedConnectionTimeout = 3;
enum RASADP_ConnectionQueryTimeout = 4;
}
//static if (_WIN32_WINNT >= 0x500) {
const RDEOPT_CustomDial = 0x00001000;
const RASLCPAP_PAP = 0xC023;
const RASLCPAP_SPAP = 0xC027;
const RASLCPAP_CHAP = 0xC223;
const RASLCPAP_EAP = 0xC227;
const RASLCPAD_CHAP_MD5 = 0x05;
const RASLCPAD_CHAP_MS = 0x80;
const RASLCPAD_CHAP_MSV2 = 0x81;
const RASLCPO_PFC = 0x00000001;
const RASLCPO_ACFC = 0x00000002;
const RASLCPO_SSHF = 0x00000004;
const RASLCPO_DES_56 = 0x00000008;
const RASLCPO_3_DES = 0x00000010;

const RASCCPCA_MPPC = 0x00000006;
const RASCCPCA_STAC = 0x00000005;

const RASCCPO_Compression = 0x00000001;
const RASCCPO_HistoryLess = 0x00000002;
const RASCCPO_Encryption56bit = 0x00000010;
const RASCCPO_Encryption40bit = 0x00000020;
const RASCCPO_Encryption128bit = 0x00000040;

const RASEO_RequireEAP = 0x00020000;
const RASEO_RequirePAP = 0x00040000;
const RASEO_RequireSPAP = 0x00080000;
const RASEO_Custom = 0x00100000;
const RASEO_PreviewPhoneNumber = 0x00200000;
const RASEO_SharedPhoneNumbers = 0x00800000;
const RASEO_PreviewUserPw = 0x01000000;
const RASEO_PreviewDomain = 0x02000000;
const RASEO_ShowDialingProgress = 0x04000000;
const RASEO_RequireCHAP = 0x08000000;
const RASEO_RequireMsCHAP = 0x10000000;
const RASEO_RequireMsCHAP2 = 0x20000000;
const RASEO_RequireW95MSCHAP = 0x40000000;
const RASEO_CustomScript = 0x80000000;

const RASIPO_VJ = 0x00000001;
const RCD_SingleUser = 0;
const RCD_AllUsers = 0x00000001;
const RCD_Eap = 0x00000002;
const RASEAPF_NonInteractive = 0x00000002;
const RASEAPF_Logon = 0x00000004;
const RASEAPF_Preview = 0x00000008;
const ET_40Bit = 1;
const ET_128Bit = 2;
const ET_None = 0;
const ET_Require = 1;
const ET_RequireMax = 2;
const ET_Optional = 3;
enum RDEOPT_CustomDial = 0x00001000;
enum RASLCPAP_PAP = 0xC023;
enum RASLCPAP_SPAP = 0xC027;
enum RASLCPAP_CHAP = 0xC223;
enum RASLCPAP_EAP = 0xC227;
enum RASLCPAD_CHAP_MD5 = 0x05;
enum RASLCPAD_CHAP_MS = 0x80;
enum RASLCPAD_CHAP_MSV2 = 0x81;
enum RASLCPO_PFC = 0x00000001;
enum RASLCPO_ACFC = 0x00000002;
enum RASLCPO_SSHF = 0x00000004;
enum RASLCPO_DES_56 = 0x00000008;
enum RASLCPO_3_DES = 0x00000010;

enum RASCCPCA_MPPC = 0x00000006;
enum RASCCPCA_STAC = 0x00000005;

enum RASCCPO_Compression = 0x00000001;
enum RASCCPO_HistoryLess = 0x00000002;
enum RASCCPO_Encryption56bit = 0x00000010;
enum RASCCPO_Encryption40bit = 0x00000020;
enum RASCCPO_Encryption128bit = 0x00000040;

enum RASEO_RequireEAP = 0x00020000;
enum RASEO_RequirePAP = 0x00040000;
enum RASEO_RequireSPAP = 0x00080000;
enum RASEO_Custom = 0x00100000;
enum RASEO_PreviewPhoneNumber = 0x00200000;
enum RASEO_SharedPhoneNumbers = 0x00800000;
enum RASEO_PreviewUserPw = 0x01000000;
enum RASEO_PreviewDomain = 0x02000000;
enum RASEO_ShowDialingProgress = 0x04000000;
enum RASEO_RequireCHAP = 0x08000000;
enum RASEO_RequireMsCHAP = 0x10000000;
enum RASEO_RequireMsCHAP2 = 0x20000000;
enum RASEO_RequireW95MSCHAP = 0x40000000;
enum RASEO_CustomScript = 0x80000000;

enum RASIPO_VJ = 0x00000001;
enum RCD_SingleUser = 0;
enum RCD_AllUsers = 0x00000001;
enum RCD_Eap = 0x00000002;
enum RASEAPF_NonInteractive = 0x00000002;
enum RASEAPF_Logon = 0x00000004;
enum RASEAPF_Preview = 0x00000008;
enum ET_40Bit = 1;
enum ET_128Bit = 2;
enum ET_None = 0;
enum ET_Require = 1;
enum ET_RequireMax = 2;
enum ET_Optional = 3;
//}

const RASCS_PAUSED = 0x1000;
const RASCS_DONE = 0x2000;
enum RASCS_PAUSED = 0x1000;
enum RASCS_DONE = 0x2000;
enum RASCONNSTATE {
RASCS_OpenPort = 0,
RASCS_PortOpened,
Expand Down
16 changes: 9 additions & 7 deletions src/core/sys/windows/rasdlg.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
module core.sys.windows.rasdlg;
version (Windows):

version (ANSI) {} else version = Unicode;

import core.sys.windows.ras;
private import core.sys.windows.lmcons, core.sys.windows.windef;

Expand All @@ -23,15 +25,15 @@ enum {
RASPBDEVENT_NoUserEdit
}

const RASPBDFLAG_PositionDlg = 1;
const RASPBDFLAG_ForceCloseOnDial = 2;
const RASPBDFLAG_NoUser = 16;
enum RASPBDFLAG_PositionDlg = 1;
enum RASPBDFLAG_ForceCloseOnDial = 2;
enum RASPBDFLAG_NoUser = 16;

const RASEDFLAG_PositionDlg = 1;
const RASEDFLAG_NewEntry = 2;
const RASEDFLAG_CloneEntry = 4;
enum RASEDFLAG_PositionDlg = 1;
enum RASEDFLAG_NewEntry = 2;
enum RASEDFLAG_CloneEntry = 4;

const RASDDFLAG_PositionDlg = 1;
enum RASDDFLAG_PositionDlg = 1;

align(4):

Expand Down
26 changes: 13 additions & 13 deletions src/core/sys/windows/rassapi.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,19 @@ private import core.sys.windows.lmcons, core.sys.windows.windef;

// FIXME: check types of constants

const size_t
enum size_t
RASSAPI_MAX_PHONENUMBER_SIZE = 128,
RASSAPI_MAX_MEDIA_NAME = 16,
RASSAPI_MAX_PORT_NAME = 16,
RASSAPI_MAX_DEVICE_NAME = 128,
RASSAPI_MAX_DEVICETYPE_NAME = 16,
RASSAPI_MAX_PARAM_KEY_SIZE = 32;

const RASPRIV_NoCallback = 0x01;
const RASPRIV_AdminSetCallback = 0x02;
const RASPRIV_CallerSetCallback = 0x04;
const RASPRIV_DialinPrivilege = 0x08;
const RASPRIV_CallbackType = 0x07;
enum RASPRIV_NoCallback = 0x01;
enum RASPRIV_AdminSetCallback = 0x02;
enum RASPRIV_CallerSetCallback = 0x04;
enum RASPRIV_DialinPrivilege = 0x08;
enum RASPRIV_CallbackType = 0x07;

enum {
RAS_MODEM_OPERATIONAL = 1,
Expand Down Expand Up @@ -54,14 +54,14 @@ enum {
MEDIA_ISDN
}

const USER_AUTHENTICATED = 0x0001;
const MESSENGER_PRESENT = 0x0002;
const PPP_CLIENT = 0x0004;
const GATEWAY_ACTIVE = 0x0008;
const REMOTE_LISTEN = 0x0010;
const PORT_MULTILINKED = 0x0020;
enum USER_AUTHENTICATED = 0x0001;
enum MESSENGER_PRESENT = 0x0002;
enum PPP_CLIENT = 0x0004;
enum GATEWAY_ACTIVE = 0x0008;
enum REMOTE_LISTEN = 0x0010;
enum PORT_MULTILINKED = 0x0020;

const size_t
enum size_t
RAS_IPADDRESSLEN = 15,
RAS_IPXADDRESSLEN = 22,
RAS_ATADDRESSLEN = 32;
Expand Down
210 changes: 105 additions & 105 deletions src/core/sys/windows/regstr.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ version (Windows):

private import core.sys.windows.windef;

const REGSTR_MAX_VALUE_LENGTH = 256;
enum REGSTR_MAX_VALUE_LENGTH = 256;

enum {
IT_COMPACT = 0,
Expand All @@ -22,114 +22,114 @@ enum {
IT_CUSTOM // = 3
}

const DOSOPTGF_DEFCLEAN = 1;

const DOSOPTF_DEFAULT = 0x01;
const DOSOPTF_SUPPORTED = 0x02;
const DOSOPTF_ALWAYSUSE = 0x04;
const DOSOPTF_USESPMODE = 0x08;
const DOSOPTF_PROVIDESUMB = 0x10;
const DOSOPTF_NEEDSETUP = 0x20;
const DOSOPTF_INDOSSTART = 0x40;
const DOSOPTF_MULTIPLE = 0x80;

const SUF_FIRSTTIME = 0x0001;
const SUF_EXPRESS = 0x0002;
const SUF_BATCHINF = 0x0004;
const SUF_CLEAN = 0x0008;
const SUF_INSETUP = 0x0010;
const SUF_NETSETUP = 0x0020;
const SUF_NETHDBOOT = 0x0040;
const SUF_NETRPLBOOT = 0x0080;
const SUF_SBSCOPYOK = 0x0100;

const VPDF_DISABLEPWRMGMT = 1;
const VPDF_FORCEAPM10MODE = 2;
const VPDF_SKIPINTELSLCHECK = 4;
const VPDF_DISABLEPWRSTATUSPOLL = 8;

const PCMCIA_OPT_HAVE_SOCKET = 0x01;
const PCMCIA_OPT_AUTOMEM = 0x04;
const PCMCIA_OPT_NO_SOUND = 0x08;
const PCMCIA_OPT_NO_AUDIO = 0x10;
const PCMCIA_OPT_NO_APMREMOVE = 0x20;

const PCMCIA_DEF_MEMBEGIN = 0x0C0000;
const PCMCIA_DEF_MEMEND = 0xFFFFFF;
const PCMCIA_DEF_MEMLEN = 0x001000;
const PCMCIA_DEF_MIN_REGION = 0x010000;
enum DOSOPTGF_DEFCLEAN = 1;

enum DOSOPTF_DEFAULT = 0x01;
enum DOSOPTF_SUPPORTED = 0x02;
enum DOSOPTF_ALWAYSUSE = 0x04;
enum DOSOPTF_USESPMODE = 0x08;
enum DOSOPTF_PROVIDESUMB = 0x10;
enum DOSOPTF_NEEDSETUP = 0x20;
enum DOSOPTF_INDOSSTART = 0x40;
enum DOSOPTF_MULTIPLE = 0x80;

enum SUF_FIRSTTIME = 0x0001;
enum SUF_EXPRESS = 0x0002;
enum SUF_BATCHINF = 0x0004;
enum SUF_CLEAN = 0x0008;
enum SUF_INSETUP = 0x0010;
enum SUF_NETSETUP = 0x0020;
enum SUF_NETHDBOOT = 0x0040;
enum SUF_NETRPLBOOT = 0x0080;
enum SUF_SBSCOPYOK = 0x0100;

enum VPDF_DISABLEPWRMGMT = 1;
enum VPDF_FORCEAPM10MODE = 2;
enum VPDF_SKIPINTELSLCHECK = 4;
enum VPDF_DISABLEPWRSTATUSPOLL = 8;

enum PCMCIA_OPT_HAVE_SOCKET = 0x01;
enum PCMCIA_OPT_AUTOMEM = 0x04;
enum PCMCIA_OPT_NO_SOUND = 0x08;
enum PCMCIA_OPT_NO_AUDIO = 0x10;
enum PCMCIA_OPT_NO_APMREMOVE = 0x20;

enum PCMCIA_DEF_MEMBEGIN = 0x0C0000;
enum PCMCIA_DEF_MEMEND = 0xFFFFFF;
enum PCMCIA_DEF_MEMLEN = 0x001000;
enum PCMCIA_DEF_MIN_REGION = 0x010000;

enum {
PCI_OPTIONS_USE_BIOS = 1,
PCI_OPTIONS_USE_IRQ_STEERING = 2
}

const PCI_FLAG_NO_VIDEO_IRQ = 0x0001;
const PCI_FLAG_PCMCIA_WANT_IRQ = 0x0002;
const PCI_FLAG_DUAL_IDE = 0x0004;
const PCI_FLAG_NO_ENUM_AT_ALL = 0x0008;
const PCI_FLAG_ENUM_NO_RESOURCE = 0x0010;
const PCI_FLAG_NEED_DWORD_ACCESS = 0x0020;
const PCI_FLAG_SINGLE_FUNCTION = 0x0040;
const PCI_FLAG_ALWAYS_ENABLED = 0x0080;
const PCI_FLAG_IS_IDE = 0x0100;
const PCI_FLAG_IS_VIDEO = 0x0200;
const PCI_FLAG_FAIL_START = 0x0400;

const size_t REGSTR_VAL_MAX_HCID_LEN = 1024;

const REGDF_NOTDETIO = 0x00000001;
const REGDF_NOTDETMEM = 0x00000002;
const REGDF_NOTDETIRQ = 0x00000004;
const REGDF_NOTDETDMA = 0x00000008;
const REGDF_NOTDETALL = REGDF_NOTDETIO | REGDF_NOTDETMEM | REGDF_NOTDETIRQ | REGDF_NOTDETDMA;
const REGDF_NEEDFULLCONFIG = 0x00000010;
const REGDF_GENFORCEDCONFIG = 0x00000020;
const REGDF_NODETCONFIG = 0x00008000;
const REGDF_CONFLICTIO = 0x00010000;
const REGDF_CONFLICTMEM = 0x00020000;
const REGDF_CONFLICTIRQ = 0x00040000;
const REGDF_CONFLICTDMA = 0x00080000;
const REGDF_CONFLICTALL = REGDF_CONFLICTIO | REGDF_CONFLICTMEM | REGDF_CONFLICTIRQ | REGDF_CONFLICTDMA;
const REGDF_MAPIRQ2TO9 = 0x00100000;
const REGDF_NOTVERIFIED = 0x80000000;

const CONFIGFLAG_DISABLED = 0x0001;
const CONFIGFLAG_REMOVED = 0x0002;
const CONFIGFLAG_MANUAL_INSTALL = 0x0004;
const CONFIGFLAG_IGNORE_BOOT_LC = 0x0008;
const CONFIGFLAG_NET_BOOT = 0x0010;
const CONFIGFLAG_REINSTALL = 0x0020;
const CONFIGFLAG_FAILEDINSTALL = 0x0040;
const CONFIGFLAG_CANTSTOPACHILD = 0x0080;
const CONFIGFLAG_OKREMOVEROM = 0x0100;
const CONFIGFLAG_NOREMOVEEXIT = 0x0200;

const CSCONFIGFLAG_DISABLED = 1;
const CSCONFIGFLAG_DO_NOT_CREATE = 2;
const CSCONFIGFLAG_DO_NOT_START = 4;
const CSCONFIGFLAG_BITS = 7;

const DMSTATEFLAG_APPLYTOALL = 1;

const NUM_RESOURCE_MAP = 256;

const MF_FLAGS_EVEN_IF_NO_RESOURCE = 1;
const MF_FLAGS_NO_CREATE_IF_NO_RESOURCE = 2;
const MF_FLAGS_FILL_IN_UNKNOWN_RESOURCE = 4;
const MF_FLAGS_CREATE_BUT_NO_SHOW_DISABLED = 8;

const EISAFLAG_NO_IO_MERGE = 1;
const EISAFLAG_SLOT_IO_FIRST = 2;

const EISA_NO_MAX_FUNCTION = 0xFF;

const NUM_EISA_RANGES = 4;

const APMMENUSUSPEND_DISABLED = 0;
const APMMENUSUSPEND_ENABLED = 1;
const APMMENUSUSPEND_UNDOCKED = 2;
const APMMENUSUSPEND_NOCHANGE = 128;
enum PCI_FLAG_NO_VIDEO_IRQ = 0x0001;
enum PCI_FLAG_PCMCIA_WANT_IRQ = 0x0002;
enum PCI_FLAG_DUAL_IDE = 0x0004;
enum PCI_FLAG_NO_ENUM_AT_ALL = 0x0008;
enum PCI_FLAG_ENUM_NO_RESOURCE = 0x0010;
enum PCI_FLAG_NEED_DWORD_ACCESS = 0x0020;
enum PCI_FLAG_SINGLE_FUNCTION = 0x0040;
enum PCI_FLAG_ALWAYS_ENABLED = 0x0080;
enum PCI_FLAG_IS_IDE = 0x0100;
enum PCI_FLAG_IS_VIDEO = 0x0200;
enum PCI_FLAG_FAIL_START = 0x0400;

enum size_t REGSTR_VAL_MAX_HCID_LEN = 1024;

enum REGDF_NOTDETIO = 0x00000001;
enum REGDF_NOTDETMEM = 0x00000002;
enum REGDF_NOTDETIRQ = 0x00000004;
enum REGDF_NOTDETDMA = 0x00000008;
enum REGDF_NOTDETALL = REGDF_NOTDETIO | REGDF_NOTDETMEM | REGDF_NOTDETIRQ | REGDF_NOTDETDMA;
enum REGDF_NEEDFULLCONFIG = 0x00000010;
enum REGDF_GENFORCEDCONFIG = 0x00000020;
enum REGDF_NODETCONFIG = 0x00008000;
enum REGDF_CONFLICTIO = 0x00010000;
enum REGDF_CONFLICTMEM = 0x00020000;
enum REGDF_CONFLICTIRQ = 0x00040000;
enum REGDF_CONFLICTDMA = 0x00080000;
enum REGDF_CONFLICTALL = REGDF_CONFLICTIO | REGDF_CONFLICTMEM | REGDF_CONFLICTIRQ | REGDF_CONFLICTDMA;
enum REGDF_MAPIRQ2TO9 = 0x00100000;
enum REGDF_NOTVERIFIED = 0x80000000;

enum CONFIGFLAG_DISABLED = 0x0001;
enum CONFIGFLAG_REMOVED = 0x0002;
enum CONFIGFLAG_MANUAL_INSTALL = 0x0004;
enum CONFIGFLAG_IGNORE_BOOT_LC = 0x0008;
enum CONFIGFLAG_NET_BOOT = 0x0010;
enum CONFIGFLAG_REINSTALL = 0x0020;
enum CONFIGFLAG_FAILEDINSTALL = 0x0040;
enum CONFIGFLAG_CANTSTOPACHILD = 0x0080;
enum CONFIGFLAG_OKREMOVEROM = 0x0100;
enum CONFIGFLAG_NOREMOVEEXIT = 0x0200;

enum CSCONFIGFLAG_DISABLED = 1;
enum CSCONFIGFLAG_DO_NOT_CREATE = 2;
enum CSCONFIGFLAG_DO_NOT_START = 4;
enum CSCONFIGFLAG_BITS = 7;

enum DMSTATEFLAG_APPLYTOALL = 1;

enum NUM_RESOURCE_MAP = 256;

enum MF_FLAGS_EVEN_IF_NO_RESOURCE = 1;
enum MF_FLAGS_NO_CREATE_IF_NO_RESOURCE = 2;
enum MF_FLAGS_FILL_IN_UNKNOWN_RESOURCE = 4;
enum MF_FLAGS_CREATE_BUT_NO_SHOW_DISABLED = 8;

enum EISAFLAG_NO_IO_MERGE = 1;
enum EISAFLAG_SLOT_IO_FIRST = 2;

enum EISA_NO_MAX_FUNCTION = 0xFF;

enum NUM_EISA_RANGES = 4;

enum APMMENUSUSPEND_DISABLED = 0;
enum APMMENUSUSPEND_ENABLED = 1;
enum APMMENUSUSPEND_UNDOCKED = 2;
enum APMMENUSUSPEND_NOCHANGE = 128;

//#ifndef NEC_98
const TCHAR[]
Expand Down Expand Up @@ -796,11 +796,11 @@ enum {
}

//#ifndef NEC_98
const PCIC_DEFAULT_IRQMASK = 0x4EB8;
enum PCIC_DEFAULT_IRQMASK = 0x4EB8;
//#else
//#define PCIC_DEFAULT_IRQMASK 0x1468
//#endif
const PCIC_DEFAULT_NUMSOCKETS = 0;
enum PCIC_DEFAULT_NUMSOCKETS = 0;

struct DSKTLSYSTEMTIME {
WORD wYear;
Expand Down
Loading