Skip to content

Delete some Win9x-specific code and comments #67814

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 10, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/coreclr/debug/di/publish.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ BOOL GetAllProcessesInSystem(DWORD *ProcessId,

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

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

*pdwNumEntries = iIndex;
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/debug/ee/controller.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -883,7 +883,7 @@ void DebuggerController::CancelOutstandingThreadStarter(Thread * pThread)

//void DebuggerController::Initialize() Sets up the static
// variables for the static DebuggerController class.
// How: Sets g_runningOnWin95, initializes the critical section
// How: initializes the critical section
HRESULT DebuggerController::Initialize()
{
CONTRACT(HRESULT)
Expand Down
4 changes: 0 additions & 4 deletions src/coreclr/debug/inc/amd64/primitives.h
Original file line number Diff line number Diff line change
Expand Up @@ -219,10 +219,6 @@ inline bool AddressIsBreakpoint(CORDB_ADDRESS_TYPE *address)
return *address == CORDbg_BREAK_INSTRUCTION;
}

inline BOOL IsRunningOnWin95() {
return false;
}

inline void SetSSFlag(DT_CONTEXT *pContext)
{
_ASSERTE(pContext != NULL);
Expand Down
1 change: 0 additions & 1 deletion src/coreclr/inc/sbuffer.inl
Original file line number Diff line number Diff line change
Expand Up @@ -907,7 +907,6 @@ static const UINT64 SBUFFER_CANARY_VALUE = UI64(0xD00BED00BED00BAA);
#ifdef ALIGN_ACCESS
static const int SBUFFER_ALIGNMENT = ALIGN_ACCESS;
#else
// This is only 4 bytes on win98 and below
static const int SBUFFER_ALIGNMENT = 4;
#endif

Expand Down
4 changes: 1 addition & 3 deletions src/coreclr/utilcode/ccomprc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -221,9 +221,7 @@ void CCompRC::Destroy()
// Free all resource libraries

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -209,10 +209,6 @@ Namespace Microsoft.VisualBasic.CompilerServices
''' <param name="uFlags">Flags that indicate the meaning of the dwItem1 and dwItem2 parameter. See ShellChangeNotificationFlags.</param>
''' <param name="dwItem1">First event-dependent value.</param>
''' <param name="dwItem2">Second event-dependent value.</param>
''' <remarks>
''' Win 95/98/Me: SHChangeNotify is supported by Microsoft Layer for Unicode.
''' 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
''' </remarks>
<DllImport("shell32.dll", CharSet:=CharSet.Auto, SetLastError:=True)>
Friend Shared Sub SHChangeNotify(ByVal wEventId As UInt32, ByVal uFlags As UInt32,
ByVal dwItem1 As IntPtr, ByVal dwItem2 As IntPtr)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ The RegFlushKey function may also write out parts of or all of the other keys. C
on an application's performance. An application should only call RegFlushKey if it requires absolute certainty that registry changes are on
disk.

In general, RegFlushKey rarely, if ever, need be used. Windows 95/98: No registry subkey or value name may exceed 255 characters.
In general, RegFlushKey rarely, if ever, need be used.
**/

[Fact]
Expand Down
5 changes: 2 additions & 3 deletions src/libraries/System.Data.OleDb/src/OleDbConnection.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,9 @@ namespace System.Data.OleDb

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