Ros-diffs September 2013

ros-diffs@reactos.org

16 participants
554 discussions

[aandrejevic] 60146: [SOFT386] Implement JMP rel16/32
by aandrejevic＠svn.reactos.org 15 Sep '13

15 Sep '13

Author: aandrejevic Date: Sun Sep 15 18:18:58 2013 New Revision: 60146 URL: http://svn.reactos.org/svn/reactos?rev=60146&view=rev Log: [SOFT386] Implement JMP rel16/32 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] Sun Sep 15 18:18:58 2013 @@ -4212,16 +4212,59 @@ SOFT386_OPCODE_HANDLER(Soft386OpcodeJmp) { + BOOLEAN Size = State->SegmentRegs[SOFT386_REG_CS].Size; + + /* Make sure this is the right instruction */ + ASSERT(Opcode == 0xE9); + + if (State->PrefixFlags == SOFT386_PREFIX_OPSIZE) + { + /* The OPSIZE prefix toggles the size */ + Size = !Size; + } + else if (State->PrefixFlags != 0) + { + /* Invalid prefix */ + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + if (Size) + { + LONG Offset = 0; + + /* Fetch the offset */ + if (!Soft386FetchDword(State, (PULONG)&Offset)) + { + /* An exception occurred */ + return FALSE; + } + + /* Move the instruction pointer */ + State->InstPtr.Long += Offset; + } + else + { + SHORT Offset = 0; + + /* Fetch the offset */ + if (!Soft386FetchWord(State, (PUSHORT)&Offset)) + { + /* An exception occurred */ + return FALSE; + } + + /* Move the instruction pointer */ + State->InstPtr.LowWord += Offset; + } + + return TRUE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeJmpAbs) +{ // TODO: NOT IMPLEMENTED UNIMPLEMENTED; return FALSE; } - -SOFT386_OPCODE_HANDLER(Soft386OpcodeJmpAbs) -{ - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; - - return FALSE; -}

1 0

[hbelusca] 60145: [ROSAPPS] Missing _SEH2_YIELD.
by hbelusca＠svn.reactos.org 15 Sep '13

15 Sep '13

Author: hbelusca Date: Sun Sep 15 18:17:25 2013 New Revision: 60145 URL: http://svn.reactos.org/svn/reactos?rev=60145&view=rev Log: [ROSAPPS] Missing _SEH2_YIELD. Modified: trunk/rosapps/applications/net/tditest/tditest/tditest.c Modified: trunk/rosapps/applications/net/tditest/tditest/tditest.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/tditest/t… ============================================================================== --- trunk/rosapps/applications/net/tditest/tditest/tditest.c [iso-8859-1] (original) +++ trunk/rosapps/applications/net/tditest/tditest/tditest.c [iso-8859-1] Sun Sep 15 18:17:25 2013 @@ -555,7 +555,7 @@ IoFreeMdl(Mdl); IoFreeIrp(Irp); ExFreePool(ConnectInfo); - return STATUS_UNSUCCESSFUL; + _SEH2_YIELD(return STATUS_UNSUCCESSFUL); } _SEH2_END; TdiBuildSendDatagram( @@ -683,7 +683,7 @@ IoFreeIrp(Irp); ExFreePool(MdlBuffer); ExFreePool(ReceiveInfo); - return STATUS_INSUFFICIENT_RESOURCES; + _SEH2_YIELD(return STATUS_INSUFFICIENT_RESOURCES); } _SEH2_END; TdiBuildReceiveDatagram(

1 0

[aandrejevic] 60144: [SOFT386] Implement LAHF, SAHF, LEA and PUSH imm16/32
by aandrejevic＠svn.reactos.org 15 Sep '13

15 Sep '13

Author: aandrejevic Date: Sun Sep 15 18:02:41 2013 New Revision: 60144 URL: http://svn.reactos.org/svn/reactos?rev=60144&view=rev Log: [SOFT386] Implement LAHF, SAHF, LEA and PUSH imm16/32 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] Sun Sep 15 18:02:41 2013 @@ -3627,23 +3627,65 @@ SOFT386_OPCODE_HANDLER(Soft386OpcodePushImm) { + BOOLEAN Size = State->SegmentRegs[SOFT386_REG_CS].Size; + + /* Make sure this is the right instruction */ + ASSERT(Opcode == 0x68); + + if (State->PrefixFlags == SOFT386_PREFIX_OPSIZE) + { + /* The OPSIZE prefix toggles the size */ + Size = !Size; + } + else + { + /* Invalid prefix */ + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + if (Size) + { + ULONG Data; + + if (!Soft386FetchDword(State, &Data)) + { + /* Exception occurred */ + return FALSE; + } + + /* Call the internal API */ + return Soft386StackPush(State, Data); + } + else + { + USHORT Data; + + if (!Soft386FetchWord(State, &Data)) + { + /* Exception occurred */ + return FALSE; + } + + /* Call the internal API */ + return Soft386StackPush(State, Data); + } +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeImulModrmImm) +{ // TODO: NOT IMPLEMENTED UNIMPLEMENTED; return FALSE; } -SOFT386_OPCODE_HANDLER(Soft386OpcodeImulModrmImm) -{ - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; - - return FALSE; -} - SOFT386_OPCODE_HANDLER(Soft386OpcodePushByteImm) { UCHAR Data; + + /* Make sure this is the right instruction */ + ASSERT(Opcode == 0x6A); if (!Soft386FetchByte(State, &Data)) { @@ -3811,10 +3853,57 @@ SOFT386_OPCODE_HANDLER(Soft386OpcodeLea) { - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; - - return FALSE; + SOFT386_MOD_REG_RM ModRegRm; + BOOLEAN OperandSize, AddressSize; + + /* Make sure this is the right instruction */ + ASSERT(Opcode == 0x8D); + + OperandSize = AddressSize = State->SegmentRegs[SOFT386_REG_CS].Size; + + if (State->PrefixFlags & SOFT386_PREFIX_ADSIZE) + { + /* The ADSIZE prefix toggles the address size */ + AddressSize = !AddressSize; + } + + if (State->PrefixFlags & SOFT386_PREFIX_OPSIZE) + { + /* The OPSIZE prefix toggles the operand size */ + OperandSize = !OperandSize; + } + + /* Get the operands */ + if (!Soft386ParseModRegRm(State, AddressSize, &ModRegRm)) + { + /* Exception occurred */ + return FALSE; + } + + /* The second operand must be memory */ + if (!ModRegRm.Memory) + { + /* Invalid */ + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + /* Write the address to the register */ + if (OperandSize) + { + return Soft386WriteModrmDwordOperands(State, + &ModRegRm, + TRUE, + ModRegRm.MemoryAddress); + } + else + { + return Soft386WriteModrmWordOperands(State, + &ModRegRm, + TRUE, + ModRegRm.MemoryAddress); + + } } SOFT386_OPCODE_HANDLER(Soft386OpcodeMovLoadSeg) @@ -3936,13 +4025,40 @@ SOFT386_OPCODE_HANDLER(Soft386OpcodeSahf) { + /* Make sure this is the right instruction */ + ASSERT(Opcode == 0x9E); + + /* Set the low-order byte of FLAGS to AH */ + State->Flags.Long &= 0xFFFFFF00; + State->Flags.Long |= State->GeneralRegs[SOFT386_REG_EAX].HighByte; + + /* Restore the reserved bits of FLAGS */ + State->Flags.AlwaysSet = TRUE; + State->Flags.Reserved0 = State->Flags.Reserved1 = FALSE; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeLahf) +{ + /* Make sure this is the right instruction */ + ASSERT(Opcode == 0x9F); + + /* Set AH to the low-order byte of FLAGS */ + State->GeneralRegs[SOFT386_REG_EAX].HighByte = LOBYTE(State->Flags.Long); + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeRetImm) +{ // TODO: NOT IMPLEMENTED UNIMPLEMENTED; return FALSE; } -SOFT386_OPCODE_HANDLER(Soft386OpcodeLahf) +SOFT386_OPCODE_HANDLER(Soft386OpcodeRet) { // TODO: NOT IMPLEMENTED UNIMPLEMENTED; @@ -3950,7 +4066,7 @@ return FALSE; } -SOFT386_OPCODE_HANDLER(Soft386OpcodeRetImm) +SOFT386_OPCODE_HANDLER(Soft386OpcodeLes) { // TODO: NOT IMPLEMENTED UNIMPLEMENTED; @@ -3958,7 +4074,7 @@ return FALSE; } -SOFT386_OPCODE_HANDLER(Soft386OpcodeRet) +SOFT386_OPCODE_HANDLER(Soft386OpcodeLds) { // TODO: NOT IMPLEMENTED UNIMPLEMENTED; @@ -3966,7 +4082,7 @@ return FALSE; } -SOFT386_OPCODE_HANDLER(Soft386OpcodeLes) +SOFT386_OPCODE_HANDLER(Soft386OpcodeEnter) { // TODO: NOT IMPLEMENTED UNIMPLEMENTED; @@ -3974,7 +4090,7 @@ return FALSE; } -SOFT386_OPCODE_HANDLER(Soft386OpcodeLds) +SOFT386_OPCODE_HANDLER(Soft386OpcodeLeave) { // TODO: NOT IMPLEMENTED UNIMPLEMENTED; @@ -3982,7 +4098,7 @@ return FALSE; } -SOFT386_OPCODE_HANDLER(Soft386OpcodeEnter) +SOFT386_OPCODE_HANDLER(Soft386OpcodeRetFarImm) { // TODO: NOT IMPLEMENTED UNIMPLEMENTED; @@ -3990,7 +4106,7 @@ return FALSE; } -SOFT386_OPCODE_HANDLER(Soft386OpcodeLeave) +SOFT386_OPCODE_HANDLER(Soft386OpcodeRetFar) { // TODO: NOT IMPLEMENTED UNIMPLEMENTED; @@ -3998,7 +4114,7 @@ return FALSE; } -SOFT386_OPCODE_HANDLER(Soft386OpcodeRetFarImm) +SOFT386_OPCODE_HANDLER(Soft386OpcodeInt3) { // TODO: NOT IMPLEMENTED UNIMPLEMENTED; @@ -4006,7 +4122,7 @@ return FALSE; } -SOFT386_OPCODE_HANDLER(Soft386OpcodeRetFar) +SOFT386_OPCODE_HANDLER(Soft386OpcodeInt) { // TODO: NOT IMPLEMENTED UNIMPLEMENTED; @@ -4014,7 +4130,7 @@ return FALSE; } -SOFT386_OPCODE_HANDLER(Soft386OpcodeInt3) +SOFT386_OPCODE_HANDLER(Soft386OpcodeIntOverflow) { // TODO: NOT IMPLEMENTED UNIMPLEMENTED; @@ -4022,7 +4138,7 @@ return FALSE; } -SOFT386_OPCODE_HANDLER(Soft386OpcodeInt) +SOFT386_OPCODE_HANDLER(Soft386OpcodeIret) { // TODO: NOT IMPLEMENTED UNIMPLEMENTED; @@ -4030,7 +4146,7 @@ return FALSE; } -SOFT386_OPCODE_HANDLER(Soft386OpcodeIntOverflow) +SOFT386_OPCODE_HANDLER(Soft386OpcodeAam) { // TODO: NOT IMPLEMENTED UNIMPLEMENTED; @@ -4038,7 +4154,7 @@ return FALSE; } -SOFT386_OPCODE_HANDLER(Soft386OpcodeIret) +SOFT386_OPCODE_HANDLER(Soft386OpcodeAad) { // TODO: NOT IMPLEMENTED UNIMPLEMENTED; @@ -4046,7 +4162,7 @@ return FALSE; } -SOFT386_OPCODE_HANDLER(Soft386OpcodeAam) +SOFT386_OPCODE_HANDLER(Soft386OpcodeXlat) { // TODO: NOT IMPLEMENTED UNIMPLEMENTED; @@ -4054,7 +4170,7 @@ return FALSE; } -SOFT386_OPCODE_HANDLER(Soft386OpcodeAad) +SOFT386_OPCODE_HANDLER(Soft386OpcodeLoopnz) { // TODO: NOT IMPLEMENTED UNIMPLEMENTED; @@ -4062,7 +4178,7 @@ return FALSE; } -SOFT386_OPCODE_HANDLER(Soft386OpcodeXlat) +SOFT386_OPCODE_HANDLER(Soft386OpcodeLoopz) { // TODO: NOT IMPLEMENTED UNIMPLEMENTED; @@ -4070,7 +4186,7 @@ return FALSE; } -SOFT386_OPCODE_HANDLER(Soft386OpcodeLoopnz) +SOFT386_OPCODE_HANDLER(Soft386OpcodeLoop) { // TODO: NOT IMPLEMENTED UNIMPLEMENTED; @@ -4078,7 +4194,7 @@ return FALSE; } -SOFT386_OPCODE_HANDLER(Soft386OpcodeLoopz) +SOFT386_OPCODE_HANDLER(Soft386OpcodeJecxz) { // TODO: NOT IMPLEMENTED UNIMPLEMENTED; @@ -4086,7 +4202,7 @@ return FALSE; } -SOFT386_OPCODE_HANDLER(Soft386OpcodeLoop) +SOFT386_OPCODE_HANDLER(Soft386OpcodeCall) { // TODO: NOT IMPLEMENTED UNIMPLEMENTED; @@ -4094,7 +4210,7 @@ return FALSE; } -SOFT386_OPCODE_HANDLER(Soft386OpcodeJecxz) +SOFT386_OPCODE_HANDLER(Soft386OpcodeJmp) { // TODO: NOT IMPLEMENTED UNIMPLEMENTED; @@ -4102,26 +4218,10 @@ return FALSE; } -SOFT386_OPCODE_HANDLER(Soft386OpcodeCall) +SOFT386_OPCODE_HANDLER(Soft386OpcodeJmpAbs) { // TODO: NOT IMPLEMENTED UNIMPLEMENTED; return FALSE; } - -SOFT386_OPCODE_HANDLER(Soft386OpcodeJmp) -{ - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; - - return FALSE; -} - -SOFT386_OPCODE_HANDLER(Soft386OpcodeJmpAbs) -{ - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; - - return FALSE; -}

