wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 0cc6233e2077c1ef679ecb8bd815d31484868294

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2018-12-04 09:08:05 +11:00
parent 178c0f6d74
commit 6fb7d85916
9 changed files with 67 additions and 423 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
patches/setupapi-SetupDiGetDeviceInterfaceDetail/0003-setupapi-SetupDiGetDeviceInterfaceDetail-should-fill.patch
View File

@@ -1,4 +1,4 @@
From 181e8775404470eef952667261555d960e636585 Mon Sep 17 00:00:00 2001
From b0160bd38c99d74d4f9edee766e1247856b443ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Fri, 19 Aug 2016 00:47:08 +0200
Subject: [PATCH] setupapi: SetupDiGetDeviceInterfaceDetail should fill out
@@ -10,10 +10,10 @@ Subject: [PATCH] setupapi: SetupDiGetDeviceInterfaceDetail should fill out
2 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c
index 93c26ce..b2fc7f8 100644
index fa4036b..42cf5dd 100644
--- a/dlls/setupapi/devinst.c
+++ b/dlls/setupapi/devinst.c
@@ -2873,9 +2873,6 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailA(
@@ -2819,9 +2819,6 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailA(HDEVINFO devinfo, SP_DEVICE_INTERFA
else
DeviceInterfaceDetailData->DevicePath[0] = '\0';
@@ -23,7 +23,7 @@ index 93c26ce..b2fc7f8 100644
ret = TRUE;
}
else
@@ -2884,6 +2881,10 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailA(
@@ -2830,6 +2827,10 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailA(HDEVINFO devinfo, SP_DEVICE_INTERFA
*RequiredSize = bytesNeeded;
SetLastError(ERROR_INSUFFICIENT_BUFFER);
}
@@ -34,7 +34,7 @@ index 93c26ce..b2fc7f8 100644
return ret;
}
@@ -2943,9 +2944,6 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailW(
@@ -2874,9 +2875,6 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailW(HDEVINFO devinfo, SP_DEVICE_INTERFA
else
DeviceInterfaceDetailData->DevicePath[0] = '\0';
@@ -44,7 +44,7 @@ index 93c26ce..b2fc7f8 100644
ret = TRUE;
}
else
@@ -2954,6 +2952,10 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailW(
@@ -2885,6 +2883,10 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailW(HDEVINFO devinfo, SP_DEVICE_INTERFA
*RequiredSize = bytesNeeded;
SetLastError(ERROR_INSUFFICIENT_BUFFER);
}
@@ -56,10 +56,10 @@ index 93c26ce..b2fc7f8 100644
}
diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c
index 7d485dd..ba4fe80 100644
index 38be0a7..f523ef4 100644
--- a/dlls/setupapi/tests/devinst.c
+++ b/dlls/setupapi/tests/devinst.c
@@ -815,6 +815,13 @@ static void test_device_iface_detail(void)
@@ -725,6 +725,13 @@ static void test_device_iface_detail(void)
ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Got unexpected error %#x.\n", GetLastError());
ok(size == expectedsize, "Got unexpected size %d.\n", size);
@@ -72,7 +72,7 @@ index 7d485dd..ba4fe80 100644
+
heap_free(detail);
SetupDiDestroyDeviceInfoList(set);
}
--
1.9.1