Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 02:32:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

[INPUT] Remove fake SHLoadRegUIStringW hack (#5258)

Browse source 
Because shlwapi!SHLoadRegUIStringW function is already implemented, so we don't need the hack any more. CORE-11700
This commit is contained in:
Katayama Hirofumi MZ 2023-04-29 07:27:54 +09:00 • committed by GitHub
parent c9ed65e0cc
commit 7eda556c64
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

44
dll/cpl/input/layout_list.c
View file

@ -87,51 +87,8 @@ LayoutList_Destroy(VOID)
typedef HRESULT (WINAPI *FN_SHLoadRegUIStringW)(HKEY, LPCWSTR, LPWSTR, DWORD); typedef HRESULT (WINAPI *FN_SHLoadRegUIStringW)(HKEY, LPCWSTR, LPWSTR, DWORD);
/* FIXME: Use shlwapi!SHLoadRegUIStringW instead when it is fully implemented */
HRESULT FakeSHLoadRegUIStringW(HKEY hkey, LPCWSTR value, LPWSTR buf, DWORD size) HRESULT FakeSHLoadRegUIStringW(HKEY hkey, LPCWSTR value, LPWSTR buf, DWORD size)
{ {
#if 1
PWCHAR pBuffer, pIndex;
WCHAR szDllPath[MAX_PATH];
DWORD dwSize;
HINSTANCE hDllInst;
INT iIndex, iLength;
dwSize = size * sizeof(WCHAR);
if (RegQueryValueExW(hkey, value, NULL, NULL, (LPBYTE)buf, &dwSize) != ERROR_SUCCESS)
return E_FAIL;
if (buf[0] != L'@')
return S_OK;
/* Move to the position after the character "@" */
pBuffer = buf + 1;
/* Get a pointer to the beginning ",-" */
pIndex = wcsstr(pBuffer, L",-");
if (!pIndex)
return E_FAIL;
/* Convert the number in the string after the ",-" */
iIndex = _wtoi(pIndex + 2);
*pIndex = 0; /* Cut the string */
if (ExpandEnvironmentStringsW(pBuffer, szDllPath, ARRAYSIZE(szDllPath)) == 0)
return E_FAIL;
hDllInst = LoadLibraryW(szDllPath);
if (!hDllInst)
return E_FAIL;
iLength = LoadStringW(hDllInst, iIndex, buf, size);
FreeLibrary(hDllInst);
if (iLength <= 0)
return E_FAIL;
return S_OK;
#else
HRESULT hr = E_FAIL; HRESULT hr = E_FAIL;
HINSTANCE hSHLWAPI = LoadLibraryW(L"shlwapi"); HINSTANCE hSHLWAPI = LoadLibraryW(L"shlwapi");
FN_SHLoadRegUIStringW fn; FN_SHLoadRegUIStringW fn;
@ -140,7 +97,6 @@ HRESULT FakeSHLoadRegUIStringW(HKEY hkey, LPCWSTR value, LPWSTR buf, DWORD size)
hr = fn(hkey, value, buf, size); hr = fn(hkey, value, buf, size);
FreeLibrary(hSHLWAPI); FreeLibrary(hSHLWAPI);
return hr; return hr;
#endif
} }
static BOOL static BOOL