August 2020 - Wine-Commits - list.winehq.org

Jacek Caban : include: Introduce consoleapi.h.
by Alexandre Julliard Aug. 10, 2020

Aug. 10, 2020

Module: wine Branch: master Commit: 3b35b468b765e19407a9434ad635d3067de7d0f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b35b468b765e19407a9434a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 10 16:05:36 2020 +0200 include: Introduce consoleapi.h. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/consoleapi.h | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++++ include/wincon.h | 54 +-------------------------------- 3 files changed, 87 insertions(+), 53 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3b35b468b765e19407a9…

1 0

Zebediah Figura : wbemprox: Return WBEM_E_NOT_FOUND from get_object() if no object is available.
by Alexandre Julliard Aug. 10, 2020

Aug. 10, 2020

Module: wine Branch: master Commit: a0c9aab5deffcdf30826574ba331ea8f18616ce3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0c9aab5deffcdf30826574b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Aug 9 19:30:09 2020 -0500 wbemprox: Return WBEM_E_NOT_FOUND from get_object() if no object is available. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49685 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/services.c | 4 +++- dlls/wbemprox/tests/query.c | 10 ++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c index e2b452e217..c0e535b3a1 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -450,6 +450,7 @@ HRESULT get_object( const WCHAR *object_path, IWbemClassObject **obj ) { IEnumWbemClassObject *iter; struct path *path; + ULONG count; HRESULT hr; hr = parse_path( object_path, &path ); @@ -461,7 +462,8 @@ HRESULT get_object( const WCHAR *object_path, IWbemClassObject **obj ) free_path( path ); return hr; } - hr = create_class_object( path->class, iter, 0, NULL, obj ); + hr = IEnumWbemClassObject_Next( iter, WBEM_INFINITE, 1, obj, &count ); + if (hr == WBEM_S_FALSE) hr = WBEM_E_NOT_FOUND; IEnumWbemClassObject_Release( iter ); free_path( path ); return hr; diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index e48722f3bc..a50002e1ba 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -267,7 +267,9 @@ static void test_Win32_Service( IWbemServices *services ) if (hr != S_OK) { win_skip( "Win32_Service not available\n" ); - goto out; + SysFreeString( empty ); + SysFreeString( class ); + return; } check_property( service, L"ProcessID", VT_I4, CIM_UINT32 ); @@ -343,9 +345,13 @@ static void test_Win32_Service( IWbemServices *services ) ok( hr == S_OK, "got %08x\n", hr ); if (service) IWbemClassObject_Release( service ); -out: SysFreeString( empty ); SysFreeString( class ); + + class = SysAllocString( L"Win32_Service.Name=\"nonexistent\"" ); + hr = IWbemServices_GetObject( services, class, 0, NULL, &service, NULL ); + ok( hr == WBEM_E_NOT_FOUND, "got %#08x\n", hr ); + SysFreeString( class ); } static void test_Win32_Bios( IWbemServices *services )

1 0

Brendan Shanks : include/msvcrt: Add stdbool.h header.
by Alexandre Julliard Aug. 10, 2020

Aug. 10, 2020

Module: wine Branch: master Commit: bae98df3282e4d85cf797b47759db095ea7363f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bae98df3282e4d85cf797b47… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Fri Aug 7 09:38:20 2020 -0700 include/msvcrt: Add stdbool.h header. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/msvcrt/stdbool.h | 31 +++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 1713f0b627..4b18aa2100 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -474,6 +474,7 @@ SOURCES = \ msvcrt/setjmp.h \ msvcrt/share.h \ msvcrt/signal.h \ + msvcrt/stdbool.h \ msvcrt/stddef.h \ msvcrt/stdint.h \ msvcrt/stdio.h \ diff --git a/include/msvcrt/stdbool.h b/include/msvcrt/stdbool.h new file mode 100644 index 0000000000..7f19f374c6 --- /dev/null +++ b/include/msvcrt/stdbool.h @@ -0,0 +1,31 @@ +/* + * Copyright 2020 Brendan Shanks 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 + */ +#ifndef __WINE_STDBOOL_H +#define __WINE_STDBOOL_H + +#ifndef __cplusplus + +#define bool _Bool +#define true 1 +#define false 0 + +#endif + +#define __bool_true_false_are_defined 1 + +#endif /* __WINE_STDBOOL_H */

1 0

Alex Henrie : urlmon: Fix null pointer dereference in process_hook_section (Coverity).
by Alexandre Julliard Aug. 10, 2020

Aug. 10, 2020

Module: wine Branch: master Commit: 0385811219a6dc7ab9726255f760ebea37e8286d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0385811219a6dc7ab9726255… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sat Aug 8 09:36:41 2020 -0600 urlmon: Fix null pointer dereference in process_hook_section (Coverity). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/axinstall.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/urlmon/axinstall.c b/dlls/urlmon/axinstall.c index 9d6f9a0f15..3f10902ddd 100644 --- a/dlls/urlmon/axinstall.c +++ b/dlls/urlmon/axinstall.c @@ -202,7 +202,7 @@ static HRESULT process_hook_section(install_ctx_t *ctx, const WCHAR *sect_name) cmd = heap_alloc(size*sizeof(WCHAR)); if(!cmd) - heap_free(cmd); + return E_OUTOFMEMORY; expand_command(ctx, val, cmd, &size); hres = RunSetupCommandW(ctx->hwnd, cmd, NULL, ctx->tmp_dir, NULL, NULL, 0, NULL);

