February 2023 - Wine-commits

Shaun Ren : winegstreamer: Implement basic functionality for video_decoder.
by Alexandre Julliard 13 Feb '23

13 Feb '23

Module: wine Branch: master Commit: 6d7b3addc4ca92fa15d5c7f6f0c4414ceba4651f URL: https://gitlab.winehq.org/wine/wine/-/commit/6d7b3addc4ca92fa15d5c7f6f0c441… Author: Shaun Ren <sren(a)codeweavers.com> Date: Wed Feb 8 01:58:39 2023 -0500 winegstreamer: Implement basic functionality for video_decoder. --- dlls/winegstreamer/video_decoder.c | 250 +++++++++++++++++++++++++++++++++++-- 1 file changed, 239 insertions(+), 11 deletions(-)

1 0

Shaun Ren : ir50_32: Implement decompression.
by Alexandre Julliard 13 Feb '23

13 Feb '23

Module: wine Branch: master Commit: 4eac23121d17e5b5cca61516429398aac1ed8e5a URL: https://gitlab.winehq.org/wine/wine/-/commit/4eac23121d17e5b5cca61516429398… Author: Shaun Ren <sren(a)codeweavers.com> Date: Wed Feb 8 02:04:02 2023 -0500 ir50_32: Implement decompression. --- dlls/ir50_32/ir50.c | 149 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 145 insertions(+), 4 deletions(-) diff --git a/dlls/ir50_32/ir50.c b/dlls/ir50_32/ir50.c index 428108f09ba..87807aba25f 100644 --- a/dlls/ir50_32/ir50.c +++ b/dlls/ir50_32/ir50.c @@ -26,6 +26,7 @@ #include "winuser.h" #include "commdlg.h" #include "vfw.h" +#include "initguid.h" #include "ir50_private.h" #include "wine/debug.h" @@ -37,6 +38,14 @@ static HINSTANCE IR50_32_hModule; #define IV50_MAGIC mmioFOURCC('I','V','5','0') #define compare_fourcc(fcc1, fcc2) (((fcc1)^(fcc2))&~0x20202020) +DEFINE_MEDIATYPE_GUID(MFVideoFormat_IV50, MAKEFOURCC('I','V','5','0')); + +static inline UINT64 +make_uint64( UINT32 high, UINT32 low ) +{ + return ((UINT64)high << 32) | low; +} + static LRESULT IV50_Open( const ICINFO *icinfo ) @@ -133,14 +142,146 @@ IV50_DecompressGetFormat( LPBITMAPINFO in, LPBITMAPINFO out ) static LRESULT IV50_DecompressBegin( IMFTransform *decoder, LPBITMAPINFO in, LPBITMAPINFO out ) { - FIXME("ICM_DECOMPRESS_BEGIN %p %p %p\n", decoder, in, out); - return ICERR_UNSUPPORTED; + IMFMediaType *input_type, *output_type; + const GUID *output_subtype; + LRESULT r = ICERR_INTERNAL; + + TRACE("ICM_DECOMPRESS_BEGIN %p %p %p\n", decoder, in, out); + + if ( !decoder ) + return ICERR_BADPARAM; + + if ( out->bmiHeader.biBitCount == 32 ) + output_subtype = &MFVideoFormat_RGB32; + else if ( out->bmiHeader.biBitCount == 16 ) + output_subtype = &MFVideoFormat_RGB555; + else + return ICERR_BADFORMAT; + + if ( FAILED(MFCreateMediaType( &input_type )) ) + return ICERR_INTERNAL; + + if ( FAILED(MFCreateMediaType( &output_type )) ) + { + IMFMediaType_Release( input_type ); + return ICERR_INTERNAL; + } + + if ( FAILED(IMFMediaType_SetGUID( input_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Video )) || + FAILED(IMFMediaType_SetGUID( input_type, &MF_MT_SUBTYPE, &MFVideoFormat_IV50 )) ) + goto done; + if ( FAILED(IMFMediaType_SetUINT64( + input_type, &MF_MT_FRAME_SIZE, + make_uint64( in->bmiHeader.biWidth, in->bmiHeader.biHeight ) )) ) + goto done; + + if ( FAILED(IMFMediaType_SetGUID( output_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Video )) || + FAILED(IMFMediaType_SetGUID( output_type, &MF_MT_SUBTYPE, output_subtype )) ) + goto done; + if ( FAILED(IMFMediaType_SetUINT64( + output_type, &MF_MT_FRAME_SIZE, + make_uint64( out->bmiHeader.biWidth, abs(out->bmiHeader.biHeight) ) )) ) + goto done; + + if ( FAILED(IMFTransform_SetInputType( decoder, 0, input_type, 0 )) || + FAILED(IMFTransform_SetOutputType( decoder, 0, output_type, 0 )) ) + goto done; + + r = ICERR_OK; + +done: + IMFMediaType_Release( input_type ); + IMFMediaType_Release( output_type ); + return r; } static LRESULT IV50_Decompress( IMFTransform *decoder, ICDECOMPRESS *icd, DWORD size ) { - FIXME("ICM_DECOMPRESS %p %p %lu\n", decoder, icd, size); - return ICERR_UNSUPPORTED; + IMFSample *in_sample = NULL, *out_sample = NULL; + IMFMediaBuffer *in_buf = NULL, *out_buf = NULL; + MFT_OUTPUT_DATA_BUFFER mft_buf; + DWORD mft_status; + BYTE *data; + HRESULT hr; + LRESULT r = ICERR_INTERNAL; + + TRACE("ICM_DECOMPRESS %p %p %lu\n", decoder, icd, size); + + if ( FAILED(MFCreateSample( &in_sample )) ) + return ICERR_INTERNAL; + + if ( FAILED(MFCreateMemoryBuffer( icd->lpbiInput->biSizeImage, &in_buf )) ) + goto done; + + if ( FAILED(IMFSample_AddBuffer( in_sample, in_buf )) ) + goto done; + + if ( FAILED(MFCreateSample( &out_sample )) ) + goto done; + + if ( FAILED(MFCreateMemoryBuffer( icd->lpbiOutput->biSizeImage, &out_buf )) ) + goto done; + + if ( FAILED(IMFSample_AddBuffer( out_sample, out_buf )) ) + goto done; + + if ( FAILED(IMFMediaBuffer_Lock( in_buf, &data, NULL, NULL ))) + goto done; + + memcpy( data, icd->lpInput, icd->lpbiInput->biSizeImage ); + + if ( FAILED(IMFMediaBuffer_Unlock( in_buf )) ) + goto done; + + if ( FAILED(IMFMediaBuffer_SetCurrentLength( in_buf, icd->lpbiInput->biSizeImage )) ) + goto done; + + if ( FAILED(IMFTransform_ProcessInput( decoder, 0, in_sample, 0 )) ) + goto done; + + memset( &mft_buf, 0, sizeof(mft_buf) ); + mft_buf.pSample = out_sample; + + hr = IMFTransform_ProcessOutput( decoder, 0, 1, &mft_buf, &mft_status ); + if ( SUCCEEDED(hr) && (mft_status & MFT_OUTPUT_DATA_BUFFER_FORMAT_CHANGE) ) + hr = IMFTransform_ProcessOutput( decoder, 0, 1, &mft_buf, &mft_status ); + + if ( SUCCEEDED(hr) ) + { + LONG width = icd->lpbiOutput->biWidth * (icd->lpbiOutput->biBitCount / 8); + LONG height = abs( icd->lpbiOutput->biHeight ); + LONG data_stride = (width + 3) & ~3; + LONG out_stride = icd->lpbiOutput->biHeight >= 0 ? -data_stride : data_stride; + BYTE *output_start = (BYTE *)icd->lpOutput; + + if (out_stride < 0) + output_start += (height - 1) * abs(out_stride); + + if ( FAILED(IMFMediaBuffer_Lock( out_buf, &data, NULL, NULL ))) + goto done; + + MFCopyImage( output_start, out_stride, data, data_stride, width, height ); + + IMFMediaBuffer_Unlock( out_buf ); + r = ICERR_OK; + } + else if ( hr == MF_E_TRANSFORM_NEED_MORE_INPUT ) + { + TRACE("no output received.\n"); + r = ICERR_OK; + } + +done: + if ( in_buf ) + IMFMediaBuffer_Release( in_buf ); + if ( in_sample ) + IMFSample_Release( in_sample ); + if ( out_buf ) + IMFMediaBuffer_Release( out_buf ); + if ( out_sample ) + IMFSample_Release( out_sample ); + + return r; } static LRESULT IV50_GetInfo( ICINFO *icinfo, DWORD dwSize )

