August 2023 - Wine-Commits - list.winehq.org

Dmitry Sokolov : cmd: Fixed var substring in 'enableDelayedExpansion' mode.
by Alexandre Julliard Aug. 25, 2023

Aug. 25, 2023

Module: wine Branch: master Commit: 7e4715149a96c19233117944b1dcf5db5126c6f9 URL: https://gitlab.winehq.org/wine/wine/-/commit/7e4715149a96c19233117944b1dcf5… Author: Dmitry Sokolov <mr.dmitry.sokolov(a)gmail.com> Date: Thu Aug 24 23:42:43 2023 +0300 cmd: Fixed var substring in 'enableDelayedExpansion' mode. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55402 --- programs/cmd/tests/test_builtins.cmd | 11 +++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 5 +++++ programs/cmd/wcmdmain.c | 2 +- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 0cb05041fa9..28b935ad521 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1275,6 +1275,17 @@ set x=C:\Program Files (x86) if ""=="" set y=%x%\dummy echo %y% +echo --- Testing if + var subst in delayed expansion mode +setlocal enableDelayedExpansion +for %%i in (abc 10.0 11.0) do ( + set result=%%i + echo [DEBUG] checking {!result!} + if "!result:~0,3!"=="10." ( + echo SDKVER=!result! + ) +) +endlocal + echo ------------ Testing for ------------ echo --- plain FOR for %%i in (A B C) do echo %%i diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 16f9d647b8a..57e72a77387 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -927,6 +927,11 @@ x(a)space@ A ------------ Testing if/set ------------ C:\Program Files (x86)\dummy +--- Testing if + var subst in delayed expansion mode +[DEBUG] checking {abc} +[DEBUG] checking {10.0} +SDKVER=10.0 +[DEBUG] checking {11.0} ------------ Testing for ------------ --- plain FOR A diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 528e4a83800..d00c6e07566 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -596,7 +596,7 @@ static WCHAR *WCMD_expand_envvar(WCHAR *start, WCHAR startchar) /* If there's complex substitution, just need %var% for now to get the expanded data to play with */ if (colonpos) { - *colonpos = startchar; + *colonpos = '%'; savedchar = *(colonpos+1); *(colonpos+1) = 0x00; }

1 0

Alex Henrie : mmdevapi: Use CRT allocation functions.
by Alexandre Julliard Aug. 24, 2023

Aug. 24, 2023

Module: wine Branch: master Commit: bd10252332491bc39100f230540b14d59f02255d URL: https://gitlab.winehq.org/wine/wine/-/commit/bd10252332491bc39100f230540b14… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 23 23:37:07 2023 -0600 mmdevapi: Use CRT allocation functions. --- dlls/mmdevapi/audiosessionmanager.c | 4 ++-- dlls/mmdevapi/audiovolume.c | 4 ++-- dlls/mmdevapi/client.c | 6 +++--- dlls/mmdevapi/devenum.c | 40 ++++++++++++++++++------------------- dlls/mmdevapi/main.c | 4 ++-- dlls/mmdevapi/session.c | 14 ++++--------- dlls/mmdevapi/spatialaudio.c | 33 +++++++++++++++--------------- 7 files changed, 49 insertions(+), 56 deletions(-)

1 0

Piotr Caban : localspl: Try fallback print processor if datatype is not supported.
by Alexandre Julliard Aug. 24, 2023

Aug. 24, 2023

