aboutsummaryrefslogtreecommitdiff
path: root/src/ext/Sql/ca/scauser.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/ext/Sql/ca/scauser.cpp')
-rw-r--r--src/ext/Sql/ca/scauser.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/ext/Sql/ca/scauser.cpp b/src/ext/Sql/ca/scauser.cpp
index 4d74e4d4..ce8a0d7f 100644
--- a/src/ext/Sql/ca/scauser.cpp
+++ b/src/ext/Sql/ca/scauser.cpp
@@ -2,7 +2,7 @@
2 2
3#include "precomp.h" 3#include "precomp.h"
4 4
5LPCWSTR vcsUserQuery = L"SELECT `User`, `Component_`, `Name`, `Domain`, `Password` FROM `User` WHERE `User`=?"; 5LPCWSTR vcsUserQuery = L"SELECT `User`, `Component_`, `Name`, `Domain`, `Password` FROM `Wix4User` WHERE `User`=?";
6enum eUserQuery { vuqUser = 1, vuqComponent, vuqName, vuqDomain, vuqPassword }; 6enum eUserQuery { vuqUser = 1, vuqComponent, vuqName, vuqDomain, vuqPassword };
7 7
8 8
@@ -41,33 +41,33 @@ HRESULT __stdcall ScaGetUser(
41 if (S_OK == hr) 41 if (S_OK == hr)
42 { 42 {
43 hr = WcaGetRecordString(hRec, vuqUser, &pwzData); 43 hr = WcaGetRecordString(hRec, vuqUser, &pwzData);
44 ExitOnFailure(hr, "Failed to get User.User"); 44 ExitOnFailure(hr, "Failed to get Wix4User.User");
45 hr = ::StringCchCopyW(pscau->wzKey, countof(pscau->wzKey), pwzData); 45 hr = ::StringCchCopyW(pscau->wzKey, countof(pscau->wzKey), pwzData);
46 ExitOnFailure(hr, "Failed to copy key string to user object"); 46 ExitOnFailure(hr, "Failed to copy key string to user object");
47 47
48 hr = WcaGetRecordString(hRec, vuqComponent, &pwzData); 48 hr = WcaGetRecordString(hRec, vuqComponent, &pwzData);
49 ExitOnFailure(hr, "Failed to get User.Component_"); 49 ExitOnFailure(hr, "Failed to get Wix4User.Component_");
50 hr = ::StringCchCopyW(pscau->wzComponent, countof(pscau->wzComponent), pwzData); 50 hr = ::StringCchCopyW(pscau->wzComponent, countof(pscau->wzComponent), pwzData);
51 ExitOnFailure(hr, "Failed to copy component string to user object"); 51 ExitOnFailure(hr, "Failed to copy component string to user object");
52 52
53 hr = WcaGetRecordFormattedString(hRec, vuqName, &pwzData); 53 hr = WcaGetRecordFormattedString(hRec, vuqName, &pwzData);
54 ExitOnFailure(hr, "Failed to get User.Name"); 54 ExitOnFailure(hr, "Failed to get Wix4User.Name");
55 hr = ::StringCchCopyW(pscau->wzName, countof(pscau->wzName), pwzData); 55 hr = ::StringCchCopyW(pscau->wzName, countof(pscau->wzName), pwzData);
56 ExitOnFailure(hr, "Failed to copy name string to user object"); 56 ExitOnFailure(hr, "Failed to copy name string to user object");
57 57
58 hr = WcaGetRecordFormattedString(hRec, vuqDomain, &pwzData); 58 hr = WcaGetRecordFormattedString(hRec, vuqDomain, &pwzData);
59 ExitOnFailure(hr, "Failed to get User.Domain"); 59 ExitOnFailure(hr, "Failed to get Wix4User.Domain");
60 hr = ::StringCchCopyW(pscau->wzDomain, countof(pscau->wzDomain), pwzData); 60 hr = ::StringCchCopyW(pscau->wzDomain, countof(pscau->wzDomain), pwzData);
61 ExitOnFailure(hr, "Failed to copy domain string to user object"); 61 ExitOnFailure(hr, "Failed to copy domain string to user object");
62 62
63 hr = WcaGetRecordFormattedString(hRec, vuqPassword, &pwzData); 63 hr = WcaGetRecordFormattedString(hRec, vuqPassword, &pwzData);
64 ExitOnFailure(hr, "Failed to get User.Password"); 64 ExitOnFailure(hr, "Failed to get Wix4User.Password");
65 hr = ::StringCchCopyW(pscau->wzPassword, countof(pscau->wzPassword), pwzData); 65 hr = ::StringCchCopyW(pscau->wzPassword, countof(pscau->wzPassword), pwzData);
66 ExitOnFailure(hr, "Failed to copy password string to user object"); 66 ExitOnFailure(hr, "Failed to copy password string to user object");
67 } 67 }
68 else if (E_NOMOREITEMS == hr) 68 else if (E_NOMOREITEMS == hr)
69 { 69 {
70 WcaLog(LOGMSG_STANDARD, "Error: Cannot locate User.User='%ls'", wzUser); 70 WcaLog(LOGMSG_STANDARD, "Error: Cannot locate Wix4User.User='%ls'", wzUser);
71 hr = E_FAIL; 71 hr = E_FAIL;
72 } 72 }
73 else 73 else