Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

When deleting registry values do not raise an exception if the value does not exist

Browse Source
This commit is contained in:
Kovid Goyal 2015-02-18 09:47:12 +05:30
parent 760ae5719c
commit 402b93394d
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/calibre/utils/winreg/lib.py
View File

@ -131,8 +131,15 @@ RegSetKeyValue = cwrap(
RegDeleteTree = cwrap(
'RegDeleteTreeW', LONG, a('key', HKEY), a('sub_key', LPCWSTR, None))
def delete_value_errcheck(result, func, args):
if result == winerror.ERROR_FILE_NOT_FOUND:
return args
if result != 0:
raise ctypes.WinError(result)
return args
RegDeleteKeyValue = cwrap(
'RegDeleteKeyValueW', LONG, a('key', HKEY), a('sub_key', LPCWSTR, None), a('name', LPCWSTR, None))
'RegDeleteKeyValueW', LONG, a('key', HKEY), a('sub_key', LPCWSTR, None), a('name', LPCWSTR, None), errcheck=delete_value_errcheck)
RegEnumKeyEx = cwrap(
'RegEnumKeyExW', LONG, a('key', HKEY), a('index', DWORD), a('name', LPWSTR), a('name_size', LPDWORD), a('reserved', LPDWORD, None),
a('cls', LPWSTR, None), a('cls_size', LPDWORD, None), a('last_write_time', ctypes.POINTER(FILETIME), in_arg=False),
@ -176,7 +183,7 @@ class Key(object):
yield name_buf.value[:lname_buf.value]
i += 1
def delete_value(self, sub_key=None, name=None):
def delete_value(self, name=None, sub_key=None):
' Delete the named value from this key. If name is None the default value is deleted. '
RegDeleteKeyValue(self.hkey, sub_key, name)