wine-commits September 2020

wine-commits@winehq.org

1 participants
703 discussions

Alexandre Julliard : makefiles: Explicitly import the CRT library also for test dlls.
by Alexandre Julliard 10 Sep '20

10 Sep '20

Module: wine Branch: master Commit: 5d2596ad8a33fd1ad06181ed3ab6ea2a5d6dc7f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d2596ad8a33fd1ad06181ed… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 10 22:05:00 2020 +0200 makefiles: Explicitly import the CRT library also for test dlls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 48 ++++++++++++++++++++++++++++++++++-------------- 1 file changed, 34 insertions(+), 14 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 4775a60334..62fa516319 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2294,6 +2294,29 @@ static struct strarray get_default_imports( const struct makefile *make ) } +/******************************************************************* + * add_crt_import + */ +static const char *add_crt_import( const struct makefile *make, struct strarray *imports ) +{ + unsigned int i; + const char *crt_dll = NULL; + + for (i = 0; i < imports->count; i++) + { + if (strncmp( imports->str[i], "msvcr", 5 ) && strncmp( imports->str[i], "ucrt", 4 )) continue; + if (crt_dll) fatal_error( "More than one C runtime DLL imported: %s and %s\n", crt_dll, imports->str[i] ); + crt_dll = imports->str[i]; + } + if (!crt_dll && !strarray_exists( &make->extradllflags, "-nodefaultlibs" )) + { + crt_dll = !make->testdll && !make->staticlib ? "ucrtbase" : "msvcrt"; + strarray_add( imports, crt_dll ); + } + return crt_dll; +} + + /******************************************************************* * add_install_rule */ @@ -3041,6 +3064,8 @@ static void output_source_spec( struct makefile *make, struct incl_file *source, const char *debug_file; if (!imports.count) imports = make->imports; + else if (make->use_msvcrt) add_crt_import( make, &imports ); + if (!dll_flags.count) dll_flags = make->extradllflags; all_libs = add_import_libs( make, &dep_libs, imports, 0, 0 ); add_import_libs( make, &dep_libs, get_default_imports( make ), 0, 0 ); /* dependencies only */ @@ -4248,7 +4273,7 @@ static void load_sources( struct makefile *make ) "MANPAGES", NULL }; - const char **var, *crt_dll = NULL; + const char **var; unsigned int i; struct strarray value; struct incl_file *file; @@ -4338,21 +4363,16 @@ static void load_sources( struct makefile *make ) if (make->use_msvcrt) { - unsigned int msvcrt_version = 0; - for (i = 0; i < make->imports.count; i++) - { - if (strncmp( make->imports.str[i], "msvcr", 5 ) && strncmp( make->imports.str[i], "ucrt", 4 )) continue; - if (crt_dll) fatal_error( "More than one crt DLL imported: %s %s\n", crt_dll, make->imports.str[i] ); - crt_dll = make->imports.str[i]; - sscanf( crt_dll, "msvcr%u", &msvcrt_version ); - } - if (!crt_dll && !strarray_exists( &make->extradllflags, "-nodefaultlibs" )) + const char *crt_dll = add_crt_import( make, &make->imports ); + + if (crt_dll && !strncmp( crt_dll, "ucrt", 4 )) strarray_add( &make->define_args, "-D_UCRT" ); + else { - crt_dll = !make->testdll && !make->staticlib ? "ucrtbase" : "msvcrt"; - strarray_add( &make->imports, crt_dll ); + unsigned int msvcrt_version = 0; + + if (crt_dll) sscanf( crt_dll, "msvcr%u", &msvcrt_version ); + strarray_add( &make->define_args, strmake( "-D_MSVCR_VER=%u", msvcrt_version )); } - if (crt_dll && !strncmp( crt_dll, "ucrt", 4 )) strarray_add( &make->define_args, "-D_UCRT" ); - else strarray_add( &make->define_args, strmake( "-D_MSVCR_VER=%u", msvcrt_version )); } LIST_FOR_EACH_ENTRY( file, &make->includes, struct incl_file, entry ) parse_file( make, file, 0 );

1 0