Module: wine Branch: master Commit: be5ca1be7c5a9f222d1a718152a3d21a07f194c4 URL: https://gitlab.winehq.org/wine/wine/-/commit/be5ca1be7c5a9f222d1a718152a3d2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 24 17:12:16 2023 +0200 localspl: Try fallback print processor if datatype is not supported. --- dlls/localspl/provider.c | 74 +++++++++++++++++++++++++++++++++++++----------- 1 file changed, 57 insertions(+), 17 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index a0776b11fe9..f35931b9bef 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -277,6 +277,7 @@ typedef struct { handle_header_t header; printer_info_t *info; WCHAR *name; + WCHAR *print_proc; WCHAR *datatype; DEVMODEW *devmode; job_info_t *doc; @@ -1833,6 +1834,8 @@ static HANDLE printer_alloc_handle(const WCHAR *name, const WCHAR *basename, PRINTER_DEFAULTSW *def) { printer_t *printer; + HKEY hroot, hkey; + LSTATUS status; printer = calloc(1, sizeof(*printer)); if (!printer) @@ -1860,6 +1863,20 @@ static HANDLE printer_alloc_handle(const WCHAR *name, const WCHAR *basename, if (def && def->pDevMode) printer->devmode = dup_devmode(def->pDevMode); + hroot = open_driver_reg(env_arch.envname); + if (hroot) + { + status = RegOpenKeyW(hroot, name, &hkey); + RegCloseKey(hroot); + if (status == ERROR_SUCCESS) + { + printer->print_proc = reg_query_value(hkey, L"Print Processor"); + RegCloseKey(hkey); + } + } + if (!printer->print_proc) + printer->print_proc = wcsdup(L"winprint"); + return (HANDLE)printer; } @@ -3411,7 +3428,7 @@ static DWORD WINAPI fpStartDocPrinter(HANDLE hprinter, DWORD level, BYTE *doc_in { printer_t *printer = (printer_t *)hprinter; DOC_INFO_1W *info = (DOC_INFO_1W *)doc_info; - BOOL datatype_valid; + BOOL datatype_valid = FALSE; WCHAR *datatype; printproc_t *pp; @@ -3470,13 +3487,23 @@ static DWORD WINAPI fpStartDocPrinter(HANDLE hprinter, DWORD level, BYTE *doc_in if (!pp) { WARN("failed to load %s print processor\n", debugstr_w(printer->info->print_proc)); - pp = print_proc_load(L"winprint"); } - if (!pp) - return 0; + else + { + datatype_valid = print_proc_check_datatype(pp, datatype); + print_proc_unload(pp); + } + + if (!datatype_valid) + { + pp = print_proc_load(printer->print_proc); + if (!pp) + return 0; + + datatype_valid = print_proc_check_datatype(pp, datatype); + print_proc_unload(pp); + } - datatype_valid = print_proc_check_datatype(pp, datatype); - print_proc_unload(pp); if (!datatype_valid) { TRACE("%s datatype not supported by %s\n", debugstr_w(datatype), @@ -3728,11 +3755,11 @@ static BOOL WINAPI fpScheduleJob(HANDLE hprinter, DWORD job_id) { printer_t *printer = (printer_t *)hprinter; WCHAR output[1024], name[1024], *datatype; + BOOL datatype_valid = FALSE, ret = TRUE; PRINTPROCESSOROPENDATA pp_data; const WCHAR *port_name, *port; job_info_t *job; printproc_t *pp; - BOOL ret = TRUE; HANDLE hpp; HKEY hkey; @@ -3775,15 +3802,6 @@ static BOOL WINAPI fpScheduleJob(HANDLE hprinter, DWORD job_id) RegCloseKey(hkey); } - pp = print_proc_load(printer->info->print_proc); - if (!pp) - { - WARN("failed to load %s print processor\n", debugstr_w(printer->info->print_proc)); - pp = print_proc_load(L"winprint"); - } - if (!pp) - return FALSE; - if (job->datatype) datatype = job->datatype; else if (printer->datatype) @@ -3791,7 +3809,28 @@ static BOOL WINAPI fpScheduleJob(HANDLE hprinter, DWORD job_id) else datatype = printer->info->datatype; - if (!print_proc_check_datatype(pp, datatype)) + pp = print_proc_load(printer->info->print_proc); + if (!pp) + { + WARN("failed to load %s print processor\n", debugstr_w(printer->info->print_proc)); + } + else + { + datatype_valid = print_proc_check_datatype(pp, datatype); + if (!datatype_valid) + print_proc_unload(pp); + } + + if (!datatype_valid) + { + pp = print_proc_load(printer->print_proc); + if (!pp) + return FALSE; + + datatype_valid = print_proc_check_datatype(pp, datatype); + } + + if (!datatype_valid) { WARN("%s datatype not supported by %s\n", debugstr_w(datatype), debugstr_w(printer->info->print_proc)); @@ -3981,6 +4020,7 @@ static BOOL WINAPI fpClosePrinter(HANDLE hprinter) release_printer_info(printer->info); free(printer->name); + free(printer->print_proc); free(printer->datatype); free(printer->devmode); free(printer);

1 0

Piotr Caban : winprint: Implement TEXT print processor.
by Alexandre Julliard Aug. 24, 2023

Aug. 24, 2023

Module: wine Branch: master Commit: 67ca3e71a34f433969c2b9ee098d4bd26c96eb7c URL: https://gitlab.winehq.org/wine/wine/-/commit/67ca3e71a34f433969c2b9ee098d4b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 24 17:45:25 2023 +0200 winprint: Implement TEXT print processor. --- dlls/winprint/printproc.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/winprint/printproc.c b/dlls/winprint/printproc.c index 3c2fb3ad3c8..8627eabd475 100644 --- a/dlls/winprint/printproc.c +++ b/dlls/winprint/printproc.c @@ -25,7 +25,6 @@ * NT EMF 1.006 * NT EMF 1.007 * NT EMF 1.008 - * TEXT * XPS2GDI * * Implement print processor features like e.g. printing multiple copies. */ @@ -66,6 +65,7 @@ BOOL WINAPI EnumPrintProcessorDatatypesW(WCHAR *server, WCHAR *name, DWORD level BYTE *datatypes, DWORD size, DWORD *needed, DWORD *no) { static const WCHAR raw[] = L"RAW"; + static const WCHAR text[] = L"TEXT"; DATATYPES_INFO_1W *info = (DATATYPES_INFO_1W *)datatypes; @@ -79,7 +79,7 @@ BOOL WINAPI EnumPrintProcessorDatatypesW(WCHAR *server, WCHAR *name, DWORD level } *no = 0; - *needed = sizeof(*info) + sizeof(raw); + *needed = 2 * sizeof(*info) + sizeof(raw) + sizeof(text); if (level != 1 || (size && !datatypes)) { @@ -93,9 +93,11 @@ BOOL WINAPI EnumPrintProcessorDatatypesW(WCHAR *server, WCHAR *name, DWORD level return FALSE; } - *no = 1; - info->pName = (WCHAR*)(info + 1); - memcpy(info + 1, raw, sizeof(raw)); + *no = 2; + info[0].pName = (WCHAR*)(info + 2); + info[1].pName = info[0].pName + sizeof(raw) / sizeof(WCHAR); + memcpy(info[0].pName, raw, sizeof(raw)); + memcpy(info[1].pName, text, sizeof(text)); return TRUE; } @@ -111,7 +113,7 @@ HANDLE WINAPI OpenPrintProcessor(WCHAR *port, PRINTPROCESSOROPENDATA *open_data) SetLastError(ERROR_INVALID_PARAMETER); return NULL; } - if (wcscmp(open_data->pDatatype, L"RAW")) + if (wcscmp(open_data->pDatatype, L"RAW") && wcscmp(open_data->pDatatype, L"TEXT")) { SetLastError(ERROR_INVALID_DATATYPE); return NULL;

1 0

Piotr Caban : localspl: Store fallback print processor in AddPrinterDriver.
by Alexandre Julliard Aug. 24, 2023

Aug. 24, 2023

Module: wine Branch: master Commit: 3a477206977016ccd62e8b12ae7cd6c5d1cbb2cd URL: https://gitlab.winehq.org/wine/wine/-/commit/3a477206977016ccd62e8b12ae7cd6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 24 16:02:13 2023 +0200 localspl: Store fallback print processor in AddPrinterDriver. --- dlls/localspl/provider.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index be4b81091eb..a0776b11fe9 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -2019,6 +2019,12 @@ static BOOL myAddPrinterDriverEx(DWORD level, LPBYTE pDriverInfo, DWORD dwFileCo else RegSetValueExW(hdrv, L"Previous Names", 0, REG_MULTI_SZ, (const BYTE*)L"", sizeof(L"")); + if (di.pszPrintProcessor) + RegSetValueExW(hdrv, L"Print Processor", 0, REG_SZ, (BYTE*)di.pszPrintProcessor, + (wcslen(di.pszPrintProcessor) + 1) * sizeof(WCHAR)); + else + RegSetValueExW(hdrv, L"Print Processor", 0, REG_SZ, (const BYTE*)L"winprint", sizeof(L"winprint")); + if (level > 5) TRACE("level %lu for Driver %s is incomplete\n", level, debugstr_w(di.pName)); RegCloseKey(hdrv);

1 0

Akihiro Sagawa : cmd: Use towlower()/towupper() for WCHARs.
by Alexandre Julliard Aug. 24, 2023

Aug. 24, 2023

Module: wine Branch: master Commit: 91de94ab9967749c8e7ece8123db947f996b092f URL: https://gitlab.winehq.org/wine/wine/-/commit/91de94ab9967749c8e7ece8123db94… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Aug 18 12:51:54 2023 +0900 cmd: Use towlower()/towupper() for WCHARs. Found with Coccinelle. --- programs/cmd/builtins.c | 2 +- programs/cmd/directory.c | 12 ++++-------- programs/cmd/wcmdmain.c | 2 +- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 397eb567277..419e812103a 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -3496,7 +3496,7 @@ void WCMD_setshow_default (const WCHAR *args) { /* Restore old directory if drive letter would change, and CD x:\directory /D (or pushd c:\directory) not supplied */ if ((wcsstr(quals, L"/D") == NULL) && - (param1[1] == ':') && (toupper(param1[0]) != toupper(cwd[0]))) { + (param1[1] == ':') && (towupper(param1[0]) != towupper(cwd[0]))) { SetCurrentDirectoryW(cwd); } } diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index dfe7e925419..b9b8656fd70 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -328,10 +328,7 @@ static DIRECTORY_STACK *WCMD_list_directory (DIRECTORY_STACK *inputparms, int le } /* /L convers all names to lower case */ - if (lower) { - WCHAR *p = fd[i].cFileName; - while ( (*p = tolower(*p)) ) ++p; - } + if (lower) wcslwr( fd[i].cFileName ); /* /Q gets file ownership information */ if (usernames) { @@ -558,8 +555,7 @@ void WCMD_directory (WCHAR *args) /* Prefill quals with (uppercased) DIRCMD env var */ if (GetEnvironmentVariableW(L"DIRCMD", string, ARRAY_SIZE(string))) { - p = string; - while ( (*p = toupper(*p)) ) ++p; + wcsupr( string ); lstrcatW(string,quals); lstrcpyW(quals, string); } @@ -827,7 +823,7 @@ void WCMD_directory (WCHAR *args) /* Output disk free (trailer) and volume information (header) if the drive letter changes */ - if (lastDrive != toupper(thisEntry->dirName[0])) { + if (lastDrive != towupper(thisEntry->dirName[0])) { /* Trailer Information */ if (lastDrive != '?') { @@ -835,7 +831,7 @@ void WCMD_directory (WCHAR *args) WCMD_dir_trailer(prevEntry->dirName[0]); } - lastDrive = toupper(thisEntry->dirName[0]); + lastDrive = towupper(thisEntry->dirName[0]); if (!bare) { WCHAR drive[3]; diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 298606f6caa..528e4a83800 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -347,7 +347,7 @@ static void WCMD_show_prompt (BOOL newLine) { } else { p++; - switch (toupper(*p)) { + switch (towupper(*p)) { case '$': *q++ = '$'; break;

1 0

Piotr Caban : ntdll: Don't overwrite last byte of RuntimeInfo if odd number of bytes is used.
by Alexandre Julliard Aug. 24, 2023

Aug. 24, 2023

Module: wine Branch: master Commit: c73bea16eb510c5806c9477eeacc63a6d5092f17 URL: https://gitlab.winehq.org/wine/wine/-/commit/c73bea16eb510c5806c9477eeacc63… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 24 14:39:36 2023 +0200 ntdll: Don't overwrite last byte of RuntimeInfo if odd number of bytes is used. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55287 --- dlls/ntdll/unix/env.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 3f00f6f68de..f42c6a8f59f 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -1702,7 +1702,7 @@ static inline void dup_unicode_string( const UNICODE_STRING *src, WCHAR **dst, U str->Length = src->Length; str->MaximumLength = src->MaximumLength; memcpy( *dst, src->Buffer, src->MaximumLength ); - *dst += src->MaximumLength / sizeof(WCHAR); + *dst += (src->MaximumLength + 1) / sizeof(WCHAR); } @@ -1798,7 +1798,7 @@ static void *build_wow64_parameters( const RTL_USER_PROCESS_PARAMETERS *params ) + params->WindowTitle.MaximumLength + params->Desktop.MaximumLength + params->ShellInfo.MaximumLength - + params->RuntimeInfo.MaximumLength + + ((params->RuntimeInfo.MaximumLength + 1) & ~1) + params->EnvironmentSize); status = NtAllocateVirtualMemory( NtCurrentProcess(), (void **)&wow64_params, 0, &size,

1 0

Akihiro Sagawa : cmd: DIR command outputs free space for the path.
by Alexandre Julliard Aug. 24, 2023

Aug. 24, 2023

Module: wine Branch: master Commit: 322c175cf0291d5c8543e0662a55082d0e53d001 URL: https://gitlab.winehq.org/wine/wine/-/commit/322c175cf0291d5c8543e0662a5508… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Aug 18 12:51:54 2023 +0900 cmd: DIR command outputs free space for the path. When the path contains a mountpoint on Unix or a junction point to another drive on Windows, cmd.exe should show free space for the path instead of the root of the drive. --- programs/cmd/directory.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index b9b8656fd70..6efcbb3a841 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -503,16 +503,14 @@ static DIRECTORY_STACK *WCMD_list_directory (DIRECTORY_STACK *inputparms, int le /***************************************************************************** * WCMD_dir_trailer * - * Print out the trailer for the supplied drive letter + * Print out the trailer for the supplied path */ -static void WCMD_dir_trailer(WCHAR drive) { - ULARGE_INTEGER avail, total, freebytes; - DWORD status; - WCHAR driveName[] = L"c:\\"; - - driveName[0] = drive; - status = GetDiskFreeSpaceExW(driveName, &avail, &total, &freebytes); - WINE_TRACE("Writing trailer for '%s' gave %ld(%ld)\n", wine_dbgstr_w(driveName), +static void WCMD_dir_trailer(const WCHAR *path) { + ULARGE_INTEGER freebytes; + BOOL status; + + status = GetDiskFreeSpaceExW(path, NULL, NULL, &freebytes); + WINE_TRACE("Writing trailer for '%s' gave %d(%ld)\n", wine_dbgstr_w(path), status, GetLastError()); if (errorlevel==0 && !bare) { @@ -828,7 +826,7 @@ void WCMD_directory (WCHAR *args) /* Trailer Information */ if (lastDrive != '?') { trailerReqd = FALSE; - WCMD_dir_trailer(prevEntry->dirName[0]); + WCMD_dir_trailer(prevEntry->dirName); } lastDrive = towupper(thisEntry->dirName[0]); @@ -858,7 +856,7 @@ void WCMD_directory (WCHAR *args) /* Trailer Information */ if (trailerReqd) { - WCMD_dir_trailer(prevEntry->dirName[0]); + WCMD_dir_trailer(prevEntry->dirName); } exit:

1 0

Zebediah Figura : wined3d: Move struct wined3d_shader_resource_view_gl to wined3d_gl.h.
by Alexandre Julliard Aug. 24, 2023

Aug. 24, 2023

Module: wine Branch: master Commit: 62510642a0823d709d4dda30014c872887722ee0 URL: https://gitlab.winehq.org/wine/wine/-/commit/62510642a0823d709d4dda30014c87… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jan 6 16:29:20 2023 -0600 wined3d: Move struct wined3d_shader_resource_view_gl to wined3d_gl.h. --- dlls/wined3d/wined3d_gl.h | 23 +++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 25 +------------------------ 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index c6cfd3606e4..40abd36f3b7 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -1068,4 +1068,27 @@ HRESULT wined3d_rendertarget_view_gl_init(struct wined3d_rendertarget_view_gl *v const struct wined3d_view_desc *desc, struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops); +struct wined3d_shader_resource_view_gl +{ + struct wined3d_shader_resource_view v; + struct wined3d_bo_user bo_user; + struct wined3d_gl_view gl_view; +}; + +static inline struct wined3d_shader_resource_view_gl *wined3d_shader_resource_view_gl( + struct wined3d_shader_resource_view *view) +{ + return CONTAINING_RECORD(view, struct wined3d_shader_resource_view_gl, v); +} + +void wined3d_shader_resource_view_gl_bind(struct wined3d_shader_resource_view_gl *view_gl, unsigned int unit, + struct wined3d_sampler_gl *sampler_gl, struct wined3d_context_gl *context_gl); +void wined3d_shader_resource_view_gl_generate_mipmap(struct wined3d_shader_resource_view_gl *srv_gl, + struct wined3d_context_gl *context_gl); +HRESULT wined3d_shader_resource_view_gl_init(struct wined3d_shader_resource_view_gl *view_gl, + const struct wined3d_view_desc *desc, struct wined3d_resource *resource, + void *parent, const struct wined3d_parent_ops *parent_ops); +void wined3d_shader_resource_view_gl_update(struct wined3d_shader_resource_view_gl *srv_gl, + struct wined3d_context_gl *context_gl); + #endif /* __WINE_WINED3D_GL */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 699dbe585d6..7a4766b5736 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3991,8 +3991,6 @@ HRESULT wined3d_rendertarget_view_no3d_init(struct wined3d_rendertarget_view *vi const struct wined3d_view_desc *desc, struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; -#include "wined3d_gl.h" - struct wined3d_shader_resource_view { LONG refcount; @@ -4008,28 +4006,7 @@ struct wined3d_shader_resource_view void wined3d_shader_resource_view_cleanup(struct wined3d_shader_resource_view *view) DECLSPEC_HIDDEN; -struct wined3d_shader_resource_view_gl -{ - struct wined3d_shader_resource_view v; - struct wined3d_bo_user bo_user; - struct wined3d_gl_view gl_view; -}; - -static inline struct wined3d_shader_resource_view_gl *wined3d_shader_resource_view_gl( - struct wined3d_shader_resource_view *view) -{ - return CONTAINING_RECORD(view, struct wined3d_shader_resource_view_gl, v); -} - -void wined3d_shader_resource_view_gl_bind(struct wined3d_shader_resource_view_gl *view_gl, unsigned int unit, - struct wined3d_sampler_gl *sampler_gl, struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; -void wined3d_shader_resource_view_gl_generate_mipmap(struct wined3d_shader_resource_view_gl *srv_gl, - struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; -HRESULT wined3d_shader_resource_view_gl_init(struct wined3d_shader_resource_view_gl *view_gl, - const struct wined3d_view_desc *desc, struct wined3d_resource *resource, - void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; -void wined3d_shader_resource_view_gl_update(struct wined3d_shader_resource_view_gl *srv_gl, - struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; +#include "wined3d_gl.h" struct wined3d_unordered_access_view {

1 0

Torge Matthies : crypt32: Fix CMS SignedData encoding.
by Alexandre Julliard Aug. 24, 2023

Aug. 24, 2023

Module: wine Branch: master Commit: 75488b303b31501afbdb9b1dcd60130b8fc675fc URL: https://gitlab.winehq.org/wine/wine/-/commit/75488b303b31501afbdb9b1dcd6013… Author: Torge Matthies <openglfreak(a)googlemail.com> Date: Mon Aug 21 04:02:55 2023 +0200 crypt32: Fix CMS SignedData encoding. Several items here were encoded conditionally even though they aren't marked as optional in the spec. Signed-off-by: Torge Matthies <openglfreak(a)googlemail.com> --- dlls/crypt32/encode.c | 52 +++++++++++++++++------------------------------- dlls/crypt32/tests/msg.c | 38 +++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 34 deletions(-) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index adfdad96fd9..9e362b8db21 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -4345,30 +4345,19 @@ static BOOL WINAPI CRYPT_AsnEncodeCMSSignerInfo(DWORD dwCertEncodingType, BOOL CRYPT_AsnEncodeCMSSignedInfo(CRYPT_SIGNED_INFO *signedInfo, void *pvData, DWORD *pcbData) { + struct DERSetDescriptor digestAlgorithmsSet = { signedInfo->cSignerInfo, + signedInfo->rgSignerInfo, sizeof(CMSG_CMS_SIGNER_INFO), + offsetof(CMSG_CMS_SIGNER_INFO, HashAlgorithm), + CRYPT_AsnEncodeAlgorithmIdWithNullParams }; struct AsnEncodeSequenceItem items[7] = { { &signedInfo->version, CRYPT_AsnEncodeInt, 0 }, + { &digestAlgorithmsSet, CRYPT_DEREncodeItemsAsSet, 0 }, + { &signedInfo->content, CRYPT_AsnEncodePKCSContentInfoInternal, 0 } }; - struct DERSetDescriptor digestAlgorithmsSet = { 0 }, certSet = { 0 }; - struct DERSetDescriptor crlSet = { 0 }, signerSet = { 0 }; + struct DERSetDescriptor certSet = { 0 }, crlSet = { 0 }, signerSet = { 0 }; struct AsnEncodeTagSwappedItem swapped[2] = { { 0 } }; - DWORD cItem = 1, cSwapped = 0; - BOOL ret = TRUE; + DWORD cItem = 3, cSwapped = 0; - if (signedInfo->cSignerInfo) - { - digestAlgorithmsSet.cItems = signedInfo->cSignerInfo; - digestAlgorithmsSet.items = signedInfo->rgSignerInfo; - digestAlgorithmsSet.itemSize = sizeof(CMSG_CMS_SIGNER_INFO); - digestAlgorithmsSet.itemOffset = - offsetof(CMSG_CMS_SIGNER_INFO, HashAlgorithm); - digestAlgorithmsSet.encode = CRYPT_AsnEncodeAlgorithmIdWithNullParams; - items[cItem].pvStructInfo = &digestAlgorithmsSet; - items[cItem].encodeFunc = CRYPT_DEREncodeItemsAsSet; - cItem++; - } - items[cItem].pvStructInfo = &signedInfo->content; - items[cItem].encodeFunc = CRYPT_AsnEncodePKCSContentInfoInternal; - cItem++; if (signedInfo->cCertEncoded) { certSet.cItems = signedInfo->cCertEncoded; @@ -4399,22 +4388,17 @@ BOOL CRYPT_AsnEncodeCMSSignedInfo(CRYPT_SIGNED_INFO *signedInfo, void *pvData, cSwapped++; cItem++; } - if (ret && signedInfo->cSignerInfo) - { - signerSet.cItems = signedInfo->cSignerInfo; - signerSet.items = signedInfo->rgSignerInfo; - signerSet.itemSize = sizeof(CMSG_CMS_SIGNER_INFO); - signerSet.itemOffset = 0; - signerSet.encode = CRYPT_AsnEncodeCMSSignerInfo; - items[cItem].pvStructInfo = &signerSet; - items[cItem].encodeFunc = CRYPT_DEREncodeItemsAsSet; - cItem++; - } - if (ret) - ret = CRYPT_AsnEncodeSequence(X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, - items, cItem, 0, NULL, pvData, pcbData); + signerSet.cItems = signedInfo->cSignerInfo; + signerSet.items = signedInfo->rgSignerInfo; + signerSet.itemSize = sizeof(CMSG_CMS_SIGNER_INFO); + signerSet.itemOffset = 0; + signerSet.encode = CRYPT_AsnEncodeCMSSignerInfo; + items[cItem].pvStructInfo = &signerSet; + items[cItem].encodeFunc = CRYPT_DEREncodeItemsAsSet; + cItem++; - return ret; + return CRYPT_AsnEncodeSequence(X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, + items, cItem, 0, NULL, pvData, pcbData); } static BOOL WINAPI CRYPT_AsnEncodeRecipientInfo(DWORD dwCertEncodingType, diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 8b550ee8b88..fa48d978e17 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -1256,6 +1256,18 @@ static void test_signed_msg_update(void) CRYPT_DELETEKEYSET); } +static const BYTE unsignedEmptyBareContent[] = { +0x30,0x0b,0x02,0x01,0x01,0x31,0x00,0x30,0x02,0x06,0x00,0x31,0x00 }; +static const BYTE unsignedEmptyContent[] = { +0x30,0x1a,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x07,0x02,0xa0,0x0d, +0x30,0x0b,0x02,0x01,0x01,0x31,0x00,0x30,0x02,0x06,0x00,0x31,0x00 }; +static const BYTE detachedUnsignedBareContent[] = { +0x30,0x14,0x02,0x01,0x01,0x31,0x00,0x30,0x0b,0x06,0x09,0x2a,0x86,0x48,0x86, +0xf7,0x0d,0x01,0x07,0x01,0x31,0x00 }; +static const BYTE detachedUnsignedContent[] = { +0x30,0x23,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x07,0x02,0xa0,0x16, +0x30,0x14,0x02,0x01,0x01,0x31,0x00,0x30,0x0b,0x06,0x09,0x2a,0x86,0x48,0x86, +0xf7,0x0d,0x01,0x07,0x01,0x31,0x00 }; static const BYTE signedEmptyBareContent[] = { 0x30,0x50,0x02,0x01,0x01,0x31,0x0e,0x30,0x0c,0x06,0x08,0x2a,0x86,0x48,0x86, 0xf7,0x0d,0x02,0x05,0x05,0x00,0x30,0x02,0x06,0x00,0x31,0x37,0x30,0x35,0x02, @@ -1590,6 +1602,32 @@ static void test_signed_msg_encoding(void) HCRYPTKEY key; DWORD size; + msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, + CMSG_DETACHED_FLAG, CMSG_SIGNED, &signInfo, NULL, NULL); + ok(msg != NULL, "CryptMsgOpenToEncode failed: %lx\n", GetLastError()); + + check_param("detached unsigned empty bare content", msg, + CMSG_BARE_CONTENT_PARAM, unsignedEmptyBareContent, + sizeof(unsignedEmptyBareContent)); + check_param("detached unsigned empty content", msg, CMSG_CONTENT_PARAM, + unsignedEmptyContent, sizeof(unsignedEmptyContent)); + ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); + ok(ret, "CryptMsgUpdate failed: %lx\n", GetLastError()); + check_param("detached unsigned bare content", msg, CMSG_BARE_CONTENT_PARAM, + detachedUnsignedBareContent, sizeof(detachedUnsignedBareContent)); + check_param("detached unsigned content", msg, CMSG_CONTENT_PARAM, + detachedUnsignedContent, sizeof(detachedUnsignedContent)); + SetLastError(0xdeadbeef); + ret = CryptMsgGetParam(msg, CMSG_COMPUTED_HASH_PARAM, 0, NULL, &size); + ok(!ret && GetLastError() == CRYPT_E_INVALID_INDEX, + "Expected CRYPT_E_INVALID_INDEX, got %lx\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = CryptMsgGetParam(msg, CMSG_ENCODED_SIGNER, 0, NULL, &size); + ok(!ret && GetLastError() == CRYPT_E_INVALID_INDEX, + "Expected CRYPT_E_INVALID_INDEX, got %lx\n", GetLastError()); + + CryptMsgClose(msg); + certInfo.SerialNumber.cbData = sizeof(serialNum); certInfo.SerialNumber.pbData = serialNum; certInfo.Issuer.cbData = sizeof(encodedCommonName);

1 0