wine-commits November 2018

wine-commits@winehq.org

2 participants
951 discussions

Henri Verbeet : d3d8: Disallow rendertarget and depth/ stencil usage on vertex buffers.
by Alexandre Julliard 21 Nov '18

21 Nov '18

Module: wine Branch: master Commit: 55092b5c9d907146eebcde743753fd0acd244a11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=55092b5c9d907146eebcde74… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 21 17:05:22 2018 +0330 d3d8: Disallow rendertarget and depth/stencil usage on vertex buffers. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/buffer.c | 4 ++++ dlls/d3d8/tests/device.c | 8 +++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index 475bf48..8487312 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -282,6 +282,10 @@ HRESULT vertexbuffer_init(struct d3d8_vertexbuffer *buffer, struct d3d8_device * return D3DERR_INVALIDCALL; } + /* In d3d8, buffers can't be used as rendertarget or depth/stencil buffer. */ + if (usage & (D3DUSAGE_RENDERTARGET | D3DUSAGE_DEPTHSTENCIL)) + return D3DERR_INVALIDCALL; + buffer->IDirect3DVertexBuffer8_iface.lpVtbl = &Direct3DVertexBuffer8_Vtbl; d3d8_resource_init(&buffer->resource); buffer->fvf = fvf; diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 8ac6ed7..b3260ea 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -9163,16 +9163,14 @@ static void test_resource_access(void) hr = IDirect3DDevice8_CreateVertexBuffer(device, 16, tests[i].usage, tests[i].format == FORMAT_COLOUR ? 0 : D3DFVF_XYZRHW, tests[i].pool, &vb); - todo_wine_if(tests[i].pool != D3DPOOL_SCRATCH && tests[i].usage & ~D3DUSAGE_DYNAMIC) - ok(hr == (tests[i].pool == D3DPOOL_SCRATCH || (tests[i].usage & ~D3DUSAGE_DYNAMIC) - ? D3DERR_INVALIDCALL : D3D_OK), "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == (tests[i].pool == D3DPOOL_SCRATCH || (tests[i].usage & ~D3DUSAGE_DYNAMIC) + ? D3DERR_INVALIDCALL : D3D_OK), "Test %u: Got unexpected hr %#x.\n", i, hr); if (FAILED(hr)) continue; hr = IDirect3DVertexBuffer8_GetDesc(vb, &vb_desc); ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); - todo_wine_if(tests[i].usage & ~D3DUSAGE_DYNAMIC) - ok(vb_desc.Usage == tests[i].usage, "Test %u: Got unexpected usage %#x.\n", i, vb_desc.Usage); + ok(vb_desc.Usage == tests[i].usage, "Test %u: Got unexpected usage %#x.\n", i, vb_desc.Usage); ok(vb_desc.Pool == tests[i].pool, "Test %u: Got unexpected pool %#x.\n", i, vb_desc.Pool); hr = IDirect3DVertexBuffer8_Lock(vb, 0, 0, &data, 0);

1 0

Józef Kucia : dxgi/tests: Add basic test for QueryVideoMemoryInfo().
by Alexandre Julliard 21 Nov '18

21 Nov '18

Module: wine Branch: master Commit: bd4b7f7fb663bcd1a13a7ca2b6421aac83642485 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd4b7f7fb663bcd1a13a7ca2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 21 10:13:24 2018 +0100 dxgi/tests: Add basic test for QueryVideoMemoryInfo(). 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/dxgi/tests/dxgi.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index bd5c574..9073a03 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -820,6 +820,57 @@ static void test_adapter_luid(void) ok(!refcount, "Factory has %u references left.\n", refcount); } +static void test_query_video_memory_info(void) +{ + DXGI_QUERY_VIDEO_MEMORY_INFO memory_info; + IDXGIAdapter3 *adapter3; + IDXGIAdapter *adapter; + IDXGIDevice *device; + ULONG refcount; + HRESULT hr; + + if (!(device = create_device(0))) + { + skip("Failed to create device.\n"); + return; + } + + hr = IDXGIDevice_GetAdapter(device, &adapter); + ok(hr == S_OK, "Failed to get adapter, hr %#x.\n", hr); + hr = IDXGIAdapter_QueryInterface(adapter, &IID_IDXGIAdapter3, (void **)&adapter3); + ok(hr == S_OK || hr == E_NOINTERFACE, "Got unexpected hr %#x.\n", hr); + if (hr == E_NOINTERFACE) + goto done; + + hr = IDXGIAdapter3_QueryVideoMemoryInfo(adapter3, 0, DXGI_MEMORY_SEGMENT_GROUP_LOCAL, &memory_info); + ok(hr == S_OK, "Failed to query video memory info, hr %#x.\n", hr); + ok(memory_info.Budget >= memory_info.AvailableForReservation, + "Available for reservation 0x%s is greater than budget 0x%s.\n", + wine_dbgstr_longlong(memory_info.AvailableForReservation), + wine_dbgstr_longlong(memory_info.Budget)); + ok(!memory_info.CurrentReservation, "Got unexpected current reservation 0x%s.\n", + wine_dbgstr_longlong(memory_info.CurrentReservation)); + + hr = IDXGIAdapter3_QueryVideoMemoryInfo(adapter3, 0, DXGI_MEMORY_SEGMENT_GROUP_NON_LOCAL, &memory_info); + ok(hr == S_OK, "Failed to query video memory info, hr %#x.\n", hr); + ok(memory_info.Budget >= memory_info.AvailableForReservation, + "Available for reservation 0x%s is greater than budget 0x%s.\n", + wine_dbgstr_longlong(memory_info.AvailableForReservation), + wine_dbgstr_longlong(memory_info.Budget)); + ok(!memory_info.CurrentReservation, "Got unexpected current reservation 0x%s.\n", + wine_dbgstr_longlong(memory_info.CurrentReservation)); + + hr = IDXGIAdapter3_QueryVideoMemoryInfo(adapter3, 0, DXGI_MEMORY_SEGMENT_GROUP_NON_LOCAL + 1, &memory_info); + ok(hr == E_INVALIDARG, "Failed to query video memory info, hr %#x.\n", hr); + + IDXGIAdapter3_Release(adapter3); + +done: + IDXGIAdapter_Release(adapter); + refcount = IDXGIDevice_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + static void test_check_interface_support(void) { LARGE_INTEGER driver_version; @@ -4694,6 +4745,7 @@ START_TEST(dxgi) queue_test(test_adapter_desc); queue_test(test_adapter_luid); + queue_test(test_query_video_memory_info); queue_test(test_check_interface_support); queue_test(test_create_surface); queue_test(test_parents);

1 0

Józef Kucia : dxgi: Report non-zero shared system memory.
by Alexandre Julliard 21 Nov '18

21 Nov '18

Module: wine Branch: master Commit: a96f6f8bf5ac285e2ade2847b00abcfa01c5f714 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a96f6f8bf5ac285e2ade2847… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 21 10:13:23 2018 +0100 dxgi: Report non-zero shared system memory. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40803 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/dxgi/adapter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index 71e15d7..4371ae7 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -178,7 +178,7 @@ static HRESULT dxgi_adapter_get_desc(struct dxgi_adapter *adapter, DXGI_ADAPTER_ desc->Revision = adapter_id.revision; desc->DedicatedVideoMemory = adapter_id.video_memory; desc->DedicatedSystemMemory = 0; /* FIXME */ - desc->SharedSystemMemory = 0; /* FIXME */ + desc->SharedSystemMemory = adapter_id.shared_system_memory; desc->AdapterLuid = adapter_id.adapter_luid; desc->Flags = 0; desc->GraphicsPreemptionGranularity = 0; /* FIXME */

1 0

Józef Kucia : wined3d: Report system shared memory for adapters.
by Alexandre Julliard 21 Nov '18

21 Nov '18

Module: wine Branch: master Commit: b0b27730e65d437e46de54a4b0a31e9ef0d00abf URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0b27730e65d437e46de54a4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 21 10:13:22 2018 +0100 wined3d: Report system shared memory for adapters. 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/directx.c | 15 ++++++++++++--- dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d.h | 1 + 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e41da8d..b9aa9fa 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -492,11 +492,12 @@ const struct wined3d_gpu_description *wined3d_get_gpu_description(enum wined3d_p void wined3d_driver_info_init(struct wined3d_driver_info *driver_info, const struct wined3d_gpu_description *gpu_desc, UINT64 vram_bytes) { + const struct driver_version_information *version_info; + enum wined3d_driver_model driver_model; + enum wined3d_display_driver driver; + MEMORYSTATUSEX memory_status; OSVERSIONINFOW os_version; WORD driver_os_version; - enum wined3d_display_driver driver; - enum wined3d_driver_model driver_model; - const struct driver_version_information *version_info; memset(&os_version, 0, sizeof(os_version)); os_version.dwOSVersionInfoSize = sizeof(os_version); @@ -585,6 +586,13 @@ void wined3d_driver_info_init(struct wined3d_driver_info *driver_info, driver_info->vram_bytes = LONG_MAX; } + driver_info->sysmem_bytes = 64 * 1024 * 1024; + memory_status.dwLength = sizeof(memory_status); + if (GlobalMemoryStatusEx(&memory_status)) + driver_info->sysmem_bytes = max(memory_status.ullTotalPhys / 2, driver_info->sysmem_bytes); + else + ERR("Failed to get global memory status.\n"); + /* Try to obtain driver version information for the current Windows version. This fails in * some cases: * - the gpu is not available on the currently selected OS version: @@ -1200,6 +1208,7 @@ HRESULT CDECL wined3d_get_adapter_identifier(const struct wined3d *wined3d, identifier->whql_level = (flags & WINED3DENUM_NO_WHQL_LEVEL) ? 0 : 1; memcpy(&identifier->adapter_luid, &adapter->luid, sizeof(identifier->adapter_luid)); identifier->video_memory = min(~(SIZE_T)0, adapter->driver_info.vram_bytes); + identifier->shared_system_memory = min(~(SIZE_T)0, adapter->driver_info.sysmem_bytes); return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 668bbc7..f908ff7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2648,6 +2648,7 @@ struct wined3d_driver_info const char *name; const char *description; UINT64 vram_bytes; + UINT64 sysmem_bytes; DWORD version_high; DWORD version_low; }; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index f8e201c..40553f7 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1736,6 +1736,7 @@ struct wined3d_adapter_identifier DWORD whql_level; LUID adapter_luid; SIZE_T video_memory; + SIZE_T shared_system_memory; }; struct wined3d_swapchain_desc

1 0

Józef Kucia : wined3d: Get rid of vram_bytes from struct wined3d_adapter.
by Alexandre Julliard 21 Nov '18

21 Nov '18

Module: wine Branch: master Commit: f17544a77c0e56d61a72220119c187e0d25278e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f17544a77c0e56d61a722201… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 21 10:13:21 2018 +0100 wined3d: Get rid of vram_bytes from struct wined3d_adapter. 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/adapter_gl.c | 3 +-- dlls/wined3d/device.c | 10 +++++++--- dlls/wined3d/directx.c | 5 ++--- dlls/wined3d/wined3d_private.h | 5 ++--- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 99df19c..2a3514a 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -3845,9 +3845,8 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, TRACE("Reporting (fake) driver version 0x%08x-0x%08x.\n", driver_info->version_high, driver_info->version_low); - adapter->vram_bytes = driver_info->vram_bytes; adapter->vram_bytes_used = 0; - TRACE("Emulating 0x%s bytes of video ram.\n", wine_dbgstr_longlong(adapter->vram_bytes)); + TRACE("Emulating 0x%s bytes of video ram.\n", wine_dbgstr_longlong(driver_info->vram_bytes)); gl_ext_emul_mask = adapter->vertex_pipe->vp_get_emul_mask(gl_info) | adapter->fragment_pipe->get_emul_mask(gl_info); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 2ae9235..a89a33d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1302,14 +1302,18 @@ void CDECL wined3d_device_set_multithreaded(struct wined3d_device *device) UINT CDECL wined3d_device_get_available_texture_mem(const struct wined3d_device *device) { + const struct wined3d_driver_info *driver_info; + TRACE("device %p.\n", device); + driver_info = &device->adapter->driver_info; + TRACE("Emulating 0x%s bytes. 0x%s used, returning 0x%s left.\n", - wine_dbgstr_longlong(device->adapter->vram_bytes), + wine_dbgstr_longlong(driver_info->vram_bytes), wine_dbgstr_longlong(device->adapter->vram_bytes_used), - wine_dbgstr_longlong(device->adapter->vram_bytes - device->adapter->vram_bytes_used)); + wine_dbgstr_longlong(driver_info->vram_bytes - device->adapter->vram_bytes_used)); - return min(UINT_MAX, device->adapter->vram_bytes - device->adapter->vram_bytes_used); + return min(UINT_MAX, driver_info->vram_bytes - device->adapter->vram_bytes_used); } void CDECL wined3d_device_set_stream_output(struct wined3d_device *device, UINT idx, diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index afbc5cb..e41da8d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1199,7 +1199,7 @@ HRESULT CDECL wined3d_get_adapter_identifier(const struct wined3d *wined3d, memcpy(&identifier->device_identifier, &IID_D3DDEVICE_D3DUID, sizeof(identifier->device_identifier)); identifier->whql_level = (flags & WINED3DENUM_NO_WHQL_LEVEL) ? 0 : 1; memcpy(&identifier->adapter_luid, &adapter->luid, sizeof(identifier->adapter_luid)); - identifier->video_memory = min(~(SIZE_T)0, adapter->vram_bytes); + identifier->video_memory = min(~(SIZE_T)0, adapter->driver_info.vram_bytes); return WINED3D_OK; } @@ -2491,9 +2491,8 @@ static BOOL wined3d_adapter_no3d_init(struct wined3d_adapter *adapter, DWORD win TRACE("adapter %p.\n", adapter); wined3d_driver_info_init(&adapter->driver_info, &gpu_description, 0); - adapter->vram_bytes = adapter->driver_info.vram_bytes; adapter->vram_bytes_used = 0; - TRACE("Emulating 0x%s bytes of video ram.\n", wine_dbgstr_longlong(adapter->vram_bytes)); + TRACE("Emulating 0x%s bytes of video ram.\n", wine_dbgstr_longlong(adapter->driver_info.vram_bytes)); if (!wined3d_adapter_no3d_init_format_info(adapter)) return FALSE; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d493e9f..668bbc7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2674,13 +2674,12 @@ struct wined3d_adapter struct wined3d_gl_info gl_info; struct wined3d_d3d_info d3d_info; struct wined3d_driver_info driver_info; - unsigned int cfg_count; - struct wined3d_pixel_format *cfgs; - UINT64 vram_bytes; UINT64 vram_bytes_used; LUID luid; WCHAR device_name[CCHDEVICENAME]; /* for use with e.g. ChangeDisplaySettings() */ + unsigned int cfg_count; + struct wined3d_pixel_format *cfgs; void *formats; size_t format_size;

1 0

Józef Kucia : wined3d: Rename DeviceName to device_name.
by Alexandre Julliard 21 Nov '18

21 Nov '18

Module: wine Branch: master Commit: 3e0148cab0c91f392a69bc01b9d3afd1710acfa0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e0148cab0c91f392a69bc01… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 21 10:13:20 2018 +0100 wined3d: Rename DeviceName to device_name. 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/directx.c | 22 +++++++++++----------- dlls/wined3d/wined3d_private.h | 3 ++- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 4a13586..afbc5cb 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -730,7 +730,7 @@ HRESULT CDECL wined3d_get_output_desc(const struct wined3d *wined3d, unsigned in if (FAILED(hr = wined3d_get_adapter_display_mode(wined3d, adapter_idx, &mode, &rotation))) return hr; - memcpy(desc->device_name, adapter->DeviceName, sizeof(desc->device_name)); + memcpy(desc->device_name, adapter->device_name, sizeof(desc->device_name)); SetRect(&desc->desktop_rect, 0, 0, mode.width, mode.height); OffsetRect(&desc->desktop_rect, adapter->monitor_position.x, adapter->monitor_position.y); /* FIXME: We should get this from EnumDisplayDevices() when the adapters @@ -769,7 +769,7 @@ UINT CDECL wined3d_get_adapter_mode_count(const struct wined3d *wined3d, UINT ad memset(&mode, 0, sizeof(mode)); mode.dmSize = sizeof(mode); - while (EnumDisplaySettingsExW(adapter->DeviceName, j++, &mode, 0)) + while (EnumDisplaySettingsExW(adapter->device_name, j++, &mode, 0)) { if (mode.dmFields & DM_DISPLAYFLAGS) { @@ -825,7 +825,7 @@ HRESULT CDECL wined3d_enum_adapter_modes(const struct wined3d *wined3d, UINT ada while (i <= mode_idx) { - if (!EnumDisplaySettingsExW(adapter->DeviceName, j++, &m, 0)) + if (!EnumDisplaySettingsExW(adapter->device_name, j++, &m, 0)) { WARN("Invalid mode_idx %u.\n", mode_idx); return WINED3DERR_INVALIDCALL; @@ -994,7 +994,7 @@ HRESULT CDECL wined3d_get_adapter_display_mode(const struct wined3d *wined3d, UI memset(&m, 0, sizeof(m)); m.dmSize = sizeof(m); - EnumDisplaySettingsExW(adapter->DeviceName, ENUM_CURRENT_SETTINGS, &m, 0); + EnumDisplaySettingsExW(adapter->device_name, ENUM_CURRENT_SETTINGS, &m, 0); mode->width = m.dmPelsWidth; mode->height = m.dmPelsHeight; mode->refresh_rate = DEFAULT_REFRESH_RATE; @@ -1097,7 +1097,7 @@ HRESULT CDECL wined3d_set_adapter_display_mode(struct wined3d *wined3d, } else { - if (!EnumDisplaySettingsW(adapter->DeviceName, ENUM_REGISTRY_SETTINGS, &new_mode)) + if (!EnumDisplaySettingsW(adapter->device_name, ENUM_REGISTRY_SETTINGS, &new_mode)) { ERR("Failed to read mode from registry.\n"); return WINED3DERR_NOTAVAILABLE; @@ -1106,7 +1106,7 @@ HRESULT CDECL wined3d_set_adapter_display_mode(struct wined3d *wined3d, } /* Only change the mode if necessary. */ - if (!EnumDisplaySettingsW(adapter->DeviceName, ENUM_CURRENT_SETTINGS, &current_mode)) + if (!EnumDisplaySettingsW(adapter->device_name, ENUM_CURRENT_SETTINGS, &current_mode)) { ERR("Failed to get current display mode.\n"); } @@ -1123,7 +1123,7 @@ HRESULT CDECL wined3d_set_adapter_display_mode(struct wined3d *wined3d, return WINED3D_OK; } - ret = ChangeDisplaySettingsExW(adapter->DeviceName, &new_mode, NULL, CDS_FULLSCREEN, NULL); + ret = ChangeDisplaySettingsExW(adapter->device_name, &new_mode, NULL, CDS_FULLSCREEN, NULL); if (ret != DISP_CHANGE_SUCCESSFUL) { if (new_mode.dmFields & DM_DISPLAYFREQUENCY) @@ -1131,7 +1131,7 @@ HRESULT CDECL wined3d_set_adapter_display_mode(struct wined3d *wined3d, WARN("ChangeDisplaySettingsExW failed, trying without the refresh rate.\n"); new_mode.dmFields &= ~DM_DISPLAYFREQUENCY; new_mode.dmDisplayFrequency = 0; - ret = ChangeDisplaySettingsExW(adapter->DeviceName, &new_mode, NULL, CDS_FULLSCREEN, NULL); + ret = ChangeDisplaySettingsExW(adapter->device_name, &new_mode, NULL, CDS_FULLSCREEN, NULL); } if (ret != DISP_CHANGE_SUCCESSFUL) return WINED3DERR_NOTAVAILABLE; @@ -1182,7 +1182,7 @@ HRESULT CDECL wined3d_get_adapter_identifier(const struct wined3d *wined3d, /* Note that d3d8 doesn't supply a device name. */ if (identifier->device_name_size) { - if (!WideCharToMultiByte(CP_ACP, 0, adapter->DeviceName, -1, identifier->device_name, + if (!WideCharToMultiByte(CP_ACP, 0, adapter->device_name, -1, identifier->device_name, identifier->device_name_size, NULL, NULL)) { ERR("Failed to convert device name, last error %#x.\n", GetLastError()); @@ -2516,8 +2516,8 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int o display_device.cb = sizeof(display_device); EnumDisplayDevicesW(NULL, ordinal, &display_device, 0); - TRACE("Display device: %s\n", debugstr_w(display_device.DeviceName)); - strcpyW(adapter->DeviceName, display_device.DeviceName); + TRACE("Display device: %s.\n", debugstr_w(display_device.DeviceName)); + strcpyW(adapter->device_name, display_device.DeviceName); if (!AllocateLocallyUniqueId(&adapter->luid)) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f739e5f..d493e9f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2674,13 +2674,14 @@ struct wined3d_adapter struct wined3d_gl_info gl_info; struct wined3d_d3d_info d3d_info; struct wined3d_driver_info driver_info; - WCHAR DeviceName[CCHDEVICENAME]; /* DeviceName for use with e.g. ChangeDisplaySettings */ unsigned int cfg_count; struct wined3d_pixel_format *cfgs; UINT64 vram_bytes; UINT64 vram_bytes_used; LUID luid; + WCHAR device_name[CCHDEVICENAME]; /* for use with e.g. ChangeDisplaySettings() */ + void *formats; size_t format_size;

1 0

Józef Kucia : dxgi: Partially implement dxgi_adapter_QueryVideoMemoryInfo().
by Alexandre Julliard 21 Nov '18

21 Nov '18

Module: wine Branch: master Commit: d94d2c0ead4eaa15c24ca2cdc4e58d4672234399 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d94d2c0ead4eaa15c24ca2cd… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 21 10:13:19 2018 +0100 dxgi: Partially implement dxgi_adapter_QueryVideoMemoryInfo(). Based on a patch by Matteo Bruni. 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/dxgi/adapter.c | 38 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index b96904e..71e15d7 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -297,10 +297,44 @@ static void STDMETHODCALLTYPE dxgi_adapter_UnregisterHardwareContentProtectionTe static HRESULT STDMETHODCALLTYPE dxgi_adapter_QueryVideoMemoryInfo(IWineDXGIAdapter *iface, UINT node_index, DXGI_MEMORY_SEGMENT_GROUP segment_group, DXGI_QUERY_VIDEO_MEMORY_INFO *memory_info) { - FIXME("iface %p, node_index %u, segment_group %#x, memory_info %p stub!\n", + struct dxgi_adapter *adapter = impl_from_IWineDXGIAdapter(iface); + struct wined3d_adapter_identifier adapter_id; + HRESULT hr; + + FIXME("iface %p, node_index %u, segment_group %#x, memory_info %p partial stub!\n", iface, node_index, segment_group, memory_info); - return E_NOTIMPL; + if (node_index) + FIXME("Ignoring node index %u.\n", node_index); + + adapter_id.driver_size = 0; + adapter_id.description_size = 0; + adapter_id.device_name_size = 0; + + wined3d_mutex_lock(); + hr = wined3d_get_adapter_identifier(adapter->factory->wined3d, adapter->ordinal, 0, &adapter_id); + wined3d_mutex_unlock(); + + if (FAILED(hr)) + return hr; + + switch (segment_group) + { + case DXGI_MEMORY_SEGMENT_GROUP_LOCAL: + memory_info->Budget = adapter_id.video_memory; + memory_info->CurrentUsage = 0; + memory_info->AvailableForReservation = adapter_id.video_memory / 2; + memory_info->CurrentReservation = 0; + break; + case DXGI_MEMORY_SEGMENT_GROUP_NON_LOCAL: + memset(memory_info, 0, sizeof(*memory_info)); + break; + default: + WARN("Invalid memory segment group %#x.\n", segment_group); + return E_INVALIDARG; + } + + return hr; } static HRESULT STDMETHODCALLTYPE dxgi_adapter_SetVideoMemoryReservation(IWineDXGIAdapter *iface,

1 0

Andre Heider : winegcc: Fix cross linking on multiarch platforms.
by Alexandre Julliard 21 Nov '18

21 Nov '18

Module: wine Branch: master Commit: 2dfff7e63c4fc6f97e83df448a2c2b8c4b9eedd5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2dfff7e63c4fc6f97e83df44… Author: Andre Heider <a.heider(a)gmail.com> Date: Wed Nov 21 13:33:52 2018 +0100 winegcc: Fix cross linking on multiarch platforms. If e.g. the 64bit libdir was set to /foo/lib/x86_64-linux-gnu/bar, winegcc will now look for the 32bit libdir at /foo/lib/i386-linux-gnu/bar. Signed-off-by: Andre Heider <a.heider(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 44 +++++++++++++++++++++++++++++++++----------- 1 file changed, 33 insertions(+), 11 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 6b3b4b6a..5136cf3 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -444,15 +444,35 @@ static int check_platform( struct options *opts, const char *file ) return ret; } +static const char *get_multiarch_dir( enum target_cpu cpu ) +{ + switch(cpu) + { + case CPU_x86: return "/i386-linux-gnu"; + case CPU_x86_64: return "/x86_64-linux-gnu"; + case CPU_ARM: return "/arm-linux-gnueabi"; + case CPU_ARM64: return "/aarch64-linux-gnu"; + case CPU_POWERPC: return "/powerpc-linux-gnu"; + default: + assert(0); + return NULL; + } +} + static char *get_lib_dir( struct options *opts ) { static const char *stdlibpath[] = { LIBDIR, "/usr/lib", "/usr/local/lib", "/lib" }; static const char libwine[] = "/libwine.so"; - const char *bit_suffix, *other_bit_suffix; + const char *bit_suffix, *other_bit_suffix, *build_multiarch, *target_multiarch; unsigned int i; + size_t build_len, target_len; bit_suffix = opts->target_cpu == CPU_x86_64 || opts->target_cpu == CPU_ARM64 ? "64" : "32"; other_bit_suffix = opts->target_cpu == CPU_x86_64 || opts->target_cpu == CPU_ARM64 ? "32" : "64"; + build_multiarch = get_multiarch_dir( build_cpu ); + target_multiarch = get_multiarch_dir( opts->target_cpu ); + build_len = strlen( build_multiarch ); + target_len = strlen( target_multiarch ); for (i = 0; i < sizeof(stdlibpath)/sizeof(stdlibpath[0]); i++) { @@ -471,16 +491,7 @@ static char *get_lib_dir( struct options *opts ) strcpy( p, bit_suffix ); strcat( p, libwine ); if (check_platform( opts, buffer )) goto found; - switch(opts->target_cpu) - { - case CPU_x86: strcpy( p, "/i386-linux-gnu" ); break; - case CPU_x86_64: strcpy( p, "/x86_64-linux-gnu" ); break; - case CPU_ARM: strcpy( p, "/arm-linux-gnueabi" ); break; - case CPU_ARM64: strcpy( p, "/aarch64-linux-gnu" ); break; - case CPU_POWERPC: strcpy( p, "/powerpc-linux-gnu" ); break; - default: - assert(0); - } + strcpy( p, target_multiarch ); strcat( p, libwine ); if (check_platform( opts, buffer )) goto found; @@ -495,6 +506,17 @@ static char *get_lib_dir( struct options *opts ) p--; while (p > buffer && *p != '/') p--; if (*p != '/') break; + + /* try s/$build_cpu/$target_cpu/ on multiarch */ + if (build_cpu != opts->target_cpu && !memcmp( p, build_multiarch, build_len ) && p[build_len] == '/') + { + memmove( p + target_len, p + build_len, strlen( p + build_len ) + 1 ); + memcpy( p, target_multiarch, target_len ); + if (check_platform( opts, buffer )) goto found; + memmove( p + build_len, p + target_len, strlen( p + target_len ) + 1 ); + memcpy( p, build_multiarch, build_len ); + } + if (memcmp( p + 1, "lib", 3 )) continue; if (p[4] == '/') {

1 0

Zebediah Figura : setupapi/tests: Add some more tests for SetupDiRegisterDeviceInfo().
by Alexandre Julliard 21 Nov '18

21 Nov '18

Module: wine Branch: master Commit: 9ac9e4b955baace94eb0373841e6ebd5080c3b51 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ac9e4b955baace94eb03738… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Nov 21 00:06:12 2018 -0600 setupapi/tests: Add some more tests for SetupDiRegisterDeviceInfo(). Changed USB\BOGUS to the testcase used elsewhere since it fails on Windows 8. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/devinst.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 3e49da0..888b247 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -539,10 +539,11 @@ static void test_register_device_info(void) { static const WCHAR bogus[] = {'S','y','s','t','e','m','\\', 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', - 'E','n','u','m','\\','U','S','B','\\','B','O','G','U','S',0}; + 'E','n','u','m','\\','R','o','o','t','\\','L','E','G','A','C','Y','_','B','O','G','U','S',0}; SP_DEVINFO_DATA device = {0}; BOOL ret; HDEVINFO set; + char id[30]; SetLastError(0xdeadbeef); ret = SetupDiRegisterDeviceInfo(NULL, NULL, 0, NULL, NULL, NULL); @@ -568,15 +569,34 @@ static void test_register_device_info(void) ok(!ret, "Expected failure.\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "Got unexpected error %#x.\n", GetLastError()); - ret = SetupDiCreateDeviceInfoA(set, "USB\\BOGUS\\0000", &guid, NULL, NULL, 0, &device); + ret = SetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0000", &guid, NULL, NULL, 0, &device); ok(ret, "Failed to create device, error %#x.\n", GetLastError()); ret = SetupDiRegisterDeviceInfo(set, &device, 0, NULL, NULL, NULL); ok(ret, "Failed to register device, error %#x.\n", GetLastError()); + ret = SetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0001", &guid, NULL, NULL, 0, &device); + ok(ret, "Failed to create device, error %#x.\n", GetLastError()); + + SetupDiDestroyDeviceInfoList(set); + + set = SetupDiGetClassDevsA(&guid, NULL, NULL, 0); + ok(set != NULL, "Failed to create device list, error %#x.\n", GetLastError()); + + ret = SetupDiEnumDeviceInfo(set, 0, &device); + ok(ret, "Failed to enumerate devices, error %#x.\n", GetLastError()); + ret = SetupDiGetDeviceInstanceIdA(set, &device, id, sizeof(id), NULL); + ok(ret, "Failed to get device id, error %#x.\n", GetLastError()); + ok(!strcasecmp(id, "Root\\LEGACY_BOGUS\\0000"), "Got unexpected id %s.\n", id); + ret = SetupDiRemoveDevice(set, &device); todo_wine ok(ret, "Failed to remove device, error %#x.\n", GetLastError()); + + ret = SetupDiEnumDeviceInfo(set, 1, &device); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_NO_MORE_ITEMS, "Got unexpected error %#x.\n", GetLastError()); + SetupDiDestroyDeviceInfoList(set); /* remove once Wine is fixed */

1 0

Zebediah Figura : setupapi/tests: Remove workarounds in testRegisterDeviceInfo().
by Alexandre Julliard 21 Nov '18

21 Nov '18

Module: wine Branch: master Commit: 4e9b306e0686f595a20943f27adc791caecaa03c URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e9b306e0686f595a20943f2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Nov 21 00:06:11 2018 -0600 setupapi/tests: Remove workarounds in testRegisterDeviceInfo(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/devinst.c | 68 +++++++++++++++++++++---------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 7ae198a..3e49da0 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -535,52 +535,52 @@ static void test_get_device_instance_id(void) SetupDiDestroyDeviceInfoList(set); } -static void testRegisterDeviceInfo(void) +static void test_register_device_info(void) { static const WCHAR bogus[] = {'S','y','s','t','e','m','\\', 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', 'E','n','u','m','\\','U','S','B','\\','B','O','G','U','S',0}; + SP_DEVINFO_DATA device = {0}; BOOL ret; HDEVINFO set; SetLastError(0xdeadbeef); - ret = pSetupDiRegisterDeviceInfo(NULL, NULL, 0, NULL, NULL, NULL); - ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, - "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); - set = pSetupDiCreateDeviceInfoList(&guid, NULL); - ok(set != NULL, "SetupDiCreateDeviceInfoList failed: %d\n", GetLastError()); - if (set) - { - SP_DEVINFO_DATA devInfo = { 0 }; + ret = SetupDiRegisterDeviceInfo(NULL, NULL, 0, NULL, NULL, NULL); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "Got unexpected error %#x.\n", GetLastError()); - SetLastError(0xdeadbeef); - ret = pSetupDiRegisterDeviceInfo(set, NULL, 0, NULL, NULL, NULL); - ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - SetLastError(0xdeadbeef); - ret = pSetupDiRegisterDeviceInfo(set, &devInfo, 0, NULL, NULL, NULL); - ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - devInfo.cbSize = sizeof(devInfo); - SetLastError(0xdeadbeef); - ret = pSetupDiRegisterDeviceInfo(set, &devInfo, 0, NULL, NULL, NULL); - ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + set = SetupDiCreateDeviceInfoList(&guid, NULL); + ok(set != NULL, "Failed to create device list, error %#x.\n", GetLastError()); - ret = pSetupDiCreateDeviceInfoA(set, "USB\\BOGUS\\0000", &guid, - NULL, NULL, 0, &devInfo); - ok(ret, "SetupDiCreateDeviceInfoA failed: %08x\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = SetupDiRegisterDeviceInfo(set, NULL, 0, NULL, NULL, NULL); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Got unexpected error %#x.\n", GetLastError()); - ret = pSetupDiRegisterDeviceInfo(set, &devInfo, 0, NULL, NULL, NULL); - ok(ret, "SetupDiRegisterDeviceInfo failed: %d\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = SetupDiRegisterDeviceInfo(set, &device, 0, NULL, NULL, NULL); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Got unexpected error %#x.\n", GetLastError()); - ret = pSetupDiRemoveDevice(set, &devInfo); - todo_wine ok(ret, "got %u\n", GetLastError()); - pSetupDiDestroyDeviceInfoList(set); + device.cbSize = sizeof(device); + SetLastError(0xdeadbeef); + ret = SetupDiRegisterDeviceInfo(set, &device, 0, NULL, NULL, NULL); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Got unexpected error %#x.\n", GetLastError()); - /* remove once Wine is fixed */ - devinst_RegDeleteTreeW(HKEY_LOCAL_MACHINE, bogus); - } + ret = SetupDiCreateDeviceInfoA(set, "USB\\BOGUS\\0000", &guid, NULL, NULL, 0, &device); + ok(ret, "Failed to create device, error %#x.\n", GetLastError()); + + ret = SetupDiRegisterDeviceInfo(set, &device, 0, NULL, NULL, NULL); + ok(ret, "Failed to register device, error %#x.\n", GetLastError()); + + ret = SetupDiRemoveDevice(set, &device); +todo_wine + ok(ret, "Failed to remove device, error %#x.\n", GetLastError()); + SetupDiDestroyDeviceInfoList(set); + + /* remove once Wine is fixed */ + devinst_RegDeleteTreeW(HKEY_LOCAL_MACHINE, bogus); } static void testCreateDeviceInterface(void) @@ -1517,7 +1517,7 @@ START_TEST(devinst) test_install_class(); test_device_info(); test_get_device_instance_id(); - testRegisterDeviceInfo(); + test_register_device_info(); testCreateDeviceInterface(); testGetDeviceInterfaceDetail(); testDevRegKey();

1 0

← Newer
1
...
48
49
50
51
52
53
54
...
96
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 November 2018