1 0

Zhiyi Zhang : dwmapi: Check NULL parameter in DwmIsCompositionEnabled().
by Alexandre Julliard Aug. 7, 2020

Aug. 7, 2020

Module: wine Branch: master Commit: 1ec8bf9b739f1528b742169670eac2350b33a7d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ec8bf9b739f1528b7421696… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sat Aug 8 00:02:25 2020 +0800 dwmapi: Check NULL parameter in DwmIsCompositionEnabled(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49664 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/dwmapi/dwmapi_main.c | 3 +++ dlls/dwmapi/tests/Makefile.in | 5 +++++ dlls/dwmapi/tests/dwmapi.c | 39 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 49 insertions(+) diff --git a/configure b/configure index f2785a280f..c9afbc0ab8 100755 --- a/configure +++ b/configure @@ -20756,6 +20756,7 @@ wine_fn_config_makefile dlls/dsuiext enable_dsuiext wine_fn_config_makefile dlls/dswave enable_dswave wine_fn_config_makefile dlls/dswave/tests enable_tests wine_fn_config_makefile dlls/dwmapi enable_dwmapi +wine_fn_config_makefile dlls/dwmapi/tests enable_tests wine_fn_config_makefile dlls/dwrite enable_dwrite wine_fn_config_makefile dlls/dwrite/tests enable_tests wine_fn_config_makefile dlls/dx8vb enable_dx8vb diff --git a/configure.ac b/configure.ac index 0f4b0b817a..360ef2b11f 100644 --- a/configure.ac +++ b/configure.ac @@ -3278,6 +3278,7 @@ WINE_CONFIG_MAKEFILE(dlls/dsuiext) WINE_CONFIG_MAKEFILE(dlls/dswave) WINE_CONFIG_MAKEFILE(dlls/dswave/tests) WINE_CONFIG_MAKEFILE(dlls/dwmapi) +WINE_CONFIG_MAKEFILE(dlls/dwmapi/tests) WINE_CONFIG_MAKEFILE(dlls/dwrite) WINE_CONFIG_MAKEFILE(dlls/dwrite/tests) WINE_CONFIG_MAKEFILE(dlls/dx8vb) diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index 6378a091f0..8408a2efed 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -60,6 +60,9 @@ HRESULT WINAPI DwmIsCompositionEnabled(BOOL *enabled) else TRACE("%p\n", enabled); + if (!enabled) + return E_INVALIDARG; + *enabled = FALSE; return S_OK; } diff --git a/dlls/dwmapi/tests/Makefile.in b/dlls/dwmapi/tests/Makefile.in new file mode 100644 index 0000000000..6c6130401d --- /dev/null +++ b/dlls/dwmapi/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = dwmapi.dll +IMPORTS = dwmapi + +C_SRCS = \ + dwmapi.c diff --git a/dlls/dwmapi/tests/dwmapi.c b/dlls/dwmapi/tests/dwmapi.c new file mode 100644 index 0000000000..1904e283bb --- /dev/null +++ b/dlls/dwmapi/tests/dwmapi.c @@ -0,0 +1,39 @@ +/* + * Copyright 2020 Zhiyi Zhang 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 "dwmapi.h" +#include "wine/test.h" + +static void test_DwmIsCompositionEnabled(void) +{ + BOOL enabled; + HRESULT hr; + + hr = DwmIsCompositionEnabled(NULL); + ok(hr == E_INVALIDARG, "Expected %#x, got %#x.\n", E_INVALIDARG, hr); + + enabled = -1; + hr = DwmIsCompositionEnabled(&enabled); + ok(hr == S_OK, "Expected %#x, got %#x.\n", S_OK, hr); + ok(enabled == TRUE || enabled == FALSE, "Got unexpected %#x.\n", enabled); +} + +START_TEST(dwmapi) +{ + test_DwmIsCompositionEnabled(); +}

1 0

Paul Gofman : include: Add d3d12 reflection structures.
by Alexandre Julliard Aug. 7, 2020

Aug. 7, 2020

Module: wine Branch: master Commit: ab0cc959cc47ee2002f1d980c6dee787123b9a5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab0cc959cc47ee2002f1d980… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Aug 7 16:20:09 2020 +0300 include: Add d3d12 reflection structures. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/d3d12shader.idl | 184 ++++++++++++++++++++++++++++++++++++++++++++++++ include/d3dcommon.idl | 20 ++++++ include/d3dcompiler.h | 1 + 4 files changed, 206 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 216adf0d7a..1713f0b627 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -109,6 +109,7 @@ SOURCES = \ d3d11sdklayers.idl \ d3d11shader.h \ d3d12.idl \ + d3d12shader.idl \ d3d8.h \ d3d8caps.h \ d3d8types.h \ diff --git a/include/d3d12shader.idl b/include/d3d12shader.idl new file mode 100644 index 0000000000..61a285bf17 --- /dev/null +++ b/include/d3d12shader.idl @@ -0,0 +1,184 @@ +/* + * Copyright 2020 Paul Gofman 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 + */ + +import "oaidl.idl"; +import "ocidl.idl"; +import "d3dcommon.idl"; + +typedef struct _D3D12_SHADER_DESC +{ + UINT Version; + const char *Creator; + UINT Flags; + UINT ConstantBuffers; + UINT BoundResources; + UINT InputParameters; + UINT OutputParameters; + UINT InstructionCount; + UINT TempRegisterCount; + UINT TempArrayCount; + UINT DefCount; + UINT DclCount; + UINT TextureNormalInstructions; + UINT TextureLoadInstructions; + UINT TextureCompInstructions; + UINT TextureBiasInstructions; + UINT TextureGradientInstructions; + UINT FloatInstructionCount; + UINT IntInstructionCount; + UINT UintInstructionCount; + UINT StaticFlowControlCount; + UINT DynamicFlowControlCount; + UINT MacroInstructionCount; + UINT ArrayInstructionCount; + UINT CutInstructionCount; + UINT EmitInstructionCount; + D3D_PRIMITIVE_TOPOLOGY GSOutputTopology; + UINT GSMaxOutputVertexCount; + D3D_PRIMITIVE InputPrimitive; + UINT PatchConstantParameters; + UINT cGSInstanceCount; + UINT cControlPoints; + D3D_TESSELLATOR_OUTPUT_PRIMITIVE HSOutputPrimitive; + D3D_TESSELLATOR_PARTITIONING HSPartitioning; + D3D_TESSELLATOR_DOMAIN TessellatorDomain; + UINT cBarrierInstructions; + UINT cInterlockedInstructions; + UINT cTextureStoreInstructions; +} D3D12_SHADER_DESC; + +typedef struct _D3D12_SHADER_VARIABLE_DESC +{ + const char *Name; + UINT StartOffset; + UINT Size; + UINT uFlags; + void *DefaultValue; + UINT StartTexture; + UINT TextureSize; + UINT StartSampler; + UINT SamplerSize; +} D3D12_SHADER_VARIABLE_DESC; + +typedef struct _D3D12_SHADER_TYPE_DESC +{ + D3D_SHADER_VARIABLE_CLASS Class; + D3D_SHADER_VARIABLE_TYPE Type; + UINT Rows; + UINT Columns; + UINT Elements; + UINT Members; + UINT Offset; + const char *Name; +} D3D12_SHADER_TYPE_DESC; + +typedef struct _D3D12_SHADER_BUFFER_DESC +{ + const char *Name; + D3D_CBUFFER_TYPE Type; + UINT Variables; + UINT Size; + UINT uFlags; +} D3D12_SHADER_BUFFER_DESC; + +typedef struct _D3D12_SHADER_INPUT_BIND_DESC +{ + const char *Name; + D3D_SHADER_INPUT_TYPE Type; + UINT BindPoint; + UINT BindCount; + UINT uFlags; + D3D_RESOURCE_RETURN_TYPE ReturnType; + D3D_SRV_DIMENSION Dimension; + UINT NumSamples; + UINT Space; + UINT uID; +} D3D12_SHADER_INPUT_BIND_DESC; + +typedef struct _D3D12_SIGNATURE_PARAMETER_DESC +{ + const char *SemanticName; + UINT SemanticIndex; + UINT Register; + D3D_NAME SystemValueType; + D3D_REGISTER_COMPONENT_TYPE ComponentType; + BYTE Mask; + BYTE ReadWriteMask; + UINT Stream; + D3D_MIN_PRECISION MinPrecision; +} D3D12_SIGNATURE_PARAMETER_DESC; + +typedef struct _D3D12_PARAMETER_DESC +{ + const char *Name; + const char *SemanticName; + D3D_SHADER_VARIABLE_TYPE Type; + D3D_SHADER_VARIABLE_CLASS Class; + UINT Rows; + UINT Columns; + D3D_INTERPOLATION_MODE InterpolationMode; + D3D_PARAMETER_FLAGS Flags; + UINT FirstInRegister; + UINT FirstInComponent; + UINT FirstOutRegister; + UINT FirstOutComponent; +} D3D12_PARAMETER_DESC; + +typedef struct _D3D12_FUNCTION_DESC +{ + UINT Version; + const char *Creator; + UINT Flags; + UINT ConstantBuffers; + UINT BoundResources; + UINT InstructionCount; + UINT TempRegisterCount; + UINT TempArrayCount; + UINT DefCount; + UINT DclCount; + UINT TextureNormalInstructions; + UINT TextureLoadInstructions; + UINT TextureCompInstructions; + UINT TextureBiasInstructions; + UINT TextureGradientInstructions; + UINT FloatInstructionCount; + UINT IntInstructionCount; + UINT UintInstructionCount; + UINT StaticFlowControlCount; + UINT DynamicFlowControlCount; + UINT MacroInstructionCount; + UINT ArrayInstructionCount; + UINT MovInstructionCount; + UINT MovcInstructionCount; + UINT ConversionInstructionCount; + UINT BitwiseInstructionCount; + D3D_FEATURE_LEVEL MinFeatureLevel; + UINT64 RequiredFeatureFlags; + const char *Name; + INT FunctionParameterCount; + BOOL HasReturn; + BOOL Has10Level9VertexShader; + BOOL Has10Level9PixelShader; +} D3D12_FUNCTION_DESC; + +typedef struct _D3D12_LIBRARY_DESC +{ + const char *Creator; + UINT Flags; + UINT FunctionCount; +} D3D12_LIBRARY_DESC; diff --git a/include/d3dcommon.idl b/include/d3dcommon.idl index 29404efd69..7d1c0d25cf 100644 --- a/include/d3dcommon.idl +++ b/include/d3dcommon.idl @@ -686,4 +686,24 @@ typedef enum _D3D_SHADER_CBUFFER_FLAGS D3D_CBF_FORCE_DWORD = 0x7fffffff } D3D_SHADER_CBUFFER_FLAGS; +typedef enum _D3D_PARAMETER_FLAGS +{ + D3D_PF_NONE, + D3D_PF_IN, + D3D_PF_OUT, + D3D_PF_FORCE_DWORD = 0x7fffffff +} D3D_PARAMETER_FLAGS; + +typedef enum _D3D_INTERPOLATION_MODE +{ + D3D_INTERPOLATION_UNDEFINED, + D3D_INTERPOLATION_CONSTANT, + D3D_INTERPOLATION_LINEAR, + D3D_INTERPOLATION_LINEAR_CENTROID, + D3D_INTERPOLATION_LINEAR_NOPERSPECTIVE, + D3D_INTERPOLATION_LINEAR_NOPERSPECTIVE_CENTROID, + D3D_INTERPOLATION_LINEAR_SAMPLE, + D3D_INTERPOLATION_LINEAR_NOPERSPECTIVE_SAMPLE, +} D3D_INTERPOLATION_MODE; + cpp_quote("DEFINE_GUID(WKPDID_D3DDebugObjectName,0x429b8c22,0x9188,0x4b0c,0x87,0x42,0xac,0xb0,0xbf,0x85,0xc2,0x00);") diff --git a/include/d3dcompiler.h b/include/d3dcompiler.h index bd1b3d1d44..f11251e9db 100644 --- a/include/d3dcompiler.h +++ b/include/d3dcompiler.h @@ -20,6 +20,7 @@ #define __D3DCOMPILER_H__ #include "d3d11shader.h" +#include "d3d12shader.h" #ifdef __cplusplus extern "C" {

1 0

Gijs Vermeulen : configure: Add an option to disable QuickTime support.
by Alexandre Julliard Aug. 7, 2020

Aug. 7, 2020

Module: wine Branch: master Commit: b99ec04f557fad83b89be406cbc605f09fdcc18a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b99ec04f557fad83b89be406… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Fri Aug 7 16:20:23 2020 +0200 configure: Add an option to disable QuickTime support. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 44 +++++++++++++++++++++++++++++++------------- configure.ac | 37 +++++++++++++++++++++---------------- 2 files changed, 52 insertions(+), 29 deletions(-) diff --git a/configure b/configure index c93e000e8f..f2785a280f 100755 --- a/configure +++ b/configure @@ -878,6 +878,7 @@ with_pcap with_png with_pthread with_pulse +with_quicktime with_sane with_sdl with_tiff @@ -2608,6 +2609,7 @@ Optional Packages: --without-png do not use PNG --without-pthread do not use the pthread library --without-pulse do not use PulseAudio sound support + --without-quicktime do not use QuickTime support --without-sane do not use SANE (scanner support) --without-sdl do not use SDL --without-tiff do not use TIFF @@ -4114,6 +4116,12 @@ if test "${with_pulse+set}" = set; then : fi +# Check whether --with-quicktime was given. +if test "${with_quicktime+set}" = set; then : + withval=$with_quicktime; +fi + + # Check whether --with-sane was given. if test "${with_sane+set}" = set; then : withval=$with_sane; @@ -8977,13 +8985,16 @@ done LIBS="$ac_save_LIBS" fi - if test "$ac_cv_header_QuickTime_ImageCompression_h" = "yes" + + if test "x$with_quicktime" != "xno" then - ac_save_LIBS="$LIBS" - LIBS="-framework QuickTime -framework ApplicationServices -framework CoreVideo $LIBS" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the QuickTime framework" >&5 + if test "$ac_cv_header_QuickTime_ImageCompression_h" = "yes" + then + ac_save_LIBS="$LIBS" + LIBS="-framework QuickTime -framework ApplicationServices -framework CoreVideo $LIBS" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the QuickTime framework" >&5 $as_echo_n "checking for the QuickTime framework... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <QuickTime/ImageCompression.h> int @@ -8997,22 +9008,29 @@ _ACEOF if ac_fn_c_try_link "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - QUICKTIME_LIBS="-framework QuickTime -framework ApplicationServices -framework CoreVideo" + QUICKTIME_LIBS="-framework QuickTime -framework ApplicationServices -framework CoreVideo" - enable_wineqtdecoder=${enable_wineqtdecoder:-yes} + enable_wineqtdecoder=${enable_wineqtdecoder:-yes} else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - ac_cv_header_QuickTime_ImageCompression_h=no + ac_cv_header_QuickTime_ImageCompression_h=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - LIBS="$ac_save_LIBS" - fi - if test "$ac_cv_header_QuickTime_ImageCompression_h" != "yes" - then - as_fn_append wine_notices "|QuickTime ${notice_platform}development files not found, video decoding won't be supported." + LIBS="$ac_save_LIBS" + fi fi + if test "$ac_cv_header_QuickTime_ImageCompression_h" != "yes"; then : + case "x$with_quicktime" in + x) as_fn_append wine_notices "|QuickTime ${notice_platform}development files not found, video decoding won't be supported." ;; + xno) ;; + *) as_fn_error $? "QuickTime ${notice_platform}development files not found, video decoding won't be supported. +This is an error since --with-quicktime was requested." "$LINENO" 5 ;; +esac + +fi + if test "$ac_cv_header_Carbon_Carbon_h" = "yes" then CARBON_LIBS="-framework Carbon" diff --git a/configure.ac b/configure.ac index 4ff0f9c81f..0f4b0b817a 100644 --- a/configure.ac +++ b/configure.ac @@ -79,6 +79,7 @@ AC_ARG_WITH(png, AS_HELP_STRING([--without-png],[do not use PNG])) AC_ARG_WITH(pthread, AS_HELP_STRING([--without-pthread],[do not use the pthread library]), [if test "x$withval" = "xno"; then ac_cv_header_pthread_h=no; fi]) AC_ARG_WITH(pulse, AS_HELP_STRING([--without-pulse],[do not use PulseAudio sound support])) +AC_ARG_WITH(quicktime, AS_HELP_STRING([--without-quicktime],[do not use QuickTime support])) AC_ARG_WITH(sane, AS_HELP_STRING([--without-sane],[do not use SANE (scanner support)])) AC_ARG_WITH(sdl, AS_HELP_STRING([--without-sdl],[do not use SDL])) AC_ARG_WITH(tiff, AS_HELP_STRING([--without-tiff],[do not use TIFF])) @@ -830,24 +831,28 @@ case $host_os in AC_CHECK_FUNCS(IOHIDManagerCreate) LIBS="$ac_save_LIBS" fi - if test "$ac_cv_header_QuickTime_ImageCompression_h" = "yes" - then - dnl Make sure we can actually use the QuickTime framework - ac_save_LIBS="$LIBS" - LIBS="-framework QuickTime -framework ApplicationServices -framework CoreVideo $LIBS" - AC_MSG_CHECKING([for the QuickTime framework]) - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <QuickTime/ImageCompression.h>]],[[CodecManagerVersion(NULL);]])], - [AC_MSG_RESULT([yes]) - AC_SUBST(QUICKTIME_LIBS,"-framework QuickTime -framework ApplicationServices -framework CoreVideo") - enable_wineqtdecoder=${enable_wineqtdecoder:-yes}], - [AC_MSG_RESULT([no]) - ac_cv_header_QuickTime_ImageCompression_h=no]) - LIBS="$ac_save_LIBS" - fi - if test "$ac_cv_header_QuickTime_ImageCompression_h" != "yes" + + dnl *** Check for QuickTime *** + if test "x$with_quicktime" != "xno" then - WINE_NOTICE([QuickTime ${notice_platform}development files not found, video decoding won't be supported.]) + if test "$ac_cv_header_QuickTime_ImageCompression_h" = "yes" + then + dnl Make sure we can actually use the QuickTime framework + ac_save_LIBS="$LIBS" + LIBS="-framework QuickTime -framework ApplicationServices -framework CoreVideo $LIBS" + AC_MSG_CHECKING([for the QuickTime framework]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <QuickTime/ImageCompression.h>]],[[CodecManagerVersion(NULL);]])], + [AC_MSG_RESULT([yes]) + AC_SUBST(QUICKTIME_LIBS,"-framework QuickTime -framework ApplicationServices -framework CoreVideo") + enable_wineqtdecoder=${enable_wineqtdecoder:-yes}], + [AC_MSG_RESULT([no]) + ac_cv_header_QuickTime_ImageCompression_h=no]) + LIBS="$ac_save_LIBS" + fi fi + WINE_NOTICE_WITH(quicktime,[test "$ac_cv_header_QuickTime_ImageCompression_h" != "yes"], + [QuickTime ${notice_platform}development files not found, video decoding won't be supported.]) + if test "$ac_cv_header_Carbon_Carbon_h" = "yes" then AC_SUBST(CARBON_LIBS,"-framework Carbon")

1 0

Alistair Leslie-Hughes : dmime: Parse TimeSig track data.
by Alexandre Julliard Aug. 7, 2020

Aug. 7, 2020

Module: wine Branch: master Commit: 6a67f56a527145fd1efe972f6e248725c2f6c47c URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a67f56a527145fd1efe972f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Aug 7 16:17:24 2020 +1000 dmime: Parse TimeSig track data. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/timesigtrack.c | 64 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 62 insertions(+), 2 deletions(-) diff --git a/dlls/dmime/timesigtrack.c b/dlls/dmime/timesigtrack.c index 697b3e3593..30432378cf 100644 --- a/dlls/dmime/timesigtrack.c +++ b/dlls/dmime/timesigtrack.c @@ -19,6 +19,7 @@ #include "dmime_private.h" #include "dmobject.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(dmime); @@ -29,6 +30,9 @@ typedef struct IDirectMusicTimeSigTrack { IDirectMusicTrack IDirectMusicTrack_iface; struct dmobject dmobj; /* IPersistStream only */ LONG ref; + + DMUS_IO_TIMESIGNATURE_ITEM *items; + unsigned int count; } IDirectMusicTimeSigTrack; /* IDirectMusicTimeSigTrack IDirectMusicTrack8 part: */ @@ -37,6 +41,11 @@ static inline IDirectMusicTimeSigTrack *impl_from_IDirectMusicTrack(IDirectMusic return CONTAINING_RECORD(iface, IDirectMusicTimeSigTrack, IDirectMusicTrack_iface); } +static inline IDirectMusicTimeSigTrack *impl_from_IPersistStream(IPersistStream *iface) +{ + return CONTAINING_RECORD(iface, IDirectMusicTimeSigTrack, dmobj.IPersistStream_iface); +} + static HRESULT WINAPI IDirectMusicTrackImpl_QueryInterface(IDirectMusicTrack *iface, REFIID riid, void **ret_iface) { @@ -77,6 +86,7 @@ static ULONG WINAPI IDirectMusicTrackImpl_Release(IDirectMusicTrack *iface) TRACE("(%p) ref=%d\n", This, ref); if (!ref) { + heap_free(This->items); HeapFree(GetProcessHeap(), 0, This); DMIME_UnlockModule(); } @@ -207,10 +217,60 @@ static const IDirectMusicTrackVtbl dmtack_vtbl = { IDirectMusicTrackImpl_Clone }; +static HRESULT parse_timetrack_list(IDirectMusicTimeSigTrack *This, IStream *stream, + struct chunk_entry *timesig) +{ + HRESULT hr; + struct chunk_entry chunk = {.parent = timesig}; + int i; + + TRACE("Parsing segment form in %p: %s\n", stream, debugstr_chunk(timesig)); + + if (FAILED(hr = stream_next_chunk(stream, &chunk))) { + WARN("Failed to read data of %s\n", debugstr_chunk(&chunk)); + return hr; + } + + if (chunk.id != DMUS_FOURCC_TIMESIGNATURE_TRACK) + return DMUS_E_UNSUPPORTED_STREAM; + + hr = stream_chunk_get_array(stream, &chunk, (void **)&This->items, &This->count, + sizeof(DMUS_IO_TIMESIGNATURE_ITEM)); + if (FAILED(hr)) + return hr; + + for (i = 0; i < This->count; i++) + { + TRACE("Found DMUS_IO_TIMESIGNATURE_ITEM\n"); + TRACE(" - lTime %d\n", This->items[i].lTime); + TRACE(" - bBeatsPerMeasure %d\n", This->items[i].bBeatsPerMeasure); + TRACE(" - bBeat %d\n", This->items[i].bBeat); + TRACE(" - wGridsPerBeat %d\n", This->items[i].wGridsPerBeat); + } + + return S_OK; +} + static HRESULT WINAPI time_IPersistStream_Load(IPersistStream *iface, IStream *stream) { - FIXME(": Loading not implemented yet\n"); - return S_OK; + IDirectMusicTimeSigTrack *This = impl_from_IPersistStream(iface); + HRESULT hr; + struct chunk_entry chunk = {0}; + + TRACE("%p, %p\n", This, stream); + + if (!stream) + return E_POINTER; + + if ((hr = stream_get_chunk(stream, &chunk) != S_OK)) + return hr; + + if (chunk.id == FOURCC_LIST && chunk.type == DMUS_FOURCC_TIMESIGTRACK_LIST) + hr = parse_timetrack_list(This, stream, &chunk); + else + hr = DMUS_E_UNSUPPORTED_STREAM; + + return hr; } static const IPersistStreamVtbl persiststream_vtbl = {

