Differences From Artifact [b8ee0e08b2d6c61c]:
- File
src/win32/docobj.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 [b4bf73a8fd532abb]:
- File
src/win32/docobj.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.
69 OLECMDEXECOPT_SHOWHELP = 3 69 OLECMDEXECOPT_SHOWHELP = 3
70 } 70 }
71 71
72 struct OLECMDTEXT { 72 struct OLECMDTEXT {
73 DWORD cmdtextf; 73 DWORD cmdtextf;
74 ULONG cwActual; 74 ULONG cwActual;
75 ULONG cwBuf; 75 ULONG cwBuf;
76 wchar rgwz[1]; | 76 wchar[1] rgwz;
77 } 77 }
78 78
79 struct OLECMD { 79 struct OLECMD {
80 ULONG cmdID; 80 ULONG cmdID;
81 DWORD cmdf; 81 DWORD cmdf;
82 } 82 }
83 83
84 alias IOleInPlaceSite* LPOLEINPLACESITE; | 84 alias IOleInPlaceSite LPOLEINPLACESITE;
85 alias IEnumOleDocumentViews* LPENUMOLEDOCUMENTVIEWS; | 85 alias IEnumOleDocumentViews LPENUMOLEDOCUMENTVIEWS;
86 86
87 extern (C) extern const IID 87 extern (C) extern const IID
88 IID_IContinueCallback, 88 IID_IContinueCallback,
89 IID_IEnumOleDocumentViews, 89 IID_IEnumOleDocumentViews,
90 IID_IPrint, 90 IID_IPrint,
91 IID_IOleDocumentView, 91 IID_IOleDocumentView,
92 IID_IOleDocument, 92 IID_IOleDocument,
................................................................................................................................................................................
93 IID_IOleCommandTarget, 93 IID_IOleCommandTarget,
94 IID_IOleDocumentSite; 94 IID_IOleDocumentSite;
95 95
96 96
97 interface IOleDocumentView : IUnknown { 97 interface IOleDocumentView : IUnknown {
98 HRESULT SetInPlaceSite(LPOLEINPLACESITE); 98 HRESULT SetInPlaceSite(LPOLEINPLACESITE);
99 HRESULT GetInPlaceSite(LPOLEINPLACESITE*); 99 HRESULT GetInPlaceSite(LPOLEINPLACESITE*);
100 HRESULT GetDocument(IUnknown**); | 100 HRESULT GetDocument(IUnknown*);
101 HRESULT SetRect(LPRECT); 101 HRESULT SetRect(LPRECT);
102 HRESULT GetRect(LPRECT); 102 HRESULT GetRect(LPRECT);
103 HRESULT SetRectComplex(LPRECT, LPRECT, LPRECT, LPRECT); 103 HRESULT SetRectComplex(LPRECT, LPRECT, LPRECT, LPRECT);
104 HRESULT Show(BOOL); 104 HRESULT Show(BOOL);
105 HRESULT UIActivate(BOOL); 105 HRESULT UIActivate(BOOL);
106 HRESULT Open(); 106 HRESULT Open();
107 HRESULT Close(DWORD); 107 HRESULT Close(DWORD);
108 HRESULT SaveViewState(IStream*); | 108 HRESULT SaveViewState(IStream);
109 HRESULT ApplyViewState(IStream*); | 109 HRESULT ApplyViewState(IStream);
110 HRESULT Clone(LPOLEINPLACESITE, IOleDocumentView**); | 110 HRESULT Clone(LPOLEINPLACESITE, IOleDocumentView*);
111 } 111 }
112 112
113 interface IEnumOleDocumentViews : IUnknown { 113 interface IEnumOleDocumentViews : IUnknown {
114 HRESULT Next(ULONG, IOleDocumentView*, ULONG*); | 114 HRESULT Next(ULONG, IOleDocumentView, ULONG*);
115 HRESULT Skip(ULONG); 115 HRESULT Skip(ULONG);
116 HRESULT Reset(); 116 HRESULT Reset();
117 HRESULT Clone(IEnumOleDocumentViews**); | 117 HRESULT Clone(IEnumOleDocumentViews*);
118 } 118 }
119 119
120 interface IOleDocument : IUnknown { 120 interface IOleDocument : IUnknown {
121 HRESULT CreateView(LPOLEINPLACESITE, IStream*, DWORD, IOleDocumentView** | 121 HRESULT CreateView(LPOLEINPLACESITE, IStream, DWORD, IOleDocumentView*);
122 HRESULT GetDocMiscStatus(DWORD*); 122 HRESULT GetDocMiscStatus(DWORD*);
123 HRESULT EnumViews(LPENUMOLEDOCUMENTVIEWS*, IOleDocumentView**); | 123 HRESULT EnumViews(LPENUMOLEDOCUMENTVIEWS*, IOleDocumentView*);
124 } 124 }
125 125
126 interface IOleCommandTarget : IUnknown { 126 interface IOleCommandTarget : IUnknown {
127 HRESULT QueryStatus(CPtr!(GUID), ULONG, OLECMD*, OLECMDTEXT*); | 127 HRESULT QueryStatus(const(GUID)*, ULONG, OLECMD*, OLECMDTEXT*);
128 HRESULT Exec(CPtr!(GUID), DWORD, DWORD, VARIANTARG*, VARIANTARG*); | 128 HRESULT Exec(const(GUID)*, DWORD, DWORD, VARIANTARG*, VARIANTARG*);
129 } 129 }
130 130
131 interface IOleDocumentSite : IUnknown { 131 interface IOleDocumentSite : IUnknown {
132 HRESULT ActivateMe(IOleDocumentView*); | 132 HRESULT ActivateMe(IOleDocumentView);
133 } 133 }