- wine-devel - winehq.org

[PATCH] quartz: Don't call memcpy with src=0 in FM2_WriteFilterData (Coverity)
by Alex Henrie 13 Aug '18

13 Aug '18

Signed-off-by: Alex Henrie <alex.henrie(a)utah.edu> --- Passing NULL to memcpy causes a segfault in newer versions of GCC, see https://www.imperialviolet.org/2016/06/26/nonnull.html --- dlls/quartz/filtermapper.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index 0d26198637..7a5b5aee72 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -148,8 +148,11 @@ static int add_data(struct Vector * v, const BYTE * pData, int size) LPBYTE pOldData = v->pData; v->capacity = (v->capacity + size) * 2; v->pData = CoTaskMemAlloc(v->capacity); - memcpy(v->pData, pOldData, v->current); - CoTaskMemFree(pOldData); + if (pOldData) + { + memcpy(v->pData, pOldData, v->current); + CoTaskMemFree(pOldData); + } } memcpy(v->pData + v->current, pData, size); v->current += size; -- 2.18.0

1 0

[PATCH] odbc32: Add SQLGetDiagRecA implementation.
by Jacek Caban 13 Aug '18

13 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/odbc32/odbc32.spec | 2 +- dlls/odbc32/proxyodbc.c | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-)

1 0

[PATCH] wineps.drv: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 13 Aug '18

13 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wineps.drv/driver.c | 6 +++--- dlls/wineps.drv/pen.c | 10 +++++----- dlls/wineps.drv/type42.c | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wineps.drv/driver.c b/dlls/wineps.drv/driver.c index 612bf69df4..64d813a44c 100644 --- a/dlls/wineps.drv/driver.c +++ b/dlls/wineps.drv/driver.c @@ -285,7 +285,7 @@ static INT_PTR CALLBACK PSDRV_PaperDlgProc(HWND hwnd, UINT msg, res = di->pi->ppd->DefaultResolution; len = sprintfW(buf, resW, res); buf[len++] = ' '; - LoadStringW(PSDRV_hInstance, IDS_DPI, buf + len, sizeof(buf)/sizeof(buf[0]) - len); + LoadStringW(PSDRV_hInstance, IDS_DPI, buf + len, ARRAY_SIZE(buf) - len); SendDlgItemMessageW(hwnd, IDD_QUALITY, CB_ADDSTRING, 0, (LPARAM)buf); SendDlgItemMessageW(hwnd, IDD_QUALITY, CB_SETITEMDATA, 0, MAKELONG(res, res)); Cursel = 0; @@ -317,7 +317,7 @@ static INT_PTR CALLBACK PSDRV_PaperDlgProc(HWND hwnd, UINT msg, else len = sprintfW(buf, resxyW, res->resx, res->resy); buf[len++] = ' '; - LoadStringW(PSDRV_hInstance, IDS_DPI, buf + len, sizeof(buf)/sizeof(buf[0]) - len); + LoadStringW(PSDRV_hInstance, IDS_DPI, buf + len, ARRAY_SIZE(buf) - len); idx = SendDlgItemMessageW(hwnd, IDD_QUALITY, CB_ADDSTRING, 0, (LPARAM)buf); SendDlgItemMessageW(hwnd, IDD_QUALITY, CB_SETITEMDATA, idx, MAKELONG(res->resx, res->resy)); @@ -557,7 +557,7 @@ INT PSDRV_ExtDeviceMode(LPSTR lpszDriver, HWND hwnd, LPDEVMODEA lpdmOutput, WCHAR SetupW[64]; static const WCHAR PAPERW[] = {'P','A','P','E','R','\0'}; - LoadStringW(PSDRV_hInstance, IDS_SETUP, SetupW, sizeof(SetupW)/sizeof(SetupW[0])); + LoadStringW(PSDRV_hInstance, IDS_SETUP, SetupW, ARRAY_SIZE(SetupW)); hinstComctl32 = LoadLibraryA("comctl32.dll"); pCreatePropertySheetPage = (void*)GetProcAddress(hinstComctl32, "CreatePropertySheetPageW"); diff --git a/dlls/wineps.drv/pen.c b/dlls/wineps.drv/pen.c index 2526fa931f..b3ad60606e 100644 --- a/dlls/wineps.drv/pen.c +++ b/dlls/wineps.drv/pen.c @@ -93,27 +93,27 @@ HPEN PSDRV_SelectPen( PHYSDEV dev, HPEN hpen, const struct brush_pattern *patter switch(physDev->pen.style) { case PS_DASH: memcpy( physDev->pen.dash, PEN_dash, sizeof(PEN_dash) ); - physDev->pen.dash_len = sizeof(PEN_dash) / sizeof(DWORD); + physDev->pen.dash_len = ARRAY_SIZE( PEN_dash ); break; case PS_DOT: memcpy( physDev->pen.dash, PEN_dot, sizeof(PEN_dot) ); - physDev->pen.dash_len = sizeof(PEN_dot) / sizeof(DWORD); + physDev->pen.dash_len = ARRAY_SIZE( PEN_dot ); break; case PS_DASHDOT: memcpy( physDev->pen.dash, PEN_dashdot, sizeof(PEN_dashdot) ); - physDev->pen.dash_len = sizeof(PEN_dashdot) / sizeof(DWORD); + physDev->pen.dash_len = ARRAY_SIZE( PEN_dashdot ); break; case PS_DASHDOTDOT: memcpy( physDev->pen.dash, PEN_dashdotdot, sizeof(PEN_dashdotdot) ); - physDev->pen.dash_len = sizeof(PEN_dashdotdot) / sizeof(DWORD); + physDev->pen.dash_len = ARRAY_SIZE( PEN_dashdotdot ); break; case PS_ALTERNATE: memcpy( physDev->pen.dash, PEN_alternate, sizeof(PEN_alternate) ); - physDev->pen.dash_len = sizeof(PEN_alternate) / sizeof(DWORD); + physDev->pen.dash_len = ARRAY_SIZE( PEN_alternate ); break; case PS_USERSTYLE: diff --git a/dlls/wineps.drv/type42.c b/dlls/wineps.drv/type42.c index c0cda50a8d..8a56cc6b6c 100644 --- a/dlls/wineps.drv/type42.c +++ b/dlls/wineps.drv/type42.c @@ -70,7 +70,7 @@ static const OTTable tables_templ[] = { }; struct tagTYPE42 { - OTTable tables[sizeof(tables_templ)/sizeof(tables_templ[0])]; + OTTable tables[ARRAY_SIZE(tables_templ)]; int glyf_tab, loca_tab, head_tab; /* indices of glyf, loca and head tables */ int hmtx_tab, maxp_tab; int num_of_written_tables; @@ -138,7 +138,7 @@ TYPE42 *T42_download_header(PHYSDEV dev, char *ps_name, RECT *bbox, UINT emsize) { DWORD i, j, tablepos, nb_blocks, glyf_off = 0, loca_off = 0, cur_off; - WORD num_of_tables = sizeof(tables_templ) / sizeof(tables_templ[0]) - 1; + WORD num_of_tables = ARRAY_SIZE(tables_templ) - 1; char *buf; TYPE42 *t42; static const char start[] = /* name, fontbbox */ -- 2.14.4

2 1

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

13 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/localspl/localmon.c | 10 +++++----- dlls/localspl/provider.c | 20 ++++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/localspl/localmon.c b/dlls/localspl/localmon.c index 4be1ad6101..8553aa2297 100644 --- a/dlls/localspl/localmon.c +++ b/dlls/localspl/localmon.c @@ -279,10 +279,10 @@ static DWORD get_type_from_name(LPCWSTR name) { HANDLE hfile; - if (!strncmpW(name, portname_LPT, sizeof(portname_LPT) / sizeof(WCHAR) -1)) + if (!strncmpW(name, portname_LPT, ARRAY_SIZE(portname_LPT) - 1)) return PORT_IS_LPT; - if (!strncmpW(name, portname_COM, sizeof(portname_COM) / sizeof(WCHAR) -1)) + if (!strncmpW(name, portname_COM, ARRAY_SIZE(portname_COM) - 1)) return PORT_IS_COM; if (!strcmpW(name, portname_FILE)) @@ -294,10 +294,10 @@ static DWORD get_type_from_name(LPCWSTR name) if (name[0] == '|') return PORT_IS_PIPE; - if (!strncmpW(name, portname_CUPS, sizeof(portname_CUPS) / sizeof(WCHAR) -1)) + if (!strncmpW(name, portname_CUPS, ARRAY_SIZE(portname_CUPS) - 1)) return PORT_IS_CUPS; - if (!strncmpW(name, portname_LPR, sizeof(portname_LPR) / sizeof(WCHAR) -1)) + if (!strncmpW(name, portname_LPR, ARRAY_SIZE(portname_LPR) - 1)) return PORT_IS_LPR; /* Must be a file or a directory. Does the file exist ? */ @@ -704,7 +704,7 @@ static DWORD WINAPI localmon_XcvDataPort(HANDLE hXcv, LPCWSTR pszDataName, PBYTE { ptr = ((xcv_t *)hXcv)->nameW; } - lstrcpynW(buffer, ptr, sizeof(buffer)/sizeof(WCHAR)); + lstrcpynW(buffer, ptr, ARRAY_SIZE(buffer)); if (buffer[0]) buffer[lstrlenW(buffer)-1] = '\0'; /* remove the ':' */ res = SetDefaultCommConfigW(buffer, (LPCOMMCONFIG) pInputData, cbInputData); TRACE("got %u with %u\n", res, GetLastError() ); diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 3538947281..c17d982fa7 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -275,7 +275,7 @@ static LONG copy_servername_from_name(LPCWSTR name, LPWSTR target) target[serverlen] = '\0'; } - len = sizeof(buffer) / sizeof(buffer[0]); + len = ARRAY_SIZE(buffer); if (GetComputerNameW(buffer, &len)) { if ((serverlen == len) && (strncmpiW(server, buffer, len) == 0)) { /* The requested Servername is our computername */ @@ -693,7 +693,7 @@ static const printenv_t * validate_envW(LPCWSTR env) TRACE("(%s)\n", debugstr_w(env)); if (env && env[0]) { - for (i = 0; i < sizeof(all_printenv)/sizeof(all_printenv[0]); i++) + for (i = 0; i < ARRAY_SIZE(all_printenv); i++) { if (lstrcmpiW(env, all_printenv[i]->envname) == 0) { @@ -749,7 +749,7 @@ static DWORD get_local_monitors(DWORD level, LPBYTE pMonitors, DWORD cbBuf, LPDW ptr = (LPWSTR) &pMonitors[len]; numentries = 0; - len = sizeof(buffer)/sizeof(buffer[0]); + len = ARRAY_SIZE(buffer); buffer[0] = '\0'; /* Windows creates the "Monitors"-Key on reboot / start "spooler" */ @@ -802,7 +802,7 @@ static DWORD get_local_monitors(DWORD level, LPBYTE pMonitors, DWORD cbBuf, LPDW } } index++; - len = sizeof(buffer)/sizeof(buffer[0]); + len = ARRAY_SIZE(buffer); buffer[0] = '\0'; } RegCloseKey(hroot); @@ -838,7 +838,7 @@ static DWORD get_local_printprocessors(LPWSTR regpathW, LPBYTE pPPInfo, DWORD cb ptr = (LPWSTR) &pPPInfo[len]; numentries = 0; - len = sizeof(buffer)/sizeof(buffer[0]); + len = ARRAY_SIZE(buffer); buffer[0] = '\0'; if (RegCreateKeyW(HKEY_LOCAL_MACHINE, regpathW, &hroot) == ERROR_SUCCESS) { @@ -852,7 +852,7 @@ static DWORD get_local_printprocessors(LPWSTR regpathW, LPBYTE pPPInfo, DWORD cb TRACE("%p: writing PRINTPROCESSOR_INFO_1W #%d\n", ppi, numentries); ppi->pName = ptr; lstrcpyW(ptr, winprintW); /* Name of the Print Processor */ - ptr += sizeof(winprintW) / sizeof(WCHAR); + ptr += ARRAY_SIZE(winprintW); } /* Scan all Printprocessor Keys */ @@ -888,7 +888,7 @@ static DWORD get_local_printprocessors(LPWSTR regpathW, LPBYTE pPPInfo, DWORD cb } } index++; - len = sizeof(buffer)/sizeof(buffer[0]); + len = ARRAY_SIZE(buffer); buffer[0] = '\0'; } RegCloseKey(hroot); @@ -1196,7 +1196,7 @@ static HANDLE printer_alloc_handle(LPCWSTR name, LPPRINTER_DEFAULTSW pDefault) printer = NULL; } if (printername) { - len = sizeof(XcvMonitorW)/sizeof(WCHAR) - 1; + len = ARRAY_SIZE(XcvMonitorW) - 1; if (strncmpW(printername, XcvMonitorW, len) == 0) { /* OpenPrinter(",XcvMonitor ", ...) detected */ TRACE(",XcvMonitor: %s\n", debugstr_w(&printername[len])); @@ -1210,7 +1210,7 @@ static HANDLE printer_alloc_handle(LPCWSTR name, LPPRINTER_DEFAULTSW pDefault) } else { - len = sizeof(XcvPortW)/sizeof(WCHAR) - 1; + len = ARRAY_SIZE(XcvPortW) - 1; if (strncmpW( printername, XcvPortW, len) == 0) { /* OpenPrinter(",XcvPort ", ...) detected */ TRACE(",XcvPort: %s\n", debugstr_w(&printername[len])); @@ -1303,7 +1303,7 @@ static BOOL myAddPrinterDriverEx(DWORD level, LPBYTE pDriverInfo, DWORD dwFileCo DRIVER_INFO, that the caller supplied */ ZeroMemory(&di, sizeof(di)); - if (pDriverInfo && (level < (sizeof(di_sizeof) / sizeof(di_sizeof[0])))) { + if (pDriverInfo && (level < ARRAY_SIZE(di_sizeof))) { memcpy(&di, pDriverInfo, di_sizeof[level]); } -- 2.14.4

2 1

RFC: Chinese/Japanese/Korean speakers - testing needed for winetricks cjkfonts patch
by Austin English 13 Aug '18

13 Aug '18

A bug [1] was reported in winetricks a while back about Chinese input in QQ; the solution was a missing font substituion (QQ expected a substitution for the native name, not the English name). I just pushed a patch that adds the font substitutes that were in Chromium [2]. As I don't speak any of those languages, I'd appreciate if anyone that does could test the patches with `winetricks cjkfonts` (particularly if you've had issues with cjkfonts before) and let me know if helps / breaks anything. Thanks in advance, -Austin [1] https://github.com/Winetricks/winetricks/issues/781 [2] https://github.com/austin987/winetricks/commit/a591bf3d9a3efc153787768f5e2a… -- -Austin GPG: 267B CC1F 053F 0749 (expires 2021/02/18)

2 1

[PATCH v2 8/8] comctl32/taskdialog: Fix center positioning.
by Zhiyi Zhang 13 Aug '18

13 Aug '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/taskdialog.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 6875b9ce4f..f69fa6aaa3 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -2,6 +2,7 @@ * Task dialog control * * Copyright 2017 Fabian Maurer + * Copyright 2018 Zhiyi Zhang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1101,8 +1102,8 @@ static void taskdialog_layout(struct taskdialog_info *dialog_info) if (first_time) { - x = (ref_rect.left + ref_rect.right + dialog_width) / 2; - y = (ref_rect.top + ref_rect.bottom + dialog_height) / 2; + x = (ref_rect.left + ref_rect.right - dialog_width) / 2; + y = (ref_rect.top + ref_rect.bottom - dialog_height) / 2; SetWindowPos(dialog_info->hwnd, 0, x, y, dialog_width, dialog_height, SWP_NOZORDER); first_time = FALSE; } -- 2.18.0

2 1

[PATCH v2 7/8] comctl32/taskdialog: Add vertical spacing for radio buttons.
by Zhiyi Zhang 13 Aug '18

13 Aug '18

Add vertical spacing to make dialog look nicer. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/taskdialog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 1bc37861f8..6875b9ce4f 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -939,7 +939,7 @@ static void taskdialog_layout(struct taskdialog_info *dialog_info) for (i = 0; i < dialog_info->radio_button_count; i++) { x = main_icon_right + h_spacing; - y = dialog_height; + y = dialog_height + v_spacing; taskdialog_get_radio_button_size(dialog_info, dialog_info->radio_buttons[i], dialog_width - x - h_spacing, &size); size.cx = dialog_width - x - h_spacing; SetWindowPos(dialog_info->radio_buttons[i], 0, x, y, size.cx, size.cy, SWP_NOZORDER); -- 2.18.0

2 1

[PATCH v2 6/8] comctl32/taskdialog: Add support for TDM_UPDATE_ICON.
by Zhiyi Zhang 13 Aug '18

13 Aug '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/taskdialog.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 6154e76be1..1bc37861f8 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -1306,6 +1306,9 @@ static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPAR case TDM_SET_BUTTON_ELEVATION_REQUIRED_STATE: taskdialog_button_set_shield(dialog_info, wParam, lParam); break; + case TDM_UPDATE_ICON: + taskdialog_set_icon(dialog_info, wParam, (HICON)lParam); + break; case WM_INITDIALOG: dialog_info = (struct taskdialog_info *)lParam; -- 2.18.0

2 1

[PATCH v2 5/8] comctl32/taskdialog: Add support for TDF_SIZE_TO_CONTENT.
by Zhiyi Zhang 13 Aug '18

13 Aug '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/taskdialog.c | 38 +++++++++++++++++++++++++++++++++----- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index ffa8ee2fe8..6154e76be1 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -828,6 +828,36 @@ static void taskdialog_add_footer_text(struct taskdialog_info *dialog_info) dialog_info->font, taskdialog_hyperlink_enabled(dialog_info)); } +static LONG taskdialog_get_dialog_width(struct taskdialog_info *dialog_info) +{ + const TASKDIALOGCONFIG *taskconfig = dialog_info->taskconfig; + BOOL syslink = taskdialog_hyperlink_enabled(dialog_info); + LONG max_width, main_icon_width, screen_width; + RECT rect; + SIZE size; + + screen_width = taskdialog_get_reference_rect(taskconfig, &rect); + if ((taskconfig->dwFlags & TDF_SIZE_TO_CONTENT) && !taskconfig->cxWidth) + { + max_width = DIALOG_MIN_WIDTH; + taskdialog_du_to_px(dialog_info, &max_width, NULL); + main_icon_width = dialog_info->m.h_spacing; + if (dialog_info->main_icon) main_icon_width += GetSystemMetrics(SM_CXICON); + if (dialog_info->content) + { + taskdialog_get_label_size(dialog_info, dialog_info->content, 0, &size, syslink); + max_width = max(max_width, size.cx + main_icon_width + dialog_info->m.h_spacing * 2); + } + } + else + { + max_width = max(taskconfig->cxWidth, DIALOG_MIN_WIDTH); + taskdialog_du_to_px(dialog_info, &max_width, NULL); + } + max_width = min(max_width, screen_width); + return max_width; +} + static void taskdialog_label_layout(struct taskdialog_info *dialog_info, HWND hwnd, INT start_x, LONG dialog_width, LONG *dialog_height, BOOL syslink) { @@ -850,7 +880,7 @@ static void taskdialog_layout(struct taskdialog_info *dialog_info) BOOL syslink = taskdialog_hyperlink_enabled(dialog_info); static BOOL first_time = TRUE; RECT ref_rect; - LONG screen_width, dialog_width, dialog_height = 0; + LONG dialog_width, dialog_height = 0; LONG h_spacing, v_spacing; LONG main_icon_right, main_icon_bottom; LONG expando_right, expando_bottom; @@ -862,10 +892,8 @@ static void taskdialog_layout(struct taskdialog_info *dialog_info) SIZE size; INT i; - screen_width = taskdialog_get_reference_rect(dialog_info->taskconfig, &ref_rect); - dialog_width = max(taskconfig->cxWidth, DIALOG_MIN_WIDTH); - taskdialog_du_to_px(dialog_info, &dialog_width, 0); - dialog_width = min(dialog_width, screen_width); + taskdialog_get_reference_rect(dialog_info->taskconfig, &ref_rect); + dialog_width = taskdialog_get_dialog_width(dialog_info); h_spacing = dialog_info->m.h_spacing; v_spacing = dialog_info->m.v_spacing; -- 2.18.0

2 1

[PATCH v2 4/8] comctl32/taskdialog: Add support for TDM_{SET,UPDATE}_ELEMENT_TEXT.
by Zhiyi Zhang 13 Aug '18

13 Aug '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/taskdialog.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index dd7369645f..ffa8ee2fe8 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -542,6 +542,28 @@ static void taskdialog_set_icon(struct taskdialog_info *dialog_info, INT element SendMessageW(dialog_info->footer_icon, STM_SETICON, (WPARAM)hicon, 0); } +static void taskdialog_set_element_text(struct taskdialog_info *dialog_info, TASKDIALOG_ELEMENTS element, + const WCHAR *text) +{ + HWND hwnd = NULL; + WCHAR *textW; + + if (element == TDE_CONTENT) + hwnd = dialog_info->content; + else if (element == TDE_EXPANDED_INFORMATION) + hwnd = dialog_info->expanded_info; + else if (element == TDE_FOOTER) + hwnd = dialog_info->footer_text; + else if (element == TDE_MAIN_INSTRUCTION) + hwnd = dialog_info->main_instruction; + + if (!hwnd) return; + + textW = taskdialog_gettext(dialog_info, TRUE, text); + SendMessageW(hwnd, WM_SETTEXT, 0, (LPARAM)textW); + Free(textW); +} + static void taskdialog_check_default_radio_buttons(struct taskdialog_info *dialog_info) { const TASKDIALOGCONFIG *taskconfig = dialog_info->taskconfig; @@ -1227,6 +1249,13 @@ static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPAR case TDM_SET_PROGRESS_BAR_MARQUEE: SendMessageW(dialog_info->progress_bar, PBM_SETMARQUEE, wParam, lParam); break; + case TDM_SET_ELEMENT_TEXT: + taskdialog_set_element_text(dialog_info, wParam, (const WCHAR *)lParam); + taskdialog_layout(dialog_info); + break; + case TDM_UPDATE_ELEMENT_TEXT: + taskdialog_set_element_text(dialog_info, wParam, (const WCHAR *)lParam); + break; case TDM_CLICK_RADIO_BUTTON: taskdialog_click_radio_button(dialog_info, wParam); break; -- 2.18.0

2 1

[PATCH v2 3/8] comctl32/taskdialog: Add support for TDM_SET_BUTTON_ELEVATION_REQUIRED_STATE.
by Zhiyi Zhang 13 Aug '18

13 Aug '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/taskdialog.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index efe159f891..dd7369645f 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -212,6 +212,13 @@ static void taskdialog_click_button(struct taskdialog_info *dialog_info, INT id) if (hwnd) taskdialog_on_button_click(dialog_info, hwnd); } +static void taskdialog_button_set_shield(const struct taskdialog_info *dialog_info, INT id, BOOL elevate) +{ + HWND hwnd = taskdialog_find_button(dialog_info->command_links, dialog_info->command_link_count, id); + if (!hwnd) hwnd = taskdialog_find_button(dialog_info->buttons, dialog_info->button_count, id); + if (hwnd) SendMessageW(hwnd, BCM_SETSHIELD, 0, elevate); +} + static void taskdialog_enable_radio_button(const struct taskdialog_info *dialog_info, INT id, BOOL enable) { HWND hwnd = taskdialog_find_button(dialog_info->radio_buttons, dialog_info->radio_button_count, id); @@ -1239,6 +1246,9 @@ static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPAR } break; } + case TDM_SET_BUTTON_ELEVATION_REQUIRED_STATE: + taskdialog_button_set_shield(dialog_info, wParam, lParam); + break; case WM_INITDIALOG: dialog_info = (struct taskdialog_info *)lParam; -- 2.18.0

2 1

[PATCH v2 2/8] comctl32/taskdialog: Add support for navigating page.
by Zhiyi Zhang 13 Aug '18

13 Aug '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/taskdialog.c | 17 ++++++++++ dlls/comctl32/tests/taskdialog.c | 58 ++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index c6a3aa7ae5..efe159f891 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -1142,8 +1142,16 @@ static void taskdialog_init(struct taskdialog_info *dialog_info, HWND hwnd) taskdialog_layout(dialog_info); } +static BOOL CALLBACK takdialog_destroy_control(HWND hwnd, LPARAM lParam) +{ + DestroyWindow(hwnd); + return TRUE; +} + static void taskdialog_destroy(struct taskdialog_info *dialog_info) { + EnumChildWindows(dialog_info->hwnd, takdialog_destroy_control, 0); + if (dialog_info->taskconfig->dwFlags & TDF_CALLBACK_TIMER) KillTimer(dialog_info->hwnd, ID_TIMER); if (dialog_info->font) DeleteObject(dialog_info->font); if (dialog_info->main_instruction_font) DeleteObject(dialog_info->main_instruction_font); @@ -1167,6 +1175,15 @@ static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPAR switch (msg) { + case TDM_NAVIGATE_PAGE: + dialog_info->taskconfig = (const TASKDIALOGCONFIG *)lParam; + taskdialog_destroy(dialog_info); + taskdialog_init(dialog_info, hwnd); + taskdialog_notify(dialog_info, TDN_DIALOG_CONSTRUCTED, 0, 0); + /* Default radio button click notification is sent before TDN_NAVIGATED */ + taskdialog_check_default_radio_buttons(dialog_info); + taskdialog_notify(dialog_info, TDN_NAVIGATED, 0, 0); + break; case TDM_CLICK_BUTTON: taskdialog_click_button(dialog_info, wParam); break; diff --git a/dlls/comctl32/tests/taskdialog.c b/dlls/comctl32/tests/taskdialog.c index 8d60fb2eb8..093671c30f 100644 --- a/dlls/comctl32/tests/taskdialog.c +++ b/dlls/comctl32/tests/taskdialog.c @@ -271,6 +271,25 @@ static const struct message_info msg_return_verification_checked[] = { 0 } }; +static TASKDIALOGCONFIG navigated_info = {0}; + +static const struct message_info msg_send_navigate[] = +{ + { TDM_NAVIGATE_PAGE, 0, (LPARAM)&navigated_info, 0}, + { 0 } +}; + +static const struct message_info msg_return_navigated_page[] = +{ + { TDN_CREATED, 0, 0, S_OK, NULL }, + { TDN_RADIO_BUTTON_CLICKED, ID_START_RADIO_BUTTON, 0, S_OK, msg_send_navigate }, + { TDN_DIALOG_CONSTRUCTED, 0, 0, S_OK, NULL }, + { TDN_RADIO_BUTTON_CLICKED, ID_START_RADIO_BUTTON, 0, S_OK, NULL }, + { TDN_NAVIGATED, 0, 0, S_OK, msg_send_click_ok }, + { TDN_BUTTON_CLICKED, IDOK, 0, S_OK, NULL }, + { 0 } +}; + static void init_test_message(UINT message, WPARAM wParam, LPARAM lParam, struct message *msg) { msg->message = WM_TD_CALLBACK; @@ -682,6 +701,44 @@ static void test_verification_box(void) "default verification box: default unchecked and then checked"); } +static void test_navigate_page(void) +{ + TASKDIALOGCONFIG info = {0}; + static const WCHAR textW[] = {'t', 'e', 'x', 't', 0}; + static const WCHAR button_format[] = {'%', '0', '2', 'd', 0}; + TASKDIALOG_BUTTON radio_buttons[TEST_NUM_RADIO_BUTTONS]; + WCHAR radio_button_titles[TEST_NUM_BUTTONS * 3]; + int i; + + /* Init radio buttons */ + for (i = 0; i < TEST_NUM_RADIO_BUTTONS; i++) + { + WCHAR *text = &radio_button_titles[i * 3]; + wsprintfW(text, button_format, i); + + radio_buttons[i].pszButtonText = text; + radio_buttons[i].nButtonID = ID_START_RADIO_BUTTON + i; + } + + info.cbSize = sizeof(TASKDIALOGCONFIG); + info.pfCallback = taskdialog_callback_proc; + info.lpCallbackData = test_ref_data; + info.dwCommonButtons = TDCBF_OK_BUTTON; + info.cRadioButtons = TEST_NUM_RADIO_BUTTONS; + info.pRadioButtons = radio_buttons; + + navigated_info = info; + navigated_info.pszVerificationText = textW; + navigated_info.dwFlags = TDF_VERIFICATION_FLAG_CHECKED; + + run_test(&info, IDOK, ID_START_RADIO_BUTTON, TRUE, msg_return_navigated_page, "navigate page: default"); + + /* TDM_NAVIGATE_PAGE doesn't check cbSize. + * And null taskconfig pointer crash applicatioin, thus doesn't check pointer either */ + navigated_info.cbSize = 0; + run_test(&info, IDOK, ID_START_RADIO_BUTTON, TRUE, msg_return_navigated_page, "navigate page: invalid taskconfig cbSize"); +} + START_TEST(taskdialog) { ULONG_PTR ctx_cookie; @@ -722,6 +779,7 @@ START_TEST(taskdialog) test_timer(); test_progress_bar(); test_verification_box(); + test_navigate_page(); unload_v6_module(ctx_cookie, hCtx); } -- 2.18.0

2 1

[PATCH v2 1/8] comctl32/taskdialog: Update vertical layout only when expando button clicked.
by Zhiyi Zhang 13 Aug '18

13 Aug '18

Update vertical layout only to improve efficiency. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/taskdialog.c | 57 +++++++++++++++++++++++++++++++++++++- 1 file changed, 56 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 457a5ff9d0..c6a3aa7ae5 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -232,11 +232,66 @@ static HRESULT taskdialog_notify(struct taskdialog_info *dialog_info, UINT notif : S_OK; } +static void taskdialog_move_controls_vertically(HWND parent, HWND *controls, INT count, INT offset) +{ + RECT rect; + POINT pt; + INT i; + + for (i = 0; i < count; i++) + { + if (!controls[i]) continue; + + GetWindowRect(controls[i], &rect); + pt.x = rect.left; + pt.y = rect.top; + MapWindowPoints(HWND_DESKTOP, parent, &pt, 1); + SetWindowPos(controls[i], 0, pt.x, pt.y + offset, 0, 0, SWP_NOSIZE | SWP_NOZORDER); + } +} + static void taskdialog_toggle_expando_control(struct taskdialog_info *dialog_info) { + const TASKDIALOGCONFIG *taskconfig = dialog_info->taskconfig; + const WCHAR *text; + RECT info_rect, rect; + INT height, offset; + dialog_info->expanded = !dialog_info->expanded; + text = dialog_info->expanded ? dialog_info->expanded_text : dialog_info->collapsed_text; + SendMessageW(dialog_info->expando_button, WM_SETTEXT, 0, (LPARAM)text); ShowWindow(dialog_info->expanded_info, dialog_info->expanded ? SW_SHOWDEFAULT : SW_HIDE); - taskdialog_layout(dialog_info); + + GetWindowRect(dialog_info->expanded_info, &info_rect); + /* If expanded information starts up not expanded, call taskdialog_layout() + * to to set size for expanded information control at least once */ + if (IsRectEmpty(&info_rect)) + { + taskdialog_layout(dialog_info); + return; + } + height = info_rect.bottom - info_rect.top + dialog_info->m.v_spacing; + offset = dialog_info->expanded ? height : -height; + + /* Update vertical layout, move all controls after expanded information */ + /* Move dialog */ + GetWindowRect(dialog_info->hwnd, &rect); + SetWindowPos(dialog_info->hwnd, 0, 0, 0, rect.right - rect.left, rect.bottom - rect.top + offset, + SWP_NOMOVE | SWP_NOZORDER); + /* Move controls */ + if (!(taskconfig->dwFlags & TDF_EXPAND_FOOTER_AREA)) + { + taskdialog_move_controls_vertically(dialog_info->hwnd, &dialog_info->progress_bar, 1, offset); + taskdialog_move_controls_vertically(dialog_info->hwnd, &dialog_info->expando_button, 1, offset); + taskdialog_move_controls_vertically(dialog_info->hwnd, &dialog_info->verification_box, 1, offset); + taskdialog_move_controls_vertically(dialog_info->hwnd, &dialog_info->footer_icon, 1, offset); + taskdialog_move_controls_vertically(dialog_info->hwnd, &dialog_info->footer_text, 1, offset); + taskdialog_move_controls_vertically(dialog_info->hwnd, dialog_info->buttons, dialog_info->button_count, offset); + taskdialog_move_controls_vertically(dialog_info->hwnd, dialog_info->radio_buttons, + dialog_info->radio_button_count, offset); + taskdialog_move_controls_vertically(dialog_info->hwnd, dialog_info->command_links, + dialog_info->command_link_count, offset); + } } static void taskdialog_on_button_click(struct taskdialog_info *dialog_info, HWND hwnd) -- 2.18.0

2 1

[PATCH] dwrite: Avoid possible out-of-bounds cluster metrics access.
by Nikolay Sivov 13 Aug '18

13 Aug '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45535 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/layout.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 65e0a57678..10d591457c 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -2089,7 +2089,7 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) */ if (layout->len == 0) hr = layout_set_dummy_line_metrics(layout, 0); - else if (layout->clustermetrics[layout->cluster_count - 1].isNewline) + else if (layout->cluster_count && layout->clustermetrics[layout->cluster_count - 1].isNewline) hr = layout_set_dummy_line_metrics(layout, layout->len - 1); if (FAILED(hr)) return hr; -- 2.18.0

1 0

[resend PATCH] msxml3: Accept NormalizeAttributeValues property
by Nikolay Sivov 13 Aug '18

13 Aug '18

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/msxml3/domdoc.c | 2 ++ dlls/msxml3/tests/domdoc.c | 39 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index ddd756582b..0b917c1302 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -73,6 +73,7 @@ static const WCHAR PropValueXSLPatternW[] = {'X','S','L','P','a','t','t','e','r' static const WCHAR PropertyResolveExternalsW[] = {'R','e','s','o','l','v','e','E','x','t','e','r','n','a','l','s',0}; static const WCHAR PropertyAllowXsltScriptW[] = {'A','l','l','o','w','X','s','l','t','S','c','r','i','p','t',0}; static const WCHAR PropertyAllowDocumentFunctionW[] = {'A','l','l','o','w','D','o','c','u','m','e','n','t','F','u','n','c','t','i','o','n',0}; +static const WCHAR PropertyNormalizeAttributeValuesW[] = {'N','o','r','m','a','l','i','z','e','A','t','t','r','i','b','u','t','e','V','a','l','u','e','s',0}; /* Anything that passes the test_get_ownerDocument() * tests can go here (data shared between all instances). @@ -3108,6 +3109,7 @@ static HRESULT WINAPI domdoc_setProperty( lstrcmpiW(p, PropertyNewParserW) == 0 || lstrcmpiW(p, PropertyResolveExternalsW) == 0 || lstrcmpiW(p, PropertyAllowXsltScriptW) == 0 || + lstrcmpiW(p, PropertyNormalizeAttributeValuesW) == 0 || lstrcmpiW(p, PropertyAllowDocumentFunctionW) == 0) { /* Ignore */ diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index d5f30fec62..35fa42a6d1 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -12792,6 +12792,44 @@ static void test_transformNodeToObject(void) free_bstrs(); } +static void test_normalize_attribute_values(void) +{ + IXMLDOMDocument2 *doc; + VARIANT var; + HRESULT hr; + + if (!is_clsid_supported(&CLSID_DOMDocument60, &IID_IXMLDOMDocument2)) + { + win_skip("NormalizeAttributeValues is not supported.\n"); + return; + } + + doc = create_document_version(60, &IID_IXMLDOMDocument2); + + V_VT(&var) = VT_I2; + V_I2(&var) = 10; + hr = IXMLDOMDocument2_getProperty(doc, _bstr_("NormalizeAttributeValues"), &var); +todo_wine { + ok(hr == S_OK, "Failed to get property value, hr %#x.\n", hr); + ok(V_VT(&var) == VT_BOOL, "Unexpected property value type, vt %d.\n", V_VT(&var)); + ok(V_BOOL(&var) == VARIANT_FALSE, "Unexpected property value.\n"); +} + V_VT(&var) = VT_BOOL; + V_BOOL(&var) = VARIANT_TRUE; + hr = IXMLDOMDocument2_setProperty(doc, _bstr_("NormalizeAttributeValues"), var); + ok(hr == S_OK, "Failed to set property, hr %#x.\n", hr); + + V_VT(&var) = VT_I2; + V_I2(&var) = 10; + hr = IXMLDOMDocument2_getProperty(doc, _bstr_("NormalizeAttributeValues"), &var); +todo_wine { + ok(hr == S_OK, "Failed to get property value, hr %#x.\n", hr); + ok(V_VT(&var) == VT_BOOL, "Unexpected property value type, vt %d.\n", V_VT(&var)); + ok(V_BOOL(&var) == VARIANT_TRUE, "Unexpected property value.\n"); +} + IXMLDOMDocument2_Release(doc); +} + START_TEST(domdoc) { HRESULT hr; @@ -12875,6 +12913,7 @@ START_TEST(domdoc) test_url(); test_merging_text(); test_transformNodeToObject(); + test_normalize_attribute_values(); test_xsltemplate(); test_xsltext(); -- 2.18.0

1 0

[PATCH v2] wined3d: Decompress DXTn 3D textures on upload.
by Henri Verbeet 13 Aug '18

13 Aug '18

From: Connor McAdams <conmanx360(a)gmail.com> Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 149253. v2: Fix the maths in the comments, as pointed out by Józef. --- dlls/wined3d/resource.c | 9 ++ dlls/wined3d/texture.c | 40 ++++-- dlls/wined3d/utils.c | 286 +++++++++++++++++++++++++++++++++++++---- dlls/wined3d/wined3d_private.h | 6 + 4 files changed, 304 insertions(+), 37 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index b5dcdf012db..bf54245276a 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -477,3 +477,12 @@ void wined3d_resource_update_draw_binding(struct wined3d_resource *resource) resource->draw_binding = WINED3D_LOCATION_TEXTURE_RGB; } } + +const struct wined3d_format *wined3d_resource_get_decompress_format(struct wined3d_resource *resource, + const struct wined3d_context *context) +{ + if (resource->format_flags & (WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE) + && !(context->d3d_info->wined3d_creation_flags & WINED3D_SRGB_READ_WRITE_CONTROL)) + return wined3d_get_format(context->gl_info, WINED3DFMT_B8G8R8A8_UNORM_SRGB, resource->usage); + return wined3d_get_format(context->gl_info, WINED3DFMT_B8G8R8A8_UNORM, resource->usage); +} diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index c316906a957..ebdacfa2ee0 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1727,7 +1727,13 @@ void wined3d_texture_prepare_texture(struct wined3d_texture *texture, struct win if (texture->flags & alloc_flag) return; - if (format->conv_byte_count) + if (texture->resource.format_flags & WINED3DFMT_FLAG_DECOMPRESS) + { + TRACE("WINED3DFMT_FLAG_DECOMPRESS set.\n"); + texture->flags |= WINED3D_TEXTURE_CONVERTED; + format = wined3d_resource_get_decompress_format(&texture->resource, context); + } + else if (format->conv_byte_count) { texture->flags |= WINED3D_TEXTURE_CONVERTED; } @@ -1897,6 +1903,7 @@ void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int s void *converted_mem = NULL; struct wined3d_format f; unsigned int level; + BOOL decompress; GLenum target; TRACE("texture %p, sub_resource_idx %u, context %p, format %s, src_box %s, data {%#x:%p}, " @@ -1948,20 +1955,31 @@ void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int s bo.addr += src_box->left * format->byte_count; } - if (format->upload) + decompress = texture->resource.format_flags & WINED3DFMT_FLAG_DECOMPRESS; + if (format->upload || decompress) { + const struct wined3d_format *compressed_format = format; unsigned int dst_row_pitch, dst_slice_pitch; void *src_mem; - if (texture->resource.format_flags & WINED3DFMT_FLAG_BLOCKS) - ERR("Converting a block-based format.\n"); + if (decompress) + { + format = wined3d_resource_get_decompress_format(&texture->resource, context); + } + else + { + if (texture->resource.format_flags & WINED3DFMT_FLAG_BLOCKS) + ERR("Converting a block-based format.\n"); - f = *format; - f.byte_count = format->conv_byte_count; - format = &f; + f = *format; + f.byte_count = format->conv_byte_count; + format = &f; + } wined3d_format_calculate_pitch(format, 1, update_w, update_h, &dst_row_pitch, &dst_slice_pitch); + /* Note that uploading 3D textures may require quite some address + * space; it may make sense to upload them per-slice instead. */ if (!(converted_mem = heap_calloc(update_d, dst_slice_pitch))) { ERR("Failed to allocate upload buffer.\n"); @@ -1970,8 +1988,12 @@ void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int s src_mem = context_map_bo_address(context, &bo, src_slice_pitch, GL_PIXEL_UNPACK_BUFFER, WINED3D_MAP_READ); - format->upload(src_mem, converted_mem, src_row_pitch, src_slice_pitch, - dst_row_pitch, dst_slice_pitch, update_w, update_h, update_d); + if (decompress) + compressed_format->decompress(src_mem, converted_mem, src_row_pitch, src_slice_pitch, + dst_row_pitch, dst_slice_pitch, update_w, update_h, update_d); + else + format->upload(src_mem, converted_mem, src_row_pitch, src_slice_pitch, + dst_row_pitch, dst_slice_pitch, update_w, update_h, update_d); context_unmap_bo_address(context, &bo, GL_PIXEL_UNPACK_BUFFER); bo.buffer_object = 0; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 937c1bc0df6..283e73015cb 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -339,6 +339,230 @@ static const struct wined3d_format_base_flags format_base_flags[] = {WINED3DFMT_RESZ, WINED3DFMT_FLAG_EXTENSION}, }; +static void rgb888_from_rgb565(WORD rgb565, BYTE *r, BYTE *g, BYTE *b) +{ + BYTE c; + + /* (2⁸ - 1) / (2⁵ - 1) ≈ 2⁸ / 2⁵ + 2⁸ / 2¹⁰ + * (2⁸ - 1) / (2⁶ - 1) ≈ 2⁸ / 2⁶ + 2⁸ / 2¹² */ + c = rgb565 >> 11; + *r = (c << 3) + (c >> 2); + c = (rgb565 >> 5) & 0x3f; + *g = (c << 2) + (c >> 4); + c = rgb565 & 0x1f; + *b = (c << 3) + (c >> 2); +} + +static void build_dxtn_colour_table(WORD colour0, WORD colour1, + DWORD colour_table[4], enum wined3d_format_id format_id) +{ + unsigned int i; + struct + { + BYTE r, g, b; + } c[4]; + + rgb888_from_rgb565(colour0, &c[0].r, &c[0].g, &c[0].b); + rgb888_from_rgb565(colour1, &c[1].r, &c[1].g, &c[1].b); + + if (format_id == WINED3DFMT_BC1_UNORM && colour0 <= colour1) + { + c[2].r = (c[0].r + c[1].r) / 2; + c[2].g = (c[0].g + c[1].g) / 2; + c[2].b = (c[0].b + c[1].b) / 2; + + c[3].r = 0; + c[3].g = 0; + c[3].b = 0; + } + else + { + for (i = 0; i < 2; ++i) + { + c[i + 2].r = (2 * c[i].r + c[1 - i].r) / 3; + c[i + 2].g = (2 * c[i].g + c[1 - i].g) / 3; + c[i + 2].b = (2 * c[i].b + c[1 - i].b) / 3; + } + } + + for (i = 0; i < 4; ++i) + { + colour_table[i] = (c[i].r << 16) | (c[i].g << 8) | c[i].b; + } +} + +static void build_dxtn_alpha_table(BYTE alpha0, BYTE alpha1, BYTE alpha_table[8]) +{ + unsigned int i; + + alpha_table[0] = alpha0; + alpha_table[1] = alpha1; + + if (alpha0 > alpha1) + { + for (i = 0; i < 6; ++i) + { + alpha_table[2 + i] = ((6 - i) * alpha0 + (i + 1) * alpha1) / 7; + } + return; + } + else + { + for (i = 0; i < 4; ++i) + { + alpha_table[2 + i] = ((4 - i) * alpha0 + (i + 1) * alpha1) / 5; + } + alpha_table[6] = 0x00; + alpha_table[7] = 0xff; + } +} + +static void decompress_dxtn_block(const BYTE *src, BYTE *dst, unsigned int width, + unsigned int height, unsigned int dst_row_pitch, enum wined3d_format_id format_id) +{ + const UINT64 *s = (const UINT64 *)src; + BOOL bc1_alpha = FALSE; + DWORD colour_table[4]; + BYTE alpha_table[8]; + UINT64 alpha_bits; + DWORD colour_bits; + unsigned int x, y; + BYTE colour_idx; + DWORD *dst_row; + BYTE alpha; + + if (format_id == WINED3DFMT_BC1_UNORM) + { + WORD colour0, colour1; + + alpha_bits = 0; + + colour0 = s[0] & 0xffff; + colour1 = (s[0] >> 16) & 0xffff; + colour_bits = (s[0] >> 32) & 0xffffffff; + build_dxtn_colour_table(colour0, colour1, colour_table, format_id); + if (colour0 <= colour1) + bc1_alpha = TRUE; + } + else + { + alpha_bits = s[0]; + if (format_id == WINED3DFMT_BC3_UNORM) + { + build_dxtn_alpha_table(alpha_bits & 0xff, (alpha_bits >> 8) & 0xff, alpha_table); + alpha_bits >>= 16; + } + + colour_bits = (s[1] >> 32) & 0xffffffff; + build_dxtn_colour_table(s[1] & 0xffff, (s[1] >> 16) & 0xffff, colour_table, format_id); + } + + for (y = 0; y < height; ++y) + { + dst_row = (DWORD *)&dst[y * dst_row_pitch]; + for (x = 0; x < width; ++x) + { + colour_idx = (colour_bits >> (y * 8 + x * 2)) & 0x3; + switch (format_id) + { + case WINED3DFMT_BC1_UNORM: + alpha = bc1_alpha && colour_idx == 3 ? 0x00 : 0xff; + break; + + case WINED3DFMT_BC2_UNORM: + alpha = (alpha_bits >> (y * 16 + x * 4)) & 0xf; + /* (2⁸ - 1) / (2⁴ - 1) ≈ 2⁸ / 2⁴ + 2⁸ / 2⁸ */ + alpha |= alpha << 4; + break; + + case WINED3DFMT_BC3_UNORM: + alpha = alpha_table[(alpha_bits >> (y * 12 + x * 3)) & 0x7]; + break; + + default: + alpha = 0xff; + break; + } + dst_row[x] = (alpha << 24) | colour_table[colour_idx]; + } + } +} + +static void decompress_dxtn(const BYTE *src, BYTE *dst, unsigned int src_row_pitch, + unsigned int src_slice_pitch, unsigned int dst_row_pitch, unsigned int dst_slice_pitch, + unsigned int width, unsigned int height, unsigned int depth, enum wined3d_format_id format_id) +{ + unsigned int block_byte_count, block_w, block_h; + const BYTE *src_row, *src_slice = src; + BYTE *dst_row, *dst_slice = dst; + unsigned int x, y, z; + + block_byte_count = format_id == WINED3DFMT_BC1_UNORM ? 8 : 16; + + for (z = 0; z < depth; ++z) + { + src_row = src_slice; + dst_row = dst_slice; + for (y = 0; y < height; y += 4) + { + for (x = 0; x < width; x += 4) + { + block_w = min(width - x, 4); + block_h = min(height - y, 4); + decompress_dxtn_block(&src_row[x * (block_byte_count / 4)], + &dst_row[x * 4], block_w, block_h, dst_row_pitch, format_id); + } + src_row += src_row_pitch; + dst_row += dst_row_pitch * 4; + } + src_slice += src_slice_pitch; + dst_slice += dst_slice_pitch; + } +} + +static void decompress_bc3(const BYTE *src, BYTE *dst, unsigned int src_row_pitch, + unsigned int src_slice_pitch, unsigned int dst_row_pitch, unsigned int dst_slice_pitch, + unsigned int width, unsigned int height, unsigned int depth) +{ + decompress_dxtn(src, dst, src_row_pitch, src_slice_pitch, dst_row_pitch, + dst_slice_pitch, width, height, depth, WINED3DFMT_BC3_UNORM); +} + +static void decompress_bc2(const BYTE *src, BYTE *dst, unsigned int src_row_pitch, + unsigned int src_slice_pitch, unsigned int dst_row_pitch, unsigned int dst_slice_pitch, + unsigned int width, unsigned int height, unsigned int depth) +{ + decompress_dxtn(src, dst, src_row_pitch, src_slice_pitch, dst_row_pitch, + dst_slice_pitch, width, height, depth, WINED3DFMT_BC2_UNORM); +} + +static void decompress_bc1(const BYTE *src, BYTE *dst, unsigned int src_row_pitch, + unsigned int src_slice_pitch, unsigned int dst_row_pitch, unsigned int dst_slice_pitch, + unsigned int width, unsigned int height, unsigned int depth) +{ + decompress_dxtn(src, dst, src_row_pitch, src_slice_pitch, dst_row_pitch, + dst_slice_pitch, width, height, depth, WINED3DFMT_BC1_UNORM); +} + +static const struct wined3d_format_decompress_info +{ + enum wined3d_format_id id; + void (*decompress)(const BYTE *src, BYTE *dst, unsigned int src_row_pitch, unsigned int src_slice_pitch, + unsigned int dst_row_pitch, unsigned int dst_slice_pitch, + unsigned int width, unsigned int height, unsigned int depth); +} +format_decompress_info[] = +{ + {WINED3DFMT_DXT1, decompress_bc1}, + {WINED3DFMT_DXT2, decompress_bc2}, + {WINED3DFMT_DXT3, decompress_bc2}, + {WINED3DFMT_DXT4, decompress_bc3}, + {WINED3DFMT_DXT5, decompress_bc3}, + {WINED3DFMT_BC1_UNORM, decompress_bc1}, + {WINED3DFMT_BC2_UNORM, decompress_bc2}, + {WINED3DFMT_BC3_UNORM, decompress_bc3}, +}; + struct wined3d_format_block_info { enum wined3d_format_id id; @@ -437,6 +661,9 @@ struct wined3d_format_texture_info void (*download)(const BYTE *src, BYTE *dst, unsigned int src_row_pitch, unsigned int src_slice_pitch, unsigned int dst_row_pitch, unsigned int dst_slice_pitch, unsigned int width, unsigned int height, unsigned int depth); + void (*decompress)(const BYTE *src, BYTE *dst, unsigned int src_row_pitch, unsigned int src_slice_pitch, + unsigned int dst_row_pitch, unsigned int dst_slice_pitch, + unsigned int width, unsigned int height, unsigned int depth); }; static void convert_l4a4_unorm(const BYTE *src, BYTE *dst, UINT src_row_pitch, UINT src_slice_pitch, @@ -1897,6 +2124,34 @@ static BOOL init_format_block_info(struct wined3d_gl_info *gl_info) return TRUE; } +/* Most compressed formats are not supported for 3D textures by OpenGL. + * + * In the case of the S3TC/DXTn formats, NV_texture_compression_vtc provides + * these formats for 3D textures, but unfortunately the block layout is + * different from the one used by Direct3D. + * + * Since applications either don't check format availability at all before + * using these, or refuse to run without them, we decompress them on upload. + * + * Affected applications include "Heroes VI", "From Dust", "Halo Online" and + * "Eldorado". */ +static BOOL init_format_decompress_info(struct wined3d_gl_info *gl_info) +{ + struct wined3d_format *format; + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(format_decompress_info); ++i) + { + if (!(format = get_format_internal(gl_info, format_decompress_info[i].id))) + return FALSE; + + format->flags[WINED3D_GL_RES_TYPE_TEX_3D] |= WINED3DFMT_FLAG_DECOMPRESS; + format->decompress = format_decompress_info[i].decompress; + } + + return TRUE; +} + static GLenum wined3d_gl_type_to_enum(enum wined3d_gl_resource_type type) { switch (type) @@ -3390,34 +3645,8 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ } } - /* GL_EXT_texture_compression_s3tc does not support 3D textures. Some Windows drivers - * for dx9 GPUs support it, some do not, so not supporting DXTn volumes is OK for d3d9. - * - * Note that GL_NV_texture_compression_vtc adds this functionality to OpenGL, but the - * block layout is not compatible with the one used by d3d. See volume_dxt5_test. */ - idx = get_format_idx(WINED3DFMT_DXT1); - gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; - idx = get_format_idx(WINED3DFMT_DXT2); - gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; - idx = get_format_idx(WINED3DFMT_DXT3); - gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; - idx = get_format_idx(WINED3DFMT_DXT4); - gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; - idx = get_format_idx(WINED3DFMT_DXT5); - gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; - idx = get_format_idx(WINED3DFMT_BC1_UNORM); - gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; - idx = get_format_idx(WINED3DFMT_BC1_UNORM_SRGB); - gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; - idx = get_format_idx(WINED3DFMT_BC2_UNORM); - gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; - idx = get_format_idx(WINED3DFMT_BC2_UNORM_SRGB); - gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; - idx = get_format_idx(WINED3DFMT_BC3_UNORM); - gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; - idx = get_format_idx(WINED3DFMT_BC3_UNORM_SRGB); - gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; - /* Similarly with ATI1N / ATI2N and GL_ARB_texture_compression_rgtc. */ + /* These formats are not supported for 3D textures. See also + * WINED3DFMT_FLAG_DECOMPRESS. */ idx = get_format_idx(WINED3DFMT_ATI1N); gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; idx = get_format_idx(WINED3DFMT_ATI2N); @@ -3742,6 +3971,7 @@ BOOL wined3d_adapter_init_format_info(struct wined3d_adapter *adapter, struct wi if (!init_format_base_info(gl_info)) return FALSE; if (!init_format_block_info(gl_info)) goto fail; + if (!init_format_decompress_info(gl_info)) goto fail; if (!ctx) /* WINED3D_NO3D */ return TRUE; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ece41ebd06c..25f7cb2416e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3081,6 +3081,8 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * void resource_unload(struct wined3d_resource *resource) DECLSPEC_HIDDEN; BOOL wined3d_resource_allocate_sysmem(struct wined3d_resource *resource) DECLSPEC_HIDDEN; void wined3d_resource_free_sysmem(struct wined3d_resource *resource) DECLSPEC_HIDDEN; +const struct wined3d_format *wined3d_resource_get_decompress_format(struct wined3d_resource *resource, + const struct wined3d_context *context) DECLSPEC_HIDDEN; GLbitfield wined3d_resource_gl_map_flags(DWORD d3d_flags) DECLSPEC_HIDDEN; GLenum wined3d_resource_gl_legacy_map_flags(DWORD d3d_flags) DECLSPEC_HIDDEN; BOOL wined3d_resource_is_offscreen(struct wined3d_resource *resource) DECLSPEC_HIDDEN; @@ -4231,6 +4233,7 @@ extern enum wined3d_format_id pixelformat_for_depth(DWORD depth) DECLSPEC_HIDDEN #define WINED3DFMT_FLAG_EXTENSION 0x00000020 #define WINED3DFMT_FLAG_FBO_ATTACHABLE 0x00000040 #define WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB 0x00000080 +#define WINED3DFMT_FLAG_DECOMPRESS 0x00000100 #define WINED3DFMT_FLAG_FLOAT 0x00000200 #define WINED3DFMT_FLAG_BUMPMAP 0x00000400 #define WINED3DFMT_FLAG_SRGB_READ 0x00000800 @@ -4304,6 +4307,9 @@ struct wined3d_format void (*download)(const BYTE *src, BYTE *dst, unsigned int src_row_pitch, unsigned int src_slice_pitch, unsigned int dst_row_pitch, unsigned dst_slice_pitch, unsigned int width, unsigned int height, unsigned int depth); + void (*decompress)(const BYTE *src, BYTE *dst, unsigned int src_row_pitch, unsigned int src_slice_pitch, + unsigned int dst_row_pitch, unsigned dst_slice_pitch, + unsigned int width, unsigned int height, unsigned int depth); enum wined3d_format_id typeless_id; GLenum gl_view_class; -- 2.11.0

4 3

[PATCH 02/11] dxgi: Set transfer image usage for Vulkan swapchain images.
by Józef Kucia 12 Aug '18

12 Aug '18

For CopyTextureRegion() on swapchain buffers. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 90f72d06e87a..3537f117d1b6 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1624,6 +1624,7 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI unsigned int image_count, i, j; VkFenceCreateInfo fence_desc; uint32_t queue_family_index; + VkImageUsageFlags usage; VkInstance vk_instance; VkBool32 supported; VkDevice vk_device; @@ -1738,6 +1739,12 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI goto fail; } + usage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; + usage |= surface_caps.supportedUsageFlags & VK_IMAGE_USAGE_TRANSFER_SRC_BIT; + usage |= surface_caps.supportedUsageFlags & VK_IMAGE_USAGE_TRANSFER_DST_BIT; + if (!(usage & VK_IMAGE_USAGE_TRANSFER_SRC_BIT) || !(usage & VK_IMAGE_USAGE_TRANSFER_DST_BIT)) + WARN("Transfer not supported for swapchain images.\n"); + vk_swapchain_desc.sType = VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR; vk_swapchain_desc.pNext = NULL; vk_swapchain_desc.flags = 0; @@ -1748,7 +1755,7 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI vk_swapchain_desc.imageExtent.width = swapchain_desc->Width; vk_swapchain_desc.imageExtent.height = swapchain_desc->Height; vk_swapchain_desc.imageArrayLayers = 1; - vk_swapchain_desc.imageUsage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; + vk_swapchain_desc.imageUsage = usage; vk_swapchain_desc.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE; vk_swapchain_desc.queueFamilyIndexCount = 0; vk_swapchain_desc.pQueueFamilyIndices = NULL; -- 2.16.4

3 2

[PATCH 3/3] ddraw/tests: Fix IDirectDraw leaks.
by Józef Kucia 12 Aug '18

12 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/ddraw/tests/ddraw1.c | 3 ++- dlls/ddraw/tests/ddraw2.c | 3 ++- dlls/ddraw/tests/ddraw4.c | 3 ++- dlls/ddraw/tests/ddraw7.c | 1 + 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 39e7d109438b..eafcd38f72ca 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -11707,8 +11707,9 @@ static void test_viewport(void) IDirect3DDevice_DeleteMatrix(device, proj_handle); destroy_material(black_background); refcount = IDirect3DDevice_Release(device); - IDirect3D2_Release(d3d); ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D2_Release(d3d); + IDirectDraw_Release(ddraw); DestroyWindow(window); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 9e2107cda43c..0a4750a8911d 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -12989,8 +12989,9 @@ static void test_viewport(void) destroy_material(black_background); refcount = IDirect3DDevice2_Release(device); - IDirect3D2_Release(d3d); ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D2_Release(d3d); + IDirectDraw2_Release(ddraw); DestroyWindow(window); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index cc77eea4a99f..b89d752606ef 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -15083,8 +15083,9 @@ static void test_viewport(void) } refcount = IDirect3DDevice3_Release(device); - IDirect3D3_Release(d3d); ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D3_Release(d3d); + IDirectDraw4_Release(ddraw); DestroyWindow(window); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 501c9a184e28..0fddc82ed9a7 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -14399,6 +14399,7 @@ static void test_viewport(void) refcount = IDirect3DDevice7_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); + IDirectDraw7_Release(ddraw); DestroyWindow(window); } -- 2.16.4

4 3

[PATCH 01/11] dxgi: Stub DXGIGetDebugInterface1().
by Józef Kucia 12 Aug '18

12 Aug '18

From: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/dxgi.spec | 1 + dlls/dxgi/dxgi_main.c | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/dlls/dxgi/dxgi.spec b/dlls/dxgi/dxgi.spec index 801e6a4283c0..67a345dc3764 100644 --- a/dlls/dxgi/dxgi.spec +++ b/dlls/dxgi/dxgi.spec @@ -3,3 +3,4 @@ @ stdcall CreateDXGIFactory2(long ptr ptr) @ stdcall DXGID3D10CreateDevice(ptr ptr ptr long ptr long ptr) @ stdcall DXGID3D10RegisterLayers(ptr long) +@ stdcall DXGIGetDebugInterface1(long ptr ptr) diff --git a/dlls/dxgi/dxgi_main.c b/dlls/dxgi/dxgi_main.c index df8761bdce09..cd2c39f4e14d 100644 --- a/dlls/dxgi/dxgi_main.c +++ b/dlls/dxgi/dxgi_main.c @@ -248,3 +248,11 @@ HRESULT WINAPI DXGID3D10RegisterLayers(const struct dxgi_device_layer *layers, U return S_OK; } + +HRESULT WINAPI DXGIGetDebugInterface1(UINT flags, REFIID iid, void **debug) +{ + TRACE("flags %#x, iid %s, debug %p.\n", flags, debugstr_guid(iid), debug); + + WARN("Returning E_NOINTERFACE.\n"); + return E_NOINTERFACE; +} -- 2.16.4

3 2

[PATCH 09/12] wined3d: Fix WINED3D_MCS_COLOR2 handling in wined3d_ffp_get_vs_settings().
by Henri Verbeet 12 Aug '18

12 Aug '18

From: Stefan Dösinger <stefan(a)codeweavers.com> WINED3D_MCS_COLOR2 requires specular colour, and does not require diffuse colour. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/utils.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index bac52022510..a4181d8572d 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -6077,6 +6077,16 @@ int wined3d_ffp_frag_program_key_compare(const void *key, const struct wine_rb_e return memcmp(ka, kb, sizeof(*ka)); } +static enum wined3d_material_color_source validate_material_colour_source(WORD use_map, + enum wined3d_material_color_source source) +{ + if (source == WINED3D_MCS_COLOR1 && use_map & (1u << WINED3D_FFP_DIFFUSE)) + return source; + if (source == WINED3D_MCS_COLOR2 && use_map & (1u << WINED3D_FFP_SPECULAR)) + return source; + return WINED3D_MCS_MATERIAL; +} + void wined3d_ffp_get_vs_settings(const struct wined3d_context *context, const struct wined3d_state *state, struct wined3d_ffp_vs_settings *settings) { @@ -6141,12 +6151,16 @@ void wined3d_ffp_get_vs_settings(const struct wined3d_context *context, settings->point_size = state->gl_primitive_type == GL_POINTS; settings->per_vertex_point_size = !!(si->use_map & 1u << WINED3D_FFP_PSIZE); - if (state->render_states[WINED3D_RS_COLORVERTEX] && (si->use_map & (1u << WINED3D_FFP_DIFFUSE))) + if (state->render_states[WINED3D_RS_COLORVERTEX]) { - settings->diffuse_source = state->render_states[WINED3D_RS_DIFFUSEMATERIALSOURCE]; - settings->emissive_source = state->render_states[WINED3D_RS_EMISSIVEMATERIALSOURCE]; - settings->ambient_source = state->render_states[WINED3D_RS_AMBIENTMATERIALSOURCE]; - settings->specular_source = state->render_states[WINED3D_RS_SPECULARMATERIALSOURCE]; + settings->diffuse_source = validate_material_colour_source(si->use_map, + state->render_states[WINED3D_RS_DIFFUSEMATERIALSOURCE]); + settings->emissive_source = validate_material_colour_source(si->use_map, + state->render_states[WINED3D_RS_EMISSIVEMATERIALSOURCE]); + settings->ambient_source = validate_material_colour_source(si->use_map, + state->render_states[WINED3D_RS_AMBIENTMATERIALSOURCE]); + settings->specular_source = validate_material_colour_source(si->use_map, + state->render_states[WINED3D_RS_SPECULARMATERIALSOURCE]); } else { -- 2.11.0

2 1

[PATCH 07/12] wined3d: Invalidate the FFP vertex shader when diffuse/specular attribute presence changes.
by Henri Verbeet 12 Aug '18

12 Aug '18

Debugged by Andy Clayton. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 12 +++++++++++- dlls/wined3d/wined3d_private.h | 6 ++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0c73aba8111..d38ba2bcf06 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -11692,6 +11692,8 @@ static void glsl_vertex_pipe_vdecl(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_info *gl_info = context->gl_info; + BOOL specular = !!(context->stream_info.use_map & (1u << WINED3D_FFP_SPECULAR)); + BOOL diffuse = !!(context->stream_info.use_map & (1u << WINED3D_FFP_DIFFUSE)); BOOL normal = !!(context->stream_info.use_map & (1u << WINED3D_FFP_NORMAL)); const BOOL legacy_clip_planes = needs_legacy_glsl_syntax(gl_info); BOOL transformed = context->stream_info.position_transformed; @@ -11724,8 +11726,14 @@ static void glsl_vertex_pipe_vdecl(struct wined3d_context *context, /* Because of settings->texcoords, we have to regenerate the vertex * shader on a vdecl change if there aren't enough varyings to just - * always output all the texture coordinates. */ + * always output all the texture coordinates. + * + * Likewise, we have to invalidate the shader when using per-vertex + * colours and diffuse/specular attribute presence changes, or when + * normal presence changes. */ if (gl_info->limits.glsl_varyings < wined3d_max_compat_varyings(gl_info) + || (state->render_states[WINED3D_RS_COLORVERTEX] + && (diffuse != context->last_was_diffuse || specular != context->last_was_specular)) || normal != context->last_was_normal) context->shader_update_mask |= 1u << WINED3D_SHADER_TYPE_VERTEX; @@ -11748,6 +11756,8 @@ static void glsl_vertex_pipe_vdecl(struct wined3d_context *context, } context->last_was_vshader = use_vs(state); + context->last_was_diffuse = diffuse; + context->last_was_specular = specular; context->last_was_normal = normal; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 25f7cb2416e..39bb06ad265 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1879,6 +1879,8 @@ struct wined3d_context DWORD last_swizzle_map : 16; /* MAX_ATTRIBS, 16 */ DWORD last_was_pshader : 1; DWORD last_was_vshader : 1; + DWORD last_was_diffuse : 1; + DWORD last_was_specular : 1; DWORD last_was_normal : 1; DWORD namedArraysLoaded : 1; DWORD last_was_ffp_blit : 1; @@ -1886,7 +1888,6 @@ struct wined3d_context DWORD last_was_ckey : 1; DWORD fog_coord : 1; DWORD fog_enabled : 1; - DWORD num_untracked_materials : 2; /* Max value 2 */ DWORD current : 1; DWORD destroyed : 1; DWORD valid : 1; @@ -1911,7 +1912,8 @@ struct wined3d_context DWORD transform_feedback_paused : 1; DWORD shader_update_mask : 6; /* WINED3D_SHADER_TYPE_COUNT, 6 */ DWORD clip_distance_mask : 8; /* MAX_CLIP_DISTANCES, 8 */ - DWORD padding : 9; + DWORD num_untracked_materials : 2; /* Max value 2 */ + DWORD padding : 7; DWORD constant_update_mask; DWORD numbered_array_mask; -- 2.11.0

2 1

[PATCH 03/12] wined3d: Clarify a TRACE in buffer_init().
by Henri Verbeet 12 Aug '18

12 Aug '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/buffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 181be6bbe48..7e5feb23262 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1371,7 +1371,7 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device /* SWvp and managed buffers always return the same pointer in buffer * maps and retain data in DISCARD maps. Keep a system memory copy of * the buffer to provide the same behavior to the application. */ - TRACE("Using doublebuffer mode.\n"); + TRACE("Pinning system memory.\n"); buffer->flags |= WINED3D_BUFFER_PIN_SYSMEM; } -- 2.11.0

2 1

[PATCH] shell32: Support BYREF index in FolderItems::Item().
by Nikolay Sivov 12 Aug '18

12 Aug '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/shell32/shelldispatch.c | 17 ++++++++++++----- dlls/shell32/tests/shelldispatch.c | 18 +++++++++++++++++- 2 files changed, 29 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index 2835fad712..c6d1dab7f6 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -1129,19 +1129,24 @@ static HRESULT WINAPI FolderItemsImpl_get_Parent(FolderItems3 *iface, IDispatch return E_NOTIMPL; } -static HRESULT WINAPI FolderItemsImpl_Item(FolderItems3 *iface, VARIANT index, FolderItem **item) +static HRESULT WINAPI FolderItemsImpl_Item(FolderItems3 *iface, VARIANT var, FolderItem **item) { FolderItemsImpl *This = impl_from_FolderItems(iface); BSTR display_name = NULL; + VARIANT index; HRESULT hr; - TRACE("(%p,%s,%p)\n", iface, debugstr_variant(&index), item); + TRACE("(%p,%s,%p)\n", iface, debugstr_variant(&var), item); *item = NULL; if (!shellfolder_exists(This->folder->path)) return S_FALSE; + VariantInit(&index); + if (FAILED(hr = VariantCopyInd(&index, &var))) + return hr; + switch (V_VT(&index)) { case VT_I2: @@ -1163,8 +1168,9 @@ static HRESULT WINAPI FolderItemsImpl_Item(FolderItems3 *iface, VARIANT index, F if (!V_BSTR(&index)) return S_FALSE; - if (FAILED(hr = IShellFolder2_ParseDisplayName(This->folder->folder, NULL, NULL, V_BSTR(&index), - NULL, &pidl, NULL))) + hr = IShellFolder2_ParseDisplayName(This->folder->folder, NULL, NULL, V_BSTR(&index), NULL, &pidl, NULL); + VariantClear(&index); + if (FAILED(hr)) return S_FALSE; if (IShellFolder2_GetDisplayNameOf(This->folder->folder, pidl, SHGDN_FORPARSING, &strret) == S_OK) @@ -1176,7 +1182,8 @@ static HRESULT WINAPI FolderItemsImpl_Item(FolderItems3 *iface, VARIANT index, F break; default: - FIXME("Index type %d not handled.\n", V_VT(&index)); + FIXME("Index type %#x not handled.\n", V_VT(&index)); + VariantClear(&index); /* fall through */ case VT_EMPTY: return E_NOTIMPL; diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 30c8291f58..5191d5e970 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -382,7 +382,7 @@ static void test_items(void) FolderItems3 *items3 = NULL; FolderItem *item = (FolderItem*)0xdeadbeef, *item2; FolderItemVerbs *verbs = (FolderItemVerbs*)0xdeadbeef; - VARIANT var, int_index, str_index, str_index2; + VARIANT var, var2, int_index, str_index, str_index2; IDispatch *disp, *disp2; LONG count = -1; IUnknown *unk; @@ -543,12 +543,14 @@ static void test_items(void) ok(r == S_OK, "FolderItems::get_Count failed: %08x\n", r); ok(count == ARRAY_SIZE(file_defs), "got %d files\n", count); + /* VT_EMPTY */ V_VT(&var) = VT_EMPTY; item = (FolderItem*)0xdeadbeef; r = FolderItems_Item(items, var, &item); ok(r == E_NOTIMPL, "expected E_NOTIMPL, got %08x\n", r); ok(!item, "item is not null\n"); + /* VT_I2 */ V_VT(&var) = VT_I2; V_I2(&var) = 0; @@ -571,6 +573,20 @@ static void test_items(void) FolderItem_Release(item); + /* VT_VARIANT | VT_BYREF */ + V_VT(&var2) = VT_I2; + V_I2(&var2) = 0; + + V_VT(&var) = VT_BYREF | VT_VARIANT; + V_VARIANTREF(&var) = &var2; + + item = NULL; + r = FolderItems_Item(items, var, &item); + ok(r == S_OK, "FolderItems::Item failed: %08x\n", r); + ok(!!item, "item is null\n"); + FolderItem_Release(item); + + /* VT_I4 */ V_VT(&var) = VT_I4; V_I4(&var) = 0; item = NULL; -- 2.18.0

1 0

[PATCH] comctl32: Fix background and text color for DrawStatusText().
by Nikolay Sivov 12 Aug '18

12 Aug '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/commctrl.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index 1117ec43e9..45b93bdc8b 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -487,20 +487,24 @@ void WINAPI DrawStatusTextW (HDC hdc, LPCRECT lprc, LPCWSTR text, UINT style) { RECT r = *lprc; UINT border = BDR_SUNKENOUTER; + COLORREF oldbkcolor; if (style & SBT_POPOUT) border = BDR_RAISEDOUTER; else if (style & SBT_NOBORDERS) border = 0; - DrawEdge (hdc, &r, border, BF_RECT|BF_ADJUST); + oldbkcolor = SetBkColor (hdc, comctl32_color.clrBtnFace); + DrawEdge (hdc, &r, border, BF_MIDDLE|BF_RECT|BF_ADJUST); /* now draw text */ if (text) { int oldbkmode = SetBkMode (hdc, TRANSPARENT); + COLORREF oldtextcolor; UINT align = DT_LEFT; int strCnt = 0; + oldtextcolor = SetTextColor (hdc, comctl32_color.clrBtnText); if (style & SBT_RTLREADING) FIXME("Unsupported RTL style!\n"); r.left += 3; @@ -520,8 +524,11 @@ void WINAPI DrawStatusTextW (HDC hdc, LPCRECT lprc, LPCWSTR text, UINT style) } while(*text++); if (strCnt) DrawTextW (hdc, text - strCnt, -1, &r, align|DT_VCENTER|DT_SINGLELINE|DT_NOPREFIX); - SetBkMode(hdc, oldbkmode); + SetBkMode (hdc, oldbkmode); + SetTextColor (hdc, oldtextcolor); } + + SetBkColor (hdc, oldbkcolor); } -- 2.18.0

1 0

[PATCH] comctl32/header: Fix item text color.
by Nikolay Sivov 12 Aug '18

12 Aug '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/header.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index a48530d888..d6f8d3a4d7 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -389,7 +389,7 @@ HEADER_DrawItem (HEADER_INFO *infoPtr, HDC hdc, INT iItem, BOOL bHotTrack, LRESU state = (phdi->bDown) ? HIS_PRESSED : (bHotTrack ? HIS_HOT : HIS_NORMAL); /* Set the colors before sending NM_CUSTOMDRAW so that it can change them */ - SetTextColor(hdc, (bHotTrack && !theme) ? COLOR_HIGHLIGHT : COLOR_BTNTEXT); + SetTextColor(hdc, (bHotTrack && !theme) ? comctl32_color.clrHighlight : comctl32_color.clrBtnText); SetBkColor(hdc, comctl32_color.clr3dFace); if (lCDFlags & CDRF_NOTIFYITEMDRAW && !(phdi->fmt & HDF_OWNERDRAW)) -- 2.18.0

1 0

[PATCH] comctl32/tests: More tests for HTREEITEM layout.
by Nikolay Sivov 12 Aug '18

12 Aug '18

Based on research by Zhiyi Zhang. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/tests/treeview.c | 72 +++++++++++++++++++++++++++------- 1 file changed, 58 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 33edaaf4b4..14d814d8e0 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -2175,20 +2175,64 @@ struct _ITEM_DATA HTREEITEM parent; /* for root value of parent field is unidetified */ HTREEITEM nextsibling; HTREEITEM firstchild; + void *unk[2]; + DWORD unk2; + WORD pad; + WORD width; }; -static void _check_item(HTREEITEM item, HTREEITEM parent, HTREEITEM nextsibling, HTREEITEM firstchild, int line) +struct _ITEM_DATA_V6 { - struct _ITEM_DATA *data = (struct _ITEM_DATA*)item; + HTREEITEM parent; /* for root value of parent field is unidetified */ + HTREEITEM nextsibling; + HTREEITEM firstchild; + void *unk[3]; + DWORD unk2[2]; + WORD pad; + WORD width; +}; - ok_(__FILE__, line)(data->parent == parent, "parent %p, got %p\n", parent, data->parent); - ok_(__FILE__, line)(data->nextsibling == nextsibling, "sibling %p, got %p\n", nextsibling, data->nextsibling); - ok_(__FILE__, line)(data->firstchild == firstchild, "firstchild %p, got %p\n", firstchild, data->firstchild); +static void _check_item(HWND hwnd, HTREEITEM item, BOOL is_version_6, int line) +{ + struct _ITEM_DATA *data = (struct _ITEM_DATA *)item; + HTREEITEM parent, nextsibling, firstchild, root; + RECT rect; + BOOL ret; + + root = (HTREEITEM)SendMessageA(hwnd, TVM_GETNEXTITEM, TVGN_ROOT, (LPARAM)item); + parent = (HTREEITEM)SendMessageA(hwnd, TVM_GETNEXTITEM, TVGN_PARENT, (LPARAM)item); + nextsibling = (HTREEITEM)SendMessageA(hwnd, TVM_GETNEXTITEM, TVGN_NEXT, (LPARAM)item); + firstchild = (HTREEITEM)SendMessageA(hwnd, TVM_GETNEXTITEM, TVGN_CHILD, (LPARAM)item); + + *(HTREEITEM*)&rect = item; + ret = SendMessageA(hwnd, TVM_GETITEMRECT, TRUE, (LPARAM)&rect); + + ok_(__FILE__, line)(item == root ? data->parent != NULL : data->parent == parent, + "Unexpected parent item %p, got %p, %p\n", parent, data->parent, hwnd); + ok_(__FILE__, line)(data->nextsibling == nextsibling, "Unexpected sibling %p, got %p\n", + nextsibling, data->nextsibling); + ok_(__FILE__, line)(data->firstchild == firstchild, "Unexpected first child %p, got %p\n", + firstchild, data->firstchild); + if (ret) + { + WORD width; + + if (is_version_6) + { + struct _ITEM_DATA_V6 *data_v6 = (struct _ITEM_DATA_V6 *)item; + width = data_v6->width; + } + else + width = data->width; + todo_wine + ok_(__FILE__, line)(width == (rect.right - rect.left), "Width %d, rect width %d.\n", + width, rect.right - rect.left); + } } -#define check_item(a, b, c, d) _check_item(a, b, c, d, __LINE__) +#define CHECK_ITEM(a, b) _check_item(a, b, is_version_6, __LINE__) -static void test_htreeitem_layout(void) +static void test_htreeitem_layout(BOOL is_version_6) { TVINSERTSTRUCTA ins; HTREEITEM item1, item2; @@ -2198,27 +2242,27 @@ static void test_htreeitem_layout(void) fill_tree(hTree); /* root has some special pointer in parent field */ - check_item(hRoot, ((struct _ITEM_DATA*)hRoot)->parent, 0, hChild); - check_item(hChild, hRoot, 0, 0); + CHECK_ITEM(hTree, hRoot); + CHECK_ITEM(hTree, hChild); ins.hParent = hChild; ins.hInsertAfter = TVI_FIRST; U(ins).item.mask = 0; item1 = TreeView_InsertItemA(hTree, &ins); - check_item(item1, hChild, 0, 0); + CHECK_ITEM(hTree, item1); ins.hParent = hRoot; ins.hInsertAfter = TVI_FIRST; U(ins).item.mask = 0; item2 = TreeView_InsertItemA(hTree, &ins); - check_item(item2, hRoot, hChild, 0); + CHECK_ITEM(hTree, item2); SendMessageA(hTree, TVM_DELETEITEM, 0, (LPARAM)hChild); /* without children now */ - check_item(hRoot, ((struct _ITEM_DATA*)hRoot)->parent, 0, item2); + CHECK_ITEM(hTree, hRoot); DestroyWindow(hTree); } @@ -2870,7 +2914,7 @@ START_TEST(treeview) test_WM_PAINT(); test_delete_items(); test_cchildren(); - test_htreeitem_layout(); + test_htreeitem_layout(FALSE); test_TVS_CHECKBOXES(); test_TVM_GETNEXTITEM(); test_TVM_HITTEST(); @@ -2907,7 +2951,7 @@ START_TEST(treeview) test_treeview_classinfo(); test_delete_items(); test_cchildren(); - test_htreeitem_layout(); + test_htreeitem_layout(TRUE); test_TVM_GETNEXTITEM(); test_TVM_HITTEST(); test_WM_GETDLGCODE(); -- 2.18.0

2 1

[PATCH] wmp/tests: Fix a minor leak on error path (Coverity)
by Nikolay Sivov 12 Aug '18

12 Aug '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/wmp/tests/media.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wmp/tests/media.c b/dlls/wmp/tests/media.c index 218b80f1e6..aeca6180b0 100644 --- a/dlls/wmp/tests/media.c +++ b/dlls/wmp/tests/media.c @@ -309,7 +309,7 @@ static BOOL test_wmp(void) LONG progress; IWMPMedia *media; static const WCHAR currentPosition[] = {'c','u','r','r','e','n','t','P','o','s','i','t','i','o','n',0}; - BSTR bstrcurrentPosition = SysAllocString(currentPosition); + BSTR bstrcurrentPosition; hres = CoCreateInstance(&CLSID_WindowsMediaPlayer, NULL, CLSCTX_INPROC_SERVER, &IID_IOleObject, (void**)&oleobj); if(hres == REGDB_E_CLASSNOTREG) { @@ -344,6 +344,7 @@ static BOOL test_wmp(void) ok(hres == S_OK, "get_controls failed: %08x\n", hres); ok(controls != NULL, "controls = NULL\n"); + bstrcurrentPosition = SysAllocString(currentPosition); hres = IWMPControls_get_isAvailable(controls, bstrcurrentPosition, &vbool); ok(hres == S_OK, "IWMPControls_get_isAvailable failed: %08x\n", hres); ok(vbool == VARIANT_FALSE, "unexpected value\n"); -- 2.18.0

1 0

[PATCH vkd3d v3 1/7] vkd3d: Fix pthread_setname_np(3) call on Mac OS.
by Chip Davis 10 Aug '18

10 Aug '18

That function exists on Mac, but it only takes a single argument, the thread's new name. That's OK for our purposes, since we were calling it on pthread_self anyhow. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- Notes: Try 2: Pull the pthread_setname_np(3) call into a header. Try 3: Detect which variant of pthread_setname_np(3) we have at configure time. configure.ac | 28 ++++++++++++++++++++++++++++ libs/vkd3d/command.c | 4 +--- libs/vkd3d/vkd3d_private.h | 11 +++++++++++ 3 files changed, 40 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 2773a15..973105b 100644 --- a/configure.ac +++ b/configure.ac @@ -94,6 +94,34 @@ VKD3D_CHECK_FUNC([HAVE_SYNC_ADD_AND_FETCH], [__sync_add_and_fetch], [__sync_add_ VKD3D_CHECK_FUNC([HAVE_SYNC_SUB_AND_FETCH], [__sync_sub_and_fetch], [__sync_sub_and_fetch((int *)0, 0)]) VKD3D_CHECK_LIB_FUNCS([pthread_setname_np], [$PTHREAD_LIBS]) +AS_IF([test "x$ac_cv_func_pthread_setname_np" = xyes], + [AC_MSG_CHECKING([which variant of pthread_setname_np is present]) + AC_CACHE_VAL([vkd3d_cv_pthread_setname_np_variant], + [vkd3d_cv_pthread_setname_np_variant=unknown + AC_COMPILE_IFELSE([AC_LANG_PROGRAM( + [#ifdef HAVE_PTHREAD_H + #include <pthread.h> + #endif + ], + [pthread_setname_np(pthread_self(), "conftest");])], + [vkd3d_cv_pthread_setname_np_variant=twoarg], + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM( + [#ifdef HAVE_PTHREAD_H + #include <pthread.h> + #endif + ], + [pthread_setname_np("conftest");])], + [vkd3d_cv_pthread_setname_np_variant=onearg])])]) + AS_CASE(["$vkd3d_cv_pthread_setname_np_variant"], + [onearg], + [AC_DEFINE([HAVE_PTHREAD_SETNAME_NP_ONEARG], [1], + [Define to 1 if you have the version of pthread_setname_np(3) that only accepts a name.]) + AC_MSG_RESULT([name only])], + [twoarg], + [AC_DEFINE([HAVE_PTHREAD_SETNAME_NP_TWOARG], [1], + [Define to 1 if you have the version of pthread_setname_np(3) that accepts a pthread handle and name.]) + AC_MSG_RESULT([pthread handle and name])], + [AC_MSG_RESULT([unknown])])]) AM_CONDITIONAL([HAVE_WIDL], [test "x$WIDL" != "xno"]) AM_CONDITIONAL([HAVE_CROSSTARGET32], [test "x$CROSSTARGET32" != "xno"]) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 4db9967..042d2f1 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -199,9 +199,7 @@ static void *vkd3d_fence_worker_main(void *arg) struct vkd3d_fence_worker *worker = arg; int rc; -#ifdef HAVE_PTHREAD_SETNAME_NP - pthread_setname_np(pthread_self(), "vkd3d_worker"); -#endif + vkd3d_set_thread_name("vkd3d_worker"); for (;;) { diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 8efb930..ca9fbaf 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -86,6 +86,17 @@ struct vkd3d_vulkan_info VkPhysicalDeviceSparseProperties sparse_properties; }; +static inline void vkd3d_set_thread_name(const char *name) +{ +#ifdef HAVE_PTHREAD_SETNAME_NP +#ifdef HAVE_PTHREAD_SETNAME_NP_ONEARG + pthread_setname_np(name); +#elif defined(HAVE_PTHREAD_SETNAME_NP_TWOARG) + pthread_setname_np(pthread_self(), name); +#endif +#endif +} + struct vkd3d_instance { VkInstance vk_instance; -- 2.18.0

3 15

[PATCH 1/3] kernel32: Implement stub for SetProcessMitigationPolicy
by Fabian Maurer 10 Aug '18

10 Aug '18

This is needed by x64 chromium sandbox for >= win8. Not doing anything but returning true is enough to make it work, though security won't be perfect. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- ...api-ms-win-core-processthreads-l1-1-1.spec | 2 +- ...api-ms-win-core-processthreads-l1-1-2.spec | 2 +- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/process.c | 10 ++++++++++ dlls/kernelbase/kernelbase.spec | 2 +- include/winnt.h | 19 +++++++++++++++++++ 6 files changed, 33 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec b/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec index ebbe55fe68..616fa63909 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec @@ -44,7 +44,7 @@ @ stdcall ResumeThread(long) kernel32.ResumeThread @ stdcall SetPriorityClass(long long) kernel32.SetPriorityClass @ stdcall SetProcessAffinityUpdateMode(long long) kernel32.SetProcessAffinityUpdateMode -@ stub SetProcessMitigationPolicy +@ stdcall SetProcessMitigationPolicy(long ptr long) kernel32.SetProcessMitigationPolicy @ stdcall SetProcessShutdownParameters(long long) kernel32.SetProcessShutdownParameters @ stdcall SetThreadContext(long ptr) kernel32.SetThreadContext @ stdcall SetThreadIdealProcessorEx(long ptr ptr) kernel32.SetThreadIdealProcessorEx diff --git a/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec b/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec index db94c2e5e7..8de6c5b66c 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec @@ -49,7 +49,7 @@ @ stdcall ResumeThread(long) kernel32.ResumeThread @ stdcall SetPriorityClass(long long) kernel32.SetPriorityClass @ stdcall SetProcessAffinityUpdateMode(long long) kernel32.SetProcessAffinityUpdateMode -@ stub SetProcessMitigationPolicy +@ stdcall SetProcessMitigationPolicy(long ptr long) kernel32.SetProcessMitigationPolicy @ stdcall SetProcessPriorityBoost(long long) kernel32.SetProcessPriorityBoost @ stdcall SetProcessShutdownParameters(long long) kernel32.SetProcessShutdownParameters @ stdcall SetThreadContext(long ptr) kernel32.SetThreadContext diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index de6f007999..812ffc6ad4 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1427,6 +1427,7 @@ @ stdcall SetProcessAffinityMask(long long) @ stdcall SetProcessAffinityUpdateMode(long long) @ stdcall SetProcessDEPPolicy(long) +@ stdcall SetProcessMitigationPolicy(long ptr long) # @ stub SetProcessPreferredUILanguages @ stdcall SetProcessPriorityBoost(long long) @ stdcall SetProcessShutdownParameters(long long) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 4e6ba1118e..a2801df874 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -4389,3 +4389,13 @@ BOOL WINAPI BaseFlushAppcompatCache(void) SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +/********************************************************************** + * SetProcessMitigationPolicy (KERNEL32.@) + */ +BOOL WINAPI SetProcessMitigationPolicy(PROCESS_MITIGATION_POLICY migitation_policy, void *buffer, SIZE_T length) +{ + FIXME("(%d, %p, %lu): stub\n", migitation_policy, buffer, length); + + return TRUE; +} diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index fb7fafe47b..f07ab7bf9a 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1456,7 +1456,7 @@ # @ stub SetProcessDefaultCpuSets # @ stub SetProcessGroupAffinity # @ stub SetProcessInformation -# @ stub SetProcessMitigationPolicy +@ stdcall SetProcessMitigationPolicy(long ptr long) kernel32.SetProcessMitigationPolicy # @ stub SetProcessPreferredUILanguages @ stdcall SetProcessPriorityBoost(long long) kernel32.SetProcessPriorityBoost @ stdcall SetProcessShutdownParameters(long long) kernel32.SetProcessShutdownParameters diff --git a/include/winnt.h b/include/winnt.h index 7f822c4aec..e9e5989f24 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6273,6 +6273,25 @@ typedef enum _RTL_UMS_SCHEDULER_REASON typedef void (CALLBACK *PRTL_UMS_SCHEDULER_ENTRY_POINT)(RTL_UMS_SCHEDULER_REASON,ULONG_PTR,PVOID); +typedef enum _PROCESS_MITIGATION_POLICY { + ProcessDEPPolicy, + ProcessASLRPolicy, + ProcessDynamicCodePolicy, + ProcessStrictHandleCheckPolicy, + ProcessSystemCallDisablePolicy, + ProcessMitigationOptionsMask, + ProcessExtensionPointDisablePolicy, + ProcessControlFlowGuardPolicy, + ProcessSignaturePolicy, + ProcessFontDisablePolicy, + ProcessImageLoadPolicy, + ProcessSystemCallFilterPolicy, + ProcessPayloadRestrictionPolicy, + ProcessChildProcessPolicy, + ProcessSideChannelIsolationPolicy, + MaxProcessMitigationPolicy +} PROCESS_MITIGATION_POLICY, *PPROCESS_MITIGATION_POLICY; + #ifdef __cplusplus } #endif -- 2.18.0

1 2

[PATCH] testbot: Only send an email when a job is really done.
by Francois Gouget 10 Aug '18

10 Aug '18

In particular don't send a report if it is requeued or was canceled. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/Engine.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 464b6db45..4478d479b 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -307,7 +307,7 @@ sub HandleJobStatusChange($$$) LogMsg "Invalid JobKey $JobKey in jobstatuschange message\n"; } - if ($OldStatus eq "running" && $NewStatus ne "running") + if ($OldStatus eq "running" and $NewStatus !~ /^(?:canceled|queued|running)$/) { my $Pid = fork; if (!defined $Pid) -- 2.18.0

1 0

[PATCH] testbot/build: Log the wine commit id the patch is tested on.
by Francois Gouget 10 Aug '18

10 Aug '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/build/Build.pl | 4 +++- testbot/bin/build/WineTest.pl | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index da145837b..920fc8204 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -93,7 +93,9 @@ sub ApplyPatch($) my ($PatchFile) = @_; InfoMsg "Applying patch\n"; - system("cd '$DataDir/wine' && set -x && ". + system("cd '$DataDir/wine' && ". + "echo wine:HEAD=`git rev-parse HEAD` && ". + "set -x && ". "git apply --verbose ". ShQuote($PatchFile) ." && ". "git add -A"); if ($? != 0) diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index 5ef8e614e..1fa59c297 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -90,7 +90,9 @@ sub ApplyPatch($) my ($PatchFile) = @_; InfoMsg "Applying patch\n"; - system("cd '$DataDir/wine' && set -x && ". + system("cd '$DataDir/wine' && ". + "echo wine:HEAD=`git rev-parse HEAD` && ". + "set -x && ". "git apply --verbose ". ShQuote($PatchFile) ." && ". "git add -A"); if ($? != 0) -- 2.18.0

1 0

[PATCH] testbot: Use List::Util::max() instead of reimplementing it.
by Francois Gouget 10 Aug '18

10 Aug '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Activity.pm | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/testbot/lib/WineTestBot/Activity.pm b/testbot/lib/WineTestBot/Activity.pm index b3e576a19..a8885a4e1 100644 --- a/testbot/lib/WineTestBot/Activity.pm +++ b/testbot/lib/WineTestBot/Activity.pm @@ -28,7 +28,9 @@ WineTestBot::Activity - reconstruct the TestBot's activity from its history rec use Exporter 'import'; our @EXPORT = qw(GetActivity GetStatistics); +use List::Util qw(max); use Scalar::Util qw(weaken); + use WineTestBot::Config; use WineTestBot::Jobs; use WineTestBot::RecordGroups; @@ -40,12 +42,6 @@ sub _UpdateMin($$) $_[0] = $_[1] if (!defined $_[0] or $_[1] < $_[0]); } -sub max($$) -{ - my ($a, $b) = @_; - return $a > $b ? $a : $b; -} - =pod =over 12 @@ -442,8 +438,7 @@ sub GetStatistics($;$) # Of course this only works for statistics about VM operations and running # tasks (so running.time, reverting.time, etc) not for those about idle or # off VMs (idle.time, etc.). - $ActivitySeconds = $Seconds + 60 + - ($SuiteTimeout > $ReconfigTimeout ? $SuiteTimeout : $ReconfigTimeout); + $ActivitySeconds = $Seconds + 60 + max($SuiteTimeout, $ReconfigTimeout); } my ($Activity, $Counters) = GetActivity($VMs, $ActivitySeconds); $GlobalStats->{"recordgroups.count"} = $Counters->{recordgroups}; -- 2.18.0

1 0

[PATCH] testbot/WineRun*: FatalError() does not return so remove the following else.
by Francois Gouget 10 Aug '18

10 Aug '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunBuild.pl | 4 ++-- testbot/bin/WineRunReconfig.pl | 4 ++-- testbot/bin/WineRunTask.pl | 4 ++-- testbot/bin/WineRunWineTest.pl | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 10c098936..47e4b3bbd 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -316,11 +316,11 @@ if ($VM->Type ne "build") { FatalError("This is not a build VM! (" . $VM->Type . ")\n"); } -elsif (!$Debug and $VM->Status ne "running") +if (!$Debug and $VM->Status ne "running") { FatalError("The VM is not ready for use (" . $VM->Status . ")\n"); } -elsif (!$VM->GetDomain()->IsPoweredOn()) +if (!$VM->GetDomain()->IsPoweredOn()) { FatalError("The VM is not powered on\n"); } diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 8a3d955a7..24a24d067 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -316,11 +316,11 @@ if ($VM->Type ne "build" and $VM->Type ne "wine") { FatalError("This is neither a build nor a Wine VM! (" . $VM->Type . ")\n"); } -elsif (!$Debug and $VM->Status ne "running") +if (!$Debug and $VM->Status ne "running") { FatalError("The VM is not ready for use (" . $VM->Status . ")\n"); } -elsif (!$VM->GetDomain()->IsPoweredOn()) +if (!$VM->GetDomain()->IsPoweredOn()) { FatalError("The VM is not powered on\n"); } diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 974ff3b51..204f86305 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -372,11 +372,11 @@ if ($VM->Type ne "win32" and $VM->Type ne "win64") { FatalError("This is not a Windows VM! (" . $VM->Type . ")\n"); } -elsif (!$Debug and $VM->Status ne "running") +if (!$Debug and $VM->Status ne "running") { FatalError("The VM is not ready for use (" . $VM->Status . ")\n"); } -elsif (!$VM->GetDomain()->IsPoweredOn()) +if (!$VM->GetDomain()->IsPoweredOn()) { FatalError("The VM is not powered on\n"); } diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index e7aa72ec9..ee4c8537a 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -373,11 +373,11 @@ if ($VM->Type ne "wine") { FatalError("This is not a Wine VM! (" . $VM->Type . ")\n"); } -elsif (!$Debug and $VM->Status ne "running") +if (!$Debug and $VM->Status ne "running") { FatalError("The VM is not ready for use (" . $VM->Status . ")\n"); } -elsif (!$VM->GetDomain()->IsPoweredOn()) +if (!$VM->GetDomain()->IsPoweredOn()) { FatalError("The VM is not powered on\n"); } -- 2.18.0

1 0

[PATCH] testbot: Remove an unneeded POSIX( qw(:errno_h) import.
by Francois Gouget 10 Aug '18

10 Aug '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Tasks.pm | 1 - 1 file changed, 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index 54ebf5360..70b620544 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -67,7 +67,6 @@ Status is set to skipped. use WineTestBot::WineTestBotObjects; our @ISA = qw(WineTestBot::WineTestBotItem); -use POSIX qw(:errno_h); use File::Path; use ObjectModel::BackEnd; use WineTestBot::Config; -- 2.18.0

1 0

[PATCH] testbot: A couple of indentation fixes in WineTestBot::Log.
by Francois Gouget 10 Aug '18

10 Aug '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Log.pm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/testbot/lib/WineTestBot/Log.pm b/testbot/lib/WineTestBot/Log.pm index b73f005c3..5dc933add 100644 --- a/testbot/lib/WineTestBot/Log.pm +++ b/testbot/lib/WineTestBot/Log.pm @@ -123,15 +123,15 @@ sub Time() sub Elapsed($) { - my ($Start) = @_; - return sprintf("%0.2f", Time()-$Start); + my ($Start) = @_; + return sprintf("%0.2f", Time() - $Start); } sub PrettyElapsed($) { - my ($Start) = @_; - require WineTestBot::Utils; - return WineTestBot::Utils::DurationToString(Time()-$Start); + my ($Start) = @_; + require WineTestBot::Utils; + return WineTestBot::Utils::DurationToString(Time() - $Start); } 1; -- 2.18.0

1 0

[PATCH] testbot: Add some section headers in PatchUtils.
by Francois Gouget 10 Aug '18

10 Aug '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/PatchUtils.pm | 74 +++++++++++++++------------ 1 file changed, 41 insertions(+), 33 deletions(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index be5ce14d1..d399ced54 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -36,39 +36,9 @@ our @EXPORT = qw(GetPatchImpact UpdateWineData); use WineTestBot::Config; -# These paths are too generic to be proof that this is a Wine patch. -my $AmbiguousPathsRe = join('|', - 'Makefile\.in$', - # aclocal.m4 gets special treatment - # configure gets special treatment - # configure.ac gets special treatment - 'include/Makefile\.in$', - 'include/config\.h\.in$', - 'po/', - 'tools/Makefile.in', - 'tools/config.guess', - 'tools/config.sub', - 'tools/install-sh', - 'tools/makedep.c', -); - -# Patches to these paths don't impact the Wine build. So ignore them. -my $IgnoredPathsRe = join('|', - '\.mailmap$', - 'ANNOUNCE$', - 'AUTHORS$', - 'COPYING\.LIB$', - 'LICENSE\$', - 'LICENSE\.OLD$', - 'MAINTAINERS$', - 'README$', - 'VERSION$', - 'documentation/', - 'tools/c2man\.pl$', - 'tools/winapi/', - 'tools/winemaker/', -); - +# +# Source repository maintenance +# =pod =over 12 @@ -140,6 +110,44 @@ sub _LoadWineFiles() } } + +# +# Wine patch analysis +# + +# These paths are too generic to be proof that this is a Wine patch. +my $AmbiguousPathsRe = join('|', + 'Makefile\.in$', + # aclocal.m4 gets special treatment + # configure gets special treatment + # configure.ac gets special treatment + 'include/Makefile\.in$', + 'include/config\.h\.in$', + 'po/', + 'tools/Makefile.in', + 'tools/config.guess', + 'tools/config.sub', + 'tools/install-sh', + 'tools/makedep.c', +); + +# Patches to these paths don't impact the Wine build. So ignore them. +my $IgnoredPathsRe = join('|', + '\.mailmap$', + 'ANNOUNCE$', + 'AUTHORS$', + 'COPYING\.LIB$', + 'LICENSE\$', + 'LICENSE\.OLD$', + 'MAINTAINERS$', + 'README$', + 'VERSION$', + 'documentation/', + 'tools/c2man\.pl$', + 'tools/winapi/', + 'tools/winemaker/', +); + sub _HandleFile($$$) { my ($Impacts, $FilePath, $Change) = @_; -- 2.18.0

1 0

[PATCH] winebus.sys: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 10 Aug '18

10 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winebus.sys/bus_iohid.c | 2 +- dlls/winebus.sys/main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index 501a40d26e..ac706f5265 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -295,7 +295,7 @@ static void handle_DeviceMatchingCallback(void *context, IOReturn result, void * pid = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDProductIDKey))); version = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDVersionNumberKey))); str = IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDSerialNumberKey)); - if (str) CFStringToWSTR(str, serial_string, sizeof(serial_string) / sizeof(WCHAR)); + if (str) CFStringToWSTR(str, serial_string, ARRAY_SIZE(serial_string)); if (IOHIDDeviceConformsTo(IOHIDDevice, kHIDPage_GenericDesktop, kHIDUsage_GD_GamePad) || IOHIDDeviceConformsTo(IOHIDDevice, kHIDPage_GenericDesktop, kHIDUsage_GD_Joystick)) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 2f3c05aa96..deb2c86d96 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -696,7 +696,7 @@ BOOL is_xbox_gamepad(WORD vid, WORD pid) if (vid != VID_MICROSOFT) return FALSE; - for (i = 0; i < sizeof(PID_XBOX_CONTROLLERS)/sizeof(*PID_XBOX_CONTROLLERS); i++) + for (i = 0; i < ARRAY_SIZE(PID_XBOX_CONTROLLERS); i++) if (pid == PID_XBOX_CONTROLLERS[i]) return TRUE; return FALSE; -- 2.14.4

2 1

[PATCH] winejoystick.drv: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 10 Aug '18

10 Aug '18

Not compile tested. If somebody with a Mac could give this a try it would be much appreciated. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winejoystick.drv/joystick_osx.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/winejoystick.drv/joystick_osx.c b/dlls/winejoystick.drv/joystick_osx.c index bf82f67116..6f53477937 100644 --- a/dlls/winejoystick.drv/joystick_osx.c +++ b/dlls/winejoystick.drv/joystick_osx.c @@ -198,7 +198,7 @@ static const char* debugstr_cf(CFTypeRef t) if (!ret) { UniChar buf[200]; - int len = min(CFStringGetLength(s), sizeof(buf)/sizeof(buf[0])); + int len = min(CFStringGetLength(s), ARRAY_SIZE(buf)); CFStringGetCharacters(s, CFRangeMake(0, len), buf); ret = debugstr_wn(buf, len); } @@ -284,7 +284,7 @@ static CFDictionaryRef create_osx_device_match(int usage) if (values[0] && values[1]) { - result = CFDictionaryCreate(NULL, (const void**)keys, (const void**)values, sizeof(values) / sizeof(values[0]), + result = CFDictionaryCreate(NULL, (const void**)keys, (const void**)values, ARRAY_SIZE(values), &kCFCopyStringDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks); if (!result) @@ -293,7 +293,7 @@ static CFDictionaryRef create_osx_device_match(int usage) else ERR("CFNumberCreate failed.\n"); - for (i = 0; i < sizeof(values) / sizeof(values[0]); i++) + for (i = 0; i < ARRAY_SIZE(values); i++) if (values[i]) CFRelease(values[i]); return result; @@ -393,7 +393,7 @@ static int find_osx_devices(void) IOHIDManagerRef hid_manager; int usages[] = { kHIDUsage_GD_Joystick, kHIDUsage_GD_GamePad, kHIDUsage_GD_MultiAxisController }; int i; - CFDictionaryRef matching_dicts[sizeof(usages) / sizeof(usages[0])]; + CFDictionaryRef matching_dicts[ARRAY_SIZE(usages)]; CFArrayRef matching; CFSetRef devset; @@ -407,7 +407,7 @@ static int find_osx_devices(void) return 0; } - for (i = 0; i < sizeof(matching_dicts) / sizeof(matching_dicts[0]); i++) + for (i = 0; i < ARRAY_SIZE(matching_dicts); i++) { matching_dicts[i] = create_osx_device_match(usages[i]); if (!matching_dicts[i]) @@ -418,10 +418,10 @@ static int find_osx_devices(void) } } - matching = CFArrayCreate(NULL, (const void**)matching_dicts, sizeof(matching_dicts) / sizeof(matching_dicts[0]), + matching = CFArrayCreate(NULL, (const void**)matching_dicts, ARRAY_SIZE(matching_dicts), &kCFTypeArrayCallBacks); - for (i = 0; i < sizeof(matching_dicts) / sizeof(matching_dicts[0]); i++) + for (i = 0; i < ARRAY_SIZE(matching_dicts); i++) CFRelease(matching_dicts[i]); IOHIDManagerSetDeviceMatchingMultiple(hid_manager, matching); -- 2.14.4

2 1

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

10 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msacm32/filter.c | 4 ++-- dlls/msacm32/format.c | 18 +++++++++--------- dlls/msacm32/internal.c | 14 +++++++------- dlls/msacm32/pcmconverter.c | 15 +++++++-------- dlls/msacm32/tests/msacm.c | 2 +- 5 files changed, 26 insertions(+), 27 deletions(-) diff --git a/dlls/msacm32/filter.c b/dlls/msacm32/filter.c index 53db82777d..8d5abced9d 100644 --- a/dlls/msacm32/filter.c +++ b/dlls/msacm32/filter.c @@ -361,8 +361,8 @@ MMRESULT WINAPI acmFilterTagDetailsW(HACMDRIVER had, PACMFILTERTAGDETAILSW paftd if (mmr == MMSYSERR_NOERROR && paftd->dwFilterTag == WAVE_FORMAT_PCM && paftd->szFilterTag[0] == 0) - MultiByteToWideChar( CP_ACP, 0, "PCM", -1, paftd->szFilterTag, - sizeof(paftd->szFilterTag)/sizeof(WCHAR) ); + MultiByteToWideChar(CP_ACP, 0, "PCM", -1, paftd->szFilterTag, + ARRAY_SIZE(paftd->szFilterTag)); return mmr; } diff --git a/dlls/msacm32/format.c b/dlls/msacm32/format.c index b3d2900393..fcc0d9b1c6 100644 --- a/dlls/msacm32/format.c +++ b/dlls/msacm32/format.c @@ -503,9 +503,9 @@ MMRESULT WINAPI acmFormatDetailsW(HACMDRIVER had, PACMFORMATDETAILSW pafd, DWORD wsprintfW(pafd->szFormat + lstrlenW(pafd->szFormat), fmt2, pafd->pwfx->wBitsPerSample); } - MultiByteToWideChar( CP_ACP, 0, (pafd->pwfx->nChannels == 1) ? "; Mono" : "; Stereo", -1, - pafd->szFormat + strlenW(pafd->szFormat), - sizeof(pafd->szFormat)/sizeof(WCHAR) - strlenW(pafd->szFormat) ); + MultiByteToWideChar(CP_ACP, 0, (pafd->pwfx->nChannels == 1) ? "; Mono" : "; Stereo", -1, + pafd->szFormat + strlenW(pafd->szFormat), + ARRAY_SIZE(pafd->szFormat) - strlenW(pafd->szFormat)); } TRACE("=> %d\n", mmr); @@ -929,8 +929,8 @@ MMRESULT WINAPI acmFormatTagDetailsW(HACMDRIVER had, PACMFORMATTAGDETAILSW paftd if (mmr == MMSYSERR_NOERROR && paftd->dwFormatTag == WAVE_FORMAT_PCM && paftd->szFormatTag[0] == 0) - MultiByteToWideChar( CP_ACP, 0, "PCM", -1, paftd->szFormatTag, - sizeof(paftd->szFormatTag)/sizeof(WCHAR) ); + MultiByteToWideChar(CP_ACP, 0, "PCM", -1, paftd->szFormatTag, + ARRAY_SIZE(paftd->szFormatTag)); return mmr; } @@ -1036,8 +1036,8 @@ MMRESULT WINAPI acmFormatTagEnumW(HACMDRIVER had, PACMFORMATTAGDETAILSW paftd, (LPARAM)paftd, ACM_FORMATTAGDETAILSF_INDEX) == MMSYSERR_NOERROR) { if (paftd->dwFormatTag == WAVE_FORMAT_PCM) { if (paftd->szFormatTag[0] == 0) - MultiByteToWideChar( CP_ACP, 0, "PCM", -1, paftd->szFormatTag, - sizeof(paftd->szFormatTag)/sizeof(WCHAR) ); + MultiByteToWideChar(CP_ACP, 0, "PCM", -1, paftd->szFormatTag, + ARRAY_SIZE(paftd->szFormatTag)); /* (WS) I'm preserving this PCM hack since it seems to be * correct. Please notice this block was borrowed from * below. @@ -1062,8 +1062,8 @@ MMRESULT WINAPI acmFormatTagEnumW(HACMDRIVER had, PACMFORMATTAGDETAILSW paftd, (LPARAM)paftd, ACM_FORMATTAGDETAILSF_INDEX) == MMSYSERR_NOERROR) { if (paftd->dwFormatTag == WAVE_FORMAT_PCM) { if (paftd->szFormatTag[0] == 0) - MultiByteToWideChar( CP_ACP, 0, "PCM", -1, paftd->szFormatTag, - sizeof(paftd->szFormatTag)/sizeof(WCHAR) ); + MultiByteToWideChar(CP_ACP, 0, "PCM", -1, paftd->szFormatTag, + ARRAY_SIZE(paftd->szFormatTag)); /* FIXME (EPP): I'm not sure this is the correct * algorithm (should make more sense to apply the same * for all already loaded formats, but this will do diff --git a/dlls/msacm32/internal.c b/dlls/msacm32/internal.c index 7bafcaad5e..aad071e8ad 100644 --- a/dlls/msacm32/internal.c +++ b/dlls/msacm32/internal.c @@ -72,7 +72,7 @@ PWINE_ACMDRIVERID MSACM_RegisterDriverFromRegistry(LPCWSTR pszRegEntry) /* The requested registry entry must have the format msacm.XXXXX in order to be recognized in any future sessions of msacm */ - if (0 == strncmpiW(pszRegEntry, msacmW, sizeof(msacmW)/sizeof(WCHAR))) { + if (0 == strncmpiW(pszRegEntry, msacmW, ARRAY_SIZE(msacmW))) { lRet = RegOpenKeyExW(HKEY_LOCAL_MACHINE, drvkey, 0, KEY_QUERY_VALUE, &hKey); if (lRet != ERROR_SUCCESS) { WARN("unable to open registry key - 0x%08x\n", lRet); @@ -373,31 +373,31 @@ void MSACM_RegisterAllDrivers(void) if (lRet == ERROR_SUCCESS) { RegQueryInfoKeyW( hKey, 0, 0, 0, &cnt, 0, 0, 0, 0, 0, 0, 0); for (i = 0; i < cnt; i++) { - bufLen = sizeof(buf) / sizeof(buf[0]); + bufLen = ARRAY_SIZE(buf); lRet = RegEnumKeyExW(hKey, i, buf, &bufLen, 0, 0, 0, &lastWrite); if (lRet != ERROR_SUCCESS) continue; - if (strncmpiW(buf, msacmW, sizeof(msacmW)/sizeof(msacmW[0]))) continue; + if (strncmpiW(buf, msacmW, ARRAY_SIZE(msacmW))) continue; if (!(name = strchrW(buf, '='))) continue; *name = 0; MSACM_RegisterDriver(buf, name + 1, 0); } i = 0; - cnt = sizeof(valname) / sizeof(*valname); + cnt = ARRAY_SIZE(valname); bufLen = sizeof(buf); while(RegEnumValueW(hKey, i, valname, &cnt, 0, &type, (BYTE*)buf, &bufLen) == ERROR_SUCCESS){ - if(!strncmpiW(valname, msacmW, sizeof(msacmW) / sizeof(*msacmW))) + if (!strncmpiW(valname, msacmW, ARRAY_SIZE(msacmW))) MSACM_RegisterDriver(valname, buf, 0); ++i; } RegCloseKey( hKey ); } - if (GetPrivateProfileSectionW(drv32, buf, sizeof(buf)/sizeof(buf[0]), sys)) + if (GetPrivateProfileSectionW(drv32, buf, ARRAY_SIZE(buf), sys)) { for(s = buf; *s; s += strlenW(s) + 1) { - if (strncmpiW(s, msacmW, sizeof(msacmW)/sizeof(msacmW[0]))) continue; + if (strncmpiW(s, msacmW, ARRAY_SIZE(msacmW))) continue; if (!(name = strchrW(s, '='))) continue; *name = 0; MSACM_RegisterDriver(s, name + 1, 0); diff --git a/dlls/msacm32/pcmconverter.c b/dlls/msacm32/pcmconverter.c index f26f125fcd..dc10f11e7a 100644 --- a/dlls/msacm32/pcmconverter.c +++ b/dlls/msacm32/pcmconverter.c @@ -984,14 +984,13 @@ static LRESULT PCM_DriverDetails(PACMDRIVERDETAILSW add) add->cFormatTags = 1; add->cFilterTags = 0; add->hicon = NULL; - MultiByteToWideChar( CP_ACP, 0, "MS-PCM", -1, - add->szShortName, sizeof(add->szShortName)/sizeof(WCHAR) ); - MultiByteToWideChar( CP_ACP, 0, "Wine PCM converter", -1, - add->szLongName, sizeof(add->szLongName)/sizeof(WCHAR) ); - MultiByteToWideChar( CP_ACP, 0, "Brought to you by the Wine team...", -1, - add->szCopyright, sizeof(add->szCopyright)/sizeof(WCHAR) ); - MultiByteToWideChar( CP_ACP, 0, "Refer to LICENSE file", -1, - add->szLicensing, sizeof(add->szLicensing)/sizeof(WCHAR) ); + MultiByteToWideChar(CP_ACP, 0, "MS-PCM", -1, add->szShortName, ARRAY_SIZE(add->szShortName)); + MultiByteToWideChar(CP_ACP, 0, "Wine PCM converter", -1, + add->szLongName, ARRAY_SIZE(add->szLongName)); + MultiByteToWideChar(CP_ACP, 0, "Brought to you by the Wine team...", -1, + add->szCopyright, ARRAY_SIZE(add->szCopyright)); + MultiByteToWideChar(CP_ACP, 0, "Refer to LICENSE file", -1, + add->szLicensing, ARRAY_SIZE(add->szLicensing) ); add->szFeatures[0] = 0; return MMSYSERR_NOERROR; diff --git a/dlls/msacm32/tests/msacm.c b/dlls/msacm32/tests/msacm.c index 959ec7f0c0..180639fa54 100644 --- a/dlls/msacm32/tests/msacm.c +++ b/dlls/msacm32/tests/msacm.c @@ -1106,7 +1106,7 @@ static void test_convert(void) MMRESULT mmr; unsigned i; - for (i = 0; i < sizeof(expected_output)/sizeof(struct stream_output); i++) + for (i = 0; i < ARRAY_SIZE(expected_output); i++) { mmr = acmStreamOpen(&has, NULL, (WAVEFORMATEX *)&expected_output[i].src, (WAVEFORMATEX *)&expected_output[i].dst, NULL, 0, 0, 0); ok(mmr == MMSYSERR_NOERROR, "#%d: open failed: 0x%x\n", i, mmr); -- 2.14.4

2 1

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

10 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/midimap/midimap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/midimap/midimap.c b/dlls/midimap/midimap.c index 1b35da7609..290300a55a 100644 --- a/dlls/midimap/midimap.c +++ b/dlls/midimap/midimap.c @@ -172,7 +172,7 @@ static BOOL MIDIMAP_LoadSettingsScheme(MIDIMAPDATA* mom, const WCHAR* scheme) return FALSE; } - for (idx = 0; !RegEnumKeyW(hKey, idx, buffer, sizeof(buffer)/sizeof(buffer[0])); idx++) + for (idx = 0; !RegEnumKeyW(hKey, idx, buffer, ARRAY_SIZE(buffer)); idx++) { if (RegOpenKeyW(hKey, buffer, &hPortKey)) continue; -- 2.14.4

2 1

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

10 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mciwave/mciwave.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index fd4d6f6728..0fa9b204f8 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -427,7 +427,7 @@ static DWORD create_tmp_file(HMMIO* hFile, LPWSTR* pszTmpFileName) szPrefix[2] = 'I'; szPrefix[3] = '\0'; - if (!GetTempPathW(sizeof(szTmpPath)/sizeof(szTmpPath[0]), szTmpPath)) { + if (!GetTempPathW(ARRAY_SIZE(szTmpPath), szTmpPath)) { WARN("can't retrieve temp path!\n"); *pszTmpFileName = NULL; return MCIERR_FILE_NOT_FOUND; -- 2.14.4

2 1

[PATCH 1/2] quartz: Remove redundant if clause from WAVEParser_InputPin_PreConnect
by Alex Henrie 10 Aug '18

10 Aug '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/quartz/waveparser.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/quartz/waveparser.c b/dlls/quartz/waveparser.c index 403c052db4..d8f349b35f 100644 --- a/dlls/quartz/waveparser.c +++ b/dlls/quartz/waveparser.c @@ -306,15 +306,12 @@ static HRESULT WAVEParser_InputPin_PreConnect(IPin * iface, IPin * pConnectPin, return E_FAIL; } - if (hr == S_OK) - { - pWAVEParser->StartOfFile = MEDIATIME_FROM_BYTES(pos + sizeof(RIFFCHUNK)); - pWAVEParser->EndOfFile = MEDIATIME_FROM_BYTES(pos + chunk.cb + sizeof(RIFFCHUNK)); - } - if (hr != S_OK) return E_FAIL; + pWAVEParser->StartOfFile = MEDIATIME_FROM_BYTES(pos + sizeof(RIFFCHUNK)); + pWAVEParser->EndOfFile = MEDIATIME_FROM_BYTES(pos + chunk.cb + sizeof(RIFFCHUNK)); + props->cbAlign = ((WAVEFORMATEX*)amt.pbFormat)->nBlockAlign; props->cbPrefix = 0; props->cbBuffer = 4096; -- 2.18.0

2 3

[PATCH] winepulse.drv: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 10 Aug '18

10 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 32f7acb91d..8d57f1a45a 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -469,7 +469,7 @@ static HRESULT pulse_connect(void) if (pulse_ctx) pa_context_unref(pulse_ctx); - GetModuleFileNameW(NULL, path, sizeof(path)/sizeof(*path)); + GetModuleFileNameW(NULL, path, ARRAY_SIZE(path)); name = strrchrW(path, '\\'); if (!name) name = path; @@ -537,7 +537,7 @@ static HRESULT pulse_test_connect(void) pa_mainloop_set_poll_func(pulse_ml, pulse_poll_func, NULL); - GetModuleFileNameW(NULL, path, sizeof(path)/sizeof(*path)); + GetModuleFileNameW(NULL, path, ARRAY_SIZE(path)); name = strrchrW(path, '\\'); if (!name) name = path; @@ -1283,7 +1283,7 @@ static HRESULT pulse_spec_from_waveformat(ACImpl *This, const WAVEFORMATEX *fmt) This->map.channels = fmt->nChannels; if (!mask || (mask & (SPEAKER_ALL|SPEAKER_RESERVED))) mask = get_channel_mask(fmt->nChannels); - for (j = 0; j < sizeof(pulse_pos_from_wfx)/sizeof(*pulse_pos_from_wfx) && i < fmt->nChannels; ++j) { + for (j = 0; j < ARRAY_SIZE(pulse_pos_from_wfx) && i < fmt->nChannels; ++j) { if (mask & (1 << j)) This->map.map[i++] = pulse_pos_from_wfx[j]; } -- 2.14.4

2 1

[PATCH] wineoss.drv: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 10 Aug '18

10 Aug '18

Not compile tested as I don't have a system with OSSv4. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wineoss.drv/midi.c | 12 +++++------- dlls/wineoss.drv/mmdevdrv.c | 7 +++---- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 3a2ab2580d..24b3e7037b 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -230,9 +230,8 @@ static LRESULT OSS_MidiInit(void) MidiOutDev[i].caps.wTechnology = MOD_MIDIPORT; MidiOutDev[i].bEnabled = FALSE; } else { - MultiByteToWideChar( CP_UNIXCP, 0, sinfo.name, -1, - MidiOutDev[i].caps.szPname, - sizeof(MidiOutDev[i].caps.szPname)/sizeof(WCHAR) ); + MultiByteToWideChar(CP_UNIXCP, 0, sinfo.name, -1, MidiOutDev[i].caps.szPname, + ARRAY_SIZE(MidiOutDev[i].caps.szPname)); MidiOutDev[i].caps.wTechnology = MIDI_UnixToWindowsDeviceType(sinfo.synth_type); if (MOD_MIDIPORT != MidiOutDev[i].caps.wTechnology) { @@ -313,7 +312,7 @@ static LRESULT OSS_MidiInit(void) } else { MultiByteToWideChar(CP_UNIXCP, 0, minfo.name, -1, MidiOutDev[numsynthdevs + i].caps.szPname, - sizeof(MidiOutDev[numsynthdevs + i].caps.szPname) / sizeof(WCHAR)); + ARRAY_SIZE(MidiOutDev[numsynthdevs + i].caps.szPname)); MidiOutDev[numsynthdevs + i].bEnabled = TRUE; } MidiOutDev[numsynthdevs + i].caps.wTechnology = MOD_MIDIPORT; @@ -338,9 +337,8 @@ static LRESULT OSS_MidiInit(void) wsprintfW(MidiInDev[i].caps.szPname, fmt, numsynthdevs + i); MidiInDev[i].state = -1; } else { - MultiByteToWideChar(CP_UNIXCP, 0, minfo.name, -1, - MidiInDev[i].caps.szPname, - sizeof(MidiInDev[i].caps.szPname) / sizeof(WCHAR)); + MultiByteToWideChar(CP_UNIXCP, 0, minfo.name, -1, MidiInDev[i].caps.szPname, + ARRAY_SIZE(MidiInDev[i].caps.szPname)); MidiInDev[i].state = 0; } MidiInDev[i].caps.dwSupport = 0; /* mandatory with MIDIINCAPS */ diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 1686c8c96c..fa3f885ea1 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -349,8 +349,7 @@ static void get_device_guid(EDataFlow flow, const char *device, GUID *guid) else key_name[0] = '0'; key_name[1] = ','; - MultiByteToWideChar(CP_UNIXCP, 0, device, -1, key_name + 2, - (sizeof(key_name) / sizeof(*key_name)) - 2); + MultiByteToWideChar(CP_UNIXCP, 0, device, -1, key_name + 2, ARRAY_SIZE(key_name) - 2); if(RegOpenKeyExW(HKEY_CURRENT_USER, drv_key_devicesW, 0, KEY_WRITE|KEY_READ, &key) == ERROR_SUCCESS){ if(RegOpenKeyExW(key, key_name, 0, KEY_READ, &dev_key) == ERROR_SUCCESS){ @@ -543,11 +542,11 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, GUID **guids, len = MultiByteToWideChar(CP_UNIXCP, 0, ai.name, -1, NULL, 0); if(flow == eRender){ prefix = outW; - prefix_len = (sizeof(outW) / sizeof(*outW)) - 1; + prefix_len = ARRAY_SIZE(outW) - 1; len += prefix_len; }else{ prefix = inW; - prefix_len = (sizeof(inW) / sizeof(*inW)) - 1; + prefix_len = ARRAY_SIZE(inW) - 1; len += prefix_len; } (*ids)[*num] = HeapAlloc(GetProcessHeap(), 0, -- 2.14.4

2 1

[PATCH] winealsa.drv: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 10 Aug '18

10 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winealsa.drv/midi.c | 10 ++++------ dlls/winealsa.drv/mmdevdrv.c | 11 +++++------ 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 6ef197681f..3d4d933ead 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -1177,9 +1177,8 @@ static void ALSA_AddMidiPort(snd_seq_client_info_t* cinfo, snd_seq_port_info_t* } else { lstrcpynA(midiPortName, snd_seq_port_info_get_name(pinfo), MAXPNAMELEN); } - MultiByteToWideChar(CP_UNIXCP, 0, midiPortName, -1, - MidiOutDev[MODM_NumDevs].caps.szPname, - sizeof(MidiOutDev[MODM_NumDevs].caps.szPname) / sizeof(WCHAR)); + MultiByteToWideChar(CP_UNIXCP, 0, midiPortName, -1, MidiOutDev[MODM_NumDevs].caps.szPname, + ARRAY_SIZE(MidiOutDev[MODM_NumDevs].caps.szPname)); MidiOutDev[MODM_NumDevs].caps.wTechnology = MIDI_AlsaToWindowsDeviceType(type); @@ -1244,9 +1243,8 @@ static void ALSA_AddMidiPort(snd_seq_client_info_t* cinfo, snd_seq_port_info_t* } else { lstrcpynA(midiPortName, snd_seq_port_info_get_name(pinfo), MAXPNAMELEN); } - MultiByteToWideChar(CP_UNIXCP, 0, midiPortName, -1, - MidiInDev[MIDM_NumDevs].caps.szPname, - sizeof(MidiInDev[MIDM_NumDevs].caps.szPname) / sizeof(WCHAR)); + MultiByteToWideChar(CP_UNIXCP, 0, midiPortName, -1, MidiInDev[MIDM_NumDevs].caps.szPname, + ARRAY_SIZE(MidiInDev[MIDM_NumDevs].caps.szPname)); MidiInDev[MIDM_NumDevs].state = 0; TRACE("MidiIn [%d]\tname='%s' support=%d\n" diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index b285705509..de89fd05c5 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -311,8 +311,7 @@ static void get_device_guid(EDataFlow flow, const char *device, GUID *guid) else key_name[0] = '0'; key_name[1] = ','; - MultiByteToWideChar(CP_UNIXCP, 0, device, -1, key_name + 2, - (sizeof(key_name) / sizeof(*key_name)) - 2); + MultiByteToWideChar(CP_UNIXCP, 0, device, -1, key_name + 2, ARRAY_SIZE(key_name) - 2); if(RegOpenKeyExW(HKEY_CURRENT_USER, drv_key_devicesW, 0, KEY_WRITE|KEY_READ, &key) == ERROR_SUCCESS){ if(RegOpenKeyExW(key, key_name, 0, KEY_READ, &dev_key) == ERROR_SUCCESS){ @@ -362,17 +361,17 @@ static WCHAR *construct_device_id(EDataFlow flow, const WCHAR *chunk1, const cha DWORD len_wchars = 0, chunk1_len = 0, copied = 0, prefix_len; static const WCHAR dashW[] = {' ','-',' ',0}; - static const size_t dashW_len = (sizeof(dashW) / sizeof(*dashW)) - 1; + static const size_t dashW_len = ARRAY_SIZE(dashW) - 1; static const WCHAR outW[] = {'O','u','t',':',' ',0}; static const WCHAR inW[] = {'I','n',':',' ',0}; if(flow == eRender){ prefix = outW; - prefix_len = (sizeof(outW) / sizeof(*outW)) - 1; + prefix_len = ARRAY_SIZE(outW) - 1; len_wchars += prefix_len; }else{ prefix = inW; - prefix_len = (sizeof(inW) / sizeof(*inW)) - 1; + prefix_len = ARRAY_SIZE(inW) - 1; len_wchars += prefix_len; } if(chunk1){ @@ -724,7 +723,7 @@ static BOOL get_alsa_name_by_guid(GUID *guid, char *name, DWORD name_size, EData DWORD size, type; GUID reg_guid; - key_name_size = sizeof(key_name)/sizeof(WCHAR); + key_name_size = ARRAY_SIZE(key_name); if(RegEnumKeyExW(devices_key, i++, key_name, &key_name_size, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) break; -- 2.14.4

2 1

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

10 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dsound/dsound.c | 4 ++-- dlls/dsound/propset.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index a8b20b1dd1..6a49d638e1 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -85,7 +85,7 @@ static void _dump_DSCAPS(DWORD xmask) { }; unsigned int i; - for (i=0;i<sizeof(flags)/sizeof(flags[0]);i++) + for (i = 0; i < ARRAY_SIZE(flags); i++) if ((flags[i].mask & xmask) == flags[i].mask) TRACE("%s ",flags[i].name); } @@ -113,7 +113,7 @@ static void _dump_DSBCAPS(DWORD xmask) { }; unsigned int i; - for (i=0;i<sizeof(flags)/sizeof(flags[0]);i++) + for (i = 0; i < ARRAY_SIZE(flags); i++) if ((flags[i].mask & xmask) == flags[i].mask) TRACE("%s ",flags[i].name); } diff --git a/dlls/dsound/propset.c b/dlls/dsound/propset.c index 9ef4ac9fbc..0272ac001f 100644 --- a/dlls/dsound/propset.c +++ b/dlls/dsound/propset.c @@ -361,8 +361,8 @@ static void DSPROPERTY_descWto1(const DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_1_DATA *data1) { data1->DeviceId = dataW->DeviceId; - lstrcpynW(data1->ModuleW, dataW->Module, sizeof(data1->ModuleW)/sizeof(*data1->ModuleW)); - lstrcpynW(data1->DescriptionW, dataW->Description, sizeof(data1->DescriptionW)/sizeof(*data1->DescriptionW)); + lstrcpynW(data1->ModuleW, dataW->Module, ARRAY_SIZE(data1->ModuleW)); + lstrcpynW(data1->DescriptionW, dataW->Description, ARRAY_SIZE(data1->DescriptionW)); WideCharToMultiByte(CP_ACP, 0, data1->DescriptionW, -1, data1->DescriptionA, sizeof(data1->DescriptionA)-1, NULL, NULL); WideCharToMultiByte(CP_ACP, 0, data1->ModuleW, -1, data1->ModuleA, sizeof(data1->ModuleA)-1, NULL, NULL); data1->DescriptionA[sizeof(data1->DescriptionA)-1] = 0; -- 2.14.4

2 1

kernel32: Add support for FILE_FLAG_WRITE_THROUGH to CreateFile.
by Dmitry Timoshkov 10 Aug '18

10 Aug '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kernel32/file.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 1e5b9fe3e7..1b33cfba5e 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1560,6 +1560,8 @@ HANDLE WINAPI CreateFileW( LPCWSTR filename, DWORD access, DWORD sharing, options |= FILE_SYNCHRONOUS_IO_NONALERT; if (attributes & FILE_FLAG_RANDOM_ACCESS) options |= FILE_RANDOM_ACCESS; + if (attributes & FILE_FLAG_WRITE_THROUGH) + options |= FILE_WRITE_THROUGH; attributes &= FILE_ATTRIBUTE_VALID_FLAGS; attr.Length = sizeof(attr); -- 2.17.1

2 2

[PATCH] winhlp32: Avoid an ARRAY_SIZE-like macro
by Michael Stefaniuc 10 Aug '18

10 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winhlp32/winhelp.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c index 8ee3d0410e..7ce5d4a0a8 100644 --- a/programs/winhlp32/winhelp.c +++ b/programs/winhlp32/winhelp.c @@ -66,19 +66,18 @@ static void WINHELP_InitFonts(HWND hWnd) {-12, 0, 0, 0, 700, 0, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 32, {'H','e','l','v',0}}, {-10, 0, 0, 0, 700, 0, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 32, {'H','e','l','v',0}}, { -8, 0, 0, 0, 400, 0, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 32, {'H','e','l','v',0}}}; -#define FONTS_LEN (sizeof(logfontlist)/sizeof(*logfontlist)) - static HFONT fonts[FONTS_LEN]; + static HFONT fonts[ARRAY_SIZE(logfontlist)]; static BOOL init = FALSE; - win->fonts_len = FONTS_LEN; + win->fonts_len = ARRAY_SIZE(logfontlist); win->fonts = fonts; if (!init) { UINT i; - for (i = 0; i < FONTS_LEN; i++) + for (i = 0; i < ARRAY_SIZE(logfontlist); i++) { fonts[i] = CreateFontIndirectW(&logfontlist[i]); } -- 2.14.4

1 0

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

10 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winhlp32/macro.c | 2 +- programs/winhlp32/macro.lex.l | 8 ++++---- programs/winhlp32/winhelp.c | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/programs/winhlp32/macro.c b/programs/winhlp32/macro.c index 5a25d6c944..280e618236 100644 --- a/programs/winhlp32/macro.c +++ b/programs/winhlp32/macro.c @@ -154,7 +154,7 @@ void CALLBACK MACRO_About(void) WCHAR name[256]; HICON icon = LoadImageW( Globals.hInstance, MAKEINTRESOURCEW(IDI_WINHELP), IMAGE_ICON, 48, 48, LR_SHARED ); - LoadStringW( Globals.hInstance, STID_WINE_HELP, name, sizeof(name)/sizeof(WCHAR) ); + LoadStringW( Globals.hInstance, STID_WINE_HELP, name, ARRAY_SIZE( name )); ShellAboutW( MACRO_CurrentWindow()->hMainWnd, name, NULL, icon ); } diff --git a/programs/winhlp32/macro.lex.l b/programs/winhlp32/macro.lex.l index 8f6945ca98..eab7a795af 100644 --- a/programs/winhlp32/macro.lex.l +++ b/programs/winhlp32/macro.lex.l @@ -75,7 +75,7 @@ struct lexret yylval; /* opening a new one */ if (lex_data->quote_stk_idx == 0) { - assert(lex_data->cache_used < sizeof(lex_data->cache_string) / sizeof(lex_data->cache_string[0])); + assert(lex_data->cache_used < ARRAY_SIZE(lex_data->cache_string)); lex_data->strptr = lex_data->cache_string[lex_data->cache_used] = HeapAlloc(GetProcessHeap(), 0, strlen(lex_data->macroptr) + 1); yylval.string = lex_data->strptr; lex_data->cache_used++; @@ -83,7 +83,7 @@ struct lexret yylval; } else *lex_data->strptr++ = yytext[0]; lex_data->quote_stack[lex_data->quote_stk_idx++] = yytext[0]; - assert(lex_data->quote_stk_idx < sizeof(lex_data->quote_stack) / sizeof(lex_data->quote_stack[0])); + assert(lex_data->quote_stk_idx < ARRAY_SIZE(lex_data->quote_stack)); } else { @@ -222,7 +222,7 @@ CheckArgs_end: static int MACRO_CallBoolFunc(void *fn, const char* args, void** ret) { void* pa[2]; - int idx = MACRO_CheckArgs(pa, sizeof(pa)/sizeof(pa[0]), args); + int idx = MACRO_CheckArgs(pa, ARRAY_SIZE(pa), args); if (idx < 0) return 0; if (!fn) return 1; @@ -257,7 +257,7 @@ static int MACRO_CallBoolFunc(void *fn, const char* args, void** ret) static int MACRO_CallVoidFunc(void *fn, const char* args) { void* pa[6]; - int idx = MACRO_CheckArgs(pa, sizeof(pa)/sizeof(pa[0]), args); + int idx = MACRO_CheckArgs(pa, ARRAY_SIZE(pa), args); if (idx < 0) return 0; if (!fn) return 1; diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c index 2ac3d2ff24..8ee3d0410e 100644 --- a/programs/winhlp32/winhelp.c +++ b/programs/winhlp32/winhelp.c @@ -595,7 +595,7 @@ static void WINHELP_RememberPage(WINHELP_WINDOW* win, WINHELP_WNDPAGE* wpage) if (!Globals.history.index || Globals.history.set[0].page != wpage->page) { - num = sizeof(Globals.history.set) / sizeof(Globals.history.set[0]); + num = ARRAY_SIZE(Globals.history.set); /* we're full, remove latest entry */ if (Globals.history.index == num) { @@ -610,7 +610,7 @@ static void WINHELP_RememberPage(WINHELP_WINDOW* win, WINHELP_WNDPAGE* wpage) } if (win->hHistoryWnd) InvalidateRect(win->hHistoryWnd, NULL, TRUE); - num = sizeof(win->back.set) / sizeof(win->back.set[0]); + num = ARRAY_SIZE(win->back.set); if (win->back.index == num) { /* we're full, remove latest entry */ @@ -1136,7 +1136,7 @@ static LRESULT CALLBACK WINHELP_HistoryWndProc(HWND hWnd, UINT msg, WPARAM wPara GetWindowRect(hWnd, &r); r.right = r.left + 30 * tm.tmAveCharWidth; - r.bottom = r.top + (sizeof(Globals.history.set) / sizeof(Globals.history.set[0])) * tm.tmHeight; + r.bottom = r.top + ARRAY_SIZE(Globals.history.set) * tm.tmHeight; AdjustWindowRect(&r, GetWindowLongW(hWnd, GWL_STYLE), FALSE); if (r.left < 0) {r.right -= r.left; r.left = 0;} if (r.top < 0) {r.bottom -= r.top; r.top = 0;} -- 2.14.4

1 0

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

10 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winemenubuilder/winemenubuilder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 0013b04cee..a81a5c7638 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -1807,7 +1807,7 @@ static BOOL GetLinkLocation( LPCWSTR linkfile, DWORD *loc, char **relative ) WINE_TRACE("%s\n", wine_dbgstr_w(filename)); - for( i=0; i<sizeof(locations)/sizeof(locations[0]); i++ ) + for( i=0; i<ARRAY_SIZE( locations ); i++ ) { if (!SHGetSpecialFolderPathW( 0, buffer, locations[i], FALSE )) continue; -- 2.14.4

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel