Ros-diffs October 2021

ros-diffs@reactos.org

26 participants
116 discussions

[reactos] 01/01: [GITHUB] build.yml: Update LLVM version to 13 (#4054)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4b0249e98a7d5893f4570… commit 4b0249e98a7d5893f4570f48dea9ce24bc12cf02 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Fri Oct 22 17:17:06 2021 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Oct 22 18:17:06 2021 +0300 [GITHUB] build.yml: Update LLVM version to 13 (#4054) --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2ccb6da912a..54fd58b7893 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,7 +34,7 @@ jobs: - name: Install LLVM if: ${{ matrix.compiler == 'clang' }} run: | - export LLVM_VERSION=12 + export LLVM_VERSION=13 wget https://apt.llvm.org/llvm.sh chmod +x llvm.sh sudo ./llvm.sh $LLVM_VERSION

3 years, 2 months

[reactos] 01/01: [ADVAPI32] Fix several corner cases in RegOpenKey* functions

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1ade494a70757b32202f1… commit 1ade494a70757b32202f13b50c86160fd3b56280 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Thu Oct 21 14:45:56 2021 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Thu Oct 21 14:45:56 2021 +0200 [ADVAPI32] Fix several corner cases in RegOpenKey* functions This fixes the remaining RegOpenKey* tests. --- dll/win32/advapi32/reg/reg.c | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/dll/win32/advapi32/reg/reg.c b/dll/win32/advapi32/reg/reg.c index 3d739fb9d4f..9beecc99d2c 100644 --- a/dll/win32/advapi32/reg/reg.c +++ b/dll/win32/advapi32/reg/reg.c @@ -3264,12 +3264,7 @@ RegOpenKeyA(HKEY hKey, if (!phkResult) return ERROR_INVALID_PARAMETER; - if (!hKey && lpSubKey && phkResult) - { - return ERROR_INVALID_HANDLE; - } - - if (!lpSubKey || !*lpSubKey) + if (!hKey && !lpSubKey) { *phkResult = hKey; return ERROR_SUCCESS; @@ -3303,12 +3298,7 @@ RegOpenKeyW(HKEY hKey, if (!phkResult) return ERROR_INVALID_PARAMETER; - if (!hKey && lpSubKey && phkResult) - { - return ERROR_INVALID_HANDLE; - } - - if (!lpSubKey || !*lpSubKey) + if (!hKey && !lpSubKey) { *phkResult = hKey; return ERROR_SUCCESS; @@ -3383,6 +3373,17 @@ RegOpenKeyExW(HKEY hKey, return ERROR_INVALID_PARAMETER; } + if (!hKey && lpSubKey && phkResult) + { + return ERROR_INVALID_HANDLE; + } + + if (IsPredefKey(hKey) && (!lpSubKey || !*lpSubKey)) + { + *phkResult = hKey; + return ERROR_SUCCESS; + } + Status = MapDefaultKey(&KeyHandle, hKey); if (!NT_SUCCESS(Status)) { @@ -3399,7 +3400,10 @@ RegOpenKeyExW(HKEY hKey, if (ulOptions & REG_OPTION_OPEN_LINK) Attributes |= OBJ_OPENLINK; - RtlInitUnicodeString(&SubKeyString, lpSubKey ? lpSubKey : L""); + if (lpSubKey == NULL || wcscmp(lpSubKey, L"\\") == 0) + RtlInitUnicodeString(&SubKeyString, L""); + else + RtlInitUnicodeString(&SubKeyString, lpSubKey); InitializeObjectAttributes(&ObjectAttributes, &SubKeyString,

3 years, 2 months

[reactos] 01/01: [IMM32] Rewrite ImmInstallIMEW (#4044)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a37d9a4e14115b850e00f… commit a37d9a4e14115b850e00f67889ee9ee7c4be7766 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Oct 21 10:28:04 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Oct 21 10:28:04 2021 +0900 [IMM32] Rewrite ImmInstallIMEW (#4044) - Add Imm32StrToUInt and Imm32UIntToStr helper functions. - Add Imm32LoadImeVerInfo, Imm32GetRegImes, Imm32WriteRegIme, Imm32GetNextHKL, Imm32CopyFile helper functions. - Add REG_IME structure for registered IMEs. - Rewrite ImmInstallIMEW function. - Improve ImmLoadLayout and Imm32LoadImeInfo functions. CORE-11700 --- dll/win32/imm32/ime.c | 169 ++++++++++++++++-- dll/win32/imm32/imm.c | 143 ++++----------- dll/win32/imm32/precomp.h | 16 ++ dll/win32/imm32/utils.c | 436 ++++++++++++++++++++++++++++++++++++++++++++++ win32ss/include/ntuser.h | 2 +- 5 files changed, 642 insertions(+), 124 deletions(-) diff --git a/dll/win32/imm32/ime.c b/dll/win32/imm32/ime.c index 9ae6115fe49..cfe0b66754e 100644 --- a/dll/win32/imm32/ime.c +++ b/dll/win32/imm32/ime.c @@ -152,6 +152,7 @@ BOOL APIENTRY Imm32LoadImeInfo(PIMEINFOEX pImeInfoEx, PIMEDPI pImeDpi) WCHAR szPath[MAX_PATH]; HINSTANCE hIME; FARPROC fn; + BOOL ret = FALSE; if (!Imm32GetSystemLibraryPath(szPath, _countof(szPath), pImeInfoEx->wszImeFile)) return FALSE; @@ -172,27 +173,46 @@ BOOL APIENTRY Imm32LoadImeInfo(PIMEINFOEX pImeInfoEx, PIMEDPI pImeDpi) do { \ fn = GetProcAddress(hIME, #name); \ if (fn) pImeDpi->name = (FN_##name)fn; \ - else if (!(optional)) goto Failed; \ + else if (!(optional)) { \ + ERR("'%s' not found in the IME module '%s'.\n", #name, debugstr_w(szPath)); \ + goto Failed; \ + } \ } while (0); #include "imetable.h" #undef DEFINE_IME_ENTRY - if (!Imm32InquireIme(pImeDpi)) + if (Imm32InquireIme(pImeDpi)) + { + ret = TRUE; + } + else { - ERR("Imm32LoadImeInfo: Imm32InquireIme failed\n"); - goto Failed; + ERR("Imm32InquireIme failed\n"); +Failed: + ret = FALSE; + FreeLibrary(pImeDpi->hInst); + pImeDpi->hInst = NULL; } - if (pImeInfoEx->fLoadFlag) - return TRUE; + if (pImeInfoEx->fLoadFlag == 0) + { + if (ret) + { + C_ASSERT(sizeof(pImeInfoEx->wszUIClass) == sizeof(pImeDpi->szUIClass)); + pImeInfoEx->ImeInfo = pImeDpi->ImeInfo; + RtlCopyMemory(pImeInfoEx->wszUIClass, pImeDpi->szUIClass, + sizeof(pImeInfoEx->wszUIClass)); + pImeInfoEx->fLoadFlag = 2; + } + else + { + pImeInfoEx->fLoadFlag = 1; + } - NtUserSetImeOwnerWindow(pImeInfoEx, TRUE); - return TRUE; + NtUserSetImeInfoEx(pImeInfoEx); + } -Failed: - FreeLibrary(pImeDpi->hInst); - pImeDpi->hInst = NULL; - return FALSE; + return ret; } PIMEDPI APIENTRY Ime32LoadImeDpi(HKL hKL, BOOL bLock) @@ -475,6 +495,127 @@ Quit: return ret; } +/*********************************************************************** + * ImmInstallIMEA (IMM32.@) + */ +HKL WINAPI ImmInstallIMEA(LPCSTR lpszIMEFileName, LPCSTR lpszLayoutText) +{ + HKL hKL = NULL; + LPWSTR pszFileNameW = NULL, pszLayoutTextW = NULL; + + TRACE("(%s, %s)\n", debugstr_a(lpszIMEFileName), debugstr_a(lpszLayoutText)); + + pszFileNameW = Imm32WideFromAnsi(lpszIMEFileName); + if (!pszFileNameW) + goto Quit; + + pszLayoutTextW = Imm32WideFromAnsi(lpszLayoutText); + if (!pszLayoutTextW) + goto Quit; + + hKL = ImmInstallIMEW(pszFileNameW, pszLayoutTextW); + +Quit: + Imm32HeapFree(pszFileNameW); + Imm32HeapFree(pszLayoutTextW); + return hKL; +} + +/*********************************************************************** + * ImmInstallIMEW (IMM32.@) + */ +HKL WINAPI ImmInstallIMEW(LPCWSTR lpszIMEFileName, LPCWSTR lpszLayoutText) +{ + WCHAR szImeFileName[MAX_PATH], szImeDestPath[MAX_PATH], szImeKey[20]; + IMEINFOEX InfoEx; + LPWSTR pchFilePart; + UINT iLayout, cLayouts; + HKL hNewKL; + WORD wLangID; + PREG_IME pLayouts = NULL; + + TRACE("(%s, %s)\n", debugstr_w(lpszIMEFileName), debugstr_w(lpszLayoutText)); + + GetFullPathNameW(lpszIMEFileName, _countof(szImeFileName), szImeFileName, &pchFilePart); + CharUpperW(szImeFileName); + if (!pchFilePart) + return NULL; + + /* Load the IME version info */ + InfoEx.hkl = hNewKL = NULL; + StringCchCopyW(InfoEx.wszImeFile, _countof(InfoEx.wszImeFile), pchFilePart); + if (Imm32LoadImeVerInfo(&InfoEx) && InfoEx.hkl) + wLangID = LOWORD(InfoEx.hkl); + else + return NULL; + + /* Get the IME layouts from registry */ + cLayouts = Imm32GetRegImes(NULL, 0); + if (cLayouts) + { + pLayouts = Imm32HeapAlloc(0, cLayouts * sizeof(REG_IME)); + if (!pLayouts || !Imm32GetRegImes(pLayouts, cLayouts)) + { + Imm32HeapFree(pLayouts); + return NULL; + } + + for (iLayout = 0; iLayout < cLayouts; ++iLayout) + { + if (lstrcmpiW(pLayouts[iLayout].szFileName, pchFilePart) == 0) + { + if (wLangID != LOWORD(pLayouts[iLayout].hKL)) + goto Quit; /* The language is different */ + + hNewKL = pLayouts[iLayout].hKL; /* Found */ + break; + } + } + } + + /* If the IME for the specified filename is valid, then unload it now */ + /* FIXME: ImmGetImeInfoEx is broken */ + if (ImmGetImeInfoEx(&InfoEx, 3, pchFilePart) && + !UnloadKeyboardLayout(InfoEx.hkl)) + { + hNewKL = NULL; + goto Quit; + } + + Imm32GetSystemLibraryPath(szImeDestPath, _countof(szImeDestPath), pchFilePart); + CharUpperW(szImeDestPath); + + /* If the source and the destination pathnames were different, then copy the IME file */ + if (lstrcmpiW(szImeFileName, szImeDestPath) != 0 && + !Imm32CopyFile(szImeFileName, szImeDestPath)) + { + hNewKL = NULL; + goto Quit; + } + + if (hNewKL == NULL) + hNewKL = Imm32GetNextHKL(cLayouts, pLayouts, wLangID); + + if (hNewKL) + { + /* Write the IME layout to registry */ + if (Imm32WriteRegIme(hNewKL, pchFilePart, lpszLayoutText)) + { + /* Load the keyboard layout */ + Imm32UIntToStr((DWORD)(DWORD_PTR)hNewKL, 16, szImeKey, _countof(szImeKey)); + hNewKL = LoadKeyboardLayoutW(szImeKey, KLF_REPLACELANG); + } + else + { + hNewKL = NULL; + } + } + +Quit: + Imm32HeapFree(pLayouts); + return hNewKL; +} + /*********************************************************************** * ImmIsIME (IMM32.@) */ @@ -482,7 +623,8 @@ BOOL WINAPI ImmIsIME(HKL hKL) { IMEINFOEX info; TRACE("(%p)\n", hKL); - return !!ImmGetImeInfoEx(&info, ImeInfoExImeWindow, &hKL); + /* FIXME: ImmGetImeInfoEx is broken */ + return !!ImmGetImeInfoEx(&info, 1, &hKL); } /*********************************************************************** @@ -542,6 +684,7 @@ ImmGetImeInfoEx(PIMEINFOEX pImeInfoEx, IMEINFOEXCLASS SearchType, PVOID pvSearch BOOL bDisabled = FALSE; HKL hKL; + /* FIXME: broken */ switch (SearchType) { case ImeInfoExKeyboardLayout: diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index f4fa021b619..c21c5a23567 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -51,54 +51,64 @@ BOOL WINAPI ImmRegisterClient(PSHAREDINFO ptr, HINSTANCE hMod) /*********************************************************************** * ImmLoadLayout (IMM32.@) */ -HKL WINAPI ImmLoadLayout(HKL hKL, PIMEINFOEX pImeInfoEx) +BOOL WINAPI ImmLoadLayout(HKL hKL, PIMEINFOEX pImeInfoEx) { DWORD cbData; - UNICODE_STRING UnicodeString; HKEY hLayoutKey = NULL, hLayoutsKey = NULL; LONG error; - NTSTATUS Status; WCHAR szLayout[MAX_PATH]; TRACE("(%p, %p)\n", hKL, pImeInfoEx); if (IS_IME_HKL(hKL) || !Imm32IsCiceroMode() || Imm32Is16BitMode()) { - UnicodeString.Buffer = szLayout; - UnicodeString.MaximumLength = sizeof(szLayout); - Status = RtlIntegerToUnicodeString((DWORD_PTR)hKL, 16, &UnicodeString); - if (!NT_SUCCESS(Status)) - return NULL; + Imm32UIntToStr((DWORD)(DWORD_PTR)hKL, 16, szLayout, _countof(szLayout)); error = RegOpenKeyW(HKEY_LOCAL_MACHINE, REGKEY_KEYBOARD_LAYOUTS, &hLayoutsKey); if (error) - return NULL; + { + ERR("RegOpenKeyW: 0x%08lX\n", error); + return FALSE; + } error = RegOpenKeyW(hLayoutsKey, szLayout, &hLayoutKey); + if (error) + { + ERR("RegOpenKeyW: 0x%08lX\n", error); + RegCloseKey(hLayoutsKey); + return FALSE; + } } else { error = RegOpenKeyW(HKEY_LOCAL_MACHINE, REGKEY_IMM, &hLayoutKey); - } - - if (error) - { - ERR("RegOpenKeyW error: 0x%08lX\n", error); - hKL = NULL; - } - else - { - cbData = sizeof(pImeInfoEx->wszImeFile); - error = RegQueryValueExW(hLayoutKey, L"Ime File", 0, 0, - (LPBYTE)pImeInfoEx->wszImeFile, &cbData); if (error) - hKL = NULL; + { + ERR("RegOpenKeyW: 0x%08lX\n", error); + return FALSE; + } } + cbData = sizeof(pImeInfoEx->wszImeFile); + error = RegQueryValueExW(hLayoutKey, L"Ime File", 0, 0, + (LPBYTE)pImeInfoEx->wszImeFile, &cbData); + pImeInfoEx->wszImeFile[_countof(pImeInfoEx->wszImeFile) - 1] = 0; + RegCloseKey(hLayoutKey); if (hLayoutsKey) RegCloseKey(hLayoutsKey); - return hKL; + + pImeInfoEx->fLoadFlag = 0; + + if (error) + { + ERR("RegQueryValueExW: 0x%08lX\n", error); + pImeInfoEx->hkl = NULL; + return FALSE; + } + + pImeInfoEx->hkl = hKL; + return Imm32LoadImeVerInfo(pImeInfoEx); } /*********************************************************************** @@ -476,10 +486,6 @@ BOOL WINAPI ImmActivateLayout(HKL hKL) return TRUE; } -static const WCHAR szImeFileW[] = {'I','m','e',' ','F','i','l','e',0}; -static const WCHAR szLayoutTextW[] = {'L','a','y','o','u','t',' ','T','e','x','t',0}; -static const WCHAR szImeRegFmt[] = {'S','y','s','t','e','m','\\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\','C','o','n','t','r','o','l','\\','K','e','y','b','o','a','r','d',' ','L','a','y','o','u','t','s','\\','%','0','8','l','x',0}; - static VOID APIENTRY Imm32CiceroSetActiveContext(HIMC hIMC, BOOL fActive, HWND hWnd, HKL hKL) { FIXME("We have to do something\n"); @@ -1015,89 +1021,6 @@ BOOL WINAPI CtfImmIsCiceroEnabled(VOID) return Imm32IsCiceroMode(); } -/*********************************************************************** - * ImmInstallIMEA (IMM32.@) - */ -HKL WINAPI ImmInstallIMEA(LPCSTR lpszIMEFileName, LPCSTR lpszLayoutText) -{ - HKL hKL = NULL; - LPWSTR pszFileNameW = NULL, pszLayoutTextW = NULL; - - TRACE("(%s, %s)\n", debugstr_a(lpszIMEFileName), debugstr_a(lpszLayoutText)); - - pszFileNameW = Imm32WideFromAnsi(lpszIMEFileName); - if (pszFileNameW == NULL) - goto Quit; - - pszLayoutTextW = Imm32WideFromAnsi(lpszLayoutText); - if (pszLayoutTextW == NULL) - goto Quit; - - hKL = ImmInstallIMEW(pszFileNameW, pszLayoutTextW); - -Quit: - Imm32HeapFree(pszFileNameW); - Imm32HeapFree(pszLayoutTextW); - return hKL; -} - -/*********************************************************************** - * ImmInstallIMEW (IMM32.@) - */ -HKL WINAPI ImmInstallIMEW(LPCWSTR lpszIMEFileName, LPCWSTR lpszLayoutText) -{ - INT lcid = GetUserDefaultLCID(); - INT count; - HKL hkl; - DWORD rc; - HKEY hkey; - WCHAR regKey[ARRAY_SIZE(szImeRegFmt)+8]; - - TRACE ("(%s, %s):\n", debugstr_w(lpszIMEFileName), - debugstr_w(lpszLayoutText)); - - /* Start with 2. e001 will be blank and so default to the wine internal IME */ - count = 2; - - while (count < 0xfff) - { - DWORD disposition = 0; - - hkl = (HKL)MAKELPARAM( lcid, 0xe000 | count ); - wsprintfW( regKey, szImeRegFmt, (ULONG_PTR)hkl); - - rc = RegCreateKeyExW(HKEY_LOCAL_MACHINE, regKey, 0, NULL, 0, KEY_WRITE, NULL, &hkey, &disposition); - if (rc == ERROR_SUCCESS && disposition == REG_CREATED_NEW_KEY) - break; - else if (rc == ERROR_SUCCESS) - RegCloseKey(hkey); - - count++; - } - - if (count == 0xfff) - { - WARN("Unable to find slot to install IME\n"); - return 0; - } - - if (rc == ERROR_SUCCESS) - { - rc = RegSetValueExW(hkey, szImeFileW, 0, REG_SZ, (const BYTE*)lpszIMEFileName, - (lstrlenW(lpszIMEFileName) + 1) * sizeof(WCHAR)); - if (rc == ERROR_SUCCESS) - rc = RegSetValueExW(hkey, szLayoutTextW, 0, REG_SZ, (const BYTE*)lpszLayoutText, - (lstrlenW(lpszLayoutText) + 1) * sizeof(WCHAR)); - RegCloseKey(hkey); - return hkl; - } - else - { - WARN("Unable to set IME registry values\n"); - return 0; - } -} - /*********************************************************************** * ImmLockIMC(IMM32.@) * diff --git a/dll/win32/imm32/precomp.h b/dll/win32/imm32/precomp.h index 584defc5501..285ab70b8d1 100644 --- a/dll/win32/imm32/precomp.h +++ b/dll/win32/imm32/precomp.h @@ -24,6 +24,7 @@ #include <winnls.h> #include <winreg.h> #include <winnls32.h> +#include <winver.h> #include <imm.h> #include <ddk/imm.h> @@ -61,6 +62,13 @@ #define ROUNDUP4(n) (((n) + 3) & ~3) /* DWORD alignment */ +typedef struct REG_IME +{ + HKL hKL; + WCHAR szImeKey[20]; /* "E0XXYYYY": "E0XX" is the device handle. "YYYY" is a LANGID. */ + WCHAR szFileName[80]; /* The IME module filename */ +} REG_IME, *PREG_IME; + extern HMODULE g_hImm32Inst; extern RTL_CRITICAL_SECTION g_csImeDpi; extern PIMEDPI g_pImeDpiList; @@ -139,3 +147,11 @@ DWORD APIENTRY Imm32ReconvertAnsiFromWide(LPRECONVERTSTRING pDest, const RECONVERTSTRING *pSrc, UINT uCodePage); DWORD APIENTRY Imm32ReconvertWideFromAnsi(LPRECONVERTSTRING pDest, const RECONVERTSTRING *pSrc, UINT uCodePage); + +HRESULT APIENTRY Imm32StrToUInt(LPCWSTR pszText, LPDWORD pdwValue, ULONG nBase); +HRESULT APIENTRY Imm32UIntToStr(DWORD dwValue, ULONG nBase, LPWSTR pszBuff, USHORT cchBuff); +BOOL APIENTRY Imm32LoadImeVerInfo(PIMEINFOEX pImeInfoEx); +UINT APIENTRY Imm32GetRegImes(PREG_IME pLayouts, UINT cLayouts); +BOOL APIENTRY Imm32WriteRegIme(HKL hKL, LPCWSTR pchFilePart, LPCWSTR pszLayout); +HKL APIENTRY Imm32GetNextHKL(UINT cKLs, const REG_IME *pLayouts, WORD wLangID); +BOOL APIENTRY Imm32CopyFile(LPWSTR pszOldFile, LPCWSTR pszNewFile); diff --git a/dll/win32/imm32/utils.c b/dll/win32/imm32/utils.c index abbe5717bc9..3cf198096a6 100644 --- a/dll/win32/imm32/utils.c +++ b/dll/win32/imm32/utils.c @@ -16,6 +16,48 @@ WINE_DEFAULT_DEBUG_CHANNEL(imm); HANDLE g_hImm32Heap = NULL; +HRESULT APIENTRY +Imm32StrToUInt(LPCWSTR pszText, LPDWORD pdwValue, ULONG nBase) +{ +#if 1 + NTSTATUS Status; + UNICODE_STRING UnicodeString; + RtlInitUnicodeString(&UnicodeString, pszText); + Status = RtlUnicodeStringToInteger(&UnicodeString, nBase, pdwValue); + if (!NT_SUCCESS(Status)) + return E_FAIL; + return S_OK; +#else + LPWSTR endptr; + *pdwValue = wcstoul(pszText, &endptr, nBase); + return (*endptr ? E_FAIL : S_OK); +#endif +} + +HRESULT APIENTRY +Imm32UIntToStr(DWORD dwValue, ULONG nBase, LPWSTR pszBuff, USHORT cchBuff) +{ +#if 1 + NTSTATUS Status; + UNICODE_STRING UnicodeString; + UnicodeString.Buffer = pszBuff; + UnicodeString.MaximumLength = cchBuff * sizeof(WCHAR); + Status = RtlIntegerToUnicodeString(dwValue, nBase, &UnicodeString); + if (!NT_SUCCESS(Status)) + return E_FAIL; + return S_OK; +#else + LPCWSTR pszFormat; + if (nBase == 16) + pszFormat = L"%lX"; + else if (nBase == 10) + pszFormat = L"%lu"; + else + return E_INVALIDARG; + return StringCchPrintfW(pszBuff, cchBuff, pszFormat, dwValue); +#endif +} + BOOL WINAPI Imm32IsImcAnsi(HIMC hIMC) { BOOL ret; @@ -484,6 +526,400 @@ Imm32ReconvertAnsiFromWide(LPRECONVERTSTRING pDest, const RECONVERTSTRING *pSrc, return cbDest; } +typedef BOOL (WINAPI *FN_GetFileVersionInfoW)(LPCWSTR, DWORD, DWORD, LPVOID); +typedef DWORD (WINAPI *FN_GetFileVersionInfoSizeW)(LPCWSTR, LPDWORD); +typedef BOOL (WINAPI *FN_VerQueryValueW)(LPCVOID, LPCWSTR, LPVOID*, PUINT); + +static FN_GetFileVersionInfoW s_fnGetFileVersionInfoW = NULL; +static FN_GetFileVersionInfoSizeW s_fnGetFileVersionInfoSizeW = NULL; +static FN_VerQueryValueW s_fnVerQueryValueW = NULL; + +static BOOL APIENTRY Imm32LoadImeFixedInfo(PIMEINFOEX pInfoEx, LPCVOID pVerInfo) +{ + UINT cbFixed = 0; + VS_FIXEDFILEINFO *pFixed; + if (!s_fnVerQueryValueW(pVerInfo, L"\\", (LPVOID*)&pFixed, &cbFixed) || !cbFixed) + return FALSE; + + /* NOTE: The IME module must contain a version info of input method driver. */ + if (pFixed->dwFileType != VFT_DRV || pFixed->dwFileSubtype != VFT2_DRV_INPUTMETHOD) + return FALSE; + + pInfoEx->dwProdVersion = pFixed->dwProductVersionMS; + pInfoEx->dwImeWinVersion = 0x40000; + return TRUE; +} + +static LPWSTR APIENTRY +Imm32GetVerInfoValue(LPCVOID pVerInfo, LPWSTR pszKey, DWORD cchKey, LPCWSTR pszName) +{ + size_t cchExtra; + LPWSTR pszValue; + UINT cbValue = 0; + + StringCchLengthW(pszKey, cchKey, &cchExtra); + + StringCchCatW(pszKey, cchKey, pszName); + s_fnVerQueryValueW(pVerInfo, pszKey, (LPVOID*)&pszValue, &cbValue); + pszKey[cchExtra] = 0; + + return (cbValue ? pszValue : NULL); +} + +BOOL APIENTRY Imm32LoadImeLangAndDesc(PIMEINFOEX pInfoEx, LPCVOID pVerInfo) +{ + BOOL ret; + WCHAR szKey[80]; + LPWSTR pszDesc; + LPWORD pw; + UINT cbData; + LANGID LangID; + + /* Getting the version info. See VerQueryValue */ + ret = s_fnVerQueryValueW(pVerInfo, L"\\VarFileInfo\\Translation", (LPVOID*)&pw, &cbData); + if (!ret || !cbData) + return FALSE; + + if (pInfoEx->hkl == NULL) + pInfoEx->hkl = (HKL)(DWORD_PTR)*pw; /* This is an invalid HKL */ + + /* Try the current language and the Unicode codepage (0x04B0) */ + LangID = LANGIDFROMLCID(GetThreadLocale()); + StringCchPrintfW(szKey, _countof(szKey), L"\\StringFileInfo\\%04X04B0\\", LangID); + pszDesc = Imm32GetVerInfoValue(pVerInfo, szKey, _countof(szKey), L"FileDescription"); + if (!pszDesc) + { + /* Retry the language and codepage of the IME module */ + StringCchPrintfW(szKey, _countof(szKey), L"\\StringFileInfo\\%04X%04X\\", pw[0], pw[1]); + pszDesc = Imm32GetVerInfoValue(pVerInfo, szKey, _countof(szKey), L"FileDescription"); + } + + /* The description */ + if (pszDesc) + StringCchCopyW(pInfoEx->wszImeDescription, _countof(pInfoEx->wszImeDescription), pszDesc); + else + pInfoEx->wszImeDescription[0] = 0; + + return TRUE; +} + +BOOL APIENTRY Imm32LoadImeVerInfo(PIMEINFOEX pImeInfoEx) +{ + HINSTANCE hinstVersion; + BOOL ret = FALSE, bLoaded = FALSE; + WCHAR szPath[MAX_PATH]; + LPVOID pVerInfo; + DWORD cbVerInfo, dwHandle; + + /* Load version.dll to use the version info API */ + Imm32GetSystemLibraryPath(szPath, _countof(szPath), L"version.dll"); + hinstVersion = GetModuleHandleW(szPath); + if (!hinstVersion) + { + hinstVersion = LoadLibraryW(szPath); + if (!hinstVersion) + return FALSE; + bLoaded = TRUE; + } + +#define GET_FN(name) do { \ + s_fn##name = (FN_##name)GetProcAddress(hinstVersion, #name); \ + if (!s_fn##name) goto Quit; \ +} while (0) + GET_FN(GetFileVersionInfoW); + GET_FN(GetFileVersionInfoSizeW); + GET_FN(VerQueryValueW); +#undef GET_FN + + /* The path of the IME module */ + Imm32GetSystemLibraryPath(szPath, _countof(szPath), pImeInfoEx->wszImeFile); + + cbVerInfo = s_fnGetFileVersionInfoSizeW(szPath, &dwHandle); + if (!cbVerInfo) + goto Quit; + + pVerInfo = Imm32HeapAlloc(0, cbVerInfo); + if (!pVerInfo) + goto Quit; + + /* Load the version info of the IME module */ + if (s_fnGetFileVersionInfoW(szPath, dwHandle, cbVerInfo, pVerInfo) && + Imm32LoadImeFixedInfo(pImeInfoEx, pVerInfo)) + { + ret = Imm32LoadImeLangAndDesc(pImeInfoEx, pVerInfo); + } + + Imm32HeapFree(pVerInfo); + +Quit: + if (bLoaded) + FreeLibrary(hinstVersion); + return ret; +} + +HKL APIENTRY Imm32GetNextHKL(UINT cKLs, const REG_IME *pLayouts, WORD wLangID) +{ + UINT iKL, wID, wLow = 0xE0FF, wHigh = 0xE01F, wNextID = 0; + + for (iKL = 0; iKL < cKLs; ++iKL) + { + wHigh = max(wHigh, HIWORD(pLayouts[iKL].hKL)); + wLow = min(wLow, HIWORD(pLayouts[iKL].hKL)); + } + + if (wHigh < 0xE0FF) + { + wNextID = wHigh + 1; + } + else if (wLow > 0xE001) + { + wNextID = wLow - 1; + } + else + { + for (wID = 0xE020; wID <= 0xE0FF; ++wID) + { + for (iKL = 0; iKL < cKLs; ++iKL) + { + if (LOWORD(pLayouts[iKL].hKL) == wLangID && + HIWORD(pLayouts[iKL].hKL) == wID) + { + break; + } + } + + if (iKL >= cKLs) + break; + } + + if (wID <= 0xE0FF) + wNextID = wID; + } + + if (!wNextID) + return NULL; + + return (HKL)(DWORD_PTR)MAKELONG(wLangID, wNextID); +} + +UINT APIENTRY Imm32GetRegImes(PREG_IME pLayouts, UINT cLayouts) +{ + HKEY hkeyLayouts, hkeyIME; + WCHAR szImeFileName[80], szImeKey[20]; + UINT iKey, nCount; + DWORD cbData; + LONG lError; + ULONG Value; + HKL hKL; + + /* Open the registry keyboard layouts */ + lError = RegOpenKeyW(HKEY_LOCAL_MACHINE, REGKEY_KEYBOARD_LAYOUTS, &hkeyLayouts); + if (lError != ERROR_SUCCESS) + return 0; + + for (iKey = nCount = 0; ; ++iKey) + { + /* Get the key name */ + lError = RegEnumKeyW(hkeyLayouts, iKey, szImeKey, _countof(szImeKey)); + if (lError != ERROR_SUCCESS) + break; + + if (szImeKey[0] != L'E' && szImeKey[0] != L'e') + continue; /* Not an IME layout */ + + if (pLayouts == NULL) /* for counting only */ + { + ++nCount; + continue; + } + + if (cLayouts <= nCount) + break; + + lError = RegOpenKeyW(hkeyLayouts, szImeKey, &hkeyIME); /* Open the IME key */ + if (lError != ERROR_SUCCESS) + break; + + /* Load the "Ime File" value */ + szImeFileName[0] = 0; + cbData = sizeof(szImeFileName); + RegQueryValueExW(hkeyIME, L"Ime File", NULL, NULL, (LPBYTE)szImeFileName, &cbData); + szImeFileName[_countof(szImeFileName) - 1] = 0; + + RegCloseKey(hkeyIME); + + if (!szImeFileName[0]) + break; + + Imm32StrToUInt(szImeKey, &Value, 16); + hKL = (HKL)(DWORD_PTR)Value; + if (!IS_IME_HKL(hKL)) + break; + + /* Store the IME key and the IME filename */ + pLayouts[nCount].hKL = hKL; + StringCchCopyW(pLayouts[nCount].szImeKey, _countof(pLayouts[nCount].szImeKey), szImeKey); + CharUpperW(szImeFileName); + StringCchCopyW(pLayouts[nCount].szFileName, _countof(pLayouts[nCount].szFileName), + szImeFileName); + ++nCount; + } + + RegCloseKey(hkeyLayouts); + return nCount; +} + +BOOL APIENTRY Imm32WriteRegIme(HKL hKL, LPCWSTR pchFilePart, LPCWSTR pszLayout) +{ + UINT iPreload; + HKEY hkeyLayouts, hkeyIME, hkeyPreload; + WCHAR szImeKey[20], szPreloadNumber[20], szPreloadKey[20], szImeFileName[80]; + DWORD cbData; + LANGID LangID; + LONG lError; + LPCWSTR pszLayoutFile; + + /* Open the registry keyboard layouts */ + lError = RegOpenKeyW(HKEY_LOCAL_MACHINE, REGKEY_KEYBOARD_LAYOUTS, &hkeyLayouts); + if (lError != ERROR_SUCCESS) + return FALSE; + + /* Get the IME key from hKL */ + Imm32UIntToStr((DWORD)(DWORD_PTR)hKL, 16, szImeKey, _countof(szImeKey)); + + /* Create a registry IME key */ + lError = RegCreateKeyW(hkeyLayouts, szImeKey, &hkeyIME); + if (lError != ERROR_SUCCESS) + goto Failure; + + /* Write "Ime File" */ + cbData = (wcslen(pchFilePart) + 1) * sizeof(WCHAR); + lError = RegSetValueExW(hkeyIME, L"Ime File", 0, REG_SZ, (LPBYTE)pchFilePart, cbData); + if (lError != ERROR_SUCCESS) + goto Failure; + + /* Write "Layout Text" */ + cbData = (wcslen(pszLayout) + 1) * sizeof(WCHAR); + lError = RegSetValueExW(hkeyIME, L"Layout Text", 0, REG_SZ, (LPBYTE)pszLayout, cbData); + if (lError != ERROR_SUCCESS) + goto Failure; + + /* Choose "Layout File" from hKL */ + LangID = LOWORD(hKL); + switch (LOBYTE(LangID)) + { + case LANG_JAPANESE: pszLayoutFile = L"kbdjpn.dll"; break; + case LANG_KOREAN: pszLayoutFile = L"kbdkor.dll"; break; + default: pszLayoutFile = L"kbdus.dll"; break; + } + StringCchCopyW(szImeFileName, _countof(szImeFileName), pszLayoutFile); + + /* Write "Layout File" */ + cbData = (wcslen(szImeFileName) + 1) * sizeof(WCHAR); + lError = RegSetValueExW(hkeyIME, L"Layout File", 0, REG_SZ, (LPBYTE)szImeFileName, cbData); + if (lError != ERROR_SUCCESS) + goto Failure; + + RegCloseKey(hkeyIME); + RegCloseKey(hkeyLayouts); + + /* Create "Preload" key */ + RegCreateKeyW(HKEY_CURRENT_USER, L"Keyboard Layout\\Preload", &hkeyPreload); + +#define MAX_PRELOAD 0x400 + for (iPreload = 1; iPreload < MAX_PRELOAD; ++iPreload) + { + Imm32UIntToStr(iPreload, 10, szPreloadNumber, _countof(szPreloadNumber)); + + /* Load the key of the preload number */ + cbData = sizeof(szPreloadKey); + lError = RegQueryValueExW(hkeyPreload, szPreloadNumber, NULL, NULL, + (LPBYTE)szPreloadKey, &cbData); + szPreloadKey[_countof(szPreloadKey) - 1] = 0; + + if (lError != ERROR_SUCCESS || lstrcmpiW(szImeKey, szPreloadKey) == 0) + break; /* Found an empty room or the same key */ + } + + if (iPreload >= MAX_PRELOAD) /* Not found */ + { + RegCloseKey(hkeyPreload); + return FALSE; + } +#undef MAX_PRELOAD + + /* Write the IME key to the preload number */ + cbData = (wcslen(szImeKey) + 1) * sizeof(WCHAR); + lError = RegSetValueExW(hkeyPreload, szPreloadNumber, 0, REG_SZ, (LPBYTE)szImeKey, cbData); + RegCloseKey(hkeyPreload); + return lError == ERROR_SUCCESS; + +Failure: + RegCloseKey(hkeyIME); + RegDeleteKeyW(hkeyLayouts, szImeKey); + RegCloseKey(hkeyLayouts); + return FALSE; +} + +typedef INT (WINAPI *FN_LZOpenFileW)(LPWSTR, LPOFSTRUCT, WORD); +typedef LONG (WINAPI *FN_LZCopy)(INT, INT); +typedef VOID (WINAPI *FN_LZClose)(INT); + +BOOL APIENTRY Imm32CopyFile(LPWSTR pszOldFile, LPCWSTR pszNewFile) +{ + BOOL ret = FALSE, bLoaded = FALSE; + HMODULE hinstLZ32; + WCHAR szLZ32Path[MAX_PATH]; + CHAR szDestA[MAX_PATH]; + OFSTRUCT OFStruct; + FN_LZOpenFileW fnLZOpenFileW; + FN_LZCopy fnLZCopy; + FN_LZClose fnLZClose; + HFILE hfDest, hfSrc; + + /* Load LZ32.dll for copying/decompressing file */ + Imm32GetSystemLibraryPath(szLZ32Path, _countof(szLZ32Path), L"LZ32"); + hinstLZ32 = GetModuleHandleW(szLZ32Path); + if (!hinstLZ32) + { + hinstLZ32 = LoadLibraryW(szLZ32Path); + if (!hinstLZ32) + return FALSE; + bLoaded = TRUE; + } + +#define GET_FN(name) do { \ + fn##name = (FN_##name)GetProcAddress(hinstLZ32, #name); \ + if (!fn##name) goto Quit; \ +} while (0) + GET_FN(LZOpenFileW); + GET_FN(LZCopy); + GET_FN(LZClose); +#undef GET_FN + + if (!WideCharToMultiByte(CP_ACP, 0, pszNewFile, -1, szDestA, _countof(szDestA), NULL, NULL)) + goto Quit; + szDestA[_countof(szDestA) - 1] = 0; + + hfSrc = fnLZOpenFileW(pszOldFile, &OFStruct, OF_READ); + if (hfSrc < 0) + goto Quit; + + hfDest = OpenFile(szDestA, &OFStruct, OF_CREATE); + if (hfDest != HFILE_ERROR) + { + ret = (fnLZCopy(hfSrc, hfDest) >= 0); + _lclose(hfDest); + } + + fnLZClose(hfSrc); + +Quit: + if (bLoaded) + FreeLibrary(hinstLZ32); + return ret; +} + /*********************************************************************** * CtfImmIsTextFrameServiceDisabled(IMM32.@) */ diff --git a/win32ss/include/ntuser.h b/win32ss/include/ntuser.h index eb5fb285a79..38076513db2 100644 --- a/win32ss/include/ntuser.h +++ b/win32ss/include/ntuser.h @@ -1183,7 +1183,7 @@ typedef struct tagIMEINFOEX }; } IMEINFOEX, *PIMEINFOEX; -typedef enum IMEINFOEXCLASS +typedef enum IMEINFOEXCLASS /* unconfirmed: buggy */ { ImeInfoExKeyboardLayout, ImeInfoExImeWindow,

3 years, 2 months

[reactos] 01/01: [SDK][MKISOFS] xconfig.h: Don't define VA_LIST_IS_ARRAY on Linux/ARM(64) (#4012)

by Konrad Dybcio

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d26409cc34bacf2e544c7… commit d26409cc34bacf2e544c70635a0330a02bb0e15e Author: Konrad Dybcio <32096130+konradybcio(a)users.noreply.github.com> AuthorDate: Wed Oct 20 21:12:23 2021 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Oct 20 22:12:23 2021 +0300 [SDK][MKISOFS] xconfig.h: Don't define VA_LIST_IS_ARRAY on Linux/ARM(64) (#4012) For some bizarre reason ARM toolchains have some peculiar issues with various va_arg macros, as this is not the first time one of these is problematic (though I don't remember the previous one, it was a long, long time ago :tm:).. They always seem to expect va_list as an argument though, so let's make them happy and by extension make ros-tools compile on Linux/ARM(64) compile again! --- sdk/tools/mkisofs/reactos/xconfig.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sdk/tools/mkisofs/reactos/xconfig.h b/sdk/tools/mkisofs/reactos/xconfig.h index 8cb5b739500..19b340402f2 100644 --- a/sdk/tools/mkisofs/reactos/xconfig.h +++ b/sdk/tools/mkisofs/reactos/xconfig.h @@ -180,8 +180,10 @@ #define HAVE_LONGLONG 1 #ifndef _WIN32 +#if !defined(__arm__) && !defined(__aarch64__) #define VA_LIST_IS_ARRAY 1 #endif +#endif #ifdef _WIN32 #define uid_t int

3 years, 2 months

[reactos] 01/01: [IMM32_APITEST] Fix himc testcase crash (#4036)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=396b49436ccbdb3675306… commit 396b49436ccbdb367530603ddc2683112ef4f62b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Oct 20 20:23:38 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Oct 20 20:23:38 2021 +0900 [IMM32_APITEST] Fix himc testcase crash (#4036) - Add NULL checks for pIC. CORE-11700 --- modules/rostests/apitests/imm32/himc.c | 46 +++++++++++++++++----------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/modules/rostests/apitests/imm32/himc.c b/modules/rostests/apitests/imm32/himc.c index 6383c8865b2..05ba76448ca 100644 --- a/modules/rostests/apitests/imm32/himc.c +++ b/modules/rostests/apitests/imm32/himc.c @@ -43,29 +43,29 @@ START_TEST(himc) ok(hIMC != NULL, "\n"); pIC = ImmLockIMC(hIMC); ok(pIC != NULL, "\n"); - ok(pIC->hWnd == NULL, "\n"); - ok(!pIC->fOpen, "\n"); - ok(ImmGetIMCCSize(pIC->hCompStr) != 0, "\n"); - ok(ImmGetIMCCSize(pIC->hCandInfo) != 0, "\n"); - ok(ImmGetIMCCSize(pIC->hGuideLine) != 0, "\n"); - ok(ImmGetIMCCSize(pIC->hPrivate) != 0, "\n"); - ok(ImmGetIMCCSize(pIC->hMsgBuf) != 0, "\n"); + ok(pIC && pIC->hWnd == NULL, "\n"); + ok(pIC && !pIC->fOpen, "\n"); + ok(pIC && ImmGetIMCCSize(pIC->hCompStr) != 0, "\n"); + ok(pIC && ImmGetIMCCSize(pIC->hCandInfo) != 0, "\n"); + ok(pIC && ImmGetIMCCSize(pIC->hGuideLine) != 0, "\n"); + ok(pIC && ImmGetIMCCSize(pIC->hPrivate) != 0, "\n"); + ok(pIC && ImmGetIMCCSize(pIC->hMsgBuf) != 0, "\n"); ImmUnlockIMC(hNewIMC); SetFocus(hwndEdit); pIC = ImmLockIMC(hIMC); ok(pIC != NULL, "\n"); - ok(pIC->hWnd == hwndEdit, "\n"); - ok(!pIC->fOpen, "\n"); + ok(pIC && pIC->hWnd == hwndEdit, "\n"); + ok(pIC && !pIC->fOpen, "\n"); ImmUnlockIMC(hNewIMC); SetFocus(NULL); pIC = ImmLockIMC(hIMC); ok(pIC != NULL, "\n"); - ok(pIC->hWnd == hwndEdit, "\n"); + ok(pIC && pIC->hWnd == hwndEdit, "\n"); ImmUnlockIMC(hNewIMC); ok(ImmSetOpenStatus(hIMC, TRUE), "\n"); pIC = ImmLockIMC(hIMC); ok(pIC != NULL, "\n"); - ok(pIC->fOpen, "\n"); + ok(pIC && pIC->fOpen, "\n"); ImmUnlockIMC(hNewIMC); ok(ImmReleaseContext(hwndEdit, hIMC), "\n"); @@ -73,12 +73,12 @@ START_TEST(himc) ok(hIMC != NULL, "\n"); pIC = ImmLockIMC(hIMC); ok(pIC != NULL, "\n"); - ok(pIC->hWnd == hwndEdit, "\n"); - ok(ImmGetIMCCSize(pIC->hCompStr) != 0, "\n"); - ok(ImmGetIMCCSize(pIC->hCandInfo) != 0, "\n"); - ok(ImmGetIMCCSize(pIC->hGuideLine) != 0, "\n"); - ok(ImmGetIMCCSize(pIC->hPrivate) != 0, "\n"); - ok(ImmGetIMCCSize(pIC->hMsgBuf) != 0, "\n"); + ok(pIC && pIC->hWnd == hwndEdit, "\n"); + ok(pIC && ImmGetIMCCSize(pIC->hCompStr) != 0, "\n"); + ok(pIC && ImmGetIMCCSize(pIC->hCandInfo) != 0, "\n"); + ok(pIC && ImmGetIMCCSize(pIC->hGuideLine) != 0, "\n"); + ok(pIC && ImmGetIMCCSize(pIC->hPrivate) != 0, "\n"); + ok(pIC && ImmGetIMCCSize(pIC->hMsgBuf) != 0, "\n"); ImmUnlockIMC(hNewIMC); ok(ImmReleaseContext(hwndEdit, hIMC), "\n"); @@ -97,12 +97,12 @@ START_TEST(himc) ok(hIMC != hOldIMC, "\n"); pIC = ImmLockIMC(hNewIMC); ok(pIC != NULL, "\n"); - ok(pIC->hWnd == NULL, "\n"); - ok(ImmGetIMCCSize(pIC->hCompStr) != 0, "\n"); - ok(ImmGetIMCCSize(pIC->hCandInfo) != 0, "\n"); - ok(ImmGetIMCCSize(pIC->hGuideLine) != 0, "\n"); - ok(ImmGetIMCCSize(pIC->hPrivate) != 0, "\n"); - ok(ImmGetIMCCSize(pIC->hMsgBuf) != 0, "\n"); + ok(pIC && pIC->hWnd == NULL, "\n"); + ok(pIC && ImmGetIMCCSize(pIC->hCompStr) != 0, "\n"); + ok(pIC && ImmGetIMCCSize(pIC->hCandInfo) != 0, "\n"); + ok(pIC && ImmGetIMCCSize(pIC->hGuideLine) != 0, "\n"); + ok(pIC && ImmGetIMCCSize(pIC->hPrivate) != 0, "\n"); + ok(pIC && ImmGetIMCCSize(pIC->hMsgBuf) != 0, "\n"); ImmUnlockIMC(hNewIMC); ok(ImmReleaseContext(hwndEdit, hIMC), "\n"); ok(ImmDestroyContext(hNewIMC), "\n");

3 years, 2 months

[reactos] 01/01: [User32-winetest] Remove ReactOS to do. N0 longer needed.

by James Tabor

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=be8e5fc7b31d64732a0ff… commit be8e5fc7b31d64732a0ffd37a27d580c68c76ac5 Author: James Tabor <james.tabor(a)reactos.org> AuthorDate: Tue Oct 19 18:49:52 2021 -0500 Commit: James Tabor <james.tabor(a)reactos.org> CommitDate: Tue Oct 19 18:49:52 2021 -0500 [User32-winetest] Remove ReactOS to do. N0 longer needed. --- modules/rostests/winetests/user32/win.c | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/rostests/winetests/user32/win.c b/modules/rostests/winetests/user32/win.c index 4e98d2a7abf..b5ec3889005 100644 --- a/modules/rostests/winetests/user32/win.c +++ b/modules/rostests/winetests/user32/win.c @@ -986,7 +986,6 @@ if (0) } ok(info->atomWindowType == GetClassLongA(hwnd, GCW_ATOM), "wrong atomWindowType for %p in hook %s\n", hwnd, hook); - todo_ros ok(info->wCreatorVersion == 0x0400 /* NT4, Win2000, XP, Win2003 */ || info->wCreatorVersion == 0x0500 /* Vista */, "wrong wCreatorVersion %04x for %p in hook %s\n", info->wCreatorVersion, hwnd, hook);

3 years, 2 months

[reactos] 01/01: [User32] Fix incorrect check.

by James Tabor

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=83f86b8fdb5619bd4f790… commit 83f86b8fdb5619bd4f790987c0a93a527d5c3e62 Author: James Tabor <james.tabor(a)reactos.org> AuthorDate: Tue Oct 19 15:29:51 2021 -0500 Commit: James Tabor <james.tabor(a)reactos.org> CommitDate: Tue Oct 19 15:29:51 2021 -0500 [User32] Fix incorrect check. Use Lo Word instead of Intersource check. Fix wine user32 tests. --- win32ss/user/user32/windows/window.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win32ss/user/user32/windows/window.c b/win32ss/user/user32/windows/window.c index 60c9feb47f5..d414259515c 100644 --- a/win32ss/user/user32/windows/window.c +++ b/win32ss/user/user32/windows/window.c @@ -156,7 +156,7 @@ RtlGetExpWinVer( HMODULE hModule ) DWORD dwMinorVersion = 10; PIMAGE_NT_HEADERS pinth; - if ( hModule && !((ULONG_PTR)hModule >> 16)) + if ( hModule && !LOWORD( ((ULONG_PTR)hModule) )) { pinth = RtlImageNtHeader( hModule ); if ( pinth )

3 years, 2 months

[reactos] 01/01: [EXPLORER] Send WM_POPUPSYSTEMMENU asynchronously (#4047)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=037c744eb15e464c0d92e… commit 037c744eb15e464c0d92e352e00260100c785979 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Oct 19 07:17:01 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Oct 19 07:17:01 2021 +0900 [EXPLORER] Send WM_POPUPSYSTEMMENU asynchronously (#4047) - Delete useless SendMessageTimeout:WM_NULL call. - Add useful SendMessageCallbackW:WM_POPUPSYSTEMMENU call. - In the callback function of SendMessageCallbackW, do PostMessageW:WM_NULL to properly handle the popup menu. CORE-16353 --- base/shell/explorer/taskswnd.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/base/shell/explorer/taskswnd.cpp b/base/shell/explorer/taskswnd.cpp index 5d90d36ebc3..d6e6d2a97ac 100644 --- a/base/shell/explorer/taskswnd.cpp +++ b/base/shell/explorer/taskswnd.cpp @@ -1630,6 +1630,11 @@ public: return FALSE; } + static VOID CALLBACK + SendAsyncProc(HWND hwnd, UINT uMsg, DWORD_PTR dwData, LRESULT lResult) + { + ::PostMessageW(hwnd, WM_NULL, 0, 0); + } VOID HandleTaskItemRightClick(IN OUT PTASK_ITEM TaskItem) { @@ -1640,14 +1645,11 @@ public: ActivateTask(TaskItem->hWnd); - /* Wait up to 2 seconds for the window to process the foreground notification. */ - DWORD_PTR resultDummy; - if (!SendMessageTimeout(TaskItem->hWnd, WM_NULL, 0, 0, 0, 2000, &resultDummy)) - ERR("HandleTaskItemRightClick detected the window was unresponsive for 2 seconds, or was destroyed\n"); if (GetForegroundWindow() != TaskItem->hWnd) ERR("HandleTaskItemRightClick detected the window did not become foreground\n"); - ::SendMessageW(TaskItem->hWnd, WM_POPUPSYSTEMMENU, 0, MAKELPARAM(pt.x, pt.y)); + ::SendMessageCallbackW(TaskItem->hWnd, WM_POPUPSYSTEMMENU, 0, MAKELPARAM(pt.x, pt.y), + SendAsyncProc, (ULONG_PTR)TaskItem); } VOID HandleTaskGroupRightClick(IN OUT PTASK_GROUP TaskGroup)

3 years, 2 months

[reactos] 01/01: [NTOS:PNP] Fix crash when removing a device without resources

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=46fbc6f43231314551c6b… commit 46fbc6f43231314551c6bc5d680386a5886b318a Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sun Oct 17 23:41:27 2021 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Mon Oct 18 22:23:49 2021 +0200 [NTOS:PNP] Fix crash when removing a device without resources This fixes commit 89fd2b86e4e1013269961a30c3f1135342df08c9 --- ntoskrnl/io/pnpmgr/devaction.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/ntoskrnl/io/pnpmgr/devaction.c b/ntoskrnl/io/pnpmgr/devaction.c index e9caa760bb5..2126d31e059 100644 --- a/ntoskrnl/io/pnpmgr/devaction.c +++ b/ntoskrnl/io/pnpmgr/devaction.c @@ -1652,9 +1652,13 @@ IopSendRemoveDevice(IN PDEVICE_OBJECT DeviceObject) PiIrpSendRemoveCheckVpb(DeviceObject, IRP_MN_REMOVE_DEVICE); /* Start of HACK: update resources stored in registry, so IopDetectResourceConflict works */ - DeviceNode->ResourceList->Count = 0; - DeviceNode->ResourceListTranslated->Count = 0; - IopUpdateResourceMapForPnPDevice(DeviceNode); + if (DeviceNode->ResourceList) + { + ASSERT(DeviceNode->ResourceListTranslated); + DeviceNode->ResourceList->Count = 0; + DeviceNode->ResourceListTranslated->Count = 0; + IopUpdateResourceMapForPnPDevice(DeviceNode); + } /* End of HACK */ PiSetDevNodeState(DeviceNode, DeviceNodeRemoved);

3 years, 2 months

[reactos] 01/01: [IMM32][IMM32_WINETEST] Re-implement ImmSetCompositionStringA/W (#4040)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=aa8fc872a098d261e13e4… commit aa8fc872a098d261e13e48aeb32fb85808e36d1d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Oct 17 19:32:48 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Oct 17 19:32:48 2021 +0900 [IMM32][IMM32_WINETEST] Re-implement ImmSetCompositionStringA/W (#4040) - Modify ImmSetCompositionStringA and ImmSetCompositionStringW prototypes (removing const of two arguments). - Add Imm32OpenICAndCS helper function. - Implement Imm32SetCompositionStringAW function. - Modify imm32_winetest (due to removal of const). CORE-11700 --- dll/win32/imm32/compstr.c | 372 ++++++++++++++++++++++++++++++- modules/rostests/winetests/imm32/imm32.c | 8 + sdk/include/psdk/imm.h | 8 +- 3 files changed, 372 insertions(+), 16 deletions(-) diff --git a/dll/win32/imm32/compstr.c b/dll/win32/imm32/compstr.c index df0726c2fa2..7fa9a0e4111 100644 --- a/dll/win32/imm32/compstr.c +++ b/dll/win32/imm32/compstr.c @@ -14,12 +14,37 @@ WINE_DEFAULT_DEBUG_CHANNEL(imm); +BOOL APIENTRY +Imm32OpenICAndCS(HIMC hIMC, LPINPUTCONTEXT *ppIC, LPCOMPOSITIONSTRING *ppCS) +{ + LPINPUTCONTEXT pIC; + LPCOMPOSITIONSTRING pCS; + + *ppIC = NULL; + *ppCS = NULL; + + pIC = ImmLockIMC(hIMC); + if (!pIC) + return FALSE; + + pCS = ImmLockIMCC(pIC->hCompStr); + if (!pCS) + { + ImmUnlockIMC(hIMC); + return FALSE; + } + + *ppIC = pIC; + *ppCS = pCS; + return TRUE; +} + static inline LONG APIENTRY Imm32CompStrAnsiToWide(LPCSTR psz, DWORD cb, LPWSTR lpBuf, DWORD dwBufLen, UINT uCodePage) { DWORD ret = MultiByteToWideChar(uCodePage, MB_PRECOMPOSED, psz, cb / sizeof(CHAR), lpBuf, dwBufLen / sizeof(WCHAR)); - if ((ret + 1) * sizeof(WCHAR) <= dwBufLen) + if (lpBuf && (ret + 1) * sizeof(WCHAR) <= dwBufLen) lpBuf[ret] = 0; return ret * sizeof(WCHAR); } @@ -29,7 +54,7 @@ Imm32CompStrWideToAnsi(LPCWSTR psz, DWORD cb, LPSTR lpBuf, DWORD dwBufLen, UINT { DWORD ret = WideCharToMultiByte(uCodePage, 0, psz, cb / sizeof(WCHAR), lpBuf, dwBufLen / sizeof(CHAR), NULL, NULL); - if ((ret + 1) * sizeof(CHAR) <= dwBufLen) + if (lpBuf && (ret + 1) * sizeof(CHAR) <= dwBufLen) lpBuf[ret] = 0; return ret * sizeof(CHAR); } @@ -44,6 +69,7 @@ Imm32CompAttrWideToAnsi(const BYTE *src, INT src_len, LPCWSTR text, if (!src_len) return 0; + str_len /= sizeof(WCHAR); rc = WideCharToMultiByte(uCodePage, 0, text, str_len, NULL, 0, NULL, NULL); if (dst_len) @@ -66,7 +92,7 @@ end: rc = j; } - return rc; + return rc * sizeof(BYTE); } static INT APIENTRY @@ -79,6 +105,7 @@ Imm32CompAttrAnsiToWide(const BYTE *src, INT src_len, LPCSTR text, if (!src_len) return 0; + str_len /= sizeof(CHAR); rc = MultiByteToWideChar(uCodePage, MB_PRECOMPOSED, text, str_len, NULL, 0); if (dst_len) @@ -100,7 +127,7 @@ Imm32CompAttrAnsiToWide(const BYTE *src, INT src_len, LPCSTR text, rc = j; } - return rc; + return rc * sizeof(BYTE); } static INT APIENTRY @@ -487,11 +514,332 @@ Imm32GetCompStrW(HIMC hIMC, const COMPOSITIONSTRING *pCS, DWORD dwIndex, } BOOL APIENTRY -Imm32SetCompositionStringAW(HIMC hIMC, DWORD dwIndex, LPCVOID lpComp, DWORD dwCompLen, - LPCVOID lpRead, DWORD dwReadLen, BOOL bAnsi) +Imm32SetCompositionStringAW(HIMC hIMC, DWORD dwIndex, LPVOID pComp, DWORD dwCompLen, + LPVOID pRead, DWORD dwReadLen, BOOL bAnsiAPI) { - FIXME("TODO:\n"); - return FALSE; + BOOL ret = FALSE, bAnsiClient; + LPVOID pCompNew = NULL, pReadNew = NULL; + DWORD dwThreadId, cbCompNew = 0, cbReadNew = 0; + LPINPUTCONTEXT pIC; + LPCOMPOSITIONSTRING pCS; + HKL hKL; + PIMEDPI pImeDpi; + UINT uCodePage; + LPRECONVERTSTRING pRS; + + dwThreadId = NtUserQueryInputContext(hIMC, 1); + if (dwThreadId != GetCurrentThreadId()) + return FALSE; + + hKL = GetKeyboardLayout(dwThreadId); + pImeDpi = ImmLockImeDpi(hKL); + if (!pImeDpi) + return FALSE; + + uCodePage = pImeDpi->uCodePage; + bAnsiClient = !ImeDpi_IsUnicode(pImeDpi); + + switch (dwIndex) + { + case SCS_SETSTR: case SCS_CHANGEATTR: case SCS_CHANGECLAUSE: + break; + + case SCS_SETRECONVERTSTRING: case SCS_QUERYRECONVERTSTRING: + if (pImeDpi->ImeInfo.fdwSCSCaps & SCS_CAP_SETRECONVERTSTRING) + break; + /* FALL THROUGH */ + default: + ImmUnlockImeDpi(pImeDpi); + return FALSE; + } + + if (bAnsiAPI == bAnsiClient || (!pComp && !pRead)) + { + ret = pImeDpi->ImeSetCompositionString(hIMC, dwIndex, pComp, dwCompLen, + pRead, dwReadLen); + ImmUnlockImeDpi(pImeDpi); + return ret; + } + + if (!Imm32OpenICAndCS(hIMC, &pIC, &pCS)) + { + ImmUnlockImeDpi(pImeDpi); + return FALSE; + } + + /* + * This code is really too complicated. But I cannot simplify. + * It converts like (pComp, dwCompLen) --> (pCompNew, cbCompNew) and + * (pRead, dwReadLen) --> (pReadNew, cbReadNew). + * (1) Check bAnsiClient, (2) Get the size, (3) Allocate a buffer for conversion, + * (4) Store converted data into the buffer. + */ + switch (dwIndex) + { + case SCS_SETSTR: + if (pComp) + { + if (bAnsiClient) + { + cbCompNew = Imm32CompStrWideToAnsi(pComp, dwCompLen, NULL, 0, uCodePage); + pCompNew = Imm32HeapAlloc(0, cbCompNew); + if (!pCompNew) + goto Quit; + + Imm32CompStrWideToAnsi(pComp, dwCompLen, pCompNew, cbCompNew, uCodePage); + } + else + { + cbCompNew = Imm32CompStrAnsiToWide(pComp, dwCompLen, NULL, 0, uCodePage); + pCompNew = Imm32HeapAlloc(0, cbCompNew); + if (!pCompNew) + goto Quit; + + Imm32CompStrAnsiToWide(pComp, dwCompLen, pCompNew, cbCompNew, uCodePage); + } + } + + if (pRead) + { + if (bAnsiClient) + { + cbReadNew = Imm32CompStrWideToAnsi(pRead, dwReadLen, NULL, 0, uCodePage); + pReadNew = Imm32HeapAlloc(0, cbReadNew); + if (!pReadNew) + goto Quit; + + Imm32CompStrWideToAnsi(pRead, dwReadLen, pReadNew, cbReadNew, uCodePage); + } + else + { + cbReadNew = Imm32CompStrAnsiToWide(pRead, dwReadLen, NULL, 0, uCodePage); + pReadNew = Imm32HeapAlloc(0, cbReadNew); + if (!pReadNew) + goto Quit; + + Imm32CompStrAnsiToWide(pRead, dwReadLen, pReadNew, cbReadNew, uCodePage); + } + } + break; + + case SCS_CHANGEATTR: + if (pComp) + { + if (bAnsiClient) + { + cbCompNew = Imm32CompAttrWideToAnsi(pComp, dwCompLen, + CS_StrW(pCS, CompStr), + CS_SizeW(pCS, CompStr), + NULL, 0, uCodePage); + pCompNew = Imm32HeapAlloc(0, cbCompNew); + if (!pCompNew) + goto Quit; + + Imm32CompAttrWideToAnsi(pComp, dwCompLen, + CS_StrW(pCS, CompStr), CS_SizeW(pCS, CompStr), + pCompNew, cbCompNew, uCodePage); + } + else + { + cbCompNew = Imm32CompAttrAnsiToWide(pComp, dwCompLen, + CS_StrA(pCS, CompStr), + CS_SizeA(pCS, CompStr), + NULL, 0, uCodePage); + pCompNew = Imm32HeapAlloc(0, cbCompNew); + if (!pCompNew) + goto Quit; + + Imm32CompAttrAnsiToWide(pComp, dwCompLen, + CS_StrA(pCS, CompStr), CS_SizeA(pCS, CompStr), + pCompNew, cbCompNew, uCodePage); + } + } + + if (pRead) + { + if (bAnsiClient) + { + cbReadNew = Imm32CompAttrWideToAnsi(pRead, dwReadLen, + CS_StrW(pCS, CompReadStr), + CS_SizeW(pCS, CompReadStr), + NULL, 0, uCodePage); + pReadNew = Imm32HeapAlloc(0, cbReadNew); + if (!pReadNew) + goto Quit; + + Imm32CompAttrWideToAnsi(pRead, dwReadLen, + CS_StrW(pCS, CompReadStr), CS_SizeW(pCS, CompReadStr), + pReadNew, cbReadNew, uCodePage); + } + else + { + cbReadNew = Imm32CompAttrAnsiToWide(pRead, dwReadLen, + CS_StrA(pCS, CompReadStr), + CS_SizeA(pCS, CompReadStr), + NULL, 0, uCodePage); + pReadNew = Imm32HeapAlloc(0, cbReadNew); + if (!pReadNew) + goto Quit; + + Imm32CompAttrAnsiToWide(pRead, dwReadLen, + CS_StrA(pCS, CompReadStr), CS_SizeA(pCS, CompReadStr), + pReadNew, cbReadNew, uCodePage); + } + } + break; + + case SCS_CHANGECLAUSE: + if (pComp) + { + if (bAnsiClient) + { + cbCompNew = Imm32CompClauseWideToAnsi(pComp, dwCompLen, CS_StrW(pCS, CompStr), + NULL, 0, uCodePage); + pCompNew = Imm32HeapAlloc(0, cbCompNew); + if (!pCompNew) + goto Quit; + + Imm32CompClauseWideToAnsi(pComp, dwCompLen, CS_StrW(pCS, CompStr), + pCompNew, cbCompNew, uCodePage); + } + else + { + cbCompNew = Imm32CompClauseAnsiToWide(pComp, dwCompLen, CS_StrA(pCS, CompStr), + NULL, 0, uCodePage); + pCompNew = Imm32HeapAlloc(0, cbCompNew); + if (!pCompNew) + goto Quit; + + Imm32CompClauseAnsiToWide(pComp, dwCompLen, CS_StrA(pCS, CompStr), + pCompNew, cbCompNew, uCodePage); + } + } + + if (pRead) + { + if (bAnsiClient) + { + cbReadNew = Imm32CompClauseWideToAnsi(pRead, dwReadLen, CS_StrW(pCS, CompReadStr), + NULL, 0, uCodePage); + pReadNew = Imm32HeapAlloc(0, cbReadNew); + if (!pReadNew) + goto Quit; + + Imm32CompClauseWideToAnsi(pRead, dwReadLen, + CS_StrW(pCS, CompReadStr), + pReadNew, cbReadNew, uCodePage); + } + else + { + cbReadNew = Imm32CompClauseAnsiToWide(pRead, dwReadLen, CS_StrA(pCS, CompReadStr), + NULL, 0, uCodePage); + pReadNew = Imm32HeapAlloc(0, cbReadNew); + if (!pReadNew) + goto Quit; + + Imm32CompClauseAnsiToWide(pRead, dwReadLen, CS_StrA(pCS, CompReadStr), + pReadNew, cbReadNew, uCodePage); + } + } + break; + + case SCS_SETRECONVERTSTRING: case SCS_QUERYRECONVERTSTRING: + { + if (pComp) + { + if (bAnsiClient) + { + cbCompNew = Imm32ReconvertAnsiFromWide(NULL, pComp, uCodePage); + pCompNew = Imm32HeapAlloc(0, cbCompNew); + if (!pCompNew) + goto Quit; + + pRS = pCompNew; + pRS->dwSize = cbCompNew; + pRS->dwVersion = 0; + Imm32ReconvertAnsiFromWide(pRS, pComp, uCodePage); + } + else + { + cbCompNew = Imm32ReconvertWideFromAnsi(NULL, pComp, uCodePage); + pCompNew = Imm32HeapAlloc(0, cbCompNew); + if (!pCompNew) + goto Quit; + + pRS = pCompNew; + pRS->dwSize = cbCompNew; + pRS->dwVersion = 0; + Imm32ReconvertWideFromAnsi(pRS, pComp, uCodePage); + } + } + + if (pRead) + { + if (bAnsiClient) + { + cbReadNew = Imm32ReconvertAnsiFromWide(NULL, pRead, uCodePage); + pReadNew = Imm32HeapAlloc(0, cbReadNew); + if (!pReadNew) + goto Quit; + + pRS = pReadNew; + pRS->dwSize = cbReadNew; + pRS->dwVersion = 0; + Imm32ReconvertAnsiFromWide(pRS, pRead, uCodePage); + } + else + { + cbReadNew = Imm32ReconvertWideFromAnsi(NULL, pRead, uCodePage); + pReadNew = Imm32HeapAlloc(0, cbReadNew); + if (!pReadNew) + goto Quit; + + pRS = pReadNew; + pRS->dwSize = cbReadNew; + pRS->dwVersion = 0; + Imm32ReconvertWideFromAnsi(pRS, pRead, uCodePage); + } + } + break; + } + } + + ImmUnlockIMCC(pIC->hCompStr); + pCS = NULL; + ImmUnlockIMC(hIMC); + pIC = NULL; + + ret = pImeDpi->ImeSetCompositionString(hIMC, dwIndex, pCompNew, cbCompNew, + pReadNew, cbReadNew); + + if (dwIndex == SCS_QUERYRECONVERTSTRING) + { + if (pComp) + { + if (bAnsiClient) + ret = Imm32ReconvertWideFromAnsi(pComp, pCompNew, uCodePage); + else + ret = Imm32ReconvertAnsiFromWide(pComp, pCompNew, uCodePage); + } + + if (pRead) + { + if (bAnsiClient) + ret = Imm32ReconvertWideFromAnsi(pRead, pReadNew, uCodePage); + else + ret = Imm32ReconvertAnsiFromWide(pRead, pReadNew, uCodePage); + } + } + +Quit: + if (pCS) + ImmUnlockIMCC(pIC->hCompStr); + if (pIC) + ImmUnlockIMC(hIMC); + Imm32HeapFree(pCompNew); + Imm32HeapFree(pReadNew); + ImmUnlockImeDpi(pImeDpi); + return ret; } /*********************************************************************** @@ -582,8 +930,8 @@ LONG WINAPI ImmGetCompositionStringW(HIMC hIMC, DWORD dwIndex, LPVOID lpBuf, DWO * ImmSetCompositionStringA (IMM32.@) */ BOOL WINAPI -ImmSetCompositionStringA(HIMC hIMC, DWORD dwIndex, LPCVOID lpComp, DWORD dwCompLen, - LPCVOID lpRead, DWORD dwReadLen) +ImmSetCompositionStringA(HIMC hIMC, DWORD dwIndex, LPVOID lpComp, DWORD dwCompLen, + LPVOID lpRead, DWORD dwReadLen) { TRACE("(%p, %lu, %p, %lu, %p, %lu)\n", hIMC, dwIndex, lpComp, dwCompLen, lpRead, dwReadLen); @@ -595,8 +943,8 @@ ImmSetCompositionStringA(HIMC hIMC, DWORD dwIndex, LPCVOID lpComp, DWORD dwCompL * ImmSetCompositionStringW (IMM32.@) */ BOOL WINAPI -ImmSetCompositionStringW(HIMC hIMC, DWORD dwIndex, LPCVOID lpComp, DWORD dwCompLen, - LPCVOID lpRead, DWORD dwReadLen) +ImmSetCompositionStringW(HIMC hIMC, DWORD dwIndex, LPVOID lpComp, DWORD dwCompLen, + LPVOID lpRead, DWORD dwReadLen) { TRACE("(%p, %lu, %p, %lu, %p, %lu)\n", hIMC, dwIndex, lpComp, dwCompLen, lpRead, dwReadLen); diff --git a/modules/rostests/winetests/imm32/imm32.c b/modules/rostests/winetests/imm32/imm32.c index fef5b0dbb0d..407dfe1f6f7 100644 --- a/modules/rostests/winetests/imm32/imm32.c +++ b/modules/rostests/winetests/imm32/imm32.c @@ -293,7 +293,11 @@ static void cleanup(void) { } static void test_ImmNotifyIME(void) { +#ifdef __REACTOS__ + static char string[] = "wine"; +#else static const char string[] = "wine"; +#endif char resstr[16] = ""; HIMC imc; BOOL ret; @@ -422,7 +426,11 @@ static LRESULT WINAPI test_ime_wnd_proc(HWND hWnd, UINT msg, WPARAM wParam, LPAR static void test_ImmGetCompositionString(void) { HIMC imc; +#ifdef __REACTOS__ + static WCHAR string[] = {'w','i','n','e',0x65e5,0x672c,0x8a9e}; +#else static const WCHAR string[] = {'w','i','n','e',0x65e5,0x672c,0x8a9e}; +#endif char cstring[20]; WCHAR wstring[20]; LONG len; diff --git a/sdk/include/psdk/imm.h b/sdk/include/psdk/imm.h index fb7032181a7..ebd3bb4cb47 100644 --- a/sdk/include/psdk/imm.h +++ b/sdk/include/psdk/imm.h @@ -891,9 +891,9 @@ WINAPI ImmSetCompositionStringA( _In_ HIMC, _In_ DWORD dwIndex, - _In_reads_bytes_opt_(dwCompLen) LPCVOID lpComp, + _Inout_updates_bytes_opt_(dwCompLen) LPVOID lpComp, _In_ DWORD dwCompLen, - _In_reads_bytes_opt_(dwReadLen) LPCVOID lpRead, + _Inout_updates_bytes_opt_(dwReadLen) LPVOID lpRead, _In_ DWORD dwReadLen); BOOL @@ -901,9 +901,9 @@ WINAPI ImmSetCompositionStringW( _In_ HIMC, _In_ DWORD dwIndex, - _In_reads_bytes_opt_(dwCompLen) LPCVOID lpComp, + _Inout_updates_bytes_opt_(dwCompLen) LPVOID lpComp, _In_ DWORD dwCompLen, - _In_reads_bytes_opt_(dwReadLen) LPCVOID lpRead, + _Inout_updates_bytes_opt_(dwReadLen) LPVOID lpRead, _In_ DWORD dwReadLen); #define ImmSetCompositionString WINELIB_NAME_AW(ImmSetCompositionString)

3 years, 2 months

← Newer
1
2
3
4
5
6
7
8
...
12
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2021