Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 59538: [WIN32K] Modify DBG_LOGEVENT to reference the parameter variable in non-logging mode, bring back cRefs variable in GDIOBJ_vReferenceObjectByPointer
by tkreuzer＠svn.reactos.org 20 Jul '13

20 Jul '13

Author: tkreuzer Date: Sat Jul 20 12:12:13 2013 New Revision: 59538 URL: http://svn.reactos.org/svn/reactos?rev=59538&view=rev Log: [WIN32K] Modify DBG_LOGEVENT to reference the parameter variable in non-logging mode, bring back cRefs variable in GDIOBJ_vReferenceObjectByPointer Modified: trunk/reactos/win32ss/gdi/ntgdi/gdidebug.h trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c Modified: trunk/reactos/win32ss/gdi/ntgdi/gdidebug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdidebug… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdidebug.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/gdidebug.h [iso-8859-1] Sat Jul 20 12:12:13 2013 @@ -47,7 +47,7 @@ #define DBG_DUMP_EVENT_LIST(pslh) DbgDumpEventList(pslh) #define DBG_CLEANUP_EVENT_LIST(pslh) DbgCleanupEventList(pslh) #else -#define DBG_LOGEVENT(pslh, type, val) +#define DBG_LOGEVENT(pslh, type, val) ((void)(val)) #define DBG_INITLOG(pslh) #define DBG_DUMP_EVENT_LIST(pslh) #define DBG_CLEANUP_EVENT_LIST(pslh) Modified: trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c [iso-8859-1] Sat Jul 20 12:12:13 2013 @@ -570,18 +570,20 @@ NTAPI GDIOBJ_vReferenceObjectByPointer(POBJ pobj) { + ULONG cRefs; + /* Check if the object has a handle */ if (GDI_HANDLE_GET_INDEX(pobj->hHmgr)) { /* Increase the handle's reference count */ ULONG ulIndex = GDI_HANDLE_GET_INDEX(pobj->hHmgr); ASSERT((gpaulRefCount[ulIndex] & REF_MASK_COUNT) > 0); - InterlockedIncrement((LONG*)&gpaulRefCount[ulIndex]); + cRefs = InterlockedIncrement((LONG*)&gpaulRefCount[ulIndex]); } else { /* Increase the object's reference count */ - InterlockedIncrement((LONG*)&pobj->ulShareCount); + cRefs = InterlockedIncrement((LONG*)&pobj->ulShareCount); } DBG_LOGEVENT(&pobj->slhLog, EVENT_REFERENCE, cRefs);

1 0

[tfaber] 59537: [SPEC2DEF] - Fix warnings
by tfaber＠svn.reactos.org 20 Jul '13

20 Jul '13

Author: tfaber Date: Sat Jul 20 11:40:04 2013 New Revision: 59537 URL: http://svn.reactos.org/svn/reactos?rev=59537&view=rev Log: [SPEC2DEF] - Fix warnings Modified: trunk/reactos/tools/spec2def/spec2def.c Modified: trunk/reactos/tools/spec2def/spec2def.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/spec2def/spec2def.c?… ============================================================================== --- trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] (original) +++ trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] Sat Jul 20 11:40:04 2013 @@ -10,7 +10,7 @@ typedef struct { char *pcName; - size_t nNameLength; + int nNameLength; char *pcRedirection; int nRedirectionLength; int nCallingConvention; @@ -315,7 +315,7 @@ PrintName(FILE *fileDest, EXPORT *pexp, char *pszPrefix, int fRedir, int fDeco) { char *pcName = fRedir ? pexp->pcRedirection : pexp->pcName; - size_t nNameLength = fRedir ? pexp->nRedirectionLength : pexp->nNameLength; + int nNameLength = fRedir ? pexp->nRedirectionLength : pexp->nNameLength; /* Handle autoname */ if (nNameLength == 1 && pcName[0] == '@') @@ -649,10 +649,10 @@ { /* Check for stdcall name */ char *p = strchr(pc, '@'); - if (p && ((size_t)(p - pc) < exp.nNameLength)) + if (p && (p - pc < exp.nNameLength)) { int i; - exp.nNameLength = p - pc; + exp.nNameLength = (int)(p - pc); if (exp.nNameLength < 1) { fprintf(stderr, "error, @ in line %d\n", nLine); @@ -669,7 +669,8 @@ } /* Get optional redirection */ - if ((pc = NextToken(pc))) + pc = NextToken(pc); + if (pc) { exp.pcRedirection = pc; exp.nRedirectionLength = TokenLength(pc);

1 0

[tfaber] 59536: [CMAKE] - Fix MSVC 64 bit host-tools build
by tfaber＠svn.reactos.org 20 Jul '13

20 Jul '13

Author: tfaber Date: Sat Jul 20 11:07:30 2013 New Revision: 59536 URL: http://svn.reactos.org/svn/reactos?rev=59536&view=rev Log: [CMAKE] - Fix MSVC 64 bit host-tools build Modified: trunk/reactos/CMakeLists.txt Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=59536&r… ============================================================================== --- trunk/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/CMakeLists.txt [iso-8859-1] Sat Jul 20 11:07:30 2013 @@ -65,7 +65,9 @@ include_directories(include/host) - add_subdirectory(dll/win32/dbghelp) + if(NOT MSVC) + add_subdirectory(dll/win32/dbghelp) + endif() add_subdirectory(tools) add_subdirectory(lib)

1 0

[tfaber] 59535: [PORTCLS] - Silence warnings. Using (unnecessary) virtual destructors here rather than final because that's what the 99 other classes already do.
by tfaber＠svn.reactos.org 20 Jul '13

20 Jul '13

Author: tfaber Date: Sat Jul 20 10:43:33 2013 New Revision: 59535 URL: http://svn.reactos.org/svn/reactos?rev=59535&view=rev Log: [PORTCLS] - Silence warnings. Using (unnecessary) virtual destructors here rather than final because that's what the 99 other classes already do. Modified: trunk/reactos/cmake/gcc.cmake trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=59535&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Sat Jul 20 10:43:33 2013 @@ -51,7 +51,7 @@ if(GCC_VERSION VERSION_LESS 4.7) add_compile_flags("-Wno-error=uninitialized") elseif(GCC_VERSION VERSION_EQUAL 4.7 OR GCC_VERSION VERSION_GREATER 4.7) - add_compile_flags("-Wno-error=unused-but-set-variable -Wno-maybe-uninitialized -Wno-error=delete-non-virtual-dtor -Wno-error=narrowing") + add_compile_flags("-Wno-error=unused-but-set-variable -Wno-maybe-uninitialized -Wno-error=narrowing") endif() if(ARCH STREQUAL "amd64") Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp [iso-8859-1] Sat Jul 20 10:43:33 2013 @@ -118,7 +118,7 @@ } CMiniportDMusUART(IUnknown * Unknown){} - ~CMiniportDMusUART(); + virtual ~CMiniportDMusUART(); /************************************************************************* * IMiniport methods @@ -242,7 +242,7 @@ return m_Ref; } - ~CMiniportDMusUARTStream(); + virtual ~CMiniportDMusUARTStream(); STDMETHODIMP_(NTSTATUS) Init (

1 0

[tfaber] 59534: [CMAKE] - And here's finally a reason why we shouldn't use g++'s host-headers and libraries - Switch back to wishy-washy-what's-a-standard mode for C++ globally, and enable C++11 on...
by tfaber＠svn.reactos.org 20 Jul '13

20 Jul '13

Author: tfaber Date: Sat Jul 20 10:23:07 2013 New Revision: 59534 URL: http://svn.reactos.org/svn/reactos?rev=59534&view=rev Log: [CMAKE] - And here's finally a reason why we shouldn't use g++'s host-headers and libraries - Switch back to wishy-washy-what's-a-standard mode for C++ globally, and enable C++11 only for netshell Modified: trunk/reactos/cmake/gcc.cmake trunk/reactos/dll/win32/netshell/CMakeLists.txt Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=59534&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Sat Jul 20 10:23:07 2013 @@ -15,7 +15,7 @@ add_compile_flags("-mstackrealign") endif() -add_compile_flags_language("-fno-rtti -fno-exceptions -std=gnu++11" "CXX") +add_compile_flags_language("-fno-rtti -fno-exceptions" "CXX") #bug #file(TO_NATIVE_PATH ${REACTOS_SOURCE_DIR} REACTOS_SOURCE_DIR_NATIVE) Modified: trunk/reactos/dll/win32/netshell/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/netshell/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/CMakeLists.txt [iso-8859-1] Sat Jul 20 10:23:07 2013 @@ -1,5 +1,10 @@ set_cpp(WITH_RUNTIME) + +if(NOT MSVC) + # HACK: this should be enabled globally! + add_compile_flags_language("-std=c++11" "CXX") +endif() remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600)

1 0

[tfaber] 59533: [CMAKE] - Why the heck do we need GNU C++ extensions aka fix build
by tfaber＠svn.reactos.org 20 Jul '13

20 Jul '13

