Mercurial > dwindows

changeset 1857:417176df4755

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 285bf986e4fd
children 952a41463240
files makefile.mingw win/browser.c win/dw.c
diffstat 3 files changed, 25 insertions(+), 25 deletions(-) [+]
line wrap: on
line diff
--- a/makefile.mingw	Thu Feb 28 13:02:25 2013 +0000
+++ b/makefile.mingw	Thu Feb 28 13:30:58 2013 +0000
@@ -23,7 +23,7 @@
 
 # Had to disable -Wunused-value due to every Win32 macro generating this warning...
 # GCC has marked this as  WONTFIX http://gcc.gnu.org/bugzilla/show_bug.cgi?id=24900
-CFLAGS = -O -g -DMSVC $(PLATFORM_DEF) $(PLATFORM_CFLAGS) -D__WIN32__ -DBUILD_DLL -DGDIPLUS -DUNICODE -D_UNICODE -DISOLATION_AWARE_ENABLED=1 -I./win -I. -I./platform -Wall -Wno-unused-value -mthreads -o $(@)
+CFLAGS = -O -g -DMSVC $(PLATFORM_DEF) $(PLATFORM_CFLAGS) -D__WIN32__ -DBUILD_DLL -DGDIPLUS -DTOOLBAR -DUNICODE -D_UNICODE -DISOLATION_AWARE_ENABLED=1 -I./win -I. -I./platform -Wall -Wno-unused-value -mthreads -o $(@)
 LDFLAGS = -shared -mwindows -mthreads -lcomctl32 -lole32 -loleaut32 -luserenv -lmsimg32 -lgdiplus -luuid
 
 COMPATOBJECTS = dwcompat.o dirent.o
--- a/win/browser.c	Thu Feb 28 13:02:25 2013 +0000
+++ b/win/browser.c	Thu Feb 28 13:30:58 2013 +0000
@@ -33,8 +33,8 @@
 
 // Our IStorage functions that the browser may call
 HRESULT STDMETHODCALLTYPE Storage_QueryInterface(IStorage FAR* This, REFIID riid, LPVOID FAR* ppvObj);
-HRESULT STDMETHODCALLTYPE Storage_AddRef(IStorage FAR* This);
-HRESULT STDMETHODCALLTYPE Storage_Release(IStorage FAR* This);
+ULONG STDMETHODCALLTYPE Storage_AddRef(IStorage FAR* This);
+ULONG STDMETHODCALLTYPE Storage_Release(IStorage FAR* This);
 HRESULT STDMETHODCALLTYPE Storage_CreateStream(IStorage FAR* This, const WCHAR *pwcsName, DWORD grfMode, DWORD reserved1, DWORD reserved2, IStream **ppstm);
 HRESULT STDMETHODCALLTYPE Storage_OpenStream(IStorage FAR* This, const WCHAR * pwcsName, void *reserved1, DWORD grfMode, DWORD reserved2, IStream **ppstm);
 HRESULT STDMETHODCALLTYPE Storage_CreateStorage(IStorage FAR* This, const WCHAR *pwcsName, DWORD grfMode, DWORD reserved1, DWORD reserved2, IStorage **ppstg);
@@ -81,8 +81,8 @@
 
 // Our IOleInPlaceFrame functions that the browser may call
 HRESULT STDMETHODCALLTYPE Frame_QueryInterface(IOleInPlaceFrame FAR* This, REFIID riid, LPVOID FAR* ppvObj);
-HRESULT STDMETHODCALLTYPE Frame_AddRef(IOleInPlaceFrame FAR* This);
-HRESULT STDMETHODCALLTYPE Frame_Release(IOleInPlaceFrame FAR* This);
+ULONG STDMETHODCALLTYPE Frame_AddRef(IOleInPlaceFrame FAR* This);
+ULONG STDMETHODCALLTYPE Frame_Release(IOleInPlaceFrame FAR* This);
 HRESULT STDMETHODCALLTYPE Frame_GetWindow(IOleInPlaceFrame FAR* This, HWND FAR* lphwnd);
 HRESULT STDMETHODCALLTYPE Frame_ContextSensitiveHelp(IOleInPlaceFrame FAR* This, BOOL fEnterMode);
 HRESULT STDMETHODCALLTYPE Frame_GetBorder(IOleInPlaceFrame FAR* This, LPRECT lprectBorder);
@@ -154,8 +154,8 @@
 
 // Our IOleClientSite functions that the browser may call
 HRESULT STDMETHODCALLTYPE Site_QueryInterface(IOleClientSite FAR* This, REFIID riid, void ** ppvObject);
-HRESULT STDMETHODCALLTYPE Site_AddRef(IOleClientSite FAR* This);
-HRESULT STDMETHODCALLTYPE Site_Release(IOleClientSite FAR* This);
+ULONG STDMETHODCALLTYPE Site_AddRef(IOleClientSite FAR* This);
+ULONG STDMETHODCALLTYPE Site_Release(IOleClientSite FAR* This);
 HRESULT STDMETHODCALLTYPE Site_SaveObject(IOleClientSite FAR* This);
 HRESULT STDMETHODCALLTYPE Site_GetMoniker(IOleClientSite FAR* This, DWORD dwAssign, DWORD dwWhichMoniker, IMoniker ** ppmk);
 HRESULT STDMETHODCALLTYPE Site_GetContainer(IOleClientSite FAR* This, LPOLECONTAINER FAR* ppContainer);
@@ -186,8 +186,8 @@
 
 // Our IDocHostUIHandler functions that the browser may call
 HRESULT STDMETHODCALLTYPE UI_QueryInterface(IDocHostUIHandler FAR* This, REFIID riid, void ** ppvObject);
-HRESULT STDMETHODCALLTYPE UI_AddRef(IDocHostUIHandler FAR* This);
-HRESULT STDMETHODCALLTYPE UI_Release(IDocHostUIHandler FAR* This);
+ULONG STDMETHODCALLTYPE UI_AddRef(IDocHostUIHandler FAR* This);
+ULONG STDMETHODCALLTYPE UI_Release(IDocHostUIHandler FAR* This);
 HRESULT STDMETHODCALLTYPE UI_ShowContextMenu(IDocHostUIHandler FAR* This, DWORD dwID, POINT __RPC_FAR *ppt, IUnknown __RPC_FAR *pcmdtReserved, IDispatch __RPC_FAR *pdispReserved);
 HRESULT STDMETHODCALLTYPE UI_GetHostInfo(IDocHostUIHandler FAR* This, DOCHOSTUIINFO __RPC_FAR *pInfo);
 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);
@@ -236,8 +236,8 @@
 
 // Our IOleInPlaceSite functions that the browser may call
 HRESULT STDMETHODCALLTYPE InPlace_QueryInterface(IOleInPlaceSite FAR* This, REFIID riid, void ** ppvObject);
-HRESULT STDMETHODCALLTYPE InPlace_AddRef(IOleInPlaceSite FAR* This);
-HRESULT STDMETHODCALLTYPE InPlace_Release(IOleInPlaceSite FAR* This);
+ULONG STDMETHODCALLTYPE InPlace_AddRef(IOleInPlaceSite FAR* This);
+ULONG STDMETHODCALLTYPE InPlace_Release(IOleInPlaceSite FAR* This);
 HRESULT STDMETHODCALLTYPE InPlace_GetWindow(IOleInPlaceSite FAR* This, HWND FAR* lphwnd);
 HRESULT STDMETHODCALLTYPE InPlace_ContextSensitiveHelp(IOleInPlaceSite FAR* This, BOOL fEnterMode);
 HRESULT STDMETHODCALLTYPE InPlace_CanInPlaceActivate(IOleInPlaceSite FAR* This);
@@ -360,12 +360,12 @@
 	return(Site_QueryInterface((IOleClientSite *)((char *)This - sizeof(IOleClientSite) - sizeof(_IOleInPlaceSiteEx)), riid, ppvObj));
 }
 
-HRESULT STDMETHODCALLTYPE UI_AddRef(IDocHostUIHandler FAR* This)
+ULONG STDMETHODCALLTYPE UI_AddRef(IDocHostUIHandler FAR* This)
 {
 	return(1);
 }
 
-HRESULT STDMETHODCALLTYPE UI_Release(IDocHostUIHandler FAR* This)
+ULONG STDMETHODCALLTYPE UI_Release(IDocHostUIHandler FAR* This)
 {
 	return(1);
 }
@@ -596,12 +596,12 @@
 	NOTIMPLEMENTED;
 }
 
-HRESULT STDMETHODCALLTYPE Storage_AddRef(IStorage FAR* This)
+ULONG STDMETHODCALLTYPE Storage_AddRef(IStorage FAR* This)
 {
 	return(1);
 }
 
-HRESULT STDMETHODCALLTYPE Storage_Release(IStorage FAR* This)
+ULONG STDMETHODCALLTYPE Storage_Release(IStorage FAR* This)
 {
 	return(1);
 }
@@ -780,12 +780,12 @@
 	return(S_OK);
 }
 
-HRESULT STDMETHODCALLTYPE Site_AddRef(IOleClientSite FAR* This)
+ULONG STDMETHODCALLTYPE Site_AddRef(IOleClientSite FAR* This)
 {
 	return(1);
 }
 
-HRESULT STDMETHODCALLTYPE Site_Release(IOleClientSite FAR* This)
+ULONG STDMETHODCALLTYPE Site_Release(IOleClientSite FAR* This)
 {
 	return(1);
 }
@@ -852,12 +852,12 @@
 	return(Site_QueryInterface((IOleClientSite *)((char *)This - sizeof(IOleClientSite)), riid, ppvObj));
 }
 
-HRESULT STDMETHODCALLTYPE InPlace_AddRef(IOleInPlaceSite FAR* This)
+ULONG STDMETHODCALLTYPE InPlace_AddRef(IOleInPlaceSite FAR* This)
 {
 	return(1);
 }
 
-HRESULT STDMETHODCALLTYPE InPlace_Release(IOleInPlaceSite FAR* This)
+ULONG STDMETHODCALLTYPE InPlace_Release(IOleInPlaceSite FAR* This)
 {
 	return(1);
 }
@@ -994,12 +994,12 @@
 	NOTIMPLEMENTED;
 }
 
-HRESULT STDMETHODCALLTYPE Frame_AddRef(IOleInPlaceFrame FAR* This)
+ULONG STDMETHODCALLTYPE Frame_AddRef(IOleInPlaceFrame FAR* This)
 {
 	return(1);
 }
 
-HRESULT STDMETHODCALLTYPE Frame_Release(IOleInPlaceFrame FAR* This)
+ULONG STDMETHODCALLTYPE Frame_Release(IOleInPlaceFrame FAR* This)
 {
 	return(1);
 }
--- a/win/dw.c	Thu Feb 28 13:02:25 2013 +0000
+++ b/win/dw.c	Thu Feb 28 13:30:58 2013 +0000
@@ -6126,7 +6126,7 @@
    HIMAGELIST imlist, dimlist;
    BITMAP bmi = { 0 };
    TBBUTTON tbButtons[] = {    
-   { MAKELONG(0, 0), id, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0L, 0}
+   { MAKELONG(0, 0), id, TBSTATE_ENABLED, TBSTYLE_BUTTON}
    };
    
    /* Get the bitmap from either the icon or bitmap itself */
@@ -6192,7 +6192,7 @@
    HICON icon = LoadImage(DWInstance, MAKEINTRESOURCE(id), IMAGE_ICON, 0, 0, 0);
    HBITMAP hbitmap = icon ? 0 : LoadBitmap(DWInstance, MAKEINTRESOURCE(id));
 #ifdef TOOLBAR
-   if(tmp = _create_toolbar(text, id, icon, hbitmap))
+   if((tmp = _create_toolbar(text, id, icon, hbitmap)))
    {
       cinfo->fore = cinfo->back = -1;
       cinfo->pOldProc = SubclassWindow(tmp, _simplewndproc);
@@ -6263,7 +6263,7 @@
 #endif
 
 #ifdef TOOLBAR
-   if(tmp = _create_toolbar(text, id, hicon, hbitmap))
+   if((tmp = _create_toolbar(text, id, hicon, hbitmap)))
    {
       cinfo->fore = cinfo->back = -1;
       cinfo->pOldProc = SubclassWindow(tmp, _simplewndproc);
@@ -6354,7 +6354,7 @@
    }
 
 #ifdef TOOLBAR
-   if(tmp = _create_toolbar(text, id, hicon, hbitmap))
+   if((tmp = _create_toolbar(text, id, hicon, hbitmap)))
    {
       cinfo->fore = cinfo->back = -1;
       cinfo->pOldProc = SubclassWindow(tmp, _simplewndproc);