amy/upiwin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

factored out some wrapping code to avoid name collisions

Browse Source
This commit is contained in:
Amy G. Bowersox 2021-08-30 21:39:07 -06:00
parent 12c9082666
commit 48f62edc39
1 changed files with 52 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
src/ep_resources.c
View File

@ -27,12 +27,34 @@
#include "ep_init.h" #include "ep_init.h"
#include "ep_types.h" #include "ep_types.h"
static PyObject *wrap_resource_file_handle(HRESFILE handle)
{
PyObject *rc = NULL, *args, *kwargs;
ResFileObject *presfile;
args = PyTuple_New(0);
if (args)
{
kwargs = PyDict_New();
if (kwargs)
{
rc = PyType_GenericNew(&ResFileType, args, kwargs);
if (rc)
{
presfile = (ResFileObject *)rc;
presfile->hresfile = handle;
}
Py_DECREF(kwargs);
}
Py_DECREF(args);
}
return rc;
}
static PyObject *resfile_load_classmethod(ResFileType *cls, PyObject *args) static PyObject *resfile_load_classmethod(ResFileType *cls, PyObject *args)
{ {
const char *filename; const char *filename;
PyObject *rc = NULL, *args, *kwargs; PyObject *rc = NULL;
ResFileObject *presfile;
HRESULT hr; HRESULT hr;
HRESFILE handle; HRESFILE handle;
@ -41,23 +63,7 @@ static PyObject *resfile_load_classmethod(ResFileType *cls, PyObject *args)
hr = Rsrc_load_file((PCSTR)filename, &handle); hr = Rsrc_load_file((PCSTR)filename, &handle);
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
{ {
args = PyTuple_New(0); rc = wrap_resource_file_handle(handle);
if (args)
{
kwargs = PyDict_New();
if (kwargs)
{
rc = PyType_GenericNew(&ResFileType, args, kwargs);
if (rc)
{
presfile = (ResFileObject *)rc;
presfile->hresfile = handle;
}
Py_DECREF(kwargs);
}
Py_DECREF(args);
}
if (!rc) if (!rc)
{ {
Rsrc_close_file(handle); Rsrc_close_file(handle);
@ -77,11 +83,34 @@ static PyObject *resfile_close(ResFileObject *self, PyObject *args)
return NULL; return NULL;
} }
static PyObject *wrap_resource_handle(HRSRC hrsrc)
{
PyObject *rc = NULL, *args, *kwargs;
ResourceObject *pres;
args = PyTuple_New(0);
if (args)
{
kwargs = PyDict_New();
if (kwargs)
{
rc = PyType_GenericNew(&ResourceType, args, kwargs);
if (rc)
{
pres = (ResourceObject *)rc;
pres->hrsrc = hrsrc;
}
Py_DECREF(kwargs);
}
Py_DECREF(args);
}
return rc;
}
static PyObject *resfile_find_resource(ResFileObject *self, PyObject *args) static PyObject *resfile_find_resource(ResFileObject *self, PyObject *args)
{ {
const char *name; const char *name;
PyObject *rc = NULL, *args, *kwargs; PyObject *rc = NULL;
ResourceObject *pres;
HRSRC hrsrc; HRSRC hrsrc;
HRESULT hr; HRESULT hr;
@ -90,23 +119,7 @@ static PyObject *resfile_find_resource(ResFileObject *self, PyObject *args)
hr = Rsrc_find_resource(self->hresfile, (PCSTR)name, NULL, &hrsrc); hr = Rsrc_find_resource(self->hresfile, (PCSTR)name, NULL, &hrsrc);
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
{ {
args = PyTuple_New(0); rc = wrap_resource_handle(hrsrc);
if (args)
{
kwargs = PyDict_New();
if (kwargs)
{
rc = PyType_GenericNew(&ResourceType, args, kwargs);
if (rc)
{
pres = (ResourceObject *)rc;
pres->hrsrc = hrsrc;
}
Py_DECREF(kwargs);
}
Py_DECREF(args);
}
if (!rc) if (!rc)
{ {
Rsrc_free_resource(hrsrc); Rsrc_free_resource(hrsrc);
@ -114,7 +127,7 @@ static PyObject *resfile_find_resource(ResFileObject *self, PyObject *args)
} }
} }
else else
PyErr_Format(PyExc_RuntimeError, "unable to load resource file '%s' (%08x)", filename, hr); PyErr_Format(PyExc_RuntimeError, "unable to load resource ''%s' (%08x)", name, hr);
return rc; return rc;
} }