Skip to content

No ext/com-dotnet resources #14282

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
merged 3 commits into from
Aug 10, 2024
Merged

No ext/com-dotnet resources #14282

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7e99e20
Get rid of le_istream
nielsdos May 20, 2024
6e62284
Get rid of le_dispatch
nielsdos Aug 10, 2024
904dc63
Update TODOs in com_dotnet
nielsdos Aug 10, 2024
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
Next Next commit
Get rid of le_istream
  • Loading branch information
@nielsdos
nielsdos committed Aug 10, 2024
commit 7e99e20a8968613f33bf112c0c191764d5cdeece
15 changes: 1 addition & 14 deletions ext/com_dotnet/com_persist.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,18 +38,10 @@ typedef struct {
DWORD engine_thread;
LONG refcount;
php_stream *stream;
zend_resource *res;
} php_istream;

static int le_istream;
static void istream_destructor(php_istream *stm);

static void istream_dtor(zend_resource *rsrc)
{
php_istream *stm = (php_istream *)rsrc->ptr;
istream_destructor(stm);
}

#define FETCH_STM() \
php_istream *stm = (php_istream*)This; \
if (GetCurrentThreadId() != stm->engine_thread) \
Expand Down Expand Up @@ -93,8 +85,7 @@ static ULONG STDMETHODCALLTYPE stm_release(IStream *This)
ret = InterlockedDecrement(&stm->refcount);
if (ret == 0) {
/* destroy it */
if (stm->res)
zend_list_delete(stm->res);
istream_destructor(stm);
}
return ret;
}
Expand Down Expand Up @@ -271,7 +262,6 @@ PHP_COM_DOTNET_API IStream *php_com_wrapper_export_stream(php_stream *stream)
stm->stream = stream;

GC_ADDREF(stream->res);
stm->res = zend_register_resource(stm, le_istream);

return (IStream*)stm;
}
Expand Down Expand Up @@ -722,7 +712,4 @@ void php_com_persist_minit(INIT_FUNC_ARGS)
helper_ce = register_class_COMPersistHelper();
helper_ce->create_object = helper_new;
helper_ce->default_object_handlers = &helper_handlers;

le_istream = zend_register_list_destructors_ex(istream_dtor,
NULL, "com_dotnet_istream_wrapper", module_number);
}