wine-commits May 2020

wine-commits@winehq.org

1 participants
743 discussions

Alex Henrie : ntdll/tests: Add more RtlIpv6AddressToString tests.
by Alexandre Julliard 26 May '20

26 May '20

Module: wine Branch: master Commit: e5f69e81f351d8ca86391d41a78dbd52177a96ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5f69e81f351d8ca86391d41… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon May 25 22:36:22 2020 -0600 ntdll/tests: Add more RtlIpv6AddressToString tests. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/rtl.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 0cbf0b33ff..f83031b490 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -1721,28 +1721,40 @@ static void test_RtlIpv6AddressToString(void) { /* ipv4 addresses & ISATAP addresses */ { "::13.1.68.3", { 0, 0, 0, 0, 0, 0, 0x10d, 0x344 } }, + { "::123.123.123.123", { 0, 0, 0, 0, 0, 0, 0x7b7b, 0x7b7b } }, + { "::ffff", { 0, 0, 0, 0, 0, 0, 0, 0xffff } }, + { "::0.1.0.0", { 0, 0, 0, 0, 0, 0, 0x100, 0 } }, { "::ffff:13.1.68.3", { 0, 0, 0, 0, 0, 0xffff, 0x10d, 0x344 } }, { "::feff:d01:4403", { 0, 0, 0, 0, 0, 0xfffe, 0x10d, 0x344 } }, { "::fffe:d01:4403", { 0, 0, 0, 0, 0, 0xfeff, 0x10d, 0x344 } }, { "::100:d01:4403", { 0, 0, 0, 0, 0, 1, 0x10d, 0x344 } }, { "::1:d01:4403", { 0, 0, 0, 0, 0, 0x100, 0x10d, 0x344 } }, + { "::1:0:d01:4403", { 0, 0, 0, 0, 0x100, 0, 0x10d, 0x344 } }, + { "::fffe:d01:4403", { 0, 0, 0, 0, 0, 0xfeff, 0x10d, 0x344 } }, + { "::fffe:0:d01:4403", { 0, 0, 0, 0, 0xfeff, 0, 0x10d, 0x344 } }, { "::ffff:0:4403", { 0, 0, 0, 0, 0, 0xffff, 0, 0x344 } }, + { "::ffff:0.1.0.0", { 0, 0, 0, 0, 0, 0xffff, 0x100, 0 } }, { "::ffff:13.1.0.0", { 0, 0, 0, 0, 0, 0xffff, 0x10d, 0 } }, { "::ffff:0:0", { 0, 0, 0, 0, 0, 0xffff, 0, 0 } }, + { "::ffff:0:ffff", { 0, 0, 0, 0, 0, 0xffff, 0, 0xffff } }, + { "::ffff:0:0.1.0.0", { 0, 0, 0, 0, 0xffff, 0, 0x100, 0 } }, { "::ffff:0:13.1.68.3", { 0, 0, 0, 0, 0xffff, 0, 0x10d, 0x344 } }, { "::ffff:ffff:d01:4403", { 0, 0, 0, 0, 0xffff, 0xffff, 0x10d, 0x344 } }, { "::ffff:0:0:d01:4403", { 0, 0, 0, 0xffff, 0, 0, 0x10d, 0x344 } }, { "::ffff:255.255.255.255", { 0, 0, 0, 0, 0, 0xffff, 0xffff, 0xffff } }, { "::ffff:129.144.52.38", { 0, 0, 0, 0, 0, 0xffff, 0x9081, 0x2634 } }, + { "::5efe:0.0.0.0", { 0, 0, 0, 0, 0, 0xfe5e, 0, 0 } }, { "::5efe:129.144.52.38", { 0, 0, 0, 0, 0, 0xfe5e, 0x9081, 0x2634 } }, { "1111:2222:3333:4444:0:5efe:129.144.52.38", { 0x1111, 0x2222, 0x3333, 0x4444, 0, 0xfe5e, 0x9081, 0x2634 } }, { "1111:2222:3333::5efe:129.144.52.38", { 0x1111, 0x2222, 0x3333, 0, 0, 0xfe5e, 0x9081, 0x2634 } }, { "1111:2222::5efe:129.144.52.38", { 0x1111, 0x2222, 0, 0, 0, 0xfe5e, 0x9081, 0x2634 } }, { "1111::5efe:129.144.52.38", { 0x1111, 0, 0, 0, 0, 0xfe5e, 0x9081, 0x2634 } }, + { "::300:5efe:8190:3426", { 0, 0, 0, 0, 3, 0xfe5e, 0x9081, 0x2634 } }, { "::200:5efe:129.144.52.38", { 0, 0, 0, 0, 2, 0xfe5e, 0x9081, 0x2634 } }, { "::100:5efe:8190:3426", { 0, 0, 0, 0, 1, 0xfe5e, 0x9081, 0x2634 } }, /* 'normal' addresses */ { "::1", { 0, 0, 0, 0, 0, 0, 0, 0x100 } }, + { "::2", { 0, 0, 0, 0, 0, 0, 0, 0x200 } }, { "0:1:2:3:4:5:6:7", { 0, 0x100, 0x200, 0x300, 0x400, 0x500, 0x600, 0x700 } }, { "1080::8:800:200c:417a", { 0x8010, 0, 0, 0, 0x800, 0x8, 0x0c20, 0x7a41 } }, { "1111:2222:3333:4444:5555:6666:7b7b:7b7b", { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0x7b7b, 0x7b7b } }, @@ -1777,7 +1789,6 @@ static void test_RtlIpv6AddressToString(void) { "2001:db8:85a3::8a2e:370:7334", { 0x120, 0xb80d, 0xa385, 0, 0, 0x2e8a, 0x7003, 0x3473 } }, { "3ffe:b00::1:0:0:a", { 0xfe3f, 0xb, 0, 0, 0x100, 0, 0, 0xa00 } }, { "::a:b:c:d:e", { 0, 0, 0, 0xa00, 0xb00, 0xc00, 0xd00, 0xe00 } }, - { "::123.123.123.123", { 0, 0, 0, 0, 0, 0, 0x7b7b, 0x7b7b } }, { "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff", { 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff } }, { "1111:2222:3333:4444:5555:6666:7777:1", { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0x7777, 0x100 } }, { "1111:2222:3333:4444:5555:6666:7777:8888", { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0x7777, 0x8888 } },

1 0

Alex Henrie : ntdll/tests: Drop RTL function workarounds for Windows <= 2000.
by Alexandre Julliard 26 May '20

26 May '20

Module: wine Branch: master Commit: 917002c88f82e0f4253171af9332c1ba4fff8be9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=917002c88f82e0f4253171af… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon May 25 22:36:21 2020 -0600 ntdll/tests: Drop RTL function workarounds for Windows <= 2000. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/rtl.c | 459 ++++++++++++++----------------------------------- 1 file changed, 133 insertions(+), 326 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=917002c88f82e0f42531…

1 0

Alex Henrie : include: Add more RTL functions.
by Alexandre Julliard 26 May '20

26 May '20

Module: wine Branch: master Commit: e3d2d852a4cc717099bcd18fe1f4c9d748d66317 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3d2d852a4cc717099bcd18f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon May 25 22:36:20 2020 -0600 include: Add more RTL functions. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/rtl.c | 4 ++-- include/winnt.h | 1 + include/winternl.h | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index bccf26d7d6..003e4a1b3b 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -546,10 +546,10 @@ SIZE_T WINAPI RtlCompareMemory( const VOID *Source1, const VOID *Source2, SIZE_T * RETURNS * The byte position of the first byte at which Source1 is not dwVal. */ -SIZE_T WINAPI RtlCompareMemoryUlong(const ULONG *Source1, SIZE_T Length, ULONG dwVal) +SIZE_T WINAPI RtlCompareMemoryUlong(VOID *Source1, SIZE_T Length, ULONG dwVal) { SIZE_T i; - for(i = 0; i < Length/sizeof(ULONG) && Source1[i] == dwVal; i++); + for(i = 0; i < Length/sizeof(ULONG) && ((ULONG *)Source1)[i] == dwVal; i++); return i * sizeof(ULONG); } diff --git a/include/winnt.h b/include/winnt.h index 3e3ac338bc..ae9177842b 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6034,6 +6034,7 @@ typedef enum _CM_ERROR_CONTROL_TYPE } SERVICE_ERROR_TYPE; NTSYSAPI SIZE_T WINAPI RtlCompareMemory(const VOID*, const VOID*, SIZE_T); +NTSYSAPI SIZE_T WINAPI RtlCompareMemoryUlong(VOID*, SIZE_T, ULONG); #define RtlEqualMemory(Destination, Source, Length) (!memcmp((Destination),(Source),(Length))) #define RtlMoveMemory(Destination, Source, Length) memmove((Destination),(Source),(Length)) diff --git a/include/winternl.h b/include/winternl.h index e197a55a27..b70460f314 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2727,6 +2727,7 @@ NTSYSAPI NTSTATUS WINAPI NtWriteRequestData(HANDLE,PLPC_MESSAGE,ULONG,PVOID,ULO NTSYSAPI NTSTATUS WINAPI NtWriteVirtualMemory(HANDLE,void*,const void*,SIZE_T,SIZE_T*); NTSYSAPI NTSTATUS WINAPI NtYieldExecution(void); +NTSYSAPI NTSTATUS WINAPI RtlAbsoluteToSelfRelativeSD(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR,PULONG); NTSYSAPI void WINAPI RtlAcquirePebLock(void); NTSYSAPI BYTE WINAPI RtlAcquireResourceExclusive(LPRTL_RWLOCK,BYTE); NTSYSAPI BYTE WINAPI RtlAcquireResourceShared(LPRTL_RWLOCK,BYTE); @@ -2800,6 +2801,7 @@ NTSYSAPI NTSTATUS WINAPI RtlCustomCPToUnicodeN(CPTABLEINFO*,WCHAR*,DWORD,DWORD* NTSYSAPI void WINAPI RtlDeactivateActivationContext(DWORD,ULONG_PTR); NTSYSAPI PVOID WINAPI RtlDecodePointer(PVOID); NTSYSAPI NTSTATUS WINAPI RtlDecompressBuffer(USHORT,PUCHAR,ULONG,PUCHAR,ULONG,PULONG); +NTSYSAPI NTSTATUS WINAPI RtlDecompressFragment(USHORT,PUCHAR,ULONG,PUCHAR,ULONG,ULONG,PULONG,PVOID); NTSYSAPI NTSTATUS WINAPI RtlDeleteAce(PACL,DWORD); NTSYSAPI NTSTATUS WINAPI RtlDeleteAtomFromAtomTable(RTL_ATOM_TABLE,RTL_ATOM); NTSYSAPI NTSTATUS WINAPI RtlDeleteCriticalSection(RTL_CRITICAL_SECTION *);

1 0

Alex Henrie : include: Add RtlIpv4AddressToString(Ex)[AW].
by Alexandre Julliard 26 May '20

26 May '20

Module: wine Branch: master Commit: 9246024a8c32eecfbeb73269ee41df7357feaa0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=9246024a8c32eecfbeb73269… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon May 25 22:36:19 2020 -0600 include: Add RtlIpv4AddressToString(Ex)[AW]. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ip2string.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/ip2string.h b/include/ip2string.h index 0753ee82a9..4c5f36c15f 100644 --- a/include/ip2string.h +++ b/include/ip2string.h @@ -23,6 +23,13 @@ extern "C" { #endif +char * WINAPI RtlIpv4AddressToStringA(const IN_ADDR *address, char *str); +WCHAR * WINAPI RtlIpv4AddressToStringW(const IN_ADDR *address, WCHAR *str); +#define RtlIpv4AddressToString WINELIB_NAME_AW(RtlIpv4AddressToString) +NTSTATUS WINAPI RtlIpv4AddressToStringExA(const IN_ADDR *address, USHORT port, char *str, ULONG *size); +NTSTATUS WINAPI RtlIpv4AddressToStringExW(const IN_ADDR *address, USHORT port, WCHAR *str, ULONG *size); +#define RtlIpv4AddressToStringEx WINELIB_NAME_AW(RtlIpv4AddressToStringEx) + NTSTATUS WINAPI RtlIpv4StringToAddressA(const char *str, BOOLEAN strict, const char **terminator, IN_ADDR *address); NTSTATUS WINAPI RtlIpv4StringToAddressW(const WCHAR *str, BOOLEAN strict, const WCHAR **terminator, IN_ADDR *address); #define RtlIpv4StringToAddress WINELIB_NAME_AW(RtlIpv4StringToAddress)

1 0

Alex Henrie : ntdll: Increase size of IPv6 address string buffers.
by Alexandre Julliard 26 May '20

26 May '20

Module: wine Branch: master Commit: bab2de00aaffc974bdc1be44dc8d006075c4c9cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=bab2de00aaffc974bdc1be44… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon May 25 22:36:18 2020 -0600 ntdll: Increase size of IPv6 address string buffers. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/rtl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 6134a5e702..bccf26d7d6 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -1269,7 +1269,7 @@ NTSTATUS WINAPI RtlIpv6StringToAddressW(const WCHAR *str, const WCHAR **terminat */ NTSTATUS WINAPI RtlIpv6StringToAddressExA(const char *str, IN6_ADDR *address, ULONG *scope, USHORT *port) { - WCHAR wstr[64]; + WCHAR wstr[128]; TRACE("(%s, %p, %p, %p)\n", debugstr_a(str), address, scope, port); @@ -1286,7 +1286,7 @@ NTSTATUS WINAPI RtlIpv6StringToAddressExA(const char *str, IN6_ADDR *address, UL */ NTSTATUS WINAPI RtlIpv6StringToAddressA(const char *str, const char **terminator, IN6_ADDR *address) { - WCHAR wstr[64]; + WCHAR wstr[128]; const WCHAR *wterminator = NULL; NTSTATUS ret;

1 0

Jacek Caban : winegcc: Add support for -Wl,--whole-archive option.
by Alexandre Julliard 26 May '20

26 May '20

Module: wine Branch: master Commit: 0db5f6cf1b2da3c69cbf2c7700c6301f40e1411a URL: https://source.winehq.org/git/wine.git/?a=commit;h=0db5f6cf1b2da3c69cbf2c77… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 25 20:34:31 2020 +0200 winegcc: Add support for -Wl,--whole-archive option. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index a1ba034009..776d2b6473 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1188,6 +1188,8 @@ static void build(struct options* opts) add_library(opts, lib_dirs, files, file + 2 ); else if (file[1] == 'x') lang = file; + else if(file[1] == 'W') + strarray_add(files, file); } /* add the default libraries, if needed */ @@ -1393,6 +1395,9 @@ static void build(struct options* opts) } strarray_add(link_args, name); break; + case 'W': + strarray_add(link_args, files->base[j]); + break; } } @@ -1932,6 +1937,11 @@ int main(int argc, char **argv) opts.debug_file = strdup( Wl->base[++j] ); continue; } + if (!strcmp(Wl->base[j], "--whole-archive") || !strcmp(Wl->base[j], "--no-whole-archive")) + { + strarray_add( opts.files, strmake( "-Wl,%s", Wl->base[j] )); + continue; + } if (!strcmp(Wl->base[j], "-static")) linking = -1; strarray_add(opts.linker_args, strmake("-Wl,%s",Wl->base[j])); }

1 0

Jacek Caban : winegcc: Add support for @file arguments.
by Alexandre Julliard 26 May '20

26 May '20

Module: wine Branch: master Commit: c5ee64a101a09366b02c18bb6f43ab9503d86af4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5ee64a101a09366b02c18bb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 25 20:34:08 2020 +0200 winegcc: Add support for @file arguments. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 40 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index d350adc724..a1ba034009 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1623,7 +1623,45 @@ int main(int argc, char **argv) for (i = 1; i < argc; i++) { - strarray_add( opts.args, argv[i] ); + char *input_buffer = NULL, *iter, *opt, *out; + struct stat st; + int fd; + + if (argv[i][0] != '@' || (fd = open( argv[i] + 1, O_RDONLY | O_BINARY )) == -1) + { + strarray_add( opts.args, argv[i] ); + continue; + } + if ((fstat( fd, &st ) == -1)) error( "Cannot stat %s", argv[i] + 1 ); + if (st.st_size) + { + input_buffer = xmalloc( st.st_size + 1 ); + if (read( fd, input_buffer, st.st_size ) != st.st_size) error( "Cannot read %s\n", argv[i] + 1 ); + } + close( fd ); + for (iter = input_buffer; iter < input_buffer + st.st_size; iter++) + { + char quote = 0; + while (iter < input_buffer + st.st_size && isspace(*iter)) iter++; + if (iter == input_buffer + st.st_size) break; + opt = out = iter; + while (iter < input_buffer + st.st_size && (quote || !isspace(*iter))) + { + if (*iter == quote) + { + iter++; + quote = 0; + } + else if (*iter == '\'' || *iter == '"') quote = *iter++; + else + { + if (*iter == '\\' && iter + 1 < input_buffer + st.st_size) iter++; + *out++ = *iter++; + } + } + *out = 0; + strarray_add( opts.args, opt ); + } } /* parse options */

1 0

Jacek Caban : winegcc: Store main arguments in strarray.
by Alexandre Julliard 26 May '20

26 May '20

Module: wine Branch: master Commit: f42e4431fb0a57cac18258ee90bcbc5c6ff9f9e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f42e4431fb0a57cac18258ee… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 25 20:33:35 2020 +0200 winegcc: Store main arguments in strarray. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 167 +++++++++++++++++++++++++----------------------- 1 file changed, 87 insertions(+), 80 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f42e4431fb0a57cac182…

1 0

Anton Baskanov : amstream: Don't crash if parent is NULL in AMAudioStream:: and AMDirectDrawStream::GetMultiMediaStream.
by Alexandre Julliard 26 May '20

26 May '20

Module: wine Branch: master Commit: 4300981d6b997c0b4c70c3415d4bbcd694d1a7f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4300981d6b997c0b4c70c341… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Mon May 25 14:17:33 2020 -0500 amstream: Don't crash if parent is NULL in AMAudioStream:: and AMDirectDrawStream::GetMultiMediaStream. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/audiostream.c | 14 +++++++------- dlls/amstream/ddrawstream.c | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c index d620abc6ec..265c3bf9f2 100644 --- a/dlls/amstream/audiostream.c +++ b/dlls/amstream/audiostream.c @@ -429,18 +429,18 @@ static ULONG WINAPI audio_IAMMediaStream_Release(IAMMediaStream *iface) /*** IMediaStream methods ***/ static HRESULT WINAPI audio_IAMMediaStream_GetMultiMediaStream(IAMMediaStream *iface, - IMultiMediaStream** multi_media_stream) + IMultiMediaStream **mmstream) { - struct audio_stream *This = impl_from_IAMMediaStream(iface); + struct audio_stream *stream = impl_from_IAMMediaStream(iface); - TRACE("(%p/%p)->(%p)\n", This, iface, multi_media_stream); + TRACE("stream %p, mmstream %p.\n", stream, mmstream); - if (!multi_media_stream) + if (!mmstream) return E_POINTER; - IMultiMediaStream_AddRef(This->parent); - *multi_media_stream = This->parent; - + if (stream->parent) + IMultiMediaStream_AddRef(stream->parent); + *mmstream = stream->parent; return S_OK; } diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index 6ef74eb7de..a4bfe948d2 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -125,18 +125,18 @@ static ULONG WINAPI ddraw_IAMMediaStream_Release(IAMMediaStream *iface) /*** IMediaStream methods ***/ static HRESULT WINAPI ddraw_IAMMediaStream_GetMultiMediaStream(IAMMediaStream *iface, - IMultiMediaStream** multi_media_stream) + IMultiMediaStream **mmstream) { - struct ddraw_stream *This = impl_from_IAMMediaStream(iface); + struct ddraw_stream *stream = impl_from_IAMMediaStream(iface); - TRACE("(%p/%p)->(%p)\n", This, iface, multi_media_stream); + TRACE("stream %p, mmstream %p.\n", stream, mmstream); - if (!multi_media_stream) + if (!mmstream) return E_POINTER; - IMultiMediaStream_AddRef(This->parent); - *multi_media_stream = This->parent; - + if (stream->parent) + IMultiMediaStream_AddRef(stream->parent); + *mmstream = stream->parent; return S_OK; }

1 0

Nikolay Sivov : include: Add CResamplerMediaObject class id.
by Alexandre Julliard 26 May '20

26 May '20

Module: wine Branch: master Commit: d45d34cdf5c2fc4b73aa6c07ff04079cdb9fe752 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d45d34cdf5c2fc4b73aa6c07… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 26 01:58:46 2020 +0300 include: Add CResamplerMediaObject class id. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wmcodecdsp.idl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/wmcodecdsp.idl b/include/wmcodecdsp.idl index d4547cd881..61381bee6d 100644 --- a/include/wmcodecdsp.idl +++ b/include/wmcodecdsp.idl @@ -25,3 +25,8 @@ cpp_quote("DEFINE_GUID(MEDIASUBTYPE_I420,0x30323449,0x0000,0x0010,0x80,0x00,0x00 uuid(bbeea841-0a63-4f52-a7ab-a9b3a84ed38a) ] coclass CMP3DecMediaObject {} + +[ + uuid(f447b69e-1884-4a7e-8055-346f74d6edb3) +] +coclass CResamplerMediaObject {}

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
75
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2020