Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-12 07:35:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix most kernel32_profile winetests

Browse source 
svn path=/trunk/; revision=36179
This commit is contained in:
Christoph von Wittich 2008-09-13 08:23:32 +00:00
parent f6c0c19edb
commit a72e8a4195
1 changed files with 27 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
reactos/dll/win32/kernel32/misc/profile.c
View file

@ -756,6 +756,9 @@ static BOOL PROFILE_Open( LPCWSTR filename )
GetWindowsDirectoryW( windirW, MAX_PATH );
if (!filename)
filename = L"win.ini";
if ((RtlDetermineDosPathNameType_U(filename) == RtlPathTypeRelative) &&
!wcschr(filename, '\\') && !wcschr(filename, '/'))
{
@ -933,7 +936,7 @@ static INT PROFILE_GetSectionNames( LPWSTR buffer, UINT len )
while ((section!=NULL)) {
if (section->name[0]) {
tmplen = wcslen(section->name)+1;
if (tmplen > buflen) {
if (tmplen >= buflen) {
if (buflen > 0) {
memcpy(buf, section->name, (buflen - 1) * sizeof(WCHAR));
buf += buflen - 1;
@ -1111,9 +1114,6 @@ static int PROFILE_GetPrivateProfileString( LPCWSTR section, LPCWSTR entry,
int ret;
LPCWSTR pDefVal = NULL;
if (!filename)
filename = L"win.ini";
DPRINT("%S, %S, %S, %p, %u, %S\n",
section, entry,
def_val, buffer, len, filename);
@ -1337,7 +1337,13 @@ UINT WINAPI GetPrivateProfileIntA( LPCSTR section, LPCSTR entry,
DWORD WINAPI GetPrivateProfileSectionW( LPCWSTR section, LPWSTR buffer,
DWORD len, LPCWSTR filename )
{
int ret = 0;
int ret = 0;
if (!section || !buffer)
{
SetLastError(ERROR_INVALID_PARAMETER);
return 0;
}
DPRINT("(%S, %p, %ld, %S)\n",
section, buffer, len, filename);
@ -1363,18 +1369,23 @@ DWORD WINAPI GetPrivateProfileSectionA( LPCSTR section, LPSTR buffer,
LPWSTR bufferW;
INT retW, ret = 0;
bufferW = buffer ? HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)) : NULL;
if (section) RtlCreateUnicodeStringFromAsciiz(&sectionW, section);
else sectionW.Buffer = NULL;
if (!section || !buffer)
{
SetLastError(ERROR_INVALID_PARAMETER);
return 0;
}
bufferW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR));
RtlCreateUnicodeStringFromAsciiz(&sectionW, section);
if (filename) RtlCreateUnicodeStringFromAsciiz(&filenameW, filename);
else filenameW.Buffer = NULL;
retW = GetPrivateProfileSectionW(sectionW.Buffer, bufferW, len, filenameW.Buffer);
if (len > 2)
{
ret = WideCharToMultiByte(CP_ACP, 0, bufferW, retW + 2, buffer, len, NULL, NULL);
ret = WideCharToMultiByte(CP_ACP, 0, bufferW, retW + 1, buffer, len, NULL, NULL);
if (ret > 2)
ret -= 2;
ret -= 1;
else
{
ret = 0;
@ -1645,13 +1656,17 @@ DWORD WINAPI GetPrivateProfileSectionNamesA( LPSTR buffer, DWORD size,
retW = GetPrivateProfileSectionNamesW(bufferW, size, filenameW.Buffer);
if (retW && size)
{
ret = WideCharToMultiByte(CP_ACP, 0, bufferW, retW, buffer, size, NULL, NULL);
ret = WideCharToMultiByte(CP_ACP, 0, bufferW, retW+1, buffer, size-1, NULL, NULL);
if (!ret)
{
ret = size;
ret = size-2;
buffer[size-1] = 0;
}
else
ret = ret-1;
}
else if(size)
buffer[0] = '\0';
RtlFreeUnicodeString(&filenameW);
HeapFree(GetProcessHeap(), 0, bufferW);