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

[PATCH 2/2] msacm32: Use wide-char string literals.
by Michael Stefaniuc 25 Nov '20

25 Nov '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msacm32/driver.c | 6 ++---- dlls/msacm32/format.c | 15 +++++---------- dlls/msacm32/internal.c | 36 ++++++++++++++---------------------- 3 files changed, 21 insertions(+), 36 deletions(-) diff --git a/dlls/msacm32/driver.c b/dlls/msacm32/driver.c index f0d003f648b..a8d6f3cf6d7 100644 --- a/dlls/msacm32/driver.c +++ b/dlls/msacm32/driver.c @@ -434,12 +434,10 @@ LRESULT WINAPI acmDriverMessage(HACMDRIVER had, UINT uMsg, LPARAM lParam1, LPARA if (!pConfigInfo) { ERR("OOM while supplying DRVCONFIGINFO for DRV_CONFIGURE, using NULL\n"); } else { - static const WCHAR drivers32[] = {'D','r','i','v','e','r','s','3','2','\0'}; - pConfigInfo->dwDCISize = iStructSize; - section_name = HeapAlloc(MSACM_hHeap, 0, (lstrlenW(drivers32) + 1) * sizeof(WCHAR)); - if (section_name) lstrcpyW(section_name, drivers32); + section_name = HeapAlloc(MSACM_hHeap, 0, sizeof(L"Drivers32")); + if (section_name) lstrcpyW(section_name, L"Drivers32"); pConfigInfo->lpszDCISectionName = section_name; alias_name = HeapAlloc(MSACM_hHeap, 0, (lstrlenW(pAlias) + 1) * sizeof(WCHAR)); if (alias_name) lstrcpyW(alias_name, pAlias); diff --git a/dlls/msacm32/format.c b/dlls/msacm32/format.c index 284633ccefe..536fa42e767 100644 --- a/dlls/msacm32/format.c +++ b/dlls/msacm32/format.c @@ -93,7 +93,6 @@ static BOOL CALLBACK MSACM_FillFormatTagsCB(HACMDRIVERID hadid, afd.cbwfx = paftd->cbFormatSize; for (i = 0; i < paftd->cStandardFormats; i++) { - static const WCHAR fmtW[] = {'%','d',' ','K','o','/','s','\0'}; int j, index; afd.dwFormatIndex = i; @@ -105,7 +104,7 @@ static BOOL CALLBACK MSACM_FillFormatTagsCB(HACMDRIVERID hadid, for (j = len; j < ACMFORMATTAGDETAILS_FORMATTAG_CHARS; j++) buffer[j] = ' '; wsprintfW(buffer + ACMFORMATTAGDETAILS_FORMATTAG_CHARS, - fmtW, (afd.pwfx->nAvgBytesPerSec + 512) / 1024); + L"%d Ko/s", (afd.pwfx->nAvgBytesPerSec + 512) / 1024); index = SendDlgItemMessageW(affd->hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMAT, CB_ADDSTRING, 0, (LPARAM)buffer); @@ -213,19 +212,17 @@ static MMRESULT MSACM_GetWFX(HWND hWnd, PACMFORMATCHOOSEW afc) return affd.ret; } -static const WCHAR fmt_prop[] = {'a','c','m','p','r','o','p','\0'}; - static INT_PTR CALLBACK FormatChooseDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { - PACMFORMATCHOOSEW afc = (PACMFORMATCHOOSEW)GetPropW(hWnd, fmt_prop); + ACMFORMATCHOOSEW *afc = (ACMFORMATCHOOSEW *)GetPropW(hWnd, L"acmprop"); TRACE("hwnd=%p msg=%i 0x%08lx 0x%08lx\n", hWnd, msg, wParam, lParam); switch (msg) { case WM_INITDIALOG: afc = (PACMFORMATCHOOSEW)lParam; - SetPropW(hWnd, fmt_prop, (HANDLE)afc); + SetPropW(hWnd, L"acmprop", (HANDLE)afc); MSACM_FillFormatTags(hWnd, afc); MSACM_FillFormat(hWnd, afc); if ((afc->fdwStyle & ~(ACMFORMATCHOOSE_STYLEF_CONTEXTHELP| @@ -431,8 +428,6 @@ MMRESULT WINAPI acmFormatDetailsA(HACMDRIVER had, PACMFORMATDETAILSA pafd, MMRESULT WINAPI acmFormatDetailsW(HACMDRIVER had, PACMFORMATDETAILSW pafd, DWORD fdwDetails) { MMRESULT mmr; - static const WCHAR fmt1[] = {'%','d',' ','H','z',0}; - static const WCHAR fmt2[] = {';',' ','%','d',' ','b','i','t','s',0}; ACMFORMATTAGDETAILSW aftd = {0}; TRACE("(%p, %p, %d)\n", had, pafd, fdwDetails); @@ -497,9 +492,9 @@ MMRESULT WINAPI acmFormatDetailsW(HACMDRIVER had, PACMFORMATDETAILSW pafd, DWORD } if (mmr == MMSYSERR_NOERROR && pafd->szFormat[0] == 0) { - wsprintfW(pafd->szFormat, fmt1, pafd->pwfx->nSamplesPerSec); + wsprintfW(pafd->szFormat, L"%d Hz", pafd->pwfx->nSamplesPerSec); if (pafd->pwfx->wBitsPerSample) { - wsprintfW(pafd->szFormat + lstrlenW(pafd->szFormat), fmt2, + wsprintfW(pafd->szFormat + lstrlenW(pafd->szFormat), L"; %d bits", pafd->pwfx->wBitsPerSample); } MultiByteToWideChar(CP_ACP, 0, (pafd->pwfx->nChannels == 1) ? "; Mono" : "; Stereo", -1, diff --git a/dlls/msacm32/internal.c b/dlls/msacm32/internal.c index cccf5014fcf..e83f1f5c215 100644 --- a/dlls/msacm32/internal.c +++ b/dlls/msacm32/internal.c @@ -347,10 +347,7 @@ PWINE_ACMDRIVERID MSACM_RegisterDriver(LPCWSTR pszDriverAlias, LPCWSTR pszFileNa */ void MSACM_RegisterAllDrivers(void) { - static const WCHAR msacm32[] = {'m','s','a','c','m','3','2','.','d','l','l','\0'}; static const WCHAR msacmW[] = {'M','S','A','C','M','.'}; - static const WCHAR drv32[] = {'d','r','i','v','e','r','s','3','2','\0'}; - static const WCHAR sys[] = {'s','y','s','t','e','m','.','i','n','i','\0'}; DWORD i, cnt, bufLen, lRet, type; WCHAR buf[2048], valname[64], *name, *s; FILETIME lastWrite; @@ -384,7 +381,7 @@ void MSACM_RegisterAllDrivers(void) RegCloseKey( hKey ); } - if (GetPrivateProfileSectionW(drv32, buf, ARRAY_SIZE(buf), sys)) + if (GetPrivateProfileSectionW(L"drivers32", buf, ARRAY_SIZE(buf), L"system.ini")) { for(s = buf; *s; s += lstrlenW(s) + 1) { @@ -396,7 +393,7 @@ void MSACM_RegisterAllDrivers(void) } } MSACM_ReorderDriversByPriority(); - MSACM_RegisterDriver(msacm32, msacm32, 0); + MSACM_RegisterDriver(L"msacm32.dll", L"msacm32.dll", 0); } /*********************************************************************** @@ -590,15 +587,13 @@ static void MSACM_ReorderDriversByPriority(void) */ for (i = 0; i < iNumDrivers; i++) { - static const WCHAR priorityTmpl[] = {'P','r','i','o','r','i','t','y','%','l','d','\0'}; WCHAR szSubKey[17]; unsigned int iTargetPosition; unsigned int iCurrentPosition; WCHAR * pAlias; - static const WCHAR sPrefix[] = {'m','s','a','c','m','.','\0'}; - + /* Build expected entry name */ - swprintf(szSubKey, 17, priorityTmpl, i + 1); + swprintf(szSubKey, 17, L"Priority%ld", i + 1); lBufferLength = sizeof(szBuffer); lError = RegQueryValueExW(hPriorityKey, szSubKey, NULL, NULL, (LPBYTE)szBuffer, (LPDWORD)&lBufferLength); if (lError != ERROR_SUCCESS) continue; @@ -607,7 +602,7 @@ static void MSACM_ReorderDriversByPriority(void) iTargetPosition = i; /* Locate driver alias in driver list */ - pAlias = wcsstr(szBuffer, sPrefix); + pAlias = wcsstr(szBuffer, L"msacm."); if (pAlias == NULL) continue; for (iCurrentPosition = 0; iCurrentPosition < iNumDrivers; iCurrentPosition++) { @@ -653,9 +648,6 @@ void MSACM_WriteCurrentPriorities(void) HKEY hPriorityKey; PWINE_ACMDRIVERID padid; DWORD dwPriorityCounter; - static const WCHAR priorityTmpl[] = {'P','r','i','o','r','i','t','y','%','l','d','\0'}; - static const WCHAR valueTmpl[] = {'%','c',',',' ','%','s','\0'}; - static const WCHAR converterAlias[] = {'I','n','t','e','r','n','a','l',' ','P','C','M',' ','C','o','n','v','e','r','t','e','r','\0'}; WCHAR szSubKey[17]; WCHAR szBuffer[256]; @@ -680,10 +672,10 @@ void MSACM_WriteCurrentPriorities(void) /* Build required value name */ dwPriorityCounter++; - swprintf(szSubKey, 17, priorityTmpl, dwPriorityCounter); - + swprintf(szSubKey, 17, L"Priority%ld", dwPriorityCounter); + /* Value has a 1 in front for enabled drivers and 0 for disabled drivers */ - swprintf(szBuffer, 256, valueTmpl, (padid->fdwSupport & ACMDRIVERDETAILS_SUPPORTF_DISABLED) ? '0' : '1', padid->pszDriverAlias); + swprintf(szBuffer, 256, L"%c, %s", (padid->fdwSupport & ACMDRIVERDETAILS_SUPPORTF_DISABLED) ? '0' : '1', padid->pszDriverAlias); wcslwr(szBuffer); lError = RegSetValueExW(hPriorityKey, szSubKey, 0, REG_SZ, (BYTE *)szBuffer, (lstrlenW(szBuffer) + 1) * sizeof(WCHAR)); @@ -695,15 +687,15 @@ void MSACM_WriteCurrentPriorities(void) /* Build required value name */ dwPriorityCounter++; - swprintf(szSubKey, 17, priorityTmpl, dwPriorityCounter); - + swprintf(szSubKey, 17, L"Priority%ld", dwPriorityCounter); + /* Value has a 1 in front for enabled drivers and 0 for disabled drivers */ - swprintf(szBuffer, 256, valueTmpl, '1', converterAlias); - + swprintf(szBuffer, 256, L"%c, %s", '1', L"Internal PCM Converter"); + lError = RegSetValueExW(hPriorityKey, szSubKey, 0, REG_SZ, (BYTE *)szBuffer, (lstrlenW(szBuffer) + 1) * sizeof(WCHAR)); if (lError != ERROR_SUCCESS) { - ERR("unable to write value for %s under key %s (0x%08x)\n", - debugstr_w(converterAlias), debugstr_w(basePriorityKey), lError); + ERR("unable to write value for Internal PCM Converter under key %s (0x%08x)\n", + debugstr_w(basePriorityKey), lError); } RegCloseKey(hPriorityKey); } -- 2.26.2

2 1

[PATCH 1/2] msacm32: Make the registry key variables global.
by Michael Stefaniuc 25 Nov '20

25 Nov '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- Deduplicates two of them. dlls/msacm32/internal.c | 32 +++++--------------------------- 1 file changed, 5 insertions(+), 27 deletions(-) diff --git a/dlls/msacm32/internal.c b/dlls/msacm32/internal.c index 9c4d1a75f3b..cccf5014fcf 100644 --- a/dlls/msacm32/internal.c +++ b/dlls/msacm32/internal.c @@ -52,17 +52,17 @@ static PWINE_ACMNOTIFYWND MSACM_pLastACMNotifyWnd = NULL; static void MSACM_ReorderDriversByPriority(void); +static const WCHAR drvkey[] = L"Software\\Microsoft\\Windows NT\\CurrentVersion\\Drivers32"; +static const WCHAR baseKey[] = L"Software\\Microsoft\\AudioCompressionManager\\DriverCache\\"; +static const WCHAR basePriorityKey[] = + L"Software\\Microsoft\\Multimedia\\Audio Compression Manager\\Priority v4.00"; + /*********************************************************************** * MSACM_RegisterDriverFromRegistry() */ PWINE_ACMDRIVERID MSACM_RegisterDriverFromRegistry(LPCWSTR pszRegEntry) { static const WCHAR msacmW[] = {'M','S','A','C','M','.'}; - static const WCHAR drvkey[] = {'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','d','o','w','s',' ','N','T','\\', - 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', - 'D','r','i','v','e','r','s','3','2','\0'}; WCHAR buf[2048]; DWORD bufLen, lRet; HKEY hKey; @@ -181,9 +181,6 @@ errCleanUp: */ static LPWSTR MSACM_GetRegistryKey(const WINE_ACMDRIVERID* padid) { - static const WCHAR baseKey[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', - 'A','u','d','i','o','C','o','m','p','r','e','s','s','i','o','n','M','a','n','a','g','e','r','\\', - 'D','r','i','v','e','r','C','a','c','h','e','\\','\0'}; LPWSTR ret; int len; @@ -354,11 +351,6 @@ void MSACM_RegisterAllDrivers(void) static const WCHAR msacmW[] = {'M','S','A','C','M','.'}; static const WCHAR drv32[] = {'d','r','i','v','e','r','s','3','2','\0'}; static const WCHAR sys[] = {'s','y','s','t','e','m','.','i','n','i','\0'}; - static const WCHAR drvkey[] = {'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','d','o','w','s',' ','N','T','\\', - 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', - 'D','r','i','v','e','r','s','3','2','\0'}; DWORD i, cnt, bufLen, lRet, type; WCHAR buf[2048], valname[64], *name, *s; FILETIME lastWrite; @@ -565,13 +557,6 @@ static void MSACM_ReorderDriversByPriority(void) if (iNumDrivers > 1) { LONG lError; - static const WCHAR basePriorityKey[] = { - 'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'M','u','l','t','i','m','e','d','i','a','\\', - 'A','u','d','i','o',' ','C','o','m','p','r','e','s','s','i','o','n',' ','M','a','n','a','g','e','r','\\', - 'P','r','i','o','r','i','t','y',' ','v','4','.','0','0','\0' - }; unsigned int i; LONG lBufferLength; WCHAR szBuffer[256]; @@ -666,13 +651,6 @@ void MSACM_WriteCurrentPriorities(void) { LONG lError; HKEY hPriorityKey; - static const WCHAR basePriorityKey[] = { - 'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'M','u','l','t','i','m','e','d','i','a','\\', - 'A','u','d','i','o',' ','C','o','m','p','r','e','s','s','i','o','n',' ','M','a','n','a','g','e','r','\\', - 'P','r','i','o','r','i','t','y',' ','v','4','.','0','0','\0' - }; PWINE_ACMDRIVERID padid; DWORD dwPriorityCounter; static const WCHAR priorityTmpl[] = {'P','r','i','o','r','i','t','y','%','l','d','\0'}; -- 2.26.2

2 1

[PATCH] mmdevapi: Use wide-char string literals.
by Michael Stefaniuc 25 Nov '20

25 Nov '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mmdevapi/devenum.c | 95 +++++++++++---------------------- dlls/mmdevapi/main.c | 18 ++----- dlls/mmdevapi/tests/mmdevenum.c | 6 +-- dlls/mmdevapi/tests/propstore.c | 13 ++--- 4 files changed, 40 insertions(+), 92 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 999ec2b0e78..9e4a29816ce 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -41,27 +41,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mmdevapi); -static const WCHAR software_mmdevapi[] = - { 'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','d','o','w','s','\\', - 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', - 'M','M','D','e','v','i','c','e','s','\\', - 'A','u','d','i','o',0}; -static const WCHAR reg_render[] = - { 'R','e','n','d','e','r',0 }; -static const WCHAR reg_capture[] = - { 'C','a','p','t','u','r','e',0 }; -static const WCHAR reg_devicestate[] = - { 'D','e','v','i','c','e','S','t','a','t','e',0 }; -static const WCHAR reg_properties[] = - { 'P','r','o','p','e','r','t','i','e','s',0 }; -static const WCHAR slashW[] = {'\\',0}; -static const WCHAR reg_out_nameW[] = {'D','e','f','a','u','l','t','O','u','t','p','u','t',0}; -static const WCHAR reg_vout_nameW[] = {'D','e','f','a','u','l','t','V','o','i','c','e','O','u','t','p','u','t',0}; -static const WCHAR reg_in_nameW[] = {'D','e','f','a','u','l','t','I','n','p','u','t',0}; -static const WCHAR reg_vin_nameW[] = {'D','e','f','a','u','l','t','V','o','i','c','e','I','n','p','u','t',0}; - static HKEY key_render; static HKEY key_capture; @@ -128,11 +107,7 @@ static inline IPropertyBagImpl *impl_from_IPropertyBag(IPropertyBag *iface) return CONTAINING_RECORD(iface, IPropertyBagImpl, IPropertyBag_iface); } -static const WCHAR propkey_formatW[] = { - '{','%','0','8','X','-','%','0','4','X','-', - '%','0','4','X','-','%','0','2','X','%','0','2','X','-', - '%','0','2','X','%','0','2','X','%','0','2','X','%','0','2','X', - '%','0','2','X','%','0','2','X','}',',','%','d',0 }; +static const WCHAR propkey_formatW[] = L"{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X},%d"; static HRESULT MMDevPropStore_OpenPropKey(const GUID *guid, DWORD flow, HKEY *propkey) { @@ -145,11 +120,11 @@ static HRESULT MMDevPropStore_OpenPropKey(const GUID *guid, DWORD flow, HKEY *pr WARN("Opening key %s failed with %u\n", debugstr_w(buffer), ret); return E_FAIL; } - ret = RegOpenKeyExW(key, reg_properties, 0, KEY_READ|KEY_WRITE|KEY_WOW64_64KEY, propkey); + ret = RegOpenKeyExW(key, L"Properties", 0, KEY_READ|KEY_WRITE|KEY_WOW64_64KEY, propkey); RegCloseKey(key); if (ret != ERROR_SUCCESS) { - WARN("Opening key %s failed with %u\n", debugstr_w(reg_properties), ret); + WARN("Opening key Properties failed with %u\n", ret); return E_FAIL; } return S_OK; @@ -345,8 +320,8 @@ static MMDevice *MMDevice_Create(WCHAR *name, GUID *id, EDataFlow flow, DWORD st if (RegCreateKeyExW(root, guidstr, 0, NULL, 0, KEY_WRITE|KEY_READ|KEY_WOW64_64KEY, NULL, &key, NULL) == ERROR_SUCCESS) { HKEY keyprop; - RegSetValueExW(key, reg_devicestate, 0, REG_DWORD, (const BYTE*)&state, sizeof(DWORD)); - if (!RegCreateKeyExW(key, reg_properties, 0, NULL, 0, KEY_WRITE|KEY_READ|KEY_WOW64_64KEY, NULL, &keyprop, NULL)) + RegSetValueExW(key, L"DeviceState", 0, REG_DWORD, (const BYTE*)&state, sizeof(DWORD)); + if (!RegCreateKeyExW(key, L"Properties", 0, NULL, 0, KEY_WRITE|KEY_READ|KEY_WOW64_64KEY, NULL, &keyprop, NULL)) { PROPVARIANT pv; @@ -404,11 +379,13 @@ static HRESULT load_devices_from_reg(void) LONG ret; DWORD curflow; - ret = RegCreateKeyExW(HKEY_LOCAL_MACHINE, software_mmdevapi, 0, NULL, 0, KEY_WRITE|KEY_READ|KEY_WOW64_64KEY, NULL, &root, NULL); + ret = RegCreateKeyExW(HKEY_LOCAL_MACHINE, + L"Software\\Microsoft\\Windows\\CurrentVersion\\MMDevices\\Audio", 0, NULL, 0, + KEY_WRITE|KEY_READ|KEY_WOW64_64KEY, NULL, &root, NULL); if (ret == ERROR_SUCCESS) - ret = RegCreateKeyExW(root, reg_capture, 0, NULL, 0, KEY_READ|KEY_WRITE|KEY_WOW64_64KEY, NULL, &key_capture, NULL); + ret = RegCreateKeyExW(root, L"Capture", 0, NULL, 0, KEY_READ|KEY_WRITE|KEY_WOW64_64KEY, NULL, &key_capture, NULL); if (ret == ERROR_SUCCESS) - ret = RegCreateKeyExW(root, reg_render, 0, NULL, 0, KEY_READ|KEY_WRITE|KEY_WOW64_64KEY, NULL, &key_render, NULL); + ret = RegCreateKeyExW(root, L"Render", 0, NULL, 0, KEY_READ|KEY_WRITE|KEY_WOW64_64KEY, NULL, &key_render, NULL); RegCloseKey(root); cur = key_capture; curflow = eCapture; @@ -683,11 +660,6 @@ static HRESULT WINAPI MMDevice_GetId(IMMDevice *iface, WCHAR **itemid) MMDevice *This = impl_from_IMMDevice(iface); WCHAR *str; GUID *id = &This->devguid; - static const WCHAR formatW[] = { '{','0','.','0','.','%','u','.','0','0','0','0','0','0','0','0','}','.', - '{','%','0','8','X','-','%','0','4','X','-', - '%','0','4','X','-','%','0','2','X','%','0','2','X','-', - '%','0','2','X','%','0','2','X','%','0','2','X','%','0','2','X', - '%','0','2','X','%','0','2','X','}',0 }; TRACE("(%p)->(%p)\n", This, itemid); if (!itemid) @@ -695,9 +667,10 @@ static HRESULT WINAPI MMDevice_GetId(IMMDevice *iface, WCHAR **itemid) *itemid = str = CoTaskMemAlloc(56 * sizeof(WCHAR)); if (!str) return E_OUTOFMEMORY; - wsprintfW( str, formatW, This->flow, id->Data1, id->Data2, id->Data3, - id->Data4[0], id->Data4[1], id->Data4[2], id->Data4[3], - id->Data4[4], id->Data4[5], id->Data4[6], id->Data4[7] ); + wsprintfW(str, L"{0.0.%u.00000000}.{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", + This->flow, id->Data1, id->Data2, id->Data3, + id->Data4[0], id->Data4[1], id->Data4[2], id->Data4[3], + id->Data4[4], id->Data4[5], id->Data4[6], id->Data4[7]); TRACE("returning %s\n", wine_dbgstr_w(str)); return S_OK; } @@ -986,7 +959,7 @@ static HRESULT WINAPI MMDevEnum_GetDefaultAudioEndpoint(IMMDeviceEnumerator *ifa return E_NOTFOUND; lstrcpyW(reg_key, drv_keyW); - lstrcatW(reg_key, slashW); + lstrcatW(reg_key, L"\\"); lstrcatW(reg_key, drvs.module_name); if(RegOpenKeyW(HKEY_CURRENT_USER, reg_key, &key) == ERROR_SUCCESS){ @@ -995,11 +968,11 @@ static HRESULT WINAPI MMDevEnum_GetDefaultAudioEndpoint(IMMDeviceEnumerator *ifa DWORD size = sizeof(def_id), state; if(flow == eRender){ - reg_x_name = reg_out_nameW; - reg_vx_name = reg_vout_nameW; + reg_x_name = L"DefaultOutput"; + reg_vx_name = L"DefaultVoiceOutput"; }else{ - reg_x_name = reg_in_nameW; - reg_vx_name = reg_vin_nameW; + reg_x_name = L"DefaultInput"; + reg_vx_name = L"DefaultVoiceInput"; } if(role == eCommunications && @@ -1051,15 +1024,12 @@ static HRESULT WINAPI MMDevEnum_GetDevice(IMMDeviceEnumerator *iface, const WCHA DWORD i=0; IMMDevice *dev = NULL; - static const WCHAR wine_info_deviceW[] = {'W','i','n','e',' ', - 'i','n','f','o',' ','d','e','v','i','c','e',0}; - TRACE("(%p)->(%s,%p)\n", This, debugstr_w(name), device); if(!name || !device) return E_POINTER; - if(!lstrcmpW(name, wine_info_deviceW)){ + if(!lstrcmpW(name, L"Wine info device")){ *device = &info_device; return S_OK; } @@ -1188,7 +1158,7 @@ static DWORD WINAPI notif_thread_proc(void *user) DWORD size; lstrcpyW(reg_key, drv_keyW); - lstrcatW(reg_key, slashW); + lstrcatW(reg_key, L"\\"); lstrcatW(reg_key, drvs.module_name); if(RegCreateKeyExW(HKEY_CURRENT_USER, reg_key, 0, NULL, 0, @@ -1198,23 +1168,19 @@ static DWORD WINAPI notif_thread_proc(void *user) } size = sizeof(out_name); - if(RegQueryValueExW(key, reg_out_nameW, 0, NULL, - (BYTE*)out_name, &size) != ERROR_SUCCESS) + if(RegQueryValueExW(key, L"DefaultOutput", 0, NULL, (BYTE*)out_name, &size) != ERROR_SUCCESS) out_name[0] = 0; size = sizeof(vout_name); - if(RegQueryValueExW(key, reg_vout_nameW, 0, NULL, - (BYTE*)vout_name, &size) != ERROR_SUCCESS) + if(RegQueryValueExW(key, L"DefaultVoiceOutput", 0, NULL, (BYTE*)vout_name, &size) != ERROR_SUCCESS) vout_name[0] = 0; size = sizeof(in_name); - if(RegQueryValueExW(key, reg_in_nameW, 0, NULL, - (BYTE*)in_name, &size) != ERROR_SUCCESS) + if(RegQueryValueExW(key, L"DefaultInput", 0, NULL, (BYTE*)in_name, &size) != ERROR_SUCCESS) in_name[0] = 0; size = sizeof(vin_name); - if(RegQueryValueExW(key, reg_vin_nameW, 0, NULL, - (BYTE*)vin_name, &size) != ERROR_SUCCESS) + if(RegQueryValueExW(key, L"DefaultVoiceInput", 0, NULL, (BYTE*)vin_name, &size) != ERROR_SUCCESS) vin_name[0] = 0; while(1){ @@ -1228,13 +1194,13 @@ static DWORD WINAPI notif_thread_proc(void *user) EnterCriticalSection(&g_notif_lock); - notify_if_changed(eRender, eConsole, key, reg_out_nameW, + notify_if_changed(eRender, eConsole, key, L"DefaultOutput", out_name, &MMDevice_def_play->IMMDevice_iface); - notify_if_changed(eRender, eCommunications, key, reg_vout_nameW, + notify_if_changed(eRender, eCommunications, key, L"DefaultVoiceOutput", vout_name, &MMDevice_def_play->IMMDevice_iface); - notify_if_changed(eCapture, eConsole, key, reg_in_nameW, + notify_if_changed(eCapture, eConsole, key, L"DefaultInput", in_name, &MMDevice_def_rec->IMMDevice_iface); - notify_if_changed(eCapture, eCommunications, key, reg_vin_nameW, + notify_if_changed(eCapture, eCommunications, key, L"DefaultVoiceInput", vin_name, &MMDevice_def_rec->IMMDevice_iface); LeaveCriticalSection(&g_notif_lock); @@ -1523,10 +1489,9 @@ static ULONG WINAPI PB_Release(IPropertyBag *iface) static HRESULT WINAPI PB_Read(IPropertyBag *iface, LPCOLESTR name, VARIANT *var, IErrorLog *log) { - static const WCHAR dsguid[] = { 'D','S','G','u','i','d', 0 }; IPropertyBagImpl *This = impl_from_IPropertyBag(iface); TRACE("Trying to read %s, type %u\n", debugstr_w(name), var->n1.n2.vt); - if (!lstrcmpW(name, dsguid)) + if (!lstrcmpW(name, L"DSGuid")) { WCHAR guidstr[39]; StringFromGUID2(&This->devguid, guidstr,ARRAY_SIZE(guidstr)); diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c index 8e9127a7507..247ebc3b001 100644 --- a/dlls/mmdevapi/main.c +++ b/dlls/mmdevapi/main.c @@ -47,8 +47,7 @@ static HINSTANCE instance; DriverFuncs drvs; -const WCHAR drv_keyW[] = {'S','o','f','t','w','a','r','e','\\', - 'W','i','n','e','\\','D','r','i','v','e','r','s',0}; +const WCHAR drv_keyW[] = L"Software\\Wine\\Drivers"; static const char *get_priority_string(int prio) { @@ -68,12 +67,10 @@ static const char *get_priority_string(int prio) static BOOL load_driver(const WCHAR *name, DriverFuncs *driver) { WCHAR driver_module[264]; - static const WCHAR wineW[] = {'w','i','n','e',0}; - static const WCHAR dotdrvW[] = {'.','d','r','v',0}; - lstrcpyW(driver_module, wineW); + lstrcpyW(driver_module, L"wine"); lstrcatW(driver_module, name); - lstrcatW(driver_module, dotdrvW); + lstrcatW(driver_module, L".drv"); TRACE("Attempting to load %s\n", wine_dbgstr_w(driver_module)); @@ -106,11 +103,7 @@ static BOOL load_driver(const WCHAR *name, DriverFuncs *driver) static BOOL WINAPI init_driver(INIT_ONCE *once, void *param, void **context) { - static const WCHAR drv_value[] = {'A','u','d','i','o',0}; - - static WCHAR default_list[] = {'p','u','l','s','e',',','a','l','s','a',',','o','s','s',',', - 'c','o','r','e','a','u','d','i','o',',','a','n','d','r','o','i','d',0}; - + static WCHAR default_list[] = L"pulse,alsa,oss,coreaudio,android"; DriverFuncs driver; HKEY key; WCHAR reg_list[256], *p, *next, *driver_list = default_list; @@ -118,8 +111,7 @@ static BOOL WINAPI init_driver(INIT_ONCE *once, void *param, void **context) if(RegOpenKeyW(HKEY_CURRENT_USER, drv_keyW, &key) == ERROR_SUCCESS){ DWORD size = sizeof(reg_list); - if(RegQueryValueExW(key, drv_value, 0, NULL, (BYTE*)reg_list, - &size) == ERROR_SUCCESS){ + if(RegQueryValueExW(key, L"Audio", 0, NULL, (BYTE*)reg_list, &size) == ERROR_SUCCESS){ if(reg_list[0] == '\0'){ TRACE("User explicitly chose no driver\n"); RegCloseKey(key); diff --git a/dlls/mmdevapi/tests/mmdevenum.c b/dlls/mmdevapi/tests/mmdevenum.c index 4708c2fef84..350d6474a46 100644 --- a/dlls/mmdevapi/tests/mmdevenum.c +++ b/dlls/mmdevapi/tests/mmdevenum.c @@ -384,8 +384,6 @@ static IMMNotificationClient notif = { &notif_vtbl }; /* Only do parameter tests here, the actual MMDevice testing should be a separate test */ START_TEST(mmdevenum) { - static const WCHAR not_a_deviceW[] = {'n','o','t','a','d','e','v','i','c','e',0}; - HRESULT hr; IUnknown *unk = NULL; IMMDeviceEnumerator *mme, *mme2; @@ -426,13 +424,13 @@ START_TEST(mmdevenum) ok(!unk, "Unk not reset to null after invalid QI\n"); ok(hr == E_NOINTERFACE, "Invalid hr %08x returned on IID_NULL\n", hr); - hr = IMMDeviceEnumerator_GetDevice(mme, not_a_deviceW, NULL); + hr = IMMDeviceEnumerator_GetDevice(mme, L"notadevice", NULL); ok(hr == E_POINTER, "GetDevice gave wrong error: %08x\n", hr); hr = IMMDeviceEnumerator_GetDevice(mme, NULL, &dev); ok(hr == E_POINTER, "GetDevice gave wrong error: %08x\n", hr); - hr = IMMDeviceEnumerator_GetDevice(mme, not_a_deviceW, &dev); + hr = IMMDeviceEnumerator_GetDevice(mme, L"notadevice", &dev); ok(hr == E_INVALIDARG, "GetDevice gave wrong error: %08x\n", hr); col = (void*)(LONG_PTR)0x12345678; diff --git a/dlls/mmdevapi/tests/propstore.c b/dlls/mmdevapi/tests/propstore.c index bdba19d158c..e5071e67e52 100644 --- a/dlls/mmdevapi/tests/propstore.c +++ b/dlls/mmdevapi/tests/propstore.c @@ -33,14 +33,7 @@ static BOOL (WINAPI *pIsWow64Process)(HANDLE, BOOL *); static const WCHAR software_renderW[] = - { 'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','d','o','w','s','\\', - 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', - 'M','M','D','e','v','i','c','e','s','\\', - 'A','u','d','i','o','\\', - 'R','e','n','d','e','r',0 }; -static const WCHAR propertiesW[] = {'P','r','o','p','e','r','t','i','e','s',0}; + L"Software\\Microsoft\\Windows\\CurrentVersion\\MMDevices\\Audio\\Render"; static void test_propertystore(IPropertyStore *store) @@ -138,7 +131,7 @@ static void test_setvalue_on_wow64(IPropertyStore *store) static const PROPERTYKEY PKEY_Bogus = { {0x1da5d803, 0xd492, 0x4edd, {0x8c, 0x23, 0xe0, 0xc0, 0xff, 0xee, 0x7f, 0x00}}, 0x7f }; - static const WCHAR bogusW[] = {'{','1','D','A','5','D','8','0','3','-','D','4','9','2','-','4','E','D','D','-','8','C','2','3','-','E','0','C','0','F','F','E','E','7','F','0','0','}',',','1','2','7',0}; + static const WCHAR bogusW[] = L"{1DA5D803-D492-4EDD-8C23-E0C0FFEE7F00},127"; PropVariantInit(&pv); @@ -172,7 +165,7 @@ static void test_setvalue_on_wow64(IPropertyStore *store) ret = RegOpenKeyExW(root, guidW, 0, KEY_READ|KEY_WOW64_64KEY, &devkey); ok(ret == ERROR_SUCCESS, "Couldn't open mmdevice guid key: %u\n", ret); - ret = RegOpenKeyExW(devkey, propertiesW, 0, KEY_READ|KEY_WOW64_64KEY, &props); + ret = RegOpenKeyExW(devkey, L"Properties", 0, KEY_READ|KEY_WOW64_64KEY, &props); ok(ret == ERROR_SUCCESS, "Couldn't open mmdevice property key: %u\n", ret); /* Note: the registry key exists even without calling IPropStore::Commit */ -- 2.26.2

2 1

[PATCH] winegstreamer: Initialise type_handler to NULL in media_stream_init_desc().
by Gijs Vermeulen 25 Nov '20

25 Nov '20

Otherwise it is used uninitialised if a failure occurs. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/winegstreamer/media_source.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 66bdf64a669..83424719d54 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -858,7 +858,7 @@ fail: static HRESULT media_stream_init_desc(struct media_stream *stream) { GstCaps *current_caps = gst_pad_get_current_caps(stream->their_src); - IMFMediaTypeHandler *type_handler; + IMFMediaTypeHandler *type_handler = NULL; IMFMediaType **stream_types = NULL; IMFMediaType *stream_type = NULL; DWORD type_count = 0; -- 2.29.2

2 1

[PATCH 1/4] mf/topoloader: Add partial topology resolution tests.
by Derek Lesho 25 Nov '20

25 Nov '20

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- I'm not sure if this is too many of too few tests, and if the kinds of tests I have here are wanted. I was going to add tests for MF_ENUMERATE_SOURCE_TYPES and MF_CONNECT_RESOLVE_INDEPENDENT_OUTPUTTYPES, but they got really large, and didn't really prove much beyond what is already documented in the MSDN. Another test I chose to leave out is for what happens on topologies with sources without a currently selected media type, since Microsoft is pretty clear that will never happen. Also note that these tests aren't un-todo'd in this patchset. The first test requires 1) the more correct sample grabber IsMediaTypeSupportedImplementation and 2) the audio resampler MFT. The second tests requires the media source to output compressed MPEG streams and for a MPEG decoder to be present. --- dlls/mf/tests/mf.c | 200 +++++++++++++++++++++++++++++++++++++- dlls/mf/tests/resource.rc | 3 + dlls/mf/tests/test.mp3 | Bin 0 -> 2551 bytes 3 files changed, 201 insertions(+), 2 deletions(-) create mode 100644 dlls/mf/tests/test.mp3 diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 43dc9a49ee7..4c70f7ee857 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1418,22 +1418,27 @@ static const IMFSampleGrabberSinkCallbackVtbl test_grabber_callback_vtbl = static void test_topology_loader(void) { IMFSampleGrabberSinkCallback test_grabber_callback = { &test_grabber_callback_vtbl }; + IMFTopologyNode *src_node, *sink_node, *src_node2, *mft_node; IMFTopology *topology, *topology2, *full_topology; - IMFTopologyNode *src_node, *sink_node; + unsigned int count, value, index; IMFPresentationDescriptor *pd; IMFSourceResolver *resolver; IMFActivate *sink_activate; IMFStreamSink *stream_sink; - unsigned int count, value; + MF_TOPOLOGY_TYPE node_type; IMFMediaType *media_type; IMFStreamDescriptor *sd; MF_OBJECT_TYPE obj_type; + IMFTransform *transform; IMFMediaSource *source; IMFTopoLoader *loader; IMFByteStream *stream; + IUnknown *node_object; IMFAttributes *attr; IMFMediaSink *sink; + WORD node_count; WCHAR *filename; + TOPOID node_id; BOOL selected; HRESULT hr; GUID guid; @@ -1581,9 +1586,200 @@ todo_wine { IMFTopology_Release(topology2); IMFTopology_Release(full_topology); + /* Partial topology (requires converter) */ + + hr = MFCreateMediaType(&media_type); + ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); + + hr = IMFMediaType_SetGUID(media_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + hr = IMFMediaType_SetGUID(media_type, &MF_MT_SUBTYPE, &MFAudioFormat_PCM); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + /* resample from 44100hz to 48000hz */ + hr = IMFMediaType_SetUINT32(media_type, &MF_MT_AUDIO_SAMPLES_PER_SECOND, 48000); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = MFCreateSampleGrabberSinkActivate(media_type, &test_grabber_callback, &sink_activate); + ok(hr == S_OK, "Failed to create grabber sink, hr %#x.\n", hr); + + IMFMediaType_Release(media_type); + + hr = IMFActivate_ActivateObject(sink_activate, &IID_IMFMediaSink, (void **)&sink); + ok(hr == S_OK, "Failed to activate, hr %#x.\n", hr); + + hr = IMFMediaSink_GetStreamSinkByIndex(sink, 0, &stream_sink); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFTopologyNode_SetObject(sink_node, (IUnknown *)stream_sink); + ok(hr == S_OK, "Failed to set object, hr %#x.\n", hr); + + hr = IMFTopologyNode_SetUINT32(sink_node, &MF_TOPONODE_CONNECT_METHOD, MF_CONNECT_ALLOW_CONVERTER); + ok(hr == S_OK, "Failed to set connect method, hr %#x.\n", hr); + + IMFStreamSink_Release(stream_sink); + + hr = IMFTopoLoader_Load(loader, topology, &full_topology, NULL); + ok(hr == S_OK, "Failed to resolve topology, hr %#x.\n", hr); + + hr = IMFTopology_GetNodeCount(full_topology, &node_count); + ok(hr == S_OK, "Failed to get node count, hr %#x.\n", hr); +todo_wine + ok(node_count == 3, "Unexpected node count %u\n", node_count); + if (node_count != 3) + { + IMFMediaSource_Release(source); + IMFSourceResolver_Release(resolver); + IMFByteStream_Release(stream); + + IMFTopoLoader_Release(loader); + + hr = MFShutdown(); + ok(hr == S_OK, "Shutdown failure, hr %#x.\n", hr); + return; + } + + hr = IMFTopologyNode_GetTopoNodeID(src_node, &node_id); + ok(hr == S_OK, "Failed to get source node id, hr %#x.\n", hr); + + hr = IMFTopology_GetNodeByID(full_topology, node_id, &src_node2); + ok(hr == S_OK, "Failed to get source in resolved topology, hr %#x.\n", hr); + + hr = IMFTopologyNode_GetOutput(src_node2, 0, &mft_node, &index); + ok(hr == S_OK, "Failed to get transform node in resolved topology, hr %#x.\n", hr); + ok(index == 0, "Unexpected stream index %u.\n", index); + + hr = IMFTopologyNode_GetNodeType(mft_node, &node_type); + ok(hr == S_OK, "Failed to get transform node type in resolved topology, hr %#x.\n", hr); + ok(node_type == MF_TOPOLOGY_TRANSFORM_NODE, "Unexpected node type %u, expected MF_TOPOLOGY_TRANSFORM_NODE.\n", node_type); + + hr = IMFTopologyNode_GetObject(mft_node, &node_object); + ok(hr == S_OK, "Failed to get object of transform node, hr %#x.\n", hr); + + hr = IUnknown_QueryInterface(node_object, &IID_IMFTransform, (void**) &transform); + ok(hr == S_OK, "Failed to get IMFTransform from transform node's object, hr %#x.\n", hr); + IUnknown_Release(node_object); + + hr = IMFTransform_GetInputCurrentType(transform, 0, &media_type); + ok(hr == S_OK, "Failed to get transform input type, hr %#x.\n", hr); + + hr = IMFMediaType_GetUINT32(media_type, &MF_MT_AUDIO_SAMPLES_PER_SECOND, &value); + ok(hr == S_OK, "Failed to get MF_MT_AUDIO_SAMPLES_PER_SECOND on transform input type, hr %#x.\n", hr); + ok(value == 44100, "Unexpected sample rate of transform input type %u, expected 44100\n", value); + + IMFMediaType_Release(media_type); + + hr = IMFTransform_GetOutputCurrentType(transform, 0, &media_type); + ok(hr == S_OK, "Failed to get transform output type, hr %#x.\n", hr); + + hr = IMFMediaType_GetUINT32(media_type, &MF_MT_AUDIO_SAMPLES_PER_SECOND, &value); + ok(hr == S_OK, "Failed to get MF_MT_AUDIO_SAMPLES_PER_SECOND on transform output type, hr %#x.\n", hr); + ok(value == 48000, "Unexpected sample rate of transform input type %u, expected 48000\n", value); + + IMFMediaType_Release(media_type); + IMFTransform_Release(transform); + IMFTopology_Release(full_topology); + IMFMediaSource_Release(source); IMFSourceResolver_Release(resolver); IMFByteStream_Release(stream); + + /* Test MF_TOPONODE_CONNECT_METHOD: + - 0x1 (MF_CONNECT_ALLOW_CONVERTER) allows converters + - 0x3 (MF_CONNECT_ALLOW_DECODER) allows converters and decoders + - 0x2 allows neither */ + + hr = MFCreateSourceResolver(&resolver); + ok(hr == S_OK, "Failed to create source resolver, hr %#x.\n", hr); + + filename = load_resource(L"test.mp3"); + + hr = MFCreateFile(MF_ACCESSMODE_READ, MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_NONE, filename, &stream); + ok(hr == S_OK, "Failed to create file stream, hr %#x.\n", hr); + + IMFByteStream_QueryInterface(stream, &IID_IMFAttributes, (void **)&attr); + IMFAttributes_SetString(attr, &MF_BYTESTREAM_CONTENT_TYPE, L"audio/mpeg"); + IMFAttributes_Release(attr); + + hr = IMFSourceResolver_CreateObjectFromByteStream(resolver, stream, NULL, MF_RESOLUTION_MEDIASOURCE, NULL, + &obj_type, (IUnknown **)&source); + ok(hr == S_OK || broken(FAILED(hr)) /* Vista */, "Failed to create source, hr %#x.\n", hr); + if (FAILED(hr)) + return; + + hr = IMFMediaSource_CreatePresentationDescriptor(source, &pd); + ok(hr == S_OK, "Failed to create descriptor, hr %#x.\n", hr); + if (FAILED(hr)) + return; + + hr = IMFPresentationDescriptor_GetStreamDescriptorByIndex(pd, 0, &selected, &sd); + ok(hr == S_OK, "Failed to get stream descriptor, hr %#x.\n", hr); + + hr = IMFTopologyNode_SetUnknown(src_node, &MF_TOPONODE_SOURCE, (IUnknown *)source); + ok(hr == S_OK, "Failed to set node source, hr %#x.\n", hr); + + hr = IMFTopologyNode_SetUnknown(src_node, &MF_TOPONODE_PRESENTATION_DESCRIPTOR, (IUnknown *)pd); + ok(hr == S_OK, "Failed to set node pd, hr %#x.\n", hr); + + hr = IMFTopologyNode_SetUnknown(src_node, &MF_TOPONODE_STREAM_DESCRIPTOR, (IUnknown *)sd); + ok(hr == S_OK, "Failed to set node sd, hr %#x.\n", hr); + + hr = MFCreateMediaType(&media_type); + ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); + + hr = IMFMediaType_SetGUID(media_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + hr = IMFMediaType_SetGUID(media_type, &MF_MT_SUBTYPE, &MFAudioFormat_PCM); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = MFCreateSampleGrabberSinkActivate(media_type, &test_grabber_callback, &sink_activate); + ok(hr == S_OK, "Failed to create grabber sink, hr %#x.\n", hr); + + IMFMediaType_Release(media_type); + + hr = IMFActivate_ActivateObject(sink_activate, &IID_IMFMediaSink, (void **)&sink); + ok(hr == S_OK, "Failed to activate, hr %#x.\n", hr); + + hr = IMFMediaSink_GetStreamSinkByIndex(sink, 0, &stream_sink); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFTopologyNode_SetObject(sink_node, (IUnknown *)stream_sink); + ok(hr == S_OK, "Failed to set object, hr %#x.\n", hr); + + IMFStreamSink_Release(stream_sink); + + hr = IMFTopologyNode_SetUINT32(sink_node, &MF_TOPONODE_CONNECT_METHOD, MF_CONNECT_DIRECT); + ok(hr == S_OK, "Failed to set connect method, hr %#x.\n", hr); + + hr = IMFTopoLoader_Load(loader, topology, &full_topology, NULL); + ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#x.\n", hr); + + hr = IMFTopologyNode_SetUINT32(sink_node, &MF_TOPONODE_CONNECT_METHOD, MF_CONNECT_ALLOW_CONVERTER); + ok(hr == S_OK, "Failed to set connect method, hr %#x.\n", hr); + + hr = IMFTopoLoader_Load(loader, topology, &full_topology, NULL); + ok(hr == MF_E_TRANSFORM_NOT_POSSIBLE_FOR_CURRENT_MEDIATYPE_COMBINATION, "Unexpected hr %#x.\n", hr); + + hr = IMFTopologyNode_SetUINT32(sink_node, &MF_TOPONODE_CONNECT_METHOD, 2); + ok(hr == S_OK, "Failed to set connect method, hr %#x.\n", hr); + + hr = IMFTopoLoader_Load(loader, topology, &full_topology, NULL); + ok(hr == MF_E_INVALIDMEDIATYPE, "Failed to resolve topology, hr %#x.\n", hr); + + hr = IMFTopologyNode_SetUINT32(sink_node, &MF_TOPONODE_CONNECT_METHOD, MF_CONNECT_ALLOW_DECODER); + ok(hr == S_OK, "Failed to set connect method, hr %#x.\n", hr); + + hr = IMFTopoLoader_Load(loader, topology, &full_topology, NULL); + ok(hr == S_OK, "Failed to resolve topology, hr %#x.\n", hr); + + hr = IMFTopology_GetNodeCount(full_topology, &node_count); + ok(hr == S_OK, "Failed to get node count, hr %#x.\n", hr); + ok(node_count == 3, "Unexpected node count %u\n", node_count); + + IMFTopology_Release(full_topology); + IMFMediaSource_Release(source); + IMFSourceResolver_Release(resolver); + IMFByteStream_Release(stream); + IMFTopoLoader_Release(loader); hr = MFShutdown(); diff --git a/dlls/mf/tests/resource.rc b/dlls/mf/tests/resource.rc index f54212a8c8f..5e847cd0b3b 100644 --- a/dlls/mf/tests/resource.rc +++ b/dlls/mf/tests/resource.rc @@ -20,3 +20,6 @@ /* @makedep: test.wav */ test.wav RCDATA test.wav + +/* @makedep: test.mp3 */ +test.mp3 RCDATA test.mp3 diff --git a/dlls/mf/tests/test.mp3 b/dlls/mf/tests/test.mp3 new file mode 100644 index 0000000000000000000000000000000000000000..8b66f19da24624d58beda20187e1f6f85bdc4f44 GIT binary patch literal 2551 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 literal 0 HcmV?d00001 -- 2.29.2

2 4

Re: wine-devel Digest, Vol 184, Issue 284
by Steve Lhomme 25 Nov '20

25 Nov '20

> Date: Wed, 25 Nov 2020 08:51:43 +0300 > From: Nikolay Sivov <nsivov(a)codeweavers.com> > To: wine-devel(a)winehq.org > Subject: Re: [PATCH] include: add AV1 support to dxva.h > Message-ID: <aa27d182-49e8-d3ec-eef1-15d4aeaf02b9(a)codeweavers.com> > Content-Type: text/plain; charset=utf-8 > > On 11/20/20 3:37 PM, Steve Lhomme wrote: >> Based on the DXVA AV1 specs >> https://www.microsoft.com/en-us/download/details.aspx?id=101577 >> >> The structures and the associated define are available in Windows SDK >> since at least 10.0.20231.0. > > Is this something pre-released? Latest one I see is 10.0.19041.0, > corresponding to Windows 10 2004. > It does not have the types. Yes, it's Windows Insider SDKs that can be found here: https://docs.microsoft.com/en-us/windows-insider/flight-hub/ >> >> The GUIDs were present in previous SDKs as well. >> --- >> include/dxva.h | 279 +++++++++++++++++++++++++++++++++++++++++++++++++ >> 1 file changed, 279 insertions(+) >> >> diff --git a/include/dxva.h b/include/dxva.h >> index 4f18f2e60da..b474bd87111 100644 >> --- a/include/dxva.h >> +++ b/include/dxva.h >> @@ -563,6 +563,285 @@ typedef struct _DXVA_Status_VPx >> USHORT wNumMbsAffected; >> } DXVA_Status_VPx, *LPDXVA_Status_VPx; >> >> + >> +#define _DIRECTX_AV1_VA_ >> + >> +/* AV1 decoder GUIDs */ >> +DEFINE_GUID(DXVA_ModeAV1_VLD_Profile0, 0xb8be4ccb, 0xcf53, 0x46ba, 0x8d, 0x59, 0xd6, 0xb8, 0xa6, 0xda, 0x5d, 0x2a); >> +DEFINE_GUID(DXVA_ModeAV1_VLD_Profile1, 0x6936ff0f, 0x45b1, 0x4163, 0x9c, 0xc1, 0x64, 0x6e, 0xf6, 0x94, 0x61, 0x08); >> +DEFINE_GUID(DXVA_ModeAV1_VLD_Profile2, 0x0c5f2aa1, 0xe541, 0x4089, 0xbb, 0x7b, 0x98, 0x11, 0x0a, 0x19, 0xd7, 0xc8); >> +DEFINE_GUID(DXVA_ModeAV1_VLD_12bit_Profile2, 0x17127009, 0xa00f, 0x4ce1, 0x99, 0x4e, 0xbf, 0x40, 0x81, 0xf6, 0xf3, 0xf0); >> +DEFINE_GUID(DXVA_ModeAV1_VLD_12bit_Profile2_420, 0x2d80bed6, 0x9cac, 0x4835, 0x9e, 0x91, 0x32, 0x7b, 0xbc, 0x4f, 0x9e, 0xe8); > Adding GUIDs is fine, since they are indeed present in current versions. >> + >> +/* AV1 picture entry data structure */ >> +typedef struct _DXVA_PicEntry_AV1 { >> + UINT width; >> + UINT height; >> + >> + // Global motion parameters >> + INT wmmat[6]; >> + union { >> + struct { >> + UCHAR wminvalid : 1; >> + UCHAR wmtype : 2; >> + UCHAR Reserved : 5; >> + }; >> + UCHAR GlobalMotionFlags; >> + }; >> + UCHAR Index; >> + USHORT Reserved16Bits; >> +} DXVA_PicEntry_AV1, *LPDXVA_PicEntry_AV1; > For that I think we should wait for released SDK. OK. It may not even be in 20H2 though. Drivers from Intel, NVIDIA and AMD can all understand those structures, even on Windows 20H1.

2 1

[PATCH 1/2] shcore: Return ISequentialStream interface for memory stream.
by Daniel Lehman 25 Nov '20

25 Nov '20

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- dlls/shcore/main.c | 4 +++- dlls/shlwapi/tests/istream.c | 2 -- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index f9722135fce..d5fce76eade 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -555,7 +555,9 @@ static HRESULT WINAPI shstream_QueryInterface(IStream *iface, REFIID riid, void TRACE("(%p)->(%s, %p)\n", stream, debugstr_guid(riid), out); - if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IStream)) + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IStream) || + IsEqualIID(riid, &IID_ISequentialStream)) { *out = iface; IStream_AddRef(iface); diff --git a/dlls/shlwapi/tests/istream.c b/dlls/shlwapi/tests/istream.c index 0888e7eb3a7..bbd198c8fde 100644 --- a/dlls/shlwapi/tests/istream.c +++ b/dlls/shlwapi/tests/istream.c @@ -270,7 +270,6 @@ static void test_stream_qi(IStream *stream) unk = NULL; hr = IStream_QueryInterface(stream, &IID_ISequentialStream, (void **)&unk); -todo_wine ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* XP */, "Failed to get ISequentialStream interface, hr %#x.\n", hr); if (unk) IUnknown_Release(unk); @@ -755,7 +754,6 @@ static void test_SHCreateMemStream(void) ok(stream != NULL, "Failed to create a stream.\n"); hr = IStream_QueryInterface(stream, &IID_ISequentialStream, (void **)&unk); -todo_wine ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* WinXP */, "Failed to QI, hr %#x.\n", hr); if (unk) IUnknown_Release(unk); -- 2.25.1

2 3

mmdevapi:render test failures
by Francois Gouget 24 Nov '20

24 Nov '20

So mmdevapi:render keeps failing randomly due to timing issues. All the random failures seem to follow this model: render.c:1091: Test failed: Position 50880 too far after playing 100ms 1077 hr = IAudioClient_Start(ac); /* #1 */ 1080 Sleep(100); 1081 slept += 100; 1087 hr = IAudioClock_GetPosition(acl, &pos, NULL); 1090 /* in rare cases is slept*1.1 not enough with dmix */ 1091 ok(pos*1000/freq <= slept*1.4, "Position %u too far after playing %ums\n", (UINT)pos, slept); There are a number of issues with that test: * Sleep(100) never sleeps for 100 ms! It either sleeps for 93.6, 109.2 or even 124.8 ms depending on the Sleep() history. In any case it's always a multiple of 15.6 ms. So line 1081 is wrong. * IAudioClient_Start() takes between 1.5 and 3 ms. There is no telling when the audio actually starts during that interval. So that adds up to 3 ms to the play time. * In turn that means the 1.4 factor on line 1091 does not provide a 'safety margin' but really only compensates for the bug on line 1081. * And in any case, given the very short duration, I feel this is going to test how the driver / hardware deals with buffering and latency more than anything else. (even if the driver claims the latency is 0) So what is the goal of that test? I mean besides "Perform renderer padding & position tests". Is the goal to check that an 8-bit stereo stream is not being played as a 16-bit stereo stream, i.e. twice as fast as it should? Then, assuming we find a suitable duration for that test, wouldn't it make more sense to set the leeway factor to something between 1.5 (an even split between expected (1) and too fast (2)) and 1.8 (i.e. biased to account for buffering & co). And we should be measuring how much time elapsed between just before the Start() call and right after the GetPosition() one to set our expectations. Or... scrap the test? -- Francois Gouget <fgouget(a)codeweavers.com>

3 7

[PATCH 1/4] qcap: Move the image buffer back into the video_capture_device structure.
by Zebediah Figura 24 Nov '20

24 Nov '20

This undoes 7aa9a04f26. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/qcap/v4l.c | 48 +++++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index b1d7e68d426..cfae2b1d1ec 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -97,6 +97,7 @@ struct v4l_device LONG caps_count; int image_size, image_pitch; + BYTE *image_data; struct strmbase_source *pin; int fd, mmap; @@ -133,6 +134,7 @@ static void v4l_device_destroy(struct video_capture_device *iface) video_close(device->fd); if (device->caps_count) heap_free(device->caps); + heap_free(device->image_data); heap_free(device); } @@ -174,13 +176,21 @@ static HRESULT v4l_device_check_format(struct video_capture_device *iface, const return E_FAIL; } -static BOOL set_caps(struct v4l_device *device, const struct caps *caps) +static HRESULT set_caps(struct v4l_device *device, const struct caps *caps) { struct v4l2_format format = {0}; - LONG width, height; + LONG width, height, image_size; + BYTE *image_data; width = caps->video_info.bmiHeader.biWidth; height = caps->video_info.bmiHeader.biHeight; + image_size = width * height * caps->video_info.bmiHeader.biBitCount / 8; + + if (!(image_data = heap_alloc(image_size))) + { + ERR("Failed to allocate memory.\n"); + return E_OUTOFMEMORY; + } format.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; format.fmt.pix.pixelformat = caps->pixelformat; @@ -192,14 +202,16 @@ static BOOL set_caps(struct v4l_device *device, const struct caps *caps) || format.fmt.pix.height != height) { ERR("Failed to set pixel format: %s.\n", strerror(errno)); - return FALSE; + heap_free(image_data); + return VFW_E_TYPE_NOT_ACCEPTED; } device->current_caps = caps; - device->image_size = width * height * caps->video_info.bmiHeader.biBitCount / 8; + device->image_size = image_size; device->image_pitch = width * caps->video_info.bmiHeader.biBitCount / 8; - - return TRUE; + heap_free(device->image_data); + device->image_data = image_data; + return S_OK; } static HRESULT v4l_device_set_format(struct video_capture_device *iface, const AM_MEDIA_TYPE *mt) @@ -214,10 +226,7 @@ static HRESULT v4l_device_set_format(struct video_capture_device *iface, const A if (device->current_caps == caps) return S_OK; - if (!set_caps(device, caps)) - return VFW_E_TYPE_NOT_ACCEPTED; - - return S_OK; + return set_caps(device, caps); } static HRESULT v4l_device_get_format(struct video_capture_device *iface, AM_MEDIA_TYPE *mt) @@ -344,13 +353,7 @@ static DWORD WINAPI ReadThread(void *arg) struct v4l_device *device = arg; HRESULT hr; IMediaSample *pSample = NULL; - unsigned char *pTarget, *image_data; - - if (!(image_data = heap_alloc(device->image_size))) - { - ERR("Failed to allocate memory.\n"); - return 0; - } + unsigned char *pTarget; for (;;) { @@ -379,7 +382,7 @@ static DWORD WINAPI ReadThread(void *arg) IMediaSample_GetPointer(pSample, &pTarget); - while (video_read(device->fd, image_data, device->image_size) == -1) + while (video_read(device->fd, device->image_data, device->image_size) == -1) { if (errno != EAGAIN) { @@ -388,7 +391,7 @@ static DWORD WINAPI ReadThread(void *arg) } } - reverse_image(device, pTarget, image_data); + reverse_image(device, pTarget, device->image_data); hr = IMemInputPin_Receive(device->pin->pMemInputPin, pSample); IMediaSample_Release(pSample); } @@ -400,7 +403,6 @@ static DWORD WINAPI ReadThread(void *arg) } } - heap_free(image_data); return 0; } @@ -550,6 +552,7 @@ struct video_capture_device *v4l_device_create(struct strmbase_source *pin, USHO struct v4l_device *device; BOOL have_libv4l2; char path[20]; + HRESULT hr; int fd, i; have_libv4l2 = video_init(); @@ -671,10 +674,9 @@ struct video_capture_device *v4l_device_create(struct strmbase_source *pin, USHO for (i = 0; i < device->caps_count; ++i) device->caps[i].media_type.pbFormat = (BYTE *)&device->caps[i].video_info; - if (!set_caps(device, &device->caps[0])) + if (FAILED(hr = set_caps(device, &device->caps[0]))) { - ERR("Failed to set pixel format: %s\n", strerror(errno)); - if (!have_libv4l2) + if (hr == VFW_E_TYPE_NOT_ACCEPTED && !have_libv4l2) ERR_(winediag)("You may need libv4l2 to use this device.\n"); goto error; } -- 2.29.2

1 3

[PATCH vkd3d 1/5] tests: Add some tests for #if expression evaluation.
by Zebediah Figura 24 Nov '20

24 Nov '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- Makefile.am | 2 + tests/preproc-if-expr.shader_test | 261 ++++++++++++++++++++++++++++++ 2 files changed, 263 insertions(+) create mode 100644 tests/preproc-if-expr.shader_test diff --git a/Makefile.am b/Makefile.am index 0ee7eda7..2cb1567a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -66,6 +66,7 @@ vkd3d_shader_tests = \ tests/math.shader_test \ tests/preproc-if.shader_test \ tests/preproc-ifdef.shader_test \ + tests/preproc-if-expr.shader_test \ tests/swizzle-0.shader_test \ tests/swizzle-1.shader_test \ tests/swizzle-2.shader_test \ @@ -210,6 +211,7 @@ XFAIL_TESTS = \ tests/math.shader_test \ tests/preproc-if.shader_test \ tests/preproc-ifdef.shader_test \ + tests/preproc-if-expr.shader_test \ tests/swizzle-0.shader_test \ tests/swizzle-1.shader_test \ tests/swizzle-2.shader_test \ diff --git a/tests/preproc-if-expr.shader_test b/tests/preproc-if-expr.shader_test new file mode 100644 index 00000000..61c5a397 --- /dev/null +++ b/tests/preproc-if-expr.shader_test @@ -0,0 +1,261 @@ +[preproc] +#if 1 == 1 +pass +#endif + +[preproc] +#if 1 == 0 +fail +#endif +pass + +[preproc] +#if 2 +pass +#endif + +[preproc] +#if -1 +pass +#endif + +[preproc] +#if-1 +pass +#endif + +[preproc] +#if 1 + 1 == 2 +pass +#endif + +[preproc] +#if 1 + 1 == 3 +fail +#endif +pass + +[preproc] +#if 8 - 3 == 5 +pass +#endif + +[preproc] +#if 2 * 2 == 4 +pass +#endif + +[preproc] +#if 2 * 2 == 4 +pass +#endif + +[preproc] +#if 8 / 3 == 2 +pass +#endif + +[preproc] +#if 0x12 == 18 +pass +#endif + +[preproc] +#if 012 == 10 +pass +#endif + +[preproc] +#if -1 == 0xfffffff +fail +#elif -1 == 0xffffffff +pass +#endif + +[preproc] +#if -1 == 0xefffffffel +fail +#elif -1 == 0xeffffffffl +pass +#endif + +[preproc] +#if (-1 == 4294967295l) && (-1 == 8589934591l) && (1 == 4294967297l) +pass +#endif + +[preproc] +#if (-1ul == 4294967295ul) && (-1ul == 8589934591ul) && (1ul == 4294967297ul) +pass +#endif + +[preproc] +#if (-1lu == 4294967295lu) && (-1lu == 8589934591lu) && (1lu == 4294967297lu) +pass +#endif + +[preproc] +#if 36893488147419103233 == 1 +pass +#endif + +[preproc] +/* All math is done using unsigned 32-bit integers. */ +#if 8 / -3 == 2 +fail +#elif 8 / -3 == 3 +fail +#elif 8 / -3 == -2 +fail +#elif 8 / -3 == -3 +fail +#elif 8 / -3 == 0 +pass +#endif + +[preproc] +#if -8 / 3 == 2 +fail +#elif -8 / 3 == 3 +fail +#elif -8 / 3 == -2 +fail +#elif -8 / 3 == -3 +fail +#elif -8 / 3 == 1431655762 +pass +#endif + +[preproc] +#if 1 && 0 +fail +#endif +pass + +[preproc] +#if 0 && 1 +fail +#endif +pass + +[preproc] +#if 1 && 1 +pass +#endif + +[preproc] +#if 1 || 0 +pass +#endif + +[preproc] +#if 0 || 1 +pass +#endif + +[preproc] +#if 0 || 0 +fail +#endif +pass + +[preproc] +#if 1 != 1 +fail +#elif 1 != 0 +pass +#endif + +[preproc] +#if 2 < 1 +fail +#elif 2 < 2 +fail +#elif 1 < 2 +pass +#endif + +[preproc] +#if 2 <= 1 +fail +#elif (1 <= 1) && (1 <= 2) +pass +#endif + +[preproc] +#if 1 > 2 +fail +#elif 2 > 2 +fail +#elif 2 > 1 +pass +#endif + +[preproc] +#if 1 >= 2 +fail +#elif (1 >= 1) && (2 >= 1) +pass +#endif + +[preproc] +#if (2 == 2) == 1 +pass +#endif + +[preproc] +#if ((!0) == 1) && ((!1) == 0) && ((!2) == 0) +pass +#endif + +[preproc] +#if (0 ? 2 : 3) == 3 +pass +#endif + +[preproc] +#if (1 ? 2 : 3) == 2 +pass +#endif + +[preproc] +#if (6 & 3) == 2 +pass +#endif + +[preproc] +#if (6 | 3) == 7 +pass +#endif + +[preproc] +#if (6 ^ 3) == 5 +pass +#endif + +[preproc] +#if +1 == 1 +pass +#endif + +[preproc] +#if -(-1) == 1 +pass +#endif + +[preproc] +#if 2 + 3 * 5 == 17 +pass +#endif + +[preproc] +#if (2 + 3) * 5 == 25 +pass +#endif + +[preproc] +#if 0 \ +< \ +1 +pass +#endif -- 2.29.2

4 16