August 2016 - Wine-commits - list.winehq.org

Bruno Jesus : dinput: Dump the condition effect correctly for 2 array items.
by Alexandre Julliard 24 Aug '16

24 Aug '16

Module: wine Branch: master Commit: 777ca9060166c2c3bf48aac06e3d738cf85bedb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=777ca9060166c2c3bf48aac06… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Aug 23 19:24:11 2016 -0300 dinput: Dump the condition effect correctly for 2 array items. Based on ideas by Elias Vanderstuyft. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 52ff925..45c3618 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -215,10 +215,14 @@ void dump_DIEFFECT(LPCDIEFFECT eff, REFGUID guid, DWORD dwFlags) _dump_DIRAMPFORCE(eff->lpvTypeSpecificParams); } } else if (type == DIEFT_CONDITION) { - if (eff->cbTypeSpecificParams != sizeof(DICONDITION)) { - WARN("Effect claims to be a condition but the type-specific params are the wrong size!\n"); - } else { + if (eff->cbTypeSpecificParams == sizeof(DICONDITION)) { _dump_DICONDITION(eff->lpvTypeSpecificParams); + } else if (eff->cbTypeSpecificParams == 2 * sizeof(DICONDITION)) { + DICONDITION *condition = eff->lpvTypeSpecificParams; + _dump_DICONDITION(&condition[0]); + _dump_DICONDITION(&condition[1]); + } else { + WARN("Effect claims to be a condition but the type-specific params are the wrong size!\n"); } } else if (type == DIEFT_CUSTOMFORCE) { if (eff->cbTypeSpecificParams != sizeof(DICUSTOMFORCE)) {

1 0

Sebastian Lackner : shell32: Use the correct memory allocation function in RecycleBin_GetDisplayNameOf.
by Alexandre Julliard 24 Aug '16

24 Aug '16

Module: wine Branch: master Commit: a11fb74ffb15b60768c6fa49b07251639a6611a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a11fb74ffb15b60768c6fa49b… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Aug 23 18:33:00 2016 +0200 shell32: Use the correct memory allocation function in RecycleBin_GetDisplayNameOf. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/recyclebin.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/shell32/recyclebin.c b/dlls/shell32/recyclebin.c index 28098af..0b5638b 100644 --- a/dlls/shell32/recyclebin.c +++ b/dlls/shell32/recyclebin.c @@ -529,11 +529,7 @@ static HRESULT WINAPI RecycleBin_GetDisplayNameOf(IShellFolder2 *This, LPCITEMID TRACE("(%p, %p, %x, %p)\n", This, pidl, uFlags, pName); TRASH_UnpackItemID(&pidl->mkid, &data); pName->uType = STRRET_WSTR; - pName->u.pOleStr = StrDupW(PathFindFileNameW(data.cFileName)); - if (pName->u.pOleStr == NULL) - return E_OUTOFMEMORY; - - return S_OK; + return SHStrDupW(PathFindFileNameW(data.cFileName), &pName->u.pOleStr); } static HRESULT WINAPI RecycleBin_SetNameOf(IShellFolder2 *This, HWND hwnd, LPCITEMIDLIST pidl, LPCOLESTR pszName,

1 0

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard 24 Aug '16

24 Aug '16

Module: wine Branch: master Commit: 0d4617e5a6e99f62d62c7cb1fa1610699c7e5bc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d4617e5a6e99f62d62c7cb1f… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Aug 23 22:13:24 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 | 154 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 76 insertions(+), 78 deletions(-) diff --git a/po/ja.po b/po/ja.po index 358cb7d..7d87e62 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: 2016-05-05 15:32+0900\n" +"PO-Revision-Date: 2016-08-20 14:33+0900\n" "Last-Translator: Akihiro Sagawa <sagawa.aki(a)gmail.com>\n" "Language-Team: Japanese\n" "Language: ja\n" @@ -10183,7 +10183,7 @@ msgstr "" "ECHO\t\t文字列を直接コンソール出力にコピー\n" "ENDLOCAL\tバッチファイルでの環境変更の局所化を終了\n" "FTYPE\t\tファイルタイプのオープンコマンドを表示または変更\n" -"HELP\t\tトピックの詳細なヘルプを表示\n" +"HELP\t\tトピックについて簡潔なヘルプを表示\n" "MD (MKDIR)\tサブディレクトリを作成\n" "MORE\t\t出力をページ区切りで表示\n" "MOVE\t\tファイルまたはディレクトリツリーを移動\n" @@ -11535,6 +11535,15 @@ msgid "" " REG [operation] /?\n" "\n" msgstr "" +"使い方:\n" +" REG [操作] [パラメータ]\n" +"\n" +"対応している操作:\n" +" ADD | DELETE | QUERY\n" +"\n" +"特定の操作に対するヘルプは以下を入力:\n" +" REG [操作] /?\n" +"\n" #: reg.rc:36 msgid "" @@ -11574,7 +11583,7 @@ msgstr "reg: システムは指定されたキーまたは値を見つけられ #: reg.rc:44 msgid "reg: Unsupported registry data type [%1]\n" -msgstr "reg: サポートされていないレジストリのデータ型 [%1]\n" +msgstr "reg: サポートされていないレジストリデータ型 [%1]\n" #: reg.rc:45 msgid "reg: The option [/d] must be followed by a valid integer\n" @@ -11637,24 +11646,20 @@ msgid "Search complete. Number of matches found: %1!d!\n" msgstr "検索が完了しました。該当箇所の数: %1!d!\n" #: reg.rc:61 -#, fuzzy -#| msgid "reg: Invalid key name\n" msgid "reg: Invalid syntax. " -msgstr "reg: キー名が無効です\n" +msgstr "reg: 無効な構文です。" #: reg.rc:62 -#, fuzzy -#| msgid "uninstaller: Invalid option [%1]\n" msgid "reg: Invalid option [%1]. " -msgstr "uninstaller: 無効なオプション [%1]\n" +msgstr "reg: 無効なオプション [%1]。" #: reg.rc:63 msgid "Type \"REG /?\" for help.\n" -msgstr "" +msgstr "ヘルプは \"REG /?\" と入力してください。\n" #: reg.rc:64 msgid "Type \"REG %1 /?\" for help.\n" -msgstr "" +msgstr "ヘルプは \"REG %1 /?\" と入力してください。\n" #: reg.rc:65 regedit.rc:205 msgid "(value not set)" @@ -11899,132 +11904,125 @@ msgid "" " regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" " regedit /D \"HKEY_LOCAL_MACHINE\\Error\\Path\"\n" msgstr "" +"使い方:\n" +" regedit [オプション] [ファイル名] [レジストリキー]\n" +"\n" +"オプション:\n" +" [オプションなし] このプログラムの GUI 版を起動します。\n" +" /L:system.dat 変更する system.dat ファイルの場所。\n" +" 他のスイッチと同時に指定できます。無視されます。\n" +" /R:user.dat 変更する user.dat ファイルの場所。\n" +" 他のスイッチと同時に指定できます。無視されます。\n" +" /C レジストリファイルの内容をインポートします。\n" +" /D 指定したレジストリキーを削除します。\n" +" /E 指定したレジストリキーをファイルにエクスポートします。\n" +" キーが未指定の場合、レジストリ全体がエクスポートされま" +"す。\n" +" /S サイレントモード。メッセージは表示されません。\n" +" /V GUI をアドバンストモードで起動します。無視されます。\n" +" /? この情報を表示し、終了します。\n" +" [ファイル名] インポートするレジストリ情報を含むファイルの場所。[/E] " +"と\n" +" 同時使用した場合、このオプションはレジストリ情報がエク" +"ス\n" +" ポートされるファイル位置を指定します。\n" +"\n" +"使い方の例:\n" +" regedit \"import.reg\"\n" +" regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" +" regedit /D \"HKEY_LOCAL_MACHINE\\Error\\Path\"\n" #: regedit.rc:360 -#, fuzzy -#| msgid "" -#| "regsvr32: Invalid or unrecognized switch [%1]\n" -#| "\n" msgid "regedit: Invalid or unrecognized switch [%1]\n" -msgstr "" -"regsvr32: 無効または認識できないスイッチです[%1]\n" -"\n" +msgstr "regedit: 無効または認識できないスイッチです [%1]\n" #: regedit.rc:361 msgid "Type \"regedit /?\" for help.\n" -msgstr "" +msgstr "ヘルプは \"regedit /?\" と入力してください。\n" #: regedit.rc:362 -#, fuzzy -#| msgid "No command was specified." msgid "regedit: No filename was specified.\n" -msgstr "コマンドが指定されていません。" +msgstr "regedit: ファイル名が指定されていません。\n" #: regedit.rc:363 msgid "regedit: No registry key was specified for removal.\n" -msgstr "" +msgstr "regedit: 削除するレジストリキーが指定されていません。\n" #: regedit.rc:364 -#, fuzzy -#| msgid "uninstaller: The application with GUID '%1' was not found\n" msgid "regedit: The file '%1' was not found.\n" -msgstr "uninstaller: GUID '%1' のアプリケーションは見つかりませんでした\n" +msgstr "regedit: ファイル '%1' が見つかりません。\n" #: regedit.rc:365 -#, fuzzy -#| msgid "reg: Unable to access remote machine\n" msgid "regedit: Unable to open the file '%1'.\n" -msgstr "reg: リモートマシンにアクセスできませんでした\n" +msgstr "regedit: ファイル '%1' をオープンできません。\n" #: regedit.rc:366 -#, fuzzy -#| msgid "Invalid handle operation.\n" msgid "regedit: Unhandled action.\n" -msgstr "ハンドル操作が正しくありません。\n" +msgstr "regedit: 処理されない操作。\n" #: regedit.rc:367 msgid "regedit: Out of memory! (%1!S!, line %2!u!)\n" -msgstr "" +msgstr "regedit: メモリ不足です! (%1!S!, %2!u! 行目)\n" #: regedit.rc:368 -#, fuzzy -#| msgid "reg: Invalid key name\n" msgid "regedit: Invalid hexadecimal value.\n" -msgstr "reg: キー名が無効です\n" +msgstr "regedit: 16進数値が正しくありません。\n" #: regedit.rc:369 msgid "" "regedit: Unable to convert hexadecimal data. An invalid value was " "encountered at '%1'.\n" msgstr "" +"regedit: 16進数のデータを変換できませんでした。正しくない値が\n" +"'%1' にあります。\n" #: regedit.rc:370 -#, fuzzy -#| msgid "" -#| "regsvr32: Invalid or unrecognized switch [%1]\n" -#| "\n" msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" -msgstr "" -"regsvr32: 無効または認識できないスイッチです[%1]\n" -"\n" +msgstr "regedit: 認識できないエスケープシーケンスです [%1!c!]\n" #: regedit.rc:371 -#, fuzzy -#| msgid "reg: Unsupported registry data type [%1]\n" msgid "regedit: Unsupported registry data type [%1]\n" -msgstr "reg: サポートされていないレジストリのデータ型 [%1]\n" +msgstr "regedit: サポートされていないレジストリデータ型 [%1]\n" #: regedit.rc:372 -#, fuzzy -#| msgid "reg: Unable to access remote machine\n" msgid "regedit: Unexpected end of line in '%1'.\n" -msgstr "reg: リモートマシンにアクセスできませんでした\n" +msgstr "regedit: 予期していない行末です '%1'。\n" #: regedit.rc:373 -#, fuzzy -#| msgid "uninstaller: The application with GUID '%1' was not found\n" msgid "regedit: The line '%1' was not recognized.\n" -msgstr "uninstaller: GUID '%1' のアプリケーションは見つかりませんでした\n" +msgstr "regedit: '%1' は認識できない行です。\n" #: regedit.rc:374 -#, fuzzy -#| msgid "reg: Unable to access remote machine\n" msgid "regedit: Unable to add the registry value '%1' to '%2'.\n" -msgstr "reg: リモートマシンにアクセスできませんでした\n" +msgstr "regedit: レジストリ値 '%1' を '%2' に加えられません。\n" #: regedit.rc:375 -#, fuzzy -#| msgid "reg: Unable to access remote machine\n" msgid "regedit: Unable to open the registry key '%1'.\n" -msgstr "reg: リモートマシンにアクセスできませんでした\n" +msgstr "regedit: レジストリキー '%1' を開けません。\n" #: regedit.rc:376 -#, fuzzy -#| msgid "reg: Unsupported registry data type [%1]\n" msgid "regedit: Unsupported registry data type [%1] encountered in '%2'.\n" -msgstr "reg: サポートされていないレジストリのデータ型 [%1]\n" +msgstr "" +"regedit: サポートされていないレジストリデータ型 [%1] が '%2' にあります。\n" #: regedit.rc:377 msgid "regedit: The registry value '%1' will be exported as binary data.\n" msgstr "" +"regedit: レジストリ値 '%1' はバイナリデータとしてエクスポートされます。\n" #: regedit.rc:378 msgid "regedit: Incorrect registry class specification in '%1'.\n" -msgstr "" +msgstr "regedit: レジストリクラス指定の誤りが '%1' にあります。\n" #: regedit.rc:379 -#, fuzzy -#| msgid "" -#| "reg: The system was unable to find the specified registry key or value\n" msgid "" "regedit: Unable to export '%1'. The specified registry key was not found.\n" -msgstr "reg: システムは指定されたキーまたは値を見つけられませんでした\n" +msgstr "" +"regedit: '%1' をエクスポートできません。指定されたキーが見つかりません。\n" #: regedit.rc:380 -#, fuzzy -#| msgid "reg: Unable to access remote machine\n" msgid "regedit: Unable to delete the registry class '%1'.\n" -msgstr "reg: リモートマシンにアクセスできませんでした\n" +msgstr "regedit: レジストリクラス '%1' を削除できません。\n" #: regedit.rc:163 msgid "Quits the registry editor" @@ -13285,19 +13283,19 @@ msgstr "ウィンドウマネージャがウィンドウを制御するのを #: winecfg.rc:173 msgid "&Emulate a virtual desktop" -msgstr "仮想デスクトップをエミュレートする(&D)" +msgstr "仮想デスクトップをエミュレートする(&E)" #: winecfg.rc:175 msgid "Desktop &size:" -msgstr "デスクトップの大きさ(&Z):" +msgstr "デスクトップの大きさ(&S):" #: winecfg.rc:180 msgid "Screen resolution" -msgstr "画面の解像度(&R)" +msgstr "画面の解像度" #: winecfg.rc:184 msgid "This is a sample text using 10 point Tahoma" -msgstr "10 ポイントの Thamoa による見本です" +msgstr "10 ポイントの Tahoma による見本です" #: winecfg.rc:191 msgid "DLL overrides" @@ -13947,7 +13945,7 @@ msgstr "構成エラー" 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" @@ -13955,11 +13953,11 @@ msgstr "それぞれの文字は %1!u! ピクセルの幅、%2!u! ピクセル #: wineconsole.rc:38 msgid "This is a test" -msgstr "これはテストです。" +msgstr "これはテストです" #: wineconsole.rc:44 msgid "wineconsole: Couldn't parse event id\n" -msgstr "wineconsole: イベント ID を解析できませんでした。\n" +msgstr "wineconsole: イベント ID を解析できませんでした\n" #: wineconsole.rc:45 msgid "wineconsole: Invalid backend\n" @@ -14869,11 +14867,11 @@ msgstr "Wordpad の起動に失敗しました" #: xcopy.rc:30 msgid "Invalid number of parameters - Use xcopy /? for help\n" -msgstr "パラメータの数が違います。xcopy /? で使い方を表示します\n" +msgstr "パラメータの数が違います。xcopy /? でヘルプを表示します\n" #: xcopy.rc:31 msgid "Invalid parameter '%1' - Use xcopy /? for help\n" -msgstr "無効なパラメータ '%1' です。xcopy /? で使い方を表示します\n" +msgstr "無効なパラメータ '%1' です。xcopy /? でヘルプを表示します\n" #: xcopy.rc:32 msgid "Press <Enter> to begin copying\n"

1 0

Nikolay Sivov : include: Fix facility id for d3d10 HRESULTs.
by Alexandre Julliard 24 Aug '16

24 Aug '16

Module: wine Branch: master Commit: 9893d9a3c69517218a5f442047089e07f161a6a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9893d9a3c69517218a5f44204… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 22 15:08:25 2016 +0300 include: Fix facility id for d3d10 HRESULTs. 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> --- include/d3d10.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/d3d10.idl b/include/d3d10.idl index 0ab6ab3..24fd2bf 100644 --- a/include/d3d10.idl +++ b/include/d3d10.idl @@ -242,7 +242,7 @@ const unsigned int D3D_SPEC_DATE_YEAR cpp_quote("#endif") const unsigned int D3D10_APPEND_ALIGNED_ELEMENT = 0xffffffff; -const unsigned int _FACD3D10 = 0x87; +const unsigned int _FACD3D10 = 0x879; const unsigned int _FACD3D10DEBUG = _FACD3D10 + 1; const unsigned int D3D10_FILTER_TYPE_MASK = 0x3; const unsigned int D3D10_SDK_VERSION = 29;

1 0

Kimmo Myllyvirta : wined3d: Add support for WINED3DFMT_BC7_UNORM format.
by Alexandre Julliard 24 Aug '16

24 Aug '16

Module: wine Branch: master Commit: 27f5bc5bbcc6381879699920ff938eec440e336e URL: http://source.winehq.org/git/wine.git/?a=commit;h=27f5bc5bbcc6381879699920f… Author: Kimmo Myllyvirta <kimmo.myllyvirta(a)gmail.com> Date: Sat Aug 20 09:24:23 2016 +0300 wined3d: Add support for WINED3DFMT_BC7_UNORM format. Signed-off-by: Kimmo Myllyvirta <kimmo.myllyvirta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/utils.c | 9 +++++++++ dlls/wined3d/wined3d_gl.h | 1 + 3 files changed, 12 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 50fb50d..9ff88a8 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -147,6 +147,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_sync", ARB_SYNC }, {"GL_ARB_texture_border_clamp", ARB_TEXTURE_BORDER_CLAMP }, {"GL_ARB_texture_compression", ARB_TEXTURE_COMPRESSION }, + {"GL_ARB_texture_compression_bptc", ARB_TEXTURE_COMPRESSION_BPTC }, {"GL_ARB_texture_compression_rgtc", ARB_TEXTURE_COMPRESSION_RGTC }, {"GL_ARB_texture_cube_map", ARB_TEXTURE_CUBE_MAP }, {"GL_ARB_texture_env_combine", ARB_TEXTURE_ENV_COMBINE }, @@ -3563,6 +3564,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD {ARB_INTERNALFORMAT_QUERY, MAKEDWORD_VERSION(4, 2)}, {ARB_MAP_BUFFER_ALIGNMENT, MAKEDWORD_VERSION(4, 2)}, + {ARB_TEXTURE_COMPRESSION_BPTC, MAKEDWORD_VERSION(4, 2)}, {ARB_TEXTURE_STORAGE, MAKEDWORD_VERSION(4, 2)}, {ARB_DEBUG_OUTPUT, MAKEDWORD_VERSION(4, 3)}, diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index f02220c..009fcd0 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -169,6 +169,7 @@ static const struct wined3d_format_channels formats[] = {WINED3DFMT_BC3_TYPELESS, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, {WINED3DFMT_BC4_TYPELESS, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, {WINED3DFMT_BC5_TYPELESS, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, + {WINED3DFMT_BC7_TYPELESS, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, {WINED3DFMT_B8G8R8A8_TYPELESS, 8, 8, 8, 8, 16, 8, 0, 24, 4, 0, 0}, {WINED3DFMT_B8G8R8X8_TYPELESS, 8, 8, 8, 0, 16, 8, 0, 0, 4, 0, 0}, }; @@ -256,6 +257,8 @@ static const struct wined3d_typed_format_info typed_formats[] = {WINED3DFMT_BC3_UNORM, WINED3DFMT_BC3_TYPELESS, ""}, {WINED3DFMT_BC4_UNORM, WINED3DFMT_BC4_TYPELESS, ""}, {WINED3DFMT_BC5_UNORM, WINED3DFMT_BC5_TYPELESS, ""}, + {WINED3DFMT_BC7_UNORM_SRGB, WINED3DFMT_BC7_TYPELESS, ""}, + {WINED3DFMT_BC7_UNORM, WINED3DFMT_BC7_TYPELESS, ""}, {WINED3DFMT_B8G8R8A8_UNORM_SRGB, WINED3DFMT_B8G8R8A8_TYPELESS, "uuuu"}, {WINED3DFMT_B8G8R8A8_UNORM, WINED3DFMT_B8G8R8A8_TYPELESS, "uuuu"}, {WINED3DFMT_B8G8R8X8_UNORM_SRGB, WINED3DFMT_B8G8R8X8_TYPELESS, "uuuX"}, @@ -318,6 +321,7 @@ static const struct wined3d_format_block_info format_block_info[] = {WINED3DFMT_BC3_UNORM, 4, 4, 16, TRUE}, {WINED3DFMT_BC4_UNORM, 4, 4, 8, TRUE}, {WINED3DFMT_BC5_UNORM, 4, 4, 16, TRUE}, + {WINED3DFMT_BC7_UNORM, 4, 4, 16, TRUE}, {WINED3DFMT_ATI1N, 4, 4, 8, FALSE}, {WINED3DFMT_ATI2N, 4, 4, 16, FALSE}, {WINED3DFMT_YUY2, 2, 1, 4, FALSE}, @@ -1115,6 +1119,11 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_COMPRESSED, ARB_TEXTURE_COMPRESSION_RGTC, NULL}, + {WINED3DFMT_BC7_UNORM, GL_COMPRESSED_RGBA_BPTC_UNORM_ARB, GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_ARB, 0, + GL_RGBA, GL_UNSIGNED_BYTE, 0, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING + | WINED3DFMT_FLAG_COMPRESSED, + ARB_TEXTURE_COMPRESSION_BPTC, NULL}, /* IEEE formats */ {WINED3DFMT_R32_FLOAT, GL_RGB32F_ARB, GL_RGB32F_ARB, 0, GL_RED, GL_FLOAT, 0, diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 34bf88d..67ab6f7 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -82,6 +82,7 @@ enum wined3d_gl_extension ARB_SYNC, ARB_TEXTURE_BORDER_CLAMP, ARB_TEXTURE_COMPRESSION, + ARB_TEXTURE_COMPRESSION_BPTC, ARB_TEXTURE_COMPRESSION_RGTC, ARB_TEXTURE_CUBE_MAP, ARB_TEXTURE_ENV_COMBINE,

1 0

Kimmo Myllyvirta : wined3d: Add support for WINED3DFMT_BC6H_UF16/ SF16 formats.
by Alexandre Julliard 24 Aug '16

24 Aug '16

Module: wine Branch: master Commit: 4882fda7f277e9c9e79e6c5ce33e07b6a8dc6dcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4882fda7f277e9c9e79e6c5ce… Author: Kimmo Myllyvirta <kimmo.myllyvirta(a)gmail.com> Date: Sun Aug 21 11:26:55 2016 +0300 wined3d: Add support for WINED3DFMT_BC6H_UF16/SF16 formats. Signed-off-by: Kimmo Myllyvirta <kimmo.myllyvirta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 009fcd0..8989833 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -169,6 +169,7 @@ static const struct wined3d_format_channels formats[] = {WINED3DFMT_BC3_TYPELESS, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, {WINED3DFMT_BC4_TYPELESS, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, {WINED3DFMT_BC5_TYPELESS, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, + {WINED3DFMT_BC6H_TYPELESS, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, {WINED3DFMT_BC7_TYPELESS, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, {WINED3DFMT_B8G8R8A8_TYPELESS, 8, 8, 8, 8, 16, 8, 0, 24, 4, 0, 0}, {WINED3DFMT_B8G8R8X8_TYPELESS, 8, 8, 8, 0, 16, 8, 0, 0, 4, 0, 0}, @@ -257,6 +258,8 @@ static const struct wined3d_typed_format_info typed_formats[] = {WINED3DFMT_BC3_UNORM, WINED3DFMT_BC3_TYPELESS, ""}, {WINED3DFMT_BC4_UNORM, WINED3DFMT_BC4_TYPELESS, ""}, {WINED3DFMT_BC5_UNORM, WINED3DFMT_BC5_TYPELESS, ""}, + {WINED3DFMT_BC6H_UF16, WINED3DFMT_BC6H_TYPELESS, ""}, + {WINED3DFMT_BC6H_SF16, WINED3DFMT_BC6H_TYPELESS, ""}, {WINED3DFMT_BC7_UNORM_SRGB, WINED3DFMT_BC7_TYPELESS, ""}, {WINED3DFMT_BC7_UNORM, WINED3DFMT_BC7_TYPELESS, ""}, {WINED3DFMT_B8G8R8A8_UNORM_SRGB, WINED3DFMT_B8G8R8A8_TYPELESS, "uuuu"}, @@ -321,6 +324,8 @@ static const struct wined3d_format_block_info format_block_info[] = {WINED3DFMT_BC3_UNORM, 4, 4, 16, TRUE}, {WINED3DFMT_BC4_UNORM, 4, 4, 8, TRUE}, {WINED3DFMT_BC5_UNORM, 4, 4, 16, TRUE}, + {WINED3DFMT_BC6H_UF16, 4, 4, 16, TRUE}, + {WINED3DFMT_BC6H_SF16, 4, 4, 16, TRUE}, {WINED3DFMT_BC7_UNORM, 4, 4, 16, TRUE}, {WINED3DFMT_ATI1N, 4, 4, 8, FALSE}, {WINED3DFMT_ATI2N, 4, 4, 16, FALSE}, @@ -1119,6 +1124,16 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_COMPRESSED, ARB_TEXTURE_COMPRESSION_RGTC, NULL}, + {WINED3DFMT_BC6H_UF16, GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_ARB, GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_ARB, 0, + GL_RGB, GL_UNSIGNED_BYTE, 0, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING + | WINED3DFMT_FLAG_COMPRESSED, + ARB_TEXTURE_COMPRESSION_BPTC, NULL}, + {WINED3DFMT_BC6H_SF16, GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_ARB, GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_ARB, 0, + GL_RGB, GL_UNSIGNED_BYTE, 0, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING + | WINED3DFMT_FLAG_COMPRESSED, + ARB_TEXTURE_COMPRESSION_BPTC, NULL}, {WINED3DFMT_BC7_UNORM, GL_COMPRESSED_RGBA_BPTC_UNORM_ARB, GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_ARB, 0, GL_RGBA, GL_UNSIGNED_BYTE, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING

1 0

Kimmo Myllyvirta : d3d11: Add tests for WINED3DFMT_BC7_UNORM format.
by Alexandre Julliard 24 Aug '16

24 Aug '16

Module: wine Branch: master Commit: 5bb67ff9e607aecea0d17831e07e8a0f175b367f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bb67ff9e607aecea0d17831e… Author: Kimmo Myllyvirta <kimmo.myllyvirta(a)gmail.com> Date: Mon Aug 22 15:18:36 2016 +0300 d3d11: Add tests for WINED3DFMT_BC7_UNORM format. Signed-off-by: Kimmo Myllyvirta <kimmo.myllyvirta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 8624ef5..cc2c22d 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -5541,6 +5541,13 @@ static void test_texture(void) 0x10, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x10, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x10, 0x7f, 0xb6, 0x6d, 0xdb, 0xb6, 0x6d, 0xdb, 0x10, 0x7f, 0xb6, 0x6d, 0xdb, 0xb6, 0x6d, 0xdb, }; + static const BYTE bc7_data[] = + { + 0x02, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x02, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, + }; static const struct texture rgba_texture = { 4, 4, 3, 1, DXGI_FORMAT_R8G8B8A8_UNORM, @@ -5561,9 +5568,11 @@ static void test_texture(void) static const struct texture bc3_texture = {8, 8, 1, 1, DXGI_FORMAT_BC3_UNORM, {{bc3_data, 2 * 16}}}; static const struct texture bc4_texture = {8, 8, 1, 1, DXGI_FORMAT_BC4_UNORM, {{bc4_data, 2 * 8}}}; static const struct texture bc5_texture = {8, 8, 1, 1, DXGI_FORMAT_BC5_UNORM, {{bc5_data, 2 * 16}}}; + static const struct texture bc7_texture = {8, 8, 1, 1, DXGI_FORMAT_BC7_UNORM, {{bc7_data, 2 * 16}}}; static const struct texture bc1_texture_srgb = {8, 8, 1, 1, DXGI_FORMAT_BC1_UNORM_SRGB, {{bc1_data, 2 * 8}}}; static const struct texture bc2_texture_srgb = {8, 8, 1, 1, DXGI_FORMAT_BC2_UNORM_SRGB, {{bc2_data, 2 * 16}}}; static const struct texture bc3_texture_srgb = {8, 8, 1, 1, DXGI_FORMAT_BC3_UNORM_SRGB, {{bc3_data, 2 * 16}}}; + static const struct texture bc7_texture_srgb = {8, 8, 1, 1, DXGI_FORMAT_BC7_UNORM_SRGB, {{bc7_data, 2 * 16}}}; static const struct texture bc1_typeless = {8, 8, 1, 1, DXGI_FORMAT_BC1_TYPELESS, {{bc1_data, 2 * 8}}}; static const struct texture bc2_typeless = {8, 8, 1, 1, DXGI_FORMAT_BC2_TYPELESS, {{bc2_data, 2 * 16}}}; static const struct texture bc3_typeless = {8, 8, 1, 1, DXGI_FORMAT_BC3_TYPELESS, {{bc3_data, 2 * 16}}}; @@ -5650,6 +5659,13 @@ static void test_texture(void) 0xff00ffff, 0xff00ffff, 0xff000000, 0xff000000, 0xff00ffff, 0xff00ffff, 0xff000000, 0xff000000, }; + static const DWORD bc7_colors[] = + { + 0xff0000fc, 0xff0000fc, 0xff00fc00, 0xff00fc00, + 0xff0000fc, 0xff0000fc, 0xff00fc00, 0xff00fc00, + 0xfffc0000, 0xfffc0000, 0xffffffff, 0xffffffff, + 0xfffc0000, 0xfffc0000, 0xffffffff, 0xffffffff, + }; static const DWORD sint8_colors[] = { 0x7e80807e, 0x7e807e7e, 0x7e807e80, 0x7e7e7e80, @@ -5692,6 +5708,8 @@ static void test_texture(void) {&ps_ld, &bc3_texture_srgb, POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc_colors}, {&ps_ld, &bc4_texture, POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc4_colors}, {&ps_ld, &bc5_texture, POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc5_colors}, + {&ps_ld, &bc7_texture, POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc7_colors}, + {&ps_ld, &bc7_texture_srgb, POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc7_colors}, {&ps_ld, NULL, POINT, 0.0f, 0.0f, 0.0f, 0.0f, zero_colors}, {&ps_ld, NULL, POINT, 0.0f, 0.0f, MIP_MAX, 0.0f, zero_colors}, {&ps_ld_sint8, &sint8_texture, POINT, 0.0f, 0.0f, 0.0f, 0.0f, sint8_colors}, @@ -5701,6 +5719,8 @@ static void test_texture(void) {&ps_sample, &bc3_texture, POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc_colors}, {&ps_sample, &bc4_texture, POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc4_colors}, {&ps_sample, &bc5_texture, POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc5_colors}, + {&ps_sample, &bc7_texture, POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc7_colors}, + {&ps_sample, &bc7_texture_srgb, POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc7_colors}, {&ps_sample, &rgba_texture, POINT, 0.0f, 0.0f, 0.0f, 0.0f, rgba_level_0}, {&ps_sample, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 0.0f, rgba_level_0}, {&ps_sample, &rgba_texture, POINT, 2.0f, 0.0f, MIP_MAX, 0.0f, rgba_level_0}, @@ -5863,6 +5883,14 @@ static void test_texture(void) { const struct texture_test *test = &texture_tests[i]; + if (test->texture && (test->texture->format == DXGI_FORMAT_BC7_UNORM + || test->texture->format == DXGI_FORMAT_BC7_UNORM_SRGB) + && feature_level < D3D_FEATURE_LEVEL_11_0) + { + skip("Feature level >= 11.0 is required for BC7 tests.\n"); + continue; + } + if (current_ps != test->ps) { if (ps) @@ -5940,7 +5968,7 @@ static void test_texture(void) for (x = 0; x < 4; ++x) { color = get_readback_color(&rb, 80 + x * 160, 60 + y * 120); - ok(compare_color(color, test->expected_colors[y * 4 + x], 1), + ok(compare_color(color, test->expected_colors[y * 4 + x], 2), "Test %u: Got unexpected color 0x%08x at (%u, %u).\n", i, color, x, y); } }

1 0

Kimmo Myllyvirta : d3d11: Add tests for WINED3DFMT_BC6H_UF16/SF16 formats.
by Alexandre Julliard 24 Aug '16

24 Aug '16

Module: wine Branch: master Commit: e38f52f17aa82308d5f2f98f408b22c63b94efef URL: http://source.winehq.org/git/wine.git/?a=commit;h=e38f52f17aa82308d5f2f98f4… Author: Kimmo Myllyvirta <kimmo.myllyvirta(a)gmail.com> Date: Mon Aug 22 15:25:49 2016 +0300 d3d11: Add tests for WINED3DFMT_BC6H_UF16/SF16 formats. Signed-off-by: Kimmo Myllyvirta <kimmo.myllyvirta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index cc2c22d..c2b2535 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -5541,6 +5541,20 @@ static void test_texture(void) 0x10, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x10, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x10, 0x7f, 0xb6, 0x6d, 0xdb, 0xb6, 0x6d, 0xdb, 0x10, 0x7f, 0xb6, 0x6d, 0xdb, 0xb6, 0x6d, 0xdb, }; + static const BYTE bc6h_u_data[] = + { + 0xe3, 0x5e, 0x00, 0x00, 0x78, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x03, 0x80, 0x7b, 0x01, 0x00, 0xe0, 0x3d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0xee, 0x05, 0x00, 0x80, 0xf7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xe3, 0xde, 0x7b, 0xef, 0x7d, 0xef, 0xbd, 0xf7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + }; + static const BYTE bc6h_s_data[] = + { + 0x63, 0x2f, 0x00, 0x00, 0xb8, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x03, 0x80, 0xbd, 0x00, 0x00, 0xe0, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0xf6, 0x02, 0x00, 0x80, 0x7b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x63, 0xaf, 0xbd, 0xf6, 0xba, 0xe7, 0x9e, 0x7b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + }; static const BYTE bc7_data[] = { 0x02, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -5568,6 +5582,8 @@ static void test_texture(void) static const struct texture bc3_texture = {8, 8, 1, 1, DXGI_FORMAT_BC3_UNORM, {{bc3_data, 2 * 16}}}; static const struct texture bc4_texture = {8, 8, 1, 1, DXGI_FORMAT_BC4_UNORM, {{bc4_data, 2 * 8}}}; static const struct texture bc5_texture = {8, 8, 1, 1, DXGI_FORMAT_BC5_UNORM, {{bc5_data, 2 * 16}}}; + static const struct texture bc6h_u_texture = {8, 8, 1, 1, DXGI_FORMAT_BC6H_UF16, {{bc6h_u_data, 2 * 16}}}; + static const struct texture bc6h_s_texture = {8, 8, 1, 1, DXGI_FORMAT_BC6H_SF16, {{bc6h_s_data, 2 * 16}}}; static const struct texture bc7_texture = {8, 8, 1, 1, DXGI_FORMAT_BC7_UNORM, {{bc7_data, 2 * 16}}}; static const struct texture bc1_texture_srgb = {8, 8, 1, 1, DXGI_FORMAT_BC1_UNORM_SRGB, {{bc1_data, 2 * 8}}}; static const struct texture bc2_texture_srgb = {8, 8, 1, 1, DXGI_FORMAT_BC2_UNORM_SRGB, {{bc2_data, 2 * 16}}}; @@ -5708,6 +5724,8 @@ static void test_texture(void) {&ps_ld, &bc3_texture_srgb, POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc_colors}, {&ps_ld, &bc4_texture, POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc4_colors}, {&ps_ld, &bc5_texture, POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc5_colors}, + {&ps_ld, &bc6h_u_texture, POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc_colors}, + {&ps_ld, &bc6h_s_texture, POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc_colors}, {&ps_ld, &bc7_texture, POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc7_colors}, {&ps_ld, &bc7_texture_srgb, POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc7_colors}, {&ps_ld, NULL, POINT, 0.0f, 0.0f, 0.0f, 0.0f, zero_colors}, @@ -5719,6 +5737,8 @@ static void test_texture(void) {&ps_sample, &bc3_texture, POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc_colors}, {&ps_sample, &bc4_texture, POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc4_colors}, {&ps_sample, &bc5_texture, POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc5_colors}, + {&ps_sample, &bc6h_u_texture, POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc_colors}, + {&ps_sample, &bc6h_s_texture, POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc_colors}, {&ps_sample, &bc7_texture, POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc7_colors}, {&ps_sample, &bc7_texture_srgb, POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc7_colors}, {&ps_sample, &rgba_texture, POINT, 0.0f, 0.0f, 0.0f, 0.0f, rgba_level_0}, @@ -5891,6 +5911,14 @@ static void test_texture(void) continue; } + if (test->texture && (test->texture->format == DXGI_FORMAT_BC6H_UF16 + || test->texture->format == DXGI_FORMAT_BC6H_SF16) + && feature_level < D3D_FEATURE_LEVEL_11_0) + { + skip("Feature level >= 11.0 is required for BC6H tests.\n"); + continue; + } + if (current_ps != test->ps) { if (ps)

1 0

Józef Kucia : d3d8/tests: Skip test_reset() when device is initially lost.
by Alexandre Julliard 24 Aug '16

24 Aug '16

Module: wine Branch: master Commit: f37a438e79c9f46f9e45df27bfe9edfc00f61f87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f37a438e79c9f46f9e45df27b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Aug 22 14:53:44 2016 +0200 d3d8/tests: Skip test_reset() when device is initially lost. 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/d3d8/tests/device.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index ffb18bd..711c357 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -1369,6 +1369,12 @@ static void test_reset(void) goto cleanup; } hr = IDirect3DDevice8_TestCooperativeLevel(device1); + /* This skips the test on testbot Win 8 VMs. */ + if (hr == D3DERR_DEVICELOST) + { + skip("Device is lost.\n"); + goto cleanup; + } ok(SUCCEEDED(hr), "TestCooperativeLevel failed, hr %#x.\n", hr); hr = IDirect3DDevice8_GetDeviceCaps(device1, &caps);

1 0

Józef Kucia : d3d8/tests: Add test for regression in IDirect3DDevice8_Reset().
by Alexandre Julliard 24 Aug '16

24 Aug '16

Module: wine Branch: master Commit: b2e8ca902b987688ad26acee56f95599622ead72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2e8ca902b987688ad26acee5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Aug 22 14:53:46 2016 +0200 d3d8/tests: Add test for regression in IDirect3DDevice8_Reset(). This adds a test for regression introduced in cad279449c62a965a70a712a91b11ba52c4ff4f7. 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/d3d8/tests/device.c | 102 ++++++++++++++++++++++++++++++++++------------- 1 file changed, 75 insertions(+), 27 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 711c357..2f9c267 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -1284,6 +1284,7 @@ static void test_reset(void) UINT adapter_mode_count; D3DLOCKED_RECT lockrect; UINT mode_count = 0; + DEVMODEW devmode; IDirect3D8 *d3d8; RECT winrect; D3DVIEWPORT8 vp; @@ -1292,6 +1293,7 @@ static void test_reset(void) DWORD value; HWND window; HRESULT hr; + LONG ret; UINT i; static const DWORD decl[] = @@ -1387,15 +1389,12 @@ static void test_reset(void) hr = IDirect3DDevice8_GetViewport(device1, &vp); ok(SUCCEEDED(hr), "GetViewport failed, hr %#x.\n", hr); - if (SUCCEEDED(hr)) - { - ok(vp.X == 0, "D3DVIEWPORT->X = %u, expected 0.\n", vp.X); - ok(vp.Y == 0, "D3DVIEWPORT->Y = %u, expected 0.\n", vp.Y); - ok(vp.Width == modes[i].w, "D3DVIEWPORT->Width = %u, expected %u.\n", vp.Width, modes[i].w); - ok(vp.Height == modes[i].h, "D3DVIEWPORT->Height = %u, expected %u.\n", vp.Height, modes[i].h); - ok(vp.MinZ == 0, "D3DVIEWPORT->MinZ = %.8e, expected 0.\n", vp.MinZ); - ok(vp.MaxZ == 1, "D3DVIEWPORT->MaxZ = %.8e, expected 1.\n", vp.MaxZ); - } + ok(vp.X == 0, "D3DVIEWPORT->X = %u, expected 0.\n", vp.X); + ok(vp.Y == 0, "D3DVIEWPORT->Y = %u, expected 0.\n", vp.Y); + ok(vp.Width == modes[i].w, "D3DVIEWPORT->Width = %u, expected %u.\n", vp.Width, modes[i].w); + ok(vp.Height == modes[i].h, "D3DVIEWPORT->Height = %u, expected %u.\n", vp.Height, modes[i].h); + ok(vp.MinZ == 0, "D3DVIEWPORT->MinZ = %.8e, expected 0.\n", vp.MinZ); + ok(vp.MaxZ == 1, "D3DVIEWPORT->MaxZ = %.8e, expected 1.\n", vp.MaxZ); i = 1; vp.X = 10; @@ -1431,15 +1430,12 @@ static void test_reset(void) memset(&vp, 0, sizeof(vp)); hr = IDirect3DDevice8_GetViewport(device1, &vp); ok(SUCCEEDED(hr), "GetViewport failed, hr %#x.\n", hr); - if (SUCCEEDED(hr)) - { - ok(vp.X == 0, "D3DVIEWPORT->X = %u, expected 0.\n", vp.X); - ok(vp.Y == 0, "D3DVIEWPORT->Y = %u, expected 0.\n", vp.Y); - ok(vp.Width == modes[i].w, "D3DVIEWPORT->Width = %u, expected %u.\n", vp.Width, modes[i].w); - ok(vp.Height == modes[i].h, "D3DVIEWPORT->Height = %u, expected %u.\n", vp.Height, modes[i].h); - ok(vp.MinZ == 0, "D3DVIEWPORT->MinZ = %.8e, expected 0.\n", vp.MinZ); - ok(vp.MaxZ == 1, "D3DVIEWPORT->MaxZ = %.8e, expected 1.\n", vp.MaxZ); - } + ok(vp.X == 0, "D3DVIEWPORT->X = %u, expected 0.\n", vp.X); + ok(vp.Y == 0, "D3DVIEWPORT->Y = %u, expected 0.\n", vp.Y); + ok(vp.Width == modes[i].w, "D3DVIEWPORT->Width = %u, expected %u.\n", vp.Width, modes[i].w); + ok(vp.Height == modes[i].h, "D3DVIEWPORT->Height = %u, expected %u.\n", vp.Height, modes[i].h); + ok(vp.MinZ == 0, "D3DVIEWPORT->MinZ = %.8e, expected 0.\n", vp.MinZ); + ok(vp.MaxZ == 1, "D3DVIEWPORT->MaxZ = %.8e, expected 1.\n", vp.MaxZ); width = GetSystemMetrics(SM_CXSCREEN); height = GetSystemMetrics(SM_CYSCREEN); @@ -1470,15 +1466,12 @@ static void test_reset(void) memset(&vp, 0, sizeof(vp)); hr = IDirect3DDevice8_GetViewport(device1, &vp); ok(SUCCEEDED(hr), "GetViewport failed, hr %#x.\n", hr); - if (SUCCEEDED(hr)) - { - ok(vp.X == 0, "D3DVIEWPORT->X = %u, expected 0.\n", vp.X); - ok(vp.Y == 0, "D3DVIEWPORT->Y = %u, expected 0.\n", vp.Y); - ok(vp.Width == 400, "D3DVIEWPORT->Width = %u, expected 400.\n", vp.Width); - ok(vp.Height == 300, "D3DVIEWPORT->Height = %u, expected 300.\n", vp.Height); - ok(vp.MinZ == 0, "D3DVIEWPORT->MinZ = %.8e, expected 0.\n", vp.MinZ); - ok(vp.MaxZ == 1, "D3DVIEWPORT->MaxZ = %.8e, expected 1.\n", vp.MaxZ); - } + ok(vp.X == 0, "D3DVIEWPORT->X = %u, expected 0.\n", vp.X); + ok(vp.Y == 0, "D3DVIEWPORT->Y = %u, expected 0.\n", vp.Y); + ok(vp.Width == 400, "D3DVIEWPORT->Width = %u, expected 400.\n", vp.Width); + ok(vp.Height == 300, "D3DVIEWPORT->Height = %u, expected 300.\n", vp.Height); + ok(vp.MinZ == 0, "D3DVIEWPORT->MinZ = %.8e, expected 0.\n", vp.MinZ); + ok(vp.MaxZ == 1, "D3DVIEWPORT->MaxZ = %.8e, expected 1.\n", vp.MaxZ); width = GetSystemMetrics(SM_CXSCREEN); height = GetSystemMetrics(SM_CYSCREEN); @@ -1495,6 +1488,61 @@ static void test_reset(void) surface_desc.Height); IDirect3DSurface8_Release(surface); + memset(&devmode, 0, sizeof(devmode)); + devmode.dmSize = sizeof(devmode); + devmode.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT; + devmode.dmPelsWidth = modes[1].w; + devmode.dmPelsHeight = modes[1].h; + ret = ChangeDisplaySettingsW(&devmode, CDS_FULLSCREEN); + ok(ret == DISP_CHANGE_SUCCESSFUL, "Failed to change display mode, ret %#x.\n", ret); + width = GetSystemMetrics(SM_CXSCREEN); + height = GetSystemMetrics(SM_CYSCREEN); + ok(width == modes[1].w, "Screen width is %u, expected %u.\n", width, modes[1].w); + ok(height == modes[1].h, "Screen height is %u, expected %u.\n", height, modes[1].h); + + d3dpp.BackBufferWidth = 500; + d3dpp.BackBufferHeight = 400; + d3dpp.BackBufferFormat = D3DFMT_A8R8G8B8; + hr = IDirect3DDevice8_Reset(device1, &d3dpp); + ok(SUCCEEDED(hr), "Reset failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_TestCooperativeLevel(device1); + ok(SUCCEEDED(hr), "TestCooperativeLevel failed, hr %#x.\n", hr); + + width = GetSystemMetrics(SM_CXSCREEN); + height = GetSystemMetrics(SM_CYSCREEN); + ok(width == modes[1].w, "Screen width is %u, expected %u.\n", width, modes[1].w); + ok(height == modes[1].h, "Screen height is %u, expected %u.\n", height, modes[1].h); + + ZeroMemory(&vp, sizeof(vp)); + hr = IDirect3DDevice8_GetViewport(device1, &vp); + ok(SUCCEEDED(hr), "GetViewport failed, hr %#x.\n", hr); + ok(vp.X == 0, "D3DVIEWPORT->X = %d.\n", vp.X); + ok(vp.Y == 0, "D3DVIEWPORT->Y = %d.\n", vp.Y); + ok(vp.Width == 500, "D3DVIEWPORT->Width = %d.\n", vp.Width); + ok(vp.Height == 400, "D3DVIEWPORT->Height = %d.\n", vp.Height); + ok(vp.MinZ == 0, "D3DVIEWPORT->MinZ = %f.\n", vp.MinZ); + ok(vp.MaxZ == 1, "D3DVIEWPORT->MaxZ = %f.\n", vp.MaxZ); + + hr = IDirect3DDevice8_GetRenderTarget(device1, &surface); + ok(SUCCEEDED(hr), "GetRenderTarget failed, hr %#x.\n", hr); + hr = IDirect3DSurface8_GetDesc(surface, &surface_desc); + ok(hr == D3D_OK, "GetDesc failed, hr %#x.\n", hr); + ok(surface_desc.Width == 500, "Back buffer width is %u, expected 500.\n", + surface_desc.Width); + ok(surface_desc.Height == 400, "Back buffer height is %u, expected 400.\n", + surface_desc.Height); + IDirect3DSurface8_Release(surface); + + devmode.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT; + devmode.dmPelsWidth = orig_width; + devmode.dmPelsHeight = orig_height; + ret = ChangeDisplaySettingsW(&devmode, CDS_FULLSCREEN); + ok(ret == DISP_CHANGE_SUCCESSFUL, "Failed to change display mode, ret %#x.\n", ret); + width = GetSystemMetrics(SM_CXSCREEN); + height = GetSystemMetrics(SM_CYSCREEN); + ok(width == orig_width, "Got screen width %u, expected %u.\n", width, orig_width); + ok(height == orig_height, "Got screen height %u, expected %u.\n", height, orig_height); + winrect.left = 0; winrect.top = 0; winrect.right = 200;

1 0