December 2021 - Wine-Commits

Jacek Caban : win32u: Directly access system DPI in ntgdi.
by Alexandre Julliard Dec. 6, 2021

Dec. 6, 2021

Module: wine Branch: master Commit: 338179ae34029ecfea2d4705fa164f258567c6c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=338179ae34029ecfea2d4705… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 6 03:10:15 2021 +0100 win32u: Directly access system DPI in ntgdi. 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/win32u/gdiobj.c | 10 ---------- dlls/win32u/sysparams.c | 7 +++++++ dlls/win32u/win32u_private.h | 2 +- dlls/win32u/wrappers.c | 9 --------- 4 files changed, 8 insertions(+), 20 deletions(-) diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index 796ae460a17..768bf3a89db 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -572,16 +572,6 @@ BOOL GDI_dec_ref_count( HGDIOBJ handle ) } -/****************************************************************************** - * get_system_dpi - * - * Get the system DPI, based on the DPI awareness mode. - */ -DWORD get_system_dpi(void) -{ - return user_callbacks ? user_callbacks->pGetDpiForSystem() : 96; -} - static HFONT create_font( const LOGFONTW *deffont ) { ENUMLOGFONTEXDVW lf; diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 8efe17aed3c..f8e462ed2a8 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1395,6 +1395,13 @@ static UINT get_thread_dpi(void) } } +/* see GetDpiForSystem */ +UINT get_system_dpi(void) +{ + if (get_thread_dpi_awareness() == DPI_AWARENESS_UNAWARE) return USER_DEFAULT_SCREEN_DPI; + return system_dpi; +} + /********************************************************************** * map_dpi_rect */ diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 1182902921f..ac560d54b9e 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -33,7 +33,6 @@ struct user_callbacks { HWND (WINAPI *pGetDesktopWindow)(void); - UINT (WINAPI *pGetDpiForSystem)(void); BOOL (WINAPI *pGetMonitorInfoW)( HMONITOR, LPMONITORINFO ); INT (WINAPI *pGetSystemMetrics)(INT); BOOL (WINAPI *pGetWindowRect)( HWND hwnd, LPRECT rect ); @@ -241,6 +240,7 @@ struct unix_funcs struct window_surface *surface ); }; +extern UINT get_system_dpi(void) DECLSPEC_HIDDEN; extern RECT get_virtual_screen_rect(void) DECLSPEC_HIDDEN; extern void wrappers_init( unixlib_handle_t handle ) DECLSPEC_HIDDEN; diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index d482c71375d..559044d69ff 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -940,14 +940,6 @@ static HWND WINAPI call_GetDesktopWindow(void) return pGetDesktopWindow ? pGetDesktopWindow() : NULL; } -static UINT WINAPI call_GetDpiForSystem(void) -{ - static UINT (WINAPI *pGetDpiForSystem)(void); - if (!pGetDpiForSystem) - pGetDpiForSystem = get_user_proc( "GetDpiForSystem", FALSE ); - return pGetDpiForSystem ? pGetDpiForSystem() : 96; -} - static BOOL WINAPI call_GetMonitorInfoW( HMONITOR monitor, MONITORINFO *info ) { static BOOL (WINAPI *pGetMonitorInfoW)( HMONITOR, LPMONITORINFO ); @@ -1000,7 +992,6 @@ static HWND WINAPI call_WindowFromDC( HDC hdc ) static const struct user_callbacks user_funcs = { call_GetDesktopWindow, - call_GetDpiForSystem, call_GetMonitorInfoW, call_GetSystemMetrics, call_GetWindowRect,

1 0

Jacek Caban : win32u: Move system parameters implementation from user32.
by Alexandre Julliard Dec. 6, 2021

Dec. 6, 2021

Module: wine Branch: master Commit: fdf3015816168678c919ab282cf4e88704e931bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=fdf3015816168678c919ab28… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 6 03:15:59 2021 +0100 win32u: Move system parameters implementation from user32. 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/user32/driver.c | 8 +- dlls/user32/message.c | 2 +- dlls/user32/sysparams.c | 2549 ++---------------------------------------- dlls/user32/user32.spec | 4 +- dlls/win32u/driver.c | 5 +- dlls/win32u/gdiobj.c | 3 + dlls/win32u/syscall.c | 1 + dlls/win32u/sysparams.c | 2338 +++++++++++++++++++++++++++++++++++++- dlls/win32u/win32u.spec | 8 +- dlls/win32u/win32u_private.h | 7 +- dlls/win32u/wrappers.c | 28 + dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 5 + include/ntuser.h | 11 + 14 files changed, 2440 insertions(+), 2530 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fdf3015816168678c919…

1 0

Brendan Shanks : include: Add processthreadsapi.h file.
by Alexandre Julliard Dec. 6, 2021

Dec. 6, 2021

Module: wine Branch: master Commit: d4cfb0c30c74cbb53291ef660ade50091a7901be URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4cfb0c30c74cbb53291ef66… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Fri Dec 3 16:28:57 2021 -0800 include: Add processthreadsapi.h file. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/processthreadsapi.h | 33 +++++++++++++++++++++++++++++++++ include/winbase.h | 1 + 3 files changed, 35 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index c99b0e1e1c1..de40421edcb 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -592,6 +592,7 @@ SOURCES = \ poppack.h \ powrprof.h \ prntvpt.h \ + processthreadsapi.h \ profinfo.h \ proofofpossessioncookieinfo.idl \ propidl.idl \ diff --git a/include/processthreadsapi.h b/include/processthreadsapi.h new file mode 100644 index 00000000000..8cdaff4796a --- /dev/null +++ b/include/processthreadsapi.h @@ -0,0 +1,33 @@ +/* + * Copyright 2021 Brendan Shanks for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _PROCESSTHREADSAPI_H +#define _PROCESSTHREADSAPI_H + +#ifdef __cplusplus +extern "C" { +#endif + +WINBASEAPI HRESULT WINAPI GetThreadDescription(HANDLE,PWSTR *); +WINBASEAPI HRESULT WINAPI SetThreadDescription(HANDLE,PCWSTR); + +#ifdef __cplusplus +} +#endif + +#endif /* _PROCESSTHREADSAPI_H */ diff --git a/include/winbase.h b/include/winbase.h index 8e8a185b4ff..2f7287f12b6 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -40,6 +40,7 @@ extern "C" { #endif #include <libloaderapi.h> +#include <processthreadsapi.h> #include <synchapi.h> #include <threadpoolapiset.h>

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard Dec. 6, 2021

Dec. 6, 2021

Module: wine Branch: master Commit: 5764980feac0da67cf69b4c172361e55122a3d39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5764980feac0da67cf69b4c1… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Sun Dec 5 23:14:42 2021 +0200 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 252 ++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 130 insertions(+), 122 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5764980feac0da67cf69…

1 0

Konstantin Romanov : wineps: Return a POINT for DC_PAPERSIZE.
by Alexandre Julliard Dec. 6, 2021

Dec. 6, 2021

Module: wine Branch: master Commit: 62e0f51e6e22deaaea6283ce541dbc7111e01faa URL: https://source.winehq.org/git/wine.git/?a=commit;h=62e0f51e6e22deaaea6283ce… Author: Konstantin Romanov <incubusrk(a)gmail.com> Date: Mon Dec 6 09:58:10 2021 +0000 wineps: Return a POINT for DC_PAPERSIZE. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52132 Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineps.drv/driver.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/wineps.drv/driver.c b/dlls/wineps.drv/driver.c index 11de7bc3328..64ed5bbb402 100644 --- a/dlls/wineps.drv/driver.c +++ b/dlls/wineps.drv/driver.c @@ -25,15 +25,19 @@ #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include <string.h> - -#include "wine/debug.h" -#include "psdrv.h" -#include "ddk/winddiui.h" +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "winnls.h" +#include "wingdi.h" #include "winuser.h" -#include "wine/wingdi16.h" #include "prsht.h" +#include "ddk/winddiui.h" + +#include "wine/debug.h" + +#include "psdrv.h" #include "psdlg.h" WINE_DEFAULT_DEBUG_CHANNEL(psdrv); @@ -561,7 +565,7 @@ DWORD WINAPI DrvDeviceCapabilities(HANDLE printer, WCHAR *device_name, WORD capa case DC_PAPERSIZE: { PAGESIZE *ps; - POINT16 *pt = output; + POINT *pt = output; int i = 0; LIST_FOR_EACH_ENTRY(ps, &pi->ppd->PageSizes, PAGESIZE, entry)

1 0

Jacek Caban : user32: Provide partial null driver.
by Alexandre Julliard Dec. 6, 2021

Dec. 6, 2021

Module: wine Branch: master Commit: bc12c971c3c61c617b0332d1bce8c6404d43e364 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc12c971c3c61c617b0332d1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 6 03:08:07 2021 +0100 user32: Provide partial null driver. Provide functions that we still call from user32 to avoid crashes on wow64. 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/user32/driver.c | 106 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 295a7ee2cd7..f0150b16643 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -119,10 +119,46 @@ void USER_unload_driver(void) * These are fallbacks for entry points that are not implemented in the real driver. */ +static void CDECL nulldrv_Beep(void) +{ +} + +static BOOL CDECL nulldrv_RegisterHotKey( HWND hwnd, UINT modifiers, UINT vk ) +{ + return TRUE; +} + +static void CDECL nulldrv_UnregisterHotKey( HWND hwnd, UINT modifiers, UINT vk ) +{ +} + static void CDECL nulldrv_DestroyCursorIcon( HCURSOR cursor ) { } +static void CDECL nulldrv_SetCursor( HCURSOR cursor ) +{ +} + +static BOOL CDECL nulldrv_GetCursorPos( LPPOINT pt ) +{ + return TRUE; +} + +static BOOL CDECL nulldrv_SetCursorPos( INT x, INT y ) +{ + return TRUE; +} + +static BOOL CDECL nulldrv_ClipCursor( LPCRECT clip ) +{ + return TRUE; +} + +static void CDECL nulldrv_UpdateClipboard(void) +{ +} + static BOOL CDECL nodrv_CreateWindow( HWND hwnd ) { static int warned; @@ -137,10 +173,29 @@ static BOOL CDECL nodrv_CreateWindow( HWND hwnd ) return FALSE; } +static BOOL CDECL nulldrv_CreateDesktopWindow( HWND hwnd ) +{ + return TRUE; +} + +static BOOL CDECL nulldrv_CreateWindow( HWND hwnd ) +{ + return TRUE; +} + static void CDECL nulldrv_DestroyWindow( HWND hwnd ) { } +static void CDECL nulldrv_FlashWindowEx( FLASHWINFO *info ) +{ +} + +static void CDECL nulldrv_GetDC( HDC hdc, HWND hwnd, HWND top_win, const RECT *win_rect, + const RECT *top_rect, DWORD flags ) +{ +} + static DWORD CDECL nulldrv_MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *handles, DWORD timeout, DWORD mask, DWORD flags ) { @@ -161,10 +216,18 @@ static void CDECL nulldrv_SetFocus( HWND hwnd ) { } +static void CDECL nulldrv_SetLayeredWindowAttributes( HWND hwnd, COLORREF key, BYTE alpha, DWORD flags ) +{ +} + static void CDECL nulldrv_SetParent( HWND hwnd, HWND parent, HWND old_parent ) { } +static void CDECL nulldrv_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ) +{ +} + static void CDECL nulldrv_SetWindowIcon( HWND hwnd, UINT type, HICON icon ) { } @@ -187,6 +250,12 @@ static LRESULT CDECL nulldrv_SysCommand( HWND hwnd, WPARAM wparam, LPARAM lparam return -1; } +static BOOL CDECL nulldrv_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO *info, + const RECT *window_rect ) +{ + return TRUE; +} + static LRESULT CDECL nulldrv_WindowMessage( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) { return 0; @@ -367,6 +436,43 @@ void CDECL __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT v driver = HeapAlloc( GetProcessHeap(), 0, sizeof(*driver) ); *driver = *funcs; +#define SET_USER_FUNC(name) \ + do { if (!driver->p##name) driver->p##name = nulldrv_##name; } while(0) + + SET_USER_FUNC(Beep); + SET_USER_FUNC(RegisterHotKey); + SET_USER_FUNC(UnregisterHotKey); + SET_USER_FUNC(DestroyCursorIcon); + SET_USER_FUNC(SetCursor); + SET_USER_FUNC(GetCursorPos); + SET_USER_FUNC(SetCursorPos); + SET_USER_FUNC(ClipCursor); + SET_USER_FUNC(UpdateClipboard); + SET_USER_FUNC(CreateDesktopWindow); + SET_USER_FUNC(CreateWindow); + SET_USER_FUNC(DestroyWindow); + SET_USER_FUNC(FlashWindowEx); + SET_USER_FUNC(GetDC); + SET_USER_FUNC(MsgWaitForMultipleObjectsEx); + SET_USER_FUNC(ReleaseDC); + SET_USER_FUNC(SetCapture); + SET_USER_FUNC(SetFocus); + SET_USER_FUNC(SetLayeredWindowAttributes); + SET_USER_FUNC(SetParent); + SET_USER_FUNC(SetWindowRgn); + SET_USER_FUNC(SetWindowIcon); + SET_USER_FUNC(SetWindowStyle); + SET_USER_FUNC(SetWindowText); + SET_USER_FUNC(ShowWindow); + SET_USER_FUNC(SysCommand); + SET_USER_FUNC(UpdateLayeredWindow); + SET_USER_FUNC(WindowMessage); + SET_USER_FUNC(WindowPosChanging); + SET_USER_FUNC(WindowPosChanged); + SET_USER_FUNC(SystemParametersInfo); + SET_USER_FUNC(ThreadDetach); +#undef SET_USER_FUNC + prev = InterlockedCompareExchangePointer( (void **)&USER_Driver, driver, &lazy_load_driver ); if (prev != &lazy_load_driver) {

1 0

Torge Matthies : windowscodecs: Disable libpng chunk size limit.
by Alexandre Julliard Dec. 6, 2021

Dec. 6, 2021

Module: wine Branch: master Commit: e1130d240e8a3ff05c814dd8a2d6e55b3f054e5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1130d240e8a3ff05c814dd8… Author: Torge Matthies <openglfreak(a)googlemail.com> Date: Fri Dec 3 21:26:16 2021 +0100 windowscodecs: Disable libpng chunk size limit. Reading a PNG file with libpng with a chunk bigger than the 8 MiB default chunk size limit set by libpng results in a libpng error, e.g. "iTXt: chunk data is too large" for a too big iTXt chunk. Fix this by disabling the chunk size limit. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52147 Signed-off-by: Torge Matthies <openglfreak(a)googlemail.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/libpng.c | 1 + dlls/windowscodecs/tests/pngformat.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/libpng.c b/dlls/windowscodecs/libpng.c index 27a735550f3..8e876b23efe 100644 --- a/dlls/windowscodecs/libpng.c +++ b/dlls/windowscodecs/libpng.c @@ -107,6 +107,7 @@ static HRESULT CDECL png_decoder_initialize(struct decoder *iface, IStream *stre goto end; } png_set_crc_action(png_ptr, PNG_CRC_QUIET_USE, PNG_CRC_QUIET_USE); + png_set_chunk_malloc_max(png_ptr, 0); /* seek to the start of the stream */ hr = stream_seek(stream, 0, STREAM_SEEK_SET, NULL); diff --git a/dlls/windowscodecs/tests/pngformat.c b/dlls/windowscodecs/tests/pngformat.c index b44fd017fcf..32afc989c2b 100644 --- a/dlls/windowscodecs/tests/pngformat.c +++ b/dlls/windowscodecs/tests/pngformat.c @@ -944,7 +944,7 @@ static void test_chunk_size(void) memcpy(png_8M_tEXt + sizeof(png_8M_tEXt) - sizeof(png_8M_tEXt_end), png_8M_tEXt_end, sizeof(png_8M_tEXt_end)); hr = create_decoder(png_8M_tEXt, sizeof(png_8M_tEXt), &decoder); - todo_wine ok(hr == S_OK, "Failed to load PNG image data %#x\n", hr); + ok(hr == S_OK, "Failed to load PNG image data %#x\n", hr); if (hr != S_OK) return; IWICBitmapDecoder_Release(decoder);

1 0

Alexandre Julliard : secur32: Move the get_buffer callback to the Unix side.
by Alexandre Julliard Dec. 6, 2021

Dec. 6, 2021

Module: wine Branch: master Commit: 97ea9ee41ce7281ce3cde56cb9d25db118b30b37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=97ea9ee41ce7281ce3cde56c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 3 12:25:53 2021 +0100 secur32: Move the get_buffer callback to the Unix side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel.c | 86 +------------------------------------ dlls/secur32/schannel_gnutls.c | 96 ++++++++++++++++++++++++++++++++++++++---- dlls/secur32/secur32_priv.h | 5 --- 3 files changed, 89 insertions(+), 98 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index d35372ed7fc..0dbffb485e6 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -665,85 +665,6 @@ static int schan_find_sec_buffer_idx(const SecBufferDesc *desc, unsigned int sta return -1; } -static void schan_resize_current_buffer(const struct schan_buffers *s, SIZE_T min_size) -{ - SecBuffer *b = &s->desc->pBuffers[s->current_buffer_idx]; - SIZE_T new_size = b->cbBuffer ? b->cbBuffer * 2 : 128; - void *new_data; - - if (b->cbBuffer >= min_size || !s->allow_buffer_resize || min_size > UINT_MAX / 2) return; - - while (new_size < min_size) new_size *= 2; - - if (b->pvBuffer) /* freed with FreeContextBuffer */ - new_data = RtlReAllocateHeap(GetProcessHeap(), 0, b->pvBuffer, new_size); - else - new_data = RtlAllocateHeap(GetProcessHeap(), 0, new_size); - - if (!new_data) - { - TRACE("Failed to resize %p from %d to %ld\n", b->pvBuffer, b->cbBuffer, new_size); - return; - } - - b->cbBuffer = new_size; - b->pvBuffer = new_data; -} - -static char * CDECL schan_get_buffer(const struct schan_transport *t, struct schan_buffers *s, SIZE_T *count) -{ - SIZE_T max_count; - PSecBuffer buffer; - - if (!s->desc) - { - TRACE("No desc\n"); - return NULL; - } - - if (s->current_buffer_idx == -1) - { - /* Initial buffer */ - int buffer_idx = s->get_next_buffer(t, s); - if (buffer_idx == -1) - { - TRACE("No next buffer\n"); - return NULL; - } - s->current_buffer_idx = buffer_idx; - } - - buffer = &s->desc->pBuffers[s->current_buffer_idx]; - TRACE("Using buffer %d: cbBuffer %d, BufferType %#x, pvBuffer %p\n", s->current_buffer_idx, buffer->cbBuffer, buffer->BufferType, buffer->pvBuffer); - - schan_resize_current_buffer(s, s->offset + *count); - max_count = buffer->cbBuffer - s->offset; - if (s->limit != ~0UL && s->limit < max_count) - max_count = s->limit; - if (!max_count) - { - int buffer_idx; - - s->allow_buffer_resize = FALSE; - buffer_idx = s->get_next_buffer(t, s); - if (buffer_idx == -1) - { - TRACE("No next buffer\n"); - return NULL; - } - s->current_buffer_idx = buffer_idx; - s->offset = 0; - return schan_get_buffer(t, s, count); - } - - if (*count > max_count) - *count = max_count; - if (s->limit != ~0UL) - s->limit -= *count; - - return (char *)buffer->pvBuffer + s->offset; -} - static int schan_init_sec_ctx_get_next_input_buffer(const struct schan_transport *t, struct schan_buffers *s) { if (s->current_buffer_idx != -1) @@ -1566,11 +1487,6 @@ static const SecurityFunctionTableW schanTableW = { NULL, /* SetContextAttributesW */ }; -const struct schan_callbacks schan_callbacks = -{ - schan_get_buffer, -}; - void SECUR32_initSchannelSP(void) { /* This is what Windows reports. This shouldn't break any applications @@ -1596,7 +1512,7 @@ void SECUR32_initSchannelSP(void) }; SecureProvider *provider; - if (!schan_funcs && __wine_init_unix_lib(hsecur32, DLL_PROCESS_ATTACH, &schan_callbacks, &schan_funcs)) + if (!schan_funcs && __wine_init_unix_lib(hsecur32, DLL_PROCESS_ATTACH, NULL, &schan_funcs)) { ERR( "no schannel support, expect problems\n" ); return; diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 9b0833efcf5..7eca22b2967 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -52,8 +52,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(secur32); WINE_DECLARE_DEBUG_CHANNEL(winediag); -static const struct schan_callbacks *callbacks; - /* Not present in gnutls version < 2.9.10. */ static int (*pgnutls_cipher_get_block_size)(gnutls_cipher_algorithm_t); @@ -199,6 +197,89 @@ static void compat_gnutls_dtls_set_mtu(gnutls_session_t session, unsigned int mt FIXME("\n"); } +static void resize_current_buffer(const struct schan_buffers *s, SIZE_T min_size) +{ + SecBuffer *b = &s->desc->pBuffers[s->current_buffer_idx]; + SIZE_T new_size = b->cbBuffer ? b->cbBuffer * 2 : 128; + void *new_data; + + if (b->cbBuffer >= min_size || !s->allow_buffer_resize || min_size > UINT_MAX / 2) return; + + while (new_size < min_size) new_size *= 2; + + if (b->pvBuffer) /* freed with FreeContextBuffer */ + new_data = RtlReAllocateHeap(GetProcessHeap(), 0, b->pvBuffer, new_size); + else + new_data = RtlAllocateHeap(GetProcessHeap(), 0, new_size); + + if (!new_data) + { + TRACE("Failed to resize %p from %d to %ld\n", b->pvBuffer, b->cbBuffer, new_size); + return; + } + + b->cbBuffer = new_size; + b->pvBuffer = new_data; +} + +static char *get_buffer(const struct schan_transport *t, struct schan_buffers *s, SIZE_T *count) +{ + SIZE_T max_count; + PSecBuffer buffer; + + if (!s->desc) + { + TRACE("No desc\n"); + return NULL; + } + + if (s->current_buffer_idx == -1) + { + /* Initial buffer */ + int buffer_idx = s->get_next_buffer(t, s); + if (buffer_idx == -1) + { + TRACE("No next buffer\n"); + return NULL; + } + s->current_buffer_idx = buffer_idx; + } + + buffer = &s->desc->pBuffers[s->current_buffer_idx]; + TRACE("Using buffer %d: cbBuffer %d, BufferType %#x, pvBuffer %p\n", s->current_buffer_idx, buffer->cbBuffer, buffer->BufferType, buffer->pvBuffer); + + resize_current_buffer(s, s->offset + *count); + max_count = buffer->cbBuffer - s->offset; + if (s->limit != ~0UL && s->limit < max_count) + max_count = s->limit; + + while (!max_count) + { + int buffer_idx; + + s->allow_buffer_resize = FALSE; + buffer_idx = s->get_next_buffer(t, s); + if (buffer_idx == -1) + { + TRACE("No next buffer\n"); + return NULL; + } + s->current_buffer_idx = buffer_idx; + s->offset = 0; + buffer = &s->desc->pBuffers[buffer_idx]; + max_count = buffer->cbBuffer; + if (s->limit != ~0UL && s->limit < max_count) + max_count = s->limit; + } + + if (*count > max_count) + *count = max_count; + if (s->limit != ~0UL) + s->limit -= *count; + + return (char *)buffer->pvBuffer + s->offset; +} + static ssize_t pull_adapter(gnutls_transport_ptr_t transport, void *buff, size_t buff_len) { struct schan_transport *t = (struct schan_transport*)transport; @@ -208,7 +289,7 @@ static ssize_t pull_adapter(gnutls_transport_ptr_t transport, void *buff, size_t TRACE("Push %lu bytes\n", len); - b = callbacks->get_buffer(t, &t->in, &len); + b = get_buffer(t, &t->in, &len); if (!b) { pgnutls_transport_set_errno(s, EAGAIN); @@ -229,7 +310,7 @@ static ssize_t push_adapter(gnutls_transport_ptr_t transport, const void *buff, TRACE("Push %lu bytes\n", len); - b = callbacks->get_buffer(t, &t->out, &len); + b = get_buffer(t, &t->out, &len); if (!b) { pgnutls_transport_set_errno(s, EAGAIN); @@ -300,7 +381,7 @@ static int pull_timeout(gnutls_transport_ptr_t transport, unsigned int timeout) TRACE("\n"); - if (callbacks->get_buffer(t, &t->in, &count)) return 1; + if (get_buffer(t, &t->in, &count)) return 1; pgnutls_transport_set_errno(s, EAGAIN); return -1; } @@ -661,7 +742,7 @@ static SECURITY_STATUS CDECL schan_send(schan_session session, const void *buffe struct schan_transport *t = (struct schan_transport *)pgnutls_transport_get_ptr(s); SIZE_T count = 0; - if (callbacks->get_buffer(t, &t->out, &count)) continue; + if (get_buffer(t, &t->out, &count)) continue; return SEC_I_CONTINUE_NEEDED; } else @@ -687,7 +768,7 @@ again: struct schan_transport *t = (struct schan_transport *)pgnutls_transport_get_ptr(s); SIZE_T count = 0; - if (callbacks->get_buffer(t, &t->in, &count)) + if (get_buffer(t, &t->in, &count)) goto again; return SEC_I_CONTINUE_NEEDED; @@ -1118,7 +1199,6 @@ NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *p { case DLL_PROCESS_ATTACH: if (!gnutls_initialize()) return STATUS_DLL_NOT_FOUND; - callbacks = ptr_in; *(const struct schan_funcs **)ptr_out = &funcs; break; case DLL_PROCESS_DETACH: diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index 88effe07a81..e4c39e476bc 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -137,11 +137,6 @@ struct schan_funcs void (CDECL *set_session_transport)(schan_session, struct schan_transport *); }; -struct schan_callbacks -{ - char * (CDECL *get_buffer)(const struct schan_transport *, struct schan_buffers *, SIZE_T *); -}; - extern const struct schan_funcs *schan_funcs; #endif /* __SECUR32_PRIV_H__ */

1 0

Torge Matthies : windowscodecs/tests: Add test for big PNG chunks.
by Alexandre Julliard Dec. 6, 2021

Dec. 6, 2021

Module: wine Branch: master Commit: 2abf0173e5cecdb59d7aeb3c673d34088135d88a URL: https://source.winehq.org/git/wine.git/?a=commit;h=2abf0173e5cecdb59d7aeb3c… Author: Torge Matthies <openglfreak(a)googlemail.com> Date: Fri Dec 3 21:26:15 2021 +0100 windowscodecs/tests: Add test for big PNG chunks. Signed-off-by: Torge Matthies <openglfreak(a)googlemail.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/pngformat.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dlls/windowscodecs/tests/pngformat.c b/dlls/windowscodecs/tests/pngformat.c index 8c33d3b9645..b44fd017fcf 100644 --- a/dlls/windowscodecs/tests/pngformat.c +++ b/dlls/windowscodecs/tests/pngformat.c @@ -922,6 +922,34 @@ todo_wine_if(td[i].todo) #undef PNG_COLOR_TYPE_GRAY_ALPHA #undef PNG_COLOR_TYPE_RGB_ALPHA +/* 1 bpp 1x1 pixel PNG image with 8 MiB comment */ +static const char png_8M_tEXt_start[] = { + 0x89,'P','N','G',0x0d,0x0a,0x1a,0x0a, + 0x00,0x00,0x00,0x0d,'I','H','D','R',0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x01,0x00,0x00,0x00,0x00,0x37,0x6e,0xf9,0x24, + 0x00,0x80,0x00,0x08,'t','E','X','t','C','o','m','m','e','n','t',0x00 /* ,[0x800030]=0x00,0x1e,0x13,0xe2,0xc7 */ +}; +static const char png_8M_tEXt_end[] = { + /* 0x00,0x80,0x00,0x08,'t','E','X','t','C','o','m','m','e','n','t',0x00,[0x800030]=0x00, */ 0x1e,0x13,0xe2,0xc7, + 0x00,0x00,0x00,0x0c,'I','D','A','T',0x78,0x9c,0x63,0x68,0x00,0x00,0x00,0x82,0x00,0x81,0x77,0xcd,0x72,0xb6, + 0x00,0x00,0x00,0x00,'I','E','N','D',0xae,0x42,0x60,0x82 +}; + +static void test_chunk_size(void) +{ + static char png_8M_tEXt[sizeof(png_8M_tEXt_start) + 0x800000 + sizeof(png_8M_tEXt_end)] = {0}; + HRESULT hr; + IWICBitmapDecoder *decoder; + + memcpy(png_8M_tEXt, png_8M_tEXt_start, sizeof(png_8M_tEXt_start)); + memcpy(png_8M_tEXt + sizeof(png_8M_tEXt) - sizeof(png_8M_tEXt_end), png_8M_tEXt_end, sizeof(png_8M_tEXt_end)); + + hr = create_decoder(png_8M_tEXt, sizeof(png_8M_tEXt), &decoder); + todo_wine ok(hr == S_OK, "Failed to load PNG image data %#x\n", hr); + if (hr != S_OK) return; + + IWICBitmapDecoder_Release(decoder); +} + START_TEST(pngformat) { HRESULT hr; @@ -935,6 +963,7 @@ START_TEST(pngformat) test_color_contexts(); test_png_palette(); test_color_formats(); + test_chunk_size(); IWICImagingFactory_Release(factory); CoUninitialize();

1 0

Alexandre Julliard : secur32: Move the pull/push callbacks to the Unix side.
by Alexandre Julliard Dec. 6, 2021

Dec. 6, 2021

Module: wine Branch: master Commit: 37eab1f496b1e7540631760956a5ca97ef4d4b76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=37eab1f496b1e75406317609… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 3 11:59:44 2021 +0100 secur32: Move the pull/push callbacks to the Unix side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel.c | 80 ------------------------------------------ dlls/secur32/schannel_gnutls.c | 38 ++++++++++---------- dlls/secur32/secur32_priv.h | 2 -- 3 files changed, 20 insertions(+), 100 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 895364a3fc7..e3c5ab76088 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -745,84 +745,6 @@ static char * CDECL schan_get_buffer(const struct schan_transport *t, struct sch return (char *)buffer->pvBuffer + s->offset; } -/* schan_pull - * Read data from the transport input buffer. - * - * t - The session transport object. - * buff - The buffer into which to store the read data. Must be at least - * *buff_len bytes in length. - * buff_len - On input, *buff_len is the desired length to read. On successful - * return, *buff_len is the number of bytes actually read. - * - * Returns: - * 0 on success, in which case: - * *buff_len == 0 indicates end of file. - * *buff_len > 0 indicates that some data was read. May be less than - * what was requested, in which case the caller should call again if/ - * when they want more. - * -1 when no data could be read without blocking - * another errno-style error value on failure - */ -static int CDECL schan_pull(struct schan_transport *t, void *buff, size_t *buff_len) -{ - char *b; - SIZE_T local_len = *buff_len; - - TRACE("Pull %lu bytes\n", local_len); - - *buff_len = 0; - - b = schan_get_buffer(t, &t->in, &local_len); - if (!b) - return -1; - - memcpy(buff, b, local_len); - t->in.offset += local_len; - - TRACE("Read %lu bytes\n", local_len); - - *buff_len = local_len; - return 0; -} - -/* schan_push - * Write data to the transport output buffer. - * - * t - The session transport object. - * buff - The buffer of data to write. Must be at least *buff_len bytes in length. - * buff_len - On input, *buff_len is the desired length to write. On successful - * return, *buff_len is the number of bytes actually written. - * - * Returns: - * 0 on success - * *buff_len will be > 0 indicating how much data was written. May be less - * than what was requested, in which case the caller should call again - * if/when they want to write more. - * -1 when no data could be written without blocking - * another errno-style error value on failure - */ -static int CDECL schan_push(struct schan_transport *t, const void *buff, size_t *buff_len) -{ - char *b; - SIZE_T local_len = *buff_len; - - TRACE("Push %lu bytes\n", local_len); - - *buff_len = 0; - - b = schan_get_buffer(t, &t->out, &local_len); - if (!b) - return -1; - - memcpy(b, buff, local_len); - t->out.offset += local_len; - - TRACE("Wrote %lu bytes\n", local_len); - - *buff_len = local_len; - return 0; -} - static schan_session CDECL schan_get_session_for_transport(struct schan_transport* t) { return t->ctx->session; @@ -1654,8 +1576,6 @@ const struct schan_callbacks schan_callbacks = { schan_get_buffer, schan_get_session_for_transport, - schan_pull, - schan_push, }; void SECUR32_initSchannelSP(void) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index e02b1643e30..117a9da42d5 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -203,40 +203,42 @@ static ssize_t pull_adapter(gnutls_transport_ptr_t transport, void *buff, size_t { struct schan_transport *t = (struct schan_transport*)transport; gnutls_session_t s = (gnutls_session_t)callbacks->get_session_for_transport(t); + SIZE_T len = buff_len; + char *b; - int ret = callbacks->pull(transport, buff, &buff_len); - if (ret == -1) + TRACE("Push %lu bytes\n", len); + + b = callbacks->get_buffer(t, &t->in, &len); + if (!b) { pgnutls_transport_set_errno(s, EAGAIN); return -1; } - if (ret < 0) - { - FIXME("unhandled error from pull callback %d\n", ret); - return -1; - } - - return buff_len; + memcpy(buff, b, len); + t->in.offset += len; + TRACE("Wrote %lu bytes\n", len); + return len; } static ssize_t push_adapter(gnutls_transport_ptr_t transport, const void *buff, size_t buff_len) { struct schan_transport *t = (struct schan_transport*)transport; gnutls_session_t s = (gnutls_session_t)callbacks->get_session_for_transport(t); + SIZE_T len = buff_len; + char *b; - int ret = callbacks->push(transport, buff, &buff_len); - if (ret == -1) + TRACE("Push %lu bytes\n", len); + + b = callbacks->get_buffer(t, &t->out, &len); + if (!b) { pgnutls_transport_set_errno(s, EAGAIN); return -1; } - if (ret < 0) - { - FIXME("unhandled error from push callback %d\n", ret); - return -1; - } - - return buff_len; + memcpy(b, buff, len); + t->out.offset += len; + TRACE("Wrote %lu bytes\n", len); + return len; } static const struct { diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index 75c6cde2e42..eedb1f4bfb2 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -140,8 +140,6 @@ struct schan_callbacks { char * (CDECL *get_buffer)(const struct schan_transport *, struct schan_buffers *, SIZE_T *); schan_session (CDECL *get_session_for_transport)(struct schan_transport *); - int CDECL (CDECL *pull)(struct schan_transport *, void *, size_t *); - int CDECL (CDECL *push)(struct schan_transport *, const void *, size_t *); }; extern const struct schan_funcs *schan_funcs;

1 0