March 2015 - Wine-Commits - list.winehq.org

Nikolay Sivov : po: Corrected Russian translation.
by Alexandre Julliard March 26, 2015

March 26, 2015

Module: wine Branch: master Commit: f1b7e367eaea294f60e4ea82d27d152994cd577c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1b7e367eaea294f60e4ea82d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 26 12:36:29 2015 +0300 po: Corrected Russian translation. --- po/ru.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ru.po b/po/ru.po index 9d312e9..14d8b4f 100644 --- a/po/ru.po +++ b/po/ru.po @@ -11513,7 +11513,7 @@ msgstr "Ошибка: неправильные параметры командн #: reg.rc:37 msgid "Error: Unable to access remote machine\n" -msgstr "Ошибка: нет удалось получить доступ к удалённому компьютеру\n" +msgstr "Ошибка: не удалось получить доступ к удалённому компьютеру\n" #: reg.rc:38 msgid ""

1 0

Henri Verbeet : d2d1: Implement d2d_d3d_render_target_SetTextRenderingParams().
by Alexandre Julliard March 26, 2015

March 26, 2015

Module: wine Branch: master Commit: 060d2230fc5e3fcfe4fd061fd494021dcd304543 URL: http://source.winehq.org/git/wine.git/?a=commit;h=060d2230fc5e3fcfe4fd061fd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 26 09:41:17 2015 +0100 d2d1: Implement d2d_d3d_render_target_SetTextRenderingParams(). --- dlls/d2d1/d2d1_private.h | 2 ++ dlls/d2d1/render_target.c | 12 +++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 18f26f0..e416197 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -64,6 +64,8 @@ struct d2d_d3d_render_target ID3D10PixelShader *rect_solid_ps; ID3D10PixelShader *rect_bitmap_ps; + IDWriteRenderingParams *text_rendering_params; + D2D1_SIZE_U pixel_size; D2D1_MATRIX_3X2_F transform; struct d2d_clip_stack clip_stack; diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 15914ed..8eccc25 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -225,6 +225,8 @@ static ULONG STDMETHODCALLTYPE d2d_d3d_render_target_Release(ID2D1RenderTarget * if (!refcount) { d2d_clip_stack_cleanup(&render_target->clip_stack); + if (render_target->text_rendering_params) + IDWriteRenderingParams_Release(render_target->text_rendering_params); ID3D10PixelShader_Release(render_target->rect_bitmap_ps); ID3D10PixelShader_Release(render_target->rect_solid_ps); ID3D10BlendState_Release(render_target->bs); @@ -856,7 +858,15 @@ static D2D1_TEXT_ANTIALIAS_MODE STDMETHODCALLTYPE d2d_d3d_render_target_GetTextA static void STDMETHODCALLTYPE d2d_d3d_render_target_SetTextRenderingParams(ID2D1RenderTarget *iface, IDWriteRenderingParams *text_rendering_params) { - FIXME("iface %p, text_rendering_params %p stub!\n", iface, text_rendering_params); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + + TRACE("iface %p, text_rendering_params %p.\n", iface, text_rendering_params); + + if (text_rendering_params) + IDWriteRenderingParams_AddRef(text_rendering_params); + if (render_target->text_rendering_params) + IDWriteRenderingParams_Release(render_target->text_rendering_params); + render_target->text_rendering_params = text_rendering_params; } static void STDMETHODCALLTYPE d2d_d3d_render_target_GetTextRenderingParams(ID2D1RenderTarget *iface,

1 0

Sebastian Lackner : browseui: Avoid race-conditions when progress dialog is released before thread terminates.
by Alexandre Julliard March 26, 2015

March 26, 2015

Module: wine Branch: master Commit: 5ecc08e349932bc933daa1573e635375b5512e71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ecc08e349932bc933daa1573… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Mar 1 03:52:06 2015 +0100 browseui: Avoid race-conditions when progress dialog is released before thread terminates. --- dlls/browseui/progressdlg.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/browseui/progressdlg.c b/dlls/browseui/progressdlg.c index e61a4cc..7d07ee9 100644 --- a/dlls/browseui/progressdlg.c +++ b/dlls/browseui/progressdlg.c @@ -235,6 +235,7 @@ static DWORD WINAPI dialog_thread(LPVOID lpParameter) /* Note: until we set the hEvent in WM_INITDIALOG, the ProgressDialog object * is protected by the critical section held by StartProgress */ struct create_params *params = lpParameter; + ProgressDialog *This = params->This; HWND hwnd; MSG msg; @@ -252,6 +253,7 @@ static DWORD WINAPI dialog_thread(LPVOID lpParameter) } } + IProgressDialog_Release(&This->IProgressDialog_iface); return 0; } @@ -341,10 +343,14 @@ static HRESULT WINAPI ProgressDialog_StartProgressDialog(IProgressDialog *iface, return S_OK; /* as on XP */ } This->dwFlags = dwFlags; + params.This = This; params.hwndParent = hwndParent; params.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + /* thread holds one reference to ensure clean shutdown */ + IProgressDialog_AddRef(&This->IProgressDialog_iface); + hThread = CreateThread(NULL, 0, dialog_thread, &params, 0, NULL); WaitForSingleObject(params.hEvent, INFINITE); CloseHandle(params.hEvent);

1 0

Jacek Caban : d3d11_1.idl: Fixed ClearView argument (missing const).
by Alexandre Julliard March 26, 2015

March 26, 2015

Module: wine Branch: master Commit: b5bb2e2f53695a7a9dae19e8920fbf75fdfe8f23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5bb2e2f53695a7a9dae19e89… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 25 16:48:04 2015 +0100 d3d11_1.idl: Fixed ClearView argument (missing const). --- include/d3d11_1.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/d3d11_1.idl b/include/d3d11_1.idl index 1ebfc5a..1a46abf 100644 --- a/include/d3d11_1.idl +++ b/include/d3d11_1.idl @@ -217,7 +217,7 @@ interface ID3D11DeviceContext1 : ID3D11DeviceContext void ClearView( ID3D11View *pView, - FLOAT Color[4], + const FLOAT Color[4], const D3D11_RECT *pRect, UINT NumRects);

1 0

Piotr Caban : user32/tests: Don' t send mouse clicks to other process windows in input tests.
by Alexandre Julliard March 26, 2015

March 26, 2015

Module: wine Branch: master Commit: dfd2506736b13cf677f4dcfd9de8c6d01deebc96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfd2506736b13cf677f4dcfd9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 25 16:54:43 2015 +0100 user32/tests: Don't send mouse clicks to other process windows in input tests. --- dlls/user32/tests/input.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 76d0821..a523f0a 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1899,6 +1899,9 @@ static void test_Input_mouse(void) ok(!got_button_up, "unexpected WM_LBUTTONUP message\n"); /* click after SetCapture call */ + hwnd = CreateWindowA("button", "button", WS_VISIBLE | WS_POPUP, + 0, 0, 100, 100, 0, NULL, NULL, NULL); + ok(hwnd != 0, "CreateWindow failed\n"); SetCapture(button_win); got_button_down = got_button_up = FALSE; simulate_click(FALSE, 50, 50); @@ -1920,6 +1923,7 @@ static void test_Input_mouse(void) } ok(got_button_down, "expected WM_RBUTTONDOWN message\n"); ok(got_button_up, "expected WM_RBUTTONUP message\n"); + DestroyWindow(hwnd); /* click on child window after SetCapture call */ hwnd = CreateWindowA("button", "button2", WS_VISIBLE | WS_CHILD,

1 0

Jacek Caban : d3d11.idl: Added D3D11_FEATURE_DATA_D3D11_OPTIONS declaration.
by Alexandre Julliard March 26, 2015

March 26, 2015

