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

[PATCH 4/8] server: Improve named pipe read 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 | 12 +++++++++++- 2 files changed, 11 insertions(+), 3 deletions(-)

1 0

[PATCH 3/8] server: Improve FSCTL_PIPE_PEEK 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 | 2 -- dlls/ntdll/tests/pipe.c | 4 ++-- server/named_pipe.c | 9 ++++++++- 3 files changed, 10 insertions(+), 5 deletions(-)

1 0

[PATCH 2/8] server: Store pipe state in pipe_end struct and return it in FSCTL_PIPE_PEEK.
by Jacek Caban 08 Aug '18

08 Aug '18

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

1 0

[PATCH 1/8] ntdll/tests: Add pipe state tests.
by Jacek Caban 08 Aug '18

08 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/tests/pipe.c | 300 ++++++++++++++++++++++++++++++++++++++++++++++-- include/winternl.h | 5 + 2 files changed, 295 insertions(+), 10 deletions(-)

1 0

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

08 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/serialui/confdlg.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/serialui/confdlg.c b/dlls/serialui/confdlg.c index 7797c238fc..cc3350572b 100644 --- a/dlls/serialui/confdlg.c +++ b/dlls/serialui/confdlg.c @@ -214,7 +214,7 @@ static BOOL SERIALUI_MakeBaudDword(LPDWORD lpdwBaudRate) { unsigned int i; - for(i=0; i<(sizeof(SERIALUI_BaudConvertTable)/sizeof(DWORD)); i+=2) + for(i=0; i<ARRAY_SIZE(SERIALUI_BaudConvertTable); i+=2) { if(*lpdwBaudRate == SERIALUI_BaudConvertTable[i]) { @@ -229,7 +229,7 @@ static BOOL SERIALUI_MakeBaudEnum(LPDWORD lpdwBaudRate) { unsigned int i; - for(i=0; i<(sizeof(SERIALUI_BaudConvertTable)/sizeof(DWORD)); i+=2) + for(i=0; i<ARRAY_SIZE(SERIALUI_BaudConvertTable); i+=2) { if(*lpdwBaudRate == SERIALUI_BaudConvertTable[i+1]) { @@ -352,8 +352,8 @@ static INT_PTR CALLBACK SERIALUI_ConfigDialogProc(HWND hWnd, UINT uMsg, WPARAM w if(!info) return FALSE; SetWindowLongPtrW(hWnd, DWLP_USER, lParam); - GetWindowTextW(hWnd, format, sizeof(format)/sizeof(WCHAR)); - snprintfW( szTitle, sizeof(szTitle)/sizeof(WCHAR), format, info->lpszDevice ); + GetWindowTextW(hWnd, format, ARRAY_SIZE(format)); + snprintfW(szTitle, ARRAY_SIZE(szTitle), format, info->lpszDevice); SetWindowTextW(hWnd, szTitle); SERIALUI_DCBToDialogInfo(hWnd, info); return TRUE; @@ -501,7 +501,7 @@ BOOL WINAPI drvSetDefaultCommConfigW( if(r != ERROR_SUCCESS) return FALSE; - snprintfW(szKeyName, sizeof(szKeyName)/sizeof(WCHAR), fmt, lpszCommKey ,lpszDevice); + snprintfW(szKeyName, ARRAY_SIZE(szKeyName), fmt, lpszCommKey, lpszDevice); r = RegCreateKeyW(hKeyReg, szKeyName, &hKeyPort); if(r == ERROR_SUCCESS) { @@ -556,7 +556,7 @@ DWORD WINAPI drvGetDefaultCommConfigW( } /* only "com1" - "com9" is allowed */ - r = sizeof(comW) / sizeof(WCHAR); /* len of "com\0" */ + r = ARRAY_SIZE(comW); /* len of "com\0" */ lstrcpynW(szKeyName, lpszDevice, r); /* simulate a lstrcmpnW */ r--; @@ -574,7 +574,7 @@ DWORD WINAPI drvGetDefaultCommConfigW( r = RegConnectRegistryW(NULL, HKEY_LOCAL_MACHINE, &hKeyReg); if(r != ERROR_SUCCESS) return r; - snprintfW(szKeyName, sizeof(szKeyName)/sizeof(WCHAR), fmt, lpszCommKey ,lpszDevice); + snprintfW(szKeyName, ARRAY_SIZE(szKeyName), fmt, lpszCommKey, lpszDevice); r = RegOpenKeyW(hKeyReg, szKeyName, &hKeyPort); if(r == ERROR_SUCCESS) { -- 2.14.4

1 0

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

08 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/qmgr/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/qmgr/file.c b/dlls/qmgr/file.c index 3673ede142..dbdfc97bcc 100644 --- a/dlls/qmgr/file.c +++ b/dlls/qmgr/file.c @@ -518,7 +518,7 @@ BOOL processFile(BackgroundCopyFileImpl *file, BackgroundCopyJobImpl *job) uc.lpszPassword = NULL; uc.dwPasswordLength = 0; uc.lpszHostName = host; - uc.dwHostNameLength = sizeof(host)/sizeof(host[0]); + uc.dwHostNameLength = ARRAY_SIZE(host); uc.nPort = 0; uc.lpszUrlPath = NULL; uc.dwUrlPathLength = ~0u; -- 2.14.4

1 0

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

08 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/qedit/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/qedit/main.c b/dlls/qedit/main.c index a012ff210c..a46f3f02e5 100644 --- a/dlls/qedit/main.c +++ b/dlls/qedit/main.c @@ -167,13 +167,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; -- 2.14.4

1 0

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

08 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/qcap/qcap_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/qcap/qcap_main.c b/dlls/qcap/qcap_main.c index bc0b903d0b..c5b4931c90 100644 --- a/dlls/qcap/qcap_main.c +++ b/dlls/qcap/qcap_main.c @@ -142,7 +142,7 @@ FactoryTemplate const g_Templates[] = { } }; -int g_cTemplates = sizeof(g_Templates) / sizeof(g_Templates[0]); +const int g_cTemplates = ARRAY_SIZE(g_Templates); /*********************************************************************** * Dll EntryPoint (QCAP.@) -- 2.14.4

1 0

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

08 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/packager/packager_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/packager/packager_main.c b/dlls/packager/packager_main.c index c1d194e368..d70202b73b 100644 --- a/dlls/packager/packager_main.c +++ b/dlls/packager/packager_main.c @@ -463,7 +463,7 @@ static HRESULT WINAPI PersistStorage_Load(IPersistStorage* iface, goto exit; }else{ len = MultiByteToWideChar(CP_ACP, 0, filenameA, filenameA_len, - filenameW, sizeof(filenameW) / sizeof(*filenameW)); + filenameW, ARRAY_SIZE(filenameW)); } stream_filename = filenameW + len - 1; @@ -474,7 +474,7 @@ static HRESULT WINAPI PersistStorage_Load(IPersistStorage* iface, ++stream_filename; stream_filename_len = len - (stream_filename - filenameW); - len = GetTempPathW(sizeof(This->filename)/sizeof(WCHAR), This->filename); + len = GetTempPathW(ARRAY_SIZE(This->filename), This->filename); memcpy(This->filename + len, stream_filename, stream_filename_len * sizeof(WCHAR)); This->filename[len + stream_filename_len] = 0; -- 2.14.4

1 0

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

08 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/opengl32/wgl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index b73920cb25..04ace8effe 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -891,7 +891,7 @@ PROC WINAPI wglGetProcAddress( LPCSTR name ) { "glVertexAttribDivisor", "glVertexAttribDivisorARB"}, /* needed by Caffeine */ }; - for (i = 0; i < sizeof(alternatives)/sizeof(alternatives[0]); i++) + for (i = 0; i < ARRAY_SIZE(alternatives); i++) { if (strcmp( name, alternatives[i].name )) continue; WARN("Extension %s required for %s not supported, trying %s\n", -- 2.14.4

1 0