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

[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