March 2023 - Wine-commits - list.winehq.org

Francois Gouget : schedsvc/tests: Document SchRpcGetTaskInfo() calls that crash on Windows.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: master Commit: 4385a3c29e169827239a05318dfda546a46e340c URL: https://gitlab.winehq.org/wine/wine/-/commit/4385a3c29e169827239a05318dfda5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat Mar 25 18:51:06 2023 +0100 schedsvc/tests: Document SchRpcGetTaskInfo() calls that crash on Windows. Not just Windows 7 but all versions up to Windows 11. --- dlls/schedsvc/tests/rpcapi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/schedsvc/tests/rpcapi.c b/dlls/schedsvc/tests/rpcapi.c index 0142b1af88a..b8742c1fd58 100644 --- a/dlls/schedsvc/tests/rpcapi.c +++ b/dlls/schedsvc/tests/rpcapi.c @@ -471,7 +471,7 @@ START_TEST(rpcapi) MIDL_user_free(names[0]); MIDL_user_free(names); - if (0) /* crashes under win7 */ + if (0) /* each of these crashes on Windows 7 to 11 */ { hr = SchRpcGetTaskInfo(NULL, 0, NULL, NULL); hr = SchRpcGetTaskInfo(L"Task1", 0, NULL, NULL);

1 0

Francois Gouget : schedsvc/tests: Deleting tasks & folders requires elevated privileges on Windows 7.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: master Commit: bb516ae1a616b6454ebe494201c50690a811dc03 URL: https://gitlab.winehq.org/wine/wine/-/commit/bb516ae1a616b6454ebe494201c506… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Mar 26 17:59:04 2023 +0200 schedsvc/tests: Deleting tasks & folders requires elevated privileges on Windows 7. This means skipping any test that requires creating a folder as the test would be unable to clean up after itself. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=53128 Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=54109 --- dlls/schedsvc/tests/Makefile.in | 2 +- dlls/schedsvc/tests/rpcapi.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/dlls/schedsvc/tests/Makefile.in b/dlls/schedsvc/tests/Makefile.in index b8e7448bb76..62f41d4744f 100644 --- a/dlls/schedsvc/tests/Makefile.in +++ b/dlls/schedsvc/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = schedsvc.dll -IMPORTS = rpcrt4 ole32 +IMPORTS = advapi32 rpcrt4 ole32 C_SRCS = \ atsvcapi.c \ diff --git a/dlls/schedsvc/tests/rpcapi.c b/dlls/schedsvc/tests/rpcapi.c index b8742c1fd58..d9e2a75eb7b 100644 --- a/dlls/schedsvc/tests/rpcapi.c +++ b/dlls/schedsvc/tests/rpcapi.c @@ -18,6 +18,7 @@ #include <stdio.h> #include <windows.h> +#include "winternl.h" #include <ole2.h> #include <rpcdce.h> #include <taskschd.h> @@ -25,6 +26,37 @@ #include "wine/test.h" +static BOOL is_process_elevated(void) +{ + HANDLE token; + if (OpenProcessToken( GetCurrentProcess(), TOKEN_QUERY, &token )) + { + TOKEN_ELEVATION_TYPE type; + DWORD size; + BOOL ret; + + ret = GetTokenInformation( token, TokenElevationType, &type, sizeof(type), &size ); + CloseHandle( token ); + return (ret && type == TokenElevationTypeFull); + } + return FALSE; +} + +static BOOL check_win_version(int min_major, int min_minor) +{ + HMODULE hntdll = GetModuleHandleA("ntdll.dll"); + NTSTATUS (WINAPI *pRtlGetVersion)(RTL_OSVERSIONINFOEXW *); + RTL_OSVERSIONINFOEXW rtlver; + + rtlver.dwOSVersionInfoSize = sizeof(RTL_OSVERSIONINFOEXW); + pRtlGetVersion = (void *)GetProcAddress(hntdll, "RtlGetVersion"); + pRtlGetVersion(&rtlver); + return rtlver.dwMajorVersion > min_major || + (rtlver.dwMajorVersion == min_major && + rtlver.dwMinorVersion >= min_minor); +} +#define is_win8_plus() check_win_version(6, 2) + extern handle_t schrpc_handle; static LONG CALLBACK rpc_exception_filter(EXCEPTION_POINTERS *ptrs) @@ -143,6 +175,12 @@ START_TEST(rpcapi) hr = SchRpcDelete(L"", 0); ok(hr == E_ACCESSDENIED /* win7 */ || hr == E_INVALIDARG /* vista */, "expected E_ACCESSDENIED, got %#lx\n", hr); + if (!is_process_elevated() && !is_win8_plus()) + { + win_skip("Skipping because deleting anything requires elevated privileges on Windows 7\n"); + return; + } + hr = SchRpcCreateFolder(L"\\Wine", NULL, 0); ok(hr == S_OK, "expected S_OK, got %#lx\n", hr);

1 0

Alex Henrie : wldap32: Implement setting LDAP_OPT_SSL and add tests.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: master Commit: 31aa2245ef4e7c91250b8033a5bdeb5069d316ee URL: https://gitlab.winehq.org/wine/wine/-/commit/31aa2245ef4e7c91250b8033a5bdeb… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Mar 27 09:07:48 2023 -0600 wldap32: Implement setting LDAP_OPT_SSL and add tests. Windows has the LDAP_OPT_SSL option to turn SSL on or off after calling ldap_init but before connecting to the server. OpenLDAP doesn't have that option and instead expects a fully SSL connection to be requested by passing one or more "ldaps://" URIs to ldap_init. However, OpenLDAP also has an LDAP_OPT_URI option, which Windows does not have, that can be used to change the URIs before connecting. And OpenLDAP already takes care of converting "ldap://" or "ldaps://" to lowercase, so all we have to do is find and replace that exact string in each URI in the list. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54727 --- dlls/wldap32/option.c | 33 ++++++++++++++++++++++++-- dlls/wldap32/tests/parse.c | 54 ++++++++++++++++++++++++++++++++++++++++++ dlls/wldap32/winldap_private.h | 18 ++++++++++++++ 3 files changed, 103 insertions(+), 2 deletions(-) diff --git a/dlls/wldap32/option.c b/dlls/wldap32/option.c index cc85ed1340b..38ede5557d2 100644 --- a/dlls/wldap32/option.c +++ b/dlls/wldap32/option.c @@ -291,6 +291,7 @@ ULONG CDECL ldap_set_optionA( LDAP *ld, int option, void *value ) case WLDAP32_LDAP_OPT_PROTOCOL_VERSION: case WLDAP32_LDAP_OPT_REFERRALS: case WLDAP32_LDAP_OPT_SIZELIMIT: + case WLDAP32_LDAP_OPT_SSL: case WLDAP32_LDAP_OPT_TIMELIMIT: return ldap_set_optionW( ld, option, value ); @@ -333,7 +334,6 @@ ULONG CDECL ldap_set_optionA( LDAP *ld, int option, void *value ) case WLDAP32_LDAP_OPT_SERVER_ERROR: case WLDAP32_LDAP_OPT_SERVER_EXT_ERROR: case WLDAP32_LDAP_OPT_SIGN: - case WLDAP32_LDAP_OPT_SSL: case WLDAP32_LDAP_OPT_SSL_INFO: case WLDAP32_LDAP_OPT_SSPI_FLAGS: case WLDAP32_LDAP_OPT_TCP_KEEPALIVE: @@ -447,6 +447,36 @@ ULONG CDECL ldap_set_optionW( LDAP *ld, int option, void *value ) case WLDAP32_LDAP_OPT_TIMELIMIT: return map_error( ldap_set_option( CTX(ld), option, value ) ); + case WLDAP32_LDAP_OPT_SSL: + { + BOOL turn_on; + char *uri, *new_uri; + + if (value == WLDAP32_LDAP_OPT_ON) + turn_on = TRUE; + else if (value == WLDAP32_LDAP_OPT_OFF) + turn_on = FALSE; + else if (*(ULONG *)value == 1) + turn_on = TRUE; + else if (*(ULONG *)value == 0) + turn_on = FALSE; + else + return WLDAP32_LDAP_PARAM_ERROR; + + ret = ldap_get_option( CTX(ld), LDAP_OPT_URI, &uri ); + if (ret != LDAP_SUCCESS) return map_error( ret ); + + if (turn_on) + new_uri = strreplace( uri, "ldap://", "ldaps://" ); + else + new_uri = strreplace( uri, "ldaps://", "ldap://" ); + + ret = map_error( ldap_set_option( CTX(ld), LDAP_OPT_URI, new_uri ) ); + ldap_memfree(uri); + free(new_uri); + return ret; + } + case WLDAP32_LDAP_OPT_CACHE_ENABLE: case WLDAP32_LDAP_OPT_CACHE_FN_PTRS: case WLDAP32_LDAP_OPT_CACHE_STRATEGY: @@ -486,7 +516,6 @@ ULONG CDECL ldap_set_optionW( LDAP *ld, int option, void *value ) case WLDAP32_LDAP_OPT_SERVER_ERROR: case WLDAP32_LDAP_OPT_SERVER_EXT_ERROR: case WLDAP32_LDAP_OPT_SIGN: - case WLDAP32_LDAP_OPT_SSL: case WLDAP32_LDAP_OPT_SSL_INFO: case WLDAP32_LDAP_OPT_SSPI_FLAGS: case WLDAP32_LDAP_OPT_TCP_KEEPALIVE: diff --git a/dlls/wldap32/tests/parse.c b/dlls/wldap32/tests/parse.c index 19e7a48b471..8cd313cd6ca 100644 --- a/dlls/wldap32/tests/parse.c +++ b/dlls/wldap32/tests/parse.c @@ -491,6 +491,59 @@ static void test_ldap_paged_search(void) ldap_unbind( ld ); } +static void test_opt_ssl(void) +{ + LDAP *ld; + ULONG ret, version = LDAP_VERSION3, value; + + /* Turning on LDAP_OPT_SSL without setting the protocol version does not work */ + ld = ldap_initA( (char *)"db.debian.org", 636 ); + ok( ld != NULL, "ldap_init failed\n" ); + ret = ldap_set_optionA( ld, LDAP_OPT_SSL, LDAP_OPT_ON ); + ok( !ret, "ldap_set_optionA should succeed, got %#lx\n", ret ); + ret = ldap_simple_bind_sA( ld, NULL, NULL ); + todo_wine ok( ret == LDAP_PROTOCOL_ERROR, "ldap_simple_bind_sA should fail, got %#lx\n", ret ); + ldap_unbind( ld ); + + /* Setting the protocol version to 3 automatically enables SSL when using port 636 */ + ld = ldap_initA( (char *)"db.debian.org", 636 ); + ok( ld != NULL, "ldap_init failed\n" ); + ret = ldap_set_optionA( ld, LDAP_OPT_PROTOCOL_VERSION, &version ); + ok( !ret, "ldap_set_optionA should succeed, got %#lx\n", ret ); + ret = ldap_set_optionA( ld, LDAP_OPT_SSL, LDAP_OPT_OFF ); + ok( !ret, "ldap_set_optionA should succeed, got %#lx\n", ret ); + ret = ldap_simple_bind_sA( ld, NULL, NULL ); + todo_wine ok( !ret, "ldap_simple_bind_sA should succeed, got %#lx\n", ret ); + ldap_unbind( ld ); + + /* Turning on SSL when the server does not expect it does not work */ + ld = ldap_initA( (char *)"db.debian.org", 389 ); + ok( ld != NULL, "ldap_init failed\n" ); + ret = ldap_set_optionA( ld, LDAP_OPT_SSL, LDAP_OPT_ON ); + ok( !ret, "ldap_set_optionA should succeed, got %#lx\n", ret ); + ret = ldap_simple_bind_sA( ld, NULL, NULL ); + ok( ret == LDAP_SERVER_DOWN, "ldap_simple_bind_sA should fail, got %#lx\n", ret ); + ldap_unbind( ld ); + + /* SSL can also be turned on by passing a pointer to a variable with value 1 */ + ld = ldap_initA( (char *)"db.debian.org", 389 ); + ok( ld != NULL, "ldap_init failed\n" ); + value = 1; + ret = ldap_set_optionA( ld, LDAP_OPT_SSL, &value ); + ok( !ret, "ldap_set_optionA should succeed, got %#lx\n", ret ); + ret = ldap_simple_bind_sA( ld, NULL, NULL ); + ok( ret == LDAP_SERVER_DOWN, "ldap_simple_bind_sA should fail, got %#lx\n", ret ); + ldap_unbind( ld ); + + /* SSL cannot be turned on by passing a pointer to a variable with a bogus value */ + ld = ldap_initA( (char *)"db.debian.org", 389 ); + ok( ld != NULL, "ldap_init failed\n" ); + value = 2; + ret = ldap_set_optionA( ld, LDAP_OPT_SSL, &value ); + ok( ret == LDAP_PARAM_ERROR, "ldap_set_optionA should fail, got %#lx\n", ret ); + ldap_unbind( ld ); +} + START_TEST (parse) { LDAP *ld; @@ -498,6 +551,7 @@ START_TEST (parse) test_ldap_paged_search(); test_ldap_server_control(); test_ldap_bind_sA(); + test_opt_ssl(); ld = ldap_initA( (char *)"db.debian.org", 389 ); ok( ld != NULL, "ldap_init failed\n" ); diff --git a/dlls/wldap32/winldap_private.h b/dlls/wldap32/winldap_private.h index aeeffcfcc15..7adf77f151e 100644 --- a/dlls/wldap32/winldap_private.h +++ b/dlls/wldap32/winldap_private.h @@ -598,6 +598,24 @@ static inline WCHAR *strnAtoW( const char *str, DWORD in_len, DWORD *out_len ) return ret; } +static inline char *strreplace( const char *s, const char *before, const char *after ) +{ + char *ret = malloc( strlen( s ) + strlen( after ) / strlen( before ) + 1 ); + char *cur, *prev = ret; + if (ret) + { + ret[0] = 0; + for (cur = strstr( s, before ); cur; cur = strstr( prev, before )) + { + strncat( ret, prev, cur - prev ); + strcat( ret, after ); + prev = cur + strlen( before ); + } + strncat( ret, prev, cur - prev ); + } + return ret; +} + static inline DWORD bvarraylenW( struct WLDAP32_berval **bv ) { struct WLDAP32_berval **p = bv;