1 0

[tkreuzer] 60143: [FRAMEDYN] Compile only for x86 [KERNEL32] Fix InterlockedExchangePointer usage [MSVCRT] Add some x64 c++ stubs
by tkreuzer＠svn.reactos.org 15 Sep '13

15 Sep '13

Author: tkreuzer Date: Sun Sep 15 17:50:38 2013 New Revision: 60143 URL: http://svn.reactos.org/svn/reactos?rev=60143&view=rev Log: [FRAMEDYN] Compile only for x86 [KERNEL32] Fix InterlockedExchangePointer usage [MSVCRT] Add some x64 c++ stubs Modified: trunk/reactos/dll/win32/CMakeLists.txt trunk/reactos/dll/win32/kernel32/client/except.c trunk/reactos/dll/win32/msvcrt/msvcrt.spec 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] Sun Sep 15 17:50:38 2013 @@ -40,7 +40,9 @@ add_subdirectory(dwmapi) add_subdirectory(faultrep) add_subdirectory(fmifs) +if(ARCH STREQUAL "i386") add_subdirectory(framedyn) +endif() add_subdirectory(fusion) add_subdirectory(gdiplus) add_subdirectory(getuname) Modified: trunk/reactos/dll/win32/kernel32/client/except.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/except.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/except.c [iso-8859-1] Sun Sep 15 17:50:38 2013 @@ -436,7 +436,7 @@ PVOID EncodedPointer, EncodedOldPointer; EncodedPointer = RtlEncodePointer(lpTopLevelExceptionFilter); - EncodedOldPointer = InterlockedExchangePointer(&GlobalTopLevelExceptionFilter, + EncodedOldPointer = InterlockedExchangePointer((PVOID*)&GlobalTopLevelExceptionFilter, EncodedPointer); return RtlDecodePointer(EncodedOldPointer); } Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.sp… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] Sun Sep 15 17:50:38 2013 @@ -10,14 +10,20 @@ @ cdecl -i386 -norelay ??0bad_typeid@@QAE@ABV0@@Z(ptr) __thiscall_MSVCRT_bad_typeid_copy_ctor @ cdecl -i386 -norelay ??0bad_typeid@@QAE@PBD@Z(ptr) __thiscall_MSVCRT_bad_typeid_ctor @ cdecl -i386 -norelay ??0exception@@QAE@ABQBD@Z(ptr) __thiscall_MSVCRT_exception_ctor +@ cdecl -arch=x86_64 -stub -norelay ??0exception@@QEAA@AEBQEBD@Z(ptr) @ cdecl -i386 -norelay ??0exception@@QAE@ABQBDH@Z(ptr long) __thiscall_MSVCRT_exception_ctor_noalloc +@ cdecl -arch=x86_64 -stub -norelay ??0exception@@QEAA@AEBQEBDH@Z(ptr long) @ cdecl -i386 -norelay ??0exception@@QAE@ABV0@@Z(ptr) __thiscall_MSVCRT_exception_copy_ctor +@ cdecl -arch=x86_64 -stub -norelay ??0exception@@QEAA@AEBV0@@Z(ptr) @ cdecl -i386 -norelay ??0exception@@QAE@XZ() __thiscall_MSVCRT_exception_default_ctor +@ cdecl -arch=x86_64 -stub -norelay ??0exception@@QEAA@XZ() @ cdecl -i386 -norelay ??1__non_rtti_object@@UAE@XZ() __thiscall_MSVCRT___non_rtti_object_dtor @ cdecl -i386 -norelay ??1bad_cast@@UAE@XZ() __thiscall_MSVCRT_bad_cast_dtor @ cdecl -i386 -norelay ??1bad_typeid@@UAE@XZ() __thiscall_MSVCRT_bad_typeid_dtor @ cdecl -i386 -norelay ??1exception@@UAE@XZ() __thiscall_MSVCRT_exception_dtor +@ cdecl -arch=x86_64 -stub -norelay ??1exception@@UEAA@XZ() __thiscall_MSVCRT_exception_dtor @ cdecl -i386 -norelay ??1type_info@@UAE@XZ() __thiscall_MSVCRT_type_info_dtor +@ cdecl -arch=x86_64 -stub ??1type_info@@UEAA@XZ() __thiscall_MSVCRT_type_info_dtor @ cdecl -arch=win32 ??2@YAPAXI@Z(long) MSVCRT_operator_new @ cdecl -arch=win64 ??2@YAPEAX_K@Z(double) MSVCRT_operator_new # @ cdecl ??2@YAPAXIHPBDH@Z(long long str long) MSVCRT_operator_new_dbg @@ -62,6 +68,7 @@ @ cdecl ?terminate@@YAXXZ() MSVCRT_terminate @ cdecl ?unexpected@@YAXXZ() MSVCRT_unexpected @ cdecl -i386 -norelay ?what@exception@@UBEPBDXZ() __thiscall_MSVCRT_what_exception +@ cdecl -arch=x86_64 -stub -norelay ?what@exception@@UEBAPEBDXZ() __thiscall_MSVCRT_what_exception @ cdecl -arch=i386 _CIacos() @ cdecl -arch=i386 _CIasin() @ cdecl -arch=i386 _CIatan() @@ -117,9 +124,9 @@ # stub __CxxCallUnwindVecDtor @ cdecl __CxxDetectRethrow(ptr) # stub __CxxExceptionFilter -@ cdecl -i386 -norelay __CxxFrameHandler(ptr ptr ptr ptr) -@ cdecl -i386 -norelay __CxxFrameHandler2(ptr ptr ptr ptr) __CxxFrameHandler -@ cdecl -i386 -norelay __CxxFrameHandler3(ptr ptr ptr ptr) __CxxFrameHandler +@ cdecl -arch=i386,x86_64 -norelay __CxxFrameHandler(ptr ptr ptr ptr) +@ cdecl -arch=i386,x86_64 -norelay __CxxFrameHandler2(ptr ptr ptr ptr) __CxxFrameHandler +@ cdecl -arch=i386,x86_64 -norelay __CxxFrameHandler3(ptr ptr ptr ptr) __CxxFrameHandler @ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) @ stdcall -i386 __CxxLongjmpUnwind(ptr) @ cdecl __CxxQueryExceptionSize()

