August 2016 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Use wined3d_resource_map() in d3d_vertex_buffer7_Lock().
by Alexandre Julliard 29 Aug '16

29 Aug '16

Module: wine Branch: master Commit: 7834f00be5a1b0e764de3e85bc3146945bbdf330 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7834f00be5a1b0e764de3e85b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 29 10:49:00 2016 +0200 wined3d: Use wined3d_resource_map() in d3d_vertex_buffer7_Lock(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/vertexbuffer.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index a88d5b5..a0cc3f6 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -227,6 +227,7 @@ static HRESULT WINAPI d3d_vertex_buffer7_Lock(IDirect3DVertexBuffer7 *iface, struct d3d_vertex_buffer *buffer = impl_from_IDirect3DVertexBuffer7(iface); struct wined3d_resource_desc wined3d_desc; struct wined3d_resource *wined3d_resource; + struct wined3d_map_desc wined3d_map_desc; HRESULT hr; DWORD wined3d_flags = 0; @@ -273,7 +274,9 @@ static HRESULT WINAPI d3d_vertex_buffer7_Lock(IDirect3DVertexBuffer7 *iface, *data_size = wined3d_desc.size; } - hr = wined3d_buffer_map(buffer->wined3d_buffer, 0, 0, (BYTE **)data, wined3d_flags); + hr = wined3d_resource_map(wined3d_buffer_get_resource(buffer->wined3d_buffer), + 0, &wined3d_map_desc, NULL, wined3d_flags); + *data = wined3d_map_desc.data; wined3d_mutex_unlock();

1 0

Henri Verbeet : ddraw: Use wined3d_resource_unmap() in d3d_vertex_buffer7_Unlock().
by Alexandre Julliard 29 Aug '16

29 Aug '16

Module: wine Branch: master Commit: bd7d8fc04f0c59241863c1518cbabf1a947c9f74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd7d8fc04f0c59241863c1518… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 29 10:49:01 2016 +0200 ddraw: Use wined3d_resource_unmap() in d3d_vertex_buffer7_Unlock(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/vertexbuffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index a0cc3f6..797afe2 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -309,7 +309,7 @@ static HRESULT WINAPI d3d_vertex_buffer7_Unlock(IDirect3DVertexBuffer7 *iface) TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - wined3d_buffer_unmap(buffer->wined3d_buffer); + wined3d_resource_unmap(wined3d_buffer_get_resource(buffer->wined3d_buffer), 0); wined3d_mutex_unlock(); return D3D_OK;

1 0

Henri Verbeet : d3d8: Use wined3d_resource_map() in d3d8_vertexbuffer_Lock ().
by Alexandre Julliard 29 Aug '16

29 Aug '16

Module: wine Branch: master Commit: 53b21e0e9cb23c2915c8ce7ff79af41e4cd10544 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53b21e0e9cb23c2915c8ce7ff… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 29 10:49:02 2016 +0200 d3d8: Use wined3d_resource_map() in d3d8_vertexbuffer_Lock(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/buffer.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index aa19314..4826fac 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -182,14 +182,20 @@ static HRESULT WINAPI d3d8_vertexbuffer_Lock(IDirect3DVertexBuffer8 *iface, UINT BYTE **data, DWORD flags) { struct d3d8_vertexbuffer *buffer = impl_from_IDirect3DVertexBuffer8(iface); + struct wined3d_map_desc wined3d_map_desc; + struct wined3d_box wined3d_box = {0}; HRESULT hr; TRACE("iface %p, offset %u, size %u, data %p, flags %#x.\n", iface, offset, size, data, flags); + wined3d_box.left = offset; + wined3d_box.right = offset + size; wined3d_mutex_lock(); - hr = wined3d_buffer_map(buffer->wined3d_buffer, offset, size, data, flags); + hr = wined3d_resource_map(wined3d_buffer_get_resource(buffer->wined3d_buffer), + 0, &wined3d_map_desc, &wined3d_box, flags); wined3d_mutex_unlock(); + *data = wined3d_map_desc.data; return hr; }

1 0

Henri Verbeet : d3d8: Use wined3d_resource_unmap() in d3d8_vertexbuffer_Unlock().
by Alexandre Julliard 29 Aug '16

29 Aug '16

Module: wine Branch: master Commit: 9853b59cd760d397963f6e1e4040c133ee001803 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9853b59cd760d397963f6e1e4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 29 10:49:03 2016 +0200 d3d8: Use wined3d_resource_unmap() in d3d8_vertexbuffer_Unlock(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/buffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index 4826fac..7d0421d 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -207,7 +207,7 @@ static HRESULT WINAPI d3d8_vertexbuffer_Unlock(IDirect3DVertexBuffer8 *iface) TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - wined3d_buffer_unmap(buffer->wined3d_buffer); + wined3d_resource_unmap(wined3d_buffer_get_resource(buffer->wined3d_buffer), 0); wined3d_mutex_unlock(); return D3D_OK;

1 0

Henri Verbeet : d3d8: Use wined3d_resource_map() in d3d8_indexbuffer_Lock( ).
by Alexandre Julliard 29 Aug '16

29 Aug '16

Module: wine Branch: master Commit: 9a82f0efa22d45460583f6b2824560ff204289dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a82f0efa22d45460583f6b28… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 29 10:49:04 2016 +0200 d3d8: Use wined3d_resource_map() in d3d8_indexbuffer_Lock(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/buffer.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index 7d0421d..2404506 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -465,14 +465,20 @@ static HRESULT WINAPI d3d8_indexbuffer_Lock(IDirect3DIndexBuffer8 *iface, UINT o BYTE **data, DWORD flags) { struct d3d8_indexbuffer *buffer = impl_from_IDirect3DIndexBuffer8(iface); + struct wined3d_map_desc wined3d_map_desc; + struct wined3d_box wined3d_box = {0}; HRESULT hr; TRACE("iface %p, offset %u, size %u, data %p, flags %#x.\n", iface, offset, size, data, flags); + wined3d_box.left = offset; + wined3d_box.right = offset + size; wined3d_mutex_lock(); - hr = wined3d_buffer_map(buffer->wined3d_buffer, offset, size, data, flags); + hr = wined3d_resource_map(wined3d_buffer_get_resource(buffer->wined3d_buffer), + 0, &wined3d_map_desc, &wined3d_box, flags); wined3d_mutex_unlock(); + *data = wined3d_map_desc.data; return hr; }

1 0

Henri Verbeet : d3d8: Use wined3d_resource_unmap() in d3d8_indexbuffer_Unlock().
by Alexandre Julliard 29 Aug '16

29 Aug '16

Module: wine Branch: master Commit: 743a47d3c4f5a809fc5de9f72a4a93d663e3171a URL: http://source.winehq.org/git/wine.git/?a=commit;h=743a47d3c4f5a809fc5de9f72… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 29 10:49:05 2016 +0200 d3d8: Use wined3d_resource_unmap() in d3d8_indexbuffer_Unlock(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/buffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index 2404506..8116c1b 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -490,7 +490,7 @@ static HRESULT WINAPI d3d8_indexbuffer_Unlock(IDirect3DIndexBuffer8 *iface) TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - wined3d_buffer_unmap(buffer->wined3d_buffer); + wined3d_resource_unmap(wined3d_buffer_get_resource(buffer->wined3d_buffer), 0); wined3d_mutex_unlock(); return D3D_OK;

1 0

Austin English : apphelp: Add SdbGetAppPatchDir stub.
by Alexandre Julliard 29 Aug '16

29 Aug '16

Module: wine Branch: master Commit: 48091559b50c28b2a9fd9a6cbc390363d38d24b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48091559b50c28b2a9fd9a6cb… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Jun 26 21:10:08 2016 -0500 apphelp: Add SdbGetAppPatchDir stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/apphelp/apphelp.c | 6 ++++++ dlls/apphelp/apphelp.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/apphelp/apphelp.c b/dlls/apphelp/apphelp.c index 64dcd87..0ff74aa 100644 --- a/dlls/apphelp/apphelp.c +++ b/dlls/apphelp/apphelp.c @@ -111,3 +111,9 @@ void WINAPI SdbCloseDatabase(PDB pdb) { FIXME("stub: %p\n", pdb); } + +void WINAPI SdbGetAppPatchDir(HSDB hsdb, WCHAR *path, DWORD size) +{ + FIXME("stub: %p %p %d\n", hsdb, path, size); + if (size && path) *path = 0; +} diff --git a/dlls/apphelp/apphelp.spec b/dlls/apphelp/apphelp.spec index a658e5c..2b0e0c6 100644 --- a/dlls/apphelp/apphelp.spec +++ b/dlls/apphelp/apphelp.spec @@ -49,7 +49,7 @@ @ stub SdbFreeFileInfo @ stub SdbFreeFlagInfo @ stub SdbGetAppCompatDataSize -@ stub SdbGetAppPatchDir +@ stdcall SdbGetAppPatchDir(long ptr long) @ stub SdbGetBinaryTagData @ stub SdbGetDatabaseID @ stub SdbGetDatabaseInformation

1 0

Józef Kucia : d3d8/tests: Prefer higher resolutions in test_reset().
by Alexandre Julliard 26 Aug '16

26 Aug '16

Module: wine Branch: master Commit: 4bc4e431c852ce3589b6f8c262b92e5f6ab22348 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bc4e431c852ce3589b6f8c26… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 25 12:34:19 2016 +0200 d3d8/tests: Prefer higher resolutions in test_reset(). 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 | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 2f9c267..530ef00 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -22,6 +22,7 @@ */ #define WINVER 0x0602 /* for CURSOR_SUPPRESSED */ +#include <stdlib.h> #define COBJMACROS #include <initguid.h> #include <d3d8.h> @@ -1269,6 +1270,21 @@ static void test_display_modes(void) IDirect3D8_Release(d3d); } +struct mode +{ + unsigned int w; + unsigned int h; +}; + +static int compare_mode(const void *a, const void *b) +{ + const struct mode *mode_a = a; + const struct mode *mode_b = b; + unsigned int w = mode_a->w - mode_b->w; + unsigned int h = mode_b->h - mode_b->h; + return abs(w) >= abs(h) ? -w : -h; +} + static void test_reset(void) { UINT width, orig_width = GetSystemMetrics(SM_CXSCREEN); @@ -1303,11 +1319,7 @@ static void test_reset(void) D3DVSD_END(), }; - struct - { - UINT w; - UINT h; - } *modes = NULL; + struct mode *modes = NULL; window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL); @@ -1358,6 +1370,9 @@ static void test_reset(void) goto cleanup; } + /* Prefer higher resolutions. */ + qsort(modes, mode_count, sizeof(*modes), compare_mode); + i = 0; if (modes[i].w == orig_width && modes[i].h == orig_height) ++i;

1 0

Nikolay Sivov : urlmon: Added proxy/stubs for IBindHost.
by Alexandre Julliard 26 Aug '16

26 Aug '16

Module: wine Branch: master Commit: 392e0c9c7a5032b4d88225cef1983fcefee085c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=392e0c9c7a5032b4d88225cef… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 26 15:29:12 2016 +0300 urlmon: Added proxy/stubs for IBindHost. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/usrmarshal.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/urlmon/usrmarshal.c b/dlls/urlmon/usrmarshal.c index d669918..e15c91b 100644 --- a/dlls/urlmon/usrmarshal.c +++ b/dlls/urlmon/usrmarshal.c @@ -53,35 +53,35 @@ HRESULT __RPC_STUB IWinInetInfo_QueryOption_Stub(IWinInetInfo* This, } HRESULT CALLBACK IBindHost_MonikerBindToStorage_Proxy(IBindHost* This, - IMoniker *pMk, IBindCtx *pBC, IBindStatusCallback *pBSC, - REFIID riid, void **ppvObj) + IMoniker *moniker, IBindCtx *bc, IBindStatusCallback *bsc, + REFIID riid, void **obj) { - FIXME("stub\n"); - return E_NOTIMPL; + TRACE("(%p %p %p %p %s %p)\n", This, moniker, bc, bsc, debugstr_guid(riid), obj); + return IBindHost_RemoteMonikerBindToStorage_Proxy(This, moniker, bc, bsc, riid, (IUnknown**)obj); } HRESULT __RPC_STUB IBindHost_MonikerBindToStorage_Stub(IBindHost* This, - IMoniker *pMk, IBindCtx *pBC, IBindStatusCallback *pBSC, - REFIID riid, IUnknown **ppvObj) + IMoniker *moniker, IBindCtx *bc, IBindStatusCallback *bsc, + REFIID riid, IUnknown **obj) { - FIXME("stub\n"); - return E_NOTIMPL; + TRACE("(%p %p %p %p %s %p)\n", This, moniker, bc, bsc, debugstr_guid(riid), obj); + return IBindHost_MonikerBindToStorage(This, moniker, bc, bsc, riid, (void**)obj); } HRESULT CALLBACK IBindHost_MonikerBindToObject_Proxy(IBindHost* This, - IMoniker *pMk, IBindCtx *pBC, IBindStatusCallback *pBSC, - REFIID riid, void **ppvObj) + IMoniker *moniker, IBindCtx *bc, IBindStatusCallback *bsc, + REFIID riid, void **obj) { - FIXME("stub\n"); - return E_NOTIMPL; + TRACE("(%p %p %p %p %s %p)\n", This, moniker, bc, bsc, debugstr_guid(riid), obj); + return IBindHost_RemoteMonikerBindToObject_Proxy(This, moniker, bc, bsc, riid, (IUnknown**)obj); } HRESULT __RPC_STUB IBindHost_MonikerBindToObject_Stub(IBindHost* This, - IMoniker *pMk, IBindCtx *pBC, IBindStatusCallback *pBSC, - REFIID riid, IUnknown **ppvObj) + IMoniker *moniker, IBindCtx *bc, IBindStatusCallback *bsc, + REFIID riid, IUnknown **obj) { - FIXME("stub\n"); - return E_NOTIMPL; + TRACE("(%p %p %p %p %s %p)\n", This, moniker, bc, bsc, debugstr_guid(riid), obj); + return IBindHost_MonikerBindToObject(This, moniker, bc, bsc, riid, (void**)obj); } HRESULT CALLBACK IBindStatusCallbackEx_GetBindInfoEx_Proxy(

1 0

Nikolay Sivov : dwrite: Fail stream creation on file mapping failure.
by Alexandre Julliard 26 Aug '16

26 Aug '16

Module: wine Branch: master Commit: 1c7a1f8f27c1669f4f30193fe96ba424d69a466a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c7a1f8f27c1669f4f30193fe… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 26 13:47:17 2016 +0300 dwrite: Fail stream creation on file mapping failure. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index cc82c26..e529d6f 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -4501,6 +4501,10 @@ static HRESULT WINAPI localfontfileloader_CreateStreamFromKey(IDWriteLocalFontFi file_ptr = MapViewOfFile(mapping, FILE_MAP_READ, 0, 0, 0); CloseHandle(mapping); + if (!file_ptr) { + ERR("mapping failed, file size %s, error %d\n", wine_dbgstr_longlong(size.QuadPart), GetLastError()); + return E_FAIL; + } stream = heap_alloc(sizeof(*stream)); if (!stream) {

1 0