Improve Native Methods

ghost1372 · ghost1372 · commit bf2d12fc0c97 · 2025-03-29T18:15:34.000+03:30
diff --git a/dev/DevWinUI/Helpers/PathHelper.cs b/dev/DevWinUI/Helpers/PathHelper.cs
@@ -58,23 +58,13 @@ public static string GetAppDataFolderPath(bool forceUnpackagedMode = false)
     /// <returns></returns>
     public static string GetExecutablePathNative()
     {
-        const uint MAX_Length = 255;
-        Span<char> buffer = stackalloc char[(int)MAX_Length];
+        const int MAX_Length = 255;
+        Span<char> buffer = stackalloc char[MAX_Length];
+        var hModule = PInvoke.GetModuleHandle(string.Empty);
+        SafeHandle safeHandle = new Microsoft.Win32.SafeHandles.SafeFileHandle(hModule.DangerousGetHandle(), ownsHandle: false);
 
-        unsafe
-        {
-            fixed (char* pBuffer = buffer)
-            {
-                uint result = PInvoke.GetModuleFileName(HMODULE.Null, new PWSTR(pBuffer), MAX_Length);
-
-                if (result == 0)
-                {
-                    throw new Win32Exception();
-                }
-
-                return new string(pBuffer, 0, (int)result);
-            }
-        }
+        uint result = PInvoke.GetModuleFileName(safeHandle, buffer);
+        return result > 0 ? buffer.Slice(0, (int)result).ToString() : string.Empty;
     }
 
     /// <summary>
diff --git a/dev/DevWinUI/Helpers/WindowHelper/WindowHelper.cs b/dev/DevWinUI/Helpers/WindowHelper/WindowHelper.cs
@@ -236,21 +236,9 @@ public static string GetWindowText(IntPtr hwnd)
     public static string GetClassName(IntPtr hwnd)
     {
         const int MAX_Length = 256;
-        Span<char> buffer = stackalloc char[(int)MAX_Length];
-
-        unsafe
-        {
-            fixed (char* pBuffer = buffer)
-            {
-                int result = PInvoke.GetClassName(new HWND(hwnd), pBuffer, MAX_Length);
-                if (result > 0)
-                {
-                    string className = new string(pBuffer, 0, result);
-                    return className;
-                }
-            }
-        }
-        return null;
+        Span<char> buffer = stackalloc char[MAX_Length];
+        int result = PInvoke.GetClassName(new HWND(hwnd), buffer);
+        return result > 0 ? buffer.Slice(0, (int)result).ToString() : string.Empty;
     }
 
     /// <summary>
diff --git a/dev/DevWinUI/NativeMethods.txt b/dev/DevWinUI/NativeMethods.txt
@@ -23,6 +23,7 @@ GetCursorPos
 GetDC
 GetDpiForWindow
 GetModuleFileName
+GetModuleHandle
 GetMonitorInfo
 GetPrivateProfileString
 GetStockObject
