Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48639 Signed-off-by: Austin English austinenglish@gmail.com --- dlls/setupapi/setupapi.spec | 4 ++-- dlls/setupapi/stubs.c | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 33ccc48097..07ddcf88cd 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -361,8 +361,8 @@ @ stdcall SetupDiGetINFClassA(str ptr ptr long ptr) @ stdcall SetupDiGetINFClassW(wstr ptr ptr long ptr) @ stub SetupDiGetSelectedDevice -@ stub SetupDiGetSelectedDriverA -@ stub SetupDiGetSelectedDriverW +@ stdcall SetupDiGetSelectedDriverA(ptr ptr) +@ stdcall SetupDiGetSelectedDriverW(ptr ptr) @ stub SetupDiGetWizardPage @ stdcall SetupDiInstallClassA(long str long ptr) @ stub SetupDiInstallClassExA diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 47dca6c150..56a104d867 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -647,3 +647,25 @@ CONFIGRET WINAPI CM_Request_Device_EjectW(DEVINST dev, PPNP_VETO_TYPE type, LPWS FIXME("(0x%08x, %p, %p, %u, 0x%08x) stub\n", dev, type, name, length, flags); return CR_SUCCESS; } + +/*********************************************************************** + * SetupDiGetSelectedDriverA (SETUPAPI.@) + */ +BOOL WINAPI SetupDiGetSelectedDriverA(HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData, + PSP_DRVINFO_DATA_A DriverInfoData) +{ + FIXME("(%p, %p) stub\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/*********************************************************************** + * SetupDiGetSelectedDriverW (SETUPAPI.@) + */ +BOOL WINAPI SetupDiGetSelectedDriverW(HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData, + PSP_DRVINFO_DATA_W DriverInfoData) +{ + FIXME("(%p, %p) stub\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +}
Hi,
While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?
Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=66685
Your paranoid android.
=== debiant (build log) ===
/usr/bin/i686-w64-mingw32-ld: setupapi.dll-ZGFBXv.spec.o:fake:(.edata+0x5d0): undefined reference to `SetupDiGetSelectedDriverA@8' /usr/bin/i686-w64-mingw32-ld: setupapi.dll-ZGFBXv.spec.o:fake:(.edata+0x5d4): undefined reference to `SetupDiGetSelectedDriverW@8' collect2: error: ld returned 1 exit status Task: The win32 build failed
=== debiant (build log) ===
/usr/bin/i686-w64-mingw32-ld: setupapi.dll-K5QLp7.spec.o:fake:(.edata+0x5d0): undefined reference to `SetupDiGetSelectedDriverA@8' /usr/bin/i686-w64-mingw32-ld: setupapi.dll-K5QLp7.spec.o:fake:(.edata+0x5d4): undefined reference to `SetupDiGetSelectedDriverW@8' collect2: error: ld returned 1 exit status Task: The wow32 build failed
On 3/8/20 9:33 AM, Austin English wrote:
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48639 Signed-off-by: Austin English austinenglish@gmail.com
dlls/setupapi/setupapi.spec | 4 ++-- dlls/setupapi/stubs.c | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 33ccc48097..07ddcf88cd 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -361,8 +361,8 @@ @ stdcall SetupDiGetINFClassA(str ptr ptr long ptr) @ stdcall SetupDiGetINFClassW(wstr ptr ptr long ptr) @ stub SetupDiGetSelectedDevice -@ stub SetupDiGetSelectedDriverA -@ stub SetupDiGetSelectedDriverW +@ stdcall SetupDiGetSelectedDriverA(ptr ptr) +@ stdcall SetupDiGetSelectedDriverW(ptr ptr)
Both missing a ptr parameter. Same in traces below.
From the bug report, Zeb have a more complete version.
It would be better to improve on that.
@ stub SetupDiGetWizardPage @ stdcall SetupDiInstallClassA(long str long ptr) @ stub SetupDiInstallClassExA diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 47dca6c150..56a104d867 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -647,3 +647,25 @@ CONFIGRET WINAPI CM_Request_Device_EjectW(DEVINST dev, PPNP_VETO_TYPE type, LPWS FIXME("(0x%08x, %p, %p, %u, 0x%08x) stub\n", dev, type, name, length, flags); return CR_SUCCESS; }
+/***********************************************************************
SetupDiGetSelectedDriverA (SETUPAPI.@)
- */
+BOOL WINAPI SetupDiGetSelectedDriverA(HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData,
PSP_DRVINFO_DATA_A DriverInfoData)
+{
- FIXME("(%p, %p) stub\n");
- SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
- return FALSE;
+}
+/***********************************************************************
SetupDiGetSelectedDriverW (SETUPAPI.@)
- */
+BOOL WINAPI SetupDiGetSelectedDriverW(HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData,
PSP_DRVINFO_DATA_W DriverInfoData)
+{
- FIXME("(%p, %p) stub\n");
- SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
- return FALSE;
+}