Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 60039: [SPEC2DEF] - Allow C++ redirects aka fix MSVC build
by tfaber＠svn.reactos.org 11 Sep '13

11 Sep '13

Author: tfaber Date: Wed Sep 11 19:19:11 2013 New Revision: 60039 URL: http://svn.reactos.org/svn/reactos?rev=60039&view=rev Log: [SPEC2DEF] - Allow C++ redirects aka fix MSVC build Modified: trunk/reactos/tools/spec2def/spec2def.c Modified: trunk/reactos/tools/spec2def/spec2def.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/spec2def/spec2def.c?… ============================================================================== --- trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] (original) +++ trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] Wed Sep 11 19:19:11 2013 @@ -349,18 +349,11 @@ } else if (pexp->pcRedirection) { - if (gbMSComp && (pexp->pcName[0] == '?')) - { - /* ignore c++ redirection, since link doesn't like that! */ - } - else - { - int fDeco; - - fDeco = ((giArch == ARCH_X86) && !ScanToken(pexp->pcRedirection, '.')); - fprintf(fileDest, "="); - PrintName(fileDest, pexp, "", 1, fDeco && !gbMSComp); - } + int fDeco; + + fDeco = ((giArch == ARCH_X86) && !ScanToken(pexp->pcRedirection, '.')); + fprintf(fileDest, "="); + PrintName(fileDest, pexp, "", 1, fDeco && !gbMSComp); } else if (((pexp->uFlags & FL_STUB) || (pexp->nCallingConvention == CC_STUB)) && (pexp->pcName[0] == '?'))

1 0

[ion] 60038: [NTOSKRNL]: Fix a literal metric fuckton of missing parameter checks in IoCreateFile. I know for a fact this fixes two ntdll pipe tests, it probably fixes a bunch of other tests too. [...
by ion＠svn.reactos.org 11 Sep '13

11 Sep '13

Author: ion Date: Wed Sep 11 18:50:28 2013 New Revision: 60038 URL: http://svn.reactos.org/svn/reactos?rev=60038&view=rev Log: [NTOSKRNL]: Fix a literal metric fuckton of missing parameter checks in IoCreateFile. I know for a fact this fixes two ntdll pipe tests, it probably fixes a bunch of other tests too. [NTOSKRNL]: Fix OPEN_PACKET definition. Also, allocate it from the pool in IoCreateFile, instead of the stack (Windows does too). [NTOSKRNL]: IoCreateFile should only be setting IO_STATUS_BLOCK Information/Status if EA Buffer validation *Fails*, not if it succeeds! Modified: trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/io/iomgr/file.c Modified: trunk/reactos/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/io.h [iso-8859-1] Wed Sep 11 18:50:28 2013 @@ -368,14 +368,15 @@ PFILE_BASIC_INFORMATION BasicInformation; PFILE_NETWORK_OPEN_INFORMATION NetworkInformation; CREATE_FILE_TYPE CreateFileType; - PVOID MailslotOrPipeParameters; + PVOID ExtraCreateParameters; BOOLEAN Override; BOOLEAN QueryOnly; BOOLEAN DeleteOnly; BOOLEAN FullAttributes; - PDUMMY_FILE_OBJECT DummyFileObject; + PDUMMY_FILE_OBJECT LocalFileObject; + BOOLEAN TraversedMountPoint; ULONG InternalFlags; - //PIO_DRIVER_CREATE_CONTEXT DriverCreateContext; Vista only, needs ROS DDK Update + PDEVICE_OBJECT TopDeviceObjectHint; } OPEN_PACKET, *POPEN_PACKET; // 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] Wed Sep 11 18:50:28 2013 @@ -188,7 +188,7 @@ BOOLEAN DirectOpen = FALSE, OpenCancelled, UseDummyFile; OBJECT_ATTRIBUTES ObjectAttributes; KIRQL OldIrql; - PDUMMY_FILE_OBJECT DummyFileObject; + PDUMMY_FILE_OBJECT LocalFileObject; PFILE_BASIC_INFORMATION FileBasicInfo; ULONG ReturnLength; KPROCESSOR_MODE CheckMode; @@ -503,9 +503,7 @@ /* Now set the IRP data */ Irp->RequestorMode = AccessMode; - Irp->Flags = IRP_CREATE_OPERATION | - IRP_SYNCHRONOUS_API | - IRP_DEFER_IO_COMPLETION; + Irp->Flags = IRP_CREATE_OPERATION | IRP_SYNCHRONOUS_API | IRP_DEFER_IO_COMPLETION; Irp->Tail.Overlay.Thread = PsGetCurrentThread(); Irp->UserIosb = &IoStatusBlock; Irp->MdlAddress = NULL; @@ -537,8 +535,7 @@ /* Set the flags */ StackLoc->Flags = (UCHAR)OpenPacket->Options; - StackLoc->Flags |= !(Attributes & OBJ_CASE_INSENSITIVE) ? - SL_CASE_SENSITIVE: 0; + StackLoc->Flags |= !(Attributes & OBJ_CASE_INSENSITIVE) ? SL_CASE_SENSITIVE: 0; break; /* Named pipe */ @@ -546,8 +543,7 @@ /* Set the named pipe MJ and set the parameters */ StackLoc->MajorFunction = IRP_MJ_CREATE_NAMED_PIPE; - StackLoc->Parameters.CreatePipe.Parameters = - OpenPacket->MailslotOrPipeParameters; + StackLoc->Parameters.CreatePipe.Parameters = OpenPacket->ExtraCreateParameters; break; /* Mailslot */ @@ -555,8 +551,7 @@ /* Set the mailslot MJ and set the parameters */ StackLoc->MajorFunction = IRP_MJ_CREATE_MAILSLOT; - StackLoc->Parameters.CreateMailslot.Parameters = - OpenPacket->MailslotOrPipeParameters; + StackLoc->Parameters.CreateMailslot.Parameters = OpenPacket->ExtraCreateParameters; break; } @@ -658,13 +653,13 @@ else { /* Use the dummy object instead */ - DummyFileObject = OpenPacket->DummyFileObject; - RtlZeroMemory(DummyFileObject, sizeof(DUMMY_FILE_OBJECT)); + LocalFileObject = OpenPacket->LocalFileObject; + RtlZeroMemory(LocalFileObject, sizeof(DUMMY_FILE_OBJECT)); /* Set it up */ - FileObject = (PFILE_OBJECT)&DummyFileObject->ObjectHeader.Body; - DummyFileObject->ObjectHeader.Type = IoFileObjectType; - DummyFileObject->ObjectHeader.PointerCount = 1; + FileObject = (PFILE_OBJECT)&LocalFileObject->ObjectHeader.Body; + LocalFileObject->ObjectHeader.Type = IoFileObjectType; + LocalFileObject->ObjectHeader.PointerCount = 1; } /* Setup the file header */ @@ -1541,7 +1536,7 @@ { NTSTATUS Status; KPROCESSOR_MODE AccessMode = ExGetPreviousMode(); - DUMMY_FILE_OBJECT DummyFileObject; + DUMMY_FILE_OBJECT LocalFileObject; FILE_NETWORK_OPEN_INFORMATION NetworkOpenInfo; HANDLE Handle; OPEN_PACKET OpenPacket; @@ -1582,7 +1577,7 @@ &NetworkOpenInfo : FileInformation; OpenPacket.QueryOnly = TRUE; OpenPacket.FullAttributes = IsBasic ? FALSE : TRUE; - OpenPacket.DummyFileObject = &DummyFileObject; + OpenPacket.LocalFileObject = &LocalFileObject; /* Update the operation count */ IopUpdateOperationCount(IopOtherTransfer); @@ -1717,14 +1712,18 @@ KPROCESSOR_MODE AccessMode; HANDLE LocalHandle = 0; LARGE_INTEGER SafeAllocationSize; - volatile PVOID SystemEaBuffer = NULL; NTSTATUS Status = STATUS_SUCCESS; - OPEN_PACKET OpenPacket; + PNAMED_PIPE_CREATE_PARAMETERS NamedPipeCreateParameters; + POPEN_PACKET OpenPacket; ULONG EaErrorOffset; - PAGED_CODE(); IOTRACE(IO_FILE_DEBUG, "FileName: %wZ\n", ObjectAttributes->ObjectName); + /* Allocate the open packet */ + OpenPacket = ExAllocatePoolWithTag(NonPagedPool, sizeof(*OpenPacket), 'pOoI'); + if (!OpenPacket) return STATUS_INSUFFICIENT_RESOURCES; + RtlZeroMemory(OpenPacket, sizeof(*OpenPacket)); + /* Check if we have no parameter checking to do */ if (Options & IO_NO_PARAMETER_CHECKING) { @@ -1738,12 +1737,112 @@ } /* Check if the call came from user mode */ - if (AccessMode != KernelMode) - { + if ((AccessMode != KernelMode) || (Options & IO_CHECK_CREATE_PARAMETERS)) + { + /* Validate parameters */ + if ((FileAttributes & ~FILE_ATTRIBUTE_VALID_FLAGS) || + + (ShareAccess & ~FILE_SHARE_VALID_FLAGS) || + + (Disposition > FILE_MAXIMUM_DISPOSITION) || + + (CreateOptions & ~FILE_VALID_OPTION_FLAGS) || + + ((CreateOptions & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)) && + (!(DesiredAccess & SYNCHRONIZE))) || + + ((CreateOptions & FILE_DELETE_ON_CLOSE) && (!(DesiredAccess & DELETE))) || + + ((CreateOptions & (FILE_SYNCHRONOUS_IO_NONALERT | FILE_SYNCHRONOUS_IO_ALERT)) == + (FILE_SYNCHRONOUS_IO_NONALERT | FILE_SYNCHRONOUS_IO_ALERT)) || + + ((CreateOptions & FILE_DIRECTORY_FILE) && !(CreateOptions & FILE_NON_DIRECTORY_FILE) && + ((CreateOptions & ~(FILE_DIRECTORY_FILE | + FILE_SYNCHRONOUS_IO_ALERT | + FILE_SYNCHRONOUS_IO_NONALERT | + FILE_WRITE_THROUGH | + FILE_COMPLETE_IF_OPLOCKED | + FILE_OPEN_FOR_BACKUP_INTENT | + FILE_DELETE_ON_CLOSE | + FILE_OPEN_FOR_FREE_SPACE_QUERY | + FILE_OPEN_BY_FILE_ID | + FILE_NO_COMPRESSION | + FILE_OPEN_REPARSE_POINT)) || + ((Disposition != FILE_CREATE) && (Disposition != FILE_OPEN) && (Disposition != FILE_OPEN_IF)))) || + + ((CreateOptions & FILE_COMPLETE_IF_OPLOCKED) && (CreateOptions & FILE_RESERVE_OPFILTER)) || + + ((CreateOptions & FILE_NO_INTERMEDIATE_BUFFERING) && (DesiredAccess & FILE_APPEND_DATA))) + { + /* + * Parameter failure. We'll be as unspecific as NT as to + * why this happened though, to make debugging a pain! + */ + DPRINT1("File Create Parameter Failure!\n"); + ExFreePool(OpenPacket); + return STATUS_INVALID_PARAMETER; + } + + /* Now check if this is a named pipe */ + if (CreateFileType == CreateFileTypeNamedPipe) + { + /* Make sure we have extra parameters */ + if (!ExtraCreateParameters) + { + ExFreePool(OpenPacket); + return STATUS_INVALID_PARAMETER; + } + + /* Get the parameters and validate them */ + NamedPipeCreateParameters = ExtraCreateParameters; + if ((NamedPipeCreateParameters->NamedPipeType > FILE_PIPE_MESSAGE_TYPE) || + + (NamedPipeCreateParameters->ReadMode > FILE_PIPE_MESSAGE_MODE) || + + (NamedPipeCreateParameters->CompletionMode > FILE_PIPE_COMPLETE_OPERATION) || + + (ShareAccess & FILE_SHARE_DELETE) || + + ((Disposition < FILE_OPEN) || (Disposition > FILE_OPEN_IF)) || + + (CreateOptions & ~FILE_VALID_PIPE_OPTION_FLAGS)) + { + /* Invalid named pipe create */ + ExFreePool(OpenPacket); + return STATUS_INVALID_PARAMETER; + } + } + else if (CreateFileType == CreateFileTypeMailslot) + { + /* Make sure we have extra parameters */ + if (!ExtraCreateParameters) + { + ExFreePool(OpenPacket); + return STATUS_INVALID_PARAMETER; + } + + /* Get the parameters and validate them */ + if ((ShareAccess & FILE_SHARE_DELETE) || + + !(ShareAccess & ~FILE_SHARE_WRITE) || + + (Disposition != FILE_CREATE) || + + (CreateOptions & ~FILE_VALID_MAILSLOT_OPTION_FLAGS)) + { + /* Invalid mailslot create */ + ExFreePool(OpenPacket); + return STATUS_INVALID_PARAMETER; + } + } + _SEH2_TRY { + /* Probe the output parameters */ ProbeForWriteHandle(FileHandle); ProbeForWriteIoStatusBlock(IoStatusBlock); + + /* Probe the allocation size if one was passed in */ if (AllocationSize) { SafeAllocationSize = ProbeForReadLargeInteger(AllocationSize); @@ -1753,32 +1852,44 @@ SafeAllocationSize.QuadPart = 0; } + /* Make sure it's valid */ + if (SafeAllocationSize.QuadPart < 0) + { + RtlRaiseStatus(STATUS_INVALID_PARAMETER); + } + + /* Check if EA was passed in */ if ((EaBuffer) && (EaLength)) { + /* Probe it */ ProbeForRead(EaBuffer, EaLength, sizeof(ULONG)); - /* marshal EaBuffer */ - SystemEaBuffer = ExAllocatePoolWithTag(NonPagedPool, - EaLength, - TAG_EA); - if (!SystemEaBuffer) - { - _SEH2_YIELD(return STATUS_INSUFFICIENT_RESOURCES); - } - - RtlCopyMemory(SystemEaBuffer, EaBuffer, EaLength); + /* And marshall it */ + OpenPacket->EaBuffer = ExAllocatePoolWithTag(NonPagedPool, + EaLength, + TAG_EA); + OpenPacket->EaLength = EaLength; + RtlCopyMemory(OpenPacket->EaBuffer, EaBuffer, EaLength); /* Validate the buffer */ - Status = IoCheckEaBufferValidity(SystemEaBuffer, + Status = IoCheckEaBufferValidity(OpenPacket->EaBuffer, EaLength, &EaErrorOffset); - IoStatusBlock->Status = Status; - IoStatusBlock->Information = EaErrorOffset; + if (!NT_SUCCESS(Status)) + { + /* Undo everything if it's invalid */ + DPRINT1("Invalid EA buffer\n"); + IoStatusBlock->Status = Status; + IoStatusBlock->Information = EaErrorOffset; + RtlRaiseStatus(Status); + } } } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { /* Return the exception code */ + if (OpenPacket->EaBuffer != NULL) ExFreePool(OpenPacket->EaBuffer); + ExFreePool(OpenPacket); Status = _SEH2_GetExceptionCode(); } _SEH2_END; @@ -1809,47 +1920,47 @@ if ((EaBuffer) && (EaLength)) { /* Allocate the kernel copy */ - SystemEaBuffer = ExAllocatePoolWithTag(NonPagedPool, - EaLength, - TAG_EA); - if (!SystemEaBuffer) return STATUS_INSUFFICIENT_RESOURCES; + OpenPacket->EaBuffer = ExAllocatePoolWithTag(NonPagedPool, + EaLength, + TAG_EA); + if (!OpenPacket->EaBuffer) + { + ExFreePool(OpenPacket); + return STATUS_INSUFFICIENT_RESOURCES; + } /* Copy the data */ - RtlCopyMemory(SystemEaBuffer, EaBuffer, EaLength); + OpenPacket->EaLength = EaLength; + RtlCopyMemory(OpenPacket->EaBuffer, EaBuffer, EaLength); /* Validate the buffer */ - Status = IoCheckEaBufferValidity(SystemEaBuffer, + Status = IoCheckEaBufferValidity(OpenPacket->EaBuffer, EaLength, &EaErrorOffset); - IoStatusBlock->Status = Status; - IoStatusBlock->Information = EaErrorOffset; - } - } - - if (!NT_SUCCESS(Status)) - { - DPRINT1("FIXME: IoCheckEaBufferValidity() failed with Status: %lx\n", - Status); - - /* Free SystemEaBuffer if needed and return the error */ - if (SystemEaBuffer) ExFreePoolWithTag(SystemEaBuffer, TAG_EA); - return Status; + if (!NT_SUCCESS(Status)) + { + /* Undo everything if it's invalid */ + DPRINT1("Invalid EA buffer\n"); + ExFreePool(OpenPacket->EaBuffer); + IoStatusBlock->Status = Status; + IoStatusBlock->Information = EaErrorOffset; + ExFreePool(OpenPacket); + return Status; + } + } } /* Setup the Open Packet */ - RtlZeroMemory(&OpenPacket, sizeof(OPEN_PACKET)); - OpenPacket.Type = IO_TYPE_OPEN_PACKET; - OpenPacket.Size = sizeof(OPEN_PACKET); - OpenPacket.AllocationSize = SafeAllocationSize; - OpenPacket.CreateOptions = CreateOptions; - OpenPacket.FileAttributes = (USHORT)FileAttributes; - OpenPacket.ShareAccess = (USHORT)ShareAccess; - OpenPacket.EaBuffer = SystemEaBuffer; - OpenPacket.EaLength = EaLength; - OpenPacket.Options = Options; - OpenPacket.Disposition = Disposition; - OpenPacket.CreateFileType = CreateFileType; - OpenPacket.MailslotOrPipeParameters = ExtraCreateParameters; + OpenPacket->Type = IO_TYPE_OPEN_PACKET; + OpenPacket->Size = sizeof(*OpenPacket); + OpenPacket->AllocationSize = SafeAllocationSize; + OpenPacket->CreateOptions = CreateOptions; + OpenPacket->FileAttributes = (USHORT)FileAttributes; + OpenPacket->ShareAccess = (USHORT)ShareAccess; + OpenPacket->Options = Options; + OpenPacket->Disposition = Disposition; + OpenPacket->CreateFileType = CreateFileType; + OpenPacket->ExtraCreateParameters = ExtraCreateParameters; /* Update the operation count */ IopUpdateOperationCount(IopOtherTransfer); @@ -1867,14 +1978,14 @@ AccessMode, NULL, DesiredAccess, - &OpenPacket, + OpenPacket, &LocalHandle); /* Free the EA Buffer */ - if (OpenPacket.EaBuffer) ExFreePool(OpenPacket.EaBuffer); + if (OpenPacket->EaBuffer) ExFreePool(OpenPacket->EaBuffer); /* Now check for Ob or Io failure */ - if (!(NT_SUCCESS(Status)) || (OpenPacket.ParseCheck != TRUE)) + if (!(NT_SUCCESS(Status)) || (OpenPacket->ParseCheck != TRUE)) { /* Check if Ob thinks well went well */ if (NT_SUCCESS(Status)) @@ -1888,10 +1999,10 @@ } /* Now check the Io status */ - if (!NT_SUCCESS(OpenPacket.FinalStatus)) + if (!NT_SUCCESS(OpenPacket->FinalStatus)) { /* Use this status instead of Ob's */ - Status = OpenPacket.FinalStatus; + Status = OpenPacket->FinalStatus; /* Check if it was only a warning */ if (NT_WARNING(Status)) @@ -1900,8 +2011,8 @@ _SEH2_TRY { /* In this case, we copy the I/O Status back */ - IoStatusBlock->Information = OpenPacket.Information; - IoStatusBlock->Status = OpenPacket.FinalStatus; + IoStatusBlock->Information = OpenPacket->Information; + IoStatusBlock->Status = OpenPacket->FinalStatus; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -1911,39 +2022,40 @@ _SEH2_END; } } - else if ((OpenPacket.FileObject) && (OpenPacket.ParseCheck != 1)) + else if ((OpenPacket->FileObject) && (OpenPacket->ParseCheck != 1)) { /* * This can happen in the very bizarre case where the parse routine * actually executed more then once (due to a reparse) and ended * up failing after already having created the File Object. */ - if (OpenPacket.FileObject->FileName.Length) + if (OpenPacket->FileObject->FileName.Length) { /* It had a name, free it */ - ExFreePoolWithTag(OpenPacket.FileObject->FileName.Buffer, TAG_IO_NAME); + ExFreePoolWithTag(OpenPacket->FileObject->FileName.Buffer, TAG_IO_NAME); } /* Clear the device object to invalidate the FO, and dereference */ - OpenPacket.FileObject->DeviceObject = NULL; - ObDereferenceObject(OpenPacket.FileObject); + OpenPacket->FileObject->DeviceObject = NULL; + ObDereferenceObject(OpenPacket->FileObject); } } else { /* We reached success and have a valid file handle */ - OpenPacket.FileObject->Flags |= FO_HANDLE_CREATED; + OpenPacket->FileObject->Flags |= FO_HANDLE_CREATED; + ASSERT(OpenPacket->FileObject->Type == IO_TYPE_FILE); /* Enter SEH for write back */ _SEH2_TRY { /* Write back the handle and I/O Status */ *FileHandle = LocalHandle; - IoStatusBlock->Information = OpenPacket.Information; - IoStatusBlock->Status = OpenPacket.FinalStatus; + IoStatusBlock->Information = OpenPacket->Information; + IoStatusBlock->Status = OpenPacket->FinalStatus; /* Get the Io status */ - Status = OpenPacket.FinalStatus; + Status = OpenPacket->FinalStatus; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -1954,13 +2066,14 @@ } /* Check if we were 100% successful */ - if ((OpenPacket.ParseCheck == TRUE) && (OpenPacket.FileObject)) + if ((OpenPacket->ParseCheck == TRUE) && (OpenPacket->FileObject)) { /* Dereference the File Object */ - ObDereferenceObject(OpenPacket.FileObject); + ObDereferenceObject(OpenPacket->FileObject); } /* Return status */ + ExFreePool(OpenPacket); return Status; } @@ -2190,7 +2303,7 @@ OUT PFILE_NETWORK_OPEN_INFORMATION Buffer) { NTSTATUS Status; - DUMMY_FILE_OBJECT DummyFileObject; + DUMMY_FILE_OBJECT LocalFileObject; HANDLE Handle; OPEN_PACKET OpenPacket; PAGED_CODE(); @@ -2207,7 +2320,7 @@ OpenPacket.NetworkInformation = Buffer; OpenPacket.QueryOnly = TRUE; OpenPacket.FullAttributes = TRUE; - OpenPacket.DummyFileObject = &DummyFileObject; + OpenPacket.LocalFileObject = &LocalFileObject; /* * Attempt opening the file. This will call the I/O Parse Routine for @@ -3000,7 +3113,7 @@ NtDeleteFile(IN POBJECT_ATTRIBUTES ObjectAttributes) { NTSTATUS Status; - DUMMY_FILE_OBJECT DummyFileObject; + DUMMY_FILE_OBJECT LocalFileObject; HANDLE Handle; KPROCESSOR_MODE AccessMode = KeGetPreviousMode(); OPEN_PACKET OpenPacket; @@ -3017,7 +3130,7 @@ FILE_SHARE_DELETE; OpenPacket.Disposition = FILE_OPEN; OpenPacket.DeleteOnly = TRUE; - OpenPacket.DummyFileObject = &DummyFileObject; + OpenPacket.LocalFileObject = &LocalFileObject; /* Update the operation counts */ IopUpdateOperationCount(IopOtherTransfer);

1 0

[tfaber] 60037: [FRAMEDYN] - Fix MSVC build - Fix some name mangling issues - Add stub libraries to make the dll actually usable. The GCC alias library is still broken though.
by tfaber＠svn.reactos.org 11 Sep '13

11 Sep '13

Author: tfaber Date: Wed Sep 11 18:36:27 2013 New Revision: 60037 URL: http://svn.reactos.org/svn/reactos?rev=60037&view=rev Log: [FRAMEDYN] - Fix MSVC build - Fix some name mangling issues - Add stub libraries to make the dll actually usable. The GCC alias library is still broken though. Added: trunk/reactos/dll/win32/framedyn/alias_gcc.s (with props) trunk/reactos/dll/win32/framedyn/alias_msvc.s (with props) Modified: trunk/reactos/dll/win32/framedyn/CMakeLists.txt trunk/reactos/dll/win32/framedyn/chstring.cpp trunk/reactos/dll/win32/framedyn/framedyn_gcc.spec trunk/reactos/dll/win32/framedyn/framedyn_msvc.spec trunk/reactos/include/psdk/chstring.h Modified: trunk/reactos/dll/win32/framedyn/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/framedyn/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/framedyn/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/framedyn/CMakeLists.txt [iso-8859-1] Wed Sep 11 18:36:27 2013 @@ -1,16 +1,32 @@ -set_cpp(WITH_RUNTIME) -list(APPEND SOURCE main.c chstring.cpp) +set_cpp(WITH_RUNTIME WITH_EXCEPTIONS) + +if(NOT MSVC) + spec2def(framedyn.dll framedyn_gcc.spec ADD_IMPORTLIB) +else() + spec2def(framedyn.dll framedyn_msvc.spec ADD_IMPORTLIB) +endif() + +list(APPEND SOURCE + main.c + chstring.cpp + ${CMAKE_CURRENT_BINARY_DIR}/framedyn.def) + add_library(framedyn SHARED ${SOURCE}) set_module_type(framedyn win32dll UNICODE) add_importlibs(framedyn oleaut32 msvcrt kernel32 ntdll) if(NOT MSVC) # FIXME: http://www.cmake.org/Bug/view.php?id=12998 - #add_target_compile_flags(framedyn "-fexceptions -Wno-deprecated-declarations") - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-fexceptions -Wno-deprecated-declarations") - spec2def(framedyn.dll framedyn_gcc.spec ADD_IMPORTLIB) - list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/framedyn.def) + #add_target_compile_flags(framedyn "-Wno-deprecated-declarations") + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error=deprecated-declarations") endif() add_cd_file(TARGET framedyn DESTINATION reactos/system32/wbem FOR all) + +if(MSVC) + add_asm_files(framedynex_asm alias_msvc.s) +else() + add_asm_files(framedynex_asm alias_gcc.s) +endif() +add_library(framedynex ${framedynex_asm}) Added: trunk/reactos/dll/win32/framedyn/alias_gcc.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/framedyn/alias_g… ============================================================================== --- trunk/reactos/dll/win32/framedyn/alias_gcc.s (added) +++ trunk/reactos/dll/win32/framedyn/alias_gcc.s [iso-8859-1] Wed Sep 11 18:36:27 2013 @@ -0,0 +1,92 @@ +#include <asm.inc> + +.code64 +.align 4 + +MACRO(DEFINE_ALIAS, alias, alias2, origstring) +PUBLIC alias +.weakref alias2, origstring +alias: + jmp alias2 +ENDM + +#define DEFINE_ALIAS(alias, orig) DEFINE_ALIAS alias, __wrap_ ## alias, #orig + +DEFINE_ALIAS(__ZN8CHString16AllocBeforeWriteEi, ?AllocBeforeWrite@CHString@@IAEXH@Z) +DEFINE_ALIAS(__ZN8CHString11AllocBufferEi, ?AllocBuffer@CHString@@IAEXH@Z) +DEFINE_ALIAS(__ZNK8CHString9AllocCopyERS_iii, ?AllocCopy@CHString@@IBEXAAV1@HHH@Z) +DEFINE_ALIAS(__ZNK8CHString14AllocSysStringEv, ?AllocSysString@CHString@@QBEPAGXZ) +DEFINE_ALIAS(__ZN8CHString10AssignCopyEiPKw, ?AssignCopy@CHString@@IAEXHPBG@Z) +DEFINE_ALIAS(__ZN8CHStringC1ERKS_, ??0CHString@@QAE@ABV0@@Z) +DEFINE_ALIAS(__ZN8CHStringC1EPKc, ??0CHString@@QAE@PBD@Z) +DEFINE_ALIAS(__ZN8CHStringC1EPKh, ??0CHString@@QAE@PBE@Z) +DEFINE_ALIAS(__ZN8CHStringC1EPKw, ??0CHString@@QAE@PBG@Z) +DEFINE_ALIAS(__ZN8CHStringC1EPKwi, ??0CHString@@QAE@PBGH@Z) +DEFINE_ALIAS(__ZN8CHStringC1Ewi, ??0CHString@@QAE@GH@Z) +DEFINE_ALIAS(__ZN8CHStringC1Ev, ??0CHString@@QAE@XZ) +DEFINE_ALIAS(__ZNK8CHString7CollateEPKw, ?Collate@CHString@@QBEHPBG@Z) +DEFINE_ALIAS(__ZNK8CHString7CompareEPKw, ?Compare@CHString@@QBEHPBG@Z) +DEFINE_ALIAS(__ZNK8CHString13CompareNoCaseEPKw, ?CompareNoCase@CHString@@QBEHPBG@Z) +DEFINE_ALIAS(__ZN8CHString10ConcatCopyEiPKwiS1_, ?ConcatCopy@CHString@@IAEXHPBGH0@Z) +DEFINE_ALIAS(__ZN8CHString13ConcatInPlaceEiPKw, ?ConcatInPlace@CHString@@IAEXHPBG@Z) +DEFINE_ALIAS(__ZN8CHString15CopyBeforeWriteEv, ?CopyBeforeWrite@CHString@@IAEXXZ) +DEFINE_ALIAS(__ZN8CHString5EmptyEv, ?Empty@CHString@@QAEXXZ) +DEFINE_ALIAS(__ZNK8CHString4FindEPKw, ?Find@CHString@@QBEHPBG@Z) +DEFINE_ALIAS(__ZNK8CHString4FindEw, ?Find@CHString@@QBEHG@Z) +DEFINE_ALIAS(__ZNK8CHString9FindOneOfEPKw, ?FindOneOf@CHString@@QBEHPBG@Z) +DEFINE_ALIAS(__ZN8CHString6FormatEjz, ?Format@CHString@@QAAXIZZ) +DEFINE_ALIAS(__ZN8CHString6FormatEPKwz, ?Format@CHString@@QAAXPBGZZ) +DEFINE_ALIAS(__ZN8CHString14FormatMessageWEjz, ?FormatMessageW@CHString@@QAAXIZZ) +DEFINE_ALIAS(__ZN8CHString14FormatMessageWEPKwz, ?FormatMessageW@CHString@@QAAXPBGZZ) +DEFINE_ALIAS(__ZN8CHString7FormatVEPKwPc, ?FormatV@CHString@@QAEXPBGPAD@Z) +DEFINE_ALIAS(__ZN8CHString9FreeExtraEv, ?FreeExtra@CHString@@QAEXXZ) +DEFINE_ALIAS(__ZNK8CHString14GetAllocLengthEv, ?GetAllocLength@CHString@@QBEHXZ) +DEFINE_ALIAS(__ZNK8CHString5GetAtEi, ?GetAt@CHString@@QBEGH@Z) +DEFINE_ALIAS(__ZN8CHString9GetBufferEi, ?GetBuffer@CHString@@QAEPAGH@Z) +DEFINE_ALIAS(__ZN8CHString18GetBufferSetLengthEi, ?GetBufferSetLength@CHString@@QAEPAGH@Z) +DEFINE_ALIAS(__ZNK8CHString7GetDataEv, ?GetData@CHString@@IBEPAUCHStringData@@XZ) +DEFINE_ALIAS(__ZNK8CHString9GetLengthEv, ?GetLength@CHString@@QBEHXZ) +DEFINE_ALIAS(__ZN8CHString4InitEv, ?Init@CHString@@IAEXXZ) +DEFINE_ALIAS(__ZNK8CHString7IsEmptyEv, ?IsEmpty@CHString@@QBEHXZ) +DEFINE_ALIAS(__ZNK8CHString4LeftEi, ?Left@CHString@@QBE?AV1@H@Z) +DEFINE_ALIAS(__ZN8CHString11LoadStringWEj, ?LoadStringW@CHString@@QAEHI@Z) +DEFINE_ALIAS(__ZN8CHString11LoadStringWEjPwj, ?LoadStringW@CHString@@IAEHIPAGI@Z) +DEFINE_ALIAS(__ZN8CHString10LockBufferEv, ?LockBuffer@CHString@@QAEPAGXZ) +DEFINE_ALIAS(__ZN8CHString9MakeLowerEv, ?MakeLower@CHString@@QAEXXZ) +DEFINE_ALIAS(__ZN8CHString11MakeReverseEv, ?MakeReverse@CHString@@QAEXXZ) +DEFINE_ALIAS(__ZN8CHString9MakeUpperEv, ?MakeUpper@CHString@@QAEXXZ) +DEFINE_ALIAS(__ZNK8CHString3MidEi, ?Mid@CHString@@QBE?AV1@H@Z) +DEFINE_ALIAS(__ZNK8CHString3MidEii, ?Mid@CHString@@QBE?AV1@HH@Z) +DEFINE_ALIAS(__ZN8CHString7ReleaseEP12CHStringData@4, ?Release@CHString@@KGXPAUCHStringData@@@Z) +DEFINE_ALIAS(__ZN8CHString7ReleaseEv, ?Release@CHString@@IAEXXZ) +DEFINE_ALIAS(__ZN8CHString13ReleaseBufferEi, ?ReleaseBuffer@CHString@@QAEXH@Z) +DEFINE_ALIAS(__ZNK8CHString11ReverseFindEw, ?ReverseFind@CHString@@QBEHG@Z) +DEFINE_ALIAS(__ZNK8CHString5RightEi, ?Right@CHString@@QBE?AV1@H@Z) +DEFINE_ALIAS(__ZN8CHString10SafeStrlenEPKw, ?SafeStrlen@CHString@@KGHPBG@Z) +DEFINE_ALIAS(__ZN8CHString5SetAtEiw, ?SetAt@CHString@@QAEXHG@Z) +DEFINE_ALIAS(__ZNK8CHString13SpanExcludingEPKw, ?SpanExcluding@CHString@@QBE?AV1@PBG@Z) +DEFINE_ALIAS(__ZNK8CHString13SpanIncludingEPKw, ?SpanIncluding@CHString@@QBE?AV1@PBG@Z) +DEFINE_ALIAS(__ZN8CHString8TrimLeftEv, ?TrimLeft@CHString@@QAEXXZ) +DEFINE_ALIAS(__ZN8CHString9TrimRightEv, ?TrimRight@CHString@@QAEXXZ) +DEFINE_ALIAS(__ZN8CHString12UnlockBufferEv, ?UnlockBuffer@CHString@@QAEXXZ) +DEFINE_ALIAS(__ZNK8CHStringcvPKwEv, ??BCHString@@QBEPBGXZ) +DEFINE_ALIAS(__ZN8CHStringpLERKS_, ??YCHString@@QAEABV0@ABV0@@Z) +DEFINE_ALIAS(__ZN8CHStringpLEc, ??YCHString@@QAEABV0@D@Z) +DEFINE_ALIAS(__ZN8CHStringpLEPKw, ??YCHString@@QAEABV0@PBG@Z) +DEFINE_ALIAS(__ZN8CHStringpLEw, ??YCHString@@QAEABV0@G@Z) +DEFINE_ALIAS(__ZN8CHStringaSEPS_, ??4CHString@@QAEABV0@PAV0@@Z) +DEFINE_ALIAS(__ZN8CHStringaSERKS_, ??4CHString@@QAEABV0@ABV0@@Z) +DEFINE_ALIAS(__ZN8CHStringaSEPKc, ??4CHString@@QAEABV0@PBD@Z) +DEFINE_ALIAS(__ZN8CHStringaSEc, ??4CHString@@QAEABV0@D@Z) +DEFINE_ALIAS(__ZN8CHStringaSEPKh, ??4CHString@@QAEABV0@PBE@Z) +DEFINE_ALIAS(__ZN8CHStringaSEPKw, ??4CHString@@QAEABV0@PBG@Z) +DEFINE_ALIAS(__ZN8CHStringaSEw, ??4CHString@@QAEABV0@G@Z) +DEFINE_ALIAS(__ZNK8CHStringixEi, ??ACHString@@QBEGH@Z) +DEFINE_ALIAS(__ZN8CHStringD1Ev, ??1CHString@@QAE@XZ) +DEFINE_ALIAS(__ZplwRK8CHString, ??H@YG?AVCHString@@GABV0@@Z) +DEFINE_ALIAS(__ZplRK8CHStringw, ??H@YG?AVCHString@@ABV0@G@Z) +DEFINE_ALIAS(__ZplRK8CHStringPKw, ??H@YG?AVCHString@@ABV0@PBG@Z) +DEFINE_ALIAS(__ZplPKwRK8CHString, ??H@YG?AVCHString@@PBGABV0@@Z) +DEFINE_ALIAS(__ZplRK8CHStringS1_, ??H@YG?AVCHString@@ABV0@0@Z) + +END Propchange: trunk/reactos/dll/win32/framedyn/alias_gcc.s ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/framedyn/alias_msvc.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/framedyn/alias_m… ============================================================================== --- trunk/reactos/dll/win32/framedyn/alias_msvc.s (added) +++ trunk/reactos/dll/win32/framedyn/alias_msvc.s [iso-8859-1] Wed Sep 11 18:36:27 2013 @@ -0,0 +1,48 @@ +#include <asm.inc> + +.code64 +.align 4 + +MACRO(DEFINE_ALIAS, alias, orig) +EXTERN &orig:ABS +ALIAS <&alias> = <&orig> +ENDM + +DEFINE_ALIAS ?AllocSysString@CHString@@QBEPA_WXZ, ?AllocSysString@CHString@@QBEPAGXZ +DEFINE_ALIAS ?AssignCopy@CHString@@IAEXHPB_W@Z, ?AssignCopy@CHString@@IAEXHPBG@Z +DEFINE_ALIAS ??0CHString@@QAE@PB_W@Z, ??0CHString@@QAE@PBG@Z +DEFINE_ALIAS ??0CHString@@QAE@PB_WH@Z, ??0CHString@@QAE@PBGH@Z +DEFINE_ALIAS ??0CHString@@QAE@_WH@Z, ??0CHString@@QAE@GH@Z +DEFINE_ALIAS ?Collate@CHString@@QBEHPB_W@Z, ?Collate@CHString@@QBEHPBG@Z +DEFINE_ALIAS ?Compare@CHString@@QBEHPB_W@Z, ?Compare@CHString@@QBEHPBG@Z +DEFINE_ALIAS ?CompareNoCase@CHString@@QBEHPB_W@Z, ?CompareNoCase@CHString@@QBEHPBG@Z +DEFINE_ALIAS ?ConcatCopy@CHString@@IAEXHPB_WH0@Z, ?ConcatCopy@CHString@@IAEXHPBGH0@Z +DEFINE_ALIAS ?ConcatInPlace@CHString@@IAEXHPB_W@Z, ?ConcatInPlace@CHString@@IAEXHPBG@Z +DEFINE_ALIAS ?Find@CHString@@QBEHPB_W@Z, ?Find@CHString@@QBEHPBG@Z +DEFINE_ALIAS ?Find@CHString@@QBEH_W@Z, ?Find@CHString@@QBEHG@Z +DEFINE_ALIAS ?FindOneOf@CHString@@QBEHPB_W@Z, ?FindOneOf@CHString@@QBEHPBG@Z +DEFINE_ALIAS ?Format@CHString@@QAAXPB_WZZ, ?Format@CHString@@QAAXPBGZZ +DEFINE_ALIAS ?FormatMessageW@CHString@@QAAXPB_WZZ, ?FormatMessageW@CHString@@QAAXPBGZZ +DEFINE_ALIAS ?FormatV@CHString@@QAEXPB_WPAD@Z, ?FormatV@CHString@@QAEXPBGPAD@Z +DEFINE_ALIAS ?GetAt@CHString@@QBE_WH@Z, ?GetAt@CHString@@QBEGH@Z +DEFINE_ALIAS ?GetBuffer@CHString@@QAEPA_WH@Z, ?GetBuffer@CHString@@QAEPAGH@Z +DEFINE_ALIAS ?GetBufferSetLength@CHString@@QAEPA_WH@Z, ?GetBufferSetLength@CHString@@QAEPAGH@Z +DEFINE_ALIAS ?LoadStringW@CHString@@IAEHIPA_WI@Z, ?LoadStringW@CHString@@IAEHIPAGI@Z +DEFINE_ALIAS ?LockBuffer@CHString@@QAEPA_WXZ, ?LockBuffer@CHString@@QAEPAGXZ +DEFINE_ALIAS ?ReverseFind@CHString@@QBEH_W@Z, ?ReverseFind@CHString@@QBEHG@Z +DEFINE_ALIAS ?SafeStrlen@CHString@@KGHPB_W@Z, ?SafeStrlen@CHString@@KGHPBG@Z +DEFINE_ALIAS ?SetAt@CHString@@QAEXH_W@Z, ?SetAt@CHString@@QAEXHG@Z +DEFINE_ALIAS ?SpanExcluding@CHString@@QBE?AV1@PB_W@Z, ?SpanExcluding@CHString@@QBE?AV1@PBG@Z +DEFINE_ALIAS ?SpanIncluding@CHString@@QBE?AV1@PB_W@Z, ?SpanIncluding@CHString@@QBE?AV1@PBG@Z +DEFINE_ALIAS ??BCHString@@QBEPB_WXZ, ??BCHString@@QBEPBGXZ +DEFINE_ALIAS ??YCHString@@QAEABV0@PB_W@Z, ??YCHString@@QAEABV0@PBG@Z +DEFINE_ALIAS ??YCHString@@QAEABV0@_W@Z, ??YCHString@@QAEABV0@G@Z +DEFINE_ALIAS ??4CHString@@QAEABV0@PB_W@Z, ??4CHString@@QAEABV0@PBG@Z +DEFINE_ALIAS ??4CHString@@QAEABV0@_W@Z, ??4CHString@@QAEABV0@G@Z +DEFINE_ALIAS ??ACHString@@QBE_WH@Z, ??ACHString@@QBEGH@Z +DEFINE_ALIAS ??H@YG?AVCHString@@_WABV0@@Z, ??H@YG?AVCHString@@GABV0@@Z +DEFINE_ALIAS ??H@YG?AVCHString@@ABV0@_W@Z, ??H@YG?AVCHString@@ABV0@G@Z +DEFINE_ALIAS ??H@YG?AVCHString@@ABV0@PB_W@Z, ??H@YG?AVCHString@@ABV0@PBG@Z +DEFINE_ALIAS ??H@YG?AVCHString@@PB_WABV0@@Z, ??H@YG?AVCHString@@PBGABV0@@Z + +END Propchange: trunk/reactos/dll/win32/framedyn/alias_msvc.s ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/framedyn/chstring.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/framedyn/chstrin… ============================================================================== --- trunk/reactos/dll/win32/framedyn/chstring.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/framedyn/chstring.cpp [iso-8859-1] Wed Sep 11 18:36:27 2013 @@ -940,7 +940,7 @@ /* * @implemented */ -void CHString::Release(CHStringData* pData) +void WINAPI CHString::Release(CHStringData* pData) { // If empty string, ignore if (pData == &afxNullData) Modified: trunk/reactos/dll/win32/framedyn/framedyn_gcc.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/framedyn/framedy… ============================================================================== --- trunk/reactos/dll/win32/framedyn/framedyn_gcc.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/framedyn/framedyn_gcc.spec [iso-8859-1] Wed Sep 11 18:36:27 2013 @@ -3,13 +3,13 @@ @ thiscall ?AllocCopy@CHString@@IBEXAAV1@HHH@Z(ptr long long long) _ZNK8CHString9AllocCopyERS_iii @ thiscall ?AllocSysString@CHString@@QBEPAGXZ() _ZNK8CHString14AllocSysStringEv @ thiscall ?AssignCopy@CHString@@IAEXHPBG@Z(long wstr) _ZN8CHString10AssignCopyEiPKw -@ thiscall ??0CHString@@QAE@ABV0@@Z(ptr) _ZN8CHStringC2ERKS_ -@ thiscall ??0CHString@@QAE@PBD@Z(str) _ZN8CHStringC2EPKc -@ thiscall ??0CHString@@QAE@PBE@Z(str) _ZN8CHStringC2EPKh -@ thiscall ??0CHString@@QAE@PBG@Z(wstr) _ZN8CHStringC2EPKw -@ thiscall ??0CHString@@QAE@PBGH@Z(wstr long) _ZN8CHStringC2EPKwi -@ thiscall ??0CHString@@QAE@GH@Z(long long) _ZN8CHStringC2Ewi -@ thiscall ??0CHString@@QAE@XZ() _ZN8CHStringC2Ev +@ thiscall ??0CHString@@QAE@ABV0@@Z(ptr) _ZN8CHStringC1ERKS_ +@ thiscall ??0CHString@@QAE@PBD@Z(str) _ZN8CHStringC1EPKc +@ thiscall ??0CHString@@QAE@PBE@Z(str) _ZN8CHStringC1EPKh +@ thiscall ??0CHString@@QAE@PBG@Z(wstr) _ZN8CHStringC1EPKw +@ thiscall ??0CHString@@QAE@PBGH@Z(wstr long) _ZN8CHStringC1EPKwi +@ thiscall ??0CHString@@QAE@GH@Z(long long) _ZN8CHStringC1Ewi +@ thiscall ??0CHString@@QAE@XZ() _ZN8CHStringC1Ev @ thiscall ?Collate@CHString@@QBEHPBG@Z(wstr) _ZNK8CHString7CollateEPKw @ thiscall ?Compare@CHString@@QBEHPBG@Z(wstr) _ZNK8CHString7CompareEPKw @ thiscall ?CompareNoCase@CHString@@QBEHPBG@Z(wstr) _ZNK8CHString13CompareNoCaseEPKw @@ -43,7 +43,7 @@ @ thiscall ?MakeUpper@CHString@@QAEXXZ() _ZN8CHString9MakeUpperEv @ thiscall ?Mid@CHString@@QBE?AV1@H@Z(long) _ZNK8CHString3MidEi @ thiscall ?Mid@CHString@@QBE?AV1@HH@Z(long long) _ZNK8CHString3MidEii -@ thiscall ?Release@CHString@@KGXPAUCHStringData@@@Z(ptr) _ZN8CHString7ReleaseEP12CHStringData +@ thiscall ?Release@CHString@@KGXPAUCHStringData@@@Z(ptr) _ZN8CHString7ReleaseEP12CHStringData@4 @ thiscall ?Release@CHString@@IAEXXZ() _ZN8CHString7ReleaseEv @ thiscall ?ReleaseBuffer@CHString@@QAEXH@Z(long) _ZN8CHString13ReleaseBufferEi @ thiscall ?ReverseFind@CHString@@QBEHG@Z(long) _ZNK8CHString11ReverseFindEw @@ -55,7 +55,7 @@ @ thiscall ?TrimLeft@CHString@@QAEXXZ() _ZN8CHString8TrimLeftEv @ thiscall ?TrimRight@CHString@@QAEXXZ() _ZN8CHString9TrimRightEv @ thiscall ?UnlockBuffer@CHString@@QAEXXZ() _ZN8CHString12UnlockBufferEv -@ thiscall ??BCHString@@QBEPBGXZ(ptr) _ZN8CHStringcvPwEv +@ thiscall ??BCHString@@QBEPBGXZ(ptr) _ZNK8CHStringcvPKwEv @ thiscall ??YCHString@@QAEABV0@ABV0@@Z(ptr) _ZN8CHStringpLERKS_ @ thiscall ??YCHString@@QAEABV0@D@Z(long) _ZN8CHStringpLEc @ thiscall ??YCHString@@QAEABV0@PBG@Z(wstr) _ZN8CHStringpLEPKw @@ -68,7 +68,7 @@ @ thiscall ??4CHString@@QAEABV0@PBG@Z(wstr) _ZN8CHStringaSEPKw @ thiscall ??4CHString@@QAEABV0@G@Z(long) _ZN8CHStringaSEw @ thiscall ??ACHString@@QBEGH@Z(long) _ZNK8CHStringixEi -@ thiscall ??1CHString@@QAE@XZ() _ZN8CHStringD2Ev +@ thiscall ??1CHString@@QAE@XZ() _ZN8CHStringD1Ev @ stdcall ??H@YG?AVCHString@@GABV0@@Z(long ptr) _ZplwRK8CHString @ stdcall ??H@YG?AVCHString@@ABV0@G@Z(ptr long) _ZplRK8CHStringw @ stdcall ??H@YG?AVCHString@@ABV0@PBG@Z(ptr wstr) _ZplRK8CHStringPKw Modified: trunk/reactos/dll/win32/framedyn/framedyn_msvc.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/framedyn/framedy… ============================================================================== --- trunk/reactos/dll/win32/framedyn/framedyn_msvc.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/framedyn/framedyn_msvc.spec [iso-8859-1] Wed Sep 11 18:36:27 2013 @@ -1,76 +1,76 @@ @ thiscall ?AllocBeforeWrite@CHString@@IAEXH@Z(long) @ thiscall ?AllocBuffer@CHString@@IAEXH@Z(long) @ thiscall ?AllocCopy@CHString@@IBEXAAV1@HHH@Z(ptr long long long) -#@ thiscall ?AllocSysString@CHString@@QBEPAGXZ() -#@ thiscall ?AssignCopy@CHString@@IAEXHPBG@Z(long wstr) +@ thiscall ?AllocSysString@CHString@@QBEPAGXZ() ?AllocSysString@CHString@@QBEPA_WXZ +@ thiscall ?AssignCopy@CHString@@IAEXHPBG@Z(long wstr) ?AssignCopy@CHString@@IAEXHPB_W@Z @ thiscall ??0CHString@@QAE@ABV0@@Z(ptr) @ thiscall ??0CHString@@QAE@PBD@Z(str) @ thiscall ??0CHString@@QAE@PBE@Z(str) -#@ thiscall ??0CHString@@QAE@PBG@Z(wstr) -#@ thiscall ??0CHString@@QAE@PBGH@Z(wstr long) -#@ thiscall ??0CHString@@QAE@GH@Z(long long) +@ thiscall ??0CHString@@QAE@PBG@Z(wstr) ??0CHString@@QAE@PB_W@Z +@ thiscall ??0CHString@@QAE@PBGH@Z(wstr long) ??0CHString@@QAE@PB_WH@Z +@ thiscall ??0CHString@@QAE@GH@Z(long long) ??0CHString@@QAE@_WH@Z @ thiscall ??0CHString@@QAE@XZ() -#@ thiscall ?Collate@CHString@@QBEHPBG@Z(wstr) -#@ thiscall ?Compare@CHString@@QBEHPBG@Z(wstr) -#@ thiscall ?CompareNoCase@CHString@@QBEHPBG@Z(wstr) -#@ thiscall ?ConcatCopy@CHString@@IAEXHPBGH0@Z(long wstr long wstr) -#@ thiscall ?ConcatInPlace@CHString@@IAEXHPBG@Z(long wstr) +@ thiscall ?Collate@CHString@@QBEHPBG@Z(wstr) ?Collate@CHString@@QBEHPB_W@Z +@ thiscall ?Compare@CHString@@QBEHPBG@Z(wstr) ?Compare@CHString@@QBEHPB_W@Z +@ thiscall ?CompareNoCase@CHString@@QBEHPBG@Z(wstr) ?CompareNoCase@CHString@@QBEHPB_W@Z +@ thiscall ?ConcatCopy@CHString@@IAEXHPBGH0@Z(long wstr long wstr) ?ConcatCopy@CHString@@IAEXHPB_WH0@Z +@ thiscall ?ConcatInPlace@CHString@@IAEXHPBG@Z(long wstr) ?ConcatInPlace@CHString@@IAEXHPB_W@Z @ thiscall ?CopyBeforeWrite@CHString@@IAEXXZ() @ thiscall ?Empty@CHString@@QAEXXZ() -#@ thiscall ?Find@CHString@@QBEHPBG@Z(wstr) -#@ thiscall ?Find@CHString@@QBEHG@Z(long) -#@ thiscall ?FindOneOf@CHString@@QBEHPBG@Z(wstr) +@ thiscall ?Find@CHString@@QBEHPBG@Z(wstr) ?Find@CHString@@QBEHPB_W@Z +@ thiscall ?Find@CHString@@QBEHG@Z(long) ?Find@CHString@@QBEH_W@Z +@ thiscall ?FindOneOf@CHString@@QBEHPBG@Z(wstr) ?FindOneOf@CHString@@QBEHPB_W@Z @ thiscall ?Format@CHString@@QAAXIZZ(long long long) -#@ thiscall ?Format@CHString@@QAAXPBGZZ(long wstr long) +@ thiscall ?Format@CHString@@QAAXPBGZZ(long wstr long) ?Format@CHString@@QAAXPB_WZZ @ thiscall ?FormatMessageW@CHString@@QAAXIZZ(long long long) -#@ thiscall ?FormatMessageW@CHString@@QAAXPBGZZ(long ptr long) -#@ thiscall ?FormatV@CHString@@QAEXPBGPAD@Z(wstr long) +@ thiscall ?FormatMessageW@CHString@@QAAXPBGZZ(long ptr long) ?FormatMessageW@CHString@@QAAXPB_WZZ +@ thiscall ?FormatV@CHString@@QAEXPBGPAD@Z(wstr long) ?FormatV@CHString@@QAEXPB_WPAD@Z @ thiscall ?FreeExtra@CHString@@QAEXXZ() @ thiscall ?GetAllocLength@CHString@@QBEHXZ() -#@ thiscall ?GetAt@CHString@@QBEGH@Z(long) -#@ thiscall ?GetBuffer@CHString@@QAEPAGH@Z(long) -#@ thiscall ?GetBufferSetLength@CHString@@QAEPAGH@Z(long) +@ thiscall ?GetAt@CHString@@QBEGH@Z(long) ?GetAt@CHString@@QBE_WH@Z +@ thiscall ?GetBuffer@CHString@@QAEPAGH@Z(long) ?GetBuffer@CHString@@QAEPA_WH@Z +@ thiscall ?GetBufferSetLength@CHString@@QAEPAGH@Z(long) ?GetBufferSetLength@CHString@@QAEPA_WH@Z @ thiscall ?GetData@CHString@@IBEPAUCHStringData@@XZ() @ thiscall ?GetLength@CHString@@QBEHXZ() @ thiscall ?Init@CHString@@IAEXXZ() @ thiscall ?IsEmpty@CHString@@QBEHXZ() @ thiscall ?Left@CHString@@QBE?AV1@H@Z(long) -#@ thiscall ?LoadStringW@CHString@@QAEHI@Z(long) -#@ thiscall ?LoadStringW@CHString@@IAEHIPAGI@Z(long wstr long) -#@ thiscall ?LockBuffer@CHString@@QAEPAGXZ() +@ thiscall ?LoadStringW@CHString@@QAEHI@Z(long) +@ thiscall ?LoadStringW@CHString@@IAEHIPAGI@Z(long wstr long) ?LoadStringW@CHString@@IAEHIPA_WI@Z +@ thiscall ?LockBuffer@CHString@@QAEPAGXZ() ?LockBuffer@CHString@@QAEPA_WXZ @ thiscall ?MakeLower@CHString@@QAEXXZ() @ thiscall ?MakeReverse@CHString@@QAEXXZ() @ thiscall ?MakeUpper@CHString@@QAEXXZ() @ thiscall ?Mid@CHString@@QBE?AV1@H@Z(long) @ thiscall ?Mid@CHString@@QBE?AV1@HH@Z(long long) @ thiscall ?Release@CHString@@KGXPAUCHStringData@@@Z(ptr) -#@ thiscall ?Release@CHString@@IAEXXZ() -#@ thiscall ?ReleaseBuffer@CHString@@QAEXH@Z(long) -#@ thiscall ?ReverseFind@CHString@@QBEHG@Z(long) +@ thiscall ?Release@CHString@@IAEXXZ() +@ thiscall ?ReleaseBuffer@CHString@@QAEXH@Z(long) +@ thiscall ?ReverseFind@CHString@@QBEHG@Z(long) ?ReverseFind@CHString@@QBEH_W@Z @ thiscall ?Right@CHString@@QBE?AV1@H@Z(long) -#@ stdcall ?SafeStrlen@CHString@@KGHPBG@Z(wstr) -#@ thiscall ?SetAt@CHString@@QAEXHG@Z(long long) -#@ thiscall ?SpanExcluding@CHString@@QBE?AV1@PBG@Z(long wstr) -#@ thiscall ?SpanIncluding@CHString@@QBE?AV1@PBG@Z(long wstr) +@ stdcall ?SafeStrlen@CHString@@KGHPBG@Z(wstr) ?SafeStrlen@CHString@@KGHPB_W@Z +@ thiscall ?SetAt@CHString@@QAEXHG@Z(long long) ?SetAt@CHString@@QAEXH_W@Z +@ thiscall ?SpanExcluding@CHString@@QBE?AV1@PBG@Z(long wstr) ?SpanExcluding@CHString@@QBE?AV1@PB_W@Z +@ thiscall ?SpanIncluding@CHString@@QBE?AV1@PBG@Z(long wstr) ?SpanIncluding@CHString@@QBE?AV1@PB_W@Z @ thiscall ?TrimLeft@CHString@@QAEXXZ() @ thiscall ?TrimRight@CHString@@QAEXXZ() @ thiscall ?UnlockBuffer@CHString@@QAEXXZ() -#@ thiscall ??BCHString@@QBEPBGXZ(ptr) +@ thiscall ??BCHString@@QBEPBGXZ(ptr) ??BCHString@@QBEPB_WXZ @ thiscall ??YCHString@@QAEABV0@ABV0@@Z(ptr) @ thiscall ??YCHString@@QAEABV0@D@Z(long) -#@ thiscall ??YCHString@@QAEABV0@PBG@Z(wstr) -#@ thiscall ??YCHString@@QAEABV0@G@Z(long) +@ thiscall ??YCHString@@QAEABV0@PBG@Z(wstr) ??YCHString@@QAEABV0@PB_W@Z +@ thiscall ??YCHString@@QAEABV0@G@Z(long) ??YCHString@@QAEABV0@_W@Z @ thiscall ??4CHString@@QAEABV0@PAV0@@Z(ptr) @ thiscall ??4CHString@@QAEABV0@ABV0@@Z(ptr) @ thiscall ??4CHString@@QAEABV0@PBD@Z(str) @ thiscall ??4CHString@@QAEABV0@D@Z(long) @ thiscall ??4CHString@@QAEABV0@PBE@Z(str) -#@ thiscall ??4CHString@@QAEABV0@PBG@Z(wstr) -#@ thiscall ??4CHString@@QAEABV0@G@Z(long) -@ thiscall ??ACHString@@QBEGH@Z(long) +@ thiscall ??4CHString@@QAEABV0@PBG@Z(wstr) ??4CHString@@QAEABV0@PB_W@Z +@ thiscall ??4CHString@@QAEABV0@G@Z(long) ??4CHString@@QAEABV0@_W@Z +@ thiscall ??ACHString@@QBEGH@Z(long) ??ACHString@@QBE_WH@Z @ thiscall ??1CHString@@QAE@XZ() -#@ stdcall ??H@YG?AVCHString@@GABV0@@Z(long ptr) -#@ stdcall ??H@YG?AVCHString@@ABV0@G@Z(ptr long) -#@ stdcall ??H@YG?AVCHString@@ABV0@PBG@Z(ptr wstr) -#@ stdcall ??H@YG?AVCHString@@PBGABV0@@Z(wstr ptr) +@ stdcall ??H@YG?AVCHString@@GABV0@@Z(long ptr) ??H@YG?AVCHString@@_WABV0@@Z +@ stdcall ??H@YG?AVCHString@@ABV0@G@Z(ptr long) ??H@YG?AVCHString@@ABV0@_W@Z +@ stdcall ??H@YG?AVCHString@@ABV0@PBG@Z(ptr wstr) ??H@YG?AVCHString@@ABV0@PB_W@Z +@ stdcall ??H@YG?AVCHString@@PBGABV0@@Z(wstr ptr) ??H@YG?AVCHString@@PB_WABV0@@Z @ stdcall ??H@YG?AVCHString@@ABV0@0@Z(ptr ptr) Modified: trunk/reactos/include/psdk/chstring.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/chstring.h?re… ============================================================================== --- trunk/reactos/include/psdk/chstring.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/chstring.h [iso-8859-1] Wed Sep 11 18:36:27 2013 @@ -14,7 +14,7 @@ WCHAR* data() { - return (WCHAR*)(this+1); + return (WCHAR*)(this+1); } }; @@ -51,14 +51,13 @@ int GetLength() const; BOOL IsEmpty() const; CHString Left(int nCount) const throw (CHeap_Exception); + int LoadStringW(UINT nID) throw (CHeap_Exception); LPWSTR LockBuffer(); void MakeLower() throw (CHeap_Exception); void MakeReverse() throw (CHeap_Exception); void MakeUpper() throw (CHeap_Exception); CHString Mid(int nFirst) const throw (CHeap_Exception); CHString Mid(int nFirst, int nCount) const throw (CHeap_Exception); - void Release(); - void Release(CHStringData* pData); void ReleaseBuffer(int nNewLength = -1) throw (CHeap_Exception); int ReverseFind(WCHAR ch) const; CHString Right(int nCount) const throw (CHeap_Exception); @@ -104,8 +103,9 @@ void CopyBeforeWrite() throw (CHeap_Exception); CHStringData* GetData() const; void Init(); - int LoadStringW(UINT nID) throw (CHeap_Exception); int LoadStringW(UINT nID, LPWSTR lpszBuf, UINT nMaxBuf) throw (CHeap_Exception); + void Release(); + static void WINAPI Release(CHStringData* pData); static int WINAPI SafeStrlen(LPCWSTR lpsz); };

1 0

[akhaldi] 60036: [SVCHOST] * CMake file improvements.
by akhaldi＠svn.reactos.org 11 Sep '13

11 Sep '13

Author: akhaldi Date: Wed Sep 11 18:33:36 2013 New Revision: 60036 URL: http://svn.reactos.org/svn/reactos?rev=60036&view=rev Log: [SVCHOST] * CMake file improvements. Modified: trunk/reactos/base/services/svchost/CMakeLists.txt Modified: trunk/reactos/base/services/svchost/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/svchost/CMak… ============================================================================== --- trunk/reactos/base/services/svchost/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/services/svchost/CMakeLists.txt [iso-8859-1] Wed Sep 11 18:33:36 2013 @@ -1,6 +1,13 @@ -add_executable(svchost globals.c registry.c security.cxx rpcsrv.c netbios.c svchost.c svchost.rc) +list(APPEND SOURCE + globals.c + registry.c + security.cxx + rpcsrv.c + netbios.c + svchost.c) +add_executable(svchost ${SOURCE} svchost.rc) target_link_libraries(svchost uuid) set_module_type(svchost win32cui UNICODE) add_importlibs(svchost advapi32 netapi32 rpcrt4 ole32 kernel32 ntdll)

1 0

[akhaldi] 60035: [SVCHOST] * Use the DbgPrintEx based SvchostDbgPrint macro. We no longer have traces enabled by default here.
by akhaldi＠svn.reactos.org 11 Sep '13

11 Sep '13

Author: akhaldi Date: Wed Sep 11 18:20:30 2013 New Revision: 60035 URL: http://svn.reactos.org/svn/reactos?rev=60035&view=rev Log: [SVCHOST] * Use the DbgPrintEx based SvchostDbgPrint macro. We no longer have traces enabled by default here. Modified: trunk/reactos/base/services/svchost/svchost.h Modified: trunk/reactos/base/services/svchost/svchost.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/svchost/svch… ============================================================================== --- trunk/reactos/base/services/svchost/svchost.h [iso-8859-1] (original) +++ trunk/reactos/base/services/svchost/svchost.h [iso-8859-1] Wed Sep 11 18:20:30 2013 @@ -21,7 +21,6 @@ // // This prints out a SVCHOST-specific debug print, with the PID/TID // -#if _EX_ #define SvchostDbgPrint(lev, fmt, ...) \ DbgPrintEx(DPFLTR_SVCHOST_ID, \ DPFLTR_MASK | lev, \ @@ -29,13 +28,7 @@ GetCurrentProcessId(), \ GetCurrentThreadId(), \ __VA_ARGS__); -#else -#define SvchostDbgPrint(lev, fmt, ...) \ - DbgPrint("[SVCHOST] %lx.%lx: " fmt, \ - GetCurrentProcessId(), \ - GetCurrentThreadId(), \ - __VA_ARGS__); -#endif + #define DBG_ERR(fmt, ...) SvchostDbgPrint(1, fmt, __VA_ARGS__) #define DBG_TRACE(fmt, ...) SvchostDbgPrint(4, fmt, __VA_ARGS__)

1 0

[ion] 60034: [NPFS-NEW]: Use locking and IRP completion macros from NPFS snippet at "Common Driver Reliability Issues - Microsoft download.microsoft.com/download/5/7/7/577a5684-8a83.../drvqa.doc". ...
by ion＠svn.reactos.org 11 Sep '13

11 Sep '13

Author: ion Date: Wed Sep 11 17:10:30 2013 New Revision: 60034 URL: http://svn.reactos.org/svn/reactos?rev=60034&view=rev Log: [NPFS-NEW]: Use locking and IRP completion macros from NPFS snippet at "Common Driver Reliability Issues - Microsoft download.microsoft.com/download/5/7/7/577a5684-8a83.../drvqa.doc". Fix a few incorrect exclusive vs shared lock acquires. Modified: trunk/reactos/drivers/filesystems/npfs_new/cleanup.c trunk/reactos/drivers/filesystems/npfs_new/close.c trunk/reactos/drivers/filesystems/npfs_new/create.c trunk/reactos/drivers/filesystems/npfs_new/datasup.c trunk/reactos/drivers/filesystems/npfs_new/fileinfo.c trunk/reactos/drivers/filesystems/npfs_new/flushbuf.c trunk/reactos/drivers/filesystems/npfs_new/fsctrl.c trunk/reactos/drivers/filesystems/npfs_new/main.c trunk/reactos/drivers/filesystems/npfs_new/npfs.h trunk/reactos/drivers/filesystems/npfs_new/read.c trunk/reactos/drivers/filesystems/npfs_new/seinfo.c trunk/reactos/drivers/filesystems/npfs_new/statesup.c trunk/reactos/drivers/filesystems/npfs_new/write.c Modified: trunk/reactos/drivers/filesystems/npfs_new/cleanup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/cleanup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/cleanup.c [iso-8859-1] Wed Sep 11 17:10:30 2013 @@ -7,18 +7,16 @@ { PIO_STACK_LOCATION IoStack; NODE_TYPE_CODE NodeTypeCode; - LIST_ENTRY List; + LIST_ENTRY DeferredList; PNP_FCB Fcb; PNP_CCB Ccb; ULONG NamedPipeEnd; - PLIST_ENTRY ThisEntry, NextEntry; - PIRP LocalIrp; PAGED_CODE(); IoStack = IoGetCurrentIrpStackLocation(Irp); - InitializeListHead(&List); + InitializeListHead(&DeferredList); - ExAcquireResourceExclusiveLite(&NpVcb->Lock, TRUE); + NpAcquireExclusiveVcb(); NodeTypeCode = NpDecodeFileObject(IoStack->FileObject, (PVOID*)&Fcb, &Ccb, @@ -31,20 +29,11 @@ --Ccb->Fcb->ServerOpenCount; } - NpSetClosingPipeState(Ccb, Irp, NamedPipeEnd, &List); + NpSetClosingPipeState(Ccb, Irp, NamedPipeEnd, &DeferredList); } - ExReleaseResourceLite(&NpVcb->Lock); - - NextEntry = List.Flink; - while (NextEntry != &List) - { - ThisEntry = NextEntry; - NextEntry = NextEntry->Flink; - - LocalIrp = CONTAINING_RECORD(ThisEntry, IRP, Tail.Overlay.ListEntry); - IoCompleteRequest(LocalIrp, IO_NAMED_PIPE_INCREMENT); - } + NpReleaseVcb(); + NpCompleteDeferredIrps(&DeferredList); return STATUS_SUCCESS; } Modified: trunk/reactos/drivers/filesystems/npfs_new/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/close.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/close.c [iso-8859-1] Wed Sep 11 17:10:30 2013 @@ -7,18 +7,16 @@ { PIO_STACK_LOCATION IoStack; NODE_TYPE_CODE NodeTypeCode; - LIST_ENTRY List; + LIST_ENTRY DeferredList; PNP_FCB Fcb; PNP_CCB Ccb; ULONG NamedPipeEnd; - PLIST_ENTRY ThisEntry, NextEntry; - PIRP LocalIrp; PAGED_CODE(); IoStack = IoGetCurrentIrpStackLocation(Irp); - InitializeListHead(&List); + InitializeListHead(&DeferredList); - ExAcquireResourceExclusiveLite(&NpVcb->Lock, TRUE); + NpAcquireExclusiveVcb(); NodeTypeCode = NpDecodeFileObject(IoStack->FileObject, (PVOID*)&Fcb, &Ccb, @@ -26,24 +24,15 @@ if (NodeTypeCode == NPFS_NTC_ROOT_DCB) { --Fcb->CurrentInstances; - NpDeleteCcb(Ccb, &List); + NpDeleteCcb(Ccb, &DeferredList); } else if (NodeTypeCode == NPFS_NTC_VCB) { --NpVcb->ReferenceCount; } - ExReleaseResourceLite(&NpVcb->Lock); - - NextEntry = List.Flink; - while (NextEntry != &List) - { - ThisEntry = NextEntry; - NextEntry = NextEntry->Flink; - - LocalIrp = CONTAINING_RECORD(ThisEntry, IRP, Tail.Overlay.ListEntry); - IoCompleteRequest(LocalIrp, IO_NAMED_PIPE_INCREMENT); - } + NpReleaseVcb(); + NpCompleteDeferredIrps(&DeferredList); Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(Irp, IO_NAMED_PIPE_INCREMENT); Modified: trunk/reactos/drivers/filesystems/npfs_new/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/create.c [iso-8859-1] Wed Sep 11 17:10:30 2013 @@ -205,12 +205,10 @@ PNP_FCB Fcb; PNP_DCB Dcb; ACCESS_MASK DesiredAccess; - LIST_ENTRY List; - PLIST_ENTRY NextEntry, ThisEntry; + LIST_ENTRY DeferredList; UNICODE_STRING Prefix; - PIRP ListIrp; - - InitializeListHead(&List); + + InitializeListHead(&DeferredList); IoStack = (PEXTENDED_IO_STACK_LOCATION)IoGetCurrentIrpStackLocation(Irp); FileObject = IoStack->FileObject; RelatedFileObject = FileObject->RelatedFileObject; @@ -240,7 +238,7 @@ Irp->IoStatus = NpOpenNamedPipeRootDirectory(NpVcb->RootDcb, FileObject, DesiredAccess, - &List); + &DeferredList); goto Quickie; } } @@ -255,7 +253,7 @@ Irp->IoStatus = NpOpenNamedPipeRootDirectory(NpVcb->RootDcb, FileObject, DesiredAccess, - &List); + &DeferredList); goto Quickie; } @@ -329,21 +327,11 @@ SL_FORCE_ACCESS_CHECK ? UserMode : Irp->RequestorMode, Irp->Tail.Overlay.Thread, - &List); + &DeferredList); Quickie: ExReleaseResourceLite(&NpVcb->Lock); - - NextEntry = List.Flink; - while (NextEntry != &List) - { - ThisEntry = NextEntry; - NextEntry = NextEntry->Flink; - - ListIrp = CONTAINING_RECORD(ThisEntry, IRP, Tail.Overlay.ListEntry); - IoCompleteRequest(ListIrp, IO_NAMED_PIPE_INCREMENT); - } - + NpCompleteDeferredIrps(&DeferredList); FsRtlExitFileSystem(); IoCompleteRequest(Irp, IO_NO_INCREMENT); @@ -622,16 +610,14 @@ PFILE_OBJECT RelatedFileObject; USHORT Disposition, ShareAccess; PEPROCESS Process; - LIST_ENTRY LocalList; - PLIST_ENTRY NextEntry, ThisEntry; + LIST_ENTRY DeferredList; UNICODE_STRING FileName; PNP_FCB Fcb; UNICODE_STRING Prefix; PNAMED_PIPE_CREATE_PARAMETERS Parameters; IO_STATUS_BLOCK IoStatus; - PIRP ListIrp; - - InitializeListHead(&LocalList); + + InitializeListHead(&DeferredList); Process = IoGetRequestorProcess(Irp); IoStack = (PEXTENDED_IO_STACK_LOCATION) IoGetCurrentIrpStackLocation(Irp); @@ -650,7 +636,7 @@ IoStatus.Information = 0; FsRtlEnterFileSystem(); - ExAcquireResourceExclusiveLite(&NpVcb->Lock, TRUE); + NpAcquireExclusiveVcb(); if (RelatedFileObject) { @@ -701,7 +687,7 @@ ShareAccess, Parameters, Process, - &LocalList, + &DeferredList, &IoStatus); goto Quickie; } @@ -731,21 +717,11 @@ ShareAccess, Parameters, Process, - &LocalList); + &DeferredList); Quickie: - ExReleaseResourceLite(&NpVcb->Lock); - - NextEntry = LocalList.Flink; - while (NextEntry != &LocalList) - { - ThisEntry = NextEntry; - NextEntry = NextEntry->Flink; - - ListIrp = CONTAINING_RECORD(ThisEntry, IRP, Tail.Overlay.ListEntry); - IoCompleteRequest(ListIrp, IO_NAMED_PIPE_INCREMENT); - } - + NpReleaseVcb(); + NpCompleteDeferredIrps(&DeferredList); FsRtlExitFileSystem(); Irp->IoStatus = IoStatus; Modified: trunk/reactos/drivers/filesystems/npfs_new/datasup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/datasup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/datasup.c [iso-8859-1] Wed Sep 11 17:10:30 2013 @@ -129,7 +129,7 @@ if (Irp && IoSetCancelRoutine(Irp, NULL)) { - Irp->Tail.Overlay.DriverContext[3] = 0; + Irp->Tail.Overlay.DriverContext[3] = NULL; } ExFreePool(QueueEntry); @@ -188,15 +188,13 @@ { PNP_DATA_QUEUE DataQueue; PNP_DATA_QUEUE_ENTRY DataEntry; - LIST_ENTRY List; + LIST_ENTRY DeferredList; PSECURITY_CLIENT_CONTEXT ClientSecurityContext; BOOLEAN CompleteWrites, FirstEntry; - PLIST_ENTRY NextEntry, ThisEntry; - PIRP LocalIrp; if (DeviceObject) IoReleaseCancelSpinLock(Irp->CancelIrql); - InitializeListHead(&List); + InitializeListHead(&DeferredList); DataQueue = (PNP_DATA_QUEUE)Irp->Tail.Overlay.DriverContext[2]; ClientSecurityContext = NULL; @@ -204,7 +202,7 @@ if (DeviceObject) { FsRtlEnterFileSystem(); - ExAcquireResourceExclusiveLite(&NpVcb->Lock, TRUE); + NpAcquireExclusiveVcb(); } DataEntry = (PNP_DATA_QUEUE_ENTRY)Irp->Tail.Overlay.DriverContext[3]; @@ -245,18 +243,18 @@ { if (FirstEntry) { - NpGetNextRealDataQueueEntry(DataQueue, &List); + NpGetNextRealDataQueueEntry(DataQueue, &DeferredList); } if (CompleteWrites) { - NpCompleteStalledWrites(DataQueue, &List); + NpCompleteStalledWrites(DataQueue, &DeferredList); } } } if (DeviceObject) { - ExReleaseResourceLite(&NpVcb->Lock); + NpReleaseVcb(); FsRtlExitFileSystem(); } @@ -266,15 +264,7 @@ Irp->IoStatus.Status = STATUS_CANCELLED; IoCompleteRequest(Irp, IO_NAMED_PIPE_INCREMENT); - NextEntry = List.Flink; - while (NextEntry != &List) - { - ThisEntry = NextEntry; - NextEntry = NextEntry->Flink; - - LocalIrp = CONTAINING_RECORD(ThisEntry, IRP, Tail.Overlay.ListEntry); - IoCompleteRequest(LocalIrp, IO_NAMED_PIPE_INCREMENT); - } + NpCompleteDeferredIrps(&DeferredList); } NTSTATUS Modified: trunk/reactos/drivers/filesystems/npfs_new/fileinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/fileinfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/fileinfo.c [iso-8859-1] Wed Sep 11 17:10:30 2013 @@ -100,30 +100,18 @@ IN PIRP Irp) { NTSTATUS Status; - LIST_ENTRY List; - PLIST_ENTRY NextEntry, ThisEntry; - PIRP LocalIrp; - PAGED_CODE(); - - InitializeListHead(&List); + LIST_ENTRY DeferredList; + PAGED_CODE(); + + InitializeListHead(&DeferredList); FsRtlEnterFileSystem(); - ExAcquireResourceSharedLite(&NpVcb->Lock, TRUE); - - Status = NpCommonSetInformation(DeviceObject, Irp, &List); - - ExReleaseResourceLite(&NpVcb->Lock); - - NextEntry = List.Flink; - while (NextEntry != &List) - { - ThisEntry = NextEntry; - NextEntry = NextEntry->Flink; - - LocalIrp = CONTAINING_RECORD(ThisEntry, IRP, Tail.Overlay.ListEntry); - IoCompleteRequest(LocalIrp, IO_NAMED_PIPE_INCREMENT); - } - + NpAcquireExclusiveVcb(); + + Status = NpCommonSetInformation(DeviceObject, Irp, &DeferredList); + + NpReleaseVcb(); + NpCompleteDeferredIrps(&DeferredList); FsRtlExitFileSystem(); if (Status != STATUS_PENDING) @@ -462,11 +450,11 @@ PAGED_CODE(); FsRtlEnterFileSystem(); - ExAcquireResourceSharedLite(&NpVcb->Lock, TRUE); + NpAcquireSharedVcb(); Status = NpCommonQueryInformation(DeviceObject, Irp); - ExReleaseResourceLite(&NpVcb->Lock); + NpReleaseVcb(); FsRtlExitFileSystem(); if (Status != STATUS_PENDING) Modified: trunk/reactos/drivers/filesystems/npfs_new/flushbuf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/flushbuf.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/flushbuf.c [iso-8859-1] Wed Sep 11 17:10:30 2013 @@ -59,11 +59,11 @@ PAGED_CODE(); FsRtlEnterFileSystem(); - ExAcquireResourceExclusiveLite(&NpVcb->Lock, TRUE); + NpAcquireSharedVcb(); Status = NpCommonFlushBuffers(DeviceObject, Irp); - ExReleaseResourceLite(&NpVcb->Lock); + NpReleaseVcb(); FsRtlExitFileSystem(); return Status; Modified: trunk/reactos/drivers/filesystems/npfs_new/fsctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/fsctrl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/fsctrl.c [iso-8859-1] Wed Sep 11 17:10:30 2013 @@ -569,35 +569,33 @@ { ULONG Fsctl; BOOLEAN Overflow = FALSE; - LIST_ENTRY List; - PLIST_ENTRY NextEntry, ThisEntry; + LIST_ENTRY DeferredList; NTSTATUS Status; - PIRP LocalIrp; - PAGED_CODE(); - - InitializeListHead(&List); + PAGED_CODE(); + + InitializeListHead(&DeferredList); Fsctl = IoGetCurrentIrpStackLocation(Irp)->Parameters.FileSystemControl.FsControlCode; switch (Fsctl) { case FSCTL_PIPE_PEEK: - ExAcquireResourceExclusiveLite(&NpVcb->Lock, TRUE); - Status = NpPeek(DeviceObject, Irp, &List); + NpAcquireExclusiveVcb(); + Status = NpPeek(DeviceObject, Irp, &DeferredList); break; case FSCTL_PIPE_INTERNAL_WRITE: - ExAcquireResourceSharedLite(&NpVcb->Lock, TRUE); - Status = NpInternalWrite(DeviceObject, Irp, &List); + NpAcquireSharedVcb(); + Status = NpInternalWrite(DeviceObject, Irp, &DeferredList); break; case FSCTL_PIPE_TRANSCEIVE: - ExAcquireResourceSharedLite(&NpVcb->Lock, TRUE); - Status = NpTransceive(DeviceObject, Irp, &List); + NpAcquireSharedVcb(); + Status = NpTransceive(DeviceObject, Irp, &DeferredList); break; case FSCTL_PIPE_INTERNAL_TRANSCEIVE: - ExAcquireResourceSharedLite(&NpVcb->Lock, TRUE); - Status = NpInternalTransceive(DeviceObject, Irp, &List); + NpAcquireSharedVcb(); + Status = NpInternalTransceive(DeviceObject, Irp, &DeferredList); break; case FSCTL_PIPE_INTERNAL_READ_OVFLOW: @@ -605,54 +603,54 @@ // on purpose case FSCTL_PIPE_INTERNAL_READ: - ExAcquireResourceSharedLite(&NpVcb->Lock, TRUE); - Status = NpInternalRead(DeviceObject, Irp, Overflow, &List); + NpAcquireSharedVcb(); + Status = NpInternalRead(DeviceObject, Irp, Overflow, &DeferredList); break; case FSCTL_PIPE_QUERY_CLIENT_PROCESS: - ExAcquireResourceSharedLite(&NpVcb->Lock, TRUE); + NpAcquireSharedVcb(); Status = NpQueryClientProcess(DeviceObject, Irp); break; case FSCTL_PIPE_ASSIGN_EVENT: - ExAcquireResourceExclusiveLite(&NpVcb->Lock, TRUE); + NpAcquireExclusiveVcb(); Status = NpAssignEvent(DeviceObject, Irp); break; case FSCTL_PIPE_DISCONNECT: - ExAcquireResourceExclusiveLite(&NpVcb->Lock, TRUE); - Status = NpDisconnect(DeviceObject, Irp, &List); + NpAcquireExclusiveVcb(); + Status = NpDisconnect(DeviceObject, Irp, &DeferredList); break; case FSCTL_PIPE_LISTEN: - ExAcquireResourceSharedLite(&NpVcb->Lock, TRUE); - Status = NpListen(DeviceObject, Irp, &List); + NpAcquireSharedVcb(); + Status = NpListen(DeviceObject, Irp, &DeferredList); break; case FSCTL_PIPE_QUERY_EVENT: - ExAcquireResourceExclusiveLite(&NpVcb->Lock, TRUE); + NpAcquireExclusiveVcb(); Status = NpQueryEvent(DeviceObject, Irp); break; case FSCTL_PIPE_WAIT: - ExAcquireResourceExclusiveLite(&NpVcb->Lock, TRUE); + NpAcquireExclusiveVcb(); Status = NpWaitForNamedPipe(DeviceObject, Irp); break; case FSCTL_PIPE_IMPERSONATE: - ExAcquireResourceExclusiveLite(&NpVcb->Lock, TRUE); + NpAcquireExclusiveVcb(); Status = NpImpersonate(DeviceObject, Irp); break; case FSCTL_PIPE_SET_CLIENT_PROCESS: - ExAcquireResourceExclusiveLite(&NpVcb->Lock, TRUE); + NpAcquireExclusiveVcb(); Status = NpSetClientProcess(DeviceObject, Irp); break; @@ -660,17 +658,8 @@ return STATUS_NOT_SUPPORTED; } - ExReleaseResourceLite(&NpVcb->Lock); - - NextEntry = List.Flink; - while (NextEntry != &List) - { - ThisEntry = NextEntry; - NextEntry = NextEntry->Flink; - - LocalIrp = CONTAINING_RECORD(ThisEntry, IRP, Tail.Overlay.ListEntry); - IoCompleteRequest(LocalIrp, IO_NAMED_PIPE_INCREMENT); - } + NpReleaseVcb(); + NpCompleteDeferredIrps(&DeferredList); return Status; } Modified: trunk/reactos/drivers/filesystems/npfs_new/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/main.c [iso-8859-1] Wed Sep 11 17:10:30 2013 @@ -40,8 +40,8 @@ DriverObject->MajorFunction[IRP_MJ_FLUSH_BUFFERS] = NpFsdFlushBuffers; DriverObject->MajorFunction[IRP_MJ_DIRECTORY_CONTROL] = NpFsdDirectoryControl; DriverObject->MajorFunction[IRP_MJ_FILE_SYSTEM_CONTROL] = NpFsdFileSystemControl; - DriverObject->MajorFunction[IRP_MJ_QUERY_SECURITY] = NpFsdQuerySecurity; - DriverObject->MajorFunction[IRP_MJ_SET_SECURITY] = NpFsdSetSecurity; + DriverObject->MajorFunction[IRP_MJ_QUERY_SECURITY] = NpFsdQuerySecurityInfo; + DriverObject->MajorFunction[IRP_MJ_SET_SECURITY] = NpFsdSetSecurityInfo; DriverObject->DriverUnload = NULL; Modified: trunk/reactos/drivers/filesystems/npfs_new/npfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/npfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/npfs.h [iso-8859-1] Wed Sep 11 17:10:30 2013 @@ -263,6 +263,60 @@ extern PNP_VCB NpVcb; +// +// Functions to lock/unlock the global VCB lock +// +FORCEINLINE +VOID +NpAcquireSharedVcb(VOID) +{ + /* Acquire the lock in shared mode */ + ExAcquireResourceSharedLite(&NpVcb->Lock, TRUE); +} + +FORCEINLINE +VOID +NpAcquireExclusiveVcb(VOID) +{ + /* Acquire the lock in exclusive mode */ + ExAcquireResourceExclusiveLite(&NpVcb->Lock, TRUE); +} + +FORCEINLINE +VOID +NpReleaseVcb(VOID) +{ + /* Release the lock */ + ExReleaseResourceLite(&NpVcb->Lock); +} + +// +// Function to process deferred IRPs outside the VCB lock but still within the +// critical region +// +VOID +FORCEINLINE +NpCompleteDeferredIrps(IN PLIST_ENTRY DeferredList) +{ + PLIST_ENTRY ThisEntry, NextEntry; + PIRP Irp; + + /* Loop the list */ + ThisEntry = DeferredList->Flink; + while (ThisEntry != DeferredList) + { + /* Remember the next entry, but don't switch to it yet */ + NextEntry = ThisEntry->Flink; + + /* Complete the IRP for this entry */ + Irp = CONTAINING_RECORD(ThisEntry, IRP, Tail.Overlay.ListEntry); + IoCompleteRequest(Irp, IO_NAMED_PIPE_INCREMENT); + + /* And now switch to the next one */ + ThisEntry = NextEntry; + } +} + BOOLEAN NTAPI NpDeleteEventTableEntry(IN PRTL_GENERIC_TABLE Table, @@ -533,13 +587,13 @@ NTSTATUS NTAPI -NpFsdQuerySecurity(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); - -NTSTATUS -NTAPI -NpFsdSetSecurity(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); +NpFsdQuerySecurityInfo(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +NTSTATUS +NTAPI +NpFsdSetSecurityInfo(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); NTSTATUS NTAPI Modified: trunk/reactos/drivers/filesystems/npfs_new/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/read.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/read.c [iso-8859-1] Wed Sep 11 17:10:30 2013 @@ -142,37 +142,25 @@ { PIO_STACK_LOCATION IoStack; IO_STATUS_BLOCK IoStatus; - LIST_ENTRY List; - PLIST_ENTRY NextEntry, ThisEntry; - PIRP LocalIrp; + LIST_ENTRY DeferredList; PAGED_CODE(); NpSlowReadCalls++; - InitializeListHead(&List); + InitializeListHead(&DeferredList); IoStack = IoGetCurrentIrpStackLocation(Irp); FsRtlEnterFileSystem(); - ExAcquireResourceSharedLite(&NpVcb->Lock, TRUE); + NpAcquireSharedVcb(); NpCommonRead(IoStack->FileObject, Irp->UserBuffer, IoStack->Parameters.Read.Length, &IoStatus, Irp, - &List); + &DeferredList); - ExReleaseResourceLite(&NpVcb->Lock); - - NextEntry = List.Flink; - while (NextEntry != &List) - { - ThisEntry = NextEntry; - NextEntry = NextEntry->Flink; - - LocalIrp = CONTAINING_RECORD(ThisEntry, IRP, Tail.Overlay.ListEntry); - IoCompleteRequest(LocalIrp, IO_NAMED_PIPE_INCREMENT); - } - + NpReleaseVcb(); + NpCompleteDeferredIrps(&DeferredList); FsRtlExitFileSystem(); if (IoStatus.Status != STATUS_PENDING) Modified: trunk/reactos/drivers/filesystems/npfs_new/seinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/seinfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/seinfo.c [iso-8859-1] Wed Sep 11 17:10:30 2013 @@ -78,18 +78,18 @@ NTSTATUS NTAPI -NpFsdQuerySecurity(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) +NpFsdQuerySecurityInfo(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) { NTSTATUS Status; PAGED_CODE(); FsRtlEnterFileSystem(); - ExAcquireResourceSharedLite(&NpVcb->Lock, TRUE); + NpAcquireExclusiveVcb(); Status = NpCommonQuerySecurityInfo(DeviceObject, Irp); - ExReleaseResourceLite(&NpVcb->Lock); + NpReleaseVcb(); FsRtlExitFileSystem(); if (Status != STATUS_PENDING) @@ -103,18 +103,18 @@ NTSTATUS NTAPI -NpFsdSetSecurity(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) +NpFsdSetSecurityInfo(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) { NTSTATUS Status; PAGED_CODE(); FsRtlEnterFileSystem(); - ExAcquireResourceSharedLite(&NpVcb->Lock, TRUE); + NpAcquireExclusiveVcb(); Status = NpCommonQuerySecurityInfo(DeviceObject, Irp); - ExReleaseResourceLite(&NpVcb->Lock); + NpReleaseVcb(); FsRtlExitFileSystem(); if (Status != STATUS_PENDING) Modified: trunk/reactos/drivers/filesystems/npfs_new/statesup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/statesup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/statesup.c [iso-8859-1] Wed Sep 11 17:10:30 2013 @@ -6,12 +6,12 @@ IN PIRP Irp) { FsRtlEnterFileSystem(); - ExAcquireResourceExclusiveLite(&NpVcb->Lock, TRUE); + NpAcquireExclusiveVcb(); RemoveEntryList(&Irp->Tail.Overlay.ListEntry); FsRtlExitFileSystem(); - ExReleaseResourceLite(&NpVcb->Lock); + NpReleaseVcb(); Irp->IoStatus.Status = STATUS_CANCELLED; IoCompleteRequest(Irp, IO_NAMED_PIPE_INCREMENT); Modified: trunk/reactos/drivers/filesystems/npfs_new/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/write.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/write.c [iso-8859-1] Wed Sep 11 17:10:30 2013 @@ -156,17 +156,15 @@ { PIO_STACK_LOCATION IoStack; IO_STATUS_BLOCK IoStatus; - LIST_ENTRY List; - PLIST_ENTRY NextEntry, ThisEntry; - PIRP ListIrp; + LIST_ENTRY DeferredList; PAGED_CODE(); NpSlowWriteCalls++; - InitializeListHead(&List); + InitializeListHead(&DeferredList); IoStack = IoGetCurrentIrpStackLocation(Irp); FsRtlEnterFileSystem(); - ExAcquireResourceSharedLite(&NpVcb->Lock, TRUE); + NpAcquireSharedVcb(); NpCommonWrite(IoStack->FileObject, Irp->UserBuffer, @@ -174,20 +172,10 @@ Irp->Tail.Overlay.Thread, &IoStatus, Irp, - &List); + &DeferredList); - ExReleaseResourceLite(&NpVcb->Lock); - - NextEntry = List.Flink; - while (NextEntry != &List) - { - ThisEntry = NextEntry; - NextEntry = NextEntry->Flink; - - ListIrp = CONTAINING_RECORD(ThisEntry, IRP, Tail.Overlay.ListEntry); - IoCompleteRequest(ListIrp, IO_NAMED_PIPE_INCREMENT); - } - + NpReleaseVcb(); + NpCompleteDeferredIrps(&DeferredList); FsRtlExitFileSystem(); if (IoStatus.Status != STATUS_PENDING)

1 0

[akhaldi] 60033: [SCRRUN] * Import from Wine 1.7.1.
by akhaldi＠svn.reactos.org 11 Sep '13

11 Sep '13

Author: akhaldi Date: Wed Sep 11 12:44:58 2013 New Revision: 60033 URL: http://svn.reactos.org/svn/reactos?rev=60033&view=rev Log: [SCRRUN] * Import from Wine 1.7.1. Added: trunk/reactos/dll/win32/scrrun/ (with props) trunk/reactos/dll/win32/scrrun/CMakeLists.txt (with props) trunk/reactos/dll/win32/scrrun/dictionary.c (with props) trunk/reactos/dll/win32/scrrun/filesystem.c (with props) trunk/reactos/dll/win32/scrrun/scrrun.c (with props) trunk/reactos/dll/win32/scrrun/scrrun.idl (with props) trunk/reactos/dll/win32/scrrun/scrrun.rc (with props) trunk/reactos/dll/win32/scrrun/scrrun.rgs (with props) trunk/reactos/dll/win32/scrrun/scrrun.spec (with props) trunk/reactos/dll/win32/scrrun/scrrun_private.h (with props) trunk/reactos/dll/win32/scrrun/scrrun_tlb.rgs (with props) Modified: trunk/reactos/dll/win32/CMakeLists.txt trunk/reactos/media/doc/README.WINE trunk/reactos/media/inf/syssetup.inf [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/CMakeLists.txt?r… Added: trunk/reactos/dll/win32/scrrun/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/scrrun/CMakeList… Added: trunk/reactos/dll/win32/scrrun/dictionary.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/scrrun/dictionar… Added: trunk/reactos/dll/win32/scrrun/filesystem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/scrrun/filesyste… Added: trunk/reactos/dll/win32/scrrun/scrrun.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/scrrun/scrrun.c?… Added: trunk/reactos/dll/win32/scrrun/scrrun.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/scrrun/scrrun.id… Added: trunk/reactos/dll/win32/scrrun/scrrun.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/scrrun/scrrun.rc… Added: trunk/reactos/dll/win32/scrrun/scrrun.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/scrrun/scrrun.rg… Added: trunk/reactos/dll/win32/scrrun/scrrun.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/scrrun/scrrun.sp… Added: trunk/reactos/dll/win32/scrrun/scrrun_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/scrrun/scrrun_pr… Added: trunk/reactos/dll/win32/scrrun/scrrun_tlb.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/scrrun/scrrun_tl… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… Modified: trunk/reactos/media/inf/syssetup.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/syssetup.inf?rev…

1 0

[akhaldi] 60032: [KERNEL32_WINETEST] * Sync with Wine 1.7.1.
by akhaldi＠svn.reactos.org 11 Sep '13

11 Sep '13

Author: akhaldi Date: Wed Sep 11 11:32:57 2013 New Revision: 60032 URL: http://svn.reactos.org/svn/reactos?rev=60032&view=rev Log: [KERNEL32_WINETEST] * Sync with Wine 1.7.1. Modified: trunk/rostests/winetests/kernel32/actctx.c trunk/rostests/winetests/kernel32/codepage.c trunk/rostests/winetests/kernel32/comm.c trunk/rostests/winetests/kernel32/console.c trunk/rostests/winetests/kernel32/debugger.c trunk/rostests/winetests/kernel32/drive.c trunk/rostests/winetests/kernel32/file.c trunk/rostests/winetests/kernel32/heap.c trunk/rostests/winetests/kernel32/loader.c trunk/rostests/winetests/kernel32/locale.c trunk/rostests/winetests/kernel32/path.c trunk/rostests/winetests/kernel32/process.c trunk/rostests/winetests/kernel32/sync.c trunk/rostests/winetests/kernel32/thread.c trunk/rostests/winetests/kernel32/time.c trunk/rostests/winetests/kernel32/virtual.c trunk/rostests/winetests/kernel32/volume.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/kernel32/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/actctx… Modified: trunk/rostests/winetests/kernel32/codepage.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/codepa… Modified: trunk/rostests/winetests/kernel32/comm.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/comm.c… Modified: trunk/rostests/winetests/kernel32/console.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/consol… Modified: trunk/rostests/winetests/kernel32/debugger.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/debugg… Modified: trunk/rostests/winetests/kernel32/drive.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/drive.… Modified: trunk/rostests/winetests/kernel32/file.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/file.c… Modified: trunk/rostests/winetests/kernel32/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/heap.c… Modified: trunk/rostests/winetests/kernel32/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/loader… Modified: trunk/rostests/winetests/kernel32/locale.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/locale… Modified: trunk/rostests/winetests/kernel32/path.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/path.c… Modified: trunk/rostests/winetests/kernel32/process.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/proces… Modified: trunk/rostests/winetests/kernel32/sync.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/sync.c… Modified: trunk/rostests/winetests/kernel32/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/thread… Modified: trunk/rostests/winetests/kernel32/time.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/time.c… Modified: trunk/rostests/winetests/kernel32/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/virtua… Modified: trunk/rostests/winetests/kernel32/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/volume…

1 0

[akhaldi] 60031: [WINE/INCLUDES] * Update Wine's atlbase.h.
by akhaldi＠svn.reactos.org 11 Sep '13

11 Sep '13

Author: akhaldi Date: Wed Sep 11 11:09:23 2013 New Revision: 60031 URL: http://svn.reactos.org/svn/reactos?rev=60031&view=rev Log: [WINE/INCLUDES] * Update Wine's atlbase.h. Modified: trunk/reactos/include/reactos/wine/atlbase.h Modified: trunk/reactos/include/reactos/wine/atlbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/atlba… ============================================================================== --- trunk/reactos/include/reactos/wine/atlbase.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/atlbase.h [iso-8859-1] Wed Sep 11 11:09:23 2013 @@ -22,6 +22,17 @@ #define __WINE_ATLBASE_H__ #include <atliface.h> +#include <comcat.h> + +/* Wine extension: we (ab)use _ATL_VER to handle struct layout differences between ATL versions. */ +#define _ATL_VER_30 0x0300 +#define _ATL_VER_70 0x0700 +#define _ATL_VER_80 0x0800 +#define _ATL_VER_100 0x0a00 + +#ifndef _ATL_VER +#define _ATL_VER _ATL_VER_100 +#endif typedef HRESULT (WINAPI _ATL_CREATORFUNC)(void* pv, REFIID riid, LPVOID* ppv); typedef HRESULT (WINAPI _ATL_CREATORARGFUNC)(void* pv, REFIID riid, LPVOID* ppv, DWORD dw); @@ -31,6 +42,8 @@ typedef const struct _ATL_CATMAP_ENTRY* (_ATL_CATMAPFUNC)(void); typedef void (WINAPI _ATL_TERMFUNC)(DWORD dw); +typedef CRITICAL_SECTION CComCriticalSection; + typedef struct _ATL_OBJMAP_ENTRYA_V1_TAG { const CLSID* pclsid; @@ -77,7 +90,7 @@ _ATL_DESCRIPTIONFUNCW* pfnGetObjectDescription; _ATL_CATMAPFUNC* pfnGetCategoryMap; void (WINAPI *pfnObjectMain)(BOOL bStarting); -} _ATL_OBJMAP_ENTRYW; +} _ATL_OBJMAP_ENTRYW, _ATL_OBJMAP_ENTRY30, _ATL_OBJMAP_ENTRY; typedef struct _ATL_TERMFUNC_ELEM_TAG @@ -148,6 +161,46 @@ _ATL_TERMFUNC_ELEM* m_pTermFuncs; } _ATL_MODULEW; +typedef struct +{ + void *m_aT; + int m_nSize; + int m_nAllocSize; +} CSimpleArray; + +typedef struct _ATL_MODULE70 +{ + UINT cbSize; + LONG m_nLockCnt; + _ATL_TERMFUNC_ELEM *m_pTermFuncs; + CComCriticalSection m_csStaticDataInitAndTypeInfo; +} _ATL_MODULE70; + +typedef struct _ATL_WIN_MODULE70 +{ + UINT cbSize; + CComCriticalSection m_csWindowCreate; + _AtlCreateWndData *m_pCreateWndList; + CSimpleArray /* <ATOM> */ m_rgWindowClassAtoms; +} _ATL_WIN_MODULE70; + +typedef struct _ATL_COM_MODULE70 +{ + UINT cbSize; + HINSTANCE m_hInstTypeLib; + _ATL_OBJMAP_ENTRY **m_ppAutoObjMapFirst; + _ATL_OBJMAP_ENTRY **m_ppAutoObjMapLast; + CComCriticalSection m_csObjMap; +} _ATL_COM_MODULE70, _ATL_COM_MODULE; + +#if _ATL_VER >= _ATL_VER_70 +typedef _ATL_MODULE70 _ATL_MODULE; +typedef _ATL_WIN_MODULE70 _ATL_WIN_MODULE; +#else +typedef _ATL_MODULEW _ATL_MODULE; +typedef _ATL_MODULEW _ATL_WIN_MODULE; +#endif + typedef struct _ATL_INTMAP_ENTRY_TAG { const IID* piid; @@ -160,6 +213,16 @@ LPCOLESTR szKey; LPCOLESTR szData; }; + +struct _ATL_CATMAP_ENTRY +{ + int iType; + const CATID *pcatid; +}; + +#define _ATL_CATMAP_ENTRY_END 0 +#define _ATL_CATMAP_ENTRY_IMPLEMENTED 1 +#define _ATL_CATMAP_ENTRY_REQUIRED 2 HRESULT WINAPI AtlAdvise(IUnknown *pUnkCP, IUnknown *pUnk, const IID * iid, LPDWORD dpw); HRESULT WINAPI AtlAxAttachControl(IUnknown*,HWND,IUnknown**); @@ -169,7 +232,11 @@ HRESULT WINAPI AtlInternalQueryInterface(void* pThis, const _ATL_INTMAP_ENTRY* pEntries, REFIID iid, void** ppvObject); HRESULT WINAPI AtlMarshalPtrInProc(IUnknown *pUnk, const IID *iid, IStream **ppStream); void WINAPI AtlModuleAddCreateWndData(_ATL_MODULEW *pM, _AtlCreateWndData *pData, void* pvObject); -HRESULT WINAPI AtlModuleAddTermFunc(_ATL_MODULEW *pM, _ATL_TERMFUNC *pFunc, DWORD_PTR dw); +HRESULT WINAPI AtlWinModuleInit(_ATL_WIN_MODULE*); +void WINAPI AtlWinModuleAddCreateWndData(_ATL_WIN_MODULE*,_AtlCreateWndData*,void*); +void* WINAPI AtlWinModuleExtractCreateWndData(_ATL_WIN_MODULE*); +HRESULT WINAPI AtlModuleAddTermFunc(_ATL_MODULE *pM, _ATL_TERMFUNC *pFunc, DWORD_PTR dw); +void WINAPI AtlCallTermFunc(_ATL_MODULE*); void* WINAPI AtlModuleExtractCreateWndData(_ATL_MODULEW *pM); HRESULT WINAPI AtlModuleInit(_ATL_MODULEW* pM, _ATL_OBJMAP_ENTRYW* p, HINSTANCE h); HRESULT WINAPI AtlModuleLoadTypeLib(_ATL_MODULEW *pM, LPCOLESTR lpszIndex, BSTR *pbstrPath, ITypeLib **ppTypeLib); @@ -183,5 +250,16 @@ HRESULT WINAPI AtlUnadvise(IUnknown *pUnkCP, const IID * iid, DWORD dw); HRESULT WINAPI AtlUnmarshalPtr(IStream *pStream, const IID *iid, IUnknown **ppUnk); HRESULT WINAPI AtlCreateRegistrar(IRegistrar**); +HRESULT WINAPI AtlUpdateRegistryFromResourceD(HINSTANCE,LPCOLESTR,BOOL,struct _ATL_REGMAP_ENTRY*,IRegistrar*); +HRESULT WINAPI AtlLoadTypeLib(HINSTANCE,LPCOLESTR,BSTR*,ITypeLib**); +HRESULT WINAPI AtlRegisterTypeLib(HINSTANCE,LPCOLESTR); +HRESULT WINAPI AtlRegisterClassCategoriesHelper(REFCLSID,const struct _ATL_CATMAP_ENTRY*,BOOL); +HRESULT WINAPI AtlComModuleGetClassObject(_ATL_COM_MODULE*,REFCLSID,REFIID,void**); +HRESULT WINAPI AtlComModuleRegisterClassObjects(_ATL_COM_MODULE*,DWORD,DWORD); +HRESULT WINAPI AtlComModuleUnregisterServer(_ATL_COM_MODULE*,BOOL,const CLSID*); +BOOL WINAPI AtlWaitWithMessageLoop(HANDLE); +HRESULT WINAPI AtlGetObjectSourceInterface(IUnknown*,GUID*,IID*,unsigned short*,unsigned short*); +HRESULT WINAPI AtlSetPerUserRegistration(unsigned char /*bool*/); +HRESULT WINAPI AtlGetPerUserRegistration(unsigned char /*bool*/ *); #endif /* __WINE_ATLBASE_H__ */

1 0

[akhaldi] 60030: [COMDLG32] * Move the resource files to the appropriate folders.
by akhaldi＠svn.reactos.org 11 Sep '13

11 Sep '13

Author: akhaldi Date: Wed Sep 11 10:46:07 2013 New Revision: 60030 URL: http://svn.reactos.org/svn/reactos?rev=60030&view=rev Log: [COMDLG32] * Move the resource files to the appropriate folders. Added: trunk/reactos/dll/win32/comdlg32/lang/ (with props) trunk/reactos/dll/win32/comdlg32/lang/cdlg_Bg.rc - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/cdlg_Bg.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ca.rc - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/cdlg_Ca.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Cs.rc - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/cdlg_Cs.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Da.rc - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/cdlg_Da.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_De.rc - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/cdlg_De.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_El.rc - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/cdlg_El.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_En.rc - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/cdlg_En.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Eo.rc - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/cdlg_Eo.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Es.rc - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/cdlg_Es.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Fi.rc - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/cdlg_Fi.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Fr.rc - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/cdlg_Fr.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_He.rc - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/cdlg_He.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Hu.rc - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/cdlg_Hu.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_It.rc - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/cdlg_It.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ja.rc - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/cdlg_Ja.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ko.rc - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/cdlg_Ko.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Lt.rc - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/cdlg_Lt.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Nl.rc - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/cdlg_Nl.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_No.rc - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/cdlg_No.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Pl.rc - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/cdlg_Pl.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Pt.rc - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/cdlg_Pt.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ro.rc - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/cdlg_Ro.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ru.rc - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/cdlg_Ru.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Si.rc - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/cdlg_Si.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Sk.rc - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/cdlg_Sk.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Sr.rc - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/cdlg_Sr.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Sv.rc - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/cdlg_Sv.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Th.rc - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/cdlg_Th.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Tr.rc - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/cdlg_Tr.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Tw.rc - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/cdlg_Tw.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Uk.rc - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/cdlg_Uk.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Zh.rc - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/cdlg_Zh.rc trunk/reactos/dll/win32/comdlg32/res/ (with props) trunk/reactos/dll/win32/comdlg32/res/bitmaps/ (with props) trunk/reactos/dll/win32/comdlg32/res/bitmaps/800.bmp - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/800.bmp trunk/reactos/dll/win32/comdlg32/res/bitmaps/fontpics.bmp - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/fontpics.bmp trunk/reactos/dll/win32/comdlg32/res/icons/ (with props) trunk/reactos/dll/win32/comdlg32/res/icons/cdrom.ico - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/cdrom.ico trunk/reactos/dll/win32/comdlg32/res/icons/floppy.ico - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/floppy.ico trunk/reactos/dll/win32/comdlg32/res/icons/folder.ico - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/folder.ico trunk/reactos/dll/win32/comdlg32/res/icons/folder2.ico - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/folder2.ico trunk/reactos/dll/win32/comdlg32/res/icons/hdisk.ico - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/hdisk.ico trunk/reactos/dll/win32/comdlg32/res/icons/network.ico - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/network.ico trunk/reactos/dll/win32/comdlg32/res/icons/pd32_collate.ico - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/pd32_collate.ico trunk/reactos/dll/win32/comdlg32/res/icons/pd32_landscape.ico - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/pd32_landscape.ico trunk/reactos/dll/win32/comdlg32/res/icons/pd32_nocollate.ico - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/pd32_nocollate.ico trunk/reactos/dll/win32/comdlg32/res/icons/pd32_portrait.ico - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/pd32_portrait.ico Removed: trunk/reactos/dll/win32/comdlg32/800.bmp trunk/reactos/dll/win32/comdlg32/cdlg_Bg.rc trunk/reactos/dll/win32/comdlg32/cdlg_Ca.rc trunk/reactos/dll/win32/comdlg32/cdlg_Cs.rc trunk/reactos/dll/win32/comdlg32/cdlg_Da.rc trunk/reactos/dll/win32/comdlg32/cdlg_De.rc trunk/reactos/dll/win32/comdlg32/cdlg_El.rc trunk/reactos/dll/win32/comdlg32/cdlg_En.rc trunk/reactos/dll/win32/comdlg32/cdlg_Eo.rc trunk/reactos/dll/win32/comdlg32/cdlg_Es.rc trunk/reactos/dll/win32/comdlg32/cdlg_Fi.rc trunk/reactos/dll/win32/comdlg32/cdlg_Fr.rc trunk/reactos/dll/win32/comdlg32/cdlg_He.rc trunk/reactos/dll/win32/comdlg32/cdlg_Hu.rc trunk/reactos/dll/win32/comdlg32/cdlg_It.rc trunk/reactos/dll/win32/comdlg32/cdlg_Ja.rc trunk/reactos/dll/win32/comdlg32/cdlg_Ko.rc trunk/reactos/dll/win32/comdlg32/cdlg_Lt.rc trunk/reactos/dll/win32/comdlg32/cdlg_Nl.rc trunk/reactos/dll/win32/comdlg32/cdlg_No.rc trunk/reactos/dll/win32/comdlg32/cdlg_Pl.rc trunk/reactos/dll/win32/comdlg32/cdlg_Pt.rc trunk/reactos/dll/win32/comdlg32/cdlg_Ro.rc trunk/reactos/dll/win32/comdlg32/cdlg_Ru.rc trunk/reactos/dll/win32/comdlg32/cdlg_Si.rc trunk/reactos/dll/win32/comdlg32/cdlg_Sk.rc trunk/reactos/dll/win32/comdlg32/cdlg_Sr.rc trunk/reactos/dll/win32/comdlg32/cdlg_Sv.rc trunk/reactos/dll/win32/comdlg32/cdlg_Th.rc trunk/reactos/dll/win32/comdlg32/cdlg_Tr.rc trunk/reactos/dll/win32/comdlg32/cdlg_Tw.rc trunk/reactos/dll/win32/comdlg32/cdlg_Uk.rc trunk/reactos/dll/win32/comdlg32/cdlg_Zh.rc trunk/reactos/dll/win32/comdlg32/cdrom.ico trunk/reactos/dll/win32/comdlg32/floppy.ico trunk/reactos/dll/win32/comdlg32/folder.ico trunk/reactos/dll/win32/comdlg32/folder2.ico trunk/reactos/dll/win32/comdlg32/fontpics.bmp trunk/reactos/dll/win32/comdlg32/hdisk.ico trunk/reactos/dll/win32/comdlg32/network.ico trunk/reactos/dll/win32/comdlg32/pd32_collate.ico trunk/reactos/dll/win32/comdlg32/pd32_landscape.ico trunk/reactos/dll/win32/comdlg32/pd32_nocollate.ico trunk/reactos/dll/win32/comdlg32/pd32_portrait.ico Modified: trunk/reactos/dll/win32/comdlg32/cdlg_xx.rc trunk/reactos/dll/win32/comdlg32/rsrc.rc [This mail would be too long, it was shortened to contain the URLs only.] Removed: trunk/reactos/dll/win32/comdlg32/800.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/800.bmp… Removed: trunk/reactos/dll/win32/comdlg32/cdlg_Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Bg… Removed: trunk/reactos/dll/win32/comdlg32/cdlg_Ca.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Ca… Removed: trunk/reactos/dll/win32/comdlg32/cdlg_Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Cs… Removed: trunk/reactos/dll/win32/comdlg32/cdlg_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Da… Removed: trunk/reactos/dll/win32/comdlg32/cdlg_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_De… Removed: trunk/reactos/dll/win32/comdlg32/cdlg_El.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_El… Removed: trunk/reactos/dll/win32/comdlg32/cdlg_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_En… Removed: trunk/reactos/dll/win32/comdlg32/cdlg_Eo.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Eo… Removed: trunk/reactos/dll/win32/comdlg32/cdlg_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Es… Removed: trunk/reactos/dll/win32/comdlg32/cdlg_Fi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Fi… Removed: trunk/reactos/dll/win32/comdlg32/cdlg_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Fr… Removed: trunk/reactos/dll/win32/comdlg32/cdlg_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_He… Removed: trunk/reactos/dll/win32/comdlg32/cdlg_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Hu… Removed: trunk/reactos/dll/win32/comdlg32/cdlg_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_It… Removed: trunk/reactos/dll/win32/comdlg32/cdlg_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Ja… Removed: trunk/reactos/dll/win32/comdlg32/cdlg_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Ko… Removed: trunk/reactos/dll/win32/comdlg32/cdlg_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Lt… Removed: trunk/reactos/dll/win32/comdlg32/cdlg_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Nl… Removed: trunk/reactos/dll/win32/comdlg32/cdlg_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_No… Removed: trunk/reactos/dll/win32/comdlg32/cdlg_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Pl… Removed: trunk/reactos/dll/win32/comdlg32/cdlg_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Pt… Removed: trunk/reactos/dll/win32/comdlg32/cdlg_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Ro… Removed: trunk/reactos/dll/win32/comdlg32/cdlg_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Ru… Removed: trunk/reactos/dll/win32/comdlg32/cdlg_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Si… Removed: trunk/reactos/dll/win32/comdlg32/cdlg_Sk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Sk… Removed: trunk/reactos/dll/win32/comdlg32/cdlg_Sr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Sr… Removed: trunk/reactos/dll/win32/comdlg32/cdlg_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Sv… Removed: trunk/reactos/dll/win32/comdlg32/cdlg_Th.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Th… Removed: trunk/reactos/dll/win32/comdlg32/cdlg_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Tr… Removed: trunk/reactos/dll/win32/comdlg32/cdlg_Tw.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Tw… Removed: trunk/reactos/dll/win32/comdlg32/cdlg_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Uk… Removed: trunk/reactos/dll/win32/comdlg32/cdlg_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Zh… Modified: trunk/reactos/dll/win32/comdlg32/cdlg_xx.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_xx… Removed: trunk/reactos/dll/win32/comdlg32/cdrom.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdrom.i… Removed: trunk/reactos/dll/win32/comdlg32/floppy.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/floppy.… Removed: trunk/reactos/dll/win32/comdlg32/folder.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/folder.… Removed: trunk/reactos/dll/win32/comdlg32/folder2.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/folder2… Removed: trunk/reactos/dll/win32/comdlg32/fontpics.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/fontpic… Removed: trunk/reactos/dll/win32/comdlg32/hdisk.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/hdisk.i… Removed: trunk/reactos/dll/win32/comdlg32/network.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/network… Removed: trunk/reactos/dll/win32/comdlg32/pd32_collate.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/pd32_co… Removed: trunk/reactos/dll/win32/comdlg32/pd32_landscape.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/pd32_la… Removed: trunk/reactos/dll/win32/comdlg32/pd32_nocollate.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/pd32_no… Removed: trunk/reactos/dll/win32/comdlg32/pd32_portrait.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/pd32_po… Modified: trunk/reactos/dll/win32/comdlg32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/rsrc.rc…

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs