Skip to content

Commit

Permalink
2.6.0.0 (#737)
Browse files Browse the repository at this point in the history 
* Correct Icons

* Bump version

* Fix CPU Family Checks

* Improve WMIC performance

* Fix #701

* Fix #706

* Update 0424

* Add BIOS info

* Code Cleanup, Add 23H2 Support, Change LTT

* Bump Version

* ACTUALLY FIX ICON

* Fix #725

* Fix Motherboard + GPU Footer

Fix Excessively Verbose Companies
Skip DisplayLink USB Devices

* Fix workflow

* Remove Space

* Shorten MSI footer name

* Shorten Gigabyte Footer Name

* Plural -> Singular

* Add Rounded Corners on 11

* Add #736

* Likely fix UNC paths

* Finish adding temp debug log

* Remove Debug Log, file uncompiled asset loading

* Bump version
  • Loading branch information
@rcmaehl
rcmaehl committed Jan 17, 2024
1 parent 4ce439e commit 11bd035
Show file tree
Hide file tree
Showing 4 changed files with 52 additions and 14 deletions.
2 changes: 1 addition & 1 deletion Langs/0000.lang
View file
Expand Up @@ -82,7 +82,7 @@ Your Computer is NOT ready for Windows 11, you can join the Discord using the Di
Your Computer is ready for Windows 11. You should receive the option to upgrade between October 5th 2021 and Fall 2022.=
Language Switcher currently disabled with Group Policy=
Theme Switcher currently disabled with Group Policy.=
"Default - No Theme Files Found=
Default - No Theme Files Found=
Guides=
Windows 11 Requirements=
Convert Disk to GPT=
Expand Down
20 changes: 11 additions & 9 deletions WhyNotWin11.au3
View file
Expand Up @@ -5,10 +5,11 @@
#AutoIt3Wrapper_Compile_Both=Y
#AutoIt3Wrapper_UseX64=Y
#AutoIt3Wrapper_Res_Comment=https://www.whynotwin11.org
#AutoIt3Wrapper_Res_CompanyName=Robert Maehl Software
#AutoIt3Wrapper_Res_Description=Detection Script to help identify why your PC isn't Windows 11 Release Ready. Now Supporting Update Checks!
#AutoIt3Wrapper_Res_Fileversion=2.5.0.5
#AutoIt3Wrapper_Res_Fileversion=2.6.0.0
#AutoIt3Wrapper_Res_ProductName=WhyNotWin11
#AutoIt3Wrapper_Res_ProductVersion=2.5.0.5
#AutoIt3Wrapper_Res_ProductVersion=2.6.0.0
#AutoIt3Wrapper_Res_LegalCopyright=Robert Maehl, using LGPL 3 License
#AutoIt3Wrapper_Res_Language=1033
#AutoIt3Wrapper_Res_requestedExecutionLevel=asInvoker
Expand Down Expand Up @@ -403,6 +404,7 @@ Func Main(ByRef $aResults, ByRef $aExtended, ByRef $aOutput)
ProgressSet(100, _Translate($aMUI[1], "Done"))

Local $hGUI = GUICreate($aName[1], 800, 600, -1, -1, BitOR($WS_POPUP, $WS_BORDER), _GetTranslationRTL($aMUI[1]))
_WinAPI_DwmSetWindowAttributeExt($hGUI, 33, 2)
GUISetBkColor($aColors[$iBackground])
GUISetFont($aFonts[$FontSmall] * $DPI_RATIO, $FW_BOLD, "", $aFonts[4])

Expand Down Expand Up @@ -532,21 +534,21 @@ Func Main(ByRef $aResults, ByRef $aExtended, ByRef $aOutput)
GUICtrlCreateIcon("", -1, 34, 110, 32, 32)
_SetBkIcon(-1, $aColors[$iText], $aColors[$iSidebar], @ScriptDir & "\assets\GitHub.ico", -1, 32, 32)
GUICtrlCreateIcon("", -1, 34, 160, 32, 32)
_SetBkIcon(-1, $aColors[$iText], $aColors[$iSidebar], @ScriptDir & ".\assets\PayPal.ico", -1, 32, 32)
_SetBkIcon(-1, $aColors[$iText], $aColors[$iSidebar], @ScriptDir & "\assets\PayPal.ico", -1, 32, 32)
GUICtrlCreateIcon("", -1, 34, 210, 32, 32)
_SetBkIcon(-1, $aColors[$iText], $aColors[$iSidebar], @ScriptDir & ".\assets\Discord.ico", -1, 32, 32)
_SetBkIcon(-1, $aColors[$iText], $aColors[$iSidebar], @ScriptDir & "\assets\Discord.ico", -1, 32, 32)
GUICtrlCreateIcon("", -1, 34, 260, 32, 32)
_SetBkIcon(-1, $aColors[$iText], $aColors[$iSidebar], @ScriptDir & ".\assets\Web.ico", -1, 32, 32)
_SetBkIcon(-1, $aColors[$iText], $aColors[$iSidebar], @ScriptDir & "\assets\Web.ico", -1, 32, 32)
If @LogonDomain <> @ComputerName Then
GUICtrlCreateIcon("", -1, 34, 310, 32, 32)
_SetBkIcon(-1, $aColors[$iText], $aColors[$iSidebar], @ScriptDir & ".\assets\HireMe.ico", -1, 32, 32)
_SetBkIcon(-1, $aColors[$iText], $aColors[$iSidebar], @ScriptDir & "\assets\HireMe.ico", -1, 32, 32)
EndIf
EndIf
If BitAND($dSettings, 65535) = 65535 Then
;;;
Else
GUICtrlCreateIcon("", -1, 34, 518, 32, 32)
_SetBkIcon(-1, $aColors[$iText], $aColors[$iSidebar], @ScriptDir & ".\assets\Settings.ico", -1, 32, 32)
_SetBkIcon(-1, $aColors[$iText], $aColors[$iSidebar], @ScriptDir & "\assets\Settings.ico", -1, 32, 32)
EndIf
GUICtrlCreateIcon("", -1, 42, 20, 20, 20)
_SetBkIcon(-1, $aColors[$iText], $aColors[$iSidebar], @ScriptDir & "\assets\WhyNotWin11.ico", -1, 20, 20)
Expand Down Expand Up @@ -1206,7 +1208,7 @@ Func OutputResults(ByRef $aResults, $aOutput)

Switch $aOutput[1]
Case "txt"
If StringInStr($aOutput[2], ":") Then
If StringInStr($aOutput[2], ":") Or StringInStr($aOutput[2], "\\") Then
$sFile = $aOutput[2]
Else
$sFile = @ScriptDir & "\" & $aOutput[2]
Expand All @@ -1218,7 +1220,7 @@ Func OutputResults(ByRef $aResults, $aOutput)
Next
FileClose($hFile)
Case "csv"
If StringInStr($aOutput[2], ":") Then
If StringInStr($aOutput[2], ":") Or StringInStr($aOutput[2], "\\") Then
$sFile = $aOutput[2]
Else
$sFile = @ScriptDir & "\" & $aOutput[2]
Expand Down
18 changes: 17 additions & 1 deletion includes/_Theming.au3
View file
Expand Up @@ -196,4 +196,20 @@ Func _SetTheme($sName = False)
EndSelect

Return $aColors
EndFunc ;==>_SetTheme
EndFunc ;==>_SetTheme

Func _WinAPI_DwmSetWindowAttributeExt($hWnd, $iAttribute, $iData)
Switch $iAttribute
Case 2, 3, 4, 6, 7, 8, 10, 11, 12, 33

Case Else
Return SetError(1, 0, 0)
EndSwitch

Local $aCall = DllCall('dwmapi.dll', 'long', 'DwmSetWindowAttribute', 'hwnd', $hWnd, 'dword', $iAttribute, _
'dword*', $iData, 'dword', 4)
If @error Then Return SetError(@error, @extended, 0)
If $aCall[0] Then Return SetError(10, $aCall[0], 0)

Return 1
EndFunc ;==>_WinAPI_DwmSetWindowAttributeExt
26 changes: 23 additions & 3 deletions includes/_WMIC.au3
View file
Expand Up @@ -199,9 +199,15 @@ Func _GetGPUInfo($iFlag = 0)

Local $Obj_Item
For $Obj_Item In $Col_Items
If $Obj_Item.Name = "Citrix Indirect Display Adapter" Then ContinueLoop
$sName &= $Obj_Item.Name & ", "
$sMemory = $Obj_Item.AdapterRAM
Switch $Obj_Item.Name
Case "Citrix Indirect Display Adapter"
ContinueCase
Case "DisplayLink USB Device"
ContinueLoop
Case Else
$sName &= $Obj_Item.Name & ", "
$sMemory = $Obj_Item.AdapterRAM
EndSwitch
Next
Else
Return 0
Expand Down Expand Up @@ -234,6 +240,20 @@ Func _GetMotherboardInfo($iFlag = 0)
Else
Return 0
EndIf
Switch $sManufacturer
Case "ASUSTek COMPUTER INC."
$sManufacturer = "ASUS"
Case "Gigabyte Technology Co., Ltd"
$sManufacturer = "Gigabyte"
Case "Microsoft Corporation"
$sManufacturer = "Microsoft"
Case "Micro-Star International Co., Ltd."
$sManufacturer = "MSI"
Case "Oracle Corporation"
$sManufacturer = "Oracle"
Case Else
;;;
EndSwitch
EndIf
Switch $iFlag
Case 0
Expand Down

0 comments on commit 11bd035

Please sign in to comment.