Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
a7a222fd
Commit
a7a222fd
authored
Apr 12, 2016
by
Steve Dower
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Closes #26624: Adds validation of ucrtbase[d].dll version with warning for old versions.
parent
1b80b240
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
99 additions
and
2 deletions
+99
-2
Misc/NEWS
Misc/NEWS
+3
-0
PC/python_ver_rc.h
PC/python_ver_rc.h
+1
-2
PC/validate_ucrtbase.py
PC/validate_ucrtbase.py
+88
-0
PCbuild/python.vcxproj
PCbuild/python.vcxproj
+7
-0
No files found.
Misc/NEWS
View file @
a7a222fd
...
@@ -385,6 +385,9 @@ Tests
...
@@ -385,6 +385,9 @@ Tests
Build
Build
-----
-----
- Issue #26624: Adds validation of ucrtbase[d].dll version with warning
for old versions.
- Issue #17603: Avoid error about nonexistant fileblocks.o file by using a
- Issue #17603: Avoid error about nonexistant fileblocks.o file by using a
lower-level check for st_blocks in struct stat.
lower-level check for st_blocks in struct stat.
...
...
PC/python_ver_rc.h
View file @
a7a222fd
...
@@ -9,11 +9,10 @@
...
@@ -9,11 +9,10 @@
#define MS_WINDOWS
#define MS_WINDOWS
#include "modsupport.h"
#include "modsupport.h"
#include "patchlevel.h"
#include "patchlevel.h"
#include <pythonnt_rc.h>
#ifdef _DEBUG
#ifdef _DEBUG
# include <pythonnt_rc_d.h>
# define PYTHON_DEBUG_EXT "_d"
# define PYTHON_DEBUG_EXT "_d"
#else
#else
# include <pythonnt_rc.h>
# define PYTHON_DEBUG_EXT
# define PYTHON_DEBUG_EXT
#endif
#endif
...
...
PC/validate_ucrtbase.py
0 → 100644
View file @
a7a222fd
'''
This script gets the version number from ucrtbased.dll and checks
whether it is a version with a known issue.
'''
import
sys
from
ctypes
import
(
c_buffer
,
POINTER
,
byref
,
create_unicode_buffer
,
Structure
,
WinDLL
)
from
ctypes.wintypes
import
DWORD
,
HANDLE
class
VS_FIXEDFILEINFO
(
Structure
):
_fields_
=
[
(
"dwSignature"
,
DWORD
),
(
"dwStrucVersion"
,
DWORD
),
(
"dwFileVersionMS"
,
DWORD
),
(
"dwFileVersionLS"
,
DWORD
),
(
"dwProductVersionMS"
,
DWORD
),
(
"dwProductVersionLS"
,
DWORD
),
(
"dwFileFlagsMask"
,
DWORD
),
(
"dwFileFlags"
,
DWORD
),
(
"dwFileOS"
,
DWORD
),
(
"dwFileType"
,
DWORD
),
(
"dwFileSubtype"
,
DWORD
),
(
"dwFileDateMS"
,
DWORD
),
(
"dwFileDateLS"
,
DWORD
),
]
kernel32
=
WinDLL
(
'kernel32'
)
version
=
WinDLL
(
'version'
)
if
len
(
sys
.
argv
)
<
2
:
print
(
'Usage: validate_ucrtbase.py <ucrtbase|ucrtbased>'
)
sys
.
exit
(
2
)
try
:
ucrtbased
=
WinDLL
(
sys
.
argv
[
1
])
except
OSError
:
print
(
'Cannot find ucrtbased.dll'
)
# This likely means that VS is not installed, but that is an
# obvious enough problem if you're trying to produce a debug
# build that we don't need to fail here.
sys
.
exit
(
0
)
# We will immediately double the length up to MAX_PATH, but the
# path may be longer, so we retry until the returned string is
# shorter than our buffer.
name_len
=
actual_len
=
130
while
actual_len
==
name_len
:
name_len
*=
2
name
=
create_unicode_buffer
(
name_len
)
actual_len
=
kernel32
.
GetModuleFileNameW
(
HANDLE
(
ucrtbased
.
_handle
),
name
,
len
(
name
))
if
not
actual_len
:
print
(
'Failed to get full module name.'
)
sys
.
exit
(
2
)
size
=
version
.
GetFileVersionInfoSizeW
(
name
,
None
)
if
not
size
:
print
(
'Failed to get size of version info.'
)
sys
.
exit
(
2
)
ver_block
=
c_buffer
(
size
)
if
(
not
version
.
GetFileVersionInfoW
(
name
,
None
,
size
,
ver_block
)
or
not
ver_block
):
print
(
'Failed to get version info.'
)
sys
.
exit
(
2
)
pvi
=
POINTER
(
VS_FIXEDFILEINFO
)()
if
not
version
.
VerQueryValueW
(
ver_block
,
""
,
byref
(
pvi
),
byref
(
DWORD
())):
print
(
'Failed to get version value from info.'
)
sys
.
exit
(
2
)
ver
=
(
pvi
.
contents
.
dwProductVersionMS
>>
16
,
pvi
.
contents
.
dwProductVersionMS
&
0xFFFF
,
pvi
.
contents
.
dwProductVersionLS
>>
16
,
pvi
.
contents
.
dwProductVersionLS
&
0xFFFF
,
)
print
(
'{} is version {}.{}.{}.{}'
.
format
(
name
.
value
,
*
ver
))
if
ver
<
(
10
,
0
,
10586
):
print
(
'WARN: ucrtbased contains known issues. '
'Please update Visual Studio or the Windows SDK.'
)
print
(
'See:'
)
print
(
' http://bugs.python.org/issue26624'
)
sys
.
exit
(
1
)
PCbuild/python.vcxproj
View file @
a7a222fd
...
@@ -83,6 +83,13 @@
...
@@ -83,6 +83,13 @@
<Import
Project=
"$(VCTargetsPath)\Microsoft.Cpp.targets"
/>
<Import
Project=
"$(VCTargetsPath)\Microsoft.Cpp.targets"
/>
<ImportGroup
Label=
"ExtensionTargets"
>
<ImportGroup
Label=
"ExtensionTargets"
>
</ImportGroup>
</ImportGroup>
<Target
Name=
"ValidateUcrtbase"
AfterTargets=
"AfterBuild"
>
<PropertyGroup>
<UcrtName>
ucrtbase
</UcrtName>
<UcrtName
Condition=
"'$(Configuration)' == 'Debug'"
>
ucrtbased
</UcrtName>
</PropertyGroup>
<Exec
Command=
'"$(OutDir)python$(PyDebugExt).exe" "$(PySourcePath)PC\validate_ucrtbase.py" $(UcrtName)'
ContinueOnError=
"true"
/>
</Target>
<Target
Name=
"GeneratePythonBat"
AfterTargets=
"AfterBuild"
>
<Target
Name=
"GeneratePythonBat"
AfterTargets=
"AfterBuild"
>
<PropertyGroup>
<PropertyGroup>
<_Content>
@rem This script invokes the most recently built Python with all arguments
<_Content>
@rem This script invokes the most recently built Python with all arguments
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment