April 2020 - Wine-commits - list.winehq.org

Jacek Caban : dbghelp: Don't bother trying to initialize loader backend if we can't get debug base address from PEB.
by Alexandre Julliard 02 Apr '20

02 Apr '20

Module: wine Branch: master Commit: 3047385437c7ef36996d0418ac378677f3e9d67c URL: https://source.winehq.org/git/wine.git/?a=commit;h=3047385437c7ef36996d0418… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 2 19:18:39 2020 +0200 dbghelp: Don't bother trying to initialize loader backend if we can't get debug base address from PEB. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp.c | 1 + dlls/dbghelp/macho_module.c | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index b54ebf1c54..369e098381 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -292,6 +292,7 @@ static BOOL check_live_target(struct process* pcs) base = base32; } else ReadProcessMemory(pcs->handle, &pbi.PebBaseAddress->Reserved[0], &base, sizeof(base), NULL); + if (!base) return FALSE; TRACE("got debug info address %#lx from PEB %p\n", base, pbi.PebBaseAddress); return elf_read_wine_loader_dbg_info(pcs, base) || macho_read_wine_loader_dbg_info(pcs, base); diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 8aa232e1ed..413a25c663 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -1845,8 +1845,7 @@ static BOOL macho_search_loader(struct process* pcs, struct macho_info* macho_in len = sizeof(image_infos.infos64); else len = sizeof(image_infos.infos32); - if (pcs->dbg_hdr_addr && - ReadProcessMemory(pcs->handle, (void*)pcs->dbg_hdr_addr, &image_infos, len, NULL)) + if (ReadProcessMemory(pcs->handle, (void*)pcs->dbg_hdr_addr, &image_infos, len, NULL)) { if (pcs->is_64bit) len = sizeof(image_info.info64);

1 0

Alexandre Julliard : krnl386: Build with msvcrt.
by Alexandre Julliard 02 Apr '20

02 Apr '20

Module: wine Branch: master Commit: 024f9ebd1a1aaf07b853f00efca9480d956312bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=024f9ebd1a1aaf07b853f00e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 2 10:54:08 2020 +0200 krnl386: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/Makefile.in | 4 ++-- dlls/krnl386.exe16/atom.c | 4 ---- dlls/krnl386.exe16/dosexe.h | 1 - dlls/krnl386.exe16/dosmem.c | 6 ------ dlls/krnl386.exe16/file.c | 5 +---- dlls/krnl386.exe16/global.c | 12 ------------ dlls/krnl386.exe16/instr.c | 3 --- dlls/krnl386.exe16/int21.c | 23 +++++++---------------- dlls/krnl386.exe16/int25.c | 6 +----- dlls/krnl386.exe16/int26.c | 6 +----- dlls/krnl386.exe16/int2f.c | 2 -- dlls/krnl386.exe16/int31.c | 3 --- dlls/krnl386.exe16/interrupts.c | 2 -- dlls/krnl386.exe16/ioports.c | 6 ------ dlls/krnl386.exe16/kernel.c | 2 ++ dlls/krnl386.exe16/kernel16_private.h | 1 - dlls/krnl386.exe16/local.c | 3 --- dlls/krnl386.exe16/ne_module.c | 10 ---------- dlls/krnl386.exe16/ne_segment.c | 21 +++------------------ dlls/krnl386.exe16/relay.c | 9 ++------- dlls/krnl386.exe16/resource.c | 32 ++++++++++++++------------------ dlls/krnl386.exe16/selector.c | 3 --- dlls/krnl386.exe16/snoop.c | 4 ---- dlls/krnl386.exe16/syslevel.c | 7 +------ dlls/krnl386.exe16/task.c | 6 ------ dlls/krnl386.exe16/thunk.c | 7 ------- dlls/krnl386.exe16/vxd.c | 25 +++++++------------------ dlls/krnl386.exe16/wowthunk.c | 6 ------ 28 files changed, 41 insertions(+), 178 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=024f9ebd1a1aaf07b853…

1 0

Alexandre Julliard : makefiles: Always build 16-bit modules with msvcrt.
by Alexandre Julliard 02 Apr '20

02 Apr '20