1 0

[tkreuzer] 60142: [DSOUND] Extend the lrint MSVC hack to support x64 as well See http://sourceforge.net/p/freeimage/discussion/36111/thread/b43c17c5
by tkreuzer＠svn.reactos.org 15 Sep '13

15 Sep '13

Author: tkreuzer Date: Sun Sep 15 17:31:25 2013 New Revision: 60142 URL: http://svn.reactos.org/svn/reactos?rev=60142&view=rev Log: [DSOUND] Extend the lrint MSVC hack to support x64 as well See http://sourceforge.net/p/freeimage/discussion/36111/thread/b43c17c5 Modified: trunk/reactos/dll/directx/dsound/dsound_convert.c Modified: trunk/reactos/dll/directx/dsound/dsound_convert.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound/dsound_… ============================================================================== --- trunk/reactos/dll/directx/dsound/dsound_convert.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/dsound/dsound_convert.c [iso-8859-1] Sun Sep 15 17:31:25 2013 @@ -64,17 +64,26 @@ #endif /* This is an inlined version of lrintf. */ -#if defined(_M_IX86) && defined(_MSC_VER) +#if defined(_MSC_VER) +#if defined(_M_AMD64) +#include <xmmintrin.h> +#endif + FORCEINLINE int lrintf(float f) { +#if defined(_M_IX86) int result; __asm { fld f; fistp result; } + return result; +#elif defined(_M_AMD64) + return _mm_cvtss_si32(_mm_load_ss(&f)); +#endif } #endif

1 0

[akhaldi] 60141: [CRYPTNET] * Sync with Wine 1.7.1.
by akhaldi＠svn.reactos.org 15 Sep '13

15 Sep '13

Author: akhaldi Date: Sun Sep 15 17:20:13 2013 New Revision: 60141 URL: http://svn.reactos.org/svn/reactos?rev=60141&view=rev Log: [CRYPTNET] * Sync with Wine 1.7.1. Modified: trunk/reactos/dll/win32/cryptnet/CMakeLists.txt trunk/reactos/dll/win32/cryptnet/cryptnet_main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/cryptnet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptnet/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/cryptnet/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptnet/CMakeLists.txt [iso-8859-1] Sun Sep 15 17:20:13 2013 @@ -14,5 +14,4 @@ target_link_libraries(cryptnet wine) add_delay_importlibs(cryptnet wininet) add_importlibs(cryptnet crypt32 msvcrt kernel32 ntdll) - add_cd_file(TARGET cryptnet DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/cryptnet/cryptnet_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptnet/cryptne… ============================================================================== --- trunk/reactos/dll/win32/cryptnet/cryptnet_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptnet/cryptnet_main.c [iso-8859-1] Sun Sep 15 17:20:13 2013 @@ -959,18 +959,12 @@ if (ret && !(dwRetrievalFlags & CRYPT_DONT_CACHE_RESULT)) { SYSTEMTIME st; + FILETIME ft; DWORD len = sizeof(st); - if (HttpQueryInfoW(hHttp, - HTTP_QUERY_EXPIRES | HTTP_QUERY_FLAG_SYSTEMTIME, &st, - &len, NULL)) - { - FILETIME ft; - - SystemTimeToFileTime(&st, &ft); - CRYPT_CacheURL(pszURL, pObject, dwRetrievalFlags, - ft); - } + if (HttpQueryInfoW(hHttp, HTTP_QUERY_EXPIRES | HTTP_QUERY_FLAG_SYSTEMTIME, + &st, &len, NULL) && SystemTimeToFileTime(&st, &ft)) + CRYPT_CacheURL(pszURL, pObject, dwRetrievalFlags, ft); } InternetCloseHandle(hHttp); } 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 15 17:20:13 2013 @@ -66,7 +66,7 @@ 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.5.26 +reactos/dll/win32/cryptnet # Synced to Wine-1.7.1 reactos/dll/win32/cryptui # Synced to Wine-1.5.26 reactos/dll/win32/dbghelp # Synced to Wine-1.5.26 reactos/dll/win32/dciman32 # Synced to Wine-1.5.19

