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

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

08 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/userenv/userenv_main.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/userenv/userenv_main.c b/dlls/userenv/userenv_main.c index d2adad4434..538b912b20 100644 --- a/dlls/userenv/userenv_main.c +++ b/dlls/userenv/userenv_main.c @@ -106,20 +106,20 @@ static void set_registry_variables(WCHAR **env, HKEY hkey, DWORD type, BOOL set_ for (index = 0; ; index++) { - size = sizeof(name)/sizeof(WCHAR); + size = ARRAY_SIZE(name); ret = RegEnumValueW(hkey, index, name, &size, NULL, NULL, NULL, NULL); if (ret != ERROR_SUCCESS) break; - if (!memicmpW(name, SystemRootW, sizeof(SystemRootW)/sizeof(WCHAR))) + if (!memicmpW(name, SystemRootW, ARRAY_SIZE(SystemRootW))) continue; - if (!memicmpW(name, SystemDriveW, sizeof(SystemDriveW)/sizeof(WCHAR))) + if (!memicmpW(name, SystemDriveW, ARRAY_SIZE(SystemDriveW))) continue; RtlInitUnicodeString(&us_name, name); us_value.Buffer = value; us_value.MaximumLength = sizeof(value); - if (!memicmpW(name, PATHW, sizeof(PATHW)/sizeof(WCHAR)) && + if (!memicmpW(name, PATHW, ARRAY_SIZE(PATHW)) && !RtlQueryEnvironmentVariable_U(*env, &us_name, &us_value)) { if (!set_path) @@ -339,7 +339,7 @@ BOOL WINAPI CreateEnvironmentBlock( LPVOID* lpEnvironment, RegCloseKey(hkey); } - len = sizeof(buf)/sizeof(WCHAR); + len = ARRAY_SIZE(buf); if (GetComputerNameW(buf, &len)) { RtlInitUnicodeString(&us_name, COMPUTERNAMEW); -- 2.14.4

1 0

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

08 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/driver.c | 2 +- dlls/user32/icontitle.c | 4 ++-- dlls/user32/lstr.c | 4 ++-- dlls/user32/user_main.c | 4 ++-- dlls/user32/win.c | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index d59a2eacf5..561a126bd6 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -57,7 +57,7 @@ static HMODULE load_desktop_driver( HWND hwnd ) HKEY hkey; DWORD size; WCHAR path[MAX_PATH]; - WCHAR key[(sizeof(key_pathW) + sizeof(displayW)) / sizeof(WCHAR) + 40]; + WCHAR key[ARRAY_SIZE(key_pathW) + ARRAY_SIZE(displayW) + 40]; UINT guid_atom = HandleToULong( GetPropW( hwnd, display_device_guid_propW )); USER_CheckNotLock(); diff --git a/dlls/user32/icontitle.c b/dlls/user32/icontitle.c index 95cb51331e..77e286ebc1 100644 --- a/dlls/user32/icontitle.c +++ b/dlls/user32/icontitle.c @@ -90,7 +90,7 @@ static BOOL ICONTITLE_SetTitlePos( HWND hwnd, HWND owner ) INT cx, cy; POINT pt; - int length = GetWindowTextW( owner, str, sizeof(str)/sizeof(WCHAR) ); + int length = GetWindowTextW( owner, str, ARRAY_SIZE( str )); while (length && str[length - 1] == ' ') /* remove trailing spaces */ str[--length] = 0; @@ -178,7 +178,7 @@ static BOOL ICONTITLE_Paint( HWND hwnd, HWND owner, HDC hDC, BOOL bActive ) { WCHAR buffer[80]; - INT length = GetWindowTextW( owner, buffer, sizeof(buffer)/sizeof(buffer[0]) ); + INT length = GetWindowTextW( owner, buffer, ARRAY_SIZE( buffer )); SetTextColor( hDC, textColor ); SetBkMode( hDC, TRANSPARENT ); diff --git a/dlls/user32/lstr.c b/dlls/user32/lstr.c index 80a2cfbe11..145a5c020d 100644 --- a/dlls/user32/lstr.c +++ b/dlls/user32/lstr.c @@ -335,7 +335,7 @@ DWORD WINAPI CharLowerBuffA( LPSTR str, DWORD len ) if (!str) return 0; /* YES */ lenW = MultiByteToWideChar(CP_ACP, 0, str, len, NULL, 0); - if (lenW > sizeof(buffer)/sizeof(WCHAR)) + if (lenW > ARRAY_SIZE(buffer)) { strW = HeapAlloc(GetProcessHeap(), 0, lenW * sizeof(WCHAR)); if (!strW) return 0; @@ -370,7 +370,7 @@ DWORD WINAPI CharUpperBuffA( LPSTR str, DWORD len ) if (!str) return 0; /* YES */ lenW = MultiByteToWideChar(CP_ACP, 0, str, len, NULL, 0); - if (lenW > sizeof(buffer)/sizeof(WCHAR)) + if (lenW > ARRAY_SIZE(buffer)) { strW = HeapAlloc(GetProcessHeap(), 0, lenW * sizeof(WCHAR)); if (!strW) return 0; diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index e287150e21..007cb687f5 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -169,7 +169,7 @@ static const WCHAR *get_default_desktop(void) static const WCHAR app_defaultsW[] = {'S','o','f','t','w','a','r','e','\\', 'W','i','n','e','\\', 'A','p','p','D','e','f','a','u','l','t','s',0}; - static WCHAR buffer[MAX_PATH + sizeof(explorerW)/sizeof(WCHAR)]; + static WCHAR buffer[MAX_PATH + ARRAY_SIZE(explorerW)]; WCHAR *p, *appname = buffer; const WCHAR *ret = defaultW; DWORD len; @@ -433,7 +433,7 @@ BOOL WINAPI ExitWindowsEx( UINT flags, DWORD reason ) STARTUPINFOW si; void *redir; - GetSystemDirectoryW( app, MAX_PATH - sizeof(winebootW)/sizeof(WCHAR) ); + GetSystemDirectoryW( app, MAX_PATH - ARRAY_SIZE( winebootW )); strcatW( app, winebootW ); strcpyW( cmdline, app ); diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 5f2ac4e0d7..cbfd8bb14a 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -2049,8 +2049,8 @@ HWND WINAPI GetDesktopWindow(void) STARTUPINFOW si; PROCESS_INFORMATION pi; WCHAR windir[MAX_PATH]; - WCHAR app[MAX_PATH + sizeof(explorer)/sizeof(WCHAR)]; - WCHAR cmdline[MAX_PATH + (sizeof(explorer) + sizeof(args))/sizeof(WCHAR)]; + WCHAR app[MAX_PATH + ARRAY_SIZE( explorer )]; + WCHAR cmdline[MAX_PATH + ARRAY_SIZE( explorer ) + ARRAY_SIZE( args )]; WCHAR desktop[MAX_PATH]; void *redir; -- 2.14.4

1 0

[PATCH] user.exe16: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 08 Aug '18

08 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user.exe16/window.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user.exe16/window.c b/dlls/user.exe16/window.c index e81d9ace3a..10f1389f0a 100644 --- a/dlls/user.exe16/window.c +++ b/dlls/user.exe16/window.c @@ -1924,7 +1924,7 @@ HWND16 WINAPI CreateWindowEx16( DWORD exStyle, LPCSTR className, { WCHAR bufferW[256]; - if (!MultiByteToWideChar( CP_ACP, 0, className, -1, bufferW, sizeof(bufferW)/sizeof(WCHAR) )) + if (!MultiByteToWideChar( CP_ACP, 0, className, -1, bufferW, ARRAY_SIZE(bufferW))) return 0; hwnd = create_window16( (CREATESTRUCTW *)&cs, bufferW, HINSTANCE_32(instance), FALSE ); } -- 2.14.4

1 0

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

08 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/uiribbon/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/uiribbon/main.c b/dlls/uiribbon/main.c index 9306338086..a76c349ad9 100644 --- a/dlls/uiribbon/main.c +++ b/dlls/uiribbon/main.c @@ -173,13 +173,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] taskschd: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 08 Aug '18

08 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/taskschd/task.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 432f983c22..1306c8c8f9 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -3852,7 +3852,7 @@ static HRESULT WINAPI TaskService_Connect(ITaskService *iface, VARIANT server, V if (!is_variant_null(&user) || !is_variant_null(&domain) || !is_variant_null(&password)) FIXME("user/domain/password are ignored\n"); - len = sizeof(comp_name)/sizeof(comp_name[0]); + len = ARRAY_SIZE(comp_name); if (!GetComputerNameW(comp_name, &len)) return HRESULT_FROM_WIN32(GetLastError()); -- 2.14.4

1 0

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

08 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/t2embed/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/t2embed/main.c b/dlls/t2embed/main.c index 766926fbfa..288c19bee1 100644 --- a/dlls/t2embed/main.c +++ b/dlls/t2embed/main.c @@ -136,7 +136,7 @@ LONG WINAPI TTIsEmbeddingEnabledForFacename(LPCSTR facename, BOOL *enabled) DWORD name_len, value_len, value, type; CHAR name[LF_FACESIZE]; - name_len = sizeof(name)/sizeof(*name); + name_len = ARRAY_SIZE(name); value_len = sizeof(value); ret = RegEnumValueA(hkey, index++, name, &name_len, NULL, &type, (BYTE*)&value, &value_len); if (ret || type != REG_DWORD) -- 2.14.4

1 0

[PATCH 8/8] server: Allow pipe server fd caching throughout its whole lifetime.
by Jacek Caban 08 Aug '18

08 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/file.c | 10 ---------- server/named_pipe.c | 2 +- 2 files changed, 1 insertion(+), 11 deletions(-)

1 0

[PATCH 7/8] server: Don't use set_no_fd_status for error handling in pipe objects.
by Jacek Caban 08 Aug '18

08 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/tests/pipe.c | 2 -- server/fd.c | 6 ------ server/file.h | 1 - server/named_pipe.c | 15 --------------- 4 files changed, 24 deletions(-)

1 0

[PATCH 6/8] server: Improve FSCTL_PIPE_TRANSCEIVE error handling.
by Jacek Caban 08 Aug '18

08 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/tests/pipe.c | 2 +- server/named_pipe.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-)

1 0

[PATCH 5/8] server: Improve named pipe write error handling.
by Jacek Caban 08 Aug '18

08 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/pipe.c | 10 +++++----- dlls/ntdll/tests/pipe.c | 1 - server/named_pipe.c | 11 ++++++++++- 3 files changed, 15 insertions(+), 7 deletions(-)

1 0