November 2022 - Wine-Commits

Zebediah Figura : winegstreamer: Release stream_cs on error in stream_thread().
by Alexandre Julliard Nov. 8, 2022

Nov. 8, 2022

Module: wine Branch: stable Commit: c0a886437fea88824a218fd92ed99ef26c396189 URL: https://gitlab.winehq.org/wine/wine/-/commit/c0a886437fea88824a218fd92ed99e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 7 17:19:31 2022 -0600 winegstreamer: Release stream_cs on error in stream_thread(). This fixes a deadlock when trying to skip video in Persona 4 Golden. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit fc5719e4c57079b19bde8d169bf0b55194649e73) Conflicts: dlls/winegstreamer/wm_asyncreader.c Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winegstreamer/wm_asyncreader.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index aa15a5a77f9..12b63cd4ac1 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -146,6 +146,7 @@ static DWORD WINAPI stream_thread(void *arg) else if (hr != NS_E_NO_MORE_SAMPLES) { ERR("Failed to get sample, hr %#x.\n", hr); + LeaveCriticalSection(&reader->stream_cs); return 0; } }

1 0

Gerald Pfeifer : iphlpapi: Zero-init prefix_len to avoid a compiler warning.
by Alexandre Julliard Nov. 8, 2022

Nov. 8, 2022

Module: wine Branch: stable Commit: f321a29a902aa5890457fbe4aaae9d4cfcfcdb09 URL: https://gitlab.winehq.org/wine/wine/-/commit/f321a29a902aa5890457fbe4aaae9d… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri Jan 28 08:53:30 2022 +0000 iphlpapi: Zero-init prefix_len to avoid a compiler warning. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 56b26e1d66ad9491bd7357a60c31e5df35cdd15c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index c94f869c9f9..387589cc03d 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1057,6 +1057,7 @@ static DWORD gateway_and_prefix_addresses_alloc( IP_ADAPTER_ADDRESSES *aa, ULONG if (flags & GAA_FLAG_INCLUDE_PREFIX) { memset( &sockaddr, 0, sizeof(sockaddr) ); + prefix_len = 0; if (family == AF_INET) { if (!key4->next_hop.s_addr)

1 0

Zebediah Figura : d3dx9: Don't mark annotation variables as dirty.
by Alexandre Julliard Nov. 8, 2022

Nov. 8, 2022

Module: wine Branch: stable Commit: 78a951d16f12cdd85d0b0b42d5f459f80ad809eb URL: https://gitlab.winehq.org/wine/wine/-/commit/78a951d16f12cdd85d0b0b42d5f459… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 7 17:24:34 2022 -0600 d3dx9: Don't mark annotation variables as dirty. This fixes a crash when trying to set their value. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 47351a609d71016f376b29aae09952d87aa0df95) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 22afa649db3..c7809bc9cca 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1313,10 +1313,15 @@ static void *record_parameter(struct d3dx_effect *effect, struct d3dx_parameter static void set_dirty(struct d3dx_parameter *param) { - struct d3dx_shared_data *shared_data; struct d3dx_top_level_parameter *top_param = param->top_level_param; - ULONG64 new_update_version = next_update_version(top_param->version_counter); + struct d3dx_shared_data *shared_data; + ULONG64 new_update_version; + + /* This is true for annotations. */ + if (!top_param) + return; + new_update_version = next_update_version(top_param->version_counter); if ((shared_data = top_param->shared_data)) shared_data->update_version = new_update_version; else

1 0

Zebediah Figura : configure: Fix the check for CAPI support.
by Alexandre Julliard Nov. 8, 2022

Nov. 8, 2022

Module: wine Branch: stable Commit: d267a658c62152b3bead5842f317d9f4e5e5d313 URL: https://gitlab.winehq.org/wine/wine/-/commit/d267a658c62152b3bead5842f317d9… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Mar 4 18:22:18 2022 -0600 configure: Fix the check for CAPI support. AC_CHECK_LIB sets the variable to "no", not an empty string. Hence compilation would fail if headers were present but libraries were missing. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b8cb9195d0d029da132a0fe1ed8e132d36bc6ea9) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 82870da724d..56fa0974d31 100755 --- a/configure +++ b/configure @@ -17609,7 +17609,7 @@ fi CPPFLAGS=$ac_save_CPPFLAGS fi -if test "x$ac_cv_lib_capi20_capi20_register" = "x" +if test "x$ac_cv_lib_capi20_capi20_register" != xyes then : case "x$with_capi" in x) as_fn_append wine_notices "|libcapi20 ${notice_platform}development files not found, ISDN won't be supported." ;; diff --git a/configure.ac b/configure.ac index b9903b04671..aeeaa8bfcf7 100644 --- a/configure.ac +++ b/configure.ac @@ -1648,7 +1648,7 @@ then AC_CHECK_LIB(capi20,capi20_register,[:],[CAPI20_LIBS=""],[$CAPI20_LIBS]) fi]) fi -WINE_NOTICE_WITH(capi,[test "x$ac_cv_lib_capi20_capi20_register" = "x"], +WINE_NOTICE_WITH(capi,[test "x$ac_cv_lib_capi20_capi20_register" != xyes], [libcapi20 ${notice_platform}development files not found, ISDN won't be supported.], [enable_capi2032])

1 0

Eric Pouech : include/msvcrt: Redefine towlower* & towupper* with wint_t types.
by Alexandre Julliard Nov. 8, 2022

Nov. 8, 2022

Module: wine Branch: stable Commit: 2e474fa5ff9d6fed43797909a8f7592ee5535cff URL: https://gitlab.winehq.org/wine/wine/-/commit/2e474fa5ff9d6fed43797909a8f759… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon May 2 16:10:42 2022 +0200 include/msvcrt: Redefine towlower* & towupper* with wint_t types. It conflicts in C++ compilation with MINGW builtin definitions. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 69ab9568b28b594160ffae3ce5fef9439fe74ae3) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/msvcrt/corecrt_wctype.h | 8 ++++---- include/msvcrt/wctype.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/msvcrt/corecrt_wctype.h b/include/msvcrt/corecrt_wctype.h index 33f91db9719..9661ab5e596 100644 --- a/include/msvcrt/corecrt_wctype.h +++ b/include/msvcrt/corecrt_wctype.h @@ -36,8 +36,8 @@ _ACRTIMP int __cdecl _iswprint_l(wint_t,_locale_t); _ACRTIMP int __cdecl _iswpunct_l(wint_t,_locale_t); _ACRTIMP int __cdecl _iswspace_l(wint_t,_locale_t); _ACRTIMP int __cdecl _iswupper_l(wint_t,_locale_t); -_ACRTIMP wchar_t __cdecl _towlower_l(wchar_t,_locale_t); -_ACRTIMP wchar_t __cdecl _towupper_l(wchar_t,_locale_t); +_ACRTIMP wint_t __cdecl _towlower_l(wint_t,_locale_t); +_ACRTIMP wint_t __cdecl _towupper_l(wint_t,_locale_t); _ACRTIMP int __cdecl is_wctype(wint_t,wctype_t); _ACRTIMP int __cdecl isleadbyte(int); _ACRTIMP int __cdecl iswalnum(wint_t); @@ -54,8 +54,8 @@ _ACRTIMP int __cdecl iswpunct(wint_t); _ACRTIMP int __cdecl iswspace(wint_t); _ACRTIMP int __cdecl iswupper(wint_t); _ACRTIMP int __cdecl iswxdigit(wint_t); -_ACRTIMP wchar_t __cdecl towlower(wchar_t); -_ACRTIMP wchar_t __cdecl towupper(wchar_t); +_ACRTIMP wint_t __cdecl towlower(wint_t); +_ACRTIMP wint_t __cdecl towupper(wint_t); #ifdef __cplusplus } diff --git a/include/msvcrt/wctype.h b/include/msvcrt/wctype.h index 2cf4636a88b..27a6adcd922 100644 --- a/include/msvcrt/wctype.h +++ b/include/msvcrt/wctype.h @@ -64,8 +64,8 @@ _ACRTIMP int __cdecl iswpunct(wint_t); _ACRTIMP int __cdecl iswspace(wint_t); _ACRTIMP int __cdecl iswupper(wint_t); _ACRTIMP int __cdecl iswxdigit(wint_t); -_ACRTIMP wchar_t __cdecl towlower(wchar_t); -_ACRTIMP wchar_t __cdecl towupper(wchar_t); +_ACRTIMP wint_t __cdecl towlower(wint_t); +_ACRTIMP wint_t __cdecl towupper(wint_t); #endif /* _WCTYPE_DEFINED */ typedef wchar_t wctrans_t;

1 0

Santino Mazza : ncrypt/tests: Test key import of an rsa key.
by Alexandre Julliard Nov. 8, 2022

Nov. 8, 2022

Module: wine Branch: stable Commit: afd256354d1d5cfe836811486d0db6e0b5c8fe14 URL: https://gitlab.winehq.org/wine/wine/-/commit/afd256354d1d5cfe836811486d0db6… Author: Santino Mazza <mazzasantino1206(a)gmail.com> Date: Tue Feb 15 12:28:27 2022 +0100 ncrypt/tests: Test key import of an rsa key. Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e7a91b0a1c20a3fc7a8b1f4ec2c8ebc8da29e498) Conflicts: dlls/ncrypt/Makefile.in dlls/ncrypt/tests/ncrypt.c Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/ncrypt/Makefile.in | 1 + dlls/ncrypt/tests/Makefile.in | 5 ++ dlls/ncrypt/tests/ncrypt.c | 146 ++++++++++++++++++++++++++++++++++++++++++ include/ncrypt.h | 4 ++ 6 files changed, 158 insertions(+)

1 0

Mohamad Al-Jaf : hid: Implement HidD_GetPhysicalDescriptor.
by Alexandre Julliard Nov. 8, 2022

Nov. 8, 2022

Module: wine Branch: stable Commit: c16f1f8c7780ab7b07997d519f8d5eea53683be5 URL: https://gitlab.winehq.org/wine/wine/-/commit/c16f1f8c7780ab7b07997d519f8d5e… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Wed Mar 30 19:50:02 2022 +0200 hid: Implement HidD_GetPhysicalDescriptor. The game INVERSUS Deluxe calls upon this function and crashes without it. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 3ec8c6459acbec392a59466406aa5d51793432c3) Conflicts: dlls/hid/hidd.c Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/hid/hid.spec | 2 +- dlls/hid/hidd.c | 6 ++++++ include/ddk/hidsdi.h | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/hid/hid.spec b/dlls/hid/hid.spec index 37dfdbce307..67c4473129d 100644 --- a/dlls/hid/hid.spec +++ b/dlls/hid/hid.spec @@ -9,7 +9,7 @@ @ stdcall HidD_GetManufacturerString(long ptr long) @ stub HidD_GetMsGenreDescriptor @ stdcall HidD_GetNumInputBuffers(long ptr) -@ stub HidD_GetPhysicalDescriptor +@ stdcall HidD_GetPhysicalDescriptor(long ptr long) @ stdcall HidD_GetPreparsedData(ptr ptr) @ stdcall HidD_GetProductString(long ptr long) @ stdcall HidD_GetSerialNumberString(long ptr long) diff --git a/dlls/hid/hidd.c b/dlls/hid/hidd.c index 684ad5b5df8..8ff332f72b2 100644 --- a/dlls/hid/hidd.c +++ b/dlls/hid/hidd.c @@ -120,6 +120,12 @@ BOOLEAN WINAPI HidD_SetNumInputBuffers(HANDLE HidDeviceObject, ULONG NumberBuffe return sync_ioctl(HidDeviceObject, IOCTL_SET_NUM_DEVICE_INPUT_BUFFERS, &NumberBuffers, sizeof(NumberBuffers), NULL, 0); } +BOOLEAN WINAPI HidD_GetPhysicalDescriptor( HANDLE file, void *buffer, ULONG buffer_len ) +{ + TRACE( "file %p, buffer %p, buffer_len %u.\n", file, buffer, buffer_len ); + return sync_ioctl( file, IOCTL_GET_PHYSICAL_DESCRIPTOR, NULL, 0, buffer, buffer_len ); +} + BOOLEAN WINAPI HidD_GetProductString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, Buffer, BufferLength); diff --git a/include/ddk/hidsdi.h b/include/ddk/hidsdi.h index 22f64e687e7..72470079a79 100644 --- a/include/ddk/hidsdi.h +++ b/include/ddk/hidsdi.h @@ -41,6 +41,7 @@ BOOLEAN WINAPI HidD_GetIndexedString(HANDLE file, ULONG index, void *buffer, ULO BOOLEAN WINAPI HidD_GetInputReport(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength); BOOLEAN WINAPI HidD_GetManufacturerString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength); BOOLEAN WINAPI HidD_GetNumInputBuffers(HANDLE HidDeviceObject, ULONG *NumberBuffers); +BOOLEAN WINAPI HidD_GetPhysicalDescriptor(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength); BOOLEAN WINAPI HidD_GetProductString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength); BOOLEAN WINAPI HidD_GetSerialNumberString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength); BOOLEAN WINAPI HidD_SetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength);

