ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

shlwapi: Small cleanups. 

- forward MLGetUILanguage to kernel32
- correct type of parameter to MLLoadLibrary
This commit is contained in:
Juan Lang 2006-06-20 08:23:12 -07:00 committed by Alexandre Julliard
parent 35d24315e7
commit 8076d1cf12
2 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
dlls/shlwapi/ordinal.c
View File

@ -3393,33 +3393,21 @@ HICON WINAPI ExtractIconWrapW(HINSTANCE hInstance, LPCWSTR lpszExeFileName,
return pExtractIconW(hInstance, lpszExeFileName, nIconIndex);
}
/*************************************************************************
* @ [SHLWAPI.376]
*/
LANGID WINAPI MLGetUILanguage(void)
{
FIXME("() stub\n");
/* FIXME: This should be a forward in the .spec file to the win2k function
* kernel32.GetUserDefaultUILanguage, however that function isn't there yet.
*/
return GetUserDefaultLangID();
}
/*************************************************************************
* @ [SHLWAPI.377]
*
* Load a library from the directory of a particular process.
*
* PARAMS
* new_mod [I] Library name
* inst_hwnd [I] Module whose directory is to be used
* dwFlags [I] Flags controlling the load
* new_mod [I] Library name
* inst_hwnd [I] Module whose directory is to be used
* bCrossCodePage [I] Should be FALSE (currently ignored)
*
* RETURNS
* Success: A handle to the loaded module
* Failure: A NULL handle.
*/
HMODULE WINAPI MLLoadLibraryA(LPCSTR new_mod, HMODULE inst_hwnd, DWORD dwFlags)
HMODULE WINAPI MLLoadLibraryA(LPCSTR new_mod, HMODULE inst_hwnd, BOOL bCrossCodePage)
{
/* FIXME: Native appears to do DPA_Create and a DPA_InsertPtr for
* each call here.
@ -3443,7 +3431,7 @@ HMODULE WINAPI MLLoadLibraryA(LPCSTR new_mod, HMODULE inst_hwnd, DWORD dwFlags)
LPSTR ptr;
DWORD len;
FIXME("(%s,%p,0x%08lx) semi-stub!\n", debugstr_a(new_mod), inst_hwnd, dwFlags);
FIXME("(%s,%p,%d) semi-stub!\n", debugstr_a(new_mod), inst_hwnd, bCrossCodePage);
len = GetModuleFileNameA(inst_hwnd, mod_path, sizeof(mod_path));
if (!len || len >= sizeof(mod_path)) return NULL;
@ -3461,13 +3449,13 @@ HMODULE WINAPI MLLoadLibraryA(LPCSTR new_mod, HMODULE inst_hwnd, DWORD dwFlags)
*
* Unicode version of MLLoadLibraryA.
*/
HMODULE WINAPI MLLoadLibraryW(LPCWSTR new_mod, HMODULE inst_hwnd, DWORD dwFlags)
HMODULE WINAPI MLLoadLibraryW(LPCWSTR new_mod, HMODULE inst_hwnd, BOOL bCrossCodePage)
{
WCHAR mod_path[2*MAX_PATH];
LPWSTR ptr;
DWORD len;
FIXME("(%s,%p,0x%08lx) semi-stub!\n", debugstr_w(new_mod), inst_hwnd, dwFlags);
FIXME("(%s,%p,%d) semi-stub!\n", debugstr_w(new_mod), inst_hwnd, bCrossCodePage);
len = GetModuleFileNameW(inst_hwnd, mod_path, sizeof(mod_path) / sizeof(WCHAR));
if (!len || len >= sizeof(mod_path) / sizeof(WCHAR)) return NULL;

2
dlls/shlwapi/shlwapi.spec
View File

@ -373,7 +373,7 @@
373 stdcall -noname DdeQueryStringWrapW(long ptr wstr long long) user32.DdeQueryStringW
374 stub -noname SHCheckDiskForMediaA
375 stub -noname SHCheckDiskForMediaW
376 stdcall -noname MLGetUILanguage() # kernel32.GetUserDefaultUILanguage
376 stdcall -noname MLGetUILanguage() kernel32.GetUserDefaultUILanguage
377 stdcall MLLoadLibraryA(str long long)
378 stdcall MLLoadLibraryW(wstr long long)
379 stub -noname Shell_GetCachedImageIndexWrapW