Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Single-threaded asynchronous svrplus #198

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Open

Single-threaded asynchronous svrplus #198

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
6ce7447
[svrplus] remove unused arg from TryInstallServer
DankRank Oct 19, 2019
b557ed4
[svrplus] add message loop
DankRank Oct 19, 2019
36bac03
[svrplus] add object wait functionality to msg loop
DankRank Oct 20, 2019
2144f61
[svrplus] TryInstallServer only deals with error messages
DankRank Oct 20, 2019
12818e8
[svrplus] split InstallServer
DankRank Oct 20, 2019
abcf2d5
[svrplus] split ThreadProc at sync points
DankRank Oct 20, 2019
51b6265
[svrplus] get rid of the worker thread
DankRank Oct 20, 2019
24f7cce
[svrplus] get rid of WM_APP_ENDTASK
DankRank Oct 20, 2019
c7d8fa9
[svrplus] document InstallProc
DankRank Oct 20, 2019
1cd63c6
Merge branch 'master' into svrplus-async
DankRank Jan 17, 2020
5beda6c
[svrplus] fix GetMessageObjects getting stuck
DankRank Feb 3, 2021
6853b53
Merge branch 'master' into svrplus-async
DankRank Feb 3, 2021
1e4f778
Merge branch 'master' into svrplus-async
DankRank Aug 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[svrplus] split InstallServer 
Now all blocking code is in ThreadProc
  • Loading branch information
@DankRank
DankRank committed Oct 20, 2019
commit 12818e8838b1bda0953bd2fe2869522e35fa8598
51 changes: 40 additions & 11 deletions src/svrplus/svrplus.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,12 +273,13 @@ typedef enum {
/**
* (Un)installs the COM Server DLL.
*
* @param isUninstall [in] When true, uninstalls the DLL, instead of installing it.
* @param is64 [in] When true, installs 64-bit version.
* @param pErrorCode [out,opt] Additional error code.
* @param isUninstall [in] When true, uninstalls the DLL, instead of installing it.
* @param is64 [in] When true, installs 64-bit version.
* @param pHandle [out,opt] Process handle.
* @param pErrorCode [out,opt] Additional error code.
* @return InstallServerResult
*/
static InstallServerResult InstallServer(bool isUninstall, bool is64, DWORD *pErrorCode)
static InstallServerResult InstallServer(bool isUninstall, bool is64, HANDLE *pHandle, DWORD *pErrorCode)
{
TCHAR regsvr32_path[MAX_PATH];
TCHAR args[14 + MAX_PATH + 4 + 3 + ARRAY_SIZE(str_rp64path)] = _T("regsvr32.exe \"");
Expand All @@ -287,7 +288,6 @@ static InstallServerResult InstallServer(bool isUninstall, bool is64, DWORD *pEr

STARTUPINFO si;
PROCESS_INFORMATION pi;
DWORD status;

// Determine the REGSVR32 path.
int ret = GetSystemDirFilePath(regsvr32_path, ARRAY_SIZE(regsvr32_path), _T("regsvr32.exe"), is64);
Expand Down Expand Up @@ -335,12 +335,32 @@ static InstallServerResult InstallServer(bool isUninstall, bool is64, DWORD *pEr
return ISR_CREATEPROCESS_FAILED;
}

// Wait for the process to exit.
WaitForSingleObject(pi.hProcess, INFINITE);
GetExitCodeProcess(pi.hProcess, &status);
CloseHandle(pi.hProcess);
CloseHandle(pi.hThread);

*pHandle = pi.hProcess;

// The calles should wait for the process to exit.
return ISR_OK;
}

/**
* (Un)installs the COM Server DLL.
*
* @param handle [in] Process handle from InstallServer
* @param pErrorCode [out,opt] Additional error code.
* @return InstallServerResult
*/
static InstallServerResult InstallServerEnd(HANDLE handle, DWORD *pErrorCode)
{
DWORD status;

if (!handle) {
return ISR_FATAL_ERROR;
}

GetExitCodeProcess(handle, &status);
CloseHandle(handle);

switch (status) {
case STILL_ACTIVE:
// Process is still active...
Expand Down Expand Up @@ -456,17 +476,26 @@ static unsigned int WINAPI ThreadProc(LPVOID lpParameter)
TCHAR msg32[256], msg64[256];
InstallServerResult res32 = ISR_OK, res64 = ISR_OK;
DWORD errorCode = 0;
HANDLE hProcess;

ThreadParams *const params = (ThreadParams*)lpParameter;

// Try to (un)install the 64-bit version.
if (g_is64bit) {
res64 = InstallServer(params->isUninstall, true, &errorCode);
res64 = InstallServer(params->isUninstall, true, &hProcess, &errorCode);
if (res64 == ISR_OK) {
WaitForSingleObject(hProcess, INFINITE);
res64 = InstallServerEnd(hProcess, &errorCode);
}
InstallServerErrorMsg(res64, errorCode, params->isUninstall, true, msg64, ARRAY_SIZE(msg64));
}

// Try to (un)install the 32-bit version.
res32 = InstallServer(params->isUninstall, false, &errorCode);
res32 = InstallServer(params->isUninstall, false, &hProcess, &errorCode);
if (res32 == ISR_OK) {
WaitForSingleObject(hProcess, INFINITE);
res32 = InstallServerEnd(hProcess, &errorCode);
}
InstallServerErrorMsg(res32, errorCode, params->isUninstall, false, msg32, ARRAY_SIZE(msg32));

if (res32 == ISR_OK && res64 == ISR_OK) {
Expand Down