diff options
author | Serhiy Storchaka <storchaka@gmail.com> | 2016-07-07 15:20:03 (GMT) |
---|---|---|
committer | Serhiy Storchaka <storchaka@gmail.com> | 2016-07-07 15:20:03 (GMT) |
commit | 2954f8399914c77e048f9e3358abfadb7a3f76e9 (patch) | |
tree | c8398eb8aa516e897bbafe9e43cb115d0365bcb0 /PC/winreg.c | |
parent | 50600a78cb6b0e4ea47033a2fd5e982c20a5d946 (diff) | |
parent | 1a2b24f02dfd4eb3383f6ae2b59e5a4eb66fd5bb (diff) | |
download | cpython-2954f8399914c77e048f9e3358abfadb7a3f76e9.zip cpython-2954f8399914c77e048f9e3358abfadb7a3f76e9.tar.gz cpython-2954f8399914c77e048f9e3358abfadb7a3f76e9.tar.bz2 |
- Issue #27332: Fixed the type of the first argument of module-level functions
generated by Argument Clinic. Patch by Petr Viktorin.
Diffstat (limited to 'PC/winreg.c')
-rw-r--r-- | PC/winreg.c | 92 |
1 files changed, 46 insertions, 46 deletions
diff --git a/PC/winreg.c b/PC/winreg.c index 293825d..9524838 100644 --- a/PC/winreg.c +++ b/PC/winreg.c @@ -798,8 +798,8 @@ closed when the hkey object is destroyed by Python. [clinic start generated code]*/ static PyObject * -winreg_CloseKey(PyModuleDef *module, PyObject *hkey) -/*[clinic end generated code: output=d96f73439403a064 input=5b1aac65ba5127ad]*/ +winreg_CloseKey(PyObject *module, PyObject *hkey) +/*[clinic end generated code: output=a4fa537019a80d15 input=5b1aac65ba5127ad]*/ { if (!PyHKEY_Close(hkey)) return NULL; @@ -823,9 +823,9 @@ If the function fails, an OSError exception is raised. [clinic start generated code]*/ static HKEY -winreg_ConnectRegistry_impl(PyModuleDef *module, Py_UNICODE *computer_name, +winreg_ConnectRegistry_impl(PyObject *module, Py_UNICODE *computer_name, HKEY key) -/*[clinic end generated code: output=5c52f6f7ba6e7b46 input=5f98a891a347e68e]*/ +/*[clinic end generated code: output=5ab79d02aa3167b4 input=5f98a891a347e68e]*/ { HKEY retKey; long rc; @@ -860,8 +860,8 @@ If the function fails, an OSError exception is raised. [clinic start generated code]*/ static HKEY -winreg_CreateKey_impl(PyModuleDef *module, HKEY key, Py_UNICODE *sub_key) -/*[clinic end generated code: output=cd6843f30a73fc0e input=3cdd1622488acea2]*/ +winreg_CreateKey_impl(PyObject *module, HKEY key, Py_UNICODE *sub_key) +/*[clinic end generated code: output=9c81d4095527c927 input=3cdd1622488acea2]*/ { HKEY retKey; long rc; @@ -899,9 +899,9 @@ If the function fails, an OSError exception is raised. [clinic start generated code]*/ static HKEY -winreg_CreateKeyEx_impl(PyModuleDef *module, HKEY key, Py_UNICODE *sub_key, +winreg_CreateKeyEx_impl(PyObject *module, HKEY key, Py_UNICODE *sub_key, int reserved, REGSAM access) -/*[clinic end generated code: output=db835d5be84e72b2 input=42c2b03f98406b66]*/ +/*[clinic end generated code: output=b9fce6dc5c4e39b1 input=42c2b03f98406b66]*/ { HKEY retKey; long rc; @@ -934,8 +934,8 @@ is removed. If the function fails, an OSError exception is raised. [clinic start generated code]*/ static PyObject * -winreg_DeleteKey_impl(PyModuleDef *module, HKEY key, Py_UNICODE *sub_key) -/*[clinic end generated code: output=875c8917dacbc99d input=b31d225b935e4211]*/ +winreg_DeleteKey_impl(PyObject *module, HKEY key, Py_UNICODE *sub_key) +/*[clinic end generated code: output=7734b1e431991ae4 input=b31d225b935e4211]*/ { long rc; rc = RegDeleteKeyW(key, sub_key ); @@ -969,9 +969,9 @@ On unsupported Windows versions, NotImplementedError is raised. [clinic start generated code]*/ static PyObject * -winreg_DeleteKeyEx_impl(PyModuleDef *module, HKEY key, Py_UNICODE *sub_key, +winreg_DeleteKeyEx_impl(PyObject *module, HKEY key, Py_UNICODE *sub_key, REGSAM access, int reserved) -/*[clinic end generated code: output=0362a0ac6502379f input=711d9d89e7ecbed7]*/ +/*[clinic end generated code: output=01378d86ad3eb936 input=711d9d89e7ecbed7]*/ { HMODULE hMod; typedef LONG (WINAPI *RDKEFunc)(HKEY, const wchar_t*, REGSAM, int); @@ -1011,8 +1011,8 @@ Removes a named value from a registry key. [clinic start generated code]*/ static PyObject * -winreg_DeleteValue_impl(PyModuleDef *module, HKEY key, Py_UNICODE *value) -/*[clinic end generated code: output=308550b8cdcfd8e1 input=a78d3407a4197b21]*/ +winreg_DeleteValue_impl(PyObject *module, HKEY key, Py_UNICODE *value) +/*[clinic end generated code: output=67e7e9a514f84951 input=a78d3407a4197b21]*/ { long rc; Py_BEGIN_ALLOW_THREADS @@ -1041,8 +1041,8 @@ raised, indicating no more values are available. [clinic start generated code]*/ static PyObject * -winreg_EnumKey_impl(PyModuleDef *module, HKEY key, int index) -/*[clinic end generated code: output=58074ffabbc67896 input=fad9a7c00ab0e04b]*/ +winreg_EnumKey_impl(PyObject *module, HKEY key, int index) +/*[clinic end generated code: output=25a6ec52cd147bc4 input=fad9a7c00ab0e04b]*/ { long rc; PyObject *retStr; @@ -1092,8 +1092,8 @@ The result is a tuple of 3 items: [clinic start generated code]*/ static PyObject * -winreg_EnumValue_impl(PyModuleDef *module, HKEY key, int index) -/*[clinic end generated code: output=4570367ebaf0e979 input=4414f47a6fb238b5]*/ +winreg_EnumValue_impl(PyObject *module, HKEY key, int index) +/*[clinic end generated code: output=d363b5a06f8789ac input=4414f47a6fb238b5]*/ { long rc; wchar_t *retValueBuf; @@ -1179,8 +1179,8 @@ Expand environment vars. [clinic start generated code]*/ static PyObject * -winreg_ExpandEnvironmentStrings_impl(PyModuleDef *module, Py_UNICODE *string) -/*[clinic end generated code: output=4cb6914065a8663c input=b2a9714d2b751aa6]*/ +winreg_ExpandEnvironmentStrings_impl(PyObject *module, Py_UNICODE *string) +/*[clinic end generated code: output=cba46ac293a8af1a input=b2a9714d2b751aa6]*/ { wchar_t *retValue = NULL; DWORD retValueSize; @@ -1229,8 +1229,8 @@ a FlushKey() call is required, it probably isn't. [clinic start generated code]*/ static PyObject * -winreg_FlushKey_impl(PyModuleDef *module, HKEY key) -/*[clinic end generated code: output=b9a7a6e405466420 input=f57457c12297d82f]*/ +winreg_FlushKey_impl(PyObject *module, HKEY key) +/*[clinic end generated code: output=e6fc230d4c5dc049 input=f57457c12297d82f]*/ { long rc; Py_BEGIN_ALLOW_THREADS @@ -1272,9 +1272,9 @@ tree. [clinic start generated code]*/ static PyObject * -winreg_LoadKey_impl(PyModuleDef *module, HKEY key, Py_UNICODE *sub_key, +winreg_LoadKey_impl(PyObject *module, HKEY key, Py_UNICODE *sub_key, Py_UNICODE *file_name) -/*[clinic end generated code: output=b8b700e39c695b90 input=e3b5b45ade311582]*/ +/*[clinic end generated code: output=87344005c5905cde input=e3b5b45ade311582]*/ { long rc; @@ -1306,9 +1306,9 @@ If the function fails, an OSError exception is raised. [clinic start generated code]*/ static HKEY -winreg_OpenKey_impl(PyModuleDef *module, HKEY key, Py_UNICODE *sub_key, +winreg_OpenKey_impl(PyObject *module, HKEY key, Py_UNICODE *sub_key, int reserved, REGSAM access) -/*[clinic end generated code: output=79818ea356490a55 input=098505ac36a9ae28]*/ +/*[clinic end generated code: output=a905f1b947f3ce85 input=098505ac36a9ae28]*/ { HKEY retKey; long rc; @@ -1333,9 +1333,9 @@ If the function fails, an OSError exception is raised. [clinic start generated code]*/ static HKEY -winreg_OpenKeyEx_impl(PyModuleDef *module, HKEY key, Py_UNICODE *sub_key, +winreg_OpenKeyEx_impl(PyObject *module, HKEY key, Py_UNICODE *sub_key, int reserved, REGSAM access) -/*[clinic end generated code: output=2dd9f29e84ea2dbc input=c6c4972af8622959]*/ +/*[clinic end generated code: output=226042593b37e940 input=c6c4972af8622959]*/ { return winreg_OpenKey_impl(module, key, sub_key, reserved, access); } @@ -1357,8 +1357,8 @@ as 100's of nanoseconds since Jan 1, 1600. [clinic start generated code]*/ static PyObject * -winreg_QueryInfoKey_impl(PyModuleDef *module, HKEY key) -/*[clinic end generated code: output=ae885222fe966a34 input=c3593802390cde1f]*/ +winreg_QueryInfoKey_impl(PyObject *module, HKEY key) +/*[clinic end generated code: output=dc657b8356a4f438 input=c3593802390cde1f]*/ { long rc; DWORD nSubKeys, nValues; @@ -1403,8 +1403,8 @@ completeness. [clinic start generated code]*/ static PyObject * -winreg_QueryValue_impl(PyModuleDef *module, HKEY key, Py_UNICODE *sub_key) -/*[clinic end generated code: output=f91cb6f623c3b65a input=41cafbbf423b21d6]*/ +winreg_QueryValue_impl(PyObject *module, HKEY key, Py_UNICODE *sub_key) +/*[clinic end generated code: output=2bb8d1e02c10d0b6 input=41cafbbf423b21d6]*/ { long rc; PyObject *retStr; @@ -1470,8 +1470,8 @@ The return value is a tuple of the value and the type_id. [clinic start generated code]*/ static PyObject * -winreg_QueryValueEx_impl(PyModuleDef *module, HKEY key, Py_UNICODE *name) -/*[clinic end generated code: output=a4b07f7807194f23 input=cf366cada4836891]*/ +winreg_QueryValueEx_impl(PyObject *module, HKEY key, Py_UNICODE *name) +/*[clinic end generated code: output=5b4fa3e33d6d3e8f input=cf366cada4836891]*/ { long rc; BYTE *retBuf, *tmp; @@ -1543,8 +1543,8 @@ to the API. [clinic start generated code]*/ static PyObject * -winreg_SaveKey_impl(PyModuleDef *module, HKEY key, Py_UNICODE *file_name) -/*[clinic end generated code: output=33109b96bfabef8f input=da735241f91ac7a2]*/ +winreg_SaveKey_impl(PyObject *module, HKEY key, Py_UNICODE *file_name) +/*[clinic end generated code: output=1dda1502bd4c30d8 input=da735241f91ac7a2]*/ { LPSECURITY_ATTRIBUTES pSA = NULL; @@ -1589,10 +1589,10 @@ KEY_SET_VALUE access. [clinic start generated code]*/ static PyObject * -winreg_SetValue_impl(PyModuleDef *module, HKEY key, Py_UNICODE *sub_key, +winreg_SetValue_impl(PyObject *module, HKEY key, Py_UNICODE *sub_key, DWORD type, Py_UNICODE *value, Py_ssize_clean_t value_length) -/*[clinic end generated code: output=3c9c7c2769e8f953 input=2cd2adab79339c53]*/ +/*[clinic end generated code: output=1e31931174820631 input=2cd2adab79339c53]*/ { long rc; @@ -1655,9 +1655,9 @@ the configuration registry to help the registry perform efficiently. [clinic start generated code]*/ static PyObject * -winreg_SetValueEx_impl(PyModuleDef *module, HKEY key, Py_UNICODE *value_name, +winreg_SetValueEx_impl(PyObject *module, HKEY key, Py_UNICODE *value_name, PyObject *reserved, DWORD type, PyObject *value) -/*[clinic end generated code: output=ea092a935c361582 input=900a9e3990bfb196]*/ +/*[clinic end generated code: output=c88c8426b6c00ec7 input=900a9e3990bfb196]*/ { BYTE *data; DWORD len; @@ -1698,8 +1698,8 @@ of any subkeys. [clinic start generated code]*/ static PyObject * -winreg_DisableReflectionKey_impl(PyModuleDef *module, HKEY key) -/*[clinic end generated code: output=50fe6e2604324cdd input=a6c9e5ca5410193c]*/ +winreg_DisableReflectionKey_impl(PyObject *module, HKEY key) +/*[clinic end generated code: output=830cce504cc764b4 input=a6c9e5ca5410193c]*/ { HMODULE hMod; typedef LONG (WINAPI *RDRKFunc)(HKEY); @@ -1741,8 +1741,8 @@ subkeys. [clinic start generated code]*/ static PyObject * -winreg_EnableReflectionKey_impl(PyModuleDef *module, HKEY key) -/*[clinic end generated code: output=e3f23edb414f24a4 input=7748abbacd1e166a]*/ +winreg_EnableReflectionKey_impl(PyObject *module, HKEY key) +/*[clinic end generated code: output=86fa1385fdd9ce57 input=7748abbacd1e166a]*/ { HMODULE hMod; typedef LONG (WINAPI *RERKFunc)(HKEY); @@ -1782,8 +1782,8 @@ Will generally raise NotImplemented if executed on a 32bit OS. [clinic start generated code]*/ static PyObject * -winreg_QueryReflectionKey_impl(PyModuleDef *module, HKEY key) -/*[clinic end generated code: output=2a49c564ca162e50 input=9f325eacb5a65d88]*/ +winreg_QueryReflectionKey_impl(PyObject *module, HKEY key) +/*[clinic end generated code: output=4e774af288c3ebb9 input=9f325eacb5a65d88]*/ { HMODULE hMod; typedef LONG (WINAPI *RQRKFunc)(HKEY, BOOL *); |