Changeset 165

Show
Ignore:
Timestamp:
12/02/06 19:09:54 (5 years ago)
Author:
smjg
Message:

Minor cleanups

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/win32/aclui.d

    r155 r165  
    101101alias ISecurityInformation* LPSECURITYINFO; 
    102102 
    103 /* 
     103/* Comment from MinGW 
    104104 * TODO: ISecurityInformation2, IEffectivePermission, ISecurityObjectTypeInfo 
    105105 */ 

  • trunk/win32/httpext.d

    r155 r165  
    1010module win32.httpext; 
    1111 
    12 /* 
     12/* Comment from MinGW 
    1313       httpext.h - Header for ISAPI extensions. 
    1414 

  • trunk/win32/lm.d

    r155 r165  
    2323public import win32.lmat; 
    2424public import win32.lmerr; 
    25 public import win32.lmmsg; 
    2625public import win32.lmshare; 
    2726public import win32.lmapibuf; 
    …… 
    2928public import win32.lmrepl; 
    3029public import win32.lmuse; 
     30public import win32.lmstats; 
    3131 
    3232version (WIN32_WINNT_ONLY) { 
    …… 
    3434    public import win32.lmserver; 
    3535} 
    36 public import win32.lmstats; 
     36version (Windows2003) { 
     37    public import win32.lmmsg; 
     38} else version (WindowsXP) { 
     39    public import win32.lmmsg; 
     40} 
    3741 
    3842// FIXME: Everything in these next files seems to be deprecated! 

  • trunk/win32/lmmsg.d

    r155 r165  
    1111pragma(lib, "netapi32.lib"); 
    1212 
    13 private import win32.lmcons, win32.windef; 
     13private import win32.lmcons, win32.windef, win32.w32api; 
    1414 
    15 // NOTE: Requires Windows XP or later 
     15static if (!_WIN32_WINNT_ONLY || _WIN32_WINNT < 0x501) { 
     16    pragma(msg, 
     17"win32.lmmsg is available only if version WindowsXP or Windows2003 is set"); 
     18    static assert (false); 
     19} 
    1620 
    1721const MSGNAME_NOT_FORWARDED  = 0; 

  • trunk/win32/oleauto.d

    r155 r165  
    210210} 
    211211 
    212 align: 
    213  
    214  
    215  
    216  // DAC: In MinGW, these were declared but not defined in oaidl. 
    217  // The SDK docs suggest they belong in this file instead. 
     212 
     213// DAC: In MinGW, these were declared but not defined in oaidl. 
     214// The SDK docs suggest they belong in this file instead. 
    218215 
    219216deprecated {  // not actually deprecated, but they aren't converted yet. 

  • trunk/win32/psapi.d

    r154 r165  
    1 /* 
    2  * Process status API (PSAPI) 
    3  * http://windowssdk.msdn.microsoft.com/library/ms684884.aspx 
     1/***********************************************************************\ 
     2*                                psapi.d                                * 
     3*                                                                       * 
     4*                       Windows API header module                       * 
     5*                                                                       * 
     6*                 Translated from MinGW Windows headers                 * 
     7*                                                                       * 
     8*                       Placed into public domain                       * 
     9\***********************************************************************/ 
     10/* Comment from MinGW 
     11 *   Process status API (PSAPI) 
     12 *   http://windowssdk.msdn.microsoft.com/library/ms684884.aspx 
    413 */ 
    514 
    …… 
    1019private import win32.windef; 
    1120 
    12  
    13 alias MODULEINFO* LPMODULEINFO; 
    14 struct MODULEINFO 
    15 { 
     21struct MODULEINFO { 
    1622    LPVOID lpBaseOfDll; 
    1723    DWORD SizeOfImage; 
    1824    LPVOID EntryPoint; 
    1925} 
     26alias MODULEINFO* LPMODULEINFO; 
    2027 
    21 alias PSAPI_WS_WATCH_INFORMATION* PPSAPI_WS_WATCH_INFORMATION; 
    22 struct PSAPI_WS_WATCH_INFORMATION 
    23 { 
     28struct PSAPI_WS_WATCH_INFORMATION { 
    2429    LPVOID FaultingPc; 
    2530    LPVOID FaultingVa; 
    2631} 
     32alias PSAPI_WS_WATCH_INFORMATION* PPSAPI_WS_WATCH_INFORMATION; 
    2733 
    28 alias PSAPI_WS_WATCH_INFORMATION_EX* PPSAPI_WS_WATCH_INFORMATION_EX; 
    29 struct PSAPI_WS_WATCH_INFORMATION_EX 
    30 { 
     34struct PSAPI_WS_WATCH_INFORMATION_EX { 
    3135    PSAPI_WS_WATCH_INFORMATION BasicInfo; 
    3236    ULONG_PTR FaultingThreadId; 
    3337    ULONG_PTR Flags; 
    34 }  
     38} 
     39alias PSAPI_WS_WATCH_INFORMATION_EX* PPSAPI_WS_WATCH_INFORMATION_EX; 
    3540 
    36 alias PROCESS_MEMORY_COUNTERS* PPROCESS_MEMORY_COUNTERS; 
    37 struct PROCESS_MEMORY_COUNTERS 
    38 { 
     41struct PROCESS_MEMORY_COUNTERS { 
    3942    DWORD cb; 
    4043    DWORD PageFaultCount; 
    …… 
    4851    DWORD PeakPagefileUsage; 
    4952} 
     53alias PROCESS_MEMORY_COUNTERS* PPROCESS_MEMORY_COUNTERS; 
    5054 
    51 alias PERFORMANCE_INFORMATION* PPERFORMANCE_INFORMATION; 
    52 struct PERFORMANCE_INFORMATION 
    53 { 
     55struct PERFORMANCE_INFORMATION { 
    5456    DWORD cb; 
    5557    SIZE_T CommitTotal; 
    …… 
    6769    DWORD ThreadCount; 
    6870} 
     71alias PERFORMANCE_INFORMATION* PPERFORMANCE_INFORMATION; 
    6972 
    70 alias ENUM_PAGE_FILE_INFORMATION* PENUM_PAGE_FILE_INFORMATION; 
    71 struct ENUM_PAGE_FILE_INFORMATION 
    72 { 
     73struct ENUM_PAGE_FILE_INFORMATION { 
    7374    DWORD cb; 
    7475    DWORD Reserved; 
    …… 
    7778    SIZE_T PeakUsage; 
    7879} 
     80alias ENUM_PAGE_FILE_INFORMATION* PENUM_PAGE_FILE_INFORMATION; 
    7981 
    8082/* application-defined callback function used with the EnumPageFiles() 
    8183 * http://windowssdk.msdn.microsoft.com/library/ms682627.aspx */ 
    82 version (Unicode) 
    83     alias BOOL function(LPVOID, PENUM_PAGE_FILE_INFORMATION, LPCWSTR) PENUM_PAGE_FILE_CALLBACK; 
    84 else 
    85     alias BOOL function(LPVOID, PENUM_PAGE_FILE_INFORMATION, LPCSTR) PENUM_PAGE_FILE_CALLBACK; 
     84version (Unicode) { 
     85    alias BOOL function(LPVOID, PENUM_PAGE_FILE_INFORMATION, LPCWSTR) 
     86      PENUM_PAGE_FILE_CALLBACK; 
     87} else { 
     88    alias BOOL function(LPVOID, PENUM_PAGE_FILE_INFORMATION, LPCSTR) 
     89      PENUM_PAGE_FILE_CALLBACK; 
     90} 
    8691 
    87  
    88 /* Grouped by application,not in alphabetical order. */ 
    89 extern (Windows) 
    90 { 
     92// Grouped by application, not in alphabetical order. 
     93extern (Windows) { 
    9194    /* Process Information 
    9295     * http://windowssdk.msdn.microsoft.com/library/ms684870.aspx */ 
    …… 
    137140} 
    138141 
    139 version (Unicode) 
    140 { 
     142version (Unicode) { 
    141143    alias GetModuleBaseNameW GetModuleBaseName; 
    142144    alias GetModuleFileNameExW GetModuleFileNameEx; 
    …… 
    146148    alias EnumPageFilesW EnumPageFiles; 
    147149    alias GetProcessImageFileNameW GetProcessImageFileName; 
    148 } 
    149 else 
    150 { 
     150} else { 
    151151    alias GetModuleBaseNameA GetModuleBaseName; 
    152152    alias GetModuleFileNameExA GetModuleFileNameEx; 

  • trunk/win32/rasdlg.d

    r163 r165  
    11/***********************************************************************\ 
    2 *                                rapi.d                                * 
     2*                                rasdlg.d                               * 
    33*                                                                       * 
    44*                       Windows API header module                       *