November 2016 - Wine-commits

Nikolay Sivov : wincodecs: Implement FilterOption property for PNG encoder.
by Alexandre Julliard 28 Nov '16

28 Nov '16

Module: wine Branch: master Commit: 5107ef7566ea91f9319c7900addd88dd6c9a3445 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5107ef7566ea91f9319c7900a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 24 12:23:28 2016 +0300 wincodecs: Implement FilterOption property for PNG encoder. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/pngformat.c | 63 ++++++++++++++++++++++++++++-------- dlls/windowscodecs/tests/converter.c | 19 ++++++++++- include/wincodec.idl | 11 +++++++ 3 files changed, 79 insertions(+), 14 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index bb2aef9..9a84162 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -39,8 +39,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); -static const WCHAR wszPngInterlaceOption[] = {'I','n','t','e','r','l','a','c','e','O','p','t','i','o','n',0}; - static inline ULONG read_ulong_be(BYTE* data) { return data[0] << 24 | data[1] << 16 | data[2] << 8 | data[3]; @@ -327,6 +325,7 @@ MAKE_FUNCPTR(png_set_expand_gray_1_2_4_to_8); MAKE_FUNCPTR(png_set_gray_1_2_4_to_8); #endif MAKE_FUNCPTR(png_set_filler); +MAKE_FUNCPTR(png_set_filter); MAKE_FUNCPTR(png_set_gray_to_rgb); MAKE_FUNCPTR(png_set_interlace_handling); MAKE_FUNCPTR(png_set_IHDR); @@ -353,6 +352,9 @@ static CRITICAL_SECTION_DEBUG init_png_cs_debug = }; static CRITICAL_SECTION init_png_cs = { &init_png_cs_debug, -1, 0, 0, 0, 0 }; +static const WCHAR wszPngInterlaceOption[] = {'I','n','t','e','r','l','a','c','e','O','p','t','i','o','n',0}; +static const WCHAR wszPngFilterOption[] = {'F','i','l','t','e','r','O','p','t','i','o','n',0}; + static void *load_libpng(void) { void *result; @@ -392,6 +394,7 @@ static void *load_libpng(void) LOAD_FUNCPTR(png_set_gray_1_2_4_to_8); #endif LOAD_FUNCPTR(png_set_filler); + LOAD_FUNCPTR(png_set_filter); LOAD_FUNCPTR(png_set_gray_to_rgb); LOAD_FUNCPTR(png_set_interlace_handling); LOAD_FUNCPTR(png_set_IHDR); @@ -1356,6 +1359,7 @@ typedef struct PngEncoder { BOOL committed; CRITICAL_SECTION lock; BOOL interlace; + WICPngFilterOption filter; BYTE *data; UINT stride; UINT passes; @@ -1410,31 +1414,44 @@ static HRESULT WINAPI PngFrameEncode_Initialize(IWICBitmapFrameEncode *iface, IPropertyBag2 *pIEncoderOptions) { PngEncoder *This = impl_from_IWICBitmapFrameEncode(iface); + WICPngFilterOption filter; BOOL interlace; - PROPBAG2 opts[1]= {{0}}; - VARIANT opt_values[1]; - HRESULT opt_hres[1]; + PROPBAG2 opts[2]= {{0}}; + VARIANT opt_values[2]; + HRESULT opt_hres[2]; HRESULT hr; TRACE("(%p,%p)\n", iface, pIEncoderOptions); opts[0].pstrName = (LPOLESTR)wszPngInterlaceOption; opts[0].vt = VT_BOOL; + opts[1].pstrName = (LPOLESTR)wszPngFilterOption; + opts[1].vt = VT_UI1; if (pIEncoderOptions) { - hr = IPropertyBag2_Read(pIEncoderOptions, 1, opts, NULL, opt_values, opt_hres); + hr = IPropertyBag2_Read(pIEncoderOptions, sizeof(opts)/sizeof(opts[0]), opts, NULL, opt_values, opt_hres); if (FAILED(hr)) return hr; + + if (V_VT(&opt_values[0]) == VT_EMPTY) + interlace = FALSE; + else + interlace = (V_BOOL(&opt_values[0]) != 0); + + filter = V_UI1(&opt_values[1]); + if (filter > WICPngFilterAdaptive) + { + WARN("Unrecognized filter option value %u.\n", filter); + filter = WICPngFilterUnspecified; + } } else - memset(opt_values, 0, sizeof(opt_values)); - - if (V_VT(&opt_values[0]) == VT_EMPTY) + { interlace = FALSE; - else - interlace = (V_BOOL(&opt_values[0]) != 0); + filter = WICPngFilterUnspecified; + } EnterCriticalSection(&This->lock); @@ -1445,6 +1462,7 @@ static HRESULT WINAPI PngFrameEncode_Initialize(IWICBitmapFrameEncode *iface, } This->interlace = interlace; + This->filter = filter; This->frame_initialized = TRUE; @@ -1617,6 +1635,22 @@ static HRESULT WINAPI PngFrameEncode_WritePixels(IWICBitmapFrameEncode *iface, if (This->interlace) This->passes = ppng_set_interlace_handling(This->png_ptr); + if (This->filter != WICPngFilterUnspecified) + { + static const int png_filter_map[] = + { + /* WICPngFilterUnspecified */ PNG_NO_FILTERS, + /* WICPngFilterNone */ PNG_FILTER_NONE, + /* WICPngFilterSub */ PNG_FILTER_SUB, + /* WICPngFilterUp */ PNG_FILTER_UP, + /* WICPngFilterAverage */ PNG_FILTER_AVG, + /* WICPngFilterPaeth */ PNG_FILTER_PAETH, + /* WICPngFilterAdaptive */ PNG_ALL_FILTERS, + }; + + ppng_set_filter(This->png_ptr, 0, png_filter_map[This->filter]); + } + This->info_written = TRUE; } @@ -1926,7 +1960,7 @@ static HRESULT WINAPI PngEncoder_CreateNewFrame(IWICBitmapEncoder *iface, { PngEncoder *This = impl_from_IWICBitmapEncoder(iface); HRESULT hr; - PROPBAG2 opts[1]= {{0}}; + PROPBAG2 opts[2]= {{0}}; TRACE("(%p,%p,%p)\n", iface, ppIFrameEncode, ppIEncoderOptions); @@ -1947,8 +1981,11 @@ static HRESULT WINAPI PngEncoder_CreateNewFrame(IWICBitmapEncoder *iface, opts[0].pstrName = (LPOLESTR)wszPngInterlaceOption; opts[0].vt = VT_BOOL; opts[0].dwType = PROPBAG2_TYPE_DATA; + opts[1].pstrName = (LPOLESTR)wszPngFilterOption; + opts[1].vt = VT_UI1; + opts[1].dwType = PROPBAG2_TYPE_DATA; - hr = CreatePropertyBag2(opts, 1, ppIEncoderOptions); + hr = CreatePropertyBag2(opts, sizeof(opts)/sizeof(opts[0]), ppIEncoderOptions); if (FAILED(hr)) { LeaveCriticalSection(&This->lock); diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index 7ca201a..2af9857 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -418,11 +418,13 @@ typedef struct property_opt_test_data VARTYPE initial_var_type; int i_init_val; float f_init_val; + BOOL skippable; } property_opt_test_data; static const WCHAR wszTiffCompressionMethod[] = {'T','i','f','f','C','o','m','p','r','e','s','s','i','o','n','M','e','t','h','o','d',0}; static const WCHAR wszCompressionQuality[] = {'C','o','m','p','r','e','s','s','i','o','n','Q','u','a','l','i','t','y',0}; static const WCHAR wszInterlaceOption[] = {'I','n','t','e','r','l','a','c','e','O','p','t','i','o','n',0}; +static const WCHAR wszFilterOption[] = {'F','i','l','t','e','r','O','p','t','i','o','n',0}; static const struct property_opt_test_data testdata_tiff_props[] = { { wszTiffCompressionMethod, VT_UI1, VT_UI1, WICTiffCompressionDontCare }, @@ -430,6 +432,12 @@ static const struct property_opt_test_data testdata_tiff_props[] = { { NULL } }; +static const struct property_opt_test_data testdata_png_props[] = { + { wszInterlaceOption, VT_BOOL, VT_BOOL, 0 }, + { wszFilterOption, VT_UI1, VT_UI1, WICPngFilterUnspecified, 0.0f, TRUE /* not supported on XP/2k3 */}, + { NULL } +}; + static int find_property_index(const WCHAR* name, PROPBAG2* all_props, int all_prop_cnt) { int i; @@ -456,6 +464,13 @@ static void test_specific_encoder_properties(IPropertyBag2 *options, const prope hr = IPropertyBag2_Read(options, 1, &pb, NULL, &pvarValue, &phrError); + if (data[i].skippable && idx == -1) + { + win_skip("Property %s is not supported on this machine.\n", wine_dbgstr_w(data[i].name)); + i++; + continue; + } + ok(idx >= 0, "Property %s not in output of GetPropertyInfo\n", wine_dbgstr_w(data[i].name)); if (idx >= 0) @@ -543,8 +558,10 @@ static void test_encoder_properties(const CLSID* clsid_encoder, IPropertyBag2 *o (int)cProperties, (int)cProperties2); } - if (clsid_encoder == &CLSID_WICTiffEncoder) + if (IsEqualCLSID(clsid_encoder, &CLSID_WICTiffEncoder)) test_specific_encoder_properties(options, testdata_tiff_props, all_props, cProperties2); + else if (IsEqualCLSID(clsid_encoder, &CLSID_WICPngEncoder)) + test_specific_encoder_properties(options, testdata_png_props, all_props, cProperties2); for (i=0; i < cProperties2; i++) { diff --git a/include/wincodec.idl b/include/wincodec.idl index 83daba8..406fe6b 100644 --- a/include/wincodec.idl +++ b/include/wincodec.idl @@ -168,6 +168,17 @@ typedef enum WICTiffCompressionOption { WICTIFFCOMPRESSIONOPTION_FORCE_DWORD = CODEC_FORCE_DWORD } WICTiffCompressionOption; +typedef enum WICPngFilterOption { + WICPngFilterUnspecified = 0, + WICPngFilterNone = 1, + WICPngFilterSub = 2, + WICPngFilterUp = 3, + WICPngFilterAverage = 4, + WICPngFilterPaeth = 5, + WICPngFilterAdaptive = 6, + WICPNFFILTEROPTION_FORCE_DWORD = CODEC_FORCE_DWORD +} WICPngFilterOption; + typedef GUID WICPixelFormatGUID; typedef REFGUID REFWICPixelFormatGUID;

1 0

Nikolay Sivov : wincodecs: Simplify property name allocation.
by Alexandre Julliard 28 Nov '16

28 Nov '16

Module: wine Branch: master Commit: b0d04e69bbc949324597082e6d36254bdb542171 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0d04e69bbc949324597082e6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 24 12:23:46 2016 +0300 wincodecs: Simplify property name allocation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/propertybag.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/windowscodecs/propertybag.c b/dlls/windowscodecs/propertybag.c index 8e81ec0..2f3015c 100644 --- a/dlls/windowscodecs/propertybag.c +++ b/dlls/windowscodecs/propertybag.c @@ -94,7 +94,7 @@ static ULONG WINAPI PropertyBag_Release(IPropertyBag2 *iface) { for (i=0; i < This->prop_count; i++) { - HeapFree(GetProcessHeap(), 0, This->properties[i].pstrName); + CoTaskMemFree(This->properties[i].pstrName); VariantClear( This->values+i ); } } @@ -213,18 +213,14 @@ static HRESULT WINAPI PropertyBag_CountProperties(IPropertyBag2 *iface, ULONG *p return S_OK; } -static HRESULT copy_propbag2(PROPBAG2 *dest, PROPBAG2 *src, BOOL useCoAlloc) +static HRESULT copy_propbag2(PROPBAG2 *dest, PROPBAG2 *src) { dest->cfType = src->cfType; dest->clsid = src->clsid; dest->dwHint = src->dwHint; dest->dwType = src->dwType; dest->vt = src->vt; - if(useCoAlloc) - dest->pstrName = CoTaskMemAlloc((strlenW(src->pstrName)+1) * sizeof(WCHAR)); - else - dest->pstrName = HeapAlloc(GetProcessHeap(), 0, (strlenW(src->pstrName)+1) * sizeof(WCHAR)); - + dest->pstrName = CoTaskMemAlloc((strlenW(src->pstrName)+1) * sizeof(WCHAR)); if(!dest->pstrName) return E_OUTOFMEMORY; @@ -251,7 +247,7 @@ static HRESULT WINAPI PropertyBag_GetPropertyInfo(IPropertyBag2 *iface, ULONG iP for (i=0; i < *pcProperties; i++) { - res = copy_propbag2(pPropBag+i, This->properties+iProperty+i, TRUE); + res = copy_propbag2(pPropBag+i, This->properties+iProperty+i); if (FAILED(res)) { do { @@ -311,7 +307,7 @@ HRESULT CreatePropertyBag2(PROPBAG2 *options, UINT count, else for (i=0; i < count; i++) { - res = copy_propbag2(This->properties+i, options+i, FALSE); + res = copy_propbag2(This->properties+i, options+i); if (FAILED(res)) break; This->properties[i].dwHint = i+1; /* 0 means unset, so we start with 1 */

1 0

Jeremy Newman : cleanup and bootstrapify
by Jeremy Newman 28 Nov '16

28 Nov '16

Module: appdb Branch: master Commit: 48307f36d1bf58997027da4fe206e8ef2e63723f URL: http://source.winehq.org/git/appdb.git/?a=commit;h=48307f36d1bf58997027da4f… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Nov 28 12:01:37 2016 -0600 cleanup and bootstrapify --- viewbugs.php | 116 +++++++++++++++++++++++++---------------------------------- 1 file changed, 49 insertions(+), 67 deletions(-) diff --git a/viewbugs.php b/viewbugs.php index 517dd35..f9646da 100644 --- a/viewbugs.php +++ b/viewbugs.php @@ -4,87 +4,69 @@ * * Mandatory parameters: * - iBugId, bug identifier - * - * TODO: - * - replace the check is_numeric($aClean['iBugId']) with an is_empty check when filtering is in place */ // application environment require("path.php"); require(BASE."include/incl.php"); -/* code to View versions affected by a Bug */ +apidb_header("Applications Affected by Bug #{$aClean['iBugId']}"); -if(!is_numeric($aClean['iBugId'])) - util_show_error_page_and_exit("Something went wrong with the bug ID"); +echo '<h1 class="whq-app-title">Applications Affected by Bug #'.$aClean['iBugId'].'</h1>',"\n"; - apidb_header("Applications affected by Bug #".$aClean['iBugId']); - echo '<form method=post action="viewbugs.php?iBugId='.$aClean['iBugId'].'">',"\n"; +echo '<form method=post action="viewbugs.php?iBugId='.$aClean['iBugId'].'">',"\n"; +echo '<input type="text" name="iBugId" value="'.$aClean['iBugId'].'" class="form-control form-control-inline" size="10">',"\n"; +echo '<button type="submit" class="btn btn-default">Search</button>',"\n"; +echo '</form>',"\n"; - echo '<table width=100% border=0 cellpadding=3 cellspacing=1>',"\n"; - echo '<tr class=color4>',"\n"; - echo ' <td width=80>Application Name</td>',"\n"; - echo ' <td>Description</td>',"\n"; - echo ' <td width=80>version</td>',"\n"; - echo ' <td>Downloads</td>',"\n"; - echo '</tr>',"\n"; - - - $hResult = query_parameters("SELECT appFamily.description as appDescription, - appFamily.appName as appName, - appVersion.*, buglinks.versionId as versionId - FROM appFamily, appVersion, buglinks - WHERE appFamily.appId = appVersion.appId - and buglinks.versionId = appVersion.versionId - AND buglinks.bug_id = '?' - ORDER BY versionName", $aClean['iBugId']); - $c = 0; +$hResult = query_parameters("SELECT appFamily.description as appDescription, + appFamily.appName as appName, + appVersion.*, buglinks.versionId as versionId + FROM appFamily, appVersion, buglinks + WHERE appFamily.appId = appVersion.appId + and buglinks.versionId = appVersion.versionId + AND buglinks.bug_id = '?' + ORDER BY versionName", $aClean['iBugId']); - if($hResult) +if(query_num_rows($hResult)) +{ + echo '<table class="whq-table whq-table-full">',"\n"; + echo '<thead><tr>',"\n"; + echo ' <td width="30%">Application Name</td>',"\n"; + echo ' <td width="50%">Description</td>',"\n"; + echo ' <td>version</td>',"\n"; + echo ' <td>Downloads</td>',"\n"; + echo '</tr></thead><tbody>',"\n"; + while($oRow = query_fetch_object($hResult)) { - while($oRow = query_fetch_object($hResult)) + $oApp = new application($oRow->appId); + $oVersion = new version($oRow->versionId); + $sDownloadUrls = ""; + if($hDownloadUrls = appData::getData($oRow->versionId, "downloadurl")) { - $oApp = new application($oRow->appId); - $oVersion = new version($oRow->versionId); - $sDownloadUrls = ""; - if($hDownloadUrls = appData::getData($oRow->versionId, "downloadurl")) - { - while($oDownloadUrl = query_fetch_object($hDownloadUrls)) - $sDownloadUrls .= "<a href=\"$oDownloadUrl->url\">". - "$oDownloadUrl->description</a><br>"; - } - - // set row color - $bgcolor = ($c % 2 == 0) ? "color0" : "color1"; - echo '<tr class='.$bgcolor.'>',"\n"; - echo ' <td>',"\n"; - echo " ".$oApp->objectMakeLink()."\n"; - echo ' </td>',"\n"; - echo ' <td>'.$oRow->appDescription.'</td>',"\n"; - echo ' <td>',"\n"; - echo " ".$oVersion->objectMakeLink()."\n"; - echo ' </td>',"\n"; - echo " <td>$sDownloadUrls</td>\n"; - echo '</tr>',"\n"; + while($oDownloadUrl = query_fetch_object($hDownloadUrls)) + $sDownloadUrls .= "<a href=\"$oDownloadUrl->url\">". + "$oDownloadUrl->description</a><br>"; } - } - - // allow users to search for other apps - echo '<tr class=color2>',"\n"; - echo ' <td align=center colspan=5> </td>',"\n"; - echo '</tr>',"\n"; - echo '<tr class=color4>',"\n"; - echo ' <td colspan=4 >  Bug #</td>',"\n"; - echo '</tr>',"\n"; - - echo '<tr class=color3>',"\n"; - echo ' <td align=center>',"\n"; - echo ' <input type="text" name="iBugId" value="'.$aClean['iBugId'].'" size="8"></td>',"\n"; - echo ' <td colspan=3><input type="submit" name="sSub" value="Search"></td>',"\n"; - echo '</tr>',"\n"; + echo '<tr>',"\n"; + echo ' <td>',"\n"; + echo " ".$oApp->objectMakeLink()."\n"; + echo ' </td>',"\n"; + echo ' <td>'.$oRow->appDescription.'</td>',"\n"; + echo ' <td>',"\n"; + echo " ".$oVersion->objectMakeLink()."\n"; + echo ' </td>',"\n"; + echo " <td>$sDownloadUrls</td>\n"; + echo '</tr>',"\n"; + } + echo '</tbody></table>',"\n"; +} +else +{ + echo html_note("No Applications Found for Bug #{$aClean['iBugId']}","","","warning"); +} - echo '</table>',"\n"; - apidb_footer(); +apidb_footer(); ?>

1 0

Jeremy Newman : change the appdb var to what the appdb expects
by Jeremy Newman 28 Nov '16

28 Nov '16

Module: bugzilla Branch: master Commit: 4560fdd4faae9563569a5148da899cec01813aef URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=4560fdd4faae9563569a5… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Nov 28 11:46:23 2016 -0600 change the appdb var to what the appdb expects --- template/en/default/bug/edit.html.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl index 6738394..5685dc3 100644 --- a/template/en/default/bug/edit.html.tmpl +++ b/template/en/default/bug/edit.html.tmpl @@ -231,7 +231,7 @@ <b>AppDB</b>: </td> <td> - <a href="//appdb.winehq.org/viewbugs.php?bug_id=[% bug.bug_id FILTER html %]">Show + <a href="//appdb.winehq.org/viewbugs.php?iBugId=[% bug.bug_id FILTER html %]">Show Apps affected by this bug</a> </td> </tr>

1 0

Austin English : include/version.php: fix tpyo/whitespace error
by Jeremy Newman 28 Nov '16

28 Nov '16

Module: appdb Branch: master Commit: 122daacfd99d9f0aa42e21644f6bc39ea99af934 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=122daacfd99d9f0aa42e2164… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Nov 26 22:33:25 2016 -0600 include/version.php: fix tpyo/whitespace error Supersedes https://source.winehq.org/patches/data/128008 This patch fixes the typo as 128008 did, but also the grammatical error (and a misspaced curly bracket in the same function). Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/version.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/version.php b/include/version.php index 60b14df..e918a9c 100644 --- a/include/version.php +++ b/include/version.php @@ -1124,7 +1124,7 @@ EOT; // show the test results table if($oTest) - { + { if($oTest->iTestingId) { echo $oTest->ShowVersionsTestingTable($this->objectMakeUrl()."&iTestingId=", 5); @@ -1173,7 +1173,7 @@ EOT; else { echo html_note('<i class="fa fa-exclamation-circle"></i> <b>Comments Disabled</b><br><br> '. - 'Comments for this application have be disabled becuase there are no maintainers.', + 'Comments for this application have been disabled because there are no maintainers.', "","","warning"); } }

1 0

Alexandre Julliard : Wine release 1.9.24
by Alexandre Julliard 25 Nov '16

25 Nov '16

Module: website Branch: master Commit: 7454d80b21bc103a181ff4265c5b417986613c0d URL: http://source.winehq.org/git/website.git/?a=commit;h=7454d80b21bc103a181ff4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 25 21:19:29 2016 +0100 Wine release 1.9.24 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2016112501.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/en/2016112501.xml b/news/en/2016112501.xml new file mode 100644 index 0000000..75ff655 --- /dev/null +++ b/news/en/2016112501.xml @@ -0,0 +1,15 @@ +<news> +<date>November 25, 2016</date> +<title>Wine 1.9.24 Released</title> +<body> +<p> The Wine development release 1.9.24 is now available.</p> +<p> <a href="{$root}/announce/1.9.24">What's new</a> in this release: +<ul> + <li>Support for unordered access views in Direct3D.</li> + <li>Many fixes in the regression tests.</li> + <li>Some more improvements in HID support.</li> + <li>Various bug fixes.</li> +</ul> +<p>The source is <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.24.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</p></body></news>

1 0

Nikolay Sivov : d2d1: Fix GetGradientStops() when asked for more stops than collection has.
by Alexandre Julliard 25 Nov '16

25 Nov '16

Module: wine Branch: master Commit: 463d1877aeb46884358d014c68de1294c817a136 URL: http://source.winehq.org/git/wine.git/?a=commit;h=463d1877aeb46884358d014c6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 25 10:15:24 2016 +0300 d2d1: Fix GetGradientStops() when asked for more stops than collection has. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/brush.c | 2 -- dlls/d2d1/tests/d2d1.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index d51f53f..601f40f 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -108,8 +108,6 @@ static void STDMETHODCALLTYPE d2d_gradient_GetGradientStops(ID2D1GradientStopCol TRACE("iface %p, stops %p, stop_count %u.\n", iface, stops, stop_count); memcpy(stops, gradient->stops, min(gradient->stop_count, stop_count) * sizeof(*stops)); - if (stop_count > gradient->stop_count) - memset(stops, 0, (stop_count - gradient->stop_count) * sizeof(*stops)); } static D2D1_GAMMA STDMETHODCALLTYPE d2d_gradient_GetColorInterpolationGamma(ID2D1GradientStopCollection *iface) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 7fcda64..a8f24f9 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -3475,6 +3475,65 @@ static void test_stroke_style(void) ID2D1Factory_Release(factory); } +static void test_gradient(void) +{ + ID2D1GradientStopCollection *gradient; + D2D1_GRADIENT_STOP stops[3], stops2[3]; + IDXGISwapChain *swapchain; + ID2D1RenderTarget *rt; + ID3D10Device1 *device; + IDXGISurface *surface; + D2D1_COLOR_F color; + unsigned int i; + UINT32 count; + HWND window; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + window = CreateWindowA("static", "d2d1_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + swapchain = create_swapchain(device, window, TRUE); + hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGISurface, (void **)&surface); + ok(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr); + rt = create_render_target(surface); + ok(!!rt, "Failed to create render target.\n"); + + stops2[0].position = 0.5f; + set_color(&stops2[0].color, 1.0f, 1.0f, 0.0f, 1.0f); + stops2[1] = stops2[0]; + hr = ID2D1RenderTarget_CreateGradientStopCollection(rt, stops2, 2, D2D1_GAMMA_2_2, + D2D1_EXTEND_MODE_CLAMP, &gradient); + ok(SUCCEEDED(hr), "Failed to create stop collection, hr %#x.\n", hr); + + count = ID2D1GradientStopCollection_GetGradientStopCount(gradient); + ok(count == 2, "Unexpected stop count %u.\n", count); + + /* Request more stops than collection has. */ + stops[0].position = 123.4f; + set_color(&stops[0].color, 1.0f, 0.5f, 0.4f, 1.0f); + color = stops[0].color; + stops[2] = stops[1] = stops[0]; + ID2D1GradientStopCollection_GetGradientStops(gradient, stops, sizeof(stops)/sizeof(stops[0])); + ok(!memcmp(stops, stops2, sizeof(*stops) * count), "Unexpected gradient stops array.\n"); + for (i = count; i < sizeof(stops)/sizeof(stops[0]); i++) + { + ok(stops[i].position == 123.4f, "%u: unexpected stop position %f.\n", i, stops[i].position); + ok(!memcmp(&stops[i].color, &color, sizeof(color)), "%u: unexpected stop color.\n", i); + } + + ID2D1GradientStopCollection_Release(gradient); + ID2D1RenderTarget_Release(rt); + + IDXGISurface_Release(surface); + IDXGISwapChain_Release(swapchain); + ID3D10Device1_Release(device); + DestroyWindow(window); +} + START_TEST(d2d1) { test_clip(); @@ -3496,4 +3555,5 @@ START_TEST(d2d1) test_bitmap_target(); test_desktop_dpi(); test_stroke_style(); + test_gradient(); }

1 0

Józef Kucia : d3d10core/tests: Port test_occlusion_query() from d3d11.
by Alexandre Julliard 25 Nov '16

25 Nov '16

Module: wine Branch: master Commit: e22b70f270b278ef5f7aa5b682a832c6b3480bbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e22b70f270b278ef5f7aa5b68… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Nov 25 12:17:52 2016 +0100 d3d10core/tests: Port test_occlusion_query() from d3d11. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 163 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 163 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 1952a87..260128f 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -3656,6 +3656,168 @@ static void test_create_query(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_occlusion_query(void) +{ + static const struct vec4 red = {1.0f, 0.0f, 0.0f, 1.0f}; + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + + struct d3d10core_test_context test_context; + D3D10_TEXTURE2D_DESC texture_desc; + ID3D10RenderTargetView *rtv; + D3D10_QUERY_DESC query_desc; + ID3D10Asynchronous *query; + unsigned int data_size, i; + ID3D10Texture2D *texture; + ID3D10Device *device; + D3D10_VIEWPORT vp; + union + { + UINT64 uint; + DWORD dword[2]; + } data; + HRESULT hr; + + if (!init_test_context(&test_context)) + return; + + device = test_context.device; + + ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, white); + + query_desc.Query = D3D10_QUERY_OCCLUSION; + query_desc.MiscFlags = 0; + hr = ID3D10Device_CreateQuery(device, &query_desc, (ID3D10Query **)&query); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + data_size = ID3D10Asynchronous_GetDataSize(query); + ok(data_size == sizeof(data), "Got unexpected data size %u.\n", data_size); + + hr = ID3D10Asynchronous_GetData(query, NULL, 0, 0); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + hr = ID3D10Asynchronous_GetData(query, &data, sizeof(data), 0); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + + ID3D10Asynchronous_End(query); + ID3D10Asynchronous_Begin(query); + ID3D10Asynchronous_Begin(query); + + hr = ID3D10Asynchronous_GetData(query, NULL, 0, 0); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + hr = ID3D10Asynchronous_GetData(query, &data, sizeof(data), 0); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + + draw_color_quad(&test_context, &red); + + ID3D10Asynchronous_End(query); + for (i = 0; i < 500; ++i) + { + if ((hr = ID3D10Asynchronous_GetData(query, NULL, 0, 0)) != S_FALSE) + break; + Sleep(10); + } + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + memset(&data, 0xff, sizeof(data)); + hr = ID3D10Asynchronous_GetData(query, &data, sizeof(data), 0); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(data.uint == 640 * 480, "Got unexpected query result 0x%08x%08x.\n", data.dword[1], data.dword[0]); + + memset(&data, 0xff, sizeof(data)); + hr = ID3D10Asynchronous_GetData(query, &data, sizeof(DWORD), 0); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D10Asynchronous_GetData(query, &data, sizeof(WORD), 0); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D10Asynchronous_GetData(query, &data, sizeof(data) - 1, 0); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D10Asynchronous_GetData(query, &data, sizeof(data) + 1, 0); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(data.dword[0] == 0xffffffff && data.dword[1] == 0xffffffff, + "Data was modified 0x%08x%08x.\n", data.dword[1], data.dword[0]); + + memset(&data, 0xff, sizeof(data)); + hr = ID3D10Asynchronous_GetData(query, &data, 0, 0); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(data.dword[0] == 0xffffffff && data.dword[1] == 0xffffffff, + "Data was modified 0x%08x%08x.\n", data.dword[1], data.dword[0]); + + hr = ID3D10Asynchronous_GetData(query, NULL, sizeof(DWORD), 0); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D10Asynchronous_GetData(query, NULL, sizeof(data), 0); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + ID3D10Asynchronous_Begin(query); + ID3D10Asynchronous_End(query); + ID3D10Asynchronous_End(query); + + for (i = 0; i < 500; ++i) + { + if ((hr = ID3D10Asynchronous_GetData(query, NULL, 0, 0)) != S_FALSE) + break; + Sleep(10); + } + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + data.dword[0] = 0x12345678; + data.dword[1] = 0x12345678; + hr = ID3D10Asynchronous_GetData(query, NULL, 0, 0); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D10Asynchronous_GetData(query, &data, sizeof(data), 0); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!data.uint, "Got unexpected query result 0x%08x%08x.\n", data.dword[1], data.dword[0]); + + texture_desc.Width = D3D10_REQ_TEXTURE2D_U_OR_V_DIMENSION; + texture_desc.Height = D3D10_REQ_TEXTURE2D_U_OR_V_DIMENSION; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_R8_UNORM; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D10_USAGE_DEFAULT; + texture_desc.BindFlags = D3D10_BIND_RENDER_TARGET; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)texture, NULL, &rtv); + ok(SUCCEEDED(hr), "Failed to create render target view, hr %#x.\n", hr); + + ID3D10Device_OMSetRenderTargets(device, 1, &rtv, NULL); + vp.TopLeftX = 0; + vp.TopLeftY = 0; + vp.Width = texture_desc.Width; + vp.Height = texture_desc.Height; + vp.MinDepth = 0.0f; + vp.MaxDepth = 1.0f; + ID3D10Device_RSSetViewports(device, 1, &vp); + + ID3D10Asynchronous_Begin(query); + for (i = 0; i < 100; i++) + draw_color_quad(&test_context, &red); + ID3D10Asynchronous_End(query); + + for (i = 0; i < 500; ++i) + { + if ((hr = ID3D10Asynchronous_GetData(query, NULL, 0, 0)) != S_FALSE) + break; + Sleep(10); + } + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + memset(&data, 0xff, sizeof(data)); + hr = ID3D10Asynchronous_GetData(query, NULL, 0, 0); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D10Asynchronous_GetData(query, &data, sizeof(data), 0); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok((data.dword[0] == 0x90000000 && data.dword[1] == 0x1) + || (data.dword[0] == 0xffffffff && !data.dword[1]) + || broken(!data.uint), + "Got unexpected query result 0x%08x%08x.\n", data.dword[1], data.dword[0]); + + ID3D10Asynchronous_Release(query); + ID3D10RenderTargetView_Release(rtv); + ID3D10Texture2D_Release(texture); + release_test_context(&test_context); +} + static void test_timestamp_query(void) { static const struct vec4 red = {1.0f, 0.0f, 0.0f, 1.0f}; @@ -9621,6 +9783,7 @@ START_TEST(device) test_create_depthstencil_state(); test_create_rasterizer_state(); test_create_query(); + test_occlusion_query(); test_timestamp_query(); test_device_removed_reason(); test_scissor();

1 0

Józef Kucia : d3d9/tests: Add test for occlusion query with result bigger than UINT32_MAX.
by Alexandre Julliard 25 Nov '16

25 Nov '16

Module: wine Branch: master Commit: 6b80fe5095ae0405b875ec431d17f84b31f6dcff URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b80fe5095ae0405b875ec431… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Nov 25 12:17:53 2016 +0100 d3d9/tests: Add test for occlusion query with result bigger than UINT32_MAX. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 87 +++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 78 insertions(+), 9 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 4ea5e6c..87dd9e7 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -5489,7 +5489,7 @@ static void test_query_support(void) DestroyWindow(window); } -static void test_occlusion_query_states(void) +static void test_occlusion_query(void) { static const float quad[] = { @@ -5498,21 +5498,25 @@ static void test_occlusion_query_states(void) 1.0f, 1.0f, 0.0f, 1.0f, -1.0f, 0.0f, }; + unsigned int data_size, i, count; struct device_desc device_desc; IDirect3DQuery9 *query = NULL; - unsigned int data_size, i; IDirect3DDevice9 *device; + IDirect3DSurface9 *rt; IDirect3D9 *d3d9; + D3DVIEWPORT9 vp; ULONG refcount; + D3DCAPS9 caps; HWND window; HRESULT hr; union { WORD word[4]; DWORD dword[2]; - } data; + UINT64 uint; + } data, expected; BOOL broken_occlusion = FALSE; - DWORD expected = registry_mode.dmPelsWidth * registry_mode.dmPelsHeight; + expected.uint = registry_mode.dmPelsWidth * registry_mode.dmPelsHeight; window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 0, 0, 640, 480, 0, 0, 0, 0); @@ -5591,7 +5595,7 @@ static void test_occlusion_query_states(void) memset(&data, 0xff, sizeof(data)); hr = IDirect3DQuery9_GetData(query, &data, data_size, D3DGETDATA_FLUSH); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - ok(data.dword[0] == expected || broken(!data.dword[0]), + ok(data.dword[0] == expected.dword[0] || broken(!data.dword[0]), "Occlusion query returned an unexpected result (0x%.8x).\n", data.dword[0]); if (!data.dword[0]) { @@ -5603,7 +5607,7 @@ static void test_occlusion_query_states(void) hr = IDirect3DQuery9_GetData(query, &data, sizeof(WORD), D3DGETDATA_FLUSH); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); if (!broken_occlusion) - ok(data.word[0] == (WORD)expected, + ok(data.word[0] == expected.word[0], "Occlusion query returned an unexpected result (0x%.8x).\n", data.dword[0]); ok(data.word[1] == 0xffff, "data was modified outside of the expected size (0x%.8x).\n", data.dword[0]); @@ -5612,7 +5616,7 @@ static void test_occlusion_query_states(void) hr = IDirect3DQuery9_GetData(query, &data, sizeof(data), D3DGETDATA_FLUSH); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); if (!broken_occlusion) - ok(data.dword[0] == expected, + ok(data.dword[0] == expected.dword[0], "Occlusion query returned an unexpected result (0x%.8x).\n", data.dword[0]); /* Different drivers seem to return different data in those high bytes on Windows, but they all write something there and the extra data is consistent (I've seen 0x00000000 and 0xdddddddd @@ -5642,8 +5646,73 @@ static void test_occlusion_query_states(void) hr = IDirect3DQuery9_Issue(query, D3DISSUE_END); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + if (broken_occlusion) + goto done; + + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + + vp.X = 0; + vp.Y = 0; + vp.Width = min(caps.MaxTextureWidth, 8192); + vp.Height = min(caps.MaxTextureHeight, 8192); + vp.MinZ = 0.0f; + vp.MaxZ = 1.0f; + hr = IDirect3DDevice9_SetViewport(device, &vp); + ok(SUCCEEDED(hr), "Failed to set viewport, hr %#x.\n", hr); + + hr = IDirect3DDevice9_CreateRenderTarget(device, vp.Width, vp.Height, + D3DFMT_A8R8G8B8, D3DMULTISAMPLE_NONE, 0, FALSE, &rt, NULL); + if (FAILED(hr)) + { + skip("Failed to create render target (width %u, height %u), hr %#x.\n", vp.Width, vp.Height, hr); + goto done; + } + ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderTarget(device, 0, rt); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, FALSE); + ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); + + expected.uint = vp.Width * vp.Height; + count = ((((UINT64)~0u) + 1) / expected.uint) + 1; + expected.uint *= count; + + trace("Expects 0x%08x%08x samples.\n", expected.dword[1], expected.dword[0]); + + hr = IDirect3DQuery9_Issue(query, D3DISSUE_BEGIN); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + for (i = 0; i < count; i++) + { + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLEFAN, 2, quad, 3 * sizeof(float)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + } + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + hr = IDirect3DQuery9_Issue(query, D3DISSUE_END); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + for (i = 0; i < 500; ++i) + { + if ((hr = IDirect3DQuery9_GetData(query, NULL, 0, D3DGETDATA_FLUSH)) != S_FALSE) + break; + Sleep(10); + } + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + memset(&data, 0xff, sizeof(data)); + hr = IDirect3DQuery9_GetData(query, &data, sizeof(data), D3DGETDATA_FLUSH); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok((data.dword[0] == expected.dword[0] && data.dword[1] == expected.dword[1]) + || (data.dword[0] == 0xffffffff && !data.dword[1]) + || broken(data.dword[0] < 0xffffffff && !data.dword[1]), + "Got unexpected query result 0x%08x%08x.\n", data.dword[1], data.dword[0]); + + IDirect3DSurface9_Release(rt); + +done: IDirect3DQuery9_Release(query); refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); @@ -11310,7 +11379,7 @@ START_TEST(device) test_vb_lock_flags(); test_vertex_buffer_alignment(); test_query_support(); - test_occlusion_query_states(); + test_occlusion_query(); test_timestamp_query(); test_get_set_vertex_shader(); test_vertex_shader_constant();

1 0

Józef Kucia : wined3d: Increase shader resource limit to MAX_SHADER_RESOURCE_VIEWS.
by Alexandre Julliard 25 Nov '16

25 Nov '16

Module: wine Branch: master Commit: 604ec98d17800b14129b08da6ef568a2e71a4614 URL: http://source.winehq.org/git/wine.git/?a=commit;h=604ec98d17800b14129b08da6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Nov 25 12:17:54 2016 +0100 wined3d: Increase shader resource limit to MAX_SHADER_RESOURCE_VIEWS. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/wined3d_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ace0a55..cad5bb8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -833,7 +833,7 @@ struct wined3d_shader_reg_maps WORD local_bool_consts; /* WINED3D_MAX_CONSTS_B, 16 */ UINT cb_sizes[WINED3D_MAX_CBS]; - struct wined3d_shader_resource_info resource_info[max(MAX_FRAGMENT_SAMPLERS, MAX_VERTEX_SAMPLERS)]; + struct wined3d_shader_resource_info resource_info[MAX_SHADER_RESOURCE_VIEWS]; struct wined3d_shader_sampler_map sampler_map; DWORD sampler_comparison_mode; BYTE bumpmat; /* MAX_TEXTURES, 8 */

1 0