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

RE: [PATCH] imm32: Use the ARRAY_SIZE() macro
by Aric Stewart 14 Aug '18

14 Aug '18

Signed-off-by: Aric Stewart <aric(a)codeweavers.com>

1 0

[PATCH 2/2] oleaut32: Extend value range before getting absolute value in VarBstrFromI4.
by Daniel Lehman 14 Aug '18

14 Aug '18

1 0

[PATCH 1/2] oleaut32/tests: Add test for VarBstrFromI4.
by Daniel Lehman 14 Aug '18

14 Aug '18

1 0

[PATCH v3] quartz: Rewrite add_data with CoTaskMemRealloc and error handling
by Alex Henrie 14 Aug '18

14 Aug '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/quartz/filtermapper.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index 0d26198637..0a41c7144a 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -145,11 +145,11 @@ static int add_data(struct Vector * v, const BYTE * pData, int size) int index = v->current; if (v->current + size > v->capacity) { - LPBYTE pOldData = v->pData; - v->capacity = (v->capacity + size) * 2; - v->pData = CoTaskMemAlloc(v->capacity); - memcpy(v->pData, pOldData, v->current); - CoTaskMemFree(pOldData); + int new_capacity = (v->capacity + size) * 2; + BYTE *new_data = CoTaskMemRealloc(v->pData, new_capacity); + if (!new_data) return -1; + v->capacity = new_capacity; + v->pData = new_data; } memcpy(v->pData + v->current, pData, size); v->current += size; -- 2.18.0

1 0

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

14 Aug '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Passing NULL to memcpy causes a segfault in newer versions of GCC, see https://www.imperialviolet.org/2016/06/26/nonnull.html v2: Fixed email address --- 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

2 2

[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