Skip to content
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

Use ANSI Windows API to fix improper UTF-16 use #13

Merged
merged 2 commits into from
Jan 24, 2024
Merged

Use ANSI Windows API to fix improper UTF-16 use #13

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
343f2e6
fix use of utf16 into uttf8 buffer
lachlanm-git Jan 21, 2024
032e374
Additional fix of improper "wide" use
lachlanm-git Jan 22, 2024
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
22 changes: 15 additions & 7 deletions src/serial.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,12 +234,12 @@ const WindowsInformationIterator = struct {
var port_length: std.os.windows.DWORD = std.os.windows.NAME_MAX;
var data_type: std.os.windows.DWORD = 0;

const result = std.os.windows.advapi32.RegQueryValueExW(
const result = RegQueryValueExA(
hkey,
std.unicode.utf8ToUtf16LeStringLiteral(key_token),
@as(std.os.windows.LPSTR, @ptrCast(@constCast(key_token))),
null,
&data_type,
@as(?*std.os.windows.BYTE, @ptrCast(port_name)),
port_name,
&port_length,
);

Expand All @@ -256,12 +256,12 @@ const WindowsInformationIterator = struct {
var data_type: std.os.windows.DWORD = 0;
var bytes_required: std.os.windows.DWORD = std.os.windows.MAX_PATH;

const result = SetupDiGetDeviceRegistryPropertyW(
const result = SetupDiGetDeviceRegistryPropertyA(
device_info_set.*,
device_info_data,
@intFromEnum(property),
&data_type,
@as(?*std.os.windows.BYTE, @ptrCast(property_str)),
property_str,
std.os.windows.NAME_MAX,
&bytes_required,
);
Expand Down Expand Up @@ -405,6 +405,14 @@ extern "advapi32" fn RegEnumValueA(
lpData: [*]std.os.windows.BYTE,
lpcbData: *std.os.windows.DWORD,
) callconv(std.os.windows.WINAPI) std.os.windows.LSTATUS;
extern "advapi32" fn RegQueryValueExA(
hKey: HKEY,
lpValueName: std.os.windows.LPSTR,
lpReserved: ?*std.os.windows.DWORD,
lpType: ?*std.os.windows.DWORD,
lpData: ?[*]std.os.windows.BYTE,
lpcbData: ?*std.os.windows.DWORD,
) callconv(std.os.windows.WINAPI) std.os.windows.LSTATUS;
extern "setupapi" fn SetupDiGetClassDevsW(
classGuid: ?*const std.os.windows.GUID,
enumerator: ?std.os.windows.PCWSTR,
Expand All @@ -425,12 +433,12 @@ extern "setupapi" fn SetupDiOpenDevRegKey(
keyType: std.os.windows.DWORD,
samDesired: std.os.windows.REGSAM,
) callconv(std.os.windows.WINAPI) HKEY;
extern "setupapi" fn SetupDiGetDeviceRegistryPropertyW(
extern "setupapi" fn SetupDiGetDeviceRegistryPropertyA(
hDevInfo: HDEVINFO,
pSpDevInfoData: *SP_DEVINFO_DATA,
property: std.os.windows.DWORD,
propertyRegDataType: ?*std.os.windows.DWORD,
propertyBuffer: ?*std.os.windows.BYTE,
propertyBuffer: ?[*]std.os.windows.BYTE,
propertyBufferSize: std.os.windows.DWORD,
requiredSize: ?*std.os.windows.DWORD,
) callconv(std.os.windows.WINAPI) std.os.windows.BOOL;
Expand Down