Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 64423: [CRT] - Allow to allow wchar_t even on C++, if it is not GCC - Remove a number of duplicate definitions [FRAMEDYN] - Compile with /Zc:wchar_t- on MSVC - Get rid of now obsolete MS...
by tkreuzer＠svn.reactos.org 30 Sep '14

30 Sep '14

Author: tkreuzer Date: Tue Sep 30 20:48:54 2014 New Revision: 64423 URL: http://svn.reactos.org/svn/reactos?rev=64423&view=rev Log: [CRT] - Allow to allow wchar_t even on C++, if it is not GCC - Remove a number of duplicate definitions [FRAMEDYN] - Compile with /Zc:wchar_t- on MSVC - Get rid of now obsolete MSVC symbol aliases - Share the spec file - Add 2 GCC symbols in the export lib (C2 constructor, D2 destructor), which are in this case identical to C1 and D1 Added: trunk/reactos/dll/win32/framedyn/framedyn.spec - copied, changed from r64367, trunk/reactos/dll/win32/framedyn/framedyn_gcc.spec Removed: trunk/reactos/dll/win32/framedyn/alias_msvc.s trunk/reactos/dll/win32/framedyn/fix_exports_msvc.s trunk/reactos/dll/win32/framedyn/framedyn_gcc.spec trunk/reactos/dll/win32/framedyn/framedyn_msvc.spec Modified: trunk/reactos/dll/win32/framedyn/CMakeLists.txt trunk/reactos/dll/win32/framedyn/alias_gcc.s trunk/reactos/include/crt/crtdefs.h trunk/reactos/include/crt/rtcapi.h trunk/reactos/include/crt/wctype.h 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] Tue Sep 30 20:48:54 2014 @@ -1,11 +1,7 @@ set_cpp(WITH_RUNTIME WITH_EXCEPTIONS) -if(NOT MSVC) - spec2def(framedyn.dll framedyn_gcc.spec ADD_IMPORTLIB) -else() - spec2def(framedyn.dll framedyn_msvc.spec ADD_IMPORTLIB) -endif() +spec2def(framedyn.dll framedyn.spec ADD_IMPORTLIB) list(APPEND SOURCE main.c @@ -13,18 +9,16 @@ ${CMAKE_CURRENT_BINARY_DIR}/framedyn.def) if(MSVC) - add_asm_files(framedyn_asm fix_exports_msvc.s) + add_compile_flags("/Zc:wchar_t-") endif() -add_library(framedyn SHARED ${SOURCE} ${framedyn_asm}) +add_library(framedyn SHARED ${SOURCE}) set_module_type(framedyn win32dll UNICODE) add_importlibs(framedyn oleaut32 msvcrt kernel32 ntdll) add_cd_file(TARGET framedyn DESTINATION reactos/system32/wbem FOR all) -if(MSVC) - add_asm_files(framedynex_asm alias_msvc.s) -else() +if(NOT MSVC) add_asm_files(framedynex_asm alias_gcc.s) endif() add_library(framedynex ${framedynex_asm}) Modified: trunk/reactos/dll/win32/framedyn/alias_gcc.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/framedyn/alias_g… ============================================================================== --- trunk/reactos/dll/win32/framedyn/alias_gcc.s [iso-8859-1] (original) +++ trunk/reactos/dll/win32/framedyn/alias_gcc.s [iso-8859-1] Tue Sep 30 20:48:54 2014 @@ -24,6 +24,7 @@ DEFINE_ALIAS(__ZN8CHStringC1EPKwi, ??0CHString@@QAE@PBGH@Z) DEFINE_ALIAS(__ZN8CHStringC1Ewi, ??0CHString@@QAE@GH@Z) DEFINE_ALIAS(__ZN8CHStringC1Ev, ??0CHString@@QAE@XZ) +DEFINE_ALIAS(__ZN8CHStringC2Ev, ??0CHString@@QAE@XZ) // CHString::CHString(void) DEFINE_ALIAS(__ZNK8CHString7CollateEPKw, ?Collate@CHString@@QBEHPBG@Z) DEFINE_ALIAS(__ZNK8CHString7CompareEPKw, ?Compare@CHString@@QBEHPBG@Z) DEFINE_ALIAS(__ZNK8CHString13CompareNoCaseEPKw, ?CompareNoCase@CHString@@QBEHPBG@Z) @@ -62,7 +63,7 @@ DEFINE_ALIAS(__ZN8CHString13ReleaseBufferEi, ?ReleaseBuffer@CHString@@QAEXH@Z) DEFINE_ALIAS(__ZNK8CHString11ReverseFindEw, ?ReverseFind@CHString@@QBEHG@Z) DEFINE_ALIAS(__ZNK8CHString5RightEi, ?Right@CHString@@QBE?AV1@H@Z) -DEFINE_ALIAS(__ZN8CHString10SafeStrlenEPKw, ?SafeStrlen@CHString@@KGHPBG@Z) +DEFINE_ALIAS(__ZN8CHString10SafeStrlenEPKw@4, ?SafeStrlen@CHString@@KGHPBG@Z) DEFINE_ALIAS(__ZN8CHString5SetAtEiw, ?SetAt@CHString@@QAEXHG@Z) DEFINE_ALIAS(__ZNK8CHString13SpanExcludingEPKw, ?SpanExcluding@CHString@@QBE?AV1@PBG@Z) DEFINE_ALIAS(__ZNK8CHString13SpanIncludingEPKw, ?SpanIncluding@CHString@@QBE?AV1@PBG@Z) @@ -82,7 +83,8 @@ DEFINE_ALIAS(__ZN8CHStringaSEPKw, ??4CHString@@QAEABV0@PBG@Z) DEFINE_ALIAS(__ZN8CHStringaSEw, ??4CHString@@QAEABV0@G@Z) DEFINE_ALIAS(__ZNK8CHStringixEi, ??ACHString@@QBEGH@Z) -DEFINE_ALIAS(__ZN8CHStringD1Ev, ??1CHString@@QAE@XZ) +DEFINE_ALIAS(__ZN8CHStringD1Ev, ??1CHString@@QAE@XZ) // CHString::~CHString() complete object destructor +DEFINE_ALIAS(__ZN8CHStringD2Ev, ??1CHString@@QAE@XZ) // CHString::~CHString() base object destructor DEFINE_ALIAS(__ZplwRK8CHString, ??H@YG?AVCHString@@GABV0@@Z) DEFINE_ALIAS(__ZplRK8CHStringw, ??H@YG?AVCHString@@ABV0@G@Z) DEFINE_ALIAS(__ZplRK8CHStringPKw, ??H@YG?AVCHString@@ABV0@PBG@Z) Removed: trunk/reactos/dll/win32/framedyn/alias_msvc.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/framedyn/alias_m… ============================================================================== --- trunk/reactos/dll/win32/framedyn/alias_msvc.s [iso-8859-1] (original) +++ trunk/reactos/dll/win32/framedyn/alias_msvc.s (removed) @@ -1,48 +0,0 @@ -#include <asm.inc> - -.code64 -.align 4 - -MACRO(DEFINE_ALIAS, alias, orig) -EXTERN &orig:ABS -ALIAS <&alias> = <&orig> -ENDM - -DEFINE_ALIAS ?AllocSysString@CHString@@QBEPA_WXZ, ?AllocSysString@CHString@@QBEPAGXZ -DEFINE_ALIAS ?AssignCopy@CHString@@IAEXHPB_W@Z, ?AssignCopy@CHString@@IAEXHPBG@Z -DEFINE_ALIAS ??0CHString@@QAE@PB_W@Z, ??0CHString@@QAE@PBG@Z -DEFINE_ALIAS ??0CHString@@QAE@PB_WH@Z, ??0CHString@@QAE@PBGH@Z -DEFINE_ALIAS ??0CHString@@QAE@_WH@Z, ??0CHString@@QAE@GH@Z -DEFINE_ALIAS ?Collate@CHString@@QBEHPB_W@Z, ?Collate@CHString@@QBEHPBG@Z -DEFINE_ALIAS ?Compare@CHString@@QBEHPB_W@Z, ?Compare@CHString@@QBEHPBG@Z -DEFINE_ALIAS ?CompareNoCase@CHString@@QBEHPB_W@Z, ?CompareNoCase@CHString@@QBEHPBG@Z -DEFINE_ALIAS ?ConcatCopy@CHString@@IAEXHPB_WH0@Z, ?ConcatCopy@CHString@@IAEXHPBGH0@Z -DEFINE_ALIAS ?ConcatInPlace@CHString@@IAEXHPB_W@Z, ?ConcatInPlace@CHString@@IAEXHPBG@Z -DEFINE_ALIAS ?Find@CHString@@QBEHPB_W@Z, ?Find@CHString@@QBEHPBG@Z -DEFINE_ALIAS ?Find@CHString@@QBEH_W@Z, ?Find@CHString@@QBEHG@Z -DEFINE_ALIAS ?FindOneOf@CHString@@QBEHPB_W@Z, ?FindOneOf@CHString@@QBEHPBG@Z -DEFINE_ALIAS ?Format@CHString@@QAAXPB_WZZ, ?Format@CHString@@QAAXPBGZZ -DEFINE_ALIAS ?FormatMessageW@CHString@@QAAXPB_WZZ, ?FormatMessageW@CHString@@QAAXPBGZZ -DEFINE_ALIAS ?FormatV@CHString@@QAEXPB_WPAD@Z, ?FormatV@CHString@@QAEXPBGPAD@Z -DEFINE_ALIAS ?GetAt@CHString@@QBE_WH@Z, ?GetAt@CHString@@QBEGH@Z -DEFINE_ALIAS ?GetBuffer@CHString@@QAEPA_WH@Z, ?GetBuffer@CHString@@QAEPAGH@Z -DEFINE_ALIAS ?GetBufferSetLength@CHString@@QAEPA_WH@Z, ?GetBufferSetLength@CHString@@QAEPAGH@Z -DEFINE_ALIAS ?LoadStringW@CHString@@IAEHIPA_WI@Z, ?LoadStringW@CHString@@IAEHIPAGI@Z -DEFINE_ALIAS ?LockBuffer@CHString@@QAEPA_WXZ, ?LockBuffer@CHString@@QAEPAGXZ -DEFINE_ALIAS ?ReverseFind@CHString@@QBEH_W@Z, ?ReverseFind@CHString@@QBEHG@Z -DEFINE_ALIAS ?SafeStrlen@CHString@@KGHPB_W@Z, ?SafeStrlen@CHString@@KGHPBG@Z -DEFINE_ALIAS ?SetAt@CHString@@QAEXH_W@Z, ?SetAt@CHString@@QAEXHG@Z -DEFINE_ALIAS ?SpanExcluding@CHString@@QBE?AV1@PB_W@Z, ?SpanExcluding@CHString@@QBE?AV1@PBG@Z -DEFINE_ALIAS ?SpanIncluding@CHString@@QBE?AV1@PB_W@Z, ?SpanIncluding@CHString@@QBE?AV1@PBG@Z -DEFINE_ALIAS ??BCHString@@QBEPB_WXZ, ??BCHString@@QBEPBGXZ -DEFINE_ALIAS ??YCHString@@QAEABV0@PB_W@Z, ??YCHString@@QAEABV0@PBG@Z -DEFINE_ALIAS ??YCHString@@QAEABV0@_W@Z, ??YCHString@@QAEABV0@G@Z -DEFINE_ALIAS ??4CHString@@QAEABV0@PB_W@Z, ??4CHString@@QAEABV0@PBG@Z -DEFINE_ALIAS ??4CHString@@QAEABV0@_W@Z, ??4CHString@@QAEABV0@G@Z -DEFINE_ALIAS ??ACHString@@QBE_WH@Z, ??ACHString@@QBEGH@Z -DEFINE_ALIAS ??H@YG?AVCHString@@_WABV0@@Z, ??H@YG?AVCHString@@GABV0@@Z -DEFINE_ALIAS ??H@YG?AVCHString@@ABV0@_W@Z, ??H@YG?AVCHString@@ABV0@G@Z -DEFINE_ALIAS ??H@YG?AVCHString@@ABV0@PB_W@Z, ??H@YG?AVCHString@@ABV0@PBG@Z -DEFINE_ALIAS ??H@YG?AVCHString@@PB_WABV0@@Z, ??H@YG?AVCHString@@PBGABV0@@Z - -END Removed: 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 [iso-8859-1] (original) +++ trunk/reactos/dll/win32/framedyn/fix_exports_msvc.s (removed) @@ -1,48 +0,0 @@ -#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 Copied: trunk/reactos/dll/win32/framedyn/framedyn.spec (from r64367, trunk/reactos/dll/win32/framedyn/framedyn_gcc.spec) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/framedyn/framedy… ============================================================================== --- trunk/reactos/dll/win32/framedyn/framedyn_gcc.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/framedyn/framedyn.spec [iso-8859-1] Tue Sep 30 20:48:54 2014 @@ -68,7 +68,7 @@ @ thiscall ??4CHString@@QAEABV0@PBG@Z(wstr) _ZN8CHStringaSEPKw @ thiscall ??4CHString@@QAEABV0@G@Z(long) _ZN8CHStringaSEw @ thiscall ??ACHString@@QBEGH@Z(long) _ZNK8CHStringixEi -@ thiscall ??1CHString@@QAE@XZ() _ZN8CHStringD1Ev +@ thiscall ??1CHString@@QAE@XZ() _ZN8CHStringD1Ev # complete object destructor, identical to _ZN8CHStringD2Ev aka base object destructor @ stdcall ??H@YG?AVCHString@@GABV0@@Z(long ptr) _ZplwRK8CHString @ stdcall ??H@YG?AVCHString@@ABV0@G@Z(ptr long) _ZplRK8CHStringw @ stdcall ??H@YG?AVCHString@@ABV0@PBG@Z(ptr wstr) _ZplRK8CHStringPKw Removed: trunk/reactos/dll/win32/framedyn/framedyn_gcc.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/framedyn/framedy… ============================================================================== --- trunk/reactos/dll/win32/framedyn/framedyn_gcc.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/framedyn/framedyn_gcc.spec (removed) @@ -1,76 +0,0 @@ -@ thiscall ?AllocBeforeWrite@CHString@@IAEXH@Z(long) _ZN8CHString16AllocBeforeWriteEi -@ thiscall ?AllocBuffer@CHString@@IAEXH@Z(long) _ZN8CHString11AllocBufferEi -@ thiscall ?AllocCopy@CHString@@IBEXAAV1@HHH@Z(ptr long long long) _ZNK8CHString9AllocCopyERS_iii -@ thiscall ?AllocSysString@CHString@@QBEPAGXZ() _ZNK8CHString14AllocSysStringEv -@ thiscall ?AssignCopy@CHString@@IAEXHPBG@Z(long wstr) _ZN8CHString10AssignCopyEiPKw -@ thiscall ??0CHString@@QAE@ABV0@@Z(ptr) _ZN8CHStringC1ERKS_ -@ thiscall ??0CHString@@QAE@PBD@Z(str) _ZN8CHStringC1EPKc -@ thiscall ??0CHString@@QAE@PBE@Z(str) _ZN8CHStringC1EPKh -@ thiscall ??0CHString@@QAE@PBG@Z(wstr) _ZN8CHStringC1EPKw -@ thiscall ??0CHString@@QAE@PBGH@Z(wstr long) _ZN8CHStringC1EPKwi -@ thiscall ??0CHString@@QAE@GH@Z(long long) _ZN8CHStringC1Ewi -@ thiscall ??0CHString@@QAE@XZ() _ZN8CHStringC1Ev -@ thiscall ?Collate@CHString@@QBEHPBG@Z(wstr) _ZNK8CHString7CollateEPKw -@ thiscall ?Compare@CHString@@QBEHPBG@Z(wstr) _ZNK8CHString7CompareEPKw -@ thiscall ?CompareNoCase@CHString@@QBEHPBG@Z(wstr) _ZNK8CHString13CompareNoCaseEPKw -@ thiscall ?ConcatCopy@CHString@@IAEXHPBGH0@Z(long wstr long wstr) _ZN8CHString10ConcatCopyEiPKwiS1_ -@ thiscall ?ConcatInPlace@CHString@@IAEXHPBG@Z(long wstr) _ZN8CHString13ConcatInPlaceEiPKw -@ thiscall ?CopyBeforeWrite@CHString@@IAEXXZ() _ZN8CHString15CopyBeforeWriteEv -@ thiscall ?Empty@CHString@@QAEXXZ() _ZN8CHString5EmptyEv -@ thiscall ?Find@CHString@@QBEHPBG@Z(wstr) _ZNK8CHString4FindEPKw -@ thiscall ?Find@CHString@@QBEHG@Z(long) _ZNK8CHString4FindEw -@ thiscall ?FindOneOf@CHString@@QBEHPBG@Z(wstr) _ZNK8CHString9FindOneOfEPKw -@ thiscall ?Format@CHString@@QAAXIZZ(long long long) _ZN8CHString6FormatEjz -@ thiscall ?Format@CHString@@QAAXPBGZZ(long wstr long) _ZN8CHString6FormatEPKwz -@ thiscall ?FormatMessageW@CHString@@QAAXIZZ(long long long) _ZN8CHString14FormatMessageWEjz -@ thiscall ?FormatMessageW@CHString@@QAAXPBGZZ(long ptr long) _ZN8CHString14FormatMessageWEPKwz -@ thiscall ?FormatV@CHString@@QAEXPBGPAD@Z(wstr long) _ZN8CHString7FormatVEPKwPc -@ thiscall ?FreeExtra@CHString@@QAEXXZ() _ZN8CHString9FreeExtraEv -@ thiscall ?GetAllocLength@CHString@@QBEHXZ() _ZNK8CHString14GetAllocLengthEv -@ thiscall ?GetAt@CHString@@QBEGH@Z(long) _ZNK8CHString5GetAtEi -@ thiscall ?GetBuffer@CHString@@QAEPAGH@Z(long) _ZN8CHString9GetBufferEi -@ thiscall ?GetBufferSetLength@CHString@@QAEPAGH@Z(long) _ZN8CHString18GetBufferSetLengthEi -@ thiscall ?GetData@CHString@@IBEPAUCHStringData@@XZ() _ZNK8CHString7GetDataEv -@ thiscall ?GetLength@CHString@@QBEHXZ() _ZNK8CHString9GetLengthEv -@ thiscall ?Init@CHString@@IAEXXZ() _ZN8CHString4InitEv -@ thiscall ?IsEmpty@CHString@@QBEHXZ() _ZNK8CHString7IsEmptyEv -@ thiscall ?Left@CHString@@QBE?AV1@H@Z(long) _ZNK8CHString4LeftEi -@ thiscall ?LoadStringW@CHString@@QAEHI@Z(long) _ZN8CHString11LoadStringWEj -@ thiscall ?LoadStringW@CHString@@IAEHIPAGI@Z(long wstr long) _ZN8CHString11LoadStringWEjPwj -@ thiscall ?LockBuffer@CHString@@QAEPAGXZ() _ZN8CHString10LockBufferEv -@ thiscall ?MakeLower@CHString@@QAEXXZ() _ZN8CHString9MakeLowerEv -@ thiscall ?MakeReverse@CHString@@QAEXXZ() _ZN8CHString11MakeReverseEv -@ thiscall ?MakeUpper@CHString@@QAEXXZ() _ZN8CHString9MakeUpperEv -@ thiscall ?Mid@CHString@@QBE?AV1@H@Z(long) _ZNK8CHString3MidEi -@ thiscall ?Mid@CHString@@QBE?AV1@HH@Z(long long) _ZNK8CHString3MidEii -@ thiscall ?Release@CHString@@KGXPAUCHStringData@@@Z(ptr) _ZN8CHString7ReleaseEP12CHStringData@4 -@ thiscall ?Release@CHString@@IAEXXZ() _ZN8CHString7ReleaseEv -@ thiscall ?ReleaseBuffer@CHString@@QAEXH@Z(long) _ZN8CHString13ReleaseBufferEi -@ thiscall ?ReverseFind@CHString@@QBEHG@Z(long) _ZNK8CHString11ReverseFindEw -@ thiscall ?Right@CHString@@QBE?AV1@H@Z(long) _ZNK8CHString5RightEi -@ stdcall ?SafeStrlen@CHString@@KGHPBG@Z(wstr) _ZN8CHString10SafeStrlenEPKw -@ thiscall ?SetAt@CHString@@QAEXHG@Z(long long) _ZN8CHString5SetAtEiw -@ thiscall ?SpanExcluding@CHString@@QBE?AV1@PBG@Z(long wstr) _ZNK8CHString13SpanExcludingEPKw -@ thiscall ?SpanIncluding@CHString@@QBE?AV1@PBG@Z(long wstr) _ZNK8CHString13SpanIncludingEPKw -@ thiscall ?TrimLeft@CHString@@QAEXXZ() _ZN8CHString8TrimLeftEv -@ thiscall ?TrimRight@CHString@@QAEXXZ() _ZN8CHString9TrimRightEv -@ thiscall ?UnlockBuffer@CHString@@QAEXXZ() _ZN8CHString12UnlockBufferEv -@ thiscall ??BCHString@@QBEPBGXZ(ptr) _ZNK8CHStringcvPKwEv -@ thiscall ??YCHString@@QAEABV0@ABV0@@Z(ptr) _ZN8CHStringpLERKS_ -@ thiscall ??YCHString@@QAEABV0@D@Z(long) _ZN8CHStringpLEc -@ thiscall ??YCHString@@QAEABV0@PBG@Z(wstr) _ZN8CHStringpLEPKw -@ thiscall ??YCHString@@QAEABV0@G@Z(long) _ZN8CHStringpLEw -@ thiscall ??4CHString@@QAEABV0@PAV0@@Z(ptr) _ZN8CHStringaSEPS_ -@ thiscall ??4CHString@@QAEABV0@ABV0@@Z(ptr) _ZN8CHStringaSERKS_ -@ thiscall ??4CHString@@QAEABV0@PBD@Z(str) _ZN8CHStringaSEPKc -@ thiscall ??4CHString@@QAEABV0@D@Z(long) _ZN8CHStringaSEc -@ thiscall ??4CHString@@QAEABV0@PBE@Z(str) _ZN8CHStringaSEPKh -@ thiscall ??4CHString@@QAEABV0@PBG@Z(wstr) _ZN8CHStringaSEPKw -@ thiscall ??4CHString@@QAEABV0@G@Z(long) _ZN8CHStringaSEw -@ thiscall ??ACHString@@QBEGH@Z(long) _ZNK8CHStringixEi -@ thiscall ??1CHString@@QAE@XZ() _ZN8CHStringD1Ev -@ stdcall ??H@YG?AVCHString@@GABV0@@Z(long ptr) _ZplwRK8CHString -@ stdcall ??H@YG?AVCHString@@ABV0@G@Z(ptr long) _ZplRK8CHStringw -@ stdcall ??H@YG?AVCHString@@ABV0@PBG@Z(ptr wstr) _ZplRK8CHStringPKw -@ stdcall ??H@YG?AVCHString@@PBGABV0@@Z(wstr ptr) _ZplPKwRK8CHString -@ stdcall ??H@YG?AVCHString@@ABV0@0@Z(ptr ptr) _ZplRK8CHStringS1_ Removed: 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 (removed) @@ -1,76 +0,0 @@ -@ 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() -@ 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) -@ thiscall ??0CHString@@QAE@PBGH@Z(wstr long) -@ thiscall ??0CHString@@QAE@GH@Z(long long) -@ thiscall ??0CHString@@QAE@XZ() -@ 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) -@ 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) -@ thiscall ?FormatMessageW@CHString@@QAAXIZZ(long long long) -@ 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) -@ 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) -@ thiscall ?LockBuffer@CHString@@QAEPAGXZ() -@ thiscall ?MakeLower@CHString@@QAEXXZ() -@ thiscall ?MakeReverse@CHString@@QAEXXZ() -@ thiscall ?MakeUpper@CHString@@QAEXXZ() -@ thiscall ?Mid@CHString@@QBE?AV1@H@Z(long) -@ thiscall ?Mid@CHString@@QBE?AV1@HH@Z(long long) -@ thiscall ?Release@CHString@@KGXPAUCHStringData@@@Z(ptr) -@ thiscall ?Release@CHString@@IAEXXZ() -@ thiscall ?ReleaseBuffer@CHString@@QAEXH@Z(long) -@ thiscall ?ReverseFind@CHString@@QBEHG@Z(long) -@ thiscall ?Right@CHString@@QBE?AV1@H@Z(long) -@ 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) -@ thiscall ??YCHString@@QAEABV0@ABV0@@Z(ptr) -@ thiscall ??YCHString@@QAEABV0@D@Z(long) -@ 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) -@ thiscall ??4CHString@@QAEABV0@G@Z(long) -@ thiscall ??ACHString@@QBEGH@Z(long) -@ thiscall ??1CHString@@QAE@XZ() -@ 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/include/crt/crtdefs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/crtdefs.h?rev=… ============================================================================== --- trunk/reactos/include/crt/crtdefs.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/crtdefs.h [iso-8859-1] Tue Sep 30 20:48:54 2014 @@ -316,7 +316,7 @@ #ifndef _WCHAR_T_DEFINED #define _WCHAR_T_DEFINED -#ifndef __cplusplus +#if defined(_MSC_VER) || !defined(__cplusplus) typedef unsigned short wchar_t; #endif #endif Modified: trunk/reactos/include/crt/rtcapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/rtcapi.h?rev=6… ============================================================================== --- trunk/reactos/include/crt/rtcapi.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/rtcapi.h [iso-8859-1] Tue Sep 30 20:48:54 2014 @@ -22,11 +22,6 @@ #define _RTC_ERRTYPE_IGNORE -1 #define _RTC_ERRTYPE_ASK -2 - -#ifndef _WCHAR_T_DEFINED -#define _WCHAR_T_DEFINED - typedef unsigned short wchar_t; -#endif typedef int (__cdecl *_RTC_error_fn)(int,const char *,int,const char *,const char *,...); typedef int (__cdecl *_RTC_error_fnW)(int,const wchar_t *,int,const wchar_t *,const wchar_t *,...); Modified: trunk/reactos/include/crt/wctype.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/wctype.h?rev=6… ============================================================================== --- trunk/reactos/include/crt/wctype.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/wctype.h [iso-8859-1] Tue Sep 30 20:48:54 2014 @@ -16,21 +16,6 @@ #ifdef __cplusplus extern "C" { -#endif - -#ifndef _CRTIMP -#define _CRTIMP __declspec(dllimport) -#endif - -#ifndef _WCHAR_T_DEFINED - typedef unsigned short wchar_t; -#define _WCHAR_T_DEFINED -#endif - -#ifndef _WCTYPE_T_DEFINED - typedef unsigned short wint_t; - typedef unsigned short wctype_t; -#define _WCTYPE_T_DEFINED #endif #ifndef WEOF

