July 2020 - Wine-devel - list.winehq.org

[PATCH v2 5/6] windowscodecs/tests: Add tests for decoding uncompressed DDS image.
by Ziqing Hui 11 Jul '20

11 Jul '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/tests/ddsformat.c | 98 +++++++++++++++------------- 1 file changed, 54 insertions(+), 44 deletions(-)

1 0

[PATCH 2/3] msvcrt: Reimplement floating point numbers printing.
by Piotr Caban 10 Jul '20

10 Jul '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=37913 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49489 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49496 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- I didn't test 49489 and 49496 bugs. I'm also leaving a trace in pf_output_fp for now (to make it easier to fix regressions). dlls/msvcrt/printf.h | 412 +++++++++++++++++++++++++++++-------- dlls/msvcrt/tests/printf.c | 4 +- 2 files changed, 327 insertions(+), 89 deletions(-)

2 1

[PATCH v3] mmdevapi: Support new AUDCLNT_* creation flags.
by Andrew Eikum 10 Jul '20

10 Jul '20

From: Rémi Bernon <rbernon(a)codeweavers.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=25173 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45700 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- v3: fix authorship dlls/winealsa.drv/mmdevdrv.c | 6 ++++-- dlls/wineandroid.drv/mmdevdrv.c | 6 ++++-- dlls/winecoreaudio.drv/mmdevdrv.c | 6 ++++-- dlls/wineoss.drv/mmdevdrv.c | 6 ++++-- dlls/winepulse.drv/mmdevdrv.c | 6 ++++-- include/audiosessiontypes.h | 2 ++ 6 files changed, 22 insertions(+), 10 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 09f98dc7b85..714d6ab9b16 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1264,8 +1264,10 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, AUDCLNT_STREAMFLAGS_RATEADJUST | AUDCLNT_SESSIONFLAGS_EXPIREWHENUNOWNED | AUDCLNT_SESSIONFLAGS_DISPLAY_HIDE | - AUDCLNT_SESSIONFLAGS_DISPLAY_HIDEWHENEXPIRED)){ - TRACE("Unknown flags: %08x\n", flags); + AUDCLNT_SESSIONFLAGS_DISPLAY_HIDEWHENEXPIRED | + AUDCLNT_STREAMFLAGS_SRC_DEFAULT_QUALITY | + AUDCLNT_STREAMFLAGS_AUTOCONVERTPCM)){ + FIXME("Unknown flags: %08x\n", flags); return E_INVALIDARG; } diff --git a/dlls/wineandroid.drv/mmdevdrv.c b/dlls/wineandroid.drv/mmdevdrv.c index b4d85642561..eac55f9e290 100644 --- a/dlls/wineandroid.drv/mmdevdrv.c +++ b/dlls/wineandroid.drv/mmdevdrv.c @@ -813,8 +813,10 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, AUDCLNT_STREAMFLAGS_RATEADJUST | AUDCLNT_SESSIONFLAGS_EXPIREWHENUNOWNED | AUDCLNT_SESSIONFLAGS_DISPLAY_HIDE | - AUDCLNT_SESSIONFLAGS_DISPLAY_HIDEWHENEXPIRED)){ - TRACE("Unknown flags: %08x\n", flags); + AUDCLNT_SESSIONFLAGS_DISPLAY_HIDEWHENEXPIRED | + AUDCLNT_STREAMFLAGS_SRC_DEFAULT_QUALITY | + AUDCLNT_STREAMFLAGS_AUTOCONVERTPCM)){ + FIXME("Unknown flags: %08x\n", flags); return E_INVALIDARG; } diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index acfa01c3d62..860d33fa3ba 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1323,8 +1323,10 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, AUDCLNT_STREAMFLAGS_RATEADJUST | AUDCLNT_SESSIONFLAGS_EXPIREWHENUNOWNED | AUDCLNT_SESSIONFLAGS_DISPLAY_HIDE | - AUDCLNT_SESSIONFLAGS_DISPLAY_HIDEWHENEXPIRED)){ - TRACE("Unknown flags: %08x\n", flags); + AUDCLNT_SESSIONFLAGS_DISPLAY_HIDEWHENEXPIRED | + AUDCLNT_STREAMFLAGS_SRC_DEFAULT_QUALITY | + AUDCLNT_STREAMFLAGS_AUTOCONVERTPCM)){ + FIXME("Unknown flags: %08x\n", flags); return E_INVALIDARG; } diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index a08e7f561b5..0c97b85f3a9 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1055,8 +1055,10 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, AUDCLNT_STREAMFLAGS_RATEADJUST | AUDCLNT_SESSIONFLAGS_EXPIREWHENUNOWNED | AUDCLNT_SESSIONFLAGS_DISPLAY_HIDE | - AUDCLNT_SESSIONFLAGS_DISPLAY_HIDEWHENEXPIRED)){ - TRACE("Unknown flags: %08x\n", flags); + AUDCLNT_SESSIONFLAGS_DISPLAY_HIDEWHENEXPIRED | + AUDCLNT_STREAMFLAGS_SRC_DEFAULT_QUALITY | + AUDCLNT_STREAMFLAGS_AUTOCONVERTPCM)){ + FIXME("Unknown flags: %08x\n", flags); return E_INVALIDARG; } diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 463d3d5a71a..23c34a50f66 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -1590,8 +1590,10 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, AUDCLNT_STREAMFLAGS_RATEADJUST | AUDCLNT_SESSIONFLAGS_EXPIREWHENUNOWNED | AUDCLNT_SESSIONFLAGS_DISPLAY_HIDE | - AUDCLNT_SESSIONFLAGS_DISPLAY_HIDEWHENEXPIRED)) { - TRACE("Unknown flags: %08x\n", flags); + AUDCLNT_SESSIONFLAGS_DISPLAY_HIDEWHENEXPIRED | + AUDCLNT_STREAMFLAGS_SRC_DEFAULT_QUALITY | + AUDCLNT_STREAMFLAGS_AUTOCONVERTPCM)) { + FIXME("Unknown flags: %08x\n", flags); return E_INVALIDARG; } diff --git a/include/audiosessiontypes.h b/include/audiosessiontypes.h index 2f785743539..81c65265759 100644 --- a/include/audiosessiontypes.h +++ b/include/audiosessiontypes.h @@ -34,9 +34,11 @@ typedef enum _AUDCLNT_SHAREMODE #define AUDCLNT_STREAMFLAGS_EVENTCALLBACK 0x00040000 #define AUDCLNT_STREAMFLAGS_NOPERSIST 0x00080000 #define AUDCLNT_STREAMFLAGS_RATEADJUST 0x00100000 +#define AUDCLNT_STREAMFLAGS_SRC_DEFAULT_QUALITY 0x08000000 #define AUDCLNT_SESSIONFLAGS_EXPIREWHENUNOWNED 0x10000000 #define AUDCLNT_SESSIONFLAGS_DISPLAY_HIDE 0x20000000 #define AUDCLNT_SESSIONFLAGS_DISPLAY_HIDEWHENEXPIRED 0x40000000 +#define AUDCLNT_STREAMFLAGS_AUTOCONVERTPCM 0x80000000 typedef enum _AudioSessionState { -- 2.27.0