Author: tfaber Date: Sat Jul 20 10:02:50 2013 New Revision: 59533 URL: http://svn.reactos.org/svn/reactos?rev=59533&view=rev Log: [CMAKE] - Why the heck do we need GNU C++ extensions aka fix build Modified: trunk/reactos/cmake/gcc.cmake Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=59533&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Sat Jul 20 10:02:50 2013 @@ -15,7 +15,7 @@ add_compile_flags("-mstackrealign") endif() -add_compile_flags_language("-fno-rtti -fno-exceptions -std=c++11" "CXX") +add_compile_flags_language("-fno-rtti -fno-exceptions -std=gnu++11" "CXX") #bug #file(TO_NATIVE_PATH ${REACTOS_SOURCE_DIR} REACTOS_SOURCE_DIR_NATIVE)

1 0

[tfaber] 59532: [NETSHELL] - Fix warnings
by tfaber＠svn.reactos.org 20 Jul '13

20 Jul '13

Author: tfaber Date: Sat Jul 20 09:56:58 2013 New Revision: 59532 URL: http://svn.reactos.org/svn/reactos?rev=59532&view=rev Log: [NETSHELL] - Fix warnings Modified: trunk/reactos/cmake/gcc.cmake trunk/reactos/dll/win32/netshell/classfactory.cpp trunk/reactos/dll/win32/netshell/connectmanager.cpp trunk/reactos/dll/win32/netshell/enumlist.h trunk/reactos/dll/win32/netshell/lanconnectui.cpp trunk/reactos/dll/win32/netshell/lanstatusui.cpp trunk/reactos/dll/win32/netshell/precomp.h trunk/reactos/dll/win32/netshell/shfldr_netconnect.cpp Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=59532&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Sat Jul 20 09:56:58 2013 @@ -15,7 +15,7 @@ add_compile_flags("-mstackrealign") endif() -add_compile_flags_language("-fno-rtti -fno-exceptions" "CXX") +add_compile_flags_language("-fno-rtti -fno-exceptions -std=c++11" "CXX") #bug #file(TO_NATIVE_PATH ${REACTOS_SOURCE_DIR} REACTOS_SOURCE_DIR_NATIVE) Modified: trunk/reactos/dll/win32/netshell/classfactory.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/classfa… ============================================================================== --- trunk/reactos/dll/win32/netshell/classfactory.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/classfactory.cpp [iso-8859-1] Sat Jul 20 09:56:58 2013 @@ -2,7 +2,8 @@ WINE_DEFAULT_DEBUG_CHANNEL (shell); -class CNetshellClassFactory: public IClassFactory +class CNetshellClassFactory : + public IClassFactory { public: CNetshellClassFactory(REFCLSID rclsid); Modified: trunk/reactos/dll/win32/netshell/connectmanager.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/connect… ============================================================================== --- trunk/reactos/dll/win32/netshell/connectmanager.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/connectmanager.cpp [iso-8859-1] Sat Jul 20 09:56:58 2013 @@ -9,45 +9,45 @@ NETCON_PROPERTIES Props; } INetConnectionItem, *PINetConnectionItem; -class CNetConnectionManager: +class CNetConnectionManager final : public INetConnectionManager, public IEnumNetConnection { public: CNetConnectionManager(); BOOL EnumerateINetConnections(); - + // IUnknown virtual HRESULT WINAPI QueryInterface(REFIID riid, LPVOID *ppvOut); virtual ULONG WINAPI AddRef(); virtual ULONG WINAPI Release(); - + // INetConnectionManager virtual HRESULT WINAPI EnumConnections(NETCONMGR_ENUM_FLAGS Flags, IEnumNetConnection **ppEnum); - + // IEnumNetConnection virtual HRESULT WINAPI Next(ULONG celt, INetConnection **rgelt, ULONG *pceltFetched); virtual HRESULT WINAPI Skip(ULONG celt); virtual HRESULT WINAPI Reset(); virtual HRESULT WINAPI Clone(IEnumNetConnection **ppenum); - + private: LONG ref; PINetConnectionItem pHead; PINetConnectionItem pCurrent; }; -class CNetConnection: +class CNetConnection final : public INetConnection { public: CNetConnection(PINetConnectionItem pItem); - + // IUnknown virtual HRESULT WINAPI QueryInterface(REFIID riid, LPVOID *ppvOut); virtual ULONG WINAPI AddRef(); virtual ULONG WINAPI Release(); - + // INetConnection HRESULT WINAPI Connect(); HRESULT WINAPI Disconnect(); @@ -56,7 +56,7 @@ HRESULT WINAPI GetProperties(NETCON_PROPERTIES **ppProps); HRESULT WINAPI GetUiObjectClassId(CLSID *pclsid); HRESULT WINAPI Rename(LPCWSTR pszwDuplicateName); - + private: LONG ref; NETCON_PROPERTIES Props; @@ -106,7 +106,7 @@ { ULONG refCount = InterlockedDecrement(&ref); - if (!refCount) + if (!refCount) delete this; return refCount; @@ -190,7 +190,7 @@ { ULONG refCount = InterlockedDecrement(&ref); - if (!refCount) + if (!refCount) { CoTaskMemFree(Props.pszwName); CoTaskMemFree(Props.pszwDeviceName); @@ -494,7 +494,7 @@ } dwSize = 0; - dwResult = GetAdaptersInfo(NULL, &dwSize); + dwResult = GetAdaptersInfo(NULL, &dwSize); if (dwResult!= ERROR_BUFFER_OVERFLOW) { CoTaskMemFree(pIfTable); Modified: trunk/reactos/dll/win32/netshell/enumlist.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/enumlis… ============================================================================== --- trunk/reactos/dll/win32/netshell/enumlist.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/enumlist.h [iso-8859-1] Sat Jul 20 09:56:58 2013 @@ -22,24 +22,24 @@ LPITEMIDLIST pidl; } ENUMLIST, *LPENUMLIST; -class CEnumIDList: +class CEnumIDList final : public IEnumIDList { public: CEnumIDList(); BOOL AddToEnumList(LPITEMIDLIST pidl); - + // IUnknown virtual HRESULT WINAPI QueryInterface(REFIID riid, LPVOID *ppvOut); virtual ULONG WINAPI AddRef(); virtual ULONG WINAPI Release(); - + // IEnumIDList virtual HRESULT STDMETHODCALLTYPE Next(ULONG celt, LPITEMIDLIST *rgelt, ULONG *pceltFetched); virtual HRESULT STDMETHODCALLTYPE Skip(ULONG celt); virtual HRESULT STDMETHODCALLTYPE Reset(); virtual HRESULT STDMETHODCALLTYPE Clone(IEnumIDList **ppenum); - + private: LONG ref; LPENUMLIST mpFirst; Modified: trunk/reactos/dll/win32/netshell/lanconnectui.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lanconn… ============================================================================== --- trunk/reactos/dll/win32/netshell/lanconnectui.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lanconnectui.cpp [iso-8859-1] Sat Jul 20 09:56:58 2013 @@ -22,38 +22,38 @@ UINT NumPropDialogOpen; } NET_ITEM, *PNET_ITEM; -class CNetConnectionPropertyUi: +class CNetConnectionPropertyUi final : public INetConnectionPropertyUi2, public INetLanConnectionUiInfo, public INetConnectionConnectUi { public: CNetConnectionPropertyUi(); - + // IUnknown virtual HRESULT WINAPI QueryInterface(REFIID riid, LPVOID *ppvOut); virtual ULONG WINAPI AddRef(); virtual ULONG WINAPI Release(); - + // INetConnectionPropertyUi2 virtual HRESULT WINAPI AddPages(HWND hwndParent, LPFNADDPROPSHEETPAGE pfnAddPage, LPARAM lParam); virtual HRESULT WINAPI GetIcon(DWORD dwSize, HICON *phIcon); // INetLanConnectionUiInfo virtual HRESULT WINAPI GetDeviceGuid(GUID *pGuid); - + // INetConnectionConnectUi virtual HRESULT WINAPI SetConnection(INetConnection* pCon); virtual HRESULT WINAPI Connect(HWND hwndParent, DWORD dwFlags); virtual HRESULT WINAPI Disconnect(HWND hwndParent, DWORD dwFlags); - + private: BOOL GetINetCfgComponent(INetCfg *pNCfg, INetCfgComponent ** pOut); VOID EnumComponents(HWND hDlgCtrl, INetCfg *pNCfg, const GUID *CompGuid, UINT Type); VOID InitializeLANPropertiesUIDlg(HWND hwndDlg); VOID ShowNetworkComponentProperties(HWND hwndDlg); static INT_PTR CALLBACK LANPropertiesUIDlg(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); - + INetConnection * pCon; INetCfgLock *NCfgLock; INetCfg * pNCfg; @@ -505,7 +505,7 @@ HRESULT WINAPI CNetConnectionPropertyUi::AddPages( - HWND hwndParent, + HWND hwndParent, LPFNADDPROPSHEETPAGE pfnAddPage, LPARAM lParam) { Modified: trunk/reactos/dll/win32/netshell/lanstatusui.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lanstat… ============================================================================== --- trunk/reactos/dll/win32/netshell/lanstatusui.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lanstatusui.cpp [iso-8859-1] Sat Jul 20 09:56:58 2013 @@ -34,7 +34,7 @@ UINT Status; } LANSTATUSUI_CONTEXT; -class CLanStatus: +class CLanStatus : public IOleCommandTarget { public: Modified: trunk/reactos/dll/win32/netshell/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/precomp… ============================================================================== --- trunk/reactos/dll/win32/netshell/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/precomp.h [iso-8859-1] Sat Jul 20 09:56:58 2013 @@ -24,6 +24,10 @@ #include <wine/debug.h> #include "resource.h" + +#if defined(_MSC_VER) && _MSC_VER < 1700 +#define final sealed +#endif #define NCF_VIRTUAL 0x1 #define NCF_SOFTWARE_ENUMERATED 0x2 Modified: trunk/reactos/dll/win32/netshell/shfldr_netconnect.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/shfldr_… ============================================================================== --- trunk/reactos/dll/win32/netshell/shfldr_netconnect.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/shfldr_netconnect.cpp [iso-8859-1] Sat Jul 20 09:56:58 2013 @@ -28,19 +28,19 @@ * IShellFolder implementation */ -class CNetworkConnections: +class CNetworkConnections final : public IShellFolder2, public IPersistFolder2, public IShellExecuteHookW { public: CNetworkConnections(); - + /* IUnknown */ virtual HRESULT WINAPI QueryInterface(REFIID riid, LPVOID *ppvOut); virtual ULONG WINAPI AddRef(); virtual ULONG WINAPI Release(); - + // IShellFolder virtual HRESULT WINAPI ParseDisplayName (HWND hwndOwner, LPBC pbc, LPOLESTR lpszDisplayName, DWORD *pchEaten, LPITEMIDLIST *ppidl, DWORD *pdwAttributes); virtual HRESULT WINAPI EnumObjects(HWND hwndOwner, DWORD dwFlags, LPENUMIDLIST *ppEnumIDList); @@ -61,15 +61,15 @@ virtual HRESULT WINAPI GetDetailsEx(LPCITEMIDLIST pidl, const SHCOLUMNID *pscid, VARIANT *pv); virtual HRESULT WINAPI GetDetailsOf(LPCITEMIDLIST pidl, UINT iColumn, SHELLDETAILS *psd); virtual HRESULT WINAPI MapColumnToSCID(UINT column, SHCOLUMNID *pscid); - + // IPersistFolder2 virtual HRESULT WINAPI GetClassID(CLSID *lpClassId); virtual HRESULT WINAPI Initialize(LPCITEMIDLIST pidl); virtual HRESULT WINAPI GetCurFolder(LPITEMIDLIST *pidl); - + // IShellExecuteHookW virtual HRESULT WINAPI Execute(LPSHELLEXECUTEINFOW pei); - + private: LONG ref; /* both paths are parsible from the desktop */ @@ -78,7 +78,7 @@ IOleCommandTarget * lpOleCmd; }; -class CNetConUiObject: +class CNetConUiObject final : public IContextMenu3, public IObjectWithSite, public IQueryInfo, @@ -86,31 +86,31 @@ { public: CNetConUiObject(LPCITEMIDLIST apidl, IOleCommandTarget *lpOleCmd); - + // IUnknown virtual HRESULT WINAPI QueryInterface(REFIID riid, LPVOID *ppvOut); virtual ULONG WINAPI AddRef(); virtual ULONG WINAPI Release(); - + // IContextMenu3 virtual HRESULT WINAPI QueryContextMenu(HMENU hmenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags); virtual HRESULT WINAPI InvokeCommand(LPCMINVOKECOMMANDINFO lpici); virtual HRESULT WINAPI GetCommandString(UINT_PTR idCmd, UINT uType, UINT *pwReserved, LPSTR pszName, UINT cchMax); virtual HRESULT WINAPI HandleMenuMsg( UINT uMsg, WPARAM wParam, LPARAM lParam); virtual HRESULT WINAPI HandleMenuMsg2(UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *plResult); - + // IObjectWithSite virtual HRESULT WINAPI SetSite(IUnknown *punk); virtual HRESULT WINAPI GetSite(REFIID iid, void **ppvSite); - + // IQueryInfo virtual HRESULT WINAPI GetInfoFlags(DWORD *pdwFlags); virtual HRESULT WINAPI GetInfoTip(DWORD dwFlags, WCHAR **ppwszTip); - + // IExtractIconW virtual HRESULT STDMETHODCALLTYPE GetIconLocation(UINT uFlags, LPWSTR szIconFile, UINT cchMax, int *piIndex, UINT *pwFlags); virtual HRESULT STDMETHODCALLTYPE Extract(LPCWSTR pszFile, UINT nIconIndex, HICON *phiconLarge, HICON *phiconSmall, UINT nIconSize); - + private: LONG ref; LPCITEMIDLIST apidl; @@ -376,10 +376,10 @@ { //IGenericSFImpl *This = (IGenericSFImpl *)iface; HRESULT hr = S_OK; - static const DWORD dwNetConnectAttributes = SFGAO_STORAGE | SFGAO_HASPROPSHEET | SFGAO_STORAGEANCESTOR | + static const DWORD dwNetConnectAttributes = SFGAO_STORAGE | SFGAO_HASPROPSHEET | SFGAO_STORAGEANCESTOR | SFGAO_FILESYSANCESTOR | SFGAO_FOLDER | SFGAO_FILESYSTEM | SFGAO_HASSUBFOLDER | SFGAO_CANRENAME | SFGAO_CANDELETE; - static const DWORD dwNetConnectItemAttributes = SFGAO_HASPROPSHEET | SFGAO_STORAGEANCESTOR | + static const DWORD dwNetConnectItemAttributes = SFGAO_HASPROPSHEET | SFGAO_STORAGEANCESTOR | SFGAO_FILESYSANCESTOR | SFGAO_CANRENAME; if (!rgfInOut) @@ -725,7 +725,7 @@ ULONG refCount; refCount = InterlockedDecrement(&ref); - if (!refCount) + if (!refCount) delete this; return refCount; @@ -816,12 +816,12 @@ _InsertMenuItemW(hMenu, indexMenu++, TRUE, -1, MFT_SEPARATOR, NULL, MFS_ENABLED); _InsertMenuItemW(hMenu, indexMenu++, TRUE, IDS_NET_CREATELINK, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_CREATELINK), MFS_ENABLED); - if (pProperties->dwCharacter & NCCF_ALLOW_REMOVAL) + if (pProperties->dwCharacter & NCCF_ALLOW_REMOVAL) _InsertMenuItemW(hMenu, indexMenu++, TRUE, IDS_NET_DELETE, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_DELETE), MFS_ENABLED); else _InsertMenuItemW(hMenu, indexMenu++, TRUE, IDS_NET_DELETE, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_DELETE), MFS_GRAYED); - if (pProperties->dwCharacter & NCCF_ALLOW_RENAME) + if (pProperties->dwCharacter & NCCF_ALLOW_RENAME) _InsertMenuItemW(hMenu, indexMenu++, TRUE, IDS_NET_RENAME, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_RENAME), MFS_ENABLED); else _InsertMenuItemW(hMenu, indexMenu++, TRUE, IDS_NET_RENAME, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_RENAME), MFS_GRAYED);

1 0

[tfaber] 59531: [PSDK] - Fix PRINTPROVIDOR::fpAddPortEx prototype
by tfaber＠svn.reactos.org 20 Jul '13

20 Jul '13

Author: tfaber Date: Sat Jul 20 09:27:15 2013 New Revision: 59531 URL: http://svn.reactos.org/svn/reactos?rev=59531&view=rev Log: [PSDK] - Fix PRINTPROVIDOR::fpAddPortEx prototype Modified: trunk/reactos/include/psdk/winsplp.h Modified: trunk/reactos/include/psdk/winsplp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winsplp.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winsplp.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winsplp.h [iso-8859-1] Sat Jul 20 09:27:15 2013 @@ -193,8 +193,8 @@ DWORD fdwOptions, LPVOID pPrinterNotifyOptions); BOOL (WINAPI *fpFindClosePrinterChangeNotification)(HANDLE hChange); - BOOL (WINAPI *fpAddPortEx)(HANDLE hMonitor, LPWSTR pName, DWORD Level, - LPBYTE lpBuffer, LPWSTR lpMonitorName); + BOOL (WINAPI *fpAddPortEx)(LPWSTR pName, DWORD Level, LPBYTE lpBuffer, + LPWSTR lpMonitorName); BOOL (WINAPI *fpShutDown)(LPVOID pvReserved); BOOL (WINAPI *fpRefreshPrinterChangeNotification)(HANDLE hPrinter, DWORD Reserved,

1 0

[aandrejevic] 59530: [NTVDM] Implement multiple allocation strategies.
by aandrejevic＠svn.reactos.org 20 Jul '13

20 Jul '13

Author: aandrejevic Date: Sat Jul 20 06:14:13 2013 New Revision: 59530 URL: http://svn.reactos.org/svn/reactos?rev=59530&view=rev Log: [NTVDM] Implement multiple allocation strategies. Modified: branches/ntvdm/subsystems/ntvdm/dos.c branches/ntvdm/subsystems/ntvdm/dos.h Modified: branches/ntvdm/subsystems/ntvdm/dos.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] Sat Jul 20 06:14:13 2013 @@ -15,9 +15,11 @@ /* PRIVATE VARIABLES **********************************************************/ static WORD CurrentPsp = SYSTEM_PSP; +static WORD DosLastError = 0; static DWORD DiskTransferArea; static HANDLE DosSystemFileTable[DOS_SFT_SIZE]; static WORD DosSftRefCount[DOS_SFT_SIZE]; +static BYTE DosAllocStrategy = DOS_ALLOC_BEST_FIT; static BOOLEAN DosUmbLinked = FALSE; /* PRIVATE FUNCTIONS **********************************************************/ @@ -225,6 +227,14 @@ { WORD Result = 0, Segment = FIRST_MCB_SEGMENT, MaxSize = 0; PDOS_MCB CurrentMcb, NextMcb; + BOOLEAN SearchUmb = FALSE; + + if (DosUmbLinked && (DosAllocStrategy & (DOS_ALLOC_HIGH | DOS_ALLOC_HIGH_LOW))) + { + /* Search UMB first */ + Segment = UMB_START_SEGMENT; + SearchUmb = TRUE; + } while (TRUE) { @@ -234,6 +244,7 @@ /* Make sure it's valid */ if (CurrentMcb->BlockType != 'M' && CurrentMcb->BlockType != 'Z') { + DosLastError = ERROR_ARENA_TRASHED; return 0; } @@ -249,23 +260,59 @@ /* Check if this block is big enough */ if (CurrentMcb->Size < Size) goto Next; - /* It is, update the smallest found so far */ - if ((Result == 0) || (CurrentMcb->Size < SEGMENT_TO_MCB(Result)->Size)) - { - Result = Segment; + switch (DosAllocStrategy & 0x3F) + { + case DOS_ALLOC_FIRST_FIT: + { + /* For first fit, stop immediately */ + Result = Segment; + goto Done; + } + + case DOS_ALLOC_BEST_FIT: + { + /* For best fit, update the smallest block found so far */ + if ((Result == 0) || (CurrentMcb->Size < SEGMENT_TO_MCB(Result)->Size)) + { + Result = Segment; + } + + break; + } + + case DOS_ALLOC_LAST_FIT: + { + /* For last fit, make the current block the result, but keep searching */ + Result = Segment; + break; + } } Next: /* If this was the last MCB in the chain, quit */ - if (CurrentMcb->BlockType == 'Z') break; + if (CurrentMcb->BlockType == 'Z') + { + /* Check if nothing was found while searching through UMBs */ + if ((Result == 0) && SearchUmb && (DosAllocStrategy & DOS_ALLOC_HIGH_LOW)) + { + /* Search low memory */ + Segment = FIRST_MCB_SEGMENT; + continue; + } + + break; + } /* Otherwise, update the segment and continue */ Segment += CurrentMcb->Size + 1; } +Done: + /* If we didn't find a free block, return 0 */ if (Result == 0) { + DosLastError = ERROR_NOT_ENOUGH_MEMORY; if (MaxAvailable) *MaxAvailable = MaxSize; return 0; } @@ -306,6 +353,7 @@ if ((Mcb->BlockType != 'M' && Mcb->BlockType != 'Z') || Mcb->OwnerPsp == 0) { Success = FALSE; + DosLastError = ERROR_INVALID_PARAMETER; goto Done; } @@ -328,6 +376,7 @@ /* Make sure the next segment is free */ if (NextMcb->OwnerPsp != 0) { + DosLastError = ERROR_NOT_ENOUGH_MEMORY; Success = FALSE; goto Done; } @@ -1457,7 +1506,7 @@ } else { - EmulatorSetRegister(EMULATOR_REG_AX, ERROR_NOT_ENOUGH_MEMORY); + EmulatorSetRegister(EMULATOR_REG_AX, DosLastError); EmulatorSetRegister(EMULATOR_REG_BX, MaxAvailable); EmulatorSetFlag(EMULATOR_FLAG_CF); } @@ -1492,6 +1541,7 @@ } else { + EmulatorSetRegister(EMULATOR_REG_AX, DosLastError); EmulatorSetFlag(EMULATOR_FLAG_CF); EmulatorSetRegister(EMULATOR_REG_BX, Size); } @@ -1509,13 +1559,45 @@ /* Get/Set Memory Management Options */ case 0x58: { - if (LOBYTE(Eax) == 0x02) + if (LOBYTE(Eax) == 0x00) + { + /* Get allocation strategy */ + + EmulatorSetRegister(EMULATOR_REG_AX, DosAllocStrategy); + EmulatorClearFlag(EMULATOR_FLAG_CF); + } + else if (LOBYTE(Eax) == 0x01) + { + /* Set allocation strategy */ + + if ((LOBYTE(Ebx) & (DOS_ALLOC_HIGH | DOS_ALLOC_HIGH_LOW)) + == (DOS_ALLOC_HIGH | DOS_ALLOC_HIGH_LOW)) + { + /* Can't set both */ + EmulatorSetRegister(EMULATOR_REG_AX, ERROR_INVALID_PARAMETER); + EmulatorSetFlag(EMULATOR_FLAG_CF); + break; + } + + if ((LOBYTE(Ebx) & 0x3F) > DOS_ALLOC_LAST_FIT) + { + /* Invalid allocation strategy */ + EmulatorSetRegister(EMULATOR_REG_AX, ERROR_INVALID_PARAMETER); + EmulatorSetFlag(EMULATOR_FLAG_CF); + break; + } + + DosAllocStrategy = LOBYTE(Ebx); + EmulatorClearFlag(EMULATOR_FLAG_CF); + } + else if (LOBYTE(Eax) == 0x02) { /* Get UMB link state */ Eax &= 0xFFFFFF00; if (DosUmbLinked) Eax |= 1; EmulatorSetRegister(EMULATOR_REG_AX, Eax); + EmulatorClearFlag(EMULATOR_FLAG_CF); } else if (LOBYTE(Eax) == 0x03) { @@ -1523,6 +1605,7 @@ if (Ebx) DosLinkUmb(); else DosUnlinkUmb(); + EmulatorClearFlag(EMULATOR_FLAG_CF); } else { Modified: branches/ntvdm/subsystems/ntvdm/dos.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos.h?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos.h [iso-8859-1] Sat Jul 20 06:14:13 2013 @@ -31,6 +31,15 @@ #define SEGMENT_TO_PSP(seg) ((PDOS_PSP)((ULONG_PTR)BaseAddress + TO_LINEAR((seg), 0))) #define UMB_START_SEGMENT 0xC000 #define UMB_END_SEGMENT 0xDFFF +#define DOS_ALLOC_HIGH 0x40 +#define DOS_ALLOC_HIGH_LOW 0x80 + +enum DOS_ALLOC_STRATEGY +{ + DOS_ALLOC_FIRST_FIT, + DOS_ALLOC_BEST_FIT, + DOS_ALLOC_LAST_FIT +}; #pragma pack(push, 1)

1 0

[hbelusca] 59529: [REGEDIT] Fix the creation of empty REG_MULTI_SZ values (they have to contain only one NULL char, since a multi-string has the form: str1\0str2\0...strN\0\0 where each strI\0 is a...
by hbelusca＠svn.reactos.org 20 Jul '13

20 Jul '13

Author: hbelusca Date: Sat Jul 20 00:37:47 2013 New Revision: 59529 URL: http://svn.reactos.org/svn/reactos?rev=59529&view=rev Log: [REGEDIT] Fix the creation of empty REG_MULTI_SZ values (they have to contain only one NULL char, since a multi-string has the form: str1\0str2\0...strN\0\0 where each strI\0 is a null-terminated string, and a multi-string is terminated by a null string. And therefore an empty multi-string has only one null char, corresponding to the terminating null string. Modified: trunk/reactos/base/applications/regedit/framewnd.c trunk/reactos/base/applications/regedit/listview.c Modified: trunk/reactos/base/applications/regedit/framewnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/framewnd.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/framewnd.c [iso-8859-1] Sat Jul 20 00:37:47 2013 @@ -853,10 +853,19 @@ cbData = sizeof(WCHAR); break; case REG_MULTI_SZ: - cbData = sizeof(WCHAR) * 2; - break; - case REG_QWORD: - cbData = sizeof(DWORD) * 2; + /* + * WARNING: An empty multi-string has only one null char. + * Indeed, multi-strings are built in the following form: + * str1\0str2\0...strN\0\0 + * where each strI\0 is a null-terminated string, and it + * ends with a terminating empty string. + * Therefore an empty multi-string contains only the terminating + * empty string, that is, one null char. + */ + cbData = sizeof(WCHAR); + break; + case REG_QWORD: /* REG_QWORD_LITTLE_ENDIAN */ + cbData = sizeof(DWORDLONG); // == sizeof(DWORD) * 2; break; default: cbData = 0; Modified: trunk/reactos/base/applications/regedit/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/listview.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/listview.c [iso-8859-1] Sat Jul 20 00:37:47 2013 @@ -439,7 +439,7 @@ return ((int)dw2 - (int)dw1); } - case REG_QWORD: + case REG_QWORD: /* REG_QWORD_LITTLE_ENDIAN */ { qw1 = *(DWORDLONG*)l->val; qw2 = *(DWORDLONG*)r->val;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs