Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 69021: [NTOS] - Fix build CORE-9914
by tfaber＠svn.reactos.org 05 Sep '15

05 Sep '15

Author: tfaber Date: Sat Sep 5 11:32:02 2015 New Revision: 69021 URL: http://svn.reactos.org/svn/reactos?rev=69021&view=rev Log: [NTOS] - Fix build CORE-9914 Modified: trunk/reactos/ntoskrnl/ps/psmgr.c Modified: trunk/reactos/ntoskrnl/ps/psmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/psmgr.c?rev=69… ============================================================================== --- trunk/reactos/ntoskrnl/ps/psmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/psmgr.c [iso-8859-1] Sat Sep 5 11:32:02 2015 @@ -680,7 +680,7 @@ NTSTATUS NTAPI NtApphelpCacheControl(IN APPHELPCACHESERVICECLASS Service, - IN PVOID ServiceData) + IN PAPPHELP_CACHE_SERVICE_LOOKUP ServiceData) { UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED;

1 0

[tfaber] 69020: [SHIMDBG] - Add a test tool for SHIM engine caching to rosapps. Patch by Mark Jansen CORE-9914
by tfaber＠svn.reactos.org 05 Sep '15

05 Sep '15

Author: tfaber Date: Sat Sep 5 11:27:20 2015 New Revision: 69020 URL: http://svn.reactos.org/svn/reactos?rev=69020&view=rev Log: [SHIMDBG] - Add a test tool for SHIM engine caching to rosapps. Patch by Mark Jansen CORE-9914 Added: trunk/rosapps/applications/devutils/shimdbg/ trunk/rosapps/applications/devutils/shimdbg/CMakeLists.txt (with props) trunk/rosapps/applications/devutils/shimdbg/shimdbg.c (with props) Modified: trunk/rosapps/applications/devutils/CMakeLists.txt Modified: trunk/rosapps/applications/devutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/CMak… ============================================================================== --- trunk/rosapps/applications/devutils/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/devutils/CMakeLists.txt [iso-8859-1] Sat Sep 5 11:27:20 2015 @@ -1,6 +1,7 @@ add_subdirectory(gdb2) add_subdirectory(gdihv) add_subdirectory(genguid) +add_subdirectory(shimdbg) add_subdirectory(symdump) add_subdirectory(syscalldump) add_subdirectory(vgafontedit) Added: trunk/rosapps/applications/devutils/shimdbg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/shim… ============================================================================== --- trunk/rosapps/applications/devutils/shimdbg/CMakeLists.txt (added) +++ trunk/rosapps/applications/devutils/shimdbg/CMakeLists.txt [iso-8859-1] Sat Sep 5 11:27:20 2015 @@ -0,0 +1,6 @@ + +add_executable(shimdbg shimdbg.c) + +set_module_type(shimdbg win32cui) +add_importlibs(shimdbg ntdll msvcrt kernel32) +add_cd_file(TARGET shimdbg DESTINATION reactos/system32 FOR all) Propchange: trunk/rosapps/applications/devutils/shimdbg/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/devutils/shimdbg/shimdbg.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/shim… ============================================================================== --- trunk/rosapps/applications/devutils/shimdbg/shimdbg.c (added) +++ trunk/rosapps/applications/devutils/shimdbg/shimdbg.c [iso-8859-1] Sat Sep 5 11:27:20 2015 @@ -0,0 +1,256 @@ +/* + * PROJECT: shimdbg utility for WINE and ReactOS + * LICENSE: BSD - See COPYING.ARM in the top level directory + * PURPOSE: Test tool for SHIM engine caching. + * PROGRAMMER: Mark Jansen + */ + +#include <stdio.h> +#include <stdlib.h> +#include <ctype.h> +#include <ntndk.h> + +void CallApphelp(APPHELPCACHESERVICECLASS Service, + PAPPHELP_CACHE_SERVICE_LOOKUP CacheEntry) +{ + NTSTATUS Status = NtApphelpCacheControl(Service, CacheEntry); + printf("NtApphelpCacheControl returned 0x%x\n", (unsigned int)Status); +} + +HANDLE MapFile(char* filename, UNICODE_STRING* PathName, int MapIt) +{ + OBJECT_ATTRIBUTES LocalObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + NTSTATUS Status; + HANDLE FileHandle = NULL; + RtlCreateUnicodeStringFromAsciiz(PathName, filename); + if (MapIt) + { + InitializeObjectAttributes(&LocalObjectAttributes, PathName, + OBJ_CASE_INSENSITIVE, NULL, NULL); + Status = NtOpenFile(&FileHandle, + SYNCHRONIZE | FILE_READ_ATTRIBUTES | FILE_READ_DATA | FILE_EXECUTE, + &LocalObjectAttributes, &IoStatusBlock, + FILE_SHARE_READ | FILE_SHARE_DELETE, + FILE_SYNCHRONOUS_IO_NONALERT | FILE_NON_DIRECTORY_FILE); + if (!NT_SUCCESS(Status)) + { + printf("Failed opening the file, using a NULL handle\n"); + FileHandle = NULL; + } + } + return FileHandle; +} + +void CallApphelpWithImage(char* filename, int MapIt, + APPHELPCACHESERVICECLASS Service, char* ServiceName) +{ + UNICODE_STRING PathName = {0}; + APPHELP_CACHE_SERVICE_LOOKUP CacheEntry; + + HANDLE FileHandle = MapFile(filename, &PathName, MapIt); + + printf("Calling %s %s mapping\n", ServiceName, (MapIt ? "with" : "without")); + + RtlInitUnicodeString(&CacheEntry.ImageName, PathName.Buffer); + CacheEntry.ImageHandle = FileHandle ? FileHandle : (HANDLE)-1; + CallApphelp(Service, &CacheEntry); + // we piggy-back on the PathName, so let the Cleanup take care of the string + //RtlFreeUnicodeString(&CacheEntry.ImageName); + + if (FileHandle) + NtClose(FileHandle); + RtlFreeUnicodeString(&PathName); +} + +int IsOpt(char* argv, const char* check) +{ + if( argv && (argv[0] == '-' || argv[0] == '/') ) { + return !stricmp(argv + 1, check); + } + return 0; +} + +int HandleImageArg(int argc, char* argv[], int* pn, char MapItChar, + APPHELPCACHESERVICECLASS Service, char* ServiceName) +{ + int n = *pn; + if (n+1 < argc) + { + int MapIt = argv[n][1] == MapItChar; + CallApphelpWithImage(argv[n+1], MapIt, Service, ServiceName); + (*pn) += 1; + return 0; + } + printf("Error: no image name specified\n"); + return 1; +} + + +UNICODE_STRING AppCompatCacheKey = RTL_CONSTANT_STRING(L"\\Registry\\MACHINE\\System\\CurrentControlSet\\Control\\Session Manager\\AppCompatCache"); +OBJECT_ATTRIBUTES AppCompatKeyAttributes = RTL_CONSTANT_OBJECT_ATTRIBUTES(&AppCompatCacheKey, OBJ_CASE_INSENSITIVE); +UNICODE_STRING AppCompatCacheValue = RTL_CONSTANT_STRING(L"AppCompatCache"); +#define REG_BINARY ( 3 ) // Free form binary + + +/* produce a hex dump, stolen from rdesktop.c */ +void hexdump(unsigned char *p, unsigned int len) +{ + unsigned char *line = p; + unsigned int i, thisline, offset = 0; + + while (offset < len) + { + printf("%04x ", offset); + thisline = len - offset; + if (thisline > 16) + thisline = 16; + + for (i = 0; i < thisline; i++) + printf("%02x ", line[i]); + + for (; i < 16; i++) + printf(" "); + + for (i = 0; i < thisline; i++) + printf("%c", (line[i] >= 0x20 && line[i] < 0x7f) ? line[i] : '.'); + + printf("\n"); + offset += thisline; + line += thisline; + } +} + +void DumpRegistryData(int IncludeDump) +{ + HANDLE KeyHandle; + NTSTATUS Status; + KEY_VALUE_PARTIAL_INFORMATION KeyValueObject; + PKEY_VALUE_PARTIAL_INFORMATION KeyValueInformation = &KeyValueObject; + ULONG KeyInfoSize, ResultSize; + + printf("Dumping AppCompatCache registry key\n"); + + Status = NtOpenKey(&KeyHandle, KEY_QUERY_VALUE, &AppCompatKeyAttributes); + + Status = NtQueryValueKey(KeyHandle, &AppCompatCacheValue, + KeyValuePartialInformation, KeyValueInformation, + sizeof(KeyValueObject), &ResultSize); + + if (Status == STATUS_BUFFER_OVERFLOW) + { + KeyInfoSize = sizeof(KEY_VALUE_PARTIAL_INFORMATION) + KeyValueInformation->DataLength; + KeyValueInformation = malloc(KeyInfoSize); + if (KeyValueInformation != NULL) + { + Status = NtQueryValueKey(KeyHandle, &AppCompatCacheValue, + KeyValuePartialInformation, KeyValueInformation, + KeyInfoSize, &ResultSize); + } + } + + if (NT_SUCCESS(Status) && KeyValueInformation->Type == REG_BINARY) + { + ULONG crc; + if (IncludeDump) + hexdump(KeyValueInformation->Data, KeyValueInformation->DataLength); + crc = RtlComputeCrc32(0, KeyValueInformation->Data, KeyValueInformation->DataLength); + printf("Len: %lu, Crc: 0x%lx\n", KeyValueInformation->DataLength, crc); + } + else + { + printf("Failed reading AppCompatCache from registry (0x%lx)\n", Status); + } + + if (KeyValueInformation != &KeyValueObject) + free(KeyValueInformation); + + if (KeyHandle) + NtClose(KeyHandle); +} + +int _getch(); + +int main(int argc, char* argv[]) +{ + int n, unhandled = 0, keepopen = 0; + + for (n = 1; n < argc; ++n) + { + char* arg = argv[n]; + if (IsOpt(arg, "d")) + { + printf("Calling ApphelpCacheServiceDump\n"); + CallApphelp(ApphelpCacheServiceDump, NULL); + unhandled = 0; + } + else if (IsOpt(arg, "h")) + { + DumpRegistryData(arg[1] == 'h'); + unhandled = 0; + } + else if (IsOpt(arg, "f")) + { + printf("Calling ApphelpCacheServiceFlush\n"); + CallApphelp(ApphelpCacheServiceFlush, NULL); + unhandled = 0; + } + else if (IsOpt(arg, "z")) + { + printf("Calling ApphelpDBGReadRegistry\n"); + CallApphelp(ApphelpDBGReadRegistry, NULL); + unhandled = 0; + } + else if (IsOpt(arg, "x")) + { + printf("Calling ApphelpDBGWriteRegistry\n"); + CallApphelp(ApphelpDBGWriteRegistry, NULL); + unhandled = 0; + } + else if (IsOpt(arg, "l")) + { + unhandled |= HandleImageArg(argc, argv, &n, 'l', + ApphelpCacheServiceLookup, "ApphelpCacheServiceLookup"); + } + else if (IsOpt(arg, "u")) + { + unhandled |= HandleImageArg(argc, argv, &n, 'u', + ApphelpCacheServiceUpdate, "ApphelpCacheServiceUpdate"); + } + else if (IsOpt(arg, "r")) + { + unhandled |= HandleImageArg(argc, argv, &n, 'r', + ApphelpCacheServiceRemove, "ApphelpCacheServiceRemove"); + } + else if (IsOpt(arg, "k")) + { + keepopen = 1; + } + else + { + unhandled = 1; + } + } + if (unhandled || argc == 1) + { + printf("Usage: %s [-d|-z|-x|-h|-H|-f|-[l|L] <image>|-[u|U] <image>|-[r|R] <image>|-k]\n", argv[0]); + printf(" -d: Dump shim cache over debug output\n"); + printf(" -z: DEBUG Read shim cache from registry\n"); + printf(" -x: DEBUG Write shim cache to registry\n"); + printf(" -h: Hexdump shim registry key\n"); + printf(" -H: Crc + Length from shim registry key only\n"); + printf(" -f: Flush (clear) the shim cache\n"); + printf(" -l: Lookup <image> in the shim cache\n"); + printf(" -L: Lookup <image> in the shim cache without mapping it\n"); + printf(" -u: Update (insert) <image> in the shim cache\n"); + printf(" -U: Update (insert) <image> in the shim cache without mapping it\n"); + printf(" -r: Remove <image> from the shim cache\n"); + printf(" -R: Remove <image> from the shim cache without mapping it\n"); + printf(" -k: Keep the console open\n"); + } + if (keepopen) + { + _getch(); + } + return unhandled; +} Propchange: trunk/rosapps/applications/devutils/shimdbg/shimdbg.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tfaber] 69019: [NDK] - Update NtApphelpCacheControl declaration and add appropriate types. Patch by Mark Jansen CORE-9914
by tfaber＠svn.reactos.org 05 Sep '15

05 Sep '15

Author: tfaber Date: Sat Sep 5 11:20:05 2015 New Revision: 69019 URL: http://svn.reactos.org/svn/reactos?rev=69019&view=rev Log: [NDK] - Update NtApphelpCacheControl declaration and add appropriate types. Patch by Mark Jansen CORE-9914 Modified: trunk/reactos/include/ndk/psfuncs.h trunk/reactos/include/ndk/pstypes.h Modified: trunk/reactos/include/ndk/psfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/psfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/psfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/psfuncs.h [iso-8859-1] Sat Sep 5 11:20:05 2015 @@ -326,13 +326,12 @@ _Out_opt_ PULONG SuspendCount ); -typedef ULONG APPHELPCACHESERVICECLASS; NTSYSCALLAPI NTSTATUS NTAPI NtApphelpCacheControl( _In_ APPHELPCACHESERVICECLASS Service, - _In_ PVOID ServiceData + _In_opt_ PAPPHELP_CACHE_SERVICE_LOOKUP ServiceData ); NTSYSCALLAPI Modified: trunk/reactos/include/ndk/pstypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/pstypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/pstypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/pstypes.h [iso-8859-1] Sat Sep 5 11:20:05 2015 @@ -811,6 +811,29 @@ } PROCESS_FOREGROUND_BACKGROUND, *PPROCESS_FOREGROUND_BACKGROUND; // +// Apphelp SHIM Cache +// +typedef enum _APPHELPCACHESERVICECLASS +{ + ApphelpCacheServiceLookup = 0, + ApphelpCacheServiceRemove = 1, + ApphelpCacheServiceUpdate = 2, + ApphelpCacheServiceFlush = 3, + ApphelpCacheServiceDump = 4, + + ApphelpDBGReadRegistry = 0x100, + ApphelpDBGWriteRegistry = 0x101, +} APPHELPCACHESERVICECLASS; + + +typedef struct _APPHELP_CACHE_SERVICE_LOOKUP +{ + UNICODE_STRING ImageName; + HANDLE ImageHandle; +} APPHELP_CACHE_SERVICE_LOOKUP, *PAPPHELP_CACHE_SERVICE_LOOKUP; + + +// // Thread Information Structures for NtQueryProcessInformation // typedef struct _THREAD_BASIC_INFORMATION

