May 2020 - Wine-Commits - list.winehq.org

Jacek Caban : winebuild: Introduce --safeseh option that allows marking assembly files as SEH compatible.
by Alexandre Julliard May 6, 2020

May 6, 2020

Module: wine Branch: master Commit: e4e05cdaab4044b0e3a66723d51e74daf6a6ac35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4e05cdaab4044b0e3a66723… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 6 16:18:31 2020 +0200 winebuild: Introduce --safeseh option that allows marking assembly files as SEH compatible. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/build.h | 1 + tools/winebuild/main.c | 7 +++++++ tools/winebuild/utils.c | 6 ++++++ tools/winebuild/winebuild.man.in | 3 +++ 4 files changed, 17 insertions(+) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index b30785b74a..c162888a03 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -364,6 +364,7 @@ extern int link_ext_symbols; extern int force_pointer_size; extern int unwind_tables; extern int unix_lib; +extern int safe_seh; extern char *input_file_name; extern char *spec_file_name; diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 47f2787b10..efb86b705e 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -47,6 +47,7 @@ int link_ext_symbols = 0; int force_pointer_size = 0; int unwind_tables = 0; int unix_lib = 0; +int safe_seh = 0; #ifdef __i386__ enum target_cpu target_cpu = CPU_x86; @@ -290,6 +291,7 @@ static const char usage_str[] = " -N, --dll-name=DLLNAME Set the DLL name (default: from input file name)\n" " -o, --output=NAME Set the output file name (default: stdout)\n" " -r, --res=RSRC.RES Load resources from RSRC.RES\n" +" --safeseh Mark object files as SEH compatible\n" " --save-temps Do not delete the generated intermediate files\n" " --subsystem=SUBSYS Set the subsystem (one of native, windows, console, wince)\n" " -u, --undefined=SYMBOL Add an undefined reference to SYMBOL when linking\n" @@ -324,6 +326,7 @@ enum long_options_values LONG_OPT_NMCMD, LONG_OPT_NXCOMPAT, LONG_OPT_RESOURCES, + LONG_OPT_SAFE_SEH, LONG_OPT_SAVE_TEMPS, LONG_OPT_STATICLIB, LONG_OPT_SUBSYSTEM, @@ -350,6 +353,7 @@ static const struct option long_options[] = { "nm-cmd", 1, 0, LONG_OPT_NMCMD }, { "nxcompat", 1, 0, LONG_OPT_NXCOMPAT }, { "resources", 0, 0, LONG_OPT_RESOURCES }, + { "safeseh", 0, 0, LONG_OPT_SAFE_SEH }, { "save-temps", 0, 0, LONG_OPT_SAVE_TEMPS }, { "subsystem", 1, 0, LONG_OPT_SUBSYSTEM }, { "version", 0, 0, LONG_OPT_VERSION }, @@ -543,6 +547,9 @@ static char **parse_options( int argc, char **argv, DLLSPEC *spec ) if (optarg[0] == 'n' || optarg[0] == 'N') spec->dll_characteristics &= ~IMAGE_DLLCHARACTERISTICS_NX_COMPAT; break; + case LONG_OPT_SAFE_SEH: + safe_seh = 1; + break; case LONG_OPT_RESOURCES: set_exec_mode( MODE_RESOURCES ); break; diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 669520711c..2a1fc96092 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -684,6 +684,12 @@ void output_standard_file_header(void) else output( "/* File generated automatically; do not edit! */\n" ); output( "/* This file can be copied, modified and distributed without restriction. */\n\n" ); + if (safe_seh) + { + output( "\t.def @feat.00; .scl 3; .type 0; .endef\n" ); + output( "\t.globl @feat.00\n" ); + output( ".set @feat.00, 1\n" ); + } } /* dump a byte stream into the assembly code */ diff --git a/tools/winebuild/winebuild.man.in b/tools/winebuild/winebuild.man.in index 9c91c1a504..63ea2a3226 100644 --- a/tools/winebuild/winebuild.man.in +++ b/tools/winebuild/winebuild.man.in @@ -219,6 +219,9 @@ and will automatically be handled correctly (though the .B \-r option will also work for Win32 files). .TP +.B --safeseh +Mark object files as SEH compatible. +.TP .B --save-temps Do not delete the various temporary files that \fBwinebuild\fR generates. .TP

1 0

Nikolay Sivov : mf: Fix timer instance leak on error path in SetTimer().
by Alexandre Julliard May 6, 2020

May 6, 2020

Module: wine Branch: master Commit: 35242aa417cd1dd7d61e72a1c8fdabd29517367f URL: https://source.winehq.org/git/wine.git/?a=commit;h=35242aa417cd1dd7d61e72a1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 6 15:49:11 2020 +0300 mf: Fix timer instance leak on error path in SetTimer(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index d6b881218b..25832afdbb 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -4093,15 +4093,19 @@ static HRESULT WINAPI present_clock_timer_SetTimer(IMFTimer *iface, DWORD flags, hr = MF_S_CLOCK_STOPPED; if (SUCCEEDED(hr)) + { list_add_tail(&clock->timers, &clock_timer->entry); + if (cancel_key) + { + *cancel_key = &clock_timer->IUnknown_iface; + IUnknown_AddRef(*cancel_key); + } + } LeaveCriticalSection(&clock->cs); - if (SUCCEEDED(hr) && cancel_key) - { - *cancel_key = &clock_timer->IUnknown_iface; - IUnknown_AddRef(*cancel_key); - } + if (FAILED(hr)) + IUnknown_Release(&clock_timer->IUnknown_iface); return hr; }

1 0

Zebediah Figura : quartz/videorenderer: Set the source rect at connection time.
by Alexandre Julliard May 6, 2020

May 6, 2020

Module: wine Branch: master Commit: e5729cf8ebe4e9616b5e9963fc5304777a7c47b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5729cf8ebe4e9616b5e9963… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 5 19:03:42 2020 -0500 quartz/videorenderer: Set the source rect at connection time. Filter state should not be modified in IPin::QueryAccept(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/videorenderer.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 77afc9fcef..15a7d59eb1 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -193,9 +193,6 @@ static HRESULT WINAPI VideoRenderer_DoRenderSample(struct strmbase_renderer *ifa static HRESULT WINAPI VideoRenderer_CheckMediaType(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt) { - struct video_renderer *filter = impl_from_strmbase_renderer(iface); - const BITMAPINFOHEADER *bitmap_header; - if (!IsEqualGUID(&mt->majortype, &MEDIATYPE_Video)) return S_FALSE; @@ -209,12 +206,6 @@ static HRESULT WINAPI VideoRenderer_CheckMediaType(struct strmbase_renderer *ifa && !IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo2)) return S_FALSE; - bitmap_header = get_bitmap_header(mt); - - filter->VideoWidth = bitmap_header->biWidth; - filter->VideoHeight = abs(bitmap_header->biHeight); - SetRect(&filter->SourceRect, 0, 0, filter->VideoWidth, filter->VideoHeight); - return S_OK; } @@ -285,6 +276,18 @@ static void video_renderer_init_stream(struct strmbase_renderer *iface) VideoRenderer_AutoShowWindow(filter); } +static HRESULT video_renderer_connect(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt) +{ + struct video_renderer *filter = impl_from_strmbase_renderer(iface); + const BITMAPINFOHEADER *bitmap_header = get_bitmap_header(mt); + + filter->VideoWidth = bitmap_header->biWidth; + filter->VideoHeight = abs(bitmap_header->biHeight); + SetRect(&filter->SourceRect, 0, 0, filter->VideoWidth, filter->VideoHeight); + + return S_OK; +} + static RECT video_renderer_get_default_rect(struct video_window *iface) { struct video_renderer *This = impl_from_video_window(iface); @@ -321,6 +324,7 @@ static const struct strmbase_renderer_ops renderer_ops = .renderer_destroy = video_renderer_destroy, .renderer_query_interface = video_renderer_query_interface, .renderer_pin_query_interface = video_renderer_pin_query_interface, + .renderer_connect = video_renderer_connect, }; static const struct video_window_ops window_ops =

