Ros-diffs July 2013

ros-diffs@reactos.org

13 participants
199 discussions

[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

[ion] 59528: [USBEHCI]: Straggler fix.
by ion＠svn.reactos.org 20 Jul '13

20 Jul '13

Author: ion Date: Sat Jul 20 00:13:59 2013 New Revision: 59528 URL: http://svn.reactos.org/svn/reactos?rev=59528&view=rev Log: [USBEHCI]: Straggler fix. Modified: trunk/reactos/drivers/usb/usbehci/hardware.cpp Modified: trunk/reactos/drivers/usb/usbehci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/hardwa… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/hardware.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/hardware.cpp [iso-8859-1] Sat Jul 20 00:13:59 2013 @@ -1124,14 +1124,10 @@ ULONG PortId, ULONG Feature) { - ULONG Value; - DPRINT("CUSBHardwareDevice::SetPortFeature\n"); if (PortId > m_Capabilities.HCSParams.PortCount) return STATUS_UNSUCCESSFUL; - - Value = EHCI_READ_REGISTER_ULONG(EHCI_PORTSC + (4 * PortId)); if (Feature == PORT_ENABLE) {

1 0

[ion] 59527: [MISC]: Cleanup a bunch of unused variables, in cases where it was obvious these variables were left-overs from debug code, debug prints, or in some cases commented-out functionality (...
by ion＠svn.reactos.org 20 Jul '13

20 Jul '13

Author: ion Date: Sat Jul 20 00:10:31 2013 New Revision: 59527 URL: http://svn.reactos.org/svn/reactos?rev=59527&view=rev Log: [MISC]: Cleanup a bunch of unused variables, in cases where it was obvious these variables were left-overs from debug code, debug prints, or in some cases commented-out functionality (in which case the variables were commented out instead of removed). If you own ACLUI, CLASS2, USB, USER32, or EXT2LIB you may want to check that these changes are accurate (i.e.: such as the last commit where the variable was actually not being used due to a bug). Modified: trunk/reactos/dll/win32/aclui/sidcache.c trunk/reactos/dll/win32/kernel32/client/except.c trunk/reactos/drivers/storage/class/class2/class2.c trunk/reactos/drivers/usb/usbccgp/descriptor.c trunk/reactos/drivers/usb/usbhub/fdo.c trunk/reactos/drivers/usb/usbhub/pdo.c trunk/reactos/drivers/usb/usbstor/error.c trunk/reactos/drivers/usb/usbstor/queue.c trunk/reactos/drivers/usb/usbstor/scsi.c trunk/reactos/lib/drivers/libusb/hub_controller.cpp trunk/reactos/lib/drivers/libusb/usb_device.cpp trunk/reactos/lib/fslib/ext2lib/Inode.c trunk/reactos/lib/fslib/ext2lib/Mke2fs.c trunk/reactos/win32ss/drivers/videoprt/child.c trunk/reactos/win32ss/user/user32/controls/static.c Modified: trunk/reactos/dll/win32/aclui/sidcache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/sidcache.c… ============================================================================== --- trunk/reactos/dll/win32/aclui/sidcache.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/aclui/sidcache.c [iso-8859-1] Sat Jul 20 00:10:31 2013 @@ -212,7 +212,7 @@ SID_NAME_USE SidNameUse = SidTypeUnknown; PPOLICY_ACCOUNT_DOMAIN_INFO PolicyAccountDomainInfo = NULL; NTSTATUS Status; - DWORD SidLength, AccountNameSize, DomainNameSize = 0; + DWORD AccountNameSize, DomainNameSize = 0; PSIDREQRESULT ReqRet = NULL; BOOL Ret = FALSE; @@ -223,7 +223,6 @@ &Names); if (NT_SUCCESS(Status)) { - SidLength = GetLengthSid(pSid); SidNameUse = Names->Use; if (ReferencedDomain != NULL && Modified: trunk/reactos/dll/win32/kernel32/client/except.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/except.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/except.c [iso-8859-1] Sat Jul 20 00:10:31 2013 @@ -396,7 +396,6 @@ SetErrorMode(IN UINT uMode) { UINT PrevErrMode, NewMode; - NTSTATUS Status; /* Get the previous mode */ PrevErrMode = GetErrorMode(); @@ -418,10 +417,10 @@ NewMode |= (PrevErrMode & SEM_NOALIGNMENTFAULTEXCEPT); /* Set the new mode */ - Status = NtSetInformationProcess(NtCurrentProcess(), - ProcessDefaultHardErrorMode, - (PVOID)&NewMode, - sizeof(NewMode)); + NtSetInformationProcess(NtCurrentProcess(), + ProcessDefaultHardErrorMode, + (PVOID)&NewMode, + sizeof(NewMode)); /* Return the previous mode */ return PrevErrMode; Modified: trunk/reactos/drivers/storage/class/class2/class2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/clas… ============================================================================== --- trunk/reactos/drivers/storage/class/class2/class2.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/class2/class2.c [iso-8859-1] Sat Jul 20 00:10:31 2013 @@ -471,7 +471,7 @@ UNICODE_STRING unicodeDeviceName; PFILE_OBJECT fileObject; CCHAR deviceNameBuffer[256]; - BOOLEAN deviceFound = FALSE; + /* BOOLEAN deviceFound = FALSE; See note at the end */ PCLASS_DRIVER_EXTENSION DriverExtension; PUNICODE_STRING RegistryPath = Argument2; @@ -578,7 +578,7 @@ if (InitializationData->ClassFindDevices(DriverObject, Argument2, InitializationData, portDeviceObject, DriverExtension->PortNumber)) { - deviceFound = TRUE; + /* deviceFound = TRUE; See note at the end */ } } Modified: trunk/reactos/drivers/usb/usbccgp/descriptor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbccgp/descri… ============================================================================== --- trunk/reactos/drivers/usb/usbccgp/descriptor.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbccgp/descriptor.c [iso-8859-1] Sat Jul 20 00:10:31 2013 @@ -311,7 +311,6 @@ { PUSB_INTERFACE_DESCRIPTOR InterfaceDescriptor; ULONG InterfaceIndex = 0; - PVOID CurrentPosition; ULONG DescriptorCount; // @@ -337,7 +336,6 @@ return STATUS_INSUFFICIENT_RESOURCES; } - CurrentPosition = ConfigurationDescriptor; do { // @@ -351,7 +349,6 @@ // FDODeviceExtension->InterfaceList[FDODeviceExtension->InterfaceListCount].InterfaceDescriptor = InterfaceDescriptor; FDODeviceExtension->InterfaceListCount++; - CurrentPosition = (PVOID)((ULONG_PTR)InterfaceDescriptor + InterfaceDescriptor->bLength); } else { Modified: trunk/reactos/drivers/usb/usbhub/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/fdo.c?r… ============================================================================== --- trunk/reactos/drivers/usb/usbhub/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub/fdo.c [iso-8859-1] Sat Jul 20 00:10:31 2013 @@ -436,7 +436,6 @@ QueryStatusChangeEndpoint( IN PDEVICE_OBJECT DeviceObject) { - NTSTATUS Status; PDEVICE_OBJECT RootHubDeviceObject; PIO_STACK_LOCATION Stack; PHUB_DEVICE_EXTENSION HubDeviceExtension; @@ -520,7 +519,7 @@ // DPRINT("DeviceObject is %x\n", DeviceObject); DPRINT("Iocalldriver %x with irp %x\n", RootHubDeviceObject, HubDeviceExtension->PendingSCEIrp); - Status = IoCallDriver(RootHubDeviceObject, HubDeviceExtension->PendingSCEIrp); + IoCallDriver(RootHubDeviceObject, HubDeviceExtension->PendingSCEIrp); return STATUS_PENDING; } @@ -1509,15 +1508,11 @@ USBD_INTERFACE_LIST_ENTRY InterfaceList[2] = {{NULL, NULL}, {NULL, NULL}}; PURB ConfigUrb = NULL; ULONG HubStatus; - PIO_STACK_LOCATION Stack; NTSTATUS Status = STATUS_SUCCESS; PHUB_DEVICE_EXTENSION HubDeviceExtension; PDEVICE_OBJECT RootHubDeviceObject; - PVOID HubInterfaceBusContext , UsbDInterfaceBusContext; + PVOID HubInterfaceBusContext; PORT_STATUS_CHANGE StatusChange; - - // get current stack location - Stack = IoGetCurrentIrpStackLocation(Irp); // get hub device extension HubDeviceExtension = (PHUB_DEVICE_EXTENSION) DeviceObject->DeviceExtension; @@ -1609,8 +1604,6 @@ ExFreePool(Urb); return Status; } - - UsbDInterfaceBusContext = HubDeviceExtension->UsbDInterface.BusContext; // Get Root Hub Device Handle Status = SubmitRequestToRootHub(RootHubDeviceObject, Modified: trunk/reactos/drivers/usb/usbhub/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/pdo.c?r… ============================================================================== --- trunk/reactos/drivers/usb/usbhub/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub/pdo.c [iso-8859-1] Sat Jul 20 00:10:31 2013 @@ -54,7 +54,6 @@ OUT PVOID OutParameter1, OUT PVOID OutParameter2) { - NTSTATUS Status; PIRP ForwardIrp; IO_STATUS_BLOCK IoStatus; PIO_STACK_LOCATION ForwardStack, CurrentStack; @@ -115,7 +114,7 @@ TRUE, TRUE); - Status = IoCallDriver(RootHubDeviceObject, ForwardIrp); + IoCallDriver(RootHubDeviceObject, ForwardIrp); // // Always return pending as the completion routine will take care of it @@ -194,8 +193,6 @@ { case IOCTL_INTERNAL_USB_GET_PARENT_HUB_INFO: { - PHUB_DEVICE_EXTENSION DeviceExtension; - DPRINT("IOCTL_INTERNAL_USB_GET_PARENT_HUB_INFO\n"); if (Irp->AssociatedIrp.SystemBuffer == NULL || Stack->Parameters.DeviceIoControl.OutputBufferLength != sizeof(PVOID)) @@ -205,7 +202,6 @@ else { PVOID* pHubPointer; - DeviceExtension = (PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension; pHubPointer = (PVOID*)Irp->AssociatedIrp.SystemBuffer; // FIXME @@ -497,10 +493,8 @@ PUNICODE_STRING SourceString = NULL; PWCHAR ReturnString = NULL; NTSTATUS Status = STATUS_SUCCESS; - LCID LocaleId; DeviceTextType = IoGetCurrentIrpStackLocation(Irp)->Parameters.QueryDeviceText.DeviceTextType; - LocaleId = IoGetCurrentIrpStackLocation(Irp)->Parameters.QueryDeviceText.LocaleId; ChildDeviceExtension = (PHUB_CHILDDEVICE_EXTENSION)DeviceObject->DeviceExtension; // Modified: trunk/reactos/drivers/usb/usbstor/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/error.… ============================================================================== --- trunk/reactos/drivers/usb/usbstor/error.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbstor/error.c [iso-8859-1] Sat Jul 20 00:10:31 2013 @@ -245,21 +245,14 @@ ErrorHandlerWorkItemRoutine( PVOID Context) { - NTSTATUS Status; - PFDO_DEVICE_EXTENSION FDODeviceExtension; PERRORHANDLER_WORKITEM_DATA WorkItemData = (PERRORHANDLER_WORKITEM_DATA)Context; - // - // get fdo - // - FDODeviceExtension = WorkItemData->Context->FDODeviceExtension; - if (WorkItemData->Context->ErrorIndex == 2) { // // reset device // - Status = USBSTOR_HandleTransferError(WorkItemData->DeviceObject, WorkItemData->Context); + USBSTOR_HandleTransferError(WorkItemData->DeviceObject, WorkItemData->Context); } else { Modified: trunk/reactos/drivers/usb/usbstor/queue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/queue.… ============================================================================== --- trunk/reactos/drivers/usb/usbstor/queue.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbstor/queue.c [iso-8859-1] Sat Jul 20 00:10:31 2013 @@ -544,7 +544,6 @@ PFDO_DEVICE_EXTENSION FDODeviceExtension; PPDO_DEVICE_EXTENSION PDODeviceExtension; KIRQL OldLevel; - NTSTATUS Status; BOOLEAN ResetInProgress; DPRINT("USBSTOR_StartIo\n"); @@ -660,7 +659,7 @@ // // execute scsi // - Status = USBSTOR_HandleExecuteSCSI(IoStack->DeviceObject, Irp, 0); + USBSTOR_HandleExecuteSCSI(IoStack->DeviceObject, Irp, 0); // // FIXME: handle error Modified: trunk/reactos/drivers/usb/usbstor/scsi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/scsi.c… ============================================================================== --- trunk/reactos/drivers/usb/usbstor/scsi.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbstor/scsi.c [iso-8859-1] Sat Jul 20 00:10:31 2013 @@ -181,9 +181,7 @@ PREAD_CAPACITY_DATA_EX CapacityDataEx; PREAD_CAPACITY_DATA CapacityData; PUFI_CAPACITY_RESPONSE Response; - NTSTATUS Status; - PURB Urb; // // access context @@ -274,7 +272,6 @@ ASSERT(Request); Status = Irp->IoStatus.Status; - Urb = &Context->Urb; // // get SCSI command data block Modified: trunk/reactos/lib/drivers/libusb/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/libusb/hub_con… ============================================================================== --- trunk/reactos/lib/drivers/libusb/hub_controller.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/libusb/hub_controller.cpp [iso-8859-1] Sat Jul 20 00:10:31 2013 @@ -402,7 +402,6 @@ IN OUT PIRP Irp) { PIO_STACK_LOCATION IoStack; - PCOMMON_DEVICE_EXTENSION DeviceExtension; PDEVICE_CAPABILITIES DeviceCapabilities; PPNP_BUS_INFORMATION BusInformation; PDEVICE_RELATIONS DeviceRelations; @@ -412,16 +411,6 @@ ULONG HiSpeed, NumPorts; WCHAR Buffer[300]; LPWSTR DeviceName; - - // - // get device extension - // - DeviceExtension = (PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - - // - // sanity check - // - ASSERT(DeviceExtension->IsFDO == FALSE); // // get current stack location @@ -2189,7 +2178,6 @@ IN OUT PIRP Irp) { PIO_STACK_LOCATION IoStack; - PCOMMON_DEVICE_EXTENSION DeviceExtension; PURB Urb; NTSTATUS Status = STATUS_NOT_IMPLEMENTED; @@ -2197,11 +2185,6 @@ // get current stack location // IoStack = IoGetCurrentIrpStackLocation(Irp); - - // - // get device extension - // - DeviceExtension = (PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension; // // determine which request should be performed Modified: trunk/reactos/lib/drivers/libusb/usb_device.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/libusb/usb_dev… ============================================================================== --- trunk/reactos/lib/drivers/libusb/usb_device.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/libusb/usb_device.cpp [iso-8859-1] Sat Jul 20 00:10:31 2013 @@ -308,7 +308,6 @@ { PUSB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup; NTSTATUS Status; - UCHAR OldAddress; UCHAR Index; DPRINT1("[%s] SetDeviceAddress> Address %x\n", m_USBType, DeviceAddress); @@ -340,9 +339,6 @@ // lets have a short nap KeStallExecutionProcessor(300); - - // back up old address - OldAddress = m_DeviceAddress; // store new device address m_DeviceAddress = DeviceAddress; Modified: trunk/reactos/lib/fslib/ext2lib/Inode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/ext2lib/Inode.c?… ============================================================================== --- trunk/reactos/lib/fslib/ext2lib/Inode.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/ext2lib/Inode.c [iso-8859-1] Sat Jul 20 00:10:31 2013 @@ -220,7 +220,6 @@ PEXT2_SUPER_BLOCK pExt2Sb = Ext2Sys->ext2_sb; int i = 0; bool bRet = true; - bool bDirty = false; ULONG TotalBlocks; TotalBlocks = Inode->i_blocks / (Ext2Sys->blocksize / SECTOR_SIZE); @@ -245,7 +244,6 @@ if (i == 0) { Inode->i_block[Index] = newBlk; - bDirty = true; } else { @@ -256,7 +254,6 @@ if (ext2_alloc_block(Ext2Sys, 0, &dwBlk)) { Inode->i_block[(i + 12 - 1)] = dwBlk; - bDirty = true; Inode->i_blocks += (Ext2Sys->blocksize / SECTOR_SIZE); } Modified: trunk/reactos/lib/fslib/ext2lib/Mke2fs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/ext2lib/Mke2fs.c… ============================================================================== --- trunk/reactos/lib/fslib/ext2lib/Mke2fs.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/ext2lib/Mke2fs.c [iso-8859-1] Sat Jul 20 00:10:31 2013 @@ -120,7 +120,7 @@ bool zero_blocks(PEXT2_FILESYS fs, ULONG blk, ULONG num, ULONG *ret_blk, ULONG *ret_count) { - ULONG j, count, next_update, next_update_incr; + ULONG j, count; static unsigned char *buf; bool retval; @@ -153,11 +153,6 @@ } /* OK, do the write loop */ - next_update = 0; - next_update_incr = num / 100; - if (next_update_incr < 1) - next_update_incr = 1; - for (j=0; j < num; j += STRIDE_LENGTH, blk += STRIDE_LENGTH) { if (num-j > STRIDE_LENGTH) Modified: trunk/reactos/win32ss/drivers/videoprt/child.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/c… ============================================================================== --- trunk/reactos/win32ss/drivers/videoprt/child.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/videoprt/child.c [iso-8859-1] Sat Jul 20 00:10:31 2013 @@ -67,7 +67,6 @@ { PWCHAR Buffer = NULL, StaticBuffer; UNICODE_STRING UnicodeStr; - ULONG Length; switch (IrpSp->Parameters.QueryId.IdType) { @@ -78,7 +77,6 @@ if (ChildExtension->EdidValid) { StaticBuffer = L"DISPLAY\\"; - Length = 8 * sizeof(WCHAR); Buffer = ExAllocatePool(PagedPool, (wcslen(StaticBuffer) + 8) * sizeof(WCHAR)); if (!Buffer) return STATUS_NO_MEMORY; @@ -92,7 +90,6 @@ else { StaticBuffer = L"DISPLAY\\Default_Monitor"; - Length = wcslen(StaticBuffer) * sizeof(WCHAR); Buffer = ExAllocatePool(PagedPool, (wcslen(StaticBuffer) + 1) * sizeof(WCHAR)); if (!Buffer) return STATUS_NO_MEMORY; @@ -121,7 +118,6 @@ if (ChildExtension->EdidValid) { StaticBuffer = L"MONITOR\\"; - Length = 8 * sizeof(WCHAR); Buffer = ExAllocatePool(PagedPool, (wcslen(StaticBuffer) + 9) * sizeof(WCHAR)); if (!Buffer) return STATUS_NO_MEMORY; @@ -138,7 +134,6 @@ else { StaticBuffer = L"MONITOR\\Default_Monitor"; - Length = wcslen(StaticBuffer) * sizeof(WCHAR); Buffer = ExAllocatePool(PagedPool, (wcslen(StaticBuffer) + 2) * sizeof(WCHAR)); if (!Buffer) return STATUS_NO_MEMORY; Modified: trunk/reactos/win32ss/user/user32/controls/static.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/contro… ============================================================================== --- trunk/reactos/win32ss/user/user32/controls/static.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/controls/static.c [iso-8859-1] Sat Jul 20 00:10:31 2013 @@ -593,7 +593,6 @@ static void STATIC_PaintOwnerDrawfn( HWND hwnd, HDC hdc, DWORD style ) { DRAWITEMSTRUCT dis; - HBRUSH hBrush; HFONT font, oldFont = NULL; UINT id = (UINT)GetWindowLongPtrW( hwnd, GWLP_ID ); @@ -609,7 +608,7 @@ font = (HFONT)GetWindowLongPtrW( hwnd, HFONT_GWL_OFFSET ); if (font) oldFont = SelectObject( hdc, font ); - hBrush = STATIC_SendWmCtlColorStatic(hwnd, hdc); + /* hBrush = */ STATIC_SendWmCtlColorStatic(hwnd, hdc); SendMessageW( GetParent(hwnd), WM_DRAWITEM, id, (LPARAM)&dis ); if (font) SelectObject( hdc, oldFont ); }

1 0

[ion] 59526: [USBCCGP]: FDO_HandleResetCyclePort should complete the pending IRPs, not the reset IRP. In fact, since the caller (FDO_HandleInternalDeviceControl) already completes the reset IRP, th...
by ion＠svn.reactos.org 19 Jul '13

19 Jul '13

Author: ion Date: Fri Jul 19 23:51:01 2013 New Revision: 59526 URL: http://svn.reactos.org/svn/reactos?rev=59526&view=rev Log: [USBCCGP]: FDO_HandleResetCyclePort should complete the pending IRPs, not the reset IRP. In fact, since the caller (FDO_HandleInternalDeviceControl) already completes the reset IRP, this was also causing double IRP completion. THIS IS WHY GCC 4.7 WARNINGS ARE IMPORTANT. Modified: trunk/reactos/drivers/usb/usbccgp/fdo.c Modified: trunk/reactos/drivers/usb/usbccgp/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbccgp/fdo.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbccgp/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbccgp/fdo.c [iso-8859-1] Fri Jul 19 23:51:01 2013 @@ -536,8 +536,8 @@ ListIrp = (PIRP)CONTAINING_RECORD(Entry, IRP, Tail.Overlay.ListEntry); /* Complete request with status success */ - Irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + ListIrp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(ListIrp, IO_NO_INCREMENT); } /* Status success */

1 0

[akhaldi] 59525: [FBTUSB] * Silence some warnings.
by akhaldi＠svn.reactos.org 19 Jul '13

19 Jul '13

Author: akhaldi Date: Fri Jul 19 23:44:47 2013 New Revision: 59525 URL: http://svn.reactos.org/svn/reactos?rev=59525&view=rev Log: [FBTUSB] * Silence some warnings. Modified: trunk/reactos/drivers/bluetooth/fbtusb/CMakeLists.txt Modified: trunk/reactos/drivers/bluetooth/fbtusb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bluetooth/fbtusb/C… ============================================================================== --- trunk/reactos/drivers/bluetooth/fbtusb/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/bluetooth/fbtusb/CMakeLists.txt [iso-8859-1] Fri Jul 19 23:44:47 2013 @@ -9,14 +9,12 @@ # fbtwmi.c fbtusb.c) -add_library(fbtusb SHARED - ${SOURCE} - fbtusb.rc) +add_library(fbtusb SHARED ${SOURCE} fbtusb.rc) # FIXME: http://www.cmake.org/Bug/view.php?id=12998 if(NOT MSVC) #allow_warnings(fbtusb) - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error") + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error -Wno-unused-but-set-variable") endif() set_module_type(fbtusb kernelmodedriver)

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
20
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2013