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
c883822d
Commit
c883822d
authored
May 17, 2022
by
Jacek Caban
Committed by
Alexandre Julliard
May 17, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winemac: Directly use ntdll for registry access in copy_system_cursor_name.
Signed-off-by:
Jacek Caban
<
jacek@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
7f7f9fa2
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
10 deletions
+11
-10
Makefile.in
dlls/winemac.drv/Makefile.in
+1
-1
macdrv.h
dlls/winemac.drv/macdrv.h
+1
-0
macdrv_main.c
dlls/winemac.drv/macdrv_main.c
+1
-1
mouse.c
dlls/winemac.drv/mouse.c
+8
-8
No files found.
dlls/winemac.drv/Makefile.in
View file @
c883822d
EXTRADEFS
=
-DWINE_NO_LONG_TYPES
MODULE
=
winemac.drv
IMPORTS
=
uuid rpcrt4 user32 gdi32
advapi32
win32u
IMPORTS
=
uuid rpcrt4 user32 gdi32 win32u
DELAYIMPORTS
=
ole32 shell32 imm32
EXTRALIBS
=
-framework
AppKit
-framework
Carbon
-framework
Security
-framework
OpenGL
-framework
IOKit
-framework
CoreVideo
-framework
QuartzCore
$(METAL_LIBS)
...
...
dlls/winemac.drv/macdrv.h
View file @
c883822d
...
...
@@ -295,6 +295,7 @@ extern BOOL query_ime_char_rect(macdrv_query* query) DECLSPEC_HIDDEN;
/* registry helpers */
extern
HKEY
open_hkcu_key
(
const
char
*
name
)
DECLSPEC_HIDDEN
;
extern
ULONG
query_reg_value
(
HKEY
hkey
,
const
WCHAR
*
name
,
KEY_VALUE_PARTIAL_INFORMATION
*
info
,
ULONG
size
)
DECLSPEC_HIDDEN
;
extern
HKEY
reg_create_ascii_key
(
HKEY
root
,
const
char
*
name
,
DWORD
options
,
...
...
dlls/winemac.drv/macdrv_main.c
View file @
c883822d
...
...
@@ -122,7 +122,7 @@ HKEY reg_open_key(HKEY root, const WCHAR *name, ULONG name_len)
}
static
HKEY
open_hkcu_key
(
const
char
*
name
)
HKEY
open_hkcu_key
(
const
char
*
name
)
{
WCHAR
bufferW
[
256
];
static
HKEY
hkcu
;
...
...
dlls/winemac.drv/mouse.c
View file @
c883822d
...
...
@@ -195,17 +195,17 @@ CFStringRef copy_system_cursor_name(ICONINFOEXW *info)
else
sprintfW
(
p
,
idW
,
info
->
wResID
);
/* @@ Wine registry key: HKCU\Software\Wine\Mac Driver\Cursors */
if
(
!
RegOpenKeyA
(
HKEY_CURRENT_USER
,
"Software
\\
Wine
\\
Mac Driver
\\
Cursors"
,
&
key
))
if
(
!
(
key
=
open_hkcu_key
(
"Software
\\
Wine
\\
Mac Driver
\\
Cursors"
)
))
{
WCHAR
value
[
64
];
DWORD
size
,
ret
;
char
buffer
[
2048
];
KEY_VALUE_PARTIAL_INFORMATION
*
info
=
(
void
*
)
buffer
;
DWORD
ret
;
value
[
0
]
=
0
;
size
=
sizeof
(
value
);
ret
=
RegQueryValueExW
(
key
,
name
,
NULL
,
NULL
,
(
BYTE
*
)
value
,
&
size
);
RegCloseKey
(
key
);
if
(
!
ret
)
ret
=
query_reg_value
(
key
,
name
,
info
,
sizeof
(
buffer
));
NtClose
(
key
);
if
(
ret
)
{
const
WCHAR
*
value
=
(
const
WCHAR
*
)
info
->
Data
;
if
(
!
value
[
0
])
{
TRACE
(
"registry forces standard cursor for %s
\n
"
,
debugstr_w
(
name
));
...
...
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