March 2023 - Wine-commits - list.winehq.org

Rémi Bernon : imm32: Return TRUE from ImmIsIME with any HKL.
by Alexandre Julliard 30 Mar '23

30 Mar '23

Module: wine Branch: master Commit: 32c5b57ac80673c2bad7291d27b4001aac31ae9b URL: https://gitlab.winehq.org/wine/wine/-/commit/32c5b57ac80673c2bad7291d27b400… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Feb 19 12:01:59 2023 +0100 imm32: Return TRUE from ImmIsIME with any HKL. --- dlls/imm32/imm.c | 7 +------ dlls/imm32/tests/imm32.c | 1 - 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index e90279a4688..5cdf14cc9d9 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -2175,13 +2175,8 @@ HKL WINAPI ImmInstallIMEW( const WCHAR *filename, const WCHAR *description ) */ BOOL WINAPI ImmIsIME( HKL hkl ) { - struct ime *ime; - TRACE( "hkl %p\n", hkl ); - - if (!(ime = ime_acquire( hkl ))) return 0; - ime_release( ime ); - + if (!hkl) return FALSE; return TRUE; } diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 1b1bd1b98bd..3032c852a7f 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -3246,7 +3246,6 @@ static void test_ImmIsIME(void) SET_ENABLE( IME_DLL_PROCESS_DETACH, TRUE ); SetLastError( 0xdeadbeef ); - todo_wine ok_ret( 0, ImmIsIME( 0 ) ); ok_ret( 0xdeadbeef, GetLastError() ); ok_ret( 1, ImmIsIME( hkl ) );

1 0

Rémi Bernon : winex11: Use the default IME implementation for stubs.
by Alexandre Julliard 30 Mar '23

30 Mar '23

Module: wine Branch: master Commit: 2a4dff01bd2dec7129e7b572dbb8e29ba75723df URL: https://gitlab.winehq.org/wine/wine/-/commit/2a4dff01bd2dec7129e7b572dbb8e2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 7 23:10:05 2023 +0100 winex11: Use the default IME implementation for stubs. --- dlls/imm32/ime.c | 11 +++--- dlls/imm32/tests/imm32.c | 1 + dlls/winex11.drv/ime.c | 79 --------------------------------------- dlls/winex11.drv/winex11.drv.spec | 9 ----- 4 files changed, 6 insertions(+), 94 deletions(-) diff --git a/dlls/imm32/ime.c b/dlls/imm32/ime.c index c31fd936ca1..c05ca6d0255 100644 --- a/dlls/imm32/ime.c +++ b/dlls/imm32/ime.c @@ -46,16 +46,15 @@ BOOL WINAPI ImeDestroy( UINT force ) BOOL WINAPI ImeSelect( HIMC himc, BOOL select ) { - FIXME( "himc %p, select %d stub!\n", himc, select ); - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); - return FALSE; + FIXME( "himc %p, select %d semi-stub!\n", himc, select ); + return TRUE; } BOOL WINAPI ImeSetActiveContext( HIMC himc, BOOL flag ) { - FIXME( "himc %p, flag %#x stub!\n", himc, flag ); - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); - return FALSE; + static int once; + if (!once++) FIXME( "himc %p, flag %#x stub!\n", himc, flag ); + return TRUE; } BOOL WINAPI ImeProcessKey( HIMC himc, UINT vkey, LPARAM key_data, BYTE *key_state ) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 3032c852a7f..175678b0650 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -3332,6 +3332,7 @@ static void test_ImmGetProperty(void) ok_ret( expect->fdwSelectCaps, ImmGetProperty( hkl, IGP_SELECT ) ); ok_ret( IMEVER_0400, ImmGetProperty( hkl, IGP_GETIMEVERSION ) ); ok_ret( expect->fdwUICaps, ImmGetProperty( hkl, IGP_UI ) ); + todo_wine ok_ret( 0xdeadbeef, GetLastError() ); /* IME_PROP_END_UNLOAD for the IME to unload / reload. */ diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index a293daa6ad9..9c0894717ad 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -525,23 +525,6 @@ BOOL WINAPI ImeInquire(LPIMEINFO lpIMEInfo, LPWSTR lpszUIClass, DWORD flags) return TRUE; } -BOOL WINAPI ImeConfigure(HKL hKL,HWND hWnd, DWORD dwMode, LPVOID lpData) -{ - FIXME("(%p, %p, %ld, %p): stub\n", hKL, hWnd, dwMode, lpData); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - -DWORD WINAPI ImeConversionList(HIMC hIMC, LPCWSTR lpSource, - LPCANDIDATELIST lpCandList, DWORD dwBufLen, UINT uFlag) - -{ - FIXME("(%p, %s, %p, %ld, %d): stub\n", hIMC, debugstr_w(lpSource), - lpCandList, dwBufLen, uFlag); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - BOOL WINAPI ImeDestroy(UINT uForce) { TRACE("\n"); @@ -551,13 +534,6 @@ BOOL WINAPI ImeDestroy(UINT uForce) return TRUE; } -LRESULT WINAPI ImeEscape(HIMC hIMC, UINT uSubFunc, LPVOID lpData) -{ - FIXME("(%p, %d, %p): stub\n", hIMC, uSubFunc, lpData); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - BOOL WINAPI ImeProcessKey(HIMC hIMC, UINT vKey, LPARAM lKeyData, const LPBYTE lpbKeyState) { /* See the comment at the head of this file */ @@ -602,15 +578,6 @@ BOOL WINAPI ImeSelect(HIMC hIMC, BOOL fSelect) return TRUE; } -BOOL WINAPI ImeSetActiveContext(HIMC hIMC,BOOL fFlag) -{ - static int once; - - if (!once++) - FIXME("(%p, %x): stub\n", hIMC, fFlag); - return TRUE; -} - UINT WINAPI ImeToAsciiEx (UINT uVKey, UINT uScanCode, const LPBYTE lpbKeyState, TRANSMSGLIST *lpdwTransKey, UINT fuState, HIMC hIMC) { @@ -777,42 +744,6 @@ BOOL WINAPI NotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue) return bRet; } -BOOL WINAPI ImeRegisterWord(LPCWSTR lpszReading, DWORD dwStyle, - LPCWSTR lpszRegister) -{ - FIXME("(%s, %ld, %s): stub\n", debugstr_w(lpszReading), dwStyle, - debugstr_w(lpszRegister)); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - -BOOL WINAPI ImeUnregisterWord(LPCWSTR lpszReading, DWORD dwStyle, - LPCWSTR lpszUnregister) -{ - FIXME("(%s, %ld, %s): stub\n", debugstr_w(lpszReading), dwStyle, - debugstr_w(lpszUnregister)); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - -UINT WINAPI ImeGetRegisterWordStyle(UINT nItem, LPSTYLEBUFW lpStyleBuf) -{ - FIXME("(%d, %p): stub\n", nItem, lpStyleBuf); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -UINT WINAPI ImeEnumRegisterWord(REGISTERWORDENUMPROCW lpfnEnumProc, - LPCWSTR lpszReading, DWORD dwStyle, - LPCWSTR lpszRegister, LPVOID lpData) -{ - FIXME("(%p, %s, %ld, %s, %p): stub\n", lpfnEnumProc, - debugstr_w(lpszReading), dwStyle, debugstr_w(lpszRegister), - lpData); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - BOOL WINAPI ImeSetCompositionString(HIMC hIMC, DWORD dwIndex, LPCVOID lpComp, DWORD dwCompLen, LPCVOID lpRead, DWORD dwReadLen) @@ -888,16 +819,6 @@ BOOL WINAPI ImeSetCompositionString(HIMC hIMC, DWORD dwIndex, LPCVOID lpComp, return TRUE; } -DWORD WINAPI ImeGetImeMenuItems(HIMC hIMC, DWORD dwFlags, DWORD dwType, - LPIMEMENUITEMINFOW lpImeParentMenu, LPIMEMENUITEMINFOW lpImeMenu, - DWORD dwSize) -{ - FIXME("(%p, %lx %lx %p %p %lx): stub\n", hIMC, dwFlags, dwType, - lpImeParentMenu, lpImeMenu, dwSize); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - /* Interfaces to XIM and other parts of winex11drv */ NTSTATUS x11drv_ime_set_open_status( UINT open ) diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index 77e4a6285de..0596d48c577 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -12,18 +12,9 @@ #IME Interface @ stdcall ImeInquire(ptr ptr wstr) -@ stdcall ImeConfigure(long long long ptr) @ stdcall ImeDestroy(long) -@ stdcall ImeEscape(long long ptr) @ stdcall ImeSelect(long long) -@ stdcall ImeSetActiveContext(long long) @ stdcall ImeToAsciiEx(long long ptr ptr long long) @ stdcall NotifyIME(long long long long) -@ stdcall ImeRegisterWord(wstr long wstr) -@ stdcall ImeUnregisterWord(wstr long wstr) -@ stdcall ImeEnumRegisterWord(ptr wstr long wstr ptr) @ stdcall ImeSetCompositionString(long long ptr long ptr long) -@ stdcall ImeConversionList(long wstr ptr long long) @ stdcall ImeProcessKey(long long long ptr) -@ stdcall ImeGetRegisterWordStyle(long ptr) -@ stdcall ImeGetImeMenuItems(long long long ptr ptr long)