1 0

[jgardou] 64422: [ADVAPI32] - Fix a memory leak in failure case. Spotted by Thomas. CORE-8582
by jgardou＠svn.reactos.org 30 Sep '14

30 Sep '14

Author: jgardou Date: Tue Sep 30 20:21:50 2014 New Revision: 64422 URL: http://svn.reactos.org/svn/reactos?rev=64422&view=rev Log: [ADVAPI32] - Fix a memory leak in failure case. Spotted by Thomas. CORE-8582 Modified: trunk/reactos/dll/win32/advapi32/reg/hkcr.c Modified: trunk/reactos/dll/win32/advapi32/reg/hkcr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/hkc… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/hkcr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/reg/hkcr.c [iso-8859-1] Tue Sep 30 20:21:50 2014 @@ -46,6 +46,7 @@ Status = NtQueryKey(hKey, KeyNameInformation, NameInformation, InfoLength, &InfoLength); if (!NT_SUCCESS(Status)) { + RtlFreeHeap(RtlGetProcessHeap(), 0, NameInformation); ERR("NtQueryKey failed: 0x%08x\n", Status); return RtlNtStatusToDosError(Status); } @@ -58,6 +59,7 @@ Status = RtlDuplicateUnicodeString(RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, &InfoName, KeyName); if (!NT_SUCCESS(Status)) { + RtlFreeHeap(RtlGetProcessHeap(), 0, NameInformation); ERR("RtlDuplicateUnicodeString failed: 0x%08x\n", Status); return RtlNtStatusToDosError(Status); }

1 0

[jgardou] 64421: [ADVAPI32] - Implement DeleteKey for HKCR subkeys CORE-8582
by jgardou＠svn.reactos.org 30 Sep '14

30 Sep '14

Author: jgardou Date: Tue Sep 30 20:01:00 2014 New Revision: 64421 URL: http://svn.reactos.org/svn/reactos?rev=64421&view=rev Log: [ADVAPI32] - Implement DeleteKey for HKCR subkeys CORE-8582 Modified: trunk/reactos/dll/win32/advapi32/reg/hkcr.c trunk/reactos/dll/win32/advapi32/reg/reg.c trunk/reactos/dll/win32/advapi32/reg/reg.h Modified: trunk/reactos/dll/win32/advapi32/reg/hkcr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/hkc… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/hkcr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/reg/hkcr.c [iso-8859-1] Tue Sep 30 20:01:00 2014 @@ -238,7 +238,6 @@ /* Close it if we must */ if (QueriedKey != hKey) { - /* The original key is on the machine view */ RegCloseKey(QueriedKey); } @@ -261,9 +260,68 @@ /* Close it if we must */ if (QueriedKey != hKey) { + RegCloseKey(QueriedKey); + } + + return ErrorCode; +} + +LONG +WINAPI +DeleteHKCRKey( + _In_ HKEY hKey, + _In_ LPCWSTR lpSubKey) +{ + HKEY QueriedKey; + LONG ErrorCode; + + ASSERT(IsHKCRKey(hKey)); + + /* Remove the HKCR flag while we're working */ + hKey = (HKEY)(((ULONG_PTR)hKey) & ~0x2); + + ErrorCode = GetPreferredHKCRKey(hKey, &QueriedKey); + + if (ErrorCode == ERROR_FILE_NOT_FOUND) + { + /* The key doesn't exist on HKCU side, no chance for a subkey */ + return RegDeleteKeyW(hKey, lpSubKey); + } + + if (ErrorCode != ERROR_SUCCESS) + { + /* Somehow we failed for another reason (maybe deleted key or whatever) */ + return ErrorCode; + } + + ErrorCode = RegDeleteKeyW(QueriedKey, lpSubKey); + + /* Close it if we must */ + if (QueriedKey != hKey) + { /* The original key is on the machine view */ RegCloseKey(QueriedKey); } + /* Anything else than ERROR_FILE_NOT_FOUND means that we found it, even if it is with failures. */ + if (ErrorCode != ERROR_FILE_NOT_FOUND) + return ErrorCode; + + /* If we're here, we must open from HKLM key. */ + ErrorCode = GetFallbackHKCRKey(hKey, &QueriedKey); + if (ErrorCode != ERROR_SUCCESS) + { + /* Maybe the key doesn't exist in the HKLM view */ + return ErrorCode; + } + + ErrorCode = RegDeleteKeyW(QueriedKey, lpSubKey); + + /* Close it if we must */ + if (QueriedKey != hKey) + { + RegCloseKey(QueriedKey); + } + return ErrorCode; } Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] Tue Sep 30 20:01:00 2014 @@ -1227,6 +1227,9 @@ return RtlNtStatusToDosError(Status); } + if (IsHKCRKey(ParentKey)) + return DeleteHKCRKey(ParentKey, lpSubKey); + RtlInitUnicodeString(&SubKeyName, (LPWSTR)lpSubKey); InitializeObjectAttributes(&ObjectAttributes, Modified: trunk/reactos/dll/win32/advapi32/reg/reg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/reg.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/reg/reg.h [iso-8859-1] Tue Sep 30 20:01:00 2014 @@ -30,3 +30,10 @@ _In_ DWORD ulOptions, _In_ REGSAM samDesired, _In_ PHKEY phkResult); + +LONG +WINAPI +DeleteHKCRKey( + _In_ HKEY hKey, + _In_ LPCWSTR lpSubKey); +

1 0

[jgardou] 64420: [ADVAPI32] - Mark key create from HKCR subkeys as HKCR subkeys CORE-8582
by jgardou＠svn.reactos.org 30 Sep '14

30 Sep '14

Author: jgardou Date: Tue Sep 30 20:00:54 2014 New Revision: 64420 URL: http://svn.reactos.org/svn/reactos?rev=64420&view=rev Log: [ADVAPI32] - Mark key create from HKCR subkeys as HKCR subkeys CORE-8582 Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] Tue Sep 30 20:00:54 2014 @@ -1125,6 +1125,9 @@ return RtlNtStatusToDosError(Status); } + if (IsHKCRKey(ParentKey)) + MakeHKCRKey(phkResult); + return ERROR_SUCCESS; }

1 0

[jgardou] 64419: [ADVAPI32] - Reimplement RegDeleteKeyA as a wrapper around RegDeleteKeyW CORE-8582
by jgardou＠svn.reactos.org 30 Sep '14

30 Sep '14

Author: jgardou Date: Tue Sep 30 20:00:35 2014 New Revision: 64419 URL: http://svn.reactos.org/svn/reactos?rev=64419&view=rev Log: [ADVAPI32] - Reimplement RegDeleteKeyA as a wrapper around RegDeleteKeyW CORE-8582 Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] Tue Sep 30 20:00:35 2014 @@ -1182,55 +1182,16 @@ RegDeleteKeyA(HKEY hKey, LPCSTR lpSubKey) { - OBJECT_ATTRIBUTES ObjectAttributes; + LONG ErrorCode; UNICODE_STRING SubKeyName; - HANDLE ParentKey; - HANDLE TargetKey; - NTSTATUS Status; - - /* Make sure we got a subkey */ - if (!lpSubKey) - { - /* Fail */ - return ERROR_INVALID_PARAMETER; - } - - Status = MapDefaultKey(&ParentKey, - hKey); - if (!NT_SUCCESS(Status)) - { - return RtlNtStatusToDosError(Status); - } - - RtlCreateUnicodeStringFromAsciiz(&SubKeyName, - (LPSTR)lpSubKey); - InitializeObjectAttributes(&ObjectAttributes, - &SubKeyName, - OBJ_CASE_INSENSITIVE, - ParentKey, - NULL); - - Status = NtOpenKey(&TargetKey, - DELETE, - &ObjectAttributes); + + RtlCreateUnicodeStringFromAsciiz(&SubKeyName, (LPSTR)lpSubKey); + + ErrorCode = RegDeleteKeyW(hKey, SubKeyName.Buffer); + RtlFreeUnicodeString(&SubKeyName); - if (!NT_SUCCESS(Status)) - { - goto Cleanup; - } - - Status = NtDeleteKey(TargetKey); - NtClose (TargetKey); - -Cleanup: - ClosePredefKey(ParentKey); - - if (!NT_SUCCESS(Status)) - { - return RtlNtStatusToDosError(Status); - } - - return ERROR_SUCCESS; + + return ErrorCode; }