1 0

[tkreuzer] 60140: [CPPRT] Add support for x64
by tkreuzer＠svn.reactos.org 15 Sep '13

15 Sep '13

Author: tkreuzer Date: Sun Sep 15 17:09:21 2013 New Revision: 60140 URL: http://svn.reactos.org/svn/reactos?rev=60140&view=rev Log: [CPPRT] Add support for x64 Added: trunk/reactos/lib/sdk/cpprt/amd64/ (with props) trunk/reactos/lib/sdk/cpprt/amd64/cpprt.s (with props) Modified: trunk/reactos/lib/sdk/cpprt/CMakeLists.txt Modified: trunk/reactos/lib/sdk/cpprt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/cpprt/CMakeLists.t… ============================================================================== --- trunk/reactos/lib/sdk/cpprt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/cpprt/CMakeLists.txt [iso-8859-1] Sun Sep 15 17:09:21 2013 @@ -5,5 +5,9 @@ ehvec.cpp typeinfo.cpp) -add_asm_files(cpprt_asm i386/cpprt.s) +if(ARCH STREQUAL "i386") + add_asm_files(cpprt_asm i386/cpprt.s) +elseif(ARCH STREQUAL "amd64") + add_asm_files(cpprt_asm amd64/cpprt.s) +endif() add_library(cpprt ${SOURCE} ${cpprt_asm}) Propchange: trunk/reactos/lib/sdk/cpprt/amd64/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Sep 15 17:09:21 2013 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/lib/sdk/cpprt/amd64/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/lib/sdk/cpprt/amd64/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/lib/sdk/cpprt/amd64/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/lib/sdk/cpprt/amd64/cpprt.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/cpprt/amd64/cpprt.… ============================================================================== --- trunk/reactos/lib/sdk/cpprt/amd64/cpprt.s (added) +++ trunk/reactos/lib/sdk/cpprt/amd64/cpprt.s [iso-8859-1] Sun Sep 15 17:09:21 2013 @@ -0,0 +1,16 @@ +#include <asm.inc> + +.code + +MACRO(DEFINE_ALIAS, alias, orig, type) +EXTERN &orig:&type +ALIAS <&alias> = <&orig> +ENDM + +; void __cdecl `eh vector constructor iterator'(void *,unsigned __int64,int,void (__cdecl*)(void *),void (__cdecl*)(void *)) +DEFINE_ALIAS ??_L@YAXPEAX_KHP6AX0@Z2@Z, ?MSVCRTEX_eh_vector_constructor_iterator@@YAXPEAX_KHP6AX0@Z2@Z + +; void __cdecl `eh vector destructor iterator'(void *,unsigned __int64,int,void (__cdecl*)(void *)) +DEFINE_ALIAS ??_M@YAXPEAX_KHP6AX0@Z@Z, ?MSVCRTEX_eh_vector_destructor_iterator@@YAXPEAX_KHP6AX0@Z@Z + +END Propchange: trunk/reactos/lib/sdk/cpprt/amd64/cpprt.s ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 60139: [CRYPTDLL] * Sync with Wine 1.7.1.
by akhaldi＠svn.reactos.org 15 Sep '13

15 Sep '13

Author: akhaldi Date: Sun Sep 15 16:52:35 2013 New Revision: 60139 URL: http://svn.reactos.org/svn/reactos?rev=60139&view=rev Log: [CRYPTDLL] * Sync with Wine 1.7.1. Modified: trunk/reactos/dll/win32/cryptdll/CMakeLists.txt trunk/reactos/dll/win32/cryptdll/cryptdll.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/cryptdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdll/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/cryptdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptdll/CMakeLists.txt [iso-8859-1] Sun Sep 15 16:52:35 2013 @@ -1,6 +1,5 @@ add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(cryptdll.dll cryptdll.spec) @@ -11,7 +10,6 @@ ${CMAKE_CURRENT_BINARY_DIR}/cryptdll.def) add_library(cryptdll SHARED ${SOURCE}) - set_module_type(cryptdll win32dll) target_link_libraries(cryptdll wine) add_importlibs(cryptdll advapi32 msvcrt kernel32 ntdll) Modified: trunk/reactos/dll/win32/cryptdll/cryptdll.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdll/cryptdl… ============================================================================== --- trunk/reactos/dll/win32/cryptdll/cryptdll.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptdll/cryptdll.c [iso-8859-1] Sun Sep 15 16:52:35 2013 @@ -35,14 +35,8 @@ case DLL_WINE_PREATTACH: return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: - { DisableThreadLibraryCalls(hinstDLL); break; - } - case DLL_PROCESS_DETACH: - { - break; - } } return TRUE; 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 15 16:52:35 2013 @@ -65,7 +65,7 @@ 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.5.26 +reactos/dll/win32/cryptdll # Synced to Wine-1.7.1 reactos/dll/win32/cryptnet # Synced to Wine-1.5.26 reactos/dll/win32/cryptui # Synced to Wine-1.5.26 reactos/dll/win32/dbghelp # Synced to Wine-1.5.26

