[ros-diffs] [reactos] 01/18: [WIN32SS] Rename EngLoadDriverEx to LDEVOBJ_pLoadDriver

[Hervé Poussineau]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3b234cce25191693e4a2d…

commit 3b234cce25191693e4a2d9903080ac6f46fceaac
Author:     Hervé Poussineau <hpoussin(a)reactos.org>
AuthorDate: Sun Jan 9 09:42:23 2022 +0100
Commit:     hpoussin <32227662+hpoussin(a)users.noreply.github.com>
CommitDate: Fri Apr 15 23:09:16 2022 +0200

    [WIN32SS] Rename EngLoadDriverEx to LDEVOBJ_pLoadDriver
---
 win32ss/gdi/eng/device.c  | 2 +-
 win32ss/gdi/eng/ldevobj.c | 8 ++++----
 win32ss/gdi/eng/ldevobj.h | 2 +-
 win32ss/gdi/eng/pdevobj.c | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/win32ss/gdi/eng/device.c b/win32ss/gdi/eng/device.c
index 2777143bf9f..f651c213b09 100644
--- a/win32ss/gdi/eng/device.c
+++ b/win32ss/gdi/eng/device.c
@@ -147,7 +147,7 @@ EngpPopulateDeviceModeList(
     {
         /* Try to load the display driver */
         TRACE("Trying driver: %ls\n", pwsz);
-        pldev = EngLoadImageEx(pwsz, LDEV_DEVICE_DISPLAY);
+        pldev = LDEVOBJ_pLoadDriver(pwsz, LDEV_DEVICE_DISPLAY);
         if (!pldev)
         {
             ERR("Could not load driver: '%ls'\n", pwsz);
diff --git a/win32ss/gdi/eng/ldevobj.c b/win32ss/gdi/eng/ldevobj.c
index 852c6822d25..7afbf1584fa 100644
--- a/win32ss/gdi/eng/ldevobj.c
+++ b/win32ss/gdi/eng/ldevobj.c
@@ -325,7 +325,7 @@ LDEVOBJ_pvFindImageProcAddress(
 
 PLDEVOBJ
 NTAPI
-EngLoadImageEx(
+LDEVOBJ_pLoadDriver(
     _In_z_ LPWSTR pwszDriverName,
     _In_ ULONG ldevtype)
 {
@@ -336,7 +336,7 @@ EngLoadImageEx(
     SIZE_T cwcLength;
     LPWSTR pwsz;
 
-    TRACE("EngLoadImageEx(%ls, %lu)\n", pwszDriverName, ldevtype);
+    TRACE("LDEVOBJ_pLoadDriver(%ls, %lu)\n", pwszDriverName, ldevtype);
     ASSERT(pwszDriverName);
 
     /* Initialize buffer for the the driver name */
@@ -444,7 +444,7 @@ leave:
     /* Unlock loader */
     EngReleaseSemaphore(ghsemLDEVList);
 
-    TRACE("EngLoadImageEx returning %p\n", pldev);
+    TRACE("LDEVOBJ_pLoadDriver returning %p\n", pldev);
     return pldev;
 }
 
@@ -456,7 +456,7 @@ APIENTRY
 EngLoadImage(
     _In_ LPWSTR pwszDriverName)
 {
-    return (HANDLE)EngLoadImageEx(pwszDriverName, LDEV_IMAGE);
+    return (HANDLE)LDEVOBJ_pLoadDriver(pwszDriverName, LDEV_IMAGE);
 }
 
 
diff --git a/win32ss/gdi/eng/ldevobj.h b/win32ss/gdi/eng/ldevobj.h
index cd15f3cc823..c7b803a9a4c 100644
--- a/win32ss/gdi/eng/ldevobj.h
+++ b/win32ss/gdi/eng/ldevobj.h
@@ -42,7 +42,7 @@ LDEVOBJ_pdmiGetModes(
 
 PLDEVOBJ
 APIENTRY
-EngLoadImageEx(
+LDEVOBJ_pLoadDriver(
     _In_z_ LPWSTR pwszDriverName,
     _In_ ULONG ldevtype);
 
diff --git a/win32ss/gdi/eng/pdevobj.c b/win32ss/gdi/eng/pdevobj.c
index a9f959b4b23..e764dea384c 100644
--- a/win32ss/gdi/eng/pdevobj.c
+++ b/win32ss/gdi/eng/pdevobj.c
@@ -386,7 +386,7 @@ EngpCreatePDEV(
     }
 
     /* Try to get a diplay driver */
-    ppdev->pldev = EngLoadImageEx(pdm->dmDeviceName, LDEV_DEVICE_DISPLAY);
+    ppdev->pldev = LDEVOBJ_pLoadDriver(pdm->dmDeviceName, LDEV_DEVICE_DISPLAY);
     if (!ppdev->pldev)
     {
         DPRINT1("Could not load display driver '%ls',
'%ls'\n",