1 0

[jgardou] 64418: [ADVAPI32] - Implement RegOpenKeyEx for HKEY_CLASSES_ROOT subkeys CORE-8582
by jgardou＠svn.reactos.org 30 Sep '14

30 Sep '14

Author: jgardou Date: Tue Sep 30 20:00:23 2014 New Revision: 64418 URL: http://svn.reactos.org/svn/reactos?rev=64418&view=rev Log: [ADVAPI32] - Implement RegOpenKeyEx for HKEY_CLASSES_ROOT subkeys CORE-8582 Added: trunk/reactos/dll/win32/advapi32/reg/hkcr.c (with props) Modified: trunk/reactos/dll/win32/advapi32/CMakeLists.txt trunk/reactos/dll/win32/advapi32/reg/reg.c trunk/reactos/dll/win32/advapi32/reg/reg.h Modified: trunk/reactos/dll/win32/advapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/advapi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/CMakeLists.txt [iso-8859-1] Tue Sep 30 20:00:23 2014 @@ -28,6 +28,7 @@ misc/msi.c misc/shutdown.c misc/sysfunc.c + reg/hkcr.c reg/reg.c sec/ac.c sec/audit.c Added: trunk/reactos/dll/win32/advapi32/reg/hkcr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/hkc… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/hkcr.c (added) +++ trunk/reactos/dll/win32/advapi32/reg/hkcr.c [iso-8859-1] Tue Sep 30 20:00:23 2014 @@ -0,0 +1,269 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: lib/advapi32/reg/hkcr.c + * PURPOSE: Registry functions - HKEY_CLASSES_ROOT abstraction + * PROGRAMMER: JerÃ´me Gardou (jerome.gardou(a)reactos.org) + */ + +#include <advapi32.h> + +#include <ndk/cmfuncs.h> +#include <pseh/pseh2.h> + +#include "reg.h" + +WINE_DEFAULT_DEBUG_CHANNEL(reg); + +static const UNICODE_STRING HKLM_ClassesPath = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\Software\\Classes"); + +static +LONG +GetKeyName(HKEY hKey, PUNICODE_STRING KeyName) +{ + UNICODE_STRING InfoName; + PKEY_NAME_INFORMATION NameInformation; + ULONG InfoLength; + NTSTATUS Status; + + /* Get info length */ + InfoLength = 0; + Status = NtQueryKey(hKey, KeyNameInformation, NULL, 0, &InfoLength); + if (Status != STATUS_BUFFER_TOO_SMALL) + { + ERR("NtQueryKey returned unexpected Status: 0x%08x\n", Status); + return RtlNtStatusToDosError(Status); + } + + /* Get it for real */ + NameInformation = RtlAllocateHeap(RtlGetProcessHeap(), 0, InfoLength); + if (NameInformation == NULL) + { + ERR("Failed to allocate %lu bytes", InfoLength); + return ERROR_NOT_ENOUGH_MEMORY; + } + + Status = NtQueryKey(hKey, KeyNameInformation, NameInformation, InfoLength, &InfoLength); + if (!NT_SUCCESS(Status)) + { + ERR("NtQueryKey failed: 0x%08x\n", Status); + return RtlNtStatusToDosError(Status); + } + + /* Make it a proper UNICODE_STRING */ + InfoName.Length = NameInformation->NameLength; + InfoName.MaximumLength = NameInformation->NameLength; + InfoName.Buffer = NameInformation->Name; + + Status = RtlDuplicateUnicodeString(RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, &InfoName, KeyName); + if (!NT_SUCCESS(Status)) + { + ERR("RtlDuplicateUnicodeString failed: 0x%08x\n", Status); + return RtlNtStatusToDosError(Status); + } + + RtlFreeHeap(RtlGetProcessHeap(), 0, NameInformation); + + return ERROR_SUCCESS; +} + +static +LONG +GetKeySam( + _In_ HKEY hKey, + _Out_ REGSAM* RegSam) +{ + NTSTATUS Status; + OBJECT_BASIC_INFORMATION ObjectInfo; + + Status = NtQueryObject(hKey, ObjectBasicInformation, &ObjectInfo, sizeof(ObjectInfo), NULL); + if (!NT_SUCCESS(Status)) + { + ERR("NtQueryObject failed, Status %x08x\n", Status); + return RtlNtStatusToDosError(Status); + } + + *RegSam = ObjectInfo.GrantedAccess; + return ERROR_SUCCESS; +} + +/* + * Gets a HKLM key from an HKCU key. + */ +static +LONG +GetFallbackHKCRKey( + _In_ HKEY hKey, + _Out_ HKEY* MachineKey) +{ + UNICODE_STRING KeyName; + LPWSTR SubKeyName; + LONG ErrorCode; + REGSAM SamDesired; + + /* Get the key name */ + ErrorCode = GetKeyName(hKey, &KeyName); + if (ErrorCode != ERROR_SUCCESS) + return ErrorCode; + + /* See if we really need a conversion */ + if (RtlPrefixUnicodeString(&HKLM_ClassesPath, &KeyName, TRUE)) + { + RtlFreeUnicodeString(&KeyName); + *MachineKey = hKey; + return ERROR_SUCCESS; + } + + SubKeyName = KeyName.Buffer + 15; /* 15 == wcslen(L"\\Registry\\User\\") */ + /* Skip the user token */ + while (*SubKeyName++ != L'\\') + { + if (!*SubKeyName) + { + ERR("Key name %S is invalid!\n", KeyName.Buffer); + return ERROR_INTERNAL_ERROR; + } + } + + /* Use the same access mask than the original key */ + ErrorCode = GetKeySam(hKey, &SamDesired); + if (ErrorCode != ERROR_SUCCESS) + { + RtlFreeUnicodeString(&KeyName); + return ErrorCode; + } + + /* Open the key. */ + ErrorCode = RegOpenKeyExW( + HKEY_LOCAL_MACHINE, + SubKeyName, + 0, + SamDesired, + MachineKey); + + RtlFreeUnicodeString(&KeyName); + + return ErrorCode; +} + +/* Get the HKCU key (if it exists) from an HKCR key */ +static +LONG +GetPreferredHKCRKey( + _In_ HKEY hKey, + _Out_ HKEY* PreferredKey) +{ + UNICODE_STRING KeyName; + LPWSTR SubKeyName; + LONG ErrorCode; + REGSAM SamDesired; + + /* Get the key name */ + ErrorCode = GetKeyName(hKey, &KeyName); + if (ErrorCode != ERROR_SUCCESS) + return ErrorCode; + + /* See if we really need a conversion */ + if (!RtlPrefixUnicodeString(&HKLM_ClassesPath, &KeyName, TRUE)) + { + RtlFreeUnicodeString(&KeyName); + *PreferredKey = hKey; + return ERROR_SUCCESS; + } + + /* 18 == wcslen(L"\\Registry\\Machine\\") */ + SubKeyName = KeyName.Buffer + 18; + + /* Use the same access mask than the original key */ + ErrorCode = GetKeySam(hKey, &SamDesired); + if (ErrorCode != ERROR_SUCCESS) + { + RtlFreeUnicodeString(&KeyName); + return ErrorCode; + } + + /* Open the key. */ + ErrorCode = RegOpenKeyExW( + HKEY_CURRENT_USER, + SubKeyName, + 0, + SamDesired, + PreferredKey); + + RtlFreeUnicodeString(&KeyName); + + return ErrorCode; +} + +/* Same as RegOpenKeyExW, but for HKEY_CLASSES_ROOT subkeys */ +LONG +WINAPI +OpenHKCRKey( + _In_ HKEY hKey, + _In_ LPCWSTR lpSubKey, + _In_ DWORD ulOptions, + _In_ REGSAM samDesired, + _In_ PHKEY phkResult) +{ + HKEY QueriedKey; + LONG ErrorCode; + + ASSERT(IsHKCRKey(hKey)); + + /* Remove the HKCR flag while we're working */ + hKey = (HKEY)(((ULONG_PTR)hKey) & ~0x2); + + ErrorCode = GetPreferredHKCRKey(hKey, &QueriedKey); + + if (ErrorCode == ERROR_FILE_NOT_FOUND) + { + /* The key doesn't exist on HKCU side, no chance for a subkey */ + ErrorCode = RegOpenKeyExW(hKey, lpSubKey, ulOptions, samDesired, phkResult); + if (ErrorCode == ERROR_SUCCESS) + MakeHKCRKey(phkResult); + return ErrorCode; + } + + if (ErrorCode != ERROR_SUCCESS) + { + /* Somehow we failed for another reason (maybe deleted key or whatever) */ + return ErrorCode; + } + + /* Try on the HKCU side */ + ErrorCode = RegOpenKeyExW(QueriedKey, lpSubKey, ulOptions, samDesired, phkResult); + if (ErrorCode == ERROR_SUCCESS) + MakeHKCRKey(phkResult); + + /* Close it if we must */ + if (QueriedKey != hKey) + { + /* The original key is on the machine view */ + RegCloseKey(QueriedKey); + } + + /* Anything else than ERROR_FILE_NOT_FOUND means that we found it, even if it is with failures. */ + if (ErrorCode != ERROR_FILE_NOT_FOUND) + return ErrorCode; + + /* If we're here, we must open from HKLM key. */ + ErrorCode = GetFallbackHKCRKey(hKey, &QueriedKey); + if (ErrorCode != ERROR_SUCCESS) + { + /* Maybe the key doesn't exist in the HKLM view */ + return ErrorCode; + } + + ErrorCode = RegOpenKeyExW(QueriedKey, lpSubKey, ulOptions, samDesired, phkResult); + if (ErrorCode == ERROR_SUCCESS) + MakeHKCRKey(phkResult); + + /* Close it if we must */ + if (QueriedKey != hKey) + { + /* The original key is on the machine view */ + RegCloseKey(QueriedKey); + } + + return ErrorCode; +} Propchange: trunk/reactos/dll/win32/advapi32/reg/hkcr.c ------------------------------------------------------------------------------ charset = UTF-8 Propchange: trunk/reactos/dll/win32/advapi32/reg/hkcr.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/advapi32/reg/hkcr.c ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] Tue Sep 30 20:00:23 2014 @@ -3483,6 +3483,9 @@ return RtlNtStatusToDosError(Status); } + if (IsHKCRKey(KeyHandle)) + return OpenHKCRKey(KeyHandle, lpSubKey, ulOptions, samDesired, phkResult); + if (ulOptions & REG_OPTION_OPEN_LINK) Attributes |= OBJ_OPENLINK; @@ -3500,10 +3503,12 @@ Status = NtOpenKey((PHANDLE)phkResult, samDesired, &ObjectAttributes); + if (!NT_SUCCESS(Status)) { ErrorCode = RtlNtStatusToDosError(Status); } + ClosePredefKey(KeyHandle); Modified: trunk/reactos/dll/win32/advapi32/reg/reg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/reg.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/reg/reg.h [iso-8859-1] Tue Sep 30 20:00:23 2014 @@ -19,5 +19,14 @@ void MakeHKCRKey(_Inout_ HKEY* hKey) { - *hKey = (HKEY)((ULONG_PTR)*hKey | 0x2); + *hKey = (HKEY)((ULONG_PTR)(*hKey) | 0x2); } + +LONG +WINAPI +OpenHKCRKey( + _In_ HKEY hKey, + _In_ LPCWSTR lpSubKey, + _In_ DWORD ulOptions, + _In_ REGSAM samDesired, + _In_ PHKEY phkResult);

1 0

[jgardou] 64417: [ADVAPI32] - Mark the HKEY_CLASSES_ROOT key as belonging to the HKEY_CLASSES_ROOT tree. CORE-8582
by jgardou＠svn.reactos.org 30 Sep '14

30 Sep '14

Author: jgardou Date: Tue Sep 30 20:00:17 2014 New Revision: 64417 URL: http://svn.reactos.org/svn/reactos?rev=64417&view=rev Log: [ADVAPI32] - Mark the HKEY_CLASSES_ROOT key as belonging to the HKEY_CLASSES_ROOT tree. CORE-8582 Added: trunk/reactos/dll/win32/advapi32/reg/reg.h (with props) Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] Tue Sep 30 20:00:17 2014 @@ -18,6 +18,8 @@ #include <ndk/cmfuncs.h> #include <pseh/pseh2.h> +#include "reg.h" + WINE_DEFAULT_DEBUG_CHANNEL(reg); /* DEFINES ******************************************************************/ @@ -231,10 +233,11 @@ static NTSTATUS -OpenClassesRootKey(PHANDLE KeyHandle) +OpenClassesRootKey(_Out_ PHANDLE KeyHandle) { OBJECT_ATTRIBUTES Attributes; UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\Software\\CLASSES"); + NTSTATUS Status; TRACE("OpenClassesRootKey()\n"); @@ -243,9 +246,17 @@ OBJ_CASE_INSENSITIVE, NULL, NULL); - return NtOpenKey(KeyHandle, - MAXIMUM_ALLOWED, - &Attributes); + Status = NtOpenKey(KeyHandle, + MAXIMUM_ALLOWED, + &Attributes); + + if (!NT_SUCCESS(Status)) + return Status; + + /* Mark it as HKCR */ + MakeHKCRKey((HKEY*)KeyHandle); + + return Status; } Added: trunk/reactos/dll/win32/advapi32/reg/reg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/reg.h (added) +++ trunk/reactos/dll/win32/advapi32/reg/reg.h [iso-8859-1] Tue Sep 30 20:00:17 2014 @@ -0,0 +1,23 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: lib/advapi32/reg/reg.c + * PURPOSE: Registry functions + */ + +#pragma once + +/* FUNCTIONS ****************************************************************/ +FORCEINLINE +BOOL +IsHKCRKey(_In_ HKEY hKey) +{ + return ((ULONG_PTR)hKey & 0x2) != 0; +} + +FORCEINLINE +void +MakeHKCRKey(_Inout_ HKEY* hKey) +{ + *hKey = (HKEY)((ULONG_PTR)*hKey | 0x2); +} Propchange: trunk/reactos/dll/win32/advapi32/reg/reg.h ------------------------------------------------------------------------------ charset = UTF-8 Propchange: trunk/reactos/dll/win32/advapi32/reg/reg.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/advapi32/reg/reg.h ------------------------------------------------------------------------------ svn:mime-type = text/plain

