wine-commits April 2022

wine-commits@winehq.org

2 participants
1024 discussions

Jeremy White : Add a todo for db.py cleanup.
by Alexandre Julliard 27 Apr '22

27 Apr '22

Module: tools Branch: master Commit: 96295d51e76b97cdf9d9e6ddbf9a78fd202f0bcd URL: https://source.winehq.org/git/tools.git/?a=commit;h=96295d51e76b97cdf9d9e6d… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Wed Apr 27 09:11:07 2022 -0500 Add a todo for db.py cleanup. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- gitlab/gitlab-to-mail/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/gitlab/gitlab-to-mail/README.md b/gitlab/gitlab-to-mail/README.md index 9f3f15b..b1d966a 100644 --- a/gitlab/gitlab-to-mail/README.md +++ b/gitlab/gitlab-to-mail/README.md @@ -17,5 +17,6 @@ * Run getmail in a loop similar to the one above / as a cron job. ## TODOs: + * Make db.py into a class that allows it to be passed the database path * Maybe have replies from the mailing list be 'unresolved'? * Super difficult: have responses from the mailing list generate the diff line_range junk

1 0

Jeremy White : Remove the CUSTOM_HEADERS option.
by Alexandre Julliard 27 Apr '22

27 Apr '22

Module: tools Branch: master Commit: 9f5f8f5dc3044b855adc54e05169dcc545bf8840 URL: https://source.winehq.org/git/tools.git/?a=commit;h=9f5f8f5dc3044b855adc54e… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Tue Apr 26 15:24:36 2022 -0500 Remove the CUSTOM_HEADERS option. We're not using it, and it is not worth getting configParser to support it. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- gitlab/gitlab-to-mail/example.cfg | 3 --- gitlab/gitlab-to-mail/gitlabtomail.py | 3 --- 2 files changed, 6 deletions(-) diff --git a/gitlab/gitlab-to-mail/example.cfg b/gitlab/gitlab-to-mail/example.cfg index 3cd31d9..19e877c 100644 --- a/gitlab/gitlab-to-mail/example.cfg +++ b/gitlab/gitlab-to-mail/example.cfg @@ -27,9 +27,6 @@ SMTP_PORT = 587 #SMTP_USER = "login" #SMTP_PASSWORD = "pass" -# can be used for mailman's 'Approved' header -CUSTOM_HEADERS = { } - # When run for the first time, how far back in time should we look for # merge requests and related events INITIAL_BACKLOG_DAYS = 5 diff --git a/gitlab/gitlab-to-mail/gitlabtomail.py b/gitlab/gitlab-to-mail/gitlabtomail.py index 0a5ef4b..2dfc72a 100755 --- a/gitlab/gitlab-to-mail/gitlabtomail.py +++ b/gitlab/gitlab-to-mail/gitlabtomail.py @@ -45,9 +45,6 @@ def send_email(message): message['Reply-To'] = settings.BRIDGE_FROM_EMAIL message['To'] = settings.BRIDGE_TO_EMAIL - for k, v in settings.CUSTOM_HEADERS.items(): - message[k] = v - encoded_message = message.as_string().encode('utf-8') if settings.DEBUG:

1 0

Jeremy White : Switch to using configparser.
by Alexandre Julliard 27 Apr '22

27 Apr '22

Module: tools Branch: master Commit: f34eb662ee91bf662222bee9316ed9f495cd2932 URL: https://source.winehq.org/git/tools.git/?a=commit;h=f34eb662ee91bf662222bee… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Tue Apr 26 15:22:17 2022 -0500 Switch to using configparser. This simply feels like a more rational way to configure these applications and will allow the runtime database to be separate from the code. NOTE: This will be a breaking change. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- gitlab/gitlab-to-mail/README.md | 6 ++--- gitlab/gitlab-to-mail/db.py | 6 ++--- .../{settings_example.py => example.cfg} | 6 ++++- gitlab/gitlab-to-mail/gitlabtomail.py | 8 ++---- gitlab/gitlab-to-mail/gitlabtomail.service | 2 +- gitlab/gitlab-to-mail/mailtogitlab.py | 7 ++---- gitlab/gitlab-to-mail/util.py | 29 ++++++++++++++++++++++ 7 files changed, 44 insertions(+), 20 deletions(-) diff --git a/gitlab/gitlab-to-mail/README.md b/gitlab/gitlab-to-mail/README.md index 993b673..9f3f15b 100644 --- a/gitlab/gitlab-to-mail/README.md +++ b/gitlab/gitlab-to-mail/README.md @@ -1,10 +1,10 @@ # GitLab <-> Mailing List bridge ## How to use - 1. Copy `settings_example.py` and name it `setting_projectname.py`. + 1. Copy `example.cfg` and name it `projectname.cfg`. 2. Tweak the values found inside. - 3. Run `gitlabtomail.py projectname` to generate emails from gitlab changes. - 4. Run `mailtogitlab.py projectname < email` to generate gitlab changes from an email. + 3. Run `gitlabtomail.py /path/to/projectname.cfg` to generate emails from gitlab changes. + 4. Run `mailtogitlab.py /path/to/projectname.cfg < email` to generate gitlab changes from an email. ## Suggested ways to achieve that * Setup ingestion IMAP mailbox that subscribes to the mailing list. diff --git a/gitlab/gitlab-to-mail/db.py b/gitlab/gitlab-to-mail/db.py index 472026c..9794abf 100644 --- a/gitlab/gitlab-to-mail/db.py +++ b/gitlab/gitlab-to-mail/db.py @@ -1,12 +1,10 @@ from sqlalchemy import create_engine, Column, Integer, Unicode, DateTime, Date from sqlalchemy.orm import declarative_base, sessionmaker +from util import Settings -import importlib -import os import sys -sys.path.append(os.getcwd()) -settings = importlib.import_module(f"settings_{sys.argv[1]}") +settings = Settings(sys.argv[1]) Base = declarative_base() diff --git a/gitlab/gitlab-to-mail/settings_example.py b/gitlab/gitlab-to-mail/example.cfg similarity index 92% rename from gitlab/gitlab-to-mail/settings_example.py rename to gitlab/gitlab-to-mail/example.cfg index 1a42216..3cd31d9 100644 --- a/gitlab/gitlab-to-mail/settings_example.py +++ b/gitlab/gitlab-to-mail/example.cfg @@ -1,3 +1,5 @@ +[settings] + # Location of the sqlite database file, which will be auto created if not found DATABASE= "/home/wine/example/db_example.sqlite" @@ -14,7 +16,9 @@ GITLAB_PROJECT_NAME = "namespace/project" BRIDGE_FROM_EMAIL = "do.not.reply(a)example.com" BRIDGE_TO_EMAIL = "bridge-list(a)lists.example.com" -BRIDGE_TAG = None # used for [PATCH $TAG 1/1] and [$TAG] for comments + +# used for [PATCH $TAG 1/1] and [$TAG] for comments +#BRIDGE_TAG = mytag SMTP_DOMAIN = "mail.example.com" SMTP_PORT = 587 diff --git a/gitlab/gitlab-to-mail/gitlabtomail.py b/gitlab/gitlab-to-mail/gitlabtomail.py index c10a0ed..0a5ef4b 100755 --- a/gitlab/gitlab-to-mail/gitlabtomail.py +++ b/gitlab/gitlab-to-mail/gitlabtomail.py @@ -5,19 +5,15 @@ from urllib.parse import urljoin, urlparse import db import re import sys -import os import datetime import dateutil.parser import requests import mailbox import smtplib import email -import importlib -from util import fetch_all +from util import fetch_all, Settings - -sys.path.append(os.getcwd()) -settings = importlib.import_module(f"settings_{sys.argv[1]}") +settings = Settings(sys.argv[1]) GITLAB_TIME_FORMAT = '%Y-%m-%dT%H:%M:%S.%fZ' diff --git a/gitlab/gitlab-to-mail/gitlabtomail.service b/gitlab/gitlab-to-mail/gitlabtomail.service index 0aeed78..3dcde7d 100644 --- a/gitlab/gitlab-to-mail/gitlabtomail.service +++ b/gitlab/gitlab-to-mail/gitlabtomail.service @@ -7,7 +7,7 @@ Type=simple Restart=always RestartSec=60 User=wine -ExecStart=/home/wine/gitlab-to-mail/runner.py wine +ExecStart=/home/wine/gitlab-to-mail/runner.py wine.cfg [Install] WantedBy=multi-user.target diff --git a/gitlab/gitlab-to-mail/mailtogitlab.py b/gitlab/gitlab-to-mail/mailtogitlab.py index 7e3c318..7fcb85b 100755 --- a/gitlab/gitlab-to-mail/mailtogitlab.py +++ b/gitlab/gitlab-to-mail/mailtogitlab.py @@ -5,14 +5,11 @@ from urllib.parse import urljoin import re import sys -import os -import importlib import email.utils import requests -from util import fetch_all +from util import fetch_all, Settings -sys.path.append(os.getcwd()) -settings = importlib.import_module(f"settings_{sys.argv[1]}") +settings = Settings(sys.argv[1]) MIN_PYTHON = (3, 8) # because of the walrus operator use if sys.version_info < MIN_PYTHON: diff --git a/gitlab/gitlab-to-mail/util.py b/gitlab/gitlab-to-mail/util.py index 37a2729..e37ead8 100644 --- a/gitlab/gitlab-to-mail/util.py +++ b/gitlab/gitlab-to-mail/util.py @@ -1,4 +1,6 @@ import requests +import configparser +import sys def fetch_all(url, settings): @@ -13,3 +15,30 @@ def fetch_all(url, settings): else: url = None return result + + +class Settings: + def __init__(self, fname): + self.cp = configparser.ConfigParser() + if len(self.cp.read(fname)) == 0: + print(f"Error: invalid configuration in {fname}.", file=sys.stderr) + sys.exit(1) + for s in ['DATABASE', 'GITLAB_TOKEN', 'GITLAB_URL', 'GITLAB_PROJECT_NAME', + 'BRIDGE_FROM_EMAIL', 'BRIDGE_TO_EMAIL', 'BRIDGE_TAG', + 'SMTP_DOMAIN', 'SMTP_USER', 'SMTP_PASSWORD']: + if s in self.cp['settings']: + self.__dict__[s] = self.cp['settings'][s].strip('"') + else: + self.__dict__[s] = None + + for s in ['DEBUG']: + if s in self.cp['settings']: + self.__dict__[s] = self.cp['settings'].getboolean(s) + else: + self.__dict__[s] = None + + for s in ['GITLAB_PROJECT_ID', 'SMTP_PORT', 'INITIAL_BACKLOG_DAYS', 'MAXIMUM_PATCHES']: + if s in self.cp['settings']: + self.__dict__[s] = self.cp['settings'].getint(s) + else: + self.__dict__[s] = None

1 0

Jeremy White : Make the database location configurable.
by Alexandre Julliard 27 Apr '22

27 Apr '22

Module: tools Branch: master Commit: 195e2f6d6f18e63b7bef4f2f9bbf88a21bf0d855 URL: https://source.winehq.org/git/tools.git/?a=commit;h=195e2f6d6f18e63b7bef4f2… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Tue Apr 26 13:29:02 2022 -0500 Make the database location configurable. Rather than being implicity based on argv[1] Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- gitlab/gitlab-to-mail/db.py | 7 ++++++- gitlab/gitlab-to-mail/settings_example.py | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/gitlab/gitlab-to-mail/db.py b/gitlab/gitlab-to-mail/db.py index 118d3c7..472026c 100644 --- a/gitlab/gitlab-to-mail/db.py +++ b/gitlab/gitlab-to-mail/db.py @@ -1,8 +1,13 @@ from sqlalchemy import create_engine, Column, Integer, Unicode, DateTime, Date from sqlalchemy.orm import declarative_base, sessionmaker +import importlib +import os import sys +sys.path.append(os.getcwd()) +settings = importlib.import_module(f"settings_{sys.argv[1]}") + Base = declarative_base() @@ -25,7 +30,7 @@ class GlobalState(Base): integer_value = Column(Integer) -engine = create_engine(f"sqlite:///db_{sys.argv[1]}.sqlite", echo=False) +engine = create_engine(f"sqlite:///{settings.DATABASE}", echo=False) Base.metadata.create_all(engine) Session = sessionmaker(bind=engine) session = Session() diff --git a/gitlab/gitlab-to-mail/settings_example.py b/gitlab/gitlab-to-mail/settings_example.py index fca80a2..1a42216 100644 --- a/gitlab/gitlab-to-mail/settings_example.py +++ b/gitlab/gitlab-to-mail/settings_example.py @@ -1,3 +1,6 @@ +# Location of the sqlite database file, which will be auto created if not found +DATABASE= "/home/wine/example/db_example.sqlite" + # if True mails are dumped to mail_dump mbox file instead of being sent out DEBUG = False

1 0

Piotr Caban : ntdll: Use 32-bit time_t when calling __NR_futex syscall.
by Alexandre Julliard 26 Apr '22

26 Apr '22

Module: wine Branch: master Commit: 4ec67b7a6447dfc4af8c03c141c600b41b90ef53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ec67b7a6447dfc4af8c03c1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 25 21:23:38 2022 +0200 ntdll: Use 32-bit time_t when calling __NR_futex syscall. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/sync.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index 1695e6ed570..1194ee514b5 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -111,6 +111,17 @@ static int futex_private = 128; static inline int futex_wait( const int *addr, int val, struct timespec *timeout ) { +#if (defined(__i386__) || defined(__arm__)) && _TIME_BITS==64 + if (timeout && sizeof(*timeout) != 8) + { + struct { + long tv_sec; + long tv_nsec; + } timeout32 = { timeout->tv_sec, timeout->tv_nsec }; + + return syscall( __NR_futex, addr, FUTEX_WAIT | futex_private, val, &timeout32, 0, 0 ); + } +#endif return syscall( __NR_futex, addr, FUTEX_WAIT | futex_private, val, timeout, 0, 0 ); }

1 0

Rémi Bernon : windows.gaming.input: Import IAsyncOperation from windows.media.speech.
by Alexandre Julliard 26 Apr '22

26 Apr '22

Module: wine Branch: master Commit: 730b35ba46e6e17f1ac9043167ddfc175e61cb5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=730b35ba46e6e17f1ac90431… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Apr 26 13:10:44 2022 +0200 windows.gaming.input: Import IAsyncOperation from windows.media.speech. Adapting it for the IAsyncOperation_boolean interface and use it to implement IForceFeedbackMotor_Try(Enable|Disable|Reset)Async. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/force_feedback.c | 32 +-- dlls/windows.gaming.input/Makefile.in | 1 + dlls/windows.gaming.input/async.c | 369 +++++++++++++++++++++++++++++ dlls/windows.gaming.input/force_feedback.c | 57 ++++- dlls/windows.gaming.input/private.h | 4 + 5 files changed, 431 insertions(+), 32 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=730b35ba46e6e17f1ac9…

1 0

Rémi Bernon : hidclass.sys: Call internal minidriver report ioctls asynchronously.
by Alexandre Julliard 26 Apr '22

26 Apr '22

Module: wine Branch: master Commit: a7d67c1c90f39d5ce1f0b9c1c5548be95097a9d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7d67c1c90f39d5ce1f0b9c1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Apr 26 13:10:43 2022 +0200 hidclass.sys: Call internal minidriver report ioctls asynchronously. Instead of calling it synchronously. Use a completion routine to wait for their completion before returning. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 60 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 48 insertions(+), 12 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 9d5f78cc27e..9d917bbc674 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -417,12 +417,34 @@ static const WCHAR *find_device_string( const WCHAR *device_id, ULONG index ) return NULL; } +struct completion_params +{ + HID_XFER_PACKET packet; + ULONG padding; + IRP *irp; +}; + +static NTSTATUS CALLBACK xfer_completion( DEVICE_OBJECT *device, IRP *irp, void *context ) +{ + struct completion_params *params = context; + IRP *orig_irp = params->irp; + + TRACE( "device %p, irp %p, context %p\n", device, irp, context ); + + orig_irp->IoStatus = irp->IoStatus; + orig_irp->IoStatus.Information -= params->padding; + IoCompleteRequest( orig_irp, IO_NO_INCREMENT ); + + free( params ); + return STATUS_SUCCESS; +} + static NTSTATUS hid_device_xfer_report( BASE_DEVICE_EXTENSION *ext, ULONG code, IRP *irp ) { IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation( irp ); - ULONG offset = 0, report_len = 0, buffer_len = 0; + ULONG offset, report_len = 0, buffer_len = 0; + struct completion_params *params; HIDP_REPORT_IDS *report = NULL; - HID_XFER_PACKET packet; BYTE *buffer = NULL; switch (code) @@ -462,28 +484,42 @@ static NTSTATUS hid_device_xfer_report( BASE_DEVICE_EXTENSION *ext, ULONG code, break; } if (!report || buffer_len < report_len) return STATUS_INVALID_PARAMETER; + offset = report->ReportID ? 0 : 1; - if (!report->ReportID) offset = 1; - packet.reportId = report->ReportID; - packet.reportBuffer = buffer + offset; + if (!(params = calloc( 1, sizeof(struct completion_params) ))) return STATUS_NO_MEMORY; + params->packet.reportId = report->ReportID; + params->packet.reportBuffer = buffer + offset; + params->irp = irp; switch (code) { case IOCTL_HID_GET_FEATURE: case IOCTL_HID_GET_INPUT_REPORT: - packet.reportBufferLen = buffer_len - offset; - call_minidriver( code, ext->u.pdo.parent_fdo, NULL, 0, &packet, sizeof(packet), &irp->IoStatus ); + params->packet.reportBufferLen = buffer_len - offset; + irp = IoBuildDeviceIoControlRequest( code, ext->u.pdo.parent_fdo, NULL, 0, &params->packet, + sizeof(params->packet), TRUE, NULL, NULL ); break; + case IOCTL_HID_WRITE_REPORT: + params->padding = 1 - offset; + /* fallthrough */ case IOCTL_HID_SET_FEATURE: case IOCTL_HID_SET_OUTPUT_REPORT: - case IOCTL_HID_WRITE_REPORT: - packet.reportBufferLen = report_len - offset; - call_minidriver( code, ext->u.pdo.parent_fdo, NULL, sizeof(packet), &packet, 0, &irp->IoStatus ); - if (code == IOCTL_HID_WRITE_REPORT && packet.reportId) irp->IoStatus.Information--; + params->packet.reportBufferLen = report_len - offset; + irp = IoBuildDeviceIoControlRequest( code, ext->u.pdo.parent_fdo, NULL, sizeof(params->packet), + &params->packet, 0, TRUE, NULL, NULL ); break; } - return irp->IoStatus.Status; + if (!irp) + { + free( params ); + return STATUS_NO_MEMORY; + } + + IoMarkIrpPending( params->irp ); + IoSetCompletionRoutine( irp, xfer_completion, params, TRUE, TRUE, TRUE ); + IoCallDriver( ext->u.pdo.parent_fdo, irp ); + return STATUS_PENDING; } NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp)

1 0

Rémi Bernon : hidclass.sys: Use a local NTSTATUS variable to keep IRP status.
by Alexandre Julliard 26 Apr '22

26 Apr '22

Module: wine Branch: master Commit: 313453de29e1364f683b7446d65e8c080209ee20 URL: https://source.winehq.org/git/wine.git/?a=commit;h=313453de29e1364f683b7446… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Apr 26 13:10:42 2022 +0200 hidclass.sys: Use a local NTSTATUS variable to keep IRP status. So we can handle pending asynchronous calls to minidriver more easily. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 91 ++++++++++++++++++++-------------------------- 1 file changed, 40 insertions(+), 51 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 78f9601ee0d..9d5f78cc27e 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -417,7 +417,7 @@ static const WCHAR *find_device_string( const WCHAR *device_id, ULONG index ) return NULL; } -static void hid_device_xfer_report( BASE_DEVICE_EXTENSION *ext, ULONG code, IRP *irp ) +static NTSTATUS hid_device_xfer_report( BASE_DEVICE_EXTENSION *ext, ULONG code, IRP *irp ) { IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation( irp ); ULONG offset = 0, report_len = 0, buffer_len = 0; @@ -442,11 +442,7 @@ static void hid_device_xfer_report( BASE_DEVICE_EXTENSION *ext, ULONG code, IRP buffer = irp->AssociatedIrp.SystemBuffer; break; } - if (!buffer || !buffer_len) - { - irp->IoStatus.Status = STATUS_INVALID_USER_BUFFER; - return; - } + if (!buffer || !buffer_len) return STATUS_INVALID_USER_BUFFER; switch (code) { @@ -465,12 +461,7 @@ static void hid_device_xfer_report( BASE_DEVICE_EXTENSION *ext, ULONG code, IRP if (report) report_len = report->FeatureLength; break; } - - if (!report || buffer_len < report_len) - { - irp->IoStatus.Status = STATUS_INVALID_PARAMETER; - return; - } + if (!report || buffer_len < report_len) return STATUS_INVALID_PARAMETER; if (!report->ReportID) offset = 1; packet.reportId = report->ReportID; @@ -491,6 +482,8 @@ static void hid_device_xfer_report( BASE_DEVICE_EXTENSION *ext, ULONG code, IRP if (code == IOCTL_HID_WRITE_REPORT && packet.reportId) irp->IoStatus.Information--; break; } + + return irp->IoStatus.Status; } NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp) @@ -498,9 +491,9 @@ NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp) struct hid_queue *queue = irp->Tail.Overlay.OriginalFileObject->FsContext; IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; + NTSTATUS status = irp->IoStatus.Status; ULONG code, index; const WCHAR *str; - NTSTATUS status; BOOL removed; KIRQL irql; @@ -522,29 +515,26 @@ NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp) switch ((code = irpsp->Parameters.DeviceIoControl.IoControlCode)) { case IOCTL_HID_GET_POLL_FREQUENCY_MSEC: - TRACE("IOCTL_HID_GET_POLL_FREQUENCY_MSEC\n"); if (irpsp->Parameters.DeviceIoControl.OutputBufferLength < sizeof(ULONG)) + status = STATUS_BUFFER_OVERFLOW; + else { - irp->IoStatus.Status = STATUS_BUFFER_OVERFLOW; - irp->IoStatus.Information = 0; - break; + *(ULONG *)irp->AssociatedIrp.SystemBuffer = ext->u.pdo.poll_interval; + irp->IoStatus.Information = sizeof(ULONG); + status = STATUS_SUCCESS; } - *(ULONG *)irp->AssociatedIrp.SystemBuffer = ext->u.pdo.poll_interval; - irp->IoStatus.Information = sizeof(ULONG); - irp->IoStatus.Status = STATUS_SUCCESS; break; case IOCTL_HID_SET_POLL_FREQUENCY_MSEC: { ULONG poll_interval; - TRACE("IOCTL_HID_SET_POLL_FREQUENCY_MSEC\n"); if (irpsp->Parameters.DeviceIoControl.InputBufferLength < sizeof(ULONG)) + status = STATUS_BUFFER_TOO_SMALL; + else { - irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; - break; + poll_interval = *(ULONG *)irp->AssociatedIrp.SystemBuffer; + if (poll_interval) ext->u.pdo.poll_interval = min( poll_interval, MAX_POLL_INTERVAL_MSEC ); + status = STATUS_SUCCESS; } - poll_interval = *(ULONG *)irp->AssociatedIrp.SystemBuffer; - if (poll_interval) ext->u.pdo.poll_interval = min(poll_interval, MAX_POLL_INTERVAL_MSEC); - irp->IoStatus.Status = STATUS_SUCCESS; break; } case IOCTL_HID_GET_PRODUCT_STRING: @@ -562,29 +552,30 @@ NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp) { irp->IoStatus.Information = (wcslen( str ) + 1) * sizeof(WCHAR); if (irp->IoStatus.Information > output_len) - irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; + status = STATUS_BUFFER_TOO_SMALL; else { memcpy( output_buf, str, irp->IoStatus.Information ); - irp->IoStatus.Status = STATUS_SUCCESS; + status = STATUS_SUCCESS; } break; } call_minidriver( IOCTL_HID_GET_STRING, ext->u.pdo.parent_fdo, ULongToPtr( index ), sizeof(index), output_buf, output_len, &irp->IoStatus ); + status = irp->IoStatus.Status; break; } case IOCTL_HID_GET_COLLECTION_INFORMATION: { irp->IoStatus.Information = sizeof(HID_COLLECTION_INFORMATION); if (irpsp->Parameters.DeviceIoControl.OutputBufferLength < sizeof(HID_COLLECTION_INFORMATION)) - irp->IoStatus.Status = STATUS_BUFFER_OVERFLOW; + status = STATUS_BUFFER_OVERFLOW; else { memcpy( irp->AssociatedIrp.SystemBuffer, &ext->u.pdo.information, sizeof(HID_COLLECTION_INFORMATION) ); - irp->IoStatus.Status = STATUS_SUCCESS; + status = STATUS_SUCCESS; } break; } @@ -594,36 +585,31 @@ NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp) irp->IoStatus.Information = desc->PreparsedDataLength; if (irpsp->Parameters.DeviceIoControl.OutputBufferLength < desc->PreparsedDataLength) - irp->IoStatus.Status = STATUS_INVALID_BUFFER_SIZE; + status = STATUS_INVALID_BUFFER_SIZE; else { memcpy( irp->UserBuffer, desc->PreparsedData, desc->PreparsedDataLength ); - irp->IoStatus.Status = STATUS_SUCCESS; + status = STATUS_SUCCESS; } break; } case IOCTL_SET_NUM_DEVICE_INPUT_BUFFERS: { - irp->IoStatus.Information = 0; - if (irpsp->Parameters.DeviceIoControl.InputBufferLength != sizeof(ULONG)) - irp->IoStatus.Status = STATUS_BUFFER_OVERFLOW; + status = STATUS_BUFFER_OVERFLOW; else - irp->IoStatus.Status = hid_queue_resize( queue, *(ULONG *)irp->AssociatedIrp.SystemBuffer ); + status = hid_queue_resize( queue, *(ULONG *)irp->AssociatedIrp.SystemBuffer ); break; } case IOCTL_GET_NUM_DEVICE_INPUT_BUFFERS: { if (irpsp->Parameters.DeviceIoControl.OutputBufferLength < sizeof(ULONG)) - { - irp->IoStatus.Information = 0; - irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; - } + status = STATUS_BUFFER_TOO_SMALL; else { *(ULONG *)irp->AssociatedIrp.SystemBuffer = queue->length; irp->IoStatus.Information = sizeof(ULONG); - irp->IoStatus.Status = STATUS_SUCCESS; + status = STATUS_SUCCESS; } break; } @@ -631,20 +617,23 @@ NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp) case IOCTL_HID_SET_FEATURE: case IOCTL_HID_GET_INPUT_REPORT: case IOCTL_HID_SET_OUTPUT_REPORT: - hid_device_xfer_report( ext, code, irp ); + status = hid_device_xfer_report( ext, code, irp ); break; default: { ULONG code = irpsp->Parameters.DeviceIoControl.IoControlCode; FIXME( "Unsupported ioctl %#lx (device=%lx access=%lx func=%lx method=%lx)\n", code, code >> 16, (code >> 14) & 3, (code >> 2) & 0xfff, code & 3 ); - irp->IoStatus.Status = STATUS_NOT_SUPPORTED; + status = STATUS_NOT_SUPPORTED; break; } } - status = irp->IoStatus.Status; - if (status != STATUS_PENDING) IoCompleteRequest( irp, IO_NO_INCREMENT ); + if (status != STATUS_PENDING) + { + irp->IoStatus.Status = status; + IoCompleteRequest( irp, IO_NO_INCREMENT ); + } return status; } @@ -695,12 +684,12 @@ NTSTATUS WINAPI pdo_read(DEVICE_OBJECT *device, IRP *irp) NTSTATUS WINAPI pdo_write(DEVICE_OBJECT *device, IRP *irp) { BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; - NTSTATUS status; - - hid_device_xfer_report( ext, IOCTL_HID_WRITE_REPORT, irp ); - - status = irp->IoStatus.Status; - IoCompleteRequest( irp, IO_NO_INCREMENT ); + NTSTATUS status = hid_device_xfer_report( ext, IOCTL_HID_WRITE_REPORT, irp ); + if (status != STATUS_PENDING) + { + irp->IoStatus.Status = status; + IoCompleteRequest( irp, IO_NO_INCREMENT ); + } return status; }

1 0

Rémi Bernon : hidclass.sys: Move handle_minidriver_string inline.
by Alexandre Julliard 26 Apr '22

26 Apr '22

Module: wine Branch: master Commit: ab8c00afbb32d83b5bf30dec8eebfcb6616265ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab8c00afbb32d83b5bf30dec… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Apr 26 13:10:41 2022 +0200 hidclass.sys: Move handle_minidriver_string inline. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 62 ++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 35 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index d742ea841e5..78f9601ee0d 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -403,11 +403,13 @@ static const struct device_strings device_strings[] = { .id = L"VID_054C&PID_0CE6", .product = L"Wireless Controller" }, }; -static const WCHAR *find_product_string( const WCHAR *device_id ) +static const WCHAR *find_device_string( const WCHAR *device_id, ULONG index ) { const WCHAR *match_id = wcsrchr( device_id, '\\' ) + 1; DWORD i; + if (index != HID_STRING_ID_IPRODUCT) return NULL; + for (i = 0; i < ARRAY_SIZE(device_strings); ++i) if (!wcsnicmp( device_strings[i].id, match_id, 17 )) return device_strings[i].product; @@ -415,30 +417,6 @@ static const WCHAR *find_product_string( const WCHAR *device_id ) return NULL; } -static void handle_minidriver_string( BASE_DEVICE_EXTENSION *ext, IRP *irp, ULONG index ) -{ - IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation( irp ); - WCHAR *output_buf = MmGetSystemAddressForMdlSafe( irp->MdlAddress, NormalPagePriority ); - ULONG output_len = stack->Parameters.DeviceIoControl.OutputBufferLength; - const WCHAR *str = NULL; - - if (index == HID_STRING_ID_IPRODUCT) str = find_product_string( ext->device_id ); - - if (!str) call_minidriver( IOCTL_HID_GET_STRING, ext->u.pdo.parent_fdo, ULongToPtr( index ), - sizeof(index), output_buf, output_len, &irp->IoStatus ); - else - { - irp->IoStatus.Information = (wcslen( str ) + 1) * sizeof(WCHAR); - if (irp->IoStatus.Information > output_len) - irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; - else - { - memcpy( output_buf, str, irp->IoStatus.Information ); - irp->IoStatus.Status = STATUS_SUCCESS; - } - } -} - static void hid_device_xfer_report( BASE_DEVICE_EXTENSION *ext, ULONG code, IRP *irp ) { IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation( irp ); @@ -520,9 +498,10 @@ NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp) struct hid_queue *queue = irp->Tail.Overlay.OriginalFileObject->FsContext; IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; + ULONG code, index; + const WCHAR *str; NTSTATUS status; BOOL removed; - ULONG code; KIRQL irql; irp->IoStatus.Information = 0; @@ -569,18 +548,31 @@ NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp) break; } case IOCTL_HID_GET_PRODUCT_STRING: - { - handle_minidriver_string( ext, irp, HID_STRING_ID_IPRODUCT ); - break; - } case IOCTL_HID_GET_SERIALNUMBER_STRING: - { - handle_minidriver_string( ext, irp, HID_STRING_ID_ISERIALNUMBER ); - break; - } case IOCTL_HID_GET_MANUFACTURER_STRING: { - handle_minidriver_string( ext, irp, HID_STRING_ID_IMANUFACTURER ); + WCHAR *output_buf = MmGetSystemAddressForMdlSafe( irp->MdlAddress, NormalPagePriority ); + ULONG output_len = irpsp->Parameters.DeviceIoControl.OutputBufferLength; + + if (code == IOCTL_HID_GET_PRODUCT_STRING) index = HID_STRING_ID_IPRODUCT; + if (code == IOCTL_HID_GET_SERIALNUMBER_STRING) index = HID_STRING_ID_ISERIALNUMBER; + if (code == IOCTL_HID_GET_MANUFACTURER_STRING) index = HID_STRING_ID_IMANUFACTURER; + + if ((str = find_device_string( ext->device_id, index ))) + { + irp->IoStatus.Information = (wcslen( str ) + 1) * sizeof(WCHAR); + if (irp->IoStatus.Information > output_len) + irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; + else + { + memcpy( output_buf, str, irp->IoStatus.Information ); + irp->IoStatus.Status = STATUS_SUCCESS; + } + break; + } + + call_minidriver( IOCTL_HID_GET_STRING, ext->u.pdo.parent_fdo, ULongToPtr( index ), + sizeof(index), output_buf, output_len, &irp->IoStatus ); break; } case IOCTL_HID_GET_COLLECTION_INFORMATION:

1 0

Rémi Bernon : hidclass.sys: Move HID_GET_COLLECTION_* handling inline.
by Alexandre Julliard 26 Apr '22

26 Apr '22

Module: wine Branch: master Commit: ae212726f8efd6f01ca283d21807f88084d8e8f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae212726f8efd6f01ca283d2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Apr 26 13:10:40 2022 +0200 hidclass.sys: Move HID_GET_COLLECTION_* handling inline. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 55 ++++++++++++++++------------------------------ 1 file changed, 19 insertions(+), 36 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index c252125d8eb..d742ea841e5 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -375,40 +375,6 @@ void HID_StartDeviceThread(DEVICE_OBJECT *device) ext->u.pdo.thread = CreateThread(NULL, 0, hid_device_thread, device, 0, NULL); } -static void handle_IOCTL_HID_GET_COLLECTION_INFORMATION( IRP *irp, BASE_DEVICE_EXTENSION *ext ) -{ - IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); - if (irpsp->Parameters.DeviceIoControl.OutputBufferLength < sizeof(HID_COLLECTION_INFORMATION)) - { - irp->IoStatus.Status = STATUS_BUFFER_OVERFLOW; - irp->IoStatus.Information = 0; - } - else - { - memcpy(irp->AssociatedIrp.SystemBuffer, &ext->u.pdo.information, sizeof(HID_COLLECTION_INFORMATION)); - irp->IoStatus.Information = sizeof(HID_COLLECTION_INFORMATION); - irp->IoStatus.Status = STATUS_SUCCESS; - } -} - -static void handle_IOCTL_HID_GET_COLLECTION_DESCRIPTOR( IRP *irp, BASE_DEVICE_EXTENSION *ext ) -{ - HIDP_COLLECTION_DESC *desc = ext->u.pdo.device_desc.CollectionDesc; - IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); - - if (irpsp->Parameters.DeviceIoControl.OutputBufferLength < desc->PreparsedDataLength) - { - irp->IoStatus.Status = STATUS_INVALID_BUFFER_SIZE; - irp->IoStatus.Information = 0; - } - else - { - memcpy( irp->UserBuffer, desc->PreparsedData, desc->PreparsedDataLength ); - irp->IoStatus.Information = desc->PreparsedDataLength; - irp->IoStatus.Status = STATUS_SUCCESS; - } -} - struct device_strings { const WCHAR *id; @@ -619,12 +585,29 @@ NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp) } case IOCTL_HID_GET_COLLECTION_INFORMATION: { - handle_IOCTL_HID_GET_COLLECTION_INFORMATION( irp, ext ); + irp->IoStatus.Information = sizeof(HID_COLLECTION_INFORMATION); + if (irpsp->Parameters.DeviceIoControl.OutputBufferLength < sizeof(HID_COLLECTION_INFORMATION)) + irp->IoStatus.Status = STATUS_BUFFER_OVERFLOW; + else + { + memcpy( irp->AssociatedIrp.SystemBuffer, &ext->u.pdo.information, + sizeof(HID_COLLECTION_INFORMATION) ); + irp->IoStatus.Status = STATUS_SUCCESS; + } break; } case IOCTL_HID_GET_COLLECTION_DESCRIPTOR: { - handle_IOCTL_HID_GET_COLLECTION_DESCRIPTOR( irp, ext ); + HIDP_COLLECTION_DESC *desc = ext->u.pdo.device_desc.CollectionDesc; + + irp->IoStatus.Information = desc->PreparsedDataLength; + if (irpsp->Parameters.DeviceIoControl.OutputBufferLength < desc->PreparsedDataLength) + irp->IoStatus.Status = STATUS_INVALID_BUFFER_SIZE; + else + { + memcpy( irp->UserBuffer, desc->PreparsedData, desc->PreparsedDataLength ); + irp->IoStatus.Status = STATUS_SUCCESS; + } break; } case IOCTL_SET_NUM_DEVICE_INPUT_BUFFERS:

1 0

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 April 2022