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

[PATCH] wined3d: Rename wined3d_sm4_immconst_type to wined3d_sm4_dimension.
by Zebediah Figura 13 Aug '20

13 Aug '20

From: Zebediah Figura <zfigura(a)codeweavers.com> These bits are used in all register tokens, not just immediate constants. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/shader_sm4.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index db3297e8e99..443cfe7e4bd 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -98,8 +98,8 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_bytecode); #define WINED3D_SM4_SWIZZLE_TYPE_SHIFT 2 #define WINED3D_SM4_SWIZZLE_TYPE_MASK (0x3u << WINED3D_SM4_SWIZZLE_TYPE_SHIFT) -#define WINED3D_SM4_IMMCONST_TYPE_SHIFT 0 -#define WINED3D_SM4_IMMCONST_TYPE_MASK (0x3u << WINED3D_SM4_IMMCONST_TYPE_SHIFT) +#define WINED3D_SM4_DIMENSION_SHIFT 0 +#define WINED3D_SM4_DIMENSION_MASK (0x3u << WINED3D_SM4_DIMENSION_SHIFT) #define WINED3D_SM4_WRITEMASK_SHIFT 4 #define WINED3D_SM4_WRITEMASK_MASK (0xfu << WINED3D_SM4_WRITEMASK_SHIFT) @@ -397,10 +397,10 @@ enum wined3d_sm4_swizzle_type WINED3D_SM4_SWIZZLE_SCALAR = 0x2, }; -enum wined3d_sm4_immconst_type +enum wined3d_sm4_dimension { - WINED3D_SM4_IMMCONST_SCALAR = 0x1, - WINED3D_SM4_IMMCONST_VEC4 = 0x2, + WINED3D_SM4_DIMENSION_SCALAR = 0x1, + WINED3D_SM4_DIMENSION_VEC4 = 0x2, }; enum wined3d_sm4_resource_type @@ -1487,12 +1487,11 @@ static BOOL shader_sm4_read_param(struct wined3d_sm4_data *priv, const DWORD **p if (register_type == WINED3D_SM4_RT_IMMCONST) { - enum wined3d_sm4_immconst_type immconst_type = - (token & WINED3D_SM4_IMMCONST_TYPE_MASK) >> WINED3D_SM4_IMMCONST_TYPE_SHIFT; + enum wined3d_sm4_dimension dimension = (token & WINED3D_SM4_DIMENSION_MASK) >> WINED3D_SM4_DIMENSION_SHIFT; - switch (immconst_type) + switch (dimension) { - case WINED3D_SM4_IMMCONST_SCALAR: + case WINED3D_SM4_DIMENSION_SCALAR: param->immconst_type = WINED3D_IMMCONST_SCALAR; if (end - *ptr < 1) { @@ -1503,7 +1502,7 @@ static BOOL shader_sm4_read_param(struct wined3d_sm4_data *priv, const DWORD **p *ptr += 1; break; - case WINED3D_SM4_IMMCONST_VEC4: + case WINED3D_SM4_DIMENSION_VEC4: param->immconst_type = WINED3D_IMMCONST_VEC4; if (end - *ptr < 4) { @@ -1515,7 +1514,7 @@ static BOOL shader_sm4_read_param(struct wined3d_sm4_data *priv, const DWORD **p break; default: - FIXME("Unhandled immediate constant type %#x.\n", immconst_type); + FIXME("Unhandled dimension %#x.\n", dimension); break; } } -- 2.28.0

2 1

[PATCH 5/5] include/dxgi1_6.idl: add missing values in DXGI_ADAPTER_FLAG3 enum
by Biswapriyo Nath 13 Aug '20

13 Aug '20

1 0

[PATCH 4/5] include/dxgi1_5.idl: add missing values in DXGI_HDR_METADATA_TYPE enum
by Biswapriyo Nath 13 Aug '20

13 Aug '20

1 0

[PATCH 2/5] include/dxgi1_2.idl: add missing values in DXGI_SCALING enum
by Biswapriyo Nath 13 Aug '20

13 Aug '20

1 0

[PATCH vkd3d 4/5] vkd3d-compiler: Support reading from standard input.
by Henri Verbeet 13 Aug '20

13 Aug '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- programs/vkd3d-compiler/main.c | 100 ++++++++++++++++++++++++++++++----------- 1 file changed, 73 insertions(+), 27 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 0051277..a6c935c 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -68,44 +68,58 @@ target_type_info[] = " This is the format used for Vulkan shaders.\n"}, }; -static bool read_shader(struct vkd3d_shader_code *shader, const char *filename) +static bool read_shader(struct vkd3d_shader_code *shader, FILE *f) { + size_t size = 4096; struct stat st; - void *code; - FILE *fd; + size_t pos = 0; + uint8_t *data; + size_t ret; memset(shader, 0, sizeof(*shader)); - if (stat(filename, &st) == -1) + if (fstat(fileno(f), &st) == -1) { - fprintf(stderr, "Could not stat file: '%s'.\n", filename); + fprintf(stderr, "Could not stat input.\n"); return false; } - shader->size = st.st_size; - if (!(fd = fopen(filename, "rb"))) + if (S_ISREG(st.st_mode)) + size = st.st_size; + + if (!(data = malloc(size))) { - fprintf(stderr, "Cannot open file for reading: '%s'.\n", filename); + fprintf(stderr, "Out of memory.\n"); return false; } - if (!(code = malloc(shader->size))) + for (;;) { - fprintf(stderr, "Out of memory.\n"); - fclose(fd); - return false; + if (pos >= size) + { + if (size > SIZE_MAX / 2 || !(data = realloc(data, size * 2))) + { + fprintf(stderr, "Out of memory.\n"); + free(data); + return false; + } + size *= 2; + } + + if (!(ret = fread(&data[pos], 1, size - pos, f))) + break; + pos += ret; } - shader->code = code; - if (fread(code, 1, shader->size, fd) != shader->size) + if (!feof(f)) { - fprintf(stderr, "Could not read shader bytecode from file: '%s'.\n", filename); - free(code); - fclose(fd); + free(data); return false; } - fclose(fd); + shader->code = data; + shader->size = pos; + return true; } @@ -117,7 +131,7 @@ static bool write_shader(const struct vkd3d_shader_code *shader, FILE *f) static void print_usage(const char *program_name) { static const char usage[] = - "[options...] file\n" + "[options...] [file]\n" "Options:\n" " -h, --help Display this information and exit.\n" " -b <type> Specify the target type. Currently the only valid value\n" @@ -136,7 +150,10 @@ static void print_usage(const char *program_name) " -x <type> Specify the type of the source. Valid values are\n" " 'dxbc-tpf' and 'none'.\n" " -- Stop option processing. Any subsequent argument is\n" - " interpreted as a filename.\n"; + " interpreted as a filename.\n" + "\n" + "If the input file is '-' or not specified, input will be read from standard\n" + "input.\n"; fprintf(stderr, "Usage: %s %s", program_name, usage); } @@ -312,10 +329,8 @@ static bool parse_command_line(int argc, char **argv, struct options *options) if (options->print_target_types) return true; - if (optind >= argc) - return false; - - options->filename = argv[argc - 1]; + if (optind < argc) + options->filename = argv[argc - 1]; return true; } @@ -370,6 +385,25 @@ static void print_target_types(enum vkd3d_shader_source_type source_type) } } +static FILE *open_input(const char *filename, bool *close) +{ + FILE *f; + + *close = false; + + if (!filename || !strcmp(filename, "-")) + return stdin; + + if (!(f = fopen(filename, "rb"))) + { + fprintf(stderr, "Unable to open '%s' for reading.\n", filename); + return NULL; + } + + *close = true; + return f; +} + static FILE *open_output(const char *filename, bool *close) { FILE *f; @@ -391,12 +425,12 @@ static FILE *open_output(const char *filename, bool *close) int main(int argc, char **argv) { + bool close_input = false, close_output = false; struct vkd3d_shader_compile_info info; struct vkd3d_shader_code spirv; - bool close_output = false; struct options options; + FILE *input, *output; char *messages; - FILE *output; int fail = 1; int ret; @@ -426,6 +460,16 @@ int main(int argc, char **argv) return 0; } + if (!(input = open_input(options.filename, &close_input))) + goto done; + + if (!options.filename && isatty(fileno(input))) + { + fprintf(stderr, "Input is a tty and input format is binary, exiting.\n" + "If this is really what you intended, specify the input explicitly.\n"); + goto done; + } + if (!(output = open_output(options.output_filename, &close_output))) goto done; @@ -445,7 +489,7 @@ int main(int argc, char **argv) info.log_level = VKD3D_SHADER_LOG_INFO; info.source_name = options.filename; - if (!read_shader(&info.source, options.filename)) + if (!read_shader(&info.source, input)) { fprintf(stderr, "Failed to read input shader.\n"); goto done; @@ -474,5 +518,7 @@ int main(int argc, char **argv) done: if (close_output) fclose(output); + if (close_input) + fclose(input); return fail; } -- 2.11.0

2 1

[PATCH v2 1/8] msscript.ocx/tests: Add initial tests for Script Procedures.
by Gabriel Ivăncescu 13 Aug '20

