mirror
/
ollama
mirror of https://github.com/ollama/ollama
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tidy up lint warnings on windows (#13430)

This commit is contained in:
Eva H 2025-12-12 11:43:35 -05:00 committed by GitHub
parent 95fdd8d619
commit de9ecfd01c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/cmd/app/app_darwin.go
View File

@ -191,13 +191,6 @@ func LaunchNewApp() {
C.launchApp(appName) C.launchApp(appName)
} }
// Send a request to the main app thread to load a UI page
func sendUIRequestMessage(path string) {
p := C.CString(path)
defer C.free(unsafe.Pointer(p))
C.uiRequest(p)
}
func registerLaunchAgent(hasCompletedFirstRun bool) { func registerLaunchAgent(hasCompletedFirstRun bool) {
// Remove any stale Login Item registrations // Remove any stale Login Item registrations
C.unregisterSelfFromLoginItem() C.unregisterSelfFromLoginItem()

5
app/cmd/app/app_windows.go
View File

@ -263,11 +263,6 @@ func createLoginShortcut() error {
return nil return nil
} }
// Send a request to the main app thread to load a UI page
func sendUIRequestMessage(path string) {
wintray.SendUIRequestMessage(path)
}
func LaunchNewApp() { func LaunchNewApp() {
} }

2
app/dialog/dlgs_windows.go
View File

@ -15,7 +15,7 @@ const multiFileBufferSize = w32.MAX_PATH * 10
type WinDlgError int type WinDlgError int
func (e WinDlgError) Error() string { func (e WinDlgError) Error() string {
return fmt.Sprintf("CommDlgExtendedError: %#x", e) return fmt.Sprintf("CommDlgExtendedError: %#x", int(e))
} }
func err() error { func err() error {

8
app/wintray/eventloop.go
View File

@ -158,16 +158,16 @@ func (t *winTray) wndProc(hWnd windows.Handle, message uint32, wParam, lParam ui
case uint32(UI_REQUEST_MSG_ID): case uint32(UI_REQUEST_MSG_ID):
// Requests for the UI must always come from the main event thread // Requests for the UI must always come from the main event thread
l := int(wParam) l := int(wParam)
path := unsafe.String((*byte)(unsafe.Pointer(lParam)), l) path := unsafe.String((*byte)(unsafe.Pointer(lParam)), l) //nolint:govet,gosec
t.app.UIRun(path) t.app.UIRun(path)
case WM_COPYDATA: case WM_COPYDATA:
// Handle URL scheme requests from other instances // Handle URL scheme requests from other instances
if lParam != 0 { if lParam != 0 {
cds := (*COPYDATASTRUCT)(unsafe.Pointer(lParam)) cds := (*COPYDATASTRUCT)(unsafe.Pointer(lParam)) //nolint:govet,gosec
if cds.DwData == 1 { // Our identifier for URL scheme messages if cds.DwData == 1 { // Our identifier for URL scheme messages
// Convert the data back to string // Convert the data back to string
data := make([]byte, cds.CbData) data := make([]byte, cds.CbData)
copy(data, (*[1 << 30]byte)(unsafe.Pointer(cds.LpData))[:cds.CbData:cds.CbData]) copy(data, (*[1 << 30]byte)(unsafe.Pointer(cds.LpData))[:cds.CbData:cds.CbData]) //nolint:govet,gosec
urlScheme := string(data) urlScheme := string(data)
handleURLSchemeRequest(urlScheme) handleURLSchemeRequest(urlScheme)
lResult = 1 // Return non-zero to indicate success lResult = 1 // Return non-zero to indicate success