Ros-diffs

ros-diffs@reactos.org

81390 discussions

[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

[aandrejevic] 60136: [SOFT386] Implement MOV (mod-reg-r/m).
by aandrejevic＠svn.reactos.org 15 Sep '13

15 Sep '13

Author: aandrejevic Date: Sun Sep 15 15:30:55 2013 New Revision: 60136 URL: http://svn.reactos.org/svn/reactos?rev=60136&view=rev Log: [SOFT386] Implement MOV (mod-reg-r/m). 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 15:30:55 2013 @@ -3665,18 +3665,140 @@ SOFT386_OPCODE_HANDLER(Soft386OpcodeMovByteModrm) { - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; - - return FALSE; + UCHAR FirstValue, SecondValue, Result; + SOFT386_MOD_REG_RM ModRegRm; + BOOLEAN AddressSize = State->SegmentRegs[SOFT386_REG_CS].Size; + + /* Make sure this is the right instruction */ + ASSERT((Opcode & 0xFD) == 0x88); + + if (State->PrefixFlags & SOFT386_PREFIX_ADSIZE) + { + /* The ADSIZE prefix toggles the size */ + AddressSize = !AddressSize; + } + else if (State->PrefixFlags + & ~(SOFT386_PREFIX_ADSIZE + | SOFT386_PREFIX_SEG + | SOFT386_PREFIX_LOCK)) + { + /* Invalid prefix */ + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + /* Get the operands */ + if (!Soft386ParseModRegRm(State, AddressSize, &ModRegRm)) + { + /* Exception occurred */ + return FALSE; + } + + if (!Soft386ReadModrmByteOperands(State, + &ModRegRm, + &FirstValue, + &SecondValue)) + { + /* Exception occurred */ + return FALSE; + } + + if (Opcode & SOFT386_OPCODE_WRITE_REG) Result = SecondValue; + else Result = FirstValue; + + /* Write back the result */ + return Soft386WriteModrmByteOperands(State, + &ModRegRm, + Opcode & SOFT386_OPCODE_WRITE_REG, + Result); + } SOFT386_OPCODE_HANDLER(Soft386OpcodeMovModrm) { - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; - - return FALSE; + SOFT386_MOD_REG_RM ModRegRm; + BOOLEAN OperandSize, AddressSize; + + /* Make sure this is the right instruction */ + ASSERT((Opcode & 0xFD) == 0x89); + + 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; + } + + if (State->PrefixFlags + & ~(SOFT386_PREFIX_ADSIZE + | SOFT386_PREFIX_OPSIZE + | SOFT386_PREFIX_SEG + | SOFT386_PREFIX_LOCK)) + { + /* Invalid prefix */ + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + /* Get the operands */ + if (!Soft386ParseModRegRm(State, AddressSize, &ModRegRm)) + { + /* Exception occurred */ + return FALSE; + } + + /* Check the operand size */ + if (OperandSize) + { + ULONG FirstValue, SecondValue, Result; + + if (!Soft386ReadModrmDwordOperands(State, + &ModRegRm, + &FirstValue, + &SecondValue)) + { + /* Exception occurred */ + return FALSE; + } + + if (Opcode & SOFT386_OPCODE_WRITE_REG) Result = SecondValue; + else Result = FirstValue; + + /* Write back the result */ + return Soft386WriteModrmDwordOperands(State, + &ModRegRm, + Opcode & SOFT386_OPCODE_WRITE_REG, + Result); + } + else + { + USHORT FirstValue, SecondValue, Result; + + if (!Soft386ReadModrmWordOperands(State, + &ModRegRm, + &FirstValue, + &SecondValue)) + { + /* Exception occurred */ + return FALSE; + } + + if (Opcode & SOFT386_OPCODE_WRITE_REG) Result = SecondValue; + else Result = FirstValue; + + /* Write back the result */ + return Soft386WriteModrmWordOperands(State, + &ModRegRm, + Opcode & SOFT386_OPCODE_WRITE_REG, + Result); + } } SOFT386_OPCODE_HANDLER(Soft386OpcodeMovStoreSeg)

1 0

[tfaber] 60135: [SPEC2DEF] - Ignore C++ redirects again because they breaks msvcrt CORE-7465 #resolve [FRAMEDYN] - Work around the lack of C++ redirects
by tfaber＠svn.reactos.org 15 Sep '13

15 Sep '13

Author: tfaber Date: Sun Sep 15 14:33:33 2013 New Revision: 60135 URL: http://svn.reactos.org/svn/reactos?rev=60135&view=rev Log: [SPEC2DEF] - Ignore C++ redirects again because they breaks msvcrt CORE-7465 #resolve [FRAMEDYN] - Work around the lack of C++ redirects Added: trunk/reactos/dll/win32/framedyn/fix_exports_msvc.s (with props) Modified: trunk/reactos/dll/win32/framedyn/CMakeLists.txt trunk/reactos/dll/win32/framedyn/framedyn_msvc.spec trunk/reactos/tools/spec2def/spec2def.c Modified: trunk/reactos/dll/win32/framedyn/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/framedyn/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/framedyn/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/framedyn/CMakeLists.txt [iso-8859-1] Sun Sep 15 14:33:33 2013 @@ -12,7 +12,11 @@ chstring.cpp ${CMAKE_CURRENT_BINARY_DIR}/framedyn.def) -add_library(framedyn SHARED ${SOURCE}) +if(MSVC) + add_asm_files(framedyn_asm fix_exports_msvc.s) +endif() + +add_library(framedyn SHARED ${SOURCE} ${framedyn_asm}) set_module_type(framedyn win32dll UNICODE) add_importlibs(framedyn oleaut32 msvcrt kernel32 ntdll) Added: trunk/reactos/dll/win32/framedyn/fix_exports_msvc.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/framedyn/fix_exp… ============================================================================== --- trunk/reactos/dll/win32/framedyn/fix_exports_msvc.s (added) +++ trunk/reactos/dll/win32/framedyn/fix_exports_msvc.s [iso-8859-1] Sun Sep 15 14:33:33 2013 @@ -0,0 +1,48 @@ +#include <asm.inc> + +.code64 +.align 4 + +MACRO(DEFINE_ALIAS, alias, orig) +EXTERN &orig:ABS +ALIAS <&alias> = <&orig> +ENDM + +DEFINE_ALIAS ?AllocSysString@CHString@@QBEPAGXZ, ?AllocSysString@CHString@@QBEPA_WXZ +DEFINE_ALIAS ?AssignCopy@CHString@@IAEXHPBG@Z, ?AssignCopy@CHString@@IAEXHPB_W@Z +DEFINE_ALIAS ??0CHString@@QAE@PBG@Z, ??0CHString@@QAE@PB_W@Z +DEFINE_ALIAS ??0CHString@@QAE@PBGH@Z, ??0CHString@@QAE@PB_WH@Z +DEFINE_ALIAS ??0CHString@@QAE@GH@Z, ??0CHString@@QAE@_WH@Z +DEFINE_ALIAS ?Collate@CHString@@QBEHPBG@Z, ?Collate@CHString@@QBEHPB_W@Z +DEFINE_ALIAS ?Compare@CHString@@QBEHPBG@Z, ?Compare@CHString@@QBEHPB_W@Z +DEFINE_ALIAS ?CompareNoCase@CHString@@QBEHPBG@Z, ?CompareNoCase@CHString@@QBEHPB_W@Z +DEFINE_ALIAS ?ConcatCopy@CHString@@IAEXHPBGH0@Z, ?ConcatCopy@CHString@@IAEXHPB_WH0@Z +DEFINE_ALIAS ?ConcatInPlace@CHString@@IAEXHPBG@Z, ?ConcatInPlace@CHString@@IAEXHPB_W@Z +DEFINE_ALIAS ?Find@CHString@@QBEHPBG@Z, ?Find@CHString@@QBEHPB_W@Z +DEFINE_ALIAS ?Find@CHString@@QBEHG@Z, ?Find@CHString@@QBEH_W@Z +DEFINE_ALIAS ?FindOneOf@CHString@@QBEHPBG@Z, ?FindOneOf@CHString@@QBEHPB_W@Z +DEFINE_ALIAS ?Format@CHString@@QAAXPBGZZ, ?Format@CHString@@QAAXPB_WZZ +DEFINE_ALIAS ?FormatMessageW@CHString@@QAAXPBGZZ, ?FormatMessageW@CHString@@QAAXPB_WZZ +DEFINE_ALIAS ?FormatV@CHString@@QAEXPBGPAD@Z, ?FormatV@CHString@@QAEXPB_WPAD@Z +DEFINE_ALIAS ?GetAt@CHString@@QBEGH@Z, ?GetAt@CHString@@QBE_WH@Z +DEFINE_ALIAS ?GetBuffer@CHString@@QAEPAGH@Z, ?GetBuffer@CHString@@QAEPA_WH@Z +DEFINE_ALIAS ?GetBufferSetLength@CHString@@QAEPAGH@Z, ?GetBufferSetLength@CHString@@QAEPA_WH@Z +DEFINE_ALIAS ?LoadStringW@CHString@@IAEHIPAGI@Z, ?LoadStringW@CHString@@IAEHIPA_WI@Z +DEFINE_ALIAS ?LockBuffer@CHString@@QAEPAGXZ, ?LockBuffer@CHString@@QAEPA_WXZ +DEFINE_ALIAS ?ReverseFind@CHString@@QBEHG@Z, ?ReverseFind@CHString@@QBEH_W@Z +DEFINE_ALIAS ?SafeStrlen@CHString@@KGHPBG@Z, ?SafeStrlen@CHString@@KGHPB_W@Z +DEFINE_ALIAS ?SetAt@CHString@@QAEXHG@Z, ?SetAt@CHString@@QAEXH_W@Z +DEFINE_ALIAS ?SpanExcluding@CHString@@QBE?AV1@PBG@Z, ?SpanExcluding@CHString@@QBE?AV1@PB_W@Z +DEFINE_ALIAS ?SpanIncluding@CHString@@QBE?AV1@PBG@Z, ?SpanIncluding@CHString@@QBE?AV1@PB_W@Z +DEFINE_ALIAS ??BCHString@@QBEPBGXZ, ??BCHString@@QBEPB_WXZ +DEFINE_ALIAS ??YCHString@@QAEABV0@PBG@Z, ??YCHString@@QAEABV0@PB_W@Z +DEFINE_ALIAS ??YCHString@@QAEABV0@G@Z, ??YCHString@@QAEABV0@_W@Z +DEFINE_ALIAS ??4CHString@@QAEABV0@PBG@Z, ??4CHString@@QAEABV0@PB_W@Z +DEFINE_ALIAS ??4CHString@@QAEABV0@G@Z, ??4CHString@@QAEABV0@_W@Z +DEFINE_ALIAS ??ACHString@@QBEGH@Z, ??ACHString@@QBE_WH@Z +DEFINE_ALIAS ??H@YG?AVCHString@@GABV0@@Z, ??H@YG?AVCHString@@_WABV0@@Z +DEFINE_ALIAS ??H@YG?AVCHString@@ABV0@G@Z, ??H@YG?AVCHString@@ABV0@_W@Z +DEFINE_ALIAS ??H@YG?AVCHString@@ABV0@PBG@Z, ??H@YG?AVCHString@@ABV0@PB_W@Z +DEFINE_ALIAS ??H@YG?AVCHString@@PBGABV0@@Z, ??H@YG?AVCHString@@PB_WABV0@@Z + +END Propchange: trunk/reactos/dll/win32/framedyn/fix_exports_msvc.s ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/framedyn/framedyn_msvc.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/framedyn/framedy… ============================================================================== --- trunk/reactos/dll/win32/framedyn/framedyn_msvc.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/framedyn/framedyn_msvc.spec [iso-8859-1] Sun Sep 15 14:33:33 2013 @@ -1,43 +1,43 @@ @ thiscall ?AllocBeforeWrite@CHString@@IAEXH@Z(long) @ thiscall ?AllocBuffer@CHString@@IAEXH@Z(long) @ thiscall ?AllocCopy@CHString@@IBEXAAV1@HHH@Z(ptr long long long) -@ thiscall ?AllocSysString@CHString@@QBEPAGXZ() ?AllocSysString@CHString@@QBEPA_WXZ -@ thiscall ?AssignCopy@CHString@@IAEXHPBG@Z(long wstr) ?AssignCopy@CHString@@IAEXHPB_W@Z +@ thiscall ?AllocSysString@CHString@@QBEPAGXZ() +@ thiscall ?AssignCopy@CHString@@IAEXHPBG@Z(long wstr) @ thiscall ??0CHString@@QAE@ABV0@@Z(ptr) @ thiscall ??0CHString@@QAE@PBD@Z(str) @ thiscall ??0CHString@@QAE@PBE@Z(str) -@ thiscall ??0CHString@@QAE@PBG@Z(wstr) ??0CHString@@QAE@PB_W@Z -@ thiscall ??0CHString@@QAE@PBGH@Z(wstr long) ??0CHString@@QAE@PB_WH@Z -@ thiscall ??0CHString@@QAE@GH@Z(long long) ??0CHString@@QAE@_WH@Z +@ thiscall ??0CHString@@QAE@PBG@Z(wstr) +@ thiscall ??0CHString@@QAE@PBGH@Z(wstr long) +@ thiscall ??0CHString@@QAE@GH@Z(long long) @ thiscall ??0CHString@@QAE@XZ() -@ thiscall ?Collate@CHString@@QBEHPBG@Z(wstr) ?Collate@CHString@@QBEHPB_W@Z -@ thiscall ?Compare@CHString@@QBEHPBG@Z(wstr) ?Compare@CHString@@QBEHPB_W@Z -@ thiscall ?CompareNoCase@CHString@@QBEHPBG@Z(wstr) ?CompareNoCase@CHString@@QBEHPB_W@Z -@ thiscall ?ConcatCopy@CHString@@IAEXHPBGH0@Z(long wstr long wstr) ?ConcatCopy@CHString@@IAEXHPB_WH0@Z -@ thiscall ?ConcatInPlace@CHString@@IAEXHPBG@Z(long wstr) ?ConcatInPlace@CHString@@IAEXHPB_W@Z +@ thiscall ?Collate@CHString@@QBEHPBG@Z(wstr) +@ thiscall ?Compare@CHString@@QBEHPBG@Z(wstr) +@ thiscall ?CompareNoCase@CHString@@QBEHPBG@Z(wstr) +@ thiscall ?ConcatCopy@CHString@@IAEXHPBGH0@Z(long wstr long wstr) +@ thiscall ?ConcatInPlace@CHString@@IAEXHPBG@Z(long wstr) @ thiscall ?CopyBeforeWrite@CHString@@IAEXXZ() @ thiscall ?Empty@CHString@@QAEXXZ() -@ thiscall ?Find@CHString@@QBEHPBG@Z(wstr) ?Find@CHString@@QBEHPB_W@Z -@ thiscall ?Find@CHString@@QBEHG@Z(long) ?Find@CHString@@QBEH_W@Z -@ thiscall ?FindOneOf@CHString@@QBEHPBG@Z(wstr) ?FindOneOf@CHString@@QBEHPB_W@Z +@ thiscall ?Find@CHString@@QBEHPBG@Z(wstr) +@ thiscall ?Find@CHString@@QBEHG@Z(long) +@ thiscall ?FindOneOf@CHString@@QBEHPBG@Z(wstr) @ thiscall ?Format@CHString@@QAAXIZZ(long long long) -@ thiscall ?Format@CHString@@QAAXPBGZZ(long wstr long) ?Format@CHString@@QAAXPB_WZZ +@ thiscall ?Format@CHString@@QAAXPBGZZ(long wstr long) @ thiscall ?FormatMessageW@CHString@@QAAXIZZ(long long long) -@ thiscall ?FormatMessageW@CHString@@QAAXPBGZZ(long ptr long) ?FormatMessageW@CHString@@QAAXPB_WZZ -@ thiscall ?FormatV@CHString@@QAEXPBGPAD@Z(wstr long) ?FormatV@CHString@@QAEXPB_WPAD@Z +@ thiscall ?FormatMessageW@CHString@@QAAXPBGZZ(long ptr long) +@ thiscall ?FormatV@CHString@@QAEXPBGPAD@Z(wstr long) @ thiscall ?FreeExtra@CHString@@QAEXXZ() @ thiscall ?GetAllocLength@CHString@@QBEHXZ() -@ thiscall ?GetAt@CHString@@QBEGH@Z(long) ?GetAt@CHString@@QBE_WH@Z -@ thiscall ?GetBuffer@CHString@@QAEPAGH@Z(long) ?GetBuffer@CHString@@QAEPA_WH@Z -@ thiscall ?GetBufferSetLength@CHString@@QAEPAGH@Z(long) ?GetBufferSetLength@CHString@@QAEPA_WH@Z +@ thiscall ?GetAt@CHString@@QBEGH@Z(long) +@ thiscall ?GetBuffer@CHString@@QAEPAGH@Z(long) +@ thiscall ?GetBufferSetLength@CHString@@QAEPAGH@Z(long) @ thiscall ?GetData@CHString@@IBEPAUCHStringData@@XZ() @ thiscall ?GetLength@CHString@@QBEHXZ() @ thiscall ?Init@CHString@@IAEXXZ() @ thiscall ?IsEmpty@CHString@@QBEHXZ() @ thiscall ?Left@CHString@@QBE?AV1@H@Z(long) @ thiscall ?LoadStringW@CHString@@QAEHI@Z(long) -@ thiscall ?LoadStringW@CHString@@IAEHIPAGI@Z(long wstr long) ?LoadStringW@CHString@@IAEHIPA_WI@Z -@ thiscall ?LockBuffer@CHString@@QAEPAGXZ() ?LockBuffer@CHString@@QAEPA_WXZ +@ thiscall ?LoadStringW@CHString@@IAEHIPAGI@Z(long wstr long) +@ thiscall ?LockBuffer@CHString@@QAEPAGXZ() @ thiscall ?MakeLower@CHString@@QAEXXZ() @ thiscall ?MakeReverse@CHString@@QAEXXZ() @ thiscall ?MakeUpper@CHString@@QAEXXZ() @@ -46,31 +46,31 @@ @ thiscall ?Release@CHString@@KGXPAUCHStringData@@@Z(ptr) @ thiscall ?Release@CHString@@IAEXXZ() @ thiscall ?ReleaseBuffer@CHString@@QAEXH@Z(long) -@ thiscall ?ReverseFind@CHString@@QBEHG@Z(long) ?ReverseFind@CHString@@QBEH_W@Z +@ thiscall ?ReverseFind@CHString@@QBEHG@Z(long) @ thiscall ?Right@CHString@@QBE?AV1@H@Z(long) -@ stdcall ?SafeStrlen@CHString@@KGHPBG@Z(wstr) ?SafeStrlen@CHString@@KGHPB_W@Z -@ thiscall ?SetAt@CHString@@QAEXHG@Z(long long) ?SetAt@CHString@@QAEXH_W@Z -@ thiscall ?SpanExcluding@CHString@@QBE?AV1@PBG@Z(long wstr) ?SpanExcluding@CHString@@QBE?AV1@PB_W@Z -@ thiscall ?SpanIncluding@CHString@@QBE?AV1@PBG@Z(long wstr) ?SpanIncluding@CHString@@QBE?AV1@PB_W@Z +@ stdcall ?SafeStrlen@CHString@@KGHPBG@Z(wstr) +@ thiscall ?SetAt@CHString@@QAEXHG@Z(long long) +@ thiscall ?SpanExcluding@CHString@@QBE?AV1@PBG@Z(long wstr) +@ thiscall ?SpanIncluding@CHString@@QBE?AV1@PBG@Z(long wstr) @ thiscall ?TrimLeft@CHString@@QAEXXZ() @ thiscall ?TrimRight@CHString@@QAEXXZ() @ thiscall ?UnlockBuffer@CHString@@QAEXXZ() -@ thiscall ??BCHString@@QBEPBGXZ(ptr) ??BCHString@@QBEPB_WXZ +@ thiscall ??BCHString@@QBEPBGXZ(ptr) @ thiscall ??YCHString@@QAEABV0@ABV0@@Z(ptr) @ thiscall ??YCHString@@QAEABV0@D@Z(long) -@ thiscall ??YCHString@@QAEABV0@PBG@Z(wstr) ??YCHString@@QAEABV0@PB_W@Z -@ thiscall ??YCHString@@QAEABV0@G@Z(long) ??YCHString@@QAEABV0@_W@Z +@ thiscall ??YCHString@@QAEABV0@PBG@Z(wstr) +@ thiscall ??YCHString@@QAEABV0@G@Z(long) @ thiscall ??4CHString@@QAEABV0@PAV0@@Z(ptr) @ thiscall ??4CHString@@QAEABV0@ABV0@@Z(ptr) @ thiscall ??4CHString@@QAEABV0@PBD@Z(str) @ thiscall ??4CHString@@QAEABV0@D@Z(long) @ thiscall ??4CHString@@QAEABV0@PBE@Z(str) -@ thiscall ??4CHString@@QAEABV0@PBG@Z(wstr) ??4CHString@@QAEABV0@PB_W@Z -@ thiscall ??4CHString@@QAEABV0@G@Z(long) ??4CHString@@QAEABV0@_W@Z -@ thiscall ??ACHString@@QBEGH@Z(long) ??ACHString@@QBE_WH@Z +@ thiscall ??4CHString@@QAEABV0@PBG@Z(wstr) +@ thiscall ??4CHString@@QAEABV0@G@Z(long) +@ thiscall ??ACHString@@QBEGH@Z(long) @ thiscall ??1CHString@@QAE@XZ() -@ stdcall ??H@YG?AVCHString@@GABV0@@Z(long ptr) ??H@YG?AVCHString@@_WABV0@@Z -@ stdcall ??H@YG?AVCHString@@ABV0@G@Z(ptr long) ??H@YG?AVCHString@@ABV0@_W@Z -@ stdcall ??H@YG?AVCHString@@ABV0@PBG@Z(ptr wstr) ??H@YG?AVCHString@@ABV0@PB_W@Z -@ stdcall ??H@YG?AVCHString@@PBGABV0@@Z(wstr ptr) ??H@YG?AVCHString@@PB_WABV0@@Z +@ stdcall ??H@YG?AVCHString@@GABV0@@Z(long ptr) +@ stdcall ??H@YG?AVCHString@@ABV0@G@Z(ptr long) +@ stdcall ??H@YG?AVCHString@@ABV0@PBG@Z(ptr wstr) +@ stdcall ??H@YG?AVCHString@@PBGABV0@@Z(wstr ptr) @ stdcall ??H@YG?AVCHString@@ABV0@0@Z(ptr ptr) Modified: trunk/reactos/tools/spec2def/spec2def.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/spec2def/spec2def.c?… ============================================================================== --- trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] (original) +++ trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] Sun Sep 15 14:33:33 2013 @@ -349,11 +349,19 @@ } else if (pexp->pcRedirection) { - int fDeco; - - fDeco = ((giArch == ARCH_X86) && !ScanToken(pexp->pcRedirection, '.')); - fprintf(fileDest, "="); - PrintName(fileDest, pexp, "", 1, fDeco && !gbMSComp); + if (gbMSComp && (pexp->pcName[0] == '?')) + { + fprintf(stderr, "warning: ignoring C++ redirection %.*s -> %.*s\n", + pexp->nNameLength, pexp->pcName, pexp->nRedirectionLength, pexp->pcRedirection); + } + else + { + int fDeco; + + fDeco = ((giArch == ARCH_X86) && !ScanToken(pexp->pcRedirection, '.')); + fprintf(fileDest, "="); + PrintName(fileDest, pexp, "", 1, fDeco && !gbMSComp); + } } else if (((pexp->uFlags & FL_STUB) || (pexp->nCallingConvention == CC_STUB)) && (pexp->pcName[0] == '?'))

1 0

[ekohl] 60134: [USRMGR] Use NetLocalGroupGetMembers level 2 instead of level 1 in order to display the domain names of well-known groups in the group membership list. Skip the domain name for other...
by ekohl＠svn.reactos.org 15 Sep '13

15 Sep '13

Author: ekohl Date: Sun Sep 15 14:20:58 2013 New Revision: 60134 URL: http://svn.reactos.org/svn/reactos?rev=60134&view=rev Log: [USRMGR] Use NetLocalGroupGetMembers level 2 instead of level 1 in order to display the domain names of well-known groups in the group membership list. Skip the domain name for other account types. Modified: trunk/reactos/dll/cpl/usrmgr/groupprops.c Modified: trunk/reactos/dll/cpl/usrmgr/groupprops.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/groupprops.… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/groupprops.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/groupprops.c [iso-8859-1] Sun Sep 15 14:20:58 2013 @@ -389,7 +389,7 @@ PGENERAL_GROUP_DATA pGroupData) { PLOCALGROUP_INFO_1 groupInfo = NULL; - PLOCALGROUP_MEMBERS_INFO_1 membersInfo = NULL; + PLOCALGROUP_MEMBERS_INFO_2 membersInfo = NULL; DWORD dwRead; DWORD dwTotal; DWORD_PTR resumeHandle = 0; @@ -435,7 +435,7 @@ NetApiBufferFree(groupInfo); /* Set group members */ - NetLocalGroupGetMembers(NULL, pGroupData->szGroupName, 1, (LPBYTE*)&membersInfo, + NetLocalGroupGetMembers(NULL, pGroupData->szGroupName, 2, (LPBYTE*)&membersInfo, MAX_PREFERRED_LENGTH, &dwRead, &dwTotal, &resumeHandle); @@ -443,31 +443,44 @@ { ZeroMemory(&lvi, sizeof(lvi)); lvi.mask = LVIF_TEXT | LVIF_STATE | LVIF_IMAGE; - lvi.pszText = membersInfo[i].lgrmi1_name; lvi.state = 0; - if (membersInfo[i].lgrmi1_sidusage == SidTypeGroup || - membersInfo[i].lgrmi1_sidusage == SidTypeWellKnownGroup) + if (membersInfo[i].lgrmi2_sidusage == SidTypeGroup || + membersInfo[i].lgrmi2_sidusage == SidTypeWellKnownGroup) { lvi.iImage = 0; } - else if (membersInfo[i].lgrmi1_sidusage == SidTypeUser) + else if (membersInfo[i].lgrmi2_sidusage == SidTypeUser) { /* FIXME: handle locked user properly! */ lvi.iImage = 1; } - if (membersInfo[i].lgrmi1_sidusage == SidTypeWellKnownGroup) + if (membersInfo[i].lgrmi2_sidusage == SidTypeWellKnownGroup) { TCHAR szSid[256]; - GetTextSid(membersInfo[i].lgrmi1_sid, szSid); + GetTextSid(membersInfo[i].lgrmi2_sid, szSid); wsprintf(szGroupName, TEXT("%s (%s)"), - membersInfo[i].lgrmi1_name, + membersInfo[i].lgrmi2_domainandname, szSid); lvi.pszText = szGroupName; + } + else + { + LPWSTR ptr; + + ptr = wcschr(membersInfo[i].lgrmi2_domainandname, L'\\'); + if (ptr != NULL) + { + lvi.pszText = ++ptr; + } + else + { + lvi.pszText = membersInfo[i].lgrmi2_domainandname; + } } (void)ListView_InsertItem(hwndLV, &lvi);

1 0

[akhaldi] 60133: [CRYPTDLG] * Move resource files to the lang folder.
by akhaldi＠svn.reactos.org 15 Sep '13

15 Sep '13

Author: akhaldi Date: Sun Sep 15 14:05:37 2013 New Revision: 60133 URL: http://svn.reactos.org/svn/reactos?rev=60133&view=rev Log: [CRYPTDLG] * Move resource files to the lang folder. Added: trunk/reactos/dll/win32/cryptdlg/lang/ (with props) trunk/reactos/dll/win32/cryptdlg/lang/cryptdlg_Da.rc - copied unchanged from r60132, trunk/reactos/dll/win32/cryptdlg/cryptdlg_Da.rc trunk/reactos/dll/win32/cryptdlg/lang/cryptdlg_De.rc - copied unchanged from r60132, trunk/reactos/dll/win32/cryptdlg/cryptdlg_De.rc trunk/reactos/dll/win32/cryptdlg/lang/cryptdlg_En.rc - copied unchanged from r60132, trunk/reactos/dll/win32/cryptdlg/cryptdlg_En.rc trunk/reactos/dll/win32/cryptdlg/lang/cryptdlg_Fr.rc - copied unchanged from r60132, trunk/reactos/dll/win32/cryptdlg/cryptdlg_Fr.rc trunk/reactos/dll/win32/cryptdlg/lang/cryptdlg_He.rc - copied unchanged from r60132, trunk/reactos/dll/win32/cryptdlg/cryptdlg_He.rc trunk/reactos/dll/win32/cryptdlg/lang/cryptdlg_Hu.rc - copied unchanged from r60132, trunk/reactos/dll/win32/cryptdlg/cryptdlg_Hu.rc trunk/reactos/dll/win32/cryptdlg/lang/cryptdlg_It.rc - copied unchanged from r60132, trunk/reactos/dll/win32/cryptdlg/cryptdlg_It.rc trunk/reactos/dll/win32/cryptdlg/lang/cryptdlg_Ko.rc - copied unchanged from r60132, trunk/reactos/dll/win32/cryptdlg/cryptdlg_Ko.rc trunk/reactos/dll/win32/cryptdlg/lang/cryptdlg_Lt.rc - copied unchanged from r60132, trunk/reactos/dll/win32/cryptdlg/cryptdlg_Lt.rc trunk/reactos/dll/win32/cryptdlg/lang/cryptdlg_Nl.rc - copied unchanged from r60132, trunk/reactos/dll/win32/cryptdlg/cryptdlg_Nl.rc trunk/reactos/dll/win32/cryptdlg/lang/cryptdlg_No.rc - copied unchanged from r60132, trunk/reactos/dll/win32/cryptdlg/cryptdlg_No.rc trunk/reactos/dll/win32/cryptdlg/lang/cryptdlg_Pl.rc - copied unchanged from r60132, trunk/reactos/dll/win32/cryptdlg/cryptdlg_Pl.rc trunk/reactos/dll/win32/cryptdlg/lang/cryptdlg_Pt.rc - copied unchanged from r60132, trunk/reactos/dll/win32/cryptdlg/cryptdlg_Pt.rc trunk/reactos/dll/win32/cryptdlg/lang/cryptdlg_Ro.rc - copied unchanged from r60132, trunk/reactos/dll/win32/cryptdlg/cryptdlg_Ro.rc trunk/reactos/dll/win32/cryptdlg/lang/cryptdlg_Uk.rc - copied unchanged from r60132, trunk/reactos/dll/win32/cryptdlg/cryptdlg_Uk.rc Removed: trunk/reactos/dll/win32/cryptdlg/cryptdlg_Da.rc trunk/reactos/dll/win32/cryptdlg/cryptdlg_De.rc trunk/reactos/dll/win32/cryptdlg/cryptdlg_En.rc trunk/reactos/dll/win32/cryptdlg/cryptdlg_Fr.rc trunk/reactos/dll/win32/cryptdlg/cryptdlg_He.rc trunk/reactos/dll/win32/cryptdlg/cryptdlg_Hu.rc trunk/reactos/dll/win32/cryptdlg/cryptdlg_It.rc trunk/reactos/dll/win32/cryptdlg/cryptdlg_Ko.rc trunk/reactos/dll/win32/cryptdlg/cryptdlg_Lt.rc trunk/reactos/dll/win32/cryptdlg/cryptdlg_Nl.rc trunk/reactos/dll/win32/cryptdlg/cryptdlg_No.rc trunk/reactos/dll/win32/cryptdlg/cryptdlg_Pl.rc trunk/reactos/dll/win32/cryptdlg/cryptdlg_Pt.rc trunk/reactos/dll/win32/cryptdlg/cryptdlg_Ro.rc trunk/reactos/dll/win32/cryptdlg/cryptdlg_Uk.rc Modified: trunk/reactos/dll/win32/cryptdlg/cryptdlg.rc Modified: trunk/reactos/dll/win32/cryptdlg/cryptdlg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdlg/cryptdl… ============================================================================== --- trunk/reactos/dll/win32/cryptdlg/cryptdlg.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptdlg/cryptdlg.rc [iso-8859-1] Sun Sep 15 14:05:37 2013 @@ -23,49 +23,49 @@ //#include "cryptres.h" #ifdef LANGUAGE_DA_DK - #include "cryptdlg_Da.rc" + #include "lang/cryptdlg_Da.rc" #endif #ifdef LANGUAGE_EN_US - #include "cryptdlg_En.rc" + #include "lang/cryptdlg_En.rc" #endif #ifdef LANGUAGE_KO_KR - #include "cryptdlg_Ko.rc" + #include "lang/cryptdlg_Ko.rc" #endif #ifdef LANGUAGE_NL_NL - #include "cryptdlg_Nl.rc" + #include "lang/cryptdlg_Nl.rc" #endif #ifdef LANGUAGE_PL_PL - #include "cryptdlg_Pl.rc" + #include "lang/cryptdlg_Pl.rc" #endif /* UTF-8 */ #ifdef LANGUAGE_DE_DE - #include "cryptdlg_De.rc" + #include "lang/cryptdlg_De.rc" #endif #ifdef LANGUAGE_FR_FR - #include "cryptdlg_Fr.rc" + #include "lang/cryptdlg_Fr.rc" #endif #ifdef LANGUAGE_HE_IL - #include "cryptdlg_He.rc" + #include "lang/cryptdlg_He.rc" #endif #ifdef LANGUAGE_HU_HU - #include "cryptdlg_Hu.rc" + #include "lang/cryptdlg_Hu.rc" #endif #ifdef LANGUAGE_IT_IT - #include "cryptdlg_It.rc" + #include "lang/cryptdlg_It.rc" #endif #ifdef LANGUAGE_LT_LT - #include "cryptdlg_Lt.rc" + #include "lang/cryptdlg_Lt.rc" #endif #ifdef LANGUAGE_NO_NO - #include "cryptdlg_No.rc" + #include "lang/cryptdlg_No.rc" #endif #ifdef LANGUAGE_PT_PT - #include "cryptdlg_Pt.rc" + #include "lang/cryptdlg_Pt.rc" #endif #ifdef LANGUAGE_RO_RO - #include "cryptdlg_Ro.rc" + #include "lang/cryptdlg_Ro.rc" #endif #ifdef LANGUAGE_UK_UA - #include "cryptdlg_Uk.rc" + #include "lang/cryptdlg_Uk.rc" #endif Removed: trunk/reactos/dll/win32/cryptdlg/cryptdlg_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdlg/cryptdl… ============================================================================== --- trunk/reactos/dll/win32/cryptdlg/cryptdlg_Da.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptdlg/cryptdlg_Da.rc (removed) @@ -1,39 +0,0 @@ -/* - * cryptdlg dll resources - * - * Copyright 2010 Thomas Larsen - * Paul Vriens - * - * 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 "cryptres.h" - -LANGUAGE LANG_DANISH, SUBLANG_DEFAULT - -STRINGTABLE -{ - IDS_CERT_POLICY "Certifikat Politik" - IDS_POLICY_ID "Politik Identifikation:" - IDS_POLICY_QUALIFIER_INFO "Politik Kvalifikations Info" - IDS_POLICY_QUALIFIER_ID "Politik Kvalifikations Id=" - IDS_CPS "CPS" /* Certification Practice Statement */ - IDS_USER_NOTICE "Bruger Meddelelse" - IDS_QUALIFIER "Kvalifikation" - IDS_NOTICE_REF "Meddelelses Reference" - IDS_ORGANIZATION "Organisation=" - IDS_NOTICE_NUM "Meddelelses Nummer=" - IDS_NOTICE_TEXT "Meddelelses Tekst=" -} Removed: trunk/reactos/dll/win32/cryptdlg/cryptdlg_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdlg/cryptdl… ============================================================================== --- trunk/reactos/dll/win32/cryptdlg/cryptdlg_De.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptdlg/cryptdlg_De.rc (removed) @@ -1,40 +0,0 @@ -/* - * cryptdlg dll resources - * - * Copyright 2009 AndrÃ© Hentschel - * - * 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 "cryptres.h" - -#pragma code_page(65001) - -LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL - -STRINGTABLE -{ - IDS_CERT_POLICY "Zertifikatsrichtlinie" - IDS_POLICY_ID "Richtlinien Qualifizierung: " - IDS_POLICY_QUALIFIER_INFO "Richtlinien Qualifizierungs Information" - IDS_POLICY_QUALIFIER_ID "Richtlinien Qualifizierungs-ID=" - IDS_CPS "CPS" - IDS_USER_NOTICE "Benutzerbenachrichtigung" - IDS_QUALIFIER "Qualifizierung" - IDS_NOTICE_REF "Benachrichtigungsbezug" - IDS_ORGANIZATION "Organisation=" - IDS_NOTICE_NUM "Benachrichtigungsnummer=" - IDS_NOTICE_TEXT "Benachrichtigungstext=" -} Removed: trunk/reactos/dll/win32/cryptdlg/cryptdlg_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdlg/cryptdl… ============================================================================== --- trunk/reactos/dll/win32/cryptdlg/cryptdlg_En.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptdlg/cryptdlg_En.rc (removed) @@ -1,38 +0,0 @@ -/* - * cryptdlg dll resources - * - * Copyright 2008 Juan Lang - * - * 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 "cryptres.h" - -LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT - -STRINGTABLE -{ - IDS_CERT_POLICY "Certificate Policy" - IDS_POLICY_ID "Policy Identifier: " - IDS_POLICY_QUALIFIER_INFO "Policy Qualifier Info" - IDS_POLICY_QUALIFIER_ID "Policy Qualifier Id=" - IDS_CPS "CPS" /* Certification Practice Statement */ - IDS_USER_NOTICE "User Notice" - IDS_QUALIFIER "Qualifier" - IDS_NOTICE_REF "Notice Reference" - IDS_ORGANIZATION "Organization=" - IDS_NOTICE_NUM "Notice Number=" - IDS_NOTICE_TEXT "Notice Text=" -} Removed: trunk/reactos/dll/win32/cryptdlg/cryptdlg_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdlg/cryptdl… ============================================================================== --- trunk/reactos/dll/win32/cryptdlg/cryptdlg_Fr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptdlg/cryptdlg_Fr.rc (removed) @@ -1,42 +0,0 @@ -/* - * cryptdlg dll French resources - * - * Copyright 2008 Jonathan Ernst - * Copyright 2009 FrÃ©dÃ©ric Delanoy - * - * 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 "cryptres.h" - -/* UTF-8 */ -#pragma code_page(65001) - -LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL - -STRINGTABLE -{ - IDS_CERT_POLICY "Politique de certificat" - IDS_POLICY_ID "Identifiant de politiqueÂ : " - IDS_POLICY_QUALIFIER_INFO "Informations sur le qualificateur de politique" - IDS_POLICY_QUALIFIER_ID "Id de qualificateur de politique =" - IDS_CPS "ÃnoncÃ© des pratiques de certification (CPS)" - IDS_USER_NOTICE "Avis utilisateur" - IDS_QUALIFIER "Qualificateur" - IDS_NOTICE_REF "RÃ©fÃ©rence Ã l'avis" - IDS_ORGANIZATION "Organisation =" - IDS_NOTICE_NUM "NumÃ©ro de l'avis =" - IDS_NOTICE_TEXT "Texte de l'avis =" -} Removed: trunk/reactos/dll/win32/cryptdlg/cryptdlg_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdlg/cryptdl… ============================================================================== --- trunk/reactos/dll/win32/cryptdlg/cryptdlg_He.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptdlg/cryptdlg_He.rc (removed) @@ -1,40 +0,0 @@ -/* - * cryptdlg dll resources - * - * Copyright 2008 Juan Lang - * - * Translated by Baruch Rutman - * - * 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 "cryptres.h" - -LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT - -STRINGTABLE -{ - IDS_CERT_POLICY "Certificate Policy" - IDS_POLICY_ID "Policy Identifier: " - IDS_POLICY_QUALIFIER_INFO "Policy Qualifier Info" - IDS_POLICY_QUALIFIER_ID "Policy Qualifier Id=" - IDS_CPS "CPS" /* Certification Practice Statement */ - IDS_USER_NOTICE "User Notice" - IDS_QUALIFIER "Qualifier" - IDS_NOTICE_REF "Notice Reference" - IDS_ORGANIZATION "××¨×××=" - IDS_NOTICE_NUM "Notice Number=" - IDS_NOTICE_TEXT "Notice Text=" -} Removed: trunk/reactos/dll/win32/cryptdlg/cryptdlg_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdlg/cryptdl… ============================================================================== --- trunk/reactos/dll/win32/cryptdlg/cryptdlg_Hu.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptdlg/cryptdlg_Hu.rc (removed) @@ -1,41 +0,0 @@ -/* - * cryptdlg dll resources - * - * Copyright 2010 Andras Kovacs - * - * 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 "cryptres.h" - -/* UTF-8 */ -#pragma code_page(65001) - -LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT - -STRINGTABLE -{ - IDS_CERT_POLICY "TanusÃtvÃ¡ny szabÃ¡lyok" - IDS_POLICY_ID "SzabÃ¡ly azonosÃtÃ³: " - IDS_POLICY_QUALIFIER_INFO "SzabÃ¡ly minÅsÃtÅ informÃ¡ciÃ³" - IDS_POLICY_QUALIFIER_ID "SzabÃ¡ly minÅsÃtÅ Id=" - IDS_CPS "CPS" /* Certification Practice Statement */ - IDS_USER_NOTICE "FelhasznÃ¡lÃ³ figyelmeztetÃ©s" - IDS_QUALIFIER "MinÅsÃtÅ" - IDS_NOTICE_REF "MegjegyzÃ©si referencia" - IDS_ORGANIZATION "Szervezet=" - IDS_NOTICE_NUM "MegjegyzÃ©s szÃ¡ma=" - IDS_NOTICE_TEXT "MegjegyzÃ©s szÃ¶vege=" -} Removed: trunk/reactos/dll/win32/cryptdlg/cryptdlg_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdlg/cryptdl… ============================================================================== --- trunk/reactos/dll/win32/cryptdlg/cryptdlg_It.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptdlg/cryptdlg_It.rc (removed) @@ -1,42 +0,0 @@ -/* - * cryptdlg dll resources - * - * Copyright 2008 Juan Lang - * Copyright 2010 Luca Bennati - * - * 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 "cryptres.h" - -/* UTF-8 */ -#pragma code_page(65001) - -LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL - -STRINGTABLE -{ - IDS_CERT_POLICY "Policy del certificato" - IDS_POLICY_ID "Identificatore della policy: " - IDS_POLICY_QUALIFIER_INFO "Informazioni sul qualificatore della policy" - IDS_POLICY_QUALIFIER_ID "Id qualificatore della policy=" - IDS_CPS "CPS" /* Certification Practice Statement */ - IDS_USER_NOTICE "Notifica dell'utente" - IDS_QUALIFIER "Qualificatore" - IDS_NOTICE_REF "Riferimento della notifica" - IDS_ORGANIZATION "Organizzazione=" - IDS_NOTICE_NUM "Numero della notifica=" - IDS_NOTICE_TEXT "Testo della notifica=" -} Removed: trunk/reactos/dll/win32/cryptdlg/cryptdlg_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdlg/cryptdl… ============================================================================== --- trunk/reactos/dll/win32/cryptdlg/cryptdlg_Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptdlg/cryptdlg_Ko.rc (removed) @@ -1,39 +0,0 @@ -/* - * cryptdlg dll resources - * - * Copyright 2008 Juan Lang - * Copyright 2008 YunSong Hwang - * - * 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 "cryptres.h" - -LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT - -STRINGTABLE -{ - IDS_CERT_POLICY "ÀÎÁõ Á¤Ã¥" - IDS_POLICY_ID "Á¤Ã¥ ½Äº°ÀÚ: " - IDS_POLICY_QUALIFIER_INFO "Á¤Ã¥ ±¸º°ÀÚ Á¤º¸" - IDS_POLICY_QUALIFIER_ID "Á¤Ã¥ ±¸º°ÀÚ ¾ÆÀÌµð=" - IDS_CPS "CPS"/*ÀÎÁõ ½ÇÇö ¼±¾ð */ - IDS_USER_NOTICE "»ç¿ëÀÚ ÅëÁö" - IDS_QUALIFIER "±¸º°ÀÚ" - IDS_NOTICE_REF "ÅëÁö ÂüÁ¶" - IDS_ORGANIZATION "±â°ü=" - IDS_NOTICE_NUM "ÅëÁö ¹øÈ£=" - IDS_NOTICE_TEXT "ÅëÁö ÅØ½ºÆ®=" -} Removed: trunk/reactos/dll/win32/cryptdlg/cryptdlg_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdlg/cryptdl… ============================================================================== --- trunk/reactos/dll/win32/cryptdlg/cryptdlg_Lt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptdlg/cryptdlg_Lt.rc (removed) @@ -1,41 +0,0 @@ -/* - * cryptdlg dll Lithuanian resources - * - * Copyright 2009 Aurimas FiÅ¡eras <aurimas(a)gmail.com> - * - * 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 "cryptres.h" - -/* UTF-8 */ -#pragma code_page(65001) - -LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL - -STRINGTABLE -{ - IDS_CERT_POLICY "Liudijimo politika" - IDS_POLICY_ID "Politikos identifikatorius: " - IDS_POLICY_QUALIFIER_INFO "Politikos kvalifikatoriaus informacija" - IDS_POLICY_QUALIFIER_ID "Politikos kvalifikatoriaus identifikatorius=" - IDS_CPS "Sertifikavimo Veiklos Nuostatos (CPS)" - IDS_USER_NOTICE "Naudotojo praneÅ¡imas" - IDS_QUALIFIER "Kvalifikatorius" - IDS_NOTICE_REF "PraneÅ¡imo nuoroda" - IDS_ORGANIZATION "Organizacija=" - IDS_NOTICE_NUM "PraneÅ¡imo numeris=" - IDS_NOTICE_TEXT "PraneÅ¡imo tekstas=" -} Removed: trunk/reactos/dll/win32/cryptdlg/cryptdlg_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdlg/cryptdl… ============================================================================== --- trunk/reactos/dll/win32/cryptdlg/cryptdlg_Nl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptdlg/cryptdlg_Nl.rc (removed) @@ -1,38 +0,0 @@ -/* - * cryptdlg dll Dutch resources - * - * Copyright 2009 Frans Kool - * - * 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 "cryptres.h" - -LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL - -STRINGTABLE -{ - IDS_CERT_POLICY "Certificaat beleid" - IDS_POLICY_ID "Beleid Identificatie: " - IDS_POLICY_QUALIFIER_INFO "Beleid kwalificator informatie" - IDS_POLICY_QUALIFIER_ID "Beleid kwalificator Id=" - IDS_CPS "CPS" - IDS_USER_NOTICE "Gebruikers verklaring" - IDS_QUALIFIER "Kwalificator" - IDS_NOTICE_REF "Verklaring referentie" - IDS_ORGANIZATION "Organisatie=" - IDS_NOTICE_NUM "Verklaring nummer=" - IDS_NOTICE_TEXT "Verklaring tekst=" -} Removed: trunk/reactos/dll/win32/cryptdlg/cryptdlg_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdlg/cryptdl… ============================================================================== --- trunk/reactos/dll/win32/cryptdlg/cryptdlg_No.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptdlg/cryptdlg_No.rc (removed) @@ -1,40 +0,0 @@ -/* - * cryptdlg dll resources (Norwegian BokmÃ¥l) - * - * Copyright 2010 Alexander N. SÃ¸rnes <alex(a)thehandofagony.com> - * - * 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 "cryptres.h" - -#pragma code_page(65001) - -LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL - -STRINGTABLE -{ - IDS_CERT_POLICY "Sertifikatpolitikk" - IDS_POLICY_ID "Politikk-ID: " - IDS_POLICY_QUALIFIER_INFO "Info om politikkvalifisering" - IDS_POLICY_QUALIFIER_ID "Kvalifiserings-ID=" - IDS_CPS "CPS" /* Certification Practice Statement */ - IDS_USER_NOTICE "Brukernotis" - IDS_QUALIFIER "Kvalifisering" - IDS_NOTICE_REF "Notisreferanse" - IDS_ORGANIZATION "Organisasjon=" - IDS_NOTICE_NUM "Notisnummer=" - IDS_NOTICE_TEXT "Notistekst=" -} Removed: trunk/reactos/dll/win32/cryptdlg/cryptdlg_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdlg/cryptdl… ============================================================================== --- trunk/reactos/dll/win32/cryptdlg/cryptdlg_Pl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptdlg/cryptdlg_Pl.rc (removed) @@ -1,38 +0,0 @@ -/* - * cryptdlg dll resources - * - * Copyright 2010 £ukasz Wojni³owicz - * - * 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 "cryptres.h" - -LANGUAGE LANG_POLISH, SUBLANG_DEFAULT - -STRINGTABLE -{ - IDS_CERT_POLICY "Zasady certyfikatu" - IDS_POLICY_ID "Identyfikator zasad: " - IDS_POLICY_QUALIFIER_INFO "Informacje o kwalifikatorze zasad" - IDS_POLICY_QUALIFIER_ID "Id kwalifikatora zasad=" - IDS_CPS "CPS" /* Certification Practice Statement */ - IDS_USER_NOTICE "Zawiadamianie u¿ytkownika" - IDS_QUALIFIER "Kwalifikator" - IDS_NOTICE_REF "Odniesienie zawiadamiania" - IDS_ORGANIZATION "Organizacja=" - IDS_NOTICE_NUM "Numer zawiadamiaj¹cy=" - IDS_NOTICE_TEXT "Tekst zawiadamiaj¹cy=" -} Removed: trunk/reactos/dll/win32/cryptdlg/cryptdlg_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdlg/cryptdl… ============================================================================== --- trunk/reactos/dll/win32/cryptdlg/cryptdlg_Pt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptdlg/cryptdlg_Pt.rc (removed) @@ -1,58 +0,0 @@ -/* - * cryptdlg dll Portuguese resources - * - * Copyright 2008 Ricardo Filipe - * Copyright 2010 Gustavo Henrique MilarÃ© - * - * 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 "cryptres.h" - -#pragma code_page(65001) - -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN - -STRINGTABLE -{ - IDS_CERT_POLICY "PolÃtica de Certificados" - IDS_POLICY_ID "Identificador da PolÃtica: " - IDS_POLICY_QUALIFIER_INFO "InformaÃ§Ã£o do Qualificador da PolÃtica" - IDS_POLICY_QUALIFIER_ID "ID do Qualificador da PolÃtica=" - IDS_CPS "CPS" /* Certification Practice Statement */ - IDS_USER_NOTICE "Aviso ao UsuÃ¡rio" - IDS_QUALIFIER "Qualificador" - IDS_NOTICE_REF "ReferÃªncia do Aviso" - IDS_ORGANIZATION "OrganizaÃ§Ã£o=" - IDS_NOTICE_NUM "NÃºmero do Aviso=" - IDS_NOTICE_TEXT "Texto do Aviso=" -} - -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE - -STRINGTABLE -{ - IDS_CERT_POLICY "PolÃtica de Certificados" - IDS_POLICY_ID "Identificador da PolÃtica: " - IDS_POLICY_QUALIFIER_INFO "InformaÃ§Ã£o do Qualificador da PolÃtica" - IDS_POLICY_QUALIFIER_ID "ID do Qualificador da PolÃtica=" - IDS_CPS "CPS" /* Certification Practice Statement */ - IDS_USER_NOTICE "Aviso ao Utilizador" - IDS_QUALIFIER "Qualificador" - IDS_NOTICE_REF "ReferÃªncia do Aviso" - IDS_ORGANIZATION "OrganizaÃ§Ã£o=" - IDS_NOTICE_NUM "NÃºmero do Aviso=" - IDS_NOTICE_TEXT "Texto do Aviso=" -} Removed: trunk/reactos/dll/win32/cryptdlg/cryptdlg_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdlg/cryptdl… ============================================================================== --- trunk/reactos/dll/win32/cryptdlg/cryptdlg_Ro.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptdlg/cryptdlg_Ro.rc (removed) @@ -1,41 +0,0 @@ -/* - * cryptdlg dll Romanian resources - * - * Copyright 2009 Paul Chitescu - * - * 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 "cryptres.h" - -/* UTF-8 */ -#pragma code_page(65001) - -LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL - -STRINGTABLE -{ - IDS_CERT_POLICY "Politica certificatului" - IDS_POLICY_ID "Identificatorul politicii: " - IDS_POLICY_QUALIFIER_INFO "InformaÈia calificatorului politicii" - IDS_POLICY_QUALIFIER_ID "Identificatorul calificatorului politicii=" - IDS_CPS "CPS" - IDS_USER_NOTICE "NotiÈÄ utilizator" - IDS_QUALIFIER "Calificator" - IDS_NOTICE_REF "ReferinÈa notiÈei" - IDS_ORGANIZATION "OrganizaÈia=" - IDS_NOTICE_NUM "NumÄrul notiÈei=" - IDS_NOTICE_TEXT "Textul notiÈei=" -} Removed: trunk/reactos/dll/win32/cryptdlg/cryptdlg_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdlg/cryptdl… ============================================================================== --- trunk/reactos/dll/win32/cryptdlg/cryptdlg_Uk.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptdlg/cryptdlg_Uk.rc (removed) @@ -1,42 +0,0 @@ -/* - * cryptdlg dll resources - * - * Copyright 2008 Juan Lang - * Copyright 2010 Igor Paliychuk - * - * 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 "cryptres.h" - -/* UTF-8 */ -#pragma code_page(65001) - -LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT - -STRINGTABLE -{ - IDS_CERT_POLICY "ÐÐ¾Ð»ÑÑÐ¸ÐºÐ° ÑÐµÑÑÐ¸ÑÑÐºÐ°ÑÑ" - IDS_POLICY_ID "ÐÐ´ÐµÐ½ÑÐ¸ÑÑÐºÐ°ÑÐ¾Ñ Ð¿Ð¾Ð»ÑÑÐ¸ÐºÐ¸: " - IDS_POLICY_QUALIFIER_INFO "ÐÐ½ÑÐ¾ÑÐ¼Ð°ÑÑÑ Ð¿ÑÐ¾ Ð²ÐºÐ°Ð·ÑÐ²Ð½Ð¸Ðº Ð¿Ð¾Ð»ÑÑÐ¸ÐºÐ¸" - IDS_POLICY_QUALIFIER_ID "Id Ð²ÐºÐ°Ð·ÑÐ²Ð½Ð¸ÐºÐ° Ð¿Ð¾Ð»ÑÑÐ¸ÐºÐ¸=" - IDS_CPS "CPS" /* Certification Practice Statement */ - IDS_USER_NOTICE "ÐÐ¾Ð²ÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÐ°" - IDS_QUALIFIER "ÐÐ¸Ð·Ð½Ð°ÑÐ½Ð¸Ðº" - IDS_NOTICE_REF "ÐÐ¾ÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð¿Ð¾Ð²ÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ" - IDS_ORGANIZATION "ÐÑÐ³Ð°Ð½ÑÐ·Ð°ÑÑÑ=" - IDS_NOTICE_NUM "ÐÐ¾Ð¼ÐµÑ Ð¿Ð¾Ð²ÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ=" - IDS_NOTICE_TEXT "Ð¢ÐµÐºÑÑ Ð¿Ð¾Ð²ÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ=" -} Propchange: trunk/reactos/dll/win32/cryptdlg/lang/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Sep 15 14:05:37 2013 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/cryptdlg/lang/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/cryptdlg/lang/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/cryptdlg/lang/ ------------------------------------------------------------------------------ tsvn:logminsize = 10

1 0

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

15 Sep '13

Author: akhaldi Date: Sun Sep 15 13:59:34 2013 New Revision: 60132 URL: http://svn.reactos.org/svn/reactos?rev=60132&view=rev Log: [CRYPT32_WINETEST] * Sync with Wine 1.7.1. Modified: trunk/rostests/winetests/crypt32/CMakeLists.txt trunk/rostests/winetests/crypt32/chain.c Modified: trunk/rostests/winetests/crypt32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/crypt32/CMakeLi… ============================================================================== --- trunk/rostests/winetests/crypt32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/crypt32/CMakeLists.txt [iso-8859-1] Sun Sep 15 13:59:34 2013 @@ -1,7 +1,5 @@ -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) +add_definitions(-D__ROS_LONG64__) list(APPEND SOURCE base64.c @@ -22,7 +20,6 @@ testlist.c) add_executable(crypt32_winetest ${SOURCE}) -target_link_libraries(crypt32_winetest wine) set_module_type(crypt32_winetest win32cui) -add_importlibs(crypt32_winetest crypt32 advapi32 msvcrt kernel32 ntdll) +add_importlibs(crypt32_winetest crypt32 advapi32 msvcrt kernel32) add_cd_file(TARGET crypt32_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/crypt32/chain.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/crypt32/chain.c… ============================================================================== --- trunk/rostests/winetests/crypt32/chain.c [iso-8859-1] (original) +++ trunk/rostests/winetests/crypt32/chain.c [iso-8859-1] Sun Sep 15 13:59:34 2013 @@ -237,6 +237,97 @@ 0xd1,0xbd,0xd7,0x95,0x22,0x43,0x7a,0x06,0x7b,0x4e,0xf6,0x37,0x8e,0xa2,0xb9, 0xcf,0x1f,0xa5,0xd2,0xbd,0x3b,0x04,0x97,0x39,0xb3,0x0f,0xfa,0x38,0xb5,0xaf, 0x55,0x20,0x88,0x60,0x93,0xf2,0xde,0xdb,0xff,0xdf }; +/* *.winehq.org cert */ +static const BYTE winehq_org[] = { +0x30,0x82,0x05,0x2a,0x30,0x82,0x04,0x12,0xa0,0x03,0x02,0x01,0x02,0x02,0x03, +0x0c,0x35,0xd0,0x30,0x0d,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x01, +0x05,0x05,0x00,0x30,0x3c,0x31,0x0b,0x30,0x09,0x06,0x03,0x55,0x04,0x06,0x13, +0x02,0x55,0x53,0x31,0x17,0x30,0x15,0x06,0x03,0x55,0x04,0x0a,0x13,0x0e,0x47, +0x65,0x6f,0x54,0x72,0x75,0x73,0x74,0x2c,0x20,0x49,0x6e,0x63,0x2e,0x31,0x14, +0x30,0x12,0x06,0x03,0x55,0x04,0x03,0x13,0x0b,0x52,0x61,0x70,0x69,0x64,0x53, +0x53,0x4c,0x20,0x43,0x41,0x30,0x1e,0x17,0x0d,0x31,0x33,0x30,0x35,0x32,0x32, +0x30,0x33,0x35,0x36,0x30,0x39,0x5a,0x17,0x0d,0x31,0x34,0x30,0x35,0x32,0x35, +0x30,0x37,0x33,0x34,0x31,0x34,0x5a,0x30,0x81,0xbb,0x31,0x29,0x30,0x27,0x06, +0x03,0x55,0x04,0x05,0x13,0x20,0x30,0x6d,0x4a,0x75,0x76,0x31,0x74,0x2d,0x31, +0x43,0x46,0x79,0x70,0x51,0x6b,0x79,0x54,0x5a,0x77,0x66,0x76,0x6a,0x48,0x48, +0x42,0x41,0x62,0x6e,0x55,0x6e,0x64,0x47,0x31,0x13,0x30,0x11,0x06,0x03,0x55, +0x04,0x0b,0x13,0x0a,0x47,0x54,0x39,0x38,0x33,0x38,0x30,0x30,0x31,0x31,0x31, +0x31,0x30,0x2f,0x06,0x03,0x55,0x04,0x0b,0x13,0x28,0x53,0x65,0x65,0x20,0x77, +0x77,0x77,0x2e,0x72,0x61,0x70,0x69,0x64,0x73,0x73,0x6c,0x2e,0x63,0x6f,0x6d, +0x2f,0x72,0x65,0x73,0x6f,0x75,0x72,0x63,0x65,0x73,0x2f,0x63,0x70,0x73,0x20, +0x28,0x63,0x29,0x31,0x33,0x31,0x2f,0x30,0x2d,0x06,0x03,0x55,0x04,0x0b,0x13, +0x26,0x44,0x6f,0x6d,0x61,0x69,0x6e,0x20,0x43,0x6f,0x6e,0x74,0x72,0x6f,0x6c, +0x20,0x56,0x61,0x6c,0x69,0x64,0x61,0x74,0x65,0x64,0x20,0x2d,0x20,0x52,0x61, +0x70,0x69,0x64,0x53,0x53,0x4c,0x28,0x52,0x29,0x31,0x15,0x30,0x13,0x06,0x03, +0x55,0x04,0x03,0x0c,0x0c,0x2a,0x2e,0x77,0x69,0x6e,0x65,0x68,0x71,0x2e,0x6f, +0x72,0x67,0x30,0x82,0x01,0x22,0x30,0x0d,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7, +0x0d,0x01,0x01,0x01,0x05,0x00,0x03,0x82,0x01,0x0f,0x00,0x30,0x82,0x01,0x0a, +0x02,0x82,0x01,0x01,0x00,0xc2,0x91,0x35,0xc7,0x67,0x32,0xf1,0x66,0x12,0x38, +0x79,0xdb,0x02,0x11,0x95,0x89,0x1b,0x4a,0x6a,0x63,0x45,0x35,0x58,0x1b,0x57, +0x8d,0xec,0x19,0x88,0xf5,0xa3,0x9e,0x6b,0xdb,0x07,0xfb,0x6e,0x29,0xe9,0xa9, +0x14,0x07,0x8c,0x3a,0xc1,0xd7,0x88,0xcc,0xe4,0x55,0x79,0x6e,0x97,0xe9,0x93, +0x88,0x9a,0x89,0xf9,0x31,0x0f,0x91,0x61,0xc2,0x9c,0xae,0x59,0x25,0x93,0x9a, +0xc8,0xf9,0x28,0x7a,0x0f,0x0f,0x89,0x9a,0xda,0x46,0xbe,0xb2,0xdc,0x90,0x5b, +0xd8,0x87,0xda,0xda,0xce,0x70,0x70,0x95,0x43,0x51,0xa0,0x21,0x22,0x54,0xab, +0xa7,0x09,0xe1,0x81,0x09,0x8c,0x00,0x15,0x30,0x5a,0xa7,0x61,0x77,0xba,0x48, +0x91,0xc6,0x94,0x90,0xdd,0x1a,0xf4,0x3f,0xa6,0x8a,0xb4,0x2f,0x98,0x16,0x0d, +0x96,0x9f,0x0c,0x96,0x01,0x15,0xbc,0x74,0x7e,0x5c,0x4e,0xe3,0x95,0xae,0x00, +0xf5,0x5b,0x88,0x0f,0xef,0x7c,0x1f,0xab,0x22,0xfe,0x95,0x42,0x1a,0xbd,0xee, +0x23,0xca,0x5b,0x7f,0x4a,0xb0,0xbe,0x15,0x65,0xe2,0xce,0x02,0xc4,0xf6,0xb8, +0xf3,0xd6,0x7e,0x75,0x5e,0x63,0x47,0x5d,0xc1,0xca,0xc3,0xc4,0x4a,0xf5,0x4d, +0x66,0x34,0x03,0xf8,0xf4,0x54,0x7d,0x6b,0x54,0x2f,0x17,0x7c,0x39,0x13,0x78, +0x09,0x9e,0xd0,0x9c,0x51,0x02,0x11,0x9d,0xa7,0x53,0x60,0xdd,0x62,0x2b,0xee, +0xb0,0xd1,0xf2,0x1a,0x5c,0xdc,0xa7,0x58,0xc2,0xfa,0x29,0xcf,0xf3,0xc9,0xe9, +0xae,0xe8,0x70,0x60,0x99,0xc7,0x30,0xdd,0x1c,0xda,0x32,0xc0,0x45,0xa5,0x48, +0xc5,0x22,0x29,0x0c,0x74,0x25,0x02,0x03,0x01,0x00,0x01,0xa3,0x82,0x01,0xb3, +0x30,0x82,0x01,0xaf,0x30,0x1f,0x06,0x03,0x55,0x1d,0x23,0x04,0x18,0x30,0x16, +0x80,0x14,0x6b,0x69,0x3d,0x6a,0x18,0x42,0x4a,0xdd,0x8f,0x02,0x65,0x39,0xfd, +0x35,0x24,0x86,0x78,0x91,0x16,0x30,0x30,0x0e,0x06,0x03,0x55,0x1d,0x0f,0x01, +0x01,0xff,0x04,0x04,0x03,0x02,0x05,0xa0,0x30,0x1d,0x06,0x03,0x55,0x1d,0x25, +0x04,0x16,0x30,0x14,0x06,0x08,0x2b,0x06,0x01,0x05,0x05,0x07,0x03,0x01,0x06, +0x08,0x2b,0x06,0x01,0x05,0x05,0x07,0x03,0x02,0x30,0x23,0x06,0x03,0x55,0x1d, +0x11,0x04,0x1c,0x30,0x1a,0x82,0x0c,0x2a,0x2e,0x77,0x69,0x6e,0x65,0x68,0x71, +0x2e,0x6f,0x72,0x67,0x82,0x0a,0x77,0x69,0x6e,0x65,0x68,0x71,0x2e,0x6f,0x72, +0x67,0x30,0x43,0x06,0x03,0x55,0x1d,0x1f,0x04,0x3c,0x30,0x3a,0x30,0x38,0xa0, +0x36,0xa0,0x34,0x86,0x32,0x68,0x74,0x74,0x70,0x3a,0x2f,0x2f,0x72,0x61,0x70, +0x69,0x64,0x73,0x73,0x6c,0x2d,0x63,0x72,0x6c,0x2e,0x67,0x65,0x6f,0x74,0x72, +0x75,0x73,0x74,0x2e,0x63,0x6f,0x6d,0x2f,0x63,0x72,0x6c,0x73,0x2f,0x72,0x61, +0x70,0x69,0x64,0x73,0x73,0x6c,0x2e,0x63,0x72,0x6c,0x30,0x1d,0x06,0x03,0x55, +0x1d,0x0e,0x04,0x16,0x04,0x14,0xff,0x4c,0x0f,0x46,0xb8,0x3c,0x5b,0x72,0xe4, +0x10,0x96,0xbb,0xa7,0xbc,0x91,0xa2,0x63,0xf6,0x81,0x0a,0x30,0x0c,0x06,0x03, +0x55,0x1d,0x13,0x01,0x01,0xff,0x04,0x02,0x30,0x00,0x30,0x78,0x06,0x08,0x2b, +0x06,0x01,0x05,0x05,0x07,0x01,0x01,0x04,0x6c,0x30,0x6a,0x30,0x2d,0x06,0x08, +0x2b,0x06,0x01,0x05,0x05,0x07,0x30,0x01,0x86,0x21,0x68,0x74,0x74,0x70,0x3a, +0x2f,0x2f,0x72,0x61,0x70,0x69,0x64,0x73,0x73,0x6c,0x2d,0x6f,0x63,0x73,0x70, +0x2e,0x67,0x65,0x6f,0x74,0x72,0x75,0x73,0x74,0x2e,0x63,0x6f,0x6d,0x30,0x39, +0x06,0x08,0x2b,0x06,0x01,0x05,0x05,0x07,0x30,0x02,0x86,0x2d,0x68,0x74,0x74, +0x70,0x3a,0x2f,0x2f,0x72,0x61,0x70,0x69,0x64,0x73,0x73,0x6c,0x2d,0x61,0x69, +0x61,0x2e,0x67,0x65,0x6f,0x74,0x72,0x75,0x73,0x74,0x2e,0x63,0x6f,0x6d,0x2f, +0x72,0x61,0x70,0x69,0x64,0x73,0x73,0x6c,0x2e,0x63,0x72,0x74,0x30,0x4c,0x06, +0x03,0x55,0x1d,0x20,0x04,0x45,0x30,0x43,0x30,0x41,0x06,0x0a,0x60,0x86,0x48, +0x01,0x86,0xf8,0x45,0x01,0x07,0x36,0x30,0x33,0x30,0x31,0x06,0x08,0x2b,0x06, +0x01,0x05,0x05,0x07,0x02,0x01,0x16,0x25,0x68,0x74,0x74,0x70,0x3a,0x2f,0x2f, +0x77,0x77,0x77,0x2e,0x67,0x65,0x6f,0x74,0x72,0x75,0x73,0x74,0x2e,0x63,0x6f, +0x6d,0x2f,0x72,0x65,0x73,0x6f,0x75,0x72,0x63,0x65,0x73,0x2f,0x63,0x70,0x73, +0x30,0x0d,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x01,0x05,0x05,0x00, +0x03,0x82,0x01,0x01,0x00,0x1b,0xa8,0x34,0xc1,0xb7,0xf3,0xbe,0xb6,0xed,0x12, +0x85,0x58,0xe1,0x69,0x35,0x0c,0xb8,0x7e,0x38,0x11,0xb3,0xd2,0xe2,0x2e,0x52, +0xcf,0xa6,0x39,0xe1,0x25,0x73,0xf0,0x1d,0xc9,0x54,0xa1,0xc2,0x50,0x19,0xea, +0x68,0xeb,0x1a,0x21,0xdb,0x86,0x14,0x55,0x73,0x02,0x28,0x56,0x14,0xf7,0xf1, +0x48,0x43,0xfb,0xd7,0xbf,0xcf,0xbb,0x20,0xc4,0x1e,0x4e,0x9a,0x7c,0xf1,0xe8, +0x28,0x76,0xce,0xf9,0xb3,0xf0,0x6f,0x93,0x70,0x51,0xcd,0xed,0x28,0x1b,0xdd, +0x66,0x38,0x40,0x5e,0x0b,0x13,0xaf,0x21,0xff,0x23,0xf1,0x5b,0xcd,0x32,0x43, +0x00,0x87,0x3d,0x10,0xc6,0x6e,0xe5,0x67,0xdc,0x9f,0x44,0x12,0x94,0xb4,0x76, +0xbd,0xd9,0x4c,0x53,0x12,0x1c,0x2e,0x2c,0x09,0x66,0x41,0x83,0x6c,0xee,0x68, +0x98,0x38,0xd2,0xc8,0x32,0xa3,0x42,0xcf,0x1c,0xfd,0x60,0x6c,0x5d,0x4b,0x4b, +0x6c,0xb8,0xf3,0x7e,0xc8,0x93,0x0a,0x68,0x66,0x14,0x3b,0x39,0x73,0x82,0xfe, +0x86,0x3c,0x3d,0xb3,0xb5,0x42,0xec,0x4c,0xc6,0xe6,0xdd,0x7e,0xd7,0xb4,0x5d, +0xeb,0x6d,0x8c,0x9e,0x29,0x95,0x99,0xb6,0x95,0x5b,0xc0,0xdd,0x46,0xdf,0xdc, +0xf2,0x1c,0x3d,0x80,0xeb,0x14,0x3d,0xd9,0x4a,0xb4,0x6f,0x3e,0x79,0xca,0x7f, +0xbc,0x27,0x47,0x90,0x86,0x55,0xfa,0x27,0xf5,0x35,0x3d,0x1d,0xc4,0xa8,0x55, +0x31,0x8f,0x3a,0x76,0x8d,0x98,0x50,0xa3,0x11,0x91,0x1c,0xb0,0xa8,0x06,0xf9, +0x22,0xb1,0xca,0x20,0x49,0xaa,0xe1,0x4d,0x41,0xf1,0x21,0xcc,0x25,0x45,0x33, +0x4f,0x2f,0x3a,0x48,0x70,0xbb }; /* Battle.Net's cert */ static const BYTE battlenet[] = { 0x30,0x82,0x03,0xd8,0x30,0x82,0x02,0xc0,0xa0,0x03,0x02,0x01,0x02,0x02,0x10, @@ -3673,6 +3764,17 @@ static SYSTEMTIME oct2009 = { 2009, 10, 3, 28, 0, 0, 0, 0 }; /* Wednesday, Oct 28, 2010 */ static SYSTEMTIME oct2010 = { 2010, 10, 3, 28, 0, 0, 0, 0 }; +/* Friday, June 6, 2013 */ +static SYSTEMTIME jun2013 = { 2013, 6, 5, 6, 0, 0, 0, 0 }; + +#define test_name_blob(a,b) _test_name_blob(__LINE__,a,b) +static void _test_name_blob(unsigned line, CERT_NAME_BLOB *blob, const char *exdata) +{ + char buf[1024]; + + CertNameToStrA(CRYPT_ASN_ENCODING, blob, CERT_SIMPLE_NAME_STR, buf, sizeof(buf)); + ok_(__FILE__,line)(!strcmp(buf, exdata), "got string %s, expected %s\n", buf, exdata); +} static void testGetCertChain(void) { @@ -3680,6 +3782,8 @@ PCCERT_CONTEXT cert; CERT_CHAIN_PARA para = { 0 }; PCCERT_CHAIN_CONTEXT chain; + const CERT_SIMPLE_CHAIN *simple_chain; + const CERT_CHAIN_ELEMENT *chain_elem; FILETIME fileTime; DWORD i; HCERTSTORE store; @@ -3874,6 +3978,68 @@ 0); pCertFreeCertificateChain(chain); } + + store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); + ok(store != NULL, "CertOpenStore failed: %u\n", GetLastError()); + + ret = CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, winehq_org, sizeof(winehq_org), + CERT_STORE_ADD_ALWAYS, &cert); + ok(ret, "CertAddEncodedCertificateToStore failed: %u\n", GetLastError()); + + oids[0] = oid_server_auth; + memset(&para, 0, sizeof(para)); + para.cbSize = sizeof(para); + para.RequestedUsage.Usage.cUsageIdentifier = 1; + para.RequestedUsage.Usage.rgpszUsageIdentifier = oids; + SystemTimeToFileTime(&jun2013, &fileTime); + + /* Pass store that does not contain all certs in chain. */ + ret = CertGetCertificateChain(NULL, cert, &fileTime, store, &para, 0, NULL, &chain); + ok(ret, "CertGetCertificateChain failed: %u\n", GetLastError()); + + if(chain->TrustStatus.dwErrorStatus == CERT_TRUST_IS_PARTIAL_CHAIN) { /* win2k */ + todo_wine win_skip("winehq cert reported as partial chain, skipping its tests\n"); + pCertFreeCertificateChain(chain); + CertCloseStore(store, 0); + return; + } + + ok(!chain->TrustStatus.dwErrorStatus, "chain->TrustStatus.dwErrorStatus = %x\n", chain->TrustStatus.dwErrorStatus); + ok(chain->TrustStatus.dwInfoStatus == CERT_TRUST_HAS_PREFERRED_ISSUER, "chain->TrustStatus.dwInfoStatus = %x\n", + chain->TrustStatus.dwInfoStatus); + + ok(chain->cChain == 1, "chain->cChain = %d\n", chain->cChain); + ok(!chain->cLowerQualityChainContext, "chain->cLowerQualityChainContext = %x\n", chain->cLowerQualityChainContext); + ok(!chain->rgpLowerQualityChainContext, "chain->rgpLowerQualityChainContext = %p\n", chain->rgpLowerQualityChainContext); + + simple_chain = *chain->rgpChain; + ok(simple_chain->cbSize == sizeof(*simple_chain), "simple_chain->cbSize = %u\n", simple_chain->cbSize); + ok(!simple_chain->TrustStatus.dwErrorStatus, "simple_chain->TrustStatus.dwErrorStatus = %x\n", + simple_chain->TrustStatus.dwErrorStatus); + ok(simple_chain->TrustStatus.dwInfoStatus == CERT_TRUST_HAS_PREFERRED_ISSUER, + "simple_chain->TrustStatus.dwInfoStatus = %x\n", simple_chain->TrustStatus.dwInfoStatus); + ok(simple_chain->cElement == 3, "simple_chain->cElement = %u\n", simple_chain->cElement); + + for(i=0; i < simple_chain->cElement; i++) { + chain_elem = simple_chain->rgpElement[i]; + ok(chain_elem->cbSize == sizeof(*chain_elem), "chain_elem->cbSize = %u\n", chain_elem->cbSize); + + ok(!chain_elem->TrustStatus.dwErrorStatus, "chain_elem->TrustStatus.dwErrorStatus = %x\n", + chain_elem->TrustStatus.dwErrorStatus); + trace("info[%u] = %x\n", i, chain_elem->TrustStatus.dwInfoStatus); + ok(chain_elem->pCertContext->dwCertEncodingType == CRYPT_ASN_ENCODING, + "chain_elem->pCertContext->dwCertEncodingType = %x\n", + chain_elem->pCertContext->dwCertEncodingType); + } + + ok(simple_chain->rgpElement[0]->pCertContext == cert, "simple_chain->rgpElement[0]->pCertContext != cert\n"); + test_name_blob(&simple_chain->rgpElement[1]->pCertContext->pCertInfo->Issuer, "US, GeoTrust Inc., GeoTrust Global CA"); + test_name_blob(&simple_chain->rgpElement[1]->pCertContext->pCertInfo->Subject, "US, \"GeoTrust, Inc.\", RapidSSL CA"); + test_name_blob(&simple_chain->rgpElement[2]->pCertContext->pCertInfo->Issuer, "US, GeoTrust Inc., GeoTrust Global CA"); + test_name_blob(&simple_chain->rgpElement[2]->pCertContext->pCertInfo->Subject, "US, GeoTrust Inc., GeoTrust Global CA"); + + pCertFreeCertificateChain(chain); + CertCloseStore(store, 0); } static void test_CERT_CHAIN_PARA_cbSize(void)

1 0

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

15 Sep '13

Author: akhaldi Date: Sun Sep 15 13:58:50 2013 New Revision: 60131 URL: http://svn.reactos.org/svn/reactos?rev=60131&view=rev Log: [CRYPT32] * Sync with Wine 1.7.1. Removed: trunk/reactos/dll/win32/crypt32/version.rc Modified: trunk/reactos/dll/win32/crypt32/CMakeLists.txt trunk/reactos/dll/win32/crypt32/crypt32.rc trunk/reactos/dll/win32/crypt32/cryptres.h trunk/reactos/dll/win32/crypt32/lang/crypt32_De.rc trunk/reactos/dll/win32/crypt32/lang/crypt32_En.rc trunk/reactos/dll/win32/crypt32/lang/crypt32_Fr.rc trunk/reactos/dll/win32/crypt32/lang/crypt32_He.rc trunk/reactos/dll/win32/crypt32/lang/crypt32_Hu.rc trunk/reactos/dll/win32/crypt32/lang/crypt32_It.rc trunk/reactos/dll/win32/crypt32/lang/crypt32_Ko.rc trunk/reactos/dll/win32/crypt32/lang/crypt32_Lt.rc trunk/reactos/dll/win32/crypt32/lang/crypt32_Nl.rc trunk/reactos/dll/win32/crypt32/lang/crypt32_No.rc trunk/reactos/dll/win32/crypt32/lang/crypt32_Pl.rc trunk/reactos/dll/win32/crypt32/lang/crypt32_Pt.rc trunk/reactos/dll/win32/crypt32/lang/crypt32_Ro.rc trunk/reactos/dll/win32/crypt32/lang/crypt32_Sv.rc trunk/reactos/dll/win32/crypt32/lang/crypt32_Uk.rc trunk/reactos/dll/win32/crypt32/main.c trunk/reactos/dll/win32/crypt32/rootstore.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/crypt32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/crypt32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/CMakeLists.txt [iso-8859-1] Sun Sep 15 13:58:50 2013 @@ -39,13 +39,6 @@ ${CMAKE_CURRENT_BINARY_DIR}/crypt32.def) add_library(crypt32 SHARED ${SOURCE} crypt32.rc) - -if(NOT MSVC) - # FIXME: http://www.cmake.org/Bug/view.php?id=12998 - #allow_warnings(crypt32) - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error") -endif() - set_module_type(crypt32 win32dll) target_link_libraries(crypt32 wine ${PSEH_LIB} oldnames) add_importlibs(crypt32 user32 advapi32 msvcrt kernel32 ntdll) Modified: trunk/reactos/dll/win32/crypt32/crypt32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32.… ============================================================================== --- trunk/reactos/dll/win32/crypt32/crypt32.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/crypt32.rc [iso-8859-1] Sun Sep 15 13:58:50 2013 @@ -22,7 +22,14 @@ //#include "winuser.h" //#include "cryptres.h" -#include "version.rc" +#define WINE_FILEDESCRIPTION_STR "Wine CryptoAPI Library" +#define WINE_FILENAME_STR "crypt32.dll" +#define WINE_FILEVERSION 5,131,2600,1243 +#define WINE_FILEVERSION_STR "5.131.2600.1243" +#define WINE_PRODUCTVERSION 5,131,2600,1243 +#define WINE_PRODUCTVERSION_STR "5.131.2600.1243" + +#include <wine/wine_common_ver.rc> #ifdef LANGUAGE_EN_US #include "lang/crypt32_En.rc" Modified: trunk/reactos/dll/win32/crypt32/cryptres.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/cryptres… ============================================================================== --- trunk/reactos/dll/win32/crypt32/cryptres.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/cryptres.h [iso-8859-1] Sun Sep 15 13:58:50 2013 @@ -61,9 +61,6 @@ #define IDS_NETSCAPE_CA_POLICY_URL 1038 #define IDS_NETSCAPE_SSL_SERVER_NAME 1039 #define IDS_NETSCAPE_COMMENT 1040 -#define IDS_SPC_SP_AGENCY_INFO 1041 -#define IDS_SPC_FINANCIAL_CRITERIA 1042 -#define IDS_SPC_MINIMAL_CRITERIA 1043 #define IDS_COUNTRY 1044 #define IDS_ORGANIZATION 1045 #define IDS_ORGANIZATIONAL_UNIT 1046 Modified: trunk/reactos/dll/win32/crypt32/lang/crypt32_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/lang/cry… ============================================================================== --- trunk/reactos/dll/win32/crypt32/lang/crypt32_De.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/lang/crypt32_De.rc [iso-8859-1] Sun Sep 15 13:58:50 2013 @@ -68,9 +68,6 @@ IDS_NETSCAPE_CA_POLICY_URL "Netscape CA Richtlinien-URL" IDS_NETSCAPE_SSL_SERVER_NAME "Netscape SSL Servername" IDS_NETSCAPE_COMMENT "Netscape Kommentar" - IDS_SPC_SP_AGENCY_INFO "SpcSp Agentur-Information" - IDS_SPC_FINANCIAL_CRITERIA "Spc Finanzielle Kriterien" - IDS_SPC_MINIMAL_CRITERIA "Spc Minimale Kriterien" IDS_COUNTRY "Land/Region" IDS_ORGANIZATION "Organisation" IDS_ORGANIZATIONAL_UNIT "Organisationseinheit" Modified: trunk/reactos/dll/win32/crypt32/lang/crypt32_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/lang/cry… ============================================================================== --- trunk/reactos/dll/win32/crypt32/lang/crypt32_En.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/lang/crypt32_En.rc [iso-8859-1] Sun Sep 15 13:58:50 2013 @@ -48,7 +48,7 @@ IDS_COUNTER_SIGN "Counter Sign" IDS_CHALLENGE_PASSWORD "Challenge Password" IDS_UNSTRUCTURED_ADDRESS "Unstructured Address" - IDS_SMIME_CAPABILITIES "SMIME Capabilities" + IDS_SMIME_CAPABILITIES "S/MIME Capabilities" IDS_PREFER_SIGNED_DATA "Prefer Signed Data" IDS_CPS "CPS" IDS_USER_NOTICE "User Notice" @@ -65,9 +65,6 @@ IDS_NETSCAPE_CA_POLICY_URL "Netscape CA Policy URL" IDS_NETSCAPE_SSL_SERVER_NAME "Netscape SSL ServerName" IDS_NETSCAPE_COMMENT "Netscape Comment" - IDS_SPC_SP_AGENCY_INFO "SpcSpAgencyInfo" - IDS_SPC_FINANCIAL_CRITERIA "SpcFinancialCriteria" - IDS_SPC_MINIMAL_CRITERIA "SpcMinimalCriteria" IDS_COUNTRY "Country/Region" IDS_ORGANIZATION "Organization" IDS_ORGANIZATIONAL_UNIT "Organizational Unit" @@ -77,7 +74,7 @@ IDS_TITLE "Title" IDS_GIVEN_NAME "Given Name" IDS_INITIALS "Initials" - IDS_SUR_NAME "Sur Name" + IDS_SUR_NAME "Surname" IDS_DOMAIN_COMPONENT "Domain Component" IDS_STREET_ADDRESS "Street Address" IDS_SERIAL_NUMBER "Serial Number" Modified: trunk/reactos/dll/win32/crypt32/lang/crypt32_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/lang/cry… ============================================================================== --- trunk/reactos/dll/win32/crypt32/lang/crypt32_Fr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/lang/crypt32_Fr.rc [iso-8859-1] Sun Sep 15 13:58:50 2013 @@ -68,9 +68,6 @@ IDS_NETSCAPE_CA_POLICY_URL "URL Netscape des stratÃ©gies d'ACL" IDS_NETSCAPE_SSL_SERVER_NAME "Nom du serveur SSL de Netscape" IDS_NETSCAPE_COMMENT "Commentaire Netscape" - IDS_SPC_SP_AGENCY_INFO "SpcSpAgencyInfo" - IDS_SPC_FINANCIAL_CRITERIA "SpcFinancialCriteria" - IDS_SPC_MINIMAL_CRITERIA "SpcMinimalCriteria" IDS_COUNTRY "Pays/RÃ©gion" IDS_ORGANIZATION "Organisation" IDS_ORGANIZATIONAL_UNIT "UnitÃ© d'organisation" Modified: trunk/reactos/dll/win32/crypt32/lang/crypt32_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/lang/cry… ============================================================================== --- trunk/reactos/dll/win32/crypt32/lang/crypt32_He.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/lang/crypt32_He.rc [iso-8859-1] Sun Sep 15 13:58:50 2013 @@ -67,9 +67,6 @@ IDS_NETSCAPE_CA_POLICY_URL "Netscape CA Policy URL" IDS_NETSCAPE_SSL_SERVER_NAME "Netscape SSL ServerName" IDS_NETSCAPE_COMMENT "Netscape Comment" - IDS_SPC_SP_AGENCY_INFO "SpcSpAgencyInfo" - IDS_SPC_FINANCIAL_CRITERIA "SpcFinancialCriteria" - IDS_SPC_MINIMAL_CRITERIA "SpcMinimalCriteria" IDS_COUNTRY "Country/Region" IDS_ORGANIZATION "Organization" IDS_ORGANIZATIONAL_UNIT "Organizational Unit" Modified: trunk/reactos/dll/win32/crypt32/lang/crypt32_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/lang/cry… ============================================================================== --- trunk/reactos/dll/win32/crypt32/lang/crypt32_Hu.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/lang/crypt32_Hu.rc [iso-8859-1] Sun Sep 15 13:58:50 2013 @@ -68,9 +68,6 @@ IDS_NETSCAPE_CA_POLICY_URL "Netscape CA szabÃ¡lyzat URL" IDS_NETSCAPE_SSL_SERVER_NAME "Netscape SSL KiszolgÃ¡lÃ³NÃ©v (ServerName)" IDS_NETSCAPE_COMMENT "Netscape megjgyzÃ©s" - IDS_SPC_SP_AGENCY_INFO "SpcSpAgencyInfo" - IDS_SPC_FINANCIAL_CRITERIA "SpcFinancialCriteria" - IDS_SPC_MINIMAL_CRITERIA "SpcMinimalCriteria" IDS_COUNTRY "OrszÃ¡g/RÃ©giÃ³" IDS_ORGANIZATION "Szervezet" IDS_ORGANIZATIONAL_UNIT "Szervezeti egysÃ©g" Modified: trunk/reactos/dll/win32/crypt32/lang/crypt32_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/lang/cry… ============================================================================== --- trunk/reactos/dll/win32/crypt32/lang/crypt32_It.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/lang/crypt32_It.rc [iso-8859-1] Sun Sep 15 13:58:50 2013 @@ -68,9 +68,6 @@ IDS_NETSCAPE_CA_POLICY_URL "URL Policy CA Netscape" IDS_NETSCAPE_SSL_SERVER_NAME "NomeServer SSL Netscape" IDS_NETSCAPE_COMMENT "Commento Netscape" - IDS_SPC_SP_AGENCY_INFO "SpcSpAgencyInfo" - IDS_SPC_FINANCIAL_CRITERIA "SpcFinancialCriteria" - IDS_SPC_MINIMAL_CRITERIA "SpcMinimalCriteria" IDS_COUNTRY "Paese/Regione" IDS_ORGANIZATION "Organizzazione" IDS_ORGANIZATIONAL_UNIT "UnitÃ Organizzativa" Modified: trunk/reactos/dll/win32/crypt32/lang/crypt32_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/lang/cry… ============================================================================== --- trunk/reactos/dll/win32/crypt32/lang/crypt32_Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/lang/crypt32_Ko.rc [iso-8859-1] Sun Sep 15 13:58:50 2013 @@ -66,9 +66,6 @@ IDS_NETSCAPE_CA_POLICY_URL "³Ý½ºÄÉÀÌÇÁ CA ¹æÄ§ URL" IDS_NETSCAPE_SSL_SERVER_NAME "³Ý½ºÄÉÀÌÇÁ SSL ¼¹öÀÌ¸§" IDS_NETSCAPE_COMMENT "³Ý½ºÄÉÀÌÇÁ ¼³¸í" - IDS_SPC_SP_AGENCY_INFO "SpcSp°ü¸®ÀÚ Á¤º¸" - IDS_SPC_FINANCIAL_CRITERIA "SpcÀçÁ¤»ó ¿øÄ¢" - IDS_SPC_MINIMAL_CRITERIA "SpcÃÖ¼Ò ¿øÄ¢" IDS_COUNTRY "³ª¶ó/Áö¿ª" IDS_ORGANIZATION "´ÜÃ¼" IDS_ORGANIZATIONAL_UNIT "´ÜÃ¼(Organizational Unit)" Modified: trunk/reactos/dll/win32/crypt32/lang/crypt32_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/lang/cry… ============================================================================== --- trunk/reactos/dll/win32/crypt32/lang/crypt32_Lt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/lang/crypt32_Lt.rc [iso-8859-1] Sun Sep 15 13:58:50 2013 @@ -68,9 +68,6 @@ IDS_NETSCAPE_CA_POLICY_URL "Netscape LÄ® politikos URL" IDS_NETSCAPE_SSL_SERVER_NAME "Netscape SSL serverio vardas" IDS_NETSCAPE_COMMENT "Netscape komentaras" - IDS_SPC_SP_AGENCY_INFO "SpcSpAgencyInfo" - IDS_SPC_FINANCIAL_CRITERIA "SpcFinancialCriteria" - IDS_SPC_MINIMAL_CRITERIA "SpcMinimalCriteria" IDS_COUNTRY "ValstybÄ/regionas" IDS_ORGANIZATION "Ä®staiga" IDS_ORGANIZATIONAL_UNIT "Ä®staigos padalinys" Modified: trunk/reactos/dll/win32/crypt32/lang/crypt32_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/lang/cry… ============================================================================== --- trunk/reactos/dll/win32/crypt32/lang/crypt32_Nl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/lang/crypt32_Nl.rc [iso-8859-1] Sun Sep 15 13:58:50 2013 @@ -67,9 +67,6 @@ IDS_NETSCAPE_CA_POLICY_URL "Netscape CA Beleids URL" IDS_NETSCAPE_SSL_SERVER_NAME "Netscape SSL Server Naam" IDS_NETSCAPE_COMMENT "Netscape Commentaar" - IDS_SPC_SP_AGENCY_INFO "SPC SP Agency Informatie" - IDS_SPC_FINANCIAL_CRITERIA "SPC Financiele Criteria" - IDS_SPC_MINIMAL_CRITERIA "SPC Minimale Criteria" IDS_COUNTRY "Land/Regio" IDS_ORGANIZATION "Organisatie" IDS_ORGANIZATIONAL_UNIT "Organisatie Onderdeel" Modified: trunk/reactos/dll/win32/crypt32/lang/crypt32_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/lang/cry… ============================================================================== --- trunk/reactos/dll/win32/crypt32/lang/crypt32_No.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/lang/crypt32_No.rc [iso-8859-1] Sun Sep 15 13:58:50 2013 @@ -67,9 +67,6 @@ IDS_NETSCAPE_CA_POLICY_URL "Netscape-CA-politikk-URL" IDS_NETSCAPE_SSL_SERVER_NAME "Netscape-SSL-tjenernavn" IDS_NETSCAPE_COMMENT "Netscape-kommentar" - IDS_SPC_SP_AGENCY_INFO "SpcSpAgencyInfo" - IDS_SPC_FINANCIAL_CRITERIA "SpcFinancialCriteria" - IDS_SPC_MINIMAL_CRITERIA "SpcMinimalCriteria" IDS_COUNTRY "Land/Region" IDS_ORGANIZATION "Organisasjon" IDS_ORGANIZATIONAL_UNIT "Organisasjonsell enhet" Modified: trunk/reactos/dll/win32/crypt32/lang/crypt32_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/lang/cry… ============================================================================== --- trunk/reactos/dll/win32/crypt32/lang/crypt32_Pl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/lang/crypt32_Pl.rc [iso-8859-1] Sun Sep 15 13:58:50 2013 @@ -65,9 +65,6 @@ IDS_NETSCAPE_CA_POLICY_URL "Adres URL zasad CA Netscape" IDS_NETSCAPE_SSL_SERVER_NAME "Nazwa serwera SSL Netscape" IDS_NETSCAPE_COMMENT "Komentarz Netscape" - IDS_SPC_SP_AGENCY_INFO "SpcSpAgencyInfo" - IDS_SPC_FINANCIAL_CRITERIA "SpcFinancialCriteria" - IDS_SPC_MINIMAL_CRITERIA "SpcMinimalCriteria" IDS_COUNTRY "Kraj/Region" IDS_ORGANIZATION "Organizacja" IDS_ORGANIZATIONAL_UNIT "Jednostka organizacyjna" Modified: trunk/reactos/dll/win32/crypt32/lang/crypt32_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/lang/cry… ============================================================================== --- trunk/reactos/dll/win32/crypt32/lang/crypt32_Pt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/lang/crypt32_Pt.rc [iso-8859-1] Sun Sep 15 13:58:50 2013 @@ -68,9 +68,6 @@ IDS_NETSCAPE_CA_POLICY_URL "URL PolÃtica CA Netscape" IDS_NETSCAPE_SSL_SERVER_NAME "Nome de Servidor SSL Netscape" IDS_NETSCAPE_COMMENT "ComentÃ¡rio Netscape" - IDS_SPC_SP_AGENCY_INFO "SpcSpAgencyInfo" - IDS_SPC_FINANCIAL_CRITERIA "SpcFinancialCriteria" - IDS_SPC_MINIMAL_CRITERIA "SpcMinimalCriteria" IDS_COUNTRY "PaÃs/RegiÃ£o" IDS_ORGANIZATION "OrganizaÃ§Ã£o" IDS_ORGANIZATIONAL_UNIT "Unidade Organizacional" @@ -221,9 +218,6 @@ IDS_NETSCAPE_CA_POLICY_URL "URL PolÃtica CA Netscape" IDS_NETSCAPE_SSL_SERVER_NAME "Netscape SSL ServerName" IDS_NETSCAPE_COMMENT "ComentÃ¡rio Netscape" - IDS_SPC_SP_AGENCY_INFO "SpcSpAgencyInfo" - IDS_SPC_FINANCIAL_CRITERIA "SpcFinancialCriteria" - IDS_SPC_MINIMAL_CRITERIA "SpcMinimalCriteria" IDS_COUNTRY "PaÃs/RegiÃ£o" IDS_ORGANIZATION "OrganizaÃ§Ã£o" IDS_ORGANIZATIONAL_UNIT "Unidade Organizacional" Modified: trunk/reactos/dll/win32/crypt32/lang/crypt32_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/lang/cry… ============================================================================== --- trunk/reactos/dll/win32/crypt32/lang/crypt32_Ro.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/lang/crypt32_Ro.rc [iso-8859-1] Sun Sep 15 13:58:50 2013 @@ -68,9 +68,6 @@ IDS_NETSCAPE_CA_POLICY_URL "URL-ul politicii CA Netscape" IDS_NETSCAPE_SSL_SERVER_NAME "Nume server SSL Netscape" IDS_NETSCAPE_COMMENT "Comentariul Netscape" - IDS_SPC_SP_AGENCY_INFO "InformaÈiiAgenÈieSpcSp" - IDS_SPC_FINANCIAL_CRITERIA "CriteriiFinanciareSpc" - IDS_SPC_MINIMAL_CRITERIA "CriteriiMinimaleSpc" IDS_COUNTRY "Èara/regiunea" IDS_ORGANIZATION "OrganizaÈia" IDS_ORGANIZATIONAL_UNIT "Unitatea organizaÈionalÄ" Modified: trunk/reactos/dll/win32/crypt32/lang/crypt32_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/lang/cry… ============================================================================== --- trunk/reactos/dll/win32/crypt32/lang/crypt32_Sv.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/lang/crypt32_Sv.rc [iso-8859-1] Sun Sep 15 13:58:50 2013 @@ -67,9 +67,6 @@ IDS_NETSCAPE_CA_POLICY_URL "Netscape CA Policy URL" IDS_NETSCAPE_SSL_SERVER_NAME "Netscape SSL ServerName" IDS_NETSCAPE_COMMENT "Netscape Comment" - IDS_SPC_SP_AGENCY_INFO "SpcSpAgencyInfo" - IDS_SPC_FINANCIAL_CRITERIA "SpcFinancialCriteria" - IDS_SPC_MINIMAL_CRITERIA "SpcMinimalCriteria" IDS_COUNTRY "Land/Region" IDS_ORGANIZATION "Organisation" IDS_ORGANIZATIONAL_UNIT "Organizational Unit" Modified: trunk/reactos/dll/win32/crypt32/lang/crypt32_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/lang/cry… ============================================================================== --- trunk/reactos/dll/win32/crypt32/lang/crypt32_Uk.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/lang/crypt32_Uk.rc [iso-8859-1] Sun Sep 15 13:58:50 2013 @@ -71,9 +71,6 @@ IDS_NETSCAPE_CA_POLICY_URL "Netscape CA Policy URL" IDS_NETSCAPE_SSL_SERVER_NAME "Netscape SSL ServerName" IDS_NETSCAPE_COMMENT "Netscape ÐÐ¾Ð¼ÐµÐ½ÑÐ°Ñ" - IDS_SPC_SP_AGENCY_INFO "SpcSpAgencyInfo" - IDS_SPC_FINANCIAL_CRITERIA "SpcFinancialCriteria" - IDS_SPC_MINIMAL_CRITERIA "SpcMinimalCriteria" IDS_COUNTRY "ÐÑÐ°ÑÐ½Ð°/Ð ÐµÐ³ÑÐ¾Ð½" IDS_ORGANIZATION "ÐÑÐ³Ð°Ð½ÑÐ·Ð°ÑÑÑ" IDS_ORGANIZATIONAL_UNIT "Organizational Unit" Modified: trunk/reactos/dll/win32/crypt32/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/main.c?r… ============================================================================== --- trunk/reactos/dll/win32/crypt32/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/main.c [iso-8859-1] Sun Sep 15 13:58:50 2013 @@ -45,14 +45,12 @@ crypt_oid_init(); break; case DLL_PROCESS_DETACH: + if (pvReserved) break; crypt_oid_free(); crypt_sip_free(); root_store_free(); default_chain_engine_free(); - /* Don't release the default provider on process shutdown, there's - * no guarantee the provider dll hasn't already been unloaded. - */ - if (hDefProv && !pvReserved) CryptReleaseContext(hDefProv, 0); + if (hDefProv) CryptReleaseContext(hDefProv, 0); break; } return TRUE; Modified: trunk/reactos/dll/win32/crypt32/rootstore.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/rootstor… ============================================================================== --- trunk/reactos/dll/win32/crypt32/rootstore.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/rootstore.c [iso-8859-1] Sun Sep 15 13:58:50 2013 @@ -326,6 +326,7 @@ static BOOL import_certs_from_path(LPCSTR path, HCERTSTORE store, BOOL allow_dir); +#ifdef HAVE_READDIR static BOOL check_buffer_resize(char **ptr_buf, size_t *buf_size, size_t check_size) { if (check_size > *buf_size) @@ -351,6 +352,7 @@ return TRUE; } +#endif /* Opens path, which must be a directory, and imports certificates from every * file in the directory into store. Removed: trunk/reactos/dll/win32/crypt32/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/version.… ============================================================================== --- trunk/reactos/dll/win32/crypt32/version.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/version.rc (removed) @@ -1,28 +0,0 @@ -/* - * crypt32 dll version resources - * - * Copyright (C) 2006 Juan Lang - * - * 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 WINE_FILEDESCRIPTION_STR "Wine CryptoAPI Library" -#define WINE_FILENAME_STR "crypt32.dll" -#define WINE_FILEVERSION 5,131,2600,1243 -#define WINE_FILEVERSION_STR "5.131.2600.1243" -#define WINE_PRODUCTVERSION 5,131,2600,1243 -#define WINE_PRODUCTVERSION_STR "5.131.2600.1243" - -#include "wine/wine_common_ver.rc" 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 13:58:50 2013 @@ -63,7 +63,7 @@ reactos/dll/win32/comdlg32 # Synced to Wine 1.3.37 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.5.26 +reactos/dll/win32/crypt32 # Synced to Wine-1.7.1 reactos/dll/win32/cryptdlg # Synced to Wine-1.5.26 reactos/dll/win32/cryptdll # Synced to Wine-1.5.26 reactos/dll/win32/cryptnet # Synced to Wine-1.5.26

1 0

[janderwald] 60130: [REACTOS] - Time to honor Mr. Amine Khaldi Welcome to the Hall of Fame
by janderwald＠svn.reactos.org 15 Sep '13

15 Sep '13

Author: janderwald Date: Sun Sep 15 13:23:22 2013 New Revision: 60130 URL: http://svn.reactos.org/svn/reactos?rev=60130&view=rev Log: [REACTOS] - Time to honor Mr. Amine Khaldi Welcome to the Hall of Fame Modified: trunk/reactos/CREDITS Modified: trunk/reactos/CREDITS URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CREDITS?rev=60130&r1=60129… ============================================================================== --- trunk/reactos/CREDITS [iso-8859-1] (original) +++ trunk/reactos/CREDITS [iso-8859-1] Sun Sep 15 13:23:22 2013 @@ -2,6 +2,7 @@ Aleksey Bragin <aleksey at reactos org> Alex Ionescu <alex.ionescu(a)reactos.org> +Amine Khaldi <amine.khaldi(a)reactos.org> Andrew Greenwood <lists(a)silverblade.co.uk> Andrew Munger <waxdragon(a)gmail.com> Arindam Das

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