1 0

Paul Gofman : services: Create service processes in a job.
by Alexandre Julliard 30 Mar '23

30 Mar '23

Module: wine Branch: master Commit: 466a86bc5460a3b1d9c253d3e82da2eb63b0775c URL: https://gitlab.winehq.org/wine/wine/-/commit/466a86bc5460a3b1d9c253d3e82da2… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Mar 29 18:17:58 2023 -0600 services: Create service processes in a job. --- programs/services/services.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/programs/services/services.c b/programs/services/services.c index 8a3ff754329..9efedab43d2 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -47,6 +47,7 @@ static DWORD default_preshutdown_timeout = 180000; static DWORD autostart_delay = 120000; static void *environment = NULL; static HKEY service_current_key = NULL; +static HANDLE job_object; static const BOOL is_win64 = (sizeof(void *) > sizeof(int)); @@ -1102,6 +1103,8 @@ found: release_process(process); return err; } + if (!AssignProcessToJobObject(job_object, pi.hProcess)) + WINE_ERR("Could not add object to job.\n"); process->process_id = pi.dwProcessId; process->process = pi.hProcess; @@ -1284,9 +1287,18 @@ int __cdecl main(int argc, char *argv[]) 'C','o','n','t','r','o','l','\\', 'S','e','r','v','i','c','e','C','u','r','r','e','n','t',0}; static const WCHAR svcctl_started_event[] = SVCCTL_STARTED_EVENT; + JOBOBJECT_EXTENDED_LIMIT_INFORMATION job_limit; HANDLE started_event; DWORD err; + job_object = CreateJobObjectW(NULL, NULL); + job_limit.BasicLimitInformation.LimitFlags = JOB_OBJECT_LIMIT_BREAKAWAY_OK | JOB_OBJECT_LIMIT_SILENT_BREAKAWAY_OK; + if (!SetInformationJobObject(job_object, JobObjectExtendedLimitInformation, &job_limit, sizeof(job_limit))) + { + WINE_ERR("Failed to initialized job object, err %lu.\n", GetLastError()); + return GetLastError(); + } + started_event = CreateEventW(NULL, TRUE, FALSE, svcctl_started_event); err = RegCreateKeyExW(HKEY_LOCAL_MACHINE, service_current_key_str, 0,

1 0

Paul Gofman : services: Factor out notify_service_state() function.
by Alexandre Julliard 30 Mar '23

30 Mar '23