1 0

[akhaldi] 60138: [CRYPTNET_WINETEST] * Speedup linking.
by akhaldi＠svn.reactos.org 15 Sep '13

15 Sep '13

Author: akhaldi Date: Sun Sep 15 16:50:24 2013 New Revision: 60138 URL: http://svn.reactos.org/svn/reactos?rev=60138&view=rev Log: [CRYPTNET_WINETEST] * Speedup linking. Modified: trunk/rostests/winetests/cryptnet/CMakeLists.txt Modified: trunk/rostests/winetests/cryptnet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/cryptnet/CMakeL… ============================================================================== --- trunk/rostests/winetests/cryptnet/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/cryptnet/CMakeLists.txt [iso-8859-1] Sun Sep 15 16:50:24 2013 @@ -1,10 +1,6 @@ -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) - +add_definitions(-D__ROS_LONG64__) add_executable(cryptnet_winetest cryptnet.c testlist.c) -target_link_libraries(cryptnet_winetest wine) set_module_type(cryptnet_winetest win32cui) -add_importlibs(cryptnet_winetest cryptnet crypt32 msvcrt kernel32 ntdll) +add_importlibs(cryptnet_winetest cryptnet crypt32 msvcrt kernel32) add_cd_file(TARGET cryptnet_winetest DESTINATION reactos/bin FOR all)

1 0

[akhaldi] 60137: [CRYPTDLG] * Sync with Wine 1.7.1.
by akhaldi＠svn.reactos.org 15 Sep '13

15 Sep '13

Author: akhaldi Date: Sun Sep 15 16:35:08 2013 New Revision: 60137 URL: http://svn.reactos.org/svn/reactos?rev=60137&view=rev Log: [CRYPTDLG] * Sync with Wine 1.7.1. Modified: trunk/reactos/dll/win32/cryptdlg/CMakeLists.txt trunk/reactos/dll/win32/cryptdlg/main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/cryptdlg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdlg/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/cryptdlg/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptdlg/CMakeLists.txt [iso-8859-1] Sun Sep 15 16:35:08 2013 @@ -6,22 +6,11 @@ list(APPEND SOURCE main.c - cryptdlg.rc ${CMAKE_CURRENT_BINARY_DIR}/cryptdlg_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/cryptdlg.def) -add_library(cryptdlg SHARED ${SOURCE}) +add_library(cryptdlg SHARED ${SOURCE} cryptdlg.rc) set_module_type(cryptdlg win32dll) target_link_libraries(cryptdlg wine) - -add_importlibs(cryptdlg - advapi32 - user32 - crypt32 - cryptui - wintrust - msvcrt - kernel32 - ntdll) - +add_importlibs(cryptdlg advapi32 user32 crypt32 cryptui wintrust msvcrt kernel32 ntdll) add_cd_file(TARGET cryptdlg DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/cryptdlg/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdlg/main.c?… ============================================================================== --- trunk/reactos/dll/win32/cryptdlg/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptdlg/main.c [iso-8859-1] Sun Sep 15 16:35:08 2013 @@ -53,10 +53,6 @@ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinstDLL); hInstance = hinstDLL; - break; - case DLL_PROCESS_DETACH: - break; - default: break; } return TRUE; 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 15 16:35:08 2013 @@ -64,7 +64,7 @@ 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.5.26 +reactos/dll/win32/cryptdlg # Synced to Wine-1.7.1 reactos/dll/win32/cryptdll # Synced to Wine-1.5.26 reactos/dll/win32/cryptnet # Synced to Wine-1.5.26 reactos/dll/win32/cryptui # Synced to Wine-1.5.26

1 0

← Newer
1
...
32
33
34
35
36
37
38
...
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