April 2017 - Wine-Commits - list.winehq.org

Alexandre Julliard : preloader: Use the SYS_mmap2 system call instead of the old SYS_mmap one.
by Alexandre Julliard April 27, 2017

April 27, 2017

Module: wine Branch: master Commit: 45a632ee81c9c5c58309426de5aadbd8dbbba0f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45a632ee81c9c5c58309426de… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 27 15:04:03 2017 +0200 preloader: Use the SYS_mmap2 system call instead of the old SYS_mmap one. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/preloader.c | 55 ++++++++++++++++++++++++++++++------------------------ 1 file changed, 31 insertions(+), 24 deletions(-) diff --git a/loader/preloader.c b/loader/preloader.c index 91ad1da..903061e 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -291,30 +291,37 @@ static inline int wld_mprotect( const void *addr, size_t len, int prot ) return SYSCALL_RET(ret); } -static void *wld_mmap( void *start, size_t len, int prot, int flags, int fd, off_t offset ) -{ - int ret; - - struct - { - void *addr; - unsigned int length; - unsigned int prot; - unsigned int flags; - unsigned int fd; - unsigned int offset; - } args; - - args.addr = start; - args.length = len; - args.prot = prot; - args.flags = flags; - args.fd = fd; - args.offset = offset; - __asm__ __volatile__( "pushl %%ebx; movl %2,%%ebx; int $0x80; popl %%ebx" - : "=a" (ret) : "0" (90 /* SYS_mmap */), "q" (&args) : "memory" ); - return (void *)SYSCALL_RET(ret); -} +void *wld_mmap( void *start, size_t len, int prot, int flags, int fd, unsigned int offset ); +__ASM_GLOBAL_FUNC(wld_mmap, + "\tpushl %ebp\n" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + "\tpushl %ebx\n" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + "\tpushl %esi\n" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + "\tpushl %edi\n" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + "\tmovl $192,%eax\n" /* SYS_mmap2 */ + "\tmovl 20(%esp),%ebx\n" /* start */ + "\tmovl 24(%esp),%ecx\n" /* len */ + "\tmovl 28(%esp),%edx\n" /* prot */ + "\tmovl 32(%esp),%esi\n" /* flags */ + "\tmovl 36(%esp),%edi\n" /* fd */ + "\tmovl 40(%esp),%ebp\n" /* offset */ + "\tshrl $12,%ebp\n" + "\tint $0x80\n" + "\tcmpl $-4096,%eax\n" + "\tjbe 1f\n" + "\tmovl $-1,%eax\n" + "1:\tpopl %edi\n" + __ASM_CFI(".cfi_adjust_cfa_offset -4\n\t") + "\tpopl %esi\n" + __ASM_CFI(".cfi_adjust_cfa_offset -4\n\t") + "\tpopl %ebx\n" + __ASM_CFI(".cfi_adjust_cfa_offset -4\n\t") + "\tpopl %ebp\n" + __ASM_CFI(".cfi_adjust_cfa_offset -4\n\t") + "\tret\n" ) static inline uid_t wld_getuid(void) {

1 0

Alistair Leslie-Hughes : odbccp32: Handle ODBC_CONFIG_DRIVER request in SQLConfigDriver/W.
by Alexandre Julliard April 27, 2017

April 27, 2017

Module: wine Branch: master Commit: c92189c600a899d5da6e996107154b1bc9ca67de URL: http://source.winehq.org/git/wine.git/?a=commit;h=c92189c600a899d5da6e99610… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Apr 26 10:03:44 2017 +0000 odbccp32: Handle ODBC_CONFIG_DRIVER request in SQLConfigDriver/W. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/odbccp32/odbccp32.c | 88 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/odbccp32/tests/misc.c | 65 +++++++++++++++++++++++++++++++--- 2 files changed, 149 insertions(+), 4 deletions(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index f28d464..fce3fcd 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -65,6 +65,7 @@ static const WCHAR odbc_error_invalid_param_string[] = {'I','n','v','a','l','i', static const WCHAR odbc_error_invalid_dsn[] = {'I','n','v','a','l','i','d',' ','D','S','N',0}; static const WCHAR odbc_error_load_lib_failed[] = {'L','o','a','d',' ','L','i','b','r','a','r','y',' ','F','a','i','l','e','d',0}; static const WCHAR odbc_error_request_failed[] = {'R','e','q','u','e','s','t',' ','F','a','i','l','e','d',0}; +static const WCHAR odbc_error_invalid_keyword[] = {'I','n','v','a','l','i','d',' ','k','e','y','w','o','r','d',' ','v','a','l','u','e',0}; /* Push an error onto the error stack, taking care of ranges etc. */ static void push_error(int code, LPCWSTR msg) @@ -303,6 +304,64 @@ static HMODULE load_config_driver(const WCHAR *driver) return hmod; } +static BOOL write_config_value(const WCHAR *driver, const WCHAR *args) +{ + long ret; + HKEY hkey, hkeydriver; + WCHAR *name = NULL; + + if(!args) + return FALSE; + + if((ret = RegOpenKeyW(HKEY_LOCAL_MACHINE, odbcini, &hkey)) == ERROR_SUCCESS) + { + if((ret = RegOpenKeyW(hkey, driver, &hkeydriver)) == ERROR_SUCCESS) + { + WCHAR *divider, *value; + + name = heap_alloc( (strlenW(args) + 1) * sizeof(WCHAR)); + if(!name) + { + push_error(ODBC_ERROR_OUT_OF_MEM, odbc_error_out_of_mem); + goto fail; + } + lstrcpyW(name, args); + + divider = strchrW(name,'='); + if(!divider) + { + push_error(ODBC_ERROR_INVALID_KEYWORD_VALUE, odbc_error_invalid_keyword); + goto fail; + } + + value = divider + 1; + *divider = '\0'; + + TRACE("Write pair: %s = %s\n", debugstr_w(name), debugstr_w(value)); + if(RegSetValueExW(hkeydriver, name, 0, REG_SZ, (BYTE*)value, + (strlenW(value)+1) * sizeof(WCHAR)) != ERROR_SUCCESS) + ERR("Failed to write registry installed key\n"); + heap_free(name); + + RegCloseKey(hkeydriver); + } + + RegCloseKey(hkey); + } + + if(ret != ERROR_SUCCESS) + push_error(ODBC_ERROR_COMPONENT_NOT_FOUND, odbc_error_component_not_found); + + return ret == ERROR_SUCCESS; + +fail: + RegCloseKey(hkeydriver); + RegCloseKey(hkey); + heap_free(name); + + return FALSE; +} + BOOL WINAPI SQLConfigDriverW(HWND hwnd, WORD request, LPCWSTR driver, LPCWSTR args, LPWSTR msg, WORD msgmax, WORD *msgout) { @@ -314,6 +373,11 @@ BOOL WINAPI SQLConfigDriverW(HWND hwnd, WORD request, LPCWSTR driver, TRACE("(%p %d %s %s %p %d %p)\n", hwnd, request, debugstr_w(driver), debugstr_w(args), msg, msgmax, msgout); + if(request == ODBC_CONFIG_DRIVER) + { + return write_config_value(driver, args); + } + hmod = load_config_driver(driver); if(!hmod) return FALSE; @@ -343,6 +407,30 @@ BOOL WINAPI SQLConfigDriver(HWND hwnd, WORD request, LPCSTR driver, debugstr_a(args), msg, msgmax, msgout); driverW = heap_strdupAtoW(driver); + if(!driverW) + { + push_error(ODBC_ERROR_OUT_OF_MEM, odbc_error_out_of_mem); + return FALSE; + } + if(request == ODBC_CONFIG_DRIVER) + { + BOOL ret = FALSE; + WCHAR *argsW = heap_strdupAtoW(args); + if(argsW) + { + ret = write_config_value(driverW, argsW); + HeapFree(GetProcessHeap(), 0, argsW); + } + else + { + push_error(ODBC_ERROR_OUT_OF_MEM, odbc_error_out_of_mem); + } + + HeapFree(GetProcessHeap(), 0, driverW); + + return ret; + } + hmod = load_config_driver(driverW); HeapFree(GetProcessHeap(), 0, driverW); if(!hmod) diff --git a/dlls/odbccp32/tests/misc.c b/dlls/odbccp32/tests/misc.c index ed8e6f1..8e119e0 100644 --- a/dlls/odbccp32/tests/misc.c +++ b/dlls/odbccp32/tests/misc.c @@ -421,31 +421,63 @@ static void test_SQLInstallDriverEx(void) DWORD cnt, error_code = 0; HKEY hkey; LONG res; + char error[1000]; GetSystemDirectoryA(syspath, MAX_PATH); - SQLInstallDriverEx("WINE ODBC Driver\0Driver=sample.dll\0Setup=sample.dll\0\0", NULL, path, MAX_PATH, &size, ODBC_INSTALL_COMPLETE, NULL); + ret = SQLConfigDriver(NULL, ODBC_CONFIG_DRIVER, "WINE ODBC Driver", "CPTimeout=59", error, sizeof(error), NULL); + ok(!ret, "SQLConfigDriver returned %d\n", ret); + sql_ret = SQLInstallerErrorW(1, &error_code, NULL, 0, NULL); + ok(sql_ret && error_code == ODBC_ERROR_COMPONENT_NOT_FOUND, "SQLConfigDriver returned %d, %u\n", sql_ret, error_code); + + ret = SQLInstallDriverEx("WINE ODBC Driver\0Driver=sample.dll\0Setup=sample.dll\0\0", NULL, + path, MAX_PATH, &size, ODBC_INSTALL_COMPLETE, NULL); + ok(ret, "SQLInstallDriverEx failed\n"); sql_ret = SQLInstallerErrorW(1, &error_code, NULL, 0, NULL); if (sql_ret && error_code == ODBC_ERROR_WRITING_SYSINFO_FAILED) { win_skip("not enough privileges\n"); return; } - ok(sql_ret && error_code == SQL_SUCCESS, "SQLInstallDriverEx failed %d, %u\n", sql_ret, error_code); + ok(sql_ret == SQL_NO_DATA || (sql_ret && error_code == SQL_SUCCESS), "SQLInstallDriverEx failed %d, %u\n", sql_ret, error_code); ok(!strcmp(path, syspath), "invalid path %s\n", path); +if (0) /* Crashes on XP. */ +{ + sql_ret = 0; + ret = SQLConfigDriver(NULL, ODBC_CONFIG_DRIVER, "WINE ODBC Driver", NULL, error, sizeof(error), NULL); + ok(!ret, "SQLConfigDriver failed '%s'\n",error); +} + + ret = SQLConfigDriver(NULL, ODBC_CONFIG_DRIVER, "WINE ODBC Driver", "CPTimeout=59\0NoWrite=60\0", error, sizeof(error), NULL); + ok(ret, "SQLConfigDriver failed\n"); + sql_ret = SQLInstallerErrorW(1, &error_code, NULL, 0, NULL); + ok(sql_ret == SQL_NO_DATA || (sql_ret && error_code == SQL_SUCCESS), "SQLConfigDriver failed %d, %u\n", sql_ret, error_code); + ret = SQLInstallDriverEx("WINE ODBC Driver Path\0Driver=sample.dll\0Setup=sample.dll\0\0", "c:\\temp", path, MAX_PATH, &size, ODBC_INSTALL_COMPLETE, NULL); + ok(ret, "SQLInstallDriverEx failed\n"); sql_ret = SQLInstallerErrorW(1, &error_code, NULL, 0, NULL); - ok(sql_ret && error_code == SQL_SUCCESS, "SQLInstallDriverEx failed %d, %u\n", sql_ret, error_code); + ok(sql_ret == SQL_NO_DATA || (sql_ret && error_code == SQL_SUCCESS), "SQLInstallDriverEx failed %d, %u\n", sql_ret, error_code); ok(!strcmp(path, "c:\\temp"), "invalid path %s\n", path); + ret = SQLConfigDriver(NULL, ODBC_CONFIG_DRIVER, "WINE ODBC Driver Path", "empty", error, sizeof(error), NULL); + ok(!ret, "SQLConfigDriver successful\n"); + sql_ret = SQLInstallerErrorW(1, &error_code, NULL, 0, NULL); + ok(sql_ret && error_code == ODBC_ERROR_INVALID_KEYWORD_VALUE, "SQLConfigDriver failed %d, %u\n", sql_ret, error_code); + + ret = SQLConfigDriver(NULL, ODBC_CONFIG_DRIVER, "WINE ODBC Driver Path", "NoWrite=60;xxxx=555", error, sizeof(error), NULL); + ok(ret, "SQLConfigDriver failed\n"); + sql_ret = SQLInstallerErrorW(1, &error_code, NULL, 0, NULL); + ok(sql_ret == SQL_NO_DATA || (sql_ret && error_code == SQL_SUCCESS), "SQLConfigDriver failed %d, %u\n", sql_ret, error_code); + if (ret) { + DWORD type = 0xdeadbeef, size = MAX_PATH; + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\ODBC\\ODBCINST.INI\\WINE ODBC Driver", 0, KEY_READ, &hkey); ok(res == ERROR_SUCCESS, "RegOpenKeyExW failed\n"); if (res == ERROR_SUCCESS) { - DWORD type = 0xdeadbeef, size = MAX_PATH; char driverpath[MAX_PATH]; strcpy(driverpath, syspath); @@ -458,6 +490,31 @@ static void test_SQLInstallDriverEx(void) ok(size == strlen(driverpath) + 1, "got %u\n", size); ok(!strcmp(path, driverpath), "invalid path %s\n", path); + res = RegQueryValueExA(hkey, "CPTimeout", NULL, &type, (BYTE *)&path, &size); + ok(res == ERROR_SUCCESS, "got %d\n", res); + ok(type == REG_SZ, "got %u\n", type); + ok(size == strlen("59") + 1, "got %u\n", size); + ok(!strcmp(path, "59"), "invalid value %s\n", path); + + res = RegQueryValueExA(hkey, "NoWrite", NULL, &type, (BYTE *)&path, &size); + ok(res == ERROR_FILE_NOT_FOUND, "got %d\n", res); + + RegCloseKey(hkey); + } + + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\ODBC\\ODBCINST.INI\\WINE ODBC Driver Path", 0, KEY_READ, &hkey); + ok(res == ERROR_SUCCESS, "RegOpenKeyExW failed\n"); + if (res == ERROR_SUCCESS) + { + size = sizeof(path); + res = RegQueryValueExA(hkey, "NoWrite", NULL, &type, (BYTE *)&path, &size); + ok(res == ERROR_SUCCESS, "got %d\n", res); + ok(type == REG_SZ, "got %u\n", type); + ok(size == strlen("60;xxxx=555") + 1, "got %u\n", size); + ok(!strcmp(path, "60;xxxx=555"), "invalid value %s\n", path); + + res = RegQueryValueExA(hkey, "CPTimeout", NULL, &type, (BYTE *)&path, &size); + ok(res == ERROR_FILE_NOT_FOUND, "got %d\n", res); RegCloseKey(hkey); } }

1 0

Józef Kucia : d3d11: Delay destroying render target view until it is no longer referenced.
by Alexandre Julliard April 27, 2017

April 27, 2017

Module: wine Branch: master Commit: 2437e3559c8369721586578bc738e70bf388910e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2437e3559c8369721586578bc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 27 12:02:48 2017 +0200 d3d11: Delay destroying render target view until it is no longer referenced. 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/d3d11/view.c | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index 85c16d8..cdd380b 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -1442,6 +1442,14 @@ static ULONG STDMETHODCALLTYPE d3d11_rendertarget_view_AddRef(ID3D11RenderTarget TRACE("%p increasing refcount to %u.\n", view, refcount); + if (refcount == 1) + { + ID3D11Device_AddRef(view->device); + wined3d_mutex_lock(); + wined3d_rendertarget_view_incref(view->wined3d_view); + wined3d_mutex_unlock(); + } + return refcount; } @@ -1454,12 +1462,13 @@ static ULONG STDMETHODCALLTYPE d3d11_rendertarget_view_Release(ID3D11RenderTarge if (!refcount) { + ID3D11Device *device = view->device; + wined3d_mutex_lock(); wined3d_rendertarget_view_decref(view->wined3d_view); - ID3D11Device_Release(view->device); - wined3d_private_store_cleanup(&view->private_store); wined3d_mutex_unlock(); - HeapFree(GetProcessHeap(), 0, view); + + ID3D11Device_Release(device); } return refcount; @@ -1665,6 +1674,19 @@ static const struct ID3D10RenderTargetViewVtbl d3d10_rendertarget_view_vtbl = d3d10_rendertarget_view_GetDesc, }; +static void STDMETHODCALLTYPE d3d_render_target_view_wined3d_object_destroyed(void *parent) +{ + struct d3d_rendertarget_view *view = parent; + + wined3d_private_store_cleanup(&view->private_store); + HeapFree(GetProcessHeap(), 0, parent); +} + +static const struct wined3d_parent_ops d3d_render_target_view_wined3d_parent_ops = +{ + d3d_render_target_view_wined3d_object_destroyed, +}; + static void wined3d_rendertarget_view_desc_from_d3d11(struct wined3d_view_desc *wined3d_desc, const D3D11_RENDER_TARGET_VIEW_DESC *desc) { @@ -1766,7 +1788,7 @@ static HRESULT d3d_rendertarget_view_init(struct d3d_rendertarget_view *view, st wined3d_rendertarget_view_desc_from_d3d11(&wined3d_desc, &view->desc); if (FAILED(hr = wined3d_rendertarget_view_create(&wined3d_desc, wined3d_resource, - view, &d3d_null_wined3d_parent_ops, &view->wined3d_view))) + view, &d3d_render_target_view_wined3d_parent_ops, &view->wined3d_view))) { wined3d_mutex_unlock(); WARN("Failed to create a wined3d rendertarget view, hr %#x.\n", hr);

1 0

Józef Kucia : d3d11: Get rid of "rasterizer_state" from struct d3d_device.
by Alexandre Julliard April 27, 2017

April 27, 2017

Module: wine Branch: master Commit: 6a9e506fd55206a4b02ebb220e778ee31bc13b07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a9e506fd55206a4b02ebb220… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 27 12:02:46 2017 +0200 d3d11: Get rid of "rasterizer_state" from struct d3d_device. 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/d3d11/d3d11_private.h | 1 - dlls/d3d11/device.c | 37 ++++++++++++++++++++++++++++++------- 2 files changed, 30 insertions(+), 8 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 3a9729b..a8987cb 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -521,7 +521,6 @@ struct d3d_device float blend_factor[4]; struct d3d_depthstencil_state *depth_stencil_state; UINT stencil_ref; - struct d3d_rasterizer_state *rasterizer_state; }; static inline struct d3d_device *impl_from_ID3D11Device(ID3D11Device *iface) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 095908d..c5ead36 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -877,12 +877,13 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetState(ID3D11DeviceCon ID3D11RasterizerState *rasterizer_state) { struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_rasterizer_state *rasterizer_state_impl; const D3D11_RASTERIZER_DESC *desc; TRACE("iface %p, rasterizer_state %p.\n", iface, rasterizer_state); wined3d_mutex_lock(); - if (!(device->rasterizer_state = unsafe_impl_from_ID3D11RasterizerState(rasterizer_state))) + if (!(rasterizer_state_impl = unsafe_impl_from_ID3D11RasterizerState(rasterizer_state))) { wined3d_device_set_rasterizer_state(device->wined3d_device, NULL); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_FILLMODE, WINED3D_FILL_SOLID); @@ -894,9 +895,9 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetState(ID3D11DeviceCon return; } - wined3d_device_set_rasterizer_state(device->wined3d_device, device->rasterizer_state->wined3d_state); + wined3d_device_set_rasterizer_state(device->wined3d_device, rasterizer_state_impl->wined3d_state); - desc = &device->rasterizer_state->desc; + desc = &rasterizer_state_impl->desc; wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_FILLMODE, desc->FillMode); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_CULLMODE, desc->CullMode); /* OpenGL style depth bias. */ @@ -1949,11 +1950,22 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSGetState(ID3D11DeviceCon ID3D11RasterizerState **rasterizer_state) { struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_rasterizer_state *rasterizer_state_impl; + struct wined3d_rasterizer_state *wined3d_state; TRACE("iface %p, rasterizer_state %p.\n", iface, rasterizer_state); - if ((*rasterizer_state = device->rasterizer_state ? &device->rasterizer_state->ID3D11RasterizerState_iface : NULL)) - ID3D11RasterizerState_AddRef(*rasterizer_state); + wined3d_mutex_lock(); + if ((wined3d_state = wined3d_device_get_rasterizer_state(device->wined3d_device))) + { + rasterizer_state_impl = wined3d_rasterizer_state_get_parent(wined3d_state); + ID3D11RasterizerState_AddRef(*rasterizer_state = &rasterizer_state_impl->ID3D11RasterizerState_iface); + } + else + { + *rasterizer_state = NULL; + } + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_RSGetViewports(ID3D11DeviceContext *iface, @@ -4612,11 +4624,22 @@ static void STDMETHODCALLTYPE d3d10_device_SOGetTargets(ID3D10Device1 *iface, static void STDMETHODCALLTYPE d3d10_device_RSGetState(ID3D10Device1 *iface, ID3D10RasterizerState **rasterizer_state) { struct d3d_device *device = impl_from_ID3D10Device(iface); + struct d3d_rasterizer_state *rasterizer_state_impl; + struct wined3d_rasterizer_state *wined3d_state; TRACE("iface %p, rasterizer_state %p.\n", iface, rasterizer_state); - if ((*rasterizer_state = device->rasterizer_state ? &device->rasterizer_state->ID3D10RasterizerState_iface : NULL)) - ID3D10RasterizerState_AddRef(*rasterizer_state); + wined3d_mutex_lock(); + if ((wined3d_state = wined3d_device_get_rasterizer_state(device->wined3d_device))) + { + rasterizer_state_impl = wined3d_rasterizer_state_get_parent(wined3d_state); + ID3D10RasterizerState_AddRef(*rasterizer_state = &rasterizer_state_impl->ID3D10RasterizerState_iface); + } + else + { + *rasterizer_state = NULL; + } + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d10_device_RSGetViewports(ID3D10Device1 *iface,

1 0

Józef Kucia : wined3d: Add parent for rasterizer state objects.
by Alexandre Julliard April 27, 2017

April 27, 2017

Module: wine Branch: master Commit: 8afc0e631c4eb7029d55e99a4e0f42aeb4130f6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8afc0e631c4eb7029d55e99a4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 27 12:02:44 2017 +0200 wined3d: Add parent for rasterizer state objects. 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/d3d11/state.c | 4 ++-- dlls/wined3d/state.c | 15 ++++++++++++++- dlls/wined3d/wined3d.spec | 3 ++- dlls/wined3d/wined3d_private.h | 3 +++ include/wine/wined3d.h | 4 +++- 5 files changed, 24 insertions(+), 5 deletions(-) diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index b85bd67..fa2e668 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -861,8 +861,8 @@ HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, struct d3d state->desc = *desc; wined3d_desc.front_ccw = desc->FrontCounterClockwise; - if (FAILED(hr = wined3d_rasterizer_state_create(device->wined3d_device, - &wined3d_desc, &state->wined3d_state))) + if (FAILED(hr = wined3d_rasterizer_state_create(device->wined3d_device, &wined3d_desc, + state, &d3d_null_wined3d_parent_ops, &state->wined3d_state))) { WARN("Failed to create wined3d rasterizer state, hr %#x.\n", hr); wined3d_private_store_cleanup(&state->private_store); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 12ef3bb..b36c0fd 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -60,13 +60,24 @@ ULONG CDECL wined3d_rasterizer_state_decref(struct wined3d_rasterizer_state *sta TRACE("%p decreasing refcount to %u.\n", state, refcount); if (!refcount) + { + state->parent_ops->wined3d_object_destroyed(state->parent); wined3d_cs_destroy_object(device->cs, wined3d_rasterizer_state_destroy_object, state); + } return refcount; } +void * CDECL wined3d_rasterizer_state_get_parent(const struct wined3d_rasterizer_state *state) +{ + TRACE("rasterizer_state %p.\n", state); + + return state->parent; +} + HRESULT CDECL wined3d_rasterizer_state_create(struct wined3d_device *device, - const struct wined3d_rasterizer_state_desc *desc, struct wined3d_rasterizer_state **state) + const struct wined3d_rasterizer_state_desc *desc, void *parent, + const struct wined3d_parent_ops *parent_ops, struct wined3d_rasterizer_state **state) { struct wined3d_rasterizer_state *object; @@ -77,6 +88,8 @@ HRESULT CDECL wined3d_rasterizer_state_create(struct wined3d_device *device, object->refcount = 1; object->desc = *desc; + object->parent = parent; + object->parent_ops = parent_ops; object->device = device; TRACE("Created rasterizer state %p.\n", object); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 0f27de3..e1fc2ac 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -201,8 +201,9 @@ @ cdecl wined3d_query_incref(ptr) @ cdecl wined3d_query_issue(ptr long) -@ cdecl wined3d_rasterizer_state_create(ptr ptr ptr) +@ cdecl wined3d_rasterizer_state_create(ptr ptr ptr ptr ptr) @ cdecl wined3d_rasterizer_state_decref(ptr) +@ cdecl wined3d_rasterizer_state_get_parent(ptr) @ cdecl wined3d_rasterizer_state_incref(ptr) @ cdecl wined3d_resource_get_desc(ptr ptr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 751f092..628ef9a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2572,6 +2572,9 @@ struct wined3d_rasterizer_state LONG refcount; struct wined3d_rasterizer_state_desc desc; + void *parent; + const struct wined3d_parent_ops *parent_ops; + struct wined3d_device *device; }; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 2d69e98..c8b790e 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2502,8 +2502,10 @@ static inline HRESULT wined3d_private_store_set_private_data(struct wined3d_priv } HRESULT __cdecl wined3d_rasterizer_state_create(struct wined3d_device *device, - const struct wined3d_rasterizer_state_desc *desc, struct wined3d_rasterizer_state **state); + const struct wined3d_rasterizer_state_desc *desc, void *parent, + const struct wined3d_parent_ops *parent_ops, struct wined3d_rasterizer_state **state); ULONG __cdecl wined3d_rasterizer_state_decref(struct wined3d_rasterizer_state *state); +void * __cdecl wined3d_rasterizer_state_get_parent(const struct wined3d_rasterizer_state *state); ULONG __cdecl wined3d_rasterizer_state_incref(struct wined3d_rasterizer_state *state); void __cdecl wined3d_resource_get_desc(const struct wined3d_resource *resource,

1 0

Paul Gofman : d3dx9: Support parameters sharing in effect.
by Alexandre Julliard April 26, 2017

April 26, 2017

Module: wine Branch: master Commit: 6f99cf01e1b88c9bb09fe6b9bff3443514db5ae2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f99cf01e1b88c9bb09fe6b9b… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Apr 26 20:25:46 2017 +0200 d3dx9: Support parameters sharing in effect. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/d3dx9_private.h | 8 +- dlls/d3dx9_36/effect.c | 209 +++++++++++++++++++++++++++++++++++++++++- dlls/d3dx9_36/tests/effect.c | 21 ++--- 3 files changed, 224 insertions(+), 14 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6f99cf01e1b88c9bb09fe…

1 0

Józef Kucia : d3d11/tests: Extend test for ID3DDeviceContextState.
by Alexandre Julliard April 26, 2017

April 26, 2017

Module: wine Branch: master Commit: faecb8eda4b0360f5d60d3a989fb3cfed779df0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=faecb8eda4b0360f5d60d3a98… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 26 13:19:59 2017 +0200 d3d11/tests: Extend test for ID3DDeviceContextState. 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/d3d11/tests/d3d11.c | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index a692473..23fbecf 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -5314,6 +5314,9 @@ static void test_device_context_state(void) return; } + check_interface(device, &IID_ID3D10Device, FALSE, FALSE); + check_interface(device, &IID_ID3D10Device1, FALSE, FALSE); + feature_level = ID3D11Device1_GetFeatureLevel(device); ID3D11Device1_GetImmediateContext1(device, &context); @@ -5334,7 +5337,7 @@ static void test_device_context_state(void) ok(SUCCEEDED(hr), "Failed to create sampler state, hr %#x.\n", hr); ID3D11DeviceContext1_PSSetSamplers(context, 0, 1, &sampler); - tmp_sampler = (ID3D11SamplerState *)0xdeadbeef; + tmp_sampler = NULL; ID3D11DeviceContext1_PSGetSamplers(context, 0, 1, &tmp_sampler); ok(tmp_sampler == sampler, "Got sampler %p, expected %p.\n", tmp_sampler, sampler); ID3D11SamplerState_Release(tmp_sampler); @@ -5347,7 +5350,7 @@ static void test_device_context_state(void) ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); /* Enable ID3D10Device behavior. */ - previous_context_state = (ID3DDeviceContextState *)0xdeadbeef; + previous_context_state = NULL; ID3D11DeviceContext1_SwapDeviceContextState(context, context_state, &previous_context_state); refcount = ID3DDeviceContextState_Release(context_state); ok(!refcount, "Got refcount %u, expected 0.\n", refcount); @@ -5358,18 +5361,35 @@ static void test_device_context_state(void) ok(tmp_sampler == (ID3D11SamplerState *)0xdeadbeef, "Got unexpected sampler %p.\n", tmp_sampler); ID3D11DeviceContext1_PSSetSamplers(context, 0, 1, &tmp_sampler); + check_interface(device, &IID_ID3D10Device, TRUE, FALSE); + check_interface(device, &IID_ID3D10Device1, TRUE, FALSE); + ID3D11DeviceContext1_SwapDeviceContextState(context, previous_context_state, &context_state); refcount = ID3DDeviceContextState_Release(context_state); ok(!refcount, "Got refcount %u, expected 0.\n", refcount); refcount = ID3DDeviceContextState_Release(previous_context_state); ok(!refcount, "Got refcount %u, expected 0.\n", refcount); - ID3D11DeviceContext1_PSSetSamplers(context, 0, 1, &sampler); + /* ID3DDeviceContextState retains the previous state. */ + tmp_sampler = NULL; + ID3D11DeviceContext1_PSGetSamplers(context, 0, 1, &tmp_sampler); + ok(tmp_sampler == sampler, "Got sampler %p, expected %p.\n", tmp_sampler, sampler); + ID3D11SamplerState_Release(tmp_sampler); + + tmp_sampler = NULL; + ID3D11DeviceContext1_PSSetSamplers(context, 0, 1, &tmp_sampler); tmp_sampler = (ID3D11SamplerState *)0xdeadbeef; ID3D11DeviceContext1_PSGetSamplers(context, 0, 1, &tmp_sampler); + ok(!tmp_sampler, "Got unexpected sampler %p.\n", tmp_sampler); + ID3D11DeviceContext1_PSSetSamplers(context, 0, 1, &sampler); + tmp_sampler = NULL; + ID3D11DeviceContext1_PSGetSamplers(context, 0, 1, &tmp_sampler); ok(tmp_sampler == sampler, "Got sampler %p, expected %p.\n", tmp_sampler, sampler); ID3D11SamplerState_Release(tmp_sampler); + check_interface(device, &IID_ID3D10Device, TRUE, FALSE); + check_interface(device, &IID_ID3D10Device1, TRUE, FALSE); + ID3D11SamplerState_Release(sampler); ID3D11DeviceContext1_Release(context); refcount = ID3D11Device1_Release(device);

1 0

Józef Kucia : d3d11: Fix refcounting for shaders.
by Alexandre Julliard April 26, 2017

April 26, 2017

Module: wine Branch: master Commit: 51d58f9962c92bb2268143383499b1e9b68d12fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=51d58f9962c92bb2268143383… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 26 13:19:57 2017 +0200 d3d11: Fix refcounting for shaders. 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/d3d11/shader.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index 6266a34..b8c50d9 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -635,6 +635,14 @@ static ULONG STDMETHODCALLTYPE d3d11_hull_shader_AddRef(ID3D11HullShader *iface) TRACE("%p increasing refcount to %u.\n", shader, refcount); + if (refcount == 1) + { + ID3D11Device_AddRef(shader->device); + wined3d_mutex_lock(); + wined3d_shader_incref(shader->wined3d_shader); + wined3d_mutex_unlock(); + } + return refcount; } @@ -831,6 +839,14 @@ static ULONG STDMETHODCALLTYPE d3d11_domain_shader_AddRef(ID3D11DomainShader *if TRACE("%p increasing refcount to %u.\n", shader, refcount); + if (refcount == 1) + { + ID3D11Device_AddRef(shader->device); + wined3d_mutex_lock(); + wined3d_shader_incref(shader->wined3d_shader); + wined3d_mutex_unlock(); + } + return refcount; } @@ -1037,6 +1053,14 @@ static ULONG STDMETHODCALLTYPE d3d11_geometry_shader_AddRef(ID3D11GeometryShader TRACE("%p increasing refcount to %u.\n", shader, refcount); + if (refcount == 1) + { + ID3D11Device_AddRef(shader->device); + wined3d_mutex_lock(); + wined3d_shader_incref(shader->wined3d_shader); + wined3d_mutex_unlock(); + } + return refcount; } @@ -1890,6 +1914,14 @@ static ULONG STDMETHODCALLTYPE d3d11_compute_shader_AddRef(ID3D11ComputeShader * TRACE("%p increasing refcount to %u.\n", shader, refcount); + if (refcount == 1) + { + ID3D11Device_AddRef(shader->device); + wined3d_mutex_lock(); + wined3d_shader_incref(shader->wined3d_shader); + wined3d_mutex_unlock(); + } + return refcount; }

1 0

Józef Kucia : d3d11: Delay destroying sampler state until it is no longer referenced.
by Alexandre Julliard April 26, 2017

April 26, 2017

Module: wine Branch: master Commit: 5813b93185aeb26ff0fca105d320cb92a9c39af7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5813b93185aeb26ff0fca105d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 26 13:19:55 2017 +0200 d3d11: Delay destroying sampler state until it is no longer referenced. Implements D3D11 behavior. 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/d3d11/state.c | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index c8e443f..b85bd67 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -947,6 +947,14 @@ static ULONG STDMETHODCALLTYPE d3d11_sampler_state_AddRef(ID3D11SamplerState *if TRACE("%p increasing refcount to %u.\n", state, refcount); + if (refcount == 1) + { + ID3D11Device_AddRef(state->device); + wined3d_mutex_lock(); + wined3d_sampler_incref(state->wined3d_sampler); + wined3d_mutex_unlock(); + } + return refcount; } @@ -959,15 +967,13 @@ static ULONG STDMETHODCALLTYPE d3d11_sampler_state_Release(ID3D11SamplerState *i if (!refcount) { - struct d3d_device *device = impl_from_ID3D11Device(state->device); + ID3D11Device *device = state->device; wined3d_mutex_lock(); wined3d_sampler_decref(state->wined3d_sampler); - wine_rb_remove(&device->sampler_states, &state->entry); - ID3D11Device_Release(state->device); - wined3d_private_store_cleanup(&state->private_store); wined3d_mutex_unlock(); - HeapFree(GetProcessHeap(), 0, state); + + ID3D11Device_Release(device); } return refcount; @@ -1146,6 +1152,21 @@ static const struct ID3D10SamplerStateVtbl d3d10_sampler_state_vtbl = d3d10_sampler_state_GetDesc, }; +static void STDMETHODCALLTYPE d3d_sampler_wined3d_object_destroyed(void *parent) +{ + struct d3d_sampler_state *state = parent; + struct d3d_device *device = impl_from_ID3D11Device(state->device); + + wine_rb_remove(&device->sampler_states, &state->entry); + wined3d_private_store_cleanup(&state->private_store); + HeapFree(GetProcessHeap(), 0, parent); +} + +static const struct wined3d_parent_ops d3d_sampler_wined3d_parent_ops = +{ + d3d_sampler_wined3d_object_destroyed, +}; + static enum wined3d_texture_address wined3d_texture_address_from_d3d11(enum D3D11_TEXTURE_ADDRESS_MODE t) { return (enum wined3d_texture_address)t; @@ -1212,7 +1233,7 @@ HRESULT d3d_sampler_state_init(struct d3d_sampler_state *state, struct d3d_devic wined3d_desc.srgb_decode = TRUE; if (FAILED(hr = wined3d_sampler_create(device->wined3d_device, &wined3d_desc, - state, &d3d_null_wined3d_parent_ops, &state->wined3d_sampler))) + state, &d3d_sampler_wined3d_parent_ops, &state->wined3d_sampler))) { WARN("Failed to create wined3d sampler, hr %#x.\n", hr); wined3d_private_store_cleanup(&state->private_store);

1 0

Henri Verbeet : d3dx9/tests: Cleanup expect_vec3.
by Alexandre Julliard April 26, 2017

April 26, 2017

Module: wine Branch: master Commit: 398e701deb117b8a118b93a97a22df71cb813cb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=398e701deb117b8a118b93a97… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 26 20:23:19 2017 +0200 d3dx9/tests: Cleanup expect_vec3. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 83 +++++++++++++++++++++++++++------------------- 1 file changed, 48 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=398e701deb117b8a118b9…

1 0