July 2014 - Wine-commits - list.winehq.org

Alexandre Julliard : lxr: Run LXR update in the background since it' s so slow.
by Alexandre Julliard 17 Jul '14

17 Jul '14

Module: tools Branch: master Commit: aeed6c973fa4b806bacf782a4f2011006fb6870d URL: http://source.winehq.org/git/tools.git/?a=commit;h=aeed6c973fa4b806bacf782a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 11 20:26:49 2014 +0200 lxr: Run LXR update in the background since it's so slow. --- lxr/update-version | 4 +--- wine_release | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/lxr/update-version b/lxr/update-version index 6a323c9..bed9714 100755 --- a/lxr/update-version +++ b/lxr/update-version @@ -16,10 +16,8 @@ fi version=$1 -tools_dir="/home/winehq/opt/git-tools" - cd /home/winehq/opt/source (echo "wine-$version"; cat wine-versions) | uniq > wine-versions.new && mv -f wine-versions.new wine-versions -$tools_dir/lxr/genxref --url=http://source.winehq.org --version=wine-$version +./genxref --url=http://source.winehq.org --version=wine-$version diff --git a/wine_release b/wine_release index 7306aa6..af9e5a7 100755 --- a/wine_release +++ b/wine_release @@ -86,7 +86,6 @@ fi echo "INSERT INTO bugs.versions (value, product_id) VALUES(\"$version\",1)" | mysql # make cross reference database for LXR -echo "==== UPDATING LXR ====" -$tools_dir/lxr/update-version $version +$tools_dir/lxr/update-version $version & # end

1 0

Francois Gouget : winetest: Improve the scripts documentation.
by Alexandre Julliard 17 Jul '14

17 Jul '14

Module: tools Branch: master Commit: f1198690004363f900204d627a8a48f809cd84eb URL: http://source.winehq.org/git/tools.git/?a=commit;h=f1198690004363f900204d62… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jul 17 18:34:53 2014 +0200 winetest: Improve the scripts documentation. --- winetest/README | 19 ------------------- winetest/build-index | 18 ++++++++++++++++-- winetest/dissect | 25 ++++++++++++++----------- winetest/gather | 24 ++++++++++++++---------- 4 files changed, 44 insertions(+), 42 deletions(-) diff --git a/winetest/README b/winetest/README index 49ca6d0..68e185a 100644 --- a/winetest/README +++ b/winetest/README @@ -25,25 +25,6 @@ file in $queuedir, then renames it to repXXXXX/report. Sample crontab entry illustrating the intended use of the tools. -* dissect - -This program looks for a file matching $queuedir/rep*/report, takes it -apart in its directory while also creating summary.txt. If an error -occurs the directory is renamed to errXXXXX to avoid future attempts -at processing this report. If everything goes flawlessly the whole -directory is renamed (based on the information learned in the process) -to $datadir/BUILD/VERSION_TAG_DIGIT where DIGIT is for resolving name -clashes and $datadir/BUILD/outdated is created to signal the change in -the given build. See also the head of the file. - -* gather - -This program is intended to run as a second stage. See the sample -crontab file. Races and concurrency problems must be dealt with on -that higher level. The program looks for a file matching -$datadir/*/outdated, creates index.html in the same directory and -removes the outdated file. See also the head of the file. - * summary.css, summary.js, resultform.html These files are referenced by the index.html files created by gather. diff --git a/winetest/build-index b/winetest/build-index index 8e12c01..186a2de 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -1,9 +1,23 @@ #!/usr/bin/perl -w # -# Build the global index for winetest result data -# # Copyright 2008 Alexandre Julliard <julliard(a)winehq.org> # +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# This program creates the global index of all the builds for which we have +# WineTest result data. use strict; use open ':utf8'; diff --git a/winetest/dissect b/winetest/dissect index 5187cf0..a243a23 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -1,16 +1,5 @@ #!/usr/bin/perl -w # -# Searches for $queuedir/rep*/report.txt-s, preprocesses and moves -# them into the appropriate $datadir/build/version directories, and -# creates $datadir/build/outdated. Each generated file has .txt extension. -# -# Files: winetest.conf -# -# Exit: 0 - successfully processed a report, call again -# 1 - failure processing a report, call again -# 2 - there was nothing to do -# 3 - fatal error, something went utterly wrong -# # Copyright (C) 2004 Ferenc Wagner # Copyright (C) 2008 Alexandre Julliard # @@ -27,6 +16,20 @@ # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# This program looks for a WineTest report file matching $queuedir/rep*/report, +# takes it apart in its directory while also creating summary.txt. If an error +# occurs the directory is renamed to errXXXXX to avoid future attempts at +# processing this report. +# If everything goes flawlessly the whole directory is renamed (based on the +# information learned in the process) to $datadir/BUILD/VERSION_TAG_DIGIT +# where DIGIT is for resolving name clashes and $datadir/BUILD/outdated is +# created to signal the change in the given build. +# +# Exit: 0 - successfully processed a report, call again +# 1 - failed to process a report, call again +# 2 - there was nothing to do +# 3 - fatal error, something went utterly wrong use strict; use open ':utf8'; diff --git a/winetest/gather b/winetest/gather index 97a5a37..5023ac6 100755 --- a/winetest/gather +++ b/winetest/gather @@ -1,15 +1,5 @@ #!/usr/bin/perl -w # -# Searches for a $datadir/*/outdated, updates the corresponding -# index.html and removes the outdated. -# -# Files: winetest.conf -# -# Exit: 0 - successfully processed a build, call again -# 1 - should not happen -# 2 - there was nothing to do -# 3 - fatal error, something went utterly wrong -# # Copyright (C) 2004 Ferenc Wagner # # This library is free software; you can redistribute it and/or @@ -25,6 +15,20 @@ # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# This program looks for builds that have received new reports. These are +# identified by the presence of a file matching $datadir/*/outdated. It then +# creates an index.html file in the same directory and removes the outdated +# file. +# +# It is thus intended to run as a second stage invoked by the winetest.cron +# script. Races and concurrency problems must be dealt with on that higher +# level. +# +# Exit: 0 - successfully processed a build, call again +# 1 - should not happen +# 2 - there was nothing to do +# 3 - fatal error, something went utterly wrong use strict; use CGI qw(:standard);

1 0

Stefan Dösinger : wined3d: Remove wined3d_texture_set /get_priority.
by Alexandre Julliard 16 Jul '14

16 Jul '14

Module: wine Branch: master Commit: 341db6d8d3d2251ffb406636cba15cb755cd2c93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=341db6d8d3d2251ffb406636c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 16 14:39:15 2014 +0200 wined3d: Remove wined3d_texture_set/get_priority. --- dlls/d3d8/texture.c | 24 ++++++++++++++++++------ dlls/d3d9/texture.c | 24 ++++++++++++++++++------ dlls/ddraw/surface.c | 8 ++++++-- dlls/wined3d/texture.c | 10 ---------- dlls/wined3d/wined3d.spec | 2 -- include/wine/wined3d.h | 2 -- 6 files changed, 42 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=341db6d8d3d2251ffb406…

1 0

Ken Thomases : winemac: Don' t query the position of the one-past-the-end character with IMR_QUERYCHARPOSITION.
by Alexandre Julliard 16 Jul '14

16 Jul '14

Module: wine Branch: master Commit: cafb192ecc93880d508493cda012267bdb0ed6c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cafb192ecc93880d508493cda… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jul 16 12:59:03 2014 -0500 winemac: Don't query the position of the one-past-the-end character with IMR_QUERYCHARPOSITION. This means the resulting rectangle will be short, but we don't have much choice. Some apps don't cope properly with the one-past-the-end character. For example, Excel 2007 gets stuck in an infinite loop. --- dlls/winemac.drv/ime.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winemac.drv/ime.c b/dlls/winemac.drv/ime.c index b62736f..7f98914 100644 --- a/dlls/winemac.drv/ime.c +++ b/dlls/winemac.drv/ime.c @@ -1509,7 +1509,7 @@ BOOL query_ime_char_rect(macdrv_query* query) *rect = CGRectMake(charpos.pt.x, charpos.pt.y, 0, charpos.cLineHeight); /* iterate over rest of length to extend rect */ - for (i = 1; i <= range->length; i++) + for (i = 1; i < range->length; i++) { charpos.dwSize = sizeof(charpos); charpos.dwCharPos = range->location + i;

1 0

Shuai Meng : vbscript: Implemented Abs.
by Alexandre Julliard 16 Jul '14

16 Jul '14

Module: wine Branch: master Commit: 997820f735c468b7826b7630aef844fdbbbff663 URL: http://source.winehq.org/git/wine.git/?a=commit;h=997820f735c468b7826b7630a… Author: Shuai Meng <mengshuaicalendr(a)gmail.com> Date: Tue Jul 15 23:02:55 2014 +0800 vbscript: Implemented Abs. --- dlls/vbscript/global.c | 19 +++++++++++++++++-- dlls/vbscript/tests/api.vbs | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index fa06353..af7a27d 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1246,8 +1246,23 @@ static HRESULT Global_ChrW(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARI static HRESULT Global_Abs(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + HRESULT hres; + VARIANT dst; + + TRACE("(%s)\n", debugstr_variant(arg)); + + assert(args_cnt == 1); + + hres = VarAbs(arg, &dst); + if(FAILED(hres)) + return hres; + + if (res) + *res = dst; + else + VariantClear(&dst); + + return S_OK; } static HRESULT Global_Fix(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 33596d3..0d27c8d 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -909,4 +909,43 @@ End Sub Call testSgnError(Null, 94) +Call ok(Abs(Empty) = 0, "Abs(Empty) = " & Abs(Empty)) +Call ok(getVT(Abs(Empty)) = "VT_I2", "getVT(Abs(Empty)) = " & getVT(Abs(Empty))) +Call ok(IsNull(Abs(Null)), "Is Abs(Null) not Null?") +Call ok(getVT(Abs(Null)) = "VT_NULL", "getVT(Abs(Null)) = " & getVT(Abs(Null))) +Call ok(Abs(0) = 0, "Abs(0) = " & Abs(0)) +Call ok(getVT(Abs(0)) = "VT_I2", "getVT(Abs(0)) = " & getVT(Abs(0))) +Call ok(Abs(-32769) = 32769, "Abs(-32769) = " & Abs(-32769)) +Call ok(getVT(Abs(-32769)) = "VT_I4", "getVT(Abs(-32769)) = " & getVT(Abs(-32769))) +Call ok(Abs(CSng(-0.5)) = 0.5, "Abs(CSng(-0.5)) = " & Abs(CSng(-0.5))) +Call ok(getVT(Abs(CSng(-0.5))) = "VT_R4", "getVT(Abs(CSng(-0.5))) = " & getVT(Abs(CSng(-0.5)))) +Call ok(Abs(0.5) = 0.5, "Abs(0.5) = " & Abs(0.5)) +Call ok(getVT(Abs(0.5)) = "VT_R8", "getVT(Abs(0.5)) = " & getVT(Abs(0.5))) +Call ok(Abs(CCur(-1)) = 1, "Abs(CCur(-1)) = " & Abs(CCur(-1))) +Call ok(getVT(Abs(CCur(-1))) = "VT_CY", "getVT(Abs(CCur(-1))) = " & getVT(Abs(CCur(-1)))) +Call ok(Abs("-1") = 1, "Abs(""-1"") = " & Abs("-1")) +Call ok(getVT(Abs("-1")) = "VT_R8", "getVT(Abs(""-1"")) = " & getVT(Abs("-1"))) +Call ok(Abs(False) = 0, "Abs(False) = " & Abs(False)) +Call ok(getVT(Abs(False)) = "VT_I2", "getVT(Abs(False)) = " & getVT(Abs(False))) +Call ok(Abs(True) = 1, "Abs(True) = " & Abs(True)) +Call ok(getVT(Abs(True)) = "VT_I2", "getVT(Abs(True)) = " & getVT(Abs(True))) +Call ok(Abs(CByte(1)) = 1, "Abs(CByte(1)) = " & Abs(CByte(1))) +Call ok(getVT(Abs(CByte(1))) = "VT_UI1", "getVT(Abs(CByte(1))) = " & getVT(Abs(CByte(1)))) + +Sub testAbsError(strings, error_num1, error_num2) + on error resume next + Dim x + + Call Err.clear() + x = Abs(strings) + Call ok(Err.number = error_num1, "Err.number1 = " & Err.number) + + Call Err.clear() + Call Abs(strings) + Call ok(Err.number = error_num2, "Err.number2 = " & Err.number) +End Sub + +Call testAbsError("strings", 13, 13) +Call testAbsError(-4, 0, 0) + Call reportSuccess()

1 0

Shuai Meng : vbscript/tests: Added tests for the subtype of TypeName.
by Alexandre Julliard 16 Jul '14

16 Jul '14

Module: wine Branch: master Commit: 95db4ce751ca4393c7eb5f090056778f8da2c8b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95db4ce751ca4393c7eb5f090… Author: Shuai Meng <mengshuaicalendr(a)gmail.com> Date: Tue Jul 15 23:06:01 2014 +0800 vbscript/tests: Added tests for the subtype of TypeName. --- dlls/vbscript/tests/api.vbs | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 0d27c8d..813f5e8 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -845,17 +845,26 @@ MyObject.myval = 0 Call ok(CSng(MyObject) = 0, "CSng(MyObject) = " & CSng(MyObject)) Call ok(getVT(CSng(MyObject)) = "VT_R4", "getVT(CSng(MyObject)) = " & getVT(CSng(MyObject))) -Dim MyEmpty +Call ok(TypeName(Empty) = "Empty", "TypeName(MyEmpty) = " & TypeName(Empty)) +Call ok(getVT(TypeName(Empty)) = "VT_BSTR", "getVT(TypeName(Empty)) = " & getVT(TypeName(Empty))) +Call ok(TypeName(Null) = "Null", "TypeName(Null) = " & TypeName(Null)) +Call ok(getVT(TypeName(Null)) = "VT_BSTR", "getVT(TypeName(Null)) = " & getVT(TypeName(Null))) Call ok(TypeName(CByte(255)) = "Byte", "TypeName(CByte(255)) = " & TypeName(CByte(255))) +Call ok(getVT(TypeName(CByte(255))) = "VT_BSTR", "getVT(TypeName(CByte(255))) = " & getVT(TypeName(CByte(255)))) Call ok(TypeName(255) = "Integer", "TypeName(255) = " & TypeName(255)) +Call ok(getVT(TypeName(255)) = "VT_BSTR", "getVT(TypeName(255)) = " & getVT(TypeName(255))) Call ok(TypeName(32768) = "Long", "TypeName(32768) = " & TypeName(32768)) +Call ok(getVT(TypeName(32768)) = "VT_BSTR", "getVT(TypeName(32768)) = " & getVT(TypeName(32768))) Call ok(TypeName(CSng(0.5)) = "Single", "TypeName(CSng(0.5)) = " & TypeName(CSng(0.5))) +Call ok(getVT(TypeName(CSng(0.5))) = "VT_BSTR", "getVT(TypeName(CSng(0.5))) = " & getVT(TypeName(CSng(0.5)))) Call ok(TypeName(-0.5) = "Double", "TypeName(-0.5) = " & TypeName(-0.5)) +Call ok(getVT(TypeName(-0.5)) = "VT_BSTR", "getVT(TypeName(-0.5)) = " & getVT(TypeName(-0.5))) Call ok(TypeName(CCur(0.5)) = "Currency", "TypeName(CCur(0.5)) = " & TypeName(CCur(0.5))) +Call ok(getVT(TypeName(CCur(0.5))) = "VT_BSTR", "getVT(TypeName(CCur(0.5))) = " & getVT(TypeName(CCur(0.5)))) Call ok(TypeName(CStr(0.5)) = "String", "TypeName(CStr(0.5)) = " & TypeName(CStr(0.5))) +Call ok(getVT(TypeName(CStr(0.5))) = "VT_BSTR", "getVT(TypeName(CStr(0.5))) = " & getVT(TypeName(CStr(0.5)))) Call ok(TypeName(True) = "Boolean", "TypeName(True) = " & TypeName(True)) -Call ok(TypeName(MyEmpty) = "Empty", "TypeName(MyEmpty) = " & TypeName(Empty)) -Call ok(TypeName(Null) = "Null", "TypeName(Null) = " & TypeName(Null)) +Call ok(getVT(TypeName(True)) = "VT_BSTR", "getVT(TypeName(True)) = " & getVT(TypeName(True))) Call ok(VarType(Empty) = vbEmpty, "VarType(Empty) = " & VarType(Empty)) Call ok(getVT(VarType(Empty)) = "VT_I2", "getVT(VarType(Empty)) = " & getVT(VarType(Empty)))

1 0

Jacek Caban : wininet: Include trailing slash in URL cache hashes.
by Alexandre Julliard 16 Jul '14

16 Jul '14

Module: wine Branch: master Commit: 2aaff6e19f9ef97a241d7ca36497d47d52b4c523 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2aaff6e19f9ef97a241d7ca36… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 16 11:06:24 2014 +0200 wininet: Include trailing slash in URL cache hashes. --- dlls/wininet/tests/urlcache.c | 40 ++++++++++++++++++++++++++++++++++++++++ dlls/wininet/urlcache.c | 2 +- 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index 35ef77d..f735d73 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -1035,6 +1035,45 @@ static void test_GetDiskInfoA(void) ok(error == ERROR_INVALID_PARAMETER, "got %u expected ERROR_INVALID_PARAMETER\n", error); } +static BOOL cache_entry_exists(const char *url) +{ + static char buf[10000]; + DWORD size = sizeof(buf); + BOOL ret; + + ret = GetUrlCacheEntryInfoA(url, (void*)buf, &size); + ok(ret || GetLastError() == ERROR_FILE_NOT_FOUND, "GetUrlCacheEntryInfoA returned %x (%u)\n", ret, GetLastError()); + + return ret; +} + +static void test_trailing_slash(void) +{ + char filename[MAX_PATH]; + BYTE zero_byte = 0; + BOOL ret; + + static const FILETIME filetime_zero; + static char url_with_slash[] = "http://testing.cache.com/"; + + + ret = CreateUrlCacheEntryA(url_with_slash, 0, "html", filename, 0); + ok(ret, "CreateUrlCacheEntry failed with error %d\n", GetLastError()); + + create_and_write_file(filenameA, &zero_byte, sizeof(zero_byte)); + + ret = CommitUrlCacheEntryA("Visited: http://testing.cache.com/", NULL, filetime_zero, filetime_zero, + NORMAL_CACHE_ENTRY, NULL, 0, "html", NULL); + ok(ret, "CommitUrlCacheEntry failed with error %d\n", GetLastError()); + + ok(cache_entry_exists("Visited: http://testing.cache.com/"), "cache entry does not exist\n"); + ok(!cache_entry_exists("Visited: http://testing.cache.com"), "cache entry exists\n"); + + ret = DeleteUrlCacheEntryA("Visited: http://testing.cache.com/"); + ok(ret, "DeleteCacheEntryA failed\n"); + DeleteFileA(filename); +} + START_TEST(urlcache) { HMODULE hdll; @@ -1058,4 +1097,5 @@ START_TEST(urlcache) test_urlcacheW(); test_FindCloseUrlCache(); test_GetDiskInfoA(); + test_trailing_slash(); } diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index f0a731b..3487aa8 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -1487,7 +1487,7 @@ static DWORD urlcache_hash_key(LPCSTR lpszKey) for (i = 0; i < sizeof(key) / sizeof(key[0]); i++) key[i] = lookupTable[(*lpszKey + i) & 0xFF]; - for (lpszKey++; *lpszKey && ((lpszKey[0] != '/') || (lpszKey[1] != 0)); lpszKey++) + for (lpszKey++; *lpszKey; lpszKey++) { for (i = 0; i < sizeof(key) / sizeof(key[0]); i++) key[i] = lookupTable[*lpszKey ^ key[i]];

1 0

Alexandre Julliard : cmd: Use array indexing syntax to access array members.
by Alexandre Julliard 16 Jul '14

16 Jul '14

Module: wine Branch: master Commit: fd17c93224a75323c5e9b912521a046da81fbf40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd17c93224a75323c5e9b9125… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 16 14:53:18 2014 +0200 cmd: Use array indexing syntax to access array members. --- programs/cmd/directory.c | 56 ++++++++++++++++++++++++------------------------ 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index 58fff44..678e2a1 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -283,18 +283,18 @@ static DIRECTORY_STACK *WCMD_list_directory (DIRECTORY_STACK *inputparms, int le /* Load all files into an in memory structure */ WINE_TRACE("Looking for matches to '%s'\n", wine_dbgstr_w(real_path)); - hff = FindFirstFileW(real_path, (fd+entry_count)); + hff = FindFirstFileW(real_path, &fd[entry_count]); if (hff != INVALID_HANDLE_VALUE) { do { /* Skip any which are filtered out by attribute */ - if (((fd+entry_count)->dwFileAttributes & attrsbits) != showattrs) continue; + if ((fd[entry_count].dwFileAttributes & attrsbits) != showattrs) continue; entry_count++; /* Keep running track of longest filename for wide output */ if (wide || orderByCol) { - int tmpLen = strlenW((fd+(entry_count-1))->cFileName) + 3; - if ((fd+(entry_count-1))->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) tmpLen = tmpLen + 2; + int tmpLen = strlenW(fd[entry_count-1].cFileName) + 3; + if (fd[entry_count-1].dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) tmpLen = tmpLen + 2; if (tmpLen > widest) widest = tmpLen; } @@ -305,7 +305,7 @@ static DIRECTORY_STACK *WCMD_list_directory (DIRECTORY_STACK *inputparms, int le errorlevel = 1; return parms->next; } - } while (FindNextFileW(hff, (fd+entry_count)) != 0); + } while (FindNextFileW(hff, &fd[entry_count]) != 0); FindClose (hff); } @@ -362,23 +362,23 @@ static DIRECTORY_STACK *WCMD_list_directory (DIRECTORY_STACK *inputparms, int le /* /L convers all names to lower case */ if (lower) { - WCHAR *p = (fd+i)->cFileName; + WCHAR *p = fd[i].cFileName; while ( (*p = tolower(*p)) ) ++p; } /* /Q gets file ownership information */ if (usernames) { strcpyW (string, inputparms->dirName); - strcatW (string, (fd+i)->cFileName); + strcatW (string, fd[i].cFileName); WCMD_getfileowner(string, username, sizeof(username)/sizeof(WCHAR)); } if (dirTime == Written) { - FileTimeToLocalFileTime (&(fd+i)->ftLastWriteTime, &ft); + FileTimeToLocalFileTime (&fd[i].ftLastWriteTime, &ft); } else if (dirTime == Access) { - FileTimeToLocalFileTime (&(fd+i)->ftLastAccessTime, &ft); + FileTimeToLocalFileTime (&fd[i].ftLastAccessTime, &ft); } else { - FileTimeToLocalFileTime (&(fd+i)->ftCreationTime, &ft); + FileTimeToLocalFileTime (&fd[i].ftCreationTime, &ft); } FileTimeToSystemTime (&ft, &st); GetDateFormatW(0, DATE_SHORTDATE, &st, NULL, datestring, @@ -389,18 +389,18 @@ static DIRECTORY_STACK *WCMD_list_directory (DIRECTORY_STACK *inputparms, int le if (wide) { tmp_width = cur_width; - if ((fd+i)->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { + if (fd[i].dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { static const WCHAR fmt[] = {'[','%','1',']','\0'}; - WCMD_output (fmt, (fd+i)->cFileName); + WCMD_output (fmt, fd[i].cFileName); dir_count++; - tmp_width = tmp_width + strlenW((fd+i)->cFileName) + 2; + tmp_width = tmp_width + strlenW(fd[i].cFileName) + 2; } else { static const WCHAR fmt[] = {'%','1','\0'}; - WCMD_output (fmt, (fd+i)->cFileName); - tmp_width = tmp_width + strlenW((fd+i)->cFileName) ; + WCMD_output (fmt, fd[i].cFileName); + tmp_width = tmp_width + strlenW(fd[i].cFileName) ; file_count++; - file_size.u.LowPart = (fd+i)->nFileSizeLow; - file_size.u.HighPart = (fd+i)->nFileSizeHigh; + file_size.u.LowPart = fd[i].nFileSizeLow; + file_size.u.HighPart = fd[i].nFileSizeHigh; byte_count.QuadPart += file_size.QuadPart; } cur_width = cur_width + widest; @@ -412,18 +412,18 @@ static DIRECTORY_STACK *WCMD_list_directory (DIRECTORY_STACK *inputparms, int le WCMD_output(padfmt, cur_width - tmp_width, nullW); } - } else if ((fd+i)->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { + } else if (fd[i].dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { dir_count++; if (!bare) { WCMD_output (fmtDir, datestring, timestring); - if (shortname) WCMD_output (fmt2, (fd+i)->cAlternateFileName); + if (shortname) WCMD_output (fmt2, fd[i].cAlternateFileName); if (usernames) WCMD_output (fmt3, username); - WCMD_output(fmt4,(fd+i)->cFileName); + WCMD_output(fmt4,fd[i].cFileName); } else { - if (!((strcmpW((fd+i)->cFileName, dotW) == 0) || - (strcmpW((fd+i)->cFileName, dotdotW) == 0))) { - WCMD_output (fmt5, recurse?inputparms->dirName:nullW, (fd+i)->cFileName); + if (!((strcmpW(fd[i].cFileName, dotW) == 0) || + (strcmpW(fd[i].cFileName, dotdotW) == 0))) { + WCMD_output (fmt5, recurse?inputparms->dirName:nullW, fd[i].cFileName); } else { addNewLine = FALSE; } @@ -431,17 +431,17 @@ static DIRECTORY_STACK *WCMD_list_directory (DIRECTORY_STACK *inputparms, int le } else { file_count++; - file_size.u.LowPart = (fd+i)->nFileSizeLow; - file_size.u.HighPart = (fd+i)->nFileSizeHigh; + file_size.u.LowPart = fd[i].nFileSizeLow; + file_size.u.HighPart = fd[i].nFileSizeHigh; byte_count.QuadPart += file_size.QuadPart; if (!bare) { WCMD_output (fmtFile, datestring, timestring, WCMD_filesize64(file_size.QuadPart)); - if (shortname) WCMD_output (fmt2, (fd+i)->cAlternateFileName); + if (shortname) WCMD_output (fmt2, fd[i].cAlternateFileName); if (usernames) WCMD_output (fmt3, username); - WCMD_output(fmt4,(fd+i)->cFileName); + WCMD_output(fmt4,fd[i].cFileName); } else { - WCMD_output (fmt5, recurse?inputparms->dirName:nullW, (fd+i)->cFileName); + WCMD_output (fmt5, recurse?inputparms->dirName:nullW, fd[i].cFileName); } } }

1 0

Stefan Dösinger : ddraw: Add validation to SetPriority / GetPriority.
by Alexandre Julliard 16 Jul '14

16 Jul '14

Module: wine Branch: master Commit: 5b9f91c18d7e21ecdd1dfb662682c34cd143d4c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b9f91c18d7e21ecdd1dfb662… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 16 14:39:10 2014 +0200 ddraw: Add validation to SetPriority / GetPriority. --- dlls/ddraw/surface.c | 72 +++++++++++++++++++++++++--------------------------- 1 file changed, 34 insertions(+), 38 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 3d61e61..355a88b 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -2229,63 +2229,59 @@ static HRESULT WINAPI ddraw_surface1_GetCaps(IDirectDrawSurface *iface, DDSCAPS return hr; } -/***************************************************************************** - * IDirectDrawSurface7::SetPriority - * - * Sets a texture priority for managed textures. - * - * Params: - * Priority: The new priority - * - * Returns: - * DD_OK on success - * For more details, see IWineD3DSurface::SetPriority - * - *****************************************************************************/ -static HRESULT WINAPI ddraw_surface7_SetPriority(IDirectDrawSurface7 *iface, DWORD Priority) +static HRESULT WINAPI ddraw_surface7_SetPriority(IDirectDrawSurface7 *iface, DWORD priority) { struct ddraw_surface *surface = impl_from_IDirectDrawSurface7(iface); + DWORD managed = DDSCAPS2_TEXTUREMANAGE | DDSCAPS2_D3DTEXTUREMANAGE; HRESULT hr; - TRACE("iface %p, priority %u.\n", iface, Priority); + TRACE("iface %p, priority %u.\n", iface, priority); wined3d_mutex_lock(); - hr = wined3d_surface_set_priority(surface->wined3d_surface, Priority); + /* No need to check for offscreen plain surfaces or mipmap sublevels. SetPriority + * calls on such surfaces segfault on Windows. */ + if (!(surface->surface_desc.ddsCaps.dwCaps2 & managed)) + { + WARN("Called on non-managed texture returning DDERR_INVALIDPARAMS.\n"); + hr = DDERR_INVALIDPARAMS; + } + else + { + wined3d_surface_set_priority(surface->wined3d_surface, priority); + hr = DD_OK; + } wined3d_mutex_unlock(); return hr; } -/***************************************************************************** - * IDirectDrawSurface7::GetPriority - * - * Returns the surface's priority - * - * Params: - * Priority: Address of a variable to write the priority to - * - * Returns: - * D3D_OK on success - * DDERR_INVALIDPARAMS if Priority == NULL - * For more details, see IWineD3DSurface::GetPriority - * - *****************************************************************************/ -static HRESULT WINAPI ddraw_surface7_GetPriority(IDirectDrawSurface7 *iface, DWORD *Priority) +static HRESULT WINAPI ddraw_surface7_GetPriority(IDirectDrawSurface7 *iface, DWORD *priority) { struct ddraw_surface *surface = impl_from_IDirectDrawSurface7(iface); + DWORD managed = DDSCAPS2_TEXTUREMANAGE | DDSCAPS2_D3DTEXTUREMANAGE; + HRESULT hr; - TRACE("iface %p, priority %p.\n", iface, Priority); + TRACE("iface %p, priority %p.\n", iface, priority); - if(!Priority) + wined3d_mutex_lock(); + if (surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_OFFSCREENPLAIN) { - return DDERR_INVALIDPARAMS; + WARN("Called on offscreenplain surface, returning DDERR_INVALIDOBJECT.\n"); + hr = DDERR_INVALIDOBJECT; + } + else if (!(surface->surface_desc.ddsCaps.dwCaps2 & managed) || !surface->wined3d_texture) + { + WARN("Called on non-managed texture or mipmap sublevel, returning DDERR_INVALIDPARAMS.\n"); + hr = DDERR_INVALIDPARAMS; + } + else + { + *priority = wined3d_surface_get_priority(surface->wined3d_surface); + hr = DD_OK; } - - wined3d_mutex_lock(); - *Priority = wined3d_surface_get_priority(surface->wined3d_surface); wined3d_mutex_unlock(); - return DD_OK; + return hr; } /*****************************************************************************

1 0

Stefan Dösinger : ddraw/tests: Add a test for IDirectDrawSurface7::SetPriority.
by Alexandre Julliard 16 Jul '14

16 Jul '14

Module: wine Branch: master Commit: 8b367c79098690445553a1ee228070789bfdc021 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b367c79098690445553a1ee2… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 16 14:39:11 2014 +0200 ddraw/tests: Add a test for IDirectDrawSurface7::SetPriority. --- dlls/ddraw/tests/ddraw7.c | 122 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 122 insertions(+) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 393cea3..3e29164 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -7448,6 +7448,127 @@ static void test_lost_device(void) DestroyWindow(window); } +static void test_resource_priority(void) +{ + IDirectDrawSurface7 *surface, *mipmap; + DDSURFACEDESC2 surface_desc; + IDirectDraw7 *ddraw; + ULONG refcount; + HWND window; + HRESULT hr; + DDSCAPS2 caps = {DDSCAPS_COMPLEX, 0, 0, 0}; + DDCAPS hal_caps; + DWORD needed_caps = DDSCAPS_TEXTURE | DDSCAPS_VIDEOMEMORY | DDSCAPS_MIPMAP; + unsigned int i; + DWORD priority; + static const struct + { + DWORD caps, caps2; + const char *name; + HRESULT hr; + /* SetPriority on offscreenplain surfaces crashes on AMD GPUs on Win7. */ + BOOL crash; + } + test_data[] = + { + {DDSCAPS_TEXTURE | DDSCAPS_VIDEOMEMORY, 0, "vidmem texture", DDERR_INVALIDPARAMS, FALSE}, + {DDSCAPS_TEXTURE | DDSCAPS_SYSTEMMEMORY, 0, "sysmem texture", DDERR_INVALIDPARAMS, FALSE}, + {DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE, "managed texture", DD_OK, FALSE}, + {DDSCAPS_TEXTURE, DDSCAPS2_D3DTEXTUREMANAGE, "managed texture", DD_OK, FALSE}, + {DDSCAPS_OFFSCREENPLAIN | DDSCAPS_VIDEOMEMORY, 0, "vidmem offscreenplain", DDERR_INVALIDOBJECT, TRUE}, + {DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY, 0, "sysmem offscreenplain", DDERR_INVALIDOBJECT, TRUE}, + }; + + window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + + memset(&hal_caps, 0, sizeof(hal_caps)); + hal_caps.dwSize = sizeof(hal_caps); + hr = IDirectDraw7_GetCaps(ddraw, &hal_caps, NULL); + ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr); + if ((hal_caps.ddsCaps.dwCaps & needed_caps) != needed_caps + || !(hal_caps.ddsCaps.dwCaps & DDSCAPS2_TEXTUREMANAGE)) + { + skip("Required surface types not supported, skipping test.\n"); + goto done; + } + + for (i = 0; i < sizeof(test_data) / sizeof(*test_data); i++) + { + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS; + surface_desc.dwWidth = 32; + surface_desc.dwHeight = 32; + surface_desc.ddsCaps.dwCaps = test_data[i].caps; + surface_desc.ddsCaps.dwCaps2 = test_data[i].caps2; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface, NULL); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x, type %s.\n", hr, test_data[i].name); + + /* Priority == NULL segfaults. */ + priority = 0xdeadbeef; + hr = IDirectDrawSurface7_GetPriority(surface, &priority); + ok(hr == test_data[i].hr, "Got unexpected hr %#x, type %s.\n", hr, test_data[i].name); + if (SUCCEEDED(test_data[i].hr)) + ok(priority == 0, "Got unexpected priority %u, type %s.\n", priority, test_data[i].name); + else + ok(priority == 0xdeadbeef, "Got unexpected priority %u, type %s.\n", priority, test_data[i].name); + + if (!test_data[i].crash) + { + hr = IDirectDrawSurface7_SetPriority(surface, 1); + ok(hr == test_data[i].hr, "Got unexpected hr %#x, type %s.\n", hr, test_data[i].name); + hr = IDirectDrawSurface7_GetPriority(surface, &priority); + ok(hr == test_data[i].hr, "Got unexpected hr %#x, type %s.\n", hr, test_data[i].name); + if (SUCCEEDED(test_data[i].hr)) + { + ok(priority == 1, "Got unexpected priority %u, type %s.\n", priority, test_data[i].name); + hr = IDirectDrawSurface7_SetPriority(surface, 2); + ok(hr == test_data[i].hr, "Got unexpected hr %#x, type %s.\n", hr, test_data[i].name); + } + else + ok(priority == 0xdeadbeef, "Got unexpected priority %u, type %s.\n", priority, test_data[i].name); + } + + IDirectDrawSurface7_Release(surface); + } + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS | DDSD_MIPMAPCOUNT; + surface_desc.dwWidth = 32; + surface_desc.dwHeight = 32; + surface_desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP; + surface_desc.ddsCaps.dwCaps2 = DDSCAPS2_TEXTUREMANAGE; + U2(surface_desc).dwMipMapCount = 2; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface, NULL); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + hr = IDirectDrawSurface7_GetAttachedSurface(surface, &caps, &mipmap); + ok(SUCCEEDED(hr), "Failed to get attached surface, hr %#x.\n", hr); + + priority = 0xdeadbeef; + hr = IDirectDrawSurface7_GetPriority(mipmap, &priority); + ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x, type managed mipmap.\n", hr); + ok(priority == 0xdeadbeef, "Got unexpected priority %u, type managed mipmap.\n", priority); + /* SetPriority on the mipmap surface crashes. */ + hr = IDirectDrawSurface7_GetPriority(surface, &priority); + ok(SUCCEEDED(hr), "Failed to get priority, hr %#x.\n", hr); + ok(priority == 0, "Got unexpected priority %u, type managed mipmap.\n", priority); + + IDirectDrawSurface7_Release(mipmap); + refcount = IDirectDrawSurface7_Release(surface); + ok(!refcount, "Got unexpected refcount %u.\n", refcount); + +done: + refcount = IDirectDraw7_Release(ddraw); + ok(!refcount, "Got unexpected refcount %u.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw7) { HMODULE module = GetModuleHandleA("ddraw.dll"); @@ -7519,4 +7640,5 @@ START_TEST(ddraw7) test_palette_alpha(); test_vb_writeonly(); test_lost_device(); + test_resource_priority(); }

1 0