Differences From Artifact [e2cda4dadcb42922]:
- File
src/win32/ole.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 [40f31eaf30616640]:
- File
src/win32/ole.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.
150 150 oleupdate_onsave,
151 151 oleupdate_oncall,
152 152 // #ifdef OLE_INTERNAL
153 153 oleupdate_onclose
154 154 // #endif
155 155 }
156 156
157 -alias HANDLE HOBJECT;
157 +mixin DECLARE_HANDLE!("HOBJECT");
158 158 alias LONG LHSERVER, LHCLIENTDOC, LHSERVERDOC;
159 159
160 160 struct OLEOBJECTVTBL {
161 161 extern (Windows) {
162 162 void* function(LPOLEOBJECT, OLE_LPCSTR) QueryProtocol;
163 163 OLESTATUS function(LPOLEOBJECT) Release;
164 164 OLESTATUS function(LPOLEOBJECT, BOOL) Show;
................................................................................
250 250 OLE_LPCSTR, LPOLESERVERDOC*) CreateFromTemplate;
251 251 OLESTATUS function(LPOLESERVER, LHSERVERDOC, OLE_LPCSTR, OLE_LPCSTR,
252 252 LPOLESERVERDOC*) Edit;
253 253 OLESTATUS function(LPOLESERVER) Exit;
254 254 OLESTATUS function(LPOLESERVER) Release;
255 255 OLESTATUS function(LPOLESERVER, HGLOBAL) Execute;
256 256 }
257 -alias OLESERVERVTBL* LPOLESERVERVTBL;
257 +alias TypeDef!(OLESERVERVTBL*) LPOLESERVERVTBL;
258 258
259 259 struct OLESERVER {
260 260 LPOLESERVERVTBL lpvtbl;
261 261 }
262 262 alias OLESERVER* LPOLESERVER;
263 263
264 264 struct OLESERVERDOCVTBL {
................................................................................
284 284 OLESTATUS OleRelease(LPOLEOBJECT);
285 285 OLESTATUS OleSaveToStream(LPOLEOBJECT, LPOLESTREAM);
286 286 OLESTATUS OleEqual(LPOLEOBJECT, LPOLEOBJECT);
287 287 OLESTATUS OleCopyToClipboard(LPOLEOBJECT);
288 288 OLESTATUS OleSetHostNames(LPOLEOBJECT, LPCSTR, LPCSTR);
289 289 OLESTATUS OleSetTargetDevice(LPOLEOBJECT, HGLOBAL);
290 290 OLESTATUS OleSetBounds(LPOLEOBJECT, LPCRECT);
291 - OLESTATUS OleSetColorScheme(LPOLEOBJECT, CPtr!(LOGPALETTE));
291 + OLESTATUS OleSetColorScheme(LPOLEOBJECT, const(LOGPALETTE)*);
292 292 OLESTATUS OleQueryBounds(LPOLEOBJECT, RECT*);
293 293 OLESTATUS OleQuerySize(LPOLEOBJECT, DWORD*);
294 294 OLESTATUS OleDraw(LPOLEOBJECT, HDC, LPCRECT, LPCRECT, HDC);
295 295 OLESTATUS OleQueryOpen(LPOLEOBJECT);
296 296 OLESTATUS OleActivate(LPOLEOBJECT, UINT, BOOL, BOOL, HWND, LPCRECT);
297 297 OLESTATUS OleExecute(LPOLEOBJECT, HGLOBAL, UINT);
298 298 OLESTATUS OleClose(LPOLEOBJECT);