Skip to content

Commit 72dc5c5

Browse files
authored
Delete some Win9x-specific code and comments (#67814)
1 parent 93c7c89 commit 72dc5c5

File tree

8 files changed

+5
-18
lines changed

8 files changed

+5
-18
lines changed

src/coreclr/debug/di/publish.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ BOOL GetAllProcessesInSystem(DWORD *ProcessId,
8181

8282
} while ((succ == TRUE) && (iIndex < (int)dwArraySize));
8383

84-
// I would like to know if we're running more than 512 processes on Win95!!
8584
_ASSERTE (iIndex < (int)dwArraySize);
8685

8786
*pdwNumEntries = iIndex;

src/coreclr/debug/ee/controller.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -883,7 +883,7 @@ void DebuggerController::CancelOutstandingThreadStarter(Thread * pThread)
883883

884884
//void DebuggerController::Initialize() Sets up the static
885885
// variables for the static DebuggerController class.
886-
// How: Sets g_runningOnWin95, initializes the critical section
886+
// How: initializes the critical section
887887
HRESULT DebuggerController::Initialize()
888888
{
889889
CONTRACT(HRESULT)

src/coreclr/debug/inc/amd64/primitives.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -219,10 +219,6 @@ inline bool AddressIsBreakpoint(CORDB_ADDRESS_TYPE *address)
219219
return *address == CORDbg_BREAK_INSTRUCTION;
220220
}
221221

222-
inline BOOL IsRunningOnWin95() {
223-
return false;
224-
}
225-
226222
inline void SetSSFlag(DT_CONTEXT *pContext)
227223
{
228224
_ASSERTE(pContext != NULL);

src/coreclr/inc/sbuffer.inl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -907,7 +907,6 @@ static const UINT64 SBUFFER_CANARY_VALUE = UI64(0xD00BED00BED00BAA);
907907
#ifdef ALIGN_ACCESS
908908
static const int SBUFFER_ALIGNMENT = ALIGN_ACCESS;
909909
#else
910-
// This is only 4 bytes on win98 and below
911910
static const int SBUFFER_ALIGNMENT = 4;
912911
#endif
913912

src/coreclr/utilcode/ccomprc.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -221,9 +221,7 @@ void CCompRC::Destroy()
221221
// Free all resource libraries
222222

223223
//*****************************************************************************
224-
// Free the loaded library if we ever loaded it and only if we are not on
225-
// Win 95 which has a known bug with DLL unloading (it randomly unloads a
226-
// dll on shut down, not necessarily the one you asked for). This is done
224+
// Free the loaded library if we ever loaded it. This is done
227225
// only in debug mode to make coverage runs accurate.
228226
//*****************************************************************************
229227

src/libraries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/Helpers/NativeMethods.vb

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -209,10 +209,6 @@ Namespace Microsoft.VisualBasic.CompilerServices
209209
''' <param name="uFlags">Flags that indicate the meaning of the dwItem1 and dwItem2 parameter. See ShellChangeNotificationFlags.</param>
210210
''' <param name="dwItem1">First event-dependent value.</param>
211211
''' <param name="dwItem2">Second event-dependent value.</param>
212-
''' <remarks>
213-
''' Win 95/98/Me: SHChangeNotify is supported by Microsoft Layer for Unicode.
214-
''' To use this http://msdn.microsoft.com/library/default.asp?url=/library/en-us/mslu/winprog/microsoft_layer_for_unicode_on_windows_95_98_me_systems.asp
215-
''' </remarks>
216212
<DllImport("shell32.dll", CharSet:=CharSet.Auto, SetLastError:=True)>
217213
Friend Shared Sub SHChangeNotify(ByVal wEventId As UInt32, ByVal uFlags As UInt32,
218214
ByVal dwItem1 As IntPtr, ByVal dwItem2 As IntPtr)

src/libraries/Microsoft.Win32.Registry/tests/RegistryKey/RegistryKey_Flush.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ The RegFlushKey function may also write out parts of or all of the other keys. C
1717
on an application's performance. An application should only call RegFlushKey if it requires absolute certainty that registry changes are on
1818
disk.
1919
20-
In general, RegFlushKey rarely, if ever, need be used. Windows 95/98: No registry subkey or value name may exceed 255 characters.
20+
In general, RegFlushKey rarely, if ever, need be used.
2121
**/
2222

2323
[Fact]

src/libraries/System.Data.OleDb/src/OleDbConnection.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,9 @@ namespace System.Data.OleDb
1616

1717
// wraps the OLEDB IDBInitialize interface which represents a connection
1818
// Notes about connection pooling
19-
// 1. Connection pooling isn't supported on Win95
20-
// 2. Only happens if we use the IDataInitialize or IDBPromptInitialize interfaces
19+
// 1. Only happens if we use the IDataInitialize or IDBPromptInitialize interfaces
2120
// it won't happen if you directly create the provider and set its properties
22-
// 3. First call on IDBInitialize must be Initialize, can't QI for any other interfaces before that
21+
// 2. First call on IDBInitialize must be Initialize, can't QI for any other interfaces before that
2322
[DefaultEvent("InfoMessage")]
2423
public sealed partial class OleDbConnection : DbConnection, ICloneable, IDbConnection
2524
{

0 commit comments

Comments
 (0)