Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit f88e2ba

Browse filesBrowse files
Skycoder42Skycoder42
committed
.
1 parent 029e1b4 commit f88e2ba
Copy full SHA for f88e2ba

File tree

2 files changed

+50
-50
lines changed
Filter options

2 files changed

+50
-50
lines changed

‎src/plugins/servicebackends/windows/windowsservicebackend.cpp

Copy file name to clipboardExpand all lines: src/plugins/servicebackends/windows/windowsservicebackend.cpp
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,9 +214,9 @@ void WindowsServiceBackend::serviceMain(DWORD dwArgc, wchar_t **lpszArgv)
214214

215215
qInfo() << Q_FUNC_INFO << "registering service";
216216
_backendInstance->_statusHandle = RegisterServiceCtrlHandlerW(SVCNAME, WindowsServiceBackend::handler);
217-
if (_backendInstance->_statusHandle) {
217+
if (!_backendInstance->_statusHandle) {
218218
qCCritical(logBackend) << "Failed to acquire service handle with error:"
219-
<< qUtf8Printable(qt_error_string(GetLastError()));
219+
<< qUtf8Printable(qt_error_string(GetLastError()));
220220
return;
221221
}
222222
_backendInstance->setStatus(SERVICE_START_PENDING);

‎tests/auto/service/TestWindowsService/tst_windowsservice.cpp

Copy file name to clipboardExpand all lines: tests/auto/service/TestWindowsService/tst_windowsservice.cpp
+48-48Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -113,54 +113,54 @@ void TestWindowsService::init()
113113
}
114114
QVERIFY(svcDir.cdUp());
115115

116-
{
117-
// try ldd to check deps
118-
QProcess ldd;
119-
ldd.setProgram(QStringLiteral("ldd")); // should be in path
120-
ldd.setArguments(QStringList{
121-
svcName
122-
});
123-
ldd.setWorkingDirectory(svcDir.absolutePath());
124-
ldd.setProcessChannelMode(QProcess::MergedChannels);
125-
ldd.start();
126-
QVERIFY2(ldd.waitForFinished(), qUtf8Printable(ldd.errorString()));
127-
qInfo() << "ldd output:\n" << ldd.readAll().constData();
128-
QVERIFY2(ldd.exitStatus() == QProcess::NormalExit, qUtf8Printable(ldd.errorString()));
129-
QCOMPARE(ldd.exitCode(), EXIT_SUCCESS);
130-
}
131-
132-
{
133-
// list files recursively
134-
QDirIterator lIter{
135-
_svcDir.path(),
136-
QDir::NoDotAndDotDot | QDir::AllEntries | QDir::Hidden | QDir::System | QDir::CaseSensitive,
137-
QDirIterator::Subdirectories
138-
};
139-
while (lIter.hasNext())
140-
qDebug() << lIter.next();
141-
}
142-
143-
{
144-
// test normal service run
145-
QProcess testP;
146-
testP.setProgram(svcDir.absoluteFilePath(svcName));
147-
testP.setArguments({QStringLiteral("--backend"), QStringLiteral("windows")});
148-
testP.setWorkingDirectory(svcDir.absolutePath());
149-
testP.setProcessChannelMode(QProcess::MergedChannels);
150-
auto env = QProcessEnvironment::systemEnvironment();
151-
env.remove(QStringLiteral("PATH"));
152-
env.remove(QStringLiteral("QT_PLUGIN_PATH"));
153-
env.remove(QStringLiteral("QML2_IMPORT_PATH"));
154-
env.remove(QStringLiteral("QT_PLUGIN_PATH"));
155-
testP.setProcessEnvironment(env);
156-
testP.start();
157-
QVERIFY2(testP.waitForStarted(), qUtf8Printable(testP.errorString()));
158-
QThread::sleep(5);
159-
testP.kill();
160-
qDebug() << testP.exitCode() << testP.readAll();
161-
QVERIFY2(testP.waitForFinished(), qUtf8Printable(testP.errorString()));
162-
qDebug() << testP.exitCode() << testP.readAll().constData();
163-
}
116+
// {
117+
// // try ldd to check deps
118+
// QProcess ldd;
119+
// ldd.setProgram(QStringLiteral("ldd")); // should be in path
120+
// ldd.setArguments(QStringList{
121+
// svcName
122+
// });
123+
// ldd.setWorkingDirectory(svcDir.absolutePath());
124+
// ldd.setProcessChannelMode(QProcess::MergedChannels);
125+
// ldd.start();
126+
// QVERIFY2(ldd.waitForFinished(), qUtf8Printable(ldd.errorString()));
127+
// qInfo() << "ldd output:\n" << ldd.readAll().constData();
128+
// QVERIFY2(ldd.exitStatus() == QProcess::NormalExit, qUtf8Printable(ldd.errorString()));
129+
// QCOMPARE(ldd.exitCode(), EXIT_SUCCESS);
130+
// }
131+
132+
// {
133+
// // list files recursively
134+
// QDirIterator lIter{
135+
// _svcDir.path(),
136+
// QDir::NoDotAndDotDot | QDir::AllEntries | QDir::Hidden | QDir::System | QDir::CaseSensitive,
137+
// QDirIterator::Subdirectories
138+
// };
139+
// while (lIter.hasNext())
140+
// qDebug() << lIter.next();
141+
// }
142+
143+
// {
144+
// // test normal service run
145+
// QProcess testP;
146+
// testP.setProgram(svcDir.absoluteFilePath(svcName));
147+
// testP.setArguments({QStringLiteral("--backend"), QStringLiteral("windows")});
148+
// testP.setWorkingDirectory(svcDir.absolutePath());
149+
// testP.setProcessChannelMode(QProcess::MergedChannels);
150+
// auto env = QProcessEnvironment::systemEnvironment();
151+
// env.remove(QStringLiteral("PATH"));
152+
// env.remove(QStringLiteral("QT_PLUGIN_PATH"));
153+
// env.remove(QStringLiteral("QML2_IMPORT_PATH"));
154+
// env.remove(QStringLiteral("QT_PLUGIN_PATH"));
155+
// testP.setProcessEnvironment(env);
156+
// testP.start();
157+
// QVERIFY2(testP.waitForStarted(), qUtf8Printable(testP.errorString()));
158+
// QThread::sleep(5);
159+
// testP.kill();
160+
// qDebug() << testP.exitCode() << testP.readAll();
161+
// QVERIFY2(testP.waitForFinished(), qUtf8Printable(testP.errorString()));
162+
// qDebug() << testP.exitCode() << testP.readAll().constData();
163+
// }
164164

165165
_manager = OpenSCManagerW(nullptr, nullptr,
166166
SC_MANAGER_CONNECT | SC_MANAGER_CREATE_SERVICE | STANDARD_RIGHTS_REQUIRED);

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.