1 0

[jgardou] 64416: [NTOS/CM] - Put the loop inside SEH, and not vice-versa.
by jgardou＠svn.reactos.org 30 Sep '14

30 Sep '14

Author: jgardou Date: Tue Sep 30 20:00:00 2014 New Revision: 64416 URL: http://svn.reactos.org/svn/reactos?rev=64416&view=rev Log: [NTOS/CM] - Put the loop inside SEH, and not vice-versa. Modified: trunk/reactos/ntoskrnl/config/cmapi.c Modified: trunk/reactos/ntoskrnl/config/cmapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmapi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmapi.c [iso-8859-1] Tue Sep 30 20:00:00 2014 @@ -1556,12 +1556,13 @@ /* Do the real copy */ KeyNameInfo->NameLength = 0; CurrentKcb = Kcb; - while (CurrentKcb) - { - ULONG NameLength; - - _SEH2_TRY - { + + _SEH2_TRY + { + while (CurrentKcb) + { + ULONG NameLength; + if (CurrentKcb->NameBlock->Compressed) { NameLength = CmpCompressedNameSize(CurrentKcb->NameBlock->Name, CurrentKcb->NameBlock->NameLength); @@ -1585,15 +1586,15 @@ /* Add path separator */ KeyNameInfo->Name[NeededLength/sizeof(WCHAR)] = OBJ_NAME_PATH_SEPARATOR; KeyNameInfo->NameLength += NameLength + sizeof(OBJ_NAME_PATH_SEPARATOR); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - return _SEH2_GetExceptionCode(); - } - _SEH2_END; - - CurrentKcb = CurrentKcb->ParentKcb; - } + + CurrentKcb = CurrentKcb->ParentKcb; + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + return _SEH2_GetExceptionCode(); + } + _SEH2_END; /* Make sure we copied everything */ ASSERT(NeededLength == 0);

