March 2022 - Wine-Devel - list.winehq.org

[PATCH 2/5] windows.gaming.input: Use the helpers to define IInspectable interfaces.

by Rémi Bernon

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/windows.gaming.input/controller.c | 41 +------------------------- dlls/windows.gaming.input/gamepad.c | 41 +------------------------- 2 files changed, 2 insertions(+), 80 deletions(-) diff --git a/dlls/windows.gaming.input/controller.c b/dlls/windows.gaming.input/controller.c index 00ab9c5d91c..654d0795eac 100644 --- a/dlls/windows.gaming.input/controller.c +++ b/dlls/windows.gaming.input/controller.c @@ -35,11 +35,6 @@ static inline struct controller_statics *impl_from_IActivationFactory( IActivati return CONTAINING_RECORD( iface, struct controller_statics, IActivationFactory_iface ); } -static inline struct controller_statics *impl_from_IRawGameControllerStatics( IRawGameControllerStatics *iface ) -{ - return CONTAINING_RECORD( iface, struct controller_statics, IRawGameControllerStatics_iface ); -} - static HRESULT WINAPI factory_QueryInterface( IActivationFactory *iface, REFIID iid, void **out ) { struct controller_statics *impl = impl_from_IActivationFactory( iface ); @@ -121,41 +116,7 @@ static const struct IActivationFactoryVtbl factory_vtbl = factory_ActivateInstance, }; -static HRESULT WINAPI statics_QueryInterface( IRawGameControllerStatics *iface, REFIID iid, void **out ) -{ - struct controller_statics *impl = impl_from_IRawGameControllerStatics( iface ); - return IActivationFactory_QueryInterface( &impl->IActivationFactory_iface, iid, out ); -} - -static ULONG WINAPI statics_AddRef( IRawGameControllerStatics *iface ) -{ - struct controller_statics *impl = impl_from_IRawGameControllerStatics( iface ); - return IActivationFactory_AddRef( &impl->IActivationFactory_iface ); -} - -static ULONG WINAPI statics_Release( IRawGameControllerStatics *iface ) -{ - struct controller_statics *impl = impl_from_IRawGameControllerStatics( iface ); - return IActivationFactory_Release( &impl->IActivationFactory_iface ); -} - -static HRESULT WINAPI statics_GetIids( IRawGameControllerStatics *iface, ULONG *iid_count, IID **iids ) -{ - struct controller_statics *impl = impl_from_IRawGameControllerStatics( iface ); - return IActivationFactory_Release( &impl->IActivationFactory_iface ); -} - -static HRESULT WINAPI statics_GetRuntimeClassName( IRawGameControllerStatics *iface, HSTRING *class_name ) -{ - struct controller_statics *impl = impl_from_IRawGameControllerStatics( iface ); - return IActivationFactory_Release( &impl->IActivationFactory_iface ); -} - -static HRESULT WINAPI statics_GetTrustLevel( IRawGameControllerStatics *iface, TrustLevel *trust_level ) -{ - struct controller_statics *impl = impl_from_IRawGameControllerStatics( iface ); - return IActivationFactory_Release( &impl->IActivationFactory_iface ); -} +DEFINE_IINSPECTABLE( statics, IRawGameControllerStatics, struct controller_statics, IActivationFactory_iface ) static HRESULT WINAPI statics_add_RawGameControllerAdded( IRawGameControllerStatics *iface, IEventHandler_RawGameController *value, EventRegistrationToken *token ) diff --git a/dlls/windows.gaming.input/gamepad.c b/dlls/windows.gaming.input/gamepad.c index e69568e2fb1..231e923b5e8 100644 --- a/dlls/windows.gaming.input/gamepad.c +++ b/dlls/windows.gaming.input/gamepad.c @@ -35,11 +35,6 @@ static inline struct gamepad_statics *impl_from_IActivationFactory( IActivationF return CONTAINING_RECORD( iface, struct gamepad_statics, IActivationFactory_iface ); } -static inline struct gamepad_statics *impl_from_IGamepadStatics( IGamepadStatics *iface ) -{ - return CONTAINING_RECORD( iface, struct gamepad_statics, IGamepadStatics_iface ); -} - static HRESULT WINAPI factory_QueryInterface( IActivationFactory *iface, REFIID iid, void **out ) { struct gamepad_statics *impl = impl_from_IActivationFactory( iface ); @@ -121,41 +116,7 @@ static const struct IActivationFactoryVtbl factory_vtbl = factory_ActivateInstance, }; -static HRESULT WINAPI statics_QueryInterface( IGamepadStatics *iface, REFIID iid, void **out ) -{ - struct gamepad_statics *impl = impl_from_IGamepadStatics( iface ); - return IActivationFactory_QueryInterface( &impl->IActivationFactory_iface, iid, out ); -} - -static ULONG WINAPI statics_AddRef( IGamepadStatics *iface ) -{ - struct gamepad_statics *impl = impl_from_IGamepadStatics( iface ); - return IActivationFactory_AddRef( &impl->IActivationFactory_iface ); -} - -static ULONG WINAPI statics_Release( IGamepadStatics *iface ) -{ - struct gamepad_statics *impl = impl_from_IGamepadStatics( iface ); - return IActivationFactory_Release( &impl->IActivationFactory_iface ); -} - -static HRESULT WINAPI statics_GetIids( IGamepadStatics *iface, ULONG *iid_count, IID **iids ) -{ - struct gamepad_statics *impl = impl_from_IGamepadStatics( iface ); - return IActivationFactory_Release( &impl->IActivationFactory_iface ); -} - -static HRESULT WINAPI statics_GetRuntimeClassName( IGamepadStatics *iface, HSTRING *class_name ) -{ - struct gamepad_statics *impl = impl_from_IGamepadStatics( iface ); - return IActivationFactory_Release( &impl->IActivationFactory_iface ); -} - -static HRESULT WINAPI statics_GetTrustLevel( IGamepadStatics *iface, TrustLevel *trust_level ) -{ - struct gamepad_statics *impl = impl_from_IGamepadStatics( iface ); - return IActivationFactory_Release( &impl->IActivationFactory_iface ); -} +DEFINE_IINSPECTABLE( statics, IGamepadStatics, struct gamepad_statics, IActivationFactory_iface ) static HRESULT WINAPI statics_add_GamepadAdded( IGamepadStatics *iface, IEventHandler_Gamepad *value, EventRegistrationToken *token ) -- 2.34.1

March 1, 2022

[PATCH 1/5] include: Add some helpers to define IInspectable forwarded methods.

by Rémi Bernon

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- This should greatly reduce the burden of implementing WinRT classes. None of the WinRT interfaces are using inheritance, and classes very often implement several interfaces, all deriving from IInspectable, and even if a v2 interface only adds a single method, it doesn't derive from the v1, and instead requires to reimplement the IInspectable methods and forward them to the default interface. In addition, it looks like they also used COM aggregation extensively, and in these cases the forward has to be done to an outer IInspectable pointer. include/inspectable.idl | 44 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/include/inspectable.idl b/include/inspectable.idl index 847d21da608..8b233e3da94 100644 --- a/include/inspectable.idl +++ b/include/inspectable.idl @@ -39,3 +39,47 @@ interface IInspectable : IUnknown } typedef [unique] IInspectable *LPINSPECTABLE; + +cpp_quote("#ifdef __WINESRC__") +cpp_quote("#define DEFINE_IINSPECTABLE_EXPR( pfx, iface_type, impl_type, impl_from, iface_mem, expr ) \\") +cpp_quote(" static inline impl_type *impl_from( iface_type *iface ) \\") +cpp_quote(" { \\") +cpp_quote(" return CONTAINING_RECORD( iface, impl_type, iface_mem ); \\") +cpp_quote(" } \\") +cpp_quote(" static HRESULT WINAPI pfx##_QueryInterface( iface_type *iface, REFIID iid, void **out ) \\") +cpp_quote(" { \\") +cpp_quote(" return IInspectable_QueryInterface( (IInspectable *)(expr), iid, out ); \\") +cpp_quote(" } \\") +cpp_quote(" static ULONG WINAPI pfx##_AddRef( iface_type *iface ) \\") +cpp_quote(" { \\") +cpp_quote(" return IInspectable_AddRef( (IInspectable *)(expr) ); \\") +cpp_quote(" } \\") +cpp_quote(" static ULONG WINAPI pfx##_Release( iface_type *iface ) \\") +cpp_quote(" { \\") +cpp_quote(" return IInspectable_Release( (IInspectable *)(expr) ); \\") +cpp_quote(" } \\") +cpp_quote(" static HRESULT WINAPI pfx##_GetIids( iface_type *iface, ULONG *iid_count, IID **iids ) \\") +cpp_quote(" { \\") +cpp_quote(" return IInspectable_GetIids( (IInspectable *)(expr), iid_count, iids ); \\") +cpp_quote(" } \\") +cpp_quote(" static HRESULT WINAPI pfx##_GetRuntimeClassName( iface_type *iface, HSTRING *class_name ) \\") +cpp_quote(" { \\") +cpp_quote(" return IInspectable_GetRuntimeClassName( (IInspectable *)(expr), class_name ); \\") +cpp_quote(" } \\") +cpp_quote(" static HRESULT WINAPI pfx##_GetTrustLevel( iface_type *iface, TrustLevel *trust_level ) \\") +cpp_quote(" { \\") +cpp_quote(" return IInspectable_GetTrustLevel( (IInspectable *)(expr), trust_level ); \\") +cpp_quote(" }") +cpp_quote("#define DEFINE_IINSPECTABLE_OUTER_PFX( pfx, impl_pfx, iface_type, impl_type, outer ) \\") +cpp_quote(" DEFINE_IINSPECTABLE_EXPR( pfx, iface_type, impl_type, impl_pfx##_from_##iface_type, \\") +cpp_quote(" iface_type##_iface, impl_pfx##_from_##iface_type( iface )->outer )") +cpp_quote("#define DEFINE_IINSPECTABLE_OUTER( pfx, iface_type, impl_type, outer ) \\") +cpp_quote(" DEFINE_IINSPECTABLE_EXPR( pfx, iface_type, impl_type, impl_from_##iface_type, \\") +cpp_quote(" iface_type##_iface, impl_from_##iface_type( iface )->outer )") +cpp_quote("#define DEFINE_IINSPECTABLE_PFX( pfx, impl_pfx, iface_type, impl_type, member ) \\") +cpp_quote(" DEFINE_IINSPECTABLE_EXPR( pfx, iface_type, impl_type, impl_pfx##_from_##iface_type, \\") +cpp_quote(" iface_type##_iface, &impl_pfx##_from_##iface_type( iface )->member )") +cpp_quote("#define DEFINE_IINSPECTABLE( pfx, iface_type, impl_type, member ) \\") +cpp_quote(" DEFINE_IINSPECTABLE_EXPR( pfx, iface_type, impl_type, impl_from_##iface_type, \\") +cpp_quote(" iface_type##_iface, &impl_from_##iface_type( iface )->member )") +cpp_quote("#endif") -- 2.34.1

March 1, 2022

Re: [PATCH v2 2/2] winex11.drv: Support _NET_WM_FULLSCREEN_MONITORS.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=109482 Your paranoid android. === w7u_2qxl (32 bit report) === user32: win.c:4568: Test failed: message 0200 available

March 1, 2022

Re: [PATCH 17/27] dlls/msftedit/tests: enable compilation with long types

by Huw Davies

Signed-off-by: Huw Davies <huw(a)codeweavers.com>

March 1, 2022

[PATCH 27/27] dlls/netprofm/tests: enable compilation with long types