Module: wine Branch: master Commit: 3580d466cc122729ed3825fa394cc4b0d4333c20 URL: https://gitlab.winehq.org/wine/wine/-/commit/3580d466cc122729ed3825fa394cc4… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Mar 29 19:03:58 2023 -0600 services: Factor out notify_service_state() function. --- programs/services/rpc.c | 41 ++++++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index e56d25ea1af..863a605ef35 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -868,11 +868,32 @@ static void fill_notify(struct sc_notify_handle *notify, struct service_entry *s SetEvent(notify->event); } +static void notify_service_state(struct service_entry *service) +{ + struct sc_service_handle *service_handle; + DWORD mask; + + mask = 1 << (service->status.dwCurrentState - SERVICE_STOPPED); + LIST_FOR_EACH_ENTRY(service_handle, &service->handles, struct sc_service_handle, entry) + { + struct sc_notify_handle *notify = service_handle->notify; + if (notify && (notify->notify_mask & mask)) + { + fill_notify(notify, service); + sc_notify_release(notify); + service_handle->notify = NULL; + service_handle->status_notified = TRUE; + } + else + service_handle->status_notified = FALSE; + } +} + DWORD __cdecl svcctl_SetServiceStatus(SC_RPC_HANDLE handle, SERVICE_STATUS *status) { - struct sc_service_handle *service, *service_handle; + struct sc_service_handle *service; struct process_entry *process; - DWORD err, mask; + DWORD err; WINE_TRACE("(%p, %p)\n", handle, status); @@ -902,21 +923,7 @@ DWORD __cdecl svcctl_SetServiceStatus(SC_RPC_HANDLE handle, SERVICE_STATUS *stat release_process(process); } - mask = 1 << (service->service_entry->status.dwCurrentState - SERVICE_STOPPED); - LIST_FOR_EACH_ENTRY(service_handle, &service->service_entry->handles, struct sc_service_handle, entry) - { - struct sc_notify_handle *notify = service_handle->notify; - if (notify && (notify->notify_mask & mask)) - { - fill_notify(notify, service->service_entry); - sc_notify_release(notify); - service_handle->notify = NULL; - service_handle->status_notified = TRUE; - } - else - service_handle->status_notified = FALSE; - } - + notify_service_state(service->service_entry); service_unlock(service->service_entry); return ERROR_SUCCESS;

1 0

Paul Gofman : services: Change running service state once its process dies.
by Alexandre Julliard 30 Mar '23

30 Mar '23

Module: wine Branch: master Commit: c0c68ee83a42eb4fd8af661e55b89b56fb32e149 URL: https://gitlab.winehq.org/wine/wine/-/commit/c0c68ee83a42eb4fd8af661e55b89b… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Mar 29 18:19:03 2023 -0600 services: Change running service state once its process dies. --- programs/services/rpc.c | 2 +- programs/services/services.c | 61 +++++++++++++++++++- programs/services/services.h | 1 + programs/services/tests/service.c | 117 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 178 insertions(+), 3 deletions(-)

1 0

Michael Stefaniuc : dinput/tests: Use separate statements instead of the comma operator.
by Alexandre Julliard 30 Mar '23

30 Mar '23

Module: wine Branch: master Commit: 4af8f423822716932e8c015587ea228312f7d317 URL: https://gitlab.winehq.org/wine/wine/-/commit/4af8f423822716932e8c015587ea22… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Mar 28 19:34:11 2023 +0200 dinput/tests: Use separate statements instead of the comma operator. --- dlls/dinput/tests/force_feedback.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/tests/force_feedback.c b/dlls/dinput/tests/force_feedback.c index 0b7fcb29fa9..696546ee49d 100644 --- a/dlls/dinput/tests/force_feedback.c +++ b/dlls/dinput/tests/force_feedback.c @@ -1455,7 +1455,7 @@ static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file, DWO set_hid_expect( file, NULL, 0 ); desc = expect_desc; desc.dwDuration = INFINITE; - desc.dwTriggerButton = DIDFT_PSHBUTTON | DIDFT_MAKEINSTANCE( 0 ) | DIDFT_FFEFFECTTRIGGER, + desc.dwTriggerButton = DIDFT_PSHBUTTON | DIDFT_MAKEINSTANCE( 0 ) | DIDFT_FFEFFECTTRIGGER; hr = IDirectInputEffect_SetParameters( effect, &desc, DIEP_NODOWNLOAD | DIEP_DURATION | DIEP_TRIGGERBUTTON ); ok( hr == DI_DOWNLOADSKIPPED, "SetParameters returned %#lx\n", hr ); set_hid_expect( file, expect_update, sizeof(expect_update) ); @@ -1464,7 +1464,7 @@ static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file, DWO wait_hid_expect( file, 100 ); /* these updates are sent asynchronously */ desc = expect_desc; desc.dwDuration = INFINITE; - desc.dwTriggerButton = DIDFT_PSHBUTTON | DIDFT_MAKEINSTANCE( 0 ) | DIDFT_FFEFFECTTRIGGER, + desc.dwTriggerButton = DIDFT_PSHBUTTON | DIDFT_MAKEINSTANCE( 0 ) | DIDFT_FFEFFECTTRIGGER; hr = IDirectInputEffect_SetParameters( effect, &desc, DIEP_NODOWNLOAD | DIEP_DURATION | DIEP_TRIGGERBUTTON ); ok( hr == DI_DOWNLOADSKIPPED, "SetParameters returned %#lx\n", hr ); set_hid_expect( file, expect_update, sizeof(expect_update) );

1 0

Michael Stefaniuc : jscript: Use separate statements instead of the comma operator.
by Alexandre Julliard 30 Mar '23

30 Mar '23

Module: wine Branch: master Commit: 8d142cb1061f33fd955a8b9266815d85e34eae11 URL: https://gitlab.winehq.org/wine/wine/-/commit/8d142cb1061f33fd955a8b9266815d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Mar 28 19:35:00 2023 +0200 jscript: Use separate statements instead of the comma operator. --- dlls/jscript/dispex.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index dd91a577159..c3cc41ce782 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -804,7 +804,7 @@ HRESULT gc_run(script_ctx_t *ctx) } while(head); return E_OUTOFMEMORY; } - chunk = chunk->next, chunk_idx = 0; + chunk = chunk->next; chunk_idx = 0; chunk->next = NULL; } chunk->ref[chunk_idx++] = obj->ref; @@ -901,13 +901,13 @@ HRESULT gc_run(script_ctx_t *ctx) free(gc_ctx.next); /* Restore */ - chunk = head, chunk_idx = 0; + chunk = head; chunk_idx = 0; LIST_FOR_EACH_ENTRY(obj, &ctx->objects, jsdisp_t, entry) { obj->ref = chunk->ref[chunk_idx++]; if(chunk_idx == ARRAY_SIZE(chunk->ref)) { struct chunk *next = chunk->next; free(chunk); - chunk = next, chunk_idx = 0; + chunk = next; chunk_idx = 0; } } free(chunk);

1 0

Jinoh Kang : ntdll: Don't report user (PE) stack via pthread_attr_setstack().
by Alexandre Julliard 30 Mar '23

30 Mar '23

Module: wine Branch: master Commit: df5f9b7d2b5395c1a537981b802b804b9f93b8ae URL: https://gitlab.winehq.org/wine/wine/-/commit/df5f9b7d2b5395c1a537981b802b80… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Wed Mar 22 01:36:45 2023 +0900 ntdll: Don't report user (PE) stack via pthread_attr_setstack(). Today, NtCreateThreadEx() passes to pthread_attr_setstack() an address range that spans both the user (PE) stack and the kernel (Unix) stack. pthread_attr_setstack() accepts an address range that will be used as the initial stack area for the thread created by pthread_create(). It is often assumed that the initial stack will be available for the entire duration of the thread's lifetime. This assumption, however, conflicts with how Win32 fibers operate. Fiber APIs allow the thread's initial stack to be freed before the thread exits, or kept alive beyond the point of thread's termination. This allows the lifetime of the thread's initial stack to be shorter or longer than the originating thread's lifetime. This is possible because each fiber has its own stack and context, and ConvertThreadToFiber() transfers the current thread's stack to a new fiber. This specifically causes problems in Glibc v2.31 and earlier. These Glibc versions have a bug where madvise(2) with the MADV_DONTNEED flag is called on the initial stack area on thread exit, even when the stack was user-supplied (via pthread_attr_setstack). Therefore, the kernel may zero out any portion of the initial stack at any time after the originating thread terminates, even if the stack no longer belongs to the current thread (either freed and reallocated, or owned by a fiber). This may ultimately lead to memory corruption. Fix this by only passing the syscall (kernel) portion of the stack to pthread_attr_setstack(). --- dlls/ntdll/unix/thread.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 4c8c04cf9fc..9b0b5f7ce22 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -1377,8 +1377,7 @@ NTSTATUS WINAPI NtCreateThreadEx( HANDLE *handle, ACCESS_MASK access, OBJECT_ATT thread_data->param = param; pthread_attr_init( &pthread_attr ); - pthread_attr_setstack( &pthread_attr, teb->DeallocationStack, - (char *)thread_data->kernel_stack + kernel_stack_size - (char *)teb->DeallocationStack ); + pthread_attr_setstack( &pthread_attr, thread_data->kernel_stack, kernel_stack_size ); pthread_attr_setguardsize( &pthread_attr, 0 ); pthread_attr_setscope( &pthread_attr, PTHREAD_SCOPE_SYSTEM ); /* force creating a kernel thread */ InterlockedIncrement( &nb_threads );

1 0

Mohamad Al-Jaf : cfgmgr32: Implement CM_MapCrToWin32Err.
by Alexandre Julliard 30 Mar '23

30 Mar '23

Module: wine Branch: master Commit: 4fab9ff230f497499da223ade9bbe3633a657f05 URL: https://gitlab.winehq.org/wine/wine/-/commit/4fab9ff230f497499da223ade9bbe3… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Thu Feb 2 22:06:57 2023 -0500 cfgmgr32: Implement CM_MapCrToWin32Err. 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(+) 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..fee3c42a5c4 --- /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(setupapi); + +/*********************************************************************** + * CM_MapCrToWin32Err (cfgmgr32.@) + */ +DWORD WINAPI CM_MapCrToWin32Err( CONFIGRET code, DWORD default_error ) +{ + TRACE( "code: %#lx, 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);

1 0

Mohamad Al-Jaf : cfgmgr32/tests: Add CM_MapCrToWin32Err tests.
by Alexandre Julliard 30 Mar '23

30 Mar '23

Module: wine Branch: master Commit: 19156ccfa747d0e9227852b6bc316d3577eb6f43 URL: https://gitlab.winehq.org/wine/wine/-/commit/19156ccfa747d0e9227852b6bc316d… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sat Feb 18 18:10:34 2023 -0500 cfgmgr32/tests: Add CM_MapCrToWin32Err tests. --- configure | 1 + configure.ac | 1 + dlls/cfgmgr32/tests/Makefile.in | 5 ++ dlls/cfgmgr32/tests/cfgmgr32.c | 111 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 118 insertions(+) diff --git a/configure b/configure index 05dda03659c..30602740d7a 100755 --- a/configure +++ b/configure @@ -21071,6 +21071,7 @@ wine_fn_config_makefile dlls/capi2032 enable_capi2032 wine_fn_config_makefile dlls/cards enable_cards wine_fn_config_makefile dlls/cdosys enable_cdosys wine_fn_config_makefile dlls/cfgmgr32 enable_cfgmgr32 +wine_fn_config_makefile dlls/cfgmgr32/tests enable_tests wine_fn_config_makefile dlls/clusapi enable_clusapi wine_fn_config_makefile dlls/cng.sys enable_cng_sys wine_fn_config_makefile dlls/combase enable_combase diff --git a/configure.ac b/configure.ac index 9e0e86b6704..d6161d7ec3b 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..aa1a2100ee1 --- /dev/null +++ b/dlls/cfgmgr32/tests/cfgmgr32.c @@ -0,0 +1,111 @@ +/* + * 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 < ARRAY_SIZE(map_codes); i++ ) + { + ret = CM_MapCrToWin32Err( map_codes[i].code, 0xdeadbeef ); + ok( ret == map_codes[i].win32_error, "%#lx returned unexpected %ld.\n", map_codes[i].code, ret ); + } +} + +START_TEST(cfgmgr32) +{ + test_CM_MapCrToWin32Err(); +}

1 0