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

Gabriel Ivăncescu : mshtml: Fix text node leak in TextRange's text setter.
by Alexandre Julliard 07 Jul '23

07 Jul '23

Module: wine Branch: master Commit: 8ac9be458b58dd6cd30a62d414690403d13de6e8 URL: https://gitlab.winehq.org/wine/wine/-/commit/8ac9be458b58dd6cd30a62d4146904… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Jul 6 19:57:52 2023 +0300 mshtml: Fix text node leak in TextRange's text setter. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/range.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mshtml/range.c b/dlls/mshtml/range.c index 89b1eecb8cb..1f062f5022a 100644 --- a/dlls/mshtml/range.c +++ b/dlls/mshtml/range.c @@ -969,6 +969,7 @@ static HRESULT WINAPI HTMLTxtRange_put_text(IHTMLTxtRange *iface, BSTR v) if(NS_FAILED(nsres)) ERR("SetEndAfter failed: %08lx\n", nsres); + nsIDOMText_Release(text_node); return IHTMLTxtRange_collapse(&This->IHTMLTxtRange_iface, VARIANT_FALSE); }

1 0

Eric Pouech : winedbg: Cache wow64 status inside struct process.
by Alexandre Julliard 07 Jul '23

07 Jul '23

Module: wine Branch: master Commit: bde065746e51e4cfdcf0cbf8583a933abbb2daea URL: https://gitlab.winehq.org/wine/wine/-/commit/bde065746e51e4cfdcf0cbf8583a93… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Wed Jul 5 19:29:04 2023 +0200 winedbg: Cache wow64 status inside struct process. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/winedbg/debugger.h | 1 + programs/winedbg/gdbproxy.c | 10 +++------- programs/winedbg/tgt_active.c | 4 +--- programs/winedbg/winedbg.c | 5 +++-- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index 59c923c38ad..28fb788b3c7 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -280,6 +280,7 @@ struct dbg_process struct backend_cpu* be_cpu; HANDLE event_on_first_exception; BOOL active_debuggee; + BOOL is_wow64; struct dbg_breakpoint bp[MAX_BREAKPOINTS]; unsigned next_bp; struct dbg_delayed_bp* delayed_bp; diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 18e18289bee..238eecb1538 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -1685,7 +1685,6 @@ static BOOL CALLBACK packet_query_libraries_cb(PCSTR mod_name, DWORD64 base, PVO IMAGE_NT_HEADERS *nth = NULL; IMAGEHLP_MODULE64 mod; SIZE_T size, i; - BOOL is_wow64; char buffer[0x400]; mod.SizeOfStruct = sizeof(mod); @@ -1709,8 +1708,7 @@ static BOOL CALLBACK packet_query_libraries_cb(PCSTR mod_name, DWORD64 base, PVO if ((unix_path = wine_get_unix_file_name(nt_name.Buffer))) { - if (IsWow64Process(gdbctx->process->handle, &is_wow64) && - is_wow64 && (tmp = strstr(unix_path, "system32"))) + if (gdbctx->process->is_wow64 && (tmp = strstr(unix_path, "system32"))) memcpy(tmp, "syswow64", 8); reply_buffer_append_xmlstr(reply, unix_path); } @@ -1743,7 +1741,7 @@ static BOOL CALLBACK packet_query_libraries_cb(PCSTR mod_name, DWORD64 base, PVO * the following computation valid in all cases. */ dos = (IMAGE_DOS_HEADER *)buffer; nth = (IMAGE_NT_HEADERS *)(buffer + dos->e_lfanew); - if (IsWow64Process(gdbctx->process->handle, &is_wow64) && is_wow64) + if (gdbctx->process->is_wow64) sec = IMAGE_FIRST_SECTION((IMAGE_NT_HEADERS32 *)nth); else sec = IMAGE_FIRST_SECTION((IMAGE_NT_HEADERS64 *)nth); @@ -1967,7 +1965,6 @@ static enum packet_return packet_query_exec_file(struct gdb_context* gdbctx) struct reply_buffer* reply = &gdbctx->qxfer_buffer; struct dbg_process* process = gdbctx->process; char *unix_path; - BOOL is_wow64; char *tmp; if (!process) return packet_error; @@ -1978,8 +1975,7 @@ static enum packet_return packet_query_exec_file(struct gdb_context* gdbctx) if (!(unix_path = wine_get_unix_file_name(process->imageName))) return packet_reply_error(gdbctx, GetLastError() == ERROR_NOT_ENOUGH_MEMORY ? HOST_ENOMEM : HOST_ENOENT); - if (IsWow64Process(process->handle, &is_wow64) && - is_wow64 && (tmp = strstr(unix_path, "system32"))) + if (process->is_wow64 && (tmp = strstr(unix_path, "system32"))) memcpy(tmp, "syswow64", 8); reply_buffer_append_str(reply, unix_path); diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index 0d5ae754af5..7a5d71d8909 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -869,15 +869,13 @@ static void output_system_info(void) const char *(CDECL *wine_get_build_id)(void); void (CDECL *wine_get_host_version)( const char **sysname, const char **release ); - BOOL is_wow64; wine_get_build_id = (void *)GetProcAddress(GetModuleHandleA("ntdll.dll"), "wine_get_build_id"); wine_get_host_version = (void *)GetProcAddress(GetModuleHandleA("ntdll.dll"), "wine_get_host_version"); - if (!IsWow64Process( dbg_curr_process->handle, &is_wow64 )) is_wow64 = FALSE; dbg_printf( "System information:\n" ); if (wine_get_build_id) dbg_printf( " Wine build: %s\n", wine_get_build_id() ); - dbg_printf( " Platform: %s%s\n", platform, is_wow64 ? " (WOW64)" : "" ); + dbg_printf( " Platform: %s%s\n", platform, dbg_curr_process->is_wow64 ? " (WOW64)" : "" ); dbg_printf( " Version: Windows %s\n", get_windows_version() ); if (wine_get_host_version) { diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index e7ba6afa2e4..438d4a3d94b 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -266,6 +266,8 @@ struct dbg_process* dbg_add_process(const struct be_process_io* pio, DWORD pid, if (!h) h = OpenProcess(PROCESS_ALL_ACCESS, FALSE, pid); + if (!IsWow64Process(h, &wow64)) wow64 = FALSE; + if (!(p = malloc(sizeof(struct dbg_process)))) return NULL; p->handle = h; p->pid = pid; @@ -276,6 +278,7 @@ struct dbg_process* dbg_add_process(const struct be_process_io* pio, DWORD pid, list_init(&p->modules); p->event_on_first_exception = NULL; p->active_debuggee = FALSE; + p->is_wow64 = wow64; p->next_bp = 1; /* breakpoint 0 is reserved for step-over */ memset(p->bp, 0, sizeof(p->bp)); p->delayed_bp = NULL; @@ -291,8 +294,6 @@ struct dbg_process* dbg_add_process(const struct be_process_io* pio, DWORD pid, list_add_head(&dbg_process_list, &p->entry); - IsWow64Process(h, &wow64); - #ifdef __i386__ p->be_cpu = &be_i386; #elif defined(__x86_64__)

1 0

Eric Pouech : winedbg: Add 'info system' command.
by Alexandre Julliard 07 Jul '23

07 Jul '23

Module: wine Branch: master Commit: 7ada0e223904c563d79af97922dc8301ecf030f9 URL: https://gitlab.winehq.org/wine/wine/-/commit/7ada0e223904c563d79af97922dc83… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Wed Jul 5 19:29:04 2023 +0200 winedbg: Add 'info system' command. Letting the information displayed in '--auto' mode be available as a command. Simplify a bit the --auto mode handling. Note: - the WOW64 status of the debuggee used to be printed in system information, which is a bit ackward as system info shouldn't be tied to a given process. - replaced it with supported guest machines (for the record, a 64-bit only setup incorrectly returns i386 as supported guest; I guess we shouldn't care). - now printing the wow64 status of a process when displaying an exception information instead. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/winedbg/dbg.y | 3 +- programs/winedbg/debug.l | 1 + programs/winedbg/debugger.h | 1 + programs/winedbg/info.c | 108 +++++++++++++++++++++++++++++++++++++++++- programs/winedbg/tgt_active.c | 97 ++----------------------------------- 5 files changed, 115 insertions(+), 95 deletions(-)

1 0

Eric Pouech : winedbg: Detect debuggee termination before first exception.
by Alexandre Julliard 07 Jul '23