by Eric Pouech

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/netprofm/tests/Makefile.in | 1 dlls/netprofm/tests/list.c | 96 ++++++++++++++++++++------------------- 2 files changed, 48 insertions(+), 49 deletions(-) diff --git a/dlls/netprofm/tests/Makefile.in b/dlls/netprofm/tests/Makefile.in index 1b40b618f04..3b5be5c5453 100644 --- a/dlls/netprofm/tests/Makefile.in +++ b/dlls/netprofm/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = netprofm.dll IMPORTS = oleaut32 ole32 diff --git a/dlls/netprofm/tests/list.c b/dlls/netprofm/tests/list.c index 56052ceb512..9295eeebc7c 100644 --- a/dlls/netprofm/tests/list.c +++ b/dlls/netprofm/tests/list.c @@ -37,49 +37,49 @@ static void test_INetwork( INetwork *network ) str = NULL; hr = INetwork_GetName( network, &str ); - todo_wine ok( hr == S_OK, "got %08x\n", hr ); + todo_wine ok( hr == S_OK, "got %08lx\n", hr ); todo_wine ok( str != NULL, "str not set\n" ); if (str) trace( "name %s\n", wine_dbgstr_w(str) ); SysFreeString( str ); str = NULL; hr = INetwork_GetDescription( network, &str ); - todo_wine ok( hr == S_OK, "got %08x\n", hr ); + todo_wine ok( hr == S_OK, "got %08lx\n", hr ); todo_wine ok( str != NULL, "str not set\n" ); if (str) trace( "description %s\n", wine_dbgstr_w(str) ); SysFreeString( str ); memset( &id, 0, sizeof(id) ); hr = INetwork_GetNetworkId( network, &id ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); trace("network id %s\n", wine_dbgstr_guid(&id)); domain_type = 0xdeadbeef; hr = INetwork_GetDomainType( network, &domain_type ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); ok( domain_type != 0xdeadbeef, "domain_type not set\n" ); trace( "domain type %08x\n", domain_type ); category = 0xdeadbeef; hr = INetwork_GetCategory( network, &category ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); ok( category != 0xdeadbeef, "category not set\n" ); trace( "category %08x\n", category ); connectivity = 0xdeadbeef; hr = INetwork_GetConnectivity( network, &connectivity ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); ok( connectivity != 0xdeadbeef, "connectivity not set\n" ); trace( "connectivity %08x\n", connectivity ); connected = 0xdead; hr = INetwork_get_IsConnected( network, &connected ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); trace("connected %d\n", connected); connected = 0xdead; hr = INetwork_get_IsConnectedToInternet( network, &connected ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); trace("connected to internet %d\n", connected); } @@ -95,39 +95,39 @@ static void test_INetworkConnection( INetworkConnection *conn ) memset( &id, 0, sizeof(id) ); hr = INetworkConnection_GetAdapterId( conn, &id ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); trace("adapter id %s\n", wine_dbgstr_guid(&id)); memset( &id, 0, sizeof(id) ); hr = INetworkConnection_GetConnectionId( conn, &id ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); trace("connection id %s\n", wine_dbgstr_guid(&id)); connectivity = 0xdeadbeef; hr = INetworkConnection_GetConnectivity( conn, &connectivity ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); ok( connectivity != 0xdeadbeef, "connectivity not set\n" ); trace( "connectivity %08x\n", connectivity ); domain_type = 0xdeadbeef; hr = INetworkConnection_GetDomainType( conn, &domain_type ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); ok( domain_type != 0xdeadbeef, "domain_type not set\n" ); trace( "domain type %08x\n", domain_type ); connected = 0xdead; hr = INetworkConnection_get_IsConnected( conn, &connected ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); trace("connected %d\n", connected); connected = 0xdead; hr = INetworkConnection_get_IsConnectedToInternet( conn, &connected ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); trace("connected to internet %d\n", connected); network = NULL; hr = INetworkConnection_GetNetwork( conn, &network ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); if (network) { test_INetwork( network ); @@ -136,7 +136,7 @@ static void test_INetworkConnection( INetworkConnection *conn ) conn_cost = NULL; hr = INetworkConnection_QueryInterface( conn, &IID_INetworkConnectionCost, (void **)&conn_cost ); - ok( hr == S_OK || broken(hr == E_NOINTERFACE), "got %08x\n", hr ); + ok( hr == S_OK || broken(hr == E_NOINTERFACE), "got %08lx\n", hr ); if (conn_cost) { DWORD cost; @@ -144,13 +144,13 @@ static void test_INetworkConnection( INetworkConnection *conn ) cost = 0xdeadbeef; hr = INetworkConnectionCost_GetCost( conn_cost, &cost ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); ok( cost != 0xdeadbeef, "cost not set\n" ); - trace("cost %08x\n", cost); + trace("cost %08lx\n", cost); memset( &status, 0,sizeof(status) ); hr = INetworkConnectionCost_GetDataPlanStatus( conn_cost, &status ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); trace("InterfaceGuid %s\n", wine_dbgstr_guid(&status.InterfaceGuid)); INetworkConnectionCost_Release( conn_cost ); @@ -242,104 +242,104 @@ static void test_INetworkListManager( void ) connectivity = 0xdeadbeef; hr = INetworkListManager_GetConnectivity( mgr, &connectivity ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); ok( connectivity != 0xdeadbeef, "unchanged value\n" ); trace( "GetConnectivity: %08x\n", connectivity ); connected = 0xdead; hr = INetworkListManager_IsConnected( mgr, &connected ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); ok( connected == VARIANT_TRUE || connected == VARIANT_FALSE, "expected boolean value\n" ); connected = 0xdead; hr = INetworkListManager_IsConnectedToInternet( mgr, &connected ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); ok( connected == VARIANT_TRUE || connected == VARIANT_FALSE, "expected boolean value\n" ); /* INetworkCostManager is supported starting Win8 */ cost_mgr = NULL; hr = INetworkListManager_QueryInterface( mgr, &IID_INetworkCostManager, (void **)&cost_mgr ); - ok( hr == S_OK || broken(hr == E_NOINTERFACE), "got %08x\n", hr ); + ok( hr == S_OK || broken(hr == E_NOINTERFACE), "got %08lx\n", hr ); if (cost_mgr) { DWORD cost; NLM_DATAPLAN_STATUS status; hr = INetworkCostManager_GetCost( cost_mgr, NULL, NULL ); - ok( hr == E_POINTER, "got %08x\n", hr ); + ok( hr == E_POINTER, "got %08lx\n", hr ); cost = 0xdeadbeef; hr = INetworkCostManager_GetCost( cost_mgr, &cost, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); ok( cost != 0xdeadbeef, "cost not set\n" ); hr = INetworkCostManager_GetDataPlanStatus( cost_mgr, NULL, NULL ); - ok( hr == E_POINTER, "got %08x\n", hr ); + ok( hr == E_POINTER, "got %08lx\n", hr ); hr = INetworkCostManager_GetDataPlanStatus( cost_mgr, &status, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); INetworkCostManager_Release( cost_mgr ); } hr = INetworkListManager_QueryInterface( mgr, &IID_IConnectionPointContainer, (void**)&cpc ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); ref1 = IConnectionPointContainer_AddRef( cpc ); hr = IConnectionPointContainer_FindConnectionPoint( cpc, &IID_INetworkListManagerEvents, &pt ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); ref2 = IConnectionPointContainer_AddRef( cpc ); - ok( ref2 == ref1 + 2, "Expected refcount %d, got %d\n", ref1 + 2, ref2 ); + ok( ref2 == ref1 + 2, "Expected refcount %ld, got %ld\n", ref1 + 2, ref2 ); IConnectionPointContainer_Release( cpc ); IConnectionPointContainer_Release( cpc ); hr = IConnectionPoint_GetConnectionPointContainer( pt, &cpc2 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); ok( cpc2 == cpc, "Expected cpc2 == %p, but got %p\n", cpc, cpc2 ); IConnectionPointContainer_Release( cpc2 ); memset( &iid, 0, sizeof(iid) ); hr = IConnectionPoint_GetConnectionInterface( pt, &iid ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); ok( !memcmp( &iid, &IID_INetworkListManagerEvents, sizeof(iid) ), "Expected iid to be IID_INetworkListManagerEvents\n" ); hr = IConnectionPoint_Advise( pt, (IUnknown*)&mgr_sink_unk, &cookie); - ok( hr == CO_E_FAILEDTOOPENTHREADTOKEN, "Advise failed: %08x\n", hr ); + ok( hr == CO_E_FAILEDTOOPENTHREADTOKEN, "Advise failed: %08lx\n", hr ); hr = IConnectionPoint_Advise( pt, (IUnknown*)&mgr_sink, &cookie); - ok( hr == S_OK, "Advise failed: %08x\n", hr ); + ok( hr == S_OK, "Advise failed: %08lx\n", hr ); hr = IConnectionPoint_Unadvise( pt, 0xdeadbeef ); - ok( hr == OLE_E_NOCONNECTION || hr == CO_E_FAILEDTOIMPERSONATE, "Unadvise failed: %08x\n", hr ); + ok( hr == OLE_E_NOCONNECTION || hr == CO_E_FAILEDTOIMPERSONATE, "Unadvise failed: %08lx\n", hr ); hr = IConnectionPoint_Unadvise( pt, cookie ); - ok( hr == S_OK, "Unadvise failed: %08x\n", hr ); + ok( hr == S_OK, "Unadvise failed: %08lx\n", hr ); hr = IConnectionPointContainer_FindConnectionPoint( cpc, &IID_INetworkListManagerEvents, &pt2 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); ok( pt == pt2, "pt != pt2\n"); IConnectionPoint_Release( pt2 ); hr = IConnectionPointContainer_FindConnectionPoint( cpc, &IID_INetworkCostManagerEvents, &pt ); - ok( hr == S_OK || hr == CO_E_FAILEDTOIMPERSONATE, "got %08x\n", hr ); + ok( hr == S_OK || hr == CO_E_FAILEDTOIMPERSONATE, "got %08lx\n", hr ); if (hr == S_OK) IConnectionPoint_Release( pt ); hr = IConnectionPointContainer_FindConnectionPoint( cpc, &IID_INetworkConnectionEvents, &pt ); - ok( hr == S_OK || hr == CO_E_FAILEDTOIMPERSONATE, "got %08x\n", hr ); + ok( hr == S_OK || hr == CO_E_FAILEDTOIMPERSONATE, "got %08lx\n", hr ); if (hr == S_OK) IConnectionPoint_Release( pt ); hr = IConnectionPointContainer_FindConnectionPoint( cpc, &IID_INetworkEvents, &pt ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); IConnectionPoint_Release( pt ); IConnectionPointContainer_Release( cpc ); network_iter = NULL; hr = INetworkListManager_GetNetworks( mgr, NLM_ENUM_NETWORK_ALL, &network_iter ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); if (network_iter) { while ((hr = IEnumNetworks_Next( network_iter, 1, &network, NULL )) == S_OK) @@ -352,17 +352,17 @@ static void test_INetworkListManager( void ) conn_iter = NULL; hr = INetworkListManager_GetNetworkConnections( mgr, &conn_iter ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); if (conn_iter) { fetched = 256; hr = IEnumNetworkConnections_Next( conn_iter, 1, NULL, &fetched ); - ok( hr == E_POINTER, "got hr %#x.\n", hr ); - ok( fetched == 256, "got wrong feteched: %d.\n", fetched ); + ok( hr == E_POINTER, "got hr %#lx.\n", hr ); + ok( fetched == 256, "got wrong feteched: %ld.\n", fetched ); hr = IEnumNetworkConnections_Next( conn_iter, 0, NULL, &fetched ); - ok( hr == E_POINTER, "got hr %#x.\n", hr ); - ok( fetched == 256, "got wrong feteched: %d.\n", fetched ); + ok( hr == E_POINTER, "got hr %#lx.\n", hr ); + ok( fetched == 256, "got wrong feteched: %ld.\n", fetched ); while ((hr = IEnumNetworkConnections_Next( conn_iter, 1, &conn, NULL )) == S_OK) { @@ -380,11 +380,11 @@ static void test_INetworkListManager( void ) ref1 = IConnectionPoint_Release( pt ); ref2 = INetworkListManager_Release( mgr ); - ok( ref2 == ref1 - 1, "ref = %u\n", ref1 ); + ok( ref2 == ref1 - 1, "ref = %lu\n", ref1 ); IConnectionPoint_Release( pt ); ref1 = IConnectionPoint_Release( pt ); - ok( !ref1, "ref = %u\n", ref1 ); + ok( !ref1, "ref = %lu\n", ref1 ); } START_TEST( list )

March 1, 2022

[PATCH 26/27] dlls/netcfgx/tests: enable compilation with long types

by Eric Pouech

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/netcfgx/tests/Makefile.in | 1 - dlls/netcfgx/tests/netcfgx.c | 16 ++++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/netcfgx/tests/Makefile.in b/dlls/netcfgx/tests/Makefile.in index 3caf6c9da7a..699af30f213 100644 --- a/dlls/netcfgx/tests/Makefile.in +++ b/dlls/netcfgx/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = netcfgx.dll IMPORTS = uuid ole32 diff --git a/dlls/netcfgx/tests/netcfgx.c b/dlls/netcfgx/tests/netcfgx.c index 31558f44f42..ab8104fa611 100644 --- a/dlls/netcfgx/tests/netcfgx.c +++ b/dlls/netcfgx/tests/netcfgx.c @@ -36,11 +36,11 @@ static void create_configuration(void) if(SUCCEEDED(hr)) { hr = INetCfg_QueryInterface(config, &IID_INetCfgLock, (LPVOID*)&netlock); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); hr = INetCfgLock_AcquireWriteLock(netlock, 5000, L"MY CLIENT", &client); ok(hr == S_OK || - hr == E_ACCESSDENIED /* Not run as admin */, "got 0x%08x\n", hr); + hr == E_ACCESSDENIED /* Not run as admin */, "got 0x%08lx\n", hr); if(hr == S_OK) { trace("Lock value: %s\n", wine_dbgstr_w(client)); @@ -50,27 +50,27 @@ static void create_configuration(void) trace("Not run with Admin permissions\n"); hr = INetCfg_Initialize(config, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); /* AcquireWriteLock needs to be run before Initialize */ hr = INetCfgLock_AcquireWriteLock(netlock, 5000, L"MY CLIENT", &client); - todo_wine ok(hr == NETCFG_E_ALREADY_INITIALIZED || hr == E_ACCESSDENIED, "got 0x%08x\n", hr); + todo_wine ok(hr == NETCFG_E_ALREADY_INITIALIZED || hr == E_ACCESSDENIED, "got 0x%08lx\n", hr); hr = INetCfg_FindComponent(config, L"MS_TCPIP", &component); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(hr == S_OK, "got 0x%08lx\n", hr); if(hr == S_OK) { INetCfgComponent_Release(component); } hr = INetCfg_Apply(config); - todo_wine ok(hr == S_OK || hr == NETCFG_E_NO_WRITE_LOCK, "got 0x%08x\n", hr); + todo_wine ok(hr == S_OK || hr == NETCFG_E_NO_WRITE_LOCK, "got 0x%08lx\n", hr); hr = INetCfg_Uninitialize(config); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); hr = INetCfgLock_ReleaseWriteLock(netlock); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); INetCfgLock_Release(netlock); INetCfg_Release(config);

March 1, 2022

[PATCH 25/27] dlls/netapi32/tests: enable compilation with long types

by Eric Pouech

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/netapi32/tests/Makefile.in | 1 dlls/netapi32/tests/access.c | 90 ++++++++++++++++++++------------------- dlls/netapi32/tests/apibuf.c | 4 +- dlls/netapi32/tests/ds.c | 14 +++--- dlls/netapi32/tests/wksta.c | 20 ++++----- 5 files changed, 64 insertions(+), 65 deletions(-) diff --git a/dlls/netapi32/tests/Makefile.in b/dlls/netapi32/tests/Makefile.in index a41e57406e8..3ca81e6e2bc 100644 --- a/dlls/netapi32/tests/Makefile.in +++ b/dlls/netapi32/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = netapi32.dll IMPORTS = advapi32 netapi32 diff --git a/dlls/netapi32/tests/access.c b/dlls/netapi32/tests/access.c index 0f0ac5417f1..5fdcb1573ea 100644 --- a/dlls/netapi32/tests/access.c +++ b/dlls/netapi32/tests/access.c @@ -72,13 +72,13 @@ static void run_usergetinfo_tests(void) if((rc = create_test_user()) != NERR_Success ) { - skip("Skipping usergetinfo_tests, create_test_user failed: 0x%08x\n", rc); + skip("Skipping usergetinfo_tests, create_test_user failed: 0x%08lx\n", rc); return; } /* Level 0 */ rc = NetUserGetInfo(NULL, L"testuser", 0, (BYTE **)&ui0); - ok(rc == NERR_Success, "NetUserGetInfo level 0 failed: 0x%08x.\n", rc); + ok(rc == NERR_Success, "NetUserGetInfo level 0 failed: 0x%08lx.\n", rc); ok(!wcscmp(L"testuser", ui0->usri0_name), "Got level 0 name %s.\n", debugstr_w(ui0->usri0_name)); NetApiBufferSize(ui0, &dwSize); ok(dwSize >= (sizeof(USER_INFO_0) + (wcslen(ui0->usri0_name) + 1) * sizeof(WCHAR)), @@ -86,7 +86,7 @@ static void run_usergetinfo_tests(void) /* Level 10 */ rc = NetUserGetInfo(NULL, L"testuser", 10, (BYTE **)&ui10); - ok(rc == NERR_Success, "NetUserGetInfo level 10 failed: 0x%08x.\n", rc); + ok(rc == NERR_Success, "NetUserGetInfo level 10 failed: 0x%08lx.\n", rc); ok(!wcscmp(L"testuser", ui10->usri10_name), "Got level 10 name %s.\n", debugstr_w(ui10->usri10_name)); NetApiBufferSize(ui10, &dwSize); ok(dwSize >= (sizeof(USER_INFO_10) + @@ -101,14 +101,14 @@ static void run_usergetinfo_tests(void) /* NetUserGetInfo should always work for the current user. */ rc = NetUserGetInfo(NULL, user_name, 0, (BYTE **)&ui0); - ok(rc == NERR_Success, "NetUsetGetInfo for current user failed: 0x%08x.\n", rc); + ok(rc == NERR_Success, "NetUsetGetInfo for current user failed: 0x%08lx.\n", rc); NetApiBufferFree(ui0); /* errors handling */ rc = NetUserGetInfo(NULL, L"testuser", 10000, (BYTE **)&ui0); - ok(rc == ERROR_INVALID_LEVEL,"Invalid Level: rc=%d\n",rc); + ok(rc == ERROR_INVALID_LEVEL,"Invalid Level: rc=%ld\n",rc); rc = NetUserGetInfo(NULL, L"Nonexistent User", 0, (BYTE **)&ui0); - ok(rc == NERR_UserNotFound,"Invalid User Name: rc=%d\n",rc); + ok(rc == NERR_UserNotFound,"Invalid User Name: rc=%ld\n",rc); todo_wine { /* FIXME - Currently Wine can't verify whether the network path is good or bad */ rc = NetUserGetInfo(L"\\\\Ba path", L"testuser", 0, (BYTE **)&ui0); @@ -117,15 +117,15 @@ static void run_usergetinfo_tests(void) rc == RPC_S_SERVER_UNAVAILABLE || rc == NERR_WkstaNotStarted || /* workstation service not running */ rc == RPC_S_INVALID_NET_ADDR, /* Some Win7 */ - "Bad Network Path: rc=%d\n",rc); + "Bad Network Path: rc=%ld\n",rc); } rc = NetUserGetInfo(L"", L"testuser", 0, (BYTE **)&ui0); ok(rc == ERROR_BAD_NETPATH || rc == NERR_Success, - "Bad Network Path: rc=%d\n",rc); + "Bad Network Path: rc=%ld\n",rc); rc = NetUserGetInfo(L"\\", L"testuser", 0, (BYTE **)&ui0); - ok(rc == ERROR_INVALID_NAME || rc == ERROR_INVALID_HANDLE,"Invalid Server Name: rc=%d\n",rc); + ok(rc == ERROR_INVALID_NAME || rc == ERROR_INVALID_HANDLE,"Invalid Server Name: rc=%ld\n",rc); rc = NetUserGetInfo(L"\\\\", L"testuser", 0, (BYTE **)&ui0); - ok(rc == ERROR_INVALID_NAME || rc == ERROR_INVALID_HANDLE,"Invalid Server Name: rc=%d\n",rc); + ok(rc == ERROR_INVALID_NAME || rc == ERROR_INVALID_HANDLE,"Invalid Server Name: rc=%ld\n",rc); if(delete_test_user() != NERR_Success) trace("Deleting the test user failed. You might have to manually delete it.\n"); @@ -182,7 +182,7 @@ static void run_usermodalsget_tests(void) USER_MODALS_INFO_2 * umi2 = NULL; rc = NetUserModalsGet(NULL, 2, (BYTE **)&umi2); - ok(rc == ERROR_SUCCESS, "NetUserModalsGet failed, rc = %d\n", rc); + ok(rc == ERROR_SUCCESS, "NetUserModalsGet failed, rc = %ld\n", rc); if (umi2) NetApiBufferFree(umi2); @@ -209,14 +209,14 @@ static void run_userhandling_tests(void) return; } else - ok(ret == NERR_BadUsername, "Got %u.\n", ret); + ok(ret == NERR_BadUsername, "Got %lu.\n", ret); usri.usri1_name = (WCHAR *)L"testuser"; usri.usri1_password = sTooLongPassword; ret = NetUserAdd(NULL, 1, (BYTE *)&usri, NULL); ok(ret == NERR_PasswordTooShort || ret == ERROR_ACCESS_DENIED /* Win2003 */, - "Adding user with too long password returned 0x%08x\n", ret); + "Adding user with too long password returned 0x%08lx\n", ret); usri.usri1_name = sTooLongName; usri.usri1_password = sTooLongPassword; @@ -226,13 +226,13 @@ static void run_userhandling_tests(void) * as the error. NERR_PasswordTooShort is reported for all kind of password related errors. */ ok(ret == NERR_BadUsername || ret == NERR_PasswordTooShort, - "Adding user with too long username/password returned 0x%08x\n", ret); + "Adding user with too long username/password returned 0x%08lx\n", ret); usri.usri1_name = (WCHAR *)L"testuser"; usri.usri1_password = sTestUserOldPass; ret = NetUserAdd(NULL, 5, (BYTE *)&usri, NULL); - ok(ret == ERROR_INVALID_LEVEL, "Adding user with level 5 returned 0x%08x\n", ret); + ok(ret == ERROR_INVALID_LEVEL, "Adding user with level 5 returned 0x%08lx\n", ret); ret = NetUserAdd(NULL, 1, (BYTE *)&usri, NULL); if(ret == ERROR_ACCESS_DENIED) @@ -246,7 +246,7 @@ static void run_userhandling_tests(void) return; } - ok(!ret, "Got %u.\n", ret); + ok(!ret, "Got %lu.\n", ret); /* On Windows XP (and newer), calling NetUserChangePassword with a NULL * domainname parameter creates a user home directory, iff the machine is @@ -260,7 +260,7 @@ static void run_userhandling_tests(void) ok(ret == NERR_Success, "Deleting the user failed.\n"); ret = NetUserDel(NULL, L"testuser"); - ok(ret == NERR_UserNotFound, "Deleting a nonexistent user returned 0x%08x\n",ret); + ok(ret == NERR_UserNotFound, "Deleting a nonexistent user returned 0x%08lx\n",ret); } static void run_localgroupgetinfo_tests(void) @@ -273,7 +273,7 @@ static void run_localgroupgetinfo_tests(void) status = NetLocalGroupGetInfo(NULL, L"Administrators", 1, (BYTE **)&lgi); ok(status == NERR_Success || broken(status == NERR_GroupNotFound), - "NetLocalGroupGetInfo unexpectedly returned %d\n", status); + "NetLocalGroupGetInfo unexpectedly returned %ld\n", status); if (status != NERR_Success) return; trace("Local groupname:%s\n", wine_dbgstr_w( lgi->lgrpi1_name)); @@ -283,7 +283,7 @@ static void run_localgroupgetinfo_tests(void) status = NetLocalGroupGetMembers(NULL, L"Administrators", 3, (BYTE **)&buffer, MAX_PREFERRED_LENGTH, &entries_read, &total_entries, NULL); - ok(status == NERR_Success, "NetLocalGroupGetMembers unexpectedly returned %d\n", status); + ok(status == NERR_Success, "NetLocalGroupGetMembers unexpectedly returned %ld\n", status); ok(entries_read > 0 && total_entries > 0, "Amount of entries is unexpectedly 0\n"); for(i=0;i<entries_read;i++) @@ -344,32 +344,32 @@ static void test_DavGetHTTPFromUNCPath(void) if (0) /* crashes on Windows */ { ret = pDavGetHTTPFromUNCPath(NULL, NULL, NULL); - ok(ret == ERROR_INVALID_PARAMETER, "got %u\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "got %lu\n", ret); size = 0; ret = pDavGetHTTPFromUNCPath(L"", buf, &size); - ok(ret == ERROR_INVALID_PARAMETER, "got %u\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "got %lu\n", ret); ret = pDavGetHTTPFromUNCPath(L"\\\\a\\b", buf, NULL); - ok(ret == ERROR_INVALID_PARAMETER, "got %u\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "got %lu\n", ret); } ret = pDavGetHTTPFromUNCPath(L"", buf, NULL); - ok(ret == ERROR_INVALID_PARAMETER, "got %u\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "got %lu\n", ret); size = 0; ret = pDavGetHTTPFromUNCPath(L"", NULL, &size); - ok(ret == ERROR_INVALID_PARAMETER || ret == ERROR_BAD_NET_NAME /* Win10 1709+ */, "got %u\n", ret); + ok(ret == ERROR_INVALID_PARAMETER || ret == ERROR_BAD_NET_NAME /* Win10 1709+ */, "got %lu\n", ret); size = 0; ret = pDavGetHTTPFromUNCPath(L"\\\\a\\b", NULL, &size); - ok(ret == ERROR_INSUFFICIENT_BUFFER, "got %u\n", ret); + ok(ret == ERROR_INSUFFICIENT_BUFFER, "got %lu\n", ret); buf[0] = 0; size = 0; ret = pDavGetHTTPFromUNCPath(L"\\\\a\\b", buf, &size); - ok(ret == ERROR_INSUFFICIENT_BUFFER, "got %u\n", ret); - ok(size == 11, "got %u\n", size); + ok(ret == ERROR_INSUFFICIENT_BUFFER, "got %lu\n", ret); + ok(size == 11, "got %lu\n", size); for (i = 0; i < ARRAY_SIZE(tests); i++) { @@ -378,16 +378,16 @@ static void test_DavGetHTTPFromUNCPath(void) ret = pDavGetHTTPFromUNCPath( tests[i].path, buf, &size ); todo_wine_if (tests[i].todo) ok(ret == tests[i].ret || broken(ret == tests[i].broken_ret), - "%u: expected %u got %u\n", i, tests[i].ret, ret); + "%lu: expected %lu got %lu\n", i, tests[i].ret, ret); if (!ret) { if (tests[i].ret_path) - ok(!wcscmp(buf, tests[i].ret_path), "%u: expected %s got %s\n", + ok(!wcscmp(buf, tests[i].ret_path), "%lu: expected %s got %s\n", i, wine_dbgstr_w(tests[i].ret_path), wine_dbgstr_w(buf)); - ok(size == wcslen(buf) + 1, "%u: got %u\n", i, size); + ok(size == wcslen(buf) + 1, "%lu: got %lu\n", i, size); } else - ok(size == ARRAY_SIZE(buf), "%u: wrong size %u\n", i, size); + ok(size == ARRAY_SIZE(buf), "%lu: wrong size %lu\n", i, size); } } @@ -437,33 +437,33 @@ static void test_DavGetUNCFromHTTPPath(void) if (0) /* crashes on Windows */ { ret = pDavGetUNCFromHTTPPath(NULL, NULL, NULL); - ok(ret == ERROR_INVALID_PARAMETER, "got %u\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "got %lu\n", ret); ret = pDavGetUNCFromHTTPPath(L"http://server/path", buf, NULL); - ok(ret == ERROR_INVALID_PARAMETER, "got %u\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "got %lu\n", ret); } ret = pDavGetUNCFromHTTPPath(L"", buf, NULL); - ok(ret == ERROR_INVALID_PARAMETER, "got %u\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "got %lu\n", ret); size = 0; ret = pDavGetUNCFromHTTPPath(L"", NULL, &size); - ok(ret == ERROR_INVALID_PARAMETER, "got %u\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "got %lu\n", ret); buf[0] = 0; size = 0; ret = pDavGetUNCFromHTTPPath(L"", buf, &size); - ok(ret == ERROR_INVALID_PARAMETER, "got %u\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "got %lu\n", ret); size = 0; ret = pDavGetUNCFromHTTPPath(L"http://server/path", NULL, &size); - ok( ret == ERROR_INSUFFICIENT_BUFFER, "got %u\n", ret ); + ok( ret == ERROR_INSUFFICIENT_BUFFER, "got %lu\n", ret ); buf[0] = 0; size = 0; ret = pDavGetUNCFromHTTPPath(L"http://server/path", buf, &size); - ok(ret == ERROR_INSUFFICIENT_BUFFER, "got %u\n", ret); - ok(size == 25, "got %u\n", size); + ok(ret == ERROR_INSUFFICIENT_BUFFER, "got %lu\n", ret); + ok(size == 25, "got %lu\n", size); for (i = 0; i < ARRAY_SIZE(tests); i++) { @@ -472,16 +472,16 @@ static void test_DavGetUNCFromHTTPPath(void) ret = pDavGetUNCFromHTTPPath( tests[i].path, buf, &size ); todo_wine_if (tests[i].todo) ok(ret == tests[i].ret || broken(ret == tests[i].broken_ret), - "%u: expected %u got %u\n", i, tests[i].ret, ret); + "%lu: expected %lu got %lu\n", i, tests[i].ret, ret); if (!ret) { if (tests[i].ret_path) - ok(!wcscmp(buf, tests[i].ret_path), "%u: expected %s got %s\n", + ok(!wcscmp(buf, tests[i].ret_path), "%lu: expected %s got %s\n", i, wine_dbgstr_w(tests[i].ret_path), wine_dbgstr_w(buf)); - ok(size == wcslen(buf) + 1, "%u: got %u\n", i, size); + ok(size == wcslen(buf) + 1, "%lu: got %lu\n", i, size); } else - ok(size == ARRAY_SIZE(buf), "%u: wrong size %u\n", i, size); + ok(size == ARRAY_SIZE(buf), "%lu: wrong size %lu\n", i, size); } } @@ -496,10 +496,10 @@ START_TEST(access) size = ARRAY_SIZE(user_name); ret = GetUserNameW(user_name, &size); - ok(ret, "Failed to get user name, error %u.\n", GetLastError()); + ok(ret, "Failed to get user name, error %lu.\n", GetLastError()); size = ARRAY_SIZE(computer_name); ret = GetComputerNameW(computer_name, &size); - ok(ret, "Failed to get computer name, error %u.\n", GetLastError()); + ok(ret, "Failed to get computer name, error %lu.\n", GetLastError()); run_userhandling_tests(); run_usergetinfo_tests(); diff --git a/dlls/netapi32/tests/apibuf.c b/dlls/netapi32/tests/apibuf.c index 9063a4f6c55..777291dd654 100644 --- a/dlls/netapi32/tests/apibuf.c +++ b/dlls/netapi32/tests/apibuf.c @@ -71,13 +71,13 @@ static void run_apibuf_tests(void) SetLastError(0xdeadbeef); res = NetApiBufferAllocate(0, NULL); ok( (res == ERROR_INVALID_PARAMETER) && (GetLastError() == 0xdeadbeef), - "returned %d with 0x%x (expected ERROR_INVALID_PARAMETER with " + "returned %ld with 0x%lx (expected ERROR_INVALID_PARAMETER with " "0xdeadbeef)\n", res, GetLastError()); SetLastError(0xdeadbeef); res = NetApiBufferAllocate(1024, NULL); ok( (res == ERROR_INVALID_PARAMETER) && (GetLastError() == 0xdeadbeef), - "returned %d with 0x%x (expected ERROR_INVALID_PARAMETER with " + "returned %ld with 0x%lx (expected ERROR_INVALID_PARAMETER with " "0xdeadbeef)\n", res, GetLastError()); } diff --git a/dlls/netapi32/tests/ds.c b/dlls/netapi32/tests/ds.c index 10cbddab6cb..5208cd72012 100644 --- a/dlls/netapi32/tests/ds.c +++ b/dlls/netapi32/tests/ds.c @@ -33,18 +33,18 @@ static void test_params(void) SetLastError(0xdeadbeef); ret = DsRoleGetPrimaryDomainInformation(NULL, DsRolePrimaryDomainInfoBasic, NULL); - ok( ret == ERROR_INVALID_PARAMETER, "Expected error ERROR_INVALID_PARAMETER, got (%d)\n", ret); + ok( ret == ERROR_INVALID_PARAMETER, "Expected error ERROR_INVALID_PARAMETER, got (%ld)\n", ret); SetLastError(0xdeadbeef); ret = DsRoleGetPrimaryDomainInformation(NULL, 0, NULL); - ok( ret == ERROR_INVALID_PARAMETER, "Expected error ERROR_INVALID_PARAMETER, got (%d)\n", ret); + ok( ret == ERROR_INVALID_PARAMETER, "Expected error ERROR_INVALID_PARAMETER, got (%ld)\n", ret); SetLastError(0xdeadbeef); ret = DsRoleGetPrimaryDomainInformation(NULL, 4, NULL); - ok( ret == ERROR_INVALID_PARAMETER, "Expected error ERROR_INVALID_PARAMETER, got (%d)\n", ret); + ok( ret == ERROR_INVALID_PARAMETER, "Expected error ERROR_INVALID_PARAMETER, got (%ld)\n", ret); SetLastError(0xdeadbeef); ret = DsRoleGetPrimaryDomainInformation(NULL, 4, (BYTE **)&dpdi); - ok( ret == ERROR_INVALID_PARAMETER, "Expected error ERROR_INVALID_PARAMETER, got (%d)\n", ret); + ok( ret == ERROR_INVALID_PARAMETER, "Expected error ERROR_INVALID_PARAMETER, got (%ld)\n", ret); } static void test_get(void) @@ -56,17 +56,17 @@ static void test_get(void) SetLastError(0xdeadbeef); ret = DsRoleGetPrimaryDomainInformation(NULL, DsRolePrimaryDomainInfoBasic, (BYTE **)&dpdi); - ok( ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got (%d)\n", ret); + ok( ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got (%ld)\n", ret); DsRoleFreeMemory(dpdi); SetLastError(0xdeadbeef); ret = DsRoleGetPrimaryDomainInformation(NULL, DsRoleUpgradeStatus, (BYTE **)&dusi); - todo_wine { ok( ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got (%d)\n", ret); } + todo_wine { ok( ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got (%ld)\n", ret); } DsRoleFreeMemory(dusi); SetLastError(0xdeadbeef); ret = DsRoleGetPrimaryDomainInformation(NULL, DsRoleOperationState, (BYTE **)&dosi); - todo_wine { ok( ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got (%d)\n", ret); } + todo_wine { ok( ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got (%ld)\n", ret); } DsRoleFreeMemory(dosi); } diff --git a/dlls/netapi32/tests/wksta.c b/dlls/netapi32/tests/wksta.c index f53fcbbcce1..7b6e1bb97ee 100644 --- a/dlls/netapi32/tests/wksta.c +++ b/dlls/netapi32/tests/wksta.c @@ -62,7 +62,7 @@ static void run_wkstausergetinfo_tests(void) skip("Workstation service not running\n"); return; } - ok(!rc && ui0, "got %d and %p (expected NERR_Success and != NULL\n", rc, ui0); + ok(!rc && ui0, "got %ld and %p (expected NERR_Success and != NULL\n", rc, ui0); ok(!wcscmp(user_name, ui0->wkui0_username), "Expected username %s, got %s.\n", debugstr_w(user_name), debugstr_w(ui0->wkui0_username)); NetApiBufferSize(ui0, &dwSize); @@ -110,7 +110,7 @@ static void run_wkstatransportenum_tests(void) apiReturn = NetWkstaTransportEnum(NULL, 1, NULL, MAX_PREFERRED_LENGTH, NULL, &totalEntries, NULL); ok(apiReturn == ERROR_INVALID_LEVEL || apiReturn == ERROR_INVALID_PARAMETER, - "NetWkstaTransportEnum returned %d\n", apiReturn); + "NetWkstaTransportEnum returned %ld\n", apiReturn); /* 2nd check: is param 5 passed? (only if level passes?) */ apiReturn = NetWkstaTransportEnum(NULL, 0, NULL, MAX_PREFERRED_LENGTH, @@ -121,25 +121,25 @@ static void run_wkstatransportenum_tests(void) return; ok(apiReturn == STATUS_ACCESS_VIOLATION || apiReturn == ERROR_INVALID_PARAMETER, - "NetWkstaTransportEnum returned %d\n", apiReturn); + "NetWkstaTransportEnum returned %ld\n", apiReturn); /* 3rd check: is param 3 passed? */ apiReturn = NetWkstaTransportEnum(NULL, 0, NULL, MAX_PREFERRED_LENGTH, NULL, NULL, NULL); ok(apiReturn == STATUS_ACCESS_VIOLATION || apiReturn == RPC_X_NULL_REF_POINTER || apiReturn == ERROR_INVALID_PARAMETER, - "NetWkstaTransportEnum returned %d\n", apiReturn); + "NetWkstaTransportEnum returned %ld\n", apiReturn); /* 4th check: is param 6 passed? */ apiReturn = NetWkstaTransportEnum(NULL, 0, &bufPtr, MAX_PREFERRED_LENGTH, &entriesRead, NULL, NULL); ok(apiReturn == RPC_X_NULL_REF_POINTER, - "NetWkstaTransportEnum returned %d\n", apiReturn); + "NetWkstaTransportEnum returned %ld\n", apiReturn); /* final check: valid return, actually get data back */ apiReturn = NetWkstaTransportEnum(NULL, 0, &bufPtr, MAX_PREFERRED_LENGTH, &entriesRead, &totalEntries, NULL); ok(apiReturn == NERR_Success || apiReturn == ERROR_NETWORK_UNREACHABLE || apiReturn == NERR_WkstaNotStarted, - "NetWkstaTransportEnum returned %d\n", apiReturn); + "NetWkstaTransportEnum returned %ld\n", apiReturn); if (apiReturn == NERR_Success) { /* WKSTA_TRANSPORT_INFO_0 *transports = (WKSTA_TRANSPORT_INFO_0 *)bufPtr; */ @@ -158,11 +158,11 @@ static void run_wkstajoininfo_tests(void) NETSETUP_JOIN_STATUS buffertype = 0xdada; ret = NetGetJoinInformation(NULL, NULL, NULL); - ok(ret == ERROR_INVALID_PARAMETER, "NetJoinGetInformation returned unexpected 0x%08x\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "NetJoinGetInformation returned unexpected 0x%08lx\n", ret); ok(buffertype == 0xdada, "buffertype set to unexpected value %d\n", buffertype); ret = NetGetJoinInformation(NULL, &buffer, &buffertype); - ok(ret == NERR_Success, "NetJoinGetInformation returned unexpected 0x%08x\n", ret); + ok(ret == NERR_Success, "NetJoinGetInformation returned unexpected 0x%08lx\n", ret); ok(buffertype != 0xdada && buffertype != NetSetupUnknownStatus, "buffertype set to unexpected value %d\n", buffertype); trace("workstation joined to %s with status %d\n", wine_dbgstr_w(buffer), buffertype); NetApiBufferFree(buffer); @@ -177,10 +177,10 @@ START_TEST(wksta) size = ARRAY_SIZE(user_name); ret = GetUserNameW(user_name, &size); - ok(ret, "Failed to get user name, error %u.\n", GetLastError()); + ok(ret, "Failed to get user name, error %lu.\n", GetLastError()); size = ARRAY_SIZE(computer_name); ret = GetComputerNameW(computer_name, &size); - ok(ret, "Failed to get computer name, error %u.\n", GetLastError()); + ok(ret, "Failed to get computer name, error %lu.\n", GetLastError()); if (pNetpGetComputerName) run_get_comp_name_tests();

March 1, 2022

[PATCH 24/27] dlls/ndis.sys/tests: enable compilation with long types

by Eric Pouech

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/ndis.sys/tests/Makefile.in | 1 - dlls/ndis.sys/tests/ndis.c | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/ndis.sys/tests/Makefile.in b/dlls/ndis.sys/tests/Makefile.in index f7073072fbf..8544dfdff2f 100644 --- a/dlls/ndis.sys/tests/Makefile.in +++ b/dlls/ndis.sys/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = ndis.sys IMPORTS = iphlpapi advapi32 ole32 diff --git a/dlls/ndis.sys/tests/ndis.c b/dlls/ndis.sys/tests/ndis.c index 3349f1dae97..9a9ddcf7e7f 100644 --- a/dlls/ndis.sys/tests/ndis.c +++ b/dlls/ndis.sys/tests/ndis.c @@ -54,7 +54,7 @@ static void test_device(const WCHAR *service_name, const MIB_IF_ROW2 *row) if (status != STATUS_SUCCESS) { - skip( "Couldn't open the device (status = %d)\n", status ); + skip( "Couldn't open the device (status = %ld)\n", status ); return; } @@ -63,8 +63,8 @@ static void test_device(const WCHAR *service_name, const MIB_IF_ROW2 *row) iosb.Information = 0xdeadbeef; status = NtDeviceIoControlFile( netdev, NULL, NULL, NULL, &iosb, IOCTL_NDIS_QUERY_GLOBAL_STATS, &oid, sizeof(oid), &medium, sizeof(medium) ); - ok(status == STATUS_INVALID_PARAMETER, "got status %#x\n", status); - ok(iosb.Status == 0xdeadbeef, "got %#x\n", iosb.Status); + ok(status == STATUS_INVALID_PARAMETER, "got status %#lx\n", status); + ok(iosb.Status == 0xdeadbeef, "got %#lx\n", iosb.Status); ok(iosb.Information == 0xdeadbeef, "got size %#Ix\n", iosb.Information); oid = OID_GEN_MEDIA_SUPPORTED;

March 1, 2022

[PATCH 23/27] dlls/msvfw32/tests: enable compilation with long types

by Eric Pouech

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/msvfw32/tests/Makefile.in | 1 dlls/msvfw32/tests/mciwnd.c | 12 +-- dlls/msvfw32/tests/msvfw.c | 178 ++++++++++++++++++++-------------------- 3 files changed, 95 insertions(+), 96 deletions(-) diff --git a/dlls/msvfw32/tests/Makefile.in b/dlls/msvfw32/tests/Makefile.in index 66d8ed3089b..01d83acb105 100644 --- a/dlls/msvfw32/tests/Makefile.in +++ b/dlls/msvfw32/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = msvfw32.dll IMPORTS = msvfw32 advapi32 gdi32 user32 diff --git a/dlls/msvfw32/tests/mciwnd.c b/dlls/msvfw32/tests/mciwnd.c index 27ca2e8d203..85006ca95bf 100644 --- a/dlls/msvfw32/tests/mciwnd.c +++ b/dlls/msvfw32/tests/mciwnd.c @@ -119,12 +119,12 @@ static BOOL create_avi_file(char *fname) ULONG buffer_length; ret = GetTempPathA(sizeof(temp_path), temp_path); - ok(ret, "Failed to get a temp path, err %d\n", GetLastError()); + ok(ret, "Failed to get a temp path, err %ld\n", GetLastError()); if (!ret) return FALSE; ret = GetTempFileNameA(temp_path, "mci", 0, fname); - ok(ret, "Failed to get a temp name, err %d\n", GetLastError()); + ok(ret, "Failed to get a temp name, err %ld\n", GetLastError()); if (!ret) return FALSE; DeleteFileA(fname); @@ -132,7 +132,7 @@ static BOOL create_avi_file(char *fname) lstrcatA(fname, ".avi"); hFile = CreateFileA(fname, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - ok(hFile != INVALID_HANDLE_VALUE, "Failed to create a file, err %d\n", GetLastError()); + ok(hFile != INVALID_HANDLE_VALUE, "Failed to create a file, err %ld\n", GetLastError()); if (hFile == INVALID_HANDLE_VALUE) return FALSE; buffer_length = padding[1]; @@ -169,7 +169,7 @@ static void test_MCIWndCreate(void) ret = SendMessageA(window, MCIWNDM_GETERRORA, sizeof(error), (LPARAM)error); ok(!ret || broken(ret == ERROR_INVALID_HANDLE) /* w2003std, w2008s64 */, - "Unexpected error %ld\n", ret); + "Unexpected error %Id\n", ret); DestroyWindow(window); @@ -182,7 +182,7 @@ static void test_MCIWndCreate(void) ret = SendMessageA(window, MCIWNDM_GETERRORA, sizeof(error), (LPARAM)error); ok(!ret || broken(ret == ERROR_INVALID_HANDLE) /* w2003std, w2008s64 */, - "Unexpected error %ld\n", ret); + "Unexpected error %Id\n", ret); DestroyWindow(parent); @@ -190,7 +190,7 @@ static void test_MCIWndCreate(void) ok(window != NULL, "Failed to create an MCIWnd window\n"); ret = SendMessageA(window, MCIWNDM_GETERRORA, sizeof(error), (LPARAM)error); - todo_wine ok(ret == MCIERR_FILE_NOT_FOUND, "Unexpected error %ld\n", ret); + todo_wine ok(ret == MCIERR_FILE_NOT_FOUND, "Unexpected error %Id\n", ret); DestroyWindow(window); diff --git a/dlls/msvfw32/tests/msvfw.c b/dlls/msvfw32/tests/msvfw.c index 07ff7e3694c..b22b466f595 100644 --- a/dlls/msvfw32/tests/msvfw.c +++ b/dlls/msvfw32/tests/msvfw.c @@ -119,51 +119,51 @@ static void test_Locate(void) else { bo.biBitCount = bi.biBitCount = 32; err = ICDecompressQuery(h, &bi, &bo); - ok(err == ICERR_OK, "Query cvid->RGB32: %d\n", err); + ok(err == ICERR_OK, "Query cvid->RGB32: %ld\n", err); err = ICDecompressQuery(h, &bi, NULL); - ok(err == ICERR_OK, "Query cvid 32: %d\n", err); + ok(err == ICERR_OK, "Query cvid 32: %ld\n", err); bo.biHeight = -bo.biHeight; err = ICDecompressQuery(h, &bi, &bo); - ok(err == ICERR_OK, "Query cvid->RGB32 height<0: %d\n", err); + ok(err == ICERR_OK, "Query cvid->RGB32 height<0: %ld\n", err); bo.biHeight = -bo.biHeight; bi.biWidth = 17; bi.biBitCount = 8; err = ICDecompressGetFormat(h, &bi, &tmp); - ok(err == ICERR_OK, "Query cvid output format: %d\n", err); + ok(err == ICERR_OK, "Query cvid output format: %ld\n", err); ok(tmp.biBitCount == 24, "Expected 24 bit, got %d bit\n", tmp.biBitCount); - ok(tmp.biSizeImage == get_stride(17, 24) * 8, "Expected size %d, got %d\n", + ok(tmp.biSizeImage == get_stride(17, 24) * 8, "Expected size %d, got %ld\n", get_stride(17, 24) * 8, tmp.biSizeImage); bi.biBitCount = 15; err = ICDecompressGetFormat(h, &bi, &tmp); - ok(err == ICERR_OK, "Query cvid output format: %d\n", err); + ok(err == ICERR_OK, "Query cvid output format: %ld\n", err); ok(tmp.biBitCount == 24, "Expected 24 bit, got %d bit\n", tmp.biBitCount); - ok(tmp.biSizeImage == get_stride(17, 24) * 8, "Expected size %d, got %d\n", + ok(tmp.biSizeImage == get_stride(17, 24) * 8, "Expected size %d, got %ld\n", get_stride(17, 24) * 8, tmp.biSizeImage); bi.biBitCount = 16; err = ICDecompressGetFormat(h, &bi, &tmp); - ok(err == ICERR_OK, "Query cvid output format: %d\n", err); + ok(err == ICERR_OK, "Query cvid output format: %ld\n", err); ok(tmp.biBitCount == 24, "Expected 24 bit, got %d bit\n", tmp.biBitCount); - ok(tmp.biSizeImage == get_stride(17, 24) * 8, "Expected size %d, got %d\n", + ok(tmp.biSizeImage == get_stride(17, 24) * 8, "Expected size %d, got %ld\n", get_stride(17, 24) * 8, tmp.biSizeImage); bi.biBitCount = 24; err = ICDecompressGetFormat(h, &bi, &tmp); - ok(err == ICERR_OK, "Query cvid output format: %d\n", err); + ok(err == ICERR_OK, "Query cvid output format: %ld\n", err); ok(tmp.biBitCount == 24, "Expected 24 bit, got %d bit\n", tmp.biBitCount); - ok(tmp.biSizeImage == get_stride(17, 24) * 8, "Expected size %d, got %d\n", + ok(tmp.biSizeImage == get_stride(17, 24) * 8, "Expected size %d, got %ld\n", get_stride(17, 24) * 8, tmp.biSizeImage); bi.biBitCount = 32; err = ICDecompressGetFormat(h, &bi, &tmp); - ok(err == ICERR_OK, "Query cvid output format: %d\n", err); + ok(err == ICERR_OK, "Query cvid output format: %ld\n", err); ok(tmp.biBitCount == 24, "Expected 24 bit, got %d bit\n", tmp.biBitCount); - ok(tmp.biSizeImage == get_stride(17, 24) * 8, "Expected size %d, got %d\n", + ok(tmp.biSizeImage == get_stride(17, 24) * 8, "Expected size %d, got %ld\n", get_stride(17, 24) * 8, tmp.biSizeImage); bi.biWidth = 32; @@ -237,63 +237,63 @@ static void test_Locate(void) ok(h != 0, "No MSVC codec installed!?\n"); if (h != 0) { err = ICDecompressQuery(h, &bi, &bo); - ok(err == ICERR_OK, "Query MSVC->RGB16: %d\n", err); + ok(err == ICERR_OK, "Query MSVC->RGB16: %ld\n", err); err = ICDecompressQuery(h, &bi, NULL); - ok(err == ICERR_OK, "Query MSVC 16: %d\n", err); + ok(err == ICERR_OK, "Query MSVC 16: %ld\n", err); bo.biHeight = -bo.biHeight; err = ICDecompressQuery(h, &bi, &bo); - todo_wine ok(err == ICERR_OK, "Query MSVC->RGB16 height<0: %d\n", err); + todo_wine ok(err == ICERR_OK, "Query MSVC->RGB16 height<0: %ld\n", err); bo.biHeight = -bo.biHeight; bo.biBitCount = 24; err = ICDecompressQuery(h, &bi, &bo); - ok(err == ICERR_OK, "Query MSVC 16->24: %d\n", err); + ok(err == ICERR_OK, "Query MSVC 16->24: %ld\n", err); bo.biBitCount = 16; bi.biWidth = 553; bi.biBitCount = 8; err = ICDecompressGetFormat(h, &bi, &tmp); - ok(err == ICERR_OK, "Query MSVC output format: %d\n", err); + ok(err == ICERR_OK, "Query MSVC output format: %ld\n", err); ok(tmp.biBitCount == 8, "Expected 8 bit, got %d bit\n", tmp.biBitCount); - ok(tmp.biWidth == 552, "Expected width 552, got %d\n", tmp.biWidth); - ok(tmp.biSizeImage == get_stride(552, 8) * 8, "Expected size %d, got %d\n", + ok(tmp.biWidth == 552, "Expected width 552, got %ld\n", tmp.biWidth); + ok(tmp.biSizeImage == get_stride(552, 8) * 8, "Expected size %d, got %ld\n", get_stride(552, 8) * 8, tmp.biSizeImage); bi.biBitCount = 15; err = ICDecompressGetFormat(h, &bi, &tmp); - ok(err == ICERR_BADFORMAT, "Query MSVC output format: %d\n", err); + ok(err == ICERR_BADFORMAT, "Query MSVC output format: %ld\n", err); bi.biBitCount = 16; err = ICDecompressGetFormat(h, &bi, &tmp); - ok(err == ICERR_OK, "Query MSVC output format: %d\n", err); + ok(err == ICERR_OK, "Query MSVC output format: %ld\n", err); ok(tmp.biBitCount == 16, "Expected 16 bit, got %d bit\n", tmp.biBitCount); - ok(tmp.biWidth == 552, "Expected width 552, got %d\n", tmp.biWidth); - ok(tmp.biSizeImage == get_stride(552, 16) * 8, "Expected size %d, got %d\n", + ok(tmp.biWidth == 552, "Expected width 552, got %ld\n", tmp.biWidth); + ok(tmp.biSizeImage == get_stride(552, 16) * 8, "Expected size %d, got %ld\n", get_stride(552, 16) * 8, tmp.biSizeImage); bi.biBitCount = 24; err = ICDecompressGetFormat(h, &bi, &tmp); - ok(err == ICERR_BADFORMAT, "Query MSVC output format: %d\n", err); + ok(err == ICERR_BADFORMAT, "Query MSVC output format: %ld\n", err); bi.biBitCount = 32; err = ICDecompressGetFormat(h, &bi, &tmp); - ok(err == ICERR_BADFORMAT, "Query MSVC output format: %d\n", err); + ok(err == ICERR_BADFORMAT, "Query MSVC output format: %ld\n", err); bi.biHeight = 17; bi.biBitCount = 8; err = ICDecompressGetFormat(h, &bi, &tmp); - ok(err == ICERR_OK, "Query MSVC output format: %d\n", err); - ok(tmp.biHeight == 16, "Expected height 16, got %d\n", tmp.biHeight); + ok(err == ICERR_OK, "Query MSVC output format: %ld\n", err); + ok(tmp.biHeight == 16, "Expected height 16, got %ld\n", tmp.biHeight); bi.biHeight = 8; bi.biWidth = 32; bi.biCompression = mmioFOURCC('m','s','v','c'); err = ICDecompressQuery(h, &bi, &bo); - ok(err == ICERR_BADFORMAT, "Query msvc->RGB16: %d\n", err); + ok(err == ICERR_BADFORMAT, "Query msvc->RGB16: %ld\n", err); ok(ICClose(h) == ICERR_OK,"ICClose failed\n"); } @@ -358,20 +358,20 @@ static void test_ICSeqCompress(void) { frame_len = 0; frame = ICSeqCompressFrame(&pc, 0, input, &key_frame, &frame_len); - ok(frame != NULL, "Frame[%d]: Expected non-NULL\n", i); + ok(frame != NULL, "Frame[%ld]: Expected non-NULL\n", i); if (frame_len == sizeof(output_nkf)) - ok(!memcmp(output_nkf, frame, frame_len), "Frame[%d]: Contents do not match\n", i); + ok(!memcmp(output_nkf, frame, frame_len), "Frame[%ld]: Contents do not match\n", i); else if (frame_len == sizeof(output_kf)) - ok(!memcmp(output_kf, frame, frame_len), "Frame[%d]: Contents do not match\n", i); + ok(!memcmp(output_kf, frame, frame_len), "Frame[%ld]: Contents do not match\n", i); else - ok(0, "Unknown frame size of %d byten\n", frame_len); + ok(0, "Unknown frame size of %ld byten\n", frame_len); } ICSeqCompressFrameEnd(&pc); ICCompressorFree(&pc); /* ICCompressorFree already closed the HIC */ err = ICClose(h); - ok(err == ICERR_BADHANDLE, "Expected -8, got %d\n", err); + ok(err == ICERR_BADHANDLE, "Expected -8, got %ld\n", err); } static ICINFO enum_info; @@ -381,16 +381,16 @@ static LRESULT CALLBACK enum_driver_proc(DWORD_PTR id, HDRVR driver, UINT msg, { ICINFO *info = (ICINFO *)lparam1; - ok(!id, "Got unexpected id %#lx.\n", id); + ok(!id, "Got unexpected id %#Ix.\n", id); ok(msg == ICM_GETINFO, "Got unexpected message %#x.\n", msg); ok(info == &enum_info, "Expected lparam1 %p, got %p.\n", &enum_info, info); - ok(lparam2 == sizeof(ICINFO), "Got lparam2 %ld.\n", lparam2); + ok(lparam2 == sizeof(ICINFO), "Got lparam2 %Id.\n", lparam2); - ok(!info->fccType, "Got unexpected type %#x.\n", info->fccType); - ok(!info->fccHandler, "Got unexpected handler %#x.\n", info->fccHandler); - ok(!info->dwFlags, "Got unexpected flags %#x.\n", info->dwFlags); - ok(!info->dwVersion, "Got unexpected version %#x.\n", info->dwVersion); - ok(info->dwVersionICM == ICVERSION, "Got unexpected ICM version %#x.\n", info->dwVersionICM); + ok(!info->fccType, "Got unexpected type %#lx.\n", info->fccType); + ok(!info->fccHandler, "Got unexpected handler %#lx.\n", info->fccHandler); + ok(!info->dwFlags, "Got unexpected flags %#lx.\n", info->dwFlags); + ok(!info->dwVersion, "Got unexpected version %#lx.\n", info->dwVersion); + ok(info->dwVersionICM == ICVERSION, "Got unexpected ICM version %#lx.\n", info->dwVersionICM); ok(!info->szName[0], "Got unexpected name %s.\n", wine_dbgstr_w(info->szName)); ok(!info->szDescription[0], "Got unexpected name %s.\n", wine_dbgstr_w(info->szDescription)); ok(!info->szDriver[0], "Got unexpected driver %s.\n", wine_dbgstr_w(info->szDriver)); @@ -418,17 +418,17 @@ static void test_ICInfo(void) info.dwSize = sizeof(info); if (!ICInfo(0, i++, &info)) break; - trace("Codec name: %s, fccHandler: 0x%08x\n", wine_dbgstr_w(info.szName), info.fccHandler); + trace("Codec name: %s, fccHandler: 0x%08lx\n", wine_dbgstr_w(info.szName), info.fccHandler); ok(info.fccType, "Expected nonzero type.\n"); ok(info.fccHandler, "Expected nonzero handler.\n"); - ok(!info.dwFlags, "Got unexpected flags %#x.\n", info.dwFlags); - ok(!info.dwVersion, "Got unexpected version %#x.\n", info.dwVersion); - ok(info.dwVersionICM == ICVERSION, "Got unexpected ICM version %#x.\n", info.dwVersionICM); + ok(!info.dwFlags, "Got unexpected flags %#lx.\n", info.dwFlags); + ok(!info.dwVersion, "Got unexpected version %#lx.\n", info.dwVersion); + ok(info.dwVersionICM == ICVERSION, "Got unexpected ICM version %#lx.\n", info.dwVersionICM); ok(!info.szName[0], "Got unexpected name %s.\n", wine_dbgstr_w(info.szName)); ok(!info.szDescription[0], "Got unexpected name %s.\n", wine_dbgstr_w(info.szDescription)); ok(ICInfo(info.fccType, info.fccHandler, &info2), - "ICInfo failed on fcc 0x%08x\n", info.fccHandler); + "ICInfo failed on fcc 0x%08lx\n", info.fccHandler); fcc = (unsigned char *)&info.fccHandler; if (!isalpha(fcc[0])) continue; @@ -437,18 +437,18 @@ static void test_ICInfo(void) /* Test getting info with a different case - bug 41602 */ fcc[0] ^= 0x20; ok(ICInfo(info.fccType, info.fccHandler, &info2), - "ICInfo failed on fcc 0x%08x\n", info.fccHandler); + "ICInfo failed on fcc 0x%08lx\n", info.fccHandler); } ok(found != 0, "expected at least one codec\n"); memset(&info, 0x55, sizeof(info)); info.dwSize = sizeof(info); ok(!ICInfo(ICTYPE_VIDEO, mmioFOURCC('f','a','k','e'), &info), "expected failure\n"); - ok(info.fccType == ICTYPE_VIDEO, "got 0x%08x\n", info.fccType); - ok(info.fccHandler == mmioFOURCC('f','a','k','e'), "got 0x%08x\n", info.fccHandler); - ok(!info.dwFlags, "Got unexpected flags %#x.\n", info.dwFlags); - ok(!info.dwVersion, "Got unexpected version %#x.\n", info.dwVersion); - ok(info.dwVersionICM == ICVERSION, "Got unexpected ICM version %#x.\n", info.dwVersionICM); + ok(info.fccType == ICTYPE_VIDEO, "got 0x%08lx\n", info.fccType); + ok(info.fccHandler == mmioFOURCC('f','a','k','e'), "got 0x%08lx\n", info.fccHandler); + ok(!info.dwFlags, "Got unexpected flags %#lx.\n", info.dwFlags); + ok(!info.dwVersion, "Got unexpected version %#lx.\n", info.dwVersion); + ok(info.dwVersionICM == ICVERSION, "Got unexpected ICM version %#lx.\n", info.dwVersionICM); ok(!info.szName[0], "Got unexpected name %s.\n", wine_dbgstr_w(info.szName)); ok(!info.szDescription[0], "Got unexpected name %s.\n", wine_dbgstr_w(info.szDescription)); ok(!info.szDriver[0], "Got unexpected driver %s.\n", wine_dbgstr_w(info.szDriver)); @@ -461,17 +461,17 @@ static void test_ICInfo(void) size = sizeof(buffer); res = RegQueryValueExA(key, "wine.test", NULL, NULL, (BYTE *)buffer, &size); - ok(!res, "Failed to query value, error %d.\n", res); + ok(!res, "Failed to query value, error %ld.\n", res); ok(!strcmp(buffer, "bogus"), "Got unexpected value \"%s\".\n", buffer); memset(&info, 0x55, sizeof(info)); info.dwSize = sizeof(info); ok(ICInfo(test_type, test_handler, &info), "Expected success.\n"); - ok(info.fccType == test_type, "Got unexpected type %#x.\n", info.fccType); - ok(info.fccHandler == test_handler, "Got unexpected handler %#x.\n", info.fccHandler); - ok(!info.dwFlags, "Got unexpected flags %#x.\n", info.dwFlags); - ok(!info.dwVersion, "Got unexpected version %#x.\n", info.dwVersion); - ok(info.dwVersionICM == ICVERSION, "Got unexpected ICM version %#x.\n", info.dwVersionICM); + ok(info.fccType == test_type, "Got unexpected type %#lx.\n", info.fccType); + ok(info.fccHandler == test_handler, "Got unexpected handler %#lx.\n", info.fccHandler); + ok(!info.dwFlags, "Got unexpected flags %#lx.\n", info.dwFlags); + ok(!info.dwVersion, "Got unexpected version %#lx.\n", info.dwVersion); + ok(info.dwVersionICM == ICVERSION, "Got unexpected ICM version %#lx.\n", info.dwVersionICM); ok(!info.szName[0], "Got unexpected name %s.\n", wine_dbgstr_w(info.szName)); ok(!info.szDescription[0], "Got unexpected name %s.\n", wine_dbgstr_w(info.szDescription)); ok(!lstrcmpW(info.szDriver, L"bogus"), "Got unexpected driver %s.\n", wine_dbgstr_w(info.szDriver)); @@ -484,7 +484,7 @@ static void test_ICInfo(void) ok(ret, "Failed to remove driver.\n"); res = RegDeleteValueA(key, "wine.test"); - ok(res == ERROR_FILE_NOT_FOUND, "Got error %u.\n", res); + ok(res == ERROR_FILE_NOT_FOUND, "Got error %lu.\n", res); RegCloseKey(key); } else @@ -495,11 +495,11 @@ static void test_ICInfo(void) memset(&info, 0x55, sizeof(info)); info.dwSize = sizeof(info); ok(ICInfo(test_type, test_handler, &info), "Expected success.\n"); - ok(info.fccType == test_type, "Got unexpected type %#x.\n", info.fccType); - ok(info.fccHandler == test_handler, "Got unexpected handler %#x.\n", info.fccHandler); - ok(!info.dwFlags, "Got unexpected flags %#x.\n", info.dwFlags); - ok(!info.dwVersion, "Got unexpected version %#x.\n", info.dwVersion); - ok(info.dwVersionICM == ICVERSION, "Got unexpected ICM version %#x.\n", info.dwVersionICM); + ok(info.fccType == test_type, "Got unexpected type %#lx.\n", info.fccType); + ok(info.fccHandler == test_handler, "Got unexpected handler %#lx.\n", info.fccHandler); + ok(!info.dwFlags, "Got unexpected flags %#lx.\n", info.dwFlags); + ok(!info.dwVersion, "Got unexpected version %#lx.\n", info.dwVersion); + ok(info.dwVersionICM == ICVERSION, "Got unexpected ICM version %#lx.\n", info.dwVersionICM); ok(!info.szName[0], "Got unexpected name %s.\n", wine_dbgstr_w(info.szName)); ok(!info.szDescription[0], "Got unexpected name %s.\n", wine_dbgstr_w(info.szDescription)); ok(!lstrcmpW(info.szDriver, L"bogus"), "Got unexpected driver %s.\n", wine_dbgstr_w(info.szDriver)); @@ -518,11 +518,11 @@ static void test_ICInfo(void) memset(&enum_info, 0x55, sizeof(enum_info)); enum_info.dwSize = sizeof(enum_info); ok(ICInfo(test_type, test_handler, &enum_info), "Expected success.\n"); - ok(!enum_info.fccType, "Got unexpected type %#x.\n", enum_info.fccType); - ok(!enum_info.fccHandler, "Got unexpected handler %#x.\n", enum_info.fccHandler); - ok(!enum_info.dwFlags, "Got unexpected flags %#x.\n", enum_info.dwFlags); - ok(enum_info.dwVersion == 0xdeadbeef, "Got unexpected version %#x.\n", enum_info.dwVersion); - ok(enum_info.dwVersionICM == ICVERSION, "Got unexpected ICM version %#x.\n", enum_info.dwVersionICM); + ok(!enum_info.fccType, "Got unexpected type %#lx.\n", enum_info.fccType); + ok(!enum_info.fccHandler, "Got unexpected handler %#lx.\n", enum_info.fccHandler); + ok(!enum_info.dwFlags, "Got unexpected flags %#lx.\n", enum_info.dwFlags); + ok(enum_info.dwVersion == 0xdeadbeef, "Got unexpected version %#lx.\n", enum_info.dwVersion); + ok(enum_info.dwVersionICM == ICVERSION, "Got unexpected ICM version %#lx.\n", enum_info.dwVersionICM); ok(!enum_info.szName[0], "Got unexpected name %s.\n", wine_dbgstr_w(enum_info.szName)); ok(!enum_info.szDescription[0], "Got unexpected name %s.\n", wine_dbgstr_w(enum_info.szDescription)); ok(!enum_info.szDriver[0], "Got unexpected driver %s.\n", wine_dbgstr_w(enum_info.szDriver)); @@ -531,11 +531,11 @@ static void test_ICInfo(void) memset(&enum_info, 0x55, sizeof(enum_info)); enum_info.dwSize = sizeof(enum_info); ok(ICInfo(test_type, 0, &enum_info), "Expected success.\n"); - ok(!enum_info.fccType, "Got unexpected type %#x.\n", enum_info.fccType); - ok(!enum_info.fccHandler, "Got unexpected handler %#x.\n", enum_info.fccHandler); - ok(!enum_info.dwFlags, "Got unexpected flags %#x.\n", enum_info.dwFlags); - ok(enum_info.dwVersion == 0xdeadbeef, "Got unexpected version %#x.\n", enum_info.dwVersion); - ok(enum_info.dwVersionICM == ICVERSION, "Got unexpected ICM version %#x.\n", enum_info.dwVersionICM); + ok(!enum_info.fccType, "Got unexpected type %#lx.\n", enum_info.fccType); + ok(!enum_info.fccHandler, "Got unexpected handler %#lx.\n", enum_info.fccHandler); + ok(!enum_info.dwFlags, "Got unexpected flags %#lx.\n", enum_info.dwFlags); + ok(enum_info.dwVersion == 0xdeadbeef, "Got unexpected version %#lx.\n", enum_info.dwVersion); + ok(enum_info.dwVersionICM == ICVERSION, "Got unexpected ICM version %#lx.\n", enum_info.dwVersionICM); ok(!enum_info.szName[0], "Got unexpected name %s.\n", wine_dbgstr_w(enum_info.szName)); ok(!enum_info.szDescription[0], "Got unexpected name %s.\n", wine_dbgstr_w(enum_info.szDescription)); ok(!enum_info.szDriver[0], "Got unexpected driver %s.\n", wine_dbgstr_w(enum_info.szDriver)); @@ -565,7 +565,7 @@ static LRESULT CALLBACK gdf_driver_proc(DWORD_PTR id, HDRVR driver, UINT msg, LRESULT ret = 0; if (winetest_debug > 1) - trace("(%#lx, %p, %#x, %#lx, %#lx)\n", id, driver, msg, lparam1, lparam2); + trace("(%#Ix, %p, %#x, %#Ix, %#Ix)\n", id, driver, msg, lparam1, lparam2); switch(msg) { @@ -579,23 +579,23 @@ static LRESULT CALLBACK gdf_driver_proc(DWORD_PTR id, HDRVR driver, UINT msg, BITMAPINFOHEADER *out = (BITMAPINFOHEADER *)lparam2; DWORD expected_size; - ok(lparam1 == (LPARAM)&gdf_in, "got input %#lx\n", lparam1); + ok(lparam1 == (LPARAM)&gdf_in, "got input %#Ix\n", lparam1); if (!out) return ICERR_OK; ok(out == gdf_out, "got output %p\n", out); - ok(out->biSize == sizeof(*out), "got size %d\n", out->biSize); + ok(out->biSize == sizeof(*out), "got size %ld\n", out->biSize); expected_size = get_size_image(out->biWidth, out->biHeight, out->biBitCount); - ok(out->biSizeImage == expected_size, "expected image size %d, got %d\n", + ok(out->biSizeImage == expected_size, "expected image size %ld, got %ld\n", expected_size, out->biSizeImage); ok(out->biPlanes == 0xcccc, "got planes %d\n", out->biPlanes); ok(out->biXPelsPerMeter == 0xcccccccc && out->biYPelsPerMeter == 0xcccccccc, - "got resolution %dx%d\n", out->biXPelsPerMeter, out->biYPelsPerMeter); - ok(out->biClrUsed == 0xcccccccc, "got biClrUsed %u\n", out->biClrUsed); - ok(out->biClrImportant == 0xcccccccc, "got biClrImportant %u\n", out->biClrImportant); + "got resolution %ldx%ld\n", out->biXPelsPerMeter, out->biYPelsPerMeter); + ok(out->biClrUsed == 0xcccccccc, "got biClrUsed %lu\n", out->biClrUsed); + ok(out->biClrImportant == 0xcccccccc, "got biClrImportant %lu\n", out->biClrImportant); switch (get_display_format_test) { @@ -631,7 +631,7 @@ static LRESULT CALLBACK gdf_driver_proc(DWORD_PTR id, HDRVR driver, UINT msg, { BITMAPINFOHEADER *out = (BITMAPINFOHEADER *)lparam2; - ok(lparam1 == (LPARAM)&gdf_in, "got input %#lx\n", lparam1); + ok(lparam1 == (LPARAM)&gdf_in, "got input %#Ix\n", lparam1); if (out) { ok(out == gdf_out, "got output %p\n", out); @@ -650,7 +650,7 @@ static LRESULT CALLBACK gdf_driver_proc(DWORD_PTR id, HDRVR driver, UINT msg, { BITMAPINFO *out = (BITMAPINFO *)lparam2; - ok(lparam1 == (LPARAM)&gdf_in, "got input %#lx\n", lparam1); + ok(lparam1 == (LPARAM)&gdf_in, "got input %#Ix\n", lparam1); if (out) { ok(out == (BITMAPINFO *)gdf_out, "got output %p\n", out); @@ -668,10 +668,10 @@ static LRESULT CALLBACK gdf_driver_proc(DWORD_PTR id, HDRVR driver, UINT msg, static void check_bitmap_header_(int line, BITMAPINFOHEADER *header, LONG width, LONG height, WORD depth, DWORD compression) { - ok_(__FILE__, line)(header->biWidth == width, "expected %d, got %d\n", width, header->biWidth); - ok_(__FILE__, line)(header->biHeight == height, "expected %d, got %d\n", height, header->biHeight); + ok_(__FILE__, line)(header->biWidth == width, "expected %ld, got %ld\n", width, header->biWidth); + ok_(__FILE__, line)(header->biHeight == height, "expected %ld, got %ld\n", height, header->biHeight); ok_(__FILE__, line)(header->biBitCount == depth, "expected %d, got %d\n", depth, header->biBitCount); - ok_(__FILE__, line)(header->biCompression == compression, "expected %#x, got %#x\n", compression, header->biCompression); + ok_(__FILE__, line)(header->biCompression == compression, "expected %#lx, got %#lx\n", compression, header->biCompression); } #define check_bitmap_header(a,b,c,d,e) check_bitmap_header_(__LINE__,a,b,c,d,e) @@ -773,19 +773,19 @@ static void test_ICGetDisplayFormat(void) ok(hic != NULL, "ICGetDisplayFormat failed\n"); ok(gdf_out->biBitCount == 32 || gdf_out->biBitCount == 24, "got %d\n", gdf_out->biBitCount); - ok(gdf_out->biCompression == BI_RGB, "got %#x\n", gdf_out->biCompression); + ok(gdf_out->biCompression == BI_RGB, "got %#lx\n", gdf_out->biCompression); /* specifying 8 bpp yields a request for palette colours */ hic = ICGetDisplayFormat(hic, &gdf_in, gdf_out, 8, 30, 40); ok(hic != NULL, "ICGetDisplayFormat failed\n"); check_bitmap_header(gdf_out, 30, 40, 8, BI_RGB); - ok(gdf_out->biClrUsed == 1, "got biClrUsed %u\n", gdf_out->biClrUsed); + ok(gdf_out->biClrUsed == 1, "got biClrUsed %lu\n", gdf_out->biClrUsed); out_bmi = (BITMAPINFO *)gdf_out; ok(!memcmp(&out_bmi->bmiColors[0], &color_yellow, sizeof(color_yellow)), "got wrong colour\n"); lres = ICClose(hic); - ok(lres == ICERR_OK, "got %ld\n", lres); + ok(lres == ICERR_OK, "got %Id\n", lres); ret = ICRemove(ICTYPE_VIDEO, testcc, 0); ok(ret, "ICRemove failed\n");

March 1, 2022

[PATCH 22/27] dlls/mstask/tests: enable compilation with long types

by Eric Pouech

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/mstask/tests/Makefile.in | 1 dlls/mstask/tests/task.c | 214 ++++++++++++++++++----------------- dlls/mstask/tests/task_scheduler.c | 132 +++++++++++----------- dlls/mstask/tests/task_trigger.c | 220 ++++++++++++++++++------------------ 4 files changed, 283 insertions(+), 284 deletions(-) diff --git a/dlls/mstask/tests/Makefile.in b/dlls/mstask/tests/Makefile.in index daaf63abdef..ad5d7d683fa 100644 --- a/dlls/mstask/tests/Makefile.in +++ b/dlls/mstask/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = mstask.dll IMPORTS = ole32 user32 diff --git a/dlls/mstask/tests/task.c b/dlls/mstask/tests/task.c index 0c7f85394ea..e79a1c44687 100644 --- a/dlls/mstask/tests/task.c +++ b/dlls/mstask/tests/task.c @@ -66,7 +66,7 @@ static void test_SetApplicationName_GetApplicationName(void) /* Attempt getting before setting application name */ hres = ITask_GetApplicationName(test_task, &stored_name); - ok(hres == S_OK, "GetApplicationName failed: %08x\n", hres); + ok(hres == S_OK, "GetApplicationName failed: %08lx\n", hres); if (hres == S_OK) { ok(!lstrcmpiW(stored_name, empty), @@ -77,10 +77,10 @@ static void test_SetApplicationName_GetApplicationName(void) /* Set application name to a nonexistent application and then get * the application name that is actually stored */ hres = ITask_SetApplicationName(test_task, non_application_name); - ok(hres == S_OK, "Failed setting name %s: %08x\n", + ok(hres == S_OK, "Failed setting name %s: %08lx\n", wine_dbgstr_w(non_application_name), hres); hres = ITask_GetApplicationName(test_task, &stored_name); - ok(hres == S_OK, "GetApplicationName failed: %08x\n", hres); + ok(hres == S_OK, "GetApplicationName failed: %08lx\n", hres); if (hres == S_OK) { full_name = path_resolve_name(non_application_name); @@ -92,10 +92,10 @@ static void test_SetApplicationName_GetApplicationName(void) /* Set a valid application name with program type extension and then * get the stored name */ hres = ITask_SetApplicationName(test_task, notepad_exe); - ok(hres == S_OK, "Failed setting name %s: %08x\n", + ok(hres == S_OK, "Failed setting name %s: %08lx\n", wine_dbgstr_w(notepad_exe), hres); hres = ITask_GetApplicationName(test_task, &stored_name); - ok(hres == S_OK, "GetApplicationName failed: %08x\n", hres); + ok(hres == S_OK, "GetApplicationName failed: %08lx\n", hres); if (hres == S_OK) { full_name = path_resolve_name(notepad_exe); @@ -107,9 +107,9 @@ static void test_SetApplicationName_GetApplicationName(void) /* Set a valid application name without program type extension and * then get the stored name */ hres = ITask_SetApplicationName(test_task, notepad); - ok(hres == S_OK, "Failed setting name %s: %08x\n", wine_dbgstr_w(notepad), hres); + ok(hres == S_OK, "Failed setting name %s: %08lx\n", wine_dbgstr_w(notepad), hres); hres = ITask_GetApplicationName(test_task, &stored_name); - ok(hres == S_OK, "GetApplicationName failed: %08x\n", hres); + ok(hres == S_OK, "GetApplicationName failed: %08lx\n", hres); if (hres == S_OK) { full_name = path_resolve_name(notepad_exe); /* XP SP1 appends .exe */ @@ -126,10 +126,10 @@ static void test_SetApplicationName_GetApplicationName(void) * to a nonexistent application and then get the name that is * actually stored */ hres = ITask_SetApplicationName(test_task, non_application_name); - ok(hres == S_OK, "Failed setting name %s: %08x\n", + ok(hres == S_OK, "Failed setting name %s: %08lx\n", wine_dbgstr_w(non_application_name), hres); hres = ITask_GetApplicationName(test_task, &stored_name); - ok(hres == S_OK, "GetApplicationName failed: %08x\n", hres); + ok(hres == S_OK, "GetApplicationName failed: %08lx\n", hres); if (hres == S_OK) { full_name = path_resolve_name(non_application_name); @@ -140,9 +140,9 @@ static void test_SetApplicationName_GetApplicationName(void) /* Clear application name */ hres = ITask_SetApplicationName(test_task, empty); - ok(hres == S_OK, "Failed setting name %s: %08x\n", wine_dbgstr_w(empty), hres); + ok(hres == S_OK, "Failed setting name %s: %08lx\n", wine_dbgstr_w(empty), hres); hres = ITask_GetApplicationName(test_task, &stored_name); - ok(hres == S_OK, "GetApplicationName failed: %08x\n", hres); + ok(hres == S_OK, "GetApplicationName failed: %08lx\n", hres); if (hres == S_OK) { ok(!lstrcmpiW(stored_name, empty), @@ -165,7 +165,7 @@ static void test_CreateTrigger(void) ok(hres == S_OK, "Failed to setup test_task\n"); hres = ITask_CreateTrigger(test_task, &trigger_index, &test_trigger); - ok(hres == S_OK, "Failed to create trigger: 0x%08x\n", hres); + ok(hres == S_OK, "Failed to create trigger: 0x%08lx\n", hres); ITaskTrigger_Release(test_trigger); ITask_Release(test_task); @@ -186,7 +186,7 @@ static void test_SetParameters_GetParameters(void) /* Get parameters before setting them */ hres = ITask_GetParameters(test_task, &parameters); - ok(hres == S_OK, "GetParameters failed: %08x\n", hres); + ok(hres == S_OK, "GetParameters failed: %08lx\n", hres); if (hres == S_OK) { ok(!lstrcmpW(parameters, empty), @@ -196,10 +196,10 @@ static void test_SetParameters_GetParameters(void) /* Set parameters to a simple string */ hres = ITask_SetParameters(test_task, parameters_a); - ok(hres == S_OK, "Failed setting parameters %s: %08x\n", + ok(hres == S_OK, "Failed setting parameters %s: %08lx\n", wine_dbgstr_w(parameters_a), hres); hres = ITask_GetParameters(test_task, &parameters); - ok(hres == S_OK, "GetParameters failed: %08x\n", hres); + ok(hres == S_OK, "GetParameters failed: %08lx\n", hres); if (hres == S_OK) { ok(!lstrcmpW(parameters, parameters_a), "Got %s, expected %s\n", @@ -209,10 +209,10 @@ static void test_SetParameters_GetParameters(void) /* Update parameters to a different simple string */ hres = ITask_SetParameters(test_task, parameters_b); - ok(hres == S_OK, "Failed setting parameters %s: %08x\n", + ok(hres == S_OK, "Failed setting parameters %s: %08lx\n", wine_dbgstr_w(parameters_b), hres); hres = ITask_GetParameters(test_task, &parameters); - ok(hres == S_OK, "GetParameters failed: %08x\n", hres); + ok(hres == S_OK, "GetParameters failed: %08lx\n", hres); if (hres == S_OK) { ok(!lstrcmpW(parameters, parameters_b), "Got %s, expected %s\n", @@ -222,10 +222,10 @@ static void test_SetParameters_GetParameters(void) /* Clear parameters */ hres = ITask_SetParameters(test_task, empty); - ok(hres == S_OK, "Failed setting parameters %s: %08x\n", + ok(hres == S_OK, "Failed setting parameters %s: %08lx\n", wine_dbgstr_w(empty), hres); hres = ITask_GetParameters(test_task, &parameters); - ok(hres == S_OK, "GetParameters failed: %08x\n", hres); + ok(hres == S_OK, "GetParameters failed: %08lx\n", hres); if (hres == S_OK) { ok(!lstrcmpW(parameters, empty), @@ -251,7 +251,7 @@ static void test_SetComment_GetComment(void) /* Get comment before setting it*/ hres = ITask_GetComment(test_task, &comment); - ok(hres == S_OK, "GetComment failed: %08x\n", hres); + ok(hres == S_OK, "GetComment failed: %08lx\n", hres); if (hres == S_OK) { ok(!lstrcmpW(comment, empty), @@ -261,10 +261,10 @@ static void test_SetComment_GetComment(void) /* Set comment to a simple string */ hres = ITask_SetComment(test_task, comment_a); - ok(hres == S_OK, "Failed setting comment %s: %08x\n", + ok(hres == S_OK, "Failed setting comment %s: %08lx\n", wine_dbgstr_w(comment_a), hres); hres = ITask_GetComment(test_task, &comment); - ok(hres == S_OK, "GetComment failed: %08x\n", hres); + ok(hres == S_OK, "GetComment failed: %08lx\n", hres); if (hres == S_OK) { ok(!lstrcmpW(comment, comment_a), "Got %s, expected %s\n", @@ -274,10 +274,10 @@ static void test_SetComment_GetComment(void) /* Update comment to a different simple string */ hres = ITask_SetComment(test_task, comment_b); - ok(hres == S_OK, "Failed setting comment %s: %08x\n", + ok(hres == S_OK, "Failed setting comment %s: %08lx\n", wine_dbgstr_w(comment_b), hres); hres = ITask_GetComment(test_task, &comment); - ok(hres == S_OK, "GetComment failed: %08x\n", hres); + ok(hres == S_OK, "GetComment failed: %08lx\n", hres); if (hres == S_OK) { ok(!lstrcmpW(comment, comment_b), "Got %s, expected %s\n", @@ -287,10 +287,10 @@ static void test_SetComment_GetComment(void) /* Clear comment */ hres = ITask_SetComment(test_task, empty); - ok(hres == S_OK, "Failed setting comment %s: %08x\n", + ok(hres == S_OK, "Failed setting comment %s: %08lx\n", wine_dbgstr_w(empty), hres); hres = ITask_GetComment(test_task, &comment); - ok(hres == S_OK, "GetComment failed: %08x\n", hres); + ok(hres == S_OK, "GetComment failed: %08lx\n", hres); if (hres == S_OK) { ok(!lstrcmpW(comment, empty), @@ -315,40 +315,40 @@ static void test_SetMaxRunTime_GetMaxRunTime(void) * 3 days * 24 hours * 60 minutes * 60 seconds * 1000 ms = 259200000 */ max_run_time = 0; hres = ITask_GetMaxRunTime(test_task, &max_run_time); - ok(hres == S_OK, "Failed to get max runtime: 0x%08x\n", hres); - ok(max_run_time == 259200000, "Expected 259200000: %d\n", max_run_time); + ok(hres == S_OK, "Failed to get max runtime: 0x%08lx\n", hres); + ok(max_run_time == 259200000, "Expected 259200000: %ld\n", max_run_time); /* Basic set test */ max_run_time = 0; hres = ITask_SetMaxRunTime(test_task, 1234); - ok(hres == S_OK, "Failed to set max runtime: 0x%08x\n", hres); + ok(hres == S_OK, "Failed to set max runtime: 0x%08lx\n", hres); hres = ITask_GetMaxRunTime(test_task, &max_run_time); - ok(hres == S_OK, "Failed to get max runtime: 0x%08x\n", hres); - ok(max_run_time == 1234, "Expected 1234: %d\n", max_run_time); + ok(hres == S_OK, "Failed to get max runtime: 0x%08lx\n", hres); + ok(max_run_time == 1234, "Expected 1234: %ld\n", max_run_time); /* Verify that time can be set to zero */ max_run_time = 1; hres = ITask_SetMaxRunTime(test_task, 0); - ok(hres == S_OK, "Failed to set max runtime: 0x%08x\n", hres); + ok(hres == S_OK, "Failed to set max runtime: 0x%08lx\n", hres); hres = ITask_GetMaxRunTime(test_task, &max_run_time); - ok(hres == S_OK, "Failed to get max runtime: 0x%08x\n", hres); - ok(max_run_time == 0, "Expected 0: %d\n", max_run_time); + ok(hres == S_OK, "Failed to get max runtime: 0x%08lx\n", hres); + ok(max_run_time == 0, "Expected 0: %ld\n", max_run_time); /* Check resolution by setting time to one */ max_run_time = 0; hres = ITask_SetMaxRunTime(test_task, 1); - ok(hres == S_OK, "Failed to set max runtime: 0x%08x\n", hres); + ok(hres == S_OK, "Failed to set max runtime: 0x%08lx\n", hres); hres = ITask_GetMaxRunTime(test_task, &max_run_time); - ok(hres == S_OK, "Failed to get max runtime: 0x%08x\n", hres); - ok(max_run_time == 1, "Expected 1: %d\n", max_run_time); + ok(hres == S_OK, "Failed to get max runtime: 0x%08lx\n", hres); + ok(max_run_time == 1, "Expected 1: %ld\n", max_run_time); /* Verify that time can be set to INFINITE */ max_run_time = 0; hres = ITask_SetMaxRunTime(test_task, INFINITE); - ok(hres == S_OK, "Failed to set max runtime: 0x%08x\n", hres); + ok(hres == S_OK, "Failed to set max runtime: 0x%08lx\n", hres); hres = ITask_GetMaxRunTime(test_task, &max_run_time); - ok(hres == S_OK, "Failed to get max runtime: 0x%08x\n", hres); - ok(max_run_time == INFINITE, "Expected INFINITE: %d\n", max_run_time); + ok(hres == S_OK, "Failed to get max runtime: 0x%08lx\n", hres); + ok(max_run_time == INFINITE, "Expected INFINITE: %ld\n", max_run_time); ITask_Release(test_task); } @@ -379,19 +379,19 @@ static void test_SetAccountInformation_GetAccountInformation(void) } ok(hres == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || hres == SCHED_E_CANNOT_OPEN_TASK, - "Unset account name generated: 0x%08x\n", hres); + "Unset account name generated: 0x%08lx\n", hres); /* Attempt to set to a dummy account without a password */ /* This test passes on WinXP but fails on Win2K */ hres = ITask_SetAccountInformation(test_task, dummy_account_name, NULL); ok(hres == S_OK, - "Failed setting dummy account with no password: %08x\n", hres); + "Failed setting dummy account with no password: %08lx\n", hres); hres = ITask_GetAccountInformation(test_task, &account_name); ok(hres == S_OK || broken(hres == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || hres == SCHED_E_CANNOT_OPEN_TASK || hres == 0x200), /* win2k */ - "GetAccountInformation failed: %08x\n", hres); + "GetAccountInformation failed: %08lx\n", hres); if (hres == S_OK) { ok(!lstrcmpW(account_name, dummy_account_name), @@ -405,13 +405,13 @@ static void test_SetAccountInformation_GetAccountInformation(void) hres = ITask_SetAccountInformation(test_task, dummy_account_name_b, dummy_account_name_b); ok(hres == S_OK, - "Failed setting dummy account with password: %08x\n", hres); + "Failed setting dummy account with password: %08lx\n", hres); hres = ITask_GetAccountInformation(test_task, &account_name); ok(hres == S_OK || broken(hres == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || hres == SCHED_E_CANNOT_OPEN_TASK || hres == 0x200), /* win2k */ - "GetAccountInformation failed: %08x\n", hres); + "GetAccountInformation failed: %08lx\n", hres); if (hres == S_OK) { ok(!lstrcmpW(account_name, dummy_account_name_b), @@ -422,13 +422,13 @@ static void test_SetAccountInformation_GetAccountInformation(void) /* Attempt to set to the local system account */ hres = ITask_SetAccountInformation(test_task, empty, NULL); - ok(hres == S_OK, "Failed setting system account: %08x\n", hres); + ok(hres == S_OK, "Failed setting system account: %08lx\n", hres); hres = ITask_GetAccountInformation(test_task, &account_name); ok(hres == S_OK || broken(hres == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || hres == SCHED_E_CANNOT_OPEN_TASK || hres == 0x200), /* win2k */ - "GetAccountInformation failed: %08x\n", hres); + "GetAccountInformation failed: %08lx\n", hres); if (hres == S_OK) { ok(!lstrcmpW(account_name, empty), @@ -456,36 +456,36 @@ static void test_task_state(void) flags = 0xdeadbeef; hr = ITask_GetFlags(test_task, &flags); - ok(hr == S_OK, "GetFlags error %#x\n", hr); - ok(flags == 0, "got %#x\n", flags); + ok(hr == S_OK, "GetFlags error %#lx\n", hr); + ok(flags == 0, "got %#lx\n", flags); if (0) /* crashes under Windows */ hr = ITask_GetTaskFlags(test_task, NULL); flags = 0xdeadbeef; hr = ITask_GetTaskFlags(test_task, &flags); - ok(hr == S_OK, "GetTaskFlags error %#x\n", hr); - ok(flags == 0, "got %#x\n", flags); + ok(hr == S_OK, "GetTaskFlags error %#lx\n", hr); + ok(flags == 0, "got %#lx\n", flags); if (0) /* crashes under Windows */ hr = ITask_GetStatus(test_task, NULL); status = 0xdeadbeef; hr = ITask_GetStatus(test_task, &status); - ok(hr == S_OK, "GetStatus error %#x\n", hr); - ok(status == SCHED_S_TASK_NOT_SCHEDULED, "got %#x\n", status); + ok(hr == S_OK, "GetStatus error %#lx\n", hr); + ok(status == SCHED_S_TASK_NOT_SCHEDULED, "got %#lx\n", status); if (0) /* crashes under Windows */ hr = ITask_GetErrorRetryCount(test_task, NULL); hr = ITask_GetErrorRetryCount(test_task, &val1); - ok(hr == E_NOTIMPL, "got %#x\n", hr); + ok(hr == E_NOTIMPL, "got %#lx\n", hr); if (0) /* crashes under Windows */ hr = ITask_GetErrorRetryInterval(test_task, NULL); hr = ITask_GetErrorRetryInterval(test_task, &val1); - ok(hr == E_NOTIMPL, "got %#x\n", hr); + ok(hr == E_NOTIMPL, "got %#lx\n", hr); if (0) /* crashes under Windows */ hr = ITask_GetIdleWait(test_task, NULL, NULL); @@ -493,7 +493,7 @@ static void test_task_state(void) val1 = 0xdead; val2 = 0xbeef; hr = ITask_GetIdleWait(test_task, &val1, &val2); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(val1 == 10, "got %u\n", val1); ok(val2 == 60, "got %u\n", val2); @@ -502,23 +502,23 @@ static void test_task_state(void) val = 0xdeadbeef; hr = ITask_GetPriority(test_task, &val); - ok(hr == S_OK, "got %#x\n", hr); - ok(val == NORMAL_PRIORITY_CLASS, "got %#x\n", val); + ok(hr == S_OK, "got %#lx\n", hr); + ok(val == NORMAL_PRIORITY_CLASS, "got %#lx\n", val); if (0) /* crashes under Windows */ hr = ITask_GetExitCode(test_task, NULL); val = 0xdeadbeef; hr = ITask_GetExitCode(test_task, &val); - ok(hr == SCHED_S_TASK_HAS_NOT_RUN, "got %#x\n", hr); - ok(val == 0, "got %#x\n", val); + ok(hr == SCHED_S_TASK_HAS_NOT_RUN, "got %#lx\n", hr); + ok(val == 0, "got %#lx\n", val); if (0) /* crashes under Windows */ hr = ITask_GetMostRecentRunTime(test_task, NULL); memset(&st, 0xff, sizeof(st)); hr = ITask_GetMostRecentRunTime(test_task, &st); - ok(hr == SCHED_S_TASK_HAS_NOT_RUN, "got %#x\n", hr); + ok(hr == SCHED_S_TASK_HAS_NOT_RUN, "got %#lx\n", hr); ok(st.wYear == 0, "got %u\n", st.wYear); ok(st.wMonth == 0, "got %u\n", st.wMonth); ok(st.wDay == 0, "got %u\n", st.wDay); @@ -535,10 +535,10 @@ static void save_job(ITask *task) IPersistFile *pfile; hr = ITask_QueryInterface(task, &IID_IPersistFile, (void **)&pfile); - ok(hr == S_OK, "QueryInterface error %#x\n", hr); + ok(hr == S_OK, "QueryInterface error %#lx\n", hr); hr = IPersistFile_Save(pfile, NULL, FALSE); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); IPersistFile_Release(pfile); } @@ -559,26 +559,26 @@ static void test_Run(void) hr = ITaskScheduler_NewWorkItem(scheduler, wine_test_runW, &CLSID_CTask, &IID_ITask, (IUnknown **)&task); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); hr = ITask_Run(task); - ok(hr == SCHED_E_TASK_NOT_READY, "got %#x\n", hr); + ok(hr == SCHED_E_TASK_NOT_READY, "got %#lx\n", hr); hr = ITask_Terminate(task); - ok(hr == SCHED_E_TASK_NOT_RUNNING, "got %#x\n", hr); + ok(hr == SCHED_E_TASK_NOT_RUNNING, "got %#lx\n", hr); hr = ITask_GetStatus(task, &status); - ok(hr == S_OK, "got %#x\n", hr); - ok(status == SCHED_S_TASK_NOT_SCHEDULED, "got %#x\n", status); + ok(hr == S_OK, "got %#lx\n", hr); + ok(status == SCHED_S_TASK_NOT_SCHEDULED, "got %#lx\n", status); save_job(task); hr = ITask_GetStatus(task, &status); - ok(hr == S_OK, "got %#x\n", hr); - ok(status == SCHED_S_TASK_NOT_SCHEDULED, "got %#x\n", status); + ok(hr == S_OK, "got %#lx\n", hr); + ok(status == SCHED_S_TASK_NOT_SCHEDULED, "got %#lx\n", status); hr = ITask_CreateTrigger(task, &idx, &trigger); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); memset(&trigger_data, 0, sizeof(trigger_data)); trigger_data.cbTriggerSize = sizeof(trigger_data); @@ -593,32 +593,32 @@ static void test_Run(void) trigger_data.Type.Weekly.WeeksInterval = 1; trigger_data.Type.Weekly.rgfDaysOfTheWeek = 0x7f; /* every day */ hr = ITaskTrigger_SetTrigger(trigger, &trigger_data); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ITaskTrigger_Release(trigger); hr = ITask_SetApplicationName(task, cmdW); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); hr = ITask_SetParameters(task, empty); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); hr = ITask_SetWorkingDirectory(task, empty); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); /* Save the task so that the Scheduler service would notice the changes */ save_job(task); hr = ITask_GetStatus(task, &status); - ok(hr == S_OK, "got %#x\n", hr); - ok(status == SCHED_S_TASK_HAS_NOT_RUN, "got %#x\n", status); + ok(hr == S_OK, "got %#lx\n", hr); + ok(status == SCHED_S_TASK_HAS_NOT_RUN, "got %#lx\n", status); hr = ITask_Run(task); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); /* According to MSDN the task status doesn't update dynamically */ hr = ITask_GetStatus(task, &status); - ok(hr == S_OK, "got %#x\n", hr); - ok(status == SCHED_S_TASK_HAS_NOT_RUN, "got %#x\n", status); + ok(hr == S_OK, "got %#lx\n", hr); + ok(status == SCHED_S_TASK_HAS_NOT_RUN, "got %#lx\n", status); ITask_Release(task); @@ -632,10 +632,10 @@ static void test_Run(void) for (i = 0; i < 5; i++) { hr = ITaskScheduler_Activate(scheduler, wine_test_runW, &IID_ITask, (IUnknown **)&task); - ok(hr == S_OK, "Activate error %#x\n", hr); + ok(hr == S_OK, "Activate error %#lx\n", hr); hr = ITask_GetStatus(task, &status); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ITask_Release(task); @@ -645,15 +645,15 @@ static void test_Run(void) } hr = ITaskScheduler_Activate(scheduler, wine_test_runW, &IID_ITask, (IUnknown **)&task); - ok(hr == S_OK, "Activate error %#x\n", hr); + ok(hr == S_OK, "Activate error %#lx\n", hr); hr = ITask_GetStatus(task, &status); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); if (status == SCHED_S_TASK_RUNNING) { hr = ITask_Terminate(task); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ITask_Release(task); @@ -667,10 +667,10 @@ static void test_Run(void) for (i = 0; i < 5; i++) { hr = ITaskScheduler_Activate(scheduler, wine_test_runW, &IID_ITask, (IUnknown **)&task); - ok(hr == S_OK, "Activate error %#x\n", hr); + ok(hr == S_OK, "Activate error %#lx\n", hr); hr = ITask_GetStatus(task, &status); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ITask_Release(task); @@ -683,7 +683,7 @@ static void test_Run(void) ITask_Release(task); hr = taskscheduler_delete(scheduler, wine_test_runW); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); } static void test_SetFlags(void) @@ -694,31 +694,31 @@ static void test_SetFlags(void) hr = ITaskScheduler_NewWorkItem(scheduler, task_name, &CLSID_CTask, &IID_ITask, (IUnknown **)&task); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); hr = ITask_SetFlags(task, 0); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); flags = 0xdeadbeef; hr = ITask_GetFlags(task, &flags); - ok(hr == S_OK, "got %#x\n", hr); - ok(flags == 0, "got %#x\n", flags); + ok(hr == S_OK, "got %#lx\n", hr); + ok(flags == 0, "got %#lx\n", flags); hr = ITask_SetFlags(task, 0xffffffff); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); flags = 0xdeadbeef; hr = ITask_GetFlags(task, &flags); - ok(hr == S_OK, "got %#x\n", hr); - ok(flags == 0x7fff, "got %#x\n", flags); + ok(hr == S_OK, "got %#lx\n", hr); + ok(flags == 0x7fff, "got %#lx\n", flags); hr = ITask_SetFlags(task, 0x9234); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); flags = 0xdeadbeef; hr = ITask_GetFlags(task, &flags); - ok(hr == S_OK, "got %#x\n", hr); - ok(flags == 0x1234, "got %#x\n", flags); + ok(hr == S_OK, "got %#lx\n", hr); + ok(flags == 0x1234, "got %#lx\n", flags); ITask_Release(task); } @@ -733,7 +733,7 @@ static void test_workitem_data(void) hr = ITaskScheduler_NewWorkItem(scheduler, task_name, &CLSID_CTask, &IID_ITask, (IUnknown **)&task); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); if (0) /* crashes under Windows */ hr = ITask_GetWorkItemData(task, &count, NULL); @@ -743,35 +743,35 @@ static void test_workitem_data(void) count = 0xdead; data = (BYTE *)0xdeadbeef; hr = ITask_GetWorkItemData(task, &count, &data); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(count == 0, "got %u\n", count); ok(data == NULL, "got %p\n", data); hr = ITask_SetWorkItemData(task, sizeof(hello), NULL); - ok(hr == E_INVALIDARG, "got %#x\n", hr); + ok(hr == E_INVALIDARG, "got %#lx\n", hr); hr = ITask_SetWorkItemData(task, 0, hello); - ok(hr == E_INVALIDARG, "got %#x\n", hr); + ok(hr == E_INVALIDARG, "got %#lx\n", hr); hr = ITask_SetWorkItemData(task, sizeof(hello), hello); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); count = 0xdead; data = NULL; hr = ITask_GetWorkItemData(task, &count, &data); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(count == sizeof(hello), "got %u\n", count); ok(data != NULL, "got NULL\n"); ok(!memcmp(data, hello, sizeof(hello)), "data mismatch\n"); CoTaskMemFree(data); hr = ITask_SetWorkItemData(task, 0, NULL); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); count = 0xdead; data = (BYTE *)0xdeadbeef; hr = ITask_GetWorkItemData(task, &count, &data); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(count == 0, "got %u\n", count); ok(data == NULL, "got %p\n", data); @@ -785,7 +785,7 @@ START_TEST(task) CoInitialize(NULL); hr = CoCreateInstance(&CLSID_CTaskScheduler, NULL, CLSCTX_INPROC_SERVER, &IID_ITaskScheduler, (void **)&scheduler); - ok(hr == S_OK, "failed to create task scheduler: %#x\n", hr); + ok(hr == S_OK, "failed to create task scheduler: %#lx\n", hr); test_SetApplicationName_GetApplicationName(); test_CreateTrigger(); diff --git a/dlls/mstask/tests/task_scheduler.c b/dlls/mstask/tests/task_scheduler.c index fafad585f53..fbee3f46190 100644 --- a/dlls/mstask/tests/task_scheduler.c +++ b/dlls/mstask/tests/task_scheduler.c @@ -65,7 +65,7 @@ static void test_NewWorkItem(void) /* Create TaskScheduler */ hres = CoCreateInstance(&CLSID_CTaskScheduler, NULL, CLSCTX_INPROC_SERVER, &IID_ITaskScheduler, (void **) &test_task_scheduler); - ok(hres == S_OK, "CTaskScheduler CoCreateInstance failed: %08x\n", hres); + ok(hres == S_OK, "CTaskScheduler CoCreateInstance failed: %08lx\n", hres); if (hres != S_OK) { skip("Failed to create task scheduler. Skipping tests.\n"); @@ -75,7 +75,7 @@ static void test_NewWorkItem(void) /* Test basic task creation */ hres = ITaskScheduler_NewWorkItem(test_task_scheduler, task_name, &CLSID_CTask, &IID_ITask, (IUnknown**)&task); - ok(hres == S_OK, "NewNetworkItem failed: %08x\n", hres); + ok(hres == S_OK, "NewNetworkItem failed: %08lx\n", hres); if (hres == S_OK) ITask_Release(task); @@ -83,18 +83,18 @@ static void test_NewWorkItem(void) hres = ITaskScheduler_NewWorkItem(test_task_scheduler, task_name, &GUID_BAD, &IID_ITask, (IUnknown**)&task); ok(hres == CLASS_E_CLASSNOTAVAILABLE, - "Expected CLASS_E_CLASSNOTAVAILABLE: %08x\n", hres); + "Expected CLASS_E_CLASSNOTAVAILABLE: %08lx\n", hres); /* Task creation attempt using invalid interface ID */ hres = ITaskScheduler_NewWorkItem(test_task_scheduler, task_name, &CLSID_CTask, &GUID_BAD, (IUnknown**)&task); - ok(hres == E_NOINTERFACE, "Expected E_NOINTERFACE: %08x\n", hres); + ok(hres == E_NOINTERFACE, "Expected E_NOINTERFACE: %08lx\n", hres); /* Task creation attempt using invalid work item class and interface ID */ hres = ITaskScheduler_NewWorkItem(test_task_scheduler, task_name, &GUID_BAD, &GUID_BAD, (IUnknown**)&task); ok(hres == CLASS_E_CLASSNOTAVAILABLE, - "Expected CLASS_E_CLASSNOTAVAILABLE: %08x\n", hres); + "Expected CLASS_E_CLASSNOTAVAILABLE: %08lx\n", hres); ITaskScheduler_Release(test_task_scheduler); return; @@ -110,7 +110,7 @@ static void test_Activate(void) /* Create TaskScheduler */ hres = CoCreateInstance(&CLSID_CTaskScheduler, NULL, CLSCTX_INPROC_SERVER, &IID_ITaskScheduler, (void **) &test_task_scheduler); - ok(hres == S_OK, "CTaskScheduler CoCreateInstance failed: %08x\n", hres); + ok(hres == S_OK, "CTaskScheduler CoCreateInstance failed: %08lx\n", hres); if (hres != S_OK) { skip("Failed to create task scheduler. Skipping tests.\n"); @@ -120,7 +120,7 @@ static void test_Activate(void) /* Attempt to activate a nonexistent task */ hres = ITaskScheduler_Activate(test_task_scheduler, not_task_name, &IID_ITask, (IUnknown**)&task); - ok(hres == COR_E_FILENOTFOUND, "Expected COR_E_FILENOTFOUND: %08x\n", hres); + ok(hres == COR_E_FILENOTFOUND, "Expected COR_E_FILENOTFOUND: %08lx\n", hres); ITaskScheduler_Release(test_task_scheduler); return; @@ -134,7 +134,7 @@ static void test_GetTargetComputer(void) /* Create TaskScheduler */ hres = CoCreateInstance(&CLSID_CTaskScheduler, NULL, CLSCTX_INPROC_SERVER, &IID_ITaskScheduler, (void **) &test_task_scheduler); - ok(hres == S_OK, "CTaskScheduler CoCreateInstance failed: %08x\n", hres); + ok(hres == S_OK, "CTaskScheduler CoCreateInstance failed: %08lx\n", hres); if (hres != S_OK) { skip("Failed to create task scheduler.\n"); @@ -145,12 +145,12 @@ static void test_GetTargetComputer(void) { /* This crashes on w2k */ hres = ITaskScheduler_GetTargetComputer(test_task_scheduler, NULL); - ok(hres == E_INVALIDARG, "got 0x%x (expected E_INVALIDARG)\n", hres); + ok(hres == E_INVALIDARG, "got 0x%lx (expected E_INVALIDARG)\n", hres); } hres = ITaskScheduler_GetTargetComputer(test_task_scheduler, &oldname); ok((hres == S_OK) && oldname && oldname[0] == '\\' && oldname[1] == '\\' && oldname[2], - "got 0x%x and %s (expected S_OK and an unc name)\n", hres, wine_dbgstr_w(oldname)); + "got 0x%lx and %s (expected S_OK and an unc name)\n", hres, wine_dbgstr_w(oldname)); CoTaskMemFree(oldname); @@ -175,7 +175,7 @@ static void test_SetTargetComputer(void) /* Create TaskScheduler */ hres = CoCreateInstance(&CLSID_CTaskScheduler, NULL, CLSCTX_INPROC_SERVER, &IID_ITaskScheduler, (void **) &test_task_scheduler); - ok(hres == S_OK, "CTaskScheduler CoCreateInstance failed: %08x\n", hres); + ok(hres == S_OK, "CTaskScheduler CoCreateInstance failed: %08lx\n", hres); if (hres != S_OK) { skip("Failed to create task scheduler. Skipping tests.\n"); @@ -183,24 +183,24 @@ static void test_SetTargetComputer(void) } hres = ITaskScheduler_GetTargetComputer(test_task_scheduler, &oldname); - ok(hres == S_OK, "got 0x%x and %s (expected S_OK)\n", hres, wine_dbgstr_w(oldname)); + ok(hres == S_OK, "got 0x%lx and %s (expected S_OK)\n", hres, wine_dbgstr_w(oldname)); /* NULL is an alias for the local computer */ hres = ITaskScheduler_SetTargetComputer(test_task_scheduler, NULL); - ok(hres == S_OK, "got 0x%x (expected S_OK)\n", hres); + ok(hres == S_OK, "got 0x%lx (expected S_OK)\n", hres); hres = ITaskScheduler_GetTargetComputer(test_task_scheduler, &name); ok((hres == S_OK && !lstrcmpiW(name, buffer)), - "got 0x%x with %s (expected S_OK and %s)\n", + "got 0x%lx with %s (expected S_OK and %s)\n", hres, wine_dbgstr_w(name), wine_dbgstr_w(buffer)); CoTaskMemFree(name); /* The name must be valid */ hres = ITaskScheduler_SetTargetComputer(test_task_scheduler, does_not_existW); - ok(hres == HRESULT_FROM_WIN32(ERROR_BAD_NETPATH), "got 0x%x (expected 0x80070035)\n", hres); + ok(hres == HRESULT_FROM_WIN32(ERROR_BAD_NETPATH), "got 0x%lx (expected 0x80070035)\n", hres); /* the name of the target computer is unchanged */ hres = ITaskScheduler_GetTargetComputer(test_task_scheduler, &name); ok((hres == S_OK && !lstrcmpiW(name, buffer)), - "got 0x%x with %s (expected S_OK and %s)\n", + "got 0x%lx with %s (expected S_OK and %s)\n", hres, wine_dbgstr_w(name), wine_dbgstr_w(buffer)); CoTaskMemFree(name); @@ -211,19 +211,19 @@ static void test_SetTargetComputer(void) skip("SetTargetComputer failed with E_ACCESSDENIED (needs admin rights)\n"); goto done; } - ok(hres == S_OK, "got 0x%x (expected S_OK)\n", hres); + ok(hres == S_OK, "got 0x%lx (expected S_OK)\n", hres); /* the case is ignored */ CharUpperW(buffer); hres = ITaskScheduler_SetTargetComputer(test_task_scheduler, buffer); - ok(hres == S_OK, "got 0x%x (expected S_OK)\n", hres); + ok(hres == S_OK, "got 0x%lx (expected S_OK)\n", hres); CharLowerW(buffer); hres = ITaskScheduler_SetTargetComputer(test_task_scheduler, buffer); - ok(hres == S_OK, "got 0x%x (expected S_OK)\n", hres); + ok(hres == S_OK, "got 0x%lx (expected S_OK)\n", hres); /* cleanup */ hres = ITaskScheduler_SetTargetComputer(test_task_scheduler, oldname); - ok(hres == S_OK, "got 0x%x (expected S_OK)\n", hres); + ok(hres == S_OK, "got 0x%lx (expected S_OK)\n", hres); done: CoTaskMemFree(oldname); @@ -243,37 +243,37 @@ static void test_Enum(void) hr = CoCreateInstance(&CLSID_CTaskScheduler, NULL, CLSCTX_INPROC_SERVER, &IID_ITaskScheduler, (void **)&scheduler); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); /* cleanup after previous runs */ taskscheduler_delete(scheduler, Task1); hr = ITaskScheduler_NewWorkItem(scheduler, Task1, &CLSID_CTask, &IID_ITask, (IUnknown **)&task); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); hr = ITaskScheduler_AddWorkItem(scheduler, Task1, (IScheduledWorkItem *)task); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ITask_Release(task); hr = ITaskScheduler_Enum(scheduler, NULL); - ok(hr == E_INVALIDARG, "got %#x\n", hr); + ok(hr == E_INVALIDARG, "got %#lx\n", hr); hr = ITaskScheduler_Enum(scheduler, &tasks); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); names = (void *)0xdeadbeef; fetched = 0xdeadbeef; hr = IEnumWorkItems_Next(tasks, 0, &names, &fetched); - ok(hr == E_INVALIDARG, "got %#x\n", hr); + ok(hr == E_INVALIDARG, "got %#lx\n", hr); ok(names == (void *)0xdeadbeef, "got %p\n", names); - ok(fetched == 0xdeadbeef, "got %#x\n", fetched); + ok(fetched == 0xdeadbeef, "got %#lx\n", fetched); hr = IEnumWorkItems_Next(tasks, 1, NULL, NULL); - ok(hr == E_INVALIDARG, "got %#x\n", hr); + ok(hr == E_INVALIDARG, "got %#lx\n", hr); names = NULL; hr = IEnumWorkItems_Next(tasks, 1, &names, NULL); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(names != NULL, "got NULL\n"); ok(names[0] != NULL, "got NULL\n"); CoTaskMemFree(names[0]); @@ -281,19 +281,19 @@ static void test_Enum(void) names = (void *)0xdeadbeef; hr = IEnumWorkItems_Next(tasks, 2, &names, NULL); - ok(hr == E_INVALIDARG, "got %#x\n", hr); + ok(hr == E_INVALIDARG, "got %#lx\n", hr); ok(names == (void *)0xdeadbeef, "got %p\n", names); hr = IEnumWorkItems_Reset(tasks); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); names = NULL; fetched = 0xdeadbeef; hr = IEnumWorkItems_Next(tasks, 1, &names, &fetched); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(names != NULL, "got NULL\n"); ok(names[0] != NULL, "got NULL\n"); - ok(fetched == 1, "got %u\n", fetched); + ok(fetched == 1, "got %lu\n", fetched); CoTaskMemFree(names[0]); CoTaskMemFree(names); @@ -301,19 +301,19 @@ static void test_Enum(void) /* do nothing*/; hr = IEnumWorkItems_Skip(tasks, 1); - ok(hr == S_FALSE, "got %#x\n", hr); + ok(hr == S_FALSE, "got %#lx\n", hr); names = (void *)0xdeadbeef; fetched = 0xdeadbeef; hr = IEnumWorkItems_Next(tasks, 1, &names, &fetched); - ok(hr == S_FALSE, "got %#x\n", hr); + ok(hr == S_FALSE, "got %#lx\n", hr); ok(names == NULL, "got %p\n", names); - ok(fetched == 0, "got %u\n", fetched); + ok(fetched == 0, "got %lu\n", fetched); IEnumWorkItems_Release(tasks); hr = taskscheduler_delete(scheduler, Task1); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ITaskScheduler_Release(scheduler); } @@ -330,31 +330,31 @@ static void test_save_task_curfile(ITask *task) WCHAR *curfile; hr = ITask_QueryInterface(task, &IID_IPersistFile, (void **)&pfile); - ok(hr == S_OK, "QueryInterface error %#x\n", hr); + ok(hr == S_OK, "QueryInterface error %#lx\n", hr); curfile = NULL; hr = IPersistFile_GetCurFile(pfile, &curfile); - ok(hr == S_OK, "GetCurFile error %#x\n", hr); + ok(hr == S_OK, "GetCurFile error %#lx\n", hr); ok(curfile && curfile[0], "curfile should not be NULL\n"); ok(file_exists(curfile), "curfile should exist\n"); hr = IPersistFile_Save(pfile, curfile, FALSE); - ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_EXISTS), "wrong error %#x\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_EXISTS), "wrong error %#lx\n", hr); hr = IPersistFile_Save(pfile, curfile, TRUE); - ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_EXISTS), "wrong error %#x\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_EXISTS), "wrong error %#lx\n", hr); hr = IPersistFile_Save(pfile, NULL, FALSE); - ok(hr == S_OK, "Save error %#x\n", hr); + ok(hr == S_OK, "Save error %#lx\n", hr); hr = IPersistFile_Save(pfile, NULL, TRUE); - ok(hr == S_OK, "Save error %#x\n", hr); + ok(hr == S_OK, "Save error %#lx\n", hr); CoTaskMemFree(curfile); curfile = NULL; hr = IPersistFile_GetCurFile(pfile, &curfile); - ok(hr == S_OK, "GetCurFile error %#x\n", hr); + ok(hr == S_OK, "GetCurFile error %#lx\n", hr); ok(curfile && curfile[0] , "curfile should not be NULL\n"); CoTaskMemFree(curfile); @@ -369,27 +369,27 @@ static WCHAR *get_task_curfile(ITask *task, BOOL should_exist, BOOL is_dirty, in CLSID clsid; hr = ITask_QueryInterface(task, &IID_IPersistFile, (void **)&pfile); - ok_(__FILE__, line)(hr == S_OK, "QueryInterface error %#x\n", hr); + ok_(__FILE__, line)(hr == S_OK, "QueryInterface error %#lx\n", hr); hr = IPersistFile_IsDirty(pfile); - ok_(__FILE__, line)(hr == is_dirty ? S_OK : S_FALSE, "got %#x\n", hr); + ok_(__FILE__, line)(hr == is_dirty ? S_OK : S_FALSE, "got %#lx\n", hr); curfile = NULL; hr = IPersistFile_GetCurFile(pfile, &curfile); - ok_(__FILE__, line)(hr == S_OK, "GetCurFile error %#x\n", hr); + ok_(__FILE__, line)(hr == S_OK, "GetCurFile error %#lx\n", hr); ok_(__FILE__, line)(curfile && curfile[0] , "curfile should not be NULL\n"); hr = IPersistFile_Load(pfile, curfile, STGM_READ); if (should_exist) - ok_(__FILE__, line)(hr == S_OK, "Load error %#x\n", hr); + ok_(__FILE__, line)(hr == S_OK, "Load error %#lx\n", hr); else - ok_(__FILE__, line)(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "wrong error %#x\n", hr); + ok_(__FILE__, line)(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "wrong error %#lx\n", hr); if (0) /* crashes under Windows */ hr = IPersistFile_GetClassID(pfile, NULL); hr = IPersistFile_GetClassID(pfile, &clsid); - ok_(__FILE__, line)(hr == S_OK, "GetClassID error %#x\n", hr); + ok_(__FILE__, line)(hr == S_OK, "GetClassID error %#lx\n", hr); ok_(__FILE__, line)(IsEqualCLSID(&clsid, &CLSID_CTask), "got %s\n", wine_dbgstr_guid(&clsid)); IPersistFile_Release(pfile); @@ -427,28 +427,28 @@ static void test_task_storage(void) hr = CoCreateInstance(&CLSID_CTaskScheduler, NULL, CLSCTX_INPROC_SERVER, &IID_ITaskScheduler, (void **)&scheduler); if (hr != S_OK) { - win_skip("CoCreateInstance(CLSID_CTaskScheduler) error %#x\n", hr); + win_skip("CoCreateInstance(CLSID_CTaskScheduler) error %#lx\n", hr); return; } hr = ITaskScheduler_Delete(scheduler, Task1_ext); - ok(hr == E_INVALIDARG, "wrong error %#x\n", hr); + ok(hr == E_INVALIDARG, "wrong error %#lx\n", hr); hr = ITaskScheduler_Delete(scheduler, Task1); - ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "wrong error %#x\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "wrong error %#lx\n", hr); hr = ITaskScheduler_NewWorkItem(scheduler, Task1_ext, &CLSID_CTask, &IID_ITask, (IUnknown **)&task); - ok(hr == E_INVALIDARG, "wrong error %#x\n", hr); + ok(hr == E_INVALIDARG, "wrong error %#lx\n", hr); hr = ITaskScheduler_NewWorkItem(scheduler, Task1, &CLSID_CTask, &IID_ITask, (IUnknown **)&task); - ok(hr == S_OK, "NewWorkItem error %#x\n", hr); + ok(hr == S_OK, "NewWorkItem error %#lx\n", hr); curfile = get_task_curfile(task, FALSE, FALSE, __LINE__); ok(!file_exists(curfile), "curfile should not exist\n"); ok(!lstrcmpW(curfile, task1_full_name), "name is wrong %s\n", wine_dbgstr_w(curfile)); hr = ITask_SetComment(task, Task1); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); curfile2 = get_task_curfile(task, FALSE, TRUE, __LINE__); ok(!file_exists(curfile2), "curfile should not exist\n"); @@ -456,7 +456,7 @@ static void test_task_storage(void) CoTaskMemFree(curfile2); hr = ITaskScheduler_NewWorkItem(scheduler, Task1, &CLSID_CTask, &IID_ITask, (IUnknown **)&task2); - ok(hr == S_OK, "NewWorkItem error %#x\n", hr); + ok(hr == S_OK, "NewWorkItem error %#lx\n", hr); ok(task2 != task, "tasks should not be equal\n"); curfile2 = get_task_curfile(task2, FALSE, FALSE, __LINE__); @@ -469,32 +469,32 @@ static void test_task_storage(void) task2 = (ITask *)0xdeadbeef; hr = ITaskScheduler_Activate(scheduler, Task1, &IID_ITask, (IUnknown **)&task2); - ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "wrong error %#x\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "wrong error %#lx\n", hr); ok(task2 == (ITask *)0xdeadbeef, "task should not be set to NULL\n"); hr = ITaskScheduler_AddWorkItem(scheduler, Task2, (IScheduledWorkItem *)task); - ok(hr == S_OK, "AddWorkItem error %#x\n", hr); + ok(hr == S_OK, "AddWorkItem error %#lx\n", hr); curfile = get_task_curfile(task, TRUE, FALSE, __LINE__); ok(file_exists(curfile), "curfile should exist\n"); ok(!lstrcmpW(curfile, task2_full_name), "name is wrong %s\n", wine_dbgstr_w(curfile)); CoTaskMemFree(curfile); hr = ITaskScheduler_AddWorkItem(scheduler, Task3, (IScheduledWorkItem *)task); - ok(hr == S_OK, "AddWorkItem error %#x\n", hr); + ok(hr == S_OK, "AddWorkItem error %#lx\n", hr); curfile = get_task_curfile(task, TRUE, FALSE, __LINE__); ok(file_exists(curfile), "curfile should exist\n"); ok(!lstrcmpW(curfile, task3_full_name), "name is wrong %s\n", wine_dbgstr_w(curfile)); CoTaskMemFree(curfile); hr = ITaskScheduler_AddWorkItem(scheduler, Task1, (IScheduledWorkItem *)task); - ok(hr == S_OK, "AddWorkItem error %#x\n", hr); + ok(hr == S_OK, "AddWorkItem error %#lx\n", hr); curfile = get_task_curfile(task, TRUE, FALSE, __LINE__); ok(file_exists(curfile), "curfile should exist\n"); ok(!lstrcmpW(curfile, task1_full_name), "name is wrong %s\n", wine_dbgstr_w(curfile)); CoTaskMemFree(curfile); hr = ITaskScheduler_AddWorkItem(scheduler, Task1, (IScheduledWorkItem *)task); - ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_EXISTS), "wrong error %#x\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_EXISTS), "wrong error %#lx\n", hr); curfile = get_task_curfile(task, TRUE, FALSE, __LINE__); ok(file_exists(curfile), "curfile should exist\n"); @@ -504,7 +504,7 @@ static void test_task_storage(void) task = NULL; hr = ITaskScheduler_Activate(scheduler, Task1, &IID_ITask, (IUnknown **)&task); - ok(hr == S_OK, "Activate error %#x\n", hr); + ok(hr == S_OK, "Activate error %#lx\n", hr); ok(task != NULL, "task should not be set to NULL\n"); curfile = get_task_curfile(task, TRUE, FALSE, __LINE__); @@ -516,11 +516,11 @@ static void test_task_storage(void) test_save_task_curfile(task); hr = taskscheduler_delete(scheduler, Task1); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); hr = taskscheduler_delete(scheduler, Task2); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); hr = taskscheduler_delete(scheduler, Task3); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ITask_Release(task); ITaskScheduler_Release(scheduler); diff --git a/dlls/mstask/tests/task_trigger.c b/dlls/mstask/tests/task_trigger.c index 168d6f34212..d0f659ef246 100644 --- a/dlls/mstask/tests/task_trigger.c +++ b/dlls/mstask/tests/task_trigger.c @@ -79,15 +79,15 @@ static BOOL compare_trigger_state(TASK_TRIGGER found_state, found_state.wStartMinute, expected_state.wStartMinute); ok(found_state.MinutesDuration == expected_state.MinutesDuration, - "MinutesDuration: Found %d but expected %d\n", + "MinutesDuration: Found %ld but expected %ld\n", found_state.MinutesDuration, expected_state.MinutesDuration); ok(found_state.MinutesInterval == expected_state.MinutesInterval, - "MinutesInterval: Found %d but expected %d\n", + "MinutesInterval: Found %ld but expected %ld\n", found_state.MinutesInterval, expected_state.MinutesInterval); ok(found_state.rgFlags == expected_state.rgFlags, - "rgFlags: Found %d but expected %d\n", + "rgFlags: Found %ld but expected %ld\n", found_state.rgFlags, expected_state.rgFlags); ok(found_state.TriggerType == expected_state.TriggerType, @@ -138,16 +138,16 @@ static void test_SetTrigger_GetTrigger(void) hres = ITaskScheduler_NewWorkItem(test_task_scheduler, task_name, &CLSID_CTask, &IID_ITask, (IUnknown **)&test_task); - ok(hres == S_OK, "got %#x\n", hres); + ok(hres == S_OK, "got %#lx\n", hres); hres = ITask_CreateTrigger(test_task, &idx, &test_trigger); - ok(hres == S_OK, "got %#x\n", hres); + ok(hres == S_OK, "got %#lx\n", hres); hres = ITaskTrigger_SetTrigger(test_trigger, NULL); - ok(hres == E_INVALIDARG, "got %#x\n", hres); + ok(hres == E_INVALIDARG, "got %#lx\n", hres); hres = ITaskTrigger_GetTrigger(test_trigger, NULL); - ok(hres == E_INVALIDARG, "got %#x\n", hres); + ok(hres == E_INVALIDARG, "got %#lx\n", hres); /* Setup a trigger with base values for this test run */ GetLocalTime(&time); @@ -161,12 +161,12 @@ static void test_SetTrigger_GetTrigger(void) memset(&trigger_state, 0xcf, sizeof(trigger_state)); trigger_state.cbTriggerSize = sizeof(trigger_state); hres = ITaskTrigger_GetTrigger(test_trigger, &trigger_state); - ok(hres == S_OK, "Failed to set trigger: 0x%08x\n", hres); + ok(hres == S_OK, "Failed to set trigger: 0x%08lx\n", hres); compare_trigger_state(trigger_state, empty_trigger_state); /* Test setting basic empty trigger */ hres = ITaskTrigger_SetTrigger(test_trigger, &empty_trigger_state); - ok(hres == S_OK, "Failed to set trigger: 0x%08x\n", hres); + ok(hres == S_OK, "Failed to set trigger: 0x%08lx\n", hres); memset(&trigger_state, 0xcf, sizeof(trigger_state)); trigger_state.cbTriggerSize = sizeof(trigger_state); hres = ITaskTrigger_GetTrigger(test_trigger, &trigger_state); @@ -175,7 +175,7 @@ static void test_SetTrigger_GetTrigger(void) /* Test setting basic non-empty trigger */ hres = ITaskTrigger_SetTrigger(test_trigger, &normal_trigger_state); - ok(hres == S_OK, "Failed to set trigger: 0x%08x\n", hres); + ok(hres == S_OK, "Failed to set trigger: 0x%08lx\n", hres); memset(&trigger_state, 0xcf, sizeof(trigger_state)); trigger_state.cbTriggerSize = sizeof(trigger_state); hres = ITaskTrigger_GetTrigger(test_trigger, &trigger_state); @@ -190,21 +190,21 @@ static void test_SetTrigger_GetTrigger(void) /* Test setting trigger with invalid cbTriggerSize */ normal_trigger_state.cbTriggerSize = sizeof(trigger_state) - 1; hres = ITaskTrigger_SetTrigger(test_trigger, &normal_trigger_state); - ok(hres == E_INVALIDARG, "Expected E_INVALIDARG: 0x%08x\n", hres); + ok(hres == E_INVALIDARG, "Expected E_INVALIDARG: 0x%08lx\n", hres); normal_trigger_state.cbTriggerSize = sizeof(trigger_state) + 1; hres = ITaskTrigger_SetTrigger(test_trigger, &normal_trigger_state); - ok(hres == E_INVALIDARG, "Expected E_INVALIDARG: 0x%08x\n", hres); + ok(hres == E_INVALIDARG, "Expected E_INVALIDARG: 0x%08lx\n", hres); normal_trigger_state.cbTriggerSize = sizeof(trigger_state); /* Test setting trigger with invalid Reserved fields */ normal_trigger_state.Reserved1 = 80; normal_trigger_state.Reserved2 = 80; hres = ITaskTrigger_SetTrigger(test_trigger, &normal_trigger_state); - ok(hres == S_OK, "Failed to set trigger: 0x%08x\n", hres); + ok(hres == S_OK, "Failed to set trigger: 0x%08lx\n", hres); memset(&trigger_state, 0xcf, sizeof(trigger_state)); trigger_state.cbTriggerSize = sizeof(trigger_state); hres = ITaskTrigger_GetTrigger(test_trigger, &trigger_state); - ok(hres == S_OK, "Expected S_OK: 0x%08x\n", hres); + ok(hres == S_OK, "Expected S_OK: 0x%08lx\n", hres); ok(trigger_state.Reserved1 == 0 && trigger_state.Reserved2 == 0, "Reserved fields should be set to zero\n"); normal_trigger_state.Reserved1 = 0; @@ -213,23 +213,23 @@ static void test_SetTrigger_GetTrigger(void) /* Test setting trigger with invalid month */ normal_trigger_state.wBeginMonth = 0; hres = ITaskTrigger_SetTrigger(test_trigger, &normal_trigger_state); - ok(hres == E_INVALIDARG, "Expected E_INVALIDARG: 0x%08x\n", hres); + ok(hres == E_INVALIDARG, "Expected E_INVALIDARG: 0x%08lx\n", hres); normal_trigger_state.wBeginMonth = 13; hres = ITaskTrigger_SetTrigger(test_trigger, &normal_trigger_state); - ok(hres == E_INVALIDARG, "Expected E_INVALIDARG: 0x%08x\n", hres); + ok(hres == E_INVALIDARG, "Expected E_INVALIDARG: 0x%08lx\n", hres); normal_trigger_state.wBeginMonth = 1; /* Test setting trigger with invalid begin date */ normal_trigger_state.wBeginDay = 0; hres = ITaskTrigger_SetTrigger(test_trigger, &normal_trigger_state); - ok(hres == E_INVALIDARG, "Expected E_INVALIDARG: 0x%08x\n", hres); + ok(hres == E_INVALIDARG, "Expected E_INVALIDARG: 0x%08lx\n", hres); normal_trigger_state.wBeginDay = 32; hres = ITaskTrigger_SetTrigger(test_trigger, &normal_trigger_state); - ok(hres == E_INVALIDARG, "Expected E_INVALIDARG: 0x%08x\n", hres); + ok(hres == E_INVALIDARG, "Expected E_INVALIDARG: 0x%08lx\n", hres); normal_trigger_state.wBeginMonth = 2; normal_trigger_state.wBeginDay = 30; hres = ITaskTrigger_SetTrigger(test_trigger, &normal_trigger_state); - ok(hres == E_INVALIDARG, "Expected E_INVALIDARG: 0x%08x\n", hres); + ok(hres == E_INVALIDARG, "Expected E_INVALIDARG: 0x%08lx\n", hres); normal_trigger_state.wBeginMonth = 1; normal_trigger_state.wBeginDay = 1; @@ -238,11 +238,11 @@ static void test_SetTrigger_GetTrigger(void) normal_trigger_state.wEndMonth = 200; normal_trigger_state.wEndDay = 200; hres = ITaskTrigger_SetTrigger(test_trigger, &normal_trigger_state); - ok(hres == S_OK, "Failed to set trigger: 0x%08x\n", hres); + ok(hres == S_OK, "Failed to set trigger: 0x%08lx\n", hres); memset(&trigger_state, 0xcf, sizeof(trigger_state)); trigger_state.cbTriggerSize = sizeof(trigger_state); hres = ITaskTrigger_GetTrigger(test_trigger, &trigger_state); - ok(hres == S_OK, "Expected S_OK: 0x%08x\n", hres); + ok(hres == S_OK, "Expected S_OK: 0x%08lx\n", hres); ok(trigger_state.wEndYear == 0, "End year should be 0: %d\n", trigger_state.wEndYear); ok(trigger_state.wEndMonth == 200, "End month should be 200: %d\n", @@ -252,7 +252,7 @@ static void test_SetTrigger_GetTrigger(void) normal_trigger_state.rgFlags = TASK_TRIGGER_FLAG_DISABLED | TASK_TRIGGER_FLAG_HAS_END_DATE; hres = ITaskTrigger_SetTrigger(test_trigger, &normal_trigger_state); - ok(hres == E_INVALIDARG, "Expected E_INVALIDARG: 0x%08x\n", hres); + ok(hres == E_INVALIDARG, "Expected E_INVALIDARG: 0x%08lx\n", hres); normal_trigger_state.rgFlags = TASK_TRIGGER_FLAG_DISABLED; normal_trigger_state.wEndYear = 2980; normal_trigger_state.wEndMonth = 1; @@ -261,40 +261,40 @@ static void test_SetTrigger_GetTrigger(void) /* Test setting trigger with invalid hour or minute*/ normal_trigger_state.wStartHour = 24; hres = ITaskTrigger_SetTrigger(test_trigger, &normal_trigger_state); - ok(hres == E_INVALIDARG, "Expected E_INVALIDARG: 0x%08x\n", hres); + ok(hres == E_INVALIDARG, "Expected E_INVALIDARG: 0x%08lx\n", hres); normal_trigger_state.wStartHour = 60; hres = ITaskTrigger_SetTrigger(test_trigger, &normal_trigger_state); - ok(hres == E_INVALIDARG, "Expected E_INVALIDARG: 0x%08x\n", hres); + ok(hres == E_INVALIDARG, "Expected E_INVALIDARG: 0x%08lx\n", hres); normal_trigger_state.wStartHour = 3; /* Test setting trigger with invalid duration / interval pairs */ normal_trigger_state.MinutesDuration = 5; normal_trigger_state.MinutesInterval = 5; hres = ITaskTrigger_SetTrigger(test_trigger, &normal_trigger_state); - ok(hres == E_INVALIDARG, "Expected E_INVALIDARG: 0x%08x\n", hres); + ok(hres == E_INVALIDARG, "Expected E_INVALIDARG: 0x%08lx\n", hres); normal_trigger_state.MinutesDuration = 5; normal_trigger_state.MinutesInterval = 6; hres = ITaskTrigger_SetTrigger(test_trigger, &normal_trigger_state); - ok(hres == E_INVALIDARG, "Expected E_INVALIDARG: 0x%08x\n", hres); + ok(hres == E_INVALIDARG, "Expected E_INVALIDARG: 0x%08lx\n", hres); normal_trigger_state.MinutesDuration = 0; normal_trigger_state.MinutesInterval = 6; hres = ITaskTrigger_SetTrigger(test_trigger, &normal_trigger_state); - ok(hres == E_INVALIDARG, "Expected E_INVALIDARG: 0x%08x\n", hres); + ok(hres == E_INVALIDARG, "Expected E_INVALIDARG: 0x%08lx\n", hres); normal_trigger_state.MinutesDuration = 5; normal_trigger_state.MinutesInterval = 0; hres = ITaskTrigger_SetTrigger(test_trigger, &normal_trigger_state); - ok(hres == S_OK, "Failed to set trigger: 0x%08x\n", hres); + ok(hres == S_OK, "Failed to set trigger: 0x%08lx\n", hres); normal_trigger_state.MinutesDuration = 0; normal_trigger_state.MinutesInterval = 0; /* Test setting trigger with end date before start date */ normal_trigger_state.wEndYear = 1979; hres = ITaskTrigger_SetTrigger(test_trigger, &normal_trigger_state); - ok(hres == S_OK, "Failed to set trigger: 0x%08x\n", hres); + ok(hres == S_OK, "Failed to set trigger: 0x%08lx\n", hres); normal_trigger_state.rgFlags = TASK_TRIGGER_FLAG_DISABLED | TASK_TRIGGER_FLAG_HAS_END_DATE; hres = ITaskTrigger_SetTrigger(test_trigger, &normal_trigger_state); - ok(hres == S_OK, "Failed to set trigger: 0x%08x\n", hres); + ok(hres == S_OK, "Failed to set trigger: 0x%08lx\n", hres); normal_trigger_state.rgFlags = TASK_TRIGGER_FLAG_DISABLED; normal_trigger_state.wEndYear = 2980; normal_trigger_state.wEndMonth = 1; @@ -306,11 +306,11 @@ static void test_SetTrigger_GetTrigger(void) normal_trigger_state.Type.Weekly.WeeksInterval = 2; normal_trigger_state.Type.Weekly.rgfDaysOfTheWeek = (TASK_MONDAY | TASK_TUESDAY); hres = ITaskTrigger_SetTrigger(test_trigger, &normal_trigger_state); - ok(hres == S_OK, "Failed to set trigger: 0x%08x\n", hres); + ok(hres == S_OK, "Failed to set trigger: 0x%08lx\n", hres); memset(&trigger_state, 0xcf, sizeof(trigger_state)); trigger_state.cbTriggerSize = sizeof(trigger_state); hres = ITaskTrigger_GetTrigger(test_trigger, &trigger_state); - ok(hres == S_OK, "Expected S_OK: 0x%08x\n", hres); + ok(hres == S_OK, "Expected S_OK: 0x%08lx\n", hres); ok(trigger_state.Type.Weekly.WeeksInterval == 0xcfcf, "Expected WeeksInterval set remain untouched: %d\n", trigger_state.Type.Weekly.WeeksInterval); @@ -320,16 +320,16 @@ static void test_SetTrigger_GetTrigger(void) normal_trigger_state.TriggerType = TASK_TIME_TRIGGER_DAILY; normal_trigger_state.Type.Daily.DaysInterval = 1; hres = ITaskTrigger_SetTrigger(test_trigger, &normal_trigger_state); - ok(hres == S_OK, "Expected S_OK: 0x%08x\n", hres); + ok(hres == S_OK, "Expected S_OK: 0x%08lx\n", hres); /* Test setting trigger with set wRandomMinutesInterval */ normal_trigger_state.wRandomMinutesInterval = 5; hres = ITaskTrigger_SetTrigger(test_trigger, &normal_trigger_state); - ok(hres == S_OK, "Failed to set trigger: 0x%08x\n", hres); + ok(hres == S_OK, "Failed to set trigger: 0x%08lx\n", hres); memset(&trigger_state, 0xcf, sizeof(trigger_state)); trigger_state.cbTriggerSize = sizeof(trigger_state); hres = ITaskTrigger_GetTrigger(test_trigger, &trigger_state); - ok(hres == S_OK, "Expected S_OK: 0x%08x\n", hres); + ok(hres == S_OK, "Expected S_OK: 0x%08lx\n", hres); ok(trigger_state.wRandomMinutesInterval == 0, "wRandomMinutesInterval should be set to zero\n"); normal_trigger_state.wRandomMinutesInterval = 0; @@ -337,7 +337,7 @@ static void test_SetTrigger_GetTrigger(void) /* Test GetTrigger using invalid cbTriggerSiz in pTrigger. In * contrast to available documentation, this succeeds in practice. */ hres = ITaskTrigger_SetTrigger(test_trigger, &normal_trigger_state); - ok(hres == S_OK, "Failed to set trigger: 0x%08x\n", hres); + ok(hres == S_OK, "Failed to set trigger: 0x%08lx\n", hres); memset(&trigger_state, 0xcf, sizeof(trigger_state)); trigger_state.cbTriggerSize = sizeof(trigger_state) - 1; hres = ITaskTrigger_GetTrigger(test_trigger, &trigger_state); @@ -366,60 +366,60 @@ static void test_task_trigger(void) hr = ITaskScheduler_NewWorkItem(test_task_scheduler, task_name, &CLSID_CTask, &IID_ITask, (IUnknown **)&task); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); count = 0xdead; hr = ITask_GetTriggerCount(task, &count); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(count == 0, "got %u\n", count); hr = ITask_DeleteTrigger(task, 0); - ok(hr == SCHED_E_TRIGGER_NOT_FOUND, "got %#x\n", hr); + ok(hr == SCHED_E_TRIGGER_NOT_FOUND, "got %#lx\n", hr); hr = ITask_GetTrigger(task, 0, &trigger); - ok(hr == SCHED_E_TRIGGER_NOT_FOUND, "got %#x\n", hr); + ok(hr == SCHED_E_TRIGGER_NOT_FOUND, "got %#lx\n", hr); idx = 0xdead; hr = ITask_CreateTrigger(task, &idx, &trigger); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(idx == 0, "got %u\n", idx); hr = ITask_GetTrigger(task, 0, &trigger2); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(trigger != trigger2, "%p != %p\n", trigger, trigger2); ref = ITaskTrigger_Release(trigger2); - ok(ref == 0, "got %u\n", ref); + ok(ref == 0, "got %lu\n", ref); ref = ITaskTrigger_Release(trigger); - ok(ref == 0, "got %u\n", ref); + ok(ref == 0, "got %lu\n", ref); count = 0xdead; hr = ITask_GetTriggerCount(task, &count); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(count == 1, "got %u\n", count); hr = ITask_DeleteTrigger(task, 0); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); idx = 0xdead; hr = ITask_CreateTrigger(task, &idx, &trigger); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(idx == 0, "got %u\n", idx); hr = ITask_DeleteTrigger(task, 0); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); count = 0xdead; hr = ITask_GetTriggerCount(task, &count); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(count == 0, "got %u\n", count); ref = ITaskTrigger_Release(trigger); - ok(ref == 0, "got %u\n", ref); + ok(ref == 0, "got %lu\n", ref); ref = ITask_Release(task); - ok(ref == 0, "got %u\n", ref); + ok(ref == 0, "got %lu\n", ref); } static void time_add_ms(SYSTEMTIME *st, DWORD ms) @@ -435,11 +435,11 @@ static void time_add_ms(SYSTEMTIME *st, DWORD ms) st->wDay, st->wMonth, st->wYear, st->wDayOfWeek, st->wHour, st->wMinute, st->wSecond, st->wMilliseconds); ret = SystemTimeToFileTime(st, &ftll.ft); - ok(ret, "SystemTimeToFileTime error %u\n", GetLastError()); + ok(ret, "SystemTimeToFileTime error %lu\n", GetLastError()); ftll.ll += ms * (ULONGLONG)10000; ret = FileTimeToSystemTime(&ftll.ft, st); - ok(ret, "FileTimeToSystemTime error %u\n", GetLastError()); + ok(ret, "FileTimeToSystemTime error %lu\n", GetLastError()); trace("new: %u/%u/%u wday %u %u:%02u:%02u.%03u\n", st->wDay, st->wMonth, st->wYear, st->wDayOfWeek, st->wHour, st->wMinute, st->wSecond, st->wMilliseconds); @@ -482,37 +482,37 @@ static void test_GetNextRunTime(void) hr = ITaskScheduler_NewWorkItem(test_task_scheduler, task_name, &CLSID_CTask, &IID_ITask, (IUnknown **)&task); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); 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); + ok(hr == S_OK, "got %#lx\n", hr); memset(&st, 0xff, sizeof(st)); hr = ITask_GetNextRunTime(task, &st); - ok(hr == SCHED_S_TASK_DISABLED, "got %#x\n", hr); + ok(hr == SCHED_S_TASK_DISABLED, "got %#lx\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); + ok(hr == S_OK, "got %#lx\n", hr); memset(&st, 0xff, sizeof(st)); hr = ITask_GetNextRunTime(task, &st); - ok(hr == SCHED_S_TASK_NO_VALID_TRIGGERS, "got %#x\n", hr); + ok(hr == SCHED_S_TASK_NO_VALID_TRIGGERS, "got %#lx\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_CreateTrigger(task, &idx, &trigger); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); memset(&st, 0xff, sizeof(st)); hr = ITask_GetNextRunTime(task, &st); - ok(hr == SCHED_S_TASK_NO_VALID_TRIGGERS, "got %#x\n", hr); + ok(hr == SCHED_S_TASK_NO_VALID_TRIGGERS, "got %#lx\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); @@ -520,17 +520,17 @@ static void test_GetNextRunTime(void) /* TASK_TIME_TRIGGER_ONCE */ hr = ITaskTrigger_GetTrigger(trigger, &data); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); data.rgFlags &= ~TASK_TRIGGER_FLAG_DISABLED; data.TriggerType = TASK_TIME_TRIGGER_ONCE; /* add 5 minutes to avoid races */ trigger_add_ms(&data, 5 * 60 * 1000, &cmp); hr = ITaskTrigger_SetTrigger(trigger, &data); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); memset(&st, 0xff, sizeof(st)); hr = ITask_GetNextRunTime(task, &st); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\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); @@ -538,16 +538,16 @@ static void test_GetNextRunTime(void) /* TASK_TIME_TRIGGER_DAILY */ hr = ITaskTrigger_GetTrigger(trigger, &data); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); data.rgFlags &= ~TASK_TRIGGER_FLAG_DISABLED; data.TriggerType = TASK_TIME_TRIGGER_DAILY; data.Type.Daily.DaysInterval = 1; hr = ITaskTrigger_SetTrigger(trigger, &data); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); memset(&st, 0xff, sizeof(st)); hr = ITask_GetNextRunTime(task, &st); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\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); @@ -555,7 +555,7 @@ static void test_GetNextRunTime(void) /* TASK_TIME_TRIGGER_WEEKLY */ hr = ITaskTrigger_GetTrigger(trigger, &data); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); data.rgFlags &= ~TASK_TRIGGER_FLAG_DISABLED; data.TriggerType = TASK_TIME_TRIGGER_WEEKLY; data.Type.Weekly.WeeksInterval = 1; @@ -564,11 +564,11 @@ static void test_GetNextRunTime(void) /* bits: TASK_SUNDAY = 1, TASK_MONDAY = 2, TASK_TUESDAY = 4, etc. */ data.Type.Weekly.rgfDaysOfTheWeek = 1 << cmp.wDayOfWeek; /* wDayOfWeek is 0 based */ hr = ITaskTrigger_SetTrigger(trigger, &data); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); memset(&st, 0xff, sizeof(st)); hr = ITask_GetNextRunTime(task, &st); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\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); @@ -581,7 +581,7 @@ static void test_GetNextRunTime(void) idx = 0xdead; hr = ITask_CreateTrigger(task, &idx, &trigger); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(idx == 1, "got %u\n", idx); /* TASK_EVENT_TRIGGER_ON_IDLE = 5 @@ -591,15 +591,15 @@ static void test_GetNextRunTime(void) for (i = 5; i <= 7; i++) { hr = ITaskTrigger_GetTrigger(trigger, &data); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); data.rgFlags &= ~TASK_TRIGGER_FLAG_DISABLED; data.TriggerType = i; hr = ITaskTrigger_SetTrigger(trigger, &data); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); memset(&st, 0xff, sizeof(st)); hr = ITask_GetNextRunTime(task, &st); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\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); @@ -608,23 +608,23 @@ static void test_GetNextRunTime(void) ITaskTrigger_Release(trigger); hr = ITask_DeleteTrigger(task, 0); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); hr = ITask_GetTrigger(task, 0, &trigger); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); for (i = 5; i <= 7; i++) { hr = ITaskTrigger_GetTrigger(trigger, &data); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); data.rgFlags &= ~TASK_TRIGGER_FLAG_DISABLED; data.TriggerType = i; hr = ITaskTrigger_SetTrigger(trigger, &data); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); memset(&st, 0xff, sizeof(st)); hr = ITask_GetNextRunTime(task, &st); - ok(hr == SCHED_S_EVENT_TRIGGER, "got %#x\n", hr); + ok(hr == SCHED_S_EVENT_TRIGGER, "got %#lx\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); @@ -661,111 +661,111 @@ static void test_trigger_manager(void) hr = ITaskScheduler_NewWorkItem(test_task_scheduler, task_name, &CLSID_CTask, &IID_ITask, (IUnknown **)&task); - ok(hr == S_OK, "got %#x\n", hr); - ok(obj_refcount(task) == 1, "got %u\n", obj_refcount(task)); + ok(hr == S_OK, "got %#lx\n", hr); + ok(obj_refcount(task) == 1, "got %lu\n", obj_refcount(task)); count = 0xdead; hr = ITask_GetTriggerCount(task, &count); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(count == 0, "got %u\n", count); idx = 0xdead; hr = ITask_CreateTrigger(task, &idx, &trigger0); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(idx == 0, "got %u\n", idx); - ok(obj_refcount(task) == 2, "got %u\n", obj_refcount(task)); + ok(obj_refcount(task) == 2, "got %lu\n", obj_refcount(task)); idx = 0xdead; hr = ITask_CreateTrigger(task, &idx, &trigger1); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(idx == 1, "got %u\n", idx); - ok(obj_refcount(task) == 3, "got %u\n", obj_refcount(task)); + ok(obj_refcount(task) == 3, "got %lu\n", obj_refcount(task)); count = 0xdead; hr = ITask_GetTriggerCount(task, &count); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(count == 2, "got %u\n", count); hr = ITaskTrigger_GetTrigger(trigger0, &state0); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); state0.wBeginYear = 3000; state0.rgFlags = 0; state0.TriggerType = TASK_TIME_TRIGGER_ONCE; hr = ITaskTrigger_SetTrigger(trigger0, &state0); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); hr = get_task_trigger(task, 0, &state); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(state.wBeginYear == 3000, "got %u\n", state.wBeginYear); ok(state.TriggerType == TASK_TIME_TRIGGER_ONCE, "got %u\n", state.TriggerType); hr = ITaskTrigger_GetTrigger(trigger1, &state1); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); state1.wBeginYear = 2000; state1.rgFlags = 0; state1.TriggerType = TASK_TIME_TRIGGER_DAILY; hr = ITaskTrigger_SetTrigger(trigger1, &state1); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); hr = get_task_trigger(task, 1, &state); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(state.wBeginYear == 2000, "got %u\n", state.wBeginYear); ok(state.TriggerType == TASK_TIME_TRIGGER_DAILY, "got %u\n", state.TriggerType); ref = ITaskTrigger_Release(trigger0); - ok(ref == 0, "got %u\n", ref); + ok(ref == 0, "got %lu\n", ref); ref = ITaskTrigger_Release(trigger1); - ok(ref == 0, "got %u\n", ref); + ok(ref == 0, "got %lu\n", ref); - ok(obj_refcount(task) == 1, "got %u\n", obj_refcount(task)); + ok(obj_refcount(task) == 1, "got %lu\n", obj_refcount(task)); hr = get_task_trigger(task, 0, &state); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(state.wBeginYear == 3000, "got %u\n", state.wBeginYear); ok(state.TriggerType == TASK_TIME_TRIGGER_ONCE, "got %u\n", state.TriggerType); hr = get_task_trigger(task, 1, &state); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(state.wBeginYear == 2000, "got %u\n", state.wBeginYear); ok(state.TriggerType == TASK_TIME_TRIGGER_DAILY, "got %u\n", state.TriggerType); hr = ITask_GetTrigger(task, 0, &trigger0); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); hr = ITask_GetTrigger(task, 1, &trigger1); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); hr = ITask_DeleteTrigger(task, 0); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); hr = get_task_trigger(task, 0, &state); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(state.wBeginYear == 2000, "got %u\n", state.wBeginYear); ok(state.TriggerType == TASK_TIME_TRIGGER_DAILY, "got %u\n", state.TriggerType); hr = get_task_trigger(task, 1, &state); - ok(hr == SCHED_E_TRIGGER_NOT_FOUND, "got %#x\n", hr); + ok(hr == SCHED_E_TRIGGER_NOT_FOUND, "got %#lx\n", hr); hr = ITaskTrigger_SetTrigger(trigger0, &state0); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); hr = ITaskTrigger_SetTrigger(trigger1, &state1); - ok(hr == E_FAIL, "got %#x\n", hr); + ok(hr == E_FAIL, "got %#lx\n", hr); count = 0xdead; hr = ITask_GetTriggerCount(task, &count); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(count == 1, "got %u\n", count); - ok(obj_refcount(task) == 3, "got %u\n", obj_refcount(task)); + ok(obj_refcount(task) == 3, "got %lu\n", obj_refcount(task)); ref = ITaskTrigger_Release(trigger0); - ok(ref == 0, "got %u\n", ref); + ok(ref == 0, "got %lu\n", ref); ref = ITaskTrigger_Release(trigger1); - ok(ref == 0, "got %u\n", ref); + ok(ref == 0, "got %lu\n", ref); ref = ITask_Release(task); - ok(ref == 0, "got %u\n", ref); + ok(ref == 0, "got %lu\n", ref); } START_TEST(task_trigger) @@ -776,7 +776,7 @@ START_TEST(task_trigger) hr = CoCreateInstance(&CLSID_CTaskScheduler, NULL, CLSCTX_INPROC_SERVER, &IID_ITaskScheduler, (void **)&test_task_scheduler); - ok(hr == S_OK, "error creating TaskScheduler instance %#x\n", hr); + ok(hr == S_OK, "error creating TaskScheduler instance %#lx\n", hr); test_SetTrigger_GetTrigger(); test_task_trigger();

March 1, 2022