Module: wine Branch: master Commit: 9e37e4587eb0b343843a7d9bd5c5c72ecf1141c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e37e4587eb0b343843a7d9bd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 25 16:47:48 2015 +0100 d3d11.idl: Added D3D11_FEATURE_DATA_D3D11_OPTIONS declaration. --- include/d3d11.idl | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/include/d3d11.idl b/include/d3d11.idl index e472944..3726d32 100644 --- a/include/d3d11.idl +++ b/include/d3d11.idl @@ -362,8 +362,31 @@ typedef enum D3D11_FEATURE D3D11_FEATURE_FORMAT_SUPPORT, D3D11_FEATURE_FORMAT_SUPPORT2, D3D11_FEATURE_D3D10_X_HARDWARE_OPTIONS, + D3D11_FEATURE_D3D11_OPTIONS, + D3D11_FEATURE_ARCHITECTURE_INFO, + D3D11_FEATURE_D3D9_OPTIONS, + D3D11_FEATURE_SHADER_MIN_PRECISION_SUPPORT, + D3D11_FEATURE_D3D9_SHADOW_SUPPORT } D3D11_FEATURE; +typedef struct D3D11_FEATURE_DATA_D3D11_OPTIONS +{ + BOOL OutputMergerLogicOp; + BOOL UAVOnlyRenderingForcedSampleCount; + BOOL DiscardAPIsSeenByDriver; + BOOL FlagsForUpdateAndCopySeenByDriver; + BOOL ClearView; + BOOL CopyWithOverlap; + BOOL ConstantBufferPartialUpdate; + BOOL ConstantBufferOffsetting; + BOOL MapNoOverwriteOnDynamicConstantBuffer; + BOOL MapNoOverwriteOnDynamicBufferSRV; + BOOL MultisampleRTVWithForcedSampleCountOne; + BOOL SAD4ShaderInstructions; + BOOL ExtendedDoublesShaderInstructions; + BOOL ExtendedResourceSharing; +} D3D11_FEATURE_DATA_D3D11_OPTIONS; + typedef enum D3D11_FILL_MODE { D3D11_FILL_WIREFRAME = 2,

1 0

Michael Müller : ntdll: Define a couple more information classes.
by Alexandre Julliard March 26, 2015

March 26, 2015

Module: wine Branch: master Commit: 64c48d0e6382ca7a4af7337bf3a1b1f8856eacb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64c48d0e6382ca7a4af7337bf… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Feb 26 05:27:14 2015 +0100 ntdll: Define a couple more information classes. --- dlls/ntdll/file.c | 20 +++++++++++--------- include/winternl.h | 28 +++++++++++++++++----------- 2 files changed, 28 insertions(+), 20 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 92e83dd..0dc5c13 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -2196,20 +2196,22 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io, 0, /* FileIdFullDirectoryInformation */ 0, /* FileValidDataLengthInformation */ 0, /* FileShortNameInformation */ - 0, - 0, - 0, + 0, /* FileIoCompletionNotificationInformation, */ + 0, /* FileIoStatusBlockRangeInformation */ + 0, /* FileIoPriorityHintInformation */ 0, /* FileSfioReserveInformation */ 0, /* FileSfioVolumeInformation */ 0, /* FileHardLinkInformation */ - 0, + 0, /* FileProcessIdsUsingFileInformation */ 0, /* FileNormalizedNameInformation */ - 0, + 0, /* FileNetworkPhysicalNameInformation */ 0, /* FileIdGlobalTxDirectoryInformation */ - 0, - 0, - 0, - 0 /* FileStandardLinkInformation */ + 0, /* FileIsRemoteDeviceInformation */ + 0, /* FileAttributeCacheInformation */ + 0, /* FileNumaNodeInformation */ + 0, /* FileStandardLinkInformation */ + 0, /* FileRemoteProtocolInformation */ + 0, /* FileReplaceCompletionInformation */ }; struct stat st; diff --git a/include/winternl.h b/include/winternl.h index f88001f..9231468 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -412,17 +412,23 @@ typedef enum _FILE_INFORMATION_CLASS { FileIdBothDirectoryInformation, FileIdFullDirectoryInformation, FileValidDataLengthInformation, - FileShortNameInformation = 40, - /* 41, 42, 43 undocumented */ - FileSfioReserveInformation = 44, - FileSfioVolumeInformation = 45, - FileHardLinkInformation = 46, - /* 47 undocumented */ - FileNormalizedNameInformation = 48, - /* 49 undocumented */ - FileIdGlobalTxDirectoryInformation = 50, - /* 51, 52, 53 undocumented */ - FileStandardLinkInformation = 54, + FileShortNameInformation, + FileIoCompletionNotificationInformation, + FileIoStatusBlockRangeInformation, + FileIoPriorityHintInformation, + FileSfioReserveInformation, + FileSfioVolumeInformation, + FileHardLinkInformation, + FileProcessIdsUsingFileInformation, + FileNormalizedNameInformation, + FileNetworkPhysicalNameInformation, + FileIdGlobalTxDirectoryInformation, + FileIsRemoteDeviceInformation, + FileAttributeCacheInformation, + FileNumaNodeInformation, + FileStandardLinkInformation, + FileRemoteProtocolInformation, + FileReplaceCompletionInformation, FileMaximumInformation } FILE_INFORMATION_CLASS, *PFILE_INFORMATION_CLASS;

1 0

Nikolay Sivov : rpcrt4: Fix RpcMgmtStopServerListening() return value when we're not listening.
by Alexandre Julliard March 26, 2015

March 26, 2015

Module: wine Branch: master Commit: 73a68b065bec473719d7bcbcdb7387161bbff7e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73a68b065bec473719d7bcbcd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 25 23:36:46 2015 +0300 rpcrt4: Fix RpcMgmtStopServerListening() return value when we're not listening. --- dlls/rpcrt4/rpc_server.c | 21 +++++++++++++++------ dlls/rpcrt4/tests/rpc.c | 4 ---- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 4789d8a..1e22d03 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -762,9 +762,18 @@ static RPC_STATUS RPCRT4_start_listen(BOOL auto_listen) return status; } -static void RPCRT4_stop_listen(BOOL auto_listen) +static RPC_STATUS RPCRT4_stop_listen(BOOL auto_listen) { + RPC_STATUS status = RPC_S_OK; + EnterCriticalSection(&listen_cs); + + if (!std_listen) + { + status = RPC_S_NOT_LISTENING; + goto done; + } + if (auto_listen || (--manual_listen_count == 0)) { if (listen_count != 0 && --listen_count == 0) { @@ -779,12 +788,14 @@ static void RPCRT4_stop_listen(BOOL auto_listen) EnterCriticalSection(&listen_cs); if (listen_done_event) SetEvent( listen_done_event ); listen_done_event = 0; - LeaveCriticalSection(&listen_cs); - return; + goto done; } assert(listen_count >= 0); } + +done: LeaveCriticalSection(&listen_cs); + return status; } static BOOL RPCRT4_protseq_is_endpoint_registered(RpcServerProtseq *protseq, const char *endpoint) @@ -1560,9 +1571,7 @@ RPC_STATUS WINAPI RpcMgmtStopServerListening ( RPC_BINDING_HANDLE Binding ) return RPC_S_WRONG_KIND_OF_BINDING; } - RPCRT4_stop_listen(FALSE); - - return RPC_S_OK; + return RPCRT4_stop_listen(FALSE); } /*********************************************************************** diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index 85473f6..400756f 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -224,10 +224,8 @@ static void test_rpc_ncacn_ip_tcp(void) ok(status == RPC_S_OK, "return wrong\n"); status = RpcMgmtStopServerListening(NULL); -todo_wine { ok(status == RPC_S_NOT_LISTENING, "wrong RpcMgmtStopServerListening error (%u)\n", status); -} status = RpcMgmtWaitServerListen(); ok(status == RPC_S_NOT_LISTENING, @@ -244,9 +242,7 @@ todo_wine { ok(status == RPC_S_OK, "RpcServerRegisterIf failed (%u)\n", status); status = RpcServerListen(1, 20, TRUE); -todo_wine { ok(status == RPC_S_OK, "RpcServerListen failed (%u)\n", status); -} status = RpcServerListen(1, 20, TRUE); todo_wine {

1 0

Nikolay Sivov : rpcrt4/tests: Use status definitions instead of numeric values.
by Alexandre Julliard March 26, 2015

March 26, 2015

Module: wine Branch: master Commit: fd25d9aadbfa60956dfd576fe94fb987800c2edb URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd25d9aadbfa60956dfd576fe… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 25 22:06:20 2015 +0300 rpcrt4/tests: Use status definitions instead of numeric values. --- dlls/rpcrt4/tests/rpc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index 34f7fac..85473f6 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -665,7 +665,7 @@ static void test_I_RpcExceptionFilter(void) if (!pI_RpcExceptionFilter) { - skip("I_RpcExceptionFilter not exported\n"); + win_skip("I_RpcExceptionFilter not exported\n"); return; } @@ -684,9 +684,9 @@ static void test_I_RpcExceptionFilter(void) case STATUS_ACCESS_VIOLATION: case STATUS_ILLEGAL_INSTRUCTION: case STATUS_PRIVILEGED_INSTRUCTION: - case 0xc00000aa /* STATUS_INSTRUCTION_MISALIGNMENT */: + case STATUS_INSTRUCTION_MISALIGNMENT: case STATUS_STACK_OVERFLOW: - case 0xc0000194 /* STATUS_POSSIBLE_DEADLOCK */: + case STATUS_POSSIBLE_DEADLOCK: ok(retval == EXCEPTION_CONTINUE_SEARCH, "I_RpcExceptionFilter(0x%x) should have returned %d instead of %d\n", exception, EXCEPTION_CONTINUE_SEARCH, retval); break;

1 0

Vincent Povirk : mscoree: Remove the runtime version selection logic and just use 4.0.
by Alexandre Julliard March 26, 2015

March 26, 2015

Module: wine Branch: master Commit: 5cd6db03495d73e3db024472514a753a44a06772 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cd6db03495d73e3db0244725… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Feb 20 12:59:53 2015 -0600 mscoree: Remove the runtime version selection logic and just use 4.0. Mono has removed support for the .NET 2.0 profile, so we'll have to be using 4.0 for everything next time we want to update. --- dlls/mscoree/corruntimehost.c | 14 +---- dlls/mscoree/metahost.c | 134 +++++++++++------------------------------ dlls/mscoree/mscoree_private.h | 6 +- 3 files changed, 37 insertions(+), 117 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5cd6db03495d73e3db024…

1 0