1 0

Zebediah Figura : ntoskrnl.exe: Move the BroadcastSystemMessage() call to plugplay_send_event().
by Alexandre Julliard May 6, 2020

May 6, 2020

Module: wine Branch: master Commit: 7addca95b5b9f960171a5673490d4d23c646ea90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7addca95b5b9f960171a5673… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 5 11:25:41 2020 -0500 ntoskrnl.exe: Move the BroadcastSystemMessage() call to plugplay_send_event(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/Makefile.in | 2 +- dlls/ntoskrnl.exe/pnp.c | 1 - programs/plugplay/Makefile.in | 2 +- programs/plugplay/main.c | 2 ++ 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/Makefile.in b/dlls/ntoskrnl.exe/Makefile.in index 85bc1ce698..df48e44ede 100644 --- a/dlls/ntoskrnl.exe/Makefile.in +++ b/dlls/ntoskrnl.exe/Makefile.in @@ -1,7 +1,7 @@ MODULE = ntoskrnl.exe IMPORTLIB = ntoskrnl IMPORTS = advapi32 hal msvcrt -DELAYIMPORTS = rpcrt4 setupapi user32 +DELAYIMPORTS = rpcrt4 setupapi EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index 470e2368fb..91b825dffc 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -670,7 +670,6 @@ static LONG WINAPI rpc_filter( EXCEPTION_POINTERS *eptr ) static void send_devicechange( DWORD code, void *data, unsigned int size ) { - BroadcastSystemMessageW( BSF_FORCEIFHUNG | BSF_QUERY, NULL, WM_DEVICECHANGE, code, (LPARAM)data ); __TRY { plugplay_send_event( code, data, size ); diff --git a/programs/plugplay/Makefile.in b/programs/plugplay/Makefile.in index 1bc2aa505a..001d81597f 100644 --- a/programs/plugplay/Makefile.in +++ b/programs/plugplay/Makefile.in @@ -1,5 +1,5 @@ MODULE = plugplay.exe -IMPORTS = advapi32 rpcrt4 +IMPORTS = advapi32 rpcrt4 user32 EXTRADLLFLAGS = -mconsole -municode -mno-cygwin diff --git a/programs/plugplay/main.c b/programs/plugplay/main.c index 00af2b0adf..8e00704842 100644 --- a/programs/plugplay/main.c +++ b/programs/plugplay/main.c @@ -141,6 +141,8 @@ void __cdecl plugplay_send_event( DWORD code, const BYTE *data, unsigned int siz struct listener *listener; struct event *event; + BroadcastSystemMessageW( BSF_FORCEIFHUNG | BSF_QUERY, NULL, WM_DEVICECHANGE, code, (LPARAM)data ); + EnterCriticalSection( &plugplay_cs ); LIST_FOR_EACH_ENTRY(listener, &listener_list, struct listener, entry)

1 0

Alexandre Julliard : kernel32: Move the psapi functions to kernelbase.
by Alexandre Julliard May 6, 2020

May 6, 2020

Module: wine Branch: master Commit: 876d7af94e71713e654db802b486e19c8b1b301c URL: https://source.winehq.org/git/wine.git/?a=commit;h=876d7af94e71713e654db802… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 6 16:24:24 2020 +0200 kernel32: Move the psapi functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/cpu.c | 71 ---- dlls/kernel32/file.c | 66 --- dlls/kernel32/kernel32.spec | 58 +-- dlls/kernel32/module.c | 482 ---------------------- dlls/kernel32/process.c | 224 ----------- dlls/kernel32/virtual.c | 95 +---- dlls/kernelbase/debug.c | 865 ++++++++++++++++++++++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 58 +-- 8 files changed, 928 insertions(+), 991 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=876d7af94e71713e654d…

1 0

Vijay Kiran Kamuju : msasn1: Implement ASN1_CreateModule function.
by Alexandre Julliard May 6, 2020

May 6, 2020

Module: wine Branch: master Commit: 84096382fc4ca80f5fc59908bf287e28a291bae8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84096382fc4ca80f5fc59908… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Tue May 5 13:51:36 2020 +0200 msasn1: Implement ASN1_CreateModule function. Based on patch from Austin English. Wine-Bug: https:/bugs.winehq.org/show_bug.cgi?id=38020 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msasn1/main.c | 30 +++++++++++++++++++++++++++++- dlls/msasn1/tests/asn1.c | 33 +++++++++++++++++++++++++++++++-- 2 files changed, 60 insertions(+), 3 deletions(-) diff --git a/dlls/msasn1/main.c b/dlls/msasn1/main.c index 90c4a8a9c9..6882fbf6c9 100644 --- a/dlls/msasn1/main.c +++ b/dlls/msasn1/main.c @@ -23,6 +23,7 @@ #include "winbase.h" #include "msasn1.h" +#include "wine/heap.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msasn1); @@ -49,10 +50,37 @@ ASN1module_t WINAPI ASN1_CreateModule(ASN1uint32_t ver, ASN1encodingrule_e rule, { ASN1module_t module = NULL; - FIXME("(%08x %08x %08x %u %p %p %p %p %u): Stub!\n", ver, rule, flags, pdu, encoder, decoder, freemem, size, magic); + TRACE("(%08x %08x %08x %u %p %p %p %p %u)\n", ver, rule, flags, pdu, encoder, decoder, freemem, size, magic); if (!encoder || !decoder || !freemem || !size) return module; + module = heap_alloc(sizeof(module)); + if (module) + { + module->nModuleName = magic; + module->eRule = rule; + module->dwFlags = flags; + module->cPDUs = pdu; + module->apfnFreeMemory = freemem; + module->acbStructSize = size; + + if (rule & ASN1_PER_RULE) + { + module->PER.apfnEncoder = (ASN1PerEncFun_t *)encoder; + module->PER.apfnDecoder = (ASN1PerDecFun_t *)decoder; + } + else if (rule & ASN1_BER_RULE) + { + module->BER.apfnEncoder = (ASN1BerEncFun_t *)encoder; + module->BER.apfnDecoder = (ASN1BerDecFun_t *)decoder; + } + else + { + module->PER.apfnEncoder = NULL; + module->PER.apfnDecoder = NULL; + } + } + return module; } diff --git a/dlls/msasn1/tests/asn1.c b/dlls/msasn1/tests/asn1.c index 19019fc72b..adbf547efa 100644 --- a/dlls/msasn1/tests/asn1.c +++ b/dlls/msasn1/tests/asn1.c @@ -46,10 +46,39 @@ static void test_CreateModule(void) ok(!mod, "Expected Failure.\n"); mod = ASN1_CreateModule(0, 0, 0, 0, encfn, decfn, freefn, size, 0); - todo_wine ok(!!mod, "Failed to create module.\n"); + ok(!!mod, "Failed to create module.\n"); + ok(mod->nModuleName==0, "Got Module name = %d\n.",mod->nModuleName); + ok(mod->eRule==0, "Got eRule = %08x\n.",mod->eRule); + ok(mod->dwFlags==0, "Got Flags = %08x\n.",mod->dwFlags); + ok(mod->cPDUs==0, "Got PDUs = %08x\n.",mod->cPDUs); + ok(mod->apfnFreeMemory==freefn, "Free function = %p.\n",mod->apfnFreeMemory); + ok(mod->acbStructSize==size, "Struct size = %p.\n",mod->acbStructSize); + ok(!mod->PER.apfnEncoder, "Encoder function should not be s et.\n"); + ok(!mod->PER.apfnDecoder, "Decoder function should not be set.\n"); mod = ASN1_CreateModule(ASN1_THIS_VERSION, ASN1_BER_RULE_DER, ASN1FLAGS_NOASSERT, 1, encfn, decfn, freefn, size, name); - todo_wine ok(!!mod, "Failed to create module.\n"); + ok(!!mod, "Failed to create module.\n"); + ok(mod->nModuleName==name, "Got Module name = %d\n.",mod->nModuleName); + ok(mod->eRule==ASN1_BER_RULE_DER, "Got eRule = %08x\n.",mod->eRule); + ok(mod->cPDUs==1, "Got PDUs = %08x\n.",mod->cPDUs); + ok(mod->dwFlags==ASN1FLAGS_NOASSERT, "Got Flags = %08x\n.",mod->dwFlags); + ok(mod->apfnFreeMemory==freefn, "Free function = %p.\n",mod->apfnFreeMemory); + ok(mod->acbStructSize==size, "Struct size = %p.\n",mod->acbStructSize); + ok(mod->BER.apfnEncoder==(ASN1BerEncFun_t *)encfn, "Encoder function = %p.\n",mod->BER.apfnEncoder); + ok(mod->BER.apfnDecoder==(ASN1BerDecFun_t *)decfn, "Decoder function = %p.\n",mod->BER.apfnDecoder); + + mod = ASN1_CreateModule(ASN1_THIS_VERSION, ASN1_PER_RULE_ALIGNED, ASN1FLAGS_NOASSERT, 1, encfn, decfn, freefn, size, name); + ok(!!mod, "Failed to create module.\n"); + ok(mod->nModuleName==name, "Got Module name = %d\n.",mod->nModuleName); + ok(mod->eRule==ASN1_PER_RULE_ALIGNED, "Got eRule = %08x\n.",mod->eRule); + ok(mod->cPDUs==1, "Got PDUs = %08x\n.",mod->cPDUs); + ok(mod->dwFlags==ASN1FLAGS_NOASSERT, "Got Flags = %08x\n.",mod->dwFlags); + ok(mod->apfnFreeMemory==freefn, "Free function = %p.\n",mod->apfnFreeMemory); + ok(mod->acbStructSize==size, "Struct size = %p.\n",mod->acbStructSize); + ok(mod->PER.apfnEncoder==(ASN1PerEncFun_t *)encfn /* WINXP & WIN2008 */ || + broken(!mod->PER.apfnEncoder), "Encoder function = %p.\n",mod->PER.apfnEncoder); + ok(mod->PER.apfnDecoder==(ASN1PerDecFun_t *)decfn /* WINXP & WIN2008 */ || + broken(!mod->PER.apfnDecoder), "Decoder function = %p.\n",mod->PER.apfnDecoder); } START_TEST(asn1)

1 0

Zebediah Figura : quartz/videorenderer: Factor out get_bitmap_header().
by Alexandre Julliard May 6, 2020

May 6, 2020

Module: wine Branch: master Commit: 665ac338ca17b546f9c81c9016917d5d0a4df7d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=665ac338ca17b546f9c81c90… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 5 19:03:41 2020 -0500 quartz/videorenderer: Factor out get_bitmap_header(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/videorenderer.c | 85 ++++++++++++++++----------------------------- 1 file changed, 30 insertions(+), 55 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 54a646fbc0..77afc9fcef 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -79,6 +79,14 @@ static inline struct video_renderer *impl_from_BaseControlVideo(BaseControlVideo return CONTAINING_RECORD(iface, struct video_renderer, baseControlVideo); } +static const BITMAPINFOHEADER *get_bitmap_header(const AM_MEDIA_TYPE *mt) +{ + if (IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo)) + return &((VIDEOINFOHEADER *)mt->pbFormat)->bmiHeader; + else + return &((VIDEOINFOHEADER2 *)mt->pbFormat)->bmiHeader; +} + static void VideoRenderer_AutoShowWindow(struct video_renderer *This) { if (!This->init && (!This->WindowPos.right || !This->WindowPos.top)) @@ -144,9 +152,7 @@ static HRESULT WINAPI VideoRenderer_ShouldDrawSampleNow(struct strmbase_renderer static HRESULT WINAPI VideoRenderer_DoRenderSample(struct strmbase_renderer *iface, IMediaSample *pSample) { struct video_renderer *filter = impl_from_strmbase_renderer(iface); - const AM_MEDIA_TYPE *mt = &filter->renderer.sink.pin.mt; LPBYTE pbSrcStream = NULL; - BITMAPINFOHEADER *bih; HRESULT hr; HDC dc; @@ -159,11 +165,6 @@ static HRESULT WINAPI VideoRenderer_DoRenderSample(struct strmbase_renderer *ifa return hr; } - if (IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo)) - bih = &((VIDEOINFOHEADER *)mt->pbFormat)->bmiHeader; - else - bih = &((VIDEOINFOHEADER2 *)mt->pbFormat)->bmiHeader; - dc = GetDC(filter->baseControlWindow.hwnd); StretchDIBits(dc, filter->DestRect.left, filter->DestRect.top, filter->DestRect.right - filter->DestRect.left, @@ -171,7 +172,7 @@ static HRESULT WINAPI VideoRenderer_DoRenderSample(struct strmbase_renderer *ifa filter->SourceRect.left, filter->SourceRect.top, filter->SourceRect.right - filter->SourceRect.left, filter->SourceRect.bottom - filter->SourceRect.top, - pbSrcStream, (BITMAPINFO *)bih, DIB_RGB_COLORS, SRCCOPY); + pbSrcStream, (BITMAPINFO *)get_bitmap_header(&filter->renderer.sink.pin.mt), DIB_RGB_COLORS, SRCCOPY); ReleaseDC(filter->baseControlWindow.hwnd, dc); if (filter->renderer.filter.state == State_Paused) @@ -190,53 +191,31 @@ static HRESULT WINAPI VideoRenderer_DoRenderSample(struct strmbase_renderer *ifa return S_OK; } -static HRESULT WINAPI VideoRenderer_CheckMediaType(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *pmt) +static HRESULT WINAPI VideoRenderer_CheckMediaType(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt) { - struct video_renderer *This = impl_from_strmbase_renderer(iface); + struct video_renderer *filter = impl_from_strmbase_renderer(iface); + const BITMAPINFOHEADER *bitmap_header; - if (!IsEqualIID(&pmt->majortype, &MEDIATYPE_Video)) + if (!IsEqualGUID(&mt->majortype, &MEDIATYPE_Video)) return S_FALSE; - if (IsEqualIID(&pmt->subtype, &MEDIASUBTYPE_RGB32) || - IsEqualIID(&pmt->subtype, &MEDIASUBTYPE_RGB24) || - IsEqualIID(&pmt->subtype, &MEDIASUBTYPE_RGB565) || - IsEqualIID(&pmt->subtype, &MEDIASUBTYPE_RGB8)) - { - LONG height; + if (!IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB32) + && !IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB24) + && !IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB565) + && !IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB8)) + return S_FALSE; - if (IsEqualIID(&pmt->formattype, &FORMAT_VideoInfo)) - { - VIDEOINFOHEADER *format = (VIDEOINFOHEADER *)pmt->pbFormat; - This->SourceRect.left = 0; - This->SourceRect.top = 0; - This->SourceRect.right = This->VideoWidth = format->bmiHeader.biWidth; - height = format->bmiHeader.biHeight; - if (height < 0) - This->SourceRect.bottom = This->VideoHeight = -height; - else - This->SourceRect.bottom = This->VideoHeight = height; - } - else if (IsEqualIID(&pmt->formattype, &FORMAT_VideoInfo2)) - { - VIDEOINFOHEADER2 *format2 = (VIDEOINFOHEADER2 *)pmt->pbFormat; - - This->SourceRect.left = 0; - This->SourceRect.top = 0; - This->SourceRect.right = This->VideoWidth = format2->bmiHeader.biWidth; - height = format2->bmiHeader.biHeight; - if (height < 0) - This->SourceRect.bottom = This->VideoHeight = -height; - else - This->SourceRect.bottom = This->VideoHeight = height; - } - else - { - WARN("Format type %s not supported\n", debugstr_guid(&pmt->formattype)); - return S_FALSE; - } - return S_OK; - } - return S_FALSE; + if (!IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo) + && !IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo2)) + return S_FALSE; + + bitmap_header = get_bitmap_header(mt); + + filter->VideoWidth = bitmap_header->biWidth; + filter->VideoHeight = abs(bitmap_header->biHeight); + SetRect(&filter->SourceRect, 0, 0, filter->VideoWidth, filter->VideoHeight); + + return S_OK; } static void video_renderer_destroy(struct strmbase_renderer *iface) @@ -360,7 +339,6 @@ static HRESULT WINAPI VideoRenderer_GetSourceRect(BaseControlVideo* iface, RECT static HRESULT WINAPI VideoRenderer_GetStaticImage(BaseControlVideo *iface, LONG *size, LONG *image) { struct video_renderer *filter = impl_from_BaseControlVideo(iface); - const AM_MEDIA_TYPE *mt = &filter->renderer.sink.pin.mt; const BITMAPINFOHEADER *bih; size_t image_size; BYTE *sample_data; @@ -369,10 +347,7 @@ static HRESULT WINAPI VideoRenderer_GetStaticImage(BaseControlVideo *iface, LONG EnterCriticalSection(&filter->renderer.csRenderLock); - if (IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo)) - bih = &((VIDEOINFOHEADER *)mt->pbFormat)->bmiHeader; - else /* if (IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo2)) */ - bih = &((VIDEOINFOHEADER2 *)mt->pbFormat)->bmiHeader; + bih = get_bitmap_header(&filter->renderer.sink.pin.mt); image_size = bih->biWidth * bih->biHeight * bih->biBitCount / 8; if (!image)

1 0

Vijay Kiran Kamuju : msasn1: Implement ASN1_CloseModule function.
by Alexandre Julliard May 6, 2020

May 6, 2020

Module: wine Branch: master Commit: 0d2f30370067e194dfdcc72b3e675aaedcc2061b URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d2f30370067e194dfdcc72b… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Tue May 5 14:21:43 2020 +0200 msasn1: Implement ASN1_CloseModule function. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msasn1/main.c | 7 +++++++ dlls/msasn1/msasn1.spec | 2 +- dlls/msasn1/tests/asn1.c | 3 +++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/msasn1/main.c b/dlls/msasn1/main.c index 6882fbf6c9..b30725aa63 100644 --- a/dlls/msasn1/main.c +++ b/dlls/msasn1/main.c @@ -84,3 +84,10 @@ ASN1module_t WINAPI ASN1_CreateModule(ASN1uint32_t ver, ASN1encodingrule_e rule, return module; } + +void WINAPI ASN1_CloseModule(ASN1module_t module) +{ + TRACE("(%p)\n", module); + + heap_free(module); +} diff --git a/dlls/msasn1/msasn1.spec b/dlls/msasn1/msasn1.spec index ca6a461c65..09935f5149 100644 --- a/dlls/msasn1/msasn1.spec +++ b/dlls/msasn1/msasn1.spec @@ -219,7 +219,7 @@ @ stub ASN1_CloseDecoder @ stub ASN1_CloseEncoder2 @ stub ASN1_CloseEncoder -@ stub ASN1_CloseModule +@ stdcall ASN1_CloseModule(ptr) @ stub ASN1_CreateDecoder @ stub ASN1_CreateDecoderEx @ stub ASN1_CreateEncoder diff --git a/dlls/msasn1/tests/asn1.c b/dlls/msasn1/tests/asn1.c index adbf547efa..80f4dd5990 100644 --- a/dlls/msasn1/tests/asn1.c +++ b/dlls/msasn1/tests/asn1.c @@ -55,6 +55,7 @@ static void test_CreateModule(void) ok(mod->acbStructSize==size, "Struct size = %p.\n",mod->acbStructSize); ok(!mod->PER.apfnEncoder, "Encoder function should not be s et.\n"); ok(!mod->PER.apfnDecoder, "Decoder function should not be set.\n"); + ASN1_CloseModule(mod); mod = ASN1_CreateModule(ASN1_THIS_VERSION, ASN1_BER_RULE_DER, ASN1FLAGS_NOASSERT, 1, encfn, decfn, freefn, size, name); ok(!!mod, "Failed to create module.\n"); @@ -66,6 +67,7 @@ static void test_CreateModule(void) ok(mod->acbStructSize==size, "Struct size = %p.\n",mod->acbStructSize); ok(mod->BER.apfnEncoder==(ASN1BerEncFun_t *)encfn, "Encoder function = %p.\n",mod->BER.apfnEncoder); ok(mod->BER.apfnDecoder==(ASN1BerDecFun_t *)decfn, "Decoder function = %p.\n",mod->BER.apfnDecoder); + ASN1_CloseModule(mod); mod = ASN1_CreateModule(ASN1_THIS_VERSION, ASN1_PER_RULE_ALIGNED, ASN1FLAGS_NOASSERT, 1, encfn, decfn, freefn, size, name); ok(!!mod, "Failed to create module.\n"); @@ -79,6 +81,7 @@ static void test_CreateModule(void) broken(!mod->PER.apfnEncoder), "Encoder function = %p.\n",mod->PER.apfnEncoder); ok(mod->PER.apfnDecoder==(ASN1PerDecFun_t *)decfn /* WINXP & WIN2008 */ || broken(!mod->PER.apfnDecoder), "Decoder function = %p.\n",mod->PER.apfnDecoder); + ASN1_CloseModule(mod); } START_TEST(asn1)

1 0

Zhiyi Zhang : wined3d: Fix an uninitialised variable warning.
by Alexandre Julliard May 5, 2020

May 5, 2020

Module: wine Branch: master Commit: 1976685a0f57bdec939228d73f6252c68ccb8f80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1976685a0f57bdec939228d7… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue May 5 20:46:43 2020 +0800 wined3d: Fix an uninitialised variable warning. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_gl.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index a1aa3c0bb9..c21ecfd5c3 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -257,7 +257,7 @@ static void context_dump_fbo_attachment(const struct wined3d_gl_info *gl_info, G }; GLint type, name, samples, width, height, old_texture, level, face, fmt, tex_target; - const char *tex_type_str; + const char *tex_type_str = NULL; unsigned int i; gl_info->fbo_ops.glGetFramebufferAttachmentParameteriv(target, attachment, @@ -310,8 +310,6 @@ static void context_dump_fbo_attachment(const struct wined3d_gl_info *gl_info, G } else { - tex_type_str = NULL; - for (i = 0; i < ARRAY_SIZE(texture_type); ++i) { if (!gl_info->supported[texture_type[i].extension])

1 0

Jacek Caban : winecrt0: Add _fltused symbol.
by Alexandre Julliard May 5, 2020

May 5, 2020

Module: wine Branch: master Commit: 053f07f602e2ead81d3764ec8cb4279614285e0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=053f07f602e2ead81d3764ec… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 5 16:29:06 2020 +0200 winecrt0: Add _fltused symbol. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecrt0/Makefile.in | 1 + dlls/winecrt0/crt_fltused.c | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/dlls/winecrt0/Makefile.in b/dlls/winecrt0/Makefile.in index bcbd4e3b55..18a116e578 100644 --- a/dlls/winecrt0/Makefile.in +++ b/dlls/winecrt0/Makefile.in @@ -2,6 +2,7 @@ MODULE = libwinecrt0.a C_SRCS = \ crt_dllmain.c \ + crt_fltused.c \ debug.c \ delay_load.c \ dll_main.c \ diff --git a/dlls/winecrt0/crt_fltused.c b/dlls/winecrt0/crt_fltused.c new file mode 100644 index 0000000000..f65fc2d96c --- /dev/null +++ b/dlls/winecrt0/crt_fltused.c @@ -0,0 +1,24 @@ +/* + * Copyright 2020 Jacek Caban for CodeWeavers + * + * 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 _WIN32 + +/* referenced by MSVC to pull crt support for floating points. we don't use it. */ +int _fltused = 0; + +#endif

1 0