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

dispinterface/custdata typelib conformance
by Kevin Puetz Aug. 7, 2020

Aug. 7, 2020

v3 should hopefully make Marvin happier. Thanks to zf on IRC for pointing out he won't understand just a two updated (v2) patches... Changes from v1: - Fix a misplaced hunk (rebase error in splitting things for review) that caused build failures with patches 07/13 to 12/13 Changes from v2: - additional fix in widl: set oInst=0 (offset in instance) for union fields (existing bug exposed now that test_dump_typelib tests GetVarDesc) - skip verification of struct field VARDESC::oInst when test_tlb is a different syskind than the info[] dump in tests/typelib.c Such differences are real, but plausibly legitimate. - Fix a few tabs and // comments that I missed (sorry!) Kind of a long series, but with the generated code in tests/typelib.c I found squashing much more made it difficult to keep straight, which presumably would make reviewing it hard too. Kevin Puetz (13): oleaut32/tests: reformat test_dump_typelib. oleaut32/tests: Fix expect_wstr_acpval(...,NULL). widl: all VARDESC fields of TKIND_UNION should have oInst=0. oleaut32/tests: Cover GetVarDesc in test_dump_typelib. oleaut32/tests: Include [dual] interface in test_dump_typelib oleaut32: Fix rewriting FUNCDESC to FUNC_DISPATCH. (reasonable stopping point, if you'd prefer to review/apply in steps) At this point VARDESC and FUNCDESC should work correctly oleaut32/tests: Cover Get*CustData in test_dump_typelib. widl: remove duplicate '\n\n' in midl_info_guid. widl: parse attribute custom(guid,expr). widl: write ATTR_CUSTOM into typelib. widl: Allow adding the same custdata GUID multiple times in a typelib. (reasonable stopping point, though the widl stuff isn't being tested yet) oleaut32: Fix error handling/reporting in TLB_copy_all_custdata. oleaut32: Load GetVarCustData from MSFT-format typelib. (complete!) dlls/oleaut32/tests/test_tlb.idl | 86 +- dlls/oleaut32/tests/typelib.c | 1867 +++++++++++++++++++++++++++--- dlls/oleaut32/typelib.c | 106 +- tools/widl/parser.l | 2 +- tools/widl/parser.y | 18 + tools/widl/widltypes.h | 7 + tools/widl/write_msft.c | 101 +- 7 files changed, 1978 insertions(+), 209 deletions(-) Range-diff: 1: 254a899e9f = 1: 2fee51637f oleaut32/tests: reformat test_dump_typelib. 2: 9976043e87 = 2: e4aae946f6 oleaut32/tests: Fix expect_wstr_acpval(...,NULL). 3: 60e1f39d8c ! 3: 37e95834fb widl: fix uninitialized field in VARDESC. @@ Metadata Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> ## Commit message ## - widl: fix uninitialized field in VARDESC. + widl: all VARDESC fields of TKIND_UNION should have oInst=0. + + Also fix uninitialized value in this field for TKIND_DISPATCH. Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> --- - This was just writing the 0x55555555 from xmalloc + TKIND_UNION previously wrote var_datawidth like TKIND_STRUCT does. + But a union's datawidth is the max of the fields, not the sum-so-far, + so this described each field as starting just past the end of the union, + + TKIND_DISPATCH was just writing the 0x55555555 from xmalloc The field seems to be unused for VAR_DISPATCH, - but was 0 in the typelibs I had to check (which seems reasonable) + but was 0 in other (non-widl) typelib files I checked, + which seems like a reasonable "reserved" value. ## tools/widl/write_msft.c ## @@ tools/widl/write_msft.c: static HRESULT add_var_desc(msft_typeinfo_t *typeinfo, UINT index, var_t* var) + typeinfo->datawidth += var_datawidth; + break; + case TKIND_UNION: +- typedata[4] = typeinfo->datawidth; ++ typedata[4] = 0; + typeinfo->datawidth = max(typeinfo->datawidth, var_datawidth); break; case TKIND_DISPATCH: var_kind = 3; /* VAR_DISPATCH */ 4: 54ab34c62a ! 4: 93cb7fc54a oleaut32/tests: Cover GetVarDesc in test_dump_typelib. @@ dlls/oleaut32/tests/typelib.c: typedef struct _type_info + var_info vars[20]; } type_info; ++static const SYSKIND info_syskind = SYS_WIN32; static const type_info info[] = { -@@ dlls/oleaut32/tests/typelib.c: static const type_info info[] = { + /*** Autogenerated data. Do not edit, change the generator above instead. ***/ + { "g", "{b14b6bb5-904e-4ff9-b247-bd361f7a0001}", /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(struct g), /*size*/ sizeof(struct g), @@ dlls/oleaut32/tests/typelib.c: static const type_info info[] = { + }, + { + /*id*/ 0x40000001, /*name*/ "f2", /*flags*/ 0, /*kind*/ VAR_PERINSTANCE, -+ { .oInst = 4 }, ++ { .oInst = 0 }, + {VT_PTR, -1, PARAMFLAG_NONE}, /* ret */ + }, + }, @@ dlls/oleaut32/tests/typelib.c: static const type_info info[] = { + }, + { + /*id*/ 0x40000001, /*name*/ "ff2", /*flags*/ 0, /*kind*/ VAR_PERINSTANCE, -+ { .oInst = 4 }, ++ { .oInst = 0 }, + {VT_PTR, -1, PARAMFLAG_NONE}, /* ret */ + }, + }, @@ dlls/oleaut32/tests/typelib.c: static void test_dump_typelib(const WCHAR *name) + int iface, func, var; VARIANT v; HRESULT hr; ++ TLIBATTR *libattr; + ole_check(LoadTypeLibEx(name, REGKIND_NONE, &typelib)); ++ ++ ole_check(ITypeLib_GetLibAttr(typelib, &libattr)); ++ if(libattr->syskind != info_syskind) { ++ /* struct VARDESC::oInst may vary from changes in sizeof(void *) affecting the offset of later fields*/ ++ skip("ignoring VARDESC::oInst, (libattr->syskind expected %d got %d)\n", info_syskind, libattr->syskind); ++ } ++ + expect_eq(ITypeLib_GetTypeInfoCount(typelib), ticount, UINT, "%d"); + for (iface = 0; iface < ticount; iface++) + { @@ dlls/oleaut32/tests/typelib.c: static void test_dump_typelib(const WCHAR *name) expect_int(MAKELONG(typeattr->wMinorVerNum, typeattr->wMajorVerNum), ti->version); expect_int(typeattr->cbSizeVft, ti->cbSizeVft * sizeof(void*)); @@ dlls/oleaut32/tests/typelib.c: static void test_dump_typelib(const WCHAR *name) + expect_null(desc->lpstrSchema); /* Reserved */ + expect_int(desc->wVarFlags, var_info->wVarFlags); + expect_int(desc->varkind, var_info->varkind); -+ if(desc->varkind == VAR_PERINSTANCE) { -+ expect_int(desc->DUMMYUNIONNAME.oInst, var_info->DUMMYUNIONNAME.oInst); ++ if (desc->varkind == VAR_PERINSTANCE) { ++ /* oInst depends on preceding field data sizes (except for unions), ++ * so it may not be valid to expect it to match info[] on other platforms */ ++ if ((libattr->syskind == info_syskind) || (typeattr->typekind == TKIND_UNION)) { ++ expect_int(desc->DUMMYUNIONNAME.oInst, var_info->DUMMYUNIONNAME.oInst); ++ } + } else if(desc->varkind == VAR_CONST) { + check_variant_info(desc->DUMMYUNIONNAME.lpvarValue, &var_info->DUMMYUNIONNAME.varValue); + } else { @@ dlls/oleaut32/tests/typelib.c: static void test_dump_typelib(const WCHAR *name) ITypeInfo_ReleaseTypeAttr(typeinfo, typeattr); ITypeInfo2_Release(typeinfo2); + ITypeInfo_Release(typeinfo); + } ++ ITypeLib_ReleaseTLibAttr(typelib, libattr); + ITypeLib_Release(typelib); + } + 5: 5f81559d20 ! 5: 9ae38e1a9c oleaut32/tests: Include [dual] interface in test_dump_typelib @@ dlls/oleaut32/tests/typelib.c: static void test_dump_typelib(const WCHAR *name) " \"%s\",\n", dump_string(name)); OLE_CHECK(ITypeLib_GetTypeInfo(lib, i, &info)); -+ if(hRefType) { -+ ITypeInfo *refInfo; -+ OLE_CHECK(ITypeInfo_GetRefTypeInfo(info, hRefType, &refInfo)); -+ ITypeInfo_Release(info); -+ info = refInfo; -+ } ++ if(hRefType) { ++ ITypeInfo *refInfo; ++ OLE_CHECK(ITypeInfo_GetRefTypeInfo(info, hRefType, &refInfo)); ++ ITypeInfo_Release(info); ++ info = refInfo; ++ } OLE_CHECK(ITypeInfo_GetTypeAttr(info, &attr)); printf(" \"%s\",\n", wine_dbgstr_guid(&attr->guid)); @@ dlls/oleaut32/tests/typelib.c: static const type_info info[] = { + HREFTYPE hRefType = 0; VARIANT v; HRESULT hr; + TLIBATTR *libattr; +@@ dlls/oleaut32/tests/typelib.c: static void test_dump_typelib(const WCHAR *name) + skip("ignoring VARDESC::oInst, (libattr->syskind expected %d got %d)\n", info_syskind, libattr->syskind); + } - ole_check(LoadTypeLibEx(name, REGKIND_NONE, &typelib)); - expect_eq(ITypeLib_GetTypeInfoCount(typelib), ticount, UINT, "%d"); - for (iface = 0; iface < ticount; iface++) + for (const type_info *ti = info; ti != info + ARRAY_SIZE(info); ++ti) @@ dlls/oleaut32/tests/typelib.c: static void test_dump_typelib(const WCHAR *name) trace("Interface %s\n", ti->name); ole_check(ITypeLib_GetTypeInfo(typelib, iface, &typeinfo)); -+ if(hRefType) { -+ ITypeInfo *refInfo; -+ ole_check(ITypeInfo_GetRefTypeInfo(typeinfo, hRefType, &refInfo)); -+ ITypeInfo_Release(typeinfo); -+ typeinfo = refInfo; -+ } ++ if(hRefType) { ++ ITypeInfo *refInfo; ++ ole_check(ITypeInfo_GetRefTypeInfo(typeinfo, hRefType, &refInfo)); ++ ITypeInfo_Release(typeinfo); ++ typeinfo = refInfo; ++ } ole_check(ITypeLib_GetDocumentation(typelib, iface, &bstrIfName, NULL, &help_ctx, NULL)); expect_wstr_acpval(bstrIfName, ti->name); SysFreeString(bstrIfName); @@ dlls/oleaut32/tests/typelib.c: static void test_dump_typelib(const WCHAR *name) ITypeInfo_Release(typeinfo); } + expect_eq(ITypeLib_GetTypeInfoCount(typelib), iface, UINT, "%d"); + ITypeLib_ReleaseTLibAttr(typelib, libattr); ITypeLib_Release(typelib); } - 6: 377c3ca32e = 6: b38819f3e2 oleaut32: Fix rewriting FUNCDESC to FUNC_DISPATCH. 7: 380f9fe194 ! 7: 5f22c13651 oleaut32/tests: Cover Get*CustData in test_dump_typelib. @@ dlls/oleaut32/tests/typelib.c: static void test_dump_typelib(const WCHAR *name) OLE_CHECK(ITypeLib_GetDocumentation(lib, i, &name, NULL, &help_ctx, NULL)); printf("{\n" @@ dlls/oleaut32/tests/typelib.c: static void test_dump_typelib(const WCHAR *name) - ITypeInfo_Release(info); - info = refInfo; - } + ITypeInfo_Release(info); + info = refInfo; + } + OLE_CHECK(ITypeInfo_QueryInterface(info, &IID_ITypeInfo2, (void**)&info2)); + OLE_CHECK(ITypeInfo_GetTypeAttr(info, &attr)); @@ dlls/oleaut32/tests/typelib.c: static const type_info info[] = { }, { /*id*/ 0x40000001, /*name*/ "f2", /*flags*/ 0, /*kind*/ VAR_PERINSTANCE, - { .oInst = 4 }, + { .oInst = 0 }, + /*#custdata*/ 0, {}, {VT_PTR, -1, PARAMFLAG_NONE}, /* ret */ }, @@ dlls/oleaut32/tests/typelib.c: static const type_info info[] = { }, { /*id*/ 0x40000001, /*name*/ "ff2", /*flags*/ 0, /*kind*/ VAR_PERINSTANCE, - { .oInst = 4 }, + { .oInst = 0 }, + /*#custdata*/ 0, {}, {VT_PTR, -1, PARAMFLAG_NONE}, /* ret */ }, 8: f1c1d50ddf = 8: 1cff646dae widl: remove duplicate '\n\n' in midl_info_guid. 9: 4996692943 = 9: 67032edfaf widl: parse attribute custom(guid,expr). 10: ead252cc9e ! 10: d2bb899aa3 widl: write ATTR_CUSTOM into typelib. @@ Commit message ## tools/widl/write_msft.c ## @@ tools/widl/write_msft.c: static HRESULT set_custdata(msft_typelib_t *typelib, REFGUID guid, + + guidoffset = ctl2_alloc_guid(typelib, &guidentry); + if(vt == VT_BSTR) ++ /* TODO midl appears to share a single reference if the same string is used as custdata in multiple places */ + write_string_value(typelib, &data_out, value); + else + write_int_value(typelib, &data_out, vt, *(int*)value); +@@ tools/widl/write_msft.c: static HRESULT set_custdata(msft_typelib_t *typelib, REFGUID guid, return S_OK; } 11: 25e45884c5 ! 11: e9966f7f9f widl: Allow adding the same custdata GUID multiple times in a typelib. @@ tools/widl/write_msft.c: static void write_default_value(msft_typelib_t *typelib + hash_key = ctl2_hash_guid(guid); + guidoffset = ctl2_find_guid(typelib, hash_key, guid); + if(guidoffset == -1) { -+ // add GUID that was not already present ++ /* add GUID that was not already present */ + MSFT_GuidEntry guidentry; + guidentry.guid = *guid; @@ tools/widl/write_msft.c: static void write_default_value(msft_typelib_t *typelib - guidoffset = ctl2_alloc_guid(typelib, &guidentry); if(vt == VT_BSTR) + /* TODO midl appears to share a single reference if the same string is used as custdata in multiple places */ write_string_value(typelib, &data_out, value); - else 12: c81690d967 = 12: 26fa308be5 oleaut32: Fix error handling/reporting in TLB_copy_all_custdata. 13: 67037eec6a ! 13: 62ea698002 oleaut32: Load GetVarCustData from MSFT-format typelib. @@ dlls/oleaut32/tests/test_tlb.idl: library Test + int test_property; +methods: + [id(1),custom(CUSTDATA_STRLIT,"ITypeInfo2::GetFuncCustData dispinterface method")] -+ // FIXME: if the custom strings were identical, midl would de-duplicate them; widl writes them twice. + void test_method([in,custom(CUSTDATA_STRLIT,"ITypeInfo2::GetParamCustData test_dispatch::test_method(x)")] int x); + } }

3 15

[PATCH] kernel32/tests: Add more GetEnvironmentVariableA/W tests.
by Gijs Vermeulen Aug. 7, 2020

Aug. 7, 2020

From: Vladimir Panteleev <git(a)vladimir.panteleev.md> Signed-off-by: Vladimir Panteleev <git(a)vladimir.panteleev.md> Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/kernel32/tests/environ.c | 63 +++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/dlls/kernel32/tests/environ.c b/dlls/kernel32/tests/environ.c index 3c1563a331..1f69594fcd 100644 --- a/dlls/kernel32/tests/environ.c +++ b/dlls/kernel32/tests/environ.c @@ -320,6 +320,68 @@ static void test_GetSetEnvironmentVariableW(void) } } +static void test_GetSetEnvironmentVariableAW(void) +{ + static const WCHAR nameW[] = {0x540D, 0x524D, 0}; + static const char name[] = "\x96\xBC\x91\x4F"; + static const WCHAR valueW[] = {0x5024, 0}; + static const char value[] = "\x92\x6C"; + WCHAR bufW[256]; + char buf[256]; + DWORD ret_size; + BOOL ret; + + if (GetACP() != 932) + { + skip("GetACP() == %d, need 932 for A/W tests\n", GetACP()); + return; + } + + /* Write W, read A */ + ret = SetEnvironmentVariableW(nameW, valueW); + ok(ret == TRUE, "SetEnvironmentVariableW failed, last error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret_size = GetEnvironmentVariableA(name, NULL, 0); + todo_wine ok(ret_size == lstrlenA(value) + 1, "expected ret_size %d, got %d\n", lstrlenA(value) + 1, ret_size); + ok(GetLastError() == 0xdeadbeef, "expected last error 0xdeadbeef, got %d\n", GetLastError()); + + lstrcpyA(buf, "foo"); + SetLastError(0xdeadbeef); + ret_size = GetEnvironmentVariableA(name, buf, lstrlenA(value) + 1); + todo_wine ok(lstrcmpA(buf, value) == 0, "expected %s, got %s\n", debugstr_a(value), debugstr_a(buf)); + todo_wine ok(ret_size == lstrlenA(value), "expected ret_size %d, got %d\n", lstrlenA(value), ret_size); + ok(GetLastError() == 0xdeadbeef, "expected last error 0xdeadbeef, got %d\n", GetLastError()); + + /* Write A, read A/W */ + ret = SetEnvironmentVariableA(name, value); + ok(ret == TRUE, "SetEnvironmentVariableW failed, last error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret_size = GetEnvironmentVariableA(name, NULL, 0); + todo_wine ok(ret_size == lstrlenA(value) + 1, "expected ret_size %d, got %d\n", lstrlenA(value) + 1, ret_size); + ok(GetLastError() == 0xdeadbeef, "expected last error 0xdeadbeef, got %d\n", GetLastError()); + + lstrcpyA(buf, "foo"); + SetLastError(0xdeadbeef); + ret_size = GetEnvironmentVariableA(name, buf, lstrlenA(value) + 1); + todo_wine ok(lstrcmpA(buf, value) == 0, "expected %s, got %s\n", debugstr_a(value), debugstr_a(buf)); + todo_wine ok(ret_size == lstrlenA(value), "expected ret_size %d, got %d\n", lstrlenA(value), ret_size); + ok(GetLastError() == 0xdeadbeef, "expected last error 0xdeadbeef, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret_size = GetEnvironmentVariableW(nameW, NULL, 0); + ok(ret_size == lstrlenW(valueW) + 1, "expected ret_size %d, got %d\n", lstrlenW(valueW) + 1, ret_size); + ok(GetLastError() == 0xdeadbeef, "expected last error 0xdeadbeef, got %d\n", GetLastError()); + + lstrcpyW(bufW, L"foo"); + SetLastError(0xdeadbeef); + ret_size = GetEnvironmentVariableW(nameW, bufW, lstrlenW(valueW) + 1); + ok(ret_size == lstrlenW(valueW), "expected ret_size %d, got %d\n", lstrlenW(valueW), ret_size); + ok(GetLastError() == 0xdeadbeef, "expected last error 0xdeadbeef, got %d\n", GetLastError()); + ok(lstrcmpW(bufW, valueW) == 0, "expected %s, got %s\n", debugstr_w(valueW), debugstr_w(bufW)); +} + static void test_ExpandEnvironmentStringsA(void) { const char* value="Long long value"; @@ -720,6 +782,7 @@ START_TEST(environ) test_Predefined(); test_GetSetEnvironmentVariableA(); test_GetSetEnvironmentVariableW(); + test_GetSetEnvironmentVariableAW(); test_ExpandEnvironmentStringsA(); test_GetComputerName(); test_GetComputerNameExA(); -- 2.28.0

1 0

[PATCH] ntdll: Pad HEAP structure so 'flags' offset matches recent Windows.
by Brendan Shanks Aug. 7, 2020

Aug. 7, 2020

Needed for Red Dead Redemption 2 to pass anti-debugger checks, it accesses 'flags' and 'force_flags' at a fixed offset of the ProcessHeap. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49666 Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/ntdll/heap.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index f3c76cc82b0..1ac0cb24806 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -145,7 +145,13 @@ typedef struct tagSUBHEAP typedef struct tagHEAP { DWORD_PTR unknown1[2]; - DWORD unknown2; + DWORD unknown2[2]; + DWORD_PTR unknown3[4]; + DWORD unknown4; + DWORD_PTR unknown5[2]; + DWORD unknown6[3]; + DWORD_PTR unknown7[2]; + /* For Vista through 10, 'flags' is at offset 0x40 (x86) / 0x70 (x64) */ DWORD flags; /* Heap flags */ DWORD force_flags; /* Forced heap flags for debugging */ SUBHEAP subheap; /* First sub-heap */ -- 2.26.2

1 0

[PATCH] include/msvcrt: Add stdbool.h header.
by Brendan Shanks Aug. 7, 2020

Aug. 7, 2020

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- This is used by an out-of-tree patch (Proton's amd_ags_x64.dll implementation). include/msvcrt/stdbool.h | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 include/msvcrt/stdbool.h diff --git a/include/msvcrt/stdbool.h b/include/msvcrt/stdbool.h new file mode 100644 index 00000000000..7f19f374c6e --- /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 */ -- 2.26.2

1 0

[PATCH] kernelbase: Fix GetEnvironmentVariableA with multi-byte strings.
by Gijs Vermeulen Aug. 7, 2020

Aug. 7, 2020

From: Vladimir Panteleev <git(a)vladimir.panteleev.md> The previous implementation of GetEnvironmentVariableA incorrectly assumed that, after WideCharToMultiByte conversion, the resulting A string will have the same number of CHARs as the number of WCHARs in the W string. This assumption resulted in failures when querying environment variables with non-ASCII values in locales with multi-byte character pages. Address this by always retrieving the Unicode value of the variable, then measuring its length after code page conversion, and only then deciding whether it fits into the user-supplied buffer. Since we are no longer preallocating a buffer with a user-specified size, the 32767 character limit on the size parameter is removed, as it should be enforced naturally by the size of the environment block. Signed-off-by: Vladimir Panteleev <git(a)vladimir.panteleev.md> Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/kernel32/tests/environ.c | 62 +++++++++++++++++++++++++++++++++++ dlls/kernelbase/process.c | 49 +++++++++++++++++++-------- 2 files changed, 97 insertions(+), 14 deletions(-) diff --git a/dlls/kernel32/tests/environ.c b/dlls/kernel32/tests/environ.c index 3c1563a331..de6db899c9 100644 --- a/dlls/kernel32/tests/environ.c +++ b/dlls/kernel32/tests/environ.c @@ -320,6 +320,67 @@ static void test_GetSetEnvironmentVariableW(void) } } +static void test_GetSetEnvironmentVariableAW(void) +{ + static const WCHAR nameW[] = {0x540D, 0x524D, 0}; + static const char name[] = "\x96\xBC\x91\x4F"; + static const WCHAR valueW[] = {0x5024, 0}; + static const char value[] = "\x92\x6C"; + WCHAR bufW[256]; + char buf[256]; + DWORD ret_size; + BOOL ret; + + if (GetACP() != 932) + { + skip("GetACP() == %d, need 932 for A/W tests\n", GetACP()); + return; + } + + /* Write W, read A */ + ret = SetEnvironmentVariableW(nameW, valueW); + ok(ret == TRUE, "unexpected error in SetEnvironmentVariableW, GetLastError=%d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret_size = GetEnvironmentVariableA(name, NULL, 0); + ok(GetLastError() == 0xdeadbeef && ret_size == lstrlenA(value) + 1, + "should return length for Shift JIS string but ret_size=%d GetLastError=%d\n", ret_size, GetLastError()); + + lstrcpyA(buf, "foo"); + SetLastError(0xdeadbeef); + ret_size = GetEnvironmentVariableA(name, buf, lstrlenA(value) + 1); + ok(GetLastError() == 0xdeadbeef && ret_size == lstrlenA(value) && lstrcmpA(buf, value) == 0, + "should return Shift JIS string but ret_size=%d GetLastError=%d and buf=%s\n", ret_size, GetLastError(), buf); + + /* Write A, read A/W */ + ret = SetEnvironmentVariableA(name, value); + ok(ret == TRUE, "unexpected error in SetEnvironmentVariableA, GetLastError=%d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret_size = GetEnvironmentVariableA(name, NULL, 0); + ok(GetLastError() == 0xdeadbeef && ret_size == lstrlenA(value) + 1, + "should return length for Shift JIS string but ret_size=%d GetLastError=%d\n", ret_size, GetLastError()); + + lstrcpyA(buf, "foo"); + SetLastError(0xdeadbeef); + ret_size = GetEnvironmentVariableA(name, buf, lstrlenA(value) + 1); + ok(GetLastError() == 0xdeadbeef && ret_size == lstrlenA(value) && lstrcmpA(buf, value) == 0, + "should return Shift JIS string but ret_size=%d GetLastError=%d and buf=%s\n", ret_size, GetLastError(), buf); + + SetLastError(0xdeadbeef); + ret_size = GetEnvironmentVariableW(nameW, NULL, 0); + ok(GetLastError() == 0xdeadbeef && ret_size == lstrlenW(valueW) + 1, + "should return length for UTF-16 string but ret_size=%d GetLastError=%d\n", ret_size, GetLastError()); + + lstrcpyW(bufW, L"foo"); + SetLastError(0xdeadbeef); + ret_size = GetEnvironmentVariableW(nameW, bufW, lstrlenW(valueW) + 1); + ok(GetLastError() == 0xdeadbeef && ret_size == lstrlenW(valueW), + "should return UTF-16 string but ret_size=%d GetLastError=%d\n", ret_size, GetLastError()); + ok_w(GetLastError() == 0xdeadbeef && ret_size == lstrlenW(valueW) && lstrcmpW(bufW, valueW) == 0, + "should return UTF-16 string but bufW=%s\n", bufW); +} + static void test_ExpandEnvironmentStringsA(void) { const char* value="Long long value"; @@ -720,6 +781,7 @@ START_TEST(environ) test_Predefined(); test_GetSetEnvironmentVariableA(); test_GetSetEnvironmentVariableW(); + test_GetSetEnvironmentVariableAW(); test_ExpandEnvironmentStringsA(); test_GetComputerName(); test_GetComputerNameExA(); diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index 58fba52415..3bb309e988 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -1460,33 +1460,54 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetEnvironmentStringsW( WCHAR *env ) DWORD WINAPI DECLSPEC_HOTPATCH GetEnvironmentVariableA( LPCSTR name, LPSTR value, DWORD size ) { UNICODE_STRING us_name, us_value; - PWSTR valueW; NTSTATUS status; DWORD len, ret; - /* limit the size to sane values */ - size = min( size, 32767 ); - if (!(valueW = HeapAlloc( GetProcessHeap(), 0, size * sizeof(WCHAR) ))) return 0; + if (!RtlCreateUnicodeStringFromAsciiz( &us_name, name )) + return 0; - RtlCreateUnicodeStringFromAsciiz( &us_name, name ); + ret = 0; us_value.Length = 0; - us_value.MaximumLength = (size ? size - 1 : 0) * sizeof(WCHAR); - us_value.Buffer = valueW; - + us_value.MaximumLength = 0; + us_value.Buffer = NULL; status = RtlQueryEnvironmentVariable_U( NULL, &us_name, &us_value ); - len = us_value.Length / sizeof(WCHAR); - if (status == STATUS_BUFFER_TOO_SMALL) ret = len + 1; - else if (!set_ntstatus( status )) ret = 0; - else if (!size) ret = len + 1; + if (status != STATUS_BUFFER_TOO_SMALL && !set_ntstatus(status)) + goto cleanup; + + if (us_value.Length) + { + if (!(us_value.Buffer = HeapAlloc( GetProcessHeap(), 0, us_value.Length ))) + goto cleanup; + us_value.MaximumLength = us_value.Length; + status = RtlQueryEnvironmentVariable_U( NULL, &us_name, &us_value ); + if (!set_ntstatus( status )) + goto cleanup; + + len = WideCharToMultiByte( CP_ACP, 0, us_value.Buffer, us_value.Length / sizeof(WCHAR), + NULL, 0, NULL, NULL ); + if (!len) + goto cleanup; + } else + len = 0; /* an empty W string is always an empty A string */ + + if (len + 1 <= size) { - if (len) WideCharToMultiByte( CP_ACP, 0, valueW, len + 1, value, size, NULL, NULL ); + if (len) + { + if (!WideCharToMultiByte( CP_ACP, 0, us_value.Buffer, us_value.Length / sizeof(WCHAR), + value, len, NULL, NULL )) + goto cleanup; + } value[len] = 0; ret = len; } + else + ret = len + 1; +cleanup: + if (us_value.Buffer) HeapFree( GetProcessHeap(), 0, us_value.Buffer ); RtlFreeUnicodeString( &us_name ); - HeapFree( GetProcessHeap(), 0, valueW ); return ret; } -- 2.28.0

3 2

[PATCH] makedep: Allow system stdbool.h to be used with msvcrt.
by Brendan Shanks Aug. 7, 2020

Aug. 7, 2020

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- This is used by an out-of-tree patch (Proton's amd_ags_x64.dll implementation). Also, is this correct or should an stdbool.h be added to include/msvcrt/? tools/makedep.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/makedep.c b/tools/makedep.c index 825458156fb..179dae718cd 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1560,6 +1560,7 @@ static struct file *open_include_file( const struct makefile *make, struct incl_ if (pFile->type == INCL_SYSTEM && pFile->use_msvcrt) { if (!strcmp( pFile->name, "stdarg.h" )) return NULL; + if (!strcmp( pFile->name, "stdbool.h" )) return NULL; fprintf( stderr, "%s:%d: error: system header %s cannot be used with msvcrt\n", pFile->included_by->file->name, pFile->included_line, pFile->name ); exit(1); -- 2.26.2

2 1

[PATCH] dwmapi: Fix NULL access in DwmIsCompositionEnabled.
by Myah Caron Aug. 7, 2020

Aug. 7, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49664 Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- dlls/dwmapi/dwmapi_main.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index 6378a091f0..72ff6df874 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -52,6 +52,10 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) HRESULT WINAPI DwmIsCompositionEnabled(BOOL *enabled) { static int once; + + if (!enabled) + return E_POINTER; + if (!once) { FIXME("%p\n", enabled); -- 2.27.0

2 1

[PATCH] dwmapi: Check NULL parameter in DwmIsCompositionEnabled().
by Zhiyi Zhang Aug. 7, 2020

Aug. 7, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49664 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- Supersede 190398 configure.ac | 1 + dlls/dwmapi/dwmapi_main.c | 3 +++ dlls/dwmapi/tests/Makefile.in | 5 +++++ dlls/dwmapi/tests/dwmapi.c | 39 +++++++++++++++++++++++++++++++++++ 4 files changed, 48 insertions(+) create mode 100644 dlls/dwmapi/tests/Makefile.in create mode 100644 dlls/dwmapi/tests/dwmapi.c diff --git a/configure.ac b/configure.ac index 4ff0f9c81f7..a2a808d5ea9 100644 --- a/configure.ac +++ b/configure.ac @@ -3273,6 +3273,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 6378a091f0b..8408a2efed1 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 00000000000..5893c5e60a5 --- /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 00000000000..1904e283bba --- /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(); +} -- 2.25.1

1 0

[PATCH] po: Update Lithuanian translation
by Aurimas Fišeras Aug. 7, 2020

Aug. 7, 2020

1 0

[PATCH] user32/tests: Skip monitor tests with modes larger than original.
by Rémi Bernon Aug. 7, 2020

Aug. 7, 2020

This seems to cause a lot of timeouts on the testbot, for some reason. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Clearly this is not ideal, but it looks like the timeouts weren't completely fixed by the update. In particular the 32bit runs are still failing. dlls/user32/tests/monitor.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 85fb2f080a7..3809221f76c 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -627,6 +627,12 @@ static void test_ChangeDisplaySettingsEx(void) dm.dmSize = sizeof(dm); for (mode = 0; EnumDisplaySettingsExA(devices[device].name, mode, &dm, 0); ++mode) { + if (dm.dmPelsWidth > devices[0].original_mode.dmPelsWidth || dm.dmPelsHeight > devices[0].original_mode.dmPelsHeight) + { + trace("skipping display mode %s %dx%d@%d\n", devices[device].name, dm.dmPelsWidth, dm.dmPelsHeight, dm.dmDisplayFrequency); + continue; + } + dm.dmPosition = position; dm.dmFields |= DM_POSITION; res = ChangeDisplaySettingsExA(devices[device].name, &dm, NULL, CDS_RESET, NULL); -- 2.27.0

2 3