March 2020 - Wine-commits - list.winehq.org

Jacek Caban : process.h: Add quick_exit declaration.
by Alexandre Julliard 19 Mar '20

19 Mar '20

Module: wine Branch: master Commit: 9e9e21fdb07d54b29a0fac758879fcc2c3418d8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e9e21fdb07d54b29a0fac75… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 19 15:41:48 2020 +0100 process.h: Add quick_exit declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/process.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/msvcrt/process.h b/include/msvcrt/process.h index a3707129ad..80be0e5bf6 100644 --- a/include/msvcrt/process.h +++ b/include/msvcrt/process.h @@ -56,6 +56,7 @@ void __cdecl _cexit(void); void __cdecl _exit(int) DECLSPEC_NORETURN; void __cdecl abort(void) DECLSPEC_NORETURN; void __cdecl exit(int) DECLSPEC_NORETURN; +_ACRTIMP DECLSPEC_NORETURN void __cdecl quick_exit(int); int __cdecl system(const char*); #ifdef __cplusplus

1 0

Jacek Caban : stdlib.h: Add _get_thread_local_invalid_parameter_handler and _set_thread_local_invalid_parameter_handler declarations.
by Alexandre Julliard 19 Mar '20

19 Mar '20

Module: wine Branch: master Commit: f0b8ca648f451ab9cb0a44f801c9cce5ad5ff52c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0b8ca648f451ab9cb0a44f8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 19 15:42:00 2020 +0100 stdlib.h: Add _get_thread_local_invalid_parameter_handler and _set_thread_local_invalid_parameter_handler declarations. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/stdlib.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index f07c44819d..f73f2ae384 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -225,6 +225,8 @@ void __cdecl qsort(void*,size_t,size_t,int (__cdecl *)(const void*,cons typedef void (__cdecl *_invalid_parameter_handler)(const wchar_t*, const wchar_t*, const wchar_t*, unsigned, uintptr_t); _invalid_parameter_handler __cdecl _set_invalid_parameter_handler(_invalid_parameter_handler); _invalid_parameter_handler __cdecl _get_invalid_parameter_handler(void); +_ACRTIMP _invalid_parameter_handler __cdecl _get_thread_local_invalid_parameter_handler(void); +_ACRTIMP _invalid_parameter_handler __cdecl _set_thread_local_invalid_parameter_handler(_invalid_parameter_handler); void __cdecl _invalid_parameter(const wchar_t *expr, const wchar_t *func, const wchar_t *file, unsigned int line, uintptr_t arg);

1 0

Jacek Caban : ucrtbase/tests: Use more ucrtbase functions directly in misc.c.
by Alexandre Julliard 19 Mar '20

19 Mar '20

Module: wine Branch: master Commit: 0f901b8e479983945996fcaa95bace6ab9670f7d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f901b8e479983945996fcaa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 19 15:42:14 2020 +0100 ucrtbase/tests: Use more ucrtbase functions directly in misc.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/misc.c | 187 ++++++++++++++------------------------------- 1 file changed, 56 insertions(+), 131 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0f901b8e479983945996…

1 0

Zhiyi Zhang : wined3d: Refactor wined3d_get_output_desc() to wined3d_output_get_desc().
by Alexandre Julliard 19 Mar '20

19 Mar '20

Module: wine Branch: master Commit: 5dae33dc3c57c28abebc7ce4d34c80a0051f8a79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5dae33dc3c57c28abebc7ce4… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Mar 19 17:07:30 2020 +0800 wined3d: Refactor wined3d_get_output_desc() to wined3d_output_get_desc(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/directx.c | 7 ++++++- dlls/d3d9/directx.c | 7 ++++++- dlls/ddraw/main.c | 7 ++++--- dlls/dxgi/output.c | 3 +-- dlls/wined3d/directx.c | 11 ++++------- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 4 ++-- 7 files changed, 24 insertions(+), 17 deletions(-) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 343073f351..509a76239d 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -398,12 +398,17 @@ static HMONITOR WINAPI d3d8_GetAdapterMonitor(IDirect3D8 *iface, UINT adapter) { struct d3d8 *d3d8 = impl_from_IDirect3D8(iface); struct wined3d_output_desc desc; + unsigned int output_idx; HRESULT hr; TRACE("iface %p, adapter %u.\n", iface, adapter); + output_idx = adapter; + if (output_idx >= d3d8->wined3d_output_count) + return NULL; + wined3d_mutex_lock(); - hr = wined3d_get_output_desc(d3d8->wined3d, adapter, &desc); + hr = wined3d_output_get_desc(d3d8->wined3d_outputs[output_idx], &desc); wined3d_mutex_unlock(); if (FAILED(hr)) diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index d79b32515f..9113ec1d5a 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -448,12 +448,17 @@ static HMONITOR WINAPI d3d9_GetAdapterMonitor(IDirect3D9Ex *iface, UINT adapter) { struct d3d9 *d3d9 = impl_from_IDirect3D9Ex(iface); struct wined3d_output_desc desc; + unsigned int output_idx; HRESULT hr; TRACE("iface %p, adapter %u.\n", iface, adapter); + output_idx = adapter; + if (output_idx >= d3d9->wined3d_output_count) + return NULL; + wined3d_mutex_lock(); - hr = wined3d_get_output_desc(d3d9->wined3d, adapter, &desc); + hr = wined3d_output_get_desc(d3d9->wined3d_outputs[output_idx], &desc); wined3d_mutex_unlock(); if (FAILED(hr)) diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 20c0f3f953..b9fe6b1e4b 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -59,6 +59,7 @@ static void ddraw_enumerate_secondary_devices(struct wined3d *wined3d, LPDDENUMC struct wined3d_adapter_identifier adapter_id; struct wined3d_adapter *wined3d_adapter; struct wined3d_output_desc output_desc; + struct wined3d_output *wined3d_output; unsigned int interface_count = 0; unsigned int adapter_idx = 0; unsigned int output_idx; @@ -86,11 +87,11 @@ static void ddraw_enumerate_secondary_devices(struct wined3d *wined3d, LPDDENUMC } wined3d_mutex_unlock(); - for (output_idx = 0; cont_enum && wined3d_adapter_get_output(wined3d_adapter, output_idx); - ++output_idx) + for (output_idx = 0; cont_enum && (wined3d_output = wined3d_adapter_get_output( + wined3d_adapter, output_idx)); ++output_idx) { wined3d_mutex_lock(); - if (FAILED(hr = wined3d_get_output_desc(wined3d, output_idx, &output_desc))) + if (FAILED(hr = wined3d_output_get_desc(wined3d_output, &output_desc))) { WARN("Failed to get output description, hr %#x.\n", hr); wined3d_mutex_unlock(); diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index 8c94788fbf..85bfed0598 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -289,8 +289,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetDesc(IDXGIOutput4 *iface, DXGI_O return E_INVALIDARG; wined3d_mutex_lock(); - hr = wined3d_get_output_desc(output->adapter->factory->wined3d, - output->adapter->ordinal, &wined3d_desc); + hr = wined3d_output_get_desc(output->wined3d_output, &wined3d_desc); wined3d_mutex_unlock(); if (FAILED(hr)) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 8cf0d77e82..9b99428134 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -915,7 +915,7 @@ HRESULT CDECL wined3d_register_software_device(struct wined3d *wined3d, void *in return WINED3D_OK; } -HRESULT CDECL wined3d_get_output_desc(const struct wined3d *wined3d, unsigned int adapter_idx, +HRESULT CDECL wined3d_output_get_desc(const struct wined3d_output *output, struct wined3d_output_desc *desc) { enum wined3d_display_rotation rotation; @@ -924,16 +924,13 @@ HRESULT CDECL wined3d_get_output_desc(const struct wined3d *wined3d, unsigned in HMONITOR monitor; HRESULT hr; - TRACE("wined3d %p, adapter_idx %u, desc %p.\n", wined3d, adapter_idx, desc); + TRACE("output %p, desc %p.\n", output, desc); - if (adapter_idx >= wined3d->adapter_count) - return WINED3DERR_INVALIDCALL; - - adapter = wined3d->adapters[adapter_idx]; + adapter = output->adapter; if (!(monitor = MonitorFromPoint(adapter->monitor_position, MONITOR_DEFAULTTOPRIMARY))) return WINED3DERR_INVALIDCALL; - if (FAILED(hr = wined3d_output_get_display_mode(&adapter->outputs[0], &mode, &rotation))) + if (FAILED(hr = wined3d_output_get_display_mode(output, &mode, &rotation))) return hr; memcpy(desc->device_name, adapter->device_name, sizeof(desc->device_name)); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index c06cca22ee..22a9a9dd74 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -12,7 +12,6 @@ @ cdecl wined3d_get_adapter(ptr long) @ cdecl wined3d_get_adapter_count(ptr) @ cdecl wined3d_get_device_caps(ptr long ptr) -@ cdecl wined3d_get_output_desc(ptr long ptr) @ cdecl wined3d_incref(ptr) @ cdecl wined3d_register_software_device(ptr ptr) @ cdecl wined3d_register_window(ptr ptr ptr long) @@ -158,6 +157,7 @@ @ cdecl wined3d_output_find_closest_matching_mode(ptr ptr) @ cdecl wined3d_output_get_adapter(ptr) +@ cdecl wined3d_output_get_desc(ptr ptr) @ cdecl wined3d_output_get_display_mode(ptr ptr ptr) @ cdecl wined3d_output_get_mode(ptr long long long ptr) @ cdecl wined3d_output_get_mode_count(ptr long long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index d192266583..2c3f085623 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2281,8 +2281,6 @@ struct wined3d_adapter * __cdecl wined3d_get_adapter(const struct wined3d *wined UINT __cdecl wined3d_get_adapter_count(const struct wined3d *wined3d); HRESULT __cdecl wined3d_get_device_caps(const struct wined3d_adapter *adapter, enum wined3d_device_type device_type, struct wined3d_caps *caps); -HRESULT __cdecl wined3d_get_output_desc(const struct wined3d *wined3d, unsigned int adapter_idx, - struct wined3d_output_desc *desc); ULONG __cdecl wined3d_incref(struct wined3d *wined3d); HRESULT __cdecl wined3d_register_software_device(struct wined3d *wined3d, void *init_function); BOOL __cdecl wined3d_register_window(struct wined3d *wined3d, HWND window, @@ -2509,6 +2507,8 @@ HRESULT __cdecl wined3d_device_validate_device(const struct wined3d_device *devi HRESULT __cdecl wined3d_output_find_closest_matching_mode(const struct wined3d_output *output, struct wined3d_display_mode *mode); struct wined3d_adapter * __cdecl wined3d_output_get_adapter(const struct wined3d_output *output); +HRESULT __cdecl wined3d_output_get_desc(const struct wined3d_output *output, + struct wined3d_output_desc *desc); HRESULT __cdecl wined3d_output_get_display_mode(const struct wined3d_output *output, struct wined3d_display_mode *mode, enum wined3d_display_rotation *rotation); HRESULT __cdecl wined3d_output_get_mode(const struct wined3d_output *output,

1 0

Zhiyi Zhang : wined3d: Add an ordinal to struct wined3d_output.
by Alexandre Julliard 19 Mar '20

19 Mar '20

Module: wine Branch: master Commit: e8dbb2fb6a05998dffbacdc8146ac51271ed3bff URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8dbb2fb6a05998dffbacdc8… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Mar 19 17:07:46 2020 +0800 wined3d: Add an ordinal to struct wined3d_output. Signed-off-by: Zhiyi Zhang <zzhang(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 | 9 ++++++--- dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d.h | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 9b99428134..4f3c9803c4 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -116,8 +116,8 @@ static void wined3d_output_cleanup(const struct wined3d_output *output) D3DKMTCloseAdapter(&close_adapter_desc); } -static HRESULT wined3d_output_init(struct wined3d_output *output, struct wined3d_adapter *adapter, - const WCHAR *device_name) +static HRESULT wined3d_output_init(struct wined3d_output *output, unsigned int ordinal, + struct wined3d_adapter *adapter, const WCHAR *device_name) { D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME open_adapter_desc; D3DKMT_CREATEDEVICE create_device_desc = {{0}}; @@ -137,6 +137,7 @@ static HRESULT wined3d_output_init(struct wined3d_output *output, struct wined3d return E_FAIL; } + output->ordinal = ordinal; lstrcpyW(output->device_name, device_name); output->adapter = adapter; output->kmt_adapter = open_adapter_desc.hAdapter; @@ -933,6 +934,7 @@ HRESULT CDECL wined3d_output_get_desc(const struct wined3d_output *output, if (FAILED(hr = wined3d_output_get_display_mode(output, &mode, &rotation))) return hr; + desc->ordinal = output->ordinal; 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); @@ -2805,7 +2807,8 @@ BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int ordinal, return FALSE; } - if (FAILED(hr = wined3d_output_init(&adapter->outputs[0], adapter, display_device.DeviceName))) + if (FAILED(hr = wined3d_output_init(&adapter->outputs[0], 0, adapter, + display_device.DeviceName))) { ERR("Failed to initialise output, hr %#x.\n", hr); goto done; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index db806adf71..6e976fb0aa 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2901,6 +2901,7 @@ struct wined3d_adapter_ops struct wined3d_output { + unsigned int ordinal; WCHAR device_name[CCHDEVICENAME]; struct wined3d_adapter *adapter; enum wined3d_format_id screen_format; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 2c3f085623..e989fff089 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2138,6 +2138,7 @@ struct wined3d_view_desc struct wined3d_output_desc { + unsigned int ordinal; WCHAR device_name[CCHDEVICENAME]; RECT desktop_rect; BOOL attached_to_desktop;

1 0

Zhiyi Zhang : d3d9: Report d3d9 adapter group information in device caps.
by Alexandre Julliard 19 Mar '20

19 Mar '20

Module: wine Branch: master Commit: 2c39a955f490bcca6632894c133d352fef7775ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c39a955f490bcca6632894c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Mar 19 17:08:09 2020 +0800 d3d9: Report d3d9 adapter group information in device caps. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/d3d9_private.h | 3 ++- dlls/d3d9/device.c | 47 +++++++++++++++++++++++++++++++++++++++-------- dlls/d3d9/directx.c | 2 +- dlls/wined3d/directx.c | 4 ---- include/wine/wined3d.h | 4 ---- 5 files changed, 42 insertions(+), 18 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index a0daaf4288..ff9a8fec0b 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -59,7 +59,6 @@ enum wined3d_format_id wined3dformat_from_d3dformat(D3DFORMAT format) DECLSPEC_H unsigned int wined3dmapflags_from_d3dmapflags(unsigned int flags, unsigned int usage) DECLSPEC_HIDDEN; void present_parameters_from_wined3d_swapchain_desc(D3DPRESENT_PARAMETERS *present_parameters, const struct wined3d_swapchain_desc *swapchain_desc, DWORD presentation_interval) DECLSPEC_HIDDEN; -void d3dcaps_from_wined3dcaps(D3DCAPS9 *caps, const struct wined3d_caps *wined3d_caps) DECLSPEC_HIDDEN; struct d3d9 { @@ -71,6 +70,8 @@ struct d3d9 BOOL extended; }; +void d3d9_caps_from_wined3dcaps(const struct d3d9 *d3d9, unsigned int adapter_ordinal, + D3DCAPS9 *caps, const struct wined3d_caps *wined3d_caps) DECLSPEC_HIDDEN; BOOL d3d9_init(struct d3d9 *d3d9, BOOL extended) DECLSPEC_HIDDEN; struct fvf_declaration diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 85798db444..4ac38c0e89 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -360,7 +360,8 @@ static BOOL wined3d_swapchain_desc_from_present_parameters(struct wined3d_swapch return TRUE; } -void d3dcaps_from_wined3dcaps(D3DCAPS9 *caps, const struct wined3d_caps *wined3d_caps) +void d3d9_caps_from_wined3dcaps(const struct d3d9 *d3d9, unsigned int adapter_ordinal, + D3DCAPS9 *caps, const struct wined3d_caps *wined3d_caps) { static const DWORD ps_minor_version[] = {0, 4, 0, 0}; static const DWORD vs_minor_version[] = {0, 1, 0, 0}; @@ -370,9 +371,14 @@ void d3dcaps_from_wined3dcaps(D3DCAPS9 *caps, const struct wined3d_caps *wined3d D3DPTFILTERCAPS_MIPFPOINT | D3DPTFILTERCAPS_MIPFLINEAR | D3DPTFILTERCAPS_MAGFPOINT | D3DPTFILTERCAPS_MAGFLINEAR |D3DPTFILTERCAPS_MAGFANISOTROPIC|D3DPTFILTERCAPS_MAGFPYRAMIDALQUAD| D3DPTFILTERCAPS_MAGFGAUSSIANQUAD; + struct wined3d_adapter *wined3d_adapter; + struct wined3d_output_desc output_desc; + struct wined3d_output *wined3d_output; + unsigned int output_idx; + HRESULT hr; caps->DeviceType = (D3DDEVTYPE)wined3d_caps->DeviceType; - caps->AdapterOrdinal = wined3d_caps->AdapterOrdinal; + caps->AdapterOrdinal = adapter_ordinal; caps->Caps = wined3d_caps->Caps; caps->Caps2 = wined3d_caps->Caps2; caps->Caps3 = wined3d_caps->Caps3; @@ -426,9 +432,6 @@ void d3dcaps_from_wined3dcaps(D3DCAPS9 *caps, const struct wined3d_caps *wined3d caps->PixelShader1xMaxValue = wined3d_caps->PixelShader1xMaxValue; caps->DevCaps2 = wined3d_caps->DevCaps2; caps->MaxNpatchTessellationLevel = wined3d_caps->MaxNpatchTessellationLevel; - caps->MasterAdapterOrdinal = wined3d_caps->MasterAdapterOrdinal; - caps->AdapterOrdinalInGroup = wined3d_caps->AdapterOrdinalInGroup; - caps->NumberOfAdaptersInGroup = wined3d_caps->NumberOfAdaptersInGroup; caps->DeclTypes = wined3d_caps->DeclTypes; caps->NumSimultaneousRTs = wined3d_caps->NumSimultaneousRTs; caps->StretchRectFilterCaps = wined3d_caps->StretchRectFilterCaps; @@ -520,6 +523,32 @@ void d3dcaps_from_wined3dcaps(D3DCAPS9 *caps, const struct wined3d_caps *wined3d DWORD major = caps->VertexShaderVersion; caps->VertexShaderVersion = D3DVS_VERSION(major, vs_minor_version[major]); } + + /* Get adapter group information */ + output_idx = adapter_ordinal; + wined3d_output = d3d9->wined3d_outputs[output_idx]; + + wined3d_mutex_lock(); + hr = wined3d_output_get_desc(wined3d_output, &output_desc); + wined3d_mutex_unlock(); + + if (FAILED(hr)) + { + ERR("Failed to get output desc, hr %#x.\n", hr); + return; + } + + caps->MasterAdapterOrdinal = output_idx - output_desc.ordinal; + caps->AdapterOrdinalInGroup = output_desc.ordinal; + if (!caps->AdapterOrdinalInGroup) + { + wined3d_adapter = wined3d_output_get_adapter(wined3d_output); + caps->NumberOfAdaptersInGroup = wined3d_adapter_get_output_count(wined3d_adapter); + } + else + { + caps->NumberOfAdaptersInGroup = 0; + } } static void device_reset_viewport_state(struct d3d9_device *device) @@ -709,7 +738,7 @@ static HRESULT WINAPI d3d9_device_GetDeviceCaps(IDirect3DDevice9Ex *iface, D3DCA hr = wined3d_device_get_device_caps(device->wined3d_device, &wined3d_caps); wined3d_mutex_unlock(); - d3dcaps_from_wined3dcaps(caps, &wined3d_caps); + d3d9_caps_from_wined3dcaps(device->d3d_parent, device->adapter_ordinal, caps, &wined3d_caps); return hr; } @@ -4595,9 +4624,10 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine struct wined3d_swapchain_desc *swapchain_desc; struct wined3d_adapter *wined3d_adapter; struct d3d9_swapchain *d3d_swapchain; - struct wined3d_caps caps; + struct wined3d_caps wined3d_caps; unsigned int output_idx; unsigned i, count = 1; + D3DCAPS9 caps; HRESULT hr; static const enum wined3d_feature_level feature_levels[] = @@ -4636,7 +4666,8 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine return hr; } - wined3d_get_device_caps(wined3d_adapter, device_type, &caps); + wined3d_get_device_caps(wined3d_adapter, device_type, &wined3d_caps); + d3d9_caps_from_wined3dcaps(parent, adapter, &caps, &wined3d_caps); device->max_user_clip_planes = caps.MaxUserClipPlanes; device->vs_uniform_count = caps.MaxVertexShaderConst; if (flags & D3DCREATE_ADAPTERGROUP_DEVICE) diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 9113ec1d5a..070387dde3 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -439,7 +439,7 @@ static HRESULT WINAPI d3d9_GetDeviceCaps(IDirect3D9Ex *iface, UINT adapter, D3DD hr = wined3d_get_device_caps(wined3d_adapter, device_type, &wined3d_caps); wined3d_mutex_unlock(); - d3dcaps_from_wined3dcaps(caps, &wined3d_caps); + d3d9_caps_from_wined3dcaps(d3d9, adapter, caps, &wined3d_caps); return hr; } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 4f3c9803c4..42cc5c8f92 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1888,7 +1888,6 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d_adapter *adapter, d3d_info = &adapter->d3d_info; caps->DeviceType = (device_type == WINED3D_DEVICE_TYPE_HAL) ? WINED3D_DEVICE_TYPE_HAL : WINED3D_DEVICE_TYPE_REF; - caps->AdapterOrdinal = adapter->ordinal; caps->Caps = 0; caps->Caps2 = WINED3DCAPS2_CANRENDERWINDOWED | @@ -2078,9 +2077,6 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d_adapter *adapter, caps->DevCaps2 = WINED3DDEVCAPS2_STREAMOFFSET | WINED3DDEVCAPS2_VERTEXELEMENTSCANSHARESTREAMOFFSET; caps->MaxNpatchTessellationLevel = 0; - caps->MasterAdapterOrdinal = 0; - caps->AdapterOrdinalInGroup = 0; - caps->NumberOfAdaptersInGroup = 1; caps->NumSimultaneousRTs = d3d_info->limits.max_rt_count; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index e989fff089..30b6f9a7e8 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1909,7 +1909,6 @@ struct wined3d_ddraw_caps struct wined3d_caps { enum wined3d_device_type DeviceType; - UINT AdapterOrdinal; DWORD Caps; DWORD Caps2; @@ -1977,9 +1976,6 @@ struct wined3d_caps float MaxNpatchTessellationLevel; - UINT MasterAdapterOrdinal; - UINT AdapterOrdinalInGroup; - UINT NumberOfAdaptersInGroup; DWORD DeclTypes; DWORD NumSimultaneousRTs; DWORD StretchRectFilterCaps;

1 0

Jacek Caban : dbghelp: Use Windows API to map macho files.
by Alexandre Julliard 19 Mar '20

19 Mar '20

Module: wine Branch: master Commit: ebf57f01f4890b726a0af702ab7751258f5ab03d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ebf57f01f4890b726a0af702… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 19 18:35:54 2020 +0100 dbghelp: Use Windows API to map macho files. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/image_private.h | 2 +- dlls/dbghelp/macho_module.c | 136 +++++++++++++++++++------------------------ 2 files changed, 61 insertions(+), 77 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ebf57f01f4890b726a0a…

1 0

Zebediah Figura : kernel32/tests: Add some tests for mounted folders.
by Alexandre Julliard 19 Mar '20

19 Mar '20

Module: wine Branch: master Commit: 5885c70b18f7293e33537a04581363faa887016b URL: https://source.winehq.org/git/wine.git/?a=commit;h=5885c70b18f7293e33537a04… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 15 16:56:52 2020 -0500 kernel32/tests: Add some tests for mounted folders. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/volume.c | 231 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 231 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5885c70b18f7293e3353…

1 0

Zebediah Figura : kernel32/tests: Remove a test for Unix-style paths.
by Alexandre Julliard 19 Mar '20

19 Mar '20

Module: wine Branch: master Commit: 7c6222838c40f11e44c6076b1a8c8b019920040f URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c6222838c40f11e44c6076b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 15 16:56:53 2020 -0500 kernel32/tests: Remove a test for Unix-style paths. Wine intentionally treats these specially, so there is no point in testing them. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/volume.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index cb834aa3c3..ded167f3e0 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -847,26 +847,22 @@ static void test_GetVolumePathNameA(void) NO_ERROR, NO_ERROR }, { /* test 37 */ - "/unix-style/absolute/path", "%CurrentDrive%\\", sizeof(volume_path), - NO_ERROR, NO_ERROR - }, - { /* test 38 */ "\\??\\C:\\NonExistent", "%CurrentDrive%\\", sizeof(volume_path), NO_ERROR, NO_ERROR }, - { /* test 39 */ + { /* test 38 */ "\\??\\M:\\NonExistent", "%CurrentDrive%\\", sizeof(volume_path), NO_ERROR, NO_ERROR }, - { /* test 40 */ + { /* test 39 */ "somefile:def", "%CurrentDrive%\\", sizeof(volume_path), NO_ERROR, NO_ERROR }, - { /* test 41 */ + { /* test 40 */ "s:omefile", "S:\\" /* win2k, winxp */, sizeof(volume_path), ERROR_FILE_NOT_FOUND, NO_ERROR }, - { /* test 42: a reasonable forward slash path that is guaranteed to exist */ + { /* test 41: a reasonable forward slash path that is guaranteed to exist */ "C:/windows/system32", "C:\\", sizeof(volume_path), NO_ERROR, NO_ERROR },

1 0

Vijay Kiran Kamuju : include: Add missing effect related defines and enums in dsound.h.
by Alexandre Julliard 19 Mar '20

19 Mar '20

Module: wine Branch: master Commit: 8f1ec07e48c8bed452a533a10f49d8c3e8f5440c URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f1ec07e48c8bed452a533a1… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sun Mar 15 18:27:00 2020 +0100 include: Add missing effect related defines and enums in dsound.h. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dsound.h | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) diff --git a/include/dsound.h b/include/dsound.h index b4a2509e89..d397e2315c 100644 --- a/include/dsound.h +++ b/include/dsound.h @@ -1769,6 +1769,92 @@ DECLARE_INTERFACE_(IDirectSoundFXWavesReverb,IUnknown) #define IDirectSoundFXWavesReverb_GetAllParameters(p,a) (p)->GetAllParameters(a) #endif +enum +{ + DSFX_I3DL2_MATERIAL_PRESET_SINGLEWINDOW, + DSFX_I3DL2_MATERIAL_PRESET_DOUBLEWINDOW, + DSFX_I3DL2_MATERIAL_PRESET_THINDOOR, + DSFX_I3DL2_MATERIAL_PRESET_THICKDOOR, + DSFX_I3DL2_MATERIAL_PRESET_WOODWALL, + DSFX_I3DL2_MATERIAL_PRESET_BRICKWALL, + DSFX_I3DL2_MATERIAL_PRESET_STONEWALL, + DSFX_I3DL2_MATERIAL_PRESET_CURTAIN +}; + +#define I3DL2_MATERIAL_PRESET_SINGLEWINDOW -2800,0.71f +#define I3DL2_MATERIAL_PRESET_DOUBLEWINDOW -5000,0.40f +#define I3DL2_MATERIAL_PRESET_THINDOOR -1800,0.66f +#define I3DL2_MATERIAL_PRESET_THICKDOOR -4400,0.64f +#define I3DL2_MATERIAL_PRESET_WOODWALL -4000,0.50f +#define I3DL2_MATERIAL_PRESET_BRICKWALL -5000,0.60f +#define I3DL2_MATERIAL_PRESET_STONEWALL -6000,0.68f +#define I3DL2_MATERIAL_PRESET_CURTAIN -1200,0.15f + +enum +{ + DSFX_I3DL2_ENVIRONMENT_PRESET_DEFAULT, + DSFX_I3DL2_ENVIRONMENT_PRESET_GENERIC, + DSFX_I3DL2_ENVIRONMENT_PRESET_PADDEDCELL, + DSFX_I3DL2_ENVIRONMENT_PRESET_ROOM, + DSFX_I3DL2_ENVIRONMENT_PRESET_BATHROOM, + DSFX_I3DL2_ENVIRONMENT_PRESET_LIVINGROOM, + DSFX_I3DL2_ENVIRONMENT_PRESET_STONEROOM, + DSFX_I3DL2_ENVIRONMENT_PRESET_AUDITORIUM, + DSFX_I3DL2_ENVIRONMENT_PRESET_CONCERTHALL, + DSFX_I3DL2_ENVIRONMENT_PRESET_CAVE, + DSFX_I3DL2_ENVIRONMENT_PRESET_ARENA, + DSFX_I3DL2_ENVIRONMENT_PRESET_HANGAR, + DSFX_I3DL2_ENVIRONMENT_PRESET_CARPETEDHALLWAY, + DSFX_I3DL2_ENVIRONMENT_PRESET_HALLWAY, + DSFX_I3DL2_ENVIRONMENT_PRESET_STONECORRIDOR, + DSFX_I3DL2_ENVIRONMENT_PRESET_ALLEY, + DSFX_I3DL2_ENVIRONMENT_PRESET_FOREST, + DSFX_I3DL2_ENVIRONMENT_PRESET_CITY, + DSFX_I3DL2_ENVIRONMENT_PRESET_MOUNTAINS, + DSFX_I3DL2_ENVIRONMENT_PRESET_QUARRY, + DSFX_I3DL2_ENVIRONMENT_PRESET_PLAIN, + DSFX_I3DL2_ENVIRONMENT_PRESET_PARKINGLOT, + DSFX_I3DL2_ENVIRONMENT_PRESET_SEWERPIPE, + DSFX_I3DL2_ENVIRONMENT_PRESET_UNDERWATER, + DSFX_I3DL2_ENVIRONMENT_PRESET_SMALLROOM, + DSFX_I3DL2_ENVIRONMENT_PRESET_MEDIUMROOM, + DSFX_I3DL2_ENVIRONMENT_PRESET_LARGEROOM, + DSFX_I3DL2_ENVIRONMENT_PRESET_MEDIUMHALL, + DSFX_I3DL2_ENVIRONMENT_PRESET_LARGEHALL, + DSFX_I3DL2_ENVIRONMENT_PRESET_PLATE +}; + +#define I3DL2_ENVIRONMENT_PRESET_DEFAULT -1000,-100,0.0f,1.49f,0.83f,-2602,0.007f,200,0.011f,100.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_GENERIC -1000,-100,0.0f,1.49f,0.83f,-2602,0.007f,200,0.011f,100.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_PADDEDCELL -1000,-6000,0.0f,0.17f,0.10f,-1204,0.001f,207,0.002f,100.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_ROOM -1000,-454,0.0f,0.40f,0.83f,-1646,0.002f,53,0.003f,100.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_BATHROOM -1000,-1200,0.0f,1.49f,0.54f,-370,0.007f,1030,0.011f,100.0f,60.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_LIVINGROOM -1000,-6000,0.0f,0.50f,0.10f,-1376,0.003f,-1104,0.004f,100.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_STONEROOM -1000,-300,0.0f,2.31f,0.64f,-711,0.012f,83,0.017f,100.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_AUDITORIUM -1000,-476,0.0f,4.32f,0.59f,-789,0.020f,-289,0.030f,100.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_CONCERTHALL -1000,-500,0.0f,3.92f,0.70f,-1230,0.020f,-2,0.029f,100.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_CAVE -1000,0,0.0f,2.91f,1.30f,-602,0.015f,-302,0.022f,100.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_ARENA -1000,-698,0.0f,7.24f,0.33f,-1166,0.020f,16,0.030f,100.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_HANGAR -1000,-1000,0.0f,10.05f,0.23f,-602,0.020f,198,0.030f,100.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_CARPETEDHALLWAY -1000,-4000,0.0f,0.30f,0.10f,-1831,0.002f,-1630,0.030f,100.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_HALLWAY -1000,-300,0.0f,1.49f,0.59f,-1219,0.007f,441,0.011f,100.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_STONECORRIDOR -1000,-237,0.0f,2.70f,0.79f,-1214,0.013f,395,0.020f,100.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_ALLEY -1000,-270,0.0f,1.49f,0.86f,-1204,0.007f,-4,0.011f,100.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_FOREST -1000,-3300,0.0f,1.49f,0.54f,-2560,0.162f,-613,0.088f,79.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_CITY -1000,-800,0.0f,1.49f,0.67f,-2273,0.007f,2217,0.011f,50.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_MOUNTAINS -1000,-2500,0.0f,1.49f,0.21f,-2780,0.300f,-2014,0.100f,27.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_QUARRY -1000,-1000,0.0f,1.49f,0.83f,-10000,0.061f,500,0.025f,100.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_PLAIN -1000,-2000,0.0f,1.49f,0.50f,-2466,0.179f,-2514,0.100f,21.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_PARKINGLOT -1000,0,0.0f,1.65f,1.50f,-1363,0.008f,-1153,0.012f,100.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_SEWERPIPE -1000,-1000,0.0f,2.81f,0.14f,429,0.014f,648,0.011f,80.0f,60.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_UNDERWATER -1000,-4000,0.0f,1.49f,0.10f,-449,0.007f,1700,0.011f,100.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_SMALLROOM -1000,-600,0.0f,1.10f,0.83f,-400,0.005f,500,0.010f,100.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_MEDIUMROOM -1000,-600,0.0f,1.30f,0.83f,-1000,0.010f,-200,0.020f,100.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_LARGEROOM -1000,-600,0.0f,1.50f,0.83f,-1600,0.020f,-1000,0.040f,100.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_MEDIUMHALL -1000,-600,0.0f,1.80f,0.70f,-1300,0.015f,-800,0.030f,100.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_LARGEHALL -1000,-600,0.0f,1.80f,0.70f,-2000,0.030f,-1400,0.060f,100.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_PLATE -1000,-200,0.0f,1.30f,0.90f,0,0.002f,0,0.010f,100.0f,75.0f,5000.0f + #ifdef __cplusplus } /* extern "C" */ #endif /* defined(__cplusplus) */

1 0