Navigation

← Previous Changeset
Next Changeset →

Changeset 127

Timestamp:

05/26/06 16:16:57 (6 years ago)

Author:

Don Clugston

Message:

* MAJOR CHANGE: Added a pragma(lib) to all files containing static functions. This should eliminate the need for users to specify Windows libraries, and will deprecate the concept of 'default libraries'. (But it might mean some existing programs will fail to link, because some libraries are currently missing from DMD).
* Added sqlucode.
* Marked win16 NetXXX functions as deprecated. We should consider removing those files from lm.d

Files:

trunk/win32/aclapi.d (modified) (1 diff)
trunk/win32/aclui.d (modified) (1 diff)
trunk/win32/all.d (modified) (1 diff)
trunk/win32/commctrl.d (modified) (1 diff)
trunk/win32/commdlg.d (modified) (1 diff)
trunk/win32/dde.d (modified) (1 diff)
trunk/win32/ddeml.d (modified) (1 diff)
trunk/win32/imm.d (modified) (1 diff)
trunk/win32/lm.d (modified) (3 diffs)
trunk/win32/lmaccess.d (modified) (1 diff)
trunk/win32/lmalert.d (modified) (1 diff)
trunk/win32/lmapibuf.d (modified) (1 diff)
trunk/win32/lmat.d (modified) (1 diff)
trunk/win32/lmaudit.d (modified) (2 diffs)
trunk/win32/lmchdev.d (modified) (1 diff)
trunk/win32/lmconfig.d (modified) (2 diffs)
trunk/win32/lmerrlog.d (modified) (2 diffs)
trunk/win32/lmmsg.d (modified) (1 diff)
trunk/win32/lmremutl.d (modified) (1 diff)
trunk/win32/lmrepl.d (modified) (1 diff)
trunk/win32/lmshare.d (modified) (1 diff)
trunk/win32/lmstats.d (modified) (1 diff)
trunk/win32/lmsvc.d (modified) (2 diffs)
trunk/win32/lmuse.d (modified) (1 diff)
trunk/win32/lmwksta.d (modified) (1 diff)
trunk/win32/lzexpand.d (modified) (1 diff)
trunk/win32/mmsystem.d (modified) (1 diff)
trunk/win32/oaidl.d (modified) (1 diff)
trunk/win32/objbase.d (modified) (1 diff)
trunk/win32/ole2.d (modified) (1 diff)
trunk/win32/oleacc.d (modified) (1 diff)
trunk/win32/oleauto.d (modified) (1 diff)
trunk/win32/prsht.d (modified) (1 diff)
trunk/win32/richedit.d (modified) (1 diff)
trunk/win32/rpc.d (modified) (2 diffs)
trunk/win32/rpcdce.d (modified) (5 diffs)
trunk/win32/rpcnsi.d (modified) (2 diffs)
trunk/win32/setupapi.d (modified) (1 diff)
trunk/win32/shellapi.d (modified) (1 diff)
trunk/win32/shldisp.d (modified) (1 diff)
trunk/win32/shlobj.d (modified) (1 diff)
trunk/win32/shlwapi.d (modified) (1 diff)
trunk/win32/sqlext.d (modified) (3 diffs)
trunk/win32/sqlucode.d (added)
trunk/win32/vfw.d (modified) (1 diff)
trunk/win32/winbase.d (modified) (1 diff)
trunk/win32/wincon.d (modified) (1 diff)
trunk/win32/wingdi.d (modified) (1 diff)
trunk/win32/winnetwk.d (modified) (1 diff)
trunk/win32/winnls.d (modified) (1 diff)
trunk/win32/winnt.d (modified) (1 diff)
trunk/win32/winreg.d (modified) (1 diff)
trunk/win32/winsock2.d (modified) (1 diff)
trunk/win32/winspool.d (modified) (1 diff)
trunk/win32/winsvc.d (modified) (1 diff)
trunk/win32/winuser.d (modified) (2 diffs)
trunk/win32/wtypes.d (modified) (7 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/win32/aclapi.d

r104	r127
10	10	\***********************************************************************/
11	11	module win32.aclapi;
	12	pragma(lib, "advapi32.lib");
12	13
13	14	import win32.windows, win32.accctrl;

trunk/win32/aclui.d

r106	r127
10	10	\***********************************************************************/
11	11	module win32.aclui;
	12	pragma(lib, "aclui.lib");
12	13
13	14	import win32.objbase, win32.commctrl, win32.accctrl;

trunk/win32/all.d

r126 r127

34 34 import win32.sql;
35 35 import win32.sqlext;
36 import win32.sqlucode;

trunk/win32/commctrl.d

r123	r127
10	10	\***********************************************************************/
11	11	module win32.commctrl;
	12	pragma(lib, "comctl32.lib");
12	13
13	14	private import win32.w32api;

trunk/win32/commdlg.d

r91 r127

10 10
11 11 module win32.commdlg;
12 pragma(lib, "comdlg32.lib");
12 13
13 14 private import win32.w32api;

trunk/win32/dde.d

r36	r127
10	10	\***********************************************************************/
11	11	module win32.dde;
	12	pragma(lib, "user32.lib");
12	13
13	14	private import win32.windef;

trunk/win32/ddeml.d

r43	r127
10	10	\***********************************************************************/
11	11	module win32.ddeml;
	12	pragma(lib, "user32.lib");
12	13
13	14	private import win32.winnt, win32.windef, win32.basetsd;

trunk/win32/imm.d

r99 r127

10 10
11 11 module win32.imm;
12 pragma(lib, "imm32.lib");
12 13
13 14 private import win32.w32api;

trunk/win32/lm.d

r121	r127
23	23	import win32.lmalert;
24	24	import win32.lmat;
25		~~import win32.lmaudit;~~
26		~~import win32.lmchdev;~~
27		~~import win32.lmconfig;~~
28	25	import win32.lmerr;
29	26	import win32.lmmsg;
…	…
33	30	import win32.lmrepl;
34	31	import win32.lmuse;
35		~~import win32.lmerrlog;~~
36		~~import win32.lmsvc;~~
37		~~import win32.lmsname; // in MinGW, this was publicly included by lm.lmsvc~~
38	32
39	33	version (WIN32_WINNT_ONLY) {
…	…
42	36	}
43	37	import win32.lmstats;
	38
	39	// FIXME: Everything in these next files seems to be deprecated!
	40	import win32.lmaudit;
	41	import win32.lmchdev; // can't find many docs for functions from this file.
	42	import win32.lmconfig;
	43	import win32.lmerrlog;
	44	import win32.lmsvc;
	45	import win32.lmsname; // in MinGW, this was publicly included by lm.lmsvc

trunk/win32/lmaccess.d

r120 r127

15 15
16 16 module win32.lmaccess;
17 pragma(lib, "netapi32.lib");
17 18 private import win32.windef;
18 19 private import win32.lmcons;

trunk/win32/lmalert.d

r123	r127
9	9	\***********************************************************************/
10	10	module win32.lmalert;
	11	pragma(lib, "netapi32.lib");
11	12	private import win32.lmcons;
12	13	private import win32.windef;

trunk/win32/lmapibuf.d

r123	r127
9	9	\***********************************************************************/
10	10	module win32.lmapibuf;
	11	pragma(lib, "netapi32.lib");
11	12	private import win32.windef;
12	13	private import win32.lmcons;

trunk/win32/lmat.d

r123	r127
9	9	\***********************************************************************/
10	10	module win32.lmat;
	11	pragma(lib, "netapi32.lib");
11	12	private import win32.lmcons;
12	13	private import win32.windef;

trunk/win32/lmaudit.d

r120	r127
8	8	* Placed into public domain *
9	9	\***********************************************************************/
	10	// COMMENT: This file may be deprecated.
10	11	module win32.lmaudit;
11	12	private import win32.lmcons;
…	…
265	266
266	267	extern (Windows) {
	268	deprecated {
267	269	NET_API_STATUS NetAuditClear(LPCWSTR,LPCWSTR,LPCWSTR);
268	270	NET_API_STATUS NetAuditRead(LPTSTR,LPTSTR,LPHLOG,DWORD,PDWORD,DWORD,DWORD,PBYTE*,DWORD,PDWORD,PDWORD);
269	271	NET_API_STATUS NetAuditWrite(DWORD,PBYTE,DWORD,LPTSTR,PBYTE);
	272	}
270	273	}
271	274

trunk/win32/lmchdev.d

r117	r127
8	8	* Placed into public domain *
9	9	\***********************************************************************/
	10
	11	// COMMENT: This file might be deprecated.
10	12	module win32.lmchdev;
11	13	private import win32.lmcons;

trunk/win32/lmconfig.d

r123	r127
8	8	* Placed into public domain *
9	9	\***********************************************************************/
	10	// All functions in this file are deprecated!
10	11	module win32.lmconfig;
11	12	private import win32.windef;
12	13	private import win32.lmcons;
	14
	15	deprecated {
13	16
14	17	struct CONFIG_INFO_0 {
…	…
24	27	PBYTE, DWORD);
25	28	}
	29	}

trunk/win32/lmerrlog.d

r117	r127
8	8	* Placed into public domain *
9	9	\***********************************************************************/
	10	// COMMENT: This appears to be only for Win16. All functions are deprecated.
10	11	module win32.lmerrlog;
11	12	private import win32.lmcons;
…	…
211	212
212	213	extern (Windows) {
	214	deprecated {
213	215	NET_API_STATUS NetErrorLogClear(LPCWSTR,LPCWSTR,LPBYTE);
214	216	NET_API_STATUS NetErrorLogRead(LPCWSTR,LPWSTR,LPHLOG,DWORD,LPDWORD,DWORD,DWORD,LPBYTE*,DWORD,LPDWORD,LPDWORD);
215	217	NET_API_STATUS NetErrorLogWrite(LPBYTE,DWORD,LPCWSTR,LPBYTE,DWORD,LPBYTE,DWORD,LPBYTE);
216	218	}
	219	}

trunk/win32/lmmsg.d

r123	r127
9	9	\***********************************************************************/
10	10	module win32.lmmsg;
	11	pragma(lib, "netapi32.lib");
11	12	private import win32.lmcons;
12	13	private import win32.windef;
	14
	15	// NOTE: Requires Windows XP or later
13	16
14	17	const MSGNAME_NOT_FORWARDED = 0;

