April 2022 - Wine-commits - list.winehq.org

Eric Pouech : winedbg: Fix command line arguments parsing.
by Alexandre Julliard 12 Apr '22

12 Apr '22

Module: wine Branch: oldstable Commit: b00bd9b9ee39cdd32874a6a0ea75d2c3701364d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b00bd9b9ee39cdd32874a6a0… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Nov 15 18:25:03 2021 +0100 winedbg: Fix command line arguments parsing. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42030 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9808c1d8a37c00ed1d6aeafe3756ca13bd4f2f02) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winedbg/winedbg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 838089e8628..362a4b1d5ee 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -717,7 +717,7 @@ int main(int argc, char** argv) /* parse options */ while (argc > 0 && argv[0][0] == '-') { - if (!strcmp(argv[0], "--command")) + if (!strcmp(argv[0], "--command") && argc > 1) { argc--; argv++; hFile = parser_generate_command_file(argv[0], NULL); @@ -729,7 +729,7 @@ int main(int argc, char** argv) argc--; argv++; continue; } - if (!strcmp(argv[0], "--file")) + if (!strcmp(argv[0], "--file") && argc > 1) { argc--; argv++; hFile = CreateFileA(argv[0], GENERIC_READ|DELETE, 0,

1 0

Bernhard Kölbl : oleaut32: Allow the registration of 64bit typelibs from a 32bit context.
by Alexandre Julliard 12 Apr '22

12 Apr '22

Module: wine Branch: oldstable Commit: 4bde9d09a3fdbf36cfa1a951a5824993cc362316 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4bde9d09a3fdbf36cfa1a951… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Wed Oct 20 16:21:38 2021 +0200 oleaut32: Allow the registration of 64bit typelibs from a 32bit context. Windows allows the registration of 64bit typelibs from 32bit programs even on a pure Win32 install. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51864 Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c159f5438aab5eeb795955d9270892e5c2d38cc3) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/oleaut32/tests/typelib.c | 180 ++++++++++++++++++++++++++++++++++++++++++ dlls/oleaut32/typelib.c | 4 - 2 files changed, 180 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 825851c948e..78290c94dfe 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -6848,6 +6848,185 @@ static void test_register_typelib(BOOL system_registration) DeleteFileW(filename); } +static void test_register_typelib_64(void) +{ + ICreateTypeInfo *createti, *createti_co; + ELEMDESC elemdesc[5], elemdesc2[5]; + FUNCDESC funcdesc, funcdesc2; + ITypeInfo *unknown, *tinfo; + ITypeLib *stdole, *typelib; + ICreateTypeLib2 *createtl; + WCHAR filename[MAX_PATH]; + HREFTYPE hreftype; + HRESULT hr; + + static const WCHAR wszStdOle2[] = { 's','t','d','o','l','e','2','.','t','l','b',0 }; + + static OLECHAR typelibW[] = { 'W','i','n','e','T','e','s','t','T','y','p','e','L','i','b',0}; + static OLECHAR helpfileW[] = { 'C',':','\\','b','o','g','u','s','.','h','l','p',0 }; + static OLECHAR dllfileW[] = { 'C',':','\\','b','o','g','u','s','.','d','l','l',0 }; + static OLECHAR interface1W[] = { 'I','T','e','s','t','W','i','n','e','6', '4', 0}; + static OLECHAR coclassW[] = {'W','i','n','e','T','e','s','t','C','o','c','l','a','s','s',0 }; + static OLECHAR func1W[] = { 'f','u','n','c','1',0 }; + static OLECHAR func2W[] = { 'f','u','n','c','2',0 }; + static OLECHAR param1W[] = { 'p','a','r','a','m','1',0 }; + static OLECHAR param2W[] = { 'p','a','r','a','m','2',0 }; + static OLECHAR *names1[] = { func1W, param1W, param2W }; + static OLECHAR *names2[] = { func2W, param1W }; + static const GUID tlcustguid = { 0x512d2fec,0xcaf6,0x4c33,{0xbc,0x38,0x84,0x2f,0x2e,0x37,0x0d,0x7b} }; + static const GUID coclassguid = { 0x317cd4dd,0x0ce0,0x4525,{0x8d,0x33,0x68,0x14,0x4c,0x53,0x60,0xe9} }; + static const GUID interfaceguid = { 0x35cc5cea,0x11cc,0x4bca,{0x89,0x8c,0xf8,0x92,0x8e,0xb8,0xda,0x24} }; + + static const SYSKIND sys = SYS_WIN64; + + hr = LoadTypeLib(wszStdOle2, &stdole); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ITypeLib_GetTypeInfoOfGuid(stdole, &IID_IDispatch, &unknown); + ok(hr == S_OK, "got %08x\n", hr); + + GetTempFileNameW(L".", L"tlb", 0, filename); + + hr = CreateTypeLib2(sys, filename, &createtl); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeLib2_SetName(createtl, typelibW); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeLib2_SetHelpFileName(createtl, helpfileW); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeLib2_SetHelpStringDll(createtl, dllfileW); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeLib2_SetGuid(createtl, &tlcustguid); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeLib2_SetVersion(createtl, 1, 0); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeLib2_CreateTypeInfo(createtl, coclassW, TKIND_COCLASS, &createti_co); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeLib2_CreateTypeInfo(createtl, interface1W, TKIND_INTERFACE, &createti); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_LayOut(createti); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_SetGuid(createti, &interfaceguid); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_SetVersion(createti, 1, 0); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_AddRefTypeInfo(createti, unknown, &hreftype); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_AddImplType(createti, 0, hreftype); + ok(hr == S_OK, "got %08x\n", hr); + + elemdesc[0].tdesc.vt = VT_UINT; + U(elemdesc[0]).idldesc.dwReserved = 0; + U(elemdesc[0]).idldesc.wIDLFlags = IDLFLAG_FIN; + + elemdesc[1].tdesc.vt = VT_DECIMAL; + U(elemdesc[1]).idldesc.dwReserved = 0; + U(elemdesc[1]).idldesc.wIDLFlags = IDLFLAG_FIN; + + memset(&funcdesc, 0, sizeof(FUNCDESC)); + funcdesc.funckind = FUNC_PUREVIRTUAL; + funcdesc.invkind = INVOKE_FUNC; + funcdesc.callconv = CC_STDCALL; + funcdesc.cParams = 2; + funcdesc.memid = 0x1; + funcdesc.elemdescFunc.tdesc.vt = VT_HRESULT; + funcdesc.lprgelemdescParam = elemdesc; + + hr = ICreateTypeInfo_AddFuncDesc(createti, 0, &funcdesc); + ok(hr == S_OK, "got %08x\n", hr); + + elemdesc2[0].tdesc.vt = VT_UINT; + U(elemdesc2[0]).idldesc.dwReserved = 0; + U(elemdesc2[0]).idldesc.wIDLFlags = IDLFLAG_FIN | IDLFLAG_FOUT; + + memset(&funcdesc2, 0, sizeof(FUNCDESC)); + funcdesc2.funckind = FUNC_PUREVIRTUAL; + funcdesc2.invkind = INVOKE_FUNC; + funcdesc.callconv = CC_STDCALL; + funcdesc2.cParams = 1; + funcdesc2.memid = 0x2; + funcdesc2.elemdescFunc.tdesc.vt = VT_HRESULT; + funcdesc2.lprgelemdescParam = elemdesc2; + + hr = ICreateTypeInfo_AddFuncDesc(createti, 1, &funcdesc2); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_SetFuncHelpContext(createti, 0, 0xabcdefab); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_SetFuncHelpContext(createti, 1, 0xabcdefab); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_SetFuncAndParamNames(createti, 0, names1, 3); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_SetFuncAndParamNames(createti, 1, names2, 2); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_SetTypeFlags(createti, TYPEFLAG_FOLEAUTOMATION | TYPEFLAG_FNONEXTENSIBLE | TYPEFLAG_FDUAL); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_QueryInterface(createti, &IID_ITypeInfo, (void**)&tinfo); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ITypeInfo_GetRefTypeOfImplType(tinfo, 0, &hreftype); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_SetGuid(createti_co, &coclassguid); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_AddRefTypeInfo(createti_co, tinfo, &hreftype); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_AddImplType(createti_co, 0, hreftype); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_SetImplTypeFlags(createti_co, 0, IMPLTYPEFLAG_FDEFAULT); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_Release(createti_co); + ok(hr == S_OK, "got %08x\n", hr); + + ICreateTypeInfo_Release(createti); + + hr = ICreateTypeLib2_SaveAllChanges(createtl); + ok(hr == S_OK, "got %08x\n", hr); + + ICreateTypeLib2_Release(createtl); + + trace("TypeLib to load: %ls\n", filename); + hr = LoadTypeLibEx(filename, REGKIND_NONE, &typelib); + ok(hr == S_OK, "got: %08x\n", hr); + + if(typelib) + { + hr = RegisterTypeLib(typelib, filename, NULL); + if (hr == TYPE_E_REGISTRYACCESS) + { + win_skip("Insufficient privileges to register typelib in the registry\n"); + ITypeLib_Release(typelib); + DeleteFileW(filename); + return; + } + ok(hr == S_OK, "got: %08x\n", hr); + + ITypeLib_Release(typelib); + } + + DeleteFileW(filename); +} + static void test_LoadTypeLib(void) { ITypeLib *tl; @@ -8351,6 +8530,7 @@ START_TEST(typelib) test_register_typelib(TRUE); test_register_typelib(FALSE); + test_register_typelib_64(); test_create_typelibs(); test_LoadTypeLib(); test_TypeInfo2_GetContainingTypeLib(); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 4669b03d5fc..b6550b69fa3 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -629,10 +629,6 @@ HRESULT WINAPI RegisterTypeLib(ITypeLib *ptlib, const WCHAR *szFullPath, const W if (FAILED(ITypeLib_GetLibAttr(ptlib, &attr))) return E_FAIL; -#ifndef _WIN64 - if (attr->syskind == SYS_WIN64) return TYPE_E_BADMODULEKIND; -#endif - get_typelib_key( &attr->guid, attr->wMajorVerNum, attr->wMinorVerNum, keyName ); res = S_OK;

1 0

Louis Lenders : wbemprox: Add empty DNSDomain to Win32_NetworkAdapterConfiguration.
by Alexandre Julliard 12 Apr '22

12 Apr '22

Module: wine Branch: oldstable Commit: b48ce9212e0e2d44da32090e5a72388bcc2ef1af URL: https://source.winehq.org/git/wine.git/?a=commit;h=b48ce9212e0e2d44da32090e… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Mon Nov 8 23:26:14 2021 +0100 wbemprox: Add empty DNSDomain to Win32_NetworkAdapterConfiguration. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51938 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d68ea16266eae2108e084f34b4ad4d47a4a51782) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wbemprox/builtin.c | 3 +++ dlls/wbemprox/tests/query.c | 12 ++++++++++++ 2 files changed, 15 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 6bb26a9d17b..d5e935063ad 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -214,6 +214,7 @@ static const struct column col_networkadapterconfig[] = { L"DefaultIPGateway", CIM_STRING|CIM_FLAG_ARRAY|COL_FLAG_DYNAMIC }, { L"Description", CIM_STRING|COL_FLAG_DYNAMIC }, { L"DHCPEnabled", CIM_BOOLEAN }, + { L"DNSDomain", CIM_STRING }, { L"DNSHostName", CIM_STRING|COL_FLAG_DYNAMIC }, { L"DNSServerSearchOrder", CIM_STRING|CIM_FLAG_ARRAY|COL_FLAG_DYNAMIC }, { L"Index", CIM_UINT32|COL_FLAG_KEY }, @@ -623,6 +624,7 @@ struct record_networkadapterconfig const struct array *defaultipgateway; const WCHAR *description; int dhcpenabled; + const WCHAR *dnsdomain; const WCHAR *dnshostname; const struct array *dnsserversearchorder; UINT32 index; @@ -2942,6 +2944,7 @@ static enum fill_status fill_networkadapterconfig( struct table *table, const st rec->defaultipgateway = get_defaultipgateway( aa->FirstGatewayAddress ); rec->description = heap_strdupW( aa->Description ); rec->dhcpenabled = -1; + rec->dnsdomain = L""; rec->dnshostname = get_dnshostname( aa->FirstUnicastAddress ); rec->dnsserversearchorder = get_dnsserversearchorder( aa->FirstDnsServerAddress ); rec->index = aa->u.s.IfIndex; diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index b2e2d815e2a..8d2ccc34efd 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1203,8 +1203,10 @@ static void test_Win32_NetworkAdapterConfiguration( IWbemServices *services ) BSTR wql = SysAllocString( L"wql" ), query = SysAllocString( L"SELECT * FROM Win32_NetworkAdapterConfiguration" ); IEnumWbemClassObject *result; IWbemClassObject *obj; + CIMTYPE type; HRESULT hr; DWORD count; + VARIANT val; hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); ok( hr == S_OK, "got %08x\n", hr ); @@ -1217,6 +1219,16 @@ static void test_Win32_NetworkAdapterConfiguration( IWbemServices *services ) check_property( obj, L"Description", VT_BSTR, CIM_STRING ); check_property( obj, L"Index", VT_I4, CIM_UINT32 ); check_property( obj, L"IPEnabled", VT_BOOL, CIM_BOOLEAN ); + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, L"DNSDomain", 0, &val, &type, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR || V_VT( &val ) == VT_NULL, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "DNSDomain %s\n", wine_dbgstr_w(V_BSTR( &val )) ); + VariantClear( &val ); + IWbemClassObject_Release( obj ); }

1 0

Loïc Rebmeister : loader: Create performance\winsat\datastore on prefix creation.
by Alexandre Julliard 12 Apr '22

12 Apr '22

Module: wine Branch: oldstable Commit: 0b26e88937aa135d2fa1015f68764ff0db5006e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b26e88937aa135d2fa1015f… Author: Loïc Rebmeister <fox2code(a)gmail.com> Date: Wed Nov 3 23:06:31 2021 +0100 loader: Create performance\winsat\datastore on prefix creation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51968 Signed-off-by: Loïc Rebmeister <fox2code(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2173d2dcc8f0b77d8c4ac40e1462029610f5c72c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 82462e492d7..610b39865ea 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2673,6 +2673,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" ; create some directories first 10,help, 10,logs, +10,performance\winsat\datastore, 10,tasks, 10,temp, 11,catroot,

1 0

Piotr Caban : msvcp100: Export ctype<char>::table function.
by Alexandre Julliard 12 Apr '22

12 Apr '22

Module: wine Branch: oldstable Commit: fb168121b2571437dae9f64b8b3a99900810ac0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb168121b2571437dae9f64b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 5 11:18:21 2021 +0100 msvcp100: Export ctype<char>::table function. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51978 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 0c42b9e111b8de1dd51b0572a2bf5ed28a7fa3da) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcp100/msvcp100.spec | 4 ++-- dlls/msvcp110/msvcp110.spec | 6 +++--- dlls/msvcp120/msvcp120.spec | 6 +++--- dlls/msvcp120_app/msvcp120_app.spec | 6 +++--- dlls/msvcp140/msvcp140.spec | 6 +++--- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index a05d20dea4e..e6374fc9985 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -2739,8 +2739,8 @@ @ cdecl ?sync_with_stdio(a)ios_base@std@@SA_N_N(a)Z(long) ios_base_sync_with_stdio @ cdecl -arch=win32 ?system_category(a)std@@YAABVerror_category(a)1@XZ() std_system_category @ cdecl -arch=win64 ?system_category(a)std@@YAAEBVerror_category(a)1@XZ() std_system_category -@ stub -arch=win32 ?table@?$ctype(a)D@std@@QBEPBFXZ -@ stub -arch=win64 ?table@?$ctype(a)D@std@@QEBAPEBFXZ +@ thiscall -arch=win32 ?table@?$ctype(a)D@std@@QBEPBFXZ(ptr) ctype_char_table +@ cdecl -arch=win64 ?table@?$ctype(a)D@std@@QEBAPEBFXZ(ptr) ctype_char_table @ extern -arch=win32 ?table_size@?$ctype(a)D@std@@2IB ctype_char_table_size @ extern -arch=win64 ?table_size@?$ctype(a)D@std@@2_KB ctype_char_table_size @ thiscall -arch=win32 ?tellg@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAE?AV?$fpos(a)H@2(a)XZ(ptr ptr) basic_istream_char_tellg diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 10c2216aebb..9209d7e4b9c 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3528,9 +3528,9 @@ @ thiscall -arch=i386 ?sync@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MAEHXZ(ptr) basic_streambuf_wchar_sync @ cdecl -arch=win64 ?sync@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MEAAHXZ(ptr) basic_streambuf_wchar_sync @ cdecl ?sync_with_stdio(a)ios_base@std@@SA_N_N(a)Z(long) ios_base_sync_with_stdio -@ stub -arch=arm ?table@?$ctype(a)D@std@@QBAPBFXZ -@ stub -arch=i386 ?table@?$ctype(a)D@std@@QBEPBFXZ -@ stub -arch=win64 ?table@?$ctype(a)D@std@@QEBAPEBFXZ +@ cdecl -arch=arm ?table@?$ctype(a)D@std@@QBAPBFXZ(ptr) ctype_char_table +@ thiscall -arch=i386 ?table@?$ctype(a)D@std@@QBEPBFXZ(ptr) ctype_char_table +@ cdecl -arch=win64 ?table@?$ctype(a)D@std@@QEBAPEBFXZ(ptr) ctype_char_table @ extern -arch=win32 ?table_size@?$ctype(a)D@std@@2IB ctype_char_table_size @ extern -arch=win64 ?table_size@?$ctype(a)D@std@@2_KB ctype_char_table_size @ cdecl -arch=arm ?tellg@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAA?AV?$fpos(a)H@2(a)XZ(ptr ptr) basic_istream_char_tellg diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 6f3e7b65f92..80df31002b2 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -3469,9 +3469,9 @@ @ thiscall -arch=i386 ?sync@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MAEHXZ(ptr) basic_streambuf_wchar_sync @ cdecl -arch=win64 ?sync@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MEAAHXZ(ptr) basic_streambuf_wchar_sync @ cdecl ?sync_with_stdio(a)ios_base@std@@SA_N_N(a)Z(long) ios_base_sync_with_stdio -@ stub -arch=arm ?table@?$ctype(a)D@std@@QBAPBFXZ -@ stub -arch=i386 ?table@?$ctype(a)D@std@@QBEPBFXZ -@ stub -arch=win64 ?table@?$ctype(a)D@std@@QEBAPEBFXZ +@ cdecl -arch=arm ?table@?$ctype(a)D@std@@QBAPBFXZ(ptr) ctype_char_table +@ thiscall -arch=i386 ?table@?$ctype(a)D@std@@QBEPBFXZ(ptr) ctype_char_table +@ cdecl -arch=win64 ?table@?$ctype(a)D@std@@QEBAPEBFXZ(ptr) ctype_char_table @ extern -arch=win32 ?table_size@?$ctype(a)D@std@@2IB ctype_char_table_size @ extern -arch=win64 ?table_size@?$ctype(a)D@std@@2_KB ctype_char_table_size @ cdecl -arch=arm ?tellg@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAA?AV?$fpos(a)H@2(a)XZ(ptr ptr) basic_istream_char_tellg diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index c35dcb2d427..066718fc3da 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -3469,9 +3469,9 @@ @ thiscall -arch=i386 ?sync@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MAEHXZ(ptr) msvcp120.?sync@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MAEHXZ @ cdecl -arch=win64 ?sync@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MEAAHXZ(ptr) msvcp120.?sync@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MEAAHXZ @ cdecl ?sync_with_stdio(a)ios_base@std@@SA_N_N(a)Z(long) msvcp120.?sync_with_stdio(a)ios_base@std@@SA_N_N(a)Z -@ stub -arch=arm ?table@?$ctype(a)D@std@@QBAPBFXZ -@ stub -arch=i386 ?table@?$ctype(a)D@std@@QBEPBFXZ -@ stub -arch=win64 ?table@?$ctype(a)D@std@@QEBAPEBFXZ +@ cdecl -arch=arm ?table@?$ctype(a)D@std@@QBAPBFXZ(ptr) msvcp120.?table@?$ctype(a)D@std@@QBAPBFXZ +@ thiscall -arch=i386 ?table@?$ctype(a)D@std@@QBEPBFXZ(ptr) msvcp120.?table@?$ctype(a)D@std@@QBEPBFXZ +@ cdecl -arch=win64 ?table@?$ctype(a)D@std@@QEBAPEBFXZ(ptr) msvcp120.?table@?$ctype(a)D@std@@QEBAPEBFXZ @ extern -arch=win32 ?table_size@?$ctype(a)D@std@@2IB msvcp120.?table_size@?$ctype(a)D@std@@2IB @ extern -arch=win64 ?table_size@?$ctype(a)D@std@@2_KB msvcp120.?table_size@?$ctype(a)D@std@@2_KB @ cdecl -arch=arm ?tellg@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAA?AV?$fpos(a)H@2(a)XZ(ptr ptr) msvcp120.?tellg@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAA?AV?$fpos(a)H@2(a)XZ diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index dcd062aa4fc..c4bfda85365 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3426,9 +3426,9 @@ @ thiscall -arch=i386 ?sync@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MAEHXZ(ptr) basic_streambuf_wchar_sync @ cdecl -arch=win64 ?sync@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MEAAHXZ(ptr) basic_streambuf_wchar_sync @ cdecl ?sync_with_stdio(a)ios_base@std@@SA_N_N(a)Z(long) ios_base_sync_with_stdio -@ stub -arch=arm ?table@?$ctype(a)D@std@@QBAPBFXZ -@ stub -arch=i386 ?table@?$ctype(a)D@std@@QBEPBFXZ -@ stub -arch=win64 ?table@?$ctype(a)D@std@@QEBAPEBFXZ +@ cdecl -arch=arm ?table@?$ctype(a)D@std@@QBAPBFXZ(ptr) ctype_char_table +@ thiscall -arch=i386 ?table@?$ctype(a)D@std@@QBEPBFXZ(ptr) ctype_char_table +@ cdecl -arch=win64 ?table@?$ctype(a)D@std@@QEBAPEBFXZ(ptr) ctype_char_table @ extern -arch=win32 ?table_size@?$ctype(a)D@std@@2IB ctype_char_table_size @ extern -arch=win64 ?table_size@?$ctype(a)D@std@@2_KB ctype_char_table_size @ cdecl -arch=arm ?tellg@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAA?AV?$fpos(a)U_Mbstatet@@@2(a)XZ(ptr ptr) basic_istream_char_tellg

1 0

Louis Lenders : combase: Add stub for RoOriginateError.
by Alexandre Julliard 12 Apr '22

12 Apr '22

Module: wine Branch: oldstable Commit: ef27e2b5030d9d613dc2c81fb1e4fb60761f28af URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef27e2b5030d9d613dc2c81f… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Thu Nov 11 13:55:31 2021 +0100 combase: Add stub for RoOriginateError. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51983 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6b59b26fff0e55c5d71a8cee9e0ddaf82e6f09f2) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- .../api-ms-win-core-winrt-error-l1-1-0.spec | 2 +- .../api-ms-win-core-winrt-error-l1-1-1.spec | 2 +- dlls/combase/combase.spec | 2 +- dlls/combase/roapi.c | 9 +++++++++ include/roerrorapi.h | 1 + 5 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-winrt-error-l1-1-0/api-ms-win-core-winrt-error-l1-1-0.spec b/dlls/api-ms-win-core-winrt-error-l1-1-0/api-ms-win-core-winrt-error-l1-1-0.spec index 99f1ca357cf..cf410136631 100644 --- a/dlls/api-ms-win-core-winrt-error-l1-1-0/api-ms-win-core-winrt-error-l1-1-0.spec +++ b/dlls/api-ms-win-core-winrt-error-l1-1-0/api-ms-win-core-winrt-error-l1-1-0.spec @@ -2,7 +2,7 @@ @ stub RoCaptureErrorContext @ stub RoFailFastWithErrorContext @ stub RoGetErrorReportingFlags -@ stub RoOriginateError +@ stdcall RoOriginateError(long ptr) combase.RoOriginateError @ stub RoOriginateErrorW @ stub RoResolveRestrictedErrorInfoReference @ stub RoSetErrorReportingFlags diff --git a/dlls/api-ms-win-core-winrt-error-l1-1-1/api-ms-win-core-winrt-error-l1-1-1.spec b/dlls/api-ms-win-core-winrt-error-l1-1-1/api-ms-win-core-winrt-error-l1-1-1.spec index 0b390f1f80a..d969540e94d 100644 --- a/dlls/api-ms-win-core-winrt-error-l1-1-1/api-ms-win-core-winrt-error-l1-1-1.spec +++ b/dlls/api-ms-win-core-winrt-error-l1-1-1/api-ms-win-core-winrt-error-l1-1-1.spec @@ -7,7 +7,7 @@ @ stub RoGetMatchingRestrictedErrorInfo @ stub RoInspectCapturedStackBackTrace @ stub RoInspectThreadErrorInfo -@ stub RoOriginateError +@ stdcall RoOriginateError(long ptr) combase.RoOriginateError @ stub RoOriginateErrorW @ stdcall RoOriginateLanguageException(long ptr ptr) combase.RoOriginateLanguageException @ stub RoReportFailedDelegate diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 6e74cca1f24..f01a93288c7 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -301,7 +301,7 @@ @ stdcall RoInitialize(long) @ stub RoInspectCapturedStackBackTrace @ stub RoInspectThreadErrorInfo -@ stub RoOriginateError +@ stdcall RoOriginateError(long ptr) @ stub RoOriginateErrorW @ stdcall RoOriginateLanguageException(long ptr ptr) @ stub RoParameterizedTypeExtraGetTypeSignature diff --git a/dlls/combase/roapi.c b/dlls/combase/roapi.c index 53da979d681..7d871fb885c 100644 --- a/dlls/combase/roapi.c +++ b/dlls/combase/roapi.c @@ -290,6 +290,15 @@ BOOL WINAPI RoOriginateLanguageException(HRESULT error, HSTRING message, IUnknow return FALSE; } +/*********************************************************************** + * RoOriginateError (combase.@) + */ +BOOL WINAPI RoOriginateError(HRESULT error, HSTRING message) +{ + FIXME("(%x %s) stub\n", error, debugstr_hstring(message)); + return FALSE; +} + /*********************************************************************** * CleanupTlsOleState (combase.@) */ diff --git a/include/roerrorapi.h b/include/roerrorapi.h index dd9c7f16ec0..454e1a6c2e9 100644 --- a/include/roerrorapi.h +++ b/include/roerrorapi.h @@ -24,6 +24,7 @@ #include <rpc.h> HRESULT WINAPI GetRestrictedErrorInfo(IRestrictedErrorInfo **info); +BOOL WINAPI RoOriginateError(HRESULT error, HSTRING message); BOOL WINAPI RoOriginateLanguageException(HRESULT error, HSTRING message, IUnknown *language_exception); #endif /* _ROERROR_H */

1 0

Connor McAdams : oleacc: Implement AccessibleObjectFromEvent.
by Alexandre Julliard 12 Apr '22

12 Apr '22

Module: wine Branch: oldstable Commit: 4ed070302fcca154855baaef8c5edac09322b3c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ed070302fcca154855baaef… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Aug 30 11:27:41 2021 -0400 oleacc: Implement AccessibleObjectFromEvent. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 602a36a2538e356ae8e64b442e9a5ad7f3748bd7) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/oleacc/main.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/oleacc/oleacc.spec | 2 +- 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index f6b66a8bcab..beceb2ff1fb 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -331,6 +331,53 @@ HRESULT WINAPI AccessibleObjectFromPoint( POINT ptScreen, IAccessible** ppacc, V return E_NOTIMPL; } +static void variant_init_i4( VARIANT *v, int val ) +{ + V_VT(v) = VT_I4; + V_I4(v) = val; +} + +HRESULT WINAPI AccessibleObjectFromEvent( HWND hwnd, DWORD object_id, DWORD child_id, + IAccessible **acc_out, VARIANT *child_id_out ) +{ + VARIANT child_id_variant; + IAccessible *acc = NULL; + IDispatch *child = NULL; + HRESULT hr; + + TRACE("%p %d %d %p %p\n", hwnd, object_id, child_id, acc_out, child_id_out); + + if (!acc_out) + return E_INVALIDARG; + *acc_out = NULL; + VariantInit(child_id_out); + + hr = AccessibleObjectFromWindow(hwnd, object_id, &IID_IAccessible, (void **)&acc); + if (FAILED(hr)) + return hr; + + variant_init_i4(&child_id_variant, child_id); + hr = IAccessible_get_accChild(acc, child_id_variant, &child); + if (FAILED(hr)) + TRACE("get_accChild failed with %#x!\n", hr); + + if (SUCCEEDED(hr) && child) + { + IAccessible_Release(acc); + hr = IDispatch_QueryInterface(child, &IID_IAccessible, (void **)&acc); + IDispatch_Release(child); + if (FAILED(hr)) + return hr; + + variant_init_i4(&child_id_variant, CHILDID_SELF); + } + + *acc_out = acc; + *child_id_out = child_id_variant; + + return S_OK; +} + HRESULT WINAPI AccessibleObjectFromWindow( HWND hwnd, DWORD dwObjectID, REFIID riid, void** ppvObject ) { diff --git a/dlls/oleacc/oleacc.spec b/dlls/oleacc/oleacc.spec index 4cff0b8effc..9ad6e915965 100644 --- a/dlls/oleacc/oleacc.spec +++ b/dlls/oleacc/oleacc.spec @@ -1,5 +1,5 @@ @ stdcall AccessibleChildren(ptr long long ptr ptr) -@ stub AccessibleObjectFromEvent +@ stdcall AccessibleObjectFromEvent(ptr long long ptr ptr) @ stdcall AccessibleObjectFromPoint(int64 ptr ptr) @ stdcall AccessibleObjectFromWindow(ptr long ptr ptr) @ stdcall CreateStdAccessibleObject(ptr long ptr ptr)

1 0

Piotr Caban : oleacc: Add AccessibleObjectFromPoint implementation.
by Alexandre Julliard 12 Apr '22

12 Apr '22

Module: wine Branch: oldstable Commit: b45ad23033b3555bb90244b352ab2fecc6bf5f4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b45ad23033b3555bb90244b3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 25 18:55:07 2021 +0100 oleacc: Add AccessibleObjectFromPoint implementation. Based on a patch by Alex Henrie. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 92f4f4a4c13e822cb5eb03207ec76f71640353d8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/oleacc/main.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 65 insertions(+), 6 deletions(-) diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index beceb2ff1fb..10300f69e73 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -325,18 +325,77 @@ LRESULT WINAPI LresultFromObject( REFIID riid, WPARAM wParam, LPUNKNOWN pAcc ) return atom; } -HRESULT WINAPI AccessibleObjectFromPoint( POINT ptScreen, IAccessible** ppacc, VARIANT* pvarChild ) -{ - FIXME("{%d,%d} %p %p: stub\n", ptScreen.x, ptScreen.y, ppacc, pvarChild ); - return E_NOTIMPL; -} - static void variant_init_i4( VARIANT *v, int val ) { V_VT(v) = VT_I4; V_I4(v) = val; } +HRESULT WINAPI AccessibleObjectFromPoint( POINT point, IAccessible** acc, VARIANT* child_id ) +{ + IAccessible *cur; + HRESULT hr; + VARIANT v; + HWND hwnd; + + TRACE("{%d,%d} %p %p\n", point.x, point.y, acc, child_id); + + if (!acc || !child_id) + return E_INVALIDARG; + + *acc = NULL; + V_VT(child_id) = VT_EMPTY; + + hwnd = WindowFromPoint(point); + if (!hwnd) + return E_FAIL; + hwnd = GetAncestor(hwnd, GA_ROOT); + + hr = AccessibleObjectFromWindow(hwnd, OBJID_WINDOW, &IID_IAccessible, (void **)&cur); + if (FAILED(hr)) + return hr; + if (!cur) + return E_FAIL; + + V_VT(&v) = VT_EMPTY; + while (1) + { + hr = IAccessible_accHitTest(cur, point.x, point.y, &v); + if (FAILED(hr)) + { + IAccessible_Release(cur); + return hr; + } + + if (V_VT(&v) == VT_I4) + { + *acc = cur; + variant_init_i4(child_id, V_I4(&v)); + return S_OK; + } + else if (V_VT(&v) == VT_DISPATCH) + { + IAccessible_Release(cur); + + hr = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IAccessible, (void**)&cur); + VariantClear(&v); + if (FAILED(hr)) + return hr; + if (!cur) + return E_FAIL; + } + else + { + VariantClear(&v); + IAccessible_Release(cur); + FIXME("unhandled variant type: %d\n", V_VT(&v)); + return E_NOTIMPL; + } + } + + return S_OK; +} + HRESULT WINAPI AccessibleObjectFromEvent( HWND hwnd, DWORD object_id, DWORD child_id, IAccessible **acc_out, VARIANT *child_id_out ) {

1 0

Doug Lyons : msvcrt: Do not acquire fd lock in msvcrt_create_io_inherit_block.
by Alexandre Julliard 12 Apr '22

12 Apr '22

Module: wine Branch: oldstable Commit: 5be7fa7879b189613fae30a02c797baf76e1a86c URL: https://source.winehq.org/git/wine.git/?a=commit;h=5be7fa7879b189613fae30a0… Author: Doug Lyons <douglyons(a)douglyons.com> Date: Thu Nov 11 17:32:45 2021 -0500 msvcrt: Do not acquire fd lock in msvcrt_create_io_inherit_block. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51647 Signed-off-by: Doug Lyons <douglyons(a)douglyons.com> Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5a514d3f45472ce1a169f33d14cdcfb07c51441e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/file.c | 5 ++--- dlls/msvcrt/msvcrt.h | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 36b1d637a27..55c79553103 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -519,7 +519,7 @@ static int msvcrt_init_fp(FILE* file, int fd, unsigned stream_flags) * 04 char file flags (wxflag): repeated for each fd * 4+NBFD HANDLE file handle: repeated for each fd */ -unsigned msvcrt_create_io_inherit_block(WORD *size, BYTE **block) +BOOL msvcrt_create_io_inherit_block(WORD *size, BYTE **block) { int fd, last_fd; char* wxflag_ptr; @@ -545,7 +545,7 @@ unsigned msvcrt_create_io_inherit_block(WORD *size, BYTE **block) for (fd = 0; fd < last_fd; fd++) { /* to be inherited, we need it to be open, and that DONTINHERIT isn't set */ - fdinfo = get_ioinfo(fd); + fdinfo = get_ioinfo_nolock(fd); if ((fdinfo->wxflag & (WX_OPEN | WX_DONTINHERIT)) == WX_OPEN) { *wxflag_ptr = fdinfo->wxflag; @@ -556,7 +556,6 @@ unsigned msvcrt_create_io_inherit_block(WORD *size, BYTE **block) *wxflag_ptr = 0; *handle_ptr = INVALID_HANDLE_VALUE; } - release_ioinfo(fdinfo); wxflag_ptr++; handle_ptr++; } return TRUE; diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index c360943b1f0..adb9248baf0 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -247,7 +247,7 @@ extern void msvcrt_free_scheduler(void) DECLSPEC_HIDDEN; extern void msvcrt_free_scheduler_thread(void) DECLSPEC_HIDDEN; #endif -extern unsigned msvcrt_create_io_inherit_block(WORD*, BYTE**) DECLSPEC_HIDDEN; +extern BOOL msvcrt_create_io_inherit_block(WORD*, BYTE**) DECLSPEC_HIDDEN; /* run-time error codes */ #define _RT_STACK 0

1 0

Thomas Faber : msvcrt/tests: Show that spawn does not require locking of fds.
by Alexandre Julliard 12 Apr '22

12 Apr '22

Module: wine Branch: oldstable Commit: d1833f8ea618bcaa71ba31aa3f3fd099cfc929e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1833f8ea618bcaa71ba31aa… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Thu Nov 11 17:42:58 2021 -0500 msvcrt/tests: Show that spawn does not require locking of fds. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit be0684dad50ffbc93b3ded4fbfebf1d1e4690589) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/tests/file.c | 45 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 43 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 0cf8bad124f..206c01695ca 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -1550,6 +1550,18 @@ static void test_stdout_handle( STARTUPINFOA *startup, char *cmdline, HANDLE hst DeleteFileA( "fdopen.err" ); } +static unsigned WINAPI read_pipe_thread(void *argument) +{ + unsigned char buffer[2]; + int ret; + int *pipefds = argument; + + ret = _read(pipefds[0], buffer, sizeof(buffer)); + ok(ret == 1, "ret = %d\n", ret); + ok(buffer[0] == 'a', "%x\n", buffer[0]); + return 0; +} + static void test_file_inherit( const char* selfname ) { int fd; @@ -1559,6 +1571,9 @@ static void test_file_inherit( const char* selfname ) STARTUPINFOA startup; SECURITY_ATTRIBUTES sa; HANDLE handles[3]; + HANDLE thread_handle; + int pipefds[2]; + intptr_t ret; fd = open ("fdopen.tst", O_CREAT | O_RDWR | O_BINARY, _S_IREAD |_S_IWRITE); ok(fd != -1, "Couldn't create test file\n"); @@ -1567,7 +1582,8 @@ static void test_file_inherit( const char* selfname ) arg_v[2] = "inherit"; arg_v[3] = buffer; sprintf(buffer, "%d", fd); arg_v[4] = 0; - _spawnvp(_P_WAIT, selfname, arg_v); + ret = _spawnvp(_P_WAIT, selfname, arg_v); + ok(ret == 0, "_spawnvp returned %d, errno %d\n", ret, errno); ok(tell(fd) == 8, "bad position %lu expecting 8\n", tell(fd)); lseek(fd, 0, SEEK_SET); ok(read(fd, buffer, sizeof (buffer)) == 8 && memcmp(buffer, "Success", 8) == 0, "Couldn't read back the data\n"); @@ -1580,12 +1596,37 @@ static void test_file_inherit( const char* selfname ) arg_v[2] = "inherit_no"; arg_v[3] = buffer; sprintf(buffer, "%d", fd); arg_v[4] = 0; - _spawnvp(_P_WAIT, selfname, arg_v); + ret = _spawnvp(_P_WAIT, selfname, arg_v); + ok(ret == 0, "_spawnvp returned %d, errno %d\n", ret, errno); ok(tell(fd) == 0, "bad position %lu expecting 0\n", tell(fd)); ok(read(fd, buffer, sizeof (buffer)) == 0, "Found unexpected data (%s)\n", buffer); close (fd); ok(unlink("fdopen.tst") == 0, "Couldn't unlink\n"); + /* Show that spawn works while a read is active */ + ok(_pipe(pipefds, 1, O_BINARY) == 0, "_pipe() failed\n"); + thread_handle = (HANDLE)_beginthreadex(NULL, 0, read_pipe_thread, pipefds, 0, NULL); + Sleep(100); /* try to make sure the thread is reading */ + fd = open ("fdopen.tst", O_CREAT | O_RDWR | O_BINARY, _S_IREAD |_S_IWRITE); + ok(fd != -1, "Couldn't create test file\n"); + arg_v[1] = "tests/file.c"; + arg_v[2] = "inherit"; + arg_v[3] = buffer; sprintf(buffer, "%d", fd); + arg_v[4] = 0; + ret = _spawnvp(_P_WAIT, selfname, arg_v); + ok(ret == 0, "_spawnvp returned %Id, errno %d\n", ret, errno); + ret = tell(fd); + ok(ret == 8, "bad position %Iu expecting 8\n", ret); + lseek(fd, 0, SEEK_SET); + ok(read(fd, buffer, sizeof (buffer)) == 8 && memcmp(buffer, "Success", 8) == 0, "Couldn't read back the data\n"); + close (fd); + ok(unlink("fdopen.tst") == 0, "Couldn't unlink\n"); + _write(pipefds[1], "a", 1); + WaitForSingleObject(thread_handle, INFINITE); + CloseHandle(thread_handle); + close(pipefds[0]); + close(pipefds[1]); + /* make file handle inheritable */ sa.nLength = sizeof(sa); sa.lpSecurityDescriptor = NULL;

1 0