Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
OpenDAS
ollama
Commits
5208cf09
Commit
5208cf09
authored
Feb 15, 2024
by
Daniel Hiltgen
Browse files
clean up some logging
parent
bb9de603
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
6 deletions
+2
-6
app/lifecycle/updater_windows.go
app/lifecycle/updater_windows.go
+2
-1
app/tray/wintray/eventloop.go
app/tray/wintray/eventloop.go
+0
-5
No files found.
app/lifecycle/updater_windows.go
View file @
5208cf09
...
...
@@ -48,7 +48,8 @@ func DoUpgrade(cancel context.CancelFunc, done chan int) error {
if
done
!=
nil
{
<-
done
}
else
{
slog
.
Warn
(
"XXX done chan was nil, not actually waiting"
)
// Shouldn't happen
slog
.
Warn
(
"done chan was nil, not actually waiting"
)
}
slog
.
Debug
(
fmt
.
Sprintf
(
"starting installer: %s %v"
,
installerExe
,
installArgs
))
...
...
app/tray/wintray/eventloop.go
View file @
5208cf09
...
...
@@ -45,7 +45,6 @@ func nativeLoop() {
case
0
:
return
default
:
// slog.Debug(fmt.Sprintf("XXX dispatching message from run loop 0x%x", m.Message))
pTranslateMessage
.
Call
(
uintptr
(
unsafe
.
Pointer
(
m
)))
//nolint:errcheck
pDispatchMessage
.
Call
(
uintptr
(
unsafe
.
Pointer
(
m
)))
//nolint:errcheck
...
...
@@ -66,11 +65,9 @@ func (t *winTray) wndProc(hWnd windows.Handle, message uint32, wParam, lParam ui
WM_MOUSEMOVE
=
0x0200
WM_LBUTTONDOWN
=
0x0201
)
// slog.Debug(fmt.Sprintf("XXX in wndProc: 0x%x", message))
switch
message
{
case
WM_COMMAND
:
menuItemId
:=
int32
(
wParam
)
// slog.Debug(fmt.Sprintf("XXX Menu Click: %d", menuItemId))
// https://docs.microsoft.com/en-us/windows/win32/menurc/wm-command#menus
switch
menuItemId
{
case
quitMenuID
:
...
...
@@ -151,7 +148,6 @@ func (t *winTray) wndProc(hWnd windows.Handle, message uint32, wParam, lParam ui
slog
.
Debug
(
fmt
.
Sprintf
(
"unmanaged app message, lParm: 0x%x"
,
lParam
))
}
case
t
.
wmTaskbarCreated
:
// on explorer.exe restarts
slog
.
Debug
(
"XXX got taskbar created event"
)
t
.
muNID
.
Lock
()
err
:=
t
.
nid
.
add
()
if
err
!=
nil
{
...
...
@@ -161,7 +157,6 @@ func (t *winTray) wndProc(hWnd windows.Handle, message uint32, wParam, lParam ui
default
:
// Calls the default window procedure to provide default processing for any window messages that an application does not process.
// https://msdn.microsoft.com/en-us/library/windows/desktop/ms633572(v=vs.85).aspx
// slog.Debug(fmt.Sprintf("XXX default wndProc handler 0x%x", message))
lResult
,
_
,
_
=
pDefWindowProc
.
Call
(
uintptr
(
hWnd
),
uintptr
(
message
),
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment