JuliaLang · LilithHafner · Jan 8, 2025 · Oct 11, 2024 · Oct 11, 2024 · Oct 18, 2024
diff --git a/contrib/asan/build.sh b/contrib/asan/build.sh
diff --git a/contrib/asan/check.jl b/contrib/asan/check.jl
diff --git a/contrib/bpftrace/gc_all.bt b/contrib/bpftrace/gc_all.bt
diff --git a/contrib/bpftrace/gc_simple.bt b/contrib/bpftrace/gc_simple.bt
diff --git a/contrib/bpftrace/gc_stop_the_world_latency.bt b/contrib/bpftrace/gc_stop_the_world_latency.bt
diff --git a/contrib/bpftrace/rt_all.bt b/contrib/bpftrace/rt_all.bt
diff --git a/contrib/check-whitespace.jl b/contrib/check-whitespace.jl
diff --git a/contrib/commit-name.sh b/contrib/commit-name.sh
diff --git a/contrib/delete-all-rpaths.sh b/contrib/delete-all-rpaths.sh
diff --git a/contrib/download_cmake.sh b/contrib/download_cmake.sh
diff --git a/contrib/excise_stdlib.sh b/contrib/excise_stdlib.sh
diff --git a/contrib/fixup-libgfortran.sh b/contrib/fixup-libgfortran.sh
diff --git a/contrib/fixup-libstdc++.sh b/contrib/fixup-libstdc++.sh
diff --git a/contrib/fixup-rpath.sh b/contrib/fixup-rpath.sh
diff --git a/contrib/install.sh b/contrib/install.sh
diff --git a/contrib/julia-config.jl b/contrib/julia-config.jl
diff --git a/contrib/mac/app/notarize_check.sh b/contrib/mac/app/notarize_check.sh
diff --git a/contrib/mac/app/renotarize_dmg.sh b/contrib/mac/app/renotarize_dmg.sh
diff --git a/contrib/new-stdlib.sh b/contrib/new-stdlib.sh
diff --git a/contrib/normalize_triplet.py b/contrib/normalize_triplet.py
diff --git a/contrib/prepare_release.sh b/contrib/prepare_release.sh
diff --git a/contrib/relative_path.py b/contrib/relative_path.py
diff --git a/contrib/tsan/build.sh b/contrib/tsan/build.sh
diff --git a/contrib/windows/icon-readme.md b/contrib/windows/icon-readme.md
diff --git a/contrib/windows/julia-banner.bmp b/contrib/windows/julia-banner.bmp
diff --git a/contrib/windows/julia.ico b/contrib/windows/julia.ico
diff --git a/deps/tools/jlchecksum b/deps/tools/jlchecksum
diff --git a/deps/tools/jldownload b/deps/tools/jldownload
diff --git a/src/flisp/bootstrap.sh b/src/flisp/bootstrap.sh
diff --git a/test/strings/basic.jl b/test/strings/basic.jl
@@ -1409,3 +1409,18 @@ end
         @test transcode(String, transcode(UInt8, transcode(UInt16, str))) == str
     end
 end
+
+@testset "cwstring" begin
 if ccall(:jl_get_UNAME, Any, ()) === :NT 
 """ 
     Base.cwstring(s) 
 Converts a string `s` to a NUL-terminated `Vector{Cwchar_t}`, suitable for passing to C 
 functions expecting a `Ptr{Cwchar_t}`. The main advantage of using this over the implicit 
 conversion provided by [`Cwstring`](@ref) is if the function is called multiple times with the 
 same argument. 
 This is only available on Windows. 
 """ 
 function cwstring(s::AbstractString) 
     bytes = codeunits(String(s)) 
     0 in bytes && throw(ArgumentError("embedded NULs are not allowed in C strings: $(repr(s))")) 
     return push!(transcode(UInt16, bytes), 0) 
 end 
 end 
 if ccall(:jl_get_UNAME, Any, ()) === :NT 
 """ 
     Base.cwstring(s) 
  
 Converts a string `s` to a NUL-terminated `Vector{Cwchar_t}`, suitable for passing to C 
 functions expecting a `Ptr{Cwchar_t}`. The main advantage of using this over the implicit 
 conversion provided by [`Cwstring`](@ref) is if the function is called multiple times with the 
 same argument. 
  
 This is only available on Windows. 
 """ 
 function cwstring(s::AbstractString) 
     bytes = codeunits(String(s)) 
     0 in bytes && throw(ArgumentError("embedded NULs are not allowed in C strings: $(repr(s))")) 
     return push!(transcode(UInt16, bytes), 0) 
 end 
 end 
+    # empty string
+    str_0 = ""
+    # string with embedded NUL character
+    str_1 = "Au\000B"
+    # string with terminating NUL character
+    str_2 = "Wordu\000"
+    # "Regular" string with UTF-8 characters of differing byte counts
+    str_3 = "aܣ𒀀"
+    @test Base.cwstring(str_0) = UInt16[0x0000]
+    @test_throws ArgumentError Base.cwstring(str_1)
+    @test Base.cwstring(str_2) == UInt16[0x0057, 0x006f, 0x0072, 0x0064, 0x0000]
+    @test Base.cwstring(str_3) == UInt16[0x0061, 0x0723, 0xd808, 0xdc00, 0x0000]
+end