April 2022 - Wine-Commits - list.winehq.org

Jeremy White : Remove the CUSTOM_HEADERS option.
by Alexandre Julliard April 27, 2022

April 27, 2022

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 : Tune event handling.
by Alexandre Julliard April 27, 2022

April 27, 2022

Module: tools Branch: master Commit: 8c1847776aaf3ab636b1ccdbeba26b68897d1e66 URL: https://source.winehq.org/git/tools.git/?a=commit;h=8c1847776aaf3ab636b1ccd… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Wed Apr 27 14:04:36 2022 -0500 Tune event handling. No longer send email when a merge is accepted. Improve logging slightly. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- gitlab/gitlab-to-mail/gitlabtomail.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gitlab/gitlab-to-mail/gitlabtomail.py b/gitlab/gitlab-to-mail/gitlabtomail.py index 2dfc72a..fb51f71 100755 --- a/gitlab/gitlab-to-mail/gitlabtomail.py +++ b/gitlab/gitlab-to-mail/gitlabtomail.py @@ -373,7 +373,7 @@ def process_commented_on(event): return mail -def process_accepted_closed(event): +def process_closed(event): if event['target_type'] != 'MergeRequest': log(f"unknow target_type {event['target_type']}, skipping") return @@ -406,13 +406,14 @@ def process_unknown(event): def process_ignore(event): - log("event ignored") + log(f"event {event['id']} ignored") EVENT_ACTION_TYPES = { "commented on": process_commented_on, - "accepted": process_accepted_closed, - "closed": process_accepted_closed, + "accepted": process_ignore, + "approved": process_ignore, + "closed": process_closed, "pushed to": process_ignore, "pushed new": process_ignore, "opened": process_ignore,

1 0

Jeremy White : Send no email for merged requests.
by Alexandre Julliard April 27, 2022

April 27, 2022

Module: tools Branch: master Commit: 7c516c48a1abfb30b197ed855ef9074b8f00058b URL: https://source.winehq.org/git/tools.git/?a=commit;h=7c516c48a1abfb30b197ed8… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Wed Apr 27 14:06:05 2022 -0500 Send no email for merged requests. This avoids sending a v2 that duplicates the original submission with only signed off by lines. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- gitlab/gitlab-to-mail/gitlabtomail.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gitlab/gitlab-to-mail/gitlabtomail.py b/gitlab/gitlab-to-mail/gitlabtomail.py index fb51f71..250f87a 100755 --- a/gitlab/gitlab-to-mail/gitlabtomail.py +++ b/gitlab/gitlab-to-mail/gitlabtomail.py @@ -546,6 +546,10 @@ def main(): iid = mr['iid'] log(f"MR{iid} updated - processing") + if mr['merged_at']: + log(f"MR{iid} merged - skipping") + continue + # We jump through some hoops because the fetch_mr_patches # entry point on GitLab does not allow one

1 0

Jeremy White : Switch to using configparser.
by Alexandre Julliard April 27, 2022

April 27, 2022

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

Jacek Caban : winex11: Don't use DragQueryFileW in export_hdrop.
by Alexandre Julliard April 26, 2022

April 26, 2022

Module: wine Branch: master Commit: 93543d9e6a3e2003a60dc9fa13ec3607a7817fcf URL: https://source.winehq.org/git/wine.git/?a=commit;h=93543d9e6a3e2003a60dc9fa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 26 16:06:07 2022 +0100 winex11: Don't use DragQueryFileW in export_hdrop. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 41 ++++++++++++++++++++++++++--------------- 1 file changed, 26 insertions(+), 15 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index d677aad034b..02456ef3870 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -1336,30 +1336,39 @@ static BOOL export_text_html( Display *display, Window win, Atom prop, Atom targ */ static BOOL export_hdrop( Display *display, Window win, Atom prop, Atom target, HANDLE handle ) { - UINT i; - UINT numFiles; - char *textUriList; + char *textUriList = NULL; UINT textUriListSize = 32; UINT next = 0; + const WCHAR *ptr; + WCHAR *unicode_data = NULL; + void *data = GlobalLock( handle ); + DROPFILES *drop_files = data; - textUriList = malloc( textUriListSize ); - if (!textUriList) return FALSE; - numFiles = DragQueryFileW( handle, 0xFFFFFFFF, NULL, 0 ); - for (i = 0; i < numFiles; i++) + if (!drop_files->fWide) + { + char *p, *files = (char *)data + drop_files->pFiles; + p = files; + while (*p) p += strlen( p ) + 1; + p++; + + if (!(unicode_data = malloc( (p - files) * sizeof(WCHAR) ))) goto failed; + MultiByteToWideChar( CP_ACP, 0, files, p - files, unicode_data, p - files ); + ptr = unicode_data; + } + else ptr = (const WCHAR *)((char *)data + drop_files->pFiles); + + if (!(textUriList = malloc( textUriListSize ))) goto failed; + + while (*ptr) { - UINT dosFilenameSize; - WCHAR *dosFilename = NULL; char *unixFilename = NULL; UINT uriSize; UINT u; - dosFilenameSize = 1 + DragQueryFileW( handle, i, NULL, 0 ); - dosFilename = malloc( dosFilenameSize * sizeof(WCHAR) ); - if (dosFilename == NULL) goto failed; - DragQueryFileW( handle, i, dosFilename, dosFilenameSize ); - unixFilename = wine_get_unix_file_name(dosFilename); - free( dosFilename ); + unixFilename = wine_get_unix_file_name( ptr ); if (unixFilename == NULL) goto failed; + ptr += lstrlenW( ptr ) + 1; + uriSize = 8 + /* file:/// */ 3 * (lstrlenA(unixFilename) - 1) + /* "%xy" per char except first '/' */ 2; /* \r\n */ @@ -1397,6 +1406,8 @@ static BOOL export_hdrop( Display *display, Window win, Atom prop, Atom target, return TRUE; failed: + GlobalUnlock( handle ); + free( unicode_data ); free( textUriList ); return FALSE; }

1 0

Rémi Bernon : windows.gaming.input: Import IAsyncOperation from windows.media.speech.
by Alexandre Julliard April 26, 2022

April 26, 2022

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: Move HID_GET_COLLECTION_* handling inline.
by Alexandre Julliard April 26, 2022

April 26, 2022

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

Jacek Caban : winex11: Directly use ntdll in uri_to_dos.
by Alexandre Julliard April 26, 2022

April 26, 2022

Module: wine Branch: master Commit: 1c01148696b164094b11624cee2985573744f83a URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c01148696b164094b11624c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 26 16:06:09 2022 +0100 winex11: Directly use ntdll in uri_to_dos. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index ec0392f3ec8..eb357ed4643 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -569,6 +569,29 @@ static HGLOBAL create_dib_from_bitmap(HBITMAP hBmp) } +/* based on wine_get_dos_file_name */ +static WCHAR *get_dos_file_name( const char *path ) +{ + ULONG len = strlen( path ) + 9; /* \??\unix prefix */ + WCHAR *ret; + + if (!(ret = malloc( len * sizeof(WCHAR) ))) return NULL; + if (wine_unix_to_nt_file_name( path, ret, &len )) + { + free( ret ); + return NULL; + } + + if (ret[5] == ':') + { + /* get rid of the \??\ prefix */ + memmove( ret, ret + 4, (len - 4) * sizeof(WCHAR) ); + } + else ret[1] = '\\'; + return ret; +} + + /*********************************************************************** * uri_to_dos * @@ -616,7 +639,7 @@ static WCHAR* uri_to_dos(char *encodedURI) if (uri[7] == '/') { /* file:///path/to/file (nautilus, thunar) */ - ret = wine_get_dos_file_name(&uri[7]); + ret = get_dos_file_name( &uri[7] ); } else if (uri[7]) { @@ -629,14 +652,14 @@ static WCHAR* uri_to_dos(char *encodedURI) if (strcmp(&uri[7], "localhost") == 0) { *path = '/'; - ret = wine_get_dos_file_name(path); + ret = get_dos_file_name( path ); } else if (gethostname(hostname, sizeof(hostname)) == 0) { if (strcmp(hostname, &uri[7]) == 0) { *path = '/'; - ret = wine_get_dos_file_name(path); + ret = get_dos_file_name( path ); } } } @@ -645,7 +668,7 @@ static WCHAR* uri_to_dos(char *encodedURI) else if (uri[6]) { /* file:/path/to/file (konqueror) */ - ret = wine_get_dos_file_name(&uri[5]); + ret = get_dos_file_name( &uri[5] ); } } free( uri ); @@ -938,7 +961,7 @@ static HANDLE import_text_uri_list( Atom type, const void *data, size_t size ) memcpy(&out[total], path, pathSize * sizeof(WCHAR)); total += pathSize; done: - HeapFree( GetProcessHeap(), 0, path ); + free( path ); if (out == NULL) break; }

1 0

Jacek Caban : winex11: Use data-only NtUserGetClipboardData to export clipboard data.
by Alexandre Julliard April 26, 2022

April 26, 2022

Module: wine Branch: master Commit: 55bbe99c29264aeddec6932cb5e4fca03ecc9471 URL: https://source.winehq.org/git/wine.git/?a=commit;h=55bbe99c29264aeddec6932c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 26 16:06:08 2022 +0100 winex11: Use data-only NtUserGetClipboardData to export clipboard data. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 167 +++++++++++++++++++------------------------ 1 file changed, 75 insertions(+), 92 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=55bbe99c29264aeddec6…

1 0

Rémi Bernon : hidclass.sys: Call internal minidriver report ioctls asynchronously.
by Alexandre Julliard April 26, 2022

April 26, 2022

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