June 2019 - Wine-Commits - list.winehq.org

Nikolay Sivov : mfplat: Improve PROPVARIANT arguments traces.
by Alexandre Julliard June 25, 2019

June 25, 2019

Module: wine Branch: master Commit: 808fe2542c46708d408cf916a763761a95019e77 URL: https://source.winehq.org/git/wine.git/?a=commit;h=808fe2542c46708d408cf916… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 25 14:05:50 2019 +0300 mfplat: Improve PROPVARIANT arguments traces. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mfplat_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mfplat/mfplat_private.h b/dlls/mfplat/mfplat_private.h index 57e4211..6418afc 100644 --- a/dlls/mfplat/mfplat_private.h +++ b/dlls/mfplat/mfplat_private.h @@ -136,7 +136,7 @@ static inline const char *debugstr_propvar(const PROPVARIANT *v) case VT_R8: return wine_dbg_sprintf("%p {VT_R8: %lf}", v, v->u.dblVal); case VT_CLSID: - return wine_dbg_sprintf("%p {VT_CLSID: %s}", v, debugstr_guid(v->u.puuid)); + return wine_dbg_sprintf("%p {VT_CLSID: %s}", v, debugstr_mf_guid(v->u.puuid)); case VT_LPWSTR: return wine_dbg_sprintf("%p {VT_LPWSTR: %s}", v, wine_dbgstr_w(v->u.pwszVal)); case VT_VECTOR | VT_UI1:

1 0

Alexandre Julliard : winebuild: Set the default entry point also for Windows builds.
by Alexandre Julliard June 25, 2019

June 25, 2019

Module: wine Branch: master Commit: 907896fba57f1c1ca6f0d9ca3379dc7ccabd8285 URL: https://source.winehq.org/git/wine.git/?a=commit;h=907896fba57f1c1ca6f0d9ca… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 25 17:36:44 2019 +0200 winebuild: Set the default entry point also for Windows builds. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47410 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/import.c | 10 ---------- tools/winebuild/main.c | 10 ++++++++++ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 8c32b73..7d3c725 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -456,15 +456,6 @@ static void add_undef_import( const char *name, int is_ordinal ) add_import_func( import, xstrdup( p ), NULL, ordinal, 0 ); } -/* get the default entry point for a given spec file */ -static const char *get_default_entry_point( const DLLSPEC *spec ) -{ - if (spec->characteristics & IMAGE_FILE_DLL) return "__wine_spec_dll_entry"; - if (spec->subsystem == IMAGE_SUBSYSTEM_NATIVE) return "__wine_spec_drv_entry"; - if (spec->type == SPEC_WIN16) return "__wine_spec_exe16_entry"; - return "__wine_spec_exe_entry"; -} - /* check if the spec file exports any stubs */ static int has_stubs( const DLLSPEC *spec ) { @@ -480,7 +471,6 @@ static int has_stubs( const DLLSPEC *spec ) /* add the extra undefined symbols that will be contained in the generated spec file itself */ static void add_extra_undef_symbols( DLLSPEC *spec ) { - if (!spec->init_func) spec->init_func = xstrdup( get_default_entry_point(spec) ); add_extra_ld_symbol( spec->init_func ); if (has_stubs( spec )) add_extra_ld_symbol( "__wine_spec_unimplemented_stub" ); if (delayed_imports.count) add_extra_ld_symbol( "__wine_spec_delay_load" ); diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 2539577..0a5becd 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -369,6 +369,15 @@ static void set_exec_mode( enum exec_mode_values mode ) exec_mode = mode; } +/* get the default entry point for a given spec file */ +static const char *get_default_entry_point( const DLLSPEC *spec ) +{ + if (spec->characteristics & IMAGE_FILE_DLL) return "__wine_spec_dll_entry"; + if (spec->subsystem == IMAGE_SUBSYSTEM_NATIVE) return "__wine_spec_drv_entry"; + if (spec->type == SPEC_WIN16) return "__wine_spec_exe16_entry"; + return "__wine_spec_exe_entry"; +} + /* parse options from the argv array and remove all the recognized ones */ static char **parse_options( int argc, char **argv, DLLSPEC *spec ) { @@ -633,6 +642,7 @@ int main(int argc, char **argv) case MODE_EXE: load_resources( argv, spec ); if (spec_file_name && !parse_input_file( spec )) break; + if (!spec->init_func) spec->init_func = xstrdup( get_default_entry_point( spec )); if (fake_module) {

1 0

