Skip to content

Fix 0.16 issues #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mdm5995 wants to merge 1 commit into
base: main
Choose a base branch
from
+20 −10
Open

Fix 0.16 issues #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion build.zig.zon
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
.{
.name = "zigwin32",
.name = .zigwin32,
.fingerprint = 0x2044322985d517e8,
.version = "25.0.28-preview",
.minimum_zig_version = "0.12.0",
Copy link
Copy Markdown

@clembu clembu Mar 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think 0.14 introduced the enum-literal spec for package names, so it would make sense that this bumps as well, even if this parameter isn't handled as of yet.

.paths = .{
Expand Down
27 changes: 18 additions & 9 deletions win32/zig.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ pub fn FormatErrorString(comptime max_len: usize) type {
if (len == 0) {
try writer.writeAll("unknown error");
}
const msg = std.mem.trimRight(u8, buf[0..len], "\r\n");
const msg = std.mem.trimStart(u8, buf[0..len], "\r\n");
try writer.writeAll(msg);
if (len + 1 >= buf.len) {
try writer.writeAll("...");
Expand All @@ -209,7 +209,7 @@ pub fn FormatErrorString(comptime max_len: usize) type {
if (len == 0) {
try writer.writeAll("unknown error");
}
const msg = std.mem.trimRight(u8, buf[0..len], "\r\n");
const msg = std.mem.trimStart(u8, buf[0..len], "\r\n");
try writer.writeAll(msg);
if (len + 1 >= buf.len) {
try writer.writeAll("...");
Expand Down Expand Up @@ -239,7 +239,7 @@ pub const FormatError = struct {

pub const format = if (@import("builtin").zig_version.order(.{ .major = 0, .minor = 15, .patch = 0 }) == .lt)
formatLegacy
else
else
formatNew;
fn formatLegacy(
self: @This(),
Expand Down Expand Up @@ -332,18 +332,25 @@ pub fn pointFromLparam(lparam: win32.LPARAM) win32.POINT {
pub fn loword(value: anytype) u16 {
switch (@typeInfo(@TypeOf(value))) {
.int => |int| switch (int.signedness) {
.signed => return loword(@as(@Type(.{ .int = .{ .signedness = .unsigned, .bits = int.bits } }), @bitCast(value))),
.unsigned => return if (int.bits <= 16) value else @intCast(0xffff & value),
.signed => {
const unsigned_value: @Int(.unsigned, @max(16, int.bits)) = @bitCast(value);
return @truncate(unsigned_value);
},
.unsigned => return @truncate(value),
},
else => {},
}
@compileError("unsupported type " ++ @typeName(@TypeOf(value)));
}

pub fn hiword(value: anytype) u16 {
switch (@typeInfo(@TypeOf(value))) {
.int => |int| switch (int.signedness) {
.signed => return hiword(@as(@Type(.{ .int = .{ .signedness = .unsigned, .bits = int.bits } }), @bitCast(value))),
.unsigned => return @intCast(0xffff & (value >> 16)),
.signed => {
const unsigned_value: @Int(.unsigned, @max(16, int.bits)) = @bitCast(value);
return @truncate(unsigned_value >> 16);
},
.unsigned => return @truncate(value >> 16),
},
else => {},
}
Expand Down Expand Up @@ -436,7 +443,8 @@ fn typedConst2(comptime ReturnType: type, comptime SwitchType: type, comptime va
.int => |target_type_info| {
if (value >= std.math.maxInt(SwitchType)) {
if (target_type_info.signedness == .signed) {
const UnsignedT = @Type(std.builtin.Type{ .int = .{ .signedness = .unsigned, .bits = target_type_info.bits } });
const UnsignedT = @Int(.unsigned, target_type_info.bits);
// const UnsignedT = @Type(std.builtin.Type{ .int = .{ .signedness = .unsigned, .bits = target_type_info.bits } });
return @as(SwitchType, @bitCast(@as(UnsignedT, value)));
}
}
Expand Down Expand Up @@ -473,7 +481,8 @@ fn typedConst2_0_13(comptime ReturnType: type, comptime SwitchType: type, compti
.Int => |target_type_info| {
if (value >= std.math.maxInt(SwitchType)) {
if (target_type_info.signedness == .signed) {
const UnsignedT = @Type(std.builtin.Type{ .Int = .{ .signedness = .unsigned, .bits = target_type_info.bits } });
const UnsignedT = @Int(.unsigned, target_type_info.bits);
// const UnsignedT = @Type(std.builtin.Type{ .Int = .{ .signedness = .unsigned, .bits = target_type_info.bits } });
return @as(SwitchType, @bitCast(@as(UnsignedT, value)));
}
}
Expand Down