Brendan Shanks : ntdll: Stop using deprecated kIOMasterPortDefault constant.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 13cc08e32d6c04f8f915d07cda39638ee99c3d43
URL:    https://gitlab.winehq.org/wine/wine/-/commit/13cc08e32d6c04f8f915d07cda39638...

Author: Brendan Shanks 
Date:   Tue Nov  8 10:47:23 2022 -0800

ntdll: Stop using deprecated kIOMasterPortDefault constant.

---

dlls/ntdll/unix/cdrom.c  | 2 +-
 dlls/ntdll/unix/system.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/ntdll/unix/cdrom.c b/dlls/ntdll/unix/cdrom.c
index a9385daf099..a4a9400a518 100644
--- a/dlls/ntdll/unix/cdrom.c
+++ b/dlls/ntdll/unix/cdrom.c
@@ -367,7 +367,7 @@ static NTSTATUS get_parent_device( int fd, char *name, size_t len )

CFDictionaryAddValue( dict, CFSTR("Removable"), kCFBooleanTrue );

-    service = IOServiceGetMatchingService( kIOMasterPortDefault, dict );
+    service = IOServiceGetMatchingService( 0, dict );

/* now look for the parent that has the "Whole" attribute set to TRUE */

diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c
index 4ca07c2e34c..ba2051da65e 100644
--- a/dlls/ntdll/unix/system.c
+++ b/dlls/ntdll/unix/system.c
@@ -1632,7 +1632,7 @@ static NTSTATUS get_smbios_from_iokit( SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti,
     struct smbios_prologue *prologue;
     BYTE major_version = 2, minor_version = 0;

-    if (!(service = IOServiceGetMatchingService(kIOMasterPortDefault, IOServiceMatching("AppleSMBIOS"))))
+    if (!(service = IOServiceGetMatchingService(0, IOServiceMatching("AppleSMBIOS"))))
     {
         WARN("can't find AppleSMBIOS service\n");
         return STATUS_NO_MEMORY;
@@ -1727,7 +1727,7 @@ static NTSTATUS generate_smbios( SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG
     struct smbios_board_args board_args;
     struct smbios_chassis_args chassis_args;

-    platform_expert = IOServiceGetMatchingService(kIOMasterPortDefault, IOServiceMatching("IOPlatformExpertDevice"));
+    platform_expert = IOServiceGetMatchingService(0, IOServiceMatching("IOPlatformExpertDevice"));
     if (!platform_expert)
         return STATUS_NO_MEMORY;

@@ -3493,7 +3493,7 @@ static NTSTATUS fill_battery_state( SYSTEM_BATTERY_STATE *bs )
     uint32_t value, voltage;
     CFTimeInterval remain;

-    if (IOPMCopyBatteryInfo( kIOMasterPortDefault, &batteries ) != kIOReturnSuccess)
+    if (IOPMCopyBatteryInfo( 0, &batteries ) != kIOReturnSuccess)
         return STATUS_ACCESS_DENIED;

if (CFArrayGetCount( batteries ) == 0)