Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sginsberg] 68891: - You know what, NT_ASSERT is awesome.
by sginsberg＠svn.reactos.org 01 Sep '15

01 Sep '15

Author: sginsberg Date: Tue Sep 1 09:25:18 2015 New Revision: 68891 URL: http://svn.reactos.org/svn/reactos?rev=68891&view=rev Log: - You know what, NT_ASSERT is awesome. Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/ntoskrnl.… ============================================================================== --- trunk/reactos/ntoskrnl/include/ntoskrnl.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/ntoskrnl.h [iso-8859-1] Tue Sep 1 09:25:18 2015 @@ -95,6 +95,12 @@ extern UCHAR _KeNumberProcessors; #define ExRaiseStatus RtlRaiseStatus +// +// NT_ASSERT Best Assert +// +#undef ASSERT +#define ASSERT NT_ASSERT + /* Internal Headers */ #include "internal/ntoskrnl.h" #include "config.h"

1 0

[sginsberg] 68890: - Missed these. Goodbye NT_ASSERT.
by sginsberg＠svn.reactos.org 01 Sep '15

01 Sep '15

Author: sginsberg Date: Tue Sep 1 08:41:39 2015 New Revision: 68890 URL: http://svn.reactos.org/svn/reactos?rev=68890&view=rev Log: - Missed these. Goodbye NT_ASSERT. Modified: trunk/reactos/ntoskrnl/mm/section.c trunk/reactos/ntoskrnl/se/token.c Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Tue Sep 1 08:41:39 2015 @@ -4190,7 +4190,7 @@ (MemoryArea->Type != MEMORY_AREA_CACHE)) || MemoryArea->DeleteInProgress) { - if (MemoryArea) NT_ASSERT(MemoryArea->Type != MEMORY_AREA_OWNED_BY_ARM3); + if (MemoryArea) ASSERT(MemoryArea->Type != MEMORY_AREA_OWNED_BY_ARM3); MmUnlockAddressSpace(AddressSpace); return STATUS_NOT_MAPPED_VIEW; } @@ -4237,7 +4237,7 @@ { DPRINT1("MmUnmapViewOfSegment failed for %p (Process %p) with %lx\n", SBaseAddress, Process, Status); - NT_ASSERT(NT_SUCCESS(Status)); + ASSERT(NT_SUCCESS(Status)); } } } @@ -4248,7 +4248,7 @@ { DPRINT1("MmUnmapViewOfSegment failed for %p (Process %p) with %lx\n", BaseAddress, Process, Status); - NT_ASSERT(NT_SUCCESS(Status)); + ASSERT(NT_SUCCESS(Status)); } } @@ -4526,14 +4526,14 @@ if (((ImageBase + ImageSize) > (ULONG_PTR)MmHighestUserAddress) || ((ImageBase + ImageSize) < ImageSize)) { - NT_ASSERT(*BaseAddress == NULL); + ASSERT(*BaseAddress == NULL); ImageBase = ALIGN_DOWN_BY((ULONG_PTR)MmHighestUserAddress - ImageSize, MM_VIRTMEM_GRANULARITY); NotAtBase = TRUE; } else if (ImageBase != ALIGN_DOWN_BY(ImageBase, MM_VIRTMEM_GRANULARITY)) { - NT_ASSERT(*BaseAddress == NULL); + ASSERT(*BaseAddress == NULL); ImageBase = ALIGN_DOWN_BY(ImageBase, MM_VIRTMEM_GRANULARITY); NotAtBase = TRUE; } @@ -4651,7 +4651,7 @@ } MmUnlockAddressSpace(AddressSpace); - NT_ASSERT(*BaseAddress == ALIGN_DOWN_POINTER_BY(*BaseAddress, MM_VIRTMEM_GRANULARITY)); + ASSERT(*BaseAddress == ALIGN_DOWN_POINTER_BY(*BaseAddress, MM_VIRTMEM_GRANULARITY)); if (NotAtBase) Status = STATUS_IMAGE_NOT_AT_BASE; Modified: trunk/reactos/ntoskrnl/se/token.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/token.c?rev=68… ============================================================================== --- trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] Tue Sep 1 08:41:39 2015 @@ -123,7 +123,7 @@ _In_ ULONG Index) { ULONG TokenFlag; - NT_ASSERT(Index < Token->PrivilegeCount); + ASSERT(Index < Token->PrivilegeCount); /* The high part of all values we are interested in is 0 */ if (Token->Privileges[Index].Luid.HighPart != 0) @@ -189,7 +189,7 @@ _In_ ULONG Index) { ULONG MoveCount; - NT_ASSERT(Index < Token->PrivilegeCount); + ASSERT(Index < Token->PrivilegeCount); /* Calculate the number of trailing privileges */ MoveCount = Token->PrivilegeCount - Index - 1;

1 0

[jimtabor] 68889: [Win32k] - Fix more ATI issues, pass more related tests. See CORE-6551.
by jimtabor＠svn.reactos.org 01 Sep '15

01 Sep '15

Author: jimtabor Date: Tue Sep 1 01:48:37 2015 New Revision: 68889 URL: http://svn.reactos.org/svn/reactos?rev=68889&view=rev Log: [Win32k] - Fix more ATI issues, pass more related tests. See CORE-6551. Modified: trunk/reactos/win32ss/user/ntuser/input.c trunk/reactos/win32ss/user/ntuser/msgqueue.c Modified: trunk/reactos/win32ss/user/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/input.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/input.c [iso-8859-1] Tue Sep 1 01:48:37 2015 @@ -492,16 +492,6 @@ ptiTo->MessageQueue->iCursorLevel -= ptiFrom->iCursorLevel; - // FIXME: conditions? - if (ptiTo->MessageQueue == gpqForeground) - { - ERR("ptiTo is Foreground\n"); - } - else - { - ERR("ptiTo NOT Foreground\n"); - } - if (ptiFrom->MessageQueue == gpqForeground) { ERR("ptiFrom is Foreground\n"); @@ -517,6 +507,10 @@ else { ERR("ptiFrom NOT Foreground\n"); + if ( ptiTo->MessageQueue->spwndActive == 0 ) + ptiTo->MessageQueue->spwndActive = ptiFrom->MessageQueue->spwndActive; + if ( ptiTo->MessageQueue->spwndFocus == 0 ) + ptiTo->MessageQueue->spwndFocus = ptiFrom->MessageQueue->spwndFocus; } CurIcon = ptiFrom->MessageQueue->CursorObject; @@ -584,6 +578,9 @@ if (ptiTo->MessageQueue == ptiFrom->MessageQueue) { + PWND spwndActive = ptiTo->MessageQueue->spwndActive; + PWND spwndFocus = ptiTo->MessageQueue->spwndFocus; + if (gptiForeground == ptiFrom) { ERR("ptiTo is now pti FG.\n"); @@ -598,6 +595,22 @@ ptiFrom->MessageQueue = MsqCreateMessageQueue(ptiFrom); + if (spwndActive) + { + if (spwndActive->head.pti == ptiFrom) + { + ptiFrom->MessageQueue->spwndActive = spwndActive; + ptiTo->MessageQueue->spwndActive = 0; + } + } + if (spwndFocus) + { + if (spwndFocus->head.pti == ptiFrom) + { + ptiFrom->MessageQueue->spwndFocus = spwndFocus; + ptiTo->MessageQueue->spwndFocus = 0; + } + } ptiTo->MessageQueue->iCursorLevel -= ptiFrom->iCursorLevel; } else @@ -610,6 +623,8 @@ ATM which one? */ RtlCopyMemory(ptiTo->MessageQueue->afKeyState, gafAsyncKeyState, sizeof(gafAsyncKeyState)); + + ptiTo->MessageQueue->msgDblClk.message = 0; /* Generate mouse move message */ msg.message = WM_MOUSEMOVE; Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] Tue Sep 1 01:48:37 2015 @@ -639,7 +639,13 @@ return; } - MessageQueue->ptiMouse = pti; + // Check to see if this is attached. + if ( pti != MessageQueue->ptiMouse && + MessageQueue->cThreads > 1 ) + { + // Set the send pti to the message queue mouse pti. + pti = MessageQueue->ptiMouse; + } if (Msg->message == WM_MOUSEMOVE) { @@ -1252,6 +1258,7 @@ } Entry = Entry->Flink; } + break; } if (WaitStatus == STATUS_USER_APC) break; @@ -1413,7 +1420,7 @@ } } -BOOL co_IntProcessMouseMessage(MSG* msg, BOOL* RemoveMessages, UINT first, UINT last) +BOOL co_IntProcessMouseMessage(MSG* msg, BOOL* RemoveMessages, BOOL* NotForUs, UINT first, UINT last) { MSG clk_msg; POINT pt; @@ -1454,11 +1461,21 @@ TRACE("Got mouse message for %p, hittest: 0x%x\n", msg->hwnd, hittest); // Null window or not the same "Hardware" message queue. - if (pwndMsg == NULL || pwndMsg->head.pti->MessageQueue != pti->MessageQueue) + if (pwndMsg == NULL || pwndMsg->head.pti->MessageQueue != MessageQueue) { // Crossing a boundary, so set cursor. See default message queue cursor. UserSetCursor(SYSTEMCUR(ARROW), FALSE); /* Remove and ignore the message */ + *RemoveMessages = TRUE; + return FALSE; + } + + // Check to see if this is attached, + if ( pwndMsg->head.pti != pti && // window thread is not current, + MessageQueue->cThreads > 1 ) // and is attached... + { + // This is not for us and we should leave so the other thread can check for messages!!! + *NotForUs = TRUE; *RemoveMessages = TRUE; return FALSE; } @@ -1795,11 +1812,11 @@ return Ret; } -BOOL co_IntProcessHardwareMessage(MSG* Msg, BOOL* RemoveMessages, UINT first, UINT last) +BOOL co_IntProcessHardwareMessage(MSG* Msg, BOOL* RemoveMessages, BOOL* NotForUs, UINT first, UINT last) { if ( IS_MOUSE_MESSAGE(Msg->message)) { - return co_IntProcessMouseMessage(Msg, RemoveMessages, first, last); + return co_IntProcessMouseMessage(Msg, RemoveMessages, NotForUs, first, last); } else if ( IS_KBD_MESSAGE(Msg->message)) { @@ -1835,7 +1852,7 @@ IN UINT QSflags, OUT MSG* pMsg) { - BOOL AcceptMessage; + BOOL AcceptMessage, NotForUs; PUSER_MESSAGE CurrentMessage; PLIST_ENTRY ListHead; MSG msg; @@ -1858,7 +1875,7 @@ if (MessageQueue->ptiSysLock != pti) { - ERR("MsqPeekHardwareMessage: Thread Q is locked to another pti!\n"); + ERR("Thread Q is locked to ptiSysLock 0x%p pti 0x%p\n",MessageQueue->ptiSysLock,pti); return FALSE; } @@ -1891,8 +1908,10 @@ msg = CurrentMessage->Msg; QS_Flags = CurrentMessage->QS_Flags; + NotForUs = FALSE; + UpdateKeyStateFromMsg(MessageQueue, &msg); - AcceptMessage = co_IntProcessHardwareMessage(&msg, &Remove, MsgFilterLow, MsgFilterHigh); + AcceptMessage = co_IntProcessHardwareMessage(&msg, &Remove, &NotForUs, MsgFilterLow, MsgFilterHigh); if (Remove) { @@ -1905,6 +1924,12 @@ } MessageQueue->idSysPeek = idSave; + + if (NotForUs) + { + Ret = FALSE; + break; + } if (AcceptMessage) {

1 0

[sginsberg] 68888: - Remove all NT_ASSERT from the kernel and replace with good old ASSERT, for ease of debugging, especially for tests run on the build servers. There is no need to use NT_ASSERT i...
by sginsberg＠svn.reactos.org 01 Sep '15

01 Sep '15

Author: sginsberg Date: Tue Sep 1 01:45:59 2015 New Revision: 68888 URL: http://svn.reactos.org/svn/reactos?rev=68888&view=rev Log: - Remove all NT_ASSERT from the kernel and replace with good old ASSERT, for ease of debugging, especially for tests run on the build servers. There is no need to use NT_ASSERT in the kernel. - The fish is long gone. Modified: trunk/reactos/ntoskrnl/cc/copy.c trunk/reactos/ntoskrnl/config/cmapi.c trunk/reactos/ntoskrnl/config/cmparse.c trunk/reactos/ntoskrnl/ex/handle.c trunk/reactos/ntoskrnl/ex/win32k.c trunk/reactos/ntoskrnl/io/iomgr/deviface.c trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/ke/arm/usercall.c trunk/reactos/ntoskrnl/ke/i386/traphdlr.c trunk/reactos/ntoskrnl/lpc/send.c trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c trunk/reactos/ntoskrnl/mm/ARM3/section.c trunk/reactos/ntoskrnl/mm/ARM3/session.c trunk/reactos/ntoskrnl/mm/ARM3/virtual.c trunk/reactos/ntoskrnl/mm/arm/page.c trunk/reactos/ntoskrnl/ob/oblife.c trunk/reactos/ntoskrnl/se/accesschk.c trunk/reactos/ntoskrnl/se/acl.c trunk/reactos/ntoskrnl/se/audit.c trunk/reactos/ntoskrnl/se/priv.c trunk/reactos/ntoskrnl/se/sd.c trunk/reactos/ntoskrnl/se/sid.c trunk/reactos/ntoskrnl/wmi/wmidrv.c Modified: trunk/reactos/ntoskrnl/cc/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/copy.c?rev=688… ============================================================================== --- trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] Tue Sep 1 01:45:59 2015 @@ -453,7 +453,7 @@ TRUE, Buffer, IoStatus); - NT_ASSERT(Success == TRUE); + ASSERT(Success == TRUE); } /* @@ -479,7 +479,7 @@ Length, TRUE, Buffer); - NT_ASSERT(Success == TRUE); + ASSERT(Success == TRUE); } /* Modified: trunk/reactos/ntoskrnl/config/cmapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmapi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmapi.c [iso-8859-1] Tue Sep 1 01:45:59 2015 @@ -606,7 +606,7 @@ } /* Copy the class data */ - NT_ASSERT(Length >= Offset); + ASSERT(Length >= Offset); RtlCopyMemory(Info->KeyFullInformation.Class, ClassData, min(Node->ClassLength, Length - Offset)); Modified: trunk/reactos/ntoskrnl/config/cmparse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmparse.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmparse.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmparse.c [iso-8859-1] Tue Sep 1 01:45:59 2015 @@ -24,7 +24,7 @@ { BOOLEAN NameValid = TRUE; - NT_ASSERT(RemainingName->Length % sizeof(WCHAR) == 0); + ASSERT(RemainingName->Length % sizeof(WCHAR) == 0); /* Check if there's nothing left in the name */ if (!(RemainingName->Buffer) || Modified: trunk/reactos/ntoskrnl/ex/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/handle.c?rev=6… ============================================================================== --- trunk/reactos/ntoskrnl/ex/handle.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/handle.c [iso-8859-1] Tue Sep 1 01:45:59 2015 @@ -85,7 +85,7 @@ default: - NT_ASSERT(FALSE); + ASSERT(FALSE); Entry = NULL; } Modified: trunk/reactos/ntoskrnl/ex/win32k.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/win32k.c?rev=6… ============================================================================== --- trunk/reactos/ntoskrnl/ex/win32k.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/win32k.c [iso-8859-1] Tue Sep 1 01:45:59 2015 @@ -77,7 +77,7 @@ if (SessionEntry == NULL) { /* The requested session does not even exist! */ - NT_ASSERT(FALSE); + ASSERT(FALSE); return STATUS_NOT_FOUND; } @@ -92,7 +92,7 @@ /* Cleanup and return */ MmQuitNextSession(SessionEntry); - NT_ASSERT(FALSE); + ASSERT(FALSE); return Status; } } Modified: trunk/reactos/ntoskrnl/io/iomgr/deviface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/deviface… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/deviface.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/deviface.c [iso-8859-1] Tue Sep 1 01:45:59 2015 @@ -876,7 +876,7 @@ } /* Add final NULL to ReturnBuffer */ - NT_ASSERT(ReturnBuffer.Length <= ReturnBuffer.MaximumLength); + ASSERT(ReturnBuffer.Length <= ReturnBuffer.MaximumLength); if (ReturnBuffer.Length >= ReturnBuffer.MaximumLength) { PWSTR NewBuffer; Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Tue Sep 1 01:45:59 2015 @@ -934,7 +934,7 @@ NextEntry = NextEntry->Flink; } - NT_ASSERT(NextEntry != &PsLoadedModuleList); + ASSERT(NextEntry != &PsLoadedModuleList); /* * Initialize the driver @@ -1374,7 +1374,7 @@ /* Set the unload invoked flag and call the unload routine */ DriverObject->Flags |= DRVO_UNLOAD_INVOKED; Status = IopLoadUnloadDriver(NULL, &DriverObject); - NT_ASSERT(Status == STATUS_SUCCESS); + ASSERT(Status == STATUS_SUCCESS); /* Mark the driver object temporary, so it could be deleted later */ ObMakeTemporaryObject(DriverObject); @@ -1874,7 +1874,7 @@ { PLOAD_UNLOAD_PARAMS LoadParams = Parameter; - NT_ASSERT(PsGetCurrentProcess() == PsInitialSystemProcess); + ASSERT(PsGetCurrentProcess() == PsInitialSystemProcess); LoadParams->Status = IopLoadUnloadDriver(LoadParams->RegistryPath, &LoadParams->DriverObject); KeSetEvent(&LoadParams->Event, 0, FALSE); Modified: trunk/reactos/ntoskrnl/ke/arm/usercall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/usercall.c… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/usercall.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/usercall.c [iso-8859-1] Tue Sep 1 01:45:59 2015 @@ -312,7 +312,7 @@ OUT PVOID *Result, OUT PULONG ResultLength) { - NT_ASSERT(FALSE); + ASSERT(FALSE); return STATUS_NOT_IMPLEMENTED; } @@ -322,7 +322,7 @@ IN PVOID *OutputBuffer, IN PULONG OutputLength) { - NT_ASSERT(FALSE); + ASSERT(FALSE); return STATUS_NOT_IMPLEMENTED; } @@ -333,7 +333,7 @@ _In_ ULONG ResultLength, _In_ NTSTATUS CallbackStatus) { - NT_ASSERT(FALSE); + ASSERT(FALSE); return STATUS_NOT_IMPLEMENTED; } Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/traphdlr.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] Tue Sep 1 01:45:59 2015 @@ -1537,7 +1537,7 @@ Thread = KeGetCurrentThread(); Thread->TrapFrame = TrapFrame; Thread->PreviousMode = KiUserTrap(TrapFrame); - NT_ASSERT(Thread->PreviousMode != KernelMode); + ASSERT(Thread->PreviousMode != KernelMode); /* Pass the register parameters to NtCallbackReturn. Result pointer is in ecx, result length in edx, status in eax */ Modified: trunk/reactos/ntoskrnl/lpc/send.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/send.c?rev=68… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/send.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/lpc/send.c [iso-8859-1] Tue Sep 1 01:45:59 2015 @@ -793,7 +793,7 @@ MessageType = LocalLpcRequest.u2.s2.Type; /* Due to the above probe, we know that TotalLength is positive */ - NT_ASSERT(LocalLpcRequest.u1.s1.TotalLength >= 0); + ASSERT(LocalLpcRequest.u1.s1.TotalLength >= 0); /* Validate the length */ if ((((ULONG)(USHORT)LocalLpcRequest.u1.s1.DataLength + sizeof(PORT_MESSAGE)) > Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pagfault.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] Tue Sep 1 01:45:59 2015 @@ -189,7 +189,7 @@ /* Check if this is a guard page */ if ((ProtectionMask & MM_PROTECT_SPECIAL) == MM_GUARDPAGE) { - NT_ASSERT(ProtectionMask != MM_DECOMMIT); + ASSERT(ProtectionMask != MM_DECOMMIT); /* Attached processes can't expand their stack */ if (KeIsAttachedProcess()) return STATUS_ACCESS_VIOLATION; @@ -200,7 +200,7 @@ /* Remove the guard page bit, and return a guard page violation */ TempPte.u.Soft.Protection = ProtectionMask & ~MM_GUARDPAGE; - NT_ASSERT(TempPte.u.Long != 0); + ASSERT(TempPte.u.Long != 0); MI_WRITE_INVALID_PTE(PointerPte, TempPte); return STATUS_GUARD_PAGE_VIOLATION; } @@ -1080,7 +1080,7 @@ } /* There is no such thing as a decommitted prototype PTE */ - NT_ASSERT(TempPte.u.Long != MmDecommittedPte.u.Long); + ASSERT(TempPte.u.Long != MmDecommittedPte.u.Long); /* Check for access rights on the PTE proper */ PteContents = *PointerPte; @@ -1420,7 +1420,7 @@ /* Resolve */ Status = MiResolveTransitionFault(Address, PointerPte, Process, LockIrql, &InPageBlock); - NT_ASSERT(NT_SUCCESS(Status)); + ASSERT(NT_SUCCESS(Status)); /* And now release the lock and leave*/ KeReleaseQueuedSpinLock(LockQueuePfnLock, LockIrql); @@ -2069,7 +2069,7 @@ if ((ProtectionCode & MM_PROTECT_SPECIAL) == MM_GUARDPAGE) { /* The VAD protection cannot be MM_DECOMMIT! */ - NT_ASSERT(ProtectionCode != MM_DECOMMIT); + ASSERT(ProtectionCode != MM_DECOMMIT); /* Remove the bit */ TempPte.u.Soft.Protection = ProtectionCode & ~MM_GUARDPAGE; @@ -2185,7 +2185,7 @@ /* Write the prototype PTE */ TempPte = PrototypePte; TempPte.u.Soft.Protection = ProtectionCode; - NT_ASSERT(TempPte.u.Long != 0); + ASSERT(TempPte.u.Long != 0); MI_WRITE_INVALID_PTE(PointerPte, TempPte); } else Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Tue Sep 1 01:45:59 2015 @@ -1121,7 +1121,7 @@ Status = MiSessionCommitPageTables(Base, (PVOID)((ULONG_PTR)Base + Buckets * MI_SYSTEM_VIEW_BUCKET_SIZE)); - NT_ASSERT(NT_SUCCESS(Status)); + ASSERT(NT_SUCCESS(Status)); } /* Create the actual prototype PTEs for this mapping */ Modified: trunk/reactos/ntoskrnl/mm/ARM3/session.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/session.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/session.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/session.c [iso-8859-1] Tue Sep 1 01:45:59 2015 @@ -930,7 +930,7 @@ /* The parameter is the actual process! */ EntryProcess = SessionEntry; - NT_ASSERT(EntryProcess != NULL); + ASSERT(EntryProcess != NULL); /* Sanity checks */ ASSERT(KeGetCurrentIrql() <= APC_LEVEL); @@ -998,7 +998,7 @@ /* The parameter is the actual process! */ EntryProcess = SessionEntry; - NT_ASSERT(EntryProcess != NULL); + ASSERT(EntryProcess != NULL); /* Sanity checks */ ASSERT(KeGetCurrentIrql() <= APC_LEVEL); @@ -1039,7 +1039,7 @@ /* The parameter is the actual process! */ EntryProcess = SessionEntry; - NT_ASSERT(EntryProcess != NULL); + ASSERT(EntryProcess != NULL); /* Sanity checks */ ASSERT(KeGetCurrentIrql () <= APC_LEVEL); Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Tue Sep 1 01:45:59 2015 @@ -7,7 +7,6 @@ */ /* INCLUDES *******************************************************************/ -/* So long, and Thanks for All the Fish */ #include <ntoskrnl.h> #define NDEBUG @@ -431,7 +430,7 @@ /* Make the page free. For prototypes, it will be made free when deleting the section object */ if (Pfn1->u2.ShareCount == 0) { - NT_ASSERT(Pfn1->u3.e2.ReferenceCount == 0); + ASSERT(Pfn1->u3.e2.ReferenceCount == 0); /* And it should be in standby or modified list */ ASSERT((Pfn1->u3.e1.PageLocation == ModifiedPageList) || (Pfn1->u3.e1.PageLocation == StandbyPageList)); @@ -1887,7 +1886,7 @@ { DPRINT1("MmQuerySectionView failed. MemoryArea=%p (%p-%p), BaseAddress=%p\n", MemoryArea, MA_GetStartingAddress(MemoryArea), MA_GetEndingAddress(MemoryArea), BaseAddress); - NT_ASSERT(NT_SUCCESS(Status)); + ASSERT(NT_SUCCESS(Status)); } } else @@ -4856,7 +4855,7 @@ // TempPte.u.Long = 0; TempPte.u.Soft.Protection = ProtectionMask; - NT_ASSERT(TempPte.u.Long != 0); + ASSERT(TempPte.u.Long != 0); // // Get the PTE, PDE and the last PTE for this address range Modified: trunk/reactos/ntoskrnl/mm/arm/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/arm/page.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/arm/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/arm/page.c [iso-8859-1] Tue Sep 1 01:45:59 2015 @@ -301,14 +301,14 @@ PVOID Address, SWAPENTRY* SwapEntry) { - NT_ASSERT(FALSE); + ASSERT(FALSE); } BOOLEAN NTAPI MmIsDisabledPage(PEPROCESS Process, PVOID Address) { - NT_ASSERT(FALSE); + ASSERT(FALSE); return FALSE; } @@ -317,6 +317,6 @@ INIT_FUNCTION MiInitializeSessionSpaceLayout(VOID) { - NT_ASSERT(FALSE); -} - + ASSERT(FALSE); +} + Modified: trunk/reactos/ntoskrnl/ob/oblife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblife.c?rev=6… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblife.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/oblife.c [iso-8859-1] Tue Sep 1 01:45:59 2015 @@ -1245,7 +1245,7 @@ /* Set the index and the entry into the object type array */ LocalObjectType->Index = ObpTypeObjectType->TotalNumberOfObjects; - NT_ASSERT(LocalObjectType->Index != 0); + ASSERT(LocalObjectType->Index != 0); if (LocalObjectType->Index < 32) { Modified: trunk/reactos/ntoskrnl/se/accesschk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/accesschk.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/se/accesschk.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/accesschk.c [iso-8859-1] Tue Sep 1 01:45:59 2015 @@ -465,7 +465,7 @@ PAGED_CODE(); - NT_ASSERT(AccessMode != KernelMode); + ASSERT(AccessMode != KernelMode); if (SecurityDescriptor == NULL) return FALSE; Modified: trunk/reactos/ntoskrnl/se/acl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/acl.c?rev=6888… ============================================================================== --- trunk/reactos/ntoskrnl/se/acl.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/acl.c [iso-8859-1] Tue Sep 1 01:45:59 2015 @@ -439,10 +439,10 @@ PSID Sid; BOOLEAN WriteTwoAces; - NT_ASSERT(RtlValidAcl(AclSource)); - NT_ASSERT(AclSource->AclSize % sizeof(ULONG) == 0); - NT_ASSERT(AclSource->Sbz1 == 0); - NT_ASSERT(AclSource->Sbz2 == 0); + ASSERT(RtlValidAcl(AclSource)); + ASSERT(AclSource->AclSize % sizeof(ULONG) == 0); + ASSERT(AclSource->Sbz1 == 0); + ASSERT(AclSource->Sbz2 == 0); Written = 0; if (*AclLength >= Written + sizeof(ACL)) @@ -457,18 +457,18 @@ CurrentSource = (PUCHAR)(AclSource + 1); for (i = 0; i < AclSource->AceCount; i++) { - NT_ASSERT((ULONG_PTR)CurrentDest % sizeof(ULONG) == 0); - NT_ASSERT((ULONG_PTR)CurrentSource % sizeof(ULONG) == 0); + ASSERT((ULONG_PTR)CurrentDest % sizeof(ULONG) == 0); + ASSERT((ULONG_PTR)CurrentSource % sizeof(ULONG) == 0); AceDest = (PACCESS_ALLOWED_ACE)CurrentDest; AceSource = (PACCESS_ALLOWED_ACE)CurrentSource; /* These all have the same structure */ - NT_ASSERT(AceSource->Header.AceType == ACCESS_ALLOWED_ACE_TYPE || + ASSERT(AceSource->Header.AceType == ACCESS_ALLOWED_ACE_TYPE || AceSource->Header.AceType == ACCESS_DENIED_ACE_TYPE || AceSource->Header.AceType == SYSTEM_AUDIT_ACE_TYPE); - NT_ASSERT(AceSource->Header.AceSize % sizeof(ULONG) == 0); - NT_ASSERT(AceSource->Header.AceSize >= sizeof(*AceSource)); + ASSERT(AceSource->Header.AceSize % sizeof(ULONG) == 0); + ASSERT(AceSource->Header.AceSize >= sizeof(*AceSource)); if (!SepShouldPropagateAce(AceSource->Header.AceFlags, &AceFlags, IsInherited, @@ -482,7 +482,7 @@ AceSize = AceSource->Header.AceSize; Mask = AceSource->Mask; Sid = (PSID)&AceSource->SidStart; - NT_ASSERT(AceSize >= FIELD_OFFSET(ACCESS_ALLOWED_ACE, SidStart) + RtlLengthSid(Sid)); + ASSERT(AceSize >= FIELD_OFFSET(ACCESS_ALLOWED_ACE, SidStart) + RtlLengthSid(Sid)); WriteTwoAces = FALSE; /* Map effective ACE to specific rights */ @@ -598,7 +598,7 @@ *IsInherited, IsDirectoryObject, GenericMapping); - NT_ASSERT(Status == STATUS_BUFFER_TOO_SMALL); + ASSERT(Status == STATUS_BUFFER_TOO_SMALL); /* Use the parent ACL only if it's not empty */ if (*AclLength != sizeof(ACL)) @@ -633,7 +633,7 @@ *IsInherited, IsDirectoryObject, GenericMapping); - NT_ASSERT(Status == STATUS_BUFFER_TOO_SMALL); + ASSERT(Status == STATUS_BUFFER_TOO_SMALL); } return Acl; } Modified: trunk/reactos/ntoskrnl/se/audit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/audit.c?rev=68… ============================================================================== --- trunk/reactos/ntoskrnl/se/audit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/audit.c [iso-8859-1] Tue Sep 1 01:45:59 2015 @@ -644,7 +644,7 @@ _SEH2_TRY { /* Loop all result entries (only 1 when no list was requested) */ - NT_ASSERT(UseResultList || (ResultListLength == 1)); + ASSERT(UseResultList || (ResultListLength == 1)); for (i = 0; i < ResultListLength; i++) { AccessStatusList[i] = SafeAccessStatusList[i]; Modified: trunk/reactos/ntoskrnl/se/priv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/priv.c?rev=688… ============================================================================== --- trunk/reactos/ntoskrnl/se/priv.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/priv.c [iso-8859-1] Tue Sep 1 01:45:59 2015 @@ -129,7 +129,7 @@ SepReleaseTokenLock(Token); /* When we reached this point, we did not find all privileges */ - NT_ASSERT(Required > 0); + ASSERT(Required > 0); return FALSE; } Modified: trunk/reactos/ntoskrnl/se/sd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/sd.c?rev=68888… ============================================================================== --- trunk/reactos/ntoskrnl/se/sd.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/sd.c [iso-8859-1] Tue Sep 1 01:45:59 2015 @@ -864,7 +864,7 @@ Control |= (ObjectSd->Control & SE_OWNER_DEFAULTED); } OwnerLength = Owner ? RtlLengthSid(Owner) : 0; - NT_ASSERT(OwnerLength % sizeof(ULONG) == 0); + ASSERT(OwnerLength % sizeof(ULONG) == 0); /* Get group and group size */ if (SecurityInformation & GROUP_SECURITY_INFORMATION) @@ -878,7 +878,7 @@ Control |= (ObjectSd->Control & SE_GROUP_DEFAULTED); } GroupLength = Group ? RtlLengthSid(Group) : 0; - NT_ASSERT(GroupLength % sizeof(ULONG) == 0); + ASSERT(GroupLength % sizeof(ULONG) == 0); /* Get DACL and DACL size */ if (SecurityInformation & DACL_SECURITY_INFORMATION) @@ -1211,7 +1211,7 @@ } } OwnerLength = RtlLengthSid(Owner); - NT_ASSERT(OwnerLength % sizeof(ULONG) == 0); + ASSERT(OwnerLength % sizeof(ULONG) == 0); /* Inherit the Group SID */ if (ExplicitDescriptor != NULL) @@ -1248,7 +1248,7 @@ return STATUS_INVALID_PRIMARY_GROUP; } GroupLength = RtlLengthSid(Group); - NT_ASSERT(GroupLength % sizeof(ULONG) == 0); + ASSERT(GroupLength % sizeof(ULONG) == 0); /* Inherit the DACL */ DaclLength = 0; @@ -1283,7 +1283,7 @@ GenericMapping); if (DaclPresent) Control |= SE_DACL_PRESENT; - NT_ASSERT(DaclLength % sizeof(ULONG) == 0); + ASSERT(DaclLength % sizeof(ULONG) == 0); /* Inherit the SACL */ SaclLength = 0; @@ -1318,7 +1318,7 @@ GenericMapping); if (SaclPresent) Control |= SE_SACL_PRESENT; - NT_ASSERT(SaclLength % sizeof(ULONG) == 0); + ASSERT(SaclLength % sizeof(ULONG) == 0); /* Allocate and initialize the new security descriptor */ Length = sizeof(SECURITY_DESCRIPTOR_RELATIVE) + @@ -1356,7 +1356,7 @@ SaclIsInherited, IsDirectoryObject, GenericMapping); - NT_ASSERT(Status == STATUS_SUCCESS); + ASSERT(Status == STATUS_SUCCESS); Descriptor->Sacl = Current; Current += SaclLength; } @@ -1371,7 +1371,7 @@ DaclIsInherited, IsDirectoryObject, GenericMapping); - NT_ASSERT(Status == STATUS_SUCCESS); + ASSERT(Status == STATUS_SUCCESS); Descriptor->Dacl = Current; Current += DaclLength; } Modified: trunk/reactos/ntoskrnl/se/sid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/sid.c?rev=6888… ============================================================================== --- trunk/reactos/ntoskrnl/se/sid.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/sid.c [iso-8859-1] Tue Sep 1 01:45:59 2015 @@ -499,8 +499,8 @@ RtlCopyMemory(CurrentDest, SrcSidAndAttributes[i].Sid, SidLength); /* Sanity checks */ - NT_ASSERT(RtlLengthSid(SidAndAttributes[i].Sid) == SidLength); - NT_ASSERT(RtlValidSid(SidAndAttributes[i].Sid)); + ASSERT(RtlLengthSid(SidAndAttributes[i].Sid) == SidLength); + ASSERT(RtlValidSid(SidAndAttributes[i].Sid)); /* Update the current destination address */ CurrentDest += ALIGN_UP_BY(SidLength, sizeof(ULONG)); Modified: trunk/reactos/ntoskrnl/wmi/wmidrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/wmi/wmidrv.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/wmi/wmidrv.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/wmi/wmidrv.c [iso-8859-1] Tue Sep 1 01:45:59 2015 @@ -125,7 +125,7 @@ _Out_ PWSTR ObjectNameBuffer, _In_ KPROCESSOR_MODE AccessMode) { - NT_ASSERT(AccessMode != KernelMode); + ASSERT(AccessMode != KernelMode); _SEH2_TRY {

1 0

[sginsberg] 68887: - Fix link fix build.
by sginsberg＠svn.reactos.org 01 Sep '15

01 Sep '15

Author: sginsberg Date: Tue Sep 1 00:38:40 2015 New Revision: 68887 URL: http://svn.reactos.org/svn/reactos?rev=68887&view=rev Log: - Fix link fix build. Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/ctxswitch… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S [iso-8859-1] Tue Sep 1 00:38:40 2015 @@ -18,6 +18,7 @@ EXTERN @KiRetireDpcList@4:PROC EXTERN @KiEnterV86Mode@4:PROC EXTERN @KiExitV86Mode@4:PROC +EXTERN _KeI386FxsrPresent:DWORD /* FUNCTIONS ****************************************************************/ .code

1 0

[sginsberg] 68886: - Small patch to fix (delayed) loading of floating point state. Enables the special handling of fpu exceptions caused by frstor when used by the kernel, by implementing its use i...
by sginsberg＠svn.reactos.org 01 Sep '15

01 Sep '15

Author: sginsberg Date: Tue Sep 1 00:20:57 2015 New Revision: 68886 URL: http://svn.reactos.org/svn/reactos?rev=68886&view=rev Log: - Small patch to fix (delayed) loading of floating point state. Enables the special handling of fpu exceptions caused by frstor when used by the kernel, by implementing its use in assembly so the trap handler gets the instruction address it needs (for ALl compilers!). May or may not fix the fact that floating point state is not properly saved between threads. See CORE-10005. Modified: trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h trunk/reactos/ntoskrnl/include/internal/i386/ke.h trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S trunk/reactos/ntoskrnl/ke/i386/traphdlr.c Modified: trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h [iso-8859-1] Tue Sep 1 00:20:57 2015 @@ -47,21 +47,6 @@ else { __asm__ __volatile__ ("fnsave %0\n wait\n" : : "m"(*SaveArea)); - } -} - -FORCEINLINE -VOID -Ke386LoadFpuState(IN PFX_SAVE_AREA SaveArea) -{ - extern ULONG KeI386FxsrPresent; - if (KeI386FxsrPresent) - { - __asm__ __volatile__ ("fxrstor %0\n" : "=m"(SaveArea) : ); - } - else - { - __asm__ __volatile__ (".globl _FrRestore\n _FrRestore: \n frstor %0\n wait\n" : "=m"(SaveArea) : ); } } Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] Tue Sep 1 00:20:57 2015 @@ -541,7 +541,6 @@ extern VOID NTAPI ExpInterlockedPopEntrySListResume(VOID); extern VOID __cdecl CopyParams(VOID); extern VOID __cdecl ReadBatch(VOID); -extern VOID __cdecl FrRestore(VOID); extern CHAR KiSystemCallExitBranch[]; extern CHAR KiSystemCallExit[]; extern CHAR KiSystemCallExit2[]; Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/ctxswitch… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S [iso-8859-1] Tue Sep 1 00:20:57 2015 @@ -159,4 +159,28 @@ popad ret 4 +PUBLIC _FrRestore +PUBLIC @Ke386LoadFpuState@4 +@Ke386LoadFpuState@4: + + /* Check if we have FXSR and choose which operand to use */ + test byte ptr [_KeI386FxsrPresent], 1 + jz _FrRestore + + /* Restore all the FPU, MMX, XMM and MXCSR registers */ + fxrstor [ecx] + ret + + /* + * Just restore the basic FPU registers. + * This may raise an exception depending + * on the status word, which KiNpxHandler will + * need to check for and handle during delayed load + * to avoid raising an unhandled exception + * and crashing the system. + */ +_FrRestore: + frstor [ecx] + ret + END Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/traphdlr.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] Tue Sep 1 00:20:57 2015 @@ -14,6 +14,9 @@ VOID KiFastCallEntry(VOID); VOID KiFastCallEntryWithSingleStep(VOID); + +extern PVOID FrRestore; +VOID FASTCALL Ke386LoadFpuState(IN PFX_SAVE_AREA SaveArea); /* GLOBALS ********************************************************************/ @@ -251,16 +254,16 @@ SaveArea->Cr0NpxState |= CR0_TS; /* Only valid if it happened during a restore */ - //if ((PVOID)TrapFrame->Eip == FrRestore) + if ((PVOID)TrapFrame->Eip == FrRestore) { /* It did, so just skip the instruction */ - //TrapFrame->Eip += 3; /* sizeof(FRSTOR) */ - //KiEoiHelper(TrapFrame); + TrapFrame->Eip += 3; /* Size of FRSTOR instruction */ + KiEoiHelper(TrapFrame); } } /* User or kernel trap -- get ready to issue an exception */ - //if (Thread->NpxState == NPX_STATE_NOT_LOADED) + if (Thread->NpxState == NPX_STATE_NOT_LOADED) { /* Update CR0 */ Cr0 = __readcr0(); @@ -744,7 +747,7 @@ KiEnterTrap(TrapFrame); /* Try to handle NPX delay load */ - while (TRUE) + for (;;) { /* Get the current thread */ Thread = KeGetCurrentThread(); @@ -775,15 +778,14 @@ NpxSaveArea = KiGetThreadNpxArea(NpxThread); /* Save FPU state */ - DPRINT("FIXME: Save FPU state: %p\n", NpxSaveArea); - //Ke386SaveFpuState(NpxSaveArea); + Ke386SaveFpuState(NpxSaveArea); /* Update NPX state */ NpxThread->NpxState = NPX_STATE_NOT_LOADED; } /* Load FPU state */ - //Ke386LoadFpuState(SaveArea); + Ke386LoadFpuState(SaveArea); /* Update NPX state */ Thread->NpxState = NPX_STATE_LOADED; @@ -823,7 +825,7 @@ { /* * If it's incorrectly set, then maybe the state is actually still valid - * but we could've lock track of that due to a BIOS call. + * but we could have lost track of that due to a BIOS call. * Make sure MP is still set, which should verify the theory. */ if (Cr0 & CR0_MP)

1 0

[gadamopoulos] 68885: [SHELL32] - Rename SHELL32_BindToChild to SHELL32_BindToFS. Do not let it be used for guid items any more. Split SHELL32_GetCLSIDForDirectoryout of it and call it only when ne...
by gadamopoulos＠svn.reactos.org 31 Aug '15

31 Aug '15

Author: gadamopoulos Date: Mon Aug 31 23:44:02 2015 New Revision: 68885 URL: http://svn.reactos.org/svn/reactos?rev=68885&view=rev Log: [SHELL32] - Rename SHELL32_BindToChild to SHELL32_BindToFS. Do not let it be used for guid items any more. Split SHELL32_GetCLSIDForDirectoryout of it and call it only when needed. - Fix callers to use SHELL32_BindToGuidItem for guid items. - Fix a bug in CFSFolder which marked folder items as files when a binding context was used. Modified: trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp trunk/reactos/dll/win32/shell32/shfldr.h trunk/reactos/dll/win32/shell32/shlfolder.cpp Modified: trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp [iso-8859-1] Mon Aug 31 23:44:02 2015 @@ -446,7 +446,10 @@ TRACE ("(%p)->(pidl=%p,%p,%s,%p)\n", this, pidl, pbcReserved, shdebugstr_guid (&riid), ppvOut); - return SHELL32_BindToChild( pidlRoot, sPathTarget, pidl, riid, ppvOut ); + if (_ILIsSpecialFolder(pidl)) + return SHELL32_BindToGuidItem(pidlRoot, pidl, pbcReserved, riid, ppvOut); + + return SHELL32_BindToFS( pidlRoot, sPathTarget, pidl, riid, ppvOut ); } /************************************************************************** Modified: trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp [iso-8859-1] Mon Aug 31 23:44:02 2015 @@ -272,7 +272,7 @@ if (_ILIsSpecialFolder(pidl)) return SHELL32_BindToGuidItem(pidlRoot, pidl, pbcReserved, riid, ppvOut); - return SHELL32_BindToChild(pidlRoot, NULL, pidl, riid, ppvOut); + return SHELL32_BindToFS(pidlRoot, NULL, pidl, riid, ppvOut); } /************************************************************************** Modified: trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp [iso-8859-1] Mon Aug 31 23:44:02 2015 @@ -207,6 +207,13 @@ pidlTemp = SHELL32_CreatePidlFromBindCtx(pbc, szElement); if (pidlTemp != NULL) { + /* We are creating an id list without ensuring that the items exist. + If we have a remaining path, this must be a folder. + We have to do it now because it is set as a file by default */ + if (szNext) + { + pidlTemp->mkid.abID[0] = PT_FOLDER; + } hr = S_OK; } else @@ -280,7 +287,7 @@ TRACE("(%p)->(pidl=%p,%p,%s,%p)\n", this, pidl, pbc, shdebugstr_guid(&riid), ppvOut); - return SHELL32_BindToChild(pidlRoot, sPathTarget, pidl, riid, ppvOut); + return SHELL32_BindToFS(pidlRoot, sPathTarget, pidl, riid, ppvOut); } /************************************************************************** Modified: trunk/reactos/dll/win32/shell32/shfldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr.h… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shfldr.h [iso-8859-1] Mon Aug 31 23:44:02 2015 @@ -41,7 +41,7 @@ LPOLESTR szNext, DWORD * pEaten, DWORD * pdwAttributes); HRESULT SHELL32_GetDisplayNameOfChild (IShellFolder2 * psf, LPCITEMIDLIST pidl, DWORD dwFlags, LPSTRRET strRet); -HRESULT SHELL32_BindToChild (LPCITEMIDLIST pidlRoot, +HRESULT SHELL32_BindToFS (LPCITEMIDLIST pidlRoot, LPCWSTR pathRoot, LPCITEMIDLIST pidlComplete, REFIID riid, LPVOID * ppvOut); HRESULT SHELL32_CompareIDs (IShellFolder * iface, LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2); Modified: trunk/reactos/dll/win32/shell32/shlfolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfolde… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlfolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlfolder.cpp [iso-8859-1] Mon Aug 31 23:44:02 2015 @@ -149,7 +149,7 @@ * In this case the absolute path is built from pidlChild (eg. C:) */ static HRESULT SHELL32_CoCreateInitSF (LPCITEMIDLIST pidlRoot, LPCWSTR pathRoot, - LPCITEMIDLIST pidlChild, REFCLSID clsid, LPVOID * ppvOut) + LPCITEMIDLIST pidlChild, REFCLSID clsid, IShellFolder** ppsfOut) { HRESULT hr; CComPtr<IShellFolder> pShellFolder; @@ -163,8 +163,7 @@ CComPtr<IPersistFolder> ppf; CComPtr<IPersistFolder3> ppf3; - if ((_ILIsFolder(pidlChild) || _ILIsDrive(pidlChild)) && - SUCCEEDED(pShellFolder->QueryInterface(IID_PPV_ARG(IPersistFolder3, &ppf3)))) + if (SUCCEEDED(pShellFolder->QueryInterface(IID_PPV_ARG(IPersistFolder3, &ppf3)))) { PERSIST_FOLDER_TARGET_INFO ppfti; @@ -198,15 +197,35 @@ ILFree (pidlAbsolute); } - *ppvOut = pShellFolder.Detach(); - - TRACE ("-- (%p) ret=0x%08x\n", *ppvOut, hr); + *ppsfOut = pShellFolder.Detach(); + + TRACE ("-- (%p) ret=0x%08x\n", *ppsfOut, hr); return hr; } +void SHELL32_GetCLSIDForDirectory(LPCWSTR pathRoot, LPCITEMIDLIST pidl, CLSID* pclsidFolder) +{ + static const WCHAR wszDotShellClassInfo[] = { + '.','S','h','e','l','l','C','l','a','s','s','I','n','f','o',0 }; + static const WCHAR wszCLSID[] = {'C','L','S','I','D',0}; + WCHAR wszCLSIDValue[CHARS_IN_GUID], wszFolderPath[MAX_PATH], *pwszPathTail = wszFolderPath; + + /* see if folder CLSID should be overridden by desktop.ini file */ + if (pathRoot) { + lstrcpynW(wszFolderPath, pathRoot, MAX_PATH); + pwszPathTail = PathAddBackslashW(wszFolderPath); + } + + _ILSimpleGetTextW(pidl,pwszPathTail,MAX_PATH - (int)(pwszPathTail - wszFolderPath)); + + if (SHELL32_GetCustomFolderAttributeFromPath (wszFolderPath, + wszDotShellClassInfo, wszCLSID, wszCLSIDValue, CHARS_IN_GUID)) + CLSIDFromString (wszCLSIDValue, pclsidFolder); +} + /*********************************************************************** - * SHELL32_BindToChild [Internal] + * SHELL32_BindToFS [Internal] * * Common code for IShellFolder_BindToObject. * @@ -222,49 +241,40 @@ * This function makes special assumptions on the shell namespace, which * means you probably can't use it for your IShellFolder implementation. */ -HRESULT SHELL32_BindToChild (LPCITEMIDLIST pidlRoot, +HRESULT SHELL32_BindToFS (LPCITEMIDLIST pidlRoot, LPCWSTR pathRoot, LPCITEMIDLIST pidlComplete, REFIID riid, LPVOID * ppvOut) { - static const WCHAR wszDotShellClassInfo[] = { - '.','S','h','e','l','l','C','l','a','s','s','I','n','f','o',0 }; - - GUID const *clsid; CComPtr<IShellFolder> pSF; HRESULT hr; - LPITEMIDLIST pidlChild; + LPCITEMIDLIST pidlChild; if (!pidlRoot || !ppvOut || !pidlComplete || !pidlComplete->mkid.cb) return E_INVALIDARG; + if (_ILIsValue(pidlComplete)) + { + ERR("Binding to file is unimplemented\n"); + return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); + } + if (!_ILIsFolder(pidlComplete) && !_ILIsDrive(pidlComplete)) + { + ERR("Got an unknown type of pidl!\n"); + return E_FAIL; + } + *ppvOut = NULL; - pidlChild = ILCloneFirst (pidlComplete); - - if ((clsid = _ILGetGUIDPointer (pidlChild))) { - /* virtual folder */ - hr = SHELL32_CoCreateInitSF (pidlRoot, pathRoot, pidlChild, *clsid, (LPVOID *)&pSF); - } else { - /* file system folder */ - CLSID clsidFolder = CLSID_ShellFSFolder; - static const WCHAR wszCLSID[] = {'C','L','S','I','D',0}; - WCHAR wszCLSIDValue[CHARS_IN_GUID], wszFolderPath[MAX_PATH], *pwszPathTail = wszFolderPath; - - /* see if folder CLSID should be overridden by desktop.ini file */ - if (pathRoot) { - lstrcpynW(wszFolderPath, pathRoot, MAX_PATH); - pwszPathTail = PathAddBackslashW(wszFolderPath); - } - - _ILSimpleGetTextW(pidlChild,pwszPathTail,MAX_PATH - (int)(pwszPathTail - wszFolderPath)); - - if (SHELL32_GetCustomFolderAttributeFromPath (wszFolderPath, - wszDotShellClassInfo, wszCLSID, wszCLSIDValue, CHARS_IN_GUID)) - CLSIDFromString (wszCLSIDValue, &clsidFolder); - - hr = SHELL32_CoCreateInitSF (pidlRoot, pathRoot, pidlChild, - clsidFolder, (LPVOID *)&pSF); - } - ILFree (pidlChild); + pidlChild = (_ILIsPidlSimple (pidlComplete)) ? pidlComplete : ILCloneFirst (pidlComplete); + + CLSID clsidFolder = CLSID_ShellFSFolder; + DWORD attributes = _ILGetFileAttributes(ILFindLastID(pidlChild), NULL, 0); + if ((attributes & (FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_READONLY)) != 0) + SHELL32_GetCLSIDForDirectory(pathRoot, pidlChild, &clsidFolder); + + hr = SHELL32_CoCreateInitSF (pidlRoot, pathRoot, pidlChild, clsidFolder, &pSF); + + if (pidlChild != pidlComplete) + ILFree ((LPITEMIDLIST)pidlChild); if (SUCCEEDED (hr)) { if (_ILIsPidlSimple (pidlComplete)) { @@ -290,27 +300,41 @@ CComPtr<IPersistFolder> pFolder; HRESULT hr; + if (!pidlRoot || !ppvOut || !pidl || !pidl->mkid.cb) + return E_INVALIDARG; + + *ppvOut = NULL; + GUID *pGUID = _ILGetGUIDPointer(pidl); if (!pGUID) { ERR("SHELL32_BindToGuidItem called for non guid item!\n"); - return E_FAIL; + return E_INVALIDARG; } hr = SHCoCreateInstance(NULL, pGUID, NULL, IID_PPV_ARG(IPersistFolder, &pFolder)); if (FAILED(hr)) return hr; - hr = pFolder->Initialize(ILCombine(pidlRoot, pidl)); - if (FAILED(hr)) - return hr; - if (_ILIsPidlSimple (pidl)) { + hr = pFolder->Initialize(ILCombine(pidlRoot, pidl)); + if (FAILED(hr)) + return hr; + return pFolder->QueryInterface(riid, ppvOut); } else { + LPITEMIDLIST pidlChild = ILCloneFirst (pidl); + if (!pidlChild) + return E_OUTOFMEMORY; + + hr = pFolder->Initialize(ILCombine(pidlRoot, pidlChild)); + ILFree(pidlChild); + if (FAILED(hr)) + return hr; + CComPtr<IShellFolder> psf; hr = pFolder->QueryInterface(IID_PPV_ARG(IShellFolder, &psf)); if (FAILED(hr))

1 0

[gadamopoulos] 68884: [SHELL32] - All shell folders must have the IPersistFolder. Hence their Initialize method is supposed to succeed for them to actually work.
by gadamopoulos＠svn.reactos.org 31 Aug '15

31 Aug '15

Author: gadamopoulos Date: Mon Aug 31 23:12:03 2015 New Revision: 68884 URL: http://svn.reactos.org/svn/reactos?rev=68884&view=rev Log: [SHELL32] - All shell folders must have the IPersistFolder. Hence their Initialize method is supposed to succeed for them to actually work. Modified: trunk/reactos/dll/win32/shell32/folders/CMyDocsFolder.cpp trunk/reactos/dll/win32/shell32/folders/CNetFolder.cpp Modified: trunk/reactos/dll/win32/shell32/folders/CMyDocsFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CMyDocsFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CMyDocsFolder.cpp [iso-8859-1] Mon Aug 31 23:12:03 2015 @@ -256,7 +256,7 @@ { TRACE ("(%p)->(%p)\n", this, pidl); - return E_NOTIMPL; + return S_OK; } HRESULT WINAPI CMyDocsFolder::GetCurFolder(LPITEMIDLIST *pidl) Modified: trunk/reactos/dll/win32/shell32/folders/CNetFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CNetFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CNetFolder.cpp [iso-8859-1] Mon Aug 31 23:12:03 2015 @@ -494,7 +494,7 @@ { TRACE("(%p)->(%p)\n", this, pidl); - return E_NOTIMPL; + return S_OK; } /**************************************************************************

1 0

[akhaldi] 68883: [VSSAPI] Import from Wine Staging 1.7.47. Thanks to Thomas Faber for his help. [PSDK] Import vss.idl and vswriter.h from Wine Staging 1.7.47. CORE-9924 CORE-9965
by akhaldi＠svn.reactos.org 31 Aug '15

31 Aug '15

Author: akhaldi Date: Mon Aug 31 19:34:37 2015 New Revision: 68883 URL: http://svn.reactos.org/svn/reactos?rev=68883&view=rev Log: [VSSAPI] Import from Wine Staging 1.7.47. Thanks to Thomas Faber for his help. [PSDK] Import vss.idl and vswriter.h from Wine Staging 1.7.47. CORE-9924 CORE-9965 Added: trunk/reactos/dll/win32/vssapi/ (with props) trunk/reactos/dll/win32/vssapi/CMakeLists.txt (with props) trunk/reactos/dll/win32/vssapi/main.c (with props) trunk/reactos/dll/win32/vssapi/msvc.s (with props) trunk/reactos/dll/win32/vssapi/vssapi.spec (with props) trunk/reactos/include/psdk/vss.idl (with props) trunk/reactos/include/psdk/vswriter.h (with props) Modified: trunk/reactos/dll/win32/CMakeLists.txt trunk/reactos/include/psdk/CMakeLists.txt trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] Mon Aug 31 19:34:37 2015 @@ -218,6 +218,7 @@ add_subdirectory(uxtheme) add_subdirectory(vbscript) add_subdirectory(version) +add_subdirectory(vssapi) add_subdirectory(wbemdisp) add_subdirectory(wbemprox) if(ARCH STREQUAL "i386") Propchange: trunk/reactos/dll/win32/vssapi/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Mon Aug 31 19:34:37 2015 @@ -0,0 +1 @@ +((CORE|ROSTESTS|ROSAPPS)-\d+)(,? ?((CORE|ROSTESTS|ROSAPPS)-\d+))*(,? ?(and |or )?((CORE|ROSTESTS|ROSAPPS)-\d+))? Propchange: trunk/reactos/dll/win32/vssapi/ ------------------------------------------------------------------------------ bugtraq:message = See issue %BUGID% for more details. Propchange: trunk/reactos/dll/win32/vssapi/ ------------------------------------------------------------------------------ bugtraq:url = https://jira.reactos.org/browse/%BUGID% Propchange: trunk/reactos/dll/win32/vssapi/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/vssapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vssapi/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/vssapi/CMakeLists.txt (added) +++ trunk/reactos/dll/win32/vssapi/CMakeLists.txt [iso-8859-1] Mon Aug 31 19:34:37 2015 @@ -0,0 +1,19 @@ + +add_definitions(-D__WINESRC__) +include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine) +spec2def(vssapi.dll vssapi.spec) + +list(APPEND SOURCE + main.c + ${CMAKE_CURRENT_BINARY_DIR}/vssapi_stubs.c + ${CMAKE_CURRENT_BINARY_DIR}/vssapi.def) + +if(MSVC) + add_asm_files(vssapi_asm msvc.s) +endif() + +add_library(vssapi SHARED ${SOURCE} ${vssapi_asm}) +set_module_type(vssapi win32dll) +target_link_libraries(vssapi wine) +add_importlibs(vssapi msvcrt kernel32 ntdll) +add_cd_file(TARGET vssapi DESTINATION reactos/system32 FOR all) Propchange: trunk/reactos/dll/win32/vssapi/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/vssapi/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vssapi/main.c?re… ============================================================================== --- trunk/reactos/dll/win32/vssapi/main.c (added) +++ trunk/reactos/dll/win32/vssapi/main.c [iso-8859-1] Mon Aug 31 19:34:37 2015 @@ -0,0 +1,120 @@ +/* + * Copyright 2014 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "vss.h" +#include "vswriter.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL( vssapi ); + +#ifdef __i386__ /* thiscall functions are i386-specific */ + +#define THISCALL(func) __thiscall_ ## func +#define THISCALL_NAME(func) __ASM_NAME("__thiscall_" #func) +#undef __thiscall +#define __thiscall __stdcall +#ifdef _MSC_VER +#define DEFINE_THISCALL_WRAPPER(func,args) \ + void __declspec(naked) __thiscall_ ##func(void) \ + { \ + __asm { pop eax } \ + __asm { push ecx } \ + __asm { push eax } \ + __asm { jmp func } \ + } +#else +#define DEFINE_THISCALL_WRAPPER(func,args) \ + extern void THISCALL(func)(void); \ + __ASM_GLOBAL_FUNC(__thiscall_ ## func, \ + "popl %eax\n\t" \ + "pushl %ecx\n\t" \ + "pushl %eax\n\t" \ + "jmp " __ASM_NAME(#func) __ASM_STDCALL(args) ) +#endif +#else /* __i386__ */ + +#define THISCALL(func) func +#define THISCALL_NAME(func) __ASM_NAME(#func) +#define __thiscall __cdecl +#define DEFINE_THISCALL_WRAPPER(func,args) /* nothing */ + +#endif /* __i386__ */ + +struct CVssWriter +{ + void **vtable; +}; + +/****************************************************************** + * ??0CVssWriter@@QAE@XZ (VSSAPI.@) + */ +struct CVssWriter * __thiscall VSSAPI_CVssWriter_default_ctor( struct CVssWriter *writer ) +{ + FIXME( "%p\n", writer ); + writer->vtable = NULL; + return writer; +} +DEFINE_THISCALL_WRAPPER( VSSAPI_CVssWriter_default_ctor, 4 ) + +/****************************************************************** + * ??1CVssWriter@@UAE@XZ (VSSAPI.@) + */ +void __thiscall VSSAPI_CVssWriter_dtor( struct CVssWriter *writer ) +{ + FIXME( "%p\n", writer ); +} +DEFINE_THISCALL_WRAPPER( VSSAPI_CVssWriter_dtor, 4 ) + +/****************************************************************** + * ?Initialize@CVssWriter@@QAGJU_GUID@@PBGW4VSS_USAGE_TYPE@@W4VSS_SOURCE_TYPE@@W4_VSS_APPLICATION_LEVEL@@KW4VSS_ALTERNATE_WRITER_STATE@@_N@Z + */ +HRESULT __thiscall VSSAPI_CVssWriter_Initialize( struct CVssWriter *writer, VSS_ID id, + LPCWSTR name, VSS_USAGE_TYPE usage_type, VSS_SOURCE_TYPE source_type, + VSS_APPLICATION_LEVEL level, DWORD timeout, VSS_ALTERNATE_WRITER_STATE alt_writer_state, + BOOL throttle, LPCWSTR instance ) +{ + FIXME( "%p, %s, %s, %u, %u, %u, %u, %u, %d, %s\n", writer, debugstr_guid(&id), + debugstr_w(name), usage_type, source_type, level, timeout, alt_writer_state, + throttle, debugstr_w(instance) ); + return S_OK; +} +DEFINE_THISCALL_WRAPPER( VSSAPI_CVssWriter_Initialize, 52 ) + +/****************************************************************** + * ?Subscribe@CVssWriter@@QAGJK@Z + */ +HRESULT __thiscall VSSAPI_CVssWriter_Subscribe( struct CVssWriter *writer, DWORD flags ) +{ + FIXME( "%p, %x\n", writer, flags ); + return S_OK; +} +DEFINE_THISCALL_WRAPPER( VSSAPI_CVssWriter_Subscribe, 8 ) + +/****************************************************************** + * ?Unsubscribe@CVssWriter@@QAGJXZ + */ +HRESULT __thiscall VSSAPI_CVssWriter_Unsubscribe( struct CVssWriter *writer ) +{ + FIXME( "%p\n", writer ); + return S_OK; +} +DEFINE_THISCALL_WRAPPER( VSSAPI_CVssWriter_Unsubscribe, 4 ) Propchange: trunk/reactos/dll/win32/vssapi/main.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/vssapi/msvc.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vssapi/msvc.s?re… ============================================================================== --- trunk/reactos/dll/win32/vssapi/msvc.s (added) +++ trunk/reactos/dll/win32/vssapi/msvc.s [iso-8859-1] Mon Aug 31 19:34:37 2015 @@ -0,0 +1,23 @@ + +#include <asm.inc> + +.code +.align 4 + +MACRO(DEFINE_THISCALL_WRAPPER, cxxname, stdcallname) +EXTERN &stdcallname:PROC +PUBLIC &cxxname +&cxxname: + pop eax + push ecx + push eax + jmp &stdcallname +ENDM + +DEFINE_THISCALL_WRAPPER ??0CVssWriter@@QAE@XZ, _VSSAPI_CVssWriter_default_ctor@4 +DEFINE_THISCALL_WRAPPER ??1CVssWriter@@UAE@XZ, _VSSAPI_CVssWriter_dtor@4 +DEFINE_THISCALL_WRAPPER ?Initialize@CVssWriter@@QAGJU_GUID@@PBGW4VSS_USAGE_TYPE@@W4VSS_SOURCE_TYPE@@W4_VSS_APPLICATION_LEVEL@@KW4VSS_ALTERNATE_WRITER_STATE@@_N@Z, _VSSAPI_CVssWriter_Initialize@52 +DEFINE_THISCALL_WRAPPER ?Subscribe@CVssWriter@@QAGJK@Z, _VSSAPI_CVssWriter_Subscribe@8 +DEFINE_THISCALL_WRAPPER ?Unsubscribe@CVssWriter@@QAGJXZ, _VSSAPI_CVssWriter_Unsubscribe@4 + +END Propchange: trunk/reactos/dll/win32/vssapi/msvc.s ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/vssapi/vssapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vssapi/vssapi.sp… ============================================================================== --- trunk/reactos/dll/win32/vssapi/vssapi.spec (added) +++ trunk/reactos/dll/win32/vssapi/vssapi.spec [iso-8859-1] Mon Aug 31 19:34:37 2015 @@ -0,0 +1,84 @@ +@ stub IsVolumeSnapshotted +@ stub VssFreeSnapshotProperties +@ stub ShouldBlockRevert +@ stub ??0CVssJetWriter@@QAE@XZ +@ cdecl -arch=i386 ??0CVssWriter@@QAE@XZ(ptr) __thiscall_VSSAPI_CVssWriter_default_ctor +@ stub ??1CVssJetWriter@@UAE@XZ +@ cdecl -arch=i386 ??1CVssWriter@@UAE@XZ(ptr) __thiscall_VSSAPI_CVssWriter_dtor +@ stub ?AreComponentsSelected@CVssJetWriter@@IBG_NXZ +@ stub ?AreComponentsSelected@CVssWriter@@IBG_NXZ +@ stub ?CreateVssBackupComponents@@YGJPAPAVIVssBackupComponents@@@Z +@ stub ?CreateVssExamineWriterMetadata@@YGJPAGPAPAVIVssExamineWriterMetadata@@@Z +@ stub ?CreateVssSnapshotSetDescription@@YGJU_GUID@@JPAPAVIVssSnapshotSetDescription@@@Z +@ stub ?GetBackupType@CVssJetWriter@@IBG?AW4_VSS_BACKUP_TYPE@@XZ +@ stub ?GetBackupType@CVssWriter@@IBG?AW4_VSS_BACKUP_TYPE@@XZ +@ stub ?GetContext@CVssJetWriter@@IBGJXZ +@ stub ?GetContext@CVssWriter@@IBGJXZ +@ stub ?GetCurrentLevel@CVssJetWriter@@IBG?AW4_VSS_APPLICATION_LEVEL@@XZ +@ stub ?GetCurrentLevel@CVssWriter@@IBG?AW4_VSS_APPLICATION_LEVEL@@XZ +@ stub ?GetCurrentSnapshotSetId@CVssJetWriter@@IBG?AU_GUID@@XZ +@ stub ?GetCurrentSnapshotSetId@CVssWriter@@IBG?AU_GUID@@XZ +@ stub ?GetCurrentVolumeArray@CVssJetWriter@@IBGPAPBGXZ +@ stub ?GetCurrentVolumeArray@CVssWriter@@IBGPAPBGXZ +@ stub ?GetCurrentVolumeCount@CVssJetWriter@@IBGIXZ +@ stub ?GetCurrentVolumeCount@CVssWriter@@IBGIXZ +@ stub ?GetRestoreType@CVssJetWriter@@IBG?AW4_VSS_RESTORE_TYPE@@XZ +@ stub ?GetRestoreType@CVssWriter@@IBG?AW4_VSS_RESTORE_TYPE@@XZ +@ stub ?GetSnapshotDeviceName@CVssJetWriter@@IBGJPBGPAPBG@Z +@ stub ?GetSnapshotDeviceName@CVssWriter@@IBGJPBGPAPBG@Z +@ stub ?Initialize@CVssJetWriter@@QAGJU_GUID@@PBG_N211K@Z +@ cdecl -arch=i386 ?Initialize@CVssWriter@@QAGJU_GUID@@PBGW4VSS_USAGE_TYPE@@W4VSS_SOURCE_TYPE@@W4_VSS_APPLICATION_LEVEL@@KW4VSS_ALTERNATE_WRITER_STATE@@_N@Z(ptr ptr wstr long long long long long long wstr) __thiscall_VSSAPI_CVssWriter_Initialize +@ stub ?InstallAlternateWriter@CVssWriter@@QAGJU_GUID@@0@Z +@ stub ?IsBootableSystemStateBackedUp@CVssJetWriter@@IBG_NXZ +@ stub ?IsBootableSystemStateBackedUp@CVssWriter@@IBG_NXZ +@ stub ?IsPartialFileSupportEnabled@CVssJetWriter@@IBG_NXZ +@ stub ?IsPartialFileSupportEnabled@CVssWriter@@IBG_NXZ +@ stub ?IsPathAffected@CVssJetWriter@@IBG_NPBG@Z +@ stub ?IsPathAffected@CVssWriter@@IBG_NPBG@Z +@ stub ?LoadVssSnapshotSetDescription@@YGJPBGPAPAVIVssSnapshotSetDescription@@U_GUID@@@Z +@ stub ?OnAbortBegin@CVssJetWriter@@UAGXXZ +@ stub ?OnAbortEnd@CVssJetWriter@@UAGXXZ +@ stub ?OnBackOffIOOnVolume@CVssWriter@@UAG_NPAGU_GUID@@1@Z +@ stub ?OnBackupComplete@CVssWriter@@UAG_NPAVIVssWriterComponents@@@Z +@ stub ?OnBackupCompleteBegin@CVssJetWriter@@UAG_NPAVIVssWriterComponents@@@Z +@ stub ?OnBackupCompleteEnd@CVssJetWriter@@UAG_NPAVIVssWriterComponents@@_N@Z +@ stub ?OnBackupShutdown@CVssWriter@@UAG_NU_GUID@@@Z +@ stub ?OnContinueIOOnVolume@CVssWriter@@UAG_NPAGU_GUID@@1@Z +@ stub ?OnFreezeBegin@CVssJetWriter@@UAG_NXZ +@ stub ?OnFreezeEnd@CVssJetWriter@@UAG_N_N@Z +@ stub ?OnIdentify@CVssJetWriter@@UAG_NPAVIVssCreateWriterMetadata@@@Z +@ stub ?OnIdentify@CVssWriter@@UAG_NPAVIVssCreateWriterMetadata@@@Z +@ stub ?OnPostRestore@CVssWriter@@UAG_NPAVIVssWriterComponents@@@Z +@ stub ?OnPostRestoreBegin@CVssJetWriter@@UAG_NPAVIVssWriterComponents@@@Z +@ stub ?OnPostRestoreEnd@CVssJetWriter@@UAG_NPAVIVssWriterComponents@@_N@Z +@ stub ?OnPostSnapshot@CVssJetWriter@@UAG_NPAVIVssWriterComponents@@@Z +@ stub ?OnPostSnapshot@CVssWriter@@UAG_NPAVIVssWriterComponents@@@Z +@ stub ?OnPreRestore@CVssWriter@@UAG_NPAVIVssWriterComponents@@@Z +@ stub ?OnPreRestoreBegin@CVssJetWriter@@UAG_NPAVIVssWriterComponents@@@Z +@ stub ?OnPreRestoreEnd@CVssJetWriter@@UAG_NPAVIVssWriterComponents@@_N@Z +@ stub ?OnPrepareBackup@CVssWriter@@UAG_NPAVIVssWriterComponents@@@Z +@ stub ?OnPrepareBackupBegin@CVssJetWriter@@UAG_NPAVIVssWriterComponents@@@Z +@ stub ?OnPrepareBackupEnd@CVssJetWriter@@UAG_NPAVIVssWriterComponents@@_N@Z +@ stub ?OnPrepareSnapshotBegin@CVssJetWriter@@UAG_NXZ +@ stub ?OnPrepareSnapshotEnd@CVssJetWriter@@UAG_N_N@Z +@ stub ?OnThawBegin@CVssJetWriter@@UAG_NXZ +@ stub ?OnThawEnd@CVssJetWriter@@UAG_N_N@Z +@ stub ?OnVSSApplicationStartup@CVssWriter@@UAG_NXZ +@ stub ?OnVSSShutdown@CVssWriter@@UAG_NXZ +@ stub ?SetWriterFailure@CVssJetWriter@@IAGJJ@Z +@ stub ?SetWriterFailure@CVssWriter@@IAGJJ@Z +@ cdecl -arch=i386 ?Subscribe@CVssWriter@@QAGJK@Z(ptr long) __thiscall_VSSAPI_CVssWriter_Subscribe +@ stub ?Uninitialize@CVssJetWriter@@QAGXXZ +@ cdecl -arch=i386 ?Unsubscribe@CVssWriter@@QAGJXZ(ptr) __thiscall_VSSAPI_CVssWriter_Unsubscribe +@ stub CreateVssBackupComponentsInternal +@ stub CreateVssExamineWriterMetadataInternal +@ stub CreateVssExpressWriterInternal +@ stub CreateWriter +@ stub CreateWriterEx +@ stub -private DllCanUnloadNow +@ stub -private DllGetClassObject +@ stub GetProviderMgmtInterface +@ stub GetProviderMgmtInterfaceInternal +@ stub IsVolumeSnapshottedInternal +@ stub ShouldBlockRevertInternal +@ stub VssFreeSnapshotPropertiesInternal Propchange: trunk/reactos/dll/win32/vssapi/vssapi.spec ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/include/psdk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/CMakeLists.tx… ============================================================================== --- trunk/reactos/include/psdk/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/include/psdk/CMakeLists.txt [iso-8859-1] Mon Aug 31 19:34:37 2015 @@ -116,6 +116,7 @@ urlmon.idl vmr9.idl # vmrender.idl + vss.idl wbemcli.idl wbemdisp.idl wbemprov.idl Added: trunk/reactos/include/psdk/vss.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/vss.idl?rev=6… ============================================================================== --- trunk/reactos/include/psdk/vss.idl (added) +++ trunk/reactos/include/psdk/vss.idl [iso-8859-1] Mon Aug 31 19:34:37 2015 @@ -0,0 +1,31 @@ +/* + * Copyright 2014 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "oaidl.idl"; + +typedef GUID VSS_ID; + +typedef enum _VSS_APPLICATION_LEVEL +{ + VSS_APP_AUTO = -1, + VSS_APP_UNKNOWN = 0, + VSS_APP_SYSTEM = 1, + VSS_APP_BACK_END = 2, + VSS_APP_FRONT_END = 3, + VSS_APP_SYSTEM_RM = 4 +} VSS_APPLICATION_LEVEL; Propchange: trunk/reactos/include/psdk/vss.idl ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/psdk/vswriter.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/vswriter.h?re… ============================================================================== --- trunk/reactos/include/psdk/vswriter.h (added) +++ trunk/reactos/include/psdk/vswriter.h [iso-8859-1] Mon Aug 31 19:34:37 2015 @@ -0,0 +1,47 @@ +/* + * Copyright 2014 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_VSWRITER_H +#define __WINE_VSWRITER_H + +typedef enum +{ + VSS_UT_UNDEFINED, + VSS_UT_BOOTABLESYSTEMSTATE, + VSS_UT_SYSTEMSERVICE, + VSS_UT_USERDATA, + VSS_UT_OTHER +} VSS_USAGE_TYPE; + +typedef enum +{ + VSS_ST_UNDEFINED, + VSS_ST_TRANSACTEDDB, + VSS_ST_NONTRANSACTEDDB, + VSS_ST_OTHER +} VSS_SOURCE_TYPE; + +typedef enum +{ + VSS_AWS_UNDEFINED, + VSS_AWS_NO_ALTERNATE_WRITER, + VSS_AWS_ALTERNATE_WRITER_EXISTS, + VSS_AWS_THIS_IS_ALTERNATE_WRITER +} VSS_ALTERNATE_WRITER_STATE; + +#endif /* ___WINE_VSWRITER_H */ Propchange: trunk/reactos/include/psdk/vswriter.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Mon Aug 31 19:34:37 2015 @@ -199,6 +199,7 @@ reactos/dll/win32/uxtheme # Forked reactos/dll/win32/vbscript # Synced to WineStaging-1.7.47 reactos/dll/win32/version # Synced to WineStaging-1.7.47 +reactos/dll/win32/vssapi # Synced to WineStaging-1.7.47 reactos/dll/win32/wbemdisp # Synced to WineStaging-1.7.47 reactos/dll/win32/wbemprox # Synced to WineStaging-1.7.47 reactos/dll/win32/windowscodecs # Synced to WineStaging-1.7.47

1 0

[akhaldi] 68882: [SETUPAPI] Sync setupcab.c with Wine Staging 1.7.47. CORE-9924
by akhaldi＠svn.reactos.org 31 Aug '15

31 Aug '15

Author: akhaldi Date: Mon Aug 31 17:52:48 2015 New Revision: 68882 URL: http://svn.reactos.org/svn/reactos?rev=68882&view=rev Log: [SETUPAPI] Sync setupcab.c with Wine Staging 1.7.47. CORE-9924 Modified: trunk/reactos/dll/win32/setupapi/setupcab.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/setupapi/setupcab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupca… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupcab.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/setupcab.c [iso-8859-1] Mon Aug 31 17:52:48 2015 @@ -49,6 +49,7 @@ PSP_FILE_CALLBACK_A msghandler; PVOID context; CHAR most_recent_cabinet_name[MAX_PATH]; + CHAR most_recent_target[MAX_PATH]; } SC_HSC_A, *PSC_HSC_A; #define SC_HSC_W_MAGIC 0x0CABFEED @@ -58,6 +59,7 @@ PSP_FILE_CALLBACK_W msghandler; PVOID context; WCHAR most_recent_cabinet_name[MAX_PATH]; + WCHAR most_recent_target[MAX_PATH]; } SC_HSC_W, *PSC_HSC_W; static BOOL LoadCABINETDll(void) @@ -77,27 +79,19 @@ return TRUE; } -static void UnloadCABINETDll(void) -{ - if (CABINET_hInstance) { - FreeLibrary(CABINET_hInstance); - CABINET_hInstance = 0; - } -} - /* FDICreate callbacks */ -static void *sc_cb_alloc(ULONG cb) +static void * CDECL sc_cb_alloc(ULONG cb) { return HeapAlloc(GetProcessHeap(), 0, cb); } -static void sc_cb_free(void *pv) +static void CDECL sc_cb_free(void *pv) { HeapFree(GetProcessHeap(), 0, pv); } -static INT_PTR sc_cb_open(char *pszFile, int oflag, int pmode) +static INT_PTR CDECL sc_cb_open(char *pszFile, int oflag, int pmode) { DWORD creation = 0, sharing = 0; int ioflag = 0; @@ -114,7 +108,7 @@ ioflag |= GENERIC_WRITE; break; case _O_RDWR: - ioflag |= GENERIC_READ & GENERIC_WRITE; + ioflag |= GENERIC_READ | GENERIC_WRITE; break; case _O_WRONLY | _O_RDWR: /* hmmm.. */ ERR("_O_WRONLY & _O_RDWR in oflag?\n"); @@ -159,7 +153,7 @@ sa.nLength = sizeof( SECURITY_ATTRIBUTES ); sa.lpSecurityDescriptor = NULL; - sa.bInheritHandle = (ioflag & _O_NOINHERIT) ? FALSE : TRUE; + sa.bInheritHandle = !(ioflag & _O_NOINHERIT); ret = (INT_PTR) CreateFileA(pszFile, ioflag, sharing, &sa, creation, FILE_ATTRIBUTE_NORMAL, NULL); @@ -168,7 +162,7 @@ return ret; } -static UINT sc_cb_read(INT_PTR hf, void *pv, UINT cb) +static UINT CDECL sc_cb_read(INT_PTR hf, void *pv, UINT cb) { DWORD num_read; BOOL rslt; @@ -188,7 +182,7 @@ return num_read; } -static UINT sc_cb_write(INT_PTR hf, void *pv, UINT cb) +static UINT CDECL sc_cb_write(INT_PTR hf, void *pv, UINT cb) { DWORD num_written; /* BOOL rv; */ @@ -206,7 +200,7 @@ } } -static int sc_cb_close(INT_PTR hf) +static int CDECL sc_cb_close(INT_PTR hf) { /* TRACE("(hf == %d)\n", hf); */ @@ -216,7 +210,7 @@ return -1; } -static long sc_cb_lseek(INT_PTR hf, long dist, int seektype) +static LONG CDECL sc_cb_lseek(INT_PTR hf, LONG dist, int seektype) { DWORD ret; @@ -238,7 +232,7 @@ /* FDICopy callbacks */ -static INT_PTR sc_FNNOTIFY_A(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pfdin) +static INT_PTR CDECL sc_FNNOTIFY_A(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pfdin) { FILE_IN_CABINET_INFO_A fici; PSC_HSC_A phsc; @@ -248,12 +242,12 @@ CHAR mysterio[SIZEOF_MYSTERIO]; /* how big? undocumented! probably 256... */ - memset(&(mysterio[0]), 0, SIZEOF_MYSTERIO); + memset(mysterio, 0, SIZEOF_MYSTERIO); TRACE("(fdint == %d, pfdin == ^%p)\n", fdint, pfdin); - if (pfdin && pfdin->pv && (*((void **) pfdin->pv) == (void *)SC_HSC_A_MAGIC)) - phsc = (PSC_HSC_A) pfdin->pv; + if (pfdin && pfdin->pv && (((PSC_HSC_A) pfdin->pv)->magic == SC_HSC_A_MAGIC)) + phsc = pfdin->pv; else { ERR("pv %p is not an SC_HSC_A.\n", (pfdin) ? pfdin->pv : NULL); return -1; @@ -268,12 +262,12 @@ TRACE(" Cabinet Set#: %d\n", pfdin->setID); TRACE(" Cabinet Cab#: %d\n", pfdin->iCabinet); */ WARN("SPFILENOTIFY_CABINETINFO undocumented: guess implementation.\n"); - ci.CabinetFile = &(phsc->most_recent_cabinet_name[0]); + ci.CabinetFile = phsc->most_recent_cabinet_name; ci.CabinetPath = pfdin->psz3; ci.DiskName = pfdin->psz2; ci.SetId = pfdin->setID; ci.CabinetNumber = pfdin->iCabinet; - phsc->msghandler(phsc->context, SPFILENOTIFY_CABINETINFO, (UINT) &ci, 0); + phsc->msghandler(phsc->context, SPFILENOTIFY_CABINETINFO, (UINT_PTR) &ci, 0); return 0; case fdintPARTIAL_FILE: TRACE("Partial file notification\n"); @@ -292,17 +286,18 @@ fici.DosDate = pfdin->date; fici.DosTime = pfdin->time; fici.DosAttribs = pfdin->attribs; - memset(&(fici.FullTargetName[0]), 0, MAX_PATH); + memset(fici.FullTargetName, 0, MAX_PATH); err = phsc->msghandler(phsc->context, SPFILENOTIFY_FILEINCABINET, - (UINT) &fici, (UINT) pfdin->psz1); + (UINT_PTR)&fici, (UINT_PTR)pfdin->psz1); if (err == FILEOP_DOIT) { - TRACE(" Callback specified filename: %s\n", debugstr_a(&(fici.FullTargetName[0]))); + TRACE(" Callback specified filename: %s\n", debugstr_a(fici.FullTargetName)); if (!fici.FullTargetName[0]) { WARN(" Empty return string causing abort.\n"); SetLastError(ERROR_PATH_NOT_FOUND); return -1; } - return sc_cb_open(&(fici.FullTargetName[0]), _O_BINARY | _O_CREAT | _O_WRONLY, _S_IREAD | _S_IWRITE); + strcpy( phsc->most_recent_target, fici.FullTargetName ); + return sc_cb_open(fici.FullTargetName, _O_BINARY | _O_CREAT | _O_WRONLY, _S_IREAD | _S_IWRITE); } else { TRACE(" Callback skipped file.\n"); return 0; @@ -312,15 +307,15 @@ /* TRACE(" File name: %s\n", debugstr_a(pfdin->psz1)); TRACE(" Exec file? %s\n", (pfdin->cb) ? "Yes" : "No"); TRACE(" File hndl: %d\n", pfdin->hf); */ - fp.Source = &(phsc->most_recent_cabinet_name[0]); - fp.Target = pfdin->psz1; + fp.Source = phsc->most_recent_cabinet_name; + fp.Target = phsc->most_recent_target; fp.Win32Error = 0; fp.Flags = 0; /* the following should be a fixme -- but it occurs too many times */ WARN("Should set file date/time/attribs (and execute files?)\n"); - err = phsc->msghandler(phsc->context, SPFILENOTIFY_FILEEXTRACTED, (UINT) &fp, 0); if (sc_cb_close(pfdin->hf)) WARN("_close failed.\n"); + err = phsc->msghandler(phsc->context, SPFILENOTIFY_FILEEXTRACTED, (UINT_PTR)&fp, 0); if (err) { SetLastError(err); return FALSE; @@ -339,15 +334,15 @@ ci.SetId = pfdin->setID; ci.CabinetNumber = pfdin->iCabinet; /* remember the new cabinet name */ - strcpy(&(phsc->most_recent_cabinet_name[0]), pfdin->psz1); - err = phsc->msghandler(phsc->context, SPFILENOTIFY_NEEDNEWCABINET, (UINT) &ci, (UINT) &(mysterio[0])); + strcpy(phsc->most_recent_cabinet_name, pfdin->psz1); + err = phsc->msghandler(phsc->context, SPFILENOTIFY_NEEDNEWCABINET, (UINT_PTR)&ci, (UINT_PTR)mysterio); if (err) { SetLastError(err); return -1; } else { if (mysterio[0]) { /* some easy paranoia. no such carefulness exists on the wide API IIRC */ - lstrcpynA(pfdin->psz3, &(mysterio[0]), SIZEOF_MYSTERIO); + lstrcpynA(pfdin->psz3, mysterio, SIZEOF_MYSTERIO); } return 0; } @@ -357,7 +352,7 @@ } } -static INT_PTR sc_FNNOTIFY_W(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pfdin) +static INT_PTR CDECL sc_FNNOTIFY_W(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pfdin) { FILE_IN_CABINET_INFO_W fici; PSC_HSC_W phsc; @@ -370,15 +365,15 @@ WCHAR buf[MAX_PATH], buf2[MAX_PATH]; CHAR charbuf[MAX_PATH]; - memset(&(mysterio[0]), 0, SIZEOF_MYSTERIO * sizeof(WCHAR)); - memset(&(buf[0]), 0, MAX_PATH * sizeof(WCHAR)); - memset(&(buf2[0]), 0, MAX_PATH * sizeof(WCHAR)); - memset(&(charbuf[0]), 0, MAX_PATH); + memset(mysterio, 0, SIZEOF_MYSTERIO * sizeof(WCHAR)); + memset(buf, 0, MAX_PATH * sizeof(WCHAR)); + memset(buf2, 0, MAX_PATH * sizeof(WCHAR)); + memset(charbuf, 0, MAX_PATH); TRACE("(fdint == %d, pfdin == ^%p)\n", fdint, pfdin); - if (pfdin && pfdin->pv && (*((void **) pfdin->pv) == (void *)SC_HSC_W_MAGIC)) - phsc = (PSC_HSC_W) pfdin->pv; + if (pfdin && pfdin->pv && (((PSC_HSC_W) pfdin->pv)->magic == SC_HSC_W_MAGIC)) + phsc = pfdin->pv; else { ERR("pv %p is not an SC_HSC_W.\n", (pfdin) ? pfdin->pv : NULL); return -1; @@ -393,18 +388,18 @@ TRACE(" Cabinet Set#: %d\n", pfdin->setID); TRACE(" Cabinet Cab#: %d\n", pfdin->iCabinet); */ WARN("SPFILENOTIFY_CABINETINFO undocumented: guess implementation.\n"); - ci.CabinetFile = &(phsc->most_recent_cabinet_name[0]); - len = 1 + MultiByteToWideChar(CP_ACP, 0, pfdin->psz3, -1, &(buf[0]), MAX_PATH); + ci.CabinetFile = phsc->most_recent_cabinet_name; + len = 1 + MultiByteToWideChar(CP_ACP, 0, pfdin->psz3, -1, buf, MAX_PATH); if ((len > MAX_PATH) || (len <= 1)) buf[0] = '\0'; - ci.CabinetPath = &(buf[0]); - len = 1 + MultiByteToWideChar(CP_ACP, 0, pfdin->psz2, -1, &(buf2[0]), MAX_PATH); + ci.CabinetPath = buf; + len = 1 + MultiByteToWideChar(CP_ACP, 0, pfdin->psz2, -1, buf2, MAX_PATH); if ((len > MAX_PATH) || (len <= 1)) buf2[0] = '\0'; - ci.DiskName = &(buf2[0]); + ci.DiskName = buf2; ci.SetId = pfdin->setID; ci.CabinetNumber = pfdin->iCabinet; - phsc->msghandler(phsc->context, SPFILENOTIFY_CABINETINFO, (UINT) &ci, 0); + phsc->msghandler(phsc->context, SPFILENOTIFY_CABINETINFO, (UINT_PTR)&ci, 0); return 0; case fdintPARTIAL_FILE: TRACE("Partial file notification\n"); @@ -417,32 +412,33 @@ TRACE(" File date: %u\n", pfdin->date); TRACE(" File time: %u\n", pfdin->time); TRACE(" File attr: %u\n", pfdin->attribs); */ - len = 1 + MultiByteToWideChar(CP_ACP, 0, pfdin->psz1, -1, &(buf2[0]), MAX_PATH); + len = 1 + MultiByteToWideChar(CP_ACP, 0, pfdin->psz1, -1, buf2, MAX_PATH); if ((len > MAX_PATH) || (len <= 1)) buf2[0] = '\0'; - fici.NameInCabinet = &(buf2[0]); + fici.NameInCabinet = buf2; fici.FileSize = pfdin->cb; fici.Win32Error = 0; fici.DosDate = pfdin->date; fici.DosTime = pfdin->time; fici.DosAttribs = pfdin->attribs; - memset(&(fici.FullTargetName[0]), 0, MAX_PATH * sizeof(WCHAR)); + memset(fici.FullTargetName, 0, MAX_PATH * sizeof(WCHAR)); err = phsc->msghandler(phsc->context, SPFILENOTIFY_FILEINCABINET, - (UINT) &fici, (UINT) pfdin->psz1); + (UINT_PTR)&fici, (UINT_PTR)pfdin->psz1); if (err == FILEOP_DOIT) { - TRACE(" Callback specified filename: %s\n", debugstr_w(&(fici.FullTargetName[0]))); + TRACE(" Callback specified filename: %s\n", debugstr_w(fici.FullTargetName)); if (fici.FullTargetName[0]) { - len = strlenW(&(fici.FullTargetName[0])) + 1; + len = strlenW(fici.FullTargetName) + 1; if ((len > MAX_PATH ) || (len <= 1)) return 0; - if (!WideCharToMultiByte(CP_ACP, 0, &(fici.FullTargetName[0]), len, &(charbuf[0]), MAX_PATH, 0, 0)) + if (!WideCharToMultiByte(CP_ACP, 0, fici.FullTargetName, len, charbuf, MAX_PATH, 0, 0)) return 0; } else { WARN("Empty buffer string caused abort.\n"); SetLastError(ERROR_PATH_NOT_FOUND); return -1; } - return sc_cb_open(&(charbuf[0]), _O_BINARY | _O_CREAT | _O_WRONLY, _S_IREAD | _S_IWRITE); + strcpyW( phsc->most_recent_target, fici.FullTargetName ); + return sc_cb_open(charbuf, _O_BINARY | _O_CREAT | _O_WRONLY, _S_IREAD | _S_IWRITE); } else { TRACE(" Callback skipped file.\n"); return 0; @@ -452,18 +448,15 @@ /* TRACE(" File name: %s\n", debugstr_a(pfdin->psz1)); TRACE(" Exec file? %s\n", (pfdin->cb) ? "Yes" : "No"); TRACE(" File hndl: %d\n", pfdin->hf); */ - fp.Source = &(phsc->most_recent_cabinet_name[0]); - len = 1 + MultiByteToWideChar(CP_ACP, 0, pfdin->psz1, -1, &(buf[0]), MAX_PATH); - if ((len > MAX_PATH) || (len <= 1)) - buf[0] = '\0'; - fp.Target = &(buf[0]); + fp.Source = phsc->most_recent_cabinet_name; + fp.Target = phsc->most_recent_target; fp.Win32Error = 0; fp.Flags = 0; /* a valid fixme -- but occurs too many times */ /* FIXME("Should set file date/time/attribs (and execute files?)\n"); */ - err = phsc->msghandler(phsc->context, SPFILENOTIFY_FILEEXTRACTED, (UINT) &fp, 0); if (sc_cb_close(pfdin->hf)) WARN("_close failed.\n"); + err = phsc->msghandler(phsc->context, SPFILENOTIFY_FILEEXTRACTED, (UINT_PTR)&fp, 0); if (err) { SetLastError(err); return FALSE; @@ -477,30 +470,30 @@ TRACE(" Cabinet Set#: %d\n", pfdin->setID); TRACE(" Cabinet Cab#: %d\n", pfdin->iCabinet); */ /* remember the new cabinet name */ - len = 1 + MultiByteToWideChar(CP_ACP, 0, pfdin->psz1, -1, &(phsc->most_recent_cabinet_name[0]), MAX_PATH); + len = 1 + MultiByteToWideChar(CP_ACP, 0, pfdin->psz1, -1, phsc->most_recent_cabinet_name, MAX_PATH); if ((len > MAX_PATH) || (len <= 1)) phsc->most_recent_cabinet_name[0] = '\0'; - ci.CabinetFile = &(phsc->most_recent_cabinet_name[0]); - len = 1 + MultiByteToWideChar(CP_ACP, 0, pfdin->psz3, -1, &(buf[0]), MAX_PATH); + ci.CabinetFile = phsc->most_recent_cabinet_name; + len = 1 + MultiByteToWideChar(CP_ACP, 0, pfdin->psz3, -1, buf, MAX_PATH); if ((len > MAX_PATH) || (len <= 1)) buf[0] = '\0'; - ci.CabinetPath = &(buf[0]); - len = 1 + MultiByteToWideChar(CP_ACP, 0, pfdin->psz2, -1, &(buf2[0]), MAX_PATH); + ci.CabinetPath = buf; + len = 1 + MultiByteToWideChar(CP_ACP, 0, pfdin->psz2, -1, buf2, MAX_PATH); if ((len > MAX_PATH) || (len <= 1)) buf2[0] = '\0'; - ci.DiskName = &(buf2[0]); + ci.DiskName = buf2; ci.SetId = pfdin->setID; ci.CabinetNumber = pfdin->iCabinet; - err = phsc->msghandler(phsc->context, SPFILENOTIFY_NEEDNEWCABINET, (UINT) &ci, (UINT) &(mysterio[0])); + err = phsc->msghandler(phsc->context, SPFILENOTIFY_NEEDNEWCABINET, (UINT_PTR)&ci, (UINT_PTR)mysterio); if (err) { SetLastError(err); return -1; } else { if (mysterio[0]) { - len = strlenW(&(mysterio[0])) + 1; + len = strlenW(mysterio) + 1; if ((len > 255) || (len <= 1)) return 0; - if (!WideCharToMultiByte(CP_ACP, 0, &(mysterio[0]), len, pfdin->psz3, 255, 0, 0)) + if (!WideCharToMultiByte(CP_ACP, 0, mysterio, len, pfdin->psz3, 255, 0, 0)) return 0; } return 0; @@ -524,11 +517,10 @@ DWORD fpnsize; BOOL ret; - TRACE("(CabinetFile == %s, Reserved == %u, MsgHandler == ^%p, Context == ^%p)\n", debugstr_a(CabinetFile), Reserved, MsgHandler, Context); - if (! LoadCABINETDll()) + if (!LoadCABINETDll()) return FALSE; if (!CabinetFile) @@ -537,17 +529,13 @@ return FALSE; } - memset(&my_hsc, 0, sizeof(SC_HSC_A)); - pszCabinet[0] = '\0'; - pszCabPath[0] = '\0'; - fpnsize = strlen(CabinetFile); if (fpnsize >= MAX_PATH) { SetLastError(ERROR_BAD_PATHNAME); return FALSE; } - fpnsize = GetFullPathNameA(CabinetFile, MAX_PATH, &(pszCabPath[0]), &p); + fpnsize = GetFullPathNameA(CabinetFile, MAX_PATH, pszCabPath, &p); if (fpnsize > MAX_PATH) { SetLastError(ERROR_BAD_PATHNAME); return FALSE; @@ -564,7 +552,7 @@ TRACE("path: %s, cabfile: %s\n", debugstr_a(pszCabPath), debugstr_a(pszCabinet)); /* remember the cabinet name */ - strcpy(&(my_hsc.most_recent_cabinet_name[0]), pszCabinet); + strcpy(my_hsc.most_recent_cabinet_name, pszCabinet); my_hsc.magic = SC_HSC_A_MAGIC; my_hsc.msghandler = MsgHandler; @@ -574,8 +562,7 @@ if (!my_hsc.hfdi) return FALSE; - ret = ( sc_FDICopy(my_hsc.hfdi, pszCabinet, pszCabPath, - 0, sc_FNNOTIFY_A, NULL, &my_hsc) ) ? TRUE : FALSE; + ret = sc_FDICopy(my_hsc.hfdi, pszCabinet, pszCabPath, 0, sc_FNNOTIFY_A, NULL, &my_hsc); sc_FDIDestroy(my_hsc.hfdi); return ret; @@ -607,8 +594,6 @@ SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - - memset(&my_hsc, 0, sizeof(SC_HSC_W)); fpnsize = GetFullPathNameW(CabinetFile, MAX_PATH, pszCabPathW, &p); if (fpnsize > MAX_PATH) { @@ -642,8 +627,7 @@ if (!my_hsc.hfdi) return FALSE; - ret = ( sc_FDICopy(my_hsc.hfdi, pszCabinet, pszCabPath, - 0, sc_FNNOTIFY_W, NULL, &my_hsc) ) ? TRUE : FALSE; + ret = sc_FDICopy(my_hsc.hfdi, pszCabinet, pszCabPath, 0, sc_FNNOTIFY_W, NULL, &my_hsc); sc_FDIDestroy(my_hsc.hfdi); return ret; @@ -674,8 +658,9 @@ hInstance = (HINSTANCE)hinstDLL; break; case DLL_PROCESS_DETACH: - UnloadCABINETDll(); + if (lpvReserved) break; SetupCloseLog(); + if (CABINET_hInstance) FreeLibrary(CABINET_hInstance); break; } Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Mon Aug 31 17:52:48 2015 @@ -331,6 +331,9 @@ reactos/dll/win32/secur32/thunks.c # Synced to WineStaging-1.7.37 reactos/dll/win32/secur32/wrapper.c # Synced to WineStaging-1.7.37 +setupapi - + reactos/dll/win32/setupapi/setupcab.c # Synced to WineStaging-1.7.47 + win32k - win32ss/gdi/ntgdi/bezier.c # Synced to WineStaging-1.7.37

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs