September 2017 - Wine-Commits

Ihsan Akmal : include: Add missing dxgi.idl constants.
by Alexandre Julliard Sept. 26, 2017

Sept. 26, 2017

Module: wine Branch: master Commit: c553e26f779bf2a170caed4e4c0fe22b84c6e043 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c553e26f779bf2a170caed4e4… Author: Ihsan Akmal <ihsanapps(a)gmail.com> Date: Tue Sep 26 17:21:21 2017 +0200 include: Add missing dxgi.idl constants. Signed-off-by: Ihsan Akmal <ihsanapps(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dxgi.idl | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/dxgi.idl b/include/dxgi.idl index b2e53e3..0626315 100644 --- a/include/dxgi.idl +++ b/include/dxgi.idl @@ -45,6 +45,16 @@ const DXGI_USAGE DXGI_USAGE_UNORDERED_ACCESS = 0x400L; const UINT DXGI_ENUM_MODES_INTERLACED = 1; const UINT DXGI_ENUM_MODES_SCALING = 2; +const UINT DXGI_RESOURCE_PRIORITY_MINIMUM = 0x28000000; +const UINT DXGI_RESOURCE_PRIORITY_LOW = 0x50000000; +const UINT DXGI_RESOURCE_PRIORITY_NORMAL = 0x78000000; +const UINT DXGI_RESOURCE_PRIORITY_HIGH = 0xa0000000; +const UINT DXGI_RESOURCE_PRIORITY_MAXIMUM = 0xc8000000; + +const UINT DXGI_MAP_READ = 0x1; +const UINT DXGI_MAP_WRITE = 0x2; +const UINT DXGI_MAP_DISCARD = 0x4; + typedef enum DXGI_SWAP_EFFECT { DXGI_SWAP_EFFECT_DISCARD = 0, DXGI_SWAP_EFFECT_SEQUENTIAL = 1, @@ -297,6 +307,8 @@ cpp_quote("#define DXGI_PRESENT_DO_NOT_WAIT __MSABI_LONG(0x00000008U) cpp_quote("#define DXGI_PRESENT_STEREO_PREFER_RIGHT __MSABI_LONG(0x00000010U)") cpp_quote("#define DXGI_PRESENT_STEREO_TEMPORARY_MONO __MSABI_LONG(0x00000020U)") cpp_quote("#define DXGI_PRESENT_RESTRICT_TO_OUTPUT __MSABI_LONG(0x00000040U)") +cpp_quote("#define DXGI_PRESENT_USE_DURATION __MSABI_LONG(0x00000100U)") +cpp_quote("#define DXGI_PRESENT_ALLOW_TEARING __MSABI_LONG(0x00000200U)") [ object,

1 0

Henri Verbeet : d2d1: Implement d2d_linear_gradient_brush_GetOpacity().
by Alexandre Julliard Sept. 26, 2017

Sept. 26, 2017

Module: wine Branch: master Commit: c1cba92cc0bb7c5d798e883ebdceee3070ef6b16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1cba92cc0bb7c5d798e883eb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 26 12:22:37 2017 +0200 d2d1: Implement d2d_linear_gradient_brush_GetOpacity(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/brush.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index b5f7418..18d9ddf 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -403,9 +403,11 @@ static void STDMETHODCALLTYPE d2d_linear_gradient_brush_SetTransform(ID2D1Linear static float STDMETHODCALLTYPE d2d_linear_gradient_brush_GetOpacity(ID2D1LinearGradientBrush *iface) { - FIXME("iface %p stub!\n", iface); + struct d2d_brush *brush = impl_from_ID2D1LinearGradientBrush(iface); - return 0.0f; + TRACE("iface %p.\n", iface); + + return brush->opacity; } static void STDMETHODCALLTYPE d2d_linear_gradient_brush_GetTransform(ID2D1LinearGradientBrush *iface,

1 0

Nikolay Sivov : shell32: Silence fixme for tested case.
by Alexandre Julliard Sept. 26, 2017

Sept. 26, 2017

Module: wine Branch: master Commit: 76d46fa3234a5b6eb5042b683b283942e6b99c58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76d46fa3234a5b6eb5042b683… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 26 12:57:52 2017 +0300 shell32: Silence fixme for tested case. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shelldispatch.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index 57170ee..644f67be 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -1148,6 +1148,8 @@ static HRESULT WINAPI FolderItemsImpl_Item(FolderItems3 *iface, VARIANT index, F default: FIXME("Index type %d not handled.\n", V_VT(&index)); + /* fall through */ + case VT_EMPTY: return E_NOTIMPL; }

1 0

Alexandre Julliard : server: No longer store the mapping object in the dll structure.
by Alexandre Julliard Sept. 26, 2017

Sept. 26, 2017

Module: wine Branch: master Commit: ab182dbf06412283b613f87dee488d12fc6045c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab182dbf06412283b613f87de… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 26 15:00:04 2017 +0200 server: No longer store the mapping object in the dll structure. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 4 ---- include/wine/server_protocol.h | 12 +++++------- server/file.h | 1 - server/mapping.c | 6 ------ server/process.c | 19 +++---------------- server/process.h | 2 -- server/protocol.def | 7 ++----- server/request.h | 11 ++++------- server/trace.c | 7 ++----- 9 files changed, 16 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ab182dbf06412283b613f…

1 0

Alexandre Julliard : server: Remove no longer used is_same_file() function.
by Alexandre Julliard Sept. 26, 2017

Sept. 26, 2017

Module: wine Branch: master Commit: bc39a7460e2e895a04ffa03eaba8907bc676d2f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc39a7460e2e895a04ffa03ea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 26 14:07:58 2017 +0200 server: Remove no longer used is_same_file() function. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/file.c | 6 ------ server/file.h | 1 - 2 files changed, 7 deletions(-) diff --git a/server/file.c b/server/file.c index 3809012..39c8150 100644 --- a/server/file.c +++ b/server/file.c @@ -265,12 +265,6 @@ done: return obj; } -/* check if two file objects point to the same file */ -int is_same_file( struct file *file1, struct file *file2 ) -{ - return is_same_file_fd( file1->fd, file2->fd ); -} - static void file_dump( struct object *obj, int verbose ) { struct file *file = (struct file *)obj; diff --git a/server/file.h b/server/file.h index 512b03a..06ea233 100644 --- a/server/file.h +++ b/server/file.h @@ -136,7 +136,6 @@ extern const char *get_timeout_str( timeout_t timeout ); extern struct file *get_file_obj( struct process *process, obj_handle_t handle, unsigned int access ); extern int get_file_unix_fd( struct file *file ); -extern int is_same_file( struct file *file1, struct file *file2 ); extern struct file *create_file_for_fd( int fd, unsigned int access, unsigned int sharing ); extern struct file *create_file_for_fd_obj( struct fd *fd, unsigned int access, unsigned int sharing ); extern void file_set_error(void);

1 0

Nikolay Sivov : gdi32: Pick first charmap if none was selected using preferred encoding.
by Alexandre Julliard Sept. 26, 2017

Sept. 26, 2017

Module: wine Branch: master Commit: d82321006de92dcd74465c905121618a76eae76a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d82321006de92dcd74465c905… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 26 10:13:47 2017 +0100 gdi32: Pick first charmap if none was selected using preferred encoding. FreeType 2.8.1 has similar logic removed from WinFNT module, that always pre-selected first charmap. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 83ca6e2..346e21d 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -5143,6 +5143,13 @@ static FT_Encoding pick_charmap( FT_Face face, int charset ) if (select_charmap( face, *encs )) break; encs++; } + + if (!face->charmap && face->num_charmaps) + { + if (!pFT_Set_Charmap(face, face->charmaps[0])) + return face->charmap->encoding; + } + return *encs; }

1 0

Henri Verbeet : d2d1: Implement linear gradient brushes.
by Alexandre Julliard Sept. 26, 2017

Sept. 26, 2017

Module: wine Branch: master Commit: e29e627064d8172bfeaafc93c15cb531ac1d09f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e29e627064d8172bfeaafc93c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 26 12:22:39 2017 +0200 d2d1: Implement linear gradient brushes. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/brush.c | 60 +++++++++--- dlls/d2d1/d2d1_private.h | 17 +++- dlls/d2d1/render_target.c | 213 +++++++++++++++++++++++++++++++++---------- dlls/d2d1/tests/d2d1.c | 228 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 451 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e29e627064d8172bfeaaf…

1 0

Alex Henrie : include: Add D3D_DISABLE_9EX checks to d3d9.h.
by Alexandre Julliard Sept. 26, 2017

Sept. 26, 2017

Module: wine Branch: master Commit: 7abed27908f637fe738cffa1e574aa1db3907d89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7abed27908f637fe738cffa1e… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Sep 26 17:21:20 2017 +0200 include: Add D3D_DISABLE_9EX checks to d3d9.h. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d9.h | 1121 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 569 insertions(+), 552 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7abed27908f637fe738cf…

1 0

Henri Verbeet : d2d1: Implement d2d_d3d_render_target_CreateRadialGradientBrush().
by Alexandre Julliard Sept. 26, 2017

Sept. 26, 2017

Module: wine Branch: master Commit: 7c430c5ce0b3f5986f21c22b98820cdd3b75531f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c430c5ce0b3f5986f21c22b9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 26 12:22:40 2017 +0200 d2d1: Implement d2d_d3d_render_target_CreateRadialGradientBrush(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/brush.c | 197 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/d2d1/d2d1_private.h | 12 ++- dlls/d2d1/render_target.c | 25 ++++-- 3 files changed, 222 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7c430c5ce0b3f5986f21c…

1 0

Henri Verbeet : d2d1: Create shader resource views for gradient stop collections.
by Alexandre Julliard Sept. 26, 2017

Sept. 26, 2017

Module: wine Branch: master Commit: 24814f8f4a13d231872b7bb1c3395165f0a6baa5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24814f8f4a13d231872b7bb1c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 26 12:22:38 2017 +0200 d2d1: Create shader resource views for gradient stop collections. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/brush.c | 68 +++++++++++++++++++++++++++++++++++++++++++++-- dlls/d2d1/d2d1_private.h | 3 ++- dlls/d2d1/render_target.c | 3 ++- 3 files changed, 70 insertions(+), 4 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 18d9ddf..1fc00e9 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -68,6 +68,7 @@ static ULONG STDMETHODCALLTYPE d2d_gradient_Release(ID2D1GradientStopCollection if (!refcount) { HeapFree(GetProcessHeap(), 0, gradient->stops); + ID3D10ShaderResourceView_Release(gradient->view); ID2D1Factory_Release(gradient->factory); HeapFree(GetProcessHeap(), 0, gradient); } @@ -129,21 +130,84 @@ static const struct ID2D1GradientStopCollectionVtbl d2d_gradient_vtbl = d2d_gradient_GetExtendMode, }; -HRESULT d2d_gradient_create(ID2D1Factory *factory, const D2D1_GRADIENT_STOP *stops, +HRESULT d2d_gradient_create(ID2D1Factory *factory, ID3D10Device *device, const D2D1_GRADIENT_STOP *stops, UINT32 stop_count, D2D1_GAMMA gamma, D2D1_EXTEND_MODE extend_mode, struct d2d_gradient **gradient) { + D3D10_SHADER_RESOURCE_VIEW_DESC srv_desc; + D3D10_SUBRESOURCE_DATA buffer_data; + ID3D10ShaderResourceView *view; + D3D10_BUFFER_DESC buffer_desc; + struct d2d_vec4 *data; + ID3D10Buffer *buffer; + unsigned int i; + HRESULT hr; + + if (!(data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, 2 * stop_count * sizeof(*data)))) + { + ERR("Failed to allocate data.\n"); + return E_OUTOFMEMORY; + } + + for (i = 0; i < stop_count; ++i) + { + data[i * 2].x = stops[i].position; + data[i * 2 + 1].x = stops[i].color.r; + data[i * 2 + 1].y = stops[i].color.g; + data[i * 2 + 1].z = stops[i].color.b; + data[i * 2 + 1].w = stops[i].color.a; + } + + buffer_desc.ByteWidth = 2 * stop_count * sizeof(*data); + buffer_desc.Usage = D3D10_USAGE_DEFAULT; + buffer_desc.BindFlags = D3D10_BIND_SHADER_RESOURCE; + buffer_desc.CPUAccessFlags = 0; + buffer_desc.MiscFlags = 0; + + buffer_data.pSysMem = data; + buffer_data.SysMemPitch = 0; + buffer_data.SysMemSlicePitch = 0; + + hr = ID3D10Device_CreateBuffer(device, &buffer_desc, &buffer_data, &buffer); + HeapFree(GetProcessHeap(), 0, data); + if (FAILED(hr)) + { + ERR("Failed to create buffer, hr %#x.\n", hr); + return hr; + } + + srv_desc.Format = DXGI_FORMAT_R32G32B32A32_FLOAT; + srv_desc.ViewDimension = D3D10_SRV_DIMENSION_BUFFER; + srv_desc.Buffer.ElementOffset = 0; + srv_desc.Buffer.ElementWidth = 2 * stop_count; + + hr = ID3D10Device_CreateShaderResourceView(device, (ID3D10Resource *)buffer, &srv_desc, &view); + ID3D10Buffer_Release(buffer); + if (FAILED(hr)) + { + ERR("Failed to create view, hr %#x.\n", hr); + return hr; + } + if (!(*gradient = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(**gradient)))) + { + ID3D10ShaderResourceView_Release(view); return E_OUTOFMEMORY; + } - FIXME("Ignoring gradient properties.\n"); + if (gamma != D2D1_GAMMA_2_2) + FIXME("Ignoring gamma %#x.\n", gamma); + if (extend_mode != D2D1_EXTEND_MODE_CLAMP) + FIXME("Ignoring extend mode %#x.\n", extend_mode); (*gradient)->ID2D1GradientStopCollection_iface.lpVtbl = &d2d_gradient_vtbl; (*gradient)->refcount = 1; ID2D1Factory_AddRef((*gradient)->factory = factory); + (*gradient)->view = view; (*gradient)->stop_count = stop_count; if (!((*gradient)->stops = HeapAlloc(GetProcessHeap(), 0, stop_count * sizeof(*stops)))) { + ID3D10ShaderResourceView_Release(view); HeapFree(GetProcessHeap(), 0, *gradient); return E_OUTOFMEMORY; } diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 2294568..efb504a 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -201,11 +201,12 @@ struct d2d_gradient LONG refcount; ID2D1Factory *factory; + ID3D10ShaderResourceView *view; D2D1_GRADIENT_STOP *stops; UINT32 stop_count; }; -HRESULT d2d_gradient_create(ID2D1Factory *factory, const D2D1_GRADIENT_STOP *stops, +HRESULT d2d_gradient_create(ID2D1Factory *factory, ID3D10Device *device, const D2D1_GRADIENT_STOP *stops, UINT32 stop_count, D2D1_GAMMA gamma, D2D1_EXTEND_MODE extend_mode, struct d2d_gradient **gradient) DECLSPEC_HIDDEN; diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 0a23b31..98471cb 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -380,7 +380,8 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateGradientStopCollect TRACE("iface %p, stops %p, stop_count %u, gamma %#x, extend_mode %#x, gradient %p.\n", iface, stops, stop_count, gamma, extend_mode, gradient); - if (SUCCEEDED(hr = d2d_gradient_create(render_target->factory, stops, stop_count, gamma, extend_mode, &object))) + if (SUCCEEDED(hr = d2d_gradient_create(render_target->factory, render_target->device, + stops, stop_count, gamma, extend_mode, &object))) *gradient = &object->ID2D1GradientStopCollection_iface; return hr;

1 0