August 2018 - Wine-Devel - list.winehq.org

[PATCH] testbot: Add some section headers in PatchUtils.
by Francois Gouget Aug. 10, 2018

Aug. 10, 2018

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/PatchUtils.pm | 74 +++++++++++++++------------ 1 file changed, 41 insertions(+), 33 deletions(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index be5ce14d1..d399ced54 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -36,39 +36,9 @@ our @EXPORT = qw(GetPatchImpact UpdateWineData); use WineTestBot::Config; -# These paths are too generic to be proof that this is a Wine patch. -my $AmbiguousPathsRe = join('|', - 'Makefile\.in$', - # aclocal.m4 gets special treatment - # configure gets special treatment - # configure.ac gets special treatment - 'include/Makefile\.in$', - 'include/config\.h\.in$', - 'po/', - 'tools/Makefile.in', - 'tools/config.guess', - 'tools/config.sub', - 'tools/install-sh', - 'tools/makedep.c', -); - -# Patches to these paths don't impact the Wine build. So ignore them. -my $IgnoredPathsRe = join('|', - '\.mailmap$', - 'ANNOUNCE$', - 'AUTHORS$', - 'COPYING\.LIB$', - 'LICENSE\$', - 'LICENSE\.OLD$', - 'MAINTAINERS$', - 'README$', - 'VERSION$', - 'documentation/', - 'tools/c2man\.pl$', - 'tools/winapi/', - 'tools/winemaker/', -); - +# +# Source repository maintenance +# =pod =over 12 @@ -140,6 +110,44 @@ sub _LoadWineFiles() } } + +# +# Wine patch analysis +# + +# These paths are too generic to be proof that this is a Wine patch. +my $AmbiguousPathsRe = join('|', + 'Makefile\.in$', + # aclocal.m4 gets special treatment + # configure gets special treatment + # configure.ac gets special treatment + 'include/Makefile\.in$', + 'include/config\.h\.in$', + 'po/', + 'tools/Makefile.in', + 'tools/config.guess', + 'tools/config.sub', + 'tools/install-sh', + 'tools/makedep.c', +); + +# Patches to these paths don't impact the Wine build. So ignore them. +my $IgnoredPathsRe = join('|', + '\.mailmap$', + 'ANNOUNCE$', + 'AUTHORS$', + 'COPYING\.LIB$', + 'LICENSE\$', + 'LICENSE\.OLD$', + 'MAINTAINERS$', + 'README$', + 'VERSION$', + 'documentation/', + 'tools/c2man\.pl$', + 'tools/winapi/', + 'tools/winemaker/', +); + sub _HandleFile($$$) { my ($Impacts, $FilePath, $Change) = @_; -- 2.18.0

1 0

[PATCH] winebus.sys: Use the ARRAY_SIZE() macro
by Michael Stefaniuc Aug. 10, 2018

Aug. 10, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winebus.sys/bus_iohid.c | 2 +- dlls/winebus.sys/main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index 501a40d26e..ac706f5265 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -295,7 +295,7 @@ static void handle_DeviceMatchingCallback(void *context, IOReturn result, void * pid = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDProductIDKey))); version = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDVersionNumberKey))); str = IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDSerialNumberKey)); - if (str) CFStringToWSTR(str, serial_string, sizeof(serial_string) / sizeof(WCHAR)); + if (str) CFStringToWSTR(str, serial_string, ARRAY_SIZE(serial_string)); if (IOHIDDeviceConformsTo(IOHIDDevice, kHIDPage_GenericDesktop, kHIDUsage_GD_GamePad) || IOHIDDeviceConformsTo(IOHIDDevice, kHIDPage_GenericDesktop, kHIDUsage_GD_Joystick)) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 2f3c05aa96..deb2c86d96 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -696,7 +696,7 @@ BOOL is_xbox_gamepad(WORD vid, WORD pid) if (vid != VID_MICROSOFT) return FALSE; - for (i = 0; i < sizeof(PID_XBOX_CONTROLLERS)/sizeof(*PID_XBOX_CONTROLLERS); i++) + for (i = 0; i < ARRAY_SIZE(PID_XBOX_CONTROLLERS); i++) if (pid == PID_XBOX_CONTROLLERS[i]) return TRUE; return FALSE; -- 2.14.4

2 1

[PATCH] winejoystick.drv: Use the ARRAY_SIZE() macro
by Michael Stefaniuc Aug. 10, 2018

Aug. 10, 2018

Not compile tested. If somebody with a Mac could give this a try it would be much appreciated. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winejoystick.drv/joystick_osx.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/winejoystick.drv/joystick_osx.c b/dlls/winejoystick.drv/joystick_osx.c index bf82f67116..6f53477937 100644 --- a/dlls/winejoystick.drv/joystick_osx.c +++ b/dlls/winejoystick.drv/joystick_osx.c @@ -198,7 +198,7 @@ static const char* debugstr_cf(CFTypeRef t) if (!ret) { UniChar buf[200]; - int len = min(CFStringGetLength(s), sizeof(buf)/sizeof(buf[0])); + int len = min(CFStringGetLength(s), ARRAY_SIZE(buf)); CFStringGetCharacters(s, CFRangeMake(0, len), buf); ret = debugstr_wn(buf, len); } @@ -284,7 +284,7 @@ static CFDictionaryRef create_osx_device_match(int usage) if (values[0] && values[1]) { - result = CFDictionaryCreate(NULL, (const void**)keys, (const void**)values, sizeof(values) / sizeof(values[0]), + result = CFDictionaryCreate(NULL, (const void**)keys, (const void**)values, ARRAY_SIZE(values), &kCFCopyStringDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks); if (!result) @@ -293,7 +293,7 @@ static CFDictionaryRef create_osx_device_match(int usage) else ERR("CFNumberCreate failed.\n"); - for (i = 0; i < sizeof(values) / sizeof(values[0]); i++) + for (i = 0; i < ARRAY_SIZE(values); i++) if (values[i]) CFRelease(values[i]); return result; @@ -393,7 +393,7 @@ static int find_osx_devices(void) IOHIDManagerRef hid_manager; int usages[] = { kHIDUsage_GD_Joystick, kHIDUsage_GD_GamePad, kHIDUsage_GD_MultiAxisController }; int i; - CFDictionaryRef matching_dicts[sizeof(usages) / sizeof(usages[0])]; + CFDictionaryRef matching_dicts[ARRAY_SIZE(usages)]; CFArrayRef matching; CFSetRef devset; @@ -407,7 +407,7 @@ static int find_osx_devices(void) return 0; } - for (i = 0; i < sizeof(matching_dicts) / sizeof(matching_dicts[0]); i++) + for (i = 0; i < ARRAY_SIZE(matching_dicts); i++) { matching_dicts[i] = create_osx_device_match(usages[i]); if (!matching_dicts[i]) @@ -418,10 +418,10 @@ static int find_osx_devices(void) } } - matching = CFArrayCreate(NULL, (const void**)matching_dicts, sizeof(matching_dicts) / sizeof(matching_dicts[0]), + matching = CFArrayCreate(NULL, (const void**)matching_dicts, ARRAY_SIZE(matching_dicts), &kCFTypeArrayCallBacks); - for (i = 0; i < sizeof(matching_dicts) / sizeof(matching_dicts[0]); i++) + for (i = 0; i < ARRAY_SIZE(matching_dicts); i++) CFRelease(matching_dicts[i]); IOHIDManagerSetDeviceMatchingMultiple(hid_manager, matching); -- 2.14.4

2 1

[PATCH] msacm32: Use the ARRAY_SIZE() macro
by Michael Stefaniuc Aug. 10, 2018

Aug. 10, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msacm32/filter.c | 4 ++-- dlls/msacm32/format.c | 18 +++++++++--------- dlls/msacm32/internal.c | 14 +++++++------- dlls/msacm32/pcmconverter.c | 15 +++++++-------- dlls/msacm32/tests/msacm.c | 2 +- 5 files changed, 26 insertions(+), 27 deletions(-) diff --git a/dlls/msacm32/filter.c b/dlls/msacm32/filter.c index 53db82777d..8d5abced9d 100644 --- a/dlls/msacm32/filter.c +++ b/dlls/msacm32/filter.c @@ -361,8 +361,8 @@ MMRESULT WINAPI acmFilterTagDetailsW(HACMDRIVER had, PACMFILTERTAGDETAILSW paftd if (mmr == MMSYSERR_NOERROR && paftd->dwFilterTag == WAVE_FORMAT_PCM && paftd->szFilterTag[0] == 0) - MultiByteToWideChar( CP_ACP, 0, "PCM", -1, paftd->szFilterTag, - sizeof(paftd->szFilterTag)/sizeof(WCHAR) ); + MultiByteToWideChar(CP_ACP, 0, "PCM", -1, paftd->szFilterTag, + ARRAY_SIZE(paftd->szFilterTag)); return mmr; } diff --git a/dlls/msacm32/format.c b/dlls/msacm32/format.c index b3d2900393..fcc0d9b1c6 100644 --- a/dlls/msacm32/format.c +++ b/dlls/msacm32/format.c @@ -503,9 +503,9 @@ MMRESULT WINAPI acmFormatDetailsW(HACMDRIVER had, PACMFORMATDETAILSW pafd, DWORD wsprintfW(pafd->szFormat + lstrlenW(pafd->szFormat), fmt2, pafd->pwfx->wBitsPerSample); } - MultiByteToWideChar( CP_ACP, 0, (pafd->pwfx->nChannels == 1) ? "; Mono" : "; Stereo", -1, - pafd->szFormat + strlenW(pafd->szFormat), - sizeof(pafd->szFormat)/sizeof(WCHAR) - strlenW(pafd->szFormat) ); + MultiByteToWideChar(CP_ACP, 0, (pafd->pwfx->nChannels == 1) ? "; Mono" : "; Stereo", -1, + pafd->szFormat + strlenW(pafd->szFormat), + ARRAY_SIZE(pafd->szFormat) - strlenW(pafd->szFormat)); } TRACE("=> %d\n", mmr); @@ -929,8 +929,8 @@ MMRESULT WINAPI acmFormatTagDetailsW(HACMDRIVER had, PACMFORMATTAGDETAILSW paftd if (mmr == MMSYSERR_NOERROR && paftd->dwFormatTag == WAVE_FORMAT_PCM && paftd->szFormatTag[0] == 0) - MultiByteToWideChar( CP_ACP, 0, "PCM", -1, paftd->szFormatTag, - sizeof(paftd->szFormatTag)/sizeof(WCHAR) ); + MultiByteToWideChar(CP_ACP, 0, "PCM", -1, paftd->szFormatTag, + ARRAY_SIZE(paftd->szFormatTag)); return mmr; } @@ -1036,8 +1036,8 @@ MMRESULT WINAPI acmFormatTagEnumW(HACMDRIVER had, PACMFORMATTAGDETAILSW paftd, (LPARAM)paftd, ACM_FORMATTAGDETAILSF_INDEX) == MMSYSERR_NOERROR) { if (paftd->dwFormatTag == WAVE_FORMAT_PCM) { if (paftd->szFormatTag[0] == 0) - MultiByteToWideChar( CP_ACP, 0, "PCM", -1, paftd->szFormatTag, - sizeof(paftd->szFormatTag)/sizeof(WCHAR) ); + MultiByteToWideChar(CP_ACP, 0, "PCM", -1, paftd->szFormatTag, + ARRAY_SIZE(paftd->szFormatTag)); /* (WS) I'm preserving this PCM hack since it seems to be * correct. Please notice this block was borrowed from * below. @@ -1062,8 +1062,8 @@ MMRESULT WINAPI acmFormatTagEnumW(HACMDRIVER had, PACMFORMATTAGDETAILSW paftd, (LPARAM)paftd, ACM_FORMATTAGDETAILSF_INDEX) == MMSYSERR_NOERROR) { if (paftd->dwFormatTag == WAVE_FORMAT_PCM) { if (paftd->szFormatTag[0] == 0) - MultiByteToWideChar( CP_ACP, 0, "PCM", -1, paftd->szFormatTag, - sizeof(paftd->szFormatTag)/sizeof(WCHAR) ); + MultiByteToWideChar(CP_ACP, 0, "PCM", -1, paftd->szFormatTag, + ARRAY_SIZE(paftd->szFormatTag)); /* FIXME (EPP): I'm not sure this is the correct * algorithm (should make more sense to apply the same * for all already loaded formats, but this will do diff --git a/dlls/msacm32/internal.c b/dlls/msacm32/internal.c index 7bafcaad5e..aad071e8ad 100644 --- a/dlls/msacm32/internal.c +++ b/dlls/msacm32/internal.c @@ -72,7 +72,7 @@ PWINE_ACMDRIVERID MSACM_RegisterDriverFromRegistry(LPCWSTR pszRegEntry) /* The requested registry entry must have the format msacm.XXXXX in order to be recognized in any future sessions of msacm */ - if (0 == strncmpiW(pszRegEntry, msacmW, sizeof(msacmW)/sizeof(WCHAR))) { + if (0 == strncmpiW(pszRegEntry, msacmW, ARRAY_SIZE(msacmW))) { lRet = RegOpenKeyExW(HKEY_LOCAL_MACHINE, drvkey, 0, KEY_QUERY_VALUE, &hKey); if (lRet != ERROR_SUCCESS) { WARN("unable to open registry key - 0x%08x\n", lRet); @@ -373,31 +373,31 @@ void MSACM_RegisterAllDrivers(void) if (lRet == ERROR_SUCCESS) { RegQueryInfoKeyW( hKey, 0, 0, 0, &cnt, 0, 0, 0, 0, 0, 0, 0); for (i = 0; i < cnt; i++) { - bufLen = sizeof(buf) / sizeof(buf[0]); + bufLen = ARRAY_SIZE(buf); lRet = RegEnumKeyExW(hKey, i, buf, &bufLen, 0, 0, 0, &lastWrite); if (lRet != ERROR_SUCCESS) continue; - if (strncmpiW(buf, msacmW, sizeof(msacmW)/sizeof(msacmW[0]))) continue; + if (strncmpiW(buf, msacmW, ARRAY_SIZE(msacmW))) continue; if (!(name = strchrW(buf, '='))) continue; *name = 0; MSACM_RegisterDriver(buf, name + 1, 0); } i = 0; - cnt = sizeof(valname) / sizeof(*valname); + cnt = ARRAY_SIZE(valname); bufLen = sizeof(buf); while(RegEnumValueW(hKey, i, valname, &cnt, 0, &type, (BYTE*)buf, &bufLen) == ERROR_SUCCESS){ - if(!strncmpiW(valname, msacmW, sizeof(msacmW) / sizeof(*msacmW))) + if (!strncmpiW(valname, msacmW, ARRAY_SIZE(msacmW))) MSACM_RegisterDriver(valname, buf, 0); ++i; } RegCloseKey( hKey ); } - if (GetPrivateProfileSectionW(drv32, buf, sizeof(buf)/sizeof(buf[0]), sys)) + if (GetPrivateProfileSectionW(drv32, buf, ARRAY_SIZE(buf), sys)) { for(s = buf; *s; s += strlenW(s) + 1) { - if (strncmpiW(s, msacmW, sizeof(msacmW)/sizeof(msacmW[0]))) continue; + if (strncmpiW(s, msacmW, ARRAY_SIZE(msacmW))) continue; if (!(name = strchrW(s, '='))) continue; *name = 0; MSACM_RegisterDriver(s, name + 1, 0); diff --git a/dlls/msacm32/pcmconverter.c b/dlls/msacm32/pcmconverter.c index f26f125fcd..dc10f11e7a 100644 --- a/dlls/msacm32/pcmconverter.c +++ b/dlls/msacm32/pcmconverter.c @@ -984,14 +984,13 @@ static LRESULT PCM_DriverDetails(PACMDRIVERDETAILSW add) add->cFormatTags = 1; add->cFilterTags = 0; add->hicon = NULL; - MultiByteToWideChar( CP_ACP, 0, "MS-PCM", -1, - add->szShortName, sizeof(add->szShortName)/sizeof(WCHAR) ); - MultiByteToWideChar( CP_ACP, 0, "Wine PCM converter", -1, - add->szLongName, sizeof(add->szLongName)/sizeof(WCHAR) ); - MultiByteToWideChar( CP_ACP, 0, "Brought to you by the Wine team...", -1, - add->szCopyright, sizeof(add->szCopyright)/sizeof(WCHAR) ); - MultiByteToWideChar( CP_ACP, 0, "Refer to LICENSE file", -1, - add->szLicensing, sizeof(add->szLicensing)/sizeof(WCHAR) ); + MultiByteToWideChar(CP_ACP, 0, "MS-PCM", -1, add->szShortName, ARRAY_SIZE(add->szShortName)); + MultiByteToWideChar(CP_ACP, 0, "Wine PCM converter", -1, + add->szLongName, ARRAY_SIZE(add->szLongName)); + MultiByteToWideChar(CP_ACP, 0, "Brought to you by the Wine team...", -1, + add->szCopyright, ARRAY_SIZE(add->szCopyright)); + MultiByteToWideChar(CP_ACP, 0, "Refer to LICENSE file", -1, + add->szLicensing, ARRAY_SIZE(add->szLicensing) ); add->szFeatures[0] = 0; return MMSYSERR_NOERROR; diff --git a/dlls/msacm32/tests/msacm.c b/dlls/msacm32/tests/msacm.c index 959ec7f0c0..180639fa54 100644 --- a/dlls/msacm32/tests/msacm.c +++ b/dlls/msacm32/tests/msacm.c @@ -1106,7 +1106,7 @@ static void test_convert(void) MMRESULT mmr; unsigned i; - for (i = 0; i < sizeof(expected_output)/sizeof(struct stream_output); i++) + for (i = 0; i < ARRAY_SIZE(expected_output); i++) { mmr = acmStreamOpen(&has, NULL, (WAVEFORMATEX *)&expected_output[i].src, (WAVEFORMATEX *)&expected_output[i].dst, NULL, 0, 0, 0); ok(mmr == MMSYSERR_NOERROR, "#%d: open failed: 0x%x\n", i, mmr); -- 2.14.4

2 1

[PATCH] midimap: Use the ARRAY_SIZE() macro
by Michael Stefaniuc Aug. 10, 2018

Aug. 10, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/midimap/midimap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/midimap/midimap.c b/dlls/midimap/midimap.c index 1b35da7609..290300a55a 100644 --- a/dlls/midimap/midimap.c +++ b/dlls/midimap/midimap.c @@ -172,7 +172,7 @@ static BOOL MIDIMAP_LoadSettingsScheme(MIDIMAPDATA* mom, const WCHAR* scheme) return FALSE; } - for (idx = 0; !RegEnumKeyW(hKey, idx, buffer, sizeof(buffer)/sizeof(buffer[0])); idx++) + for (idx = 0; !RegEnumKeyW(hKey, idx, buffer, ARRAY_SIZE(buffer)); idx++) { if (RegOpenKeyW(hKey, buffer, &hPortKey)) continue; -- 2.14.4

2 1

[PATCH] mciwave: Use the ARRAY_SIZE() macro
by Michael Stefaniuc Aug. 10, 2018

Aug. 10, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mciwave/mciwave.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index fd4d6f6728..0fa9b204f8 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -427,7 +427,7 @@ static DWORD create_tmp_file(HMMIO* hFile, LPWSTR* pszTmpFileName) szPrefix[2] = 'I'; szPrefix[3] = '\0'; - if (!GetTempPathW(sizeof(szTmpPath)/sizeof(szTmpPath[0]), szTmpPath)) { + if (!GetTempPathW(ARRAY_SIZE(szTmpPath), szTmpPath)) { WARN("can't retrieve temp path!\n"); *pszTmpFileName = NULL; return MCIERR_FILE_NOT_FOUND; -- 2.14.4

2 1

[PATCH 1/2] quartz: Remove redundant if clause from WAVEParser_InputPin_PreConnect
by Alex Henrie Aug. 10, 2018

Aug. 10, 2018

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/quartz/waveparser.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/quartz/waveparser.c b/dlls/quartz/waveparser.c index 403c052db4..d8f349b35f 100644 --- a/dlls/quartz/waveparser.c +++ b/dlls/quartz/waveparser.c @@ -306,15 +306,12 @@ static HRESULT WAVEParser_InputPin_PreConnect(IPin * iface, IPin * pConnectPin, return E_FAIL; } - if (hr == S_OK) - { - pWAVEParser->StartOfFile = MEDIATIME_FROM_BYTES(pos + sizeof(RIFFCHUNK)); - pWAVEParser->EndOfFile = MEDIATIME_FROM_BYTES(pos + chunk.cb + sizeof(RIFFCHUNK)); - } - if (hr != S_OK) return E_FAIL; + pWAVEParser->StartOfFile = MEDIATIME_FROM_BYTES(pos + sizeof(RIFFCHUNK)); + pWAVEParser->EndOfFile = MEDIATIME_FROM_BYTES(pos + chunk.cb + sizeof(RIFFCHUNK)); + props->cbAlign = ((WAVEFORMATEX*)amt.pbFormat)->nBlockAlign; props->cbPrefix = 0; props->cbBuffer = 4096; -- 2.18.0

2 3

[PATCH] winepulse.drv: Use the ARRAY_SIZE() macro
by Michael Stefaniuc Aug. 10, 2018

Aug. 10, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 32f7acb91d..8d57f1a45a 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -469,7 +469,7 @@ static HRESULT pulse_connect(void) if (pulse_ctx) pa_context_unref(pulse_ctx); - GetModuleFileNameW(NULL, path, sizeof(path)/sizeof(*path)); + GetModuleFileNameW(NULL, path, ARRAY_SIZE(path)); name = strrchrW(path, '\\'); if (!name) name = path; @@ -537,7 +537,7 @@ static HRESULT pulse_test_connect(void) pa_mainloop_set_poll_func(pulse_ml, pulse_poll_func, NULL); - GetModuleFileNameW(NULL, path, sizeof(path)/sizeof(*path)); + GetModuleFileNameW(NULL, path, ARRAY_SIZE(path)); name = strrchrW(path, '\\'); if (!name) name = path; @@ -1283,7 +1283,7 @@ static HRESULT pulse_spec_from_waveformat(ACImpl *This, const WAVEFORMATEX *fmt) This->map.channels = fmt->nChannels; if (!mask || (mask & (SPEAKER_ALL|SPEAKER_RESERVED))) mask = get_channel_mask(fmt->nChannels); - for (j = 0; j < sizeof(pulse_pos_from_wfx)/sizeof(*pulse_pos_from_wfx) && i < fmt->nChannels; ++j) { + for (j = 0; j < ARRAY_SIZE(pulse_pos_from_wfx) && i < fmt->nChannels; ++j) { if (mask & (1 << j)) This->map.map[i++] = pulse_pos_from_wfx[j]; } -- 2.14.4

2 1

[PATCH] wineoss.drv: Use the ARRAY_SIZE() macro
by Michael Stefaniuc Aug. 10, 2018

Aug. 10, 2018

Not compile tested as I don't have a system with OSSv4. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wineoss.drv/midi.c | 12 +++++------- dlls/wineoss.drv/mmdevdrv.c | 7 +++---- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 3a2ab2580d..24b3e7037b 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -230,9 +230,8 @@ static LRESULT OSS_MidiInit(void) MidiOutDev[i].caps.wTechnology = MOD_MIDIPORT; MidiOutDev[i].bEnabled = FALSE; } else { - MultiByteToWideChar( CP_UNIXCP, 0, sinfo.name, -1, - MidiOutDev[i].caps.szPname, - sizeof(MidiOutDev[i].caps.szPname)/sizeof(WCHAR) ); + MultiByteToWideChar(CP_UNIXCP, 0, sinfo.name, -1, MidiOutDev[i].caps.szPname, + ARRAY_SIZE(MidiOutDev[i].caps.szPname)); MidiOutDev[i].caps.wTechnology = MIDI_UnixToWindowsDeviceType(sinfo.synth_type); if (MOD_MIDIPORT != MidiOutDev[i].caps.wTechnology) { @@ -313,7 +312,7 @@ static LRESULT OSS_MidiInit(void) } else { MultiByteToWideChar(CP_UNIXCP, 0, minfo.name, -1, MidiOutDev[numsynthdevs + i].caps.szPname, - sizeof(MidiOutDev[numsynthdevs + i].caps.szPname) / sizeof(WCHAR)); + ARRAY_SIZE(MidiOutDev[numsynthdevs + i].caps.szPname)); MidiOutDev[numsynthdevs + i].bEnabled = TRUE; } MidiOutDev[numsynthdevs + i].caps.wTechnology = MOD_MIDIPORT; @@ -338,9 +337,8 @@ static LRESULT OSS_MidiInit(void) wsprintfW(MidiInDev[i].caps.szPname, fmt, numsynthdevs + i); MidiInDev[i].state = -1; } else { - MultiByteToWideChar(CP_UNIXCP, 0, minfo.name, -1, - MidiInDev[i].caps.szPname, - sizeof(MidiInDev[i].caps.szPname) / sizeof(WCHAR)); + MultiByteToWideChar(CP_UNIXCP, 0, minfo.name, -1, MidiInDev[i].caps.szPname, + ARRAY_SIZE(MidiInDev[i].caps.szPname)); MidiInDev[i].state = 0; } MidiInDev[i].caps.dwSupport = 0; /* mandatory with MIDIINCAPS */ diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 1686c8c96c..fa3f885ea1 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -349,8 +349,7 @@ static void get_device_guid(EDataFlow flow, const char *device, GUID *guid) else key_name[0] = '0'; key_name[1] = ','; - MultiByteToWideChar(CP_UNIXCP, 0, device, -1, key_name + 2, - (sizeof(key_name) / sizeof(*key_name)) - 2); + MultiByteToWideChar(CP_UNIXCP, 0, device, -1, key_name + 2, ARRAY_SIZE(key_name) - 2); if(RegOpenKeyExW(HKEY_CURRENT_USER, drv_key_devicesW, 0, KEY_WRITE|KEY_READ, &key) == ERROR_SUCCESS){ if(RegOpenKeyExW(key, key_name, 0, KEY_READ, &dev_key) == ERROR_SUCCESS){ @@ -543,11 +542,11 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, GUID **guids, len = MultiByteToWideChar(CP_UNIXCP, 0, ai.name, -1, NULL, 0); if(flow == eRender){ prefix = outW; - prefix_len = (sizeof(outW) / sizeof(*outW)) - 1; + prefix_len = ARRAY_SIZE(outW) - 1; len += prefix_len; }else{ prefix = inW; - prefix_len = (sizeof(inW) / sizeof(*inW)) - 1; + prefix_len = ARRAY_SIZE(inW) - 1; len += prefix_len; } (*ids)[*num] = HeapAlloc(GetProcessHeap(), 0, -- 2.14.4

2 1

[PATCH] winealsa.drv: Use the ARRAY_SIZE() macro
by Michael Stefaniuc Aug. 10, 2018

Aug. 10, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winealsa.drv/midi.c | 10 ++++------ dlls/winealsa.drv/mmdevdrv.c | 11 +++++------ 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 6ef197681f..3d4d933ead 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -1177,9 +1177,8 @@ static void ALSA_AddMidiPort(snd_seq_client_info_t* cinfo, snd_seq_port_info_t* } else { lstrcpynA(midiPortName, snd_seq_port_info_get_name(pinfo), MAXPNAMELEN); } - MultiByteToWideChar(CP_UNIXCP, 0, midiPortName, -1, - MidiOutDev[MODM_NumDevs].caps.szPname, - sizeof(MidiOutDev[MODM_NumDevs].caps.szPname) / sizeof(WCHAR)); + MultiByteToWideChar(CP_UNIXCP, 0, midiPortName, -1, MidiOutDev[MODM_NumDevs].caps.szPname, + ARRAY_SIZE(MidiOutDev[MODM_NumDevs].caps.szPname)); MidiOutDev[MODM_NumDevs].caps.wTechnology = MIDI_AlsaToWindowsDeviceType(type); @@ -1244,9 +1243,8 @@ static void ALSA_AddMidiPort(snd_seq_client_info_t* cinfo, snd_seq_port_info_t* } else { lstrcpynA(midiPortName, snd_seq_port_info_get_name(pinfo), MAXPNAMELEN); } - MultiByteToWideChar(CP_UNIXCP, 0, midiPortName, -1, - MidiInDev[MIDM_NumDevs].caps.szPname, - sizeof(MidiInDev[MIDM_NumDevs].caps.szPname) / sizeof(WCHAR)); + MultiByteToWideChar(CP_UNIXCP, 0, midiPortName, -1, MidiInDev[MIDM_NumDevs].caps.szPname, + ARRAY_SIZE(MidiInDev[MIDM_NumDevs].caps.szPname)); MidiInDev[MIDM_NumDevs].state = 0; TRACE("MidiIn [%d]\tname='%s' support=%d\n" diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index b285705509..de89fd05c5 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -311,8 +311,7 @@ static void get_device_guid(EDataFlow flow, const char *device, GUID *guid) else key_name[0] = '0'; key_name[1] = ','; - MultiByteToWideChar(CP_UNIXCP, 0, device, -1, key_name + 2, - (sizeof(key_name) / sizeof(*key_name)) - 2); + MultiByteToWideChar(CP_UNIXCP, 0, device, -1, key_name + 2, ARRAY_SIZE(key_name) - 2); if(RegOpenKeyExW(HKEY_CURRENT_USER, drv_key_devicesW, 0, KEY_WRITE|KEY_READ, &key) == ERROR_SUCCESS){ if(RegOpenKeyExW(key, key_name, 0, KEY_READ, &dev_key) == ERROR_SUCCESS){ @@ -362,17 +361,17 @@ static WCHAR *construct_device_id(EDataFlow flow, const WCHAR *chunk1, const cha DWORD len_wchars = 0, chunk1_len = 0, copied = 0, prefix_len; static const WCHAR dashW[] = {' ','-',' ',0}; - static const size_t dashW_len = (sizeof(dashW) / sizeof(*dashW)) - 1; + static const size_t dashW_len = ARRAY_SIZE(dashW) - 1; static const WCHAR outW[] = {'O','u','t',':',' ',0}; static const WCHAR inW[] = {'I','n',':',' ',0}; if(flow == eRender){ prefix = outW; - prefix_len = (sizeof(outW) / sizeof(*outW)) - 1; + prefix_len = ARRAY_SIZE(outW) - 1; len_wchars += prefix_len; }else{ prefix = inW; - prefix_len = (sizeof(inW) / sizeof(*inW)) - 1; + prefix_len = ARRAY_SIZE(inW) - 1; len_wchars += prefix_len; } if(chunk1){ @@ -724,7 +723,7 @@ static BOOL get_alsa_name_by_guid(GUID *guid, char *name, DWORD name_size, EData DWORD size, type; GUID reg_guid; - key_name_size = sizeof(key_name)/sizeof(WCHAR); + key_name_size = ARRAY_SIZE(key_name); if(RegEnumKeyExW(devices_key, i++, key_name, &key_name_size, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) break; -- 2.14.4

2 1