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

Added unit test for environment functions and fixed some bugs.

This commit is contained in:
Dmitry Timoshkov 2002-08-20 00:22:29 +00:00 committed by Alexandre Julliard
parent fc34344d14
commit b967834362
4 changed files with 218 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/kernel/tests/.cvsignore
View File

@ -2,6 +2,7 @@ Makefile
alloc.ok alloc.ok
atom.ok atom.ok
directory.ok directory.ok
environ.ok
file.ok file.ok
kernel32_test.exe.spec.c kernel32_test.exe.spec.c
locale.ok locale.ok

1
dlls/kernel/tests/Makefile.in
View File

@ -9,6 +9,7 @@ CTESTS = \
alloc.c \ alloc.c \
atom.c \ atom.c \
directory.c \ directory.c \
environ.c \
file.c \ file.c \
locale.c \ locale.c \
path.c \ path.c \

189
dlls/kernel/tests/environ.c Normal file
View File

@ -0,0 +1,189 @@
/*
* Unit test suite for environment functions.
*
* Copyright 2002 Dmitry Timoshkov
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "wine/test.h"
#include "winbase.h"
#include "winerror.h"
static void test_GetSetEnvironmentVariableA(void)
{
char buf[256];
BOOL ret;
DWORD ret_size;
static const char name[] = "SomeWildName";
static const char name_cased[] = "sOMEwILDnAME";
static const char value[] = "SomeWildValue";
ret = SetEnvironmentVariableA(NULL, NULL);
ok(ret == FALSE && GetLastError() == ERROR_INVALID_PARAMETER, "should fail with NULL, NULL");
ret = SetEnvironmentVariableA("", "");
ok(ret == FALSE && GetLastError() == ERROR_INVALID_PARAMETER, "should fail with \"\", \"\"");
ret = SetEnvironmentVariableA(name, "");
ok(ret == TRUE, "should not fail with empty value");
ret = SetEnvironmentVariableA("", value);
ok(ret == FALSE && GetLastError() == ERROR_INVALID_PARAMETER, "should fail with empty name");
ret = SetEnvironmentVariableA(name, value);
ok(ret == TRUE, "unexpected error in SetEnvironmentVariableA");
/* the following line should just crash */
/* ret_size = GetEnvironmentVariableA(name, NULL, lstrlenA(value) + 1); */
ret_size = GetEnvironmentVariableA(NULL, NULL, 0);
ok(ret_size == 0 && GetLastError() == ERROR_ENVVAR_NOT_FOUND, "should not find variable");
ret_size = GetEnvironmentVariableA(NULL, buf, lstrlenA(value) + 1);
ok(ret_size == 0 && GetLastError() == ERROR_ENVVAR_NOT_FOUND, "should not find variable");
ret_size = GetEnvironmentVariableA("", buf, lstrlenA(value) + 1);
ok(ret_size == 0 && GetLastError() == ERROR_ENVVAR_NOT_FOUND, "should not find variable");
lstrcpyA(buf, "foo");
ret_size = GetEnvironmentVariableA(name, buf, 0);
ok(lstrcmpA(buf, "foo") == 0, "should not touch the buffer");
ok(ret_size == lstrlenA(value) + 1, "should return length with terminating 0");
lstrcpyA(buf, "foo");
ret_size = GetEnvironmentVariableA(name, buf, lstrlenA(value));
ok(lstrcmpA(buf, "foo") == 0, "should not touch the buffer");
ok(ret_size == lstrlenA(value) + 1, "should return length with terminating 0");
lstrcpyA(buf, "foo");
ret_size = GetEnvironmentVariableA(name, buf, lstrlenA(value) + 1);
ok(lstrcmpA(buf, value) == 0, "should touch the buffer");
ok(ret_size == lstrlenA(value), "should return length without terminating 0");
lstrcpyA(buf, "foo");
ret_size = GetEnvironmentVariableA(name_cased, buf, lstrlenA(value) + 1);
ok(lstrcmpA(buf, value) == 0, "should touch the buffer");
ok(ret_size == lstrlenA(value), "should return length without terminating 0");
ret = SetEnvironmentVariableA(name, NULL);
ok(ret == TRUE, "should erase existing variable");
lstrcpyA(buf, "foo");
ret_size = GetEnvironmentVariableA(name, buf, lstrlenA(value) + 1);
ok(ret_size == 0 && GetLastError() == ERROR_ENVVAR_NOT_FOUND, "should not find variable");
ok(lstrcmpA(buf, "foo") == 0, "should not touch the buffer");
ret = SetEnvironmentVariableA(name, value);
ok(ret == TRUE, "unexpected error in SetEnvironmentVariableA");
ret = SetEnvironmentVariableA(name, "");
ok(ret == TRUE, "should not fail with empty value");
lstrcpyA(buf, "foo");
ret_size = GetEnvironmentVariableA(name, buf, lstrlenA(value) + 1);
ok(ret_size == 0 && GetLastError() == ERROR_ENVVAR_NOT_FOUND, "should not find variable");
ok(lstrcmpA(buf, "") == 0, "should copy an empty string");
}
static void test_GetSetEnvironmentVariableW(void)
{
WCHAR buf[256];
BOOL ret;
DWORD ret_size;
static const WCHAR name[] = {'S','o','m','e','W','i','l','d','N','a','m','e',0};
static const WCHAR value[] = {'S','o','m','e','W','i','l','d','V','a','l','u','e',0};
static const WCHAR name_cased[] = {'s','O','M','E','w','I','L','D','n','A','M','E',0};
static const WCHAR empty_strW[] = { 0 };
static const WCHAR fooW[] = {'f','o','o',0};
ret = SetEnvironmentVariableW(NULL, NULL);
ok(ret == FALSE && GetLastError() == ERROR_INVALID_PARAMETER, "should fail with NULL, NULL");
ret = SetEnvironmentVariableW(empty_strW, empty_strW);
ok(ret == FALSE && GetLastError() == ERROR_INVALID_PARAMETER, "should fail with \"\", \"\"");
ret = SetEnvironmentVariableW(name, empty_strW);
ok(ret == TRUE, "should not fail with empty value");
ret = SetEnvironmentVariableW(empty_strW, value);
ok(ret == FALSE && GetLastError() == ERROR_INVALID_PARAMETER, "should fail with empty name");
ret = SetEnvironmentVariableW(name, value);
ok(ret == TRUE, "unexpected error in SetEnvironmentVariableW");
/* the following line should just crash */
/* ret_size = GetEnvironmentVariableW(name, NULL, lstrlenW(value) + 1); */
ret_size = GetEnvironmentVariableW(NULL, NULL, 0);
ok(ret_size == 0 && GetLastError() == ERROR_ENVVAR_NOT_FOUND, "should not find variable");
ret_size = GetEnvironmentVariableW(NULL, buf, lstrlenW(value) + 1);
ok(ret_size == 0 && GetLastError() == ERROR_ENVVAR_NOT_FOUND, "should not find variable");
ret_size = GetEnvironmentVariableW(empty_strW, buf, lstrlenW(value) + 1);
ok(ret_size == 0 && GetLastError() == ERROR_ENVVAR_NOT_FOUND, "should not find variable");
lstrcpyW(buf, fooW);
ret_size = GetEnvironmentVariableW(name, buf, 0);
ok(lstrcmpW(buf, fooW) == 0, "should not touch the buffer");
ok(ret_size == lstrlenW(value) + 1, "should return length with terminating 0");
lstrcpyW(buf, fooW);
ret_size = GetEnvironmentVariableW(name, buf, lstrlenW(value));
todo_wine
{
ok(lstrcmpW(buf, fooW) == 0, "should not touch the buffer");
};
ok(ret_size == lstrlenW(value) + 1, "should return length with terminating 0");
lstrcpyW(buf, fooW);
ret_size = GetEnvironmentVariableW(name, buf, lstrlenW(value) + 1);
ok(lstrcmpW(buf, value) == 0, "should touch the buffer");
ok(ret_size == lstrlenW(value), "should return length without terminating 0");
lstrcpyW(buf, fooW);
ret_size = GetEnvironmentVariableW(name_cased, buf, lstrlenW(value) + 1);
ok(lstrcmpW(buf, value) == 0, "should touch the buffer");
ok(ret_size == lstrlenW(value), "should return length without terminating 0");
ret = SetEnvironmentVariableW(name, NULL);
ok(ret == TRUE, "should erase existing variable");
lstrcpyW(buf, fooW);
ret_size = GetEnvironmentVariableW(name, buf, lstrlenW(value) + 1);
ok(ret_size == 0 && GetLastError() == ERROR_ENVVAR_NOT_FOUND, "should not find variable");
ok(lstrcmpW(buf, fooW) == 0, "should not touch the buffer");
ret = SetEnvironmentVariableW(name, value);
ok(ret == TRUE, "unexpected error in SetEnvironmentVariableW");
ret = SetEnvironmentVariableW(name, empty_strW);
ok(ret == TRUE, "should not fail with empty value");
lstrcpyW(buf, fooW);
ret_size = GetEnvironmentVariableW(name, buf, lstrlenW(value) + 1);
ok(ret_size == 0 && GetLastError() == ERROR_ENVVAR_NOT_FOUND, "should not find variable");
todo_wine
{
ok(lstrcmpW(buf, empty_strW) == 0, "should copy an empty string");
};
}
START_TEST(environ)
{
test_GetSetEnvironmentVariableA();
test_GetSetEnvironmentVariableW();
}

39
memory/environ.c
View File

@ -536,9 +536,10 @@ DWORD WINAPI GetEnvironmentVariableA( LPCSTR name, LPSTR value, DWORD size )
if (!name || !*name) if (!name || !*name)
{ {
SetLastError( ERROR_INVALID_PARAMETER ); SetLastError( ERROR_ENVVAR_NOT_FOUND );
return 0; return 0;
} }
RtlAcquirePebLock(); RtlAcquirePebLock();
if ((p = ENV_FindVariable( current_envdb.env, name, strlen(name) ))) if ((p = ENV_FindVariable( current_envdb.env, name, strlen(name) )))
{ {
@ -546,9 +547,8 @@ DWORD WINAPI GetEnvironmentVariableA( LPCSTR name, LPSTR value, DWORD size )
if (size <= ret) if (size <= ret)
{ {
/* If not enough room, include the terminating null /* If not enough room, include the terminating null
* in the returned size and return an empty string */ * in the returned size */
ret++; ret++;
if (value) *value = '\0';
} }
else if (value) strcpy( value, p ); else if (value) strcpy( value, p );
} }
@ -564,17 +564,26 @@ DWORD WINAPI GetEnvironmentVariableA( LPCSTR name, LPSTR value, DWORD size )
*/ */
DWORD WINAPI GetEnvironmentVariableW( LPCWSTR nameW, LPWSTR valW, DWORD size) DWORD WINAPI GetEnvironmentVariableW( LPCWSTR nameW, LPWSTR valW, DWORD size)
{ {
LPSTR name = HEAP_strdupWtoA( GetProcessHeap(), 0, nameW ); LPSTR name, val;
LPSTR val = valW ? HeapAlloc( GetProcessHeap(), 0, size ) : NULL; DWORD ret;
DWORD res = GetEnvironmentVariableA( name, val, size );
HeapFree( GetProcessHeap(), 0, name ); if (!nameW || !*nameW)
if (val)
{ {
if (size > 0 && !MultiByteToWideChar( CP_ACP, 0, val, -1, valW, size )) SetLastError( ERROR_ENVVAR_NOT_FOUND );
valW[size-1] = 0; return 0;
HeapFree( GetProcessHeap(), 0, val );
} }
return res;
name = HEAP_strdupWtoA( GetProcessHeap(), 0, nameW );
val = valW ? HeapAlloc( GetProcessHeap(), 0, size ) : NULL;
ret = GetEnvironmentVariableA( name, val, size );
if (ret && val)
{
if (size && !MultiByteToWideChar( CP_ACP, 0, val, -1, valW, size ))
valW[size-1] = 0;
}
HeapFree( GetProcessHeap(), 0, name );
if (val) HeapFree( GetProcessHeap(), 0, val );
return ret;
} }
@ -587,6 +596,12 @@ BOOL WINAPI SetEnvironmentVariableA( LPCSTR name, LPCSTR value )
LPSTR p, env, new_env; LPSTR p, env, new_env;
BOOL ret = FALSE; BOOL ret = FALSE;
if (!name || !*name)
{
SetLastError( ERROR_INVALID_PARAMETER );
return FALSE;
}
RtlAcquirePebLock(); RtlAcquirePebLock();
env = p = current_envdb.env; env = p = current_envdb.env;