1 0

Shaun Ren : wine.inf: Enable ir50_32 video codec.
by Alexandre Julliard 13 Feb '23

13 Feb '23

Module: wine Branch: master Commit: d83e03f638094cbac14307b0eabc9b71025dbaae URL: https://gitlab.winehq.org/wine/wine/-/commit/d83e03f638094cbac14307b0eabc9b… Author: Shaun Ren <sren(a)codeweavers.com> Date: Wed Feb 8 02:46:23 2023 -0500 wine.inf: Enable ir50_32 video codec. --- loader/wine.inf.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index a306b07dc26..1f5138051c9 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2242,7 +2242,7 @@ system.ini, drivers32,,"msacm.msgsm610=msgsm32.acm" system.ini, drivers32,,"vidc.mrle=msrle32.dll" system.ini, drivers32,,"vidc.msvc=msvidc32.dll" system.ini, drivers32,,"vidc.cvid=iccvid.dll" -system.ini, drivers32,,"; vidc.IV50=ir50_32.dll" +system.ini, drivers32,,"vidc.IV50=ir50_32.dll" system.ini, drivers32,,"; vidc.IV31=ir32_32.dll" system.ini, drivers32,,"; vidc.IV32=ir32_32.dll"

1 0

André Zwing : maintainers: Remove myself as maintainer of wpcap.
by Alexandre Julliard 13 Feb '23

