[PATCH v5 0/2] MR2231: cfgmgr32: Implement CM_MapCrToWin32Err.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53781 The Matrix Awakens MegaCity Unreal Engine 5.1 demo and Hogwarts Legacy call this. Duplicate Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54513 -- v5: cfgmgr32/tests: Add CM_MapCrToWin32Err tests. cfgmgr32: Implement CM_MapCrToWin32Err. https://gitlab.winehq.org/wine/wine/-/merge_requests/2231
From: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53781 --- dlls/cfgmgr32/Makefile.in | 3 ++ dlls/cfgmgr32/cfgmgr32.spec | 1 + dlls/cfgmgr32/main.c | 58 +++++++++++++++++++++++++++++++++++++ include/cfgmgr32.h | 1 + 4 files changed, 63 insertions(+) create mode 100644 dlls/cfgmgr32/main.c diff --git a/dlls/cfgmgr32/Makefile.in b/dlls/cfgmgr32/Makefile.in index 10621fa5dc7..f05b3176aa3 100644 --- a/dlls/cfgmgr32/Makefile.in +++ b/dlls/cfgmgr32/Makefile.in @@ -1,3 +1,6 @@ MODULE = cfgmgr32.dll IMPORTLIB = cfgmgr32 IMPORTS = setupapi + +C_SRCS = \ + main.c diff --git a/dlls/cfgmgr32/cfgmgr32.spec b/dlls/cfgmgr32/cfgmgr32.spec index 69ec784de68..3b4f6106618 100644 --- a/dlls/cfgmgr32/cfgmgr32.spec +++ b/dlls/cfgmgr32/cfgmgr32.spec @@ -126,6 +126,7 @@ @ stdcall CM_Locate_DevNodeW(ptr wstr long) setupapi.CM_Locate_DevNodeW @ stdcall CM_Locate_DevNode_ExA(ptr str long long) setupapi.CM_Locate_DevNode_ExA @ stdcall CM_Locate_DevNode_ExW(ptr wstr long long) setupapi.CM_Locate_DevNode_ExW +@ stdcall CM_MapCrToWin32Err(long long) @ stub CM_Merge_Range_List @ stub CM_Modify_Res_Des @ stub CM_Modify_Res_Des_Ex diff --git a/dlls/cfgmgr32/main.c b/dlls/cfgmgr32/main.c new file mode 100644 index 00000000000..f0907bbc9bd --- /dev/null +++ b/dlls/cfgmgr32/main.c @@ -0,0 +1,58 @@ +/* + * Copyright (C) 2023 Mohamad Al-Jaf + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/debug.h" +#include "cfgmgr32.h" + +WINE_DEFAULT_DEBUG_CHANNEL(cfgmgr32); + +/*********************************************************************** + * CM_MapCrToWin32Err (cfgmgr32.@) + */ +CMAPI DWORD WINAPI CM_MapCrToWin32Err( CONFIGRET code, DWORD default_error ) +{ + TRACE( "code: %ld, default_error: %ld\n", code, default_error ); + + switch (code) + { + case CR_SUCCESS: return ERROR_SUCCESS; + case CR_OUT_OF_MEMORY: return ERROR_NOT_ENOUGH_MEMORY; + case CR_INVALID_POINTER: return ERROR_INVALID_USER_BUFFER; + case CR_INVALID_FLAG: return ERROR_INVALID_FLAGS; + case CR_INVALID_DEVNODE: + case CR_INVALID_DEVICE_ID: + case CR_INVALID_MACHINENAME: + case CR_INVALID_PROPERTY: + case CR_INVALID_REFERENCE_STRING: return ERROR_INVALID_DATA; + case CR_NO_SUCH_DEVNODE: + case CR_NO_SUCH_VALUE: + case CR_NO_SUCH_DEVICE_INTERFACE: return ERROR_NOT_FOUND; + case CR_ALREADY_SUCH_DEVNODE: return ERROR_ALREADY_EXISTS; + case CR_BUFFER_SMALL: return ERROR_INSUFFICIENT_BUFFER; + case CR_NO_REGISTRY_HANDLE: return ERROR_INVALID_HANDLE; + case CR_REGISTRY_ERROR: return ERROR_REGISTRY_CORRUPT; + case CR_NO_SUCH_REGISTRY_KEY: return ERROR_FILE_NOT_FOUND; + case CR_REMOTE_COMM_FAILURE: + case CR_MACHINE_UNAVAILABLE: + case CR_NO_CM_SERVICES: return ERROR_SERVICE_NOT_ACTIVE; + case CR_ACCESS_DENIED: return ERROR_ACCESS_DENIED; + case CR_CALL_NOT_IMPLEMENTED: return ERROR_CALL_NOT_IMPLEMENTED; + } + + return default_error; +} diff --git a/include/cfgmgr32.h b/include/cfgmgr32.h index d300c4babaa..b78f118622e 100644 --- a/include/cfgmgr32.h +++ b/include/cfgmgr32.h @@ -242,6 +242,7 @@ CMAPI WORD WINAPI CM_Get_Version(void); CMAPI CONFIGRET WINAPI CM_Locate_DevNodeA(PDEVINST,DEVINSTID_A,ULONG); CMAPI CONFIGRET WINAPI CM_Locate_DevNodeW(PDEVINST,DEVINSTID_W,ULONG); #define CM_Locate_DevNode WINELIB_NAME_AW(CM_Locate_DevNode) +CMAPI DWORD WINAPI CM_MapCrToWin32Err(CONFIGRET,DWORD); CMAPI CONFIGRET WINAPI CM_Open_DevNode_Key(DEVINST dnDevInst, REGSAM access, ULONG ulHardwareProfile, REGDISPOSITION disposition, PHKEY phkDevice, ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Request_Device_EjectA(DEVINST dev, PPNP_VETO_TYPE type, LPSTR name, ULONG length, ULONG flags); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/2231
From: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- configure.ac | 1 + dlls/cfgmgr32/tests/Makefile.in | 5 ++ dlls/cfgmgr32/tests/cfgmgr32.c | 112 ++++++++++++++++++++++++++++++++ 3 files changed, 118 insertions(+) create mode 100644 dlls/cfgmgr32/tests/Makefile.in create mode 100644 dlls/cfgmgr32/tests/cfgmgr32.c diff --git a/configure.ac b/configure.ac index 5ff1bb093f4..c62bcb3ee25 100644 --- a/configure.ac +++ b/configure.ac @@ -2379,6 +2379,7 @@ WINE_CONFIG_MAKEFILE(dlls/capi2032) WINE_CONFIG_MAKEFILE(dlls/cards) WINE_CONFIG_MAKEFILE(dlls/cdosys) WINE_CONFIG_MAKEFILE(dlls/cfgmgr32) +WINE_CONFIG_MAKEFILE(dlls/cfgmgr32/tests) WINE_CONFIG_MAKEFILE(dlls/clusapi) WINE_CONFIG_MAKEFILE(dlls/cng.sys) WINE_CONFIG_MAKEFILE(dlls/combase) diff --git a/dlls/cfgmgr32/tests/Makefile.in b/dlls/cfgmgr32/tests/Makefile.in new file mode 100644 index 00000000000..4e1f97b1c0c --- /dev/null +++ b/dlls/cfgmgr32/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = cfgmgr32.dll +IMPORTS = cfgmgr32 + +C_SRCS = \ + cfgmgr32.c diff --git a/dlls/cfgmgr32/tests/cfgmgr32.c b/dlls/cfgmgr32/tests/cfgmgr32.c new file mode 100644 index 00000000000..9f295998bf6 --- /dev/null +++ b/dlls/cfgmgr32/tests/cfgmgr32.c @@ -0,0 +1,112 @@ +/* + * Copyright (C) 2023 Mohamad Al-Jaf + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/test.h" +#include "cfgmgr32.h" + +static void test_CM_MapCrToWin32Err(void) +{ + unsigned int i; + DWORD ret; + + static const struct + { + CONFIGRET code; + DWORD win32_error; + } + map_codes[] = + { + { CR_SUCCESS, ERROR_SUCCESS }, + { CR_OUT_OF_MEMORY, ERROR_NOT_ENOUGH_MEMORY }, + { CR_INVALID_POINTER, ERROR_INVALID_USER_BUFFER }, + { CR_INVALID_FLAG, ERROR_INVALID_FLAGS }, + { CR_INVALID_DEVNODE, ERROR_INVALID_DATA }, + { CR_INVALID_DEVINST, ERROR_INVALID_DATA }, + { CR_NO_SUCH_DEVNODE, ERROR_NOT_FOUND }, + { CR_NO_SUCH_DEVINST, ERROR_NOT_FOUND }, + { CR_ALREADY_SUCH_DEVNODE, ERROR_ALREADY_EXISTS }, + { CR_ALREADY_SUCH_DEVINST, ERROR_ALREADY_EXISTS }, + { CR_BUFFER_SMALL, ERROR_INSUFFICIENT_BUFFER }, + { CR_NO_REGISTRY_HANDLE, ERROR_INVALID_HANDLE }, + { CR_REGISTRY_ERROR, ERROR_REGISTRY_CORRUPT }, + { CR_INVALID_DEVICE_ID, ERROR_INVALID_DATA }, + { CR_NO_SUCH_VALUE, ERROR_NOT_FOUND }, + { CR_NO_SUCH_REGISTRY_KEY, ERROR_FILE_NOT_FOUND }, + { CR_INVALID_MACHINENAME, ERROR_INVALID_DATA }, + { CR_REMOTE_COMM_FAILURE, ERROR_SERVICE_NOT_ACTIVE }, + { CR_MACHINE_UNAVAILABLE, ERROR_SERVICE_NOT_ACTIVE }, + { CR_NO_CM_SERVICES, ERROR_SERVICE_NOT_ACTIVE }, + { CR_ACCESS_DENIED, ERROR_ACCESS_DENIED }, + { CR_CALL_NOT_IMPLEMENTED, ERROR_CALL_NOT_IMPLEMENTED }, + { CR_INVALID_PROPERTY, ERROR_INVALID_DATA }, + { CR_NO_SUCH_DEVICE_INTERFACE, ERROR_NOT_FOUND }, + { CR_INVALID_REFERENCE_STRING, ERROR_INVALID_DATA }, + { CR_DEFAULT, 0xdeadbeef }, + { CR_INVALID_RES_DES, 0xdeadbeef }, + { CR_INVALID_LOG_CONF, 0xdeadbeef }, + { CR_INVALID_ARBITRATOR, 0xdeadbeef }, + { CR_INVALID_NODELIST, 0xdeadbeef }, + { CR_DEVNODE_HAS_REQS, 0xdeadbeef }, + { CR_DEVINST_HAS_REQS, 0xdeadbeef }, + { CR_INVALID_RESOURCEID, 0xdeadbeef }, + { CR_DLVXD_NOT_FOUND, 0xdeadbeef }, + { CR_NO_MORE_LOG_CONF, 0xdeadbeef }, + { CR_NO_MORE_RES_DES, 0xdeadbeef }, + { CR_INVALID_RANGE_LIST, 0xdeadbeef }, + { CR_INVALID_RANGE, 0xdeadbeef }, + { CR_FAILURE, 0xdeadbeef }, + { CR_NO_SUCH_LOGICAL_DEV, 0xdeadbeef }, + { CR_CREATE_BLOCKED, 0xdeadbeef }, + { CR_NOT_SYSTEM_VM, 0xdeadbeef }, + { CR_REMOVE_VETOED, 0xdeadbeef }, + { CR_APM_VETOED, 0xdeadbeef }, + { CR_INVALID_LOAD_TYPE, 0xdeadbeef }, + { CR_NO_ARBITRATOR, 0xdeadbeef }, + { CR_INVALID_DATA, 0xdeadbeef }, + { CR_INVALID_API, 0xdeadbeef }, + { CR_DEVLOADER_NOT_READY, 0xdeadbeef }, + { CR_NEED_RESTART, 0xdeadbeef }, + { CR_NO_MORE_HW_PROFILES, 0xdeadbeef }, + { CR_DEVICE_NOT_THERE, 0xdeadbeef }, + { CR_WRONG_TYPE, 0xdeadbeef }, + { CR_INVALID_PRIORITY, 0xdeadbeef }, + { CR_NOT_DISABLEABLE, 0xdeadbeef }, + { CR_FREE_RESOURCES, 0xdeadbeef }, + { CR_QUERY_VETOED, 0xdeadbeef }, + { CR_CANT_SHARE_IRQ, 0xdeadbeef }, + { CR_NO_DEPENDENT, 0xdeadbeef }, + { CR_SAME_RESOURCES, 0xdeadbeef }, + { CR_DEVICE_INTERFACE_ACTIVE, 0xdeadbeef }, + { CR_INVALID_CONFLICT_LIST, 0xdeadbeef }, + { CR_INVALID_INDEX, 0xdeadbeef }, + { CR_INVALID_STRUCTURE_SIZE, 0xdeadbeef }, + { NUM_CR_RESULTS, 0xdeadbeef }, + }; + + for ( i = 0; i < sizeof(map_codes) / sizeof(map_codes[0]); i++ ) + { + ret = 0xdeadbeef; + ret = CM_MapCrToWin32Err( map_codes[i].code, 0xdeadbeef ); + ok( ret == map_codes[i].win32_error, "expected %ld, got %ld.\n", map_codes[i].win32_error, ret ); + } +} + +START_TEST(cfgmgr32) +{ + test_CM_MapCrToWin32Err(); +} -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/2231
@zfigura Hi Zebediah, just wondering if you've had a chance to review this MR? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/2231#note_28160
Zebediah Figura (@zfigura) commented about dlls/cfgmgr32/main.c:
+ * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/debug.h" +#include "cfgmgr32.h" + +WINE_DEFAULT_DEBUG_CHANNEL(cfgmgr32); Let's use the setupapi channel; it's basically part of the same subsystem.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/2231#note_28271
Zebediah Figura (@zfigura) commented about dlls/cfgmgr32/main.c:
+ * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/debug.h" +#include "cfgmgr32.h" + +WINE_DEFAULT_DEBUG_CHANNEL(cfgmgr32); + +/*********************************************************************** + * CM_MapCrToWin32Err (cfgmgr32.@) + */ +CMAPI DWORD WINAPI CM_MapCrToWin32Err( CONFIGRET code, DWORD default_error ) No need to repeat CMAPI here.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/2231#note_28272
Zebediah Figura (@zfigura) commented about dlls/cfgmgr32/main.c:
+ * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/debug.h" +#include "cfgmgr32.h" + +WINE_DEFAULT_DEBUG_CHANNEL(cfgmgr32); + +/*********************************************************************** + * CM_MapCrToWin32Err (cfgmgr32.@) + */ +CMAPI DWORD WINAPI CM_MapCrToWin32Err( CONFIGRET code, DWORD default_error ) +{ + TRACE( "code: %ld, default_error: %ld\n", code, default_error ); Let's use %#lx for the code, since it's specified as hexadecimal in the headers.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/2231#note_28273
Zebediah Figura (@zfigura) commented about dlls/cfgmgr32/tests/cfgmgr32.c:
+ { CR_NOT_DISABLEABLE, 0xdeadbeef }, + { CR_FREE_RESOURCES, 0xdeadbeef }, + { CR_QUERY_VETOED, 0xdeadbeef }, + { CR_CANT_SHARE_IRQ, 0xdeadbeef }, + { CR_NO_DEPENDENT, 0xdeadbeef }, + { CR_SAME_RESOURCES, 0xdeadbeef }, + { CR_DEVICE_INTERFACE_ACTIVE, 0xdeadbeef }, + { CR_INVALID_CONFLICT_LIST, 0xdeadbeef }, + { CR_INVALID_INDEX, 0xdeadbeef }, + { CR_INVALID_STRUCTURE_SIZE, 0xdeadbeef }, + { NUM_CR_RESULTS, 0xdeadbeef }, + }; + + for ( i = 0; i < sizeof(map_codes) / sizeof(map_codes[0]); i++ ) + { + ret = 0xdeadbeef; This assignment is dead.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/2231#note_28274
Zebediah Figura (@zfigura) commented about dlls/cfgmgr32/tests/cfgmgr32.c:
+ { CR_QUERY_VETOED, 0xdeadbeef }, + { CR_CANT_SHARE_IRQ, 0xdeadbeef }, + { CR_NO_DEPENDENT, 0xdeadbeef }, + { CR_SAME_RESOURCES, 0xdeadbeef }, + { CR_DEVICE_INTERFACE_ACTIVE, 0xdeadbeef }, + { CR_INVALID_CONFLICT_LIST, 0xdeadbeef }, + { CR_INVALID_INDEX, 0xdeadbeef }, + { CR_INVALID_STRUCTURE_SIZE, 0xdeadbeef }, + { NUM_CR_RESULTS, 0xdeadbeef }, + }; + + for ( i = 0; i < sizeof(map_codes) / sizeof(map_codes[0]); i++ ) + { + ret = 0xdeadbeef; + ret = CM_MapCrToWin32Err( map_codes[i].code, 0xdeadbeef ); + ok( ret == map_codes[i].win32_error, "expected %ld, got %ld.\n", map_codes[i].win32_error, ret ); This doesn't give enough information to tell which test failed. Better to specify the CM error code, and then there's no need to specify the expected error.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/2231#note_28275
Zebediah Figura (@zfigura) commented about dlls/cfgmgr32/tests/cfgmgr32.c:
+ { CR_WRONG_TYPE, 0xdeadbeef }, + { CR_INVALID_PRIORITY, 0xdeadbeef }, + { CR_NOT_DISABLEABLE, 0xdeadbeef }, + { CR_FREE_RESOURCES, 0xdeadbeef }, + { CR_QUERY_VETOED, 0xdeadbeef }, + { CR_CANT_SHARE_IRQ, 0xdeadbeef }, + { CR_NO_DEPENDENT, 0xdeadbeef }, + { CR_SAME_RESOURCES, 0xdeadbeef }, + { CR_DEVICE_INTERFACE_ACTIVE, 0xdeadbeef }, + { CR_INVALID_CONFLICT_LIST, 0xdeadbeef }, + { CR_INVALID_INDEX, 0xdeadbeef }, + { CR_INVALID_STRUCTURE_SIZE, 0xdeadbeef }, + { NUM_CR_RESULTS, 0xdeadbeef }, + }; + + for ( i = 0; i < sizeof(map_codes) / sizeof(map_codes[0]); i++ ) We have an ARRAY_SIZE macro for this.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/2231#note_28276
participants (3)
-
Mohamad Al-Jaf -
Mohamad Al-Jaf (＠maljaf)
-
Zebediah Figura (＠zfigura)