[PATCH v2 1/3] sechost: Update return codes for ControlTraceA and W
This lets programs know tracing is not available. Signed-off-by: David Koolhoven <david(a)koolhoven-home.net> --- dlls/sechost/trace.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/sechost/trace.c b/dlls/sechost/trace.c index 01733690ac8..8f8c316a353 100644 --- a/dlls/sechost/trace.c +++ b/dlls/sechost/trace.c @@ -37,7 +37,7 @@ ULONG WINAPI ControlTraceA( TRACEHANDLE handle, const char *session, EVENT_TRACE_PROPERTIES *properties, ULONG control ) { FIXME("(%s, %s, %p, %d) stub\n", wine_dbgstr_longlong(handle), debugstr_a(session), properties, control); - return ERROR_SUCCESS; + return ERROR_WMI_INSTANCE_NOT_FOUND; } /****************************************************************************** @@ -47,7 +47,7 @@ ULONG WINAPI ControlTraceW( TRACEHANDLE handle, const WCHAR *session, EVENT_TRACE_PROPERTIES *properties, ULONG control ) { FIXME("(%s, %s, %p, %d) stub\n", wine_dbgstr_longlong(handle), debugstr_w(session), properties, control); - return ERROR_SUCCESS; + return ERROR_WMI_INSTANCE_NOT_FOUND; } /****************************************************************************** -- 2.19.1
Consolidates calls which currently can only give a single return code. Signed-off-by: David Koolhoven <david(a)koolhoven-home.net> --- dlls/advapi32/eventlog.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index c01955e22d5..f651aa33bae 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -678,8 +678,7 @@ ULONG WINAPI StopTraceA( TRACEHANDLE session, LPCSTR session_name, PEVENT_TRACE_ */ ULONG WINAPI QueryTraceW( TRACEHANDLE handle, LPCWSTR sessionname, PEVENT_TRACE_PROPERTIES properties ) { - FIXME("%s %s %p: stub\n", wine_dbgstr_longlong(handle), debugstr_w(sessionname), properties); - return ERROR_CALL_NOT_IMPLEMENTED; + return ControlTraceW( hSession, SessionName, Properties, EVENT_TRACE_CONTROL_FLUSH ); } /****************************************************************************** -- 2.19.1
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=89381 Your paranoid android. === debiant2 (build log) === ../wine/dlls/advapi32/eventlog.c:690:27: error: ‘hSession’ undeclared (first use in this function) ../wine/dlls/advapi32/eventlog.c:690:37: error: ‘SessionName’ undeclared (first use in this function); did you mean ‘sessionname’? ../wine/dlls/advapi32/eventlog.c:690:50: error: ‘Properties’ undeclared (first use in this function); did you mean ‘properties’? Task: The win32 Wine build failed === debiant2 (build log) === ../wine/dlls/advapi32/eventlog.c:690:27: error: ‘hSession’ undeclared (first use in this function) ../wine/dlls/advapi32/eventlog.c:690:37: error: ‘SessionName’ undeclared (first use in this function); did you mean ‘sessionname’? ../wine/dlls/advapi32/eventlog.c:690:50: error: ‘Properties’ undeclared (first use in this function); did you mean ‘properties’? Task: The wow64 Wine build failed
This introduces QueryTraceA() for programs that need it. Signed-off-by: David Koolhoven <david(a)koolhoven-home.net> --- dlls/advapi32/advapi32.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index d5235c6adb9..1b7a83d347a 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -603,7 +603,7 @@ @ stdcall -import QueryServiceObjectSecurity(long long ptr long ptr) @ stdcall -import QueryServiceStatus(long ptr) @ stdcall -import QueryServiceStatusEx (long long ptr long ptr) -# @ stub QueryTraceA +@ stdcall QueryTraceA(int64 str ptr) @ stdcall QueryTraceW(int64 wstr ptr) # @ stub QueryUserServiceName # @ stub QueryUsersOnEncryptedFile -- 2.19.1
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=89382 Your paranoid android. === debiant2 (build log) === error: patch failed: dlls/advapi32/advapi32.spec:603 Task: Patch failed to apply === debiant2 (build log) === error: patch failed: dlls/advapi32/advapi32.spec:603 Task: Patch failed to apply
participants (2)
-
David Koolhoven -
Marvin