mirror of
https://github.com/reactos/reactos.git
synced 2025-08-05 00:45:43 +00:00
[RTL] actctx.c: Revert pointless formatting changes
This commit is contained in:
parent
49ed915759
commit
37b2e791ee
1 changed files with 41 additions and 76 deletions
|
@ -9,7 +9,7 @@
|
||||||
* Jacek Caban for CodeWeavers
|
* Jacek Caban for CodeWeavers
|
||||||
* Alexandre Julliard
|
* Alexandre Julliard
|
||||||
* Stefan Ginsberg (stefan.ginsberg@reactos.org)
|
* Stefan Ginsberg (stefan.ginsberg@reactos.org)
|
||||||
* Samuel Serapión
|
* Samuel Serapión
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* Based on Wine 3.2-37c98396 */
|
/* Based on Wine 3.2-37c98396 */
|
||||||
|
@ -2978,7 +2978,6 @@ static NTSTATUS search_manifest_in_module( struct actctx_loader* acl, struct ass
|
||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static NTSTATUS get_manifest_in_pe_file( struct actctx_loader* acl, struct assembly_identity* ai,
|
static NTSTATUS get_manifest_in_pe_file( struct actctx_loader* acl, struct assembly_identity* ai,
|
||||||
LPCWSTR filename, LPCWSTR directory, BOOL shared,
|
LPCWSTR filename, LPCWSTR directory, BOOL shared,
|
||||||
HANDLE file, LPCWSTR resname, ULONG lang )
|
HANDLE file, LPCWSTR resname, ULONG lang )
|
||||||
|
@ -3060,7 +3059,6 @@ static NTSTATUS get_manifest_in_manifest_file( struct actctx_loader* acl, struct
|
||||||
size.QuadPart = 0;
|
size.QuadPart = 0;
|
||||||
status = NtCreateSection( &mapping, STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ,
|
status = NtCreateSection( &mapping, STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ,
|
||||||
&attr, &size, PAGE_READONLY, SEC_COMMIT, file );
|
&attr, &size, PAGE_READONLY, SEC_COMMIT, file );
|
||||||
|
|
||||||
if (status != STATUS_SUCCESS) return status;
|
if (status != STATUS_SUCCESS) return status;
|
||||||
|
|
||||||
offset.QuadPart = 0;
|
offset.QuadPart = 0;
|
||||||
|
@ -3843,10 +3841,7 @@ static NTSTATUS find_window_class(ACTIVATION_CONTEXT* actctx, const UNICODE_STRI
|
||||||
return STATUS_SUCCESS;
|
return STATUS_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
_Must_inspect_result_
|
static NTSTATUS build_tlib_section(ACTIVATION_CONTEXT* actctx, struct guidsection_header **section)
|
||||||
static
|
|
||||||
NTSTATUS
|
|
||||||
build_tlib_section(ACTIVATION_CONTEXT* actctx, struct guidsection_header **section)
|
|
||||||
{
|
{
|
||||||
unsigned int i, j, k, total_len = 0, tlib_count = 0, names_len = 0;
|
unsigned int i, j, k, total_len = 0, tlib_count = 0, names_len = 0;
|
||||||
struct guidsection_header *header;
|
struct guidsection_header *header;
|
||||||
|
@ -4083,10 +4078,7 @@ static void get_comserver_datalen(const struct entity_array *entities, const str
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
_Must_inspect_result_
|
static NTSTATUS add_comserver_record(const struct guidsection_header *section, const struct entity_array *entities,
|
||||||
static
|
|
||||||
NTSTATUS
|
|
||||||
add_comserver_record(const struct guidsection_header *section, const struct entity_array *entities,
|
|
||||||
const struct dll_redirect *dll, struct guid_index **index, ULONG *data_offset, ULONG *module_offset,
|
const struct dll_redirect *dll, struct guid_index **index, ULONG *data_offset, ULONG *module_offset,
|
||||||
ULONG *seed, ULONG rosterindex)
|
ULONG *seed, ULONG rosterindex)
|
||||||
{
|
{
|
||||||
|
@ -4269,10 +4261,7 @@ add_comserver_record(const struct guidsection_header *section, const struct enti
|
||||||
return STATUS_SUCCESS;
|
return STATUS_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
_Must_inspect_result_
|
static NTSTATUS build_comserver_section(ACTIVATION_CONTEXT* actctx, struct guidsection_header **section)
|
||||||
static
|
|
||||||
NTSTATUS
|
|
||||||
build_comserver_section(ACTIVATION_CONTEXT* actctx, struct guidsection_header **section)
|
|
||||||
{
|
{
|
||||||
unsigned int i, j, total_len = 0, class_count = 0, names_len = 0;
|
unsigned int i, j, total_len = 0, class_count = 0, names_len = 0;
|
||||||
struct guidsection_header *header;
|
struct guidsection_header *header;
|
||||||
|
@ -4340,10 +4329,7 @@ static inline struct comclassredirect_data *get_comclass_data(ACTIVATION_CONTEXT
|
||||||
return (struct comclassredirect_data*)((BYTE*)actctx->comserver_section + index->data_offset);
|
return (struct comclassredirect_data*)((BYTE*)actctx->comserver_section + index->data_offset);
|
||||||
}
|
}
|
||||||
|
|
||||||
_Must_inspect_result_
|
static NTSTATUS find_comserver_redirection(ACTIVATION_CONTEXT* actctx, const GUID *guid, ACTCTX_SECTION_KEYED_DATA* data)
|
||||||
static
|
|
||||||
NTSTATUS
|
|
||||||
find_comserver_redirection(ACTIVATION_CONTEXT* actctx, const GUID *guid, ACTCTX_SECTION_KEYED_DATA* data)
|
|
||||||
{
|
{
|
||||||
struct comclassredirect_data *comclass;
|
struct comclassredirect_data *comclass;
|
||||||
struct guid_index *index = NULL;
|
struct guid_index *index = NULL;
|
||||||
|
@ -4400,10 +4386,7 @@ static void get_ifaceps_datalen(const struct entity_array *entities, unsigned in
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
_Must_inspect_result_
|
static NTSTATUS add_ifaceps_record(struct guidsection_header *section, struct entity_array *entities,
|
||||||
static
|
|
||||||
NTSTATUS
|
|
||||||
add_ifaceps_record(struct guidsection_header *section, struct entity_array *entities,
|
|
||||||
struct guid_index **index, ULONG *data_offset, ULONG rosterindex)
|
struct guid_index **index, ULONG *data_offset, ULONG rosterindex)
|
||||||
{
|
{
|
||||||
unsigned int i;
|
unsigned int i;
|
||||||
|
@ -4492,10 +4475,7 @@ add_ifaceps_record(struct guidsection_header *section, struct entity_array *enti
|
||||||
return STATUS_SUCCESS;
|
return STATUS_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
_Must_inspect_result_
|
static NTSTATUS build_ifaceps_section(ACTIVATION_CONTEXT* actctx, struct guidsection_header **section)
|
||||||
static
|
|
||||||
NTSTATUS
|
|
||||||
build_ifaceps_section(ACTIVATION_CONTEXT* actctx, struct guidsection_header **section)
|
|
||||||
{
|
{
|
||||||
unsigned int i, j, total_len = 0, count = 0;
|
unsigned int i, j, total_len = 0, count = 0;
|
||||||
struct guidsection_header *header;
|
struct guidsection_header *header;
|
||||||
|
@ -4562,10 +4542,7 @@ static inline struct ifacepsredirect_data *get_ifaceps_data(ACTIVATION_CONTEXT *
|
||||||
return (struct ifacepsredirect_data*)((BYTE*)actctx->ifaceps_section + index->data_offset);
|
return (struct ifacepsredirect_data*)((BYTE*)actctx->ifaceps_section + index->data_offset);
|
||||||
}
|
}
|
||||||
|
|
||||||
_Must_inspect_result_
|
static NTSTATUS find_cominterface_redirection(ACTIVATION_CONTEXT* actctx, const GUID *guid, ACTCTX_SECTION_KEYED_DATA* data)
|
||||||
static
|
|
||||||
NTSTATUS
|
|
||||||
find_cominterface_redirection(ACTIVATION_CONTEXT* actctx, const GUID *guid, ACTCTX_SECTION_KEYED_DATA* data)
|
|
||||||
{
|
{
|
||||||
struct ifacepsredirect_data *iface;
|
struct ifacepsredirect_data *iface;
|
||||||
struct guid_index *index = NULL;
|
struct guid_index *index = NULL;
|
||||||
|
@ -4603,10 +4580,7 @@ find_cominterface_redirection(ACTIVATION_CONTEXT* actctx, const GUID *guid, ACTC
|
||||||
return STATUS_SUCCESS;
|
return STATUS_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
_Must_inspect_result_
|
static NTSTATUS build_clr_surrogate_section(ACTIVATION_CONTEXT* actctx, struct guidsection_header **section)
|
||||||
static
|
|
||||||
NTSTATUS
|
|
||||||
build_clr_surrogate_section(ACTIVATION_CONTEXT* actctx, struct guidsection_header **section)
|
|
||||||
{
|
{
|
||||||
unsigned int i, j, total_len = 0, count = 0;
|
unsigned int i, j, total_len = 0, count = 0;
|
||||||
struct guidsection_header *header;
|
struct guidsection_header *header;
|
||||||
|
@ -4722,10 +4696,7 @@ static inline struct clrsurrogate_data *get_surrogate_data(ACTIVATION_CONTEXT *a
|
||||||
return (struct clrsurrogate_data*)((BYTE*)actctx->clrsurrogate_section + index->data_offset);
|
return (struct clrsurrogate_data*)((BYTE*)actctx->clrsurrogate_section + index->data_offset);
|
||||||
}
|
}
|
||||||
|
|
||||||
_Must_inspect_result_
|
static NTSTATUS find_clr_surrogate(ACTIVATION_CONTEXT* actctx, const GUID *guid, ACTCTX_SECTION_KEYED_DATA* data)
|
||||||
static
|
|
||||||
NTSTATUS
|
|
||||||
find_clr_surrogate(ACTIVATION_CONTEXT* actctx, const GUID *guid, ACTCTX_SECTION_KEYED_DATA* data)
|
|
||||||
{
|
{
|
||||||
struct clrsurrogate_data *surrogate;
|
struct clrsurrogate_data *surrogate;
|
||||||
struct guid_index *index = NULL;
|
struct guid_index *index = NULL;
|
||||||
|
@ -4835,10 +4806,7 @@ static void write_progid_record(struct strsection_header *section, const WCHAR *
|
||||||
(*index) += 1;
|
(*index) += 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
_Must_inspect_result_
|
static NTSTATUS add_progid_record(ACTIVATION_CONTEXT* actctx, struct strsection_header *section, const struct entity_array *entities,
|
||||||
static
|
|
||||||
NTSTATUS
|
|
||||||
add_progid_record(ACTIVATION_CONTEXT* actctx, struct strsection_header *section, const struct entity_array *entities,
|
|
||||||
struct string_index **index, ULONG *data_offset, ULONG *global_offset, ULONG rosterindex)
|
struct string_index **index, ULONG *data_offset, ULONG *global_offset, ULONG rosterindex)
|
||||||
{
|
{
|
||||||
unsigned int i, j;
|
unsigned int i, j;
|
||||||
|
@ -4875,10 +4843,7 @@ add_progid_record(ACTIVATION_CONTEXT* actctx, struct strsection_header *section,
|
||||||
return Status;
|
return Status;
|
||||||
}
|
}
|
||||||
|
|
||||||
_Must_inspect_result_
|
static NTSTATUS build_progid_section(ACTIVATION_CONTEXT* actctx, struct strsection_header **section)
|
||||||
static
|
|
||||||
NTSTATUS
|
|
||||||
build_progid_section(ACTIVATION_CONTEXT* actctx, struct strsection_header **section)
|
|
||||||
{
|
{
|
||||||
unsigned int i, j, total_len = 0, count = 0;
|
unsigned int i, j, total_len = 0, count = 0;
|
||||||
struct strsection_header *header;
|
struct strsection_header *header;
|
||||||
|
@ -5116,7 +5081,6 @@ void actctx_init(PVOID* pOldShimData)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* FUNCTIONS ***************************************************************/
|
|
||||||
|
|
||||||
/***********************************************************************
|
/***********************************************************************
|
||||||
* RtlCreateActivationContext (NTDLL.@)
|
* RtlCreateActivationContext (NTDLL.@)
|
||||||
|
@ -5325,7 +5289,7 @@ RtlReleaseActivationContext( HANDLE handle )
|
||||||
/***********************************************************************
|
/***********************************************************************
|
||||||
* RtlAddRefActivationContext (NTDLL.@)
|
* RtlAddRefActivationContext (NTDLL.@)
|
||||||
*/
|
*/
|
||||||
VOID NTAPI RtlAddRefActivationContext( HANDLE handle )
|
void WINAPI RtlAddRefActivationContext( HANDLE handle )
|
||||||
{
|
{
|
||||||
ACTIVATION_CONTEXT *actctx;
|
ACTIVATION_CONTEXT *actctx;
|
||||||
|
|
||||||
|
@ -5336,7 +5300,7 @@ VOID NTAPI RtlAddRefActivationContext( HANDLE handle )
|
||||||
/******************************************************************
|
/******************************************************************
|
||||||
* RtlReleaseActivationContext (NTDLL.@)
|
* RtlReleaseActivationContext (NTDLL.@)
|
||||||
*/
|
*/
|
||||||
VOID NTAPI RtlReleaseActivationContext( HANDLE handle )
|
void WINAPI RtlReleaseActivationContext( HANDLE handle )
|
||||||
{
|
{
|
||||||
ACTIVATION_CONTEXT *actctx;
|
ACTIVATION_CONTEXT *actctx;
|
||||||
|
|
||||||
|
@ -5348,12 +5312,13 @@ VOID NTAPI RtlReleaseActivationContext( HANDLE handle )
|
||||||
/******************************************************************
|
/******************************************************************
|
||||||
* RtlZombifyActivationContext (NTDLL.@)
|
* RtlZombifyActivationContext (NTDLL.@)
|
||||||
*
|
*
|
||||||
|
* FIXME: function prototype might be wrong
|
||||||
*/
|
*/
|
||||||
NTSTATUS NTAPI RtlZombifyActivationContext(PVOID Context)
|
NTSTATUS WINAPI RtlZombifyActivationContext( HANDLE handle )
|
||||||
{
|
{
|
||||||
UNIMPLEMENTED;
|
UNIMPLEMENTED;
|
||||||
|
|
||||||
if (Context == ACTCTX_FAKE_HANDLE)
|
if (handle == ACTCTX_FAKE_HANDLE)
|
||||||
return STATUS_SUCCESS;
|
return STATUS_SUCCESS;
|
||||||
|
|
||||||
return STATUS_NOT_IMPLEMENTED;
|
return STATUS_NOT_IMPLEMENTED;
|
||||||
|
@ -5394,7 +5359,7 @@ NTSTATUS NTAPI RtlActivateActivationContext( ULONG flags, HANDLE handle, PULONG_
|
||||||
/***********************************************************************
|
/***********************************************************************
|
||||||
* RtlDeactivateActivationContext (NTDLL.@)
|
* RtlDeactivateActivationContext (NTDLL.@)
|
||||||
*/
|
*/
|
||||||
NTSTATUS NTAPI RtlDeactivateActivationContext( ULONG flags, ULONG_PTR cookie )
|
NTSTATUS WINAPI RtlDeactivateActivationContext( ULONG flags, ULONG_PTR cookie )
|
||||||
{
|
{
|
||||||
RTL_ACTIVATION_CONTEXT_STACK_FRAME *frame, *top;
|
RTL_ACTIVATION_CONTEXT_STACK_FRAME *frame, *top;
|
||||||
|
|
||||||
|
@ -5464,7 +5429,7 @@ RtlFreeActivationContextStack(IN PACTIVATION_CONTEXT_STACK Stack)
|
||||||
/******************************************************************
|
/******************************************************************
|
||||||
* RtlFreeThreadActivationContextStack (NTDLL.@)
|
* RtlFreeThreadActivationContextStack (NTDLL.@)
|
||||||
*/
|
*/
|
||||||
VOID NTAPI RtlFreeThreadActivationContextStack(VOID)
|
void WINAPI RtlFreeThreadActivationContextStack(void)
|
||||||
{
|
{
|
||||||
RtlFreeActivationContextStack(NtCurrentTeb()->ActivationContextStackPointer);
|
RtlFreeActivationContextStack(NtCurrentTeb()->ActivationContextStackPointer);
|
||||||
NtCurrentTeb()->ActivationContextStackPointer = NULL;
|
NtCurrentTeb()->ActivationContextStackPointer = NULL;
|
||||||
|
@ -5474,7 +5439,7 @@ VOID NTAPI RtlFreeThreadActivationContextStack(VOID)
|
||||||
/******************************************************************
|
/******************************************************************
|
||||||
* RtlGetActiveActivationContext (NTDLL.@)
|
* RtlGetActiveActivationContext (NTDLL.@)
|
||||||
*/
|
*/
|
||||||
NTSTATUS NTAPI RtlGetActiveActivationContext( HANDLE *handle )
|
NTSTATUS WINAPI RtlGetActiveActivationContext( HANDLE *handle )
|
||||||
{
|
{
|
||||||
if (NtCurrentTeb()->ActivationContextStackPointer->ActiveFrame)
|
if (NtCurrentTeb()->ActivationContextStackPointer->ActiveFrame)
|
||||||
{
|
{
|
||||||
|
@ -5491,7 +5456,7 @@ NTSTATUS NTAPI RtlGetActiveActivationContext( HANDLE *handle )
|
||||||
/******************************************************************
|
/******************************************************************
|
||||||
* RtlIsActivationContextActive (NTDLL.@)
|
* RtlIsActivationContextActive (NTDLL.@)
|
||||||
*/
|
*/
|
||||||
BOOLEAN NTAPI RtlIsActivationContextActive( HANDLE handle )
|
BOOLEAN WINAPI RtlIsActivationContextActive( HANDLE handle )
|
||||||
{
|
{
|
||||||
RTL_ACTIVATION_CONTEXT_STACK_FRAME *frame;
|
RTL_ACTIVATION_CONTEXT_STACK_FRAME *frame;
|
||||||
|
|
||||||
|
@ -5507,7 +5472,7 @@ BOOLEAN NTAPI RtlIsActivationContextActive( HANDLE handle )
|
||||||
* Get information about an activation context.
|
* Get information about an activation context.
|
||||||
* FIXME: function signature/prototype may be wrong
|
* FIXME: function signature/prototype may be wrong
|
||||||
*/
|
*/
|
||||||
NTSTATUS NTAPI RtlQueryInformationActivationContext( ULONG flags, HANDLE handle, PVOID subinst,
|
NTSTATUS WINAPI RtlQueryInformationActivationContext( ULONG flags, HANDLE handle, PVOID subinst,
|
||||||
ULONG class, PVOID buffer,
|
ULONG class, PVOID buffer,
|
||||||
SIZE_T bufsize, SIZE_T *retlen )
|
SIZE_T bufsize, SIZE_T *retlen )
|
||||||
{
|
{
|
||||||
|
@ -5807,11 +5772,11 @@ RtlpFindActivationContextSection_CheckParameters( ULONG flags, const GUID *guid,
|
||||||
* Find information about a string in an activation context.
|
* Find information about a string in an activation context.
|
||||||
* FIXME: function signature/prototype may be wrong
|
* FIXME: function signature/prototype may be wrong
|
||||||
*/
|
*/
|
||||||
NTSTATUS NTAPI RtlFindActivationContextSectionString( ULONG flags, const GUID *guid, ULONG section_kind,
|
NTSTATUS WINAPI RtlFindActivationContextSectionString( ULONG flags, const GUID *guid, ULONG section_kind,
|
||||||
const UNICODE_STRING *section_name, PVOID ptr )
|
const UNICODE_STRING *section_name, PVOID ptr )
|
||||||
{
|
{
|
||||||
PACTCTX_SECTION_KEYED_DATA data = ptr;
|
PACTCTX_SECTION_KEYED_DATA data = ptr;
|
||||||
NTSTATUS status;
|
NTSTATUS status = STATUS_SXS_KEY_NOT_FOUND;
|
||||||
|
|
||||||
DPRINT("RtlFindActivationContextSectionString(%x %p %x %wZ %p)\n", flags, guid, section_kind, section_name, ptr);
|
DPRINT("RtlFindActivationContextSectionString(%x %p %x %wZ %p)\n", flags, guid, section_kind, section_name, ptr);
|
||||||
status = RtlpFindActivationContextSection_CheckParameters(flags, guid, section_kind, section_name, data);
|
status = RtlpFindActivationContextSection_CheckParameters(flags, guid, section_kind, section_name, data);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue