Ros-diffs February 2015

ros-diffs@reactos.org

16 participants
372 discussions

[tkreuzer] 66287: [FRAMEDYN] Fix compilation on x64

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Feb 15 14:39:02 2015 New Revision: 66287 URL: http://svn.reactos.org/svn/reactos?rev=66287&view=rev Log: [FRAMEDYN] Fix compilation on x64 Modified: trunk/reactos/dll/win32/CMakeLists.txt trunk/reactos/dll/win32/framedyn/chstring.cpp trunk/reactos/dll/win32/framedyn/framedyn.spec Modified: trunk/reactos/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] Sun Feb 15 14:39:02 2015 @@ -41,9 +41,7 @@ add_subdirectory(faultrep) add_subdirectory(fltlib) add_subdirectory(fmifs) -if(ARCH STREQUAL "i386") add_subdirectory(framedyn) -endif() add_subdirectory(fusion) add_subdirectory(gdiplus) add_subdirectory(getuname) Modified: trunk/reactos/dll/win32/framedyn/chstring.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/framedyn/chstrin… ============================================================================== --- trunk/reactos/dll/win32/framedyn/chstring.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/framedyn/chstring.cpp [iso-8859-1] Sun Feb 15 14:39:02 2015 @@ -180,7 +180,7 @@ if (lpsz != 0) { // Get its length - int Len = strlen(lpsz); + int Len = (int)strlen(lpsz); if (Len) { // Allocate and convert the string @@ -968,7 +968,7 @@ // If no len provided, get one if (nNewLength == -1) { - nNewLength = wcslen(m_pchData); + nNewLength = (int)wcslen(m_pchData); } // Set appropriate size and null-terminate @@ -1052,7 +1052,7 @@ int Count; // Get position and then, extract - Count = wcscspn(m_pchData, lpszCharSet); + Count = (int)wcscspn(m_pchData, lpszCharSet); return Left(Count); } @@ -1064,7 +1064,7 @@ int Count; // Get position and then, extract - Count = wcsspn(m_pchData, lpszCharSet); + Count = (int)wcsspn(m_pchData, lpszCharSet); return Left(Count); } @@ -1199,7 +1199,7 @@ // If we have string, get its len if (lpsz != 0) { - Len = strlen(lpsz); + Len = (int)strlen(lpsz); } else { Modified: trunk/reactos/dll/win32/framedyn/framedyn.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/framedyn/framedy… ============================================================================== --- trunk/reactos/dll/win32/framedyn/framedyn.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/framedyn/framedyn.spec [iso-8859-1] Sun Feb 15 14:39:02 2015 @@ -1,80 +1,160 @@ -@ 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 # 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 -@ stdcall ??H@YG?AVCHString@@PBGABV0@@Z(wstr ptr) _ZplPKwRK8CHString -@ stdcall ??H@YG?AVCHString@@ABV0@0@Z(ptr ptr) _ZplRK8CHStringS1_ -@ thiscall ?Flush@Provider@@MAEXXZ() _ZN8Provider5FlushEv -@ thiscall ?ValidateDeletionFlags@Provider@@MAEJJ@Z(long) _ZN8Provider21ValidateDeletionFlagsEl -@ thiscall ?ValidateMethodFlags@Provider@@MAEJJ@Z(long) _ZN8Provider19ValidateMethodFlagsEl -@ thiscall ?ValidateQueryFlags@Provider@@MAEJJ@Z(long) _ZN8Provider18ValidateQueryFlagsEl +@ thiscall -arch=win32 ?AllocBeforeWrite@CHString@@IAEXH@Z(long) _ZN8CHString16AllocBeforeWriteEi # protected: void __thiscall CHString::AllocBeforeWrite(int) +@ thiscall -arch=win64 ?AllocBeforeWrite@CHString@@IEAAXH@Z(long) _ZN8CHString16AllocBeforeWriteEi # protected: void __thiscall CHString::AllocBeforeWrite(int) +@ thiscall -arch=win32 ?AllocBuffer@CHString@@IAEXH@Z(long) _ZN8CHString11AllocBufferEi # protected: void __thiscall CHString::AllocBuffer(int) +@ thiscall -arch=win64 ?AllocBuffer@CHString@@IEAAXH@Z(long) _ZN8CHString11AllocBufferEi # protected: void __thiscall CHString::AllocBuffer(int) +@ thiscall -arch=win32 ?AllocCopy@CHString@@IBEXAAV1@HHH@Z(ptr long long long) _ZNK8CHString9AllocCopyERS_iii # protected: void __thiscall CHString::AllocCopy(class CHString &,int,int,int)const +@ thiscall -arch=win64 ?AllocCopy@CHString@@IEBAXAEAV1@HHH@Z(ptr long long long) _ZNK8CHString9AllocCopyERS_iii # protected: void __thiscall CHString::AllocCopy(class CHString &,int,int,int)const +@ thiscall -arch=win32 ?AllocSysString@CHString@@QBEPAGXZ() _ZNK8CHString14AllocSysStringEv +@ thiscall -arch=win64 ?AllocSysString@CHString@@QEBAPEAGXZ() _ZNK8CHString14AllocSysStringEv +@ thiscall -arch=win32 ?AssignCopy@CHString@@IAEXHPBG@Z(long wstr) _ZN8CHString10AssignCopyEiPKw +@ thiscall -arch=win64 ?AssignCopy@CHString@@IEAAXHPEBG@Z(long wstr) _ZN8CHString10AssignCopyEiPKw +@ thiscall -arch=win32 ??0CHString@@QAE@ABV0@@Z(ptr) _ZN8CHStringC1ERKS_ +@ thiscall -arch=win64 ??0CHString@@QEAA@AEBV0@@Z(ptr) _ZN8CHStringC1ERKS_ +@ thiscall -arch=win32 ??0CHString@@QAE@PBD@Z(str) _ZN8CHStringC1EPKc +@ thiscall -arch=win64 ??0CHString@@QEAA@PEBD@Z(str) _ZN8CHStringC1EPKc +@ thiscall -arch=win32 ??0CHString@@QAE@PBE@Z(str) _ZN8CHStringC1EPKh +@ thiscall -arch=win64 ??0CHString@@QEAA@PEBE@Z(str) _ZN8CHStringC1EPKh +@ thiscall -arch=win32 ??0CHString@@QAE@PBG@Z(wstr) _ZN8CHStringC1EPKw +@ thiscall -arch=win64 ??0CHString@@QEAA@PEBG@Z(wstr) _ZN8CHStringC1EPKw +@ thiscall -arch=win32 ??0CHString@@QAE@PBGH@Z(wstr long) _ZN8CHStringC1EPKwi +@ thiscall -arch=win64 ??0CHString@@QEAA@PEBGH@Z(wstr long) _ZN8CHStringC1EPKwi +@ thiscall -arch=win32 ??0CHString@@QAE@GH@Z(long long) _ZN8CHStringC1Ewi +@ thiscall -arch=win64 ??0CHString@@QEAA@GH@Z(long long) _ZN8CHStringC1Ewi +@ thiscall -arch=win32 ??0CHString@@QAE@XZ() _ZN8CHStringC1Ev # public: __thiscall CHString::CHString(void) +@ thiscall -arch=win64 ??0CHString@@QEAA@XZ() _ZN8CHStringC1Ev # public: __thiscall CHString::CHString(void) +@ thiscall -arch=win32 ?Collate@CHString@@QBEHPBG@Z(wstr) _ZNK8CHString7CollateEPKw # public: int __thiscall CHString::Collate(unsigned short const *)const +@ thiscall -arch=win64 ?Collate@CHString@@QEBAHPEBG@Z(wstr) _ZNK8CHString7CollateEPKw # public: int __thiscall CHString::Collate(unsigned short const *)const +@ thiscall -arch=win32 ?Compare@CHString@@QBEHPBG@Z(wstr) _ZNK8CHString7CompareEPKw # public: int __thiscall CHString::Compare(unsigned short const *)const +@ thiscall -arch=win64 ?Compare@CHString@@QEBAHPEBG@Z(wstr) _ZNK8CHString7CompareEPKw # public: int __thiscall CHString::Compare(unsigned short const *)const +@ thiscall -arch=win32 ?CompareNoCase@CHString@@QBEHPBG@Z(wstr) _ZNK8CHString13CompareNoCaseEPKw # public: int __thiscall CHString::CompareNoCase(unsigned short const *)const +@ thiscall -arch=win64 ?CompareNoCase@CHString@@QEBAHPEBG@Z(wstr) _ZNK8CHString13CompareNoCaseEPKw # public: int __thiscall CHString::CompareNoCase(unsigned short const *)const +@ thiscall -arch=win32 ?ConcatCopy@CHString@@IAEXHPBGH0@Z(long wstr long wstr) _ZN8CHString10ConcatCopyEiPKwiS1_ # protected: void __thiscall CHString::ConcatCopy(int,unsigned short const *,int,unsigned short const *) +@ thiscall -arch=win64 ?ConcatCopy@CHString@@IEAAXHPEBGH0@Z(long wstr long wstr) _ZN8CHString10ConcatCopyEiPKwiS1_ # protected: void __thiscall CHString::ConcatCopy(int,unsigned short const *,int,unsigned short const *) +@ thiscall -arch=win32 ?ConcatInPlace@CHString@@IAEXHPBG@Z(long wstr) _ZN8CHString13ConcatInPlaceEiPKw # protected: void __thiscall CHString::ConcatInPlace(int,unsigned short const *) +@ thiscall -arch=win64 ?ConcatInPlace@CHString@@IEAAXHPEBG@Z(long wstr) _ZN8CHString13ConcatInPlaceEiPKw # protected: void __thiscall CHString::ConcatInPlace(int,unsigned short const *) +@ thiscall -arch=win32 ?CopyBeforeWrite@CHString@@IAEXXZ() _ZN8CHString15CopyBeforeWriteEv # protected: void __thiscall CHString::CopyBeforeWrite(void) +@ thiscall -arch=win64 ?CopyBeforeWrite@CHString@@IEAAXXZ() _ZN8CHString15CopyBeforeWriteEv # protected: void __thiscall CHString::CopyBeforeWrite(void) +@ thiscall -arch=win32 ?Empty@CHString@@QAEXXZ() _ZN8CHString5EmptyEv # public: void __thiscall CHString::Empty(void) +@ thiscall -arch=win64 ?Empty@CHString@@QEAAXXZ() _ZN8CHString5EmptyEv # public: void __thiscall CHString::Empty(void) +@ thiscall -arch=win32 ?Find@CHString@@QBEHPBG@Z(wstr) _ZNK8CHString4FindEPKw # public: int __thiscall CHString::Find(unsigned short const *)const +@ thiscall -arch=win64 ?Find@CHString@@QEBAHPEBG@Z(wstr) _ZNK8CHString4FindEPKw # public: int __thiscall CHString::Find(unsigned short const *)const +@ thiscall -arch=win32 ?Find@CHString@@QBEHG@Z(long) _ZNK8CHString4FindEw # public: int __thiscall CHString::Find(unsigned short)const +@ thiscall -arch=win64 ?Find@CHString@@QEBAHG@Z(long) _ZNK8CHString4FindEPKw # public: int __thiscall CHString::Find(unsigned short)const +@ thiscall -arch=win32 ?FindOneOf@CHString@@QBEHPBG@Z(wstr) _ZNK8CHString9FindOneOfEPKw # public: int __thiscall CHString::FindOneOf(unsigned short const *)const +@ thiscall -arch=win64 ?FindOneOf@CHString@@QEBAHPEBG@Z(wstr) _ZNK8CHString9FindOneOfEPKw # public: int __thiscall CHString::FindOneOf(unsigned short const *)const +@ thiscall -arch=win32 ?Format@CHString@@QAAXIZZ(long long long) _ZN8CHString6FormatEjz # public: void __cdecl CHString::Format(unsigned int,...) +@ thiscall -arch=win64 ?Format@CHString@@QEAAXIZZ(long long long) _ZN8CHString6FormatEjz # public: void __cdecl CHString::Format(unsigned int,...) +@ thiscall -arch=win32 ?Format@CHString@@QAAXPBGZZ(long wstr long) _ZN8CHString6FormatEPKwz # public: void __cdecl CHString::Format(unsigned short const *,...) +@ thiscall -arch=win64 ?Format@CHString@@QEAAXPEBGZZ(long wstr long) _ZN8CHString6FormatEPKwz # public: void __cdecl CHString::Format(unsigned short const *,...) +@ thiscall -arch=win32 ?FormatMessageW@CHString@@QAAXIZZ(long long long) _ZN8CHString14FormatMessageWEjz # public: void __cdecl CHString::FormatMessageW(unsigned int,...) +@ thiscall -arch=win64 ?FormatMessageW@CHString@@QEAAXIZZ(long long long) _ZN8CHString14FormatMessageWEjz # public: void __cdecl CHString::FormatMessageW(unsigned int,...) +@ thiscall -arch=win32 ?FormatMessageW@CHString@@QAAXPBGZZ(long ptr long) _ZN8CHString14FormatMessageWEPKwz # public: void __cdecl CHString::FormatMessageW(unsigned short const *,...) +@ thiscall -arch=win64 ?FormatMessageW@CHString@@QEAAXPEBGZZ(long ptr long) _ZN8CHString14FormatMessageWEPKwz # public: void __cdecl CHString::FormatMessageW(unsigned short const *,...) +@ thiscall -arch=win32 ?FormatV@CHString@@QAEXPBGPAD@Z(wstr long) _ZN8CHString7FormatVEPKwPc # public: void __thiscall CHString::FormatV(unsigned short const *,char *) +@ thiscall -arch=win64 ?FormatV@CHString@@QEAAXPEBGPEAD@Z(wstr long) _ZN8CHString7FormatVEPKwPc # public: void __thiscall CHString::FormatV(unsigned short const *,char *) +@ thiscall -arch=win32 ?FreeExtra@CHString@@QAEXXZ() _ZN8CHString9FreeExtraEv # public: void __thiscall CHString::FreeExtra(void) +@ thiscall -arch=win64 ?FreeExtra@CHString@@QEAAXXZ() _ZN8CHString9FreeExtraEv # public: void __thiscall CHString::FreeExtra(void) +@ thiscall -arch=win32 ?GetAllocLength@CHString@@QBEHXZ() _ZNK8CHString14GetAllocLengthEv # public: int __thiscall CHString::GetAllocLength(void)const +@ thiscall -arch=win64 ?GetAllocLength@CHString@@QEBAHXZ() _ZNK8CHString14GetAllocLengthEv # public: int __thiscall CHString::GetAllocLength(void)const +@ thiscall -arch=win32 ?GetAt@CHString@@QBEGH@Z(long) _ZNK8CHString5GetAtEi # public: unsigned short __thiscall CHString::GetAt(int)const +@ thiscall -arch=win64 ?GetAt@CHString@@QEBAGH@Z(long) _ZNK8CHString5GetAtEi # public: unsigned short __thiscall CHString::GetAt(int)const +@ thiscall -arch=win32 ?GetBuffer@CHString@@QAEPAGH@Z(long) _ZN8CHString9GetBufferEi # public: unsigned short * __thiscall CHString::GetBuffer(int) +@ thiscall -arch=win64 ?GetBuffer@CHString@@QEAAPEAGH@Z(long) _ZN8CHString9GetBufferEi # public: unsigned short * __thiscall CHString::GetBuffer(int) +@ thiscall -arch=win32 ?GetBufferSetLength@CHString@@QAEPAGH@Z(long) _ZN8CHString18GetBufferSetLengthEi # public: unsigned short * __thiscall CHString::GetBufferSetLength(int) +@ thiscall -arch=win64 ?GetBufferSetLength@CHString@@QEAAPEAGH@Z(long) _ZN8CHString18GetBufferSetLengthEi # public: unsigned short * __thiscall CHString::GetBufferSetLength(int) +@ thiscall -arch=win32 ?GetData@CHString@@IBEPAUCHStringData@@XZ() _ZNK8CHString7GetDataEv # protected: struct CHStringData * __thiscall CHString::GetData(void)const +@ thiscall -arch=win64 ?GetData@CHString@@IEBAPEAUCHStringData@@XZ() _ZNK8CHString7GetDataEv # protected: struct CHStringData * __thiscall CHString::GetData(void)const +@ thiscall -arch=win32 ?GetLength@CHString@@QBEHXZ() _ZNK8CHString9GetLengthEv # public: int __thiscall CHString::GetLength(void)const +@ thiscall -arch=win64 ?GetLength@CHString@@QEBAHXZ() _ZNK8CHString9GetLengthEv # public: int __thiscall CHString::GetLength(void)const +@ thiscall -arch=win32 ?Init@CHString@@IAEXXZ() _ZN8CHString4InitEv # protected: void __thiscall CHString::Init(void) +@ thiscall -arch=win64 ?Init@CHString@@IEAAXXZ() _ZN8CHString4InitEv # protected: void __thiscall CHString::Init(void) +@ thiscall -arch=win32 ?IsEmpty@CHString@@QBEHXZ() _ZNK8CHString7IsEmptyEv # public: int __thiscall CHString::IsEmpty(void)const +@ thiscall -arch=win64 ?IsEmpty@CHString@@QEBAHXZ() _ZNK8CHString7IsEmptyEv # public: int __thiscall CHString::IsEmpty(void)const +@ thiscall -arch=win32 ?Left@CHString@@QBE?AV1@H@Z(long) _ZNK8CHString4LeftEi # public: class CHString __thiscall CHString::Left(int)const +@ thiscall -arch=win64 ?Left@CHString@@QEBA?AV1@H@Z(long) _ZNK8CHString4LeftEi # public: class CHString __thiscall CHString::Left(int)const +@ thiscall -arch=win32 ?LoadStringW@CHString@@QAEHI@Z(long) _ZN8CHString11LoadStringWEj # public: int __thiscall CHString::LoadStringW(unsigned int) +@ thiscall -arch=win64 ?LoadStringW@CHString@@QEAAHI@Z(long) _ZN8CHString11LoadStringWEj # public: int __thiscall CHString::LoadStringW(unsigned int) +@ thiscall -arch=win32 ?LoadStringW@CHString@@IAEHIPAGI@Z(long wstr long) _ZN8CHString11LoadStringWEjPwj # protected: int __thiscall CHString::LoadStringW(unsigned int,unsigned short *,unsigned int) +@ thiscall -arch=win64 ?LoadStringW@CHString@@IEAAHIPEAGI@Z(long wstr long) _ZN8CHString11LoadStringWEjPwj # protected: int __thiscall CHString::LoadStringW(unsigned int,unsigned short *,unsigned int) +@ thiscall -arch=win32 ?LockBuffer@CHString@@QAEPAGXZ() _ZN8CHString10LockBufferEv # public: unsigned short * __thiscall CHString::LockBuffer(void) +@ thiscall -arch=win64 ?LockBuffer@CHString@@QEAAPEAGXZ() _ZN8CHString10LockBufferEv # public: unsigned short * __thiscall CHString::LockBuffer(void) +@ thiscall -arch=win32 ?MakeLower@CHString@@QAEXXZ() _ZN8CHString9MakeLowerEv # public: void __thiscall CHString::MakeLower(void) +@ thiscall -arch=win64 ?MakeLower@CHString@@QEAAXXZ() _ZN8CHString9MakeLowerEv # public: void __thiscall CHString::MakeLower(void) +@ thiscall -arch=win32 ?MakeReverse@CHString@@QAEXXZ() _ZN8CHString11MakeReverseEv # public: void __thiscall CHString::MakeReverse(void) +@ thiscall -arch=win64 ?MakeReverse@CHString@@QEAAXXZ() _ZN8CHString11MakeReverseEv # public: void __thiscall CHString::MakeReverse(void) +@ thiscall -arch=win32 ?MakeUpper@CHString@@QAEXXZ() _ZN8CHString9MakeUpperEv # public: void __thiscall CHString::MakeUpper(void) +@ thiscall -arch=win64 ?MakeUpper@CHString@@QEAAXXZ() _ZN8CHString9MakeUpperEv # public: void __thiscall CHString::MakeUpper(void) +@ thiscall -arch=win32 ?Mid@CHString@@QBE?AV1@H@Z(long) _ZNK8CHString3MidEi # public: class CHString __thiscall CHString::Mid(int)const +@ thiscall -arch=win64 ?Mid@CHString@@QEBA?AV1@H@Z(long) _ZNK8CHString3MidEi # public: class CHString __thiscall CHString::Mid(int)const +@ thiscall -arch=win32 ?Mid@CHString@@QBE?AV1@HH@Z(long long) _ZNK8CHString3MidEii # public: class CHString __thiscall CHString::Mid(int,int)const +@ thiscall -arch=win64 ?Mid@CHString@@QEBA?AV1@HH@Z(long long) _ZNK8CHString3MidEii # public: class CHString __thiscall CHString::Mid(int,int)const +@ thiscall -arch=win32 ?Release@CHString@@KGXPAUCHStringData@@@Z(ptr) _ZN8CHString7ReleaseEP12CHStringData@4 # protected: static void __stdcall CHString::Release(struct CHStringData *) +@ thiscall -arch=win64 ?Release@CHString@@KAXPEAUCHStringData@@@Z(ptr) _ZN8CHString7ReleaseEP12CHStringData@4 # protected: static void __stdcall CHString::Release(struct CHStringData *) +@ thiscall -arch=win32 ?Release@CHString@@IAEXXZ() _ZN8CHString7ReleaseEv # protected: void __thiscall CHString::Release(void) +@ thiscall -arch=win64 ?Release@CHString@@IEAAXXZ() _ZN8CHString7ReleaseEv # protected: void __thiscall CHString::Release(void) +@ thiscall -arch=win32 ?ReleaseBuffer@CHString@@QAEXH@Z(long) _ZN8CHString13ReleaseBufferEi # public: void __thiscall CHString::ReleaseBuffer(int) +@ thiscall -arch=win64 ?ReleaseBuffer@CHString@@QEAAXH@Z(long) _ZN8CHString13ReleaseBufferEi # public: void __thiscall CHString::ReleaseBuffer(int) +@ thiscall -arch=win32 ?ReverseFind@CHString@@QBEHG@Z(long) _ZNK8CHString11ReverseFindEw # public: int __thiscall CHString::ReverseFind(unsigned short)const +@ thiscall -arch=win64 ?ReverseFind@CHString@@QEBAHG@Z(long) _ZNK8CHString11ReverseFindEw # public: int __thiscall CHString::ReverseFind(unsigned short)const +@ thiscall -arch=win32 ?Right@CHString@@QBE?AV1@H@Z(long) _ZNK8CHString5RightEi # public: class CHString __thiscall CHString::Right(int)const +@ thiscall -arch=win64 ?Right@CHString@@QEBA?AV1@H@Z(long) _ZNK8CHString5RightEi # public: class CHString __thiscall CHString::Right(int)const +@ stdcall -arch=win32 ?SafeStrlen@CHString@@KGHPBG@Z(wstr) _ZN8CHString10SafeStrlenEPKw # protected: static int__stdcall CHString::SafeStrlen(unsigned short const *) +@ stdcall -arch=win64 ?SafeStrlen@CHString@@KAHPEBG@Z(wstr) _ZN8CHString10SafeStrlenEPKw # protected: static int__stdcall CHString::SafeStrlen(unsigned short const *) +@ thiscall -arch=win32 ?SetAt@CHString@@QAEXHG@Z(long long) _ZN8CHString5SetAtEiw # public: void __thiscall CHString::SetAt(int,unsigned short) +@ thiscall -arch=win64 ?SetAt@CHString@@QEAAXHG@Z(long long) _ZN8CHString5SetAtEiw # public: void __thiscall CHString::SetAt(int,unsigned short) +@ thiscall -arch=win32 ?SpanExcluding@CHString@@QBE?AV1@PBG@Z(long wstr) _ZNK8CHString13SpanExcludingEPKw # public: class CHString __thiscall CHString::SpanExcluding(unsigned short const *)const +@ thiscall -arch=win64 ?SpanExcluding@CHString@@QEBA?AV1@PEBG@Z(long wstr) _ZNK8CHString13SpanExcludingEPKw # public: class CHString __thiscall CHString::SpanExcluding(unsigned short const *)const +@ thiscall -arch=win32 ?SpanIncluding@CHString@@QBE?AV1@PBG@Z(long wstr) _ZNK8CHString13SpanIncludingEPKw # public: class CHString __thiscall CHString::SpanIncluding(unsigned short const *)const +@ thiscall -arch=win64 ?SpanIncluding@CHString@@QEBA?AV1@PEBG@Z(long wstr) _ZNK8CHString13SpanIncludingEPKw # public: class CHString __thiscall CHString::SpanIncluding(unsigned short const *)const +@ thiscall -arch=win32 ?TrimLeft@CHString@@QAEXXZ() _ZN8CHString8TrimLeftEv # public: void __thiscall CHString::TrimLeft(void) +@ thiscall -arch=win64 ?TrimLeft@CHString@@QEAAXXZ() _ZN8CHString8TrimLeftEv # public: void __thiscall CHString::TrimLeft(void) +@ thiscall -arch=win32 ?TrimRight@CHString@@QAEXXZ() _ZN8CHString9TrimRightEv # public: void __thiscall CHString::TrimRight(void) +@ thiscall -arch=win64 ?TrimRight@CHString@@QEAAXXZ() _ZN8CHString9TrimRightEv # public: void __thiscall CHString::TrimRight(void) +@ thiscall -arch=win32 ?UnlockBuffer@CHString@@QAEXXZ() _ZN8CHString12UnlockBufferEv # public: void __thiscall CHString::UnlockBuffer(void) +@ thiscall -arch=win64 ?UnlockBuffer@CHString@@QEAAXXZ() _ZN8CHString12UnlockBufferEv # public: void __thiscall CHString::UnlockBuffer(void) +@ thiscall -arch=win32 ??BCHString@@QBEPBGXZ(ptr) _ZNK8CHStringcvPKwEv # public: __thiscall CHString::operator unsigned short const *(void)const +@ thiscall -arch=win64 ??BCHString@@QEBAPEBGXZ(ptr) _ZNK8CHStringcvPKwEv # public: __thiscall CHString::operator unsigned short const *(void)const +@ thiscall -arch=win32 ??YCHString@@QAEABV0@ABV0@@Z(ptr) _ZN8CHStringpLERKS_ # public: class CHString const & __thiscall CHString::operator+=(class CHString const &) +@ thiscall -arch=win64 ??YCHString@@QEAAAEBV0@AEBV0@@Z(ptr) _ZN8CHStringpLERKS_ # public: class CHString const & __thiscall CHString::operator+=(class CHString const &) +@ thiscall -arch=win32 ??YCHString@@QAEABV0@D@Z(long) _ZN8CHStringpLEc # public: class CHString const & __thiscall CHString::operator+=(char) +@ thiscall -arch=win64 ??YCHString@@QEAAAEBV0@D@Z(long) _ZN8CHStringpLEc # public: class CHString const & __thiscall CHString::operator+=(char) +@ thiscall -arch=win32 ??YCHString@@QAEABV0@PBG@Z(wstr) _ZN8CHStringpLEPKw # public: class CHString const & __thiscall CHString::operator+=(unsigned short const *) +@ thiscall -arch=win64 ??YCHString@@QEAAAEBV0@PEBG@Z(wstr) _ZN8CHStringpLEPKw # public: class CHString const & __thiscall CHString::operator+=(unsigned short const *) +@ thiscall -arch=win32 ??YCHString@@QAEABV0@G@Z(long) _ZN8CHStringpLEw # public: class CHString const & __thiscall CHString::operator+=(unsigned short) +@ thiscall -arch=win64 ??YCHString@@QEAAAEBV0@G@Z(long) _ZN8CHStringpLEw # public: class CHString const & __thiscall CHString::operator+=(unsigned short) +@ thiscall -arch=win32 ??4CHString@@QAEABV0@PAV0@@Z(ptr) _ZN8CHStringaSEPS_ # public: class CHString const & __thiscall CHString::operator=(class CHString *) +@ thiscall -arch=win64 ??4CHString@@QEAAAEBV0@PEAV0@@Z(ptr) _ZN8CHStringaSEPS_ # public: class CHString const & __thiscall CHString::operator=(class CHString *) +@ thiscall -arch=win32 ??4CHString@@QAEABV0@ABV0@@Z(ptr) _ZN8CHStringaSERKS_ # public: class CHString const & __thiscall CHString::operator=(class CHString const &) +@ thiscall -arch=win64 ??4CHString@@QEAAAEBV0@AEBV0@@Z(ptr) _ZN8CHStringaSERKS_ # public: class CHString const & __thiscall CHString::operator=(class CHString const &) +@ thiscall -arch=win32 ??4CHString@@QAEABV0@PBD@Z(str) _ZN8CHStringaSEPKc # public: class CHString const & __thiscall CHString::operator=(char const *) +@ thiscall -arch=win64 ??4CHString@@QEAAAEBV0@PEBD@Z(str) _ZN8CHStringaSEPKc # public: class CHString const & __thiscall CHString::operator=(char const *) +@ thiscall -arch=win32 ??4CHString@@QAEABV0@D@Z(long) _ZN8CHStringaSEc # public: class CHString const & __thiscall CHString::operator=(char) +@ thiscall -arch=win64 ??4CHString@@QEAAAEBV0@D@Z(long) _ZN8CHStringaSEc # public: class CHString const & __thiscall CHString::operator=(char) +@ thiscall -arch=win32 ??4CHString@@QAEABV0@PBE@Z(str) _ZN8CHStringaSEPKh # public: class CHString const & __thiscall CHString::operator=(unsigned char const *) +@ thiscall -arch=win64 ??4CHString@@QEAAAEBV0@PEBE@Z(str) _ZN8CHStringaSEPKh # public: class CHString const & __thiscall CHString::operator=(unsigned char const *) +@ thiscall -arch=win32 ??4CHString@@QAEABV0@PBG@Z(wstr) _ZN8CHStringaSEPKw # public: class CHString const & __thiscall CHString::operator=(unsigned short const *) +@ thiscall -arch=win64 ??4CHString@@QEAAAEBV0@PEBG@Z(wstr) _ZN8CHStringaSEPKw # public: class CHString const & __thiscall CHString::operator=(unsigned short const *) +@ thiscall -arch=win32 ??4CHString@@QAEABV0@G@Z(long) _ZN8CHStringaSEw # public: class CHString const & __thiscall CHString::operator=(unsigned short) +@ thiscall -arch=win64 ??4CHString@@QEAAAEBV0@G@Z(long) _ZN8CHStringaSEw # public: class CHString const & __thiscall CHString::operator=(unsigned short) +@ thiscall -arch=win32 ??ACHString@@QBEGH@Z(long) _ZNK8CHStringixEi # public: unsigned short __thiscall CHString::operator[](int)const +@ thiscall -arch=win64 ??ACHString@@QEBAGH@Z(long) _ZNK8CHStringixEi # public: unsigned short __thiscall CHString::operator[](int)const +@ thiscall -arch=win32 ??1CHString@@QAE@XZ() _ZN8CHStringD1Ev # public: __thiscall CHString::~CHString(void), complete object destructor, identical to _ZN8CHStringD2Ev aka base object destructor +@ thiscall -arch=win64 ??1CHString@@QEAA@XZ() _ZN8CHStringD1Ev # public: __thiscall CHString::~CHString(void), complete object destructor, identical to _ZN8CHStringD2Ev aka base object destructor +@ stdcall -arch=win32 ??H@YG?AVCHString@@GABV0@@Z(long ptr) _ZplwRK8CHString # class CHString __stdcall operator+(unsigned short,class CHString const &) +@ stdcall -arch=win64 ??H@YA?AVCHString@@GAEBV0@@Z(long ptr) _ZplwRK8CHString # class CHString __stdcall operator+(unsigned short,class CHString const &) +@ stdcall -arch=win32 ??H@YG?AVCHString@@ABV0@G@Z(ptr long) _ZplRK8CHStringw # class CHString __stdcall operator+(class CHString const &,unsigned short) +@ stdcall -arch=win64 ??H@YA?AVCHString@@AEBV0@G@Z(ptr long) _ZplRK8CHStringw # class CHString __stdcall operator+(class CHString const &,unsigned short) +@ stdcall -arch=win32 ??H@YG?AVCHString@@ABV0@PBG@Z(ptr wstr) _ZplRK8CHStringPKw # class CHString __stdcall operator+(class CHString const &,unsigned short const *) +@ stdcall -arch=win64 ??H@YA?AVCHString@@AEBV0@PEBG@Z(ptr wstr) _ZplRK8CHStringPKw # class CHString __stdcall operator+(class CHString const &,unsigned short const *) +@ stdcall -arch=win32 ??H@YG?AVCHString@@PBGABV0@@Z(wstr ptr) _ZplPKwRK8CHString # class CHString __stdcall operator+(unsigned short const *,class CHString const &) +@ stdcall -arch=win64 ??H@YA?AVCHString@@PEBGAEBV0@@Z(wstr ptr) _ZplPKwRK8CHString # class CHString __stdcall operator+(unsigned short const *,class CHString const &) +@ stdcall -arch=win32 ??H@YG?AVCHString@@ABV0@0@Z(ptr ptr) _ZplRK8CHStringS1_ # class CHString __stdcall operator+(class CHString const &,class CHString const &) +@ stdcall -arch=win64 ??H@YA?AVCHString@@AEBV0@G@Z(ptr ptr) _ZplRK8CHStringS1_ # class CHString __stdcall operator+(class CHString const &,class CHString const &) +@ thiscall -arch=win32 ?Flush@Provider@@MAEXXZ() _ZN8Provider5FlushEv # protected: virtual void __thiscall Provider::Flush(void) +@ thiscall -arch=win64 ?Flush@Provider@@MEAAXXZ() _ZN8Provider5FlushEv # protected: virtual void __thiscall Provider::Flush(void) +@ thiscall -arch=win32 ?ValidateDeletionFlags@Provider@@MAEJJ@Z(long) _ZN8Provider21ValidateDeletionFlagsEl # protected: virtual long __thiscall Provider::ValidateDeletionFlags(long) +@ thiscall -arch=win64 ?ValidateDeletionFlags@Provider@@MEAAJJ@Z(long) _ZN8Provider21ValidateDeletionFlagsEl # protected: virtual long __thiscall Provider::ValidateDeletionFlags(long) +@ thiscall -arch=win32 ?ValidateMethodFlags@Provider@@MAEJJ@Z(long) _ZN8Provider19ValidateMethodFlagsEl # protected: virtual long __thiscall Provider::ValidateMethodFlags(long) +@ thiscall -arch=win64 ?ValidateMethodFlags@Provider@@MEAAJJ@Z(long) _ZN8Provider19ValidateMethodFlagsEl # protected: virtual long __thiscall Provider::ValidateMethodFlags(long) +@ thiscall -arch=win32 ?ValidateQueryFlags@Provider@@MAEJJ@Z(long) _ZN8Provider18ValidateQueryFlagsEl # protected: virtual long __thiscall Provider::ValidateQueryFlags(long) +@ thiscall -arch=win64 ?ValidateQueryFlags@Provider@@MEAAJJ@Z(long) _ZN8Provider18ValidateQueryFlagsEl # protected: virtual long __thiscall Provider::ValidateQueryFlags(long)

