[Bug 48545] New: SDL GameControllerAddMapping registry keys do not work

[WineHQ Bugzilla]

https://bugs.winehq.org/show_bug.cgi?id=48545

Bug ID: 48545
           Summary: SDL GameControllerAddMapping registry keys do not work
           Product: Wine
           Version: 5.0
          Hardware: x86
                OS: Mac OS X
            Status: UNCONFIRMED
          Severity: normal
          Priority: P2
         Component: hid
          Assignee: [e-mail]
          Reporter: [e-mail]

The registry entries to add SDL controller mappings do not work
(HKLM/CurrentControlSet/Services/WineBus/Map)

I've discovered the enumeration of the subkeys fails with ERROR_ACCESS_DENIED

If I change the RegOpenKeyExW call (line 1039 of bus_sdl.c) to use KEY_READ
instead of KEY_ENUMERATE_SUB_KEYS the enumeration succeeds and the controller
mappings are passed to SDL.

The registry keys were created with the stock wine regedit program.

I can provide a diff if really required, but I feel like this might be an issue
that needs solving somewhere else (perhaps the default permissions on registry
key creation need tweaking?)

[Bug 48545] SDL GameControllerAddMapping registry keys do not work

[WineHQ Bugzilla]

https://bugs.winehq.org/show_bug.cgi?id=48545

[e-mail] changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |[e-mail]

[Bug 48545] SDL GameControllerAddMapping registry keys do not work

[WineHQ Bugzilla]

https://bugs.winehq.org/show_bug.cgi?id=48545

--- Comment #1 from [e-mail] ---
I can confirm, Map keys are ignored.

[Bug 48545] SDL GameControllerAddMapping registry keys do not work

[WineHQ Bugzilla]

https://bugs.winehq.org/show_bug.cgi?id=48545

--- Comment #2 from Hans Leidekker  ---
(In reply to Zakk from comment #0)
> The registry entries to add SDL controller mappings do not work
> (HKLM/CurrentControlSet/Services/WineBus/Map)
>
> I've discovered the enumeration of the subkeys fails with ERROR_ACCESS_DENIED
>
> If I change the RegOpenKeyExW call (line 1039 of bus_sdl.c) to use KEY_READ
> instead of KEY_ENUMERATE_SUB_KEYS the enumeration succeeds and the
> controller mappings are passed to SDL.
>
> The registry keys were created with the stock wine regedit program.
>
> I can provide a diff if really required, but I feel like this might be an
> issue that needs solving somewhere else (perhaps the default permissions on
> registry key creation need tweaking?)

No, KEY_ENUMERATE_SUB_KEYS is wrong. It should be KEY_READ as you suggested.

[Bug 48545] SDL GameControllerAddMapping registry keys do not work

[WineHQ Bugzilla]

https://bugs.winehq.org/show_bug.cgi?id=48545

--- Comment #3 from Hans Leidekker  ---
Created attachment 68670
  --> https://bugs.winehq.org/attachment.cgi?id=68670
patch

[Bug 48545] SDL GameControllerAddMapping registry keys do not work

[WineHQ Bugzilla]

https://bugs.winehq.org/show_bug.cgi?id=48545

Hans Leidekker  changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|UNCONFIRMED                 |RESOLVED
      Fixed by SHA1|                            |6ce03d93135247fce4e9b231931
                   |                            |9c8e989fd3767
         Resolution|---                         |FIXED

--- Comment #4 from Hans Leidekker  ---
Fix committed as 6ce03d93135247fce4e9b2319319c8e989fd3767.

[Bug 48545] SDL GameControllerAddMapping registry keys do not work

[WineHQ Bugzilla]

https://bugs.winehq.org/show_bug.cgi?id=48545

Alexandre Julliard  changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|RESOLVED                    |CLOSED

--- Comment #5 from Alexandre Julliard  ---
Closing bugs fixed in 6.0-rc1.

[Bug 48545] SDL GameControllerAddMapping registry keys do not work

[WineHQ Bugzilla]

https://bugs.winehq.org/show_bug.cgi?id=48545

Michael Stefaniuc  changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
   Target Milestone|---                         |5.0.x

[Bug 48545] SDL GameControllerAddMapping registry keys do not work

[WineHQ Bugzilla]

https://bugs.winehq.org/show_bug.cgi?id=48545

Michael Stefaniuc  changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
   Target Milestone|5.0.x                       |---

--- Comment #6 from Michael Stefaniuc  ---
Removing the 5.0.x milestone from bug fixes included in 5.0.4.