Ros-diffs August 2013

ros-diffs@reactos.org

10 participants
327 discussions

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sat Aug 31 15:05:49 2013 New Revision: 59922 URL: http://svn.reactos.org/svn/reactos?rev=59922&view=rev Log: really fix build Modified: trunk/reactos/dll/win32/shell32/CMakeLists.txt Modified: trunk/reactos/dll/win32/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] Sat Aug 31 15:05:49 2013 @@ -96,6 +96,7 @@ add_importlibs(shell32 advapi32 + browseui gdi32 user32 comctl32

11 years

[hbelusca] 59921: [FREELDR-KDCOM-KDBG] Fix debugging issues.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Aug 31 15:01:50 2013 New Revision: 59921 URL: http://svn.reactos.org/svn/reactos?rev=59921&view=rev Log: [FREELDR-KDCOM-KDBG] Fix debugging issues. Modified: trunk/reactos/boot/freeldr/freeldr/comm/rs232.c trunk/reactos/drivers/base/kdcom/kdcom.c trunk/reactos/ntoskrnl/kd/i386/kdbg.c Modified: trunk/reactos/boot/freeldr/freeldr/comm/rs232.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/comm/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/comm/rs232.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/comm/rs232.c [iso-8859-1] Sat Aug 31 15:01:50 2013 @@ -109,7 +109,7 @@ if (PortInitialized == FALSE) return FALSE; - return (CpGetByte(&Rs232ComPort, ByteReceived, FALSE) == CP_GET_SUCCESS); + return (CpGetByte(&Rs232ComPort, ByteReceived, FALSE, FALSE) == CP_GET_SUCCESS); } */ Modified: trunk/reactos/drivers/base/kdcom/kdcom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/kdcom.c… ============================================================================== --- trunk/reactos/drivers/base/kdcom/kdcom.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdcom/kdcom.c [iso-8859-1] Sat Aug 31 15:01:50 2013 @@ -222,7 +222,7 @@ KdpPollByte(OUT PUCHAR OutByte) { /* Poll the byte */ - if (CpGetByte(&KdDebugComPort, OutByte, FALSE, TRUE) == CP_GET_SUCCESS) + if (CpGetByte(&KdDebugComPort, OutByte, FALSE, FALSE) == CP_GET_SUCCESS) { return KDP_PACKET_RECEIVED; } Modified: trunk/reactos/ntoskrnl/kd/i386/kdbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/i386/kdbg.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/kd/i386/kdbg.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/i386/kdbg.c [iso-8859-1] Sat Aug 31 15:01:50 2013 @@ -136,7 +136,7 @@ IN PCPPORT PortInformation, OUT PUCHAR ByteReceived) { - return (CpGetByte(PortInformation, ByteReceived, FALSE, TRUE) == CP_GET_SUCCESS); + return (CpGetByte(PortInformation, ByteReceived, FALSE, FALSE) == CP_GET_SUCCESS); } VOID

11 years

[hbelusca] 59920: Code formatting only

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Aug 31 15:00:17 2013 New Revision: 59920 URL: http://svn.reactos.org/svn/reactos?rev=59920&view=rev Log: Code formatting only Modified: trunk/reactos/include/reactos/libs/cportlib/cportlib.h trunk/reactos/lib/cportlib/cport.c Modified: trunk/reactos/include/reactos/libs/cportlib/cportlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/cport… ============================================================================== --- trunk/reactos/include/reactos/libs/cportlib/cportlib.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/cportlib/cportlib.h [iso-8859-1] Sat Aug 31 15:00:17 2013 @@ -72,7 +72,7 @@ IN PCPPORT Port, OUT PUCHAR Byte, IN BOOLEAN Wait, - IN BOOLEAN Poll + IN BOOLEAN Poll ); VOID Modified: trunk/reactos/lib/cportlib/cport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cportlib/cport.c?rev=5… ============================================================================== --- trunk/reactos/lib/cportlib/cport.c [iso-8859-1] (original) +++ trunk/reactos/lib/cportlib/cport.c [iso-8859-1] Sat Aug 31 15:00:17 2013 @@ -256,7 +256,7 @@ CpGetByte(IN PCPPORT Port, OUT PUCHAR Byte, IN BOOLEAN Wait, - IN BOOLEAN Poll) + IN BOOLEAN Poll) { UCHAR Lsr; ULONG LimitCount = Wait ? TIMEOUT_COUNT : 1; @@ -288,7 +288,7 @@ if (Port->Flags & CPPORT_FLAG_MODEM_CONTROL) { /* Not implemented yet */ - //DPRINT1("CP: CPPORT_FLAG_MODEM_CONTROL unexpected\n"); + // DPRINT1("CP: CPPORT_FLAG_MODEM_CONTROL unexpected\n"); } /* Byte was read */ @@ -311,7 +311,7 @@ if (Port->Flags & CPPORT_FLAG_MODEM_CONTROL) // To be removed when this becomes implemented. { /* Not implemented yet */ - //DPRINT1("CP: CPPORT_FLAG_MODEM_CONTROL unexpected\n"); + // DPRINT1("CP: CPPORT_FLAG_MODEM_CONTROL unexpected\n"); } /* Wait for LSR to say we can go ahead */

