Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 60619: [NTOSKRNL] * Add a sanity check to prevent a potential out-of-bounds write. CID 731662. CORE-6681
by akhaldi＠svn.reactos.org 11 Oct '13

11 Oct '13

Author: akhaldi Date: Fri Oct 11 19:37:29 2013 New Revision: 60619 URL: http://svn.reactos.org/svn/reactos?rev=60619&view=rev Log: [NTOSKRNL] * Add a sanity check to prevent a potential out-of-bounds write. CID 731662. CORE-6681 Modified: trunk/reactos/ntoskrnl/ob/oblife.c 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] Fri Oct 11 19:37:29 2013 @@ -1236,6 +1236,9 @@ /* Set the index and the entry into the object type array */ LocalObjectType->Index = ObpTypeObjectType->TotalNumberOfObjects; + + NT_ASSERT(LocalObjectType->Index != 0); + if (LocalObjectType->Index < 32) { /* It fits, insert it */

1 0

[aandrejevic] 60618: [SOFT386] Fix a bad call to RtlFillMemory.
by aandrejevic＠svn.reactos.org 11 Oct '13

11 Oct '13

Author: aandrejevic Date: Fri Oct 11 19:24:58 2013 New Revision: 60618 URL: http://svn.reactos.org/svn/reactos?rev=60618&view=rev Log: [SOFT386] Fix a bad call to RtlFillMemory. Modified: branches/ntvdm/lib/soft386/opcodes.c 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] Fri Oct 11 19:24:58 2013 @@ -6135,7 +6135,7 @@ /* Fill the memory block with the data */ if (DataSize == sizeof(UCHAR)) { - RtlFillMemory(Block, State->GeneralRegs[SOFT386_REG_EAX].LowByte, sizeof(Block)); + RtlFillMemory(Block, sizeof(Block), State->GeneralRegs[SOFT386_REG_EAX].LowByte); } else {

1 0

[aandrejevic] 60617: [SOFT386] Fix incorrect (reverse) handling of the DF flag.
by aandrejevic＠svn.reactos.org 11 Oct '13

11 Oct '13

Author: aandrejevic Date: Fri Oct 11 19:02:06 2013 New Revision: 60617 URL: http://svn.reactos.org/svn/reactos?rev=60617&view=rev Log: [SOFT386] Fix incorrect (reverse) handling of the DF flag. Modified: branches/ntvdm/lib/soft386/opcodes.c 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] Fri Oct 11 19:02:06 2013 @@ -5960,7 +5960,7 @@ /* Increment/decrement ESI and EDI */ if (OperandSize) { - if (State->Flags.Df) + if (!State->Flags.Df) { State->GeneralRegs[SOFT386_REG_ESI].Long += DataSize; State->GeneralRegs[SOFT386_REG_EDI].Long += DataSize; @@ -5973,7 +5973,7 @@ } else { - if (State->Flags.Df) + if (!State->Flags.Df) { State->GeneralRegs[SOFT386_REG_ESI].LowWord += DataSize; State->GeneralRegs[SOFT386_REG_EDI].LowWord += DataSize; @@ -6071,7 +6071,7 @@ /* Increment/decrement ESI and EDI */ if (OperandSize) { - if (State->Flags.Df) + if (!State->Flags.Df) { State->GeneralRegs[SOFT386_REG_ESI].Long += DataSize; State->GeneralRegs[SOFT386_REG_EDI].Long += DataSize; @@ -6084,7 +6084,7 @@ } else { - if (State->Flags.Df) + if (!State->Flags.Df) { State->GeneralRegs[SOFT386_REG_ESI].LowWord += DataSize; State->GeneralRegs[SOFT386_REG_EDI].LowWord += DataSize; @@ -6214,12 +6214,12 @@ /* Increment/decrement EDI */ if (OperandSize) { - if (State->Flags.Df) State->GeneralRegs[SOFT386_REG_EDI].Long += DataSize; + if (!State->Flags.Df) State->GeneralRegs[SOFT386_REG_EDI].Long += DataSize; else State->GeneralRegs[SOFT386_REG_EDI].Long -= DataSize; } else { - if (State->Flags.Df) State->GeneralRegs[SOFT386_REG_EDI].LowWord += DataSize; + if (!State->Flags.Df) State->GeneralRegs[SOFT386_REG_EDI].LowWord += DataSize; else State->GeneralRegs[SOFT386_REG_EDI].LowWord -= DataSize; } } @@ -6291,12 +6291,12 @@ /* Increment/decrement ESI */ if (OperandSize) { - if (State->Flags.Df) State->GeneralRegs[SOFT386_REG_ESI].Long += DataSize; + if (!State->Flags.Df) State->GeneralRegs[SOFT386_REG_ESI].Long += DataSize; else State->GeneralRegs[SOFT386_REG_ESI].Long -= DataSize; } else { - if (State->Flags.Df) State->GeneralRegs[SOFT386_REG_ESI].LowWord += DataSize; + if (!State->Flags.Df) State->GeneralRegs[SOFT386_REG_ESI].LowWord += DataSize; else State->GeneralRegs[SOFT386_REG_ESI].LowWord -= DataSize; } @@ -6375,12 +6375,12 @@ /* Increment/decrement EDI */ if (OperandSize) { - if (State->Flags.Df) State->GeneralRegs[SOFT386_REG_EDI].Long += DataSize; + if (!State->Flags.Df) State->GeneralRegs[SOFT386_REG_EDI].Long += DataSize; else State->GeneralRegs[SOFT386_REG_EDI].Long -= DataSize; } else { - if (State->Flags.Df) State->GeneralRegs[SOFT386_REG_EDI].LowWord += DataSize; + if (!State->Flags.Df) State->GeneralRegs[SOFT386_REG_EDI].LowWord += DataSize; else State->GeneralRegs[SOFT386_REG_EDI].LowWord -= DataSize; } @@ -6511,12 +6511,12 @@ /* Increment/decrement EDI */ if (OperandSize) { - if (State->Flags.Df) State->GeneralRegs[SOFT386_REG_EDI].Long += DataSize; + if (!State->Flags.Df) State->GeneralRegs[SOFT386_REG_EDI].Long += DataSize; else State->GeneralRegs[SOFT386_REG_EDI].Long -= DataSize; } else { - if (State->Flags.Df) State->GeneralRegs[SOFT386_REG_EDI].LowWord += DataSize; + if (!State->Flags.Df) State->GeneralRegs[SOFT386_REG_EDI].LowWord += DataSize; else State->GeneralRegs[SOFT386_REG_EDI].LowWord -= DataSize; } } @@ -6650,12 +6650,12 @@ /* Increment/decrement ESI */ if (OperandSize) { - if (State->Flags.Df) State->GeneralRegs[SOFT386_REG_ESI].Long += DataSize; + if (!State->Flags.Df) State->GeneralRegs[SOFT386_REG_ESI].Long += DataSize; else State->GeneralRegs[SOFT386_REG_ESI].Long -= DataSize; } else { - if (State->Flags.Df) State->GeneralRegs[SOFT386_REG_ESI].LowWord += DataSize; + if (!State->Flags.Df) State->GeneralRegs[SOFT386_REG_ESI].LowWord += DataSize; else State->GeneralRegs[SOFT386_REG_ESI].LowWord -= DataSize; } }

1 0

[aandrejevic] 60616: [SOFT386] Implement the REP prefix for OUTS, LODS and STOS.
by aandrejevic＠svn.reactos.org 11 Oct '13

11 Oct '13

