aboutsummaryrefslogtreecommitdiff
path: root/src/ca/netshortcuts.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/ca/netshortcuts.cpp')
-rw-r--r--src/ca/netshortcuts.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/ca/netshortcuts.cpp b/src/ca/netshortcuts.cpp
index 59ef838b..6ff129db 100644
--- a/src/ca/netshortcuts.cpp
+++ b/src/ca/netshortcuts.cpp
@@ -4,7 +4,7 @@
4 4
5LPCWSTR vcsShortcutsQuery = 5LPCWSTR vcsShortcutsQuery =
6 L"SELECT `Component_`, `Directory_`, `Name`, `Target`, `Attributes`, `IconFile`, `IconIndex` " 6 L"SELECT `Component_`, `Directory_`, `Name`, `Target`, `Attributes`, `IconFile`, `IconIndex` "
7 L"FROM `WixInternetShortcut`"; 7 L"FROM `Wix4InternetShortcut`";
8enum eShortcutsQuery { esqComponent = 1, esqDirectory, esqFilename, esqTarget, esqAttributes, esqIconFile, esqIconIndex }; 8enum eShortcutsQuery { esqComponent = 1, esqDirectory, esqFilename, esqTarget, esqAttributes, esqIconFile, esqIconIndex };
9enum eShortcutsAttributes { esaLink = 0, esaURL = 1 }; 9enum eShortcutsAttributes { esaLink = 0, esaURL = 1 };
10 10
@@ -44,9 +44,9 @@ extern "C" UINT __stdcall WixSchedInternetShortcuts(
44 ExitOnFailure(hr, "failed to initialize WixSchedInternetShortcuts."); 44 ExitOnFailure(hr, "failed to initialize WixSchedInternetShortcuts.");
45 45
46 // anything to do? 46 // anything to do?
47 if (S_OK != WcaTableExists(L"WixInternetShortcut")) 47 if (S_OK != WcaTableExists(L"Wix4InternetShortcut"))
48 { 48 {
49 WcaLog(LOGMSG_STANDARD, "WixInternetShortcut table doesn't exist, so there are no Internet shortcuts to process"); 49 WcaLog(LOGMSG_STANDARD, "Wix4InternetShortcut table doesn't exist, so there are no Internet shortcuts to process");
50 goto LExit; 50 goto LExit;
51 } 51 }
52 52
@@ -71,7 +71,7 @@ extern "C" UINT __stdcall WixSchedInternetShortcuts(
71 71
72 // query and loop through all the shortcuts 72 // query and loop through all the shortcuts
73 hr = WcaOpenExecuteView(vcsShortcutsQuery, &hView); 73 hr = WcaOpenExecuteView(vcsShortcutsQuery, &hView);
74 ExitOnFailure(hr, "failed to open view on WixInternetShortcut table"); 74 ExitOnFailure(hr, "failed to open view on Wix4InternetShortcut table");
75 75
76 while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) 76 while (S_OK == (hr = WcaFetchRecord(hView, &hRec)))
77 { 77 {
@@ -91,7 +91,7 @@ extern "C" UINT __stdcall WixSchedInternetShortcuts(
91 hr = WcaGetRecordInteger(hRec, esqIconIndex, &iIconIndex); 91 hr = WcaGetRecordInteger(hRec, esqIconIndex, &iIconIndex);
92 ExitOnFailure(hr, "failed to get shortcut icon index"); 92 ExitOnFailure(hr, "failed to get shortcut icon index");
93 93
94 // skip processing this WixInternetShortcut row if the component isn't being configured 94 // skip processing this Wix4InternetShortcut row if the component isn't being configured
95 WCA_TODO todo = WcaGetComponentToDo(pwzComponent); 95 WCA_TODO todo = WcaGetComponentToDo(pwzComponent);
96 if (WCA_TODO_UNKNOWN == todo) 96 if (WCA_TODO_UNKNOWN == todo)
97 { 97 {
@@ -144,7 +144,7 @@ extern "C" UINT __stdcall WixSchedInternetShortcuts(
144 { 144 {
145 hr = S_OK; 145 hr = S_OK;
146 } 146 }
147 ExitOnFailure(hr, "Failure occured while processing WixInternetShortcut table"); 147 ExitOnFailure(hr, "Failure occured while processing Wix4InternetShortcut table");
148 148
149 // if we have any shortcuts to install 149 // if we have any shortcuts to install
150 if (pwzCustomActionData && *pwzCustomActionData) 150 if (pwzCustomActionData && *pwzCustomActionData)
@@ -154,9 +154,9 @@ extern "C" UINT __stdcall WixSchedInternetShortcuts(
154 ExitOnFailure(hr, "failed to extend progress bar for InternetShortcuts"); 154 ExitOnFailure(hr, "failed to extend progress bar for InternetShortcuts");
155 155
156 // provide custom action data to deferred and rollback CAs 156 // provide custom action data to deferred and rollback CAs
157 hr = WcaSetProperty(PLATFORM_DECORATION(L"WixRollbackInternetShortcuts"), pwzCustomActionData); 157 hr = WcaSetProperty(CUSTOM_ACTION_DECORATION(L"RollbackInternetShortcuts"), pwzCustomActionData);
158 ExitOnFailure(hr, "failed to set WixRollbackInternetShortcuts rollback custom action data"); 158 ExitOnFailure(hr, "failed to set WixRollbackInternetShortcuts rollback custom action data");
159 hr = WcaSetProperty(PLATFORM_DECORATION(L"WixCreateInternetShortcuts"), pwzCustomActionData); 159 hr = WcaSetProperty(CUSTOM_ACTION_DECORATION(L"CreateInternetShortcuts"), pwzCustomActionData);
160 ExitOnFailure(hr, "failed to set WixCreateInternetShortcuts custom action data"); 160 ExitOnFailure(hr, "failed to set WixCreateInternetShortcuts custom action data");
161 } 161 }
162 162