Ros-diffs January 2013

ros-diffs@reactos.org

11 participants
185 discussions

[tfaber] 58227: [STLPORT] - Add basic_fstream(FILE *) constructor to make up for the completely broken basic_fstream(int) one [EXPLORER] - Fix accordingly. Also fix totally broken initialization or...

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Jan 26 18:21:39 2013 New Revision: 58227 URL: http://svn.reactos.org/svn/reactos?rev=58227&view=rev Log: [STLPORT] - Add basic_fstream(FILE *) constructor to make up for the completely broken basic_fstream(int) one [EXPLORER] - Fix accordingly. Also fix totally broken initialization order in t[io]fstream Modified: trunk/reactos/base/shell/explorer/utility/xmlstorage.h trunk/reactos/include/c++/stlport/stl/_fstream.h trunk/reactos/lib/3rdparty/stlport/src/details/fstream_stdio.cpp Modified: trunk/reactos/base/shell/explorer/utility/xmlstorage.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/utilit… ============================================================================== --- trunk/reactos/base/shell/explorer/utility/xmlstorage.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/utility/xmlstorage.h [iso-8859-1] Sat Jan 26 18:21:39 2013 @@ -516,25 +516,41 @@ /// base class for XMLStorage::tifstream and XMLStorage::tofstream struct FileHolder { - FileHolder(LPCTSTR path, LPCTSTR mode) - { +protected: + FileHolder() + { + } + + ~FileHolder() + { + if (_pfile) + fclose(_pfile); + delete _buf; + } + + FILE_FILEBUF* init_buf(LPCTSTR path, std::ios_base::openmode mode) + { + PCTSTR modestr = mode == std::ios::in ? TEXT("rb") : TEXT("wb"); //@@ _MS_VER: temporarily needed for the ReactOS build environment #if defined(__STDC_WANT_SECURE_LIB__) && defined(_MS_VER) // secure CRT functions using VS 2005 - if (_tfopen_s(&_pfile, path, mode) != 0) + if (_tfopen_s(&_pfile, path, modestr) != 0) _pfile = NULL; #else - _pfile = _tfopen(path, mode); -#endif - } - - ~FileHolder() - { + _pfile = _tfopen(path, modestr); +#endif + +#ifdef __GNUC__ + _buf = new FILE_FILEBUF(_pfile, mode); +#else + _buf = new FILE_FILEBUF; if (_pfile) - fclose(_pfile); - } - -protected: - FILE* _pfile; + _buf->open(_pfile, mode); +#endif + return _buf; + } + + FILE* _pfile; + FILE_FILEBUF* _buf; }; /// input file stream with ANSI/UNICODE file names @@ -543,24 +559,11 @@ typedef std::istream super; tifstream(LPCTSTR path) - : super(&_buf), - FileHolder(path, TEXT("rb")), // binary mode is important for XMLReader::read_buffer() with MinGW libraries -#ifdef __GNUC__ - _buf(_pfile, std::ios::in) -#else - _buf() -#endif + : super(init_buf(path, std::ios::in)) { if (!_pfile) setstate(badbit); -#ifdef _MSC_VER - else - _buf.open(fileno(_pfile)); -#endif - } - -protected: - FILE_FILEBUF _buf; + } }; /// output file stream with ANSI/UNICODE file names @@ -569,29 +572,16 @@ typedef std::ostream super; tofstream(LPCTSTR path) - : super(&_buf), - FileHolder(path, TEXT("wb")), -#ifdef __GNUC__ - _buf(_pfile, std::ios::out) -#else - _buf() -#endif + : super(init_buf(path, std::ios::out)) { if (!_pfile) setstate(badbit); -#ifdef _MSC_VER - else - _buf.open(fileno(_pfile)); -#endif } ~tofstream() { flush(); } - -protected: - FILE_FILEBUF _buf; }; #else // FILE_FILEBUF Modified: trunk/reactos/include/c++/stlport/stl/_fstream.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/c%2B%2B/stlport/st… ============================================================================== --- trunk/reactos/include/c++/stlport/stl/_fstream.h [iso-8859-1] (original) +++ trunk/reactos/include/c++/stlport/stl/_fstream.h [iso-8859-1] Sat Jan 26 18:21:39 2013 @@ -59,6 +59,9 @@ bool _M_open(const char*, ios_base::openmode, long __protection); bool _M_open(const char*, ios_base::openmode); bool _M_open(int __id, ios_base::openmode = ios_base::__default_mode); +#if defined (_STLP_USE_STDIO_IO) + bool _M_open(FILE *file, ios_base::openmode = ios_base::__default_mode); +#endif /* _STLP_USE_STDIO_IO */ #if defined (_STLP_USE_WIN32_IO) bool _M_open(_STLP_fd __id, ios_base::openmode = ios_base::__default_mode); #endif /* _STLP_USE_WIN32_IO */ @@ -182,6 +185,12 @@ return this->_M_open(__id, _Init_mode); } +# if defined (_STLP_USE_STDIO_IO) + _Self* open(FILE *file, ios_base::openmode _Init_mode = ios_base::__default_mode) { + return _M_base._M_open(file, _Init_mode) ? this : 0; + } +# endif /* _STLP_USE_STDIO_IO */ + # if defined (_STLP_USE_WIN32_IO) _Self* open(_STLP_fd __id, ios_base::openmode _Init_mode = ios_base::__default_mode) { return _M_base._M_open(__id, _Init_mode) ? this : 0; Modified: trunk/reactos/lib/3rdparty/stlport/src/details/fstream_stdio.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/stlport/src/d… ============================================================================== --- trunk/reactos/lib/3rdparty/stlport/src/details/fstream_stdio.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/stlport/src/details/fstream_stdio.cpp [iso-8859-1] Sat Jan 26 18:21:39 2013 @@ -300,6 +300,41 @@ return true; } +bool _Filebuf_base::_M_open(FILE *file, ios_base::openmode openmode) +{ + _STLP_fd file_no; + + if (_M_is_open) + return false; + + _M_file = file; + + if (_M_file) { + file_no = fileno(_M_file); + } else { + return false; + } + + // unset buffering immediately + setbuf(_M_file, 0); + + _M_is_open = true; + + if (openmode & ios_base::ate) { + if (FSEEK(_M_file, 0, SEEK_END) != 0) + _M_is_open = false; + } + + _M_file_id = file_no; + _M_should_close = _M_is_open; + _M_openmode = openmode; + + if (_M_is_open) + _M_regular_file = _STLP_PRIV __is_regular_file(_M_file_id); + + return (_M_is_open != 0); +} + bool _Filebuf_base::_M_close() { if (!_M_is_open)

11 years, 11 months

[pschweitzer] 58226: [NTOSKRNL] Fix a fixme in IopParseDevice() by calling SeOpenObjectAuditAlarm(). Won't change anything right now since it calls a stub.

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Jan 26 17:29:18 2013 New Revision: 58226 URL: http://svn.reactos.org/svn/reactos?rev=58226&view=rev Log: [NTOSKRNL] Fix a fixme in IopParseDevice() by calling SeOpenObjectAuditAlarm(). Won't change anything right now since it calls a stub. Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] Sat Jan 26 17:29:18 2013 @@ -196,6 +196,7 @@ ACCESS_MASK DesiredAccess, GrantedAccess; BOOLEAN AccessGranted, LockHeld = FALSE; PPRIVILEGE_SET Privileges = NULL; + UNICODE_STRING FileString; IOTRACE(IO_FILE_DEBUG, "ParseObject: %p. RemainingName: %wZ\n", ParseObject, RemainingName); @@ -309,7 +310,20 @@ OpenPacket->Override= TRUE; } - /* FIXME: Do Audit/Alarm for open operation */ + FileString.Length = 8; + FileString.MaximumLength = 8; + FileString.Buffer = L"File"; + + /* Do Audit/Alarm for open operation */ + SeOpenObjectAuditAlarm(&FileString, + OriginalDeviceObject, + CompleteName, + OriginalDeviceObject->SecurityDescriptor, + AccessState, + FALSE, + AccessGranted, + UserMode, + &AccessState->GenerateOnClose); } else {

11 years, 11 months