trunk/win32/lmremutl.d

r123	r127
10	10	// D Conversion Note: DESC_CHAR is defined as TCHAR.
11	11	module win32.lmremutl;
	12	pragma(lib, "netapi32.lib");
12	13	private import win32.lmcons;
13	14	private import win32.windef;

trunk/win32/lmrepl.d

r117	r127
9	9	\***********************************************************************/
10	10	module win32.lmrepl;
	11	pragma(lib, "netapi32.lib");
11	12	private import win32.lmcons;
12	13	private import win32.windef;

trunk/win32/lmshare.d

r121	r127
12	12	private import win32.windef;
13	13
14		/*
	14
15	15	private import win32.w32api;
16	16	static if (_WIN32_WINNT_ONLY) {
17		pragma(lib, "Netapi.lib");
18		} else {
	17	pragma(lib, "netapi.lib");
	18	}
	19	/* else {
19	20	// only for WinME, 98, 95.
20	21	pragma(lib, "svrapi.lib")

trunk/win32/lmstats.d

r120	r127
9	9	\***********************************************************************/
10	10	module win32.lmstats;
	11	pragma(lib, "netapi32.lib");
11	12	private import win32.lmcons;
12	13	private import win32.windef;

trunk/win32/lmsvc.d

r120	r127
8	8	* Placed into public domain *
9	9	\***********************************************************************/
	10	// FIXME: Is this file deprecated? All of the functions are only for Win16.
10	11	/**
11	12	Changes relative to MinGW:
…	…
140	141
141	142	extern (Windows) {
	143	deprecated {
142	144	NET_API_STATUS NetServiceControl(LPCWSTR,LPCWSTR,DWORD,DWORD,PBYTE*);
143	145	NET_API_STATUS NetServiceEnum(LPCWSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,PDWORD);
144	146	NET_API_STATUS NetServiceGetInfo(LPCWSTR,LPCWSTR,DWORD,PBYTE*);
145	147	NET_API_STATUS NetServiceInstall(LPCWSTR,LPCWSTR,DWORD,LPCWSTR,PBYTE);
	148	}
146	149	}
147	150	//MACRO #define SERVICE_IP_CODE(t,n) ((long)SERVICE_IP_QUERY_HINT\|(long)(n\|(t<<SERVICE_IP_WAITTIME_SHIFT)))

trunk/win32/lmuse.d

r123	r127
	1	/***********************************************************************\
	2	* lmuse.d *
	3	* *
	4	* Windows API header module *
	5	* *
	6	* Translated from MinGW Windows headers *
	7	* *
	8	* Placed into public domain *
	9	\***********************************************************************/
1	10	module win32.lmuse;
	11	pragma(lib, "netapi32.lib");
2	12	import win32.lmuseflg;
3	13	private import win32.lmcons;

trunk/win32/lmwksta.d

r121	r127
9	9	\***********************************************************************/
10	10	module win32.lmwksta;
	11	pragma(lib, "netapi32.lib");
11	12	private import win32.lmcons;
12	13	import win32.lmuseflg;

trunk/win32/lzexpand.d

r85	r127
9	9	\***********************************************************************/
10	10	module win32.lzexpand;
11
12		import win32.windef;
13		import win32.winbase;
	11	pragma(lib, "lz32.lib");
	12	private import win32.windef;
	13	private import win32.winbase;
14	14
15	15	enum : LONG {

trunk/win32/mmsystem.d

r99	r127
13	13
14	14	module win32.mmsystem;
	15	pragma(lib, "winmm.lib");
15	16	private import win32.w32api;
16		import win32.winver;
17		import win32.windef;
	17	private import win32.winver;
	18	private import win32.windef;
18	19
19	20	align(1):

trunk/win32/oaidl.d

r123	r127
8	8	* Placed into public domain *
9	9	\***********************************************************************/
10		~~// TODO: Sort out LPCREATETYPEINFO etc.~~
11
12	10	module win32.oaidl;
13	11

trunk/win32/objbase.d

r123	r127
9	9	\***********************************************************************/
10	10	module win32.objbase;
	11	pragma(lib, "ole32.lib");
11	12	private import win32.winbase;
12	13	private import win32.basetyps;

trunk/win32/ole2.d

r108	r127
9	9	\***********************************************************************/
10	10	module win32.ole2;
11
	11	pragma(lib, "ole32.lib");
12	12	import win32.winerror;
13	13	import win32.objbase;

trunk/win32/oleacc.d

r101 r127

10 10
11 11 module win32.oleacc;
12 pragma(lib, "oleacc.lib");
12 13 private import win32.oaidl;
13 14 private import win32.wtypes;
trunk/win32/oleauto.d

r120 r127

10 10
11 11 module win32.oleauto;
12
12 pragma(lib, "oleaut32.lib");
13 13 import win32.oaidl;
14 14 private import win32.wtypes;

trunk/win32/prsht.d

r68	r127
10	10	\***********************************************************************/
11	11	module win32.prsht;
12
	12	pragma(lib, "comctl32.lib");
13	13	private import win32.w32api;
14	14	private import win32.windef;

trunk/win32/richedit.d

r114	r127
15	15
16	16	version(Unicode) {
17		const wchar [] RICHEDIT_CLASS= "RichEdit20W";
	17	const wchar [] RICHEDIT_CLASS = "RichEdit20W";
18	18	} else {
19		const char [] RICHEDIT_CLASS="RichEdit20A";
20		}
21
22		const RICHEDIT_CLASS10A="RICHEDIT";
	19	const char [] RICHEDIT_CLASS = "RichEdit20A";
	20	}
	21
	22	const RICHEDIT_CLASS10A = "RICHEDIT";
23	23
24	24	const TCHAR []
25		CF_RTF = "Rich Text Format",
	25	CF_RTF = "Rich Text Format",
26	26	CF_RTFNOOBJS = "Rich Text Format Without Objects",
27	27	CF_RETEXTOBJ = "RichEdit Text and Objects";
28	28
29		const CFM_BOLD=1;
30		const CFM_ITALIC=2;
31		const CFM_UNDERLINE=4;
32		const CFM_STRIKEOUT=8;
33		const CFM_PROTECTED=16;
34		const CFM_LINK=32;
35		const CFM_SIZE=0x80000000;
36		const CFM_COLOR=0x40000000;
37		const CFM_FACE=0x20000000;
38		const CFM_OFFSET=0x10000000;
39		const CFM_CHARSET=0x08000000;
40		const CFM_SUBSCRIPT=0x00030000;
41		const CFM_SUPERSCRIPT=0x00030000;
42		const CFE_BOLD=1;
43		const CFE_ITALIC=2;
44		const CFE_UNDERLINE=4;
45		const CFE_STRIKEOUT=8;
46		const CFE_PROTECTED=16;
47		const CFE_AUTOCOLOR=0x40000000;
48		const CFE_SUBSCRIPT=0x00010000;
49		const CFE_SUPERSCRIPT=0x00020000;
	29	const DWORD
	30	CFM_BOLD = 1,
	31	CFM_ITALIC = 2,
	32	CFM_UNDERLINE = 4,
	33	CFM_STRIKEOUT = 8,
	34	CFM_PROTECTED = 16,
	35	CFM_LINK = 32,
	36	CFM_SIZE = 0x80000000,
	37	CFM_COLOR = 0x40000000,
	38	CFM_FACE = 0x20000000,
	39	CFM_OFFSET = 0x10000000,
	40	CFM_CHARSET = 0x08000000,
	41	CFM_SUBSCRIPT = 0x00030000,
	42	CFM_SUPERSCRIPT = 0x00030000;
	43
	44	const DWORD
	45	CFE_BOLD = 1,
	46	CFE_ITALIC = 2,
	47	CFE_UNDERLINE = 4,
	48	CFE_STRIKEOUT = 8,
	49	CFE_PROTECTED = 16,
	50	CFE_SUBSCRIPT = 0x00010000,
	51	CFE_SUPERSCRIPT = 0x00020000,
	52	CFE_AUTOCOLOR = 0x40000000;
	53
50	54	const CFM_EFFECTS = CFM_BOLD \| CFM_ITALIC \| CFM_UNDERLINE \| CFM_COLOR \| CFM_STRIKEOUT \| CFE_PROTECTED \| CFM_LINK;
51	55
52		const IMF_FORCENONE=1;
53		const IMF_FORCEENABLE=2;
54		const IMF_FORCEDISABLE=4;
55		const IMF_CLOSESTATUSWINDOW=8;
56		const IMF_VERTICAL=32;
57		const IMF_FORCEACTIVE=64;
58		const IMF_FORCEINACTIVE=128;
59		const IMF_FORCEREMEMBER=256;
	56	// flags for EM_SETIMEOPTIONS
	57	const LPARAM
	58	IMF_FORCENONE = 1,
	59	IMF_FORCEENABLE = 2,
	60	IMF_FORCEDISABLE = 4,
	61	IMF_CLOSESTATUSWINDOW = 8,
	62	IMF_VERTICAL = 32,
	63	IMF_FORCEACTIVE = 64,
	64	IMF_FORCEINACTIVE = 128,
	65	IMF_FORCEREMEMBER = 256;
60	66
61	67	const SEL_EMPTY=0;

trunk/win32/rpc.d

r99	r127
12	12	typedef void *I_RPC_HANDLE;
13	13	alias long RPC_STATUS;
	14	// Moved to rpcdce:
	15	RpcImpersonateClient
	16	RpcRevertToSelf
	17
14	18	*/
15	19
…	…
28	32
29	33	extern (Windows) {
30		~~RPC_STATUS RpcImpersonateClient(RPC_BINDING_HANDLE);~~
31		~~RPC_STATUS RpcRevertToSelf();~~
32	34	int I_RpcMapWin32Status(RPC_STATUS);
33	35	}

trunk/win32/rpcdce.d

r123	r127
11	11
12	12	module win32.rpcdce;
13		import win32.basetyps;
	13	pragma(lib, "Rpcrt4.lib");
	14	private import win32.basetyps;
14	15	private import win32.w32api;
15
16	16	public import win32.rpcdcep;
17	17
…	…
22	22
23	23	alias void RPC_MGR_EPV;
24		const RPC_C_BINDING_INFINITE_TIMEOUT=10;
25		const RPC_C_BINDING_MIN_TIMEOUT=0;
26		const RPC_C_BINDING_DEFAULT_TIMEOUT=5;
27		const RPC_C_BINDING_MAX_TIMEOUT=9;
	24	// for RpcMgmtSetComTimeout()
	25	enum : uint {
	26	RPC_C_BINDING_MIN_TIMEOUT = 0,
	27	RPC_C_BINDING_DEFAULT_TIMEOUT = 5,
	28	RPC_C_BINDING_MAX_TIMEOUT = 9,
	29	RPC_C_BINDING_INFINITE_TIMEOUT = 10
	30	}
	31
28	32	const RPC_C_CANCEL_INFINITE_TIMEOUT= -1;
29	33	const RPC_C_LISTEN_MAX_CALLS_DEFAULT=1234;
…	…
32	36	const RPC_C_USE_INTERNET_PORT=1;
33	37	const RPC_C_USE_INTRANET_PORT=2;
34		const RPC_C_STATS_CALLS_IN=0;
35		const RPC_C_STATS_CALLS_OUT=1;
36		const RPC_C_STATS_PKTS_IN=2;
37		const RPC_C_STATS_PKTS_OUT=3;
	38
	39	// for RPC_STATS_VECTOR, used by RpcMgmyInqStats
	40	enum : uint {
	41	RPC_C_STATS_CALLS_IN = 0,
	42	RPC_C_STATS_CALLS_OUT,
	43	RPC_C_STATS_PKTS_IN,
	44	RPC_C_STATS_PKTS_OUT
	45	}
	46
38	47	const RPC_IF_AUTOLISTEN=0x0001;
39	48	const RPC_IF_OLE=2;
…	…
43	52	const RPC_C_MGMT_IS_SERVER_LISTEN=3;
44	53	const RPC_C_MGMT_STOP_SERVER_LISTEN=4;
45		const RPC_C_EP_ALL_ELTS=0;
46		const RPC_C_EP_MATCH_BY_IF=1;
47		const RPC_C_EP_MATCH_BY_OBJ=2;
48		const RPC_C_EP_MATCH_BY_BOTH=3;
49		const RPC_C_VERS_ALL=1;
50		const RPC_C_VERS_COMPATIBLE=2;
51		const RPC_C_VERS_EXACT=3;
52		const RPC_C_VERS_MAJOR_ONLY=4;
53		const RPC_C_VERS_UPTO=5;
	54
	55	// Inquiry Type for RpcMgmtEpEltInqBegin()
	56	enum : uint {
	57	RPC_C_EP_ALL_ELTS = 0,
	58	RPC_C_EP_MATCH_BY_IF,
	59	RPC_C_EP_MATCH_BY_OBJ,
	60	RPC_C_EP_MATCH_BY_BOTH
	61	}
	62
	63	// for RpcMgmtEpEltInqNext()
	64	enum : uint {
	65	RPC_C_VERS_ALL = 1,
	66	RPC_C_VERS_COMPATIBLE,
	67	RPC_C_VERS_EXACT,
	68	RPC_C_VERS_MAJOR_ONLY,
	69	RPC_C_VERS_UPTO
	70	}
	71
54	72	const DCE_C_ERROR_STRING_LEN=256;
55	73	const RPC_C_PARM_MAX_PACKET_LENGTH=1;
…	…
255	273	RPC_STATUS RpcMgmtEpEltInqNextA(RPC_EP_INQ_HANDLE,RPC_IF_ID,RPC_BINDING_HANDLE,UUID,char *);
256	274	RPC_STATUS RpcMgmtEpEltInqNextW(RPC_EP_INQ_HANDLE,RPC_IF_ID,RPC_BINDING_HANDLE,UUID,wchar *);
	275
	276	// MinGW erroneously had these in rpc.h
	277	RPC_STATUS RpcImpersonateClient(RPC_BINDING_HANDLE);
	278	RPC_STATUS RpcRevertToSelf();
	279
257	280	}
258	281

trunk/win32/rpcnsi.d

r89	r127
3	3	* *
4	4	* Windows API header module *
	5	* RPC Name Service (RpcNs APIs) *
5	6	* *
6	7	* Translated from MinGW Windows headers *
…	…
9	10	\***********************************************************************/
10	11	module win32.rpcnsi;
	12	pragma(lib, "rpcns4.lib");
11	13	private import win32.w32api;
	14	private import win32.basetyps;
12	15	private import win32.rpcdcep;
13	16	private import win32.rpcnsi;

trunk/win32/setupapi.d

r107	r127
10	10	\***********************************************************************/
11	11	module win32.setupapi;
12
13		import win32.w32api;
	12	pragma(lib, "setupapi.lib");
	13	private import win32.w32api;
14	14	private import win32.windef;
15	15	private import win32.winbase; // for SYSTEMTIME

trunk/win32/shellapi.d

r75	r127
10	10	\***********************************************************************/
11	11	module win32.shellapi;
12
	12	pragma(lib, "shell32.lib");
13	13	private import win32.w32api, win32.windef;
14	14

trunk/win32/shldisp.d

r123	r127
11	11	private import win32.unknwn;
12	12
13		const ACO_AUTOSUGGEST = 0x01;
	13	// options for IAutoComplete2
	14	const DWORD ACO_AUTOSUGGEST = 0x01;
14	15
15	16	interface IAutoComplete : public IUnknown {

trunk/win32/shlobj.d

r123	r127
11	11	// TODO: CMIC_VALID_SEE_FLAGS
12	12	module win32.shlobj;
	13	pragma(lib, "shell32.lib");
13	14	private import win32.w32api;
14	15	private import win32.unknwn;

trunk/win32/shlwapi.d

r121	r127
8	8	* Placed into public domain *
9	9	\***********************************************************************/
	10	module win32.shlwapi;
	11	pragma(lib, "shlwapi.lib");
	12
10	13	/* Changes compared to MinGW:
11	14	wnsprintf functions are not included.

trunk/win32/sqlext.d

r122	r127
16	16	*/
17	17	module win32.sqlext;
18		~~pragma(msg, "sqlext: Some code needs to be moved to sqlucode");~~
19		~~/* Moved to sqlucode~~
20		~~static if (ODBCVER <= 0x0300) {~~
21		~~const SQL_UNICODE=-95;~~
22		~~const SQL_UNICODE_VARCHAR=-96;~~
23		~~const SQL_UNICODE_LONGVARCHAR=-97;~~
24		~~const SQL_UNICODE_CHAR=SQL_UNICODE;~~
25		~~} else {~~
26		~~const SQL_UNICODE=SQL_WCHAR;~~
27		~~const SQL_UNICODE_VARCHAR=SQL_WVARCHAR;~~
28		~~const SQL_UNICODE_LONGVARCHAR=SQL_WLONGVARCHAR;~~
29		~~const SQL_UNICODE_CHAR=SQL_WCHAR;~~
30		}
31		*/
32
33	18	import win32.sql;
34	19	private import win32.windef;
35
36	20
37	21	const SQL_SPEC_MAJOR = 3;
…	…
242	226	const SQL_DEFAULT_PARAM = -5;
243	227	const SQL_DELETE = 3;
	228
244	229	const SQL_DRIVER_COMPLETE = 1;
245	230	const SQL_DRIVER_COMPLETE_REQUIRED = 3;
…	…
253	238	const SQL_DRIVER_PROMPT = 2;
254	239	const SQL_DRIVER_VER = 7;
	240
255	241	const SQL_DTC_ENLIST_EXPENSIVE = 1;
	242	const SQL_DTC_UNENLIST_EXPENSIVE = 2;
256	243	const SQL_DTC_TRANSITION_COST = 1750;
257		~~const SQL_DTC_UNENLIST_EXPENSIVE = 2;~~
258	244	const SQL_ENSURE = 1;
259	245	const SQL_ENTIRE_ROWSET = 0;

trunk/win32/vfw.d

r116 r127

1 1 // Converted from w32api\vfw.h
2 2 module win32.vfw;
3
4 pragma(lib, "vfw32.lib");
3 5
4 6 private import win32.windows;

trunk/win32/winbase.d

r123	r127
14	14	private import win32.w32api;
15	15	private import win32.winnt;
	16	pragma(lib, "kernel32.lib");
16	17
17	18	// FIXME: clean up Windows version support

trunk/win32/wincon.d

r123	r127
13	13	private import win32.w32api;
14	14	private import win32.windef;
	15	pragma(lib, "kernel32.lib");
15	16
16	17	// FIXME: clean up Windows version support

trunk/win32/wingdi.d

r124	r127
13	13	private import win32.winver;
14	14	private import win32.windef;
	15	pragma(lib, "gdi32.lib");
15	16
16	17	// FIXME: clean up Windows version support

trunk/win32/winnetwk.d

r57 r127

13 13 private import win32.winbase, win32.winnt;
14 14 private import win32.winerror;
15 pragma(lib, "mpr.lib");
15 16
16 17

trunk/win32/winnls.d

r75	r127
12	12
13	13	private import win32.w32api, win32.basetsd, win32.windef, win32.winbase;
	14	pragma(lib, "kernel32.lib");
14	15
15	16	alias DWORD LCTYPE, CALTYPE, CALID, LGRPID, GEOID, GEOTYPE, GEOCLASS;

trunk/win32/winnt.d

r123	r127
3189	3189	}
3190	3190
	3191	//TODO: These are actually macros, and were introduced with Win98.
3191	3192	PVOID GetCurrentFiber();
3192	3193	PVOID GetFiberData();

trunk/win32/winreg.d

r57 r127

12 12
13 13 private import win32.windef, win32.winbase;
14 pragma(lib, "advapi32.lib");
14 15
15 16 const HKEY
trunk/win32/winsock2.d

r109 r127

9 9 module win32.winsock2;
10 10
11 pragma(lib, "Ws2_32.lib");
11 12 /*
12 13 Definitions for winsock 2

trunk/win32/winspool.d

r123	r127
13	13	private import win32.wingdi;
14	14	private import win32.winbase; // for SYSTEMTIME
	15
	16	pragma(lib, "winspool.lib");
15	17
16	18	// FIXME: clean up Windows version support

trunk/win32/winsvc.d

r75 r127

12 12
13 13 private import win32.w32api;
14 pragma(lib, "advapi.lib");
14 15
15 16 static if (!_WIN32_WINNT_ONLY) {

trunk/win32/winuser.d

r125	r127
9	9	\***********************************************************************/
10	10
	11	// Conversion Notes:
11	12	// The following macros were for win16 only, and are not included in this file:
12	13	//#define EnumTaskWindows(h,f,p) EnumThreadWindows((DWORD)h,f,p)
…	…
19	20
20	21	module win32.winuser;
21
22	22	private import win32.w32api;
23	23	private import win32.winbase;
24	24	private import win32.wingdi;
25	25	private import win32.windef; // for HMONITOR
	26
	27	pragma(lib, "user32.lib");
26	28
27	29	// FIXME: clean up Windows version support

trunk/win32/wtypes.d

r109	r127
18	18	alias GUID_NULL IID_NULL;
19	19	alias GUID_NULL CLSID_NULL;
20		//MACRO #define CBPCLIPDATA(d) ((d).cbSize-sizeof((d).ulClipFmt))
21
22		const BYTE DECIMAL_NEG = 0x80;
23		//MACRO #define DECIMAL_SETZERO(d) {(d).Lo64=(d).Hi32=(d).signscale=0;}
24
25		const ROTFLAGS_REGISTRATIONKEEPSALIVE=0x01;
26		const ROTFLAGS_ALLOWANYCLIENT=0x02;
	20
	21	const ROTFLAGS_REGISTRATIONKEEPSALIVE = 0x01;
	22	const ROTFLAGS_ALLOWANYCLIENT = 0x02;
27	23
28	24	/* also in winsock2.h */
…	…
34	30
35	31	enum DVASPECT{
36		DVASPECT_CONTENT=1,
37		DVASPECT_THUMBNAIL=2,
38		DVASPECT_ICON=4,
39		DVASPECT_DOCPRINT=8
	32	DVASPECT_CONTENT = 1,
	33	DVASPECT_THUMBNAIL = 2,
	34	DVASPECT_ICON = 4,
	35	DVASPECT_DOCPRINT = 8
40	36	}
41	37
42	38	enum DVASPECT2{
43		DVASPECT_OPAQUE=16,
44		DVASPECT_TRANSPARENT=32
	39	DVASPECT_OPAQUE = 16,
	40	DVASPECT_TRANSPARENT = 32
45	41	}
46	42
47	43	enum STATFLAG{
48		STATFLAG_DEFAULT=0,
49		STATFLAG_NONAME=1
	44	STATFLAG_DEFAULT = 0,
	45	STATFLAG_NONAME = 1
50	46	}
51	47
52	48	enum MEMCTX{
53		MEMCTX_LOCAL=0,
	49	MEMCTX_LOCAL = 0,
54	50	MEMCTX_TASK,
55	51	MEMCTX_SHARED,
56	52	MEMCTX_MACSYSTEM,
57		MEMCTX_UNKNOWN=-1,
58		MEMCTX_SAME=-2
	53	MEMCTX_UNKNOWN = -1,
	54	MEMCTX_SAME = -2
59	55	}
60	56
61	57	enum MSHCTX{
62		MSHCTX_LOCAL=0,
	58	MSHCTX_LOCAL = 0,
63	59	MSHCTX_NOSHAREDMEM,
64	60	MSHCTX_DIFFERENTMACHINE,
…	…
118	114	alias BSTRBLOB * LPBSTRBLOB;
119	115
	116	// Used only in the PROPVARIANT structure
	117	// According to the 2003 SDK, this should be in propidl.h, not here.
120	118	struct CLIPDATA{
121	119	ULONG cbSize;
…	…
153	151	VT_UNKNOWN,
154	152	VT_DECIMAL,
155		VT_I1=16,
	153	VT_I1 = 16,
156	154	VT_UI1,
157	155	VT_UI2,
…	…
169	167	VT_LPSTR,
170	168	VT_LPWSTR,
171		VT_RECORD=36,
172		VT_INT_PTR=37,
173		VT_UINT_PTR=38,
174		VT_FILETIME=64,
	169	VT_RECORD = 36,
	170	VT_INT_PTR = 37,
	171	VT_UINT_PTR = 38,
	172	VT_FILETIME = 64,
175	173	VT_BLOB,
176	174	VT_STREAM,
…	…
213	211	alias double DOUBLE;
214	212
	213
215	214	struct DECIMAL{
216	215	USHORT wReserved;
217	216	union {
218	217	struct {
219		BYTE scale;
220		BYTE sign;
	218	ubyte scale; // valid values are 0 to 28
	219	ubyte sign; // 0 for positive, DECIMAL_NEG for negatives.
	220	const ubyte DECIMAL_NEG = 0x80;
221	221	}
222	222	USHORT signscale;
…	…
230	230	ULONGLONG Lo64;
231	231	}
232		}
	232	// #define DECIMAL_SETZERO(d) {(d).Lo64=(d).Hi32=(d).signscale=0;}
	233	void setZero() { Lo64 = 0; Hi32 = 0; signscale = 0; }
	234	}

r126	r127
34	34	import win32.sql;
35	35	import win32.sqlext;
	36	import win32.sqlucode;

r91	r127
10	10
11	11	module win32.commdlg;
	12	pragma(lib, "comdlg32.lib");
12	13
13	14	private import win32.w32api;

r99	r127
10	10
11	11	module win32.imm;
	12	pragma(lib, "imm32.lib");
12	13
13	14	private import win32.w32api;

r120	r127
15	15
16	16	module win32.lmaccess;
	17	pragma(lib, "netapi32.lib");
17	18	private import win32.windef;
18	19	private import win32.lmcons;

r101	r127
10	10
11	11	module win32.oleacc;
	12	pragma(lib, "oleacc.lib");
12	13	private import win32.oaidl;
13	14	private import win32.wtypes;

r120	r127
10	10
11	11	module win32.oleauto;
12
	12	pragma(lib, "oleaut32.lib");
13	13	import win32.oaidl;
14	14	private import win32.wtypes;

r116	r127
1	1	// Converted from w32api\vfw.h
2	2	module win32.vfw;
	3
	4	pragma(lib, "vfw32.lib");
3	5
4	6	private import win32.windows;

r57	r127
13	13	private import win32.winbase, win32.winnt;
14	14	private import win32.winerror;
	15	pragma(lib, "mpr.lib");
15	16
16	17

r57	r127
12	12
13	13	private import win32.windef, win32.winbase;
	14	pragma(lib, "advapi32.lib");
14	15
15	16	const HKEY

r109	r127
9	9	module win32.winsock2;
10	10
	11	pragma(lib, "Ws2_32.lib");
11	12	/*
12	13	Definitions for winsock 2

r75	r127
12	12
13	13	private import win32.w32api;
	14	pragma(lib, "advapi.lib");
14	15
15	16	static if (!_WIN32_WINNT_ONLY) {

Navigation

Changeset 127

Legend:

Download in other formats: