Ros-diffs September 2013

ros-diffs@reactos.org

16 participants
554 discussions

[tfaber] 60456: [NTOS:CC] - Simplify cache segment range checks - Remove unused function CcRosFreeCacheSegment - Minor style fixes CORE-7491
by tfaber＠svn.reactos.org 29 Sep '13

29 Sep '13

Author: tfaber Date: Sun Sep 29 20:52:23 2013 New Revision: 60456 URL: http://svn.reactos.org/svn/reactos?rev=60456&view=rev Log: [NTOS:CC] - Simplify cache segment range checks - Remove unused function CcRosFreeCacheSegment - Minor style fixes CORE-7491 Modified: trunk/reactos/ntoskrnl/cc/copy.c trunk/reactos/ntoskrnl/cc/fs.c trunk/reactos/ntoskrnl/cc/pin.c trunk/reactos/ntoskrnl/cc/view.c trunk/reactos/ntoskrnl/include/internal/cc.h Modified: trunk/reactos/ntoskrnl/cc/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/copy.c?rev=604… ============================================================================== --- trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] Sun Sep 29 20:52:23 2013 @@ -355,13 +355,16 @@ if (!Wait) { KeAcquireSpinLock(&Bcb->BcbLock, &oldirql); + /* FIXME: this loop doesn't take into account areas that don't have + * a segment in the list yet */ current_entry = Bcb->BcbSegmentListHead.Flink; while (current_entry != &Bcb->BcbSegmentListHead) { current = CONTAINING_RECORD(current_entry, CACHE_SEGMENT, BcbSegmentListEntry); - if (!current->Valid && current->FileOffset < ReadOffset + Length - && current->FileOffset + Bcb->CacheSegmentSize > ReadOffset) + if (!current->Valid && + DoSegmentsIntersect(current->FileOffset, Bcb->CacheSegmentSize, + ReadOffset, Length)) { KeReleaseSpinLock(&Bcb->BcbLock, oldirql); IoStatus->Status = STATUS_UNSUCCESSFUL; @@ -466,23 +469,20 @@ { /* testing, if the requested datas are available */ KeAcquireSpinLock(&Bcb->BcbLock, &oldirql); + /* FIXME: this loop doesn't take into account areas that don't have + * a segment in the list yet */ current_entry = Bcb->BcbSegmentListHead.Flink; while (current_entry != &Bcb->BcbSegmentListHead) { CacheSeg = CONTAINING_RECORD(current_entry, CACHE_SEGMENT, BcbSegmentListEntry); - if (!CacheSeg->Valid) - { - if (((WriteOffset >= CacheSeg->FileOffset) && - (WriteOffset < CacheSeg->FileOffset + Bcb->CacheSegmentSize)) - || ((WriteOffset + Length > CacheSeg->FileOffset) && - (WriteOffset + Length <= CacheSeg->FileOffset + - Bcb->CacheSegmentSize))) - { - KeReleaseSpinLock(&Bcb->BcbLock, oldirql); - /* datas not available */ - return FALSE; - } + if (!CacheSeg->Valid && + DoSegmentsIntersect(CacheSeg->FileOffset, Bcb->CacheSegmentSize, + WriteOffset, Length)) + { + KeReleaseSpinLock(&Bcb->BcbLock, oldirql); + /* datas not available */ + return FALSE; } current_entry = current_entry->Flink; } @@ -687,23 +687,20 @@ { /* testing, if the requested datas are available */ KeAcquireSpinLock(&Bcb->BcbLock, &oldirql); + /* FIXME: this loop doesn't take into account areas that don't have + * a segment in the list yet */ current_entry = Bcb->BcbSegmentListHead.Flink; while (current_entry != &Bcb->BcbSegmentListHead) { CacheSeg = CONTAINING_RECORD(current_entry, CACHE_SEGMENT, BcbSegmentListEntry); - if (!CacheSeg->Valid) + if (!CacheSeg->Valid && + DoSegmentsIntersect(CacheSeg->FileOffset, Bcb->CacheSegmentSize, + WriteOffset.u.LowPart, Length)) { - if (((WriteOffset.u.LowPart >= CacheSeg->FileOffset) && - (WriteOffset.u.LowPart < CacheSeg->FileOffset + Bcb->CacheSegmentSize)) - || ((WriteOffset.u.LowPart + Length > CacheSeg->FileOffset) && - (WriteOffset.u.LowPart + Length <= - CacheSeg->FileOffset + Bcb->CacheSegmentSize))) - { - KeReleaseSpinLock(&Bcb->BcbLock, oldirql); - /* datas not available */ - return FALSE; - } + KeReleaseSpinLock(&Bcb->BcbLock, oldirql); + /* datas not available */ + return FALSE; } current_entry = current_entry->Flink; } Modified: trunk/reactos/ntoskrnl/cc/fs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/fs.c?rev=60456… ============================================================================== --- trunk/reactos/ntoskrnl/cc/fs.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/fs.c [iso-8859-1] Sun Sep 29 20:52:23 2013 @@ -159,7 +159,9 @@ current_entry = Bcb->BcbSegmentListHead.Flink; while (current_entry != &Bcb->BcbSegmentListHead) { - current = CONTAINING_RECORD(current_entry, CACHE_SEGMENT, BcbSegmentListEntry); + current = CONTAINING_RECORD(current_entry, + CACHE_SEGMENT, + BcbSegmentListEntry); current_entry = current_entry->Flink; if (current->FileOffset > FileSizes->AllocationSize.QuadPart || (current->FileOffset == 0 && FileSizes->AllocationSize.QuadPart == 0)) Modified: trunk/reactos/ntoskrnl/cc/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/pin.c?rev=6045… ============================================================================== --- trunk/reactos/ntoskrnl/cc/pin.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/pin.c [iso-8859-1] Sun Sep 29 20:52:23 2013 @@ -261,7 +261,7 @@ { IoStatus->Status = STATUS_SUCCESS; } - KeReleaseMutex(&iBcb->CacheSegment->Mutex, 0); + KeReleaseMutex(&iBcb->CacheSegment->Mutex, FALSE); } else { Modified: trunk/reactos/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/view.c?rev=604… ============================================================================== --- trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] Sun Sep 29 20:52:23 2013 @@ -236,7 +236,7 @@ /* One reference is added above */ if (current->ReferenceCount > 2) { - KeReleaseMutex(&current->Mutex, 0); + KeReleaseMutex(&current->Mutex, FALSE); current->Bcb->Callbacks->ReleaseFromLazyWrite( current->Bcb->LazyWriteContext); CcRosCacheSegmentDecRefCount(current); @@ -249,7 +249,7 @@ Status = CcRosFlushCacheSegment(current); - KeReleaseMutex(&current->Mutex, 0); + KeReleaseMutex(&current->Mutex, FALSE); current->Bcb->Callbacks->ReleaseFromLazyWrite( current->Bcb->LazyWriteContext); @@ -446,7 +446,7 @@ KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); KeReleaseGuardedMutex(&ViewLock); - KeReleaseMutex(&CacheSeg->Mutex, 0); + KeReleaseMutex(&CacheSeg->Mutex, FALSE); return(STATUS_SUCCESS); } @@ -474,8 +474,8 @@ { current = CONTAINING_RECORD(current_entry, CACHE_SEGMENT, BcbSegmentListEntry); - if ((current->FileOffset <= FileOffset) && - ((current->FileOffset + Bcb->CacheSegmentSize) > FileOffset)) + if (IsPointInSegment(current->FileOffset, Bcb->CacheSegmentSize, + FileOffset)) { CcRosCacheSegmentIncRefCount(current); KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); @@ -485,7 +485,7 @@ KernelMode, FALSE, NULL); - return(current); + return current; } current_entry = current_entry->Flink; } @@ -493,7 +493,7 @@ KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); KeReleaseGuardedMutex(&ViewLock); - return(NULL); + return NULL; } NTSTATUS @@ -536,7 +536,7 @@ KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); KeReleaseGuardedMutex(&ViewLock); - KeReleaseMutex(&CacheSeg->Mutex, 0); + KeReleaseMutex(&CacheSeg->Mutex, FALSE); return(STATUS_SUCCESS); } @@ -589,7 +589,7 @@ KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); KeReleaseGuardedMutex(&ViewLock); - KeReleaseMutex(&CacheSeg->Mutex, 0); + KeReleaseMutex(&CacheSeg->Mutex, FALSE); return(STATUS_SUCCESS); } @@ -659,8 +659,8 @@ { current = CONTAINING_RECORD(current_entry, CACHE_SEGMENT, BcbSegmentListEntry); - if (current->FileOffset <= FileOffset && - (current->FileOffset + Bcb->CacheSegmentSize) > FileOffset) + if (IsPointInSegment(current->FileOffset, Bcb->CacheSegmentSize, + FileOffset)) { CcRosCacheSegmentIncRefCount(current); KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); @@ -673,7 +673,7 @@ current ); } #endif - KeReleaseMutex(&(*CacheSeg)->Mutex, 0); + KeReleaseMutex(&(*CacheSeg)->Mutex, FALSE); KeReleaseGuardedMutex(&ViewLock); ExFreeToNPagedLookasideList(&CacheSegLookasideList, *CacheSeg); *CacheSeg = current; @@ -996,38 +996,6 @@ return(STATUS_SUCCESS); } -NTSTATUS -NTAPI -CcRosFreeCacheSegment ( - PBCB Bcb, - PCACHE_SEGMENT CacheSeg) -{ - NTSTATUS Status; - KIRQL oldIrql; - - ASSERT(Bcb); - - DPRINT("CcRosFreeCacheSegment(Bcb 0x%p, CacheSeg 0x%p)\n", - Bcb, CacheSeg); - - KeAcquireGuardedMutex(&ViewLock); - KeAcquireSpinLock(&Bcb->BcbLock, &oldIrql); - RemoveEntryList(&CacheSeg->BcbSegmentListEntry); - RemoveEntryList(&CacheSeg->CacheSegmentListEntry); - RemoveEntryList(&CacheSeg->CacheSegmentLRUListEntry); - if (CacheSeg->Dirty) - { - RemoveEntryList(&CacheSeg->DirtySegmentListEntry); - DirtyPageCount -= Bcb->CacheSegmentSize / PAGE_SIZE; - - } - KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); - KeReleaseGuardedMutex(&ViewLock); - - Status = CcRosInternalFreeCacheSegment(CacheSeg); - return(Status); -} - /* * @implemented */ @@ -1081,7 +1049,7 @@ IoStatus->Status = Status; } } - KeReleaseMutex(&current->Mutex, 0); + KeReleaseMutex(&current->Mutex, FALSE); KeAcquireGuardedMutex(&ViewLock); KeAcquireSpinLock(&Bcb->BcbLock, &oldIrql); @@ -1148,7 +1116,6 @@ */ InitializeListHead(&FreeList); KeAcquireSpinLock(&Bcb->BcbLock, &oldIrql); - current_entry = Bcb->BcbSegmentListHead.Flink; while (!IsListEmpty(&Bcb->BcbSegmentListHead)) { current_entry = RemoveTailList(&Bcb->BcbSegmentListHead); Modified: trunk/reactos/ntoskrnl/include/internal/cc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/cc.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/cc.h [iso-8859-1] Sun Sep 29 20:52:23 2013 @@ -205,13 +205,6 @@ NTSTATUS NTAPI -CcRosFreeCacheSegment( - PBCB, - PCACHE_SEGMENT -); - -NTSTATUS -NTAPI ReadCacheSegment(PCACHE_SEGMENT CacheSeg); NTSTATUS @@ -315,3 +308,28 @@ NTSTATUS NTAPI CcTryToInitializeFileCache(PFILE_OBJECT FileObject); + +FORCEINLINE +BOOLEAN +DoSegmentsIntersect( + _In_ ULONG Offset1, + _In_ ULONG Length1, + _In_ ULONG Offset2, + _In_ ULONG Length2) +{ + if (Offset1 + Length1 <= Offset2) + return FALSE; + if (Offset2 + Length2 <= Offset1) + return FALSE; + return TRUE; +} + +FORCEINLINE +BOOLEAN +IsPointInSegment( + _In_ ULONG Offset1, + _In_ ULONG Length1, + _In_ ULONG Point) +{ + return DoSegmentsIntersect(Offset1, Length1, Point, 1); +}

1 0

[aandrejevic] 60455: [SOFT386] Implement opcode group 0xD0 (instructions ROL, ROR, RCL, RCR, SHL, SHR, SAL, SAR).
by aandrejevic＠svn.reactos.org 29 Sep '13

29 Sep '13

Author: aandrejevic Date: Sun Sep 29 18:39:59 2013 New Revision: 60455 URL: http://svn.reactos.org/svn/reactos?rev=60455&view=rev Log: [SOFT386] Implement opcode group 0xD0 (instructions ROL, ROR, RCL, RCR, SHL, SHR, SAL, SAR). Modified: branches/ntvdm/lib/soft386/opgroups.c Modified: branches/ntvdm/lib/soft386/opgroups.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opgroups.c?re… ============================================================================== --- branches/ntvdm/lib/soft386/opgroups.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opgroups.c [iso-8859-1] Sun Sep 29 18:39:59 2013 @@ -347,8 +347,134 @@ SOFT386_OPCODE_HANDLER(Soft386OpcodeGroupD0) { - UNIMPLEMENTED; - return FALSE; // TODO: NOT IMPLEMENTED + UCHAR Result, Dummy, Value; + SOFT386_MOD_REG_RM ModRegRm; + BOOLEAN AddressSize = State->SegmentRegs[SOFT386_REG_CS].Size; + + if (State->PrefixFlags & SOFT386_PREFIX_ADSIZE) + { + /* The ADSIZE prefix toggles the size */ + AddressSize = !AddressSize; + } + + if (!Soft386ParseModRegRm(State, AddressSize, &ModRegRm)) + { + /* Exception occurred */ + return FALSE; + } + + /* Read the operands */ + if (!Soft386ReadModrmByteOperands(State, &ModRegRm, &Dummy, &Value)) + { + /* Exception occurred */ + return FALSE; + } + + /* Check which operation is this */ + switch (ModRegRm.Register) + { + /* ROL */ + case 0: + { + Result = (Value << 1) | (Value >> 7); + + /* Update CF and OF */ + State->Flags.Cf = Value >> 7; + State->Flags.Of = ((Result & SIGN_FLAG_BYTE) ? TRUE : FALSE) + ^ (State->Flags.Cf ? TRUE : FALSE); + + break; + } + + /* ROR */ + case 1: + { + Result = (Value >> 1) | (Value << 7); + + /* Update CF and OF */ + State->Flags.Cf = Value & 1; + State->Flags.Of = ((Result & SIGN_FLAG_BYTE) ? TRUE : FALSE) + ^ ((Result & (SIGN_FLAG_BYTE >> 1)) ? TRUE : FALSE); + + break; + } + + /* RCL */ + case 2: + { + Result = (Value << 1) | (State->Flags.Cf ? 1 : 0); + + /* Update CF and OF */ + State->Flags.Cf = (Value & SIGN_FLAG_BYTE) ? TRUE : FALSE; + State->Flags.Of = ((Result & SIGN_FLAG_BYTE) ? TRUE : FALSE) + ^ (State->Flags.Cf ? TRUE : FALSE); + + break; + } + + /* RCR */ + case 3: + { + Result = (Value >> 1) | (State->Flags.Cf ? SIGN_FLAG_BYTE : 0); + + /* Update CF and OF */ + State->Flags.Cf = Value & 1; + State->Flags.Of = ((Result & SIGN_FLAG_BYTE) ? TRUE : FALSE) + ^ ((Result & (SIGN_FLAG_BYTE >> 1)) ? TRUE : FALSE); + + break; + } + + /* SHL/SAL */ + case 4: + case 6: + { + Result = Value << 1; + + /* Update CF and OF */ + State->Flags.Cf = (Value & SIGN_FLAG_BYTE) ? TRUE : FALSE; + State->Flags.Of = ((Result & SIGN_FLAG_BYTE) ? TRUE : FALSE) + ^ (State->Flags.Cf ? TRUE : FALSE); + + break; + } + + /* SHR */ + case 5: + { + Result = Value >> 1; + + /* Update CF and OF */ + State->Flags.Cf = Value & 1; + State->Flags.Of = (Value & SIGN_FLAG_BYTE) ? TRUE : FALSE; + + break; + } + + /* SAR */ + case 7: + { + Result = (Value >> 1) | (Value & SIGN_FLAG_BYTE); + + /* Update CF and OF */ + State->Flags.Cf = Value & 1; + State->Flags.Of = FALSE; + + break; + } + } + + /* Update ZF, SF and PF */ + State->Flags.Zf = (Result == 0) ? TRUE : FALSE; + State->Flags.Sf = (Result & SIGN_FLAG_BYTE) ? TRUE : FALSE; + State->Flags.Pf = Soft386CalculateParity(Result); + + /* Write back the result */ + return Soft386WriteModrmByteOperands(State, + &ModRegRm, + FALSE, + Value); + } SOFT386_OPCODE_HANDLER(Soft386OpcodeGroupD1)

1 0

[akhaldi] 60454: [DIRECTX/WINE] * Move Wine DirectX related dlls to the appropriate folder. CORE-7495 #resolve
by akhaldi＠svn.reactos.org 29 Sep '13

29 Sep '13

Author: akhaldi Date: Sun Sep 29 16:10:32 2013 New Revision: 60454 URL: http://svn.reactos.org/svn/reactos?rev=60454&view=rev Log: [DIRECTX/WINE] * Move Wine DirectX related dlls to the appropriate folder. CORE-7495 #resolve Added: trunk/reactos/dll/directx/wine/amstream/ - copied from r60450, trunk/reactos/dll/directx/amstream/ trunk/reactos/dll/directx/wine/dinput/ - copied from r60450, trunk/reactos/dll/directx/dinput/ trunk/reactos/dll/directx/wine/dinput8/ - copied from r60450, trunk/reactos/dll/directx/dinput8/ trunk/reactos/dll/directx/wine/dmusic/ - copied from r60450, trunk/reactos/dll/directx/dmusic/ trunk/reactos/dll/directx/wine/dplay/ - copied from r60450, trunk/reactos/dll/directx/dplay/ trunk/reactos/dll/directx/wine/dplayx/ - copied from r60450, trunk/reactos/dll/directx/dplayx/ trunk/reactos/dll/directx/wine/dsound/ - copied from r60450, trunk/reactos/dll/directx/dsound/ trunk/reactos/dll/directx/wine/dxdiagn/ - copied from r60450, trunk/reactos/dll/directx/dxdiagn/ trunk/reactos/dll/directx/wine/dxgi/ - copied from r60450, trunk/reactos/dll/directx/dxgi/ trunk/reactos/dll/directx/wine/msdmo/ - copied from r60450, trunk/reactos/dll/directx/msdmo/ trunk/reactos/dll/directx/wine/qedit/ - copied from r60450, trunk/reactos/dll/directx/qedit/ trunk/reactos/dll/directx/wine/quartz/ - copied from r60450, trunk/reactos/dll/directx/quartz/ Removed: trunk/reactos/dll/directx/amstream/ trunk/reactos/dll/directx/dinput/ trunk/reactos/dll/directx/dinput8/ trunk/reactos/dll/directx/dmusic/ trunk/reactos/dll/directx/dplay/ trunk/reactos/dll/directx/dplayx/ trunk/reactos/dll/directx/dsound/ trunk/reactos/dll/directx/dxdiagn/ trunk/reactos/dll/directx/dxgi/ trunk/reactos/dll/directx/msdmo/ trunk/reactos/dll/directx/qedit/ trunk/reactos/dll/directx/quartz/ Modified: trunk/reactos/dll/directx/CMakeLists.txt trunk/reactos/dll/directx/wine/CMakeLists.txt trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/directx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/CMakeLists.txt… ============================================================================== --- trunk/reactos/dll/directx/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/CMakeLists.txt [iso-8859-1] Sun Sep 29 16:10:32 2013 @@ -1,25 +1,13 @@ -add_subdirectory(amstream) add_subdirectory(d3d8thk) #add_subdirectory(bdaplgin) #disabled in trunk #add_subdirectory(d3d8) #disabled in trunk, see wine subfolder #add_subdirectory(d3d9) #disabled in trunk, see wine subfolder #add_subdirectory(ddraw) #disabled in trunk, see wine subfolder add_subdirectory(devenum) -add_subdirectory(dinput) -add_subdirectory(dinput8) -add_subdirectory(dmusic) -add_subdirectory(dplay) -add_subdirectory(dplayx) -add_subdirectory(dsound) #add_subdirectory(dsound_new) #disabled in trunk -add_subdirectory(dxdiagn) -add_subdirectory(dxgi) #add_subdirectory(ksproxy) Not needed at the moment add_subdirectory(ksuser) -add_subdirectory(msdmo) #add_subdirectory(msdvbnp) #disabled in trunk #add_subdirectory(msvidctl) #disabled in trunk -add_subdirectory(qedit) -add_subdirectory(quartz) add_subdirectory(wine) Modified: trunk/reactos/dll/directx/wine/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/CMakeList… ============================================================================== --- trunk/reactos/dll/directx/wine/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/CMakeLists.txt [iso-8859-1] Sun Sep 29 16:10:32 2013 @@ -1,4 +1,5 @@ +add_subdirectory(amstream) add_subdirectory(d3d8) add_subdirectory(d3d9) add_subdirectory(d3dcompiler_43) @@ -24,4 +25,15 @@ add_subdirectory(d3dx9_43) add_subdirectory(d3dxof) add_subdirectory(ddraw) +add_subdirectory(dinput) +add_subdirectory(dinput8) +add_subdirectory(dmusic) +add_subdirectory(dplay) +add_subdirectory(dplayx) +add_subdirectory(dsound) +add_subdirectory(dxdiagn) +add_subdirectory(dxgi) +add_subdirectory(msdmo) +add_subdirectory(qedit) +add_subdirectory(quartz) add_subdirectory(wined3d) 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] Sun Sep 29 16:10:32 2013 @@ -27,24 +27,24 @@ The following libraries are shared with Wine. -reactos/dll/directx/amstream # Synced to Wine-1.3.37 -reactos/dll/directx/dinput # Synced to Wine-1.7.1 -reactos/dll/directx/dinput8 # Synced to Wine-1.5.26 -reactos/dll/directx/dmusic # Synced to Wine-1.5.26 -reactos/dll/directx/dplay # Synced to Wine-1.5.26 -reactos/dll/directx/dplayx # Synced to Wine-1.5.26 -reactos/dll/directx/dsound # Synced to Wine-1.5.26 -reactos/dll/directx/dxdiagn # Synced to Wine-0_9_5 -reactos/dll/directx/dxgi # Synced to Wine-1.7.1 -reactos/dll/directx/msdmo # Autosync -reactos/dll/directx/qedit # Autosync -reactos/dll/directx/quartz # Synced to Wine-1.5.26 +reactos/dll/directx/wine/amstream # Synced to Wine-1.3.37 reactos/dll/directx/wine/d3d8 # Synced to Wine-1.7.1 reactos/dll/directx/wine/d3d9 # Synced to Wine-1.7.1 reactos/dll/directx/wine/d3dcompiler_43 # Synced to Wine-1.7.1 reactos/dll/directx/wine/d3dx9_24 => 43 # Synced to Wine-1.7.1 reactos/dll/directx/wine/d3dxof # Synced to Wine-1.7.1 reactos/dll/directx/wine/ddraw # Synced to Wine-1.7.1 +reactos/dll/directx/wine/dinput # Synced to Wine-1.7.1 +reactos/dll/directx/wine/dinput8 # Synced to Wine-1.5.26 +reactos/dll/directx/wine/dmusic # Synced to Wine-1.5.26 +reactos/dll/directx/wine/dplay # Synced to Wine-1.5.26 +reactos/dll/directx/wine/dplayx # Synced to Wine-1.5.26 +reactos/dll/directx/wine/dsound # Synced to Wine-1.5.26 +reactos/dll/directx/wine/dxdiagn # Synced to Wine-0_9_5 +reactos/dll/directx/wine/dxgi # Synced to Wine-1.7.1 +reactos/dll/directx/wine/msdmo # Autosync +reactos/dll/directx/wine/qedit # Autosync +reactos/dll/directx/wine/quartz # Synced to Wine-1.5.26 reactos/dll/directx/wine/wined3d # Synced to Wine-1.7.1 reactos/dll/win32/activeds # Synced to Wine-1.1.43?

1 0

[aandrejevic] 60453: [SOFT386] Implement opcode group 0xFE.
by aandrejevic＠svn.reactos.org 29 Sep '13

29 Sep '13

Author: aandrejevic Date: Sun Sep 29 16:07:06 2013 New Revision: 60453 URL: http://svn.reactos.org/svn/reactos?rev=60453&view=rev Log: [SOFT386] Implement opcode group 0xFE. Modified: branches/ntvdm/lib/soft386/opgroups.c Modified: branches/ntvdm/lib/soft386/opgroups.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opgroups.c?re… ============================================================================== --- branches/ntvdm/lib/soft386/opgroups.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opgroups.c [iso-8859-1] Sun Sep 29 16:07:06 2013 @@ -383,8 +383,60 @@ SOFT386_OPCODE_HANDLER(Soft386OpcodeGroupFE) { - UNIMPLEMENTED; - return FALSE; // TODO: NOT IMPLEMENTED + UCHAR Dummy, Value; + SOFT386_MOD_REG_RM ModRegRm; + BOOLEAN AddressSize = State->SegmentRegs[SOFT386_REG_CS].Size; + + if (State->PrefixFlags & SOFT386_PREFIX_ADSIZE) + { + /* The ADSIZE prefix toggles the size */ + AddressSize = !AddressSize; + } + + if (!Soft386ParseModRegRm(State, AddressSize, &ModRegRm)) + { + /* Exception occurred */ + return FALSE; + } + + if (ModRegRm.Register > 1) + { + /* Invalid */ + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + /* Read the operands */ + if (!Soft386ReadModrmByteOperands(State, &ModRegRm, &Dummy, &Value)) + { + /* Exception occurred */ + return FALSE; + } + + if (ModRegRm.Register == 0) + { + /* Increment and update OF */ + Value++; + State->Flags.Of = (Value == SIGN_FLAG_BYTE) ? TRUE : FALSE; + } + else + { + /* Decrement and update OF */ + State->Flags.Of = (Value == SIGN_FLAG_BYTE) ? TRUE : FALSE; + Value--; + } + + /* Update flags */ + State->Flags.Sf = (Value & SIGN_FLAG_BYTE) ? TRUE : FALSE; + State->Flags.Zf = (Value == 0) ? TRUE : FALSE; + State->Flags.Af = ((Value & 0x0F) == 0) ? TRUE : FALSE; + State->Flags.Pf = Soft386CalculateParity(Value); + + /* Write back the result */ + return Soft386WriteModrmByteOperands(State, + &ModRegRm, + FALSE, + Value); } SOFT386_OPCODE_HANDLER(Soft386OpcodeGroupFF)

1 0

[aandrejevic] 60452: [SOFT386] Implement opcode groups 0xC6 and 0xC7.
by aandrejevic＠svn.reactos.org 29 Sep '13

29 Sep '13

Author: aandrejevic Date: Sun Sep 29 16:01:10 2013 New Revision: 60452 URL: http://svn.reactos.org/svn/reactos?rev=60452&view=rev Log: [SOFT386] Implement opcode groups 0xC6 and 0xC7. Modified: branches/ntvdm/lib/soft386/opgroups.c Modified: branches/ntvdm/lib/soft386/opgroups.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opgroups.c?re… ============================================================================== --- branches/ntvdm/lib/soft386/opgroups.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opgroups.c [iso-8859-1] Sun Sep 29 16:01:10 2013 @@ -243,14 +243,106 @@ SOFT386_OPCODE_HANDLER(Soft386OpcodeGroupC6) { - UNIMPLEMENTED; - return FALSE; // TODO: NOT IMPLEMENTED + UCHAR Immediate; + SOFT386_MOD_REG_RM ModRegRm; + BOOLEAN AddressSize = State->SegmentRegs[SOFT386_REG_CS].Size; + + if (State->PrefixFlags & SOFT386_PREFIX_ADSIZE) + { + /* The ADSIZE prefix toggles the size */ + AddressSize = !AddressSize; + } + + if (!Soft386ParseModRegRm(State, AddressSize, &ModRegRm)) + { + /* Exception occurred */ + return FALSE; + } + + if (ModRegRm.Register != 0) + { + /* Invalid */ + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + /* Get the immediate operand */ + if (!Soft386FetchByte(State, &Immediate)) + { + /* Exception occurred */ + return FALSE; + } + + return Soft386WriteModrmByteOperands(State, + &ModRegRm, + FALSE, + Immediate); } SOFT386_OPCODE_HANDLER(Soft386OpcodeGroupC7) { - UNIMPLEMENTED; - return FALSE; // TODO: NOT IMPLEMENTED + SOFT386_MOD_REG_RM ModRegRm; + BOOLEAN OperandSize, AddressSize; + + OperandSize = AddressSize = State->SegmentRegs[SOFT386_REG_CS].Size; + + if (State->PrefixFlags & SOFT386_PREFIX_OPSIZE) + { + /* The OPSIZE prefix toggles the size */ + OperandSize = !OperandSize; + } + + if (State->PrefixFlags & SOFT386_PREFIX_ADSIZE) + { + /* The ADSIZE prefix toggles the size */ + AddressSize = !AddressSize; + } + + if (!Soft386ParseModRegRm(State, AddressSize, &ModRegRm)) + { + /* Exception occurred */ + return FALSE; + } + + if (ModRegRm.Register != 0) + { + /* Invalid */ + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + if (OperandSize) + { + ULONG Immediate; + + /* Get the immediate operand */ + if (!Soft386FetchDword(State, &Immediate)) + { + /* Exception occurred */ + return FALSE; + } + + return Soft386WriteModrmDwordOperands(State, + &ModRegRm, + FALSE, + Immediate); + } + else + { + USHORT Immediate; + + /* Get the immediate operand */ + if (!Soft386FetchWord(State, &Immediate)) + { + /* Exception occurred */ + return FALSE; + } + + return Soft386WriteModrmWordOperands(State, + &ModRegRm, + FALSE, + Immediate); + } } SOFT386_OPCODE_HANDLER(Soft386OpcodeGroupD0)

1 0

[aandrejevic] 60451: [SOFT386] Implement opcode group 0x8F.
by aandrejevic＠svn.reactos.org 29 Sep '13

29 Sep '13

Author: aandrejevic Date: Sun Sep 29 15:52:20 2013 New Revision: 60451 URL: http://svn.reactos.org/svn/reactos?rev=60451&view=rev Log: [SOFT386] Implement opcode group 0x8F. Modified: branches/ntvdm/lib/soft386/opgroups.c Modified: branches/ntvdm/lib/soft386/opgroups.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opgroups.c?re… ============================================================================== --- branches/ntvdm/lib/soft386/opgroups.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opgroups.c [iso-8859-1] Sun Sep 29 15:52:20 2013 @@ -175,8 +175,58 @@ SOFT386_OPCODE_HANDLER(Soft386OpcodeGroup8F) { - UNIMPLEMENTED; - return FALSE; // TODO: NOT IMPLEMENTED + ULONG Value; + SOFT386_MOD_REG_RM ModRegRm; + BOOLEAN OperandSize, AddressSize; + + OperandSize = AddressSize = State->SegmentRegs[SOFT386_REG_CS].Size; + + if (State->PrefixFlags & SOFT386_PREFIX_OPSIZE) + { + /* The OPSIZE prefix toggles the size */ + OperandSize = !OperandSize; + } + + if (State->PrefixFlags & SOFT386_PREFIX_ADSIZE) + { + /* The ADSIZE prefix toggles the size */ + AddressSize = !AddressSize; + } + + if (!Soft386ParseModRegRm(State, AddressSize, &ModRegRm)) + { + /* Exception occurred */ + return FALSE; + } + + if (ModRegRm.Register != 0) + { + /* Invalid */ + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + /* Pop a value from the stack */ + if (!Soft386StackPop(State, &Value)) + { + /* Exception occurred */ + return FALSE; + } + + if (OperandSize) + { + return Soft386WriteModrmDwordOperands(State, + &ModRegRm, + FALSE, + Value); + } + else + { + return Soft386WriteModrmWordOperands(State, + &ModRegRm, + FALSE, + LOWORD(Value)); + } } SOFT386_OPCODE_HANDLER(Soft386OpcodeGroupC0)

1 0

[aandrejevic] 60450: [SOFT386] Implement opcode group 0x80. Group 0x82 is just an alias to group 0x80.
by aandrejevic＠svn.reactos.org 29 Sep '13

29 Sep '13

Author: aandrejevic Date: Sun Sep 29 15:04:43 2013 New Revision: 60450 URL: http://svn.reactos.org/svn/reactos?rev=60450&view=rev Log: [SOFT386] Implement opcode group 0x80. Group 0x82 is just an alias to group 0x80. Modified: branches/ntvdm/lib/soft386/opcodes.c branches/ntvdm/lib/soft386/opgroups.c branches/ntvdm/lib/soft386/opgroups.h Modified: branches/ntvdm/lib/soft386/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opcodes.c?rev… ============================================================================== --- branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] Sun Sep 29 15:04:43 2013 @@ -154,9 +154,9 @@ Soft386OpcodeShortConditionalJmp, Soft386OpcodeShortConditionalJmp, Soft386OpcodeShortConditionalJmp, - Soft386OpcodeGroup80, + Soft386OpcodeGroup8082, Soft386OpcodeGroup81, - Soft386OpcodeGroup82, + Soft386OpcodeGroup8082, Soft386OpcodeGroup83, Soft386OpcodeTestByteModrm, Soft386OpcodeTestModrm, Modified: branches/ntvdm/lib/soft386/opgroups.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opgroups.c?re… ============================================================================== --- branches/ntvdm/lib/soft386/opgroups.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opgroups.c [iso-8859-1] Sun Sep 29 15:04:43 2013 @@ -21,10 +21,144 @@ /* PUBLIC FUNCTIONS ***********************************************************/ -SOFT386_OPCODE_HANDLER(Soft386OpcodeGroup80) -{ - UNIMPLEMENTED; - return FALSE; // TODO: NOT IMPLEMENTED +SOFT386_OPCODE_HANDLER(Soft386OpcodeGroup8082) +{ + UCHAR Immediate, Result, Dummy, Value; + SOFT386_MOD_REG_RM ModRegRm; + BOOLEAN AddressSize = State->SegmentRegs[SOFT386_REG_CS].Size; + + if (State->PrefixFlags & SOFT386_PREFIX_ADSIZE) + { + /* The ADSIZE prefix toggles the size */ + AddressSize = !AddressSize; + } + + if (!Soft386ParseModRegRm(State, AddressSize, &ModRegRm)) + { + /* Exception occurred */ + return FALSE; + } + + /* Fetch the immediate operand */ + if (!Soft386FetchByte(State, &Immediate)) + { + /* Exception occurred */ + return FALSE; + } + + /* Read the operands */ + if (!Soft386ReadModrmByteOperands(State, &ModRegRm, &Dummy, &Value)) + { + /* Exception occurred */ + return FALSE; + } + + /* Check which operation is this */ + switch (ModRegRm.Register) + { + /* ADD */ + case 0: + { + Result = Value + Immediate; + + /* Update CF, OF and AF */ + State->Flags.Cf = (Result < Value) && (Result < Immediate); + State->Flags.Of = ((Value & SIGN_FLAG_BYTE) == (Immediate & SIGN_FLAG_BYTE)) + && ((Value & SIGN_FLAG_BYTE) != (Result & SIGN_FLAG_BYTE)); + State->Flags.Af = (((Value & 0x0F) + (Immediate & 0x0F)) & 0x10) ? TRUE : FALSE; + + break; + } + + /* OR */ + case 1: + { + Result = Value | Immediate; + break; + } + + /* ADC */ + case 2: + { + INT Carry = State->Flags.Cf ? 1 : 0; + + Result = Value + Immediate + Carry; + + /* Update CF, OF and AF */ + State->Flags.Cf = ((Immediate == 0xFF) && (Carry == 1)) + || ((Result < Value) && (Result < (Immediate + Carry))); + State->Flags.Of = ((Value & SIGN_FLAG_BYTE) == (Immediate & SIGN_FLAG_BYTE)) + && ((Value & SIGN_FLAG_BYTE) != (Result & SIGN_FLAG_BYTE)); + State->Flags.Af = (((Value & 0x0F) + ((Immediate + Carry) & 0x0F)) & 0x10) + ? TRUE : FALSE; + + break; + } + + /* SBB */ + case 3: + { + INT Carry = State->Flags.Cf ? 1 : 0; + + Result = Value - Immediate - Carry; + + /* Update CF, OF and AF */ + State->Flags.Cf = Value < (Immediate + Carry); + State->Flags.Of = ((Value & SIGN_FLAG_BYTE) != (Immediate & SIGN_FLAG_BYTE)) + && ((Value & SIGN_FLAG_BYTE) != (Result & SIGN_FLAG_BYTE)); + State->Flags.Af = (Value & 0x0F) < ((Immediate + Carry) & 0x0F); + + break; + } + + /* AND */ + case 4: + { + Result = Value & Immediate; + break; + } + + /* SUB or CMP */ + case 5: + case 7: + { + Result = Value - Immediate; + + /* Update CF, OF and AF */ + State->Flags.Cf = Value < Immediate; + State->Flags.Of = ((Value & SIGN_FLAG_BYTE) != (Immediate & SIGN_FLAG_BYTE)) + && ((Value & SIGN_FLAG_BYTE) != (Result & SIGN_FLAG_BYTE)); + State->Flags.Af = (Value & 0x0F) < (Immediate & 0x0F); + + break; + } + + /* XOR */ + case 6: + { + Value ^= Immediate; + break; + } + + default: + { + /* Shouldn't happen */ + ASSERT(FALSE); + } + } + + /* Update ZF, SF and PF */ + State->Flags.Zf = (Result == 0) ? TRUE : FALSE; + State->Flags.Sf = (Result & SIGN_FLAG_BYTE) ? TRUE : FALSE; + State->Flags.Pf = Soft386CalculateParity(Result); + + /* Unless this is CMP, write back the result */ + if (ModRegRm.Register != 7) + { + return Soft386WriteModrmByteOperands(State, &ModRegRm, FALSE, Result); + } + + return TRUE; } SOFT386_OPCODE_HANDLER(Soft386OpcodeGroup81) @@ -33,12 +167,6 @@ return FALSE; // TODO: NOT IMPLEMENTED } -SOFT386_OPCODE_HANDLER(Soft386OpcodeGroup82) -{ - UNIMPLEMENTED; - return FALSE; // TODO: NOT IMPLEMENTED -} - SOFT386_OPCODE_HANDLER(Soft386OpcodeGroup83) { UNIMPLEMENTED; Modified: branches/ntvdm/lib/soft386/opgroups.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opgroups.h?re… ============================================================================== --- branches/ntvdm/lib/soft386/opgroups.h [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opgroups.h [iso-8859-1] Sun Sep 29 15:04:43 2013 @@ -11,9 +11,8 @@ /* DEFINES ********************************************************************/ -SOFT386_OPCODE_HANDLER(Soft386OpcodeGroup80); +SOFT386_OPCODE_HANDLER(Soft386OpcodeGroup8082); SOFT386_OPCODE_HANDLER(Soft386OpcodeGroup81); -SOFT386_OPCODE_HANDLER(Soft386OpcodeGroup82); SOFT386_OPCODE_HANDLER(Soft386OpcodeGroup83); SOFT386_OPCODE_HANDLER(Soft386OpcodeGroup8F); SOFT386_OPCODE_HANDLER(Soft386OpcodeGroupC0);

1 0

[akhaldi] 60449: [CABMAN] * Show the status messages only in -V mode. * Improve error messages by marking them as ERROR/WARNING. * Brought to you by David Quintana. CORE-7477 #resolve #comment Comm...
by akhaldi＠svn.reactos.org 29 Sep '13

29 Sep '13

Author: akhaldi Date: Sun Sep 29 14:48:37 2013 New Revision: 60449 URL: http://svn.reactos.org/svn/reactos?rev=60449&view=rev Log: [CABMAN] * Show the status messages only in -V mode. * Improve error messages by marking them as ERROR/WARNING. * Brought to you by David Quintana. CORE-7477 #resolve #comment Committed in r60449. Gracias. Modified: trunk/reactos/tools/cabman/cabinet.cxx trunk/reactos/tools/cabman/cabman.h trunk/reactos/tools/cabman/dfp.cxx trunk/reactos/tools/cabman/main.cxx Modified: trunk/reactos/tools/cabman/cabinet.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabinet.cxx?r… ============================================================================== --- trunk/reactos/tools/cabman/cabinet.cxx [iso-8859-1] (original) +++ trunk/reactos/tools/cabman/cabinet.cxx [iso-8859-1] Sun Sep 29 14:48:37 2013 @@ -607,7 +607,7 @@ SelectCodec(CAB_CODEC_MSZIP); else { - printf("Invalid codec specified!\n"); + printf("ERROR: Invalid codec specified!\n"); return false; } Modified: trunk/reactos/tools/cabman/cabman.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabman.h?rev=… ============================================================================== --- trunk/reactos/tools/cabman/cabman.h [iso-8859-1] (original) +++ trunk/reactos/tools/cabman/cabman.h [iso-8859-1] Sun Sep 29 14:48:37 2013 @@ -24,6 +24,7 @@ virtual ~CCABManager(); bool ParseCmdline(int argc, char* argv[]); bool Run(); + bool IsVerbose() { return Verbose; } private: void Usage(); bool CreateCabinet(); @@ -39,6 +40,9 @@ ULONG Mode; bool PromptOnOverwrite; char FileName[PATH_MAX]; + bool Verbose; }; +extern CCABManager CABMgr; + /* EOF */ Modified: trunk/reactos/tools/cabman/dfp.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/dfp.cxx?rev=6… ============================================================================== --- trunk/reactos/tools/cabman/dfp.cxx [iso-8859-1] (original) +++ trunk/reactos/tools/cabman/dfp.cxx [iso-8859-1] Sun Sep 29 14:48:37 2013 @@ -14,7 +14,7 @@ */ #include <stdlib.h> #include <stdio.h> -#include "cabinet.h" +#include "cabman.h" #include "dfp.h" @@ -345,7 +345,7 @@ if (Status == CAB_STATUS_FAILURE) { - printf("Directive file contains errors at line %u.\n", (UINT)CurrentLine); + printf("ERROR: Directive file contains errors at line %u.\n", (UINT)CurrentLine); DPRINT(MID_TRACE, ("Error while executing command.\n")); } @@ -359,7 +359,7 @@ if (Status != CAB_STATUS_SUCCESS) { - printf("Directive file contains errors at line %u.\n", (UINT)CurrentLine); + printf("ERROR: Directive file contains errors at line %u.\n", (UINT)CurrentLine); DPRINT(MID_TRACE, ("Error while copying file.\n")); } @@ -380,7 +380,7 @@ break; default: - printf("Directive file contains errors at line %u.\n", (UINT)CurrentLine); + printf("ERROR: Directive file contains errors at line %u.\n", (UINT)CurrentLine); DPRINT(MID_TRACE, ("Token is (%u).\n", (UINT)CurrentToken)); return CAB_STATUS_SUCCESS; } @@ -391,7 +391,10 @@ if (!InfFileOnly) { - printf("\nWriting cabinet. This may take a while...\n\n"); + if (CABMgr.IsVerbose()) + { + printf("Writing cabinet. This may take a while...\n"); + } if (DiskCreated) { @@ -415,7 +418,10 @@ } } - printf("\nDone.\n"); + if (CABMgr.IsVerbose()) + { + printf("Done.\n"); + } } return CAB_STATUS_SUCCESS; @@ -1181,7 +1187,7 @@ if (Status != CAB_STATUS_SUCCESS) { DPRINT(MIN_TRACE, ("Cannot create cabinet (%u).\n", (UINT)Status)); - printf("Cannot create cabinet.\n"); + printf("ERROR: Cannot create cabinet.\n"); return CAB_STATUS_FAILURE; } CabinetCreated = true; @@ -1192,7 +1198,7 @@ if (Status != CAB_STATUS_SUCCESS) { DPRINT(MIN_TRACE, ("Cannot create disk (%u).\n", (UINT)Status)); - printf("Cannot create disk.\n"); + printf("ERROR: Cannot create disk.\n"); return CAB_STATUS_FAILURE; } DiskCreated = true; @@ -1219,19 +1225,19 @@ if (strstr(Options,"optional")) { Status = CAB_STATUS_SUCCESS; - printf("Optional file does not exist: %s.\n", SrcName); + printf("Optional file skipped (does not exist): %s.\n", SrcName); } else - printf("File does not exist: %s.\n", SrcName); + printf("ERROR: File not found: %s.\n", SrcName); break; case CAB_STATUS_NOMEMORY: - printf("Insufficient memory to add file: %s.\n", SrcName); + printf("ERROR: Insufficient memory to add file: %s.\n", SrcName); break; default: - printf("Cannot add file: %s (%u).\n", SrcName, (UINT)Status); + printf("ERROR: Cannot add file: %s (%u).\n", SrcName, (UINT)Status); break; } return Status; Modified: trunk/reactos/tools/cabman/main.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/main.cxx?rev=… ============================================================================== --- trunk/reactos/tools/cabman/main.cxx [iso-8859-1] (original) +++ trunk/reactos/tools/cabman/main.cxx [iso-8859-1] Sun Sep 29 14:48:37 2013 @@ -173,6 +173,7 @@ InfFileOnly = false; Mode = CM_MODE_DISPLAY; FileName[0] = 0; + Verbose = false; } @@ -215,7 +216,8 @@ printf(" -RC Specify file to put in cabinet reserved area\n"); printf(" (size must be less than 64KB).\n"); printf(" -S Create simple cabinet.\n"); - printf(" -P dir Files in the .dff are relative to this directory\n"); + printf(" -P dir Files in the .dff are relative to this directory.\n"); + printf(" -V Verbose mode (prints more messages).\n"); } bool CCABManager::ParseCmdline(int argc, char* argv[]) @@ -309,7 +311,7 @@ i++; if (!SetCabinetReservedFile(&argv[i][0])) { - printf("Cannot open cabinet reserved area file.\n"); + printf("ERROR: Cannot open cabinet reserved area file.\n"); return false; } } @@ -317,14 +319,14 @@ { if (!SetCabinetReservedFile(&argv[i][3])) { - printf("Cannot open cabinet reserved area file.\n"); + printf("ERROR: Cannot open cabinet reserved area file.\n"); return false; } } break; default: - printf("Bad parameter %s.\n", argv[i]); + printf("ERROR: Bad parameter %s.\n", argv[i]); return false; } break; @@ -344,9 +346,13 @@ SetFileRelativePath(&argv[i][2]); break; + + case 'V': + Verbose = true; + break; default: - printf("Bad parameter %s.\n", argv[i]); + printf("ERROR: Bad parameter %s.\n", argv[i]); return false; } } @@ -356,7 +362,7 @@ { if(FileName[0]) { - printf("You may only specify one directive file!\n"); + printf("ERROR: You may only specify one directive file!\n"); return false; } else @@ -391,7 +397,7 @@ // Search criteria (= the filename argument) is necessary for creating a simple cabinet if( Mode == CM_MODE_CREATE_SIMPLE && !HasSearchCriteria()) { - printf("You have to enter input file names!\n"); + printf("ERROR: You have to enter input file names!\n"); return false; } @@ -409,7 +415,7 @@ Status = Load(FileName); if (Status != CAB_STATUS_SUCCESS) { - printf("Specified directive file could not be found: %s.\n", FileName); + printf("ERROR: Specified directive file could not be found: %s.\n", FileName); return false; } @@ -430,7 +436,10 @@ if (Open() == CAB_STATUS_SUCCESS) { - printf("Cabinet %s\n\n", GetCabinetName()); + if (Verbose) + { + printf("Cabinet %s\n\n", GetCabinetName()); + } if (FindFirst(&Search) == CAB_STATUS_SUCCESS) { @@ -473,12 +482,12 @@ else { /* There should be at least one file in a cabinet */ - printf("No files in cabinet."); + printf("WARNING: No files in cabinet."); } return true; } else - printf("Cannot open file: %s\n", GetCabinetName()); + printf("ERROR: Cannot open file: %s\n", GetCabinetName()); return false; } @@ -495,7 +504,10 @@ if (Open() == CAB_STATUS_SUCCESS) { - printf("Cabinet %s\n\n", GetCabinetName()); + if (Verbose) + { + printf("Cabinet %s\n\n", GetCabinetName()); + } if (FindFirst(&Search) == CAB_STATUS_SUCCESS) { @@ -507,22 +519,22 @@ break; case CAB_STATUS_INVALID_CAB: - printf("Cabinet contains errors.\n"); + printf("ERROR: Cabinet contains errors.\n"); bRet = false; break; case CAB_STATUS_UNSUPPCOMP: - printf("Cabinet uses unsupported compression type.\n"); + printf("ERROR: Cabinet uses unsupported compression type.\n"); bRet = false; break; case CAB_STATUS_CANNOT_WRITE: - printf("You've run out of free space on the destination volume or the volume is damaged.\n"); + printf("ERROR: You've run out of free space on the destination volume or the volume is damaged.\n"); bRet = false; break; default: - printf("Unspecified error code (%u).\n", (UINT)Status); + printf("ERROR: Unspecified error code (%u).\n", (UINT)Status); bRet = false; break; } @@ -537,7 +549,7 @@ return bRet; } else - printf("Cannot open file: %s.\n", GetCabinetName()); + printf("ERROR: Cannot open file: %s.\n", GetCabinetName()); return false; } @@ -548,7 +560,10 @@ * FUNCTION: Process cabinet */ { - printf("ReactOS Cabinet Manager\n\n"); + if (Verbose) + { + printf("ReactOS Cabinet Manager\n\n"); + } switch (Mode) { @@ -601,21 +616,27 @@ * FileName = Pointer to buffer with name of file (full path) */ { - printf("Extracting %s\n", GetFileName(FileName)); + if (Verbose) + { + printf("Extracting %s\n", GetFileName(FileName)); + } } void CCABManager::OnDiskChange(char* CabinetName, - char* DiskLabel) -/* - * FUNCTION: Called when a new disk is to be processed - * ARGUMENTS: - * CabinetName = Pointer to buffer with name of cabinet - * DiskLabel = Pointer to buffer with label of disk - */ -{ - printf("\nChanging to cabinet %s - %s\n\n", CabinetName, DiskLabel); + char* DiskLabel) + /* + * FUNCTION: Called when a new disk is to be processed + * ARGUMENTS: + * CabinetName = Pointer to buffer with name of cabinet + * DiskLabel = Pointer to buffer with label of disk + */ +{ + if (Verbose) + { + printf("\nChanging to cabinet %s - %s\n\n", CabinetName, DiskLabel); + } } @@ -628,9 +649,13 @@ * FileName = Pointer to buffer with name of file (full path) */ { - printf("Adding %s\n", GetFileName(FileName)); -} - + if (Verbose) + { + printf("Adding %s\n", GetFileName(FileName)); + } +} + +CCABManager CABMgr; int main(int argc, char * argv[]) /* @@ -640,11 +665,9 @@ * argv = Pointer to list of command line arguments */ { - CCABManager CABMgr; bool status = false; - if (CABMgr.ParseCmdline(argc, argv)) - status = CABMgr.Run(); + if (CABMgr.ParseCmdline(argc, argv)) status = CABMgr.Run(); return (status ? 0 : 1); }

1 0

[akhaldi] 60448: [WIN32K] * Improve sanity checking in IntEngAlphaBlend(). Brought to you by Huw Campbell (huw .dot. campbell @at@ gmail .dot. com) CORE-7458 #resolve #comment Committed in r60448. ...
by akhaldi＠svn.reactos.org 29 Sep '13

29 Sep '13

Author: akhaldi Date: Sun Sep 29 14:33:09 2013 New Revision: 60448 URL: http://svn.reactos.org/svn/reactos?rev=60448&view=rev Log: [WIN32K] * Improve sanity checking in IntEngAlphaBlend(). Brought to you by Huw Campbell (huw .dot. campbell @at@ gmail .dot. com) CORE-7458 #resolve #comment Committed in r60448. Thanks ;) Modified: trunk/reactos/win32ss/gdi/eng/alphablend.c Modified: trunk/reactos/win32ss/gdi/eng/alphablend.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/alphablend… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/alphablend.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/alphablend.c [iso-8859-1] Sun Sep 29 14:33:09 2013 @@ -118,7 +118,7 @@ OutputRect.top += Translate.y; OutputRect.bottom += Translate.y; - ASSERT(InputRect.left < InputRect.right && InputRect.top < InputRect.bottom); + ASSERT(InputRect.left <= InputRect.right && InputRect.top <= InputRect.bottom); Ret = FALSE; ClippingType = (ClipRegion == NULL) ? DC_TRIVIAL : ClipRegion->iDComplexity; @@ -141,7 +141,6 @@ Rect.right = InputRect.right + (CombinedRect.right - OutputRect.right) * (InputRect.right - InputRect.left) / (OutputRect.right - OutputRect.left); Rect.top = InputRect.top + (CombinedRect.top - OutputRect.top) * (InputRect.bottom - InputRect.top) / (OutputRect.bottom - OutputRect.top); Rect.bottom = InputRect.bottom + (CombinedRect.bottom - OutputRect.bottom) * (InputRect.bottom - InputRect.top) / (OutputRect.bottom - OutputRect.top); - ASSERT(InputRect.left < InputRect.right && InputRect.top < InputRect.bottom); /* Aplha blend one rect */ Ret = DibFunctionsForBitmapFormat[OutputObj->iBitmapFormat].DIB_AlphaBlend( @@ -170,7 +169,6 @@ Rect.right = InputRect.right + (CombinedRect.right - OutputRect.right) * (InputRect.right - InputRect.left) / (OutputRect.right - OutputRect.left); Rect.top = InputRect.top + (CombinedRect.top - OutputRect.top) * (InputRect.bottom - InputRect.top) / (OutputRect.bottom - OutputRect.top); Rect.bottom = InputRect.bottom + (CombinedRect.bottom - OutputRect.bottom) * (InputRect.bottom - InputRect.top) / (OutputRect.bottom - OutputRect.top); - ASSERT(InputRect.left < InputRect.right && InputRect.top < InputRect.bottom); /* Alpha blend one rect */ Ret = DibFunctionsForBitmapFormat[OutputObj->iBitmapFormat].DIB_AlphaBlend(

1 0

[akhaldi] 60447: [DINPUT_WINETEST] * Speedup build.
by akhaldi＠svn.reactos.org 29 Sep '13

29 Sep '13

Author: akhaldi Date: Sun Sep 29 12:17:56 2013 New Revision: 60447 URL: http://svn.reactos.org/svn/reactos?rev=60447&view=rev Log: [DINPUT_WINETEST] * Speedup build. Modified: trunk/rostests/winetests/dinput/CMakeLists.txt Modified: trunk/rostests/winetests/dinput/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/dinput/CMakeLis… ============================================================================== --- trunk/rostests/winetests/dinput/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/dinput/CMakeLists.txt [iso-8859-1] Sun Sep 29 12:17:56 2013 @@ -1,5 +1,3 @@ - -add_definitions(-D__ROS_LONG64__) add_executable(dinput_winetest device.c @@ -9,7 +7,7 @@ mouse.c testlist.c) -target_link_libraries(dinput_winetest wine dinput_data_formats) +target_link_libraries(dinput_winetest dinput_data_formats) set_module_type(dinput_winetest win32cui) -add_importlibs(dinput_winetest dinput ole32 user32 msvcrt kernel32 ntdll) +add_importlibs(dinput_winetest dinput ole32 user32 msvcrt kernel32) add_cd_file(TARGET dinput_winetest DESTINATION reactos/bin FOR all)

1 0

← Newer
1
2
3
4
5
6
7
...
56
Older →

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