-
Notifications
You must be signed in to change notification settings - Fork 796
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
Removed considerations for Windows 95/98/ME #2400
base: main
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -63,8 +63,9 @@ def Connect(entryName, bUseCallback): | |
win32event.ResetEvent(callbackEvent) | ||
else: | ||
theCallback = None | ||
# in order to *use* the username/password of a particular dun entry, one must | ||
# explicitly get those params under win95.... | ||
# in order to *use* the username/password of a particular dun entry, | ||
# one must explicitly get those params under Win95 ... | ||
# TODO: We no longer support Windows 95, how should this code be updated ? | ||
Comment on lines
+66
to
+68
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We no longer support Windows 95, how should this code be updated ? |
||
try: | ||
dp, b = win32ras.GetEntryDialParams(None, entryName) | ||
except: | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -254,8 +254,8 @@ def EmptyMENUITEMINFO(mask=None, text_buf_size=512): | |
| win32con.MIIM_STATE | ||
| win32con.MIIM_STRING | ||
| win32con.MIIM_SUBMENU | ||
| win32con.MIIM_TYPE | ||
) | ||
# Note: No MIIM_TYPE - this screws win2k/98. | ||
Comment on lines
+257
to
-258
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This needs to be tested, I have no idea of its actual effect. Just following the comment. |
||
|
||
if mask & win32con.MIIM_STRING: | ||
text_buffer = _make_empty_text_buffer(text_buf_size) | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -94,8 +94,6 @@ PYWINTYPES_EXPORT PyTypeObject PySECURITY_ATTRIBUTESType = { | |
// @comm On platforms that support security descriptor operations, SECURITY_DESCRIPTOR | ||
// defaults to a blank security descriptor with no owner, group, dacl, or sacl. | ||
// Set to None to use a NULL security descriptor instead. | ||
// When PySECURITY_ATTRIBUTES is created on Windows 95/98/Me, SECURITY_DESCRIPTOR defaults | ||
// to None and should not be changed. | ||
// When SECURITY_DESCRIPTOR is not None, any of its methods can be invoked directly | ||
// on the PySECURITY_ATTRIBUTES object | ||
|
||
|
@@ -106,9 +104,9 @@ PySECURITY_ATTRIBUTES::PySECURITY_ATTRIBUTES(void) | |
m_sa.nLength = sizeof(SECURITY_ATTRIBUTES); | ||
m_obSD = new PySECURITY_DESCRIPTOR(SECURITY_DESCRIPTOR_MIN_LENGTH); | ||
m_sa.lpSecurityDescriptor = ((PySECURITY_DESCRIPTOR *)m_obSD)->GetSD(); | ||
// On win95/98/me (or any platform that doesn't have NT security) the | ||
// initialization of the SECURITY_DESCRIPTOR should fail, leaving the | ||
// sd NULL. | ||
// On platforms that don't have NT security, | ||
// the initialization of the SECURITY_DESCRIPTOR should fail, | ||
// leaving the sd NULL. | ||
Comment on lines
+107
to
+109
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
if (m_sa.lpSecurityDescriptor == NULL) { | ||
Py_DECREF(m_obSD); | ||
Py_INCREF(Py_None); | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We no longer support Windows 95, how should this code be updated ?