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

[PATCH] dsound: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 10 Aug '18

10 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dsound/dsound.c | 4 ++-- dlls/dsound/propset.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index a8b20b1dd1..6a49d638e1 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -85,7 +85,7 @@ static void _dump_DSCAPS(DWORD xmask) { }; unsigned int i; - for (i=0;i<sizeof(flags)/sizeof(flags[0]);i++) + for (i = 0; i < ARRAY_SIZE(flags); i++) if ((flags[i].mask & xmask) == flags[i].mask) TRACE("%s ",flags[i].name); } @@ -113,7 +113,7 @@ static void _dump_DSBCAPS(DWORD xmask) { }; unsigned int i; - for (i=0;i<sizeof(flags)/sizeof(flags[0]);i++) + for (i = 0; i < ARRAY_SIZE(flags); i++) if ((flags[i].mask & xmask) == flags[i].mask) TRACE("%s ",flags[i].name); } diff --git a/dlls/dsound/propset.c b/dlls/dsound/propset.c index 9ef4ac9fbc..0272ac001f 100644 --- a/dlls/dsound/propset.c +++ b/dlls/dsound/propset.c @@ -361,8 +361,8 @@ static void DSPROPERTY_descWto1(const DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_1_DATA *data1) { data1->DeviceId = dataW->DeviceId; - lstrcpynW(data1->ModuleW, dataW->Module, sizeof(data1->ModuleW)/sizeof(*data1->ModuleW)); - lstrcpynW(data1->DescriptionW, dataW->Description, sizeof(data1->DescriptionW)/sizeof(*data1->DescriptionW)); + lstrcpynW(data1->ModuleW, dataW->Module, ARRAY_SIZE(data1->ModuleW)); + lstrcpynW(data1->DescriptionW, dataW->Description, ARRAY_SIZE(data1->DescriptionW)); WideCharToMultiByte(CP_ACP, 0, data1->DescriptionW, -1, data1->DescriptionA, sizeof(data1->DescriptionA)-1, NULL, NULL); WideCharToMultiByte(CP_ACP, 0, data1->ModuleW, -1, data1->ModuleA, sizeof(data1->ModuleA)-1, NULL, NULL); data1->DescriptionA[sizeof(data1->DescriptionA)-1] = 0; -- 2.14.4

2 1

kernel32: Add support for FILE_FLAG_WRITE_THROUGH to CreateFile.
by Dmitry Timoshkov 10 Aug '18

10 Aug '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kernel32/file.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 1e5b9fe3e7..1b33cfba5e 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1560,6 +1560,8 @@ HANDLE WINAPI CreateFileW( LPCWSTR filename, DWORD access, DWORD sharing, options |= FILE_SYNCHRONOUS_IO_NONALERT; if (attributes & FILE_FLAG_RANDOM_ACCESS) options |= FILE_RANDOM_ACCESS; + if (attributes & FILE_FLAG_WRITE_THROUGH) + options |= FILE_WRITE_THROUGH; attributes &= FILE_ATTRIBUTE_VALID_FLAGS; attr.Length = sizeof(attr); -- 2.17.1

2 2

[PATCH] winhlp32: Avoid an ARRAY_SIZE-like macro
by Michael Stefaniuc 10 Aug '18

10 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winhlp32/winhelp.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c index 8ee3d0410e..7ce5d4a0a8 100644 --- a/programs/winhlp32/winhelp.c +++ b/programs/winhlp32/winhelp.c @@ -66,19 +66,18 @@ static void WINHELP_InitFonts(HWND hWnd) {-12, 0, 0, 0, 700, 0, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 32, {'H','e','l','v',0}}, {-10, 0, 0, 0, 700, 0, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 32, {'H','e','l','v',0}}, { -8, 0, 0, 0, 400, 0, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 32, {'H','e','l','v',0}}}; -#define FONTS_LEN (sizeof(logfontlist)/sizeof(*logfontlist)) - static HFONT fonts[FONTS_LEN]; + static HFONT fonts[ARRAY_SIZE(logfontlist)]; static BOOL init = FALSE; - win->fonts_len = FONTS_LEN; + win->fonts_len = ARRAY_SIZE(logfontlist); win->fonts = fonts; if (!init) { UINT i; - for (i = 0; i < FONTS_LEN; i++) + for (i = 0; i < ARRAY_SIZE(logfontlist); i++) { fonts[i] = CreateFontIndirectW(&logfontlist[i]); } -- 2.14.4

1 0

[PATCH] winhlp32: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 10 Aug '18

10 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winhlp32/macro.c | 2 +- programs/winhlp32/macro.lex.l | 8 ++++---- programs/winhlp32/winhelp.c | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/programs/winhlp32/macro.c b/programs/winhlp32/macro.c index 5a25d6c944..280e618236 100644 --- a/programs/winhlp32/macro.c +++ b/programs/winhlp32/macro.c @@ -154,7 +154,7 @@ void CALLBACK MACRO_About(void) WCHAR name[256]; HICON icon = LoadImageW( Globals.hInstance, MAKEINTRESOURCEW(IDI_WINHELP), IMAGE_ICON, 48, 48, LR_SHARED ); - LoadStringW( Globals.hInstance, STID_WINE_HELP, name, sizeof(name)/sizeof(WCHAR) ); + LoadStringW( Globals.hInstance, STID_WINE_HELP, name, ARRAY_SIZE( name )); ShellAboutW( MACRO_CurrentWindow()->hMainWnd, name, NULL, icon ); } diff --git a/programs/winhlp32/macro.lex.l b/programs/winhlp32/macro.lex.l index 8f6945ca98..eab7a795af 100644 --- a/programs/winhlp32/macro.lex.l +++ b/programs/winhlp32/macro.lex.l @@ -75,7 +75,7 @@ struct lexret yylval; /* opening a new one */ if (lex_data->quote_stk_idx == 0) { - assert(lex_data->cache_used < sizeof(lex_data->cache_string) / sizeof(lex_data->cache_string[0])); + assert(lex_data->cache_used < ARRAY_SIZE(lex_data->cache_string)); lex_data->strptr = lex_data->cache_string[lex_data->cache_used] = HeapAlloc(GetProcessHeap(), 0, strlen(lex_data->macroptr) + 1); yylval.string = lex_data->strptr; lex_data->cache_used++; @@ -83,7 +83,7 @@ struct lexret yylval; } else *lex_data->strptr++ = yytext[0]; lex_data->quote_stack[lex_data->quote_stk_idx++] = yytext[0]; - assert(lex_data->quote_stk_idx < sizeof(lex_data->quote_stack) / sizeof(lex_data->quote_stack[0])); + assert(lex_data->quote_stk_idx < ARRAY_SIZE(lex_data->quote_stack)); } else { @@ -222,7 +222,7 @@ CheckArgs_end: static int MACRO_CallBoolFunc(void *fn, const char* args, void** ret) { void* pa[2]; - int idx = MACRO_CheckArgs(pa, sizeof(pa)/sizeof(pa[0]), args); + int idx = MACRO_CheckArgs(pa, ARRAY_SIZE(pa), args); if (idx < 0) return 0; if (!fn) return 1; @@ -257,7 +257,7 @@ static int MACRO_CallBoolFunc(void *fn, const char* args, void** ret) static int MACRO_CallVoidFunc(void *fn, const char* args) { void* pa[6]; - int idx = MACRO_CheckArgs(pa, sizeof(pa)/sizeof(pa[0]), args); + int idx = MACRO_CheckArgs(pa, ARRAY_SIZE(pa), args); if (idx < 0) return 0; if (!fn) return 1; diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c index 2ac3d2ff24..8ee3d0410e 100644 --- a/programs/winhlp32/winhelp.c +++ b/programs/winhlp32/winhelp.c @@ -595,7 +595,7 @@ static void WINHELP_RememberPage(WINHELP_WINDOW* win, WINHELP_WNDPAGE* wpage) if (!Globals.history.index || Globals.history.set[0].page != wpage->page) { - num = sizeof(Globals.history.set) / sizeof(Globals.history.set[0]); + num = ARRAY_SIZE(Globals.history.set); /* we're full, remove latest entry */ if (Globals.history.index == num) { @@ -610,7 +610,7 @@ static void WINHELP_RememberPage(WINHELP_WINDOW* win, WINHELP_WNDPAGE* wpage) } if (win->hHistoryWnd) InvalidateRect(win->hHistoryWnd, NULL, TRUE); - num = sizeof(win->back.set) / sizeof(win->back.set[0]); + num = ARRAY_SIZE(win->back.set); if (win->back.index == num) { /* we're full, remove latest entry */ @@ -1136,7 +1136,7 @@ static LRESULT CALLBACK WINHELP_HistoryWndProc(HWND hWnd, UINT msg, WPARAM wPara GetWindowRect(hWnd, &r); r.right = r.left + 30 * tm.tmAveCharWidth; - r.bottom = r.top + (sizeof(Globals.history.set) / sizeof(Globals.history.set[0])) * tm.tmHeight; + r.bottom = r.top + ARRAY_SIZE(Globals.history.set) * tm.tmHeight; AdjustWindowRect(&r, GetWindowLongW(hWnd, GWL_STYLE), FALSE); if (r.left < 0) {r.right -= r.left; r.left = 0;} if (r.top < 0) {r.bottom -= r.top; r.top = 0;} -- 2.14.4

1 0

[PATCH] winemenubuilder: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 10 Aug '18

10 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winemenubuilder/winemenubuilder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 0013b04cee..a81a5c7638 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -1807,7 +1807,7 @@ static BOOL GetLinkLocation( LPCWSTR linkfile, DWORD *loc, char **relative ) WINE_TRACE("%s\n", wine_dbgstr_w(filename)); - for( i=0; i<sizeof(locations)/sizeof(locations[0]); i++ ) + for( i=0; i<ARRAY_SIZE( locations ); i++ ) { if (!SHGetSpecialFolderPathW( 0, buffer, locations[i], FALSE )) continue; -- 2.14.4

1 0

[PATCH] winebrowser: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 10 Aug '18

10 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winebrowser/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winebrowser/main.c b/programs/winebrowser/main.c index b1c49e7cd1..7fcaba13a1 100644 --- a/programs/winebrowser/main.c +++ b/programs/winebrowser/main.c @@ -334,7 +334,7 @@ static WCHAR *encode_unix_path(const char *src) const char safe_chars[] = "/-_.~@&=+$,:"; const char hex_digits[] = "0123456789ABCDEF"; const WCHAR schema[] = {'f','i','l','e',':','/','/',0}; - int len = sizeof(schema)/sizeof(schema[0]); + int len = ARRAY_SIZE(schema); tmp_src = src; -- 2.14.4

1 0

[PATCH] regsvr32: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 10 Aug '18

10 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/regsvr32/regsvr32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/regsvr32/regsvr32.c b/programs/regsvr32/regsvr32.c index 988aaa3a20..cfbb80d465 100644 --- a/programs/regsvr32/regsvr32.c +++ b/programs/regsvr32/regsvr32.c @@ -49,7 +49,7 @@ static void WINAPIV output_write(UINT id, ...) if (Silent) return; - 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; -- 2.14.4

1 0

[PATCH] extrac32: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 10 Aug '18

10 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/extrac32/extrac32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/extrac32/extrac32.c b/programs/extrac32/extrac32.c index 63205e8176..7ab936eec0 100644 --- a/programs/extrac32/extrac32.c +++ b/programs/extrac32/extrac32.c @@ -118,7 +118,7 @@ static void copy_file(LPCWSTR source, LPCWSTR destination) static const WCHAR overwriteMsg[] = {'O','v','e','r','w','r','i','t','e',' ','"','%','s','"','?',0}; static const WCHAR titleMsg[] = {'E','x','t','r','a','c','t',0}; WCHAR msg[MAX_PATH+100]; - snprintfW(msg, sizeof(msg)/sizeof(msg[0]), overwriteMsg, destination); + snprintfW(msg, ARRAY_SIZE(msg), overwriteMsg, destination); if (MessageBoxW(NULL, msg, titleMsg, MB_YESNO | MB_ICONWARNING) != IDYES) return; } -- 2.14.4

1 0

[PATCH] xolehlp: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 10 Aug '18

10 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/xolehlp/xolehlp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/xolehlp/xolehlp.c b/dlls/xolehlp/xolehlp.c index 4714f8ced5..2a741f4914 100644 --- a/dlls/xolehlp/xolehlp.c +++ b/dlls/xolehlp/xolehlp.c @@ -650,7 +650,7 @@ static BOOL is_local_machineA( const CHAR *server ) { static const CHAR dot[] = "."; CHAR buffer[MAX_COMPUTERNAME_LENGTH + 1]; - DWORD len = sizeof(buffer) / sizeof(buffer[0]); + DWORD len = ARRAY_SIZE( buffer ); if (!server || !strcmp( server, dot )) return TRUE; if (GetComputerNameA( buffer, &len ) && !lstrcmpiA( server, buffer )) return TRUE; @@ -660,7 +660,7 @@ static BOOL is_local_machineW( const WCHAR *server ) { static const WCHAR dotW[] = {'.',0}; WCHAR buffer[MAX_COMPUTERNAME_LENGTH + 1]; - DWORD len = sizeof(buffer) / sizeof(buffer[0]); + DWORD len = ARRAY_SIZE( buffer ); if (!server || !strcmpW( server, dotW )) return TRUE; if (GetComputerNameW( buffer, &len ) && !strcmpiW( server, buffer )) return TRUE; -- 2.14.4

1 0

[PATCH] wsdapi: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 10 Aug '18

10 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wsdapi/address.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wsdapi/address.c b/dlls/wsdapi/address.c index d6be6a2c57..7f11f48ce7 100644 --- a/dlls/wsdapi/address.c +++ b/dlls/wsdapi/address.c @@ -150,7 +150,7 @@ static HRESULT WINAPI IWSDUdpAddressImpl_GetTransportAddressEx(IWSDUdpAddress *T switch (((SOCKADDR_IN *) &impl->sockAddr)->sin_family) { case AF_INET: - size = sizeof(impl->ipv4Address) / sizeof(WCHAR); + size = ARRAY_SIZE(impl->ipv4Address); if (WSAAddressToStringW((LPSOCKADDR) &impl->sockAddr, sizeof(SOCKADDR_IN), NULL, impl->ipv4Address, &size) == 0) { @@ -161,7 +161,7 @@ static HRESULT WINAPI IWSDUdpAddressImpl_GetTransportAddressEx(IWSDUdpAddress *T break; case AF_INET6: - size = sizeof(impl->ipv6Address) / sizeof(WCHAR); + size = ARRAY_SIZE(impl->ipv6Address); /* Copy the SOCKADDR structure so we can remove the scope ID if not required */ memcpy(&storage, &impl->sockAddr, sizeof(SOCKADDR_IN6)); -- 2.14.4

1 0