Differences From Artifact [aa198bc3f64df113]:
- File
src/win32/wtypes.d
- 2015-04-21 10:46:55 - part of checkin [4e2933c620] on branch trunk - Rebased to the latest verson dmd 2.067. Not yet verified the outcome. (user: kinaba) [annotate]
To Artifact [9514097d3d6522ba]:
- File
src/win32/wtypes.d
-
2015-05-05 06:49:05
- part of checkin
[9b639cf2d6]
on branch trunk
- Working version for update to 2.067.
The problem was __gshared. Replacing it with TLS fixed the issue. Remaining problem is that "hack.d"'s CloseHandle hack is not working anymore.
(user: kinaba) [annotate]
-
2015-05-05 06:49:05
- part of checkin
[9b639cf2d6]
on branch trunk
- Working version for update to 2.067.
72 MSHLFLAGS_TABLESTRONG, 72 MSHLFLAGS_TABLESTRONG,
73 MSHLFLAGS_TABLEWEAK 73 MSHLFLAGS_TABLEWEAK
74 } 74 }
75 75
76 struct FLAGGED_WORD_BLOB { 76 struct FLAGGED_WORD_BLOB {
77 uint fFlags; 77 uint fFlags;
78 uint clSize; 78 uint clSize;
79 ushort asData[1]; | 79 ushort[1] asData;
80 } 80 }
81 81
82 alias WCHAR OLECHAR; 82 alias WCHAR OLECHAR;
83 alias LPWSTR LPOLESTR; 83 alias LPWSTR LPOLESTR;
84 alias LPCWSTR LPCOLESTR; 84 alias LPCWSTR LPCOLESTR;
85 85
86 alias ushort VARTYPE; 86 alias ushort VARTYPE;
................................................................................................................................................................................
89 const VARIANT_BOOL VARIANT_TRUE = -1; // 0xffff; 89 const VARIANT_BOOL VARIANT_TRUE = -1; // 0xffff;
90 const VARIANT_BOOL VARIANT_FALSE = 0; 90 const VARIANT_BOOL VARIANT_FALSE = 0;
91 91
92 alias OLECHAR* BSTR; 92 alias OLECHAR* BSTR;
93 alias FLAGGED_WORD_BLOB* wireBSTR; 93 alias FLAGGED_WORD_BLOB* wireBSTR;
94 alias BSTR* LPBSTR; 94 alias BSTR* LPBSTR;
95 //alias LONG SCODE; // also in winerror 95 //alias LONG SCODE; // also in winerror
> 96 mixin DECLARE_HANDLE!("HCONTEXT");
96 alias HANDLE HCONTEXT, HMETAFILEPICT; | 97 mixin DECLARE_HANDLE!("HMETAFILEPICT");
97 98
98 union CY { 99 union CY {
99 struct { 100 struct {
100 uint Lo; 101 uint Lo;
101 int Hi; 102 int Hi;
102 } 103 }
103 LONGLONG int64; 104 LONGLONG int64;
................................................................................................................................................................................
210 211
211 struct DECIMAL { 212 struct DECIMAL {
212 USHORT wReserved; 213 USHORT wReserved;
213 union { 214 union {
214 struct { 215 struct {
215 ubyte scale; // valid values are 0 to 28 216 ubyte scale; // valid values are 0 to 28
216 ubyte sign; // 0 for positive, DECIMAL_NEG for negatives 217 ubyte sign; // 0 for positive, DECIMAL_NEG for negatives
217 ubyte DECIMAL_NEG = 0x80; | 218 enum ubyte DECIMAL_NEG = 0x80;
218 } 219 }
219 USHORT signscale; 220 USHORT signscale;
220 } 221 }
221 ULONG Hi32; 222 ULONG Hi32;
222 union { 223 union {
223 struct { 224 struct {
224 ULONG Lo32; 225 ULONG Lo32;