1 0

[jgardou] 64415: [ADVAPI32] - Reimplement RegCreateKeyExA as a wrapper around RegCreateKeyExW CORE-8582
by jgardou＠svn.reactos.org 30 Sep '14

30 Sep '14

Author: jgardou Date: Tue Sep 30 19:59:51 2014 New Revision: 64415 URL: http://svn.reactos.org/svn/reactos?rev=64415&view=rev Log: [ADVAPI32] - Reimplement RegCreateKeyExA as a wrapper around RegCreateKeyExW CORE-8582 Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] Tue Sep 30 19:59:51 2014 @@ -1013,75 +1013,39 @@ * @implemented */ LONG WINAPI -RegCreateKeyExA(HKEY hKey, - LPCSTR lpSubKey, - DWORD Reserved, - LPSTR lpClass, - DWORD dwOptions, - REGSAM samDesired, - LPSECURITY_ATTRIBUTES lpSecurityAttributes, - PHKEY phkResult, - LPDWORD lpdwDisposition) +RegCreateKeyExA( + _In_ HKEY hKey, + _In_ LPCSTR lpSubKey, + _In_ DWORD Reserved, + _In_ LPSTR lpClass, + _In_ DWORD dwOptions, + _In_ REGSAM samDesired, + _In_ LPSECURITY_ATTRIBUTES lpSecurityAttributes, + _Out_ PHKEY phkResult, + _Out_ LPDWORD lpdwDisposition) { UNICODE_STRING SubKeyString; UNICODE_STRING ClassString; - OBJECT_ATTRIBUTES ObjectAttributes; - HANDLE ParentKey; - ULONG Attributes = OBJ_CASE_INSENSITIVE; - NTSTATUS Status; - - TRACE("RegCreateKeyExA() called\n"); - - if (lpSecurityAttributes && lpSecurityAttributes->nLength != sizeof(SECURITY_ATTRIBUTES)) - return ERROR_INVALID_USER_BUFFER; - - /* get the real parent key */ - Status = MapDefaultKey(&ParentKey, - hKey); - if (!NT_SUCCESS(Status)) - { - return RtlNtStatusToDosError(Status); - } - - TRACE("ParentKey %p\n", ParentKey); - - if (lpClass != NULL) - { - RtlCreateUnicodeStringFromAsciiz(&ClassString, - lpClass); - } - - if (dwOptions & REG_OPTION_OPEN_LINK) - Attributes |= OBJ_OPENLINK; - - RtlCreateUnicodeStringFromAsciiz(&SubKeyString, - (LPSTR)lpSubKey); - InitializeObjectAttributes(&ObjectAttributes, - &SubKeyString, - Attributes, - (HANDLE)ParentKey, - lpSecurityAttributes ? (PSECURITY_DESCRIPTOR)lpSecurityAttributes->lpSecurityDescriptor : NULL); - Status = CreateNestedKey(phkResult, - &ObjectAttributes, - (lpClass == NULL)? NULL : &ClassString, - dwOptions, - samDesired, - lpdwDisposition); + DWORD ErrorCode; + + RtlCreateUnicodeStringFromAsciiz(&ClassString, lpClass); + RtlCreateUnicodeStringFromAsciiz(&SubKeyString, (LPSTR)lpSubKey); + + ErrorCode = RegCreateKeyExW( + hKey, + SubKeyString.Buffer, + Reserved, + ClassString.Buffer, + dwOptions, + samDesired, + lpSecurityAttributes, + phkResult, + lpdwDisposition); + RtlFreeUnicodeString(&SubKeyString); - if (lpClass != NULL) - { - RtlFreeUnicodeString(&ClassString); - } - - ClosePredefKey(ParentKey); - - TRACE("Status %x\n", Status); - if (!NT_SUCCESS(Status)) - { - return RtlNtStatusToDosError(Status); - } - - return ERROR_SUCCESS; + RtlFreeUnicodeString(&ClassString); + + return ErrorCode; }

1 0

[jgardou] 64414: [ADVAPI32] - Rewrite RegOpenKeyExA as a wrapper around RegOpenKeyExW CORE-8582
by jgardou＠svn.reactos.org 30 Sep '14

30 Sep '14

Author: jgardou Date: Tue Sep 30 19:59:35 2014 New Revision: 64414 URL: http://svn.reactos.org/svn/reactos?rev=64414&view=rev Log: [ADVAPI32] - Rewrite RegOpenKeyExA as a wrapper around RegOpenKeyExW CORE-8582 Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] Tue Sep 30 19:59:35 2014 @@ -3452,54 +3452,25 @@ * @implemented */ LONG WINAPI -RegOpenKeyExA(HKEY hKey, - LPCSTR lpSubKey, - DWORD ulOptions, - REGSAM samDesired, - PHKEY phkResult) -{ - OBJECT_ATTRIBUTES ObjectAttributes; +RegOpenKeyExA( + _In_ HKEY hKey, + _In_ LPCSTR lpSubKey, + _In_ DWORD ulOptions, + _In_ REGSAM samDesired, + _Out_ PHKEY phkResult) +{ UNICODE_STRING SubKeyString; - HANDLE KeyHandle; - NTSTATUS Status; - ULONG Attributes = OBJ_CASE_INSENSITIVE; - LONG ErrorCode = ERROR_SUCCESS; + LONG ErrorCode; TRACE("RegOpenKeyExA hKey 0x%x lpSubKey %s ulOptions 0x%x samDesired 0x%x phkResult %p\n", hKey, lpSubKey, ulOptions, samDesired, phkResult); - if (!phkResult) - { - return ERROR_INVALID_PARAMETER; - } - - Status = MapDefaultKey(&KeyHandle, - hKey); - if (!NT_SUCCESS(Status)) - { - return RtlNtStatusToDosError(Status); - } - - if (ulOptions & REG_OPTION_OPEN_LINK) - Attributes |= OBJ_OPENLINK; RtlCreateUnicodeStringFromAsciiz(&SubKeyString, (LPSTR)lpSubKey); - InitializeObjectAttributes(&ObjectAttributes, - &SubKeyString, - Attributes, - KeyHandle, - NULL); - - Status = NtOpenKey((PHANDLE)phkResult, - samDesired, - &ObjectAttributes); + + ErrorCode = RegOpenKeyExW(hKey, SubKeyString.Buffer, ulOptions, samDesired, phkResult); + RtlFreeUnicodeString(&SubKeyString); - if (!NT_SUCCESS(Status)) - { - ErrorCode = RtlNtStatusToDosError(Status); - } - - ClosePredefKey(KeyHandle); return ErrorCode; }

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