December 2017 - Wine-Commits

Akihiro Sagawa : po: Update Japanese Translation.
by Alexandre Julliard Dec. 12, 2017

Dec. 12, 2017

Module: wine Branch: master Commit: d54bf06f55538a5c19dd1365f5de23030ad700fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=d54bf06f55538a5c19dd1365f… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Dec 12 23:56:29 2017 +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 | 91 +++++++++++----------------------------------------------------- 1 file changed, 15 insertions(+), 76 deletions(-) diff --git a/po/ja.po b/po/ja.po index 23d172f..260559d 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-10-02 22:05+0900\n" +"PO-Revision-Date: 2017-12-12 22:41+0900\n" "Last-Translator: Akihiro Sagawa <sagawa.aki(a)gmail.com>\n" "Language-Team: Japanese\n" "Language: ja\n" @@ -125,9 +125,9 @@ msgid "" "href=\"https://wiki.winehq.org/Gecko\">https://wiki.winehq.org/Gecko</a> for " "details." msgstr "" -"Gecko パッケージを見つけられません。このパッケージは HTML を組み込んだアプリ" -"ケーションが正しく動作するために必要です。 Wine で Gecko パッケージを自動的に" -"ダウンロードし、インストールできます。\n" +"Gecko パッケージを見つけられませんでした。このパッケージは HTML を組み込んだ" +"アプリケーションが正しく動作するために必要です。Wine で当該パッケージを自動的" +"にダウンロードし、インストールすることができます。\n" "\n" "注意: 代わりにディストリビューションのパッケージを利用することをおすすめしま" "す。詳しくは、<a href=\"https://wiki.winehq.org/Gecko\">https://wiki.winehq." @@ -171,9 +171,9 @@ msgid "" "href=\"https://wiki.winehq.org/Mono\">https://wiki.winehq.org/Mono</a> for " "details." msgstr "" -"wine-mono パッケージを見つけられません。このパッケージは .NET アプリケーショ" -"ンが正しく動作するために必要です。 Wine で Mono パッケージを自動的にダウン" -"ロードし、インストールできます。\n" +"wine-mono パッケージを見つけられませんでした。このパッケージは .NET アプリ" +"ケーションが正しく動作するために必要です。Wine で当該パッケージを自動的にダウ" +"ンロードし、インストールすることができます。\n" "\n" "注意: 代わりにディストリビューションのパッケージを利用することをおすすめしま" "す。詳しくは、<a href=\"https://wiki.winehq.org/Mono\">https://wiki.winehq." @@ -8909,10 +8909,8 @@ msgid " sec" msgstr " 秒" #: twain.rc:29 -#, fuzzy -#| msgid "Select Folder" msgid "Select Source" -msgstr "フォルダの選択" +msgstr "ソースの選択" #: urlmon.rc:32 wininet.rc:77 msgid "Security Warning" @@ -10592,47 +10590,6 @@ msgstr "" "ります。\n" #: cmd.rc:364 -#, fuzzy -#| msgid "" -#| "CMD built-in commands are:\n" -#| "ASSOC\t\tShow or modify file extension associations\n" -#| "ATTRIB\t\tShow or change DOS file attributes\n" -#| "CALL\t\tInvoke a batch file from inside another\n" -#| "CD (CHDIR)\tChange current default directory\n" -#| "CHOICE\t\tWait for an keypress from a selectable list\n" -#| "CLS\t\tClear the console screen\n" -#| "COPY\t\tCopy file\n" -#| "CTTY\t\tChange input/output device\n" -#| "DATE\t\tShow or change the system date\n" -#| "DEL (ERASE)\tDelete a file or set of files\n" -#| "DIR\t\tList the contents of a directory\n" -#| "ECHO\t\tCopy text directly to the console output\n" -#| "ENDLOCAL\tEnd localization of environment changes in a batch file\n" -#| "FTYPE\t\tShow or modify open commands associated with file types\n" -#| "HELP\t\tShow brief help details on a topic\n" -#| "MD (MKDIR)\tCreate a subdirectory\n" -#| "MORE\t\tDisplay output in pages\n" -#| "MOVE\t\tMove a file, set of files or directory tree\n" -#| "PATH\t\tSet or show the search path\n" -#| "PAUSE\t\tSuspend execution of a batch file\n" -#| "POPD\t\tRestore the directory to the last one saved with PUSHD\n" -#| "PROMPT\t\tChange the command prompt\n" -#| "PUSHD\t\tChange to a new directory, saving the current one\n" -#| "REN (RENAME)\tRename a file\n" -#| "RD (RMDIR)\tDelete a subdirectory\n" -#| "SET\t\tSet or show environment variables\n" -#| "SETLOCAL\tStart localization of environment changes in a batch file\n" -#| "START\t\tStart a program, or open a document in the associated program\n" -#| "TIME\t\tSet or show the current system time\n" -#| "TITLE\t\tSet the window title for the CMD session\n" -#| "TYPE\t\tType the contents of a text file\n" -#| "VER\t\tShow the current version of CMD\n" -#| "VOL\t\tShow the volume label of a disk device\n" -#| "XCOPY\t\tCopy source files or directory trees to a destination\n" -#| "EXIT\t\tClose down CMD\n" -#| "\n" -#| "Enter HELP <command> for further information on any of the above " -#| "commands.\n" msgid "" "CMD built-in commands are:\n" "ASSOC\t\tShow or modify file extension associations\n" @@ -10691,6 +10648,7 @@ msgstr "" "FTYPE\t\tファイルタイプのオープンコマンドを表示または変更\n" "HELP\t\tトピックについて簡潔なヘルプを表示\n" "MD (MKDIR)\tサブディレクトリを作成\n" +"MKLINK\t\tシンボリックリンクを作成\n" "MORE\t\t出力をページ区切りで表示\n" "MOVE\t\tファイルまたはディレクトリツリーを移動\n" "PATH\t\tパスを表示または設定\n" @@ -12030,17 +11988,6 @@ msgid "Icons (*.ico)" msgstr "アイコン (*.ico)" #: reg.rc:35 -#, fuzzy -#| msgid "" -#| "Usage:\n" -#| " REG [operation] [parameters]\n" -#| "\n" -#| "Supported operations:\n" -#| " ADD | DELETE | IMPORT | QUERY\n" -#| "\n" -#| "For help on a specific operation, type:\n" -#| " REG [operation] /?\n" -#| "\n" msgid "" "Usage:\n" " REG [operation] [parameters]\n" @@ -12056,7 +12003,7 @@ msgstr "" " REG [操作] [パラメータ]\n" "\n" "対応している操作:\n" -" ADD | DELETE | IMPORT | QUERY\n" +" ADD | DELETE | IMPORT | EXPORT | QUERY\n" "\n" "特定の操作に対するヘルプは以下を入力:\n" " REG [操作] /?\n" @@ -12199,22 +12146,16 @@ msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" msgstr "reg: 認識できないエスケープシーケンスです [\\%1!c!]\n" #: reg.rc:70 -#, fuzzy -#| msgid "REG IMPORT file.reg\n" msgid "REG EXPORT key_name file.reg [/y]\n" -msgstr "REG IMPORT ファイル.reg\n" +msgstr "REG EXPORT キー名ファイル.reg [/y]\n" #: reg.rc:71 -#, fuzzy -#| msgid "regedit: Invalid system key [%1]\n" msgid "reg: Invalid system key [%1]\n" -msgstr "regedit: システムキーが無効です [%1]\n" +msgstr "reg: システムキーが無効です [%1]\n" #: reg.rc:72 -#, fuzzy -#| msgid "The registry value '%1' already exists. Do you want to overwrite it?" msgid "The file '%1' already exists. Do you want to overwrite it?" -msgstr "レジストリ値 '%1' はすでに存在します。上書きしますか?" +msgstr "ファイル '%1' はすでに存在します。上書きしますか?" #: regedit.rc:34 msgid "&Registry" @@ -14955,7 +14896,7 @@ msgstr "盤面の変更(&C)..." #: winemine.rc:49 msgid "&Fastest Times" -msgstr "ハイスコア(&F)" +msgstr "ハイスコア(&F)" #: winemine.rc:54 msgid "&About WineMine" @@ -14982,10 +14923,8 @@ msgid "Expert" msgstr "上級" #: winemine.rc:74 winemine.rc:33 -#, fuzzy -#| msgid "Result" msgid "Reset Results" -msgstr "結果" +msgstr "ハイスコアのクリア" #: winemine.rc:80 msgid "Congratulations!"

1 0

Jacek Caban : mshtml/tests: Added a test of calls to functions from different frame.
by Alexandre Julliard Dec. 12, 2017

Dec. 12, 2017

Module: wine Branch: master Commit: e6f7a759ed80da115ffbcc5e9777d485153f6cdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6f7a759ed80da115ffbcc5e9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 12 15:28:04 2017 +0100 mshtml/tests: Added a test of calls to functions from different frame. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/elements.js | 16 ++++++++++++++++ dlls/mshtml/tests/frame.js | 25 +++++++++++++++++++++++++ dlls/mshtml/tests/rsrc.rc | 6 ++++++ dlls/mshtml/tests/runscript.html | 11 +++++++++++ 4 files changed, 58 insertions(+) diff --git a/dlls/mshtml/tests/elements.js b/dlls/mshtml/tests/elements.js index 6e193ee..a16194f 100644 --- a/dlls/mshtml/tests/elements.js +++ b/dlls/mshtml/tests/elements.js @@ -104,6 +104,21 @@ function test_head() { next_test(); } +function test_iframe() { + document.body.innerHTML = '<iframe src="runscript.html?frame.js"></iframe>' + var iframe = document.body.firstChild; + + iframe.onload = guard(function() { + var r = iframe.contentWindow.global_object.get_global_value(); + ok(r === "global value", "get_global_value() returned " + r); + + var f = iframe.contentWindow.global_object.get_global_value; + ok(f() === "global value", "f() returned " + f()); + + next_test(); + }); +} + function test_getElementsByClassName() { var elems; @@ -178,6 +193,7 @@ var tests = [ test_ElementTraversal, test_getElementsByClassName, test_head, + test_iframe, test_query_selector, test_compare_position ]; diff --git a/dlls/mshtml/tests/frame.js b/dlls/mshtml/tests/frame.js new file mode 100644 index 0000000..588405c --- /dev/null +++ b/dlls/mshtml/tests/frame.js @@ -0,0 +1,25 @@ +/* + * Copyright 2017 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +var global_value = "global value"; + +var global_object = { + get_global_value: function() { + return global_value; + } +}; diff --git a/dlls/mshtml/tests/rsrc.rc b/dlls/mshtml/tests/rsrc.rc index ec2b729..df5b469 100644 --- a/dlls/mshtml/tests/rsrc.rc +++ b/dlls/mshtml/tests/rsrc.rc @@ -34,6 +34,12 @@ vbtest.html HTML "vbtest.html" /* @makedep: events.html */ events.html HTML "events.html" +/* @makedep: runscript.html */ +runscript.html HTML "runscript.html" + +/* @makedep: frame.js */ +frame.js HTML "frame.js" + /* @makedep: externscr.js */ externscr.js HTML "externscr.js" diff --git a/dlls/mshtml/tests/runscript.html b/dlls/mshtml/tests/runscript.html new file mode 100644 index 0000000..a4d0ac5 --- /dev/null +++ b/dlls/mshtml/tests/runscript.html @@ -0,0 +1,11 @@ +<!DOCTYPE html> +<html> + <head> + </head> + <script> + var q = document.location.search.replace("?", ""); + if(q) document.write('<s'+'cript src="' + q + '"></s'+'cript>'); + </script> + <body> + </body> +</html>

1 0

Alexandre Julliard : explorer: Fix parsing command line that contains spaces.
by Alexandre Julliard Dec. 12, 2017

Dec. 12, 2017

Module: wine Branch: master Commit: ff53db7e6396337692ed2966ef3bf49a4737e3a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff53db7e6396337692ed2966e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 12 09:33:32 2017 +0100 explorer: Fix parsing command line that contains spaces. Reported by Alistair Leslie-Hughes. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/explorer.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index afb565f..ac5bebb 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -658,7 +658,7 @@ static IShellFolder* get_starting_shell_folder(parameters_struct* params) return folder; } -static int copy_path_string(LPWSTR target, LPWSTR source) +static WCHAR *copy_path_string(WCHAR *target, WCHAR *source) { INT i = 0; @@ -667,10 +667,9 @@ static int copy_path_string(LPWSTR target, LPWSTR source) if (*source == '\"') { source ++; - while (*source != '\"') target[i++] = *source++; + while (*source && *source != '\"') target[i++] = *source++; target[i] = 0; - source ++; - i+=2; + if (*source) source++; } else { @@ -678,7 +677,7 @@ static int copy_path_string(LPWSTR target, LPWSTR source) target[i] = 0; } PathRemoveBackslashW(target); - return i; + return source; } @@ -741,12 +740,12 @@ static void parse_command_line(LPWSTR commandline,parameters_struct *parameters) else if (strncmpW(p, arg_root, sizeof(arg_root)/sizeof(WCHAR))==0) { p += sizeof(arg_root)/sizeof(WCHAR); - p+=copy_path_string(parameters->root,p); + p = copy_path_string(parameters->root,p); } else if (strncmpW(p, arg_select, sizeof(arg_select)/sizeof(WCHAR))==0) { p += sizeof(arg_select)/sizeof(WCHAR); - p+=copy_path_string(parameters->selection,p); + p = copy_path_string(parameters->selection,p); if (!parameters->root[0]) copy_path_root(parameters->root, parameters->selection);

1 0

Jacek Caban : jscript: Do not pass DISPATCH_JSCRIPT_CALLEREXECSSOURCE flag for calls across different script contexts.
by Alexandre Julliard Dec. 12, 2017

Dec. 12, 2017

Module: wine Branch: master Commit: 2f9c2186cc6b42b6a0aff9d9500372bbc4b0e73f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f9c2186cc6b42b6a0aff9d95… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 12 15:27:51 2017 +0100 jscript: Do not pass DISPATCH_JSCRIPT_CALLEREXECSSOURCE flag for calls across different script contexts. Fixes regression in calls between different contexts. Spotted by Nikolay. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index ed88c6f..40c02a0 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1103,6 +1103,8 @@ HRESULT disp_call(script_ctx_t *ctx, IDispatch *disp, DISPID id, WORD flags, uns return E_FAIL; } + if(ctx != jsdisp->ctx) + flags &= ~DISPATCH_JSCRIPT_INTERNAL_MASK; hres = jsdisp_call(jsdisp, id, flags, argc, argv, ret); jsdisp_release(jsdisp); return hres; @@ -1191,6 +1193,8 @@ HRESULT disp_call_value(script_ctx_t *ctx, IDispatch *disp, IDispatch *jsthis, W jsdisp = iface_to_jsdisp(disp); if(jsdisp) { + if(ctx != jsdisp->ctx) + flags &= ~DISPATCH_JSCRIPT_INTERNAL_MASK; hres = jsdisp_call_value(jsdisp, jsthis, flags, argc, argv, r); jsdisp_release(jsdisp); return hres;

1 0

Alexandre Julliard : ntdll: Only require MAP_SHARED for writable mappings.
by Alexandre Julliard Dec. 12, 2017

Dec. 12, 2017

Module: wine Branch: master Commit: dac252ecb42fb17c2f3f2deb559262514b58e990 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dac252ecb42fb17c2f3f2deb5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 12 15:15:02 2017 +0100 ntdll: Only require MAP_SHARED for writable mappings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 1156fc1..22965d0 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1146,7 +1146,7 @@ static NTSTATUS map_file_into_view( struct file_view *view, int fd, size_t start { void *ptr; int prot = VIRTUAL_GetUnixProt( vprot | VPROT_COMMITTED /* make sure it is accessible */ ); - unsigned int flags = MAP_FIXED | ((vprot & VPROT_WRITECOPY) ? MAP_PRIVATE : MAP_SHARED); + unsigned int flags = MAP_FIXED | ((vprot & VPROT_WRITE) ? MAP_SHARED : MAP_PRIVATE); assert( start < view->size ); assert( start + size <= view->size );

1 0

Andrew Eikum : xaudio2: Account for abandoned buffer bytes.
by Alexandre Julliard Dec. 11, 2017

Dec. 11, 2017

Module: wine Branch: master Commit: f57246e5e55a6ea65a35458a7256c8547ccc5462 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f57246e5e55a6ea65a35458a7… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Dec 11 10:41:35 2017 -0600 xaudio2: Account for abandoned buffer bytes. This should fix bug 44148, a regression caused by e2c73fc394ba. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/xaudio_dll.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 8f15ded..bc5cf1c 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -2286,13 +2286,14 @@ static void update_source_state(XA2SourceImpl *src) src->first_al_buf %= XAUDIO2_MAX_QUEUED_BUFFERS; src->al_bufs_used -= processed; - if(processed > src->abandoned_albufs){ - for(i = src->abandoned_albufs; i < processed; ++i){ - ALint bufsize; + for(i = 0; i < processed; ++i){ + ALint bufsize; - alGetBufferi(al_buffers[i], AL_SIZE, &bufsize); + alGetBufferi(al_buffers[i], AL_SIZE, &bufsize); - src->in_al_bytes -= bufsize; + src->in_al_bytes -= bufsize; + + if(src->abandoned_albufs == 0){ src->played_frames += bufsize / src->submit_blocksize; if(al_buffers[i] == src->buffers[src->first_buf].latest_al_buf){ @@ -2318,11 +2319,10 @@ static void update_source_state(XA2SourceImpl *src) src->buffers[src->first_buf].xa2buffer.pContext); } } + }else{ + src->abandoned_albufs--; } - - src->abandoned_albufs = 0; - }else - src->abandoned_albufs -= processed; + } } if(!src->running)

1 0

Matteo Bruni : d3d11/tests: Add a couple of testcases for UINT, sRGB UAVs.
by Alexandre Julliard Dec. 11, 2017

Dec. 11, 2017

Module: wine Branch: master Commit: 6a00754c6f189a3e2aa39b317496ca9b2d9df9ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a00754c6f189a3e2aa39b317… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Dec 8 17:54:21 2017 +0100 d3d11/tests: Add a couple of testcases for UINT, sRGB UAVs. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 20697b1..a80df2a 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -14233,6 +14233,8 @@ static void test_create_unordered_access_view(void) #define FMT_UNKNOWN DXGI_FORMAT_UNKNOWN #define RGBA8_UNORM DXGI_FORMAT_R8G8B8A8_UNORM +#define RGBA8_SRGB DXGI_FORMAT_R8G8B8A8_UNORM_SRGB +#define RGBA8_UINT DXGI_FORMAT_R8G8B8A8_UINT #define RGBA8_TL DXGI_FORMAT_R8G8B8A8_TYPELESS #define DIM_UNKNOWN D3D11_UAV_DIMENSION_UNKNOWN #define TEX_1D D3D11_UAV_DIMENSION_TEXTURE1D @@ -14260,6 +14262,8 @@ static void test_create_unordered_access_view(void) {{10, 1, RGBA8_UNORM}, {FMT_UNKNOWN, TEX_2D, 9}, {RGBA8_UNORM, TEX_2D, 9}}, {{ 1, 1, RGBA8_TL}, {RGBA8_UNORM, TEX_2D, 0}, {RGBA8_UNORM, TEX_2D, 0}}, {{10, 1, RGBA8_TL}, {RGBA8_UNORM, TEX_2D, 0}, {RGBA8_UNORM, TEX_2D, 0}}, + {{ 1, 1, RGBA8_UINT}, {0}, {RGBA8_UINT, TEX_2D, 0, 0, 1}}, + {{ 1, 1, RGBA8_TL}, {RGBA8_UINT, TEX_2D, 0, 0, ~0u}, {RGBA8_UINT, TEX_2D, 0, 0, 1}}, {{ 1, 4, RGBA8_UNORM}, {0}, {RGBA8_UNORM, TEX_2D_ARRAY, 0, 0, 4}}, {{10, 4, RGBA8_UNORM}, {0}, {RGBA8_UNORM, TEX_2D_ARRAY, 0, 0, 4}}, {{10, 4, RGBA8_UNORM}, {FMT_UNKNOWN, TEX_2D_ARRAY, 0, 0, ~0u}, {RGBA8_UNORM, TEX_2D_ARRAY, 0, 0, 4}}, @@ -14314,6 +14318,10 @@ static void test_create_unordered_access_view(void) {{TEX_2D, 1, 1, RGBA8_UNORM}, {RGBA8_UNORM, TEX_2D_ARRAY, 1, 0, 1}}, {{TEX_2D, 1, 1, RGBA8_UNORM}, {RGBA8_UNORM, TEX_2D_ARRAY, 0, 0, 2}}, {{TEX_2D, 1, 1, RGBA8_UNORM}, {RGBA8_UNORM, TEX_2D_ARRAY, 0, 1, 1}}, + {{TEX_2D, 1, 1, RGBA8_UNORM}, {RGBA8_UINT, TEX_2D, 0, 0, 1}}, + {{TEX_2D, 1, 1, RGBA8_UINT}, {RGBA8_UNORM, TEX_2D, 0, 0, 1}}, + {{TEX_2D, 1, 1, RGBA8_UNORM}, {RGBA8_SRGB, TEX_2D, 0, 0, 1}}, + {{TEX_2D, 1, 1, RGBA8_SRGB}, {RGBA8_UNORM, TEX_2D, 0, 0, 1}}, {{TEX_3D, 1, 1, RGBA8_UNORM}, {RGBA8_UNORM, TEX_1D, 0}}, {{TEX_3D, 1, 1, RGBA8_UNORM}, {RGBA8_UNORM, TEX_1D_ARRAY, 0, 0, 1}}, {{TEX_3D, 1, 1, RGBA8_UNORM}, {RGBA8_UNORM, TEX_2D, 0}}, @@ -14337,6 +14345,8 @@ static void test_create_unordered_access_view(void) }; #undef FMT_UNKNOWN #undef RGBA8_UNORM +#undef RGBA8_SRGB +#undef RGBA8_UINT #undef RGBA8_TL #undef DIM_UNKNOWN #undef TEX_1D

1 0

Stefan Dösinger : dxdiag: Recognise /dontskip.
by Alexandre Julliard Dec. 11, 2017

Dec. 11, 2017

Module: wine Branch: master Commit: 162e6c1e4041894639d8276032e28779839b789b URL: http://source.winehq.org/git/wine.git/?a=commit;h=162e6c1e4041894639d827603… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Dec 8 21:15:39 2017 +0100 dxdiag: Recognise /dontskip. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/dxdiag/main.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/programs/dxdiag/main.c b/programs/dxdiag/main.c index 3ced122..d7d430b 100644 --- a/programs/dxdiag/main.c +++ b/programs/dxdiag/main.c @@ -110,6 +110,7 @@ static BOOL process_command_line(const WCHAR *cmdline, struct command_line_info static const WCHAR whql_colonW[] = {'w','h','q','l',':',0}; static const WCHAR offW[] = {'o','f','f',0}; static const WCHAR onW[] = {'o','n',0}; + static const WCHAR dontskipW[] = {'d','o','n','t','s','k','i','p',0}; info->whql_check = FALSE; info->output_type = OUTPUT_NONE; @@ -163,6 +164,14 @@ static BOOL process_command_line(const WCHAR *cmdline, struct command_line_info return FALSE; break; + + case 'd': + case 'D': + if (strncmpiW(cmdline, dontskipW, 8)) + return FALSE; + cmdline += 8; + break; + default: return FALSE; }

1 0

Matteo Bruni : d3d11/tests: Add tests for GenerateMips().
by Alexandre Julliard Dec. 11, 2017

Dec. 11, 2017

Module: wine Branch: master Commit: e14e6fdbce446e558907fbd3d6e5bb67e6724bb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e14e6fdbce446e558907fbd3d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Dec 8 17:54:24 2017 +0100 d3d11/tests: Add tests for GenerateMips(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 457 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 457 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e14e6fdbce446e558907f…

1 0

Nikolay Sivov : wshom: Implement Popup() method.
by Alexandre Julliard Dec. 11, 2017

Dec. 11, 2017

Module: wine Branch: master Commit: 8c68872416a07cdc6b4b837c42f74a27f55aa079 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c68872416a07cdc6b4b837c4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 11 10:31:51 2017 +0300 wshom: Implement Popup() method. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wshom.ocx/shell.c | 78 +++++++++++++++++++++++++++++++++++++++++--- dlls/wshom.ocx/tests/wshom.c | 49 ++++++++++++++++++++++++++++ 2 files changed, 123 insertions(+), 4 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index b00bc10..a023786 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -1275,11 +1275,81 @@ static HRESULT WINAPI WshShell3_Run(IWshShell3 *iface, BSTR cmd, VARIANT *style, } } -static HRESULT WINAPI WshShell3_Popup(IWshShell3 *iface, BSTR Text, VARIANT* SecondsToWait, VARIANT *Title, VARIANT *Type, int *button) +struct popup_thread_param { - FIXME("(%s %s %s %s %p): stub\n", debugstr_w(Text), debugstr_variant(SecondsToWait), - debugstr_variant(Title), debugstr_variant(Type), button); - return E_NOTIMPL; + WCHAR *text; + VARIANT title; + VARIANT type; + INT button; +}; + +static DWORD WINAPI popup_thread_proc(void *arg) +{ + static const WCHAR defaulttitleW[] = {'W','i','n','d','o','w','s',' ','S','c','r','i','p','t',' ','H','o','s','t',0}; + struct popup_thread_param *param = (struct popup_thread_param *)arg; + + param->button = MessageBoxW(NULL, param->text, is_optional_argument(&param->title) ? + defaulttitleW : V_BSTR(&param->title), V_I4(&param->type)); + return 0; +} + +static HRESULT WINAPI WshShell3_Popup(IWshShell3 *iface, BSTR text, VARIANT *seconds_to_wait, VARIANT *title, + VARIANT *type, int *button) +{ + struct popup_thread_param param; + DWORD tid, status; + VARIANT timeout; + HANDLE hthread; + HRESULT hr; + + TRACE("(%s %s %s %s %p)\n", debugstr_w(text), debugstr_variant(seconds_to_wait), debugstr_variant(title), + debugstr_variant(type), button); + + if (!seconds_to_wait || !title || !type || !button) + return E_POINTER; + + VariantInit(&timeout); + if (!is_optional_argument(seconds_to_wait)) + { + hr = VariantChangeType(&timeout, seconds_to_wait, 0, VT_I4); + if (FAILED(hr)) + return hr; + } + + VariantInit(&param.type); + if (!is_optional_argument(type)) + { + hr = VariantChangeType(&param.type, type, 0, VT_I4); + if (FAILED(hr)) + return hr; + } + + if (is_optional_argument(title)) + param.title = *title; + else + { + VariantInit(&param.title); + hr = VariantChangeType(&param.title, title, 0, VT_BSTR); + if (FAILED(hr)) + return hr; + } + + param.text = text; + param.button = -1; + hthread = CreateThread(NULL, 0, popup_thread_proc, &param, 0, &tid); + status = MsgWaitForMultipleObjects(1, &hthread, FALSE, V_I4(&timeout) ? V_I4(&timeout) * 1000: INFINITE, 0); + if (status == WAIT_TIMEOUT) + { + PostThreadMessageW(tid, WM_QUIT, 0, 0); + MsgWaitForMultipleObjects(1, &hthread, FALSE, INFINITE, 0); + param.button = -1; + } + *button = param.button; + + VariantClear(&param.title); + CloseHandle(hthread); + + return S_OK; } static HRESULT WINAPI WshShell3_CreateShortcut(IWshShell3 *iface, BSTR PathLink, IDispatch** Shortcut) diff --git a/dlls/wshom.ocx/tests/wshom.c b/dlls/wshom.ocx/tests/wshom.c index 7e82f30..18ff4d6 100644 --- a/dlls/wshom.ocx/tests/wshom.c +++ b/dlls/wshom.ocx/tests/wshom.c @@ -566,6 +566,54 @@ static void test_registry(void) IWshShell3_Release(sh3); } +static void test_popup(void) +{ + static const WCHAR textW[] = {'T','e','x','t',0}; + VARIANT timeout, type, title, optional; + IWshShell *sh; + int button; + HRESULT hr; + BSTR text; + + hr = CoCreateInstance(&CLSID_WshShell, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, + &IID_IWshShell, (void **)&sh); + ok(hr == S_OK, "Failed to create WshShell object, hr %#x.\n", hr); + + button = 123; + text = SysAllocString(textW); + + hr = IWshShell_Popup(sh, NULL, NULL, NULL, NULL, &button); + ok(hr == E_POINTER, "Unexpected retval %#x.\n", hr); + ok(button == 123, "Unexpected button id %d.\n", button); + + hr = IWshShell_Popup(sh, text, NULL, NULL, NULL, &button); + ok(hr == E_POINTER, "Unexpected retval %#x.\n", hr); + ok(button == 123, "Unexpected button id %d.\n", button); + + V_VT(&optional) = VT_ERROR; + V_ERROR(&optional) = DISP_E_PARAMNOTFOUND; + + V_VT(&timeout) = VT_I2; + V_I2(&timeout) = 1; + + V_VT(&type) = VT_I2; + V_I2(&type) = 1; + + V_VT(&title) = VT_BSTR; + V_BSTR(&title) = NULL; + + hr = IWshShell_Popup(sh, text, &timeout, &optional, &type, &button); + ok(hr == S_OK, "Unexpected retval %#x.\n", hr); + ok(button == -1, "Unexpected button id %d.\n", button); + + hr = IWshShell_Popup(sh, text, &timeout, &title, &optional, &button); + ok(hr == S_OK, "Unexpected retval %#x.\n", hr); + ok(button == -1, "Unexpected button id %d.\n", button); + + SysFreeString(text); + IWshShell_Release(sh); +} + START_TEST(wshom) { IUnknown *unk; @@ -583,6 +631,7 @@ START_TEST(wshom) test_wshshell(); test_registry(); + test_popup(); CoUninitialize(); }

1 0