December 2022 - Wine-commits

Floris Renaud : po: Update Dutch translation for joy.cpl.
by Alexandre Julliard 05 Dec '22

05 Dec '22

Module: wine Branch: master Commit: d3ee56835bd82222bb1fb08c7aa611b2f1d8d233 URL: https://gitlab.winehq.org/wine/wine/-/commit/d3ee56835bd82222bb1fb08c7aa611… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Sat Dec 3 18:41:26 2022 +0100 po: Update Dutch translation for joy.cpl. Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> --- po/nl.po | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/po/nl.po b/po/nl.po index 6073d7e6550..84c96ffae99 100644 --- a/po/nl.po +++ b/po/nl.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2022-09-26 12:00+0200\n" +"PO-Revision-Date: 2022-12-03 18:45+0100\n" "Last-Translator: Floris Renaud <jkfloris(a)dds.nl>\n" "Language-Team: Dutch\n" "Language: nl\n" @@ -3759,29 +3759,27 @@ msgid "" "updated here until you restart this applet." msgstr "" "Na het uit- of inschakelen van een apparaat zullen de aangesloten joysticks " -"niet vernieuwd worden totdat deze applicatie herstart wordt." +"niet vernieuwd worden totdat dit programma herstart wordt." #: dlls/joy.cpl/joy.rc:55 msgid "DInput" -msgstr "" +msgstr "DInput" #: dlls/joy.cpl/joy.rc:59 msgid "Axes" -msgstr "" +msgstr "Assen" #: dlls/joy.cpl/joy.rc:60 msgid "POVs" -msgstr "" +msgstr "Gezichtsveld" #: dlls/joy.cpl/joy.rc:61 msgid "Buttons" msgstr "Knoppen" #: dlls/joy.cpl/joy.rc:62 -#, fuzzy -#| msgid "Test Force Feedback" msgid "Force Feedback Effect" -msgstr "Force Feedback Testen" +msgstr "Force Feedback Effect" #: dlls/joy.cpl/joy.rc:64 msgid "" @@ -3793,60 +3791,60 @@ msgstr "" #: dlls/joy.cpl/joy.rc:70 msgid "XInput" -msgstr "" +msgstr "XInput" #: dlls/joy.cpl/joy.rc:73 -#, fuzzy -#| msgid "User" msgid "User #0" -msgstr "Gebruiker" +msgstr "Gebruiker 0" #: dlls/joy.cpl/joy.rc:74 -#, fuzzy -#| msgid "User" msgid "User #1" -msgstr "Gebruiker" +msgstr "Gebruiker 1" #: dlls/joy.cpl/joy.rc:75 -#, fuzzy -#| msgid "User" msgid "User #2" -msgstr "Gebruiker" +msgstr "Gebruiker 2" #: dlls/joy.cpl/joy.rc:76 -#, fuzzy -#| msgid "User" msgid "User #3" -msgstr "Gebruiker" +msgstr "Gebruiker 3" #: dlls/joy.cpl/joy.rc:78 msgid "" "No user detected on slot #0, make sure your gamepad is plugged in, and not " "overriden for DInput in the Joysticks tab." msgstr "" +"Geen gebruiker gevonden op slot nr. 0. Zorg dat de gamepad is aangesloten en " +"niet voor DInput is overschreven op het Joysticks-tabblad." #: dlls/joy.cpl/joy.rc:82 msgid "" "No user detected on slot #1, make sure your gamepad is plugged in, and not " "overriden for DInput in the Joysticks tab." msgstr "" +"Geen gebruiker gevonden op slot nr. 1. Zorg dat de gamepad is aangesloten en " +"niet voor DInput is overschreven op het Joysticks-tabblad." #: dlls/joy.cpl/joy.rc:86 msgid "" "No user detected on slot #2, make sure your gamepad is plugged in, and not " "overriden for DInput in the Joysticks tab." msgstr "" +"Geen gebruiker gevonden op slot nr. 2. Zorg dat de gamepad is aangesloten en " +"niet voor DInput is overschreven op het Joysticks-tabblad." #: dlls/joy.cpl/joy.rc:90 msgid "" "No user detected on slot #3, make sure your gamepad is plugged in, and not " "overriden for DInput in the Joysticks tab." msgstr "" +"Geen gebruiker gevonden op slot nr. 3. Zorg dat de gamepad is aangesloten en " +"niet voor DInput is overschreven op het Joysticks-tabblad." #: dlls/joy.cpl/joy.rc:95 dlls/joy.cpl/joy.rc:96 dlls/joy.cpl/joy.rc:97 #: dlls/joy.cpl/joy.rc:98 msgid "Rumble" -msgstr "" +msgstr "Trillen" #: dlls/joy.cpl/joy.rc:31 msgid "Game Controllers"

1 0

Jacek Caban : winevulkan: Get rid of direct Unix calls.
by Alexandre Julliard 05 Dec '22

05 Dec '22

Module: wine Branch: master Commit: 2f41d8511882253c6f3c2b031255173b40416b29 URL: https://gitlab.winehq.org/wine/wine/-/commit/2f41d8511882253c6f3c2b03125517… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Dec 3 12:30:23 2022 +0100 winevulkan: Get rid of direct Unix calls. --- dlls/winevulkan/loader.c | 5 +- dlls/winevulkan/loader_thunks.c | 452 +++++++++++++++++++-------------------- dlls/winevulkan/make_vulkan | 27 +-- dlls/winevulkan/vulkan.c | 21 -- dlls/winevulkan/vulkan_loader.h | 3 - dlls/winevulkan/vulkan_private.h | 3 - dlls/winevulkan/vulkan_thunks.c | 7 +- 7 files changed, 231 insertions(+), 287 deletions(-)

1 0

Jacek Caban : winevulkan: Use UNIX_CALL macro for Unix calls.
by Alexandre Julliard 05 Dec '22

05 Dec '22

Module: wine Branch: master Commit: c4f46feffc44709fa94819948f0ecb6c017d9de5 URL: https://gitlab.winehq.org/wine/wine/-/commit/c4f46feffc44709fa94819948f0ecb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Dec 3 12:33:45 2022 +0100 winevulkan: Use UNIX_CALL macro for Unix calls. --- dlls/winevulkan/loader.c | 33 +- dlls/winevulkan/loader_thunks.c | 1028 +++++++++++++++++++-------------------- dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_loader.h | 9 +- 4 files changed, 531 insertions(+), 541 deletions(-)

1 0

Zebediah Figura : qasf/asfreader: Do not store the media type passed to IFileSourceFilter::Load().
by Alexandre Julliard 05 Dec '22

05 Dec '22

Module: wine Branch: master Commit: fed36aee5a1e51f7cb699f6a9e9454430a89f491 URL: https://gitlab.winehq.org/wine/wine/-/commit/fed36aee5a1e51f7cb699f6a9e9454… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Oct 22 17:05:56 2021 -0500 qasf/asfreader: Do not store the media type passed to IFileSourceFilter::Load(). --- dlls/qasf/asfreader.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/dlls/qasf/asfreader.c b/dlls/qasf/asfreader.c index 7bc57a2d500..4cf077e9dd3 100644 --- a/dlls/qasf/asfreader.c +++ b/dlls/qasf/asfreader.c @@ -189,7 +189,6 @@ struct asf_reader struct strmbase_filter filter; IFileSourceFilter IFileSourceFilter_iface; - AM_MEDIA_TYPE media_type; WCHAR *file_name; HRESULT result; @@ -409,7 +408,6 @@ static void asf_reader_destroy(struct strmbase_filter *iface) } free(filter->file_name); - FreeMediaType(&filter->media_type); IWMReaderCallback_Release(filter->callback); IWMReader_Release(filter->reader); @@ -652,12 +650,6 @@ static HRESULT WINAPI file_source_Load(IFileSourceFilter *iface, LPCOLESTR file_ return E_FAIL; } - if (media_type && FAILED(hr = CopyMediaType(&filter->media_type, media_type))) - { - LeaveCriticalSection(&filter->filter.filter_cs); - return hr; - } - EnterCriticalSection(&filter->status_cs); if (SUCCEEDED(hr = IWMReader_Open(filter->reader, filter->file_name, filter->callback, NULL))) { @@ -688,11 +680,11 @@ static HRESULT WINAPI file_source_GetCurFile(IFileSourceFilter *iface, LPOLESTR if (media_type) { - media_type->majortype = filter->media_type.majortype; - media_type->subtype = filter->media_type.subtype; - media_type->lSampleSize = filter->media_type.lSampleSize; - media_type->pUnk = filter->media_type.pUnk; - media_type->cbFormat = filter->media_type.cbFormat; + media_type->majortype = GUID_NULL; + media_type->subtype = GUID_NULL; + media_type->lSampleSize = 0; + media_type->pUnk = NULL; + media_type->cbFormat = 0; } if (filter->file_name)

1 0

Zebediah Figura : qasf/tests: Expand the IFileSourceFilter tests.
by Alexandre Julliard 05 Dec '22

05 Dec '22

Module: wine Branch: master Commit: f6b054344c12e77843b7b536a8f07faa91bea2bc URL: https://gitlab.winehq.org/wine/wine/-/commit/f6b054344c12e77843b7b536a8f07f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Oct 22 17:06:24 2021 -0500 qasf/tests: Expand the IFileSourceFilter tests. --- dlls/qasf/tests/asfreader.c | 146 +++++++++++++++++++++++++++----------------- 1 file changed, 90 insertions(+), 56 deletions(-)

1 0

Piotr Caban : localspl: Support Port handles in EndDocPrinter.
by Alexandre Julliard 05 Dec '22

05 Dec '22

Module: wine Branch: master Commit: 74be22b78275cd15f2d772a14f10f58d2463f4ce URL: https://gitlab.winehq.org/wine/wine/-/commit/74be22b78275cd15f2d772a14f10f5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Dec 3 19:09:05 2022 +0100 localspl: Support Port handles in EndDocPrinter. --- dlls/localspl/provider.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 7336dbaa705..63113157cc8 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -1697,7 +1697,8 @@ static HANDLE port_alloc_handle(const WCHAR *name, BOOL *stop_search) return NULL; } if (!port->mon->monitor.pfnOpenPort || !port->mon->monitor.pfnWritePort - || !port->mon->monitor.pfnClosePort || !port->mon->monitor.pfnStartDocPort) + || !port->mon->monitor.pfnClosePort || !port->mon->monitor.pfnStartDocPort + || !port->mon->monitor.pfnEndDocPort) { FIXME("port not supported: %s\n", debugstr_w(name)); free(port_name); @@ -3595,7 +3596,19 @@ static BOOL WINAPI fpEndDocPrinter(HANDLE hprinter) TRACE("%p\n", hprinter); - if (!printer || printer->header.type != HANDLE_PRINTER) + if (!printer) + { + SetLastError(ERROR_INVALID_HANDLE); + return 0; + } + + if (printer->header.type == HANDLE_PORT) + { + port_t *port = (port_t *)hprinter; + return port->mon->monitor.pfnEndDocPort(port->hport); + } + + if (printer->header.type != HANDLE_PRINTER) { SetLastError(ERROR_INVALID_HANDLE); return FALSE;

1 0

Piotr Caban : winspool: Implement print processor validation in AddPrinter.
by Alexandre Julliard 05 Dec '22

05 Dec '22

Module: wine Branch: master Commit: efe693e607e325cd00220f2d271d067a70e88b91 URL: https://gitlab.winehq.org/wine/wine/-/commit/efe693e607e325cd00220f2d271d06… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 25 15:49:18 2022 +0200 winspool: Implement print processor validation in AddPrinter. --- dlls/winspool.drv/info.c | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index e58ae925c2b..258d67c5788 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -2568,6 +2568,37 @@ static void set_devices_and_printerports(PRINTER_INFO_2W *pi) } } +static BOOL validate_print_proc(WCHAR *server, const WCHAR *name) +{ + PRINTPROCESSOR_INFO_1W *ppi; + DWORD size, i, no; + + if (!EnumPrintProcessorsW(server, NULL, 1, NULL, 0, &size, &no) + && GetLastError() != ERROR_INSUFFICIENT_BUFFER) + { + return FALSE; + } + ppi = malloc(size); + if (!ppi) + { + SetLastError(ERROR_OUTOFMEMORY); + return FALSE; + } + if (!EnumPrintProcessorsW(server, NULL, 1, (BYTE*)ppi, size, &size, &no)) + { + free(ppi); + return FALSE; + } + + for (i = 0; i < no; i++) + { + if (!wcsicmp(ppi[i].pName, name)) + break; + } + free(ppi); + return i != no; +} + /***************************************************************************** * AddPrinterW [WINSPOOL.@] */ @@ -2628,7 +2659,7 @@ HANDLE WINAPI AddPrinterW(LPWSTR pName, DWORD Level, LPBYTE pPrinter) RegCloseKey(hkeyDriver); RegCloseKey(hkeyDrivers); - if (wcsicmp( pi->pPrintProcessor, L"WinPrint" )) + if (!validate_print_proc(pName, pi->pPrintProcessor)) { FIXME("Can't find processor %s\n", debugstr_w(pi->pPrintProcessor)); SetLastError(ERROR_UNKNOWN_PRINTPROCESSOR);

1 0

Piotr Caban : localspl: Add AddPrintProcessor implementation.
by Alexandre Julliard 05 Dec '22

05 Dec '22

Module: wine Branch: master Commit: 29d05e540ec3c2f7ce783b7b7c82cff5ec9c293c URL: https://gitlab.winehq.org/wine/wine/-/commit/29d05e540ec3c2f7ce783b7b7c82cf… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 25 17:52:21 2022 +0200 localspl: Add AddPrintProcessor implementation. --- dlls/localspl/provider.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++- dlls/winspool.drv/info.c | 17 +++++++++++----- 2 files changed, 64 insertions(+), 6 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 63113157cc8..dd6b6b9cf45 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -2627,6 +2627,57 @@ emP_cleanup: return (res); } +static BOOL WINAPI fpAddPrintProcessor(WCHAR *name, WCHAR *environment, WCHAR *path, + WCHAR *print_proc) +{ + const printenv_t * env; + HKEY hroot = NULL; + WCHAR *regpath; + LSTATUS s; + + TRACE("(%s, %s, %s, %s)\n", debugstr_w(name), debugstr_w(environment), + debugstr_w(path), debugstr_w(print_proc)); + + if (!path || !print_proc) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (name && name[0]) + { + FIXME("server %s not supported\n", debugstr_w(name)); + SetLastError(ERROR_INVALID_NAME); + return FALSE; + } + + env = validate_envW(environment); + if (!env) + return FALSE; + + regpath = malloc(sizeof(fmt_printprocessorsW) + + wcslen(env->envname) * sizeof(WCHAR)); + if (!regpath) + return FALSE; + wsprintfW(regpath, fmt_printprocessorsW, env->envname); + + s = RegCreateKeyW(HKEY_LOCAL_MACHINE, regpath, &hroot); + free(regpath); + if (!s) + { + s = RegSetKeyValueW(hroot, print_proc, L"Driver", REG_SZ, path, + (wcslen(path) + 1) * sizeof(WCHAR)); + } + RegCloseKey(hroot); + if (s) + { + SetLastError(s); + return FALSE; + } + + return TRUE; +} + /***************************************************************************** * fpEnumPrintProcessors [exported through PRINTPROVIDOR] * @@ -3715,7 +3766,7 @@ static const PRINTPROVIDOR backend = { NULL, /* fpGetPrinterDriver */ fpGetPrinterDriverDirectory, NULL, /* fpDeletePrinterDriver */ - NULL, /* fpAddPrintProcessor */ + fpAddPrintProcessor, fpEnumPrintProcessors, fpGetPrintProcessorDirectory, NULL, /* fpDeletePrintProcessor */ diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 258d67c5788..8abfc9b0887 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -4799,12 +4799,19 @@ BOOL WINAPI AddPrintProcessorA(LPSTR pName, LPSTR pEnvironment, LPSTR pPathName, /***************************************************************************** * AddPrintProcessorW [WINSPOOL.@] */ -BOOL WINAPI AddPrintProcessorW(LPWSTR pName, LPWSTR pEnvironment, LPWSTR pPathName, - LPWSTR pPrintProcessorName) +BOOL WINAPI AddPrintProcessorW(WCHAR *name, WCHAR *env, WCHAR *path, WCHAR *print_proc) { - FIXME("(%s,%s,%s,%s): stub\n", debugstr_w(pName), debugstr_w(pEnvironment), - debugstr_w(pPathName), debugstr_w(pPrintProcessorName)); - return TRUE; + TRACE("(%s,%s,%s,%s)\n", debugstr_w(name), debugstr_w(env), + debugstr_w(path), debugstr_w(print_proc)); + + if (!path || !print_proc) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if ((backend == NULL) && !load_backend()) return FALSE; + return backend->fpAddPrintProcessor(name, env, path, print_proc); } /*****************************************************************************

1 0

Mohamad Al-Jaf : wbemprox: Provide accurate SMBIOS serial number.
by Alexandre Julliard 05 Dec '22

05 Dec '22

Module: wine Branch: master Commit: b7430d4e6fcd5fd3f5d6dcd3f88aa13d8f1819f3 URL: https://gitlab.winehq.org/wine/wine/-/commit/b7430d4e6fcd5fd3f5d6dcd3f88aa1… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sat Dec 3 03:09:03 2022 -0500 wbemprox: Provide accurate SMBIOS serial number. --- dlls/wbemprox/builtin.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index b8f7d0b8dca..faab5d51af6 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -79,7 +79,7 @@ static const struct column col_bios[] = { L"Manufacturer", CIM_STRING|COL_FLAG_DYNAMIC }, { L"Name", CIM_STRING }, { L"ReleaseDate", CIM_DATETIME|COL_FLAG_DYNAMIC }, - { L"SerialNumber", CIM_STRING }, + { L"SerialNumber", CIM_STRING|COL_FLAG_DYNAMIC }, { L"SMBIOSBIOSVersion", CIM_STRING|COL_FLAG_DYNAMIC }, { L"SMBIOSMajorVersion", CIM_UINT16 }, { L"SMBIOSMinorVersion", CIM_UINT16 }, @@ -1378,6 +1378,13 @@ static WCHAR *get_bios_releasedate( const char *buf, UINT len ) return ret; } +static WCHAR *get_bios_serialnumber( const char *buf, UINT len ) +{ + WCHAR *ret = get_bios_string( 4, buf, len ); + if (!ret) return wcsdup( L"0" ); + return ret; +} + static WCHAR *get_bios_smbiosbiosversion( const char *buf, UINT len ) { WCHAR *ret = get_bios_string( 2, buf, len ); @@ -1455,7 +1462,7 @@ static enum fill_status fill_bios( struct table *table, const struct expr *cond rec->manufacturer = get_bios_manufacturer( buf, len ); rec->name = L"Default System BIOS"; rec->releasedate = get_bios_releasedate( buf, len ); - rec->serialnumber = L"0"; + rec->serialnumber = get_bios_serialnumber( buf, len ); rec->smbiosbiosversion = get_bios_smbiosbiosversion( buf, len ); rec->smbiosmajorversion = get_bios_smbiosmajorversion( buf, len ); rec->smbiosminorversion = get_bios_smbiosminorversion( buf, len );

1 0

Piotr Caban : winprint: Fix parameters validation in EnumPrintProcessorDatatypesW.
by Alexandre Julliard 05 Dec '22

05 Dec '22

Module: wine Branch: master Commit: a98fb06a5b0278383cd59690d756edeedcb807c4 URL: https://gitlab.winehq.org/wine/wine/-/commit/a98fb06a5b0278383cd59690d756ed… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Dec 3 18:42:10 2022 +0100 winprint: Fix parameters validation in EnumPrintProcessorDatatypesW. --- dlls/winprint/printproc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winprint/printproc.c b/dlls/winprint/printproc.c index d7d9cce9d93..8ea3557b3bc 100644 --- a/dlls/winprint/printproc.c +++ b/dlls/winprint/printproc.c @@ -81,7 +81,7 @@ BOOL WINAPI EnumPrintProcessorDatatypesW(WCHAR *server, WCHAR *name, DWORD level *no = 0; *needed = sizeof(*info) + sizeof(raw); - if (level != 1 || !datatypes) + if (level != 1 || (size && !datatypes)) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE;

1 0