[commit] r2652 - trunk/GME/MgaUtil

[GMESRC Repository Notifications]

Author: ksmyth
Date: Mon Oct  3 14:02:54 2016
New Revision: 2652

Log:
Better error handling

Modified:
   trunk/GME/MgaUtil/MgaRegistrar.cpp

Modified: trunk/GME/MgaUtil/MgaRegistrar.cpp
==============================================================================
--- trunk/GME/MgaUtil/MgaRegistrar.cpp	Mon Oct  3 14:02:51 2016	(r2651)
+++ trunk/GME/MgaUtil/MgaRegistrar.cpp	Mon Oct  3 14:02:54 2016	(r2652)
@@ -1958,9 +1958,12 @@
 			}
 
 			if((mode & RM_USER) || (type2 & COMPONENTTYPE_SYSREGREF) != 0 ) {
-				if (!res) res = comps.RecurseDeleteKey(PutInCString(progid));
-				if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS;
-				ERRTHROW(res);
+				if (!res)
+					res = comps.RecurseDeleteKey(PutInCString(progid));
+				if (res == ERROR_FILE_NOT_FOUND)
+					res = ERROR_SUCCESS;
+				if (res != ERROR_SUCCESS)
+					WIN32THROW(res);
 			}
 		}
 		if(mode & (RM_SYS | RM_TEST)) {
@@ -1970,8 +1973,10 @@
 				if(mode & RM_SYS) res = comps.RecurseDeleteKey(PutInCString(progid));
 				if(mode & RM_TEST) res = comps.Open(comps, PutInCString(progid));
 			}
-			if(res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS;
-			ERRTHROW(res);
+			if(res == ERROR_FILE_NOT_FOUND)
+				res = ERROR_SUCCESS;
+			if (res != ERROR_SUCCESS)
+				WIN32THROW(res);
 		}
 	}
 	COMCATCH(;)