wine-commits January 2024

wine-commits@winehq.org

1 participants
711 discussions

Bernhard Übelacker : wing32: Avoid crash in WinGGetDIBPointer when called with NULL bitmap info.
by Alexandre Julliard 17 Jan '24

17 Jan '24

Module: wine Branch: master Commit: 0f6a66e91967cfd53f90975b172d8f06c31f8be1 URL: https://gitlab.winehq.org/wine/wine/-/commit/0f6a66e91967cfd53f90975b172d8f… Author: Bernhard Übelacker <bernhardu(a)mailbox.org> Date: Sun Jan 14 10:24:45 2024 +0100 wing32: Avoid crash in WinGGetDIBPointer when called with NULL bitmap info. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56135 --- dlls/wing32/tests/wing32.c | 3 +++ dlls/wing32/wing32.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wing32/tests/wing32.c b/dlls/wing32/tests/wing32.c index 1a3c958ff02..e3f01ff22bc 100644 --- a/dlls/wing32/tests/wing32.c +++ b/dlls/wing32/tests/wing32.c @@ -51,6 +51,9 @@ static void test_WinGGetDIBPointer(void) dib = WinGGetDIBPointer(NULL, NULL); ok(dib == NULL, "WinGGetDIBPointer returned unexpected value %p\n", dib); + dib = WinGGetDIBPointer(bmp, NULL); + ok(dib != NULL, "WinGGetDIBPointer failed\n"); + dib = WinGGetDIBPointer(bmp, &bmi); ok(dib != NULL, "WinGGetDIBPointer failed\n"); diff --git a/dlls/wing32/wing32.c b/dlls/wing32/wing32.c index b6702ba8017..14012206286 100644 --- a/dlls/wing32/wing32.c +++ b/dlls/wing32/wing32.c @@ -72,7 +72,7 @@ void * WINAPI WinGGetDIBPointer( HBITMAP hbmp, BITMAPINFO *bmi ) if (GetObjectW( hbmp, sizeof(ds), &ds ) == sizeof(ds)) { - bmi->bmiHeader = ds.dsBmih; + if (bmi) bmi->bmiHeader = ds.dsBmih; return ds.dsBm.bmBits; } return NULL;

1 0

Bernhard Übelacker : wing32: Add tests.
by Alexandre Julliard 17 Jan '24

17 Jan '24

Module: wine Branch: master Commit: edf0635ed4350973924407c71b1dbfad2f9d2416 URL: https://gitlab.winehq.org/wine/wine/-/commit/edf0635ed4350973924407c71b1dbf… Author: Bernhard Übelacker <bernhardu(a)mailbox.org> Date: Sun Jan 14 10:20:16 2024 +0100 wing32: Add tests. --- configure | 1 + configure.ac | 1 + dlls/wing32/Makefile.in | 1 + dlls/wing32/tests/Makefile.in | 5 ++++ dlls/wing32/tests/wing32.c | 64 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 72 insertions(+) diff --git a/configure b/configure index e30aed5f408..3939f1873a4 100755 --- a/configure +++ b/configure @@ -22440,6 +22440,7 @@ wine_fn_config_makefile dlls/winex11.drv enable_winex11_drv wine_fn_config_makefile dlls/winexinput.sys enable_winexinput_sys wine_fn_config_makefile dlls/wing.dll16 enable_win16 wine_fn_config_makefile dlls/wing32 enable_wing32 +wine_fn_config_makefile dlls/wing32/tests enable_tests wine_fn_config_makefile dlls/winhttp enable_winhttp wine_fn_config_makefile dlls/winhttp/tests enable_tests wine_fn_config_makefile dlls/wininet enable_wininet diff --git a/configure.ac b/configure.ac index cba55126869..9488b3263cc 100644 --- a/configure.ac +++ b/configure.ac @@ -3257,6 +3257,7 @@ WINE_CONFIG_MAKEFILE(dlls/winex11.drv) WINE_CONFIG_MAKEFILE(dlls/winexinput.sys) WINE_CONFIG_MAKEFILE(dlls/wing.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/wing32) +WINE_CONFIG_MAKEFILE(dlls/wing32/tests) WINE_CONFIG_MAKEFILE(dlls/winhttp) WINE_CONFIG_MAKEFILE(dlls/winhttp/tests) WINE_CONFIG_MAKEFILE(dlls/wininet) diff --git a/dlls/wing32/Makefile.in b/dlls/wing32/Makefile.in index 833e62e8d8e..e4da7836632 100644 --- a/dlls/wing32/Makefile.in +++ b/dlls/wing32/Makefile.in @@ -1,4 +1,5 @@ MODULE = wing32.dll +IMPORTLIB = wing32 IMPORTS = user32 gdi32 SOURCES = \ diff --git a/dlls/wing32/tests/Makefile.in b/dlls/wing32/tests/Makefile.in new file mode 100644 index 00000000000..395a9f4706a --- /dev/null +++ b/dlls/wing32/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = wing32.dll +IMPORTS = wing32 gdi32 + +SOURCES = \ + wing32.c diff --git a/dlls/wing32/tests/wing32.c b/dlls/wing32/tests/wing32.c new file mode 100644 index 00000000000..1a3c958ff02 --- /dev/null +++ b/dlls/wing32/tests/wing32.c @@ -0,0 +1,64 @@ +/* + * Unit test suite for wing32 functions + * + * Copyright 2024 Bernhard Übelacker + * + * 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 + */ + +#include <windows.h> + +#include "wine/test.h" + +HDC WINAPI WinGCreateDC(void); +HBITMAP WINAPI WinGCreateBitmap(HDC, BITMAPINFO*, void **); +void* WINAPI WinGGetDIBPointer(HBITMAP, BITMAPINFO*); + +static void test_WinGGetDIBPointer(void) +{ + HDC dc; + BITMAPINFO bmi; + void *bits; + HBITMAP bmp; + void* dib; + + dc = WinGCreateDC(); + ok(dc != NULL, "WinGCreateDC failed\n"); + + memset(&bmi, 0, sizeof(bmi)); + bmi.bmiHeader.biSize = sizeof(bmi.bmiHeader); + bmi.bmiHeader.biWidth = 1; + bmi.bmiHeader.biHeight = 1; + bmi.bmiHeader.biPlanes = 1; + bmi.bmiHeader.biBitCount= 24; + bmi.bmiHeader.biCompression= BI_RGB; + bmi.bmiHeader.biSizeImage = 0; + bmp = WinGCreateBitmap(dc, &bmi, &bits); + ok(bmp != NULL, "WinGCreateBitmap failed\n"); + + dib = WinGGetDIBPointer(NULL, NULL); + ok(dib == NULL, "WinGGetDIBPointer returned unexpected value %p\n", dib); + + dib = WinGGetDIBPointer(bmp, &bmi); + ok(dib != NULL, "WinGGetDIBPointer failed\n"); + + DeleteObject(bmp); + DeleteDC(dc); +} + +START_TEST(wing32) +{ + test_WinGGetDIBPointer(); +}

1 0

Alexandre Julliard : ntdll/tests: Add exception test for int 2d on x86-64.
by Alexandre Julliard 17 Jan '24

17 Jan '24

Module: wine Branch: master Commit: fad3e416f8615938a4ca0e554bea7d75d1cc8f86 URL: https://gitlab.winehq.org/wine/wine/-/commit/fad3e416f8615938a4ca0e554bea7d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 17 12:16:37 2024 +0100 ntdll/tests: Add exception test for int 2d on x86-64. --- dlls/ntdll/tests/exception.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 76190aef75a..0153843da19 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -3185,6 +3185,13 @@ static const struct exception 1, 1, STATUS_SINGLE_STEP, 0 }, { { 0xcd, 0x2c, 0xc3 }, 0, 2, STATUS_ASSERTION_FAILURE, 0 }, + { { 0xb8, 0xb8, 0xb8, 0xb8, 0xb8, /* mov $0xb8b8b8b8, %eax */ + 0xcd, 0x2d, 0xfa, 0xc3 }, /* int $0x2d; cli; ret */ + 7, 1, STATUS_BREAKPOINT, 1, { 0xb8b8b8b8 } }, +/* 40 */ + { { 0xb8, 0x01, 0x00, 0x00, 0x00, /* mov $0x01, %eax */ + 0xcd, 0x2d, 0xfa, 0xc3 }, /* int $0x2d; cli; ret */ + 8, 0, STATUS_SUCCESS, 0 }, }; static int got_exception;

1 0

Brendan Shanks : opengl32: Make wglSwapLayerBuffers hookable.
by Alexandre Julliard 17 Jan '24

17 Jan '24

Module: wine Branch: master Commit: 1f8bba0f749fffdcd3fbb3392c8f8580860af71a URL: https://gitlab.winehq.org/wine/wine/-/commit/1f8bba0f749fffdcd3fbb3392c8f85… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Jan 16 13:36:25 2024 -0800 opengl32: Make wglSwapLayerBuffers hookable. --- dlls/opengl32/wgl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index b3cffa00a3e..40602d7d22d 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -438,8 +438,8 @@ PROC WINAPI wglGetDefaultProcAddress( LPCSTR name ) /*********************************************************************** * wglSwapLayerBuffers (OPENGL32.@) */ -BOOL WINAPI wglSwapLayerBuffers(HDC hdc, - UINT fuPlanes) { +BOOL WINAPI DECLSPEC_HOTPATCH wglSwapLayerBuffers(HDC hdc, UINT fuPlanes) +{ TRACE("(%p, %08x)\n", hdc, fuPlanes); if (fuPlanes & WGL_SWAP_MAIN_PLANE) {

1 0

Dmitry Timoshkov : ntdll: Add NtCompareTokens() stub.
by Alexandre Julliard 17 Jan '24

17 Jan '24

Module: wine Branch: master Commit: 16d2f3c8a700d9909dd373c00f98ae853cd38dcb URL: https://gitlab.winehq.org/wine/wine/-/commit/16d2f3c8a700d9909dd373c00f98ae… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Nov 13 10:57:53 2023 +0300 ntdll: Add NtCompareTokens() stub. SQL Native Client ODBC driver fails to load if GetProcAddress("NtCompareTokens") returns NULL, however it never calls it. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ntdll/ntdll.spec | 4 +- dlls/ntdll/ntsyscalls.h | 852 ++++++++++++++++++++++++----------------------- dlls/ntdll/unix/server.c | 10 + dlls/wow64/security.c | 12 + include/winternl.h | 1 + 5 files changed, 452 insertions(+), 427 deletions(-)

1 0

Nikolay Sivov : evr/dshow: Handle YUY2 sample copy.
by Alexandre Julliard 17 Jan '24

17 Jan '24

Module: wine Branch: master Commit: ba664e108eeb73548d094b08875102897155fcea URL: https://gitlab.winehq.org/wine/wine/-/commit/ba664e108eeb73548d094b08875102… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 18 23:15:43 2023 +0100 evr/dshow: Handle YUY2 sample copy. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53810 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/evr.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/evr/evr.c b/dlls/evr/evr.c index 803c1d2dff9..516427c5fff 100644 --- a/dlls/evr/evr.c +++ b/dlls/evr/evr.c @@ -344,7 +344,7 @@ static void evr_destroy(struct strmbase_renderer *iface) free(filter); } -static HRESULT evr_copy_sample_buffer(struct evr *filter, IMediaSample *input_sample, IMFSample **sample) +static HRESULT evr_copy_sample_buffer(struct evr *filter, const GUID *subtype, IMediaSample *input_sample, IMFSample **sample) { IDirect3DSurface9 *surface; D3DLOCKED_RECT locked_rect; @@ -364,6 +364,15 @@ static HRESULT evr_copy_sample_buffer(struct evr *filter, IMediaSample *input_sa width = frame_size >> 32; lines = frame_size; + if (IsEqualGUID(subtype, &MFVideoFormat_YUY2)) + { + width = (3 * width + 3) & ~3; + } + else + { + width *= 4; + } + if (FAILED(hr = IMediaSample_GetPointer(input_sample, &src))) { WARN("Failed to get pointer to sample data, hr %#lx.\n", hr); @@ -383,7 +392,7 @@ static HRESULT evr_copy_sample_buffer(struct evr *filter, IMediaSample *input_sa if (SUCCEEDED(hr = IDirect3DSurface9_LockRect(surface, &locked_rect, NULL, D3DLOCK_DISCARD))) { if (src_stride < 0) src += (-src_stride) * (lines - 1); - MFCopyImage(locked_rect.pBits, locked_rect.Pitch, src, src_stride, width * 4, lines); + MFCopyImage(locked_rect.pBits, locked_rect.Pitch, src, src_stride, width, lines); IDirect3DSurface9_UnlockRect(surface); } @@ -417,9 +426,10 @@ static HRESULT evr_render(struct strmbase_renderer *iface, IMediaSample *input_s IMFMediaType_GetGUID(filter->media_type, &MF_MT_SUBTYPE, &subtype); if (IsEqualGUID(&subtype, &MFVideoFormat_ARGB32) - || IsEqualGUID(&subtype, &MFVideoFormat_RGB32)) + || IsEqualGUID(&subtype, &MFVideoFormat_RGB32) + || IsEqualGUID(&subtype, &MFVideoFormat_YUY2)) { - if (SUCCEEDED(hr = evr_copy_sample_buffer(filter, input_sample, &sample))) + if (SUCCEEDED(hr = evr_copy_sample_buffer(filter, &subtype, input_sample, &sample))) { if (SUCCEEDED(IMFTransform_ProcessInput(filter->mixer, 0, sample, 0))) IMFVideoPresenter_ProcessMessage(filter->presenter, MFVP_MESSAGE_PROCESSINPUTNOTIFY, 0);

1 0

Sven Baars : advapi32/tests: Skip WoW64 tests on 32-bit in test_reg_create_key.
by Alexandre Julliard 17 Jan '24

17 Jan '24

Module: wine Branch: master Commit: a1adaaca2768708f5158b82d7a7edaf69124783e URL: https://gitlab.winehq.org/wine/wine/-/commit/a1adaaca2768708f5158b82d7a7eda… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Sat Dec 23 14:17:35 2023 +0100 advapi32/tests: Skip WoW64 tests on 32-bit in test_reg_create_key. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=54613 --- dlls/advapi32/tests/registry.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 27b33194fc4..35df1b226f5 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -1338,9 +1338,9 @@ static void test_reg_create_key(void) * the registry access check is performed correctly. Redirection isn't * being tested, so the tests don't care about whether the process is * running under WOW64. */ - if (!pIsWow64Process) + if (!has_wow64()) { - win_skip("WOW64 flags are not recognized\n"); + skip("WOW64 flags are not recognized\n"); return; }

1 0

Sven Baars : advapi32/tests: Introduce a new has_wow64 helper.
by Alexandre Julliard 17 Jan '24

17 Jan '24

Module: wine Branch: master Commit: 7565d61403fcb1e784eb5304273c075e499e317c URL: https://gitlab.winehq.org/wine/wine/-/commit/7565d61403fcb1e784eb5304273c07… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Sat Dec 23 14:15:02 2023 +0100 advapi32/tests: Introduce a new has_wow64 helper. --- dlls/advapi32/tests/registry.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 30a79368c94..27b33194fc4 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -64,6 +64,17 @@ static DWORD (WINAPI *pEnumDynamicTimeZoneInformation)(const DWORD, static BOOL limited_user; static const BOOL is_64bit = sizeof(void *) > sizeof(int); +static BOOL has_wow64(void) +{ + if (!is_64bit) + { + BOOL is_wow64; + if (!pIsWow64Process || !pIsWow64Process( GetCurrentProcess(), &is_wow64 ) || !is_wow64) + return FALSE; + } + return TRUE; +} + static const char *dbgstr_SYSTEMTIME(const SYSTEMTIME *st) { return wine_dbg_sprintf("%02d-%02d-%04d %02d:%02d:%02d.%03d", @@ -2575,14 +2586,10 @@ static void test_redirection(void) HKEY key, key32, key64, root, root32, root64; DWORD subkeys, subkeys32, subkeys64; - if (ptr_size != 64) + if (!has_wow64()) { - BOOL is_wow64; - if (!pIsWow64Process || !pIsWow64Process( GetCurrentProcess(), &is_wow64 ) || !is_wow64) - { - skip( "Not on Wow64, no redirection\n" ); - return; - } + skip( "Not on Wow64, no redirection\n" ); + return; } if (limited_user)

1 0

David Kahurani : gdiplus: Avoid use of temporary variable.
by Alexandre Julliard 17 Jan '24

17 Jan '24

Module: wine Branch: master Commit: 760bcdcb4e5c271876baee6bc7207bba400b33a8 URL: https://gitlab.winehq.org/wine/wine/-/commit/760bcdcb4e5c271876baee6bc7207b… Author: David Kahurani <k.kahurani(a)gmail.com> Date: Sat Dec 23 12:26:49 2023 +0300 gdiplus: Avoid use of temporary variable. A temporary variable is used here to assist with assignment but this does not conform to the coding style in the rest of gdiplus and introduces an unnecessary variable. Signed-off-by: David Kahurani <k.kahurani(a)gmail.com> --- dlls/gdiplus/graphicspath.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 24c2888cfe8..9e186aa43d1 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -117,10 +117,16 @@ struct flatten_bezier_job static BOOL flatten_bezier_add(struct list *jobs, path_list_node_t *start, REAL x2, REAL y2, REAL x3, REAL y3, path_list_node_t *end) { struct flatten_bezier_job *job = malloc(sizeof(struct flatten_bezier_job)); - struct flatten_bezier_job temp = { start, x2, y2, x3, y3, end }; if (!job) return FALSE; - *job = temp; + + job->start = start; + job->x2 = x2; + job->y2 = y2; + job->x3 = x3; + job->y3 = y3; + job->end = end; + list_add_after(jobs, &job->entry); return TRUE; }

1 0

Zhiyi Zhang : win32u: Fix a possible out-of-bounds write (Coverity).
by Alexandre Julliard 17 Jan '24

17 Jan '24

Module: wine Branch: master Commit: d91eab24d245d13642cf2fd5d96a9f5851fdb240 URL: https://gitlab.winehq.org/wine/wine/-/commit/d91eab24d245d13642cf2fd5d96a9f… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sat Dec 30 13:11:34 2023 +0800 win32u: Fix a possible out-of-bounds write (Coverity). --- dlls/win32u/sysparams.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index ad6e7dce39b..a9563eaff84 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -6121,7 +6121,7 @@ BOOL WINAPI NtUserSetSysColors( INT count, const INT *colors, const COLORREF *va if (IS_INTRESOURCE(colors)) return FALSE; /* stupid app passes a color instead of an array */ for (i = 0; i < count; i++) - if (colors[i] >= 0 && colors[i] <= ARRAY_SIZE( system_colors )) + if (colors[i] >= 0 && colors[i] < ARRAY_SIZE( system_colors )) set_entry( &system_colors[colors[i]], values[i], 0, 0 ); /* Send WM_SYSCOLORCHANGE message to all windows */

1 0

← Newer
1
...
47
48
49
50
51
52
53
...
72
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 January 2024