Remove considerations for Windows 2000 and Windows Vista (#2667)

Author: Avasam

CHANGES.md

@@ -22,6 +22,8 @@ Coming in build 312, as yet unreleased
 * Implement multidimensional SAFEARRAY(COM Record) and SAFEARRAY(double) (mhammond#2655, [@geppi][geppi])
 * Added many missing license and copyright notice files (mhammond#2590, [@Avasam][Avasam])
 * Fixed missing version stamp on built `.dll` and `.exe` files (mhammond#2647, [@Avasam][Avasam])
+* Removed considerations for Windows 2000 and Windows Vista (mhammond#2667, [@Avasam][Avasam])
+  * This mostly updates obsolete documentation and tests
 * Removed considerations for Windows 95/98/ME (mhammond#2400, [@Avasam][Avasam])
   This removes the following constants:
   * `win32con.FILE_ATTRIBUTE_ATOMIC_WRITE`

com/help/active_directory.html

@@ -83,9 +83,11 @@ <h2><a name="getobj">Getting Active Directory Objects</a></h2>
 
 <h3><a name="discovery">Discovery</a></h3>
 <p>
-A tool that can be of a great help is ADSIedit which is in the Windows
-2000 support tools on the Windows 2000 server cdrom. It gives you the
-	raw ldap view of active directory.</p>
+A tool that can be of a great help is the ADSI Edit MMC snap-in, aka <b>ADSIEdit.msc</b>. See
+<a href="https://www.microsoft.com/en-us/download/details.aspx?id=45520"
+>Remote Server Administration Tools for Windows 10</a> for installation instructions.
+It gives you the raw ldap view of active directory.
+Note that it is not available for the Home edition of Windows.</p>
 <code>
 def discover():
     Here is a function that helps you determine the active directory ldap strings that you can actually use.

com/win32com/server/register.py

@@ -9,6 +9,7 @@
 
 import os
 import sys
+import tempfile
 
 import pythoncom
 import win32api
@@ -541,8 +542,6 @@ def UnregisterInfoClasses(*classes, **flags):
 
 # Attempt to 're-execute' our current process with elevation.
 def ReExecuteElevated(flags):
-    import tempfile
-
     import win32console
     import win32event  # we've already checked we are running XP above
     import win32process
@@ -646,14 +645,9 @@ def UseCommandLine(*classes, **flags):
         else:
             RegisterClasses(*classes, **flags)
     except win32api.error as exc:
-        # If we are on xp+ and have "access denied", retry using
-        # ShellExecuteEx with 'runas' verb to force elevation (vista) and/or
-        # admin login dialog (vista/xp)
-        if (
-            flags["unattended"]
-            or exc.winerror != winerror.ERROR_ACCESS_DENIED
-            or sys.getwindowsversion()[0] < 5
-        ):
+        # If we have "access denied", retry using
+        # ShellExecuteEx with 'runas' verb to force elevation
+        if flags["unattended"] or exc.winerror != winerror.ERROR_ACCESS_DENIED:
             raise
         ReExecuteElevated(flags)
 

com/win32com/src/PythonCOM.cpp

@@ -92,7 +92,6 @@ extern LONG _PyCom_GetGatewayCount(void);
 typedef HRESULT(STDAPICALLTYPE *CreateURLMonikerExfunc)(LPMONIKER, LPCWSTR, LPMONIKER *, DWORD);
 static CreateURLMonikerExfunc pfnCreateURLMonikerEx = NULL;
 
-// Win2k or later
 typedef HRESULT(STDAPICALLTYPE *CoWaitForMultipleHandlesfunc)(DWORD dwFlags, DWORD dwTimeout, ULONG cHandles,
                                                               LPHANDLE pHandles, LPDWORD lpdwindex);
 static CoWaitForMultipleHandlesfunc pfnCoWaitForMultipleHandles = NULL;
@@ -104,7 +103,6 @@ typedef HRESULT(STDAPICALLTYPE *CoSetCancelObjectfunc)(IUnknown *);
 static CoSetCancelObjectfunc pfnCoSetCancelObject = NULL;
 
 // typedefs for the function pointers are in OleAcc.h
-// WinXP or later
 LPFNOBJECTFROMLRESULT pfnObjectFromLresult = NULL;
 
 typedef HRESULT(STDAPICALLTYPE *CoCreateInstanceExfunc)(REFCLSID, IUnknown *, DWORD, COSERVERINFO *, ULONG, MULTI_QI *);

com/win32comext/propsys/src/propsys.cpp

@@ -2,10 +2,6 @@
 // $Id$
 
 // Implements wrappers for the Property System functions and interfaces.
-// These interfaces are present on Windows Vista and later, but can also
-// be installed on XP with Desktop Search 3.
-// However, this module doeen't dynamically load any libraries or functions,
-// so it will fail to import if the components are not installed.
 
 // This source file contains autoduck documentation.
 // @doc
@@ -38,13 +34,6 @@
 #include "propvarutil.h"
 #include "Shobjidl.h"
 
-#define CHECK_PFN(fname)    \
-    if (pfn##fname == NULL) \
-        return PyErr_Format(PyExc_NotImplementedError, "%s is not available on this platform", #fname);
-// Not available on Vista or earlier
-typedef HRESULT(WINAPI *PFNSHGetPropertyStoreForWindow)(HWND, REFIID, void **);
-static PFNSHGetPropertyStoreForWindow pfnSHGetPropertyStoreForWindow = NULL;
-
 // @object PyPROPERTYKEY|A tuple of a fmtid and property id (IID, int) that uniquely identifies a property
 BOOL PyWinObject_AsPROPERTYKEY(PyObject *obkey, PROPERTYKEY *pkey)
 {
@@ -390,12 +379,10 @@ static PyObject *PyPSLookupPropertyHandlerCLSID(PyObject *self, PyObject *args)
 };
 
 // @pymethod <o PyIPropertyStore>|propsys|SHGetPropertyStoreForWindow|Retrieves a collection of a window's properties
-// @comm Requires Windows 7 or later.
 // @rdesc The returned store can be used to set the System.AppUserModel.ID property that determines how windows
 //	are grouped on the taskbar
 static PyObject *PySHGetPropertyStoreForWindow(PyObject *self, PyObject *args)
 {
-    CHECK_PFN(SHGetPropertyStoreForWindow);
     HWND hwnd;
     IID riid = IID_IPropertyStore;
     void *ret;
@@ -407,7 +394,7 @@ static PyObject *PySHGetPropertyStoreForWindow(PyObject *self, PyObject *args)
 
     HRESULT hr;
     PY_INTERFACE_PRECALL;
-    hr = (*pfnSHGetPropertyStoreForWindow)(hwnd, riid, &ret);
+    hr = SHGetPropertyStoreForWindow(hwnd, riid, &ret);
     PY_INTERFACE_POSTCALL;
     if (FAILED(hr))
         return PyCom_BuildPyException(hr);
@@ -546,7 +533,7 @@ static PyObject *PySHSetDefaultProperties(PyObject *self, PyObject *args)
 }
 
 /* List of module functions */
-// @module propsys|A module, encapsulating the Vista Property System interfaces
+// @module propsys|A module, encapsulating the Property System interfaces
 static struct PyMethodDef propsys_methods[] = {
     //	{ "SHGetPropertyStoreFromIDList", PySHGetPropertyStoreFromIDList, 1 }, // @pymeth
     // SHGetPropertyStoreFromIDList|Retrieves the property store from an absolute ID list
@@ -618,10 +605,7 @@ static const PyCom_InterfaceSupportInfo g_interfaceSupportData[] = {
 /* Module initialisation */
 PYWIN_MODULE_INIT_FUNC(propsys)
 {
-    PYWIN_MODULE_INIT_PREPARE(propsys, propsys_methods,
-                              "A module, encapsulating the Property System interfaces."
-                              "Available on Windows Vista and later, but can also be used"
-                              "on XP if Desktop Search 3 is installed.");
+    PYWIN_MODULE_INIT_PREPARE(propsys, propsys_methods, "A module, encapsulating the Property System interfaces.");
 
     if (PyDict_SetItemString(dict, "error", PyWinExc_COMError) == -1)
         PYWIN_MODULE_INIT_RETURN_ERROR;
@@ -636,10 +620,5 @@ PYWIN_MODULE_INIT_FUNC(propsys)
                                        sizeof(g_interfaceSupportData) / sizeof(PyCom_InterfaceSupportInfo)) != 0)
         PYWIN_MODULE_INIT_RETURN_ERROR;
 
-    HMODULE hmod = GetModuleHandle(L"shell32.dll");
-    if (hmod)
-        pfnSHGetPropertyStoreForWindow =
-            (PFNSHGetPropertyStoreForWindow)GetProcAddress(hmod, "SHGetPropertyStoreForWindow");
-
     PYWIN_MODULE_INIT_RETURN_SUCCESS;
 }

com/win32comext/shell/demos/explorer_browser.py

@@ -1,4 +1,4 @@
-# A sample of using Vista's IExplorerBrowser interfaces...
+# A sample of using IExplorerBrowser interfaces...
 # Currently doesn't quite work:
 # * CPU sits at 100% while running.
 

com/win32comext/shell/demos/servers/context_menu.py

@@ -78,12 +78,11 @@ def InvokeCommand(self, ci):
         mask, hwnd, verb, params, dir, nShow, hotkey, hicon = ci
         win32gui.MessageBox(hwnd, "Hello", "Wow", win32con.MB_OK)
 
-    def GetCommandString(self, cmd, typ):
+    def GetCommandString(self, cmd: int, typ):
         # If GetCommandString returns the same string for all items then
-        # the shell seems to ignore all but one.  This is even true in
-        # Win7 etc where there is no status bar (and hence this string seems
-        # ignored)
-        return "Hello from Python (cmd=%d)!!" % (cmd,)
+        # the shell seems to ignore all but one.  This is even true if the
+        # status bar is turned off (and hence this string seems ignored).
+        return f"Hello from Python ({cmd=})!!"
 
 
 def DllRegisterServer():

com/win32comext/shell/demos/servers/folder_view.py

@@ -8,7 +8,8 @@
 import os
 import pickle
 import random
-import sys
+import struct
+import winreg
 
 import commctrl
 import pythoncom
@@ -796,12 +797,6 @@ def get_schema_fname():
 
 
 def DllRegisterServer():
-    import winreg
-
-    if sys.getwindowsversion()[0] < 6:
-        print("This sample only works on Vista")
-        sys.exit(1)
-
     key = winreg.CreateKey(
         winreg.HKEY_LOCAL_MACHINE,
         "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\"
@@ -816,7 +811,6 @@ def DllRegisterServer():
     attr = (
         shellcon.SFGAO_FOLDER | shellcon.SFGAO_HASSUBFOLDER | shellcon.SFGAO_BROWSABLE
     )
-    import struct
 
     s = struct.pack("i", attr)
     winreg.SetValueEx(key, "Attributes", 0, winreg.REG_BINARY, s)
@@ -832,8 +826,6 @@ def DllRegisterServer():
 
 
 def DllUnregisterServer():
-    import winreg
-
     paths = [
         "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Desktop\\Namespace\\"
         + ShellFolder._reg_clsid_,

com/win32comext/shell/src/PyIFileOperation.cpp

@@ -629,7 +629,6 @@ PyObject *PyIFileOperation::GetAnyOperationsAborted(PyObject *self, PyObject *ar
 //	performed by the shell as a unit.  Serves as a replacement for <om shell.SHFileOperation>.
 // <nl>No changes are actually made until PerformOperations is called.
 // <nl>Progress can be monitored by implementing <o PyGFileOperationProgressSink>.
-// <nl>Requires Vista or later.
 static struct PyMethodDef PyIFileOperation_methods[] = {
     {"Advise", PyIFileOperation::Advise, 1},      // @pymeth Advise|Connects an event sink to receive updates
     {"Unadvise", PyIFileOperation::Unadvise, 1},  // @pymeth Unadvise|Disconnects a progress sink

com/win32comext/shell/src/PyIKnownFolder.cpp

@@ -211,7 +211,6 @@ PyObject *PyIKnownFolder::GetFolderDefinition(PyObject *self, PyObject *args)
 
 // @object PyIKnownFolder|Interface representing a known folder that serves
 // as a replacement for the numeric CSIDL definitions and API functions.
-// Requires Vista or later.
 static struct PyMethodDef PyIKnownFolder_methods[] = {
     {"GetId", PyIKnownFolder::GetId, 1},  // @pymeth GetId|Returns the id of the folder
     {"GetCategory", PyIKnownFolder::GetCategory,