Ros-diffs August 2021

ros-diffs@reactos.org

16 participants
93 discussions

[reactos] 01/01: [IMM32] Rewrite ImmUnregisterWordA (#3893)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1ead16de95b5c11267588… commit 1ead16de95b5c11267588622d27ee08e770eabb1 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Aug 12 12:30:13 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Aug 12 12:30:13 2021 +0900 [IMM32] Rewrite ImmUnregisterWordA (#3893) Implementing Japanese input... CORE-11700 --- dll/win32/imm32/imm.c | 66 ++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 47 insertions(+), 19 deletions(-) diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index f7ec97bcc42..a64f38246f7 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -4105,28 +4105,56 @@ BOOL WINAPI ImmSimulateHotKey(HWND hWnd, DWORD dwHotKeyID) BOOL WINAPI ImmUnregisterWordA( HKL hKL, LPCSTR lpszReading, DWORD dwStyle, LPCSTR lpszUnregister) { - ImmHkl *immHkl = IMM_GetImmHkl(hKL); - TRACE("(%p, %s, %d, %s):\n", hKL, debugstr_a(lpszReading), dwStyle, - debugstr_a(lpszUnregister)); - if (immHkl->hIME && immHkl->pImeUnregisterWord) + BOOL ret = FALSE; + PIMEDPI pImeDpi; + LPWSTR pszReadingW = NULL, pszUnregisterW = NULL; + INT cch; + + TRACE("(%p, %s, 0x%lX, %s)\n", hKL, debugstr_a(lpszReading), dwStyle, + debugstr_a(lpszUnregister)); + + pImeDpi = ImmLockOrLoadImeDpi(hKL); + if (pImeDpi == NULL) + return FALSE; + + if (!(pImeDpi->ImeInfo.fdwProperty & IME_PROP_UNICODE)) { - if (!is_kbd_ime_unicode(immHkl)) - return immHkl->pImeUnregisterWord((LPCWSTR)lpszReading,dwStyle, - (LPCWSTR)lpszUnregister); - else - { - LPWSTR lpszwReading = strdupAtoW(lpszReading); - LPWSTR lpszwUnregister = strdupAtoW(lpszUnregister); - BOOL rc; + ret = pImeDpi->ImeUnregisterWord(lpszReading, dwStyle, lpszUnregister); + ImmUnlockImeDpi(pImeDpi); + return ret; + } - rc = immHkl->pImeUnregisterWord(lpszwReading,dwStyle,lpszwUnregister); - HeapFree(GetProcessHeap(),0,lpszwReading); - HeapFree(GetProcessHeap(),0,lpszwUnregister); - return rc; - } + if (lpszReading) + { + cch = lstrlenA(lpszReading); + pszReadingW = Imm32HeapAlloc(0, (cch + 1) * sizeof(WCHAR)); + if (pszReadingW == NULL) + goto Quit; + cch = MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, lpszReading, cch, + pszReadingW, cch + 1); + pszReadingW[cch] = 0; } - else - return FALSE; + + if (lpszUnregister) + { + cch = lstrlenA(lpszUnregister); + pszUnregisterW = Imm32HeapAlloc(0, (cch + 1) * sizeof(WCHAR)); + if (pszUnregisterW == NULL) + goto Quit; + cch = MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, lpszUnregister, cch, + pszUnregisterW, cch + 1); + pszUnregisterW[cch] = 0; + } + + ret = pImeDpi->ImeUnregisterWord(pszReadingW, dwStyle, pszUnregisterW); + +Quit: + if (pszReadingW) + HeapFree(g_hImm32Heap, 0, pszReadingW); + if (pszUnregisterW) + HeapFree(g_hImm32Heap, 0, pszUnregisterW); + ImmUnlockImeDpi(pImeDpi); + return ret; } /***********************************************************************

3 years, 1 month

[reactos] 01/01: [IMM32] Rewrite ImmRegisterWordW (#3892)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=94285dce4d54e2782a3c2… commit 94285dce4d54e2782a3c2795c46ca25dc5130156 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Aug 12 12:29:02 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Aug 12 12:29:02 2021 +0900 [IMM32] Rewrite ImmRegisterWordW (#3892) Implementing Japanese input... CORE-11700 --- dll/win32/imm32/imm.c | 68 ++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 48 insertions(+), 20 deletions(-) diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index 963ebb9acab..f7ec97bcc42 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -3394,7 +3394,7 @@ BOOL WINAPI ImmRegisterWordA( pszRegisterW[cch] = 0; } - ret = ImmRegisterWordW(hKL, pszReadingW, dwStyle, pszRegisterW); + ret = pImeDpi->ImeRegisterWord(pszReadingW, dwStyle, pszRegisterW); Quit: if (pszReadingW) @@ -3411,28 +3411,56 @@ Quit: BOOL WINAPI ImmRegisterWordW( HKL hKL, LPCWSTR lpszReading, DWORD dwStyle, LPCWSTR lpszRegister) { - ImmHkl *immHkl = IMM_GetImmHkl(hKL); - TRACE("(%p, %s, %d, %s):\n", hKL, debugstr_w(lpszReading), dwStyle, - debugstr_w(lpszRegister)); - if (immHkl->hIME && immHkl->pImeRegisterWord) + BOOL ret = FALSE; + PIMEDPI pImeDpi; + LPSTR pszReadingA = NULL, pszRegisterA = NULL; + INT cchW, cchA; + + TRACE("(%p, %s, 0x%lX, %s)\n", hKL, debugstr_w(lpszReading), dwStyle, + debugstr_w(lpszRegister)); + + pImeDpi = ImmLockOrLoadImeDpi(hKL); + if (!pImeDpi) + return FALSE; + + if (pImeDpi->ImeInfo.fdwProperty & IME_PROP_UNICODE) { - if (is_kbd_ime_unicode(immHkl)) - return immHkl->pImeRegisterWord(lpszReading,dwStyle,lpszRegister); - else - { - LPSTR lpszaReading = strdupWtoA(lpszReading); - LPSTR lpszaRegister = strdupWtoA(lpszRegister); - BOOL rc; + ret = pImeDpi->ImeRegisterWord(lpszReading, dwStyle, lpszRegister); + ImmUnlockImeDpi(pImeDpi); + return ret; + } - rc = immHkl->pImeRegisterWord((LPCWSTR)lpszaReading,dwStyle, - (LPCWSTR)lpszaRegister); - HeapFree(GetProcessHeap(),0,lpszaReading); - HeapFree(GetProcessHeap(),0,lpszaRegister); - return rc; - } + if (lpszReading) + { + cchW = lstrlenW(lpszReading); + cchA = (cchW + 1) * sizeof(WCHAR); + pszReadingA = Imm32HeapAlloc(0, cchA); + if (!pszReadingA) + goto Quit; + cchA = WideCharToMultiByte(CP_ACP, 0, lpszReading, cchW, pszReadingA, cchA, NULL, NULL); + pszReadingA[cchA] = 0; } - else - return FALSE; + + if (lpszRegister) + { + cchW = lstrlenW(lpszRegister); + cchA = (cchW + 1) * sizeof(WCHAR); + pszRegisterA = Imm32HeapAlloc(0, cchA); + if (!pszRegisterA) + goto Quit; + cchA = WideCharToMultiByte(CP_ACP, 0, lpszRegister, cchW, pszRegisterA, cchA, NULL, NULL); + pszRegisterA[cchA] = 0; + } + + ret = pImeDpi->ImeRegisterWord(pszReadingA, dwStyle, pszRegisterA); + +Quit: + if (pszReadingA) + HeapFree(g_hImm32Heap, 0, pszReadingA); + if (pszRegisterA) + HeapFree(g_hImm32Heap, 0, pszRegisterA); + ImmUnlockImeDpi(pImeDpi); + return ret; } /***********************************************************************

3 years, 1 month

[reactos] 01/01: [IMM32] Rewrite ImmRegisterWordA (#3881)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1e62771c7821b3ab221e4… commit 1e62771c7821b3ab221e47d786c1323f266e4208 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Aug 10 08:08:23 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Aug 10 08:08:23 2021 +0900 [IMM32] Rewrite ImmRegisterWordA (#3881) - Rewrite ImmRegisterWordA function. - Modify imetable.h. CORE-11700 --- dll/win32/imm32/imm.c | 87 ++++++++++++++++++++++++++++++++++++---------- win32ss/include/imetable.h | 10 +++--- 2 files changed, 73 insertions(+), 24 deletions(-) diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index 7ae9094844c..963ebb9acab 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -437,6 +437,27 @@ BOOL WINAPI ImmLoadIME(HKL hKL) return (pImeDpi != NULL); } +PIMEDPI APIENTRY ImmLockOrLoadImeDpi(HKL hKL) +{ + PW32CLIENTINFO pInfo; + PIMEDPI pImeDpi; + + if (!IS_IME_HKL(hKL)) + { + if (!g_psi || !(g_psi->dwSRVIFlags & SRVINFO_CICERO_ENABLED)) + return NULL; + + pInfo = (PW32CLIENTINFO)(NtCurrentTeb()->Win32ClientInfo); + if ((pInfo->W32ClientInfo[0] & 2)) + return NULL; + } + + pImeDpi = ImmLockImeDpi(hKL); + if (pImeDpi == NULL) + pImeDpi = Ime32LoadImeDpi(hKL, TRUE); + return pImeDpi; +} + HKL WINAPI ImmLoadLayout(HKL hKL, PIMEINFOEX pImeInfoEx) { DWORD cbData; @@ -3332,28 +3353,56 @@ BOOL WINAPI ImmNotifyIME( BOOL WINAPI ImmRegisterWordA( HKL hKL, LPCSTR lpszReading, DWORD dwStyle, LPCSTR lpszRegister) { - ImmHkl *immHkl = IMM_GetImmHkl(hKL); - TRACE("(%p, %s, %d, %s):\n", hKL, debugstr_a(lpszReading), dwStyle, - debugstr_a(lpszRegister)); - if (immHkl->hIME && immHkl->pImeRegisterWord) + BOOL ret = FALSE; + PIMEDPI pImeDpi; + LPWSTR pszReadingW = NULL, pszRegisterW = NULL; + INT cch; + + TRACE("(%p, %s, 0x%lX, %s)\n", hKL, debugstr_a(lpszReading), dwStyle, + debugstr_a(lpszRegister)); + + pImeDpi = ImmLockOrLoadImeDpi(hKL); + if (!pImeDpi) + return FALSE; + + if (!(pImeDpi->ImeInfo.fdwProperty & IME_PROP_UNICODE)) { - if (!is_kbd_ime_unicode(immHkl)) - return immHkl->pImeRegisterWord((LPCWSTR)lpszReading,dwStyle, - (LPCWSTR)lpszRegister); - else - { - LPWSTR lpszwReading = strdupAtoW(lpszReading); - LPWSTR lpszwRegister = strdupAtoW(lpszRegister); - BOOL rc; + ret = pImeDpi->ImeRegisterWord(lpszReading, dwStyle, lpszRegister); + ImmUnlockImeDpi(pImeDpi); + return ret; + } - rc = immHkl->pImeRegisterWord(lpszwReading,dwStyle,lpszwRegister); - HeapFree(GetProcessHeap(),0,lpszwReading); - HeapFree(GetProcessHeap(),0,lpszwRegister); - return rc; - } + if (lpszReading) + { + cch = lstrlenA(lpszReading); + pszReadingW = Imm32HeapAlloc(0, (cch + 1) * sizeof(WCHAR)); + if (pszReadingW == NULL) + goto Quit; + cch = MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, lpszReading, cch, + pszReadingW, cch + 1); + pszReadingW[cch] = 0; } - else - return FALSE; + + if (lpszRegister) + { + cch = lstrlenA(lpszRegister); + pszRegisterW = Imm32HeapAlloc(0, (cch + 1) * sizeof(WCHAR)); + if (pszRegisterW == NULL) + goto Quit; + cch = MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, lpszRegister, cch, + pszRegisterW, cch + 1); + pszRegisterW[cch] = 0; + } + + ret = ImmRegisterWordW(hKL, pszReadingW, dwStyle, pszRegisterW); + +Quit: + if (pszReadingW) + HeapFree(g_hImm32Heap, 0, pszReadingW); + if (pszRegisterW) + HeapFree(g_hImm32Heap, 0, pszRegisterW); + ImmUnlockImeDpi(pImeDpi); + return ret; } /*********************************************************************** diff --git a/win32ss/include/imetable.h b/win32ss/include/imetable.h index 5157ec43030..3bfd5c1d562 100644 --- a/win32ss/include/imetable.h +++ b/win32ss/include/imetable.h @@ -1,10 +1,10 @@ /* DEFINE_IME_ENTRY(type, name, params, extended) */ -DEFINE_IME_ENTRY(BOOL, ImeInquire, (LPIMEINFO lpIMEInfo, LPWSTR lpszWndClass, DWORD dwSystemInfoFlags), FALSE) -DEFINE_IME_ENTRY(DWORD, ImeConversionList, (HIMC hIMC, LPCWSTR lpSrc, LPCANDIDATELIST lpDst, DWORD dwBufLen, UINT uFlag), FALSE) -DEFINE_IME_ENTRY(BOOL, ImeRegisterWord, (LPCWSTR lpszReading, DWORD dwStyle, LPCWSTR lpszString), FALSE) -DEFINE_IME_ENTRY(BOOL, ImeUnregisterWord, (LPCWSTR lpszReading, DWORD dwStyle, LPCWSTR lpszString), FALSE) +DEFINE_IME_ENTRY(BOOL, ImeInquire, (LPIMEINFO lpIMEInfo, LPVOID lpszWndClass, DWORD dwSystemInfoFlags), FALSE) +DEFINE_IME_ENTRY(DWORD, ImeConversionList, (HIMC hIMC, LPCVOID lpSrc, LPCANDIDATELIST lpDst, DWORD dwBufLen, UINT uFlag), FALSE) +DEFINE_IME_ENTRY(BOOL, ImeRegisterWord, (LPCVOID lpszReading, DWORD dwStyle, LPCVOID lpszString), FALSE) +DEFINE_IME_ENTRY(BOOL, ImeUnregisterWord, (LPCVOID lpszReading, DWORD dwStyle, LPCVOID lpszString), FALSE) DEFINE_IME_ENTRY(UINT, ImeGetRegisterWordStyle, (UINT nItem, LPSTYLEBUFW lpStyleBuf), FALSE) -DEFINE_IME_ENTRY(UINT, ImeEnumRegisterWord, (HKL hKL, REGISTERWORDENUMPROCW lpfnEnumProc, LPCWSTR lpszReading, DWORD dwStyle, LPCWSTR lpszString, LPVOID lpData), FALSE) +DEFINE_IME_ENTRY(UINT, ImeEnumRegisterWord, (HKL hKL, REGISTERWORDENUMPROCW lpfnEnumProc, LPCVOID lpszReading, DWORD dwStyle, LPCVOID lpszString, LPVOID lpData), FALSE) DEFINE_IME_ENTRY(BOOL, ImeConfigure, (HKL hKL, HWND hWnd, DWORD dwMode, LPVOID lpData), FALSE) DEFINE_IME_ENTRY(BOOL, ImeDestroy, (UINT uReserved), FALSE) DEFINE_IME_ENTRY(LRESULT, ImeEscape, (HIMC hIMC, UINT uEscape, LPVOID lpData), FALSE)

3 years, 1 month

[reactos] 01/01: [IMM32] Rewrite ImmGetVirtualKey (#3889)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6b24e73d41cf14e7bf25b… commit 6b24e73d41cf14e7bf25b5209c304e15d40514f5 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Aug 10 08:03:32 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Aug 10 08:03:32 2021 +0900 [IMM32] Rewrite ImmGetVirtualKey (#3889) Implementing Japanese input. CORE-11700 --- dll/win32/imm32/imm.c | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index 2e89bf4c011..7ae9094844c 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -3130,25 +3130,22 @@ BOOL WINAPI ImmGetStatusWindowPos(HIMC hIMC, LPPOINT lpptPos) */ UINT WINAPI ImmGetVirtualKey(HWND hWnd) { - OSVERSIONINFOA version; - InputContextData *data = ImmGetContext( hWnd ); - TRACE("%p\n", hWnd); - - if ( data ) - return data->lastVK; - - version.dwOSVersionInfoSize = sizeof(OSVERSIONINFOA); - GetVersionExA( &version ); - switch(version.dwPlatformId) - { - case VER_PLATFORM_WIN32_WINDOWS: - return VK_PROCESSKEY; - case VER_PLATFORM_WIN32_NT: - return 0; - default: - FIXME("%d not supported\n",version.dwPlatformId); - return VK_PROCESSKEY; - } + HIMC hIMC; + LPINPUTCONTEXTDX pIC; + UINT ret = VK_PROCESSKEY; + + TRACE("(%p)\n", hWnd); + + hIMC = ImmGetContext(hWnd); + pIC = (LPINPUTCONTEXTDX)ImmLockIMC(hIMC); + if (!pIC) + return ret; + + if (pIC->bHasVKey) + ret = pIC->nVKey; + + ImmUnlockIMC(hIMC); + return ret; } /***********************************************************************

3 years, 1 month

[reactos] 01/01: [GDI32] Revise IntTMWFixUp Raster Font List (#3808)

by Doug Lyons

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ad8d8b662846cb4060d22… commit ad8d8b662846cb4060d22c4bb16897c8a352794c Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Mon Aug 9 06:07:04 2021 -0500 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Aug 9 13:07:04 2021 +0200 [GDI32] Revise IntTMWFixUp Raster Font List (#3808) CORE-17662 CORE-17723 --- win32ss/gdi/ntgdi/text.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/win32ss/gdi/ntgdi/text.c b/win32ss/gdi/ntgdi/text.c index 8de0855558e..2c252494da6 100644 --- a/win32ss/gdi/ntgdi/text.c +++ b/win32ss/gdi/ntgdi/text.c @@ -42,14 +42,14 @@ IntTMWFixUp( * out the problematic TrueType and Vector bits. * Our list below checks for Raster Font Facenames. */ DPRINT("Font Facename is '%S'.\n", lf.lfFaceName); - if ((wcsicmp(lf.lfFaceName, L"Helv") == 0) || - (wcsicmp(lf.lfFaceName, L"Courier") == 0) || + if ((wcsicmp(lf.lfFaceName, L"Courier") == 0) || + (wcsicmp(lf.lfFaceName, L"FixedSys") == 0) || + (wcsicmp(lf.lfFaceName, L"Helv") == 0) || (wcsicmp(lf.lfFaceName, L"MS Sans Serif") == 0) || (wcsicmp(lf.lfFaceName, L"MS Serif") == 0) || - (wcsicmp(lf.lfFaceName, L"Times New Roman") == 0) || - (wcsicmp(lf.lfFaceName, L"MS Shell Dlg") == 0) || (wcsicmp(lf.lfFaceName, L"System") == 0) || - (wcsicmp(lf.lfFaceName, L"Terminal") == 0)) + (wcsicmp(lf.lfFaceName, L"Terminal") == 0) || + (wcsicmp(lf.lfFaceName, L"Tms Rmn") == 0)) { ptm->TextMetric.tmPitchAndFamily &= ~(TMPF_TRUETYPE | TMPF_VECTOR); }

3 years, 1 month

[reactos] 01/01: Check for PAE

by James Tabor

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a81ad376a1e261339d481… commit a81ad376a1e261339d481a0b163b1492c10c6b9f Author: James Tabor <james.tabor(a)reactos.org> AuthorDate: Sun Aug 8 20:37:06 2021 -0500 Commit: James Tabor <james.tabor(a)reactos.org> CommitDate: Sun Aug 8 20:37:06 2021 -0500 Check for PAE Checking for PAE and set some logic later to support it. --- ntoskrnl/ke/i386/cpu.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ntoskrnl/ke/i386/cpu.c b/ntoskrnl/ke/i386/cpu.c index ac1d9ee4dfd..03bd33d465b 100644 --- a/ntoskrnl/ke/i386/cpu.c +++ b/ntoskrnl/ke/i386/cpu.c @@ -380,6 +380,11 @@ KiGetFeatureBits(VOID) if (CpuFeatures & 0x02000000) FeatureBits |= KF_XMMI; if (CpuFeatures & 0x04000000) FeatureBits |= KF_XMMI64; + if (CpuFeatures & 0x00000040) + { + DPRINT1("Support PAE\n"); + } + /* Check if the CPU has hyper-threading */ if (CpuFeatures & 0x10000000) {

3 years, 1 month

[reactos] 01/01: [IMM32][SDK] Rename some members of INPUTCONTEXTDX

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4f2108882dbfe2fbdd2a0… commit 4f2108882dbfe2fbdd2a07839db888bc411e35c9 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Aug 9 00:05:06 2021 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Aug 9 00:05:06 2021 +0900 [IMM32][SDK] Rename some members of INPUTCONTEXTDX CORE-11700 --- sdk/include/reactos/wine/ddk/imm.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk/include/reactos/wine/ddk/imm.h b/sdk/include/reactos/wine/ddk/imm.h index 7242bd3c46a..81d665dc7dc 100644 --- a/sdk/include/reactos/wine/ddk/imm.h +++ b/sdk/include/reactos/wine/ddk/imm.h @@ -92,10 +92,10 @@ typedef struct INPUTCONTEXTDX /* unconfirmed */ INPUTCONTEXT; UINT nVKey; BOOL bHasVKey; - DWORD dwUnknown148; + DWORD dwUnknownCat; DWORD dwUIFlags; - DWORD dwUnknown150; - void *pUnknown154; + DWORD dwUnknownDog; + void *pUnknownFox; /* ... */ } INPUTCONTEXTDX, *LPINPUTCONTEXTDX;

3 years, 1 month

[reactos] 01/01: [DHCPCSVC] Make the DHCP client service stoppable

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=033b6639e4c9394c26a47… commit 033b6639e4c9394c26a47e18752accaf17a8756e Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Aug 8 14:09:31 2021 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Aug 8 14:10:25 2021 +0200 [DHCPCSVC] Make the DHCP client service stoppable - Make all threads (pipe thread, adapter discovery thread and dispatcher thread) wait on the stop event. - Close shared resources in the main (dispatcher) thread after the pipe thread and the adapter discovery thread have shut down. This enables us to stop and restart the DHCP client properly. CORE-14390 --- base/services/dhcpcsvc/dhcp/adapter.c | 59 +++++-------- base/services/dhcpcsvc/dhcp/api.c | 44 +++++----- base/services/dhcpcsvc/dhcp/dhclient.c | 8 -- base/services/dhcpcsvc/dhcp/dispatch.c | 19 ++-- base/services/dhcpcsvc/dhcp/pipe.c | 145 +++++++++++++++++++++---------- base/services/dhcpcsvc/dhcpcsvc.c | 73 +++++++++++++++- base/services/dhcpcsvc/include/rosdhcp.h | 18 ++-- 7 files changed, 233 insertions(+), 133 deletions(-) diff --git a/base/services/dhcpcsvc/dhcp/adapter.c b/base/services/dhcpcsvc/dhcp/adapter.c index b2ff127285f..65f620360b8 100644 --- a/base/services/dhcpcsvc/dhcp/adapter.c +++ b/base/services/dhcpcsvc/dhcp/adapter.c @@ -1,5 +1,10 @@ #include <rosdhcp.h> +#define NDEBUG +#include <reactos/debug.h> + +extern HANDLE hAdapterStateChangedEvent; + SOCKET DhcpSocket = INVALID_SOCKET; static LIST_ENTRY AdapterList; static WSADATA wsd; @@ -287,14 +292,13 @@ DWORD WINAPI AdapterDiscoveryThread(LPVOID Context) { PMIB_IFTABLE Table = (PMIB_IFTABLE) malloc(sizeof(MIB_IFTABLE)); DWORD Error, Size = sizeof(MIB_IFTABLE); PDHCP_ADAPTER Adapter = NULL; - HANDLE AdapterStateChangedEvent = (HANDLE)Context; + HANDLE hStopEvent = (HANDLE)Context; struct interface_info *ifi = NULL; struct protocol *proto; int i, AdapterCount = 0, Broadcast; - /* FIXME: Kill this thread when the service is stopped */ - - do { + while (TRUE) + { DH_DbgPrint(MID_TRACE,("Getting Adapter List...\n")); while( (Error = GetIfTable(Table, &Size, 0 )) == @@ -346,7 +350,7 @@ DWORD WINAPI AdapterDiscoveryThread(LPVOID Context) { got_one, &Adapter->DhclientInfo); state_init(&Adapter->DhclientInfo); - SetEvent(AdapterStateChangedEvent); + SetEvent(hAdapterStateChangedEvent); } } else { @@ -444,7 +448,7 @@ DWORD WINAPI AdapterDiscoveryThread(LPVOID Context) { ApiLock(); InsertTailList( &AdapterList, &Adapter->ListEntry ); AdapterCount++; - SetEvent(AdapterStateChangedEvent); + SetEvent(hAdapterStateChangedEvent); ApiUnlock(); } else { free( Adapter ); Adapter = 0; } } else { free( Adapter ); Adapter = 0; } @@ -458,43 +462,24 @@ DWORD WINAPI AdapterDiscoveryThread(LPVOID Context) { if (Error != NO_ERROR) break; #else - Sleep(3000); + if (WaitForSingleObject(hStopEvent, 3000) == WAIT_OBJECT_0) + { + DPRINT("Stopping the discovery thread!\n"); + break; + } #endif - } while (TRUE); + } - DbgPrint("DHCPCSVC: Adapter discovery thread is terminating! (Error: %d)\n", Error); + if (Table) + free(Table); + + DPRINT("Adapter discovery thread terminated! (Error: %d)\n", Error); - if( Table ) free( Table ); return Error; } -HANDLE StartAdapterDiscovery(VOID) { - HANDLE ThreadHandle, EventHandle; - - EventHandle = CreateEvent(NULL, - FALSE, - FALSE, - NULL); - - if (EventHandle == NULL) - return NULL; - - ThreadHandle = CreateThread(NULL, - 0, - AdapterDiscoveryThread, - (LPVOID)EventHandle, - 0, - NULL); - - if (ThreadHandle == NULL) - { - CloseHandle(EventHandle); - return NULL; - } - - CloseHandle(ThreadHandle); - - return EventHandle; +HANDLE StartAdapterDiscovery(HANDLE hStopEvent) { + return CreateThread(NULL, 0, AdapterDiscoveryThread, (LPVOID)hStopEvent, 0, NULL); } void AdapterStop() { diff --git a/base/services/dhcpcsvc/dhcp/api.c b/base/services/dhcpcsvc/dhcp/api.c index 62fd2c56551..28d19cacba7 100644 --- a/base/services/dhcpcsvc/dhcp/api.c +++ b/base/services/dhcpcsvc/dhcp/api.c @@ -13,7 +13,7 @@ static CRITICAL_SECTION ApiCriticalSection; -extern HANDLE AdapterStateChangedEvent; +extern HANDLE hAdapterStateChangedEvent; VOID ApiInit() { InitializeCriticalSection( &ApiCriticalSection ); @@ -33,7 +33,7 @@ VOID ApiFree() { /* This represents the service portion of the DHCP client API */ -DWORD DSLeaseIpAddress( PipeSendFunc Send, COMM_DHCP_REQ *Req ) { +DWORD DSLeaseIpAddress( PipeSendFunc Send, HANDLE CommPipe, COMM_DHCP_REQ *Req ) { COMM_DHCP_REPLY Reply; PDHCP_ADAPTER Adapter; struct protocol* proto; @@ -56,16 +56,16 @@ DWORD DSLeaseIpAddress( PipeSendFunc Send, COMM_DHCP_REQ *Req ) { Adapter->DhclientInfo.client->state = S_INIT; state_reboot(&Adapter->DhclientInfo); - if (AdapterStateChangedEvent != NULL) - SetEvent(AdapterStateChangedEvent); + if (hAdapterStateChangedEvent != NULL) + SetEvent(hAdapterStateChangedEvent); } ApiUnlock(); - return Send( &Reply ); + return Send(CommPipe, &Reply ); } -DWORD DSQueryHWInfo( PipeSendFunc Send, COMM_DHCP_REQ *Req ) { +DWORD DSQueryHWInfo( PipeSendFunc Send, HANDLE CommPipe, COMM_DHCP_REQ *Req ) { COMM_DHCP_REPLY Reply; PDHCP_ADAPTER Adapter; @@ -84,10 +84,10 @@ DWORD DSQueryHWInfo( PipeSendFunc Send, COMM_DHCP_REQ *Req ) { ApiUnlock(); - return Send( &Reply ); + return Send(CommPipe, &Reply ); } -DWORD DSReleaseIpAddressLease( PipeSendFunc Send, COMM_DHCP_REQ *Req ) { +DWORD DSReleaseIpAddressLease( PipeSendFunc Send, HANDLE CommPipe, COMM_DHCP_REQ *Req ) { COMM_DHCP_REPLY Reply; PDHCP_ADAPTER Adapter; struct protocol* proto; @@ -117,16 +117,16 @@ DWORD DSReleaseIpAddressLease( PipeSendFunc Send, COMM_DHCP_REQ *Req ) { Adapter->DhclientInfo.client->active = NULL; Adapter->DhclientInfo.client->state = S_INIT; - if (AdapterStateChangedEvent != NULL) - SetEvent(AdapterStateChangedEvent); + if (hAdapterStateChangedEvent != NULL) + SetEvent(hAdapterStateChangedEvent); } ApiUnlock(); - return Send( &Reply ); + return Send(CommPipe, &Reply ); } -DWORD DSRenewIpAddressLease( PipeSendFunc Send, COMM_DHCP_REQ *Req ) { +DWORD DSRenewIpAddressLease( PipeSendFunc Send, HANDLE CommPipe, COMM_DHCP_REQ *Req ) { COMM_DHCP_REPLY Reply; PDHCP_ADAPTER Adapter; struct protocol* proto; @@ -138,7 +138,7 @@ DWORD DSRenewIpAddressLease( PipeSendFunc Send, COMM_DHCP_REQ *Req ) { if( !Adapter || Adapter->DhclientState.state == S_STATIC ) { Reply.Reply = 0; ApiUnlock(); - return Send( &Reply ); + return Send(CommPipe, &Reply ); } Reply.Reply = 1; @@ -154,15 +154,15 @@ DWORD DSRenewIpAddressLease( PipeSendFunc Send, COMM_DHCP_REQ *Req ) { Adapter->DhclientInfo.client->state = S_INIT; state_reboot(&Adapter->DhclientInfo); - if (AdapterStateChangedEvent != NULL) - SetEvent(AdapterStateChangedEvent); + if (hAdapterStateChangedEvent != NULL) + SetEvent(hAdapterStateChangedEvent); ApiUnlock(); - return Send( &Reply ); + return Send(CommPipe, &Reply ); } -DWORD DSStaticRefreshParams( PipeSendFunc Send, COMM_DHCP_REQ *Req ) { +DWORD DSStaticRefreshParams( PipeSendFunc Send, HANDLE CommPipe, COMM_DHCP_REQ *Req ) { NTSTATUS Status; COMM_DHCP_REPLY Reply; PDHCP_ADAPTER Adapter; @@ -197,16 +197,16 @@ DWORD DSStaticRefreshParams( PipeSendFunc Send, COMM_DHCP_REQ *Req ) { &Adapter->NteInstance ); Reply.Reply = NT_SUCCESS(Status); - if (AdapterStateChangedEvent != NULL) - SetEvent(AdapterStateChangedEvent); + if (hAdapterStateChangedEvent != NULL) + SetEvent(hAdapterStateChangedEvent); } ApiUnlock(); - return Send( &Reply ); + return Send(CommPipe, &Reply ); } -DWORD DSGetAdapterInfo( PipeSendFunc Send, COMM_DHCP_REQ *Req ) { +DWORD DSGetAdapterInfo( PipeSendFunc Send, HANDLE CommPipe, COMM_DHCP_REQ *Req ) { COMM_DHCP_REPLY Reply; PDHCP_ADAPTER Adapter; @@ -240,5 +240,5 @@ DWORD DSGetAdapterInfo( PipeSendFunc Send, COMM_DHCP_REQ *Req ) { ApiUnlock(); - return Send( &Reply ); + return Send(CommPipe, &Reply ); } diff --git a/base/services/dhcpcsvc/dhcp/dhclient.c b/base/services/dhcpcsvc/dhcp/dhclient.c index f97a7ca83df..5d8964b216d 100644 --- a/base/services/dhcpcsvc/dhcp/dhclient.c +++ b/base/services/dhcpcsvc/dhcp/dhclient.c @@ -122,14 +122,6 @@ init_client(void) inaddr_any.s_addr = INADDR_ANY; bootp_packet_handler = do_packet; - if (PipeInit() == INVALID_HANDLE_VALUE) - { - DbgPrint("DHCPCSVC: PipeInit() failed!\n"); - AdapterStop(); - ApiFree(); - return 0; // FALSE - } - return 1; // TRUE } diff --git a/base/services/dhcpcsvc/dhcp/dispatch.c b/base/services/dhcpcsvc/dhcp/dispatch.c index d72e0928047..7b973310bb0 100644 --- a/base/services/dhcpcsvc/dhcp/dispatch.c +++ b/base/services/dhcpcsvc/dhcp/dispatch.c @@ -41,6 +41,9 @@ #include <rosdhcp.h> +#define NDEBUG +#include <reactos/debug.h> + //#include <sys/ioctl.h> //#include <net/if_media.h> @@ -48,7 +51,8 @@ //#include <poll.h> extern SOCKET DhcpSocket; -HANDLE AdapterStateChangedEvent = NULL; +extern HANDLE hAdapterStateChangedEvent; + struct protocol *protocols = NULL; struct timeout *timeouts = NULL; static struct timeout *free_timeouts = NULL; @@ -71,12 +75,7 @@ dispatch(HANDLE hStopEvent) HANDLE Events[3]; int EventCount = 2; - Events[0] = StartAdapterDiscovery(); - if (!Events[0]) - return; - - AdapterStateChangedEvent = Events[0]; - + Events[0] = hAdapterStateChangedEvent; Events[1] = hStopEvent; Events[2] = WSA_INVALID_EVENT; @@ -157,6 +156,7 @@ dispatch(HANDLE hStopEvent) else if (count == WAIT_OBJECT_0 + 1) { /* Stop event signalled */ + DPRINT("Dispatch thread stop event!\n"); break; } else if (count == WAIT_OBJECT_0 + 2) @@ -183,12 +183,11 @@ dispatch(HANDLE hStopEvent) } } while (1); - AdapterStateChangedEvent = NULL; - CloseHandle(Events[0]); - CloseHandle(Events[1]); WSACloseEvent(Events[2]); ApiUnlock(); + + DPRINT("Dispatch thread stopped!\n"); } void diff --git a/base/services/dhcpcsvc/dhcp/pipe.c b/base/services/dhcpcsvc/dhcp/pipe.c index aff1812675c..a323d171ebd 100644 --- a/base/services/dhcpcsvc/dhcp/pipe.c +++ b/base/services/dhcpcsvc/dhcp/pipe.c @@ -11,21 +11,28 @@ #define NDEBUG #include <reactos/debug.h> -static HANDLE CommPipe = INVALID_HANDLE_VALUE, CommThread; -DWORD CommThrId; - #define COMM_PIPE_OUTPUT_BUFFER sizeof(COMM_DHCP_REQ) #define COMM_PIPE_INPUT_BUFFER sizeof(COMM_DHCP_REPLY) #define COMM_PIPE_DEFAULT_TIMEOUT 1000 -DWORD PipeSend( COMM_DHCP_REPLY *Reply ) { +DWORD PipeSend( HANDLE CommPipe, COMM_DHCP_REPLY *Reply ) { DWORD Written = 0; + OVERLAPPED Overlapped = {0}; BOOL Success = WriteFile( CommPipe, Reply, sizeof(*Reply), &Written, - NULL ); + &Overlapped); + if (!Success) + { + WaitForSingleObject(CommPipe, INFINITE); + Success = GetOverlappedResult(CommPipe, + &Overlapped, + &Written, + TRUE); + } + return Success ? Written : -1; } @@ -34,10 +41,57 @@ DWORD WINAPI PipeThreadProc( LPVOID Parameter ) { COMM_DHCP_REQ Req; COMM_DHCP_REPLY Reply; BOOL Result, Connected; + HANDLE Events[2]; + HANDLE CommPipe; + OVERLAPPED Overlapped = {0}; + DWORD dwError; - while( TRUE ) { - Connected = ConnectNamedPipe( CommPipe, NULL ) ? - TRUE : GetLastError() == ERROR_PIPE_CONNECTED; + DPRINT("PipeThreadProc(%p)\n", Parameter); + + CommPipe = CreateNamedPipeW + ( DHCP_PIPE_NAME, + PIPE_ACCESS_DUPLEX | FILE_FLAG_FIRST_PIPE_INSTANCE | FILE_FLAG_OVERLAPPED, + PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT, + 1, + COMM_PIPE_OUTPUT_BUFFER, + COMM_PIPE_INPUT_BUFFER, + COMM_PIPE_DEFAULT_TIMEOUT, + NULL ); + if (CommPipe == INVALID_HANDLE_VALUE) + { + DbgPrint("DHCP: Could not create named pipe\n"); + return FALSE; + } + + Events[0] = (HANDLE)Parameter; + Events[1] = CommPipe; + + while( TRUE ) + { + Connected = ConnectNamedPipe(CommPipe, &Overlapped); + if (!Connected) + { + dwError = GetLastError(); + if (dwError == ERROR_IO_PENDING) + { + dwError = WaitForMultipleObjects(2, Events, FALSE, INFINITE); + DPRINT("WaitForMultipleObjects() returned %lu\n", dwError); + if (dwError == WAIT_OBJECT_0 + 1) + { + Connected = GetOverlappedResult(CommPipe, + &Overlapped, + &BytesRead, + TRUE); + } + else if (dwError == WAIT_OBJECT_0) + { + CancelIo(CommPipe); + CloseHandle(CommPipe); + CommPipe = INVALID_HANDLE_VALUE; + break; + } + } + } if (!Connected) { DbgPrint("DHCP: Could not connect named pipe\n"); @@ -46,74 +100,75 @@ DWORD WINAPI PipeThreadProc( LPVOID Parameter ) { break; } - Result = ReadFile( CommPipe, &Req, sizeof(Req), &BytesRead, NULL ); + Result = ReadFile(CommPipe, &Req, sizeof(Req), &BytesRead, &Overlapped); + if (!Result) + { + dwError = GetLastError(); + if (dwError == ERROR_IO_PENDING) + { + dwError = WaitForMultipleObjects(2, Events, FALSE, INFINITE); + DPRINT("WaitForMultipleObjects() returned %lu\n", dwError); + if (dwError == WAIT_OBJECT_0 + 1) + { + Result = GetOverlappedResult(CommPipe, + &Overlapped, + &BytesRead, + TRUE); + } + else if (dwError == WAIT_OBJECT_0) + { + CancelIo(CommPipe); + DisconnectNamedPipe( CommPipe ); + CloseHandle(CommPipe); + CommPipe = INVALID_HANDLE_VALUE; + break; + } + } + } + if( Result ) { switch( Req.Type ) { case DhcpReqQueryHWInfo: - DSQueryHWInfo( PipeSend, &Req ); + DSQueryHWInfo( PipeSend, CommPipe, &Req ); break; case DhcpReqLeaseIpAddress: - DSLeaseIpAddress( PipeSend, &Req ); + DSLeaseIpAddress( PipeSend, CommPipe, &Req ); break; case DhcpReqReleaseIpAddress: - DSReleaseIpAddressLease( PipeSend, &Req ); + DSReleaseIpAddressLease( PipeSend, CommPipe, &Req ); break; case DhcpReqRenewIpAddress: - DSRenewIpAddressLease( PipeSend, &Req ); + DSRenewIpAddressLease( PipeSend, CommPipe, &Req ); break; case DhcpReqStaticRefreshParams: - DSStaticRefreshParams( PipeSend, &Req ); + DSStaticRefreshParams( PipeSend, CommPipe, &Req ); break; case DhcpReqGetAdapterInfo: - DSGetAdapterInfo( PipeSend, &Req ); + DSGetAdapterInfo( PipeSend, CommPipe, &Req ); break; default: DPRINT1("Unrecognized request type %d\n", Req.Type); ZeroMemory( &Reply, sizeof( COMM_DHCP_REPLY ) ); Reply.Reply = 0; - PipeSend( &Reply ); + PipeSend(CommPipe, &Reply ); break; } } DisconnectNamedPipe( CommPipe ); } - return TRUE; -} + DPRINT("Pipe thread stopped!\n"); -HANDLE PipeInit() { - CommPipe = CreateNamedPipeW - ( DHCP_PIPE_NAME, - PIPE_ACCESS_DUPLEX | FILE_FLAG_FIRST_PIPE_INSTANCE, - PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT, - 1, - COMM_PIPE_OUTPUT_BUFFER, - COMM_PIPE_INPUT_BUFFER, - COMM_PIPE_DEFAULT_TIMEOUT, - NULL ); - - if( CommPipe == INVALID_HANDLE_VALUE ) { - DbgPrint("DHCP: Could not create named pipe\n"); - return CommPipe; - } - - CommThread = CreateThread( NULL, 0, PipeThreadProc, NULL, 0, &CommThrId ); - - if( !CommThread ) { - CloseHandle( CommPipe ); - CommPipe = INVALID_HANDLE_VALUE; - } - - return CommPipe; + return TRUE; } -VOID PipeDestroy() { - CloseHandle( CommPipe ); - CommPipe = INVALID_HANDLE_VALUE; +HANDLE PipeInit(HANDLE hStopEvent) +{ + return CreateThread( NULL, 0, PipeThreadProc, (LPVOID)hStopEvent, 0, NULL); } diff --git a/base/services/dhcpcsvc/dhcpcsvc.c b/base/services/dhcpcsvc/dhcpcsvc.c index e1f131c6c50..819af629a79 100644 --- a/base/services/dhcpcsvc/dhcpcsvc.c +++ b/base/services/dhcpcsvc/dhcpcsvc.c @@ -17,8 +17,10 @@ static WCHAR ServiceName[] = L"DHCP"; SERVICE_STATUS_HANDLE ServiceStatusHandle = 0; SERVICE_STATUS ServiceStatus; HANDLE hStopEvent = NULL; +HANDLE hAdapterStateChangedEvent = NULL; static HANDLE PipeHandle = INVALID_HANDLE_VALUE; +extern SOCKET DhcpSocket; DWORD APIENTRY DhcpCApiInitialize(LPDWORD Version) @@ -391,6 +393,10 @@ ServiceControlHandler(DWORD dwControl, VOID WINAPI ServiceMain(DWORD argc, LPWSTR* argv) { + HANDLE hPipeThread = INVALID_HANDLE_VALUE; + HANDLE hDiscoveryThread = INVALID_HANDLE_VALUE; + DWORD ret; + ServiceStatusHandle = RegisterServiceCtrlHandlerExW(ServiceName, ServiceControlHandler, NULL); @@ -403,18 +409,52 @@ ServiceMain(DWORD argc, LPWSTR* argv) UpdateServiceStatus(SERVICE_START_PENDING); /* Create the stop event */ - hStopEvent = CreateEventW(NULL, FALSE, FALSE, NULL); + hStopEvent = CreateEventW(NULL, TRUE, FALSE, NULL); if (hStopEvent == NULL) { UpdateServiceStatus(SERVICE_STOPPED); return; } + hAdapterStateChangedEvent = CreateEvent(NULL, FALSE, FALSE, NULL); + if (hAdapterStateChangedEvent == NULL) + { + CloseHandle(hStopEvent); + UpdateServiceStatus(SERVICE_STOPPED); + return; + } + UpdateServiceStatus(SERVICE_START_PENDING); if (!init_client()) { - DPRINT1("DHCPCSVC: init_client() failed!\n"); + DbgPrint("DHCPCSVC: init_client() failed!\n"); + CloseHandle(hAdapterStateChangedEvent); + CloseHandle(hStopEvent); + UpdateServiceStatus(SERVICE_STOPPED); + return; + } + + UpdateServiceStatus(SERVICE_START_PENDING); + + hPipeThread = PipeInit(hStopEvent); + if (hPipeThread == INVALID_HANDLE_VALUE) + { + DbgPrint("DHCPCSVC: PipeInit() failed!\n"); + stop_client(); + CloseHandle(hAdapterStateChangedEvent); + CloseHandle(hStopEvent); + UpdateServiceStatus(SERVICE_STOPPED); + return; + } + + hDiscoveryThread = StartAdapterDiscovery(hStopEvent); + if (hDiscoveryThread == INVALID_HANDLE_VALUE) + { + DbgPrint("DHCPCSVC: StartAdapterDiscovery() failed!\n"); + stop_client(); + CloseHandle(hAdapterStateChangedEvent); + CloseHandle(hStopEvent); UpdateServiceStatus(SERVICE_STOPPED); return; } @@ -429,8 +469,37 @@ ServiceMain(DWORD argc, LPWSTR* argv) dispatch(hStopEvent); DH_DbgPrint(MID_TRACE,("DHCPCSVC: DHCP service is shutting down\n")); + stop_client(); + DPRINT("Wait for pipe thread to close! %p\n", hPipeThread); + if (hPipeThread != INVALID_HANDLE_VALUE) + { + DPRINT("Waiting for pipe thread\n"); + ret = WaitForSingleObject(hPipeThread, 5000); + DPRINT("Done %lx\n", ret); + } + + DPRINT("Wait for discovery thread to close! %p\n", hDiscoveryThread); + if (hDiscoveryThread != INVALID_HANDLE_VALUE) + { + DPRINT("Waiting for discovery thread\n"); + ret = WaitForSingleObject(hDiscoveryThread, 5000); + DPRINT("Done %lx\n", ret); + } + + DPRINT("Closing events!\n"); + CloseHandle(hAdapterStateChangedEvent); + CloseHandle(hStopEvent); + + if (DhcpSocket != INVALID_SOCKET) + closesocket(DhcpSocket); + + CloseHandle(hDiscoveryThread); + CloseHandle(hPipeThread); + + DPRINT("Done!\n"); + UpdateServiceStatus(SERVICE_STOPPED); } diff --git a/base/services/dhcpcsvc/include/rosdhcp.h b/base/services/dhcpcsvc/include/rosdhcp.h index ffb2ee8ff31..3f278a31a4f 100644 --- a/base/services/dhcpcsvc/include/rosdhcp.h +++ b/base/services/dhcpcsvc/include/rosdhcp.h @@ -76,7 +76,7 @@ typedef struct _DHCP_ADAPTER { unsigned char recv_buf[1]; } DHCP_ADAPTER, *PDHCP_ADAPTER; -typedef DWORD (*PipeSendFunc)( COMM_DHCP_REPLY *Reply ); +typedef DWORD (*PipeSendFunc)(HANDLE CommPipe, COMM_DHCP_REPLY *Reply ); #define random rand #define srandom srand @@ -85,24 +85,24 @@ int init_client(void); void stop_client(void); void AdapterInit(VOID); -HANDLE StartAdapterDiscovery(VOID); +HANDLE StartAdapterDiscovery(HANDLE hStopEvent); void AdapterStop(VOID); extern PDHCP_ADAPTER AdapterGetFirst(VOID); extern PDHCP_ADAPTER AdapterGetNext(PDHCP_ADAPTER); extern PDHCP_ADAPTER AdapterFindIndex( unsigned int AdapterIndex ); extern PDHCP_ADAPTER AdapterFindInfo( struct interface_info *info ); extern PDHCP_ADAPTER AdapterFindByHardwareAddress( u_int8_t haddr[16], u_int8_t hlen ); -extern HANDLE PipeInit(VOID); +extern HANDLE PipeInit(HANDLE hStopEvent); extern VOID ApiInit(VOID); extern VOID ApiFree(VOID); extern VOID ApiLock(VOID); extern VOID ApiUnlock(VOID); -extern DWORD DSQueryHWInfo( PipeSendFunc Send, COMM_DHCP_REQ *Req ); -extern DWORD DSLeaseIpAddress( PipeSendFunc Send, COMM_DHCP_REQ *Req ); -extern DWORD DSRenewIpAddressLease( PipeSendFunc Send, COMM_DHCP_REQ *Req ); -extern DWORD DSReleaseIpAddressLease( PipeSendFunc Send, COMM_DHCP_REQ *Req ); -extern DWORD DSStaticRefreshParams( PipeSendFunc Send, COMM_DHCP_REQ *Req ); -extern DWORD DSGetAdapterInfo( PipeSendFunc Send, COMM_DHCP_REQ *Req ); +extern DWORD DSQueryHWInfo( PipeSendFunc Send, HANDLE CommPipe, COMM_DHCP_REQ *Req ); +extern DWORD DSLeaseIpAddress( PipeSendFunc Send, HANDLE CommPipe, COMM_DHCP_REQ *Req ); +extern DWORD DSRenewIpAddressLease( PipeSendFunc Send, HANDLE CommPipe, COMM_DHCP_REQ *Req ); +extern DWORD DSReleaseIpAddressLease( PipeSendFunc Send, HANDLE CommPipe, COMM_DHCP_REQ *Req ); +extern DWORD DSStaticRefreshParams( PipeSendFunc Send, HANDLE CommPipe, COMM_DHCP_REQ *Req ); +extern DWORD DSGetAdapterInfo( PipeSendFunc Send, HANDLE CommPipe, COMM_DHCP_REQ *Req ); extern int inet_aton(const char *s, struct in_addr *addr); int warn( char *format, ... );

3 years, 1 month

[reactos] 01/01: [IMM32] Delete useless ImmInternalSendIMENotify function

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f486f877964b28f648620… commit f486f877964b28f648620a6f7b2c160dfb2d3835 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Aug 8 17:46:02 2021 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Aug 8 17:46:02 2021 +0900 [IMM32] Delete useless ImmInternalSendIMENotify function CORE-11700 --- dll/win32/imm32/imm.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index 3f2ed30b2f7..2e89bf4c011 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -842,19 +842,6 @@ static void ImmInternalSendIMEMessage(InputContextData *data, UINT msg, WPARAM w SendMessageW(target, msg, wParam, lParam); } -static LRESULT ImmInternalSendIMENotify(InputContextData *data, WPARAM notify, LPARAM lParam) -{ - HWND target; - - target = data->IMC.hWnd; - if (!target) target = GetFocus(); - - if (target) - return SendMessageW(target, WM_IME_NOTIFY, notify, lParam); - - return 0; -} - static InputContextData* get_imc_data(HIMC hIMC) { InputContextData *data = hIMC;

3 years, 1 month

[reactos] 01/01: [IMM32] Rewrite ImmSetCompositionFontA/W (#3886)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7342ed1861d4cae5fc216… commit 7342ed1861d4cae5fc21656e0c249a81f423f49c Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Aug 8 17:35:34 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Aug 8 17:35:34 2021 +0900 [IMM32] Rewrite ImmSetCompositionFontA/W (#3886) - Rewrite ImmSetCompositionFontA and ImmSetCompositionFontW functions. - Add INPUTCONTEXTDX structure as an extension of INPUTCONTEXT. CORE-11700 --- dll/win32/imm32/imm.c | 132 ++++++++++++++++++++++++++++++++----- sdk/include/reactos/wine/ddk/imm.h | 37 +++++++++++ 2 files changed, 151 insertions(+), 18 deletions(-) diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index f33211203e4..3f2ed30b2f7 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -3482,29 +3482,88 @@ BOOL WINAPI ImmSetCandidateWindow( #undef MAX_CANDIDATEFORM } +static VOID APIENTRY WideToAnsiLogFont(const LOGFONTW *plfW, LPLOGFONTA plfA) +{ + BOOL bUsedDef; + size_t cchW, cchA = _countof(plfA->lfFaceName); + RtlCopyMemory(plfA, plfW, offsetof(LOGFONTA, lfFaceName)); + StringCchLengthW(plfW->lfFaceName, _countof(plfW->lfFaceName), &cchW); + cchA = WideCharToMultiByte(CP_ACP, 0, plfW->lfFaceName, (INT)cchW, + plfA->lfFaceName, (INT)cchA, NULL, &bUsedDef); + if (cchA > _countof(plfA->lfFaceName) - 1) + cchA = _countof(plfA->lfFaceName) - 1; + plfA->lfFaceName[cchA] = 0; +} + +static VOID APIENTRY AnsiToWideLogFont(const LOGFONTA *plfA, LPLOGFONTW plfW) +{ + size_t cchA, cchW = _countof(plfW->lfFaceName); + RtlCopyMemory(plfW, plfA, offsetof(LOGFONTW, lfFaceName)); + StringCchLengthA(plfA->lfFaceName, _countof(plfA->lfFaceName), &cchA); + cchW = MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, plfA->lfFaceName, (INT)cchA, + plfW->lfFaceName, cchW); + if (cchW > _countof(plfW->lfFaceName) - 1) + cchW = _countof(plfW->lfFaceName) - 1; + plfW->lfFaceName[cchW] = 0; +} + /*********************************************************************** * ImmSetCompositionFontA (IMM32.@) */ BOOL WINAPI ImmSetCompositionFontA(HIMC hIMC, LPLOGFONTA lplf) { - InputContextData *data = get_imc_data(hIMC); + LOGFONTW lfW; + DWORD dwImeThreadId, dwThreadId; + PCLIENTIMC pClientImc; + BOOL bWide; + LPINPUTCONTEXTDX pIC; + LCID lcid; + HWND hWnd; + PTEB pTeb; + TRACE("(%p, %p)\n", hIMC, lplf); - if (!data || !lplf) - { - SetLastError(ERROR_INVALID_HANDLE); + dwImeThreadId = Imm32QueryInputContext(hIMC, 1); + dwThreadId = GetCurrentThreadId(); + if (dwImeThreadId != dwThreadId) return FALSE; + + pClientImc = ImmLockClientImc(hIMC); + if (pClientImc == NULL) + return FALSE; + + bWide = (pClientImc->dwFlags & CLIENTIMC_WIDE); + ImmUnlockClientImc(pClientImc); + + if (bWide) + { + AnsiToWideLogFont(lplf, &lfW); + return ImmSetCompositionFontW(hIMC, &lfW); } - if (IMM_IsCrossThreadAccess(NULL, hIMC)) + pIC = (LPINPUTCONTEXTDX)ImmLockIMC(hIMC); + if (pIC == NULL) return FALSE; - memcpy(&data->IMC.lfFont.W,lplf,sizeof(LOGFONTA)); - MultiByteToWideChar(CP_ACP, 0, lplf->lfFaceName, -1, data->IMC.lfFont.W.lfFaceName, - LF_FACESIZE); - ImmNotifyIME(hIMC, NI_CONTEXTUPDATED, 0, IMC_SETCOMPOSITIONFONT); - ImmInternalSendIMENotify(data, IMN_SETCOMPOSITIONFONT, 0); + pTeb = NtCurrentTeb(); + if (pTeb->Win32ClientInfo[2] < 0x400) + { + lcid = GetSystemDefaultLCID(); + if (PRIMARYLANGID(lcid) == LANG_JAPANESE && !(pIC->dwUIFlags & 2) && + pIC->cfCompForm.dwStyle != CFS_DEFAULT) + { + PostMessageA(pIC->hWnd, WM_IME_REPORT, IR_CHANGECONVERT, 0); + } + } + + pIC->lfFont.A = *lplf; + pIC->fdwInit |= INIT_LOGFONT; + hWnd = pIC->hWnd; + + ImmUnlockIMC(hIMC); + Imm32NotifyAction(hIMC, hWnd, NI_CONTEXTUPDATED, 0, IMC_SETCOMPOSITIONFONT, + IMN_SETCOMPOSITIONFONT, 0); return TRUE; } @@ -3513,22 +3572,59 @@ BOOL WINAPI ImmSetCompositionFontA(HIMC hIMC, LPLOGFONTA lplf) */ BOOL WINAPI ImmSetCompositionFontW(HIMC hIMC, LPLOGFONTW lplf) { - InputContextData *data = get_imc_data(hIMC); + LOGFONTA lfA; + DWORD dwImeThreadId, dwThreadId; + PCLIENTIMC pClientImc; + BOOL bWide; + HWND hWnd; + LPINPUTCONTEXTDX pIC; + PTEB pTeb; + LCID lcid; + TRACE("(%p, %p)\n", hIMC, lplf); - if (!data || !lplf) - { - SetLastError(ERROR_INVALID_HANDLE); + dwImeThreadId = Imm32QueryInputContext(hIMC, 1); + dwThreadId = GetCurrentThreadId(); + if (dwImeThreadId != dwThreadId) + return FALSE; + + pClientImc = ImmLockClientImc(hIMC); + if (pClientImc == NULL) return FALSE; + + bWide = (pClientImc->dwFlags & CLIENTIMC_WIDE); + ImmUnlockClientImc(pClientImc); + + if (!bWide) + { + WideToAnsiLogFont(lplf, &lfA); + return ImmSetCompositionFontA(hIMC, &lfA); } - if (IMM_IsCrossThreadAccess(NULL, hIMC)) + pIC = (LPINPUTCONTEXTDX)ImmLockIMC(hIMC); + if (pIC == NULL) return FALSE; - data->IMC.lfFont.W = *lplf; - ImmNotifyIME(hIMC, NI_CONTEXTUPDATED, 0, IMC_SETCOMPOSITIONFONT); - ImmInternalSendIMENotify(data, IMN_SETCOMPOSITIONFONT, 0); + pTeb = NtCurrentTeb(); + if (pTeb->Win32ClientInfo[2] < 0x400) + { + lcid = GetSystemDefaultLCID(); + if (PRIMARYLANGID(lcid) == LANG_JAPANESE && + !(pIC->dwUIFlags & 2) && + pIC->cfCompForm.dwStyle != CFS_DEFAULT) + { + PostMessageW(pIC->hWnd, WM_IME_REPORT, IR_CHANGECONVERT, 0); + } + } + + pIC->lfFont.W = *lplf; + pIC->fdwInit |= INIT_LOGFONT; + hWnd = pIC->hWnd; + + ImmUnlockIMC(hIMC); + Imm32NotifyAction(hIMC, hWnd, NI_CONTEXTUPDATED, 0, IMC_SETCOMPOSITIONFONT, + IMN_SETCOMPOSITIONFONT, 0); return TRUE; } diff --git a/sdk/include/reactos/wine/ddk/imm.h b/sdk/include/reactos/wine/ddk/imm.h index 106d9603119..7242bd3c46a 100644 --- a/sdk/include/reactos/wine/ddk/imm.h +++ b/sdk/include/reactos/wine/ddk/imm.h @@ -87,6 +87,24 @@ C_ASSERT(offsetof(INPUTCONTEXT, dwReserve) == 0x134); C_ASSERT(sizeof(INPUTCONTEXT) == 0x140); #endif +typedef struct INPUTCONTEXTDX /* unconfirmed */ +{ + INPUTCONTEXT; + UINT nVKey; + BOOL bHasVKey; + DWORD dwUnknown148; + DWORD dwUIFlags; + DWORD dwUnknown150; + void *pUnknown154; + /* ... */ +} INPUTCONTEXTDX, *LPINPUTCONTEXTDX; + +#ifndef _WIN64 +C_ASSERT(offsetof(INPUTCONTEXTDX, nVKey) == 0x140); +C_ASSERT(offsetof(INPUTCONTEXTDX, bHasVKey) == 0x144); +C_ASSERT(offsetof(INPUTCONTEXTDX, dwUIFlags) == 0x14c); +#endif + // bits of fdwInit of INPUTCONTEXT #define INIT_STATUSWNDPOS 0x00000001 #define INIT_CONVERSION 0x00000002 @@ -95,6 +113,25 @@ C_ASSERT(sizeof(INPUTCONTEXT) == 0x140); #define INIT_COMPFORM 0x00000010 #define INIT_SOFTKBDPOS 0x00000020 +#ifndef WM_IME_REPORT + #define WM_IME_REPORT 0x280 +#endif + +// WM_IME_REPORT wParam +#define IR_STRINGSTART 0x100 +#define IR_STRINGEND 0x101 +#define IR_OPENCONVERT 0x120 +#define IR_CHANGECONVERT 0x121 +#define IR_CLOSECONVERT 0x122 +#define IR_FULLCONVERT 0x123 +#define IR_IMESELECT 0x130 +#define IR_STRING 0x140 +#define IR_DBCSCHAR 0x160 +#define IR_UNDETERMINE 0x170 +#define IR_STRINGEX 0x180 +#define IR_MODEINFO 0x190 + + LPINPUTCONTEXT WINAPI ImmLockIMC(HIMC); #endif /* _WINE_IMM_H_ */

3 years, 1 month

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2021