Skip to content

gh-102344: implement winreg QueryValue / SetValue using QueryValueEx / SetValueEx #102345

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zooba merged 10 commits into from
Mar 1, 2023
Merged

gh-102344: implement winreg QueryValue / SetValue using QueryValueEx / SetValueEx #102345

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0d928df
reimplement QueryValue / SetValue
maxbachmann Feb 28, 2023
e0b256d
refactor QueryValueEx
maxbachmann Feb 28, 2023
799f380
cleanup
maxbachmann Feb 28, 2023
67ef9f3
fix type
maxbachmann Feb 28, 2023
fbc1a0e
remove unused variables
maxbachmann Feb 28, 2023
de0549b
fix duplicated variable name
maxbachmann Mar 1, 2023
deca441
add news
maxbachmann Mar 1, 2023
2c95f23
Update PC/winreg.c
maxbachmann Mar 1, 2023
8a4543b
revert part
maxbachmann Mar 1, 2023
8397a2f
move news
maxbachmann Mar 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
refactor QueryValueEx
  • Loading branch information
@maxbachmann
maxbachmann authored Feb 28, 2023
commit e0b256d791073e8133b8cbdf310e1bde1bb40908
56 changes: 26 additions & 30 deletions PC/winreg.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1582,54 +1582,50 @@ static PyObject *
winreg_QueryValueEx_impl(PyObject *module, HKEY key, const Py_UNICODE *name)
/*[clinic end generated code: output=f1b85b1c3d887ec7 input=cf366cada4836891]*/
{
long rc;
BYTE *retBuf, *tmp;
LONG rc;
WCHAR buf[256], *pbuf = buf;
DWORD size = sizeof(buf);
DWORD bufSize = 0, retSize;
DWORD typ;
PyObject *obData;
PyObject *result;
PyObject *obData = NULL;
PyObject *result = NULL;

if (PySys_Audit("winreg.QueryValue", "nuu",
(Py_ssize_t)key, NULL, name) < 0) {
return NULL;
}
rc = RegQueryValueExW(key, name, NULL, NULL, NULL, &bufSize);
if (rc == ERROR_MORE_DATA)
bufSize = 256;
else if (rc != ERROR_SUCCESS)
return PyErr_SetFromWindowsErrWithFunction(rc,
"RegQueryValueEx");
retBuf = (BYTE *)PyMem_Malloc(bufSize);
if (retBuf == NULL)
return PyErr_NoMemory();

while (1) {
retSize = bufSize;
rc = RegQueryValueExW(key, name, NULL, &typ,
(BYTE *)retBuf, &retSize);
if (rc != ERROR_MORE_DATA)
Py_BEGIN_ALLOW_THREADS
rc = RegQueryValueExW(key, name, NULL, &typ, (LPBYTE)pbuf,
&size);
Py_END_ALLOW_THREADS
if (rc != ERROR_MORE_DATA) {
break;

bufSize *= 2;
tmp = (char *) PyMem_Realloc(retBuf, bufSize);
}
void *tmp = PyMem_Realloc(pbuf != buf ? pbuf : NULL, size);
if (tmp == NULL) {
PyMem_Free(retBuf);
return PyErr_NoMemory();
PyErr_NoMemory();
goto exit;
}
retBuf = tmp;
pbuf = tmp;
}

if (rc != ERROR_SUCCESS) {
PyMem_Free(retBuf);
return PyErr_SetFromWindowsErrWithFunction(rc,
"RegQueryValueEx");
PyErr_SetFromWindowsErrWithFunction(rc, "RegQueryValueEx");
goto exit;
}
obData = Reg2Py(pbuf, length, typ);
if (obData == NULL) {
goto exit;
}
obData = Reg2Py(retBuf, bufSize, typ);
PyMem_Free(retBuf);
if (obData == NULL)
return NULL;
result = Py_BuildValue("Oi", obData, typ);
Py_DECREF(obData);

exit:
if (pbuf != buf) {
PyMem_Free(pbuf);
}
return result;
}

Expand Down