1 0

Santino Mazza : ncrypt: Make NCryptOpenStorageProvider return a valid stub pointer.
by Alexandre Julliard Nov. 8, 2022

Nov. 8, 2022

Module: wine Branch: stable Commit: 05164887585495ec47bd2af3da9868a9a13c1862 URL: https://gitlab.winehq.org/wine/wine/-/commit/05164887585495ec47bd2af3da9868… Author: Santino Mazza <mazzasantino1206(a)gmail.com> Date: Wed Feb 16 15:13:04 2022 +0100 ncrypt: Make NCryptOpenStorageProvider return a valid stub pointer. Some applications crash when the storage provider is null. Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit cf3517b7905eceda3fe73977604863c80c9d1193) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ncrypt/main.c | 21 ++++++++++++++++++++- dlls/ncrypt/ncrypt_internal.h | 44 +++++++++++++++++++++++++++++++++++++++++++ dlls/ncrypt/tests/ncrypt.c | 2 -- 3 files changed, 64 insertions(+), 3 deletions(-) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index f23b239d93f..44cfe781e7c 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -19,10 +19,12 @@ */ #include <stdarg.h> +#include <stdlib.h> #include "windef.h" #include "winbase.h" #include "ncrypt.h" +#include "ncrypt_internal.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ncrypt); @@ -99,6 +101,14 @@ SECURITY_STATUS WINAPI NCryptGetProperty(NCRYPT_HANDLE object, const WCHAR *prop return NTE_NOT_SUPPORTED; } +static struct object *allocate_object(enum object_type type) +{ + struct object *ret; + if (!(ret = calloc(1, sizeof(*ret)))) return NULL; + ret->type = type; + return ret; +} + SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_HANDLE decrypt_key, const WCHAR *type, NCryptBufferDesc *params, NCRYPT_KEY_HANDLE *key, PBYTE data, DWORD datasize, DWORD flags) @@ -131,8 +141,17 @@ SECURITY_STATUS WINAPI NCryptOpenKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_HAN SECURITY_STATUS WINAPI NCryptOpenStorageProvider(NCRYPT_PROV_HANDLE *provider, const WCHAR *name, DWORD flags) { + struct object *object; + FIXME("(%p, %s, %u): stub\n", provider, wine_dbgstr_w(name), flags); - return NTE_NOT_SUPPORTED; + + if (!(object = allocate_object(STORAGE_PROVIDER))) + { + ERR("Error allocating memory.\n"); + return NTE_NO_MEMORY; + } + *provider = (NCRYPT_PROV_HANDLE)object; + return ERROR_SUCCESS; } SECURITY_STATUS WINAPI NCryptSetProperty(NCRYPT_HANDLE object, const WCHAR *property, diff --git a/dlls/ncrypt/ncrypt_internal.h b/dlls/ncrypt/ncrypt_internal.h new file mode 100644 index 00000000000..7a2d96f8417 --- /dev/null +++ b/dlls/ncrypt/ncrypt_internal.h @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2021 Santino Mazza + * + * 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 + */ + +struct storage_provider +{ +}; + +enum object_type +{ + STORAGE_PROVIDER, +}; + +struct object_property +{ + WCHAR *key; + DWORD value_size; + void *value; +}; + +struct object +{ + enum object_type type; + DWORD num_properties; + struct object_property *properties; + union + { + struct storage_provider storage_provider; + }; +}; diff --git a/dlls/ncrypt/tests/ncrypt.c b/dlls/ncrypt/tests/ncrypt.c index 31c07f2dac7..336e53f7ff2 100644 --- a/dlls/ncrypt/tests/ncrypt.c +++ b/dlls/ncrypt/tests/ncrypt.c @@ -92,12 +92,10 @@ static void test_key_import_rsa(void) NCRYPT_KEY_HANDLE key; SECURITY_STATUS ret; - todo_wine { prov = 0; ret = NCryptOpenStorageProvider(&prov, NULL, 0); ok(ret == ERROR_SUCCESS, "got %#x\n", ret); ok(prov, "got null handle\n"); - } todo_wine { key = 0;

1 0

Eric Pouech : msacm32: Use extended structure definition for driver configuration.
by Alexandre Julliard Nov. 8, 2022

Nov. 8, 2022

Module: wine Branch: stable Commit: bb63f676f39151485bc06ffa8329ec3236cd16d9 URL: https://gitlab.winehq.org/wine/wine/-/commit/bb63f676f39151485bc06ffa8329ec… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 11 18:49:45 2022 +0100 msacm32: Use extended structure definition for driver configuration. 1a) fixes a too short memory allocation on 64bit (DRVCONFIGINFO is 20 byte large while only 16 bytes were allocated) 1b) incidentally, removes a bunch of GCC11 warnings (generated by 1a) 2) introduces DRVCONFIGINFOEX (note, in SDK, it's defined in mmiscapi.h; since it doesn't exist yet in Wine, I added the structure to mmsystem.h, where DRVCONFIGINFO already exists) 3) initializes the missing field Note: my testing don't show on Win10's msacm32 that DRV_CONFIGURE uses the DRVCONFIGINFOEX structure. So, maybe (wild guess here), the extended structure is only used when the driver is linked to some hardware. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 14f8089dc1793a6c7d91d3dfe822d2f51526bbe8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msacm32/driver.c | 18 +++++++++--------- include/mmsystem.h | 6 ++++++ 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/msacm32/driver.c b/dlls/msacm32/driver.c index a8d6f3cf6d7..036461800b1 100644 --- a/dlls/msacm32/driver.c +++ b/dlls/msacm32/driver.c @@ -400,7 +400,7 @@ LRESULT WINAPI acmDriverMessage(HACMDRIVER had, UINT uMsg, LPARAM lParam1, LPARA { PWINE_ACMDRIVERID padid; LRESULT lResult; - LPDRVCONFIGINFO pConfigInfo = NULL; + LPDRVCONFIGINFOEX pConfigInfo = NULL; LPWSTR section_name = NULL; LPWSTR alias_name = NULL; @@ -425,16 +425,15 @@ LRESULT WINAPI acmDriverMessage(HACMDRIVER had, UINT uMsg, LPARAM lParam1, LPARA } if (pAlias != NULL) { - /* DRVCONFIGINFO is only 12 bytes long, but native msacm - * reports a 16-byte structure to codecs, so allocate 16 bytes, - * just to be on the safe side. - */ - const unsigned int iStructSize = 16; - pConfigInfo = HeapAlloc(MSACM_hHeap, 0, iStructSize); + pConfigInfo = HeapAlloc(MSACM_hHeap, 0, sizeof(*pConfigInfo)); if (!pConfigInfo) { - ERR("OOM while supplying DRVCONFIGINFO for DRV_CONFIGURE, using NULL\n"); + ERR("OOM while supplying DRVCONFIGINFOEX for DRV_CONFIGURE, using NULL\n"); } else { - pConfigInfo->dwDCISize = iStructSize; + /* In some cases (seen in the 32bit world), a DRVCONFIGINFOEX struct is passed + * (with extended size) instead of the documented DRVCONFIGINFO. + * So, always pass a DRVCONFIGINFOEX to be one the safe side + */ + pConfigInfo->dwDCISize = sizeof(*pConfigInfo); section_name = HeapAlloc(MSACM_hHeap, 0, sizeof(L"Drivers32")); if (section_name) lstrcpyW(section_name, L"Drivers32"); @@ -442,6 +441,7 @@ LRESULT WINAPI acmDriverMessage(HACMDRIVER had, UINT uMsg, LPARAM lParam1, LPARA alias_name = HeapAlloc(MSACM_hHeap, 0, (lstrlenW(pAlias) + 1) * sizeof(WCHAR)); if (alias_name) lstrcpyW(alias_name, pAlias); pConfigInfo->lpszDCIAliasName = alias_name; + pConfigInfo->dnDevNode = 0; /* FIXME */ if (pConfigInfo->lpszDCISectionName == NULL || pConfigInfo->lpszDCIAliasName == NULL) { HeapFree(MSACM_hHeap, 0, alias_name); diff --git a/include/mmsystem.h b/include/mmsystem.h index 2a0782d0cb9..5684ff20683 100644 --- a/include/mmsystem.h +++ b/include/mmsystem.h @@ -225,6 +225,12 @@ typedef struct tagDRVCONFIGINFO { LPCWSTR lpszDCIAliasName; } DRVCONFIGINFO, *LPDRVCONFIGINFO; +typedef struct tagDRVCONFIGINFOEX { + DWORD dwDCISize; + LPCWSTR lpszDCISectionName; + LPCWSTR lpszDCIAliasName; + DWORD dnDevNode; +} DRVCONFIGINFOEX, *LPDRVCONFIGINFOEX; LRESULT WINAPI DefDriverProc(DWORD_PTR,HDRVR,UINT,LPARAM,LPARAM); /* this sounds odd, but it's the way it is. OpenDriverA even disappeared

1 0

Alexandre Julliard : makefiles: Disable printf format warnings for non-PE msvcrt modules.
by Alexandre Julliard Nov. 8, 2022

Nov. 8, 2022

Module: wine Branch: stable Commit: a07278e571257b166498c843ab0fee1a43dc1609 URL: https://gitlab.winehq.org/wine/wine/-/commit/a07278e571257b166498c843ab0fee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 27 18:47:25 2022 +0100 makefiles: Disable printf format warnings for non-PE msvcrt modules. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 26a3472b340f01288b3fa4b98a4e8f363b62b135) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- configure | 28 ++++++++++++++++++++++++++++ configure.ac | 3 ++- tools/makedep.c | 2 +- 3 files changed, 31 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 56fa0974d31..dfded3d83c9 100755 --- a/configure +++ b/configure @@ -19470,6 +19470,34 @@ printf "%s\n" "$ac_cv_cflags__fshort_wchar" >&6; } if test "x$ac_cv_cflags__fshort_wchar" = xyes then : MSVCRTFLAGS="$MSVCRTFLAGS -fshort-wchar" +fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wno-format" >&5 +printf %s "checking whether the compiler supports -Wno-format... " >&6; } +if test ${ac_cv_cflags__Wno_format+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -Wno-format" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_cflags__Wno_format=yes +else $as_nop + ac_cv_cflags__Wno_format=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wno_format" >&5 +printf "%s\n" "$ac_cv_cflags__Wno_format" >&6; } +if test "x$ac_cv_cflags__Wno_format" = xyes +then : + MSVCRTFLAGS="$MSVCRTFLAGS -Wno-format" fi ;; esac diff --git a/configure.ac b/configure.ac index aeeaa8bfcf7..4b15e79d5d1 100644 --- a/configure.ac +++ b/configure.ac @@ -1882,7 +1882,8 @@ char*f(const char *h,char n) {return strchr(h,n);}]])],[ac_cv_c_logicalop_noisy= WINE_TRY_CFLAGS([-Wl,-delayload,autoconftest.dll],[AC_SUBST(DELAYLOADFLAG,["-Wl,-delayload,"])]) ;; *) MSVCRTFLAGS="-D_WIN32" WINE_TRY_CFLAGS([-fno-builtin],[MSVCRTFLAGS="$MSVCRTFLAGS -fno-builtin"]) - WINE_TRY_CFLAGS([-fshort-wchar],[MSVCRTFLAGS="$MSVCRTFLAGS -fshort-wchar"]) ;; + WINE_TRY_CFLAGS([-fshort-wchar],[MSVCRTFLAGS="$MSVCRTFLAGS -fshort-wchar"]) + WINE_TRY_CFLAGS([-Wno-format],[MSVCRTFLAGS="$MSVCRTFLAGS -Wno-format"]) ;; esac case $host_cpu in diff --git a/tools/makedep.c b/tools/makedep.c index e69dc3ce0a4..3c25a7f7064 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2986,6 +2986,7 @@ static void output_source_default( struct makefile *make, struct incl_file *sour output( "%s.o: %s\n", obj_dir_path( make, obj ), source->filename ); output( "\t%s$(CC) -c -o $@ %s", cmd_prefix( "CC" ), source->filename ); output_filenames( defines ); + output_filenames( make->extlib ? extra_cflags_extlib : extra_cflags ); if (make->sharedlib || (source->file->flags & FLAG_C_UNIX)) { output_filenames( unix_dllflags ); @@ -2997,7 +2998,6 @@ static void output_source_default( struct makefile *make, struct incl_file *sour if (!*dll_ext && make->module && is_crt_module( make->module )) output_filename( "-fno-builtin" ); } - output_filenames( make->extlib ? extra_cflags_extlib : extra_cflags ); output_filenames( cpp_flags ); output_filename( "$(CFLAGS)" ); output( "\n" );

1 0