wine-commits December 2021

wine-commits@winehq.org

2 participants
569 discussions

Jacek Caban : win32u: Move NtUserGetDpiForMonitor implementation from user32.
by Alexandre Julliard 06 Dec '21

06 Dec '21

Module: wine Branch: master Commit: b877c78ec53b072c94211198ba08140b5b04489f URL: https://source.winehq.org/git/wine.git/?a=commit;h=b877c78ec53b072c94211198… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 6 03:09:07 2021 +0100 win32u: Move NtUserGetDpiForMonitor 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/sysparams.c | 24 ------------------- dlls/user32/user32.spec | 2 +- dlls/win32u/syscall.c | 1 + dlls/win32u/sysparams.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 10 ++++++++ include/ntuser.h | 1 + 8 files changed, 76 insertions(+), 26 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 36375dabd42..11a2532411d 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3328,30 +3328,6 @@ UINT WINAPI GetDpiForSystem(void) return system_dpi; } -/*********************************************************************** - * GetDpiForMonitorInternal (USER32.@) - */ -BOOL WINAPI GetDpiForMonitorInternal( HMONITOR monitor, UINT type, UINT *x, UINT *y ) -{ - if (type > 2) - { - SetLastError( ERROR_BAD_ARGUMENTS ); - return FALSE; - } - if (!x || !y) - { - SetLastError( ERROR_INVALID_ADDRESS ); - return FALSE; - } - switch (GetAwarenessFromDpiAwarenessContext( GetThreadDpiAwarenessContext() )) - { - case DPI_AWARENESS_UNAWARE: *x = *y = USER_DEFAULT_SCREEN_DPI; break; - case DPI_AWARENESS_SYSTEM_AWARE: *x = *y = system_dpi; break; - default: *x = *y = get_monitor_dpi( monitor ); break; - } - return TRUE; -} - /********************************************************************** * GetThreadDpiAwarenessContext (USER32.@) */ diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 20d89c14a84..0f5e880263f 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -298,7 +298,7 @@ @ stdcall GetDlgItemTextA(long long ptr long) @ stdcall GetDlgItemTextW(long long ptr long) @ stdcall GetDoubleClickTime() -@ stdcall GetDpiForMonitorInternal(long long ptr ptr) +@ stdcall GetDpiForMonitorInternal(long long ptr ptr) NtUserGetDpiForMonitor @ stdcall GetDpiForSystem() @ stdcall GetDpiForWindow(long) @ stdcall GetFocus() diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index e85633b041c..2e8b2408f31 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -112,6 +112,7 @@ static void * const syscalls[] = NtUserGetClipboardSequenceNumber, NtUserGetClipboardViewer, NtUserGetCursor, + NtUserGetDpiForMonitor, NtUserGetKeyState, NtUserGetKeyboardLayout, NtUserGetKeyboardLayoutName, diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index edc37e7e80f..74ab94aa818 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1345,6 +1345,43 @@ RECT get_virtual_screen_rect(void) return rect; } +/********************************************************************** + * get_monitor_dpi + */ +static UINT get_monitor_dpi( HMONITOR monitor ) +{ + /* FIXME: use the monitor DPI instead */ + return system_dpi; +} + +/********************************************************************** + * get_thread_dpi_awareness + */ +static DPI_AWARENESS get_thread_dpi_awareness(void) +{ + struct user_thread_info *info = get_user_thread_info(); + ULONG_PTR context = info->dpi_awareness; + + if (!context) context = NtUserGetProcessDpiAwarenessContext( NULL ); + + switch (context) + { + case 0x10: + case 0x11: + case 0x12: + case 0x80000010: + case 0x80000011: + case 0x80000012: + return context & 3; + case (ULONG_PTR)DPI_AWARENESS_CONTEXT_UNAWARE: + case (ULONG_PTR)DPI_AWARENESS_CONTEXT_SYSTEM_AWARE: + case (ULONG_PTR)DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE: + return ~context; + default: + return DPI_AWARENESS_INVALID; + } +} + /********************************************************************** * NtUserGetDisplayConfigBufferSizes (win32u.@) */ @@ -1764,6 +1801,30 @@ ULONG WINAPI NtUserGetSystemDpiForProcess( HANDLE process ) return system_dpi; } +/*********************************************************************** + * NtUserGetDpiForMonitor (win32u.@) + */ +BOOL WINAPI NtUserGetDpiForMonitor( HMONITOR monitor, UINT type, UINT *x, UINT *y ) +{ + if (type > 2) + { + SetLastError( ERROR_BAD_ARGUMENTS ); + return FALSE; + } + if (!x || !y) + { + SetLastError( ERROR_INVALID_ADDRESS ); + return FALSE; + } + switch (get_thread_dpi_awareness()) + { + case DPI_AWARENESS_UNAWARE: *x = *y = USER_DEFAULT_SCREEN_DPI; break; + case DPI_AWARENESS_SYSTEM_AWARE: *x = *y = system_dpi; break; + default: *x = *y = get_monitor_dpi( monitor ); break; + } + return TRUE; +} + /* retrieve the cached base keys for a given entry */ static BOOL get_base_keys( enum parameter_key index, HKEY *base_key, HKEY *volatile_key ) { diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index a95d6eca565..c073f14896b 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -924,7 +924,7 @@ @ stdcall NtUserGetDisplayConfigBufferSizes(long ptr ptr) @ stub NtUserGetDoubleClickTime @ stub NtUserGetDpiForCurrentProcess -@ stub NtUserGetDpiForMonitor +@ stdcall -syscall NtUserGetDpiForMonitor(long long ptr ptr) @ stub NtUserGetExtendedPointerDeviceProperty @ stub NtUserGetForegroundWindow @ stub NtUserGetGUIThreadInfo diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 95a3df42805..bea1b00ebed 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -99,6 +99,7 @@ SYSCALL_ENTRY( NtUserGetClipboardSequenceNumber ) \ SYSCALL_ENTRY( NtUserGetClipboardViewer ) \ SYSCALL_ENTRY( NtUserGetCursor ) \ + SYSCALL_ENTRY( NtUserGetDpiForMonitor ) \ SYSCALL_ENTRY( NtUserGetKeyState ) \ SYSCALL_ENTRY( NtUserGetKeyboardLayout ) \ SYSCALL_ENTRY( NtUserGetKeyboardLayoutName ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 1026bc94843..eb739181812 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -315,3 +315,13 @@ NTSTATUS WINAPI wow64_NtUserGetSystemDpiForProcess( UINT *args ) return NtUserGetSystemDpiForProcess( process ); } + +NTSTATUS WINAPI wow64_NtUserGetDpiForMonitor( UINT *args ) +{ + HMONITOR monitor = get_handle( &args ); + UINT type = get_ulong( &args ); + UINT *x = get_ptr( &args ); + UINT *y = get_ptr( &args ); + + return NtUserGetDpiForMonitor( monitor, type, x, y ); +} diff --git a/include/ntuser.h b/include/ntuser.h index 2b747a856e8..5049926aa78 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -115,6 +115,7 @@ HWND WINAPI NtUserGetClipboardViewer(void); HCURSOR WINAPI NtUserGetCursor(void); LONG WINAPI NtUserGetDisplayConfigBufferSizes( UINT32 flags, UINT32 *num_path_info, UINT32 *num_mode_info ); +BOOL WINAPI NtUserGetDpiForMonitor( HMONITOR monitor, UINT type, UINT *x, UINT *y ); INT WINAPI NtUserGetKeyNameText( LONG lparam, WCHAR *buffer, INT size ); SHORT WINAPI NtUserGetKeyState( INT vkey ); HKL WINAPI NtUserGetKeyboardLayout( DWORD thread_id );