Author: aandrejevic Date: Fri Oct 11 18:34:31 2013 New Revision: 60616 URL: http://svn.reactos.org/svn/reactos?rev=60616&view=rev Log: [SOFT386] Implement the REP prefix for OUTS, LODS and STOS. Modified: branches/ntvdm/lib/soft386/opcodes.c 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] Fri Oct 11 18:34:31 2013 @@ -6122,40 +6122,106 @@ AddressSize = !AddressSize; } - if ((State->PrefixFlags & SOFT386_PREFIX_REP) - || (State->PrefixFlags & SOFT386_PREFIX_REPNZ)) - { - // TODO: The REP/REPZ/REPNZ prefixes need to be implemented! - Soft386Exception(State, SOFT386_EXCEPTION_UD); - return FALSE; - } - /* Calculate the size */ if (Opcode == 0xAA) DataSize = sizeof(UCHAR); else DataSize = OperandSize ? sizeof(ULONG) : sizeof(USHORT); - /* Write to the destination operand */ - if (!Soft386WriteMemory(State, - SOFT386_REG_ES, - AddressSize ? State->GeneralRegs[SOFT386_REG_EDI].Long - : State->GeneralRegs[SOFT386_REG_EDI].LowWord, - &State->GeneralRegs[SOFT386_REG_EAX].Long, - DataSize)) - { - /* Exception occurred */ - return FALSE; - } - - /* Increment/decrement EDI */ - if (OperandSize) - { - if (State->Flags.Df) State->GeneralRegs[SOFT386_REG_EDI].Long += DataSize; - else State->GeneralRegs[SOFT386_REG_EDI].Long -= DataSize; + if (State->PrefixFlags & SOFT386_PREFIX_REP) + { + UCHAR Block[STRING_BLOCK_SIZE]; + ULONG Count = OperandSize ? State->GeneralRegs[SOFT386_REG_ECX].Long + : State->GeneralRegs[SOFT386_REG_ECX].LowWord; + + /* Fill the memory block with the data */ + if (DataSize == sizeof(UCHAR)) + { + RtlFillMemory(Block, State->GeneralRegs[SOFT386_REG_EAX].LowByte, sizeof(Block)); + } + else + { + ULONG i; + + for (i = 0; i < STRING_BLOCK_SIZE / DataSize; i++) + { + if (DataSize == sizeof(USHORT)) + { + ((PUSHORT)Block)[i] = State->GeneralRegs[SOFT386_REG_EAX].LowWord; + } + else + { + ((PULONG)Block)[i] = State->GeneralRegs[SOFT386_REG_EAX].Long; + } + } + } + + /* Transfer until finished */ + while (Count) + { + ULONG Processed = min(Count, STRING_BLOCK_SIZE / DataSize); + + if (State->Flags.Df) + { + /* Reduce EDI by the number of bytes to transfer */ + if (AddressSize) State->GeneralRegs[SOFT386_REG_EDI].Long -= Processed * DataSize; + else State->GeneralRegs[SOFT386_REG_EDI].LowWord -= Processed * DataSize; + } + + /* Write to memory */ + if (!Soft386WriteMemory(State, + SOFT386_REG_ES, + AddressSize ? State->GeneralRegs[SOFT386_REG_EDI].Long + : State->GeneralRegs[SOFT386_REG_EDI].LowWord, + Block, + Processed * DataSize)) + { + /* Set ECX */ + if (OperandSize) State->GeneralRegs[SOFT386_REG_ECX].Long = Count; + else State->GeneralRegs[SOFT386_REG_ECX].LowWord = LOWORD(Count); + + /* Exception occurred */ + return FALSE; + } + + if (!State->Flags.Df) + { + /* Increase EDI by the number of bytes transfered */ + if (AddressSize) State->GeneralRegs[SOFT386_REG_EDI].Long += Processed * DataSize; + else State->GeneralRegs[SOFT386_REG_EDI].LowWord += Processed * DataSize; + } + + /* Reduce the total count by the number processed in this run */ + Count -= Processed; + } + + /* Clear ECX */ + if (OperandSize) State->GeneralRegs[SOFT386_REG_ECX].Long = 0; + else State->GeneralRegs[SOFT386_REG_ECX].LowWord = 0; } else { - if (State->Flags.Df) State->GeneralRegs[SOFT386_REG_EDI].LowWord += DataSize; - else State->GeneralRegs[SOFT386_REG_EDI].LowWord -= DataSize; + /* Write to the destination operand */ + if (!Soft386WriteMemory(State, + SOFT386_REG_ES, + AddressSize ? State->GeneralRegs[SOFT386_REG_EDI].Long + : State->GeneralRegs[SOFT386_REG_EDI].LowWord, + &State->GeneralRegs[SOFT386_REG_EAX].Long, + DataSize)) + { + /* Exception occurred */ + return FALSE; + } + + /* Increment/decrement EDI */ + if (OperandSize) + { + if (State->Flags.Df) State->GeneralRegs[SOFT386_REG_EDI].Long += DataSize; + else State->GeneralRegs[SOFT386_REG_EDI].Long -= DataSize; + } + else + { + if (State->Flags.Df) State->GeneralRegs[SOFT386_REG_EDI].LowWord += DataSize; + else State->GeneralRegs[SOFT386_REG_EDI].LowWord -= DataSize; + } } /* Return success */ @@ -6182,19 +6248,32 @@ { /* The ADSIZE prefix toggles the size */ AddressSize = !AddressSize; - } - - if ((State->PrefixFlags & SOFT386_PREFIX_REP) - || (State->PrefixFlags & SOFT386_PREFIX_REPNZ)) - { - // TODO: The REP/REPZ/REPNZ prefixes need to be implemented! - Soft386Exception(State, SOFT386_EXCEPTION_UD); - return FALSE; } /* Calculate the size */ if (Opcode == 0xAC) DataSize = sizeof(UCHAR); else DataSize = OperandSize ? sizeof(ULONG) : sizeof(USHORT); + + if (State->PrefixFlags & SOFT386_PREFIX_REP) + { + ULONG Count = OperandSize ? State->GeneralRegs[SOFT386_REG_ECX].Long + : State->GeneralRegs[SOFT386_REG_ECX].LowWord; + + /* If the count is 0, do nothing */ + if (Count == 0) return TRUE; + + /* Only the last entry will be loaded */ + if (!State->Flags.Df) + { + if (AddressSize) State->GeneralRegs[SOFT386_REG_ESI].Long += (Count - 1) * DataSize; + else State->GeneralRegs[SOFT386_REG_ESI].LowWord += (Count - 1) * DataSize; + } + else + { + if (AddressSize) State->GeneralRegs[SOFT386_REG_ESI].Long -= (Count - 1) * DataSize; + else State->GeneralRegs[SOFT386_REG_ESI].LowWord -= (Count - 1) * DataSize; + } + } /* Read from the source operand */ if (!Soft386ReadMemory(State, @@ -6448,7 +6527,6 @@ SOFT386_OPCODE_HANDLER(Soft386OpcodeOuts) { - ULONG Data = 0; ULONG DataSize; BOOLEAN OperandSize, AddressSize; @@ -6467,49 +6545,119 @@ { /* The ADSIZE prefix toggles the size */ AddressSize = !AddressSize; - } - - if ((State->PrefixFlags & SOFT386_PREFIX_REP) - || (State->PrefixFlags & SOFT386_PREFIX_REPNZ)) - { - // TODO: The REP/REPZ/REPNZ prefixes need to be implemented! - Soft386Exception(State, SOFT386_EXCEPTION_UD); - return FALSE; } /* Calculate the size */ if (Opcode == 0x6E) DataSize = sizeof(UCHAR); else DataSize = OperandSize ? sizeof(ULONG) : sizeof(USHORT); - /* Read from the source operand */ - if (!Soft386ReadMemory(State, - SOFT386_REG_DS, - AddressSize ? State->GeneralRegs[SOFT386_REG_ESI].Long - : State->GeneralRegs[SOFT386_REG_ESI].LowWord, - FALSE, - &Data, - DataSize)) - { - /* Exception occurred */ - return FALSE; - } - - /* Write to the I/O port */ - State->IoWriteCallback(State, - State->GeneralRegs[SOFT386_REG_EDX].LowWord, - &Data, - DataSize); - - /* Increment/decrement ESI */ - if (OperandSize) - { - if (State->Flags.Df) State->GeneralRegs[SOFT386_REG_ESI].Long += DataSize; - else State->GeneralRegs[SOFT386_REG_ESI].Long -= DataSize; + if (State->PrefixFlags & SOFT386_PREFIX_REP) + { + UCHAR Block[STRING_BLOCK_SIZE]; + ULONG Count = OperandSize ? State->GeneralRegs[SOFT386_REG_ECX].Long + : State->GeneralRegs[SOFT386_REG_ECX].LowWord; + + /* Clear the memory block */ + RtlZeroMemory(Block, sizeof(Block)); + + /* Transfer until finished */ + while (Count) + { + ULONG Processed = min(Count, STRING_BLOCK_SIZE / DataSize); + + /* Read from memory */ + if (!Soft386ReadMemory(State, + SOFT386_REG_ES, + AddressSize ? State->GeneralRegs[SOFT386_REG_EDI].Long + : State->GeneralRegs[SOFT386_REG_EDI].LowWord, + FALSE, + Block, + Processed * DataSize)) + { + /* Set ECX */ + if (OperandSize) State->GeneralRegs[SOFT386_REG_ECX].Long = Count; + else State->GeneralRegs[SOFT386_REG_ECX].LowWord = LOWORD(Count); + + /* Exception occurred */ + return FALSE; + } + + if (State->Flags.Df) + { + ULONG i, j; + + /* Reduce EDI by the number of bytes to transfer */ + if (AddressSize) State->GeneralRegs[SOFT386_REG_EDI].Long -= Processed * DataSize; + else State->GeneralRegs[SOFT386_REG_EDI].LowWord -= Processed * DataSize; + + /* Reverse the block data */ + for (i = 0; i < Processed / 2; i++) + { + /* Swap the values */ + for (j = 0; j < DataSize; j++) + { + UCHAR Temp = Block[i * DataSize + j]; + Block[i * DataSize + j] = Block[(Processed - i - 1) * DataSize + j]; + Block[(Processed - i - 1) * DataSize + j] = Temp; + } + } + } + + /* Write to the I/O port */ + State->IoWriteCallback(State, + State->GeneralRegs[SOFT386_REG_EDX].LowWord, + Block, + Processed * DataSize); + + if (!State->Flags.Df) + { + /* Increase EDI by the number of bytes transfered */ + if (AddressSize) State->GeneralRegs[SOFT386_REG_EDI].Long += Processed * DataSize; + else State->GeneralRegs[SOFT386_REG_EDI].LowWord += Processed * DataSize; + } + + /* Reduce the total count by the number processed in this run */ + Count -= Processed; + } + + /* Clear ECX */ + if (OperandSize) State->GeneralRegs[SOFT386_REG_ECX].Long = 0; + else State->GeneralRegs[SOFT386_REG_ECX].LowWord = 0; } else { - if (State->Flags.Df) State->GeneralRegs[SOFT386_REG_ESI].LowWord += DataSize; - else State->GeneralRegs[SOFT386_REG_ESI].LowWord -= DataSize; + ULONG Data = 0; + + /* Read from the source operand */ + if (!Soft386ReadMemory(State, + SOFT386_REG_DS, + AddressSize ? State->GeneralRegs[SOFT386_REG_ESI].Long + : State->GeneralRegs[SOFT386_REG_ESI].LowWord, + FALSE, + &Data, + DataSize)) + { + /* Exception occurred */ + return FALSE; + } + + /* Write to the I/O port */ + State->IoWriteCallback(State, + State->GeneralRegs[SOFT386_REG_EDX].LowWord, + &Data, + DataSize); + + /* Increment/decrement ESI */ + if (OperandSize) + { + if (State->Flags.Df) State->GeneralRegs[SOFT386_REG_ESI].Long += DataSize; + else State->GeneralRegs[SOFT386_REG_ESI].Long -= DataSize; + } + else + { + if (State->Flags.Df) State->GeneralRegs[SOFT386_REG_ESI].LowWord += DataSize; + else State->GeneralRegs[SOFT386_REG_ESI].LowWord -= DataSize; + } } /* Return success */

1 0

[akhaldi] 60615: [NTOSKRNL] * Fix the owner's attributes handling when releasing the working set lock. CIDs 731438 and 731439. CORE-6681
by akhaldi＠svn.reactos.org 11 Oct '13

11 Oct '13

Author: akhaldi Date: Fri Oct 11 18:12:16 2013 New Revision: 60615 URL: http://svn.reactos.org/svn/reactos?rev=60615&view=rev Log: [NTOSKRNL] * Fix the owner's attributes handling when releasing the working set lock. CIDs 731438 and 731439. CORE-6681 Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/ARM3/virtual.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Fri Oct 11 18:12:16 2013 @@ -1307,8 +1307,8 @@ VOID MiUnlockProcessWorkingSetForFault(IN PEPROCESS Process, IN PETHREAD Thread, - IN BOOLEAN Safe, - IN BOOLEAN Shared) + OUT PBOOLEAN Safe, + OUT PBOOLEAN Shared) { ASSERT(MI_WS_OWNER(Process)); @@ -1317,22 +1317,22 @@ { /* Release unsafely */ MiUnlockProcessWorkingSetUnsafe(Process, Thread); - Safe = FALSE; - Shared = FALSE; + *Safe = FALSE; + *Shared = FALSE; } else if (Thread->OwnsProcessWorkingSetExclusive == 1) { /* Owner is safe and exclusive, release normally */ MiUnlockProcessWorkingSet(Process, Thread); - Safe = TRUE; - Shared = FALSE; + *Safe = TRUE; + *Shared = FALSE; } else { /* Owner is shared (implies safe), release normally */ ASSERT(FALSE); - Safe = TRUE; - Shared = TRUE; + *Safe = TRUE; + *Shared = TRUE; } } 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] Fri Oct 11 18:12:16 2013 @@ -223,8 +223,8 @@ /* Release the working set lock */ MiUnlockProcessWorkingSetForFault(CurrentProcess, CurrentThread, - WsSafe, - WsShared); + &WsSafe, + &WsShared); /* Fault it in */ Status = MmAccessFault(FALSE, PageTableVirtualAddress, KernelMode, NULL);

1 0

[akhaldi] 60614: [WINDOWSCODECSEXT_WINETEST] * Import from Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 11 Oct '13

11 Oct '13

Author: akhaldi Date: Fri Oct 11 18:10:20 2013 New Revision: 60614 URL: http://svn.reactos.org/svn/reactos?rev=60614&view=rev Log: [WINDOWSCODECSEXT_WINETEST] * Import from Wine 1.7.1. CORE-7469 Added: trunk/rostests/winetests/windowscodecsext/ trunk/rostests/winetests/windowscodecsext/CMakeLists.txt (with props) trunk/rostests/winetests/windowscodecsext/testlist.c (with props) trunk/rostests/winetests/windowscodecsext/transform.c (with props) Modified: trunk/rostests/winetests/CMakeLists.txt Modified: trunk/rostests/winetests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/CMakeLists.txt?… ============================================================================== --- trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] Fri Oct 11 18:10:20 2013 @@ -101,6 +101,7 @@ add_subdirectory(version) add_subdirectory(wbemprox) add_subdirectory(windowscodecs) +add_subdirectory(windowscodecsext) add_subdirectory(winhttp) add_subdirectory(wininet) add_subdirectory(winmm) Added: trunk/rostests/winetests/windowscodecsext/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/windowscodecsex… ============================================================================== --- trunk/rostests/winetests/windowscodecsext/CMakeLists.txt (added) +++ trunk/rostests/winetests/windowscodecsext/CMakeLists.txt [iso-8859-1] Fri Oct 11 18:10:20 2013 @@ -0,0 +1,9 @@ + +list(APPEND SOURCE + transform.c + testlist.c) + +add_executable(windowscodecsext_winetest ${SOURCE}) +set_module_type(windowscodecsext_winetest win32cui) +add_importlibs(windowscodecsext_winetest ole32 windowscodecsext msvcrt kernel32) +add_cd_file(TARGET windowscodecsext_winetest DESTINATION reactos/bin FOR all) Propchange: trunk/rostests/winetests/windowscodecsext/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/windowscodecsext/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/windowscodecsex… ============================================================================== --- trunk/rostests/winetests/windowscodecsext/testlist.c (added) +++ trunk/rostests/winetests/windowscodecsext/testlist.c [iso-8859-1] Fri Oct 11 18:10:20 2013 @@ -0,0 +1,12 @@ +/* Automatically generated file; DO NOT EDIT!! */ + +#define STANDALONE +#include <wine/test.h> + +extern void func_transform(void); + +const struct test winetest_testlist[] = +{ + { "transform", func_transform }, + { 0, 0 } +}; Propchange: trunk/rostests/winetests/windowscodecsext/testlist.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/windowscodecsext/transform.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/windowscodecsex… ============================================================================== --- trunk/rostests/winetests/windowscodecsext/transform.c (added) +++ trunk/rostests/winetests/windowscodecsext/transform.c [iso-8859-1] Fri Oct 11 18:10:20 2013 @@ -0,0 +1,64 @@ +/* + * Copyright 2013 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 + */ + +#define COBJMACROS + +#include <stdio.h> +#include "windows.h" +#include "objbase.h" +#include "wincodec.h" +#include "wine/test.h" + +HRESULT WINAPI WICCreateColorTransform_Proxy(IWICColorTransform**); + +static void test_WICCreateColorTransform_Proxy(void) +{ + HRESULT hr; + IWICColorTransform *transform; + + hr = WICCreateColorTransform_Proxy( NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + transform = NULL; + hr = WICCreateColorTransform_Proxy( &transform ); + ok( hr == S_OK, "got %08x\n", hr ); + if (transform) IWICColorTransform_Release( transform ); + + hr = CoInitializeEx( NULL, COINIT_APARTMENTTHREADED ); + ok( hr == S_OK, "got %08x\n", hr ); + + transform = NULL; + hr = WICCreateColorTransform_Proxy( &transform ); + ok( hr == S_OK, "got %08x\n", hr ); + if (transform) IWICColorTransform_Release( transform ); + CoUninitialize(); + + hr = CoInitializeEx( NULL, COINIT_MULTITHREADED ); + ok( hr == S_OK, "got %08x\n", hr ); + + transform = NULL; + hr = WICCreateColorTransform_Proxy( &transform ); + ok( hr == S_OK, "got %08x\n", hr ); + if (transform) IWICColorTransform_Release( transform ); + CoUninitialize(); +} + +START_TEST(transform) +{ + test_WICCreateColorTransform_Proxy(); +} Propchange: trunk/rostests/winetests/windowscodecsext/transform.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 60613: [WINDOWSCODECSEXT] * Import from Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 11 Oct '13

11 Oct '13