9 years, 10 months

[tkreuzer] 66286: [LIBS] Fix some MSVC warnings (and potential bugs) regarding signed/unsigned comparison.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Feb 15 11:24:52 2015 New Revision: 66286 URL: http://svn.reactos.org/svn/reactos?rev=66286&view=rev Log: [LIBS] Fix some MSVC warnings (and potential bugs) regarding signed/unsigned comparison. Modified: trunk/reactos/lib/drivers/sound/mmixer/sup.c trunk/reactos/lib/fslib/ext2lib/Super.c trunk/reactos/lib/fslib/vfatlib/check/check.c trunk/reactos/lib/fslib/vfatlib/check/dosfsck.h Modified: trunk/reactos/lib/drivers/sound/mmixer/sup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/s… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/sup.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/sup.c [iso-8859-1] Sun Feb 15 11:24:52 2015 @@ -675,7 +675,8 @@ LPMIXERLINE_EXT MixerLine) { LPMIXERCONTROLDETAILS_UNSIGNED Input; - LONG Value, Index, Channel = 0; + LONG Value; + ULONG Index, Channel = 0; ULONG dwValue; MIXER_STATUS Status; LPMIXERVOLUME_DATA VolumeData; Modified: trunk/reactos/lib/fslib/ext2lib/Super.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/ext2lib/Super.c?… ============================================================================== --- trunk/reactos/lib/fslib/ext2lib/Super.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/ext2lib/Super.c [iso-8859-1] Sun Feb 15 11:24:52 2015 @@ -47,7 +47,7 @@ DPRINT(" Creator OS: %lu\n", pExt2Sb->s_creator_os); DPRINT(" Revision Level: %lu\n", pExt2Sb->s_rev_level); DPRINT(" Reserved Block Default UID: %u\n", pExt2Sb->s_def_resuid); - DPRINT(" Reserved Block Default GID: %u\n", pExt2Sb->s_def_resgid); + DPRINT(" Reserved Block Default GID: %u\n", pExt2Sb->s_def_resgid); DPRINT(" uuid = "); for (i=0; i < 16; i++) DbgPrint("%x ", pExt2Sb->s_uuid[i]); @@ -75,13 +75,13 @@ { int frags_per_block = 0; ULONG overhead = 0; - int rem = 0; + ULONG rem = 0; ULONG i = 0; ULONG group_block = 0; ULONG numblocks = 0; PEXT2_SUPER_BLOCK pExt2Sb = Ext2Sys->ext2_sb; LARGE_INTEGER SysTime; - + NtQuerySystemTime(&SysTime); Ext2Sys->blocksize = EXT2_BLOCK_SIZE(pExt2Sb); @@ -201,14 +201,14 @@ * XXX Not all block groups need the descriptor blocks, but * being clever is tricky... */ - overhead = (int) (3 + Ext2Sys->desc_blocks + Ext2Sys->inode_blocks_per_group); + overhead = (3 + Ext2Sys->desc_blocks + Ext2Sys->inode_blocks_per_group); /* * See if the last group is big enough to support the * necessary data structures. If not, we need to get rid of * it. */ - rem = (int) ((pExt2Sb->s_blocks_count - pExt2Sb->s_first_data_block) % + rem = ((pExt2Sb->s_blocks_count - pExt2Sb->s_first_data_block) % pExt2Sb->s_blocks_per_group); if ((Ext2Sys->group_desc_count == 1) && rem && (rem < overhead)) @@ -279,14 +279,14 @@ numblocks -= 1 + Ext2Sys->desc_blocks; } - + numblocks -= 2 + Ext2Sys->inode_blocks_per_group; - + pExt2Sb->s_free_blocks_count += numblocks; Ext2Sys->group_desc[i].bg_free_blocks_count = (__u16)numblocks; Ext2Sys->group_desc[i].bg_free_inodes_count = (__u16)pExt2Sb->s_inodes_per_group; Ext2Sys->group_desc[i].bg_used_dirs_count = 0; - + group_block += pExt2Sb->s_blocks_per_group; } Modified: trunk/reactos/lib/fslib/vfatlib/check/check.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/ch… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/check/check.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/check/check.c [iso-8859-1] Sun Feb 15 11:24:52 2015 @@ -838,7 +838,7 @@ int scan_root(DOS_FS *fs) { DOS_FILE **chain; - int i; + ULONG i; root = NULL; chain = &root; Modified: trunk/reactos/lib/fslib/vfatlib/check/dosfsck.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/do… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/check/dosfsck.h [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/check/dosfsck.h [iso-8859-1] Sun Feb 15 11:24:52 2015 @@ -178,8 +178,8 @@ #define FAT_MAX_BAD(fs) (0xff7 | FAT_EXTD(fs)) #define FAT_IS_BAD(fs,v) ((v) >= FAT_MIN_BAD(fs) && (v) <= FAT_MAX_BAD(fs)) -/* return -16 as a number with fs->fat_bits bits */ -#define FAT_EXTD(fs) (((1 << fs->eff_fat_bits)-1) & ~0xf) +/* return -16 as an unsigned number with fs->fat_bits bits */ +#define FAT_EXTD(fs) (((1UL << fs->eff_fat_bits)-1) & ~0xf) #endif

9 years, 10 months

[tkreuzer] 66285: [PSDK] Add _SH_ to processor definitions, fix some processor #ifdefs Patch by Yuntian Zhang CORE-7946 #resolve

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Feb 15 11:22:29 2015 New Revision: 66285 URL: http://svn.reactos.org/svn/reactos?rev=66285&view=rev Log: [PSDK] Add _SH_ to processor definitions, fix some processor #ifdefs Patch by Yuntian Zhang CORE-7946 #resolve Modified: trunk/reactos/include/psdk/windows.h trunk/reactos/include/psdk/winnt.h trunk/reactos/include/xdk/winnt_old.h Modified: trunk/reactos/include/psdk/windows.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/windows.h?rev… ============================================================================== --- trunk/reactos/include/psdk/windows.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/windows.h [iso-8859-1] Sun Feb 15 11:22:29 2015 @@ -18,7 +18,7 @@ #endif #if !defined(_X86_) && !defined(_AMD64_) && !defined(_IA64_) && !defined(_ALPHA_) && \ - !defined(_ARM_) && !defined(_PPC_) && !defined(_MIPS_) && !defined(_68K_) + !defined(_ARM_) && !defined(_PPC_) && !defined(_MIPS_) && !defined(_68K_) && !defined(_SH_) #if defined(_M_AMD64) || defined(__x86_64__) #define _AMD64_ @@ -36,6 +36,8 @@ #define _MIPS_ #elif defined(_M_M68K) || defined(__68k__) #define _68K_ +#elif defined(_SHX_) || defined(__sh__) +#define _SH_ #endif #endif Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=6… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Sun Feb 15 11:22:29 2015 @@ -2959,7 +2959,7 @@ #endif /* _LDT_ENTRY_DEFINED */ /* FIXME: add more machines */ -#if defined(_X86_) && !defined(__PowerPC__) +#if defined(_X86_) #define SIZE_OF_80387_REGISTERS 80 #define CONTEXT_i386 0x10000 #define CONTEXT_i486 0x10000 @@ -3015,7 +3015,7 @@ DWORD SegSs; BYTE ExtendedRegisters[MAXIMUM_SUPPORTED_EXTENSION]; } CONTEXT; -#elif defined(__x86_64__) +#elif defined(_AMD64_) #define CONTEXT_AMD64 0x100000 @@ -3464,7 +3464,7 @@ DWORD ContextFlags; DWORD Fill[4]; } CONTEXT; -#elif defined(SHx) +#elif defined(_SH_) /* These are the debug or break registers on the SH3 */ typedef struct _DEBUG_REGISTERS { Modified: trunk/reactos/include/xdk/winnt_old.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/winnt_old.h?re… ============================================================================== --- trunk/reactos/include/xdk/winnt_old.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/winnt_old.h [iso-8859-1] Sun Feb 15 11:22:29 2015 @@ -1602,7 +1602,7 @@ #endif /* _LDT_ENTRY_DEFINED */ /* FIXME: add more machines */ -#if defined(_X86_) && !defined(__PowerPC__) +#if defined(_X86_) #define SIZE_OF_80387_REGISTERS 80 #define CONTEXT_i386 0x10000 #define CONTEXT_i486 0x10000 @@ -1658,7 +1658,7 @@ DWORD SegSs; BYTE ExtendedRegisters[MAXIMUM_SUPPORTED_EXTENSION]; } CONTEXT; -#elif defined(__x86_64__) +#elif defined(_AMD64_) #define CONTEXT_AMD64 0x100000 @@ -2107,7 +2107,7 @@ DWORD ContextFlags; DWORD Fill[4]; } CONTEXT; -#elif defined(SHx) +#elif defined(_SH_) /* These are the debug or break registers on the SH3 */ typedef struct _DEBUG_REGISTERS {

