wine-commits February 2017

wine-commits@winehq.org

2 participants
838 discussions

Józef Kucia : wined3d: Implement compute pipeline UAV binding.
by Alexandre Julliard 09 Feb '17

09 Feb '17

Module: wine Branch: master Commit: 6cc1335adcea2c79ce1998f9e3af30ca9b537cf9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cc1335adcea2c79ce1998f9e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 9 12:00:29 2017 +0100 wined3d: Implement compute pipeline UAV binding. 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/wined3d/context.c | 19 ++++++++++++++----- dlls/wined3d/cs.c | 31 +++++++++++++++++++++++++++++++ dlls/wined3d/device.c | 26 ++++++++++++++++++++++++++ dlls/wined3d/glsl_shader.c | 3 ++- dlls/wined3d/state.c | 9 +++++++++ dlls/wined3d/stateblock.c | 5 +++++ dlls/wined3d/utils.c | 2 ++ dlls/wined3d/wined3d.spec | 1 + dlls/wined3d/wined3d_private.h | 13 ++++++++++--- include/wine/wined3d.h | 2 ++ 10 files changed, 102 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6cc1335adcea2c79ce199…

1 0

Józef Kucia : wined3d: Fix order of command stream functions.
by Alexandre Julliard 09 Feb '17

09 Feb '17

Module: wine Branch: master Commit: 5954a4d006ad561e34b82483fc0fe8aebda2eea7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5954a4d006ad561e34b82483f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 9 12:00:28 2017 +0100 wined3d: Fix order of command stream functions. 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/wined3d/cs.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 422f3f1..b8fcf59 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1024,13 +1024,14 @@ static void wined3d_cs_exec_set_shader_resource_view(struct wined3d_cs *cs, cons device_invalidate_state(cs->device, STATE_SHADER_RESOURCE_BINDING); } -void wined3d_cs_emit_set_unordered_access_view(struct wined3d_cs *cs, unsigned int view_idx, - struct wined3d_unordered_access_view *view) +void wined3d_cs_emit_set_shader_resource_view(struct wined3d_cs *cs, enum wined3d_shader_type type, + UINT view_idx, struct wined3d_shader_resource_view *view) { - struct wined3d_cs_set_unordered_access_view *op; + struct wined3d_cs_set_shader_resource_view *op; op = cs->ops->require_space(cs, sizeof(*op)); - op->opcode = WINED3D_CS_OP_SET_UNORDERED_ACCESS_VIEW; + op->opcode = WINED3D_CS_OP_SET_SHADER_RESOURCE_VIEW; + op->type = type; op->view_idx = view_idx; op->view = view; @@ -1053,14 +1054,13 @@ static void wined3d_cs_exec_set_unordered_access_view(struct wined3d_cs *cs, con device_invalidate_state(cs->device, STATE_UNORDERED_ACCESS_VIEW_BINDING); } -void wined3d_cs_emit_set_shader_resource_view(struct wined3d_cs *cs, enum wined3d_shader_type type, - UINT view_idx, struct wined3d_shader_resource_view *view) +void wined3d_cs_emit_set_unordered_access_view(struct wined3d_cs *cs, unsigned int view_idx, + struct wined3d_unordered_access_view *view) { - struct wined3d_cs_set_shader_resource_view *op; + struct wined3d_cs_set_unordered_access_view *op; op = cs->ops->require_space(cs, sizeof(*op)); - op->opcode = WINED3D_CS_OP_SET_SHADER_RESOURCE_VIEW; - op->type = type; + op->opcode = WINED3D_CS_OP_SET_UNORDERED_ACCESS_VIEW; op->view_idx = view_idx; op->view = view;

1 0

Nikolay Sivov : dxgi: Added support for DXGI_SWAP_CHAIN_FLAG_GDI_COMPATIBLE.
by Alexandre Julliard 09 Feb '17

09 Feb '17

Module: wine Branch: master Commit: 1a7ddf8dd96f9982c42ac7b8ed8cbfbacf07288c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a7ddf8dd96f9982c42ac7b8e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 9 07:51:56 2017 +0300 dxgi: Added support for DXGI_SWAP_CHAIN_FLAG_GDI_COMPATIBLE. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 16 +++++++++++++--- dlls/d3d8/device.c | 12 +++++++----- dlls/d3d9/d3d9_private.h | 2 +- dlls/d3d9/device.c | 32 ++++++++++++++++---------------- dlls/d3d9/texture.c | 4 ++-- dlls/ddraw/ddraw.c | 9 +++++---- dlls/dxgi/device.c | 2 +- dlls/dxgi/tests/device.c | 1 - dlls/dxgi/utils.c | 12 ++++++++++++ dlls/wined3d/device.c | 6 +++++- dlls/wined3d/swapchain.c | 10 +++++++--- include/wine/wined3d.h | 3 ++- 12 files changed, 71 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1a7ddf8dd96f9982c42ac…

1 0

Carlos Garnacho : winex11: Use XIAllDevices to select for XI_RawMotion.
by Alexandre Julliard 09 Feb '17

09 Feb '17

Module: wine Branch: master Commit: 448433ae034841b47b79af1c652c1a7f45d2895f URL: http://source.winehq.org/git/wine.git/?a=commit;h=448433ae034841b47b79af1c6… Author: Carlos Garnacho <carlosg(a)gnome.org> Date: Wed Feb 8 01:50:31 2017 +0100 winex11: Use XIAllDevices to select for XI_RawMotion. Instead of selecting for XI2 events for every slave device individually, do it for XIAllDevices, and store the current device's relative X/Y valuators so they can be quickly looked up in the XI_RawMotion events received. Signed-off-by: Carlos Garnacho <carlosg(a)gnome.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/mouse.c | 185 +++++++++++++++++++++++++++++++--------------- dlls/winex11.drv/x11drv.h | 10 +++ 2 files changed, 137 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=448433ae034841b47b79a…

1 0

Hugh McMaster : regedit: Sort treeview children on refresh.
by Alexandre Julliard 09 Feb '17

09 Feb '17

Module: wine Branch: master Commit: 7073e27fbd61c7d2eeff8e4e3ccf1dfa0eca581b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7073e27fbd61c7d2eeff8e4e3… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Feb 9 11:12:14 2017 +0000 regedit: Sort treeview children on refresh. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/treeview.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c index 9d9fa6d..d07399d 100644 --- a/programs/regedit/treeview.c +++ b/programs/regedit/treeview.c @@ -482,6 +482,7 @@ BOOL RefreshTreeView(HWND hwndTV) SendMessageW(hwndTV, WM_SETREDRAW, TRUE, 0); InvalidateRect(hwndTV, NULL, FALSE); + SendMessageW(hwndTV, TVM_SORTCHILDREN, TRUE, (LPARAM)hSelectedItem); SetCursor(hcursorOld); /* We reselect the currently selected node, this will prompt a refresh of the listview. */

1 0

Hugh McMaster : regedit: Refresh listview after import.
by Alexandre Julliard 09 Feb '17

09 Feb '17

Module: wine Branch: master Commit: e23ca416bd873cb546a44950c406862677044831 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e23ca416bd873cb546a44950c… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Feb 9 11:12:03 2017 +0000 regedit: Refresh listview after import. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/framewnd.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index fb29ffb..6b549d6 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -354,6 +354,8 @@ static BOOL ImportRegistryFile(HWND hWnd) { OPENFILENAMEW ofn; WCHAR title[128]; + HKEY root_key = NULL; + WCHAR *key_path; InitOpenFileName(hWnd, &ofn); ofn.Flags |= OFN_ENABLESIZING; @@ -371,6 +373,11 @@ static BOOL ImportRegistryFile(HWND hWnd) CheckCommDlgError(hWnd); } RefreshTreeView(g_pChildWnd->hTreeWnd); + + key_path = GetItemPath(g_pChildWnd->hTreeWnd, 0, &root_key); + RefreshListView(g_pChildWnd->hListWnd, root_key, key_path, NULL); + HeapFree(GetProcessHeap(), 0, key_path); + return TRUE; }

1 0

Hugh McMaster : regedit: Display a dialog message after successful/ unsuccessful file import.
by Alexandre Julliard 09 Feb '17

09 Feb '17

Module: wine Branch: master Commit: 9e1d356d78e04db950326156d390afa7d2808f7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e1d356d78e04db950326156d… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Feb 9 11:08:20 2017 +0000 regedit: Display a dialog message after successful/unsuccessful file import. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 114 +++++++++++++++++++++++------------------- po/bg.po | 113 +++++++++++++++++++++++------------------- po/ca.po | 117 +++++++++++++++++++++++++------------------- po/cs.po | 114 +++++++++++++++++++++++------------------- po/da.po | 116 ++++++++++++++++++++++++------------------- po/de.po | 117 +++++++++++++++++++++++++------------------- po/el.po | 111 ++++++++++++++++++++++------------------- po/en.po | 112 +++++++++++++++++++++++------------------- po/en_US.po | 112 +++++++++++++++++++++++------------------- po/eo.po | 113 +++++++++++++++++++++++------------------- po/es.po | 116 ++++++++++++++++++++++++------------------- po/fa.po | 112 +++++++++++++++++++++++------------------- po/fi.po | 117 +++++++++++++++++++++++++------------------- po/fr.po | 117 +++++++++++++++++++++++++------------------- po/he.po | 115 ++++++++++++++++++++++++------------------- po/hi.po | 111 ++++++++++++++++++++++------------------- po/hr.po | 115 ++++++++++++++++++++++++------------------- po/hu.po | 115 ++++++++++++++++++++++++------------------- po/it.po | 116 ++++++++++++++++++++++++------------------- po/ja.po | 116 ++++++++++++++++++++++++------------------- po/ko.po | 114 +++++++++++++++++++++++------------------- po/lt.po | 117 +++++++++++++++++++++++++------------------- po/ml.po | 111 ++++++++++++++++++++++------------------- po/nb_NO.po | 117 +++++++++++++++++++++++++------------------- po/nl.po | 116 ++++++++++++++++++++++++------------------- po/or.po | 111 ++++++++++++++++++++++------------------- po/pa.po | 111 ++++++++++++++++++++++------------------- po/pl.po | 114 +++++++++++++++++++++++------------------- po/pt_BR.po | 117 +++++++++++++++++++++++++------------------- po/pt_PT.po | 116 ++++++++++++++++++++++++------------------- po/rm.po | 112 +++++++++++++++++++++++------------------- po/ro.po | 117 +++++++++++++++++++++++++------------------- po/ru.po | 117 +++++++++++++++++++++++++------------------- po/sk.po | 113 +++++++++++++++++++++++------------------- po/sl.po | 114 +++++++++++++++++++++++------------------- po/sr_RS(a)cyrillic.po | 113 +++++++++++++++++++++++------------------- po/sr_RS(a)latin.po | 113 +++++++++++++++++++++++------------------- po/sv.po | 115 ++++++++++++++++++++++++------------------- po/te.po | 111 ++++++++++++++++++++++------------------- po/th.po | 112 +++++++++++++++++++++++------------------- po/tr.po | 117 +++++++++++++++++++++++++------------------- po/uk.po | 117 +++++++++++++++++++++++++------------------- po/wa.po | 112 +++++++++++++++++++++++------------------- po/wine.pot | 111 ++++++++++++++++++++++------------------- po/zh_CN.po | 115 ++++++++++++++++++++++++------------------- po/zh_TW.po | 114 +++++++++++++++++++++++------------------- programs/regedit/framewnd.c | 7 ++- programs/regedit/regedit.rc | 2 + programs/regedit/resource.h | 2 + 49 files changed, 2920 insertions(+), 2347 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9e1d356d78e04db950326…

1 0

Henri Verbeet : d3d8: Do not modify the "texture" pointer for D3DFMT_UNKNOWN in d3d8_device_CreateVolumeTexture().
by Alexandre Julliard 09 Feb '17

09 Feb '17

Module: wine Branch: master Commit: bb8f4d7a888b791b0dc56e7c281b215d12bd022c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb8f4d7a888b791b0dc56e7c2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 9 12:52:40 2017 +0100 d3d8: Do not modify the "texture" pointer for D3DFMT_UNKNOWN in d3d8_device_CreateVolumeTexture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 3 +++ dlls/d3d8/tests/device.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index ad5880c..2c8d6cb 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -824,6 +824,9 @@ static HRESULT WINAPI d3d8_device_CreateVolumeTexture(IDirect3DDevice8 *iface, TRACE("iface %p, width %u, height %u, depth %u, levels %u, usage %#x, format %#x, pool %#x, texture %p.\n", iface, width, height, depth, levels, usage, format, pool, texture); + if (!format) + return D3DERR_INVALIDCALL; + *texture = NULL; object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index ff3c9b4..9a9278b 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -8242,7 +8242,7 @@ static void test_format_unknown(void) hr = IDirect3DDevice8_CreateVolumeTexture(device, 64, 64, 1, 1, 0, D3DFMT_UNKNOWN, D3DPOOL_DEFAULT, (IDirect3DVolumeTexture8 **)&iface); ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - todo_wine ok(iface == (void *)0xdeadbeef, "Got unexpected iface %p.\n", iface); + ok(iface == (void *)0xdeadbeef, "Got unexpected iface %p.\n", iface); refcount = IDirect3DDevice8_Release(device); ok(!refcount, "Device has %u references left.\n", refcount);

1 0

Henri Verbeet : d3d8: Do not modify the "texture" pointer for D3DFMT_UNKNOWN in d3d8_device_CreateCubeTexture().
by Alexandre Julliard 09 Feb '17

09 Feb '17

Module: wine Branch: master Commit: 9e16f478c1c1d18e35d0964ca93378626fede569 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e16f478c1c1d18e35d0964ca… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 9 12:52:39 2017 +0100 d3d8: Do not modify the "texture" pointer for D3DFMT_UNKNOWN in d3d8_device_CreateCubeTexture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 3 +++ dlls/d3d8/tests/device.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 989c1b0..ad5880c 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -853,6 +853,9 @@ static HRESULT WINAPI d3d8_device_CreateCubeTexture(IDirect3DDevice8 *iface, UIN TRACE("iface %p, edge_length %u, levels %u, usage %#x, format %#x, pool %#x, texture %p.\n", iface, edge_length, levels, usage, format, pool, texture); + if (!format) + return D3DERR_INVALIDCALL; + *texture = NULL; object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index c05c9f2..ff3c9b4 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -8236,7 +8236,7 @@ static void test_format_unknown(void) hr = IDirect3DDevice8_CreateCubeTexture(device, 64, 1, 0, D3DFMT_UNKNOWN, D3DPOOL_DEFAULT, (IDirect3DCubeTexture8 **)&iface); ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - todo_wine ok(iface == (void *)0xdeadbeef, "Got unexpected iface %p.\n", iface); + ok(iface == (void *)0xdeadbeef, "Got unexpected iface %p.\n", iface); iface = (void *)0xdeadbeef; hr = IDirect3DDevice8_CreateVolumeTexture(device, 64, 64, 1, 1, 0,

1 0

Henri Verbeet : d3d8: Do not modify the "texture" pointer for D3DFMT_UNKNOWN in d3d8_device_CreateTexture().
by Alexandre Julliard 09 Feb '17

09 Feb '17

Module: wine Branch: master Commit: 5ec48e76ad0a285b046b1af41b552ab697bc8344 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ec48e76ad0a285b046b1af41… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 9 12:52:38 2017 +0100 d3d8: Do not modify the "texture" pointer for D3DFMT_UNKNOWN in d3d8_device_CreateTexture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 3 +++ dlls/d3d8/tests/device.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 805694b..989c1b0 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -791,6 +791,9 @@ static HRESULT WINAPI d3d8_device_CreateTexture(IDirect3DDevice8 *iface, TRACE("iface %p, width %u, height %u, levels %u, usage %#x, format %#x, pool %#x, texture %p.\n", iface, width, height, levels, usage, format, pool, texture); + if (!format) + return D3DERR_INVALIDCALL; + *texture = NULL; object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index da67fb3..c05c9f2 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -8230,7 +8230,7 @@ static void test_format_unknown(void) hr = IDirect3DDevice8_CreateTexture(device, 64, 64, 1, 0, D3DFMT_UNKNOWN, D3DPOOL_DEFAULT, (IDirect3DTexture8 **)&iface); ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - todo_wine ok(iface == (void *)0xdeadbeef, "Got unexpected iface %p.\n", iface); + ok(iface == (void *)0xdeadbeef, "Got unexpected iface %p.\n", iface); iface = (void *)0xdeadbeef; hr = IDirect3DDevice8_CreateCubeTexture(device, 64, 1, 0,

1 0

← Newer
1
...
56
57
58
59
60
61
62
...
84
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2017