Skip to content

Commit e86ff6f

Browse files
authored
Removed considerations for Windows 95/98/ME (#2400)
1 parent 6396383 commit e86ff6f

31 files changed

+49
-93
lines changed

CHANGES.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,11 @@ As of build 305, installation .exe files have been deprecated; see
1818
Coming in build 312, as yet unreleased
1919
--------------------------------------
2020

21+
* Removed considerations for Windows 95/98/ME (mhammond#2400, [@Avasam][Avasam])
22+
This removes the following constants:
23+
* `win32con.FILE_ATTRIBUTE_ATOMIC_WRITE`
24+
* `win32con.FILE_ATTRIBUTE_XACTION_WRITE`
25+
2126
Build 311, released 2025/07/14
2227
------------------------------
2328

Pythonwin/doc/debugger/probs.html

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
<H1><IMG SRC="pythonwin.gif" WIDTH=64 HEIGHT=64>Pythonwin Debugger Known Problems </H1>
1111
<P>This document lists the currently known problems with the pywin.debugger package. </P>
1212
<P>You may also wish to view the <A HREF="index.html">debugger overview</A>, the <A HREF="tutorial.html">debugger tutorial</A>, or the <A HREF="general.html">general debugger documentation</A>. </P>
13-
<H3>Exiting the debugger on Windows 95 sometimes causes a crash.</H3>
14-
<P>There is a problem with the "hierlist" control on Windows 95. I don't know what it is. </P>
1513
<H3>Closing the main debugger application while debugging may cause strange results. </H3>
1614
<P>This is particularly true when debugging non-Pythonwin applications. I have made some efforts in this area, but it is pretty hard and complex. </P>
1715
<P>Closing the debugger dialog, selecting "End/Close" from one of the property pages, or "Close" from the debugging toolbar should always work as expected. </P>

Pythonwin/doc/debugger/tutorial.html

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,7 @@ <H3>From the MS-DOS Prompt</H3>
3333
<P>Change to the Pythonwin\pywin\debugger directory.</P>
3434
<P>For Windows NT users, type:</P>
3535
<CODE><P>fail.py&lt;enter&gt;</CODE> </P>
36-
<P>Or Windows 95/98 (sob - you would hope that 98 would have fixed some of 95s dumbness!)</P>
37-
<CODE><P>&lt;path to python.exe&gt;\python.exe fail.py</P>
38-
</CODE><P>or</P>
36+
<P>or</P>
3937
<CODE><P>start fail.py</CODE> </P>
4038
<H2>Using the Debugger</H2>
4139
<P>If all goes well, you should see the debugger appear in a full GUI frame, with a particular line in fail.py highlighted. Part of the screen should look something like: </P>

Pythonwin/pywin/Demos/splittst.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ def OnCreateClient(self, cp, context):
3939
self.v3.InsertItem(0, "Icon 1", 0)
4040
self.v3.InsertItem(0, "Icon 2", 1)
4141
self.v3.InsertItem(0, "Icon 3", 2)
42-
# self.v3.Arrange(commctrl.LVA_DEFAULT) Hmmm - win95 aligns left always???
4342
return 1
4443

4544
def OnDestroy(self, msg):

Pythonwin/pywin/framework/dlgappcore.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ def OnPaint(self):
3434
dc.DrawIcon((left, top), hIcon)
3535
self.EndPaint(paintStruct)
3636

37-
# Only needed to provide a minimized icon (and this seems
38-
# less important under win95/NT4
37+
# Only needed to provide a minimized icon
3938
def OnEraseBkgnd(self, dc):
4039
if self.IsIconic():
4140
return 1

Pythonwin/readme.html

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,6 @@ <H2><a name="KnownProblems">Known Problems</a></H2>
3737
<UL>
3838
<LI>Some of the configuration options (eg, &quot;Docking Windows&quot;) do not
3939
take affect until you restart Pythonwin. </LI>
40-
<LI>Under Windows 9x, any attempt to use Pythonwin features from an MS-DOS
41-
prompt seems to cause immediate death.&nbsp; This means that you can not use
42-
the Pythonwin debugger for programs running under Python.exe on Windows
43-
9x.&nbsp; You should still be able to use the debugger normally from inside
44-
Pythonwin itself. </LI>
45-
<LI>Pythonwin will occasionally crash upon exiting under Windows 9x. The crash is in
46-
&quot;user.exe&quot; (old 16 bit code) which makes debugging difficult. It does not happen on Windows NT, so I'm stumped on this one. If someone could even just narrow it down to exactly what code will cause the crash at exit I would really appreciate it. </LI>
4740
<LI>Some of the menu items are always grey.&nbsp; This functionality is simply not yet implemented in
4841
Pythonwin. </LI>
4942
</UL>

com/win32com/src/PythonCOM.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@ static CoSetCancelObjectfunc pfnCoSetCancelObject = NULL;
107107
// WinXP or later
108108
LPFNOBJECTFROMLRESULT pfnObjectFromLresult = NULL;
109109

110-
// May not be available on Windows 95, although I'm not sure that's even a concern anymore
111110
typedef HRESULT(STDAPICALLTYPE *CoCreateInstanceExfunc)(REFCLSID, IUnknown *, DWORD, COSERVERINFO *, ULONG, MULTI_QI *);
112111
static CoCreateInstanceExfunc pfnCoCreateInstanceEx = NULL;
113112
typedef HRESULT(STDAPICALLTYPE *CoInitializeSecurityfunc)(PSECURITY_DESCRIPTOR, LONG, SOLE_AUTHENTICATION_SERVICE *,

com/win32com/src/dllmain.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,6 @@ HRESULT PyCom_CoInitializeEx(LPVOID reserved, DWORD dwInit)
165165
CEnterLeaveFramework _celf;
166166
if (g_bCoInitThreadHasInit && g_dwCoInitThread == GetCurrentThreadId())
167167
return S_OK;
168-
// Do a LoadLibrary, as the Ex version may not always exist
169-
// on Win95.
170168
HMODULE hMod = GetModuleHandle(_T("ole32.dll"));
171169
if (hMod == 0)
172170
return E_HANDLE;

com/win32com/src/extensions/PyIType.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -803,7 +803,6 @@ PyObject *pythoncom_unregistertypelib(PyObject *self, PyObject *args)
803803
return NULL;
804804

805805
PY_INTERFACE_PRECALL;
806-
// WARNING: Requires Win95 OSR2 or later!!!
807806
HRESULT hr = UnRegisterTypeLib(clsid, major, minor, lcid, syskind);
808807
PY_INTERFACE_POSTCALL;
809808
if (FAILED(hr))

com/win32com/src/include/stdafx.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// are changed infrequently
44
//
55

6-
// _WIN32_DCOM screws win95 and NT :-( However, we need to define this
6+
// _WIN32_DCOM screws Windows NT :-( However, we need to define this
77
// so we don't lose all the constants etc that come with DCOM
88
//
99
#define _WIN32_DCOM

0 commit comments

Comments
 (0)