September 2018 - Wine-Commits

Henri Verbeet : wined3d: Handle lack of ARB_half_float_vertex in format_vertex_info[].
by Alexandre Julliard Sept. 13, 2018

Sept. 13, 2018

Module: wine Branch: master Commit: cff217f9fcc01bd7b82ce2ba310ffddb0d1f94ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=cff217f9fcc01bd7b82ce2ba… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 13 21:04:45 2018 +0430 wined3d: Handle lack of ARB_half_float_vertex in format_vertex_info[]. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 0c230da..3a74fc8 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -624,8 +624,11 @@ static const struct wined3d_format_vertex_info format_vertex_info[] = {WINED3DFMT_R10G10B10X2_SNORM, WINED3D_FFP_EMIT_DEC3N, GL_SHORT}, {WINED3DFMT_R10G10B10A2_UNORM, WINED3D_FFP_EMIT_INVALID, GL_UNSIGNED_INT_2_10_10_10_REV, ARB_VERTEX_TYPE_2_10_10_10_REV}, - {WINED3DFMT_R16G16_FLOAT, WINED3D_FFP_EMIT_FLOAT16_2, GL_HALF_FLOAT}, - {WINED3DFMT_R16G16B16A16_FLOAT, WINED3D_FFP_EMIT_FLOAT16_4, GL_HALF_FLOAT}, + /* Without ARB_half_float_vertex we convert these on upload. */ + {WINED3DFMT_R16G16_FLOAT, WINED3D_FFP_EMIT_FLOAT16_2, GL_FLOAT}, + {WINED3DFMT_R16G16_FLOAT, WINED3D_FFP_EMIT_FLOAT16_2, GL_HALF_FLOAT, ARB_HALF_FLOAT_VERTEX}, + {WINED3DFMT_R16G16B16A16_FLOAT, WINED3D_FFP_EMIT_FLOAT16_4, GL_FLOAT}, + {WINED3DFMT_R16G16B16A16_FLOAT, WINED3D_FFP_EMIT_FLOAT16_4, GL_HALF_FLOAT, ARB_HALF_FLOAT_VERTEX}, {WINED3DFMT_R8G8B8A8_SNORM, WINED3D_FFP_EMIT_INVALID, GL_BYTE}, {WINED3DFMT_R8G8B8A8_SINT, WINED3D_FFP_EMIT_INVALID, GL_BYTE}, {WINED3DFMT_R16G16B16A16_UINT, WINED3D_FFP_EMIT_INVALID, GL_UNSIGNED_SHORT}, @@ -3556,17 +3559,6 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ format->color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_P8); } - if (!gl_info->supported[ARB_HALF_FLOAT_VERTEX]) - { - /* Do not change the size of the type, it is CPU side. We have to change the GPU-side information though. - * It is the job of the vertex buffer code to make sure that the vbos have the right format */ - format = get_format_internal(adapter, WINED3DFMT_R16G16_FLOAT); - format->gl_vtx_type = GL_FLOAT; - - format = get_format_internal(adapter, WINED3DFMT_R16G16B16A16_FLOAT); - format->gl_vtx_type = GL_FLOAT; - } - if (!gl_info->supported[ARB_HALF_FLOAT_PIXEL]) { format = get_format_internal(adapter, WINED3DFMT_R16_FLOAT);

1 0

Henri Verbeet : wined3d: Move ARB_vertex_array_bgra handling to init_format_vertex_info().
by Alexandre Julliard Sept. 13, 2018

Sept. 13, 2018

Module: wine Branch: master Commit: 05792f647622f02a9407d479c90fb32b03e42b95 URL: https://source.winehq.org/git/wine.git/?a=commit;h=05792f647622f02a9407d479… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 13 21:04:44 2018 +0430 wined3d: Move ARB_vertex_array_bgra handling to init_format_vertex_info(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 54b7bce..0c230da 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3556,12 +3556,6 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ format->color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_P8); } - if (gl_info->supported[ARB_VERTEX_ARRAY_BGRA]) - { - format = get_format_internal(adapter, WINED3DFMT_B8G8R8A8_UNORM); - format->gl_vtx_format = GL_BGRA; - } - if (!gl_info->supported[ARB_HALF_FLOAT_VERTEX]) { /* Do not change the size of the type, it is CPU side. We have to change the GPU-side information though. @@ -3690,6 +3684,12 @@ static BOOL init_format_vertex_info(const struct wined3d_adapter *adapter, format->gl_vtx_format = format->component_count; } + if (gl_info->supported[ARB_VERTEX_ARRAY_BGRA]) + { + format = get_format_internal(adapter, WINED3DFMT_B8G8R8A8_UNORM); + format->gl_vtx_format = GL_BGRA; + } + return TRUE; }

1 0

Huw Davies : ntoskrnl: Allow space for the '\0'.
by Alexandre Julliard Sept. 13, 2018

Sept. 13, 2018

Module: wine Branch: master Commit: 9f74c00e069ff0de4be96262f61b93839f8913cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f74c00e069ff0de4be96262… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Sep 13 10:48:58 2018 +0100 ntoskrnl: Allow space for the '\0'. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 804a938..18524af 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1353,7 +1353,7 @@ NTSTATUS WINAPI IoSetDeviceInterfaceState( UNICODE_STRING *name, BOOLEAN enable if (!guid_from_string( (refstr ? refstr : name->Buffer + namelen) - 38, &class )) return STATUS_INVALID_PARAMETER; - len = strlenW(DeviceClassesW) + 38 + 1 + namelen + 2; + len = strlenW(DeviceClassesW) + 38 + 1 + namelen + 2 + 1; if (!(path = heap_alloc( len * sizeof(WCHAR) ))) return STATUS_NO_MEMORY;

1 0

Aric Stewart : winebus.sys: Improve unloading the winebus driver.
by Alexandre Julliard Sept. 13, 2018

Sept. 13, 2018

Module: wine Branch: master Commit: db6c5b59b67f92dcfd06fefb6c04866b45205ebb URL: https://source.winehq.org/git/wine.git/?a=commit;h=db6c5b59b67f92dcfd06fefb… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Sep 12 11:22:09 2018 -0500 winebus.sys: Improve unloading the winebus driver. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus.h | 3 +++ dlls/winebus.sys/bus_iohid.c | 34 +++++++++++++++++++++++++--------- dlls/winebus.sys/bus_sdl.c | 10 ++++++++++ dlls/winebus.sys/bus_udev.c | 10 ++++++++++ dlls/winebus.sys/main.c | 9 +++++++++ 5 files changed, 57 insertions(+), 9 deletions(-) diff --git a/dlls/winebus.sys/bus.h b/dlls/winebus.sys/bus.h index bf93c04..16e9bf7 100644 --- a/dlls/winebus.sys/bus.h +++ b/dlls/winebus.sys/bus.h @@ -22,6 +22,9 @@ typedef int(*enum_func)(DEVICE_OBJECT *device, void *context); NTSTATUS WINAPI udev_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry_path) DECLSPEC_HIDDEN; NTSTATUS WINAPI iohid_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry_path) DECLSPEC_HIDDEN; NTSTATUS WINAPI sdl_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry_path) DECLSPEC_HIDDEN; +void udev_driver_unload( void ) DECLSPEC_HIDDEN; +void iohid_driver_unload( void ) DECLSPEC_HIDDEN; +void sdl_driver_unload( void ) DECLSPEC_HIDDEN; /* Native device function table */ typedef struct diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index ac706f5..95077ac 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -98,6 +98,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(plugplay); static DRIVER_OBJECT *iohid_driver_obj = NULL; static IOHIDManagerRef hid_manager; +static CFRunLoopRef run_loop; +static HANDLE run_loop_handle; static const WCHAR busidW[] = {'I','O','H','I','D',0}; @@ -372,7 +374,7 @@ static void handle_RemovalCallback(void *context, IOReturn result, void *sender, /* This puts the relevant run loop for event handling into a WINE thread */ static DWORD CALLBACK runloop_thread(void *args) { - CFRunLoopRef run_loop = CFRunLoopGetCurrent(); + run_loop = CFRunLoopGetCurrent(); IOHIDManagerSetDeviceMatching(hid_manager, NULL); IOHIDManagerRegisterDeviceMatchingCallback(hid_manager, handle_DeviceMatchingCallback, NULL); @@ -388,18 +390,12 @@ static DWORD CALLBACK runloop_thread(void *args) CFRunLoopRun(); TRACE("Run Loop exiting\n"); - - IOHIDManagerRegisterDeviceMatchingCallback(hid_manager, NULL, NULL); - IOHIDManagerRegisterDeviceRemovalCallback(hid_manager, NULL, NULL); - IOHIDManagerUnscheduleFromRunLoop(hid_manager, run_loop, kCFRunLoopDefaultMode); - CFRelease(hid_manager); return 1; + } NTSTATUS WINAPI iohid_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry_path) { - HANDLE run_loop_handle; - TRACE("(%p, %s)\n", driver, debugstr_w(registry_path->Buffer)); iohid_driver_obj = driver; @@ -414,10 +410,25 @@ NTSTATUS WINAPI iohid_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registr return STATUS_UNSUCCESSFUL; } - CloseHandle(run_loop_handle); return STATUS_SUCCESS; } +void iohid_driver_unload( void ) +{ + TRACE("Unloading Driver\n"); + if (iohid_driver_obj != NULL) + { + IOHIDManagerUnscheduleFromRunLoop(hid_manager, run_loop, kCFRunLoopDefaultMode); + CFRunLoopStop(run_loop); + WaitForSingleObject(run_loop_handle, INFINITE); + CloseHandle(run_loop_handle); + IOHIDManagerRegisterDeviceMatchingCallback(hid_manager, NULL, NULL); + IOHIDManagerRegisterDeviceRemovalCallback(hid_manager, NULL, NULL); + CFRelease(hid_manager); + } + TRACE("Driver Unloaded\n"); +} + #else NTSTATUS WINAPI iohid_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry_path) @@ -426,4 +437,9 @@ NTSTATUS WINAPI iohid_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registr return STATUS_NOT_IMPLEMENTED; } +void iohid_driver_unload( void ) +{ + TRACE("Stub: Unload Driver\n"); +} + #endif /* HAVE_IOHIDMANAGERCREATE */ diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 159727f..6b2b28e 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -927,6 +927,11 @@ static DWORD CALLBACK deviceloop_thread(void *args) return 0; } +void sdl_driver_unload( void ) +{ + TRACE("Unload Driver\n"); +} + NTSTATUS WINAPI sdl_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry_path) { static const WCHAR controller_modeW[] = {'M','a','p',' ','C','o','n','t','r','o','l','l','e','r','s',0}; @@ -1023,4 +1028,9 @@ NTSTATUS WINAPI sdl_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry_ return STATUS_NOT_IMPLEMENTED; } +void sdl_driver_unload( void ) +{ + TRACE("Stub: Unload Driver\n"); +} + #endif /* SONAME_LIBSDL2 */ diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 788b564..dabda6a 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1418,6 +1418,11 @@ static DWORD CALLBACK deviceloop_thread(void *args) return 0; } +void udev_driver_unload( void ) +{ + TRACE("Unload Driver\n"); +} + NTSTATUS WINAPI udev_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry_path) { HANDLE events[2]; @@ -1482,4 +1487,9 @@ NTSTATUS WINAPI udev_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry return STATUS_NOT_IMPLEMENTED; } +void udev_driver_unload( void ) +{ + TRACE("Stub: Unload Driver\n"); +} + #endif /* HAVE_UDEV */ diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index ce68e4a..fd795f1 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -699,6 +699,13 @@ BOOL is_xbox_gamepad(WORD vid, WORD pid) return FALSE; } +static void WINAPI driver_unload(DRIVER_OBJECT *driver) +{ + udev_driver_unload(); + iohid_driver_unload(); + sdl_driver_unload(); +} + NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) { static const WCHAR udevW[] = {'\\','D','r','i','v','e','r','\\','U','D','E','V',0}; @@ -720,5 +727,7 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) IoCreateDriver(&udev, udev_driver_init); IoCreateDriver(&iohid, iohid_driver_init); + driver->DriverUnload = driver_unload; + return STATUS_SUCCESS; }

1 0

Nikolay Sivov : opcservices/tests: Fix uninitialized variable access ( Valgrind).
by Alexandre Julliard Sept. 13, 2018

Sept. 13, 2018

Module: wine Branch: master Commit: d63a037eacc115747a360ff73dd12ba77d7de3f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d63a037eacc115747a360ff7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 13 09:21:15 2018 +0300 opcservices/tests: Fix uninitialized variable access (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/tests/opcservices.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/opcservices/tests/opcservices.c b/dlls/opcservices/tests/opcservices.c index f619460..a9c25a5 100644 --- a/dlls/opcservices/tests/opcservices.c +++ b/dlls/opcservices/tests/opcservices.c @@ -518,7 +518,7 @@ static void test_rel_part_uri(void) IOpcPartUri *rel_uri2; IOpcUri *source_uri2; IUnknown *unk = NULL; - BOOL ret; + BOOL ret = FALSE; BSTR str; hr = IOpcPartUri_GetSourceUri(rel_uri, &source_uri);

1 0

Alex Henrie : wine.inf: Add TCP/IP DataBasePath value.
by Alexandre Julliard Sept. 13, 2018

Sept. 13, 2018

Module: wine Branch: master Commit: bfe48889aeda69cac81e46b1d57beb0ed04b897c URL: https://source.winehq.org/git/wine.git/?a=commit;h=bfe48889aeda69cac81e46b1… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Sep 12 22:26:50 2018 -0600 wine.inf: Add TCP/IP DataBasePath value. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45821 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index f10284b..5767b29 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -3416,7 +3416,7 @@ HKLM,%CurrentVersionNT%\SvcHost,"netsvcs",0x00010008,"Schedule" HKLM,%CurrentVersion%\RunServices,"winemenubuilder",2,"%11%\winemenubuilder.exe -a -r" HKLM,"System\CurrentControlSet\Services\Eventlog\Application",,16 HKLM,"System\CurrentControlSet\Services\Eventlog\System","Sources",0x10000,"" -HKLM,"System\CurrentControlSet\Services\Tcpip\Parameters",,16 +HKLM,"System\CurrentControlSet\Services\Tcpip\Parameters","DataBasePath",2,"%11%\drivers" HKLM,"System\CurrentControlSet\Services\VxD\MSTCP",,16 HKLM,"System\CurrentControlSet\Services\Winsock\Parameters",,16 HKLM,"System\CurrentControlSet\Services\Winsock2\Parameters\Protocol_Catalog9\Catalog_Entries",,16

1 0

Aric Stewart : winebus.sys: Implement IRP_MN_QUERY_DEVICE_RELATIONS.
by Alexandre Julliard Sept. 13, 2018

Sept. 13, 2018

Module: wine Branch: master Commit: 5815c7b520794c703037fefa9bdc0b796eb13493 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5815c7b520794c703037fefa… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Sep 12 11:23:29 2018 -0500 winebus.sys: Implement IRP_MN_QUERY_DEVICE_RELATIONS. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/main.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index fd795f1..6b1949c 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -360,6 +360,57 @@ void bus_remove_hid_device(DEVICE_OBJECT *device) HeapFree(GetProcessHeap(), 0, pnp_device); } +static NTSTATUS build_device_relations(DEVICE_RELATIONS **devices) +{ + int i; + struct pnp_device *ptr; + + EnterCriticalSection(&device_list_cs); + *devices = HeapAlloc(GetProcessHeap(), 0, sizeof(DEVICE_RELATIONS) + + list_count(&pnp_devset) * sizeof (void *)); + + if (!*devices) + { + LeaveCriticalSection(&device_list_cs); + return STATUS_INSUFFICIENT_RESOURCES; + } + + i = 0; + LIST_FOR_EACH_ENTRY(ptr, &pnp_devset, struct pnp_device, entry) + { + (*devices)->Objects[i] = (DEVICE_OBJECT*)ptr->device; + i++; + } + LeaveCriticalSection(&device_list_cs); + (*devices)->Count = i; + return STATUS_SUCCESS; +} + +static NTSTATUS handle_IRP_MN_QUERY_DEVICE_RELATIONS(IRP *irp) +{ + NTSTATUS status = irp->IoStatus.u.Status; + IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); + + TRACE("IRP_MN_QUERY_DEVICE_RELATIONS"); + switch (irpsp->Parameters.QueryDeviceRelations.Type) + { + case EjectionRelations: + case RemovalRelations: + case TargetDeviceRelation: + case PowerRelations: + FIXME("Unhandled Device Relation %x\n",irpsp->Parameters.QueryDeviceRelations.Type); + break; + case BusRelations: + status = build_device_relations((DEVICE_RELATIONS**)&irp->IoStatus.Information); + break; + default: + FIXME("Unknown Device Relation %x\n",irpsp->Parameters.QueryDeviceRelations.Type); + break; + } + + return status; +} + static NTSTATUS handle_IRP_MN_QUERY_ID(DEVICE_OBJECT *device, IRP *irp) { NTSTATUS status = irp->IoStatus.u.Status; @@ -404,6 +455,8 @@ NTSTATUS WINAPI common_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) { case IRP_MN_QUERY_DEVICE_RELATIONS: TRACE("IRP_MN_QUERY_DEVICE_RELATIONS\n"); + status = handle_IRP_MN_QUERY_DEVICE_RELATIONS(irp); + irp->IoStatus.u.Status = status; break; case IRP_MN_QUERY_ID: TRACE("IRP_MN_QUERY_ID\n");

1 0

Alexandre Julliard : winex11: Make pixel format traces more compact.
by Alexandre Julliard Sept. 13, 2018

Sept. 13, 2018

Module: wine Branch: master Commit: 92434118375ae725c835d012751cf0e06565c950 URL: https://source.winehq.org/git/wine.git/?a=commit;h=92434118375ae725c835d012… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 13 16:17:37 2018 +0200 winex11: Make pixel format traces more compact. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/opengl.c | 32 +++++--------------------------- 1 file changed, 5 insertions(+), 27 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 7aa6448..0b0fd51 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -297,8 +297,11 @@ static void init_pixel_formats( Display *display ); static BOOL glxRequireVersion(int requiredVersion); static void dump_PIXELFORMATDESCRIPTOR(const PIXELFORMATDESCRIPTOR *ppfd) { - TRACE(" - size / version : %d / %d\n", ppfd->nSize, ppfd->nVersion); - TRACE(" - dwFlags : "); + TRACE( "size %u version %u flags %u type %u color %u %u,%u,%u,%u " + "accum %u depth %u stencil %u aux %u ", + ppfd->nSize, ppfd->nVersion, ppfd->dwFlags, ppfd->iPixelType, + ppfd->cColorBits, ppfd->cRedBits, ppfd->cGreenBits, ppfd->cBlueBits, ppfd->cAlphaBits, + ppfd->cAccumBits, ppfd->cDepthBits, ppfd->cStencilBits, ppfd->cAuxBuffers ); #define TEST_AND_DUMP(t,tv) if ((t) & (tv)) TRACE(#tv " ") TEST_AND_DUMP(ppfd->dwFlags, PFD_DEPTH_DONTCARE); TEST_AND_DUMP(ppfd->dwFlags, PFD_DOUBLEBUFFER); @@ -321,31 +324,6 @@ static void dump_PIXELFORMATDESCRIPTOR(const PIXELFORMATDESCRIPTOR *ppfd) { TEST_AND_DUMP(ppfd->dwFlags, PFD_SUPPORT_COMPOSITION); #undef TEST_AND_DUMP TRACE("\n"); - - TRACE(" - iPixelType : "); - switch (ppfd->iPixelType) { - case PFD_TYPE_RGBA: TRACE("PFD_TYPE_RGBA"); break; - case PFD_TYPE_COLORINDEX: TRACE("PFD_TYPE_COLORINDEX"); break; - } - TRACE("\n"); - - TRACE(" - Color : %d\n", ppfd->cColorBits); - TRACE(" - Red : %d\n", ppfd->cRedBits); - TRACE(" - Green : %d\n", ppfd->cGreenBits); - TRACE(" - Blue : %d\n", ppfd->cBlueBits); - TRACE(" - Alpha : %d\n", ppfd->cAlphaBits); - TRACE(" - Accum : %d\n", ppfd->cAccumBits); - TRACE(" - Depth : %d\n", ppfd->cDepthBits); - TRACE(" - Stencil : %d\n", ppfd->cStencilBits); - TRACE(" - Aux : %d\n", ppfd->cAuxBuffers); - - TRACE(" - iLayerType : "); - switch (ppfd->iLayerType) { - case PFD_MAIN_PLANE: TRACE("PFD_MAIN_PLANE"); break; - case PFD_OVERLAY_PLANE: TRACE("PFD_OVERLAY_PLANE"); break; - case (BYTE)PFD_UNDERLAY_PLANE: TRACE("PFD_UNDERLAY_PLANE"); break; - } - TRACE("\n"); } #define PUSH1(attribs,att) do { attribs[nAttribs++] = (att); } while (0)

1 0

Nikolay Sivov : include: Add ID2D1DrawingStateBlock1 definition.
by Alexandre Julliard Sept. 13, 2018

Sept. 13, 2018

Module: wine Branch: master Commit: 49647cb32cbf6980d6a0584cc71c01f6bbd56956 URL: https://source.winehq.org/git/wine.git/?a=commit;h=49647cb32cbf6980d6a0584c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 13 11:07:57 2018 +0300 include: Add ID2D1DrawingStateBlock1 definition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d2d1_1.idl | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/include/d2d1_1.idl b/include/d2d1_1.idl index 1118226..ff283f8 100644 --- a/include/d2d1_1.idl +++ b/include/d2d1_1.idl @@ -21,7 +21,6 @@ import "d2d1.idl"; interface ID2D1DeviceContext; interface ID2D1StrokeStyle1; interface ID2D1PathGeometry1; -interface ID2D1DrawingStateBlock1; interface ID2D1GdiMetafile; interface ID2D1Properties; interface IPrintDocumentPackageTarget; @@ -253,6 +252,21 @@ typedef HRESULT (__stdcall *PD2D1_EFFECT_FACTORY)(IUnknown **effect); [ object, + uuid(689f1f85-c72e-4e33-8f19-85754efd5ace), + local, +] +interface ID2D1DrawingStateBlock1 : ID2D1DrawingStateBlock +{ + void GetDescription( + [out] D2D1_DRAWING_STATE_DESCRIPTION1 *desc + ); + void SetDescription( + [in] const D2D1_DRAWING_STATE_DESCRIPTION1 *desc + ); +} + +[ + object, uuid(a898a84c-3873-4588-b08b-ebbf978df041), local, ]

1 0

Nikolay Sivov : d2d1: Return bitmap options.
by Alexandre Julliard Sept. 13, 2018

Sept. 13, 2018

Module: wine Branch: master Commit: bccd14f2f6c8758e14b67ffdd11f7ef2f35f5e2c URL: https://source.winehq.org/git/wine.git/?a=commit;h=bccd14f2f6c8758e14b67ffd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 13 21:04:47 2018 +0430 d2d1: Return bitmap options. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/bitmap.c | 47 ++++++++++++++------- dlls/d2d1/d2d1_private.h | 7 +-- dlls/d2d1/device.c | 40 +++++++++++++++--- dlls/d2d1/tests/d2d1.c | 108 +++++++++++++++++++++++++---------------------- 4 files changed, 126 insertions(+), 76 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bccd14f2f6c8758e14b6…

1 0