1 0

Jacek Caban : win32u: Implement NtUserGetSystemDpiForProcess.
by Alexandre Julliard 06 Dec '21

06 Dec '21

Module: wine Branch: master Commit: d08808d8f3fefc3e558e9b3d349428719a5ada47 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d08808d8f3fefc3e558e9b3d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 6 03:08:45 2021 +0100 win32u: Implement NtUserGetSystemDpiForProcess. 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/sysparams.c | 15 +-- dlls/win32u/font.c | 6 +- dlls/win32u/syscall.c | 1 + dlls/win32u/sysparams.c | 306 ++++++++++++++++++++++++++++++++++++++++++- dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 3 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 7 + include/ntuser.h | 1 + 9 files changed, 319 insertions(+), 23 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d08808d8f3fefc3e558e…

1 0

Jacek Caban : win32u: Implement NtUserGetProcessDpiAwarenessContext and NtUserSetProcessDpiAwarenessContext.
by Alexandre Julliard 06 Dec '21

06 Dec '21

Module: wine Branch: master Commit: aab62429c2aac5dbd6539c0aa7b0b6767ad95540 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aab62429c2aac5dbd6539c0a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 6 03:08:21 2021 +0100 win32u: Implement NtUserGetProcessDpiAwarenessContext and NtUserSetProcessDpiAwarenessContext. And use them in 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/sysparams.c | 45 ++++++++++++++++++++++----------------------- dlls/win32u/syscall.c | 2 ++ dlls/win32u/sysparams.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/win32u/win32u.spec | 4 ++-- dlls/wow64win/syscall.h | 2 ++ dlls/wow64win/user.c | 15 +++++++++++++++ include/ntuser.h | 9 +++++++++ 7 files changed, 90 insertions(+), 25 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=aab62429c2aac5dbd653…

1 0

Jacek Caban : user32: Provide partial null driver.
by Alexandre Julliard 06 Dec '21

06 Dec '21

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

Jacek Caban : win32u: Add partial wow64 support.
by Alexandre Julliard 06 Dec '21

06 Dec '21

Module: wine Branch: master Commit: ac9119badbd2d600430d93670219e6b9de0af5b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac9119badbd2d600430d9367… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 6 03:07:35 2021 +0100 win32u: Add partial wow64 support. 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/syscall.c | 18 ++++++ dlls/win32u/wrappers.c | 145 +++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 157 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ac9119badbd2d600430d…

1 0

Gijs Vermeulen : mfplat/tests: Skip test_d3d11_surface_buffer if D3D11 device can't be created.
by Alexandre Julliard 06 Dec '21

06 Dec '21

Module: wine Branch: master Commit: fbce38c5daff9472c5becae20e3e08a083049954 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fbce38c5daff9472c5becae2… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Sat Dec 4 14:04:38 2021 +0100 mfplat/tests: Skip test_d3d11_surface_buffer if D3D11 device can't be created. Lets tests run successfully on macOS. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index cee90567084..4dfdc18bb52 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -6589,7 +6589,12 @@ static void test_d3d11_surface_buffer(void) return; } - device = create_d3d11_device(); + /* d3d11 */ + if (!(device = create_d3d11_device())) + { + skip("Failed to create a D3D11 device, skipping tests.\n"); + return; + } memset(&desc, 0, sizeof(desc)); desc.Width = 64;

1 0

Torge Matthies : windowscodecs: Disable libpng chunk size limit.
by Alexandre Julliard 06 Dec '21

06 Dec '21

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

Torge Matthies : windowscodecs/tests: Add test for big PNG chunks.
by Alexandre Julliard 06 Dec '21

06 Dec '21

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: Convert the Unix library to the __wine_unix_call interface.
by Alexandre Julliard 06 Dec '21

06 Dec '21