1 0

[hbelusca] 69018: [MSCONFIG_NEW]: Start improved MSConfig. It's time to commit stuff I've done in it since 2011!
by hbelusca＠svn.reactos.org 05 Sep '15

05 Sep '15

Author: hbelusca Date: Sat Sep 5 10:37:36 2015 New Revision: 69018 URL: http://svn.reactos.org/svn/reactos?rev=69018&view=rev Log: [MSCONFIG_NEW]: Start improved MSConfig. It's time to commit stuff I've done in it since 2011! Added: trunk/reactos/base/applications/msconfig_new/ - copied from r69017, trunk/reactos/base/applications/msconfig/

1 0

[tfaber] 69017: [ESENT] - Add stub dll. Fixes CCleaner startup. Patch by Mark Jansen CORE-8758 #resolve
by tfaber＠svn.reactos.org 05 Sep '15

05 Sep '15

Author: tfaber Date: Sat Sep 5 10:00:31 2015 New Revision: 69017 URL: http://svn.reactos.org/svn/reactos?rev=69017&view=rev Log: [ESENT] - Add stub dll. Fixes CCleaner startup. Patch by Mark Jansen CORE-8758 #resolve Added: trunk/reactos/dll/win32/esent/ (with props) trunk/reactos/dll/win32/esent/CMakeLists.txt (with props) trunk/reactos/dll/win32/esent/esent.spec (with props) Modified: trunk/reactos/dll/win32/CMakeLists.txt 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] Sat Sep 5 10:00:31 2015 @@ -38,6 +38,7 @@ add_subdirectory(dhcpcsvc) add_subdirectory(dnsapi) add_subdirectory(dwmapi) +add_subdirectory(esent) add_subdirectory(faultrep) add_subdirectory(fltlib) add_subdirectory(fmifs) Propchange: trunk/reactos/dll/win32/esent/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat Sep 5 10:00:31 2015 @@ -0,0 +1 @@ +((CORE|ROSTESTS|ROSAPPS)-\d+)(,? ?((CORE|ROSTESTS|ROSAPPS)-\d+))*(,? ?(and |or )?((CORE|ROSTESTS|ROSAPPS)-\d+))? Propchange: trunk/reactos/dll/win32/esent/ ------------------------------------------------------------------------------ bugtraq:message = See issue %BUGID% for more details. Propchange: trunk/reactos/dll/win32/esent/ ------------------------------------------------------------------------------ bugtraq:url = https://jira.reactos.org/browse/%BUGID% Propchange: trunk/reactos/dll/win32/esent/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/esent/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/esent/CMakeLists… ============================================================================== --- trunk/reactos/dll/win32/esent/CMakeLists.txt (added) +++ trunk/reactos/dll/win32/esent/CMakeLists.txt [iso-8859-1] Sat Sep 5 10:00:31 2015 @@ -0,0 +1,13 @@ + +spec2def(esent.dll esent.spec) + +list(APPEND SOURCE + ${CMAKE_CURRENT_BINARY_DIR}/esent_stubs.c) + +add_library(esent SHARED + ${SOURCE} + ${CMAKE_CURRENT_BINARY_DIR}/esent.def) + +set_module_type(esent win32dll) +add_importlibs(esent msvcrt kernel32 ntdll) +add_cd_file(TARGET esent DESTINATION reactos/system32 FOR all) Propchange: trunk/reactos/dll/win32/esent/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/esent/esent.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/esent/esent.spec… ============================================================================== --- trunk/reactos/dll/win32/esent/esent.spec (added) +++ trunk/reactos/dll/win32/esent/esent.spec [iso-8859-1] Sat Sep 5 10:00:31 2015 @@ -0,0 +1,292 @@ +# stub JetAddColumn@28 (ord 1)cannot be forwarded with msvc .def file +# stub JetAttachDatabase2@16 (ord 2)cannot be forwarded with msvc .def file +# stub JetAttachDatabase@12 (ord 3)cannot be forwarded with msvc .def file +# stub JetAttachDatabaseWithStreaming@24 (ord 4)cannot be forwarded with msvc .def file +# stub JetBackup@12 (ord 5)cannot be forwarded with msvc .def file +# stub JetBackupInstance@16 (ord 6)cannot be forwarded with msvc .def file +# stub JetBeginExternalBackup@4 (ord 7)cannot be forwarded with msvc .def file +# stub JetBeginExternalBackupInstance@8 (ord 8)cannot be forwarded with msvc .def file +# stub JetBeginSession@16 (ord 9)cannot be forwarded with msvc .def file +# stub JetBeginTransaction2@8 (ord 10)cannot be forwarded with msvc .def file +# stub JetBeginTransaction@4 (ord 11)cannot be forwarded with msvc .def file +# stub JetCloseDatabase@12 (ord 12)cannot be forwarded with msvc .def file +# stub JetCloseFile@4 (ord 13)cannot be forwarded with msvc .def file +# stub JetCloseFileInstance@8 (ord 14)cannot be forwarded with msvc .def file +# stub JetCloseTable@8 (ord 15)cannot be forwarded with msvc .def file +# stub JetCommitTransaction@8 (ord 16)cannot be forwarded with msvc .def file +# stub JetCompact@24 (ord 17)cannot be forwarded with msvc .def file +# stub JetComputeStats@8 (ord 18)cannot be forwarded with msvc .def file +# stub JetConvertDDL@20 (ord 19)cannot be forwarded with msvc .def file +# stub JetCreateDatabase2@20 (ord 20)cannot be forwarded with msvc .def file +# stub JetCreateDatabase@20 (ord 21)cannot be forwarded with msvc .def file +# stub JetCreateDatabaseWithStreaming@28 (ord 22)cannot be forwarded with msvc .def file +# stub JetCreateIndex2@16 (ord 23)cannot be forwarded with msvc .def file +# stub JetCreateIndex@28 (ord 24)cannot be forwarded with msvc .def file +# stub JetCreateInstance2@16 (ord 25)cannot be forwarded with msvc .def file +# stub JetCreateInstance@8 (ord 26)cannot be forwarded with msvc .def file +# stub JetCreateTable@24 (ord 27)cannot be forwarded with msvc .def file +# stub JetCreateTableColumnIndex2@12 (ord 28)cannot be forwarded with msvc .def file +# stub JetCreateTableColumnIndex@12 (ord 29)cannot be forwarded with msvc .def file +# stub JetDBUtilities@4 (ord 30)cannot be forwarded with msvc .def file +# stub JetDefragment2@28 (ord 31)cannot be forwarded with msvc .def file +# stub JetDefragment@24 (ord 32)cannot be forwarded with msvc .def file +# stub JetDelete@8 (ord 33)cannot be forwarded with msvc .def file +# stub JetDeleteColumn2@16 (ord 34)cannot be forwarded with msvc .def file +# stub JetDeleteColumn@12 (ord 35)cannot be forwarded with msvc .def file +# stub JetDeleteIndex@12 (ord 36)cannot be forwarded with msvc .def file +# stub JetDeleteTable@12 (ord 37)cannot be forwarded with msvc .def file +# stub JetDetachDatabase2@12 (ord 38)cannot be forwarded with msvc .def file +# stub JetDetachDatabase@8 (ord 39)cannot be forwarded with msvc .def file +# stub JetDupCursor@16 (ord 40)cannot be forwarded with msvc .def file +# stub JetDupSession@8 (ord 41)cannot be forwarded with msvc .def file +# stub JetEnableMultiInstance@12 (ord 42)cannot be forwarded with msvc .def file +# stub JetEndExternalBackup@0 (ord 43)cannot be forwarded with msvc .def file +# stub JetEndExternalBackupInstance2@8 (ord 44)cannot be forwarded with msvc .def file +# stub JetEndExternalBackupInstance@4 (ord 45)cannot be forwarded with msvc .def file +# stub JetEndSession@8 (ord 46)cannot be forwarded with msvc .def file +# stub JetEnumerateColumns@40 (ord 47)cannot be forwarded with msvc .def file +# stub JetEscrowUpdate@36 (ord 48)cannot be forwarded with msvc .def file +# stub JetExternalRestore2@40 (ord 49)cannot be forwarded with msvc .def file +# stub JetExternalRestore@32 (ord 50)cannot be forwarded with msvc .def file +# stub JetFreeBuffer@4 (ord 51)cannot be forwarded with msvc .def file +# stub JetGetAttachInfo@12 (ord 52)cannot be forwarded with msvc .def file +# stub JetGetAttachInfoInstance@16 (ord 53)cannot be forwarded with msvc .def file +# stub JetGetBookmark@20 (ord 54)cannot be forwarded with msvc .def file +# stub JetGetColumnInfo@28 (ord 55)cannot be forwarded with msvc .def file +# stub JetGetCounter@12 (ord 56)cannot be forwarded with msvc .def file +# stub JetGetCurrentIndex@16 (ord 57)cannot be forwarded with msvc .def file +# stub JetGetCursorInfo@20 (ord 58)cannot be forwarded with msvc .def file +# stub JetGetDatabaseFileInfo@16 (ord 59)cannot be forwarded with msvc .def file +# stub JetGetDatabaseInfo@20 (ord 60)cannot be forwarded with msvc .def file +# stub JetGetIndexInfo@28 (ord 61)cannot be forwarded with msvc .def file +# stub JetGetInstanceInfo@8 (ord 62)cannot be forwarded with msvc .def file +# stub JetGetLS@16 (ord 63)cannot be forwarded with msvc .def file +# stub JetGetLock@12 (ord 64)cannot be forwarded with msvc .def file +# stub JetGetLogInfo@12 (ord 65)cannot be forwarded with msvc .def file +# stub JetGetLogInfoInstance2@20 (ord 66)cannot be forwarded with msvc .def file +# stub JetGetLogInfoInstance@16 (ord 67)cannot be forwarded with msvc .def file +# stub JetGetObjectInfo@32 (ord 68)cannot be forwarded with msvc .def file +# stub JetGetRecordPosition@16 (ord 69)cannot be forwarded with msvc .def file +# stub JetGetSecondaryIndexBookmark@36 (ord 70)cannot be forwarded with msvc .def file +# stub JetGetSystemParameter@24 (ord 71)cannot be forwarded with msvc .def file +# stub JetGetTableColumnInfo@24 (ord 72)cannot be forwarded with msvc .def file +# stub JetGetTableIndexInfo@24 (ord 73)cannot be forwarded with msvc .def file +# stub JetGetTableInfo@20 (ord 74)cannot be forwarded with msvc .def file +# stub JetGetTruncateLogInfoInstance@16 (ord 75)cannot be forwarded with msvc .def file +# stub JetGetVersion@8 (ord 76)cannot be forwarded with msvc .def file +# stub JetGotoBookmark@16 (ord 77)cannot be forwarded with msvc .def file +# stub JetGotoPosition@12 (ord 78)cannot be forwarded with msvc .def file +# stub JetGotoSecondaryIndexBookmark@28 (ord 79)cannot be forwarded with msvc .def file +# stub JetGrowDatabase@16 (ord 80)cannot be forwarded with msvc .def file +# stub JetIdle@8 (ord 81)cannot be forwarded with msvc .def file +# stub JetIndexRecordCount@16 (ord 82)cannot be forwarded with msvc .def file +# stub JetInit2@8 (ord 83)cannot be forwarded with msvc .def file +# stub JetInit3@16 (ord 84)cannot be forwarded with msvc .def file +# stub JetInit@4 (ord 85)cannot be forwarded with msvc .def file +# stub JetIntersectIndexes@20 (ord 86)cannot be forwarded with msvc .def file +# stub JetMakeKey@20 (ord 87)cannot be forwarded with msvc .def file +# stub JetMove@16 (ord 88)cannot be forwarded with msvc .def file +# stub JetOSSnapshotAbort@8 (ord 89)cannot be forwarded with msvc .def file +# stub JetOSSnapshotFreeze@16 (ord 90)cannot be forwarded with msvc .def file +# stub JetOSSnapshotPrepare@8 (ord 91)cannot be forwarded with msvc .def file +# stub JetOSSnapshotThaw@8 (ord 92)cannot be forwarded with msvc .def file +# stub JetOpenDatabase@20 (ord 93)cannot be forwarded with msvc .def file +# stub JetOpenFile@16 (ord 94)cannot be forwarded with msvc .def file +# stub JetOpenFileInstance@20 (ord 95)cannot be forwarded with msvc .def file +# stub JetOpenFileSectionInstance@28 (ord 96)cannot be forwarded with msvc .def file +# stub JetOpenTable@28 (ord 97)cannot be forwarded with msvc .def file +# stub JetOpenTempTable2@28 (ord 98)cannot be forwarded with msvc .def file +# stub JetOpenTempTable3@28 (ord 99)cannot be forwarded with msvc .def file +# stub JetOpenTempTable@24 (ord 100)cannot be forwarded with msvc .def file +# stub JetPrepareToCommitTransaction@16 (ord 101)cannot be forwarded with msvc .def file +# stub JetPrepareUpdate@12 (ord 102)cannot be forwarded with msvc .def file +# stub JetReadFile@16 (ord 103)cannot be forwarded with msvc .def file +# stub JetReadFileInstance@20 (ord 104)cannot be forwarded with msvc .def file +# stub JetRegisterCallback@24 (ord 105)cannot be forwarded with msvc .def file +# stub JetRenameColumn@20 (ord 106)cannot be forwarded with msvc .def file +# stub JetRenameTable@16 (ord 107)cannot be forwarded with msvc .def file +# stub JetResetCounter@8 (ord 108)cannot be forwarded with msvc .def file +# stub JetResetSessionContext@4 (ord 109)cannot be forwarded with msvc .def file +# stub JetResetTableSequential@12 (ord 110)cannot be forwarded with msvc .def file +# stub JetRestore2@12 (ord 111)cannot be forwarded with msvc .def file +# stub JetRestore@8 (ord 112)cannot be forwarded with msvc .def file +# stub JetRestoreInstance@16 (ord 113)cannot be forwarded with msvc .def file +# stub JetRetrieveColumn@32 (ord 114)cannot be forwarded with msvc .def file +# stub JetRetrieveColumns@16 (ord 115)cannot be forwarded with msvc .def file +# stub JetRetrieveKey@24 (ord 116)cannot be forwarded with msvc .def file +# stub JetRetrieveTaggedColumnList@28 (ord 117)cannot be forwarded with msvc .def file +# stub JetRollback@8 (ord 118)cannot be forwarded with msvc .def file +# stub JetSeek@12 (ord 119)cannot be forwarded with msvc .def file +# stub JetSetColumn@28 (ord 120)cannot be forwarded with msvc .def file +# stub JetSetColumnDefaultValue@28 (ord 121)cannot be forwarded with msvc .def file +# stub JetSetColumns@16 (ord 122)cannot be forwarded with msvc .def file +# stub JetSetCurrentIndex2@16 (ord 123)cannot be forwarded with msvc .def file +# stub JetSetCurrentIndex@12 (ord 124)cannot be forwarded with msvc .def file +# stub JetSetDatabaseSize@16 (ord 125)cannot be forwarded with msvc .def file +# stub JetSetIndexRange@12 (ord 126)cannot be forwarded with msvc .def file +# stub JetSetLS@16 (ord 127)cannot be forwarded with msvc .def file +# stub JetSetSessionContext@8 (ord 128)cannot be forwarded with msvc .def file +# stub JetSetSystemParameter@20 (ord 129)cannot be forwarded with msvc .def file +# stub JetSetTableSequential@12 (ord 130)cannot be forwarded with msvc .def file +# stub JetSnapshotStart@12 (ord 131)cannot be forwarded with msvc .def file +# stub JetSnapshotStop@8 (ord 132)cannot be forwarded with msvc .def file +# stub JetStopBackup@0 (ord 133)cannot be forwarded with msvc .def file +# stub JetStopBackupInstance@4 (ord 134)cannot be forwarded with msvc .def file +# stub JetStopService@0 (ord 135)cannot be forwarded with msvc .def file +# stub JetStopServiceInstance@4 (ord 136)cannot be forwarded with msvc .def file +# stub JetTerm2@8 (ord 137)cannot be forwarded with msvc .def file +# stub JetTerm@4 (ord 138)cannot be forwarded with msvc .def file +# stub JetTruncateLog@0 (ord 139)cannot be forwarded with msvc .def file +# stub JetTruncateLogInstance@4 (ord 140)cannot be forwarded with msvc .def file +# stub JetUnregisterCallback@16 (ord 141)cannot be forwarded with msvc .def file +# stub JetUpdate2@24 (ord 142)cannot be forwarded with msvc .def file +# stub JetUpdate@20 (ord 143)cannot be forwarded with msvc .def file +# stub JetUpgradeDatabase@16 (ord 144)cannot be forwarded with msvc .def file +145 stub JetAddColumn +146 stub JetAttachDatabase2 +147 stub JetAttachDatabase +148 stub JetAttachDatabaseWithStreaming +149 stub JetBackup +150 stub JetBackupInstance +151 stub JetBeginExternalBackup +152 stub JetBeginExternalBackupInstance +153 stub JetBeginSession +154 stub JetBeginTransaction2 +155 stub JetBeginTransaction +156 stub JetCloseDatabase +157 stub JetCloseFile +158 stub JetCloseFileInstance +159 stub JetCloseTable +160 stub JetCommitTransaction +161 stub JetCompact +162 stub JetComputeStats +163 stub JetConvertDDL +164 stub JetCreateDatabase2 +165 stub JetCreateDatabase +166 stub JetCreateDatabaseWithStreaming +167 stub JetCreateIndex2 +168 stub JetCreateIndex +169 stub JetCreateInstance2 +170 stub JetCreateInstance +171 stub JetCreateTable +172 stub JetCreateTableColumnIndex2 +173 stub JetCreateTableColumnIndex +174 stub JetDBUtilities +175 stub JetDefragment2 +176 stub JetDefragment +177 stub JetDelete +178 stub JetDeleteColumn2 +179 stub JetDeleteColumn +180 stub JetDeleteIndex +181 stub JetDeleteTable +182 stub JetDetachDatabase2 +183 stub JetDetachDatabase +184 stub JetDupCursor +185 stub JetDupSession +186 stub JetEnableMultiInstance +187 stub JetEndExternalBackup +188 stub JetEndExternalBackupInstance2 +189 stub JetEndExternalBackupInstance +190 stub JetEndSession +191 stub JetEnumerateColumns +192 stub JetEscrowUpdate +193 stub JetExternalRestore2 +194 stub JetExternalRestore +195 stub JetFreeBuffer +196 stub JetGetAttachInfo +197 stub JetGetAttachInfoInstance +198 stub JetGetBookmark +199 stub JetGetColumnInfo +200 stub JetGetCounter +201 stub JetGetCurrentIndex +202 stub JetGetCursorInfo +203 stub JetGetDatabaseFileInfo +204 stub JetGetDatabaseInfo +205 stub JetGetIndexInfo +206 stub JetGetInstanceInfo +207 stub JetGetLS +208 stub JetGetLock +209 stub JetGetLogInfo +210 stub JetGetLogInfoInstance2 +211 stub JetGetLogInfoInstance +212 stub JetGetObjectInfo +213 stub JetGetRecordPosition +214 stub JetGetSecondaryIndexBookmark +215 stub JetGetSystemParameter +216 stub JetGetTableColumnInfo +217 stub JetGetTableIndexInfo +218 stub JetGetTableInfo +219 stub JetGetTruncateLogInfoInstance +220 stub JetGetVersion +221 stub JetGotoBookmark +222 stub JetGotoPosition +223 stub JetGotoSecondaryIndexBookmark +224 stub JetGrowDatabase +225 stub JetIdle +226 stub JetIndexRecordCount +227 stub JetInit2 +228 stub JetInit3 +229 stub JetInit +230 stub JetIntersectIndexes +231 stub JetMakeKey +232 stub JetMove +233 stub JetOSSnapshotAbort +234 stub JetOSSnapshotFreeze +235 stub JetOSSnapshotPrepare +236 stub JetOSSnapshotThaw +237 stub JetOpenDatabase +238 stub JetOpenFile +239 stub JetOpenFileInstance +240 stub JetOpenFileSectionInstance +241 stub JetOpenTable +242 stub JetOpenTempTable2 +243 stub JetOpenTempTable3 +244 stub JetOpenTempTable +245 stub JetPrepareToCommitTransaction +246 stub JetPrepareUpdate +247 stub JetReadFile +248 stub JetReadFileInstance +249 stub JetRegisterCallback +250 stub JetRenameColumn +251 stub JetRenameTable +252 stub JetResetCounter +253 stub JetResetSessionContext +254 stub JetResetTableSequential +255 stub JetRestore2 +256 stub JetRestore +257 stub JetRestoreInstance +258 stub JetRetrieveColumn +259 stub JetRetrieveColumns +260 stub JetRetrieveKey +261 stub JetRetrieveTaggedColumnList +262 stub JetRollback +263 stub JetSeek +264 stub JetSetColumn +265 stub JetSetColumnDefaultValue +266 stub JetSetColumns +267 stub JetSetCurrentIndex2 +268 stub JetSetCurrentIndex3 +269 stub JetSetCurrentIndex4 +270 stub JetSetCurrentIndex +271 stub JetSetDatabaseSize +272 stub JetSetIndexRange +273 stub JetSetLS +274 stub JetSetSessionContext +275 stub JetSetSystemParameter +276 stub JetSetTableSequential +277 stub JetSnapshotStart +278 stub JetSnapshotStop +279 stub JetStopBackup +280 stub JetStopBackupInstance +281 stub JetStopService +282 stub JetStopServiceInstance +283 stub JetTerm2 +284 stub JetTerm +285 stub JetTruncateLog +286 stub JetTruncateLogInstance +287 stub JetUnregisterCallback +288 stub JetUpdate2 +289 stub JetUpdate +290 stub JetUpgradeDatabase +291 stub ese +292 stub esent Propchange: trunk/reactos/dll/win32/esent/esent.spec ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 69016: [GDI32] Fix build with VS 2015.
by akhaldi＠svn.reactos.org 05 Sep '15

