1.2.rev157

* Continuing on issues for #18 on WINNT * SystemAppUserModelId on shortcuts now works, i found out that if it already exists you cannot update it, it will throw access denied. so that id can only be set if it the file doesnt exist
Noitidart · Mar 28, 2015 · 9b4e390 · 9b4e390
1 parent 654e1f7
commit 9b4e390
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/modules/ostypes_win.jsm b/modules/ostypes_win.jsm
@@ -1364,10 +1364,10 @@ var winInit = function() {
 			var hr_GetValue = pps.GetValue(vtblPpsPtr, pkey, ppropvar.address());
 			this.checkHRESULT(hr_GetValue, 'IPropertyStore_GetValue');
 
-			console.info('ppropvar:', ppropvar.toString(), uneval(ppropvar));
+			//console.info('ppropvar:', ppropvar.toString(), uneval(ppropvar));
 
 			if (ret_js) {
-				console.info('ppropvar.pwszVal:', ppropvar.pwszVal.toString(), uneval(ppropvar.pwszVal));
+				//console.info('ppropvar.pwszVal:', ppropvar.pwszVal.toString(), uneval(ppropvar.pwszVal));
 				if (ppropvar.pwszVal.isNull()) {
 					console.log('ppropvar.pwszVal is NULL so blank string was found');
 					var jsstr = '';
@@ -1376,7 +1376,7 @@ var winInit = function() {
 				}
 
 				var rez_PropVariantClear = self.API('PropVariantClear')(ppropvar.address());
-				console.info('rez_PropVariantClear:', rez_PropVariantClear.toString(), uneval(rez_PropVariantClear));
+				//console.info('rez_PropVariantClear:', rez_PropVariantClear.toString(), uneval(rez_PropVariantClear));
 
 				return jsstr;
 			} else {

diff --git a/modules/workers/ProfilistWorker.js b/modules/workers/ProfilistWorker.js
@@ -166,7 +166,6 @@ function createShortcut(path_createInDir, str_createWithName, path_linkTo, optio
 				str_createWtihArgs: '-P -no-remote', // no args are set if not provided
 				str_createWithDesc: 'this is description i want shown on my shortcut', // no descriptin is set if not provided
 				path_createWithWorkDir: null // i have no idea what a working dir is, but if not provided its not set
-				
 			}
 			*/
 			// creates shortcut file (.lnk)
@@ -203,8 +202,8 @@ function createShortcut(path_createInDir, str_createWithName, path_linkTo, optio
 
 				if ('str_createWithAppUserModelId' in options) {
 					ostypes.HELPER.InitPropStoreConsts();
-					var propertyStorePtr = ostypes.IPropertyStore.ptr();
-					var hr_shellLinkQI2 = shellLink.QueryInterface(shellLinkPtr, IID_IPropertyStore.address(), propertyStorePtr.address());
+					var propertyStorePtr = ostypes.TYPE.IPropertyStore.ptr();
+					var hr_shellLinkQI2 = shellLink.QueryInterface(shellLinkPtr, ostypes.CONST.IID_IPropertyStore.address(), propertyStorePtr.address());
 					console.info('hr_shellLinkQI2:', hr_shellLinkQI2.toString(), uneval(hr_shellLinkQI2));
 					ostypes.HELPER.checkHRESULT(hr_shellLinkQI2, 'QueryInterface (IShellLink->IPropertyStore)');
 					propertyStore = propertyStorePtr.contents.lpVtbl.contents;
@@ -265,9 +264,13 @@ function createShortcut(path_createInDir, str_createWithName, path_linkTo, optio
 				}
 
 				if ('str_createWithAppUserModelId' in options) {
-					var hr_systemAppUserModelID = ostypes.HELPER.IPropertyStore_SetValue(propertyStorePtr, propertyStore, ostypes.CONST.PKEY_AppUserModel_ID.address(), options.str_createWithAppUserModelId);		
-					ostypes.HELPER.checkHRESULT(hr_systemAppUserModelID, 'hr_systemAppUserModelID');
-
+					if (promise_checkExists) {
+						console.error('cannot update System.AppUserModel.ID, you specified it should though, so throwing warning as it will not update it'); // trying to update while it exists returns HRESULT of -2147287035 which is STG_E_ACCESSDENIED
+					} else {
+						var hr_systemAppUserModelID = ostypes.HELPER.IPropertyStore_SetValue(propertyStorePtr, propertyStore, ostypes.CONST.PKEY_AppUserModel_ID.address(), options.str_createWithAppUserModelId);		
+						ostypes.HELPER.checkHRESULT(hr_systemAppUserModelID, 'hr_systemAppUserModelID');
+					}
+
 					var jsstr_IPSGetValue = ostypes.HELPER.IPropertyStore_GetValue(propertyStorePtr, propertyStore, ostypes.CONST.PKEY_AppUserModel_ID.address(), null);
 					console.info('jsstr_IPSGetValue:', jsstr_IPSGetValue.toString(), uneval(jsstr_IPSGetValue));
 				}