Changeset 146

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

Committed on behalf of Stewart; updated for DMD 0.163, which makes imports private by default. Right now, it is extremely conservative; probably many more of them should be made public.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/win32/accctrl.d

    r135 r146  
    1212 
    1313private import win32.w32api, win32.winbase, win32.windef; 
     14private import win32.basetyps; 
    1415 
    1516// FIXME: check types and grouping of constants 

  • trunk/win32/aclui.d

    r127 r146  
    1414import win32.objbase, win32.commctrl, win32.accctrl; 
    1515private import win32.winuser; 
     16private import win32.windef; 
     17private import win32.basetyps; 
     18private import win32.unknwn; 
     19private import win32.prsht; 
    1620 
    1721struct SI_OBJECT_INFO { 

  • trunk/win32/comcat.d

    r104 r146  
    1212 
    1313import win32.windows, win32.ole2; 
     14private import win32.unknwn, win32.windef, win32.basetyps; 
     15private import win32.cguid, win32.objbase, win32.wtypes; 
    1416 
    1517alias IEnumGUID* LPENUMGUID; 

  • trunk/win32/core.d

    r135 r146  
    1818module win32.core; 
    1919 
    20 import win32.windef; 
    21 import win32.wincon; 
    22 import win32.winbase; 
    23 import win32.wingdi; 
    24 import win32.winuser; 
    25 import win32.winnls; 
    26 import win32.winver; 
    27 import win32.winnetwk; 
     20public import win32.windef; 
     21public import win32.winnt; 
     22public import win32.wincon; 
     23public import win32.winbase; 
     24public import win32.wingdi; 
     25public import win32.winuser; 
     26public import win32.winnls; 
     27public import win32.winver; 
     28public import win32.winnetwk; 
    2829 
    2930// We can't use static if for imports, build gets confused. 
    …… 
    3839 
    3940version (WIN32_WINNT_ONLY) { 
    40     import win32.winsvc; 
     41    public import win32.winsvc; 
    4142} 

  • trunk/win32/d3d9.d

    r123 r146  
    1111module win32.d3d9; 
    1212 
    13 import win32.objbase; 
    14 import win32.d3d9types; 
    15 import win32.d3d9caps; 
    16 private import win32.wingdi; 
     13private import win32.objbase; 
     14public import win32.d3d9types; 
     15public import win32.d3d9caps; 
     16private import win32.wingdi, win32.windef; 
     17private import win32.basetyps, win32.unknwn; 
    1718 
    1819// FIXME: check types and gropuing of some constants 

  • trunk/win32/d3d9types.d

    r135 r146  
    1111module win32.d3d9types; 
    1212 
    13 private import win32.windef; 
     13private import win32.windef, win32.basetyps; 
    1414 
    1515// FIXME: check types and grouping of constants 

  • trunk/win32/dbt.d

    r123 r146  
    115115    DWORD dbcp_devicetype; 
    116116    DWORD dbcp_reserved; 
    117     char _dbcp_name[1]; 
    118     char* dbcp_name() { return _dbcp_name.ptr; } 
     117    char _dbcp_name; 
     118    char* dbcp_name() { return &_dbcp_name; } 
    119119} 
    120120alias DEV_BROADCAST_PORT_A* PDEV_BROADCAST_PORT_A; 
    121121 
    122122struct DEV_BROADCAST_PORT_W { 
    123     DWORD dbcp_size = DEV_BROADCAST_PORT_W.sizeof; 
    124     DWORD dbcp_devicetype; 
    125     DWORD dbcp_reserved; 
    126     WCHAR _dbcp_name[1]; 
    127   WCHAR* dbcp_name() { return _dbcp_name.ptr; } 
     123    DWORD dbcp_size = DEV_BROADCAST_PORT_W.sizeof; 
     124    DWORD dbcp_devicetype; 
     125    DWORD dbcp_reserved; 
     126    WCHAR _dbcp_name; 
     127   WCHAR* dbcp_name() { return &_dbcp_name; } 
    128128} 
    129129alias DEV_BROADCAST_PORT_W* PDEV_BROADCAST_PORT_W; 
    …… 
    131131struct DEV_BROADCAST_USERDEFINED { 
    132132    DEV_BROADCAST_HDR dbud_dbh; 
    133     char _dbud_szName[1]; 
    134     char* dbud_szName() { return _dbud_szName.ptr; } 
     133    char _dbud_szName; 
     134    char* dbud_szName() { return &_dbud_szName; } 
    135135} 
    136136 
    …… 
    157157        DWORD dbcc_reserved; 
    158158        GUID  dbcc_classguid; 
    159         char  _dbcc_name[1]; 
    160         char* dbcc_name() { return _dbcc_name.ptr; } 
     159        char  _dbcc_name; 
     160        char* dbcc_name() { return &_dbcc_name; } 
    161161    } 
    162162    alias DEV_BROADCAST_DEVICEINTERFACE_A* PDEV_BROADCAST_DEVICEINTERFACE_A; 
    163163 
    164164    struct DEV_BROADCAST_DEVICEINTERFACE_W { 
    165         DWORD dbcc_size = DEV_BROADCAST_DEVICEINTERFACE_W.sizeof; 
    166         DWORD dbcc_devicetype; 
    167         DWORD dbcc_reserved; 
    168         GUID  dbcc_classguid; 
    169         WCHAR _dbcc_name[1]; 
    170         WCHAR* dbcc_name() { return _dbcc_name.ptr; } 
     165        DWORD dbcc_size = DEV_BROADCAST_DEVICEINTERFACE_W.sizeof; 
     166        DWORD dbcc_devicetype; 
     167        DWORD dbcc_reserved; 
     168        GUID  dbcc_classguid; 
     169        WCHAR _dbcc_name; 
     170        WCHAR* dbcc_name() { return &_dbcc_name; } 
    171171    } 
    172172    alias DEV_BROADCAST_DEVICEINTERFACE_W* PDEV_BROADCAST_DEVICEINTERFACE_W; 
    …… 
    187187        GUID   dbch_eventguid; 
    188188        LONG   dbch_nameoffset; 
    189         BYTE   _dbch_data[1]; 
    190         BYTE*  dbch_data() { return _dbch_data.ptr; } 
     189        BYTE   _dbch_data; 
     190        BYTE*  dbch_data() { return &_dbch_data; } 
    191191    } 
    192192    alias DEV_BROADCAST_HANDLE* PDEV_BROADCAST_HANDLE; 

  • trunk/win32/docobj.d

    r141 r146  
    1414private import win32.objidl; 
    1515private import win32.oaidl; 
     16private import win32.windef, win32.basetyps; 
    1617 
    1718// FIXME: remove inherited methods from interface definitions 

  • trunk/win32/exdisp.d

    r141 r146  
    1313import win32.ocidl; 
    1414import win32.docobj; 
    15 private import win32.wtypes; 
     15private import win32.wtypes, win32.basetyps, win32.windef; 
    1616 
    1717 

  • trunk/win32/mshtml.d

    r141 r146  
    1212private import win32.unknwn; 
    1313private import win32.wtypes; 
    14 private import win32.oaidl; 
     14private import win32.oaidl, win32.basetyps, win32.windef; 
     15 
    1516 
    1617// These are used in this file, but not defined in MinGW. 

  • trunk/win32/objbase.d

    r135 r146  
    1212private import win32.winbase; 
    1313private import win32.basetyps; 
     14private import win32.windef; 
     15private import win32.objfwd; 
     16private import win32.rpcdce; 
    1417import win32.wtypes; 
    1518import win32.cguid; 

  • trunk/win32/objidl.d

    r135 r146  
    1616import win32.unknwn; 
    1717import win32.objfwd; 
     18private import win32.windef; 
     19private import win32.basetyps; 
    1820private import win32.oleidl; 
    1921private import win32.wtypes; 

  • trunk/win32/ocidl.d

    r135 r146  
    1414private import win32.wingdi; // for TEXTMETRICW 
    1515private import win32.winuser; // for LPMSG 
     16private import win32.windef, win32.wtypes; 
     17private import win32.objidl; // for CLIPFORMAT 
     18private import win32.oleidl; 
     19private import win32.oaidl; 
     20private import win32.objfwd; 
    1621 
    1722interface IBindHost : public IUnknown {} 

  • trunk/win32/ole2.d

    r141 r146  
    1010module win32.ole2; 
    1111pragma(lib, "ole32.lib"); 
    12 import win32.winerror; 
    13 import win32.objbase; 
    14 import win32.olectlid; 
    15 import win32.oleauto; 
    16 import win32.oleidl; 
     12public import win32.winerror; 
     13public import win32.objbase; 
     14public import win32.olectlid; 
     15public import win32.oleauto; 
     16public import win32.oleidl; 
    1717private import win32.winuser; // for LPMSG 
     18private import win32.windef; 
     19private import win32.objfwd; 
     20private import win32.objidl; 
     21private import win32.wtypes; 
     22public import win32.unknwn; 
     23public import win32.basetyps; 
    1824 
    1925 

  • trunk/win32/oleacc.d

    r141 r146  
    1313private import win32.oaidl; 
    1414private import win32.wtypes; 
     15private import win32.basetyps; 
     16private import win32.windef; 
     17private import win32.unknwn; 
    1518 
    1619enum { 

  • trunk/win32/oleauto.d

    r141 r146  
    1212 
    1313import win32.oaidl; 
     14private import win32.windef; 
     15private import win32.unknwn; 
     16private import win32.basetyps; 
    1417private import win32.wtypes; 
    1518private import win32.winbase; // for SYSTEMTIME 

  • trunk/win32/olectl.d

    r141 r146  
    1919private import win32.oleauto; 
    2020private import win32.winuser; 
     21private import win32.winerror; 
     22private import win32.windef, win32.wtypes, win32.unknwn, win32.basetyps; 
     23private import win32.oaidl, win32.objfwd; 
    2124 
    2225 

  • trunk/win32/oledlg.d

    r141 r146  
    1717import win32.dlgs; 
    1818import win32.prsht; 
     19private import win32.winnt, win32.objidl, win32.objfwd; 
     20private import win32.winbase; 
    1921 
    2022// FIXME: remove inherited methods from interface definitions 

  • trunk/win32/oleidl.d

    r123 r146  
    1414module win32.oleidl; 
    1515 
     16private import win32.objfwd; // for LPMONIKER 
     17private import win32.windef; 
     18private import win32.basetyps; 
    1619private import win32.unknwn; 
    1720private import win32.wtypes; 

  • trunk/win32/ras.d

    r141 r146  
    1111private import win32.lmcons; 
    1212private import win32.w32api; 
    13 private import win32.windef; 
     13private import win32.windef, win32.basetyps; 
    1414 
    1515pragma(lib, "rasapi32.lib"); 

  • trunk/win32/richole.d

    r141 r146  
    1313private import win32.ole2; 
    1414private import win32.richedit; // for CHARRANGE 
     15private import win32.objfwd; 
     16private import win32.objidl; 
    1517 
    1618align(4): 

  • trunk/win32/rpcndr.d

    r139 r146  
    2222private import win32.rpcdce; 
    2323private import win32.unknwn; 
     24private import win32.windef; 
    2425 
    2526pragma(lib,"rpcrt4.lib"); 

  • trunk/win32/servprov.d

    r123 r146  
    1010module win32.servprov; 
    1111private import win32.unknwn; 
    12 private import win32.wtypes; 
     12private import win32.wtypes, win32.basetyps, win32.windef; 
    1313 
    1414extern (C) { 

  • trunk/win32/setupapi.d

    r141 r146  
    1717private import win32.winreg; 
    1818private import win32.prsht; 
     19private import win32.basetyps; 
    1920 
    2021/*static if(_WIN32_WINNT < _WIN32_WINDOWS) { 

  • trunk/win32/shldisp.d

    r127 r146  
    99\***********************************************************************/ 
    1010module win32.shldisp; 
    11 private import win32.unknwn; 
     11private import win32.unknwn, win32.windef, win32.wtypes; 
    1212 
    1313// options for IAutoComplete2 

  • trunk/win32/shlobj.d

    r138 r146  
    2020private import win32.winbase; 
    2121private import win32.winnetwk; // for NETRESOURCE 
     22private import win32.winnt, win32.wtypes, win32.objfwd, win32.objidl; 
     23private import win32.prsht; 
    2224 
    2325import win32.ole2; 

  • trunk/win32/shlwapi.d

    r141 r146  
    3030private import win32.winbase; 
    3131private import win32.winreg; 
     32private import win32.unknwn, win32.objidl, win32.basetyps; 
    3233 
    3334const DLLVER_PLATFORM_WINDOWS = 0x00000001; 

  • trunk/win32/sql.d

    r122 r146  
    99\***********************************************************************/ 
    1010module win32.sql; 
    11 import win32.sqltypes; 
     11public import win32.sqltypes; 
    1212private import win32.windef; 
    1313 

  • trunk/win32/sqlext.d

    r135 r146  
    1616*/ 
    1717module win32.sqlext; 
    18 import win32.sql; 
     18public import win32.sql; 
    1919private import win32.windef; 
    2020 

  • trunk/win32/sqltypes.d

    r135 r146  
    1313 
    1414module win32.sqltypes; 
    15 private import win32.wtypes; // for GUID 
     15private import win32.basetyps; 
     16private import win32.windef; 
    1617 
    1718alias byte SCHAR; 

  • trunk/win32/sqlucode.d

    r127 r146  
    99\***********************************************************************/ 
    1010module win32.sqlucode; 
    11 private import win32.sqlext; 
     11private import win32.sqlext;     
    1212 
    1313const SQL_WCHAR        = -8; 

  • trunk/win32/testall.d

    r144 r146  
    4848import win32.subauth; 
    4949import win32.ras; 
     50//import win32.nddeapi; 
     51import win32.msacm; 
     52import win32.nspapi; 
     53 
    5054 
    5155version (Windows2003) { 

  • trunk/win32/unknwn.d

    r123 r146  
    1414import win32.objfwd; 
    1515import win32.wtypes; 
     16private import win32.basetyps; 
    1617 
    1718extern (Windows) { 

  • trunk/win32/winbase.d

    r138 r146  
    5454private import win32.w32api; 
    5555private import win32.winnt; 
     56private import win32.basetyps; 
    5657 
    5758pragma(lib, "kernel32.lib"); 

  • trunk/win32/windef.d

    r135 r146  
    1111module win32.windef; 
    1212 
    13 import win32.winnt; 
     13public import win32.winnt; 
    1414private import win32.w32api; 
    1515 

  • trunk/win32/winnt.d

    r141 r146  
    1313 
    1414module win32.winnt; 
     15 
    1516private import win32.w32api; 
    16 private import win32.windef; 
    17 import win32.winerror; 
    18 import win32.basetsd; 
     17public import win32.windef; 
     18public import win32.winerror; 
     19public import win32.basetsd; 
    1920 
    2021/* Translation Notes: 

  • trunk/win32/winsock2.d

    r141 r146  
    3333import win32.winbase; 
    3434import win32.windef; 
     35import win32.basetyps; 
    3536 
    3637// NOTE: This header is NOT to be inluded with winsock.