05 Sep '15

Author: akhaldi Date: Sat Sep 5 08:39:14 2015 New Revision: 69016 URL: http://svn.reactos.org/svn/reactos?rev=69016&view=rev Log: [GDI32] Fix build with VS 2015. Modified: trunk/reactos/win32ss/gdi/gdi32/wine/rosglue.c Modified: trunk/reactos/win32ss/gdi/gdi32/wine/rosglue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/wine/ros… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/wine/rosglue.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/wine/rosglue.c [iso-8859-1] Sat Sep 5 08:39:14 2015 @@ -519,8 +519,8 @@ DbgRaiseAssertionFailure(); } -#if defined(_MSC_VER) && (DBG != 1) -// MSVC uses it's own in this case. Thus skipping it. +#if (_MSC_VER < 1900) && (DBG != 1) +/* MSVC uses its own in this case. */ #else double

1 0

[hbelusca] 69015: [CRT]: Add a missing header inclusion.
by hbelusca＠svn.reactos.org 05 Sep '15

05 Sep '15

Author: hbelusca Date: Sat Sep 5 00:41:56 2015 New Revision: 69015 URL: http://svn.reactos.org/svn/reactos?rev=69015&view=rev Log: [CRT]: Add a missing header inclusion. Modified: trunk/reactos/include/crt/string.h Modified: trunk/reactos/include/crt/string.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/string.h?rev=6… ============================================================================== --- trunk/reactos/include/crt/string.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/string.h [iso-8859-1] Sat Sep 5 00:41:56 2015 @@ -1150,5 +1150,5 @@ #define stricmp _stricmp #define wcsicmp _wcsicmp +#include <sec_api/string_s.h> #endif -

1 0

[tfaber] 69014: [NTOS:WMI] - Actually fix WmipShutdown. Spotted by Hermès CORE-10105
by tfaber＠svn.reactos.org 04 Sep '15

04 Sep '15

Author: tfaber Date: Fri Sep 4 22:11:51 2015 New Revision: 69014 URL: http://svn.reactos.org/svn/reactos?rev=69014&view=rev Log: [NTOS:WMI] - Actually fix WmipShutdown. Spotted by Hermès CORE-10105 Modified: trunk/reactos/ntoskrnl/wmi/wmidrv.c Modified: trunk/reactos/ntoskrnl/wmi/wmidrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/wmi/wmidrv.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/wmi/wmidrv.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/wmi/wmidrv.c [iso-8859-1] Fri Sep 4 22:11:51 2015 @@ -552,8 +552,9 @@ _Inout_ PDEVICE_OBJECT DeviceObject, _Inout_ PIRP Irp) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; } _Function_class_(FAST_IO_DEVICE_CONTROL)

1 0

[tfaber] 69013: [NTOS:WMI][HAL] - Properly stub WmipShutdown and HalpDispatchPower to avoid IRP leaks CORE-10105
by tfaber＠svn.reactos.org 04 Sep '15

04 Sep '15

Author: tfaber Date: Fri Sep 4 21:30:16 2015 New Revision: 69013 URL: http://svn.reactos.org/svn/reactos?rev=69013&view=rev Log: [NTOS:WMI][HAL] - Properly stub WmipShutdown and HalpDispatchPower to avoid IRP leaks CORE-10105 Modified: trunk/reactos/hal/halx86/legacy/halpnpdd.c Modified: trunk/reactos/hal/halx86/legacy/halpnpdd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/legacy/halpnpdd… ============================================================================== --- trunk/reactos/hal/halx86/legacy/halpnpdd.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/legacy/halpnpdd.c [iso-8859-1] Fri Sep 4 21:30:16 2015 @@ -820,8 +820,23 @@ HalpDispatchPower(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { + PFDO_EXTENSION FdoExtension; + DPRINT1("HAL: PnP Driver Power!\n"); - return STATUS_SUCCESS; + FdoExtension = DeviceObject->DeviceExtension; + if (FdoExtension->ExtensionType == FdoExtensionType) + { + PoStartNextPowerIrp(Irp); + IoSkipCurrentIrpStackLocation(Irp); + return PoCallDriver(FdoExtension->AttachedDeviceObject, Irp); + } + else + { + PoStartNextPowerIrp(Irp); + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; + } } NTSTATUS

1 0

[tfaber] 69012: [NTOS:KE] - Fix KiGetCacheInformation for Intel processors according to the latest Intel Instruction Set Reference
by tfaber＠svn.reactos.org 04 Sep '15

04 Sep '15

Author: tfaber Date: Fri Sep 4 20:33:37 2015 New Revision: 69012 URL: http://svn.reactos.org/svn/reactos?rev=69012&view=rev Log: [NTOS:KE] - Fix KiGetCacheInformation for Intel processors according to the latest Intel Instruction Set Reference Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/cpu.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] Fri Sep 4 20:33:37 2015 @@ -525,149 +525,114 @@ CurrentRegister >>= 8; if (!RegisterByte) continue; - /* - * Valid values are from 0x40 (0 bytes) to 0x49 - * (32MB), or from 0x80 to 0x89 (same size but - * 8-way associative. - */ - if (((RegisterByte > 0x40) && (RegisterByte <= 0x47)) || - ((RegisterByte > 0x78) && (RegisterByte <= 0x7C)) || - ((RegisterByte > 0x80) && (RegisterByte <= 0x85))) + Size = 0; + switch (RegisterByte) { - /* Compute associativity */ - Associativity = 4; - if (RegisterByte >= 0x79) Associativity = 8; - - /* Mask out only the first nibble */ - RegisterByte &= 0x07; - - /* Check if this cache is bigger than the last */ - Size = 0x10000 << RegisterByte; - if ((Size / Associativity) > CurrentSize) - { - /* Set the L2 Cache Size and Associativity */ - CurrentSize = Size / Associativity; - Pcr->SecondLevelCacheSize = Size; - Pcr->SecondLevelCacheAssociativity = Associativity; - } + case 0x06: + case 0x08: + KePrefetchNTAGranularity = 32; + break; + case 0x09: + KePrefetchNTAGranularity = 64; + break; + case 0x0a: + case 0x0c: + KePrefetchNTAGranularity = 32; + break; + case 0x0d: + case 0x0e: + KePrefetchNTAGranularity = 64; + break; + case 0x1d: + Size = 128 * 1024; + Associativity = 2; + break; + case 0x21: + Size = 256 * 1024; + Associativity = 8; + break; + case 0x24: + Size = 1024 * 1024; + Associativity = 16; + break; + case 0x2c: + case 0x30: + KePrefetchNTAGranularity = 64; + break; + case 0x41: + case 0x42: + case 0x43: + case 0x44: + case 0x45: + Size = (1 << (RegisterByte - 0x41)) * 128 * 1024; + Associativity = 4; + break; + case 0x48: + Size = 3 * 1024 * 1024; + Associativity = 12; + break; + case 0x49: + Size = 4 * 1024 * 1024; + Associativity = 16; + break; + case 0x4e: + Size = 6 * 1024 * 1024; + Associativity = 24; + break; + case 0x60: + case 0x66: + case 0x67: + case 0x68: + KePrefetchNTAGranularity = 64; + break; + case 0x78: + Size = 1024 * 1024; + Associativity = 4; + break; + case 0x79: + case 0x7a: + case 0x7b: + case 0x7c: + case 0x7d: + Size = (1 << (RegisterByte - 0x79)) * 128 * 1024; + Associativity = 8; + break; + case 0x7f: + Size = 512 * 1024; + Associativity = 2; + break; + case 0x80: + Size = 512 * 1024; + Associativity = 8; + break; + case 0x82: + case 0x83: + case 0x84: + case 0x85: + Size = (1 << (RegisterByte - 0x82)) * 256 * 1024; + Associativity = 8; + break; + case 0x86: + Size = 512 * 1024; + Associativity = 4; + break; + case 0x87: + Size = 1024 * 1024; + Associativity = 8; + break; + case 0xf0: + KePrefetchNTAGranularity = 64; + break; + case 0xf1: + KePrefetchNTAGranularity = 128; + break; } - else if ((RegisterByte > 0x21) && (RegisterByte <= 0x29)) + if (Size && (Size / Associativity) > CurrentSize) { - /* Set minimum cache line size */ - if (CacheLine < 128) CacheLine = 128; - - /* Hard-code size/associativity */ - Associativity = 8; - switch (RegisterByte) - { - case 0x22: - Size = 512 * 1024; - Associativity = 4; - break; - - case 0x23: - Size = 1024 * 1024; - break; - - case 0x25: - Size = 2048 * 1024; - break; - - case 0x29: - Size = 4096 * 1024; - break; - - default: - Size = 0; - break; - } - - /* Check if this cache is bigger than the last */ - if ((Size / Associativity) > CurrentSize) - { - /* Set the L2 Cache Size and Associativity */ - CurrentSize = Size / Associativity; - Pcr->SecondLevelCacheSize = Size; - Pcr->SecondLevelCacheAssociativity = Associativity; - } - } - else if (((RegisterByte > 0x65) && (RegisterByte < 0x69)) || - (RegisterByte == 0x2C) || (RegisterByte == 0xF0)) - { - /* Indicates L1 cache line of 64 bytes */ - KePrefetchNTAGranularity = 64; - } - else if (RegisterByte == 0xF1) - { - /* Indicates L1 cache line of 128 bytes */ - KePrefetchNTAGranularity = 128; - } - else if (((RegisterByte >= 0x4A) && (RegisterByte <= 0x4C)) || - (RegisterByte == 0x78) || - (RegisterByte == 0x7D) || - (RegisterByte == 0x7F) || - (RegisterByte == 0x86) || - (RegisterByte == 0x87)) - { - /* Set minimum cache line size */ - if (CacheLine < 64) CacheLine = 64; - - /* Hard-code size/associativity */ - switch (RegisterByte) - { - case 0x4A: - Size = 4 * 1024 * 1024; - Associativity = 8; - break; - - case 0x4B: - Size = 6 * 1024 * 1024; - Associativity = 12; - break; - - case 0x4C: - Size = 8 * 1024 * 1024; - Associativity = 16; - break; - - case 0x78: - Size = 1 * 1024 * 1024; - Associativity = 4; - break; - - case 0x7D: - Size = 2 * 1024 * 1024; - Associativity = 8; - break; - - case 0x7F: - Size = 512 * 1024; - Associativity = 2; - break; - - case 0x86: - Size = 512 * 1024; - Associativity = 4; - break; - - case 0x87: - Size = 1 * 1024 * 1024; - Associativity = 8; - break; - - default: - Size = 0; - break; - } - - /* Check if this cache is bigger than the last */ - if ((Size / Associativity) > CurrentSize) - { - /* Set the L2 Cache Size and Associativity */ - CurrentSize = Size / Associativity; - Pcr->SecondLevelCacheSize = Size; - Pcr->SecondLevelCacheAssociativity = Associativity; - } + /* Set the L2 Cache Size and Associativity */ + CurrentSize = Size / Associativity; + Pcr->SecondLevelCacheSize = Size; + Pcr->SecondLevelCacheAssociativity = Associativity; } } }

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