refactor(all): more code cleanup

Author: Septh

source/demos/createwindow.ts

@@ -3,15 +3,13 @@ import {
     RegisterClassEx, LoadCursor, LoadIcon, WNDCLASSEX,
     CreateWindowEx, ShowWindow, UpdateWindow, DefWindowProc,
     GetMessage, TranslateMessage, DispatchMessage, PostQuitMessage,
-    MessageBox,
-    type HINSTANCE, type WPARAM, type LPARAM, type HWND, type MSG,
-    FormatMessage
+    FormatMessage, MessageBox,
+    type HINSTANCE, type WPARAM, type LPARAM, type HWND, type MSG
 } from 'libwin32'
 import { CS_, CW_, FORMAT_MESSAGE_, IDC_, IDI_, MB_, SW_, WM_, WS_, WS_EX_ } from 'libwin32/consts'
 
-const windowClass = "NodeApp"
-const windowName  = "Window Demo!"
-const appTitle    = "A NodeJS app using the Win32 API"
+const windowClass = 'libwin32_app'
+const windowName  = 'libwin32 demo: CreateWindow'
 
 function wndProc(hWnd: HWND, uMmsg: WM_, wParam: WPARAM, lParam: LPARAM) {
 
@@ -33,18 +31,19 @@ function wndProc(hWnd: HWND, uMmsg: WM_, wParam: WPARAM, lParam: LPARAM) {
 
 function WinMain(hInstance: HINSTANCE, nCmdShow: SW_): number {
 
-    using wcex = new WNDCLASSEX(wndProc)    // Note: cbSize is set by the WNDCLASSEX constructor
+    const wcex = new WNDCLASSEX()   // Note: cbSize is set by the WNDCLASSEX constructor
     wcex.lpszClassName = windowClass
     wcex.style         = CS_.HREDRAW | CS_.VREDRAW
     wcex.hInstance     = hInstance
+    wcex.lpfnWndProc   = wndProc
     wcex.hCursor       = LoadCursor(null, IDC_.ARROW)
     wcex.hIcon         = LoadIcon(hInstance, IDI_.APPLICATION)
     wcex.hIconSm       = LoadIcon(hInstance, IDI_.APPLICATION)
-    wcex.hbrBackground = 13 as any          // Note: brushes are not yet implemented. 13 is the standard background.
+    wcex.hbrBackground = 13 as any  // Note: brushes are not yet implemented. 13 is the standard background.
 
     const atom = RegisterClassEx(wcex)
     if (!atom) {
-        MessageBox(null, "Call to RegisterClassEx failed!", appTitle, MB_.OK | MB_.ICONERROR)
+        MessageBox(null, 'Call to RegisterClassEx failed!', 'libwin32', MB_.OK | MB_.ICONERROR)
         return 1
     }
 
@@ -58,7 +57,7 @@ function WinMain(hInstance: HINSTANCE, nCmdShow: SW_): number {
     if (!hWnd) {
         const err = GetLastError()
         const msg = FormatMessage(FORMAT_MESSAGE_.FROM_SYSTEM, null, err, 0)
-        MessageBox(null, "Call to CreateWindow failed!\n" + msg, appTitle, MB_.OK | MB_.ICONERROR)
+        MessageBox(null, 'Call to CreateWindowEx failed!\n' + msg, 'libwin32', MB_.OK | MB_.ICONERROR)
         return err
     }
 

source/win32/kernel32/error.ts

@@ -3,6 +3,31 @@ import { cDWORD, cLPCVOID, cLPWSTR, cVOID, type HMODULE } from '../ctypes.js'
 import type { FORMAT_MESSAGE_ } from '../consts.js'
 import { kernel32 } from './_lib.js'
 
+/**
+ * Formats a message string.
+ *
+ * Note: the Arguments parameter is not yet supported. Right now, you can use FormatMessage()
+ *       to retrieve the message text for a system-defined error returned by GetLastError().
+ *
+ * https://learn.microsoft.com/en-us/windows/win32/api/winbase/nf-winbase-formatmessagew
+ */
+export function FormatMessage(dwFlags: FORMAT_MESSAGE_ | number, lpSource: HMODULE | string | null, dwMessageId: number, dwLanguageId: number): string {
+    FormatMessage.fn ??= kernel32.func('FormatMessageW', cDWORD, [ cDWORD, cLPCVOID, cDWORD, cDWORD, cLPWSTR, cDWORD, '...' as any ])
+
+    const out = new Uint16Array(2048)
+    const len = FormatMessage.fn(
+        dwFlags, lpSource, dwMessageId, dwLanguageId,
+        out, out.length,
+        'int', 0    // Fake va_list
+    )
+    return textDecoder.decode(out.slice(0, len))
+}
+
+/** @internal */
+export declare namespace FormatMessage {
+    export var fn: koffi.KoffiFunc<(dwFlags: number, lpSource: HMODULE | string | null, dwMessageId: number, dwLanguageId: number, lpBuffer: Uint16Array, nSize: number, ...args: any[]) => number>
+}
+
 /**
  * Retrieves the calling thread's last-error code value.
  *
@@ -32,28 +57,3 @@ export function SetLastError(dwErrcode: number): void {
 export declare namespace SetLastError {
     export var fn: koffi.KoffiFunc<(dwErrcode: number) => void>
 }
-
-/**
- * Formats a message string.
- *
- * Note: the Arguments parameter is not yet supported. Right now, you can use FormatMessage()
- *       to retrieve the message text for a system-defined error returned by GetLastError().
- *
- * https://learn.microsoft.com/en-us/windows/win32/api/winbase/nf-winbase-formatmessagew
- */
-export function FormatMessage(dwFlags: FORMAT_MESSAGE_ | number, lpSource: HMODULE | string | null, dwMessageId: number, dwLanguageId: number): string {
-    FormatMessage.fn ??= kernel32.func('FormatMessageW', cDWORD, [ cDWORD, cLPCVOID, cDWORD, cDWORD, cLPWSTR, cDWORD, '...' as any ])
-
-    const out = new Uint16Array(2048)
-    const len = FormatMessage.fn(
-        dwFlags, lpSource, dwMessageId, dwLanguageId,
-        out, out.length,
-        'int', 0    // Fake va_list
-    )
-    return textDecoder.decode(out.slice(0, len))
-}
-
-/** @internal */
-export declare namespace FormatMessage {
-    export var fn: koffi.KoffiFunc<(dwFlags: number, lpSource: HMODULE | string | null, dwMessageId: number, dwLanguageId: number, lpBuffer: Uint16Array, nSize: number, ...args: any[]) => number>
-}

source/win32/kernel32/process.ts

@@ -21,33 +21,33 @@ export declare namespace CloseHandle {
 }
 
 /**
- * Opens an existing local process object.
+ * Retrieves a pseudo handle for the current process.
  *
- * https://learn.microsoft.com/en-us/windows/win32/api/processthreadsapi/nf-processthreadsapi-openprocess
+ * https://learn.microsoft.com/en-us/windows/win32/api/processthreadsapi/nf-processthreadsapi-getcurrentprocess
  */
-export function OpenProcess(dwDesiredAccess: PSAR_ | number, bInheritHandle: boolean, dwProcessId: number): HANDLE | null {
-    OpenProcess.fn ??= kernel32.func('OpenProcess', cHANDLE, [ cDWORD, cBOOL, cDWORD ])
-    return OpenProcess.fn(dwDesiredAccess, Number(bInheritHandle), dwProcessId)
+export function GetCurrentProcess(): HANDLE {
+    GetCurrentProcess.fn ??= kernel32.func('GetCurrentProcess', cHANDLE, [])
+    return GetCurrentProcess.fn()
 }
 
 /** @internal */
-export declare namespace OpenProcess {
-    export var fn: koffi.KoffiFunc<(dwDesiredAccess: PSAR_ | number, bInheritHandle: number, dwProcessId: number) => HANDLE>
+export declare namespace GetCurrentProcess {
+    export var fn: koffi.KoffiFunc<() => HANDLE>
 }
 
 /**
- * Retrieves a pseudo handle for the current process.
+ * Opens an existing local process object.
  *
- * https://learn.microsoft.com/en-us/windows/win32/api/processthreadsapi/nf-processthreadsapi-getcurrentprocess
+ * https://learn.microsoft.com/en-us/windows/win32/api/processthreadsapi/nf-processthreadsapi-openprocess
  */
-export function GetCurrentProcess(): HANDLE {
-    GetCurrentProcess.fn ??= kernel32.func('GetCurrentProcess', cHANDLE, [])
-    return GetCurrentProcess.fn()
+export function OpenProcess(dwDesiredAccess: PSAR_ | number, bInheritHandle: boolean, dwProcessId: number): HANDLE | null {
+    OpenProcess.fn ??= kernel32.func('OpenProcess', cHANDLE, [ cDWORD, cBOOL, cDWORD ])
+    return OpenProcess.fn(dwDesiredAccess, Number(bInheritHandle), dwProcessId)
 }
 
 /** @internal */
-export declare namespace GetCurrentProcess {
-    export var fn: koffi.KoffiFunc<() => HANDLE>
+export declare namespace OpenProcess {
+    export var fn: koffi.KoffiFunc<(dwDesiredAccess: PSAR_ | number, bInheritHandle: number, dwProcessId: number) => HANDLE>
 }
 
 /**

source/win32/user32.ts

@@ -1,10 +1,9 @@
 export { user32 } from './user32/_lib.js'
-export * from './user32/class.js'
+export * from './user32/wndclass.js'
 export * from './user32/cursor.js'
 export * from './user32/icon.js'
 export * from './user32/image.js'
 export * from './user32/menu.js'
 export * from './user32/message.js'
 export * from './user32/messagebox.js'
-export * from './user32/point.js'
 export * from './user32/window.js'

source/win32/user32/cursor.ts

@@ -1,10 +1,11 @@
+import { koffi } from '../private.js'
 import {
     cBOOL, cLPCWSTR, cHANDLE,
+    cPOINT, type POINT,
     type HINSTANCE, type HCURSOR
 } from '../ctypes.js'
 import type { IDC_ } from '../consts.js'
 import { user32 } from './_lib.js'
-import type { koffi } from '../private.js'
 
 /**
  * Destroys a cursor and frees any memory the cursor occupied.
@@ -21,6 +22,21 @@ export declare namespace DestroyCursor {
     export var fn: koffi.KoffiFunc<(hCursor: HCURSOR) => number>
 }
 
+/**
+ * Retrieves the cursor's position, in screen coordinates.
+ *
+ * https://learn.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-getcursorpos
+ */
+export function GetCursorPos(lpPoint: POINT): number {
+    GetCursorPos.fn ??= user32.func('GetCursorPos', cBOOL, [ koffi.out(cPOINT) ])
+    return GetCursorPos.fn(lpPoint)
+}
+
+/** @internal */
+export declare namespace GetCursorPos {
+    export var fn: koffi.KoffiFunc<(lpPoint: POINT) => number>
+}
+
 /**
  * Loads the specified cursor resource from the executable (.exe) file associated with an application instance.
  *