9 years, 10 months

[tkreuzer] 66284: [SHELL32] Fix prototype of COpenWithDialog::NoOpenDlgProc. DLGPROCs return INT_PTR, not BOOL. Fixes amd64 build.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Feb 15 11:21:31 2015 New Revision: 66284 URL: http://svn.reactos.org/svn/reactos?rev=66284&view=rev Log: [SHELL32] Fix prototype of COpenWithDialog::NoOpenDlgProc. DLGPROCs return INT_PTR, not BOOL. Fixes amd64 build. Modified: trunk/reactos/dll/win32/shell32/COpenWithMenu.cpp Modified: trunk/reactos/dll/win32/shell32/COpenWithMenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/COpenWit… ============================================================================== --- trunk/reactos/dll/win32/shell32/COpenWithMenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/COpenWithMenu.cpp [iso-8859-1] Sun Feb 15 11:21:31 2015 @@ -783,7 +783,7 @@ VOID AddApp(COpenWithList::SApp *pApp, BOOL bSelected); VOID Browse(); VOID Accept(); - static BOOL CALLBACK NoOpenDlgProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam); + static INT_PTR CALLBACK NoOpenDlgProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam); COpenWithList::SApp *GetCurrentApp(); const OPENASINFO *m_pInfo; @@ -816,7 +816,7 @@ ImageList_Destroy(m_hImgList); } -BOOL CALLBACK COpenWithDialog::NoOpenDlgProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) +INT_PTR CALLBACK COpenWithDialog::NoOpenDlgProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) { switch(Message) { @@ -850,7 +850,7 @@ if (m_bNoOpen) { int dReturnValue = DialogBox(shell32_hInstance, MAKEINTRESOURCE(IDD_NOOPEN), hwnd, NoOpenDlgProc); - + if (dReturnValue == IDNO) return TRUE; else if (dReturnValue == -1)

9 years, 10 months

[tkreuzer] 66283: [KDVBOX] Fix amd64 build

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Feb 15 11:13:30 2015 New Revision: 66283 URL: http://svn.reactos.org/svn/reactos?rev=66283&view=rev Log: [KDVBOX] Fix amd64 build Modified: trunk/reactos/drivers/base/kdvm/kdvbox_asm.S Modified: trunk/reactos/drivers/base/kdvm/kdvbox_asm.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdvm/kdvbox_a… ============================================================================== --- trunk/reactos/drivers/base/kdvm/kdvbox_asm.S [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdvm/kdvbox_asm.S [iso-8859-1] Sun Feb 15 11:13:30 2015 @@ -14,6 +14,7 @@ #else PUBLIC KdVmExchange FUNC KdVmExchange + .endprolog xchg rax, rcx mov edx, HEX(5659) out dx, rax

9 years, 10 months

[tkreuzer] 66282: [FREELDR] Fix non-x86 build

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Feb 15 11:10:09 2015 New Revision: 66282 URL: http://svn.reactos.org/svn/reactos?rev=66282&view=rev Log: [FREELDR] Fix non-x86 build Modified: trunk/reactos/boot/freeldr/freeldr/custom.c trunk/reactos/boot/freeldr/freeldr/include/custom.h Modified: trunk/reactos/boot/freeldr/freeldr/custom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/custo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/custom.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/custom.c [iso-8859-1] Sun Feb 15 11:10:09 2015 @@ -25,8 +25,6 @@ #ifdef _M_IX86 -const CHAR BootDrivePrompt[] = "Enter the boot drive.\n\nExamples:\nfd0 - first floppy drive\nhd0 - first hard drive\nhd1 - second hard drive\ncd0 - first CD-ROM drive.\n\nBIOS drive numbers may also be used:\n0 - first floppy drive\n0x80 - first hard drive\n0x81 - second hard drive"; -const CHAR BootPartitionPrompt[] = "Enter the boot partition.\n\nEnter 0 for the active (bootable) partition."; const CHAR BootSectorFilePrompt[] = "Enter the boot sector file path.\n\nExamples:\n\\BOOTSECT.DOS\n/boot/bootsect.dos"; const CHAR LinuxKernelPrompt[] = "Enter the Linux kernel image path.\n\nExamples:\n/vmlinuz\n/boot/vmlinuz-2.4.18"; const CHAR LinuxInitrdPrompt[] = "Enter the initrd image path.\n\nExamples:\n/initrd.gz\n/boot/root.img.gz\n\nLeave blank for no initial ram disk."; @@ -34,6 +32,8 @@ #endif // _M_IX86 +const CHAR BootDrivePrompt[] = "Enter the boot drive.\n\nExamples:\nfd0 - first floppy drive\nhd0 - first hard drive\nhd1 - second hard drive\ncd0 - first CD-ROM drive.\n\nBIOS drive numbers may also be used:\n0 - first floppy drive\n0x80 - first hard drive\n0x81 - second hard drive"; +const CHAR BootPartitionPrompt[] = "Enter the boot partition.\n\nEnter 0 for the active (bootable) partition."; const CHAR ReactOSSystemPathPrompt[] = "Enter the path to your ReactOS system directory.\n\nExamples:\n\\REACTOS\n\\ROS"; const CHAR ReactOSOptionsPrompt[] = "Enter the options you want passed to the kernel.\n\nExamples:\n/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200\n/FASTDETECT /SOS /NOGUIBOOT\n/BASEVIDEO /MAXMEM=64\n/KERNEL=NTKRNLMP.EXE /HAL=HALMPS.DLL"; const CHAR CustomBootPrompt[] = "Press ENTER to boot your custom boot setup."; Modified: trunk/reactos/boot/freeldr/freeldr/include/custom.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/custom.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/custom.h [iso-8859-1] Sun Feb 15 11:10:09 2015 @@ -30,7 +30,8 @@ VOID OptionMenuCustomBootDisk(VOID); VOID OptionMenuCustomBootPartition(VOID); VOID OptionMenuCustomBootBootSectorFile(VOID); -VOID OptionMenuCustomBootReactOS(VOID); VOID OptionMenuCustomBootLinux(VOID); #endif // _M_IX86 + +VOID OptionMenuCustomBootReactOS(VOID);

9 years, 10 months

