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

[PATCH 3/3] d3d11/tests: Add more tests for multisample resolve.
by Józef Kucia 13 Jul '18

13 Jul '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index be7c90768c98..5e324b18ba66 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -27036,6 +27036,47 @@ static void test_multisample_resolve(void) DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, &color, 0xffbf7f40, TRUE}, + + {DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_UNORM, + DXGI_FORMAT_R8G8B8A8_UNORM, + &green, 0xff00ff00, TRUE}, + {DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_UNORM, + DXGI_FORMAT_R8G8B8A8_UNORM, + &color, 0xffbf7f40, TRUE}, + {DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + &green, 0xff00ff00, TRUE}, + {DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + &color, 0xffe1bc89, TRUE}, + {DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_UNORM, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + &green, 0xff00ff00, TRUE}, + {DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_UNORM, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + &color, 0xffe1bc89, TRUE}, + {DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + DXGI_FORMAT_R8G8B8A8_UNORM, + &green, 0xff00ff00, TRUE}, + {DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + DXGI_FORMAT_R8G8B8A8_UNORM, + &color, 0xffbf7f40, TRUE}, }; if (!init_test_context(&test_context, NULL)) -- 2.16.4

2 1

[PATCH 2/3] wined3d: Take into account all shader stages when determining feature level.
by Józef Kucia 13 Jul '18

13 Jul '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/directx.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e4220058221b..bb8d5afb4aa7 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1847,22 +1847,29 @@ static enum wined3d_pci_vendor wined3d_guess_card_vendor(const char *gl_vendor_s static enum wined3d_feature_level feature_level_from_caps(const struct wined3d_gl_info *gl_info, const struct shader_caps *shader_caps, const struct fragment_caps *fragment_caps) { + unsigned int shader_model; + + shader_model = min(shader_caps->vs_version, shader_caps->ps_version); + shader_model = min(shader_model, max(shader_caps->gs_version, 3)); + shader_model = min(shader_model, max(shader_caps->hs_version, 4)); + shader_model = min(shader_model, max(shader_caps->ds_version, 4)); + if (gl_info->supported[WINED3D_GL_VERSION_3_2] && gl_info->supported[ARB_SAMPLER_OBJECTS]) { - if (shader_caps->vs_version >= 5 + if (shader_model >= 5 && gl_info->supported[ARB_DRAW_INDIRECT] && gl_info->supported[ARB_TEXTURE_COMPRESSION_BPTC]) return WINED3D_FEATURE_LEVEL_11; - if (shader_caps->vs_version == 4) + if (shader_model == 4) return WINED3D_FEATURE_LEVEL_10; } - if (shader_caps->vs_version == 3) + if (shader_model == 3) return WINED3D_FEATURE_LEVEL_9_SM3; - if (shader_caps->vs_version == 2) + if (shader_model == 2) return WINED3D_FEATURE_LEVEL_9_SM2; - if (shader_caps->vs_version == 1) + if (shader_model == 1) return WINED3D_FEATURE_LEVEL_8; if (fragment_caps->TextureOpCaps & WINED3DTEXOPCAPS_DOTPRODUCT3) -- 2.16.4

2 1

[PATCH 1/3] wined3d: Separate feature level checks from shader model checks.
by Józef Kucia 13 Jul '18

13 Jul '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/directx.c | 21 ++++++++++++++------- dlls/wined3d/glsl_shader.c | 4 ---- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 9ecc4ed71354..e4220058221b 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1844,13 +1844,20 @@ static enum wined3d_pci_vendor wined3d_guess_card_vendor(const char *gl_vendor_s return HW_VENDOR_NVIDIA; } -static enum wined3d_feature_level feature_level_from_caps(const struct shader_caps *shader_caps, - const struct fragment_caps *fragment_caps) +static enum wined3d_feature_level feature_level_from_caps(const struct wined3d_gl_info *gl_info, + const struct shader_caps *shader_caps, const struct fragment_caps *fragment_caps) { - if (shader_caps->vs_version >= 5) - return WINED3D_FEATURE_LEVEL_11; - if (shader_caps->vs_version == 4) - return WINED3D_FEATURE_LEVEL_10; + if (gl_info->supported[WINED3D_GL_VERSION_3_2] && gl_info->supported[ARB_SAMPLER_OBJECTS]) + { + if (shader_caps->vs_version >= 5 + && gl_info->supported[ARB_DRAW_INDIRECT] + && gl_info->supported[ARB_TEXTURE_COMPRESSION_BPTC]) + return WINED3D_FEATURE_LEVEL_11; + + if (shader_caps->vs_version == 4) + return WINED3D_FEATURE_LEVEL_10; + } + if (shader_caps->vs_version == 3) return WINED3D_FEATURE_LEVEL_9_SM3; if (shader_caps->vs_version == 2) @@ -4306,7 +4313,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, d3d_info->limits.ffp_textures = fragment_caps.MaxSimultaneousTextures; d3d_info->shader_color_key = fragment_caps.wined3d_caps & WINED3D_FRAGMENT_CAP_COLOR_KEY; d3d_info->wined3d_creation_flags = wined3d_creation_flags; - d3d_info->feature_level = feature_level_from_caps(&shader_caps, &fragment_caps); + d3d_info->feature_level = feature_level_from_caps(gl_info, &shader_caps, &fragment_caps); TRACE("Max texture stages: %u.\n", d3d_info->limits.ffp_blend_stages); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 1e922c80dff7..0c73aba81118 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -11242,8 +11242,6 @@ static void shader_glsl_init_context_state(struct wined3d_context *context) static unsigned int shader_glsl_get_shader_model(const struct wined3d_gl_info *gl_info) { BOOL shader_model_4 = gl_info->glsl_version >= MAKEDWORD_VERSION(1, 50) - && gl_info->supported[WINED3D_GL_VERSION_3_2] - && gl_info->supported[ARB_SAMPLER_OBJECTS] && gl_info->supported[ARB_SHADER_BIT_ENCODING] && gl_info->supported[ARB_TEXTURE_SWIZZLE]; @@ -11251,14 +11249,12 @@ static unsigned int shader_glsl_get_shader_model(const struct wined3d_gl_info *g && gl_info->supported[ARB_COMPUTE_SHADER] && gl_info->supported[ARB_CULL_DISTANCE] && gl_info->supported[ARB_DERIVATIVE_CONTROL] - && gl_info->supported[ARB_DRAW_INDIRECT] && gl_info->supported[ARB_GPU_SHADER5] && gl_info->supported[ARB_SHADER_ATOMIC_COUNTERS] && gl_info->supported[ARB_SHADER_IMAGE_LOAD_STORE] && gl_info->supported[ARB_SHADER_IMAGE_SIZE] && gl_info->supported[ARB_SHADING_LANGUAGE_PACKING] && gl_info->supported[ARB_TESSELLATION_SHADER] - && gl_info->supported[ARB_TEXTURE_COMPRESSION_BPTC] && gl_info->supported[ARB_TEXTURE_GATHER] && gl_info->supported[ARB_TRANSFORM_FEEDBACK3]) return 5; -- 2.16.4

2 1

[PATCH] crypt32: Print CryptUnprotectMemory FIXME only once.
by André Hentschel 13 Jul '18

13 Jul '18

From: Christian Costa <titan.costa(a)gmail.com> Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/crypt32/main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/crypt32/main.c b/dlls/crypt32/main.c index 9ff7592..c03c092 100644 --- a/dlls/crypt32/main.c +++ b/dlls/crypt32/main.c @@ -258,6 +258,7 @@ BOOL WINAPI CryptProtectMemory(void *data, DWORD len, DWORD flags) BOOL WINAPI CryptUnprotectMemory(void *data, DWORD len, DWORD flags) { - FIXME("(%p %u %08x): stub\n", data, len, flags); + static int fixme_once; + if (!fixme_once++) FIXME("(%p %u %08x): stub\n", data, len, flags); return TRUE; } -- 2.7.4

1 0

[PATCH] winedbg: Check for visible Window Station before displaying crash dialog
by André Hentschel 13 Jul '18

13 Jul '18

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> For https://bugs.winehq.org/show_bug.cgi?id=35928 --- programs/winedbg/crashdlg.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/programs/winedbg/crashdlg.c b/programs/winedbg/crashdlg.c index a925378..cda2642 100644 --- a/programs/winedbg/crashdlg.c +++ b/programs/winedbg/crashdlg.c @@ -48,6 +48,20 @@ int msgbox_res_id(HWND hwnd, UINT textid, UINT captionid, UINT type) return IDCANCEL; } +static BOOL is_visible(void) +{ + USEROBJECTFLAGS flags; + HWINSTA winstation; + + if (!(winstation = GetProcessWindowStation())) + return FALSE; + + if (!(GetUserObjectInformationA(winstation, UOI_FLAGS, &flags, sizeof(flags), NULL))) + return FALSE; + + return flags.dwFlags & WSF_VISIBLE; +} + static WCHAR *get_program_name(HANDLE hProcess) { WCHAR image_name[MAX_PATH]; @@ -362,7 +376,7 @@ int display_crash_dialog(void) /* dbg_curr_process->handle is not set */ HANDLE hProcess; - if (!DBG_IVAR(ShowCrashDialog)) + if (!DBG_IVAR(ShowCrashDialog) || !is_visible()) return TRUE; hProcess = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, dbg_curr_pid); -- 2.7.4

1 0

[PATCH] start: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 13 Jul '18

13 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(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 0d79aca9a4..f5f50bb3e7 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 4010befa04..32372ecc34 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); -- 2.14.4

1 0

[PATCH] wmic: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 13 Jul '18

13 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(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 ddd2aecd53..f4a5bc74f1 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 ); -- 2.14.4

1 0

[PATCH] winefile: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 13 Jul '18

13 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(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 044a399a82..23be450d5f 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); } -- 2.14.4

1 0

[PATCH] wscript: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 13 Jul '18

13 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(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 fb95c0c94d..fb1c86fc62 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 3537f9d724..1cbb9e7e98 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, '.'); -- 2.14.4

1 0

[PATCH] xcopy: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 13 Jul '18

13 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(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 cdf0bdfb26..616c7d2700 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; -- 2.14.4

1 0