Addendum for FEATURE_CODEPAGES_FILE

diff --git a/src/classlibnative/inc/nlstable.h b/src/classlibnative/inc/nlstable.h
deleted file mode 100644 (file)
index b5f5a4b..0000000
--- a/src/classlibnative/inc/nlstable.h
+++ /dev/null
@@ -1,121 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-// ==++==
-//
-
-//
-
-//
-// TODO: NLS Arrowhead - when we have win7 unicode support this can "go away"
-// ==--==
-#ifndef _NLSTABLE_H
-#define _NLSTABLE_H
-
-////////////////////////////////////////////////////////////////////////////
-//
-//  Class:    NLSTable
-// 
-//  Purpose:  The base class for NLS+ table.  This class provides the utility
-//            functions to open and map a view of NLS+ data files.
-//
-//  Date:     August 31, 1999
-//
-////////////////////////////////////////////////////////////////////////////
-
-typedef  LPWORD        P844_TABLE;     // ptr to 8:4:4 table
-
-//
-//  Macros For High and Low Nibbles of a BYTE.
-//
-#define LO_NIBBLE(b)              ((BYTE)((BYTE)(b) & 0xF))
-#define HI_NIBBLE(b)              ((BYTE)(((BYTE)(b) >> 4) & 0xF))
-
-//
-//  Macros for Extracting the 8:4:4 Index Values.
-//
-#define GET8(w)                   (HIBYTE(w))
-#define GETHI4(w)                 (HI_NIBBLE(LOBYTE(w)))
-#define GETLO4(w)                 (LO_NIBBLE(LOBYTE(w)))
-
-////////////////////////////////////////////////////////////////////////////
-//
-//  Traverse844Byte
-//
-//  Traverses the 8:4:4 translation table for the given wide character.  It
-//  returns the final value of the 8:4:4 table, which is a BYTE in length.
-//
-//  NOTE: Offsets in table are in BYTES.
-//
-//    Broken Down Version:
-//    --------------------
-//        Incr = pTable[GET8(wch)] / sizeof(WORD);
-//        Incr = pTable[Incr + GETHI4(wch)];
-//        Value = (BYTE *)pTable[Incr + GETLO4(wch)];
-//
-//   
-////////////////////////////////////////////////////////////////////////////
-
-inline BYTE& Traverse844Byte(const WORD * pTable, WCHAR wch)
-{
-    return (
-             ((BYTE *)pTable)[
-                pTable[
-                   (pTable[GET8(wch)] / sizeof(WORD)) + GETHI4(wch)
-                ] + GETLO4(wch)
-             ]
-           );
-}
-
-////////////////////////////////////////////////////////////////////////////
-//
-//  Traverse844Word
-//
-//  Traverses the 8:4:4 translation table for the given wide character.  It
-//  returns the final value of the 8:4:4 table, which is a WORD in length.
-//
-//    Broken Down Version:
-//    --------------------
-//        Incr = pTable[GET8(wch)];
-//        Incr = pTable[Incr + GETHI4(wch)];
-//        Value = pTable[Incr + GETLO4(wch)];
-//
-//   
-////////////////////////////////////////////////////////////////////////////
-
-inline WORD Traverse844Word(const WORD * pTable, WCHAR wch)
-{
-    return (pTable[pTable[pTable[GET8(wch)] + GETHI4(wch)] + GETLO4(wch)]);
-}
-
-////////////////////////////////////////////////////////////////////////////
-//
-//  GET_INCR_VALUE
-//
-//  Gets the value of a given wide character from the given 8:4:4 table.  It
-//  then uses the value as an increment by adding it to the given wide
-//  character code point.
-//
-//  NOTE:  Whenever there is no translation for the given code point, the
-//         tables will return an increment value of 0.  This way, the
-//         wide character passed in is the same value that is returned.
-//
-//  DEFINED AS A MACRO.
-//
-//   
-////////////////////////////////////////////////////////////////////////////
-
-inline WCHAR GetIncrValue(const WORD * p844Tbl, WCHAR wch)
-{
-     return ((WCHAR)(wch + Traverse844Word(p844Tbl, wch)));
-}
-
-class NLSTable
-{
-    public:
-        static HANDLE CreateSharedMemoryMapping(const LPCWSTR pMappingName, const int iSize );
-        static PBYTE OpenOrCreateMemoryMapping(const LPCWSTR pMappingName, const int iSize , HANDLE *mappedFile);
-};
-
-#endif  // _NLSTABLE_H

diff --git a/src/classlibnative/nls/nlsinfo.cpp b/src/classlibnative/nls/nlsinfo.cpp
index a9b1918..507a18b 100644 (file)
--- a/src/classlibnative/nls/nlsinfo.cpp
+++ b/src/classlibnative/nls/nlsinfo.cpp
@@ -33,7 +33,6 @@
 #include "metasig.h"
 #include "nls.h"
 #include "nlsinfo.h"
-#include "nlstable.h"
 
 //#include <mlang.h>
 #include "sortversioning.h"

diff --git a/src/vm/securitymeta.cpp b/src/vm/securitymeta.cpp
index 73552ac..7027c47 100644 (file)
--- a/src/vm/securitymeta.cpp
+++ b/src/vm/securitymeta.cpp
@@ -21,7 +21,6 @@
 #include "security.h"
 
 #include "perfcounters.h"
-#include "nlstable.h"
 #include "frames.h"
 #include "dllimport.h"
 #include "strongname.h"