- Wine-Devel - list.winehq.org

[PATCH 3/7] server: Allow creating unbound console connection objects.
by Jacek Caban Sept. 16, 2020

Sept. 16, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/console.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)

1 0

[PATCH 2/7] kernelbase: Create console connection in init_console.
by Jacek Caban Sept. 16, 2020

Sept. 16, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernelbase/console.c | 20 ++++++++++++++++++++ server/console.c | 6 ++---- 2 files changed, 22 insertions(+), 4 deletions(-)

1 0

[PATCH 1/7] server: Introduce console_connection object.
by Jacek Caban Sept. 16, 2020

Sept. 16, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/console.c | 86 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 85 insertions(+), 1 deletion(-)

1 0

[PATCH] msvcirt: Set error when file can't be opened in ifstream_open_ctor.
by Piotr Caban Sept. 16, 2020

Sept. 16, 2020

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcirt/msvcirt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

1 0

[PATCH v2 1/3] msvcrt: Add _s[w|n]printf_c[_l].
by Gijs Vermeulen Sept. 16, 2020

Sept. 16, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49765 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/msvcr100/msvcr100.spec | 8 ++-- dlls/msvcr110/msvcr110.spec | 8 ++-- dlls/msvcr120/msvcr120.spec | 8 ++-- dlls/msvcr120_app/msvcr120_app.spec | 8 ++-- dlls/msvcr80/msvcr80.spec | 7 ++-- dlls/msvcr90/msvcr90.spec | 8 ++-- dlls/msvcrt/msvcrt.spec | 8 ++-- dlls/msvcrt/wcs.c | 59 +++++++++++++++++++++++++++++ 8 files changed, 87 insertions(+), 27 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index f507406d52..4e6041e81e 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1293,8 +1293,8 @@ @ stub _setsystime(ptr long) @ cdecl _sleep(long) MSVCRT__sleep @ varargs _snprintf(ptr long str) MSVCRT__snprintf -@ stub _snprintf_c -@ stub _snprintf_c_l +@ varargs _snprintf_c(ptr long str) MSVCRT_snprintf_c +@ varargs _snprintf_c_l(ptr long str ptr) MSVCRT_snprintf_c_l @ varargs _snprintf_l(ptr long str ptr) MSVCRT__snprintf_l @ varargs _snprintf_s(ptr long long str) MSVCRT__snprintf_s @ stub _snprintf_s_l @@ -1376,8 +1376,8 @@ @ cdecl _strxfrm_l(ptr str long ptr) MSVCRT__strxfrm_l @ cdecl _swab(str str long) MSVCRT__swab @ varargs _swprintf(ptr wstr) MSVCRT_swprintf -@ stub _swprintf_c -@ stub _swprintf_c_l +@ varargs _swprintf_c(ptr long str) MSVCRT_swprintf_c +@ varargs _swprintf_c_l(ptr long str ptr) MSVCRT_swprintf_c_l @ stub _swprintf_p @ varargs _swprintf_p_l(ptr long wstr ptr) MSVCRT_swprintf_p_l @ varargs _swprintf_s_l(ptr long wstr ptr) MSVCRT__swprintf_s_l diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 7423a1ccd6..d8e6ffac2c 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1650,8 +1650,8 @@ @ stub _setsystime(ptr long) @ cdecl _sleep(long) MSVCRT__sleep @ varargs _snprintf(ptr long str) MSVCRT__snprintf -@ stub _snprintf_c -@ stub _snprintf_c_l +@ varargs _snprintf_c(ptr long str) MSVCRT_snprintf_c +@ varargs _snprintf_c_l(ptr long str ptr) MSVCRT_snprintf_c_l @ varargs _snprintf_l(ptr long str ptr) MSVCRT__snprintf_l @ varargs _snprintf_s(ptr long long str) MSVCRT__snprintf_s @ stub _snprintf_s_l @@ -1733,8 +1733,8 @@ @ cdecl _strxfrm_l(ptr str long ptr) MSVCRT__strxfrm_l @ cdecl _swab(str str long) MSVCRT__swab @ varargs _swprintf(ptr wstr) MSVCRT_swprintf -@ stub _swprintf_c -@ stub _swprintf_c_l +@ varargs _swprintf_c(ptr long str) MSVCRT_swprintf_c +@ varargs _swprintf_c_l(ptr long str ptr) MSVCRT_swprintf_c_l @ stub _swprintf_p @ varargs _swprintf_p_l(ptr long wstr ptr) MSVCRT_swprintf_p_l @ varargs _swprintf_s_l(ptr long wstr ptr) MSVCRT__swprintf_s_l diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 64b4e2d625..168ac8b332 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1661,8 +1661,8 @@ @ stub _setsystime(ptr long) @ cdecl _sleep(long) MSVCRT__sleep @ varargs _snprintf(ptr long str) MSVCRT__snprintf -@ stub _snprintf_c -@ stub _snprintf_c_l +@ varargs _snprintf_c(ptr long str) MSVCRT_snprintf_c +@ varargs _snprintf_c_l(ptr long str ptr) MSVCRT_snprintf_c_l @ varargs _snprintf_l(ptr long str ptr) MSVCRT__snprintf_l @ varargs _snprintf_s(ptr long long str) MSVCRT__snprintf_s @ stub _snprintf_s_l @@ -1750,8 +1750,8 @@ @ cdecl _strxfrm_l(ptr str long ptr) MSVCRT__strxfrm_l @ cdecl _swab(str str long) MSVCRT__swab @ varargs _swprintf(ptr wstr) MSVCRT_swprintf -@ stub _swprintf_c -@ stub _swprintf_c_l +@ varargs _swprintf_c(ptr long str) MSVCRT_swprintf_c +@ varargs _swprintf_c_l(ptr long str ptr) MSVCRT_swprintf_c_l @ stub _swprintf_p @ varargs _swprintf_p_l(ptr long wstr ptr) MSVCRT_swprintf_p_l @ varargs _swprintf_s_l(ptr long wstr ptr) MSVCRT__swprintf_s_l diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index d9e998c985..be0d87776d 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1380,8 +1380,8 @@ @ cdecl _setmbcp(long) msvcr120._setmbcp @ cdecl _setmode(long long) msvcr120._setmode @ varargs _snprintf(ptr long str) msvcr120._snprintf -@ stub _snprintf_c -@ stub _snprintf_c_l +@ varargs _snprintf_c(ptr long str) msvcr120._snprintf_c +@ varargs _snprintf_c_l(ptr long str ptr) msvcr120._snprintf_c_l @ varargs _snprintf_l(ptr long str ptr) msvcr120._snprintf_l @ varargs _snprintf_s(ptr long long str) msvcr120._snprintf_s @ stub _snprintf_s_l @@ -1461,8 +1461,8 @@ @ cdecl _strxfrm_l(ptr str long ptr) msvcr120._strxfrm_l @ cdecl _swab(str str long) msvcr120._swab @ varargs _swprintf(ptr wstr) msvcr120._swprintf -@ stub _swprintf_c -@ stub _swprintf_c_l +@ varargs _swprintf_c(ptr long str) msvcr120._swprintf_c +@ varargs _swprintf_c_l(ptr long str ptr) msvcr120._swprintf_c_l @ stub _swprintf_p @ varargs _swprintf_p_l(ptr long wstr ptr) msvcr120._swprintf_p_l @ varargs _swprintf_s_l(ptr long wstr ptr) msvcr120._swprintf_s_l diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 9c4e56d0c3..539c548aff 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -973,8 +973,8 @@ @ stub _setsystime(ptr long) @ cdecl _sleep(long) MSVCRT__sleep @ varargs _snprintf(ptr long str) MSVCRT__snprintf -@ stub _snprintf_c -@ stub _snprintf_c_l +@ varargs _snprintf_c(ptr long str) MSVCRT_snprintf_c +@ varargs _snprintf_c_l(ptr long str ptr) MSVCRT_snprintf_c_l @ varargs _snprintf_l(ptr long str ptr) MSVCRT__snprintf_l @ varargs _snprintf_s(ptr long long str) MSVCRT__snprintf_s @ stub _snprintf_s_l @@ -1056,7 +1056,8 @@ @ cdecl _strxfrm_l(ptr str long ptr) MSVCRT__strxfrm_l @ cdecl _swab(str str long) MSVCRT__swab @ varargs _swprintf(ptr wstr) MSVCRT_swprintf -@ stub _swprintf_c +@ varargs _swprintf_c(ptr long str) MSVCRT_swprintf_c +@ varargs _swprintf_c_l(ptr long str ptr) MSVCRT_swprintf_c_l @ stub _swprintf_p @ varargs _swprintf_p_l(ptr long wstr ptr) MSVCRT_swprintf_p_l @ varargs _swprintf_s_l(ptr long wstr ptr) MSVCRT__swprintf_s_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 1b7e3810d8..1a7964a415 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -948,8 +948,8 @@ @ stub _setsystime(ptr long) @ cdecl _sleep(long) MSVCRT__sleep @ varargs _snprintf(ptr long str) MSVCRT__snprintf -@ stub _snprintf_c -@ stub _snprintf_c_l +@ varargs _snprintf_c(ptr long str) MSVCRT_snprintf_c +@ varargs _snprintf_c_l(ptr long str ptr) MSVCRT_snprintf_c_l @ varargs _snprintf_l(ptr long str ptr) MSVCRT__snprintf_l @ varargs _snprintf_s(ptr long long str) MSVCRT__snprintf_s @ stub _snprintf_s_l @@ -1031,8 +1031,8 @@ @ cdecl _strxfrm_l(ptr str long ptr) MSVCRT__strxfrm_l @ cdecl _swab(str str long) MSVCRT__swab @ varargs _swprintf(ptr wstr) MSVCRT_swprintf -@ stub _swprintf_c -@ stub _swprintf_c_l +@ varargs _swprintf_c(ptr long str) MSVCRT_swprintf_c +@ varargs _swprintf_c_l(ptr long str ptr) MSVCRT_swprintf_c_l @ stub _swprintf_p @ varargs _swprintf_p_l(ptr long wstr ptr) MSVCRT_swprintf_p_l @ varargs _swprintf_s_l(ptr long wstr ptr) MSVCRT__swprintf_s_l diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index e7be7d6982..6710c14245 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -909,8 +909,8 @@ @ stub _setsystime(ptr long) @ cdecl _sleep(long) MSVCRT__sleep @ varargs _snprintf(ptr long str) MSVCRT__snprintf -# stub _snprintf_c(ptr long str) -# stub _snprintf_c_l(ptr long str ptr) +@ varargs _snprintf_c(ptr long str) MSVCRT_snprintf_c +@ varargs _snprintf_c_l(ptr long str ptr) MSVCRT_snprintf_c_l @ varargs _snprintf_l(ptr long str ptr) MSVCRT__snprintf_l @ varargs _snprintf_s(ptr long long str) MSVCRT__snprintf_s # stub _snprintf_s_l(ptr long long str ptr) @@ -990,8 +990,8 @@ @ cdecl _strxfrm_l(ptr str long ptr) MSVCRT__strxfrm_l @ cdecl _swab(str str long) MSVCRT__swab @ varargs _swprintf(ptr wstr) MSVCRT_swprintf -# stub _swprintf_c(ptr long str) -# stub _swprintf_c_l(ptr long str ptr) +@ varargs _swprintf_c(ptr long str) MSVCRT_swprintf_c +@ varargs _swprintf_c_l(ptr long str ptr) MSVCRT_swprintf_c_l @ varargs _swprintf_p_l(ptr long wstr ptr) MSVCRT_swprintf_p_l @ varargs _swprintf_s_l(ptr long wstr ptr) MSVCRT__swprintf_s_l @ varargs _swscanf_l(wstr wstr ptr) MSVCRT__swscanf_l diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 7ceaa5c741..1932022c23 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1176,6 +1176,33 @@ int WINAPIV MSVCRT__snprintf_l(char *str, unsigned int count, MSVCRT__locale_t l return retval; } +/********************************************************************* + * _snprintf_c_l (MSVCRT.@) + */ +int WINAPIV MSVCRT_snprintf_c_l(char *str, unsigned int count, const char *format, + MSVCRT__locale_t locale, ...) +{ + int retval; + __ms_va_list valist; + __ms_va_start(valist, locale); + retval = MSVCRT_vsnprintf_c_l(str, count, format, locale, valist); + __ms_va_end(valist); + return retval; +} + +/********************************************************************* + * _snprintf_c (MSVCRT.@) + */ +int WINAPIV MSVCRT_snprintf_c(char *str, unsigned int count, const char *format, ...) +{ + int retval; + __ms_va_list valist; + __ms_va_start(valist, format); + retval = MSVCRT_vsnprintf_c(str, count, format, valist); + __ms_va_end(valist); + return retval; +} + /********************************************************************* * _snprintf_s (MSVCRT.@) */ @@ -1533,6 +1560,38 @@ int WINAPIV MSVCRT__swprintf_s_l(MSVCRT_wchar_t *str, MSVCRT_size_t numberOfElem return r; } +/********************************************************************* + * _swprintf_c_l (MSVCRT.@) + */ +int WINAPIV MSVCRT_swprintf_c_l(MSVCRT_wchar_t *str, MSVCRT_size_t len, + const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, ... ) +{ + __ms_va_list ap; + int r; + + __ms_va_start(ap, locale); + r = MSVCRT_vswprintf_c_l(str, len, format, locale, ap); + __ms_va_end(ap); + + return r; +} + +/********************************************************************* + * _swprintf_c (MSVCRT.@) + */ +int WINAPIV MSVCRT_swprintf_c(MSVCRT_wchar_t *str, MSVCRT_size_t len, + const MSVCRT_wchar_t *format, ... ) +{ + __ms_va_list ap; + int r; + + __ms_va_start(ap, format); + r = MSVCRT_vswprintf_c(str, len, format, ap); + __ms_va_end(ap); + + return r; +} + /********************************************************************* * _vswprintf (MSVCRT.@) */ -- 2.28.0

2 3

[PATCH 4/4 v3] msvcrt: Add _snprintf_s_l.
by Piotr Caban Sept. 16, 2020

Sept. 16, 2020

From: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 14 ++++++++++++++ 8 files changed, 21 insertions(+), 7 deletions(-)

1 0

[PATCH 3/4 v3] msvcrt: Fix _snprintf_l function signature.
by Piotr Caban Sept. 16, 2020

Sept. 16, 2020

From: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/wcs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

1 0

[PATCH 2/4 v3] msvcrt: Add _s[w|n]printf_c[_l].
by Piotr Caban Sept. 16, 2020

Sept. 16, 2020

From: Gijs Vermeulen <gijsvrm(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49765 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcr100/msvcr100.spec | 8 ++-- dlls/msvcr110/msvcr110.spec | 8 ++-- dlls/msvcr120/msvcr120.spec | 8 ++-- dlls/msvcr120_app/msvcr120_app.spec | 8 ++-- dlls/msvcr80/msvcr80.spec | 7 ++-- dlls/msvcr90/msvcr90.spec | 8 ++-- dlls/msvcrt/msvcrt.spec | 8 ++-- dlls/msvcrt/wcs.c | 59 +++++++++++++++++++++++++++++ 8 files changed, 87 insertions(+), 27 deletions(-)

1 0

[PATCH 1/4 v3] msvcrt: Fix count parameter type in printf functions family.
by Piotr Caban Sept. 16, 2020

Sept. 16, 2020

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/msvcrt.h | 4 ++-- dlls/msvcrt/wcs.c | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-)

