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
a0a890b7
Commit
a0a890b7
authored
May 29, 2022
by
Jacek Caban
Committed by
Alexandre Julliard
May 30, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winemac: Detect system cursors from cursor module name in copy_system_cursor_name.
Signed-off-by:
Jacek Caban
<
jacek@codeweavers.com
>
parent
5e18d7d8
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
4 deletions
+6
-4
macdrv.h
dlls/winemac.drv/macdrv.h
+1
-0
mouse.c
dlls/winemac.drv/mouse.c
+5
-4
No files found.
dlls/winemac.drv/macdrv.h
View file @
a0a890b7
...
@@ -367,6 +367,7 @@ static inline UINT asciiz_to_unicode(WCHAR *dst, const char *src)
...
@@ -367,6 +367,7 @@ static inline UINT asciiz_to_unicode(WCHAR *dst, const char *src)
}
}
/* FIXME: remove once we use unixlib */
/* FIXME: remove once we use unixlib */
#define wcsicmp strcmpiW
#define wcsnicmp strncmpiW
#define wcsnicmp strncmpiW
#define wcsrchr strrchrW
#define wcsrchr strrchrW
#define wcstol strtolW
#define wcstol strtolW
...
...
dlls/winemac.drv/mouse.c
View file @
a0a890b7
...
@@ -170,7 +170,7 @@ CFStringRef copy_system_cursor_name(ICONINFOEXW *info)
...
@@ -170,7 +170,7 @@ CFStringRef copy_system_cursor_name(ICONINFOEXW *info)
const
struct
system_cursors
*
cursors
;
const
struct
system_cursors
*
cursors
;
unsigned
int
i
;
unsigned
int
i
;
CFStringRef
cursor_name
=
NULL
;
CFStringRef
cursor_name
=
NULL
;
HMODULE
module
;
const
WCHAR
*
module
;
HKEY
key
;
HKEY
key
;
WCHAR
*
p
,
name
[
MAX_PATH
*
2
];
WCHAR
*
p
,
name
[
MAX_PATH
*
2
];
...
@@ -223,10 +223,11 @@ CFStringRef copy_system_cursor_name(ICONINFOEXW *info)
...
@@ -223,10 +223,11 @@ CFStringRef copy_system_cursor_name(ICONINFOEXW *info)
}
}
if
(
info
->
szResName
[
0
])
goto
done
;
/* only integer resources are supported here */
if
(
info
->
szResName
[
0
])
goto
done
;
/* only integer resources are supported here */
if
(
!
(
module
=
GetModuleHandleW
(
info
->
szModName
)))
goto
done
;
for
(
i
=
0
;
i
<
ARRAY_SIZE
(
module_cursors
);
i
++
)
if
((
module
=
wcsrchr
(
info
->
szModName
,
'\\'
)))
module
++
;
if
(
GetModuleHandleW
(
module_cursors
[
i
].
name
)
==
module
)
break
;
else
module
=
info
->
szModName
;
for
(
i
=
0
;
i
<
ARRAY_SIZE
(
module_cursors
);
i
++
)
if
(
!
wcsicmp
(
module
,
module_cursors
[
i
].
name
))
break
;
if
(
i
==
ARRAY_SIZE
(
module_cursors
))
goto
done
;
if
(
i
==
ARRAY_SIZE
(
module_cursors
))
goto
done
;
cursors
=
module_cursors
[
i
].
cursors
;
cursors
=
module_cursors
[
i
].
cursors
;
...
...
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