Differences From Artifact [d7dba25775579154]:
- File
src/win32/ole2.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 [068170c0bbf5e02d]:
- File
src/win32/ole2.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.ole2; 10 module win32.ole2;
11 pragma(lib, "ole32.lib"); | 11 pragma(lib, "ole32");
12 12
13 public import win32.basetyps, win32.objbase, win32.oleauto, win32.olectlid, 13 public import win32.basetyps, win32.objbase, win32.oleauto, win32.olectlid,
14 win32.oleidl, win32.unknwn, win32.winerror, win32.uuid; 14 win32.oleidl, win32.unknwn, win32.winerror, win32.uuid;
15 private import win32.objfwd, win32.objidl, win32.windef, win32.wtypes; 15 private import win32.objfwd, win32.objidl, win32.windef, win32.wtypes;
16 private import win32.winuser; // for LPMSG 16 private import win32.winuser; // for LPMSG
17 17
18 const E_DRAW = VIEW_E_DRAW; 18 const E_DRAW = VIEW_E_DRAW;
................................................................................................................................................................................
39 LPOLESTREAMVTBL lpstbl; 39 LPOLESTREAMVTBL lpstbl;
40 } 40 }
41 alias OLESTREAM* LPOLESTREAM; 41 alias OLESTREAM* LPOLESTREAM;
42 42
43 extern (Windows) { 43 extern (Windows) {
44 struct OLESTREAMVTBL { 44 struct OLESTREAMVTBL {
45 DWORD function (LPOLESTREAM, void*, DWORD) Get; 45 DWORD function (LPOLESTREAM, void*, DWORD) Get;
46 DWORD function (LPOLESTREAM, CPtr!(void), DWORD) Put; | 46 DWORD function (LPOLESTREAM, const(void)*, DWORD) Put;
47 } 47 }
48 } 48 }
49 alias OLESTREAMVTBL* LPOLESTREAMVTBL; 49 alias OLESTREAMVTBL* LPOLESTREAMVTBL;
50 50
51 extern (Windows) { 51 extern (Windows) {
52 HRESULT CreateDataAdviseHolder(LPDATAADVISEHOLDER*); 52 HRESULT CreateDataAdviseHolder(LPDATAADVISEHOLDER*);
53 DWORD OleBuildVersion(); 53 DWORD OleBuildVersion();
................................................................................................................................................................................
98 HGLOBAL OleGetIconOfFile(LPOLESTR, BOOL); 98 HGLOBAL OleGetIconOfFile(LPOLESTR, BOOL);
99 HGLOBAL OleGetIconOfClass(REFCLSID, LPOLESTR, BOOL); 99 HGLOBAL OleGetIconOfClass(REFCLSID, LPOLESTR, BOOL);
100 HGLOBAL OleMetafilePictFromIconAndLabel(HICON, LPOLESTR, LPOLESTR, UINT) 100 HGLOBAL OleMetafilePictFromIconAndLabel(HICON, LPOLESTR, LPOLESTR, UINT)
101 HRESULT OleRegGetUserType(REFCLSID, DWORD, LPOLESTR*); 101 HRESULT OleRegGetUserType(REFCLSID, DWORD, LPOLESTR*);
102 HRESULT OleRegGetMiscStatus(REFCLSID, DWORD, DWORD*); 102 HRESULT OleRegGetMiscStatus(REFCLSID, DWORD, DWORD*);
103 HRESULT OleRegEnumFormatEtc (REFCLSID, DWORD, LPENUMFORMATETC*); 103 HRESULT OleRegEnumFormatEtc (REFCLSID, DWORD, LPENUMFORMATETC*);
104 HRESULT OleRegEnumVerbs (REFCLSID, LPENUMOLEVERB*); 104 HRESULT OleRegEnumVerbs (REFCLSID, LPENUMOLEVERB*);
105 HRESULT OleConvertOLESTREAMToIStorage(LPOLESTREAM, LPSTORAGE, CPtr!(DVTA | 105 HRESULT OleConvertOLESTREAMToIStorage(LPOLESTREAM, LPSTORAGE, const(DVTA
106 HRESULT OleConvertIStorageToOLESTREAM(LPSTORAGE, LPOLESTREAM); 106 HRESULT OleConvertIStorageToOLESTREAM(LPSTORAGE, LPOLESTREAM);
107 HRESULT GetHGlobalFromILockBytes(LPLOCKBYTES, HGLOBAL*); 107 HRESULT GetHGlobalFromILockBytes(LPLOCKBYTES, HGLOBAL*);
108 HRESULT CreateILockBytesOnHGlobal(HGLOBAL, BOOL, LPLOCKBYTES*); 108 HRESULT CreateILockBytesOnHGlobal(HGLOBAL, BOOL, LPLOCKBYTES*);
109 HRESULT GetHGlobalFromStream(LPSTREAM, HGLOBAL*); 109 HRESULT GetHGlobalFromStream(LPSTREAM, HGLOBAL*);
110 HRESULT CreateStreamOnHGlobal(HGLOBAL, BOOL, LPSTREAM*); 110 HRESULT CreateStreamOnHGlobal(HGLOBAL, BOOL, LPSTREAM*);
111 HRESULT OleDoAutoConvert(LPSTORAGE, LPCLSID); 111 HRESULT OleDoAutoConvert(LPSTORAGE, LPCLSID);
112 HRESULT OleGetAutoConvert(REFCLSID, LPCLSID); 112 HRESULT OleGetAutoConvert(REFCLSID, LPCLSID);
113 HRESULT OleSetAutoConvert(REFCLSID, REFCLSID); 113 HRESULT OleSetAutoConvert(REFCLSID, REFCLSID);
114 HRESULT GetConvertStg(LPSTORAGE); 114 HRESULT GetConvertStg(LPSTORAGE);
115 HRESULT SetConvertStg(LPSTORAGE, BOOL); 115 HRESULT SetConvertStg(LPSTORAGE, BOOL);
116 HRESULT OleConvertIStorageToOLESTREAMEx(LPSTORAGE, CLIPFORMAT, LONG, LON 116 HRESULT OleConvertIStorageToOLESTREAMEx(LPSTORAGE, CLIPFORMAT, LONG, LON
117 HRESULT OleConvertOLESTREAMToIStorageEx(LPOLESTREAM, LPSTORAGE, CLIPFORM 117 HRESULT OleConvertOLESTREAMToIStorageEx(LPOLESTREAM, LPSTORAGE, CLIPFORM
118 } 118 }