Removed the crosscalls (unicode to ascii) from GetAcceptLanguagesW.
Removed todo_wine from GetAcceptLanguagesA tests.
This commit is contained in:
Stefan Leichter
Alexandre Julliard
parent
86a0e50a1d
commit
3f7749a6dd
|
|
@ -518,38 +518,44 @@ RegisterDefaultAcceptHeaders_Exit:
|
|||
}
|
||||
|
||||
/*************************************************************************
|
||||
* @ [SHLWAPI.14]
|
||||
* @ [SHLWAPI.15]
|
||||
*
|
||||
* Get Explorers "AcceptLanguage" setting.
|
||||
*
|
||||
* PARAMS
|
||||
* langbuf [O] Destination for language string
|
||||
* buflen [I] Length of langbuf
|
||||
* [0] Success: used length of langbuf
|
||||
*
|
||||
* RETURNS
|
||||
* Success: S_OK. langbuf is set to the language string found.
|
||||
* Failure: E_FAIL, If any arguments are invalid, error occurred, or Explorer
|
||||
* does not contain the setting.
|
||||
* E_INVALIDARG, If the buffer is not big enough
|
||||
*/
|
||||
HRESULT WINAPI GetAcceptLanguagesA(
|
||||
LPSTR langbuf,
|
||||
LPDWORD buflen)
|
||||
HRESULT WINAPI GetAcceptLanguagesW( LPWSTR langbuf, LPDWORD buflen)
|
||||
{
|
||||
CHAR *mystr;
|
||||
static const WCHAR szkeyW[] = {
|
||||
'S','o','f','t','w','a','r','e','\\',
|
||||
'M','i','c','r','o','s','o','f','t','\\',
|
||||
'I','n','t','e','r','n','e','t',' ','E','x','p','l','o','r','e','r','\\',
|
||||
'I','n','t','e','r','n','a','t','i','o','n','a','l',0};
|
||||
static const WCHAR valueW[] = {
|
||||
'A','c','c','e','p','t','L','a','n','g','u','a','g','e',0};
|
||||
static const WCHAR enusW[] = {'e','n','-','u','s',0};
|
||||
DWORD mystrlen, mytype;
|
||||
HKEY mykey;
|
||||
HRESULT retval;
|
||||
LCID mylcid;
|
||||
WCHAR *mystr;
|
||||
|
||||
if (!langbuf || !buflen || !*buflen) return E_FAIL;
|
||||
if(!langbuf || !buflen || !*buflen)
|
||||
return E_FAIL;
|
||||
|
||||
mystrlen = (*buflen > 6) ? *buflen : 6;
|
||||
mystr = (CHAR*)HeapAlloc(GetProcessHeap(),
|
||||
HEAP_ZERO_MEMORY, mystrlen);
|
||||
RegOpenKeyA(HKEY_CURRENT_USER,
|
||||
"Software\\Microsoft\\Internet Explorer\\International",
|
||||
&mykey);
|
||||
if (RegQueryValueExA(mykey, "AcceptLanguage",
|
||||
0, &mytype, (PBYTE)mystr, &mystrlen)) {
|
||||
mystrlen = (*buflen > 20) ? *buflen : 20 ;
|
||||
mystr = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR) * mystrlen);
|
||||
RegOpenKeyW(HKEY_CURRENT_USER, szkeyW, &mykey);
|
||||
if(RegQueryValueExW(mykey, valueW, 0, &mytype, (PBYTE)mystr, &mystrlen)) {
|
||||
/* Did not find value */
|
||||
mylcid = GetUserDefaultLCID();
|
||||
/* somehow the mylcid translates into "en-us"
|
||||
|
|
@ -560,71 +566,51 @@ HRESULT WINAPI GetAcceptLanguagesA(
|
|||
* letter for "sublanguage", which does not come close to
|
||||
* "en-us"
|
||||
*/
|
||||
lstrcpyA(mystr, "en-us");
|
||||
mystrlen = lstrlenA(mystr);
|
||||
}
|
||||
else {
|
||||
lstrcpyW(mystr, enusW);
|
||||
mystrlen = lstrlenW(mystr);
|
||||
} else {
|
||||
/* handle returned string */
|
||||
FIXME("missing code\n");
|
||||
}
|
||||
if (mystrlen > *buflen)
|
||||
lstrcpynA(langbuf, mystr, *buflen);
|
||||
else {
|
||||
lstrcpyA(langbuf, mystr);
|
||||
*buflen = lstrlenA(langbuf);
|
||||
memcpy( langbuf, mystr, min(*buflen,strlenW(mystr)+1)*sizeof(WCHAR) );
|
||||
|
||||
if(*buflen > lstrlenW(mystr)) {
|
||||
*buflen = lstrlenW(mystr);
|
||||
retval = S_OK;
|
||||
} else {
|
||||
*buflen = 0;
|
||||
retval = E_INVALIDARG;
|
||||
SetLastError(ERROR_INSUFFICIENT_BUFFER);
|
||||
}
|
||||
RegCloseKey(mykey);
|
||||
HeapFree(GetProcessHeap(), 0, mystr);
|
||||
TRACE("language is %s\n", debugstr_a(langbuf));
|
||||
return 0;
|
||||
return retval;
|
||||
}
|
||||
|
||||
/*************************************************************************
|
||||
* @ [SHLWAPI.15]
|
||||
* @ [SHLWAPI.14]
|
||||
*
|
||||
* Unicode version of GetAcceptLanguagesA.
|
||||
* Ascii version of GetAcceptLanguagesW.
|
||||
*/
|
||||
HRESULT WINAPI GetAcceptLanguagesW(
|
||||
LPWSTR langbuf,
|
||||
LPDWORD buflen)
|
||||
HRESULT WINAPI GetAcceptLanguagesA( LPSTR langbuf, LPDWORD buflen)
|
||||
{
|
||||
CHAR *mystr;
|
||||
DWORD mystrlen, mytype;
|
||||
HKEY mykey;
|
||||
LCID mylcid;
|
||||
WCHAR *langbufW;
|
||||
DWORD buflenW, convlen;
|
||||
HRESULT retval;
|
||||
|
||||
if(!langbuf || !buflen || !*buflen) return E_FAIL;
|
||||
|
||||
mystrlen = (*buflen > 6) ? *buflen : 6;
|
||||
mystr = (CHAR*)HeapAlloc(GetProcessHeap(),
|
||||
HEAP_ZERO_MEMORY, mystrlen);
|
||||
RegOpenKeyA(HKEY_CURRENT_USER,
|
||||
"Software\\Microsoft\\Internet Explorer\\International",
|
||||
&mykey);
|
||||
if (RegQueryValueExA(mykey, "AcceptLanguage",
|
||||
0, &mytype, (PBYTE)mystr, &mystrlen)) {
|
||||
/* Did not find value */
|
||||
mylcid = GetUserDefaultLCID();
|
||||
/* somehow the mylcid translates into "en-us"
|
||||
* this is similar to "LOCALE_SABBREVLANGNAME"
|
||||
* which could be gotten via GetLocaleInfo.
|
||||
* The only problem is LOCALE_SABBREVLANGUAGE" is
|
||||
* a 3 char string (first 2 are country code and third is
|
||||
* letter for "sublanguage", which does not come close to
|
||||
* "en-us"
|
||||
*/
|
||||
lstrcpyA(mystr, "en-us");
|
||||
mystrlen = lstrlenA(mystr);
|
||||
}
|
||||
else {
|
||||
/* handle returned string */
|
||||
FIXME("missing code\n");
|
||||
}
|
||||
RegCloseKey(mykey);
|
||||
*buflen = MultiByteToWideChar(0, 0, mystr, -1, langbuf, (*buflen)-1);
|
||||
HeapFree(GetProcessHeap(), 0, mystr);
|
||||
TRACE("language is %s\n", debugstr_w(langbuf));
|
||||
return 0;
|
||||
buflenW = *buflen;
|
||||
langbufW = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR) * buflenW);
|
||||
retval = GetAcceptLanguagesW(langbufW, &buflenW);
|
||||
|
||||
/* FIXME: this is wrong, the string may not be null-terminated */
|
||||
convlen = WideCharToMultiByte(CP_ACP, 0, langbufW, -1, langbuf,
|
||||
*buflen, NULL, NULL);
|
||||
*buflen = buflenW ? convlen : 0;
|
||||
|
||||
if(langbufW) HeapFree(GetProcessHeap(), 0, langbufW);
|
||||
return retval;
|
||||
}
|
||||
|
||||
/*************************************************************************
|
||||
|
|
|
|||
|
|
@ -90,22 +90,22 @@ static void test_GetAcceptLanguagesA(void)
|
|||
buffersize = buffersize2 = 1;
|
||||
memset(buffer, 0, sizeof(buffer));
|
||||
retval = pGetAcceptLanguagesA( buffer, &buffersize);
|
||||
todo_wine ok(retval == E_INVALIDARG, "function result wrong: got %08lx; expected E_INVALIDARG\n", retval);
|
||||
todo_wine ok(buffersize == 0,
|
||||
ok(retval == E_INVALIDARG, "function result wrong: got %08lx; expected E_INVALIDARG\n", retval);
|
||||
ok(buffersize == 0,
|
||||
"buffersize wrong: got %08lx, expected 0 (2nd parameter;Win2k)\n", buffersize);
|
||||
todo_wine ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(),
|
||||
ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(),
|
||||
"last error wrong: got %08lx; expected ERROR_INSUFFICIENT_BUFFER\n", GetLastError());
|
||||
todo_wine ok(buffersize2 == strlen(buffer),
|
||||
ok(buffersize2 == strlen(buffer),
|
||||
"buffer content (length) wrong: got %08x, expected %08lx \n", strlen(buffer), buffersize2);
|
||||
|
||||
buffersize = buffersize2 = exactsize;
|
||||
memset(buffer, 0, sizeof(buffer));
|
||||
SetLastError(ERROR_SUCCESS);
|
||||
retval = pGetAcceptLanguagesA( buffer, &buffersize);
|
||||
todo_wine ok(retval == E_INVALIDARG, "function result wrong: got %08lx; expected E_INVALIDARG\n", retval);
|
||||
todo_wine ok(buffersize == 0,
|
||||
ok(retval == E_INVALIDARG, "function result wrong: got %08lx; expected E_INVALIDARG\n", retval);
|
||||
ok(buffersize == 0,
|
||||
"buffersize wrong: got %08lx, expected 0 (2nd parameter;Win2k)\n", buffersize);
|
||||
todo_wine ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(),
|
||||
ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(),
|
||||
"last error wrong: got %08lx; expected ERROR_INSUFFICIENT_BUFFER\n", GetLastError());
|
||||
ok(buffersize2 == strlen(buffer),
|
||||
"buffer content (length) wrong: got %08x, expected %08lx \n", strlen(buffer), buffersize2);
|
||||
|
|
|
|||
Loading…
Reference in New Issue