dsource.org

Open Source Development for
the D Programming Language

Navigation

← Previous Changeset
Next Changeset →

Changeset 172

Timestamp:

12/19/06 20:39:19 (2 years ago)

Author:

smjg

Message:

Polish a few off

Files:

trunk/win32/shellapi.d (modified) (1 diff)
trunk/win32/snmp.d (modified) (8 diffs)
trunk/win32/windef.d (modified) (3 diffs)
trunk/win32/windows.d (modified) (2 diffs)
trunk/win32/winerror.d (modified) (5 diffs)
trunk/win32/winnetwk.d (modified) (3 diffs)
trunk/win32/winnls.d (modified) (7 diffs)
trunk/win32/winreg.d (modified) (11 diffs)

Legend:

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

trunk/win32/shellapi.d

r171 r172

56 56 }
57 57
58 ~~// FIXME: is the value correct?~~
59 58 static if (WINVER >= 0x501) {
60 59 const DWORD ABM_SETSTATE = 10;

trunk/win32/snmp.d

r144	r172
11	11	module win32.snmp;
12	12
13		import win32.windows;
14
	13	private import win32.windows;
	14
	15	// These are not documented on MSDN
15	16	enum {
16	17	DEFAULT_SNMP_PORT_UDP = 161,
…	…
64	65	}
65	66
66		enum {
	67
	68	enum : AsnInteger {
67	69	SNMP_ERRORSTATUS_NOERROR,
68	70	SNMP_ERRORSTATUS_TOOBIG,
…	…
86	88	}
87	89
88		enum {
	90	enum : AsnInteger {
89	91	SNMP_GENERICTRAP_COLDSTART,
90	92	SNMP_GENERICTRAP_WARMSTART,
…	…
96	98	}
97	99
	100	// These are not documented on MSDN
98	101	enum {
99	102	SNMP_ACCESS_NONE,
…	…
109	112	}
110	113
111		enum {
	114	enum : INT {
112	115	SNMP_LOG_SILENT,
113	116	SNMP_LOG_FATAL,
…	…
118	121	}
119	122
120		const SNMP_OUTPUT_TO_CONSOLE = 1;
121		const SNMP_OUTPUT_TO_LOGFILE = 2;
122		const SNMP_OUTPUT_TO_EVENTLOG = 4;
123		const SNMP_OUTPUT_TO_DEBUGGER = 8;
124		const SNMP_MAX_OID_LEN = 128;
125
126		enum {
	123	const INT
	124	SNMP_OUTPUT_TO_CONSOLE = 1,
	125	SNMP_OUTPUT_TO_LOGFILE = 2,
	126	SNMP_OUTPUT_TO_EVENTLOG = 4,
	127	SNMP_OUTPUT_TO_DEBUGGER = 8;
	128
	129	const size_t SNMP_MAX_OID_LEN = 128;
	130
	131	enum : DWORD {
127	132	SNMP_MEM_ALLOC_ERROR = 1,
128	133	SNMP_BERAPI_INVALID_LENGTH = 10,
…	…
229	234	}
230	235
231		~~// #ifndef SNMPSTRICT~~
232	236	alias SnmpUtilMemAlloc SNMP_malloc;
233	237	alias SnmpUtilMemFree SNMP_free;
…	…
264	268	alias AsnCounter32 AsnCounter;
265	269	alias AsnGauge32 AsnGauge;
266		~~// #endif /* SNMPSTRICT */~~

trunk/win32/windef.d

r160	r172
58	58	alias uint ULONG, DWORD, UINT, COLORREF;
59	59	alias uint* PULONG, PDWORD, LPDWORD, PUINT, LPUINT;
60		alias int WINBOOL, BOOL, INT, LONG, HFILE;
	60	alias int WINBOOL, BOOL, INT, LONG, HFILE, HRESULT;
61	61	alias int* PWINBOOL, LPWINBOOL, PBOOL, LPBOOL, PINT, LPINT, LPLONG;
62	62	alias float FLOAT;
…	…
66	66	alias UINT_PTR WPARAM;
67	67	alias LONG_PTR LPARAM, LRESULT;
68
69		~~alias LONG HRESULT;~~
70	68
71	69	alias HANDLE HGLOBAL, HLOCAL, GLOBALHANDLE, LOCALHANDLE, HGDIOBJ, HACCEL,
…	…
116	114	enum : BOOL {
117	115	FALSE = 0,
118		TRUE = 1,
	116	TRUE = 1
119	117	}

trunk/win32/windows.d

r170	r172
27	27
28	28	// We can't use static if for imports, build gets confused.
29		~~// static if (_WIN32_WINNT_ONLY) import win32.winsvc;~~
30	29	version (Windows2003) {
31	30	public import win32.winsvc;
…	…
71	70	#endif /* (_WIN32_WINNT >= 0x0400) */
72	71	+/
73

trunk/win32/winerror.d

r160	r172
1659	1659	WSA_QOS_RESERVED_PETYPE, // = 11031
1660	1660
1661
1662	1661	ERROR_IPSEC_QM_POLICY_EXISTS = 13000,
1663	1662	ERROR_IPSEC_QM_POLICY_NOT_FOUND,
…	…
1850	1849	}
1851	1850
1852		enum : HRESULT {
	1851	enum : HRESULT {
1853	1852	S_OK = 0x00000000,
1854	1853	S_FALSE = 0x00000001,
…	…
2221	2220	NTE_FAIL = 0x80090020,
2222	2221	NTE_SYS_ERR = 0x80090021
2223		~~// NTE_TOKEN_KEYSET_STORAGE = ???~~
2224	2222	}
2225	2223
…	…
2235	2233	FACILITY_DISPATCH,
2236	2234	FACILITY_STORAGE,
2237		FACILITY_ITF, // = 4
	2235	FACILITY_ITF, // = 4
2238	2236	FACILITY_WIN32 = 7,
2239	2237	FACILITY_WINDOWS = 8,
…	…
2244	2242	// C Macros
2245	2243
2246		bool SUCCEEDED(HRESULT Status)
2247		{
	2244	bool SUCCEEDED(HRESULT Status) {
2248	2245	return Status >= 0;
2249	2246	}
2250	2247
2251		bool FAILED(HRESULT Status)
2252		{
	2248	bool FAILED(HRESULT Status) {
2253	2249	return Status < 0;
2254	2250	}
2255	2251
2256		bool IS_ERROR(HRESULT Status)
2257		{
	2252	bool IS_ERROR(HRESULT Status) {
2258	2253	return (Status >>> 31) == SEVERITY_ERROR;
2259	2254	}
2260	2255
2261		ushort HRESULT_CODE(HRESULT r)
2262		{
2263		return cast(ushort)(r & 0xFFFF);
	2256	ushort HRESULT_CODE(HRESULT r) {
	2257	return cast(ushort) (r & 0xFFFF);
2264	2258	}
2265	2259
2266		ushort SCODE_CODE(SCODE r)
2267		{
2268		return cast(ushort)(r & 0xFFFF);
	2260	ushort SCODE_CODE(SCODE r) {
	2261	return cast(ushort) (r & 0xFFFF);
2269	2262	}
2270	2263
2271		ushort HRESULT_FACILITY(HRESULT r)
2272		{
2273		return cast(ushort)((r>>16) & 0x1fff);
	2264	ushort HRESULT_FACILITY(HRESULT r) {
	2265	return cast(ushort) ((r>>16) & 0x1fff);
2274	2266	}
2275	2267
2276		ushort SCODE_FACILITY(SCODE r)
2277		{
2278		return cast(ushort)((r>>16) & 0x1fff);
	2268	ushort SCODE_FACILITY(SCODE r) {
	2269	return cast(ushort) ((r>>16) & 0x1fff);
2279	2270	}
2280	2271
2281		ushort HRESULT_SEVERITY(HRESULT r)
2282		{
2283		return cast(ushort)((r>>31) & 0x1);
	2272	ushort HRESULT_SEVERITY(HRESULT r) {
	2273	return cast(ushort) ((r>>31) & 0x1);
2284	2274	}
2285	2275
2286		ushort SCODE_SEVERITY(SCODE r)
2287		{
2288		return cast(ushort)((r>>31) & 0x1);
	2276	ushort SCODE_SEVERITY(SCODE r) {
	2277	return cast(ushort) ((r>>31) & 0x1);
2289	2278	}
2290	2279
2291		HRESULT MAKE_HRESULT(bool s, uint f, uint c)
2292		{
	2280	HRESULT MAKE_HRESULT(bool s, uint f, uint c) {
2293	2281	return (s << 31) \| (f << 16) \| c;
2294	2282	}
2295	2283
2296		SCODE MAKE_SCODE(bool s, uint f, uint c)
2297		{
	2284	SCODE MAKE_SCODE(bool s, uint f, uint c) {
2298	2285	return (s << 31) \| (f << 16) \| c;
2299	2286	}
2300	2287
2301		SCODE GetScode(HRESULT hr)
2302		{
	2288	SCODE GetScode(HRESULT hr) {
2303	2289	return hr;
2304	2290	}
2305	2291
2306		HRESULT ResultFromScode(SCODE c)
2307		{
	2292	HRESULT ResultFromScode(SCODE c) {
2308	2293	return c;
2309	2294	}
2310	2295
2311		HRESULT HRESULT_FROM_NT(HRESULT x)
2312		{
	2296	HRESULT HRESULT_FROM_NT(HRESULT x) {
2313	2297	return x \| FACILITY_NT_BIT;
2314	2298	}
2315	2299
2316		HRESULT HRESULT_FROM_WIN32(HRESULT x)
2317		{
2318		return x ? (x & 0x0000FFFF)\|(FACILITY_WIN32<<16)\|0x80000000 : 0;
	2300	HRESULT HRESULT_FROM_WIN32(HRESULT x) {
	2301	return x ? (x & 0x0000FFFF) \| (FACILITY_WIN32 << 16) \| 0x80000000 : 0;
2319	2302	}
2320	2303
2321		HRESULT PropagateResult(HRESULT hrPrevious, SCODE scBase)
2322		{
	2304	HRESULT PropagateResult(HRESULT hrPrevious, SCODE scBase) {
2323	2305	return scBase;
2324	2306	}

trunk/win32/winnetwk.d

r155	r172
211	211
212	212	struct NETRESOURCEW {
213		DWORD dwScope;
214		DWORD dwType;
215		DWORD dwDisplayType;
216		DWORD dwUsage;
	213	DWORD dwScope;
	214	DWORD dwType;
	215	DWORD dwDisplayType;
	216	DWORD dwUsage;
217	217	LPWSTR lpLocalName;
218	218	LPWSTR lpRemoteName;
…	…
242	242	struct DISCDLGSTRUCTA {
243	243	DWORD cbStructure;
244		HWND hwndOwner;
	244	HWND hwndOwner;
245	245	LPSTR lpLocalName;
246	246	LPSTR lpRemoteName;
…	…
258	258	alias DISCDLGSTRUCTW* LPDISCDLGSTRUCTW;
259	259
260		struct UNIVERSAL_NAME_INFOA { LPSTR lpUniversalName; }
	260	struct UNIVERSAL_NAME_INFOA {
	261	LPSTR lpUniversalName;
	262	}
261	263	alias UNIVERSAL_NAME_INFOA* LPUNIVERSAL_NAME_INFOA;
262	264
263		struct UNIVERSAL_NAME_INFOW { LPWSTR lpUniversalName; }
	265	struct UNIVERSAL_NAME_INFOW {
	266	LPWSTR lpUniversalName;
	267	}
264	268	alias UNIVERSAL_NAME_INFOW* LPUNIVERSAL_NAME_INFOW;
265	269

trunk/win32/winnls.d

r155	r172
15	15
16	16	alias DWORD LCTYPE, CALTYPE, CALID, LGRPID, GEOID, GEOTYPE, GEOCLASS;
17
18		~~// FIXME: check types of constants~~
19	17
20	18	const size_t
…	…
167	165	enum : DWORD {
168	166	CP_INSTALLED = 1,
169		CP_SUPPORTED ~~= 2~~
	167	CP_SUPPORTED
170	168	}
171	169
…	…
186	184	CP_OEMCP,
187	185	CP_MACCP,
188		CP_THREAD_ACP, // = 3
189		CP_SYMBOL = 42,
190		CP_UTF7 = 65000,
191		CP_UTF8 = 65001
	186	CP_THREAD_ACP, // = 3
	187	CP_SYMBOL = 42,
	188	CP_UTF7 = 65000,
	189	CP_UTF8 = 65001
192	190	}
193	191
…	…
257	255	WC_COMPOSITECHECK = 512;
258	256
259		// The type of these could not be determined from the MSDN site
260		enum {
	257	enum : LONG {
261	258	CTRY_DEFAULT = 0,
262	259	CTRY_DOMINICAN_REPUBLIC = 1,
…	…
374	371
375	372	enum : CALTYPE {
376		CAL_ICALINTVALUE = 1,
	373	CAL_ICALINTVALUE = 1,
377	374	CAL_SCALNAME,
378	375	CAL_IYEAROFFSETRANGE,
…	…
424	421
425	422	enum : CALTYPE {
426		CAL_GREGORIAN = 1,
	423	CAL_GREGORIAN = 1,
427	424	CAL_GREGORIAN_US,
428	425	CAL_JAPAN,
…	…
607	604
608	605	struct NUMBERFMTA {
609		UINT NumDigits;
610		UINT LeadingZero;
611		UINT Grouping;
	606	UINT NumDigits;
	607	UINT LeadingZero;
	608	UINT Grouping;
612	609	LPSTR lpDecimalSep;
613	610	LPSTR lpThousandSep;
614		UINT NegativeOrder;
	611	UINT NegativeOrder;
615	612	}
616	613	alias NUMBERFMTA* LPNUMBERFMTA;

trunk/win32/winreg.d

r155	r172
12	12	pragma(lib, "advapi32.lib");
13	13
14		private import win32.winbase, win32.windef;
	14	private import win32.w32api, win32.winbase, win32.windef;
15	15
16	16	const HKEY
…	…
34	34
35	35	enum : DWORD {
36		REG_NONE = 0,
	36	REG_NONE = 0,
37	37	REG_SZ,
38	38	REG_EXPAND_SZ,
39	39	REG_BINARY,
40	40	REG_DWORD_LITTLE_ENDIAN,
41		REG_DWORD = REG_DWORD_LITTLE_ENDIAN,
	41	REG_DWORD = REG_DWORD_LITTLE_ENDIAN,
42	42	REG_DWORD_BIG_ENDIAN,
43	43	REG_LINK,
…	…
47	47	REG_RESOURCE_REQUIREMENTS_LIST,
48	48	REG_QWORD_LITTLE_ENDIAN,
49		REG_QWORD = REG_QWORD_LITTLE_ENDIAN
	49	REG_QWORD = REG_QWORD_LITTLE_ENDIAN
50	50	}
51	51
…	…
75	75
76	76	extern (Windows) {
77		~~BOOL AbortSystemShutdownA(LPCSTR);~~
78		~~BOOL AbortSystemShutdownW(LPCWSTR);~~
79		~~BOOL InitiateSystemShutdownA(LPSTR, LPSTR, DWORD, BOOL, BOOL);~~
80		~~BOOL InitiateSystemShutdownW(LPWSTR, LPWSTR, DWORD, BOOL, BOOL);~~
81	77	LONG RegCloseKey(HKEY);
82	78	LONG RegConnectRegistryA(LPCSTR, HKEY, PHKEY);
…	…
99	95	PDWORD);
100	96	LONG RegFlushKey(HKEY);
101		~~LONG RegGetKeySecurity(HKEY, SECURITY_INFORMATION, PSECURITY_DESCRIPTOR,~~
102		~~PDWORD);~~
103	97	LONG RegLoadKeyA(HKEY, LPCSTR, LPCSTR);
104	98	LONG RegLoadKeyW(HKEY, LPCWSTR, LPCWSTR);
105		~~LONG RegNotifyChangeKeyValue(HKEY, BOOL, DWORD, HANDLE, BOOL);~~
106	99	LONG RegOpenKeyExA(HKEY, LPCSTR, DWORD, REGSAM, PHKEY);
107	100	LONG RegOpenKeyExW(HKEY, LPCWSTR, DWORD, REGSAM, PHKEY);
…	…
116	109	LONG RegReplaceKeyA(HKEY, LPCSTR, LPCSTR, LPCSTR);
117	110	LONG RegReplaceKeyW(HKEY, LPCWSTR, LPCWSTR, LPCWSTR);
118		~~LONG RegRestoreKeyA(HKEY, LPCSTR, DWORD);~~
119		~~LONG RegRestoreKeyW(HKEY, LPCWSTR, DWORD);~~
120	111	LONG RegSaveKeyA(HKEY, LPCSTR, LPSECURITY_ATTRIBUTES);
121	112	LONG RegSaveKeyW(HKEY, LPCWSTR, LPSECURITY_ATTRIBUTES);
…	…
125	116	LONG RegUnLoadKeyA(HKEY, LPCSTR);
126	117	LONG RegUnLoadKeyW(HKEY, LPCWSTR);
	118
	119	static if (_WIN32_WINDOWS >= 0x410) {
	120	LONG RegNotifyChangeKeyValue(HKEY, BOOL, DWORD, HANDLE, BOOL);
	121	}
	122
	123	static if (_WIN32_WINNT_ONLY) {
	124	BOOL AbortSystemShutdownA(LPCSTR);
	125	BOOL AbortSystemShutdownW(LPCWSTR);
	126	BOOL InitiateSystemShutdownA(LPSTR, LPSTR, DWORD, BOOL, BOOL);
	127	BOOL InitiateSystemShutdownW(LPWSTR, LPWSTR, DWORD, BOOL, BOOL);
	128	LONG RegGetKeySecurity(HKEY, SECURITY_INFORMATION,
	129	PSECURITY_DESCRIPTOR, PDWORD);
	130	LONG RegRestoreKeyA(HKEY, LPCSTR, DWORD);
	131	LONG RegRestoreKeyW(HKEY, LPCWSTR, DWORD);
	132	LONG RegSetKeySecurity(HKEY, SECURITY_INFORMATION,
	133	PSECURITY_DESCRIPTOR);
	134
	135	static if (_WIN32_WINNT >= 0x500) {
	136	LONG RegDisablePredefinedCache();
	137	LONG RegOpenCurrentUser(REGSAM, PHKEY);
	138	LONG RegOpenUserClassesRoot(HANDLE, DWORD, REGSAM, PHKEY);
	139	}
	140
	141	static if (_WIN32_WINNT >= 0x501) {
	142	LONG RegSaveKeyExA(HKEY, LPCSTR, LPSECURITY_ATTRIBUTES, DWORD);
	143	LONG RegSaveKeyExW(HKEY, LPCWSTR, LPSECURITY_ATTRIBUTES, DWORD);
	144	}
	145	}
	146
127	147	deprecated {
128	148	LONG RegCreateKeyA(HKEY, LPCSTR, PHKEY);
…	…
141	161	version (Unicode) {
142	162	alias VALENTW VALENT;
143		~~alias AbortSystemShutdownW AbortSystemShutdown;~~
144		~~alias InitiateSystemShutdownW InitiateSystemShutdown;~~
145	163	alias RegConnectRegistryW RegConnectRegistry;
146	164	alias RegCreateKeyExW RegCreateKeyEx;
…	…
155	173	alias RegQueryValueExW RegQueryValueEx;
156	174	alias RegReplaceKeyW RegReplaceKey;
157		~~alias RegRestoreKeyW RegRestoreKey;~~
158	175	alias RegSaveKeyW RegSaveKey;
159	176	alias RegSetValueExW RegSetValueEx;
160	177	alias RegUnLoadKeyW RegUnLoadKey;
	178	static if (_WIN32_WINNT_ONLY) {
	179	alias AbortSystemShutdownW AbortSystemShutdown;
	180	alias InitiateSystemShutdownW InitiateSystemShutdown;
	181	alias RegRestoreKeyW RegRestoreKey;
	182	static if (_WIN32_WINNT >= 0x501) {
	183	alias RegSaveKeyExA RegSaveKeyEx;
	184	}
	185	}
161	186	deprecated {
162	187	alias RegCreateKeyW RegCreateKey;
…	…
168	193	} else {
169	194	alias VALENTA VALENT;
170		~~alias AbortSystemShutdownA AbortSystemShutdown;~~
171		~~alias InitiateSystemShutdownA InitiateSystemShutdown;~~
172	195	alias RegConnectRegistryA RegConnectRegistry;
173	196	alias RegCreateKeyExA RegCreateKeyEx;
…	…
182	205	alias RegQueryValueExA RegQueryValueEx;
183	206	alias RegReplaceKeyA RegReplaceKey;
184		~~alias RegRestoreKeyA RegRestoreKey;~~
185	207	alias RegSaveKeyA RegSaveKey;
186	208	alias RegSetValueExA RegSetValueEx;
187	209	alias RegUnLoadKeyA RegUnLoadKey;
	210	static if (_WIN32_WINNT_ONLY) {
	211	alias AbortSystemShutdownA AbortSystemShutdown;
	212	alias InitiateSystemShutdownA InitiateSystemShutdown;
	213	alias RegRestoreKeyW RegRestoreKey;
	214	static if (_WIN32_WINNT >= 0x501) {
	215	alias RegSaveKeyExA RegSaveKeyEx;
	216	}
	217	}
188	218	deprecated {
189	219	alias RegCreateKeyA RegCreateKey;

Download in other formats:

© Copyright 2004-2008 - The Sankaty Group, Inc. All rights reserved.

Make a Donation

Privacy Statement Terms of Service