13 Feb '23

Module: wine Branch: master Commit: 5ff8c089a92d949cd1b40826f32abb49155046ef URL: https://gitlab.winehq.org/wine/wine/-/commit/5ff8c089a92d949cd1b40826f32abb… Author: André Zwing <nerv(a)dawncrow.de> Date: Mon Feb 13 12:36:57 2023 +0100 maintainers: Remove myself as maintainer of wpcap. --- MAINTAINERS | 4 ---- 1 file changed, 4 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 50f75e04e6f..22351f5af60 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -395,10 +395,6 @@ WinINet P: Jacek Caban <jacek(a)codeweavers.com> F: dlls/wininet/ -WPcap -M: André Zwing <nerv(a)dawncrow.de> -F: dlls/wpcap/ - X11 Driver M: Alexandre Julliard <julliard(a)winehq.org> P: Rémi Bernon <rbernon(a)codeweavers.com>

1 0

Hans Leidekker : configure: Check for pcap_init() instead of pcap_create().
by Alexandre Julliard 13 Feb '23

13 Feb '23

Module: wine Branch: master Commit: 032e8d9c362b881a4213c819d1cc6262f2df4b35 URL: https://gitlab.winehq.org/wine/wine/-/commit/032e8d9c362b881a4213c819d1cc62… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 7 21:40:23 2023 +0100 configure: Check for pcap_init() instead of pcap_create(). pcap_init() will be required by later patches and it was introduced after pcap_create(). --- configure | 22 +++++++++++----------- configure.ac | 4 ++-- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/configure b/configure index f07125ef8f6..aae3f417b67 100755 --- a/configure +++ b/configure @@ -15708,9 +15708,9 @@ fi if test "$ac_cv_header_pcap_pcap_h" = "yes" then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pcap_create in -lpcap" >&5 -printf %s "checking for pcap_create in -lpcap... " >&6; } -if test ${ac_cv_lib_pcap_pcap_create+y} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pcap_init in -lpcap" >&5 +printf %s "checking for pcap_init in -lpcap... " >&6; } +if test ${ac_cv_lib_pcap_pcap_init+y} then : printf %s "(cached) " >&6 else $as_nop @@ -15722,35 +15722,35 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -char pcap_create (); +char pcap_init (); int main (void) { -return pcap_create (); +return pcap_init (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO" then : - ac_cv_lib_pcap_pcap_create=yes + ac_cv_lib_pcap_pcap_init=yes else $as_nop - ac_cv_lib_pcap_pcap_create=no + ac_cv_lib_pcap_pcap_init=no fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pcap_pcap_create" >&5 -printf "%s\n" "$ac_cv_lib_pcap_pcap_create" >&6; } -if test "x$ac_cv_lib_pcap_pcap_create" = xyes +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pcap_pcap_init" >&5 +printf "%s\n" "$ac_cv_lib_pcap_pcap_init" >&6; } +if test "x$ac_cv_lib_pcap_pcap_init" = xyes then : PCAP_LIBS="-lpcap" fi fi -if test "x$ac_cv_lib_pcap_pcap_create" != xyes +if test "x$ac_cv_lib_pcap_pcap_init" != xyes then : case "x$with_pcap" in x) as_fn_append wine_notices "|pcap ${notice_platform}development files not found, wpcap won't be supported." ;; diff --git a/configure.ac b/configure.ac index 6410f8a0e42..3d996c34fae 100644 --- a/configure.ac +++ b/configure.ac @@ -1371,9 +1371,9 @@ WINE_NOTICE_WITH(opencl,[test "x$ac_cv_lib_OpenCL_clGetPlatformInfo" != xyes], dnl **** Check for libpcap **** if test "$ac_cv_header_pcap_pcap_h" = "yes" then - AC_CHECK_LIB(pcap,pcap_create,[AC_SUBST(PCAP_LIBS,["-lpcap"])]) + AC_CHECK_LIB(pcap,pcap_init,[AC_SUBST(PCAP_LIBS,["-lpcap"])]) fi -WINE_NOTICE_WITH(pcap,[test "x$ac_cv_lib_pcap_pcap_create" != xyes], +WINE_NOTICE_WITH(pcap,[test "x$ac_cv_lib_pcap_pcap_init" != xyes], [pcap ${notice_platform}development files not found, wpcap won't be supported.], [enable_wpcap])

1 0

Hans Leidekker : wpcap: Sync spec file with latest version of libpcap.
by Alexandre Julliard 13 Feb '23

13 Feb '23

Module: wine Branch: master Commit: adf7336b53042f4875a62e28d51931c836af2889 URL: https://gitlab.winehq.org/wine/wine/-/commit/adf7336b53042f4875a62e28d51931… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 6 12:39:19 2023 +0100 wpcap: Sync spec file with latest version of libpcap. --- dlls/wpcap/wpcap.c | 2 +- dlls/wpcap/wpcap.spec | 27 +++++++++++++++++++++------ 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index 4d8a115b0ea..0964715f92c 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -865,7 +865,7 @@ const char * CDECL pcap_tstamp_type_val_to_name( int val ) return ret; } -int CDECL wsockinit( void ) +int CDECL pcap_wsockinit( void ) { WSADATA wsadata; TRACE( "\n" ); diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec index 8cbb44148e8..5c26ad0c24e 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -2,11 +2,9 @@ @ stub bpf_filter @ stub bpf_image @ stub bpf_validate -@ stub endservent @ stub eproto_db -@ stub getservent -@ stub install_bpf_program @ cdecl pcap_activate(ptr) +@ stub pcap_bufsize @ cdecl pcap_breakloop(ptr) @ cdecl pcap_can_set_rfmon(ptr) @ cdecl pcap_close(ptr) @@ -14,9 +12,11 @@ @ stub pcap_compile_nopcap @ cdecl pcap_create(str ptr) @ stub pcap_createsrcstr +@ stub pcap_datalink_ext @ cdecl pcap_datalink(ptr) @ cdecl pcap_datalink_name_to_val(str) @ cdecl pcap_datalink_val_to_description(long) +@ stub pcap_datalink_val_to_description_or_dlt @ cdecl pcap_datalink_val_to_name(long) @ cdecl pcap_dispatch(ptr long ptr ptr) @ cdecl pcap_dump(ptr ptr str) @@ -24,7 +24,12 @@ @ stub pcap_dump_file @ stub pcap_dump_flush @ stub pcap_dump_ftell +@ stub pcap_dump_ftell64 +@ stub pcap_dump_hopen @ cdecl pcap_dump_open(ptr str) +@ stub pcap_dump_open_append +@ stub pcap_ether_aton +@ stub pcap_ether_hostton @ stub pcap_file @ stub pcap_fileno @ cdecl pcap_findalldevs(ptr ptr) @@ -38,6 +43,10 @@ @ cdecl pcap_geterr(ptr) @ stub pcap_getevent @ cdecl pcap_getnonblock(ptr ptr) +@ stub pcap_hopen_offline +@ stub pcap_hopen_offline_with_tstamp_precision +@ stub pcap_init +@ stub pcap_inject @ stub pcap_is_swapped @ cdecl pcap_lib_version() @ cdecl pcap_list_datalinks(ptr ptr) @@ -53,15 +62,18 @@ @ stub pcap_next_etherent @ cdecl pcap_next_ex(ptr ptr ptr) @ stub pcap_offline_filter -@ stub pcap_offline_read +@ stub pcap_oid_get_request +@ stub pcap_oid_set_request @ cdecl pcap_open(str long long long ptr ptr) @ stub pcap_open_dead +@ stub pcap_open_dead_with_tstamp_precision @ cdecl pcap_open_live(str long long long ptr) @ stub pcap_open_offline +@ stub pcap_open_offline_with_tstamp_precision @ cdecl pcap_parsesrcstr(str ptr ptr ptr ptr ptr) @ stub pcap_perror -@ stub pcap_read @ stub pcap_remoteact_accept +@ stub pcap_remoteact_accept_ex @ stub pcap_remoteact_cleanup @ stub pcap_remoteact_close @ stub pcap_remoteact_list @@ -72,6 +84,7 @@ @ stub pcap_sendqueue_transmit @ cdecl pcap_set_buffer_size(ptr long) @ cdecl pcap_set_datalink(ptr long) +@ stub pcap_set_immediate_mode @ cdecl pcap_set_promisc(ptr long) @ cdecl pcap_set_rfmon(ptr long) @ cdecl pcap_set_snaplen(ptr long) @@ -79,6 +92,7 @@ @ cdecl pcap_set_tstamp_precision(ptr long) @ cdecl pcap_set_tstamp_type(ptr long) @ cdecl pcap_setbuff(ptr long) +@ stub pcap_setdirection @ cdecl pcap_setfilter(ptr ptr) @ stub pcap_setmintocopy @ stub pcap_setmode @@ -93,4 +107,5 @@ @ cdecl pcap_tstamp_type_name_to_val(str) @ cdecl pcap_tstamp_type_val_to_description(long) @ cdecl pcap_tstamp_type_val_to_name(long) -@ cdecl wsockinit() +@ stub pcap_version +@ cdecl pcap_wsockinit()

