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

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

Aug. 24, 2016

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 : wined3d: Add support for WINED3DFMT_BC7_UNORM format.
by Alexandre Julliard Aug. 24, 2016

Aug. 24, 2016

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

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard Aug. 24, 2016

Aug. 24, 2016

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 : oleaut32: Keep most of typeinfo attributes in TYPEATTR structure.
by Alexandre Julliard Aug. 24, 2016

Aug. 24, 2016

Module: wine Branch: master Commit: e90a17d20f1c70b4f3d22bce8cca84dba5c480e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e90a17d20f1c70b4f3d22bce8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 23 21:53:06 2016 +0300 oleaut32: Keep most of typeinfo attributes in TYPEATTR structure. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.c | 539 +++++++++++++++++++++++------------------------- 1 file changed, 253 insertions(+), 286 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e90a17d20f1c70b4f3d22…

1 0

Nikolay Sivov : hidclass: Fix handle leak on error path (Coverity).
by Alexandre Julliard Aug. 24, 2016

Aug. 24, 2016

Module: wine Branch: master Commit: 026353bf7bc2f357d0fbf2fa6398262c01859fca URL: http://source.winehq.org/git/wine.git/?a=commit;h=026353bf7bc2f357d0fbf2fa6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 23 00:05:36 2016 +0300 hidclass: Fix handle leak on error path (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/pnp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index 87cd94e..7df8374 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -47,14 +47,14 @@ static NTSTATUS get_device_id(DEVICE_OBJECT *device, BUS_QUERY_ID_TYPE type, WCH NTSTATUS status; IO_STACK_LOCATION *irpsp; IO_STATUS_BLOCK irp_status; + HANDLE event; IRP *irp; - HANDLE event = CreateEventA(NULL, FALSE, FALSE, NULL); irp = IoBuildSynchronousFsdRequest(IRP_MJ_PNP, device, NULL, 0, NULL, NULL, &irp_status); if (irp == NULL) return STATUS_NO_MEMORY; - irp->UserEvent = event; + irp->UserEvent = event = CreateEventA(NULL, FALSE, FALSE, NULL); irpsp = IoGetNextIrpStackLocation(irp); irpsp->MinorFunction = IRP_MN_QUERY_ID; irpsp->Parameters.QueryId.IdType = type;

1 0

Bruno Jesus : dinput/tests: Use EnumEffects and test a supported effect.
by Alexandre Julliard Aug. 24, 2016

Aug. 24, 2016

Module: wine Branch: master Commit: 97b5862e487f9f14072b594d9468386b123d4a25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97b5862e487f9f14072b594d9… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Aug 23 19:24:10 2016 -0300 dinput/tests: Use EnumEffects and test a supported effect. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/joystick.c | 163 +++++++++++++++++++++++++++++++++++++------ 1 file changed, 142 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=97b5862e487f9f14072b5…

1 0

Michael Müller : d3d11: Fix calculation of array size for 1D textures.
by Alexandre Julliard Aug. 24, 2016

Aug. 24, 2016

Module: wine Branch: master Commit: 983b3577ca50ef7688b026093cfed1156acc76d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=983b3577ca50ef7688b026093… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Aug 23 22:48:27 2016 +0200 d3d11: Fix calculation of array size for 1D textures. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/view.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index a13316f..205513d 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -184,7 +184,7 @@ static HRESULT normalize_dsv_desc(D3D11_DEPTH_STENCIL_VIEW_DESC *desc, ID3D11Res { case D3D11_DSV_DIMENSION_TEXTURE1DARRAY: if (desc->u.Texture1DArray.ArraySize == ~0u && desc->u.Texture1DArray.FirstArraySlice < layer_count) - desc->u.Texture1DArray.ArraySize = layer_count - desc->u.Texture1DArray.ArraySize; + desc->u.Texture1DArray.ArraySize = layer_count - desc->u.Texture1DArray.FirstArraySlice; break; case D3D11_DSV_DIMENSION_TEXTURE2DARRAY: @@ -412,7 +412,7 @@ static HRESULT normalize_rtv_desc(D3D11_RENDER_TARGET_VIEW_DESC *desc, ID3D11Res { case D3D11_RTV_DIMENSION_TEXTURE1DARRAY: if (desc->u.Texture1DArray.ArraySize == ~0u && desc->u.Texture1DArray.FirstArraySlice < layer_count) - desc->u.Texture1DArray.ArraySize = layer_count - desc->u.Texture1DArray.ArraySize; + desc->u.Texture1DArray.ArraySize = layer_count - desc->u.Texture1DArray.FirstArraySlice; break; case D3D11_RTV_DIMENSION_TEXTURE2DARRAY: @@ -915,7 +915,7 @@ static HRESULT normalize_uav_desc(D3D11_UNORDERED_ACCESS_VIEW_DESC *desc, ID3D11 { case D3D11_UAV_DIMENSION_TEXTURE1DARRAY: if (desc->u.Texture1DArray.ArraySize == ~0u && desc->u.Texture1DArray.FirstArraySlice < layer_count) - desc->u.Texture1DArray.ArraySize = layer_count - desc->u.Texture1DArray.ArraySize; + desc->u.Texture1DArray.ArraySize = layer_count - desc->u.Texture1DArray.FirstArraySlice; break; case D3D11_UAV_DIMENSION_TEXTURE2DARRAY:

1 0

Jacek Caban : wpc: Added class factory stub implementation.
by Alexandre Julliard Aug. 24, 2016

Aug. 24, 2016

Module: wine Branch: master Commit: 14cf136a8c68fa45a72c09409a19d13bb44d3bcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=14cf136a8c68fa45a72c09409… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 24 12:40:35 2016 +0200 wpc: Added class factory stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wpc/wpc.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/dlls/wpc/wpc.c b/dlls/wpc/wpc.c index 48f8edf..20db3fc 100644 --- a/dlls/wpc/wpc.c +++ b/dlls/wpc/wpc.c @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS + +#include "initguid.h" #include "wpcapi.h" #include "rpcproxy.h" @@ -25,6 +28,61 @@ WINE_DEFAULT_DEBUG_CHANNEL(wpc); static HINSTANCE wpc_instance; +static HRESULT WINAPI WindowsParentalControls_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **ppv) +{ + FIXME("(%s %p %p)\n", debugstr_guid(riid), outer, ppv); + return E_NOTIMPL; +} + +static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) +{ + *ppv = NULL; + + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", iface, ppv); + *ppv = iface; + }else if(IsEqualGUID(&IID_IClassFactory, riid)) { + TRACE("(%p)->(IID_IClassFactory %p)\n", iface, ppv); + *ppv = iface; + } + + if(*ppv) { + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; + } + + FIXME("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); + return E_NOINTERFACE; +} + +static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface) +{ + TRACE("(%p)\n", iface); + return 2; +} + +static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) +{ + TRACE("(%p)\n", iface); + return 1; +} + +static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL fLock) +{ + TRACE("(%p)->(%x)\n", iface, fLock); + return S_OK; +} + +static const IClassFactoryVtbl WPCFactoryVtbl = { + ClassFactory_QueryInterface, + ClassFactory_AddRef, + ClassFactory_Release, + WindowsParentalControls_CreateInstance, + ClassFactory_LockServer +}; + +static IClassFactory WPCFactory = { &WPCFactoryVtbl }; + /****************************************************************** * DllMain */ @@ -49,6 +107,11 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) */ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) { + if(IsEqualGUID(&CLSID_WindowsParentalControls, rclsid)) { + TRACE("(CLSID_WindowsParentalControls %s %p)\n", debugstr_guid(riid), ppv); + return IClassFactory_QueryInterface(&WPCFactory, riid, ppv); + } + FIXME("Unknown object %s (iface %s)\n", debugstr_guid(rclsid), debugstr_guid(riid)); return CLASS_E_CLASSNOTAVAILABLE; }

1 0

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

Aug. 24, 2016

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

Max Qian : api-ms-win-eventlog-legacy-l1-1-0: Add dll.
by Alexandre Julliard Aug. 23, 2016

Aug. 23, 2016

Module: wine Branch: master Commit: b2200d7275067585810c4f25dbec869b31dc4074 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2200d7275067585810c4f25d… Author: Max Qian <public(a)maxqia.com> Date: Tue Aug 23 01:26:53 2016 -0700 api-ms-win-eventlog-legacy-l1-1-0: Add dll. Signed-off-by: Max Qian <public(a)maxqia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-eventlog-legacy-l1-1-0/Makefile.in | 1 + .../api-ms-win-eventlog-legacy-l1-1-0.spec | 6 ++++++ tools/make_specfiles | 1 + 5 files changed, 11 insertions(+) diff --git a/configure b/configure index edcfea5..533151c 100755 --- a/configure +++ b/configure @@ -977,6 +977,7 @@ enable_api_ms_win_downlevel_user32_l1_1_0 enable_api_ms_win_downlevel_version_l1_1_0 enable_api_ms_win_eventing_classicprovider_l1_1_0 enable_api_ms_win_eventing_provider_l1_1_0 +enable_api_ms_win_eventlog_legacy_l1_1_0 enable_api_ms_win_ntuser_dc_access_l1_1_0 enable_api_ms_win_security_base_l1_1_0 enable_api_ms_win_security_base_l1_2_0 @@ -17519,6 +17520,7 @@ wine_fn_config_dll api-ms-win-downlevel-user32-l1-1-0 enable_api_ms_win_downleve wine_fn_config_dll api-ms-win-downlevel-version-l1-1-0 enable_api_ms_win_downlevel_version_l1_1_0 wine_fn_config_dll api-ms-win-eventing-classicprovider-l1-1-0 enable_api_ms_win_eventing_classicprovider_l1_1_0 wine_fn_config_dll api-ms-win-eventing-provider-l1-1-0 enable_api_ms_win_eventing_provider_l1_1_0 +wine_fn_config_dll api-ms-win-eventlog-legacy-l1-1-0 enable_api_ms_win_eventlog_legacy_l1_1_0 wine_fn_config_dll api-ms-win-ntuser-dc-access-l1-1-0 enable_api_ms_win_ntuser_dc_access_l1_1_0 wine_fn_config_dll api-ms-win-security-base-l1-1-0 enable_api_ms_win_security_base_l1_1_0 wine_fn_config_dll api-ms-win-security-base-l1-2-0 enable_api_ms_win_security_base_l1_2_0 diff --git a/configure.ac b/configure.ac index fc629dc..b6e2aab 100644 --- a/configure.ac +++ b/configure.ac @@ -2742,6 +2742,7 @@ WINE_CONFIG_DLL(api-ms-win-downlevel-user32-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-version-l1-1-0) WINE_CONFIG_DLL(api-ms-win-eventing-classicprovider-l1-1-0) WINE_CONFIG_DLL(api-ms-win-eventing-provider-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-eventlog-legacy-l1-1-0) WINE_CONFIG_DLL(api-ms-win-ntuser-dc-access-l1-1-0) WINE_CONFIG_DLL(api-ms-win-security-base-l1-1-0) WINE_CONFIG_DLL(api-ms-win-security-base-l1-2-0) diff --git a/dlls/api-ms-win-eventlog-legacy-l1-1-0/Makefile.in b/dlls/api-ms-win-eventlog-legacy-l1-1-0/Makefile.in new file mode 100644 index 0000000..11590ca --- /dev/null +++ b/dlls/api-ms-win-eventlog-legacy-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-eventlog-legacy-l1-1-0.dll diff --git a/dlls/api-ms-win-eventlog-legacy-l1-1-0/api-ms-win-eventlog-legacy-l1-1-0.spec b/dlls/api-ms-win-eventlog-legacy-l1-1-0/api-ms-win-eventlog-legacy-l1-1-0.spec new file mode 100644 index 0000000..6a12a60 --- /dev/null +++ b/dlls/api-ms-win-eventlog-legacy-l1-1-0/api-ms-win-eventlog-legacy-l1-1-0.spec @@ -0,0 +1,6 @@ +@ stdcall DeregisterEventSource(long) advapi32.DeregisterEventSource +@ stdcall GetEventLogInformation(long long ptr long ptr) advapi32.GetEventLogInformation +@ stdcall RegisterEventSourceA(ptr ptr) advapi32.RegisterEventSourceA +@ stdcall RegisterEventSourceW(ptr ptr) advapi32.RegisterEventSourceW +@ stdcall ReportEventA(long long long long ptr long long ptr ptr) advapi32.ReportEventA +@ stdcall ReportEventW(long long long long ptr long long ptr ptr) advapi32.ReportEventW diff --git a/tools/make_specfiles b/tools/make_specfiles index 25a5bdf..b5e5904 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -115,6 +115,7 @@ my @dll_groups = "api-ms-win-core-registry-l1-1-0", "api-ms-win-eventing-classicprovider-l1-1-0", "api-ms-win-eventing-provider-l1-1-0", + "api-ms-win-eventlog-legacy-l1-1-0", "api-ms-win-security-base-l1-2-0", "api-ms-win-security-lsalookup-l1-1-0", "api-ms-win-security-sddl-l1-1-0",

1 0