[tfaber] 66281: [KMTESTS] - Add KmtGetSystemRoutineAddress and use it to avoid importing functions that are not available in some versions of Windows. This allows running kmtests on Windows XP SP3 ...

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Feb 15 10:23:21 2015 New Revision: 66281 URL: http://svn.reactos.org/svn/reactos?rev=66281&view=rev Log: [KMTESTS] - Add KmtGetSystemRoutineAddress and use it to avoid importing functions that are not available in some versions of Windows. This allows running kmtests on Windows XP SP3 (and probably Server 2003 SP0/SP2). Note that failures on XP are still not valid bugs, this is purely for convenience! Dedicated to Jérôme. ROSTESTS-150 Modified: trunk/rostests/kmtests/include/kmt_test.h trunk/rostests/kmtests/include/kmt_test_kernel.h trunk/rostests/kmtests/kmtest_drv/testlist.c trunk/rostests/kmtests/ntos_ex/ExFastMutex.c trunk/rostests/kmtests/ntos_ex/ExResource.c trunk/rostests/kmtests/ntos_ke/KeApc.c trunk/rostests/kmtests/ntos_ke/KeGuardedMutex.c trunk/rostests/kmtests/ntos_ke/KeMutex.c trunk/rostests/kmtests/ntos_ke/KeSpinLock.c Modified: trunk/rostests/kmtests/include/kmt_test.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/include/kmt_test.… ============================================================================== --- trunk/rostests/kmtests/include/kmt_test.h [iso-8859-1] (original) +++ trunk/rostests/kmtests/include/kmt_test.h [iso-8859-1] Sun Feb 15 10:23:21 2015 @@ -132,6 +132,7 @@ BOOLEAN KmtAreInterruptsEnabled(VOID); ULONG KmtGetPoolTag(PVOID Memory); USHORT KmtGetPoolType(PVOID Memory); +PVOID KmtGetSystemRoutineAddress(IN PCWSTR RoutineName); PKTHREAD KmtStartThread(IN PKSTART_ROUTINE StartRoutine, IN PVOID StartContext OPTIONAL); VOID KmtFinishThread(IN PKTHREAD Thread OPTIONAL, IN PKEVENT Event OPTIONAL); #elif defined KMT_USER_MODE Modified: trunk/rostests/kmtests/include/kmt_test_kernel.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/include/kmt_test_… ============================================================================== --- trunk/rostests/kmtests/include/kmt_test_kernel.h [iso-8859-1] (original) +++ trunk/rostests/kmtests/include/kmt_test_kernel.h [iso-8859-1] Sun Feb 15 10:23:21 2015 @@ -126,6 +126,13 @@ return Header->PoolType; } +PVOID KmtGetSystemRoutineAddress(IN PCWSTR RoutineName) +{ + UNICODE_STRING RoutineNameString; + RtlInitUnicodeString(&RoutineNameString, (PWSTR)RoutineName); + return MmGetSystemRoutineAddress(&RoutineNameString); +} + PKTHREAD KmtStartThread(IN PKSTART_ROUTINE StartRoutine, IN PVOID StartContext OPTIONAL) { NTSTATUS Status; Modified: trunk/rostests/kmtests/kmtest_drv/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kmtest_drv/testli… ============================================================================== --- trunk/rostests/kmtests/kmtest_drv/testlist.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/kmtest_drv/testlist.c [iso-8859-1] Sun Feb 15 10:23:21 2015 @@ -94,7 +94,7 @@ { "KeIrql", Test_KeIrql }, { "KeMutex", Test_KeMutex }, { "-KeProcessor", Test_KeProcessor }, - { "KeSpinLock", Test_KeSpinLock }, + { "KeSpinLock", Test_KeSpinLock }, { "KeTimer", Test_KeTimer }, { "-KernelType", Test_KernelType }, { "MmSection", Test_MmSection }, Modified: trunk/rostests/kmtests/ntos_ex/ExFastMutex.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_ex/ExFastMut… ============================================================================== --- trunk/rostests/kmtests/ntos_ex/ExFastMutex.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_ex/ExFastMutex.c [iso-8859-1] Sun Feb 15 10:23:21 2015 @@ -10,9 +10,23 @@ //#define NDEBUG #include <debug.h> -NTKERNELAPI VOID FASTCALL ExiAcquireFastMutex(IN OUT PFAST_MUTEX FastMutex); -NTKERNELAPI VOID FASTCALL ExiReleaseFastMutex(IN OUT PFAST_MUTEX FastMutex); -NTKERNELAPI BOOLEAN FASTCALL ExiTryToAcquireFastMutex(IN OUT PFAST_MUTEX FastMutex); +static +VOID +(FASTCALL +*pExEnterCriticalRegionAndAcquireFastMutexUnsafe)( + _Inout_ PFAST_MUTEX FastMutex +); + +static +VOID +(FASTCALL +*pExReleaseFastMutexUnsafeAndLeaveCriticalRegion)( + _Inout_ PFAST_MUTEX FastMutex +); + +static VOID (FASTCALL *pExiAcquireFastMutex)(IN OUT PFAST_MUTEX FastMutex); +static VOID (FASTCALL *pExiReleaseFastMutex)(IN OUT PFAST_MUTEX FastMutex); +static BOOLEAN (FASTCALL *pExiTryToAcquireFastMutex)(IN OUT PFAST_MUTEX FastMutex); #define CheckMutex(Mutex, ExpectedCount, ExpectedOwner, \ ExpectedContention, ExpectedOldIrql, \ @@ -44,15 +58,18 @@ ExReleaseFastMutex(Mutex); CheckMutex(Mutex, 1L, NULL, 0LU, OriginalIrql, OriginalIrql); -#ifdef _M_IX86 /* ntoskrnl's fastcall version */ - ExiAcquireFastMutex(Mutex); - CheckMutex(Mutex, 0L, Thread, 0LU, OriginalIrql, APC_LEVEL); - ok_bool_false(ExiTryToAcquireFastMutex(Mutex), "ExiTryToAcquireFastMutex returned"); - CheckMutex(Mutex, 0L, Thread, 0LU, OriginalIrql, APC_LEVEL); - ExiReleaseFastMutex(Mutex); - CheckMutex(Mutex, 1L, NULL, 0LU, OriginalIrql, OriginalIrql); -#endif + if (!skip(pExiAcquireFastMutex && + pExiReleaseFastMutex && + pExiTryToAcquireFastMutex, "No fastcall fast mutex functions\n")) + { + pExiAcquireFastMutex(Mutex); + CheckMutex(Mutex, 0L, Thread, 0LU, OriginalIrql, APC_LEVEL); + ok_bool_false(pExiTryToAcquireFastMutex(Mutex), "ExiTryToAcquireFastMutex returned"); + CheckMutex(Mutex, 0L, Thread, 0LU, OriginalIrql, APC_LEVEL); + pExiReleaseFastMutex(Mutex); + CheckMutex(Mutex, 1L, NULL, 0LU, OriginalIrql, OriginalIrql); + } /* try to acquire */ ok_bool_true(ExTryToAcquireFastMutex(Mutex), "ExTryToAcquireFastMutex returned"); @@ -61,9 +78,14 @@ CheckMutex(Mutex, 1L, NULL, 0LU, OriginalIrql, OriginalIrql); /* shortcut functions with critical region */ - ExEnterCriticalRegionAndAcquireFastMutexUnsafe(Mutex); - ok_bool_true(KeAreApcsDisabled(), "KeAreApcsDisabled returned"); - ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(Mutex); + if (!skip(pExEnterCriticalRegionAndAcquireFastMutexUnsafe && + pExReleaseFastMutexUnsafeAndLeaveCriticalRegion, + "Shortcut functions not available")) + { + pExEnterCriticalRegionAndAcquireFastMutexUnsafe(Mutex); + ok_bool_true(KeAreApcsDisabled(), "KeAreApcsDisabled returned"); + pExReleaseFastMutexUnsafeAndLeaveCriticalRegion(Mutex); + } /* acquire/release unsafe */ if (!KmtIsCheckedBuild || OriginalIrql == APC_LEVEL) @@ -291,6 +313,13 @@ FAST_MUTEX Mutex; KIRQL Irql; + pExEnterCriticalRegionAndAcquireFastMutexUnsafe = KmtGetSystemRoutineAddress(L"ExEnterCriticalRegionAndAcquireFastMutexUnsafe"); + pExReleaseFastMutexUnsafeAndLeaveCriticalRegion = KmtGetSystemRoutineAddress(L"ExReleaseFastMutexUnsafeAndLeaveCriticalRegion"); + + pExiAcquireFastMutex = KmtGetSystemRoutineAddress(L"ExiAcquireFastMutex"); + pExiReleaseFastMutex = KmtGetSystemRoutineAddress(L"ExiReleaseFastMutex"); + pExiTryToAcquireFastMutex = KmtGetSystemRoutineAddress(L"ExiTryToAcquireFastMutex"); + memset(&Mutex, 0x55, sizeof Mutex); ExInitializeFastMutex(&Mutex); CheckMutex(&Mutex, 1L, NULL, 0LU, 0x55555555LU, PASSIVE_LEVEL); Modified: trunk/rostests/kmtests/ntos_ex/ExResource.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_ex/ExResourc… ============================================================================== --- trunk/rostests/kmtests/ntos_ex/ExResource.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_ex/ExResource.c [iso-8859-1] Sun Feb 15 10:23:21 2015 @@ -9,6 +9,49 @@ //#define NDEBUG #include <debug.h> + +static +_IRQL_requires_max_(APC_LEVEL) +_Acquires_lock_(_Global_critical_region_) +PVOID +(NTAPI +*pExEnterCriticalRegionAndAcquireResourceShared)( + _Inout_ _Requires_lock_not_held_(*_Curr_) _Acquires_shared_lock_(*_Curr_) + PERESOURCE Resource); + +static +_IRQL_requires_max_(APC_LEVEL) +_Acquires_lock_(_Global_critical_region_) +PVOID +(NTAPI +*pExEnterCriticalRegionAndAcquireResourceExclusive)( + _Inout_ _Requires_lock_not_held_(*_Curr_) _Acquires_exclusive_lock_(*_Curr_) + PERESOURCE Resource); + +static +_IRQL_requires_max_(APC_LEVEL) +_Acquires_lock_(_Global_critical_region_) +PVOID +(NTAPI +*pExEnterCriticalRegionAndAcquireSharedWaitForExclusive)( + _Inout_ _Requires_lock_not_held_(*_Curr_) _Acquires_lock_(*_Curr_) + PERESOURCE Resource); + +static +_IRQL_requires_max_(DISPATCH_LEVEL) +_Releases_lock_(_Global_critical_region_) +VOID +(FASTCALL +*pExReleaseResourceAndLeaveCriticalRegion)( + _Inout_ _Requires_lock_held_(*_Curr_) _Releases_lock_(*_Curr_) + PERESOURCE Resource); + +static +_IRQL_requires_min_(PASSIVE_LEVEL) +_IRQL_requires_max_(DISPATCH_LEVEL) +BOOLEAN +(NTAPI +*pKeAreAllApcsDisabled)(VOID); /* TODO: This is getting pretty long, make it somehow easier to read if possible */ @@ -137,65 +180,83 @@ LONG Count = 0; ok_bool_false(KeAreApcsDisabled(), "KeAreApcsDisabled returned"); - ok_eq_uint(KeAreAllApcsDisabled(), AreApcsDisabled); - + if (pKeAreAllApcsDisabled) + ok_eq_uint(pKeAreAllApcsDisabled(), AreApcsDisabled); + + if (skip(pExEnterCriticalRegionAndAcquireResourceShared && + pExEnterCriticalRegionAndAcquireSharedWaitForExclusive && + pExEnterCriticalRegionAndAcquireResourceExclusive && + pExReleaseResourceAndLeaveCriticalRegion, "No shortcuts\n")) + { + return; + } /* ExEnterCriticalRegionAndAcquireResourceShared, ExEnterCriticalRegionAndAcquireSharedWaitForExclusive */ Count = 0; - Ret = ExEnterCriticalRegionAndAcquireResourceShared(Res); ++Count; + Ret = pExEnterCriticalRegionAndAcquireResourceShared(Res); ++Count; ok_eq_pointer(Ret, KeGetCurrentThread()->Win32Thread); ok_bool_true(KeAreApcsDisabled(), "KeAreApcsDisabled returned"); - ok_eq_bool(KeAreAllApcsDisabled(), AreApcsDisabled); - CheckResourceStatus(Res, FALSE, Count, 0LU, 0LU); - - Ret = ExEnterCriticalRegionAndAcquireResourceShared(Res); ++Count; + if (pKeAreAllApcsDisabled) + ok_eq_bool(pKeAreAllApcsDisabled(), AreApcsDisabled); + CheckResourceStatus(Res, FALSE, Count, 0LU, 0LU); + + Ret = pExEnterCriticalRegionAndAcquireResourceShared(Res); ++Count; ok_eq_pointer(Ret, KeGetCurrentThread()->Win32Thread); ok_bool_true(KeAreApcsDisabled(), "KeAreApcsDisabled returned"); - ok_eq_bool(KeAreAllApcsDisabled(), AreApcsDisabled); - CheckResourceStatus(Res, FALSE, Count, 0LU, 0LU); - - ExEnterCriticalRegionAndAcquireSharedWaitForExclusive(Res); ++Count; + if (pKeAreAllApcsDisabled) + ok_eq_bool(pKeAreAllApcsDisabled(), AreApcsDisabled); + CheckResourceStatus(Res, FALSE, Count, 0LU, 0LU); + + pExEnterCriticalRegionAndAcquireSharedWaitForExclusive(Res); ++Count; ok_eq_pointer(Ret, KeGetCurrentThread()->Win32Thread); ok_bool_true(KeAreApcsDisabled(), "KeAreApcsDisabled returned"); - ok_eq_bool(KeAreAllApcsDisabled(), AreApcsDisabled); + if (pKeAreAllApcsDisabled) + ok_eq_bool(pKeAreAllApcsDisabled(), AreApcsDisabled); CheckResourceStatus(Res, FALSE, Count, 0LU, 0LU); while (Count-- > 1) { - ExReleaseResourceAndLeaveCriticalRegion(Res); + pExReleaseResourceAndLeaveCriticalRegion(Res); ok_bool_true(KeAreApcsDisabled(), "KeAreApcsDisabled returned"); - ok_eq_bool(KeAreAllApcsDisabled(), AreApcsDisabled); + if (pKeAreAllApcsDisabled) + ok_eq_bool(pKeAreAllApcsDisabled(), AreApcsDisabled); CheckResourceStatus(Res, FALSE, Count, 0LU, 0LU); } - ExReleaseResourceAndLeaveCriticalRegion(Res); + pExReleaseResourceAndLeaveCriticalRegion(Res); ok_bool_false(KeAreApcsDisabled(), "KeAreApcsDisabled returned"); - ok_eq_bool(KeAreAllApcsDisabled(), AreApcsDisabled); + if (pKeAreAllApcsDisabled) + ok_eq_bool(pKeAreAllApcsDisabled(), AreApcsDisabled); CheckResourceStatus(Res, FALSE, Count, 0LU, 0LU); /* ExEnterCriticalRegionAndAcquireResourceExclusive */ Count = 0; ok_bool_false(KeAreApcsDisabled(), "KeAreApcsDisabled returned"); - ok_eq_bool(KeAreAllApcsDisabled(), AreApcsDisabled); - Ret = ExEnterCriticalRegionAndAcquireResourceExclusive(Res); ++Count; + if (pKeAreAllApcsDisabled) + ok_eq_bool(pKeAreAllApcsDisabled(), AreApcsDisabled); + Ret = pExEnterCriticalRegionAndAcquireResourceExclusive(Res); ++Count; ok_eq_pointer(Ret, KeGetCurrentThread()->Win32Thread); ok_bool_true(KeAreApcsDisabled(), "KeAreApcsDisabled returned"); - ok_eq_bool(KeAreAllApcsDisabled(), AreApcsDisabled); + if (pKeAreAllApcsDisabled) + ok_eq_bool(pKeAreAllApcsDisabled(), AreApcsDisabled); CheckResourceStatus(Res, TRUE, Count, 0LU, 0LU); - Ret = ExEnterCriticalRegionAndAcquireResourceExclusive(Res); ++Count; + Ret = pExEnterCriticalRegionAndAcquireResourceExclusive(Res); ++Count; ok_eq_pointer(Ret, KeGetCurrentThread()->Win32Thread); ok_bool_true(KeAreApcsDisabled(), "KeAreApcsDisabled returned"); - ok_eq_bool(KeAreAllApcsDisabled(), AreApcsDisabled); + if (pKeAreAllApcsDisabled) + ok_eq_bool(pKeAreAllApcsDisabled(), AreApcsDisabled); CheckResourceStatus(Res, TRUE, Count, 0LU, 0LU); - ExReleaseResourceAndLeaveCriticalRegion(Res); --Count; + pExReleaseResourceAndLeaveCriticalRegion(Res); --Count; ok_bool_true(KeAreApcsDisabled(), "KeAreApcsDisabled returned"); - ok_eq_bool(KeAreAllApcsDisabled(), AreApcsDisabled); + if (pKeAreAllApcsDisabled) + ok_eq_bool(pKeAreAllApcsDisabled(), AreApcsDisabled); CheckResourceStatus(Res, TRUE, Count, 0LU, 0LU); - ExReleaseResourceAndLeaveCriticalRegion(Res); --Count; + pExReleaseResourceAndLeaveCriticalRegion(Res); --Count; ok_bool_false(KeAreApcsDisabled(), "KeAreApcsDisabled returned"); - ok_eq_uint(KeAreAllApcsDisabled(), AreApcsDisabled); + if (pKeAreAllApcsDisabled) + ok_eq_uint(pKeAreAllApcsDisabled(), AreApcsDisabled); CheckResourceStatus(Res, FALSE, Count, 0LU, 0LU); } @@ -400,6 +461,17 @@ ERESOURCE Res; KIRQL Irql; + pExEnterCriticalRegionAndAcquireResourceShared = KmtGetSystemRoutineAddress(L"ExEnterCriticalRegionAndAcquireResourceShared"); + pExEnterCriticalRegionAndAcquireSharedWaitForExclusive = KmtGetSystemRoutineAddress(L"ExEnterCriticalRegionAndAcquireSharedWaitForExclusive"); + pExEnterCriticalRegionAndAcquireResourceExclusive = KmtGetSystemRoutineAddress(L"ExEnterCriticalRegionAndAcquireResourceExclusive"); + pExReleaseResourceAndLeaveCriticalRegion = KmtGetSystemRoutineAddress(L"ExReleaseResourceAndLeaveCriticalRegion"); + pKeAreAllApcsDisabled = KmtGetSystemRoutineAddress(L"KeAreAllApcsDisabled"); + + if (skip(pKeAreAllApcsDisabled != NULL, "KeAreAllApcsDisabled unavailable\n")) + { + /* We can live without this function here */ + } + /* this must be true even with the different structure versions */ ASSERT(sizeof(ERESOURCE) == sizeof(ERESOURCE_2K3)); Modified: trunk/rostests/kmtests/ntos_ke/KeApc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_ke/KeApc.c?r… ============================================================================== --- trunk/rostests/kmtests/ntos_ke/KeApc.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_ke/KeApc.c [iso-8859-1] Sun Feb 15 10:23:21 2015 @@ -7,11 +7,33 @@ #include <kmt_test.h> +static +_IRQL_requires_min_(PASSIVE_LEVEL) +_IRQL_requires_max_(DISPATCH_LEVEL) +BOOLEAN +(NTAPI +*pKeAreAllApcsDisabled)(VOID); + +static +_Acquires_lock_(_Global_critical_region_) +_IRQL_requires_max_(APC_LEVEL) +VOID +(NTAPI +*pKeEnterGuardedRegion)(VOID); + +static +_Releases_lock_(_Global_critical_region_) +_IRQL_requires_max_(APC_LEVEL) +VOID +(NTAPI +*pKeLeaveGuardedRegion)(VOID); + #define CheckApcs(KernelApcsDisabled, SpecialApcsDisabled, AllApcsDisabled, Irql) do \ { \ ok_eq_bool(KeAreApcsDisabled(), KernelApcsDisabled || SpecialApcsDisabled); \ ok_eq_int(Thread->KernelApcDisable, KernelApcsDisabled); \ - ok_eq_bool(KeAreAllApcsDisabled(), AllApcsDisabled); \ + if (pKeAreAllApcsDisabled) \ + ok_eq_bool(pKeAreAllApcsDisabled(), AllApcsDisabled); \ ok_eq_int(Thread->SpecialApcDisable, SpecialApcsDisabled); \ ok_irql(Irql); \ } while (0) @@ -19,7 +41,18 @@ START_TEST(KeApc) { KIRQL Irql; - PKTHREAD Thread = KeGetCurrentThread(); + PKTHREAD Thread; + + pKeAreAllApcsDisabled = KmtGetSystemRoutineAddress(L"KeAreAllApcsDisabled"); + pKeEnterGuardedRegion = KmtGetSystemRoutineAddress(L"KeEnterGuardedRegion"); + pKeLeaveGuardedRegion = KmtGetSystemRoutineAddress(L"KeLeaveGuardedRegion"); + + if (skip(pKeAreAllApcsDisabled != NULL, "KeAreAllApcsDisabled unavailable\n")) + { + /* We can live without this function here */ + } + + Thread = KeGetCurrentThread(); CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); @@ -38,37 +71,41 @@ CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); /* guarded region */ - KeEnterGuardedRegion(); - CheckApcs(0, -1, TRUE, PASSIVE_LEVEL); - KeEnterGuardedRegion(); - CheckApcs(0, -2, TRUE, PASSIVE_LEVEL); - KeEnterGuardedRegion(); - CheckApcs(0, -3, TRUE, PASSIVE_LEVEL); - KeLeaveGuardedRegion(); - CheckApcs(0, -2, TRUE, PASSIVE_LEVEL); - KeLeaveGuardedRegion(); - CheckApcs(0, -1, TRUE, PASSIVE_LEVEL); - KeLeaveGuardedRegion(); - CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); - - /* mix them */ - KeEnterGuardedRegion(); - CheckApcs(0, -1, TRUE, PASSIVE_LEVEL); - KeEnterCriticalRegion(); - CheckApcs(-1, -1, TRUE, PASSIVE_LEVEL); - KeLeaveCriticalRegion(); - CheckApcs(0, -1, TRUE, PASSIVE_LEVEL); - KeLeaveGuardedRegion(); - CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); - - KeEnterCriticalRegion(); - CheckApcs(-1, 0, FALSE, PASSIVE_LEVEL); - KeEnterGuardedRegion(); - CheckApcs(-1, -1, TRUE, PASSIVE_LEVEL); - KeLeaveGuardedRegion(); - CheckApcs(-1, 0, FALSE, PASSIVE_LEVEL); - KeLeaveCriticalRegion(); - CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); + if (!skip(pKeEnterGuardedRegion && + pKeLeaveGuardedRegion, "Guarded regions not available\n")) + { + pKeEnterGuardedRegion(); + CheckApcs(0, -1, TRUE, PASSIVE_LEVEL); + pKeEnterGuardedRegion(); + CheckApcs(0, -2, TRUE, PASSIVE_LEVEL); + pKeEnterGuardedRegion(); + CheckApcs(0, -3, TRUE, PASSIVE_LEVEL); + pKeLeaveGuardedRegion(); + CheckApcs(0, -2, TRUE, PASSIVE_LEVEL); + pKeLeaveGuardedRegion(); + CheckApcs(0, -1, TRUE, PASSIVE_LEVEL); + pKeLeaveGuardedRegion(); + CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); + + /* mix them */ + pKeEnterGuardedRegion(); + CheckApcs(0, -1, TRUE, PASSIVE_LEVEL); + KeEnterCriticalRegion(); + CheckApcs(-1, -1, TRUE, PASSIVE_LEVEL); + KeLeaveCriticalRegion(); + CheckApcs(0, -1, TRUE, PASSIVE_LEVEL); + pKeLeaveGuardedRegion(); + CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); + + KeEnterCriticalRegion(); + CheckApcs(-1, 0, FALSE, PASSIVE_LEVEL); + pKeEnterGuardedRegion(); + CheckApcs(-1, -1, TRUE, PASSIVE_LEVEL); + pKeLeaveGuardedRegion(); + CheckApcs(-1, 0, FALSE, PASSIVE_LEVEL); + KeLeaveCriticalRegion(); + CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); + } /* leave without entering */ if (!KmtIsCheckedBuild) @@ -78,19 +115,23 @@ KeEnterCriticalRegion(); CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); - KeLeaveGuardedRegion(); - CheckApcs(0, 1, TRUE, PASSIVE_LEVEL); - KeEnterGuardedRegion(); - CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); - - KeLeaveCriticalRegion(); - CheckApcs(1, 0, FALSE, PASSIVE_LEVEL); - KeLeaveGuardedRegion(); - CheckApcs(1, 1, TRUE, PASSIVE_LEVEL); - KeEnterCriticalRegion(); - CheckApcs(0, 1, TRUE, PASSIVE_LEVEL); - KeEnterGuardedRegion(); - CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); + if (!skip(pKeEnterGuardedRegion && + pKeLeaveGuardedRegion, "Guarded regions not available\n")) + { + pKeLeaveGuardedRegion(); + CheckApcs(0, 1, TRUE, PASSIVE_LEVEL); + pKeEnterGuardedRegion(); + CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); + + KeLeaveCriticalRegion(); + CheckApcs(1, 0, FALSE, PASSIVE_LEVEL); + pKeLeaveGuardedRegion(); + CheckApcs(1, 1, TRUE, PASSIVE_LEVEL); + KeEnterCriticalRegion(); + CheckApcs(0, 1, TRUE, PASSIVE_LEVEL); + pKeEnterGuardedRegion(); + CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); + } } /* manually disable APCs */ @@ -130,38 +171,42 @@ CheckApcs(0, 0, TRUE, HIGH_LEVEL); /* Ke*GuardedRegion assert at > APC_LEVEL */ - if (!KmtIsCheckedBuild) + if (!KmtIsCheckedBuild && + !skip(pKeEnterGuardedRegion && + pKeLeaveGuardedRegion, "Guarded regions not available\n")) { - KeEnterGuardedRegion(); + pKeEnterGuardedRegion(); CheckApcs(0, -1, TRUE, HIGH_LEVEL); - KeLeaveGuardedRegion(); + pKeLeaveGuardedRegion(); } CheckApcs(0, 0, TRUE, HIGH_LEVEL); KeLowerIrql(Irql); CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); - if (!KmtIsCheckedBuild) + if (!KmtIsCheckedBuild && + !skip(pKeEnterGuardedRegion && + pKeLeaveGuardedRegion, "Guarded regions not available\n")) { KeRaiseIrql(HIGH_LEVEL, &Irql); CheckApcs(0, 0, TRUE, HIGH_LEVEL); KeEnterCriticalRegion(); CheckApcs(-1, 0, TRUE, HIGH_LEVEL); - KeEnterGuardedRegion(); + pKeEnterGuardedRegion(); CheckApcs(-1, -1, TRUE, HIGH_LEVEL); KeLowerIrql(Irql); CheckApcs(-1, -1, TRUE, PASSIVE_LEVEL); KeLeaveCriticalRegion(); CheckApcs(0, -1, TRUE, PASSIVE_LEVEL); - KeLeaveGuardedRegion(); - CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); - - KeEnterGuardedRegion(); + pKeLeaveGuardedRegion(); + CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); + + pKeEnterGuardedRegion(); CheckApcs(0, -1, TRUE, PASSIVE_LEVEL); KeRaiseIrql(HIGH_LEVEL, &Irql); CheckApcs(0, -1, TRUE, HIGH_LEVEL); KeEnterCriticalRegion(); CheckApcs(-1, -1, TRUE, HIGH_LEVEL); - KeLeaveGuardedRegion(); + pKeLeaveGuardedRegion(); CheckApcs(-1, 0, TRUE, HIGH_LEVEL); KeLowerIrql(Irql); CheckApcs(-1, 0, FALSE, PASSIVE_LEVEL); @@ -172,13 +217,13 @@ CheckApcs(-1, 0, FALSE, PASSIVE_LEVEL); KeRaiseIrql(HIGH_LEVEL, &Irql); CheckApcs(-1, 0, TRUE, HIGH_LEVEL); - KeEnterGuardedRegion(); + pKeEnterGuardedRegion(); CheckApcs(-1, -1, TRUE, HIGH_LEVEL); KeLeaveCriticalRegion(); CheckApcs(0, -1, TRUE, HIGH_LEVEL); KeLowerIrql(Irql); CheckApcs(0, -1, TRUE, PASSIVE_LEVEL); - KeLeaveGuardedRegion(); + pKeLeaveGuardedRegion(); CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); } Modified: trunk/rostests/kmtests/ntos_ke/KeGuardedMutex.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_ke/KeGuarded… ============================================================================== --- trunk/rostests/kmtests/ntos_ke/KeGuardedMutex.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_ke/KeGuardedMutex.c [iso-8859-1] Sun Feb 15 10:23:21 2015 @@ -9,6 +9,86 @@ #define NDEBUG #include <debug.h> + +static +_IRQL_requires_min_(PASSIVE_LEVEL) +_IRQL_requires_max_(DISPATCH_LEVEL) +BOOLEAN +(NTAPI +*pKeAreAllApcsDisabled)(VOID); + +static +_Acquires_lock_(_Global_critical_region_) +_Requires_lock_not_held_(*Mutex) +_Acquires_lock_(*Mutex) +_IRQL_requires_max_(APC_LEVEL) +_IRQL_requires_min_(PASSIVE_LEVEL) +VOID +(FASTCALL +*pKeAcquireGuardedMutex)( + _Inout_ PKGUARDED_MUTEX GuardedMutex); + +static +_Requires_lock_not_held_(*FastMutex) +_Acquires_lock_(*FastMutex) +_IRQL_requires_max_(APC_LEVEL) +_IRQL_requires_min_(PASSIVE_LEVEL) +VOID +(FASTCALL +*pKeAcquireGuardedMutexUnsafe)( + _Inout_ PKGUARDED_MUTEX GuardedMutex); + +static +_Acquires_lock_(_Global_critical_region_) +_IRQL_requires_max_(APC_LEVEL) +VOID +(NTAPI +*pKeEnterGuardedRegion)(VOID); + +static +_Releases_lock_(_Global_critical_region_) +_IRQL_requires_max_(APC_LEVEL) +VOID +(NTAPI +*pKeLeaveGuardedRegion)(VOID); + +static +_IRQL_requires_max_(APC_LEVEL) +_IRQL_requires_min_(PASSIVE_LEVEL) +VOID +(FASTCALL +*pKeInitializeGuardedMutex)( + _Out_ PKGUARDED_MUTEX GuardedMutex); + +static +_Requires_lock_held_(*FastMutex) +_Releases_lock_(*FastMutex) +_IRQL_requires_max_(APC_LEVEL) +VOID +(FASTCALL +*pKeReleaseGuardedMutexUnsafe)( + _Inout_ PKGUARDED_MUTEX GuardedMutex); + +static +_Releases_lock_(_Global_critical_region_) +_Requires_lock_held_(*Mutex) +_Releases_lock_(*Mutex) +_IRQL_requires_max_(APC_LEVEL) +VOID +(FASTCALL +*pKeReleaseGuardedMutex)( + _Inout_ PKGUARDED_MUTEX GuardedMutex); + +static +_Must_inspect_result_ +_Success_(return != FALSE) +_IRQL_requires_max_(APC_LEVEL) +_Post_satisfies_(return == 1 || return == 0) +BOOLEAN +(FASTCALL +*pKeTryToAcquireGuardedMutex)( + _When_ (return, _Requires_lock_not_held_(*_Curr_) _Acquires_exclusive_lock_(*_Curr_)) _Acquires_lock_(_Global_critical_region_) + _Inout_ PKGUARDED_MUTEX GuardedMutex); #define CheckMutex(Mutex, ExpectedCount, ExpectedOwner, ExpectedContention, \ ExpectedKernelApcDisable, ExpectedSpecialApcDisable, \ @@ -25,7 +105,7 @@ ok_eq_int((Mutex)->SpecialApcDisable, 0x5555); \ ok_eq_bool(KeAreApcsDisabled(), KernelApcsDisabled || SpecialApcsDisabled); \ ok_eq_int(Thread->KernelApcDisable, KernelApcsDisabled); \ - ok_eq_bool(KeAreAllApcsDisabled(), AllApcsDisabled); \ + ok_eq_bool(pKeAreAllApcsDisabled(), AllApcsDisabled); \ ok_eq_int(Thread->SpecialApcDisable, SpecialApcsDisabled); \ ok_irql(ExpectedIrql); \ } while (0) @@ -48,17 +128,17 @@ if (!KmtIsCheckedBuild || OriginalIrql <= APC_LEVEL) { /* acquire/release normally */ - KeAcquireGuardedMutex(Mutex); + pKeAcquireGuardedMutex(Mutex); CheckMutex(Mutex, 0L, Thread, 0LU, 0x5555, SpecialApcsDisabled - 1, KernelApcsDisabled, SpecialApcsDisabled - 1, TRUE, OriginalIrql); - ok_bool_false(KeTryToAcquireGuardedMutex(Mutex), "KeTryToAcquireGuardedMutex returned"); + ok_bool_false(pKeTryToAcquireGuardedMutex(Mutex), "KeTryToAcquireGuardedMutex returned"); CheckMutex(Mutex, 0L, Thread, 0LU, 0x5555, SpecialApcsDisabled - 1, KernelApcsDisabled, SpecialApcsDisabled - 1, TRUE, OriginalIrql); - KeReleaseGuardedMutex(Mutex); + pKeReleaseGuardedMutex(Mutex); CheckMutex(Mutex, 1L, NULL, 0LU, 0x5555, SpecialApcsDisabled - 1, KernelApcsDisabled, SpecialApcsDisabled, AllApcsDisabled, OriginalIrql); /* try to acquire */ - ok_bool_true(KeTryToAcquireGuardedMutex(Mutex), "KeTryToAcquireGuardedMutex returned"); + ok_bool_true(pKeTryToAcquireGuardedMutex(Mutex), "KeTryToAcquireGuardedMutex returned"); CheckMutex(Mutex, 0L, Thread, 0LU, 0x5555, SpecialApcsDisabled - 1, KernelApcsDisabled, SpecialApcsDisabled - 1, TRUE, OriginalIrql); - KeReleaseGuardedMutex(Mutex); + pKeReleaseGuardedMutex(Mutex); CheckMutex(Mutex, 1L, NULL, 0LU, 0x5555, SpecialApcsDisabled - 1, KernelApcsDisabled, SpecialApcsDisabled, AllApcsDisabled, OriginalIrql); } else @@ -69,9 +149,9 @@ if (!KmtIsCheckedBuild || OriginalIrql == APC_LEVEL || SpecialApcsDisabled < 0) { /* acquire/release unsafe */ - KeAcquireGuardedMutexUnsafe(Mutex); + pKeAcquireGuardedMutexUnsafe(Mutex); CheckMutex(Mutex, 0L, Thread, 0LU, 0x5555, SpecialApcsDisabled - 1, KernelApcsDisabled, SpecialApcsDisabled, AllApcsDisabled, OriginalIrql); - KeReleaseGuardedMutexUnsafe(Mutex); + pKeReleaseGuardedMutexUnsafe(Mutex); CheckMutex(Mutex, 1L, NULL, 0LU, 0x5555, SpecialApcsDisabled - 1, KernelApcsDisabled, SpecialApcsDisabled, AllApcsDisabled, OriginalIrql); } @@ -79,29 +159,29 @@ if (!KmtIsCheckedBuild) { /* mismatched acquire/release */ - KeAcquireGuardedMutex(Mutex); + pKeAcquireGuardedMutex(Mutex); CheckMutex(Mutex, 0L, Thread, 0LU, 0x5555, SpecialApcsDisabled - 1, KernelApcsDisabled, SpecialApcsDisabled - 1, TRUE, OriginalIrql); - KeReleaseGuardedMutexUnsafe(Mutex); + pKeReleaseGuardedMutexUnsafe(Mutex); CheckMutex(Mutex, 1L, NULL, 0LU, 0x5555, SpecialApcsDisabled - 1, KernelApcsDisabled, SpecialApcsDisabled - 1, TRUE, OriginalIrql); - KeLeaveGuardedRegion(); + pKeLeaveGuardedRegion(); CheckMutex(Mutex, 1L, NULL, 0LU, 0x5555, SpecialApcsDisabled - 1, KernelApcsDisabled, SpecialApcsDisabled, AllApcsDisabled, OriginalIrql); - KeAcquireGuardedMutexUnsafe(Mutex); + pKeAcquireGuardedMutexUnsafe(Mutex); CheckMutex(Mutex, 0L, Thread, 0LU, 0x5555, SpecialApcsDisabled - 1, KernelApcsDisabled, SpecialApcsDisabled, AllApcsDisabled, OriginalIrql); - KeReleaseGuardedMutex(Mutex); + pKeReleaseGuardedMutex(Mutex); CheckMutex(Mutex, 1L, NULL, 0LU, 0x5555, SpecialApcsDisabled - 1, KernelApcsDisabled, SpecialApcsDisabled + 1, OriginalIrql >= APC_LEVEL || SpecialApcsDisabled != -1, OriginalIrql); - KeEnterGuardedRegion(); + pKeEnterGuardedRegion(); CheckMutex(Mutex, 1L, NULL, 0LU, 0x5555, SpecialApcsDisabled - 1, KernelApcsDisabled, SpecialApcsDisabled, AllApcsDisabled, OriginalIrql); /* release without acquire */ - KeReleaseGuardedMutexUnsafe(Mutex); + pKeReleaseGuardedMutexUnsafe(Mutex); CheckMutex(Mutex, 0L, NULL, 0LU, 0x5555, SpecialApcsDisabled - 1, KernelApcsDisabled, SpecialApcsDisabled, AllApcsDisabled, OriginalIrql); - KeReleaseGuardedMutex(Mutex); + pKeReleaseGuardedMutex(Mutex); CheckMutex(Mutex, 1L, NULL, 0LU, 0x5555, SpecialApcsDisabled, KernelApcsDisabled, SpecialApcsDisabled + 1, OriginalIrql >= APC_LEVEL || SpecialApcsDisabled != -1, OriginalIrql); - KeReleaseGuardedMutex(Mutex); + pKeReleaseGuardedMutex(Mutex); /* TODO: here we see that Mutex->Count isn't actually just a count. Test the bits correctly! */ CheckMutex(Mutex, 0L, NULL, 0LU, 0x5555, SpecialApcsDisabled, KernelApcsDisabled, SpecialApcsDisabled + 2, OriginalIrql >= APC_LEVEL || SpecialApcsDisabled != -2, OriginalIrql); - KeReleaseGuardedMutex(Mutex); + pKeReleaseGuardedMutex(Mutex); CheckMutex(Mutex, 1L, NULL, 0LU, 0x5555, SpecialApcsDisabled, KernelApcsDisabled, SpecialApcsDisabled + 3, OriginalIrql >= APC_LEVEL || SpecialApcsDisabled != -3, OriginalIrql); Thread->SpecialApcDisable -= 3; } @@ -242,10 +322,10 @@ LARGE_INTEGER Timeout; Timeout.QuadPart = -50 * 1000 * 10; /* 50 ms */ - InitThreadData(&ThreadData, Mutex, KeAcquireGuardedMutex, NULL, KeReleaseGuardedMutex); - InitThreadData(&ThreadData2, Mutex, KeAcquireGuardedMutex, NULL, KeReleaseGuardedMutex); - InitThreadData(&ThreadDataUnsafe, Mutex, KeAcquireGuardedMutexUnsafe, NULL, KeReleaseGuardedMutexUnsafe); - InitThreadData(&ThreadDataTry, Mutex, NULL, KeTryToAcquireGuardedMutex, KeReleaseGuardedMutex); + InitThreadData(&ThreadData, Mutex, pKeAcquireGuardedMutex, NULL, pKeReleaseGuardedMutex); + InitThreadData(&ThreadData2, Mutex, pKeAcquireGuardedMutex, NULL, pKeReleaseGuardedMutex); + InitThreadData(&ThreadDataUnsafe, Mutex, pKeAcquireGuardedMutexUnsafe, NULL, pKeReleaseGuardedMutexUnsafe); + InitThreadData(&ThreadDataTry, Mutex, NULL, pKeTryToAcquireGuardedMutex, pKeReleaseGuardedMutex); /* have a thread acquire the mutex */ Status = StartThread(&ThreadData, NULL, PASSIVE_LEVEL, FALSE, FALSE); @@ -337,6 +417,29 @@ }; int i; + pKeAreAllApcsDisabled = KmtGetSystemRoutineAddress(L"KeAreAllApcsDisabled"); + pKeInitializeGuardedMutex = KmtGetSystemRoutineAddress(L"KeInitializeGuardedMutex"); + pKeAcquireGuardedMutex = KmtGetSystemRoutineAddress(L"KeAcquireGuardedMutex"); + pKeAcquireGuardedMutexUnsafe = KmtGetSystemRoutineAddress(L"KeAcquireGuardedMutexUnsafe"); + pKeEnterGuardedRegion = KmtGetSystemRoutineAddress(L"KeEnterGuardedRegion"); + pKeLeaveGuardedRegion = KmtGetSystemRoutineAddress(L"KeLeaveGuardedRegion"); + pKeReleaseGuardedMutex = KmtGetSystemRoutineAddress(L"KeReleaseGuardedMutex"); + pKeReleaseGuardedMutexUnsafe = KmtGetSystemRoutineAddress(L"KeReleaseGuardedMutexUnsafe"); + pKeTryToAcquireGuardedMutex = KmtGetSystemRoutineAddress(L"KeTryToAcquireGuardedMutex"); + + if (skip(pKeAreAllApcsDisabled && + pKeInitializeGuardedMutex && + pKeAcquireGuardedMutex && + pKeAcquireGuardedMutexUnsafe && + pKeEnterGuardedRegion && + pKeLeaveGuardedRegion && + pKeReleaseGuardedMutex && + pKeReleaseGuardedMutexUnsafe && + pKeTryToAcquireGuardedMutex, "No guarded mutexes\n")) + { + return; + } + for (i = 0; i < sizeof TestIterations / sizeof TestIterations[0]; ++i) { trace("Run %d\n", i); @@ -345,7 +448,7 @@ Thread->SpecialApcDisable = TestIterations[i].SpecialApcsDisabled; RtlFillMemory(&Mutex, sizeof Mutex, 0x55); - KeInitializeGuardedMutex(&Mutex); + pKeInitializeGuardedMutex(&Mutex); CheckMutex(&Mutex, 1L, NULL, 0LU, 0x5555, 0x5555, TestIterations[i].KernelApcsDisabled, TestIterations[i].SpecialApcsDisabled, TestIterations[i].AllApcsDisabled, TestIterations[i].Irql); TestGuardedMutex(&Mutex, TestIterations[i].KernelApcsDisabled, TestIterations[i].SpecialApcsDisabled, TestIterations[i].AllApcsDisabled, TestIterations[i].Irql); @@ -356,6 +459,6 @@ trace("Concurrent test\n"); RtlFillMemory(&Mutex, sizeof Mutex, 0x55); - KeInitializeGuardedMutex(&Mutex); + pKeInitializeGuardedMutex(&Mutex); TestGuardedMutexConcurrent(&Mutex); } Modified: trunk/rostests/kmtests/ntos_ke/KeMutex.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_ke/KeMutex.c… ============================================================================== --- trunk/rostests/kmtests/ntos_ke/KeMutex.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_ke/KeMutex.c [iso-8859-1] Sun Feb 15 10:23:21 2015 @@ -6,6 +6,13 @@ */ #include <kmt_test.h> + +static +_IRQL_requires_min_(PASSIVE_LEVEL) +_IRQL_requires_max_(DISPATCH_LEVEL) +BOOLEAN +(NTAPI +*pKeAreAllApcsDisabled)(VOID); #define ULONGS_PER_POINTER (sizeof(PVOID) / sizeof(ULONG)) #define MUTANT_SIZE (2 + 6 * ULONGS_PER_POINTER) @@ -55,7 +62,8 @@ { \ ok_eq_bool(KeAreApcsDisabled(), KernelApcsDisabled || SpecialApcsDisabled); \ ok_eq_int(Thread->KernelApcDisable, KernelApcsDisabled); \ - ok_eq_bool(KeAreAllApcsDisabled(), AllApcsDisabled); \ + if (pKeAreAllApcsDisabled) \ + ok_eq_bool(pKeAreAllApcsDisabled(), AllApcsDisabled); \ ok_eq_int(Thread->SpecialApcDisable, SpecialApcsDisabled); \ ok_irql(Irql); \ } while (0) @@ -137,6 +145,12 @@ START_TEST(KeMutex) { + pKeAreAllApcsDisabled = KmtGetSystemRoutineAddress(L"KeAreAllApcsDisabled"); + if (skip(pKeAreAllApcsDisabled != NULL, "KeAreAllApcsDisabled unavailable\n")) + { + /* We can live without this function here */ + } + TestMutant(); TestMutex(); } Modified: trunk/rostests/kmtests/ntos_ke/KeSpinLock.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_ke/KeSpinLoc… ============================================================================== --- trunk/rostests/kmtests/ntos_ke/KeSpinLock.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_ke/KeSpinLock.c [iso-8859-1] Sun Feb 15 10:23:21 2015 @@ -20,19 +20,36 @@ //#define NDEBUG #include <debug.h> -/* TODO: these are documented for Vista+ */ -NTKERNELAPI +static +_Must_inspect_result_ +_IRQL_requires_min_(DISPATCH_LEVEL) +_Post_satisfies_(return == 1 || return == 0) +BOOLEAN +(FASTCALL +*pKeTryToAcquireSpinLockAtDpcLevel)( + _Inout_ _Requires_lock_not_held_(*_Curr_) + _When_(return!=0, _Acquires_lock_(*_Curr_)) + PKSPIN_LOCK SpinLock); + +static VOID -FASTCALL -KeAcquireInStackQueuedSpinLockForDpc( +(FASTCALL +*pKeAcquireInStackQueuedSpinLockForDpc)( IN OUT PKSPIN_LOCK SpinLock, OUT PKLOCK_QUEUE_HANDLE LockHandle); -NTKERNELAPI +static VOID -FASTCALL -KeReleaseInStackQueuedSpinLockForDpc( +(FASTCALL +*pKeReleaseInStackQueuedSpinLockForDpc)( IN PKLOCK_QUEUE_HANDLE LockHandle); + +static +_Must_inspect_result_ +BOOLEAN +(FASTCALL +*pKeTestSpinLock)( + _In_ PKSPIN_LOCK SpinLock); /* TODO: multiprocessor testing */ @@ -119,8 +136,8 @@ DEFINE_RELEASE(ReleaseForDpc, TRUE, KeReleaseSpinLockForDpc(SpinLock, CheckData->Irql)) #endif -DEFINE_ACQUIRE(AcquireInStackForDpc, FALSE, KeAcquireInStackQueuedSpinLockForDpc(SpinLock, &CheckData->QueueHandle)) -DEFINE_RELEASE(ReleaseInStackForDpc, FALSE, KeReleaseInStackQueuedSpinLockForDpc(&CheckData->QueueHandle)) +DEFINE_ACQUIRE(AcquireInStackForDpc, FALSE, pKeAcquireInStackQueuedSpinLockForDpc(SpinLock, &CheckData->QueueHandle)) +DEFINE_RELEASE(ReleaseInStackForDpc, FALSE, pKeReleaseInStackQueuedSpinLockForDpc(&CheckData->QueueHandle)) #ifdef _X86_ DEFINE_ACQUIRE(AcquireInt, FALSE, KiAcquireSpinLock(SpinLock)) @@ -142,7 +159,7 @@ return Ret; } BOOLEAN TryNoRaise(PKSPIN_LOCK SpinLock, PCHECK_DATA CheckData) { - BOOLEAN Ret = KeTryToAcquireSpinLockAtDpcLevel(SpinLock); + BOOLEAN Ret = pKeTryToAcquireSpinLockAtDpcLevel(SpinLock); return Ret; } @@ -197,7 +214,7 @@ #define CheckSpinLock(SpinLock, CheckData, Value) do \ { \ - BOOLEAN Ret = SpinLock ? KeTestSpinLock(SpinLock) : TRUE; \ + BOOLEAN Ret = SpinLock && pKeTestSpinLock ? pKeTestSpinLock(SpinLock) : TRUE; \ KIRQL ExpectedIrql = (CheckData)->OriginalIrql; \ \ switch ((CheckData)->Check) \ @@ -257,7 +274,10 @@ } if (CheckData->AcquireNoRaise && - (CheckData->OriginalIrql >= DISPATCH_LEVEL || !KmtIsCheckedBuild)) + (CheckData->OriginalIrql >= DISPATCH_LEVEL || !KmtIsCheckedBuild) && + (CheckData->AcquireNoRaise != AcquireInStackForDpc || + !skip(pKeAcquireInStackQueuedSpinLockForDpc && + pKeReleaseInStackQueuedSpinLockForDpc, "No DPC spinlock functions\n"))) { /* acquire/release without irql change */ CheckData->AcquireNoRaise(SpinLock, CheckData); @@ -279,7 +299,8 @@ CheckData->IsAcquired = FALSE; KmtSetIrql(CheckData->OriginalIrql); - if (CheckData->TryAcquireNoRaise) + if (CheckData->TryAcquireNoRaise && + !skip(pKeTryToAcquireSpinLockAtDpcLevel != NULL, "KeTryToAcquireSpinLockAtDpcLevel unavailable\n")) { CheckSpinLock(SpinLock, CheckData, 0); ok_bool_true(CheckData->TryAcquireNoRaise(SpinLock, CheckData), "TryAcquireNoRaise returned"); @@ -320,7 +341,14 @@ { CheckQueue, SynchIrql, AcquireQueuedSynch, ReleaseQueued, TryQueuedSynch, NULL, NULL, NULL, LockQueuePfnLock }, }; int i, iIrql; - PKPRCB Prcb = KeGetCurrentPrcb(); + PKPRCB Prcb; + + pKeTryToAcquireSpinLockAtDpcLevel = KmtGetSystemRoutineAddress(L"KeTryToAcquireSpinLockAtDpcLevel"); + pKeAcquireInStackQueuedSpinLockForDpc = KmtGetSystemRoutineAddress(L"KeAcquireInStackQueuedSpinLockForDpc"); + pKeReleaseInStackQueuedSpinLockForDpc = KmtGetSystemRoutineAddress(L"KeReleaseInStackQueuedSpinLockForDpc"); + pKeTestSpinLock = KmtGetSystemRoutineAddress(L"KeTestSpinLock"); + + Prcb = KeGetCurrentPrcb(); /* KeInitializeSpinLock */ memset(&SpinLock, 0x55, sizeof SpinLock); @@ -328,17 +356,20 @@ ok_eq_ulongptr(SpinLock, 0); /* KeTestSpinLock */ - ok_bool_true(KeTestSpinLock(&SpinLock), "KeTestSpinLock returned"); - SpinLock = 1; - ok_bool_false(KeTestSpinLock(&SpinLock), "KeTestSpinLock returned"); - SpinLock = 2; - ok_bool_false(KeTestSpinLock(&SpinLock), "KeTestSpinLock returned"); - SpinLock = (ULONG_PTR)-1; - ok_bool_false(KeTestSpinLock(&SpinLock), "KeTestSpinLock returned"); - SpinLock = (ULONG_PTR)1 << (sizeof(ULONG_PTR) * CHAR_BIT - 1); - ok_bool_false(KeTestSpinLock(&SpinLock), "KeTestSpinLock returned"); - SpinLock = 0; - ok_bool_true(KeTestSpinLock(&SpinLock), "KeTestSpinLock returned"); + if (!skip(pKeTestSpinLock != NULL, "KeTestSpinLock unavailable\n")) + { + ok_bool_true(pKeTestSpinLock(&SpinLock), "KeTestSpinLock returned"); + SpinLock = 1; + ok_bool_false(pKeTestSpinLock(&SpinLock), "KeTestSpinLock returned"); + SpinLock = 2; + ok_bool_false(pKeTestSpinLock(&SpinLock), "KeTestSpinLock returned"); + SpinLock = (ULONG_PTR)-1; + ok_bool_false(pKeTestSpinLock(&SpinLock), "KeTestSpinLock returned"); + SpinLock = (ULONG_PTR)1 << (sizeof(ULONG_PTR) * CHAR_BIT - 1); + ok_bool_false(pKeTestSpinLock(&SpinLock), "KeTestSpinLock returned"); + SpinLock = 0; + ok_bool_true(pKeTestSpinLock(&SpinLock), "KeTestSpinLock returned"); + } /* on UP none of the following functions actually looks at the spinlock! */ if (!KmtIsMultiProcessorBuild && !KmtIsCheckedBuild)