Module: wine Branch: master Commit: 392bdb85e73b0287c21626b489957bf076137674 URL: https://source.winehq.org/git/wine.git/?a=commit;h=392bdb85e73b0287c21626b4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 4 13:18:34 2021 +0100 secur32: Convert the Unix library to the __wine_unix_call interface. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/Makefile.in | 1 + dlls/secur32/schannel.c | 124 +++++++++++++++------ dlls/secur32/schannel_gnutls.c | 245 +++++++++++++++++++++-------------------- dlls/secur32/secur32_priv.h | 142 ++++++++++++++++++++---- 4 files changed, 331 insertions(+), 181 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=392bdb85e73b0287c216…

1 0

Alexandre Julliard : secur32: Pre-allocate the token buffer for handshake() on the PE side.
by Alexandre Julliard 06 Dec '21

06 Dec '21

Module: wine Branch: master Commit: 1cf48b46845c1364e5d032924a700f372f7b0628 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1cf48b46845c1364e5d03292… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 3 18:24:24 2021 +0100 secur32: Pre-allocate the token buffer for handshake() on the PE side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel.c | 17 ++++++++++++++++- dlls/secur32/schannel_gnutls.c | 41 +++++++---------------------------------- dlls/secur32/secur32_priv.h | 4 ++-- 3 files changed, 25 insertions(+), 37 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 432c35cdfde..14645080f38 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -689,12 +689,14 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( PSecBufferDesc pInput, ULONG Reserved2, PCtxtHandle phNewContext, PSecBufferDesc pOutput, ULONG *pfContextAttr, PTimeStamp ptsExpiry) { + const ULONG extra_size = 0x10000; struct schan_context *ctx; struct schan_buffers *out_buffers; struct schan_credentials *cred; SIZE_T expected_size = ~0UL; SECURITY_STATUS ret; SecBuffer *buffer; + SecBuffer alloc_buffer = { 0 }; int idx; TRACE("%p %p %s 0x%08x %d %d %p %d %p %p %p %p\n", phCredential, phContext, @@ -814,19 +816,32 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( ctx->req_ctx_attr = fContextReq; /* Perform the TLS handshake */ - ret = schan_funcs->handshake(ctx->transport.session, pInput, expected_size, pOutput, fContextReq); + if (fContextReq & ISC_REQ_ALLOCATE_MEMORY) + { + alloc_buffer.cbBuffer = extra_size; + alloc_buffer.BufferType = SECBUFFER_TOKEN; + alloc_buffer.pvBuffer = RtlAllocateHeap( GetProcessHeap(), 0, extra_size ); + } + ret = schan_funcs->handshake(ctx->transport.session, pInput, expected_size, pOutput, &alloc_buffer); out_buffers = &ctx->transport.out; if (out_buffers->current_buffer_idx != -1) { SecBuffer *buffer = &out_buffers->desc->pBuffers[out_buffers->current_buffer_idx]; buffer->cbBuffer = out_buffers->offset; + if (buffer->pvBuffer == alloc_buffer.pvBuffer) + { + RtlReAllocateHeap( GetProcessHeap(), HEAP_REALLOC_IN_PLACE_ONLY, + buffer->pvBuffer, buffer->cbBuffer ); + alloc_buffer.pvBuffer = NULL; + } } else if (out_buffers->desc && out_buffers->desc->cBuffers > 0) { SecBuffer *buffer = &out_buffers->desc->pBuffers[0]; buffer->cbBuffer = 0; } + RtlFreeHeap( GetProcessHeap(), 0, alloc_buffer.pvBuffer ); if(ctx->transport.in.offset && ctx->transport.in.offset != pInput->pBuffers[0].cbBuffer) { if(pInput->cBuffers<2 || pInput->pBuffers[1].BufferType!=SECBUFFER_EMPTY) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index e4da13c9b3e..d832c353fcd 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -204,7 +204,7 @@ static void init_schan_buffers(struct schan_buffers *s, const PSecBufferDesc des s->limit = ~0UL; s->desc = desc; s->current_buffer_idx = -1; - s->allow_buffer_resize = FALSE; + s->alloc_buffer = NULL; s->get_next_buffer = get_next_buffer; } @@ -240,10 +240,9 @@ static int handshake_get_next_buffer_alloc(const struct schan_transport *t, stru idx = schan_find_sec_buffer_idx(s->desc, 0, SECBUFFER_EMPTY); if (idx != -1) s->desc->pBuffers[idx].BufferType = SECBUFFER_TOKEN; } - if (idx != -1 && !s->desc->pBuffers[idx].pvBuffer) + if (idx != -1 && !s->desc->pBuffers[idx].pvBuffer && s->alloc_buffer) { - s->desc->pBuffers[idx].cbBuffer = 0; - s->allow_buffer_resize = TRUE; + s->desc->pBuffers[idx] = *s->alloc_buffer; } return idx; } @@ -302,31 +301,6 @@ static int recv_message_get_next_buffer(const struct schan_transport *t, struct return schan_find_sec_buffer_idx(s->desc, 0, SECBUFFER_DATA); } -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; @@ -353,7 +327,6 @@ static char *get_buffer(const struct schan_transport *t, struct schan_buffers *s 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; @@ -362,7 +335,6 @@ static char *get_buffer(const struct schan_transport *t, struct schan_buffers *s { int buffer_idx; - s->allow_buffer_resize = FALSE; buffer_idx = s->get_next_buffer(t, s); if (buffer_idx == -1) { @@ -580,7 +552,8 @@ static void CDECL schan_set_session_target(schan_session session, const char *ta } static SECURITY_STATUS CDECL schan_handshake(schan_session session, SecBufferDesc *input, - SIZE_T input_size, SecBufferDesc *output, ULONG flags ) + SIZE_T input_size, SecBufferDesc *output, + SecBuffer *alloc_buffer ) { gnutls_session_t s = (gnutls_session_t)session; struct schan_transport *t = (struct schan_transport *)pgnutls_transport_get_ptr(s); @@ -588,8 +561,8 @@ static SECURITY_STATUS CDECL schan_handshake(schan_session session, SecBufferDes init_schan_buffers(&t->in, input, handshake_get_next_buffer); t->in.limit = input_size; - init_schan_buffers(&t->out, output, (flags & ISC_REQ_ALLOCATE_MEMORY) ? - handshake_get_next_buffer_alloc : handshake_get_next_buffer ); + init_schan_buffers(&t->out, output, handshake_get_next_buffer_alloc ); + t->out.alloc_buffer = alloc_buffer; while(1) { err = pgnutls_handshake(s); diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index 9970c0847e3..6bfa1ff7a26 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -95,8 +95,8 @@ struct schan_buffers SIZE_T offset; SIZE_T limit; const SecBufferDesc *desc; + SecBuffer *alloc_buffer; int current_buffer_idx; - BOOL allow_buffer_resize; int (*get_next_buffer)(const struct schan_transport *, struct schan_buffers *); }; @@ -122,7 +122,7 @@ struct schan_funcs unsigned int (CDECL *get_session_cipher_block_size)(schan_session); SECURITY_STATUS (CDECL *get_session_peer_certificate)(schan_session, CERT_BLOB *, ULONG *, ULONG *); SECURITY_STATUS (CDECL *get_unique_channel_binding)(schan_session, void *, ULONG *); - SECURITY_STATUS (CDECL *handshake)(schan_session, SecBufferDesc *, SIZE_T, SecBufferDesc *, ULONG ); + SECURITY_STATUS (CDECL *handshake)(schan_session, SecBufferDesc *, SIZE_T, SecBufferDesc *, SecBuffer * ); SECURITY_STATUS (CDECL *recv)(schan_session, SecBufferDesc *, SIZE_T, void *, SIZE_T *); SECURITY_STATUS (CDECL *send)(schan_session, SecBufferDesc *, const void *, SIZE_T *); void (CDECL *set_application_protocols)(schan_session, unsigned char *, unsigned int);

1 0

← Newer
1
...
39
40
41
42
43
44
45
...
57
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2021