Ros-diffs March 2006

ros-diffs@reactos.org

2 participants
67 discussions

[mbosma] 21400: Unify coding style using GNU Indent

by aleksey＠studiocerebral.com

Author: mbosma Date: Mon Mar 27 22:17:12 2006 New Revision: 21400 URL: http://svn.reactos.ru/svn/reactos?rev=21400&view=rev Log: Unify coding style using GNU Indent Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/cc/cacheman.c branches/cache_manager_rewrite/reactos/ntoskrnl/cc/copy.c branches/cache_manager_rewrite/reactos/ntoskrnl/cc/fs.c branches/cache_manager_rewrite/reactos/ntoskrnl/cc/mdl.c branches/cache_manager_rewrite/reactos/ntoskrnl/cc/pin.c branches/cache_manager_rewrite/reactos/ntoskrnl/cc/view.c Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/cc/cacheman.c URL: http://svn.reactos.ru/svn/reactos/branches/cache_manager_rewrite/reactos/nt… ============================================================================== --- branches/cache_manager_rewrite/reactos/ntoskrnl/cc/cacheman.c (original) +++ branches/cache_manager_rewrite/reactos/ntoskrnl/cc/cacheman.c Mon Mar 27 22:17:12 2006 @@ -16,41 +16,34 @@ /* FUNCTIONS *****************************************************************/ -VOID -NTAPI -CcInit(VOID) +VOID NTAPI +CcInit (VOID) { - CcInitView(); + CcInitView (); } /* * @unimplemented */ -LARGE_INTEGER -STDCALL -CcGetFlushedValidData ( - IN PSECTION_OBJECT_POINTERS SectionObjectPointer, - IN BOOLEAN BcbListHeld - ) +LARGE_INTEGER STDCALL +CcGetFlushedValidData (IN PSECTION_OBJECT_POINTERS SectionObjectPointer, + IN BOOLEAN BcbListHeld) { - LARGE_INTEGER i; + LARGE_INTEGER i; - UNIMPLEMENTED; + UNIMPLEMENTED; - i.QuadPart = 0; - return i; + i.QuadPart = 0; + return i; } /* * @unimplemented */ -PVOID -STDCALL -CcRemapBcb ( - IN PVOID Bcb - ) +PVOID STDCALL +CcRemapBcb (IN PVOID Bcb) { - UNIMPLEMENTED; + UNIMPLEMENTED; return 0; } @@ -58,66 +51,51 @@ /* * @unimplemented */ -VOID -STDCALL -CcScheduleReadAhead ( - IN PFILE_OBJECT FileObject, - IN PLARGE_INTEGER FileOffset, - IN ULONG Length - ) +VOID STDCALL +CcScheduleReadAhead (IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, + IN ULONG Length) { - UNIMPLEMENTED; + UNIMPLEMENTED; } /* * @unimplemented */ -VOID -STDCALL -CcSetAdditionalCacheAttributes ( - IN PFILE_OBJECT FileObject, - IN BOOLEAN DisableReadAhead, - IN BOOLEAN DisableWriteBehind - ) +VOID STDCALL +CcSetAdditionalCacheAttributes (IN PFILE_OBJECT FileObject, + IN BOOLEAN DisableReadAhead, + IN BOOLEAN DisableWriteBehind) { - UNIMPLEMENTED; + UNIMPLEMENTED; } /* * @unimplemented */ -VOID -STDCALL -CcSetBcbOwnerPointer ( - IN PVOID Bcb, - IN PVOID Owner - ) +VOID STDCALL +CcSetBcbOwnerPointer (IN PVOID Bcb, + IN PVOID Owner) { - UNIMPLEMENTED; + UNIMPLEMENTED; } /* * @unimplemented */ -VOID -STDCALL -CcSetDirtyPageThreshold ( - IN PFILE_OBJECT FileObject, - IN ULONG DirtyPageThreshold - ) +VOID STDCALL +CcSetDirtyPageThreshold (IN PFILE_OBJECT FileObject, + IN ULONG DirtyPageThreshold) { - UNIMPLEMENTED; + UNIMPLEMENTED; } /* * @unimplemented */ -VOID -STDCALL -CcSetReadAheadGranularity ( - IN PFILE_OBJECT FileObject, - IN ULONG Granularity - ) +VOID STDCALL +CcSetReadAheadGranularity (IN PFILE_OBJECT FileObject, + IN ULONG Granularity) { - UNIMPLEMENTED; + UNIMPLEMENTED; } Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/cc/copy.c URL: http://svn.reactos.ru/svn/reactos/branches/cache_manager_rewrite/reactos/nt… ============================================================================== --- branches/cache_manager_rewrite/reactos/ntoskrnl/cc/copy.c (original) +++ branches/cache_manager_rewrite/reactos/ntoskrnl/cc/copy.c Mon Mar 27 22:17:12 2006 @@ -18,13 +18,13 @@ static PFN_TYPE CcZeroPage = 0; -#define MAX_ZERO_LENGTH (256 * 1024) -#define MAX_RW_LENGTH (256 * 1024) +#define MAX_ZERO_LENGTH (256 * 1024) +#define MAX_RW_LENGTH (256 * 1024) #if defined(__GNUC__) /* void * alloca(size_t size); */ #elif defined(_MSC_VER) -void* _alloca(size_t size); +void *_alloca (size_t size); #else #error Unknown compiler for alloca intrinsic stack allocation "function" #endif @@ -41,600 +41,582 @@ /* FUNCTIONS *****************************************************************/ -NTSTATUS STDCALL -MmMapViewInSystemCache(PCACHE_VIEW); - - -VOID -NTAPI -CcInitCacheZeroPage(VOID) -{ - NTSTATUS Status; - - Status = MmRequestPageMemoryConsumer(MC_NPPOOL, TRUE, &CcZeroPage); - if (!NT_SUCCESS(Status)) - { - DbgPrint("Can't allocate CcZeroPage.\n"); - KEBUGCHECKCC; - } - Status = MiZeroPage(CcZeroPage); - if (!NT_SUCCESS(Status)) - { - DbgPrint("Can't zero out CcZeroPage.\n"); - KEBUGCHECKCC; - } +NTSTATUS STDCALL MmMapViewInSystemCache (PCACHE_VIEW); + + +VOID NTAPI +CcInitCacheZeroPage (VOID) +{ + NTSTATUS Status; + + Status = MmRequestPageMemoryConsumer (MC_NPPOOL, TRUE, &CcZeroPage); + if (!NT_SUCCESS (Status)) + { + DbgPrint ("Can't allocate CcZeroPage.\n"); + KEBUGCHECKCC; + } + Status = MiZeroPage (CcZeroPage); + if (!NT_SUCCESS (Status)) + { + DbgPrint ("Can't zero out CcZeroPage.\n"); + KEBUGCHECKCC; + } } /* * @unimplemented */ BOOLEAN STDCALL -CcCanIWrite ( - IN PFILE_OBJECT FileObject, - IN ULONG BytesToWrite, - IN BOOLEAN Wait, - IN BOOLEAN Retrying) -{ - UNIMPLEMENTED; - return FALSE; +CcCanIWrite (IN PFILE_OBJECT FileObject, + IN ULONG BytesToWrite, + IN BOOLEAN Wait, + IN BOOLEAN Retrying) +{ + UNIMPLEMENTED; + return FALSE; } BOOLEAN STDCALL CcCopyRead (IN PFILE_OBJECT FileObject, - IN PLARGE_INTEGER FileOffset, - IN ULONG Length, - IN BOOLEAN Wait, - OUT PVOID Buffer, - OUT PIO_STATUS_BLOCK IoStatus) -{ - - ULONG Index; - PBCB Bcb; - LARGE_INTEGER Offset; - PLIST_ENTRY entry; - PCACHE_VIEW current = NULL; - ULONG CurrentLength; - NTSTATUS Status; - - DPRINT("CcCopyRead(FileObject 0x%p, FileOffset %I64x, " - "Length %d, Wait %d, Buffer 0x%p, IoStatus 0x%p)\n", - FileObject, FileOffset->QuadPart, Length, Wait, - Buffer, IoStatus); - - - if (!Wait) - { - IoStatus->Information = 0; - IoStatus->Status = STATUS_UNSUCCESSFUL; - CHECKPOINT; - return FALSE; - } - - IoStatus->Information = Length; - IoStatus->Status = STATUS_SUCCESS; - - Bcb = FileObject->SectionObjectPointer->SharedCacheMap; - - if (FileOffset->QuadPart + Length > Bcb->FileSizes.FileSize.QuadPart) - { - KEBUGCHECK(0); - } - - if (Bcb->FileSizes.AllocationSize.QuadPart > sizeof(Bcb->CacheView) / sizeof(Bcb->CacheView[0]) * CACHE_VIEW_SIZE) - { - /* not implemented */ - KEBUGCHECK(0); - } - - Offset = *FileOffset; - - ExAcquireFastMutex(&CcCacheViewLock); - while (Length) - { - Index = Offset.QuadPart / CACHE_VIEW_SIZE; - if (Bcb->CacheView[Index] && Bcb->CacheView[Index]->Bcb == Bcb) - { - CHECKPOINT; - if (Bcb->CacheView[Index]->RefCount == 0) - { - RemoveEntryList(&Bcb->CacheView[Index]->ListEntry); - InsertHeadList(&CcInUseCacheViewListHead, &Bcb->CacheView[Index]->ListEntry); - } - Bcb->CacheView[Index]->RefCount++; - } - else - { - CHECKPOINT; - if (IsListEmpty(&CcFreeCacheViewListHead)) - { - /* not implemented */ - KEBUGCHECK(0); - } - - entry = CcFreeCacheViewListHead.Flink; - while (entry != &CcFreeCacheViewListHead) - { - current = CONTAINING_RECORD(entry, CACHE_VIEW, ListEntry); - entry = entry->Flink; - if (current->Bcb == NULL) - { - break; - } - } - if (entry == &CcFreeCacheViewListHead) - { - KEBUGCHECK(0); - } - - if (current->Bcb) - { - current->Bcb->CacheView[current->SectionData.ViewOffset / CACHE_VIEW_SIZE] = NULL; - } - Bcb->CacheView[Index] = current; - - - if(Bcb->CacheView[Index]->Bcb != NULL) - { - DPRINT1("%x\n", Bcb->CacheView[Index]->Bcb); - /* not implemented */ - KEBUGCHECK(0); - } - Bcb->CacheView[Index]->RefCount = 1; - Bcb->CacheView[Index]->Bcb = Bcb; - Bcb->CacheView[Index]->SectionData.ViewOffset = Index * CACHE_VIEW_SIZE; - Bcb->CacheView[Index]->SectionData.Section = Bcb->Section; - Bcb->CacheView[Index]->SectionData.Segment = Bcb->Section->Segment; - - Status = MmMapViewInSystemCache(Bcb->CacheView[Index]); - - if (!NT_SUCCESS(Status)) - { - KEBUGCHECK(0); - } - } - ExReleaseFastMutex(&CcCacheViewLock); - - if (Offset.QuadPart % CACHE_VIEW_SIZE) - { - if (Length > CACHE_VIEW_SIZE - Offset.u.LowPart % CACHE_VIEW_SIZE) - { - CurrentLength = CACHE_VIEW_SIZE - Offset.u.LowPart % CACHE_VIEW_SIZE; - } - else - { - CurrentLength = Length; - } - memcpy(Buffer, - (PVOID)((ULONG_PTR)Bcb->CacheView[Index]->BaseAddress + Offset.u.LowPart % CACHE_VIEW_SIZE), - CurrentLength); - Buffer = (PVOID)((ULONG_PTR)Buffer + CurrentLength); - Length -= CurrentLength; - Offset.QuadPart += CurrentLength; - } - else - { - CurrentLength = Length > CACHE_VIEW_SIZE ? CACHE_VIEW_SIZE : Length; - memcpy(Buffer, Bcb->CacheView[Index]->BaseAddress, CurrentLength); - Buffer = (PVOID)((ULONG_PTR)Buffer + CurrentLength); - Length -= CurrentLength; - Offset.QuadPart += CurrentLength; - } - ExAcquireFastMutex(&CcCacheViewLock); - - Bcb->CacheView[Index]->RefCount--; - if (Bcb->CacheView[Index]->RefCount == 0) - { - RemoveEntryList(&Bcb->CacheView[Index]->ListEntry); - InsertHeadList(&CcFreeCacheViewListHead, &Bcb->CacheView[Index]->ListEntry); - } - } - ExReleaseFastMutex(&CcCacheViewLock); - - CHECKPOINT; - - return TRUE; -} - -/* - * @implemented - */ -BOOLEAN STDCALL -CcCopyWrite(IN PFILE_OBJECT FileObject, - IN PLARGE_INTEGER FileOffset, - IN ULONG Length, - IN BOOLEAN Wait, - IN PVOID Buffer) -{ - - ULONG Index; - PBCB Bcb; - LARGE_INTEGER Offset; - PLIST_ENTRY entry; - PCACHE_VIEW current = NULL; - ULONG CurrentLength; - NTSTATUS Status; - - DPRINT("CcCopyWrite(FileObject 0x%p, FileOffset %I64x, " - "Length %d, Wait %d, Buffer 0x%p)\n", - FileObject, FileOffset->QuadPart, Length, Wait, Buffer); - - if (!Wait) - { - CHECKPOINT; - return FALSE; - } - - Bcb = FileObject->SectionObjectPointer->SharedCacheMap; - - if (FileOffset->QuadPart + Length > Bcb->FileSizes.FileSize.QuadPart) - { - KEBUGCHECK(0); - } - - if (Bcb->FileSizes.AllocationSize.QuadPart > sizeof(Bcb->CacheView) / sizeof(Bcb->CacheView[0]) * CACHE_VIEW_SIZE) - { - /* not implemented */ - KEBUGCHECK(0); - } - - Offset = *FileOffset; - - ExAcquireFastMutex(&CcCacheViewLock); - while (Length) - { - Index = Offset.QuadPart / CACHE_VIEW_SIZE; - if (Bcb->CacheView[Index] && Bcb->CacheView[Index]->Bcb == Bcb) - { - CHECKPOINT; - if (Bcb->CacheView[Index]->RefCount == 0) - { - RemoveEntryList(&Bcb->CacheView[Index]->ListEntry); - InsertHeadList(&CcInUseCacheViewListHead, &Bcb->CacheView[Index]->ListEntry); - } - Bcb->CacheView[Index]->RefCount++; - } - else - { - CHECKPOINT; - if (IsListEmpty(&CcFreeCacheViewListHead)) - { - /* not implemented */ - KEBUGCHECK(0); - } - - entry = CcFreeCacheViewListHead.Flink; - while (entry != &CcFreeCacheViewListHead) - { - current = CONTAINING_RECORD(entry, CACHE_VIEW, ListEntry); - entry = entry->Flink; - if (current->Bcb == NULL) - { - break; - } - } - if (entry == &CcFreeCacheViewListHead) - { - KEBUGCHECK(0); - } - - if (current->Bcb) - { - current->Bcb->CacheView[current->SectionData.ViewOffset / CACHE_VIEW_SIZE] = NULL; - } - - Bcb->CacheView[Index] = current; - - if(Bcb->CacheView[Index]->Bcb != NULL) - { - DPRINT1("%x\n", Bcb->CacheView[Index]->Bcb); - /* not implemented */ - KEBUGCHECK(0); - } - Bcb->CacheView[Index]->RefCount = 1; - Bcb->CacheView[Index]->Bcb = Bcb; - Bcb->CacheView[Index]->SectionData.ViewOffset = Index * CACHE_VIEW_SIZE; - Bcb->CacheView[Index]->SectionData.Section = Bcb->Section; - Bcb->CacheView[Index]->SectionData.Segment = Bcb->Section->Segment; - - Status = MmMapViewInSystemCache(Bcb->CacheView[Index]); - - if (!NT_SUCCESS(Status)) - { - KEBUGCHECK(0); - } - } - ExReleaseFastMutex(&CcCacheViewLock); - - if (Offset.QuadPart % CACHE_VIEW_SIZE) - { - if (Length > CACHE_VIEW_SIZE - Offset.u.LowPart % CACHE_VIEW_SIZE) - { - CurrentLength = CACHE_VIEW_SIZE - Offset.u.LowPart % CACHE_VIEW_SIZE; - } - else - { - CurrentLength = Length; - } - memcpy((PVOID)((ULONG_PTR)Bcb->CacheView[Index]->BaseAddress + Offset.u.LowPart % CACHE_VIEW_SIZE), - Buffer, CurrentLength); - Buffer = (PVOID)((ULONG_PTR)Buffer + CurrentLength); - Length -= CurrentLength; - Offset.QuadPart += CurrentLength; - } - else - { - CurrentLength = Length > CACHE_VIEW_SIZE ? CACHE_VIEW_SIZE : Length; - memcpy(Bcb->CacheView[Index]->BaseAddress, Buffer, CurrentLength); - Buffer = (PVOID)((ULONG_PTR)Buffer + CurrentLength); - Length -= CurrentLength; - Offset.QuadPart += CurrentLength; - } - ExAcquireFastMutex(&CcCacheViewLock); - - Bcb->CacheView[Index]->RefCount--; - if (Bcb->CacheView[Index]->RefCount == 0) - { - RemoveEntryList(&Bcb->CacheView[Index]->ListEntry); - InsertHeadList(&CcFreeCacheViewListHead, &Bcb->CacheView[Index]->ListEntry); - } - } - ExReleaseFastMutex(&CcCacheViewLock); - - CHECKPOINT; - - return TRUE; -} - -/* - * @unimplemented - */ -VOID -STDCALL -CcDeferWrite ( - IN PFILE_OBJECT FileObject, - IN PCC_POST_DEFERRED_WRITE PostRoutine, - IN PVOID Context1, - IN PVOID Context2, - IN ULONG BytesToWrite, - IN BOOLEAN Retrying - ) -{ - UNIMPLEMENTED; -} - -/* - * @unimplemented - */ -VOID -STDCALL -CcFastCopyRead ( - IN PFILE_OBJECT FileObject, - IN ULONG FileOffset, - IN ULONG Length, - IN ULONG PageCount, - OUT PVOID Buffer, - OUT PIO_STATUS_BLOCK IoStatus - ) -{ - UNIMPLEMENTED; -} -/* - * @unimplemented - */ -VOID -STDCALL -CcFastCopyWrite( - IN PFILE_OBJECT FileObject, - IN ULONG FileOffset, - IN ULONG Length, - IN PVOID Buffer) -{ - UNIMPLEMENTED; -} - -/* - * @unimplemented - */ -NTSTATUS -STDCALL -CcWaitForCurrentLazyWriterActivity ( - VOID - ) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -/* - * @implemented - */ -BOOLEAN STDCALL -CcZeroData (IN PFILE_OBJECT FileObject, - IN PLARGE_INTEGER StartOffset, - IN PLARGE_INTEGER EndOffset, - IN BOOLEAN Wait) -{ - NTSTATUS Status; - LARGE_INTEGER WriteOffset; - ULONG Length; - ULONG CurrentLength; - PMDL Mdl; - ULONG i; - IO_STATUS_BLOCK Iosb; - KEVENT Event; - LARGE_INTEGER Offset; - ULONG Index; - - DPRINT("CcZeroData(FileObject 0x%p, StartOffset %I64x, EndOffset %I64x, " - "Wait %d)\n", FileObject, StartOffset->QuadPart, EndOffset->QuadPart, - Wait); - - Length = EndOffset->u.LowPart - StartOffset->u.LowPart; - WriteOffset.QuadPart = StartOffset->QuadPart; - - if (FileObject->SectionObjectPointer->SharedCacheMap == NULL) - { - /* File is not cached */ - - Mdl = alloca(MmSizeOfMdl(NULL, MAX_ZERO_LENGTH)); - - while (Length > 0) - { - if (Length + WriteOffset.u.LowPart % PAGE_SIZE > MAX_ZERO_LENGTH) - { - CurrentLength = MAX_ZERO_LENGTH - WriteOffset.u.LowPart % PAGE_SIZE; - } - else - { - CurrentLength = Length; - } - MmInitializeMdl(Mdl, (PVOID)WriteOffset.u.LowPart, CurrentLength); - Mdl->MdlFlags |= (MDL_PAGES_LOCKED | MDL_IO_PAGE_READ); - for (i = 0; i < ((Mdl->Size - sizeof(MDL)) / sizeof(ULONG)); i++) - { - ((PPFN_TYPE)(Mdl + 1))[i] = CcZeroPage; - } - KeInitializeEvent(&Event, NotificationEvent, FALSE); - Status = IoSynchronousPageWrite(FileObject, Mdl, &WriteOffset, &Event, &Iosb); - if (Status == STATUS_PENDING) - { - KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); - Status = Iosb.Status; - } - MmUnmapLockedPages(Mdl->MappedSystemVa, Mdl); - if (!NT_SUCCESS(Status)) - { - return(FALSE); - } - WriteOffset.QuadPart += CurrentLength; - Length -= CurrentLength; - } - } - else - { - /* File is cached */ - PBCB Bcb; - PCACHE_VIEW current = NULL; - PLIST_ENTRY entry; - - - Bcb = FileObject->SectionObjectPointer->SharedCacheMap; - - if (!Wait) - { - CHECKPOINT; - return FALSE; - } - - if (EndOffset->QuadPart > Bcb->FileSizes.FileSize.QuadPart) - { - KEBUGCHECK(0); - } - - if (Bcb->FileSizes.AllocationSize.QuadPart > sizeof(Bcb->CacheView) / sizeof(Bcb->CacheView[0]) * CACHE_VIEW_SIZE) - { - /* not implemented */ - KEBUGCHECK(0); - } - - Offset = *StartOffset; - Length = EndOffset->QuadPart - StartOffset->QuadPart; - - ExAcquireFastMutex(&CcCacheViewLock); - while (Length) - { - Index = Offset.QuadPart / CACHE_VIEW_SIZE; - if (Bcb->CacheView[Index] && Bcb->CacheView[Index]->Bcb == Bcb) - { + IN PLARGE_INTEGER FileOffset, + IN ULONG Length, + IN BOOLEAN Wait, + OUT PVOID Buffer, + OUT PIO_STATUS_BLOCK IoStatus) +{ + + ULONG Index; + PBCB Bcb; + LARGE_INTEGER Offset; + PLIST_ENTRY entry; + PCACHE_VIEW current = NULL; + ULONG CurrentLength; + NTSTATUS Status; + + DPRINT ("CcCopyRead(FileObject 0x%p, FileOffset %I64x, " + "Length %d, Wait %d, Buffer 0x%p, IoStatus 0x%p)\n", + FileObject, FileOffset->QuadPart, Length, Wait, Buffer, IoStatus); + + + if (!Wait) + { + IoStatus->Information = 0; + IoStatus->Status = STATUS_UNSUCCESSFUL; + CHECKPOINT; + return FALSE; + } + + IoStatus->Information = Length; + IoStatus->Status = STATUS_SUCCESS; + + Bcb = FileObject->SectionObjectPointer->SharedCacheMap; + + if (FileOffset->QuadPart + Length > Bcb->FileSizes.FileSize.QuadPart) + { + KEBUGCHECK (0); + } + + if (Bcb->FileSizes.AllocationSize.QuadPart > sizeof (Bcb->CacheView) / sizeof (Bcb->CacheView[0]) * CACHE_VIEW_SIZE) + { + /* not implemented */ + KEBUGCHECK (0); + } + + Offset = *FileOffset; + + ExAcquireFastMutex (&CcCacheViewLock); + while (Length) + { + Index = Offset.QuadPart / CACHE_VIEW_SIZE; + if (Bcb->CacheView[Index] && Bcb->CacheView[Index]->Bcb == Bcb) + { CHECKPOINT; if (Bcb->CacheView[Index]->RefCount == 0) { - RemoveEntryList(&Bcb->CacheView[Index]->ListEntry); - InsertHeadList(&CcInUseCacheViewListHead, &Bcb->CacheView[Index]->ListEntry); + RemoveEntryList (&Bcb->CacheView[Index]->ListEntry); + InsertHeadList (&CcInUseCacheViewListHead, &Bcb->CacheView[Index]->ListEntry); } Bcb->CacheView[Index]->RefCount++; - } - else - { + } + else + { CHECKPOINT; - if (IsListEmpty(&CcFreeCacheViewListHead)) - { - /* not implemented */ - KEBUGCHECK(0); + if (IsListEmpty (&CcFreeCacheViewListHead)) + { + /* not implemented */ + KEBUGCHECK (0); } entry = CcFreeCacheViewListHead.Flink; while (entry != &CcFreeCacheViewListHead) { - current = CONTAINING_RECORD(entry, CACHE_VIEW, ListEntry); - entry = entry->Flink; - if (current->Bcb == NULL) - { - break; - } + current = CONTAINING_RECORD (entry, CACHE_VIEW, ListEntry); + entry = entry->Flink; + if (current->Bcb == NULL) + { + break; + } } if (entry == &CcFreeCacheViewListHead) { - KEBUGCHECK(0); - } - + KEBUGCHECK (0); + } + + if (current->Bcb) + { + current->Bcb->CacheView[current->SectionData.ViewOffset / CACHE_VIEW_SIZE] = NULL; + } Bcb->CacheView[Index] = current; - if(Bcb->CacheView[Index]->Bcb != NULL) - { - DPRINT1("%x\n", Bcb->CacheView[Index]->Bcb); - /* not implemented */ - KEBUGCHECK(0); + + if (Bcb->CacheView[Index]->Bcb != NULL) + { + DPRINT1 ("%x\n", Bcb->CacheView[Index]->Bcb); + /* not implemented */ + KEBUGCHECK (0); } Bcb->CacheView[Index]->RefCount = 1; Bcb->CacheView[Index]->Bcb = Bcb; Bcb->CacheView[Index]->SectionData.ViewOffset = Index * CACHE_VIEW_SIZE; - Bcb->CacheView[Index]->SectionData.Section = Bcb->Section; - Bcb->CacheView[Index]->SectionData.Segment = Bcb->Section->Segment; - - Status = MmMapViewInSystemCache(Bcb->CacheView[Index]); - - if (!NT_SUCCESS(Status)) - { - KEBUGCHECK(0); - } - } - ExReleaseFastMutex(&CcCacheViewLock); - - if (Offset.QuadPart % CACHE_VIEW_SIZE) - { + Bcb->CacheView[Index]->SectionData.Section = Bcb->Section; + Bcb->CacheView[Index]->SectionData.Segment = Bcb->Section->Segment; + + Status = MmMapViewInSystemCache (Bcb->CacheView[Index]); + + if (!NT_SUCCESS (Status)) + { + KEBUGCHECK (0); + } + } + ExReleaseFastMutex (&CcCacheViewLock); + + if (Offset.QuadPart % CACHE_VIEW_SIZE) + { if (Length > CACHE_VIEW_SIZE - Offset.u.LowPart % CACHE_VIEW_SIZE) - { - CurrentLength = CACHE_VIEW_SIZE - Offset.u.LowPart % CACHE_VIEW_SIZE; - } - else - { - CurrentLength = Length; - } - memset((PVOID)((ULONG_PTR)Bcb->CacheView[Index]->BaseAddress + Offset.u.LowPart % CACHE_VIEW_SIZE), 0, CurrentLength); - Length -= CurrentLength; - Offset.QuadPart += CurrentLength; - } - else - { - CurrentLength = Length > CACHE_VIEW_SIZE ? CACHE_VIEW_SIZE : Length; - memset(Bcb->CacheView[Index]->BaseAddress, 0, CurrentLength); - Length -= CurrentLength; - Offset.QuadPart += CurrentLength; - } - ExAcquireFastMutex(&CcCacheViewLock); - - Bcb->CacheView[Index]->RefCount--; - if (Bcb->CacheView[Index]->RefCount == 0) - { - RemoveEntryList(&Bcb->CacheView[Index]->ListEntry); - InsertHeadList(&CcFreeCacheViewListHead, &Bcb->CacheView[Index]->ListEntry); - } - } - ExReleaseFastMutex(&CcCacheViewLock); - - CHECKPOINT; - - } - return(TRUE); -} + { + CurrentLength = CACHE_VIEW_SIZE - Offset.u.LowPart % CACHE_VIEW_SIZE; + } + else + { + CurrentLength = Length; + } + memcpy (Buffer, + (PVOID) ((ULONG_PTR) Bcb->CacheView[Index]->BaseAddress + Offset.u.LowPart % CACHE_VIEW_SIZE), CurrentLength); + Buffer = (PVOID) ((ULONG_PTR) Buffer + CurrentLength); + Length -= CurrentLength; + Offset.QuadPart += CurrentLength; + } + else + { + CurrentLength = Length > CACHE_VIEW_SIZE ? CACHE_VIEW_SIZE : Length; + memcpy (Buffer, Bcb->CacheView[Index]->BaseAddress, CurrentLength); + Buffer = (PVOID) ((ULONG_PTR) Buffer + CurrentLength); + Length -= CurrentLength; + Offset.QuadPart += CurrentLength; + } + ExAcquireFastMutex (&CcCacheViewLock); + + Bcb->CacheView[Index]->RefCount--; + if (Bcb->CacheView[Index]->RefCount == 0) + { + RemoveEntryList (&Bcb->CacheView[Index]->ListEntry); + InsertHeadList (&CcFreeCacheViewListHead, &Bcb->CacheView[Index]->ListEntry); + } + } + ExReleaseFastMutex (&CcCacheViewLock); + + CHECKPOINT; + + return TRUE; +} + +/* + * @implemented + */ +BOOLEAN STDCALL +CcCopyWrite (IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, + IN ULONG Length, + IN BOOLEAN Wait, + IN PVOID Buffer) +{ + + ULONG Index; + PBCB Bcb; + LARGE_INTEGER Offset; + PLIST_ENTRY entry; + PCACHE_VIEW current = NULL; + ULONG CurrentLength; + NTSTATUS Status; + + DPRINT ("CcCopyWrite(FileObject 0x%p, FileOffset %I64x, " + "Length %d, Wait %d, Buffer 0x%p)\n", FileObject, FileOffset->QuadPart, Length, Wait, Buffer); + + if (!Wait) + { + CHECKPOINT; + return FALSE; + } + + Bcb = FileObject->SectionObjectPointer->SharedCacheMap; + + if (FileOffset->QuadPart + Length > Bcb->FileSizes.FileSize.QuadPart) + { + KEBUGCHECK (0); + } + + if (Bcb->FileSizes.AllocationSize.QuadPart > sizeof (Bcb->CacheView) / sizeof (Bcb->CacheView[0]) * CACHE_VIEW_SIZE) + { + /* not implemented */ + KEBUGCHECK (0); + } + + Offset = *FileOffset; + + ExAcquireFastMutex (&CcCacheViewLock); + while (Length) + { + Index = Offset.QuadPart / CACHE_VIEW_SIZE; + if (Bcb->CacheView[Index] && Bcb->CacheView[Index]->Bcb == Bcb) + { + CHECKPOINT; + if (Bcb->CacheView[Index]->RefCount == 0) + { + RemoveEntryList (&Bcb->CacheView[Index]->ListEntry); + InsertHeadList (&CcInUseCacheViewListHead, &Bcb->CacheView[Index]->ListEntry); + } + Bcb->CacheView[Index]->RefCount++; + } + else + { + CHECKPOINT; + if (IsListEmpty (&CcFreeCacheViewListHead)) + { + /* not implemented */ + KEBUGCHECK (0); + } + + entry = CcFreeCacheViewListHead.Flink; + while (entry != &CcFreeCacheViewListHead) + { + current = CONTAINING_RECORD (entry, CACHE_VIEW, ListEntry); + entry = entry->Flink; + if (current->Bcb == NULL) + { + break; + } + } + if (entry == &CcFreeCacheViewListHead) + { + KEBUGCHECK (0); + } + + if (current->Bcb) + { + current->Bcb->CacheView[current->SectionData.ViewOffset / CACHE_VIEW_SIZE] = NULL; + } + + Bcb->CacheView[Index] = current; + + if (Bcb->CacheView[Index]->Bcb != NULL) + { + DPRINT1 ("%x\n", Bcb->CacheView[Index]->Bcb); + /* not implemented */ + KEBUGCHECK (0); + } + Bcb->CacheView[Index]->RefCount = 1; + Bcb->CacheView[Index]->Bcb = Bcb; + Bcb->CacheView[Index]->SectionData.ViewOffset = Index * CACHE_VIEW_SIZE; + Bcb->CacheView[Index]->SectionData.Section = Bcb->Section; + Bcb->CacheView[Index]->SectionData.Segment = Bcb->Section->Segment; + + Status = MmMapViewInSystemCache (Bcb->CacheView[Index]); + + if (!NT_SUCCESS (Status)) + { + KEBUGCHECK (0); + } + } + ExReleaseFastMutex (&CcCacheViewLock); + + if (Offset.QuadPart % CACHE_VIEW_SIZE) + { + if (Length > CACHE_VIEW_SIZE - Offset.u.LowPart % CACHE_VIEW_SIZE) + { + CurrentLength = CACHE_VIEW_SIZE - Offset.u.LowPart % CACHE_VIEW_SIZE; + } + else + { + CurrentLength = Length; + } + memcpy ((PVOID) ((ULONG_PTR) Bcb->CacheView[Index]->BaseAddress + Offset.u.LowPart % CACHE_VIEW_SIZE), + Buffer, CurrentLength); + Buffer = (PVOID) ((ULONG_PTR) Buffer + CurrentLength); + Length -= CurrentLength; + Offset.QuadPart += CurrentLength; + } + else + { + CurrentLength = Length > CACHE_VIEW_SIZE ? CACHE_VIEW_SIZE : Length; + memcpy (Bcb->CacheView[Index]->BaseAddress, Buffer, CurrentLength); + Buffer = (PVOID) ((ULONG_PTR) Buffer + CurrentLength); + Length -= CurrentLength; + Offset.QuadPart += CurrentLength; + } + ExAcquireFastMutex (&CcCacheViewLock); + + Bcb->CacheView[Index]->RefCount--; + if (Bcb->CacheView[Index]->RefCount == 0) + { + RemoveEntryList (&Bcb->CacheView[Index]->ListEntry); + InsertHeadList (&CcFreeCacheViewListHead, &Bcb->CacheView[Index]->ListEntry); + } + } + ExReleaseFastMutex (&CcCacheViewLock); + + CHECKPOINT; + + return TRUE; +} + +/* + * @unimplemented + */ +VOID STDCALL +CcDeferWrite (IN PFILE_OBJECT FileObject, + IN PCC_POST_DEFERRED_WRITE PostRoutine, + IN PVOID Context1, + IN PVOID Context2, + IN ULONG BytesToWrite, + IN BOOLEAN Retrying) +{ + UNIMPLEMENTED; +} + +/* + * @unimplemented + */ +VOID STDCALL +CcFastCopyRead (IN PFILE_OBJECT FileObject, + IN ULONG FileOffset, + IN ULONG Length, + IN ULONG PageCount, + OUT PVOID Buffer, + OUT PIO_STATUS_BLOCK IoStatus) +{ + UNIMPLEMENTED; +} + +/* + * @unimplemented + */ +VOID STDCALL +CcFastCopyWrite (IN PFILE_OBJECT FileObject, + IN ULONG FileOffset, + IN ULONG Length, + IN PVOID Buffer) +{ + UNIMPLEMENTED; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +CcWaitForCurrentLazyWriterActivity (VOID) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* + * @implemented + */ +BOOLEAN STDCALL +CcZeroData (IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER StartOffset, + IN PLARGE_INTEGER EndOffset, + IN BOOLEAN Wait) +{ + NTSTATUS Status; + LARGE_INTEGER WriteOffset; + ULONG Length; + ULONG CurrentLength; + PMDL Mdl; + ULONG i; + IO_STATUS_BLOCK Iosb; + KEVENT Event; + LARGE_INTEGER Offset; + ULONG Index; + + DPRINT ("CcZeroData(FileObject 0x%p, StartOffset %I64x, EndOffset %I64x, " + "Wait %d)\n", FileObject, StartOffset->QuadPart, EndOffset->QuadPart, Wait); + + Length = EndOffset->u.LowPart - StartOffset->u.LowPart; + WriteOffset.QuadPart = StartOffset->QuadPart; + + if (FileObject->SectionObjectPointer->SharedCacheMap == NULL) + { + /* File is not cached */ + + Mdl = alloca (MmSizeOfMdl (NULL, MAX_ZERO_LENGTH)); + + while (Length > 0) + { + if (Length + WriteOffset.u.LowPart % PAGE_SIZE > MAX_ZERO_LENGTH) + { + CurrentLength = MAX_ZERO_LENGTH - WriteOffset.u.LowPart % PAGE_SIZE; + } + else + { + CurrentLength = Length; + } + MmInitializeMdl (Mdl, (PVOID) WriteOffset.u.LowPart, CurrentLength); + Mdl->MdlFlags |= (MDL_PAGES_LOCKED | MDL_IO_PAGE_READ); + for (i = 0; i < ((Mdl->Size - sizeof (MDL)) / sizeof (ULONG)); i++) + { + ((PPFN_TYPE) (Mdl + 1))[i] = CcZeroPage; + } + KeInitializeEvent (&Event, NotificationEvent, FALSE); + Status = IoSynchronousPageWrite (FileObject, Mdl, &WriteOffset, &Event, &Iosb); + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject (&Event, Executive, KernelMode, FALSE, NULL); + Status = Iosb.Status; + } + MmUnmapLockedPages (Mdl->MappedSystemVa, Mdl); + if (!NT_SUCCESS (Status)) + { + return (FALSE); + } + WriteOffset.QuadPart += CurrentLength; + Length -= CurrentLength; + } + } + else + { + /* File is cached */ + PBCB Bcb; + PCACHE_VIEW current = NULL; + PLIST_ENTRY entry; + + Bcb = FileObject->SectionObjectPointer->SharedCacheMap; + + if (!Wait) + { + CHECKPOINT; + return FALSE; + } + + if (EndOffset->QuadPart > Bcb->FileSizes.FileSize.QuadPart) + { + KEBUGCHECK (0); + } + + if (Bcb->FileSizes.AllocationSize.QuadPart > sizeof (Bcb->CacheView) / sizeof (Bcb->CacheView[0]) * CACHE_VIEW_SIZE) + { + /* not implemented */ + KEBUGCHECK (0); + } + + Offset = *StartOffset; + Length = EndOffset->QuadPart - StartOffset->QuadPart; + + ExAcquireFastMutex (&CcCacheViewLock); + while (Length) + { + Index = Offset.QuadPart / CACHE_VIEW_SIZE; + if (Bcb->CacheView[Index] && Bcb->CacheView[Index]->Bcb == Bcb) + { + CHECKPOINT; + if (Bcb->CacheView[Index]->RefCount == 0) + { + RemoveEntryList (&Bcb->CacheView[Index]->ListEntry); + InsertHeadList (&CcInUseCacheViewListHead, &Bcb->CacheView[Index]->ListEntry); + } + Bcb->CacheView[Index]->RefCount++; + } + else + { + CHECKPOINT; + if (IsListEmpty (&CcFreeCacheViewListHead)) + { + /* not implemented */ + KEBUGCHECK (0); + } + + entry = CcFreeCacheViewListHead.Flink; + while (entry != &CcFreeCacheViewListHead) + { + current = CONTAINING_RECORD (entry, CACHE_VIEW, ListEntry); + entry = entry->Flink; + if (current->Bcb == NULL) + { + break; + } + } + if (entry == &CcFreeCacheViewListHead) + { + KEBUGCHECK (0); + } + + Bcb->CacheView[Index] = current; + + if (Bcb->CacheView[Index]->Bcb != NULL) + { + DPRINT1 ("%x\n", Bcb->CacheView[Index]->Bcb); + /* not implemented */ + KEBUGCHECK (0); + } + Bcb->CacheView[Index]->RefCount = 1; + Bcb->CacheView[Index]->Bcb = Bcb; + Bcb->CacheView[Index]->SectionData.ViewOffset = Index * CACHE_VIEW_SIZE; + Bcb->CacheView[Index]->SectionData.Section = Bcb->Section; + Bcb->CacheView[Index]->SectionData.Segment = Bcb->Section->Segment; + + Status = MmMapViewInSystemCache (Bcb->CacheView[Index]); + + if (!NT_SUCCESS (Status)) + { + KEBUGCHECK (0); + } + } + ExReleaseFastMutex (&CcCacheViewLock); + + if (Offset.QuadPart % CACHE_VIEW_SIZE) + { + if (Length > CACHE_VIEW_SIZE - Offset.u.LowPart % CACHE_VIEW_SIZE) + { + CurrentLength = CACHE_VIEW_SIZE - Offset.u.LowPart % CACHE_VIEW_SIZE; + } + else + { + CurrentLength = Length; + } + memset ((PVOID) ((ULONG_PTR) Bcb->CacheView[Index]->BaseAddress + Offset.u.LowPart % CACHE_VIEW_SIZE), 0, + CurrentLength); + Length -= CurrentLength; + Offset.QuadPart += CurrentLength; + } + else + { + CurrentLength = Length > CACHE_VIEW_SIZE ? CACHE_VIEW_SIZE : Length; + memset (Bcb->CacheView[Index]->BaseAddress, 0, CurrentLength); + Length -= CurrentLength; + Offset.QuadPart += CurrentLength; + } + ExAcquireFastMutex (&CcCacheViewLock); + + Bcb->CacheView[Index]->RefCount--; + if (Bcb->CacheView[Index]->RefCount == 0) + { + RemoveEntryList (&Bcb->CacheView[Index]->ListEntry); + InsertHeadList (&CcFreeCacheViewListHead, &Bcb->CacheView[Index]->ListEntry); + } + } + ExReleaseFastMutex (&CcCacheViewLock); + + CHECKPOINT; + } + return (TRUE); +} Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/cc/fs.c URL: http://svn.reactos.ru/svn/reactos/branches/cache_manager_rewrite/reactos/nt… ============================================================================== --- branches/cache_manager_rewrite/reactos/ntoskrnl/cc/fs.c (original) +++ branches/cache_manager_rewrite/reactos/ntoskrnl/cc/fs.c Mon Mar 27 22:17:12 2006 @@ -16,7 +16,7 @@ #ifndef ROUND_DOWN -#define ROUND_DOWN(X,Y) ((X) & ~((Y) - 1)) +#define ROUND_DOWN(X,Y) ((X) & ~((Y) - 1)) #endif /* GLOBALS *****************************************************************/ @@ -25,89 +25,71 @@ extern ULONG CcCacheViewArrayCount; extern FAST_MUTEX CcCacheViewLock; -NTSTATUS STDCALL -MmUnmapViewInSystemCache(PCACHE_VIEW); +NTSTATUS STDCALL MmUnmapViewInSystemCache (PCACHE_VIEW); -NTSTATUS STDCALL -MmChangeSectionSize(PSECTION_OBJECT Section, - PLARGE_INTEGER NewMaxSize); +NTSTATUS STDCALL MmChangeSectionSize (PSECTION_OBJECT Section, PLARGE_INTEGER NewMaxSize); /* FUNCTIONS *****************************************************************/ /* * @unimplemented */ -LARGE_INTEGER -STDCALL -CcGetDirtyPages ( - IN PVOID LogHandle, - IN PDIRTY_PAGE_ROUTINE DirtyPageRoutine, - IN PVOID Context1, - IN PVOID Context2 - ) +LARGE_INTEGER STDCALL +CcGetDirtyPages (IN PVOID LogHandle, + IN PDIRTY_PAGE_ROUTINE DirtyPageRoutine, + IN PVOID Context1, + IN PVOID Context2) { - LARGE_INTEGER i; - UNIMPLEMENTED; - i.QuadPart = 0; - return i; + LARGE_INTEGER i; + UNIMPLEMENTED; + i.QuadPart = 0; + return i; } /* * @implemented */ -PFILE_OBJECT -STDCALL -CcGetFileObjectFromBcb ( - IN PVOID Bcb - ) +PFILE_OBJECT STDCALL +CcGetFileObjectFromBcb (IN PVOID Bcb) { - PINTERNAL_BCB iBcb = (PINTERNAL_BCB)Bcb; - return iBcb->Bcb->FileObject; + PINTERNAL_BCB iBcb = (PINTERNAL_BCB) Bcb; + return iBcb->Bcb->FileObject; } /* * @unimplemented */ -LARGE_INTEGER -STDCALL -CcGetLsnForFileObject ( - IN PFILE_OBJECT FileObject, - OUT PLARGE_INTEGER OldestLsn OPTIONAL - ) +LARGE_INTEGER STDCALL +CcGetLsnForFileObject (IN PFILE_OBJECT FileObject, + OUT PLARGE_INTEGER OldestLsn OPTIONAL) { - LARGE_INTEGER i; - UNIMPLEMENTED; - i.QuadPart = 0; - return i; + LARGE_INTEGER i; + UNIMPLEMENTED; + i.QuadPart = 0; + return i; } /* * @unimplemented */ -BOOLEAN -STDCALL -CcIsThereDirtyData ( - IN PVPB Vpb - ) +BOOLEAN STDCALL +CcIsThereDirtyData (IN PVPB Vpb) { - UNIMPLEMENTED; - return FALSE; + UNIMPLEMENTED; + return FALSE; } /* * @unimplemented */ -BOOLEAN -STDCALL -CcPurgeCacheSection ( - IN PSECTION_OBJECT_POINTERS SectionObjectPointer, - IN PLARGE_INTEGER FileOffset OPTIONAL, - IN ULONG Length, - IN BOOLEAN UninitializeCacheMaps - ) +BOOLEAN STDCALL +CcPurgeCacheSection (IN PSECTION_OBJECT_POINTERS SectionObjectPointer, + IN PLARGE_INTEGER FileOffset OPTIONAL, + IN ULONG Length, + IN BOOLEAN UninitializeCacheMaps) { - UNIMPLEMENTED; - return FALSE; + UNIMPLEMENTED; + return FALSE; } @@ -115,101 +97,94 @@ * @implemented */ VOID STDCALL -CcSetFileSizes (IN PFILE_OBJECT FileObject, - IN PCC_FILE_SIZES FileSizes) +CcSetFileSizes (IN PFILE_OBJECT FileObject, + IN PCC_FILE_SIZES FileSizes) { - PBCB Bcb; - NTSTATUS Status; - ULONG i; + PBCB Bcb; + NTSTATUS Status; + ULONG i; - DPRINT("CcSetFileSizes(FileObject 0x%p, FileSizes 0x%p)\n", - FileObject, FileSizes); - DPRINT("AllocationSize %d, FileSize %d, ValidDataLength %d\n", - (ULONG)FileSizes->AllocationSize.QuadPart, - (ULONG)FileSizes->FileSize.QuadPart, - (ULONG)FileSizes->ValidDataLength.QuadPart); - DPRINT("%wZ\n", &FileObject->FileName); - - Bcb = FileObject->SectionObjectPointer->SharedCacheMap; - if (Bcb == NULL) - { - return; - } - DPRINT("AllocationSize %d, FileSize %d, ValidDataLength %d\n", - (ULONG)Bcb->FileSizes.AllocationSize.QuadPart, - (ULONG)Bcb->FileSizes.FileSize.QuadPart, - (ULONG)Bcb->FileSizes.ValidDataLength.QuadPart); - ExAcquireFastMutex(&CcCacheViewLock); + DPRINT ("CcSetFileSizes(FileObject 0x%p, FileSizes 0x%p)\n", FileObject, FileSizes); + DPRINT ("AllocationSize %d, FileSize %d, ValidDataLength %d\n", + (ULONG) FileSizes->AllocationSize.QuadPart, + (ULONG) FileSizes->FileSize.QuadPart, (ULONG) FileSizes->ValidDataLength.QuadPart); + DPRINT ("%wZ\n", &FileObject->FileName); - DPRINT("%d\n", Bcb->FileSizes.FileSize.u.LowPart); + Bcb = FileObject->SectionObjectPointer->SharedCacheMap; + if (Bcb == NULL) + { + return; + } + DPRINT ("AllocationSize %d, FileSize %d, ValidDataLength %d\n", + (ULONG) Bcb->FileSizes.AllocationSize.QuadPart, + (ULONG) Bcb->FileSizes.FileSize.QuadPart, (ULONG) Bcb->FileSizes.ValidDataLength.QuadPart); + ExAcquireFastMutex (&CcCacheViewLock); - for (i = ROUND_DOWN(FileSizes->AllocationSize.QuadPart, CACHE_VIEW_SIZE) / CACHE_VIEW_SIZE; - i < ROUND_UP(Bcb->FileSizes.AllocationSize.QuadPart, CACHE_VIEW_SIZE) / CACHE_VIEW_SIZE; - i++) - { - if (Bcb->CacheView[i] != NULL) - { - if (Bcb->CacheView[i]->Bcb != Bcb) - { - KEBUGCHECK(0); - } - if (Bcb->CacheView[i]->RefCount > 0) - { - KEBUGCHECK(0); - } - Status = MmUnmapViewInSystemCache(Bcb->CacheView[i]); - if (!NT_SUCCESS(Status)) - { - KEBUGCHECK(0); - } - Bcb->CacheView[i]->RefCount = 0; - Bcb->CacheView[i]->Bcb = NULL; - Bcb->CacheView[i] = NULL; - } - } - + DPRINT ("%d\n", Bcb->FileSizes.FileSize.u.LowPart); + + for (i = ROUND_DOWN (FileSizes->AllocationSize.QuadPart, CACHE_VIEW_SIZE) / CACHE_VIEW_SIZE; + i < ROUND_UP (Bcb->FileSizes.AllocationSize.QuadPart, CACHE_VIEW_SIZE) / CACHE_VIEW_SIZE; i++) + { + if (Bcb->CacheView[i] != NULL) + { + if (Bcb->CacheView[i]->Bcb != Bcb) + { + KEBUGCHECK (0); + } + if (Bcb->CacheView[i]->RefCount > 0) + { + KEBUGCHECK (0); + } + Status = MmUnmapViewInSystemCache (Bcb->CacheView[i]); + if (!NT_SUCCESS (Status)) + { + KEBUGCHECK (0); + } + Bcb->CacheView[i]->RefCount = 0; + Bcb->CacheView[i]->Bcb = NULL; + Bcb->CacheView[i] = NULL; + } + } + #if 0 - for (i = 0; i < CcCacheViewArrayCount; i++) - { - if (CcCacheViewArray[i].Bcb == Bcb) - { - if (PAGE_ROUND_UP(FileSizes->AllocationSize.QuadPart) <= CcCacheViewArray[i].SectionData.ViewOffset || - (PAGE_ROUND_UP(FileSizes->AllocationSize.QuadPart) > CcCacheViewArray[i].SectionData.ViewOffset && - PAGE_ROUND_UP(FileSizes->AllocationSize.QuadPart) <= CcCacheViewArray[i].SectionData.ViewOffset + CACHE_VIEW_SIZE)) - - { - if (CcCacheViewArray[i].RefCount > 0) - { - KEBUGCHECK(0); - } - Status = MmUnmapViewInSystemCache(&CcCacheViewArray[i]); - if (!NT_SUCCESS(Status)) - { - KEBUGCHECK(0); - } - CcCacheViewArray[i].RefCount = 0; - CcCacheViewArray[i].Bcb = NULL; - } - } - } + for (i = 0; i < CcCacheViewArrayCount; i++) + { + if (CcCacheViewArray[i].Bcb == Bcb) + { + if (PAGE_ROUND_UP (FileSizes->AllocationSize.QuadPart) <= CcCacheViewArray[i].SectionData.ViewOffset || + (PAGE_ROUND_UP (FileSizes->AllocationSize.QuadPart) > CcCacheViewArray[i].SectionData.ViewOffset && + PAGE_ROUND_UP (FileSizes->AllocationSize.QuadPart) <= + CcCacheViewArray[i].SectionData.ViewOffset + CACHE_VIEW_SIZE)) + + { + if (CcCacheViewArray[i].RefCount > 0) + { + KEBUGCHECK (0); + } + Status = MmUnmapViewInSystemCache (&CcCacheViewArray[i]); + if (!NT_SUCCESS (Status)) + { + KEBUGCHECK (0); + } + CcCacheViewArray[i].RefCount = 0; + CcCacheViewArray[i].Bcb = NULL; + } + } + } #endif - Status = MmChangeSectionSize(Bcb->Section, &FileSizes->FileSize); - Bcb->FileSizes = *FileSizes; + Status = MmChangeSectionSize (Bcb->Section, &FileSizes->FileSize); + Bcb->FileSizes = *FileSizes; - ExReleaseFastMutex(&CcCacheViewLock); + ExReleaseFastMutex (&CcCacheViewLock); } /* * @unimplemented */ -VOID -STDCALL -CcSetLogHandleForFile ( - IN PFILE_OBJECT FileObject, - IN PVOID LogHandle, - IN PFLUSH_TO_LSN FlushToLsnRoutine - ) +VOID STDCALL +CcSetLogHandleForFile (IN PFILE_OBJECT FileObject, + IN PVOID LogHandle, + IN PFLUSH_TO_LSN FlushToLsnRoutine) { - UNIMPLEMENTED; + UNIMPLEMENTED; } - Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/cc/mdl.c URL: http://svn.reactos.ru/svn/reactos/branches/cache_manager_rewrite/reactos/nt… ============================================================================== --- branches/cache_manager_rewrite/reactos/ntoskrnl/cc/mdl.c (original) +++ branches/cache_manager_rewrite/reactos/ntoskrnl/cc/mdl.c Mon Mar 27 22:17:12 2006 @@ -19,21 +19,18 @@ /* * @implemented */ -VOID -STDCALL -CcMdlRead( - IN PFILE_OBJECT FileObject, - IN PLARGE_INTEGER FileOffset, - IN ULONG Length, - OUT PMDL * MdlChain, - OUT PIO_STATUS_BLOCK IoStatus - ) +VOID STDCALL +CcMdlRead (IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, + IN ULONG Length, + OUT PMDL * MdlChain, + OUT PIO_STATUS_BLOCK IoStatus) { - UNIMPLEMENTED; + UNIMPLEMENTED; } /* - * NAME INTERNAL + * NAME INTERNAL * CcMdlReadCompleteDev@8 * * DESCRIPTION @@ -46,13 +43,12 @@ * None. * * NOTE - * Used by CcMdlReadComplete@8 and FsRtl + * Used by CcMdlReadComplete@8 and FsRtl * */ -VOID -STDCALL -CcMdlReadCompleteDev(IN PMDL MdlChain, - IN PFILE_OBJECT FileObject) +VOID STDCALL +CcMdlReadCompleteDev (IN PMDL MdlChain, + IN PFILE_OBJECT FileObject) { PMDL Mdl; @@ -60,8 +56,8 @@ while ((Mdl = MdlChain)) { MdlChain = Mdl->Next; - MmUnlockPages(Mdl); - IoFreeMdl(Mdl); + MmUnlockPages (Mdl); + IoFreeMdl (Mdl); } } @@ -81,66 +77,58 @@ * * @implemented */ -VOID -STDCALL -CcMdlReadComplete(IN PFILE_OBJECT FileObject, - IN PMDL MdlChain) -{ - PDEVICE_OBJECT DeviceObject = NULL; - PFAST_IO_DISPATCH FastDispatch; - - /* Get Fast Dispatch Data */ - DeviceObject = IoGetRelatedDeviceObject(FileObject); - FastDispatch = DeviceObject->DriverObject->FastIoDispatch; - - /* Check if we support Fast Calls, and check this one */ - if (FastDispatch && FastDispatch->MdlReadComplete) - { - /* Use the fast path */ - FastDispatch->MdlReadComplete(FileObject, - MdlChain, - DeviceObject); - } - - /* Use slow path */ - CcMdlReadCompleteDev(MdlChain, FileObject); -} - -/* - * @implemented - */ -VOID -STDCALL -CcMdlWriteComplete(IN PFILE_OBJECT FileObject, - IN PLARGE_INTEGER FileOffset, +VOID STDCALL +CcMdlReadComplete (IN PFILE_OBJECT FileObject, IN PMDL MdlChain) { PDEVICE_OBJECT DeviceObject = NULL; PFAST_IO_DISPATCH FastDispatch; /* Get Fast Dispatch Data */ - DeviceObject = IoGetRelatedDeviceObject(FileObject); + DeviceObject = IoGetRelatedDeviceObject (FileObject); + FastDispatch = DeviceObject->DriverObject->FastIoDispatch; + + /* Check if we support Fast Calls, and check this one */ + if (FastDispatch && FastDispatch->MdlReadComplete) + { + /* Use the fast path */ + FastDispatch->MdlReadComplete (FileObject, MdlChain, DeviceObject); + } + + /* Use slow path */ + CcMdlReadCompleteDev (MdlChain, FileObject); +} + +/* + * @implemented + */ +VOID STDCALL +CcMdlWriteComplete (IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, + IN PMDL MdlChain) +{ + PDEVICE_OBJECT DeviceObject = NULL; + PFAST_IO_DISPATCH FastDispatch; + + /* Get Fast Dispatch Data */ + DeviceObject = IoGetRelatedDeviceObject (FileObject); FastDispatch = DeviceObject->DriverObject->FastIoDispatch; /* Check if we support Fast Calls, and check this one */ if (FastDispatch && FastDispatch->MdlWriteComplete) { - /* Use the fast path */ - FastDispatch->MdlWriteComplete(FileObject, - FileOffset, - MdlChain, - DeviceObject); + /* Use the fast path */ + FastDispatch->MdlWriteComplete (FileObject, FileOffset, MdlChain, DeviceObject); } /* Use slow path */ - CcMdlWriteCompleteDev(FileOffset, MdlChain, FileObject); + CcMdlWriteCompleteDev (FileOffset, MdlChain, FileObject); } -VOID -STDCALL -CcMdlWriteCompleteDev(IN PLARGE_INTEGER FileOffset, - IN PMDL MdlChain, - IN PFILE_OBJECT FileObject) +VOID STDCALL +CcMdlWriteCompleteDev (IN PLARGE_INTEGER FileOffset, + IN PMDL MdlChain, + IN PFILE_OBJECT FileObject) { UNIMPLEMENTED; } @@ -148,28 +136,22 @@ /* * @unimplemented */ -VOID -STDCALL -CcMdlWriteAbort ( - IN PFILE_OBJECT FileObject, - IN PMDL MdlChain - ) +VOID STDCALL +CcMdlWriteAbort (IN PFILE_OBJECT FileObject, + IN PMDL MdlChain) { - UNIMPLEMENTED; + UNIMPLEMENTED; } /* * @unimplemented */ -VOID -STDCALL -CcPrepareMdlWrite ( - IN PFILE_OBJECT FileObject, - IN PLARGE_INTEGER FileOffset, - IN ULONG Length, - OUT PMDL * MdlChain, - OUT PIO_STATUS_BLOCK IoStatus - ) +VOID STDCALL +CcPrepareMdlWrite (IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, + IN ULONG Length, + OUT PMDL * MdlChain, + OUT PIO_STATUS_BLOCK IoStatus) { - UNIMPLEMENTED; + UNIMPLEMENTED; } Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/cc/pin.c URL: http://svn.reactos.ru/svn/reactos/branches/cache_manager_rewrite/reactos/nt… ============================================================================== --- branches/cache_manager_rewrite/reactos/ntoskrnl/cc/pin.c (original) +++ branches/cache_manager_rewrite/reactos/ntoskrnl/cc/pin.c Mon Mar 27 22:17:12 2006 @@ -24,217 +24,208 @@ /* FUNCTIONS *****************************************************************/ -NTSTATUS STDCALL -MmMapViewInSystemCache(PCACHE_VIEW); - - -/* - * @implemented - */ -BOOLEAN STDCALL -CcMapData(IN PFILE_OBJECT FileObject, - IN PLARGE_INTEGER FileOffset, - IN ULONG Length, - IN BOOLEAN Wait, - OUT PVOID* piBcb, - OUT PVOID* pBuffer) -{ - PINTERNAL_BCB iBcb; - PBCB Bcb; - ULONG Index; - NTSTATUS Status; - PLIST_ENTRY entry; - PCACHE_VIEW current = NULL; - - DPRINT("CcMapData(FileObject 0x%p, FileOffset %I64x, Length %d, Wait %d," - " pBcb 0x%p, pBuffer 0x%p)\n", FileObject, FileOffset->QuadPart, - Length, Wait, piBcb, pBuffer); - - ASSERT (FileObject); - ASSERT (FileObject->SectionObjectPointer); - ASSERT (FileObject->SectionObjectPointer->SharedCacheMap); - ASSERT (FileOffset); - ASSERT (piBcb); - ASSERT (pBuffer); - - if (!Wait) - { - *piBcb = NULL; - *pBuffer = NULL; - return FALSE; - } - - Bcb = FileObject->SectionObjectPointer->SharedCacheMap; - - if (FileOffset->QuadPart + Length > Bcb->FileSizes.AllocationSize.QuadPart) - { - DPRINT("%d %I64d %I64d\n", Length, FileOffset->QuadPart + Length, Bcb->FileSizes.AllocationSize.QuadPart); +NTSTATUS STDCALL MmMapViewInSystemCache (PCACHE_VIEW); + + +/* + * @implemented + */ +BOOLEAN STDCALL +CcMapData (IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, + IN ULONG Length, + IN BOOLEAN Wait, + OUT PVOID * piBcb, + OUT PVOID * pBuffer) +{ + PINTERNAL_BCB iBcb; + PBCB Bcb; + ULONG Index; + NTSTATUS Status; + PLIST_ENTRY entry; + PCACHE_VIEW current = NULL; + + DPRINT ("CcMapData(FileObject 0x%p, FileOffset %I64x, Length %d, Wait %d," + " pBcb 0x%p, pBuffer 0x%p)\n", FileObject, FileOffset->QuadPart, Length, Wait, piBcb, pBuffer); + + ASSERT (FileObject); + ASSERT (FileObject->SectionObjectPointer); + ASSERT (FileObject->SectionObjectPointer->SharedCacheMap); + ASSERT (FileOffset); + ASSERT (piBcb); + ASSERT (pBuffer); + + if (!Wait) + { + *piBcb = NULL; + *pBuffer = NULL; + return FALSE; + } + + Bcb = FileObject->SectionObjectPointer->SharedCacheMap; + + if (FileOffset->QuadPart + Length > Bcb->FileSizes.AllocationSize.QuadPart) + { + DPRINT ("%d %I64d %I64d\n", Length, FileOffset->QuadPart + Length, Bcb->FileSizes.AllocationSize.QuadPart); // KEBUGCHECK(0); - } - - if (FileOffset->QuadPart + Length - ROUND_DOWN(FileOffset->QuadPart, CACHE_VIEW_SIZE) > CACHE_VIEW_SIZE) - { - /* not implemented */ - KEBUGCHECK(0); - } - - - - if (Bcb->FileSizes.AllocationSize.QuadPart > sizeof(Bcb->CacheView) / sizeof(Bcb->CacheView[0]) * CACHE_VIEW_SIZE) - { - /* not implemented */ - KEBUGCHECK(0); - } - - ExAcquireFastMutex(&CcCacheViewLock); - - Index = FileOffset->QuadPart / CACHE_VIEW_SIZE; - if (Bcb->CacheView[Index] && Bcb->CacheView[Index]->Bcb == Bcb) - { - if (Bcb->CacheView[Index]->RefCount == 0) - { - RemoveEntryList(&Bcb->CacheView[Index]->ListEntry); - InsertHeadList(&CcInUseCacheViewListHead, &Bcb->CacheView[Index]->ListEntry); - } - Bcb->CacheView[Index]->RefCount++; - } - else - { - if (IsListEmpty(&CcFreeCacheViewListHead)) - { - /* not implemented */ - KEBUGCHECK(0); - } - - entry = CcFreeCacheViewListHead.Flink; - while (entry != &CcFreeCacheViewListHead) - { - current = CONTAINING_RECORD(entry, CACHE_VIEW, ListEntry); - entry = entry->Flink; - if (current->Bcb == NULL) - { - break; - } - } - if (entry == &CcFreeCacheViewListHead) - { - KEBUGCHECK(0); - } - - Bcb->CacheView[Index] = current; - - if(Bcb->CacheView[Index]->Bcb != NULL) - { - DPRINT1("%x\n", Bcb->CacheView[Index]->Bcb); - /* not implemented */ - KEBUGCHECK(0); - } - Bcb->CacheView[Index]->RefCount = 1; - Bcb->CacheView[Index]->Bcb = Bcb; - Bcb->CacheView[Index]->SectionData.ViewOffset = Index * CACHE_VIEW_SIZE; - Bcb->CacheView[Index]->SectionData.Section = Bcb->Section; - Bcb->CacheView[Index]->SectionData.Segment = Bcb->Section->Segment; - - Status = MmMapViewInSystemCache(Bcb->CacheView[Index]); - - if (!NT_SUCCESS(Status)) - { - KEBUGCHECK(0); - } - } - ExReleaseFastMutex(&CcCacheViewLock); - - iBcb = ExAllocateFromNPagedLookasideList(&iBcbLookasideList); - if (iBcb == NULL) - { - KEBUGCHECK(0); - } - memset(iBcb, 0, sizeof(INTERNAL_BCB)); - - iBcb->Bcb = Bcb; - iBcb->Index = Index; - - *piBcb = iBcb; - *pBuffer = (PVOID)((ULONG_PTR)Bcb->CacheView[Index]->BaseAddress + (ULONG_PTR)(FileOffset->QuadPart - Bcb->CacheView[Index]->SectionData.ViewOffset)); - - DPRINT("CcMapData() done\n"); - - return TRUE; -} - -/* - * @unimplemented - */ -BOOLEAN -STDCALL -CcPinMappedData ( - IN PFILE_OBJECT FileObject, - IN PLARGE_INTEGER FileOffset, - IN ULONG Length, - IN ULONG Flags, - OUT PVOID * Bcb - ) -{ - /* no-op for current implementation. */ - return TRUE; -} - -/* - * @unimplemented - */ -BOOLEAN -STDCALL -CcPinRead ( - IN PFILE_OBJECT FileObject, - IN PLARGE_INTEGER FileOffset, - IN ULONG Length, - IN ULONG Flags, - OUT PVOID * Bcb, - OUT PVOID * Buffer - ) -{ - if (CcMapData(FileObject, FileOffset, Length, Flags, Bcb, Buffer)) - { - if (CcPinMappedData(FileObject, FileOffset, Length, Flags, Bcb)) - return TRUE; + } + + if (FileOffset->QuadPart + Length - ROUND_DOWN (FileOffset->QuadPart, CACHE_VIEW_SIZE) > CACHE_VIEW_SIZE) + { + /* not implemented */ + KEBUGCHECK (0); + } + + + + if (Bcb->FileSizes.AllocationSize.QuadPart > sizeof (Bcb->CacheView) / sizeof (Bcb->CacheView[0]) * CACHE_VIEW_SIZE) + { + /* not implemented */ + KEBUGCHECK (0); + } + + ExAcquireFastMutex (&CcCacheViewLock); + + Index = FileOffset->QuadPart / CACHE_VIEW_SIZE; + if (Bcb->CacheView[Index] && Bcb->CacheView[Index]->Bcb == Bcb) + { + if (Bcb->CacheView[Index]->RefCount == 0) + { + RemoveEntryList (&Bcb->CacheView[Index]->ListEntry); + InsertHeadList (&CcInUseCacheViewListHead, &Bcb->CacheView[Index]->ListEntry); + } + Bcb->CacheView[Index]->RefCount++; + } else - CcUnpinData(Bcb); - } - return FALSE; -} - -/* - * @unimplemented - */ -BOOLEAN -STDCALL -CcPreparePinWrite ( - IN PFILE_OBJECT FileObject, - IN PLARGE_INTEGER FileOffset, - IN ULONG Length, - IN BOOLEAN Zero, - IN ULONG Flags, - OUT PVOID * Bcb, - OUT PVOID * Buffer - ) -{ - /* - * FIXME: This is function is similar to CcPinRead, but doesn't - * read the data if they're not present. Instead it should just - * prepare the cache segments and zero them out if Zero == TRUE. - * - * For now calling CcPinRead is better than returning error or - * just having UNIMPLEMENTED here. - */ - return CcPinRead(FileObject, FileOffset, Length, Flags, Bcb, Buffer); -} - -/* - * @implemented - */ -VOID STDCALL -CcSetDirtyPinnedData (IN PVOID Bcb, - IN PLARGE_INTEGER Lsn) + { + if (IsListEmpty (&CcFreeCacheViewListHead)) + { + /* not implemented */ + KEBUGCHECK (0); + } + + entry = CcFreeCacheViewListHead.Flink; + while (entry != &CcFreeCacheViewListHead) + { + current = CONTAINING_RECORD (entry, CACHE_VIEW, ListEntry); + entry = entry->Flink; + if (current->Bcb == NULL) + { + break; + } + } + if (entry == &CcFreeCacheViewListHead) + { + KEBUGCHECK (0); + } + + Bcb->CacheView[Index] = current; + + if (Bcb->CacheView[Index]->Bcb != NULL) + { + DPRINT1 ("%x\n", Bcb->CacheView[Index]->Bcb); + /* not implemented */ + KEBUGCHECK (0); + } + Bcb->CacheView[Index]->RefCount = 1; + Bcb->CacheView[Index]->Bcb = Bcb; + Bcb->CacheView[Index]->SectionData.ViewOffset = Index * CACHE_VIEW_SIZE; + Bcb->CacheView[Index]->SectionData.Section = Bcb->Section; + Bcb->CacheView[Index]->SectionData.Segment = Bcb->Section->Segment; + + Status = MmMapViewInSystemCache (Bcb->CacheView[Index]); + + if (!NT_SUCCESS (Status)) + { + KEBUGCHECK (0); + } + } + ExReleaseFastMutex (&CcCacheViewLock); + + iBcb = ExAllocateFromNPagedLookasideList (&iBcbLookasideList); + if (iBcb == NULL) + { + KEBUGCHECK (0); + } + memset (iBcb, 0, sizeof (INTERNAL_BCB)); + + iBcb->Bcb = Bcb; + iBcb->Index = Index; + + *piBcb = iBcb; + *pBuffer = + (PVOID) ((ULONG_PTR) Bcb->CacheView[Index]->BaseAddress + + (ULONG_PTR) (FileOffset->QuadPart - Bcb->CacheView[Index]->SectionData.ViewOffset)); + + DPRINT ("CcMapData() done\n"); + + return TRUE; +} + +/* + * @unimplemented + */ +BOOLEAN STDCALL +CcPinMappedData (IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, + IN ULONG Length, + IN ULONG Flags, + OUT PVOID * Bcb) +{ + /* no-op for current implementation. */ + return TRUE; +} + +/* + * @unimplemented + */ +BOOLEAN STDCALL +CcPinRead (IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, + IN ULONG Length, + IN ULONG Flags, + OUT PVOID * Bcb, + OUT PVOID * Buffer) +{ + if (CcMapData (FileObject, FileOffset, Length, Flags, Bcb, Buffer)) + { + if (CcPinMappedData (FileObject, FileOffset, Length, Flags, Bcb)) + return TRUE; + else + CcUnpinData (Bcb); + } + return FALSE; +} + +/* + * @unimplemented + */ +BOOLEAN STDCALL +CcPreparePinWrite (IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, + IN ULONG Length, + IN BOOLEAN Zero, + IN ULONG Flags, + OUT PVOID * Bcb, + OUT PVOID * Buffer) +{ + /* + * FIXME: This is function is similar to CcPinRead, but doesn't + * read the data if they're not present. Instead it should just + * prepare the cache segments and zero them out if Zero == TRUE. + * + * For now calling CcPinRead is better than returning error or + * just having UNIMPLEMENTED here. + */ + return CcPinRead (FileObject, FileOffset, Length, Flags, Bcb, Buffer); +} + +/* + * @implemented + */ +VOID STDCALL +CcSetDirtyPinnedData (IN PVOID Bcb, + IN PLARGE_INTEGER Lsn) { // PINTERNAL_BCB iBcb = Bcb; // iBcb->Dirty = TRUE; @@ -248,44 +239,38 @@ VOID STDCALL CcUnpinData (IN PVOID _iBcb) { - PINTERNAL_BCB iBcb = _iBcb; - - DPRINT("CcUnpinData(%x)\n", _iBcb); - - ExAcquireFastMutex(&CcCacheViewLock); - iBcb->Bcb->CacheView[iBcb->Index]->RefCount--; - if (iBcb->Bcb->CacheView[iBcb->Index]->RefCount == 0) - { - RemoveEntryList(&iBcb->Bcb->CacheView[iBcb->Index]->ListEntry); - InsertHeadList(&CcFreeCacheViewListHead, &iBcb->Bcb->CacheView[iBcb->Index]->ListEntry); - } - ExReleaseFastMutex(&CcCacheViewLock); - ExFreeToNPagedLookasideList(&iBcbLookasideList, iBcb); - - DPRINT("CcUnpinData done\n"); -} - -/* - * @unimplemented - */ -VOID -STDCALL -CcUnpinDataForThread ( - IN PVOID Bcb, - IN ERESOURCE_THREAD ResourceThreadId - ) -{ - UNIMPLEMENTED; -} - -/* - * @implemented - */ -VOID -STDCALL -CcRepinBcb ( - IN PVOID Bcb - ) + PINTERNAL_BCB iBcb = _iBcb; + + DPRINT ("CcUnpinData(%x)\n", _iBcb); + + ExAcquireFastMutex (&CcCacheViewLock); + iBcb->Bcb->CacheView[iBcb->Index]->RefCount--; + if (iBcb->Bcb->CacheView[iBcb->Index]->RefCount == 0) + { + RemoveEntryList (&iBcb->Bcb->CacheView[iBcb->Index]->ListEntry); + InsertHeadList (&CcFreeCacheViewListHead, &iBcb->Bcb->CacheView[iBcb->Index]->ListEntry); + } + ExReleaseFastMutex (&CcCacheViewLock); + ExFreeToNPagedLookasideList (&iBcbLookasideList, iBcb); + + DPRINT ("CcUnpinData done\n"); +} + +/* + * @unimplemented + */ +VOID STDCALL +CcUnpinDataForThread (IN PVOID Bcb, + IN ERESOURCE_THREAD ResourceThreadId) +{ + UNIMPLEMENTED; +} + +/* + * @implemented + */ +VOID STDCALL +CcRepinBcb (IN PVOID Bcb) { // PINTERNAL_BCB iBcb = Bcb; // iBcb->RefCount++; @@ -295,13 +280,10 @@ /* * @unimplemented */ -VOID -STDCALL -CcUnpinRepinnedBcb ( - IN PVOID Bcb, - IN BOOLEAN WriteThrough, - IN PIO_STATUS_BLOCK IoStatus) -{ - KEBUGCHECK(0); -} - +VOID STDCALL +CcUnpinRepinnedBcb (IN PVOID Bcb, + IN BOOLEAN WriteThrough, + IN PIO_STATUS_BLOCK IoStatus) +{ + KEBUGCHECK (0); +} Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/cc/view.c URL: http://svn.reactos.ru/svn/reactos/branches/cache_manager_rewrite/reactos/nt… ============================================================================== --- branches/cache_manager_rewrite/reactos/ntoskrnl/cc/view.c (original) +++ branches/cache_manager_rewrite/reactos/ntoskrnl/cc/view.c Mon Mar 27 22:17:12 2006 @@ -23,7 +23,7 @@ #undef ROUND_DOWN #endif -#define ROUND_UP(N, S) (((N) + (S) - 1) & ~((S) - 1)) +#define ROUND_UP(N, S) (((N) + (S) - 1) & ~((S) - 1)) #define ROUND_DOWN(N, S) ((N) & ~((S) - 1)) NPAGED_LOOKASIDE_LIST iBcbLookasideList; @@ -37,21 +37,18 @@ LIST_ENTRY CcInUseCacheViewListHead; PMEMORY_AREA CcCacheViewMemoryArea; -NTSTATUS NTAPI -MmCreateDataFileSection(PSECTION_OBJECT *SectionObject, - ACCESS_MASK DesiredAccess, - POBJECT_ATTRIBUTES ObjectAttributes, - PLARGE_INTEGER UMaximumSize, - ULONG SectionPageProtection, - ULONG AllocationAttributes, - PFILE_OBJECT FileObject, - BOOLEAN CacheManager); - -NTSTATUS STDCALL -MmUnmapViewInSystemCache(PCACHE_VIEW); - -NTSTATUS -MmFlushDataFileSection(PSECTION_OBJECT Section, PLARGE_INTEGER StartOffset, ULONG Length); +NTSTATUS NTAPI MmCreateDataFileSection (PSECTION_OBJECT * SectionObject, + ACCESS_MASK DesiredAccess, + POBJECT_ATTRIBUTES ObjectAttributes, + PLARGE_INTEGER UMaximumSize, + ULONG SectionPageProtection, + ULONG AllocationAttributes, + PFILE_OBJECT FileObject, + BOOLEAN CacheManager); + +NTSTATUS STDCALL MmUnmapViewInSystemCache (PCACHE_VIEW); + +NTSTATUS MmFlushDataFileSection (PSECTION_OBJECT Section, PLARGE_INTEGER StartOffset, ULONG Length); /* FUNCTIONS *****************************************************************/ @@ -59,247 +56,220 @@ * @implemented */ VOID STDCALL -CcFlushCache(IN PSECTION_OBJECT_POINTERS SectionObjectPointers, - IN PLARGE_INTEGER FileOffset OPTIONAL, - IN ULONG Length, - OUT PIO_STATUS_BLOCK IoStatus) -{ - PBCB Bcb; - NTSTATUS Status = STATUS_SUCCESS; - - DPRINT("CcFlushCache(SectionObjectPointers 0x%p, FileOffset 0x%p, Length %d, IoStatus 0x%p)\n", - SectionObjectPointers, FileOffset, Length, IoStatus); - - if (SectionObjectPointers && SectionObjectPointers->SharedCacheMap) - { - Bcb = (PBCB)SectionObjectPointers->SharedCacheMap; - ASSERT(Bcb); - - Status = MmFlushDataFileSection(Bcb->Section, FileOffset, Length); - } - if (IoStatus) - { - IoStatus->Status = Status; - IoStatus->Status = STATUS_SUCCESS; - } +CcFlushCache (IN PSECTION_OBJECT_POINTERS SectionObjectPointers, + IN PLARGE_INTEGER FileOffset OPTIONAL, + IN ULONG Length, + OUT PIO_STATUS_BLOCK IoStatus) +{ + PBCB Bcb; + NTSTATUS Status = STATUS_SUCCESS; + + DPRINT ("CcFlushCache(SectionObjectPointers 0x%p, FileOffset 0x%p, Length %d, IoStatus 0x%p)\n", + SectionObjectPointers, FileOffset, Length, IoStatus); + + if (SectionObjectPointers && SectionObjectPointers->SharedCacheMap) + { + Bcb = (PBCB) SectionObjectPointers->SharedCacheMap; + ASSERT (Bcb); + + Status = MmFlushDataFileSection (Bcb->Section, FileOffset, Length); + } + if (IoStatus) + { + IoStatus->Status = Status; + IoStatus->Status = STATUS_SUCCESS; + } } /* * @implemented */ PFILE_OBJECT STDCALL -CcGetFileObjectFromSectionPtrs(IN PSECTION_OBJECT_POINTERS SectionObjectPointers) -{ - PBCB Bcb; - if (SectionObjectPointers && SectionObjectPointers->SharedCacheMap) - { - Bcb = (PBCB)SectionObjectPointers->SharedCacheMap; - ASSERT(Bcb); - return Bcb->FileObject; - } - return NULL; -} - - -VOID -INIT_FUNCTION -NTAPI -CcInitView(VOID) - -{ - NTSTATUS Status; - PHYSICAL_ADDRESS BoundaryAddressMultiple; - ULONG i; - ULONG Size; - PVOID Base; - - DPRINT("CcInitView()\n"); - - ExInitializeFastMutex(&CcCacheViewLock); - - ExInitializeNPagedLookasideList (&iBcbLookasideList, - NULL, - NULL, - 0, - sizeof(INTERNAL_BCB), - TAG_IBCB, - 20); - ExInitializeNPagedLookasideList (&BcbLookasideList, - NULL, - NULL, - 0, - sizeof(BCB), - TAG_BCB, - 20); - - InitializeListHead(&CcFreeCacheViewListHead); - InitializeListHead(&CcInUseCacheViewListHead); - - BoundaryAddressMultiple.QuadPart = 0LL; - - Size = MmSystemRangeStart >= (PVOID)0xC0000000 ? 0x18000000 : 0x20000000; - CcCacheViewBase = (PVOID)(0xF0000000 - Size); - MmLockAddressSpace(MmGetKernelAddressSpace()); - - Status = MmCreateMemoryArea( - MmGetKernelAddressSpace(), - MEMORY_AREA_CACHE_SEGMENT, - &CcCacheViewBase, - Size, - 0, - &CcCacheViewMemoryArea, - FALSE, - FALSE, - BoundaryAddressMultiple); - MmUnlockAddressSpace(MmGetKernelAddressSpace()); - DPRINT1("CcCacheViewBase: %x\n", CcCacheViewBase); - if (!NT_SUCCESS(Status)) - { - KEBUGCHECK(0); - } - CcCacheViewArray = ExAllocatePool(NonPagedPool, sizeof(CACHE_VIEW) * (Size / CACHE_VIEW_SIZE)); - if (CcCacheViewArray == NULL) - { - KEBUGCHECK(0); - } - - Base = CcCacheViewBase; - CcCacheViewArrayCount = Size / CACHE_VIEW_SIZE; - for (i = 0; i < CcCacheViewArrayCount; i++) - { - CcCacheViewArray[i].BaseAddress = Base; - CcCacheViewArray[i].RefCount = 0; - CcCacheViewArray[i].Bcb = NULL; - CcCacheViewArray[i].SectionData.ViewOffset = 0; - InsertTailList(&CcFreeCacheViewListHead, &CcCacheViewArray[i].ListEntry); - Base = (PVOID)((ULONG_PTR)Base + CACHE_VIEW_SIZE); - } - CcInitCacheZeroPage(); - +CcGetFileObjectFromSectionPtrs (IN PSECTION_OBJECT_POINTERS SectionObjectPointers) +{ + PBCB Bcb; + if (SectionObjectPointers && SectionObjectPointers->SharedCacheMap) + { + Bcb = (PBCB) SectionObjectPointers->SharedCacheMap; + ASSERT (Bcb); + return Bcb->FileObject; + } + return NULL; +} + + +VOID INIT_FUNCTION NTAPI +CcInitView (VOID) +{ + NTSTATUS Status; + PHYSICAL_ADDRESS BoundaryAddressMultiple; + ULONG i; + ULONG Size; + PVOID Base; + + DPRINT ("CcInitView()\n"); + + ExInitializeFastMutex (&CcCacheViewLock); + + ExInitializeNPagedLookasideList (&iBcbLookasideList, NULL, NULL, 0, sizeof (INTERNAL_BCB), TAG_IBCB, 20); + ExInitializeNPagedLookasideList (&BcbLookasideList, NULL, NULL, 0, sizeof (BCB), TAG_BCB, 20); + + InitializeListHead (&CcFreeCacheViewListHead); + InitializeListHead (&CcInUseCacheViewListHead); + + BoundaryAddressMultiple.QuadPart = 0LL; + + Size = MmSystemRangeStart >= (PVOID) 0xC0000000 ? 0x18000000 : 0x20000000; + CcCacheViewBase = (PVOID) (0xF0000000 - Size); + MmLockAddressSpace (MmGetKernelAddressSpace ()); + + Status = MmCreateMemoryArea (MmGetKernelAddressSpace (), + MEMORY_AREA_CACHE_SEGMENT, + &CcCacheViewBase, Size, 0, &CcCacheViewMemoryArea, FALSE, FALSE, BoundaryAddressMultiple); + MmUnlockAddressSpace (MmGetKernelAddressSpace ()); + DPRINT1 ("CcCacheViewBase: %x\n", CcCacheViewBase); + if (!NT_SUCCESS (Status)) + { + KEBUGCHECK (0); + } + CcCacheViewArray = ExAllocatePool (NonPagedPool, sizeof (CACHE_VIEW) * (Size / CACHE_VIEW_SIZE)); + if (CcCacheViewArray == NULL) + { + KEBUGCHECK (0); + } + + Base = CcCacheViewBase; + CcCacheViewArrayCount = Size / CACHE_VIEW_SIZE; + for (i = 0; i < CcCacheViewArrayCount; i++) + { + CcCacheViewArray[i].BaseAddress = Base; + CcCacheViewArray[i].RefCount = 0; + CcCacheViewArray[i].Bcb = NULL; + CcCacheViewArray[i].SectionData.ViewOffset = 0; + InsertTailList (&CcFreeCacheViewListHead, &CcCacheViewArray[i].ListEntry); + Base = (PVOID) ((ULONG_PTR) Base + CACHE_VIEW_SIZE); + } + CcInitCacheZeroPage (); + } VOID STDCALL -CcInitializeCacheMap(IN PFILE_OBJECT FileObject, - IN PCC_FILE_SIZES FileSizes, - IN BOOLEAN PinAccess, - IN PCACHE_MANAGER_CALLBACKS CallBacks, - IN PVOID LazyWriterContext) -{ - PBCB Bcb; - NTSTATUS Status; - - DPRINT("CcInitializeCacheMap(), %wZ\n", &FileObject->FileName); - DPRINT("%I64x (%I64d)\n", FileSizes->FileSize.QuadPart, FileSizes->FileSize.QuadPart); - - ASSERT (FileObject); - ASSERT (FileSizes); - - ExAcquireFastMutex(&CcCacheViewLock); - - Bcb = FileObject->SectionObjectPointer->SharedCacheMap; - if (Bcb == NULL) - { - Bcb = ExAllocateFromNPagedLookasideList(&BcbLookasideList); - if (Bcb == NULL) - { - KEBUGCHECK(0); - } - memset(Bcb, 0, sizeof(BCB)); - - Bcb->FileObject = FileObject; - Bcb->FileSizes = *FileSizes; - Bcb->PinAccess = PinAccess; - Bcb->CallBacks = CallBacks; - Bcb->LazyWriterContext = LazyWriterContext; - Bcb->RefCount = 0; - - DPRINT("%x %x\n", FileObject, FileSizes->FileSize.QuadPart); - - Status = MmCreateDataFileSection(&Bcb->Section, - STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_WRITE, - NULL, - &Bcb->FileSizes.FileSize, - PAGE_READWRITE, - SEC_COMMIT, - Bcb->FileObject, - TRUE); - if (!NT_SUCCESS(Status)) - { - DPRINT1("%x\n", Status); - KEBUGCHECK(0); - } - - FileObject->SectionObjectPointer->SharedCacheMap = Bcb; - } - - if (FileObject->PrivateCacheMap == NULL) - { - FileObject->PrivateCacheMap = Bcb; - Bcb->RefCount++; - } - - ExReleaseFastMutex(&CcCacheViewLock); - DPRINT("CcInitializeCacheMap() done\n"); +CcInitializeCacheMap (IN PFILE_OBJECT FileObject, + IN PCC_FILE_SIZES FileSizes, + IN BOOLEAN PinAccess, + IN PCACHE_MANAGER_CALLBACKS CallBacks, + IN PVOID LazyWriterContext) +{ + PBCB Bcb; + NTSTATUS Status; + + DPRINT ("CcInitializeCacheMap(), %wZ\n", &FileObject->FileName); + DPRINT ("%I64x (%I64d)\n", FileSizes->FileSize.QuadPart, FileSizes->FileSize.QuadPart); + + ASSERT (FileObject); + ASSERT (FileSizes); + + ExAcquireFastMutex (&CcCacheViewLock); + + Bcb = FileObject->SectionObjectPointer->SharedCacheMap; + if (Bcb == NULL) + { + Bcb = ExAllocateFromNPagedLookasideList (&BcbLookasideList); + if (Bcb == NULL) + { + KEBUGCHECK (0); + } + memset (Bcb, 0, sizeof (BCB)); + + Bcb->FileObject = FileObject; + Bcb->FileSizes = *FileSizes; + Bcb->PinAccess = PinAccess; + Bcb->CallBacks = CallBacks; + Bcb->LazyWriterContext = LazyWriterContext; + Bcb->RefCount = 0; + + DPRINT ("%x %x\n", FileObject, FileSizes->FileSize.QuadPart); + + Status = MmCreateDataFileSection (&Bcb->Section, + STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_WRITE, + NULL, &Bcb->FileSizes.FileSize, PAGE_READWRITE, SEC_COMMIT, Bcb->FileObject, TRUE); + if (!NT_SUCCESS (Status)) + { + DPRINT1 ("%x\n", Status); + KEBUGCHECK (0); + } + + FileObject->SectionObjectPointer->SharedCacheMap = Bcb; + } + + if (FileObject->PrivateCacheMap == NULL) + { + FileObject->PrivateCacheMap = Bcb; + Bcb->RefCount++; + } + + ExReleaseFastMutex (&CcCacheViewLock); + DPRINT ("CcInitializeCacheMap() done\n"); } BOOLEAN STDCALL -CcUninitializeCacheMap (IN PFILE_OBJECT FileObject, - IN PLARGE_INTEGER TruncateSize OPTIONAL, - IN PCACHE_UNINITIALIZE_EVENT UninitializeCompleteEvent OPTIONAL) -{ - PBCB Bcb; - ULONG i; - NTSTATUS Status; - - DPRINT("CcUninitializeCacheMap(), %wZ\n", &FileObject->FileName); - ExAcquireFastMutex(&CcCacheViewLock); - Bcb = FileObject->SectionObjectPointer->SharedCacheMap; - if (Bcb) - { - if (FileObject->PrivateCacheMap == Bcb) - { - Bcb->RefCount--; - FileObject->PrivateCacheMap = NULL; - } - if (Bcb->RefCount == 0) - { - Bcb->RefCount++; - ExReleaseFastMutex(&CcCacheViewLock); - MmFlushDataFileSection(Bcb->Section, NULL, 0); - ExAcquireFastMutex(&CcCacheViewLock); - Bcb->RefCount--; - if (Bcb->RefCount == 0) - { - for (i = 0; i < ROUND_UP(Bcb->FileSizes.AllocationSize.QuadPart, CACHE_VIEW_SIZE) / CACHE_VIEW_SIZE; i++) - { - if (Bcb->CacheView[i] && Bcb->CacheView[i]->Bcb == Bcb) - { - CHECKPOINT; - if (Bcb->CacheView[i]->RefCount > 0) - { - KEBUGCHECK(0); - } - Status = MmUnmapViewInSystemCache(Bcb->CacheView[i]); - if (!NT_SUCCESS(Status)) - { - KEBUGCHECK(0); - } - Bcb->CacheView[i]->RefCount = 0; - Bcb->CacheView[i]->Bcb = NULL; - Bcb->CacheView[i] = NULL; - } - } - - DPRINT("%x\n", Bcb->Section); - ObDereferenceObject(Bcb->Section); - FileObject->SectionObjectPointer->SharedCacheMap = NULL; - ExFreeToNPagedLookasideList(&BcbLookasideList, Bcb); - } - } - } - DPRINT("CcUninitializeCacheMap() done, %wZ\n", &FileObject->FileName); - ExReleaseFastMutex(&CcCacheViewLock); - return TRUE; +CcUninitializeCacheMap (IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER TruncateSize OPTIONAL, + IN PCACHE_UNINITIALIZE_EVENT UninitializeCompleteEvent OPTIONAL) +{ + PBCB Bcb; + ULONG i; + NTSTATUS Status; + + DPRINT ("CcUninitializeCacheMap(), %wZ\n", &FileObject->FileName); + ExAcquireFastMutex (&CcCacheViewLock); + Bcb = FileObject->SectionObjectPointer->SharedCacheMap; + if (Bcb) + { + if (FileObject->PrivateCacheMap == Bcb) + { + Bcb->RefCount--; + FileObject->PrivateCacheMap = NULL; + } + if (Bcb->RefCount == 0) + { + Bcb->RefCount++; + ExReleaseFastMutex (&CcCacheViewLock); + MmFlushDataFileSection (Bcb->Section, NULL, 0); + ExAcquireFastMutex (&CcCacheViewLock); + Bcb->RefCount--; + if (Bcb->RefCount == 0) + { + for (i = 0; i < ROUND_UP (Bcb->FileSizes.AllocationSize.QuadPart, CACHE_VIEW_SIZE) / CACHE_VIEW_SIZE; i++) + { + if (Bcb->CacheView[i] && Bcb->CacheView[i]->Bcb == Bcb) + { + CHECKPOINT; + if (Bcb->CacheView[i]->RefCount > 0) + { + KEBUGCHECK (0); + } + Status = MmUnmapViewInSystemCache (Bcb->CacheView[i]); + if (!NT_SUCCESS (Status)) + { + KEBUGCHECK (0); + } + Bcb->CacheView[i]->RefCount = 0; + Bcb->CacheView[i]->Bcb = NULL; + Bcb->CacheView[i] = NULL; + } + } + + DPRINT ("%x\n", Bcb->Section); + ObDereferenceObject (Bcb->Section); + FileObject->SectionObjectPointer->SharedCacheMap = NULL; + ExFreeToNPagedLookasideList (&BcbLookasideList, Bcb); + } + } + } + DPRINT ("CcUninitializeCacheMap() done, %wZ\n", &FileObject->FileName); + ExReleaseFastMutex (&CcCacheViewLock); + return TRUE; }

18 years, 9 months

[fireball] 21399: - Sync oleaut32.dll to Wine-0.9.10 - Change related header files

by aleksey＠studiocerebral.com

Author: fireball Date: Mon Mar 27 20:44:53 2006 New Revision: 21399 URL: http://svn.reactos.ru/svn/reactos?rev=21399&view=rev Log: - Sync oleaut32.dll to Wine-0.9.10 - Change related header files Added: trunk/reactos/dll/win32/oleaut32/oleaut32_Tr.rc - copied unchanged from r21360, vendor/wine/dlls/oleaut32/current/oleaut32_Tr.rc Modified: trunk/reactos/dll/win32/oleaut32/connpt.c trunk/reactos/dll/win32/oleaut32/hash.c trunk/reactos/dll/win32/oleaut32/oleaut.c trunk/reactos/dll/win32/oleaut32/oleaut32.rc trunk/reactos/dll/win32/oleaut32/oleaut32.spec trunk/reactos/dll/win32/oleaut32/olefont.c trunk/reactos/dll/win32/oleaut32/olepicture.c trunk/reactos/dll/win32/oleaut32/tmarshal.c trunk/reactos/dll/win32/oleaut32/typelib.c trunk/reactos/dll/win32/oleaut32/usrmarshal.c trunk/reactos/dll/win32/oleaut32/varformat.c trunk/reactos/dll/win32/oleaut32/variant.c trunk/reactos/dll/win32/oleaut32/variant.h trunk/reactos/dll/win32/oleaut32/vartype.c trunk/reactos/include/oaidl.h trunk/reactos/include/ocidl.h trunk/reactos/include/olectl.h trunk/reactos/include/olectlid.h Modified: trunk/reactos/dll/win32/oleaut32/connpt.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/oleaut32/connpt.c… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/connpt.c (original) +++ trunk/reactos/dll/win32/oleaut32/connpt.c Mon Mar 27 20:44:53 2006 @@ -160,14 +160,10 @@ /* * Compare the riid with the interface IDs implemented by this object. */ - if (memcmp(&IID_IUnknown, riid, sizeof(IID_IUnknown)) == 0) - { + if (IsEqualIID(&IID_IUnknown, riid)) *ppvObject = (IConnectionPoint*)This; - } - else if (memcmp(&IID_IConnectionPoint, riid, sizeof(IID_IConnectionPoint)) == 0) - { + else if (IsEqualIID(&IID_IConnectionPoint, riid)) *ppvObject = (IConnectionPoint*)This; - } /* * Check that we obtained an interface. @@ -433,14 +429,10 @@ /* * Compare the riid with the interface IDs implemented by this object. */ - if (memcmp(&IID_IUnknown, riid, sizeof(IID_IUnknown)) == 0) - { + if (IsEqualIID(&IID_IUnknown, riid)) *ppvObject = (IEnumConnections*)This; - } - else if (memcmp(&IID_IEnumConnections, riid, sizeof(IID_IEnumConnections)) == 0) - { + else if (IsEqualIID(&IID_IEnumConnections, riid)) *ppvObject = (IEnumConnections*)This; - } /* * Check that we obtained an interface. Modified: trunk/reactos/dll/win32/oleaut32/hash.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/oleaut32/hash.c?r… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/hash.c (original) +++ trunk/reactos/dll/win32/oleaut32/hash.c Mon Mar 27 20:44:53 2006 @@ -539,8 +539,8 @@ case LANG_TATAR: case LANG_TELUGU: case LANG_THAI: case LANG_UKRAINIAN: case LANG_URDU: case LANG_UZBEK: case LANG_VIETNAMESE: case LANG_GAELIC: case LANG_MALTESE: - case LANG_MAORI: case LANG_RHAETO_ROMANCE: - case LANG_SAAMI: case LANG_SORBIAN: case LANG_SUTU: + case LANG_MAORI: case LANG_ROMANSH: case LANG_IRISH: + case LANG_SAMI: case LANG_UPPER_SORBIAN: case LANG_SUTU: case LANG_TSONGA: case LANG_TSWANA: case LANG_VENDA: case LANG_XHOSA: case LANG_ZULU: case LANG_ESPERANTO: case LANG_WALON: case LANG_CORNISH: case LANG_WELSH: Modified: trunk/reactos/dll/win32/oleaut32/oleaut.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut.c… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/oleaut.c (original) +++ trunk/reactos/dll/win32/oleaut32/oleaut.c Mon Mar 27 20:44:53 2006 @@ -446,8 +446,8 @@ BSTR_bCache = FALSE; } -static WCHAR _delimiter[2] = {'!',0}; /* default delimiter apparently */ -static WCHAR *pdelimiter = &_delimiter[0]; +static const WCHAR _delimiter[2] = {'!',0}; /* default delimiter apparently */ +static const WCHAR *pdelimiter = &_delimiter[0]; /*********************************************************************** * RegisterActiveObject (OLEAUT32.33) Modified: trunk/reactos/dll/win32/oleaut32/oleaut32.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut32… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/oleaut32.rc (original) +++ trunk/reactos/dll/win32/oleaut32/oleaut32.rc Mon Mar 27 20:44:53 2006 @@ -42,6 +42,7 @@ #include "oleaut32_Ru.rc" #include "oleaut32_Sv.rc" #include "oleaut32_Th.rc" +#include "oleaut32_Tr.rc" #include "oleaut32_Uk.rc" /* Modified: trunk/reactos/dll/win32/oleaut32/oleaut32.spec URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut32… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/oleaut32.spec (original) +++ trunk/reactos/dll/win32/oleaut32/oleaut32.spec Mon Mar 27 20:44:53 2006 @@ -111,7 +111,7 @@ 112 stdcall VarBstrFromR8(double long long ptr) 113 stdcall VarBstrFromCy(double long long ptr) 114 stdcall VarBstrFromDate(double long long ptr) -115 stub VarBstrFromDisp +115 stdcall VarBstrFromDisp(ptr long long ptr) 116 stdcall VarBstrFromBool(long long long ptr) 117 stdcall VarFormatPercent(ptr long long long long long ptr) 118 stdcall VarBoolFromUI1(long ptr) @@ -285,10 +285,10 @@ 288 stdcall VARIANT_UserMarshal(ptr ptr ptr) 289 stdcall VARIANT_UserUnmarshal(ptr ptr ptr) 290 stdcall VARIANT_UserFree(ptr ptr) -291 stub LPSAFEARRAY_UserSize -292 stub LPSAFEARRAY_UserMarshal -293 stub LPSAFEARRAY_UserUnmarshal -294 stub LPSAFEARRAY_UserFree +291 stdcall LPSAFEARRAY_UserSize(ptr long ptr) +292 stdcall LPSAFEARRAY_UserMarshal(ptr ptr ptr) +293 stdcall LPSAFEARRAY_UserUnmarshal(ptr ptr ptr) +294 stdcall LPSAFEARRAY_UserFree(ptr ptr) 295 stub LPSAFEARRAY_Size 296 stub LPSAFEARRAY_Marshal 297 stub LPSAFEARRAY_Unmarshal Modified: trunk/reactos/dll/win32/oleaut32/olefont.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/oleaut32/olefont.… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/olefont.c (original) +++ trunk/reactos/dll/win32/oleaut32/olefont.c Mon Mar 27 20:44:53 2006 @@ -40,6 +40,7 @@ #include "olectl.h" #include "wine/debug.h" #include "connpt.h" /* for CreateConnectionPoint */ +#include "oaidl.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); @@ -95,7 +96,8 @@ long cyLogical; long cyHimetric; - IConnectionPoint *pCP; + IConnectionPoint *pPropertyNotifyCP; + IConnectionPoint *pFontEventsCP; }; /* @@ -378,24 +380,74 @@ */ static void OLEFont_SendNotify(OLEFontImpl* this, DISPID dispID) { + static const WCHAR wszName[] = {'N','a','m','e',0}; + static const WCHAR wszSize[] = {'S','i','z','e',0}; + static const WCHAR wszBold[] = {'B','o','l','d',0}; + static const WCHAR wszItalic[] = {'I','t','a','l','i','c',0}; + static const WCHAR wszUnder[] = {'U','n','d','e','r','l','i','n','e',0}; + static const WCHAR wszStrike[] = {'S','t','r','i','k','e','t','h','r','o','u','g','h',0}; + static const WCHAR wszWeight[] = {'W','e','i','g','h','t',0}; + static const WCHAR wszCharset[] = {'C','h','a','r','s','s','e','t',0}; + static const LPCWSTR dispid_mapping[] = + { + wszName, + NULL, + wszSize, + wszBold, + wszItalic, + wszUnder, + wszStrike, + wszWeight, + wszCharset + }; + IEnumConnections *pEnum; CONNECTDATA CD; HRESULT hres; - hres = IConnectionPoint_EnumConnections(this->pCP, &pEnum); - if (FAILED(hres)) /* When we have 0 connections. */ - return; - - while(IEnumConnections_Next(pEnum, 1, &CD, NULL) == S_OK) { - IPropertyNotifySink *sink; - - IUnknown_QueryInterface(CD.pUnk, &IID_IPropertyNotifySink, (LPVOID)&sink); - IPropertyNotifySink_OnChanged(sink, dispID); - IPropertyNotifySink_Release(sink); - IUnknown_Release(CD.pUnk); + hres = IConnectionPoint_EnumConnections(this->pPropertyNotifyCP, &pEnum); + if (SUCCEEDED(hres)) + { + while(IEnumConnections_Next(pEnum, 1, &CD, NULL) == S_OK) { + IPropertyNotifySink *sink; + + IUnknown_QueryInterface(CD.pUnk, &IID_IPropertyNotifySink, (LPVOID)&sink); + IPropertyNotifySink_OnChanged(sink, dispID); + IPropertyNotifySink_Release(sink); + IUnknown_Release(CD.pUnk); + } + IEnumConnections_Release(pEnum); } - IEnumConnections_Release(pEnum); - return; + + hres = IConnectionPoint_EnumConnections(this->pFontEventsCP, &pEnum); + if (SUCCEEDED(hres)) + { + DISPPARAMS dispparams; + VARIANTARG vararg; + + VariantInit(&vararg); + V_VT(&vararg) = VT_BSTR; + V_BSTR(&vararg) = SysAllocString(dispid_mapping[dispID]); + + dispparams.cArgs = 1; + dispparams.cNamedArgs = 0; + dispparams.rgdispidNamedArgs = NULL; + dispparams.rgvarg = &vararg; + + while(IEnumConnections_Next(pEnum, 1, &CD, NULL) == S_OK) { + IFontEventsDisp *disp; + + IUnknown_QueryInterface(CD.pUnk, &IID_IFontEventsDisp, (LPVOID)&disp); + IDispatch_Invoke(disp, DISPID_FONT_CHANGED, &IID_NULL, + LOCALE_NEUTRAL, INVOKE_FUNC, &dispparams, NULL, + NULL, NULL); + + IDispatch_Release(disp); + IUnknown_Release(CD.pUnk); + } + VariantClear(&vararg); + IEnumConnections_Release(pEnum); + } } /************************************************************************ @@ -459,7 +511,18 @@ newObject->fontLock = 0; newObject->cyLogical = 72L; newObject->cyHimetric = 2540L; - CreateConnectionPoint((IUnknown*)newObject, &IID_IPropertyNotifySink, &newObject->pCP); + newObject->pPropertyNotifyCP = NULL; + newObject->pFontEventsCP = NULL; + + CreateConnectionPoint((IUnknown*)newObject, &IID_IPropertyNotifySink, &newObject->pPropertyNotifyCP); + CreateConnectionPoint((IUnknown*)newObject, &IID_IFontEventsDisp, &newObject->pFontEventsCP); + + if (!newObject->pPropertyNotifyCP || !newObject->pFontEventsCP) + { + OLEFontImpl_Destroy(newObject); + return NULL; + } + TRACE("returning %p\n", newObject); return newObject; } @@ -479,6 +542,11 @@ if (fontDesc->gdiFont!=0) DeleteObject(fontDesc->gdiFont); + + if (fontDesc->pPropertyNotifyCP) + IConnectionPoint_Release(fontDesc->pPropertyNotifyCP); + if (fontDesc->pFontEventsCP) + IConnectionPoint_Release(fontDesc->pFontEventsCP); HeapFree(GetProcessHeap(), 0, fontDesc); } @@ -1041,6 +1109,17 @@ newObject->gdiFont = CreateFontIndirectW(&logFont); + /* create new connection points */ + newObject->pPropertyNotifyCP = NULL; + newObject->pFontEventsCP = NULL; + CreateConnectionPoint((IUnknown*)newObject, &IID_IPropertyNotifySink, &newObject->pPropertyNotifyCP); + CreateConnectionPoint((IUnknown*)newObject, &IID_IFontEventsDisp, &newObject->pFontEventsCP); + + if (!newObject->pPropertyNotifyCP || !newObject->pFontEventsCP) + { + OLEFontImpl_Destroy(newObject); + return E_OUTOFMEMORY; + } /* The cloned object starts with a reference count of 1 */ newObject->ref = 1; @@ -1839,12 +1918,17 @@ OLEFontImpl *this = impl_from_IConnectionPointContainer(iface); TRACE("(%p)->(%s, %p): stub\n", this, debugstr_guid(riid), ppCp); - if(memcmp(riid, &IID_IPropertyNotifySink, sizeof(IID_IPropertyNotifySink)) == 0) { - return IConnectionPoint_QueryInterface(this->pCP, &IID_IConnectionPoint, - (LPVOID)ppCp); + if(IsEqualIID(riid, &IID_IPropertyNotifySink)) { + return IConnectionPoint_QueryInterface(this->pPropertyNotifyCP, + &IID_IConnectionPoint, + (LPVOID)ppCp); + } else if(IsEqualIID(riid, &IID_IFontEventsDisp)) { + return IConnectionPoint_QueryInterface(this->pFontEventsCP, + &IID_IConnectionPoint, + (LPVOID)ppCp); } else { - FIXME("Tried to find connection point on %s\n", debugstr_guid(riid)); - return E_NOINTERFACE; + FIXME("no connection point for %s\n", debugstr_guid(riid)); + return CONNECT_E_NOCONNECTION; } } Modified: trunk/reactos/dll/win32/oleaut32/olepicture.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/oleaut32/olepictu… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/olepicture.c (original) +++ trunk/reactos/dll/win32/oleaut32/olepicture.c Mon Mar 27 20:44:53 2006 @@ -279,7 +279,13 @@ newObject->lpvtblIPersistStream = &OLEPictureImpl_IPersistStream_VTable; newObject->lpvtblIConnectionPointContainer = &OLEPictureImpl_IConnectionPointContainer_VTable; + newObject->pCP = NULL; CreateConnectionPoint((IUnknown*)newObject,&IID_IPropertyNotifySink,&newObject->pCP); + if (!newObject->pCP) + { + HeapFree(GetProcessHeap(), 0, newObject); + return NULL; + } /* * Start with one reference count. The caller of this function @@ -348,6 +354,9 @@ static void OLEPictureImpl_Destroy(OLEPictureImpl* Obj) { TRACE("(%p)\n", Obj); + + if (Obj->pCP) + IConnectionPoint_Release(Obj->pCP); if(Obj->fOwn) { /* We need to destroy the picture */ switch(Obj->desc.picType) { @@ -377,7 +386,43 @@ HeapFree(GetProcessHeap(), 0, Obj); } -static ULONG WINAPI OLEPictureImpl_AddRef(IPicture* iface); + +/************************************************************************ + * OLEPictureImpl_AddRef (IUnknown) + * + * See Windows documentation for more details on IUnknown methods. + */ +static ULONG WINAPI OLEPictureImpl_AddRef( + IPicture* iface) +{ + OLEPictureImpl *This = (OLEPictureImpl *)iface; + ULONG refCount = InterlockedIncrement(&This->ref); + + TRACE("(%p)->(ref before=%ld)\n", This, refCount - 1); + + return refCount; +} + +/************************************************************************ + * OLEPictureImpl_Release (IUnknown) + * + * See Windows documentation for more details on IUnknown methods. + */ +static ULONG WINAPI OLEPictureImpl_Release( + IPicture* iface) +{ + OLEPictureImpl *This = (OLEPictureImpl *)iface; + ULONG refCount = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(ref before=%ld)\n", This, refCount + 1); + + /* + * If the reference count goes down to 0, perform suicide. + */ + if (!refCount) OLEPictureImpl_Destroy(This); + + return refCount; +} /************************************************************************ * OLEPictureImpl_QueryInterface (IUnknown) @@ -447,6 +492,7 @@ return S_OK; } + /*********************************************************************** * OLEPicture_SendNotify (internal) * @@ -471,44 +517,6 @@ IEnumConnections_Release(pEnum); return; } - -/************************************************************************ - * OLEPictureImpl_AddRef (IUnknown) - * - * See Windows documentation for more details on IUnknown methods. - */ -static ULONG WINAPI OLEPictureImpl_AddRef( - IPicture* iface) -{ - OLEPictureImpl *This = (OLEPictureImpl *)iface; - ULONG refCount = InterlockedIncrement(&This->ref); - - TRACE("(%p)->(ref before=%ld)\n", This, refCount - 1); - - return refCount; -} - -/************************************************************************ - * OLEPictureImpl_Release (IUnknown) - * - * See Windows documentation for more details on IUnknown methods. - */ -static ULONG WINAPI OLEPictureImpl_Release( - IPicture* iface) -{ - OLEPictureImpl *This = (OLEPictureImpl *)iface; - ULONG refCount = InterlockedDecrement(&This->ref); - - TRACE("(%p)->(ref before=%ld)\n", This, refCount + 1); - - /* - * If the reference count goes down to 0, perform suicide. - */ - if (!refCount) OLEPictureImpl_Destroy(This); - - return refCount; -} - /************************************************************************ * OLEPictureImpl_get_Handle @@ -820,7 +828,6 @@ /************************************************************************ * IConnectionPointContainer */ - static HRESULT WINAPI OLEPictureImpl_IConnectionPointContainer_QueryInterface( IConnectionPointContainer* iface, REFIID riid, @@ -869,12 +876,15 @@ *ppCP = NULL; if (IsEqualGUID(riid,&IID_IPropertyNotifySink)) return IConnectionPoint_QueryInterface(This->pCP,&IID_IConnectionPoint,(LPVOID)ppCP); - FIXME("tried to find connection point on %s?\n",debugstr_guid(riid)); - return 0x80040200; -} + FIXME("no connection point for %s\n",debugstr_guid(riid)); + return CONNECT_E_NOCONNECTION; +} + + /************************************************************************ * IPersistStream */ + /************************************************************************ * OLEPictureImpl_IPersistStream_QueryInterface (IUnknown) * @@ -1043,137 +1053,9 @@ #endif /* HAVE_GIF_LIB_H */ -/************************************************************************ - * OLEPictureImpl_IPersistStream_Load (IUnknown) - * - * Loads the binary data from the IStream. Starts at current position. - * There appears to be an 2 DWORD header: - * DWORD magic; - * DWORD len; - * - * Currently implemented: BITMAP, ICON, JPEG, GIF - */ -static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface,IStream*pStm) { - HRESULT hr = E_FAIL; - BOOL headerisdata = FALSE; - BOOL statfailed = FALSE; - ULONG xread, toread; - BYTE *xbuf; - DWORD header[2]; - WORD magic; - STATSTG statstg; - OLEPictureImpl *This = impl_from_IPersistStream(iface); - - TRACE("(%p,%p)\n",This,pStm); - - /**************************************************************************************** - * Part 1: Load the data - */ - /* Sometimes we have a header, sometimes we don't. Apply some guesses to find - * out whether we do. - * - * UPDATE: the IStream can be mapped to a plain file instead of a stream in a - * compound file. This may explain most, if not all, of the cases of "no - * header", and the header validation should take this into account. - * At least in Visual Basic 6, resource streams, valid headers are - * header[0] == "lt\0\0", - * header[1] == length_of_stream. - * - * Also handle streams where we do not have a working "Stat" method by - * reading all data until the end of the stream. - */ - hr=IStream_Stat(pStm,&statstg,STATFLAG_NONAME); - if (hr) { - TRACE("stat failed with hres %lx, proceeding to read all data.\n",hr); - statfailed = TRUE; - /* we will read at least 8 byte ... just right below */ - statstg.cbSize.QuadPart = 8; - } - hr=IStream_Read(pStm,header,8,&xread); - if (hr || xread!=8) { - FIXME("Failure while reading picture header (hr is %lx, nread is %ld).\n",hr,xread); - return hr; - } - - headerisdata = FALSE; - xread = 0; - if (!memcmp(&(header[0]),"lt\0\0", 4) && (header[1] <= statstg.cbSize.QuadPart-8)) { - toread = header[1]; - } else { - if (!memcmp(&(header[0]), "GIF8", 4) || /* GIF header */ - !memcmp(&(header[0]), "BM", 2) || /* BMP header */ - !memcmp(&(header[0]), "\xff\xd8", 2) || /* JPEG header */ - (header[1] > statstg.cbSize.QuadPart)|| /* invalid size */ - (header[1]==0) - ) {/* Incorrect header, assume none. */ - headerisdata = TRUE; - toread = statstg.cbSize.QuadPart-8; - xread = 8; - } else { - FIXME("Unknown stream header magic: %08lx\n", header[0]); - toread = header[1]; - } - } - - if (statfailed) { /* we don't know the size ... read all we get */ - int sizeinc = 4096; - int origsize = sizeinc; - ULONG nread = 42; - - TRACE("Reading all data from stream.\n"); - xbuf = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, origsize); - if (headerisdata) - memcpy (xbuf, &header, 8); - while (1) { - while (xread < origsize) { - hr = IStream_Read(pStm,xbuf+xread,origsize-xread,&nread); - xread+=nread; - if (hr || !nread) - break; - } - if (!nread || hr) /* done, or error */ - break; - if (xread == origsize) { - origsize += sizeinc; - sizeinc = 2*sizeinc; /* exponential increase */ - xbuf = HeapReAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, xbuf, origsize); - } - } - if (hr) - TRACE("hr in no-stat loader case is %08lx\n", hr); - TRACE("loaded %ld bytes.\n", xread); - This->datalen = xread; - This->data = xbuf; - } else { - This->datalen = toread+(headerisdata?8:0); - xbuf = This->data = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, This->datalen); - - if (headerisdata) - memcpy (xbuf, &header, 8); - - while (xread < This->datalen) { - ULONG nread; - hr = IStream_Read(pStm,xbuf+xread,This->datalen-xread,&nread); - xread+=nread; - if (hr || !nread) - break; - } - if (xread != This->datalen) - FIXME("Could only read %ld of %d bytes out of stream?\n",xread,This->datalen); - } - if (This->datalen == 0) { /* Marks the "NONE" picture */ - This->desc.picType = PICTYPE_NONE; - return S_OK; - } - - - /**************************************************************************************** - * Part 2: Process the loaded data - */ - - magic = xbuf[0] + (xbuf[1]<<8); - switch (magic) { - case 0x4947: { /* GIF */ + +static HRESULT OLEPictureImpl_LoadGif(OLEPictureImpl *This, BYTE *xbuf, ULONG xread) +{ #ifdef HAVE_GIF_LIB_H struct gifdata gd; GifFileType *gif; @@ -1378,8 +1260,10 @@ FIXME("Trying to load GIF, but no support for libgif/libungif compiled in.\n"); return E_FAIL; #endif - } - case 0xd8ff: { /* JPEG */ +} + +static HRESULT OLEPictureImpl_LoadJpeg(OLEPictureImpl *This, BYTE *xbuf, ULONG xread) +{ #ifdef HAVE_JPEGLIB_H struct jpeg_decompress_struct jd; struct jpeg_error_mgr jerr; @@ -1475,15 +1359,16 @@ DeleteDC(hdcref); This->desc.picType = PICTYPE_BITMAP; OLEPictureImpl_SetBitmap(This); - hr = S_OK; HeapFree(GetProcessHeap(),0,bits); + return S_OK; #else ERR("Trying to load JPEG picture, but JPEG supported not compiled in.\n"); - hr = E_FAIL; + return E_FAIL; #endif - break; - } - case 0x4d42: { /* Bitmap */ +} + +static HRESULT OLEPictureImpl_LoadDIB(OLEPictureImpl *This, BYTE *xbuf, ULONG xread) +{ BITMAPFILEHEADER *bfh = (BITMAPFILEHEADER*)xbuf; BITMAPINFO *bi = (BITMAPINFO*)(bfh+1); HDC hdcref; @@ -1503,10 +1388,11 @@ DeleteDC(hdcref); This->desc.picType = PICTYPE_BITMAP; OLEPictureImpl_SetBitmap(This); - hr = S_OK; - break; - } - case 0x0000: { /* ICON , first word is dwReserved */ + return S_OK; +} + +static HRESULT OLEPictureImpl_LoadIcon(OLEPictureImpl *This, BYTE *xbuf, ULONG xread) +{ HICON hicon; CURSORICONFILEDIR *cifd = (CURSORICONFILEDIR*)xbuf; HDC hdcRef; @@ -1551,7 +1437,7 @@ ); if (!hicon) { FIXME("CreateIcon failed.\n"); - hr = E_FAIL; + return E_FAIL; } else { This->desc.picType = PICTYPE_ICON; This->desc.u.icon.hicon = hicon; @@ -1561,8 +1447,151 @@ This->himetricWidth =(cifd->idEntries[i].bWidth *2540)/GetDeviceCaps(hdcRef, LOGPIXELSX); This->himetricHeight=(cifd->idEntries[i].bHeight*2540)/GetDeviceCaps(hdcRef, LOGPIXELSY); DeleteDC(hdcRef); - hr = S_OK; + return S_OK; } +} + +/************************************************************************ + * OLEPictureImpl_IPersistStream_Load (IUnknown) + * + * Loads the binary data from the IStream. Starts at current position. + * There appears to be an 2 DWORD header: + * DWORD magic; + * DWORD len; + * + * Currently implemented: BITMAP, ICON, JPEG, GIF + */ +static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface,IStream*pStm) { + HRESULT hr = E_FAIL; + BOOL headerisdata = FALSE; + BOOL statfailed = FALSE; + ULONG xread, toread; + BYTE *xbuf; + DWORD header[2]; + WORD magic; + STATSTG statstg; + OLEPictureImpl *This = impl_from_IPersistStream(iface); + + TRACE("(%p,%p)\n",This,pStm); + + /**************************************************************************************** + * Part 1: Load the data + */ + /* Sometimes we have a header, sometimes we don't. Apply some guesses to find + * out whether we do. + * + * UPDATE: the IStream can be mapped to a plain file instead of a stream in a + * compound file. This may explain most, if not all, of the cases of "no + * header", and the header validation should take this into account. + * At least in Visual Basic 6, resource streams, valid headers are + * header[0] == "lt\0\0", + * header[1] == length_of_stream. + * + * Also handle streams where we do not have a working "Stat" method by + * reading all data until the end of the stream. + */ + hr=IStream_Stat(pStm,&statstg,STATFLAG_NONAME); + if (hr) { + TRACE("stat failed with hres %lx, proceeding to read all data.\n",hr); + statfailed = TRUE; + /* we will read at least 8 byte ... just right below */ + statstg.cbSize.QuadPart = 8; + } + hr=IStream_Read(pStm,header,8,&xread); + if (hr || xread!=8) { + FIXME("Failure while reading picture header (hr is %lx, nread is %ld).\n",hr,xread); + return hr; + } + + headerisdata = FALSE; + xread = 0; + if (!memcmp(&(header[0]),"lt\0\0", 4) && (header[1] <= statstg.cbSize.QuadPart-8)) { + toread = header[1]; + } else { + if (!memcmp(&(header[0]), "GIF8", 4) || /* GIF header */ + !memcmp(&(header[0]), "BM", 2) || /* BMP header */ + !memcmp(&(header[0]), "\xff\xd8", 2) || /* JPEG header */ + (header[1] > statstg.cbSize.QuadPart)|| /* invalid size */ + (header[1]==0) + ) {/* Incorrect header, assume none. */ + headerisdata = TRUE; + toread = statstg.cbSize.QuadPart-8; + xread = 8; + } else { + FIXME("Unknown stream header magic: %08lx\n", header[0]); + toread = header[1]; + } + } + + if (statfailed) { /* we don't know the size ... read all we get */ + int sizeinc = 4096; + int origsize = sizeinc; + ULONG nread = 42; + + TRACE("Reading all data from stream.\n"); + xbuf = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, origsize); + if (headerisdata) + memcpy (xbuf, &header, 8); + while (1) { + while (xread < origsize) { + hr = IStream_Read(pStm,xbuf+xread,origsize-xread,&nread); + xread+=nread; + if (hr || !nread) + break; + } + if (!nread || hr) /* done, or error */ + break; + if (xread == origsize) { + origsize += sizeinc; + sizeinc = 2*sizeinc; /* exponential increase */ + xbuf = HeapReAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, xbuf, origsize); + } + } + if (hr) + TRACE("hr in no-stat loader case is %08lx\n", hr); + TRACE("loaded %ld bytes.\n", xread); + This->datalen = xread; + This->data = xbuf; + } else { + This->datalen = toread+(headerisdata?8:0); + xbuf = This->data = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, This->datalen); + + if (headerisdata) + memcpy (xbuf, &header, 8); + + while (xread < This->datalen) { + ULONG nread; + hr = IStream_Read(pStm,xbuf+xread,This->datalen-xread,&nread); + xread+=nread; + if (hr || !nread) + break; + } + if (xread != This->datalen) + FIXME("Could only read %ld of %d bytes out of stream?\n",xread,This->datalen); + } + if (This->datalen == 0) { /* Marks the "NONE" picture */ + This->desc.picType = PICTYPE_NONE; + return S_OK; + } + + + /**************************************************************************************** + * Part 2: Process the loaded data + */ + + magic = xbuf[0] + (xbuf[1]<<8); + switch (magic) { + case 0x4947: /* GIF */ + hr = OLEPictureImpl_LoadGif(This, xbuf, xread); + break; + case 0xd8ff: /* JPEG */ + hr = OLEPictureImpl_LoadJpeg(This, xbuf, xread); + break; + case 0x4d42: /* Bitmap */ + hr = OLEPictureImpl_LoadDIB(This, xbuf, xread); + break; + case 0x0000: { /* ICON , first word is dwReserved */ + hr = OLEPictureImpl_LoadIcon(This, xbuf, xread); break; } default: @@ -1587,8 +1616,223 @@ return hr; } -static int serializeIcon(HICON hIcon, void ** ppBuffer, unsigned int * pLength); -static int serializeBMP(HBITMAP hBitmap, void ** ppBuffer, unsigned int * pLength); +static int serializeBMP(HBITMAP hBitmap, void ** ppBuffer, unsigned int * pLength) +{ + int iSuccess = 0; + HDC hDC; + BITMAPINFO * pInfoBitmap; + int iNumPaletteEntries; + unsigned char * pPixelData; + BITMAPFILEHEADER * pFileHeader; + BITMAPINFO * pInfoHeader; + + pInfoBitmap = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)); + + /* Find out bitmap size and padded length */ + hDC = GetDC(0); + pInfoBitmap->bmiHeader.biSize = sizeof(pInfoBitmap->bmiHeader); + GetDIBits(hDC, hBitmap, 0, 0, NULL, pInfoBitmap, DIB_RGB_COLORS); + + /* Fetch bitmap palette & pixel data */ + + pPixelData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, pInfoBitmap->bmiHeader.biSizeImage); + GetDIBits(hDC, hBitmap, 0, pInfoBitmap->bmiHeader.biHeight, pPixelData, pInfoBitmap, DIB_RGB_COLORS); + + /* Calculate the total length required for the BMP data */ + if (pInfoBitmap->bmiHeader.biClrUsed != 0) { + iNumPaletteEntries = pInfoBitmap->bmiHeader.biClrUsed; + if (iNumPaletteEntries > 256) iNumPaletteEntries = 256; + } else { + if (pInfoBitmap->bmiHeader.biBitCount <= 8) + iNumPaletteEntries = 1 << pInfoBitmap->bmiHeader.biBitCount; + else + iNumPaletteEntries = 0; + } + *pLength = + sizeof(BITMAPFILEHEADER) + + sizeof(BITMAPINFOHEADER) + + iNumPaletteEntries * sizeof(RGBQUAD) + + pInfoBitmap->bmiHeader.biSizeImage; + *ppBuffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, *pLength); + + /* Fill the BITMAPFILEHEADER */ + pFileHeader = (BITMAPFILEHEADER *)(*ppBuffer); + pFileHeader->bfType = 0x4d42; + pFileHeader->bfSize = *pLength; + pFileHeader->bfOffBits = + sizeof(BITMAPFILEHEADER) + + sizeof(BITMAPINFOHEADER) + + iNumPaletteEntries * sizeof(RGBQUAD); + + /* Fill the BITMAPINFOHEADER and the palette data */ + pInfoHeader = (BITMAPINFO *)((unsigned char *)(*ppBuffer) + sizeof(BITMAPFILEHEADER)); + memcpy(pInfoHeader, pInfoBitmap, sizeof(BITMAPINFOHEADER) + iNumPaletteEntries * sizeof(RGBQUAD)); + memcpy( + (unsigned char *)(*ppBuffer) + + sizeof(BITMAPFILEHEADER) + + sizeof(BITMAPINFOHEADER) + + iNumPaletteEntries * sizeof(RGBQUAD), + pPixelData, pInfoBitmap->bmiHeader.biSizeImage); + iSuccess = 1; + + HeapFree(GetProcessHeap(), 0, pPixelData); + HeapFree(GetProcessHeap(), 0, pInfoBitmap); + return iSuccess; +} + +static int serializeIcon(HICON hIcon, void ** ppBuffer, unsigned int * pLength) +{ + ICONINFO infoIcon; + int iSuccess = 0; + + *ppBuffer = NULL; *pLength = 0; + if (GetIconInfo(hIcon, &infoIcon)) { + HDC hDC; + BITMAPINFO * pInfoBitmap; + unsigned char * pIconData = NULL; + unsigned int iDataSize = 0; + + pInfoBitmap = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)); + + /* Find out icon size */ + hDC = GetDC(0); + pInfoBitmap->bmiHeader.biSize = sizeof(pInfoBitmap->bmiHeader); + GetDIBits(hDC, infoIcon.hbmColor, 0, 0, NULL, pInfoBitmap, DIB_RGB_COLORS); + if (1) { + /* Auxiliary pointers */ + CURSORICONFILEDIR * pIconDir; + CURSORICONFILEDIRENTRY * pIconEntry; + BITMAPINFOHEADER * pIconBitmapHeader; + unsigned int iOffsetPalette; + unsigned int iOffsetColorData; + unsigned int iOffsetMaskData; + + unsigned int iLengthScanLineColor; + unsigned int iLengthScanLineMask; + unsigned int iNumEntriesPalette; + + iLengthScanLineMask = ((pInfoBitmap->bmiHeader.biWidth + 31) >> 5) << 2; + iLengthScanLineColor = ((pInfoBitmap->bmiHeader.biWidth * pInfoBitmap->bmiHeader.biBitCount + 31) >> 5) << 2; +/* + FIXME("DEBUG: bitmap size is %d x %d\n", + pInfoBitmap->bmiHeader.biWidth, + pInfoBitmap->bmiHeader.biHeight); + FIXME("DEBUG: bitmap bpp is %d\n", + pInfoBitmap->bmiHeader.biBitCount); + FIXME("DEBUG: bitmap nplanes is %d\n", + pInfoBitmap->bmiHeader.biPlanes); + FIXME("DEBUG: bitmap biSizeImage is %lu\n", + pInfoBitmap->bmiHeader.biSizeImage); +*/ + /* Let's start with one CURSORICONFILEDIR and one CURSORICONFILEDIRENTRY */ + iDataSize += 3 * sizeof(WORD) + sizeof(CURSORICONFILEDIRENTRY) + sizeof(BITMAPINFOHEADER); + pIconData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, iDataSize); + + /* Fill out the CURSORICONFILEDIR */ + pIconDir = (CURSORICONFILEDIR *)pIconData; + pIconDir->idType = 1; + pIconDir->idCount = 1; + + /* Fill out the CURSORICONFILEDIRENTRY */ + pIconEntry = (CURSORICONFILEDIRENTRY *)(pIconData + 3 * sizeof(WORD)); + pIconEntry->bWidth = (unsigned char)pInfoBitmap->bmiHeader.biWidth; + pIconEntry->bHeight = (unsigned char)pInfoBitmap->bmiHeader.biHeight; + pIconEntry->bColorCount = + (pInfoBitmap->bmiHeader.biBitCount < 8) + ? 1 << pInfoBitmap->bmiHeader.biBitCount + : 0; + pIconEntry->xHotspot = pInfoBitmap->bmiHeader.biPlanes; + pIconEntry->yHotspot = pInfoBitmap->bmiHeader.biBitCount; + pIconEntry->dwDIBSize = 0; + pIconEntry->dwDIBOffset = 3 * sizeof(WORD) + sizeof(CURSORICONFILEDIRENTRY); + + /* Fill out the BITMAPINFOHEADER */ + pIconBitmapHeader = (BITMAPINFOHEADER *)(pIconData + 3 * sizeof(WORD) + sizeof(CURSORICONFILEDIRENTRY)); + memcpy(pIconBitmapHeader, &pInfoBitmap->bmiHeader, sizeof(BITMAPINFOHEADER)); + + /* Find out whether a palette exists for the bitmap */ + if ( (pInfoBitmap->bmiHeader.biBitCount == 16 && pInfoBitmap->bmiHeader.biCompression == BI_RGB) + || (pInfoBitmap->bmiHeader.biBitCount == 24) + || (pInfoBitmap->bmiHeader.biBitCount == 32 && pInfoBitmap->bmiHeader.biCompression == BI_RGB)) { + iNumEntriesPalette = pInfoBitmap->bmiHeader.biClrUsed; + if (iNumEntriesPalette > 256) iNumEntriesPalette = 256; + } else if ((pInfoBitmap->bmiHeader.biBitCount == 16 || pInfoBitmap->bmiHeader.biBitCount == 32) + && pInfoBitmap->bmiHeader.biCompression == BI_BITFIELDS) { + iNumEntriesPalette = 3; + } else if (pInfoBitmap->bmiHeader.biBitCount <= 8) { + iNumEntriesPalette = 1 << pInfoBitmap->bmiHeader.biBitCount; + } else { + iNumEntriesPalette = 0; + } + + /* Add bitmap size and header size to icon data size. */ + iOffsetPalette = iDataSize; + iDataSize += iNumEntriesPalette * sizeof(DWORD); + iOffsetColorData = iDataSize; + iDataSize += pIconBitmapHeader->biSizeImage; + iOffsetMaskData = iDataSize; + iDataSize += pIconBitmapHeader->biHeight * iLengthScanLineMask; + pIconBitmapHeader->biSizeImage += pIconBitmapHeader->biHeight * iLengthScanLineMask; + pIconBitmapHeader->biHeight *= 2; + pIconData = HeapReAlloc(GetProcessHeap(), 0, pIconData, iDataSize); + pIconEntry = (CURSORICONFILEDIRENTRY *)(pIconData + 3 * sizeof(WORD)); + pIconBitmapHeader = (BITMAPINFOHEADER *)(pIconData + 3 * sizeof(WORD) + sizeof(CURSORICONFILEDIRENTRY)); + pIconEntry->dwDIBSize = iDataSize - (3 * sizeof(WORD) + sizeof(CURSORICONFILEDIRENTRY)); + + /* Get the actual bitmap data from the icon bitmap */ + GetDIBits(hDC, infoIcon.hbmColor, 0, pInfoBitmap->bmiHeader.biHeight, + pIconData + iOffsetColorData, pInfoBitmap, DIB_RGB_COLORS); + if (iNumEntriesPalette > 0) { + memcpy(pIconData + iOffsetPalette, pInfoBitmap->bmiColors, + iNumEntriesPalette * sizeof(RGBQUAD)); + } + + /* Reset all values so that GetDIBits call succeeds */ + memset(pIconData + iOffsetMaskData, 0, iDataSize - iOffsetMaskData); + memset(pInfoBitmap, 0, sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)); + pInfoBitmap->bmiHeader.biSize = sizeof(pInfoBitmap->bmiHeader); +/* + if (!(GetDIBits(hDC, infoIcon.hbmMask, 0, 0, NULL, pInfoBitmap, DIB_RGB_COLORS) + && GetDIBits(hDC, infoIcon.hbmMask, 0, pIconEntry->bHeight, + pIconData + iOffsetMaskData, pInfoBitmap, DIB_RGB_COLORS))) { + + printf("ERROR: unable to get bitmap mask (error %lu)\n", + GetLastError()); + + } +*/ + GetDIBits(hDC, infoIcon.hbmMask, 0, 0, NULL, pInfoBitmap, DIB_RGB_COLORS); + GetDIBits(hDC, infoIcon.hbmMask, 0, pIconEntry->bHeight, pIconData + iOffsetMaskData, pInfoBitmap, DIB_RGB_COLORS); + + /* Write out everything produced so far to the stream */ + *ppBuffer = pIconData; *pLength = iDataSize; + iSuccess = 1; + } else { +/* + printf("ERROR: unable to get bitmap information via GetDIBits() (error %lu)\n", + GetLastError()); +*/ + } + /* + Remarks (from MSDN entry on GetIconInfo): + + GetIconInfo creates bitmaps for the hbmMask and hbmColor + members of ICONINFO. The calling application must manage + these bitmaps and delete them when they are no longer + necessary. + */ + if (hDC) ReleaseDC(0, hDC); + DeleteObject(infoIcon.hbmMask); + if (infoIcon.hbmColor) DeleteObject(infoIcon.hbmColor); + HeapFree(GetProcessHeap(), 0, pInfoBitmap); + } else { + printf("ERROR: Unable to get icon information (error %lu)\n", + GetLastError()); + } + return iSuccess; +} + static HRESULT WINAPI OLEPictureImpl_Save( IPersistStream* iface,IStream*pStm,BOOL fClearDirty) { @@ -1696,223 +1940,6 @@ return hResult; } -static int serializeBMP(HBITMAP hBitmap, void ** ppBuffer, unsigned int * pLength) -{ - int iSuccess = 0; - HDC hDC; - BITMAPINFO * pInfoBitmap; - int iNumPaletteEntries; - unsigned char * pPixelData; - BITMAPFILEHEADER * pFileHeader; - BITMAPINFO * pInfoHeader; - - pInfoBitmap = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)); - - /* Find out bitmap size and padded length */ - hDC = GetDC(0); - pInfoBitmap->bmiHeader.biSize = sizeof(pInfoBitmap->bmiHeader); - GetDIBits(hDC, hBitmap, 0, 0, NULL, pInfoBitmap, DIB_RGB_COLORS); - - /* Fetch bitmap palette & pixel data */ - - pPixelData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, pInfoBitmap->bmiHeader.biSizeImage); - GetDIBits(hDC, hBitmap, 0, pInfoBitmap->bmiHeader.biHeight, pPixelData, pInfoBitmap, DIB_RGB_COLORS); - - /* Calculate the total length required for the BMP data */ - if (pInfoBitmap->bmiHeader.biClrUsed != 0) { - iNumPaletteEntries = pInfoBitmap->bmiHeader.biClrUsed; - if (iNumPaletteEntries > 256) iNumPaletteEntries = 256; - } else { - if (pInfoBitmap->bmiHeader.biBitCount <= 8) - iNumPaletteEntries = 1 << pInfoBitmap->bmiHeader.biBitCount; - else - iNumPaletteEntries = 0; - } - *pLength = - sizeof(BITMAPFILEHEADER) + - sizeof(BITMAPINFOHEADER) + - iNumPaletteEntries * sizeof(RGBQUAD) + - pInfoBitmap->bmiHeader.biSizeImage; - *ppBuffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, *pLength); - - /* Fill the BITMAPFILEHEADER */ - pFileHeader = (BITMAPFILEHEADER *)(*ppBuffer); - pFileHeader->bfType = 0x4d42; - pFileHeader->bfSize = *pLength; - pFileHeader->bfOffBits = - sizeof(BITMAPFILEHEADER) + - sizeof(BITMAPINFOHEADER) + - iNumPaletteEntries * sizeof(RGBQUAD); - - /* Fill the BITMAPINFOHEADER and the palette data */ - pInfoHeader = (BITMAPINFO *)((unsigned char *)(*ppBuffer) + sizeof(BITMAPFILEHEADER)); - memcpy(pInfoHeader, pInfoBitmap, sizeof(BITMAPINFOHEADER) + iNumPaletteEntries * sizeof(RGBQUAD)); - memcpy( - (unsigned char *)(*ppBuffer) + - sizeof(BITMAPFILEHEADER) + - sizeof(BITMAPINFOHEADER) + - iNumPaletteEntries * sizeof(RGBQUAD), - pPixelData, pInfoBitmap->bmiHeader.biSizeImage); - iSuccess = 1; - - HeapFree(GetProcessHeap(), 0, pPixelData); - HeapFree(GetProcessHeap(), 0, pInfoBitmap); - return iSuccess; -} - -static int serializeIcon(HICON hIcon, void ** ppBuffer, unsigned int * pLength) -{ - ICONINFO infoIcon; - int iSuccess = 0; - - *ppBuffer = NULL; *pLength = 0; - if (GetIconInfo(hIcon, &infoIcon)) { - HDC hDC; - BITMAPINFO * pInfoBitmap; - unsigned char * pIconData = NULL; - unsigned int iDataSize = 0; - - pInfoBitmap = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)); - - /* Find out icon size */ - hDC = GetDC(0); - pInfoBitmap->bmiHeader.biSize = sizeof(pInfoBitmap->bmiHeader); - GetDIBits(hDC, infoIcon.hbmColor, 0, 0, NULL, pInfoBitmap, DIB_RGB_COLORS); - if (1) { - /* Auxiliary pointers */ - CURSORICONFILEDIR * pIconDir; - CURSORICONFILEDIRENTRY * pIconEntry; - BITMAPINFOHEADER * pIconBitmapHeader; - unsigned int iOffsetPalette; - unsigned int iOffsetColorData; - unsigned int iOffsetMaskData; - - unsigned int iLengthScanLineColor; - unsigned int iLengthScanLineMask; - unsigned int iNumEntriesPalette; - - iLengthScanLineMask = ((pInfoBitmap->bmiHeader.biWidth + 31) >> 5) << 2; - iLengthScanLineColor = ((pInfoBitmap->bmiHeader.biWidth * pInfoBitmap->bmiHeader.biBitCount + 31) >> 5) << 2; -/* - FIXME("DEBUG: bitmap size is %d x %d\n", - pInfoBitmap->bmiHeader.biWidth, - pInfoBitmap->bmiHeader.biHeight); - FIXME("DEBUG: bitmap bpp is %d\n", - pInfoBitmap->bmiHeader.biBitCount); - FIXME("DEBUG: bitmap nplanes is %d\n", - pInfoBitmap->bmiHeader.biPlanes); - FIXME("DEBUG: bitmap biSizeImage is %lu\n", - pInfoBitmap->bmiHeader.biSizeImage); -*/ - /* Let's start with one CURSORICONFILEDIR and one CURSORICONFILEDIRENTRY */ - iDataSize += 3 * sizeof(WORD) + sizeof(CURSORICONFILEDIRENTRY) + sizeof(BITMAPINFOHEADER); - pIconData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, iDataSize); - - /* Fill out the CURSORICONFILEDIR */ - pIconDir = (CURSORICONFILEDIR *)pIconData; - pIconDir->idType = 1; - pIconDir->idCount = 1; - - /* Fill out the CURSORICONFILEDIRENTRY */ - pIconEntry = (CURSORICONFILEDIRENTRY *)(pIconData + 3 * sizeof(WORD)); - pIconEntry->bWidth = (unsigned char)pInfoBitmap->bmiHeader.biWidth; - pIconEntry->bHeight = (unsigned char)pInfoBitmap->bmiHeader.biHeight; - pIconEntry->bColorCount = - (pInfoBitmap->bmiHeader.biBitCount < 8) - ? 1 << pInfoBitmap->bmiHeader.biBitCount - : 0; - pIconEntry->xHotspot = pInfoBitmap->bmiHeader.biPlanes; - pIconEntry->yHotspot = pInfoBitmap->bmiHeader.biBitCount; - pIconEntry->dwDIBSize = 0; - pIconEntry->dwDIBOffset = 3 * sizeof(WORD) + sizeof(CURSORICONFILEDIRENTRY); - - /* Fill out the BITMAPINFOHEADER */ - pIconBitmapHeader = (BITMAPINFOHEADER *)(pIconData + 3 * sizeof(WORD) + sizeof(CURSORICONFILEDIRENTRY)); - memcpy(pIconBitmapHeader, &pInfoBitmap->bmiHeader, sizeof(BITMAPINFOHEADER)); - - /* Find out whether a palette exists for the bitmap */ - if ( (pInfoBitmap->bmiHeader.biBitCount == 16 && pInfoBitmap->bmiHeader.biCompression == BI_RGB) - || (pInfoBitmap->bmiHeader.biBitCount == 24) - || (pInfoBitmap->bmiHeader.biBitCount == 32 && pInfoBitmap->bmiHeader.biCompression == BI_RGB)) { - iNumEntriesPalette = pInfoBitmap->bmiHeader.biClrUsed; - if (iNumEntriesPalette > 256) iNumEntriesPalette = 256; - } else if ((pInfoBitmap->bmiHeader.biBitCount == 16 || pInfoBitmap->bmiHeader.biBitCount == 32) - && pInfoBitmap->bmiHeader.biCompression == BI_BITFIELDS) { - iNumEntriesPalette = 3; - } else if (pInfoBitmap->bmiHeader.biBitCount <= 8) { - iNumEntriesPalette = 1 << pInfoBitmap->bmiHeader.biBitCount; - } else { - iNumEntriesPalette = 0; - } - - /* Add bitmap size and header size to icon data size. */ - iOffsetPalette = iDataSize; - iDataSize += iNumEntriesPalette * sizeof(DWORD); - iOffsetColorData = iDataSize; - iDataSize += pIconBitmapHeader->biSizeImage; - iOffsetMaskData = iDataSize; - iDataSize += pIconBitmapHeader->biHeight * iLengthScanLineMask; - pIconBitmapHeader->biSizeImage += pIconBitmapHeader->biHeight * iLengthScanLineMask; - pIconBitmapHeader->biHeight *= 2; - pIconData = HeapReAlloc(GetProcessHeap(), 0, pIconData, iDataSize); - pIconEntry = (CURSORICONFILEDIRENTRY *)(pIconData + 3 * sizeof(WORD)); - pIconBitmapHeader = (BITMAPINFOHEADER *)(pIconData + 3 * sizeof(WORD) + sizeof(CURSORICONFILEDIRENTRY)); - pIconEntry->dwDIBSize = iDataSize - (3 * sizeof(WORD) + sizeof(CURSORICONFILEDIRENTRY)); - - /* Get the actual bitmap data from the icon bitmap */ - GetDIBits(hDC, infoIcon.hbmColor, 0, pInfoBitmap->bmiHeader.biHeight, - pIconData + iOffsetColorData, pInfoBitmap, DIB_RGB_COLORS); - if (iNumEntriesPalette > 0) { - memcpy(pIconData + iOffsetPalette, pInfoBitmap->bmiColors, - iNumEntriesPalette * sizeof(RGBQUAD)); - } - - /* Reset all values so that GetDIBits call succeeds */ - memset(pIconData + iOffsetMaskData, 0, iDataSize - iOffsetMaskData); - memset(pInfoBitmap, 0, sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)); - pInfoBitmap->bmiHeader.biSize = sizeof(pInfoBitmap->bmiHeader); -/* - if (!(GetDIBits(hDC, infoIcon.hbmMask, 0, 0, NULL, pInfoBitmap, DIB_RGB_COLORS) - && GetDIBits(hDC, infoIcon.hbmMask, 0, pIconEntry->bHeight, - pIconData + iOffsetMaskData, pInfoBitmap, DIB_RGB_COLORS))) { - - printf("ERROR: unable to get bitmap mask (error %lu)\n", - GetLastError()); - - } -*/ - GetDIBits(hDC, infoIcon.hbmMask, 0, 0, NULL, pInfoBitmap, DIB_RGB_COLORS); - GetDIBits(hDC, infoIcon.hbmMask, 0, pIconEntry->bHeight, pIconData + iOffsetMaskData, pInfoBitmap, DIB_RGB_COLORS); - - /* Write out everything produced so far to the stream */ - *ppBuffer = pIconData; *pLength = iDataSize; - iSuccess = 1; - } else { -/* - printf("ERROR: unable to get bitmap information via GetDIBits() (error %lu)\n", - GetLastError()); -*/ - } - /* - Remarks (from MSDN entry on GetIconInfo): - - GetIconInfo creates bitmaps for the hbmMask and hbmColor - members of ICONINFO. The calling application must manage - these bitmaps and delete them when they are no longer - necessary. - */ - if (hDC) ReleaseDC(0, hDC); - DeleteObject(infoIcon.hbmMask); - if (infoIcon.hbmColor) DeleteObject(infoIcon.hbmColor); - HeapFree(GetProcessHeap(), 0, pInfoBitmap); - } else { - printf("ERROR: Unable to get icon information (error %lu)\n", - GetLastError()); - } - return iSuccess; -} - static HRESULT WINAPI OLEPictureImpl_GetSizeMax( IPersistStream* iface,ULARGE_INTEGER*pcbSize) { @@ -1921,9 +1948,11 @@ return E_NOTIMPL; } + /************************************************************************ * IDispatch */ + /************************************************************************ * OLEPictureImpl_IDispatch_QueryInterface (IUnknown) * @@ -2029,12 +2058,31 @@ EXCEPINFO* pExepInfo, UINT* puArgErr) { - FIXME("(dispid: %ld):Stub\n",dispIdMember); - - VariantInit(pVarResult); - V_VT(pVarResult) = VT_BOOL; - V_BOOL(pVarResult) = FALSE; - return S_OK; + OLEPictureImpl *This = impl_from_IDispatch(iface); + if (dispIdMember == DISPID_PICT_TYPE) + { + TRACE("DISPID_PICT_TYPE\n"); + if (!(wFlags & INVOKE_PROPERTYGET)) + return DISP_E_PARAMNOTFOUND; + if (pDispParams->cArgs != 0) + return DISP_E_BADPARAMCOUNT; + if (pVarResult) + { + VariantInit(pVarResult); + V_VT(pVarResult) = VT_I2; + return OLEPictureImpl_get_Type((IPicture *)&This->lpVtbl, &V_I2(pVarResult)); + } + return S_OK; + } + else + { + FIXME("(dispid: %ld):Stub\n",dispIdMember); + + VariantInit(pVarResult); + V_VT(pVarResult) = VT_BOOL; + V_BOOL(pVarResult) = FALSE; + return S_OK; + } } Modified: trunk/reactos/dll/win32/oleaut32/tmarshal.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/oleaut32/tmarshal… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/tmarshal.c (original) +++ trunk/reactos/dll/win32/oleaut32/tmarshal.c Mon Mar 27 20:44:53 2006 @@ -43,6 +43,7 @@ #include "ole2.h" #include "typelib.h" +#include "variant.h" #include "wine/debug.h" static const WCHAR IDispatchW[] = { 'I','D','i','s','p','a','t','c','h',0}; @@ -167,7 +168,7 @@ * can happen. S_OK to make sure we continue * serializing. */ - ERR("pUnk is NULL?\n"); + WARN("pUnk is NULL\n"); xsize = 0; return xbuf_add(buf,(LPBYTE)&xsize,sizeof(xsize)); } @@ -354,6 +355,7 @@ CRITICAL_SECTION crit; IUnknown *outerunknown; IDispatch *dispatch; + IRpcProxyBuffer *dispatch_proxy; } TMProxyImpl; static HRESULT WINAPI @@ -390,7 +392,7 @@ if (!refCount) { - if (This->dispatch) IDispatch_Release(This->dispatch); + if (This->dispatch_proxy) IRpcProxyBuffer_Release(This->dispatch_proxy); DeleteCriticalSection(&This->crit); if (This->chanbuf) IRpcChannelBuffer_Release(This->chanbuf); VirtualFree(This->asmstubs, 0, MEM_RELEASE); @@ -414,6 +416,9 @@ LeaveCriticalSection(&This->crit); + if (This->dispatch_proxy) + IRpcProxyBuffer_Connect(This->dispatch_proxy, pRpcChannelBuffer); + return S_OK; } @@ -430,6 +435,9 @@ This->chanbuf = NULL; LeaveCriticalSection(&This->crit); + + if (This->dispatch_proxy) + IRpcProxyBuffer_Disconnect(This->dispatch_proxy); } @@ -501,13 +509,14 @@ { HRESULT hres = S_OK; - TRACE("(tdesc.vt %d)\n",tdesc->vt); + TRACE("(tdesc.vt %s)\n",debugstr_vt(tdesc->vt)); switch (tdesc->vt) { case VT_EMPTY: /* nothing. empty variant for instance */ return S_OK; case VT_I8: case VT_UI8: + case VT_CY: hres = S_OK; if (debugout) TRACE_(olerelay)("%lx%lx",arg[0],arg[1]); if (writeit) @@ -515,6 +524,7 @@ return hres; case VT_BOOL: case VT_ERROR: + case VT_INT: case VT_UINT: case VT_I4: case VT_R4: @@ -550,7 +560,7 @@ VARIANT *vt = (VARIANT*)arg; DWORD vttype = V_VT(vt); - if (debugout) TRACE_(olerelay)("Vt(%ld)(",vttype); + if (debugout) TRACE_(olerelay)("Vt(%s%s)(",debugstr_vt(vttype),debugstr_vf(vttype)); tdesc2.vt = vttype; if (writeit) { hres = xbuf_add(buf,(LPBYTE)&vttype,sizeof(vttype)); @@ -666,11 +676,15 @@ if (debugout) TRACE_(olerelay)("unk(0x%lx)",*arg); if (writeit) hres = _marshal_interface(buf,&IID_IUnknown,(LPUNKNOWN)*arg); + if (dealloc && *(IUnknown **)arg) + IUnknown_Release((LPUNKNOWN)*arg); return hres; case VT_DISPATCH: if (debugout) TRACE_(olerelay)("idisp(0x%lx)",*arg); if (writeit) hres = _marshal_interface(buf,&IID_IDispatch,(LPUNKNOWN)*arg); + if (dealloc && *(IUnknown **)arg) + IUnknown_Release((LPUNKNOWN)*arg); return hres; case VT_VOID: if (debugout) TRACE_(olerelay)("<void>"); @@ -761,7 +775,7 @@ if (debugout) TRACE_(olerelay)("[%ld]",adesc->rgbounds[i].cElements); arrsize *= adesc->rgbounds[i].cElements; } - if (debugout) TRACE_(olerelay)("(vt %d)",adesc->tdescElem.vt); + if (debugout) TRACE_(olerelay)("(vt %s)",debugstr_vt(adesc->tdescElem.vt)); if (debugout) TRACE_(olerelay)("["); for (i=0;i<arrsize;i++) { hres = serialize_param(tinfo, writeit, debugout, dealloc, &adesc->tdescElem, (DWORD*)((LPBYTE)arg+i*_xsize(&adesc->tdescElem)), buf); @@ -790,7 +804,7 @@ { HRESULT hres = S_OK; - TRACE("vt %d at %p\n",tdesc->vt,arg); + TRACE("vt %s at %p\n",debugstr_vt(tdesc->vt),arg); while (1) { switch (tdesc->vt) { @@ -814,7 +828,7 @@ memset(&tdesc2,0,sizeof(tdesc2)); tdesc2.vt = vttype; V_VT(vt) = vttype; - if (debugout) TRACE_(olerelay)("Vt(%ld)(",vttype); + if (debugout) TRACE_(olerelay)("Vt(%s%s)(",debugstr_vt(vttype),debugstr_vf(vttype)); hres = deserialize_param(tinfo, readit, debugout, alloc, &tdesc2, (DWORD*)&(V_I4(vt)), buf); TRACE_(olerelay)(")"); return hres; @@ -825,6 +839,7 @@ } case VT_I8: case VT_UI8: + case VT_CY: if (readit) { hres = xbuf_get(buf,(LPBYTE)arg,8); if (hres) ERR("Failed to read integer 8 byte\n"); @@ -834,6 +849,7 @@ case VT_ERROR: case VT_BOOL: case VT_I4: + case VT_INT: case VT_UINT: case VT_R4: case VT_UI4: @@ -1371,56 +1387,29 @@ static HRESULT WINAPI ProxyIDispatch_GetTypeInfoCount(LPDISPATCH iface, UINT * pctinfo) { TMProxyImpl *This = (TMProxyImpl *)iface; - HRESULT hr; TRACE("(%p)\n", pctinfo); - if (!This->dispatch) - { - hr = IUnknown_QueryInterface(This->outerunknown, &IID_IDispatch, - (LPVOID *)&This->dispatch); - } - if (This->dispatch) - hr = IDispatch_GetTypeInfoCount(This->dispatch, pctinfo); - - return hr; + return IDispatch_GetTypeInfoCount(This->dispatch, pctinfo); } static HRESULT WINAPI ProxyIDispatch_GetTypeInfo(LPDISPATCH iface, UINT iTInfo, LCID lcid, ITypeInfo** ppTInfo) { TMProxyImpl *This = (TMProxyImpl *)iface; - HRESULT hr = S_OK; TRACE("(%d, %lx, %p)\n", iTInfo, lcid, ppTInfo); - if (!This->dispatch) - { - hr = IUnknown_QueryInterface(This->outerunknown, &IID_IDispatch, - (LPVOID *)&This->dispatch); - } - if (This->dispatch) - hr = IDispatch_GetTypeInfo(This->dispatch, iTInfo, lcid, ppTInfo); - - return hr; + return IDispatch_GetTypeInfo(This->dispatch, iTInfo, lcid, ppTInfo); } static HRESULT WINAPI ProxyIDispatch_GetIDsOfNames(LPDISPATCH iface, REFIID riid, LPOLESTR * rgszNames, UINT cNames, LCID lcid, DISPID * rgDispId) { TMProxyImpl *This = (TMProxyImpl *)iface; - HRESULT hr; TRACE("(%s, %p, %d, 0x%lx, %p)\n", debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); - if (!This->dispatch) - { - hr = IUnknown_QueryInterface(This->outerunknown, &IID_IDispatch, - (LPVOID *)&This->dispatch); - } - if (This->dispatch) - hr = IDispatch_GetIDsOfNames(This->dispatch, riid, rgszNames, - cNames, lcid, rgDispId); - - return hr; + return IDispatch_GetIDsOfNames(This->dispatch, riid, rgszNames, + cNames, lcid, rgDispId); } static HRESULT WINAPI ProxyIDispatch_Invoke(LPDISPATCH iface, DISPID dispIdMember, REFIID riid, LCID lcid, @@ -1428,21 +1417,25 @@ EXCEPINFO * pExcepInfo, UINT * puArgErr) { TMProxyImpl *This = (TMProxyImpl *)iface; - HRESULT hr; - - TRACE("(%ld, %s, 0x%lx, 0x%x, %p, %p, %p, %p)\n", dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - - if (!This->dispatch) - { - hr = IUnknown_QueryInterface(This->outerunknown, &IID_IDispatch, - (LPVOID *)&This->dispatch); - } - if (This->dispatch) - hr = IDispatch_Invoke(This->dispatch, dispIdMember, riid, lcid, - wFlags, pDispParams, pVarResult, pExcepInfo, - puArgErr); - - return hr; + + TRACE("(%ld, %s, 0x%lx, 0x%x, %p, %p, %p, %p)\n", dispIdMember, + debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, + pExcepInfo, puArgErr); + + return IDispatch_Invoke(This->dispatch, dispIdMember, riid, lcid, + wFlags, pDispParams, pVarResult, pExcepInfo, + puArgErr); +} + +static inline HRESULT get_facbuf_for_iid(REFIID riid, IPSFactoryBuffer **facbuf) +{ + HRESULT hr; + CLSID clsid; + + if ((hr = CoGetPSClsid(riid, &clsid))) + return hr; + return CoGetClassObject(&clsid, CLSCTX_INPROC_SERVER, NULL, + &IID_IPSFactoryBuffer, (LPVOID*)facbuf); } static HRESULT WINAPI @@ -1470,6 +1463,7 @@ assert(sizeof(TMAsmProxy) == 12); proxy->dispatch = NULL; + proxy->dispatch_proxy = NULL; proxy->outerunknown = pUnkOuter; proxy->asmstubs = VirtualAlloc(NULL, sizeof(TMAsmProxy) * nroffuncs, MEM_COMMIT, PAGE_EXECUTE_READWRITE); if (!proxy->asmstubs) { @@ -1549,10 +1543,22 @@ { if (typeattr->wTypeFlags & TYPEFLAG_FDISPATCHABLE) { - proxy->lpvtbl[3] = ProxyIDispatch_GetTypeInfoCount; - proxy->lpvtbl[4] = ProxyIDispatch_GetTypeInfo; - proxy->lpvtbl[5] = ProxyIDispatch_GetIDsOfNames; - proxy->lpvtbl[6] = ProxyIDispatch_Invoke; + IPSFactoryBuffer *factory_buffer; + hres = get_facbuf_for_iid(&IID_IDispatch, &factory_buffer); + if (hres == S_OK) + { + hres = IPSFactoryBuffer_CreateProxy(factory_buffer, NULL, + &IID_IDispatch, &proxy->dispatch_proxy, + (void **)&proxy->dispatch); + IPSFactoryBuffer_Release(factory_buffer); + } + if (hres == S_OK) + { + proxy->lpvtbl[3] = ProxyIDispatch_GetTypeInfoCount; + proxy->lpvtbl[4] = ProxyIDispatch_GetTypeInfo; + proxy->lpvtbl[5] = ProxyIDispatch_GetIDsOfNames; + proxy->lpvtbl[6] = ProxyIDispatch_Invoke; + } } ITypeInfo_ReleaseTypeAttr(tinfo, typeattr); } @@ -1563,10 +1569,16 @@ proxy->tinfo = tinfo; memcpy(&proxy->iid,riid,sizeof(*riid)); proxy->chanbuf = 0; - *ppv = (LPVOID)proxy; - *ppProxy = (IRpcProxyBuffer *)&(proxy->lpvtbl2); - IUnknown_AddRef((IUnknown *)*ppv); - return S_OK; + if (hres == S_OK) + { + *ppv = (LPVOID)proxy; + *ppProxy = (IRpcProxyBuffer *)&(proxy->lpvtbl2); + IUnknown_AddRef((IUnknown *)*ppv); + return S_OK; + } + else + TMProxyImpl_Release((IRpcProxyBuffer *)&proxy->lpvtbl2); + return hres; } typedef struct _TMStubImpl { @@ -1576,6 +1588,7 @@ LPUNKNOWN pUnk; ITypeInfo *tinfo; IID iid; + IRpcStubBuffer *dispatch_stub; } TMStubImpl; static HRESULT WINAPI @@ -1627,6 +1640,10 @@ IUnknown_AddRef(pUnkServer); This->pUnk = pUnkServer; + + if (This->dispatch_stub) + IRpcStubBuffer_Connect(This->dispatch_stub, pUnkServer); + return S_OK; } @@ -1642,6 +1659,9 @@ IUnknown_Release(This->pUnk); This->pUnk = NULL; } + + if (This->dispatch_stub) + IRpcStubBuffer_Disconnect(This->dispatch_stub); } static HRESULT WINAPI @@ -1659,18 +1679,21 @@ BSTR iname = NULL; ITypeInfo *tinfo; + TRACE("...\n"); + + if (xmsg->iMethod < 3) { + ERR("IUnknown methods cannot be marshaled by the typelib marshaler\n"); + return E_UNEXPECTED; + } + + if (This->dispatch_stub && xmsg->iMethod < sizeof(IDispatchVtbl)/sizeof(void *)) + return IRpcStubBuffer_Invoke(This->dispatch_stub, xmsg, rpcchanbuf); + memset(&buf,0,sizeof(buf)); buf.size = xmsg->cbBuffer; buf.base = HeapAlloc(GetProcessHeap(), 0, xmsg->cbBuffer); memcpy(buf.base, xmsg->Buffer, xmsg->cbBuffer); buf.curoff = 0; - - TRACE("...\n"); - - if (xmsg->iMethod < 3) { - ERR("IUnknown methods cannot be marshaled by the typelib marshaler\n"); - return E_UNEXPECTED; - } hres = _get_funcdesc(This->tinfo,xmsg->iMethod,&tinfo,&fdesc,&iname,NULL); if (hres) { @@ -1830,25 +1853,48 @@ HRESULT hres; ITypeInfo *tinfo; TMStubImpl *stub; + TYPEATTR *typeattr; TRACE("(%s,%p,%p)\n",debugstr_guid(riid),pUnkServer,ppStub); + hres = _get_typeinfo_for_iid(riid,&tinfo); if (hres) { ERR("No typeinfo for %s?\n",debugstr_guid(riid)); return hres; } + stub = CoTaskMemAlloc(sizeof(TMStubImpl)); if (!stub) return E_OUTOFMEMORY; stub->lpvtbl = &tmstubvtbl; stub->ref = 1; stub->tinfo = tinfo; + stub->dispatch_stub = NULL; memcpy(&(stub->iid),riid,sizeof(*riid)); hres = IRpcStubBuffer_Connect((LPRPCSTUBBUFFER)stub,pUnkServer); *ppStub = (LPRPCSTUBBUFFER)stub; TRACE("IRpcStubBuffer: %p\n", stub); if (hres) ERR("Connect to pUnkServer failed?\n"); + + /* if we derive from IDispatch then defer to its stub for some of its methods */ + hres = ITypeInfo_GetTypeAttr(tinfo, &typeattr); + if (hres == S_OK) + { + if (typeattr->wTypeFlags & TYPEFLAG_FDISPATCHABLE) + { + IPSFactoryBuffer *factory_buffer; + hres = get_facbuf_for_iid(&IID_IDispatch, &factory_buffer); + if (hres == S_OK) + { + hres = IPSFactoryBuffer_CreateStub(factory_buffer, &IID_IDispatch, + pUnkServer, &stub->dispatch_stub); + IPSFactoryBuffer_Release(factory_buffer); + } + } + ITypeInfo_ReleaseTypeAttr(tinfo, typeattr); + } + return hres; } Modified: trunk/reactos/dll/win32/oleaut32/typelib.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/oleaut32/typelib.… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/typelib.c (original) +++ trunk/reactos/dll/win32/oleaut32/typelib.c Mon Mar 27 20:44:53 2006 @@ -196,7 +196,7 @@ return buffer; } -int TLB_ReadTypeLib(LPCWSTR file, INT index, ITypeLib2 **ppTypelib); +static int TLB_ReadTypeLib(LPCWSTR pszFileName, LPWSTR pszPath, UINT cchPath, ITypeLib2 **ppTypeLib); /**************************************************************************** @@ -333,38 +333,14 @@ REGKIND regkind, /* [in] Specify kind of registration */ ITypeLib **pptLib) /* [out] Pointer to pointer to loaded type library */ { - WCHAR szPath[MAX_PATH+1], szFileCopy[MAX_PATH+1]; - WCHAR *pIndexStr; + WCHAR szPath[MAX_PATH+1]; HRESULT res; - INT index = 1; TRACE("(%s,%d,%p)\n",debugstr_w(szFile), regkind, pptLib); - /* by default try and load using LoadLibrary (for builtin stdole32.tlb) */ - memcpy(szPath, szFile, (strlenW(szFile)+1)*sizeof(WCHAR)); - *pptLib = NULL; - if(!SearchPathW(NULL,szFile,NULL,sizeof(szPath)/sizeof(WCHAR),szPath, - NULL)) { - - /* Look for a trailing '\\' followed by an index */ - pIndexStr = strrchrW(szFile, '\\'); - if(pIndexStr && pIndexStr != szFile && *++pIndexStr != '\0') { - index = atoiW(pIndexStr); - memcpy(szFileCopy, szFile, - (pIndexStr - szFile - 1) * sizeof(WCHAR)); - szFileCopy[pIndexStr - szFile - 1] = '\0'; - if(!SearchPathW(NULL,szFileCopy,NULL,sizeof(szPath)/sizeof(WCHAR), - szPath,NULL)) - return TYPE_E_CANTLOADLIBRARY; - if (GetFileAttributesW(szFileCopy) & FILE_ATTRIBUTE_DIRECTORY) - return TYPE_E_CANTLOADLIBRARY; - } - } - - TRACE("File %s index %d\n", debugstr_w(szPath), index); - - res = TLB_ReadTypeLib(szPath, index, (ITypeLib2**)pptLib); + + res = TLB_ReadTypeLib(szFile, szPath, MAX_PATH + 1, (ITypeLib2**)pptLib); if (SUCCEEDED(res)) switch(regkind) @@ -1224,7 +1200,7 @@ } else if (V_ISARRAY(pvar) || V_ISVECTOR(pvar)) { - TRACE(",FIXME"); + TRACE(",%p", V_ARRAY(pvar)); } else switch (V_TYPE(pvar)) { @@ -1988,9 +1964,10 @@ (*ppRefType)->pImpTLInfo = pImpLib; if(impinfo.flags & MSFT_IMPINFO_OFFSET_IS_GUID) { MSFT_ReadGuid(&(*ppRefType)->guid, impinfo.oGuid, pcx); + TRACE("importing by guid %s\n", debugstr_guid(&(*ppRefType)->guid)); (*ppRefType)->index = TLB_REF_USE_GUID; } else - (*ppRefType)->index = impinfo.oGuid; + (*ppRefType)->index = impinfo.oGuid; }else{ ERR("Cannot find a reference\n"); (*ppRefType)->reference=-1; @@ -2033,6 +2010,7 @@ static ITypeInfoImpl * MSFT_DoTypeInfo( TLBContext *pcx, int count, + INT dispatch_href, ITypeLibImpl * pLibInfo) { MSFT_TypeInfoBase tiBase; @@ -2113,38 +2091,10 @@ ptiRet->impltypelist->hRef = tiBase.datatype1; } else - { /* FIXME: This is a really bad hack to add IDispatch */ - const char* szStdOle = "stdole2.tlb\0"; - int nStdOleLen = strlen(szStdOle); - TLBRefType **ppRef = &ptiRet->reflist; - - while(*ppRef) { - if((*ppRef)->reference == -1) - break; - ppRef = &(*ppRef)->next; - } - if(!*ppRef) { - *ppRef = TLB_Alloc(sizeof(**ppRef)); - (*ppRef)->guid = IID_IDispatch; - (*ppRef)->reference = -1; - (*ppRef)->index = TLB_REF_USE_GUID; - (*ppRef)->pImpTLInfo = TLB_Alloc(sizeof(TLBImpLib)); - (*ppRef)->pImpTLInfo->guid = IID_StdOle; - (*ppRef)->pImpTLInfo->name = SysAllocStringLen(NULL, - nStdOleLen + 1); - - MultiByteToWideChar(CP_ACP, - MB_PRECOMPOSED, - szStdOle, - -1, - (*ppRef)->pImpTLInfo->name, - SysStringLen((*ppRef)->pImpTLInfo->name)); - - (*ppRef)->pImpTLInfo->lcid = 0; - (*ppRef)->pImpTLInfo->wVersionMajor = 2; - (*ppRef)->pImpTLInfo->wVersionMinor = 0; - } - } + { + MSFT_DoRefType(pcx, ptiRet, dispatch_href); + ptiRet->impltypelist->hRef = dispatch_href; + } break; default: ptiRet->impltypelist=TLB_Alloc(sizeof(TLBImplType)); @@ -2188,22 +2138,50 @@ */ #define MSFT_SIGNATURE 0x5446534D /* "MSFT" */ #define SLTG_SIGNATURE 0x47544c53 /* "SLTG" */ -int TLB_ReadTypeLib(LPCWSTR pszFileName, INT index, ITypeLib2 **ppTypeLib) +static int TLB_ReadTypeLib(LPCWSTR pszFileName, LPWSTR pszPath, UINT cchPath, ITypeLib2 **ppTypeLib) { ITypeLibImpl *entry; int ret = TYPE_E_CANTLOADLIBRARY; - DWORD dwSignature = 0; - HANDLE hFile; - - TRACE_(typelib)("%s:%d\n", debugstr_w(pszFileName), index); + INT index = 1; + HINSTANCE hinstDLL; *ppTypeLib = NULL; + + lstrcpynW(pszPath, pszFileName, cchPath); + + /* first try loading as a dll and access the typelib as a resource */ + hinstDLL = LoadLibraryExW(pszFileName, 0, DONT_RESOLVE_DLL_REFERENCES | + LOAD_LIBRARY_AS_DATAFILE | LOAD_WITH_ALTERED_SEARCH_PATH); + if (!hinstDLL) + { + /* it may have been specified with resource index appended to the + * path, so remove it and try again */ + const WCHAR *pIndexStr = strrchrW(pszFileName, '\\'); + if(pIndexStr && pIndexStr != pszFileName && *++pIndexStr != '\0') + { + index = atoiW(pIndexStr); + pszPath[pIndexStr - pszFileName - 1] = '\0'; + + hinstDLL = LoadLibraryExW(pszPath, 0, DONT_RESOLVE_DLL_REFERENCES | + LOAD_LIBRARY_AS_DATAFILE | LOAD_WITH_ALTERED_SEARCH_PATH); + } + } + + /* get the path to the specified typelib file */ + if (!hinstDLL) + { + /* otherwise, try loading as a regular file */ + if (!SearchPathW(NULL, pszFileName, NULL, cchPath, pszPath, NULL)) + return TYPE_E_CANTLOADLIBRARY; + } + + TRACE_(typelib)("File %s index %d\n", debugstr_w(pszPath), index); /* We look the path up in the typelib cache. If found, we just addref it, and return the pointer. */ EnterCriticalSection(&cache_section); for (entry = tlb_cache_first; entry != NULL; entry = entry->next) { - if (!strcmpiW(entry->path, pszFileName) && entry->index == index) + if (!strcmpiW(entry->path, pszPath) && entry->index == index) { TRACE("cache hit\n"); *ppTypeLib = (ITypeLib2*)entry; @@ -2214,88 +2192,69 @@ } LeaveCriticalSection(&cache_section); - /* check the signature of the file */ - hFile = CreateFileW( pszFileName, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0 ); - if (INVALID_HANDLE_VALUE != hFile) - { - HANDLE hMapping = CreateFileMappingW( hFile, NULL, PAGE_READONLY | SEC_COMMIT, 0, 0, NULL ); - if (hMapping) - { - LPVOID pBase = MapViewOfFile(hMapping, FILE_MAP_READ, 0, 0, 0); - if(pBase) - { - /* retrieve file size */ - DWORD dwTLBLength = GetFileSize(hFile, NULL); - - /* first try to load as *.tlb */ - dwSignature = FromLEDWord(*((DWORD*) pBase)); - if ( dwSignature == MSFT_SIGNATURE) - { - *ppTypeLib = ITypeLib2_Constructor_MSFT(pBase, dwTLBLength); - } - else if ( dwSignature == SLTG_SIGNATURE) - { - *ppTypeLib = ITypeLib2_Constructor_SLTG(pBase, dwTLBLength); - } - UnmapViewOfFile(pBase); - } - CloseHandle(hMapping); - } - CloseHandle(hFile); - } - else - { - TRACE("not found, trying to load %s as library\n", debugstr_w(pszFileName)); - } - - /* if the file is a DLL or not found, try loading it with LoadLibrary */ - if (((WORD)dwSignature == IMAGE_DOS_SIGNATURE) || (dwSignature == 0)) - { - /* find the typelibrary resource*/ - HINSTANCE hinstDLL = LoadLibraryExW(pszFileName, 0, DONT_RESOLVE_DLL_REFERENCES| - LOAD_LIBRARY_AS_DATAFILE|LOAD_WITH_ALTERED_SEARCH_PATH); - if (hinstDLL) - { + /* now actually load and parse the typelib */ + if (hinstDLL) + { static const WCHAR TYPELIBW[] = {'T','Y','P','E','L','I','B',0}; HRSRC hrsrc = FindResourceW(hinstDLL, MAKEINTRESOURCEW(index), TYPELIBW); if (hrsrc) { - HGLOBAL hGlobal = LoadResource(hinstDLL, hrsrc); - if (hGlobal) - { - LPVOID pBase = LockResource(hGlobal); - DWORD dwTLBLength = SizeofResource(hinstDLL, hrsrc); - - if (pBase) + HGLOBAL hGlobal = LoadResource(hinstDLL, hrsrc); + if (hGlobal) { - /* try to load as incore resource */ - dwSignature = FromLEDWord(*((DWORD*) pBase)); - if ( dwSignature == MSFT_SIGNATURE) - { - *ppTypeLib = ITypeLib2_Constructor_MSFT(pBase, dwTLBLength); - } - else if ( dwSignature == SLTG_SIGNATURE) - { - *ppTypeLib = ITypeLib2_Constructor_SLTG(pBase, dwTLBLength); - } - else - { - FIXME("Header type magic 0x%08lx not supported.\n",dwSignature); - } + LPVOID pBase = LockResource(hGlobal); + DWORD dwTLBLength = SizeofResource(hinstDLL, hrsrc); + + if (pBase) + { + /* try to load as incore resource */ + DWORD dwSignature = FromLEDWord(*((DWORD*) pBase)); + if (dwSignature == MSFT_SIGNATURE) + *ppTypeLib = ITypeLib2_Constructor_MSFT(pBase, dwTLBLength); + else if (dwSignature == SLTG_SIGNATURE) + *ppTypeLib = ITypeLib2_Constructor_SLTG(pBase, dwTLBLength); + else + FIXME("Header type magic 0x%08lx not supported.\n",dwSignature); + } + FreeResource( hGlobal ); } - FreeResource( hGlobal ); - } } FreeLibrary(hinstDLL); - } + } + else + { + HANDLE hFile = CreateFileW(pszPath, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0 ); + if (INVALID_HANDLE_VALUE != hFile) + { + HANDLE hMapping = CreateFileMappingW( hFile, NULL, PAGE_READONLY | SEC_COMMIT, 0, 0, NULL ); + if (hMapping) + { + LPVOID pBase = MapViewOfFile(hMapping, FILE_MAP_READ, 0, 0, 0); + if(pBase) + { + /* retrieve file size */ + DWORD dwTLBLength = GetFileSize(hFile, NULL); + DWORD dwSignature = FromLEDWord(*((DWORD*) pBase)); + + if (dwSignature == MSFT_SIGNATURE) + *ppTypeLib = ITypeLib2_Constructor_MSFT(pBase, dwTLBLength); + else if (dwSignature == SLTG_SIGNATURE) + *ppTypeLib = ITypeLib2_Constructor_SLTG(pBase, dwTLBLength); + + UnmapViewOfFile(pBase); + } + CloseHandle(hMapping); + } + CloseHandle(hFile); + } } if(*ppTypeLib) { ITypeLibImpl *impl = (ITypeLibImpl*)*ppTypeLib; TRACE("adding to cache\n"); - impl->path = HeapAlloc(GetProcessHeap(), 0, (strlenW(pszFileName)+1) * sizeof(WCHAR)); - lstrcpyW(impl->path, pszFileName); + impl->path = HeapAlloc(GetProcessHeap(), 0, (strlenW(pszPath)+1) * sizeof(WCHAR)); + lstrcpyW(impl->path, pszPath); /* We should really canonicalise the path here. */ impl->index = index; @@ -2314,6 +2273,20 @@ /*================== ITypeLib(2) Methods ===================================*/ +static ITypeLibImpl* TypeLibImpl_Constructor(void) +{ + ITypeLibImpl* pTypeLibImpl; + + pTypeLibImpl = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(ITypeLibImpl)); + if (!pTypeLibImpl) return NULL; + + pTypeLibImpl->lpVtbl = &tlbvt; + pTypeLibImpl->lpVtblTypeComp = &tlbtcvt; + pTypeLibImpl->ref = 1; + + return pTypeLibImpl; +} + /**************************************************************************** * ITypeLib2_Constructor_MSFT * @@ -2329,12 +2302,8 @@ TRACE("%p, TLB length = %ld\n", pLib, dwTLBLength); - pTypeLibImpl = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(ITypeLibImpl)); + pTypeLibImpl = TypeLibImpl_Constructor(); if (!pTypeLibImpl) return NULL; - - pTypeLibImpl->lpVtbl = &tlbvt; - pTypeLibImpl->lpVtblTypeComp = &tlbtcvt; - pTypeLibImpl->ref = 1; /* get pointer to beginning of typelib data */ cx.pos = 0; @@ -2345,12 +2314,14 @@ /* read header */ MSFT_ReadLEDWords((void*)&tlbHeader, sizeof(tlbHeader), &cx, 0); - TRACE("header:\n"); - TRACE("\tmagic1=0x%08x ,magic2=0x%08x\n",tlbHeader.magic1,tlbHeader.magic2 ); + TRACE_(typelib)("header:\n"); + TRACE_(typelib)("\tmagic1=0x%08x ,magic2=0x%08x\n",tlbHeader.magic1,tlbHeader.magic2 ); if (tlbHeader.magic1 != MSFT_SIGNATURE) { FIXME("Header type magic 0x%08x not supported.\n",tlbHeader.magic1); return NULL; } + TRACE_(typelib)("\tdispatchpos = 0x%x\n", tlbHeader.dispatchpos); + /* there is a small amount of information here until the next important * part: * the segment directory . Try to calculate the amount of data */ @@ -2515,7 +2486,7 @@ for(i = 0; i<(int)tlbHeader.nrtypeinfos; i++) { - *ppTI = MSFT_DoTypeInfo(&cx, i, pTypeLibImpl); + *ppTI = MSFT_DoTypeInfo(&cx, i, tlbHeader.dispatchpos, pTypeLibImpl); ppTI = &((*ppTI)->next); (pTypeLibImpl->TypeInfoCount)++; @@ -3155,11 +3126,9 @@ TRACE_(typelib)("%p, TLB length = %ld\n", pLib, dwTLBLength); - pTypeLibImpl = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(ITypeLibImpl)); + + pTypeLibImpl = TypeLibImpl_Constructor(); if (!pTypeLibImpl) return NULL; - - pTypeLibImpl->lpVtbl = &tlbvt; - pTypeLibImpl->ref = 1; pHeader = pLib; @@ -3475,13 +3444,16 @@ if (!ref) { /* remove cache entry */ - TRACE("removing from cache list\n"); - EnterCriticalSection(&cache_section); - if (This->next) This->next->prev = This->prev; - if (This->prev) This->prev->next = This->next; - else tlb_cache_first = This->next; - LeaveCriticalSection(&cache_section); - + if(This->path) + { + TRACE("removing from cache list\n"); + EnterCriticalSection(&cache_section); + if (This->next) This->next->prev = This->prev; + if (This->prev) This->prev->next = This->next; + else tlb_cache_first = This->next; + LeaveCriticalSection(&cache_section); + HeapFree(GetProcessHeap(), 0, This->path); + } /* FIXME destroy child objects */ TRACE(" destroying ITypeLib(%p)\n",This); @@ -4287,7 +4259,12 @@ it means that function is called by ITypeLib2_Release */ ITypeLib2_Release((ITypeLib2*)This->pTypeLib); } else { - FIXME("destroy child objects\n"); + static int once = 0; + if (!once) + { + once = 1; + FIXME("destroy child objects\n"); + } TRACE("destroying ITypeInfo(%p)\n",This); if (This->Name) @@ -4623,8 +4600,8 @@ BSTR *rgBstrNames, UINT cMaxNames, UINT *pcNames) { ITypeInfoImpl *This = (ITypeInfoImpl *)iface; - TLBFuncDesc * pFDesc; - TLBVarDesc * pVDesc; + const TLBFuncDesc *pFDesc; + const TLBVarDesc *pVDesc; int i; TRACE("(%p) memid=0x%08lx Maxname=%d\n", This, memid, cMaxNames); for(pFDesc=This->funclist; pFDesc && pFDesc->funcdesc.memid != memid; pFDesc=pFDesc->next); @@ -4693,7 +4670,7 @@ ITypeInfoImpl *This = (ITypeInfoImpl *)iface; int i; HRESULT hr = S_OK; - TLBImplType *pImpl = This->impltypelist; + const TLBImplType *pImpl = This->impltypelist; TRACE("(%p) index %d\n", This, index); if (TRACE_ON(ole)) dump_TypeInfo(This); @@ -4772,8 +4749,8 @@ LPOLESTR *rgszNames, UINT cNames, MEMBERID *pMemId) { ITypeInfoImpl *This = (ITypeInfoImpl *)iface; - TLBFuncDesc * pFDesc; - TLBVarDesc * pVDesc; + const TLBFuncDesc *pFDesc; + const TLBVarDesc *pVDesc; HRESULT ret=S_OK; int i; @@ -4899,6 +4876,24 @@ case 17: res = func(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],args[8],args[9],args[10],args[11],args[12],args[13],args[14],args[15],args[16]); break; + case 18: + res = func(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],args[8],args[9],args[10],args[11],args[12],args[13],args[14],args[15],args[16],args[17]); + break; + case 19: + res = func(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],args[8],args[9],args[10],args[11],args[12],args[13],args[14],args[15],args[16],args[17],args[18]); + break; + case 20: + res = func(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],args[8],args[9],args[10],args[11],args[12],args[13],args[14],args[15],args[16],args[17],args[18],args[19]); + break; + case 21: + res = func(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],args[8],args[9],args[10],args[11],args[12],args[13],args[14],args[15],args[16],args[17],args[18],args[19],args[20]); + break; + case 22: + res = func(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],args[8],args[9],args[10],args[11],args[12],args[13],args[14],args[15],args[16],args[17],args[18],args[19],args[20],args[21]); + break; + case 23: + res = func(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],args[8],args[9],args[10],args[11],args[12],args[13],args[14],args[15],args[16],args[17],args[18],args[19],args[20],args[21],args[22]); + break; default: FIXME("unsupported number of arguments %d in stdcall\n",nrargs); res = -1; @@ -4916,165 +4911,6 @@ extern int _argsize(DWORD vt); -/**************************************************************************** - * Helper functions for Dispcall / Invoke, which copies one variant - * with target type onto the argument stack. - */ -static HRESULT -_copy_arg( ITypeInfo2 *tinfo, TYPEDESC *tdesc, - DWORD *argpos, VARIANT *arg, VARTYPE vt -) { - UINT arglen = _argsize(vt)*sizeof(DWORD); - VARIANT va; - - if ((vt==VT_PTR) && tdesc && (tdesc->u.lptdesc->vt == VT_VARIANT)) { - memcpy(argpos,&arg,sizeof(void*)); - return S_OK; - } - - if (V_VT(arg) == vt) { - memcpy(argpos, &V_I4(arg), arglen); - return S_OK; - } - - if (V_ISARRAY(arg) && (vt == VT_SAFEARRAY)) { - memcpy(argpos, &V_ARRAY(arg), sizeof(SAFEARRAY*)); - return S_OK; - } - - if (vt == VT_VARIANT) { - memcpy(argpos, arg, arglen); - return S_OK; - } - /* Deref BYREF vars if there is need */ - if(V_ISBYREF(arg) && ((V_VT(arg) & ~VT_BYREF)==vt)) { - memcpy(argpos,(void*)V_I4(arg), arglen); - return S_OK; - } - if (vt==VT_UNKNOWN && V_VT(arg)==VT_DISPATCH) { - /* in this context, if the type lib specifies IUnknown*, giving an - IDispatch* is correct; so, don't invoke VariantChangeType */ - memcpy(argpos,&V_I4(arg), arglen); - return S_OK; - } - if ((vt == VT_PTR) && tdesc) - return _copy_arg(tinfo, tdesc->u.lptdesc, argpos, arg, tdesc->u.lptdesc->vt); - - if ((vt == VT_USERDEFINED) && tdesc && tinfo) { - ITypeInfo *tinfo2 = NULL; - TYPEATTR *tattr = NULL; - HRESULT hres; - - hres = ITypeInfo_GetRefTypeInfo(tinfo,tdesc->u.hreftype,&tinfo2); - if (hres) { - FIXME("Could not get typeinfo of hreftype %lx for VT_USERDEFINED, " - "while coercing from vt 0x%x. Copying 4 byte.\n", - tdesc->u.hreftype,V_VT(arg)); - memcpy(argpos, &V_I4(arg), 4); - return S_OK; - } - hres = ITypeInfo_GetTypeAttr(tinfo2,&tattr); - if( hres ) - { - ERR("GetTypeAttr failed\n"); - ITypeInfo_Release(tinfo2); - return hres; - } - switch (tattr->typekind) { - case TKIND_ENUM: - switch ( V_VT( arg ) ) { - case VT_I2: - *argpos = V_I2(arg); - hres = S_OK; - break; - case VT_I4: - memcpy(argpos, &V_I4(arg), 4); - hres = S_OK; - break; - case VT_BYREF|VT_I4: - memcpy(argpos, V_I4REF(arg), 4); - hres = S_OK; - break; - default: - FIXME("vt 0x%x -> TKIND_ENUM unhandled.\n",V_VT(arg)); - hres = E_FAIL; - break; - } - break; - - case TKIND_ALIAS: - tdesc = &(tattr->tdescAlias); - hres = _copy_arg((ITypeInfo2*)tinfo2, tdesc, argpos, arg, tdesc->vt); - break; - - case TKIND_INTERFACE: - if (V_VT(arg) == VT_DISPATCH) { - IDispatch *disp; - if (IsEqualIID(&IID_IDispatch,&(tattr->guid))) { - memcpy(argpos, &V_DISPATCH(arg), 4); - hres = S_OK; - break; - } - hres=IUnknown_QueryInterface(V_DISPATCH(arg), - &IID_IDispatch,(LPVOID*)&disp); - if (SUCCEEDED(hres)) { - memcpy(argpos,&disp,4); - IUnknown_Release(V_DISPATCH(arg)); - hres = S_OK; - break; - } - FIXME("Failed to query IDispatch interface from %s while " - "converting to VT_DISPATCH!\n",debugstr_guid(&(tattr->guid))); - hres = E_FAIL; - break; - } - if (V_VT(arg) == VT_UNKNOWN) { - memcpy(argpos, &V_UNKNOWN(arg), 4); - hres = S_OK; - break; - } - FIXME("vt 0x%x -> TKIND_INTERFACE(%s) unhandled\n", - V_VT(arg),debugstr_guid(&(tattr->guid))); - hres = E_FAIL; - break; - - case TKIND_DISPATCH: - if (V_VT(arg) == VT_DISPATCH) { - memcpy(argpos, &V_DISPATCH(arg), 4); - hres = S_OK; - } - else { - hres = E_FAIL; - FIXME("TKIND_DISPATCH unhandled for target vt 0x%x.\n",V_VT(arg)); - } - break; - case TKIND_RECORD: - FIXME("TKIND_RECORD unhandled.\n"); - hres = E_FAIL; - break; - default: - FIXME("TKIND %d unhandled.\n",tattr->typekind); - hres = E_FAIL; - break; - } - ITypeInfo_ReleaseTypeAttr(tinfo2, tattr); - ITypeInfo_Release(tinfo2); - return hres; - } - - VariantInit(&va); - if (VariantChangeType(&va,arg,0,vt)==S_OK) { - memcpy(argpos,&V_I4(&va), arglen); - FIXME("Should not use VariantChangeType here." - " (conversion from 0x%x -> 0x%x) %08lx\n", - V_VT(arg), vt, *argpos - ); - return S_OK; - } - ERR("Set arg to disparg type 0x%x vs 0x%x\n",V_VT(arg),vt); - return E_FAIL; -} - static HRESULT userdefined_to_variantvt(ITypeInfo *tinfo, const TYPEDESC *tdesc, VARTYPE *vt) { HRESULT hr = S_OK; @@ -5144,7 +4980,7 @@ HRESULT hr = S_OK; /* enforce only one level of pointer indirection */ - if (!(*vt & VT_BYREF) && (tdesc->vt == VT_PTR)) + if (!(*vt & VT_BYREF) && !(*vt & VT_ARRAY) && (tdesc->vt == VT_PTR)) { tdesc = tdesc->u.lptdesc; @@ -5181,9 +5017,17 @@ case VT_USERDEFINED: hr = userdefined_to_variantvt(tinfo, tdesc, vt); break; + case VT_VOID: + case VT_CARRAY: case VT_PTR: - ERR("cannot convert VT_PTR into variant VT\n"); - hr = E_FAIL; + case VT_LPSTR: + case VT_LPWSTR: + ERR("cannot convert type %d into variant VT\n", tdesc->vt); + hr = DISP_E_BADVARTYPE; + break; + case VT_SAFEARRAY: + *vt |= VT_ARRAY; + hr = typedescvt_to_variantvt(tinfo, tdesc->u.lptdesc, vt); break; default: *vt |= tdesc->vt; @@ -5229,10 +5073,6 @@ *|CC_MPWCDECL *|CC_MPWPASCAL * - * BUGS - * Native accepts arguments in the reverse order. I.e. the first item in the - * prgpvarg array is the last argument in the C/C++ declaration of the - * function to be called. */ HRESULT WINAPI DispCallFunc( @@ -5294,6 +5134,17 @@ HeapFree(GetProcessHeap(),0,args); return S_OK; } + +#define INVBUF_ELEMENT_SIZE \ + (sizeof(VARIANTARG) + sizeof(VARIANTARG) + sizeof(VARIANTARG *) + sizeof(VARTYPE)) +#define INVBUF_GET_ARG_ARRAY(buffer, params) \ + ((VARIANTARG *)(buffer)) +#define INVBUF_GET_MISSING_ARG_ARRAY(buffer, params) \ + ((VARIANTARG *)((char *)(buffer) + sizeof(VARIANTARG) * (params))) +#define INVBUF_GET_ARG_PTR_ARRAY(buffer, params) \ + ((VARIANTARG **)((char *)(buffer) + (sizeof(VARIANTARG) + sizeof(VARIANTARG)) * (params))) +#define INVBUF_GET_ARG_TYPE_ARRAY(buffer, params) \ + ((VARTYPE *)((char *)(buffer) + (sizeof(VARIANTARG) + sizeof(VARIANTARG) + sizeof(VARIANTARG *)) * (params))) static HRESULT WINAPI ITypeInfo_fnInvoke( ITypeInfo2 *iface, @@ -5335,163 +5186,179 @@ switch (func_desc->funckind) { case FUNC_PUREVIRTUAL: case FUNC_VIRTUAL: { - DWORD res; - int numargs, numargs2, argspos, args2pos; - DWORD *args , *args2; - VARIANT *rgvarg = HeapAlloc(GetProcessHeap(), 0, sizeof(VARIANT) * func_desc->cParams); - memcpy(rgvarg,pDispParams->rgvarg,sizeof(VARIANT)*pDispParams->cArgs); + void *buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, INVBUF_ELEMENT_SIZE * func_desc->cParams); + VARIANT varresult; + VARIANT retval; /* pointer for storing byref retvals in */ + VARIANTARG **prgpvarg = INVBUF_GET_ARG_PTR_ARRAY(buffer, func_desc->cParams); + VARIANTARG *rgvarg = INVBUF_GET_ARG_ARRAY(buffer, func_desc->cParams); + VARTYPE *rgvt = INVBUF_GET_ARG_TYPE_ARRAY(buffer, func_desc->cParams); hres = S_OK; - numargs = 1; /* sizeof(thisptr) */ - numargs2 = 0; for (i = 0; i < func_desc->cParams; i++) { TYPEDESC *tdesc = &func_desc->lprgelemdescParam[i].tdesc; - - numargs += _argsize(tdesc->vt); - if (i>=pDispParams->cArgs) { /* arguments to return */ - if (tdesc->vt == VT_PTR) { - numargs2 += _argsize(tdesc->u.lptdesc->vt); - } else { - FIXME("The variant type here should have been VT_PTR, not vt %d\n", tdesc->vt); - numargs2 += _argsize(tdesc->vt); + hres = typedescvt_to_variantvt((ITypeInfo *)iface, tdesc, &rgvt[i]); + if (FAILED(hres)) + goto func_fail; + } + + TRACE("changing args\n"); + for (i = 0; i < func_desc->cParams; i++) + { + USHORT wParamFlags = func_desc->lprgelemdescParam[i].u.paramdesc.wParamFlags; + + if (wParamFlags & PARAMFLAG_FRETVAL) + { + /* note: this check is placed so that if the caller passes + * in a VARIANTARG for the retval we just ignore it, like + * native does */ + if (i == func_desc->cParams - 1) + { + VARIANTARG *arg; + arg = prgpvarg[i] = &rgvarg[i]; + memset(arg, 0, sizeof(*arg)); + V_VT(arg) = rgvt[i]; + memset(&retval, 0, sizeof(retval)); + V_BYREF(arg) = &retval; + } + else + { + ERR("[retval] parameter must be the last parameter of the method (%d/%d)\n", i, func_desc->cParams); + hres = E_UNEXPECTED; + break; } } - } - - args = HeapAlloc(GetProcessHeap(),0,sizeof(DWORD)*numargs); - args2 = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(DWORD)*numargs2); - - args[0] = (DWORD)pIUnk; - argspos = 1; args2pos = 0; - for (i = 0; i < func_desc->cParams; i++) - { - ELEMDESC *elemdesc = &(func_desc->lprgelemdescParam[i]); - TYPEDESC *tdesc = &(elemdesc->tdesc); - USHORT paramFlags = elemdesc->u.paramdesc.wParamFlags; - int arglen = _argsize(tdesc->vt); - - if (i<pDispParams->cArgs) + else if (i < pDispParams->cArgs) { - VARIANT *arg = &rgvarg[pDispParams->cArgs-i-1]; - - if (paramFlags & PARAMFLAG_FOPT) { - if(i < func_desc->cParams - func_desc->cParamsOpt) - ERR("Parameter has PARAMFLAG_FOPT flag but is not one of last cParamOpt parameters\n"); - if(V_VT(arg) == VT_EMPTY - || ((V_ISBYREF(arg)) && !V_BYREF(arg))) { - /* FIXME: Documentation says that we do this when parameter is left unspecified. - How to determine it? */ - - if(paramFlags & PARAMFLAG_FHASDEFAULT) - FIXME("PARAMFLAG_FHASDEFAULT flag not supported\n"); - V_VT(arg) = VT_ERROR; - V_ERROR(arg) = DISP_E_PARAMNOTFOUND; - arglen = _argsize(VT_ERROR); - } + VARIANTARG *src_arg = &pDispParams->rgvarg[pDispParams->cArgs - 1 - i]; + V_VT(&rgvarg[i]) = V_VT(src_arg); + dump_Variant(src_arg); + + /* FIXME: this doesn't work for VT_BYREF arguments if + * they are not the same type as in the paramdesc */ + if ((rgvt[i] & VT_BYREF) && !V_ISBYREF(src_arg)) + { + VARIANTARG *missing_arg = INVBUF_GET_MISSING_ARG_ARRAY(buffer, func_desc->cParams); + V_VT(&missing_arg[i]) = V_VT(src_arg); + hres = VariantChangeType(&missing_arg[i], src_arg, 0, rgvt[i] & ~VT_BYREF); + V_BYREF(&rgvarg[i]) = &V_NONE(&missing_arg[i]); } - hres = _copy_arg(iface, tdesc, &args[argspos], arg, tdesc->vt); - if (FAILED(hres)) goto func_fail; - argspos += arglen; + else + hres = VariantChangeType(&rgvarg[i], src_arg, 0, rgvt[i]); + + if (FAILED(hres)) + { + ERR("failed to convert param %d to %s%s from %s%s\n", i, + debugstr_vt(rgvt[i]), debugstr_vf(rgvt[i]), + debugstr_VT(src_arg), debugstr_VF(src_arg)); + break; + } + V_VT(&rgvarg[i]) = rgvt[i]; + prgpvarg[i] = &rgvarg[i]; } - else if (paramFlags & PARAMFLAG_FOPT) + else if (wParamFlags & PARAMFLAG_FOPT) { - VARIANT *arg = &rgvarg[i]; - - if (i < func_desc->cParams - func_desc->cParamsOpt) - ERR("Parameter has PARAMFLAG_FOPT flag but is not one of last cParamOpt parameters\n"); - if (paramFlags & PARAMFLAG_FHASDEFAULT) - FIXME("PARAMFLAG_FHASDEFAULT flag not supported\n"); - - V_VT(arg) = VT_ERROR; - V_ERROR(arg) = DISP_E_PARAMNOTFOUND; - arglen = _argsize(VT_ERROR); - hres = _copy_arg(iface, tdesc, &args[argspos], arg, tdesc->vt); - if (FAILED(hres)) goto func_fail; - argspos += arglen; + VARIANTARG *arg; + arg = prgpvarg[i] = &rgvarg[i]; + if (wParamFlags & PARAMFLAG_FHASDEFAULT) + { + hres = VariantCopy(arg, &func_desc->lprgelemdescParam[i].u.paramdesc.pparamdescex->varDefaultValue); + if (FAILED(hres)) + break; + } + else + { + VARIANTARG *missing_arg = INVBUF_GET_MISSING_ARG_ARRAY(buffer, func_desc->cParams); + V_VT(arg) = VT_VARIANT | VT_BYREF; + V_VARIANTREF(arg) = &missing_arg[i]; + V_VT(V_VARIANTREF(arg)) = VT_ERROR; + V_ERROR(V_VARIANTREF(arg)) = DISP_E_PARAMNOTFOUND; + } } else { - if (tdesc->vt == VT_PTR) - arglen = _argsize(tdesc->u.lptdesc->vt); - else - FIXME("set %d to pointer for get (type is %d)\n",i,tdesc->vt); - - /* Supply pointers for the rest, so propertyget works*/ - args[argspos] = (DWORD)&args2[args2pos]; - - /* If pointer to variant, pass reference it. */ - if ((tdesc->vt == VT_PTR) && - (tdesc->u.lptdesc->vt == VT_VARIANT) && - pVarResult - ) - args[argspos]= (DWORD)pVarResult; - argspos += 1; - args2pos += arglen; + hres = DISP_E_BADPARAMCOUNT; + break; } } + if (FAILED(hres)) goto func_fail; /* FIXME: we don't free changed types here */ if (func_desc->cParamsOpt < 0) - FIXME("Does not support optional parameters (%d)\n", func_desc->cParamsOpt); - - res = _invoke((*(FARPROC**)pIUnk)[func_desc->oVft/4], - func_desc->callconv, - numargs, - args - ); + { + FIXME("Does not support safearray optional parameters\n"); + hres = DISP_E_BADPARAMCOUNT; + goto func_fail; /* FIXME: we don't free changed types here */ + } + + V_VT(&varresult) = 0; + hres = typedescvt_to_variantvt((ITypeInfo *)iface, &func_desc->elemdescFunc.tdesc, &V_VT(&varresult)); + if (FAILED(hres)) goto func_fail; /* FIXME: we don't free changed types here */ + + hres = DispCallFunc(pIUnk, func_desc->oVft, func_desc->callconv, + V_VT(&varresult), func_desc->cParams, rgvt, + prgpvarg, &varresult); for (i = 0; i < func_desc->cParams; i++) { USHORT wParamFlags = func_desc->lprgelemdescParam[i].u.paramdesc.wParamFlags; if (wParamFlags & PARAMFLAG_FRETVAL) { - ELEMDESC *elemdesc = &func_desc->lprgelemdescParam[i]; - TYPEDESC *tdesc = &elemdesc->tdesc; - VARIANTARG varresult; - V_VT(&varresult) = 0; - hres = typedescvt_to_variantvt((ITypeInfo *)iface, tdesc, &V_VT(&varresult)); - if (hres) - break; - /* FIXME: this is really messy - we should keep the - * args in VARIANTARGs rather than a DWORD array */ - memcpy(&V_UI4(&varresult), &args[i+1], sizeof(DWORD)); if (TRACE_ON(ole)) { - TRACE("varresult: "); - dump_Variant(&varresult); + TRACE("[retval] value: "); + dump_Variant(prgpvarg[i]); } if (pVarResult) /* deref return value */ - hres = VariantCopyInd(pVarResult, &varresult); + hres = VariantCopyInd(pVarResult, prgpvarg[i]); /* free data stored in varresult. Note that * VariantClear doesn't do what we want because we are * working with byref types. */ /* FIXME: clear safearrays, bstrs, records and - * variants here too */ - if ((V_VT(&varresult) == (VT_UNKNOWN | VT_BYREF)) || - (V_VT(&varresult) == (VT_DISPATCH | VT_BYREF))) + * variants here too */ + if ((V_VT(prgpvarg[i]) == (VT_UNKNOWN | VT_BYREF)) || + (V_VT(prgpvarg[i]) == (VT_DISPATCH | VT_BYREF))) { - if(*V_UNKNOWNREF(&varresult)) - IUnknown_Release(*V_UNKNOWNREF(&varresult)); + if(*V_UNKNOWNREF(prgpvarg[i])) + IUnknown_Release(*V_UNKNOWNREF(prgpvarg[i])); } break; } + else if (i < pDispParams->cArgs) + { + if (wParamFlags & PARAMFLAG_FOUT) + { + hres = VariantChangeType(&pDispParams->rgvarg[pDispParams->cArgs - 1 - i], + &rgvarg[i], 0, + V_VT(&pDispParams->rgvarg[pDispParams->cArgs - 1 - i])); + if (FAILED(hres)) + { + ERR("failed to convert param %d to vt %d\n", i, + V_VT(&pDispParams->rgvarg[pDispParams->cArgs - 1 - i])); + break; + } + } + VariantClear(&rgvarg[i]); + } + else if (wParamFlags & PARAMFLAG_FOPT) + { + if (wParamFlags & PARAMFLAG_FHASDEFAULT) + VariantClear(&rgvarg[i]); + } } - if ((func_desc->elemdescFunc.tdesc.vt == VT_HRESULT) && FAILED(res)) + if ((V_VT(&varresult) == VT_ERROR) && FAILED(V_ERROR(&varresult))) { - WARN("invoked function failed with error 0x%08lx\n", res); + WARN("invoked function failed with error 0x%08lx\n", V_ERROR(&varresult)); hres = DISP_E_EXCEPTION; - if (pExcepInfo) pExcepInfo->scode = res; + if (pExcepInfo) pExcepInfo->scode = V_ERROR(&varresult); } func_fail: - HeapFree(GetProcessHeap(), 0, rgvarg); - HeapFree(GetProcessHeap(),0,args2); - HeapFree(GetProcessHeap(),0,args); + HeapFree(GetProcessHeap(), 0, buffer); break; - } + } case FUNC_DISPATCH: { IDispatch *disp; @@ -5562,8 +5429,8 @@ DWORD *pdwHelpContext, BSTR *pBstrHelpFile) { ITypeInfoImpl *This = (ITypeInfoImpl *)iface; - TLBFuncDesc * pFDesc; - TLBVarDesc * pVDesc; + const TLBFuncDesc *pFDesc; + const TLBVarDesc *pVDesc; TRACE("(%p) memid %ld Name(%p) DocString(%p)" " HelpContext(%p) HelpFile(%p)\n", This, memid, pBstrName, pBstrDocString, pdwHelpContext, pBstrHelpFile); @@ -5613,7 +5480,7 @@ WORD *pwOrdinal) { ITypeInfoImpl *This = (ITypeInfoImpl *)iface; - TLBFuncDesc *pFDesc; + const TLBFuncDesc *pFDesc; TRACE("(%p)->(memid %lx, %d, %p, %p, %p)\n", This, memid, invKind, pBstrDllName, pBstrName, pwOrdinal); @@ -5947,7 +5814,7 @@ MEMBERID memid, INVOKEKIND invKind, UINT *pFuncIndex) { ITypeInfoImpl *This = (ITypeInfoImpl *)iface; - TLBFuncDesc *pFuncInfo; + const TLBFuncDesc *pFuncInfo; int i; HRESULT result; @@ -6171,8 +6038,8 @@ BSTR *pbstrHelpStringDll) { ITypeInfoImpl *This = (ITypeInfoImpl *)iface; - TLBFuncDesc * pFDesc; - TLBVarDesc * pVDesc; + const TLBFuncDesc *pFDesc; + const TLBVarDesc *pVDesc; TRACE("(%p) memid %ld lcid(0x%lx) HelpString(%p) " "HelpStringContext(%p) HelpStringDll(%p)\n", This, memid, lcid, pbstrHelpString, pdwHelpStringContext, @@ -6458,41 +6325,49 @@ LCID lcid, /* [I] Locale Id */ ITypeInfo **pptinfo) /* [O] Destination for created ITypeInfo object */ { - ITypeInfoImpl *pTIImpl; + ITypeInfoImpl *pTIClass, *pTIIface; + ITypeLibImpl *pTypeLibImpl; int param, func; TLBFuncDesc **ppFuncDesc; - pTIImpl = (ITypeInfoImpl*)ITypeInfo_Constructor(); - pTIImpl->pTypeLib = NULL; - pTIImpl->index = 0; - pTIImpl->Name = NULL; - pTIImpl->dwHelpContext = -1; - memset(&pTIImpl->TypeAttr.guid, 0, sizeof(GUID)); - pTIImpl->TypeAttr.lcid = lcid; - pTIImpl->TypeAttr.typekind = TKIND_COCLASS; - pTIImpl->TypeAttr.wMajorVerNum = 0; - pTIImpl->TypeAttr.wMinorVerNum = 0; - pTIImpl->TypeAttr.cbAlignment = 2; - pTIImpl->TypeAttr.cbSizeInstance = -1; - pTIImpl->TypeAttr.cbSizeVft = -1; - pTIImpl->TypeAttr.cFuncs = 0; - pTIImpl->TypeAttr.cImplTypes = 1; - pTIImpl->TypeAttr.cVars = 0; - pTIImpl->TypeAttr.wTypeFlags = 0; - - ppFuncDesc = &pTIImpl->funclist; + TRACE_(typelib)("\n"); + pTypeLibImpl = TypeLibImpl_Constructor(); + if (!pTypeLibImpl) return E_FAIL; + + pTIIface = (ITypeInfoImpl*)ITypeInfo_Constructor(); + pTIIface->pTypeLib = pTypeLibImpl; + pTIIface->index = 0; + pTIIface->Name = NULL; + pTIIface->dwHelpContext = -1; + memset(&pTIIface->TypeAttr.guid, 0, sizeof(GUID)); + pTIIface->TypeAttr.lcid = lcid; + pTIIface->TypeAttr.typekind = TKIND_INTERFACE; + pTIIface->TypeAttr.wMajorVerNum = 0; + pTIIface->TypeAttr.wMinorVerNum = 0; + pTIIface->TypeAttr.cbAlignment = 2; + pTIIface->TypeAttr.cbSizeInstance = -1; + pTIIface->TypeAttr.cbSizeVft = -1; + pTIIface->TypeAttr.cFuncs = 0; + pTIIface->TypeAttr.cImplTypes = 0; + pTIIface->TypeAttr.cVars = 0; + pTIIface->TypeAttr.wTypeFlags = 0; + + ppFuncDesc = &pTIIface->funclist; for(func = 0; func < pidata->cMembers; func++) { METHODDATA *md = pidata->pmethdata + func; *ppFuncDesc = HeapAlloc(GetProcessHeap(), 0, sizeof(**ppFuncDesc)); (*ppFuncDesc)->Name = SysAllocString(md->szName); (*ppFuncDesc)->funcdesc.memid = md->dispid; + (*ppFuncDesc)->funcdesc.funckind = FUNC_VIRTUAL; (*ppFuncDesc)->funcdesc.invkind = md->wFlags; (*ppFuncDesc)->funcdesc.callconv = md->cc; (*ppFuncDesc)->funcdesc.cParams = md->cArgs; (*ppFuncDesc)->funcdesc.cParamsOpt = 0; - (*ppFuncDesc)->funcdesc.oVft = md->iMeth; - (*ppFuncDesc)->funcdesc.wFuncFlags = 0; /*??*/ + (*ppFuncDesc)->funcdesc.oVft = md->iMeth << 2; + (*ppFuncDesc)->funcdesc.wFuncFlags = 0; (*ppFuncDesc)->funcdesc.elemdescFunc.tdesc.vt = md->vtReturn; + (*ppFuncDesc)->funcdesc.elemdescFunc.u.paramdesc.wParamFlags = PARAMFLAG_NONE; + (*ppFuncDesc)->funcdesc.elemdescFunc.u.paramdesc.pparamdescex = NULL; (*ppFuncDesc)->funcdesc.lprgelemdescParam = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, md->cArgs * sizeof(ELEMDESC)); (*ppFuncDesc)->pParamDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, @@ -6501,9 +6376,49 @@ (*ppFuncDesc)->funcdesc.lprgelemdescParam[param].tdesc.vt = md->ppdata[param].vt; (*ppFuncDesc)->pParamDesc[param].Name = SysAllocString(md->ppdata[param].szName); } + (*ppFuncDesc)->helpcontext = 0; + (*ppFuncDesc)->HelpStringContext = 0; + (*ppFuncDesc)->HelpString = NULL; + (*ppFuncDesc)->Entry = NULL; + (*ppFuncDesc)->ctCustData = 0; + (*ppFuncDesc)->pCustData = NULL; + (*ppFuncDesc)->next = NULL; ppFuncDesc = &(*ppFuncDesc)->next; - } - *pptinfo = (ITypeInfo*)pTIImpl; + } + + pTypeLibImpl->pTypeInfo = pTIIface; + pTypeLibImpl->TypeInfoCount++; + + pTIClass = (ITypeInfoImpl*)ITypeInfo_Constructor(); + pTIClass->pTypeLib = pTypeLibImpl; + pTIClass->index = 1; + pTIClass->Name = NULL; + pTIClass->dwHelpContext = -1; + memset(&pTIClass->TypeAttr.guid, 0, sizeof(GUID)); + pTIClass->TypeAttr.lcid = lcid; + pTIClass->TypeAttr.typekind = TKIND_COCLASS; + pTIClass->TypeAttr.wMajorVerNum = 0; + pTIClass->TypeAttr.wMinorVerNum = 0; + pTIClass->TypeAttr.cbAlignment = 2; + pTIClass->TypeAttr.cbSizeInstance = -1; + pTIClass->TypeAttr.cbSizeVft = -1; + pTIClass->TypeAttr.cFuncs = 0; + pTIClass->TypeAttr.cImplTypes = 1; + pTIClass->TypeAttr.cVars = 0; + pTIClass->TypeAttr.wTypeFlags = 0; + + pTIClass->impltypelist = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*pTIClass->impltypelist)); + pTIClass->impltypelist->hRef = 1; + + pTIClass->reflist = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*pTIClass->reflist)); + pTIClass->reflist->index = 0; + pTIClass->reflist->reference = 1; + pTIClass->reflist->pImpTLInfo = TLB_REF_INTERNAL; + + pTIIface->next = pTIClass; + pTypeLibImpl->TypeInfoCount++; + + *pptinfo = (ITypeInfo*)pTIClass; return S_OK; } @@ -6539,8 +6454,8 @@ BINDPTR * pBindPtr) { ITypeInfoImpl *This = info_impl_from_ITypeComp(iface); - TLBFuncDesc * pFDesc; - TLBVarDesc * pVDesc; + const TLBFuncDesc *pFDesc; + const TLBVarDesc *pVDesc; TRACE("(%s, %lx, 0x%x, %p, %p, %p)\n", debugstr_w(szName), lHash, wFlags, ppTInfo, pDescKind, pBindPtr); Modified: trunk/reactos/dll/win32/oleaut32/usrmarshal.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/oleaut32/usrmarsh… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/usrmarshal.c (original) +++ trunk/reactos/dll/win32/oleaut32/usrmarshal.c Mon Mar 27 20:44:53 2006 @@ -60,6 +60,22 @@ { return NdrDllGetClassObject(rclsid, riid, ppv, OLEAUT32_ProxyFileList, &CLSID_PSDispatch, &PSFactoryBuffer); +} + +static void dump_user_flags(unsigned long *pFlags) +{ + if (HIWORD(*pFlags) == NDR_LOCAL_DATA_REPRESENTATION) + TRACE("MAKELONG(NDR_LOCAL_REPRESENTATION, "); + else + TRACE("MAKELONG(0x%04x, ", HIWORD(*pFlags)); + switch (LOWORD(*pFlags)) + { + case MSHCTX_LOCAL: TRACE("MSHCTX_LOCAL)"); break; + case MSHCTX_NOSHAREDMEM: TRACE("MSHCTX_NOSHAREDMEM)"); break; + case MSHCTX_DIFFERENTMACHINE: TRACE("MSHCTX_DIFFERENTMACHINE)"); break; + case MSHCTX_INPROC: TRACE("MSHCTX_INPROC)"); break; + default: TRACE("%d)", LOWORD(*pFlags)); + } } /* CLEANLOCALSTORAGE */ @@ -516,6 +532,402 @@ CoTaskMemFree(ref); } +/* LPSAFEARRAY */ + +/* Get the number of cells in a SafeArray */ +static ULONG SAFEARRAY_GetCellCount(const SAFEARRAY *psa) +{ + const SAFEARRAYBOUND* psab = psa->rgsabound; + USHORT cCount = psa->cDims; + ULONG ulNumCells = 1; + + while (cCount--) + { + /* This is a valid bordercase. See testcases. -Marcus */ + if (!psab->cElements) + return 0; + ulNumCells *= psab->cElements; + psab++; + } + return ulNumCells; +} + +static inline SF_TYPE SAFEARRAY_GetUnionType(SAFEARRAY *psa) +{ + VARTYPE vt; + HRESULT hr; + + hr = SafeArrayGetVartype(psa, &vt); + if (FAILED(hr)) + RpcRaiseException(hr); + + if (psa->fFeatures & FADF_HAVEIID) + return SF_HAVEIID; + + switch (vt) + { + case VT_I1: + case VT_UI1: return SF_I1; + case VT_BOOL: + case VT_I2: + case VT_UI2: return SF_I2; + case VT_INT: + case VT_UINT: + case VT_I4: + case VT_UI4: + case VT_R4: return SF_I4; + case VT_DATE: + case VT_CY: + case VT_R8: + case VT_I8: + case VT_UI8: return SF_I8; + case VT_INT_PTR: + case VT_UINT_PTR: return (sizeof(UINT_PTR) == 4 ? SF_I4 : SF_I8); + case VT_BSTR: return SF_BSTR; + case VT_DISPATCH: return SF_DISPATCH; + case VT_VARIANT: return SF_VARIANT; + case VT_UNKNOWN: return SF_UNKNOWN; + /* Note: Return a non-zero size to indicate vt is valid. The actual size + * of a UDT is taken from the result of IRecordInfo_GetSize(). + */ + case VT_RECORD: return SF_RECORD; + default: return SF_ERROR; + } +} + +unsigned long WINAPI LPSAFEARRAY_UserSize(unsigned long *pFlags, unsigned long StartingSize, LPSAFEARRAY *ppsa) +{ + unsigned long size = StartingSize; + + TRACE("("); dump_user_flags(pFlags); TRACE(", %ld, %p\n", StartingSize, *ppsa); + + size += sizeof(ULONG_PTR); + if (*ppsa) + { + SAFEARRAY *psa = *ppsa; + ULONG ulCellCount = SAFEARRAY_GetCellCount(psa); + SF_TYPE sftype; + HRESULT hr; + + size += sizeof(ULONG); + size += FIELD_OFFSET(struct _wireSAFEARRAY, uArrayStructs); + + sftype = SAFEARRAY_GetUnionType(psa); + size += sizeof(ULONG); + + size += sizeof(ULONG); + size += sizeof(ULONG_PTR); + if (sftype == SF_HAVEIID) + size += sizeof(IID); + + size += sizeof(psa->rgsabound[0]) * psa->cDims; + + size += sizeof(ULONG); + + switch (sftype) + { + case SF_BSTR: + { + BSTR* lpBstr; + + for (lpBstr = (BSTR*)psa->pvData; ulCellCount; ulCellCount--, lpBstr++) + size = BSTR_UserSize(pFlags, size, lpBstr); + + break; + } + case SF_DISPATCH: + case SF_UNKNOWN: + case SF_HAVEIID: + FIXME("size interfaces\n"); + break; + case SF_VARIANT: + { + VARIANT* lpVariant; + + for (lpVariant = (VARIANT*)psa->pvData; ulCellCount; ulCellCount--, lpVariant++) + size = VARIANT_UserSize(pFlags, size, lpVariant); + + break; + } + case SF_RECORD: + { + IRecordInfo* pRecInfo = NULL; + + hr = SafeArrayGetRecordInfo(psa, &pRecInfo); + if (FAILED(hr)) + RpcRaiseException(hr); + + if (pRecInfo) + { + FIXME("size record info %p\n", pRecInfo); + + IRecordInfo_Release(pRecInfo); + } + break; + } + case SF_I1: + case SF_I2: + case SF_I4: + case SF_I8: + size += ulCellCount * psa->cbElements; + break; + default: + break; + } + + } + + return size; +} + +unsigned char * WINAPI LPSAFEARRAY_UserMarshal(unsigned long *pFlags, unsigned char *Buffer, LPSAFEARRAY *ppsa) +{ + HRESULT hr; + + TRACE("("); dump_user_flags(pFlags); TRACE(", %p, &%p\n", Buffer, *ppsa); + + *(ULONG_PTR *)Buffer = *ppsa ? TRUE : FALSE; + Buffer += sizeof(ULONG_PTR); + if (*ppsa) + { + VARTYPE vt; + SAFEARRAY *psa = *ppsa; + ULONG ulCellCount = SAFEARRAY_GetCellCount(psa); + wireSAFEARRAY wiresa; + SF_TYPE sftype; + GUID guid; + + *(ULONG *)Buffer = psa->cDims; + Buffer += sizeof(ULONG); + wiresa = (wireSAFEARRAY)Buffer; + wiresa->cDims = psa->cDims; + wiresa->fFeatures = psa->fFeatures; + wiresa->cbElements = psa->cbElements; + + hr = SafeArrayGetVartype(psa, &vt); + if (FAILED(hr)) + RpcRaiseException(hr); + wiresa->cLocks = (USHORT)psa->cLocks | (vt << 16); + + Buffer += FIELD_OFFSET(struct _wireSAFEARRAY, uArrayStructs); + + sftype = SAFEARRAY_GetUnionType(psa); + *(ULONG *)Buffer = sftype; + Buffer += sizeof(ULONG); + + *(ULONG *)Buffer = ulCellCount; + Buffer += sizeof(ULONG); + *(ULONG_PTR *)Buffer = (ULONG_PTR)psa->pvData; + Buffer += sizeof(ULONG_PTR); + if (sftype == SF_HAVEIID) + { + SafeArrayGetIID(psa, &guid); + memcpy(Buffer, &guid, sizeof(guid)); + Buffer += sizeof(guid); + } + + memcpy(Buffer, psa->rgsabound, sizeof(psa->rgsabound[0]) * psa->cDims); + Buffer += sizeof(psa->rgsabound[0]) * psa->cDims; + + *(ULONG *)Buffer = ulCellCount; + Buffer += sizeof(ULONG); + + if (psa->pvData) + { + switch (sftype) + { + case SF_BSTR: + { + BSTR* lpBstr; + + for (lpBstr = (BSTR*)psa->pvData; ulCellCount; ulCellCount--, lpBstr++) + Buffer = BSTR_UserMarshal(pFlags, Buffer, lpBstr); + + break; + } + case SF_DISPATCH: + case SF_UNKNOWN: + case SF_HAVEIID: + FIXME("marshal interfaces\n"); + break; + case SF_VARIANT: + { + VARIANT* lpVariant; + + for (lpVariant = (VARIANT*)psa->pvData; ulCellCount; ulCellCount--, lpVariant++) + Buffer = VARIANT_UserMarshal(pFlags, Buffer, lpVariant); + + break; + } + case SF_RECORD: + { + IRecordInfo* pRecInfo = NULL; + + hr = SafeArrayGetRecordInfo(psa, &pRecInfo); + if (FAILED(hr)) + RpcRaiseException(hr); + + if (pRecInfo) + { + FIXME("write record info %p\n", pRecInfo); + + IRecordInfo_Release(pRecInfo); + } + break; + } + case SF_I1: + case SF_I2: + case SF_I4: + case SF_I8: + /* Just copy the data over */ + memcpy(Buffer, psa->pvData, ulCellCount * psa->cbElements); + Buffer += ulCellCount * psa->cbElements; + break; + default: + break; + } + } + + } + return Buffer; +} + +#define FADF_AUTOSETFLAGS (FADF_HAVEIID | FADF_RECORD | FADF_HAVEVARTYPE | \ + FADF_BSTR | FADF_UNKNOWN | FADF_DISPATCH | \ + FADF_VARIANT | FADF_CREATEVECTOR) + +unsigned char * WINAPI LPSAFEARRAY_UserUnmarshal(unsigned long *pFlags, unsigned char *Buffer, LPSAFEARRAY *ppsa) +{ + ULONG_PTR ptr; + wireSAFEARRAY wiresa; + ULONG cDims; + HRESULT hr; + SF_TYPE sftype; + ULONG cell_count; + GUID guid; + VARTYPE vt; + SAFEARRAYBOUND *wiresab; + + TRACE("("); dump_user_flags(pFlags); TRACE(", %p, %p\n", Buffer, ppsa); + + ptr = *(ULONG_PTR *)Buffer; + Buffer += sizeof(ULONG_PTR); + + if (!ptr) + { + *ppsa = NULL; + + TRACE("NULL safe array unmarshaled\n"); + + return Buffer; + } + + cDims = *(ULONG *)Buffer; + Buffer += sizeof(ULONG); + + wiresa = (wireSAFEARRAY)Buffer; + Buffer += FIELD_OFFSET(struct _wireSAFEARRAY, uArrayStructs); + + if (cDims != wiresa->cDims) + RpcRaiseException(RPC_S_INVALID_BOUND); + + /* FIXME: there should be a limit on how large cDims can be */ + + vt = HIWORD(wiresa->cLocks); + + sftype = *(ULONG *)Buffer; + Buffer += sizeof(ULONG); + + cell_count = *(ULONG *)Buffer; + Buffer += sizeof(ULONG); + ptr = *(ULONG_PTR *)Buffer; + Buffer += sizeof(ULONG_PTR); + if (sftype == SF_HAVEIID) + { + memcpy(&guid, Buffer, sizeof(guid)); + Buffer += sizeof(guid); + } + + wiresab = (SAFEARRAYBOUND *)Buffer; + Buffer += sizeof(wiresab[0]) * wiresa->cDims; + + *ppsa = SafeArrayCreateEx(vt, wiresa->cDims, wiresab, NULL); + if (!ppsa) + RpcRaiseException(E_OUTOFMEMORY); + + /* be careful about which flags we set since they could be a security + * risk */ + (*ppsa)->fFeatures = wiresa->fFeatures & ~(FADF_AUTOSETFLAGS); + /* FIXME: there should be a limit on how large wiresa->cbElements can be */ + (*ppsa)->cbElements = wiresa->cbElements; + (*ppsa)->cLocks = LOWORD(wiresa->cLocks); + + hr = SafeArrayAllocData(*ppsa); + if (FAILED(hr)) + RpcRaiseException(hr); + + if ((*(ULONG *)Buffer != cell_count) || (SAFEARRAY_GetCellCount(*ppsa) != cell_count)) + RpcRaiseException(RPC_S_INVALID_BOUND); + Buffer += sizeof(ULONG); + + if (ptr) + { + switch (sftype) + { + case SF_BSTR: + { + BSTR* lpBstr; + + for (lpBstr = (BSTR*)(*ppsa)->pvData; cell_count; cell_count--, lpBstr++) + Buffer = BSTR_UserUnmarshal(pFlags, Buffer, lpBstr); + + break; + } + case SF_DISPATCH: + case SF_UNKNOWN: + case SF_HAVEIID: + FIXME("marshal interfaces\n"); + break; + case SF_VARIANT: + { + VARIANT* lpVariant; + + for (lpVariant = (VARIANT*)(*ppsa)->pvData; cell_count; cell_count--, lpVariant++) + Buffer = VARIANT_UserUnmarshal(pFlags, Buffer, lpVariant); + + break; + } + case SF_RECORD: + { + FIXME("set record info\n"); + + break; + } + case SF_I1: + case SF_I2: + case SF_I4: + case SF_I8: + /* Just copy the data over */ + memcpy((*ppsa)->pvData, Buffer, cell_count * (*ppsa)->cbElements); + Buffer += cell_count * (*ppsa)->cbElements; + break; + default: + break; + } + } + + TRACE("safe array unmarshaled: %p\n", *ppsa); + + return Buffer; +} + +void WINAPI LPSAFEARRAY_UserFree(unsigned long *pFlags, LPSAFEARRAY *ppsa) +{ + TRACE("("); dump_user_flags(pFlags); TRACE(", &%p\n", *ppsa); + + SafeArrayDestroy(*ppsa); +} + /* IDispatch */ /* exactly how Invoke is marshalled is not very clear to me yet, * but the way I've done it seems to work for me */ Modified: trunk/reactos/dll/win32/oleaut32/varformat.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/oleaut32/varforma… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/varformat.c (original) +++ trunk/reactos/dll/win32/oleaut32/varformat.c Mon Mar 27 20:44:53 2006 @@ -1983,7 +1983,7 @@ #define NUMBER_VTBITS (VTBIT_I1|VTBIT_UI1|VTBIT_I2|VTBIT_UI2| \ VTBIT_I4|VTBIT_UI4|VTBIT_I8|VTBIT_UI8| \ VTBIT_R4|VTBIT_R8|VTBIT_CY|VTBIT_DECIMAL| \ - (1<<VT_BOOL)|(1<<VT_INT)|(1<<VT_UINT)) + VTBIT_BOOL|VTBIT_INT|VTBIT_UINT) /********************************************************************** * VarFormatFromTokens [OLEAUT32.139] @@ -2006,6 +2006,9 @@ if (!pVarIn || !rgbTok) return E_INVALIDARG; + + if (V_VT(pVarIn) == VT_NULL) + return S_OK; if (*rgbTok == FMT_TO_STRING || header->type == FMT_TYPE_GENERAL) { Modified: trunk/reactos/dll/win32/oleaut32/variant.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/oleaut32/variant.… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/variant.c (original) +++ trunk/reactos/dll/win32/oleaut32/variant.c Mon Mar 27 20:44:53 2006 @@ -2500,199 +2500,231 @@ return S_OK; } +/* Wrapper around VariantChangeTypeEx() which permits changing a + variant with VT_RESERVED flag set. Needed by VarCmp. */ +static HRESULT _VarChangeTypeExWrap (VARIANTARG* pvargDest, + VARIANTARG* pvargSrc, LCID lcid, USHORT wFlags, VARTYPE vt) +{ + HRESULT res; + VARTYPE flags; + + flags = V_VT(pvargSrc) & ~VT_TYPEMASK; + V_VT(pvargSrc) &= ~VT_RESERVED; + res = VariantChangeTypeEx(pvargDest,pvargSrc,lcid,wFlags,vt); + V_VT(pvargSrc) |= flags; + + return res; +} + /********************************************************************** * VarCmp [OLEAUT32.176] * - * flags can be: - * NORM_IGNORECASE, NORM_IGNORENONSPACE, NORM_IGNORESYMBOLS - * NORM_IGNOREWIDTH, NORM_IGNOREKANATYPE, NORM_IGNOREKASHIDA - * + * Compare two variants. + * + * PARAMS + * left [I] First variant + * right [I] Second variant + * lcid [I] LCID (locale identifier) for the comparison + * flags [I] Flags to be used in the comparision: + * NORM_IGNORECASE, NORM_IGNORENONSPACE, NORM_IGNORESYMBOLS, + * NORM_IGNOREWIDTH, NORM_IGNOREKANATYPE, NORM_IGNOREKASHIDA + * + * RETURNS + * VARCMP_LT: left variant is less than right variant. + * VARCMP_EQ: input variants are equal. + * VARCMP_LT: left variant is greater than right variant. + * VARCMP_NULL: either one of the input variants is NULL. + * Failure: An HRESULT error code indicating the error. + * + * NOTES + * Native VarCmp up to and including WinXP dosn't like as input variants + * I1, UI2, VT_UI4, UI8 and UINT. INT is accepted only as left variant. + * + * If both input variants are ERROR then VARCMP_EQ will be returned, else + * an ERROR variant will trigger an error. + * + * Both input variants can have VT_RESERVED flag set which is ignored + * unless one and only one of the variants is a BSTR and the other one + * is not an EMPTY variant. All four VT_RESERVED combinations have a + * different meaning: + * - BSTR and other: BSTR is always greater than the other variant. + * - BSTR|VT_RESERVED and other: a string comparision is performed. + * - BSTR and other|VT_RESERVED: If the BSTR is a number a numeric + * comparision will take place else the BSTR is always greater. + * - BSTR|VT_RESERVED and other|VT_RESERVED: It seems that the other + * variant is ignored and the return value depends only on the sign + * of the BSTR if it is a number else the BSTR is always greater. A + * positive BSTR is greater, a negative one is smaller than the other + * variant. + * + * SEE + * VarBstrCmp for the lcid and flags usage. */ HRESULT WINAPI VarCmp(LPVARIANT left, LPVARIANT right, LCID lcid, DWORD flags) { - BOOL lOk = TRUE; - BOOL rOk = TRUE; - BOOL l_isR = FALSE; - BOOL r_isR = FALSE; - LONGLONG lVal = -1; - LONGLONG rVal = -1; - VARIANT rv,lv; - DWORD xmask; - HRESULT rc; - double lDouble =0.0,rDouble=0.0; + VARTYPE lvt, rvt, vt; + VARIANT rv,lv; + DWORD xmask; + HRESULT rc; TRACE("(%p->(%s%s),%p->(%s%s),0x%08lx,0x%08lx)\n", left, debugstr_VT(left), debugstr_VF(left), right, debugstr_VT(right), debugstr_VF(right), lcid, flags); - VariantInit(&lv);VariantInit(&rv); - V_VT(right) &= ~0x8000; /* hack since we sometime get this flag. */ - V_VT(left) &= ~0x8000; /* hack since we sometime get this flag. */ - - /* If either are null, then return VARCMP_NULL */ - if ((V_VT(left)&VT_TYPEMASK) == VT_NULL || - (V_VT(right)&VT_TYPEMASK) == VT_NULL) + lvt = V_VT(left) & VT_TYPEMASK; + rvt = V_VT(right) & VT_TYPEMASK; + xmask = (1 << lvt) | (1 << rvt); + + /* If we have any flag set except VT_RESERVED bail out. + Same for the left input variant type > VT_INT and for the + right input variant type > VT_I8. Yes, VT_INT is only supported + as left variant. Go figure */ + if (((V_VT(left) | V_VT(right)) & ~VT_TYPEMASK & ~VT_RESERVED) || + lvt > VT_INT || rvt > VT_I8) { + return DISP_E_BADVARTYPE; + } + + /* Don't ask me why but native VarCmp cannot handle: VT_I1, VT_UI2, VT_UI4, + VT_UINT and VT_UI8. Tested with DCOM98, Win2k, WinXP */ + if (rvt == VT_INT || xmask & (VTBIT_I1 | VTBIT_UI2 | VTBIT_UI4 | VTBIT_UI8 | + VTBIT_DISPATCH | VTBIT_VARIANT | VTBIT_UNKNOWN | VTBIT_15)) + return DISP_E_TYPEMISMATCH; + + /* If both variants are VT_ERROR return VARCMP_EQ */ + if (xmask == VTBIT_ERROR) + return VARCMP_EQ; + else if (xmask & VTBIT_ERROR) + return DISP_E_TYPEMISMATCH; + + if (xmask & VTBIT_NULL) return VARCMP_NULL; - /* Strings - use VarBstrCmp */ - if ((V_VT(left)&VT_TYPEMASK) == VT_BSTR && - (V_VT(right)&VT_TYPEMASK) == VT_BSTR) { + VariantInit(&lv); + VariantInit(&rv); + + /* Two BSTRs, ignore VT_RESERVED */ + if (xmask == VTBIT_BSTR) return VarBstrCmp(V_BSTR(left), V_BSTR(right), lcid, flags); - } - - xmask = (1<<(V_VT(left)&VT_TYPEMASK))|(1<<(V_VT(right)&VT_TYPEMASK)); - if (xmask & VTBIT_DECIMAL) { - rc = VariantChangeType(&lv,left,0,VT_DECIMAL); - if (FAILED(rc)) return rc; - rc = VariantChangeType(&rv,right,0,VT_DECIMAL); - if (FAILED(rc)) return rc; - return VarDecCmp(&V_DECIMAL(&lv), &V_DECIMAL(&rv)); - } - if (xmask & VTBIT_R8) { - rc = VariantChangeType(&lv,left,0,VT_R8); - if (FAILED(rc)) return rc; - rc = VariantChangeType(&rv,right,0,VT_R8); - if (FAILED(rc)) return rc; - - if (V_R8(&lv) == V_R8(&rv)) return VARCMP_EQ; - if (V_R8(&lv) < V_R8(&rv)) return VARCMP_LT; - if (V_R8(&lv) > V_R8(&rv)) return VARCMP_GT; - return E_FAIL; /* can't get here */ - } - if (xmask & VTBIT_R4) { - rc = VariantChangeType(&lv,left,0,VT_R4); - if (FAILED(rc)) return rc; - rc = VariantChangeType(&rv,right,0,VT_R4); - if (FAILED(rc)) return rc; - - if (V_R4(&lv) == V_R4(&rv)) return VARCMP_EQ; - if (V_R4(&lv) < V_R4(&rv)) return VARCMP_LT; - if (V_R4(&lv) > V_R4(&rv)) return VARCMP_GT; - return E_FAIL; /* can't get here */ - } - - /* Integers - Ideally like to use VarDecCmp, but no Dec support yet - Use LONGLONG to maximize ranges */ - lOk = TRUE; - switch (V_VT(left)&VT_TYPEMASK) { - case VT_I1 : lVal = V_I1(left); break; - case VT_I2 : lVal = V_I2(left); break; - case VT_I4 : - case VT_INT : lVal = V_I4(left); break; - case VT_UI1 : lVal = V_UI1(left); break; - case VT_UI2 : lVal = V_UI2(left); break; - case VT_UI4 : - case VT_UINT : lVal = V_UI4(left); break; - case VT_BOOL : lVal = V_BOOL(left); break; - case VT_EMPTY : lVal = 0; break; - case VT_R4 : lDouble = V_R4(left); lOk = FALSE; l_isR= TRUE; break; - case VT_R8 : lDouble = V_R8(left); lOk = FALSE; l_isR= TRUE; break; - default: lOk = FALSE; - } - - rOk = TRUE; - switch (V_VT(right)&VT_TYPEMASK) { - case VT_I1 : rVal = V_I1(right); break; - case VT_I2 : rVal = V_I2(right); break; - case VT_I4 : - case VT_INT : rVal = V_I4(right); break; - case VT_UI1 : rVal = V_UI1(right); break; - case VT_UI2 : rVal = V_UI2(right); break; - case VT_UI4 : - case VT_UINT : rVal = V_UI4(right); break; - case VT_BOOL : rVal = V_BOOL(right); break; - case VT_EMPTY : rVal = 0; break; - case VT_R4 : rDouble = V_R4(right); rOk = FALSE;r_isR= TRUE; break; - case VT_R8 : rDouble = V_R8(right); rOk = FALSE;r_isR= TRUE; break; - default: rOk = FALSE; - } - - if (lOk && rOk) { - if (lVal < rVal) { - return VARCMP_LT; - } else if (lVal > rVal) { - return VARCMP_GT; + + /* A BSTR and an other variant; we have to take care of VT_RESERVED */ + if (xmask & VTBIT_BSTR) { + VARIANT *bstrv, *nonbv; + VARTYPE nonbvt; + int swap = 0; + + /* Swap the variants so the BSTR is always on the left */ + if (lvt == VT_BSTR) { + bstrv = left; + nonbv = right; + nonbvt = rvt; } else { - return VARCMP_EQ; + swap = 1; + bstrv = right; + nonbv = left; + nonbvt = lvt; } - } - else if (l_isR && r_isR) { - if (lDouble < rDouble) { - return VARCMP_LT; - } else if (lDouble > rDouble) { - return VARCMP_GT; - } else { - return VARCMP_EQ; + + /* BSTR and EMPTY: ignore VT_RESERVED */ + if (nonbvt == VT_EMPTY) + rc = (!V_BSTR(bstrv) || !*V_BSTR(bstrv)) ? VARCMP_EQ : VARCMP_GT; + else { + VARTYPE breserv = V_VT(bstrv) & ~VT_TYPEMASK; + VARTYPE nreserv = V_VT(nonbv) & ~VT_TYPEMASK; + + if (!breserv && !nreserv) + /* No VT_RESERVED set ==> BSTR always greater */ + rc = VARCMP_GT; + else if (breserv && !nreserv) { + /* BSTR has VT_RESERVED set. Do a string comparision */ + rc = VariantChangeTypeEx(&rv,nonbv,lcid,0,VT_BSTR); + if (FAILED(rc)) + return rc; + rc = VarBstrCmp(V_BSTR(bstrv), V_BSTR(&rv), lcid, flags); + } else if (V_BSTR(bstrv) && *V_BSTR(bstrv)) { + /* Non NULL nor empty BSTR */ + /* If the BSTR is not a number the BSTR is greater */ + rc = _VarChangeTypeExWrap(&lv,bstrv,lcid,0,VT_R8); + if (FAILED(rc)) + rc = VARCMP_GT; + else if (breserv && nreserv) + /* FIXME: This is strange: with both VT_RESERVED set it + looks like the result depends only on the sign of + the BSTR number */ + rc = (V_R8(&lv) >= 0) ? VARCMP_GT : VARCMP_LT; + else + /* Numeric comparision, will be handled below. + VARCMP_NULL used only to break out. */ + rc = VARCMP_NULL; + VariantClear(&lv); + VariantClear(&rv); + } else + /* Empty or NULL BSTR */ + rc = VARCMP_GT; } - } - else if (lOk && r_isR) { - if (lVal < rDouble) { - return VARCMP_LT; - } else if (lVal > rDouble) { - return VARCMP_GT; - } else { - return VARCMP_EQ; + /* Fixup the return code if we swapped left and right */ + if (swap) { + if (rc == VARCMP_GT) + rc = VARCMP_LT; + else if (rc == VARCMP_LT) + rc = VARCMP_GT; } - } - else if (l_isR && rOk) { - if (lDouble < rVal) { - return VARCMP_LT; - } else if (lDouble > rVal) { - return VARCMP_GT; - } else { - return VARCMP_EQ; - } - } - if ((V_VT(left)&VT_TYPEMASK) == VT_BSTR ) { - if(((V_VT(right)&VT_TYPEMASK) == VT_EMPTY ) && !(V_BSTR(left))) { - return VARCMP_EQ; - } else { - return VARCMP_GT; - } - } - if ((V_VT(right)&VT_TYPEMASK) == VT_BSTR ) { - if(((V_VT(left)&VT_TYPEMASK) == VT_EMPTY ) && !(V_BSTR(right))) { - return VARCMP_EQ; - } else { - return VARCMP_LT; - } - } - /* Dates */ - if ((V_VT(left)&VT_TYPEMASK) == VT_DATE && - (V_VT(right)&VT_TYPEMASK) == VT_DATE) { - - if (floor(V_DATE(left)) == floor(V_DATE(right))) { - /* Due to floating point rounding errors, calculate varDate in whole numbers) */ - double wholePart = 0.0; - double leftR; - double rightR; - - /* Get the fraction * 24*60*60 to make it into whole seconds */ - wholePart = (double) floor( V_DATE(left) ); - if (wholePart == 0) wholePart = 1; - leftR = floor(fmod( V_DATE(left), wholePart ) * (24*60*60)); - - wholePart = (double) floor( V_DATE(right) ); - if (wholePart == 0) wholePart = 1; - rightR = floor(fmod( V_DATE(right), wholePart ) * (24*60*60)); - - if (leftR < rightR) { - return VARCMP_LT; - } else if (leftR > rightR) { - return VARCMP_GT; - } else { - return VARCMP_EQ; - } - - } else if (V_DATE(left) < V_DATE(right)) { - return VARCMP_LT; - } else if (V_DATE(left) > V_DATE(right)) { - return VARCMP_GT; - } - } - else if((V_VT(right)&VT_TYPEMASK) == VT_EMPTY) - return VARCMP_GT; - FIXME("VarCmp partial implementation, doesn't support %s / %s\n",wine_vtypes[V_VT(left)], wine_vtypes[V_VT(right)]); - return E_FAIL; + if (rc != VARCMP_NULL) + return rc; + } + + if (xmask & VTBIT_DECIMAL) + vt = VT_DECIMAL; + else if (xmask & VTBIT_BSTR) + vt = VT_R8; + else if (xmask & VTBIT_R4) + vt = VT_R4; + else if (xmask & (VTBIT_R8 | VTBIT_DATE)) + vt = VT_R8; + else if (xmask & VTBIT_CY) + vt = VT_CY; + else + /* default to I8 */ + vt = VT_I8; + + /* Coerce the variants */ + rc = _VarChangeTypeExWrap(&lv,left,lcid,0,vt); + if (rc == DISP_E_OVERFLOW && vt != VT_R8) { + /* Overflow, change to R8 */ + vt = VT_R8; + rc = _VarChangeTypeExWrap(&lv,left,lcid,0,vt); + } + if (FAILED(rc)) + return rc; + rc = _VarChangeTypeExWrap(&rv,right,lcid,0,vt); + if (rc == DISP_E_OVERFLOW && vt != VT_R8) { + /* Overflow, change to R8 */ + vt = VT_R8; + rc = _VarChangeTypeExWrap(&lv,left,lcid,0,vt); + if (FAILED(rc)) + return rc; + rc = _VarChangeTypeExWrap(&rv,right,lcid,0,vt); + } + if (FAILED(rc)) + return rc; + +#define _VARCMP(a,b) \ + (((a) == (b)) ? VARCMP_EQ : (((a) < (b)) ? VARCMP_LT : VARCMP_GT)) + + switch (vt) { + case VT_CY: + return VarCyCmp(V_CY(&lv), V_CY(&rv)); + case VT_DECIMAL: + return VarDecCmp(&V_DECIMAL(&lv), &V_DECIMAL(&rv)); + case VT_I8: + return _VARCMP(V_I8(&lv), V_I8(&rv)); + case VT_R4: + return _VARCMP(V_R4(&lv), V_R4(&rv)); + case VT_R8: + return _VARCMP(V_R8(&lv), V_R8(&rv)); + default: + /* We should never get here */ + return E_FAIL; + } +#undef _VARCMP } /********************************************************************** @@ -2920,7 +2952,6 @@ /* Do the math */ hres = S_OK; - V_VT(&tv) = tvt; V_VT(result) = resvt; switch (tvt) { case VT_DECIMAL: @@ -2941,10 +2972,13 @@ V_VT(result) = VT_R8; V_R8(result) = r8res; goto end; - } else + } else { + V_VT(&tv) = tvt; V_I8(&tv) = V_I8(&lv) + V_I8(&rv); + } break; case VT_R8: + V_VT(&tv) = tvt; /* FIXME: overflow detection */ V_R8(&tv) = V_R8(&lv) + V_R8(&rv); break; @@ -3184,7 +3218,7 @@ found = TRUE; resvt = VT_DECIMAL; } - if (!found && (((1<<lvt) | (1<<rvt)) & (VTBIT_I1|VTBIT_I2|VTBIT_UI1|VTBIT_UI2|VTBIT_I4|VTBIT_UI4|(1<<VT_INT)|(1<<VT_UINT)))) { + if (!found && (((1<<lvt) | (1<<rvt)) & (VTBIT_I1|VTBIT_I2|VTBIT_UI1|VTBIT_UI2|VTBIT_I4|VTBIT_UI4|VTBIT_INT|VTBIT_UINT))) { found = TRUE; resvt = VT_I4; } @@ -3253,7 +3287,7 @@ lvt = V_VT(left)&VT_TYPEMASK; rvt = V_VT(right)&VT_TYPEMASK; found = FALSE;resvt = VT_VOID; - if (((1<<lvt) | (1<<rvt)) & ((1<<VT_DATE)|(1<<VT_R4)|(1<<VT_R8))) { + if (((1<<lvt) | (1<<rvt)) & (VTBIT_DATE|VTBIT_R4|VTBIT_R8)) { found = TRUE; resvt = VT_R8; } @@ -3261,7 +3295,7 @@ found = TRUE; resvt = VT_DECIMAL; } - if (!found && (((1<<lvt) | (1<<rvt)) & (VTBIT_I1|VTBIT_I2|VTBIT_UI1|VTBIT_UI2|VTBIT_I4|VTBIT_UI4|(1<<VT_INT)|(1<<VT_UINT)))) { + if (!found && (((1<<lvt) | (1<<rvt)) & (VTBIT_I1|VTBIT_I2|VTBIT_UI1|VTBIT_UI2|VTBIT_I4|VTBIT_UI4|VTBIT_INT|VTBIT_UINT))) { found = TRUE; resvt = VT_I4; } Modified: trunk/reactos/dll/win32/oleaut32/variant.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/oleaut32/variant.… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/variant.h (original) +++ trunk/reactos/dll/win32/oleaut32/variant.h Mon Mar 27 20:44:53 2006 @@ -33,6 +33,20 @@ /* Get the extra flags from a variant pointer */ #define V_EXTRA_TYPE(v) (V_VT((v)) & VT_EXTRA_TYPE) + +/* Missing in Windows but useful VTBIT_* defines */ +#define VTBIT_BOOL (1 << VT_BSTR) +#define VTBIT_BSTR (1 << VT_BSTR) +#define VTBIT_DATE (1 << VT_DATE) +#define VTBIT_DISPATCH (1 << VT_DISPATCH) +#define VTBIT_EMPTY (1 << VT_EMPTY) +#define VTBIT_ERROR (1 << VT_ERROR) +#define VTBIT_INT (1 << VT_INT) +#define VTBIT_NULL (1 << VT_NULL) +#define VTBIT_UINT (1 << VT_UINT) +#define VTBIT_UNKNOWN (1 << VT_UNKNOWN) +#define VTBIT_VARIANT (1 << VT_VARIANT) +#define VTBIT_15 (1 << 15) /* no variant type with this number */ extern const char* wine_vtypes[]; #define debugstr_vt(v) (((v)&VT_TYPEMASK) <= VT_CLSID ? wine_vtypes[((v)&VT_TYPEMASK)] : \ Modified: trunk/reactos/dll/win32/oleaut32/vartype.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/oleaut32/vartype.… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/vartype.c (original) +++ trunk/reactos/dll/win32/oleaut32/vartype.c Mon Mar 27 20:44:53 2006 @@ -110,7 +110,8 @@ } /* Coerce VT_DISPATCH to another type */ -static HRESULT VARIANT_FromDisp(IDispatch* pdispIn, LCID lcid, void* pOut, VARTYPE vt) +static HRESULT VARIANT_FromDisp(IDispatch* pdispIn, LCID lcid, void* pOut, + VARTYPE vt, DWORD dwFlags) { static const DISPPARAMS emptyParams = { NULL, NULL, 0, 0 }; VARIANTARG srcVar, dstVar; @@ -127,7 +128,7 @@ { /* Convert the property to the requested type */ V_VT(&dstVar) = VT_EMPTY; - hRet = VariantChangeTypeEx(&dstVar, &srcVar, lcid, 0, vt); + hRet = VariantChangeTypeEx(&dstVar, &srcVar, lcid, dwFlags, vt); VariantClear(&srcVar); if (SUCCEEDED(hRet)) @@ -448,7 +449,7 @@ */ HRESULT WINAPI VarI1FromDisp(IDispatch* pdispIn, LCID lcid, signed char* pcOut) { - return VARIANT_FromDisp(pdispIn, lcid, pcOut, VT_I1); + return VARIANT_FromDisp(pdispIn, lcid, pcOut, VT_I1, 0); } /************************************************************************ @@ -741,7 +742,7 @@ */ HRESULT WINAPI VarUI1FromDisp(IDispatch* pdispIn, LCID lcid, BYTE* pbOut) { - return VARIANT_FromDisp(pdispIn, lcid, pbOut, VT_UI1); + return VARIANT_FromDisp(pdispIn, lcid, pbOut, VT_UI1, 0); } /************************************************************************ @@ -1042,7 +1043,7 @@ */ HRESULT WINAPI VarI2FromDisp(IDispatch* pdispIn, LCID lcid, SHORT* psOut) { - return VARIANT_FromDisp(pdispIn, lcid, psOut, VT_I2); + return VARIANT_FromDisp(pdispIn, lcid, psOut, VT_I2, 0); } /************************************************************************ @@ -1356,7 +1357,7 @@ */ HRESULT WINAPI VarUI2FromDisp(IDispatch* pdispIn, LCID lcid, USHORT* pusOut) { - return VARIANT_FromDisp(pdispIn, lcid, pusOut, VT_UI2); + return VARIANT_FromDisp(pdispIn, lcid, pusOut, VT_UI2, 0); } /************************************************************************ @@ -1632,7 +1633,7 @@ */ HRESULT WINAPI VarI4FromDisp(IDispatch* pdispIn, LCID lcid, LONG *piOut) { - return VARIANT_FromDisp(pdispIn, lcid, piOut, VT_I4); + return VARIANT_FromDisp(pdispIn, lcid, piOut, VT_I4, 0); } /************************************************************************ @@ -1941,7 +1942,7 @@ */ HRESULT WINAPI VarUI4FromDisp(IDispatch* pdispIn, LCID lcid, ULONG *pulOut) { - return VARIANT_FromDisp(pdispIn, lcid, pulOut, VT_UI4); + return VARIANT_FromDisp(pdispIn, lcid, pulOut, VT_UI4, 0); } /************************************************************************ @@ -2248,7 +2249,7 @@ */ HRESULT WINAPI VarI8FromDisp(IDispatch* pdispIn, LCID lcid, LONG64* pi64Out) { - return VARIANT_FromDisp(pdispIn, lcid, pi64Out, VT_I8); + return VARIANT_FromDisp(pdispIn, lcid, pi64Out, VT_I8, 0); } /************************************************************************ @@ -2576,7 +2577,7 @@ */ HRESULT WINAPI VarUI8FromDisp(IDispatch* pdispIn, LCID lcid, ULONG64* pui64Out) { - return VARIANT_FromDisp(pdispIn, lcid, pui64Out, VT_UI8); + return VARIANT_FromDisp(pdispIn, lcid, pui64Out, VT_UI8, 0); } /************************************************************************ @@ -2851,7 +2852,7 @@ */ HRESULT WINAPI VarR4FromDisp(IDispatch* pdispIn, LCID lcid, float *pFltOut) { - return VARIANT_FromDisp(pdispIn, lcid, pFltOut, VT_R4); + return VARIANT_FromDisp(pdispIn, lcid, pFltOut, VT_R4, 0); } /************************************************************************ @@ -3172,7 +3173,7 @@ */ HRESULT WINAPI VarR8FromDisp(IDispatch* pdispIn, LCID lcid, double *pDblOut) { - return VARIANT_FromDisp(pdispIn, lcid, pDblOut, VT_R8); + return VARIANT_FromDisp(pdispIn, lcid, pDblOut, VT_R8, 0); } /************************************************************************ @@ -3594,7 +3595,7 @@ */ HRESULT WINAPI VarCyFromDisp(IDispatch* pdispIn, LCID lcid, CY* pCyOut) { - return VARIANT_FromDisp(pdispIn, lcid, pCyOut, VT_CY); + return VARIANT_FromDisp(pdispIn, lcid, pCyOut, VT_CY, 0); } /************************************************************************ @@ -4265,7 +4266,7 @@ */ HRESULT WINAPI VarDecFromDisp(IDispatch* pdispIn, LCID lcid, DECIMAL* pDecOut) { - return VARIANT_FromDisp(pdispIn, lcid, pDecOut, VT_DECIMAL); + return VARIANT_FromDisp(pdispIn, lcid, pDecOut, VT_DECIMAL, 0); } /************************************************************************ @@ -5806,7 +5807,7 @@ */ HRESULT WINAPI VarBoolFromDisp(IDispatch* pdispIn, LCID lcid, VARIANT_BOOL *pBoolOut) { - return VARIANT_FromDisp(pdispIn, lcid, pBoolOut, VT_BOOL); + return VARIANT_FromDisp(pdispIn, lcid, pBoolOut, VT_BOOL, 0); } /************************************************************************ @@ -6544,6 +6545,27 @@ return VARIANT_BstrFromUInt(ullIn, lcid, dwFlags, pbstrOut); } +/************************************************************************ + * VarBstrFromDisp (OLEAUT32.115) + * + * Convert a VT_DISPATCH to a BSTR. + * + * PARAMS + * pdispIn [I] Source + * lcid [I] LCID for conversion + * dwFlags [I] Flags controlling the conversion (VAR_ flags from "oleauto.h") + * pbstrOut [O] Destination + * + * RETURNS + * Success: S_OK. + * Failure: E_INVALIDARG, if the source value is invalid + * DISP_E_TYPEMISMATCH, if the type cannot be converted + */ +HRESULT WINAPI VarBstrFromDisp(IDispatch* pdispIn, LCID lcid, ULONG dwFlags, BSTR* pbstrOut) +{ + return VARIANT_FromDisp(pdispIn, lcid, pbstrOut, VT_BSTR, dwFlags); +} + /********************************************************************** * VarBstrCat (OLEAUT32.313) * @@ -6727,7 +6749,7 @@ */ HRESULT WINAPI VarDateFromDisp(IDispatch* pdispIn, LCID lcid, DATE* pdateOut) { - return VARIANT_FromDisp(pdispIn, lcid, pdateOut, VT_DATE); + return VARIANT_FromDisp(pdispIn, lcid, pdateOut, VT_DATE, 0); } /****************************************************************************** Modified: trunk/reactos/include/oaidl.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/include/oaidl.h?rev=21399&r… ============================================================================== --- trunk/reactos/include/oaidl.h (original) +++ trunk/reactos/include/oaidl.h Mon Mar 27 20:44:53 2006 @@ -143,7 +143,9 @@ SF_BSTR=VT_BSTR, SF_UNKNOWN=VT_UNKNOWN, SF_DISPATCH=VT_DISPATCH, - SF_VARIANT=VT_VARIANT + SF_VARIANT=VT_VARIANT, + SF_RECORD=VT_RECORD, + SF_HAVEIID=VT_UNKNOWN|VT_RESERVED, }SF_TYPE; typedef struct _wireBRECORD { ULONG fFlags; Modified: trunk/reactos/include/ocidl.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/include/ocidl.h?rev=21399&r… ============================================================================== --- trunk/reactos/include/ocidl.h (original) +++ trunk/reactos/include/ocidl.h Mon Mar 27 20:44:53 2006 @@ -20,6 +20,7 @@ typedef interface IPropertyPageSite *LPPROPERTYPAGESITE; typedef interface IFont *LPFONT; typedef interface IFontDisp *LPFONTDISP; +typedef interface IFontEventsDisp *LPFONTEVENTS; typedef interface IOleUndoManager *LPOLEUNDOMANAGER; typedef interface IQuickActivate *LPQUICKACTIVATE; typedef interface IObjectWithSite *LPOBJECTWITHSITE; @@ -638,6 +639,21 @@ }; #undef INTERFACE +EXTERN_C const IID IID_IFontEventsDisp; +#define INTERFACE IFontEventsDisp +DECLARE_INTERFACE_(IFontEventsDisp,IDispatch) +{ + STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + STDMETHOD(GetTypeInfoCount)(THIS_ UINT*) PURE; + STDMETHOD(GetTypeInfo)(THIS_ UINT,LCID,LPTYPEINFO*) PURE; + STDMETHOD(GetIDsOfNames)(THIS_ REFIID,LPOLESTR*,UINT,LCID,DISPID*) PURE; + STDMETHOD(Invoke)(THIS_ DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*) PURE; + /*[id(0x9)]*/STDMETHOD(FontChanged)(THIS_ BSTR) PURE; +}; +#undef INTERFACE + EXTERN_C const IID IID_IPicture; #define INTERFACE IPicture DECLARE_INTERFACE_(IPicture,IUnknown) Modified: trunk/reactos/include/olectl.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/include/olectl.h?rev=21399&… ============================================================================== --- trunk/reactos/include/olectl.h (original) +++ trunk/reactos/include/olectl.h Mon Mar 27 20:44:53 2006 @@ -218,6 +218,9 @@ #define DISPID_FONT_STRIKE 6 #define DISPID_FONT_WEIGHT 7 #define DISPID_FONT_CHARSET 8 +#define DISPID_FONT_CHANGED 9 + +/* IPicture */ #define DISPID_PICT_HANDLE 0 #define DISPID_PICT_HPAL 2 #define DISPID_PICT_TYPE 3 Modified: trunk/reactos/include/olectlid.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/include/olectlid.h?rev=2139… ============================================================================== --- trunk/reactos/include/olectlid.h (original) +++ trunk/reactos/include/olectlid.h Mon Mar 27 20:44:53 2006 @@ -40,6 +40,7 @@ extern const GUID CLSID_StdPicture; extern const GUID IID_IFont; extern const GUID IID_IFontDisp; +extern const GUID IID_IFontEventsDisp; extern const GUID IID_IPicture; extern const GUID IID_IPictureDisp; extern const GUID GUID_HIMETRIC;

18 years, 9 months

[fireball] 21398: - Fix incorrect RPCRTAPI definition - Add more languages to winnt.h (needed for further oleaut32 wine sync) - Moved some languages out of wine/winnt.h and changing their value to those in windows headers

by aleksey＠studiocerebral.com

Author: fireball Date: Mon Mar 27 17:30:37 2006 New Revision: 21398 URL: http://svn.reactos.ru/svn/reactos?rev=21398&view=rev Log: - Fix incorrect RPCRTAPI definition - Add more languages to winnt.h (needed for further oleaut32 wine sync) - Moved some languages out of wine/winnt.h and changing their value to those in windows headers Modified: trunk/reactos/include/reactos/wine/winnt.h trunk/reactos/include/rpc.h trunk/reactos/include/winnt.h Modified: trunk/reactos/include/reactos/wine/winnt.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/include/reactos/wine/winnt.… ============================================================================== --- trunk/reactos/include/reactos/wine/winnt.h (original) +++ trunk/reactos/include/reactos/wine/winnt.h Mon Mar 27 17:30:37 2006 @@ -33,9 +33,8 @@ #define LANG_BRETON 0x93 /* FIXME: these are not in the Windows header */ -#define LANG_GAELIC 0x3c +#define LANG_GAELIC 0x94 #define LANG_MALTESE 0x3a -#define LANG_MAORI 0x28 #define LANG_RHAETO_ROMANCE 0x17 #define LANG_SAAMI 0x3b #define LANG_SORBIAN 0x2e Modified: trunk/reactos/include/rpc.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/include/rpc.h?rev=21398&r1=… ============================================================================== --- trunk/reactos/include/rpc.h (original) +++ trunk/reactos/include/rpc.h Mon Mar 27 17:30:37 2006 @@ -17,12 +17,6 @@ #define RPC_UNICODE_SUPPORTED #endif -#ifdef _RPCRT4_ -#define RPCRTAPI DECLSPEC_EXPORT -#else -#define RPCRTAPI DECLSPEC_IMPORT -#endif - #ifndef __MIDL_USER_DEFINED #define midl_user_allocate MIDL_user_allocate #define midl_user_free MIDL_user_free @@ -34,6 +28,7 @@ #define __RPC_USER __stdcall #define __RPC_STUB __stdcall #define RPC_ENTRY __stdcall +#define RPCRTAPI typedef void *I_RPC_HANDLE; typedef long RPC_STATUS; Modified: trunk/reactos/include/winnt.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/include/winnt.h?rev=21398&r… ============================================================================== --- trunk/reactos/include/winnt.h (original) +++ trunk/reactos/include/winnt.h Mon Mar 27 17:30:37 2006 @@ -638,6 +638,7 @@ #define LANG_HEBREW 0x0d #define LANG_HUNGARIAN 0x0e #define LANG_ICELANDIC 0x0f +#define LANG_IRISH 0x3c #define LANG_ITALIAN 0x10 #define LANG_JAPANESE 0x11 #define LANG_KOREAN 0x12 @@ -646,7 +647,9 @@ #define LANG_POLISH 0x15 #define LANG_PORTUGUESE 0x16 #define LANG_ROMANIAN 0x18 +#define LANG_ROMANSH 0x17 #define LANG_RUSSIAN 0x19 +#define LANG_SAMI 0x3b #define LANG_CROATIAN 0x1a #define LANG_SERBIAN 0x1a #define LANG_SLOVAK 0x1b @@ -656,6 +659,7 @@ #define LANG_TURKISH 0x1f #define LANG_URDU 0x20 #define LANG_INDONESIAN 0x21 +#define LANG_UPPER_SORBIAN 0x2e #define LANG_UKRAINIAN 0x22 #define LANG_BELARUSIAN 0x23 #define LANG_SLOVENIAN 0x24 @@ -699,6 +703,7 @@ #define LANG_NEPALI 0x61 #define LANG_DIVEHI 0x65 #define LANG_INVARIANT 0x7f +#define LANG_MAORI 0x81 #define SUBLANG_NEUTRAL 0x00 #define SUBLANG_DEFAULT 0x01 #define SUBLANG_SYS_DEFAULT 0x02

18 years, 9 months

[peterw] 21397: [AUDIT] reactos\drivers\storage\disk (Unlocked): - I've read over each function and there is nothing in here which is reversed, besides it's not even compatible with the windows counter-part. - I state that this is clean.

by aleksey＠studiocerebral.com

Author: peterw Date: Mon Mar 27 11:38:43 2006 New Revision: 21397 URL: http://svn.reactos.ru/svn/reactos?rev=21397&view=rev Log: [AUDIT] reactos\drivers\storage\disk (Unlocked): - I've read over each function and there is nothing in here which is reversed, besides it's not even compatible with the windows counter-part. - I state that this is clean. Modified: trunk/reactos/drivers/storage/disk/disk.c (props changed) trunk/reactos/drivers/storage/disk/disk.rc (props changed) Propchange: trunk/reactos/drivers/storage/disk/disk.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/drivers/storage/disk/disk.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

18 years, 9 months

[peterw] 21396: Fixed a few spelling mistakes and change http://www.reactos.com to http://www.reactos.org/.

by aleksey＠studiocerebral.com

Author: peterw Date: Sun Mar 26 23:57:49 2006 New Revision: 21396 URL: http://svn.reactos.ru/svn/reactos?rev=21396&view=rev Log: Fixed a few spelling mistakes and change http://www.reactos.com to http://www.reactos.org/. Modified: trunk/reactos/INSTALL trunk/reactos/README Modified: trunk/reactos/INSTALL URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/INSTALL?rev=21396&r1=21395&… ============================================================================== --- trunk/reactos/INSTALL (original) +++ trunk/reactos/INSTALL Sun Mar 26 23:57:49 2006 @@ -2,21 +2,21 @@ To build the system you need either mingw32 installed on Windows or a mingw32 cross compiler running on unix. You may obtain MinGW binaries that build -ReactOS from http://www.reactos.com. +ReactOS from http://www.reactos.org/. 2. Building ReactOS 2.1 Building the binaries -To build ReactOS run 'make' (wihout the quotes) if you are building on Linux +To build ReactOS run 'make' (without the quotes) if you are building on Linux or 'mingw32-make' if you are building on Windows (or ReactOS) from the top directory. 2.2 Building a bootable CD image -To build a bootable CD image run 'make bootcd' (wihout the quotes) if you are +To build a bootable CD image run 'make bootcd' (without the quotes) if you are building on Linux or 'mingw32-make bootcd' if you are building on Windows (or ReactOS) from the top directory. This will create a CD image with a filename, ReactOS.iso, in the top directory. @@ -75,6 +75,6 @@ bugs should be submitted to bugzilla and general chat takes place in the forums, or #reactos on freenode -http://www.reactos.org +http://www.reactos.org/ ReactOS Development Team Modified: trunk/reactos/README URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/README?rev=21396&r1=21395&r… ============================================================================== --- trunk/reactos/README (original) +++ trunk/reactos/README Sun Mar 26 23:57:49 2006 @@ -9,11 +9,11 @@ that is compatible with Windows NT applications and drivers. The ReactOS project, although currently focused on Windows NT 4.0 -compatibility, is always keeping an eye towards compatibility with +compatibility, is always keeping an eye toward compatibility with future Windows NT releases, that is, Windows 2000 (NT 5.0) and Windows XP (NT 5.1). -More information is available at http://www.reactos.com. +More information is available at http://www.reactos.org/. 2. Building ReactOS

18 years, 9 months

[fireball] 21395: - Update rpc-related headers to Wine 0.9.10 (rpcndr.h is merged with the new changes, not replaced completely) - dll/rpcrt4 - if NdrSendReceive fails, don't produce um exception, but just print a warning - as it was before the Wine 0.9.10 merge (fixes TaskMgr regression, and probably other related things)

by aleksey＠studiocerebral.com

Author: fireball Date: Sun Mar 26 23:38:03 2006 New Revision: 21395 URL: http://svn.reactos.ru/svn/reactos?rev=21395&view=rev Log: - Update rpc-related headers to Wine 0.9.10 (rpcndr.h is merged with the new changes, not replaced completely) - dll/rpcrt4 - if NdrSendReceive fails, don't produce um exception, but just print a warning - as it was before the Wine 0.9.10 merge (fixes TaskMgr regression, and probably other related things) Modified: trunk/reactos/dll/win32/rpcrt4/ndr_midl.c trunk/reactos/include/rpcndr.h Modified: trunk/reactos/dll/win32/rpcrt4/ndr_midl.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_midl.c… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/ndr_midl.c (original) +++ trunk/reactos/dll/win32/rpcrt4/ndr_midl.c Sun Mar 26 23:38:03 2006 @@ -285,7 +285,11 @@ status = I_RpcSendReceive(stubmsg->RpcMsg); if (status != RPC_S_OK) - RpcRaiseException(status); + { + WARN("I_RpcSendReceive did not return success.\n"); + /* FIXME: raise exception? */ + //RpcRaiseException(status); + } stubmsg->BufferLength = stubmsg->RpcMsg->BufferLength; stubmsg->BufferStart = stubmsg->RpcMsg->Buffer; Modified: trunk/reactos/include/rpcndr.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/include/rpcndr.h?rev=21395&… ============================================================================== --- trunk/reactos/include/rpcndr.h (original) +++ trunk/reactos/include/rpcndr.h Sun Mar 26 23:38:03 2006 @@ -100,10 +100,7 @@ void *userContext; } *NDR_SCONTEXT; typedef void (__RPC_USER *NDR_RUNDOWN)(void*); -typedef struct _SCONTEXT_QUEUE { - unsigned long NumberOfObjects; - NDR_SCONTEXT *ArrayOfObjects; -} SCONTEXT_QUEUE,*PSCONTEXT_QUEUE; + struct _MIDL_STUB_MESSAGE; struct _MIDL_STUB_DESC; struct _FULL_PTR_XLAT_TABLES; @@ -111,47 +108,16 @@ typedef unsigned long RPC_LENGTH; typedef void(__RPC_USER *EXPR_EVAL)(struct _MIDL_STUB_MESSAGE*); typedef const unsigned char *PFORMAT_STRING; -typedef struct { + +typedef struct +{ long Dimension; unsigned long *BufferConformanceMark; unsigned long *BufferVarianceMark; unsigned long *MaxCountArray; unsigned long *OffsetArray; unsigned long *ActualCountArray; -} ARRAY_INFO,*PARRAY_INFO; - -RPC_BINDING_HANDLE RPC_ENTRY NDRCContextBinding(NDR_CCONTEXT); -void RPC_ENTRY NDRCContextMarshall(NDR_CCONTEXT,void*); -void RPC_ENTRY NDRCContextUnmarshall(NDR_CCONTEXT*,RPC_BINDING_HANDLE,void*,unsigned long); -void RPC_ENTRY NDRSContextMarshall(NDR_SCONTEXT,void*,NDR_RUNDOWN); -NDR_SCONTEXT RPC_ENTRY NDRSContextUnmarshall(void*pBuff,unsigned long); -void RPC_ENTRY RpcSsDestroyClientContext(void**); -void RPC_ENTRY NDRcopy(void*,void*,unsigned int); -unsigned int RPC_ENTRY MIDL_wchar_strlen(wchar_t*); -void RPC_ENTRY MIDL_wchar_strcpy(void*,wchar_t*); -void RPC_ENTRY char_from_ndr(PRPC_MESSAGE,unsigned char*); -void RPC_ENTRY char_array_from_ndr(PRPC_MESSAGE,unsigned long,unsigned long,unsigned char*); -void RPC_ENTRY short_from_ndr(PRPC_MESSAGE,unsigned short*); -void RPC_ENTRY short_array_from_ndr(PRPC_MESSAGE,unsigned long,unsigned long,unsigned short*); -void RPC_ENTRY short_from_ndr_temp(unsigned char**,unsigned short*,unsigned long); -void RPC_ENTRY long_from_ndr(PRPC_MESSAGE,unsigned long*); -void RPC_ENTRY long_array_from_ndr(PRPC_MESSAGE,unsigned long,unsigned long,unsigned long*); -void RPC_ENTRY long_from_ndr_temp(unsigned char**,unsigned long*,unsigned long); -void RPC_ENTRY enum_from_ndr(PRPC_MESSAGE,unsigned int*); -void RPC_ENTRY float_from_ndr(PRPC_MESSAGE,void*); -void RPC_ENTRY float_array_from_ndr(PRPC_MESSAGE,unsigned long,unsigned long,void*); -void RPC_ENTRY double_from_ndr(PRPC_MESSAGE,void*); -void RPC_ENTRY double_array_from_ndr(PRPC_MESSAGE,unsigned long,unsigned long,void*); -void RPC_ENTRY hyper_from_ndr(PRPC_MESSAGE,hyper*); -void RPC_ENTRY hyper_array_from_ndr(PRPC_MESSAGE,unsigned long,unsigned long,hyper*); -void RPC_ENTRY hyper_from_ndr_temp(unsigned char**,hyper*,unsigned long); -void RPC_ENTRY data_from_ndr(PRPC_MESSAGE,void*,char*,unsigned char); -void RPC_ENTRY data_into_ndr(void*,PRPC_MESSAGE,char*,unsigned char); -void RPC_ENTRY tree_into_ndr(void*,PRPC_MESSAGE,char*,unsigned char); -void RPC_ENTRY data_size_ndr(void*,PRPC_MESSAGE,char*,unsigned char); -void RPC_ENTRY tree_size_ndr(void*,PRPC_MESSAGE,char*,unsigned char); -void RPC_ENTRY tree_peek_ndr(PRPC_MESSAGE,unsigned char**,char*,unsigned char); -void *RPC_ENTRY midl_allocate(int); +} ARRAY_INFO, *PARRAY_INFO; typedef struct { @@ -160,10 +126,12 @@ void *CSArrayInfo; } CS_STUB_INFO; +typedef struct _NDR_PIPE_DESC *PNDR_PIPE_DESC; +typedef struct _NDR_PIPE_MESSAGE *PNDR_PIPE_MESSAGE; typedef struct _NDR_ASYNC_MESSAGE *PNDR_ASYNC_MESSAGE; typedef struct _NDR_CORRELATION_INFO *PNDR_CORRELATION_INFO; -#pragma pack(push,4) +#include <pshpack4.h> typedef struct _MIDL_STUB_MESSAGE { PRPC_MESSAGE RpcMsg; @@ -231,7 +199,8 @@ INT_PTR Reserved51_4; INT_PTR Reserved51_5; } MIDL_STUB_MESSAGE, *PMIDL_STUB_MESSAGE; -#pragma pack(pop) +#include <poppack.h> + typedef void*(__RPC_API *GENERIC_BINDING_ROUTINE)(void*); typedef void (__RPC_API *GENERIC_UNBIND_ROUTINE)(void*,unsigned char*); typedef struct _GENERIC_BINDING_ROUTINE_PAIR { @@ -245,12 +214,14 @@ GENERIC_UNBIND_ROUTINE pfnUnbind; } GENERIC_BINDING_INFO,*PGENERIC_BINDING_INFO; typedef void(__RPC_USER *XMIT_HELPER_ROUTINE)(PMIDL_STUB_MESSAGE); -typedef struct _XMIT_ROUTINE_QUINTUPLE { +typedef struct _XMIT_ROUTINE_QUINTUPLE +{ XMIT_HELPER_ROUTINE pfnTranslateToXmit; XMIT_HELPER_ROUTINE pfnTranslateFromXmit; XMIT_HELPER_ROUTINE pfnFreeXmit; XMIT_HELPER_ROUTINE pfnFreeInst; -} XMIT_ROUTINE_QUINTUPLE,*PXMIT_ROUTINE_QUINTUPLE; +} XMIT_ROUTINE_QUINTUPLE, *PXMIT_ROUTINE_QUINTUPLE; + typedef struct _MALLOC_FREE_STRUCT { void*(__RPC_USER *pfnAllocate)(unsigned int); void(__RPC_USER *pfnFree)(void*); @@ -263,7 +234,9 @@ typedef unsigned char *(__RPC_USER *USER_MARSHAL_MARSHALLING_ROUTINE)(unsigned long *,unsigned char *,void *); typedef unsigned char *(__RPC_USER *USER_MARSHAL_UNMARSHALLING_ROUTINE)(unsigned long *,unsigned char *,void *); typedef void (__RPC_USER *USER_MARSHAL_FREEING_ROUTINE)(unsigned long *,void *); -typedef struct _USER_MARSHAL_ROUTINE_QUADRUPLE { + +typedef struct _USER_MARSHAL_ROUTINE_QUADRUPLE +{ USER_MARSHAL_SIZING_ROUTINE pfnBufferSize; USER_MARSHAL_MARSHALLING_ROUTINE pfnMarshall; USER_MARSHAL_UNMARSHALLING_ROUTINE pfnUnmarshall; @@ -290,10 +263,11 @@ NDR_CS_SIZE_CONVERT_ROUTINES *pSizeConvertRoutines; CS_TAG_GETTING_ROUTINE *pTagGettingRoutines; } NDR_CS_ROUTINES; -typedef struct _MIDL_STUB_DESC { - void*RpcInterfaceInformation; - void*(__RPC_API *pfnAllocate)(unsigned int); - void(__RPC_API *pfnFree)(void*); +typedef struct _MIDL_STUB_DESC +{ + void *RpcInterfaceInformation; + void * (__RPC_API *pfnAllocate)(size_t); + void (__RPC_API *pfnFree)(void *); union { handle_t *pAutoHandle; handle_t *pPrimitiveHandle; @@ -318,24 +292,34 @@ } MIDL_STUB_DESC; typedef const MIDL_STUB_DESC *PMIDL_STUB_DESC; typedef void*PMIDL_XMIT_TYPE; -typedef struct _MIDL_FORMAT_STRING { +typedef struct _MIDL_FORMAT_STRING +{ short Pad; +#if defined(__GNUC__) + unsigned char Format[0]; +#else unsigned char Format[1]; +#endif } MIDL_FORMAT_STRING; + typedef struct _MIDL_SYNTAX_INFO { RPC_SYNTAX_IDENTIFIER TransferSyntax; - RPC_DISPATCH_TABLE *DispatchTable; + RPC_DISPATCH_TABLE* DispatchTable; PFORMAT_STRING ProcString; - const unsigned short *FmtStringOffset; + const unsigned short* FmtStringOffset; PFORMAT_STRING TypeString; - const void *aUserMarshalQuadruple; + const void* aUserMarshalQuadruple; ULONG_PTR pReserved1; ULONG_PTR pReserved2; } MIDL_SYNTAX_INFO, *PMIDL_SYNTAX_INFO; -typedef void(__RPC_API *STUB_THUNK)(PMIDL_STUB_MESSAGE); -typedef long(__RPC_API *SERVER_ROUTINE)(void); -typedef struct _MIDL_SERVER_INFO_ { + +typedef void (__RPC_API *STUB_THUNK)( PMIDL_STUB_MESSAGE ); + +typedef long (__RPC_API *SERVER_ROUTINE)(); + +typedef struct _MIDL_SERVER_INFO_ +{ PMIDL_STUB_DESC pStubDesc; const SERVER_ROUTINE *DispatchTable; PFORMAT_STRING ProcString; @@ -344,151 +328,31 @@ PRPC_SYNTAX_IDENTIFIER pTransferSyntax; ULONG_PTR nCount; PMIDL_SYNTAX_INFO pSyntaxInfo; -} MIDL_SERVER_INFO,*PMIDL_SERVER_INFO; -typedef struct _MIDL_STUBLESS_PROXY_INFO { +} MIDL_SERVER_INFO, *PMIDL_SERVER_INFO; + +typedef struct _MIDL_STUBLESS_PROXY_INFO +{ PMIDL_STUB_DESC pStubDesc; PFORMAT_STRING ProcFormatString; const unsigned short *FormatStringOffset; -} MIDL_STUBLESS_PROXY_INFO; -typedef MIDL_STUBLESS_PROXY_INFO *PMIDL_STUBLESS_PROXY_INFO; -typedef union _CLIENT_CALL_RETURN { + PRPC_SYNTAX_IDENTIFIER pTransferSyntax; + ULONG_PTR nCount; + PMIDL_SYNTAX_INFO pSyntaxInfo; +} MIDL_STUBLESS_PROXY_INFO, *PMIDL_STUBLESS_PROXY_INFO; + +typedef union _CLIENT_CALL_RETURN +{ void *Pointer; - long Simple; + LONG_PTR Simple; } CLIENT_CALL_RETURN; -typedef enum { XLAT_SERVER = 1,XLAT_CLIENT } XLAT_SIDE; -typedef struct _FULL_PTR_TO_REFID_ELEMENT { - struct _FULL_PTR_TO_REFID_ELEMENT *Next; - void*Pointer; - unsigned long RefId; - unsigned char State; -} FULL_PTR_TO_REFID_ELEMENT,*PFULL_PTR_TO_REFID_ELEMENT; -typedef struct _FULL_PTR_XLAT_TABLES { - struct { - void **XlatTable; - unsigned char *StateTable; - unsigned long NumberOfEntries; - } RefIdToPointer; - struct { - PFULL_PTR_TO_REFID_ELEMENT *XlatTable; - unsigned long NumberOfBuckets; - unsigned long HashMask; - } PointerToRefId; - unsigned long NextRefId; - XLAT_SIDE XlatSide; -} FULL_PTR_XLAT_TABLES,*PFULL_PTR_XLAT_TABLES; -void RPC_ENTRY NdrSimpleTypeMarshall(PMIDL_STUB_MESSAGE,unsigned char*,unsigned char); -unsigned char *RPC_ENTRY NdrPointerMarshall(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING pFormat); -unsigned char *RPC_ENTRY NdrSimpleStructMarshall(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING); -unsigned char *RPC_ENTRY NdrConformantStructMarshall(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING); -unsigned char *RPC_ENTRY NdrConformantVaryingStructMarshall(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING); -unsigned char *RPC_ENTRY NdrHardStructMarshall(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING); -unsigned char *RPC_ENTRY NdrComplexStructMarshall(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING); -unsigned char *RPC_ENTRY NdrFixedArrayMarshall(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING); -unsigned char *RPC_ENTRY NdrConformantArrayMarshall(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING); -unsigned char *RPC_ENTRY NdrConformantVaryingArrayMarshall(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING); -unsigned char *RPC_ENTRY NdrVaryingArrayMarshall(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING); -unsigned char *RPC_ENTRY NdrComplexArrayMarshall(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING); -unsigned char *RPC_ENTRY NdrNonConformantStringMarshall(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING); -unsigned char *RPC_ENTRY NdrConformantStringMarshall(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING); -unsigned char *RPC_ENTRY NdrEncapsulatedUnionMarshall(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING); -unsigned char *RPC_ENTRY NdrNonEncapsulatedUnionMarshall(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING); -unsigned char *RPC_ENTRY NdrByteCountPointerMarshall(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING); -unsigned char *RPC_ENTRY NdrXmitOrRepAsMarshall(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING); -unsigned char *RPC_ENTRY NdrInterfacePointerMarshall(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING); -void RPC_ENTRY NdrClientContextMarshall(PMIDL_STUB_MESSAGE,NDR_CCONTEXT,int); -void RPC_ENTRY NdrServerContextMarshall(PMIDL_STUB_MESSAGE,NDR_SCONTEXT,NDR_RUNDOWN); -void RPC_ENTRY NdrSimpleTypeUnmarshall(PMIDL_STUB_MESSAGE,unsigned char*,unsigned char); -unsigned char *RPC_ENTRY NdrPointerUnmarshall(PMIDL_STUB_MESSAGE,unsigned char**,PFORMAT_STRING,unsigned char); -unsigned char *RPC_ENTRY NdrSimpleStructUnmarshall(PMIDL_STUB_MESSAGE,unsigned char**,PFORMAT_STRING,unsigned char); -unsigned char *RPC_ENTRY NdrConformantStructUnmarshall(PMIDL_STUB_MESSAGE,unsigned char**,PFORMAT_STRING,unsigned char); -unsigned char *RPC_ENTRY NdrConformantVaryingStructUnmarshall(PMIDL_STUB_MESSAGE,unsigned char**,PFORMAT_STRING,unsigned char); -unsigned char *RPC_ENTRY NdrHardStructUnmarshall(PMIDL_STUB_MESSAGE,unsigned char**,PFORMAT_STRING,unsigned char); -unsigned char *RPC_ENTRY NdrComplexStructUnmarshall(PMIDL_STUB_MESSAGE,unsigned char**,PFORMAT_STRING,unsigned char); -unsigned char *RPC_ENTRY NdrFixedArrayUnmarshall(PMIDL_STUB_MESSAGE,unsigned char**,PFORMAT_STRING,unsigned char); -unsigned char *RPC_ENTRY NdrConformantArrayUnmarshall(PMIDL_STUB_MESSAGE,unsigned char**,PFORMAT_STRING,unsigned char); -unsigned char *RPC_ENTRY NdrConformantVaryingArrayUnmarshall(PMIDL_STUB_MESSAGE,unsigned char**,PFORMAT_STRING,unsigned char); -unsigned char *RPC_ENTRY NdrVaryingArrayUnmarshall(PMIDL_STUB_MESSAGE,unsigned char**,PFORMAT_STRING,unsigned char); -unsigned char *RPC_ENTRY NdrComplexArrayUnmarshall(PMIDL_STUB_MESSAGE,unsigned char**,PFORMAT_STRING,unsigned char); -unsigned char *RPC_ENTRY NdrNonConformantStringUnmarshall(PMIDL_STUB_MESSAGE,unsigned char**,PFORMAT_STRING,unsigned char); -unsigned char *RPC_ENTRY NdrConformantStringUnmarshall(PMIDL_STUB_MESSAGE,unsigned char**,PFORMAT_STRING,unsigned char); -unsigned char *RPC_ENTRY NdrEncapsulatedUnionUnmarshall(PMIDL_STUB_MESSAGE,unsigned char**,PFORMAT_STRING,unsigned char); -unsigned char *RPC_ENTRY NdrNonEncapsulatedUnionUnmarshall(PMIDL_STUB_MESSAGE,unsigned char**,PFORMAT_STRING,unsigned char); -unsigned char *RPC_ENTRY NdrByteCountPointerUnmarshall(PMIDL_STUB_MESSAGE,unsigned char**,PFORMAT_STRING,unsigned char); -unsigned char *RPC_ENTRY NdrXmitOrRepAsUnmarshall(PMIDL_STUB_MESSAGE,unsigned char**,PFORMAT_STRING,unsigned char); -unsigned char *RPC_ENTRY NdrInterfacePointerUnmarshall(PMIDL_STUB_MESSAGE,unsigned char**,PFORMAT_STRING,unsigned char); -void RPC_ENTRY NdrClientContextUnmarshall(PMIDL_STUB_MESSAGE,NDR_CCONTEXT*,RPC_BINDING_HANDLE); -NDR_SCONTEXT RPC_ENTRY NdrServerContextUnmarshall(PMIDL_STUB_MESSAGE); -void RPC_ENTRY NdrPointerBufferSize(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING); -void RPC_ENTRY NdrSimpleStructBufferSize(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING); -void RPC_ENTRY NdrConformantStructBufferSize(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING); -void RPC_ENTRY NdrConformantVaryingStructBufferSize(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING); -void RPC_ENTRY NdrHardStructBufferSize(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING); -void RPC_ENTRY NdrComplexStructBufferSize(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING); -void RPC_ENTRY NdrFixedArrayBufferSize(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING); -void RPC_ENTRY NdrConformantArrayBufferSize(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING); -void RPC_ENTRY NdrConformantVaryingArrayBufferSize(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING); -void RPC_ENTRY NdrVaryingArrayBufferSize(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING); -void RPC_ENTRY NdrComplexArrayBufferSize(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING); -void RPC_ENTRY NdrConformantStringBufferSize(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING); -void RPC_ENTRY NdrNonConformantStringBufferSize(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING); -void RPC_ENTRY NdrEncapsulatedUnionBufferSize(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING); -void RPC_ENTRY NdrNonEncapsulatedUnionBufferSize(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING); -void RPC_ENTRY NdrByteCountPointerBufferSize(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING); -void RPC_ENTRY NdrXmitOrRepAsBufferSize(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING); -void RPC_ENTRY NdrInterfacePointerBufferSize(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING); -void RPC_ENTRY NdrContextHandleSize(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING); -unsigned long RPC_ENTRY NdrPointerMemorySize(PMIDL_STUB_MESSAGE,PFORMAT_STRING); -unsigned long RPC_ENTRY NdrSimpleStructMemorySize(PMIDL_STUB_MESSAGE,PFORMAT_STRING); -unsigned long RPC_ENTRY NdrConformantStructMemorySize(PMIDL_STUB_MESSAGE,PFORMAT_STRING); -unsigned long RPC_ENTRY NdrConformantVaryingStructMemorySize(PMIDL_STUB_MESSAGE,PFORMAT_STRING); -unsigned long RPC_ENTRY NdrHardStructMemorySize(PMIDL_STUB_MESSAGE,PFORMAT_STRING); -unsigned long RPC_ENTRY NdrComplexStructMemorySize(PMIDL_STUB_MESSAGE,PFORMAT_STRING); -unsigned long RPC_ENTRY NdrFixedArrayMemorySize(PMIDL_STUB_MESSAGE,PFORMAT_STRING); -unsigned long RPC_ENTRY NdrConformantArrayMemorySize(PMIDL_STUB_MESSAGE,PFORMAT_STRING); -unsigned long RPC_ENTRY NdrConformantVaryingArrayMemorySize(PMIDL_STUB_MESSAGE,PFORMAT_STRING); -unsigned long RPC_ENTRY NdrVaryingArrayMemorySize(PMIDL_STUB_MESSAGE,PFORMAT_STRING); -unsigned long RPC_ENTRY NdrComplexArrayMemorySize(PMIDL_STUB_MESSAGE,PFORMAT_STRING); -unsigned long RPC_ENTRY NdrConformantStringMemorySize(PMIDL_STUB_MESSAGE,PFORMAT_STRING); -unsigned long RPC_ENTRY NdrNonConformantStringMemorySize(PMIDL_STUB_MESSAGE,PFORMAT_STRING); -unsigned long RPC_ENTRY NdrEncapsulatedUnionMemorySize(PMIDL_STUB_MESSAGE,PFORMAT_STRING); -unsigned long RPC_ENTRY NdrNonEncapsulatedUnionMemorySize(PMIDL_STUB_MESSAGE,PFORMAT_STRING); -unsigned long RPC_ENTRY NdrXmitOrRepAsMemorySize(PMIDL_STUB_MESSAGE,PFORMAT_STRING); -unsigned long RPC_ENTRY NdrInterfacePointerMemorySize(PMIDL_STUB_MESSAGE,PFORMAT_STRING); -void RPC_ENTRY NdrPointerFree(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING); -void RPC_ENTRY NdrSimpleStructFree(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING); -void RPC_ENTRY NdrConformantStructFree(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING); -void RPC_ENTRY NdrConformantVaryingStructFree(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING); -void RPC_ENTRY NdrHardStructFree(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING); -void RPC_ENTRY NdrComplexStructFree(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING); -void RPC_ENTRY NdrFixedArrayFree(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING); -void RPC_ENTRY NdrConformantArrayFree(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING); -void RPC_ENTRY NdrConformantVaryingArrayFree(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING); -void RPC_ENTRY NdrVaryingArrayFree(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING); -void RPC_ENTRY NdrComplexArrayFree(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING); -void RPC_ENTRY NdrEncapsulatedUnionFree(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING); -void RPC_ENTRY NdrNonEncapsulatedUnionFree(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING); -void RPC_ENTRY NdrByteCountPointerFree(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING); -void RPC_ENTRY NdrXmitOrRepAsFree(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING); -void RPC_ENTRY NdrInterfacePointerFree(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING); -void RPC_ENTRY NdrConvert(PMIDL_STUB_MESSAGE,PFORMAT_STRING); -void RPC_ENTRY NdrClientInitializeNew(PRPC_MESSAGE,PMIDL_STUB_MESSAGE,PMIDL_STUB_DESC,unsigned int); -unsigned char *RPC_ENTRY NdrServerInitializeNew(PRPC_MESSAGE,PMIDL_STUB_MESSAGE,PMIDL_STUB_DESC); -void RPC_ENTRY NdrClientInitialize(PRPC_MESSAGE,PMIDL_STUB_MESSAGE,PMIDL_STUB_DESC,unsigned int); -unsigned char *RPC_ENTRY NdrServerInitialize(PRPC_MESSAGE,PMIDL_STUB_MESSAGE,PMIDL_STUB_DESC); -unsigned char *RPC_ENTRY NdrServerInitializeUnmarshall(PMIDL_STUB_MESSAGE,PMIDL_STUB_DESC,PRPC_MESSAGE); -void RPC_ENTRY NdrServerInitializeMarshall(PRPC_MESSAGE,PMIDL_STUB_MESSAGE); -unsigned char *RPC_ENTRY NdrGetBuffer(PMIDL_STUB_MESSAGE,unsigned long,RPC_BINDING_HANDLE); -unsigned char *RPC_ENTRY NdrNsGetBuffer(PMIDL_STUB_MESSAGE,unsigned long,RPC_BINDING_HANDLE); -unsigned char *RPC_ENTRY NdrSendReceive(PMIDL_STUB_MESSAGE,unsigned char*); -unsigned char *RPC_ENTRY NdrNsSendReceive(PMIDL_STUB_MESSAGE,unsigned char*,RPC_BINDING_HANDLE*); -void RPC_ENTRY NdrFreeBuffer(PMIDL_STUB_MESSAGE); -CLIENT_CALL_RETURN RPC_VAR_ENTRY NdrClientCall(PMIDL_STUB_DESC,PFORMAT_STRING,...); + typedef enum { STUB_UNMARSHAL, STUB_CALL_SERVER, STUB_MARSHAL, STUB_CALL_SERVER_NO_HRESULT } STUB_PHASE; + typedef enum { PROXY_CALCSIZE, PROXY_GETBUFFER, @@ -496,66 +360,245 @@ PROXY_SENDRECEIVE, PROXY_UNMARSHAL } PROXY_PHASE; -long RPC_ENTRY NdrStubCall(struct IRpcStubBuffer*,struct IRpcChannelBuffer*,PRPC_MESSAGE,unsigned long*); -void RPC_ENTRY NdrServerCall(PRPC_MESSAGE); -int RPC_ENTRY NdrServerUnmarshall(struct IRpcChannelBuffer*,PRPC_MESSAGE,PMIDL_STUB_MESSAGE,PMIDL_STUB_DESC,PFORMAT_STRING,void*); -void RPC_ENTRY NdrServerMarshall(struct IRpcStubBuffer*,struct IRpcChannelBuffer*,PMIDL_STUB_MESSAGE,PFORMAT_STRING); -RPC_STATUS RPC_ENTRY NdrMapCommAndFaultStatus(PMIDL_STUB_MESSAGE,unsigned long*,unsigned long*,RPC_STATUS); -int RPC_ENTRY NdrSH_UPDecision(PMIDL_STUB_MESSAGE,unsigned char**,RPC_BUFPTR); -int RPC_ENTRY NdrSH_TLUPDecision(PMIDL_STUB_MESSAGE,unsigned char**); -int RPC_ENTRY NdrSH_TLUPDecisionBuffer(PMIDL_STUB_MESSAGE,unsigned char**); -int RPC_ENTRY NdrSH_IfAlloc(PMIDL_STUB_MESSAGE,unsigned char**,unsigned long); -int RPC_ENTRY NdrSH_IfAllocRef(PMIDL_STUB_MESSAGE,unsigned char**,unsigned long); -int RPC_ENTRY NdrSH_IfAllocSet(PMIDL_STUB_MESSAGE,unsigned char**,unsigned long); -RPC_BUFPTR RPC_ENTRY NdrSH_IfCopy(PMIDL_STUB_MESSAGE,unsigned char**,unsigned long); -RPC_BUFPTR RPC_ENTRY NdrSH_IfAllocCopy(PMIDL_STUB_MESSAGE,unsigned char**,unsigned long); -unsigned long RPC_ENTRY NdrSH_Copy(unsigned char*,unsigned char*,unsigned long); -void RPC_ENTRY NdrSH_IfFree(PMIDL_STUB_MESSAGE,unsigned char*); -RPC_BUFPTR RPC_ENTRY NdrSH_StringMarshall(PMIDL_STUB_MESSAGE,unsigned char*,unsigned long,int); -RPC_BUFPTR RPC_ENTRY NdrSH_StringUnMarshall(PMIDL_STUB_MESSAGE,unsigned char**,int); -typedef void *RPC_SS_THREAD_HANDLE; -typedef void* __RPC_API RPC_CLIENT_ALLOC(unsigned int); -typedef void __RPC_API RPC_CLIENT_FREE(void*); -void*RPC_ENTRY RpcSsAllocate(unsigned int); -void RPC_ENTRY RpcSsDisableAllocate(void); -void RPC_ENTRY RpcSsEnableAllocate(void); -void RPC_ENTRY RpcSsFree(void*); -RPC_SS_THREAD_HANDLE RPC_ENTRY RpcSsGetThreadHandle(void); -void RPC_ENTRY RpcSsSetClientAllocFree(RPC_CLIENT_ALLOC*,RPC_CLIENT_FREE*); -void RPC_ENTRY RpcSsSetThreadHandle(RPC_SS_THREAD_HANDLE); -void RPC_ENTRY RpcSsSwapClientAllocFree(RPC_CLIENT_ALLOC*,RPC_CLIENT_FREE*,RPC_CLIENT_ALLOC**,RPC_CLIENT_FREE**); -void*RPC_ENTRY RpcSmAllocate(unsigned int,RPC_STATUS*); -RPC_STATUS RPC_ENTRY RpcSmClientFree(void*); -RPC_STATUS RPC_ENTRY RpcSmDestroyClientContext(void**); -RPC_STATUS RPC_ENTRY RpcSmDisableAllocate(void); -RPC_STATUS RPC_ENTRY RpcSmEnableAllocate(void); -RPC_STATUS RPC_ENTRY RpcSmFree(void*); -RPC_SS_THREAD_HANDLE RPC_ENTRY RpcSmGetThreadHandle(RPC_STATUS*); -RPC_STATUS RPC_ENTRY RpcSmSetClientAllocFree(RPC_CLIENT_ALLOC*,RPC_CLIENT_FREE*); -RPC_STATUS RPC_ENTRY RpcSmSetThreadHandle(RPC_SS_THREAD_HANDLE); -RPC_STATUS RPC_ENTRY RpcSmSwapClientAllocFree(RPC_CLIENT_ALLOC*,RPC_CLIENT_FREE*,RPC_CLIENT_ALLOC**,RPC_CLIENT_FREE**); -void RPC_ENTRY NdrRpcSsEnableAllocate(PMIDL_STUB_MESSAGE); -void RPC_ENTRY NdrRpcSsDisableAllocate(PMIDL_STUB_MESSAGE); -void RPC_ENTRY NdrRpcSmSetClientToOsf(PMIDL_STUB_MESSAGE); -void*RPC_ENTRY NdrRpcSmClientAllocate(unsigned int); -void RPC_ENTRY NdrRpcSmClientFree(void*); -void*RPC_ENTRY NdrRpcSsDefaultAllocate(unsigned int); -void RPC_ENTRY NdrRpcSsDefaultFree(void*); -PFULL_PTR_XLAT_TABLES RPC_ENTRY NdrFullPointerXlatInit(unsigned long,XLAT_SIDE); -void RPC_ENTRY NdrFullPointerXlatFree(PFULL_PTR_XLAT_TABLES); -int RPC_ENTRY NdrFullPointerQueryPointer(PFULL_PTR_XLAT_TABLES,void*,unsigned char,unsigned long*); -int RPC_ENTRY NdrFullPointerQueryRefId(PFULL_PTR_XLAT_TABLES,unsigned long,unsigned char,void**); -void RPC_ENTRY NdrFullPointerInsertRefId(PFULL_PTR_XLAT_TABLES,unsigned long,void*); -int RPC_ENTRY NdrFullPointerFree(PFULL_PTR_XLAT_TABLES,void*); -void*RPC_ENTRY NdrAllocate(PMIDL_STUB_MESSAGE,unsigned int); -void RPC_ENTRY NdrClearOutParameters(PMIDL_STUB_MESSAGE,PFORMAT_STRING,void*); -void*RPC_ENTRY NdrOleAllocate(unsigned int); -void RPC_ENTRY NdrOleFree(void*); -unsigned char*RPC_ENTRY NdrUserMarshalMarshall(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING); -unsigned char*RPC_ENTRY NdrUserMarshalUnmarshall(PMIDL_STUB_MESSAGE,unsigned char**,PFORMAT_STRING,unsigned char); -void RPC_ENTRY NdrUserMarshalBufferSize(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING); -unsigned long RPC_ENTRY NdrUserMarshalMemorySize(PMIDL_STUB_MESSAGE,PFORMAT_STRING); -void RPC_ENTRY NdrUserMarshalFree(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING); + +typedef enum { + XLAT_SERVER = 1, + XLAT_CLIENT +} XLAT_SIDE; + +typedef struct _FULL_PTR_TO_REFID_ELEMENT { + struct _FULL_PTR_TO_REFID_ELEMENT *Next; + void *Pointer; + unsigned long RefId; + unsigned char State; +} FULL_PTR_TO_REFID_ELEMENT, *PFULL_PTR_TO_REFID_ELEMENT; + +/* Full pointer translation tables */ +typedef struct _FULL_PTR_XLAT_TABLES { + struct { + void **XlatTable; + unsigned char *StateTable; + unsigned long NumberOfEntries; + } RefIdToPointer; + + struct { + PFULL_PTR_TO_REFID_ELEMENT *XlatTable; + unsigned long NumberOfBuckets; + unsigned long HashMask; + } PointerToRefId; + + unsigned long NextRefId; + XLAT_SIDE XlatSide; +} FULL_PTR_XLAT_TABLES, *PFULL_PTR_XLAT_TABLES; + +struct IRpcStubBuffer; + +typedef unsigned long error_status_t; +typedef void * NDR_CCONTEXT; + +typedef struct _SCONTEXT_QUEUE { + unsigned long NumberOfObjects; + NDR_SCONTEXT *ArrayOfObjects; +} SCONTEXT_QUEUE, *PSCONTEXT_QUEUE; + +/* Context Handles */ + +RPCRTAPI RPC_BINDING_HANDLE RPC_ENTRY + NDRCContextBinding( IN NDR_CCONTEXT CContext ); + +RPCRTAPI void RPC_ENTRY + NDRCContextMarshall( IN NDR_CCONTEXT CContext, OUT void *pBuff ); + +RPCRTAPI void RPC_ENTRY + NDRCContextUnmarshall( OUT NDR_CCONTEXT *pCContext, IN RPC_BINDING_HANDLE hBinding, + IN void *pBuff, IN unsigned long DataRepresentation ); + +RPCRTAPI void RPC_ENTRY + NDRSContextMarshall( IN NDR_SCONTEXT CContext, OUT void *pBuff, IN NDR_RUNDOWN userRunDownIn ); + +RPCRTAPI NDR_SCONTEXT RPC_ENTRY + NDRSContextUnmarshall( IN void *pBuff, IN unsigned long DataRepresentation ); + +RPCRTAPI void RPC_ENTRY + NDRSContextMarshallEx( IN RPC_BINDING_HANDLE BindingHandle, IN NDR_SCONTEXT CContext, + OUT void *pBuff, IN NDR_RUNDOWN userRunDownIn ); + +RPCRTAPI void RPC_ENTRY + NDRSContextMarshall2( IN RPC_BINDING_HANDLE BindingHandle, IN NDR_SCONTEXT CContext, + OUT void *pBuff, IN NDR_RUNDOWN userRunDownIn, IN void * CtxGuard, + IN unsigned long Flags ); + +RPCRTAPI NDR_SCONTEXT RPC_ENTRY + NDRSContextUnmarshallEx( IN RPC_BINDING_HANDLE BindingHandle, IN void *pBuff, + IN unsigned long DataRepresentation ); + +RPCRTAPI NDR_SCONTEXT RPC_ENTRY + NDRSContextUnmarshall2( IN RPC_BINDING_HANDLE BindingHandle, IN void *pBuff, + IN unsigned long DataRepresentation, IN void *CtxGuard, + IN unsigned long Flags ); + +RPCRTAPI void RPC_ENTRY + NdrClientContextMarshall ( PMIDL_STUB_MESSAGE pStubMsg, NDR_CCONTEXT ContextHandle, int fCheck ); + +RPCRTAPI void RPC_ENTRY + NdrClientContextUnmarshall( IN PMIDL_STUB_MESSAGE pStubMsg, OUT NDR_CCONTEXT* pContextHandle, + IN RPC_BINDING_HANDLE BindHandle ); + +RPCRTAPI void RPC_ENTRY + NdrServerContextMarshall ( PMIDL_STUB_MESSAGE pStubMsg, NDR_SCONTEXT ContextHandle, NDR_RUNDOWN RundownRoutine ); + +RPCRTAPI NDR_SCONTEXT RPC_ENTRY + NdrServerContextUnmarshall( IN PMIDL_STUB_MESSAGE pStubMsg ); + +RPCRTAPI void RPC_ENTRY + NdrContextHandleSize( PMIDL_STUB_MESSAGE pStubMsg, unsigned char* pMemory, PFORMAT_STRING pFormat ); + +RPCRTAPI NDR_SCONTEXT RPC_ENTRY + NdrContextHandleInitialize( IN PMIDL_STUB_MESSAGE pStubMsg, IN PFORMAT_STRING pFormat ); + +RPCRTAPI void RPC_ENTRY + NdrServerContextNewMarshall( PMIDL_STUB_MESSAGE pStubMsg, NDR_SCONTEXT ContextHandle, + NDR_RUNDOWN RundownRoutine, PFORMAT_STRING pFormat ); + +RPCRTAPI NDR_SCONTEXT RPC_ENTRY + NdrServerContextNewUnmarshall( IN PMIDL_STUB_MESSAGE pStubMsg, IN PFORMAT_STRING pFormat ); + +RPCRTAPI void RPC_ENTRY + RpcSsDestroyClientContext( IN void **ContextHandle ); + +RPCRTAPI void RPC_ENTRY + NdrSimpleTypeMarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char* pMemory, unsigned char FormatChar ); +RPCRTAPI void RPC_ENTRY + NdrSimpleTypeUnmarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char* pMemory, unsigned char FormatChar ); + +/* while MS declares each prototype separately, I prefer to use macros for this kind of thing instead */ +#define SIMPLE_TYPE_MARSHAL(type) \ +RPCRTAPI unsigned char* RPC_ENTRY \ + Ndr##type##Marshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char* pMemory, PFORMAT_STRING pFormat ); \ +RPCRTAPI unsigned char* RPC_ENTRY \ + Ndr##type##Unmarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char** ppMemory, PFORMAT_STRING pFormat, unsigned char fMustAlloc ); \ +RPCRTAPI void RPC_ENTRY \ + Ndr##type##BufferSize( PMIDL_STUB_MESSAGE pStubMsg, unsigned char* pMemory, PFORMAT_STRING pFormat ); \ +RPCRTAPI unsigned long RPC_ENTRY \ + Ndr##type##MemorySize( PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat ); + +#define TYPE_MARSHAL(type) \ + SIMPLE_TYPE_MARSHAL(type) \ +RPCRTAPI void RPC_ENTRY \ + Ndr##type##Free( PMIDL_STUB_MESSAGE pStubMsg, unsigned char* pMemory, PFORMAT_STRING pFormat ); + +TYPE_MARSHAL(Pointer) +TYPE_MARSHAL(SimpleStruct) +TYPE_MARSHAL(ConformantStruct) +TYPE_MARSHAL(ConformantVaryingStruct) +TYPE_MARSHAL(ComplexStruct) +TYPE_MARSHAL(FixedArray) +TYPE_MARSHAL(ConformantArray) +TYPE_MARSHAL(ConformantVaryingArray) +TYPE_MARSHAL(VaryingArray) +TYPE_MARSHAL(ComplexArray) +TYPE_MARSHAL(EncapsulatedUnion) +TYPE_MARSHAL(NonEncapsulatedUnion) +TYPE_MARSHAL(ByteCountPointer) +TYPE_MARSHAL(XmitOrRepAs) +TYPE_MARSHAL(UserMarshal) +TYPE_MARSHAL(InterfacePointer) +TYPE_MARSHAL(Range) + +SIMPLE_TYPE_MARSHAL(ConformantString) +SIMPLE_TYPE_MARSHAL(NonConformantString) + +#undef TYPE_MARSHAL +#undef SIMPLE_TYPE_MARSHAL + +RPCRTAPI void RPC_ENTRY + NdrConvert2( PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat, long NumberParams ); +RPCRTAPI void RPC_ENTRY + NdrConvert( PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat ); + +/* Note: this should return a CLIENT_CALL_RETURN, but calling convention for + * returning structures/unions is different between Windows and gcc on i386. */ +LONG_PTR RPC_VAR_ENTRY + NdrClientCall2( PMIDL_STUB_DESC pStubDescriptor, PFORMAT_STRING pFormat, ... ); +LONG_PTR RPC_VAR_ENTRY + NdrClientCall( PMIDL_STUB_DESC pStubDescriptor, PFORMAT_STRING pFormat, ... ); +LONG_PTR RPC_VAR_ENTRY + NdrAsyncClientCall( PMIDL_STUB_DESC pStubDescriptor, PFORMAT_STRING pFormat, ... ); + +RPCRTAPI void RPC_ENTRY + NdrServerCall2( PRPC_MESSAGE pRpcMsg ); +RPCRTAPI void RPC_ENTRY + NdrServerCall( PRPC_MESSAGE pRpcMsg ); + +RPCRTAPI long RPC_ENTRY + NdrStubCall2( struct IRpcStubBuffer* pThis, struct IRpcChannelBuffer* pChannel, PRPC_MESSAGE pRpcMsg, unsigned long * pdwStubPhase ); +RPCRTAPI long RPC_ENTRY + NdrStubCall( struct IRpcStubBuffer* pThis, struct IRpcChannelBuffer* pChannel, PRPC_MESSAGE pRpcMsg, unsigned long * pdwStubPhase ); +RPCRTAPI long RPC_ENTRY + NdrAsyncStubCall( struct IRpcStubBuffer* pThis, struct IRpcChannelBuffer* pChannel, PRPC_MESSAGE pRpcMsg, unsigned long * pdwStubPhase ); + +RPCRTAPI void* RPC_ENTRY + NdrAllocate( PMIDL_STUB_MESSAGE pStubMsg, size_t Len ); + +RPCRTAPI void RPC_ENTRY + NdrClearOutParameters( PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat, void *ArgAddr ); + +RPCRTAPI RPC_STATUS RPC_ENTRY + NdrMapCommAndFaultStatus( PMIDL_STUB_MESSAGE pStubMsg, unsigned long *pCommStatus, + unsigned long *pFaultStatus, RPC_STATUS Status_ ); + +RPCRTAPI void* RPC_ENTRY + NdrOleAllocate( size_t Size ); +RPCRTAPI void RPC_ENTRY + NdrOleFree( void* NodeToFree ); + +RPCRTAPI void RPC_ENTRY + NdrClientInitializeNew( PRPC_MESSAGE pRpcMessage, PMIDL_STUB_MESSAGE pStubMsg, + PMIDL_STUB_DESC pStubDesc, unsigned int ProcNum ); +RPCRTAPI unsigned char* RPC_ENTRY + NdrServerInitializeNew( PRPC_MESSAGE pRpcMsg, PMIDL_STUB_MESSAGE pStubMsg, PMIDL_STUB_DESC pStubDesc ); +RPCRTAPI unsigned char* RPC_ENTRY + NdrGetBuffer( MIDL_STUB_MESSAGE *stubmsg, unsigned long buflen, RPC_BINDING_HANDLE handle ); +RPCRTAPI void RPC_ENTRY + NdrFreeBuffer( MIDL_STUB_MESSAGE *pStubMsg ); +RPCRTAPI unsigned char* RPC_ENTRY + NdrSendReceive( MIDL_STUB_MESSAGE *stubmsg, unsigned char *buffer ); + +RPCRTAPI unsigned char * RPC_ENTRY + NdrNsGetBuffer( PMIDL_STUB_MESSAGE pStubMsg, unsigned long BufferLength, RPC_BINDING_HANDLE Handle ); +RPCRTAPI unsigned char * RPC_ENTRY + NdrNsSendReceive( PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pBufferEnd, RPC_BINDING_HANDLE *pAutoHandle ); + +RPCRTAPI PFULL_PTR_XLAT_TABLES RPC_ENTRY + NdrFullPointerXlatInit( unsigned long NumberOfPointers, XLAT_SIDE XlatSide ); +RPCRTAPI void RPC_ENTRY + NdrFullPointerXlatFree( PFULL_PTR_XLAT_TABLES pXlatTables ); +RPCRTAPI int RPC_ENTRY + NdrFullPointerQueryPointer( PFULL_PTR_XLAT_TABLES pXlatTables, void *pPointer, + unsigned char QueryType, unsigned long *pRefId ); +RPCRTAPI int RPC_ENTRY + NdrFullPointerQueryRefId( PFULL_PTR_XLAT_TABLES pXlatTables, unsigned long RefId, + unsigned char QueryType, void **ppPointer ); +RPCRTAPI void RPC_ENTRY + NdrFullPointerInsertRefId( PFULL_PTR_XLAT_TABLES pXlatTables, unsigned long RefId, void *pPointer ); +RPCRTAPI int RPC_ENTRY + NdrFullPointerFree( PFULL_PTR_XLAT_TABLES pXlatTables, void *Pointer ); + +RPCRTAPI void RPC_ENTRY + NdrRpcSsEnableAllocate( PMIDL_STUB_MESSAGE pMessage ); +RPCRTAPI void RPC_ENTRY + NdrRpcSsDisableAllocate( PMIDL_STUB_MESSAGE pMessage ); +RPCRTAPI void RPC_ENTRY + NdrRpcSmSetClientToOsf( PMIDL_STUB_MESSAGE pMessage ); +RPCRTAPI void * RPC_ENTRY + NdrRpcSmClientAllocate( IN size_t Size ); +RPCRTAPI void RPC_ENTRY + NdrRpcSmClientFree( IN void *NodeToFree ); +RPCRTAPI void * RPC_ENTRY + NdrRpcSsDefaultAllocate( IN size_t Size ); +RPCRTAPI void RPC_ENTRY + NdrRpcSsDefaultFree( IN void *NodeToFree ); + #ifdef __cplusplus } #endif

18 years, 9 months

[fireball] 21394: - Sync rpcfc.h to Wine-0.9.10

by aleksey＠studiocerebral.com

Author: fireball Date: Sun Mar 26 20:04:49 2006 New Revision: 21394 URL: http://svn.reactos.ru/svn/reactos?rev=21394&view=rev Log: - Sync rpcfc.h to Wine-0.9.10 Modified: trunk/reactos/include/reactos/wine/rpcfc.h Modified: trunk/reactos/include/reactos/wine/rpcfc.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/include/reactos/wine/rpcfc.… ============================================================================== --- trunk/reactos/include/reactos/wine/rpcfc.h (original) +++ trunk/reactos/include/reactos/wine/rpcfc.h Sun Mar 26 20:04:49 2006 @@ -21,7 +21,7 @@ #define RPC_FC_DOUBLE 0x0c #define RPC_FC_ENUM16 0x0d #define RPC_FC_ENUM32 0x0e -#define RPC_FC_IGNORE 0x0f /* handle_t */ +#define RPC_FC_IGNORE 0x0f #define RPC_FC_ERROR_STATUS_T 0x10 /* other stuff */ @@ -29,12 +29,6 @@ #define RPC_FC_UP 0x12 /* unique pointer */ #define RPC_FC_OP 0x13 /* unique pointer in object ? */ #define RPC_FC_FP 0x14 /* full pointer */ -/* FC_RP/UP/OP/FP: flags, NdrFcShort(typeofs)/basetype */ -#define RPC_FC_P_ALLOCALLNODES 0x01 -#define RPC_FC_P_DONTFREE 0x02 -#define RPC_FC_P_ONSTACK 0x04 /* [alloced_on_stack] */ -#define RPC_FC_P_SIMPLEPOINTER 0x08 /* [simple_pointer] */ -#define RPC_FC_P_DEREF 0x10 #define RPC_FC_STRUCT 0x15 /* simple structure */ /* FC_STRUCT: align-1, NdrFcShort(size), fields */ @@ -67,6 +61,8 @@ #define RPC_FC_C_CSTRING 0x22 #define RPC_FC_C_WSTRING 0x25 +#define RPC_FC_CSTRING 0x26 +#define RPC_FC_WSTRING 0x29 #define RPC_FC_ENCAPSULATED_UNION 0x2a #define RPC_FC_NON_ENCAPSULATED_UNION 0x2b @@ -80,47 +76,12 @@ /* FC_IP: FC_CONSTANT_IID iid */ /* FC_IP: FC_PAD correlation */ -#define RPC_FC_BIND_EXPLICIT 0x00 #define RPC_FC_BIND_CONTEXT 0x30 #define RPC_FC_BIND_GENERIC 0x31 #define RPC_FC_BIND_PRIMITIVE 0x32 #define RPC_FC_AUTO_HANDLE 0x33 #define RPC_FC_CALLBACK_HANDLE 0x34 -/* proc header: oiflags, NdrFcLong(rpcflags), NdrFcShort(procnum), NdrFcShort(stacksiz), - * oi2 header: NdrFcShort(clientbuf), NdrFcShort(servbuf), oi2flags, parmcount - * oi2 parameters: NdrFcShort(flags), NdrFcShort(stackofs), NdrFcShort(typeofs)/basetype */ - #define RPC_FC_PROC_OIF_FULLPTR 0x01 - #define RPC_FC_PROC_OIF_RPCSSALLOC 0x02 - #define RPC_FC_PROC_OIF_OBJECT 0x04 - #define RPC_FC_PROC_OIF_RPCFLAGS 0x08 - #define RPC_FC_PROC_OIF_OBJ_V2 0x20 - #define RPC_FC_PROC_OIF_NEWINIT 0x40 - - #define RPC_FC_PROC_OI2F_SRVMUSTSIZE 0x01 - #define RPC_FC_PROC_OI2F_CLTMUSTSIZE 0x02 - #define RPC_FC_PROC_OI2F_HASRETURN 0x04 - #define RPC_FC_PROC_OI2F_HASPIPES 0x08 - #define RPC_FC_PROC_OI2F_HASASYNCUUID 0x20 - #define RPC_FC_PROC_OI2F_HASEXTS 0x40 - #define RPC_FC_PROC_OI2F_HASASYNCHND 0x80 - #define RPC_FC_PROC_PF_MUSTSIZE 0x0001 - #define RPC_FC_PROC_PF_MUSTFREE 0x0002 - #define RPC_FC_PROC_PF_PIPE 0x0004 - #define RPC_FC_PROC_PF_IN 0x0008 - #define RPC_FC_PROC_PF_OUT 0x0010 - #define RPC_FC_PROC_PF_RETURN 0x0020 - #define RPC_FC_PROC_PF_BASETYPE 0x0040 - #define RPC_FC_PROC_PF_BYVAL 0x0080 - #define RPC_FC_PROC_PF_SIMPLEREF 0x0100 - #define RPC_FC_PROC_PF_DONTFREEINST 0x0200 - #define RPC_FC_PROC_PF_SAVEASYNC 0x0400 - #define RPC_FC_PROC_PF_SRVALLOCSIZE 0xe000 /* in 8 byte units */ -#define RPC_FC_PROC_EXT_NEWCORRDESC 0x01 -#define RPC_FC_PROC_EXT_CLIENTCORRCHECK 0x02 -#define RPC_FC_PROC_EXT_SERVERCORRCHECK 0x04 -#define RPC_FC_PROC_EXT_HASNOTIFY 0x08 -#define RPC_FC_PROC_EXT_HASNOTIFY2 0x10 #define RPC_FC_POINTER 0x36 @@ -128,6 +89,8 @@ #define RPC_FC_ALIGNM8 0x39 #define RPC_FC_STRUCTPAD2 0x3e + +#define RPC_FC_STRING_SIZED 0x44 #define RPC_FC_NO_REPEAT 0x46 #define RPC_FC_FIXED_REPEAT 0x47 @@ -158,6 +121,10 @@ /* FC_RETURN_PARAM_BASETYPE: basetype */ #define RPC_FC_DEREFERENCE 0x54 +#define RPC_FC_DIV_2 0x55 +#define RPC_FC_MULT_2 0x56 +#define RPC_FC_ADD_1 0x57 +#define RPC_FC_SUB_1 0x58 #define RPC_FC_CALLBACK 0x59 @@ -169,8 +136,54 @@ #define RPC_FC_USER_MARSHAL 0xb4 +#define RPC_FC_RANGE 0xb7 + #define RPC_FC_INT3264 0xb8 #define RPC_FC_UINT3264 0xb9 + +/* FC_RP/UP/OP/FP: flags, NdrFcShort(typeofs)/basetype */ +#define RPC_FC_P_ALLOCALLNODES 0x01 +#define RPC_FC_P_DONTFREE 0x02 +#define RPC_FC_P_ONSTACK 0x04 /* [alloced_on_stack] */ +#define RPC_FC_P_SIMPLEPOINTER 0x08 /* [simple_pointer] */ +#define RPC_FC_P_DEREF 0x10 + +#define RPC_FC_BIND_EXPLICIT 0x00 + +/* proc header: oiflags, NdrFcLong(rpcflags), NdrFcShort(procnum), NdrFcShort(stacksiz), + * oi2 header: NdrFcShort(clientbuf), NdrFcShort(servbuf), oi2flags, parmcount + * oi2 parameters: NdrFcShort(flags), NdrFcShort(stackofs), NdrFcShort(typeofs)/basetype */ +#define RPC_FC_PROC_OIF_FULLPTR 0x01 +#define RPC_FC_PROC_OIF_RPCSSALLOC 0x02 +#define RPC_FC_PROC_OIF_OBJECT 0x04 +#define RPC_FC_PROC_OIF_RPCFLAGS 0x08 +#define RPC_FC_PROC_OIF_OBJ_V2 0x20 +#define RPC_FC_PROC_OIF_NEWINIT 0x40 + +#define RPC_FC_PROC_OI2F_SRVMUSTSIZE 0x01 +#define RPC_FC_PROC_OI2F_CLTMUSTSIZE 0x02 +#define RPC_FC_PROC_OI2F_HASRETURN 0x04 +#define RPC_FC_PROC_OI2F_HASPIPES 0x08 +#define RPC_FC_PROC_OI2F_HASASYNCUUID 0x20 +#define RPC_FC_PROC_OI2F_HASEXTS 0x40 +#define RPC_FC_PROC_OI2F_HASASYNCHND 0x80 +#define RPC_FC_PROC_PF_MUSTSIZE 0x0001 +#define RPC_FC_PROC_PF_MUSTFREE 0x0002 +#define RPC_FC_PROC_PF_PIPE 0x0004 +#define RPC_FC_PROC_PF_IN 0x0008 +#define RPC_FC_PROC_PF_OUT 0x0010 +#define RPC_FC_PROC_PF_RETURN 0x0020 +#define RPC_FC_PROC_PF_BASETYPE 0x0040 +#define RPC_FC_PROC_PF_BYVAL 0x0080 +#define RPC_FC_PROC_PF_SIMPLEREF 0x0100 +#define RPC_FC_PROC_PF_DONTFREEINST 0x0200 +#define RPC_FC_PROC_PF_SAVEASYNC 0x0400 +#define RPC_FC_PROC_PF_SRVALLOCSIZE 0xe000 /* in 8 byte units */ +#define RPC_FC_PROC_EXT_NEWCORRDESC 0x01 +#define RPC_FC_PROC_EXT_CLIENTCORRCHECK 0x02 +#define RPC_FC_PROC_EXT_SERVERCORRCHECK 0x04 +#define RPC_FC_PROC_EXT_HASNOTIFY 0x08 +#define RPC_FC_PROC_EXT_HASNOTIFY2 0x10 /* correlation types */ #define RPC_FC_NORMAL_CONFORMANCE 0x00

18 years, 9 months

[mbosma] 21393: Replace tabs with spaces the file looked messed up in msvc.

by aleksey＠studiocerebral.com

Author: mbosma Date: Sun Mar 26 00:14:49 2006 New Revision: 21393 URL: http://svn.reactos.ru/svn/reactos?rev=21393&view=rev Log: Replace tabs with spaces the file looked messed up in msvc. Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/cc/pin.c Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/cc/pin.c URL: http://svn.reactos.ru/svn/reactos/branches/cache_manager_rewrite/reactos/nt… ============================================================================== --- branches/cache_manager_rewrite/reactos/ntoskrnl/cc/pin.c (original) +++ branches/cache_manager_rewrite/reactos/ntoskrnl/cc/pin.c Sun Mar 26 00:14:49 2006 @@ -33,11 +33,11 @@ */ BOOLEAN STDCALL CcMapData(IN PFILE_OBJECT FileObject, - IN PLARGE_INTEGER FileOffset, - IN ULONG Length, - IN BOOLEAN Wait, - OUT PVOID* piBcb, - OUT PVOID* pBuffer) + IN PLARGE_INTEGER FileOffset, + IN ULONG Length, + IN BOOLEAN Wait, + OUT PVOID* piBcb, + OUT PVOID* pBuffer) { PINTERNAL_BCB iBcb; PBCB Bcb; @@ -47,8 +47,8 @@ PCACHE_VIEW current = NULL; DPRINT("CcMapData(FileObject 0x%p, FileOffset %I64x, Length %d, Wait %d," - " pBcb 0x%p, pBuffer 0x%p)\n", FileObject, FileOffset->QuadPart, - Length, Wait, piBcb, pBuffer); + " pBcb 0x%p, pBuffer 0x%p)\n", FileObject, FileOffset->QuadPart, + Length, Wait, piBcb, pBuffer); ASSERT (FileObject); ASSERT (FileObject->SectionObjectPointer); @@ -94,7 +94,7 @@ if (Bcb->CacheView[Index]->RefCount == 0) { RemoveEntryList(&Bcb->CacheView[Index]->ListEntry); - InsertHeadList(&CcInUseCacheViewListHead, &Bcb->CacheView[Index]->ListEntry); + InsertHeadList(&CcInUseCacheViewListHead, &Bcb->CacheView[Index]->ListEntry); } Bcb->CacheView[Index]->RefCount++; } @@ -110,11 +110,11 @@ while (entry != &CcFreeCacheViewListHead) { current = CONTAINING_RECORD(entry, CACHE_VIEW, ListEntry); - entry = entry->Flink; - if (current->Bcb == NULL) - { - break; - } + entry = entry->Flink; + if (current->Bcb == NULL) + { + break; + } } if (entry == &CcFreeCacheViewListHead) { @@ -168,12 +168,12 @@ BOOLEAN STDCALL CcPinMappedData ( - IN PFILE_OBJECT FileObject, - IN PLARGE_INTEGER FileOffset, - IN ULONG Length, - IN ULONG Flags, - OUT PVOID * Bcb - ) + IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, + IN ULONG Length, + IN ULONG Flags, + OUT PVOID * Bcb + ) { /* no-op for current implementation. */ return TRUE; @@ -185,13 +185,13 @@ BOOLEAN STDCALL CcPinRead ( - IN PFILE_OBJECT FileObject, - IN PLARGE_INTEGER FileOffset, - IN ULONG Length, - IN ULONG Flags, - OUT PVOID * Bcb, - OUT PVOID * Buffer - ) + IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, + IN ULONG Length, + IN ULONG Flags, + OUT PVOID * Bcb, + OUT PVOID * Buffer + ) { if (CcMapData(FileObject, FileOffset, Length, Flags, Bcb, Buffer)) { @@ -209,14 +209,14 @@ BOOLEAN STDCALL CcPreparePinWrite ( - IN PFILE_OBJECT FileObject, - IN PLARGE_INTEGER FileOffset, - IN ULONG Length, - IN BOOLEAN Zero, - IN ULONG Flags, - OUT PVOID * Bcb, - OUT PVOID * Buffer - ) + IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, + IN ULONG Length, + IN BOOLEAN Zero, + IN ULONG Flags, + OUT PVOID * Bcb, + OUT PVOID * Buffer + ) { /* * FIXME: This is function is similar to CcPinRead, but doesn't @@ -234,7 +234,7 @@ */ VOID STDCALL CcSetDirtyPinnedData (IN PVOID Bcb, - IN PLARGE_INTEGER Lsn) + IN PLARGE_INTEGER Lsn) { // PINTERNAL_BCB iBcb = Bcb; // iBcb->Dirty = TRUE; @@ -271,11 +271,11 @@ VOID STDCALL CcUnpinDataForThread ( - IN PVOID Bcb, - IN ERESOURCE_THREAD ResourceThreadId - ) -{ - UNIMPLEMENTED; + IN PVOID Bcb, + IN ERESOURCE_THREAD ResourceThreadId + ) +{ + UNIMPLEMENTED; } /* @@ -284,8 +284,8 @@ VOID STDCALL CcRepinBcb ( - IN PVOID Bcb - ) + IN PVOID Bcb + ) { // PINTERNAL_BCB iBcb = Bcb; // iBcb->RefCount++; @@ -298,9 +298,9 @@ VOID STDCALL CcUnpinRepinnedBcb ( - IN PVOID Bcb, - IN BOOLEAN WriteThrough, - IN PIO_STATUS_BLOCK IoStatus) + IN PVOID Bcb, + IN BOOLEAN WriteThrough, + IN PIO_STATUS_BLOCK IoStatus) { KEBUGCHECK(0); }

18 years, 9 months

[fireball] 21392: - Fix DbgPrint -> DPRINT1, commented out DbgPrint -> DPRINT - Fix a pair of places where failure results in no debug message - Formatting is still UGLY. To be fixed later.

by aleksey＠studiocerebral.com

Author: fireball Date: Sun Mar 26 00:04:40 2006 New Revision: 21392 URL: http://svn.reactos.ru/svn/reactos?rev=21392&view=rev Log: - Fix DbgPrint -> DPRINT1, commented out DbgPrint -> DPRINT - Fix a pair of places where failure results in no debug message - Formatting is still UGLY. To be fixed later. Modified: trunk/reactos/base/system/winlogon/winlogon.c Modified: trunk/reactos/base/system/winlogon/winlogon.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/system/winlogon/winlog… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.c (original) +++ trunk/reactos/base/system/winlogon/winlogon.c Sun Mar 26 00:04:40 2006 @@ -127,7 +127,7 @@ { Sleep(1000); - //DbgPrint("WL: Attempting to open event \"SvcctrlStartEvent_A3725DX\"\n"); + DPRINT("WL: Attempting to open event \"SvcctrlStartEvent_A3725DX\"\n"); ServicesInitEvent = OpenEvent(EVENT_ALL_ACCESS, //SYNCHRONIZE, FALSE, L"SvcctrlStartEvent_A3725DX"); @@ -139,16 +139,16 @@ if (ServicesInitEvent == NULL) { - DbgPrint("WL: Failed to open event \"SvcctrlStartEvent_A3725DX\"\n"); + DPRINT1("WL: Failed to open event \"SvcctrlStartEvent_A3725DX\"\n"); return FALSE; } /* wait for event signalization */ - //DbgPrint("WL: Waiting forever on event handle: %x\n", ServicesInitEvent); + DPRINT("WL: Waiting forever on event handle: %x\n", ServicesInitEvent); WaitForSingleObject(ServicesInitEvent, INFINITE); - //DbgPrint("WL: Closing event object \"SvcctrlStartEvent_A3725DX\"\n"); + DPRINT("WL: Closing event object \"SvcctrlStartEvent_A3725DX\"\n"); CloseHandle(ServicesInitEvent); - //DbgPrint("WL: StartServices() Done.\n"); + DPRINT("WL: StartServices() Done.\n"); return TRUE; } @@ -170,7 +170,7 @@ if (LsassInitEvent == NULL) { - DbgPrint("WL: Failed to create lsass notification event\n"); + DPRINT1("WL: Failed to create lsass notification event\n"); return(FALSE); } @@ -196,7 +196,7 @@ &ProcessInformation); if (!Result) { - DbgPrint("WL: Failed to execute lsass\n"); + DPRINT1("WL: Failed to execute lsass\n"); return(FALSE); } @@ -292,7 +292,7 @@ VOID STDCALL HandleHotKey(MSG *Msg) { - DbgPrint("HOTKEY: Got hot key (%d)\n", Msg->wParam); + DPRINT1("HOTKEY: Got hot key (%d)\n", Msg->wParam); /* CTRL-ALT-DEL */ if (Msg->wParam == 0) @@ -418,7 +418,7 @@ &WLSession->UserToken); if (!Result) { - DbgPrint ("WL: LogonUserW() failed\n"); + DPRINT1 ("WL: LogonUserW() failed\n"); RtlDestroyEnvironment (lpEnvironment); return FALSE; } @@ -436,7 +436,7 @@ if (!LoadUserProfileW (WLSession->UserToken, &ProfileInfo)) { - DbgPrint ("WL: LoadUserProfileW() failed\n"); + DPRINT1 ("WL: LoadUserProfileW() failed\n"); CloseHandle (WLSession->UserToken); RtlDestroyEnvironment (lpEnvironment); return FALSE; @@ -446,7 +446,7 @@ WLSession->UserToken, TRUE)) { - DbgPrint ("WL: CreateEnvironmentBlock() failed\n"); + DPRINT1("WL: CreateEnvironmentBlock() failed\n"); return FALSE; } @@ -479,7 +479,7 @@ &ProcessInformation); if (!Result) { - DbgPrint ("WL: Failed to execute user shell %s\n", CommandLine); + DPRINT1("WL: Failed to execute user shell %s\n", CommandLine); if (ImpersonateLoggedOnUser(WLSession->UserToken)) { UpdatePerUserSystemParameters(0, FALSE); @@ -549,25 +549,29 @@ if(!RegisterLogonProcess(GetCurrentProcessId(), TRUE)) { - DbgPrint("WL: Could not register logon process\n"); + DPRINT1("WL: Could not register logon process\n"); NtShutdownSystem(ShutdownNoReboot); ExitProcess(0); return 0; } #if START_LSASS - if (StartProcess(L"StartLsass")) - { - if (!StartLsass()) - { - DbgPrint("WL: Failed to start LSASS (0x%X)\n", GetLastError()); - } - } + if (StartProcess(L"StartLsass")) + { + if (!StartLsass()) + { + DPRINT1("WL: Failed to start LSASS (0x%X)\n", GetLastError()); + } + } + else + { + DPRINT1("WL: StartProcess() failed!\n"); + } #endif if(!(WLSession = MsGinaInit())) { - DbgPrint("WL: Failed to initialize msgina.dll\n"); + DPRINT1("WL: Failed to initialize msgina.dll\n"); NtShutdownSystem(ShutdownNoReboot); ExitProcess(0); return 0; @@ -589,7 +593,7 @@ SetThreadDesktop(WLSession->ApplicationDesktop); if(!SwitchDesktop(WLSession->ApplicationDesktop)) { - DbgPrint("WL: Cannot switch to Winlogon desktop (0x%X)\n", GetLastError()); + DPRINT1("WL: Cannot switch to Winlogon desktop (0x%X)\n", GetLastError()); } InitServices(); @@ -597,7 +601,7 @@ /* Check for pending setup */ if (GetSetupType () != 0) { - DPRINT ("Winlogon: CheckForSetup() in setup mode\n"); + DPRINT("Winlogon: CheckForSetup() in setup mode\n"); /* Run setup and reboot when done */ RunSetup(); @@ -608,11 +612,11 @@ } #if SUPPORT_CONSOLESTART - StartConsole = !StartIntoGUI(); -#endif - if(!InitializeSAS(WLSession)) - { - DbgPrint("WL: Failed to initialize SAS\n"); + StartConsole = !StartIntoGUI(); +#endif + if(!InitializeSAS(WLSession)) + { + DPRINT1("WL: Failed to initialize SAS\n"); ExitProcess(2); return 2; } @@ -628,13 +632,13 @@ case STATUS_PORT_CONNECTION_REFUSED: /* FIXME - we don't have the 'SeTcbPrivilege' pivilege, so set it or call LsaAddAccountRights() and try again */ - DbgPrint("WL: LsaRegisterLogonProcess() returned STATUS_PORT_CONNECTION_REFUSED\n"); + DPRINT1("WL: LsaRegisterLogonProcess() returned STATUS_PORT_CONNECTION_REFUSED\n"); break; case STATUS_NAME_TOO_LONG: - DbgPrint("WL: LsaRegisterLogonProcess() returned STATUS_NAME_TOO_LONG\n"); + DPRINT1("WL: LsaRegisterLogonProcess() returned STATUS_NAME_TOO_LONG\n"); break; default: - DbgPrint("WL: Failed to connect to LSASS\n"); + DPRINT1("WL: Failed to connect to LSASS\n"); break; } return(1); @@ -645,7 +649,7 @@ if (!NT_SUCCESS(Status)) { LsaDeregisterLogonProcess(LsaHandle); - DbgPrint("WL: Failed to lookup authentication package\n"); + DPRINT1("WL: Failed to lookup authentication package\n"); return(1); } #endif @@ -734,7 +738,7 @@ } else { - DbgPrint("WL: LogonStatus != LOGON_SHUTDOWN!!!\n"); + DPRINT1("WL: LogonStatus != LOGON_SHUTDOWN!!!\n"); ExitProcess(0); } #if SUPPORT_CONSOLESTART @@ -757,7 +761,7 @@ { if(pMessage) { - DbgPrint("WL-Status: %ws\n", pMessage); + DPRINT1("WL-Status: %ws\n", pMessage); } return TRUE; } @@ -779,8 +783,12 @@ { if(!StartServices()) { - DbgPrint("WL: Failed to start Services (0x%X)\n", GetLastError()); - } + DPRINT1("WL: Failed to start Services (0x%X)\n", GetLastError()); + } + } + else + { + DPRINT1("WL: StartProcess() failed!\n"); } return TRUE; @@ -856,7 +864,7 @@ /* the user doesn't want to login, instead pressed cancel we should display the window again so one can logon again */ /* FIXME - disconnect any connections in case we did a remote logon */ - DbgPrint("WL: DoLogin failed\n"); + DPRINT1("WL: DoLogin failed\n"); WlxAction = WLX_SAS_ACTION_NONE; } if(WlxAction == WLX_SAS_ACTION_NONE)

18 years, 9 months

[peterw] 21391: [AUDIT] reactos\base\system\expand (Unlocked): - Clean.

by aleksey＠studiocerebral.com

Author: peterw Date: Sat Mar 25 23:39:54 2006 New Revision: 21391 URL: http://svn.reactos.ru/svn/reactos?rev=21391&view=rev Log: [AUDIT] reactos\base\system\expand (Unlocked): - Clean. Modified: trunk/reactos/base/system/expand/De.rc (props changed) trunk/reactos/base/system/expand/En.rc (props changed) trunk/reactos/base/system/expand/Fr.rc (props changed) trunk/reactos/base/system/expand/Hu.rc (props changed) trunk/reactos/base/system/expand/Ja.rc (props changed) trunk/reactos/base/system/expand/Sv.rc (props changed) trunk/reactos/base/system/expand/expand.c (props changed) trunk/reactos/base/system/expand/expand.rc (props changed) trunk/reactos/base/system/expand/resource.h (props changed) Propchange: trunk/reactos/base/system/expand/De.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/system/expand/En.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/system/expand/Fr.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/system/expand/Hu.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/system/expand/Ja.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/system/expand/Sv.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/system/expand/expand.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/system/expand/expand.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/system/expand/resource.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

18 years, 9 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2006