1 0

Louis Lenders : wine.inf: Add EditionID to HKEY_LOCAL_MACHINE\Software\Microsoft\Windows NT\CurrentVersion.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: master Commit: e8b0c9239562ed78c94d7dba87d5004b4d82b113 URL: https://gitlab.winehq.org/wine/wine/-/commit/e8b0c9239562ed78c94d7dba87d500… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Sat Mar 25 18:32:07 2023 +0100 wine.inf: Add EditionID to HKEY_LOCAL_MACHINE\Software\Microsoft\Windows NT\CurrentVersion. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54675 --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index c5850d1e205..9aaf2124ee3 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2512,6 +2512,7 @@ HKLM,%CurrentVersionNT%,"DigitalProductId",1,00,00,00,00,00,00,00,00,00,00,00,\ 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%,"EditionId",2,"Professional" HKLM,%CurrentVersionNT%,"ProductName",2,"Windows 10 Pro" HKLM,%Control%\ProductOptions,"ProductType",2,"WinNT" HKLM,%Control%\Windows,"CSDVersion",0x10003,0

1 0

Bernhard Kölbl : windows.media.speech/tests: Allow recognizer state to be idle during active recognition session.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: master Commit: 4f824a507afecc43c2543c0c54448a523142d0b6 URL: https://gitlab.winehq.org/wine/wine/-/commit/4f824a507afecc43c2543c0c54448a… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Sat Mar 25 22:02:59 2023 +0100 windows.media.speech/tests: Allow recognizer state to be idle during active recognition session. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54441 Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- dlls/windows.media.speech/tests/speech.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c index 6bc5a8b1751..fb0fa9e3b4d 100644 --- a/dlls/windows.media.speech/tests/speech.c +++ b/dlls/windows.media.speech/tests/speech.c @@ -1772,7 +1772,7 @@ static void test_Recognition(void) recog_state = 0xdeadbeef; hr = ISpeechRecognizer2_get_State(recognizer2, &recog_state); ok(hr == S_OK, "ISpeechRecognizer2_get_State failed, hr %#lx.\n", hr); - ok(recog_state == SpeechRecognizerState_Capturing, "recog_state was %u.\n", recog_state); + ok(recog_state == SpeechRecognizerState_Capturing || broken(recog_state == SpeechRecognizerState_Idle), "recog_state was %u.\n", recog_state); /* * TODO: Use a loopback device together with prerecorded audio files to test the recognizer's functionality.

1 0

Francois Gouget : imm32/tests: Document the WINE_LANGID value.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: master Commit: 683ad8221b54ff37f5c185b0571da893bf409792 URL: https://gitlab.winehq.org/wine/wine/-/commit/683ad8221b54ff37f5c185b0571da8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 21 04:18:26 2023 +0100 imm32/tests: Document the WINE_LANGID value. --- dlls/imm32/tests/ime_wrapper.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/imm32/tests/ime_wrapper.rc b/dlls/imm32/tests/ime_wrapper.rc index 812754ce4ce..e71d81f4fc9 100644 --- a/dlls/imm32/tests/ime_wrapper.rc +++ b/dlls/imm32/tests/ime_wrapper.rc @@ -18,7 +18,7 @@ #pragma makedep testdll -#define WINE_LANGID 047f +#define WINE_LANGID 047f /* LANG_INVARIANT/SUBLANG_DEFAULT */ #define WINE_FILETYPE VFT_DRV #define WINE_FILESUBTYPE VFT2_DRV_INPUTMETHOD #define WINE_FILENAME "ime_wrapper"

1 0

Francois Gouget : widl: Error_loc() messages must have a trailing linefeed.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: master Commit: 99f77667bb23a5c0f2b5b60a1e591fecd9714fb7 URL: https://gitlab.winehq.org/wine/wine/-/commit/99f77667bb23a5c0f2b5b60a1e591f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 22 02:24:57 2023 +0100 widl: Error_loc() messages must have a trailing linefeed. --- tools/widl/parser.l | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 1b16de63f0b..3ea03a7a26f 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -173,7 +173,7 @@ static int token_winrt( int token, const char *str, YYSTYPE *yylval ) static void winrt_enable( int ns_prefix ) { - if (!list_empty( &import_stack ) && !winrt_mode) error_loc( "WinRT IDL file imported in non-winrt mode." ); + if (!list_empty( &import_stack ) && !winrt_mode) error_loc( "WinRT IDL file imported in non-winrt mode.\n" ); use_abi_namespace = ns_prefix; winrt_mode = TRUE;

