January 2017 - Wine-Commits

Julian Rüger : German translation for release 2.0-rc5
by Jeremy Newman Jan. 16, 2017

Jan. 16, 2017

Module: website Branch: master Commit: 8cab6520536e08e409ddd74401d62125df0574bd URL: http://source.winehq.org/git/website.git/?a=commit;h=8cab6520536e08e409ddd7… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Jan 16 14:32:20 2017 +0100 German translation for release 2.0-rc5 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2017011301.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/de/2017011301.xml b/news/de/2017011301.xml new file mode 100644 index 0000000..cbe3153 --- /dev/null +++ b/news/de/2017011301.xml @@ -0,0 +1,12 @@ +<news> +<date>13. Januar 2017</date> +<title>Wine 2.0-rc5 freigegeben</title> +<body> + Die Entwicklungsversion 2.0-rc5 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/2.0-rc5">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Nur Fehlerkorrekturen, da wir uns im Code-freeze befinden.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/2.0/wine-2.0-rc5.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 2.0-rc4
by Jeremy Newman Jan. 16, 2017

Jan. 16, 2017

Module: website Branch: master Commit: 8fa746d4b8859f9cc827d305e7120ee5db489d1c URL: http://source.winehq.org/git/website.git/?a=commit;h=8fa746d4b8859f9cc827d3… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Jan 16 14:31:33 2017 +0100 German translation for release 2.0-rc4 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2017010601.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/de/2017010601.xml b/news/de/2017010601.xml new file mode 100644 index 0000000..a907ef3 --- /dev/null +++ b/news/de/2017010601.xml @@ -0,0 +1,12 @@ +<news> +<date>6. Januar 2017</date> +<title>Wine 2.0-rc4 freigegeben</title> +<body> + Die Entwicklungsversion 2.0-rc4 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/2.0-rc4">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Nur Fehlerkorrekturen, da wir uns im Code-freeze befinden.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/2.0/wine-2.0-rc4.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Alexandre Julliard : Wine release 2.0-rc5
by Alexandre Julliard Jan. 13, 2017

Jan. 13, 2017

Module: website Branch: master Commit: 927715d9b343734afa76d546249ed1488c009c09 URL: http://source.winehq.org/git/website.git/?a=commit;h=927715d9b343734afa76d5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 13 21:13:06 2017 +0100 Wine release 2.0-rc5 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2017011301.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/en/2017011301.xml b/news/en/2017011301.xml new file mode 100644 index 0000000..828e55e --- /dev/null +++ b/news/en/2017011301.xml @@ -0,0 +1,12 @@ +<news> +<date>January 13, 2017</date> +<title>Wine 2.0-rc5 Released</title> +<body> + The Wine development release 2.0-rc5 is now available. + <a href="{$root}/announce/2.0-rc5">What's new</a> in this release: +<ul> + <li>Bug fixes only, we are in code freeze.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/2.0/wine-2.0-rc5.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Józef Kucia : d3d9: Return D3D_OK from UnlockRect() for not locked textures.
by Alexandre Julliard Jan. 13, 2017

Jan. 13, 2017

Module: wine Branch: master Commit: 6664601b83753ab18080b0d0001636d3b70b6cea URL: http://source.winehq.org/git/wine.git/?a=commit;h=6664601b83753ab18080b0d00… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 13 12:53:47 2017 +0100 d3d9: Return D3D_OK from UnlockRect() for not locked textures. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/surface.c | 11 ++++++++--- dlls/d3d9/tests/device.c | 3 +-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index 2f8d447..07eaf7b 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -273,11 +273,16 @@ static HRESULT WINAPI d3d9_surface_UnlockRect(IDirect3DSurface9 *iface) hr = wined3d_resource_unmap(wined3d_texture_get_resource(surface->wined3d_texture), surface->sub_resource_idx); wined3d_mutex_unlock(); - switch(hr) + if (hr == WINEDDERR_NOTLOCKED) { - case WINEDDERR_NOTLOCKED: return D3DERR_INVALIDCALL; - default: return hr; + D3DRESOURCETYPE type; + if (surface->texture) + type = IDirect3DBaseTexture9_GetType(&surface->texture->IDirect3DBaseTexture9_iface); + else + type = D3DRTYPE_SURFACE; + hr = type == D3DRTYPE_TEXTURE ? D3D_OK : D3DERR_INVALIDCALL; } + return hr; } static HRESULT WINAPI d3d9_surface_GetDC(IDirect3DSurface9 *iface, HDC *dc) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 39cc2e2..758e5c8 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -7376,7 +7376,6 @@ static void test_lockrect_invalid(void) ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x, type %s.\n", hr, resources[r].name); expected_hr = resources[r].type == D3DRTYPE_TEXTURE ? D3D_OK : D3DERR_INVALIDCALL; hr = IDirect3DSurface9_UnlockRect(surface); - todo_wine_if(resources[r].type == D3DRTYPE_TEXTURE) ok(hr == expected_hr, "Got hr %#x, expected %#x, type %s.\n", hr, expected_hr, resources[r].name); for (i = 0; i < sizeof(test_data) / sizeof(*test_data); ++i) @@ -7490,7 +7489,7 @@ static void test_lockrect_invalid(void) hr = IDirect3DTexture9_UnlockRect(texture, 0); ok(SUCCEEDED(hr), "Failed to unlock texture, hr %#x, type %s.\n", hr, resources[r].name); hr = IDirect3DTexture9_UnlockRect(texture, 0); - todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x, type %s.\n", hr, resources[r].name); + ok(hr == D3D_OK, "Got unexpected hr %#x, type %s.\n", hr, resources[r].name); hr = IDirect3DTexture9_LockRect(texture, 0, &locked_rect, &test_data[0].rect, 0); ok(hr == D3D_OK, "Got unexpected hr %#x for rect %s, type %s.\n",

1 0

Józef Kucia : d3d8: Return D3D_OK from UnlockRect() for not locked textures.
by Alexandre Julliard Jan. 13, 2017

Jan. 13, 2017

Module: wine Branch: master Commit: 8f8c2a8ade8d8b2c61c5f1614aa477900d6ab449 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f8c2a8ade8d8b2c61c5f1614… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 13 12:53:46 2017 +0100 d3d8: Return D3D_OK from UnlockRect() for not locked textures. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/surface.c | 11 ++++++++--- dlls/d3d8/tests/device.c | 3 +-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index 81ddd8f..56f9282 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -271,11 +271,16 @@ static HRESULT WINAPI d3d8_surface_UnlockRect(IDirect3DSurface8 *iface) hr = wined3d_resource_unmap(wined3d_texture_get_resource(surface->wined3d_texture), surface->sub_resource_idx); wined3d_mutex_unlock(); - switch(hr) + if (hr == WINEDDERR_NOTLOCKED) { - case WINEDDERR_NOTLOCKED: return D3DERR_INVALIDCALL; - default: return hr; + D3DRESOURCETYPE type; + if (surface->texture) + type = IDirect3DBaseTexture8_GetType(&surface->texture->IDirect3DBaseTexture8_iface); + else + type = D3DRTYPE_SURFACE; + hr = type == D3DRTYPE_TEXTURE ? D3D_OK : D3DERR_INVALIDCALL; } + return hr; } static const IDirect3DSurface8Vtbl d3d8_surface_vtbl = diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 17c9d1c..28c6af3 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -4883,7 +4883,6 @@ static void test_lockrect_invalid(void) ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x, type %s.\n", hr, resources[r].name); expected_hr = resources[r].type == D3DRTYPE_TEXTURE ? D3D_OK : D3DERR_INVALIDCALL; hr = IDirect3DSurface8_UnlockRect(surface); - todo_wine_if(resources[r].type == D3DRTYPE_TEXTURE) ok(hr == expected_hr, "Got hr %#x, expected %#x, type %s.\n", hr, expected_hr, resources[r].name); for (i = 0; i < (sizeof(valid) / sizeof(*valid)); ++i) @@ -5025,7 +5024,7 @@ static void test_lockrect_invalid(void) hr = IDirect3DTexture8_UnlockRect(texture, 0); ok(SUCCEEDED(hr), "Failed to unlock texture, hr %#x, type %s.\n", hr, resources[r].name); hr = IDirect3DTexture8_UnlockRect(texture, 0); - todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x, type %s.\n", hr, resources[r].name); + ok(hr == D3D_OK, "Got unexpected hr %#x, type %s.\n", hr, resources[r].name); hr = IDirect3DTexture8_LockRect(texture, 0, &locked_rect, &valid[0], 0); ok(hr == D3D_OK, "Got unexpected hr %#x for rect %s, type %s.\n",

1 0

Józef Kucia : d3d9/tests: Add more tests for UnlockRect().
by Alexandre Julliard Jan. 13, 2017

Jan. 13, 2017

Module: wine Branch: master Commit: 52452b271e6329deed88110f6fa18d58bea63e2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=52452b271e6329deed88110f6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 13 12:53:45 2017 +0100 d3d9/tests: Add more tests for UnlockRect(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index aa266a5..39cc2e2 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -7296,12 +7296,12 @@ static void test_lockrect_invalid(void) IDirect3DDevice9 *device; IDirect3DTexture9 *texture; IDirect3DCubeTexture9 *cube_texture; - IDirect3D9 *d3d; + HRESULT hr, expected_hr; unsigned int i, r; + IDirect3D9 *d3d; ULONG refcount; HWND window; BYTE *base; - HRESULT hr; static const struct { D3DRESOURCETYPE type; @@ -7374,6 +7374,10 @@ static void test_lockrect_invalid(void) base = locked_rect.pBits; hr = IDirect3DSurface9_UnlockRect(surface); ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x, type %s.\n", hr, resources[r].name); + expected_hr = resources[r].type == D3DRTYPE_TEXTURE ? D3D_OK : D3DERR_INVALIDCALL; + hr = IDirect3DSurface9_UnlockRect(surface); + todo_wine_if(resources[r].type == D3DRTYPE_TEXTURE) + ok(hr == expected_hr, "Got hr %#x, expected %#x, type %s.\n", hr, expected_hr, resources[r].name); for (i = 0; i < sizeof(test_data) / sizeof(*test_data); ++i) { @@ -7485,6 +7489,8 @@ static void test_lockrect_invalid(void) ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x, type %s.\n", hr, resources[r].name); hr = IDirect3DTexture9_UnlockRect(texture, 0); ok(SUCCEEDED(hr), "Failed to unlock texture, hr %#x, type %s.\n", hr, resources[r].name); + hr = IDirect3DTexture9_UnlockRect(texture, 0); + todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x, type %s.\n", hr, resources[r].name); hr = IDirect3DTexture9_LockRect(texture, 0, &locked_rect, &test_data[0].rect, 0); ok(hr == D3D_OK, "Got unexpected hr %#x for rect %s, type %s.\n", @@ -7519,6 +7525,8 @@ static void test_lockrect_invalid(void) ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x, type %s.\n", hr, resources[r].name); hr = IDirect3DCubeTexture9_UnlockRect(cube_texture, D3DCUBEMAP_FACE_NEGATIVE_X, 0); ok(SUCCEEDED(hr), "Failed to unlock texture, hr %#x, type %s.\n", hr, resources[r].name); + hr = IDirect3DCubeTexture9_UnlockRect(cube_texture, D3DCUBEMAP_FACE_NEGATIVE_X, 0); + todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x, type %s.\n", hr, resources[r].name); hr = IDirect3DCubeTexture9_LockRect(cube_texture, D3DCUBEMAP_FACE_NEGATIVE_X, 0, &locked_rect, &test_data[0].rect, 0);

1 0

Jacek Caban : secur32: Don' t change input buffer in InitializeSecurityContext.
by Alexandre Julliard Jan. 13, 2017

Jan. 13, 2017

Module: wine Branch: master Commit: c1f055d8dfda4cb4349db319a9e8734022d74895 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1f055d8dfda4cb4349db319a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 13 19:57:48 2017 +0100 secur32: Don't change input buffer in InitializeSecurityContext. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel.c | 13 ++++++++++--- dlls/secur32/tests/schannel.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 3 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index c6cc4d1..71f219c 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -732,7 +732,14 @@ schan_imp_session schan_session_for_transport(struct schan_transport* t) return t->ctx->session; } -static int schan_init_sec_ctx_get_next_buffer(const struct schan_transport *t, struct schan_buffers *s) +static int schan_init_sec_ctx_get_next_input_buffer(const struct schan_transport *t, struct schan_buffers *s) +{ + if (s->current_buffer_idx != -1) + return -1; + return schan_find_sec_buffer_idx(s->desc, 0, SECBUFFER_TOKEN); +} + +static int schan_init_sec_ctx_get_next_output_buffer(const struct schan_transport *t, struct schan_buffers *s) { if (s->current_buffer_idx == -1) { @@ -884,9 +891,9 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( ctx->req_ctx_attr = fContextReq; transport.ctx = ctx; - init_schan_buffers(&transport.in, pInput, schan_init_sec_ctx_get_next_buffer); + init_schan_buffers(&transport.in, pInput, schan_init_sec_ctx_get_next_input_buffer); transport.in.limit = expected_size; - init_schan_buffers(&transport.out, pOutput, schan_init_sec_ctx_get_next_buffer); + init_schan_buffers(&transport.out, pOutput, schan_init_sec_ctx_get_next_output_buffer); schan_imp_set_session_transport(ctx->session, &transport); /* Perform the TLS handshake */ diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 4b8adc4..ead0e8c 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -636,6 +636,36 @@ static int receive_data(SOCKET sock, SecBuffer *buf) return received; } +static void test_InitializeSecurityContext(void) +{ + SCHANNEL_CRED cred; + CredHandle cred_handle; + CtxtHandle context; + SECURITY_STATUS status; + SecBuffer out_buffer = {1000, SECBUFFER_TOKEN, NULL}; + SecBuffer in_buffer = {0, SECBUFFER_EMPTY, NULL}; + SecBufferDesc out_buffers = {SECBUFFER_VERSION, 1, &out_buffer}; + SecBufferDesc in_buffers = {SECBUFFER_VERSION, 1, &in_buffer}; + ULONG attrs; + + init_cred(&cred); + cred.grbitEnabledProtocols = SP_PROT_TLS1_CLIENT; + cred.dwFlags = SCH_CRED_NO_DEFAULT_CREDS|SCH_CRED_MANUAL_CRED_VALIDATION; + status = AcquireCredentialsHandleA(NULL, (SEC_CHAR *)UNISP_NAME_A, SECPKG_CRED_OUTBOUND, NULL, + &cred, NULL, NULL, &cred_handle, NULL); + ok(status == SEC_E_OK, "AcquireCredentialsHandleA failed: %08x\n", status); + if (status != SEC_E_OK) return; + + status = InitializeSecurityContextA(&cred_handle, NULL, (SEC_CHAR *)"localhost", + ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM|ISC_REQ_ALLOCATE_MEMORY, + 0, 0, &in_buffers, 0, &context, &out_buffers, &attrs, NULL); + ok(status == SEC_I_CONTINUE_NEEDED, "Expected SEC_I_CONTINUE_NEEDED, got %08x\n", status); + + FreeContextBuffer(out_buffer.pvBuffer); + DeleteSecurityContext(&context); + FreeCredentialsHandle(&cred_handle); +} + static void test_communication(void) { int ret; @@ -940,5 +970,6 @@ START_TEST(schannel) test_cread_attrs(); testAcquireSecurityContext(); + test_InitializeSecurityContext(); test_communication(); }

1 0

Józef Kucia : d3d8/tests: Add more tests for UnlockRect().
by Alexandre Julliard Jan. 13, 2017

Jan. 13, 2017

Module: wine Branch: master Commit: 16df0ea08afeb3970729d82176b51c0795559f48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16df0ea08afeb3970729d8217… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 13 12:53:44 2017 +0100 d3d8/tests: Add more tests for UnlockRect(). Signed-off-by: Józef Kucia <jkucia(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 | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 22667ec..17c9d1c 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -4808,12 +4808,12 @@ static void test_lockrect_invalid(void) IDirect3DCubeTexture8 *cube_texture; D3DLOCKED_RECT locked_rect; IDirect3DDevice8 *device; + HRESULT hr, expected_hr; IDirect3D8 *d3d8; unsigned int i, r; ULONG refcount; HWND window; BYTE *base; - HRESULT hr; unsigned int offset, expected_offset; static const struct { @@ -4875,11 +4875,16 @@ static void test_lockrect_invalid(void) default: break; } + hr = IDirect3DSurface8_LockRect(surface, &locked_rect, NULL, 0); ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x, type %s.\n", hr, resources[r].name); base = locked_rect.pBits; hr = IDirect3DSurface8_UnlockRect(surface); ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x, type %s.\n", hr, resources[r].name); + expected_hr = resources[r].type == D3DRTYPE_TEXTURE ? D3D_OK : D3DERR_INVALIDCALL; + hr = IDirect3DSurface8_UnlockRect(surface); + todo_wine_if(resources[r].type == D3DRTYPE_TEXTURE) + ok(hr == expected_hr, "Got hr %#x, expected %#x, type %s.\n", hr, expected_hr, resources[r].name); for (i = 0; i < (sizeof(valid) / sizeof(*valid)); ++i) { @@ -5019,6 +5024,8 @@ static void test_lockrect_invalid(void) ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x, type %s.\n", hr, resources[r].name); hr = IDirect3DTexture8_UnlockRect(texture, 0); ok(SUCCEEDED(hr), "Failed to unlock texture, hr %#x, type %s.\n", hr, resources[r].name); + hr = IDirect3DTexture8_UnlockRect(texture, 0); + todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x, type %s.\n", hr, resources[r].name); hr = IDirect3DTexture8_LockRect(texture, 0, &locked_rect, &valid[0], 0); ok(hr == D3D_OK, "Got unexpected hr %#x for rect %s, type %s.\n", @@ -5054,6 +5061,8 @@ static void test_lockrect_invalid(void) ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x, type %s.\n", hr, resources[r].name); hr = IDirect3DCubeTexture8_UnlockRect(cube_texture, D3DCUBEMAP_FACE_NEGATIVE_X, 0); ok(SUCCEEDED(hr), "Failed to unlock texture, hr %#x, type %s.\n", hr, resources[r].name); + hr = IDirect3DCubeTexture8_UnlockRect(cube_texture, D3DCUBEMAP_FACE_NEGATIVE_X, 0); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x, type %s.\n", hr, resources[r].name); hr = IDirect3DCubeTexture8_LockRect(cube_texture, D3DCUBEMAP_FACE_NEGATIVE_X, 0, &locked_rect, &valid[0], 0);

1 0

Ken Thomases : winemac: Ignore an additional expected error in the clipboard pipe communication code.
by Alexandre Julliard Jan. 13, 2017

Jan. 13, 2017

Module: wine Branch: master Commit: 52e20d82f88785c3b49a7616ea1d6c0ae5bcf38d URL: http://source.winehq.org/git/wine.git/?a=commit;h=52e20d82f88785c3b49a7616e… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Jan 13 13:36:22 2017 -0600 winemac: Ignore an additional expected error in the clipboard pipe communication code. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/clipboard.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 49a3ed3..7115c3b 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -2141,7 +2141,8 @@ void CDECL macdrv_UpdateClipboard(void) else { result = GetLastError(); - if (result != ERROR_BROKEN_PIPE && result != ERROR_OPERATION_ABORTED) + if (result != ERROR_BROKEN_PIPE && result != ERROR_OPERATION_ABORTED && + result != ERROR_HANDLES_CLOSED) WARN("failed to read from pipe: %d\n", result); }

1 0

Ken Thomases : winemac: Export HTML Format clipboard data to the public.html pasteboard type.
by Alexandre Julliard Jan. 13, 2017

Jan. 13, 2017

Module: wine Branch: master Commit: 961703427dc107760cbd0d5101f59ea777a0b526 URL: http://source.winehq.org/git/wine.git/?a=commit;h=961703427dc107760cbd0d510… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Jan 13 13:36:21 2017 -0600 winemac: Export HTML Format clipboard data to the public.html pasteboard type. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/clipboard.c | 68 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 67 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index fdd1110..49a3ed3 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -82,6 +82,7 @@ static CFDataRef export_bitmap_to_bmp(HANDLE data); static CFDataRef export_dib_to_bmp(HANDLE data); static CFDataRef export_enhmetafile(HANDLE data); static CFDataRef export_hdrop_to_filenames(HANDLE data); +static CFDataRef export_html(HANDLE data); static CFDataRef export_metafilepict(HANDLE data); static CFDataRef export_text_to_utf8(HANDLE data); static CFDataRef export_unicodetext_to_utf8(HANDLE data); @@ -186,7 +187,7 @@ static const struct { wszJFIF, CFSTR("public.jpeg"), import_clipboard_data, export_clipboard_data }, { wszPNG, CFSTR("public.png"), import_clipboard_data, export_clipboard_data }, { wszHTMLFormat, NULL, import_clipboard_data, export_clipboard_data }, - { wszHTMLFormat, CFSTR("public.html"), import_html, NULL, TRUE }, + { wszHTMLFormat, CFSTR("public.html"), import_html, export_html, TRUE }, { CFSTR_SHELLURLW, CFSTR("public.url"), import_utf8_to_text, export_text_to_utf8 }, }; @@ -522,6 +523,28 @@ static HANDLE create_bitmap_from_dib(HANDLE dib) /************************************************************************** + * get_html_description_field + * + * Find the value of a field in an HTML Format description. + */ +static const char* get_html_description_field(const char* data, const char* keyword) +{ + const char* pos = data; + + while (pos && *pos && *pos != '<') + { + if (memcmp(pos, keyword, strlen(keyword)) == 0) + return pos + strlen(keyword); + + pos = strchr(pos, '\n'); + if (pos) pos++; + } + + return NULL; +} + + +/************************************************************************** * import_clipboard_data * * Generic import clipboard data routine. @@ -1141,6 +1164,49 @@ done: /************************************************************************** + * export_html + * + * Export HTML Format to public.html data. + * + * FIXME: We should attempt to add an <a base> tag and convert windows paths. + */ +static CFDataRef export_html(HANDLE handle) +{ + CFDataRef ret; + const char *data, *field_value; + int fragmentstart, fragmentend; + + data = GlobalLock(handle); + + /* read the important fields */ + field_value = get_html_description_field(data, "StartFragment:"); + if (!field_value) + { + ERR("Couldn't find StartFragment value\n"); + goto failed; + } + fragmentstart = atoi(field_value); + + field_value = get_html_description_field(data, "EndFragment:"); + if (!field_value) + { + ERR("Couldn't find EndFragment value\n"); + goto failed; + } + fragmentend = atoi(field_value); + + /* export only the fragment */ + ret = CFDataCreate(NULL, (const UInt8*)&data[fragmentstart], fragmentend - fragmentstart); + GlobalUnlock(handle); + return ret; + +failed: + GlobalUnlock(handle); + return NULL; +} + + +/************************************************************************** * export_metafilepict * * Export a metafile to data.

1 0