9 years, 10 months

[jimtabor] 66280: [User32] - Move notify window event to a better location for passing wine msg:test_winevents. See CORE-7447.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sun Feb 15 10:14:18 2015 New Revision: 66280 URL: http://svn.reactos.org/svn/reactos?rev=66280&view=rev Log: [User32] - Move notify window event to a better location for passing wine msg:test_winevents. See CORE-7447. Modified: trunk/reactos/win32ss/user/user32/windows/defwnd.c Modified: trunk/reactos/win32ss/user/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/defwnd.c [iso-8859-1] Sun Feb 15 10:14:18 2015 @@ -95,9 +95,6 @@ RtlInitLargeUnicodeString((PLARGE_UNICODE_STRING)&lsString, String, 0); } Ret = NtUserDefSetText(hWnd, (String ? &lsString : NULL)); - - if (Ret) - IntNotifyWinEvent(EVENT_OBJECT_NAMECHANGE, hWnd, OBJID_WINDOW, CHILDID_SELF, 0); return Ret; } @@ -1402,7 +1399,10 @@ DefSetText(hWnd, (PCWSTR)lParam, TRUE); if ((GetWindowLongPtrW(hWnd, GWL_STYLE) & WS_CAPTION) == WS_CAPTION) + { UserPaintCaption(hWnd); + IntNotifyWinEvent(EVENT_OBJECT_NAMECHANGE, hWnd, OBJID_WINDOW, CHILDID_SELF, 0); + } Result = 1; break; }

