chore: 全仓同步 w32→win32 模块改名与 range(int(...)) 显式收窄适配
This commit is contained in:
1 parent
ea2af739dd
commit
d206abf3e1
49 files changed
+16545
-16495
No files matched your search
+600
-600
File diff suppressed because it is too large.
Load diff
@@ -5,9 +5,9 @@ import string
|
||||
import stdlib
|
||||
import viperlib
|
||||
import hashlib
|
||||
import w32.win32file
|
||||
import w32.win32base
|
||||
import w32.fileio as fileio
|
||||
import win32.win32file
|
||||
import win32.win32base
|
||||
import win32.fileio as fileio
|
||||
|
||||
|
||||
# Utils - project utility functions (SHA1 hashing, directory cleanup)
|
||||
@@ -19,9 +19,9 @@ _mbuddy: memhub.MemBuddy*
|
||||
# nibble_to_hex_char - convert a nibble to a hex character
|
||||
def nibble_to_hex_char(n: int, uppercase: int) -> char:
|
||||
"""Convert a 0-15 nibble to a hex character (uppercase=1 uses 'A'-'F')."""
|
||||
if n < 10: return '0' + n
|
||||
if uppercase != 0: return 'A' + (n - 10)
|
||||
return 'a' + (n - 10)
|
||||
if n < 10: return char('0' + n)
|
||||
if uppercase != 0: return char('A' + (n - 10))
|
||||
return char('a' + (n - 10))
|
||||
|
||||
|
||||
# bytes_to_hex - convert a byte sequence to a hex string
|
||||
@@ -33,7 +33,7 @@ def bytes_to_hex(pool: memhub.MemBuddy*, digest: bytes, nbytes: sizet, uppercase
|
||||
if use_malloc != 0: hex_buf = stdlib.malloc(hex_len)
|
||||
else: hex_buf = pool.alloc(hex_len)
|
||||
if hex_buf is None: return None
|
||||
for i in range(nbytes):
|
||||
for i in range(int(nbytes)):
|
||||
hi: int = (digest[i] >> 4) & 0xF
|
||||
lo: int = digest[i] & 0xF
|
||||
hex_buf[i * 2] = nibble_to_hex_char(hi, uppercase)
|
||||
@@ -129,7 +129,7 @@ def PathToModuleName(path: str, strip_includes_prefix: int) -> str:
|
||||
# Copy and replace / with .
|
||||
result: str = stdlib.malloc(plen + 1)
|
||||
if result is None: return None
|
||||
for ri in range(plen):
|
||||
for ri in range(int(plen)):
|
||||
ch: char = path[path_start + ri]
|
||||
if ch == '/' or ch == '\\': result[ri] = '.'
|
||||
else: result[ri] = ch
|
||||
@@ -146,14 +146,14 @@ def CleanDir(dir_path: str) -> int:
|
||||
if pattern is None: return -1
|
||||
viperlib.snprintf(pattern, dir_len + 8, "%s/*", dir_path)
|
||||
|
||||
find_data: w32.win32file.WIN32_FIND_DATAA* = stdlib.malloc(w32.win32file.WIN32_FIND_DATAA.__sizeof__())
|
||||
find_data: win32.win32file.WIN32_FIND_DATAA* = stdlib.malloc(win32.win32file.WIN32_FIND_DATAA.__sizeof__())
|
||||
if find_data is None:
|
||||
stdlib.free(pattern)
|
||||
return -1
|
||||
string.memset(find_data, 0, w32.win32file.WIN32_FIND_DATAA.__sizeof__())
|
||||
string.memset(find_data, 0, win32.win32file.WIN32_FIND_DATAA.__sizeof__())
|
||||
|
||||
handle: w32.win32base.HANDLE = w32.win32file.FindFirstFileA(pattern, find_data)
|
||||
if handle == w32.win32base.INVALID_HANDLE_VALUE:
|
||||
handle: win32.win32base.HANDLE = win32.win32file.FindFirstFileA(pattern, find_data)
|
||||
if handle == win32.win32base.INVALID_HANDLE_VALUE:
|
||||
stdlib.free(pattern)
|
||||
stdlib.free(find_data)
|
||||
return 0
|
||||
@@ -170,21 +170,21 @@ def CleanDir(dir_path: str) -> int:
|
||||
full_path: bytes = JoinPath(dir_path, fname)
|
||||
if full_path is not None:
|
||||
# Check whether this is a directory
|
||||
is_dir: uint32 = find_data.dwFileAttributes & w32.win32file.FILE_ATTRIBUTE_DIRECTORY
|
||||
is_dir: uint32 = find_data.dwFileAttributes & win32.win32file.FILE_ATTRIBUTE_DIRECTORY
|
||||
if is_dir != 0:
|
||||
# Recurse into the subdirectory
|
||||
sub_deleted: int = CleanDir(full_path)
|
||||
if sub_deleted > 0: deleted += sub_deleted
|
||||
# Remove the now-empty subdirectory
|
||||
w32.win32file.RemoveDirectoryA(full_path)
|
||||
win32.win32file.RemoveDirectoryA(full_path)
|
||||
else:
|
||||
# Delete the file
|
||||
if w32.win32file.DeleteFileA(full_path) != 0: deleted += 1
|
||||
if win32.win32file.DeleteFileA(full_path) != 0: deleted += 1
|
||||
stdlib.free(full_path)
|
||||
|
||||
if w32.win32file.FindNextFileA(handle, find_data) == 0: break
|
||||
if win32.win32file.FindNextFileA(handle, find_data) == 0: break
|
||||
|
||||
w32.win32file.FindClose(handle)
|
||||
win32.win32file.FindClose(handle)
|
||||
stdlib.free(pattern)
|
||||
stdlib.free(find_data)
|
||||
return deleted
|
||||
Reference in new issue
Block a user