Alexandre Julliard : advapi32: Move registry functions to kernelbase.
by Alexandre Julliard June 25, 2019

June 25, 2019

Module: wine Branch: master Commit: c7548d6c4fcc37844503f67d41e2a4bc2e429dcc URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7548d6c4fcc37844503f67d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 25 12:34:15 2019 +0200 advapi32: Move registry functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/Makefile.in | 1 + dlls/advapi32/advapi32.spec | 94 +- dlls/advapi32/registry.c | 3545 +++------------------------------------ dlls/kernelbase/kernelbase.spec | 98 +- dlls/kernelbase/main.c | 2 +- dlls/kernelbase/registry.c | 3112 +++++++++++++++++++++++++++++++++- include/winreg.h | 3 + 7 files changed, 3424 insertions(+), 3431 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c7548d6c4fcc37844503…

1 0

Zebediah Figura : ntoskrnl.exe: Load a driver' s root PnP devices when the driver is started.
by Alexandre Julliard June 25, 2019

June 25, 2019

Module: wine Branch: master Commit: b06740ecde72974bb709281dfac8709b9ec986b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b06740ecde72974bb709281d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Jun 22 10:12:32 2019 -0500 ntoskrnl.exe: Load a driver's root PnP devices when the driver is started. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 2 + dlls/ntoskrnl.exe/ntoskrnl_private.h | 1 + dlls/ntoskrnl.exe/pnp.c | 109 ++++++++++++++++++++++++++++++++--- 3 files changed, 103 insertions(+), 9 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 5839072..92f9afa 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3648,6 +3648,8 @@ NTSTATUS WINAPI ZwLoadDriver( const UNICODE_STRING *service_name ) driver = WINE_RB_ENTRY_VALUE( entry, struct wine_driver, entry ); driver->service_handle = service_handle; + pnp_manager_enumerate_root_devices( service_name->Buffer + wcslen( servicesW ) ); + set_service_status( service_handle, SERVICE_RUNNING, SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN ); return STATUS_SUCCESS; diff --git a/dlls/ntoskrnl.exe/ntoskrnl_private.h b/dlls/ntoskrnl.exe/ntoskrnl_private.h index 1c5952f..b5244ef 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl_private.h +++ b/dlls/ntoskrnl.exe/ntoskrnl_private.h @@ -76,6 +76,7 @@ extern POBJECT_TYPE SeTokenObjectType; void ObReferenceObject( void *obj ) DECLSPEC_HIDDEN; +void pnp_manager_enumerate_root_devices( const WCHAR *driver_name ) DECLSPEC_HIDDEN; void pnp_manager_start(void) DECLSPEC_HIDDEN; void pnp_manager_stop(void) DECLSPEC_HIDDEN; diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index 6f2283b..48430f3 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -375,6 +375,18 @@ static BOOL install_device_driver( DEVICE_OBJECT *device, HDEVINFO set, SP_DEVIN return TRUE; } +/* Load the function driver for a newly created PDO, if one is present, and + * send IRPs to start the device. */ +static void start_device( DEVICE_OBJECT *device, HDEVINFO set, SP_DEVINFO_DATA *sp_device ) +{ + load_function_driver( device, set, sp_device ); + if (device->DriverObject) + { + send_pnp_irp( device, IRP_MN_START_DEVICE ); + send_power_irp( device, PowerDeviceD0 ); + } +} + static void handle_bus_relations( DEVICE_OBJECT *device ) { static const WCHAR infpathW[] = {'I','n','f','P','a','t','h',0}; @@ -420,19 +432,14 @@ static void handle_bus_relations( DEVICE_OBJECT *device ) return; } - load_function_driver( device, set, &sp_device ); - if (device->DriverObject) - { - send_pnp_irp( device, IRP_MN_START_DEVICE ); - send_power_irp( device, PowerDeviceD0 ); - } + start_device( device, set, &sp_device ); SetupDiDestroyDeviceInfoList( set ); } -static void handle_removal_relations( DEVICE_OBJECT *device ) +static void remove_device( DEVICE_OBJECT *device ) { - TRACE( "(%p)\n", device ); + TRACE("Removing device %p.\n", device); send_power_irp( device, PowerDeviceD3 ); send_pnp_irp( device, IRP_MN_SURPRISE_REMOVAL ); @@ -452,7 +459,7 @@ void WINAPI IoInvalidateDeviceRelations( DEVICE_OBJECT *device_object, DEVICE_RE handle_bus_relations( device_object ); break; case RemovalRelations: - handle_removal_relations( device_object ); + remove_device( device_object ); break; default: FIXME("Unhandled relation %#x.\n", type); @@ -755,6 +762,23 @@ POWER_STATE WINAPI PoSetPowerState( DEVICE_OBJECT *device, POWER_STATE_TYPE type static DRIVER_OBJECT *pnp_manager; +struct root_pnp_device +{ + WCHAR id[MAX_DEVICE_ID_LEN]; + struct wine_rb_entry entry; + DEVICE_OBJECT *device; +}; + +static int root_pnp_devices_rb_compare( const void *key, const struct wine_rb_entry *entry ) +{ + const struct root_pnp_device *device = WINE_RB_ENTRY_VALUE( entry, const struct root_pnp_device, entry ); + const WCHAR *k = key; + + return wcsicmp( k, device->id ); +} + +static struct wine_rb_tree root_pnp_devices = { root_pnp_devices_rb_compare }; + static NTSTATUS WINAPI pnp_manager_device_pnp( DEVICE_OBJECT *device, IRP *irp ) { IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation( irp ); @@ -783,7 +807,74 @@ void pnp_manager_start(void) ERR("Failed to create PnP manager driver, status %#x.\n", status); } +static void destroy_root_pnp_device( struct wine_rb_entry *entry, void *context ) +{ + struct root_pnp_device *device = WINE_RB_ENTRY_VALUE(entry, struct root_pnp_device, entry); + remove_device( device->device ); +} + void pnp_manager_stop(void) { + wine_rb_destroy( &root_pnp_devices, destroy_root_pnp_device, NULL ); IoDeleteDriver( pnp_manager ); } + +void pnp_manager_enumerate_root_devices( const WCHAR *driver_name ) +{ + static const WCHAR driverW[] = {'\\','D','r','i','v','e','r','\\',0}; + static const WCHAR rootW[] = {'R','O','O','T',0}; + WCHAR buffer[MAX_SERVICE_NAME + ARRAY_SIZE(driverW)], id[MAX_DEVICE_ID_LEN]; + SP_DEVINFO_DATA sp_device = {sizeof(sp_device)}; + struct root_pnp_device *pnp_device; + DEVICE_OBJECT *device; + NTSTATUS status; + unsigned int i; + HDEVINFO set; + + TRACE("Searching for new root-enumerated devices for driver %s.\n", debugstr_w(driver_name)); + + set = SetupDiGetClassDevsW( NULL, rootW, NULL, DIGCF_ALLCLASSES ); + if (set == INVALID_HANDLE_VALUE) + { + ERR("Failed to build device set, error %#x.\n", GetLastError()); + return; + } + + for (i = 0; SetupDiEnumDeviceInfo( set, i, &sp_device ); ++i) + { + if (!SetupDiGetDeviceRegistryPropertyW( set, &sp_device, SPDRP_SERVICE, + NULL, (BYTE *)buffer, sizeof(buffer), NULL ) + || lstrcmpiW( buffer, driver_name )) + { + continue; + } + + SetupDiGetDeviceInstanceIdW( set, &sp_device, id, ARRAY_SIZE(id), NULL ); + + if (wine_rb_get( &root_pnp_devices, id )) + continue; + + TRACE("Adding new root-enumerated device %s.\n", debugstr_w(id)); + + if ((status = IoCreateDevice( pnp_manager, sizeof(struct root_pnp_device), NULL, + FILE_DEVICE_CONTROLLER, FILE_AUTOGENERATED_DEVICE_NAME, FALSE, &device ))) + { + ERR("Failed to create root-enumerated PnP device %s, status %#x.\n", debugstr_w(id), status); + continue; + } + + pnp_device = device->DeviceExtension; + wcscpy( pnp_device->id, id ); + pnp_device->device = device; + if (wine_rb_put( &root_pnp_devices, id, &pnp_device->entry )) + { + ERR("Failed to insert device %s into tree.\n", debugstr_w(id)); + IoDeleteDevice( device ); + continue; + } + + start_device( device, set, &sp_device ); + } + + SetupDiDestroyDeviceInfoList(set); +}

1 0

Zebediah Figura : ntoskrnl.exe: Add a stub PnP manager driver.
by Alexandre Julliard June 25, 2019

June 25, 2019

Module: wine Branch: master Commit: d4c91cc6f99b3f46df142bc92225150a18a2a11f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4c91cc6f99b3f46df142bc9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Jun 22 10:12:31 2019 -0500 ntoskrnl.exe: Add a stub PnP manager driver. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 5 +++++ dlls/ntoskrnl.exe/ntoskrnl_private.h | 3 +++ dlls/ntoskrnl.exe/pnp.c | 36 ++++++++++++++++++++++++++++++++++++ 3 files changed, 44 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 209410c..5839072 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -850,6 +850,8 @@ NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ) PsInitialSystemProcess = IoGetCurrentProcess(); request_thread = GetCurrentThreadId(); + pnp_manager_start(); + handles[0] = stop_event; handles[1] = manager; @@ -917,6 +919,9 @@ NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ) } done: + /* Native PnP drivers expect that all of their devices will be removed when + * their unload routine is called, so we must stop the PnP manager first. */ + pnp_manager_stop(); wine_rb_destroy( &wine_drivers, unload_driver, NULL ); return status; } diff --git a/dlls/ntoskrnl.exe/ntoskrnl_private.h b/dlls/ntoskrnl.exe/ntoskrnl_private.h index 2823a1c..1c5952f 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl_private.h +++ b/dlls/ntoskrnl.exe/ntoskrnl_private.h @@ -76,6 +76,9 @@ extern POBJECT_TYPE SeTokenObjectType; void ObReferenceObject( void *obj ) DECLSPEC_HIDDEN; +void pnp_manager_start(void) DECLSPEC_HIDDEN; +void pnp_manager_stop(void) DECLSPEC_HIDDEN; + static const WCHAR servicesW[] = {'\\','R','e','g','i','s','t','r','y', '\\','M','a','c','h','i','n','e', '\\','S','y','s','t','e','m', diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index e1b348b..6f2283b 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -3,6 +3,7 @@ * * Copyright 2016 Sebastian Lackner * Copyright 2016 Aric Stewart for CodeWeavers + * Copyright 2019 Zebediah Figura * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -751,3 +752,38 @@ POWER_STATE WINAPI PoSetPowerState( DEVICE_OBJECT *device, POWER_STATE_TYPE type FIXME("device %p, type %u, state %u, stub!\n", device, type, state.DeviceState); return state; } + +static DRIVER_OBJECT *pnp_manager; + +static NTSTATUS WINAPI pnp_manager_device_pnp( DEVICE_OBJECT *device, IRP *irp ) +{ + IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation( irp ); + + TRACE("device %p, irp %p, minor function %#x.\n", device, irp, stack->MinorFunction); + + IoCompleteRequest( irp, IO_NO_INCREMENT ); + return irp->IoStatus.u.Status; +} + +static NTSTATUS WINAPI pnp_manager_driver_entry( DRIVER_OBJECT *driver, UNICODE_STRING *keypath ) +{ + pnp_manager = driver; + driver->MajorFunction[IRP_MJ_PNP] = pnp_manager_device_pnp; + return STATUS_SUCCESS; +} + +void pnp_manager_start(void) +{ + static const WCHAR driver_nameW[] = {'\\','D','r','i','v','e','r','\\','P','n','p','M','a','n','a','g','e','r',0}; + UNICODE_STRING driver_nameU; + NTSTATUS status; + + RtlInitUnicodeString( &driver_nameU, driver_nameW ); + if ((status = IoCreateDriver( &driver_nameU, pnp_manager_driver_entry ))) + ERR("Failed to create PnP manager driver, status %#x.\n", status); +} + +void pnp_manager_stop(void) +{ + IoDeleteDriver( pnp_manager ); +}

1 0

Zebediah Figura : wined3d: Store the cursor texture in a local variable in swapchain_gl_present().
by Alexandre Julliard June 25, 2019

June 25, 2019

Module: wine Branch: master Commit: d601fd92347fd2032f1e7866ddba661566090674 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d601fd92347fd2032f1e7866… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 24 19:08:36 2019 -0500 wined3d: Store the cursor texture in a local variable in swapchain_gl_present(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47392 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 8d6306e..b75aead 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -428,9 +428,9 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, struct wined3d_texture *back_buffer = swapchain->back_buffers[0]; const struct wined3d_fb_state *fb = &swapchain->device->cs->fb; struct wined3d_rendertarget_view *dsv = fb->depth_stencil; + struct wined3d_texture *logo_texture, *cursor_texture; const struct wined3d_gl_info *gl_info; struct wined3d_context_gl *context_gl; - struct wined3d_texture *logo_texture; struct wined3d_context *context; BOOL render_to_fbo; @@ -456,8 +456,8 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, WINED3D_BLT_SRC_CKEY, NULL, WINED3D_TEXF_POINT); } - if (swapchain->device->bCursorVisible && swapchain->device->cursor_texture - && !swapchain->device->hardwareCursor) + if ((cursor_texture = swapchain->device->cursor_texture) + && swapchain->device->bCursorVisible && !swapchain->device->hardwareCursor) { RECT dst_rect = { @@ -468,9 +468,7 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, }; RECT src_rect = { - 0, 0, - swapchain->device->cursor_texture->resource.width, - swapchain->device->cursor_texture->resource.height + 0, 0, cursor_texture->resource.width, cursor_texture->resource.height }; const RECT clip_rect = {0, 0, back_buffer->resource.width, back_buffer->resource.height}; @@ -479,9 +477,8 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, if (swapchain->desc.windowed) MapWindowPoints(NULL, swapchain->win_handle, (POINT *)&dst_rect, 2); if (wined3d_clip_blit(&clip_rect, &dst_rect, &src_rect)) - wined3d_texture_blt(back_buffer, 0, &dst_rect, - swapchain->device->cursor_texture, 0, &src_rect, - WINED3D_BLT_ALPHA_TEST, NULL, WINED3D_TEXF_POINT); + wined3d_texture_blt(back_buffer, 0, &dst_rect, cursor_texture, 0, + &src_rect, WINED3D_BLT_ALPHA_TEST, NULL, WINED3D_TEXF_POINT); } TRACE("Presenting DC %p.\n", context_gl->dc);

1 0

Nikolay Sivov : mfreadwrite: Add MFCreateSinkWriterFromURL() stub.
by Alexandre Julliard June 25, 2019

June 25, 2019

Module: wine Branch: master Commit: b182ba882cfcce7b8769470f49f0fba216095c45 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b182ba882cfcce7b8769470f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 25 14:05:52 2019 +0300 mfreadwrite: Add MFCreateSinkWriterFromURL() stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 11 +++++++++++ dlls/mfreadwrite/mfreadwrite.spec | 2 +- include/mfreadwrite.idl | 2 ++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index dd92337..3637d2f 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -1464,6 +1464,17 @@ HRESULT WINAPI MFCreateSinkWriterFromMediaSink(IMFMediaSink *sink, IMFAttributes return create_sink_writer_from_sink(sink, attributes, &IID_IMFSinkWriter, (void **)writer); } +/*********************************************************************** + * MFCreateSinkWriterFromURL (mfreadwrite.@) + */ +HRESULT WINAPI MFCreateSinkWriterFromURL(const WCHAR *url, IMFByteStream *bytestream, IMFAttributes *attributes, + IMFSinkWriter **writer) +{ + FIXME("%s, %p, %p, %p.\n", debugstr_w(url), bytestream, attributes, writer); + + return E_NOTIMPL; +} + static HRESULT create_source_reader_from_object(IUnknown *unk, IMFAttributes *attributes, REFIID riid, void **out) { IMFMediaSource *source = NULL; diff --git a/dlls/mfreadwrite/mfreadwrite.spec b/dlls/mfreadwrite/mfreadwrite.spec index 3a215a9..dd585d9 100644 --- a/dlls/mfreadwrite/mfreadwrite.spec +++ b/dlls/mfreadwrite/mfreadwrite.spec @@ -3,7 +3,7 @@ @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() @ stdcall MFCreateSinkWriterFromMediaSink(ptr ptr ptr) -@ stub MFCreateSinkWriterFromURL +@ stdcall MFCreateSinkWriterFromURL(wstr ptr ptr ptr) @ stdcall MFCreateSourceReaderFromByteStream(ptr ptr ptr) @ stdcall MFCreateSourceReaderFromMediaSource(ptr ptr ptr) @ stdcall MFCreateSourceReaderFromURL(wstr ptr ptr) diff --git a/include/mfreadwrite.idl b/include/mfreadwrite.idl index ed09b74..cbfeef8 100644 --- a/include/mfreadwrite.idl +++ b/include/mfreadwrite.idl @@ -185,6 +185,8 @@ interface IMFReadWriteClassFactory : IUnknown cpp_quote( "HRESULT WINAPI MFCreateSinkWriterFromMediaSink(IMFMediaSink *sink, IMFAttributes *attributes," ) cpp_quote( " IMFSinkWriter **writer);" ) +cpp_quote( "HRESULT WINAPI MFCreateSinkWriterFromURL(const WCHAR *url, IMFByteStream *bytestream," ) +cpp_quote( " IMFAttributes *attributes, IMFSinkWriter **writer);" ) cpp_quote( "HRESULT WINAPI MFCreateSourceReaderFromByteStream(IMFByteStream *stream, IMFAttributes *attributes," ) cpp_quote( " IMFSourceReader **reader);" ) cpp_quote( "HRESULT WINAPI MFCreateSourceReaderFromMediaSource(IMFMediaSource *source, IMFAttributes *attributes," )

1 0

Nikolay Sivov : mfplat: Add MF_LOW_LATENCY attribute GUID.
by Alexandre Julliard June 25, 2019

June 25, 2019

Module: wine Branch: master Commit: 4c3e5312426f6aa73093e82c0741c92fa83afa28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c3e5312426f6aa73093e82c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 25 14:05:51 2019 +0300 mfplat: Add MF_LOW_LATENCY attribute GUID. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 3 ++- include/mfapi.h | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 78ae417..45d1677 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -630,6 +630,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_TOPOLOGY_DYNAMIC_CHANGE_NOT_ALLOWED), X(MF_MT_ALPHA_MODE), X(MF_TOPOLOGY_PLAYBACK_MAX_DIMS), + X(MF_LOW_LATENCY), X(MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS), X(MF_MT_PIXEL_ASPECT_RATIO), X(MF_TOPOLOGY_ENABLE_XVP_FOR_PLAYBACK), @@ -721,8 +722,8 @@ const char *debugstr_attr(const GUID *guid) X(MF_TOPONODE_DISABLE_PREROLL), X(MF_MT_VIDEO_3D_FORMAT), X(MF_EVENT_STREAM_METADATA_KEYDATA), - X(MF_SINK_WRITER_D3D_MANAGER), X(MF_SOURCE_READER_D3D_MANAGER), + X(MF_SINK_WRITER_D3D_MANAGER), X(MFSampleExtension_3DVideo), X(MF_EVENT_SOURCE_FAKE_START), X(MF_EVENT_SOURCE_PROJECTSTART), diff --git a/include/mfapi.h b/include/mfapi.h index 6797706..957fb0d 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -320,6 +320,8 @@ DEFINE_GUID(MF_EVENT_STREAM_METADATA_SYSTEMID, 0x1ea2ef64, 0xba16, 0x4a DEFINE_GUID(MF_EVENT_TOPOLOGY_STATUS, 0x30c5018d, 0x9a53, 0x454b, 0xad, 0x9e, 0x6d, 0x5f, 0x8f, 0xa7, 0xc4, 0x3b); DEFINE_GUID(MF_EVENT_OUTPUT_NODE, 0x830f1a8b, 0xc060, 0x46dd, 0xa8, 0x01, 0x1c, 0x95, 0xde, 0xc9, 0xb1, 0x07); +DEFINE_GUID(MF_LOW_LATENCY, 0x9c27891a, 0xed7a, 0x40e1, 0x88, 0xe8, 0xb2, 0x27, 0x27, 0xa0, 0x24, 0xee); + typedef unsigned __int64 MFWORKITEM_KEY; typedef enum

1 0

Alexandre Julliard : advapi32: Move security descriptor functions to kernelbase.
by Alexandre Julliard June 25, 2019

June 25, 2019

Module: wine Branch: master Commit: 0ded44024280316baba41ac9c6458dc1ca3f4f45 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ded44024280316baba41ac9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 25 12:35:52 2019 +0200 advapi32: Move security descriptor functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32.spec | 52 ++--- dlls/advapi32/security.c | 481 ---------------------------------------- dlls/kernelbase/kernelbase.spec | 52 ++--- dlls/kernelbase/security.c | 401 +++++++++++++++++++++++++++++++++ 4 files changed, 453 insertions(+), 533 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0ded44024280316baba4…

1 0

Alexandre Julliard : advapi32: Move token functions to kernelbase.
by Alexandre Julliard June 25, 2019

June 25, 2019

Module: wine Branch: master Commit: 7557620aeb92eba6793ba3f5249c27c8658ace30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7557620aeb92eba6793ba3f5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 25 12:35:37 2019 +0200 advapi32: Move token functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32.spec | 36 +-- dlls/advapi32/security.c | 569 ---------------------------------------- dlls/kernelbase/Makefile.in | 2 +- dlls/kernelbase/kernelbase.spec | 36 +-- dlls/kernelbase/security.c | 352 +++++++++++++++++++++++++ 5 files changed, 389 insertions(+), 606 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7557620aeb92eba6793b…

1 0