Differences From Artifact [1a7488ae8c3326a5]:
- File
src/win32/oleacc.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 [dbfc227161dd27d8]:
- File
src/win32/oleacc.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.
4 * Windows API header module * 4 * Windows API header module *
5 * * 5 * *
6 * Translated from MinGW Windows headers * 6 * Translated from MinGW Windows headers *
7 * * 7 * *
8 * Placed into public domain * 8 * Placed into public domain *
9 \***********************************************************************/ 9 \***********************************************************************/
10 module win32.oleacc; 10 module win32.oleacc;
11 pragma(lib, "oleacc.lib"); | 11 pragma(lib, "oleacc");
12 12
13 private import win32.basetyps, win32.oaidl, win32.unknwn, win32.wtypes, 13 private import win32.basetyps, win32.oaidl, win32.unknwn, win32.wtypes,
14 win32.windef; 14 win32.windef;
15 15
16 enum { 16 enum {
17 DISPID_ACC_PARENT = -5000, 17 DISPID_ACC_PARENT = -5000,
18 DISPID_ACC_CHILDCOUNT = -5001, 18 DISPID_ACC_CHILDCOUNT = -5001,
................................................................................................................................................................................
153 SELFLAG_REMOVESELECTION = 16 153 SELFLAG_REMOVESELECTION = 16
154 } 154 }
155 155
156 const SELFLAG_VALID = 0x0000001F; 156 const SELFLAG_VALID = 0x0000001F;
157 157
158 158
159 interface IAccessible : IDispatch { 159 interface IAccessible : IDispatch {
160 HRESULT get_accParent(IDispatch**); | 160 HRESULT get_accParent(IDispatch*);
161 HRESULT get_accChildCount(int*); 161 HRESULT get_accChildCount(int*);
162 HRESULT get_accChild(VARIANT, IDispatch **); | 162 HRESULT get_accChild(VARIANT, IDispatch*);
163 HRESULT get_accName(VARIANT, BSTR*); 163 HRESULT get_accName(VARIANT, BSTR*);
164 HRESULT get_accValue(VARIANT, BSTR*); 164 HRESULT get_accValue(VARIANT, BSTR*);
165 HRESULT get_accDescription(VARIANT, BSTR*); 165 HRESULT get_accDescription(VARIANT, BSTR*);
166 HRESULT get_accRole(VARIANT, VARIANT*); 166 HRESULT get_accRole(VARIANT, VARIANT*);
167 HRESULT get_accState(VARIANT, VARIANT*); 167 HRESULT get_accState(VARIANT, VARIANT*);
168 HRESULT get_accHelp(VARIANT, BSTR*); 168 HRESULT get_accHelp(VARIANT, BSTR*);
169 HRESULT get_accHelpTopic(BSTR*, VARIANT, int*); 169 HRESULT get_accHelpTopic(BSTR*, VARIANT, int*);
................................................................................................................................................................................
178 HRESULT accHitTest(int, int, VARIANT*); 178 HRESULT accHitTest(int, int, VARIANT*);
179 HRESULT accDoDefaultAction(VARIANT); 179 HRESULT accDoDefaultAction(VARIANT);
180 180
181 HRESULT put_accName(VARIANT, BSTR); 181 HRESULT put_accName(VARIANT, BSTR);
182 HRESULT put_accValue(VARIANT, BSTR); 182 HRESULT put_accValue(VARIANT, BSTR);
183 } 183 }
184 184
185 alias IAccessible* LPACCESSIBLE; | 185 alias IAccessible LPACCESSIBLE;
186 186
187 extern (Windows) { 187 extern (Windows) {
188 HRESULT AccessibleChildren(IAccessible*, LONG, LONG, VARIANT*, LONG*); | 188 HRESULT AccessibleChildren(IAccessible, LONG, LONG, VARIANT*, LONG*);
189 HRESULT AccessibleObjectFromEvent(HWND, DWORD, DWORD, IAccessible*, VARI | 189 HRESULT AccessibleObjectFromEvent(HWND, DWORD, DWORD, IAccessible, VARIA
190 HRESULT AccessibleObjectFromPoint(POINT, IAccessible**, VARIANT*); | 190 HRESULT AccessibleObjectFromPoint(POINT, IAccessible*, VARIANT*);
191 HRESULT AccessibleObjectFromWindow(HWND, DWORD, REFIID, void**); 191 HRESULT AccessibleObjectFromWindow(HWND, DWORD, REFIID, void**);
192 HRESULT CreateStdAccessibleObject(HWND, LONG, REFIID, void**); 192 HRESULT CreateStdAccessibleObject(HWND, LONG, REFIID, void**);
193 HRESULT CreateStdAccessibleProxyA(HWND, LPCSTR, LONG, REFIID, void**); 193 HRESULT CreateStdAccessibleProxyA(HWND, LPCSTR, LONG, REFIID, void**);
194 HRESULT CreateStdAccessibleProxyW(HWND, LPCWSTR, LONG, REFIID, void**); 194 HRESULT CreateStdAccessibleProxyW(HWND, LPCWSTR, LONG, REFIID, void**);
195 195
196 void GetOleaccVersionInfo(DWORD*, DWORD*); 196 void GetOleaccVersionInfo(DWORD*, DWORD*);
197 UINT GetRoleTextA(DWORD, LPSTR, UINT); 197 UINT GetRoleTextA(DWORD, LPSTR, UINT);
198 UINT GetRoleTextW(DWORD, LPWSTR, UINT); 198 UINT GetRoleTextW(DWORD, LPWSTR, UINT);
199 UINT GetStateTextA(DWORD, LPSTR, UINT); 199 UINT GetStateTextA(DWORD, LPSTR, UINT);
200 UINT GetStateTextW(DWORD, LPWSTR, UINT); 200 UINT GetStateTextW(DWORD, LPWSTR, UINT);
201 LRESULT LresultFromObject(REFIID, WPARAM, LPUNKNOWN); 201 LRESULT LresultFromObject(REFIID, WPARAM, LPUNKNOWN);
202 HRESULT ObjectFromLresult(LRESULT, REFIID, WPARAM, void**); 202 HRESULT ObjectFromLresult(LRESULT, REFIID, WPARAM, void**);
203 HRESULT WindowFromAccessibleObject(IAccessible*, HWND*); | 203 HRESULT WindowFromAccessibleObject(IAccessible, HWND*);
204 } 204 }
205 205
206 version(Unicode) { 206 version(Unicode) {
207 alias CreateStdAccessibleProxyW CreateStdAccessibleProxy; 207 alias CreateStdAccessibleProxyW CreateStdAccessibleProxy;
208 alias GetRoleTextW GetRoleText; 208 alias GetRoleTextW GetRoleText;
209 alias GetStateTextW GetStateText; 209 alias GetStateTextW GetStateText;
210 } else { 210 } else {
211 alias CreateStdAccessibleProxyA CreateStdAccessibleProxy; 211 alias CreateStdAccessibleProxyA CreateStdAccessibleProxy;
212 alias GetRoleTextA GetRoleText; 212 alias GetRoleTextA GetRoleText;
213 alias GetStateTextA GetStateText; 213 alias GetStateTextA GetStateText;
214 } 214 }