wine-commits February 2016

wine-commits@winehq.org

2 participants
755 discussions

Alexandre Julliard : Wine release 1.9.4
by Alexandre Julliard 19 Feb '16

19 Feb '16

Module: website Branch: master Commit: 71f016f9ef45db60c6f7e4bb19eaf2d636e2cc40 URL: http://source.winehq.org/git/website.git/?a=commit;h=71f016f9ef45db60c6f7e4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 19 23:56:31 2016 +0900 Wine release 1.9.4 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2016021901.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2016021901.xml b/news/en/2016021901.xml new file mode 100644 index 0000000..1882eda --- /dev/null +++ b/news/en/2016021901.xml @@ -0,0 +1,16 @@ +<news> +<date>February 19, 2016</date> +<title>Wine 1.9.4 Released</title> +<body> + The Wine development release 1.9.4 is now available. + <a href="{$root}/announce/1.9.4">What's new</a> in this release: +<ul> + <li>Support for color glyphs and font fallbacks in DirectWrite.</li> + <li>Improvements to the WebServices reader.</li> + <li>Support for more formats in Direct3D 11.</li> + <li>Simplified syntax and clean up of tests marked todo.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.4.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>. +</body></news>

1 0

Tag wine-1.9.4 : Alexandre Julliard : Release 1.9.4
by Alexandre Julliard 19 Feb '16

19 Feb '16

Module: wine Branch: refs/tags/wine-1.9.4 Tag: 76bf0852f246e2ae69d050f5036fd12b224c96c1 URL: http://source.winehq.org/git/wine.git/?a=tag;h=76bf0852f246e2ae69d050f5036f… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 19 23:54:19 2016 +0900 Release 1.9.4

1 0

Alexandre Julliard : Release 1.9.4.
by Alexandre Julliard 19 Feb '16

19 Feb '16

Module: wine Branch: master Commit: c26284168ccf53e657bdfbedffd4ef13698688c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c26284168ccf53e657bdfbedf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 19 23:54:19 2016 +0900 Release 1.9.4. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 899 +++++++++++++++++++++++++++++++++++--------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 523 insertions(+), 396 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c26284168ccf53e657bdf…

1 0

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard 19 Feb '16

19 Feb '16

Module: wine Branch: master Commit: d2680d69f6ccdceb859b05a2c1cc076511baea8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2680d69f6ccdceb859b05a2c… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Feb 19 23:14:15 2016 +0900 po: Update Japanese translation. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ja.po | 64 ++++++++++++++++------------------------------------------------ 1 file changed, 16 insertions(+), 48 deletions(-) diff --git a/po/ja.po b/po/ja.po index 849d712..b9b5ab6 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2015-11-22 13:05+0900\n" +"PO-Revision-Date: 2016-02-19 21:25+0900\n" "Last-Translator: Akihiro Sagawa <sagawa.aki(a)gmail.com>\n" "Language-Team: Japanese\n" "Language: ja\n" @@ -1044,7 +1044,7 @@ msgstr "フォルダの選択" #: comdlg32.rc:148 msgid "Font size has to be a number." -msgstr "" +msgstr "フォントサイズは数値で指定してください。" #: comdlg32.rc:83 oleview.rc:98 msgid "Ready" @@ -11555,90 +11555,61 @@ msgid "The operation completed successfully\n" msgstr "操作は正常に完了しました\n" #: reg.rc:35 -#, fuzzy -#| msgid "Error: Invalid key name\n" msgid "reg: Invalid key name\n" -msgstr "エラー: キー名が無効です\n" +msgstr "reg: キー名が無効です\n" #: reg.rc:36 -#, fuzzy -#| msgid "Error: Invalid command line parameters\n" msgid "reg: Invalid command line parameters\n" -msgstr "エラー: コマンドライン引数が無効です\n" +msgstr "reg: コマンドライン引数が無効です\n" #: reg.rc:37 -#, fuzzy -#| msgid "Error: Unable to access remote machine\n" msgid "reg: Unable to access remote machine\n" -msgstr "エラー: リモートマシンにアクセスできませんでした\n" +msgstr "reg: リモートマシンにアクセスできませんでした\n" #: reg.rc:38 -#, fuzzy -#| msgid "" -#| "Error: The system was unable to find the specified registry key or value\n" msgid "" "reg: The system was unable to find the specified registry key or value\n" -msgstr "エラー: システムは指定されたキーまたは値を見つけられませんでした\n" +msgstr "reg: システムは指定されたキーまたは値を見つけられませんでした\n" #: reg.rc:39 -#, fuzzy -#| msgid "Error: Unsupported type\n" msgid "reg: Unsupported registry data type [%1]\n" -msgstr "エラー: サポートされていない種類です\n" +msgstr "reg: サポートされていないレジストリのデータ型 [%1]\n" #: reg.rc:40 -#, fuzzy -#| msgid "" -#| "uninstaller: The option '--remove' must be followed by an application " -#| "GUID\n" msgid "reg: The option [/d] must be followed by a valid integer\n" -msgstr "" -"uninstaller: --remove オプションはアプリケーション GUID の指定が必要です\n" +msgstr "reg: /d オプションのあとに正しい整数値を指定してください\n" #: reg.rc:41 -#, fuzzy -#| msgid "" -#| "uninstaller: The option '--remove' must be followed by an application " -#| "GUID\n" msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" -msgstr "" -"uninstaller: --remove オプションはアプリケーション GUID の指定が必要です\n" +msgstr "reg: /d オプションのあとに正しい16進数値を指定してください\n" #: reg.rc:42 msgid "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n" -msgstr "" +msgstr "reg: 取り扱えないレジストリのデータ型 [/t 0x%1!x!, /d %2]\n" #: reg.rc:43 -#, fuzzy -#| msgid "The specified file already exists. Do you want to replace it?" msgid "The registry value '%1' already exists. Do you want to overwrite it?" -msgstr "指定した名前はすでに存在します。ファイルを置き換えますか?" +msgstr "レジストリ値 '%1' はすでに存在します。上書きしますか?" #: reg.rc:47 msgid "The registry operation was cancelled\n" -msgstr "" +msgstr "レジストリ操作は取り消されました\n" #: reg.rc:48 regedit.rc:204 msgid "(Default)" msgstr "(既定)" #: reg.rc:49 -#, fuzzy -#| msgid "Are you sure you want to delete these values?" msgid "Are you sure you want to delete the registry value '%1'?" -msgstr "これらの値を削除しますか?" +msgstr "本当にレジストリ値 '%1' を削除しますか?" #: reg.rc:50 -#, fuzzy -#| msgid "Are you sure you want to delete value '%s'?" msgid "Are you sure you want to delete all registry values in '%1'?" -msgstr "本当に '%s'を削除しますか?" +msgstr "本当に '%1' にあるすべてのレジストリ値を削除しますか?" #: reg.rc:51 -#, fuzzy -#| msgid "Are you sure you want to delete '%1'?" msgid "Are you sure you want to delete the registry key '%1'?" -msgstr "'%1' を削除しますか?" +msgstr "本当にレジストリキー '%1' を削除しますか?" #: regedit.rc:34 msgid "&Registry" @@ -13771,13 +13742,10 @@ msgid "Configuration error" msgstr "構成エラー" #: wineconsole.rc:42 -#, fuzzy -#| msgid "Screen buffer size must be greater or equal to the window's one" msgid "" "The size of the screen buffer must be greater than or equal to the size of " "the window." -msgstr "" -"スクリーンバッファサイズはウィンドウバッファサイズ以上にしてください" +msgstr "スクリーンバッファのサイズはウィンドウのサイズ以上にしてください" #: wineconsole.rc:37 msgid "Each character is %1!u! pixels wide and %2!u! pixels high"

1 0

Joachim Priesner : comctl32: Treeview: Set visible = TRUE when deleting first visible item.
by Alexandre Julliard 19 Feb '16

19 Feb '16

Module: wine Branch: master Commit: 71a4ac73e29a5fe05d73bb4ddfba579be500a195 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71a4ac73e29a5fe05d73bb4dd… Author: Joachim Priesner <joachim.priesner(a)web.de> Date: Sun Feb 14 21:58:14 2016 +0100 comctl32: Treeview: Set visible = TRUE when deleting first visible item. This fixes a crash when deleting the first visible item if it has visibleOrder < 0 and thus the ISVISIBLE macro returns false (this happens when both insertion and deletion happened while bRedraw == false). Signed-off-by: Joachim Priesner <joachim.priesner(a)web.de> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/treeview.c | 6 +++--- dlls/comctl32/treeview.c | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index bd030d6..7e6c731 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -1910,6 +1910,9 @@ static void test_delete_items(void) /* Regression test for a crash when deleting the first visible item while bRedraw == false. */ hTree = create_treeview_control(0); + ret = SendMessageA(hTree, WM_SETREDRAW, FALSE, 0); + ok(ret == 0, "got %d\n", ret); + ins.hParent = TVI_ROOT; ins.hInsertAfter = TVI_ROOT; U(ins).item.mask = TVIF_TEXT; @@ -1924,9 +1927,6 @@ static void test_delete_items(void) hItem2 = TreeView_InsertItemA(hTree, &ins); ok(hItem2 != NULL, "InsertItem failed\n"); - ret = SendMessageA(hTree, WM_SETREDRAW, FALSE, 0); - ok(ret == 0, "got %d\n", ret); - ret = SendMessageA(hTree, TVM_DELETEITEM, 0, (LPARAM)hItem1); ok(ret == TRUE, "got %d\n", ret); diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 5938b29..ae17413 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -1545,6 +1545,7 @@ TREEVIEW_DeleteItem(TREEVIEW_INFO *infoPtr, HTREEITEM item) if (infoPtr->firstVisible == item) { + visible = TRUE; if (item->nextSibling) newFirstVisible = item->nextSibling; else if (item->prevSibling)

1 0

Alistair Leslie-Hughes : gdi32/tests: Check values returned from GetPath.
by Alexandre Julliard 19 Feb '16

19 Feb '16

Module: wine Branch: master Commit: 9ac1744b8020b258885e35653eb51984ce78718f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ac1744b8020b258885e35653… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Feb 18 17:54:09 2016 +1100 gdi32/tests: Check values returned from GetPath. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/metafile.c | 44 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 6804a96..f464720 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -3361,6 +3361,41 @@ static void test_emf_polybezier(void) DeleteEnhMetaFile(hemf); } +static const unsigned char EMF_PATH_BITS[] = +{ + 0x01, 0x00, 0x00, 0x00, 0x6c, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xe6, 0xff, 0xff, 0xff, 0xe6, 0xff, 0xff, 0xff, + 0x20, 0x45, 0x4d, 0x46, 0x00, 0x00, 0x01, 0x00, + 0xf8, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x80, 0x07, 0x00, 0x00, 0xd3, 0x03, 0x00, 0x00, + 0xfc, 0x01, 0x00, 0x00, 0x03, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x60, 0xc0, 0x07, 0x00, + 0xd3, 0xf3, 0x03, 0x00, 0x3b, 0x00, 0x00, 0x00, + 0x08, 0x00, 0x00, 0x00, 0x1b, 0x00, 0x00, 0x00, + 0x10, 0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00, + 0x32, 0x00, 0x00, 0x00, 0x36, 0x00, 0x00, 0x00, + 0x10, 0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00, + 0x96, 0x00, 0x00, 0x00, 0x36, 0x00, 0x00, 0x00, + 0x10, 0x00, 0x00, 0x00, 0x96, 0x00, 0x00, 0x00, + 0x96, 0x00, 0x00, 0x00, 0x36, 0x00, 0x00, 0x00, + 0x10, 0x00, 0x00, 0x00, 0x96, 0x00, 0x00, 0x00, + 0x32, 0x00, 0x00, 0x00, 0x36, 0x00, 0x00, 0x00, + 0x10, 0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00, + 0x32, 0x00, 0x00, 0x00, 0x2b, 0x00, 0x00, 0x00, + 0x18, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, + 0x0a, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, + 0x13, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, + 0x08, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, + 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x10, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00 +}; + static void test_emf_GetPath(void) { HDC hdcMetafile; @@ -3383,14 +3418,21 @@ static void test_emf_GetPath(void) ok( ret, "LineTo error %d.\n", GetLastError()); ret = LineTo(hdcMetafile, 50, 50); ok( ret, "LineTo error %d.\n", GetLastError()); + Rectangle(hdcMetafile, 10, 10, 20, 20); EndPath(hdcMetafile); size = GetPath(hdcMetafile, NULL, NULL, 0); - todo_wine ok( size == 5, "GetPath returned %d.\n", size); + todo_wine ok( size == 9, "GetPath returned %d.\n", size); hemf = CloseEnhMetaFile(hdcMetafile); ok(hemf != 0, "CloseEnhMetaFile error %d\n", GetLastError()); + if (compare_emf_bits(hemf, EMF_PATH_BITS, sizeof(EMF_PATH_BITS), "test_emf_GetPath", FALSE) != 0) + { + dump_emf_bits(hemf, "test_emf_GetPath"); + dump_emf_records(hemf, "test_emf_GetPath"); + } + DeleteEnhMetaFile(hemf); }

1 0

Qian Hong : advapi32/tests: Add more invalid parameter tests for AccessCheck.
by Alexandre Julliard 19 Feb '16

19 Feb '16

Module: wine Branch: master Commit: 954ca154ac0b2e944df2daa1b13ca9587b126577 URL: http://source.winehq.org/git/wine.git/?a=commit;h=954ca154ac0b2e944df2daa1b… Author: Qian Hong <qhong(a)codeweavers.com> Date: Thu Feb 18 14:58:26 2016 +0800 advapi32/tests: Add more invalid parameter tests for AccessCheck. Signed-off-by: Qian Hong <qhong(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 166 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 162 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 3e1ced0..8b86d45 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1437,6 +1437,45 @@ todo_wine ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, "Access and/or AccessStatus were changed!\n"); + /* Null PrivSet with insufficient PrivSetLen */ + SetLastError(0xdeadbeef); + Access = AccessStatus = 0x1abe11ed; + PrivSetLen = 1; + ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, + 0, &PrivSetLen, &Access, &AccessStatus); + err = GetLastError(); + ok(!ret && err == ERROR_NOACCESS, "AccessCheck should have " + "failed with ERROR_NOACCESS, instead of %d\n", err); + ok(PrivSetLen == 1, "PrivSetLen returns %d\n", PrivSetLen); + ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, + "Access and/or AccessStatus were changed!\n"); + + /* Null PrivSet with insufficient PrivSetLen */ + SetLastError(0xdeadbeef); + Access = AccessStatus = 0x1abe11ed; + PrivSetLen = sizeof(PRIVILEGE_SET) - 1; + ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, + 0, &PrivSetLen, &Access, &AccessStatus); + err = GetLastError(); + ok(!ret && err == ERROR_NOACCESS, "AccessCheck should have " + "failed with ERROR_NOACCESS, instead of %d\n", err); + ok(PrivSetLen == sizeof(PRIVILEGE_SET) - 1, "PrivSetLen returns %d\n", PrivSetLen); + ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, + "Access and/or AccessStatus were changed!\n"); + + /* Null PrivSet with minimal sufficient PrivSetLen */ + SetLastError(0xdeadbeef); + Access = AccessStatus = 0x1abe11ed; + PrivSetLen = sizeof(PRIVILEGE_SET); + ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, + 0, &PrivSetLen, &Access, &AccessStatus); + err = GetLastError(); + ok(!ret && err == ERROR_NOACCESS, "AccessCheck should have " + "failed with ERROR_NOACCESS, instead of %d\n", err); + ok(PrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", PrivSetLen); + ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, + "Access and/or AccessStatus were changed!\n"); + /* Valid PrivSet with zero PrivSetLen */ SetLastError(0xdeadbeef); Access = AccessStatus = 0x1abe11ed; @@ -1448,9 +1487,75 @@ todo_wine ok(!ret && err == ERROR_INSUFFICIENT_BUFFER, "AccessCheck should have " "failed with ERROR_INSUFFICIENT_BUFFER, instead of %d\n", err); todo_wine + ok(PrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", PrivSetLen); +todo_wine + ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, + "Access and/or AccessStatus were changed!\n"); + + /* Valid PrivSet with insufficient PrivSetLen */ + SetLastError(0xdeadbeef); + Access = AccessStatus = 0x1abe11ed; + PrivSetLen = 1; + ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, + PrivSet, &PrivSetLen, &Access, &AccessStatus); + err = GetLastError(); +todo_wine + ok(!ret && err == ERROR_INSUFFICIENT_BUFFER, "AccessCheck should have " + "failed with ERROR_INSUFFICIENT_BUFFER, instead of %d\n", err); +todo_wine + ok(PrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", PrivSetLen); +todo_wine ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, "Access and/or AccessStatus were changed!\n"); + /* Valid PrivSet with insufficient PrivSetLen */ + SetLastError(0xdeadbeef); + Access = AccessStatus = 0x1abe11ed; + PrivSetLen = sizeof(PRIVILEGE_SET) - 1; + ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, + PrivSet, &PrivSetLen, &Access, &AccessStatus); + err = GetLastError(); +todo_wine + ok(!ret && err == ERROR_INSUFFICIENT_BUFFER, "AccessCheck should have " + "failed with ERROR_INSUFFICIENT_BUFFER, instead of %d\n", err); +todo_wine + ok(PrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", PrivSetLen); +todo_wine + ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, + "Access and/or AccessStatus were changed!\n"); + + /* Valid PrivSet with minimal sufficient PrivSetLen */ + SetLastError(0xdeadbeef); + Access = AccessStatus = 0x1abe11ed; + PrivSetLen = sizeof(PRIVILEGE_SET); + memset(PrivSet, 0xcc, PrivSetLen); + ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, + PrivSet, &PrivSetLen, &Access, &AccessStatus); + err = GetLastError(); + ok(ret, "AccessCheck failed with error %d\n", GetLastError()); +todo_wine + ok(PrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", PrivSetLen); + ok(AccessStatus && (Access == KEY_READ), + "AccessCheck failed to grant access with error %d\n", GetLastError()); + ok(PrivSet->PrivilegeCount == 0, "PrivilegeCount returns %d, expects 0\n", + PrivSet->PrivilegeCount); + + /* Valid PrivSet with sufficient PrivSetLen */ + SetLastError(0xdeadbeef); + Access = AccessStatus = 0x1abe11ed; + PrivSetLen = sizeof(PRIVILEGE_SET) + 1; + memset(PrivSet, 0xcc, PrivSetLen); + ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, + PrivSet, &PrivSetLen, &Access, &AccessStatus); + err = GetLastError(); + ok(ret, "AccessCheck failed with error %d\n", GetLastError()); +todo_wine + ok(PrivSetLen == sizeof(PRIVILEGE_SET) + 1, "PrivSetLen returns %d\n", PrivSetLen); + ok(AccessStatus && (Access == KEY_READ), + "AccessCheck failed to grant access with error %d\n", GetLastError()); + ok(PrivSet->PrivilegeCount == 0, "PrivilegeCount returns %d, expects 0\n", + PrivSet->PrivilegeCount); + PrivSetLen = FIELD_OFFSET(PRIVILEGE_SET, Privilege[16]); /* Null PrivSet with valid PrivSetLen */ @@ -1475,7 +1580,7 @@ todo_wine "with ERROR_ACCESS_DENIED, instead of %d\n", err); ok(!Access, "Should have failed to grant any access, got 0x%08x\n", Access); - SetLastError(0); + SetLastError(0xdeadbeef); PrivSet->PrivilegeCount = 16; ret = AccessCheck(SecurityDescriptor, Token, ACCESS_SYSTEM_SECURITY, &Mapping, PrivSet, &PrivSetLen, &Access, &AccessStatus); @@ -1488,16 +1593,69 @@ todo_wine ret = pRtlAdjustPrivilege(SE_SECURITY_PRIVILEGE, TRUE, TRUE, &Enabled); if (!ret) { - SetLastError(0); - PrivSet->PrivilegeCount = 16; + /* Valid PrivSet with zero PrivSetLen */ + SetLastError(0xdeadbeef); + Access = AccessStatus = 0x1abe11ed; + PrivSetLen = 0; + ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, + PrivSet, &PrivSetLen, &Access, &AccessStatus); + err = GetLastError(); + todo_wine + ok(!ret && err == ERROR_INSUFFICIENT_BUFFER, "AccessCheck should have " + "failed with ERROR_INSUFFICIENT_BUFFER, instead of %d\n", err); + todo_wine + ok(PrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", PrivSetLen); + todo_wine + ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, + "Access and/or AccessStatus were changed!\n"); + + /* Valid PrivSet with insufficient PrivSetLen */ + SetLastError(0xdeadbeef); + Access = AccessStatus = 0x1abe11ed; + PrivSetLen = sizeof(PRIVILEGE_SET) - 1; + ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, + PrivSet, &PrivSetLen, &Access, &AccessStatus); + err = GetLastError(); + todo_wine + ok(!ret && err == ERROR_INSUFFICIENT_BUFFER, "AccessCheck should have " + "failed with ERROR_INSUFFICIENT_BUFFER, instead of %d\n", err); + todo_wine + ok(PrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", PrivSetLen); + todo_wine + ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, + "Access and/or AccessStatus were changed!\n"); + + /* Valid PrivSet with minimal sufficient PrivSetLen */ + SetLastError(0xdeadbeef); + Access = AccessStatus = 0x1abe11ed; + PrivSetLen = sizeof(PRIVILEGE_SET); + memset(PrivSet, 0xcc, PrivSetLen); + ret = AccessCheck(SecurityDescriptor, Token, ACCESS_SYSTEM_SECURITY, &Mapping, + PrivSet, &PrivSetLen, &Access, &AccessStatus); + ok(ret && AccessStatus && GetLastError() == 0xdeadbeef, + "AccessCheck should have succeeded, error %d\n", + GetLastError()); + ok(Access == ACCESS_SYSTEM_SECURITY, + "Access should be equal to ACCESS_SYSTEM_SECURITY instead of 0x%08x\n", + Access); + ok(PrivSet->PrivilegeCount == 1, "PrivilegeCount returns %d, expects 1\n", + PrivSet->PrivilegeCount); + + /* Valid PrivSet with large PrivSetLen */ + SetLastError(0xdeadbeef); + Access = AccessStatus = 0x1abe11ed; + PrivSetLen = FIELD_OFFSET(PRIVILEGE_SET, Privilege[16]); + memset(PrivSet, 0xcc, PrivSetLen); ret = AccessCheck(SecurityDescriptor, Token, ACCESS_SYSTEM_SECURITY, &Mapping, PrivSet, &PrivSetLen, &Access, &AccessStatus); - ok(ret && AccessStatus && GetLastError() == 0, + ok(ret && AccessStatus && GetLastError() == 0xdeadbeef, "AccessCheck should have succeeded, error %d\n", GetLastError()); ok(Access == ACCESS_SYSTEM_SECURITY, "Access should be equal to ACCESS_SYSTEM_SECURITY instead of 0x%08x\n", Access); + ok(PrivSet->PrivilegeCount == 1, "PrivilegeCount returns %d, expects 1\n", + PrivSet->PrivilegeCount); } else trace("Couldn't get SE_SECURITY_PRIVILEGE (0x%08x), skipping ACCESS_SYSTEM_SECURITY test\n",

1 0

Stefan Dösinger : wined3d: Track SFLAG_NONPOW2 per-texture.
by Alexandre Julliard 19 Feb '16

19 Feb '16

Module: wine Branch: master Commit: cdefb5ccb7db1ed801fb8a3a8c55774d375b4b7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdefb5ccb7db1ed801fb8a3a8… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Feb 18 17:30:01 2016 +0100 wined3d: Track SFLAG_NONPOW2 per-texture. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 17 +++-------------- dlls/wined3d/texture.c | 6 ++++++ dlls/wined3d/wined3d_private.h | 22 +++++++++++----------- 3 files changed, 20 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7858d15..88acca5 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -594,7 +594,7 @@ static BOOL surface_use_pbo(const struct wined3d_surface *surface) && gl_info->supported[ARB_PIXEL_BUFFER_OBJECT] && !texture->resource.format->convert && !(texture->flags & WINED3D_TEXTURE_PIN_SYSMEM) - && !(surface->flags & SFLAG_NONPOW2); + && !(texture->flags & WINED3D_TEXTURE_COND_NP2_EMULATED); } static HRESULT surface_private_setup(struct wined3d_surface *surface) @@ -635,12 +635,6 @@ static HRESULT surface_private_setup(struct wined3d_surface *surface) } } - if (pow2Width != surface->resource.width - || pow2Height != surface->resource.height) - { - surface->flags |= SFLAG_NONPOW2; - } - if ((surface->pow2Width > gl_info->limits.texture_size || surface->pow2Height > gl_info->limits.texture_size) && !(surface->resource.usage & (WINED3DUSAGE_RENDERTARGET | WINED3DUSAGE_DEPTHSTENCIL))) { @@ -1321,7 +1315,7 @@ static void surface_download_data(struct wined3d_surface *surface, const struct GLenum gl_type = format->glType; void *mem; - if (surface->flags & SFLAG_NONPOW2) + if (surface->container->flags & WINED3D_TEXTURE_COND_NP2_EMULATED) { wined3d_texture_get_pitch(surface->container, surface->texture_level, &dst_row_pitch, &dst_slice_pitch); wined3d_format_calculate_pitch(format, surface->resource.device->surface_alignment, @@ -1355,7 +1349,7 @@ static void surface_download_data(struct wined3d_surface *surface, const struct checkGLcall("glGetTexImage"); } - if (surface->flags & SFLAG_NONPOW2) + if (surface->container->flags & WINED3D_TEXTURE_COND_NP2_EMULATED) { const BYTE *src_data; BYTE *dst_data; @@ -1880,11 +1874,6 @@ HRESULT wined3d_surface_update_desc(struct wined3d_surface *surface, const struc surface->pow2Height <<= 1; } - if (surface->pow2Width != width || surface->pow2Height != height) - surface->flags |= SFLAG_NONPOW2; - else - surface->flags &= ~SFLAG_NONPOW2; - if (surface->container->user_memory) { surface->resource.map_binding = WINED3D_LOCATION_USER_MEMORY; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 804856b..c3bae83 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -663,6 +663,11 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT wined3d_format_calculate_pitch(format, 1, width, height, &texture->row_pitch, &texture->slice_pitch); + texture->flags &= ~WINED3D_TEXTURE_COND_NP2_EMULATED; + if (((width & (width - 1)) || (height & (height - 1))) && !gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO] + && !gl_info->supported[ARB_TEXTURE_RECTANGLE] && !gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT]) + texture->flags |= WINED3D_TEXTURE_COND_NP2_EMULATED; + return wined3d_surface_update_desc(surface, gl_info); } @@ -1074,6 +1079,7 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 texture->pow2_matrix[0] = (((float)desc->width) / ((float)pow2_width)); texture->pow2_matrix[5] = (((float)desc->height) / ((float)pow2_height)); texture->flags &= ~WINED3D_TEXTURE_POW2_MAT_IDENT; + texture->flags |= WINED3D_TEXTURE_COND_NP2_EMULATED; } texture->pow2_matrix[10] = 1.0f; texture->pow2_matrix[15] = 1.0f; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a20bc65..35ece12 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2336,16 +2336,17 @@ struct wined3d_texture_ops }; #define WINED3D_TEXTURE_COND_NP2 0x00000001 -#define WINED3D_TEXTURE_POW2_MAT_IDENT 0x00000002 -#define WINED3D_TEXTURE_IS_SRGB 0x00000004 -#define WINED3D_TEXTURE_RGB_ALLOCATED 0x00000008 -#define WINED3D_TEXTURE_RGB_VALID 0x00000010 -#define WINED3D_TEXTURE_SRGB_ALLOCATED 0x00000020 -#define WINED3D_TEXTURE_SRGB_VALID 0x00000040 -#define WINED3D_TEXTURE_CONVERTED 0x00000080 -#define WINED3D_TEXTURE_PIN_SYSMEM 0x00000100 -#define WINED3D_TEXTURE_DYNAMIC_MAP 0x00000200 -#define WINED3D_TEXTURE_NORMALIZED_COORDS 0x00000400 +#define WINED3D_TEXTURE_COND_NP2_EMULATED 0x00000002 +#define WINED3D_TEXTURE_POW2_MAT_IDENT 0x00000004 +#define WINED3D_TEXTURE_IS_SRGB 0x00000008 +#define WINED3D_TEXTURE_RGB_ALLOCATED 0x00000010 +#define WINED3D_TEXTURE_RGB_VALID 0x00000020 +#define WINED3D_TEXTURE_SRGB_ALLOCATED 0x00000040 +#define WINED3D_TEXTURE_SRGB_VALID 0x00000080 +#define WINED3D_TEXTURE_CONVERTED 0x00000100 +#define WINED3D_TEXTURE_PIN_SYSMEM 0x00000200 +#define WINED3D_TEXTURE_DYNAMIC_MAP 0x00000400 +#define WINED3D_TEXTURE_NORMALIZED_COORDS 0x00000800 #define WINED3D_TEXTURE_ASYNC_COLOR_KEY 0x00000001 @@ -2596,7 +2597,6 @@ void draw_textured_quad(const struct wined3d_surface *src_surface, struct wined3 /* Surface flags: */ #define SFLAG_DIBSECTION 0x00000001 /* Has a DIB section attached for GetDC. */ #define SFLAG_DISCARD 0x00000002 /* ??? */ -#define SFLAG_NONPOW2 0x00000004 /* Surface sizes are not a power of 2 */ #define SFLAG_DCINUSE 0x00000020 /* Set between GetDC and ReleaseDC calls. */ struct wined3d_sampler

1 0

Henri Verbeet : d3d8: Use wined3d_texture_get_sub_resource_parent() in d3d8_texture_3d_UnlockBox().
by Alexandre Julliard 19 Feb '16

19 Feb '16

Module: wine Branch: master Commit: e580d74829b9e01cbcf4349ef4e5cc50d73b6e71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e580d74829b9e01cbcf4349ef… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 18 17:30:00 2016 +0100 d3d8: Use wined3d_texture_get_sub_resource_parent() in d3d8_texture_3d_UnlockBox(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/texture.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index 2b9df09..b9f5824 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -1029,20 +1029,16 @@ static HRESULT WINAPI d3d8_texture_3d_LockBox(IDirect3DVolumeTexture8 *iface, static HRESULT WINAPI d3d8_texture_3d_UnlockBox(IDirect3DVolumeTexture8 *iface, UINT level) { struct d3d8_texture *texture = impl_from_IDirect3DVolumeTexture8(iface); - struct wined3d_resource *sub_resource; struct d3d8_volume *volume_impl; HRESULT hr; TRACE("iface %p, level %u.\n", iface, level); wined3d_mutex_lock(); - if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, level))) + if (!(volume_impl = wined3d_texture_get_sub_resource_parent(texture->wined3d_texture, level))) hr = D3DERR_INVALIDCALL; else - { - volume_impl = wined3d_resource_get_parent(sub_resource); hr = IDirect3DVolume8_UnlockBox(&volume_impl->IDirect3DVolume8_iface); - } wined3d_mutex_unlock(); return hr;

1 0

Henri Verbeet : d3d8: Use wined3d_texture_get_sub_resource_parent() in d3d8_texture_3d_LockBox().
by Alexandre Julliard 19 Feb '16

19 Feb '16

Module: wine Branch: master Commit: 4ddf51dab16202c57f6050c5421854af5c3eef5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ddf51dab16202c57f6050c54… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 18 17:29:59 2016 +0100 d3d8: Use wined3d_texture_get_sub_resource_parent() in d3d8_texture_3d_LockBox(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/texture.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index cf5827d..2b9df09 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -1010,7 +1010,6 @@ static HRESULT WINAPI d3d8_texture_3d_LockBox(IDirect3DVolumeTexture8 *iface, UINT level, D3DLOCKED_BOX *locked_box, const D3DBOX *box, DWORD flags) { struct d3d8_texture *texture = impl_from_IDirect3DVolumeTexture8(iface); - struct wined3d_resource *sub_resource; struct d3d8_volume *volume_impl; HRESULT hr; @@ -1018,13 +1017,10 @@ static HRESULT WINAPI d3d8_texture_3d_LockBox(IDirect3DVolumeTexture8 *iface, iface, level, locked_box, box, flags); wined3d_mutex_lock(); - if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, level))) + if (!(volume_impl = wined3d_texture_get_sub_resource_parent(texture->wined3d_texture, level))) hr = D3DERR_INVALIDCALL; else - { - volume_impl = wined3d_resource_get_parent(sub_resource); hr = IDirect3DVolume8_LockBox(&volume_impl->IDirect3DVolume8_iface, locked_box, box, flags); - } wined3d_mutex_unlock(); return hr;

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
76
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-commits February 2016