13 Aug '20

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/msscript.ocx/tests/msscript.c | 607 ++++++++++++++++++++++++++++- 1 file changed, 605 insertions(+), 2 deletions(-) diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 352bf78..571f0fe 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -93,7 +93,16 @@ DEFINE_EXPECT(CreateInstance); DEFINE_EXPECT(SetInterfaceSafetyOptions); DEFINE_EXPECT(InitNew); DEFINE_EXPECT(Close); +DEFINE_EXPECT(Bind); +DEFINE_EXPECT(QI_ITypeComp); +DEFINE_EXPECT(GetTypeAttr); +DEFINE_EXPECT(GetNames); +DEFINE_EXPECT(GetFuncDesc); +DEFINE_EXPECT(ReleaseTypeAttr); +DEFINE_EXPECT(ReleaseFuncDesc); +DEFINE_EXPECT(ReleaseVarDesc); DEFINE_EXPECT(QI_IDispatchEx); +DEFINE_EXPECT(GetTypeInfo); DEFINE_EXPECT(GetIDsOfNames); DEFINE_EXPECT(Invoke); DEFINE_EXPECT(InvokeEx); @@ -118,6 +127,55 @@ static void _expect_ref(IUnknown* obj, ULONG ref, int line) static IActiveScriptSite *site; static SCRIPTSTATE state; +static ITypeInfo TypeInfo; + +static struct +{ + const WCHAR *name; + SHORT num_args; + SHORT num_opt_args; + VARTYPE ret_type; + FUNCKIND func_kind; + INVOKEKIND invoke_kind; + WORD flags; +} custom_engine_funcs[] = +{ + { L"foobar", 3, 0, VT_I4, FUNC_DISPATCH, INVOKE_FUNC, 0 }, + { L"barfoo", 11, 2, VT_VOID, FUNC_VIRTUAL, INVOKE_FUNC, FUNCFLAG_FRESTRICTED }, + { L"empty", 0, 0, VT_EMPTY, FUNC_PUREVIRTUAL, INVOKE_PROPERTYGET, FUNCFLAG_FBINDABLE | FUNCFLAG_FDISPLAYBIND }, + { L"vararg", 4, -1, VT_BSTR, FUNC_NONVIRTUAL, INVOKE_PROPERTYPUT, FUNCFLAG_FREQUESTEDIT }, + { L"static", 0, 1, VT_PTR, FUNC_STATIC, INVOKE_PROPERTYPUTREF, FUNCFLAG_FHIDDEN }, + { L"deadbeef", 21, -9, VT_ERROR, 0xdeadbeef, 0xdeadbeef, 0xffff } +}; + +static int memid_to_func_index(MEMBERID memid) +{ + UINT idx = memid - 0xdeadbeef; + return idx < ARRAY_SIZE(custom_engine_funcs) ? idx : -1; +} + +static MEMBERID func_index_to_memid(UINT idx) +{ + return idx + 0xdeadbeef; +} + +static FUNCDESC *get_func_desc(UINT i) +{ + FUNCDESC *desc; + + if (!(desc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*desc)))) + return NULL; + + desc->memid = func_index_to_memid(i); + desc->cParams = custom_engine_funcs[i].num_args; + desc->cParamsOpt = custom_engine_funcs[i].num_opt_args; + desc->elemdescFunc.tdesc.vt = custom_engine_funcs[i].ret_type; + desc->elemdescFunc.paramdesc.wParamFlags = PARAMFLAG_FRETVAL; + desc->funckind = custom_engine_funcs[i].func_kind; + desc->invkind = custom_engine_funcs[i].invoke_kind; + desc->wFuncFlags = custom_engine_funcs[i].flags; + return desc; +} static HRESULT WINAPI ActiveScriptParse_QueryInterface(IActiveScriptParse *iface, REFIID riid, void **ppv) { @@ -236,6 +294,282 @@ static const IObjectSafetyVtbl ObjectSafetyVtbl = { static IObjectSafety ObjectSafety = { &ObjectSafetyVtbl }; +static HRESULT WINAPI TypeComp_QueryInterface(ITypeComp *iface, REFIID riid, void **ppv) +{ + *ppv = NULL; + ok(0, "unexpected call\n"); + return E_NOINTERFACE; +} + +static ULONG WINAPI TypeComp_AddRef(ITypeComp *iface) +{ + return 2; +} + +static ULONG WINAPI TypeComp_Release(ITypeComp *iface) +{ + return 1; +} + +static HRESULT WINAPI TypeComp_Bind(ITypeComp *iface, LPOLESTR szName, ULONG lHashVal, WORD wFlags, + ITypeInfo **ppTInfo, DESCKIND *pDescKind, BINDPTR *pBindPtr) +{ + ULONG hash = LHashValOfNameSys(sizeof(void*) == 8 ? SYS_WIN64 : SYS_WIN32, LOCALE_USER_DEFAULT, szName); + UINT i; + + CHECK_EXPECT(Bind); + ok(lHashVal == hash, "wrong hash, expected 0x%08x, got 0x%08x.\n", hash, lHashVal); + ok(wFlags == INVOKE_FUNC, "wrong flags, got 0x%x.\n", wFlags); + + *ppTInfo = NULL; + *pDescKind = DESCKIND_NONE; + pBindPtr->lptcomp = NULL; + + if (!lstrcmpW(szName, L"type_mismatch")) + return TYPE_E_TYPEMISMATCH; + + if (!lstrcmpW(szName, L"variable")) + { + if (!(pBindPtr->lpvardesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(VARDESC)))) + return E_OUTOFMEMORY; + *ppTInfo = &TypeInfo; + *pDescKind = DESCKIND_VARDESC; + return S_OK; + } + + for (i = 0; i < ARRAY_SIZE(custom_engine_funcs); i++) + { + if (!lstrcmpW(szName, custom_engine_funcs[i].name)) + { + *ppTInfo = &TypeInfo; + *pDescKind = DESCKIND_FUNCDESC; + pBindPtr->lpfuncdesc = get_func_desc(i); + return S_OK; + } + } + + return S_OK; +} + +static HRESULT WINAPI TypeComp_BindType(ITypeComp *iface, LPOLESTR szName, ULONG lHashVal, + ITypeInfo **ppTInfo, ITypeComp **ppTComp) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static const ITypeCompVtbl TypeCompVtbl = { + TypeComp_QueryInterface, + TypeComp_AddRef, + TypeComp_Release, + TypeComp_Bind, + TypeComp_BindType +}; + +static ITypeComp TypeComp = { &TypeCompVtbl }; + +static BOOL TypeComp_available = FALSE; +static HRESULT WINAPI TypeInfo_QueryInterface(ITypeInfo *iface, REFIID riid, void **ppv) +{ + *ppv = NULL; + + if (IsEqualGUID(&IID_ITypeComp, riid)) + { + CHECK_EXPECT(QI_ITypeComp); + if (TypeComp_available) + { + *ppv = &TypeComp; + return S_OK; + } + return E_NOINTERFACE; + } + + ok(0, "unexpected riid %s\n", wine_dbgstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI TypeInfo_AddRef(ITypeInfo *iface) +{ + return 2; +} + +static ULONG WINAPI TypeInfo_Release(ITypeInfo *iface) +{ + return 1; +} + +static UINT TypeInfo_GetTypeAttr_cFuncs; +static HRESULT WINAPI TypeInfo_GetTypeAttr(ITypeInfo *iface, TYPEATTR **ppTypeAttr) +{ + CHECK_EXPECT(GetTypeAttr); + + if (!(*ppTypeAttr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(TYPEATTR)))) + return E_OUTOFMEMORY; + + (*ppTypeAttr)->cFuncs = TypeInfo_GetTypeAttr_cFuncs; + return S_OK; +} + +static HRESULT WINAPI TypeInfo_GetTypeComp(ITypeInfo *iface, ITypeComp **ppTComp) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI TypeInfo_GetFuncDesc(ITypeInfo *iface, UINT index, FUNCDESC **ppFuncDesc) +{ + CHECK_EXPECT(GetFuncDesc); + + if (index >= ARRAY_SIZE(custom_engine_funcs)) + return E_INVALIDARG; + + *ppFuncDesc = get_func_desc(index); + return S_OK; +} + +static HRESULT WINAPI TypeInfo_GetVarDesc(ITypeInfo *iface, UINT index, VARDESC **ppVarDesc) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI TypeInfo_GetNames(ITypeInfo *iface, MEMBERID memid, BSTR *rgBstrNames, + UINT cMaxNames, UINT *pcNames) +{ + int idx; + + CHECK_EXPECT(GetNames); + ok(cMaxNames == 1, "unexpected cMaxNames, got %u.\n", cMaxNames); + ok(rgBstrNames != NULL, "rgBstrNames is NULL.\n"); + ok(pcNames != NULL, "pcNames is NULL.\n"); + + idx = memid_to_func_index(memid); + if (idx != -1) + { + *rgBstrNames = SysAllocString(custom_engine_funcs[idx].name); + *pcNames = 1; + return S_OK; + } + + *pcNames = 0; + return TYPE_E_ELEMENTNOTFOUND; +} + +static HRESULT WINAPI TypeInfo_GetRefTypeOfImplType(ITypeInfo *iface, UINT index, HREFTYPE *pRefType) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI TypeInfo_GetImplTypeFlags(ITypeInfo *iface, UINT index, INT *pImplTypeFlags) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI TypeInfo_GetIDsOfNames(ITypeInfo *iface, LPOLESTR *rgszNames, UINT cNames, + MEMBERID *pMemId) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI TypeInfo_Invoke(ITypeInfo *iface, PVOID pvInstance, MEMBERID memid, WORD wFlags, + DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI TypeInfo_GetDocumentation(ITypeInfo *iface, MEMBERID memid, BSTR *pBstrName, + BSTR *pBstrDocString, DWORD *pdwHelpContext, BSTR *pBstrHelpFile) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI TypeInfo_GetDllEntry(ITypeInfo *iface, MEMBERID memid, INVOKEKIND invKind, + BSTR *pBstrDllName, BSTR *pBstrName, WORD *pwOrdinal) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI TypeInfo_GetRefTypeInfo(ITypeInfo *iface, HREFTYPE hRefType, ITypeInfo **ppTInfo) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI TypeInfo_AddressOfMember(ITypeInfo *iface, MEMBERID memid, INVOKEKIND invKind, PVOID *ppv) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI TypeInfo_CreateInstance(ITypeInfo *iface, IUnknown *pUnkOuter, REFIID riid, PVOID *ppvObj) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI TypeInfo_GetMops(ITypeInfo *iface, MEMBERID memid, BSTR *pBstrMops) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI TypeInfo_GetContainingTypeLib(ITypeInfo *iface, ITypeLib **ppTLib, UINT *pIndex) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static void WINAPI TypeInfo_ReleaseTypeAttr(ITypeInfo *iface, TYPEATTR *pTypeAttr) +{ + CHECK_EXPECT(ReleaseTypeAttr); + HeapFree(GetProcessHeap(), 0, pTypeAttr); +} + +static void WINAPI TypeInfo_ReleaseFuncDesc(ITypeInfo *iface, FUNCDESC *pFuncDesc) +{ + CHECK_EXPECT(ReleaseFuncDesc); + HeapFree(GetProcessHeap(), 0, pFuncDesc); +} + +static void WINAPI TypeInfo_ReleaseVarDesc(ITypeInfo *iface, VARDESC *pVarDesc) +{ + CHECK_EXPECT(ReleaseVarDesc); + HeapFree(GetProcessHeap(), 0, pVarDesc); +} + +static const ITypeInfoVtbl TypeInfoVtbl = { + TypeInfo_QueryInterface, + TypeInfo_AddRef, + TypeInfo_Release, + TypeInfo_GetTypeAttr, + TypeInfo_GetTypeComp, + TypeInfo_GetFuncDesc, + TypeInfo_GetVarDesc, + TypeInfo_GetNames, + TypeInfo_GetRefTypeOfImplType, + TypeInfo_GetImplTypeFlags, + TypeInfo_GetIDsOfNames, + TypeInfo_Invoke, + TypeInfo_GetDocumentation, + TypeInfo_GetDllEntry, + TypeInfo_GetRefTypeInfo, + TypeInfo_AddressOfMember, + TypeInfo_CreateInstance, + TypeInfo_GetMops, + TypeInfo_GetContainingTypeLib, + TypeInfo_ReleaseTypeAttr, + TypeInfo_ReleaseFuncDesc, + TypeInfo_ReleaseVarDesc +}; + +static ITypeInfo TypeInfo = { &TypeInfoVtbl }; + static BOOL DispatchEx_available = FALSE; static HRESULT WINAPI DispatchEx_QueryInterface(IDispatchEx *iface, REFIID riid, void **ppv) { @@ -274,8 +608,12 @@ static HRESULT WINAPI DispatchEx_GetTypeInfoCount(IDispatchEx *iface, UINT *pcti static HRESULT WINAPI DispatchEx_GetTypeInfo(IDispatchEx *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - ok(0, "unexpected call\n"); - return E_NOTIMPL; + CHECK_EXPECT(GetTypeInfo); + ok(iTInfo == 0, "unexpected iTInfo %u.\n", iTInfo); + ok(lcid == LOCALE_USER_DEFAULT, "unexpected lcid %u\n", lcid); + + *ppTInfo = &TypeInfo; + return S_OK; } static BSTR Dispatch_expected_name; @@ -2316,6 +2654,7 @@ static void test_IScriptControl_get_Modules(void) LONG idx1_0[] = { 0, 1 }; LONG idx1_1[] = { 1, 1 }; + IScriptProcedureCollection *procs; IEnumVARIANT *enumvar, *enumvar2; IScriptModuleCollection *mods; VARIANT var, vars[3]; @@ -2602,6 +2941,8 @@ static void test_IScriptControl_get_Modules(void) ok(hr == E_FAIL, "IScriptModule_get_Name returned: 0x%08x.\n", hr); hr = IScriptModule_get_CodeObject(mod, &disp); ok(hr == E_FAIL, "IScriptModule_get_CodeObject returned: 0x%08x.\n", hr); + hr = IScriptModule_get_Procedures(mod, &procs); + ok(hr == E_FAIL, "IScriptModule_get_Procedures returned: 0x%08x.\n", hr); str = SysAllocString(L"function closed() { }\n"); hr = IScriptModule_AddCode(mod, str); ok(hr == E_FAIL, "IScriptModule_AddCode failed: 0x%08x.\n", hr); @@ -2949,6 +3290,267 @@ static void test_IScriptControl_get_CodeObject(void) } } +static void test_IScriptControl_get_Procedures(void) +{ + IScriptProcedureCollection *procs, *procs2; + IScriptProcedure *proc; + IScriptControl *sc; + VARIANT var; + LONG count; + HRESULT hr; + BSTR str; + UINT i; + + hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, + &IID_IScriptControl, (void**)&sc); + ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08x.\n", hr); + + hr = IScriptControl_get_Procedures(sc, &procs); + ok(hr == E_FAIL, "IScriptControl_get_Procedures returned: 0x%08x.\n", hr); + + str = SysAllocString(L"jscript"); + hr = IScriptControl_put_Language(sc, str); + ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08x.\n", hr); + SysFreeString(str); + + hr = IScriptControl_get_Procedures(sc, &procs); + ok(hr == S_OK, "IScriptControl_get_Procedures failed: 0x%08x.\n", hr); + + hr = IScriptProcedureCollection_get_Count(procs, NULL); + todo_wine ok(hr == E_POINTER, "IScriptProcedureCollection_get_Count returned: 0x%08x.\n", hr); + hr = IScriptProcedureCollection_get_Count(procs, &count); + todo_wine ok(hr == S_OK, "IScriptProcedureCollection_get_Count failed: 0x%08x.\n", hr); + + V_VT(&var) = VT_I4; + V_I4(&var) = -1; + hr = IScriptProcedureCollection_get_Item(procs, var, NULL); + todo_wine ok(hr == E_POINTER, "IScriptProcedureCollection_get_Item returned: 0x%08x.\n", hr); + hr = IScriptProcedureCollection_get_Item(procs, var, &proc); + todo_wine ok(hr == 0x800a0009, "IScriptProcedureCollection_get_Item returned: 0x%08x.\n", hr); + + str = SysAllocString(L"" + "function add(a, b) { return a + b; }\n" + "function nop(a) { }\n" + "function muladd(a, b, c) { return a * b + c; }\n" + ); + hr = IScriptControl_AddCode(sc, str); + ok(hr == S_OK, "IScriptControl_AddCode failed: 0x%08x.\n", hr); + todo_wine CHECK_ERROR(sc, 0); + SysFreeString(str); + + hr = IScriptProcedureCollection_get_Count(procs, &count); + todo_wine ok(hr == S_OK, "IScriptProcedureCollection_get_Count failed: 0x%08x.\n", hr); + + V_VT(&var) = VT_I4; + V_I4(&var) = 1; + IScriptProcedureCollection_AddRef(procs); + i = IScriptProcedureCollection_Release(procs); + hr = IScriptProcedureCollection_get_Item(procs, var, &proc); + todo_wine ok(hr == S_OK, "IScriptProcedureCollection_get_Item failed: 0x%08x.\n", hr); + IScriptProcedureCollection_AddRef(procs); + ok(i == IScriptProcedureCollection_Release(procs), + "IScriptProcedureCollection_get_Item should not have added a ref to the collection.\n"); + if (hr == S_OK) IScriptProcedure_Release(proc); + + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(L"Nop"); + hr = IScriptProcedureCollection_get_Item(procs, var, &proc); + todo_wine ok(hr == S_OK, "IScriptProcedureCollection_get_Item failed: 0x%08x.\n", hr); + ok(V_VT(&var) == VT_BSTR, "var type not BSTR, got %d.\n", V_VT(&var)); + VariantClear(&var); + if (hr == S_OK) IScriptProcedure_Release(proc); + + V_VT(&var) = VT_R8; + V_R8(&var) = 3.0; + hr = IScriptProcedureCollection_get_Item(procs, var, &proc); + todo_wine ok(hr == S_OK, "IScriptProcedureCollection_get_Item failed: 0x%08x.\n", hr); + if (hr == S_OK) IScriptProcedure_Release(proc); + + IScriptProcedureCollection_Release(procs); + IScriptControl_Release(sc); + + if (have_custom_engine) + { + hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, + &IID_IScriptControl, (void**)&sc); + ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08x.\n", hr); + + SET_EXPECT(CreateInstance); + SET_EXPECT(SetInterfaceSafetyOptions); + SET_EXPECT(SetScriptSite); + SET_EXPECT(QI_IActiveScriptParse); + SET_EXPECT(InitNew); + + str = SysAllocString(L"testscript"); + hr = IScriptControl_put_Language(sc, str); + ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08x.\n", hr); + SysFreeString(str); + + CHECK_CALLED(CreateInstance); + CHECK_CALLED(SetInterfaceSafetyOptions); + CHECK_CALLED(SetScriptSite); + CHECK_CALLED(QI_IActiveScriptParse); + CHECK_CALLED(InitNew); + + hr = IScriptControl_get_Procedures(sc, &procs); + ok(hr == S_OK, "IScriptControl_get_Procedures failed: 0x%08x.\n", hr); + hr = IScriptControl_get_Procedures(sc, &procs2); + ok(hr == S_OK, "IScriptControl_get_Procedures failed: 0x%08x.\n", hr); + ok(procs == procs2, "Procedure collections are not the same (%p vs %p).\n", procs, procs2); + IScriptProcedureCollection_Release(procs2); + + GetScriptDispatch_expected_name = NULL; + SET_EXPECT(SetScriptState_STARTED); + SET_EXPECT(GetScriptDispatch); + SET_EXPECT(GetTypeInfo); + SET_EXPECT(GetTypeAttr); + SET_EXPECT(ReleaseTypeAttr); + TypeInfo_GetTypeAttr_cFuncs = 1337; + hr = IScriptProcedureCollection_get_Count(procs, &count); + todo_wine ok(hr == S_OK, "IScriptProcedureCollection_get_Count failed: 0x%08x.\n", hr); + todo_wine CHECK_CALLED(SetScriptState_STARTED); + todo_wine CHECK_CALLED(GetScriptDispatch); + todo_wine CHECK_CALLED(GetTypeInfo); + todo_wine CHECK_CALLED(GetTypeAttr); + todo_wine CHECK_CALLED(ReleaseTypeAttr); + TypeInfo_GetTypeAttr_cFuncs = ARRAY_SIZE(custom_engine_funcs); + count = 0; + hr = IScriptProcedureCollection_get_Count(procs, &count); + todo_wine ok(hr == S_OK, "IScriptProcedureCollection_get_Count failed: 0x%08x.\n", hr); + todo_wine ok(count == 1337, "count is not 1337, got %d.\n", count); + + /* Reload the collection to update the cached function count */ + IScriptProcedureCollection_Release(procs); + hr = IScriptControl_get_Procedures(sc, &procs); + ok(hr == S_OK, "IScriptControl_get_Procedures failed: 0x%08x.\n", hr); + count = 0; + SET_EXPECT(GetTypeAttr); + SET_EXPECT(ReleaseTypeAttr); + hr = IScriptProcedureCollection_get_Count(procs, &count); + todo_wine ok(hr == S_OK, "IScriptProcedureCollection_get_Count failed: 0x%08x.\n", hr); + todo_wine ok(count == ARRAY_SIZE(custom_engine_funcs), "count is not %u, got %d.\n", TypeInfo_GetTypeAttr_cFuncs, count); + todo_wine CHECK_CALLED(GetTypeAttr); + todo_wine CHECK_CALLED(ReleaseTypeAttr); + + /* Adding code reloads the typeinfo the next time */ + SET_EXPECT(SetScriptState_STARTED); + SET_EXPECT(ParseScriptText); + parse_item_name = NULL; + parse_flags = SCRIPTTEXT_ISVISIBLE; + str = SysAllocString(L" "); + hr = IScriptControl_AddCode(sc, str); + ok(hr == S_OK, "IScriptControl_AddCode failed: 0x%08x.\n", hr); + SysFreeString(str); + todo_wine CHECK_ERROR(sc, 0); + todo_wine CHECK_NOT_CALLED(SetScriptState_STARTED); + CHECK_CALLED(ParseScriptText); + + GetScriptDispatch_expected_name = NULL; + SET_EXPECT(GetScriptDispatch); + SET_EXPECT(GetTypeInfo); + SET_EXPECT(GetTypeAttr); + SET_EXPECT(ReleaseTypeAttr); + hr = IScriptProcedureCollection_get_Count(procs, &count); + todo_wine ok(hr == S_OK, "IScriptProcedureCollection_get_Count failed: 0x%08x.\n", hr); + todo_wine ok(count == ARRAY_SIZE(custom_engine_funcs), "count is not %u, got %d.\n", TypeInfo_GetTypeAttr_cFuncs, count); + todo_wine CHECK_CALLED(GetScriptDispatch); + todo_wine CHECK_CALLED(GetTypeInfo); + todo_wine CHECK_CALLED(GetTypeAttr); + todo_wine CHECK_CALLED(ReleaseTypeAttr); + + /* Try without ITypeComp interface */ + SET_EXPECT(QI_ITypeComp); + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(L"foobar"); + hr = IScriptProcedureCollection_get_Item(procs, var, &proc); + todo_wine ok(hr == E_NOINTERFACE, "IScriptProcedureCollection_get_Item returned: 0x%08x.\n", hr); + ok(V_VT(&var) == VT_BSTR, "var type not BSTR, got %d.\n", V_VT(&var)); + VariantClear(&var); + todo_wine CHECK_CALLED(QI_ITypeComp); + + /* Make ITypeComp available */ + TypeComp_available = TRUE; + SET_EXPECT(QI_ITypeComp); + SET_EXPECT(Bind); + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(L"type_mismatch"); + hr = IScriptProcedureCollection_get_Item(procs, var, &proc); + todo_wine ok(hr == TYPE_E_TYPEMISMATCH, "IScriptProcedureCollection_get_Item returned: 0x%08x.\n", hr); + VariantClear(&var); + todo_wine CHECK_CALLED(QI_ITypeComp); + todo_wine CHECK_CALLED(Bind); + TypeComp_available = FALSE; + + SET_EXPECT(Bind); + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(L"not_found"); + hr = IScriptProcedureCollection_get_Item(procs, var, &proc); + todo_wine ok(hr == CTL_E_ILLEGALFUNCTIONCALL, "IScriptProcedureCollection_get_Item failed: 0x%08x.\n", hr); + VariantClear(&var); + todo_wine CHECK_CALLED(Bind); + + SET_EXPECT(Bind); + SET_EXPECT(ReleaseVarDesc); + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(L"variable"); + hr = IScriptProcedureCollection_get_Item(procs, var, &proc); + todo_wine ok(hr == CTL_E_ILLEGALFUNCTIONCALL, "IScriptProcedureCollection_get_Item failed: 0x%08x.\n", hr); + VariantClear(&var); + todo_wine CHECK_CALLED(Bind); + todo_wine CHECK_CALLED(ReleaseVarDesc); + + /* Index 0 and below are invalid (doesn't even call GetFuncDesc) */ + V_VT(&var) = VT_I4; + V_I4(&var) = 0; + hr = IScriptProcedureCollection_get_Item(procs, var, &proc); + todo_wine ok(hr == 0x800a0009, "IScriptProcedureCollection_get_Item returned: 0x%08x.\n", hr); + V_I4(&var) = -1; + hr = IScriptProcedureCollection_get_Item(procs, var, &proc); + todo_wine ok(hr == 0x800a0009, "IScriptProcedureCollection_get_Item returned: 0x%08x.\n", hr); + SET_EXPECT(GetFuncDesc); + V_I4(&var) = 1337; + hr = IScriptProcedureCollection_get_Item(procs, var, &proc); + todo_wine ok(hr == E_INVALIDARG, "IScriptProcedureCollection_get_Item returned: 0x%08x.\n", hr); + todo_wine CHECK_CALLED(GetFuncDesc); + + for (i = 0; i < ARRAY_SIZE(custom_engine_funcs); i++) + { + /* Querying by index still goes through the Bind process */ + SET_EXPECT(GetFuncDesc); + SET_EXPECT(GetNames); + SET_EXPECT(ReleaseFuncDesc); + V_VT(&var) = VT_R4; + V_R4(&var) = i + 1; + hr = IScriptProcedureCollection_get_Item(procs, var, &proc); + todo_wine ok(hr == S_OK, "get_Item for index %u failed: 0x%08x.\n", i, hr); + todo_wine CHECK_CALLED(GetFuncDesc); + todo_wine CHECK_CALLED(GetNames); + todo_wine CHECK_CALLED(ReleaseFuncDesc); + if (hr == S_OK) IScriptProcedure_Release(proc); + + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(custom_engine_funcs[i].name); + SET_EXPECT(Bind); + SET_EXPECT(GetNames); + SET_EXPECT(ReleaseFuncDesc); + hr = IScriptProcedureCollection_get_Item(procs, var, &proc); + todo_wine ok(hr == S_OK, "get_Item for %s failed: 0x%08x.\n", wine_dbgstr_w(custom_engine_funcs[i].name), hr); + VariantClear(&var); + todo_wine CHECK_CALLED(Bind); + todo_wine CHECK_CALLED(GetNames); + todo_wine CHECK_CALLED(ReleaseFuncDesc); + if (hr == S_OK) IScriptProcedure_Release(proc); + } + + IScriptProcedureCollection_Release(procs); + IActiveScriptSite_Release(site); + + SET_EXPECT(Close); + IScriptControl_Release(sc); + CHECK_CALLED(Close); + } +} + START_TEST(msscript) { IUnknown *unk; @@ -2988,6 +3590,7 @@ START_TEST(msscript) test_IScriptControl_Run(); test_IScriptControl_get_Modules(); test_IScriptControl_get_CodeObject(); + test_IScriptControl_get_Procedures(); init_registry(FALSE); -- 2.21.0

2 15

[PATCH vkd3d 3/5] vkd3d-compiler: Support writing to standard output.
by Henri Verbeet 13 Aug '20

13 Aug '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- programs/vkd3d-compiler/main.c | 75 +++++++++++++++++++++++++++++------------- 1 file changed, 53 insertions(+), 22 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index ed4b0ee..0051277 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define _GNU_SOURCE #include <fcntl.h> #include <stdbool.h> #include <stdio.h> @@ -108,21 +109,9 @@ static bool read_shader(struct vkd3d_shader_code *shader, const char *filename) return true; } -static bool write_shader(const struct vkd3d_shader_code *shader, const char *filename) +static bool write_shader(const struct vkd3d_shader_code *shader, FILE *f) { - FILE *fd; - - if (!(fd = fopen(filename, "wb"))) - { - fprintf(stderr, "Cannot open file for writing: '%s'.\n", filename); - return false; - } - - if (fwrite(shader->code, 1, shader->size, fd) != shader->size) - fprintf(stderr, "Could not write shader bytecode to file: '%s'.\n", filename); - - fclose(fd); - return true; + return fwrite(shader->code, 1, shader->size, f) == shader->size; } static void print_usage(const char *program_name) @@ -136,7 +125,9 @@ static void print_usage(const char *program_name) " --buffer-uav=<type> Specify the buffer type to use for buffer UAV bindings.\n" " Valid values are 'buffer-texture' (default) and\n" " 'storage-buffer'.\n" - " -o, --output=<file> Write the output to <file>.\n" + " -o, --output=<file> Write the output to <file>. If <file> is '-' or no\n" + " output file is specified, output will be written to\n" + " standard output.\n" " --print-source-types Display the supported source types and exit.\n" " --print-target-types Display the supported target types for the specified\n" " source type and exit.\n" @@ -379,12 +370,34 @@ static void print_target_types(enum vkd3d_shader_source_type source_type) } } +static FILE *open_output(const char *filename, bool *close) +{ + FILE *f; + + *close = false; + + if (!filename || !strcmp(filename, "-")) + return stdout; + + if (!(f = fopen(filename, "wb"))) + { + fprintf(stderr, "Unable to open '%s' for writing.\n", filename); + return NULL; + } + + *close = true; + return f; +} + int main(int argc, char **argv) { struct vkd3d_shader_compile_info info; struct vkd3d_shader_code spirv; + bool close_output = false; struct options options; char *messages; + FILE *output; + int fail = 1; int ret; if (!parse_command_line(argc, argv, &options)) @@ -413,6 +426,16 @@ int main(int argc, char **argv) return 0; } + if (!(output = open_output(options.output_filename, &close_output))) + goto done; + + if (!options.output_filename && isatty(fileno(output))) + { + fprintf(stderr, "Output is a tty and output format is binary, exiting.\n" + "If this is really what you intended, specify the output explicitly.\n"); + goto done; + } + info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; info.next = NULL; info.source_type = options.source_type; @@ -424,8 +447,8 @@ int main(int argc, char **argv) if (!read_shader(&info.source, options.filename)) { - fprintf(stderr, "Failed to read DXBC shader.\n"); - return 1; + fprintf(stderr, "Failed to read input shader.\n"); + goto done; } ret = vkd3d_shader_compile(&info, &spirv, &messages); @@ -435,13 +458,21 @@ int main(int argc, char **argv) vkd3d_shader_free_shader_code(&info.source); if (ret < 0) { - fprintf(stderr, "Failed to compile DXBC shader, ret %d.\n", ret); - return 1; + fprintf(stderr, "Failed to compile shader, ret %d.\n", ret); + goto done; } - if (options.output_filename) - write_shader(&spirv, options.output_filename); + if (!write_shader(&spirv, output)) + { + fprintf(stderr, "Failed to write output shader.\n"); + vkd3d_shader_free_shader_code(&spirv); + goto done; + } + fail = 0; vkd3d_shader_free_shader_code(&spirv); - return 0; +done: + if (close_output) + fclose(output); + return fail; } -- 2.11.0

2 1

[PATCH vkd3d 2/5] build: Try "vulkan-1" as the Vulkan library.
by Henri Verbeet 13 Aug '20

13 Aug '20

Somewhat unconventionally, the official Vulkan import library is called "vulkan-1.lib" on Windows. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- configure.ac | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 355aaab..ca9d760 100644 --- a/configure.ac +++ b/configure.ac @@ -96,10 +96,14 @@ VKD3D_CHECK_PTHREAD AC_SUBST([VULKAN_LIBS]) VKD3D_CHECK_SONAME([vulkan], [vkGetInstanceProcAddr], [VULKAN_LIBS="-lvulkan"], - [VKD3D_CHECK_SONAME([MoltenVK], [vkGetInstanceProcAddr], - [VULKAN_LIBS="-lMoltenVK" - AC_DEFINE_UNQUOTED([SONAME_LIBVULKAN],["$ac_cv_lib_soname_MoltenVK"])], - [AC_MSG_ERROR([libvulkan and libMoltenVK not found.])])]) + [VKD3D_CHECK_SONAME([vulkan-1], [vkGetInstanceProcAddr], + [VULKAN_LIBS="-lvulkan-1" + AC_DEFINE_UNQUOTED([SONAME_LIBVULKAN], ["$ac_cv_lib_soname_vulkan_1"])], + [VKD3D_CHECK_SONAME([MoltenVK], [vkGetInstanceProcAddr], + [VULKAN_LIBS="-lMoltenVK" + AC_DEFINE_UNQUOTED([SONAME_LIBVULKAN], + ["$ac_cv_lib_soname_MoltenVK"])], + [AC_MSG_ERROR([libvulkan and libMoltenVK not found.])])])]) AS_IF([test "x$with_spirv_tools" = "xyes"], [PKG_CHECK_MODULES([SPIRV_TOOLS], [SPIRV-Tools-shared], -- 2.11.0

2 1

[PATCH vkd3d 5/5] vkd3d-shader: Introduce an enumeration for swizzle components.
by Henri Verbeet 13 Aug '20

13 Aug '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index e4d8a50..1ece69d 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -731,10 +731,15 @@ struct vkd3d_shader_signature }; /* swizzle bits fields: wwzzyyxx */ -#define VKD3D_SHADER_SWIZZLE_X (0u) -#define VKD3D_SHADER_SWIZZLE_Y (1u) -#define VKD3D_SHADER_SWIZZLE_Z (2u) -#define VKD3D_SHADER_SWIZZLE_W (3u) +enum vkd3d_shader_swizzle_component +{ + VKD3D_SHADER_SWIZZLE_X = 0x0, + VKD3D_SHADER_SWIZZLE_Y = 0x1, + VKD3D_SHADER_SWIZZLE_Z = 0x2, + VKD3D_SHADER_SWIZZLE_W = 0x3, + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_SWIZZLE_COMPONENT), +}; #define VKD3D_SHADER_SWIZZLE_MASK (0x3u) #define VKD3D_SHADER_SWIZZLE_SHIFT(idx) (2u * (idx)) -- 2.11.0

1 0

[PATCH vkd3d 1/5] build: Assume the soname is <library>.dll when building for MinGW hosts.
by Henri Verbeet 13 Aug '20

13 Aug '20

That's not strictly true, but the only case we care about is the Vulkan DLL on Windows, for which the official import library is called vulkan-1.lib, and the DLL is called vulkan-1.dll. We can do something more elaborate once it becomes relevant. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- m4/check-soname.m4 | 1 + 1 file changed, 1 insertion(+) diff --git a/m4/check-soname.m4 b/m4/check-soname.m4 index f195341..584095f 100644 --- a/m4/check-soname.m4 +++ b/m4/check-soname.m4 @@ -39,6 +39,7 @@ AC_CACHE_VAL(ac_Lib, AC_LINK_IFELSE([AC_LANG_CALL([], [$2])], [AS_CASE(["$host_os"], [darwin*|macosx*], [AS_VAR_SET(ac_Lib,[`$OTOOL -L conftest$ac_exeext | grep "]ac_lib_pattern[\\.[[0-9A-Za-z.]]*dylib" | sed -e "s/^.*\/$]ac_lib_pattern[\.[[0-9A-Za-z.]]*dylib$.*$/\1/"';2,$d'`])], + [mingw*], [AS_VAR_SET(ac_Lib,[$1.dll])], [AS_VAR_SET(ac_Lib,[`$READELF -d conftest$ac_exeext | grep "NEEDED.*]ac_lib_pattern[" | sed -e "s/^.*\\m4_dquote(\$]ac_lib_pattern[[[^ ]]*\$\\).*$/\1/"';2,$d'`]) AS_VAR_IF([ac_Lib],[], [AS_VAR_SET(ac_Lib,[`$LDD conftest$ac_exeext | grep "]ac_lib_pattern[" | sed -e "s/^.*$]ac_lib_pattern[[[^ ]]*$.*$/\1/"';2,$d'`])])])]) -- 2.11.0

1 0