[breaking] Refactor for consistency with std

hazeycode · hazeycode · commit fe188a2b32d0 · 2025-12-29T17:14:27.000Z
Removes a usingnamespace usage (part of #3)
diff --git a/README.md b/README.md
@@ -55,13 +55,12 @@ pub fn build(b: *std.Build) !void {
 
 ### Bindings Usage Example
 ```zig
-const zwindows = @import("zwindows");
-const windows = zwindows.windows;
-const dwrite = zwindows.dwrite;
-const dxgi = zwindows.dxgi;
-const d3d12 = zwindows.d3d12;
-const d3d12d = zwindows.d3d12d;
-const dml = zwindows.directml;
+const windows = @import("zwindows");
+const dwrite = windows.dwrite;
+const dxgi = windows.dxgi;
+const d3d12 = windows.d3d12;
+const d3d12d = windows.d3d12d;
+const dml = windows.directml;
 // etc
 
 pub fn main() !void {
diff --git a/build.zig b/build.zig
@@ -36,7 +36,7 @@ pub fn build(b: *std.Build) !void {
     }
 
     const zwindows_module = b.addModule("zwindows", .{
-        .root_source_file = b.path("src/zwindows.zig"),
+        .root_source_file = b.path("src/windows.zig"),
         .target = target,
         .optimize = optimize,
     });
diff --git a/build.zig.zon b/build.zig.zon
@@ -1,7 +1,7 @@
 .{
     .name = .zwindows,
     .fingerprint = 0x263908d4bb75c6c4,
-    .version = "0.2.0-dev",
+    .version = "0.3.0-dev",
     .minimum_zig_version = "0.14.0",
     .paths = .{
         "build.zig",
diff --git a/src/dds_loader.zig b/src/dds_loader.zig
@@ -3,10 +3,9 @@
 const std = @import("std");
 const assert = std.debug.assert;
 
-const zwindows = @import("zwindows");
-const windows = zwindows.windows;
-const dxgi = zwindows.dxgi;
-const d3d12 = zwindows.d3d12;
+const windows = @import("zwindows");
+const dxgi = windows.dxgi;
+const d3d12 = windows.d3d12;
 
 const DDS_HEADER_FLAGS_TEXTURE: u32 = 0x00001007; // DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH | DDSD_PIXELFORMAT
 const DDS_HEADER_FLAGS_MIPMAP: u32 = 0x00020000; // DDSD_MIPMAPCOUNT
diff --git a/src/windows.zig b/src/windows.zig
diff --git a/src/windows/d2d1.zig b/src/windows/d2d1.zig
@@ -1,6 +1,6 @@
 const std = @import("std");
 const assert = std.debug.assert;
-const windows = @import("windows.zig");
+const windows = @import("../windows.zig");
 const UINT = windows.UINT;
 const IUnknown = windows.IUnknown;
 const HRESULT = windows.HRESULT;
diff --git a/src/windows/d3d11.zig b/src/windows/d3d11.zig
@@ -1,4 +1,4 @@
-const windows = @import("windows.zig");
+const windows = @import("../windows.zig");
 const IUnknown = windows.IUnknown;
 const UINT = windows.UINT;
 const WINAPI = windows.WINAPI;
diff --git a/src/windows/d3d11on12.zig b/src/windows/d3d11on12.zig
@@ -1,4 +1,4 @@
-const windows = @import("windows.zig");
+const windows = @import("../windows.zig");
 const IUnknown = windows.IUnknown;
 const UINT = windows.UINT;
 const WINAPI = windows.WINAPI;
diff --git a/src/windows/d3d11sdklayers.zig b/src/windows/d3d11sdklayers.zig
@@ -1,4 +1,4 @@
-const windows = @import("windows.zig");
+const windows = @import("../windows.zig");
 const IUnknown = windows.IUnknown;
 const HRESULT = windows.HRESULT;
 const WINAPI = windows.WINAPI;
diff --git a/src/windows/d3d12.zig b/src/windows/d3d12.zig
@@ -1,6 +1,6 @@
 const std = @import("std");
 
-const windows = @import("windows.zig");
+const windows = @import("../windows.zig");
 const UINT = windows.UINT;
 const IUnknown = windows.IUnknown;
 const HRESULT = windows.HRESULT;
diff --git a/src/windows/d3d12sdklayers.zig b/src/windows/d3d12sdklayers.zig
@@ -1,4 +1,4 @@
-const windows = @import("windows.zig");
+const windows = @import("../windows.zig");
 const IUnknown = windows.IUnknown;
 const HRESULT = windows.HRESULT;
 const WINAPI = windows.WINAPI;
diff --git a/src/windows/d3dcommon.zig b/src/windows/d3dcommon.zig
@@ -1,4 +1,4 @@
-const windows = @import("windows.zig");
+const windows = @import("../windows.zig");
 const IUnknown = windows.IUnknown;
 const UINT = windows.UINT;
 const WINAPI = windows.WINAPI;
diff --git a/src/windows/d3dcompiler.zig b/src/windows/d3dcompiler.zig
@@ -1,9 +1,9 @@
-const std = @import("std");
-const WINAPI = std.os.windows.WINAPI;
-const HRESULT = std.os.windows.HRESULT;
-const LPCSTR = std.os.windows.LPCSTR;
-const UINT = std.os.windows.UINT;
-const SIZE_T = std.os.windows.SIZE_T;
+const windows = @import("../windows.zig");
+const WINAPI = windows.WINAPI;
+const HRESULT = windows.HRESULT;
+const LPCSTR = windows.LPCSTR;
+const UINT = windows.UINT;
+const SIZE_T = windows.SIZE_T;
 
 const d3dcommon = @import("d3dcommon.zig");
 
diff --git a/src/windows/directml.zig b/src/windows/directml.zig
@@ -1,6 +1,6 @@
 const std = @import("std");
 const assert = std.debug.assert;
-const windows = @import("windows.zig");
+const windows = @import("../windows.zig");
 const UINT = windows.UINT;
 const UINT64 = windows.UINT64;
 const FLOAT = windows.FLOAT;
diff --git a/src/windows/dwrite.zig b/src/windows/dwrite.zig
@@ -1,4 +1,4 @@
-const windows = @import("windows.zig");
+const windows = @import("../windows.zig");
 const UINT = windows.UINT;
 const IUnknown = windows.IUnknown;
 const GUID = windows.GUID;
diff --git a/src/windows/dxgi.zig b/src/windows/dxgi.zig
@@ -1,4 +1,4 @@
-const windows = @import("windows.zig");
+const windows = @import("../windows.zig");
 const UINT = windows.UINT;
 const UINT64 = windows.UINT64;
 const DWORD = windows.DWORD;
diff --git a/src/windows/mf.zig b/src/windows/mf.zig
@@ -1,4 +1,4 @@
-const windows = @import("windows.zig");
+const windows = @import("../windows.zig");
 const IUnknown = windows.IUnknown;
 const UINT = windows.UINT;
 const UINT32 = windows.UINT32;
diff --git a/src/windows/wasapi.zig b/src/windows/wasapi.zig
@@ -1,4 +1,4 @@
-const windows = @import("windows.zig");
+const windows = @import("../windows.zig");
 const BYTE = windows.BYTE;
 const UINT = windows.UINT;
 const UINT32 = windows.UINT32;
diff --git a/src/windows/wincodec.zig b/src/windows/wincodec.zig
@@ -1,4 +1,4 @@
-const windows = @import("windows.zig");
+const windows = @import("../windows.zig");
 const IUnknown = windows.IUnknown;
 const WINAPI = windows.WINAPI;
 const HRESULT = windows.HRESULT;
diff --git a/src/windows/xapo.zig b/src/windows/xapo.zig
@@ -1,6 +1,7 @@
 const std = @import("std");
 const assert = std.debug.assert;
-const windows = @import("windows.zig");
+
+const windows = @import("../windows.zig");
 const BYTE = windows.BYTE;
 const HRESULT = windows.HRESULT;
 const WINAPI = windows.WINAPI;
@@ -11,6 +12,7 @@ const WCHAR = windows.WCHAR;
 const GUID = windows.GUID;
 const ULONG = windows.ULONG;
 const IUnknown = windows.IUnknown;
+
 const wasapi = @import("wasapi.zig");
 const WAVEFORMATEX = wasapi.WAVEFORMATEX;
 
diff --git a/src/windows/xaudio2.zig b/src/windows/xaudio2.zig
@@ -1,5 +1,5 @@
 const std = @import("std");
-const windows = @import("windows.zig");
+const windows = @import("../windows.zig");
 const IUnknown = windows.IUnknown;
 const BYTE = windows.BYTE;
 const UINT = windows.UINT;
diff --git a/src/windows/xaudio2fx.zig b/src/windows/xaudio2fx.zig
@@ -1,5 +1,5 @@
 const std = @import("std");
-const windows = @import("windows.zig");
+const windows = @import("../windows.zig");
 const IUnknown = windows.IUnknown;
 const BYTE = windows.BYTE;
 const HRESULT = windows.HRESULT;
diff --git a/src/windows/xinput.zig b/src/windows/xinput.zig
@@ -1,5 +1,5 @@
 const std = @import("std");
-const windows = @import("windows.zig");
+const windows = @import("../windows.zig");
 const BYTE = windows.BYTE;
 const WCHAR = windows.WCHAR;
 const SHORT = windows.SHORT;
diff --git a/src/zd3d12.zig b/src/zd3d12.zig
@@ -1,21 +1,20 @@
 const std = @import("std");
 const assert = std.debug.assert;
 
-const zwindows = @import("zwindows");
-const windows = zwindows.windows;
-const dwrite = zwindows.dwrite;
-const dxgi = zwindows.dxgi;
-const d3d11 = zwindows.d3d11;
-const d3d12 = zwindows.d3d12;
-const d3d12d = zwindows.d3d12d;
-const d3d = zwindows.d3d;
-const d2d1 = zwindows.d2d1;
-const d3d11on12 = zwindows.d3d11on12;
-const wic = zwindows.wic;
-const HResultError = zwindows.HResultError;
-const hrPanic = zwindows.hrPanic;
-const hrPanicOnFail = zwindows.hrPanicOnFail;
-const hrErrorOnFail = zwindows.hrErrorOnFail;
+const windows = @import("zwindows");
+const dwrite = windows.dwrite;
+const dxgi = windows.dxgi;
+const d3d11 = windows.d3d11;
+const d3d12 = windows.d3d12;
+const d3d12d = windows.d3d12d;
+const d3d = windows.d3d;
+const d2d1 = windows.d2d1;
+const d3d11on12 = windows.d3d11on12;
+const wic = windows.wic;
+const HResultError = windows.HResultError;
+const hrPanic = windows.hrPanic;
+const hrPanicOnFail = windows.hrPanicOnFail;
+const hrErrorOnFail = windows.hrErrorOnFail;
 
 const dds_loader = @import("dds_loader.zig");
 
diff --git a/src/zwindows.zig b/src/zwindows.zig
diff --git a/src/zxaudio2.zig b/src/zxaudio2.zig

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ pub fn build(b: *std.Build) !void {`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`const zwindows_module = b.addModule("zwindows", .{`
`39`		`- .root_source_file = b.path("src/zwindows.zig"),`
	`39`	`+ .root_source_file = b.path("src/windows.zig"),`
`40`	`40`	`.target = target,`
`41`	`41`	`.optimize = optimize,`
`42`	`42`	`});`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-const windows = @import("windows.zig");`
	`1`	`+const windows = @import("../windows.zig");`
`2`	`2`	`const IUnknown = windows.IUnknown;`
`3`	`3`	`const UINT = windows.UINT;`
`4`	`4`	`const WINAPI = windows.WINAPI;`