TheLanc3/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2026-09-18 10:21:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

refactor(msi): pass the app name to the printer custom actions

Browse Source 
preprocess.py rewrote the CustomActions sources per customer so the printer
carried the app name, which meant the dll was recompiled for every custom
client and, worse, left the app name baked into a compiled binary.

Pass it through CustomActionData instead. Only the printer and its port ever
varied: the INF path and the driver name ship under their stock names and
preprocess.py already forced the driver name back to RustDesk, so a single
build of the dll now serves every custom client.

Both actions treat the name as optional and fall back to the stock name, so a
package built before this still installs and uninstalls its printer.

This also unblocks patching a prebuilt msi template, which cannot work while a
compiled dll contains the app name: replacing a string inside a PE would shift
everything after it.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Q7fBdTwziR5BHTkSz7Tzcm
This commit is contained in:
rustdesk
2026-08-05 20:47:38 +08:00
parent 63f8177132
commit be24391993
5 changed files with 64 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
res/msi/CustomActions/CustomActions.cpp
View File

@@ -1022,6 +1022,7 @@ UINT __stdcall InstallPrinter(
int nResult = 0;
LPWSTR installFolder = NULL;
LPWSTR appName = NULL;
LPWSTR pwz = NULL;
LPWSTR pwzData = NULL;
@@ -1035,11 +1036,21 @@ UINT __stdcall InstallPrinter(
hr = WcaReadStringFromCaData(&pwz, &installFolder);
ExitOnFailure(hr, "failed to read database key from custom action data: %ls", pwz);
// Names the printer. Optional, so that a package built before this was passed in
// still installs, keeping the stock printer name.
if (FAILED(WcaReadStringFromCaData(&pwz, &appName)))
{
ReleaseNullStr(appName);
}
WcaLog(LOGMSG_STANDARD, "Try to install RD printer in : %ls", installFolder);
RemotePrinter::installUpdatePrinter(installFolder);
RemotePrinter::installUpdatePrinter(installFolder, appName ? appName : L"");
WcaLog(LOGMSG_STANDARD, "Install RD printer done");
LExit:
if (appName) {
ReleaseStr(appName);
}
if (pwzData) {
ReleaseStr(pwzData);
}
@@ -1054,14 +1065,36 @@ UINT __stdcall UninstallPrinter(
HRESULT hr = S_OK;
DWORD er = ERROR_SUCCESS;
LPWSTR appName = NULL;
LPWSTR pwz = NULL;
LPWSTR pwzData = NULL;
hr = WcaInitialize(hInstall, "UninstallPrinter");
ExitOnFailure(hr, "Failed to initialize");
// Must match the name install used, otherwise the printer is left behind. Absent
// on packages built before this was passed in, where it was the stock name.
if (SUCCEEDED(WcaGetProperty(L"CustomActionData", &pwzData)))
{
pwz = pwzData;
if (FAILED(WcaReadStringFromCaData(&pwz, &appName)))
{
ReleaseNullStr(appName);
}
}
WcaLog(LOGMSG_STANDARD, "Try to uninstall RD printer");
RemotePrinter::uninstallPrinter();
RemotePrinter::uninstallPrinter(appName ? appName : L"");
WcaLog(LOGMSG_STANDARD, "Uninstall RD printer done");
LExit:
if (appName) {
ReleaseStr(appName);
}
if (pwzData) {
ReleaseStr(pwzData);
}
er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE;
return WcaFinalize(er);
}