Ros-diffs May 2005

ros-diffs@reactos.org

26 participants
814 discussions

by mf＠svn.reactos.com

eliminate GCC4 warnings Modified: trunk/reactos/subsys/system/explorer/Jamfile Modified: trunk/reactos/subsys/system/explorer/Makefile Modified: trunk/reactos/subsys/system/explorer/Makefile.MinGW Modified: trunk/reactos/subsys/system/explorer/Makefile.PCH Modified: trunk/reactos/subsys/system/explorer/Makefile.Wine _____ Modified: trunk/reactos/subsys/system/explorer/Jamfile --- trunk/reactos/subsys/system/explorer/Jamfile 2005-05-11 19:12:26 UTC (rev 15227) +++ trunk/reactos/subsys/system/explorer/Jamfile 2005-05-11 19:13:20 UTC (rev 15228) @@ -45,7 +45,7 @@ i386-stub-win32.c : <define>WIN32 <define>_WIN32_IE=0x0600 <define>_WIN32_WINNT=0x0501 <define>WINVER=0x0500 <include>. <include>$(EXPAT_INC) -# only for GCC: <cxxflags>-fexceptions <cxxflags>-Wall +# only for GCC: <cxxflags>-fexceptions <cxxflags>-Wall <cxxflags>-Wno-unused-value <find-shared-library>gdi32 <find-shared-library>ole32 <find-shared-library>comctl32 _____ Modified: trunk/reactos/subsys/system/explorer/Makefile --- trunk/reactos/subsys/system/explorer/Makefile 2005-05-11 19:12:26 UTC (rev 15227) +++ trunk/reactos/subsys/system/explorer/Makefile 2005-05-11 19:13:20 UTC (rev 15228) @@ -17,7 +17,7 @@ TARGET_CFLAGS := \ -D__USE_W32API -DWIN32 -D_ROS_ \ -D_WIN32_IE=0x0600 -D_WIN32_WINNT=0x0501 -DWINVER=0x0500 \ - -DUNICODE -fexceptions -Wall -g \ + -DUNICODE -fexceptions -Wall -Wno-unused-value -g \ -I../../../include/expat TARGET_CPPFLAGS := $(TARGET_CFLAGS) _____ Modified: trunk/reactos/subsys/system/explorer/Makefile.MinGW --- trunk/reactos/subsys/system/explorer/Makefile.MinGW 2005-05-11 19:12:26 UTC (rev 15227) +++ trunk/reactos/subsys/system/explorer/Makefile.MinGW 2005-05-11 19:13:20 UTC (rev 15228) @@ -9,7 +9,7 @@ LINK = g++ # -D_NO_ALPHABLEND for builds without msimg32.dll dependency -CFLAGS = -DWIN32 -D_WIN32_IE=0x0600 -D_WIN32_WINNT=0x0501 -DWINVER=0x0500 -fexceptions -Wall -I. -I$(EXPAT_INC) +CFLAGS = -DWIN32 -D_WIN32_IE=0x0600 -D_WIN32_WINNT=0x0501 -DWINVER=0x0500 -fexceptions -Wall -Wno-unused-value -I. -I$(EXPAT_INC) RCFLAGS = -DWIN32 -D__WINDRES__ LFLAGS = -Wl,--subsystem,windows _____ Modified: trunk/reactos/subsys/system/explorer/Makefile.PCH --- trunk/reactos/subsys/system/explorer/Makefile.PCH 2005-05-11 19:12:26 UTC (rev 15227) +++ trunk/reactos/subsys/system/explorer/Makefile.PCH 2005-05-11 19:13:20 UTC (rev 15228) @@ -10,7 +10,7 @@ CXX = g++ LINK = g++ -CFLAGS = -DWIN32 -D_WIN32_IE=0x0600 -D_WIN32_WINNT=0x0501 -DWINVER=0x0500 -fexceptions -Wall -I. -I$(EXPAT_INC) +CFLAGS = -DWIN32 -D_WIN32_IE=0x0600 -D_WIN32_WINNT=0x0501 -DWINVER=0x0500 -fexceptions -Wall -Wno-unused-value -I. -I$(EXPAT_INC) RCFLAGS = -DWIN32 -D__WINDRES__ LFLAGS = -Wl,--subsystem,windows _____ Modified: trunk/reactos/subsys/system/explorer/Makefile.Wine --- trunk/reactos/subsys/system/explorer/Makefile.Wine 2005-05-11 19:12:26 UTC (rev 15227) +++ trunk/reactos/subsys/system/explorer/Makefile.Wine 2005-05-11 19:13:20 UTC (rev 15228) @@ -126,7 +126,7 @@ LINT = LINTFLAGS = INCLUDES = -I$(SRCDIR) -I. -I$(TOPSRCDIR)/include -I$(TOPOBJDIR)/include $(EXTRAINCL) -EXTRACFLAGS = -mpreferred-stack-boundary=2 -fno-strict-aliasing -gstabs+ -Wpointer-arith +EXTRACFLAGS = -mpreferred-stack-boundary=2 -fno-strict-aliasing -gstabs+ -Wpointer-arith -Wno-unused-value ALLCFLAGS = $(INCLUDES) $(DEFS) $(EXTRACFLAGS) $(CPPFLAGS) $(CFLAGS) ALLLINTFLAGS = $(INCLUDES) $(DEFS) $(LINTFLAGS) MKINSTALLDIRS= $(TOPSRCDIR)/tools/mkinstalldirs -m 755

19 years, 4 months

[mf] 15227: Synchronisation with explorer source code

by mf＠svn.reactos.com

Synchronisation with explorer source code Modified: trunk/reactos/subsys/system/ibrowser/utility/utility.h _____ Modified: trunk/reactos/subsys/system/ibrowser/utility/utility.h --- trunk/reactos/subsys/system/ibrowser/utility/utility.h 2005-05-11 19:12:03 UTC (rev 15226) +++ trunk/reactos/subsys/system/ibrowser/utility/utility.h 2005-05-11 19:12:26 UTC (rev 15227) @@ -182,9 +182,9 @@ // launch a program or document file -extern BOOL launch_file(HWND hwnd, LPCTSTR cmd, UINT nCmdShow, LPCTSTR parameters=NULL); +extern BOOL launch_file(HWND hwnd, LPCTSTR cmd, UINT nCmdShow=SW_SHOWNORMAL, LPCTSTR parameters=NULL); #ifdef UNICODE -extern BOOL launch_fileA(HWND hwnd, LPSTR cmd, UINT nCmdShow, LPCSTR parameters=NULL); +extern BOOL launch_fileA(HWND hwnd, LPSTR cmd, UINT nCmdShow=SW_SHOWNORMAL, LPCSTR parameters=NULL); #else #define launch_fileA launch_file #endif @@ -300,16 +300,22 @@ struct Thread { Thread() - : _alive(false) + : _alive(false), + _destroy(false) { _hThread = INVALID_HANDLE_VALUE; + _evtFinish = CreateEvent(NULL, TRUE, FALSE, NULL); } virtual ~Thread() { Stop(); + CloseHandle(_evtFinish); CloseHandle(_hThread); + + if (_destroy) + delete this; } void Start() @@ -322,6 +328,8 @@ void Stop() { + SetEvent(_evtFinish); + if (_alive) { { Lock lock(_crit_sect); @@ -343,7 +351,9 @@ static DWORD WINAPI ThreadProc(void* para); HANDLE _hThread; + HANDLE _evtFinish; bool _alive; + bool _destroy; };

19 years, 4 months

[mf] 15226: Makefile maintainancement

by mf＠svn.reactos.com

Makefile maintainancement Modified: trunk/reactos/subsys/system/ibrowser/ibrowser.dsp Modified: trunk/reactos/subsys/system/ibrowser/make_ibrowser.dsp _____ Modified: trunk/reactos/subsys/system/ibrowser/ibrowser.dsp --- trunk/reactos/subsys/system/ibrowser/ibrowser.dsp 2005-05-11 19:11:27 UTC (rev 15225) +++ trunk/reactos/subsys/system/ibrowser/ibrowser.dsp 2005-05-11 19:12:03 UTC (rev 15226) @@ -177,10 +177,6 @@ # End Source File # Begin Source File -SOURCE=.\utility\expat.h -# End Source File -# Begin Source File - SOURCE=.\utility\utility.cpp # End Source File # Begin Source File _____ Modified: trunk/reactos/subsys/system/ibrowser/make_ibrowser.dsp --- trunk/reactos/subsys/system/ibrowser/make_ibrowser.dsp 2005-05-11 19:11:27 UTC (rev 15225) +++ trunk/reactos/subsys/system/ibrowser/make_ibrowser.dsp 2005-05-11 19:12:03 UTC (rev 15226) @@ -158,10 +158,6 @@ # Begin Source File -SOURCE=.\Jamfile -# End Source File -# Begin Source File - SOURCE=.\Makefile # End Source File # Begin Source File

19 years, 4 months

[mf] 15225: eliminate GCC4 warnings

by mf＠svn.reactos.com

eliminate GCC4 warnings Modified: trunk/reactos/subsys/system/ibrowser/Makefile Modified: trunk/reactos/subsys/system/ibrowser/Makefile.MinGW Modified: trunk/reactos/subsys/system/ibrowser/Makefile.PCH Modified: trunk/reactos/subsys/system/ibrowser/webchild.h _____ Modified: trunk/reactos/subsys/system/ibrowser/Makefile --- trunk/reactos/subsys/system/ibrowser/Makefile 2005-05-11 19:08:36 UTC (rev 15224) +++ trunk/reactos/subsys/system/ibrowser/Makefile 2005-05-11 19:11:27 UTC (rev 15225) @@ -17,7 +17,7 @@ TARGET_CFLAGS := \ -D__USE_W32API -DWIN32 -D_ROS_ \ -D_WIN32_IE=0x0600 -D_WIN32_WINNT=0x0501 -DWINVER=0x0500 \ - -DUNICODE -fexceptions -Wall \ + -DUNICODE -fexceptions -Wall -Wno-unused-value \ -I../../../include/expat TARGET_CPPFLAGS := $(TARGET_CFLAGS) _____ Modified: trunk/reactos/subsys/system/ibrowser/Makefile.MinGW --- trunk/reactos/subsys/system/ibrowser/Makefile.MinGW 2005-05-11 19:08:36 UTC (rev 15224) +++ trunk/reactos/subsys/system/ibrowser/Makefile.MinGW 2005-05-11 19:11:27 UTC (rev 15225) @@ -8,7 +8,7 @@ CXX = g++ LINK = g++ -CFLAGS = -DWIN32 -D_WIN32_IE=0x0600 -D_WIN32_WINNT=0x0501 -DWINVER=0x0500 -fexceptions -Wall -I. -I$(EXPAT_INC) +CFLAGS = -DWIN32 -D_WIN32_IE=0x0600 -D_WIN32_WINNT=0x0501 -DWINVER=0x0500 -fexceptions -Wall -Wno-unused-value -I. -I$(EXPAT_INC) RCFLAGS = -DWIN32 -D__WINDRES__ LFLAGS = -Wl,--subsystem,windows _____ Modified: trunk/reactos/subsys/system/ibrowser/Makefile.PCH --- trunk/reactos/subsys/system/ibrowser/Makefile.PCH 2005-05-11 19:08:36 UTC (rev 15224) +++ trunk/reactos/subsys/system/ibrowser/Makefile.PCH 2005-05-11 19:11:27 UTC (rev 15225) @@ -10,7 +10,7 @@ CXX = g++ LINK = g++ -CFLAGS = -DWIN32 -D_WIN32_IE=0x0600 -D_WIN32_WINNT=0x0501 -DWINVER=0x0500 -fexceptions -Wall -I. -I$(EXPAT_INC) +CFLAGS = -DWIN32 -D_WIN32_IE=0x0600 -D_WIN32_WINNT=0x0501 -DWINVER=0x0500 -fexceptions -Wall -Wno-unused-value -I. -I$(EXPAT_INC) RCFLAGS = -DWIN32 -D__WINDRES__ LFLAGS = -Wl,--subsystem,windows _____ Modified: trunk/reactos/subsys/system/ibrowser/webchild.h --- trunk/reactos/subsys/system/ibrowser/webchild.h 2005-05-11 19:08:36 UTC (rev 15224) +++ trunk/reactos/subsys/system/ibrowser/webchild.h 2005-05-11 19:11:27 UTC (rev 15225) @@ -115,25 +115,38 @@ { } - STDMETHODIMP QueryInterface(REFIID riid, LPVOID* ppv) {*ppv=0; - if (IsEqualIID(riid, _uuid_base) || - IsEqualIID(riid, IID_IUnknown)) {*ppv=static_cast<BASE*>(this); this->AddRef(); return S_OK;} - return E_NOINTERFACE;} + STDMETHODIMP QueryInterface(REFIID riid, LPVOID* ppv) + { + *ppv = NULL; + if (IsEqualIID(riid, _uuid_base) || IsEqualIID(riid, IID_IUnknown)) + {*ppv=static_cast<BASE*>(this); this->AddRef(); return S_OK;} + + return E_NOINTERFACE; + } + protected: IComSrvQI() {} + virtual ~IComSrvQI() {} REFIID _uuid_base; }; template<> struct IComSrvQI<IUnknown> : public IUnknown { - STDMETHODIMP QueryInterface(REFIID riid, LPVOID* ppv) {*ppv=0; - if (IsEqualIID(riid, IID_IUnknown)) {*ppv=this; AddRef(); return S_OK;} - return E_NOINTERFACE;} + STDMETHODIMP QueryInterface(REFIID riid, LPVOID* ppv) + { + *ppv = NULL; + if (IsEqualIID(riid, IID_IUnknown)) + {*ppv=this; AddRef(); return S_OK;} + + return E_NOINTERFACE; + } + protected: IComSrvQI<IUnknown>() {} + virtual ~IComSrvQI<IUnknown>() {} }; @@ -455,6 +468,8 @@ struct DWebBrowserEvents2IF { + virtual ~DWebBrowserEvents2IF() {} + virtual void StatusTextChange(const BStr& text) {} @@ -594,6 +609,9 @@ // MinGW defines a wrong FixedDWebBrowserEvents2 interface with virtual functions for DISPID calls, so we use our own, corrected version: interface FixedDWebBrowserEvents2 : public IDispatch { +#ifdef __GNUC__ + virtual ~FixedDWebBrowserEvents2() {} +#endif }; struct ANSUNC DWebBrowserEvents2Impl : public SimpleComObject,

19 years, 4 months

[mf] 15224: eliminate GCC4 warnings (patch by Thomas Weidenmueller)

by mf＠svn.reactos.com

eliminate GCC4 warnings (patch by Thomas Weidenmueller) Modified: trunk/reactos/subsys/system/explorer/i386-stub-win32.c Modified: trunk/reactos/subsys/system/explorer/shell/shellbrowser.h Modified: trunk/reactos/subsys/system/explorer/shell/webchild.h Modified: trunk/reactos/subsys/system/explorer/utility/dragdropimpl.h Modified: trunk/reactos/subsys/system/explorer/utility/shellbrowserimpl.h _____ Modified: trunk/reactos/subsys/system/explorer/i386-stub-win32.c --- trunk/reactos/subsys/system/explorer/i386-stub-win32.c 2005-05-11 17:37:46 UTC (rev 15223) +++ trunk/reactos/subsys/system/explorer/i386-stub-win32.c 2005-05-11 19:08:36 UTC (rev 15224) @@ -524,10 +524,10 @@ /* scan for the sequence $<data>#<checksum> */ -unsigned char * +char * getpacket (void) { - unsigned char *buffer = &remcomInBuffer[0]; + char *buffer = &remcomInBuffer[0]; unsigned char checksum; unsigned char xmitcsum; int count; @@ -597,7 +597,7 @@ /* send the packet in buffer. */ void -putpacket (unsigned char *buffer) +putpacket (char *buffer) { unsigned char checksum; int count; _____ Modified: trunk/reactos/subsys/system/explorer/shell/shellbrowser.h --- trunk/reactos/subsys/system/explorer/shell/shellbrowser.h 2005-05-11 17:37:46 UTC (rev 15223) +++ trunk/reactos/subsys/system/explorer/shell/shellbrowser.h 2005-05-11 19:08:36 UTC (rev 15224) @@ -50,6 +50,7 @@ struct BrowserCallback { + virtual ~BrowserCallback() {} virtual void entry_selected(Entry* entry) = 0; }; _____ Modified: trunk/reactos/subsys/system/explorer/shell/webchild.h --- trunk/reactos/subsys/system/explorer/shell/webchild.h 2005-05-11 17:37:46 UTC (rev 15223) +++ trunk/reactos/subsys/system/explorer/shell/webchild.h 2005-05-11 19:08:36 UTC (rev 15224) @@ -1,5 +1,5 @@ /* - * Copyright 2004 Martin Fuchs + * Copyright 2004, 2005 Martin Fuchs * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -115,25 +115,38 @@ { } - STDMETHODIMP QueryInterface(REFIID riid, LPVOID* ppv) {*ppv=0; - if (IsEqualIID(riid, _uuid_base) || - IsEqualIID(riid, IID_IUnknown)) {*ppv=static_cast<BASE*>(this); this->AddRef(); return S_OK;} - return E_NOINTERFACE;} + STDMETHODIMP QueryInterface(REFIID riid, LPVOID* ppv) + { + *ppv = NULL; + if (IsEqualIID(riid, _uuid_base) || IsEqualIID(riid, IID_IUnknown)) + {*ppv=static_cast<BASE*>(this); this->AddRef(); return S_OK;} + + return E_NOINTERFACE; + } + protected: IComSrvQI() {} + virtual ~IComSrvQI() {} REFIID _uuid_base; }; template<> struct IComSrvQI<IUnknown> : public IUnknown { - STDMETHODIMP QueryInterface(REFIID riid, LPVOID* ppv) {*ppv=0; - if (IsEqualIID(riid, IID_IUnknown)) {*ppv=this; AddRef(); return S_OK;} - return E_NOINTERFACE;} + STDMETHODIMP QueryInterface(REFIID riid, LPVOID* ppv) + { + *ppv = NULL; + if (IsEqualIID(riid, IID_IUnknown)) + {*ppv=this; AddRef(); return S_OK;} + + return E_NOINTERFACE; + } + protected: IComSrvQI<IUnknown>() {} + virtual ~IComSrvQI<IUnknown>() {} }; @@ -455,6 +468,8 @@ struct DWebBrowserEvents2IF { + virtual ~DWebBrowserEvents2IF() {} + virtual void StatusTextChange(const BStr& text) {} @@ -594,6 +609,9 @@ // MinGW defines a wrong FixedDWebBrowserEvents2 interface with virtual functions for DISPID calls, so we use our own, corrected version: interface FixedDWebBrowserEvents2 : public IDispatch { +#ifdef __GNUC__ + virtual ~FixedDWebBrowserEvents2() {} +#endif }; struct ANSUNC DWebBrowserEvents2Impl : public SimpleComObject, _____ Modified: trunk/reactos/subsys/system/explorer/utility/dragdropimpl.h --- trunk/reactos/subsys/system/explorer/utility/dragdropimpl.h 2005-05-11 17:37:46 UTC (rev 15223) +++ trunk/reactos/subsys/system/explorer/utility/dragdropimpl.h 2005-05-11 19:08:36 UTC (rev 15224) @@ -52,10 +52,12 @@ class IDropSourceImpl : public IDropSource { long m_cRefCount; + public: bool m_bDropped; IDropSourceImpl::IDropSourceImpl() : m_cRefCount(0), m_bDropped(false) {} + virtual ~IDropSourceImpl() {} //IUnknown virtual HRESULT STDMETHODCALLTYPE QueryInterface( _____ Modified: trunk/reactos/subsys/system/explorer/utility/shellbrowserimpl.h --- trunk/reactos/subsys/system/explorer/utility/shellbrowserimpl.h 2005-05-11 17:37:46 UTC (rev 15223) +++ trunk/reactos/subsys/system/explorer/utility/shellbrowserimpl.h 2005-05-11 19:08:36 UTC (rev 15224) @@ -29,7 +29,7 @@ #ifdef __MINGW32__ #include "servprov.h" // for IServiceProvider -#include "docobj.h" // for IOleCommandTarget +#include "docobj.h" // for IOleCommandTarget #endif @@ -45,45 +45,49 @@ { } + virtual ~IShellBrowserImpl() + { + } + virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, void** ppvObject); virtual ULONG STDMETHODCALLTYPE AddRef() {return ++_dwRef;} virtual ULONG STDMETHODCALLTYPE Release() {return --_dwRef;} //not heap based - // *** IOleWindow methods *** - virtual HRESULT STDMETHODCALLTYPE ContextSensitiveHelp(BOOL fEnterMode) {return E_NOTIMPL;} + // *** IOleWindow methods *** + virtual HRESULT STDMETHODCALLTYPE ContextSensitiveHelp(BOOL fEnterMode) {return E_NOTIMPL;} // *** ICommDlgBrowser methods *** - virtual HRESULT STDMETHODCALLTYPE OnDefaultCommand(IShellView* ppshv); + virtual HRESULT STDMETHODCALLTYPE OnDefaultCommand(IShellView* ppshv); - virtual HRESULT STDMETHODCALLTYPE OnStateChange(IShellView* ppshv, ULONG uChange) + virtual HRESULT STDMETHODCALLTYPE OnStateChange(IShellView* ppshv, ULONG uChange) { //handle selection, rename, focus if needed return E_NOTIMPL; } - virtual HRESULT STDMETHODCALLTYPE IncludeObject(IShellView* ppshv, LPCITEMIDLIST pidl) + virtual HRESULT STDMETHODCALLTYPE IncludeObject(IShellView* ppshv, LPCITEMIDLIST pidl) { //filter files if needed return S_OK; } - // *** IShellBrowser methods *** (same as IOleInPlaceFrame) - virtual HRESULT STDMETHODCALLTYPE InsertMenusSB(HMENU hmenuShared, LPOLEMENUGROUPWIDTHS lpMenuWidths) {return E_NOTIMPL;} - virtual HRESULT STDMETHODCALLTYPE SetMenuSB(HMENU hmenuShared, HOLEMENU holemenuReserved, HWND hwndActiveObject) {return E_NOTIMPL;} - virtual HRESULT STDMETHODCALLTYPE RemoveMenusSB(HMENU hmenuShared) {return E_NOTIMPL;} - virtual HRESULT STDMETHODCALLTYPE SetStatusTextSB(LPCOLESTR lpszStatusText) {return E_NOTIMPL;} - virtual HRESULT STDMETHODCALLTYPE EnableModelessSB(BOOL fEnable) {return E_NOTIMPL;} + // *** IShellBrowser methods *** (same as IOleInPlaceFrame) + virtual HRESULT STDMETHODCALLTYPE InsertMenusSB(HMENU hmenuShared, LPOLEMENUGROUPWIDTHS lpMenuWidths) {return E_NOTIMPL;} + virtual HRESULT STDMETHODCALLTYPE SetMenuSB(HMENU hmenuShared, HOLEMENU holemenuReserved, HWND hwndActiveObject) {return E_NOTIMPL;} + virtual HRESULT STDMETHODCALLTYPE RemoveMenusSB(HMENU hmenuShared) {return E_NOTIMPL;} + virtual HRESULT STDMETHODCALLTYPE SetStatusTextSB(LPCOLESTR lpszStatusText) {return E_NOTIMPL;} + virtual HRESULT STDMETHODCALLTYPE EnableModelessSB(BOOL fEnable) {return E_NOTIMPL;} virtual HRESULT STDMETHODCALLTYPE BrowseObject(LPCITEMIDLIST pidl, UINT wFlags) {return E_NOTIMPL;} virtual HRESULT STDMETHODCALLTYPE GetViewStateStream(DWORD grfMode, LPSTREAM* ppStrm) {return E_NOTIMPL;} virtual HRESULT STDMETHODCALLTYPE OnViewWindowActive(IShellView* ppshv) {return E_NOTIMPL;} virtual HRESULT STDMETHODCALLTYPE SetToolbarItems(LPTBBUTTON lpButtons, UINT nButtons, UINT uFlags) {return E_NOTIMPL;} virtual HRESULT STDMETHODCALLTYPE TranslateAcceleratorSB(LPMSG lpmsg, WORD wID) {return S_OK;} - // IServiceProvider + // IServiceProvider virtual HRESULT STDMETHODCALLTYPE QueryService(REFGUID guidService, REFIID riid, void** ppvObject); - // IOleCommandTarget - virtual HRESULT STDMETHODCALLTYPE QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds[], OLECMDTEXT* pCmdText); - virtual HRESULT STDMETHODCALLTYPE Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut); + // IOleCommandTarget + virtual HRESULT STDMETHODCALLTYPE QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds[], OLECMDTEXT* pCmdText); + virtual HRESULT STDMETHODCALLTYPE Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut); protected: DWORD _dwRef;

19 years, 4 months

[chorns] 15223: Use mingw convention for import libraries (libmodule.a)

by chorns＠svn.reactos.com

Use mingw convention for import libraries (libmodule.a) Modified: branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp 2005-05-11 17:30:21 UTC (rev 15222) +++ branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp 2005-05-11 17:37:46 UTC (rev 15223) @@ -637,9 +637,7 @@ Module::GetDependencyPath () const { if ( HasImportLibrary () ) - { - return ReplaceExtension ( GetPath(), ".a" ); - } + return ReplaceExtension ( GetPathWithPrefix ( "lib" ), ".a" ); else return GetPath(); }

19 years, 4 months

[mf] 15222: fix listbox insert algorithmus

by mf＠svn.reactos.com

fix listbox insert algorithmus Modified: trunk/reactos/subsys/system/explorer/shell/pane.cpp Modified: trunk/reactos/subsys/system/explorer/shell/pane.h _____ Modified: trunk/reactos/subsys/system/explorer/shell/pane.cpp --- trunk/reactos/subsys/system/explorer/shell/pane.cpp 2005-05-11 17:12:24 UTC (rev 15221) +++ trunk/reactos/subsys/system/explorer/shell/pane.cpp 2005-05-11 17:30:21 UTC (rev 15222) @@ -85,7 +85,7 @@ Entry* entry = _root; if (entry) - insert_entries(entry, -1); + insert_entries(entry); init(); @@ -657,12 +657,12 @@ // insert listbox entries after index idx -void Pane::insert_entries(Entry* dir, int idx) +int Pane::insert_entries(Entry* dir, int idx) { Entry* entry = dir; if (!entry) - return; + return idx; for(; entry; entry=entry->_next) { #ifndef _LEFT_FILES @@ -685,8 +685,10 @@ ListBox_InsertItemData(_hwnd, idx, entry); if (_treePane && entry->_expanded) - insert_entries(entry->_down, idx); + idx = insert_entries(entry->_down, idx); } + + return idx; } _____ Modified: trunk/reactos/subsys/system/explorer/shell/pane.h --- trunk/reactos/subsys/system/explorer/shell/pane.h 2005-05-11 17:12:24 UTC (rev 15221) +++ trunk/reactos/subsys/system/explorer/shell/pane.h 2005-05-11 17:30:21 UTC (rev 15222) @@ -92,7 +92,7 @@ void calc_single_width(int col); void draw_item(LPDRAWITEMSTRUCT dis, Entry* entry, int calcWidthCol=-1); - void insert_entries(Entry* dir, int idx=-1); + int insert_entries(Entry* dir, int idx=-1); BOOL command(UINT cmd); int Notify(int id, NMHDR* pnmh);

19 years, 4 months

[chorns] 15221: Rebuild import library if definition file is modified

by chorns＠svn.reactos.com

Rebuild import library if definition file is modified Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-05-11 17:03:00 UTC (rev 15220) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-05-11 17:12:24 UTC (rev 15221) @@ -1833,14 +1833,16 @@ { string library_target ( GetImportLibraryFilename ( module, &clean_files ) ); - + string defFilename = GetDefinitionFilename (); + string_list deps; GetDefinitionDependencies ( deps ); fprintf ( fMakefile, "# IMPORT LIBRARY RULE:\n" ); - fprintf ( fMakefile, "%s:", - library_target.c_str () ); + fprintf ( fMakefile, "%s: %s", + library_target.c_str (), + defFilename.c_str () ); size_t i, iend = deps.size(); for ( i = 0; i < iend; i++ ) @@ -1856,7 +1858,7 @@ fprintf ( fMakefile, "\t${dlltool} --dllname %s --def %s --output-lib %s %s\n\n", module.GetTargetName ().c_str (), - GetDefinitionFilename ().c_str (), + defFilename.c_str (), library_target.c_str (), killAt.c_str () ); }

19 years, 4 months

[weiden] 15220: revert the changes i accidently committed

by weiden＠svn.reactos.com

revert the changes i accidently committed Modified: trunk/rosapps/tests/hello/hello.c _____ Modified: trunk/rosapps/tests/hello/hello.c --- trunk/rosapps/tests/hello/hello.c 2005-05-11 17:00:13 UTC (rev 15219) +++ trunk/rosapps/tests/hello/hello.c 2005-05-11 17:03:00 UTC (rev 15220) @@ -1,12 +1,8 @@ -#include <windows.h> #include <stdio.h> #include <string.h> int main(int argc, char* argv[]) { - WCHAR str[255]; - - wsprintfW(str, L"%04X", 0xab34); - printf("%S\n", str); + printf("Hello world\n"); return(0); }

19 years, 4 months

[weiden] 15219: SVN maintainance

by weiden＠svn.reactos.com

SVN maintainance Property changes on: trunk/rosapps/demos/maze ___________________________________________________________________ Name: svn:ignore - maze.exe maze.nostrip.exe maze.sym maze.coff .*.d *.o *.map + *.exe *.sym *.coff *.d *.o *.a *.map Property changes on: trunk/rosapps/devutils/genguid ___________________________________________________________________ Name: svn:ignore - *.exe *.o *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.map + *.exe *.o *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.map *.a Property changes on: trunk/rosapps/devutils/zoomin ___________________________________________________________________ Name: svn:ignore - *.exe *.o *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.map + *.exe *.o *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.map *.a Property changes on: trunk/rosapps/games/solitaire ___________________________________________________________________ Name: svn:ignore - .coff .o .d .a .sym .map .exe + *.coff *.o *.d *.a *.sym *.map *.exe *.a Property changes on: trunk/rosapps/games/winemine ___________________________________________________________________ Name: svn:ignore - *.o *.d *.exe *.coff *.sym *.map + *.o *.d *.exe *.coff *.sym *.map *.a Property changes on: trunk/rosapps/packmgr/cmd-line ___________________________________________________________________ Name: svn:ignore + *.d *.a *.o *.dll *.exe *.coff *.map Property changes on: trunk/rosapps/packmgr/gui ___________________________________________________________________ Name: svn:ignore + *.d *.a *.o *.dll *.exe *.coff *.map Property changes on: trunk/rosapps/packmgr/gui/res ___________________________________________________________________ Name: svn:ignore + *.d *.a *.o *.dll *.exe *.coff *.map Property changes on: trunk/rosapps/packmgr/lib ___________________________________________________________________ Name: svn:ignore + *.d *.a *.o *.dll *.exe *.coff *.map Property changes on: trunk/rosapps/packmgr/tree ___________________________________________________________________ Name: svn:ignore + *.d *.a *.o *.dll *.exe *.coff *.map

19 years, 4 months

← Newer
1
...
46
47
48
49
50
51
52
...
82
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2005