- wine-devel - winehq.org

Trivial bug in wine-staging xaudio2_7-WMA_support
by Olivier F. R. Dierick 25 Jul '18

25 Jul '18

Hello, I found a trivial bug in one of your staged patch set while trying to configure wine-staging on Debian 8 Jessie: Debian 8 Jessie doesn't ship a libavcodec-dev package that provides avcodec_send_packet(), so configure prints the "libavcodec not found or too old" notice. The option --without-ffmpeg disables the check but not the notice. In xaudio2_7-WMA_support / 0001-xaudio2-Use-ffmpeg-to-convert-WMA-formats.patch Line 69: WINE_NOTICE_WITH(libavcodec, ... should be: WINE_NOTICE_WITH(ffmpeg, ... With this change the notice is disabled when using --without-ffmpeg. I don't think it deserves a bug report. Regards, -- Olivier F. R. Dierick o.dierick(a)piezo-forte.be

2 1

[PATCH] wine.inf: Add "Sources" key.
by Gijs Vermeulen 24 Jul '18

24 Jul '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44981 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 9a76509983..777428900f 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -3416,6 +3416,7 @@ HKLM,%CurrentVersionNT%\SvcHost,"netsvcs",0x00010008,"Schedule" HKLM,%CurrentVersion%\RunServices,"winemenubuilder",2,"%11%\winemenubuilder.exe -a -r" HKLM,"System\CurrentControlSet\Services\Eventlog\Application",,16 HKLM,"System\CurrentControlSet\Services\Eventlog\System",,16 +HKLM,"System\CurrentControlSet\Services\Eventlog\System","Sources",0x10000,"" HKLM,"System\CurrentControlSet\Services\Tcpip\Parameters",,16 HKLM,"System\CurrentControlSet\Services\VxD\MSTCP",,16 HKLM,"System\CurrentControlSet\Services\Winsock\Parameters",,16 -- 2.13.7

1 0

[PATCH] windowscodecs: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 24 Jul '18

24 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/windowscodecs/bitmap.c | 2 +- dlls/windowscodecs/bmpencode.c | 2 +- dlls/windowscodecs/jpegformat.c | 2 +- dlls/windowscodecs/metadataquery.c | 10 +++++----- dlls/windowscodecs/pngformat.c | 4 ++-- dlls/windowscodecs/tiffformat.c | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/windowscodecs/bitmap.c b/dlls/windowscodecs/bitmap.c index f8414962f2..116fd3134a 100644 --- a/dlls/windowscodecs/bitmap.c +++ b/dlls/windowscodecs/bitmap.c @@ -555,7 +555,7 @@ static HRESULT WINAPI IMILBitmapImpl_GetPixelFormat(IMILBitmapSource *iface, *format = 0; - for (i = 0; i < sizeof(pixel_fmt_map)/sizeof(pixel_fmt_map[0]); i++) + for (i = 0; i < ARRAY_SIZE(pixel_fmt_map); i++) { if (IsEqualGUID(pixel_fmt_map[i].WIC_format, &This->pixelformat)) { diff --git a/dlls/windowscodecs/bmpencode.c b/dlls/windowscodecs/bmpencode.c index 97f30d7197..aa65675a98 100644 --- a/dlls/windowscodecs/bmpencode.c +++ b/dlls/windowscodecs/bmpencode.c @@ -529,7 +529,7 @@ static HRESULT WINAPI BmpEncoder_CreateNewFrame(IWICBitmapEncoder *iface, if (ppIEncoderOptions) { - hr = CreatePropertyBag2(opts, sizeof(opts)/sizeof(opts[0]), ppIEncoderOptions); + hr = CreatePropertyBag2(opts, ARRAY_SIZE(opts), ppIEncoderOptions); if (FAILED(hr)) return hr; } diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index f05663f070..d24af6dc9e 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -1463,7 +1463,7 @@ static HRESULT WINAPI JpegEncoder_CreateNewFrame(IWICBitmapEncoder *iface, if (ppIEncoderOptions) { - hr = CreatePropertyBag2(opts, sizeof(opts)/sizeof(opts[0]), ppIEncoderOptions); + hr = CreatePropertyBag2(opts, ARRAY_SIZE(opts), ppIEncoderOptions); if (FAILED(hr)) { LeaveCriticalSection(&This->lock); diff --git a/dlls/windowscodecs/metadataquery.c b/dlls/windowscodecs/metadataquery.c index e33884881b..2d7c918921 100644 --- a/dlls/windowscodecs/metadataquery.c +++ b/dlls/windowscodecs/metadataquery.c @@ -164,7 +164,7 @@ static VARTYPE map_type(struct string_t *str) { UINT i; - for (i = 0; i < sizeof(str2vt)/sizeof(str2vt[0]); i++) + for (i = 0; i < ARRAY_SIZE(str2vt); i++) { if (str2vt[i].len == str->len) { @@ -743,7 +743,7 @@ HRESULT WINAPI WICMapGuidToShortName(REFGUID guid, UINT len, WCHAR *name, UINT * if (!guid) return E_INVALIDARG; - for (i = 0; i < sizeof(guid2name)/sizeof(guid2name[0]); i++) + for (i = 0; i < ARRAY_SIZE(guid2name); i++) { if (IsEqualGUID(guid, guid2name[i].guid)) { @@ -774,7 +774,7 @@ HRESULT WINAPI WICMapShortNameToGuid(PCWSTR name, GUID *guid) if (!name || !guid) return E_INVALIDARG; - for (i = 0; i < sizeof(guid2name)/sizeof(guid2name[0]); i++) + for (i = 0; i < ARRAY_SIZE(guid2name); i++) { if (!lstrcmpiW(name, guid2name[i].name)) { @@ -884,7 +884,7 @@ static const WCHAR *map_shortname_to_schema(const GUID *format, const WCHAR *nam !IsEqualGUID(format, &GUID_MetadataFormatXMPStruct)) return NULL; - for (i = 0; i < sizeof(name2schema)/sizeof(name2schema[0]); i++) + for (i = 0; i < ARRAY_SIZE(name2schema); i++) { if (!lstrcmpW(name2schema[i].name, name)) return name2schema[i].schema; @@ -909,7 +909,7 @@ HRESULT WINAPI WICMapSchemaToName(REFGUID format, LPWSTR schema, UINT len, WCHAR !IsEqualGUID(format, &GUID_MetadataFormatXMPStruct)) return WINCODEC_ERR_PROPERTYNOTFOUND; - for (i = 0; i < sizeof(name2schema)/sizeof(name2schema[0]); i++) + for (i = 0; i < ARRAY_SIZE(name2schema); i++) { if (!lstrcmpW(name2schema[i].schema, schema)) { diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index fd0d197bb3..6b13112130 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -1441,7 +1441,7 @@ static HRESULT WINAPI PngFrameEncode_Initialize(IWICBitmapFrameEncode *iface, if (pIEncoderOptions) { - hr = IPropertyBag2_Read(pIEncoderOptions, sizeof(opts)/sizeof(opts[0]), opts, NULL, opt_values, opt_hres); + hr = IPropertyBag2_Read(pIEncoderOptions, ARRAY_SIZE(opts), opts, NULL, opt_values, opt_hres); if (FAILED(hr)) return hr; @@ -2046,7 +2046,7 @@ static HRESULT WINAPI PngEncoder_CreateNewFrame(IWICBitmapEncoder *iface, if (ppIEncoderOptions) { - hr = CreatePropertyBag2(opts, sizeof(opts)/sizeof(opts[0]), ppIEncoderOptions); + hr = CreatePropertyBag2(opts, ARRAY_SIZE(opts), ppIEncoderOptions); if (FAILED(hr)) { LeaveCriticalSection(&This->lock); diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 2b2f84f859..966ab3eb4b 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -1956,7 +1956,7 @@ static HRESULT WINAPI TiffEncoder_CreateNewFrame(IWICBitmapEncoder *iface, if (ppIEncoderOptions && SUCCEEDED(hr)) { - hr = CreatePropertyBag2(opts, sizeof(opts)/sizeof(opts[0]), ppIEncoderOptions); + hr = CreatePropertyBag2(opts, ARRAY_SIZE(opts), ppIEncoderOptions); if (SUCCEEDED(hr)) { VARIANT v; -- 2.14.4

2 1

[PATCH v2] sfnt2fon: Prevent reading past allocated buffer
by janisozaur＠gmail.com 24 Jul '18

24 Jul '18

From: Michał Janiszewski <janisozaur(a)gmail.com> Some fonts (e.g. Courier) may cause sfnt2fon try reading past end of heap-allocated buffer. Rather than reading from uninitialised memory, return 0 in such case. Visual tests on .fon render of this font (using FontForge) shown no artifacts. This should fix Bug 45422 v2: - Improve C89 compatibility - Use cached index for both left and right bytes --- tools/sfnt2fon/sfnt2fon.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tools/sfnt2fon/sfnt2fon.c b/tools/sfnt2fon/sfnt2fon.c index 25f0763872..0f788da7e1 100644 --- a/tools/sfnt2fon/sfnt2fon.c +++ b/tools/sfnt2fon/sfnt2fon.c @@ -554,6 +554,7 @@ static struct fontinfo *fill_fontinfo( const char *face_name, int ppem, int enc, for(x = 0; x < ((info->dfCharTable[i].width + 7) / 8); x++) { for(y = 0; y < ppem; y++) { + int idx, x_limit; if(y < ascent - face->glyph->bitmap_top || y >= face->glyph->bitmap.rows + ascent - face->glyph->bitmap_top) { info->data[data_pos++] = 0; @@ -565,16 +566,19 @@ static struct fontinfo *fill_fontinfo( const char *face_name, int ppem, int enc, info->data[data_pos++] = 0; continue; } + idx = (y - (ascent - face->glyph->bitmap_top)) * face->glyph->bitmap.pitch + x - x_off; if(x == x_off) left_byte = 0; else - left_byte = face->glyph->bitmap.buffer[(y - (ascent - face->glyph->bitmap_top)) * face->glyph->bitmap.pitch + x - x_off - 1]; + left_byte = face->glyph->bitmap.buffer[idx - 1]; + /* FreeType allocates that many bytes for bitmap, but some fonts (e.g. Courier) might try reading past the buffer */ + x_limit = face->glyph->bitmap.rows * face->glyph->bitmap.pitch; /* On the last non-trivial output byte (x == x_end) have we got one or two input bytes */ - if(x == x_end && (face->glyph->bitmap_left % 8 != 0) && ((face->glyph->bitmap.width % 8 == 0) || (x != (((face->glyph->bitmap.width) & ~0x7) + face->glyph->bitmap_left) / 8))) + if((idx >= x_limit) || (x == x_end && (face->glyph->bitmap_left % 8 != 0) && ((face->glyph->bitmap.width % 8 == 0) || (x != (((face->glyph->bitmap.width) & ~0x7) + face->glyph->bitmap_left) / 8)))) right_byte = 0; else - right_byte = face->glyph->bitmap.buffer[(y - (ascent - face->glyph->bitmap_top)) * face->glyph->bitmap.pitch + x - x_off]; + right_byte = face->glyph->bitmap.buffer[idx]; byte = (left_byte << (8 - (face->glyph->bitmap_left & 7))) & 0xff; byte |= ((right_byte >> (face->glyph->bitmap_left & 7)) & 0xff); -- 2.18.0

1 0

[PATCH] mountmgr.sys: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 24 Jul '18

24 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mountmgr.sys/device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index 1437bfc853..f96b05e4da 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -658,7 +658,7 @@ static void create_drive_devices(void) if (!RegQueryValueExW( drives_key, driveW, NULL, &type, (BYTE *)buffer, &size ) && type == REG_SZ) { - for (j = 0; j < sizeof(drive_types)/sizeof(drive_types[0]); j++) + for (j = 0; j < ARRAY_SIZE(drive_types); j++) if (drive_types[j][0] && !strcmpiW( buffer, drive_types[j] )) { drive_type = j; @@ -1123,7 +1123,7 @@ static void create_port_devices( DRIVER_OBJECT *driver ) p[1] = 'o'; p[2] = 'm'; search_paths = serial_search_paths; - num_search_paths = sizeof(serial_search_paths)/sizeof(serial_search_paths[0]); + num_search_paths = ARRAY_SIZE(serial_search_paths); windows_ports_key_name = serialcomm_keyW; } else @@ -1132,7 +1132,7 @@ static void create_port_devices( DRIVER_OBJECT *driver ) p[1] = 'p'; p[2] = 't'; search_paths = parallel_search_paths; - num_search_paths = sizeof(parallel_search_paths)/sizeof(parallel_search_paths[0]); + num_search_paths = ARRAY_SIZE(parallel_search_paths); windows_ports_key_name = parallel_ports_keyW; } p += 3; -- 2.14.4

1 0

[PATCH] winetest: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 24 Jul '18

24 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winetest/gui.c | 2 +- programs/winetest/main.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/winetest/gui.c b/programs/winetest/gui.c index 2948d7e1ad..bda00f3707 100644 --- a/programs/winetest/gui.c +++ b/programs/winetest/gui.c @@ -547,7 +547,7 @@ report (enum report_type t, ...) } va_start (ap, t); - if (t < sizeof text_funcs / sizeof text_funcs[0]) ret = funcs[t](ap); + if (t < ARRAY_SIZE(text_funcs)) ret = funcs[t](ap); else report (R_WARNING, "unimplemented report type: %d", t); va_end (ap); return ret; diff --git a/programs/winetest/main.c b/programs/winetest/main.c index b3c3c1c850..56044095f3 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -461,7 +461,7 @@ static void print_language(void) if (pGetSystemPreferredUILanguages && !running_under_wine()) { WCHAR langW[32]; - ULONG num, size = sizeof(langW)/sizeof(langW[0]); + ULONG num, size = ARRAY_SIZE(langW); if (pGetSystemPreferredUILanguages(MUI_LANGUAGE_ID, &num, langW, &size)) { char lang[32], *p = lang; @@ -1263,7 +1263,7 @@ int main( int argc, char *argv[] ) exit (0); } else if ((argv[i][0] != '-' && argv[i][0] != '/') || argv[i][2]) { - if (nb_filters == sizeof(filters)/sizeof(filters[0])) + if (nb_filters == ARRAY_SIZE(filters)) { report (R_ERROR, "Too many test filters specified"); exit (2); -- 2.14.4

1 0

[PATCH] wordpad: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 24 Jul '18

24 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/wordpad/wordpad.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 904867f617..1ced34c7ff 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -250,7 +250,7 @@ static void set_caption(LPCWSTR wszNewFileName) memcpy(wszCaption, wszNewFileName, lstrlenW(wszNewFileName)*sizeof(WCHAR)); length += lstrlenW(wszNewFileName); memcpy(wszCaption + length, wszSeparator, sizeof(wszSeparator)); - length += sizeof(wszSeparator) / sizeof(WCHAR); + length += ARRAY_SIZE(wszSeparator); memcpy(wszCaption + length, wszAppTitle, sizeof(wszAppTitle)); SetWindowTextW(hMainWnd, wszCaption); @@ -398,7 +398,7 @@ static void populate_size_list(HWND hSizeListWnd) GetDeviceCaps(hdc, LOGPIXELSY))); } else { - for(i = 0; i < sizeof(choices)/sizeof(choices[0]); i++) + for(i = 0; i < ARRAY_SIZE(choices); i++) add_size(hSizeListWnd, choices[i]); } @@ -1124,7 +1124,7 @@ static void dialog_viewproperties(void) psp[0].lParam = reg_formatindex(SF_TEXT); psp[0].pfnCallback = NULL; psp[0].pszTitle = MAKEINTRESOURCEW(STRING_VIEWPROPS_TEXT); - for(i = 1; i < sizeof(psp)/sizeof(psp[0]); i++) + for(i = 1; i < ARRAY_SIZE(psp); i++) { psp[i].dwSize = psp[0].dwSize; psp[i].dwFlags = psp[0].dwFlags; @@ -1141,7 +1141,7 @@ static void dialog_viewproperties(void) psh.hwndParent = hMainWnd; psh.hInstance = hInstance; psh.pszCaption = MAKEINTRESOURCEW(STRING_VIEWPROPS_TITLE); - psh.nPages = sizeof(psp)/sizeof(psp[0]); + psh.nPages = ARRAY_SIZE(psp); U3(psh).ppsp = ppsp; U(psh).pszIcon = MAKEINTRESOURCEW(IDI_WORDPAD); @@ -1235,7 +1235,7 @@ static LRESULT handle_findmsg(LPFINDREPLACEW pFr) if (pFr->lpstrFindWhat != custom_data->findBuffer) { lstrcpynW(custom_data->findBuffer, pFr->lpstrFindWhat, - sizeof(custom_data->findBuffer) / sizeof(WCHAR)); + ARRAY_SIZE(custom_data->findBuffer)); pFr->lpstrFindWhat = custom_data->findBuffer; } @@ -1885,8 +1885,8 @@ static LRESULT OnCreate( HWND hWnd ) font = (HFONT)SendMessageW(hFontListWnd, WM_GETFONT, 0, 0); hdc = GetDC(hFontListWnd); font = SelectObject(hdc, font); - GetTextExtentPointW(hdc, font_text, sizeof(font_text) / sizeof(font_text[0]) - 1, &name_sz); - GetTextExtentPointW(hdc, size_text, sizeof(size_text) / sizeof(size_text[0]) - 1, &size_sz); + GetTextExtentPointW(hdc, font_text, ARRAY_SIZE(font_text) - 1, &name_sz); + GetTextExtentPointW(hdc, size_text, ARRAY_SIZE(size_text) - 1, &size_sz); font = SelectObject(hdc, font); ReleaseDC(hFontListWnd, hdc); rbb.hwndChild = hFontListWnd; -- 2.14.4

1 0

[PATCH] wineboot: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 24 Jul '18

24 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/wineboot/wineboot.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 2a65b9e8b3..17ef9cbcca 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -401,7 +401,7 @@ static void create_volatile_environment_registry_key(void) set_reg_value( hkey, HomeDriveW, path ); } - size = sizeof(path)/sizeof(path[0]); + size = ARRAY_SIZE(path); if (GetUserNameW( path, &size )) set_reg_value( hkey, UserNameW, path ); set_reg_value( hkey, HomeShareW, EmptyW ); @@ -410,7 +410,7 @@ static void create_volatile_environment_registry_key(void) if (SUCCEEDED(hr)) set_reg_value( hkey, LocalAppDataW, path ); - size = (sizeof(computername)/sizeof(WCHAR)) - 2; + size = ARRAY_SIZE(computername) - 2; if (GetComputerNameW(&computername[2], &size)) { set_reg_value( hkey, UserDomainW, &computername[2] ); @@ -433,7 +433,7 @@ static BOOL wininit(void) static const WCHAR wininitbakW[] = {'w','i','n','i','n','i','t','.','b','a','k',0}; WCHAR initial_buffer[1024]; WCHAR *str, *buffer = initial_buffer; - DWORD size = sizeof(initial_buffer)/sizeof(WCHAR); + DWORD size = ARRAY_SIZE(initial_buffer); DWORD res; for (;;) @@ -948,7 +948,7 @@ static HANDLE start_rundll32( const char *inf_path, BOOL wow64 ) static const WCHAR wowinstall[] = {' ','W','o','w','6','4','I','n','s','t','a','l','l',0}; static const WCHAR inf[] = {' ','1','2','8',' ','\\','\\','?','\\','u','n','i','x',0 }; - WCHAR app[MAX_PATH + sizeof(rundll)/sizeof(WCHAR)]; + WCHAR app[MAX_PATH + ARRAY_SIZE(rundll)]; STARTUPINFOW si; PROCESS_INFORMATION pi; WCHAR *buffer; -- 2.14.4

1 0

[PATCH] uninstaller: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 24 Jul '18

24 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/uninstaller/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/uninstaller/main.c b/programs/uninstaller/main.c index 736593e27d..142d3d16f7 100644 --- a/programs/uninstaller/main.c +++ b/programs/uninstaller/main.c @@ -102,7 +102,7 @@ static void WINAPIV output_message(unsigned int id, ...) WCHAR fmt[1024]; __ms_va_list va_args; - if (!LoadStringW(GetModuleHandleW(NULL), id, fmt, sizeof(fmt)/sizeof(fmt[0]))) + if (!LoadStringW(GetModuleHandleW(NULL), id, fmt, ARRAY_SIZE(fmt))) { WINE_FIXME("LoadString failed with %d\n", GetLastError()); return; @@ -342,8 +342,8 @@ static void UninstallProgram(void) WCHAR sUninstallFailed[MAX_STRING_LEN]; HINSTANCE hInst = GetModuleHandleW(0); - LoadStringW(hInst, IDS_APPNAME, sAppName, sizeof(sAppName)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_UNINSTALLFAILED, sUninstallFailed, sizeof(sUninstallFailed)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_APPNAME, sAppName, ARRAY_SIZE(sAppName)); + LoadStringW(hInst, IDS_UNINSTALLFAILED, sUninstallFailed, ARRAY_SIZE(sUninstallFailed)); wsprintfW(errormsg, sUninstallFailed, entries[i].command); if(MessageBoxW(0, errormsg, sAppName, MB_YESNO | MB_ICONQUESTION)==IDYES) { -- 2.14.4

1 0

[PATCH] sfnt2fon: Prevent reading past allocated buffer
by janisozaur＠gmail.com 24 Jul '18

24 Jul '18

From: Michał Janiszewski <janisozaur(a)gmail.com> Some fonts (e.g. Courier) may cause sfnt2fon try reading past end of heap-allocated buffer. Rather than reading from uninitialised memory, return 0 in such case. Visual tests on .fon render of this font (using FontForge) shown no artifacts. --- tools/sfnt2fon/sfnt2fon.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/sfnt2fon/sfnt2fon.c b/tools/sfnt2fon/sfnt2fon.c index 25f0763872..fb125bbeaf 100644 --- a/tools/sfnt2fon/sfnt2fon.c +++ b/tools/sfnt2fon/sfnt2fon.c @@ -570,11 +570,14 @@ static struct fontinfo *fill_fontinfo( const char *face_name, int ppem, int enc, else left_byte = face->glyph->bitmap.buffer[(y - (ascent - face->glyph->bitmap_top)) * face->glyph->bitmap.pitch + x - x_off - 1]; + int x_idx = (y - (ascent - face->glyph->bitmap_top)) * face->glyph->bitmap.pitch + x - x_off; + // FreeType allocates that many bytes for bitmap, but some fonts (e.g. Courier) might try reading past the buffer + int x_limit = face->glyph->bitmap.rows * face->glyph->bitmap.pitch; /* On the last non-trivial output byte (x == x_end) have we got one or two input bytes */ - if(x == x_end && (face->glyph->bitmap_left % 8 != 0) && ((face->glyph->bitmap.width % 8 == 0) || (x != (((face->glyph->bitmap.width) & ~0x7) + face->glyph->bitmap_left) / 8))) + if((x_idx >= x_limit) || (x == x_end && (face->glyph->bitmap_left % 8 != 0) && ((face->glyph->bitmap.width % 8 == 0) || (x != (((face->glyph->bitmap.width) & ~0x7) + face->glyph->bitmap_left) / 8)))) right_byte = 0; else - right_byte = face->glyph->bitmap.buffer[(y - (ascent - face->glyph->bitmap_top)) * face->glyph->bitmap.pitch + x - x_off]; + right_byte = face->glyph->bitmap.buffer[x_idx]; byte = (left_byte << (8 - (face->glyph->bitmap_left & 7))) & 0xff; byte |= ((right_byte >> (face->glyph->bitmap_left & 7)) & 0xff); -- 2.18.0

2 1

[PATCH v3] dsound: Correctly calculate angle between vectors with equal and opposite directions
by Andrew Eikum 24 Jul '18

24 Jul '18

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- v3: With suggestion from Ruslan. dlls/dsound/sound3d.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c index 03fd3d4678..118bb60456 100644 --- a/dlls/dsound/sound3d.c +++ b/dlls/dsound/sound3d.c @@ -111,7 +111,13 @@ static inline D3DVALUE AngleBetweenVectorsRad (const D3DVECTOR *a, const D3DVECT return 0; cos = product/(la*lb); - angle = acos(cos); + if(cos > 1.f){ + angle = 0; + }else if(cos < -1.f){ + angle = M_PI; + }else{ + angle = acos(cos); + } TRACE("angle between (%f,%f,%f) and (%f,%f,%f) = %f radians (%f degrees)\n", a->x, a->y, a->z, b->x, b->y, b->z, angle, RadToDeg(angle)); return angle; -- 2.18.0

1 0

[PATCH v2] dsound: Correctly calculate angle between vectors with equal and opposite directions
by Andrew Eikum 24 Jul '18

24 Jul '18

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- v2: Remove old calculation, thanks Nikolay. dlls/dsound/sound3d.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c index 03fd3d4678..6ca79c1bbc 100644 --- a/dlls/dsound/sound3d.c +++ b/dlls/dsound/sound3d.c @@ -111,7 +111,13 @@ static inline D3DVALUE AngleBetweenVectorsRad (const D3DVECTOR *a, const D3DVECT return 0; cos = product/(la*lb); - angle = acos(cos); + if(fabs(1 - cos) < 0.0001f){ + angle = 0; + }else if(fabs(-1 - cos) < 0.0001f){ + angle = M_PI; + }else{ + angle = acos(cos); + } TRACE("angle between (%f,%f,%f) and (%f,%f,%f) = %f radians (%f degrees)\n", a->x, a->y, a->z, b->x, b->y, b->z, angle, RadToDeg(angle)); return angle; -- 2.18.0

2 4

[PATCH 2/2] winevulkan: Mark ICD and thunking functions as private.
by Jacek Caban 24 Jul '18

24 Jul '18

We don't need them in importlib. We use them only for vulkan-1 forwarding, which doesn't need an importlib. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winevulkan/make_vulkan | 6 +- dlls/winevulkan/winevulkan.spec | 360 ++++++++++++++++++++-------------------- 2 files changed, 183 insertions(+), 183 deletions(-)

1 0

[PATCH] strmbase: Remove unused function
by janisozaur＠gmail.com 24 Jul '18

24 Jul '18

From: Michał Janiszewski <janisozaur(a)gmail.com> Signed-off-by: Michał Janiszewski <janisozaur(a)gmail.com> --- dlls/strmbase/transform.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index 4d7069d19a..8419b90931 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -51,11 +51,6 @@ static inline BaseInputPin *impl_BaseInputPin_from_BasePin( BasePin *iface ) return CONTAINING_RECORD(iface, BaseInputPin, pin); } -static inline BasePin *impl_BasePin_from_IPin( IPin *iface ) -{ - return CONTAINING_RECORD(iface, BasePin, IPin_iface); -} - static inline BaseInputPin *impl_BaseInputPin_from_IPin( IPin *iface ) { return CONTAINING_RECORD(iface, BaseInputPin, pin.IPin_iface); -- 2.18.0

1 0

[PATCH] ipconfig: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 23 Jul '18

23 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/ipconfig/ipconfig.c | 40 ++++++++++++++++++---------------------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/programs/ipconfig/ipconfig.c b/programs/ipconfig/ipconfig.c index 936dfa2ea8..4370a28a44 100644 --- a/programs/ipconfig/ipconfig.c +++ b/programs/ipconfig/ipconfig.c @@ -35,7 +35,7 @@ static int ipconfig_vprintfW(const WCHAR *msg, __ms_va_list va_args) WCHAR msg_buffer[8192]; wlen = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, msg, 0, 0, msg_buffer, - sizeof(msg_buffer)/sizeof(*msg_buffer), &va_args); + ARRAY_SIZE(msg_buffer), &va_args); ret = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), msg_buffer, wlen, &count, NULL); if (!ret) @@ -80,8 +80,7 @@ static int WINAPIV ipconfig_message_printfW(int msg, ...) WCHAR msg_buffer[8192]; int len; - LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer, - sizeof(msg_buffer)/sizeof(WCHAR)); + LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer, ARRAY_SIZE(msg_buffer)); __ms_va_start(va_args, msg); len = ipconfig_vprintfW(msg_buffer, va_args); @@ -95,8 +94,7 @@ static int ipconfig_message(int msg) static const WCHAR formatW[] = {'%','1',0}; WCHAR msg_buffer[8192]; - LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer, - sizeof(msg_buffer)/sizeof(WCHAR)); + LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer, ARRAY_SIZE(msg_buffer)); return ipconfig_printfW(formatW, msg_buffer); } @@ -118,8 +116,7 @@ static const WCHAR *iftype_to_string(DWORD type) msg = STRING_UNKNOWN; } - LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer, - sizeof(msg_buffer)/sizeof(WCHAR)); + LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer, ARRAY_SIZE(msg_buffer)); return msg_buffer; } @@ -130,10 +127,10 @@ static void print_field(int msg, const WCHAR *value) WCHAR field[] = {'.',' ','.',' ','.',' ','.',' ','.',' ','.',' ','.',' ','.',' ','.', ' ','.',' ','.',' ','.',' ','.',' ','.',' ','.',' ','.',' ','.',' ',0}; - WCHAR name_buffer[sizeof(field)/sizeof(WCHAR)]; + WCHAR name_buffer[ARRAY_SIZE(field)]; - LoadStringW(GetModuleHandleW(NULL), msg, name_buffer, sizeof(name_buffer)/sizeof(WCHAR)); - memcpy(field, name_buffer, sizeof(WCHAR) * min(strlenW(name_buffer), sizeof(field)/sizeof(WCHAR) - 1)); + LoadStringW(GetModuleHandleW(NULL), msg, name_buffer, ARRAY_SIZE(name_buffer)); + memcpy(field, name_buffer, sizeof(WCHAR) * min(strlenW(name_buffer), ARRAY_SIZE(field) - 1)); ipconfig_printfW(formatW, field, value); } @@ -189,22 +186,22 @@ static void print_basic_information(void) for (addr = p->FirstUnicastAddress; addr; addr = addr->Next) { if (addr->Address.lpSockaddr->sa_family == AF_INET && - socket_address_to_string(addr_buf, sizeof(addr_buf)/sizeof(WCHAR), &addr->Address)) + socket_address_to_string(addr_buf, ARRAY_SIZE(addr_buf), &addr->Address)) print_field(STRING_IP_ADDRESS, addr_buf); else if (addr->Address.lpSockaddr->sa_family == AF_INET6 && - socket_address_to_string(addr_buf, sizeof(addr_buf)/sizeof(WCHAR), &addr->Address)) + socket_address_to_string(addr_buf, ARRAY_SIZE(addr_buf), &addr->Address)) print_field(STRING_IP6_ADDRESS, addr_buf); /* FIXME: Output corresponding subnet mask. */ } if (p->FirstGatewayAddress) { - if (socket_address_to_string(addr_buf, sizeof(addr_buf)/sizeof(WCHAR), &p->FirstGatewayAddress->Address)) + if (socket_address_to_string(addr_buf, ARRAY_SIZE(addr_buf), &p->FirstGatewayAddress->Address)) print_field(STRING_DEFAULT_GATEWAY, addr_buf); for (gateway = p->FirstGatewayAddress->Next; gateway; gateway = gateway->Next) { - if (socket_address_to_string(addr_buf, sizeof(addr_buf)/sizeof(WCHAR), &gateway->Address)) + if (socket_address_to_string(addr_buf, ARRAY_SIZE(addr_buf), &gateway->Address)) print_value(addr_buf); } } @@ -243,8 +240,7 @@ static const WCHAR *nodetype_to_string(DWORD type) msg = STRING_UNKNOWN; } - LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer, - sizeof(msg_buffer)/sizeof(WCHAR)); + LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer, ARRAY_SIZE(msg_buffer)); return msg_buffer; } @@ -277,7 +273,7 @@ static const WCHAR *boolean_to_string(int value) static WCHAR msg_buffer[15]; LoadStringW(GetModuleHandleW(NULL), value ? STRING_YES : STRING_NO, - msg_buffer, sizeof(msg_buffer)/sizeof(WCHAR)); + msg_buffer, ARRAY_SIZE(msg_buffer)); return msg_buffer; } @@ -301,7 +297,7 @@ static void print_full_information(void) { WCHAR hostnameW[MAX_HOSTNAME_LEN + 4]; - MultiByteToWideChar(CP_ACP, 0, info->HostName, -1, hostnameW, sizeof(hostnameW)/sizeof(hostnameW[0])); + MultiByteToWideChar(CP_ACP, 0, info->HostName, -1, hostnameW, ARRAY_SIZE(hostnameW)); print_field(STRING_HOSTNAME, hostnameW); /* FIXME: Output primary DNS suffix. */ @@ -348,22 +344,22 @@ static void print_full_information(void) for (addr = p->FirstUnicastAddress; addr; addr = addr->Next) { if (addr->Address.lpSockaddr->sa_family == AF_INET && - socket_address_to_string(addr_buf, sizeof(addr_buf)/sizeof(WCHAR), &addr->Address)) + socket_address_to_string(addr_buf, ARRAY_SIZE(addr_buf), &addr->Address)) print_field(STRING_IP_ADDRESS, addr_buf); else if (addr->Address.lpSockaddr->sa_family == AF_INET6 && - socket_address_to_string(addr_buf, sizeof(addr_buf)/sizeof(WCHAR), &addr->Address)) + socket_address_to_string(addr_buf, ARRAY_SIZE(addr_buf), &addr->Address)) print_field(STRING_IP6_ADDRESS, addr_buf); /* FIXME: Output corresponding subnet mask. */ } if (p->FirstGatewayAddress) { - if (socket_address_to_string(addr_buf, sizeof(addr_buf)/sizeof(WCHAR), &p->FirstGatewayAddress->Address)) + if (socket_address_to_string(addr_buf, ARRAY_SIZE(addr_buf), &p->FirstGatewayAddress->Address)) print_field(STRING_DEFAULT_GATEWAY, addr_buf); for (gateway = p->FirstGatewayAddress->Next; gateway; gateway = gateway->Next) { - if (socket_address_to_string(addr_buf, sizeof(addr_buf)/sizeof(WCHAR), &gateway->Address)) + if (socket_address_to_string(addr_buf, ARRAY_SIZE(addr_buf), &gateway->Address)) print_value(addr_buf); } } -- 2.14.4

1 0

[PATCH] taskkill: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 23 Jul '18

23 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/taskkill/taskkill.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/programs/taskkill/taskkill.c b/programs/taskkill/taskkill.c index 6e4e1eb55a..59ce98dc6d 100644 --- a/programs/taskkill/taskkill.c +++ b/programs/taskkill/taskkill.c @@ -47,7 +47,7 @@ static int taskkill_vprintfW(const WCHAR *msg, __ms_va_list va_args) WCHAR msg_buffer[8192]; wlen = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, msg, 0, 0, msg_buffer, - sizeof(msg_buffer)/sizeof(*msg_buffer), &va_args); + ARRAY_SIZE(msg_buffer), &va_args); ret = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), msg_buffer, wlen, &count, NULL); if (!ret) @@ -92,8 +92,7 @@ static int WINAPIV taskkill_message_printfW(int msg, ...) WCHAR msg_buffer[8192]; int len; - LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer, - sizeof(msg_buffer)/sizeof(WCHAR)); + LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer, ARRAY_SIZE(msg_buffer)); __ms_va_start(va_args, msg); len = taskkill_vprintfW(msg_buffer, va_args); @@ -107,8 +106,7 @@ static int taskkill_message(int msg) static const WCHAR formatW[] = {'%','1',0}; WCHAR msg_buffer[8192]; - LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer, - sizeof(msg_buffer)/sizeof(WCHAR)); + LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer, ARRAY_SIZE(msg_buffer)); return taskkill_printfW(formatW, msg_buffer); } -- 2.14.4

1 0

[PATCH] net: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 23 Jul '18

23 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/net/net.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/programs/net/net.c b/programs/net/net.c index d8123ebf97..8a4c3f1132 100644 --- a/programs/net/net.c +++ b/programs/net/net.c @@ -61,8 +61,7 @@ static int output_vprintf(const WCHAR* fmt, __ms_va_list va_args) int len; SetLastError(NO_ERROR); - len = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, fmt, 0, 0, str, - sizeof(str)/sizeof(*str), &va_args); + len = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, fmt, 0, 0, str, ARRAY_SIZE(str), &va_args); if (len == 0 && GetLastError() != NO_ERROR) WINE_FIXME("Could not format string: le=%u, fmt=%s\n", GetLastError(), wine_dbgstr_w(fmt)); else @@ -85,7 +84,7 @@ static int WINAPIV output_string(int msg, ...) WCHAR fmt[8192]; __ms_va_list arguments; - LoadStringW(GetModuleHandleW(NULL), msg, fmt, sizeof(fmt)/sizeof(fmt[0])); + LoadStringW(GetModuleHandleW(NULL), msg, fmt, ARRAY_SIZE(fmt)); __ms_va_start(arguments, msg); output_vprintf(fmt, arguments); __ms_va_end(arguments); @@ -119,7 +118,7 @@ static BOOL net_use(int argc, const WCHAR* argv[]) HMODULE hmod = GetModuleHandleW(NULL); /* Load the status strings */ - for (i = 0; i < sizeof(status)/sizeof(*status); i++) + for (i = 0; i < ARRAY_SIZE(status); i++) { status[i] = HeapAlloc(GetProcessHeap(), 0, 1024 * sizeof(**status)); LoadStringW(hmod, STRING_OK+i, status[i], 1024); @@ -147,7 +146,7 @@ static BOOL net_use(int argc, const WCHAR* argv[]) } while (rc == ERROR_MORE_DATA); /* Release the status strings */ - for (i = 0; i < sizeof(status)/sizeof(*status); i++) + for (i = 0; i < ARRAY_SIZE(status); i++) HeapFree(GetProcessHeap(), 0, status[i]); return TRUE; @@ -256,7 +255,7 @@ static BOOL net_service(int operation, const WCHAR* service_name) return FALSE; } - buffer_size = sizeof(service_display_name)/sizeof(*service_display_name); + buffer_size = ARRAY_SIZE(service_display_name); GetServiceDisplayNameW(SCManager, service_name, service_display_name, &buffer_size); if (!service_display_name[0]) lstrcpyW(service_display_name, service_name); -- 2.14.4

1 0

[PATCH] icinfo: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 23 Jul '18

23 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/icinfo/icinfo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/icinfo/icinfo.c b/programs/icinfo/icinfo.c index 601ec8c8b3..1059183361 100644 --- a/programs/icinfo/icinfo.c +++ b/programs/icinfo/icinfo.c @@ -33,7 +33,7 @@ static int mywprintf(const WCHAR *format, ...) HANDLE hout = GetStdHandle(STD_OUTPUT_HANDLE); va_start(parms, format); - vsnprintfW(output_bufW, sizeof(output_bufW)/sizeof(output_bufW[0]), format, parms); + vsnprintfW(output_bufW, ARRAY_SIZE(output_bufW), format, parms); va_end(parms); /* Try to write as unicode whenever we think it's a console */ -- 2.14.4

1 0

[PATCH] hostname: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 23 Jul '18

23 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/hostname/hostname.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/programs/hostname/hostname.c b/programs/hostname/hostname.c index 8bf8676a97..3e1f2bdda3 100644 --- a/programs/hostname/hostname.c +++ b/programs/hostname/hostname.c @@ -90,8 +90,7 @@ static int hostname_message_printfW(int msg, ...) WCHAR msg_buffer[8192]; int len; - LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer, - sizeof(msg_buffer)/sizeof(WCHAR)); + LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer, ARRAY_SIZE(msg_buffer)); va_start(va_args, msg); len = hostname_vprintfW(msg_buffer, va_args); @@ -105,8 +104,7 @@ static int hostname_message(int msg) static const WCHAR formatW[] = {'%','s',0}; WCHAR msg_buffer[8192]; - LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer, - sizeof(msg_buffer)/sizeof(WCHAR)); + LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer, ARRAY_SIZE(msg_buffer)); return hostname_printfW(formatW, msg_buffer); } @@ -119,7 +117,7 @@ static void display_computer_name(void) WCHAR nameW[256]; gethostname(nameA, sizeof(nameA)); - MultiByteToWideChar(CP_UNIXCP, 0, nameA, sizeof(nameA), nameW, sizeof(nameW)/sizeof(WCHAR)); + MultiByteToWideChar(CP_UNIXCP, 0, nameA, sizeof(nameA), nameW, ARRAY_SIZE(nameW)); hostname_printfW(fmtW, nameW); } @@ -132,7 +130,7 @@ int wmain(int argc, WCHAR *argv[]) unsigned int i; - if (!strncmpW(argv[1], slashHelpW, sizeof(slashHelpW)/sizeof(WCHAR) - 1)) + if (!strncmpW(argv[1], slashHelpW, ARRAY_SIZE(slashHelpW) - 1)) { hostname_message(STRING_USAGE); return 1; -- 2.14.4

1 0

[PATCH] clock: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 23 Jul '18

23 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/clock/main.c | 4 ++-- programs/clock/winclock.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/clock/main.c b/programs/clock/main.c index 04bfe64424..3ad636be43 100644 --- a/programs/clock/main.c +++ b/programs/clock/main.c @@ -72,7 +72,7 @@ static VOID CLOCK_UpdateWindowCaption(VOID) /* Set frame caption */ if (Globals.bDate) { chars = GetDateFormatW(LOCALE_USER_DEFAULT, DATE_LONGDATE, NULL, NULL, - szCaption, sizeof(szCaption)/sizeof(WCHAR)); + szCaption, ARRAY_SIZE(szCaption)); if (chars) { --chars; szCaption[chars++] = ' '; @@ -255,7 +255,7 @@ static int CLOCK_MenuCommand (WPARAM wParam) } /* show "about" box */ case IDM_ABOUT: { - LoadStringW(Globals.hInstance, IDS_CLOCK, szApp, sizeof(szApp)/sizeof(WCHAR)); + LoadStringW(Globals.hInstance, IDS_CLOCK, szApp, ARRAY_SIZE(szApp)); lstrcpyW(szAppRelease,szApp); ShellAboutW(Globals.hMainWnd, szApp, szAppRelease, 0); break; diff --git a/programs/clock/winclock.c b/programs/clock/winclock.c index 0b2def11ab..53c3821d95 100644 --- a/programs/clock/winclock.c +++ b/programs/clock/winclock.c @@ -187,7 +187,7 @@ HFONT SizeFont(HDC dc, int x, int y, BOOL bSeconds, const LOGFONTW* font) int chars; chars = GetTimeFormatW(LOCALE_USER_DEFAULT, bSeconds ? 0 : TIME_NOSECONDS, NULL, - NULL, szTime, sizeof(szTime)/sizeof(WCHAR)); + NULL, szTime, ARRAY_SIZE(szTime)); if (!chars) return 0; @@ -219,7 +219,7 @@ void DigitalClock(HDC dc, int x, int y, BOOL bSeconds, HFONT font) int chars; chars = GetTimeFormatW(LOCALE_USER_DEFAULT, bSeconds ? 0 : TIME_NOSECONDS, NULL, - NULL, szTime, sizeof(szTime)/sizeof(WCHAR)); + NULL, szTime, ARRAY_SIZE(szTime)); if (!chars) return; --chars; -- 2.14.4

1 0

[PATCH] attrib: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 23 Jul '18

23 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/attrib/attrib.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/attrib/attrib.c b/programs/attrib/attrib.c index a5742048bc..79a599aafd 100644 --- a/programs/attrib/attrib.c +++ b/programs/attrib/attrib.c @@ -36,7 +36,7 @@ static WCHAR *ATTRIB_LoadMessage(UINT id) static WCHAR msg[MAXSTRING]; const WCHAR failedMsg[] = {'F', 'a', 'i', 'l', 'e', 'd', '!', 0}; - if (!LoadStringW(GetModuleHandleW(NULL), id, msg, sizeof(msg)/sizeof(WCHAR))) { + if (!LoadStringW(GetModuleHandleW(NULL), id, msg, ARRAY_SIZE(msg))) { WINE_FIXME("LoadString failed with %d\n", GetLastError()); lstrcpyW(msg, failedMsg); } @@ -236,7 +236,7 @@ static BOOL ATTRIB_processdirectory(const WCHAR *rootdir, const WCHAR *filespec, strcpyW(buffer, rootdir); strcatW(buffer, fd.cFileName); ATTRIB_wprintf(fmt, flags, buffer); - for (count = 0; count < (sizeof(flags)/sizeof(WCHAR) - 1); count++) flags[count] = ' '; + for (count = 0; count < (ARRAY_SIZE(flags) - 1); count++) flags[count] = ' '; found = TRUE; } } while (FindNextFileW(hff, &fd) != 0); @@ -302,7 +302,7 @@ int wmain(int argc, WCHAR *argv[]) /* Name may be a relative or explicit path, so calculate curdir based on current locations, stripping off the filename */ WINE_TRACE("Supplied name: '%s'\n", wine_dbgstr_w(originalname)); - GetFullPathNameW(originalname, sizeof(curdir)/sizeof(WCHAR), curdir, &namepart); + GetFullPathNameW(originalname, ARRAY_SIZE(curdir), curdir, &namepart); WINE_TRACE("Result: '%s'\n", wine_dbgstr_w(curdir)); if (namepart) { strcpyW(name, namepart); -- 2.14.4

1 0

[PATCH] itss: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 23 Jul '18

23 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/itss/moniker.c | 2 +- dlls/itss/protocol.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/itss/moniker.c b/dlls/itss/moniker.c index 3315b914d3..6c61f47482 100644 --- a/dlls/itss/moniker.c +++ b/dlls/itss/moniker.c @@ -435,7 +435,7 @@ static HRESULT WINAPI ITS_IParseDisplayNameImpl_ParseDisplayName( { static const WCHAR szPrefix[] = { '@','M','S','I','T','S','t','o','r','e',':',0 }; - const DWORD prefix_len = (sizeof szPrefix/sizeof szPrefix[0])-1; + const DWORD prefix_len = ARRAY_SIZE(szPrefix)-1; DWORD n; ITS_IParseDisplayNameImpl *This = impl_from_IParseDisplayName(iface); diff --git a/dlls/itss/protocol.c b/dlls/itss/protocol.c index 1cdb365002..a7c40077cc 100644 --- a/dlls/itss/protocol.c +++ b/dlls/itss/protocol.c @@ -153,12 +153,12 @@ static LPCWSTR skip_schema(LPCWSTR url) static const WCHAR msits_schema[] = {'m','s','-','i','t','s',':'}; static const WCHAR mk_schema[] = {'m','k',':','@','M','S','I','T','S','t','o','r','e',':'}; - if(!strncmpiW(its_schema, url, sizeof(its_schema)/sizeof(WCHAR))) - return url+sizeof(its_schema)/sizeof(WCHAR); - if(!strncmpiW(msits_schema, url, sizeof(msits_schema)/sizeof(WCHAR))) - return url+sizeof(msits_schema)/sizeof(WCHAR); - if(!strncmpiW(mk_schema, url, sizeof(mk_schema)/sizeof(WCHAR))) - return url+sizeof(mk_schema)/sizeof(WCHAR); + if(!strncmpiW(its_schema, url, ARRAY_SIZE(its_schema))) + return url + ARRAY_SIZE(its_schema); + if(!strncmpiW(msits_schema, url, ARRAY_SIZE(msits_schema))) + return url + ARRAY_SIZE(msits_schema); + if(!strncmpiW(mk_schema, url, ARRAY_SIZE(mk_schema))) + return url + ARRAY_SIZE(mk_schema); return NULL; } -- 2.14.4

1 0

[PATCH] itss: Remove a superfluous variable initialization
by Michael Stefaniuc 23 Jul '18

23 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/itss/moniker.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/itss/moniker.c b/dlls/itss/moniker.c index 0509c9e1a5..3315b914d3 100644 --- a/dlls/itss/moniker.c +++ b/dlls/itss/moniker.c @@ -287,7 +287,7 @@ static HRESULT WINAPI ITS_IMonikerImpl_GetDisplayName( ITS_IMonikerImpl *This = impl_from_IMoniker(iface); static const WCHAR szFormat[] = { 'm','s','-','i','t','s',':','%','s',':',':','%','s',0 }; - DWORD len = sizeof szFormat / sizeof(WCHAR); + DWORD len; LPWSTR str; TRACE("%p %p %p %p\n", iface, pbc, pmkToLeft, ppszDisplayName); -- 2.14.4

1 0

[PATCH] iphlpapi: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 23 Jul '18

23 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 2 +- dlls/iphlpapi/ipstats.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 7911e9d8cf..7de70c9ef4 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1717,7 +1717,7 @@ DWORD WINAPI GetIfEntry(PMIB_IFROW pIfRow) */ DWORD WINAPI GetIfEntry2( MIB_IF_ROW2 *row2 ) { - DWORD ret, len = sizeof(row2->Description)/sizeof(row2->Description[0]); + DWORD ret, len = ARRAY_SIZE(row2->Description); char buf[MAX_ADAPTER_NAME], *name; MIB_IFROW row; diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 8f6720ea52..799d03d574 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -666,7 +666,7 @@ DWORD WINAPI GetIcmpStatisticsEx(PMIB_ICMP_EX stats, DWORD family) continue; } - for (i = 0; i < sizeof(icmpinstatlist)/sizeof(icmpinstatlist[0]); i++) + for (i = 0; i < ARRAY_SIZE(icmpinstatlist); i++) { if (!strcasecmp(buf, icmpinstatlist[i].name)) { @@ -688,7 +688,7 @@ DWORD WINAPI GetIcmpStatisticsEx(PMIB_ICMP_EX stats, DWORD family) continue; } - for (i = 0; i < sizeof(icmpoutstatlist)/sizeof(icmpoutstatlist[0]); i++) + for (i = 0; i < ARRAY_SIZE(icmpoutstatlist); i++) { if (!strcasecmp(buf, icmpoutstatlist[i].name)) { @@ -819,7 +819,7 @@ DWORD WINAPI GetIpStatisticsEx(PMIB_IPSTATS stats, DWORD family) if ((ptr = strchr(value, '\n'))) *ptr='\0'; - for (i = 0; i < sizeof(ipstatlist)/sizeof(ipstatlist[0]); i++) + for (i = 0; i < ARRAY_SIZE(ipstatlist); i++) if (!strcasecmp(buf, ipstatlist[i].name)) { if (sscanf(value, "%d", &res)) *ipstatlist[i].elem = res; @@ -1209,7 +1209,7 @@ DWORD WINAPI GetUdpStatisticsEx(PMIB_UDPSTATS stats, DWORD family) if ((ptr = strchr(value, '\n'))) *ptr='\0'; - for (i = 0; i < sizeof(udpstatlist)/sizeof(udpstatlist[0]); i++) + for (i = 0; i < ARRAY_SIZE(udpstatlist); i++) if (!strcasecmp(buf, udpstatlist[i].name)) { if (sscanf(value, "%d", &res)) *udpstatlist[i].elem = res; -- 2.14.4

1 0

[PATCH] inetcomm: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 23 Jul '18

23 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/inetcomm/mimeole.c | 7 +++---- dlls/inetcomm/protocol.c | 18 +++++++++--------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 681ca820d4..cb9ebcc382 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -1581,9 +1581,8 @@ static HRESULT decode_base64(IStream *input, IStream **ret_stream) while(1) { /* skip invalid chars */ - while(ptr < end && - (*ptr >= sizeof(base64_decode_table)/sizeof(*base64_decode_table) - || base64_decode_table[*ptr] == -1)) + while(ptr < end && (*ptr >= ARRAY_SIZE(base64_decode_table) + || base64_decode_table[*ptr] == -1)) ptr++; if(ptr == end) break; @@ -3715,7 +3714,7 @@ HRESULT WINAPI MimeOleObjectFromMoniker(BINDF bindf, IMoniker *moniker, IBindCtx return E_OUTOFMEMORY; memcpy(mhtml_url, mhtml_prefixW, sizeof(mhtml_prefixW)); - strcpyW(mhtml_url + sizeof(mhtml_prefixW)/sizeof(WCHAR), display_name); + strcpyW(mhtml_url + ARRAY_SIZE(mhtml_prefixW), display_name); HeapFree(GetProcessHeap(), 0, display_name); hres = CreateURLMoniker(NULL, mhtml_url, moniker_new); diff --git a/dlls/inetcomm/protocol.c b/dlls/inetcomm/protocol.c index 028463a269..c6a59fee7c 100644 --- a/dlls/inetcomm/protocol.c +++ b/dlls/inetcomm/protocol.c @@ -83,16 +83,16 @@ static HRESULT parse_mhtml_url(const WCHAR *url, mhtml_url_t *r) { const WCHAR *p; - if(strncmpiW(url, mhtml_prefixW, sizeof(mhtml_prefixW)/sizeof(WCHAR))) + if(strncmpiW(url, mhtml_prefixW, ARRAY_SIZE(mhtml_prefixW))) return E_FAIL; - r->mhtml = url + sizeof(mhtml_prefixW)/sizeof(WCHAR); + r->mhtml = url + ARRAY_SIZE(mhtml_prefixW); p = strchrW(r->mhtml, '!'); if(p) { r->mhtml_len = p - r->mhtml; /* FIXME: We handle '!' and '!x-usc:' in URLs as the same thing. Those should not be the same. */ - if(!strncmpW(p, mhtml_separatorW, sizeof(mhtml_separatorW)/sizeof(WCHAR))) - p += sizeof(mhtml_separatorW)/sizeof(WCHAR); + if(!strncmpW(p, mhtml_separatorW, ARRAY_SIZE(mhtml_separatorW))) + p += ARRAY_SIZE(mhtml_separatorW); else p++; }else { @@ -657,7 +657,7 @@ static HRESULT WINAPI MimeHtmlProtocolInfo_CombineUrl(IInternetProtocolInfo *ifa DWORD cchResult, DWORD* pcchResult, DWORD dwReserved) { MimeHtmlProtocol *This = impl_from_IInternetProtocolInfo(iface); - size_t len = sizeof(mhtml_prefixW)/sizeof(WCHAR); + size_t len = ARRAY_SIZE(mhtml_prefixW); mhtml_url_t url; WCHAR *p; HRESULT hres; @@ -670,26 +670,26 @@ static HRESULT WINAPI MimeHtmlProtocolInfo_CombineUrl(IInternetProtocolInfo *ifa if(FAILED(hres)) return hres; - if(!strncmpiW(pwzRelativeUrl, mhtml_prefixW, sizeof(mhtml_prefixW)/sizeof(WCHAR))) { + if(!strncmpiW(pwzRelativeUrl, mhtml_prefixW, ARRAY_SIZE(mhtml_prefixW))) { FIXME("Relative URL is mhtml protocol\n"); return INET_E_USE_DEFAULT_PROTOCOLHANDLER; } len += url.mhtml_len; if(*pwzRelativeUrl) - len += strlenW(pwzRelativeUrl) + sizeof(mhtml_separatorW)/sizeof(WCHAR); + len += strlenW(pwzRelativeUrl) + ARRAY_SIZE(mhtml_separatorW); if(len >= cchResult) { *pcchResult = 0; return E_FAIL; } memcpy(pwzResult, mhtml_prefixW, sizeof(mhtml_prefixW)); - p = pwzResult + sizeof(mhtml_prefixW)/sizeof(WCHAR); + p = pwzResult + ARRAY_SIZE(mhtml_prefixW); memcpy(p, url.mhtml, url.mhtml_len*sizeof(WCHAR)); p += url.mhtml_len; if(*pwzRelativeUrl) { memcpy(p, mhtml_separatorW, sizeof(mhtml_separatorW)); - p += sizeof(mhtml_separatorW)/sizeof(WCHAR); + p += ARRAY_SIZE(mhtml_separatorW); strcpyW(p, pwzRelativeUrl); }else { *p = 0; -- 2.14.4

1 0

[PATCH] gameux: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 23 Jul '18

23 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gameux/gameexplorer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gameux/gameexplorer.c b/dlls/gameux/gameexplorer.c index 63bf69d736..6495c78b38 100644 --- a/dlls/gameux/gameexplorer.c +++ b/dlls/gameux/gameexplorer.c @@ -150,7 +150,7 @@ HRESULT GAMEUX_buildGameRegistryPath(GAME_INSTALL_SCOPE installScope, if(gameInstanceId) { if(SUCCEEDED(hr)) - hr = (StringFromGUID2(gameInstanceId, sInstanceId, sizeof(sInstanceId)/sizeof(sInstanceId[0])) ? S_OK : E_FAIL); + hr = (StringFromGUID2(gameInstanceId, sInstanceId, ARRAY_SIZE(sInstanceId)) ? S_OK : E_FAIL); if(SUCCEEDED(hr)) { @@ -219,7 +219,7 @@ static HRESULT GAMEUX_WriteRegistryRecord(struct GAMEUX_GAME_DATA *GameData) hr = GAMEUX_buildGameRegistryPath(GameData->installScope, &GameData->guidInstanceId, &lpRegistryKey); if(SUCCEEDED(hr)) - hr = (StringFromGUID2(&GameData->guidApplicationId, sGameApplicationId, sizeof(sGameApplicationId)/sizeof(sGameApplicationId[0])) ? S_OK : E_FAIL); + hr = (StringFromGUID2(&GameData->guidApplicationId, sGameApplicationId, ARRAY_SIZE(sGameApplicationId)) ? S_OK : E_FAIL); if(SUCCEEDED(hr)) hr = HRESULT_FROM_WIN32(RegCreateKeyExW(HKEY_LOCAL_MACHINE, lpRegistryKey, -- 2.14.4

1 0

[PATCH] browseui: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 23 Jul '18

23 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/browseui/progressdlg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/browseui/progressdlg.c b/dlls/browseui/progressdlg.c index 7cba7d6464..2355b0cfa0 100644 --- a/dlls/browseui/progressdlg.c +++ b/dlls/browseui/progressdlg.c @@ -114,7 +114,7 @@ static LPWSTR load_string(HINSTANCE hInstance, UINT uiResourceId) WCHAR string[256]; LPWSTR ret; - LoadStringW(hInstance, uiResourceId, string, sizeof(string)/sizeof(string[0])); + LoadStringW(hInstance, uiResourceId, string, ARRAY_SIZE(string)); ret = HeapAlloc(GetProcessHeap(), 0, (strlenW(string) + 1) * sizeof(WCHAR)); strcpyW(ret, string); return ret; -- 2.14.4

1 0

[PATCH] taskmgr: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 23 Jul '18

23 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/taskmgr/about.c | 2 +- programs/taskmgr/affinity.c | 16 +++++++-------- programs/taskmgr/applpage.c | 14 ++++++------- programs/taskmgr/column.c | 50 ++++++++++++++++++++++----------------------- programs/taskmgr/dbgchnl.c | 8 ++++---- programs/taskmgr/debug.c | 16 +++++++-------- programs/taskmgr/endproc.c | 14 ++++++------- programs/taskmgr/perfdata.c | 2 +- programs/taskmgr/perfpage.c | 4 ++-- programs/taskmgr/priority.c | 10 ++++----- programs/taskmgr/procpage.c | 4 ++-- programs/taskmgr/taskmgr.c | 32 ++++++++++++++--------------- programs/taskmgr/trayicon.c | 6 +++--- 13 files changed, 88 insertions(+), 90 deletions(-) diff --git a/programs/taskmgr/about.c b/programs/taskmgr/about.c index c625139645..1eff50f003 100644 --- a/programs/taskmgr/about.c +++ b/programs/taskmgr/about.c @@ -36,7 +36,7 @@ void OnAbout(void) WCHAR copy[] = {'B','r','i','a','n',' ', 'P','a','l','m','e','r',' ', '<','b','r','i','a','n','p','@','r','e','a','c','t','o','s','.','o','r','g','>',0}; - LoadStringW( hInst, IDC_TASKMGR, appname, sizeof(appname)/sizeof(WCHAR) ); + LoadStringW( hInst, IDC_TASKMGR, appname, ARRAY_SIZE( appname )); ShellAboutW( hMainWnd, appname, copy, LoadImageA( hInst, (LPSTR)IDI_TASKMANAGER, IMAGE_ICON, 48, 48, LR_SHARED )); } diff --git a/programs/taskmgr/affinity.c b/programs/taskmgr/affinity.c index c195a2d7ce..4e33f50d4f 100644 --- a/programs/taskmgr/affinity.c +++ b/programs/taskmgr/affinity.c @@ -51,9 +51,9 @@ AffinityDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) * the number of CPUs present in the system */ if (!GetProcessAffinityMask(hProcessAffinityHandle, &dwProcessAffinityMask, &dwSystemAffinityMask)) { - GetLastErrorText(wstrErrorText, sizeof(wstrErrorText)/sizeof(WCHAR)); + GetLastErrorText(wstrErrorText, ARRAY_SIZE(wstrErrorText)); EndDialog(hDlg, 0); - LoadStringW(hInst, IDS_AFFINITY_UNABLE2ACCESS, wszUnable2Access, sizeof(wszUnable2Access)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_AFFINITY_UNABLE2ACCESS, wszUnable2Access, ARRAY_SIZE(wszUnable2Access)); MessageBoxW(hMainWnd, wstrErrorText, wszUnable2Access, MB_OK|MB_ICONSTOP); } @@ -291,8 +291,8 @@ AffinityDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) if (!dwProcessAffinityMask) { WCHAR wszErrorMsg[255]; WCHAR wszErrorTitle[255]; - LoadStringW(hInst, IDS_AFFINITY_ERROR_MESSAGE, wszErrorMsg, sizeof(wszErrorMsg)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_AFFINITY_ERROR_TITLE, wszErrorTitle, sizeof(wszErrorTitle)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_AFFINITY_ERROR_MESSAGE, wszErrorMsg, ARRAY_SIZE(wszErrorMsg)); + LoadStringW(hInst, IDS_AFFINITY_ERROR_TITLE, wszErrorTitle, ARRAY_SIZE(wszErrorTitle)); MessageBoxW(hDlg, wszErrorMsg, wszErrorTitle, MB_OK|MB_ICONSTOP); return TRUE; } @@ -301,9 +301,9 @@ AffinityDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) * Try to set the process affinity */ if (!SetProcessAffinityMask(hProcessAffinityHandle, dwProcessAffinityMask)) { - GetLastErrorText(wstrErrorText, sizeof(wstrErrorText)/sizeof(WCHAR)); + GetLastErrorText(wstrErrorText, ARRAY_SIZE(wstrErrorText)); EndDialog(hDlg, LOWORD(wParam)); - LoadStringW(hInst, IDS_AFFINITY_UNABLE2ACCESS, wszUnable2Access, sizeof(wszUnable2Access)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_AFFINITY_UNABLE2ACCESS, wszUnable2Access, ARRAY_SIZE(wszUnable2Access)); MessageBoxW(hMainWnd, wstrErrorText, wszUnable2Access, MB_OK|MB_ICONSTOP); } @@ -341,8 +341,8 @@ void ProcessPage_OnSetAffinity(void) return; hProcessAffinityHandle = OpenProcess(PROCESS_QUERY_INFORMATION|PROCESS_SET_INFORMATION, FALSE, dwProcessId); if (!hProcessAffinityHandle) { - GetLastErrorText(wstrErrorText, sizeof(wstrErrorText)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_AFFINITY_UNABLE2ACCESS, wszUnable2Access, sizeof(wszUnable2Access)/sizeof(WCHAR)); + GetLastErrorText(wstrErrorText, ARRAY_SIZE(wstrErrorText)); + LoadStringW(hInst, IDS_AFFINITY_UNABLE2ACCESS, wszUnable2Access, ARRAY_SIZE(wszUnable2Access)); MessageBoxW(hMainWnd, wstrErrorText, wszUnable2Access, MB_OK|MB_ICONSTOP); return; } diff --git a/programs/taskmgr/applpage.c b/programs/taskmgr/applpage.c index e2874b5943..ae881b530c 100644 --- a/programs/taskmgr/applpage.c +++ b/programs/taskmgr/applpage.c @@ -249,10 +249,8 @@ static BOOL CALLBACK EnumWindowsProc(HWND hWnd, LPARAM lParam) return TRUE; /* Check and see if this is a top-level app window */ - if (!GetWindowTextW(hWnd, wszText, sizeof(wszText)/sizeof(WCHAR)) || - !IsWindowVisible(hWnd) || - (GetParent(hWnd) != NULL) || - (GetWindow(hWnd, GW_OWNER) != NULL) || + if (!GetWindowTextW(hWnd, wszText, ARRAY_SIZE(wszText)) || !IsWindowVisible(hWnd) || + (GetParent(hWnd) != NULL) || (GetWindow(hWnd, GW_OWNER) != NULL) || (GetWindowLongW(hWnd, GWL_EXSTYLE) & WS_EX_TOOLWINDOW)) { return TRUE; /* Skip this window */ @@ -415,8 +413,8 @@ static void ApplicationPageOnNotify(WPARAM wParam, LPARAM lParam) WCHAR wszNotResponding[255]; WCHAR wszRunning[255]; - LoadStringW(hInst, IDS_APPLICATION_NOT_RESPONDING, wszNotResponding, sizeof(wszNotResponding)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_APPLICATION_RUNNING, wszRunning, sizeof(wszRunning)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_APPLICATION_NOT_RESPONDING, wszNotResponding, ARRAY_SIZE(wszNotResponding)); + LoadStringW(hInst, IDS_APPLICATION_RUNNING, wszRunning, ARRAY_SIZE(wszRunning)); pnmh = (LPNMHDR) lParam; pnmdi = (LV_DISPINFOW*) lParam; @@ -842,8 +840,8 @@ ApplicationPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) WCHAR wszTask[255]; WCHAR wszStatus[255]; - LoadStringW(hInst, IDS_APPLICATION_TASK, wszTask, sizeof(wszTask)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_APPLICATION_STATUS, wszStatus, sizeof(wszStatus)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_APPLICATION_TASK, wszTask, ARRAY_SIZE(wszTask)); + LoadStringW(hInst, IDS_APPLICATION_STATUS, wszStatus, ARRAY_SIZE(wszStatus)); switch (message) { case WM_INITDIALOG: diff --git a/programs/taskmgr/column.c b/programs/taskmgr/column.c index 35ba2a0b94..27c5926b5b 100644 --- a/programs/taskmgr/column.c +++ b/programs/taskmgr/column.c @@ -63,31 +63,31 @@ static WCHAR wszIOOtherBytes[255]; static void load_column_headers(void) { - LoadStringW(hInst, IDS_IMAGENAME, wszImageName, sizeof(wszImageName)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_PID, wszPID, sizeof(wszPID)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_USERNAME, wszUserName, sizeof(wszUserName)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_SESSIONID, wszSessionID, sizeof(wszSessionID)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_CPUUSAGE, wszCPU, sizeof(wszCPU)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_CPUTIME, wszCPUTime, sizeof(wszCPUTime)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_MEMORYUSAGE, wszMemUsage, sizeof(wszMemUsage)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_PEAKMEMORYUSAGE, wszPeakMemUsage, sizeof(wszPeakMemUsage)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_MEMORYUSAGEDELTA, wszMemDelta, sizeof(wszMemDelta)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_PAGEFAULTS, wszPageFaults, sizeof(wszPageFaults)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_PAGEFAULTSDELTA, wszPFDelta, sizeof(wszPFDelta)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_VIRTUALMEMORYSIZE, wszVMSize, sizeof(wszVMSize)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_PAGEDPOOL, wszPagedPool, sizeof(wszPagedPool)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_NONPAGEDPOOL, wszNPPool, sizeof(wszNPPool)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_BASEPRIORITY, wszBasePri, sizeof(wszBasePri)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_HANDLECOUNT, wszHandles, sizeof(wszHandles)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_THREADCOUNT, wszThreads, sizeof(wszThreads)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_USEROBJECTS, wszUSERObjects, sizeof(wszUSERObjects)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_GDIOBJECTS, wszGDIObjects, sizeof(wszGDIObjects)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_IOREADS, wszIOReads, sizeof(wszIOReads)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_IOWRITES, wszIOWrites, sizeof(wszIOWrites)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_IOOTHER, wszIOOther, sizeof(wszIOOther)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_IOREADBYTES, wszIOReadBytes, sizeof(wszIOReadBytes)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_IOWRITEBYTES, wszIOWriteBytes, sizeof(wszIOWriteBytes)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_IOOTHERBYTES, wszIOOtherBytes, sizeof(wszIOOtherBytes)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_IMAGENAME, wszImageName, ARRAY_SIZE(wszImageName)); + LoadStringW(hInst, IDS_PID, wszPID, ARRAY_SIZE(wszPID)); + LoadStringW(hInst, IDS_USERNAME, wszUserName, ARRAY_SIZE(wszUserName)); + LoadStringW(hInst, IDS_SESSIONID, wszSessionID, ARRAY_SIZE(wszSessionID)); + LoadStringW(hInst, IDS_CPUUSAGE, wszCPU, ARRAY_SIZE(wszCPU)); + LoadStringW(hInst, IDS_CPUTIME, wszCPUTime, ARRAY_SIZE(wszCPUTime)); + LoadStringW(hInst, IDS_MEMORYUSAGE, wszMemUsage, ARRAY_SIZE(wszMemUsage)); + LoadStringW(hInst, IDS_PEAKMEMORYUSAGE, wszPeakMemUsage, ARRAY_SIZE(wszPeakMemUsage)); + LoadStringW(hInst, IDS_MEMORYUSAGEDELTA, wszMemDelta, ARRAY_SIZE(wszMemDelta)); + LoadStringW(hInst, IDS_PAGEFAULTS, wszPageFaults, ARRAY_SIZE(wszPageFaults)); + LoadStringW(hInst, IDS_PAGEFAULTSDELTA, wszPFDelta, ARRAY_SIZE(wszPFDelta)); + LoadStringW(hInst, IDS_VIRTUALMEMORYSIZE, wszVMSize, ARRAY_SIZE(wszVMSize)); + LoadStringW(hInst, IDS_PAGEDPOOL, wszPagedPool, ARRAY_SIZE(wszPagedPool)); + LoadStringW(hInst, IDS_NONPAGEDPOOL, wszNPPool, ARRAY_SIZE(wszNPPool)); + LoadStringW(hInst, IDS_BASEPRIORITY, wszBasePri, ARRAY_SIZE(wszBasePri)); + LoadStringW(hInst, IDS_HANDLECOUNT, wszHandles, ARRAY_SIZE(wszHandles)); + LoadStringW(hInst, IDS_THREADCOUNT, wszThreads, ARRAY_SIZE(wszThreads)); + LoadStringW(hInst, IDS_USEROBJECTS, wszUSERObjects, ARRAY_SIZE(wszUSERObjects)); + LoadStringW(hInst, IDS_GDIOBJECTS, wszGDIObjects, ARRAY_SIZE(wszGDIObjects)); + LoadStringW(hInst, IDS_IOREADS, wszIOReads, ARRAY_SIZE(wszIOReads)); + LoadStringW(hInst, IDS_IOWRITES, wszIOWrites, ARRAY_SIZE(wszIOWrites)); + LoadStringW(hInst, IDS_IOOTHER, wszIOOther, ARRAY_SIZE(wszIOOther)); + LoadStringW(hInst, IDS_IOREADBYTES, wszIOReadBytes, ARRAY_SIZE(wszIOReadBytes)); + LoadStringW(hInst, IDS_IOWRITEBYTES, wszIOWriteBytes, ARRAY_SIZE(wszIOWriteBytes)); + LoadStringW(hInst, IDS_IOOTHERBYTES, wszIOOtherBytes, ARRAY_SIZE(wszIOOtherBytes)); } static int InsertColumn(int nCol, LPCWSTR lpszColumnHeading, int nFormat, int nWidth, int nSubItem) diff --git a/programs/taskmgr/dbgchnl.c b/programs/taskmgr/dbgchnl.c index 6e2dea0e14..7200eb476c 100644 --- a/programs/taskmgr/dbgchnl.c +++ b/programs/taskmgr/dbgchnl.c @@ -113,7 +113,7 @@ static int list_channel_CB(HANDLE hProcess, void* addr, struct __wine_debug_ int index; HWND hChannelLV = user; - MultiByteToWideChar(CP_ACP, 0, channel->name, sizeof(channel->name), nameW, sizeof(nameW)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, channel->name, sizeof(channel->name), nameW, ARRAY_SIZE(nameW)); lvitem.mask = LVIF_TEXT; lvitem.pszText = nameW; @@ -231,7 +231,7 @@ static void DebugChannels_OnCreate(HWND hwndDlg) LVCOLUMNW lvc; WCHAR debug_channelW[255]; - LoadStringW(hInst, IDS_DEBUG_CHANNEL, debug_channelW, sizeof(debug_channelW)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_DEBUG_CHANNEL, debug_channelW, ARRAY_SIZE(debug_channelW)); lvc.mask = LVCF_FMT | LVCF_TEXT | LVCF_WIDTH; lvc.fmt = LVCFMT_LEFT; @@ -293,8 +293,8 @@ static void DebugChannels_OnNotify(HWND hDlg, LPARAM lParam) unsigned bitmask = 1 << (lhti.iSubItem - 1); struct cce_user user; - ListView_GetItemTextA(hChannelLV, lhti.iItem, 0, name, sizeof(name) / sizeof(name[0])); - ListView_GetItemTextW(hChannelLV, lhti.iItem, lhti.iSubItem, val, sizeof(val) / sizeof(val[0])); + ListView_GetItemTextA(hChannelLV, lhti.iItem, 0, name, ARRAY_SIZE(name)); + ListView_GetItemTextW(hChannelLV, lhti.iItem, lhti.iSubItem, val, ARRAY_SIZE(val)); user.name = name; user.value = (val[0] == 'x') ? 0 : bitmask; user.mask = bitmask; diff --git a/programs/taskmgr/debug.c b/programs/taskmgr/debug.c index 10fa912feb..ceb27d11f9 100644 --- a/programs/taskmgr/debug.c +++ b/programs/taskmgr/debug.c @@ -57,9 +57,9 @@ void ProcessPage_OnDebug(void) 'A','e','D','e','b','u','g',0}; static const WCHAR wszDebugger[] = {'D','e','b','u','g','g','e','r',0}; - LoadStringW(hInst, IDS_WARNING_TITLE, wszWarnTitle, sizeof(wszWarnTitle)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_DEBUG_UNABLE2DEBUG, wszUnable2Debug, sizeof(wszUnable2Debug)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_DEBUG_MESSAGE, wszWarnMsg, sizeof(wszWarnMsg)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_WARNING_TITLE, wszWarnTitle, ARRAY_SIZE(wszWarnTitle)); + LoadStringW(hInst, IDS_DEBUG_UNABLE2DEBUG, wszUnable2Debug, ARRAY_SIZE(wszUnable2Debug)); + LoadStringW(hInst, IDS_DEBUG_MESSAGE, wszWarnMsg, ARRAY_SIZE(wszWarnMsg)); Count = SendMessageW(hProcessPageListCtrl, LVM_GETITEMCOUNT, 0, 0); for (Index=0; Index<Count; Index++) @@ -82,14 +82,14 @@ void ProcessPage_OnDebug(void) if (MessageBoxW(hMainWnd, wszWarnMsg, wszWarnTitle, MB_YESNO|MB_ICONWARNING) != IDYES) { - GetLastErrorText(wstrErrorText, sizeof(wstrErrorText)/sizeof(WCHAR)); + GetLastErrorText(wstrErrorText, ARRAY_SIZE(wstrErrorText)); MessageBoxW(hMainWnd, wstrErrorText, wszUnable2Debug, MB_OK|MB_ICONSTOP); return; } if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, wszSubKey, 0, KEY_READ, &hKey) != ERROR_SUCCESS) { - GetLastErrorText(wstrErrorText, sizeof(wstrErrorText)/sizeof(WCHAR)); + GetLastErrorText(wstrErrorText, ARRAY_SIZE(wstrErrorText)); MessageBoxW(hMainWnd, wstrErrorText, wszUnable2Debug, MB_OK|MB_ICONSTOP); return; } @@ -97,7 +97,7 @@ void ProcessPage_OnDebug(void) dwDebuggerSize = 260; if (RegQueryValueExW(hKey, wszDebugger, NULL, NULL, (LPBYTE)wstrDebugger, &dwDebuggerSize) != ERROR_SUCCESS) { - GetLastErrorText(wstrErrorText, sizeof(wstrErrorText)/sizeof(WCHAR)); + GetLastErrorText(wstrErrorText, ARRAY_SIZE(wstrErrorText)); MessageBoxW(hMainWnd, wstrErrorText, wszUnable2Debug, MB_OK|MB_ICONSTOP); RegCloseKey(hKey); return; @@ -108,7 +108,7 @@ void ProcessPage_OnDebug(void) hDebugEvent = CreateEventW(NULL, FALSE, FALSE, NULL); if (!hDebugEvent) { - GetLastErrorText(wstrErrorText, sizeof(wstrErrorText)/sizeof(WCHAR)); + GetLastErrorText(wstrErrorText, ARRAY_SIZE(wstrErrorText)); MessageBoxW(hMainWnd, wstrErrorText, wszUnable2Debug, MB_OK|MB_ICONSTOP); return; } @@ -120,7 +120,7 @@ void ProcessPage_OnDebug(void) si.cb = sizeof(STARTUPINFOW); if (!CreateProcessW(NULL, wstrDebugPath, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) { - GetLastErrorText(wstrErrorText, sizeof(wstrErrorText)/sizeof(WCHAR)); + GetLastErrorText(wstrErrorText, ARRAY_SIZE(wstrErrorText)); MessageBoxW(hMainWnd, wstrErrorText, wszUnable2Debug, MB_OK|MB_ICONSTOP); } diff --git a/programs/taskmgr/endproc.c b/programs/taskmgr/endproc.c index 89c2d7bf80..7ed5ff08c6 100644 --- a/programs/taskmgr/endproc.c +++ b/programs/taskmgr/endproc.c @@ -38,9 +38,9 @@ static WCHAR wszUnable2Terminate[255]; static void load_message_strings(void) { - LoadStringW(hInst, IDS_TERMINATE_MESSAGE, wszWarnMsg, sizeof(wszWarnMsg)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_TERMINATE_UNABLE2TERMINATE, wszUnable2Terminate, sizeof(wszUnable2Terminate)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_WARNING_TITLE, wszWarnTitle, sizeof(wszWarnTitle)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_TERMINATE_MESSAGE, wszWarnMsg, ARRAY_SIZE(wszWarnMsg)); + LoadStringW(hInst, IDS_TERMINATE_UNABLE2TERMINATE, wszUnable2Terminate, ARRAY_SIZE(wszUnable2Terminate)); + LoadStringW(hInst, IDS_WARNING_TITLE, wszWarnTitle, ARRAY_SIZE(wszWarnTitle)); } void ProcessPage_OnEndProcess(void) @@ -79,14 +79,14 @@ void ProcessPage_OnEndProcess(void) if (!hProcess) { - GetLastErrorText(wstrErrorText, sizeof(wstrErrorText)/sizeof(WCHAR)); + GetLastErrorText(wstrErrorText, ARRAY_SIZE(wstrErrorText)); MessageBoxW(hMainWnd, wstrErrorText,wszUnable2Terminate, MB_OK|MB_ICONSTOP); return; } if (!TerminateProcess(hProcess, 0)) { - GetLastErrorText(wstrErrorText, sizeof(wstrErrorText)/sizeof(WCHAR)); + GetLastErrorText(wstrErrorText, ARRAY_SIZE(wstrErrorText)); MessageBoxW(hMainWnd, wstrErrorText,wszUnable2Terminate, MB_OK|MB_ICONSTOP); } @@ -129,14 +129,14 @@ void ProcessPage_OnEndProcessTree(void) if (!hProcess) { - GetLastErrorText(wstrErrorText, sizeof(wstrErrorText)/sizeof(WCHAR)); + GetLastErrorText(wstrErrorText, ARRAY_SIZE(wstrErrorText)); MessageBoxW(hMainWnd, wstrErrorText,wszUnable2Terminate, MB_OK|MB_ICONSTOP); return; } if (!TerminateProcess(hProcess, 0)) { - GetLastErrorText(wstrErrorText, sizeof(wstrErrorText)/sizeof(WCHAR)); + GetLastErrorText(wstrErrorText, ARRAY_SIZE(wstrErrorText)); MessageBoxW(hMainWnd, wstrErrorText,wszUnable2Terminate, MB_OK|MB_ICONSTOP); } diff --git a/programs/taskmgr/perfdata.c b/programs/taskmgr/perfdata.c index aa19914d61..f86d52159f 100644 --- a/programs/taskmgr/perfdata.c +++ b/programs/taskmgr/perfdata.c @@ -248,7 +248,7 @@ void PerfDataRefresh(void) else { WCHAR idleW[255]; - LoadStringW(hInst, IDS_SYSTEM_IDLE_PROCESS, idleW, sizeof(idleW)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_SYSTEM_IDLE_PROCESS, idleW, ARRAY_SIZE(idleW)); lstrcpyW(pPerfData[Idx].ImageName, idleW ); } diff --git a/programs/taskmgr/perfpage.c b/programs/taskmgr/perfpage.c index 3969ce41a2..63fb009eda 100644 --- a/programs/taskmgr/perfpage.c +++ b/programs/taskmgr/perfpage.c @@ -141,7 +141,7 @@ static DWORD WINAPI PerformancePageRefreshThread(void *lpParameter) static const WCHAR wszFormatDigit[] = {'%','u',0}; WCHAR wszMemUsage[255]; - LoadStringW(hInst, IDS_STATUS_BAR_MEMORY_USAGE, wszMemUsage, sizeof(wszMemUsage)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_STATUS_BAR_MEMORY_USAGE, wszMemUsage, ARRAY_SIZE(wszMemUsage)); /* Create the event */ hPerformancePageEvent = CreateEventW(NULL, TRUE, TRUE, NULL); @@ -190,7 +190,7 @@ static DWORD WINAPI PerformancePageRefreshThread(void *lpParameter) args[1] = CommitChargeLimit; FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ARGUMENT_ARRAY, wszMemUsage, 0, 0, Text, - sizeof(Text)/sizeof(*Text), (__ms_va_list*)args); + ARRAY_SIZE(Text), (__ms_va_list*)args); SendMessageW(hStatusWnd, SB_SETTEXTW, 2, (LPARAM)Text); /* diff --git a/programs/taskmgr/priority.c b/programs/taskmgr/priority.c index 577a1aee14..90323db0c4 100644 --- a/programs/taskmgr/priority.c +++ b/programs/taskmgr/priority.c @@ -44,9 +44,9 @@ static void DoSetPriority(DWORD priority) WCHAR wszWarnTitle[255]; WCHAR wszUnable2Change[255]; - LoadStringW(hInst, IDS_PRIORITY_CHANGE_MESSAGE, wszWarnMsg, sizeof(wszWarnMsg)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_WARNING_TITLE, wszWarnTitle, sizeof(wszWarnTitle)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_PRIORITY_UNABLE2CHANGE, wszUnable2Change, sizeof(wszUnable2Change)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_PRIORITY_CHANGE_MESSAGE, wszWarnMsg, ARRAY_SIZE(wszWarnMsg)); + LoadStringW(hInst, IDS_WARNING_TITLE, wszWarnTitle, ARRAY_SIZE(wszWarnTitle)); + LoadStringW(hInst, IDS_PRIORITY_UNABLE2CHANGE, wszUnable2Change, ARRAY_SIZE(wszUnable2Change)); Count = SendMessageW(hProcessPageListCtrl, LVM_GETITEMCOUNT, 0, 0); for (Index=0; Index<Count; Index++) @@ -74,14 +74,14 @@ static void DoSetPriority(DWORD priority) if (!hProcess) { - GetLastErrorText(wstrErrorText, sizeof(wstrErrorText)/sizeof(WCHAR)); + GetLastErrorText(wstrErrorText, ARRAY_SIZE(wstrErrorText)); MessageBoxW(hMainWnd, wstrErrorText, wszUnable2Change, MB_OK|MB_ICONSTOP); return; } if (!SetPriorityClass(hProcess, priority)) { - GetLastErrorText(wstrErrorText, sizeof(wstrErrorText)/sizeof(WCHAR)); + GetLastErrorText(wstrErrorText, ARRAY_SIZE(wstrErrorText)); MessageBoxW(hMainWnd, wstrErrorText, wszUnable2Change, MB_OK|MB_ICONSTOP); } diff --git a/programs/taskmgr/procpage.c b/programs/taskmgr/procpage.c index beccd86e5f..5ea2e6b044 100644 --- a/programs/taskmgr/procpage.c +++ b/programs/taskmgr/procpage.c @@ -384,8 +384,8 @@ static DWORD WINAPI ProcessPageRefreshThread(void *lpParameter) WCHAR wszCPU_Usage[255]; WCHAR wszProcesses[255]; - LoadStringW(hInst, IDS_STATUS_BAR_CPU_USAGE, wszCPU_Usage, sizeof(wszCPU_Usage)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_STATUS_BAR_PROCESSES, wszProcesses, sizeof(wszProcesses)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_STATUS_BAR_CPU_USAGE, wszCPU_Usage, ARRAY_SIZE(wszCPU_Usage)); + LoadStringW(hInst, IDS_STATUS_BAR_PROCESSES, wszProcesses, ARRAY_SIZE(wszProcesses)); /* Create the event */ hProcessPageEvent = CreateEventW(NULL, TRUE, TRUE, NULL); diff --git a/programs/taskmgr/taskmgr.c b/programs/taskmgr/taskmgr.c index b280f7975d..1983d4d443 100644 --- a/programs/taskmgr/taskmgr.c +++ b/programs/taskmgr/taskmgr.c @@ -122,9 +122,9 @@ static BOOL OnCreate(HWND hWnd) static WCHAR wszProcesses[255]; static WCHAR wszPerformance[255]; - LoadStringW(hInst, IDS_APPLICATIONS, wszApplications, sizeof(wszApplications)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_PROCESSES, wszProcesses, sizeof(wszProcesses)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_PERFORMANCE, wszPerformance, sizeof(wszPerformance)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_APPLICATIONS, wszApplications, ARRAY_SIZE(wszApplications)); + LoadStringW(hInst, IDS_PROCESSES, wszProcesses, ARRAY_SIZE(wszProcesses)); + LoadStringW(hInst, IDS_PERFORMANCE, wszPerformance, ARRAY_SIZE(wszPerformance)); SendMessageW(hMainWnd, WM_SETICON, ICON_BIG, (LPARAM)LoadIconW(hInst, MAKEINTRESOURCEW(IDI_TASKMANAGER))); SendMessageW(hMainWnd, WM_SETICON, ICON_SMALL, @@ -501,8 +501,8 @@ static void TaskManager_OnExitMenuLoop(HWND hWnd) WCHAR wszCPU_Usage[255]; WCHAR wszProcesses[255]; - LoadStringW(hInst, IDS_STATUS_BAR_CPU_USAGE, wszCPU_Usage, sizeof(wszCPU_Usage)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_STATUS_BAR_PROCESSES, wszProcesses, sizeof(wszProcesses)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_STATUS_BAR_CPU_USAGE, wszCPU_Usage, ARRAY_SIZE(wszCPU_Usage)); + LoadStringW(hInst, IDS_STATUS_BAR_PROCESSES, wszProcesses, ARRAY_SIZE(wszProcesses)); bInMenuLoop = FALSE; /* Update the status bar pane sizes */ @@ -522,7 +522,7 @@ static void TaskManager_OnMenuSelect(HWND hWnd, UINT nItemID, UINT nFlags, HMENU { WCHAR wstr[256] = {0}; - LoadStringW(hInst, nItemID, wstr, sizeof(wstr)/sizeof(WCHAR)); + LoadStringW(hInst, nItemID, wstr, ARRAY_SIZE(wstr)); SendMessageW(hStatusWnd, SB_SETTEXTW, 0, (LPARAM)wstr); } @@ -610,16 +610,16 @@ static void TaskManager_OnTabWndSelChange(void) WCHAR wszCPUHistory[255]; WCHAR wszShowKernelTimes[255]; - LoadStringW(hInst, IDS_VIEW_LARGE, wszLargeIcons, sizeof(wszLargeIcons)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_VIEW_SMALL, wszSmallIcons, sizeof(wszSmallIcons)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_VIEW_DETAILS, wszDetails, sizeof(wszDetails)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_WINDOWS, wszWindows, sizeof(wszWindows)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_VIEW_SELECTCOLUMNS, wszSelectColumns, sizeof(wszSelectColumns)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_OPTIONS_SHOW16BITTASKS, wszShow16bTasks, sizeof(wszShow16bTasks)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_VIEW_CPUHISTORY_ONEGRAPHALL, wszOneGraphAllCPU, sizeof(wszOneGraphAllCPU)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_VIEW_CPUHISTORY_ONEGRAPHPERCPU, wszOneGraphPerCPU, sizeof(wszOneGraphPerCPU)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_VIEW_CPUHISTORY, wszCPUHistory, sizeof(wszCPUHistory)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_VIEW_SHOWKERNELTIMES, wszShowKernelTimes, sizeof(wszShowKernelTimes)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_VIEW_LARGE, wszLargeIcons, ARRAY_SIZE(wszLargeIcons)); + LoadStringW(hInst, IDS_VIEW_SMALL, wszSmallIcons, ARRAY_SIZE(wszSmallIcons)); + LoadStringW(hInst, IDS_VIEW_DETAILS, wszDetails, ARRAY_SIZE(wszDetails)); + LoadStringW(hInst, IDS_WINDOWS, wszWindows, ARRAY_SIZE(wszWindows)); + LoadStringW(hInst, IDS_VIEW_SELECTCOLUMNS, wszSelectColumns, ARRAY_SIZE(wszSelectColumns)); + LoadStringW(hInst, IDS_OPTIONS_SHOW16BITTASKS, wszShow16bTasks, ARRAY_SIZE(wszShow16bTasks)); + LoadStringW(hInst, IDS_VIEW_CPUHISTORY_ONEGRAPHALL, wszOneGraphAllCPU, ARRAY_SIZE(wszOneGraphAllCPU)); + LoadStringW(hInst, IDS_VIEW_CPUHISTORY_ONEGRAPHPERCPU, wszOneGraphPerCPU, ARRAY_SIZE(wszOneGraphPerCPU)); + LoadStringW(hInst, IDS_VIEW_CPUHISTORY, wszCPUHistory, ARRAY_SIZE(wszCPUHistory)); + LoadStringW(hInst, IDS_VIEW_SHOWKERNELTIMES, wszShowKernelTimes, ARRAY_SIZE(wszShowKernelTimes)); hMenu = GetMenu(hMainWnd); hViewMenu = GetSubMenu(hMenu, 2); diff --git a/programs/taskmgr/trayicon.c b/programs/taskmgr/trayicon.c index af98474c24..b814e8c7c0 100644 --- a/programs/taskmgr/trayicon.c +++ b/programs/taskmgr/trayicon.c @@ -140,7 +140,7 @@ BOOL TrayIcon_ShellAddTrayIcon(void) BOOL bRetVal; WCHAR wszCPU_Usage[255]; - LoadStringW(hInst, IDS_STATUS_BAR_CPU_USAGE, wszCPU_Usage, sizeof(wszCPU_Usage)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_STATUS_BAR_CPU_USAGE, wszCPU_Usage, ARRAY_SIZE(wszCPU_Usage)); memset(&nid, 0, sizeof(NOTIFYICONDATAW)); @@ -187,8 +187,8 @@ BOOL TrayIcon_ShellUpdateTrayIcon(void) BOOL bRetVal; WCHAR wszCPU_Usage[255]; - LoadStringW(hInst, IDS_STATUS_BAR_CPU_USAGE, wszCPU_Usage, sizeof(wszCPU_Usage)/sizeof(WCHAR)); - + LoadStringW(hInst, IDS_STATUS_BAR_CPU_USAGE, wszCPU_Usage, ARRAY_SIZE(wszCPU_Usage)); + memset(&nid, 0, sizeof(NOTIFYICONDATAW)); hIcon = TrayIcon_GetProcessorUsageIcon(); -- 2.14.4

1 0

[PATCH] amstream: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 23 Jul '18

23 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/amstream/main.c | 4 ++-- dlls/amstream/tests/amstream.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/amstream/main.c b/dlls/amstream/main.c index 2cadf9c32f..65aafba3e6 100644 --- a/dlls/amstream/main.c +++ b/dlls/amstream/main.c @@ -174,13 +174,13 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) && ! IsEqualGUID( &IID_IUnknown, riid) ) return E_NOINTERFACE; - for (i=0; i < sizeof(object_creation)/sizeof(object_creation[0]); i++) + for (i = 0; i < ARRAY_SIZE(object_creation); i++) { if (IsEqualGUID(object_creation[i].clsid, rclsid)) break; } - if (i == sizeof(object_creation)/sizeof(object_creation[0])) + if (i == ARRAY_SIZE(object_creation)) { FIXME("%s: no class found.\n", debugstr_guid(rclsid)); return CLASS_E_CLASSNOTAVAILABLE; diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 1a14572c8a..52e691fea4 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -479,7 +479,7 @@ static void test_media_streams(void) ok(!lstrcmpW(info.achName, id), "Pin name is %s instead of %s\n", wine_dbgstr_w(info.achName), wine_dbgstr_w(id)); hr = IPin_EnumMediaTypes(pins[i], &enum_media_types); ok(hr == S_OK, "IPin_EnumMediaTypes returned: %x\n", hr); - hr = IEnumMediaTypes_Next(enum_media_types, sizeof(media_types) / sizeof(media_types[0]), media_types, &nb_media_types); + hr = IEnumMediaTypes_Next(enum_media_types, ARRAY_SIZE(media_types), media_types, &nb_media_types); ok(SUCCEEDED(hr), "IEnumMediaTypes_Next returned: %x\n", hr); ok(nb_media_types > 0, "nb_media_types should be >0\n"); IEnumMediaTypes_Release(enum_media_types); -- 2.14.4

1 0

[PATCH] dsound: Correctly calculate angle between vectors with equal and opposite directions
by Andrew Eikum 23 Jul '18

23 Jul '18

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/dsound/sound3d.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c index 03fd3d4678..8dafa1dd64 100644 --- a/dlls/dsound/sound3d.c +++ b/dlls/dsound/sound3d.c @@ -111,6 +111,13 @@ static inline D3DVALUE AngleBetweenVectorsRad (const D3DVECTOR *a, const D3DVECT return 0; cos = product/(la*lb); + if(fabs(1 - cos) < 0.0001f){ + angle = 0; + }else if(fabs(-1 - cos) < 0.0001f){ + angle = M_PI; + }else{ + angle = acos(cos); + } angle = acos(cos); TRACE("angle between (%f,%f,%f) and (%f,%f,%f) = %f radians (%f degrees)\n", a->x, a->y, a->z, b->x, b->y, b->z, angle, RadToDeg(angle)); -- 2.18.0

1 0

The compiled from source WINE has no font antialiasing, but installed from the package has.
by John Found 23 Jul '18

23 Jul '18

When I build WINE from source code and then run it from the build directory, all programs run with weird font rendering: some fonts has only grayscale antialiasing, most are not antialiased at all. Subpixel smooting is not working at all. The installed from the system repositories WINE (Manjaro Linux/Arch) has fine subpixel antialiasing. Both versions run on the same WINEPREFIX (~/.wine/) and all the registry keys are properly set for subpixel antialiasing. Tried to make new wine prefix, but the result is the same, with the difference that even the rare grayscale antialiasing disappeared. When building, I am following the directions from here: https://wiki.winehq.org/Building_Wine#Shared_WoW64 What I am doing wrong when building and how to diagnose/fix it? -- John Found <johnfound(a)asm32.info>

2 1

Wine staging 3.13 release
by Alistair Leslie-Hughes 23 Jul '18

23 Jul '18

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary of the past few weeks * Rebased to current wine 3.13 (880 patches are applied to wine vanilla) * Reviewed and upstreamed patches. Updated patchsets * xaudio2 WMA support. * kernelbase-PathCchCombineEx * winepulse-PulseAudio_Support Added * [44888] Implement WINED3DFMT_B8G8R8X8_UNORM to WINED3DFMT_L8_UNORM conversion * [36763] Rogue Squadron 3D 1.3: Crashes with game resolutions above 640x480 * [28282] Sound constantly crackling in lot of games Where can you help * Run Steam/Battle.net/UPlay. * Try you favorite game. * Test your favorite applications. * Steal staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

3 5

[PATCH] mmdevapi: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 23 Jul '18

23 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mmdevapi/devenum.c | 10 +++++----- dlls/mmdevapi/main.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index b189e8e060..685ec27de6 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -338,7 +338,7 @@ static MMDevice *MMDevice_Create(WCHAR *name, GUID *id, EDataFlow flow, DWORD st cur->state = state; cur->devguid = *id; - StringFromGUID2(&cur->devguid, guidstr, sizeof(guidstr)/sizeof(*guidstr)); + StringFromGUID2(&cur->devguid, guidstr, ARRAY_SIZE(guidstr)); if (flow == eRender) root = key_render; @@ -429,7 +429,7 @@ static HRESULT load_devices_from_reg(void) DWORD len; PROPVARIANT pv = { VT_EMPTY }; - len = sizeof(guidvalue)/sizeof(guidvalue[0]); + len = ARRAY_SIZE(guidvalue); ret = RegEnumKeyExW(cur, i++, guidvalue, &len, NULL, NULL, NULL, NULL); if (ret == ERROR_NO_MORE_ITEMS) { @@ -1395,7 +1395,7 @@ static HRESULT WINAPI MMDevPropStore_GetCount(IPropertyStore *iface, DWORD *npro return hr; *nprops = 0; do { - DWORD len = sizeof(buffer)/sizeof(*buffer); + DWORD len = ARRAY_SIZE(buffer); if (RegEnumValueW(propkey, i, buffer, &len, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) break; i++; @@ -1410,7 +1410,7 @@ static HRESULT WINAPI MMDevPropStore_GetAt(IPropertyStore *iface, DWORD prop, PR { MMDevPropStore *This = impl_from_IPropertyStore(iface); WCHAR buffer[50]; - DWORD len = sizeof(buffer)/sizeof(*buffer); + DWORD len = ARRAY_SIZE(buffer); HRESULT hr; HKEY propkey; @@ -1530,7 +1530,7 @@ static HRESULT WINAPI PB_Read(IPropertyBag *iface, LPCOLESTR name, VARIANT *var, if (!lstrcmpW(name, dsguid)) { WCHAR guidstr[39]; - StringFromGUID2(&This->devguid, guidstr,sizeof(guidstr)/sizeof(*guidstr)); + StringFromGUID2(&This->devguid, guidstr,ARRAY_SIZE(guidstr)); var->n1.n2.vt = VT_BSTR; var->n1.n2.n3.bstrVal = SysAllocString(guidstr); return S_OK; diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c index 2b0a6f946b..8886975c96 100644 --- a/dlls/mmdevapi/main.c +++ b/dlls/mmdevapi/main.c @@ -295,7 +295,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) return E_NOINTERFACE; } - for (i = 0; i < sizeof(MMDEVAPI_CF)/sizeof(MMDEVAPI_CF[0]); ++i) + for (i = 0; i < ARRAY_SIZE(MMDEVAPI_CF); ++i) { if (IsEqualGUID(rclsid, MMDEVAPI_CF[i].rclsid)) { IClassFactory_AddRef(&MMDEVAPI_CF[i].IClassFactory_iface); -- 2.14.4

2 1

[PATCH] api-ms-win-devices-config-l1-1-0: Add dll.
by Andrey Gusev 23 Jul '18

23 Jul '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- configure | 2 + configure.ac | 1 + .../Makefile.in | 1 + .../api-ms-win-devices-config-l1-1-0.spec | 38 +++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 43 insertions(+) create mode 100644 dlls/api-ms-win-devices-config-l1-1-0/Makefile.in create mode 100644 dlls/api-ms-win-devices-config-l1-1-0/api-ms-win-devices-config-l1-1-0.spec diff --git a/configure b/configure index 337ce912fe..fd58e1538b 100755 --- a/configure +++ b/configure @@ -1045,6 +1045,7 @@ enable_api_ms_win_crt_stdio_l1_1_0 enable_api_ms_win_crt_string_l1_1_0 enable_api_ms_win_crt_time_l1_1_0 enable_api_ms_win_crt_utility_l1_1_0 +enable_api_ms_win_devices_config_l1_1_0 enable_api_ms_win_devices_config_l1_1_1 enable_api_ms_win_devices_query_l1_1_1 enable_api_ms_win_downlevel_advapi32_l1_1_0 @@ -19137,6 +19138,7 @@ wine_fn_config_makefile dlls/api-ms-win-crt-stdio-l1-1-0 enable_api_ms_win_crt_s wine_fn_config_makefile dlls/api-ms-win-crt-string-l1-1-0 enable_api_ms_win_crt_string_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-crt-time-l1-1-0 enable_api_ms_win_crt_time_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-crt-utility-l1-1-0 enable_api_ms_win_crt_utility_l1_1_0 +wine_fn_config_makefile dlls/api-ms-win-devices-config-l1-1-0 enable_api_ms_win_devices_config_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-devices-config-l1-1-1 enable_api_ms_win_devices_config_l1_1_1 wine_fn_config_makefile dlls/api-ms-win-devices-query-l1-1-1 enable_api_ms_win_devices_query_l1_1_1 wine_fn_config_makefile dlls/api-ms-win-downlevel-advapi32-l1-1-0 enable_api_ms_win_downlevel_advapi32_l1_1_0 diff --git a/configure.ac b/configure.ac index be247ea200..ddf7ee3a20 100644 --- a/configure.ac +++ b/configure.ac @@ -2998,6 +2998,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-crt-stdio-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-crt-string-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-crt-time-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-crt-utility-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-devices-config-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-devices-config-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-devices-query-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-downlevel-advapi32-l1-1-0) diff --git a/dlls/api-ms-win-devices-config-l1-1-0/Makefile.in b/dlls/api-ms-win-devices-config-l1-1-0/Makefile.in new file mode 100644 index 0000000000..1e11946aa7 --- /dev/null +++ b/dlls/api-ms-win-devices-config-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-devices-config-l1-1-0.dll diff --git a/dlls/api-ms-win-devices-config-l1-1-0/api-ms-win-devices-config-l1-1-0.spec b/dlls/api-ms-win-devices-config-l1-1-0/api-ms-win-devices-config-l1-1-0.spec new file mode 100644 index 0000000000..fcd3aaa4ad --- /dev/null +++ b/dlls/api-ms-win-devices-config-l1-1-0/api-ms-win-devices-config-l1-1-0.spec @@ -0,0 +1,38 @@ +@ stub CM_Delete_Class_Key +@ stub CM_Delete_DevNode_Key +@ stub CM_Delete_Device_Interface_KeyW +@ stub CM_Disable_DevNode +@ stub CM_Enable_DevNode +@ stdcall CM_Get_Child(ptr long long) setupapi.CM_Get_Child +@ stub CM_Get_Class_PropertyW +@ stub CM_Get_Class_Property_Keys +@ stdcall CM_Get_Class_Registry_PropertyW(ptr long ptr ptr long long ptr) setupapi.CM_Get_Class_Registry_PropertyW +@ stub CM_Get_Depth +@ stub CM_Get_DevNode_PropertyW +@ stub CM_Get_DevNode_Property_Keys +@ stdcall CM_Get_DevNode_Registry_PropertyW(long long ptr ptr ptr long) setupapi.CM_Get_DevNode_Registry_PropertyW +@ stdcall CM_Get_DevNode_Status(ptr ptr long long) setupapi.CM_Get_DevNode_Status +@ stdcall CM_Get_Device_IDW(ptr ptr long long) setupapi.CM_Get_Device_IDW +@ stdcall CM_Get_Device_ID_ListW(wstr ptr long long) setupapi.CM_Get_Device_ID_ListW +@ stdcall CM_Get_Device_ID_List_SizeW(ptr wstr long) setupapi.CM_Get_Device_ID_List_SizeW +@ stdcall CM_Get_Device_ID_Size(ptr ptr long) setupapi.CM_Get_Device_ID_Size +@ stub CM_Get_Device_Interface_ListW +@ stdcall CM_Get_Device_Interface_List_SizeW(ptr ptr wstr long) setupapi.CM_Get_Device_Interface_List_SizeW +@ stub CM_Get_Device_Interface_PropertyW +@ stub CM_Get_Device_Interface_Property_KeysW +@ stdcall CM_Get_Parent(ptr long long) setupapi.CM_Get_Parent +@ stub CM_Get_Sibling +@ stdcall CM_Locate_DevNodeW(ptr wstr long) setupapi.CM_Locate_DevNodeW +@ stub CM_Open_Class_KeyW +@ stdcall CM_Open_DevNode_Key(long long long long ptr long) setupapi.CM_Open_DevNode_Key +@ stub CM_Open_Device_Interface_KeyW +@ stub CM_Query_And_Remove_SubTreeW +@ stub CM_Register_Notification +@ stub CM_Set_Class_PropertyW +@ stdcall CM_Set_Class_Registry_PropertyW(ptr long ptr long long ptr) setupapi.CM_Set_Class_Registry_PropertyW +@ stub CM_Set_DevNode_PropertyW +@ stub CM_Set_DevNode_Registry_PropertyW +@ stub CM_Set_Device_Interface_PropertyW +@ stub CM_Setup_DevNode +@ stub CM_Uninstall_DevNode +@ stub CM_Unregister_Notification diff --git a/tools/make_specfiles b/tools/make_specfiles index 4faf66559d..cd3af877bb 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -105,6 +105,7 @@ my @dll_groups = [ "setupapi", "cfgmgr32", + "api-ms-win-devices-config-l1-1-0", "api-ms-win-devices-config-l1-1-1", "api-ms-win-devices-query-l1-1-1", ], -- 2.17.1

1 0

[PATCH] winemac.drv: Print the debug string and not the pointer to it
by Michael Stefaniuc 22 Jul '18

22 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winemac.drv/vulkan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winemac.drv/vulkan.c b/dlls/winemac.drv/vulkan.c index b1211dff54..d49c9a1ab2 100644 --- a/dlls/winemac.drv/vulkan.c +++ b/dlls/winemac.drv/vulkan.c @@ -342,7 +342,7 @@ static VkResult macdrv_vkEnumerateInstanceExtensionProperties(const char *layer_ unsigned int i; VkResult res; - TRACE("layer_name %p, count %p, properties %p\n", debugstr_a(layer_name), count, properties); + TRACE("layer_name %s, count %p, properties %p\n", debugstr_a(layer_name), count, properties); /* This shouldn't get called with layer_name set, the ICD loader prevents it. */ if (layer_name) -- 2.14.4

2 1

[PATCH] winex11.drv: Allow the children windows to accept WM_DROPFILES if they have WS_EX_ACCEPTFILES.
by John Found 22 Jul '18

22 Jul '18

Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=41606 Signed-off-by: John Found <johnfound(a)asm32.info> --- dlls/winex11.drv/xdnd.c | 58 +++++++++++++++++++++++++++++++++++------ 1 file changed, 50 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index 2ab28e43bf..2ba98491e1 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -254,6 +254,31 @@ void X11DRV_XDND_EnterEvent( HWND hWnd, XClientMessageEvent *event ) XFree(xdndtypes); } +/* the recursive worker for window_from_point_dnd */ +HWND do_window_from_point_dnd(HWND hwnd, POINT* point) +{ + HWND w; + w = ChildWindowFromPointEx(hwnd, *point, CWP_SKIPDISABLED | CWP_SKIPINVISIBLE); + if (w && (w != hwnd)) + { + ClientToScreen(hwnd, point); + ScreenToClient(w, point); + w = do_window_from_point_dnd(w, point); + } + return w; +} + + +/* Recursively search for the window on given coordinates in a drag&drop specific manner. */ +HWND window_from_point_dnd(HWND hwnd, POINT point) +{ + POINT p; + p.x = point.x; + p.y = point.y; + ScreenToClient(hwnd, &p); + return do_window_from_point_dnd(hwnd, &p); +} + /************************************************************************** * X11DRV_XDND_PositionEvent * @@ -270,7 +295,7 @@ void X11DRV_XDND_PositionEvent( HWND hWnd, XClientMessageEvent *event ) HRESULT hr; XDNDxy = root_to_virtual_screen( event->data.l[2] >> 16, event->data.l[2] & 0xFFFF ); - targetWindow = WindowFromPoint(XDNDxy); + targetWindow = window_from_point_dnd(hWnd, XDNDxy); pointl.x = XDNDxy.x; pointl.y = XDNDxy.y; @@ -334,11 +359,18 @@ void X11DRV_XDND_PositionEvent( HWND hWnd, XClientMessageEvent *event ) if (XDNDAccepted) accept = 1; - else if ((GetWindowLongW( hWnd, GWL_EXSTYLE ) & WS_EX_ACCEPTFILES) && - X11DRV_XDND_HasHDROP()) + else { - accept = 1; - effect = DROPEFFECT_COPY; + /* fallback search for window able to accept these files. */ + + while (targetWindow && !(GetWindowLongW(targetWindow, GWL_EXSTYLE) & WS_EX_ACCEPTFILES)) + targetWindow = GetParent(targetWindow); + + if (targetWindow && X11DRV_XDND_HasHDROP()) + { + accept = 1; + effect = DROPEFFECT_COPY; + } } TRACE("actionRequested(%ld) accept(%d) chosen(0x%x) at x(%d),y(%d)\n", @@ -423,10 +455,20 @@ void X11DRV_XDND_DropEvent( HWND hWnd, XClientMessageEvent *event ) { /* Only send WM_DROPFILES if Drop didn't succeed or DROPEFFECT_NONE was set. * Doing both causes winamp to duplicate the dropped files (#29081) */ - if ((GetWindowLongW( hWnd, GWL_EXSTYLE ) & WS_EX_ACCEPTFILES) && - X11DRV_XDND_HasHDROP()) + POINT pt; + HWND hwnd_drop; + + pt.x = XDNDxy.x; + pt.y = XDNDxy.y; + + hwnd_drop = window_from_point_dnd(hWnd, pt); + + while (hwnd_drop && !(GetWindowLongW(hwnd_drop, GWL_EXSTYLE) & WS_EX_ACCEPTFILES)) + hwnd_drop = GetParent(hwnd_drop); + + if (hwnd_drop) { - HRESULT hr = X11DRV_XDND_SendDropFiles( hWnd ); + HRESULT hr = X11DRV_XDND_SendDropFiles(hwnd_drop); if (SUCCEEDED(hr)) { accept = 1; -- 2.18.0

2 2

Support for loading .NET DLLs with embedded manifests declaring clrClass GUIDs
by Daniel Kamil Kozar 22 Jul '18

22 Jul '18

Hello, Wine developers. I've been independently trying to get to the bottom of bug 43270, which is the last bug keeping the application from achieving the same functionality as on Windows. >From what I've been able to find out, a .NET DLL which contains an embedded manifest and the implementation of an internal plugin interface fails to load, which leads to the functionality not being available at program runtime. The request to create an instance of the class provided by said DLL is done by calling CoCreateInstance() from another DLL, which contains a "startup helper" and is called by the application in an early stage. CoCreateInstance() correctly calls into mscoree in order to service the request for creating the instance, but the function takes a peek into the registry for the CLSID information for some reason. I'd like to know, if possible : 1. Is CoCreateInstance() supposed to look into the registry for information regarding "registration-free" (i.e. with an embedded manifest) .NET DLLs? I haven't found the CLSID inside the registry in a working real Windows installation, so it doesn't seem likely to me. 2. How are the "registration-free" DLLs supposed to be located? The only thing I could find regarding this is the add_dll_redirect() function in actctx.c, which is called when the manifest contains a <File> directive. However, adding the directive to said DLL's doesn't help, as the file still fails to load, despite the same code path being executed and the DLL being added to the redirects. 3. Generally, is a similar setup currently supported by Wine? Or am I just looking for stuff that simply doesn't exist inside the source? Thank you in advance, Daniel

2 2

[PATCH v4 1/2] kernel32: resource: Changed QUEUEDUPDATES to match MS offset
by Jon Doron 22 Jul '18

22 Jul '18

The utility muirct.exe for some reason accesses the opaque HANDLE that is returned by BeginUpdateResource, it assumes a certain structure in which (on 32bit systems) there is a pointer to the wide repesentation of the file name in offset 0x18 (0x30 on 64bit). Refer to: muirct!BldToolsEndUpdateResourceW called from muirct!CopyChecksumToFile Sample execution: MUIRCT.EXE -c "ui.exe" -e "de-DE\ui.exe.mui" Signed-off-by: Jon Doron <arilou(a)gmail.com> --- dlls/kernel32/resource.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/resource.c b/dlls/kernel32/resource.c index 73f3cca363..59bc7a8cdc 100644 --- a/dlls/kernel32/resource.c +++ b/dlls/kernel32/resource.c @@ -635,7 +635,8 @@ DWORD WINAPI SizeofResource( HINSTANCE hModule, HRSRC hRsrc ) typedef struct { - LPWSTR pFileName; + void *Reserved[6]; + LPWSTR pFileName; /* Must be in offset 0x18 on 32bit and 0x30 on 64bit */ BOOL bDeleteExistingResources; struct list root; } QUEUEDUPDATES; -- 2.17.1

2 2

Vacation
by Alexandre Julliard 21 Jul '18

21 Jul '18

Folks, I'll be gone on vacation for the next three weeks, so there won't be any commits during that time. There also won't be a release two weeks from now; release 3.14 will be out in four weeks. I'd encourage everyone to still submit patches during that time. Note that patches won't get assigned to reviewers since that process is not fully automated, but the usual reviewers should still feel free to review and sign off on patches, so that I can have a large number of patches reviewed and ready to commit when I get back. Have fun while I'm gone ;-) -- Alexandre Julliard julliard(a)winehq.org

1 0

[PATCH v2] find: First simple implementation and tests
by Fabian Maurer 21 Jul '18

21 Jul '18

The message text is the same as on windows, since the exit code doesn't seem reliable. v2: Read input text line by line Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- configure | 25 ++--- configure.ac | 1 + programs/find/Makefile.in | 5 +- programs/find/find.c | 137 +++++++++++++++++++++++++- programs/find/resources.h | 27 +++++ programs/find/rsrc.rc | 25 +++++ programs/find/tests/Makefile.in | 4 + programs/find/tests/find.c | 169 ++++++++++++++++++++++++++++++++ 8 files changed, 369 insertions(+), 24 deletions(-) create mode 100644 programs/find/resources.h create mode 100644 programs/find/rsrc.rc create mode 100644 programs/find/tests/Makefile.in create mode 100644 programs/find/tests/find.c diff --git a/configure b/configure index 337ce912fe..40f697d60c 100755 --- a/configure +++ b/configure @@ -805,7 +805,6 @@ infodir docdir oldincludedir includedir -runstatedir localstatedir sharedstatedir sysconfdir @@ -1870,7 +1869,6 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' -runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -2123,15 +2121,6 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; - -runstatedir | --runstatedir | --runstatedi | --runstated \ - | --runstate | --runstat | --runsta | --runst | --runs \ - | --run | --ru | --r) - ac_prev=runstatedir ;; - -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ - | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ - | --run=* | --ru=* | --r=*) - runstatedir=$ac_optarg ;; - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -2269,7 +2258,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir runstatedir + libdir localedir mandir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -2422,7 +2411,6 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -6803,7 +6791,7 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -6849,7 +6837,7 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -6873,7 +6861,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -6918,7 +6906,7 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -6942,7 +6930,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -20030,6 +20018,7 @@ wine_fn_config_makefile programs/explorer enable_explorer wine_fn_config_makefile programs/extrac32 enable_extrac32 wine_fn_config_makefile programs/fc enable_fc wine_fn_config_makefile programs/find enable_find +wine_fn_config_makefile programs/find/tests enable_tests wine_fn_config_makefile programs/findstr enable_findstr wine_fn_config_makefile programs/fsutil enable_fsutil wine_fn_config_makefile programs/hh enable_hh diff --git a/configure.ac b/configure.ac index be247ea200..e8edcbe522 100644 --- a/configure.ac +++ b/configure.ac @@ -3891,6 +3891,7 @@ WINE_CONFIG_MAKEFILE(programs/explorer) WINE_CONFIG_MAKEFILE(programs/extrac32) WINE_CONFIG_MAKEFILE(programs/fc) WINE_CONFIG_MAKEFILE(programs/find) +WINE_CONFIG_MAKEFILE(programs/find/tests) WINE_CONFIG_MAKEFILE(programs/findstr) WINE_CONFIG_MAKEFILE(programs/fsutil) WINE_CONFIG_MAKEFILE(programs/hh) diff --git a/programs/find/Makefile.in b/programs/find/Makefile.in index ef8d61b7ce..4a90905986 100644 --- a/programs/find/Makefile.in +++ b/programs/find/Makefile.in @@ -1,4 +1,7 @@ MODULE = find.exe -APPMODE = -mconsole -municode +APPMODE = -mconsole +IMPORTS = user32 shlwapi C_SRCS = find.c + +RC_SRCS = rsrc.rc diff --git a/programs/find/find.c b/programs/find/find.c index 9d7aecd402..bbac3eeee0 100644 --- a/programs/find/find.c +++ b/programs/find/find.c @@ -16,18 +16,145 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <windows.h> +#include <stdlib.h> +#include <shlwapi.h> + +#include "wine/heap.h" #include "wine/debug.h" +#include "resources.h" WINE_DEFAULT_DEBUG_CHANNEL(find); -int wmain(int argc, WCHAR *argv[]) +/* Reads a line from a handle, returns TRUE if there is more to be read */ +BOOL read_line_from_handle(HANDLE handle, char **line_out) +{ + int buffer_size = 4096; + char c; + DWORD bytes_read; + int length = 0; + BOOL success; + char *line = heap_alloc(buffer_size); + + for (;;) + { + success = ReadFile(handle, &c, 1, &bytes_read, NULL); + + if (c == '\n') + break; + + /* Check for EOF */ + if (!success || !bytes_read) + { + if (length == 0) + return FALSE; + else + break; + } + + /* Make sure buffer is large enough */ + if (length + bytes_read >= buffer_size) + { + buffer_size *= 2; + line = heap_realloc(line, buffer_size); + } + + line[length++] = c; + } + + line[length] = 0; + if (length - 1 >= 0 && line[length - 1] == '\r') + line[length - 1] = 0; + + *line_out = line; + return TRUE; +} + +void write_to_handle(HANDLE handle, const char *str) +{ + DWORD bytes_written_sum = 0; + DWORD length = lstrlenA(str); + do + { + DWORD bytes_written; + WriteFile(handle, str, length * sizeof(char), &bytes_written, NULL); + bytes_written_sum += bytes_written; + } while (bytes_written_sum < length); +} + +void find_printf(const char *str) +{ + write_to_handle(GetStdHandle(STD_OUTPUT_HANDLE), str); +} + +BOOL run_find_for_line(const char *line, const char *tofind) { + void *found; + + if (lstrlenA(line) == 0) + return FALSE; + + found = StrStrA(line, tofind); + + if (found) + { + find_printf(line); + find_printf("\r\n"); + return TRUE; + } + + return FALSE; +} + +int main(int argc, char *argv[]) +{ + char *line; + char *tofind = NULL; + char message_parameter_invalid[64]; + char message_switch_invalid[64]; int i; + int exitcode; + HANDLE input; - WINE_FIXME("stub:"); + TRACE("running find:"); for (i = 0; i < argc; i++) - WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); - WINE_FIXME("\n"); + { + TRACE(" %s", argv[i]); + } + TRACE("\n"); + + LoadStringA(GetModuleHandleW(NULL), IDS_INVALID_PARAMETER, message_parameter_invalid, sizeof(message_parameter_invalid)); + LoadStringA(GetModuleHandleW(NULL), IDS_INVALID_SWITCH, message_switch_invalid, sizeof(message_switch_invalid)); + + input = GetStdHandle(STD_INPUT_HANDLE); + + for (i = 1; i < argc; i++) + { + if (argv[i][0] == '/') + { + find_printf(message_switch_invalid); + return 2; + } + else if(tofind == NULL) + { + tofind = argv[i]; + } + } + + if (tofind == NULL) + { + find_printf(message_parameter_invalid); + return 2; + } + + exitcode = 1; + while (read_line_from_handle(input, &line)) + { + if (run_find_for_line(line, tofind)) + exitcode = 0; + + heap_free(line); + } - return 0; + return exitcode; } diff --git a/programs/find/resources.h b/programs/find/resources.h new file mode 100644 index 0000000000..8712d91e36 --- /dev/null +++ b/programs/find/resources.h @@ -0,0 +1,27 @@ +/* + * Resource IDs + * + * Copyright 2018 Fabian Maurer + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_FIND_RESOURCES_H +#define __WINE_FIND_RESOURCES_H + +#define IDS_INVALID_PARAMETER 1000 +#define IDS_INVALID_SWITCH 1001 + +#endif /* __WINE_FIND_RESOURCES_H */ diff --git a/programs/find/rsrc.rc b/programs/find/rsrc.rc new file mode 100644 index 0000000000..f10fb6285f --- /dev/null +++ b/programs/find/rsrc.rc @@ -0,0 +1,25 @@ +/* + * Copyright 2018 Fabian Maurer + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resources.h" + +STRINGTABLE +{ + IDS_INVALID_PARAMETER "FIND: Parameter format not correct\r\n" + IDS_INVALID_SWITCH "FIND: Invalid switch\r\n" +} diff --git a/programs/find/tests/Makefile.in b/programs/find/tests/Makefile.in new file mode 100644 index 0000000000..ad88243ede --- /dev/null +++ b/programs/find/tests/Makefile.in @@ -0,0 +1,4 @@ +TESTDLL = find.exe + +C_SRCS = \ + find.c diff --git a/programs/find/tests/find.c b/programs/find/tests/find.c new file mode 100644 index 0000000000..615d99ca59 --- /dev/null +++ b/programs/find/tests/find.c @@ -0,0 +1,169 @@ +/* + * Copyright 2018 Fabian Maurer + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <windows.h> +#include <stdio.h> + +#include "wine/heap.h" +#include "wine/test.h" + +char* read_all_from_handle(HANDLE handle) +{ + char buffer[4096]; + DWORD bytes_read; + DWORD length = 0; + BOOL success; + char *ret = heap_alloc_zero(1); + + for (;;) + { + success = ReadFile(handle, buffer, sizeof(buffer), &bytes_read, NULL); + if (!success || !bytes_read) + break; + ret = heap_realloc(ret, length + bytes_read); + memcpy((char *)ret + length, buffer, bytes_read); + length += bytes_read; + } + + ret[length] = 0; + return ret; +} + +/* Copied from find.exe implementation */ +void write_to_handle(HANDLE handle, const char *str) +{ + DWORD bytes_written_sum = 0; + DWORD length = lstrlenA(str); + do + { + DWORD bytes_written; + WriteFile(handle, str, length * sizeof(char), &bytes_written, NULL); + bytes_written_sum += bytes_written; + } while (bytes_written_sum < length); +} + +#define run_find(commandline, input, out_expected, exitcode_expected) \ + run_find_(commandline, input, out_expected, exitcode_expected, __FILE__, __LINE__) + +static void run_find_(const char *commandline, const char *input, const char *out_expected, int exitcode_expected, const char *file, int line) +{ + HANDLE child_stdin_read; + HANDLE child_stdout_write; + HANDLE parent_stdin_write; + HANDLE parent_stdout_read; + STARTUPINFOA startup_info = {0}; + SECURITY_ATTRIBUTES security_attributes; + PROCESS_INFORMATION process_info = {0}; + char *child_output = NULL; + char cmd[4096]; + int comparison; + DWORD exitcode; + + security_attributes.nLength = sizeof(SECURITY_ATTRIBUTES); + security_attributes.bInheritHandle = TRUE; + security_attributes.lpSecurityDescriptor = NULL; + + CreatePipe(&parent_stdout_read, &child_stdout_write, &security_attributes, 0); + CreatePipe(&child_stdin_read, &parent_stdin_write, &security_attributes, 0); + + SetHandleInformation(parent_stdout_read, HANDLE_FLAG_INHERIT, 0); + SetHandleInformation(parent_stdin_write, HANDLE_FLAG_INHERIT, 0); + + startup_info.cb = sizeof(STARTUPINFOW); + startup_info.hStdInput = child_stdin_read; + startup_info.hStdOutput = child_stdout_write; + startup_info.hStdError = NULL; + startup_info.dwFlags |= STARTF_USESTDHANDLES; + + sprintf(cmd, "find.exe %s", commandline); + CreateProcessA(NULL, cmd, NULL, NULL, TRUE, 0, NULL, NULL, &startup_info, &process_info); + CloseHandle(child_stdin_read); + CloseHandle(child_stdout_write); + + write_to_handle(parent_stdin_write, input); + CloseHandle(parent_stdin_write); + + child_output = read_all_from_handle(parent_stdout_read); + CloseHandle(parent_stdout_read); + + GetExitCodeProcess(process_info.hProcess, &exitcode); + CloseHandle(process_info.hProcess); + CloseHandle(process_info.hThread); + + comparison = lstrcmpA(child_output, out_expected); + + ok_(file, line)(comparison == 0, "\n#################### Expected:\n" + "%s\n" + "#################### But got:\n" + "%s\n" + "####################\n", + out_expected, child_output); + ok_(file, line)(exitcode == exitcode_expected, "Expected exitcode %d, got %d\n", exitcode_expected, exitcode); + + heap_free(child_output); +} + +static void test_errors(void) +{ + run_find("", "", "FIND: Parameter format not correct\r\n", 2); + todo_wine + run_find("test", "", "FIND: Parameter format not correct\r\n", 2); + todo_wine + run_find("\"test", "", "FIND: Parameter format not correct\r\n", 2); + run_find("\"test\" /XYZ", "", "FIND: Invalid switch\r\n", 2); +} + +static void test_singleline_without_switches(void) +{ + run_find("\"\"", "test", "", 1); + run_find("\"test\"", "", "", 1); + run_find("\"test\"", "test", "test\r\n", 0); + run_find("\"test\"", "test2", "test2\r\n", 0); + run_find("\"test2\"", "test", "", 1); + +} + +static void test_multiline(void) +{ + /* Newline in input shouldn't work */ + run_find("\"t1\r\nt1\"", "t1\r\nt1", "", 1); + run_find("\"t1\nt1\"", "t1\nt1", "", 1); + + /* Newline should always be displayed as \r\n */ + run_find("\"test1\"", "test1\ntest2", "test1\r\n", 0); + run_find("\"test1\"", "test1\r\ntest2", "test1\r\n", 0); + + /* Test with empty line */ + run_find("\"test1\"", "test1\n\ntest2", "test1\r\n", 0); + + /* Two strings to be found */ + run_find("\"test\"", "junk1\ntest1\ntest2\r\njunk", "test1\r\ntest2\r\n", 0); +} + +START_TEST(find) +{ + if (PRIMARYLANGID(GetUserDefaultUILanguage()) != LANG_ENGLISH) + { + skip("Tests only work with english locale.\n"); + return; + } + + test_errors(); + test_singleline_without_switches(); + test_multiline(); +} -- 2.18.0

1 0

[PATCH] ole32: read vt into a DWORD, as propvariant->vt is 16 bit (Coverity)
by Marcus Meissner 21 Jul '18

21 Jul '18

713110 Out-of-bounds access Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> --- dlls/ole32/stg_prop.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index 0213f31a8d..221463bc05 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -1045,11 +1045,13 @@ static HRESULT PropertyStorage_ReadProperty(PROPVARIANT *prop, const BYTE *data, UINT codepage, void* (WINAPI *allocate)(void *this, ULONG size), void *allocate_data) { HRESULT hr = S_OK; + DWORD vt; assert(prop); assert(data); - StorageUtl_ReadDWord(data, 0, (DWORD *)&prop->vt); + StorageUtl_ReadDWord(data, 0, &vt); data += sizeof(DWORD); + prop->vt = vt; switch (prop->vt) { case VT_EMPTY: -- 2.18.0

1 0

[PATCH] winevulkan: Correctly allocate memory for VkCommandBuffers (Coverity).
by Józef Kucia 21 Jul '18

21 Jul '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/winevulkan/vulkan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 63a7bd232bee..14e4440fbd0d 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -525,7 +525,7 @@ VkResult WINAPI wine_vkAllocateCommandBuffers(VkDevice device, wine_dbgstr_longlong(allocate_info_host.commandPool), allocate_info_host.level); - if (!(buffers[i] = heap_alloc_zero(sizeof(*buffers)))) + if (!(buffers[i] = heap_alloc_zero(sizeof(**buffers)))) { res = VK_ERROR_OUT_OF_HOST_MEMORY; break; -- 2.16.4

1 0

[PATCH v2] hnetcfg: Add more GUIDs
by Fabian Maurer 21 Jul '18

21 Jul '18

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/hnetcfg/hnetcfg.idl | 24 ++++++++++++++ include/netfw.idl | 69 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 93 insertions(+) diff --git a/dlls/hnetcfg/hnetcfg.idl b/dlls/hnetcfg/hnetcfg.idl index 763529a83b..40a3b9853f 100644 --- a/dlls/hnetcfg/hnetcfg.idl +++ b/dlls/hnetcfg/hnetcfg.idl @@ -51,3 +51,27 @@ coclass NetFwOpenPort { interface INetFwOpenPort; } uuid(e2b3c97f-6ae1-41ac-817a-f6f92166d7dd) ] coclass NetFwPolicy2 { interface INetFwPolicy2; } + +[ + helpstring("HNetCfg.FwRule"), + progid("HNetCfg.FwRule"), + threading(both), + uuid(2c5bc43e-3369-4c33-ab0c-be9469677af4) +] +coclass NetFwRule { interface INetFwRule; } + +[ + helpstring("HNetCfg.FwProduct"), + progid("HNetCfg.FwProduct"), + threading(both), + uuid(9d745ed8-c514-4d1d-bf42-751fed2d5ac7) +] +coclass NetFwProduct { interface INetFwProduct; } + +[ + helpstring("HNetCfg.FwProducts"), + progid("HNetCfg.FwProducts"), + threading(both), + uuid(cc19079b-8272-4d73-bb70-cdb533527b61) +] +coclass NetFwProducts { interface INetFwProducts; } diff --git a/include/netfw.idl b/include/netfw.idl index cf03b82075..7c5d3d40bb 100644 --- a/include/netfw.idl +++ b/include/netfw.idl @@ -643,6 +643,51 @@ interface INetFwMgr : IDispatch [out] VARIANT* restricted ); } +[ + local, + object, + uuid(71881699-18f4-458b-b892-3ffce5e07f75), + dual +] +interface INetFwProduct : IDispatch +{ + [id(1), propget] + HRESULT RuleCategories([out, retval] VARIANT *ruleCategories); + + [id(1), propput] + HRESULT RuleCategories([in] VARIANT ruleCategories); + + [id(2), propget] + HRESULT DisplayName([out, retval] BSTR *displayName); + + [id(2), propput] + HRESULT DisplayName([in] BSTR displayName); + + [id(3), propget] + HRESULT PathToSignedProductExe([out, retval] BSTR *path); +} + +[ + local, + object, + uuid(39eb36e0-2097-40bd-8af2-63a13b525362), + dual +] +interface INetFwProducts : IDispatch +{ + [id(1), propget] + HRESULT Count([out, retval] LONG *count); + + [id(2)] + HRESULT Register([in] INetFwProduct *product, [out, retval] IUnknown **registration); + + [id(3)] + HRESULT Item([in] LONG index, [out, retval] INetFwProduct **product); + + [id(DISPID_NEWENUM), propget, restricted] + HRESULT _NewEnum([out, retval] IUnknown **newEnum); +} + [ uuid(DB4F3345-3EF8-45ED-B976-25A6D3B81B71), version(1.0) @@ -694,4 +739,28 @@ library NetFwPublicTypeLib { [default] interface INetFwPolicy2; } + + [ + uuid(2c5bc43e-3369-4c33-ab0c-be9469677af4) + ] + coclass NetFwRule + { + [default] interface INetFwRule; + } + + [ + uuid(9d745ed8-c514-4d1d-bf42-751fed2d5ac7) + ] + coclass NetFwProduct + { + [default] interface INetFwProduct; + } + + [ + uuid(cc19079b-8272-4d73-bb70-cdb533527b61) + ] + coclass NetFwProducts + { + [default] interface INetFwProducts; + } } -- 2.18.0

1 0

[PATCH] dpnet: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 21 Jul '18

21 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dpnet/address.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dpnet/address.c b/dlls/dpnet/address.c index 4d55caa47e..0bfa2bca03 100644 --- a/dlls/dpnet/address.c +++ b/dlls/dpnet/address.c @@ -150,7 +150,7 @@ static const char *debugstr_SP(const GUID *id) { if (!id) return "(null)"; - for (i = 0; i < sizeof(guids)/sizeof(guids[0]); i++) { + for (i = 0; i < ARRAY_SIZE(guids); i++) { if (IsEqualGUID(id, guids[i].guid)) return guids[i].name; } -- 2.14.4

2 1

[PATCH] hnetcfg: Add more GUIDs
by Fabian Maurer 21 Jul '18

21 Jul '18

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/hnetcfg/hnetcfg.idl | 24 ++++++++++++++ include/netfw.idl | 69 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 93 insertions(+) diff --git a/dlls/hnetcfg/hnetcfg.idl b/dlls/hnetcfg/hnetcfg.idl index 763529a83b..40a3b9853f 100644 --- a/dlls/hnetcfg/hnetcfg.idl +++ b/dlls/hnetcfg/hnetcfg.idl @@ -51,3 +51,27 @@ coclass NetFwOpenPort { interface INetFwOpenPort; } uuid(e2b3c97f-6ae1-41ac-817a-f6f92166d7dd) ] coclass NetFwPolicy2 { interface INetFwPolicy2; } + +[ + helpstring("HNetCfg.FwRule"), + progid("HNetCfg.FwRule"), + threading(both), + uuid(2c5bc43e-3369-4c33-ab0c-be9469677af4) +] +coclass NetFwRule { interface INetFwRule; } + +[ + helpstring("HNetCfg.FwProduct"), + progid("HNetCfg.FwProduct"), + threading(both), + uuid(9d745ed8-c514-4d1d-bf42-751fed2d5ac7) +] +coclass NetFwProduct { interface INetFwProduct; } + +[ + helpstring("HNetCfg.FwProducts"), + progid("HNetCfg.FwProducts"), + threading(both), + uuid(cc19079b-8272-4d73-bb70-cdb533527b61) +] +coclass NetFwProducts { interface INetFwProducts; } diff --git a/include/netfw.idl b/include/netfw.idl index cf03b82075..46a5198768 100644 --- a/include/netfw.idl +++ b/include/netfw.idl @@ -643,6 +643,51 @@ interface INetFwMgr : IDispatch [out] VARIANT* restricted ); } +[ + local, + object, + uuid(71881699-18f4-458b-b892-3ffce5e07f75), + dual +] +interface INetFwProduct : IDispatch +{ + [id(1), propget] + HRESULT RuleCategories([out, retval] VARIANT *ruleCategories); + + [id(1), propput] + HRESULT RuleCategories([in] VARIANT ruleCategories); + + [id(2), propget] + HRESULT DisplayName([out, retval] BSTR *displayName); + + [id(2), propput] + HRESULT DisplayName([in] BSTR displayName); + + [id(3), propget] + HRESULT PathToSignedProductExe([out, retval] BSTR *path); +} + +[ + local, + object, + uuid(39EB36E0-2097-40BD-8AF2-63A13B525362), + dual +] +interface INetFwProducts : IDispatch +{ + [id(1), propget] + HRESULT Count([out, retval] LONG *count); + + [id(2)] + HRESULT Register([in] INetFwProduct *product, [out, retval] IUnknown **registration); + + [id(3)] + HRESULT Item([in] LONG index, [out, retval] INetFwProduct **product); + + [id(DISPID_NEWENUM), propget, restricted] + HRESULT _NewEnum([out, retval] IUnknown **newEnum); +} + [ uuid(DB4F3345-3EF8-45ED-B976-25A6D3B81B71), version(1.0) @@ -694,4 +739,28 @@ library NetFwPublicTypeLib { [default] interface INetFwPolicy2; } + + [ + uuid(2c5bc43e-3369-4c33-ab0c-be9469677af4) + ] + coclass NetFwRule + { + [default] interface INetFwRule; + } + + [ + uuid(9d745ed8-c514-4d1d-bf42-751fed2d5ac7) + ] + coclass NetFwProduct + { + [default] interface INetFwProduct; + } + + [ + uuid(cc19079b-8272-4d73-bb70-cdb533527b61) + ] + coclass NetFwProducts + { + [default] interface INetFwProducts; + } } -- 2.18.0

2 1

[PATCH] explorer: Properly handle WM_SETTEXT to allow setting desktop title
by Fabian Maurer 20 Jul '18

20 Jul '18

Since fc14753dc0188a52a05243d5d82c4062b93daaff the wine virtual desktop window doesn't have a title anymore. This commit fixes this. This is needed because DesktopWndProc ignores the WM_SETTEXT message. Alternative would be handling WM_SETTEXT in DesktopWndProc. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- programs/explorer/desktop.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 4f47ad0d36b..97bc9e40a6b 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -662,6 +662,9 @@ static LRESULT WINAPI desktop_wnd_proc( HWND hwnd, UINT message, WPARAM wp, LPAR EndPaint( hwnd, &ps ); } return 0; + + case WM_SETTEXT: + return DefWindowProcW( hwnd, message, wp, lp ); } return desktop_orig_wndproc( hwnd, message, wp, lp ); -- 2.18.0

3 5

[PATCH] dnsapi: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 20 Jul '18

20 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dnsapi/query.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index 74b70967ae..19eecfded1 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -618,7 +618,7 @@ static DNS_STATUS dns_do_query( PCSTR name, WORD type, DWORD options, PDNS_RECOR goto exit; } - for (i = 0; i < sizeof(sections)/sizeof(sections[0]); i++) + for (i = 0; i < ARRAY_SIZE(sections); i++) { for (num = 0; num < ns_msg_count( msg, sections[i] ); num++) { @@ -771,7 +771,7 @@ static DNS_STATUS dns_get_hostname_a( COMPUTER_NAME_FORMAT format, PSTR buffer, PDWORD len ) { char name[256]; - DWORD size = sizeof(name)/sizeof(name[0]); + DWORD size = ARRAY_SIZE(name); if (!GetComputerNameExA( format, name, &size )) return DNS_ERROR_NAME_DOES_NOT_EXIST; @@ -790,7 +790,7 @@ static DNS_STATUS dns_get_hostname_w( COMPUTER_NAME_FORMAT format, PWSTR buffer, PDWORD len ) { WCHAR name[256]; - DWORD size = sizeof(name)/sizeof(name[0]); + DWORD size = ARRAY_SIZE(name); if (!GetComputerNameExW( format, name, &size )) return DNS_ERROR_NAME_DOES_NOT_EXIST; -- 2.14.4

1 0

[PATCH] evr: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 20 Jul '18

20 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/evr/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/evr/main.c b/dlls/evr/main.c index ed5c9f4c79..313d518b76 100644 --- a/dlls/evr/main.c +++ b/dlls/evr/main.c @@ -154,13 +154,13 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) && !IsEqualGUID( &IID_IUnknown, riid)) return E_NOINTERFACE; - for (i = 0; i < sizeof(object_creation)/sizeof(object_creation[0]); i++) + for (i = 0; i < ARRAY_SIZE(object_creation); i++) { if (IsEqualGUID(object_creation[i].clsid, rclsid)) break; } - if (i == sizeof(object_creation)/sizeof(object_creation[0])) + if (i == ARRAY_SIZE(object_creation)) { FIXME("%s: no class found.\n", debugstr_guid(rclsid)); return CLASS_E_CLASSNOTAVAILABLE; -- 2.14.4

1 0

[PATCH] fusion: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 20 Jul '18

20 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/fusion/asmcache.c | 8 ++++---- dlls/fusion/fusion.c | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/fusion/asmcache.c b/dlls/fusion/asmcache.c index 668aa8777e..deca5f4c37 100644 --- a/dlls/fusion/asmcache.c +++ b/dlls/fusion/asmcache.c @@ -117,14 +117,14 @@ static BOOL get_assembly_directory(LPWSTR dir, DWORD size, const char *version, if (!strcmp(version, "v4.0.30319")) { strcpyW(dir + len, dotnet); - len += sizeof(dotnet)/sizeof(WCHAR) -1; + len += ARRAY_SIZE(dotnet) - 1; strcpyW(dir + len, gac + 1); - len += sizeof(gac)/sizeof(WCHAR) - 2; + len += ARRAY_SIZE(gac) - 2; } else { strcpyW(dir + len, gac); - len += sizeof(gac)/sizeof(WCHAR) - 1; + len += ARRAY_SIZE(gac) - 1; } switch (architecture) { @@ -433,7 +433,7 @@ static HRESULT WINAPI IAssemblyCacheImpl_InstallAssembly(IAssemblyCache *iface, WCHAR asmdir[MAX_PATH], *p, **external_files = NULL, *dst_dir = NULL; PEKIND architecture; char *clr_version; - DWORD i, count = 0, src_len, dst_len = sizeof(format_v40)/sizeof(format_v40[0]); + DWORD i, count = 0, src_len, dst_len = ARRAY_SIZE(format_v40); HRESULT hr; TRACE("(%p, %d, %s, %p)\n", iface, dwFlags, diff --git a/dlls/fusion/fusion.c b/dlls/fusion/fusion.c index b038b38092..a57d7e067c 100644 --- a/dlls/fusion/fusion.c +++ b/dlls/fusion/fusion.c @@ -144,9 +144,9 @@ HRESULT WINAPI GetCachePath(ASM_CACHE_FLAGS dwCacheFlags, LPWSTR pwzCachePath, case ASM_CACHE_GAC: { strcpyW(path + len, assembly); - len += sizeof(assembly)/sizeof(WCHAR) - 1; + len += ARRAY_SIZE(assembly) - 1; strcpyW(path + len, gac); - len += sizeof(gac)/sizeof(WCHAR) - 1; + len += ARRAY_SIZE(gac) - 1; break; } case ASM_CACHE_DOWNLOAD: @@ -156,13 +156,13 @@ HRESULT WINAPI GetCachePath(ASM_CACHE_FLAGS dwCacheFlags, LPWSTR pwzCachePath, } case ASM_CACHE_ROOT: strcpyW(path + len, assembly); - len += sizeof(assembly)/sizeof(WCHAR) - 1; + len += ARRAY_SIZE(assembly) - 1; break; case ASM_CACHE_ROOT_EX: strcpyW(path + len, dotnet); - len += sizeof(dotnet)/sizeof(WCHAR) - 1; + len += ARRAY_SIZE(dotnet) - 1; strcpyW(path + len, assembly); - len += sizeof(assembly)/sizeof(WCHAR) - 1; + len += ARRAY_SIZE(assembly) - 1; break; default: return E_INVALIDARG; -- 2.14.4

1 0

[PATCH] hhctrl.ocx: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 20 Jul '18

20 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/hhctrl.ocx/chm.c | 12 ++++++------ dlls/hhctrl.ocx/help.c | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c index 8cf2539d71..01403368b0 100644 --- a/dlls/hhctrl.ocx/chm.c +++ b/dlls/hhctrl.ocx/chm.c @@ -483,12 +483,12 @@ LPCWSTR skip_schema(LPCWSTR url) static const WCHAR msits_schema[] = {'m','s','-','i','t','s',':'}; static const WCHAR mk_schema[] = {'m','k',':','@','M','S','I','T','S','t','o','r','e',':'}; - if(!strncmpiW(its_schema, url, sizeof(its_schema)/sizeof(WCHAR))) - return url+sizeof(its_schema)/sizeof(WCHAR); - if(!strncmpiW(msits_schema, url, sizeof(msits_schema)/sizeof(WCHAR))) - return url+sizeof(msits_schema)/sizeof(WCHAR); - if(!strncmpiW(mk_schema, url, sizeof(mk_schema)/sizeof(WCHAR))) - return url+sizeof(mk_schema)/sizeof(WCHAR); + if(!strncmpiW(its_schema, url, ARRAY_SIZE(its_schema))) + return url + ARRAY_SIZE(its_schema); + if(!strncmpiW(msits_schema, url, ARRAY_SIZE(msits_schema))) + return url + ARRAY_SIZE(msits_schema); + if(!strncmpiW(mk_schema, url, ARRAY_SIZE(mk_schema))) + return url + ARRAY_SIZE(mk_schema); return url; } diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index c7a2a7a9e2..75b28f2f57 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -241,7 +241,7 @@ static BOOL AppendFullPathURL(LPCWSTR file, LPWSTR buf, LPCWSTR index) TRACE("%s %p %s\n", debugstr_w(file), buf, debugstr_w(index)); - if(!GetFullPathNameW(file, sizeof(full_path)/sizeof(full_path[0]), full_path, NULL)) { + if (!GetFullPathNameW(file, ARRAY_SIZE(full_path), full_path, NULL)) { WARN("GetFullPathName failed: %u\n", GetLastError()); return FALSE; } @@ -1830,7 +1830,7 @@ HHInfo *CreateHelpViewer(HHInfo *info, LPCWSTR filename, HWND caller) /* Set the invalid tab ID (-1) as the default value for all * of the tabs, this matches a failed TCM_INSERTITEM call. */ - for(i=0;i<sizeof(info->tabs)/sizeof(HHTab);i++) + for (i = 0; i < ARRAY_SIZE(info->tabs); i++) info->tabs[i].id = -1; OleInitialize(NULL); @@ -1867,7 +1867,7 @@ HHInfo *CreateHelpViewer(HHInfo *info, LPCWSTR filename, HWND caller) */ static char find_html_symbol(const char *entity, int entity_len) { - int max = sizeof(html_encoded_symbols)/sizeof(html_encoded_symbols[0])-1; + int max = ARRAY_SIZE(html_encoded_symbols)-1; int min = 0, dir; while(min <= max) -- 2.14.4

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel