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

Serge Gautherie : windowscodecs: Fix an MSVC warning about get_decoder_info().
by Alexandre Julliard July 13, 2018

July 13, 2018

Module: wine Branch: master Commit: 90518ebd2ca14568879831a5a87685a8385a21d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90518ebd2ca14568879831a5… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Wed Jul 11 17:37:09 2018 +0200 windowscodecs: Fix an MSVC warning about get_decoder_info(). Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index 21e6610..e131107 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -2155,7 +2155,7 @@ void ReleaseComponentInfos(void) IWICComponentInfo_Release(&info->IWICComponentInfo_iface); } -HRESULT get_decoder_info(const CLSID *clsid, IWICBitmapDecoderInfo **info) +HRESULT get_decoder_info(REFCLSID clsid, IWICBitmapDecoderInfo **info) { IWICComponentInfo *compinfo; HRESULT hr;

1 0

Michael Stefaniuc : dxerr8: Use the ARRAY_SIZE() macro.
by Alexandre Julliard July 13, 2018

July 13, 2018

Module: wine Branch: master Commit: 4c28872037d42b728682c27b549d08f5ba42f857 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c28872037d42b728682c27b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Jul 13 19:01:22 2018 +0200 dxerr8: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxerr8/dxerr8.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dxerr8/dxerr8.c b/dlls/dxerr8/dxerr8.c index e42ee00..1d22296 100644 --- a/dlls/dxerr8/dxerr8.c +++ b/dlls/dxerr8/dxerr8.c @@ -51,7 +51,7 @@ const char * WINAPI DXGetErrorString8A(HRESULT hr) { unsigned int i, j, k = 0; - for (i = sizeof(info)/sizeof(info[0]); i != 0; i /= 2) { + for (i = ARRAY_SIZE(info); i != 0; i /= 2) { j = k + (i / 2); if (hr == info[j].hr) return info[j].resultA; @@ -69,7 +69,7 @@ const WCHAR * WINAPI DXGetErrorString8W(HRESULT hr) static const WCHAR unknown[] = { 'U', 'n', 'k', 'n', 'o', 'w', 'n', 0 }; unsigned int i, j, k = 0; - for (i = sizeof(info)/sizeof(info[0]); i != 0; i /= 2) { + for (i = ARRAY_SIZE(info); i != 0; i /= 2) { j = k + (i / 2); if (hr == info[j].hr) return info[j].resultW; @@ -86,7 +86,7 @@ const char * WINAPI DXGetErrorDescription8A(HRESULT hr) { unsigned int i, j, k = 0; - for (i = sizeof(info)/sizeof(info[0]); i != 0; i /= 2) { + for (i = ARRAY_SIZE(info); i != 0; i /= 2) { j = k + (i / 2); if (hr == info[j].hr) return info[j].descriptionA; @@ -104,7 +104,7 @@ const WCHAR * WINAPI DXGetErrorDescription8W(HRESULT hr) static const WCHAR na[] = { 'n', '/', 'a', 0 }; unsigned int i, j, k = 0; - for (i = sizeof(info)/sizeof(info[0]); i != 0; i /= 2) { + for (i = ARRAY_SIZE(info); i != 0; i /= 2) { j = k + (i / 2); if (hr == info[j].hr) return info[j].descriptionW;

1 0

Alexandre Julliard : user32: Remove FIXMEs from physical<-> logical mapping functions.
by Alexandre Julliard July 13, 2018

July 13, 2018

Module: wine Branch: master Commit: ae7acbfe4b84937010c4feb45c3c1e8cb2073bcc URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae7acbfe4b84937010c4feb4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 13 17:37:56 2018 +0200 user32: Remove FIXMEs from physical<->logical mapping functions. Also group them with the other DPI functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/input.c | 20 -------------------- dlls/user32/sysparams.c | 34 ++++++++++++++++++++++++++++++++++ dlls/user32/winpos.c | 24 ------------------------ 3 files changed, 34 insertions(+), 44 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 19d1ec9..c621769 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -285,16 +285,6 @@ BOOL WINAPI GetCursorInfo( PCURSORINFO pci ) /*********************************************************************** - * GetPhysicalCursorPos (USER32.@) -*/ - -BOOL WINAPI GetPhysicalCursorPos(POINT *point) -{ - FIXME("(%p) semi-stub: forwarding to GetCursorPos\n", point); - return GetCursorPos(point); -} - -/*********************************************************************** * SetCursorPos (USER32.@) */ BOOL WINAPI DECLSPEC_HOTPATCH SetCursorPos( INT x, INT y ) @@ -320,16 +310,6 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetCursorPos( INT x, INT y ) return ret; } -/*********************************************************************** - * SetPhysicalCursorPos (USER32.@) -*/ - -BOOL WINAPI SetPhysicalCursorPos(INT x, INT y) -{ - FIXME("(%u %u) semi-stub: forwarding to SetCursorPos\n", x, y); - return SetCursorPos(x, y); -} - /********************************************************************** * SetCapture (USER32.@) */ diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 95387cd..6a22f95 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3437,3 +3437,37 @@ BOOL WINAPI GetDisplayAutoRotationPreferences( ORIENTATION_PREFERENCE *orientati *orientation = ORIENTATION_PREFERENCE_NONE; return TRUE; } + +/* physical<->logical mapping functions from win8 that are nops in later versions */ + +/*********************************************************************** + * GetPhysicalCursorPos (USER32.@) + */ +BOOL WINAPI GetPhysicalCursorPos( POINT *point ) +{ + return GetCursorPos( point ); +} + +/*********************************************************************** + * SetPhysicalCursorPos (USER32.@) + */ +BOOL WINAPI SetPhysicalCursorPos( INT x, INT y ) +{ + return SetCursorPos( x, y ); +} + +/*********************************************************************** + * LogicalToPhysicalPoint (USER32.@) + */ +BOOL WINAPI LogicalToPhysicalPoint( HWND hwnd, POINT *point ) +{ + return TRUE; +} + +/*********************************************************************** + * PhysicalToLogicalPoint (USER32.@) + */ +BOOL WINAPI PhysicalToLogicalPoint( HWND hwnd, POINT *point ) +{ + return TRUE; +} diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 56a5393..dc2816a 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -2999,27 +2999,3 @@ void WINPOS_SysCommandSizeMove( HWND hwnd, WPARAM wParam ) else WINPOS_ShowIconTitle( hwnd, TRUE ); } } - -/*********************************************************************** - * LogicalToPhysicalPoint (USER32.@) - */ -BOOL WINAPI LogicalToPhysicalPoint(HWND hwnd, POINT *point) -{ - static int once; - - if (!once++) - FIXME("(%p %p) stub\n", hwnd, point); - return TRUE; -} - -/*********************************************************************** - * PhysicalToLogicalPoint (USER32.@) - */ -BOOL WINAPI PhysicalToLogicalPoint(HWND hwnd, POINT *point) -{ - static int once; - - if (!once++) - FIXME("(%p %p) stub\n", hwnd, point); - return TRUE; -}

1 0

Michael Stefaniuc : wscript: Use the ARRAY_SIZE() macro.
by Alexandre Julliard July 13, 2018

July 13, 2018

Module: wine Branch: master Commit: f140ad6e05c650f7234d2d72e8dd7e7cc8ec62a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f140ad6e05c650f7234d2d72… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Jul 13 19:01:27 2018 +0200 wscript: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wscript/host.c | 6 +++--- programs/wscript/main.c | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/programs/wscript/host.c b/programs/wscript/host.c index fb95c0c..fb1c86f 100644 --- a/programs/wscript/host.c +++ b/programs/wscript/host.c @@ -84,7 +84,7 @@ static void print_string(const WCHAR *string) ret = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), string, len, &count, NULL); if(ret) { static const WCHAR crnlW[] = {'\r','\n'}; - WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), crnlW, sizeof(crnlW)/sizeof(*crnlW), &count, NULL); + WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), crnlW, ARRAY_SIZE(crnlW), &count, NULL); return; } @@ -183,7 +183,7 @@ static HRESULT WINAPI Host_get_FullName(IHost *iface, BSTR *out_Path) WINE_TRACE("(%p)\n", out_Path); - if(GetModuleFileNameW(NULL, fullPath, sizeof(fullPath)/sizeof(WCHAR)) == 0) + if(GetModuleFileNameW(NULL, fullPath, ARRAY_SIZE(fullPath)) == 0) return E_FAIL; if(!(*out_Path = SysAllocString(fullPath))) return E_OUTOFMEMORY; @@ -198,7 +198,7 @@ static HRESULT WINAPI Host_get_Path(IHost *iface, BSTR *out_Path) WINE_TRACE("(%p)\n", out_Path); - if(GetModuleFileNameW(NULL, path, sizeof(path)/sizeof(WCHAR)) == 0) + if(GetModuleFileNameW(NULL, path, ARRAY_SIZE(path)) == 0) return E_FAIL; pos = strrchrW(path, '\\'); howMany = pos - path; diff --git a/programs/wscript/main.c b/programs/wscript/main.c index 3537f9d..1cbb9e7 100644 --- a/programs/wscript/main.c +++ b/programs/wscript/main.c @@ -253,7 +253,7 @@ static BOOL get_engine_clsid(const WCHAR *ext, CLSID *clsid) if(res != ERROR_SUCCESS) return FALSE; - size = sizeof(fileid)/sizeof(WCHAR); + size = ARRAY_SIZE(fileid); res = RegQueryValueW(hkey, NULL, fileid, &size); RegCloseKey(hkey); if(res != ERROR_SUCCESS) @@ -266,7 +266,7 @@ static BOOL get_engine_clsid(const WCHAR *ext, CLSID *clsid) if(res != ERROR_SUCCESS) return FALSE; - size = sizeof(progid)/sizeof(WCHAR); + size = ARRAY_SIZE(progid); res = RegQueryValueW(hkey, NULL, progid, &size); RegCloseKey(hkey); if(res != ERROR_SUCCESS) @@ -446,8 +446,8 @@ int WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPWSTR cmdline, int cm WINE_FIXME("No file name specified\n"); return 1; } - res = GetFullPathNameW(filename, sizeof(scriptFullName)/sizeof(WCHAR), scriptFullName, &filepart); - if(!res || res > sizeof(scriptFullName)/sizeof(WCHAR)) + res = GetFullPathNameW(filename, ARRAY_SIZE(scriptFullName), scriptFullName, &filepart); + if(!res || res > ARRAY_SIZE(scriptFullName)) return 1; ext = strrchrW(filepart, '.');

1 0

Michael Stefaniuc : xcopy: Use the ARRAY_SIZE() macro.
by Alexandre Julliard July 13, 2018

July 13, 2018

Module: wine Branch: master Commit: c99d5f31527bdb665ef332a8058c4125ac2d05e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c99d5f31527bdb665ef332a8… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Jul 13 19:01:26 2018 +0200 xcopy: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/xcopy/xcopy.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index cdf0bdf..616c7d2 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -84,7 +84,7 @@ static WCHAR *XCOPY_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); } @@ -269,7 +269,7 @@ static BOOL XCOPY_ProcessExcludeFile(WCHAR* filename, WCHAR* endOfName) { } /* Process line by line */ - while (fgetws(buffer, sizeof(buffer)/sizeof(WCHAR), inFile) != NULL) { + while (fgetws(buffer, ARRAY_SIZE(buffer), inFile) != NULL) { EXCLUDELIST *thisEntry; int length = lstrlenW(buffer); @@ -840,9 +840,9 @@ static int XCOPY_ParseCommandLine(WCHAR *suppliedsource, /* Debug info: */ FileTimeToSystemTime (&dateRange, &st); GetDateFormatW(0, DATE_SHORTDATE, &st, NULL, datestring, - sizeof(datestring)/sizeof(WCHAR)); + ARRAY_SIZE(datestring)); GetTimeFormatW(0, TIME_NOSECONDS, &st, - NULL, timestring, sizeof(timestring)/sizeof(WCHAR)); + NULL, timestring, ARRAY_SIZE(timestring)); WINE_TRACE("Date being used is: %s %s\n", wine_dbgstr_w(datestring), wine_dbgstr_w(timestring)); @@ -987,7 +987,7 @@ static int XCOPY_ProcessSourceParm(WCHAR *suppliedsource, WCHAR *stem, lstrcpyW(spec, suppliedsource+2); } else { WCHAR curdir[MAXSTRING]; - GetCurrentDirectoryW(sizeof(curdir)/sizeof(WCHAR), curdir); + GetCurrentDirectoryW(ARRAY_SIZE(curdir), curdir); stem[0] = curdir[0]; stem[1] = curdir[1]; stem[2] = 0x00;

1 0

Michael Stefaniuc : dxerr9: Use the ARRAY_SIZE() macro.
by Alexandre Julliard July 13, 2018

July 13, 2018

Module: wine Branch: master Commit: d7fb7dfb46ca663a010de589a5ec2f0d96b2f4af URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7fb7dfb46ca663a010de589… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Jul 13 19:01:23 2018 +0200 dxerr9: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxerr9/dxerr9.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dxerr9/dxerr9.c b/dlls/dxerr9/dxerr9.c index c65f48e..e5b1861 100644 --- a/dlls/dxerr9/dxerr9.c +++ b/dlls/dxerr9/dxerr9.c @@ -55,7 +55,7 @@ const char * WINAPI DXGetErrorString9A(HRESULT hr) { unsigned int i, j, k = 0; - for (i = sizeof(info)/sizeof(info[0]); i != 0; i /= 2) { + for (i = ARRAY_SIZE(info); i != 0; i /= 2) { j = k + (i / 2); if (hr == info[j].hr) return info[j].resultA; @@ -73,7 +73,7 @@ const WCHAR * WINAPI DXGetErrorString9W(HRESULT hr) static const WCHAR unknown[] = { 'U', 'n', 'k', 'n', 'o', 'w', 'n', 0 }; unsigned int i, j, k = 0; - for (i = sizeof(info)/sizeof(info[0]); i != 0; i /= 2) { + for (i = ARRAY_SIZE(info); i != 0; i /= 2) { j = k + (i / 2); if (hr == info[j].hr) return info[j].resultW; @@ -90,7 +90,7 @@ const char * WINAPI DXGetErrorDescription9A(HRESULT hr) { unsigned int i, j, k = 0; - for (i = sizeof(info)/sizeof(info[0]); i != 0; i /= 2) { + for (i = ARRAY_SIZE(info); i != 0; i /= 2) { j = k + (i / 2); if (hr == info[j].hr) return info[j].descriptionA; @@ -108,7 +108,7 @@ const WCHAR * WINAPI DXGetErrorDescription9W(HRESULT hr) static const WCHAR na[] = { 'n', '/', 'a', 0 }; unsigned int i, j, k = 0; - for (i = sizeof(info)/sizeof(info[0]); i != 0; i /= 2) { + for (i = ARRAY_SIZE(info); i != 0; i /= 2) { j = k + (i / 2); if (hr == info[j].hr) return info[j].descriptionW;

1 0

Piotr Caban : ucrtbase: Don't fail if path ends with '\' character in stat functions family.
by Alexandre Julliard July 13, 2018

July 13, 2018

Module: wine Branch: master Commit: c5cb5e24a30d98aa329e87c3c9e709b16cf43233 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5cb5e24a30d98aa329e87c3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jul 13 16:49:34 2018 +0200 ucrtbase: Don't fail if path ends with '\' character in stat functions family. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45292 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/file.c | 22 ++++++++++++++++++---- dlls/ucrtbase/tests/misc.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 6b295cf..1c7b5a4 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -2980,13 +2980,20 @@ int CDECL MSVCRT_stat64(const char* path, struct MSVCRT__stat64 * buf) while (plen && path[plen-1]==' ') plen--; - if (plen && (plen<2 || path[plen-2]!=':') && - (path[plen-1]==':' || path[plen-1]=='\\' || path[plen-1]=='/')) + if (plen==2 && path[1]==':') { *MSVCRT__errno() = MSVCRT_ENOENT; return -1; } +#if _MSVCR_VER<140 + if (plen>=2 && path[plen-2]!=':' && (path[plen-1]=='\\' || path[plen-1]=='/')) + { + *MSVCRT__errno() = MSVCRT_ENOENT; + return -1; + } +#endif + if (!GetFileAttributesExA(path, GetFileExInfoStandard, &hfi)) { TRACE("failed (%d)\n",GetLastError()); @@ -3128,13 +3135,20 @@ int CDECL MSVCRT__wstat64(const MSVCRT_wchar_t* path, struct MSVCRT__stat64 * bu while (plen && path[plen-1]==' ') plen--; - if(plen && (plen<2 || path[plen-2]!=':') && - (path[plen-1]==':' || path[plen-1]=='\\' || path[plen-1]=='/')) + if (plen==2 && path[1]==':') { *MSVCRT__errno() = MSVCRT_ENOENT; return -1; } +#if _MSVCR_VER<140 + if (plen>=2 && path[plen-2]!=':' && (path[plen-1]=='\\' || path[plen-1]=='/')) + { + *MSVCRT__errno() = MSVCRT_ENOENT; + return -1; + } +#endif + if (!GetFileAttributesExW(path, GetFileExInfoStandard, &hfi)) { TRACE("failed (%d)\n",GetLastError()); diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 555dc2d..2a9648a 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -27,6 +27,7 @@ #include <share.h> #include <fcntl.h> #include <time.h> +#include <direct.h> #include <windef.h> #include <winbase.h> @@ -129,6 +130,7 @@ static void (CDECL *p_exit)(int); static int (CDECL *p__crt_atexit)(void (CDECL*)(void)); static int (__cdecl *p_crt_at_quick_exit)(void (__cdecl *func)(void)); static void (__cdecl *p_quick_exit)(int exitcode); +static int (__cdecl *p__stat32)(const char*, struct _stat32 *buf); static void test__initialize_onexit_table(void) { @@ -437,6 +439,7 @@ static BOOL init(void) p_exit = (void*)GetProcAddress(module, "exit"); p_crt_at_quick_exit = (void*)GetProcAddress(module, "_crt_at_quick_exit"); p_quick_exit = (void*)GetProcAddress(module, "quick_exit"); + p__stat32 = (void*)GetProcAddress(module, "_stat32"); return TRUE; } @@ -931,6 +934,48 @@ static void test_quick_exit(const char *argv0) CloseHandle(quick_exit_event); } +static void test__stat32(void) +{ + static const char test_file[] = "\\stat_file.tst"; + static const char test_dir[] = "\\stat_dir.tst"; + + char path[2*MAX_PATH]; + struct _stat32 buf; + int fd, ret; + DWORD len; + + len = GetTempPathA(MAX_PATH, path); + ok(len, "GetTempPathA failed\n"); + + ret = p__stat32("c:", &buf); + ok(ret == -1, "_stat32('c:') returned %d\n", ret); + ret = p__stat32("c:\\", &buf); + ok(!ret, "_stat32('c:\\') returned %d\n", ret); + + memcpy(path+len, test_file, sizeof(test_file)); + if((fd = open(path, O_WRONLY | O_CREAT | O_BINARY, _S_IREAD |_S_IWRITE)) >= 0) + { + ret = p__stat32(path, &buf); + ok(!ret, "_stat32('%s') returned %d\n", path, ret); + strcat(path, "\\"); + ret = p__stat32(path, &buf); + todo_wine ok(ret, "_stat32('%s') returned %d\n", path, ret); + close(fd); + remove(path); + } + + memcpy(path+len, test_dir, sizeof(test_dir)); + if(!mkdir(path)) + { + ret = p__stat32(path, &buf); + ok(!ret, "_stat32('%s') returned %d\n", path, ret); + strcat(path, "\\"); + ret = p__stat32(path, &buf); + ok(!ret, "_stat32('%s') returned %d\n", path, ret); + rmdir(path); + } +} + START_TEST(misc) { int arg_c; @@ -964,4 +1009,5 @@ START_TEST(misc) test_asctime(); test_exit(arg_v[0]); test_quick_exit(arg_v[0]); + test__stat32(); }

1 0

Michael Stefaniuc : msgsm32.acm: Avoid an ARRAY_SIZE-like macro.
by Alexandre Julliard July 13, 2018

July 13, 2018

Module: wine Branch: master Commit: 8abd579252efb323f92ccfafc20f35f6dd093c80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8abd579252efb323f92ccfaf… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Jul 11 22:06:11 2018 +0200 msgsm32.acm: Avoid an ARRAY_SIZE-like macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msgsm32.acm/msgsm32.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/msgsm32.acm/msgsm32.c b/dlls/msgsm32.acm/msgsm32.c index cce1303..99eef96 100644 --- a/dlls/msgsm32.acm/msgsm32.c +++ b/dlls/msgsm32.acm/msgsm32.c @@ -199,7 +199,6 @@ static BOOL GSM_FormatValidate(const WAVEFORMATEX *wfx) } static const DWORD gsm_rates[] = { 8000, 11025, 22050, 44100, 48000, 96000 }; -#define NUM_RATES (sizeof(gsm_rates)/sizeof(*gsm_rates)) /*********************************************************************** * GSM_FormatTagDetails @@ -241,13 +240,13 @@ static LRESULT GSM_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery) case 0: aftd->dwFormatTag = WAVE_FORMAT_PCM; aftd->cbFormatSize = sizeof(PCMWAVEFORMAT); - aftd->cStandardFormats = NUM_RATES; + aftd->cStandardFormats = ARRAY_SIZE(gsm_rates); lstrcpyW(aftd->szFormatTag, szPcm); break; case 1: aftd->dwFormatTag = WAVE_FORMAT_GSM610; aftd->cbFormatSize = sizeof(GSM610WAVEFORMAT); - aftd->cStandardFormats = NUM_RATES; + aftd->cStandardFormats = ARRAY_SIZE(gsm_rates); lstrcpyW(aftd->szFormatTag, szGsm); break; } @@ -270,7 +269,7 @@ static LRESULT GSM_FormatDetails(PACMFORMATDETAILSW afd, DWORD dwQuery) switch (afd->dwFormatTag) { case WAVE_FORMAT_PCM: - if (afd->dwFormatIndex >= NUM_RATES) return ACMERR_NOTPOSSIBLE; + if (afd->dwFormatIndex >= ARRAY_SIZE(gsm_rates)) return ACMERR_NOTPOSSIBLE; afd->pwfx->nChannels = 1; afd->pwfx->nSamplesPerSec = gsm_rates[afd->dwFormatIndex]; afd->pwfx->wBitsPerSample = 16; @@ -278,7 +277,7 @@ static LRESULT GSM_FormatDetails(PACMFORMATDETAILSW afd, DWORD dwQuery) afd->pwfx->nAvgBytesPerSec = afd->pwfx->nSamplesPerSec * afd->pwfx->nBlockAlign; break; case WAVE_FORMAT_GSM610: - if (afd->dwFormatIndex >= NUM_RATES) return ACMERR_NOTPOSSIBLE; + if (afd->dwFormatIndex >= ARRAY_SIZE(gsm_rates)) return ACMERR_NOTPOSSIBLE; afd->pwfx->nChannels = 1; afd->pwfx->nSamplesPerSec = gsm_rates[afd->dwFormatIndex]; afd->pwfx->wBitsPerSample = 0;

1 0

Michael Stefaniuc : msg711.acm: Avoid ARRAY_SIZE-like macros.
by Alexandre Julliard July 13, 2018

July 13, 2018

Module: wine Branch: master Commit: 29db42279474c3e80e286e47fe790ceaae8f2a13 URL: https://source.winehq.org/git/wine.git/?a=commit;h=29db42279474c3e80e286e47… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Jul 11 22:06:10 2018 +0200 msg711.acm: Avoid ARRAY_SIZE-like macros. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msg711.acm/msg711.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/dlls/msg711.acm/msg711.c b/dlls/msg711.acm/msg711.c index dc1661c..cb8b762 100644 --- a/dlls/msg711.acm/msg711.c +++ b/dlls/msg711.acm/msg711.c @@ -87,10 +87,6 @@ static const Format ULaw_Formats[] = {1, 8, 22050}, {2, 8, 22050}, {1, 8, 44100}, {2, 8, 44100}, }; -#define NUM_PCM_FORMATS (sizeof(PCM_Formats) / sizeof(PCM_Formats[0])) -#define NUM_ALAW_FORMATS (sizeof(ALaw_Formats) / sizeof(ALaw_Formats[0])) -#define NUM_ULAW_FORMATS (sizeof(ULaw_Formats) / sizeof(ULaw_Formats[0])) - /*********************************************************************** * G711_GetFormatIndex */ @@ -102,15 +98,15 @@ static DWORD G711_GetFormatIndex(const WAVEFORMATEX *wfx) switch (wfx->wFormatTag) { case WAVE_FORMAT_PCM: - hi = NUM_PCM_FORMATS; + hi = ARRAY_SIZE(PCM_Formats); fmts = PCM_Formats; break; case WAVE_FORMAT_ALAW: - hi = NUM_ALAW_FORMATS; + hi = ARRAY_SIZE(ALaw_Formats); fmts = ALaw_Formats; break; case WAVE_FORMAT_MULAW: - hi = NUM_ULAW_FORMATS; + hi = ARRAY_SIZE(ULaw_Formats); fmts = ULaw_Formats; break; default: @@ -716,19 +712,19 @@ static LRESULT G711_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery) case 0: aftd->dwFormatTag = WAVE_FORMAT_PCM; aftd->cbFormatSize = sizeof(PCMWAVEFORMAT); - aftd->cStandardFormats = NUM_PCM_FORMATS; + aftd->cStandardFormats = ARRAY_SIZE(PCM_Formats); lstrcpyW(aftd->szFormatTag, szPcm); break; case 1: aftd->dwFormatTag = WAVE_FORMAT_ALAW; aftd->cbFormatSize = sizeof(WAVEFORMATEX); - aftd->cStandardFormats = NUM_ALAW_FORMATS; + aftd->cStandardFormats = ARRAY_SIZE(ALaw_Formats); lstrcpyW(aftd->szFormatTag, szALaw); break; case 2: aftd->dwFormatTag = WAVE_FORMAT_MULAW; aftd->cbFormatSize = sizeof(WAVEFORMATEX); - aftd->cStandardFormats = NUM_ULAW_FORMATS; + aftd->cStandardFormats = ARRAY_SIZE(ULaw_Formats); lstrcpyW(aftd->szFormatTag, szULaw); break; } @@ -751,7 +747,7 @@ static LRESULT G711_FormatDetails(PACMFORMATDETAILSW afd, DWORD dwQuery) switch (afd->dwFormatTag) { case WAVE_FORMAT_PCM: - if (afd->dwFormatIndex >= NUM_PCM_FORMATS) return ACMERR_NOTPOSSIBLE; + if (afd->dwFormatIndex >= ARRAY_SIZE(PCM_Formats)) return ACMERR_NOTPOSSIBLE; afd->pwfx->nChannels = PCM_Formats[afd->dwFormatIndex].nChannels; afd->pwfx->nSamplesPerSec = PCM_Formats[afd->dwFormatIndex].rate; afd->pwfx->wBitsPerSample = PCM_Formats[afd->dwFormatIndex].nBits; @@ -759,7 +755,7 @@ static LRESULT G711_FormatDetails(PACMFORMATDETAILSW afd, DWORD dwQuery) afd->pwfx->nAvgBytesPerSec = afd->pwfx->nSamplesPerSec * afd->pwfx->nBlockAlign; break; case WAVE_FORMAT_ALAW: - if (afd->dwFormatIndex >= NUM_ALAW_FORMATS) return ACMERR_NOTPOSSIBLE; + if (afd->dwFormatIndex >= ARRAY_SIZE(ALaw_Formats)) return ACMERR_NOTPOSSIBLE; afd->pwfx->nChannels = ALaw_Formats[afd->dwFormatIndex].nChannels; afd->pwfx->nSamplesPerSec = ALaw_Formats[afd->dwFormatIndex].rate; afd->pwfx->wBitsPerSample = ALaw_Formats[afd->dwFormatIndex].nBits; @@ -768,7 +764,7 @@ static LRESULT G711_FormatDetails(PACMFORMATDETAILSW afd, DWORD dwQuery) afd->pwfx->cbSize = 0; break; case WAVE_FORMAT_MULAW: - if (afd->dwFormatIndex >= NUM_ULAW_FORMATS) return ACMERR_NOTPOSSIBLE; + if (afd->dwFormatIndex >= ARRAY_SIZE(ULaw_Formats)) return ACMERR_NOTPOSSIBLE; afd->pwfx->nChannels = ULaw_Formats[afd->dwFormatIndex].nChannels; afd->pwfx->nSamplesPerSec = ULaw_Formats[afd->dwFormatIndex].rate; afd->pwfx->wBitsPerSample = ULaw_Formats[afd->dwFormatIndex].nBits;

1 0

Ken Thomases : winemac: Extract a new class, WineBaseView, to be the superclass of WineContentView and future view classes.
by Alexandre Julliard July 13, 2018

July 13, 2018

Module: wine Branch: master Commit: e27abb0a3a3a5d43a12622fb99452f40c8b340ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=e27abb0a3a3a5d43a12622fb… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Jul 13 09:27:00 2018 -0500 winemac: Extract a new class, WineBaseView, to be the superclass of WineContentView and future view classes. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.m | 96 +++++++++++++++++++++++------------------ 1 file changed, 55 insertions(+), 41 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index e37e071..1e10c27 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -299,7 +299,11 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi @end -(a)interface WineContentView : NSView <NSTextInputClient> +(a)interface WineBaseView : NSView +(a)end + + +(a)interface WineContentView : WineBaseView <NSTextInputClient> { NSMutableArray* glContexts; NSMutableArray* pendingGlContexts; @@ -366,6 +370,52 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi @end +(a)implementation WineBaseView + + - (void) setRetinaMode:(int)mode + { + for (WineBaseView* subview in [self subviews]) + { + if ([subview isKindOfClass:[WineBaseView class]]) + [subview setRetinaMode:mode]; + } + } + + - (BOOL) acceptsFirstMouse:(NSEvent*)theEvent + { + return YES; + } + + - (BOOL) preservesContentDuringLiveResize + { + // Returning YES from this tells Cocoa to keep our view's content during + // a Cocoa-driven resize. In theory, we're also supposed to override + // -setFrameSize: to mark exposed sections as needing redisplay, but + // user32 will take care of that in a roundabout way. This way, we don't + // redraw until the window surface is flushed. + // + // This doesn't do anything when we resize the window ourselves. + return YES; + } + + - (BOOL)acceptsFirstResponder + { + return [[self window] contentView] == self; + } + + - (BOOL) mouseDownCanMoveWindow + { + return NO; + } + + - (NSFocusRingType) focusRingType + { + return NSFocusRingTypeNone; + } + +(a)end + + @implementation WineContentView @synthesize everHadGLContext = _everHadGLContext; @@ -537,7 +587,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi return YES; for (WineContentView* view in [self subviews]) { - if ([view hasGLDescendant]) + if ([view isKindOfClass:[WineContentView class]] && [view hasGLDescendant]) return YES; } return NO; @@ -589,38 +639,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi [self setFrame:frame]; [self updateGLContexts]; - for (WineContentView* subview in [self subviews]) - { - if ([subview isKindOfClass:[WineContentView class]]) - [subview setRetinaMode:mode]; - } - } - - - (BOOL) acceptsFirstMouse:(NSEvent*)theEvent - { - return YES; - } - - - (BOOL) preservesContentDuringLiveResize - { - // Returning YES from this tells Cocoa to keep our view's content during - // a Cocoa-driven resize. In theory, we're also supposed to override - // -setFrameSize: to mark exposed sections as needing redisplay, but - // user32 will take care of that in a roundabout way. This way, we don't - // redraw until the window surface is flushed. - // - // This doesn't do anything when we resize the window ourselves. - return YES; - } - - - (BOOL)acceptsFirstResponder - { - return [[self window] contentView] == self; - } - - - (BOOL) mouseDownCanMoveWindow - { - return NO; + [super setRetinaMode:mode]; } - (void) viewDidHide @@ -655,11 +674,6 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi [[self inputContext] discardMarkedText]; } - - (NSFocusRingType) focusRingType - { - return NSFocusRingTypeNone; - } - - (void) didAddSubview:(NSView*)subview { if ([subview isKindOfClass:[WineContentView class]]) @@ -2537,9 +2551,9 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi if (shape) [shape transformUsingAffineTransform:transform]; - for (WineContentView* subview in [self.contentView subviews]) + for (WineBaseView* subview in [self.contentView subviews]) { - if ([subview isKindOfClass:[WineContentView class]]) + if ([subview isKindOfClass:[WineBaseView class]]) [subview setRetinaMode:mode]; }

1 0