[hbelusca] 58225: [CONSRV] Fix input/output (read/write) waiter threads notifications. Now console is usable. Go and test it! :D

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Jan 26 16:12:05 2013 New Revision: 58225 URL: http://svn.reactos.org/svn/reactos?rev=58225&view=rev Log: [CONSRV] Fix input/output (read/write) waiter threads notifications. Now console is usable. Go and test it! :D Modified: branches/ros-csrss/win32ss/user/consrv/coninput.c branches/ros-csrss/win32ss/user/consrv/console.c branches/ros-csrss/win32ss/user/consrv/handle.c Modified: branches/ros-csrss/win32ss/user/consrv/coninput.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/coninput.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/coninput.c [iso-8859-1] Sat Jan 26 16:12:05 2013 @@ -93,6 +93,10 @@ WaitAny, NULL, NULL); + if (!IsListEmpty(&Console->InputBuffer.ReadWaitQueue)) + { + CsrDereferenceWait(&Console->InputBuffer.ReadWaitQueue); + } return STATUS_SUCCESS; } @@ -359,18 +363,6 @@ DPRINT1("ReadInputBufferThread - WaitContext = 0x%p, WaitArgument1 = 0x%p, WaitArgument2 = 0x%p, WaitFlags = %lu\n", WaitContext, WaitArgument1, WaitArgument2, WaitFlags); /* - * Somebody is closing a handle to this input buffer, - * by calling ConSrvCloseHandleEntry. - * See whether we are linked to that handle (ie. we - * are a waiter for this handle), and if so, return. - */ - if (InputHandle == InputInfo->HandleEntry) - { - Status = STATUS_ALERTED; - goto Quit; - } - - /* * If we are notified of the process termination via a call * to CsrNotifyWaitBlock triggered by CsrDestroyProcess or * CsrDestroyThread, just return. @@ -378,6 +370,20 @@ if (WaitFlags & CsrProcessTerminating) { Status = STATUS_THREAD_IS_TERMINATING; + goto Quit; + } + + /* + * Somebody is closing a handle to this input buffer, + * by calling ConSrvCloseHandleEntry. + * See whether we are linked to that handle (ie. we + * are a waiter for this handle), and if so, return. + * Otherwise, ignore the call and continue waiting. + */ + if (InputHandle != NULL) + { + Status = (InputHandle == InputInfo->HandleEntry ? STATUS_ALERTED + : STATUS_PENDING); goto Quit; } @@ -490,18 +496,6 @@ DPRINT1("ReadCharsThread - WaitContext = 0x%p, WaitArgument1 = 0x%p, WaitArgument2 = 0x%p, WaitFlags = %lu\n", WaitContext, WaitArgument1, WaitArgument2, WaitFlags); /* - * Somebody is closing a handle to this input buffer, - * by calling ConSrvCloseHandleEntry. - * See whether we are linked to that handle (ie. we - * are a waiter for this handle), and if so, return. - */ - if (InputHandle == InputInfo->HandleEntry) - { - Status = STATUS_ALERTED; - goto Quit; - } - - /* * If we are notified of the process termination via a call * to CsrNotifyWaitBlock triggered by CsrDestroyProcess or * CsrDestroyThread, just return. @@ -509,6 +503,20 @@ if (WaitFlags & CsrProcessTerminating) { Status = STATUS_THREAD_IS_TERMINATING; + goto Quit; + } + + /* + * Somebody is closing a handle to this input buffer, + * by calling ConSrvCloseHandleEntry. + * See whether we are linked to that handle (ie. we + * are a waiter for this handle), and if so, return. + * Otherwise, ignore the call and continue waiting. + */ + if (InputHandle != NULL) + { + Status = (InputHandle == InputInfo->HandleEntry ? STATUS_ALERTED + : STATUS_PENDING); goto Quit; } Modified: branches/ros-csrss/win32ss/user/consrv/console.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/console.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/console.c [iso-8859-1] Sat Jan 26 16:12:05 2013 @@ -15,6 +15,7 @@ //#define NDEBUG #include <debug.h> + /* FUNCTIONS *****************************************************************/ BOOL FASTCALL @@ -87,6 +88,10 @@ WaitAll, NULL, NULL); + if (!IsListEmpty(&Console->WriteWaitQueue)) + { + CsrDereferenceWait(&Console->WriteWaitQueue); + } } } Modified: branches/ros-csrss/win32ss/user/consrv/handle.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/h… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/handle.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/handle.c [iso-8859-1] Sat Jan 26 16:12:05 2013 @@ -73,7 +73,11 @@ WaitAll, NULL, (PVOID)Entry); - // TODO: Dereference the notified waits. + + if (!IsListEmpty(&InputBuffer->ReadWaitQueue)) + { + CsrDereferenceWait(&InputBuffer->ReadWaitQueue); + } } /* If the last handle to a screen buffer is closed, delete it... */ @@ -498,8 +502,6 @@ ConSrvDeleteConsole(Console); } - - NTSTATUS NTAPI ConSrvNewProcess(PCSR_PROCESS SourceProcess,

11 years, 11 months

[tfaber] 58224: [EXPLORER] - Use set_cpp instead of hand-coding all the parameters - Use comutil.h and link with comsupp unconditionally, since we now have them - Use STLPort-compatible filebuf con...

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Jan 26 15:06:49 2013 New Revision: 58224 URL: http://svn.reactos.org/svn/reactos?rev=58224&view=rev Log: [EXPLORER] - Use set_cpp instead of hand-coding all the parameters - Use comutil.h and link with comsupp unconditionally, since we now have them - Use STLPort-compatible filebuf constructor for TCHAR iostreams - Fix a few MSVC and GCC 4.7 errors/warnings Modified: trunk/reactos/base/shell/explorer/CMakeLists.txt trunk/reactos/base/shell/explorer/desktop/desktop.cpp trunk/reactos/base/shell/explorer/desktop/desktop.h trunk/reactos/base/shell/explorer/explorer.cpp trunk/reactos/base/shell/explorer/shell/webchild.cpp trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp trunk/reactos/base/shell/explorer/utility/treedroptarget.h trunk/reactos/base/shell/explorer/utility/utility.h trunk/reactos/base/shell/explorer/utility/xmlstorage.h trunk/reactos/include/crt/comutil.h Modified: trunk/reactos/base/shell/explorer/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/CMakeL… ============================================================================== --- trunk/reactos/base/shell/explorer/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/CMakeLists.txt [iso-8859-1] Sat Jan 26 15:06:49 2013 @@ -1,15 +1,11 @@ add_subdirectory(notifyhook) -#NOTE : explorer doesn't follow standard c++, and so doesn't compile with stlport headers -#I'm not willing to do it if explorer_new is hanging around. -#jgardou -#set_cpp() +set_cpp() add_definitions( -DWIN32 - -D__WINDRES__ - -DUNICODE -D_UNICODE) + -D__WINDRES__) #add_pch(explorer precomp.h) include_directories(${CMAKE_CURRENT_SOURCE_DIR}) @@ -51,20 +47,10 @@ utility/shellbrowserimpl.cpp) # utility/shelltests.cpp add_executable(explorer ${SOURCE}) -set_subsystem(explorer windows) -set_entrypoint(explorer wWinMainCRTStartup) - -target_link_libraries(explorer - -lsupc++ - -lstdc++ - -lgcc - -lmingwex - -lmingw32 - wine - uuid) +target_link_libraries(explorer comsupp wine uuid) +set_module_type(explorer win32gui UNICODE) add_importlibs(explorer advapi32 gdi32 user32 ws2_32 msimg32 comctl32 ole32 oleaut32 shell32 shlwapi notifyhook msvcrt kernel32 ntdll) -set_image_base(explorer 0x00400000) add_dependencies(explorer psdk) add_cd_file(TARGET explorer DESTINATION reactos FOR all) add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/explorer-cfg-template.xml DESTINATION reactos FOR all) Modified: trunk/reactos/base/shell/explorer/desktop/desktop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/deskto… ============================================================================== --- trunk/reactos/base/shell/explorer/desktop/desktop.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/desktop/desktop.cpp [iso-8859-1] Sat Jan 26 15:06:49 2013 @@ -235,8 +235,9 @@ if (minimized.empty()) { EnumWindows(MinimizeDesktopEnumFct, (LPARAM)&minimized); } else { - for(list<MinimizeStruct>::const_reverse_iterator it=minimized.rbegin(); - it!=minimized.rend(); ++it) { + const list<MinimizeStruct>& cminimized = minimized; + for(list<MinimizeStruct>::const_reverse_iterator it=cminimized.rbegin(); + it!=cminimized.rend(); ++it) { ShowWindowAsync(it->first, it->second&WS_MAXIMIZE? SW_MAXIMIZE: SW_RESTORE); Sleep(20); } Modified: trunk/reactos/base/shell/explorer/desktop/desktop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/deskto… ============================================================================== --- trunk/reactos/base/shell/explorer/desktop/desktop.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/desktop/desktop.h [iso-8859-1] Sat Jan 26 15:06:49 2013 @@ -141,7 +141,8 @@ /* [out][in] */ DWORD __RPC_FAR *pdwEffect) { TVHITTESTINFO hit; - hit.pt = (POINT&)pt; + hit.pt.x = pt.x; + hit.pt.y = pt.y; ScreenToClient(m_hTargetWnd, &hit.pt); hit.flags = TVHT_ONITEM; Modified: trunk/reactos/base/shell/explorer/explorer.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer.cpp [iso-8859-1] Sat Jan 26 15:06:49 2013 @@ -32,7 +32,7 @@ #include "resource.h" -//#include <locale.h> // for setlocale() +#include <locale.h> // for setlocale() #include <wincon.h> Modified: trunk/reactos/base/shell/explorer/shell/webchild.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/shell/… ============================================================================== --- trunk/reactos/base/shell/explorer/shell/webchild.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/shell/webchild.cpp [iso-8859-1] Sat Jan 26 15:06:49 2013 @@ -33,20 +33,7 @@ #include "webchild.h" -#ifdef _MSC_VER - -#if _MSC_VER>=1300 // vtMissing for VS.Net #include <comutil.h> -#pragma comment(lib, "comsupp") -#endif - -#else - -#ifdef __MINGW32__ // MinGW is lacking vtMissing (as of 07.02.2004) -static Variant vtMissing; -#endif - -#endif //#include <mshtml.h> Modified: trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskba… ============================================================================== --- trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp [iso-8859-1] Sat Jan 26 15:06:49 2013 @@ -1874,7 +1874,7 @@ bool StartMenuRoot::IsStartMenuVisible() const { - return IsWindowVisible(_hwnd); + return IsWindowVisible(_hwnd) != FALSE; } void StartMenuRoot::ProcessKey(int vk) Modified: trunk/reactos/base/shell/explorer/utility/treedroptarget.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/utilit… ============================================================================== --- trunk/reactos/base/shell/explorer/utility/treedroptarget.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/utility/treedroptarget.h [iso-8859-1] Sat Jan 26 15:06:49 2013 @@ -61,7 +61,8 @@ /* [out][in] */ DWORD __RPC_FAR *pdwEffect) { TVHITTESTINFO hit; - hit.pt = (POINT&)pt; + hit.pt.x = pt.x; + hit.pt.y = pt.y; ScreenToClient(m_hTargetWnd, &hit.pt); hit.flags = TVHT_ONITEM; HTREEITEM hItem = TreeView_HitTest(m_hTargetWnd,&hit); Modified: trunk/reactos/base/shell/explorer/utility/utility.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/utilit… ============================================================================== --- trunk/reactos/base/shell/explorer/utility/utility.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/utility/utility.h [iso-8859-1] Sat Jan 26 15:06:49 2013 @@ -53,7 +53,7 @@ //#include <malloc.h> // for alloca() #include <assert.h> //#include <stdlib.h> // for _MAX_DIR, ... -//#include <stdio.h> // for sprintf() +#include <stdio.h> // for sprintf() //#include <time.h> #ifdef __cplusplus Modified: trunk/reactos/base/shell/explorer/utility/xmlstorage.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/utilit… ============================================================================== --- trunk/reactos/base/shell/explorer/utility/xmlstorage.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/utility/xmlstorage.h [iso-8859-1] Sat Jan 26 15:06:49 2013 @@ -548,11 +548,15 @@ #ifdef __GNUC__ _buf(_pfile, std::ios::in) #else - _buf(_pfile) + _buf() #endif { if (!_pfile) setstate(badbit); +#ifdef _MSC_VER + else + _buf.open(fileno(_pfile)); +#endif } protected: @@ -570,11 +574,15 @@ #ifdef __GNUC__ _buf(_pfile, std::ios::out) #else - _buf(_pfile) + _buf() #endif { if (!_pfile) setstate(badbit); +#ifdef _MSC_VER + else + _buf.open(fileno(_pfile)); +#endif } ~tofstream() Modified: trunk/reactos/include/crt/comutil.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/comutil.h?rev=… ============================================================================== --- trunk/reactos/include/crt/comutil.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/comutil.h [iso-8859-1] Sat Jan 26 15:06:49 2013 @@ -15,7 +15,7 @@ #define _COM_MEMCPY_S(dest,destsize,src,count) memcpy(dest,src,count) /* Use of wsprintf might be impossible, if strsafe.h is included. */ -#ifndef __STDC_SECURE_LIB__ +#if !defined(__STDC_SECURE_LIB__) || defined(__REACTOS__) #define _COM_PRINTF_S_1(dest,destsize,format,arg1) wsprintf(dest,format,arg1) #elif defined(UNICODE) #define _COM_PRINTF_S_1(dest,destsize,format,arg1) swprintf_s(dest,destsize,format,arg1)