1 0

Rémi Bernon : widl: Define PARSER_LTYPE instead of api.location.type.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: master Commit: 78c5e3ab0321a9a8a24e2bc35518419f97cd8d2e URL: https://gitlab.winehq.org/wine/wine/-/commit/78c5e3ab0321a9a8a24e2bc3551841… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Mar 25 13:31:57 2023 +0100 widl: Define PARSER_LTYPE instead of api.location.type. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54729 --- tools/widl/parser.y | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index e3476f6ded8..5567d94559e 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -106,6 +106,13 @@ static typelib_t *current_typelib; %} +%code requires +{ + +#define PARSER_LTYPE struct location + +} + %code provides { @@ -119,7 +126,6 @@ void pop_import( PARSER_LTYPE *yylloc ); } -%define api.location.type {struct location} %define api.prefix {parser_} %define api.pure full %define parse.error verbose

1 0

Marc-Aurel Zent : iphlpapi: Return FALSE for bad handles in IcmpCloseHandle.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: master Commit: 5de03757f7d5f0cbdbbee079f6b0f548d0ad2626 URL: https://gitlab.winehq.org/wine/wine/-/commit/5de03757f7d5f0cbdbbee079f6b0f5… Author: Marc-Aurel Zent <marc_aurel(a)me.com> Date: Sun Mar 26 13:31:14 2023 +0200 iphlpapi: Return FALSE for bad handles in IcmpCloseHandle. --- dlls/iphlpapi/iphlpapi_main.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 6286c168277..4afe3470630 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -4565,7 +4565,12 @@ struct icmp_handle_data */ BOOL WINAPI IcmpCloseHandle( HANDLE handle ) { - struct icmp_handle_data *data = (struct icmp_handle_data *)handle; + struct icmp_handle_data *data; + + if (handle == NULL || handle == INVALID_HANDLE_VALUE) + return FALSE; + + data = (struct icmp_handle_data *)handle; CloseHandle( data->nsi_device ); heap_free( data );

1 0

Mohamad Al-Jaf : include: Add windows.graphics.capture.idl file.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: master Commit: 4eb5616e8d42e79a03ed4de8f095cab8480395dd URL: https://gitlab.winehq.org/wine/wine/-/commit/4eb5616e8d42e79a03ed4de8f095ca… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Tue Dec 6 21:01:54 2022 -0500 include: Add windows.graphics.capture.idl file. --- include/Makefile.in | 1 + include/windows.graphics.capture.idl | 77 ++++++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 102ea551cac..9bde0bcceb0 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -815,6 +815,7 @@ SOURCES = \ windows.gaming.input.idl \ windows.gaming.ui.idl \ windows.globalization.idl \ + windows.graphics.capture.idl \ windows.graphics.directx.direct3d11.idl \ windows.graphics.directx.idl \ windows.graphics.effects.idl \ diff --git a/include/windows.graphics.capture.idl b/include/windows.graphics.capture.idl new file mode 100644 index 00000000000..f89f91afc42 --- /dev/null +++ b/include/windows.graphics.capture.idl @@ -0,0 +1,77 @@ +/* + * Copyright (C) 2023 Mohamad Al-Jaf + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "inspectable.idl"; +import "asyncinfo.idl"; +import "eventtoken.idl"; +import "windowscontracts.idl"; +import "windows.foundation.idl"; +/* import "windows.graphics.idl"; */ +import "windows.graphics.directx.idl"; +import "windows.graphics.directx.direct3d11.idl"; +/* import "windows.security.authorization.appcapabilityaccess.idl"; */ +import "windows.system.idl"; +import "windows.ui.idl"; +/* import "windows.ui.composition.idl"; */ + +namespace Windows.Graphics.Capture { + interface IGraphicsCaptureSession; + interface IGraphicsCaptureSession2; + interface IGraphicsCaptureSession3; + interface IGraphicsCaptureSessionStatics; + + runtimeclass GraphicsCaptureSession; + + [ + contract(Windows.Foundation.UniversalApiContract, 6.0), + exclusiveto(Windows.Graphics.Capture.GraphicsCaptureSession), + uuid(814e42a9-f70f-4ad7-939b-fddcc6eb880d) + ] + interface IGraphicsCaptureSession : IInspectable + { + HRESULT StartCapture(); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 6.0), + exclusiveto(Windows.Graphics.Capture.GraphicsCaptureSession), + uuid(2224a540-5974-49aa-b232-0882536f4cb5) + ] + interface IGraphicsCaptureSessionStatics : IInspectable + { + HRESULT IsSupported([out, retval] boolean *result); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 6.0), + marshaling_behavior(agile), + static(Windows.Graphics.Capture.IGraphicsCaptureSessionStatics, Windows.Foundation.UniversalApiContract, 6.0), + threading(both) + ] + runtimeclass GraphicsCaptureSession + { + [default] interface Windows.Graphics.Capture.IGraphicsCaptureSession; + [contract(Windows.Foundation.UniversalApiContract, 10.0)] interface Windows.Graphics.Capture.IGraphicsCaptureSession2; + [contract(Windows.Foundation.UniversalApiContract, 12.0)] interface Windows.Graphics.Capture.IGraphicsCaptureSession3; + interface Windows.Foundation.IClosable; + } +}

1 0