1 0

[PATCH] combase: Manage per-thread call cancellation counter.
by Nikolay Sivov Sept. 16, 2020

Sept. 16, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Helps NVDA application from https://bugs.winehq.org/show_bug.cgi?id=48952 to get past initial failure. dlls/combase/combase.c | 27 +++++++++++++--- dlls/combase/combase_private.h | 1 + dlls/ole32/compobj_private.h | 1 + dlls/ole32/tests/compobj.c | 59 ++++++++++++++++++++++++++++++++++ include/winerror.h | 1 + 5 files changed, 85 insertions(+), 4 deletions(-) diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index c66f0bbf8e2..7a85b95a19b 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -3104,9 +3104,20 @@ HRESULT WINAPI CoRegisterChannelHook(REFGUID guidExtension, IChannelHook *channe */ HRESULT WINAPI CoDisableCallCancellation(void *reserved) { - FIXME("%p stub\n", reserved); + struct tlsdata *tlsdata; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p\n", reserved); + + if (FAILED(hr = com_get_tlsdata(&tlsdata))) + return hr; + + if (!tlsdata->cancelcount) + return CO_E_CANCEL_DISABLED; + + tlsdata->cancelcount--; + + return S_OK; } /*********************************************************************** @@ -3114,9 +3125,17 @@ HRESULT WINAPI CoDisableCallCancellation(void *reserved) */ HRESULT WINAPI CoEnableCallCancellation(void *reserved) { - FIXME("%p stub\n", reserved); + struct tlsdata *tlsdata; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p\n", reserved); + + if (FAILED(hr = com_get_tlsdata(&tlsdata))) + return hr; + + tlsdata->cancelcount++; + + return S_OK; } /*********************************************************************** diff --git a/dlls/combase/combase_private.h b/dlls/combase/combase_private.h index 2c938e6ff49..55ce02d06f0 100644 --- a/dlls/combase/combase_private.h +++ b/dlls/combase/combase_private.h @@ -84,6 +84,7 @@ struct tlsdata IUnknown *state; /* see CoSetState */ struct list spies; /* Spies installed with CoRegisterInitializeSpy */ DWORD spies_lock; + DWORD cancelcount; }; extern HRESULT WINAPI InternalTlsAllocData(struct tlsdata **data); diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index f10b41907a1..4ec22d51f45 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -62,6 +62,7 @@ struct oletls IUnknown *state; /* see CoSetState */ struct list spies; /* Spies installed with CoRegisterInitializeSpy */ DWORD spies_lock; + DWORD cancelcount; }; /* Global Interface Table Functions */ diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index e627521fa59..5ed3f9638b1 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -4186,6 +4186,64 @@ todo_wine CoUninitialize(); } +static void test_call_cancellation(void) +{ + HRESULT hr; + + /* Cancellation is disabled initially. */ + hr = CoDisableCallCancellation(NULL); + ok(hr == CO_E_CANCEL_DISABLED, "Unexpected hr %#x.\n", hr); + + hr = CoEnableCallCancellation(NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = CoDisableCallCancellation(NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = CoDisableCallCancellation(NULL); + ok(hr == CO_E_CANCEL_DISABLED, "Unexpected hr %#x.\n", hr); + + hr = CoEnableCallCancellation(NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + /* Counter is not affected by initialization. */ + hr = CoInitialize(NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = CoDisableCallCancellation(NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = CoDisableCallCancellation(NULL); + ok(hr == CO_E_CANCEL_DISABLED, "Unexpected hr %#x.\n", hr); + + hr = CoEnableCallCancellation(NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + CoUninitialize(); + + hr = CoDisableCallCancellation(NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = CoDisableCallCancellation(NULL); + ok(hr == CO_E_CANCEL_DISABLED, "Unexpected hr %#x.\n", hr); + + /* It's cumulative. */ + hr = CoEnableCallCancellation(NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = CoEnableCallCancellation(NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = CoDisableCallCancellation(NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = CoDisableCallCancellation(NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = CoDisableCallCancellation(NULL); + ok(hr == CO_E_CANCEL_DISABLED, "Unexpected hr %#x.\n", hr); +} + START_TEST(compobj) { init_funcs(); @@ -4236,6 +4294,7 @@ START_TEST(compobj) test_CoGetCurrentProcess(); test_mta_usage(); test_CoCreateInstanceFromApp(); + test_call_cancellation(); DeleteFileA( testlib ); } diff --git a/include/winerror.h b/include/winerror.h index 4ebb48c1249..86f7aace68e 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -2679,6 +2679,7 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define RPC_E_NO_CONTEXT _HRESULT_TYPEDEF_(0x8001011E) #define RPC_E_TIMEOUT _HRESULT_TYPEDEF_(0x8001011F) #define RPC_E_NO_SYNC _HRESULT_TYPEDEF_(0x80010120) +#define CO_E_CANCEL_DISABLED _HRESULT_TYPEDEF_(0x80010140) #define RPC_E_UNEXPECTED _HRESULT_TYPEDEF_(0x8001FFFF) #define DISP_E_UNKNOWNINTERFACE _HRESULT_TYPEDEF_(0x80020001) -- 2.28.0

3 2