May 2018 - Wine-commits - list.winehq.org

Zebediah Figura : msi/tests: Test deferral of InstallODBC and RemoveODBC.
by Alexandre Julliard 22 May '18

22 May '18

Module: wine Branch: master Commit: 7305e5fd8c1262e369c2807e83adfb9aaf4f2e7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=7305e5fd8c1262e369c2807e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 18 22:00:58 2018 -0500 msi/tests: Test deferral of InstallODBC and RemoveODBC. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/Makefile.in | 2 +- dlls/msi/tests/action.c | 14 +++++++++++++ dlls/msi/tests/custom.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/msi/tests/custom.spec | 2 ++ 4 files changed, 66 insertions(+), 1 deletion(-) diff --git a/dlls/msi/tests/Makefile.in b/dlls/msi/tests/Makefile.in index 43a5657..18a6457 100644 --- a/dlls/msi/tests/Makefile.in +++ b/dlls/msi/tests/Makefile.in @@ -1,7 +1,7 @@ TESTDLL = msi.dll IMPORTS = cabinet msi shell32 ole32 oleaut32 user32 advapi32 version odbccp32 -custom_IMPORTS = uuid msi ole32 shell32 advapi32 +custom_IMPORTS = uuid msi ole32 shell32 advapi32 odbccp32 SOURCES = \ action.c \ diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index e33decc..943c939 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -870,7 +870,11 @@ static const char odbc_install_exec_seq_dat[] = "InstallInitialize\t\t1500\n" "ProcessComponents\t\t1600\n" "InstallODBC\t\t3000\n" + "io_immediate\tNOT REMOVE\t3001\n" + "io_deferred\tNOT REMOVE\t3002\n" "RemoveODBC\t\t3100\n" + "ro_immediate\tREMOVE\t3101\n" + "ro_deferred\tREMOVE\t3102\n" "RemoveFiles\t\t3900\n" "InstallFiles\t\t4000\n" "RegisterProduct\t\t5000\n" @@ -878,6 +882,15 @@ static const char odbc_install_exec_seq_dat[] = "PublishProduct\t\t5200\n" "InstallFinalize\t\t6000\n"; +static const char odbc_custom_action_dat[] = + "Action\tType\tSource\tTarget\n" + "s72\ti2\tS64\tS0\n" + "CustomAction\tAction\n" + "io_immediate\t1\tcustom.dll\todbc_absent\n" + "io_deferred\t1025\tcustom.dll\todbc_present\n" + "ro_immediate\t1\tcustom.dll\todbc_present\n" + "ro_deferred\t1025\tcustom.dll\todbc_absent\n"; + static const char odbc_media_dat[] = "DiskId\tLastSequence\tDiskPrompt\tCabinet\tVolumeLabel\tSource\n" "i2\ti4\tL64\tS255\tS32\tS72\n" @@ -1969,6 +1982,7 @@ static const msi_table odbc_tables[] = ADD_TABLE(odbc_translator), ADD_TABLE(odbc_datasource), ADD_TABLE(odbc_install_exec_seq), + ADD_TABLE(odbc_custom_action), ADD_TABLE(odbc_media), ADD_TABLE(property) }; diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 4e3e2dc..0f34eb0 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -24,6 +24,7 @@ #include <windef.h> #include <winbase.h> #include <winsvc.h> +#include <odbcinst.h> #define COBJMACROS #include <shlobj.h> #include <msxml.h> @@ -1314,3 +1315,51 @@ todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { ok(hinst, !pf_exists("msitest\\duplicate2.txt"), "file present\n"); return ERROR_SUCCESS; } + +UINT WINAPI odbc_present(MSIHANDLE hinst) +{ + int gotdriver = 0, gotdriver2 = 0; + char buffer[1000], *p; + WORD len; + BOOL r; + + r = SQLGetInstalledDrivers(buffer, sizeof(buffer), &len); + ok(hinst, len < sizeof(buffer), "buffer too small\n"); + ok(hinst, r, "SQLGetInstalledDrivers failed\n"); + for (p = buffer; *p; p += strlen(p) + 1) + { + if (!strcmp(p, "ODBC test driver")) + gotdriver = 1; + if (!strcmp(p, "ODBC test driver2")) + gotdriver2 = 1; + } +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { + ok(hinst, gotdriver, "driver absent\n"); + ok(hinst, gotdriver2, "driver 2 absent\n"); +} + return ERROR_SUCCESS; +} + +UINT WINAPI odbc_absent(MSIHANDLE hinst) +{ + int gotdriver = 0, gotdriver2 = 0; + char buffer[1000], *p; + WORD len; + BOOL r; + + r = SQLGetInstalledDrivers(buffer, sizeof(buffer), &len); + ok(hinst, len < sizeof(buffer), "buffer too small\n"); + ok(hinst, r, "SQLGetInstalledDrivers failed\n"); + for (p = buffer; *p; p += strlen(p) + 1) + { + if (!strcmp(p, "ODBC test driver")) + gotdriver = 1; + if (!strcmp(p, "ODBC test driver2")) + gotdriver2 = 1; + } +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { + ok(hinst, !gotdriver, "driver present\n"); + ok(hinst, !gotdriver2, "driver 2 present\n"); +} + return ERROR_SUCCESS; +} diff --git a/dlls/msi/tests/custom.spec b/dlls/msi/tests/custom.spec index 1b15ca9..52feffa 100644 --- a/dlls/msi/tests/custom.spec +++ b/dlls/msi/tests/custom.spec @@ -9,6 +9,8 @@ @ stdcall crs_absent(long) @ stdcall file_present(long) @ stdcall file_absent(long) +@ stdcall odbc_present(long) +@ stdcall odbc_absent(long) @ stdcall rd_present(long) @ stdcall rd_absent(long) @ stdcall sds_present(long)

