September 2018 - Wine-Devel

[PATCH v8 2/5] shell32/autocomplete: Avoid another buffer overflow and handle arbitrary sizes for the auto-append string

by Gabriel Ivăncescu

The previous code caps the auto-append text at 255 characters, which can be easily exploited. It's also less efficient as it scans the string multiple times. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/shell32/autocomplete.c | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index b0c92c3..c5b168b 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -126,6 +126,28 @@ static size_t format_quick_complete(WCHAR *dst, const WCHAR *qc, const WCHAR *st return dst - base; } +static void autoappend_str(IAutoCompleteImpl *ac, WCHAR *text, UINT len, WCHAR *str, HWND hwnd) +{ + WCHAR *tmp; + size_t size; + + /* The character capitalization can be different, + so merge text and str into a new string */ + size = len + strlenW(&str[len]) + 1; + + if ((tmp = heap_alloc(size * sizeof(*tmp)))) + { + memcpy(tmp, text, len * sizeof(*tmp)); + memcpy(&tmp[len], &str[len], (size - len) * sizeof(*tmp)); + } + else tmp = str; + + SendMessageW(hwnd, WM_SETTEXT, 0, (LPARAM)tmp); + SendMessageW(hwnd, EM_SETSEL, len, size - 1); + if (tmp != str) + heap_free(tmp); +} + static void autocomplete_text(IAutoCompleteImpl *ac, HWND hwnd, enum autoappend_flag flag) { HRESULT hr; @@ -166,12 +188,7 @@ static void autocomplete_text(IAutoCompleteImpl *ac, HWND hwnd, enum autoappend_ { if (cpt == 0 && flag == autoappend_flag_yes) { - WCHAR buffW[255]; - - strcpyW(buffW, text); - strcatW(buffW, &strs[len]); - SetWindowTextW(hwnd, buffW); - SendMessageW(hwnd, EM_SETSEL, len, strlenW(strs)); + autoappend_str(ac, text, len, strs, hwnd); if (!(ac->options & ACO_AUTOSUGGEST)) { CoTaskMemFree(strs); -- 1.9.1

Sept. 18, 2018

[PATCH v8 1/5] shell32/autocomplete: Don't auto-append on control characters

by Gabriel Ivăncescu

We must not auto-append on control characters, most notably Backspace, but also ^X (cut) and so on. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- v8: Don't exclude ^V. dlls/shell32/autocomplete.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 183b37b..b0c92c3 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -343,7 +343,7 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, case WM_CHAR: case WM_UNICHAR: ret = CallWindowProcW(This->wpOrigEditProc, hwnd, uMsg, wParam, lParam); - autocomplete_text(This, hwnd, (This->options & ACO_AUTOAPPEND) + autocomplete_text(This, hwnd, (This->options & ACO_AUTOAPPEND) && wParam >= ' ' ? autoappend_flag_yes : autoappend_flag_no); return ret; case WM_DESTROY: -- 1.9.1

Sept. 18, 2018

[PATCH 2/2] user32/listbox: Optimize SetCount partly

by Gabriel Ivăncescu

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/user32/listbox.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index c8bd148..a8de8d3 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -1763,18 +1763,31 @@ static LRESULT LISTBOX_SetCount( LB_DESCR *descr, INT count ) return LB_ERR; } - /* FIXME: this is far from optimal... */ if (count > descr->nb_items) { - while (count > descr->nb_items) - if ((ret = LISTBOX_InsertString( descr, -1, 0 )) < 0) - return ret; + INT num = descr->nb_items; + if ((ret = LISTBOX_InitStorage(descr, count - num)) != LB_OKAY) + return ret; + memset(&descr->items[num], 0, (count - num) * sizeof(*descr->items)); + descr->nb_items = count; + + LISTBOX_UpdateScroll(descr); + LISTBOX_InvalidateItems(descr, num); + + /* If listbox was empty, set focus to the first item */ + if (count == 1) LISTBOX_SetCaretIndex(descr, 0, FALSE); } else if (count < descr->nb_items) { + /* FIXME: This is not really optimal */ + DWORD oldstyle = descr->style; + LISTBOX_SetRedraw(descr, FALSE); + while (count < descr->nb_items) if ((ret = LISTBOX_RemoveItem( descr, (descr->nb_items - 1) )) < 0) - return ret; + break; + if (!(oldstyle & LBS_NOREDRAW)) LISTBOX_SetRedraw(descr, TRUE); + if (ret < 0) return ret; } InvalidateRect( descr->self, NULL, TRUE ); -- 1.9.1

Sept. 18, 2018

[PATCH 1/2] comctl32/listbox: Optimize SetCount partly

by Gabriel Ivăncescu

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- The case where count < descr->nb_items isn't really optimal, just stops redrawing right now. The other case (growing) should be optimal now, though. dlls/comctl32/listbox.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 2137ef8..01588bb 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -1758,18 +1758,31 @@ static LRESULT LISTBOX_SetCount( LB_DESCR *descr, INT count ) return LB_ERR; } - /* FIXME: this is far from optimal... */ if (count > descr->nb_items) { - while (count > descr->nb_items) - if ((ret = LISTBOX_InsertString( descr, -1, 0 )) < 0) - return ret; + INT num = descr->nb_items; + if ((ret = LISTBOX_InitStorage(descr, count - num)) != LB_OKAY) + return ret; + memset(&descr->items[num], 0, (count - num) * sizeof(*descr->items)); + descr->nb_items = count; + + LISTBOX_UpdateScroll(descr); + LISTBOX_InvalidateItems(descr, num); + + /* If listbox was empty, set focus to the first item */ + if (count == 1) LISTBOX_SetCaretIndex(descr, 0, FALSE); } else if (count < descr->nb_items) { + /* FIXME: This is not really optimal */ + DWORD oldstyle = descr->style; + LISTBOX_SetRedraw(descr, FALSE); + while (count < descr->nb_items) if ((ret = LISTBOX_RemoveItem( descr, (descr->nb_items - 1) )) < 0) - return ret; + break; + if (!(oldstyle & LBS_NOREDRAW)) LISTBOX_SetRedraw(descr, TRUE); + if (ret < 0) return ret; } InvalidateRect( descr->self, NULL, TRUE ); -- 1.9.1

Sept. 18, 2018

[PATCH 2/2] user32/listbox: Fix InitStorage heap extension

by Gabriel Ivăncescu

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/user32/listbox.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index c8bd148..967baf2 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -698,16 +698,20 @@ static LRESULT LISTBOX_InitStorage( LB_DESCR *descr, INT nb_items ) { LB_ITEMDATA *item; - nb_items += LB_ARRAY_GRANULARITY - 1; - nb_items -= (nb_items % LB_ARRAY_GRANULARITY); if (descr->items) { - nb_items += HeapSize( GetProcessHeap(), 0, descr->items ) / sizeof(*item); - item = HeapReAlloc( GetProcessHeap(), 0, descr->items, - nb_items * sizeof(LB_ITEMDATA)); + nb_items += descr->nb_items; + if (nb_items > HeapSize(GetProcessHeap(), 0, descr->items) / sizeof(*item)) + { + UINT n = nb_items + LB_ARRAY_GRANULARITY - 1; + item = HeapReAlloc(GetProcessHeap(), 0, descr->items, + (n - n % LB_ARRAY_GRANULARITY) * sizeof(*item)); + } + else return LB_OKAY; } else { - item = HeapAlloc( GetProcessHeap(), 0, - nb_items * sizeof(LB_ITEMDATA)); + UINT n = nb_items + LB_ARRAY_GRANULARITY - 1; + item = HeapAlloc(GetProcessHeap(), 0, + (n - n % LB_ARRAY_GRANULARITY) * sizeof(*item)); } if (!item) -- 1.9.1

Sept. 18, 2018

[PATCH 1/2] comctl32/listbox: Fix InitStorage heap extension

by Gabriel Ivăncescu

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- Only increase the item array if we actually have to. Previously, sending 1 to nb_items repeatedly would always increase the array by LB_ARRAY_GRANULARITY, even if there was plenty of space. dlls/comctl32/listbox.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 2137ef8..9cd89ff 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -673,16 +673,20 @@ static LRESULT LISTBOX_InitStorage( LB_DESCR *descr, INT nb_items ) { LB_ITEMDATA *item; - nb_items += LB_ARRAY_GRANULARITY - 1; - nb_items -= (nb_items % LB_ARRAY_GRANULARITY); if (descr->items) { - nb_items += HeapSize( GetProcessHeap(), 0, descr->items ) / sizeof(*item); - item = HeapReAlloc( GetProcessHeap(), 0, descr->items, - nb_items * sizeof(LB_ITEMDATA)); + nb_items += descr->nb_items; + if (nb_items > HeapSize(GetProcessHeap(), 0, descr->items) / sizeof(*item)) + { + UINT n = nb_items + LB_ARRAY_GRANULARITY - 1; + item = HeapReAlloc(GetProcessHeap(), 0, descr->items, + (n - n % LB_ARRAY_GRANULARITY) * sizeof(*item)); + } + else return LB_OKAY; } else { - item = HeapAlloc( GetProcessHeap(), 0, - nb_items * sizeof(LB_ITEMDATA)); + UINT n = nb_items + LB_ARRAY_GRANULARITY - 1; + item = HeapAlloc(GetProcessHeap(), 0, + (n - n % LB_ARRAY_GRANULARITY) * sizeof(*item)); } if (!item) -- 1.9.1

Sept. 18, 2018

Is WINE compatible with .NET framework

by mrt303xx＠aol.com

I built a simple test app (displays a empty WinForm with no content) to test .NET and it fails to open? Are the some settings I have missed. I used WineTricks to install dotnet462 and I installed .NET 2.1 for Mac on my machine, but it still fails

Sept. 18, 2018

[PATCH] uxtheme: Use the ARRAY_SIZE() macro

by Michael Stefaniuc

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/uxtheme/draw.c | 5 ++--- dlls/uxtheme/metric.c | 2 +- dlls/uxtheme/msstyles.c | 22 +++++++++++----------- dlls/uxtheme/property.c | 4 ++-- dlls/uxtheme/stylemap.c | 2 +- dlls/uxtheme/system.c | 46 +++++++++++++++++++++------------------------- 6 files changed, 38 insertions(+), 43 deletions(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index d07d0753da..69c53b9ebc 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -198,8 +198,7 @@ static PTHEME_PROPERTY UXTHEME_SelectImage(HTHEME hTheme, HDC hdc, int iPartId, HBITMAP hBmp; BOOL hasAlpha; - lstrcpynW(szPath, fileProp->lpValue, - min(fileProp->dwValueLen+1, sizeof(szPath)/sizeof(szPath[0]))); + lstrcpynW(szPath, fileProp->lpValue, min(fileProp->dwValueLen+1, ARRAY_SIZE(szPath))); hBmp = MSSTYLES_LoadBitmap(hTheme, szPath, &hasAlpha); if(!hBmp) continue; @@ -245,7 +244,7 @@ static HRESULT UXTHEME_LoadImage(HTHEME hTheme, HDC hdc, int iPartId, int iState FIXME("Couldn't determine image for part/state %d/%d, invalid theme?\n", iPartId, iStateId); return E_PROP_ID_UNSUPPORTED; } - lstrcpynW(szPath, tp->lpValue, min(tp->dwValueLen+1, sizeof(szPath)/sizeof(szPath[0]))); + lstrcpynW(szPath, tp->lpValue, min(tp->dwValueLen+1, ARRAY_SIZE(szPath))); *hBmp = MSSTYLES_LoadBitmap(hTheme, szPath, hasImageAlpha); if(!*hBmp) { TRACE("Failed to load bitmap %s\n", debugstr_w(szPath)); diff --git a/dlls/uxtheme/metric.c b/dlls/uxtheme/metric.c index daf17ca35a..5f6c36f5cf 100644 --- a/dlls/uxtheme/metric.c +++ b/dlls/uxtheme/metric.c @@ -181,7 +181,7 @@ int WINAPI GetThemeSysSize(HTHEME hTheme, int iSizeID) }; if(hTheme) { - for(i=0; i<sizeof(metricMap)/sizeof(metricMap[0]); i+=2) { + for(i=0; i<ARRAY_SIZE(metricMap); i+=2) { if(metricMap[i] == iSizeID) { id = metricMap[i+1]; break; diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index fe91494afd..bc8eca7b34 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -344,7 +344,7 @@ static BOOL MSSTYLES_ParseIniSectionName(LPCWSTR lpSection, DWORD dwLen, LPWSTR WCHAR state[60] = {'\0'}; LPWSTR tmp; LPWSTR comp; - lstrcpynW(sec, lpSection, min(dwLen+1, sizeof(sec)/sizeof(sec[0]))); + lstrcpynW(sec, lpSection, min(dwLen+1, ARRAY_SIZE(sec))); *szAppName = 0; *szClassName = 0; @@ -369,17 +369,17 @@ static BOOL MSSTYLES_ParseIniSectionName(LPCWSTR lpSection, DWORD dwLen, LPWSTR tmp = strchrW(comp, '('); if(tmp) { *tmp++ = 0; - lstrcpynW(part, comp, sizeof(part)/sizeof(part[0])); + lstrcpynW(part, comp, ARRAY_SIZE(part)); comp = tmp; /* now get the state */ tmp = strchrW(comp, ')'); if (!tmp) return FALSE; *tmp = 0; - lstrcpynW(state, comp, sizeof(state)/sizeof(state[0])); + lstrcpynW(state, comp, ARRAY_SIZE(state)); } else { - lstrcpynW(part, comp, sizeof(part)/sizeof(part[0])); + lstrcpynW(part, comp, ARRAY_SIZE(part)); } } else { @@ -393,7 +393,7 @@ static BOOL MSSTYLES_ParseIniSectionName(LPCWSTR lpSection, DWORD dwLen, LPWSTR if (!tmp) return FALSE; *tmp = 0; - lstrcpynW(state, comp, sizeof(state)/sizeof(state[0])); + lstrcpynW(state, comp, ARRAY_SIZE(state)); } else { lstrcpynW(szClassName, comp, MAX_THEME_CLASS_NAME); @@ -897,7 +897,7 @@ static void MSSTYLES_ParseThemeIni(PTHEME_FILE tf, BOOL setMetrics) parse_init_nonclient (&nonClientState); while((lpName=UXINI_GetNextValue(ini, &dwLen, &lpValue, &dwValueLen))) { - lstrcpynW(szPropertyName, lpName, min(dwLen+1, sizeof(szPropertyName)/sizeof(szPropertyName[0]))); + lstrcpynW(szPropertyName, lpName, min(dwLen+1, ARRAY_SIZE(szPropertyName))); if(MSSTYLES_LookupProperty(szPropertyName, &iPropertyPrimitive, &iPropertyId)) { if(iPropertyId >= TMT_FIRSTCOLOR && iPropertyId <= TMT_LASTCOLOR) { if (!parse_handle_color_property (&colorState, iPropertyId, @@ -948,7 +948,7 @@ static void MSSTYLES_ParseThemeIni(PTHEME_FILE tf, BOOL setMetrics) ps = MSSTYLES_AddPartState(cls, iPartId, iStateId); while((lpName=UXINI_GetNextValue(ini, &dwLen, &lpValue, &dwValueLen))) { - lstrcpynW(szPropertyName, lpName, min(dwLen+1, sizeof(szPropertyName)/sizeof(szPropertyName[0]))); + lstrcpynW(szPropertyName, lpName, min(dwLen+1, ARRAY_SIZE(szPropertyName))); if(MSSTYLES_LookupProperty(szPropertyName, &iPropertyPrimitive, &iPropertyId)) { MSSTYLES_AddProperty(ps, iPropertyPrimitive, iPropertyId, lpValue, dwValueLen, isGlobal); } @@ -1014,13 +1014,13 @@ PTHEME_CLASS MSSTYLES_OpenThemeClass(LPCWSTR pszAppName, LPCWSTR pszClassList) start = pszClassList; while((end = strchrW(start, ';'))) { len = end-start; - lstrcpynW(szClassName, start, min(len+1, sizeof(szClassName)/sizeof(szClassName[0]))); + lstrcpynW(szClassName, start, min(len+1, ARRAY_SIZE(szClassName))); start = end+1; cls = MSSTYLES_FindClass(tfActiveTheme, pszAppName, szClassName); if(cls) break; } if(!cls && *start) { - lstrcpynW(szClassName, start, sizeof(szClassName)/sizeof(szClassName[0])); + lstrcpynW(szClassName, start, ARRAY_SIZE(szClassName)); cls = MSSTYLES_FindClass(tfActiveTheme, pszAppName, szClassName); } if(cls) { @@ -1120,7 +1120,7 @@ HBITMAP MSSTYLES_LoadBitmap (PTHEME_CLASS tc, LPCWSTR lpFilename, BOOL* hasAlpha WCHAR szFile[MAX_PATH]; LPWSTR tmp; PTHEME_IMAGE img; - lstrcpynW(szFile, lpFilename, sizeof(szFile)/sizeof(szFile[0])); + lstrcpynW(szFile, lpFilename, ARRAY_SIZE(szFile)); tmp = szFile; do { if(*tmp == '\\') *tmp = '_'; @@ -1273,7 +1273,7 @@ static HRESULT MSSTYLES_GetFont (LPCWSTR lpCur, LPCWSTR lpEnd, pFont->lfHeight = pointSize; pFont->lfWeight = FW_REGULAR; pFont->lfCharSet = DEFAULT_CHARSET; - while(MSSTYLES_GetNextToken(lpCur, lpEnd, &lpCur, attr, sizeof(attr)/sizeof(attr[0]))) { + while(MSSTYLES_GetNextToken(lpCur, lpEnd, &lpCur, attr, ARRAY_SIZE(attr))) { if(!lstrcmpiW(szBold, attr)) pFont->lfWeight = FW_BOLD; else if(!lstrcmpiW(szItalic, attr)) pFont->lfItalic = TRUE; else if(!lstrcmpiW(szUnderline, attr)) pFont->lfUnderline = TRUE; diff --git a/dlls/uxtheme/property.c b/dlls/uxtheme/property.c index 9dffbdde87..0e077aeec4 100644 --- a/dlls/uxtheme/property.c +++ b/dlls/uxtheme/property.c @@ -87,7 +87,7 @@ HRESULT WINAPI GetThemeEnumValue(HTHEME hTheme, int iPartId, int iStateId, if(!(tp = MSSTYLES_FindProperty(hTheme, iPartId, iStateId, TMT_ENUM, iPropId))) return E_PROP_ID_UNSUPPORTED; - hr = MSSTYLES_GetPropertyString(tp, val, sizeof(val)/sizeof(val[0])); + hr = MSSTYLES_GetPropertyString(tp, val, ARRAY_SIZE(val)); if(FAILED(hr)) return hr; if(!MSSTYLES_LookupEnum(val, iPropId, piVal)) @@ -262,7 +262,7 @@ HRESULT WINAPI GetThemeMetric(HTHEME hTheme, HDC hdc, int iPartId, case TMT_COLOR: return MSSTYLES_GetPropertyColor(tp, (COLORREF*)piVal); case TMT_ENUM: - hr = MSSTYLES_GetPropertyString(tp, val, sizeof(val)/sizeof(val[0])); + hr = MSSTYLES_GetPropertyString(tp, val, ARRAY_SIZE(val)); if(FAILED(hr)) return hr; if(!MSSTYLES_LookupEnum(val, iPropId, piVal)) diff --git a/dlls/uxtheme/stylemap.c b/dlls/uxtheme/stylemap.c index a310d4031d..19e3c93224 100644 --- a/dlls/uxtheme/stylemap.c +++ b/dlls/uxtheme/stylemap.c @@ -1051,7 +1051,7 @@ BOOL MSSTYLES_LookupPartState(LPCWSTR pszClass, LPCWSTR pszPart, LPCWSTR pszStat *iPartId = 0; *iStateId = 0; - for(i=0; i<sizeof(mapClass)/sizeof(mapClass[0]); i++) { + for(i=0; i<ARRAY_SIZE(mapClass); i++) { if(!lstrcmpiW(mapClass[i].pszClass, pszClass)) { map = mapClass[i].lpMap; if(pszPart) { diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index e11271ac2b..db497544f9 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -159,7 +159,7 @@ static void UXTHEME_LoadTheme(void) /* Get current theme configuration */ if(!RegOpenKeyW(HKEY_CURRENT_USER, szThemeManager, &hKey)) { TRACE("Loading theme config\n"); - buffsize = sizeof(tmp)/sizeof(tmp[0]); + buffsize = ARRAY_SIZE(tmp); if(!RegQueryValueExW(hKey, szThemeActive, NULL, NULL, (LPBYTE)tmp, &buffsize)) { bThemeActive = (tmp[0] != '0'); } @@ -167,10 +167,10 @@ static void UXTHEME_LoadTheme(void) bThemeActive = FALSE; TRACE("Failed to get ThemeActive: %d\n", GetLastError()); } - buffsize = sizeof(szCurrentColor)/sizeof(szCurrentColor[0]); + buffsize = ARRAY_SIZE(szCurrentColor); if(RegQueryValueExW(hKey, szColorName, NULL, NULL, (LPBYTE)szCurrentColor, &buffsize)) szCurrentColor[0] = '\0'; - buffsize = sizeof(szCurrentSize)/sizeof(szCurrentSize[0]); + buffsize = ARRAY_SIZE(szCurrentSize); if(RegQueryValueExW(hKey, szSizeName, NULL, NULL, (LPBYTE)szCurrentSize, &buffsize)) szCurrentSize[0] = '\0'; if (query_reg_path (hKey, szDllName, szCurrentTheme)) @@ -194,8 +194,8 @@ static void UXTHEME_LoadTheme(void) } else { /* Make sure the global color & size match the theme */ - lstrcpynW(szCurrentColor, pt->pszSelectedColor, sizeof(szCurrentColor)/sizeof(szCurrentColor[0])); - lstrcpynW(szCurrentSize, pt->pszSelectedSize, sizeof(szCurrentSize)/sizeof(szCurrentSize[0])); + lstrcpynW(szCurrentColor, pt->pszSelectedColor, ARRAY_SIZE(szCurrentColor)); + lstrcpynW(szCurrentSize, pt->pszSelectedSize, ARRAY_SIZE(szCurrentSize)); MSSTYLES_SetActiveTheme(pt, FALSE); TRACE("Theme active: %s %s %s\n", debugstr_w(szCurrentTheme), @@ -477,9 +477,9 @@ static HRESULT UXTHEME_SetActiveTheme(PTHEME_FILE tf) return hr; if(tf) { bThemeActive = TRUE; - lstrcpynW(szCurrentTheme, tf->szThemeFile, sizeof(szCurrentTheme)/sizeof(szCurrentTheme[0])); - lstrcpynW(szCurrentColor, tf->pszSelectedColor, sizeof(szCurrentColor)/sizeof(szCurrentColor[0])); - lstrcpynW(szCurrentSize, tf->pszSelectedSize, sizeof(szCurrentSize)/sizeof(szCurrentSize[0])); + lstrcpynW(szCurrentTheme, tf->szThemeFile, ARRAY_SIZE(szCurrentTheme)); + lstrcpynW(szCurrentColor, tf->pszSelectedColor, ARRAY_SIZE(szCurrentColor)); + lstrcpynW(szCurrentSize, tf->pszSelectedSize, ARRAY_SIZE(szCurrentSize)); } else { UXTHEME_RestoreSystemMetrics(); @@ -661,9 +661,9 @@ HTHEME WINAPI OpenThemeDataEx(HWND hwnd, LPCWSTR pszClassList, DWORD flags) if(bThemeActive) { - pszAppName = UXTHEME_GetWindowProperty(hwnd, atSubAppName, szAppBuff, sizeof(szAppBuff)/sizeof(szAppBuff[0])); + pszAppName = UXTHEME_GetWindowProperty(hwnd, atSubAppName, szAppBuff, ARRAY_SIZE(szAppBuff)); /* If SetWindowTheme was used on the window, that overrides the class list passed to this function */ - pszUseClassList = UXTHEME_GetWindowProperty(hwnd, atSubIdList, szClassBuff, sizeof(szClassBuff)/sizeof(szClassBuff[0])); + pszUseClassList = UXTHEME_GetWindowProperty(hwnd, atSubIdList, szClassBuff, ARRAY_SIZE(szClassBuff)); if(!pszUseClassList) pszUseClassList = pszClassList; @@ -837,7 +837,7 @@ HRESULT WINAPI GetThemeDocumentationProperty(LPCWSTR pszThemeName, /* Try to load from string resources */ hr = E_PROP_ID_UNSUPPORTED; if(MSSTYLES_LookupProperty(pszPropertyName, NULL, &iDocId)) { - for(i=0; i<sizeof(wDocToRes)/sizeof(wDocToRes[0]); i+=2) { + for(i=0; i<ARRAY_SIZE(wDocToRes); i+=2) { if(wDocToRes[i] == iDocId) { if(LoadStringW(pt->hTheme, wDocToRes[i+1], pszValueBuff, cchMaxValChars)) { hr = S_OK; @@ -1049,9 +1049,9 @@ HRESULT WINAPI EnumThemes(LPCWSTR pszThemePath, EnumThemeProc callback, && !(wfd.cFileName[0] == '.' && ((wfd.cFileName[1] == '.' && wfd.cFileName[2] == 0) || wfd.cFileName[1] == 0))) { wsprintfW(szPath, szFormat, szDir, wfd.cFileName, wfd.cFileName); - hr = GetThemeDocumentationProperty(szPath, szDisplayName, szName, sizeof(szName)/sizeof(szName[0])); + hr = GetThemeDocumentationProperty(szPath, szDisplayName, szName, ARRAY_SIZE(szName)); if(SUCCEEDED(hr)) - hr = GetThemeDocumentationProperty(szPath, szTooltip, szTip, sizeof(szTip)/sizeof(szTip[0])); + hr = GetThemeDocumentationProperty(szPath, szTooltip, szTip, ARRAY_SIZE(szTip)); if(SUCCEEDED(hr)) { TRACE("callback(%s,%s,%s,%p)\n", debugstr_w(szPath), debugstr_w(szName), debugstr_w(szTip), lpData); if(!callback(NULL, szPath, szName, szTip, NULL, lpData)) { @@ -1113,12 +1113,10 @@ HRESULT WINAPI EnumThemeColors(LPWSTR pszThemeFileName, LPWSTR pszSizeName, if(!dwColorNum && *tmp) { TRACE("%s\n", debugstr_w(tmp)); lstrcpyW(pszColorNames->szName, tmp); - LoadStringW (pt->hTheme, resourceId, - pszColorNames->szDisplayName, - sizeof (pszColorNames->szDisplayName) / sizeof (WCHAR)); - LoadStringW (pt->hTheme, resourceId+1000, - pszColorNames->szTooltip, - sizeof (pszColorNames->szTooltip) / sizeof (WCHAR)); + LoadStringW(pt->hTheme, resourceId, pszColorNames->szDisplayName, + ARRAY_SIZE(pszColorNames->szDisplayName)); + LoadStringW(pt->hTheme, resourceId+1000, pszColorNames->szTooltip, + ARRAY_SIZE(pszColorNames->szTooltip)); } else hr = E_PROP_ID_UNSUPPORTED; @@ -1173,12 +1171,10 @@ HRESULT WINAPI EnumThemeSizes(LPWSTR pszThemeFileName, LPWSTR pszColorName, if(!dwSizeNum && *tmp) { TRACE("%s\n", debugstr_w(tmp)); lstrcpyW(pszSizeNames->szName, tmp); - LoadStringW (pt->hTheme, resourceId, - pszSizeNames->szDisplayName, - sizeof (pszSizeNames->szDisplayName) / sizeof (WCHAR)); - LoadStringW (pt->hTheme, resourceId+1000, - pszSizeNames->szTooltip, - sizeof (pszSizeNames->szTooltip) / sizeof (WCHAR)); + LoadStringW(pt->hTheme, resourceId, pszSizeNames->szDisplayName, + ARRAY_SIZE(pszSizeNames->szDisplayName)); + LoadStringW(pt->hTheme, resourceId+1000, pszSizeNames->szTooltip, + ARRAY_SIZE(pszSizeNames->szTooltip)); } else hr = E_PROP_ID_UNSUPPORTED; -- 2.14.4

Sept. 18, 2018

Re: [PATCH] wininet/tests: Skip tests when querying INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT fails (newer win10)

by Marvin

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=42197 Your paranoid android. === w2003std (32 bit Windows report) === wininet: http.c:6021: Test failed: HttpSendRequest failed: 12045 http.c:6822: Test failed: HttpSendRequest failed with error 12045

Sept. 18, 2018

[PATCH] wininet/tests: Skip tests when querying INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT fails (newer win10)

by André Hentschel

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/wininet/tests/http.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index ace8512399..9ec4902cdc 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -5569,6 +5569,12 @@ static void test_cert_struct(HINTERNET req, const cert_struct_test_t *test) size = sizeof(info); res = InternetQueryOptionA(req, INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT, &info, &size); + if (!res) + { + win_skip("Querying INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT failed, skipping tests\n"); + return; + } + ok(res, "InternetQueryOption failed: %u\n", GetLastError()); ok(size == sizeof(info), "size = %u\n", size); -- 2.17.1

Sept. 18, 2018