mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-02 19:12:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 14

Get rid of Win32s check.

Browse source
This commit is contained in:
Guido van Rossum 2000-04-04 22:48:55 +00:00
parent bf4041a0a6
commit 4f3cc35cc1
1 changed files with 1 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

18
PC/import_nt.c
View file

@ -14,22 +14,6 @@
extern const char *PyWin_DLLVersionString; // a string loaded from the DLL at startup. extern const char *PyWin_DLLVersionString; // a string loaded from the DLL at startup.
/* Return whether this is Win32s, i.e., Win32 API on Win 3.1(1).
This function is exported! */
BOOL PyWin_IsWin32s()
{
static BOOL bIsWin32s = -1; /* flag as "not yet looked" */
if (bIsWin32s == -1) {
OSVERSIONINFO ver;
ver.dwOSVersionInfoSize = sizeof(ver);
GetVersionEx(&ver);
bIsWin32s = ver.dwPlatformId == VER_PLATFORM_WIN32s;
}
return bIsWin32s;
}
FILE *PyWin_FindRegisteredModule( const char *moduleName, struct filedescr **ppFileDesc, char *pathBuf, int pathLen) FILE *PyWin_FindRegisteredModule( const char *moduleName, struct filedescr **ppFileDesc, char *pathBuf, int pathLen)
{ {
char *moduleKey; char *moduleKey;
@ -43,7 +27,7 @@ FILE *PyWin_FindRegisteredModule( const char *moduleName, struct filedescr **ppF
#endif #endif
struct filedescr *fdp = NULL; struct filedescr *fdp = NULL;
FILE *fp; FILE *fp;
HKEY keyBase = PyWin_IsWin32s() ? HKEY_CLASSES_ROOT : HKEY_LOCAL_MACHINE; HKEY keyBase = HKEY_LOCAL_MACHINE;
int modNameSize; int modNameSize;
long regStat; long regStat;