November 2015 - Wine-Commits

Stefan Dösinger : d3d8/tests: Multisampled render targets are zeroed on creation.
by Alexandre Julliard Nov. 23, 2015

Nov. 23, 2015

Module: wine Branch: master Commit: 876f7546ab5d513804a163bd1805c9b64932eaf4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=876f7546ab5d513804a163bd1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Nov 23 13:21:35 2015 +0100 d3d8/tests: Multisampled render targets are zeroed on creation. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/visual.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 7029551..e3f6d2d 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -8503,6 +8503,75 @@ static void test_shademode(void) DestroyWindow(window); } +static void test_multisample_init(void) +{ + IDirect3DDevice8 *device; + IDirect3D8 *d3d; + IDirect3DSurface8 *back, *multi; + ULONG refcount; + HWND window; + HRESULT hr; + D3DCOLOR color; + unsigned int x, y; + struct surface_readback rb; + BOOL all_zero = TRUE; + + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + if (FAILED(IDirect3D8_CheckDeviceMultiSampleType(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_A8R8G8B8, TRUE, D3DMULTISAMPLE_2_SAMPLES))) + { + skip("Multisampling not supported for D3DFMT_A8R8G8B8, skipping multisample init test.\n"); + goto done; + } + + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + hr = IDirect3DDevice8_GetBackBuffer(device, 0, D3DBACKBUFFER_TYPE_MONO, &back); + ok(SUCCEEDED(hr), "Failed to get back buffer, hr %#x.\n", hr); + hr = IDirect3DDevice8_CreateRenderTarget(device, 640, 480, D3DFMT_A8R8G8B8, + D3DMULTISAMPLE_2_SAMPLES, FALSE, &multi); + ok(SUCCEEDED(hr), "Failed to create multisampled render target, hr %#x.\n", hr); + + hr = IDirect3DDevice8_CopyRects(device, multi, NULL, 0, back, NULL); + ok(SUCCEEDED(hr), "CopyRects failed, hr %#x.\n", hr); + + get_rt_readback(back, &rb); + for (y = 0; y < 480; ++y) + { + for (x = 0; x < 640; ++x) + { + color = get_readback_color(&rb, x, y); + if (!color_match(color, 0x00000000, 0)) + { + all_zero = FALSE; + break; + } + } + if (!all_zero) + break; + } + release_surface_readback(&rb); + ok(all_zero, "Got unexpected color 0x%08x, position %ux%u.\n", color, x, y); + + IDirect3DSurface8_Release(multi); + IDirect3DSurface8_Release(back); + + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + +done: + IDirect3D8_Release(d3d); + DestroyWindow(window); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER8 identifier; @@ -8567,4 +8636,5 @@ START_TEST(visual) test_flip(); test_uninitialized_varyings(); test_shademode(); + test_multisample_init(); }

1 0

Nikolay Sivov : ddeml: Don't trash 'cb' field of structure returned by DdeQueryConvInfo16() (Coverity).
by Alexandre Julliard Nov. 23, 2015

Nov. 23, 2015

Module: wine Branch: master Commit: b22d4e45886122cce25e596f177d9a225c9f899c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b22d4e45886122cce25e596f1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 22 22:55:52 2015 +0300 ddeml: Don't trash 'cb' field of structure returned by DdeQueryConvInfo16() (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddeml.dll16/ddeml.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ddeml.dll16/ddeml.c b/dlls/ddeml.dll16/ddeml.c index 94c947b..5ecb35e 100644 --- a/dlls/ddeml.dll16/ddeml.c +++ b/dlls/ddeml.dll16/ddeml.c @@ -496,6 +496,7 @@ UINT16 WINAPI DdeQueryConvInfo16(HCONV hConv, DWORD idTransaction, ret = DdeQueryConvInfo(hConv, idTransaction, &ci32); if (ret == 0) return 0; + ci16.cb = lpConvInfo->cb; ci16.hUser = ci32.hUser; ci16.hConvPartner = ci32.hConvPartner; ci16.hszSvcPartner = ci32.hszSvcPartner;

1 0

Sebastian Lackner : server: Fix crash when calling SetNamedPipeHandleState on partially closed pipe.
by Alexandre Julliard Nov. 23, 2015

Nov. 23, 2015

Module: wine Branch: master Commit: ace9d329e9c1bae6a4d15d98482a67b802721348 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ace9d329e9c1bae6a4d15d984… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Nov 23 07:24:07 2015 +0100 server: Fix crash when calling SetNamedPipeHandleState on partially closed pipe. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 12 ++++++++++++ server/named_pipe.c | 6 +++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 842376a..60336f8 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -1427,6 +1427,9 @@ static void test_CloseHandle(void) ret = GetNamedPipeHandleStateA(hfile, &state, NULL, NULL, NULL, NULL, 0); ok(ret, "GetNamedPipeHandleState failed with %u\n", GetLastError()); + state = PIPE_READMODE_MESSAGE | PIPE_WAIT; + ret = SetNamedPipeHandleState(hfile, &state, NULL, NULL); + ok(ret, "SetNamedPipeHandleState failed with %u\n", GetLastError()); SetLastError(0xdeadbeef); ret = ReadFile(hfile, buffer, 0, &numbytes, NULL); @@ -1464,6 +1467,9 @@ static void test_CloseHandle(void) ret = GetNamedPipeHandleStateA(hfile, &state, NULL, NULL, NULL, NULL, 0); ok(ret, "GetNamedPipeHandleState failed with %u\n", GetLastError()); + state = PIPE_READMODE_MESSAGE | PIPE_WAIT; + ret = SetNamedPipeHandleState(hfile, &state, NULL, NULL); + ok(ret, "SetNamedPipeHandleState failed with %u\n", GetLastError()); SetLastError(0xdeadbeef); ret = ReadFile(hfile, buffer, 0, &numbytes, NULL); @@ -1515,6 +1521,9 @@ static void test_CloseHandle(void) ret = GetNamedPipeHandleStateA(hpipe, &state, NULL, NULL, NULL, NULL, 0); ok(ret, "GetNamedPipeHandleState failed with %u\n", GetLastError()); + state = PIPE_READMODE_MESSAGE | PIPE_WAIT; + ret = SetNamedPipeHandleState(hpipe, &state, NULL, NULL); + ok(ret, "SetNamedPipeHandleState failed with %u\n", GetLastError()); SetLastError(0xdeadbeef); ret = ReadFile(hpipe, buffer, 0, &numbytes, NULL); @@ -1552,6 +1561,9 @@ static void test_CloseHandle(void) ret = GetNamedPipeHandleStateA(hpipe, &state, NULL, NULL, NULL, NULL, 0); ok(ret, "GetNamedPipeHandleState failed with %u\n", GetLastError()); + state = PIPE_READMODE_MESSAGE | PIPE_WAIT; + ret = SetNamedPipeHandleState(hpipe, &state, NULL, NULL); + ok(ret, "SetNamedPipeHandleState failed with %u\n", GetLastError()); SetLastError(0xdeadbeef); ret = ReadFile(hpipe, buffer, 0, &numbytes, NULL); diff --git a/server/named_pipe.c b/server/named_pipe.c index 1c9143f..8d5753a 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -1046,7 +1046,11 @@ DECL_HANDLER(set_named_pipe_info) client = (struct pipe_client *)get_handle_obj( current->process, req->handle, 0, &pipe_client_ops ); if (!client) return; - server = client->server; + if (!(server = client->server)) + { + release_object( client ); + return; + } } if ((req->flags & ~(NAMED_PIPE_MESSAGE_STREAM_READ | NAMED_PIPE_NONBLOCKING_MODE)) ||

1 0

Francois Gouget : cmd/tests: Fix the builtin tests when the current directory contains a space.
by Alexandre Julliard Nov. 23, 2015

Nov. 23, 2015

Module: wine Branch: master Commit: 46e94c8d19284f4353e3f9592784c8870fb1b966 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46e94c8d19284f4353e3f9592… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Nov 22 19:34:18 2015 +0100 cmd/tests: Fix the builtin tests when the current directory contains a space. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/tests/test_builtins.cmd | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 1bcd655..52c549e 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -952,11 +952,11 @@ goto :TestForR del temp.bat 2>nul call :WriteLine set WINE_found=N for /l %%i in (1,1,%WINE_expectedresults%) do ( - call :WriteLine if "%%%%WINE_expectedresults.%%i%%%%"=="%%%%1" set WINE_found=Y + call :WriteLine if "%%%%WINE_expectedresults.%%i%%%%"=="%%%%~1" set WINE_found=Y call :WriteLine if "%%%%WINE_found%%%%"=="Y" set WINE_expectedresults.%%i= call :WriteLine if "%%%%WINE_found%%%%"=="Y" goto :eof ) -call :WriteLine echo Got unexpected result: "%%%%1" +call :WriteLine echo Got unexpected result: "%%%%~1" goto :eof :WriteLine @@ -984,7 +984,7 @@ set WINE_expectedresults.2=%WINE_CURDIR%\bar\. set WINE_expectedresults.3=%WINE_CURDIR%\baz\. set WINE_expectedresults.4=%WINE_CURDIR%\foo\. call :SetExpected -for /R %%i in (.) do call temp.bat %%i +for /R %%i in (.) do call temp.bat "%%i" call :ValidateExpected echo Plain directory enumeration from provided root @@ -995,7 +995,7 @@ set WINE_expectedresults.3=%WINE_CURDIR%\baz\. set WINE_expectedresults.4=%WINE_CURDIR%\foo\. if "%CD%"=="" goto :SkipBrokenNT4 call :SetExpected -for /R "%WINE_CURDIR%" %%i in (.) do call temp.bat %%i +for /R "%WINE_CURDIR%" %%i in (.) do call temp.bat "%%i" call :ValidateExpected :SkipBrokenNT4 @@ -1004,7 +1004,7 @@ set WINE_expectedresults=2 set WINE_expectedresults.1=%WINE_CURDIR%\baz\bazbaz set WINE_expectedresults.2=%WINE_CURDIR%\bazbaz call :SetExpected -for /R %%i in (baz*) do call temp.bat %%i +for /R %%i in (baz*) do call temp.bat "%%i" call :ValidateExpected echo File enumeration from provided root @@ -1012,7 +1012,7 @@ set WINE_expectedresults=2 set WINE_expectedresults.1=%WINE_CURDIR%\baz\bazbaz set WINE_expectedresults.2=%WINE_CURDIR%\bazbaz call :SetExpected -for /R %%i in (baz*) do call temp.bat %%i +for /R %%i in (baz*) do call temp.bat "%%i" call :ValidateExpected echo Mixed enumeration @@ -1024,7 +1024,7 @@ set WINE_expectedresults.4=%WINE_CURDIR%\baz\bazbaz set WINE_expectedresults.5=%WINE_CURDIR%\bazbaz set WINE_expectedresults.6=%WINE_CURDIR%\foo\. call :SetExpected -for /R %%i in (. baz*) do call temp.bat %%i +for /R %%i in (. baz*) do call temp.bat "%%i" call :ValidateExpected echo Mixed enumeration from provided root @@ -1036,7 +1036,7 @@ set WINE_expectedresults.4=%WINE_CURDIR%\baz\bazbaz set WINE_expectedresults.5=%WINE_CURDIR%\bazbaz set WINE_expectedresults.6=%WINE_CURDIR%\foo\. call :SetExpected -for /R %%i in (. baz*) do call temp.bat %%i +for /R %%i in (. baz*) do call temp.bat "%%i" call :ValidateExpected echo With duplicates enumeration @@ -1054,7 +1054,7 @@ set WINE_expectedresults.10=%WINE_CURDIR%\foo\bazbaz set WINE_expectedresults.11=%WINE_CURDIR%\foo\fred set WINE_expectedresults.12=%WINE_CURDIR%\fred call :SetExpected -for /R %%i in (baz* bazbaz fred ba*) do call temp.bat %%i +for /R %%i in (baz* bazbaz fred ba*) do call temp.bat "%%i" call :ValidateExpected echo Strip missing wildcards, keep unwildcarded names @@ -1066,7 +1066,7 @@ set WINE_expectedresults.4=%WINE_CURDIR%\bazbaz set WINE_expectedresults.5=%WINE_CURDIR%\foo\jim set WINE_expectedresults.6=%WINE_CURDIR%\jim call :SetExpected -for /R %%i in (baz* fred* jim) do call temp.bat %%i +for /R %%i in (baz* fred* jim) do call temp.bat "%%i" call :ValidateExpected echo for /R passed @@ -2490,7 +2490,7 @@ cmd /e:oN /C tmp.cmd rem FIXME: creating file before setting envvar value to prevent parsing-time evaluation (due to EnableDelayedExpansion not being implemented/available yet) echo --- setlocal with corresponding endlocal -rem %CD% does not tork on NT4 so use the following workaround +rem %CD% does not work on NT4 so use the following workaround for /d %%i in (.) do set WINE_CURDIR=%%~dpnxi echo @echo off> test.cmd echo echo %%WINE_VAR%%>> test.cmd @@ -2520,7 +2520,7 @@ echo cd foobar2>> test.cmd echo echo %%WINE_VAR%%>> test.cmd echo for /d %%%%i in (.) do echo %%%%~dpnxi>> test.cmd set WINE_VAR=globalval -rem %CD% does not tork on NT4 so use the following workaround +rem %CD% does not work on NT4 so use the following workaround for /d %%i in (.) do set WINE_CURDIR=%%~dpnxi call test.cmd echo %WINE_VAR% @@ -2532,7 +2532,7 @@ echo --- setlocal within same batch program set WINE_var1=one set WINE_var2= set WINE_var3= -rem %CD% does not tork on NT4 so use the following workaround +rem %CD% does not work on NT4 so use the following workaround for /d %%i in (.) do set WINE_CURDIR=%%~dpnxi setlocal set WINE_var2=two @@ -2564,7 +2564,7 @@ echo --- Mismatched set and end locals mkdir foodir2 2>nul mkdir foodir3 2>nul mkdir foodir4 2>nul -rem %CD% does not tork on NT4 so use the following workaround +rem %CD% does not work on NT4 so use the following workaround for /d %%i in (.) do set WINE_curdir=%%~dpnxi echo @echo off> 2set1end.cmd @@ -2597,7 +2597,7 @@ rem -- setlocal1 == this batch, should never be used inside a called routine setlocal set WINE_var=value2 cd foodir2 -call %WINE_CURDIR%\2set1end.cmd +call "%WINE_CURDIR%\2set1end.cmd" echo Finished: echo %WINE_VAR% for /d %%i in (.) do echo %%~dpnxi @@ -2612,7 +2612,7 @@ rem -- setlocal1 == this batch, should never be used inside a called routine setlocal set WINE_var=value2 cd foodir2 -call %WINE_CURDIR%\1set2end.cmd +call "%WINE_CURDIR%\1set2end.cmd" echo Finished: echo %WINE_VAR% for /d %%i in (.) do echo %%~dpnxi

1 0

Jactry Zeng : po: Update Simplified Chinese translation.
by Alexandre Julliard Nov. 23, 2015

Nov. 23, 2015

Module: wine Branch: master Commit: f4581918c670d4f53aeb05b5e04cd952a0621d94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4581918c670d4f53aeb05b5e… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Sat Nov 21 22:58:42 2015 +0800 po: Update Simplified Chinese translation. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/zh_CN.po | 48 ++++++++++++++---------------------------------- 1 file changed, 14 insertions(+), 34 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 51660b3..56c0cd3 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -8477,58 +8477,44 @@ msgid "Wine" msgstr "Wine" #: winemac.rc:33 -#, fuzzy -#| msgid "Hide" msgid "Hide %@" -msgstr "隐藏" +msgstr "隐藏 %@" #: winemac.rc:35 -#, fuzzy -#| msgid "I/O Other" msgid "Hide Others" -msgstr "I/O 其他" +msgstr "隐藏其他" #: winemac.rc:36 -#, fuzzy -#| msgid "Show" msgid "Show All" -msgstr "显示" +msgstr "显示全部" #: winemac.rc:37 msgid "Quit %@" -msgstr "" +msgstr "退出 %@" #: winemac.rc:38 msgid "Quit" -msgstr "" +msgstr "退出" #: winemac.rc:40 -#, fuzzy -#| msgid "&Window" msgid "Window" -msgstr "窗口(&W)" +msgstr "窗口" #: winemac.rc:41 -#, fuzzy -#| msgid "&Minimize" msgid "Minimize" -msgstr "最小化(&M)" +msgstr "最小化" #: winemac.rc:42 -#, fuzzy -#| msgid "Zoom in" msgid "Zoom" -msgstr "放大" +msgstr "缩放" #: winemac.rc:43 msgid "Enter Full Screen" -msgstr "" +msgstr "全屏" #: winemac.rc:44 -#, fuzzy -#| msgid "&Bring To Front" msgid "Bring All to Front" -msgstr "移到最前面(&B)" +msgstr "前置全部窗口" #: wineps.rc:31 msgid "Paper Si&ze:" @@ -12662,10 +12648,8 @@ msgid "Select Drive Letter" msgstr "选择驱动器盘符" #: winecfg.rc:232 -#, fuzzy -#| msgid "Wine configuration" msgid "Drive configuration" -msgstr "Wine 设置" +msgstr "驱动器设置" #: winecfg.rc:233 msgid "" @@ -12738,14 +12722,12 @@ msgid "&Test Sound" msgstr "测试音频(&T)" #: winecfg.rc:277 winecfg.rc:90 -#, fuzzy -#| msgid "Wine configuration" msgid "Speaker configuration" -msgstr "Wine 设置" +msgstr "扬声器设置" #: winecfg.rc:280 msgid "Speakers:" -msgstr "" +msgstr "扬声器：" #: winecfg.rc:288 msgid "Appearance" @@ -12969,10 +12951,8 @@ msgid "Letter" msgstr "盘符" #: winecfg.rc:78 -#, fuzzy -#| msgid "New Folder" msgid "Target folder" -msgstr "新文件夹" +msgstr "目标文件夹" #: winecfg.rc:79 msgid ""

1 0

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard Nov. 23, 2015

Nov. 23, 2015

Module: wine Branch: master Commit: dcbd4a003111fc2db5abb6e358a8942f1c20790f URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcbd4a003111fc2db5abb6e35… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Nov 22 20:27:21 2015 +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 | 70 ++++++++++++++++++++++++++++++---------------------------------- 1 file changed, 33 insertions(+), 37 deletions(-) diff --git a/po/ja.po b/po/ja.po index 298ef76..d8b5cb0 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2015-07-22 00:22+0900\n" +"PO-Revision-Date: 2015-11-22 13:05+0900\n" "Last-Translator: Akihiro Sagawa <sagawa.aki(a)gmail.com>\n" "Language-Team: Japanese\n" "Language: ja\n" @@ -3180,7 +3180,7 @@ msgstr "表示" #: hhctrl.rc:43 winemac.rc:34 msgid "Hide" -msgstr "非表示" +msgstr "隠す" #: hhctrl.rc:44 ieframe.rc:68 shdoclc.rc:167 shdoclc.rc:191 msgid "Stop" @@ -7445,16 +7445,12 @@ msgid "&Convert..." msgstr "変換(&C)..." #: oledlg.rc:36 -#, fuzzy -#| msgid "&Object" msgid "%1 %2 &Object" -msgstr "オブジェクト(&O)" +msgstr "%1 %2 オブジェクト(&O)" #: oledlg.rc:34 -#, fuzzy -#| msgid "&Object" msgid "%1 &Object" -msgstr "オブジェクト(&O)" +msgstr "%1 オブジェクト(&O)" #: oledlg.rc:33 oleview.rc:40 msgid "&Object" @@ -8567,58 +8563,44 @@ msgid "Wine" msgstr "Wine" #: winemac.rc:33 -#, fuzzy -#| msgid "Hide" msgid "Hide %@" -msgstr "非表示" +msgstr "%@ を隠す" #: winemac.rc:35 -#, fuzzy -#| msgid "Other" msgid "Hide Others" -msgstr "その他" +msgstr "ほかを隠す" #: winemac.rc:36 -#, fuzzy -#| msgid "Show" msgid "Show All" -msgstr "表示" +msgstr "すべてを表示" #: winemac.rc:37 msgid "Quit %@" -msgstr "" +msgstr "%@ を終了" #: winemac.rc:38 msgid "Quit" -msgstr "" +msgstr "終了" #: winemac.rc:40 -#, fuzzy -#| msgid "&Window" msgid "Window" -msgstr "ウィンドウ(&W)" +msgstr "ウィンドウ" #: winemac.rc:41 -#, fuzzy -#| msgid "&Minimize" msgid "Minimize" -msgstr "最小化(&M)" +msgstr "しまう" #: winemac.rc:42 -#, fuzzy -#| msgid "Zoom in" msgid "Zoom" -msgstr "拡大" +msgstr "拡大／縮小" #: winemac.rc:43 msgid "Enter Full Screen" -msgstr "" +msgstr "フルスクリーンにする" #: winemac.rc:44 -#, fuzzy -#| msgid "&Bring To Front" msgid "Bring All to Front" -msgstr "手前に表示(&B)" +msgstr "すべてを手前に移動" #: wineps.rc:31 msgid "Paper Si&ze:" @@ -9664,7 +9646,7 @@ msgstr "DEL <ファイル名> はファイルやファイル群を削除しま #: cmd.rc:65 msgid "DIR lists the contents of a directory.\n" -msgstr "DIR はディレクトリの内容を一覧表示します。\n" +msgstr "DIR はディレクトリ内容の一覧を表示します。\n" #: cmd.rc:75 msgid "" @@ -12904,18 +12886,17 @@ msgstr "" #: uninstaller.rc:31 msgid "uninstaller: The application with GUID '%1' was not found\n" -msgstr "" +msgstr "uninstaller: GUID '%1' のアプリケーションは見つかりませんでした\n" #: uninstaller.rc:32 msgid "" "uninstaller: The option '--remove' must be followed by an application GUID\n" msgstr "" +"uninstaller: --remove オプションはアプリケーション GUID の指定が必要です\n" #: uninstaller.rc:33 -#, fuzzy -#| msgid "Error: Invalid option '%c'.\n" msgid "uninstaller: Invalid option [%1]\n" -msgstr "エラー: 無効なオプション '%c'。\n" +msgstr "uninstaller: 無効なオプション [%1]\n" #: uninstaller.rc:35 msgid "" @@ -12924,6 +12905,10 @@ msgid "" "Uninstall applications from the current Wine prefix.\n" "\n" msgstr "" +"Wine アプリケーションアンインストーラ\n" +"\n" +"アプリケーションを現在の Wine プレフィックスからアンインストールします。\n" +"\n" #: uninstaller.rc:43 msgid "" @@ -12938,6 +12923,17 @@ msgid "" " [no option] Launch the graphical version of this program.\n" "\n" msgstr "" +"使い方:\n" +" uninstaller [オプション群]\n" +"\n" +"オプション:\n" +" --help\t この情報を表示する。\n" +" --list\t この Wine プレフィックスにインストールされた全アプリ\n" +"\t\t ケーションの一覧を表示する。\n" +" --remove\t 指定のアプリケーションをアンインストールする。\n" +"\t\t アプリケーション GUID を割り出すため --list をつかう。\n" +" [オプションなし] このプログラムのグラフィカル版を起動する。\n" +"\n" #: view.rc:36 msgid "&Pan"

1 0

Vijay Kiran Kamuju : wine.inf: Install wordpad in Program FilesWindows NT\Accessories.
by Alexandre Julliard Nov. 23, 2015

Nov. 23, 2015

Module: wine Branch: master Commit: 616495b6a47b1a77b5294ff9ebf2d22442e10daf URL: http://source.winehq.org/git/wine.git/?a=commit;h=616495b6a47b1a77b5294ff9e… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sun Nov 22 01:50:00 2015 +0000 wine.inf: Install wordpad in Program FilesWindows NT\Accessories. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index c8de5f9..7773377 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2529,6 +2529,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,shdocvw.dll 16422,Internet Explorer,iexplore.exe 16422,Windows Media Player,wmplayer.exe +16422,Windows NT\Accessories,wordpad.exe 11,,* [FakeDlls] @@ -2578,6 +2579,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 16412,Microsoft, 16422,Internet Explorer,iexplore.exe 16422,Windows Media Player,wmplayer.exe +16422,Windows NT\Accessories,wordpad.exe 16427,System\OLE DB,oledb32.dll 16427,System\OLE DB,msdaps.dll 11,,*

1 0

Vincent Povirk : advapi32/tests: Skip test when registry virtualization can't delete values.
by Alexandre Julliard Nov. 23, 2015

Nov. 23, 2015

Module: wine Branch: master Commit: f742b05d771e2ebe5adf099095570df7c4a1ba82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f742b05d771e2ebe5adf09909… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Nov 20 11:17:18 2015 -0600 advapi32/tests: Skip test when registry virtualization can't delete values. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/crypt.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c index ebae143..84a54a1 100644 --- a/dlls/advapi32/tests/crypt.c +++ b/dlls/advapi32/tests/crypt.c @@ -961,7 +961,13 @@ static void test_machine_guid(void) { restoreGuid = TRUE; r = RegDeleteValueA(key, "MachineGuid"); - ok(!r, "RegDeleteValueA failed: %d\n", r); + ok(!r || broken(r == ERROR_ACCESS_DENIED) /*win8*/, "RegDeleteValueA failed: %d\n", r); + if (r == ERROR_ACCESS_DENIED) + { + skip("broken virtualization on HKLM\\Software\\Microsoft\\Cryptography\n"); + RegCloseKey(key); + return; + } } else ok(r == ERROR_FILE_NOT_FOUND, "expected ERROR_FILE_NOT_FOUND, got %d\n",

1 0

Thomas Faber : dinput: Implement MSVC version of enum_callback_wrapper.
by Alexandre Julliard Nov. 23, 2015

Nov. 23, 2015

Module: wine Branch: master Commit: 805473dec7c154798c0035495f08040c62f1a7d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=805473dec7c154798c0035495… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sun Nov 22 17:51:24 2015 +0100 dinput: Implement MSVC version of enum_callback_wrapper. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/dinput_main.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 24e7951..2ff6fd9 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -339,7 +339,21 @@ static DWORD diactionformat_priorityW(LPDIACTIONFORMATW lpdiaf, DWORD genre) return priorityFlags; } -#ifdef __i386__ +#if defined __i386__ && defined _MSC_VER +__declspec(naked) BOOL enum_callback_wrapper(void *callback, const void *instance, void *ref) +{ + __asm + { + push ebp + mov ebp, esp + push [ebp+16] + push [ebp+12] + call [ebp+8] + leave + ret + } +} +#elif defined __i386__ && defined __GNUC__ extern BOOL enum_callback_wrapper(void *callback, const void *instance, void *ref); __ASM_GLOBAL_FUNC( enum_callback_wrapper, "pushl %ebp\n\t"

1 0

Vincent Povirk : atl100/tests: Check Administrators group if UAC is disabled.
by Alexandre Julliard Nov. 23, 2015

Nov. 23, 2015

Module: wine Branch: master Commit: 1efa69c6185b0a32dd384e9bbffca8a509bf0bf5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1efa69c6185b0a32dd384e9bb… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Nov 21 19:47:40 2015 -0600 atl100/tests: Check Administrators group if UAC is disabled. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/atl100/tests/atl.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 59 insertions(+), 2 deletions(-) diff --git a/dlls/atl100/tests/atl.c b/dlls/atl100/tests/atl.c index d07a523..c6e5cda 100644 --- a/dlls/atl100/tests/atl.c +++ b/dlls/atl100/tests/atl.c @@ -63,10 +63,58 @@ static const WCHAR fileW[] = {'f','i','l','e',':','/','/','/','\0'}; static const WCHAR html_fileW[] = {'t','e','s','t','.','h','t','m','l','\0'}; static const char html_str[] = "<html><body>test</body><html>"; +static BOOL is_token_admin(HANDLE token) +{ + PSID administrators = NULL; + SID_IDENTIFIER_AUTHORITY nt_authority = { SECURITY_NT_AUTHORITY }; + DWORD groups_size; + PTOKEN_GROUPS groups; + DWORD group_index; + + /* Create a well-known SID for the Administrators group. */ + if (! AllocateAndInitializeSid(&nt_authority, 2, SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_ADMINS, 0, 0, 0, 0, 0, 0, + &administrators)) + return FALSE; + + /* Get the group info from the token */ + groups_size = 0; + GetTokenInformation(token, TokenGroups, NULL, 0, &groups_size); + groups = HeapAlloc(GetProcessHeap(), 0, groups_size); + if (groups == NULL) + { + FreeSid(administrators); + return FALSE; + } + if (! GetTokenInformation(token, TokenGroups, groups, groups_size, &groups_size)) + { + HeapFree(GetProcessHeap(), 0, groups); + FreeSid(administrators); + return FALSE; + } + + /* Now check if the token groups include the Administrators group */ + for (group_index = 0; group_index < groups->GroupCount; group_index++) + { + if (EqualSid(groups->Groups[group_index].Sid, administrators)) + { + HeapFree(GetProcessHeap(), 0, groups); + FreeSid(administrators); + return TRUE; + } + } + + /* If we end up here we didn't find the Administrators group */ + HeapFree(GetProcessHeap(), 0, groups); + FreeSid(administrators); + return FALSE; +} + static BOOL is_process_limited(void) { static BOOL (WINAPI *pOpenProcessToken)(HANDLE, DWORD, PHANDLE) = NULL; HANDLE token; + BOOL result=FALSE; if (!pOpenProcessToken) { @@ -83,10 +131,19 @@ static BOOL is_process_limited(void) DWORD size; ret = GetTokenInformation(token, TokenElevationType, &type, sizeof(type), &size); + if (ret) + { + if (type == TokenElevationTypeDefault) + /* UAC is disabled, check for administrators group */ + result = !is_token_admin(token); + else if (type == TokenElevationTypeFull) + result = FALSE; + else if (type == TokenElevationTypeLimited) + result = TRUE; + } CloseHandle(token); - return (ret && type == TokenElevationTypeLimited); } - return FALSE; + return result; } static void test_winmodule(void)

1 0