Module: wine Branch: master Commit: fbbad0f10ae6e7d8bba405290ffc76f1fa6907ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=fbbad0f10ae6e7d8bba40529… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 2 11:09:19 2020 +0200 makefiles: Always build 16-bit modules with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/avifile.dll16/Makefile.in | 2 +- dlls/commdlg.dll16/Makefile.in | 2 +- dlls/compobj.dll16/Makefile.in | 2 +- dlls/ctl3d.dll16/Makefile.in | 2 +- dlls/ctl3dv2.dll16/Makefile.in | 2 +- dlls/ddeml.dll16/Makefile.in | 2 +- dlls/dispdib.dll16/Makefile.in | 2 +- dlls/display.drv16/Makefile.in | 2 +- dlls/gdi.exe16/Makefile.in | 2 +- dlls/keyboard.drv16/Makefile.in | 2 +- dlls/krnl386.exe16/Makefile.in | 2 +- dlls/lzexpand.dll16/Makefile.in | 2 +- dlls/mmsystem.dll16/Makefile.in | 2 +- dlls/mouse.drv16/Makefile.in | 2 +- dlls/msacm.dll16/Makefile.in | 2 +- dlls/msvideo.dll16/Makefile.in | 2 +- dlls/ole2.dll16/Makefile.in | 2 +- dlls/ole2disp.dll16/Makefile.in | 2 +- dlls/ole2nls.dll16/Makefile.in | 2 +- dlls/olecli.dll16/Makefile.in | 2 +- dlls/olesvr.dll16/Makefile.in | 2 +- dlls/setupx.dll16/Makefile.in | 2 +- dlls/shell.dll16/Makefile.in | 2 +- dlls/sound.drv16/Makefile.in | 2 +- dlls/storage.dll16/Makefile.in | 2 +- dlls/stress.dll16/Makefile.in | 2 +- dlls/system.drv16/Makefile.in | 2 +- dlls/toolhelp.dll16/Makefile.in | 2 +- dlls/twain.dll16/Makefile.in | 2 +- dlls/typelib.dll16/Makefile.in | 2 +- dlls/user.exe16/Makefile.in | 2 +- dlls/ver.dll16/Makefile.in | 2 +- dlls/w32sys.dll16/Makefile.in | 2 +- dlls/win32s16.dll16/Makefile.in | 2 +- dlls/win87em.dll16/Makefile.in | 2 +- dlls/winaspi.dll16/Makefile.in | 2 +- dlls/windebug.dll16/Makefile.in | 2 +- dlls/wineps16.drv16/Makefile.in | 2 +- dlls/wing.dll16/Makefile.in | 2 +- dlls/winnls.dll16/Makefile.in | 2 +- dlls/winsock.dll16/Makefile.in | 2 +- dlls/wintab.dll16/Makefile.in | 2 +- programs/rundll.exe16/Makefile.in | 2 +- programs/winhelp.exe16/Makefile.in | 2 +- programs/winoldap.mod16/Makefile.in | 2 +- tools/makedep.c | 6 +++--- 46 files changed, 48 insertions(+), 48 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fbbad0f10ae6e7d8bba4…

1 0

Alexandre Julliard : makefiles: Always explicitly specify the C runtime import.
by Alexandre Julliard 02 Apr '20

02 Apr '20

Module: wine Branch: master Commit: e67ca92f5721acb0e5252951dd2bc15d637af2be URL: https://source.winehq.org/git/wine.git/?a=commit;h=e67ca92f5721acb0e5252951… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 2 11:30:23 2020 +0200 makefiles: Always explicitly specify the C runtime import. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 0ff17564d7..061d8c6572 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2236,7 +2236,6 @@ static struct strarray get_default_imports( const struct makefile *make ) struct strarray ret = empty_strarray; if (strarray_exists( &make->extradllflags, "-nodefaultlibs" )) return ret; - if (make->use_msvcrt) strarray_add( &ret, "msvcrt" ); strarray_add( &ret, "winecrt0" ); if (make->is_win16) strarray_add( &ret, "kernel" ); strarray_add( &ret, "kernel32" ); @@ -4270,12 +4269,8 @@ static void load_sources( struct makefile *make ) } if (!crt_dll && !strarray_exists( &make->extradllflags, "-nodefaultlibs" )) { - if (make->use_msvcrt && !make->testdll && !make->staticlib) - { - strarray_add( &make->imports, "ucrtbase" ); - crt_dll = "ucrtbase"; - } - else crt_dll = "msvcrt"; + crt_dll = !make->testdll && !make->staticlib ? "ucrtbase" : "msvcrt"; + strarray_add( &make->imports, crt_dll ); } if (crt_dll && !strncmp( crt_dll, "ucrt", 4 )) strarray_add( &make->define_args, "-D_UCRT" ); } @@ -4289,7 +4284,6 @@ static void load_sources( struct makefile *make ) { for (i = 0; i < make->imports.count; i++) strarray_add_uniq( &cross_import_libs, make->imports.str[i] ); - if (crt_dll) strarray_add_uniq( &cross_import_libs, crt_dll ); if (make->is_win16) strarray_add_uniq( &cross_import_libs, "kernel" ); strarray_add_uniq( &cross_import_libs, "winecrt0" ); strarray_add_uniq( &cross_import_libs, "kernel32" );

1 0

Alexandre Julliard : makefiles: Don't add default libs for msvcrt builds.
by Alexandre Julliard 02 Apr '20

02 Apr '20

Module: wine Branch: master Commit: 5603ece70d66d20826066d4439a54439faa78c6c URL: https://source.winehq.org/git/wine.git/?a=commit;h=5603ece70d66d20826066d44… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 2 11:31:33 2020 +0200 makefiles: Don't add default libs for msvcrt builds. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 061d8c6572..9b64f0fed4 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2148,9 +2148,12 @@ static struct strarray add_default_libraries( const struct makefile *make, struc struct strarray all_libs = empty_strarray; unsigned int i, j; - if (!make->use_msvcrt) strarray_add( &all_libs, "-lwine_port" ); - strarray_addall( &all_libs, get_expanded_make_var_array( make, "EXTRALIBS" )); - strarray_addall( &all_libs, libs ); + if (!make->use_msvcrt) + { + strarray_add( &all_libs, "-lwine_port" ); + strarray_addall( &all_libs, get_expanded_make_var_array( make, "EXTRALIBS" )); + strarray_addall( &all_libs, libs ); + } for (i = 0; i < all_libs.count; i++) { @@ -2999,7 +3002,6 @@ static void output_source_spec( struct makefile *make, struct incl_file *source, if (!dll_flags.count) dll_flags = make->extradllflags; all_libs = add_import_libs( make, &dep_libs, imports, 0 ); add_import_libs( make, &dep_libs, get_default_imports( make ), 0 ); /* dependencies only */ - strarray_addall( &all_libs, libs ); dll_name = strmake( "%s.dll%s", obj, make->is_cross ? "" : dll_ext ); obj_name = strmake( "%s%s", obj_dir_path( make, obj ), make->is_cross ? ".cross.o" : ".o" ); @@ -3446,7 +3448,6 @@ static void output_test_module( struct makefile *make ) const char *parent_ext = parent && parent->is_cross ? "" : dll_ext; add_import_libs( make, &dep_libs, get_default_imports( make ), 0 ); /* dependencies only */ - strarray_addall( &all_libs, libs ); strarray_add( &make->all_targets, strmake( "%s%s", testmodule, ext )); strarray_add( &make->clean_files, strmake( "%s%s", stripped, ext )); output( "%s%s:\n", obj_dir_path( make, testmodule ), ext );

1 0

Zebediah Figura : quartz/filesource: Get rid of the AsyncReader typedef.
by Alexandre Julliard 02 Apr '20

02 Apr '20

Module: wine Branch: master Commit: d1d01de751a916ca2d9e13a1d0aeb34319934cca URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1d01de751a916ca2d9e13a1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 1 23:01:00 2020 -0500 quartz/filesource: Get rid of the AsyncReader typedef. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filesource.c | 83 +++++++++++++++++++++++------------------------- 1 file changed, 40 insertions(+), 43 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d1d01de751a916ca2d9e…

1 0

Zebediah Figura : quartz/videorenderer: Use calloc() in video_renderer_create().
by Alexandre Julliard 02 Apr '20

02 Apr '20

Module: wine Branch: master Commit: c2fa5cb5476d866de2c30af4b76333e9dfb4b500 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2fa5cb5476d866de2c30af4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 1 23:01:01 2020 -0500 quartz/videorenderer: Use calloc() in video_renderer_create(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/videorenderer.c | 40 ++++++++++++++++------------------------ 1 file changed, 16 insertions(+), 24 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 9301e8d769..8fb3a9e422 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -247,7 +247,7 @@ static void video_renderer_destroy(struct strmbase_renderer *iface) BaseControlVideo_Destroy(&filter->baseControlVideo); CloseHandle(filter->run_event); strmbase_renderer_cleanup(&filter->renderer); - CoTaskMemFree(filter); + free(filter); InterlockedDecrement(&object_locks); } @@ -701,46 +701,38 @@ static const IOverlayVtbl overlay_vtbl = HRESULT video_renderer_create(IUnknown *outer, IUnknown **out) { + VideoRendererImpl *object; HRESULT hr; - VideoRendererImpl * pVideoRenderer; - *out = NULL; - - pVideoRenderer = CoTaskMemAlloc(sizeof(VideoRendererImpl)); - - pVideoRenderer->init = FALSE; - ZeroMemory(&pVideoRenderer->SourceRect, sizeof(RECT)); - ZeroMemory(&pVideoRenderer->DestRect, sizeof(RECT)); - ZeroMemory(&pVideoRenderer->WindowPos, sizeof(RECT)); - pVideoRenderer->FullScreenMode = OAFALSE; - - pVideoRenderer->IOverlay_iface.lpVtbl = &overlay_vtbl; + if (!(object = calloc(1, sizeof(*object)))) + return E_OUTOFMEMORY; - strmbase_renderer_init(&pVideoRenderer->renderer, outer, - &CLSID_VideoRenderer, L"In", &renderer_ops); + strmbase_renderer_init(&object->renderer, outer, &CLSID_VideoRenderer, L"In", &renderer_ops); + object->IOverlay_iface.lpVtbl = &overlay_vtbl; - hr = video_window_init(&pVideoRenderer->baseControlWindow, &IVideoWindow_VTable, - &pVideoRenderer->renderer.filter, &pVideoRenderer->renderer.sink.pin, + hr = video_window_init(&object->baseControlWindow, &IVideoWindow_VTable, + &object->renderer.filter, &object->renderer.sink.pin, &renderer_BaseWindowFuncTable); if (FAILED(hr)) goto fail; - hr = basic_video_init(&pVideoRenderer->baseControlVideo, &pVideoRenderer->renderer.filter, - &pVideoRenderer->renderer.sink.pin, &renderer_BaseControlVideoFuncTable); + hr = basic_video_init(&object->baseControlVideo, &object->renderer.filter, + &object->renderer.sink.pin, &renderer_BaseControlVideoFuncTable); if (FAILED(hr)) goto fail; - if (FAILED(hr = BaseWindowImpl_PrepareWindow(&pVideoRenderer->baseControlWindow.baseWindow))) + if (FAILED(hr = BaseWindowImpl_PrepareWindow(&object->baseControlWindow.baseWindow))) goto fail; - pVideoRenderer->run_event = CreateEventW(NULL, TRUE, FALSE, NULL); + object->run_event = CreateEventW(NULL, TRUE, FALSE, NULL); - *out = &pVideoRenderer->renderer.filter.IUnknown_inner; + TRACE("Created video renderer %p.\n", object); + *out = &object->renderer.filter.IUnknown_inner; return S_OK; fail: - strmbase_renderer_cleanup(&pVideoRenderer->renderer); - CoTaskMemFree(pVideoRenderer); + strmbase_renderer_cleanup(&object->renderer); + free(object); return hr; }

1 0

Zebediah Figura : quartz/videorenderer: Get rid of the VideoRendererImpl typedef.
by Alexandre Julliard 02 Apr '20

02 Apr '20

Module: wine Branch: master Commit: 33f11bce82d53dce1c1195ad4937b31d9867fea6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=33f11bce82d53dce1c1195ad… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 1 23:01:02 2020 -0500 quartz/videorenderer: Get rid of the VideoRendererImpl typedef. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/videorenderer.c | 80 ++++++++++++++++++++++----------------------- 1 file changed, 40 insertions(+), 40 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=33f11bce82d53dce1c11…

1 0

Zebediah Figura : quartz/vmr9: Use calloc().
by Alexandre Julliard 02 Apr '20

02 Apr '20

Module: wine Branch: master Commit: a273a0e71fe0a217e9b7b3632d756b793b4c7dcc URL: https://source.winehq.org/git/wine.git/?a=commit;h=a273a0e71fe0a217e9b7b363… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 1 23:01:03 2020 -0500 quartz/vmr9: Use calloc(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/vmr9.c | 119 ++++++++++++++++++++++------------------------------- 1 file changed, 50 insertions(+), 69 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index c44607b3ef..58fbef5433 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -597,7 +597,7 @@ static void vmr_destroy(struct strmbase_renderer *iface) FreeLibrary(filter->hD3d9); BaseControlWindow_Destroy(&filter->baseControlWindow); strmbase_renderer_cleanup(&filter->renderer); - CoTaskMemFree(filter); + free(filter); InterlockedDecrement(&object_locks); } @@ -2291,69 +2291,57 @@ static const IOverlayVtbl overlay_vtbl = static HRESULT vmr_create(IUnknown *outer, IUnknown **out, const CLSID *clsid) { + struct quartz_vmr *object; HRESULT hr; - struct quartz_vmr* pVMR; - *out = NULL; - - pVMR = CoTaskMemAlloc(sizeof(struct quartz_vmr)); + if (!(object = calloc(1, sizeof(*object)))) + return E_OUTOFMEMORY; - pVMR->hD3d9 = LoadLibraryA("d3d9.dll"); - if (!pVMR->hD3d9 ) + object->hD3d9 = LoadLibraryA("d3d9.dll"); + if (!object->hD3d9) { WARN("Could not load d3d9.dll\n"); - CoTaskMemFree(pVMR); + free(object); return VFW_E_DDRAW_CAPS_NOT_SUITABLE; } - pVMR->IAMCertifiedOutputProtection_iface.lpVtbl = &IAMCertifiedOutputProtection_Vtbl; - pVMR->IAMFilterMiscFlags_iface.lpVtbl = &IAMFilterMiscFlags_Vtbl; - - pVMR->mode = 0; - pVMR->allocator_d3d9_dev = NULL; - pVMR->allocator_mon= NULL; - pVMR->num_surfaces = pVMR->cur_surface = 0; - pVMR->allocator = NULL; - pVMR->presenter = NULL; - pVMR->hWndClippingWindow = NULL; - pVMR->IVMRFilterConfig_iface.lpVtbl = &VMR7_FilterConfig_Vtbl; - pVMR->IVMRFilterConfig9_iface.lpVtbl = &VMR9_FilterConfig_Vtbl; - pVMR->IVMRMonitorConfig_iface.lpVtbl = &VMR7_MonitorConfig_Vtbl; - pVMR->IVMRMonitorConfig9_iface.lpVtbl = &VMR9_MonitorConfig_Vtbl; - pVMR->IVMRSurfaceAllocatorNotify_iface.lpVtbl = &VMR7_SurfaceAllocatorNotify_Vtbl; - pVMR->IVMRSurfaceAllocatorNotify9_iface.lpVtbl = &VMR9_SurfaceAllocatorNotify_Vtbl; - pVMR->IVMRWindowlessControl_iface.lpVtbl = &VMR7_WindowlessControl_Vtbl; - pVMR->IVMRWindowlessControl9_iface.lpVtbl = &VMR9_WindowlessControl_Vtbl; - pVMR->IOverlay_iface.lpVtbl = &overlay_vtbl; - - strmbase_renderer_init(&pVMR->renderer, outer, clsid, L"VMR Input0", &renderer_ops); - - hr = video_window_init(&pVMR->baseControlWindow, &IVideoWindow_VTable, - &pVMR->renderer.filter, &pVMR->renderer.sink.pin, &renderer_BaseWindowFuncTable); + strmbase_renderer_init(&object->renderer, outer, clsid, L"VMR Input0", &renderer_ops); + object->IAMCertifiedOutputProtection_iface.lpVtbl = &IAMCertifiedOutputProtection_Vtbl; + object->IAMFilterMiscFlags_iface.lpVtbl = &IAMFilterMiscFlags_Vtbl; + object->IVMRFilterConfig_iface.lpVtbl = &VMR7_FilterConfig_Vtbl; + object->IVMRFilterConfig9_iface.lpVtbl = &VMR9_FilterConfig_Vtbl; + object->IVMRMonitorConfig_iface.lpVtbl = &VMR7_MonitorConfig_Vtbl; + object->IVMRMonitorConfig9_iface.lpVtbl = &VMR9_MonitorConfig_Vtbl; + object->IVMRSurfaceAllocatorNotify_iface.lpVtbl = &VMR7_SurfaceAllocatorNotify_Vtbl; + object->IVMRSurfaceAllocatorNotify9_iface.lpVtbl = &VMR9_SurfaceAllocatorNotify_Vtbl; + object->IVMRWindowlessControl_iface.lpVtbl = &VMR7_WindowlessControl_Vtbl; + object->IVMRWindowlessControl9_iface.lpVtbl = &VMR9_WindowlessControl_Vtbl; + object->IOverlay_iface.lpVtbl = &overlay_vtbl; + + hr = video_window_init(&object->baseControlWindow, &IVideoWindow_VTable, + &object->renderer.filter, &object->renderer.sink.pin, &renderer_BaseWindowFuncTable); if (FAILED(hr)) goto fail; - if (FAILED(hr = BaseWindowImpl_PrepareWindow(&pVMR->baseControlWindow.baseWindow))) + if (FAILED(hr = BaseWindowImpl_PrepareWindow(&object->baseControlWindow.baseWindow))) goto fail; - hr = basic_video_init(&pVMR->baseControlVideo, &pVMR->renderer.filter, - &pVMR->renderer.sink.pin, &renderer_BaseControlVideoFuncTable); + hr = basic_video_init(&object->baseControlVideo, &object->renderer.filter, + &object->renderer.sink.pin, &renderer_BaseControlVideoFuncTable); if (FAILED(hr)) goto fail; - pVMR->run_event = CreateEventW(NULL, TRUE, FALSE, NULL); + object->run_event = CreateEventW(NULL, TRUE, FALSE, NULL); - *out = &pVMR->renderer.filter.IUnknown_inner; - ZeroMemory(&pVMR->source_rect, sizeof(RECT)); - ZeroMemory(&pVMR->target_rect, sizeof(RECT)); - TRACE("Created at %p\n", pVMR); + TRACE("Created VMR %p.\n", object); + *out = &object->renderer.filter.IUnknown_inner; return hr; fail: - BaseWindowImpl_DoneWithWindow(&pVMR->baseControlWindow.baseWindow); - strmbase_renderer_cleanup(&pVMR->renderer); - FreeLibrary(pVMR->hD3d9); - CoTaskMemFree(pVMR); + BaseWindowImpl_DoneWithWindow(&object->baseControlWindow.baseWindow); + strmbase_renderer_cleanup(&object->renderer); + FreeLibrary(object->hD3d9); + free(object); return hr; } @@ -2423,7 +2411,7 @@ static ULONG WINAPI VMR9_ImagePresenter_Release(IVMRImagePresenter9 *iface) IDirect3DSurface9_Release(surface); } - CoTaskMemFree(This->d3d9_surfaces); + free(This->d3d9_surfaces); This->d3d9_surfaces = NULL; This->num_surfaces = 0; if (This->d3d9_vertex) @@ -2431,7 +2419,7 @@ static ULONG WINAPI VMR9_ImagePresenter_Release(IVMRImagePresenter9 *iface) IDirect3DVertexBuffer9_Release(This->d3d9_vertex); This->d3d9_vertex = NULL; } - CoTaskMemFree(This); + free(This); return 0; } return refCount; @@ -2699,8 +2687,8 @@ static BOOL CreateRenderingWindow(VMR9DefaultAllocatorPresenterImpl *This, VMR9A } IVMRSurfaceAllocatorNotify9_SetD3DDevice(This->SurfaceAllocatorNotify, This->d3d9_dev, This->hMon); - This->d3d9_surfaces = CoTaskMemAlloc(*numbuffers * sizeof(IDirect3DSurface9 *)); - ZeroMemory(This->d3d9_surfaces, *numbuffers * sizeof(IDirect3DSurface9 *)); + if (!(This->d3d9_surfaces = calloc(*numbuffers, sizeof(IDirect3DSurface9 *)))) + return FALSE; hr = VMR9_SurfaceAllocator_SetAllocationSettings(This, info); if (FAILED(hr)) @@ -2915,19 +2903,18 @@ static IDirect3D9 *init_d3d9(HMODULE d3d9_handle) static HRESULT VMR9DefaultAllocatorPresenterImpl_create(struct quartz_vmr *parent, LPVOID * ppv) { + VMR9DefaultAllocatorPresenterImpl *object; HRESULT hr = S_OK; int i; - VMR9DefaultAllocatorPresenterImpl* This; - This = CoTaskMemAlloc(sizeof(VMR9DefaultAllocatorPresenterImpl)); - if (!This) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; - This->d3d9_ptr = init_d3d9(parent->hD3d9); - if (!This->d3d9_ptr) + object->d3d9_ptr = init_d3d9(parent->hD3d9); + if (!object->d3d9_ptr) { WARN("Could not initialize d3d9.dll\n"); - CoTaskMemFree(This); + free(object); return VFW_E_DDRAW_CAPS_NOT_SUITABLE; } @@ -2936,7 +2923,7 @@ static HRESULT VMR9DefaultAllocatorPresenterImpl_create(struct quartz_vmr *paren { D3DDISPLAYMODE mode; - hr = IDirect3D9_EnumAdapterModes(This->d3d9_ptr, i++, D3DFMT_X8R8G8B8, 0, &mode); + hr = IDirect3D9_EnumAdapterModes(object->d3d9_ptr, i++, D3DFMT_X8R8G8B8, 0, &mode); if (hr == D3DERR_INVALIDCALL) break; /* out of adapters */ } while (FAILED(hr)); if (FAILED(hr)) @@ -2944,24 +2931,18 @@ static HRESULT VMR9DefaultAllocatorPresenterImpl_create(struct quartz_vmr *paren if (hr == D3DERR_NOTAVAILABLE) { ERR("Format not supported\n"); - IDirect3D9_Release(This->d3d9_ptr); - CoTaskMemFree(This); + IDirect3D9_Release(object->d3d9_ptr); + free(object); return VFW_E_DDRAW_CAPS_NOT_SUITABLE; } - This->IVMRImagePresenter9_iface.lpVtbl = &VMR9_ImagePresenter; - This->IVMRSurfaceAllocatorEx9_iface.lpVtbl = &VMR9_SurfaceAllocator; + object->IVMRImagePresenter9_iface.lpVtbl = &VMR9_ImagePresenter; + object->IVMRSurfaceAllocatorEx9_iface.lpVtbl = &VMR9_SurfaceAllocator; - This->refCount = 1; - This->pVMR9 = parent; - This->d3d9_surfaces = NULL; - This->d3d9_dev = NULL; - This->hMon = 0; - This->d3d9_vertex = NULL; - This->num_surfaces = 0; - This->SurfaceAllocatorNotify = NULL; - This->reset = FALSE; + object->refCount = 1; + object->pVMR9 = parent; - *ppv = &This->IVMRImagePresenter9_iface; + TRACE("Created default presenter %p.\n", object); + *ppv = &object->IVMRImagePresenter9_iface; return S_OK; }

1 0

Zebediah Figura : quartz/vmr9: Get rid of the VMR9DefaultAllocatorPresenterImpl typedef.
by Alexandre Julliard 02 Apr '20

02 Apr '20

Module: wine Branch: master Commit: 4820290ac0081e1705922e678c81079e6e7ddcf1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4820290ac0081e1705922e67… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 1 23:01:04 2020 -0500 quartz/vmr9: Get rid of the VMR9DefaultAllocatorPresenterImpl typedef. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/vmr9.c | 49 +++++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 58fbef5433..07a3dbc241 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -151,7 +151,7 @@ static inline struct quartz_vmr *impl_from_IVMRWindowlessControl9(IVMRWindowless return CONTAINING_RECORD(iface, struct quartz_vmr, IVMRWindowlessControl9_iface); } -typedef struct +struct default_presenter { IVMRImagePresenter9 IVMRImagePresenter9_iface; IVMRSurfaceAllocatorEx9 IVMRSurfaceAllocatorEx9_iface; @@ -170,16 +170,16 @@ typedef struct struct quartz_vmr* pVMR9; IVMRSurfaceAllocatorNotify9 *SurfaceAllocatorNotify; -} VMR9DefaultAllocatorPresenterImpl; +}; -static inline VMR9DefaultAllocatorPresenterImpl *impl_from_IVMRImagePresenter9( IVMRImagePresenter9 *iface) +static inline struct default_presenter *impl_from_IVMRImagePresenter9(IVMRImagePresenter9 *iface) { - return CONTAINING_RECORD(iface, VMR9DefaultAllocatorPresenterImpl, IVMRImagePresenter9_iface); + return CONTAINING_RECORD(iface, struct default_presenter, IVMRImagePresenter9_iface); } -static inline VMR9DefaultAllocatorPresenterImpl *impl_from_IVMRSurfaceAllocatorEx9( IVMRSurfaceAllocatorEx9 *iface) +static inline struct default_presenter *impl_from_IVMRSurfaceAllocatorEx9(IVMRSurfaceAllocatorEx9 *iface) { - return CONTAINING_RECORD(iface, VMR9DefaultAllocatorPresenterImpl, IVMRSurfaceAllocatorEx9_iface); + return CONTAINING_RECORD(iface, struct default_presenter, IVMRSurfaceAllocatorEx9_iface); } static HRESULT VMR9DefaultAllocatorPresenterImpl_create(struct quartz_vmr *parent, LPVOID * ppv); @@ -2358,7 +2358,8 @@ HRESULT vmr9_create(IUnknown *outer, IUnknown **out) static HRESULT WINAPI VMR9_ImagePresenter_QueryInterface(IVMRImagePresenter9 *iface, REFIID riid, void **ppv) { - VMR9DefaultAllocatorPresenterImpl *This = impl_from_IVMRImagePresenter9(iface); + struct default_presenter *This = impl_from_IVMRImagePresenter9(iface); + TRACE("(%p/%p)->(%s, %p)\n", This, iface, qzdebugstr_guid(riid), ppv); *ppv = NULL; @@ -2381,7 +2382,7 @@ static HRESULT WINAPI VMR9_ImagePresenter_QueryInterface(IVMRImagePresenter9 *if static ULONG WINAPI VMR9_ImagePresenter_AddRef(IVMRImagePresenter9 *iface) { - VMR9DefaultAllocatorPresenterImpl *This = impl_from_IVMRImagePresenter9(iface); + struct default_presenter *This = impl_from_IVMRImagePresenter9(iface); ULONG refCount = InterlockedIncrement(&This->refCount); TRACE("(%p)->() AddRef from %d\n", iface, refCount - 1); @@ -2391,7 +2392,7 @@ static ULONG WINAPI VMR9_ImagePresenter_AddRef(IVMRImagePresenter9 *iface) static ULONG WINAPI VMR9_ImagePresenter_Release(IVMRImagePresenter9 *iface) { - VMR9DefaultAllocatorPresenterImpl *This = impl_from_IVMRImagePresenter9(iface); + struct default_presenter *This = impl_from_IVMRImagePresenter9(iface); ULONG refCount = InterlockedDecrement(&This->refCount); TRACE("(%p)->() Release from %d\n", iface, refCount + 1); @@ -2427,7 +2428,7 @@ static ULONG WINAPI VMR9_ImagePresenter_Release(IVMRImagePresenter9 *iface) static HRESULT WINAPI VMR9_ImagePresenter_StartPresenting(IVMRImagePresenter9 *iface, DWORD_PTR id) { - VMR9DefaultAllocatorPresenterImpl *This = impl_from_IVMRImagePresenter9(iface); + struct default_presenter *This = impl_from_IVMRImagePresenter9(iface); TRACE("(%p/%p/%p)->(...) stub\n", iface, This,This->pVMR9); return S_OK; @@ -2435,7 +2436,7 @@ static HRESULT WINAPI VMR9_ImagePresenter_StartPresenting(IVMRImagePresenter9 *i static HRESULT WINAPI VMR9_ImagePresenter_StopPresenting(IVMRImagePresenter9 *iface, DWORD_PTR id) { - VMR9DefaultAllocatorPresenterImpl *This = impl_from_IVMRImagePresenter9(iface); + struct default_presenter *This = impl_from_IVMRImagePresenter9(iface); TRACE("(%p/%p/%p)->(...) stub\n", iface, This,This->pVMR9); return S_OK; @@ -2444,7 +2445,7 @@ static HRESULT WINAPI VMR9_ImagePresenter_StopPresenting(IVMRImagePresenter9 *if #define USED_FVF (D3DFVF_XYZRHW | D3DFVF_TEX1) struct VERTEX { float x, y, z, rhw, u, v; }; -static HRESULT VMR9_ImagePresenter_PresentTexture(VMR9DefaultAllocatorPresenterImpl *This, IDirect3DSurface9 *surface) +static HRESULT VMR9_ImagePresenter_PresentTexture(struct default_presenter *This, IDirect3DSurface9 *surface) { IDirect3DTexture9 *texture = NULL; HRESULT hr; @@ -2487,7 +2488,7 @@ static HRESULT VMR9_ImagePresenter_PresentTexture(VMR9DefaultAllocatorPresenterI return S_OK; } -static HRESULT VMR9_ImagePresenter_PresentOffscreenSurface(VMR9DefaultAllocatorPresenterImpl *This, IDirect3DSurface9 *surface) +static HRESULT VMR9_ImagePresenter_PresentOffscreenSurface(struct default_presenter *This, IDirect3DSurface9 *surface) { HRESULT hr; IDirect3DSurface9 *target = NULL; @@ -2514,7 +2515,7 @@ static HRESULT VMR9_ImagePresenter_PresentOffscreenSurface(VMR9DefaultAllocatorP static HRESULT WINAPI VMR9_ImagePresenter_PresentImage(IVMRImagePresenter9 *iface, DWORD_PTR id, VMR9PresentationInfo *info) { - VMR9DefaultAllocatorPresenterImpl *This = impl_from_IVMRImagePresenter9(iface); + struct default_presenter *This = impl_from_IVMRImagePresenter9(iface); HRESULT hr; RECT output; BOOL render = FALSE; @@ -2565,26 +2566,26 @@ static const IVMRImagePresenter9Vtbl VMR9_ImagePresenter = static HRESULT WINAPI VMR9_SurfaceAllocator_QueryInterface(IVMRSurfaceAllocatorEx9 *iface, REFIID riid, LPVOID * ppv) { - VMR9DefaultAllocatorPresenterImpl *This = impl_from_IVMRSurfaceAllocatorEx9(iface); + struct default_presenter *This = impl_from_IVMRSurfaceAllocatorEx9(iface); return VMR9_ImagePresenter_QueryInterface(&This->IVMRImagePresenter9_iface, riid, ppv); } static ULONG WINAPI VMR9_SurfaceAllocator_AddRef(IVMRSurfaceAllocatorEx9 *iface) { - VMR9DefaultAllocatorPresenterImpl *This = impl_from_IVMRSurfaceAllocatorEx9(iface); + struct default_presenter *This = impl_from_IVMRSurfaceAllocatorEx9(iface); return VMR9_ImagePresenter_AddRef(&This->IVMRImagePresenter9_iface); } static ULONG WINAPI VMR9_SurfaceAllocator_Release(IVMRSurfaceAllocatorEx9 *iface) { - VMR9DefaultAllocatorPresenterImpl *This = impl_from_IVMRSurfaceAllocatorEx9(iface); + struct default_presenter *This = impl_from_IVMRSurfaceAllocatorEx9(iface); return VMR9_ImagePresenter_Release(&This->IVMRImagePresenter9_iface); } -static HRESULT VMR9_SurfaceAllocator_SetAllocationSettings(VMR9DefaultAllocatorPresenterImpl *This, VMR9AllocationInfo *allocinfo) +static HRESULT VMR9_SurfaceAllocator_SetAllocationSettings(struct default_presenter *This, VMR9AllocationInfo *allocinfo) { D3DCAPS9 caps; UINT width, height; @@ -2660,7 +2661,7 @@ static UINT d3d9_adapter_from_hwnd(IDirect3D9 *d3d9, HWND hwnd, HMONITOR *mon_ou return d3d9_adapter; } -static BOOL CreateRenderingWindow(VMR9DefaultAllocatorPresenterImpl *This, VMR9AllocationInfo *info, DWORD *numbuffers) +static BOOL CreateRenderingWindow(struct default_presenter *This, VMR9AllocationInfo *info, DWORD *numbuffers) { D3DPRESENT_PARAMETERS d3dpp; DWORD d3d9_adapter; @@ -2714,7 +2715,7 @@ static BOOL CreateRenderingWindow(VMR9DefaultAllocatorPresenterImpl *This, VMR9A static HRESULT WINAPI VMR9_SurfaceAllocator_InitializeDevice(IVMRSurfaceAllocatorEx9 *iface, DWORD_PTR id, VMR9AllocationInfo *allocinfo, DWORD *numbuffers) { - VMR9DefaultAllocatorPresenterImpl *This = impl_from_IVMRSurfaceAllocatorEx9(iface); + struct default_presenter *This = impl_from_IVMRSurfaceAllocatorEx9(iface); if (This->pVMR9->mode != VMR9Mode_Windowed && !This->pVMR9->hWndClippingWindow) { @@ -2741,7 +2742,7 @@ static HRESULT WINAPI VMR9_SurfaceAllocator_TerminateDevice(IVMRSurfaceAllocator } /* Recreate all surfaces (If allocated as D3DPOOL_DEFAULT) and survive! */ -static HRESULT VMR9_SurfaceAllocator_UpdateDeviceReset(VMR9DefaultAllocatorPresenterImpl *This) +static HRESULT VMR9_SurfaceAllocator_UpdateDeviceReset(struct default_presenter *This) { struct VERTEX t_vert[4]; UINT width, height; @@ -2846,7 +2847,7 @@ static HRESULT VMR9_SurfaceAllocator_UpdateDeviceReset(VMR9DefaultAllocatorPrese static HRESULT WINAPI VMR9_SurfaceAllocator_GetSurface(IVMRSurfaceAllocatorEx9 *iface, DWORD_PTR id, DWORD surfaceindex, DWORD flags, IDirect3DSurface9 **surface) { - VMR9DefaultAllocatorPresenterImpl *This = impl_from_IVMRSurfaceAllocatorEx9(iface); + struct default_presenter *This = impl_from_IVMRSurfaceAllocatorEx9(iface); /* Update everything first, this is needed because the surface might be destroyed in the reset */ if (!This->d3d9_dev) @@ -2870,7 +2871,7 @@ static HRESULT WINAPI VMR9_SurfaceAllocator_GetSurface(IVMRSurfaceAllocatorEx9 * static HRESULT WINAPI VMR9_SurfaceAllocator_AdviseNotify(IVMRSurfaceAllocatorEx9 *iface, IVMRSurfaceAllocatorNotify9 *allocnotify) { - VMR9DefaultAllocatorPresenterImpl *This = impl_from_IVMRSurfaceAllocatorEx9(iface); + struct default_presenter *This = impl_from_IVMRSurfaceAllocatorEx9(iface); TRACE("(%p/%p)->(...)\n", iface, This); @@ -2903,7 +2904,7 @@ static IDirect3D9 *init_d3d9(HMODULE d3d9_handle) static HRESULT VMR9DefaultAllocatorPresenterImpl_create(struct quartz_vmr *parent, LPVOID * ppv) { - VMR9DefaultAllocatorPresenterImpl *object; + struct default_presenter *object; HRESULT hr = S_OK; int i;

1 0