[PATCH v2 0/1] MR2417: setupapi: Stub in CM_MapCrToWin32Err

[James McDonnell (＠ElementalWarrior)]

Stub for affinity photo

--
  v2: setupapi: Stub in CM_MapCrToWin32Err

https://gitlab.winehq.org/wine/wine/-/merge_requests/2417

[PATCH v2 1/1] setupapi: Stub in CM_MapCrToWin32Err

[James McDonnell]

From: James McDonnell

---
 dlls/cfgmgr32/cfgmgr32.spec | 1 +
 dlls/setupapi/setupapi.spec | 1 +
 dlls/setupapi/stubs.c       | 6 ++++++
 3 files changed, 8 insertions(+)

diff --git a/dlls/cfgmgr32/cfgmgr32.spec b/dlls/cfgmgr32/cfgmgr32.spec
index 69ec784de68..70cc34b9c4e 100644
--- a/dlls/cfgmgr32/cfgmgr32.spec
+++ b/dlls/cfgmgr32/cfgmgr32.spec
@@ -184,3 +184,4 @@
 @ stub CM_Unregister_Device_InterfaceW
 @ stub CM_Unregister_Device_Interface_ExA
 @ stub CM_Unregister_Device_Interface_ExW
+@ stdcall CM_MapCrToWin32Err(ptr long) setupapi.CM_MapCrToWin32Err
diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec
index 7578fb25c9c..665696e5672 100644
--- a/dlls/setupapi/setupapi.spec
+++ b/dlls/setupapi/setupapi.spec
@@ -602,3 +602,4 @@
 @ stdcall pSetupStringTableSetExtraData(ptr long ptr long) StringTableSetExtraData
 @ stub pSetupVerifyCatalogFile
 @ stub pSetupVerifyQueuedCatalogs
+@ stdcall CM_MapCrToWin32Err(ptr long)
diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c
index 75185de047c..29d75336369 100644
--- a/dlls/setupapi/stubs.c
+++ b/dlls/setupapi/stubs.c
@@ -667,6 +667,11 @@ CONFIGRET WINAPI CM_Request_Device_EjectW(DEVINST dev, PPNP_VETO_TYPE type, LPWS
     return CR_SUCCESS;
 }

+DWORD WINAPI CM_MapCrToWin32Err(CONFIGRET cmReturnCode, DWORD defaultErr) {
+    FIXME("cmReturnCode %ld, defaultErr %ld stub!\n", cmReturnCode, defaultErr);
+    return CR_SUCCESS;
+}
+
 BOOL WINAPI SetupDiGetClassRegistryPropertyW(const GUID *class, DWORD prop, DWORD *datatype, BYTE *buff, DWORD size,
     DWORD *req_size, const WCHAR *name, VOID *reserved)
 {
@@ -675,3 +680,4 @@ BOOL WINAPI SetupDiGetClassRegistryPropertyW(const GUID *class, DWORD prop, DWOR
     SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
     return FALSE;
 }
+

[PATCH v2 1/1] setupapi: Stub in CM_MapCrToWin32Err

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=130654

Your paranoid android.

=== debian11 (32 bit report) ===

qasf:
asfreader.c:947: Test failed: blocking 0: Got hr 0x80040216.
Unhandled exception: page fault on read access to 0x00000002 in 32-bit code (0x00402106).

[Alexandre Julliard (＠julliard)]

Superseded by !2231.

[PATCH v2 0/1] MR2417: setupapi: Stub in CM_MapCrToWin32Err - closed

[Alexandre Julliard (＠julliard)]

This merge request was closed by Alexandre Julliard.