marcel/kinto
1
0
Fork 0
mirror of https://github.com/rbreaves/kinto.git synced 2025-08-02 09:06:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

- Additional fixes for Windows 10 user profile spaces

Browse Source
This commit is contained in:
Ben Reaves
2020-08-24 14:30:50 -05:00
parent b1c361080a
commit 0a5c526941
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
windows/detectUSB.ahk
View File

@@ -11,13 +11,12 @@ WinHide % "ahk_id " DllCall("GetConsoleWindow", "ptr")
notify_change(wParam, lParam, msg, hwnd) notify_change(wParam, lParam, msg, hwnd)
{ {
global lastkb global lastkb
; kbtype = % ComObjCreate("WScript.Shell").Exec("cscript /nologo usb.vbs").StdOut.ReadAll()
DetectHiddenWindows On DetectHiddenWindows On
Run %ComSpec%,, Hide, pid Run %ComSpec%,, Hide, pid
WinWait ahk_pid %pid% WinWait ahk_pid %pid%
DllCall("AttachConsole", "UInt", pid) DllCall("AttachConsole", "UInt", pid)
WshShell := ComObjCreate("Wscript.Shell") WshShell := ComObjCreate("Wscript.Shell")
exec := WshShell.Exec("cscript /nologo usb.vbs") exec := WshShell.Exec("cscript /nologo ""%userprofile%\.kinto\usb.vbs""")
kbtype := exec.StdOut.ReadAll() kbtype := exec.StdOut.ReadAll()
DllCall("FreeConsole") DllCall("FreeConsole")
Process Close, %pid% Process Close, %pid%

12
windows/usb.vbs
View File

@@ -1,5 +1,5 @@
Option Explicit Option Explicit
Dim oWMISrv, collDvcs, iUSBDvc , iDvc, sDvcID, sPID, sVID Dim oWMISrv, collDvcs, iUSBDvc , iDvc, sDvcID, sPID, sVID, deviceID
' add item to array ' add item to array
Function AddItem(arr, val) Function AddItem(arr, val)
@@ -49,21 +49,23 @@ Dim nonApple: nonApple = 0
Dim i Dim i
If vcount = 1 Then If vcount = 1 Then
deviceID = deviceVID(0)
If StrComp(deviceVID(0), "05AC") = 0 Then If StrComp(deviceVID(0), "05AC") = 0 Then
Wscript.Echo "Apple" Wscript.Echo "Apple " & deviceID
Else Else
Wscript.Echo "Windows" Wscript.Echo "Windows " & deviceID
End If End If
Else Else
For i = 0 To counter-1 For i = 0 To counter-1
deviceID = deviceVID(i)
If StrComp(deviceVID(i), "05AC") = -1 Then If StrComp(deviceVID(i), "05AC") = -1 Then
nonApple = 1 nonApple = 1
End If End If
Next Next
If nonApple = 1 Then If nonApple = 1 Then
Wscript.Echo "Windows" Wscript.Echo "Windows " & deviceID
Else Else
Wscript.Echo "Apple" Wscript.Echo "Apple " & deviceID
End If End If
End If End If