Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
02972b53
Commit
02972b53
authored
Nov 12, 2022
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winemac: Use RtlGetLastWin32Error() instead of GetLastError().
parent
191b8d01
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
7 deletions
+7
-7
clipboard.c
dlls/winemac.drv/clipboard.c
+2
-2
dllmain.c
dlls/winemac.drv/dllmain.c
+2
-2
mouse.c
dlls/winemac.drv/mouse.c
+1
-1
systray.c
dlls/winemac.drv/systray.c
+2
-2
No files found.
dlls/winemac.drv/clipboard.c
View file @
02972b53
...
...
@@ -285,7 +285,7 @@ static WINE_CLIPFORMAT *insert_clipboard_format(UINT id, CFStringRef type)
if
(
!
NtUserGetClipboardFormatName
(
format
->
format_id
,
buffer
,
ARRAY_SIZE
(
buffer
)))
{
WARN
(
"failed to get name for format %s; error 0x%08x
\n
"
,
debugstr_format
(
format
->
format_id
),
GetLast
Error
());
WARN
(
"failed to get name for format %s; error 0x%08x
\n
"
,
debugstr_format
(
format
->
format_id
),
RtlGetLastWin32
Error
());
free
(
format
);
return
NULL
;
}
...
...
@@ -1428,7 +1428,7 @@ static UINT *get_clipboard_formats(UINT *size)
if
(
!
(
ids
=
malloc
(
*
size
*
sizeof
(
*
ids
))))
return
NULL
;
if
(
NtUserGetUpdatedClipboardFormats
(
ids
,
*
size
,
size
))
break
;
free
(
ids
);
if
(
GetLast
Error
()
!=
ERROR_INSUFFICIENT_BUFFER
)
return
NULL
;
if
(
RtlGetLastWin32
Error
()
!=
ERROR_INSUFFICIENT_BUFFER
)
return
NULL
;
}
register_win32_formats
(
ids
,
*
size
);
return
ids
;
...
...
dlls/winemac.drv/dllmain.c
View file @
02972b53
...
...
@@ -138,7 +138,7 @@ static void CALLBACK quit_callback(HWND hwnd, UINT msg, ULONG_PTR data, LRESULT
quit_callback
,
(
ULONG_PTR
)
qi
))
{
WARN
(
"failed to send WM_ENDSESSION to win %p; error 0x%08x
\n
"
,
qi
->
wins
[
i
],
GetLast
Error
());
qi
->
wins
[
i
],
RtlGetLastWin32
Error
());
quit_callback
(
qi
->
wins
[
i
],
WM_ENDSESSION
,
(
ULONG_PTR
)
qi
,
0
);
}
}
...
...
@@ -197,7 +197,7 @@ NTSTATUS WINAPI macdrv_app_quit_request(void *arg, ULONG size)
if
(
!
SendMessageCallbackW
(
qi
->
wins
[
i
],
WM_QUERYENDSESSION
,
0
,
qi
->
flags
,
quit_callback
,
(
ULONG_PTR
)
qi
))
{
DWORD
error
=
GetLast
Error
();
DWORD
error
=
RtlGetLastWin32
Error
();
BOOL
invalid
=
(
error
==
ERROR_INVALID_WINDOW_HANDLE
);
if
(
invalid
)
TRACE
(
"failed to send WM_QUERYENDSESSION to win %p because it's invalid; assuming success
\n
"
,
...
...
dlls/winemac.drv/mouse.c
View file @
02972b53
...
...
@@ -957,6 +957,6 @@ void macdrv_release_capture(HWND hwnd, const macdrv_event *event)
{
NtUserReleaseCapture
();
if
(
!
NtUserPostMessage
(
capture
,
WM_CANCELMODE
,
0
,
0
))
WARN
(
"failed to post WM_CANCELMODE; error 0x%08x
\n
"
,
GetLast
Error
());
WARN
(
"failed to post WM_CANCELMODE; error 0x%08x
\n
"
,
RtlGetLastWin32
Error
());
}
}
dlls/winemac.drv/systray.c
View file @
02972b53
...
...
@@ -298,7 +298,7 @@ static BOOL notify_owner(struct tray_icon *icon, UINT msg, int x, int y)
TRACE
(
"posting msg 0x%04x to hwnd %p id 0x%x
\n
"
,
msg
,
icon
->
owner
,
icon
->
id
);
if
(
!
NtUserMessageCall
(
icon
->
owner
,
icon
->
callback_message
,
wp
,
lp
,
0
,
NtUserSendNotifyMessage
,
FALSE
)
&&
(
GetLast
Error
()
==
ERROR_INVALID_WINDOW_HANDLE
))
(
RtlGetLastWin32
Error
()
==
ERROR_INVALID_WINDOW_HANDLE
))
{
WARN
(
"window %p was destroyed, removing icon 0x%x
\n
"
,
icon
->
owner
,
icon
->
id
);
delete_icon
(
icon
);
...
...
@@ -343,7 +343,7 @@ void macdrv_status_item_mouse_button(const macdrv_event *event)
msg
+=
WM_LBUTTONDBLCLK
-
WM_LBUTTONDOWN
;
if
(
!
send_message
(
icon
->
owner
,
WM_MACDRV_ACTIVATE_ON_FOLLOWING_FOCUS
,
0
,
0
)
&&
GetLast
Error
()
==
ERROR_INVALID_WINDOW_HANDLE
)
RtlGetLastWin32
Error
()
==
ERROR_INVALID_WINDOW_HANDLE
)
{
WARN
(
"window %p was destroyed, removing icon 0x%x
\n
"
,
icon
->
owner
,
icon
->
id
);
delete_icon
(
icon
);
...
...
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