11 years, 11 months

[tfaber] 58223: [CRT] - Import C++ compiler support headers from mingw-w64 (with some fixes) - Implement the required parts of the comsupp library

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Jan 26 13:33:15 2013 New Revision: 58223 URL: http://svn.reactos.org/svn/reactos?rev=58223&view=rev Log: [CRT] - Import C++ compiler support headers from mingw-w64 (with some fixes) - Implement the required parts of the comsupp library Added: trunk/reactos/include/crt/comdef.h (with props) trunk/reactos/include/crt/comdefsp.h (with props) trunk/reactos/include/crt/comip.h (with props) trunk/reactos/include/crt/comutil.h (with props) trunk/reactos/lib/sdk/comsupp/ (with props) trunk/reactos/lib/sdk/comsupp/CMakeLists.txt (with props) trunk/reactos/lib/sdk/comsupp/comsupp.cpp (with props) Modified: trunk/reactos/lib/sdk/CMakeLists.txt [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/reactos/include/crt/comdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/comdef.h?rev=5… Added: trunk/reactos/include/crt/comdefsp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/comdefsp.h?rev… Added: trunk/reactos/include/crt/comip.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/comip.h?rev=58… Added: trunk/reactos/include/crt/comutil.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/comutil.h?rev=… Modified: trunk/reactos/lib/sdk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/CMakeLists.txt?rev… Added: trunk/reactos/lib/sdk/comsupp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/comsupp/CMakeLists… Added: trunk/reactos/lib/sdk/comsupp/comsupp.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/comsupp/comsupp.cp…

11 years, 11 months

[ekohl] 58222: [SAMSRV] Implement SamrQueryDisplayInformation2, SamrGetDisplayEnumerationIndex2 and SamrQueryDisplayInformation3.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Jan 26 13:03:33 2013 New Revision: 58222 URL: http://svn.reactos.org/svn/reactos?rev=58222&view=rev Log: [SAMSRV] Implement SamrQueryDisplayInformation2, SamrGetDisplayEnumerationIndex2 and SamrQueryDisplayInformation3. Modified: trunk/reactos/dll/win32/samsrv/samrpc.c Modified: trunk/reactos/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samrpc.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] Sat Jan 26 13:03:33 2013 @@ -7000,9 +7000,21 @@ OUT unsigned long *TotalReturned, OUT PSAMPR_DISPLAY_INFO_BUFFER Buffer) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} + TRACE("%p %lu %lu %lu %lu %p %p %p\n", + DomainHandle, DisplayInformationClass, Index, + EntryCount, PreferredMaximumLength, TotalAvailable, + TotalReturned, Buffer); + + return SamrQueryDisplayInformation(DomainHandle, + DisplayInformationClass, + Index, + EntryCount, + PreferredMaximumLength, + TotalAvailable, + TotalReturned, + Buffer); +} + /* Function 49 */ NTSTATUS @@ -7012,8 +7024,13 @@ IN PRPC_UNICODE_STRING Prefix, OUT unsigned long *Index) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + TRACE("(%p %lu %p %p)\n", + DomainHandle, DisplayInformationClass, Prefix, Index); + + return SamrGetDisplayEnumerationIndex(DomainHandle, + DisplayInformationClass, + Prefix, + Index); } @@ -7302,8 +7319,19 @@ OUT unsigned long *TotalReturned, OUT PSAMPR_DISPLAY_INFO_BUFFER Buffer) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + TRACE("%p %lu %lu %lu %lu %p %p %p\n", + DomainHandle, DisplayInformationClass, Index, + EntryCount, PreferredMaximumLength, TotalAvailable, + TotalReturned, Buffer); + + return SamrQueryDisplayInformation(DomainHandle, + DisplayInformationClass, + Index, + EntryCount, + PreferredMaximumLength, + TotalAvailable, + TotalReturned, + Buffer); }

11 years, 11 months

[ekohl] 58221: [SAMSRV] Implement SamrQueryInformationDomain2 and SamrQueryInformationUser2.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Jan 26 12:18:55 2013 New Revision: 58221 URL: http://svn.reactos.org/svn/reactos?rev=58221&view=rev Log: [SAMSRV] Implement SamrQueryInformationDomain2 and SamrQueryInformationUser2. Modified: trunk/reactos/dll/win32/samsrv/samrpc.c Modified: trunk/reactos/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samrpc.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] Sat Jan 26 12:18:55 2013 @@ -6957,6 +6957,7 @@ return STATUS_NOT_IMPLEMENTED; } + /* Function 46 */ NTSTATUS NTAPI @@ -6964,9 +6965,13 @@ IN DOMAIN_INFORMATION_CLASS DomainInformationClass, OUT PSAMPR_DOMAIN_INFO_BUFFER *Buffer) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} + TRACE("(%p %lu %p)\n", DomainHandle, DomainInformationClass, Buffer); + + return SamrQueryInformationDomain(DomainHandle, + DomainInformationClass, + Buffer); +} + /* Function 47 */ NTSTATUS @@ -6975,9 +6980,13 @@ IN USER_INFORMATION_CLASS UserInformationClass, OUT PSAMPR_USER_INFO_BUFFER *Buffer) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} + TRACE("(%p %lu %p)\n", UserHandle, UserInformationClass, Buffer); + + return SamrQueryInformationUser(UserHandle, + UserInformationClass, + Buffer); +} + /* Function 48 */ NTSTATUS

11 years, 11 months

[ekohl] 58220: [SAMSRV] Start implementing SamrDeleteAlias and SamrDeleteUser. WIP

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Jan 26 11:23:05 2013 New Revision: 58220 URL: http://svn.reactos.org/svn/reactos?rev=58220&view=rev Log: [SAMSRV] Start implementing SamrDeleteAlias and SamrDeleteUser. WIP Modified: trunk/reactos/dll/win32/samsrv/samrpc.c Modified: trunk/reactos/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samrpc.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] Sat Jan 26 11:23:05 2013 @@ -4553,8 +4553,41 @@ NTAPI SamrDeleteAlias(IN OUT SAMPR_HANDLE *AliasHandle) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PSAM_DB_OBJECT AliasObject; + NTSTATUS Status; + + /* Validate the alias handle */ + Status = SampValidateDbObject(AliasHandle, + SamDbAliasObject, + DELETE, + &AliasObject); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + /* Fail, if the alias is built-in */ + if (AliasObject->RelativeId < 1000) + { + TRACE("You can not delete a special account!\n"); + return STATUS_SPECIAL_ACCOUNT; + } + + /* FIXME: Remove all members from the alias */ + + /* Delete the alias from the database */ + Status = SampDeleteAccountDbObject(AliasObject); + if (!NT_SUCCESS(Status)) + { + TRACE("SampDeleteAccountDbObject() failed (Status 0x%08lx)\n", Status); + return Status; + } + + /* Invalidate the handle */ + *AliasHandle = NULL; + + return Status; } @@ -4963,8 +4996,45 @@ NTAPI SamrDeleteUser(IN OUT SAMPR_HANDLE *UserHandle) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PSAM_DB_OBJECT UserObject; + NTSTATUS Status; + + TRACE("(%p)\n", UserHandle); + + /* Validate the user handle */ + Status = SampValidateDbObject(*UserHandle, + SamDbUserObject, + DELETE, + &UserObject); + if (!NT_SUCCESS(Status)) + { + TRACE("SampValidateDbObject() failed (Status 0x%08lx)\n", Status); + return Status; + } + + /* Fail, if the user is built-in */ + if (UserObject->RelativeId < 1000) + { + TRACE("You can not delete a special account!\n"); + return STATUS_SPECIAL_ACCOUNT; + } + + /* FIXME: Remove the user from all groups */ + + /* FIXME: Remove the user from all aliases */ + + /* Delete the user from the database */ + Status = SampDeleteAccountDbObject(UserObject); + if (!NT_SUCCESS(Status)) + { + TRACE("SampDeleteAccountDbObject() failed (Status 0x%08lx)\n", Status); + return Status; + } + + /* Invalidate the handle */ + *UserHandle = NULL; + + return STATUS_SUCCESS; }

11 years, 11 months

[tkreuzer] 58219: [FREELDR] Return NULL, not FALSE on failure in Ext2ReadBlockPointerList

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Jan 26 09:34:12 2013 New Revision: 58219 URL: http://svn.reactos.org/svn/reactos?rev=58219&view=rev Log: [FREELDR] Return NULL, not FALSE on failure in Ext2ReadBlockPointerList Modified: trunk/reactos/boot/freeldr/freeldr/fs/ext2.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/ext2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/ex… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/ext2.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/ext2.c [iso-8859-1] Sat Jan 26 09:34:12 2013 @@ -1049,7 +1049,7 @@ if (!Ext2CopyIndirectBlockPointers(BlockList, &CurrentBlockInList, BlockCount, Inode->blocks.indir_block)) { MmHeapFree(BlockList); - return FALSE; + return NULL; } } @@ -1059,7 +1059,7 @@ if (!Ext2CopyDoubleIndirectBlockPointers(BlockList, &CurrentBlockInList, BlockCount, Inode->blocks.double_indir_block)) { MmHeapFree(BlockList); - return FALSE; + return NULL; } } @@ -1069,7 +1069,7 @@ if (!Ext2CopyTripleIndirectBlockPointers(BlockList, &CurrentBlockInList, BlockCount, Inode->blocks.tripple_indir_block)) { MmHeapFree(BlockList); - return FALSE; + return NULL; } }

11 years, 11 months

[tfaber] 58218: [BROWSEUI_APITEST] - Add a test for SHExplorerParseCmdLine. CORE-5568

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Jan 25 23:24:46 2013 New Revision: 58218 URL: http://svn.reactos.org/svn/reactos?rev=58218&view=rev Log: [BROWSEUI_APITEST] - Add a test for SHExplorerParseCmdLine. CORE-5568 Added: trunk/rostests/apitests/browseui/ trunk/rostests/apitests/browseui/CMakeLists.txt (with props) trunk/rostests/apitests/browseui/SHExplorerParseCmdLine.c (with props) trunk/rostests/apitests/browseui/testlist.c (with props) Modified: trunk/rostests/apitests/CMakeLists.txt Modified: trunk/rostests/apitests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/CMakeLists.txt?r… ============================================================================== --- trunk/rostests/apitests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/CMakeLists.txt [iso-8859-1] Fri Jan 25 23:24:46 2013 @@ -2,6 +2,7 @@ add_library(apitest apitest.c) add_subdirectory(advapi32) +add_subdirectory(browseui) add_subdirectory(crt) add_subdirectory(dciman32) add_subdirectory(gdi32) Added: trunk/rostests/apitests/browseui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/browseui/CMakeLi… ============================================================================== --- trunk/rostests/apitests/browseui/CMakeLists.txt (added) +++ trunk/rostests/apitests/browseui/CMakeLists.txt [iso-8859-1] Fri Jan 25 23:24:46 2013 @@ -1,0 +1,10 @@ + +list(APPEND SOURCE + SHExplorerParseCmdLine.c + testlist.c) + +add_executable(browseui_apitest ${SOURCE}) +target_link_libraries(browseui_apitest wine) +set_module_type(browseui_apitest win32cui) +add_importlibs(browseui_apitest browseui shell32 msvcrt kernel32 ntdll) +add_cd_file(TARGET browseui_apitest DESTINATION reactos/bin FOR all) Propchange: trunk/rostests/apitests/browseui/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/browseui/SHExplorerParseCmdLine.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/browseui/SHExplo… ============================================================================== --- trunk/rostests/apitests/browseui/SHExplorerParseCmdLine.c (added) +++ trunk/rostests/apitests/browseui/SHExplorerParseCmdLine.c [iso-8859-1] Fri Jan 25 23:24:46 2013 @@ -1,0 +1,147 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Test for SHExplorerParseCmdLine + * PROGRAMMER: Thomas Faber + */ + +#define UNICODE +#include <wine/test.h> +#include <strsafe.h> +#include <shlobj.h> + +#define UNKNOWN_SIZE 0x100 + +typedef struct _EXPLORER_INFO +{ + PWSTR FileName; + PIDLIST_ABSOLUTE pidl; + DWORD dwFlags; /* TODO: make some constants */ + ULONG Unknown[UNKNOWN_SIZE]; /* TODO: find out more */ +} EXPLORER_INFO, *PEXPLORER_INFO; + +PVOID +WINAPI +SHExplorerParseCmdLine( + _Out_ PEXPLORER_INFO Info); + +#define PIDL_IS_UNTOUCHED -1 +#define PIDL_IS_NULL -2 +#define PIDL_IS_PATH -3 + +#define InvalidPointer ((PVOID)0x5555555555555555ULL) + +static +VOID +TestCommandLine( + _In_ INT ExpectedRet, + _In_ INT ExpectedCsidl, + _In_ DWORD ExpectedFlags, + _In_ PCWSTR ExpectedFileName, + _In_ PCWSTR PidlPath) +{ + EXPLORER_INFO Info; + PVOID Ret; + ULONG i; + + FillMemory(&Info, sizeof(Info), 0x55); + Info.dwFlags = 0x00000000; + Ret = SHExplorerParseCmdLine(&Info); + + if (ExpectedRet == -1) + ok(Ret == Info.pidl, "Ret = %p, expected %p\n", Ret, Info.pidl); + else + ok(Ret == (PVOID)ExpectedRet, "Ret = %p, expected %p\n", Ret, (PVOID)ExpectedRet); + + if (ExpectedFileName == NULL) + ok(Info.FileName == InvalidPointer, "FileName = %p\n", Info.FileName); + else + { + ok(Info.FileName != NULL && Info.FileName != InvalidPointer, "FileName = %p\n", Info.FileName); + if (Info.FileName != NULL && Info.FileName != InvalidPointer) + { + ok(!wcscmp(Info.FileName, ExpectedFileName), "FileName = %ls, expected %ls\n", Info.FileName, ExpectedFileName); + LocalFree(Info.FileName); + } + } + + if (ExpectedCsidl == PIDL_IS_UNTOUCHED) + ok(Info.pidl == InvalidPointer, "pidl = %p\n", Info.pidl); + else if (ExpectedCsidl == PIDL_IS_NULL) + ok(Info.pidl == NULL, "pidl = %p\n", Info.pidl); + else + { + PIDLIST_ABSOLUTE ExpectedPidl; + HRESULT hr; + + ok(Info.pidl != NULL, "pidl = %p\n", Info.pidl); + if (Info.pidl != NULL && Info.pidl != InvalidPointer) + { + if (ExpectedCsidl == PIDL_IS_PATH) + { + ExpectedPidl = SHSimpleIDListFromPath(PidlPath); + hr = ExpectedPidl == NULL ? E_FAIL : S_OK; + ok(ExpectedPidl != NULL, "SHSimpleIDListFromPath failed\n"); + } + else + { + hr = SHGetFolderLocation(NULL, ExpectedCsidl, NULL, 0, &ExpectedPidl); + ok(hr == S_OK, "SHGetFolderLocation returned %08lx\n", hr); + } + if (SUCCEEDED(hr)) + { + ok(ILIsEqual(Info.pidl, ExpectedPidl), "Unexpected pidl value\n"); + ILFree(ExpectedPidl); + } + ILFree(Info.pidl); + } + } + + ok(Info.dwFlags == ExpectedFlags, "dwFlags = %08lx, expected %08lx\n", Info.dwFlags, ExpectedFlags); + for (i = 0; i < sizeof(Info.Unknown) / sizeof(Info.Unknown[0]); i++) + ok(Info.Unknown[i] == 0x55555555, "Unknown[%lu] = %08lx\n", i, Info.Unknown[i]); +} + +START_TEST(SHExplorerParseCmdLine) +{ + struct + { + PCWSTR CommandLine; + INT ExpectedRet; + INT ExpectedCsidl; + DWORD ExpectedFlags; + PCWSTR ExpectedFileName; + PCWSTR PidlPath; + } Tests[] = + { + { L"", -1, CSIDL_MYDOCUMENTS, 0x00000009 }, + { L"/e", TRUE, PIDL_IS_UNTOUCHED, 0x00000008 }, + { L"/n", TRUE, PIDL_IS_UNTOUCHED, 0x00004001 }, + { L"/x", TRUE, PIDL_IS_NULL, 0x02000000, L"/x" }, + { L"-e", TRUE, PIDL_IS_NULL, 0x02000000, L"-e" }, + { L"C:\\", TRUE, PIDL_IS_PATH, 0x00000200, NULL, L"C:\\" }, + { L"/e,C:\\", TRUE, PIDL_IS_PATH, 0x00000208, NULL, L"C:\\" }, + /* TODO: needs a lot more testcases */ + }; + const int TestCount = sizeof(Tests) / sizeof(Tests[0]); + PWSTR CommandLine; + WCHAR OriginalCommandLine[1024]; + int i; + + CommandLine = GetCommandLine(); + (VOID)StringCbCopy(OriginalCommandLine, sizeof(OriginalCommandLine), CommandLine); + + for (i = 0; i < TestCount; i++) + { + wcscpy(CommandLine, L"browseui_apitest.exe "); + wcscat(CommandLine, Tests[i].CommandLine); + trace("Command line: %ls\n", CommandLine); + TestCommandLine(Tests[i].ExpectedRet, + Tests[i].ExpectedCsidl, + Tests[i].ExpectedFlags, + Tests[i].ExpectedFileName, + Tests[i].PidlPath); + } + + wcscpy(CommandLine, OriginalCommandLine); +} Propchange: trunk/rostests/apitests/browseui/SHExplorerParseCmdLine.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/browseui/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/browseui/testlis… ============================================================================== --- trunk/rostests/apitests/browseui/testlist.c (added) +++ trunk/rostests/apitests/browseui/testlist.c [iso-8859-1] Fri Jan 25 23:24:46 2013 @@ -1,0 +1,16 @@ +#define WIN32_LEAN_AND_MEAN +#define __ROS_LONG64__ +#include <windows.h> + +#define STANDALONE +#include "wine/test.h" + +extern void func_SHExplorerParseCmdLine(void); + +const struct test winetest_testlist[] = +{ + { "SHExplorerParseCmdLine", func_SHExplorerParseCmdLine }, + + { 0, 0 } +}; + Propchange: trunk/rostests/apitests/browseui/testlist.c ------------------------------------------------------------------------------ svn:eol-style = native

11 years, 11 months

← Newer
1
2
3
4
5
6
7
...
19
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 January 2013