Update custom action code for new table names.

author: Bob Arnson <bob@firegiant.com> 2020-10-20 17:09:40 -0400
committer: Bob Arnson <bob@firegiant.com> 2020-10-20 17:11:49 -0400
commit: 2bfd637a14e4460f90107adada95652f28599536 (patch)
tree: c1ea288dfc9b2b76b1ac0a25f89367d052abbb9b /src
parent: 3a7ce8761489aca2f5a93c0c80ace7ef8ba3397f (diff)
download: wix-2bfd637a14e4460f90107adada95652f28599536.tar.gz
wix-2bfd637a14e4460f90107adada95652f28599536.tar.bz2
wix-2bfd637a14e4460f90107adada95652f28599536.zip
1 files changed, 11 insertions, 11 deletions
diff --git a/src/ca/netfxca.cpp b/src/ca/netfxca.cpp
index 15802f2b..3a71babf 100644
--- a/src/ca/netfxca.cpp
+++ b/src/ca/netfxca.cpp
@@ -23,8 +23,8 @@ LPCWSTR vcsFileId =
 enum eFileId { fiFile = 1 };
 LPCWSTR vcsNgenQuery =
-    L"SELECT `NetFxNativeImage`.`File_`, `NetFxNativeImage`.`NetFxNativeImage`, `NetFxNativeImage`.`Priority`, `NetFxNativeImage`.`Attributes`, `NetFxNativeImage`.`File_Application`, `NetFxNativeImage`.`Directory_ApplicationBase`, `File`.`Component_` "
+    L"SELECT `Wix4NetFxNativeImage`.`File_`, `Wix4NetFxNativeImage`.`Wix4NetFxNativeImage`, `Wix4NetFxNativeImage`.`Priority`, `Wix4NetFxNativeImage`.`Attributes`, `Wix4NetFxNativeImage`.`File_Application`, `Wix4NetFxNativeImage`.`Directory_ApplicationBase`, `File`.`Component_` "
-    L"FROM `NetFxNativeImage`, `File` WHERE `File`.`File`=`NetFxNativeImage`.`File_`";
+    L"FROM `Wix4NetFxNativeImage`, `File` WHERE `File`.`File`=`Wix4NetFxNativeImage`.`File_`";
 enum eNgenQuery { ngqFile = 1, ngqId, ngqPriority, ngqAttributes, ngqFileApp, ngqDirAppBase, ngqComponent };
 LPCWSTR vcsNgenGac =
@@ -232,7 +232,7 @@ static HRESULT GetStrongName(
    // get the name value records for this component
    hr = WcaOpenView(vcsNgenStrongName, &hView);
-    ExitOnFailure(hr, "failed to open view on NetFxNativeImage table");
+    ExitOnFailure(hr, "failed to open view on Wix4NetFxNativeImage table");
    hr = WcaExecuteView(hView, hComponentRec);
    ExitOnFailure(hr, "failed to execute strong name view");
@@ -462,17 +462,17 @@ extern "C" UINT __stdcall SchedNetFx(
    // loop through all the NetFx records
    hr = WcaOpenExecuteView(vcsNgenQuery, &hView);
-    ExitOnFailure(hr, "failed to open view on NetFxNativeImage table");
+    ExitOnFailure(hr, "failed to open view on Wix4NetFxNativeImage table");
    while (S_OK == (hr = WcaFetchRecord(hView, &hRec)))
    {
        // Get Id
        hr = WcaGetRecordString(hRec, ngqId, &pwzId);
-        ExitOnFailure(hr, "failed to get NetFxNativeImage.NetFxNativeImage");
+        ExitOnFailure(hr, "failed to get Wix4NetFxNativeImage.Wix4NetFxNativeImage");
        // Get File
        hr = WcaGetRecordString(hRec, ngqFile, &pwzData);
-        ExitOnFailure(hr, "failed to get NetFxNativeImage.File_ for record: %ls", pwzId);
+        ExitOnFailure(hr, "failed to get Wix4NetFxNativeImage.File_ for record: %ls", pwzId);
        hr = StrAllocFormatted(&pwzTemp, vpwzUnformattedQuotedFile, pwzData);
        ExitOnFailure(hr, "failed to format file string for file: %ls", pwzData);
        hr = WcaGetFormattedString(pwzTemp, &pwzFile);
@@ -480,7 +480,7 @@ extern "C" UINT __stdcall SchedNetFx(
        // Get Priority
        hr = WcaGetRecordInteger(hRec, ngqPriority, &iPriority);
-        ExitOnFailure(hr, "failed to get NetFxNativeImage.Priority for record: %ls", pwzId);
+        ExitOnFailure(hr, "failed to get Wix4NetFxNativeImage.Priority for record: %ls", pwzId);
        if (0 == iPriority)
            iAssemblyCost = COST_NGEN_BLOCKING;
@@ -489,11 +489,11 @@ extern "C" UINT __stdcall SchedNetFx(
        // Get Attributes
        hr = WcaGetRecordInteger(hRec, ngqAttributes, &iAttributes);
-        ExitOnFailure(hr, "failed to get NetFxNativeImage.Attributes for record: %ls", pwzId);
+        ExitOnFailure(hr, "failed to get Wix4NetFxNativeImage.Attributes for record: %ls", pwzId);
        // Get File_Application or leave pwzFileApp NULL.
        hr = WcaGetRecordFormattedString(hRec, ngqFileApp, &pwzData);
-        ExitOnFailure(hr, "failed to get NetFxNativeImage.File_Application for record: %ls", pwzId);
+        ExitOnFailure(hr, "failed to get Wix4NetFxNativeImage.File_Application for record: %ls", pwzId);
        // Check if the value resolves to a valid file ID.
        if (S_OK == FileIdExists(pwzData))
@@ -517,7 +517,7 @@ extern "C" UINT __stdcall SchedNetFx(
        // Get Directory_ApplicationBase or leave pwzDirAppBase NULL.
        hr = WcaGetRecordFormattedString(hRec, ngqDirAppBase, &pwzData);
-        ExitOnFailure(hr, "failed to get NetFxNativeImage.Directory_ApplicationBase for record: %ls", pwzId);
+        ExitOnFailure(hr, "failed to get Wix4NetFxNativeImage.Directory_ApplicationBase for record: %ls", pwzId);
        if (WcaIsUnicodePropertySet(pwzData))
        {
@@ -540,7 +540,7 @@ extern "C" UINT __stdcall SchedNetFx(
        // Get Component
        hr = WcaGetRecordString(hRec, ngqComponent, &pwzComponent);
-        ExitOnFailure(hr, "failed to get NetFxNativeImage.Directory_ApplicationBase for record: %ls", pwzId);
+        ExitOnFailure(hr, "failed to get Wix4NetFxNativeImage.Directory_ApplicationBase for record: %ls", pwzId);
        er = ::MsiGetComponentStateW(hInstall, pwzComponent, &isInstalled, &isAction);
        ExitOnWin32Error(er, hr, "failed to get install state for Component: %ls", pwzComponent);
author	Bob Arnson <bob@firegiant.com>	2020-10-20 17:09:40 -0400
committer	Bob Arnson <bob@firegiant.com>	2020-10-20 17:11:49 -0400
commit	2bfd637a14e4460f90107adada95652f28599536 (patch)
tree	c1ea288dfc9b2b76b1ac0a25f89367d052abbb9b /src
parent	3a7ce8761489aca2f5a93c0c80ace7ef8ba3397f (diff)
download	wix-2bfd637a14e4460f90107adada95652f28599536.tar.gz wix-2bfd637a14e4460f90107adada95652f28599536.tar.bz2 wix-2bfd637a14e4460f90107adada95652f28599536.zip

diff --git a/src/ca/netfxca.cpp b/src/ca/netfxca.cpp index 15802f2b..3a71babf 100644 --- a/src/ca/netfxca.cpp +++ b/src/ca/netfxca.cpp
@@ -23,8 +23,8 @@ LPCWSTR vcsFileId =
23	enum eFileId { fiFile = 1 };	23	enum eFileId { fiFile = 1 };
24		24
25	LPCWSTR vcsNgenQuery =	25	LPCWSTR vcsNgenQuery =
26	L"SELECT `NetFxNativeImage`.`File_`, `NetFxNativeImage`.`NetFxNativeImage`, `NetFxNativeImage`.`Priority`, `NetFxNativeImage`.`Attributes`, `NetFxNativeImage`.`File_Application`, `NetFxNativeImage`.`Directory_ApplicationBase`, `File`.`Component_` "	26	L"SELECT `Wix4NetFxNativeImage`.`File_`, `Wix4NetFxNativeImage`.`Wix4NetFxNativeImage`, `Wix4NetFxNativeImage`.`Priority`, `Wix4NetFxNativeImage`.`Attributes`, `Wix4NetFxNativeImage`.`File_Application`, `Wix4NetFxNativeImage`.`Directory_ApplicationBase`, `File`.`Component_` "
27	L"FROM `NetFxNativeImage`, `File` WHERE `File`.`File`=`NetFxNativeImage`.`File_`";	27	L"FROM `Wix4NetFxNativeImage`, `File` WHERE `File`.`File`=`Wix4NetFxNativeImage`.`File_`";
28	enum eNgenQuery { ngqFile = 1, ngqId, ngqPriority, ngqAttributes, ngqFileApp, ngqDirAppBase, ngqComponent };	28	enum eNgenQuery { ngqFile = 1, ngqId, ngqPriority, ngqAttributes, ngqFileApp, ngqDirAppBase, ngqComponent };
29		29
30	LPCWSTR vcsNgenGac =	30	LPCWSTR vcsNgenGac =
@@ -232,7 +232,7 @@ static HRESULT GetStrongName(
232		232
233	// get the name value records for this component	233	// get the name value records for this component
234	hr = WcaOpenView(vcsNgenStrongName, &hView);	234	hr = WcaOpenView(vcsNgenStrongName, &hView);
235	ExitOnFailure(hr, "failed to open view on NetFxNativeImage table");	235	ExitOnFailure(hr, "failed to open view on Wix4NetFxNativeImage table");
236		236
237	hr = WcaExecuteView(hView, hComponentRec);	237	hr = WcaExecuteView(hView, hComponentRec);
238	ExitOnFailure(hr, "failed to execute strong name view");	238	ExitOnFailure(hr, "failed to execute strong name view");
@@ -462,17 +462,17 @@ extern "C" UINT __stdcall SchedNetFx(
462		462
463	// loop through all the NetFx records	463	// loop through all the NetFx records
464	hr = WcaOpenExecuteView(vcsNgenQuery, &hView);	464	hr = WcaOpenExecuteView(vcsNgenQuery, &hView);
465	ExitOnFailure(hr, "failed to open view on NetFxNativeImage table");	465	ExitOnFailure(hr, "failed to open view on Wix4NetFxNativeImage table");
466		466
467	while (S_OK == (hr = WcaFetchRecord(hView, &hRec)))	467	while (S_OK == (hr = WcaFetchRecord(hView, &hRec)))
468	{	468	{
469	// Get Id	469	// Get Id
470	hr = WcaGetRecordString(hRec, ngqId, &pwzId);	470	hr = WcaGetRecordString(hRec, ngqId, &pwzId);
471	ExitOnFailure(hr, "failed to get NetFxNativeImage.NetFxNativeImage");	471	ExitOnFailure(hr, "failed to get Wix4NetFxNativeImage.Wix4NetFxNativeImage");
472		472
473	// Get File	473	// Get File
474	hr = WcaGetRecordString(hRec, ngqFile, &pwzData);	474	hr = WcaGetRecordString(hRec, ngqFile, &pwzData);
475	ExitOnFailure(hr, "failed to get NetFxNativeImage.File_ for record: %ls", pwzId);	475	ExitOnFailure(hr, "failed to get Wix4NetFxNativeImage.File_ for record: %ls", pwzId);
476	hr = StrAllocFormatted(&pwzTemp, vpwzUnformattedQuotedFile, pwzData);	476	hr = StrAllocFormatted(&pwzTemp, vpwzUnformattedQuotedFile, pwzData);
477	ExitOnFailure(hr, "failed to format file string for file: %ls", pwzData);	477	ExitOnFailure(hr, "failed to format file string for file: %ls", pwzData);
478	hr = WcaGetFormattedString(pwzTemp, &pwzFile);	478	hr = WcaGetFormattedString(pwzTemp, &pwzFile);
@@ -480,7 +480,7 @@ extern "C" UINT __stdcall SchedNetFx(
480		480
481	// Get Priority	481	// Get Priority
482	hr = WcaGetRecordInteger(hRec, ngqPriority, &iPriority);	482	hr = WcaGetRecordInteger(hRec, ngqPriority, &iPriority);
483	ExitOnFailure(hr, "failed to get NetFxNativeImage.Priority for record: %ls", pwzId);	483	ExitOnFailure(hr, "failed to get Wix4NetFxNativeImage.Priority for record: %ls", pwzId);
484		484
485	if (0 == iPriority)	485	if (0 == iPriority)
486	iAssemblyCost = COST_NGEN_BLOCKING;	486	iAssemblyCost = COST_NGEN_BLOCKING;
@@ -489,11 +489,11 @@ extern "C" UINT __stdcall SchedNetFx(
489		489
490	// Get Attributes	490	// Get Attributes
491	hr = WcaGetRecordInteger(hRec, ngqAttributes, &iAttributes);	491	hr = WcaGetRecordInteger(hRec, ngqAttributes, &iAttributes);
492	ExitOnFailure(hr, "failed to get NetFxNativeImage.Attributes for record: %ls", pwzId);	492	ExitOnFailure(hr, "failed to get Wix4NetFxNativeImage.Attributes for record: %ls", pwzId);
493		493
494	// Get File_Application or leave pwzFileApp NULL.	494	// Get File_Application or leave pwzFileApp NULL.
495	hr = WcaGetRecordFormattedString(hRec, ngqFileApp, &pwzData);	495	hr = WcaGetRecordFormattedString(hRec, ngqFileApp, &pwzData);
496	ExitOnFailure(hr, "failed to get NetFxNativeImage.File_Application for record: %ls", pwzId);	496	ExitOnFailure(hr, "failed to get Wix4NetFxNativeImage.File_Application for record: %ls", pwzId);
497		497
498	// Check if the value resolves to a valid file ID.	498	// Check if the value resolves to a valid file ID.
499	if (S_OK == FileIdExists(pwzData))	499	if (S_OK == FileIdExists(pwzData))
@@ -517,7 +517,7 @@ extern "C" UINT __stdcall SchedNetFx(
517		517
518	// Get Directory_ApplicationBase or leave pwzDirAppBase NULL.	518	// Get Directory_ApplicationBase or leave pwzDirAppBase NULL.
519	hr = WcaGetRecordFormattedString(hRec, ngqDirAppBase, &pwzData);	519	hr = WcaGetRecordFormattedString(hRec, ngqDirAppBase, &pwzData);
520	ExitOnFailure(hr, "failed to get NetFxNativeImage.Directory_ApplicationBase for record: %ls", pwzId);	520	ExitOnFailure(hr, "failed to get Wix4NetFxNativeImage.Directory_ApplicationBase for record: %ls", pwzId);
521		521
522	if (WcaIsUnicodePropertySet(pwzData))	522	if (WcaIsUnicodePropertySet(pwzData))
523	{	523	{
@@ -540,7 +540,7 @@ extern "C" UINT __stdcall SchedNetFx(
540		540
541	// Get Component	541	// Get Component
542	hr = WcaGetRecordString(hRec, ngqComponent, &pwzComponent);	542	hr = WcaGetRecordString(hRec, ngqComponent, &pwzComponent);
543	ExitOnFailure(hr, "failed to get NetFxNativeImage.Directory_ApplicationBase for record: %ls", pwzId);	543	ExitOnFailure(hr, "failed to get Wix4NetFxNativeImage.Directory_ApplicationBase for record: %ls", pwzId);
544	er = ::MsiGetComponentStateW(hInstall, pwzComponent, &isInstalled, &isAction);	544	er = ::MsiGetComponentStateW(hInstall, pwzComponent, &isInstalled, &isAction);
545	ExitOnWin32Error(er, hr, "failed to get install state for Component: %ls", pwzComponent);	545	ExitOnWin32Error(er, hr, "failed to get install state for Component: %ls", pwzComponent);
546		546