November 2015 - Wine-Commits

Jacek Caban : wininet: Improved debug traces.
by Alexandre Julliard Nov. 25, 2015

Nov. 25, 2015

Module: wine Branch: master Commit: 6790d825d1b2c41de73ffe5cb5df28c1d1cc8878 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6790d825d1b2c41de73ffe5cb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 25 15:11:48 2015 +0100 wininet: Improved debug traces. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/ftp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 8944c5c..96cbb5b 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -2309,7 +2309,7 @@ BOOL WINAPI FtpCommandW( HINTERNET hConnect, BOOL fExpectResponse, DWORD dwFlags strcat(cmd, szCRLF); len--; - TRACE("Sending (%s) len(%d)\n", cmd, len); + TRACE("Sending (%s) len(%d)\n", debugstr_a(cmd), len); while ((nBytesSent < len) && (nRC != -1)) { nRC = sock_send(lpwfs->sndSocket, cmd + nBytesSent, len - nBytesSent, 0); @@ -2728,7 +2728,7 @@ static BOOL FTP_SendCommandA(INT nSocket, FTP_COMMAND ftpCmd, LPCSTR lpszParam, sprintf(buf, "%s%s%s%s", szFtpCommands[ftpCmd], dwParamLen ? " " : "", dwParamLen ? lpszParam : "", szCRLF); - TRACE("Sending (%s) len(%d)\n", buf, len); + TRACE("Sending (%s) len(%d)\n", debugstr_a(buf), len); while((nBytesSent < len) && (nRC != -1)) { nRC = sock_send(nSocket, buf+nBytesSent, len - nBytesSent, 0);

1 0

Alistair Leslie-Hughes : d3d10core/tests: Add test for NULL blend factor in OMSetBlendState().
by Alexandre Julliard Nov. 25, 2015

Nov. 25, 2015

Module: wine Branch: master Commit: 5269fdce2c6174dc93a86b14a3ec5a837a68e800 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5269fdce2c6174dc93a86b14a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Nov 25 13:39:56 2015 +1100 d3d10core/tests: Add test for NULL blend factor in OMSetBlendState(). Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index bec3763..d25600e 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -2223,6 +2223,7 @@ float4 main(float4 color : COLOR) : SV_TARGET D3D10_BUFFER_DESC buffer_desc; D3D10_BLEND_DESC blend_desc; ID3D10Texture2D *ds_texture; + float tmp_blend_factor[4]; float blend_factor[4]; ID3D10Device *device; BOOL predicate_value; @@ -2559,7 +2560,30 @@ float4 main(float4 color : COLOR) : SV_TARGET hr = ID3D10Device_CreatePredicate(device, &predicate_desc, &predicate); ok(SUCCEEDED(hr), "Failed to create predicate, hr %#x.\n", hr); + /* Verify the behavior of set state methods. */ + + blend_factor[0] = 0.1f; + blend_factor[1] = 0.2f; + blend_factor[2] = 0.3f; + blend_factor[3] = 0.4f; + ID3D10Device_OMSetBlendState(device, blend_state, blend_factor, D3D10_DEFAULT_SAMPLE_MASK); + ID3D10Device_OMGetBlendState(device, &tmp_blend_state, tmp_blend_factor, &sample_mask); + ok(tmp_blend_factor[0] == 0.1f && tmp_blend_factor[1] == 0.2f + && tmp_blend_factor[2] == 0.3f && tmp_blend_factor[3] == 0.4f, + "Got unexpected blend factor {%.8e, %.8e, %.8e, %.8e}.\n", + tmp_blend_factor[0], tmp_blend_factor[1], tmp_blend_factor[2], tmp_blend_factor[3]); + ID3D10BlendState_Release(tmp_blend_state); + + ID3D10Device_OMSetBlendState(device, blend_state, NULL, D3D10_DEFAULT_SAMPLE_MASK); + ID3D10Device_OMGetBlendState(device, &tmp_blend_state, tmp_blend_factor, &sample_mask); + ok(tmp_blend_factor[0] == 1.0f && tmp_blend_factor[1] == 1.0f + && tmp_blend_factor[2] == 1.0f && tmp_blend_factor[3] == 1.0f, + "Got unexpected blend factor {%.8e, %.8e, %.8e, %.8e}.\n", + tmp_blend_factor[0], tmp_blend_factor[1], tmp_blend_factor[2], tmp_blend_factor[3]); + ID3D10BlendState_Release(tmp_blend_state); + /* Setup state. */ + ID3D10Device_VSSetConstantBuffers(device, 0, D3D10_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT, cb); ID3D10Device_VSSetShaderResources(device, 0, D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT, srv); ID3D10Device_VSSetSamplers(device, 0, D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT, sampler);

1 0

Stefan Dösinger : dxgi/tests: Test DXGI_SWAP_EFFECT_FLIP_DISCARD.
by Alexandre Julliard Nov. 25, 2015

Nov. 25, 2015

Module: wine Branch: master Commit: a971d4f2f67f3271e3fe331f32eee2241c2691bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a971d4f2f67f3271e3fe331f3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Nov 24 22:18:45 2015 +0100 dxgi/tests: Test DXGI_SWAP_EFFECT_FLIP_DISCARD. 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/dxgi/factory.c | 1 + dlls/dxgi/tests/device.c | 25 +++++++++++++++++++------ 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 2e0d5ab..5da45f3 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -201,6 +201,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChain(IDXGIFactory1 *ifa min_buffer_count = 1; break; + case DXGI_SWAP_EFFECT_FLIP_DISCARD: case DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL: min_buffer_count = 2; break; diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index f5480de..522d5de 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -1077,15 +1077,20 @@ static void test_swapchain_parameters(void) {TRUE, 1, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {TRUE, 2, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, S_OK, DXGI_ERROR_INVALID_CALL, 1}, {TRUE, 3, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, S_OK, DXGI_ERROR_INVALID_CALL, 2}, - {TRUE, 0, 4 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, - {TRUE, 1, 4 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, - {TRUE, 2, 4 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + {TRUE, 0, DXGI_SWAP_EFFECT_FLIP_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + {TRUE, 1, DXGI_SWAP_EFFECT_FLIP_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + {TRUE, 2, DXGI_SWAP_EFFECT_FLIP_DISCARD, S_OK, DXGI_ERROR_INVALID_CALL, 0}, + {TRUE, 0, 5 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + {TRUE, 1, 5 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + {TRUE, 2, 5 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {TRUE, 16, DXGI_SWAP_EFFECT_DISCARD, S_OK, S_OK, 0}, {TRUE, 16, DXGI_SWAP_EFFECT_SEQUENTIAL, S_OK, S_OK, 15}, {TRUE, 16, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, S_OK, DXGI_ERROR_INVALID_CALL, 15}, + {TRUE, 16, DXGI_SWAP_EFFECT_FLIP_DISCARD, S_OK, DXGI_ERROR_INVALID_CALL, 0}, {TRUE, 17, DXGI_SWAP_EFFECT_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {TRUE, 17, DXGI_SWAP_EFFECT_SEQUENTIAL, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {TRUE, 17, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + {TRUE, 17, DXGI_SWAP_EFFECT_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {FALSE, 0, DXGI_SWAP_EFFECT_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {FALSE, 1, DXGI_SWAP_EFFECT_DISCARD, S_OK, S_OK, 0}, @@ -1101,15 +1106,23 @@ static void test_swapchain_parameters(void) {FALSE, 1, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {FALSE, 2, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, S_OK, DXGI_ERROR_INVALID_CALL, 1}, {FALSE, 3, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, S_OK, DXGI_ERROR_INVALID_CALL, 2}, - {FALSE, 0, 4 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, - {FALSE, 1, 4 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, - {FALSE, 2, 4 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + {FALSE, 0, DXGI_SWAP_EFFECT_FLIP_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + {FALSE, 1, DXGI_SWAP_EFFECT_FLIP_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + {FALSE, 2, DXGI_SWAP_EFFECT_FLIP_DISCARD, S_OK, DXGI_ERROR_INVALID_CALL, 0}, + {FALSE, 0, 5 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + {FALSE, 1, 5 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + {FALSE, 2, 5 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {FALSE, 16, DXGI_SWAP_EFFECT_DISCARD, S_OK, S_OK, 0}, {FALSE, 16, DXGI_SWAP_EFFECT_SEQUENTIAL, S_OK, S_OK, 15}, {FALSE, 16, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, S_OK, DXGI_ERROR_INVALID_CALL, 15}, + /* The following test fails on Nvidia with E_OUTOFMEMORY and leaks device references in the + * process. Disable it for now. + {FALSE, 16, DXGI_SWAP_EFFECT_FLIP_DISCARD, S_OK, DXGI_ERROR_INVALID_CALL, 0}, + */ {FALSE, 17, DXGI_SWAP_EFFECT_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {FALSE, 17, DXGI_SWAP_EFFECT_SEQUENTIAL, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {FALSE, 17, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + {FALSE, 17, DXGI_SWAP_EFFECT_FLIP_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, }; if (!(device = create_device()))

1 0

Alistair Leslie-Hughes : d3d11: Make blend_factor optional in d3d11_immediate_context_OMSetBlendState().
by Alexandre Julliard Nov. 25, 2015

Nov. 25, 2015

Module: wine Branch: master Commit: e7de17fce8e55a72d6e2e0dbc30e2b0916f3897a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7de17fce8e55a72d6e2e0dbc… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Nov 25 14:44:32 2015 +0100 d3d11: Make blend_factor optional in d3d11_immediate_context_OMSetBlendState(). Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index f9d7c9e..b1f56c3 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -606,10 +606,14 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetBlendState(ID3D11Devi ID3D11BlendState *blend_state, const FLOAT blend_factor[4], UINT sample_mask) { struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + static const float default_blend_factor[] = {1.0f, 1.0f, 1.0f, 1.0f}; const D3D11_BLEND_DESC *desc; - TRACE("iface %p, blend_state %p, blend_factor {%.8e %.8e %.8e %.8e}, sample_mask 0x%08x.\n", - iface, blend_state, blend_factor[0], blend_factor[1], blend_factor[2], blend_factor[3], sample_mask); + TRACE("iface %p, blend_state %p, blend_factor %p, sample_mask 0x%08x.\n", + iface, blend_state, blend_factor, sample_mask); + + if (!blend_factor) + blend_factor = default_blend_factor; if (blend_factor[0] != 1.0f || blend_factor[1] != 1.0f || blend_factor[2] != 1.0f || blend_factor[3] != 1.0f) FIXME("Ignoring blend factor {%.8e %.8e %.8e %.8e}.\n", @@ -3063,8 +3067,8 @@ static void STDMETHODCALLTYPE d3d10_device_OMSetBlendState(ID3D10Device1 *iface, struct d3d_device *device = impl_from_ID3D10Device(iface); struct d3d_blend_state *blend_state_object; - TRACE("iface %p, blend_state %p, blend_factor {%.8e %.8e %.8e %.8e}, sample_mask 0x%08x.\n", - iface, blend_state, blend_factor[0], blend_factor[1], blend_factor[2], blend_factor[3], sample_mask); + TRACE("iface %p, blend_state %p, blend_factor %p, sample_mask 0x%08x.\n", + iface, blend_state, blend_factor, sample_mask); blend_state_object = unsafe_impl_from_ID3D10BlendState(blend_state); d3d11_immediate_context_OMSetBlendState(&device->immediate_context.ID3D11DeviceContext_iface,

1 0

Stefan Dösinger : dxgi/tests: Windows 10 properly makes buffers read only.
by Alexandre Julliard Nov. 25, 2015

Nov. 25, 2015

Module: wine Branch: master Commit: 8492b1939501093af78bf22d0c486f2ca8a3a9f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8492b1939501093af78bf22d0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Nov 24 22:18:46 2015 +0100 dxgi/tests: Windows 10 properly makes buffers read only. 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/dxgi/tests/device.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 522d5de..4e54f4f 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -1051,7 +1051,7 @@ static void test_swapchain_parameters(void) HRESULT hr; unsigned int i, j; ULONG refcount; - DXGI_USAGE usage, expected_usage; + DXGI_USAGE usage, expected_usage, broken_usage; HWND window; static const struct { @@ -1191,13 +1191,14 @@ static void test_swapchain_parameters(void) hr = IDXGISwapChain_GetBuffer(swapchain, j, &IID_IDXGIResource, (void **)&resource); ok(SUCCEEDED(hr), "GetBuffer(%u) failed, hr %#x, test %u.\n", hr, i, j); - expected_usage = DXGI_USAGE_RENDER_TARGET_OUTPUT | DXGI_USAGE_BACK_BUFFER; - /* Buffers > 0 are supposed to be read only. This is the case except that in - * fullscreen mode the last backbuffer (BufferCount - 1) is writeable. This - * is not the case if an unsupported refresh rate is passed for some reason, - * probably because the invalid refresh rate triggers a kinda-sorta windowed - * mode. + * fullscreen mode on Windows <= 8 the last backbuffer (BufferCount - 1) is + * writeable. This is not the case if an unsupported refresh rate is passed + * for some reason, probably because the invalid refresh rate triggers a + * kinda-sorta windowed mode. + * + * On Windows 10 all buffers > 0 are read-only. Mark the earlier behavior + * broken. * * This last buffer acts as a shadow frontbuffer. Writing to it doesn't show * the draw on the screen right away (Aero on or off doesn't matter), but @@ -1206,12 +1207,15 @@ static void test_swapchain_parameters(void) * Note that if the application doesn't have focused creating a fullscreen * swapchain returns DXGI_STATUS_OCCLUDED and we get a windowed swapchain, * so use the Windowed property of the swapchain that was actually created. */ + expected_usage = DXGI_USAGE_RENDER_TARGET_OUTPUT | DXGI_USAGE_BACK_BUFFER | DXGI_USAGE_READ_ONLY; + broken_usage = DXGI_USAGE_RENDER_TARGET_OUTPUT | DXGI_USAGE_BACK_BUFFER; + if (desc.Windowed || j < tests[i].highest_accessible_buffer) - expected_usage |= DXGI_USAGE_READ_ONLY; + broken_usage |= DXGI_USAGE_READ_ONLY; hr = IDXGIResource_GetUsage(resource, &usage); ok(SUCCEEDED(hr), "Failed to get resource usage, hr %#x, test %u, buffer %u.\n", hr, i, j); - ok(usage == expected_usage, "Got usage %x, expected %x, test %u, buffer %u.\n", + ok(usage == expected_usage || broken(usage == broken_usage), "Got usage %x, expected %x, test %u, buffer %u.\n", usage, expected_usage, i, j); IDXGIResource_Release(resource);

1 0

Vincent Povirk : d3d8/tests: Accept CURSOR_SUPPRESSED in cursor flags.
by Alexandre Julliard Nov. 25, 2015

Nov. 25, 2015

Module: wine Branch: master Commit: fbe20ab62fb067f5219059f8748c98b549b58485 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbe20ab62fb067f5219059f87… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Nov 24 14:41:07 2015 -0600 d3d8/tests: Accept CURSOR_SUPPRESSED in cursor flags. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 5 +++-- include/winuser.h | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 827f144..daf45b7 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -21,6 +21,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WINVER 0x0602 /* for CURSOR_SUPPRESSED */ #define COBJMACROS #include <initguid.h> #include <d3d8.h> @@ -853,7 +854,7 @@ static void test_cursor(void) memset(&info, 0, sizeof(info)); info.cbSize = sizeof(info); ok(pGetCursorInfo(&info), "GetCursorInfo failed\n"); - ok(info.flags & CURSOR_SHOWING, "The gdi cursor is hidden (%08x)\n", info.flags); + ok(info.flags & (CURSOR_SHOWING|CURSOR_SUPPRESSED), "The gdi cursor is hidden (%08x)\n", info.flags); ok(info.hCursor == cur, "The cursor handle is %p\n", info.hCursor); /* unchanged */ /* Still hidden */ @@ -867,7 +868,7 @@ static void test_cursor(void) memset(&info, 0, sizeof(info)); info.cbSize = sizeof(info); ok(pGetCursorInfo(&info), "GetCursorInfo failed\n"); - ok(info.flags & CURSOR_SHOWING, "The gdi cursor is hidden (%08x)\n", info.flags); + ok(info.flags & (CURSOR_SHOWING|CURSOR_SUPPRESSED), "The gdi cursor is hidden (%08x)\n", info.flags); ok(info.hCursor != cur, "The cursor handle is %p\n", info.hCursor); refcount = IDirect3DDevice8_Release(device); diff --git a/include/winuser.h b/include/winuser.h index 1d3759a..50821f4 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -1533,6 +1533,7 @@ typedef struct tagCURSORINFO } CURSORINFO, *PCURSORINFO, *LPCURSORINFO; #define CURSOR_SHOWING 0x00000001 +#define CURSOR_SUPPRESSED 0x00000002 /* this is the 6 byte accel struct used in Win32 when presented to the user */ typedef struct tagACCEL

1 0

Michael Stefaniuc : ieframe: Use BOOL instead of VARIANT_BOOL in on_commandstate_change().
by Alexandre Julliard Nov. 25, 2015

Nov. 25, 2015

Module: wine Branch: master Commit: 2cebbfc5e542dc8a59a2f33ab42b36cddcae651b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cebbfc5e542dc8a59a2f33ab… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Nov 25 10:04:59 2015 +0100 ieframe: Use BOOL instead of VARIANT_BOOL in on_commandstate_change(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/dochost.c | 2 +- dlls/ieframe/ieframe.h | 2 +- dlls/ieframe/navigate.c | 4 ++-- dlls/ieframe/oleobject.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index 8f3b088..2d4261a 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -80,7 +80,7 @@ void abort_dochost_tasks(DocHost *This, task_proc_t proc) } } -void on_commandstate_change(DocHost *doc_host, LONG command, VARIANT_BOOL enable) +void on_commandstate_change(DocHost *doc_host, LONG command, BOOL enable) { DISPPARAMS dispparams; VARIANTARG params[2]; diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index ae36c65..371cb03 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -278,7 +278,7 @@ HRESULT dochost_object_available(DocHost*,IUnknown*) DECLSPEC_HIDDEN; void set_doc_state(DocHost*,READYSTATE) DECLSPEC_HIDDEN; void deactivate_document(DocHost*) DECLSPEC_HIDDEN; void create_doc_view_hwnd(DocHost*) DECLSPEC_HIDDEN; -void on_commandstate_change(DocHost*,LONG,VARIANT_BOOL) DECLSPEC_HIDDEN; +void on_commandstate_change(DocHost*,LONG,BOOL) DECLSPEC_HIDDEN; void notify_download_state(DocHost*,BOOL) DECLSPEC_HIDDEN; void update_navigation_commands(DocHost *dochost) DECLSPEC_HIDDEN; diff --git a/dlls/ieframe/navigate.c b/dlls/ieframe/navigate.c index 1b42fa5..1027313eb 100644 --- a/dlls/ieframe/navigate.c +++ b/dlls/ieframe/navigate.c @@ -885,8 +885,8 @@ static HRESULT navigate_bsc(DocHost *This, BindStatusCallback *bsc, IMoniker *mo } notify_download_state(This, TRUE); - on_commandstate_change(This, CSC_NAVIGATEBACK, VARIANT_FALSE); - on_commandstate_change(This, CSC_NAVIGATEFORWARD, VARIANT_FALSE); + on_commandstate_change(This, CSC_NAVIGATEBACK, FALSE); + on_commandstate_change(This, CSC_NAVIGATEFORWARD, FALSE); if(This->document) deactivate_document(This); diff --git a/dlls/ieframe/oleobject.c b/dlls/ieframe/oleobject.c index 3a75a71..2d3cac6 100644 --- a/dlls/ieframe/oleobject.c +++ b/dlls/ieframe/oleobject.c @@ -471,8 +471,8 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, LPOLECLIENTSITE release_client_site(This); if(!pClientSite) { - on_commandstate_change(&This->doc_host, CSC_NAVIGATEBACK, VARIANT_FALSE); - on_commandstate_change(&This->doc_host, CSC_NAVIGATEFORWARD, VARIANT_FALSE); + on_commandstate_change(&This->doc_host, CSC_NAVIGATEBACK, FALSE); + on_commandstate_change(&This->doc_host, CSC_NAVIGATEFORWARD, FALSE); if(This->doc_host.document) deactivate_document(&This->doc_host);

1 0

Nikolay Sivov : winmm: For consistency forward wReserved1 values from -W to -A calls too.
by Alexandre Julliard Nov. 25, 2015

Nov. 25, 2015

Module: wine Branch: master Commit: a360cc47d5cd33fe78ab6d67147392bff431ee4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a360cc47d5cd33fe78ab6d671… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 24 22:02:36 2015 +0300 winmm: For consistency forward wReserved1 values from -W to -A calls too. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/waveform.c | 4 ++-- dlls/winmm/winmm.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 55f48a8..93a5004 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -2629,7 +2629,7 @@ UINT WINAPI waveOutGetDevCapsA(UINT_PTR uDeviceID, LPWAVEOUTCAPSA lpCaps, wocA.dwFormats = wocW.dwFormats; wocA.wChannels = wocW.wChannels; wocA.dwSupport = wocW.dwSupport; - wocA.wReserved1 = 0; + wocA.wReserved1 = wocW.wReserved1; memcpy(lpCaps, &wocA, min(uSize, sizeof(wocA))); } return ret; @@ -3355,7 +3355,7 @@ UINT WINAPI waveInGetDevCapsA(UINT_PTR uDeviceID, LPWAVEINCAPSA lpCaps, UINT uSi sizeof(wicA.szPname), NULL, NULL ); wicA.dwFormats = wicW.dwFormats; wicA.wChannels = wicW.wChannels; - wicA.wReserved1 = 0; + wicA.wReserved1 = wicW.wReserved1; memcpy(lpCaps, &wicA, min(uSize, sizeof(wicA))); } return ret; diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index a626a79..f2d0858 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -229,7 +229,7 @@ UINT WINAPI auxGetDevCapsA(UINT_PTR uDeviceID, LPAUXCAPSA lpCaps, UINT uSize) WideCharToMultiByte( CP_ACP, 0, acW.szPname, -1, acA.szPname, sizeof(acA.szPname), NULL, NULL ); acA.wTechnology = acW.wTechnology; - acA.wReserved1 = 0; + acA.wReserved1 = acW.wReserved1; acA.dwSupport = acW.dwSupport; memcpy(lpCaps, &acA, min(uSize, sizeof(acA))); }

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard Nov. 25, 2015

Nov. 25, 2015

Module: wine Branch: master Commit: 468fa3e1252858d1afa729376aff1622c95feeb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=468fa3e1252858d1afa729376… Author: Julian Rüger <jr98(a)gmx.net> Date: Tue Nov 24 19:32:52 2015 +0100 po: Update German translation. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/de.po | 48 +++++++++++++++++------------------------------- 1 file changed, 17 insertions(+), 31 deletions(-) diff --git a/po/de.po b/po/de.po index c9de142..86d59d4 100644 --- a/po/de.po +++ b/po/de.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-11-06 12:55+0100\n" +"PO-Revision-Date: 2015-11-24 19:33+0100\n" "Last-Translator: Julian Rüger\n" "Language-Team: German\n" "Language: de\n" @@ -3191,7 +3191,7 @@ msgstr "Anzeigen" #: hhctrl.rc:43 winemac.rc:34 msgid "Hide" -msgstr "Verstecken" +msgstr "Ausblenden" #: hhctrl.rc:44 ieframe.rc:68 shdoclc.rc:167 shdoclc.rc:191 msgid "Stop" @@ -8592,58 +8592,44 @@ msgid "Wine" msgstr "Wine" #: winemac.rc:33 -#, fuzzy -#| msgid "Hide" msgid "Hide %@" -msgstr "Verstecken" +msgstr "%@ ausblenden" #: winemac.rc:35 -#, fuzzy -#| msgid "Other" msgid "Hide Others" -msgstr "Andere" +msgstr "Andere ausblenden" #: winemac.rc:36 -#, fuzzy -#| msgid "Show" msgid "Show All" -msgstr "Anzeigen" +msgstr "Alle anzeigen" #: winemac.rc:37 msgid "Quit %@" -msgstr "" +msgstr "%@ beenden" #: winemac.rc:38 msgid "Quit" -msgstr "" +msgstr "Beenden" #: winemac.rc:40 -#, fuzzy -#| msgid "&Window" msgid "Window" -msgstr "&Fenster" +msgstr "Fenster" #: winemac.rc:41 -#, fuzzy -#| msgid "&Minimize" msgid "Minimize" -msgstr "&Minimieren" +msgstr "Minimieren" #: winemac.rc:42 -#, fuzzy -#| msgid "Zoom in" msgid "Zoom" -msgstr "Ver&größern" +msgstr "Zoom" #: winemac.rc:43 msgid "Enter Full Screen" -msgstr "" +msgstr "Vollbildmodus" #: winemac.rc:44 -#, fuzzy -#| msgid "&Bring To Front" msgid "Bring All to Front" -msgstr "&In den Vordergrund holen" +msgstr "Alle in den Vordergrund holen" #: wineps.rc:31 msgid "Paper Si&ze:" @@ -11300,11 +11286,11 @@ msgstr "" #: oleview.rc:122 msgid "Show or hide the toolbar" -msgstr "Symbolleiste zeigen oder verstecken" +msgstr "Symbolleiste anzeigen oder ausblenden" #: oleview.rc:123 msgid "Show or hide the status bar" -msgstr "Statusleiste zeigen oder verstecken" +msgstr "Statusleiste anzeigen oder ausblenden" #: oleview.rc:124 msgid "Refresh all lists" @@ -11909,7 +11895,7 @@ msgstr "Entfernt Schlüssel aus den Favoriten" #: regedit.rc:166 msgid "Shows or hides the status bar" -msgstr "Zeigt oder versteckt die Statusleiste" +msgstr "Blendet die Statusleiste ein oder aus" #: regedit.rc:167 msgid "Change position of split between two panes" @@ -12199,7 +12185,7 @@ msgstr "Nach Programmstart &minimieren" #: taskmgr.rc:47 msgid "&Hide When Minimized" -msgstr "&Verstecken, wenn minimiert" +msgstr "&Ausblenden, wenn minimiert" #: taskmgr.rc:49 taskmgr.rc:257 msgid "&Show 16-bit tasks" @@ -12678,7 +12664,7 @@ msgstr "" #: taskmgr.rc:191 msgid "Hide the Task Manager when it is minimized" -msgstr "Versteckt den Task-Manager, wenn er minimiert ist" +msgstr "Blendet den Task-Manager aus, wenn er minimiert ist" #: taskmgr.rc:192 msgid "Force Task Manager to update now, regardless of Update Speed setting"

1 0

Alexandre Julliard : user32/tests: Fix a few msg test failures on Windows 7.
by Alexandre Julliard Nov. 25, 2015

Nov. 25, 2015

Module: wine Branch: master Commit: 023af7c3cbf404ecc06a273150ac5562f2f16f2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=023af7c3cbf404ecc06a27315… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 25 22:33:05 2015 +0900 user32/tests: Fix a few msg test failures on Windows 7. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index d92fbc7..b90f8d0 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -7300,7 +7300,7 @@ static const struct message WmAltPressRelease[] = { { EVENT_SYSTEM_CAPTURESTART, winevent_hook|wparam|lparam, 0, 0 }, { WM_INITMENU, sent|defwinproc }, { EVENT_SYSTEM_MENUSTART, winevent_hook|wparam|lparam, OBJID_SYSMENU, 0 }, - { WM_MENUSELECT, sent|defwinproc|wparam, MAKEWPARAM(0,MF_SYSMENU|MF_POPUP|MF_HILITE) }, + { WM_MENUSELECT, sent|defwinproc|wparam, MAKEWPARAM(0,MF_SYSMENU|MF_POPUP|MF_HILITE), 0, MAKEWPARAM(0,MF_RIGHTJUSTIFY) }, { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_SYSMENU, 1 }, { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_MENU, 0x30000001 }, /* XP */ @@ -7367,7 +7367,7 @@ static const struct message WmVkF10Seq[] = { { EVENT_SYSTEM_CAPTURESTART, winevent_hook|wparam|lparam, 0, 0 }, { WM_INITMENU, sent|defwinproc }, { EVENT_SYSTEM_MENUSTART, winevent_hook|wparam|lparam, OBJID_SYSMENU, 0 }, - { WM_MENUSELECT, sent|defwinproc|wparam, MAKEWPARAM(0,MF_SYSMENU|MF_POPUP|MF_HILITE) }, + { WM_MENUSELECT, sent|defwinproc|wparam, MAKEWPARAM(0,MF_SYSMENU|MF_POPUP|MF_HILITE), 0, MAKEWPARAM(0,MF_RIGHTJUSTIFY) }, { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_SYSMENU, 1 }, { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_F10, 0x10000001 }, /* XP */ @@ -7399,7 +7399,7 @@ static const struct message WmShiftF10Seq[] = { { HCBT_SYSCOMMAND, hook }, { WM_ENTERMENULOOP, sent|defwinproc|wparam|lparam, 0, 0 }, { WM_INITMENU, sent|defwinproc }, - { WM_MENUSELECT, sent|defwinproc|wparam, MAKEWPARAM(0,MF_SYSMENU|MF_POPUP|MF_HILITE) }, + { WM_MENUSELECT, sent|defwinproc|wparam, MAKEWPARAM(0,MF_SYSMENU|MF_POPUP|MF_HILITE), 0, MAKEWPARAM(0,MF_RIGHTJUSTIFY) }, { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_SHIFT, 0xd0000001 }, /* XP */ { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_ESCAPE, 0x10000001 }, /* XP */ { WM_CAPTURECHANGED, sent|defwinproc|wparam|lparam, 0, 0 }, @@ -9239,7 +9239,7 @@ static void test_recursive_hook(void) hook_depth = 0; GetMessageW(&msg, hook_hwnd, 0, 0); - ok(15 < max_hook_depth && max_hook_depth < 45, "max_hook_depth = %d\n", max_hook_depth); + ok(15 <= max_hook_depth && max_hook_depth < 45, "max_hook_depth = %d\n", max_hook_depth); trace("max_hook_depth = %d\n", max_hook_depth); b = UnhookWindowsHookEx(recursive_hook);

1 0