wine-devel September 2018

wine-devel@winehq.org

70 participants
627 discussions

[PATCH 4/4] msi/tests: Add a test for repetitive MsiGetActiveDatabase calls.
by Dmitry Timoshkov 19 Sep '18

19 Sep '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/msi/tests/custom.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index c6e9f1eb52..1694e93fde 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -281,7 +281,7 @@ static void test_db(MSIHANDLE hinst) VT_EMPTY, VT_EMPTY, VT_LPSTR, VT_EMPTY, VT_LPSTR, VT_EMPTY, VT_EMPTY, VT_EMPTY, VT_EMPTY, VT_I4, VT_I4, VT_EMPTY, VT_EMPTY, VT_EMPTY, VT_EMPTY }; - MSIHANDLE hdb, view, rec, rec2, suminfo; + MSIHANDLE hdb, hdb2, view, rec, rec2, suminfo; char buffer[10]; DWORD sz; UINT r, count, type, i; @@ -312,6 +312,17 @@ static void test_db(MSIHANDLE hinst) ok(hinst, sz == strlen(buffer), "got size %u\n", sz); ok(hinst, !strcmp(buffer, "Name"), "got '%s'\n", buffer); + /* Test MsiGetActiveDatabase + MsiDatabaseIsTablePersistent once again */ + hdb2 = MsiGetActiveDatabase(hinst); + ok(hinst, hdb2, "MsiGetActiveDatabase failed\n"); + ok(hinst, hdb2 != hdb, "db handles should be different\n"); + + r = MsiDatabaseIsTablePersistentA(hdb2, "Test"); + ok(hinst, r == MSICONDITION_TRUE, "got %u\n", r); + + r = MsiCloseHandle(hdb2); + ok(hinst, !r, "got %u\n", r); + r = MsiCloseHandle(rec2); ok(hinst, !r, "got %u\n", r); -- 2.17.1

2 1

[PATCH 2/4] msi: Do not attempt to copy a not string property in MsiSummaryInfoGetProperty.
by Dmitry Timoshkov 19 Sep '18

19 Sep '18

This patch fixes the crashes when running the tests under Wine. Currently the crashes are hidden by a custom action exception handler. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/msi/suminfo.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msi/suminfo.c b/dlls/msi/suminfo.c index af3458a0a8..98f6330d9f 100644 --- a/dlls/msi/suminfo.c +++ b/dlls/msi/suminfo.c @@ -758,8 +758,10 @@ UINT WINAPI MsiSummaryInfoGetPropertyA( } __ENDTRY - if (!r) + if (!r && buf) + { r = msi_strncpyWtoA( buf, -1, szValueBuf, pcchValueBuf, TRUE ); + } midl_user_free( buf ); return r; @@ -808,7 +810,7 @@ UINT WINAPI MsiSummaryInfoGetPropertyW( } __ENDTRY - if (!r) + if (!r && buf) r = msi_strncpyW( buf, -1, szValueBuf, pcchValueBuf ); midl_user_free( buf ); -- 2.17.1

2 1

[PATCH 1/4] msi: Move parameter checks to a common helper in MsiSummaryInfoSetProperty.
by Dmitry Timoshkov 19 Sep '18

19 Sep '18

Currently MsiSummaryInfoSetProperty tests don't have a chance to execute under Wine because the tests crash earlier, and the crashes are hidden by a custom action exception handler. This patch simplifies the next one. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/msi/suminfo.c | 44 ++++++++++++++++++++------------------------ 1 file changed, 20 insertions(+), 24 deletions(-) diff --git a/dlls/msi/suminfo.c b/dlls/msi/suminfo.c index 37c49d72e2..af3458a0a8 100644 --- a/dlls/msi/suminfo.c +++ b/dlls/msi/suminfo.c @@ -877,26 +877,32 @@ static UINT set_prop( MSISUMMARYINFO *si, UINT uiProperty, UINT type, return ERROR_SUCCESS; } -UINT WINAPI MsiSummaryInfoSetPropertyW( MSIHANDLE handle, UINT uiProperty, UINT uiDataType, - INT iValue, FILETIME *pftValue, LPCWSTR szValue ) +static UINT msi_set_prop( MSISUMMARYINFO *si, UINT uiProperty, UINT uiDataType, + INT iValue, FILETIME *pftValue, awcstring *str ) { - awcstring str; - MSISUMMARYINFO *si; - UINT type, ret; - - TRACE("%u, %u, %u, %d, %p, %s\n", handle, uiProperty, uiDataType, iValue, pftValue, - debugstr_w(szValue) ); - - type = get_type( uiProperty ); + UINT type = get_type( uiProperty ); if( type == VT_EMPTY || type != uiDataType ) return ERROR_DATATYPE_MISMATCH; - if( uiDataType == VT_LPSTR && !szValue ) + if( uiDataType == VT_LPSTR && !str->str.a ) return ERROR_INVALID_PARAMETER; if( uiDataType == VT_FILETIME && !pftValue ) return ERROR_INVALID_PARAMETER; + return set_prop( si, uiProperty, type, iValue, pftValue, str ); +} + +UINT WINAPI MsiSummaryInfoSetPropertyW( MSIHANDLE handle, UINT uiProperty, UINT uiDataType, + INT iValue, FILETIME *pftValue, LPCWSTR szValue ) +{ + awcstring str; + MSISUMMARYINFO *si; + UINT ret; + + TRACE("%u, %u, %u, %d, %p, %s\n", handle, uiProperty, uiDataType, iValue, pftValue, + debugstr_w(szValue) ); + if (!(si = msihandle2msiinfo( handle, MSIHANDLETYPE_SUMMARYINFO ))) { MSIHANDLE remote; @@ -913,7 +919,7 @@ UINT WINAPI MsiSummaryInfoSetPropertyW( MSIHANDLE handle, UINT uiProperty, UINT str.unicode = TRUE; str.str.w = szValue; - ret = set_prop( si, uiProperty, type, iValue, pftValue, &str ); + ret = msi_set_prop( si, uiProperty, uiDataType, iValue, pftValue, &str ); msiobj_release( &si->hdr ); return ret; } @@ -923,21 +929,11 @@ UINT WINAPI MsiSummaryInfoSetPropertyA( MSIHANDLE handle, UINT uiProperty, UINT { awcstring str; MSISUMMARYINFO *si; - UINT type, ret; + UINT ret; TRACE("%u, %u, %u, %d, %p, %s\n", handle, uiProperty, uiDataType, iValue, pftValue, debugstr_a(szValue) ); - type = get_type( uiProperty ); - if( type == VT_EMPTY || type != uiDataType ) - return ERROR_DATATYPE_MISMATCH; - - if( uiDataType == VT_LPSTR && !szValue ) - return ERROR_INVALID_PARAMETER; - - if( uiDataType == VT_FILETIME && !pftValue ) - return ERROR_INVALID_PARAMETER; - if (!(si = msihandle2msiinfo( handle, MSIHANDLETYPE_SUMMARYINFO ))) { MSIHANDLE remote; @@ -954,7 +950,7 @@ UINT WINAPI MsiSummaryInfoSetPropertyA( MSIHANDLE handle, UINT uiProperty, UINT str.unicode = FALSE; str.str.a = szValue; - ret = set_prop( si, uiProperty, uiDataType, iValue, pftValue, &str ); + ret = msi_set_prop( si, uiProperty, uiDataType, iValue, pftValue, &str ); msiobj_release( &si->hdr ); return ret; } -- 2.17.1

2 1

[PATCH v8 1/5] shell32/autocomplete: Don't auto-append on control characters
by Gabriel Ivăncescu 19 Sep '18

19 Sep '18

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

2 9

[PATCH 1/5] quartz/tests: Test interfaces exposed by the filter graph.
by Zebediah Figura 19 Sep '18

19 Sep '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/filtergraph.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 37304d6..82f895f 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -76,6 +76,46 @@ static IFilterGraph2 *create_graph(void) return ret; } +#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) +static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) +{ + IUnknown *iface = iface_ptr; + HRESULT hr, expected_hr; + IUnknown *unk; + + expected_hr = supported ? S_OK : E_NOINTERFACE; + + hr = IUnknown_QueryInterface(iface, iid, (void **)&unk); + ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + if (SUCCEEDED(hr)) + IUnknown_Release(unk); +} + +static void test_interfaces(void) +{ + IFilterGraph2 *graph = create_graph(); + + check_interface(graph, &IID_IBasicAudio, TRUE); + check_interface(graph, &IID_IBasicVideo2, TRUE); + check_interface(graph, &IID_IFilterGraph2, TRUE); + check_interface(graph, &IID_IFilterMapper, TRUE); + check_interface(graph, &IID_IFilterMapper3, TRUE); + check_interface(graph, &IID_IGraphConfig, TRUE); + check_interface(graph, &IID_IGraphVersion, TRUE); + check_interface(graph, &IID_IMediaControl, TRUE); + check_interface(graph, &IID_IMediaEvent, TRUE); + check_interface(graph, &IID_IMediaFilter, TRUE); + check_interface(graph, &IID_IMediaEventSink, TRUE); + check_interface(graph, &IID_IMediaPosition, TRUE); + check_interface(graph, &IID_IMediaSeeking, TRUE); + check_interface(graph, &IID_IObjectWithSite, TRUE); + check_interface(graph, &IID_IVideoWindow, TRUE); + + check_interface(graph, &IID_IBaseFilter, FALSE); + + IFilterGraph2_Release(graph); +} + static void test_basic_video(IFilterGraph2 *graph) { IBasicVideo* pbv; @@ -1827,6 +1867,7 @@ START_TEST(filtergraph) { CoInitializeEx(NULL, COINIT_MULTITHREADED); + test_interfaces(); test_render_run(avifile); test_render_run(mpegfile); test_enum_filters(); -- 2.7.4

1 4

Is WINE compatible with .NET framework
by mrt303xx＠aol.com 18 Sep '18

18 Sep '18

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

1 0

[PATCH] uxtheme: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 18 Sep '18

18 Sep '18

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

1 0

[PATCH] user32/tests: Allow newer Win10 behaviour
by André Hentschel 18 Sep '18

18 Sep '18

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/user32/tests/monitor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index f4c1a4b17c..8f1b2c6fdd 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -585,7 +585,7 @@ static void test_display_config(void) paths = modes = 100; ret = pGetDisplayConfigBufferSizes(0, &paths, &modes); ok(ret == ERROR_INVALID_PARAMETER || ret == ERROR_NOT_SUPPORTED, "got %d\n", ret); - ok(modes == 0 && paths == 0, "got %u, %u\n", modes, paths); + ok((modes == 0 || modes == 100) && paths == 0, "got %u, %u\n", modes, paths); } START_TEST(monitor) -- 2.17.1

1 0

[PATCH] winex11.drv: Add missing biCompression initialization (Valgrind)
by Sven Baars 18 Sep '18

18 Sep '18

This was previously used uninitialized in bitmapinfoheader_from_user_bitmapinfo Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/winex11.drv/window.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 0a4f118c34..37531d8595 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -545,6 +545,7 @@ static BOOL create_icon_pixmaps( HDC hdc, const ICONINFO *icon, Pixmap *icon_ret info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); info->bmiHeader.biBitCount = 0; + info->bmiHeader.biCompression = BI_RGB; if (!(lines = GetDIBits( hdc, icon->hbmColor, 0, 0, NULL, info, DIB_RGB_COLORS ))) goto failed; if (!(bits.ptr = HeapAlloc( GetProcessHeap(), 0, info->bmiHeader.biSizeImage ))) goto failed; if (!GetDIBits( hdc, icon->hbmColor, 0, lines, bits.ptr, info, DIB_RGB_COLORS )) goto failed; -- 2.17.1

2 2

[PATCH 8/8] dxgi/tests: Add test for swapchain formats.
by Józef Kucia 18 Sep '18

18 Sep '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/tests/dxgi.c | 100 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 99 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 376c1ecd6fdf..9ab247254922 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -3804,7 +3804,7 @@ static void test_swapchain_backbuffer_index(IUnknown *device, BOOL is_d3d12) { swapchain_desc.SwapEffect = tests[i].swap_effect; expected_hr = is_d3d12 && !tests[i].supported_in_d3d12 ? DXGI_ERROR_INVALID_CALL : S_OK; - hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); + hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); ok(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); if (FAILED(hr)) continue; @@ -3837,6 +3837,102 @@ done: ok(refcount == !is_d3d12, "Got unexpected refcount %u.\n", refcount); } +static void test_swapchain_formats(IUnknown *device, BOOL is_d3d12) +{ + DXGI_SWAP_CHAIN_DESC swapchain_desc; + IDXGISwapChain *swapchain; + HRESULT hr, expected_hr; + IDXGIFactory *factory; + unsigned int i; + ULONG refcount; + BOOL is_flip; + RECT rect; + BOOL ret; + + static const struct + { + DXGI_FORMAT format; + DXGI_SWAP_EFFECT swap_effect; + BOOL supported; + } + tests[] = + { + {DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_SWAP_EFFECT_DISCARD, TRUE}, + {DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_SWAP_EFFECT_SEQUENTIAL, TRUE}, + {DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, TRUE}, + {DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_SWAP_EFFECT_FLIP_DISCARD, TRUE}, + {DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_SWAP_EFFECT_DISCARD, TRUE}, + {DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_SWAP_EFFECT_SEQUENTIAL, TRUE}, + {DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, FALSE}, + {DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_SWAP_EFFECT_FLIP_DISCARD, FALSE}, + {DXGI_FORMAT_B8G8R8A8_UNORM, DXGI_SWAP_EFFECT_DISCARD, TRUE}, + {DXGI_FORMAT_B8G8R8A8_UNORM, DXGI_SWAP_EFFECT_SEQUENTIAL, TRUE}, + {DXGI_FORMAT_B8G8R8A8_UNORM, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, TRUE}, + {DXGI_FORMAT_B8G8R8A8_UNORM, DXGI_SWAP_EFFECT_FLIP_DISCARD, TRUE}, + {DXGI_FORMAT_B8G8R8A8_UNORM_SRGB, DXGI_SWAP_EFFECT_DISCARD, TRUE}, + {DXGI_FORMAT_B8G8R8A8_UNORM_SRGB, DXGI_SWAP_EFFECT_SEQUENTIAL, TRUE}, + {DXGI_FORMAT_B8G8R8A8_UNORM_SRGB, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, FALSE}, + {DXGI_FORMAT_B8G8R8A8_UNORM_SRGB, DXGI_SWAP_EFFECT_FLIP_DISCARD, FALSE}, + {DXGI_FORMAT_R10G10B10A2_UNORM, DXGI_SWAP_EFFECT_DISCARD, TRUE}, + {DXGI_FORMAT_R10G10B10A2_UNORM, DXGI_SWAP_EFFECT_SEQUENTIAL, TRUE}, + {DXGI_FORMAT_R10G10B10A2_UNORM, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, TRUE}, + {DXGI_FORMAT_R10G10B10A2_UNORM, DXGI_SWAP_EFFECT_FLIP_DISCARD, TRUE}, + {DXGI_FORMAT_R16G16B16A16_FLOAT, DXGI_SWAP_EFFECT_DISCARD, TRUE}, + {DXGI_FORMAT_R16G16B16A16_FLOAT, DXGI_SWAP_EFFECT_SEQUENTIAL, TRUE}, + {DXGI_FORMAT_R16G16B16A16_FLOAT, DXGI_SWAP_EFFECT_FLIP_DISCARD, TRUE}, + {DXGI_FORMAT_R16G16B16A16_FLOAT, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, TRUE}, + {DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM, DXGI_SWAP_EFFECT_FLIP_DISCARD, FALSE}, + {DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, FALSE}, + }; + + get_factory(device, is_d3d12, &factory); + + swapchain_desc.BufferDesc.RefreshRate.Numerator = 60; + swapchain_desc.BufferDesc.RefreshRate.Denominator = 60; + swapchain_desc.BufferDesc.ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED; + swapchain_desc.BufferDesc.Scaling = DXGI_MODE_SCALING_UNSPECIFIED; + swapchain_desc.SampleDesc.Count = 1; + swapchain_desc.SampleDesc.Quality = 0; + swapchain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; + swapchain_desc.BufferCount = 4; + swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0); + swapchain_desc.Windowed = TRUE; + swapchain_desc.Flags = 0; + + ret = GetClientRect(swapchain_desc.OutputWindow, &rect); + ok(ret, "Failed to get client rect.\n"); + swapchain_desc.BufferDesc.Width = rect.right; + swapchain_desc.BufferDesc.Height = rect.bottom; + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + is_flip = tests[i].swap_effect == DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL + || tests[i].swap_effect == DXGI_SWAP_EFFECT_FLIP_DISCARD; + + if (is_d3d12 && !is_flip) + continue; + + swapchain_desc.BufferDesc.Format = tests[i].format; + swapchain_desc.SwapEffect = tests[i].swap_effect; + hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); + expected_hr = tests[i].supported ? S_OK : DXGI_ERROR_INVALID_CALL; + ok(hr == expected_hr + /* Flip presentation model not supported. */ + || broken(is_flip && hr == DXGI_ERROR_INVALID_CALL), + "Test %u: Got hr %#x, expected %#x.\n", i, hr, expected_hr); + + if (SUCCEEDED(hr)) + { + refcount = IDXGISwapChain_Release(swapchain); + ok(!refcount, "Swapchain has %u references left.\n", refcount); + } + } + + DestroyWindow(swapchain_desc.OutputWindow); + refcount = IDXGIFactory_Release(factory); + ok(refcount == !is_d3d12, "Got unexpected refcount %u.\n", refcount); +} + static void test_maximum_frame_latency(void) { IDXGIDevice1 *device1; @@ -4210,6 +4306,7 @@ START_TEST(dxgi) test_swapchain_parameters(); run_on_d3d10(test_swapchain_resize); run_on_d3d10(test_swapchain_backbuffer_index); + run_on_d3d10(test_swapchain_formats); if (!(d3d12_module = LoadLibraryA("d3d12.dll"))) { @@ -4228,6 +4325,7 @@ START_TEST(dxgi) run_on_d3d12(test_swapchain_resize); run_on_d3d12(test_swapchain_backbuffer_index); + run_on_d3d12(test_swapchain_formats); FreeLibrary(d3d12_module); } -- 2.16.4

2 1

← Newer
1
...
24
25
26
27
28
29
30
...
63
Older →

Jump to page:

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 September 2018