1 0

Nikolay Sivov : combase: Move CoGetInstanceFromFile().
by Alexandre Julliard Aug. 7, 2020

Aug. 7, 2020

Module: wine Branch: master Commit: 449d323d25cb4f2956fa4b7a9868c69f8468c06d URL: https://source.winehq.org/git/wine.git/?a=commit;h=449d323d25cb4f2956fa4b7a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 7 09:11:48 2020 +0300 combase: Move CoGetInstanceFromFile(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.c | 98 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/combase/combase.spec | 2 +- dlls/ole32/compobj.c | 73 ----------------------------------- dlls/ole32/ole32.spec | 2 +- 4 files changed, 100 insertions(+), 75 deletions(-) diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index 1370aa8271..06fc97e17d 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -627,3 +627,101 @@ HRESULT WINAPI CoGetActivationState(GUID guid, DWORD arg2, DWORD *arg3) return E_NOTIMPL; } + +static void init_multi_qi(DWORD count, MULTI_QI *mqi, HRESULT hr) +{ + ULONG i; + + for (i = 0; i < count; i++) + { + mqi[i].pItf = NULL; + mqi[i].hr = hr; + } +} + +static HRESULT return_multi_qi(IUnknown *unk, DWORD count, MULTI_QI *mqi, BOOL include_unk) +{ + ULONG index = 0, fetched = 0; + + if (include_unk) + { + mqi[0].hr = S_OK; + mqi[0].pItf = unk; + index = fetched = 1; + } + + for (; index < count; index++) + { + mqi[index].hr = IUnknown_QueryInterface(unk, mqi[index].pIID, (void **)&mqi[index].pItf); + if (mqi[index].hr == S_OK) + fetched++; + } + + if (!include_unk) + IUnknown_Release(unk); + + if (fetched == 0) + return E_NOINTERFACE; + + return fetched == count ? S_OK : CO_S_NOTALLINTERFACES; +} + +/*********************************************************************** + * CoGetInstanceFromFile (combase.@) + */ +HRESULT WINAPI DECLSPEC_HOTPATCH CoGetInstanceFromFile(COSERVERINFO *server_info, CLSID *rclsid, + IUnknown *outer, DWORD cls_context, DWORD grfmode, OLECHAR *filename, DWORD count, + MULTI_QI *results) +{ + IPersistFile *pf = NULL; + IUnknown *obj = NULL; + CLSID clsid; + HRESULT hr; + + if (!count || !results) + return E_INVALIDARG; + + if (server_info) + FIXME("() non-NULL server_info not supported\n"); + + init_multi_qi(count, results, E_NOINTERFACE); + + if (!rclsid) + { + hr = GetClassFile(filename, &clsid); + if (FAILED(hr)) + { + ERR("Failed to get CLSID from a file.\n"); + return hr; + } + + rclsid = &clsid; + } + + hr = CoCreateInstance(rclsid, outer, cls_context, &IID_IUnknown, (void **)&obj); + if (hr != S_OK) + { + init_multi_qi(count, results, hr); + return hr; + } + + /* Init from file */ + hr = IUnknown_QueryInterface(obj, &IID_IPersistFile, (void **)&pf); + if (FAILED(hr)) + { + init_multi_qi(count, results, hr); + IUnknown_Release(obj); + return hr; + } + + hr = IPersistFile_Load(pf, filename, grfmode); + IPersistFile_Release(pf); + if (SUCCEEDED(hr)) + return return_multi_qi(obj, count, results, FALSE); + else + { + init_multi_qi(count, results, hr); + IUnknown_Release(obj); + return hr; + } +} diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 4f737aeb53..e90df05446 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -107,7 +107,7 @@ @ stdcall CoGetCurrentProcess() ole32.CoGetCurrentProcess @ stdcall CoGetDefaultContext(long ptr ptr) ole32.CoGetDefaultContext @ stub CoGetErrorInfo -@ stdcall CoGetInstanceFromFile(ptr ptr ptr long long wstr long ptr) ole32.CoGetInstanceFromFile +@ stdcall CoGetInstanceFromFile(ptr ptr ptr long long wstr long ptr) @ stdcall CoGetInstanceFromIStorage(ptr ptr ptr long ptr long ptr) ole32.CoGetInstanceFromIStorage @ stdcall CoGetInterfaceAndReleaseStream(ptr ptr ptr) ole32.CoGetInterfaceAndReleaseStream @ stdcall CoGetMalloc(long ptr) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 6a0c518081..1ad8a4b1d1 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -3434,79 +3434,6 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoCreateInstanceEx( return return_multi_qi(unk, cmq, pResults, TRUE); } -/*********************************************************************** - * CoGetInstanceFromFile [OLE32.@] - */ -HRESULT WINAPI DECLSPEC_HOTPATCH CoGetInstanceFromFile( - COSERVERINFO *server_info, - CLSID *rclsid, - IUnknown *outer, - DWORD cls_context, - DWORD grfmode, - OLECHAR *filename, - DWORD count, - MULTI_QI *results -) -{ - IPersistFile *pf = NULL; - IUnknown* unk = NULL; - CLSID clsid; - HRESULT hr; - - if (count == 0 || !results) - return E_INVALIDARG; - - if (server_info) - FIXME("() non-NULL server_info not supported\n"); - - init_multi_qi(count, results, E_NOINTERFACE); - - /* optionally get CLSID from a file */ - if (!rclsid) - { - hr = GetClassFile(filename, &clsid); - if (FAILED(hr)) - { - ERR("failed to get CLSID from a file\n"); - return hr; - } - - rclsid = &clsid; - } - - hr = CoCreateInstance(rclsid, - outer, - cls_context, - &IID_IUnknown, - (void**)&unk); - - if (hr != S_OK) - { - init_multi_qi(count, results, hr); - return hr; - } - - /* init from file */ - hr = IUnknown_QueryInterface(unk, &IID_IPersistFile, (void**)&pf); - if (FAILED(hr)) - { - init_multi_qi(count, results, hr); - IUnknown_Release(unk); - return hr; - } - - hr = IPersistFile_Load(pf, filename, grfmode); - IPersistFile_Release(pf); - if (SUCCEEDED(hr)) - return return_multi_qi(unk, count, results, FALSE); - else - { - init_multi_qi(count, results, hr); - IUnknown_Release(unk); - return hr; - } -} - /*********************************************************************** * CoGetInstanceFromIStorage [OLE32.@] */ diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index ef074bbc26..b1949eec8e 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -35,7 +35,7 @@ @ stdcall CoGetCurrentLogicalThreadId(ptr) @ stdcall CoGetCurrentProcess() @ stdcall CoGetDefaultContext(long ptr ptr) -@ stdcall CoGetInstanceFromFile(ptr ptr ptr long long wstr long ptr) +@ stdcall CoGetInstanceFromFile(ptr ptr ptr long long wstr long ptr) combase.CoGetInstanceFromFile @ stdcall CoGetInstanceFromIStorage(ptr ptr ptr long ptr long ptr) @ stdcall CoGetInterfaceAndReleaseStream(ptr ptr ptr) @ stdcall CoGetMalloc(long ptr) combase.CoGetMalloc

1 0

Nikolay Sivov : combase: Move CoGetCallState().
by Alexandre Julliard Aug. 7, 2020

Aug. 7, 2020

Module: wine Branch: master Commit: 90755c8ea353c81e02da4902707b077636e6a2ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=90755c8ea353c81e02da4902… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 7 09:11:46 2020 +0300 combase: Move CoGetCallState(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.c | 10 ++++++++++ dlls/combase/combase.spec | 2 +- dlls/ole32/ole32.spec | 2 +- dlls/ole32/ole32_main.c | 9 --------- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index 752658012c..7947109fef 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -607,3 +607,13 @@ HRESULT WINAPI CoGetObjectContext(REFIID riid, void **ppv) return IObjContext_QueryInterface(context, riid, ppv); } + +/*********************************************************************** + * CoGetCallState (combase.@) + */ +HRESULT WINAPI CoGetCallState(int arg1, ULONG *arg2) +{ + FIXME("%d, %p.\n", arg1, arg2); + + return E_NOTIMPL; +} diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index c84c10a21f..b9ccea5913 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -97,7 +97,7 @@ @ stub CoGetApartmentID @ stdcall CoGetApartmentType(ptr ptr) ole32.CoGetApartmentType @ stdcall CoGetCallContext(ptr ptr) ole32.CoGetCallContext -@ stdcall CoGetCallState(long ptr) ole32.CoGetCallState +@ stdcall CoGetCallState(long ptr) @ stdcall CoGetCallerTID(ptr) ole32.CoGetCallerTID @ stub CoGetCancelObject @ stdcall CoGetClassObject(ptr long ptr ptr ptr) ole32.CoGetClassObject diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index faccb54292..370a32eeae 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -28,7 +28,7 @@ @ stdcall CoGetActivationState(int128 long ptr) @ stdcall CoGetApartmentType(ptr ptr) @ stdcall CoGetCallContext(ptr ptr) -@ stdcall CoGetCallState(long ptr) +@ stdcall CoGetCallState(long ptr) combase.CoGetCallState @ stdcall CoGetCallerTID(ptr) @ stdcall CoGetClassObject(ptr long ptr ptr ptr) @ stdcall CoGetContextToken(ptr) diff --git a/dlls/ole32/ole32_main.c b/dlls/ole32/ole32_main.c index 414fdf2b36..13b3d3681b 100644 --- a/dlls/ole32/ole32_main.c +++ b/dlls/ole32/ole32_main.c @@ -167,15 +167,6 @@ HRESULT WINAPI CoGetActivationState(GUID guid, DWORD unknown, DWORD *unknown2) return E_NOTIMPL; } -/*********************************************************************** - * CoGetCallState (ole32.@) - */ -HRESULT WINAPI CoGetCallState(int unknown, PULONG unknown2) -{ - FIXME("%d, %p\n", unknown, unknown2); - return E_NOTIMPL; -} - /****************************************************************************** * IsValidInterface [OLE32.@] *

1 0