1 0

[PATCH v2] mmdevapi: Support new AUDCLNT_* creation flags.
by Andrew Eikum 10 Jul '20

10 Jul '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=25173 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45700 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/winealsa.drv/mmdevdrv.c | 6 ++++-- dlls/wineandroid.drv/mmdevdrv.c | 6 ++++-- dlls/winecoreaudio.drv/mmdevdrv.c | 6 ++++-- dlls/wineoss.drv/mmdevdrv.c | 6 ++++-- dlls/winepulse.drv/mmdevdrv.c | 6 ++++-- include/audiosessiontypes.h | 2 ++ 6 files changed, 22 insertions(+), 10 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 09f98dc7b85..714d6ab9b16 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1264,8 +1264,10 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, AUDCLNT_STREAMFLAGS_RATEADJUST | AUDCLNT_SESSIONFLAGS_EXPIREWHENUNOWNED | AUDCLNT_SESSIONFLAGS_DISPLAY_HIDE | - AUDCLNT_SESSIONFLAGS_DISPLAY_HIDEWHENEXPIRED)){ - TRACE("Unknown flags: %08x\n", flags); + AUDCLNT_SESSIONFLAGS_DISPLAY_HIDEWHENEXPIRED | + AUDCLNT_STREAMFLAGS_SRC_DEFAULT_QUALITY | + AUDCLNT_STREAMFLAGS_AUTOCONVERTPCM)){ + FIXME("Unknown flags: %08x\n", flags); return E_INVALIDARG; } diff --git a/dlls/wineandroid.drv/mmdevdrv.c b/dlls/wineandroid.drv/mmdevdrv.c index b4d85642561..eac55f9e290 100644 --- a/dlls/wineandroid.drv/mmdevdrv.c +++ b/dlls/wineandroid.drv/mmdevdrv.c @@ -813,8 +813,10 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, AUDCLNT_STREAMFLAGS_RATEADJUST | AUDCLNT_SESSIONFLAGS_EXPIREWHENUNOWNED | AUDCLNT_SESSIONFLAGS_DISPLAY_HIDE | - AUDCLNT_SESSIONFLAGS_DISPLAY_HIDEWHENEXPIRED)){ - TRACE("Unknown flags: %08x\n", flags); + AUDCLNT_SESSIONFLAGS_DISPLAY_HIDEWHENEXPIRED | + AUDCLNT_STREAMFLAGS_SRC_DEFAULT_QUALITY | + AUDCLNT_STREAMFLAGS_AUTOCONVERTPCM)){ + FIXME("Unknown flags: %08x\n", flags); return E_INVALIDARG; } diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index acfa01c3d62..860d33fa3ba 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1323,8 +1323,10 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, AUDCLNT_STREAMFLAGS_RATEADJUST | AUDCLNT_SESSIONFLAGS_EXPIREWHENUNOWNED | AUDCLNT_SESSIONFLAGS_DISPLAY_HIDE | - AUDCLNT_SESSIONFLAGS_DISPLAY_HIDEWHENEXPIRED)){ - TRACE("Unknown flags: %08x\n", flags); + AUDCLNT_SESSIONFLAGS_DISPLAY_HIDEWHENEXPIRED | + AUDCLNT_STREAMFLAGS_SRC_DEFAULT_QUALITY | + AUDCLNT_STREAMFLAGS_AUTOCONVERTPCM)){ + FIXME("Unknown flags: %08x\n", flags); return E_INVALIDARG; } diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index a08e7f561b5..0c97b85f3a9 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1055,8 +1055,10 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, AUDCLNT_STREAMFLAGS_RATEADJUST | AUDCLNT_SESSIONFLAGS_EXPIREWHENUNOWNED | AUDCLNT_SESSIONFLAGS_DISPLAY_HIDE | - AUDCLNT_SESSIONFLAGS_DISPLAY_HIDEWHENEXPIRED)){ - TRACE("Unknown flags: %08x\n", flags); + AUDCLNT_SESSIONFLAGS_DISPLAY_HIDEWHENEXPIRED | + AUDCLNT_STREAMFLAGS_SRC_DEFAULT_QUALITY | + AUDCLNT_STREAMFLAGS_AUTOCONVERTPCM)){ + FIXME("Unknown flags: %08x\n", flags); return E_INVALIDARG; } diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 463d3d5a71a..23c34a50f66 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -1590,8 +1590,10 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, AUDCLNT_STREAMFLAGS_RATEADJUST | AUDCLNT_SESSIONFLAGS_EXPIREWHENUNOWNED | AUDCLNT_SESSIONFLAGS_DISPLAY_HIDE | - AUDCLNT_SESSIONFLAGS_DISPLAY_HIDEWHENEXPIRED)) { - TRACE("Unknown flags: %08x\n", flags); + AUDCLNT_SESSIONFLAGS_DISPLAY_HIDEWHENEXPIRED | + AUDCLNT_STREAMFLAGS_SRC_DEFAULT_QUALITY | + AUDCLNT_STREAMFLAGS_AUTOCONVERTPCM)) { + FIXME("Unknown flags: %08x\n", flags); return E_INVALIDARG; } diff --git a/include/audiosessiontypes.h b/include/audiosessiontypes.h index 2f785743539..81c65265759 100644 --- a/include/audiosessiontypes.h +++ b/include/audiosessiontypes.h @@ -34,9 +34,11 @@ typedef enum _AUDCLNT_SHAREMODE #define AUDCLNT_STREAMFLAGS_EVENTCALLBACK 0x00040000 #define AUDCLNT_STREAMFLAGS_NOPERSIST 0x00080000 #define AUDCLNT_STREAMFLAGS_RATEADJUST 0x00100000 +#define AUDCLNT_STREAMFLAGS_SRC_DEFAULT_QUALITY 0x08000000 #define AUDCLNT_SESSIONFLAGS_EXPIREWHENUNOWNED 0x10000000 #define AUDCLNT_SESSIONFLAGS_DISPLAY_HIDE 0x20000000 #define AUDCLNT_SESSIONFLAGS_DISPLAY_HIDEWHENEXPIRED 0x40000000 +#define AUDCLNT_STREAMFLAGS_AUTOCONVERTPCM 0x80000000 typedef enum _AudioSessionState { -- 2.27.0

1 0

[PATCH 1/5] msdmo: Remove dead code associated with an older registry format.
by Zebediah Figura 10 Jul '20

10 Jul '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msdmo/dmoreg.c | 113 +++----------------------------------------- 1 file changed, 6 insertions(+), 107 deletions(-) diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index 1a35b41f468..ffe64782d1c 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -32,8 +32,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msdmo); -#define MSDMO_MAJOR_VERSION 6 - static const WCHAR szDMORootKey[] = { 'D','i','r','e','c','t','S','h','o','w','\\', @@ -139,40 +137,8 @@ static BOOL IsMediaTypeEqual(const DMO_PARTIAL_MEDIATYPE* mt1, const DMO_PARTIAL static HRESULT write_types(HKEY hkey, LPCWSTR name, const DMO_PARTIAL_MEDIATYPE* types, DWORD count) { - LONG ret; - - if (MSDMO_MAJOR_VERSION > 5) - { - ret = RegSetValueExW(hkey, name, 0, REG_BINARY, (const BYTE*) types, - count* sizeof(DMO_PARTIAL_MEDIATYPE)); - } - else - { - HKEY skey1,skey2,skey3; - DWORD index = 0; - WCHAR szGuidKey[64]; - - ret = RegCreateKeyExW(hkey, name, 0, NULL, REG_OPTION_NON_VOLATILE, - KEY_WRITE, NULL, &skey1, NULL); - if (ret) - return HRESULT_FROM_WIN32(ret); - - while (index < count) - { - GUIDToString(szGuidKey,&types[index].type); - ret = RegCreateKeyExW(skey1, szGuidKey, 0, NULL, - REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &skey2, NULL); - GUIDToString(szGuidKey,&types[index].subtype); - ret = RegCreateKeyExW(skey2, szGuidKey, 0, NULL, - REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &skey3, NULL); - RegCloseKey(skey3); - RegCloseKey(skey2); - index ++; - } - RegCloseKey(skey1); - } - - return HRESULT_FROM_WIN32(ret); + return HRESULT_FROM_WIN32(RegSetValueExW(hkey, name, 0, REG_BINARY, + (const BYTE *)types, count * sizeof(DMO_PARTIAL_MEDIATYPE))); } /*************************************************************** @@ -766,78 +732,11 @@ static const IEnumDMOVtbl edmovt = HRESULT read_types(HKEY root, LPCWSTR key, ULONG *supplied, ULONG requested, DMO_PARTIAL_MEDIATYPE* types ) { - HRESULT ret = S_OK; + DWORD len = requested * sizeof(DMO_PARTIAL_MEDIATYPE); + LONG ret = RegQueryValueExW(root, key, NULL, NULL, (BYTE *)types, &len); - if (MSDMO_MAJOR_VERSION > 5) - { - DWORD len; - LONG rc; - - len = requested * sizeof(DMO_PARTIAL_MEDIATYPE); - rc = RegQueryValueExW(root, key, NULL, NULL, (LPBYTE) types, &len); - ret = HRESULT_FROM_WIN32(rc); - - *supplied = len / sizeof(DMO_PARTIAL_MEDIATYPE); - } - else - { - HKEY hkey; - WCHAR szGuidKey[64]; - - *supplied = 0; - if (ERROR_SUCCESS == RegOpenKeyExW(root, key, 0, KEY_READ, &hkey)) - { - int index = 0; - WCHAR szNextKey[MAX_PATH]; - DWORD len; - LONG rc = ERROR_SUCCESS; - - while (rc == ERROR_SUCCESS) - { - len = MAX_PATH; - rc = RegEnumKeyExW(hkey, index, szNextKey, &len, NULL, NULL, NULL, NULL); - if (rc == ERROR_SUCCESS) - { - HKEY subk; - int sub_index = 0; - LONG rcs = ERROR_SUCCESS; - WCHAR szSubKey[MAX_PATH]; - - RegOpenKeyExW(hkey, szNextKey, 0, KEY_READ, &subk); - while (rcs == ERROR_SUCCESS) - { - len = MAX_PATH; - rcs = RegEnumKeyExW(subk, sub_index, szSubKey, &len, NULL, NULL, NULL, NULL); - if (rcs == ERROR_SUCCESS) - { - if (*supplied >= requested) - { - /* Bailing */ - ret = S_FALSE; - rc = ERROR_MORE_DATA; - rcs = ERROR_MORE_DATA; - break; - } - - wsprintfW(szGuidKey,szToGuidFmt,szNextKey); - CLSIDFromString(szGuidKey, &types[*supplied].type); - wsprintfW(szGuidKey,szToGuidFmt,szSubKey); - CLSIDFromString(szGuidKey, &types[*supplied].subtype); - TRACE("Adding type %s subtype %s at index %i\n", - debugstr_guid(&types[*supplied].type), - debugstr_guid(&types[*supplied].subtype), - *supplied); - (*supplied)++; - } - sub_index++; - } - index++; - } - } - RegCloseKey(hkey); - } - } - return ret; + *supplied = len / sizeof(DMO_PARTIAL_MEDIATYPE); + return HRESULT_FROM_WIN32(ret); } /*************************************************************** -- 2.27.0

1 4

[PATCH 3/6] windowscodecs: Add tests for DdsDecoder_Wine_Initialize().
by Ziqing Hui 10 Jul '20

10 Jul '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/tests/ddsformat.c | 38 +++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 7 deletions(-)

2 2

[PATCH 2/6] windowscodecs: Add IWICWineDecoder stub for DDS decoder.
by Ziqing Hui 10 Jul '20

10 Jul '20

Initializing cube map and uncompressed DDS is not supported in WIC. But we would like to use them in other part of wine. So we introduce a Wine-specific interface to initialize them. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/ddsformat.c | 40 ++++++++++++++++++++++++++++++++++ include/wincodec.idl | 10 +++++++++ 2 files changed, 50 insertions(+)

2 1

[PATCH 1/6] windowscodecs: Remove header and header_dxt10 in struct DdsDecoder.
by Ziqing Hui 10 Jul '20

10 Jul '20

This make dds_info become the only dependence of implementation. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/ddsformat.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-)

2 1

[PATCH 11/11] server: Remove no longer used set_console_output_info request.
by Jacek Caban 10 Jul '20

10 Jul '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/wine/condrv.h | 10 +++ server/console.c | 191 ------------------------------------------ server/protocol.def | 36 -------- 3 files changed, 10 insertions(+), 227 deletions(-)

1 0

[PATCH 10/11] wineconsole: Use IOCTL_CONDRV_SET_OUTPUT_INFO in WINECON_SetColors.
by Jacek Caban 10 Jul '20

10 Jul '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/wineconsole/wineconsole.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-)

1 0