Merge pull request #88 from enthought/handle-resource-name-null

Stop enumeration when name is null
enthought · Sep 23, 2020 · 28364ce · 28364ce
2 parents b112ca8 + 392782c
commit 28364ce
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/win32ctypes/core/cffi/_resource.py b/win32ctypes/core/cffi/_resource.py
@@ -50,6 +50,8 @@ def wrapped(hModule, lpszType, lParam):
 
 def ENUMRESNAMEPROC(callback):
     def wrapped(hModule, lpszType, lpszName, lParam):
+        if lpszName == ffi.NULL:
+            return False
         return callback(
             hModule, resource(lpszType), resource(lpszName), lParam)
     return wrapped

diff --git a/win32ctypes/core/ctypes/_resource.py b/win32ctypes/core/ctypes/_resource.py
@@ -38,7 +38,9 @@ def wrapped(handle, type_, name, param):
             type_ = int(type_)
         else:
             type_ = ctypes.cast(type_, LPCWSTR).value
-        if IS_INTRESOURCE(name):
+        if name is None:
+            return False
+        elif IS_INTRESOURCE(name):
             name = int(name)
         else:
             name = ctypes.cast(name, LPCWSTR).value