Changeset 37

Show
Ignore:
Timestamp:
04/03/06 07:40:19 (3 years ago)
Author:
Don Clugston
Message:

Mods by Stewart.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/win32/winerror.d

    r36 r37  
    10941094    FRS_ERR_SYSVOL_DEMOTE, 
    10951095    FRS_ERR_INVALID_SERVICE_PARAMETER, // = 8017 
    1096     ERROR_DS_NOT_INSTALLED =8200, 
     1096    ERROR_DS_NOT_INSTALLED = 8200, 
    10971097    ERROR_DS_MEMBERSHIP_EVALUATED_LOCALLY, 
    10981098    ERROR_DS_NO_ATTRIBUTE_OR_VALUE, 
    …… 
    11171117    ERROR_PROMOTION_ACTIVE, 
    11181118    ERROR_NO_PROMOTION_ACTIVE, // = 8222 
    1119     ERROR_DS_OPERATIONS_ERROR =8224, 
     1119    ERROR_DS_OPERATIONS_ERROR = 8224, 
    11201120    ERROR_DS_PROTOCOL_ERROR, 
    11211121    ERROR_DS_TIMELIMIT_EXCEEDED, 
    …… 
    22162216 
    22172217 
    2218 enum { 
     2218enum : uint { 
    22192219    SEVERITY_SUCCESS = 0, 
    22202220    SEVERITY_ERROR = 1 
    22212221} 
    22222222 
    2223 enum { 
    2224     FACILITY_NULL    = 0, 
     2223enum : uint { 
     2224    FACILITY_NULL    = 0, 
    22252225    FACILITY_RPC, 
    22262226    FACILITY_DISPATCH, 
    22272227    FACILITY_STORAGE, 
    2228     FACILITY_ITF, // = 4 
    2229     FACILITY_WIN32   = 7, 
    2230     FACILITY_WINDOWS = 8, 
     2228    FACILITY_ITF, // = 4 
     2229    FACILITY_WIN32   = 7, 
     2230    FACILITY_WINDOWS = 8, 
    22312231    FACILITY_CONTROL = 10, 
    22322232    FACILITY_NT_BIT  = 0x10000000 
    …… 
    22352235// C Macros 
    22362236 
    2237 bool SUCCEEDED(HRESULT Status)  
     2237bool SUCCEEDED(HRESULT Status) 
    22382238{ 
    22392239    return Status>=0; 
    …… 
    22822282HRESULT MAKE_HRESULT(uint s, uint f, uint c) 
    22832283{ 
    2284     return (s<<31) | (f<<16) | c; 
     2284    return (s << 31) | (f << 16) | c; 
    22852285} 
    22862286 
    22872287SCODE MAKE_SCODE(uint s, uint f, uint c) 
    22882288{ 
    2289     return (s<<31) | (f<<16) | c; 
     2289    return (s << 31) | (f << 16) | c; 
    22902290} 
    22912291 

  • trunk/win32/winnt.d

    r36 r37  
    1515  void* memset(void*, uint, uint); 
    1616} 
     17 
     18alias void* LPVOID; 
     19alias char UCHAR; 
     20alias char* PUCHAR; 
     21alias uint ULONG; 
     22alias uint* PULONG; 
     23 
     24alias HANDLE* LPHANDLE; 
    1725 
    1826// #ifndef _WINNT_ 

  • trunk/win32/winreg.d

    r36 r37  
    3636 
    3737enum : DWORD { 
    38     REG_NONE                        = 0, 
     38    REG_NONE  = 0, 
    3939    REG_SZ, 
    4040    REG_EXPAND_SZ, 
    4141    REG_BINARY, 
    4242    REG_DWORD_LITTLE_ENDIAN, 
    43     REG_DWORD                       = REG_DWORD_LITTLE_ENDIAN, 
     43    REG_DWORD = REG_DWORD_LITTLE_ENDIAN, 
    4444    REG_DWORD_BIG_ENDIAN, 
    4545    REG_LINK, 
    …… 
    4949    REG_RESOURCE_REQUIREMENTS_LIST, 
    5050    REG_QWORD_LITTLE_ENDIAN, 
    51     REG_QWORD                      = REG_QWORD_LITTLE_ENDIAN 
     51    REG_QWORD = REG_QWORD_LITTLE_ENDIAN 
    5252} 
    5353 
    54 enum : DWORD { 
     54const DWORD 
    5555    REG_NOTIFY_CHANGE_NAME       = 1, 
    5656    REG_NOTIFY_CHANGE_ATTRIBUTES = 2, 
    5757    REG_NOTIFY_CHANGE_LAST_SET   = 4, 
    58     REG_NOTIFY_CHANGE_SECURITY   = 8 
    59 } 
     58    REG_NOTIFY_CHANGE_SECURITY   = 8; 
    6059 
    6160alias ACCESS_MASK REGSAM; 
    …… 
    8584    LONG RegConnectRegistryA(LPCSTR, HKEY, PHKEY); 
    8685    LONG RegConnectRegistryW(LPCWSTR, HKEY, PHKEY); 
    87     LONG RegCreateKeyExA(HKEY, LPCSTR, DWORD, LPSTR, DWORD, REGSAM, LPSECURITY_ATTRIBUTES, PHKEY, PDWORD); 
    88     LONG RegCreateKeyExW(HKEY, LPCWSTR, DWORD, LPWSTR, DWORD, REGSAM, LPSECURITY_ATTRIBUTES, PHKEY, PDWORD); 
     86    LONG RegCreateKeyExA(HKEY, LPCSTR, DWORD, LPSTR, DWORD, REGSAM, 
     87      LPSECURITY_ATTRIBUTES, PHKEY, PDWORD); 
     88    LONG RegCreateKeyExW(HKEY, LPCWSTR, DWORD, LPWSTR, DWORD, REGSAM, 
     89      LPSECURITY_ATTRIBUTES, PHKEY, PDWORD); 
    8990    LONG RegDeleteKeyA(HKEY, LPCSTR); 
    9091    LONG RegDeleteKeyW(HKEY, LPCWSTR); 
    9192    LONG RegDeleteValueA(HKEY, LPCSTR); 
    9293    LONG RegDeleteValueW(HKEY, LPCWSTR); 
    93     LONG RegEnumKeyExA(HKEY, DWORD, LPSTR, PDWORD, PDWORD, LPSTR, PDWORD, PFILETIME); 
    94     LONG RegEnumKeyExW(HKEY, DWORD, LPWSTR, PDWORD, PDWORD, LPWSTR, PDWORD, PFILETIME); 
    95     LONG RegEnumValueA(HKEY, DWORD, LPSTR, PDWORD, PDWORD, PDWORD, LPBYTE, PDWORD); 
    96     LONG RegEnumValueW(HKEY, DWORD, LPWSTR, PDWORD, PDWORD, PDWORD, LPBYTE, PDWORD); 
     94    LONG RegEnumKeyExA(HKEY, DWORD, LPSTR, PDWORD, PDWORD, LPSTR, PDWORD, 
     95      PFILETIME); 
     96    LONG RegEnumKeyExW(HKEY, DWORD, LPWSTR, PDWORD, PDWORD, LPWSTR, PDWORD, 
     97      PFILETIME); 
     98    LONG RegEnumValueA(HKEY, DWORD, LPSTR, PDWORD, PDWORD, PDWORD, LPBYTE, 
     99      PDWORD); 
     100    LONG RegEnumValueW(HKEY, DWORD, LPWSTR, PDWORD, PDWORD, PDWORD, LPBYTE, 
     101      PDWORD); 
    97102    LONG RegFlushKey(HKEY); 
    98     LONG RegGetKeySecurity(HKEY, SECURITY_INFORMATION, PSECURITY_DESCRIPTOR, PDWORD); 
     103    LONG RegGetKeySecurity(HKEY, SECURITY_INFORMATION, PSECURITY_DESCRIPTOR, 
     104      PDWORD); 
    99105    LONG RegLoadKeyA(HKEY, LPCSTR, LPCSTR); 
    100106    LONG RegLoadKeyW(HKEY, LPCWSTR, LPCWSTR); 
    …… 
    102108    LONG RegOpenKeyExA(HKEY, LPCSTR, DWORD, REGSAM, PHKEY); 
    103109    LONG RegOpenKeyExW(HKEY, LPCWSTR, DWORD, REGSAM, PHKEY); 
    104     LONG RegQueryInfoKeyA(HKEY, LPSTR, PDWORD, PDWORD, PDWORD, PDWORD, PDWORD, PDWORD, PDWORD, PDWORD, PDWORD, PFILETIME); 
    105     LONG RegQueryInfoKeyW(HKEY, LPWSTR, PDWORD, PDWORD, PDWORD, PDWORD, PDWORD, PDWORD, PDWORD, PDWORD, PDWORD, PFILETIME); 
     110    LONG RegQueryInfoKeyA(HKEY, LPSTR, PDWORD, PDWORD, PDWORD, PDWORD, 
     111      PDWORD, PDWORD, PDWORD, PDWORD, PDWORD, PFILETIME); 
     112    LONG RegQueryInfoKeyW(HKEY, LPWSTR, PDWORD, PDWORD, PDWORD, PDWORD, 
     113      PDWORD, PDWORD, PDWORD, PDWORD, PDWORD, PFILETIME); 
    106114    LONG RegQueryMultipleValuesA(HKEY, PVALENTA, DWORD, LPSTR, LPDWORD); 
    107115    LONG RegQueryMultipleValuesW(HKEY, PVALENTW, DWORD, LPWSTR, LPDWORD);