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

Michael Stefaniuc : d3dx9: Merge the d3dx_effect_GetBool() helper.
by Alexandre Julliard 07 Mar '19

07 Mar '19

Module: wine Branch: master Commit: cca43ca090ccb27c5e3d3564dbe69a424f0c9872 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cca43ca090ccb27c5e3d3564… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Mar 5 22:34:25 2019 +0100 d3dx9: Merge the d3dx_effect_GetBool() helper. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 8147dc1..4ff695c 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1361,22 +1361,6 @@ static HRESULT d3dx9_base_effect_set_bool(struct d3dx9_base_effect *base, D3DXHA return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_get_bool(struct d3dx9_base_effect *base, D3DXHANDLE parameter, BOOL *b) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (b && param && !param->element_count && param->rows == 1 && param->columns == 1) - { - set_number(b, D3DXPT_BOOL, param->data, param->type); - TRACE("Returning %s\n", *b ? "TRUE" : "FALSE"); - return D3D_OK; - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_bool_array(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const BOOL *b, UINT count) { @@ -3510,10 +3494,20 @@ static HRESULT WINAPI d3dx_effect_SetBool(ID3DXEffect *iface, D3DXHANDLE paramet static HRESULT WINAPI d3dx_effect_GetBool(ID3DXEffect *iface, D3DXHANDLE parameter, BOOL *b) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, b %p.\n", iface, parameter, b); - return d3dx9_base_effect_get_bool(&effect->base_effect, parameter, b); + if (b && param && !param->element_count && param->rows == 1 && param->columns == 1) + { + set_number(b, D3DXPT_BOOL, param->data, param->type); + TRACE("Returning %s\n", *b ? "TRUE" : "FALSE"); + return D3D_OK; + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_SetBoolArray(ID3DXEffect *iface, D3DXHANDLE parameter, const BOOL *b, UINT count)

1 0

Michael Stefaniuc : d3dx9: Merge the d3dx_effect_GetBoolArray() helper.
by Alexandre Julliard 07 Mar '19

07 Mar '19

Module: wine Branch: master Commit: ab7756619c1b16c761618a68d1b6a06ad437cbe8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab7756619c1b16c761618a68… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Mar 5 22:34:26 2019 +0100 d3dx9: Merge the d3dx_effect_GetBoolArray() helper. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 43 ++++++++++++++++++------------------------- 1 file changed, 18 insertions(+), 25 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 4ff695c..4deb40f 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1400,30 +1400,6 @@ static HRESULT d3dx9_base_effect_set_bool_array(struct d3dx9_base_effect *base, return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_get_bool_array(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, BOOL *b, UINT count) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (b && param && (param->class == D3DXPC_SCALAR - || param->class == D3DXPC_VECTOR - || param->class == D3DXPC_MATRIX_ROWS - || param->class == D3DXPC_MATRIX_COLUMNS)) - { - UINT i, size = min(count, param->bytes / sizeof(DWORD)); - - for (i = 0; i < size; ++i) - { - set_number(&b[i], D3DXPT_BOOL, (DWORD *)param->data + i, param->type); - } - return D3D_OK; - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_int(struct d3dx9_base_effect *base, D3DXHANDLE parameter, INT n) { struct d3dx_parameter *param = get_valid_parameter(base, parameter); @@ -3522,10 +3498,27 @@ static HRESULT WINAPI d3dx_effect_SetBoolArray(ID3DXEffect *iface, D3DXHANDLE pa static HRESULT WINAPI d3dx_effect_GetBoolArray(ID3DXEffect *iface, D3DXHANDLE parameter, BOOL *b, UINT count) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, b %p, count %u.\n", iface, parameter, b, count); - return d3dx9_base_effect_get_bool_array(&effect->base_effect, parameter, b, count); + if (b && param && (param->class == D3DXPC_SCALAR + || param->class == D3DXPC_VECTOR + || param->class == D3DXPC_MATRIX_ROWS + || param->class == D3DXPC_MATRIX_COLUMNS)) + { + unsigned int i, size = min(count, param->bytes / sizeof(DWORD)); + + for (i = 0; i < size; ++i) + { + set_number(&b[i], D3DXPT_BOOL, (DWORD *)param->data + i, param->type); + } + return D3D_OK; + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_SetInt(ID3DXEffect *iface, D3DXHANDLE parameter, INT n)

1 0

Ken Thomases : kernel32: Remove some duplicate code.
by Alexandre Julliard 07 Mar '19

07 Mar '19

Module: wine Branch: master Commit: 4dd5e533b10a93a20637961ad2ba22b4195f5767 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4dd5e533b10a93a20637961a… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 6 18:54:58 2019 -0600 kernel32: Remove some duplicate code. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 89b561e..09f0433 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -344,11 +344,6 @@ static enum binary_type get_binary_info( HANDLE hfile, pe_image_info_t *info ) case 2: return BINARY_UNIX_EXE; case 8: return BINARY_UNIX_LIB; } - switch(header.macho.filetype) - { - case 2: return BINARY_UNIX_EXE; - case 8: return BINARY_UNIX_LIB; - } } return BINARY_UNKNOWN; }

1 0

Józef Kucia : d3d12: Remove export ordinals.
by Alexandre Julliard 07 Mar '19

07 Mar '19

Module: wine Branch: master Commit: ffe1049e54a80684c7f5111474ee2613f8fd330a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ffe1049e54a80684c7f51114… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 7 11:21:20 2019 +0100 d3d12: Remove export ordinals. 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/d3d12/d3d12.spec | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/d3d12/d3d12.spec b/dlls/d3d12/d3d12.spec index 53151bf..3361381 100644 --- a/dlls/d3d12/d3d12.spec +++ b/dlls/d3d12/d3d12.spec @@ -1,8 +1,8 @@ -100 stub GetBehaviorValue -101 stdcall D3D12CreateDevice(ptr long ptr ptr) -102 stdcall D3D12GetDebugInterface(ptr ptr) -103 stub D3D12CoreCreateLayeredDevice -104 stub D3D12CoreGetLayeredDeviceSize -105 stub D3D12CoreRegisterLayers -106 stdcall D3D12CreateRootSignatureDeserializer(ptr long ptr ptr) -107 stdcall D3D12SerializeRootSignature(ptr long ptr ptr) +@ stub GetBehaviorValue +@ stdcall D3D12CreateDevice(ptr long ptr ptr) +@ stdcall D3D12GetDebugInterface(ptr ptr) +@ stub D3D12CoreCreateLayeredDevice +@ stub D3D12CoreGetLayeredDeviceSize +@ stub D3D12CoreRegisterLayers +@ stdcall D3D12CreateRootSignatureDeserializer(ptr long ptr ptr) +@ stdcall D3D12SerializeRootSignature(ptr long ptr ptr)

1 0

Józef Kucia : d3d12: Add stub for D3D12EnableExperimentalFeatures().
by Alexandre Julliard 07 Mar '19

07 Mar '19

Module: wine Branch: master Commit: 8de1e92fc2ed5f3faec98c7e39a5f1dfa94272f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8de1e92fc2ed5f3faec98c7e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 7 11:21:21 2019 +0100 d3d12: Add stub for D3D12EnableExperimentalFeatures(). 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/d3d12/d3d12.spec | 1 + dlls/d3d12/d3d12_main.c | 9 +++++++++ include/d3d12.idl | 3 +++ 3 files changed, 13 insertions(+) diff --git a/dlls/d3d12/d3d12.spec b/dlls/d3d12/d3d12.spec index 3361381..9e79891 100644 --- a/dlls/d3d12/d3d12.spec +++ b/dlls/d3d12/d3d12.spec @@ -6,3 +6,4 @@ @ stub D3D12CoreRegisterLayers @ stdcall D3D12CreateRootSignatureDeserializer(ptr long ptr ptr) @ stdcall D3D12SerializeRootSignature(ptr long ptr ptr) +@ stdcall D3D12EnableExperimentalFeatures(long ptr ptr ptr) diff --git a/dlls/d3d12/d3d12_main.c b/dlls/d3d12/d3d12_main.c index f0c48ee..92a235e 100644 --- a/dlls/d3d12/d3d12_main.c +++ b/dlls/d3d12/d3d12_main.c @@ -45,6 +45,15 @@ HRESULT WINAPI D3D12GetDebugInterface(REFIID iid, void **debug) return DXGI_ERROR_SDK_COMPONENT_MISSING; } +HRESULT WINAPI D3D12EnableExperimentalFeatures(UINT feature_count, + const IID *iids, void *configurations, UINT *configurations_sizes) +{ + FIXME("feature_count %u, iids %p, configurations %p, configurations_sizes %p stub!\n", + feature_count, iids, configurations, configurations_sizes); + + return E_NOINTERFACE; +} + static HRESULT d3d12_signal_event(HANDLE event) { return SetEvent(event) ? S_OK : E_FAIL; diff --git a/include/d3d12.idl b/include/d3d12.idl index 6f515e6..307a4fd 100644 --- a/include/d3d12.idl +++ b/include/d3d12.idl @@ -2180,3 +2180,6 @@ typedef HRESULT (__stdcall *PFN_D3D12_CREATE_DEVICE)(IUnknown *adapter, typedef HRESULT (__stdcall *PFN_D3D12_GET_DEBUG_INTERFACE)(REFIID iid, void **debug); [local] HRESULT __stdcall D3D12GetDebugInterface(REFIID iid, void **debug); + +[local] HRESULT __stdcall D3D12EnableExperimentalFeatures(UINT feature_count, + const IID *iids, void *configurations, UINT *configurations_sizes);

1 0

Józef Kucia : d3d12: Add stub for D3D12SerializeVersionedRootSignature().
by Alexandre Julliard 07 Mar '19

07 Mar '19

Module: wine Branch: master Commit: 5307a251e5fa0c87023e78fac3e1a59d7d2b0047 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5307a251e5fa0c87023e78fa… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 7 11:21:22 2019 +0100 d3d12: Add stub for D3D12SerializeVersionedRootSignature(). 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/d3d12/d3d12.spec | 2 ++ dlls/d3d12/d3d12_main.c | 13 +++++++++++++ include/d3d12.idl | 4 ++++ 3 files changed, 19 insertions(+) diff --git a/dlls/d3d12/d3d12.spec b/dlls/d3d12/d3d12.spec index 9e79891..5c4f4cf 100644 --- a/dlls/d3d12/d3d12.spec +++ b/dlls/d3d12/d3d12.spec @@ -7,3 +7,5 @@ @ stdcall D3D12CreateRootSignatureDeserializer(ptr long ptr ptr) @ stdcall D3D12SerializeRootSignature(ptr long ptr ptr) @ stdcall D3D12EnableExperimentalFeatures(long ptr ptr ptr) +#@ stub D3D12CreateVersionedRootSignatureDeserializer +@ stdcall D3D12SerializeVersionedRootSignature(ptr ptr ptr) diff --git a/dlls/d3d12/d3d12_main.c b/dlls/d3d12/d3d12_main.c index 92a235e..d6d691c 100644 --- a/dlls/d3d12/d3d12_main.c +++ b/dlls/d3d12/d3d12_main.c @@ -182,3 +182,16 @@ HRESULT WINAPI D3D12SerializeRootSignature(const D3D12_ROOT_SIGNATURE_DESC *root return vkd3d_serialize_root_signature(root_signature_desc, version, blob, error_blob); } + +HRESULT WINAPI D3D12SerializeVersionedRootSignature(const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *desc, + ID3DBlob **blob, ID3DBlob **error_blob) +{ + FIXME("desc %p, blob %p, error_blob %p partial-stub!\n", + desc, blob, error_blob); + + if (desc->Version == D3D_ROOT_SIGNATURE_VERSION_1_0) + return D3D12SerializeRootSignature(&desc->Desc_1_0, desc->Version, blob, error_blob); + + FIXME("Unsupported version %#x.\n", desc->Version); + return E_NOTIMPL; +} diff --git a/include/d3d12.idl b/include/d3d12.idl index 307a4fd..3a5a914 100644 --- a/include/d3d12.idl +++ b/include/d3d12.idl @@ -2171,6 +2171,10 @@ interface ID3D12RootSignatureDeserializer : IUnknown const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *root_signature_desc, ID3DBlob **blob, ID3DBlob **error_blob); +[local] HRESULT __stdcall D3D12SerializeVersionedRootSignature( + const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *desc, + ID3DBlob **blob, ID3DBlob **error_blob); + typedef HRESULT (__stdcall *PFN_D3D12_CREATE_DEVICE)(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_feature_level, REFIID iid, void **device);

1 0

Józef Kucia : dxgi: Implement dxgi_output_GetDisplayModeList1().
by Alexandre Julliard 07 Mar '19

07 Mar '19

Module: wine Branch: master Commit: b817be926d86510874b6b728c75fc62ae697c32e URL: https://source.winehq.org/git/wine.git/?a=commit;h=b817be926d86510874b6b728… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 7 11:21:23 2019 +0100 dxgi: Implement dxgi_output_GetDisplayModeList1(). 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/output.c | 149 ++++++++++++++++++++++++++++++++--------------------- 1 file changed, 90 insertions(+), 59 deletions(-) diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index b1f20b9..4a4b0fc 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -75,6 +75,85 @@ static HRESULT dxgi_output_find_closest_matching_mode(struct dxgi_output *output return hr; } +enum dxgi_mode_struct_version +{ + DXGI_MODE_STRUCT_VERSION_0, + DXGI_MODE_STRUCT_VERSION_1, +}; + +static HRESULT dxgi_output_get_display_mode_list(struct dxgi_output *output, + DXGI_FORMAT format, unsigned int *mode_count, void *modes, + enum dxgi_mode_struct_version struct_version) +{ + enum wined3d_format_id wined3d_format; + struct wined3d_display_mode mode; + unsigned int i, max_count; + struct wined3d *wined3d; + HRESULT hr; + + if (!mode_count) + return DXGI_ERROR_INVALID_CALL; + + if (format == DXGI_FORMAT_UNKNOWN) + { + *mode_count = 0; + return S_OK; + } + + wined3d_format = wined3dformat_from_dxgi_format(format); + + wined3d_mutex_lock(); + wined3d = output->adapter->factory->wined3d; + max_count = wined3d_get_adapter_mode_count(wined3d, output->adapter->ordinal, + wined3d_format, WINED3D_SCANLINE_ORDERING_UNKNOWN); + + if (!modes) + { + wined3d_mutex_unlock(); + *mode_count = max_count; + return S_OK; + } + + if (max_count > *mode_count) + { + wined3d_mutex_unlock(); + return DXGI_ERROR_MORE_DATA; + } + + *mode_count = max_count; + + for (i = 0; i < *mode_count; ++i) + { + if (FAILED(hr = wined3d_enum_adapter_modes(wined3d, output->adapter->ordinal, + wined3d_format, WINED3D_SCANLINE_ORDERING_UNKNOWN, i, &mode))) + { + WARN("Failed to enum adapter mode %u, hr %#x.\n", i, hr); + wined3d_mutex_unlock(); + return hr; + } + + switch (struct_version) + { + case DXGI_MODE_STRUCT_VERSION_0: + { + DXGI_MODE_DESC *desc = modes; + dxgi_mode_from_wined3d(&desc[i], &mode); + break; + } + + case DXGI_MODE_STRUCT_VERSION_1: + { + DXGI_MODE_DESC1 *desc = modes; + dxgi_mode1_from_wined3d(&desc[i], &mode); + break; + } + } + } + wined3d_mutex_unlock(); + + return S_OK; +} + static inline struct dxgi_output *impl_from_IDXGIOutput4(IDXGIOutput4 *iface) { return CONTAINING_RECORD(iface, struct dxgi_output, IDXGIOutput4_iface); @@ -208,66 +287,15 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetDesc(IDXGIOutput4 *iface, DXGI_O } static HRESULT STDMETHODCALLTYPE dxgi_output_GetDisplayModeList(IDXGIOutput4 *iface, - DXGI_FORMAT format, UINT flags, UINT *mode_count, DXGI_MODE_DESC *desc) + DXGI_FORMAT format, UINT flags, UINT *mode_count, DXGI_MODE_DESC *modes) { struct dxgi_output *output = impl_from_IDXGIOutput4(iface); - enum wined3d_format_id wined3d_format; - unsigned int i, max_count; - struct wined3d *wined3d; - - FIXME("iface %p, format %s, flags %#x, mode_count %p, desc %p partial stub!\n", - iface, debug_dxgi_format(format), flags, mode_count, desc); - - if (!mode_count) - return DXGI_ERROR_INVALID_CALL; - - if (format == DXGI_FORMAT_UNKNOWN) - { - *mode_count = 0; - return S_OK; - } - wined3d = output->adapter->factory->wined3d; - wined3d_format = wined3dformat_from_dxgi_format(format); + FIXME("iface %p, format %s, flags %#x, mode_count %p, modes %p partial stub!\n", + iface, debug_dxgi_format(format), flags, mode_count, modes); - wined3d_mutex_lock(); - max_count = wined3d_get_adapter_mode_count(wined3d, output->adapter->ordinal, - wined3d_format, WINED3D_SCANLINE_ORDERING_UNKNOWN); - - if (!desc) - { - wined3d_mutex_unlock(); - *mode_count = max_count; - return S_OK; - } - - if (max_count > *mode_count) - { - wined3d_mutex_unlock(); - return DXGI_ERROR_MORE_DATA; - } - - *mode_count = max_count; - - for (i = 0; i < *mode_count; ++i) - { - struct wined3d_display_mode mode; - HRESULT hr; - - hr = wined3d_enum_adapter_modes(wined3d, output->adapter->ordinal, wined3d_format, - WINED3D_SCANLINE_ORDERING_UNKNOWN, i, &mode); - if (FAILED(hr)) - { - WARN("EnumAdapterModes failed, hr %#x.\n", hr); - wined3d_mutex_unlock(); - return hr; - } - - dxgi_mode_from_wined3d(&desc[i], &mode); - } - wined3d_mutex_unlock(); - - return S_OK; + return dxgi_output_get_display_mode_list(output, + format, mode_count, modes, DXGI_MODE_STRUCT_VERSION_0); } static HRESULT STDMETHODCALLTYPE dxgi_output_FindClosestMatchingMode(IDXGIOutput4 *iface, @@ -378,10 +406,13 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetFrameStatistics(IDXGIOutput4 *if static HRESULT STDMETHODCALLTYPE dxgi_output_GetDisplayModeList1(IDXGIOutput4 *iface, DXGI_FORMAT format, UINT flags, UINT *mode_count, DXGI_MODE_DESC1 *modes) { - FIXME("iface %p, format %#x, flags %#x, mode_count %p, modes %p stub!\n", - iface, format, flags, mode_count, modes); + struct dxgi_output *output = impl_from_IDXGIOutput4(iface); - return E_NOTIMPL; + FIXME("iface %p, format %s, flags %#x, mode_count %p, modes %p partial stub!\n", + iface, debug_dxgi_format(format), flags, mode_count, modes); + + return dxgi_output_get_display_mode_list(output, + format, mode_count, modes, DXGI_MODE_STRUCT_VERSION_1); } static HRESULT STDMETHODCALLTYPE dxgi_output_FindClosestMatchingMode1(IDXGIOutput4 *iface,

1 0

Józef Kucia : dxgi: Trace mode on separate line for FindClosestMatchingMode().
by Alexandre Julliard 07 Mar '19

07 Mar '19

Module: wine Branch: master Commit: b1a4af225807eea48300be440ff9e1ac691041de URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1a4af225807eea48300be44… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 7 11:21:24 2019 +0100 dxgi: Trace mode on separate line for FindClosestMatchingMode(). For more readable logs. 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/output.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index 4a4b0fc..123dee8 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -305,8 +305,10 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_FindClosestMatchingMode(IDXGIOutput struct wined3d_display_mode wined3d_mode; HRESULT hr; - TRACE("iface %p, mode %s, closest_match %p, device %p.\n", - iface, debug_dxgi_mode(mode), closest_match, device); + TRACE("iface %p, mode %p, closest_match %p, device %p.\n", + iface, mode, closest_match, device); + + TRACE("Mode: %s.\n", debug_dxgi_mode(mode)); wined3d_display_mode_from_dxgi(&wined3d_mode, mode); hr = dxgi_output_find_closest_matching_mode(output, &wined3d_mode, device); @@ -422,8 +424,10 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_FindClosestMatchingMode1(IDXGIOutpu struct wined3d_display_mode wined3d_mode; HRESULT hr; - TRACE("iface %p, mode %s, closest_match %p, device %p.\n", - iface, debug_dxgi_mode1(mode), closest_match, device); + TRACE("iface %p, mode %p, closest_match %p, device %p.\n", + iface, mode, closest_match, device); + + TRACE("Mode: %s.\n", debug_dxgi_mode1(mode)); wined3d_display_mode_from_dxgi1(&wined3d_mode, mode); hr = dxgi_output_find_closest_matching_mode(output, &wined3d_mode, device);

1 0

Hans Leidekker : amsi: New dll.
by Alexandre Julliard 07 Mar '19

07 Mar '19

Module: wine Branch: master Commit: e581835a8c8a79d718c88b5d745be646b5b0f425 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e581835a8c8a79d718c88b5d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Mar 7 14:14:12 2019 +0100 amsi: New dll. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/amsi/Makefile.in | 1 + dlls/amsi/amsi.spec | 13 +++++++++++++ 4 files changed, 17 insertions(+) diff --git a/configure b/configure index 5f9aca9..1d80c01 100755 --- a/configure +++ b/configure @@ -899,6 +899,7 @@ enable_adsldp enable_adsldpc enable_advapi32 enable_advpack +enable_amsi enable_amstream enable_api_ms_win_appmodel_identity_l1_1_0 enable_api_ms_win_appmodel_runtime_l1_1_1 @@ -19225,6 +19226,7 @@ wine_fn_config_makefile dlls/advapi32 enable_advapi32 wine_fn_config_makefile dlls/advapi32/tests enable_tests wine_fn_config_makefile dlls/advpack enable_advpack wine_fn_config_makefile dlls/advpack/tests enable_tests +wine_fn_config_makefile dlls/amsi enable_amsi wine_fn_config_makefile dlls/amstream enable_amstream wine_fn_config_makefile dlls/amstream/tests enable_tests wine_fn_config_makefile dlls/api-ms-win-appmodel-identity-l1-1-0 enable_api_ms_win_appmodel_identity_l1_1_0 diff --git a/configure.ac b/configure.ac index a55d2f8..71e8606 100644 --- a/configure.ac +++ b/configure.ac @@ -2869,6 +2869,7 @@ WINE_CONFIG_MAKEFILE(dlls/advapi32) WINE_CONFIG_MAKEFILE(dlls/advapi32/tests) WINE_CONFIG_MAKEFILE(dlls/advpack) WINE_CONFIG_MAKEFILE(dlls/advpack/tests) +WINE_CONFIG_MAKEFILE(dlls/amsi) WINE_CONFIG_MAKEFILE(dlls/amstream) WINE_CONFIG_MAKEFILE(dlls/amstream/tests) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-appmodel-identity-l1-1-0) diff --git a/dlls/amsi/Makefile.in b/dlls/amsi/Makefile.in new file mode 100644 index 0000000..dfaec30 --- /dev/null +++ b/dlls/amsi/Makefile.in @@ -0,0 +1 @@ +MODULE = amsi.dll diff --git a/dlls/amsi/amsi.spec b/dlls/amsi/amsi.spec new file mode 100644 index 0000000..6c2b4ae --- /dev/null +++ b/dlls/amsi/amsi.spec @@ -0,0 +1,13 @@ +@ stub AmsiCloseSession +@ stub AmsiInitialize +@ stub AmsiOpenSession +@ stub AmsiScanBuffer +@ stub AmsiScanString +@ stub AmsiUacInitialize +@ stub AmsiUacScan +@ stub AmsiUacUninitialize +@ stub AmsiUninitialize +@ stub DllCanUnloadNow +@ stub DllGetClassObject +@ stub DllRegisterServer +@ stub DllUnregisterServer

1 0

Hans Leidekker : amsi: Add stub implementations for a couple of functions.
by Alexandre Julliard 07 Mar '19

07 Mar '19

Module: wine Branch: master Commit: 65f30810c17949498c95d64be7f3bdc6f48ae7d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=65f30810c17949498c95d64b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Mar 7 14:14:13 2019 +0100 amsi: Add stub implementations for a couple of functions. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amsi/Makefile.in | 3 +++ dlls/amsi/amsi.spec | 12 +++++----- dlls/amsi/main.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++ include/Makefile.in | 1 + include/amsi.idl | 36 ++++++++++++++++++++++++++++ 5 files changed, 111 insertions(+), 6 deletions(-) diff --git a/dlls/amsi/Makefile.in b/dlls/amsi/Makefile.in index dfaec30..213d3e0 100644 --- a/dlls/amsi/Makefile.in +++ b/dlls/amsi/Makefile.in @@ -1 +1,4 @@ MODULE = amsi.dll + +C_SRCS = \ + main.c diff --git a/dlls/amsi/amsi.spec b/dlls/amsi/amsi.spec index 6c2b4ae..27e6b3d 100644 --- a/dlls/amsi/amsi.spec +++ b/dlls/amsi/amsi.spec @@ -1,12 +1,12 @@ -@ stub AmsiCloseSession -@ stub AmsiInitialize -@ stub AmsiOpenSession -@ stub AmsiScanBuffer -@ stub AmsiScanString +@ stdcall AmsiCloseSession(ptr ptr) +@ stdcall AmsiInitialize(wstr ptr) +@ stdcall AmsiOpenSession(ptr ptr) +@ stdcall AmsiScanBuffer(ptr ptr long wstr ptr ptr) +@ stdcall AmsiScanString(ptr wstr wstr ptr ptr) @ stub AmsiUacInitialize @ stub AmsiUacScan @ stub AmsiUacUninitialize -@ stub AmsiUninitialize +@ stdcall AmsiUninitialize(ptr) @ stub DllCanUnloadNow @ stub DllGetClassObject @ stub DllRegisterServer diff --git a/dlls/amsi/main.c b/dlls/amsi/main.c new file mode 100644 index 0000000..f56e699 --- /dev/null +++ b/dlls/amsi/main.c @@ -0,0 +1,65 @@ +/* + * Copyright 2019 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "amsi.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(amsi); + +HRESULT WINAPI AmsiInitialize( const WCHAR *appname, HAMSICONTEXT *context ) +{ + FIXME( "%s, %p\n", debugstr_w(appname), context ); + *context = (HAMSICONTEXT)0xdeadbeef; + return S_OK; +} + +HRESULT WINAPI AmsiOpenSession( HAMSICONTEXT context, HAMSISESSION *session ) +{ + FIXME( "%p, %p\n", context, session ); + *session = (HAMSISESSION)0xdeadbeef; + return S_OK; +} + +void WINAPI AmsiCloseSession( HAMSICONTEXT context, HAMSISESSION session ) +{ + FIXME( "%p, %p\n", context, session ); +} + +HRESULT WINAPI AmsiScanBuffer( HAMSICONTEXT context, void *buffer, ULONG length, const WCHAR *name, + HAMSISESSION session, AMSI_RESULT *result ) +{ + FIXME( "%p, %p, %u, %s, %p, %p\n", context, buffer, length, debugstr_w(name), session, result ); + *result = AMSI_RESULT_NOT_DETECTED; + return S_OK; +} + +HRESULT WINAPI AmsiScanString( HAMSICONTEXT context, const WCHAR *string, const WCHAR *name, + HAMSISESSION session, AMSI_RESULT *result ) +{ + FIXME( "%p, %s, %s, %p, %p\n", context, debugstr_w(string), debugstr_w(name), session, result ); + *result = AMSI_RESULT_NOT_DETECTED; + return S_OK; +} + +void WINAPI AmsiUninitialize( HAMSICONTEXT context ) +{ + FIXME( "%p\n", context ); +} diff --git a/include/Makefile.in b/include/Makefile.in index c9f5be9..2817c10 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -11,6 +11,7 @@ SOURCES = \ advpub.h \ af_irda.h \ amaudio.h \ + amsi.idl \ amstream.idl \ amvideo.idl \ appcompatapi.h \ diff --git a/include/amsi.idl b/include/amsi.idl new file mode 100644 index 0000000..31303a3 --- /dev/null +++ b/include/amsi.idl @@ -0,0 +1,36 @@ +/* + * Copyright 2019 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +cpp_quote("DECLARE_HANDLE(HAMSICONTEXT);") +cpp_quote("DECLARE_HANDLE(HAMSISESSION);") + +typedef [v1_enum] enum AMSI_RESULT +{ + AMSI_RESULT_CLEAN = 0x00, + AMSI_RESULT_NOT_DETECTED = 0x01, + AMSI_RESULT_BLOCKED_BY_ADMIN_START = 0x4000, + AMSI_RESULT_BLOCKED_BY_ADMIN_END = 0x4fff, + AMSI_RESULT_DETECTED = 0x8000, +} AMSI_RESULT; + +cpp_quote("void WINAPI AmsiCloseSession(HAMSICONTEXT,HAMSISESSION);") +cpp_quote("HRESULT WINAPI AmsiInitialize(const WCHAR*,HAMSICONTEXT*);") +cpp_quote("HRESULT WINAPI AmsiOpenSession(HAMSICONTEXT,HAMSISESSION*);") +cpp_quote("HRESULT WINAPI AmsiScanBuffer(HAMSICONTEXT,void*,ULONG,const WCHAR*,HAMSISESSION,AMSI_RESULT*);") +cpp_quote("HRESULT WINAPI AmsiScanString(HAMSICONTEXT,const WCHAR*,const WCHAR *,HAMSISESSION,AMSI_RESULT*);") +cpp_quote("void WINAPI AmsiUninitialize(HAMSICONTEXT);")

1 0