JehanneOS
/
newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cygwin: move transaction helpers into ntdll.h 

We'll need them elsewhere in future.

Signed-off-by: Corinna Vinschen <corinna@vinschen.de
This commit is contained in:
Corinna Vinschen 2018-03-01 16:51:12 +01:00
parent 3e16fd6986
commit 65267a9a34
2 changed files with 35 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
winsup/cygwin/ntdll.h
View File

@ -14,6 +14,10 @@
/* custom status code: */ /* custom status code: */
#define STATUS_ILLEGAL_DLL_PSEUDO_RELOCATION ((NTSTATUS) 0xe0000269) #define STATUS_ILLEGAL_DLL_PSEUDO_RELOCATION ((NTSTATUS) 0xe0000269)
/* Simplify checking for a transactional error code. */
#define NT_TRANSACTIONAL_ERROR(s) \
(((ULONG)(s) >= (ULONG)STATUS_TRANSACTIONAL_CONFLICT) \
&& ((ULONG)(s) <= (ULONG)STATUS_TRANSACTION_NOT_ENLISTED))
#define NtCurrentProcess() ((HANDLE) (LONG_PTR) -1) #define NtCurrentProcess() ((HANDLE) (LONG_PTR) -1)
#define NtCurrentThread() ((HANDLE) (LONG_PTR) -2) #define NtCurrentThread() ((HANDLE) (LONG_PTR) -2)
@ -1601,5 +1605,36 @@ extern "C"
&& ebi.SignalState != 0; && ebi.SignalState != 0;
} }
static inline void
start_transaction (HANDLE &old_trans, HANDLE &trans)
{
NTSTATUS status = NtCreateTransaction (&trans,
SYNCHRONIZE | TRANSACTION_ALL_ACCESS,
NULL, NULL, NULL, 0, 0, 0, NULL, NULL);
if (NT_SUCCESS (status))
{
old_trans = RtlGetCurrentTransaction ();
RtlSetCurrentTransaction (trans);
}
else
{
debug_printf ("NtCreateTransaction failed, %y", status);
old_trans = trans = NULL;
}
}
static inline NTSTATUS
stop_transaction (NTSTATUS status, HANDLE old_trans, HANDLE &trans)
{
RtlSetCurrentTransaction (old_trans);
if (NT_SUCCESS (status))
status = NtCommitTransaction (trans, TRUE);
else
status = NtRollbackTransaction (trans, TRUE);
NtClose (trans);
trans = NULL;
return status;
}
} }
#endif #endif

36
winsup/cygwin/syscalls.cc
View File

@ -182,42 +182,6 @@ dup3 (int oldfd, int newfd, int flags)
return res; return res;
} }
/* Define macro to simplify checking for a transactional error code. */
#define NT_TRANSACTIONAL_ERROR(s) \
(((ULONG)(s) >= (ULONG)STATUS_TRANSACTIONAL_CONFLICT) \
&& ((ULONG)(s) <= (ULONG)STATUS_TRANSACTION_NOT_ENLISTED))
static inline void
start_transaction (HANDLE &old_trans, HANDLE &trans)
{
NTSTATUS status = NtCreateTransaction (&trans,
SYNCHRONIZE | TRANSACTION_ALL_ACCESS,
NULL, NULL, NULL, 0, 0, 0, NULL, NULL);
if (NT_SUCCESS (status))
{
old_trans = RtlGetCurrentTransaction ();
RtlSetCurrentTransaction (trans);
}
else
{
debug_printf ("NtCreateTransaction failed, %y", status);
old_trans = trans = NULL;
}
}
static inline NTSTATUS
stop_transaction (NTSTATUS status, HANDLE old_trans, HANDLE &trans)
{
RtlSetCurrentTransaction (old_trans);
if (NT_SUCCESS (status))
status = NtCommitTransaction (trans, TRUE);
else
status = NtRollbackTransaction (trans, TRUE);
NtClose (trans);
trans = NULL;
return status;
}
static const char desktop_ini[] = static const char desktop_ini[] =
"[.ShellClassInfo]\r\n" "[.ShellClassInfo]\r\n"
"CLSID={645FF040-5081-101B-9F08-00AA002F954E}\r\n" "CLSID={645FF040-5081-101B-9F08-00AA002F954E}\r\n"