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

[PATCH] net: Use the ARRAY_SIZE() macro
by Michael Stefaniuc July 23, 2018

July 23, 2018

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 July 23, 2018

July 23, 2018

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 July 23, 2018

July 23, 2018

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 July 23, 2018

July 23, 2018

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 July 23, 2018

July 23, 2018

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 July 23, 2018

July 23, 2018

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 July 23, 2018

July 23, 2018

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 July 23, 2018

July 23, 2018

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 July 23, 2018

July 23, 2018

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 July 23, 2018

July 23, 2018

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