Skip to content

W
wine-winehq
Commit 4ca01b34 authored by Nikolay Sivov's avatar Nikolay Sivov Committed by Alexandre Julliard
Browse files
Options

shell32/tests: Fix a dependency on unimplemented function call (Valgrind).

parent 219f477a
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 4 deletions
dlls/shell32/tests/progman_dde.c
View file @ 4ca01b34
...@@ -200,14 +200,22 @@ static void init_strings(void) ...@@ -200,14 +200,22 @@ static void init_strings(void)
WCHAR module[MAX_PATH]; WCHAR module[MAX_PATH];
WCHAR module_expanded[MAX_PATH]; WCHAR module_expanded[MAX_PATH];
WCHAR localized[MAX_PATH]; WCHAR localized[MAX_PATH];
HRESULT hr;
int id; int id;
MultiByteToWideChar(CP_ACP, 0, startup, -1, startupW, sizeof(startupW)/sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, startup, -1, startupW, sizeof(startupW)/sizeof(WCHAR));
pSHGetLocalizedName(startupW, module, MAX_PATH, &id); hr = pSHGetLocalizedName(startupW, module, MAX_PATH, &id);
ExpandEnvironmentStringsW(module, module_expanded, MAX_PATH); todo_wine ok(hr == S_OK, "got 0x%08x\n", hr);
LoadStringW(GetModuleHandleW(module_expanded), id, localized, MAX_PATH); /* check to be removed when SHGetLocalizedName is implemented */
if (hr == S_OK)
{
ExpandEnvironmentStringsW(module, module_expanded, MAX_PATH);
LoadStringW(GetModuleHandleW(module_expanded), id, localized, MAX_PATH);
WideCharToMultiByte(CP_ACP, 0, localized, -1, StartupTitle, sizeof(StartupTitle), NULL, NULL); WideCharToMultiByte(CP_ACP, 0, localized, -1, StartupTitle, sizeof(StartupTitle), NULL, NULL);
}
else
lstrcpyA(StartupTitle, (strrchr(startup, '\\') + 1));
} }
else else
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment