comparison win/browser.c @ 1857:417176df4755

Add TOOLBAR define with MinGW by default... fix warnings...generated by gcc in both the newly enabled browser and toolbar sections.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Thu, 28 Feb 2013 13:30:58 +0000
parents 32b5fba0b00a
children 22e3e829be13
comparison
equal deleted inserted replaced
1856:285bf986e4fd 1857:417176df4755
31 // This is used by DisplayHTMLStr(). It can be global because we never change it. 31 // This is used by DisplayHTMLStr(). It can be global because we never change it.
32 static const SAFEARRAYBOUND ArrayBound = {1, 0}; 32 static const SAFEARRAYBOUND ArrayBound = {1, 0};
33 33
34 // Our IStorage functions that the browser may call 34 // Our IStorage functions that the browser may call
35 HRESULT STDMETHODCALLTYPE Storage_QueryInterface(IStorage FAR* This, REFIID riid, LPVOID FAR* ppvObj); 35 HRESULT STDMETHODCALLTYPE Storage_QueryInterface(IStorage FAR* This, REFIID riid, LPVOID FAR* ppvObj);
36 HRESULT STDMETHODCALLTYPE Storage_AddRef(IStorage FAR* This); 36 ULONG STDMETHODCALLTYPE Storage_AddRef(IStorage FAR* This);
37 HRESULT STDMETHODCALLTYPE Storage_Release(IStorage FAR* This); 37 ULONG STDMETHODCALLTYPE Storage_Release(IStorage FAR* This);
38 HRESULT STDMETHODCALLTYPE Storage_CreateStream(IStorage FAR* This, const WCHAR *pwcsName, DWORD grfMode, DWORD reserved1, DWORD reserved2, IStream **ppstm); 38 HRESULT STDMETHODCALLTYPE Storage_CreateStream(IStorage FAR* This, const WCHAR *pwcsName, DWORD grfMode, DWORD reserved1, DWORD reserved2, IStream **ppstm);
39 HRESULT STDMETHODCALLTYPE Storage_OpenStream(IStorage FAR* This, const WCHAR * pwcsName, void *reserved1, DWORD grfMode, DWORD reserved2, IStream **ppstm); 39 HRESULT STDMETHODCALLTYPE Storage_OpenStream(IStorage FAR* This, const WCHAR * pwcsName, void *reserved1, DWORD grfMode, DWORD reserved2, IStream **ppstm);
40 HRESULT STDMETHODCALLTYPE Storage_CreateStorage(IStorage FAR* This, const WCHAR *pwcsName, DWORD grfMode, DWORD reserved1, DWORD reserved2, IStorage **ppstg); 40 HRESULT STDMETHODCALLTYPE Storage_CreateStorage(IStorage FAR* This, const WCHAR *pwcsName, DWORD grfMode, DWORD reserved1, DWORD reserved2, IStorage **ppstg);
41 HRESULT STDMETHODCALLTYPE Storage_OpenStorage(IStorage FAR* This, const WCHAR * pwcsName, IStorage * pstgPriority, DWORD grfMode, SNB snbExclude, DWORD reserved, IStorage **ppstg); 41 HRESULT STDMETHODCALLTYPE Storage_OpenStorage(IStorage FAR* This, const WCHAR * pwcsName, IStorage * pstgPriority, DWORD grfMode, SNB snbExclude, DWORD reserved, IStorage **ppstg);
42 HRESULT STDMETHODCALLTYPE Storage_CopyTo(IStorage FAR* This, DWORD ciidExclude, IID const *rgiidExclude, SNB snbExclude,IStorage *pstgDest); 42 HRESULT STDMETHODCALLTYPE Storage_CopyTo(IStorage FAR* This, DWORD ciidExclude, IID const *rgiidExclude, SNB snbExclude,IStorage *pstgDest);
79 // here instead of doing that programmably. 79 // here instead of doing that programmably.
80 IStorage MyIStorage = { &MyIStorageTable }; 80 IStorage MyIStorage = { &MyIStorageTable };
81 81
82 // Our IOleInPlaceFrame functions that the browser may call 82 // Our IOleInPlaceFrame functions that the browser may call
83 HRESULT STDMETHODCALLTYPE Frame_QueryInterface(IOleInPlaceFrame FAR* This, REFIID riid, LPVOID FAR* ppvObj); 83 HRESULT STDMETHODCALLTYPE Frame_QueryInterface(IOleInPlaceFrame FAR* This, REFIID riid, LPVOID FAR* ppvObj);
84 HRESULT STDMETHODCALLTYPE Frame_AddRef(IOleInPlaceFrame FAR* This); 84 ULONG STDMETHODCALLTYPE Frame_AddRef(IOleInPlaceFrame FAR* This);
85 HRESULT STDMETHODCALLTYPE Frame_Release(IOleInPlaceFrame FAR* This); 85 ULONG STDMETHODCALLTYPE Frame_Release(IOleInPlaceFrame FAR* This);
86 HRESULT STDMETHODCALLTYPE Frame_GetWindow(IOleInPlaceFrame FAR* This, HWND FAR* lphwnd); 86 HRESULT STDMETHODCALLTYPE Frame_GetWindow(IOleInPlaceFrame FAR* This, HWND FAR* lphwnd);
87 HRESULT STDMETHODCALLTYPE Frame_ContextSensitiveHelp(IOleInPlaceFrame FAR* This, BOOL fEnterMode); 87 HRESULT STDMETHODCALLTYPE Frame_ContextSensitiveHelp(IOleInPlaceFrame FAR* This, BOOL fEnterMode);
88 HRESULT STDMETHODCALLTYPE Frame_GetBorder(IOleInPlaceFrame FAR* This, LPRECT lprectBorder); 88 HRESULT STDMETHODCALLTYPE Frame_GetBorder(IOleInPlaceFrame FAR* This, LPRECT lprectBorder);
89 HRESULT STDMETHODCALLTYPE Frame_RequestBorderSpace(IOleInPlaceFrame FAR* This, LPCBORDERWIDTHS pborderwidths); 89 HRESULT STDMETHODCALLTYPE Frame_RequestBorderSpace(IOleInPlaceFrame FAR* This, LPCBORDERWIDTHS pborderwidths);
90 HRESULT STDMETHODCALLTYPE Frame_SetBorderSpace(IOleInPlaceFrame FAR* This, LPCBORDERWIDTHS pborderwidths); 90 HRESULT STDMETHODCALLTYPE Frame_SetBorderSpace(IOleInPlaceFrame FAR* This, LPCBORDERWIDTHS pborderwidths);
152 152
153 153
154 154
155 // Our IOleClientSite functions that the browser may call 155 // Our IOleClientSite functions that the browser may call
156 HRESULT STDMETHODCALLTYPE Site_QueryInterface(IOleClientSite FAR* This, REFIID riid, void ** ppvObject); 156 HRESULT STDMETHODCALLTYPE Site_QueryInterface(IOleClientSite FAR* This, REFIID riid, void ** ppvObject);
157 HRESULT STDMETHODCALLTYPE Site_AddRef(IOleClientSite FAR* This); 157 ULONG STDMETHODCALLTYPE Site_AddRef(IOleClientSite FAR* This);
158 HRESULT STDMETHODCALLTYPE Site_Release(IOleClientSite FAR* This); 158 ULONG STDMETHODCALLTYPE Site_Release(IOleClientSite FAR* This);
159 HRESULT STDMETHODCALLTYPE Site_SaveObject(IOleClientSite FAR* This); 159 HRESULT STDMETHODCALLTYPE Site_SaveObject(IOleClientSite FAR* This);
160 HRESULT STDMETHODCALLTYPE Site_GetMoniker(IOleClientSite FAR* This, DWORD dwAssign, DWORD dwWhichMoniker, IMoniker ** ppmk); 160 HRESULT STDMETHODCALLTYPE Site_GetMoniker(IOleClientSite FAR* This, DWORD dwAssign, DWORD dwWhichMoniker, IMoniker ** ppmk);
161 HRESULT STDMETHODCALLTYPE Site_GetContainer(IOleClientSite FAR* This, LPOLECONTAINER FAR* ppContainer); 161 HRESULT STDMETHODCALLTYPE Site_GetContainer(IOleClientSite FAR* This, LPOLECONTAINER FAR* ppContainer);
162 HRESULT STDMETHODCALLTYPE Site_ShowObject(IOleClientSite FAR* This); 162 HRESULT STDMETHODCALLTYPE Site_ShowObject(IOleClientSite FAR* This);
163 HRESULT STDMETHODCALLTYPE Site_OnShowWindow(IOleClientSite FAR* This, BOOL fShow); 163 HRESULT STDMETHODCALLTYPE Site_OnShowWindow(IOleClientSite FAR* This, BOOL fShow);
184 184
185 185
186 186
187 // Our IDocHostUIHandler functions that the browser may call 187 // Our IDocHostUIHandler functions that the browser may call
188 HRESULT STDMETHODCALLTYPE UI_QueryInterface(IDocHostUIHandler FAR* This, REFIID riid, void ** ppvObject); 188 HRESULT STDMETHODCALLTYPE UI_QueryInterface(IDocHostUIHandler FAR* This, REFIID riid, void ** ppvObject);
189 HRESULT STDMETHODCALLTYPE UI_AddRef(IDocHostUIHandler FAR* This); 189 ULONG STDMETHODCALLTYPE UI_AddRef(IDocHostUIHandler FAR* This);
190 HRESULT STDMETHODCALLTYPE UI_Release(IDocHostUIHandler FAR* This); 190 ULONG STDMETHODCALLTYPE UI_Release(IDocHostUIHandler FAR* This);
191 HRESULT STDMETHODCALLTYPE UI_ShowContextMenu(IDocHostUIHandler FAR* This, DWORD dwID, POINT __RPC_FAR *ppt, IUnknown __RPC_FAR *pcmdtReserved, IDispatch __RPC_FAR *pdispReserved); 191 HRESULT STDMETHODCALLTYPE UI_ShowContextMenu(IDocHostUIHandler FAR* This, DWORD dwID, POINT __RPC_FAR *ppt, IUnknown __RPC_FAR *pcmdtReserved, IDispatch __RPC_FAR *pdispReserved);
192 HRESULT STDMETHODCALLTYPE UI_GetHostInfo(IDocHostUIHandler FAR* This, DOCHOSTUIINFO __RPC_FAR *pInfo); 192 HRESULT STDMETHODCALLTYPE UI_GetHostInfo(IDocHostUIHandler FAR* This, DOCHOSTUIINFO __RPC_FAR *pInfo);
193 HRESULT STDMETHODCALLTYPE UI_ShowUI(IDocHostUIHandler FAR* This, DWORD dwID, IOleInPlaceActiveObject __RPC_FAR *pActiveObject, IOleCommandTarget __RPC_FAR *pCommandTarget, IOleInPlaceFrame __RPC_FAR *pFrame, IOleInPlaceUIWindow __RPC_FAR *pDoc); 193 HRESULT STDMETHODCALLTYPE UI_ShowUI(IDocHostUIHandler FAR* This, DWORD dwID, IOleInPlaceActiveObject __RPC_FAR *pActiveObject, IOleCommandTarget __RPC_FAR *pCommandTarget, IOleInPlaceFrame __RPC_FAR *pFrame, IOleInPlaceUIWindow __RPC_FAR *pDoc);
194 HRESULT STDMETHODCALLTYPE UI_HideUI(IDocHostUIHandler FAR* This); 194 HRESULT STDMETHODCALLTYPE UI_HideUI(IDocHostUIHandler FAR* This);
195 HRESULT STDMETHODCALLTYPE UI_UpdateUI(IDocHostUIHandler FAR* This); 195 HRESULT STDMETHODCALLTYPE UI_UpdateUI(IDocHostUIHandler FAR* This);
234 234
235 235
236 236
237 // Our IOleInPlaceSite functions that the browser may call 237 // Our IOleInPlaceSite functions that the browser may call
238 HRESULT STDMETHODCALLTYPE InPlace_QueryInterface(IOleInPlaceSite FAR* This, REFIID riid, void ** ppvObject); 238 HRESULT STDMETHODCALLTYPE InPlace_QueryInterface(IOleInPlaceSite FAR* This, REFIID riid, void ** ppvObject);
239 HRESULT STDMETHODCALLTYPE InPlace_AddRef(IOleInPlaceSite FAR* This); 239 ULONG STDMETHODCALLTYPE InPlace_AddRef(IOleInPlaceSite FAR* This);
240 HRESULT STDMETHODCALLTYPE InPlace_Release(IOleInPlaceSite FAR* This); 240 ULONG STDMETHODCALLTYPE InPlace_Release(IOleInPlaceSite FAR* This);
241 HRESULT STDMETHODCALLTYPE InPlace_GetWindow(IOleInPlaceSite FAR* This, HWND FAR* lphwnd); 241 HRESULT STDMETHODCALLTYPE InPlace_GetWindow(IOleInPlaceSite FAR* This, HWND FAR* lphwnd);
242 HRESULT STDMETHODCALLTYPE InPlace_ContextSensitiveHelp(IOleInPlaceSite FAR* This, BOOL fEnterMode); 242 HRESULT STDMETHODCALLTYPE InPlace_ContextSensitiveHelp(IOleInPlaceSite FAR* This, BOOL fEnterMode);
243 HRESULT STDMETHODCALLTYPE InPlace_CanInPlaceActivate(IOleInPlaceSite FAR* This); 243 HRESULT STDMETHODCALLTYPE InPlace_CanInPlaceActivate(IOleInPlaceSite FAR* This);
244 HRESULT STDMETHODCALLTYPE InPlace_OnInPlaceActivate(IOleInPlaceSite FAR* This); 244 HRESULT STDMETHODCALLTYPE InPlace_OnInPlaceActivate(IOleInPlaceSite FAR* This);
245 HRESULT STDMETHODCALLTYPE InPlace_OnUIActivate(IOleInPlaceSite FAR* This); 245 HRESULT STDMETHODCALLTYPE InPlace_OnUIActivate(IOleInPlaceSite FAR* This);
358 // inside our _IOleClientSiteEx, and comes immediately after the _IOleInPlaceSiteEx, we can employ 358 // inside our _IOleClientSiteEx, and comes immediately after the _IOleInPlaceSiteEx, we can employ
359 // the following trickery to get the pointer to our _IOleClientSiteEx. 359 // the following trickery to get the pointer to our _IOleClientSiteEx.
360 return(Site_QueryInterface((IOleClientSite *)((char *)This - sizeof(IOleClientSite) - sizeof(_IOleInPlaceSiteEx)), riid, ppvObj)); 360 return(Site_QueryInterface((IOleClientSite *)((char *)This - sizeof(IOleClientSite) - sizeof(_IOleInPlaceSiteEx)), riid, ppvObj));
361 } 361 }
362 362
363 HRESULT STDMETHODCALLTYPE UI_AddRef(IDocHostUIHandler FAR* This) 363 ULONG STDMETHODCALLTYPE UI_AddRef(IDocHostUIHandler FAR* This)
364 { 364 {
365 return(1); 365 return(1);
366 } 366 }
367 367
368 HRESULT STDMETHODCALLTYPE UI_Release(IDocHostUIHandler FAR* This) 368 ULONG STDMETHODCALLTYPE UI_Release(IDocHostUIHandler FAR* This)
369 { 369 {
370 return(1); 370 return(1);
371 } 371 }
372 372
373 // Called when the browser object is about to display its context menu. 373 // Called when the browser object is about to display its context menu.
594 HRESULT STDMETHODCALLTYPE Storage_QueryInterface(IStorage FAR* This, REFIID riid, LPVOID FAR* ppvObj) 594 HRESULT STDMETHODCALLTYPE Storage_QueryInterface(IStorage FAR* This, REFIID riid, LPVOID FAR* ppvObj)
595 { 595 {
596 NOTIMPLEMENTED; 596 NOTIMPLEMENTED;
597 } 597 }
598 598
599 HRESULT STDMETHODCALLTYPE Storage_AddRef(IStorage FAR* This) 599 ULONG STDMETHODCALLTYPE Storage_AddRef(IStorage FAR* This)
600 { 600 {
601 return(1); 601 return(1);
602 } 602 }
603 603
604 HRESULT STDMETHODCALLTYPE Storage_Release(IStorage FAR* This) 604 ULONG STDMETHODCALLTYPE Storage_Release(IStorage FAR* This)
605 { 605 {
606 return(1); 606 return(1);
607 } 607 }
608 608
609 HRESULT STDMETHODCALLTYPE Storage_CreateStream(IStorage FAR* This, const WCHAR *pwcsName, DWORD grfMode, DWORD reserved1, DWORD reserved2, IStream **ppstm) 609 HRESULT STDMETHODCALLTYPE Storage_CreateStream(IStorage FAR* This, const WCHAR *pwcsName, DWORD grfMode, DWORD reserved1, DWORD reserved2, IStream **ppstm)
778 } 778 }
779 779
780 return(S_OK); 780 return(S_OK);
781 } 781 }
782 782
783 HRESULT STDMETHODCALLTYPE Site_AddRef(IOleClientSite FAR* This) 783 ULONG STDMETHODCALLTYPE Site_AddRef(IOleClientSite FAR* This)
784 { 784 {
785 return(1); 785 return(1);
786 } 786 }
787 787
788 HRESULT STDMETHODCALLTYPE Site_Release(IOleClientSite FAR* This) 788 ULONG STDMETHODCALLTYPE Site_Release(IOleClientSite FAR* This)
789 { 789 {
790 return(1); 790 return(1);
791 } 791 }
792 792
793 HRESULT STDMETHODCALLTYPE Site_SaveObject(IOleClientSite FAR* This) 793 HRESULT STDMETHODCALLTYPE Site_SaveObject(IOleClientSite FAR* This)
850 // inside our _IOleClientSiteEx, and comes immediately after the IOleClientSite, we can employ 850 // inside our _IOleClientSiteEx, and comes immediately after the IOleClientSite, we can employ
851 // the following trickery to get the pointer to our _IOleClientSiteEx. 851 // the following trickery to get the pointer to our _IOleClientSiteEx.
852 return(Site_QueryInterface((IOleClientSite *)((char *)This - sizeof(IOleClientSite)), riid, ppvObj)); 852 return(Site_QueryInterface((IOleClientSite *)((char *)This - sizeof(IOleClientSite)), riid, ppvObj));
853 } 853 }
854 854
855 HRESULT STDMETHODCALLTYPE InPlace_AddRef(IOleInPlaceSite FAR* This) 855 ULONG STDMETHODCALLTYPE InPlace_AddRef(IOleInPlaceSite FAR* This)
856 { 856 {
857 return(1); 857 return(1);
858 } 858 }
859 859
860 HRESULT STDMETHODCALLTYPE InPlace_Release(IOleInPlaceSite FAR* This) 860 ULONG STDMETHODCALLTYPE InPlace_Release(IOleInPlaceSite FAR* This)
861 { 861 {
862 return(1); 862 return(1);
863 } 863 }
864 864
865 HRESULT STDMETHODCALLTYPE InPlace_GetWindow(IOleInPlaceSite FAR* This, HWND FAR* lphwnd) 865 HRESULT STDMETHODCALLTYPE InPlace_GetWindow(IOleInPlaceSite FAR* This, HWND FAR* lphwnd)
992 HRESULT STDMETHODCALLTYPE Frame_QueryInterface(IOleInPlaceFrame FAR* This, REFIID riid, LPVOID FAR* ppvObj) 992 HRESULT STDMETHODCALLTYPE Frame_QueryInterface(IOleInPlaceFrame FAR* This, REFIID riid, LPVOID FAR* ppvObj)
993 { 993 {
994 NOTIMPLEMENTED; 994 NOTIMPLEMENTED;
995 } 995 }
996 996
997 HRESULT STDMETHODCALLTYPE Frame_AddRef(IOleInPlaceFrame FAR* This) 997 ULONG STDMETHODCALLTYPE Frame_AddRef(IOleInPlaceFrame FAR* This)
998 { 998 {
999 return(1); 999 return(1);
1000 } 1000 }
1001 1001
1002 HRESULT STDMETHODCALLTYPE Frame_Release(IOleInPlaceFrame FAR* This) 1002 ULONG STDMETHODCALLTYPE Frame_Release(IOleInPlaceFrame FAR* This)
1003 { 1003 {
1004 return(1); 1004 return(1);
1005 } 1005 }
1006 1006
1007 HRESULT STDMETHODCALLTYPE Frame_GetWindow(IOleInPlaceFrame FAR* This, HWND FAR* lphwnd) 1007 HRESULT STDMETHODCALLTYPE Frame_GetWindow(IOleInPlaceFrame FAR* This, HWND FAR* lphwnd)