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

Ken Thomases : winemac: Implement WineMetalView class.
by Alexandre Julliard July 13, 2018

July 13, 2018

Module: wine Branch: master Commit: 357017cd87fbae43bdb48b2d9a0e72dec9eb1205 URL: https://source.winehq.org/git/wine.git/?a=commit;h=357017cd87fbae43bdb48b2d… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Jul 13 09:27:44 2018 -0500 winemac: Implement WineMetalView class. 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> --- configure | 593 ++++++++++++++++++++++++++++++++++++++++ configure.ac | 7 + dlls/winemac.drv/Makefile.in | 2 +- dlls/winemac.drv/cocoa_window.m | 141 ++++++++++ dlls/winemac.drv/macdrv_cocoa.h | 10 + include/config.h.in | 3 + 6 files changed, 755 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=357017cd87fbae43bdb4…

1 0

Andrew Eikum : winemac: Implement Vulkan driver on top of MoltenVK.
by Alexandre Julliard July 13, 2018

July 13, 2018

Module: wine Branch: master Commit: 10035f1b974235e09db8c81d24855ab547f8d5fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=10035f1b974235e09db8c81d… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Jul 13 09:28:12 2018 -0500 winemac: Implement Vulkan driver on top of MoltenVK. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 62 ++++- configure.ac | 8 +- dlls/winemac.drv/Makefile.in | 1 + dlls/winemac.drv/gdi.c | 2 +- dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/vulkan.c | 613 +++++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/vulkan.c | 3 + include/config.h.in | 3 + 8 files changed, 687 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=10035f1b974235e09db8…

1 0

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

July 13, 2018

Module: wine Branch: master Commit: 8969cf98cf3801df31428342394ac4ba4eee6854 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8969cf98cf3801df31428342… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Jul 13 19:01:25 2018 +0200 wineconsole: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/curses.c | 2 +- programs/wineconsole/dialog.c | 23 +++++++++-------------- programs/wineconsole/user.c | 18 +++++++++--------- programs/wineconsole/wineconsole.c | 2 +- 4 files changed, 20 insertions(+), 25 deletions(-) diff --git a/programs/wineconsole/curses.c b/programs/wineconsole/curses.c index 7413c8f..6c35554 100644 --- a/programs/wineconsole/curses.c +++ b/programs/wineconsole/curses.c @@ -340,7 +340,7 @@ static void WCCURSES_SetTitle(const struct inner_data* data) { WCHAR wbuf[256]; - if (WINECON_GetConsoleTitle(data->hConIn, wbuf, sizeof(wbuf)/sizeof(WCHAR))) + if (WINECON_GetConsoleTitle(data->hConIn, wbuf, ARRAY_SIZE(wbuf))) { char buffer[256]; diff --git a/programs/wineconsole/dialog.c b/programs/wineconsole/dialog.c index 9a14184..8988125 100644 --- a/programs/wineconsole/dialog.c +++ b/programs/wineconsole/dialog.c @@ -208,12 +208,10 @@ static LRESULT WINAPI WCUSER_FontPreviewProc(HWND hWnd, UINT msg, WPARAM wParam, FillRect(ps.hdc, &ps.rcPaint, CreateSolidBrush(bkcolor)); SetBkColor(ps.hdc, bkcolor); SetTextColor(ps.hdc, get_color(di, IDC_FNT_COLOR_FG)); - len = LoadStringW(GetModuleHandleW(NULL), IDS_FNT_PREVIEW, - buf, sizeof(buf) / sizeof(buf[0])); + len = LoadStringW(GetModuleHandleW(NULL), IDS_FNT_PREVIEW, buf, ARRAY_SIZE(buf)); if (len) TextOutW(ps.hdc, 0, 0, buf, len); - TextOutW(ps.hdc, 0, di->font[size_idx].height, ascii, - sizeof(ascii)/sizeof(ascii[0]) - 1); + TextOutW(ps.hdc, 0, di->font[size_idx].height, ascii, ARRAY_SIZE(ascii) - 1); SelectObject(ps.hdc, hOldFont); } EndPaint(hWnd, &ps); @@ -366,7 +364,7 @@ static int CALLBACK font_enum_size(const LOGFONTW* lf, const TEXTMETRICW* tm, static const int sizes[] = {8,9,10,11,12,14,16,18,20,22,24,26,28,36,48,72}; int i; - di->nFont = sizeof(sizes) / sizeof(sizes[0]); + di->nFont = ARRAY_SIZE(sizes); di->font = HeapAlloc(GetProcessHeap(), 0, di->nFont * sizeof(di->font[0])); for (i = 0; i < di->nFont; i++) { @@ -459,11 +457,11 @@ static BOOL select_font(struct dialog_info* di) SendDlgItemMessageW(di->hDlg, IDC_FNT_PREVIEW, WM_SETFONT, (WPARAM)hFont, TRUE); if (hOldFont) DeleteObject(hOldFont); - LoadStringW(GetModuleHandleW(NULL), IDS_FNT_DISPLAY, fmt, sizeof(fmt) / sizeof(fmt[0])); + LoadStringW(GetModuleHandleW(NULL), IDS_FNT_DISPLAY, fmt, ARRAY_SIZE(fmt)); args[0] = config.cell_width; args[1] = config.cell_height; FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ARGUMENT_ARRAY, - fmt, 0, 0, buf, sizeof(buf)/sizeof(*buf), (__ms_va_list*)args); + fmt, 0, 0, buf, ARRAY_SIZE(buf), (__ms_va_list*)args); SendDlgItemMessageW(di->hDlg, IDC_FNT_FONT_INFO, WM_SETTEXT, 0, (LPARAM)buf); @@ -687,10 +685,8 @@ static INT_PTR WINAPI WCUSER_ConfigDlgProc(HWND hDlg, UINT msg, WPARAM wParam, L WCHAR cap[256]; WCHAR txt[256]; - LoadStringW(GetModuleHandleW(NULL), IDS_DLG_TIT_ERROR, - cap, sizeof(cap) / sizeof(cap[0])); - LoadStringW(GetModuleHandleW(NULL), IDS_DLG_ERR_SBWINSIZE, - txt, sizeof(txt) / sizeof(cap[0])); + LoadStringW(GetModuleHandleW(NULL), IDS_DLG_TIT_ERROR, cap, ARRAY_SIZE(cap)); + LoadStringW(GetModuleHandleW(NULL), IDS_DLG_ERR_SBWINSIZE, txt, ARRAY_SIZE(txt)); MessageBoxW(hDlg, txt, cap, MB_OK); SetWindowLongPtrW(hDlg, DWLP_MSGRESULT, PSNRET_INVALID); @@ -831,9 +827,8 @@ BOOL WCUSER_GetProperties(struct inner_data* data, BOOL current) memset(&psHead, 0, sizeof(psHead)); psHead.dwSize = sizeof(psHead); - if (!LoadStringW(GetModuleHandleW(NULL), - (current) ? IDS_DLG_TIT_CURRENT : IDS_DLG_TIT_DEFAULT, - buff, sizeof(buff) / sizeof(buff[0]))) + if (!LoadStringW(GetModuleHandleW(NULL), (current) ? IDS_DLG_TIT_CURRENT : IDS_DLG_TIT_DEFAULT, + buff, ARRAY_SIZE(buff))) { buff[0] = 'S'; buff[1] = 'e'; diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c index 03d0ea1..0b29157 100644 --- a/programs/wineconsole/user.c +++ b/programs/wineconsole/user.c @@ -823,25 +823,25 @@ static BOOL WCUSER_FillMenu(HMENU hMenu, BOOL sep) hSubMenu = CreateMenu(); if (!hSubMenu) return FALSE; - LoadStringW(hInstance, IDS_MARK, buff, sizeof(buff) / sizeof(buff[0])); + LoadStringW(hInstance, IDS_MARK, buff, ARRAY_SIZE(buff)); InsertMenuW(hSubMenu, -1, MF_BYPOSITION|MF_STRING, IDS_MARK, buff); - LoadStringW(hInstance, IDS_COPY, buff, sizeof(buff) / sizeof(buff[0])); + LoadStringW(hInstance, IDS_COPY, buff, ARRAY_SIZE(buff)); InsertMenuW(hSubMenu, -1, MF_BYPOSITION|MF_STRING, IDS_COPY, buff); - LoadStringW(hInstance, IDS_PASTE, buff, sizeof(buff) / sizeof(buff[0])); + LoadStringW(hInstance, IDS_PASTE, buff, ARRAY_SIZE(buff)); InsertMenuW(hSubMenu, -1, MF_BYPOSITION|MF_STRING, IDS_PASTE, buff); - LoadStringW(hInstance, IDS_SELECTALL, buff, sizeof(buff) / sizeof(buff[0])); + LoadStringW(hInstance, IDS_SELECTALL, buff, ARRAY_SIZE(buff)); InsertMenuW(hSubMenu, -1, MF_BYPOSITION|MF_STRING, IDS_SELECTALL, buff); - LoadStringW(hInstance, IDS_SCROLL, buff, sizeof(buff) / sizeof(buff[0])); + LoadStringW(hInstance, IDS_SCROLL, buff, ARRAY_SIZE(buff)); InsertMenuW(hSubMenu, -1, MF_BYPOSITION|MF_STRING, IDS_SCROLL, buff); - LoadStringW(hInstance, IDS_SEARCH, buff, sizeof(buff) / sizeof(buff[0])); + LoadStringW(hInstance, IDS_SEARCH, buff, ARRAY_SIZE(buff)); InsertMenuW(hSubMenu, -1, MF_BYPOSITION|MF_STRING, IDS_SEARCH, buff); if (sep) InsertMenuW(hMenu, -1, MF_BYPOSITION|MF_SEPARATOR, 0, NULL); - LoadStringW(hInstance, IDS_EDIT, buff, sizeof(buff) / sizeof(buff[0])); + LoadStringW(hInstance, IDS_EDIT, buff, ARRAY_SIZE(buff)); InsertMenuW(hMenu, -1, MF_BYPOSITION|MF_STRING|MF_POPUP, (UINT_PTR)hSubMenu, buff); - LoadStringW(hInstance, IDS_DEFAULT, buff, sizeof(buff) / sizeof(buff[0])); + LoadStringW(hInstance, IDS_DEFAULT, buff, ARRAY_SIZE(buff)); InsertMenuW(hMenu, -1, MF_BYPOSITION|MF_STRING, IDS_DEFAULT, buff); - LoadStringW(hInstance, IDS_PROPERTIES, buff, sizeof(buff) / sizeof(buff[0])); + LoadStringW(hInstance, IDS_PROPERTIES, buff, ARRAY_SIZE(buff)); InsertMenuW(hMenu, -1, MF_BYPOSITION|MF_STRING, IDS_PROPERTIES, buff); return TRUE; diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index 9e3afb1..439099c 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -45,7 +45,7 @@ static void printf_res(UINT uResId, ...) va_list args; va_start(args, uResId); - LoadStringW(GetModuleHandleW(NULL), uResId, buffer, sizeof(buffer)/sizeof(buffer[0])); + LoadStringW(GetModuleHandleW(NULL), uResId, buffer, ARRAY_SIZE(buffer)); WideCharToMultiByte(CP_UNIXCP, 0, buffer, -1, ansi, sizeof(ansi), NULL, NULL); vprintf(ansi, args); va_end(args);

1 0

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

July 13, 2018

Module: wine Branch: master Commit: a9933cc2d160c8de4f145463bdce035768940913 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9933cc2d160c8de4f145463… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Jul 13 19:01:24 2018 +0200 winemine: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemine/dialog.c | 9 ++++----- programs/winemine/main.c | 10 +++++----- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/programs/winemine/dialog.c b/programs/winemine/dialog.c index c182e91..4741241 100644 --- a/programs/winemine/dialog.c +++ b/programs/winemine/dialog.c @@ -69,9 +69,8 @@ INT_PTR CALLBACK CongratsDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lP case WM_COMMAND: switch( LOWORD( wParam ) ) { case IDOK: - GetDlgItemTextW( hDlg, IDC_EDITNAME, - p_board->best_name[p_board->difficulty], - sizeof( p_board->best_name[p_board->difficulty] ) / sizeof(WCHAR) ); + GetDlgItemTextW( hDlg, IDC_EDITNAME, p_board->best_name[p_board->difficulty], + ARRAY_SIZE(p_board->best_name[p_board->difficulty] )); EndDialog( hDlg, 0 ); return TRUE; @@ -107,8 +106,8 @@ INT_PTR CALLBACK TimesDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPara case WM_COMMAND: switch( LOWORD( wParam ) ) { case IDC_RESET: - LoadStringW( NULL, IDC_CONFIRMTITLE, confirm_title, sizeof(confirm_title)/sizeof(WCHAR) ); - LoadStringW( NULL, IDC_CONFIRMTEXT, confirm_text, sizeof(confirm_text)/sizeof(WCHAR) ); + LoadStringW( NULL, IDC_CONFIRMTITLE, confirm_title, ARRAY_SIZE(confirm_title)); + LoadStringW( NULL, IDC_CONFIRMTEXT, confirm_text, ARRAY_SIZE(confirm_text)); confirm_msgbox_result = MessageBoxW( hDlg, confirm_text, confirm_title, MB_OKCANCEL | MB_DEFBUTTON2 | MB_ICONWARNING ); if( confirm_msgbox_result != IDOK ) break; diff --git a/programs/winemine/main.c b/programs/winemine/main.c index 5bec84c..255d217 100644 --- a/programs/winemine/main.c +++ b/programs/winemine/main.c @@ -112,7 +112,7 @@ static void LoadBoard( BOARD *p_board ) size = sizeof( data ); if( RegQueryValueExW( hkey, key_name, NULL, &type, (LPBYTE) data, &size ) == ERROR_SUCCESS ) - lstrcpynW( p_board->best_name[i], data, sizeof(p_board->best_name[i])/sizeof(WCHAR) ); + lstrcpynW( p_board->best_name[i], data, ARRAY_SIZE(p_board->best_name[i])); else LoadStringW( p_board->hInst, IDS_NOBODY, p_board->best_name[i], MAX_PLAYER_NAME_SIZE+1 ); } @@ -179,7 +179,7 @@ void SaveBoard( BOARD *p_board ) for( i = 0; i < 3; i++ ) { wsprintfW( key_name, nameW, i+1 ); - lstrcpynW( data, p_board->best_name[i], sizeof(data)/sizeof(WCHAR) ); + lstrcpynW( data, p_board->best_name[i], ARRAY_SIZE(data)); RegSetValueExW( hkey, key_name, 0, REG_SZ, (LPBYTE) data, (lstrlenW(data)+1) * sizeof(WCHAR) ); } @@ -1003,8 +1003,8 @@ static LRESULT WINAPI MainProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPara case IDM_ABOUT: { WCHAR appname[256], other[256]; - LoadStringW( board.hInst, IDS_APPNAME, appname, sizeof(appname)/sizeof(WCHAR) ); - LoadStringW( board.hInst, IDS_ABOUT, other, sizeof(other)/sizeof(WCHAR) ); + LoadStringW( board.hInst, IDS_APPNAME, appname, ARRAY_SIZE(appname)); + LoadStringW( board.hInst, IDS_ABOUT, other, ARRAY_SIZE(other)); ShellAboutW( hWnd, appname, other, LoadImageW(board.hInst, MAKEINTRESOURCEW(IDI_WINEMINE), IMAGE_ICON, 48, 48, LR_SHARED)); return 0; @@ -1025,7 +1025,7 @@ int WINAPI wWinMain( HINSTANCE hInst, HINSTANCE hPrevInst, LPWSTR cmdline, int c HACCEL haccel; WCHAR appname[20]; - LoadStringW( hInst, IDS_APPNAME, appname, sizeof(appname)/sizeof(WCHAR)); + LoadStringW( hInst, IDS_APPNAME, appname, ARRAY_SIZE(appname)); wc.cbSize = sizeof(wc); wc.style = 0;

1 0

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

July 13, 2018

Module: wine Branch: master Commit: 1066283874887a055df4491e229f538004972225 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1066283874887a055df4491e… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Jul 13 19:01:28 2018 +0200 winefile: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winefile/winefile.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index 044a399..23be450 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -193,7 +193,7 @@ static LPWSTR load_string(LPWSTR buffer, DWORD size, UINT id) return buffer; } -#define RS(b, i) load_string(b, sizeof(b)/sizeof(b[0]), i) +#define RS(b, i) load_string(b, ARRAY_SIZE(b), i) /* display error message for the specified WIN32 error code */ @@ -1243,9 +1243,9 @@ static Entry* read_tree(Root* root, LPCWSTR path, LPITEMIDLIST pidl, LPWSTR drv, root->drive_type = DRIVE_UNKNOWN; drv[0] = '\\'; drv[1] = '\0'; - load_string(root->volname, sizeof(root->volname)/sizeof(root->volname[0]), IDS_DESKTOP); + load_string(root->volname, ARRAY_SIZE(root->volname), IDS_DESKTOP); root->fs_flags = 0; - load_string(root->fs, sizeof(root->fs)/sizeof(root->fs[0]), IDS_SHELL); + load_string(root->fs, ARRAY_SIZE(root->fs), IDS_SHELL); return read_tree_shell(root, pidl, sortOrder, hwnd); } @@ -1257,9 +1257,9 @@ static Entry* read_tree(Root* root, LPCWSTR path, LPITEMIDLIST pidl, LPWSTR drv, root->drive_type = GetDriveTypeW(path); lstrcatW(drv, sSlash); - load_string(root->volname, sizeof(root->volname)/sizeof(root->volname[0]), IDS_ROOT_FS); + load_string(root->volname, ARRAY_SIZE(root->volname), IDS_ROOT_FS); root->fs_flags = 0; - load_string(root->fs, sizeof(root->fs)/sizeof(root->fs[0]), IDS_UNIXFS); + load_string(root->fs, ARRAY_SIZE(root->fs), IDS_UNIXFS); lstrcpyW(root->path, sSlash); @@ -1347,7 +1347,7 @@ static ChildWnd* alloc_child_window(LPCWSTR path, LPITEMIDLIST pidl, HWND hwnd) entry = read_tree(root, dir_path, pidl, drv, child->sortOrder, hwnd); if (root->entry.etype == ET_SHELL) - load_string(root->entry.data.cFileName, sizeof(root->entry.data.cFileName)/sizeof(root->entry.data.cFileName[0]), IDS_DESKTOP); + load_string(root->entry.data.cFileName, ARRAY_SIZE(root->entry.data.cFileName), IDS_DESKTOP); else wsprintfW(root->entry.data.cFileName, sTitleFmt, drv, root->fs); @@ -2649,12 +2649,12 @@ static void set_space_status(void) if (GetDiskFreeSpaceExW(NULL, &ulFreeBytesToCaller, &ulTotalBytes, &ulFreeBytes)) { DWORD_PTR args[2]; - args[0] = (DWORD_PTR)StrFormatByteSizeW(ulFreeBytesToCaller.QuadPart, b1, sizeof(b1)/sizeof(*b1)); - args[1] = (DWORD_PTR)StrFormatByteSizeW(ulTotalBytes.QuadPart, b2, sizeof(b2)/sizeof(*b2)); + args[0] = (DWORD_PTR)StrFormatByteSizeW(ulFreeBytesToCaller.QuadPart, b1, ARRAY_SIZE(b1)); + args[1] = (DWORD_PTR)StrFormatByteSizeW(ulTotalBytes.QuadPart, b2, ARRAY_SIZE(b2)); FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ARGUMENT_ARRAY, - RS(fmt,IDS_FREE_SPACE_FMT), 0, 0, buffer, - sizeof(buffer)/sizeof(*buffer), (__ms_va_list*)args); + RS(fmt,IDS_FREE_SPACE_FMT), 0, 0, buffer, ARRAY_SIZE(buffer), + (__ms_va_list*)args); } else lstrcpyW(buffer, sQMarks); @@ -3430,7 +3430,7 @@ static void create_drive_bar(void) drivebarBtn.iString++; #endif /* insert shell namespace button */ - load_string(b1, sizeof(b1)/sizeof(b1[0]), IDS_SHELL); + load_string(b1, ARRAY_SIZE(b1), IDS_SHELL); b1[lstrlenW(b1)+1] = '\0'; SendMessageW(Globals.hdrivebar, TB_ADDSTRINGW, 0, (LPARAM)b1); @@ -4198,15 +4198,15 @@ static void InitInstance(HINSTANCE hinstance) /* load column strings */ col = 1; - load_string(g_pos_names[col++], sizeof(g_pos_names[col])/sizeof(g_pos_names[col][0]), IDS_COL_NAME); - load_string(g_pos_names[col++], sizeof(g_pos_names[col])/sizeof(g_pos_names[col][0]), IDS_COL_SIZE); - load_string(g_pos_names[col++], sizeof(g_pos_names[col])/sizeof(g_pos_names[col][0]), IDS_COL_CDATE); - load_string(g_pos_names[col++], sizeof(g_pos_names[col])/sizeof(g_pos_names[col][0]), IDS_COL_ADATE); - load_string(g_pos_names[col++], sizeof(g_pos_names[col])/sizeof(g_pos_names[col][0]), IDS_COL_MDATE); - load_string(g_pos_names[col++], sizeof(g_pos_names[col])/sizeof(g_pos_names[col][0]), IDS_COL_IDX); - load_string(g_pos_names[col++], sizeof(g_pos_names[col])/sizeof(g_pos_names[col][0]), IDS_COL_LINKS); - load_string(g_pos_names[col++], sizeof(g_pos_names[col])/sizeof(g_pos_names[col][0]), IDS_COL_ATTR); - load_string(g_pos_names[col++], sizeof(g_pos_names[col])/sizeof(g_pos_names[col][0]), IDS_COL_SEC); + load_string(g_pos_names[col++], ARRAY_SIZE(g_pos_names[col]), IDS_COL_NAME); + load_string(g_pos_names[col++], ARRAY_SIZE(g_pos_names[col]), IDS_COL_SIZE); + load_string(g_pos_names[col++], ARRAY_SIZE(g_pos_names[col]), IDS_COL_CDATE); + load_string(g_pos_names[col++], ARRAY_SIZE(g_pos_names[col]), IDS_COL_ADATE); + load_string(g_pos_names[col++], ARRAY_SIZE(g_pos_names[col]), IDS_COL_MDATE); + load_string(g_pos_names[col++], ARRAY_SIZE(g_pos_names[col]), IDS_COL_IDX); + load_string(g_pos_names[col++], ARRAY_SIZE(g_pos_names[col]), IDS_COL_LINKS); + load_string(g_pos_names[col++], ARRAY_SIZE(g_pos_names[col]), IDS_COL_ATTR); + load_string(g_pos_names[col++], ARRAY_SIZE(g_pos_names[col]), IDS_COL_SEC); } @@ -4263,7 +4263,7 @@ static BOOL show_frame(HWND hwndParent, int cmdshow, LPCWSTR path) Globals.htoolbar = CreateToolbarEx(Globals.hMainWnd, WS_CHILD|WS_VISIBLE, IDW_TOOLBAR, 2, Globals.hInstance, IDB_TOOLBAR, toolbarBtns, - sizeof(toolbarBtns)/sizeof(TBBUTTON), 16, 15, 16, 15, sizeof(TBBUTTON)); + ARRAY_SIZE(toolbarBtns), 16, 15, 16, 15, sizeof(TBBUTTON)); CheckMenuItem(Globals.hMenuOptions, ID_VIEW_TOOL_BAR, MF_BYCOMMAND|MF_CHECKED); }

1 0

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

July 13, 2018

Module: wine Branch: master Commit: 414fe80aebe3850fd016da5cb883f4bfeab1c543 URL: https://source.winehq.org/git/wine.git/?a=commit;h=414fe80aebe3850fd016da5c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Jul 13 19:01:30 2018 +0200 start: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/startmenu.c | 2 +- programs/start/start.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/programs/explorer/startmenu.c b/programs/explorer/startmenu.c index 0d79aca..f5f50bb 100644 --- a/programs/explorer/startmenu.c +++ b/programs/explorer/startmenu.c @@ -475,7 +475,7 @@ void do_startmenu(HWND hwnd) if (SUCCEEDED(SHGetSpecialFolderLocation(NULL, CSIDL_CONTROLS, &pidl))) add_shell_item(&root_menu, pidl); - LoadStringW(NULL, IDS_RUN, run_label, sizeof(run_label)/sizeof(run_label[0])); + LoadStringW(NULL, IDS_RUN, run_label, ARRAY_SIZE(run_label)); mii.cbSize = sizeof(mii); mii.fMask = MIIM_STRING|MIIM_ID; diff --git a/programs/start/start.c b/programs/start/start.c index 4010bef..32372ec 100644 --- a/programs/start/start.c +++ b/programs/start/start.c @@ -100,8 +100,7 @@ static void fatal_string_error(int which, DWORD error_code, const WCHAR *filenam { WCHAR msg[2048]; - if (!LoadStringW(GetModuleHandleW(NULL), which, - msg, sizeof(msg)/sizeof(WCHAR))) + if (!LoadStringW(GetModuleHandleW(NULL), which, msg, ARRAY_SIZE(msg))) WINE_ERR("LoadString failed, error %d\n", GetLastError()); fatal_error(msg, error_code, filename); @@ -111,8 +110,7 @@ static void fatal_string(int which) { WCHAR msg[2048]; - if (!LoadStringW(GetModuleHandleW(NULL), which, - msg, sizeof(msg)/sizeof(WCHAR))) + if (!LoadStringW(GetModuleHandleW(NULL), which, msg, ARRAY_SIZE(msg))) WINE_ERR("LoadString failed, error %d\n", GetLastError()); output(msg);

1 0

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

July 13, 2018

Module: wine Branch: master Commit: cd82a649aa002125eb8d06b198a516fc9b785234 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd82a649aa002125eb8d06b1… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Jul 13 19:01:29 2018 +0200 wmic: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wmic/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/wmic/main.c b/programs/wmic/main.c index ddd2aec..f4a5bc7 100644 --- a/programs/wmic/main.c +++ b/programs/wmic/main.c @@ -82,7 +82,7 @@ static const WCHAR *find_class( const WCHAR *alias ) { unsigned int i; - for (i = 0; i < sizeof(alias_map)/sizeof(alias_map[0]); i++) + for (i = 0; i < ARRAY_SIZE(alias_map); i++) { if (!strcmpiW( alias, alias_map[i].alias )) return alias_map[i].class; } @@ -158,7 +158,7 @@ static int output_message( int msg ) static const WCHAR fmtW[] = {'%','s',0}; WCHAR buffer[8192]; - LoadStringW( GetModuleHandleW(NULL), msg, buffer, sizeof(buffer)/sizeof(WCHAR) ); + LoadStringW( GetModuleHandleW(NULL), msg, buffer, ARRAY_SIZE(buffer)); return output_string( fmtW, buffer ); } @@ -193,7 +193,7 @@ static int query_prop( const WCHAR *class, const WCHAR *propname ) hr = IWbemLocator_ConnectServer( locator, path, NULL, NULL, NULL, 0, NULL, NULL, &services ); if (hr != S_OK) goto done; - len = strlenW( class ) + sizeof(select_allW) / sizeof(select_allW[0]); + len = strlenW( class ) + ARRAY_SIZE(select_allW); if (!(query = SysAllocStringLen( NULL, len ))) goto done; strcpyW( query, select_allW ); strcatW( query, class );

1 0

Józef Kucia : winevulkan: Use WINE_VK_VERSION to limit supported features.
by Alexandre Julliard July 13, 2018

July 13, 2018

Module: wine Branch: master Commit: 8bd787c3b3ed8665b3a13eaaec406e63b5cfbad0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8bd787c3b3ed8665b3a13eaa… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jul 13 10:55:38 2018 +0200 winevulkan: Use WINE_VK_VERSION to limit supported features. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index fbb8528..76ea95f 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2306,6 +2306,15 @@ class VkRegistry(object): self.funcs = {} self.types = {} + self.version_regex = re.compile( + r'^' + r'VK_VERSION_' + r'(?P<major>[0-9])' + r'_' + r'(?P<minor>[0-9])' + r'$' + ) + # Overall strategy for parsing the registry is to first # parse all type / function definitions. Then parse # features and extensions to decide which types / functions @@ -2323,6 +2332,14 @@ class VkRegistry(object): self.copyright = root.find('./comment').text + def _is_feature_supported(self, feature): + version = self.version_regex.match(feature) + if not version: + return True + + version = tuple(map(int, version.group('major', 'minor'))) + return version <= WINE_VK_VERSION + def _mark_command_required(self, command): """ Helper function to mark a certain command and the datatypes it needs as required.""" def mark_bitmask_dependencies(bitmask, types): @@ -2542,7 +2559,7 @@ class VkRegistry(object): type_info.required = True feature = require.attrib.get("feature") - if feature == "VK_VERSION_1_1": + if feature and not self._is_feature_supported(feature): continue # Pull in any commands we need. We infer types to pull in from the command @@ -2569,8 +2586,7 @@ class VkRegistry(object): if tag.tag == "comment": continue elif tag.tag == "command": - # For now limit to 1.0 features as various 1.1 features need more work. - if feature_name == "VK_VERSION_1_1": + if not self._is_feature_supported(feature_name): continue name = tag.attrib["name"] self._mark_command_required(name)

1 0

Józef Kucia : winevulkan: Implement vkEnumerateInstanceVersion().
by Alexandre Julliard July 13, 2018

July 13, 2018

Module: wine Branch: master Commit: a45b04273f9e9a7ebd993276c29d2e70eeeaac0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a45b04273f9e9a7ebd993276… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jul 13 10:55:37 2018 +0200 winevulkan: Implement vkEnumerateInstanceVersion(). The current version of Vulkan Loader returns VK_API_VERSION_1_1. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vulkan-1/tests/vulkan.c | 22 ++++++++++++++++++++++ dlls/vulkan-1/vulkan-1.spec | 2 +- dlls/vulkan-1/vulkan.c | 14 +++++++++++--- dlls/winevulkan/make_vulkan | 6 +++++- dlls/winevulkan/vulkan.c | 14 ++++++++++++++ dlls/winevulkan/vulkan_thunks.h | 2 ++ dlls/winevulkan/winevulkan.spec | 2 +- dlls/winex11.drv/vulkan.c | 18 ++++++++++++++++++ include/wine/vulkan.h | 2 ++ include/wine/vulkan_driver.h | 3 ++- 10 files changed, 78 insertions(+), 7 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a45b04273f9e9a7ebd99…

1 0

Józef Kucia : winevulkan: Allow running make_vulkan from any working directory.
by Alexandre Julliard July 13, 2018

July 13, 2018

Module: wine Branch: master Commit: cc0606175b90e3ba852a6fcf434b63a9ca3bb12f URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc0606175b90e3ba852a6fcf… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jul 13 10:55:34 2018 +0200 winevulkan: Allow running make_vulkan from any working directory. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 2672ad7..8c00509 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2721,6 +2721,11 @@ class VkRegistry(object): self.handles = sorted(handles, key=lambda handle: handle.name) self.structs = sorted(structs, key=lambda struct: struct.name) +def set_working_directory(): + path = os.path.abspath(__file__) + path = os.path.dirname(path) + os.chdir(path) + def download_vk_xml(filename): url = "https://raw.github.com/KhronosGroup/Vulkan-Docs/v{0}/xml/vk.xml".format(VK_XML_VERSION) if not os.path.isfile(filename): @@ -2738,6 +2743,8 @@ def main(): else: # > 1 LOGGER.setLevel(logging.DEBUG) + set_working_directory() + vk_xml = "vk-{0}.xml".format(VK_XML_VERSION) download_vk_xml(vk_xml) registry = VkRegistry(vk_xml)

1 0

Detlef Riekenberg : winhttp/tests: Skip the tests when we encounter a failure.
by Alexandre Julliard July 13, 2018

July 13, 2018

Module: wine Branch: master Commit: 054c916c4074d9114708e1bc08bc2ef8782a3f0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=054c916c4074d9114708e1bc… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Jul 12 21:04:24 2018 +0200 winhttp/tests: Skip the tests when we encounter a failure. This avoids entering the loop and flood the result file until we reach the 120s test timeout. Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/winhttp.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 46504e1..c9e053f 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -4417,9 +4417,11 @@ static void test_chunked_read(void) goto done; } ok( ret, "WinHttpSendRequest failed with error %u\n", GetLastError() ); + if (!ret) goto done; ret = WinHttpReceiveResponse( req, NULL ); ok( ret, "WinHttpReceiveResponse failed with error %u\n", GetLastError() ); + if (!ret) goto done; header[0] = 0; len = sizeof(header);

1 0

Louis Lenders : mscoree: Add stub for CorIsLatestSvc to hint user at broken .NET installation.
by Alexandre Julliard July 13, 2018

July 13, 2018

Module: wine Branch: master Commit: 27f2f4199fde170a1ff2b3090506ad3c9e6d1bfa URL: https://source.winehq.org/git/wine.git/?a=commit;h=27f2f4199fde170a1ff2b309… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Wed Jul 11 19:58:54 2018 +0200 mscoree: Add stub for CorIsLatestSvc to hint user at broken .NET installation. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/mscoree.spec | 2 +- dlls/mscoree/mscoree_main.c | 11 +++++++++++ dlls/mscoree/tests/mscoree.c | 7 ++++++- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/mscoree/mscoree.spec b/dlls/mscoree/mscoree.spec index 3715b7c..ec4668b 100644 --- a/dlls/mscoree/mscoree.spec +++ b/dlls/mscoree/mscoree.spec @@ -25,7 +25,7 @@ @ stub CorDllMainWorker @ stdcall CorExitProcess(long) @ stub CorGetSvc -@ stub CorIsLatestSvc +@ stdcall CorIsLatestSvc(ptr ptr) @ stub CorMarkThreadInThreadPool @ stub CorTickleSvc @ stdcall CreateConfigStream(wstr ptr) diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 9561405..42f8169 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -49,6 +49,7 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL( mscoree ); +WINE_DECLARE_DEBUG_CHANNEL(winediag); static HINSTANCE MSCOREE_hInstance; @@ -309,6 +310,16 @@ HRESULT WINAPI GetCORVersion(LPWSTR pbuffer, DWORD cchBuffer, DWORD *dwLength) return ret; } +HRESULT WINAPI CorIsLatestSvc(int *unk1, int *unk2) +{ + ERR_(winediag)("If this function is called, it is likely the result of a broken .NET installation\n"); + + if (!unk1 || !unk2) + return E_POINTER; + + return S_OK; +} + HRESULT WINAPI GetRequestedRuntimeInfo(LPCWSTR pExe, LPCWSTR pwszVersion, LPCWSTR pConfigurationFile, DWORD startupFlags, DWORD runtimeInfoFlags, LPWSTR pDirectory, DWORD dwDirectory, DWORD *dwDirectoryLength, LPWSTR pVersion, DWORD cchBuffer, DWORD *dwlength) diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index 63517dc..dd4724d 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -35,6 +35,7 @@ static const WCHAR v4_0[] = {'v','4','.','0','.','3','0','3','1','9',0}; static HMODULE hmscoree; static HRESULT (WINAPI *pGetCORVersion)(LPWSTR, DWORD, DWORD*); +static HRESULT (WINAPI *pCorIsLatestSvc)(INT*, INT*); static HRESULT (WINAPI *pGetCORSystemDirectory)(LPWSTR, DWORD, DWORD*); static HRESULT (WINAPI *pGetRequestedRuntimeInfo)(LPCWSTR, LPCWSTR, LPCWSTR, DWORD, DWORD, LPWSTR, DWORD, DWORD*, LPWSTR, DWORD, DWORD*); static HRESULT (WINAPI *pLoadLibraryShim)(LPCWSTR, LPCWSTR, LPVOID, HMODULE*); @@ -55,6 +56,7 @@ static BOOL init_functionpointers(void) } pGetCORVersion = (void *)GetProcAddress(hmscoree, "GetCORVersion"); + pCorIsLatestSvc = (void *)GetProcAddress(hmscoree, "CorIsLatestSvc"); pGetCORSystemDirectory = (void *)GetProcAddress(hmscoree, "GetCORSystemDirectory"); pGetRequestedRuntimeInfo = (void *)GetProcAddress(hmscoree, "GetRequestedRuntimeInfo"); pLoadLibraryShim = (void *)GetProcAddress(hmscoree, "LoadLibraryShim"); @@ -63,7 +65,7 @@ static BOOL init_functionpointers(void) pCLRCreateInstance = (void *)GetProcAddress(hmscoree, "CLRCreateInstance"); if (!pGetCORVersion || !pGetCORSystemDirectory || !pGetRequestedRuntimeInfo || !pLoadLibraryShim || - !pCreateInterface || !pCLRCreateInstance + !pCreateInterface || !pCLRCreateInstance || !pCorIsLatestSvc ) { win_skip("functions not available\n"); @@ -289,6 +291,9 @@ static void test_versioninfo(void) hr = pGetRequestedRuntimeInfo( NULL, v2_0_0, NULL, 0, RUNTIME_INFO_UPGRADE_VERSION, path, MAX_PATH, &path_len, version, MAX_PATH, NULL); ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08x\n", hr); ok(!winetest_strcmpW(version, v2_0), "version is %s , expected %s\n", wine_dbgstr_w(version), wine_dbgstr_w(v2_0)); + + hr = pCorIsLatestSvc(NULL, NULL); + ok(hr == E_POINTER, "CorIsLatestSvc returned %08x\n", hr); } static void test_loadlibraryshim(void)

1 0

Zebediah Figura : kernel32/tests: Load GetSystemFirmwareTable() dynamically.
by Alexandre Julliard July 13, 2018

July 13, 2018

Module: wine Branch: master Commit: 75464b13fdc958fb6e18dea71ac4e05ea446c8e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=75464b13fdc958fb6e18dea7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jul 13 09:48:03 2018 +0100 kernel32/tests: Load GetSystemFirmwareTable() dynamically. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/version.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/version.c b/dlls/kernel32/tests/version.c index 3bc04fd..c1b7c9c 100644 --- a/dlls/kernel32/tests/version.c +++ b/dlls/kernel32/tests/version.c @@ -26,6 +26,7 @@ #include "winternl.h" static BOOL (WINAPI * pGetProductInfo)(DWORD, DWORD, DWORD, DWORD, DWORD *); +static UINT (WINAPI * pGetSystemFirmwareTable)(DWORD, DWORD, void *, DWORD); static NTSTATUS (WINAPI * pNtQuerySystemInformation)(SYSTEM_INFORMATION_CLASS, void *, ULONG, ULONG *); static NTSTATUS (WINAPI * pRtlGetVersion)(RTL_OSVERSIONINFOEXW *); @@ -44,6 +45,7 @@ static void init_function_pointers(void) hmod = GetModuleHandleA("kernel32.dll"); GET_PROC(GetProductInfo); + GET_PROC(GetSystemFirmwareTable); hmod = GetModuleHandleA("ntdll.dll"); @@ -709,9 +711,16 @@ static void test_GetSystemFirmwareTable(void) static const ULONG min_sfti_len = FIELD_OFFSET(SYSTEM_FIRMWARE_TABLE_INFORMATION, TableBuffer); ULONG expected_len; UINT len; - SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti = HeapAlloc(GetProcessHeap(), 0, min_sfti_len); + SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti; UCHAR *smbios_table; + if (!pGetSystemFirmwareTable) + { + win_skip("GetSystemFirmwareTable not available\n"); + return; + } + + sfti = HeapAlloc(GetProcessHeap(), 0, min_sfti_len); ok(!!sfti, "Failed to allocate memory\n"); sfti->ProviderSignature = RSMB; sfti->Action = SystemFirmwareTable_Get; @@ -729,7 +738,7 @@ static void test_GetSystemFirmwareTable(void) expected_len -= min_sfti_len; smbios_table = HeapAlloc(GetProcessHeap(), 0, expected_len); - len = GetSystemFirmwareTable(RSMB, 0, smbios_table, expected_len); + len = pGetSystemFirmwareTable(RSMB, 0, smbios_table, expected_len); ok(len == expected_len, "Expected length %u, got %u\n", expected_len, len); ok(len == 0 || !memcmp(smbios_table, sfti->TableBuffer, 6), "Expected prologue %02x %02x %02x %02x %02x %02x, got %02x %02x %02x %02x %02x %02x\n",

1 0

Józef Kucia : winevulkan: Implement vkEnumerateInstanceLayerProperties() in ICD.
by Alexandre Julliard July 13, 2018

July 13, 2018

Module: wine Branch: master Commit: b75a1178221213a9d315e086862e4cabf69d62ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=b75a1178221213a9d315e086… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jul 13 10:55:40 2018 +0200 winevulkan: Implement vkEnumerateInstanceLayerProperties() in ICD. Other Vulkan ICDs implement this function. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 4 ---- dlls/winevulkan/vulkan.c | 14 ++++++++++++++ dlls/winevulkan/winevulkan.spec | 1 + 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 76ea95f..83c9507 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2258,10 +2258,6 @@ class VkGenerator(object): if not func.is_core_func(): continue - # Not an ICD level function. - if func.name == "vkEnumerateInstanceLayerProperties": - continue - # We support all Core functions except for VK_KHR_display* APIs. # Create stubs for unsupported Core functions. if func.is_required(): diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 4e11c72..a06cfa1 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -828,6 +828,19 @@ VkResult WINAPI wine_vkEnumerateInstanceExtensionProperties(const char *layer_na return *count < num_properties ? VK_INCOMPLETE : VK_SUCCESS; } +VkResult WINAPI wine_vkEnumerateInstanceLayerProperties(uint32_t *count, VkLayerProperties *properties) +{ + TRACE("%p, %p\n", count, properties); + + if (!properties) + { + *count = 0; + return VK_SUCCESS; + } + + return VK_ERROR_LAYER_NOT_PRESENT; +} + VkResult WINAPI wine_vkEnumerateInstanceVersion(uint32_t *version) { VkResult res; @@ -1096,6 +1109,7 @@ static const struct vulkan_func vk_global_dispatch_table[] = { {"vkCreateInstance", &wine_vkCreateInstance}, {"vkEnumerateInstanceExtensionProperties", &wine_vkEnumerateInstanceExtensionProperties}, + {"vkEnumerateInstanceLayerProperties", &wine_vkEnumerateInstanceLayerProperties}, {"vkEnumerateInstanceVersion", &wine_vkEnumerateInstanceVersion}, {"vkGetInstanceProcAddr", &wine_vkGetInstanceProcAddr}, }; diff --git a/dlls/winevulkan/winevulkan.spec b/dlls/winevulkan/winevulkan.spec index ee34a99..91f7333 100644 --- a/dlls/winevulkan/winevulkan.spec +++ b/dlls/winevulkan/winevulkan.spec @@ -149,6 +149,7 @@ @ stdcall wine_vkEnumerateDeviceExtensionProperties(ptr str ptr ptr) @ stdcall wine_vkEnumerateDeviceLayerProperties(ptr ptr ptr) @ stdcall wine_vkEnumerateInstanceExtensionProperties(str ptr ptr) +@ stdcall wine_vkEnumerateInstanceLayerProperties(ptr ptr) @ stdcall wine_vkEnumerateInstanceVersion(ptr) @ stdcall wine_vkEnumeratePhysicalDeviceGroups(ptr ptr ptr) @ stdcall wine_vkEnumeratePhysicalDevices(ptr ptr ptr)

1 0

Józef Kucia : winevulkan: Add driver functions for VK_KHR_device_group.
by Alexandre Julliard July 13, 2018

July 13, 2018

Module: wine Branch: master Commit: 960e52e12fb9d6384c293d727bb14c0d439757fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=960e52e12fb9d6384c293d72… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jul 13 10:55:35 2018 +0200 winevulkan: Add driver functions for VK_KHR_device_group. In order to unwrap VkSurface. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vulkan-1/vulkan-1.spec | 4 ++-- dlls/winevulkan/make_vulkan | 8 +++++-- dlls/winevulkan/vulkan_thunks.c | 14 +++++++++++ dlls/winevulkan/vulkan_thunks.h | 4 ++++ dlls/winevulkan/winevulkan.spec | 4 ++-- dlls/winex11.drv/vulkan.c | 51 +++++++++++++++++++++++++++++++---------- include/wine/vulkan.h | 4 ++++ include/wine/vulkan_driver.h | 4 +++- 8 files changed, 74 insertions(+), 19 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=960e52e12fb9d6384c29…

1 0

Józef Kucia : vulkan-1: Forward all functions directly to winevulkan.
by Alexandre Julliard July 13, 2018

July 13, 2018

Module: wine Branch: master Commit: 1354e3535a24accc688da39c01c966e7dbaae3dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=1354e3535a24accc688da39c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jul 13 10:55:41 2018 +0200 vulkan-1: Forward all functions directly to winevulkan. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vulkan-1/vulkan-1.spec | 8 ++++---- dlls/vulkan-1/vulkan.c | 50 --------------------------------------------- dlls/winevulkan/make_vulkan | 7 +------ 3 files changed, 5 insertions(+), 60 deletions(-) diff --git a/dlls/vulkan-1/vulkan-1.spec b/dlls/vulkan-1/vulkan-1.spec index c518343..2e05979 100644 --- a/dlls/vulkan-1/vulkan-1.spec +++ b/dlls/vulkan-1/vulkan-1.spec @@ -146,9 +146,9 @@ @ stdcall vkEndCommandBuffer(ptr) winevulkan.wine_vkEndCommandBuffer @ stdcall vkEnumerateDeviceExtensionProperties(ptr str ptr ptr) winevulkan.wine_vkEnumerateDeviceExtensionProperties @ stdcall vkEnumerateDeviceLayerProperties(ptr ptr ptr) winevulkan.wine_vkEnumerateDeviceLayerProperties -@ stdcall vkEnumerateInstanceExtensionProperties(str ptr ptr) -@ stdcall vkEnumerateInstanceLayerProperties(ptr ptr) -@ stdcall vkEnumerateInstanceVersion(ptr) +@ stdcall vkEnumerateInstanceExtensionProperties(str ptr ptr) winevulkan.wine_vkEnumerateInstanceExtensionProperties +@ stdcall vkEnumerateInstanceLayerProperties(ptr ptr) winevulkan.wine_vkEnumerateInstanceLayerProperties +@ stdcall vkEnumerateInstanceVersion(ptr) winevulkan.wine_vkEnumerateInstanceVersion @ stdcall vkEnumeratePhysicalDeviceGroups(ptr ptr ptr) winevulkan.wine_vkEnumeratePhysicalDeviceGroups @ stdcall vkEnumeratePhysicalDevices(ptr ptr ptr) winevulkan.wine_vkEnumeratePhysicalDevices @ stdcall vkFlushMappedMemoryRanges(ptr long ptr) winevulkan.wine_vkFlushMappedMemoryRanges @@ -175,7 +175,7 @@ @ stdcall vkGetImageSparseMemoryRequirements(ptr int64 ptr ptr) winevulkan.wine_vkGetImageSparseMemoryRequirements @ stdcall vkGetImageSparseMemoryRequirements2(ptr ptr ptr ptr) winevulkan.wine_vkGetImageSparseMemoryRequirements2 @ stdcall vkGetImageSubresourceLayout(ptr int64 ptr ptr) winevulkan.wine_vkGetImageSubresourceLayout -@ stdcall vkGetInstanceProcAddr(ptr str) +@ stdcall vkGetInstanceProcAddr(ptr str) winevulkan.wine_vkGetInstanceProcAddr @ stub vkGetPhysicalDeviceDisplayPlanePropertiesKHR @ stub vkGetPhysicalDeviceDisplayPropertiesKHR @ stub vkGetPhysicalDeviceExternalBufferProperties diff --git a/dlls/vulkan-1/vulkan.c b/dlls/vulkan-1/vulkan.c index abac9e1..d3b3560 100644 --- a/dlls/vulkan-1/vulkan.c +++ b/dlls/vulkan-1/vulkan.c @@ -23,59 +23,9 @@ #include "winbase.h" #include "wine/debug.h" -#define VK_NO_PROTOTYPES -#include "wine/vulkan.h" WINE_DEFAULT_DEBUG_CHANNEL(vulkan); -VkResult WINAPI wine_vkEnumerateInstanceExtensionProperties(const char *, uint32_t *, VkExtensionProperties *); -VkResult WINAPI wine_vkEnumerateInstanceVersion(uint32_t *); -PFN_vkVoidFunction WINAPI wine_vkGetInstanceProcAddr(VkInstance, const char *); - -VkResult WINAPI vkEnumerateInstanceExtensionProperties(const char *layer_name, - uint32_t *count, VkExtensionProperties *properties) -{ - TRACE("%p, %p, %p\n", layer_name, count, properties); - - if (layer_name) - return VK_ERROR_LAYER_NOT_PRESENT; - - return wine_vkEnumerateInstanceExtensionProperties(NULL, count, properties); -} - -VkResult WINAPI vkEnumerateInstanceVersion(uint32_t *version) -{ - TRACE("%p\n", version); - - return wine_vkEnumerateInstanceVersion(version); -} - -VkResult WINAPI vkEnumerateInstanceLayerProperties(uint32_t *count, - VkLayerProperties *properties) -{ - TRACE("%p, %p\n", count, properties); - - /* We don't support any layers. */ - *count = 0; - return VK_SUCCESS; -} - -PFN_vkVoidFunction WINAPI vkGetInstanceProcAddr(VkInstance instance, const char *name) -{ - TRACE("%p, %s\n", instance, debugstr_a(name)); - - if (!strcmp(name, "vkEnumerateInstanceExtensionProperties")) - return (PFN_vkVoidFunction)vkEnumerateInstanceExtensionProperties; - - if (!strcmp(name, "vkEnumerateInstanceLayerProperties")) - return (PFN_vkVoidFunction)vkEnumerateInstanceLayerProperties; - - if (!strcmp(name, "vkGetInstanceProcAddr")) - return (PFN_vkVoidFunction)vkGetInstanceProcAddr; - - return wine_vkGetInstanceProcAddr(instance, name); -} - BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, void *reserved) { TRACE("%p, %u, %p\n", hinst, reason, reserved); diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 83c9507..7773f34 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2276,12 +2276,7 @@ class VkGenerator(object): # We support all Core functions except for VK_KHR_display* APIs. # Create stubs for unsupported Core functions. if func.is_required(): - # Global functions need a custom implementation, except for - # vkCreateInstance, which we can just forward. - if func.is_global_func() and func.name != "vkCreateInstance": - f.write(func.spec()) - else: - f.write(func.spec(symbol="winevulkan.wine_" + func.name)) + f.write(func.spec(symbol="winevulkan.wine_" + func.name)) else: f.write("@ stub {0}\n".format(func.name))

1 0

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

July 13, 2018

Module: wine Branch: master Commit: 947600a33dd5cfb00c756b3fdcfb428da8c6befa URL: https://source.winehq.org/git/wine.git/?a=commit;h=947600a33dd5cfb00c756b3f… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Jul 11 22:06:09 2018 +0200 msadp32.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/msadp32.acm/msadp32.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/msadp32.acm/msadp32.c b/dlls/msadp32.acm/msadp32.c index 24e0c6a..50ade3d 100644 --- a/dlls/msadp32.acm/msadp32.c +++ b/dlls/msadp32.acm/msadp32.c @@ -83,9 +83,6 @@ static const Format ADPCM_Formats[] = {1, 4, 22050}, {2, 4, 22050}, {1, 4, 44100}, {2, 4, 44100}, }; -#define NUM_PCM_FORMATS (sizeof(PCM_Formats) / sizeof(PCM_Formats[0])) -#define NUM_ADPCM_FORMATS (sizeof(ADPCM_Formats) / sizeof(ADPCM_Formats[0])) - static int MS_Delta[] = { 230, 230, 230, 230, 307, 409, 512, 614, @@ -109,11 +106,11 @@ static DWORD ADPCM_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_ADPCM: - hi = NUM_ADPCM_FORMATS; + hi = ARRAY_SIZE(ADPCM_Formats); fmts = ADPCM_Formats; break; default: @@ -441,13 +438,13 @@ static LRESULT ADPCM_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_ADPCM; aftd->cbFormatSize = sizeof(ADPCMWAVEFORMAT) + (7 - 1) * sizeof(ADPCMCOEFSET); - aftd->cStandardFormats = NUM_ADPCM_FORMATS; + aftd->cStandardFormats = ARRAY_SIZE(ADPCM_Formats); lstrcpyW(aftd->szFormatTag, szMsAdPcm); break; } @@ -470,7 +467,7 @@ static LRESULT ADPCM_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; @@ -483,7 +480,7 @@ static LRESULT ADPCM_FormatDetails(PACMFORMATDETAILSW afd, DWORD dwQuery) afd->pwfx->nSamplesPerSec * afd->pwfx->nBlockAlign; break; case WAVE_FORMAT_ADPCM: - if (afd->dwFormatIndex >= NUM_ADPCM_FORMATS) return ACMERR_NOTPOSSIBLE; + if (afd->dwFormatIndex >= ARRAY_SIZE(ADPCM_Formats)) return ACMERR_NOTPOSSIBLE; if (afd->cbwfx < sizeof(ADPCMWAVEFORMAT) + (7 - 1) * sizeof(ADPCMCOEFSET)) return ACMERR_NOTPOSSIBLE; afd->pwfx->nChannels = ADPCM_Formats[afd->dwFormatIndex].nChannels;

1 0

Józef Kucia : winevulkan: Implement VK_KHR_device_group.
by Alexandre Julliard July 13, 2018

July 13, 2018

Module: wine Branch: master Commit: fae218310cab0b1191153084375867d5d2e7d4a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fae218310cab0b1191153084… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jul 13 10:55:36 2018 +0200 winevulkan: Implement VK_KHR_device_group. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vulkan-1/vulkan-1.spec | 10 ++--- dlls/winevulkan/make_vulkan | 1 - dlls/winevulkan/vulkan_thunks.c | 81 +++++++++++++++++++++++++++++++++++++++++ dlls/winevulkan/vulkan_thunks.h | 31 ++++++++++++++++ dlls/winevulkan/winevulkan.spec | 10 ++--- include/wine/vulkan.h | 18 +++++++++ 6 files changed, 140 insertions(+), 11 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fae218310cab0b119115…

1 0

Józef Kucia : winevulkan: Downgrade ERR() to WARN() in wine_vkEnumerateInstanceExtensionProperties().
by Alexandre Julliard July 13, 2018

July 13, 2018

Module: wine Branch: master Commit: 036376e6a5593f77f96b19ad713cbde70f458b18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=036376e6a5593f77f96b19ad… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jul 13 10:55:39 2018 +0200 winevulkan: Downgrade ERR() to WARN() in wine_vkEnumerateInstanceExtensionProperties(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index f2ec38a..4e11c72 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -766,17 +766,16 @@ VkResult WINAPI wine_vkEnumerateDeviceExtensionProperties(VkPhysicalDevice phys_ VkResult WINAPI wine_vkEnumerateInstanceExtensionProperties(const char *layer_name, uint32_t *count, VkExtensionProperties *properties) { - VkResult res; - uint32_t num_properties = 0, num_host_properties = 0; - VkExtensionProperties *host_properties = NULL; + uint32_t num_properties = 0, num_host_properties; + VkExtensionProperties *host_properties; unsigned int i, j; + VkResult res; - TRACE("%p %p %p\n", layer_name, count, properties); + TRACE("%p, %p, %p\n", layer_name, count, properties); - /* This shouldn't get called with layer_name set, the ICD loader prevents it. */ if (layer_name) { - ERR("Layer enumeration not supported from ICD.\n"); + WARN("Layer enumeration not supported from ICD.\n"); return VK_ERROR_LAYER_NOT_PRESENT; } @@ -784,14 +783,13 @@ VkResult WINAPI wine_vkEnumerateInstanceExtensionProperties(const char *layer_na if (res != VK_SUCCESS) return res; - host_properties = heap_calloc(num_host_properties, sizeof(*host_properties)); - if (!host_properties) + if (!(host_properties = heap_calloc(num_host_properties, sizeof(*host_properties)))) return VK_ERROR_OUT_OF_HOST_MEMORY; res = vk_funcs->p_vkEnumerateInstanceExtensionProperties(NULL, &num_host_properties, host_properties); if (res != VK_SUCCESS) { - ERR("Failed to retrieve host properties, res=%d\n", res); + ERR("Failed to retrieve host properties, res=%d.\n", res); heap_free(host_properties); return res; } @@ -810,7 +808,7 @@ VkResult WINAPI wine_vkEnumerateInstanceExtensionProperties(const char *layer_na if (!properties) { - TRACE("Returning %u extensions\n", num_properties); + TRACE("Returning %u extensions.\n", num_properties); *count = num_properties; heap_free(host_properties); return VK_SUCCESS; @@ -820,9 +818,8 @@ VkResult WINAPI wine_vkEnumerateInstanceExtensionProperties(const char *layer_na { if (wine_vk_instance_extension_supported(host_properties[i].extensionName)) { - TRACE("Enabling extension '%s'\n", host_properties[i].extensionName); - properties[j] = host_properties[i]; - j++; + TRACE("Enabling extension '%s'.\n", host_properties[i].extensionName); + properties[j++] = host_properties[i]; } } *count = min(*count, num_properties);

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard July 12, 2018

July 12, 2018

Module: wine Branch: master Commit: 7022afb3a8011c2562d154d6a4fa44ac3efa250b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7022afb3a8011c2562d154d6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 12 20:56:54 2018 +0300 po: Update Russian translation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ru.po | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/po/ru.po b/po/ru.po index 156642b..1947549 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2018-07-06 09:17+0300\n" +"PO-Revision-Date: 2018-07-12 16:25+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" @@ -3442,18 +3442,16 @@ msgid "Connections" msgstr "Подключения" #: inetcpl.rc:125 -#, fuzzy -#| msgid "Wine configuration" msgid "Automatic configuration" -msgstr "Настройка Wine" +msgstr "Автонастройка" #: inetcpl.rc:126 msgid "Use Web Proxy Auto-Discovery (WPAD)" -msgstr "" +msgstr "Использовать WPAD" #: inetcpl.rc:127 msgid "Use Proxy Auto-Config (PAC) script" -msgstr "" +msgstr "Использовать PAC-скрипт" #: inetcpl.rc:128 inetcpl.rc:132 msgid "Address:"

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard July 12, 2018

July 12, 2018

Module: wine Branch: master Commit: 4c39728c5042ae88f18941e6f709c5ac8021d98f URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c39728c5042ae88f18941e6… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Thu Jul 12 20:54:20 2018 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/po/lt.po b/po/lt.po index 34974c2..0da1c2f 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2018-07-06 09:07+0300\n" +"PO-Revision-Date: 2018-07-12 20:53+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -3437,18 +3437,16 @@ msgid "Connections" msgstr "Ryšiai" #: inetcpl.rc:125 -#, fuzzy -#| msgid "Wine configuration" msgid "Automatic configuration" -msgstr "„Wine“ konfigūravimas" +msgstr "Automatinis konfigūravimas" #: inetcpl.rc:126 msgid "Use Web Proxy Auto-Discovery (WPAD)" -msgstr "" +msgstr "Naudoti įgaliotojo serverio automatinį radimą (WPAD)" #: inetcpl.rc:127 msgid "Use Proxy Auto-Config (PAC) script" -msgstr "" +msgstr "Naudoti įgaliotojo serverio automatinio konfigūravimo (PAC) skriptą" #: inetcpl.rc:128 inetcpl.rc:132 msgid "Address:"

1 0

Akihiro Sagawa : kernel32: Fix LCMapString(LCMAP_HALFWIDTH) in some cases.
by Alexandre Julliard July 12, 2018

July 12, 2018

Module: wine Branch: master Commit: a5da5252291c8df05d2f144cb3f6b9d008b4be1e URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5da5252291c8df05d2f144c… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Jul 12 23:30:29 2018 +0900 kernel32: Fix LCMapString(LCMAP_HALFWIDTH) in some cases. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45439 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 12 ++++-------- dlls/kernel32/tests/locale.c | 4 ++-- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index d21a763..2e0cf83 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -3626,21 +3626,17 @@ INT WINAPI LCMapStringEx(LPCWSTR name, DWORD flags, LPCWSTR src, INT srclen, LPW { /* map full-width character to half-width one, e.g. U+30A2 -> U+FF71, U+30D7 -> U+FF8C U+FF9F. */ - if (map_to_halfwidth(wch, dst_ptr, dstlen) == 2) + if (map_to_halfwidth(wch, dst_ptr, len) == 2) { - dstlen--; + len--; dst_ptr++; - if (!dstlen) - { - SetLastError(ERROR_INSUFFICIENT_BUFFER); - return 0; - } + if (!len) break; } } else *dst_ptr = wch; } - if (!(flags & (LCMAP_UPPERCASE | LCMAP_LOWERCASE))) + if (!(flags & (LCMAP_UPPERCASE | LCMAP_LOWERCASE)) || srclen) goto done; srclen = dst_ptr - dst; diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index e48bc7a..39d359f 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2516,7 +2516,7 @@ static void test_lcmapstring_unicode(lcmapstring_wrapper func_ptr, const char *f SetLastError(0xdeadbeef); ret = func_ptr(LCMAP_HALFWIDTH | LCMAP_UPPERCASE, buf, 2, buf2, 1); - todo_wine ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "%s should return 0 and ERROR_INSUFFICIENT_BUFFER, got %d\n", func_name, ret); SetLastError(0xdeadbeef); @@ -2525,7 +2525,7 @@ static void test_lcmapstring_unicode(lcmapstring_wrapper func_ptr, const char *f "%s should return 0 and ERROR_INSUFFICIENT_BUFFER, got %d\n", func_name, ret); ret = func_ptr(LCMAP_HALFWIDTH | LCMAP_UPPERCASE, buf, 2, buf2, 3); - todo_wine ok(ret == 3, "%s ret %d, expected value 3\n", func_name, ret); + ok(ret == 3, "%s ret %d, expected value 3\n", func_name, ret); ret = func_ptr(LCMAP_HALFWIDTH | LCMAP_UPPERCASE, buf, 2, buf2, 4); ok(ret == 3, "%s ret %d, expected value 3\n", func_name, ret);

1 0

Michael Stefaniuc : msacm32: Avoid an ARRAY_SIZE-like macro.
by Alexandre Julliard July 12, 2018

July 12, 2018

Module: wine Branch: master Commit: 756958f6113159ccba0ffe58c4c6d8b693cf2aa3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=756958f6113159ccba0ffe58… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Jul 11 22:06:17 2018 +0200 msacm32: 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/msacm32/pcmconverter.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/msacm32/pcmconverter.c b/dlls/msacm32/pcmconverter.c index d52662a..f26f125 100644 --- a/dlls/msacm32/pcmconverter.c +++ b/dlls/msacm32/pcmconverter.c @@ -71,7 +71,6 @@ static DWORD PCM_drvClose(DWORD dwDevID) return 1; } -#define NUM_PCM_FORMATS (sizeof(PCM_Formats) / sizeof(PCM_Formats[0])) #define NUM_OF(a,b) ((a)/(b)) /* flags for fdwDriver */ @@ -114,7 +113,7 @@ static DWORD PCM_GetFormatIndex(LPWAVEFORMATEX wfx) unsigned int i; TRACE("(%p)\n", wfx); - for (i = 0; i < NUM_PCM_FORMATS; i++) { + for (i = 0; i < ARRAY_SIZE(PCM_Formats); i++) { if (wfx->nChannels == PCM_Formats[i].nChannels && wfx->nSamplesPerSec == PCM_Formats[i].rate && wfx->wBitsPerSample == PCM_Formats[i].nBits) @@ -1035,7 +1034,7 @@ static LRESULT PCM_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery) aftd->dwFormatTag = WAVE_FORMAT_PCM; aftd->cbFormatSize = sizeof(PCMWAVEFORMAT); aftd->fdwSupport = ACMDRIVERDETAILS_SUPPORTF_CONVERTER; - aftd->cStandardFormats = NUM_PCM_FORMATS; + aftd->cStandardFormats = ARRAY_SIZE(PCM_Formats); aftd->szFormatTag[0] = 0; return MMSYSERR_NOERROR; @@ -1057,7 +1056,7 @@ static LRESULT PCM_FormatDetails(PACMFORMATDETAILSW afd, DWORD dwQuery) } break; case ACM_FORMATDETAILSF_INDEX: - assert(afd->dwFormatIndex < NUM_PCM_FORMATS); + assert(afd->dwFormatIndex < ARRAY_SIZE(PCM_Formats)); afd->pwfx->wFormatTag = WAVE_FORMAT_PCM; afd->pwfx->nChannels = PCM_Formats[afd->dwFormatIndex].nChannels; afd->pwfx->nSamplesPerSec = PCM_Formats[afd->dwFormatIndex].rate;

1 0

Akihiro Sagawa : kernel32/tests: Add more LCMapString tests.
by Alexandre Julliard July 12, 2018

July 12, 2018

Module: wine Branch: master Commit: ef2df8ed3681a55a66382164227f8a5a1ae4bf51 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef2df8ed3681a55a66382164… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Jul 12 23:30:28 2018 +0900 kernel32/tests: Add more LCMapString tests. Especially combined with LCMAP_HALFWIDTH and LCMAP_UPPERCASE. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 06a7aa7..e48bc7a 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2509,6 +2509,27 @@ static void test_lcmapstring_unicode(lcmapstring_wrapper func_ptr, const char *f ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "%s should return 0 and ERROR_INSUFFICIENT_BUFFER, got %d\n", func_name, ret); + buf[0] = 'a'; + buf[1] = 0x30ac; + ret = func_ptr(LCMAP_HALFWIDTH | LCMAP_UPPERCASE, buf, 2, buf2, 0); + ok(ret == 3, "%s ret %d, expected value 3\n", func_name, ret); + + SetLastError(0xdeadbeef); + ret = func_ptr(LCMAP_HALFWIDTH | LCMAP_UPPERCASE, buf, 2, buf2, 1); + todo_wine ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "%s should return 0 and ERROR_INSUFFICIENT_BUFFER, got %d\n", func_name, ret); + + SetLastError(0xdeadbeef); + ret = func_ptr(LCMAP_HALFWIDTH | LCMAP_UPPERCASE, buf, 2, buf2, 2); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "%s should return 0 and ERROR_INSUFFICIENT_BUFFER, got %d\n", func_name, ret); + + ret = func_ptr(LCMAP_HALFWIDTH | LCMAP_UPPERCASE, buf, 2, buf2, 3); + todo_wine ok(ret == 3, "%s ret %d, expected value 3\n", func_name, ret); + + ret = func_ptr(LCMAP_HALFWIDTH | LCMAP_UPPERCASE, buf, 2, buf2, 4); + ok(ret == 3, "%s ret %d, expected value 3\n", func_name, ret); + /* LCMAP_UPPERCASE or LCMAP_LOWERCASE should accept src == dst */ lstrcpyW(buf, lower_case); ret = func_ptr(LCMAP_UPPERCASE, buf, -1, buf, ARRAY_SIZE(buf));

1 0

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

July 12, 2018

Module: wine Branch: master Commit: c2272212186865e0fff2bb46df9ffb71a28cd453 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2272212186865e0fff2bb46… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Jul 11 22:06:16 2018 +0200 l3codeca.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/l3codeca.acm/mpegl3.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/l3codeca.acm/mpegl3.c b/dlls/l3codeca.acm/mpegl3.c index 0e419bd..f71aac3 100644 --- a/dlls/l3codeca.acm/mpegl3.c +++ b/dlls/l3codeca.acm/mpegl3.c @@ -89,9 +89,6 @@ static const Format MPEG3_Formats[] = {1, 0, 48000}, {2, 0, 48000} }; -#define NUM_PCM_FORMATS (sizeof(PCM_Formats) / sizeof(PCM_Formats[0])) -#define NUM_MPEG3_FORMATS (sizeof(MPEG3_Formats) / sizeof(MPEG3_Formats[0])) - /*********************************************************************** * MPEG3_GetFormatIndex */ @@ -103,12 +100,12 @@ static DWORD MPEG3_GetFormatIndex(LPWAVEFORMATEX wfx) switch (wfx->wFormatTag) { case WAVE_FORMAT_PCM: - hi = NUM_PCM_FORMATS; + hi = ARRAY_SIZE(PCM_Formats); fmts = PCM_Formats; break; case WAVE_FORMAT_MPEG: case WAVE_FORMAT_MPEGLAYER3: - hi = NUM_MPEG3_FORMATS; + hi = ARRAY_SIZE(MPEG3_Formats); fmts = MPEG3_Formats; break; default: @@ -733,7 +730,7 @@ static LRESULT MPEG3_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: @@ -768,7 +765,7 @@ static LRESULT MPEG3_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;

1 0

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

July 12, 2018

Module: wine Branch: master Commit: 053a7e225c8190fd7416b3f3c3186f1ac230eeb3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=053a7e225c8190fd7416b3f3… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Jul 12 23:49:34 2018 +0200 dbghelp: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/cpu_i386.c | 4 ++-- dlls/dbghelp/dbghelp.c | 5 ++--- dlls/dbghelp/elf_module.c | 14 ++++++-------- dlls/dbghelp/macho_module.c | 2 +- dlls/dbghelp/minidump.c | 4 ++-- dlls/dbghelp/module.c | 16 +++++++--------- dlls/dbghelp/msc.c | 2 +- dlls/dbghelp/stabs.c | 6 +++--- dlls/dbghelp/symbol.c | 2 +- 9 files changed, 25 insertions(+), 30 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=053a7e225c8190fd7416…

1 0

Johannes Brandstätter : ntdll: Check for NULL context in NtGetContextThread.
by Alexandre Julliard July 12, 2018

July 12, 2018

Module: wine Branch: master Commit: ec418e7f55f5e38f8825187ae5dfe33fec31689b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec418e7f55f5e38f8825187a… Author: Johannes Brandstätter <jbrandst(a)2ds.eu> Date: Wed Jul 11 17:45:32 2018 +0200 ntdll: Check for NULL context in NtGetContextThread. Crash Bandicoot N. Sane Trilogy calls NtGetContextThread with the context being set to NULL which leads to a crash. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45428 Signed-off-by: Johannes Brandstätter <jbrandst(a)2ds.eu> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 0d25360..e751082 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2160,9 +2160,13 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) { NTSTATUS ret; - DWORD needed_flags = context->ContextFlags; + DWORD needed_flags; BOOL self = (handle == GetCurrentThread()); + if (!context) return STATUS_INVALID_PARAMETER; + + needed_flags = context->ContextFlags; + /* debug registers require a server call */ if (context->ContextFlags & (CONTEXT_DEBUG_REGISTERS & ~CONTEXT_AMD64)) self = FALSE;

1 0

Dmitry Timoshkov : advapi32: Read the configured object list for the performance provider.
by Alexandre Julliard July 12, 2018

July 12, 2018

Module: wine Branch: master Commit: 6500f882dad29eb417107d2f73589b31b53b6f3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6500f882dad29eb417107d2f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jul 11 12:16:22 2018 +0800 advapi32: Read the configured object list for the performance provider. FIXME: it's not currently used, but the queries should be matched against the configured object lists, and the providers should be loaded and called only in case of a match. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/registry.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 3daf53d..a83341f 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -1486,6 +1486,7 @@ struct perf_provider { HMODULE perflib; WCHAR linkage[MAX_PATH]; + WCHAR objects[MAX_PATH]; PM_OPEN_PROC *pOpen; PM_CLOSE_PROC *pClose; PM_COLLECT_PROC *pCollect; @@ -1509,6 +1510,7 @@ static void *get_provider_entry(HKEY perf, HMODULE perflib, const char *name) static BOOL load_provider(HKEY root, const WCHAR *name, struct perf_provider *provider) { + static const WCHAR object_listW[] = { 'O','b','j','e','c','t',' ','L','i','s','t',0 }; static const WCHAR performanceW[] = { 'P','e','r','f','o','r','m','a','n','c','e',0 }; static const WCHAR libraryW[] = { 'L','i','b','r','a','r','y',0 }; static const WCHAR linkageW[] = { 'L','i','n','k','a','g','e',0 }; @@ -1541,6 +1543,16 @@ static BOOL load_provider(HKEY root, const WCHAR *name, struct perf_provider *pr if (err != ERROR_SUCCESS) return FALSE; + provider->objects[0] = 0; + len = sizeof(buf) - sizeof(WCHAR); + err = RegQueryValueExW(perf, object_listW, NULL, &type, (BYTE *)buf, &len); + if (err == ERROR_SUCCESS && (type == REG_SZ || type == REG_MULTI_SZ)) + { + memcpy(provider->objects, buf, len); + provider->objects[len / sizeof(WCHAR)] = 0; + TRACE("Object List: %s\n", debugstr_w(provider->objects)); + } + len = sizeof(buf) - sizeof(WCHAR); err = RegQueryValueExW(perf, libraryW, NULL, &type, (BYTE *)buf, &len); if (err != ERROR_SUCCESS || !(type == REG_SZ || type == REG_EXPAND_SZ))

1 0

Dmitry Timoshkov : advapi32: If the query is not specified the default query is "Global".
by Alexandre Julliard July 12, 2018

July 12, 2018

Module: wine Branch: master Commit: 8be6b299bc36eafdc01b64b0c4c414bb7e28776f URL: https://source.winehq.org/git/wine.git/?a=commit;h=8be6b299bc36eafdc01b64b0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jul 11 12:16:19 2018 +0800 advapi32: If the query is not specified the default query is "Global". Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/registry.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index ce56b5a..3daf53d 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -1582,9 +1582,13 @@ error: static DWORD collect_data(struct perf_provider *provider, const WCHAR *query, void **data, DWORD *size, DWORD *obj_count) { + static const WCHAR globalW[] = { 'G','l','o','b','a','l',0 }; WCHAR *linkage = provider->linkage[0] ? provider->linkage : NULL; DWORD err; + if (!query || !query[0]) + query = globalW; + err = provider->pOpen(linkage); if (err != ERROR_SUCCESS) {

1 0

Huw Davies : winspool: Remove ordinals from the performance functions.
by Alexandre Julliard July 12, 2018

July 12, 2018

Module: wine Branch: master Commit: e7059c6f126e797c570e6510c8a4b1596121c4a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7059c6f126e797c570e6510… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jul 12 10:52:39 2018 +0100 winspool: Remove ordinals from the performance functions. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/winspool.drv.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winspool.drv/winspool.drv.spec b/dlls/winspool.drv/winspool.drv.spec index 58dc60b..f7319cb 100644 --- a/dlls/winspool.drv/winspool.drv.spec +++ b/dlls/winspool.drv/winspool.drv.spec @@ -2,9 +2,6 @@ 101 stub -noname ClusterSplOpen 102 stub -noname ClusterSplClose 103 stub -noname ClusterSplIsAlive -104 stub PerfClose -105 stub PerfCollect -106 stub PerfOpen 201 stdcall GetDefaultPrinterA(ptr ptr) 202 stdcall SetDefaultPrinterA(str) 203 stdcall GetDefaultPrinterW(ptr ptr) @@ -151,6 +148,9 @@ @ stdcall IsValidDevmodeW(ptr long) @ stdcall OpenPrinterA(str ptr ptr) @ stdcall OpenPrinterW(wstr ptr ptr) +@ stub PerfClose +@ stub PerfCollect +@ stub PerfOpen @ stub PlayGdiScriptOnPrinterIC @ stub PrinterMessageBoxA @ stub PrinterMessageBoxW

1 0

Józef Kucia : winevulkan: Add TRACE() for created devices.
by Alexandre Julliard July 12, 2018

July 12, 2018

Module: wine Branch: master Commit: 29467f9da560210197144c022c3bebe074ec2a90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=29467f9da560210197144c02… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 12 11:39:46 2018 +0200 winevulkan: Add TRACE() for created devices. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 987332e..cb84c4d 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -650,6 +650,7 @@ VkResult WINAPI wine_vkCreateDevice(VkPhysicalDevice phys_dev, object->quirks = phys_dev->instance->quirks; *device = object; + TRACE("Created device %p (native device %p).\n", object, object->device); return VK_SUCCESS; } @@ -713,7 +714,7 @@ VkResult WINAPI wine_vkCreateInstance(const VkInstanceCreateInfo *create_info, } *instance = object; - TRACE("Done, instance=%p native_instance=%p\n", object, object->instance); + TRACE("Created instance %p (native instance %p).\n", object, object->instance); return VK_SUCCESS; }

1 0

Józef Kucia : vulkan-1/tests: Introduce for_each_device() helper.
by Alexandre Julliard July 12, 2018

July 12, 2018

Module: wine Branch: master Commit: d36ecbe8dfb7a7b3f1b9a3e3ccc29b36d2b73f0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=d36ecbe8dfb7a7b3f1b9a3e3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 12 11:39:44 2018 +0200 vulkan-1/tests: Introduce for_each_device() helper. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vulkan-1/tests/vulkan.c | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/dlls/vulkan-1/tests/vulkan.c b/dlls/vulkan-1/tests/vulkan.c index 67da880..25e5c01 100644 --- a/dlls/vulkan-1/tests/vulkan.c +++ b/dlls/vulkan-1/tests/vulkan.c @@ -38,10 +38,23 @@ static VkResult create_instance(uint32_t extension_count, return vkCreateInstance(&create_info, NULL, vk_instance); } -static void test_enumerate_physical_devices(void) +static void enumerate_physical_device(VkPhysicalDevice vk_physical_device) { - VkPhysicalDevice *vk_physical_devices; VkPhysicalDeviceProperties properties; + + vkGetPhysicalDeviceProperties(vk_physical_device, &properties); + + trace("Device '%s', %#x:%#x, driver version %u.%u.%u (%#x), api version %u.%u.%u.\n", + properties.deviceName, properties.vendorID, properties.deviceID, + VK_VERSION_MAJOR(properties.driverVersion), VK_VERSION_MINOR(properties.driverVersion), + VK_VERSION_PATCH(properties.driverVersion), properties.driverVersion, + VK_VERSION_MAJOR(properties.apiVersion), VK_VERSION_MINOR(properties.apiVersion), + VK_VERSION_PATCH(properties.apiVersion)); +} + +static void for_each_device(void (*test_func)(VkPhysicalDevice)) +{ + VkPhysicalDevice *vk_physical_devices; VkInstance vk_instance; unsigned int i; uint32_t count; @@ -63,23 +76,13 @@ static void test_enumerate_physical_devices(void) return; } - trace("Got %u physical device(s).\n", count); vk_physical_devices = heap_calloc(count, sizeof(*vk_physical_devices)); ok(!!vk_physical_devices, "Failed to allocate memory.\n"); vr = vkEnumeratePhysicalDevices(vk_instance, &count, vk_physical_devices); ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); for (i = 0; i < count; ++i) - { - vkGetPhysicalDeviceProperties(vk_physical_devices[i], &properties); - - trace("Device '%s', %#x:%#x, driver version %u.%u.%u (%#x), api version %u.%u.%u.\n", - properties.deviceName, properties.vendorID, properties.deviceID, - VK_VERSION_MAJOR(properties.driverVersion), VK_VERSION_MINOR(properties.driverVersion), - VK_VERSION_PATCH(properties.driverVersion), properties.driverVersion, - VK_VERSION_MAJOR(properties.apiVersion), VK_VERSION_MINOR(properties.apiVersion), - VK_VERSION_PATCH(properties.apiVersion)); - } + test_func(vk_physical_devices[i]); heap_free(vk_physical_devices); @@ -88,5 +91,5 @@ static void test_enumerate_physical_devices(void) START_TEST(vulkan) { - test_enumerate_physical_devices(); + for_each_device(enumerate_physical_device); }

1 0

Alex Henrie : ntdll: Return chassis info from NtQuerySystemInformation on Linux.
by Alexandre Julliard July 12, 2018

July 12, 2018

Module: wine Branch: master Commit: 2c9308e7d5c5277074f398f76b40c689f19774c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c9308e7d5c5277074f398f7… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Jul 12 00:57:55 2018 +0200 ntdll: Return chassis info from NtQuerySystemInformation on Linux. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 3973c4b..af22e58 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -108,6 +108,17 @@ struct smbios_board { BYTE serial; }; +struct smbios_chassis { + BYTE type; + BYTE length; + WORD handle; + BYTE vendor; + BYTE shape; + BYTE version; + BYTE serial; + BYTE asset_tag; +}; + #include "poppack.h" /* Firmware table providers */ @@ -1987,12 +1998,15 @@ static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG size_t system_vendor_len, system_product_len, system_version_len, system_serial_len; char board_vendor[128], board_product[128], board_version[128], board_serial[128]; size_t board_vendor_len, board_product_len, board_version_len, board_serial_len; + char chassis_vendor[128], chassis_version[128], chassis_serial[128], chassis_asset_tag[128]; + size_t chassis_vendor_len, chassis_version_len, chassis_serial_len, chassis_asset_tag_len; char *buffer = (char*)sfti->TableBuffer; BYTE string_count; struct smbios_prologue *prologue; struct smbios_bios *bios; struct smbios_system *system; struct smbios_board *board; + struct smbios_chassis *chassis; #define S(s) s, sizeof(s) bios_vendor_len = get_smbios_string("/sys/class/dmi/id/bios_vendor", S(bios_vendor)); @@ -2006,6 +2020,10 @@ static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG board_product_len = get_smbios_string("/sys/class/dmi/id/board_name", S(board_product)); board_version_len = get_smbios_string("/sys/class/dmi/id/board_version", S(board_version)); board_serial_len = get_smbios_string("/sys/class/dmi/id/board_serial", S(board_serial)); + chassis_vendor_len = get_smbios_string("/sys/class/dmi/id/chassis_vendor", S(chassis_vendor)); + chassis_version_len = get_smbios_string("/sys/class/dmi/id/chassis_version", S(chassis_version)); + chassis_serial_len = get_smbios_string("/sys/class/dmi/id/chassis_serial", S(chassis_serial)); + chassis_asset_tag_len = get_smbios_string("/sys/class/dmi/id/chassis_tag", S(chassis_asset_tag)); #undef S *required_len = sizeof(struct smbios_prologue); @@ -2020,6 +2038,10 @@ static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG *required_len += sizeof(struct smbios_board); *required_len += max(board_vendor_len + board_product_len + board_version_len + board_serial_len + 5, 2); + *required_len += sizeof(struct smbios_chassis); + *required_len += max(chassis_vendor_len + chassis_version_len + chassis_serial_len + + chassis_asset_tag_len + 5, 2); + sfti->TableBufferLength = *required_len; *required_len += FIELD_OFFSET(SYSTEM_FIRMWARE_TABLE_INFORMATION, TableBuffer); @@ -2090,6 +2112,25 @@ static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG if (!string_count) *buffer++ = 0; *buffer++ = 0; + string_count = 0; + chassis = (struct smbios_chassis*)buffer; + chassis->type = 3; + chassis->length = sizeof(struct smbios_chassis); + chassis->handle = 0; + chassis->vendor = chassis_vendor_len ? ++string_count : 0; + chassis->shape = 0x2; /* unknown */ + chassis->version = chassis_version_len ? ++string_count : 0; + chassis->serial = chassis_serial_len ? ++string_count : 0; + chassis->asset_tag = chassis_asset_tag_len ? ++string_count : 0; + buffer += sizeof(struct smbios_chassis); + + copy_smbios_string(&buffer, chassis_vendor, chassis_vendor_len); + copy_smbios_string(&buffer, chassis_version, chassis_version_len); + copy_smbios_string(&buffer, chassis_serial, chassis_serial_len); + copy_smbios_string(&buffer, chassis_asset_tag, chassis_asset_tag_len); + if (!string_count) *buffer++ = 0; + *buffer++ = 0; + return STATUS_SUCCESS; } default:

1 0

Alex Henrie : ntdll: Return system info from NtQuerySystemInformation on Linux.
by Alexandre Julliard July 12, 2018

July 12, 2018

Module: wine Branch: master Commit: a52c7c962a8e4e15d26a017bbb1e262f3acb84dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=a52c7c962a8e4e15d26a017b… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Jul 12 00:57:53 2018 +0200 ntdll: Return system info from NtQuerySystemInformation on Linux. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 3c324a4..06c6a92 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -88,6 +88,16 @@ struct smbios_bios { UINT64 characteristics; }; +struct smbios_system { + BYTE type; + BYTE length; + WORD handle; + BYTE vendor; + BYTE product; + BYTE version; + BYTE serial; +}; + #include "poppack.h" /* Firmware table providers */ @@ -1963,15 +1973,22 @@ static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG { char bios_vendor[128], bios_version[128], bios_date[128]; size_t bios_vendor_len, bios_version_len, bios_date_len; + char system_vendor[128], system_product[128], system_version[128], system_serial[128]; + size_t system_vendor_len, system_product_len, system_version_len, system_serial_len; char *buffer = (char*)sfti->TableBuffer; BYTE string_count; struct smbios_prologue *prologue; struct smbios_bios *bios; + struct smbios_system *system; #define S(s) s, sizeof(s) bios_vendor_len = get_smbios_string("/sys/class/dmi/id/bios_vendor", S(bios_vendor)); bios_version_len = get_smbios_string("/sys/class/dmi/id/bios_version", S(bios_version)); bios_date_len = get_smbios_string("/sys/class/dmi/id/bios_date", S(bios_date)); + system_vendor_len = get_smbios_string("/sys/class/dmi/id/sys_vendor", S(system_vendor)); + system_product_len = get_smbios_string("/sys/class/dmi/id/product", S(system_product)); + system_version_len = get_smbios_string("/sys/class/dmi/id/product_version", S(system_version)); + system_serial_len = get_smbios_string("/sys/class/dmi/id/product_serial", S(system_serial)); #undef S *required_len = sizeof(struct smbios_prologue); @@ -1979,6 +1996,10 @@ static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG *required_len += sizeof(struct smbios_bios); *required_len += max(bios_vendor_len + bios_version_len + bios_date_len + 4, 2); + *required_len += sizeof(struct smbios_system); + *required_len += max(system_vendor_len + system_product_len + system_version_len + + system_serial_len + 5, 2); + sfti->TableBufferLength = *required_len; *required_len += FIELD_OFFSET(SYSTEM_FIRMWARE_TABLE_INFORMATION, TableBuffer); @@ -2013,6 +2034,24 @@ static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG if (!string_count) *buffer++ = 0; *buffer++ = 0; + string_count = 0; + system = (struct smbios_system*)buffer; + system->type = 1; + system->length = sizeof(struct smbios_system); + system->handle = 0; + system->vendor = system_vendor_len ? ++string_count : 0; + system->product = system_product_len ? ++string_count : 0; + system->version = system_version_len ? ++string_count : 0; + system->serial = system_serial_len ? ++string_count : 0; + buffer += sizeof(struct smbios_system); + + copy_smbios_string(&buffer, system_vendor, system_vendor_len); + copy_smbios_string(&buffer, system_product, system_product_len); + copy_smbios_string(&buffer, system_version, system_version_len); + copy_smbios_string(&buffer, system_serial, system_serial_len); + if (!string_count) *buffer++ = 0; + *buffer++ = 0; + return STATUS_SUCCESS; } default:

1 0

Alex Henrie : ntdll: Return board info from NtQuerySystemInformation on Linux.
by Alexandre Julliard July 12, 2018

July 12, 2018

Module: wine Branch: master Commit: 5008779665c5314f19454b3ee4f65287e6864e4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=5008779665c5314f19454b3e… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Jul 12 00:57:54 2018 +0200 ntdll: Return board info from NtQuerySystemInformation on Linux. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 06c6a92..3973c4b 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -98,6 +98,16 @@ struct smbios_system { BYTE serial; }; +struct smbios_board { + BYTE type; + BYTE length; + WORD handle; + BYTE vendor; + BYTE product; + BYTE version; + BYTE serial; +}; + #include "poppack.h" /* Firmware table providers */ @@ -1975,11 +1985,14 @@ static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG size_t bios_vendor_len, bios_version_len, bios_date_len; char system_vendor[128], system_product[128], system_version[128], system_serial[128]; size_t system_vendor_len, system_product_len, system_version_len, system_serial_len; + char board_vendor[128], board_product[128], board_version[128], board_serial[128]; + size_t board_vendor_len, board_product_len, board_version_len, board_serial_len; char *buffer = (char*)sfti->TableBuffer; BYTE string_count; struct smbios_prologue *prologue; struct smbios_bios *bios; struct smbios_system *system; + struct smbios_board *board; #define S(s) s, sizeof(s) bios_vendor_len = get_smbios_string("/sys/class/dmi/id/bios_vendor", S(bios_vendor)); @@ -1989,6 +2002,10 @@ static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG system_product_len = get_smbios_string("/sys/class/dmi/id/product", S(system_product)); system_version_len = get_smbios_string("/sys/class/dmi/id/product_version", S(system_version)); system_serial_len = get_smbios_string("/sys/class/dmi/id/product_serial", S(system_serial)); + board_vendor_len = get_smbios_string("/sys/class/dmi/id/board_vendor", S(board_vendor)); + board_product_len = get_smbios_string("/sys/class/dmi/id/board_name", S(board_product)); + board_version_len = get_smbios_string("/sys/class/dmi/id/board_version", S(board_version)); + board_serial_len = get_smbios_string("/sys/class/dmi/id/board_serial", S(board_serial)); #undef S *required_len = sizeof(struct smbios_prologue); @@ -2000,6 +2017,9 @@ static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG *required_len += max(system_vendor_len + system_product_len + system_version_len + system_serial_len + 5, 2); + *required_len += sizeof(struct smbios_board); + *required_len += max(board_vendor_len + board_product_len + board_version_len + board_serial_len + 5, 2); + sfti->TableBufferLength = *required_len; *required_len += FIELD_OFFSET(SYSTEM_FIRMWARE_TABLE_INFORMATION, TableBuffer); @@ -2052,6 +2072,24 @@ static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG if (!string_count) *buffer++ = 0; *buffer++ = 0; + string_count = 0; + board = (struct smbios_board*)buffer; + board->type = 2; + board->length = sizeof(struct smbios_board); + board->handle = 0; + board->vendor = board_vendor_len ? ++string_count : 0; + board->product = board_product_len ? ++string_count : 0; + board->version = board_version_len ? ++string_count : 0; + board->serial = board_serial_len ? ++string_count : 0; + buffer += sizeof(struct smbios_board); + + copy_smbios_string(&buffer, board_vendor, board_vendor_len); + copy_smbios_string(&buffer, board_product, board_product_len); + copy_smbios_string(&buffer, board_version, board_version_len); + copy_smbios_string(&buffer, board_serial, board_serial_len); + if (!string_count) *buffer++ = 0; + *buffer++ = 0; + return STATUS_SUCCESS; } default:

1 0

Józef Kucia : winevulkan: Implement VK_KHR_device_group_creation.
by Alexandre Julliard July 12, 2018

July 12, 2018

Module: wine Branch: master Commit: b27b3aeaf64cd5e8b1b8fed2d430f2476aa6e8af URL: https://source.winehq.org/git/wine.git/?a=commit;h=b27b3aeaf64cd5e8b1b8fed2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 12 11:39:43 2018 +0200 winevulkan: Implement VK_KHR_device_group_creation. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vulkan-1/vulkan-1.spec | 2 +- dlls/winevulkan/make_vulkan | 5 +++ dlls/winevulkan/vulkan.c | 91 +++++++++++++++++++++++++++++++--------- dlls/winevulkan/vulkan_private.h | 2 +- dlls/winevulkan/vulkan_thunks.c | 3 ++ dlls/winevulkan/vulkan_thunks.h | 6 +++ dlls/winevulkan/winevulkan.spec | 2 +- include/wine/vulkan.h | 6 +++ 8 files changed, 95 insertions(+), 22 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b27b3aeaf64cd5e8b1b8…

1 0

Dmitry Timoshkov : advapi32: Performance providers' Open() expects to see the configured name as its parameter.
by Alexandre Julliard July 12, 2018

July 12, 2018

Module: wine Branch: master Commit: a77eed47b438671d6f8fc7673a4852aef23503ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=a77eed47b438671d6f8fc767… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jul 11 12:16:14 2018 +0800 advapi32: Performance providers' Open() expects to see the configured name as its parameter. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/registry.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index ac75e7b..ce56b5a 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -1485,6 +1485,7 @@ LONG WINAPI RegSetKeyValueA( HKEY hkey, LPCSTR subkey, LPCSTR name, DWORD type, struct perf_provider { HMODULE perflib; + WCHAR linkage[MAX_PATH]; PM_OPEN_PROC *pOpen; PM_CLOSE_PROC *pClose; PM_COLLECT_PROC *pCollect; @@ -1510,6 +1511,8 @@ static BOOL load_provider(HKEY root, const WCHAR *name, struct perf_provider *pr { static const WCHAR performanceW[] = { 'P','e','r','f','o','r','m','a','n','c','e',0 }; static const WCHAR libraryW[] = { 'L','i','b','r','a','r','y',0 }; + static const WCHAR linkageW[] = { 'L','i','n','k','a','g','e',0 }; + static const WCHAR exportW[] = { 'E','x','p','o','r','t',0 }; WCHAR buf[MAX_PATH], buf2[MAX_PATH]; DWORD err, type, len; HKEY service, perf; @@ -1518,6 +1521,21 @@ static BOOL load_provider(HKEY root, const WCHAR *name, struct perf_provider *pr if (err != ERROR_SUCCESS) return FALSE; + provider->linkage[0] = 0; + err = RegOpenKeyExW(service, linkageW, 0, KEY_READ, &perf); + if (err == ERROR_SUCCESS) + { + len = sizeof(buf) - sizeof(WCHAR); + err = RegQueryValueExW(perf, exportW, NULL, &type, (BYTE *)buf, &len); + if (err == ERROR_SUCCESS && (type == REG_SZ || type == REG_MULTI_SZ)) + { + memcpy(provider->linkage, buf, len); + provider->linkage[len / sizeof(WCHAR)] = 0; + TRACE("Export: %s\n", debugstr_w(provider->linkage)); + } + RegCloseKey(perf); + } + err = RegOpenKeyExW(service, performanceW, 0, KEY_READ, &perf); RegCloseKey(service); if (err != ERROR_SUCCESS) @@ -1564,12 +1582,13 @@ error: static DWORD collect_data(struct perf_provider *provider, const WCHAR *query, void **data, DWORD *size, DWORD *obj_count) { + WCHAR *linkage = provider->linkage[0] ? provider->linkage : NULL; DWORD err; - err = provider->pOpen(NULL); + err = provider->pOpen(linkage); if (err != ERROR_SUCCESS) { - TRACE("Open error %u (%#x)\n", err, err); + TRACE("Open(%s) error %u (%#x)\n", debugstr_w(linkage), err, err); return err; }

1 0

Akihiro Sagawa : winmm: Support TIME_MIDI position in MIDI stream.
by Alexandre Julliard July 12, 2018

July 12, 2018

Module: wine Branch: master Commit: 95c21f3f9475de09965cd34186e99e9aed86d70d URL: https://source.winehq.org/git/wine.git/?a=commit;h=95c21f3f9475de09965cd341… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Jul 11 22:33:25 2018 +0900 winmm: Support TIME_MIDI position in MIDI stream. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/midi.c | 4 ++-- dlls/winmm/winmm.c | 21 ++++++++++++++++++--- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/dlls/winmm/tests/midi.c b/dlls/winmm/tests/midi.c index 66f35ef..2b1e91f 100644 --- a/dlls/winmm/tests/midi.c +++ b/dlls/winmm/tests/midi.c @@ -698,7 +698,7 @@ static void test_midiStream(UINT udev, HWND hwnd) test_position(hm, TIME_MS, TIME_MS); test_position(hm, TIME_TICKS, TIME_TICKS); - todo_wine test_position(hm, TIME_MIDI, TIME_MIDI); + test_position(hm, TIME_MIDI, TIME_MIDI); test_position(hm, TIME_SMPTE, TIME_MS); test_position(hm, TIME_SAMPLES, TIME_MS); test_position(hm, TIME_BYTES, TIME_MS); @@ -933,7 +933,7 @@ static void test_midiStream(UINT udev, HWND hwnd) /* TIME_MIDI value is a quarter of TIME_TICKS, rounded */ expected = (ret + midiprop.tdiv.dwTimeDiv/8) / (midiprop.tdiv.dwTimeDiv/4); ret = get_position(hm, TIME_MIDI); - todo_wine ok(ret == expected, "expected song pointer %u, got %u\n", expected, ret); + ok(ret == expected, "expected song pointer %u, got %u\n", expected, ret); ok(records.count == 2, "expected 2 MM_MOM_DONE messages, got %d\n", records.count); diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index f2dfae9..487bbff 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -1508,9 +1508,17 @@ MMRESULT WINAPI midiStreamPosition(HMIDISTRM hMidiStrm, LPMMTIME lpMMT, UINT cbm } else { EnterCriticalSection(&lpMidiStrm->lock); switch (lpMMT->wType) { - default: - FIXME("Unsupported time type %x\n", lpMMT->wType); - /* fall through */ + case TIME_MIDI: + if (lpMidiStrm->dwTimeDiv < 0x8000) { + DWORD tdiv, pulses; + tdiv = (lpMidiStrm->dwTimeDiv > 24) ? lpMidiStrm->dwTimeDiv : 24; + pulses = midistream_get_current_pulse(lpMidiStrm); + lpMMT->u.midi.songptrpos = (pulses + tdiv/8) / (tdiv/4); + if (!lpMMT->u.midi.songptrpos && pulses) lpMMT->u.midi.songptrpos++; + TRACE("=> song position %d (pulses %u, tdiv %u)\n", lpMMT->u.midi.songptrpos, pulses, tdiv); + break; + } + /* fall through */ case TIME_BYTES: case TIME_SAMPLES: lpMMT->wType = TIME_MS; @@ -1523,6 +1531,13 @@ MMRESULT WINAPI midiStreamPosition(HMIDISTRM hMidiStrm, LPMMTIME lpMMT, UINT cbm lpMMT->u.ticks = midistream_get_current_pulse(lpMidiStrm); TRACE("=> %d ticks\n", lpMMT->u.ticks); break; + default: + FIXME("Unsupported time type %x\n", lpMMT->wType); + /* use TIME_MS instead */ + lpMMT->wType = TIME_MS; + lpMMT->u.ms = midistream_get_playing_position(lpMidiStrm); + TRACE("=> %d ms\n", lpMMT->u.ms); + break; } LeaveCriticalSection(&lpMidiStrm->lock); }

1 0

Dmitry Timoshkov : advapi32: Add initial support for querying performance counters data.
by Alexandre Julliard July 12, 2018

July 12, 2018

Module: wine Branch: master Commit: 903de9b678fcb40191d5bdbb62ab7b8879343c9b URL: https://source.winehq.org/git/wine.git/?a=commit;h=903de9b678fcb40191d5bdbb… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jul 11 12:16:07 2018 +0800 advapi32: Add initial support for querying performance counters data. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/registry.c | 244 ++++++++++++++++++++++++++++++++++++++++- dlls/advapi32/tests/registry.c | 17 +-- 2 files changed, 249 insertions(+), 12 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=903de9b678fcb40191d5…

1 0

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

July 12, 2018

Module: wine Branch: master Commit: 96cf25ed90e69c8573133a16235d6db1e7fb4de7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=96cf25ed90e69c8573133a16… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Jul 11 22:06:15 2018 +0200 imaadp32.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/imaadp32.acm/imaadp32.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/imaadp32.acm/imaadp32.c b/dlls/imaadp32.acm/imaadp32.c index 474f548..9518adc 100644 --- a/dlls/imaadp32.acm/imaadp32.c +++ b/dlls/imaadp32.acm/imaadp32.c @@ -79,9 +79,6 @@ static const Format ADPCM_Formats[] = {1, 4, 22050}, {2, 4, 22050}, {1, 4, 44100}, {2, 4, 44100}, }; -#define NUM_PCM_FORMATS (sizeof(PCM_Formats) / sizeof(PCM_Formats[0])) -#define NUM_ADPCM_FORMATS (sizeof(ADPCM_Formats) / sizeof(ADPCM_Formats[0])) - /*********************************************************************** * ADPCM_GetFormatIndex */ @@ -93,11 +90,11 @@ static DWORD ADPCM_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_IMA_ADPCM: - hi = NUM_ADPCM_FORMATS; + hi = ARRAY_SIZE(ADPCM_Formats); fmts = ADPCM_Formats; break; default: @@ -585,13 +582,13 @@ static LRESULT ADPCM_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_IMA_ADPCM; aftd->cbFormatSize = sizeof(IMAADPCMWAVEFORMAT); - aftd->cStandardFormats = NUM_ADPCM_FORMATS; + aftd->cStandardFormats = ARRAY_SIZE(ADPCM_Formats); lstrcpyW(aftd->szFormatTag, szImaAdPcm); break; } @@ -614,7 +611,7 @@ static LRESULT ADPCM_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; @@ -627,7 +624,7 @@ static LRESULT ADPCM_FormatDetails(PACMFORMATDETAILSW afd, DWORD dwQuery) afd->pwfx->nSamplesPerSec * afd->pwfx->nBlockAlign; break; case WAVE_FORMAT_IMA_ADPCM: - if (afd->dwFormatIndex >= NUM_ADPCM_FORMATS) return ACMERR_NOTPOSSIBLE; + if (afd->dwFormatIndex >= ARRAY_SIZE(ADPCM_Formats)) return ACMERR_NOTPOSSIBLE; afd->pwfx->nChannels = ADPCM_Formats[afd->dwFormatIndex].nChannels; afd->pwfx->nSamplesPerSec = ADPCM_Formats[afd->dwFormatIndex].rate; afd->pwfx->wBitsPerSample = ADPCM_Formats[afd->dwFormatIndex].nBits;

1 0