wine-commits July 2019

wine-commits@winehq.org

2 participants
228 discussions

Jacek Caban : kernel32/tests: Add more debugger tests.
by Alexandre Julliard 04 Jul '19

04 Jul '19

Module: wine Branch: master Commit: 6aaa2b23a33a43d637f84eb5eac99319b03b7782 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6aaa2b23a33a43d637f84eb5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 4 13:37:31 2019 +0200 kernel32/tests: Add more debugger tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/debugger.c | 270 +++++++++++++++++++++++++++++++++++++---- 1 file changed, 248 insertions(+), 22 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6aaa2b23a33a43d637f8…

1 0

Zebediah Figura : user32: Factor out add_device().
by Alexandre Julliard 04 Jul '19

04 Jul '19

Module: wine Branch: master Commit: 5b39ef03d699b7684db72fcc068f54246b1f0442 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b39ef03d699b7684db72fcc… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jul 2 18:08:00 2019 -0500 user32: Factor out add_device(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/rawinput.c | 142 ++++++++++++++++++++++++++----------------------- 1 file changed, 74 insertions(+), 68 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index 2949264..49cf9f7 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -85,20 +85,73 @@ static BOOL array_reserve(void **elements, unsigned int *capacity, unsigned int return TRUE; } +static struct hid_device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface) +{ + SP_DEVICE_INTERFACE_DETAIL_DATA_W *detail; + struct hid_device *device; + HANDLE file; + WCHAR *path; + DWORD size; + + SetupDiGetDeviceInterfaceDetailW(set, iface, NULL, 0, &size, NULL); + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) + { + ERR("Failed to get device path, error %#x.\n", GetLastError()); + return FALSE; + } + if (!(detail = heap_alloc(size))) + { + ERR("Failed to allocate memory.\n"); + return FALSE; + } + detail->cbSize = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W); + SetupDiGetDeviceInterfaceDetailW(set, iface, detail, size, NULL, NULL); + + TRACE("Found HID device %s.\n", debugstr_w(detail->DevicePath)); + + if (!(path = heap_strdupW(detail->DevicePath))) + { + ERR("Failed to allocate memory.\n"); + heap_free(detail); + return NULL; + } + heap_free(detail); + + file = CreateFileW(path, GENERIC_READ | GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0); + if (file == INVALID_HANDLE_VALUE) + { + ERR("Failed to open device file %s, error %u.\n", debugstr_w(path), GetLastError()); + heap_free(path); + return NULL; + } + + if (!array_reserve((void **)&hid_devices, &hid_devices_max, hid_devices_count + 1, sizeof(*hid_devices))) + { + ERR("Failed to allocate memory.\n"); + CloseHandle(file); + heap_free(path); + return NULL; + } + + device = &hid_devices[hid_devices_count++]; + device->path = path; + device->file = file; + + return device; +} + static void find_hid_devices(void) { static ULONGLONG last_check; SP_DEVICE_INTERFACE_DATA iface = { sizeof(iface) }; - SP_DEVICE_INTERFACE_DETAIL_DATA_W *detail; - DWORD detail_size, needed; + struct hid_device *device; HIDD_ATTRIBUTES attr; - DWORD idx, didx; HIDP_CAPS caps; GUID hid_guid; HDEVINFO set; - HANDLE file; - WCHAR *path; + DWORD idx; if (GetTickCount64() - last_check < 2000) return; @@ -108,87 +161,40 @@ static void find_hid_devices(void) set = SetupDiGetClassDevsW(&hid_guid, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT); - detail_size = sizeof(*detail) + (MAX_PATH * sizeof(WCHAR)); - if (!(detail = heap_alloc(detail_size))) - return; - detail->cbSize = sizeof(*detail); - EnterCriticalSection(&hid_devices_cs); /* destroy previous list */ - for (didx = 0; didx < hid_devices_count; ++didx) + for (idx = 0; idx < hid_devices_count; ++idx) { - CloseHandle(hid_devices[didx].file); - heap_free(hid_devices[didx].path); + CloseHandle(hid_devices[idx].file); + heap_free(hid_devices[idx].path); } - didx = 0; + hid_devices_count = 0; for (idx = 0; SetupDiEnumDeviceInterfaces(set, NULL, &hid_guid, idx, &iface); ++idx) { - if (!SetupDiGetDeviceInterfaceDetailW(set, &iface, detail, detail_size, &needed, NULL)) - { - if (!(detail = heap_realloc(detail, needed))) - { - ERR("Failed to allocate memory.\n"); - goto done; - } - detail_size = needed; - - SetupDiGetDeviceInterfaceDetailW(set, &iface, detail, detail_size, NULL, NULL); - } - - if (!(path = heap_strdupW(detail->DevicePath))) - { - ERR("Failed to allocate memory.\n"); - goto done; - } - - file = CreateFileW(path, GENERIC_READ | GENERIC_WRITE, - FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0); - if (file == INVALID_HANDLE_VALUE) - { - ERR("Failed to open device file %s, error %u.\n", debugstr_w(path), GetLastError()); - heap_free(path); + if (!(device = add_device(set, &iface))) continue; - } - - if (!array_reserve((void **)&hid_devices, &hid_devices_max, didx + 1, sizeof(*hid_devices))) - { - ERR("Failed to allocate memory.\n"); - CloseHandle(file); - heap_free(path); - goto done; - } - - TRACE("Found HID device %s.\n", debugstr_w(path)); - - hid_devices[didx].path = path; - hid_devices[didx].file = file; attr.Size = sizeof(HIDD_ATTRIBUTES); - if (!HidD_GetAttributes(file, &attr)) - WARN_(rawinput)("Failed to get attributes.\n"); - hid_devices[didx].info.dwVendorId = attr.VendorID; - hid_devices[didx].info.dwProductId = attr.ProductID; - hid_devices[didx].info.dwVersionNumber = attr.VersionNumber; + if (!HidD_GetAttributes(device->file, &attr)) + WARN("Failed to get attributes.\n"); + device->info.dwVendorId = attr.VendorID; + device->info.dwProductId = attr.ProductID; + device->info.dwVersionNumber = attr.VersionNumber; - if (!HidD_GetPreparsedData(file, &hid_devices[didx].data)) - WARN_(rawinput)("Failed to get preparsed data.\n"); + if (!HidD_GetPreparsedData(device->file, &device->data)) + WARN("Failed to get preparsed data.\n"); - if (!HidP_GetCaps(hid_devices[didx].data, &caps)) - WARN_(rawinput)("Failed to get caps.\n"); + if (!HidP_GetCaps(device->data, &caps)) + WARN("Failed to get caps.\n"); - hid_devices[didx].info.usUsagePage = caps.UsagePage; - hid_devices[didx].info.usUsage = caps.Usage; - - didx++; + device->info.usUsagePage = caps.UsagePage; + device->info.usUsage = caps.Usage; } - hid_devices_count = didx; -done: LeaveCriticalSection(&hid_devices_cs); SetupDiDestroyDeviceInfoList(set); - heap_free(detail); } /***********************************************************************

1 0

Zebediah Figura : user32: Introduce and use an array_reserve() helper.
by Alexandre Julliard 04 Jul '19

04 Jul '19

Module: wine Branch: master Commit: e1d6146fca36179fe9ed8d7bd5326206b2a89dcd URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1d6146fca36179fe9ed8d7b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jul 2 18:07:59 2019 -0500 user32: Introduce and use an array_reserve() helper. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/rawinput.c | 51 +++++++++++++++++++++++++++++++------------------- 1 file changed, 32 insertions(+), 19 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index 56ea249..2949264 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -58,6 +58,33 @@ static CRITICAL_SECTION_DEBUG hid_devices_cs_debug = }; static CRITICAL_SECTION hid_devices_cs = { &hid_devices_cs_debug, -1, 0, 0, 0, 0 }; +static BOOL array_reserve(void **elements, unsigned int *capacity, unsigned int count, unsigned int size) +{ + unsigned int new_capacity, max_capacity; + void *new_elements; + + if (count <= *capacity) + return TRUE; + + max_capacity = ~(SIZE_T)0 / size; + if (count > max_capacity) + return FALSE; + + new_capacity = max(4, *capacity); + while (new_capacity < count && new_capacity <= max_capacity / 2) + new_capacity *= 2; + if (new_capacity < count) + new_capacity = max_capacity; + + if (!(new_elements = heap_realloc(*elements, new_capacity * size))) + return FALSE; + + *elements = new_elements; + *capacity = new_capacity; + + return TRUE; +} + static void find_hid_devices(void) { static ULONGLONG last_check; @@ -125,26 +152,12 @@ static void find_hid_devices(void) continue; } - if (didx >= hid_devices_max) + if (!array_reserve((void **)&hid_devices, &hid_devices_max, didx + 1, sizeof(*hid_devices))) { - if (hid_devices) - { - hid_devices_max *= 2; - hid_devices = heap_realloc(hid_devices, - hid_devices_max * sizeof(hid_devices[0])); - } - else - { - hid_devices_max = 8; - hid_devices = heap_alloc(hid_devices_max * sizeof(hid_devices[0])); - } - if (!hid_devices) - { - ERR("Failed to allocate memory.\n"); - CloseHandle(file); - heap_free(path); - goto done; - } + ERR("Failed to allocate memory.\n"); + CloseHandle(file); + heap_free(path); + goto done; } TRACE("Found HID device %s.\n", debugstr_w(path));

1 0

Zebediah Figura : hidclass.sys: Create a mouse device interface for HID mouse devices.
by Alexandre Julliard 04 Jul '19

04 Jul '19

Module: wine Branch: master Commit: b84334d2bd3e507f5c7b81ce13c22f8f76cdce3e URL: https://source.winehq.org/git/wine.git/?a=commit;h=b84334d2bd3e507f5c7b81ce… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jul 2 18:07:58 2019 -0500 hidclass.sys: Create a mouse device interface for HID mouse devices. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 9 +++++++++ dlls/hidclass.sys/hid.h | 3 +++ dlls/hidclass.sys/pnp.c | 5 +++++ 3 files changed, 17 insertions(+) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 9470f7d..0e905c8 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -33,6 +33,7 @@ #include "initguid.h" #include "devguid.h" +#include "ntddmou.h" WINE_DEFAULT_DEBUG_CHANNEL(hid); WINE_DECLARE_DEBUG_CHANNEL(hid_report); @@ -122,6 +123,14 @@ NTSTATUS HID_LinkDevice(DEVICE_OBJECT *device) return status; } + /* FIXME: This should probably be done in mouhid.sys. */ + if (ext->preparseData->caps.UsagePage == HID_USAGE_PAGE_GENERIC + && ext->preparseData->caps.Usage == HID_USAGE_GENERIC_MOUSE) + { + if (!IoRegisterDeviceInterface(device, &GUID_DEVINTERFACE_MOUSE, NULL, &ext->mouse_link_name)) + ext->is_mouse = TRUE; + } + return STATUS_SUCCESS; error: diff --git a/dlls/hidclass.sys/hid.h b/dlls/hidclass.sys/hid.h index 0f82323..86d7bdf 100644 --- a/dlls/hidclass.sys/hid.h +++ b/dlls/hidclass.sys/hid.h @@ -55,6 +55,9 @@ typedef struct _BASE_DEVICE_EXTENSION { KSPIN_LOCK irp_queue_lock; LIST_ENTRY irp_queue; + BOOL is_mouse; + UNICODE_STRING mouse_link_name; + /* Minidriver Specific stuff will end up here */ } BASE_DEVICE_EXTENSION; diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index 8265efd..b5c9987 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -215,6 +215,9 @@ NTSTATUS PNP_RemoveDevice(minidriver *minidriver, DEVICE_OBJECT *device, IRP *ir return rc; } + if (ext->is_mouse) + IoSetDeviceInterfaceState(&ext->mouse_link_name, FALSE); + if (irp) rc = minidriver->PNPDispatch(device, irp); HID_DeleteDevice(device); @@ -294,6 +297,8 @@ NTSTATUS WINAPI HID_PNP_Dispatch(DEVICE_OBJECT *device, IRP *irp) rc = minidriver->PNPDispatch(device, irp); IoSetDeviceInterfaceState(&ext->link_name, TRUE); + if (ext->is_mouse) + IoSetDeviceInterfaceState(&ext->mouse_link_name, TRUE); return rc; } case IRP_MN_REMOVE_DEVICE:

1 0

Zebediah Figura : include: Add ntddmou.h.
by Alexandre Julliard 04 Jul '19

04 Jul '19

Module: wine Branch: master Commit: 37d51cd1570667e2ce855fb922b5e93fa0a71390 URL: https://source.winehq.org/git/wine.git/?a=commit;h=37d51cd1570667e2ce855fb9… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jul 2 18:07:57 2019 -0500 include: Add ntddmou.h. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/ntddmou.h | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index e9312b3..6913587 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -477,6 +477,7 @@ SOURCES = \ nserror.h \ nspapi.h \ ntddcdrm.h \ + ntddmou.h \ ntddndis.h \ ntddscsi.h \ ntddstor.h \ diff --git a/include/ntddmou.h b/include/ntddmou.h new file mode 100644 index 0000000..828a3e3 --- /dev/null +++ b/include/ntddmou.h @@ -0,0 +1,24 @@ +/* + * Copyright 2019 Zebediah Figura for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _NTDDMOU_ +#define _NTDDMOU_ + +DEFINE_GUID(GUID_DEVINTERFACE_MOUSE, 0x378de44c, 0x56ef, 0x11d1, 0xbc, 0x8c, 0x00, 0xa0, 0xc9, 0x14, 0x05, 0xdd); + +#endif

1 0

Zebediah Figura : winehid.inf: Add WINEMOUSE to the list of winehid device IDs.
by Alexandre Julliard 04 Jul '19

04 Jul '19

Module: wine Branch: master Commit: f67bd0216593d405ac941038f402cd8a30622960 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f67bd0216593d405ac941038… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jul 2 18:07:56 2019 -0500 winehid.inf: Add WINEMOUSE to the list of winehid device IDs. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/winehid.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/winehid.inf.in b/loader/winehid.inf.in index bd42bce..566448e 100644 --- a/loader/winehid.inf.in +++ b/loader/winehid.inf.in @@ -11,6 +11,7 @@ Wine hidraw device=device_section,HIDRAW Wine IOHID device=device_section,IOHID Wine libevent device=device_section,LNXEV Wine SDL HID device=device_section,SDLJOY +Wine mouse device=device_section,WINEMOUSE [device_section.Services] AddService = winehid,0x2,svc_section

1 0

Zebediah Figura : winebus.sys: Create a stub mouse device.
by Alexandre Julliard 04 Jul '19

04 Jul '19

Module: wine Branch: master Commit: 9c6ea019358eadcf86159872e2890ffc94960965 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c6ea019358eadcf86159872… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jul 2 18:07:55 2019 -0500 winebus.sys: Create a stub mouse device. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/main.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 3616ebe..89ea65b 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -33,13 +33,16 @@ #include "setupapi.h" #include "cfgmgr32.h" #include "winioctl.h" +#include "hidusage.h" #include "ddk/wdm.h" #include "ddk/hidport.h" +#include "ddk/hidtypes.h" #include "wine/debug.h" #include "wine/unicode.h" #include "wine/list.h" #include "bus.h" +#include "controller.h" WINE_DEFAULT_DEBUG_CHANNEL(plugplay); WINE_DECLARE_DEBUG_CHANNEL(hid_report); @@ -66,6 +69,8 @@ static const WORD PID_XBOX_CONTROLLERS[] = { static DRIVER_OBJECT *driver_obj; +static DEVICE_OBJECT *mouse_obj; + HANDLE driver_key; struct pnp_device @@ -767,6 +772,76 @@ static void WINAPI driver_unload(DRIVER_OBJECT *driver) NtClose(driver_key); } +static NTSTATUS mouse_get_reportdescriptor(DEVICE_OBJECT *device, BYTE *buffer, DWORD length, DWORD *ret_length) +{ + TRACE("buffer %p, length %u.\n", buffer, length); + + *ret_length = sizeof(REPORT_HEADER) + sizeof(REPORT_TAIL); + if (length < sizeof(REPORT_HEADER) + sizeof(REPORT_TAIL)) + return STATUS_BUFFER_TOO_SMALL; + + memcpy(buffer, REPORT_HEADER, sizeof(REPORT_HEADER)); + memcpy(buffer + sizeof(REPORT_HEADER), REPORT_TAIL, sizeof(REPORT_TAIL)); + buffer[IDX_HEADER_PAGE] = HID_USAGE_PAGE_GENERIC; + buffer[IDX_HEADER_USAGE] = HID_USAGE_GENERIC_MOUSE; + + return STATUS_SUCCESS; +} + +static NTSTATUS mouse_get_string(DEVICE_OBJECT *device, DWORD index, WCHAR *buffer, DWORD length) +{ + static const WCHAR nameW[] = {'W','i','n','e',' ','H','I','D',' ','m','o','u','s','e',0}; + if (index != HID_STRING_ID_IPRODUCT) + return STATUS_NOT_IMPLEMENTED; + if (length < ARRAY_SIZE(nameW)) + return STATUS_BUFFER_TOO_SMALL; + strcpyW(buffer, nameW); + return STATUS_SUCCESS; +} + +static NTSTATUS mouse_begin_report_processing(DEVICE_OBJECT *device) +{ + return STATUS_SUCCESS; +} + +static NTSTATUS mouse_set_output_report(DEVICE_OBJECT *device, UCHAR id, BYTE *report, DWORD length, ULONG_PTR *ret_length) +{ + FIXME("id %u, stub!\n", id); + return STATUS_NOT_IMPLEMENTED; +} + +static NTSTATUS mouse_get_feature_report(DEVICE_OBJECT *device, UCHAR id, BYTE *report, DWORD length, ULONG_PTR *ret_length) +{ + FIXME("id %u, stub!\n", id); + return STATUS_NOT_IMPLEMENTED; +} + +static NTSTATUS mouse_set_feature_report(DEVICE_OBJECT *device, UCHAR id, BYTE *report, DWORD length, ULONG_PTR *ret_length) +{ + FIXME("id %u, stub!\n", id); + return STATUS_NOT_IMPLEMENTED; +} + +static const platform_vtbl mouse_vtbl = +{ + .get_reportdescriptor = mouse_get_reportdescriptor, + .get_string = mouse_get_string, + .begin_report_processing = mouse_begin_report_processing, + .set_output_report = mouse_set_output_report, + .get_feature_report = mouse_get_feature_report, + .set_feature_report = mouse_set_feature_report, +}; + +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); + IoInvalidateDeviceRelations(mouse_obj, BusRelations); +} + NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) { static const WCHAR SDL_enabledW[] = {'E','n','a','b','l','e',' ','S','D','L',0}; @@ -788,6 +863,8 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) driver->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL] = hid_internal_dispatch; driver->DriverUnload = driver_unload; + mouse_device_create(); + if (check_bus_option(&SDL_enabled, 1)) { if (sdl_driver_init() == STATUS_SUCCESS)

1 0

Hans Leidekker : wbemprox: Build with msvcrt.
by Alexandre Julliard 04 Jul '19

04 Jul '19

Module: wine Branch: master Commit: dba0dd41613a91f17142a9bd8ea12b5abb881433 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dba0dd41613a91f17142a9bd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jul 4 09:27:39 2019 +0200 wbemprox: Build with msvcrt. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/Makefile.in | 2 + dlls/wbemprox/builtin.c | 157 ++++++++++++++++++--------------------- dlls/wbemprox/class.c | 19 +++-- dlls/wbemprox/main.c | 2 - dlls/wbemprox/process.c | 1 - dlls/wbemprox/qualifier.c | 9 +-- dlls/wbemprox/query.c | 61 ++++++++------- dlls/wbemprox/reg.c | 1 - dlls/wbemprox/security.c | 1 - dlls/wbemprox/service.c | 1 - dlls/wbemprox/services.c | 12 ++- dlls/wbemprox/table.c | 17 ++--- dlls/wbemprox/wbemlocator.c | 12 ++- dlls/wbemprox/wbemprox_private.h | 3 +- dlls/wbemprox/wql.y | 12 ++- 15 files changed, 141 insertions(+), 169 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dba0dd41613a91f17142…

1 0

Zebediah Figura : services: Do not overwrite the service type in SetServiceStatus().
by Alexandre Julliard 04 Jul '19

04 Jul '19

Module: wine Branch: master Commit: 4f8dfdba3df0401bdca7ceab1c0fd031446b53c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f8dfdba3df0401bdca7ceab… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 3 17:29:35 2019 -0500 services: Do not overwrite the service type in SetServiceStatus(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 2 ++ programs/services/rpc.c | 17 ++++++++++------- programs/services/tests/service.c | 8 ++++---- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 267fddb..48ddb29 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -135,6 +135,8 @@ static BOOL start_driver(HANDLE service) } ok(status.dwCurrentState == SERVICE_RUNNING, "expected SERVICE_RUNNING, got %d\n", status.dwCurrentState); + ok(status.dwServiceType == SERVICE_KERNEL_DRIVER, + "expected SERVICE_KERNEL_DRIVER, got %#x\n", status.dwServiceType); return TRUE; } diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 8a77d97..a657492 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -865,28 +865,31 @@ static void fill_notify(struct sc_notify_handle *notify, struct service_entry *s SetEvent(notify->event); } -DWORD __cdecl svcctl_SetServiceStatus( - SC_RPC_HANDLE hServiceStatus, - LPSERVICE_STATUS lpServiceStatus) +DWORD __cdecl svcctl_SetServiceStatus(SC_RPC_HANDLE handle, SERVICE_STATUS *status) { struct sc_service_handle *service, *service_handle; struct process_entry *process; DWORD err, mask; - WINE_TRACE("(%p, %p)\n", hServiceStatus, lpServiceStatus); + WINE_TRACE("(%p, %p)\n", handle, status); - if ((err = validate_service_handle(hServiceStatus, SERVICE_SET_STATUS, &service)) != 0) + if ((err = validate_service_handle(handle, SERVICE_SET_STATUS, &service)) != 0) return err; service_lock(service->service_entry); /* FIXME: be a bit more discriminant about what parts of the status we set * and check that fields are valid */ - service->service_entry->status = *lpServiceStatus; + service->service_entry->status.dwCurrentState = status->dwCurrentState; + service->service_entry->status.dwControlsAccepted = status->dwControlsAccepted; + service->service_entry->status.dwWin32ExitCode = status->dwWin32ExitCode; + service->service_entry->status.dwServiceSpecificExitCode = status->dwServiceSpecificExitCode; + service->service_entry->status.dwCheckPoint = status->dwCheckPoint; + service->service_entry->status.dwWaitHint = status->dwWaitHint; SetEvent(service->service_entry->status_changed_event); if ((process = service->service_entry->process) && - lpServiceStatus->dwCurrentState == SERVICE_STOPPED) + status->dwCurrentState == SERVICE_STOPPED) { service->service_entry->process = NULL; if (!--process->use_count) diff --git a/programs/services/tests/service.c b/programs/services/tests/service.c index f6e36fb..dcaf5f0 100644 --- a/programs/services/tests/service.c +++ b/programs/services/tests/service.c @@ -462,7 +462,7 @@ static void test_service(void) res = QueryServiceStatus(service_handle, &status); ok(res, "QueryServiceStatus failed: %d\n", GetLastError()); - todo_wine ok(status.dwServiceType == SERVICE_WIN32_OWN_PROCESS, "status.dwServiceType = %x\n", status.dwServiceType); + ok(status.dwServiceType == SERVICE_WIN32_OWN_PROCESS, "status.dwServiceType = %x\n", status.dwServiceType); ok(status.dwCurrentState == SERVICE_RUNNING, "status.dwCurrentState = %x\n", status.dwCurrentState); ok(status.dwControlsAccepted == (SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN), "status.dwControlsAccepted = %x\n", status.dwControlsAccepted); @@ -517,7 +517,7 @@ static inline void test_no_stop(void) res = QueryServiceStatus(service_handle, &status); ok(res, "QueryServiceStatus failed: %d\n", GetLastError()); - todo_wine ok(status.dwServiceType == SERVICE_WIN32_OWN_PROCESS, "status.dwServiceType = %x\n", status.dwServiceType); + ok(status.dwServiceType == SERVICE_WIN32_OWN_PROCESS, "status.dwServiceType = %x\n", status.dwServiceType); ok(status.dwCurrentState == SERVICE_RUNNING, "status.dwCurrentState = %x\n", status.dwCurrentState); ok(status.dwControlsAccepted == (SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN), "status.dwControlsAccepted = %x\n", status.dwControlsAccepted); @@ -538,7 +538,7 @@ static inline void test_no_stop(void) res = QueryServiceStatus(service_handle, &status); ok(res, "QueryServiceStatus failed: %d\n", GetLastError()); - todo_wine ok(status.dwServiceType == SERVICE_WIN32_OWN_PROCESS, "status.dwServiceType = %x\n", status.dwServiceType); + ok(status.dwServiceType == SERVICE_WIN32_OWN_PROCESS, "status.dwServiceType = %x\n", status.dwServiceType); ok(status.dwCurrentState==SERVICE_STOPPED || status.dwCurrentState==SERVICE_STOP_PENDING, "status.dwCurrentState = %x\n", status.dwCurrentState); ok(status.dwControlsAccepted == 0, "status.dwControlsAccepted = %x\n", status.dwControlsAccepted); @@ -558,7 +558,7 @@ static inline void test_no_stop(void) res = QueryServiceStatus(service_handle, &status); ok(res, "QueryServiceStatus failed: %d\n", GetLastError()); - todo_wine ok(status.dwServiceType == SERVICE_WIN32_OWN_PROCESS, "status.dwServiceType = %x\n", status.dwServiceType); + ok(status.dwServiceType == SERVICE_WIN32_OWN_PROCESS, "status.dwServiceType = %x\n", status.dwServiceType); ok(status.dwCurrentState==SERVICE_STOPPED || status.dwCurrentState==SERVICE_STOP_PENDING, "status.dwCurrentState = %x\n", status.dwCurrentState); ok(status.dwControlsAccepted == 0, "status.dwControlsAccepted = %x\n", status.dwControlsAccepted);

1 0

Zebediah Figura : services: Report a PID of 0 for drivers.
by Alexandre Julliard 04 Jul '19

04 Jul '19

Module: wine Branch: master Commit: 946e1b2f6bcd9f2f82939dce7ae5e5d343d55d56 URL: https://source.winehq.org/git/wine.git/?a=commit;h=946e1b2f6bcd9f2f82939dce… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 3 17:29:34 2019 -0500 services: Report a PID of 0 for drivers. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/rpc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 4150102..8a77d97 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -831,7 +831,9 @@ static void fill_status_process(SERVICE_STATUS_PROCESS *status, struct service_e { struct process_entry *process = service->process; memcpy(status, &service->status, sizeof(service->status)); - status->dwProcessId = process ? process->process_id : 0; + status->dwProcessId = 0; + if (process && !(service->status.dwServiceType & SERVICE_DRIVER)) + status->dwProcessId = process->process_id; status->dwServiceFlags = 0; }

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
23
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2019