11 years

[gadamopoulos] 59919: [shell32] - Remove a line that shouldn't have been committed

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sat Aug 31 14:59:45 2013 New Revision: 59919 URL: http://svn.reactos.org/svn/reactos?rev=59919&view=rev Log: [shell32] - Remove a line that shouldn't have been committed Modified: trunk/reactos/dll/win32/shell32/precomp.h Modified: trunk/reactos/dll/win32/shell32/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/precomp.… ============================================================================== --- trunk/reactos/dll/win32/shell32/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/precomp.h [iso-8859-1] Sat Aug 31 14:59:45 2013 @@ -72,7 +72,6 @@ #include "filedefext.h" #include "drvdefext.h" #include "CMenuBand.h" -#include "CMenuDeskBar.h" #include <wine/debug.h>

11 years

[gadamopoulos] 59918: [shell32] - Halfplement CDesktopBrowser::BrowseObject. Now when the user tries to open a folder from the desktop we will try to create a new explorer window. - ps: this affect...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sat Aug 31 14:53:01 2013 New Revision: 59918 URL: http://svn.reactos.org/svn/reactos?rev=59918&view=rev Log: [shell32] - Halfplement CDesktopBrowser::BrowseObject. Now when the user tries to open a folder from the desktop we will try to create a new explorer window. - ps: this affects only explorer_new and the rest of the shell is still not working well enough to actually show the new window Modified: trunk/reactos/dll/win32/shell32/desktop.cpp trunk/reactos/dll/win32/shell32/precomp.h Modified: trunk/reactos/dll/win32/shell32/desktop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/desktop.… ============================================================================== --- trunk/reactos/dll/win32/shell32/desktop.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/desktop.cpp [iso-8859-1] Sat Aug 31 14:53:01 2013 @@ -261,7 +261,12 @@ HRESULT STDMETHODCALLTYPE CDesktopBrowser::BrowseObject(LPCITEMIDLIST pidl, UINT wFlags) { - return E_NOTIMPL; + /* + * We should use IShellWindows interface here in order to attempt to + * find an open shell window that shows the requested pidl and activate it + */ + + return SHOpenNewFrame((LPITEMIDLIST)pidl, NULL, 0, 0); } HRESULT STDMETHODCALLTYPE CDesktopBrowser::GetViewStateStream(DWORD grfMode, IStream **ppStrm) Modified: trunk/reactos/dll/win32/shell32/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/precomp.… ============================================================================== --- trunk/reactos/dll/win32/shell32/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/precomp.h [iso-8859-1] Sat Aug 31 14:53:01 2013 @@ -25,6 +25,7 @@ #include <shlwapi.h> #include <shlobj.h> #include <shlobj_undoc.h> +#include <shlwapi_undoc.h> #include <appmgmt.h> #include <ntquery.h> #include <recyclebin.h> @@ -71,6 +72,7 @@ #include "filedefext.h" #include "drvdefext.h" #include "CMenuBand.h" +#include "CMenuDeskBar.h" #include <wine/debug.h>

11 years

[akhaldi] 59917: [SAL] * Forward __callback to __inner_callback now that wincrypt.h has the proper inclusion.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Aug 31 11:07:09 2013 New Revision: 59917 URL: http://svn.reactos.org/svn/reactos?rev=59917&view=rev Log: [SAL] * Forward __callback to __inner_callback now that wincrypt.h has the proper inclusion. Modified: trunk/reactos/base/services/svchost/security.cxx trunk/reactos/include/psdk/sal.h Modified: trunk/reactos/base/services/svchost/security.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/svchost/secu… ============================================================================== --- trunk/reactos/base/services/svchost/security.cxx [iso-8859-1] (original) +++ trunk/reactos/base/services/svchost/security.cxx [iso-8859-1] Sat Aug 31 11:07:09 2013 @@ -8,7 +8,6 @@ /* INCLUDES ******************************************************************/ -#define __callback extern "C" { #include "svchost.h" Modified: trunk/reactos/include/psdk/sal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/sal.h?rev=599… ============================================================================== --- trunk/reactos/include/psdk/sal.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/sal.h [iso-8859-1] Sat Aug 31 11:07:09 2013 @@ -1733,3 +1733,4 @@ #endif // ] _USE_ATTRIBUTES_FOR_SAL +#define __callback __inner_callback

11 years

[ion] 59916: [CONSRV]: One last fix to CONSRV_API_CONNECTINFO. We now have compatibility with Windows and kernel32 is much much happier. [CONSRV]: Implement Case11 of BaseSrvNlsCreateSection, but w...

by ion＠svn.reactos.org

Author: ion Date: Sat Aug 31 08:30:00 2013 New Revision: 59916 URL: http://svn.reactos.org/svn/reactos?rev=59916&view=rev Log: [CONSRV]: One last fix to CONSRV_API_CONNECTINFO. We now have compatibility with Windows and kernel32 is much much happier. [CONSRV]: Implement Case11 of BaseSrvNlsCreateSection, but we seem to be getting bogus locale IDs. Modified: trunk/reactos/include/reactos/subsys/win/conmsg.h trunk/reactos/subsystems/win/basesrv/basesrv.h trunk/reactos/subsystems/win/basesrv/nls.c Modified: trunk/reactos/include/reactos/subsys/win/conmsg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/win… ============================================================================== --- trunk/reactos/include/reactos/subsys/win/conmsg.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/win/conmsg.h [iso-8859-1] Sat Aug 31 08:30:00 2013 @@ -164,7 +164,7 @@ DWORD dwHotKey; DWORD dwStartupFlags; CONSOLE_PROPERTIES; - BOOL ConsoleNeeded; // Used for GUI apps only. + BOOLEAN ConsoleNeeded; // Used for GUI apps only. LPTHREAD_START_ROUTINE CtrlDispatcher; LPTHREAD_START_ROUTINE ImeDispatcher; LPTHREAD_START_ROUTINE PropDispatcher; Modified: trunk/reactos/subsystems/win/basesrv/basesrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/bas… ============================================================================== --- trunk/reactos/subsystems/win/basesrv/basesrv.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win/basesrv/basesrv.h [iso-8859-1] Sat Aug 31 08:30:00 2013 @@ -43,8 +43,8 @@ typedef BOOL(*WINAPI PGET_NLS_SECTION_NAME)(UINT CodePage, UINT Base, ULONG Unknown, - LPSTR BaseName, - LPSTR Result, + LPWSTR BaseName, + LPWSTR Result, ULONG ResultSize ); Modified: trunk/reactos/subsystems/win/basesrv/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/nls… ============================================================================== --- trunk/reactos/subsystems/win/basesrv/nls.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win/basesrv/nls.c [iso-8859-1] Sat Aug 31 08:30:00 2013 @@ -151,6 +151,8 @@ PWCHAR NlsFileName; UCHAR SecurityDescriptor[52]; OBJECT_ATTRIBUTES ObjectAttributes; + WCHAR FileNameBuffer[32]; + WCHAR NlsSectionNameBuffer[32]; PBASE_NLS_CREATE_SECTION NlsMsg = &((PBASE_API_MESSAGE)ApiMessage)->Data.NlsCreateSection; /* Load kernel32 first and import the NLS routines */ @@ -211,8 +213,34 @@ DPRINT1("This type not yet supported\n"); return STATUS_NOT_IMPLEMENTED; case 11: - DPRINT1("This type not yet supported\n"); - return STATUS_NOT_IMPLEMENTED; + /* Get the filename for this locale */ + if (!pGetCPFileNameFromRegistry(NlsMsg->LocaleId, + FileNameBuffer, + RTL_NUMBER_OF(FileNameBuffer))) + { + DPRINT1("File name query failed\n"); + return STATUS_INVALID_PARAMETER; + } + + /* Get the name of the section for this locale */ + DPRINT1("File name: %S\n", FileNameBuffer); + Status = pGetNlsSectionName(NlsMsg->LocaleId, + 10, + 0, + L"\\NLS\\NlsSectionCP", + NlsSectionNameBuffer, + RTL_NUMBER_OF(NlsSectionNameBuffer)); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Section name query failed: %lx\n", Status); + return Status; + } + + /* Setup the name and go open it */ + NlsFileName = FileNameBuffer; + DPRINT1("Section name: %S\n", NlsSectionNameBuffer); + RtlInitUnicodeString(&NlsSectionName, NlsSectionNameBuffer); + break; case 12: RtlInitUnicodeString(&NlsSectionName, L"\\NLS\\NlsSectionGeo"); NlsFileName = L"geo.nls";

11 years

[ion] 59915: CORE-2198 #resolve #time 15m #comment [NPFS/KERNEL32]: Always use the right semantics.

by ion＠svn.reactos.org

Author: ion Date: Sat Aug 31 07:29:26 2013 New Revision: 59915 URL: http://svn.reactos.org/svn/reactos?rev=59915&view=rev Log: CORE-2198 #resolve #time 15m #comment [NPFS/KERNEL32]: Always use the right semantics. Modified: trunk/reactos/dll/win32/kernel32/client/file/npipe.c trunk/reactos/drivers/filesystems/npfs/create.c trunk/reactos/drivers/filesystems/npfs/fsctrl.c Modified: trunk/reactos/dll/win32/kernel32/client/file/npipe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/npipe.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/npipe.c [iso-8859-1] Sat Aug 31 07:29:26 2013 @@ -13,8 +13,6 @@ #define NDEBUG #include <debug.h> DEBUG_CHANNEL(kernel32file); - -//#define USING_PROPER_NPFS_WAIT_SEMANTICS /* GLOBALS ********************************************************************/ @@ -364,17 +362,6 @@ return r; } - -/* - * When NPFS will work properly, use this code instead. It is compatible with - * Microsoft's NPFS.SYS. The main difference is that: - * - This code actually respects the timeout instead of ignoring it! - * - This code validates and creates the proper names for both UNC and local pipes - * - On NT, you open the *root* pipe directory (either \DosDevices\Pipe or - * \DosDevices\Unc\Server\Pipe) and then send the pipe to wait on in the - * FILE_PIPE_WAIT_FOR_BUFFER structure. - */ -#ifdef USING_PROPER_NPFS_WAIT_SEMANTICS /* * @implemented */ @@ -559,96 +546,6 @@ /* Success */ return TRUE; } -#else -/* - * @implemented - */ -BOOL -WINAPI -WaitNamedPipeW(LPCWSTR lpNamedPipeName, - DWORD nTimeOut) -{ - UNICODE_STRING NamedPipeName; - NTSTATUS Status; - OBJECT_ATTRIBUTES ObjectAttributes; - FILE_PIPE_WAIT_FOR_BUFFER WaitPipe; - HANDLE FileHandle; - IO_STATUS_BLOCK Iosb; - - if (RtlDosPathNameToNtPathName_U(lpNamedPipeName, - &NamedPipeName, - NULL, - NULL) == FALSE) - { - return FALSE; - } - - InitializeObjectAttributes(&ObjectAttributes, - &NamedPipeName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - Status = NtOpenFile(&FileHandle, - FILE_READ_ATTRIBUTES | SYNCHRONIZE, - &ObjectAttributes, - &Iosb, - FILE_SHARE_READ | FILE_SHARE_WRITE, - FILE_SYNCHRONOUS_IO_NONALERT); - if (!NT_SUCCESS(Status)) - { - BaseSetLastNTError(Status); - RtlFreeUnicodeString(&NamedPipeName); - return FALSE; - } - - /* Check what timeout we got */ - if (nTimeOut == NMPWAIT_WAIT_FOREVER) - { - /* Don't use a timeout */ - WaitPipe.TimeoutSpecified = FALSE; - } - else - { - /* Check if default */ - if (nTimeOut == NMPWAIT_USE_DEFAULT_WAIT) - { - /* Set it to 0 */ - WaitPipe.Timeout.LowPart = 0; - WaitPipe.Timeout.HighPart = 0; - } - else - { - /* Convert to NT format */ - WaitPipe.Timeout.QuadPart = UInt32x32To64(-10000, nTimeOut); - } - - /* In both cases, we do have a timeout */ - WaitPipe.TimeoutSpecified = TRUE; - } - - Status = NtFsControlFile(FileHandle, - NULL, - NULL, - NULL, - &Iosb, - FSCTL_PIPE_WAIT, - &WaitPipe, - sizeof(WaitPipe), - NULL, - 0); - NtClose(FileHandle); - if (!NT_SUCCESS(Status)) - { - BaseSetLastNTError(Status); - RtlFreeUnicodeString(&NamedPipeName); - return FALSE; - } - - RtlFreeUnicodeString(&NamedPipeName); - return TRUE; -} -#endif - /* * @implemented Modified: trunk/reactos/drivers/filesystems/npfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/create.c [iso-8859-1] Sat Aug 31 07:29:26 2013 @@ -12,8 +12,6 @@ #define NDEBUG #include <debug.h> - -//#define USING_PROPER_NPFS_WAIT_SEMANTICS /* FUNCTIONS *****************************************************************/ @@ -251,10 +249,6 @@ PNPFS_CCB ServerCcb = NULL; PNPFS_VCB Vcb; NTSTATUS Status; -#ifndef USING_PROPER_NPFS_WAIT_SEMANTICS - ACCESS_MASK DesiredAccess; - BOOLEAN SpecialAccess; -#endif DPRINT("NpfsCreate(DeviceObject %p Irp %p)\n", DeviceObject, Irp); @@ -263,22 +257,11 @@ FileObject = IoStack->FileObject; RelatedFileObject = FileObject->RelatedFileObject; FileName = &FileObject->FileName; -#ifndef USING_PROPER_NPFS_WAIT_SEMANTICS - DesiredAccess = IoStack->Parameters.CreatePipe.SecurityContext->DesiredAccess; -#endif DPRINT("FileObject %p\n", FileObject); DPRINT("FileName %wZ\n", &FileObject->FileName); Irp->IoStatus.Information = 0; - -#ifndef USING_PROPER_NPFS_WAIT_SEMANTICS - SpecialAccess = ((DesiredAccess & SPECIFIC_RIGHTS_ALL) == FILE_READ_ATTRIBUTES); - if (SpecialAccess) - { - DPRINT("NpfsCreate() open client end for special use!\n"); - } -#endif DPRINT("FileName->Length: %hu RelatedFileObject: %p\n", FileName->Length, RelatedFileObject); @@ -353,11 +336,7 @@ ClientCcb->FileObject = FileObject; ClientCcb->Thread = (struct ETHREAD *)Irp->Tail.Overlay.Thread; ClientCcb->PipeEnd = FILE_PIPE_CLIENT_END; -#ifndef USING_PROPER_NPFS_WAIT_SEMANTICS - ClientCcb->PipeState = SpecialAccess ? 0 : FILE_PIPE_DISCONNECTED_STATE; -#else ClientCcb->PipeState = FILE_PIPE_DISCONNECTED_STATE; -#endif InitializeListHead(&ClientCcb->ReadRequestListHead); DPRINT("CCB: %p\n", ClientCcb); @@ -398,85 +377,62 @@ /* * Step 3. Search for listening server CCB. */ -#ifndef USING_PROPER_NPFS_WAIT_SEMANTICS - if (!SpecialAccess) - { -#endif + /* + * WARNING: Point of no return! Once we get the server CCB it's + * possible that we completed a wait request and so we have to + * complete even this request. + */ + + ServerCcb = NpfsFindListeningServerInstance(Fcb); + if (ServerCcb == NULL) + { + PLIST_ENTRY CurrentEntry; + PNPFS_CCB Ccb; + /* - * WARNING: Point of no return! Once we get the server CCB it's - * possible that we completed a wait request and so we have to - * complete even this request. + * If no waiting server CCB was found then try to pick + * one of the listing server CCB on the pipe. */ - ServerCcb = NpfsFindListeningServerInstance(Fcb); + CurrentEntry = Fcb->ServerCcbListHead.Flink; + while (CurrentEntry != &Fcb->ServerCcbListHead) + { + Ccb = CONTAINING_RECORD(CurrentEntry, NPFS_CCB, CcbListEntry); + if (Ccb->PipeState == FILE_PIPE_LISTENING_STATE) + { + ServerCcb = Ccb; + break; + } + CurrentEntry = CurrentEntry->Flink; + } + + /* + * No one is listening to me?! I'm so lonely... :( + */ + if (ServerCcb == NULL) { - PLIST_ENTRY CurrentEntry; - PNPFS_CCB Ccb; - - /* - * If no waiting server CCB was found then try to pick - * one of the listing server CCB on the pipe. - */ - - CurrentEntry = Fcb->ServerCcbListHead.Flink; - while (CurrentEntry != &Fcb->ServerCcbListHead) + /* Not found, bail out with error for FILE_OPEN requests. */ + DPRINT("No listening server CCB found!\n"); + if (ClientCcb->Data) { - Ccb = CONTAINING_RECORD(CurrentEntry, NPFS_CCB, CcbListEntry); - if (Ccb->PipeState == FILE_PIPE_LISTENING_STATE) - { - ServerCcb = Ccb; - break; - } - CurrentEntry = CurrentEntry->Flink; + ExFreePoolWithTag(ClientCcb->Data, TAG_NPFS_CCB_DATA); } - /* - * No one is listening to me?! I'm so lonely... :( - */ - - if (ServerCcb == NULL) - { - /* Not found, bail out with error for FILE_OPEN requests. */ - DPRINT("No listening server CCB found!\n"); - if (ClientCcb->Data) - { - ExFreePoolWithTag(ClientCcb->Data, TAG_NPFS_CCB_DATA); - } - - NpfsDereferenceCcb(ClientCcb); - KeUnlockMutex(&Fcb->CcbListLock); - NpfsDereferenceFcb(Fcb); - Irp->IoStatus.Status = STATUS_OBJECT_NAME_NOT_FOUND; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_OBJECT_NAME_NOT_FOUND; - } - } - else - { - /* Signal the server thread and remove it from the waiter list */ - /* FIXME: Merge this with the NpfsFindListeningServerInstance routine. */ - NpfsSignalAndRemoveListeningServerInstance(Fcb, ServerCcb); - } -#ifndef USING_PROPER_NPFS_WAIT_SEMANTICS - } - else if (IsListEmpty(&Fcb->ServerCcbListHead)) - { - DPRINT("No server fcb found!\n"); - - if (ClientCcb->Data) - { - ExFreePoolWithTag(ClientCcb->Data, TAG_NPFS_CCB_DATA); - } - - NpfsDereferenceCcb(ClientCcb); - KeUnlockMutex(&Fcb->CcbListLock); - NpfsDereferenceFcb(Fcb); - Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_UNSUCCESSFUL; - } -#endif + NpfsDereferenceCcb(ClientCcb); + KeUnlockMutex(&Fcb->CcbListLock); + NpfsDereferenceFcb(Fcb); + Irp->IoStatus.Status = STATUS_OBJECT_NAME_NOT_FOUND; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_OBJECT_NAME_NOT_FOUND; + } + } + else + { + /* Signal the server thread and remove it from the waiter list */ + /* FIXME: Merge this with the NpfsFindListeningServerInstance routine. */ + NpfsSignalAndRemoveListeningServerInstance(Fcb, ServerCcb); + } /* * Step 4. Add the client CCB to a list and connect it if possible. Modified: trunk/reactos/drivers/filesystems/npfs/fsctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/fsctrl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/fsctrl.c [iso-8859-1] Sat Aug 31 07:29:26 2013 @@ -15,8 +15,6 @@ #define NDEBUG #include <debug.h> -//#define USING_PROPER_NPFS_WAIT_SEMANTICS - /* FUNCTIONS *****************************************************************/ static DRIVER_CANCEL NpfsListeningCancelRoutine; @@ -319,108 +317,8 @@ return Status; } -static NTSTATUS +NTSTATUS NpfsWaitPipe(PIRP Irp, - PNPFS_CCB Ccb) -{ - PLIST_ENTRY current_entry; - PNPFS_FCB Fcb; - PNPFS_CCB ServerCcb; - PFILE_PIPE_WAIT_FOR_BUFFER WaitPipe; - PLARGE_INTEGER TimeOut; - NTSTATUS Status; - PEXTENDED_IO_STACK_LOCATION IoStack; - PFILE_OBJECT FileObject; - PNPFS_VCB Vcb; - - IoStack = (PEXTENDED_IO_STACK_LOCATION)IoGetCurrentIrpStackLocation(Irp); - ASSERT(IoStack); - FileObject = IoStack->FileObject; - ASSERT(FileObject); - - DPRINT("Waiting on Pipe %wZ\n", &FileObject->FileName); - - WaitPipe = (PFILE_PIPE_WAIT_FOR_BUFFER)Irp->AssociatedIrp.SystemBuffer; - - ASSERT(Ccb->Fcb); - ASSERT(Ccb->Fcb->Vcb); - - /* Get the VCB */ - Vcb = Ccb->Fcb->Vcb; - - /* Lock the pipe list */ - KeLockMutex(&Vcb->PipeListLock); - - /* File a pipe with the given name */ - Fcb = NpfsFindPipe(Vcb, - &FileObject->FileName); - - /* Unlock the pipe list */ - KeUnlockMutex(&Vcb->PipeListLock); - - /* Fail if not pipe was found */ - if (Fcb == NULL) - { - DPRINT("No pipe found!\n"); - return STATUS_OBJECT_NAME_NOT_FOUND; - } - - /* search for listening server */ - current_entry = Fcb->ServerCcbListHead.Flink; - while (current_entry != &Fcb->ServerCcbListHead) - { - ServerCcb = CONTAINING_RECORD(current_entry, - NPFS_CCB, - CcbListEntry); - - if (ServerCcb->PipeState == FILE_PIPE_LISTENING_STATE) - { - /* found a listening server CCB */ - DPRINT("Listening server CCB found -- connecting\n"); - NpfsDereferenceFcb(Fcb); - return STATUS_SUCCESS; - } - - current_entry = current_entry->Flink; - } - - /* No listening server fcb found, so wait for one */ - - /* If a timeout specified */ - if (WaitPipe->TimeoutSpecified) - { - /* NMPWAIT_USE_DEFAULT_WAIT = 0 */ - if (WaitPipe->Timeout.QuadPart == 0) - { - TimeOut = &Fcb->TimeOut; - } - else - { - TimeOut = &WaitPipe->Timeout; - } - } - else - { - /* Wait forever */ - TimeOut = NULL; - } - NpfsDereferenceFcb(Fcb); - - Status = KeWaitForSingleObject(&Ccb->ConnectEvent, - UserRequest, - Irp->RequestorMode, - (Ccb->FileObject->Flags & FO_ALERTABLE_IO) != 0, - TimeOut); - if ((Status == STATUS_USER_APC) || (Status == STATUS_KERNEL_APC) || (Status == STATUS_ALERTED)) - Status = STATUS_CANCELLED; - - DPRINT("KeWaitForSingleObject() returned (Status %lx)\n", Status); - - return Status; -} - -NTSTATUS -NpfsWaitPipe2(PIRP Irp, PNPFS_CCB Ccb) { PLIST_ENTRY current_entry; @@ -429,16 +327,12 @@ PFILE_PIPE_WAIT_FOR_BUFFER WaitPipe; LARGE_INTEGER TimeOut; NTSTATUS Status; -#ifdef USING_PROPER_NPFS_WAIT_SEMANTICS PNPFS_VCB Vcb; UNICODE_STRING PipeName; -#endif - DPRINT("NpfsWaitPipe\n"); WaitPipe = (PFILE_PIPE_WAIT_FOR_BUFFER)Irp->AssociatedIrp.SystemBuffer; -#ifdef USING_PROPER_NPFS_WAIT_SEMANTICS /* Fail, if the CCB does not represent the root directory */ if (Ccb->Type != CCB_DIRECTORY) return STATUS_ILLEGAL_FUNCTION; @@ -488,15 +382,6 @@ } DPRINT("Fcb %p\n", Fcb); -#else - Fcb = Ccb->Fcb; - - if (Ccb->PipeState != 0) - { - DPRINT("Pipe is not in passive (waiting) state!\n"); - return STATUS_UNSUCCESSFUL; - } -#endif /* search for listening server */ current_entry = Fcb->ServerCcbListHead.Flink; @@ -510,9 +395,7 @@ { /* found a listening server CCB */ DPRINT("Listening server CCB found -- connecting\n"); -#ifdef USING_PROPER_NPFS_WAIT_SEMANTICS NpfsDereferenceFcb(Fcb); -#endif return STATUS_SUCCESS; } @@ -526,9 +409,8 @@ TimeOut = WaitPipe->Timeout; else TimeOut = Fcb->TimeOut; -#ifdef USING_PROPER_NPFS_WAIT_SEMANTICS + NpfsDereferenceFcb(Fcb); -#endif /* Wait for one */ Status = KeWaitForSingleObject(&Ccb->ConnectEvent,

11 years

[ion] 59914: [NPFS]: Add support for a few more volume information classes, and disable APCs like an FS should.

by ion＠svn.reactos.org

Author: ion Date: Sat Aug 31 07:07:43 2013 New Revision: 59914 URL: http://svn.reactos.org/svn/reactos?rev=59914&view=rev Log: [NPFS]: Add support for a few more volume information classes, and disable APCs like an FS should. Modified: trunk/reactos/drivers/filesystems/npfs/volume.c Modified: trunk/reactos/drivers/filesystems/npfs/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/v… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/volume.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/volume.c [iso-8859-1] Sat Aug 31 07:07:43 2013 @@ -15,73 +15,91 @@ /* FUNCTIONS ****************************************************************/ -static NTSTATUS -NpfsQueryFsDeviceInformation(PFILE_FS_DEVICE_INFORMATION FsDeviceInfo, - PULONG BufferLength) +NTSTATUS +NTAPI +NpQueryFsDeviceInformation(IN PFILE_FS_DEVICE_INFORMATION FsDeviceInfo, + OUT PULONG BufferLength) { + PAGED_CODE(); DPRINT("NpfsQueryFsDeviceInformation()\n"); DPRINT("FsDeviceInfo = %p\n", FsDeviceInfo); if (*BufferLength < sizeof(FILE_FS_DEVICE_INFORMATION)) { - *BufferLength = sizeof(FILE_FS_DEVICE_INFORMATION); return STATUS_BUFFER_OVERFLOW; } FsDeviceInfo->DeviceType = FILE_DEVICE_NAMED_PIPE; FsDeviceInfo->Characteristics = 0; - *BufferLength = sizeof(FILE_FS_DEVICE_INFORMATION); + *BufferLength -= sizeof(FILE_FS_DEVICE_INFORMATION); DPRINT("NpfsQueryFsDeviceInformation() finished.\n"); return STATUS_SUCCESS; } +NTSTATUS +NTAPI +NpQueryFsFullSizeInfo(IN PFILE_FS_FULL_SIZE_INFORMATION FsSizeInfo, + OUT PULONG BufferSize) +{ + RtlZeroMemory(FsSizeInfo, sizeof(FILE_FS_FULL_SIZE_INFORMATION)); + *BufferSize -= sizeof(FILE_FS_FULL_SIZE_INFORMATION); + return STATUS_SUCCESS; +} -static NTSTATUS -NpfsQueryFsAttributeInformation(PFILE_FS_ATTRIBUTE_INFORMATION FsAttributeInfo, - PULONG BufferLength) +NTSTATUS +NTAPI +NpQueryFsSizeInfo(IN PFILE_FS_SIZE_INFORMATION FsSizeInfo, + OUT PULONG BufferSize) { + FsSizeInfo->TotalAllocationUnits.LowPart = 0; + FsSizeInfo->TotalAllocationUnits.HighPart = 0; + FsSizeInfo->AvailableAllocationUnits.LowPart = 0; + FsSizeInfo->AvailableAllocationUnits.HighPart = 0; + FsSizeInfo->SectorsPerAllocationUnit = 1; + FsSizeInfo->BytesPerSector = 1; + *BufferSize -= sizeof(FILE_FS_SIZE_INFORMATION); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +NpQueryFsAttributeInformation(IN PFILE_FS_ATTRIBUTE_INFORMATION FsAttributeInfo, + OUT PULONG BufferLength) +{ + PAGED_CODE(); DPRINT("NpfsQueryFsAttributeInformation() called.\n"); DPRINT("FsAttributeInfo = %p\n", FsAttributeInfo); if (*BufferLength < sizeof(FILE_FS_ATTRIBUTE_INFORMATION) + 8) { - *BufferLength = (sizeof(FILE_FS_ATTRIBUTE_INFORMATION) + 8); + *BufferLength = 0; return STATUS_BUFFER_OVERFLOW; } FsAttributeInfo->FileSystemAttributes = FILE_CASE_PRESERVED_NAMES; - FsAttributeInfo->MaximumComponentNameLength = 255; + FsAttributeInfo->MaximumComponentNameLength = -1; FsAttributeInfo->FileSystemNameLength = 8; - wcscpy(FsAttributeInfo->FileSystemName, - L"NPFS"); + wcscpy(FsAttributeInfo->FileSystemName, L"NPFS"); DPRINT("NpfsQueryFsAttributeInformation() finished.\n"); - *BufferLength = (sizeof(FILE_FS_ATTRIBUTE_INFORMATION) + 8); + *BufferLength -= (sizeof(FILE_FS_ATTRIBUTE_INFORMATION) + 8); return STATUS_SUCCESS; } - -NTSTATUS NTAPI -NpfsQueryVolumeInformation(PDEVICE_OBJECT DeviceObject, - PIRP Irp) +NTSTATUS +NTAPI +NpCommonQueryVolumeInformation(IN PIRP Irp) { PIO_STACK_LOCATION Stack; FS_INFORMATION_CLASS FsInformationClass; - NTSTATUS Status = STATUS_SUCCESS; PVOID SystemBuffer; ULONG BufferLength; - - /* PRECONDITION */ - ASSERT(DeviceObject != NULL); - ASSERT(Irp != NULL); - - DPRINT("NpfsQueryVolumeInformation(DeviceObject %p, Irp %p)\n", - DeviceObject, - Irp); + NTSTATUS Status; + PAGED_CODE(); Stack = IoGetCurrentIrpStackLocation(Irp); FsInformationClass = Stack->Parameters.QueryVolume.FsInformationClass; @@ -93,25 +111,49 @@ switch (FsInformationClass) { + case FileFsFullSizeInformation: + Status = NpQueryFsFullSizeInfo(SystemBuffer, &BufferLength); + break; + case FileFsSizeInformation: + Status = NpQueryFsSizeInfo(SystemBuffer, &BufferLength); + break; + case FileFsDeviceInformation: - Status = NpfsQueryFsDeviceInformation(SystemBuffer, - &BufferLength); + Status = NpQueryFsDeviceInformation(SystemBuffer, &BufferLength); break; case FileFsAttributeInformation: - Status = NpfsQueryFsAttributeInformation(SystemBuffer, - &BufferLength); + Status = NpQueryFsAttributeInformation(SystemBuffer, &BufferLength); break; default: + DPRINT1("Query not implemented: %d\n", FsInformationClass); Status = STATUS_NOT_SUPPORTED; } - Irp->IoStatus.Status = Status; - Irp->IoStatus.Information = BufferLength; + Irp->IoStatus.Information = Stack->Parameters.QueryVolume.Length - BufferLength; + return Status; +} - IoCompleteRequest(Irp, - IO_NO_INCREMENT); +NTSTATUS +NTAPI +NpfsQueryVolumeInformation(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + NTSTATUS Status; + PAGED_CODE(); + DPRINT("NpfsQueryVolumeInformation(DeviceObject %p, Irp %p)\n", DeviceObject, Irp); + + FsRtlEnterFileSystem(); + Status = NpCommonQueryVolumeInformation(Irp); + FsRtlExitFileSystem(); + + if (Status != STATUS_PENDING) + { + Irp->IoStatus.Status = Status; + + IoCompleteRequest(Irp, IO_DISK_INCREMENT); + } return Status; }

11 years

[ion] 59913: [NTDLL]: Use NT-style calculation in CsrClientCallServer. In special cases, structures can be padded at the end, causing the size of the structure - the size of last field, not to be e...

by ion＠svn.reactos.org

Author: ion Date: Sat Aug 31 02:19:36 2013 New Revision: 59913 URL: http://svn.reactos.org/svn/reactos?rev=59913&view=rev Log: [NTDLL]: Use NT-style calculation in CsrClientCallServer. In special cases, structures can be padded at the end, causing the size of the structure - the size of last field, not to be equal to the offset of the last field. Doing math the NT way will, in some cases (if the CSR union is not 8-byte aligned), cause the TotalLength to be 4 bytes bigger than really needed. [CSRSRV]: Increase the padding to 39*4 bytes, instead of 35, to match Windows. Modified: trunk/reactos/dll/ntdll/csr/connect.c trunk/reactos/include/reactos/subsys/csr/csrmsg.h Modified: trunk/reactos/dll/ntdll/csr/connect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/csr/connect.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/csr/connect.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/csr/connect.c [iso-8859-1] Sat Aug 31 02:19:36 2013 @@ -321,6 +321,33 @@ return Status; } +#if 0 +// +// Structures can be padded at the end, causing the size of the entire structure +// minus the size of the last field, not to be equal to the offset of the last +// field. +// +typedef struct _TEST_EMBEDDED +{ + ULONG One; + ULONG Two; + ULONG Three; +} TEST_EMBEDDED; + +typedef struct _TEST +{ + PORT_MESSAGE h; + TEST_EMBEDDED Three; +} TEST; + +C_ASSERT(sizeof(PORT_MESSAGE) == 0x18); +C_ASSERT(FIELD_OFFSET(TEST, Three) == 0x18); +C_ASSERT(sizeof(TEST_EMBEDDED) == 0xC); + +C_ASSERT(sizeof(TEST) != (sizeof(TEST_EMBEDDED) + sizeof(PORT_MESSAGE))); +C_ASSERT((sizeof(TEST) - sizeof(TEST_EMBEDDED)) != FIELD_OFFSET(TEST, Three)); +#endif + /* * @implemented */ @@ -337,10 +364,10 @@ /* Fill out the Port Message Header */ ApiMessage->Header.u2.ZeroInit = 0; - ApiMessage->Header.u1.s1.TotalLength = - FIELD_OFFSET(CSR_API_MESSAGE, Data) + DataLength; - ApiMessage->Header.u1.s1.DataLength = - ApiMessage->Header.u1.s1.TotalLength - sizeof(PORT_MESSAGE); + ApiMessage->Header.u1.s1.TotalLength = DataLength + + sizeof(CSR_API_MESSAGE) - sizeof(ApiMessage->Data); // FIELD_OFFSET(CSR_API_MESSAGE, Data) + DataLength; + ApiMessage->Header.u1.s1.DataLength = DataLength + + FIELD_OFFSET(CSR_API_MESSAGE, Data) - sizeof(ApiMessage->Header);// ApiMessage->Header.u1.s1.TotalLength - sizeof(PORT_MESSAGE); /* Fill out the CSR Header */ ApiMessage->ApiNumber = ApiNumber; Modified: trunk/reactos/include/reactos/subsys/csr/csrmsg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/csr… ============================================================================== --- trunk/reactos/include/reactos/subsys/csr/csrmsg.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/csr/csrmsg.h [iso-8859-1] Sat Aug 31 02:19:36 2013 @@ -133,7 +133,7 @@ // Finally, the overall message structure size must be at most // equal to the maximum acceptable LPC message size. // - ULONG_PTR Padding[35]; + ULONG_PTR ApiMessageData[39]; } Data; }; };

11 years

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 August 2013