1 0

Jacek Caban : itss: Support COM aggregation in its protocol handler.
by Alexandre Julliard 22 May '18

22 May '18

Module: wine Branch: master Commit: cd5570d9efd0cea19e5863fb334da3d40dd9658d URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd5570d9efd0cea19e5863fb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 22 11:31:59 2018 +0200 itss: Support COM aggregation in its protocol handler. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/itss/itss.c | 29 ++++++++++++------ dlls/itss/protocol.c | 76 ++++++++++++++++++++++++++++++++-------------- dlls/itss/tests/protocol.c | 64 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 138 insertions(+), 31 deletions(-) diff --git a/dlls/itss/itss.c b/dlls/itss/itss.c index f47a0e9..1d236a5 100644 --- a/dlls/itss/itss.c +++ b/dlls/itss/itss.c @@ -105,20 +105,31 @@ static ULONG WINAPI ITSSCF_Release(LPCLASSFACTORY iface) } -static HRESULT WINAPI ITSSCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, - REFIID riid, LPVOID *ppobj) +static HRESULT WINAPI ITSSCF_CreateInstance(IClassFactory *iface, IUnknown *outer, + REFIID riid, void **ppv) { IClassFactoryImpl *This = impl_from_IClassFactory(iface); + IUnknown *unk; HRESULT hres; - LPUNKNOWN punk; - TRACE("(%p)->(%p,%s,%p)\n", This, pOuter, debugstr_guid(riid), ppobj); + TRACE("(%p)->(%p %s %p)\n", This, outer, debugstr_guid(riid), ppv); - *ppobj = NULL; - hres = This->pfnCreateInstance(pOuter, (LPVOID *) &punk); - if (SUCCEEDED(hres)) { - hres = IUnknown_QueryInterface(punk, riid, ppobj); - IUnknown_Release(punk); + if(outer && !IsEqualGUID(riid, &IID_IUnknown)) { + *ppv = NULL; + return CLASS_E_NOAGGREGATION; + } + + hres = This->pfnCreateInstance(outer, (void**)&unk); + if(FAILED(hres)) { + *ppv = NULL; + return hres; + } + + if(!IsEqualGUID(riid, &IID_IUnknown)) { + hres = IUnknown_QueryInterface(unk, riid, ppv); + IUnknown_Release(unk); + }else { + *ppv = unk; } return hres; } diff --git a/dlls/itss/protocol.c b/dlls/itss/protocol.c index 1463518..1cdb365 100644 --- a/dlls/itss/protocol.c +++ b/dlls/itss/protocol.c @@ -36,16 +36,23 @@ WINE_DEFAULT_DEBUG_CHANNEL(itss); typedef struct { + IUnknown IUnknown_inner; IInternetProtocol IInternetProtocol_iface; IInternetProtocolInfo IInternetProtocolInfo_iface; LONG ref; + IUnknown *outer; ULONG offset; struct chmFile *chm_file; struct chmUnitInfo chm_object; } ITSProtocol; +static inline ITSProtocol *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, ITSProtocol, IUnknown_inner); +} + static inline ITSProtocol *impl_from_IInternetProtocol(IInternetProtocol *iface) { return CONTAINING_RECORD(iface, ITSProtocol, IInternetProtocol_iface); @@ -65,14 +72,13 @@ static void release_chm(ITSProtocol *This) This->offset = 0; } -static HRESULT WINAPI ITSProtocol_QueryInterface(IInternetProtocol *iface, REFIID riid, void **ppv) +static HRESULT WINAPI ITSProtocol_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) { - ITSProtocol *This = impl_from_IInternetProtocol(iface); + ITSProtocol *This = impl_from_IUnknown(iface); - *ppv = NULL; if(IsEqualGUID(&IID_IUnknown, riid)) { TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); - *ppv = &This->IInternetProtocol_iface; + *ppv = &This->IUnknown_inner; }else if(IsEqualGUID(&IID_IInternetProtocolRoot, riid)) { TRACE("(%p)->(IID_IInternetProtocolRoot %p)\n", This, ppv); *ppv = &This->IInternetProtocol_iface; @@ -82,28 +88,27 @@ static HRESULT WINAPI ITSProtocol_QueryInterface(IInternetProtocol *iface, REFII }else if(IsEqualGUID(&IID_IInternetProtocolInfo, riid)) { TRACE("(%p)->(IID_IInternetProtocolInfo %p)\n", This, ppv); *ppv = &This->IInternetProtocolInfo_iface; + }else { + *ppv = NULL; + WARN("not supported interface %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; } - if(*ppv) { - IInternetProtocol_AddRef(iface); - return S_OK; - } - - WARN("not supported interface %s\n", debugstr_guid(riid)); - return E_NOINTERFACE; + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; } -static ULONG WINAPI ITSProtocol_AddRef(IInternetProtocol *iface) +static ULONG WINAPI ITSProtocol_AddRef(IUnknown *iface) { - ITSProtocol *This = impl_from_IInternetProtocol(iface); + ITSProtocol *This = impl_from_IUnknown(iface); LONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); return ref; } -static ULONG WINAPI ITSProtocol_Release(IInternetProtocol *iface) +static ULONG WINAPI ITSProtocol_Release(IUnknown *iface) { - ITSProtocol *This = impl_from_IInternetProtocol(iface); + ITSProtocol *This = impl_from_IUnknown(iface); LONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -118,6 +123,30 @@ static ULONG WINAPI ITSProtocol_Release(IInternetProtocol *iface) return ref; } +static const IUnknownVtbl ITSProtocolUnkVtbl = { + ITSProtocol_QueryInterface, + ITSProtocol_AddRef, + ITSProtocol_Release +}; + +static HRESULT WINAPI ITSInternetProtocol_QueryInterface(IInternetProtocol *iface, REFIID riid, void **ppv) +{ + ITSProtocol *This = impl_from_IInternetProtocol(iface); + return IUnknown_QueryInterface(This->outer, riid, ppv); +} + +static ULONG WINAPI ITSInternetProtocol_AddRef(IInternetProtocol *iface) +{ + ITSProtocol *This = impl_from_IInternetProtocol(iface); + return IUnknown_AddRef(This->outer); +} + +static ULONG WINAPI ITSInternetProtocol_Release(IInternetProtocol *iface) +{ + ITSProtocol *This = impl_from_IInternetProtocol(iface); + return IUnknown_Release(This->outer); +} + static LPCWSTR skip_schema(LPCWSTR url) { static const WCHAR its_schema[] = {'i','t','s',':'}; @@ -387,9 +416,9 @@ static HRESULT WINAPI ITSProtocol_UnlockRequest(IInternetProtocol *iface) } static const IInternetProtocolVtbl ITSProtocolVtbl = { - ITSProtocol_QueryInterface, - ITSProtocol_AddRef, - ITSProtocol_Release, + ITSInternetProtocol_QueryInterface, + ITSInternetProtocol_AddRef, + ITSInternetProtocol_Release, ITSProtocol_Start, ITSProtocol_Continue, ITSProtocol_Abort, @@ -520,21 +549,24 @@ static const IInternetProtocolInfoVtbl ITSProtocolInfoVtbl = { ITSProtocolInfo_QueryInfo }; -HRESULT ITSProtocol_create(IUnknown *pUnkOuter, LPVOID *ppobj) +HRESULT ITSProtocol_create(IUnknown *outer, void **ppv) { ITSProtocol *ret; - TRACE("(%p %p)\n", pUnkOuter, ppobj); + TRACE("(%p %p)\n", outer, ppv); ITSS_LockModule(); ret = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ITSProtocol)); + if(!ret) + return E_OUTOFMEMORY; + ret->IUnknown_inner.lpVtbl = &ITSProtocolUnkVtbl; ret->IInternetProtocol_iface.lpVtbl = &ITSProtocolVtbl; ret->IInternetProtocolInfo_iface.lpVtbl = &ITSProtocolInfoVtbl; ret->ref = 1; + ret->outer = outer ? outer : &ret->IUnknown_inner; - *ppobj = &ret->IInternetProtocol_iface; - + *ppv = &ret->IUnknown_inner; return S_OK; } diff --git a/dlls/itss/tests/protocol.c b/dlls/itss/tests/protocol.c index 663411f..3028da4 100644 --- a/dlls/itss/tests/protocol.c +++ b/dlls/itss/tests/protocol.c @@ -60,6 +60,7 @@ DEFINE_EXPECT(ReportProgress_CACHEFILENAMEAVAILABLE); DEFINE_EXPECT(ReportProgress_DIRECTBIND); DEFINE_EXPECT(ReportData); DEFINE_EXPECT(ReportResult); +DEFINE_EXPECT(outer_QI_test); static HRESULT expect_hrResult; static IInternetProtocol *read_protocol = NULL; @@ -660,6 +661,68 @@ static void delete_chm(void) ok(ret, "DeleteFileA failed: %d\n", GetLastError()); } +static const IID outer_test_iid = {0xabcabc00,0,0,{0,0,0,0,0,0,0,0x66}}; + +static HRESULT WINAPI outer_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) +{ + if(IsEqualGUID(riid, &outer_test_iid)) { + CHECK_EXPECT(outer_QI_test); + *ppv = (IUnknown*)0xdeadbeef; + return S_OK; + } + ok(0, "unexpected call %s\n", wine_dbgstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI outer_AddRef(IUnknown *iface) +{ + return 2; +} + +static ULONG WINAPI outer_Release(IUnknown *iface) +{ + return 1; +} + +static const IUnknownVtbl outer_vtbl = { + outer_QueryInterface, + outer_AddRef, + outer_Release +}; + +static void test_com_aggregation(const CLSID *clsid) +{ + IUnknown outer = { &outer_vtbl }; + IClassFactory *class_factory; + IUnknown *unk, *unk2, *unk3; + HRESULT hres; + + hres = CoGetClassObject(clsid, CLSCTX_INPROC_SERVER, NULL, &IID_IClassFactory, (void**)&class_factory); + ok(hres == S_OK, "CoGetClassObject failed: %08x\n", hres); + + hres = IClassFactory_CreateInstance(class_factory, &outer, &IID_IUnknown, (void**)&unk); + ok(hres == S_OK, "CreateInstance returned: %08x\n", hres); + + hres = IUnknown_QueryInterface(unk, &IID_IInternetProtocol, (void**)&unk2); + ok(hres == S_OK, "Could not get IInternetProtocol iface: %08x\n", hres); + + SET_EXPECT(outer_QI_test); + hres = IUnknown_QueryInterface(unk2, &outer_test_iid, (void**)&unk3); + CHECK_CALLED(outer_QI_test); + ok(hres == S_OK, "Could not get IInternetProtocol iface: %08x\n", hres); + ok(unk3 == (IUnknown*)0xdeadbeef, "unexpected unk2\n"); + + IUnknown_Release(unk2); + IUnknown_Release(unk); + + unk = (void*)0xdeadbeef; + hres = IClassFactory_CreateInstance(class_factory, &outer, &IID_IInternetProtocol, (void**)&unk); + ok(hres == CLASS_E_NOAGGREGATION, "CreateInstance returned: %08x\n", hres); + ok(!unk, "unk = %p\n", unk); + + IClassFactory_Release(class_factory); +} + START_TEST(protocol) { OleInitialize(NULL); @@ -669,6 +732,7 @@ START_TEST(protocol) test_its_protocol(); test_mk_protocol(); + test_com_aggregation(&CLSID_ITSProtocol); delete_chm(); OleUninitialize();

1 0

Matej Špindler : kernel32: Check for LOCALE_NOUSEROVERRIDE for neutral locales.
by Alexandre Julliard 22 May '18

22 May '18

Module: wine Branch: master Commit: da5112c74313b5236183135204cab38a8b0169ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=da5112c74313b52361831352… Author: Matej Špindler <spindler.matej(a)gmail.com> Date: Tue May 22 17:15:01 2018 +0200 kernel32: Check for LOCALE_NOUSEROVERRIDE for neutral locales. Signed-off-by: Matej Špindler <spindler.matej(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 2 +- dlls/kernel32/tests/locale.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 5a6ff35..d21a763 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -1812,7 +1812,7 @@ INT WINAPI GetLocaleInfoEx(LPCWSTR locale, LCTYPE info, LPWSTR buffer, INT len) /* special handling for neutral locale names */ if (locale && strlenW(locale) == 2) { - switch (info) + switch (info & ~LOCALE_LOCALEINFOFLAGSMASK) { case LOCALE_SNAME: if (len && len < 3) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 91a8703..791f015 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -4499,6 +4499,10 @@ static void test_GetLocaleInfoEx(void) ok(ret == 1, "got %d\n", ret); ok(!bufferW[0], "got %s\n", wine_dbgstr_w(bufferW)); + ret = pGetLocaleInfoEx(enW, LOCALE_SPARENT | LOCALE_NOUSEROVERRIDE, bufferW, sizeof(bufferW)/sizeof(WCHAR)); + ok(ret == 1, "got %d\n", ret); + ok(!bufferW[0], "got %s\n", wine_dbgstr_w(bufferW)); + ret = pGetLocaleInfoEx(enW, LOCALE_SCOUNTRY, bufferW, sizeof(bufferW)/sizeof(WCHAR)); ok(ret == lstrlenW(bufferW)+1, "got %d\n", ret); if ((PRIMARYLANGID(LANGIDFROMLCID(GetSystemDefaultLCID())) != LANG_ENGLISH) ||

1 0

Mingcong Bai : po: Update Simplified Chinese translation.
by Alexandre Julliard 22 May '18

22 May '18

Module: wine Branch: master Commit: 36ccf6bf59ec3ce65e409ee5e4a922108ff81c99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=36ccf6bf59ec3ce65e409ee5… Author: Mingcong Bai <jeffbai(a)aosc.xyz> Date: Tue May 22 16:09:52 2018 +0800 po: Update Simplified Chinese translation. Signed-off-by: Mingcong Bai <jeffbai(a)aosc.xyz> Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/zh_CN.po | 80 +++++++++++++++++++------------------------------------------ 1 file changed, 25 insertions(+), 55 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 1f95335..d91dd37 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-12-16 00:29-0600\n" +"PO-Revision-Date: 2018-05-20 10:58+0800\n" "Last-Translator: Mingcong Bai <jeffbai(a)aosc.xyz>\n" "Language-Team: Chinese (PRC)\n" "Language: zh_CN\n" @@ -3636,19 +3636,19 @@ msgstr "期望得到 Array 对象" msgid "" "'writable' attribute on the property descriptor cannot be set to 'true' on " "this object" -msgstr "" +msgstr "无法在此对象上更改属性描述符中的“writable”属性为“true”" #: jscript.rc:70 msgid "Cannot redefine non-configurable property '|'" -msgstr "" +msgstr "无法重定义不可配置的属性“|”" #: jscript.rc:71 msgid "Cannot modify non-writable property '|'" -msgstr "" +msgstr "无法更改不可写的属性“|”" #: jscript.rc:72 msgid "Property cannot have both accessors and a value" -msgstr "" +msgstr "属性不能同时包含存取器和值" #: ../../include/wine/wine_common_ver.rc:129 msgid "Wine kernel DLL" @@ -6619,10 +6619,8 @@ msgid "Connection reset by peer.\n" msgstr "连接被重置。\n" #: winerror.mc:3760 -#, fuzzy -#| msgid "Message 0x%1 not found in file %2.\n" msgid "No Signature found in file.\n" -msgstr "未在文件 %2 中发现消息 0x%1。\n" +msgstr "未在文件内找到签名。\n" #: localspl.rc:31 localui.rc:31 winspool.rc:30 msgid "Local Port" @@ -8441,10 +8439,8 @@ msgid "&Browse..." msgstr "浏览(&B)..." #: shell32.rc:355 shell32.rc:384 -#, fuzzy -#| msgid "File type" msgid "File type:" -msgstr "文件类型" +msgstr "文件类型：" #: shell32.rc:359 shell32.rc:392 urlmon.rc:37 explorer.rc:32 msgid "Location:" @@ -8455,16 +8451,12 @@ msgid "Size:" msgstr "大小：" #: shell32.rc:365 shell32.rc:398 -#, fuzzy -#| msgid "Creation date" msgid "Creation date:" -msgstr "创建日期" +msgstr "创建日期：" #: shell32.rc:369 shell32.rc:406 -#, fuzzy -#| msgid "&Attributes:" msgid "Attributes:" -msgstr "属性(&A)：" +msgstr "属性：" #: shell32.rc:371 shell32.rc:408 winefile.rc:174 msgid "H&idden" @@ -8475,28 +8467,20 @@ msgid "&Archive" msgstr "存档(&A)" #: shell32.rc:386 -#, fuzzy -#| msgid "Open:" msgid "Open with:" -msgstr "打开：" +msgstr "打开方式：" #: shell32.rc:389 -#, fuzzy -#| msgid "Change &Icon..." msgid "&Change..." -msgstr "改变图标(&I)..." +msgstr "更改(&C)..." #: shell32.rc:400 -#, fuzzy -#| msgid "Modified" msgid "Last modified:" -msgstr "修改" +msgstr "最近修改：" #: shell32.rc:402 -#, fuzzy -#| msgid "Last Change:" msgid "Last accessed:" -msgstr "最后更改：" +msgstr "最近访问：" #: shell32.rc:138 shell32.rc:142 winefile.rc:108 msgid "Size" @@ -9100,70 +9084,56 @@ msgid "" msgstr "证书至少带有一个不明安全问题。" #: winineterror.mc:26 -#, fuzzy -#| msgid "Service request timeout.\n" msgid "The request has timed out.\n" -msgstr "服务请求超时。\n" +msgstr "请求超时。\n" #: winineterror.mc:31 -#, fuzzy -#| msgid "A printer error occurred." msgid "An internal error has occurred.\n" -msgstr "打印机错误。" +msgstr "发生内部错误。\n" #: winineterror.mc:36 -#, fuzzy -#| msgid "Path is invalid.\n" msgid "The URL is invalid.\n" -msgstr "路径无效。\n" +msgstr "URL 无效。\n" #: winineterror.mc:41 msgid "The URL scheme could not be recognized or is not supported.\n" -msgstr "" +msgstr "该 URL 格式无法识别或不被支持。\n" #: winineterror.mc:46 -#, fuzzy -#| msgid "The username could not be found.\n" msgid "The server name could not be resolved.\n" -msgstr "找不到用户名。\n" +msgstr "无法解析服务器域名。\n" #: winineterror.mc:51 -#, fuzzy -#| msgid "The user profile is invalid.\n" msgid "The requested operation is invalid.\n" -msgstr "无效用户档案。\n" +msgstr "请求的操作无效。\n" #: winineterror.mc:56 msgid "" "The operation was canceled, usually because the handle on which the request " "was operating was closed before the operation completed.\n" -msgstr "" +msgstr "该操作已被取消，这一般是操作完成前请求操作的句柄被关闭导致的。\n" #: winineterror.mc:61 -#, fuzzy -#| msgid "The profile could not be added.\n" msgid "The requested item could not be located.\n" -msgstr "无法添加该档案。\n" +msgstr "无法找到请求项。\n" #: winineterror.mc:66 -#, fuzzy -#| msgid "Can't connect to the LDAP server" msgid "The attempt to connect to the server failed.\n" -msgstr "无法连接到 LDAP 服务器" +msgstr "尝试连接到服务器失败。\n" #: winineterror.mc:71 msgid "The connection with the server has been terminated.\n" -msgstr "" +msgstr "到服务器的连接已终止。\n" #: winineterror.mc:76 msgid "" "SSL certificate date that was received from the server is bad. The " "certificate is expired.\n" -msgstr "" +msgstr "从服务器接收的 SSL 证书日期无效。该证书已过期。\n" #: winineterror.mc:81 msgid "SSL certificate common name (host name field) is incorrect.\n" -msgstr "" +msgstr "SSL 证书一般名称（域名栏目）不正确。\n" #: winmm.rc:32 msgid "The specified command was carried out."

1 0

Jacek Caban : urlmon/tests: Handle ERROR_INTERNET_INVALID_CA security problem in https tests.
by Alexandre Julliard 22 May '18

22 May '18

Module: wine Branch: master Commit: df976fd57adb146bddf03333cc5a84da39da6acf URL: https://source.winehq.org/git/wine.git/?a=commit;h=df976fd57adb146bddf03333… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 22 10:13:44 2018 +0200 urlmon/tests: Handle ERROR_INTERNET_INVALID_CA security problem in https tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/protocol.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 1c5ffaf..78b882b 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -246,14 +246,17 @@ static HRESULT WINAPI HttpSecurity_GetWindow(IHttpSecurity* iface, REFGUID rgui static HRESULT WINAPI HttpSecurity_OnSecurityProblem(IHttpSecurity *iface, DWORD dwProblem) { - trace("Security problem: %u\n", dwProblem); - ok(dwProblem == ERROR_INTERNET_SEC_CERT_REV_FAILED, "Expected ERROR_INTERNET_SEC_CERT_REV_FAILED got %u\n", dwProblem); + win_skip("Security problem: %u\n", dwProblem); + ok(dwProblem == ERROR_INTERNET_SEC_CERT_REV_FAILED || dwProblem == ERROR_INTERNET_INVALID_CA, + "Expected got %u security problem\n", dwProblem); /* Only retry once */ if (security_problem) return E_ABORT; security_problem = TRUE; + if(dwProblem == ERROR_INTERNET_INVALID_CA) + return E_ABORT; SET_EXPECT(BeginningTransaction); return RPC_E_RETRY; @@ -1157,6 +1160,9 @@ static HRESULT WINAPI ProtocolSink_ReportResult(IInternetProtocolSink *iface, HR { CHECK_EXPECT(ReportResult); + if(security_problem) + return S_OK; + if(tested_protocol == FTP_TEST) ok(hrResult == E_PENDING || hrResult == S_OK, "hrResult = %08x, expected E_PENDING or S_OK\n", hrResult); else @@ -2625,6 +2631,7 @@ static void init_test(int prot, DWORD flags) empty_file = (flags & TEST_EMPTY) != 0; bind_from_cache = (flags & TEST_FROMCACHE) != 0; file_with_hash = FALSE; + security_problem = FALSE; bindinfo_options = 0; if(flags & TEST_DISABLEAUTOREDIRECT)

1 0

Jacek Caban : urlmon/tests: Use the same thread for both connections in redirect tests.
by Alexandre Julliard 22 May '18

22 May '18

Module: wine Branch: master Commit: 749dbd81b1cbd24e5ec3df0ce97712c1e9945c9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=749dbd81b1cbd24e5ec3df0c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 22 10:13:52 2018 +0200 urlmon/tests: Use the same thread for both connections in redirect tests. Fixes a race spotted by Zebediah Figura. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/protocol.c | 58 +++++++++++++++++++++++--------------------- 1 file changed, 31 insertions(+), 27 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 78b882b..f5543fe 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -156,7 +156,7 @@ static PROTOCOLDATA protocoldata, *pdata, continue_protdata; static DWORD prot_read, filter_state, http_post_test, thread_id; static BOOL security_problem, test_async_req, impl_protex; static BOOL async_read_pending, mimefilter_test, direct_read, wait_for_switch, emulate_prot, short_read, test_abort; -static BOOL empty_file, no_mime, bind_from_cache, file_with_hash; +static BOOL empty_file, no_mime, bind_from_cache, file_with_hash, reuse_protocol_thread; enum { STATE_CONNECTING, @@ -1611,40 +1611,41 @@ static HRESULT WINAPI ProtocolEmul_QueryInterface(IInternetProtocolEx *iface, RE static DWORD WINAPI thread_proc(PVOID arg) { - BOOL redirect_only = redirect_on_continue; + BOOL redirect = redirect_on_continue; HRESULT hres; memset(&protocoldata, -1, sizeof(protocoldata)); - prot_state = 0; + while(1) { + prot_state = 0; - SET_EXPECT(ReportProgress_FINDINGRESOURCE); - hres = IInternetProtocolSink_ReportProgress(binding_sink, - BINDSTATUS_FINDINGRESOURCE, hostW); - CHECK_CALLED(ReportProgress_FINDINGRESOURCE); - ok(hres == S_OK, "ReportProgress failed: %08x\n", hres); + SET_EXPECT(ReportProgress_FINDINGRESOURCE); + hres = IInternetProtocolSink_ReportProgress(binding_sink, + BINDSTATUS_FINDINGRESOURCE, hostW); + CHECK_CALLED(ReportProgress_FINDINGRESOURCE); + ok(hres == S_OK, "ReportProgress failed: %08x\n", hres); - SET_EXPECT(ReportProgress_CONNECTING); - hres = IInternetProtocolSink_ReportProgress(binding_sink, - BINDSTATUS_CONNECTING, winehq_ipW); - CHECK_CALLED(ReportProgress_CONNECTING); - ok(hres == S_OK, "ReportProgress failed: %08x\n", hres); + SET_EXPECT(ReportProgress_CONNECTING); + hres = IInternetProtocolSink_ReportProgress(binding_sink, + BINDSTATUS_CONNECTING, winehq_ipW); + CHECK_CALLED(ReportProgress_CONNECTING); + ok(hres == S_OK, "ReportProgress failed: %08x\n", hres); - SET_EXPECT(ReportProgress_SENDINGREQUEST); - hres = IInternetProtocolSink_ReportProgress(binding_sink, - BINDSTATUS_SENDINGREQUEST, NULL); - CHECK_CALLED(ReportProgress_SENDINGREQUEST); - ok(hres == S_OK, "ReportProgress failed: %08x\n", hres); + SET_EXPECT(ReportProgress_SENDINGREQUEST); + hres = IInternetProtocolSink_ReportProgress(binding_sink, + BINDSTATUS_SENDINGREQUEST, NULL); + CHECK_CALLED(ReportProgress_SENDINGREQUEST); + ok(hres == S_OK, "ReportProgress failed: %08x\n", hres); - prot_state = 1; - SET_EXPECT(Switch); - hres = IInternetProtocolSink_Switch(binding_sink, &protocoldata); - CHECK_CALLED(Switch); - ok(hres == S_OK, "Switch failed: %08x\n", hres); + prot_state = 1; + SET_EXPECT(Switch); + hres = IInternetProtocolSink_Switch(binding_sink, &protocoldata); + CHECK_CALLED(Switch); + ok(hres == S_OK, "Switch failed: %08x\n", hres); - if(redirect_only) { - prot_state = 0; - return 0; + if(!redirect) + break; + redirect = FALSE; } if(!short_read) { @@ -1799,7 +1800,8 @@ static void protocol_start(IInternetProtocolSink *pOIProtSink, IInternetBindInfo IServiceProvider_Release(service_provider); - CreateThread(NULL, 0, thread_proc, NULL, 0, &tid); + if(!reuse_protocol_thread) + CreateThread(NULL, 0, thread_proc, NULL, 0, &tid); return; } @@ -1909,6 +1911,7 @@ static HRESULT WINAPI ProtocolEmul_Continue(IInternetProtocolEx *iface, if(redirect_on_continue) { redirect_on_continue = FALSE; + reuse_protocol_thread = TRUE; if(bindinfo_options & BINDINFO_OPTIONS_DISABLEAUTOREDIRECTS) SET_EXPECT(Redirect); @@ -2632,6 +2635,7 @@ static void init_test(int prot, DWORD flags) bind_from_cache = (flags & TEST_FROMCACHE) != 0; file_with_hash = FALSE; security_problem = FALSE; + reuse_protocol_thread = FALSE; bindinfo_options = 0; if(flags & TEST_DISABLEAUTOREDIRECT)

1 0

Jacek Caban : urlmon: Ensure that inner protocol handler reference is released after other references.
by Alexandre Julliard 22 May '18

22 May '18

Module: wine Branch: master Commit: 52aefc06114441c5b6b2cbcbd84e6756c6286275 URL: https://source.winehq.org/git/wine.git/?a=commit;h=52aefc06114441c5b6b2cbcb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 22 10:13:59 2018 +0200 urlmon: Ensure that inner protocol handler reference is released after other references. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/bindprot.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index 5965244..42d3d21 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -309,10 +309,6 @@ static ULONG WINAPI BindProtocol_AddRef(IInternetProtocolEx *iface) static void release_protocol_handler(BindProtocol *This) { - if(This->protocol_unk) { - IUnknown_Release(This->protocol_unk); - This->protocol_unk = NULL; - } if(This->protocol) { IInternetProtocol_Release(This->protocol); This->protocol = NULL; @@ -326,6 +322,10 @@ static void release_protocol_handler(BindProtocol *This) IInternetProtocolSink_Release(This->protocol_sink_handler); This->protocol_sink_handler = &This->default_protocol_handler.IInternetProtocolSink_iface; } + if(This->protocol_unk) { + IUnknown_Release(This->protocol_unk); + This->protocol_unk = NULL; + } } static ULONG WINAPI BindProtocol_Release(IInternetProtocolEx *iface) @@ -654,24 +654,25 @@ static HRESULT WINAPI ProtocolHandler_Start(IInternetProtocol *iface, LPCWSTR sz static HRESULT WINAPI ProtocolHandler_Continue(IInternetProtocol *iface, PROTOCOLDATA *pProtocolData) { BindProtocol *This = impl_from_IInternetProtocol(iface); - IInternetProtocol *protocol; + IInternetProtocol *protocol = NULL; HRESULT hres; TRACE("(%p)->(%p)\n", This, pProtocolData); /* FIXME: This should not be needed. */ - if(!This->protocol && This->protocol_unk) { + if(!This->protocol) { + if(!This->protocol_unk) + return E_FAIL; hres = IUnknown_QueryInterface(This->protocol_unk, &IID_IInternetProtocol, (void**)&protocol); if(FAILED(hres)) return E_FAIL; - }else { - IInternetProtocol_AddRef(protocol = This->protocol); } - hres = IInternetProtocol_Continue(protocol, pProtocolData); + hres = IInternetProtocol_Continue(protocol ? protocol : This->protocol, pProtocolData); heap_free(pProtocolData); - IInternetProtocol_Release(protocol); + if(protocol) + IInternetProtocol_Release(protocol); return hres; }

1 0

Jacek Caban : urlmon/tests: Added more ref counting and aggregation tests.
by Alexandre Julliard 22 May '18

22 May '18

Module: wine Branch: master Commit: d3a9af15d286b386c8738a1936dd569d4677803c URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3a9af15d286b386c8738a19… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 22 10:14:08 2018 +0200 urlmon/tests: Added more ref counting and aggregation tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/protocol.c | 131 ++++++++++++++++++++++++++++++++----------- 1 file changed, 97 insertions(+), 34 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d3a9af15d286b386c873…

1 0

Dmitry Timoshkov : mstask: Handle disabled tasks in ITask::GetNextRunTime( ).
by Alexandre Julliard 22 May '18

22 May '18

Module: wine Branch: master Commit: e14e6bdeed2e72e40d83279f367e2997be23bf96 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e14e6bdeed2e72e40d83279f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue May 22 16:18:30 2018 +0800 mstask: Handle disabled tasks in ITask::GetNextRunTime(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/task.c | 6 ++++++ dlls/mstask/tests/task_trigger.c | 13 +++++++++++++ 2 files changed, 19 insertions(+) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 012bf48..a201e44 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -476,6 +476,12 @@ static HRESULT WINAPI MSTASK_ITask_GetNextRunTime(ITask *iface, SYSTEMTIME *rt) TRACE("(%p, %p)\n", iface, rt); + if (This->flags & TASK_FLAG_DISABLED) + { + memset(rt, 0, sizeof(*rt)); + return SCHED_S_TASK_DISABLED; + } + GetLocalTime(&current_st); for (i = 0; i < This->trigger_count; i++) diff --git a/dlls/mstask/tests/task_trigger.c b/dlls/mstask/tests/task_trigger.c index f7ab461..a89fa62 100644 --- a/dlls/mstask/tests/task_trigger.c +++ b/dlls/mstask/tests/task_trigger.c @@ -487,6 +487,19 @@ static void test_GetNextRunTime(void) if (0) /* crashes under Windows */ hr = ITask_GetNextRunTime(task, NULL); + hr = ITask_SetFlags(task, TASK_FLAG_DISABLED); + ok(hr == S_OK, "got %#x\n", hr); + + memset(&st, 0xff, sizeof(st)); + hr = ITask_GetNextRunTime(task, &st); + ok(hr == SCHED_S_TASK_DISABLED, "got %#x\n", hr); + ok(!memcmp(&st, &st_empty, sizeof(st)), "got %u/%u/%u wday %u %u:%02u:%02u\n", + st.wDay, st.wMonth, st.wYear, st.wDayOfWeek, + st.wHour, st.wMinute, st.wSecond); + + hr = ITask_SetFlags(task, 0); + ok(hr == S_OK, "got %#x\n", hr); + memset(&st, 0xff, sizeof(st)); hr = ITask_GetNextRunTime(task, &st); ok(hr == SCHED_S_TASK_NO_VALID_TRIGGERS, "got %#x\n", hr);

1 0

Dmitry Timoshkov : mstask: Add support for event triggers to ITask:: GetNextRunTime().
by Alexandre Julliard 22 May '18

22 May '18

Module: wine Branch: master Commit: 2a56402c5664b4e7b3d60580161454b1aa47bdd0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a56402c5664b4e7b3d60580… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue May 22 16:18:36 2018 +0800 mstask: Add support for event triggers to ITask::GetNextRunTime(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/task.c | 9 ++++++- dlls/mstask/tests/task_trigger.c | 56 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 63 insertions(+), 2 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index a201e44..57ad0f7 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -469,6 +469,7 @@ static void filetime_add_days(FILETIME *ft, ULONG days) static HRESULT WINAPI MSTASK_ITask_GetNextRunTime(ITask *iface, SYSTEMTIME *rt) { TaskImpl *This = impl_from_ITask(iface); + HRESULT hr = SCHED_S_TASK_NO_VALID_TRIGGERS; SYSTEMTIME st, current_st; FILETIME current_ft, begin_ft, end_ft, best_ft; BOOL have_best_time = FALSE; @@ -493,6 +494,12 @@ static HRESULT WINAPI MSTASK_ITask_GetNextRunTime(ITask *iface, SYSTEMTIME *rt) switch (This->trigger[i].TriggerType) { + case TASK_EVENT_TRIGGER_ON_IDLE: + case TASK_EVENT_TRIGGER_AT_SYSTEMSTART: + case TASK_EVENT_TRIGGER_AT_LOGON: + hr = SCHED_S_EVENT_TRIGGER; + break; + case TASK_TIME_TRIGGER_ONCE: st = current_st; st.wHour = This->trigger[i].wStartHour; @@ -547,7 +554,7 @@ static HRESULT WINAPI MSTASK_ITask_GetNextRunTime(ITask *iface, SYSTEMTIME *rt) } memset(rt, 0, sizeof(*rt)); - return SCHED_S_TASK_NO_VALID_TRIGGERS; + return hr; } static HRESULT WINAPI MSTASK_ITask_SetIdleWait( diff --git a/dlls/mstask/tests/task_trigger.c b/dlls/mstask/tests/task_trigger.c index a89fa62..328cae2 100644 --- a/dlls/mstask/tests/task_trigger.c +++ b/dlls/mstask/tests/task_trigger.c @@ -477,7 +477,7 @@ static void test_GetNextRunTime(void) ITask *task; ITaskTrigger *trigger; TASK_TRIGGER data; - WORD idx; + WORD idx, i; SYSTEMTIME st, cmp; hr = ITaskScheduler_NewWorkItem(test_task_scheduler, task_name, &CLSID_CTask, @@ -557,6 +557,60 @@ static void test_GetNextRunTime(void) /* FIXME: TASK_TIME_TRIGGER_MONTHLYDOW */ ITaskTrigger_Release(trigger); + /* do not delete a valid trigger */ + + idx = 0xdead; + hr = ITask_CreateTrigger(task, &idx, &trigger); + ok(hr == S_OK, "got %#x\n", hr); + ok(idx == 1, "got %u\n", idx); + + /* TASK_EVENT_TRIGGER_ON_IDLE = 5 + * TASK_EVENT_TRIGGER_AT_SYSTEMSTART = 6 + * TASK_EVENT_TRIGGER_AT_LOGON = 7 + */ + for (i = 5; i <= 7; i++) + { + hr = ITaskTrigger_GetTrigger(trigger, &data); + ok(hr == S_OK, "got %#x\n", hr); + data.rgFlags &= ~TASK_TRIGGER_FLAG_DISABLED; + data.TriggerType = i; + hr = ITaskTrigger_SetTrigger(trigger, &data); + ok(hr == S_OK, "got %#x\n", hr); + + memset(&st, 0xff, sizeof(st)); + hr = ITask_GetNextRunTime(task, &st); + ok(hr == S_OK, "got %#x\n", hr); + ok(!memcmp(&st, &cmp, sizeof(st)), "got %u/%u/%u wday %u %u:%02u:%02u\n", + st.wDay, st.wMonth, st.wYear, st.wDayOfWeek, + st.wHour, st.wMinute, st.wSecond); + } + + ITaskTrigger_Release(trigger); + + hr = ITask_DeleteTrigger(task, 0); + ok(hr == S_OK, "got %#x\n", hr); + + hr = ITask_GetTrigger(task, 0, &trigger); + ok(hr == S_OK, "got %#x\n", hr); + + for (i = 5; i <= 7; i++) + { + hr = ITaskTrigger_GetTrigger(trigger, &data); + ok(hr == S_OK, "got %#x\n", hr); + data.rgFlags &= ~TASK_TRIGGER_FLAG_DISABLED; + data.TriggerType = i; + hr = ITaskTrigger_SetTrigger(trigger, &data); + ok(hr == S_OK, "got %#x\n", hr); + + memset(&st, 0xff, sizeof(st)); + hr = ITask_GetNextRunTime(task, &st); + ok(hr == SCHED_S_EVENT_TRIGGER, "got %#x\n", hr); + ok(!memcmp(&st, &st_empty, sizeof(st)), "got %u/%u/%u wday %u %u:%02u:%02u\n", + st.wDay, st.wMonth, st.wYear, st.wDayOfWeek, + st.wHour, st.wMinute, st.wSecond); + } + + ITaskTrigger_Release(trigger); ITask_Release(task); }

1 0