1 0

Hans Leidekker : wpcap: Make Unix call parameters wow64 compatible.
by Alexandre Julliard 13 Feb '23

13 Feb '23

Module: wine Branch: master Commit: e702266e14688ebff82f46d415684502bec1a44f URL: https://gitlab.winehq.org/wine/wine/-/commit/e702266e14688ebff82f46d4156845… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 6 14:31:56 2023 +0100 wpcap: Make Unix call parameters wow64 compatible. --- dlls/wpcap/unixlib.c | 281 ++++++++++------- dlls/wpcap/unixlib.h | 166 ++++++---- dlls/wpcap/wpcap.c | 870 ++++++++++++++++++++++++++++++++++++++++----------- 3 files changed, 966 insertions(+), 351 deletions(-)

1 0

Hans Leidekker : wpcap: Fix an off-by-one error in convert_length_to_ipv6_mask().
by Alexandre Julliard 13 Feb '23

13 Feb '23

Module: wine Branch: master Commit: 90f53d681a2fbd0c9fcb9db33b50183688b61031 URL: https://gitlab.winehq.org/wine/wine/-/commit/90f53d681a2fbd0c9fcb9db33b5018… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 6 16:33:40 2023 +0100 wpcap: Fix an off-by-one error in convert_length_to_ipv6_mask(). --- dlls/wpcap/wpcap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index 5494ed292e1..5c25e4a2708 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -444,7 +444,7 @@ static struct sockaddr *get_address( const IP_ADAPTER_UNICAST_ADDRESS *addr ) static void convert_length_to_ipv6_mask( ULONG length, IN6_ADDR *mask ) { unsigned int i; - for (i = 0; i < length / 8; i++) mask->u.Byte[i] = 0xff; + for (i = 0; i < length / 8 - 1; i++) mask->u.Byte[i] = 0xff; mask->u.Byte[i] = 0xff << (8 - length % 8); }

1 0

Hans Leidekker : wpcap: Implement pcap_bufsize().
by Alexandre Julliard 13 Feb '23

13 Feb '23

Module: wine Branch: master Commit: 82ed15f97599a09ec35658f770fbf6f740ffa4d5 URL: https://gitlab.winehq.org/wine/wine/-/commit/82ed15f97599a09ec35658f770fbf6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 6 16:40:49 2023 +0100 wpcap: Implement pcap_bufsize(). --- dlls/wpcap/unixlib.c | 7 +++++++ dlls/wpcap/unixlib.h | 6 ++++++ dlls/wpcap/wpcap.c | 11 +++++++++++ dlls/wpcap/wpcap.spec | 2 +- 4 files changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/wpcap/unixlib.c b/dlls/wpcap/unixlib.c index c65a13a1c15..ed753c0d6fd 100644 --- a/dlls/wpcap/unixlib.c +++ b/dlls/wpcap/unixlib.c @@ -55,6 +55,12 @@ static NTSTATUS wrap_breakloop( void *args ) return STATUS_SUCCESS; } +static NTSTATUS wrap_bufsize( void *args ) +{ + const struct bufsize_params *params = args; + return pcap_bufsize( (pcap_t *)(ULONG_PTR)params->handle ); +} + static NTSTATUS wrap_can_set_rfmon( void *args ) { const struct can_set_rfmon_params *params = args; @@ -436,6 +442,7 @@ const unixlib_entry_t __wine_unix_call_funcs[] = { wrap_activate, wrap_breakloop, + wrap_bufsize, wrap_can_set_rfmon, wrap_close, wrap_compile, diff --git a/dlls/wpcap/unixlib.h b/dlls/wpcap/unixlib.h index 403158af978..740be3ad12e 100644 --- a/dlls/wpcap/unixlib.h +++ b/dlls/wpcap/unixlib.h @@ -75,6 +75,11 @@ struct breakloop_params UINT64 handle; }; +struct bufsize_params +{ + UINT64 handle; +}; + struct can_set_rfmon_params { UINT64 handle; @@ -322,6 +327,7 @@ enum pcap_funcs { unix_activate, unix_breakloop, + unix_bufsize, unix_can_set_rfmon, unix_close, unix_compile, diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index 5c25e4a2708..f3b203f983d 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -108,6 +108,17 @@ void CDECL pcap_breakloop( struct pcap *pcap ) PCAP_CALL( breakloop, &params ); } +int CDECL pcap_bufsize( struct pcap *pcap ) +{ + struct bufsize_params params; + + TRACE( "%p\n", pcap ); + + if (!pcap) return 0; + params.handle = pcap->handle; + return PCAP_CALL( bufsize, &params ); +} + int CDECL pcap_can_set_rfmon( struct pcap *pcap ) { struct can_set_rfmon_params params; diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec index 5c26ad0c24e..7a59dda3caf 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -4,7 +4,7 @@ @ stub bpf_validate @ stub eproto_db @ cdecl pcap_activate(ptr) -@ stub pcap_bufsize +@ cdecl pcap_bufsize(ptr) @ cdecl pcap_breakloop(ptr) @ cdecl pcap_can_set_rfmon(ptr) @ cdecl pcap_close(ptr)

1 0

Hans Leidekker : wpcap: Implement pcap_dump_close().
by Alexandre Julliard 13 Feb '23

13 Feb '23

Module: wine Branch: master Commit: c589e978a7919f10bcf1150c98272db057255596 URL: https://gitlab.winehq.org/wine/wine/-/commit/c589e978a7919f10bcf1150c98272d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 6 16:47:16 2023 +0100 wpcap: Implement pcap_dump_close(). --- dlls/wpcap/unixlib.c | 8 ++++++++ dlls/wpcap/unixlib.h | 6 ++++++ dlls/wpcap/wpcap.c | 12 ++++++++++++ dlls/wpcap/wpcap.spec | 2 +- 4 files changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/wpcap/unixlib.c b/dlls/wpcap/unixlib.c index ed753c0d6fd..49232c4c444 100644 --- a/dlls/wpcap/unixlib.c +++ b/dlls/wpcap/unixlib.c @@ -155,6 +155,13 @@ static NTSTATUS wrap_dump( void *args ) return STATUS_SUCCESS; } +static NTSTATUS wrap_dump_close( void *args ) +{ + const struct dump_close_params *params = args; + pcap_dump_close( (pcap_dumper_t *)(ULONG_PTR)params->handle ); + return STATUS_SUCCESS; +} + static NTSTATUS wrap_dump_open( void *args ) { const struct dump_open_params *params = args; @@ -452,6 +459,7 @@ const unixlib_entry_t __wine_unix_call_funcs[] = wrap_datalink_val_to_description, wrap_datalink_val_to_name, wrap_dump, + wrap_dump_close, wrap_dump_open, wrap_findalldevs, wrap_get_tstamp_precision, diff --git a/dlls/wpcap/unixlib.h b/dlls/wpcap/unixlib.h index 740be3ad12e..3adb8f1f61d 100644 --- a/dlls/wpcap/unixlib.h +++ b/dlls/wpcap/unixlib.h @@ -138,6 +138,11 @@ struct dump_params const unsigned char *packet; }; +struct dump_close_params +{ + UINT64 handle; +}; + struct dump_open_params { UINT64 handle; @@ -337,6 +342,7 @@ enum pcap_funcs unix_datalink_val_to_description, unix_datalink_val_to_name, unix_dump, + unix_dump_close, unix_dump_open, unix_findalldevs, unix_get_tstamp_precision, diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index f3b203f983d..afb47a58a90 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -301,6 +301,18 @@ struct dumper UINT64 handle; }; +void CDECL pcap_dump_close( struct dumper *dumper ) +{ + struct dump_close_params params; + + TRACE( "%p\n", dumper ); + + if (!dumper) return; + params.handle = dumper->handle; + PCAP_CALL( dump, &params ); + free( dumper ); +} + static inline WCHAR *strdup_from_utf8( const char *str ) { WCHAR *ret = NULL; diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec index 7a59dda3caf..b3685d098fe 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -20,7 +20,7 @@ @ cdecl pcap_datalink_val_to_name(long) @ cdecl pcap_dispatch(ptr long ptr ptr) @ cdecl pcap_dump(ptr ptr str) -@ stub pcap_dump_close +@ cdecl pcap_dump_close(ptr) @ stub pcap_dump_file @ stub pcap_dump_flush @ stub pcap_dump_ftell

1 0