9 years, 10 months

[pschweitzer] 66279: [BOOTDATA] Errm... Spotted by Giannis

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Feb 15 10:02:57 2015 New Revision: 66279 URL: http://svn.reactos.org/svn/reactos?rev=66279&view=rev Log: [BOOTDATA] Errm... Spotted by Giannis Modified: trunk/reactos/boot/bootdata/hivesys.inf Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Sun Feb 15 10:02:57 2015 @@ -1933,15 +1933,15 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Themes","Start",0x00010001,0x00000002 HKLM,"SYSTEM\CurrentControlSet\Services\Themes","Type",0x00010001,0x00000020 -; ReactOS Installer Service -HKLM,"SYSTEM\CurrentControlSet\Services\MSIServer","Description",0x00000000,"ReactOS Installer Service" -HKLM,"SYSTEM\CurrentControlSet\Services\MSIServer","DisplayName",0x00000000,"ReactOS Installer Service" -HKLM,"SYSTEM\CurrentControlSet\Services\MSIServer","ErrorControl",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\MSIServer","Group",0x00000000,"Installation Infrastructure" -HKLM,"SYSTEM\CurrentControlSet\Services\MSIServer","ImagePath",0x00020000,"%SystemRoot%\system32\msiexec.exe /V" -HKLM,"SYSTEM\CurrentControlSet\Services\MSIServer","ObjectName",0x00000000,"LocalSystem" -HKLM,"SYSTEM\CurrentControlSet\Services\MSIServer","Start",0x00010001,0x00000003 -HKLM,"SYSTEM\CurrentControlSet\Services\MSIServer","Type",0x00010001,0x00000020 +; Windows Installer Service +HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","DisplayName",0x00000000,"ReactOS Installer" +HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","Description",0x00000000,"Controls installation, maintenance, and removal of software packaged as an msi (Windows Installer)" +HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","Group",0x00000000,"Windows Installer" +HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","ErrorControl",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","ImagePath",0x00020000,"system32\msiexec.exe /V" +HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","ObjectName",0x00000000,"LocalSystem" +HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","Start",0x00010001,0x00000003 +HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","Type",0x00010001,0x00000020 ; Sound Blaster (NT4) ;HKLM,"SYSTEM\CurrentControlSet\Services\sndblst","Description",0x00000000,"Sound Blaster (NT4)" @@ -2014,16 +2014,6 @@ HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","DefaultSettings.XResolution",0x00010001,640 HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","DefaultSettings.YResolution",0x00010001,480 -; Windows Installer Service -HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","DisplayName",0x00000000,"ReactOS Installer" -HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","Description",0x00000000,"Controls installation, maintenance, and removal of software packaged as an msi (Windows Installer)" -HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","Group",0x00000000,"Windows Installer" -HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","ErrorControl",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","ImagePath",0x00020000,"system32\msiexec.exe /V" -HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","ObjectName",0x00000000,"LocalSystem" -HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","Start",0x00010001,0x00000003 -HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","Type",0x00010001,0x00000020 - ; ControlSet selection settings HKLM,"SYSTEM\Select","Current",0x00010001,0x00000001 HKLM,"SYSTEM\Select","Default",0x00010001,0x00000001

9 years, 10 months

[pschweitzer] 66278: [BOOTDATA] msiexec can be used as a service (and might be required by some MSIs)

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Feb 15 09:59:29 2015 New Revision: 66278 URL: http://svn.reactos.org/svn/reactos?rev=66278&view=rev Log: [BOOTDATA] msiexec can be used as a service (and might be required by some MSIs) Modified: trunk/reactos/boot/bootdata/hivesys.inf Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Sun Feb 15 09:59:29 2015 @@ -1933,6 +1933,16 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Themes","Start",0x00010001,0x00000002 HKLM,"SYSTEM\CurrentControlSet\Services\Themes","Type",0x00010001,0x00000020 +; ReactOS Installer Service +HKLM,"SYSTEM\CurrentControlSet\Services\MSIServer","Description",0x00000000,"ReactOS Installer Service" +HKLM,"SYSTEM\CurrentControlSet\Services\MSIServer","DisplayName",0x00000000,"ReactOS Installer Service" +HKLM,"SYSTEM\CurrentControlSet\Services\MSIServer","ErrorControl",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\MSIServer","Group",0x00000000,"Installation Infrastructure" +HKLM,"SYSTEM\CurrentControlSet\Services\MSIServer","ImagePath",0x00020000,"%SystemRoot%\system32\msiexec.exe /V" +HKLM,"SYSTEM\CurrentControlSet\Services\MSIServer","ObjectName",0x00000000,"LocalSystem" +HKLM,"SYSTEM\CurrentControlSet\Services\MSIServer","Start",0x00010001,0x00000003 +HKLM,"SYSTEM\CurrentControlSet\Services\MSIServer","Type",0x00010001,0x00000020 + ; Sound Blaster (NT4) ;HKLM,"SYSTEM\CurrentControlSet\Services\sndblst","Description",0x00000000,"Sound Blaster (NT4)" ;HKLM,"SYSTEM\CurrentControlSet\Services\sndblst","ErrorControl",0x00010001,0x00000001

9 years, 10 months

← Newer
1
...
20
21
22
23
24
25
26
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2015