07 Jul '23

Module: wine Branch: master Commit: fdd1c1c7765a2d863975fb1ed9e310f453934ec5 URL: https://gitlab.winehq.org/wine/wine/-/commit/fdd1c1c7765a2d863975fb1ed9e310… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Wed Jul 5 19:29:04 2023 +0200 winedbg: Detect debuggee termination before first exception. When a crash in a program happens, and the debugger in launched in --auto mode, in some cases the program terminates before the debugger has gotten proper context on debuggee. (Could be a watchdog in programs checking if it's debugged and terminating itself if so). Detect debuggee termination and still provide some information on debuggee (threads, modules, system info). The backtrace will not be available as no exception is gotten from debuggee. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55187 Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/winedbg/tgt_active.c | 39 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index a339a586eca..5ac9a4d1229 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -597,6 +597,26 @@ void dbg_active_wait_for_first_exception(void) wait_exception(); } +static BOOL dbg_active_wait_for_startup(DEBUG_EVENT* de) +{ + dbg_interactiveP = FALSE; + while (dbg_num_processes() && WaitForDebugEvent(de, INFINITE)) + { + switch (de->dwDebugEventCode) + { + case CREATE_PROCESS_DEBUG_EVENT: + case CREATE_THREAD_DEBUG_EVENT: + case LOAD_DLL_DEBUG_EVENT: + case EXCEPTION_DEBUG_EVENT: + if (dbg_handle_debug_event(de)) return TRUE; + break; + default: + return FALSE; + } + } + return FALSE; +} + static BOOL dbg_start_debuggee(LPSTR cmdLine) { PROCESS_INFORMATION info; @@ -862,6 +882,8 @@ enum dbg_start dbg_active_auto(int argc, char* argv[]) { HANDLE thread = 0, event = 0, input, output = INVALID_HANDLE_VALUE; enum dbg_start ds = start_error_parse; + BOOL first_exception = TRUE; + DEBUG_EVENT de; DBG_IVAR(BreakOnDllLoad) = 0; @@ -894,12 +916,25 @@ enum dbg_start dbg_active_auto(int argc, char* argv[]) NULL); if (input == INVALID_HANDLE_VALUE) return start_error_parse; - if (dbg_curr_process->active_debuggee) - dbg_active_wait_for_first_exception(); + /* debuggee can terminate before we get the first exception. + * so detect end of attach load sequence, and then print information. + */ + if (dbg_curr_process->active_debuggee && !(first_exception = dbg_active_wait_for_startup(&de))) + { + dbg_printf("Couldn't get first exception for process %04lx %ls%s.\n" + "No backtrace available\n", + dbg_curr_pid, dbg_curr_process->imageName, dbg_curr_process->is_wow64 ? " (WOW64)" : ""); + } dbg_interactiveP = TRUE; parser_handle(NULL, input); + if (!first_exception) + { + /* continue managing debug events, in case the exception event comes after current debug event */ + ContinueDebugEvent(de.dwProcessId, de.dwThreadId, DBG_CONTINUE); + dbg_active_wait_for_first_exception(); + } if (output != INVALID_HANDLE_VALUE) { SetEvent( event );

1 0

Alistair Leslie-Hughes : xaudio2_7: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 07 Jul '23

07 Jul '23

Module: wine Branch: master Commit: db6b62dfa99688302aed35920bcb701af8e9d183 URL: https://gitlab.winehq.org/wine/wine/-/commit/db6b62dfa99688302aed35920bcb70… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jul 7 18:38:51 2023 +1000 xaudio2_7: Remove DECLSPEC_HIDDEN usage. --- dlls/xaudio2_7/xaudio_private.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/xaudio2_7/xaudio_private.h b/dlls/xaudio2_7/xaudio_private.h index 8c07d4e9555..fc907edf9c1 100644 --- a/dlls/xaudio2_7/xaudio_private.h +++ b/dlls/xaudio2_7/xaudio_private.h @@ -104,15 +104,15 @@ typedef struct _IXAudio2Impl { } IXAudio2Impl; /* xaudio_dll.c */ -extern HRESULT xaudio2_initialize(IXAudio2Impl *This, UINT32 flags, XAUDIO2_PROCESSOR proc) DECLSPEC_HIDDEN; -extern FAudioEffectChain *wrap_effect_chain(const XAUDIO2_EFFECT_CHAIN *pEffectChain) DECLSPEC_HIDDEN; -extern void engine_cb(FAudioEngineCallEXT proc, FAudio *faudio, float *stream, void *user) DECLSPEC_HIDDEN; -extern DWORD WINAPI engine_thread(void *user) DECLSPEC_HIDDEN; +extern HRESULT xaudio2_initialize(IXAudio2Impl *This, UINT32 flags, XAUDIO2_PROCESSOR proc); +extern FAudioEffectChain *wrap_effect_chain(const XAUDIO2_EFFECT_CHAIN *pEffectChain); +extern void engine_cb(FAudioEngineCallEXT proc, FAudio *faudio, float *stream, void *user); +extern DWORD WINAPI engine_thread(void *user); /* xapo.c */ -extern HRESULT make_xapo_factory(REFCLSID clsid, REFIID riid, void **ppv) DECLSPEC_HIDDEN; +extern HRESULT make_xapo_factory(REFCLSID clsid, REFIID riid, void **ppv); /* xaudio_allocator.c */ -extern void* XAudio_Internal_Malloc(size_t size) DECLSPEC_HIDDEN; -extern void XAudio_Internal_Free(void* ptr) DECLSPEC_HIDDEN; -extern void* XAudio_Internal_Realloc(void* ptr, size_t size) DECLSPEC_HIDDEN; +extern void* XAudio_Internal_Malloc(size_t size); +extern void XAudio_Internal_Free(void* ptr); +extern void* XAudio_Internal_Realloc(void* ptr, size_t size);

1 0

Alistair Leslie-Hughes : dsound: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 07 Jul '23

07 Jul '23

Module: wine Branch: master Commit: 0599292ce7acb6c7f437700319f1d88d0970d7b8 URL: https://gitlab.winehq.org/wine/wine/-/commit/0599292ce7acb6c7f437700319f1d8… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jul 7 18:38:51 2023 +1000 dsound: Remove DECLSPEC_HIDDEN usage. --- dlls/dsound/dsound_private.h | 120 +++++++++++++++++++++---------------------- 1 file changed, 60 insertions(+), 60 deletions(-)

1 0

Alistair Leslie-Hughes : winmm: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 07 Jul '23

07 Jul '23

Module: wine Branch: master Commit: c55eaef445a3f6d34adfd1ec65d0541e90710670 URL: https://gitlab.winehq.org/wine/wine/-/commit/c55eaef445a3f6d34adfd1ec65d054… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jul 7 18:38:51 2023 +1000 winmm: Remove DECLSPEC_HIDDEN usage. --- dlls/winmm/winemm.h | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/winmm/winemm.h b/dlls/winmm/winemm.h index 52cab64b1c5..0bae816c793 100644 --- a/dlls/winmm/winemm.h +++ b/dlls/winmm/winemm.h @@ -127,39 +127,39 @@ typedef struct tagWINE_MMIO { /* function prototypes */ -LPWINE_DRIVER DRIVER_FindFromHDrvr(HDRVR hDrvr) DECLSPEC_HIDDEN; -BOOL DRIVER_GetLibName(LPCWSTR keyName, LPCWSTR sectName, LPWSTR buf, int sz) DECLSPEC_HIDDEN; -LPWINE_DRIVER DRIVER_TryOpenDriver32(LPCWSTR fn, LPARAM lParam2) DECLSPEC_HIDDEN; -void DRIVER_UnloadAll(void) DECLSPEC_HIDDEN; +LPWINE_DRIVER DRIVER_FindFromHDrvr(HDRVR hDrvr); +BOOL DRIVER_GetLibName(LPCWSTR keyName, LPCWSTR sectName, LPWSTR buf, int sz); +LPWINE_DRIVER DRIVER_TryOpenDriver32(LPCWSTR fn, LPARAM lParam2); +void DRIVER_UnloadAll(void); -void MMDRV_Exit(void) DECLSPEC_HIDDEN; -UINT MMDRV_GetNum(UINT) DECLSPEC_HIDDEN; +void MMDRV_Exit(void); +UINT MMDRV_GetNum(UINT); LPWINE_MLD MMDRV_Alloc(UINT size, UINT type, LPHANDLE hndl, DWORD* dwFlags, - DWORD_PTR* dwCallback, DWORD_PTR* dwInstance) DECLSPEC_HIDDEN; -void MMDRV_Free(HANDLE hndl, LPWINE_MLD mld) DECLSPEC_HIDDEN; -DWORD MMDRV_Open(LPWINE_MLD mld, UINT wMsg, DWORD_PTR dwParam1, DWORD dwParam2) DECLSPEC_HIDDEN; -DWORD MMDRV_Close(LPWINE_MLD mld, UINT wMsg) DECLSPEC_HIDDEN; -LPWINE_MLD MMDRV_Get(HANDLE hndl, UINT type, BOOL bCanBeID) DECLSPEC_HIDDEN; -DWORD MMDRV_Message(LPWINE_MLD mld, UINT wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2) DECLSPEC_HIDDEN; -UINT MMDRV_PhysicalFeatures(LPWINE_MLD mld, UINT uMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2) DECLSPEC_HIDDEN; + DWORD_PTR* dwCallback, DWORD_PTR* dwInstance); +void MMDRV_Free(HANDLE hndl, LPWINE_MLD mld); +DWORD MMDRV_Open(LPWINE_MLD mld, UINT wMsg, DWORD_PTR dwParam1, DWORD dwParam2); +DWORD MMDRV_Close(LPWINE_MLD mld, UINT wMsg); +LPWINE_MLD MMDRV_Get(HANDLE hndl, UINT type, BOOL bCanBeID); +DWORD MMDRV_Message(LPWINE_MLD mld, UINT wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2); +UINT MMDRV_PhysicalFeatures(LPWINE_MLD mld, UINT uMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2); -DWORD MCI_SendCommand(UINT wDevID, UINT16 wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2) DECLSPEC_HIDDEN; +DWORD MCI_SendCommand(UINT wDevID, UINT16 wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2); -const char* WINMM_ErrorToString(MMRESULT error) DECLSPEC_HIDDEN; +const char* WINMM_ErrorToString(MMRESULT error); -void TIME_MMTimeStop(void) DECLSPEC_HIDDEN; +void TIME_MMTimeStop(void); -MMRESULT WINMM_CheckCallback(DWORD_PTR dwCallback, DWORD fdwOpen, BOOL mixer) DECLSPEC_HIDDEN; +MMRESULT WINMM_CheckCallback(DWORD_PTR dwCallback, DWORD fdwOpen, BOOL mixer); -void WINMM_DeleteWaveform(void) DECLSPEC_HIDDEN; +void WINMM_DeleteWaveform(void); -void joystick_unload( void ) DECLSPEC_HIDDEN; +void joystick_unload( void ); /* Global variables */ -extern CRITICAL_SECTION WINMM_cs DECLSPEC_HIDDEN; -extern HINSTANCE hWinMM32Instance DECLSPEC_HIDDEN; -extern HANDLE psLastEvent DECLSPEC_HIDDEN; -extern HANDLE psStopEvent DECLSPEC_HIDDEN; +extern CRITICAL_SECTION WINMM_cs; +extern HINSTANCE hWinMM32Instance; +extern HANDLE psLastEvent; +extern HANDLE psStopEvent; /* GetDriverFlags() returned bits is not documented (nor the call itself) * Here are Wine only definitions of the bits

1 0

Mohamad Al-Jaf : include: Add support for BYTE IReference.
by Alexandre Julliard 07 Jul '23

07 Jul '23

Module: wine Branch: master Commit: 296fc81340d61d2ebf1d868e3531fcbaae443ca2 URL: https://gitlab.winehq.org/wine/wine/-/commit/296fc81340d61d2ebf1d868e3531fc… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sun Jul 2 22:37:53 2023 -0400 include: Add support for BYTE IReference. Needed by Windows.Networking.Connectivity.IPInformation. --- include/windows.foundation.idl | 1 + 1 file changed, 1 insertion(+) diff --git a/include/windows.foundation.idl b/include/windows.foundation.idl index 281b51d0d6c..9be302515a4 100644 --- a/include/windows.foundation.idl +++ b/include/windows.foundation.idl @@ -86,6 +86,7 @@ namespace Windows.Foundation { interface Windows.Foundation.AsyncOperationCompletedHandler<boolean>; interface Windows.Foundation.IAsyncOperation<IInspectable *>; interface Windows.Foundation.IAsyncOperation<boolean>; + interface Windows.Foundation.IReference<BYTE>; interface Windows.Foundation.IReference<INT32>; interface Windows.Foundation.IReference<DOUBLE>; interface Windows.Foundation.TypedEventHandler<IInspectable *, IInspectable *>;

1 0

Mohamad Al-Jaf : include: Add windows.networking.connectivity.idl file.
by Alexandre Julliard 07 Jul '23

07 Jul '23

Module: wine Branch: master Commit: ef5f397b7dff909325001a4a39319bc98f798056 URL: https://gitlab.winehq.org/wine/wine/-/commit/ef5f397b7dff909325001a4a39319b… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sun Jul 2 23:26:30 2023 -0400 include: Add windows.networking.connectivity.idl file. Needed by Windows.Networking.HostName. --- include/Makefile.in | 1 + include/windows.networking.connectivity.idl | 66 +++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 1f28524adc2..80ba168dc86 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -834,6 +834,7 @@ SOURCES = \ windows.media.idl \ windows.media.speechrecognition.idl \ windows.media.speechsynthesis.idl \ + windows.networking.connectivity.idl \ windows.perception.spatial.idl \ windows.perception.spatial.surfaces.idl \ windows.security.credentials.idl \ diff --git a/include/windows.networking.connectivity.idl b/include/windows.networking.connectivity.idl new file mode 100644 index 00000000000..8c6489ba13b --- /dev/null +++ b/include/windows.networking.connectivity.idl @@ -0,0 +1,66 @@ +/* + * 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.networking.idl"; */ +import "windows.storage.streams.idl"; + +namespace Windows.Networking.Connectivity { + interface IIPInformation; + interface INetworkAdapter; + + runtimeclass IPInformation; + runtimeclass NetworkAdapter; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Networking.Connectivity.IPInformation), + uuid(d85145e0-138f-47d7-9b3a-36bb488cef33) + ] + interface IIPInformation : IInspectable + { + [propget] HRESULT NetworkAdapter([out, retval] Windows.Networking.Connectivity.NetworkAdapter **value); + [propget] HRESULT PrefixLength([out, retval] Windows.Foundation.IReference<BYTE> **value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile) + ] + runtimeclass IPInformation + { + [default] interface Windows.Networking.Connectivity.IIPInformation; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + ] + runtimeclass NetworkAdapter + { + [default] interface Windows.Networking.Connectivity.INetworkAdapter; + } +}

1 0

Mohamad Al-Jaf : include: Add windows.networking.idl file.
by Alexandre Julliard 07 Jul '23

07 Jul '23

Module: wine Branch: master Commit: 07b7fd09f7149300d3c36f1e1b413206aeabbce3 URL: https://gitlab.winehq.org/wine/wine/-/commit/07b7fd09f7149300d3c36f1e1b4132… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sun Jul 2 23:32:39 2023 -0400 include: Add windows.networking.idl file. --- include/Makefile.in | 1 + include/windows.networking.idl | 173 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 174 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 80ba168dc86..b1b582ff4d6 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -835,6 +835,7 @@ SOURCES = \ windows.media.speechrecognition.idl \ windows.media.speechsynthesis.idl \ windows.networking.connectivity.idl \ + windows.networking.idl \ windows.perception.spatial.idl \ windows.perception.spatial.surfaces.idl \ windows.security.credentials.idl \ diff --git a/include/windows.networking.idl b/include/windows.networking.idl new file mode 100644 index 00000000000..e864a3bb1ad --- /dev/null +++ b/include/windows.networking.idl @@ -0,0 +1,173 @@ +/* + * 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.networking.connectivity.idl"; + +namespace Windows.Networking { + typedef enum DomainNameType DomainNameType; + typedef enum HostNameSortOptions HostNameSortOptions; + typedef enum HostNameType HostNameType; + + interface IEndpointPair; + interface IEndpointPairFactory; + interface IHostName; + interface IHostNameFactory; + interface IHostNameStatics; + + runtimeclass EndpointPair; + runtimeclass HostName; + + declare { + interface Windows.Foundation.Collections.IIterable<Windows.Networking.EndpointPair *>; + interface Windows.Foundation.Collections.IIterable<Windows.Networking.HostName *>; + interface Windows.Foundation.Collections.IIterator<Windows.Networking.EndpointPair *>; + interface Windows.Foundation.Collections.IIterator<Windows.Networking.HostName *>; + interface Windows.Foundation.Collections.IVectorView<Windows.Networking.EndpointPair *>; + interface Windows.Foundation.Collections.IVectorView<Windows.Networking.HostName *>; + interface Windows.Foundation.Collections.IVector<Windows.Networking.HostName *>; + interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Foundation.Collections.IVectorView<Windows.Networking.EndpointPair *> *>; + interface Windows.Foundation.IAsyncOperation<Windows.Foundation.Collections.IVectorView<Windows.Networking.EndpointPair *> *>; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0) + ] + enum DomainNameType + { + Suffix = 0, + FullyQualified = 1, + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + flags + ] + enum HostNameSortOptions + { + None = 0x0, + OptimizeForLongConnections = 0x2, + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0) + ] + enum HostNameType + { + DomainName = 0, + Ipv4 = 1, + Ipv6 = 2, + Bluetooth = 3, + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Networking.EndpointPair), + uuid(33a0aa36-f8fa-4b30-b856-76517c3bd06d) + ] + interface IEndpointPair : IInspectable + { + [propget] HRESULT LocalHostName([out, retval] Windows.Networking.HostName **value); + [propput] HRESULT LocalHostName([in] Windows.Networking.HostName *value); + [propget] HRESULT LocalServiceName([out, retval] HSTRING *value); + [propput] HRESULT LocalServiceName([in] HSTRING value); + [propget] HRESULT RemoteHostName([out, retval] Windows.Networking.HostName **value); + [propput] HRESULT RemoteHostName([in] Windows.Networking.HostName *value); + [propget] HRESULT RemoteServiceName([out, retval] HSTRING *value); + [propput] HRESULT RemoteServiceName([in] HSTRING value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Networking.EndpointPair), + uuid(b609d971-64e0-442b-aa6f-cc8c8f181f78) + ] + interface IEndpointPairFactory : IInspectable + { + HRESULT CreateEndpointPair([in] Windows.Networking.HostName *host, [in] HSTRING service, + [in] Windows.Networking.HostName *remote_host, [in] HSTRING remote_service, + [out, retval] Windows.Networking.EndpointPair **value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Networking.HostName), + uuid(bf8ecaad-ed96-49a7-9084-d416cae88dcb) + ] + interface IHostName : IInspectable + { + [propget] HRESULT IPInformation([out, retval] Windows.Networking.Connectivity.IPInformation **value); + [propget] HRESULT RawName([out, retval] HSTRING *value); + [propget] HRESULT DisplayName([out, retval] HSTRING *value); + [propget] HRESULT CanonicalName([out, retval] HSTRING *value); + [propget] HRESULT Type([out, retval] Windows.Networking.HostNameType *value); + HRESULT IsEqual([in] Windows.Networking.HostName *name, [out, retval] boolean *equal); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Networking.HostName), + uuid(458c23ed-712f-4576-adf1-c20b2c643558) + ] + interface IHostNameFactory : IInspectable + { + HRESULT CreateHostName([in] HSTRING name, [out, retval] Windows.Networking.HostName **value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Networking.HostName), + uuid(f68cd4bf-a388-4e8b-91ea-54dd6dd901c0) + ] + interface IHostNameStatics : IInspectable + { + HRESULT Compare([in] HSTRING value1, [in] HSTRING value2, [out, retval] INT32 *result); + } + + [ + activatable(Windows.Networking.IEndpointPairFactory, Windows.Foundation.UniversalApiContract, 1.0), + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass EndpointPair + { + [default] interface Windows.Networking.IEndpointPair; + } + + [ + activatable(Windows.Networking.IHostNameFactory, Windows.Foundation.UniversalApiContract, 1.0), + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + static(Windows.Networking.IHostNameStatics, Windows.Foundation.UniversalApiContract, 1.0), + threading(both) + ] + runtimeclass HostName + { + [default] interface Windows.Networking.IHostName; + [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.Foundation.IStringable; + } +}

1 0