Author: akhaldi Date: Fri Oct 11 18:08:24 2013 New Revision: 60613 URL: http://svn.reactos.org/svn/reactos?rev=60613&view=rev Log: [WINDOWSCODECSEXT] * Import from Wine 1.7.1. CORE-7469 Added: trunk/reactos/dll/win32/windowscodecsext/ (with props) trunk/reactos/dll/win32/windowscodecsext/CMakeLists.txt (with props) trunk/reactos/dll/win32/windowscodecsext/main.c (with props) trunk/reactos/dll/win32/windowscodecsext/windowscodecsext.spec (with props) Modified: trunk/reactos/dll/win32/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] Fri Oct 11 18:08:24 2013 @@ -219,6 +219,7 @@ add_subdirectory(wdmaud.drv) endif() add_subdirectory(windowscodecs) +add_subdirectory(windowscodecsext) add_subdirectory(winemp3.acm) add_subdirectory(winfax) add_subdirectory(wing32) Propchange: trunk/reactos/dll/win32/windowscodecsext/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Fri Oct 11 18:08:24 2013 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/windowscodecsext/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/windowscodecsext/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/windowscodecsext/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/windowscodecsext/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecsext… ============================================================================== --- trunk/reactos/dll/win32/windowscodecsext/CMakeLists.txt (added) +++ trunk/reactos/dll/win32/windowscodecsext/CMakeLists.txt [iso-8859-1] Fri Oct 11 18:08:24 2013 @@ -0,0 +1,14 @@ + +add_definitions(-D__WINESRC__) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +spec2def(windowscodecsext.dll windowscodecsext.spec ADD_IMPORTLIB) + +list(APPEND SOURCE + main.c + ${CMAKE_CURRENT_BINARY_DIR}/windowscodecsext.def) + +add_library(windowscodecsext SHARED ${SOURCE}) +set_module_type(windowscodecsext win32dll) +target_link_libraries(windowscodecsext wine) +add_importlibs(windowscodecsext ole32 msvcrt kernel32 ntdll) +add_cd_file(TARGET windowscodecsext DESTINATION reactos/system32 FOR all) Propchange: trunk/reactos/dll/win32/windowscodecsext/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/windowscodecsext/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecsext… ============================================================================== --- trunk/reactos/dll/win32/windowscodecsext/main.c (added) +++ trunk/reactos/dll/win32/windowscodecsext/main.c [iso-8859-1] Fri Oct 11 18:08:24 2013 @@ -0,0 +1,95 @@ +/* + * Windows Codecs Extensions + * + * Copyright 2013 Austin English + * + * 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> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "initguid.h" +#include "wincodec.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) +{ + TRACE("(%p, %u, %p)\n", instance, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +} + +/****************************************************************** + * DllGetClassObject + */ +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) +{ + FIXME("(%s,%s,%p) stub\n", debugstr_guid(rclsid), debugstr_guid(iid), ppv); + + return CLASS_E_CLASSNOTAVAILABLE; +} + +HRESULT WINAPI WICCreateColorTransform_Proxy(IWICColorTransform **ppIWICColorTransform) +{ + HRESULT hr, init; + IWICImagingFactory *factory; + + TRACE("(%p)\n", ppIWICColorTransform); + + if (!ppIWICColorTransform) return E_INVALIDARG; + + init = CoInitializeEx(NULL, COINIT_MULTITHREADED); + + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICImagingFactory, (void **)&factory); + if (FAILED(hr)) + { + if (SUCCEEDED(init)) CoUninitialize(); + return hr; + } + hr = IWICImagingFactory_CreateColorTransformer(factory, ppIWICColorTransform); + IWICImagingFactory_Release(factory); + + if (SUCCEEDED(init)) CoUninitialize(); + return hr; +} + +HRESULT WINAPI IWICColorTransform_Initialize_Proxy_W(IWICColorTransform *iface, + IWICBitmapSource *pIBitmapSource, IWICColorContext *pIContextSource, + IWICColorContext *pIContextDest, REFWICPixelFormatGUID pixelFmtDest) +{ + TRACE("(%p,%p,%p,%p,%s)\n", iface, pIBitmapSource, pIContextSource, pIContextDest, + debugstr_guid(pixelFmtDest)); + + return IWICColorTransform_Initialize(iface, pIBitmapSource, pIContextSource, + pIContextDest, pixelFmtDest); +} Propchange: trunk/reactos/dll/win32/windowscodecsext/main.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/windowscodecsext/windowscodecsext.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecsext… ============================================================================== --- trunk/reactos/dll/win32/windowscodecsext/windowscodecsext.spec (added) +++ trunk/reactos/dll/win32/windowscodecsext/windowscodecsext.spec [iso-8859-1] Fri Oct 11 18:08:24 2013 @@ -0,0 +1,3 @@ +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall IWICColorTransform_Initialize_Proxy(ptr ptr ptr ptr ptr) IWICColorTransform_Initialize_Proxy_W +@ stdcall WICCreateColorTransform_Proxy(ptr) Propchange: trunk/reactos/dll/win32/windowscodecsext/windowscodecsext.spec ------------------------------------------------------------------------------ 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] Fri Oct 11 18:08:24 2013 @@ -48,179 +48,180 @@ reactos/dll/directx/wine/quartz # Synced to Wine-1.7.1 reactos/dll/directx/wine/wined3d # Synced to Wine-1.7.1 -reactos/dll/win32/activeds # Synced to Wine-1.1.43? -reactos/dll/win32/actxprxy # Synced to Wine-1.5.26 -reactos/dll/win32/advpack # Synced to Wine-1.7.1 -reactos/dll/win32/atl # Synced to Wine-1.7.1 -reactos/dll/win32/atl100 # Synced to Wine-1.7.1 -reactos/dll/win32/atl80 # Synced to Wine-1.7.1 -reactos/dll/win32/avifil32 # Synced to Wine-1.7.1 -reactos/dll/win32/bcrypt # Synced to Wine-1.5.26 -reactos/dll/win32/browseui # Out of sync -reactos/dll/win32/cabinet # Synced to Wine-1.5.26 -reactos/dll/win32/clusapi # Synced to Wine-1.7.1 -reactos/dll/win32/comcat # Synced to Wine-1.7.1 -reactos/dll/win32/comctl32 # Synced to Wine 1.7.1 -reactos/dll/win32/comdlg32 # Synced to Wine 1.7.1 -reactos/dll/win32/compstui # Synced to Wine-1.5.19 -reactos/dll/win32/credui # Synced to Wine-1.7.1 -reactos/dll/win32/crypt32 # Synced to Wine-1.7.1 -reactos/dll/win32/cryptdlg # Synced to Wine-1.7.1 -reactos/dll/win32/cryptdll # Synced to Wine-1.7.1 -reactos/dll/win32/cryptnet # Synced to Wine-1.7.1 -reactos/dll/win32/cryptui # Synced to Wine-1.7.1 -reactos/dll/win32/dbghelp # Synced to Wine-1.7.1 -reactos/dll/win32/dciman32 # Synced to Wine-1.7.1 -reactos/dll/win32/dwmapi # Synced to Wine-1.7.1 -reactos/dll/win32/faultrep # Synced to Wine-1.7.1 -reactos/dll/win32/fusion # Synced to Wine-1.7.1 -reactos/dll/win32/gdiplus # Synced to Wine-1.7.1 -reactos/dll/win32/hhctrl.ocx # Synced to Wine-1.7.1 -reactos/dll/win32/hlink # Synced to Wine-1.7.1 -reactos/dll/win32/hnetcfg # Synced to Wine-1.7.1 -reactos/dll/win32/httpapi # Synced to Wine-1.7.1 -reactos/dll/win32/iccvid # Synced to Wine-1.7.1 -reactos/dll/win32/icmp # Synced to Wine-0_9_10 -reactos/dll/win32/ieframe # Synced to Wine-1.7.1 -reactos/dll/win32/imaadp32.acm # Synced to Wine-1.7.1 -reactos/dll/win32/imagehlp # Synced to Wine-1.7.1 -reactos/dll/win32/imm32 # Synced to Wine-1.5.19 -reactos/dll/win32/inetcomm # Synced to Wine-1.7.1 -reactos/dll/win32/inetmib1 # Synced to Wine-1.7.1 -reactos/dll/win32/initpki # Synced to Wine-1.7.1 -reactos/dll/win32/inseng # Synced to Wine-1.7.1 -reactos/dll/win32/iphlpapi # Out of sync -reactos/dll/win32/itircl # Synced to Wine-1.7.1 -reactos/dll/win32/itss # Synced to Wine-1.7.1 -reactos/dll/win32/jscript # Synced to Wine-1.7.1 -reactos/dll/win32/loadperf # Synced to Wine-1.7.1 -reactos/dll/win32/localspl # Synced to Wine-1.7.1 -reactos/dll/win32/localui # Synced to Wine-1.7.1 -reactos/dll/win32/lz32 # Synced to Wine-1.5.19 -reactos/dll/win32/mapi32 # Synced to Wine-1.7.1 -reactos/dll/win32/mciavi32 # Synced to Wine-1.7.1 -reactos/dll/win32/mcicda # Synced to Wine-1.5.19 -reactos/dll/win32/mciqtz32 # Synced to Wine-1.7.1 -reactos/dll/win32/mciseq # Synced to Wine-1.7.1 -reactos/dll/win32/mciwave # Synced to Wine-1.5.19 -reactos/dll/win32/mlang # Synced to Wine-1.7.1 -reactos/dll/win32/mmdevapi # Synced to Wine-1.7.1 -reactos/dll/win32/mpr # Synced to Wine-1.7.1 -reactos/dll/win32/mprapi # Synced to Wine-1.5.19 -reactos/dll/win32/msacm32 # Synced to Wine-1.7.1 -reactos/dll/win32/msadp32.acm # Synced to Wine-1.7.1 -reactos/dll/win32/mscat32 # Synced to Wine-1.7.1 -reactos/dll/win32/mscms # Synced to Wine-1.7.1 -reactos/dll/win32/mscoree # Synced to Wine-1.5.4 -reactos/dll/win32/msctf # Synced to Wine-1.7.1 -reactos/dll/win32/msftedit # Synced to Wine-1.5.19 -reactos/dll/win32/msg711.acm # Synced to Wine-1.7.1 -reactos/dll/win32/msgsm32.acm # Synced to Wine-1.7.1 -reactos/dll/win32/mshtml # Synced to Wine-1.7.1 -reactos/dll/win32/mshtml.tlb # Synced to Wine-1.5.26 -reactos/dll/win32/msi # Synced to Wine-1.7.1 -reactos/dll/win32/msimg32 # Synced to Wine-1.5.19 -reactos/dll/win32/msimtf # Synced to Wine-1.7.1 -reactos/dll/win32/msisip # Synced to Wine-1.7.1 -reactos/dll/win32/msisys.ocx # Synced to Wine-1.7.1 -reactos/dll/win32/msnet32 # Synced to Wine-1.5.19 -reactos/dll/win32/msrle32 # Synced to Wine-1.7.1 -reactos/dll/win32/mssign32 # Synced to Wine-1.7.1 -reactos/dll/win32/mssip32 # Synced to Wine-1.7.1 -reactos/dll/win32/mstask # Synced to Wine-1.7.1 -reactos/dll/win32/msvcrt20 # Out of sync -reactos/dll/win32/msvcrt40 # Out of sync -reactos/dll/win32/msvfw32 # Synced to Wine-1.7.1 -reactos/dll/win32/msvidc32 # Synced to Wine-1.7.1 -reactos/dll/win32/msxml # Synced to Wine-1.5.19 -reactos/dll/win32/msxml2 # Synced to Wine-1.5.19 -reactos/dll/win32/msxml3 # Synced to Wine-1.7.1 -reactos/dll/win32/msxml4 # Synced to Wine-1.5.19 -reactos/dll/win32/msxml6 # Synced to Wine-1.5.19 -reactos/dll/win32/nddeapi # Synced to Wine-1.5.19 -reactos/dll/win32/netapi32 # Forked at Wine-1.3.34 -reactos/dll/win32/ntdsapi # Synced to Wine-1.5.19 -reactos/dll/win32/ntprint # Synced to Wine-1.7.1 -reactos/dll/win32/objsel # Synced to Wine-1.5.19 -reactos/dll/win32/odbc32 # Out of sync. Depends on port of Linux ODBC. -reactos/dll/win32/odbccp32 # Synced to Wine-1.5.19 -reactos/dll/win32/ole32 # Synced to Wine-1.7.1 -reactos/dll/win32/oleacc # Autosync -reactos/dll/win32/oleaut32 # Synced to Wine-1.7.1 -reactos/dll/win32/olecli32 # Synced to Wine-1.5.19 -reactos/dll/win32/oledlg # Synced to Wine-1.7.1 -reactos/dll/win32/olepro32 # Synced to Wine-1.7.1 -reactos/dll/win32/olesvr32 # Synced to Wine-1.5.19 -reactos/dll/win32/olethk32 # Synced to Wine-1.5.19 -reactos/dll/win32/pdh # Synced to Wine-1.7.1 -reactos/dll/win32/pidgen # Synced to Wine-1.5.19 -reactos/dll/win32/powrprof # Forked at Wine-1.0rc5 -reactos/dll/win32/printui # Synced to Wine-1.7.1 -reactos/dll/win32/propsys # Synced to Wine-1.5.26 -reactos/dll/win32/pstorec # Synced to Wine-1.7.1 -reactos/dll/win32/qmgr # Synced to Wine-1.7.1 -reactos/dll/win32/qmgrprxy # Synced to Wine-1.5.26 -reactos/dll/win32/query # Synced to Wine-1.7.1 -reactos/dll/win32/rasapi32 # Synced to Wine-1.5.4 -reactos/dll/win32/resutils # Synced to Wine-1.5.19 -reactos/dll/win32/riched20 # Synced to Wine-1.7.1 -reactos/dll/win32/riched32 # Synced to Wine-1.7.1 -reactos/dll/win32/rpcrt4 # Synced to Wine-1.3.26 -reactos/dll/win32/rsabase # Autosync -reactos/dll/win32/rsaenh # Synced to Wine-1.7.1 -reactos/dll/win32/sccbase # Synced to Wine-1.7.1 -reactos/dll/win32/schannel # Synced to Wine-1.5.19 -reactos/dll/win32/scrrun # Synced to Wine-1.7.1 -reactos/dll/win32/secur32 # Forked -reactos/dll/win32/security # Forked (different .spec) -reactos/dll/win32/sensapi # Synced to Wine-1.7.1 -reactos/dll/win32/setupapi # Forked at Wine-20050524 -reactos/dll/win32/shdoclc # Synced to Wine-1.5.19 -reactos/dll/win32/shdocvw # Synced to Wine-1.7.1 -reactos/dll/win32/shell32 # Forked at Wine-20071011 -reactos/dll/win32/shfolder # Synced to Wine-1.7.1 -reactos/dll/win32/shlwapi # Synced to Wine-1.7.1 -reactos/dll/win32/slbcsp # Synced to Wine-1.7.1 -reactos/dll/win32/snmpapi # Synced to Wine-1.7.1 -reactos/dll/win32/softpub # Synced to Wine-1.5.19 -reactos/dll/win32/spoolss # Synced to Wine-1.7.1 -reactos/dll/win32/stdole2.tlb # Synced to Wine-1.5.19 -reactos/dll/win32/stdole32.tlb # Synced to Wine-1.5.19 -reactos/dll/win32/sti # Synced to Wine-1.7.1 -reactos/dll/win32/sxs # Synced to Wine-1.7.1 -reactos/dll/win32/tapi32 # Synced to Wine-1.7.1 -reactos/dll/win32/traffic # Synced to Wine-1.5.19 -reactos/dll/win32/twain_32 # Out of sync -reactos/dll/win32/unicows # Synced to Wine-1.3.32 (Win9x only, why do we need this?!) -reactos/dll/win32/updspapi # Synced to Wine-1.5.4 -reactos/dll/win32/url # Synced to Wine-1.5.19 -reactos/dll/win32/urlmon # Synced to Wine-1.7.1 -reactos/dll/win32/usp10 # Synced to Wine-1.7.1 -reactos/dll/win32/uxtheme # Forked -reactos/dll/win32/vbscript # Synced to Wine-1.7.1 -reactos/dll/win32/version # Autosync -reactos/dll/win32/wbemprox # Synced to Wine-1.7.1 -reactos/dll/win32/wer # Autosync -reactos/dll/win32/windowscodecs # Synced to Wine-1.7.1 -reactos/dll/win32/winemp3.acm # Synced to Wine-1.7.1 -reactos/dll/win32/wing32 # Out of sync -reactos/dll/win32/winhttp # Synced to Wine-1.7.1 -reactos/dll/win32/wininet # Synced to Wine-1.7.1 -reactos/dll/win32/winmm # Forked at Wine-20050628 -reactos/dll/win32/winmm/midimap # Forked at Wine-20050628 -reactos/dll/win32/winmm/wavemap # Forked at Wine-20050628 -reactos/dll/win32/wintrust # Synced to Wine-1.7.1 -reactos/dll/win32/wldap32 # Synced to Wine-1.7.1 -reactos/dll/win32/wmi # Synced to Wine-1.7.1 -reactos/dll/win32/wtsapi32 # Synced to Wine-1.7.1 -reactos/dll/win32/wuapi # Synced to Wine-1.7.1 -reactos/dll/win32/xinput1_1 # Synced to Wine-1.7.1 -reactos/dll/win32/xinput1_2 # Synced to Wine-1.7.1 -reactos/dll/win32/xinput1_3 # Synced to Wine-1.7.1 -reactos/dll/win32/xinput9_1_0 # Synced to Wine-1.7.1 -reactos/dll/win32/xmllite # Synced to Wine-1.7.1 - -reactos/dll/cpl/inetcpl # Synced to Wine-1.3.21 +reactos/dll/win32/activeds # Synced to Wine-1.1.43? +reactos/dll/win32/actxprxy # Synced to Wine-1.5.26 +reactos/dll/win32/advpack # Synced to Wine-1.7.1 +reactos/dll/win32/atl # Synced to Wine-1.7.1 +reactos/dll/win32/atl100 # Synced to Wine-1.7.1 +reactos/dll/win32/atl80 # Synced to Wine-1.7.1 +reactos/dll/win32/avifil32 # Synced to Wine-1.7.1 +reactos/dll/win32/bcrypt # Synced to Wine-1.5.26 +reactos/dll/win32/browseui # Out of sync +reactos/dll/win32/cabinet # Synced to Wine-1.5.26 +reactos/dll/win32/clusapi # Synced to Wine-1.7.1 +reactos/dll/win32/comcat # Synced to Wine-1.7.1 +reactos/dll/win32/comctl32 # Synced to Wine 1.7.1 +reactos/dll/win32/comdlg32 # Synced to Wine 1.7.1 +reactos/dll/win32/compstui # Synced to Wine-1.5.19 +reactos/dll/win32/credui # Synced to Wine-1.7.1 +reactos/dll/win32/crypt32 # Synced to Wine-1.7.1 +reactos/dll/win32/cryptdlg # Synced to Wine-1.7.1 +reactos/dll/win32/cryptdll # Synced to Wine-1.7.1 +reactos/dll/win32/cryptnet # Synced to Wine-1.7.1 +reactos/dll/win32/cryptui # Synced to Wine-1.7.1 +reactos/dll/win32/dbghelp # Synced to Wine-1.7.1 +reactos/dll/win32/dciman32 # Synced to Wine-1.7.1 +reactos/dll/win32/dwmapi # Synced to Wine-1.7.1 +reactos/dll/win32/faultrep # Synced to Wine-1.7.1 +reactos/dll/win32/fusion # Synced to Wine-1.7.1 +reactos/dll/win32/gdiplus # Synced to Wine-1.7.1 +reactos/dll/win32/hhctrl.ocx # Synced to Wine-1.7.1 +reactos/dll/win32/hlink # Synced to Wine-1.7.1 +reactos/dll/win32/hnetcfg # Synced to Wine-1.7.1 +reactos/dll/win32/httpapi # Synced to Wine-1.7.1 +reactos/dll/win32/iccvid # Synced to Wine-1.7.1 +reactos/dll/win32/icmp # Synced to Wine-0_9_10 +reactos/dll/win32/ieframe # Synced to Wine-1.7.1 +reactos/dll/win32/imaadp32.acm # Synced to Wine-1.7.1 +reactos/dll/win32/imagehlp # Synced to Wine-1.7.1 +reactos/dll/win32/imm32 # Synced to Wine-1.5.19 +reactos/dll/win32/inetcomm # Synced to Wine-1.7.1 +reactos/dll/win32/inetmib1 # Synced to Wine-1.7.1 +reactos/dll/win32/initpki # Synced to Wine-1.7.1 +reactos/dll/win32/inseng # Synced to Wine-1.7.1 +reactos/dll/win32/iphlpapi # Out of sync +reactos/dll/win32/itircl # Synced to Wine-1.7.1 +reactos/dll/win32/itss # Synced to Wine-1.7.1 +reactos/dll/win32/jscript # Synced to Wine-1.7.1 +reactos/dll/win32/loadperf # Synced to Wine-1.7.1 +reactos/dll/win32/localspl # Synced to Wine-1.7.1 +reactos/dll/win32/localui # Synced to Wine-1.7.1 +reactos/dll/win32/lz32 # Synced to Wine-1.5.19 +reactos/dll/win32/mapi32 # Synced to Wine-1.7.1 +reactos/dll/win32/mciavi32 # Synced to Wine-1.7.1 +reactos/dll/win32/mcicda # Synced to Wine-1.5.19 +reactos/dll/win32/mciqtz32 # Synced to Wine-1.7.1 +reactos/dll/win32/mciseq # Synced to Wine-1.7.1 +reactos/dll/win32/mciwave # Synced to Wine-1.5.19 +reactos/dll/win32/mlang # Synced to Wine-1.7.1 +reactos/dll/win32/mmdevapi # Synced to Wine-1.7.1 +reactos/dll/win32/mpr # Synced to Wine-1.7.1 +reactos/dll/win32/mprapi # Synced to Wine-1.5.19 +reactos/dll/win32/msacm32 # Synced to Wine-1.7.1 +reactos/dll/win32/msadp32.acm # Synced to Wine-1.7.1 +reactos/dll/win32/mscat32 # Synced to Wine-1.7.1 +reactos/dll/win32/mscms # Synced to Wine-1.7.1 +reactos/dll/win32/mscoree # Synced to Wine-1.5.4 +reactos/dll/win32/msctf # Synced to Wine-1.7.1 +reactos/dll/win32/msftedit # Synced to Wine-1.5.19 +reactos/dll/win32/msg711.acm # Synced to Wine-1.7.1 +reactos/dll/win32/msgsm32.acm # Synced to Wine-1.7.1 +reactos/dll/win32/mshtml # Synced to Wine-1.7.1 +reactos/dll/win32/mshtml.tlb # Synced to Wine-1.5.26 +reactos/dll/win32/msi # Synced to Wine-1.7.1 +reactos/dll/win32/msimg32 # Synced to Wine-1.5.19 +reactos/dll/win32/msimtf # Synced to Wine-1.7.1 +reactos/dll/win32/msisip # Synced to Wine-1.7.1 +reactos/dll/win32/msisys.ocx # Synced to Wine-1.7.1 +reactos/dll/win32/msnet32 # Synced to Wine-1.5.19 +reactos/dll/win32/msrle32 # Synced to Wine-1.7.1 +reactos/dll/win32/mssign32 # Synced to Wine-1.7.1 +reactos/dll/win32/mssip32 # Synced to Wine-1.7.1 +reactos/dll/win32/mstask # Synced to Wine-1.7.1 +reactos/dll/win32/msvcrt20 # Out of sync +reactos/dll/win32/msvcrt40 # Out of sync +reactos/dll/win32/msvfw32 # Synced to Wine-1.7.1 +reactos/dll/win32/msvidc32 # Synced to Wine-1.7.1 +reactos/dll/win32/msxml # Synced to Wine-1.5.19 +reactos/dll/win32/msxml2 # Synced to Wine-1.5.19 +reactos/dll/win32/msxml3 # Synced to Wine-1.7.1 +reactos/dll/win32/msxml4 # Synced to Wine-1.5.19 +reactos/dll/win32/msxml6 # Synced to Wine-1.5.19 +reactos/dll/win32/nddeapi # Synced to Wine-1.5.19 +reactos/dll/win32/netapi32 # Forked at Wine-1.3.34 +reactos/dll/win32/ntdsapi # Synced to Wine-1.5.19 +reactos/dll/win32/ntprint # Synced to Wine-1.7.1 +reactos/dll/win32/objsel # Synced to Wine-1.5.19 +reactos/dll/win32/odbc32 # Out of sync. Depends on port of Linux ODBC. +reactos/dll/win32/odbccp32 # Synced to Wine-1.5.19 +reactos/dll/win32/ole32 # Synced to Wine-1.7.1 +reactos/dll/win32/oleacc # Autosync +reactos/dll/win32/oleaut32 # Synced to Wine-1.7.1 +reactos/dll/win32/olecli32 # Synced to Wine-1.5.19 +reactos/dll/win32/oledlg # Synced to Wine-1.7.1 +reactos/dll/win32/olepro32 # Synced to Wine-1.7.1 +reactos/dll/win32/olesvr32 # Synced to Wine-1.5.19 +reactos/dll/win32/olethk32 # Synced to Wine-1.5.19 +reactos/dll/win32/pdh # Synced to Wine-1.7.1 +reactos/dll/win32/pidgen # Synced to Wine-1.5.19 +reactos/dll/win32/powrprof # Forked at Wine-1.0rc5 +reactos/dll/win32/printui # Synced to Wine-1.7.1 +reactos/dll/win32/propsys # Synced to Wine-1.5.26 +reactos/dll/win32/pstorec # Synced to Wine-1.7.1 +reactos/dll/win32/qmgr # Synced to Wine-1.7.1 +reactos/dll/win32/qmgrprxy # Synced to Wine-1.5.26 +reactos/dll/win32/query # Synced to Wine-1.7.1 +reactos/dll/win32/rasapi32 # Synced to Wine-1.5.4 +reactos/dll/win32/resutils # Synced to Wine-1.5.19 +reactos/dll/win32/riched20 # Synced to Wine-1.7.1 +reactos/dll/win32/riched32 # Synced to Wine-1.7.1 +reactos/dll/win32/rpcrt4 # Synced to Wine-1.3.26 +reactos/dll/win32/rsabase # Autosync +reactos/dll/win32/rsaenh # Synced to Wine-1.7.1 +reactos/dll/win32/sccbase # Synced to Wine-1.7.1 +reactos/dll/win32/schannel # Synced to Wine-1.5.19 +reactos/dll/win32/scrrun # Synced to Wine-1.7.1 +reactos/dll/win32/secur32 # Forked +reactos/dll/win32/security # Forked (different .spec) +reactos/dll/win32/sensapi # Synced to Wine-1.7.1 +reactos/dll/win32/setupapi # Forked at Wine-20050524 +reactos/dll/win32/shdoclc # Synced to Wine-1.5.19 +reactos/dll/win32/shdocvw # Synced to Wine-1.7.1 +reactos/dll/win32/shell32 # Forked at Wine-20071011 +reactos/dll/win32/shfolder # Synced to Wine-1.7.1 +reactos/dll/win32/shlwapi # Synced to Wine-1.7.1 +reactos/dll/win32/slbcsp # Synced to Wine-1.7.1 +reactos/dll/win32/snmpapi # Synced to Wine-1.7.1 +reactos/dll/win32/softpub # Synced to Wine-1.5.19 +reactos/dll/win32/spoolss # Synced to Wine-1.7.1 +reactos/dll/win32/stdole2.tlb # Synced to Wine-1.5.19 +reactos/dll/win32/stdole32.tlb # Synced to Wine-1.5.19 +reactos/dll/win32/sti # Synced to Wine-1.7.1 +reactos/dll/win32/sxs # Synced to Wine-1.7.1 +reactos/dll/win32/tapi32 # Synced to Wine-1.7.1 +reactos/dll/win32/traffic # Synced to Wine-1.5.19 +reactos/dll/win32/twain_32 # Out of sync +reactos/dll/win32/unicows # Synced to Wine-1.3.32 (Win9x only, why do we need this?!) +reactos/dll/win32/updspapi # Synced to Wine-1.5.4 +reactos/dll/win32/url # Synced to Wine-1.5.19 +reactos/dll/win32/urlmon # Synced to Wine-1.7.1 +reactos/dll/win32/usp10 # Synced to Wine-1.7.1 +reactos/dll/win32/uxtheme # Forked +reactos/dll/win32/vbscript # Synced to Wine-1.7.1 +reactos/dll/win32/version # Autosync +reactos/dll/win32/wbemprox # Synced to Wine-1.7.1 +reactos/dll/win32/wer # Autosync +reactos/dll/win32/windowscodecs # Synced to Wine-1.7.1 +reactos/dll/win32/windowscodecsext # Synced to Wine-1.7.1 +reactos/dll/win32/winemp3.acm # Synced to Wine-1.7.1 +reactos/dll/win32/wing32 # Out of sync +reactos/dll/win32/winhttp # Synced to Wine-1.7.1 +reactos/dll/win32/wininet # Synced to Wine-1.7.1 +reactos/dll/win32/winmm # Forked at Wine-20050628 +reactos/dll/win32/winmm/midimap # Forked at Wine-20050628 +reactos/dll/win32/winmm/wavemap # Forked at Wine-20050628 +reactos/dll/win32/wintrust # Synced to Wine-1.7.1 +reactos/dll/win32/wldap32 # Synced to Wine-1.7.1 +reactos/dll/win32/wmi # Synced to Wine-1.7.1 +reactos/dll/win32/wtsapi32 # Synced to Wine-1.7.1 +reactos/dll/win32/wuapi # Synced to Wine-1.7.1 +reactos/dll/win32/xinput1_1 # Synced to Wine-1.7.1 +reactos/dll/win32/xinput1_2 # Synced to Wine-1.7.1 +reactos/dll/win32/xinput1_3 # Synced to Wine-1.7.1 +reactos/dll/win32/xinput9_1_0 # Synced to Wine-1.7.1 +reactos/dll/win32/xmllite # Synced to Wine-1.7.1 + +reactos/dll/cpl/inetcpl # Synced to Wine-1.3.21 ReactOS shares the following programs with Winehq.

1 0

[aandrejevic] 60612: [SOFT386] Clear the memory block before it's used.
by aandrejevic＠svn.reactos.org 11 Oct '13

11 Oct '13

Author: aandrejevic Date: Fri Oct 11 16:31:35 2013 New Revision: 60612 URL: http://svn.reactos.org/svn/reactos?rev=60612&view=rev Log: [SOFT386] Clear the memory block before it's used. Modified: branches/ntvdm/lib/soft386/opcodes.c 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] Fri Oct 11 16:31:35 2013 @@ -6341,6 +6341,9 @@ ULONG Count = OperandSize ? State->GeneralRegs[SOFT386_REG_ECX].Long : State->GeneralRegs[SOFT386_REG_ECX].LowWord; + /* Clear the memory block */ + RtlZeroMemory(Block, sizeof(Block)); + /* Transfer until finished */ while (Count) {

1 0

[akhaldi] 60611: [NPFS/NPFS_NEW] * Make npfs_new the one and only npfs. One of the few foo_new modules that actually made it and I hope it won't be the last ; ) CORE-7451
by akhaldi＠svn.reactos.org 11 Oct '13

11 Oct '13

Author: akhaldi Date: Fri Oct 11 15:19:46 2013 New Revision: 60611 URL: http://svn.reactos.org/svn/reactos?rev=60611&view=rev Log: [NPFS/NPFS_NEW] * Make npfs_new the one and only npfs. One of the few foo_new modules that actually made it and I hope it won't be the last ;) CORE-7451 Added: trunk/reactos/drivers/filesystems/npfs/ - copied from r60603, trunk/reactos/drivers/filesystems/npfs_new/ Removed: trunk/reactos/drivers/filesystems/npfs_new/ Modified: trunk/reactos/drivers/filesystems/CMakeLists.txt Modified: trunk/reactos/drivers/filesystems/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/CMakeL… ============================================================================== --- trunk/reactos/drivers/filesystems/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/CMakeLists.txt [iso-8859-1] Fri Oct 11 15:19:46 2013 @@ -6,5 +6,5 @@ add_subdirectory(fs_rec) add_subdirectory(msfs) add_subdirectory(mup) -add_subdirectory(npfs_new) +add_subdirectory(npfs) add_subdirectory(ntfs)

1 0

[akhaldi] 60610: [QUARTZ_WINETEST] * Generate a local copy of the fil_data header instead of reusing the identical quartz one. CORE-7469
by akhaldi＠svn.reactos.org 11 Oct '13

11 Oct '13

Author: akhaldi Date: Fri Oct 11 13:33:44 2013 New Revision: 60610 URL: http://svn.reactos.org/svn/reactos?rev=60610&view=rev Log: [QUARTZ_WINETEST] * Generate a local copy of the fil_data header instead of reusing the identical quartz one. CORE-7469 Modified: trunk/rostests/winetests/quartz/CMakeLists.txt Modified: trunk/rostests/winetests/quartz/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/CMakeLis… ============================================================================== --- trunk/rostests/winetests/quartz/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/quartz/CMakeLists.txt [iso-8859-1] Fri Oct 11 13:33:44 2013 @@ -10,9 +10,10 @@ videorenderer.c testlist.c) +add_idl_headers(quartz_test_idlheader fil_data.idl) add_executable(quartz_winetest ${SOURCE}) target_link_libraries(quartz_winetest uuid) -add_dependencies(quartz_winetest quartz_idlheader) +add_dependencies(quartz_winetest quartz_test_idlheader) set_module_type(quartz_winetest win32cui) add_importlibs(quartz_winetest ole32 oleaut32 advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET quartz_winetest DESTINATION reactos/bin FOR all)

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