- Wine-Commits - list.winehq.org

Rémi Bernon : opengl32: Implement wow64 thunks for glMapBuffer (et al.).
by Alexandre Julliard Nov. 21, 2022

Nov. 21, 2022

Module: wine Branch: master Commit: 09652f121c38e844a8a4e2590dfcd11b0d33df85 URL: https://gitlab.winehq.org/wine/wine/-/commit/09652f121c38e844a8a4e2590dfcd1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Nov 18 09:41:19 2022 +0100 opengl32: Implement wow64 thunks for glMapBuffer (et al.). --- dlls/opengl32/make_opengl | 15 ++ dlls/opengl32/unix_thunks.c | 252 +++++--------------------------- dlls/opengl32/unix_wgl.c | 346 ++++++++++++++++++++++++++++++++++++++++++++ dlls/opengl32/wgl.c | 79 ++++++++++ 4 files changed, 474 insertions(+), 218 deletions(-)

1 0

Gerald Pfeifer : msado15: Avoid uninitialized variable warning in fields_get_Item.
by Alexandre Julliard Nov. 21, 2022

Nov. 21, 2022

Module: wine Branch: master Commit: 66f6cc59651721e501efd821939e56887fbb4ce5 URL: https://gitlab.winehq.org/wine/wine/-/commit/66f6cc59651721e501efd821939e56… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Nov 20 09:25:32 2022 +0000 msado15: Avoid uninitialized variable warning in fields_get_Item. This avoids the following warning by GCC 13: dlls/msado15/recordset.c:790:32: warning: 'i' may be used uninitialized --- dlls/msado15/recordset.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 177938af2f7..aa2db6e2968 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -781,7 +781,7 @@ static HRESULT WINAPI fields_get_Item( Fields *iface, VARIANT index, Field **obj { struct fields *fields = impl_from_Fields( iface ); HRESULT hr; - ULONG i; + ULONG i = 0; TRACE( "%p, %s, %p\n", fields, debugstr_variant(&index), obj );

1 0

Mohamad Al-Jaf : windows.media: Stub IClosedCaptionPropertiesStatics interface.
by Alexandre Julliard Nov. 21, 2022

Nov. 21, 2022

Module: wine Branch: master Commit: c0913c34eafa8f05c40c0ee526e351190ad77557 URL: https://gitlab.winehq.org/wine/wine/-/commit/c0913c34eafa8f05c40c0ee526e351… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sat Nov 12 19:51:57 2022 -0500 windows.media: Stub IClosedCaptionPropertiesStatics interface. Needed by Chromium-based browsers. --- dlls/windows.media/captions.c | 107 ++++++++++++++++++++++++++++++++++++ dlls/windows.media/private.h | 40 ++++++++++++++ dlls/windows.media/tests/captions.c | 11 ++++ 3 files changed, 158 insertions(+)

1 0

Mohamad Al-Jaf : windows.media: Add stub DLL.
by Alexandre Julliard Nov. 21, 2022

Nov. 21, 2022

Module: wine Branch: master Commit: e0aca838c88f38e02d696a116d4f5bb460b7ca5e URL: https://gitlab.winehq.org/wine/wine/-/commit/e0aca838c88f38e02d696a116d4f5b… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sat Nov 12 19:31:20 2022 -0500 windows.media: Add stub DLL. --- configure | 3 + configure.ac | 2 + dlls/windows.media/Makefile.in | 9 +++ dlls/windows.media/captions.c | 125 ++++++++++++++++++++++++++++++++++ dlls/windows.media/classes.idl | 23 +++++++ dlls/windows.media/main.c | 46 +++++++++++++ dlls/windows.media/private.h | 42 ++++++++++++ dlls/windows.media/tests/Makefile.in | 5 ++ dlls/windows.media/tests/captions.c | 83 ++++++++++++++++++++++ dlls/windows.media/windows.media.spec | 3 + 10 files changed, 341 insertions(+)

1 0

Rémi Bernon : opengl32: Use manual win32 thunks for glMapBuffer (et al.).
by Alexandre Julliard Nov. 21, 2022

Nov. 21, 2022

Module: wine Branch: master Commit: 50ab0f8f7123fa82ce7268cbe26303dec4f76680 URL: https://gitlab.winehq.org/wine/wine/-/commit/50ab0f8f7123fa82ce7268cbe26303… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 7 16:34:20 2022 +0100 opengl32: Use manual win32 thunks for glMapBuffer (et al.). --- dlls/opengl32/make_opengl | 11 +++++ dlls/opengl32/thunks.c | 110 +++++------------------------------------ dlls/opengl32/wgl.c | 123 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 145 insertions(+), 99 deletions(-)

1 0

Rémi Bernon : opengl32: Implement wow64 thunk for glGetString (et al.).
by Alexandre Julliard Nov. 21, 2022

Nov. 21, 2022

Module: wine Branch: master Commit: 17abb6f4e700b6c66c59bbc5334b66c116452e9a URL: https://gitlab.winehq.org/wine/wine/-/commit/17abb6f4e700b6c66c59bbc5334b66… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Nov 18 07:22:14 2022 +0100 opengl32: Implement wow64 thunk for glGetString (et al.). This is a bit tricky because the strings are supposed to be static, but we also cannot return the unix strings directly either. So instead we keep track, on the unix side, of known unix / wow64 string associations, and return the known wow64 string if the unix string was already requested before. If the string wasn't found, the syscall returns STATUS_BUFFER_TOO_SMALL, and the PE side allocates the required memory, calling the syscall once again with the wow64 string pointer to copy the string to. On concurrent calls, the syscall may return a different wow64 string, in which case the PE side uses it instead and frees the one it allocated. Lastly, the PE side also keeps record of wow64 strings it had allocated, so that we can free them on process detach. The unix side also does some cleanup of its mapping buffer, as there's no guarantee that it will be completely unloaded. --- dlls/opengl32/make_opengl | 18 ++++ dlls/opengl32/thunks.c | 59 ++----------- dlls/opengl32/unix_thunks.c | 112 +++--------------------- dlls/opengl32/unix_wgl.c | 207 ++++++++++++++++++++++++++++++++++++++++++++ dlls/opengl32/unixlib.h | 1 + dlls/opengl32/wgl.c | 192 +++++++++++++++++++++++++++++++++++++++- 6 files changed, 436 insertions(+), 153 deletions(-)

1 0

Mohamad Al-Jaf : include/windowscontracts: Bump contractversion to 14.
by Alexandre Julliard Nov. 21, 2022

Nov. 21, 2022

Module: wine Branch: master Commit: efcaa605f7b491eae464a2116affc8f9cdbb4dca URL: https://gitlab.winehq.org/wine/wine/-/commit/efcaa605f7b491eae464a2116affc8… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sat Nov 12 19:45:48 2022 -0500 include/windowscontracts: Bump contractversion to 14. --- include/windowscontracts.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/windowscontracts.idl b/include/windowscontracts.idl index 6bcf80ac954..5bcae48a5b5 100644 --- a/include/windowscontracts.idl +++ b/include/windowscontracts.idl @@ -26,7 +26,7 @@ namespace Windows { apicontract FoundationContract {}; - [contractversion(10)] + [contractversion(14)] apicontract UniversalApiContract {}; }

1 0

Rémi Bernon : dwrite: Avoid memcpy source overflow in GetFontAxisValues.
by Alexandre Julliard Nov. 21, 2022

Nov. 21, 2022

Module: wine Branch: master Commit: 0908161bbde1a0bce914f076ffd0358b90e4543b URL: https://gitlab.winehq.org/wine/wine/-/commit/0908161bbde1a0bce914f076ffd035… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Nov 17 01:00:46 2022 +0100 dwrite: Avoid memcpy source overflow in GetFontAxisValues. --- dlls/dwrite/font.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index d2d2b7963f7..5e1fb1c8cbf 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -7039,7 +7039,7 @@ static HRESULT WINAPI fontfacereference1_GetFontAxisValues(IDWriteFontFaceRefere if (value_count < reference->axis_values_count) return E_NOT_SUFFICIENT_BUFFER; - memcpy(axis_values, reference->axis_values, value_count * sizeof(*axis_values)); + memcpy(axis_values, reference->axis_values, reference->axis_values_count * sizeof(*axis_values)); return S_OK; }

1 0

Eric Pouech : comctl32/tests: Fix monthcal selection tests.
by Alexandre Julliard Nov. 21, 2022

Nov. 21, 2022

Module: wine Branch: master Commit: 190fbc750094bb88a20a70d3f28cd91b77790b62 URL: https://gitlab.winehq.org/wine/wine/-/commit/190fbc750094bb88a20a70d3f28cd9… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Nov 17 12:27:50 2022 +0100 comctl32/tests: Fix monthcal selection tests. Changed MCHITTESTINFO.cbSize to fall back to V1: From the rest of the tests, it looks like the extended size of MCHITTESTINFO requires loading common controls V6, which is only done afterwards in the tests. Improved lookup of an unselected day. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50097 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/comctl32/tests/monthcal.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index fcafb790302..8b01173e86e 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -2021,7 +2021,7 @@ static void test_sel_notify(void) HWND hwnd; RECT rc; - MCHITTESTINFO mchit = {sizeof(MCHITTESTINFO)}; + MCHITTESTINFO mchit = {MCHITTESTINFO_V1_SIZE}; SYSTEMTIME st; Monthcal_style styles[] = { {MCS_NOTODAY, "MCS_NOTODAY"}, @@ -2039,15 +2039,19 @@ static void test_sel_notify(void) MoveWindow(hwnd, 0, 0, rc.right, rc.bottom, FALSE); /* Simulate mouse click on some unselected day to generate MCN_SELECT and MCN_SELCHANGE notifications */ - mchit.pt.x = rc.right / 2; - mchit.pt.y = rc.bottom / 2; - SendMessageA(hwnd, MCM_HITTEST, 0, (LPARAM)&mchit); + mchit.pt.x = mchit.pt.y = 0; SendMessageA(hwnd, MCM_GETCURSEL, 0, (LPARAM)&st); - while(st.wDay == mchit.st.wDay) /* Ensure that mchit.pt points to unselected day */ + + do { - mchit.pt.y++; + /* we assume box for day is larger than 3x3 */ + if ((mchit.pt.y += 3) >= rc.bottom) + { + mchit.pt.y = 0; + if ((mchit.pt.x += 3) >= rc.right) break; + } SendMessageA(hwnd, MCM_HITTEST, 0, (LPARAM)&mchit); - } + } while (mchit.uHit != MCHT_CALENDARDATE || st.wDay == mchit.st.wDay); /* Ensure that mchit.pt points to unselected day */ got_MCN_SELECT = got_MCN_SELCHANGE = FALSE; SendMessageA(hwnd, WM_LBUTTONDOWN, 0, MAKELPARAM(mchit.pt.x, mchit.pt.y)); if (styles[i].val & MCS_MULTISELECT)

1 0

Alex Henrie : secur32: Use the wcsdup function instead of reimplementing it.
by Alexandre Julliard Nov. 21, 2022

Nov. 21, 2022

Module: wine Branch: master Commit: 5f981c37e70d9e48532e16ec4f062d6c1f91be96 URL: https://gitlab.winehq.org/wine/wine/-/commit/5f981c37e70d9e48532e16ec4f062d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Nov 20 19:34:15 2022 -0700 secur32: Use the wcsdup function instead of reimplementing it. --- dlls/secur32/secur32.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index b14fc0e05b7..4875ce85651 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -174,13 +174,6 @@ PSecurityFunctionTableW WINAPI InitSecurityInterfaceW(void) return &securityFunctionTableW; } -static WCHAR *strdupW( const WCHAR *str ) -{ - WCHAR *ret = NULL; - if (str && (ret = malloc( (wcslen(str) + 1) * sizeof(WCHAR) ))) wcscpy( ret, str ); - return ret; -} - static void _makeFnTableA(PSecurityFunctionTableA fnTableA, const SecurityFunctionTableA *inFnTableA, const SecurityFunctionTableW *inFnTableW) @@ -345,8 +338,8 @@ static void _copyPackageInfo(PSecPkgInfoW info, const SecPkgInfoA *inInfoA, memcpy(info, inInfoW ? inInfoW : (const SecPkgInfoW *)inInfoA, sizeof(*info)); if (inInfoW) { - info->Name = strdupW(inInfoW->Name); - info->Comment = strdupW(inInfoW->Comment); + info->Name = wcsdup(inInfoW->Name); + info->Comment = wcsdup(inInfoW->Comment); } else { @@ -385,14 +378,14 @@ SecureProvider *SECUR32_addProvider(const SecurityFunctionTableA *fnTableA, if (fnTableA || fnTableW) { - ret->moduleName = moduleName ? strdupW(moduleName) : NULL; + ret->moduleName = wcsdup(moduleName); _makeFnTableA(&ret->fnTableA, fnTableA, fnTableW); _makeFnTableW(&ret->fnTableW, fnTableA, fnTableW); ret->loaded = !moduleName; } else { - ret->moduleName = strdupW(moduleName); + ret->moduleName = wcsdup(moduleName); ret->loaded = FALSE; }

1 0