Skip to content

Commit 103b350

Browse files
committed
Fix wine
1 parent bb6f2ac commit 103b350

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
2+
index 85eb2976807..36d92b32d1c 100644
3+
--- a/dlls/ntdll/loader.c
4+
+++ b/dlls/ntdll/loader.c
5+
@@ -4620,7 +4620,7 @@ NTSTATUS WINAPI LdrAddDllDirectory( const UNICODE_STRING *dir, void **cookie )
6+
struct dll_dir_entry *ptr;
7+
DOS_PATHNAME_TYPE type = RtlDetermineDosPathNameType_U( dir->Buffer );
8+
9+
- if (type != ABSOLUTE_PATH && type != ABSOLUTE_DRIVE_PATH && type != UNC_PATH)
10+
+ if (type != ABSOLUTE_PATH && type != ABSOLUTE_DRIVE_PATH && type != UNC_PATH && type != DEVICE_PATH)
11+
return STATUS_INVALID_PARAMETER;
12+
13+
status = RtlDosPathNameToNtPathName_U_WithStatus( dir->Buffer, &nt_name, NULL, NULL );

overlays/wine.nix

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
final: prev: {
22
winePackages = prev.winePackages // {
33
minimal = prev.winePackages.minimal.overrideAttrs (oldAttrs: {
4-
# Fix issue with UNC file paths
4+
# Fix issue with UNC device file paths
55
patches = oldAttrs.patches or []
6-
++ final.lib.optional (builtins.compareVersions prev.winePackages.minimal.version "10.0" < 0) ./patches/wine-add-dll-directory.patch;
6+
++ [(if builtins.compareVersions prev.winePackages.minimal.version "10.0" < 0
7+
then ./patches/wine-add-dll-directory.patch
8+
else ./patches/wine-add-dll-directory-10.patch)];
79
# Avoid dependency on X11
810
configureFlags = oldAttrs.configureFlags or [] ++ [ "--without-x" ];
911
});

0 commit comments

Comments
 (0)