Differences From Artifact [0d8181c3ae90ee78]:
- File
src/win32/oleidl.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 [7389b9c0e57070f9]:
- File
src/win32/oleidl.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.
7 * * 7 * *
8 * Placed into public domain * 8 * Placed into public domain *
9 \***********************************************************************/ 9 \***********************************************************************/
10 module win32.oleidl; 10 module win32.oleidl;
11 11
12 // DAC: This is defined in ocidl !! 12 // DAC: This is defined in ocidl !!
13 // what is it doing in here? 13 // what is it doing in here?
14 //alias IEnumOleUndoUnits* LPENUMOLEUNDOUNITS; | 14 //alias IEnumOleUndoUnits LPENUMOLEUNDOUNITS;
15 15
16 private import win32.basetyps, win32.objidl, win32.unknwn, win32.windef, 16 private import win32.basetyps, win32.objidl, win32.unknwn, win32.windef,
17 win32.winuser, win32.wtypes; 17 win32.winuser, win32.wtypes;
18 private import win32.objfwd; // for LPMONIKER 18 private import win32.objfwd; // for LPMONIKER
19 private import win32.wingdi; // for LPLOGPALETTE 19 private import win32.wingdi; // for LPLOGPALETTE
20 20
21 const MK_ALT = 32; 21 const MK_ALT = 32;
................................................................................................................................................................................
50 DROPEFFECT_COPY = 1, 50 DROPEFFECT_COPY = 1,
51 DROPEFFECT_MOVE = 2, 51 DROPEFFECT_MOVE = 2,
52 DROPEFFECT_LINK = 4, 52 DROPEFFECT_LINK = 4,
53 DROPEFFECT_SCROLL = 0x80000000 53 DROPEFFECT_SCROLL = 0x80000000
54 } 54 }
55 55
56 struct OLEMENUGROUPWIDTHS { 56 struct OLEMENUGROUPWIDTHS {
57 LONG width[6]; | 57 LONG[6] width;
58 } 58 }
59 alias OLEMENUGROUPWIDTHS* LPOLEMENUGROUPWIDTHS; 59 alias OLEMENUGROUPWIDTHS* LPOLEMENUGROUPWIDTHS;
60 60
61 alias HGLOBAL HOLEMENU; 61 alias HGLOBAL HOLEMENU;
62 62
63 enum OLECLOSE { 63 enum OLECLOSE {
64 OLECLOSE_SAVEIFDIRTY, 64 OLECLOSE_SAVEIFDIRTY,
................................................................................................................................................................................
88 alias OLEINPLACEFRAMEINFO* LPOLEINPLACEFRAMEINFO; 88 alias OLEINPLACEFRAMEINFO* LPOLEINPLACEFRAMEINFO;
89 89
90 interface IEnumOLEVERB : IUnknown 90 interface IEnumOLEVERB : IUnknown
91 { 91 {
92 HRESULT Next(ULONG,OLEVERB*,ULONG*); 92 HRESULT Next(ULONG,OLEVERB*,ULONG*);
93 HRESULT Skip(ULONG); 93 HRESULT Skip(ULONG);
94 HRESULT Reset(); 94 HRESULT Reset();
95 HRESULT Clone(IEnumOLEVERB**); | 95 HRESULT Clone(IEnumOLEVERB*);
96 } 96 }
97 //alias IEnumOLEVERB IEnumOleVerb; 97 //alias IEnumOLEVERB IEnumOleVerb;
98 alias IEnumOLEVERB LPENUMOLEVERB; 98 alias IEnumOLEVERB LPENUMOLEVERB;
99 99
100 100
101 interface IParseDisplayName : IUnknown { 101 interface IParseDisplayName : IUnknown {
102 HRESULT ParseDisplayName(IBindCtx*,LPOLESTR,ULONG*,IMoniker**); | 102 HRESULT ParseDisplayName(IBindCtx,LPOLESTR,ULONG*,IMoniker*);
103 } 103 }
104 alias IParseDisplayName LPPARSEDISPLAYNAME; 104 alias IParseDisplayName LPPARSEDISPLAYNAME;
105 105
106 interface IOleContainer : IParseDisplayName { 106 interface IOleContainer : IParseDisplayName {
107 HRESULT EnumObjects(DWORD,IEnumUnknown**); | 107 HRESULT EnumObjects(DWORD,IEnumUnknown*);
108 HRESULT LockContainer(BOOL); 108 HRESULT LockContainer(BOOL);
109 } 109 }
110 alias IOleContainer LPOLECONTAINER; 110 alias IOleContainer LPOLECONTAINER;
111 111
112 interface IOleItemContainer : IOleContainer { 112 interface IOleItemContainer : IOleContainer {
113 HRESULT GetObject(LPOLESTR,DWORD,IBindCtx*,REFIID,void**); | 113 HRESULT GetObject(LPOLESTR,DWORD,IBindCtx,REFIID,void**);
114 HRESULT GetObjectStorage(LPOLESTR,IBindCtx*,REFIID,void**); | 114 HRESULT GetObjectStorage(LPOLESTR,IBindCtx,REFIID,void**);
115 HRESULT IsRunning(LPOLESTR); 115 HRESULT IsRunning(LPOLESTR);
116 } 116 }
117 117
118 118
119 interface IOleClientSite : IUnknown { 119 interface IOleClientSite : IUnknown {
120 HRESULT SaveObject(); 120 HRESULT SaveObject();
121 HRESULT GetMoniker(DWORD,DWORD,LPMONIKER*); 121 HRESULT GetMoniker(DWORD,DWORD,LPMONIKER*);
................................................................................................................................................................................
192 } 192 }
193 alias IOleInPlaceFrame LPOLEINPLACEFRAME; 193 alias IOleInPlaceFrame LPOLEINPLACEFRAME;
194 194
195 interface IOleInPlaceSite : IOleWindow { 195 interface IOleInPlaceSite : IOleWindow {
196 HRESULT CanInPlaceActivate(); 196 HRESULT CanInPlaceActivate();
197 HRESULT OnInPlaceActivate(); 197 HRESULT OnInPlaceActivate();
198 HRESULT OnUIActivate(); 198 HRESULT OnUIActivate();
199 HRESULT GetWindowContext(IOleInPlaceFrame*,IOleInPlaceUIWindow*,LPRECT,L | 199 HRESULT GetWindowContext(IOleInPlaceFrame,IOleInPlaceUIWindow,LPRECT,LPR
200 HRESULT Scroll(SIZE); 200 HRESULT Scroll(SIZE);
201 HRESULT OnUIDeactivate(BOOL); 201 HRESULT OnUIDeactivate(BOOL);
202 HRESULT OnInPlaceDeactivate(); 202 HRESULT OnInPlaceDeactivate();
203 HRESULT DiscardUndoState(); 203 HRESULT DiscardUndoState();
204 HRESULT DeactivateAndUndo(); 204 HRESULT DeactivateAndUndo();
205 HRESULT OnPosRectChange(LPCRECT); 205 HRESULT OnPosRectChange(LPCRECT);
206 } 206 }
................................................................................................................................................................................
234 } 234 }
235 235
236 interface IViewObject : IUnknown { 236 interface IViewObject : IUnknown {
237 HRESULT Draw(DWORD,LONG,PVOID,DVTARGETDEVICE*,HDC,HDC,LPCRECTL,LPCRECTL, 237 HRESULT Draw(DWORD,LONG,PVOID,DVTARGETDEVICE*,HDC,HDC,LPCRECTL,LPCRECTL,
238 HRESULT GetColorSet(DWORD,LONG,PVOID,DVTARGETDEVICE*,HDC,LPLOGPALETTE*); 238 HRESULT GetColorSet(DWORD,LONG,PVOID,DVTARGETDEVICE*,HDC,LPLOGPALETTE*);
239 HRESULT Freeze(DWORD,LONG,PVOID,PDWORD); 239 HRESULT Freeze(DWORD,LONG,PVOID,PDWORD);
240 HRESULT Unfreeze(DWORD); 240 HRESULT Unfreeze(DWORD);
241 HRESULT SetAdvise(DWORD,DWORD,IAdviseSink*); | 241 HRESULT SetAdvise(DWORD,DWORD,IAdviseSink);
242 HRESULT GetAdvise(PDWORD,PDWORD,IAdviseSink**); | 242 HRESULT GetAdvise(PDWORD,PDWORD,IAdviseSink*);
243 } 243 }
244 alias IViewObject LPVIEWOBJECT; 244 alias IViewObject LPVIEWOBJECT;
245 245
246 interface IViewObject2 : IViewObject { 246 interface IViewObject2 : IViewObject {
247 HRESULT GetExtent(DWORD,LONG,DVTARGETDEVICE*,LPSIZEL); 247 HRESULT GetExtent(DWORD,LONG,DVTARGETDEVICE*,LPSIZEL);
248 } 248 }
249 alias IViewObject2 LPVIEWOBJECT2; 249 alias IViewObject2 LPVIEWOBJECT2;
250 250
251 interface IOleCache : IUnknown { 251 interface IOleCache : IUnknown {
252 HRESULT Cache(FORMATETC*,DWORD,DWORD*); 252 HRESULT Cache(FORMATETC*,DWORD,DWORD*);
253 HRESULT Uncache(DWORD); 253 HRESULT Uncache(DWORD);
254 HRESULT EnumCache(IEnumSTATDATA**); | 254 HRESULT EnumCache(IEnumSTATDATA*);
255 HRESULT InitCache(LPDATAOBJECT); 255 HRESULT InitCache(LPDATAOBJECT);
256 HRESULT SetData(FORMATETC*,STGMEDIUM*,BOOL); 256 HRESULT SetData(FORMATETC*,STGMEDIUM*,BOOL);
257 } 257 }
258 alias IOleCache LPOLECACHE; 258 alias IOleCache LPOLECACHE;
259 259
260 interface IOleCache2 : IOleCache { 260 interface IOleCache2 : IOleCache {
261 HRESULT UpdateCache(LPDATAOBJECT,DWORD,LPVOID); 261 HRESULT UpdateCache(LPDATAOBJECT,DWORD,LPVOID);