Multi-OEM/Retail Project {MRP} - Mk3

One change i made in CheckMSDM script was:

IF /I NOT "%KEd%"=="%OSVER%" echo [CMSDM] Your MSDM Key is not for the installed Edition, saved only. = if it not a match which what happened before.

OSVER = ProfessionalEducation (from WMIC/Reg check).

KEd = The result from KeyInfo program/Pkconfig database. = ProfessionalEducation from editionID.

So it *should* be a match, unless this Edition changes AFTER MRP does it primary checks.

It should detect any ProfessionalEducationN version too.

 

Hmm

Will do some more work on this when i get back later. I have an idea where the tweak may be needed.

 

Thanks Enth

Will get this fixed, luckily it only seems like it is this Edition that causing some confusion in my checks... I love a challenge

I will get it sorted one way or another when i get back later...

 

@Enth, PM sent with a revised DeCompile to test when you can.

It should now DEBUG the important returned values (temp for this test) to see if the parsing stages are working properly and not adding a space or something that i have missed seeing.

Now off out to fix a RS2 upgraded PC that has lost all internet connection! Back later... Oh the joys of computing!

 

[DEBUG] > Var: OSVER='Professional'
[DEBUG] > Var: KEd='ProfessionalEducation'

Hmm its picking up Professional only for the OSEdition. Odd.

At least it now showing me why it was not a match.

Now i have something to go on... Not sure how to get around it but i will find a way.

 

What is odd is the fact that OSVER said ProfessionalEducation > [CHKOE] ProfessionalEducation Edition installed. Which is the exact same WMIC line as the one checked in the MSDM section.

It changes between the first script (install that does the branding) and after the first reboot when the Add-On manager starts.

 

@Enth, Got it

Just going to do a test with the changes using a static OS Env variable, same way i do the debug one... Hopefully it should now save the real edition name and use that instead of a WMIC call which as we seen picks Pro and not the ProEdu that it was originally detected correctly in the branding script.

Results shortly...

 

YES - nailed it!!

Spoiler

Code:

Multi-OEM/Retail Project Version : 170415-R54.5 - BaseLine  [MRP/MDL] 
 
Required files present and extracted successfully. 
 
Enhanced Log Mode: Activated. 
 
> Checking OEM's Folder Structure.
OEM's folder detected, structure appears OK. 
 
OS Installation Date: 15/04/2017 
 
[CHKOV] Windows 10 Pro Education x86 version found. 
[CHKOE] ProfessionalEducation Edition installed. 
[CHKOB] Build Version: 15063.0.x86fre.rs2_release.170317-1834 
[OSLNG] Edition Language/Code: en-GB ( 2057 [809h] ) 
[OSLNG] OS Locale:             en-GB 
[OSLNG] OS Language Value:     ENG 
 
-------------------- 
BIOS DMI Information 
-------------------- 
#1 CS Product Name   : [VMware Virtual Platform] 
#2 CS Model Name     : [VMware Virtual Platform] 
#4 CS Vendor Name    : [VMware, Inc.] 
#5 CS System Name    : [VMware, Inc.] 
#6 Baseboard Name    : [Intel Corporation] 
#8 BIOS ID           : [DELL] 
 
Info: Standard HDD Detected. 
 
[CHKLF] Rename 'System Drive' flag was enabled, 'C:' changed to 'Windows_10_ProfEdu'. 
[CKDMI] Checking DMI for manufacture information. 
[VMWCF] VMware Bios ID conflict resolution enabled. VMware resolved as Dell [#8]. 
[THMOK] Dell [VMware] manufacture will be used for theme/branding. 
[BRND1] > Branding Extra Checks Section. 
[FTMNP] Force theme text file not present. 
[CHKMN] Computer Model Name: 'VMware Virtual Platform' detected and applied.
[BRND2] > Brand Transfer Section. 
[BGDFC] Desktop backgrounds folder created. 
[W8XAP] > Windows 8.x/10 User Account Picture Management Section 1. 
[RMXML] OOBE.xml file deleted.  
[UBREP] User.bmp replaced.  
[UPREP] User.png replaced.  
[UPREP] User-40.png replaced.  
[WXAP2] > Windows 10 User Account Picture Management Section 2. 
[UPREP] User-32.png replaced.  
[UPREP] User-48.png replaced.  
[UPREP] User-192.png replaced. 
[WXLS5] Lock Screen {img105.jpg} replaced. 
[THMMN] > Theme Management Section. 
[THMRP] Dell theme has been applied. 
[WXLS1] Log-In Background {img100.jpg} replaced. 
[TTFS0] > Transfer Theme Files Section. 
[OIFCS] System32\oobe\info folder has been created. 
[OIFCS] Required theme files transferred to 'System32\oobe\info' folder. 
[TDYUP] > Deletion of unused files. 
[BRNOK] Branding script has completed.
[ADMAN] Add-On Manager Started. 
[CMSDM] > Detecting if Visual C 2012 DLL's are already present. 
[CMSDM] > Visual C 2012 DLL's have been temporarily installed. 
[CMSDM] Checking BIOS for MSDM Key. 
[CMSDM] Processing MSDM Key for Edition status. 
[CMSDM] > Show MSDM Key Information. 
[DEBUG] > Var: OSVER{WMIC}='Professional' 
[DEBUG] > Var: RealEdition='ProfessionalEducation'
[DEBUG] > Var: KEd='ProfessionalEducation' 
[CMSDM] MSDM Key Information: Win 10 ProfessionalEducation OEM-DM
[CMSDM] Your MSDM key is for the Edition installed, saved and applied.
[CMSDM] See C:\MSDM-Key.txt for your saved MSDM key details.
[CMSDM] > Temporary Visual C 2012 DLL's used have been uninstalled. 
[ADMVM] Detected a 'default' VMware Virtual Machine. 
[USRAC] Advanced Log-On screen has been enabled.
[USRAC] Set 'User Account Picture' registry entry applied. 
[USRRO] 'Registered Owner' registry entry corrected. 
[USRD0] Detected 'defaultuser0', attempting to remove the folder... 
[USRD0] Removal of 'defaultuser0' folder successful. 
[AMBMP] > Checking BIOS's mode and System drive's partition type. 
[AMBMP] BIOS Mode: Legacy, Partition Type: MBR 
[AMHDC] HDD Controller Mode: AHCI 
[AMCOS] Online activation/license check failed. 
[CHKLS] > Checking if Windows is activated/licensed. 
[CHKLS] License Status: Not Licensed. 
[CHKLS] Note: System reboot maybe required to complete activation. 
[AMUTC] UserTweaks.cmd file is present, attempting to apply. 
[AMUTC] UserTweaks completed without errors. 
[ADMAN] Add-On Manager Completed. 
[CLNUP] MRP Clean Up Processed. 
 
================================================================================ 
= Please Note: It is advisable to logout or reboot your computer when possible = 
=              to allow the User and Log-On background pictures to finalize.   = 
================================================================================ 
 
Enhanced Log Mode: Deactivated. 
 
The Multi-OEM/Retail Project has now completed. 
 

Just got to tidy things up.

Also to check that it not affect other Editions, which it shouldn't as I have set a little error code section, if OSVER is same it will use that as normal.

Might leave the extra DEBUG lines in as if in future another edition needs attention it will indicate what went wrong.

One thing i have noticed is the Build Version, it still says: 15063.0.x86fre.rs2_release.170317-1834 this ISO i used (thanks Enth ), had .138 updated. Ah well it not important as it only information and not used for anything within MRP.

 

Test 2 Completed: W10 Home/Core.

Also Tidied DEBUG part up (if enhanced log mode enabled). Plus added the Build Revision line to show the UBR number, (updates integrated). If using a first release OS it will say BaseLine instead.

Spoiler

Code:

Multi-OEM/Retail Project Version : 170416-R54.5 - BaseLine  [MRP/MDL] 
 
Required files present and extracted successfully. 
 
Enhanced Log Mode: Activated. 
 
> Checking OEM's Folder Structure.
OEM's folder detected, structure appears OK. 
 
OS Installation Date: 16/04/2017 
 
[CHKOV] Windows 10 Home x86 version found. 
[CHKOE] Core Edition installed. 
[CHKOB] Build Version: 15063.0.x86fre.rs2_release.170317-1834 
[CHKOB] Build Revision: 138. 
[OSLNG] Edition Language/Code: en-GB ( 2057 [809h] ) 
[OSLNG] OS Locale:             en-GB 
[OSLNG] OS Language Value:     ENG 
 
-------------------- 
BIOS DMI Information 
-------------------- 
#1 CS Product Name   : [VMware Virtual Platform] 
#2 CS Model Name     : [VMware Virtual Platform] 
#4 CS Vendor Name    : [VMware, Inc.] 
#5 CS System Name    : [VMware, Inc.] 
#6 Baseboard Name    : [Intel Corporation] 
#8 BIOS ID           : [DELL] 
 
Info: Standard HDD Detected. 
 
[CHKLF] Rename 'System Drive' flag was enabled, 'C:' changed to 'Windows_10_Core'. 
[CKDMI] Checking DMI for manufacture information. 
[VMWCF] VMware Bios ID conflict resolution enabled. VMware resolved as Dell [#8]. 
[THMOK] Dell [VMware] manufacture will be used for theme/branding. 
[BRND1] > Branding Extra Checks Section. 
[FTMNP] Force theme text file not present. 
[CHKMN] Computer Model Name: 'VMware Virtual Platform' detected and applied.
[BRND2] > Brand Transfer Section. 
[BGDFC] Desktop backgrounds folder created. 
[W8XAP] > Windows 8.x/10 User Account Picture Management Section 1. 
[RMXML] OOBE.xml file deleted.  
[UBREP] User.bmp replaced.  
[UPREP] User.png replaced.  
[UPREP] User-40.png replaced.  
[WXAP2] > Windows 10 User Account Picture Management Section 2. 
[UPREP] User-32.png replaced.  
[UPREP] User-48.png replaced.  
[UPREP] User-192.png replaced. 
[WXLS5] Lock Screen {img105.jpg} replaced. 
[THMMN] > Theme Management Section. 
[THMRP] Dell theme has been applied. 
[WXLS1] Log-In Background {img100.jpg} replaced. 
[TTFS0] > Transfer Theme Files Section. 
[OIFCS] System32\oobe\info folder has been created. 
[OIFCS] Required theme files transferred to 'System32\oobe\info' folder. 
[TDYUP] > Deletion of unused files. 
[BRNOK] Branding script has completed.
[ADMAN] Add-On Manager Started. 
[CMSDM] > Detecting if Visual C 2012 DLL's are already present. 
[CMSDM] > Visual C 2012 DLL's have been temporarily installed. 
[CMSDM] Checking BIOS for MSDM Key. 
[CMSDM] Processing MSDM Key for Edition status. 
[CMSDM] > Show MSDM Key Information. 
[DEBUG] > Var: OSVER {WMIC} : 'Core' 
[DEBUG] > Var: RealEdition  : 'Core' 
[DEBUG] > Var: KeyEditionID : 'Core' 
[CMSDM] MSDM Key Information: Win 10 Core OEM-DM
[CMSDM] Your MSDM key is for the Edition installed, saved and applied.
[CMSDM] See C:\MSDM-Key.txt for your saved MSDM key details.
[CMSDM] > Temporary Visual C 2012 DLL's used have been uninstalled. 
[ADMVM] Detected a 'default' VMware Virtual Machine. 
[USRAC] Advanced Log-On screen has been enabled.
[USRAC] Set 'User Account Picture' registry entry applied. 
[USRRO] 'Registered Owner' registry entry corrected. 
[USRD0] Detected 'defaultuser0', attempting to remove the folder... 
[USRD0] Removal of 'defaultuser0' folder successful. 
[AMBMP] > Checking BIOS's mode and System drive's partition type. 
[AMBMP] BIOS Mode: Legacy, Partition Type: MBR 
[AMHDC] HDD Controller Mode: AHCI 
[AMCOS] Online activation/license check failed. 
[CHKLS] > Checking if Windows is activated/licensed. 
[CHKLS] License Status: Not Licensed. 
[CHKLS] Note: System reboot maybe required to complete activation. 
[AMUTC] UserTweaks.cmd file is present, attempting to apply. 
[AMUTC] UserTweaks completed without errors. 
[ADMAN] Add-On Manager Completed. 
[CLNUP] MRP Clean Up Processed. 
 
================================================================================ 
= Please Note: It is advisable to logout or reboot your computer when possible = 
=              to allow the User and Log-On background pictures to finalize.   = 
================================================================================ 
 
Enhanced Log Mode: Deactivated. 
 
The Multi-OEM/Retail Project has now completed. 
 

Will release this new MRP revision later as it is almost 01:30am GMT here.

Probably be in about 8 or 9 hours time once i have time to sleep and check other OS's when I awake.

Many thanks Enth for the AIO, now i have a LOT of choices to have a play with.

 

MRP 54.5 Updated!

The main project has been updated and uploaded. See first post for the download and the new password for the MRP archive.

For now the other archives are the same password as before, this will change when they are next updated and the new passwords will be shown in the download spoiler and no longer will be shown on the *********. link.

This has been done for reasons which i will not discuss here.

Also change log details will be within the respective archives from now on. Saves a lot of updating the first post!

 

oops i noticed a little gremlin [CMSDM] > Show MSDM Key Information.

It not important - will have that fixed on next update.

 

I use UltraISO and it works ok, the latest version is 9.6.6.3300.

To make it save a full ISO version that also includes the .uibak click the Options menu, Configuration, then save tab, just have the top two boxes ticked (recompile... and backup) click OK and close program, reopen and the settings are saved. You can check to make sure.

This saves a full iso .uibak backup and makes a fresh iso.

On mine in the save tab menu, the super restore is ticked and greyed out. but that not affect the full iso save, thats if you cancel saving the iso mid way it then auto restores the original iso.