November 2019 - Wine-commits

Zebediah Figura : ntoskrnl.exe: BusRelations is also used when devices are removed.
by Alexandre Julliard 07 Nov '19

07 Nov '19

Module: wine Branch: master Commit: 81cda52d15317d065074fb060732b0f30bf99e4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=81cda52d15317d065074fb06… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Nov 6 23:55:03 2019 -0600 ntoskrnl.exe: BusRelations is also used when devices are removed. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/pnp.c | 18 +++++++++++++++--- dlls/winebus.sys/bus_iohid.c | 2 +- dlls/winebus.sys/bus_sdl.c | 2 +- dlls/winebus.sys/bus_udev.c | 2 +- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index 62a32a4afc..863eee390f 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -435,6 +435,21 @@ static void handle_bus_relations( DEVICE_OBJECT *parent ) } } + if (wine_parent->children) + { + for (i = 0; i < wine_parent->children->Count; ++i) + { + DEVICE_OBJECT *child = wine_parent->children->Objects[i]; + + if (!device_in_list( relations, child )) + { + TRACE("Removing device %p.\n", child); + remove_device( child ); + } + ObDereferenceObject( child ); + } + } + ExFreePool( wine_parent->children ); wine_parent->children = relations; @@ -453,9 +468,6 @@ void WINAPI IoInvalidateDeviceRelations( DEVICE_OBJECT *device_object, DEVICE_RE case BusRelations: handle_bus_relations( device_object ); break; - case RemovalRelations: - remove_device( device_object ); - break; default: FIXME("Unhandled relation %#x.\n", type); break; diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index ad542b5dfb..c6aa003ffc 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -371,7 +371,7 @@ static void handle_RemovalCallback(void *context, IOReturn result, void *sender, device = bus_find_hid_device(&iohid_vtbl, IOHIDDevice); if (device) { - IoInvalidateDeviceRelations(device, RemovalRelations); + IoInvalidateDeviceRelations(bus_pdo, BusRelations); bus_remove_hid_device(device); } } diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 5f07ee2435..322e09be79 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -902,7 +902,7 @@ static void try_remove_device(SDL_JoystickID id) sdl_controller = private->sdl_controller; sdl_haptic = private->sdl_haptic; - IoInvalidateDeviceRelations(device, RemovalRelations); + IoInvalidateDeviceRelations(bus_pdo, BusRelations); bus_remove_hid_device(device); diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index b2cf62dedb..5e0b5c5151 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1297,7 +1297,7 @@ static void try_remove_device(struct udev_device *dev) #endif if (!device) return; - IoInvalidateDeviceRelations(device, RemovalRelations); + IoInvalidateDeviceRelations(bus_pdo, BusRelations); private = impl_from_DEVICE_OBJECT(device);

1 0

Zebediah Figura : winebus.sys: Stop creating a setupapi device.
by Alexandre Julliard 07 Nov '19

07 Nov '19

Module: wine Branch: master Commit: c074966b9d75d9519e8640e87725ad439f4ffa0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c074966b9d75d9519e8640e8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Nov 6 23:55:04 2019 -0600 winebus.sys: Stop creating a setupapi device. ntoskrnl.exe handles this now. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/Makefile.in | 2 +- dlls/winebus.sys/bus.h | 2 +- dlls/winebus.sys/bus_iohid.c | 5 +--- dlls/winebus.sys/bus_sdl.c | 8 ++----- dlls/winebus.sys/bus_udev.c | 8 ++----- dlls/winebus.sys/main.c | 56 ++++---------------------------------------- 6 files changed, 11 insertions(+), 70 deletions(-) diff --git a/dlls/winebus.sys/Makefile.in b/dlls/winebus.sys/Makefile.in index 78e3da1b9c..3bdc1a5d58 100644 --- a/dlls/winebus.sys/Makefile.in +++ b/dlls/winebus.sys/Makefile.in @@ -1,5 +1,5 @@ MODULE = winebus.sys -IMPORTS = ntoskrnl setupapi advapi32 +IMPORTS = ntoskrnl advapi32 EXTRALIBS = $(IOKIT_LIBS) $(UDEV_LIBS) EXTRAINCL = $(UDEV_CFLAGS) $(SDL2_CFLAGS) EXTRADLLFLAGS = -Wl,--subsystem,native diff --git a/dlls/winebus.sys/bus.h b/dlls/winebus.sys/bus.h index a250878489..09666dc151 100644 --- a/dlls/winebus.sys/bus.h +++ b/dlls/winebus.sys/bus.h @@ -43,7 +43,7 @@ void *get_platform_private(DEVICE_OBJECT *device) DECLSPEC_HIDDEN; /* HID Plug and Play Bus */ DEVICE_OBJECT *bus_create_hid_device(const WCHAR *busidW, WORD vid, WORD pid, WORD input, DWORD version, DWORD uid, const WCHAR *serialW, BOOL is_gamepad, - const GUID *class, const platform_vtbl *vtbl, DWORD platform_data_size) DECLSPEC_HIDDEN; + const platform_vtbl *vtbl, DWORD platform_data_size) DECLSPEC_HIDDEN; DEVICE_OBJECT *bus_find_hid_device(const platform_vtbl *vtbl, void *platform_dev) DECLSPEC_HIDDEN; void bus_remove_hid_device(DEVICE_OBJECT *device) DECLSPEC_HIDDEN; void process_hid_report(DEVICE_OBJECT *device, BYTE *report, DWORD length) DECLSPEC_HIDDEN; diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index c6aa003ffc..ed91b51fc8 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -102,9 +102,6 @@ static HANDLE run_loop_handle; static const WCHAR busidW[] = {'I','O','H','I','D',0}; -#include "initguid.h" -DEFINE_GUID(GUID_DEVCLASS_IOHID, 0x989D309D,0x0470,0x4E1A,0x89,0x38,0x50,0x1F,0x42,0xBD,0x9A,0xCD); - struct platform_private { IOHIDDeviceRef device; @@ -348,7 +345,7 @@ static void handle_DeviceMatchingCallback(void *context, IOReturn result, void * input = 0; device = bus_create_hid_device(busidW, vid, pid, input, - version, uid, str?serial_string:NULL, is_gamepad, &GUID_DEVCLASS_IOHID, + version, uid, str ? serial_string : NULL, is_gamepad, &iohid_vtbl, sizeof(struct platform_private)); if (!device) ERR("Failed to create device\n"); diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 322e09be79..61651c92f6 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -66,9 +66,6 @@ static const WCHAR sdl_busidW[] = {'S','D','L','J','O','Y',0}; static DWORD map_controllers = 0; -#include "initguid.h" -DEFINE_GUID(GUID_DEVCLASS_SDL, 0x463d60b5,0x802b,0x4bb2,0x8f,0xdb,0x7d,0xa9,0xb9,0x96,0x04,0xd8); - static void *sdl_handle = NULL; static HANDLE deviceloop_handle; static UINT quit_event = -1; @@ -974,9 +971,8 @@ static void try_add_device(unsigned int index) if (is_xbox_gamepad) input = 0; - device = bus_create_hid_device(sdl_busidW, vid, pid, - input, version, index, serial, is_xbox_gamepad, &GUID_DEVCLASS_SDL, - &sdl_vtbl, sizeof(struct platform_private)); + device = bus_create_hid_device(sdl_busidW, vid, pid, input, version, index, + serial, is_xbox_gamepad, &sdl_vtbl, sizeof(struct platform_private)); if (device) { diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 5e0b5c5151..239051723c 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -98,10 +98,6 @@ static int deviceloop_control[2]; static const WCHAR hidraw_busidW[] = {'H','I','D','R','A','W',0}; static const WCHAR lnxev_busidW[] = {'L','N','X','E','V',0}; -#include "initguid.h" -DEFINE_GUID(GUID_DEVCLASS_HIDRAW, 0x3def44ad,0x242e,0x46e5,0x82,0x6d,0x70,0x72,0x13,0xf3,0xaa,0x81); -DEFINE_GUID(GUID_DEVCLASS_LINUXEVENT, 0x1b932c0d,0xfea7,0x42cd,0x8e,0xaa,0x0e,0x48,0x79,0xb6,0x9e,0xaa); - struct platform_private { struct udev_device *udev_device; @@ -1241,13 +1237,13 @@ static void try_add_device(struct udev_device *dev) if (strcmp(subsystem, "hidraw") == 0) { device = bus_create_hid_device(hidraw_busidW, vid, pid, input, version, 0, serial, is_gamepad, - &GUID_DEVCLASS_HIDRAW, &hidraw_vtbl, sizeof(struct platform_private)); + &hidraw_vtbl, sizeof(struct platform_private)); } #ifdef HAS_PROPER_INPUT_HEADER else if (strcmp(subsystem, "input") == 0) { device = bus_create_hid_device(lnxev_busidW, vid, pid, input, version, 0, serial, is_gamepad, - &GUID_DEVCLASS_LINUXEVENT, &lnxev_vtbl, sizeof(struct wine_input_private)); + &lnxev_vtbl, sizeof(struct wine_input_private)); } #endif diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 24ddb21c4a..b4599b6889 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -25,13 +25,7 @@ #include "ntstatus.h" #define WIN32_NO_STATUS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" #include "winternl.h" -#include "winreg.h" -#include "setupapi.h" -#include "cfgmgr32.h" #include "winioctl.h" #include "hidusage.h" #include "ddk/wdm.h" @@ -47,8 +41,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(plugplay); WINE_DECLARE_DEBUG_CHANNEL(hid_report); -static const WCHAR backslashW[] = {'\\',0}; - struct product_desc { WORD vid; @@ -223,23 +215,20 @@ static WCHAR *get_compatible_ids(DEVICE_OBJECT *device) DEVICE_OBJECT *bus_create_hid_device(const WCHAR *busidW, WORD vid, WORD pid, WORD input, DWORD version, DWORD uid, const WCHAR *serialW, BOOL is_gamepad, - const GUID *class, const platform_vtbl *vtbl, DWORD platform_data_size) + const platform_vtbl *vtbl, DWORD platform_data_size) { static const WCHAR device_name_fmtW[] = {'\\','D','e','v','i','c','e','\\','%','s','#','%','p',0}; - WCHAR *id, instance[MAX_DEVICE_ID_LEN]; struct device_extension *ext; struct pnp_device *pnp_dev; DEVICE_OBJECT *device; UNICODE_STRING nameW; WCHAR dev_name[256]; - HDEVINFO devinfo; - SP_DEVINFO_DATA data = {sizeof(data)}; NTSTATUS status; DWORD length; - TRACE("(%s, %04x, %04x, %04x, %u, %u, %s, %u, %s, %p, %u)\n", + TRACE("(%s, %04x, %04x, %04x, %u, %u, %s, %u, %p, %u)\n", debugstr_w(busidW), vid, pid, input, version, uid, debugstr_w(serialW), - is_gamepad, debugstr_guid(class), vtbl, platform_data_size); + is_gamepad, vtbl, platform_data_size); if (!(pnp_dev = HeapAlloc(GetProcessHeap(), 0, sizeof(*pnp_dev)))) return NULL; @@ -286,41 +275,6 @@ DEVICE_OBJECT *bus_create_hid_device(const WCHAR *busidW, WORD vid, WORD pid, list_add_tail(&pnp_devset, &pnp_dev->entry); LeaveCriticalSection(&device_list_cs); - - devinfo = SetupDiCreateDeviceInfoList(class, NULL); - if (devinfo == INVALID_HANDLE_VALUE) - { - ERR("failed to create device info list, error %#x\n", GetLastError()); - goto error; - } - - if (!(id = get_device_id(device))) - { - ERR("failed to generate instance id\n"); - goto error; - } - strcpyW(instance, id); - ExFreePool(id); - - if (!(id = get_instance_id(device))) - { - ERR("failed to generate instance id\n"); - goto error; - } - strcatW(instance, backslashW); - strcatW(instance, id); - ExFreePool(id); - - if (SetupDiCreateDeviceInfoW(devinfo, instance, class, NULL, NULL, DICD_INHERIT_CLASSDRVS, &data)) - { - if (!SetupDiRegisterDeviceInfo(devinfo, &data, 0, NULL, NULL, NULL)) - ERR("failed to register device info, error %#x\n", GetLastError()); - } - else if (GetLastError() != ERROR_DEVINST_ALREADY_EXISTS) - ERR("failed to create device info, error %#x\n", GetLastError()); - -error: - SetupDiDestroyDeviceInfoList(devinfo); return device; } @@ -556,11 +510,9 @@ static const platform_vtbl mouse_vtbl = static void mouse_device_create(void) { - static const GUID wine_mouse_class = {0xdfe2580e,0x52fd,0x453d,{0xa2,0xc1,0x33,0x81,0xf2,0x32,0x68,0x4c}}; static const WCHAR busidW[] = {'W','I','N','E','M','O','U','S','E',0}; - mouse_obj = bus_create_hid_device(busidW, 0, 0, -1, 0, 0, busidW, FALSE, - &wine_mouse_class, &mouse_vtbl, 0); + mouse_obj = bus_create_hid_device(busidW, 0, 0, -1, 0, 0, busidW, FALSE, &mouse_vtbl, 0); IoInvalidateDeviceRelations(bus_pdo, BusRelations); }

1 0

Paul Gofman : ddraw/tests: Add tests for alpha component in surface format conversions.
by Alexandre Julliard 07 Nov '19

07 Nov '19

Module: wine Branch: master Commit: c96f0682d0dfb106c779b13ffbfda66d867002a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c96f0682d0dfb106c779b13f… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Nov 6 16:45:23 2019 +0300 ddraw/tests: Add tests for alpha component in surface format conversions. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw7.c | 276 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 276 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c96f0682d0dfb106c779…

1 0

Zebediah Figura : d3d9/tests: Add another flush to work around an intermittent test failure on fvwm2.
by Alexandre Julliard 07 Nov '19

07 Nov '19

Module: wine Branch: master Commit: eb13c3286f76788770131955861d8cce2800da09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb13c3286f76788770131955… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Nov 6 10:20:20 2019 -0600 d3d9/tests: Add another flush to work around an intermittent test failure on fvwm2. 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/d3d9/tests/d3d9ex.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 38f49572fe..d0967f0ac0 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -3124,6 +3124,7 @@ static void test_wndproc(void) "Expected IsIconic %u, got %u, i=%u.\n", tests[i].iconic, IsIconic(focus_window), i); ShowWindow(focus_window, SW_SHOWNOACTIVATE); + flush_events(); ShowWindow(focus_window, SW_SHOWMINNOACTIVE); flush_events();

1 0

Zebediah Figura : wined3d: Introduce wined3d_stateblock_set_viewport().
by Alexandre Julliard 07 Nov '19

07 Nov '19

Module: wine Branch: master Commit: 6f6e440e088436d97702cadda0002446ae84f972 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f6e440e088436d97702cadd… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Nov 6 10:20:21 2019 -0600 wined3d: Introduce wined3d_stateblock_set_viewport(). 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/stateblock.c | 9 +++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 3 files changed, 11 insertions(+) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 24fd551adc..1d522ad89b 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1546,6 +1546,15 @@ void CDECL wined3d_stateblock_set_material(struct wined3d_stateblock *stateblock stateblock->changed.material = TRUE; } +void CDECL wined3d_stateblock_set_viewport(struct wined3d_stateblock *stateblock, + const struct wined3d_viewport *viewport) +{ + TRACE("stateblock %p, viewport %p.\n", stateblock, viewport); + + stateblock->stateblock_state.viewport = *viewport; + stateblock->changed.viewport = TRUE; +} + static void init_default_render_states(DWORD rs[WINEHIGHEST_RENDER_STATE + 1], const struct wined3d_d3d_info *d3d_info) { union diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 4f3cdf9b7b..48e5ea954b 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -277,6 +277,7 @@ @ cdecl wined3d_stateblock_set_transform(ptr long ptr) @ cdecl wined3d_stateblock_set_vertex_declaration(ptr ptr) @ cdecl wined3d_stateblock_set_vertex_shader(ptr ptr) +@ cdecl wined3d_stateblock_set_viewport(ptr ptr) @ cdecl wined3d_stateblock_set_vs_consts_b(ptr long long ptr) @ cdecl wined3d_stateblock_set_vs_consts_f(ptr long long ptr) @ cdecl wined3d_stateblock_set_vs_consts_i(ptr long long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 0b535475d0..c311ded731 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2692,6 +2692,7 @@ void __cdecl wined3d_stateblock_set_transform(struct wined3d_stateblock *statebl void __cdecl wined3d_stateblock_set_vertex_declaration(struct wined3d_stateblock *stateblock, struct wined3d_vertex_declaration *declaration); void __cdecl wined3d_stateblock_set_vertex_shader(struct wined3d_stateblock *stateblock, struct wined3d_shader *shader); +void __cdecl wined3d_stateblock_set_viewport(struct wined3d_stateblock *stateblock, const struct wined3d_viewport *viewport); HRESULT __cdecl wined3d_stateblock_set_vs_consts_b(struct wined3d_stateblock *stateblock, unsigned int start_idx, unsigned int count, const BOOL *constants); HRESULT __cdecl wined3d_stateblock_set_vs_consts_f(struct wined3d_stateblock *stateblock,

1 0

Zebediah Figura : d3d9: Handle stateblocks in d3d9_device_SetViewport().
by Alexandre Julliard 07 Nov '19

07 Nov '19

Module: wine Branch: master Commit: 960a460e37a4677891126979c5a282d55e943d9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=960a460e37a4677891126979… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Nov 6 10:20:22 2019 -0600 d3d9: Handle stateblocks in d3d9_device_SetViewport(). 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/d3d9/device.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 7224c31e6e..b4ba9223e0 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2123,7 +2123,9 @@ static HRESULT WINAPI d3d9_device_SetViewport(IDirect3DDevice9Ex *iface, const D vp.max_z = viewport->MaxZ; wined3d_mutex_lock(); - wined3d_device_set_viewports(device->wined3d_device, 1, &vp); + wined3d_stateblock_set_viewport(device->update_state, &vp); + if (!device->recording) + wined3d_device_set_viewports(device->wined3d_device, 1, &vp); wined3d_mutex_unlock(); return D3D_OK;

1 0

Zebediah Figura : d3d8: Handle stateblocks in d3d8_device_SetViewport().
by Alexandre Julliard 07 Nov '19

07 Nov '19

Module: wine Branch: master Commit: 00e98852e2cb65c364b8f85cce317bfeecf4a590 URL: https://source.winehq.org/git/wine.git/?a=commit;h=00e98852e2cb65c364b8f85c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Nov 6 10:20:23 2019 -0600 d3d8: Handle stateblocks in d3d8_device_SetViewport(). 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/d3d8/device.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 0aa326fad5..8cd85776f1 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1682,7 +1682,9 @@ static HRESULT WINAPI d3d8_device_SetViewport(IDirect3DDevice8 *iface, const D3D vp.min_z = viewport->MinZ; vp.max_z = viewport->MaxZ; - wined3d_device_set_viewports(device->wined3d_device, 1, &vp); + wined3d_stateblock_set_viewport(device->update_state, &vp); + if (!device->recording) + wined3d_device_set_viewports(device->wined3d_device, 1, &vp); wined3d_mutex_unlock(); return D3D_OK;

1 0

Zebediah Figura : ddraw: Handle stateblocks in d3d_device7_SetViewport().
by Alexandre Julliard 07 Nov '19

07 Nov '19

Module: wine Branch: master Commit: 227d5a32e3b8d76720e2dea8d30088ef3b4c3a85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=227d5a32e3b8d76720e2dea8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Nov 6 10:20:24 2019 -0600 ddraw: Handle stateblocks in d3d_device7_SetViewport(). 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/ddraw/device.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index cef865948b..e2643e6589 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -5358,7 +5358,9 @@ static HRESULT d3d_device7_SetViewport(IDirect3DDevice7 *iface, D3DVIEWPORT7 *vi vp.min_z = viewport->dvMinZ; vp.max_z = viewport->dvMaxZ; - wined3d_device_set_viewports(device->wined3d_device, 1, &vp); + wined3d_stateblock_set_viewport(device->update_state, &vp); + if (!device->recording) + wined3d_device_set_viewports(device->wined3d_device, 1, &vp); wined3d_mutex_unlock(); return D3D_OK;

1 0

Alexandre Julliard : winver: Fix program exit code.
by Alexandre Julliard 07 Nov '19

07 Nov '19

Module: wine Branch: master Commit: 4e81171e1281b08a08e099eb5dcf9fd9b04dda3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e81171e1281b08a08e099eb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 7 12:34:14 2019 +0100 winver: Fix program exit code. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winver/winver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winver/winver.c b/programs/winver/winver.c index 8d725ac73b..96ee25748a 100644 --- a/programs/winver/winver.c +++ b/programs/winver/winver.c @@ -24,5 +24,5 @@ int PASCAL WinMain (HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show) { - return ShellAboutA(NULL, PACKAGE_NAME, PACKAGE_STRING, 0); + return !ShellAboutA(NULL, PACKAGE_NAME, PACKAGE_STRING, 0); }

1 0

Alexandre Julliard : ntdll: Support running .exe.so binaries in RtlCreateUserProcess().
by Alexandre Julliard 07 Nov '19

07 Nov '19

Module: wine Branch: master Commit: 051a8ddd045b897190279a3f451e39a61fd14dcb URL: https://source.winehq.org/git/wine.git/?a=commit;h=051a8ddd045b897190279a3f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 7 12:28:11 2019 +0100 ntdll: Support running .exe.so binaries in RtlCreateUserProcess(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/process.c | 119 ++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 114 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 7c108f2896..3dbd589f54 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -1161,6 +1161,112 @@ static BOOL is_builtin_path( UNICODE_STRING *path, BOOL *is_64bit ) } +/*********************************************************************** + * get_so_file_info + */ +static BOOL get_so_file_info( HANDLE handle, pe_image_info_t *info ) +{ + union + { + struct + { + unsigned char magic[4]; + unsigned char class; + unsigned char data; + unsigned char version; + unsigned char ignored1[9]; + unsigned short type; + unsigned short machine; + unsigned char ignored2[8]; + unsigned int phoff; + unsigned char ignored3[12]; + unsigned short phnum; + } elf; + struct + { + unsigned char magic[4]; + unsigned char class; + unsigned char data; + unsigned char ignored1[10]; + unsigned short type; + unsigned short machine; + unsigned char ignored2[12]; + unsigned __int64 phoff; + unsigned char ignored3[16]; + unsigned short phnum; + } elf64; + struct + { + unsigned int magic; + unsigned int cputype; + unsigned int cpusubtype; + unsigned int filetype; + } macho; + IMAGE_DOS_HEADER mz; + } header; + + IO_STATUS_BLOCK io; + LARGE_INTEGER offset; + + offset.QuadPart = 0; + if (NtReadFile( handle, 0, NULL, NULL, &io, &header, sizeof(header), &offset, 0 )) return FALSE; + if (io.Information != sizeof(header)) return FALSE; + + if (!memcmp( header.elf.magic, "\177ELF", 4 )) + { + unsigned int type; + unsigned short phnum; + + if (header.elf.version != 1 /* EV_CURRENT */) return FALSE; +#ifdef WORDS_BIGENDIAN + if (header.elf.data != 2 /* ELFDATA2MSB */) return FALSE; +#else + if (header.elf.data != 1 /* ELFDATA2LSB */) return FALSE; +#endif + switch (header.elf.machine) + { + case 3: info->cpu = CPU_x86; break; + case 20: info->cpu = CPU_POWERPC; break; + case 40: info->cpu = CPU_ARM; break; + case 62: info->cpu = CPU_x86_64; break; + case 183: info->cpu = CPU_ARM64; break; + } + if (header.elf.type != 3 /* ET_DYN */) return FALSE; + if (header.elf.class == 2 /* ELFCLASS64 */) + { + offset.QuadPart = header.elf64.phoff; + phnum = header.elf64.phnum; + } + else + { + offset.QuadPart = header.elf.phoff; + phnum = header.elf.phnum; + } + while (phnum--) + { + if (NtReadFile( handle, 0, NULL, NULL, &io, &type, sizeof(type), &offset, 0 )) return FALSE; + if (io.Information < sizeof(type)) return FALSE; + if (type == 3 /* PT_INTERP */) return FALSE; + offset.QuadPart += (header.elf.class == 2) ? 56 : 32; + } + return TRUE; + } + else if (header.macho.magic == 0xfeedface || header.macho.magic == 0xfeedfacf) + { + switch (header.macho.cputype) + { + case 0x00000007: info->cpu = CPU_x86; break; + case 0x01000007: info->cpu = CPU_x86_64; break; + case 0x0000000c: info->cpu = CPU_ARM; break; + case 0x0100000c: info->cpu = CPU_ARM64; break; + case 0x00000012: info->cpu = CPU_POWERPC; break; + } + if (header.macho.filetype == 8) return TRUE; + } + return FALSE; +} + + /*********************************************************************** * get_pe_file_info */ @@ -1172,16 +1278,16 @@ static NTSTATUS get_pe_file_info( UNICODE_STRING *path, ULONG attributes, OBJECT_ATTRIBUTES attr; IO_STATUS_BLOCK io; + memset( info, 0, sizeof(*info) ); InitializeObjectAttributes( &attr, path, attributes, 0, 0 ); if ((status = NtOpenFile( handle, GENERIC_READ, &attr, &io, - FILE_SHARE_READ | FILE_SHARE_DELETE, 0 ))) + FILE_SHARE_READ | FILE_SHARE_DELETE, FILE_SYNCHRONOUS_IO_NONALERT ))) { BOOL is_64bit; if (is_builtin_path( path, &is_64bit )) { TRACE( "assuming %u-bit builtin for %s\n", is_64bit ? 64 : 32, debugstr_us(path)); - memset( info, 0, sizeof(*info) ); /* assume current arch */ #if defined(__i386__) || defined(__x86_64__) info->cpu = is_64bit ? CPU_x86_64 : CPU_x86; @@ -1212,6 +1318,10 @@ static NTSTATUS get_pe_file_info( UNICODE_STRING *path, ULONG attributes, SERVER_END_REQ; NtClose( mapping ); } + else if (status == STATUS_INVALID_IMAGE_NOT_MZ) + { + if (get_so_file_info( *handle, info )) return STATUS_SUCCESS; + } return status; } @@ -1341,12 +1451,11 @@ NTSTATUS WINAPI RtlCreateUserProcess( UNICODE_STRING *path, ULONG attributes, switch (status) { case STATUS_INVALID_IMAGE_WIN_64: - ERR( "64-bit application %s not supported in 32-bit prefix\n", - debugstr_us( &params->ImagePathName )); + ERR( "64-bit application %s not supported in 32-bit prefix\n", debugstr_us(path) ); break; case STATUS_INVALID_IMAGE_FORMAT: ERR( "%s not supported on this installation (%s binary)\n", - debugstr_us( &params->ImagePathName ), cpu_names[pe_info.cpu] ); + debugstr_us(path), cpu_names[pe_info.cpu] ); break; } goto done;

1 0