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

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

25 Jun '19

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 : setupapi: Delay-load user32.
by Alexandre Julliard 25 Jun '19

25 Jun '19

Module: wine Branch: master Commit: 00e71346329a79b32e6e62e1a4e8003aef8e00a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=00e71346329a79b32e6e62e1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Jun 22 10:12:33 2019 -0500 setupapi: Delay-load user32. We want to load setupapi from services.exe. We do not want to initialize user32 there, as that results in the creation of a window station. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/Makefile.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/Makefile.in b/dlls/setupapi/Makefile.in index bf157cb..6bb9d59 100644 --- a/dlls/setupapi/Makefile.in +++ b/dlls/setupapi/Makefile.in @@ -1,8 +1,8 @@ EXTRADEFS = -D_SETUPAPI_ MODULE = setupapi.dll IMPORTLIB = setupapi -IMPORTS = uuid user32 version advapi32 rpcrt4 -DELAYIMPORTS = shell32 wintrust ole32 winspool comdlg32 +IMPORTS = uuid version advapi32 rpcrt4 +DELAYIMPORTS = shell32 wintrust ole32 winspool comdlg32 user32 C_SRCS = \ devinst.c \

1 0

Zhiyi Zhang : dxgi: Return DXGI_STATUS_OCCLUDED for minimised windows in d3d11_swapchain_present ().
by Alexandre Julliard 25 Jun '19

25 Jun '19

Module: wine Branch: master Commit: 8113aca7623ced28040f3d5acfdea75551ab459f URL: https://source.winehq.org/git/wine.git/?a=commit;h=8113aca7623ced28040f3d5a… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jun 25 02:47:47 2019 +0430 dxgi: Return DXGI_STATUS_OCCLUDED for minimised windows in d3d11_swapchain_present(). 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/dxgi/swapchain.c | 3 +++ dlls/dxgi/tests/dxgi.c | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 1bc59f4..8dbbfab 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -306,6 +306,9 @@ static HRESULT d3d11_swapchain_present(struct d3d11_swapchain *swapchain, return DXGI_ERROR_INVALID_CALL; } + if (IsIconic(d3d11_swapchain_get_hwnd(swapchain))) + return DXGI_STATUS_OCCLUDED; + if (flags & ~DXGI_PRESENT_TEST) FIXME("Unimplemented flags %#x.\n", flags); if (flags & DXGI_PRESENT_TEST) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 51ff440..f5c16a7 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -4073,8 +4073,7 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12) /* Minimised window. */ ShowWindow(swapchain_desc.OutputWindow, SW_MINIMIZE); hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); - todo_wine_if(!is_d3d12) ok(hr == (is_d3d12 ? S_OK : DXGI_STATUS_OCCLUDED), - "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == (is_d3d12 ? S_OK : DXGI_STATUS_OCCLUDED), "Test %u: Got unexpected hr %#x.\n", i, hr); ShowWindow(swapchain_desc.OutputWindow, SW_NORMAL); /* Hidden window. */

1 0

Zhiyi Zhang : dxgi/tests: Add IDXGIOutput ownership tests.
by Alexandre Julliard 25 Jun '19

25 Jun '19

Module: wine Branch: master Commit: da6afd5cfd41c11cb60a9ac050f5b7035b50abe6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da6afd5cfd41c11cb60a9ac0… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jun 25 02:47:48 2019 +0430 dxgi/tests: Add IDXGIOutput ownership tests. Mostly to show that IDXGIOutput_TakeOwnership() and IDXGIOutput_ReleaseOwnership() are based on VidPN ownership. 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/dxgi/tests/dxgi.c | 213 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 212 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=da6afd5cfd41c11cb60a…

1 0

Zebediah Figura : quartz/memallocator: Forbid setting the start media time without setting the end time.
by Alexandre Julliard 25 Jun '19

25 Jun '19

Module: wine Branch: master Commit: 44318feeb659588175958101b7551d046c9773a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44318feeb659588175958101… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 24 20:05:16 2019 -0500 quartz/memallocator: Forbid setting the start media time without setting the end time. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/memallocator.c | 21 ++++++++++----------- dlls/quartz/tests/memallocator.c | 2 +- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c index ac12abd..1d74c3c 100644 --- a/dlls/quartz/memallocator.c +++ b/dlls/quartz/memallocator.c @@ -734,21 +734,20 @@ static HRESULT WINAPI StdMediaSample2_GetMediaTime(IMediaSample2 * iface, LONGLO return S_OK; } -static HRESULT WINAPI StdMediaSample2_SetMediaTime(IMediaSample2 * iface, LONGLONG * pStart, LONGLONG * pEnd) +static HRESULT WINAPI StdMediaSample2_SetMediaTime(IMediaSample2 *iface, LONGLONG *start, LONGLONG *end) { - StdMediaSample2 *This = impl_from_IMediaSample2(iface); - - TRACE("(%p)->(%p, %p)\n", iface, pStart, pEnd); + StdMediaSample2 *sample = impl_from_IMediaSample2(iface); - if (pStart) - This->tMediaStart = *pStart; - else - This->tMediaStart = INVALID_MEDIA_TIME; + TRACE("sample %p, start %p, end %p.\n", iface, start, end); - if (pEnd) - This->tMediaEnd = *pEnd; + if (start) + { + if (!end) return E_POINTER; + sample->tMediaStart = *start; + sample->tMediaEnd = *end; + } else - This->tMediaEnd = 0; + sample->tMediaStart = INVALID_MEDIA_TIME; return S_OK; } diff --git a/dlls/quartz/tests/memallocator.c b/dlls/quartz/tests/memallocator.c index b4f3b23..3868312 100644 --- a/dlls/quartz/tests/memallocator.c +++ b/dlls/quartz/tests/memallocator.c @@ -379,7 +379,7 @@ static void test_media_time(void) { start = 0x123; hr = IMediaSample_SetMediaTime(sample, &start, NULL); - todo_wine ok(hr == E_POINTER, "Got hr %#x.\n", hr); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); } end = 0x321;

1 0

Zebediah Figura : quartz/memallocator: Avoid using a magic value for the start media time.
by Alexandre Julliard 25 Jun '19

25 Jun '19

Module: wine Branch: master Commit: f1c749239490eb3bb148d115709baa6f579019ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1c749239490eb3bb148d115… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 24 20:05:17 2019 -0500 quartz/memallocator: Avoid using a magic value for the start media time. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/memallocator.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c index 1d74c3c..b7dff8c 100644 --- a/dlls/quartz/memallocator.c +++ b/dlls/quartz/memallocator.c @@ -40,6 +40,7 @@ typedef struct StdMediaSample2 struct list listentry; LONGLONG tMediaStart; LONGLONG tMediaEnd; + BOOL media_time_valid; } StdMediaSample2; typedef struct BaseMemAllocator @@ -74,8 +75,6 @@ static inline StdMediaSample2 *unsafe_impl_from_IMediaSample(IMediaSample * ifac #define AM_SAMPLE2_PROP_SIZE_WRITABLE FIELD_OFFSET(AM_SAMPLE2_PROPERTIES, pbBuffer) -#define INVALID_MEDIA_TIME (((ULONGLONG)0x7fffffff << 32) | 0xffffffff) - static HRESULT BaseMemAllocator_Init(HRESULT (* fnAlloc)(IMemAllocator *), HRESULT (* fnFree)(IMemAllocator *), HRESULT (* fnVerify)(IMemAllocator *, ALLOCATOR_PROPERTIES *), @@ -435,8 +434,7 @@ static HRESULT StdMediaSample2_Construct(BYTE * pbBuffer, LONG cbBuffer, IMemAll (*ppSample)->props.cbData = sizeof(AM_SAMPLE2_PROPERTIES); (*ppSample)->props.cbBuffer = (*ppSample)->props.lActual = cbBuffer; (*ppSample)->props.pbBuffer = pbBuffer; - (*ppSample)->tMediaStart = INVALID_MEDIA_TIME; - (*ppSample)->tMediaEnd = 0; + (*ppSample)->media_time_valid = FALSE; return S_OK; } @@ -496,8 +494,7 @@ static ULONG WINAPI StdMediaSample2_Release(IMediaSample2 * iface) DeleteMediaType(This->props.pMediaType); This->props.pMediaType = NULL; This->props.dwSampleFlags = 0; - This->tMediaStart = INVALID_MEDIA_TIME; - This->tMediaEnd = 0; + This->media_time_valid = FALSE; if (This->pParent) IMemAllocator_ReleaseBuffer(This->pParent, (IMediaSample *)iface); @@ -725,7 +722,7 @@ static HRESULT WINAPI StdMediaSample2_GetMediaTime(IMediaSample2 * iface, LONGLO TRACE("(%p)->(%p, %p)\n", iface, pStart, pEnd); - if (This->tMediaStart == INVALID_MEDIA_TIME) + if (!This->media_time_valid) return VFW_E_MEDIA_TIME_NOT_SET; *pStart = This->tMediaStart; @@ -745,9 +742,10 @@ static HRESULT WINAPI StdMediaSample2_SetMediaTime(IMediaSample2 *iface, LONGLON if (!end) return E_POINTER; sample->tMediaStart = *start; sample->tMediaEnd = *end; + sample->media_time_valid = TRUE; } else - sample->tMediaStart = INVALID_MEDIA_TIME; + sample->media_time_valid = FALSE; return S_OK; }

1 0

Zebediah Figura : quartz/memallocator: Return S_OK when clearing the media type.
by Alexandre Julliard 25 Jun '19

25 Jun '19

Module: wine Branch: master Commit: 838f68341f74fe80c3f0329e9696bdc11ad5920a URL: https://source.winehq.org/git/wine.git/?a=commit;h=838f68341f74fe80c3f0329e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 24 20:05:18 2019 -0500 quartz/memallocator: Return S_OK when clearing the media type. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/memallocator.c | 2 +- dlls/quartz/tests/memallocator.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c index b7dff8c..91c2373 100644 --- a/dlls/quartz/memallocator.c +++ b/dlls/quartz/memallocator.c @@ -686,7 +686,7 @@ static HRESULT WINAPI StdMediaSample2_SetMediaType(IMediaSample2 * iface, AM_MED This->props.pMediaType = NULL; } if (!pMediaType) - return S_FALSE; + return S_OK; if (!(This->props.pMediaType = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)))) return E_OUTOFMEMORY; diff --git a/dlls/quartz/tests/memallocator.c b/dlls/quartz/tests/memallocator.c index 3868312..9bbfd42 100644 --- a/dlls/quartz/tests/memallocator.c +++ b/dlls/quartz/tests/memallocator.c @@ -487,7 +487,7 @@ static void test_sample_properties(void) ok(!mt, "Got media type %p.\n", mt); hr = IMediaSample_SetMediaType(sample, NULL); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); mt = (AM_MEDIA_TYPE *)0xdeadbeef; hr = IMediaSample_GetMediaType(sample, &mt); @@ -513,7 +513,7 @@ static void test_sample_properties(void) ok(!memcmp(props.pMediaType, &expect_mt, sizeof(AM_MEDIA_TYPE)), "Media types didn't match.\n"); hr = IMediaSample_SetMediaType(sample, NULL); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); mt = (AM_MEDIA_TYPE *)0xdeadbeef; hr = IMediaSample_GetMediaType(sample, &mt);

1 0

Zebediah Figura : quartz/memallocator: Set the AM_SAMPLE_TYPECHANGED flag.
by Alexandre Julliard 25 Jun '19

25 Jun '19

Module: wine Branch: master Commit: daaf546f42f7c3956af00ae40f14ca24b15cf49f URL: https://source.winehq.org/git/wine.git/?a=commit;h=daaf546f42f7c3956af00ae4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 24 20:05:19 2019 -0500 quartz/memallocator: Set the AM_SAMPLE_TYPECHANGED flag. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/memallocator.c | 7 +++++++ dlls/quartz/tests/memallocator.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c index 91c2373..5ac8a72 100644 --- a/dlls/quartz/memallocator.c +++ b/dlls/quartz/memallocator.c @@ -685,8 +685,15 @@ static HRESULT WINAPI StdMediaSample2_SetMediaType(IMediaSample2 * iface, AM_MED DeleteMediaType(This->props.pMediaType); This->props.pMediaType = NULL; } + if (!pMediaType) + { + This->props.dwSampleFlags &= ~AM_SAMPLE_TYPECHANGED; return S_OK; + } + + This->props.dwSampleFlags |= AM_SAMPLE_TYPECHANGED; + if (!(This->props.pMediaType = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)))) return E_OUTOFMEMORY; diff --git a/dlls/quartz/tests/memallocator.c b/dlls/quartz/tests/memallocator.c index 9bbfd42..164f3af 100644 --- a/dlls/quartz/tests/memallocator.c +++ b/dlls/quartz/tests/memallocator.c @@ -509,7 +509,7 @@ static void test_sample_properties(void) hr = IMediaSample2_GetProperties(sample2, sizeof(props), (BYTE *)&props); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(props.dwSampleFlags == AM_SAMPLE_TYPECHANGED, "Got flags %#x.\n", props.dwSampleFlags); + ok(props.dwSampleFlags == AM_SAMPLE_TYPECHANGED, "Got flags %#x.\n", props.dwSampleFlags); ok(!memcmp(props.pMediaType, &expect_mt, sizeof(AM_MEDIA_TYPE)), "Media types didn't match.\n"); hr = IMediaSample_SetMediaType(sample, NULL);

1 0

Alexandre Julliard : usbd.sys: Build with msvcrt.
by Alexandre Julliard 25 Jun '19

25 Jun '19

Module: wine Branch: master Commit: 503d5ef50d8abf1e9ecf842bdf44747fea382d39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=503d5ef50d8abf1e9ecf842b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 25 08:30:21 2019 +0200 usbd.sys: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usbd.sys/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/usbd.sys/Makefile.in b/dlls/usbd.sys/Makefile.in index d4e47a9..b756bf7 100644 --- a/dlls/usbd.sys/Makefile.in +++ b/dlls/usbd.sys/Makefile.in @@ -1,7 +1,7 @@ MODULE = usbd.sys IMPORTLIB = usbd IMPORTS = ntoskrnl -EXTRADLLFLAGS = -Wl,--subsystem,native +EXTRADLLFLAGS = -mno-cygwin -Wl,--subsystem,native C_SRCS = \ usbd.c

1 0

Alexandre Julliard : user.exe: Build with msvcrt.
by Alexandre Julliard 25 Jun '19

25 Jun '19

Module: wine Branch: master Commit: 84f39259b1a52197cd30c38ab4e5be5b8db833b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84f39259b1a52197cd30c38a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 25 08:32:37 2019 +0200 user.exe: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user.exe16/Makefile.in | 2 +- dlls/user.exe16/comm.c | 9 +++------ dlls/user.exe16/dialog.c | 3 --- dlls/user.exe16/message.c | 3 --- dlls/user.exe16/network.c | 5 ----- 5 files changed, 4 insertions(+), 18 deletions(-) diff --git a/dlls/user.exe16/Makefile.in b/dlls/user.exe16/Makefile.in index 5a82b75..664b8e8 100644 --- a/dlls/user.exe16/Makefile.in +++ b/dlls/user.exe16/Makefile.in @@ -1,6 +1,6 @@ MODULE = user.exe16 IMPORTS = mpr user32 gdi32 -EXTRADLLFLAGS = -m16 -Wb,--main-module,user32.dll,--heap,65520 +EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,user32.dll,--heap,65520 C_SRCS = \ bidi.c \ diff --git a/dlls/user.exe16/comm.c b/dlls/user.exe16/comm.c index a1715c8..9125c6d 100644 --- a/dlls/user.exe16/comm.c +++ b/dlls/user.exe16/comm.c @@ -50,9 +50,6 @@ * */ -#include "config.h" -#include "wine/port.h" - #include <stdlib.h> #include <stdarg.h> #include <stdio.h> @@ -416,7 +413,7 @@ INT16 WINAPI BuildCommDCB16(LPCSTR device, LPDCB16 lpdcb) TRACE("(%s), ptr %p\n", device, lpdcb); - if (_strnicmp(device,"COM",3)) + if (strnicmp(device,"COM",3)) return -1; port = device[3] - '0'; @@ -457,7 +454,7 @@ INT16 WINAPI OpenComm16(LPCSTR device,UINT16 cbInQueue,UINT16 cbOutQueue) if (port-- == 0) ERR("BUG ! COM0 or LPT0 don't exist !\n"); - if (!_strnicmp(device,"COM",3)) + if (!strnicmp(device,"COM",3)) { if (COM[port].handle) return IE_OPEN; @@ -508,7 +505,7 @@ INT16 WINAPI OpenComm16(LPCSTR device,UINT16 cbInQueue,UINT16 cbOutQueue) } } else - if (!_strnicmp(device,"LPT",3)) { + if (!strnicmp(device,"LPT",3)) { if (LPT[port].handle) return IE_OPEN; diff --git a/dlls/user.exe16/dialog.c b/dlls/user.exe16/dialog.c index 385e859..1041638 100644 --- a/dlls/user.exe16/dialog.c +++ b/dlls/user.exe16/dialog.c @@ -18,9 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include <stdarg.h> #include "windef.h" diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c index dd15707..14e7a19 100644 --- a/dlls/user.exe16/message.c +++ b/dlls/user.exe16/message.c @@ -18,9 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include <assert.h> #include <stdarg.h> #include <string.h> diff --git a/dlls/user.exe16/network.c b/dlls/user.exe16/network.c index 8dc31b1..c137bb1 100644 --- a/dlls/user.exe16/network.c +++ b/dlls/user.exe16/network.c @@ -18,15 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <ctype.h> #include <stdarg.h> #include <string.h> #include <sys/types.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif #include "windef.h" #include "winbase.h"

1 0