Chao Long : ntdll: Fix a ImagePathName memory leak (Valgrind).
by Alexandre Julliard 10 Sep '20

10 Sep '20

Module: wine Branch: master Commit: 655ab7a84f1442ebc185a09acd06611cac1a3eb2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=655ab7a84f1442ebc185a09a… Author: Chao Long <longchao(a)uniontech.com> Date: Thu Sep 10 11:09:34 2020 +0800 ntdll: Fix a ImagePathName memory leak (Valgrind). Signed-off-by: Chao Long <longchao(a)uniontech.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/env.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index 06e7c1bb37..933792317d 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -1250,6 +1250,7 @@ void init_user_process_params(void) params->Environment = env; NtCurrentTeb()->Peb->ProcessParameters = params; + RtlFreeUnicodeString( &initial_params.ImagePathName ); RtlFreeUnicodeString( &cmdline ); RtlReleasePath( load_path );

1 0

Fabian Maurer : user32/menu: Store application defined value as pointer.
by Alexandre Julliard 10 Sep '20

10 Sep '20

Module: wine Branch: master Commit: 93937a53f1a7675976b4bb7e70b96db231d77996 URL: https://source.winehq.org/git/wine.git/?a=commit;h=93937a53f1a7675976b4bb7e… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Sep 10 09:06:49 2020 +0200 user32/menu: Store application defined value as pointer. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49805 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/menu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 3b1e3f25f4..59c2083c17 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -104,7 +104,7 @@ typedef struct { UINT cyMax; /* max height of the whole menu, 0 is screen height */ HBRUSH hbrBack; /* brush for menu background */ DWORD dwContextHelpID; - DWORD dwMenuData; /* application defined value */ + ULONG_PTR dwMenuData; /* application defined value */ HMENU hSysMenuOwner; /* Handle to the dummy sys menu holder */ WORD textOffset; /* Offset of text when items have both bitmaps and text */ } POPUPMENU, *LPPOPUPMENU;

1 0

Zebediah Figura : winegstreamer: Dereference messages dropped from watch_bus().
by Alexandre Julliard 10 Sep '20

10 Sep '20

Module: wine Branch: master Commit: 21d2e68d8e1ab37e47c146af954c267908dd55ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=21d2e68d8e1ab37e47c146af… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Sep 9 18:00:58 2020 -0500 winegstreamer: Dereference messages dropped from watch_bus(). >From GStreamer documentation: "If the handler returns GST_BUS_DROP, it should unref the message, else the message should not be unreffed by the sync handler." Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 2c9aafd7a6..724ac8fd25 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1280,6 +1280,7 @@ static GstBusSyncReply watch_bus(GstBus *bus, GstMessage *msg, gpointer data) default: break; } + gst_message_unref(msg); return GST_BUS_DROP; }

1 0

Ken Thomases : mountmgr: Avoid operating on a null CFStringRef, which would crash.
by Alexandre Julliard 10 Sep '20

10 Sep '20

Module: wine Branch: master Commit: 7e312c346cc94f093d82324f9020ac5595464f61 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e312c346cc94f093d82324f… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Sep 9 14:21:49 2020 -0500 mountmgr: Avoid operating on a null CFStringRef, which would crash. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/diskarb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mountmgr.sys/diskarb.c b/dlls/mountmgr.sys/diskarb.c index 3d531b95ee..12da89d768 100644 --- a/dlls/mountmgr.sys/diskarb.c +++ b/dlls/mountmgr.sys/diskarb.c @@ -298,7 +298,7 @@ static CFStringRef find_service_id( const WCHAR *adapter ) service = CFArrayGetValueAtIndex( services, i ); name = SCNetworkInterfaceGetBSDName( SCNetworkServiceGetInterface(service) ); - if (CFStringGetLength( name ) < ARRAY_SIZE( buf )) + if (name && CFStringGetLength( name ) < ARRAY_SIZE( buf )) { CFStringGetCharacters( name, CFRangeMake(0, CFStringGetLength(name)), buf ); if (!lstrcmpW( buf, unix_name ) && (id = SCNetworkServiceGetServiceID( service )))

1 0

Ken Thomases : dbghelp: Avoid asserting on egregiously long stabs symbol names.
by Alexandre Julliard 10 Sep '20

10 Sep '20

Module: wine Branch: master Commit: c7a0d5f6266b9ca315558d4042a3c355baa1cf5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7a0d5f6266b9ca315558d40… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Sep 9 14:21:48 2020 -0500 dbghelp: Avoid asserting on egregiously long stabs symbol names. Some Mac libraries have symbols which are many thousands of characters long. (Thank you, C++ templates!) It doesn't seem worth it to accommodate those by dynamically allocating the symbol name buffer, but we definitely don't want to assert. Just log an ERR. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/stabs.c | 58 +++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 46 insertions(+), 12 deletions(-) diff --git a/dlls/dbghelp/stabs.c b/dlls/dbghelp/stabs.c index b1b4a6ef1c..517299897c 100644 --- a/dlls/dbghelp/stabs.c +++ b/dlls/dbghelp/stabs.c @@ -83,7 +83,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp_stabs); #define N_EXCL 0xc2 #define N_RBRAC 0xe0 -static void stab_strcpy(char* dest, int sz, const char* source) +static BOOL stab_strcpy(char* dest, int sz, const char* source) { char* ptr = dest; /* @@ -115,7 +115,7 @@ static void stab_strcpy(char* dest, int sz, const char* source) while (ptr > dest && isdigit(*ptr)) ptr--; if (*ptr == '.') *ptr = '\0'; } - assert(sz > 0); + return (sz > 0); } typedef struct @@ -1134,8 +1134,12 @@ static inline void pending_add_var(struct pending_list* pending, const char* nam { pending_make_room(pending); pending->objs[pending->num].tag = PENDING_VAR; - stab_strcpy(pending->objs[pending->num].u.var.name, - sizeof(pending->objs[pending->num].u.var.name), name); + if (!stab_strcpy(pending->objs[pending->num].u.var.name, + sizeof(pending->objs[pending->num].u.var.name), name)) + { + ERR("symbol too long %s\n", debugstr_a(name)); + return; + } pending->objs[pending->num].u.var.type = stabs_parse_type(name); pending->objs[pending->num].u.var.kind = dt; pending->objs[pending->num].u.var.loc = *loc; @@ -1327,8 +1331,8 @@ BOOL stabs_parse(struct module* module, ULONG_PTR load_offset, stabbuf_append(&stabbuff, &stabbufflen, ptr); ptr = stabbuff; } - stab_strcpy(symname, sizeof(symname), ptr); - if (!stabs_parse_typedef(module, ptr, symname)) + if (!stab_strcpy(symname, sizeof(symname), ptr) || + !stabs_parse_typedef(module, ptr, symname)) { /* skip this definition */ stabbuff[0] = '\0'; @@ -1348,7 +1352,12 @@ BOOL stabs_parse(struct module* module, ULONG_PTR load_offset, * * With a.out or mingw, they actually do make some amount of sense. */ - stab_strcpy(symname, sizeof(symname), ptr); + if (!stab_strcpy(symname, sizeof(symname), ptr)) + { + ERR("symbol too long: %s\n", debugstr_a(ptr)); + stabbuff[0] = '\0'; + continue; + } loc.kind = loc_absolute; loc.reg = 0; loc.offset = load_offset + n_value; @@ -1358,7 +1367,12 @@ BOOL stabs_parse(struct module* module, ULONG_PTR load_offset, case N_LCSYM: case N_STSYM: /* These are static symbols and BSS symbols. */ - stab_strcpy(symname, sizeof(symname), ptr); + if (!stab_strcpy(symname, sizeof(symname), ptr)) + { + ERR("symbol too long: %s\n", debugstr_a(ptr)); + stabbuff[0] = '\0'; + continue; + } loc.kind = loc_absolute; loc.reg = 0; loc.offset = load_offset + n_value; @@ -1383,7 +1397,12 @@ BOOL stabs_parse(struct module* module, ULONG_PTR load_offset, if (curr_func != NULL) { struct symt* param_type = stabs_parse_type(ptr); - stab_strcpy(symname, sizeof(symname), ptr); + if (!stab_strcpy(symname, sizeof(symname), ptr)) + { + ERR("symbol too long: %s\n", debugstr_a(ptr)); + stabbuff[0] = '\0'; + continue; + } loc.kind = loc_regrel; loc.reg = dbghelp_current_cpu->frame_regno; loc.offset = n_value; @@ -1442,7 +1461,12 @@ BOOL stabs_parse(struct module* module, ULONG_PTR load_offset, loc.reg = CV_REG_NONE; break; } - stab_strcpy(symname, sizeof(symname), ptr); + if (!stab_strcpy(symname, sizeof(symname), ptr)) + { + ERR("symbol too long: %s\n", debugstr_a(ptr)); + stabbuff[0] = '\0'; + continue; + } if (ptr[strlen(symname) + 1] == 'P') { struct symt* param_type = stabs_parse_type(ptr); @@ -1494,7 +1518,12 @@ BOOL stabs_parse(struct module* module, ULONG_PTR load_offset, * all of the pages related to the stabs, and that * sucks up swap space like crazy. */ - stab_strcpy(symname, sizeof(symname), ptr); + if (!stab_strcpy(symname, sizeof(symname), ptr)) + { + ERR("symbol too long: %s\n", debugstr_a(ptr)); + stabbuff[0] = '\0'; + continue; + } if (*symname) { struct symt_function_signature* func_type; @@ -1620,7 +1649,12 @@ BOOL stabs_parse(struct module* module, ULONG_PTR load_offset, } if (*ptr == '_') ptr++; - stab_strcpy(symname, sizeof(symname), ptr); + if (!stab_strcpy(symname, sizeof(symname), ptr)) + { + ERR("symbol too long: %s\n", debugstr_a(ptr)); + stabbuff[0] = '\0'; + continue; + } callback(module, load_offset, symname, n_value, is_public, is_global, stab_ptr->n_other, compiland, user);

1 0

Anton Baskanov : amstream: Use current format to create surface in AMDirectDrawStream::CreateSample.
by Alexandre Julliard 10 Sep '20

10 Sep '20

Module: wine Branch: master Commit: e64a2e112e12afbd64e27a9eee0acaa3f7dcaffd URL: https://source.winehq.org/git/wine.git/?a=commit;h=e64a2e112e12afbd64e27a9e… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Thu Sep 10 02:17:39 2020 +0700 amstream: Use current format to create surface in AMDirectDrawStream::CreateSample. 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/ddrawstream.c | 25 +++--- dlls/amstream/tests/amstream.c | 174 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 190 insertions(+), 9 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e64a2e112e12afbd64e2…

1 0

Anton Baskanov : amstream: Reconnect if the new format is incompatible with the connection media type in AMDirectDrawStream::SetFormat.
by Alexandre Julliard 10 Sep '20

10 Sep '20

Module: wine Branch: master Commit: 47ab12402201b1b7f93e9505c60f5ef8755d55a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=47ab12402201b1b7f93e9505… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Thu Sep 10 02:17:38 2020 +0700 amstream: Reconnect if the new format is incompatible with the connection media type in AMDirectDrawStream::SetFormat. 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/ddrawstream.c | 37 ++++++++++++ dlls/amstream/tests/amstream.c | 130 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 166 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=47ab12402201b1b7f93e…

1 0

Anton Baskanov : amstream: Reject incompatible media types in AMDirectDrawStream::ReceiveConnection.
by Alexandre Julliard 10 Sep '20

10 Sep '20

Module: wine Branch: master Commit: 337fcca4d1e0d494192d67786dbf1feeac87f592 URL: https://source.winehq.org/git/wine.git/?a=commit;h=337fcca4d1e0d494192d6778… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Thu Sep 10 02:17:37 2020 +0700 amstream: Reject incompatible media types in AMDirectDrawStream::ReceiveConnection. 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/ddrawstream.c | 26 +++++++ dlls/amstream/tests/amstream.c | 152 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 178 insertions(+) diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index 542c315930..c281c81d33 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -61,6 +61,26 @@ struct ddraw_stream static HRESULT ddrawstreamsample_create(struct ddraw_stream *parent, IDirectDrawSurface *surface, const RECT *rect, IDirectDrawStreamSample **ddraw_stream_sample); +static BOOL is_format_compatible(struct ddraw_stream *stream, + DWORD width, DWORD height, const DDPIXELFORMAT *connection_pf) +{ + if (stream->format.flags & DDSD_HEIGHT) + { + if (stream->format.width != width || stream->format.height != height) + return FALSE; + } + if (stream->format.flags & DDSD_PIXELFORMAT) + { + if (stream->format.pf.dwFlags & DDPF_FOURCC) + return FALSE; + if (stream->format.pf.u1.dwRGBBitCount != connection_pf->u1.dwRGBBitCount) + return FALSE; + if (stream->format.pf.u1.dwRGBBitCount == 16 && stream->format.pf.u3.dwGBitMask != connection_pf->u3.dwGBitMask) + return FALSE; + } + return TRUE; +} + static inline struct ddraw_stream *impl_from_IAMMediaStream(IAMMediaStream *iface) { return CONTAINING_RECORD(iface, struct ddraw_stream, IAMMediaStream_iface); @@ -824,6 +844,12 @@ static HRESULT WINAPI ddraw_sink_ReceiveConnection(IPin *iface, IPin *peer, cons return VFW_E_TYPE_NOT_ACCEPTED; } + if (!is_format_compatible(stream, width, height, &pf)) + { + LeaveCriticalSection(&stream->cs); + return VFW_E_TYPE_NOT_ACCEPTED; + } + IPin_QueryDirection(peer, &dir); if (dir != PINDIR_OUTPUT) { diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index f081c58a2a..0b343b4912 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -3353,13 +3353,34 @@ static void test_ddrawstream_receive_connection(void) IDirectDrawMediaStream *ddraw_stream; IAMMultiMediaStream *mmstream; struct testfilter source; + DDSURFACEDESC format; IMediaStream *stream; + VIDEOINFO video_info; AM_MEDIA_TYPE mt; HRESULT hr; ULONG ref; IPin *pin; int i; + static const VIDEOINFO yuy2_video_info = + { + .bmiHeader.biSize = sizeof(BITMAPINFOHEADER), + .bmiHeader.biWidth = 333, + .bmiHeader.biHeight = -444, + .bmiHeader.biPlanes = 1, + .bmiHeader.biBitCount = 16, + .bmiHeader.biCompression = MAKEFOURCC('Y', 'U', 'Y', '2'), + }; + + const AM_MEDIA_TYPE yuy2_mt = + { + .majortype = MEDIATYPE_Video, + .subtype = MEDIASUBTYPE_YUY2, + .formattype = FORMAT_VideoInfo, + .cbFormat = sizeof(VIDEOINFOHEADER), + .pbFormat = (BYTE *)&yuy2_video_info, + }; + const AM_MEDIA_TYPE video_mt = { .majortype = MEDIATYPE_Video, @@ -3420,6 +3441,137 @@ static void test_ddrawstream_receive_connection(void) } } + format = rgb8_format; + format.dwFlags = DDSD_WIDTH; + format.dwWidth = 222; + format.dwHeight = 555; + hr = IDirectDrawMediaStream_SetFormat(ddraw_stream, &format, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_ReceiveConnection(pin, &source.source.pin.IPin_iface, &rgb32_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IPin_Disconnect(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + format = rgb8_format; + format.dwFlags = DDSD_HEIGHT; + format.dwWidth = 333; + format.dwHeight = 444; + hr = IDirectDrawMediaStream_SetFormat(ddraw_stream, &format, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + video_info = rgb555_video_info; + video_info.bmiHeader.biWidth = 333; + video_info.bmiHeader.biHeight = 444; + mt = rgb555_mt; + mt.pbFormat = (BYTE *)&video_info; + hr = IPin_ReceiveConnection(pin, &source.source.pin.IPin_iface, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IPin_Disconnect(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_ReceiveConnection(pin, &source.source.pin.IPin_iface, &rgb32_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IPin_Disconnect(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + video_info = rgb32_video_info; + video_info.bmiHeader.biWidth = 332; + video_info.bmiHeader.biHeight = 444; + mt = rgb32_mt; + mt.pbFormat = (BYTE *)&video_info; + hr = IPin_ReceiveConnection(pin, &source.source.pin.IPin_iface, &mt); + ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + + video_info = rgb32_video_info; + video_info.bmiHeader.biWidth = 333; + video_info.bmiHeader.biHeight = 443; + mt = rgb32_mt; + mt.pbFormat = (BYTE *)&video_info; + hr = IPin_ReceiveConnection(pin, &source.source.pin.IPin_iface, &mt); + ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + + hr = IDirectDrawMediaStream_SetFormat(ddraw_stream, &rgb8_format, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_ReceiveConnection(pin, &source.source.pin.IPin_iface, &rgb555_mt); + ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + + hr = IPin_ReceiveConnection(pin, &source.source.pin.IPin_iface, &rgb8_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IPin_Disconnect(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDirectDrawMediaStream_SetFormat(ddraw_stream, &rgb555_format, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_ReceiveConnection(pin, &source.source.pin.IPin_iface, &rgb565_mt); + ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + + hr = IPin_ReceiveConnection(pin, &source.source.pin.IPin_iface, &rgb555_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IPin_Disconnect(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDirectDrawMediaStream_SetFormat(ddraw_stream, &rgb565_format, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_ReceiveConnection(pin, &source.source.pin.IPin_iface, &rgb24_mt); + ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + + hr = IPin_ReceiveConnection(pin, &source.source.pin.IPin_iface, &rgb565_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IPin_Disconnect(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDirectDrawMediaStream_SetFormat(ddraw_stream, &rgb24_format, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_ReceiveConnection(pin, &source.source.pin.IPin_iface, &rgb32_mt); + ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + + hr = IPin_ReceiveConnection(pin, &source.source.pin.IPin_iface, &rgb24_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IPin_Disconnect(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDirectDrawMediaStream_SetFormat(ddraw_stream, &rgb32_format, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_ReceiveConnection(pin, &source.source.pin.IPin_iface, &rgb8_mt); + ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + + hr = IPin_ReceiveConnection(pin, &source.source.pin.IPin_iface, &rgb32_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IPin_Disconnect(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDirectDrawMediaStream_SetFormat(ddraw_stream, &yuy2_format, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_ReceiveConnection(pin, &source.source.pin.IPin_iface, &yuy2_mt); + ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + + format = yuy2_format; + format.ddpfPixelFormat.dwRBitMask = 0xf800; + format.ddpfPixelFormat.dwGBitMask = 0x07e0; + format.ddpfPixelFormat.dwBBitMask = 0x001f; + hr = IDirectDrawMediaStream_SetFormat(ddraw_stream, &format, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_ReceiveConnection(pin, &source.source.pin.IPin_iface, &rgb565_mt); + ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + + format = rgb8_format; + format.dwFlags = 0; + hr = IDirectDrawMediaStream_SetFormat(ddraw_stream, &format, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_ReceiveConnection(pin, &source.source.pin.IPin_iface, &rgb565_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IPin_Disconnect(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = IAMMultiMediaStream_Release(mmstream); ok(!ref, "Got outstanding refcount %d.\n", ref); IPin_Release(pin);

1 0

Anton Baskanov : amstream: Implement AMDirectDrawStream::SetFormat.
by Alexandre Julliard 10 Sep '20

10 Sep '20

Module: wine Branch: master Commit: 8c1204ffeeb68829a1dac9594e301cb1dd36df85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c1204ffeeb68829a1dac959… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Thu Sep 10 02:17:36 2020 +0700 amstream: Implement AMDirectDrawStream::SetFormat. 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/ddrawstream.c | 81 ++++++++++++- dlls/amstream/tests/amstream.c | 258 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 336 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8c1204ffeeb68829a1da…

1 0

← Newer
1
...
44
45
46
47
48
49
50
...
71
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 September 2020