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

Fixed atom test to work on Windows.

This commit is contained in:
Dmitry Timoshkov 2002-10-04 17:45:00 +00:00 committed by Alexandre Julliard
parent 3139b927b2
commit c8ab54d158
2 changed files with 72 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

160
dlls/kernel/tests/atom.c
View File

@ -28,6 +28,8 @@ static const WCHAR foobarW[] = {'f','o','o','b','a','r',0};
static const WCHAR FOOBARW[] = {'F','O','O','B','A','R',0}; static const WCHAR FOOBARW[] = {'F','O','O','B','A','R',0};
static const WCHAR _foobarW[] = {'_','f','o','o','b','a','r',0}; static const WCHAR _foobarW[] = {'_','f','o','o','b','a','r',0};
static BOOL unicode_OS;
static void test_add_atom(void) static void test_add_atom(void)
{ {
ATOM atom, w_atom; ATOM atom, w_atom;
@ -47,41 +49,56 @@ static void test_add_atom(void)
* find the first one, not add a new one */ * find the first one, not add a new one */
SetLastError( 0xdeadbeef ); SetLastError( 0xdeadbeef );
w_atom = GlobalAddAtomW( foobarW ); w_atom = GlobalAddAtomW( foobarW );
ok( w_atom == atom, "Unicode atom does not match ASCII" ); if (w_atom && GetLastError() != ERROR_CALL_NOT_IMPLEMENTED)
ok( GetLastError() == 0xdeadbeef, "GlobalAddAtomW set last error" ); unicode_OS = TRUE;
else
trace("WARNING: Unicode atom APIs are not supported on this platform\n");
if (unicode_OS)
{
ok( w_atom == atom, "Unicode atom does not match ASCII" );
ok( GetLastError() == 0xdeadbeef, "GlobalAddAtomW set last error" );
}
/* Verify that it can be found (or not) appropriately via unicode name */ /* Verify that it can be found (or not) appropriately via unicode name */
ok( GlobalFindAtomW( foobarW ) == atom, "could not find atom foobar" ); if (unicode_OS)
ok( GlobalFindAtomW( FOOBARW ) == atom, "could not find atom FOOBAR" ); {
ok( !GlobalFindAtomW( _foobarW ), "found _foobar" ); ok( GlobalFindAtomW( foobarW ) == atom, "could not find atom foobar" );
ok( GlobalFindAtomW( FOOBARW ) == atom, "could not find atom FOOBAR" );
ok( !GlobalFindAtomW( _foobarW ), "found _foobar" );
}
/* Test integer atoms /* Test integer atoms
* (0x0000 .. 0xbfff) should be valid; * (0x0001 .. 0xbfff) should be valid;
* (0xc000 .. 0xffff) should be invalid */ * (0xc000 .. 0xffff) should be invalid */
todo_wine
SetLastError( 0xdeadbeef );
ok( GlobalAddAtomA(0) == 0 && GetLastError() == 0xdeadbeef, "succeeded to add atom 0" );
if (unicode_OS)
{ {
SetLastError( 0xdeadbeef ); SetLastError( 0xdeadbeef );
ok( GlobalAddAtomA(0) == 0 && GetLastError() == 0xdeadbeef, "failed to add atom 0" ); ok( GlobalAddAtomW(0) == 0 && GetLastError() == 0xdeadbeef, "succeeded to add atom 0" );
SetLastError( 0xdeadbeef );
ok( GlobalAddAtomW(0) == 0 && GetLastError() == 0xdeadbeef, "failed to add atom 0" );
} }
SetLastError( 0xdeadbeef ); SetLastError( 0xdeadbeef );
for (i = 1; i <= 0xbfff; i++) for (i = 1; i <= 0xbfff; i++)
{ {
SetLastError( 0xdeadbeef ); SetLastError( 0xdeadbeef );
ok( GlobalAddAtomA((LPCSTR)i) == i && GetLastError() == 0xdeadbeef, ok( GlobalAddAtomA((LPCSTR)i) == i && GetLastError() == 0xdeadbeef,
"failed to add atom %x", i ); "failed to add atom %x", i );
ok( GlobalAddAtomW((LPCWSTR)i) == i && GetLastError() == 0xdeadbeef, if (unicode_OS)
"failed to add atom %x", i ); {
SetLastError( 0xdeadbeef );
ok( GlobalAddAtomW((LPCWSTR)i) == i && GetLastError() == 0xdeadbeef,
"failed to add atom %x", i );
}
} }
for (i = 0xc000; i <= 0xffff; i++) for (i = 0xc000; i <= 0xffff; i++)
{ {
SetLastError( 0xdeadbeef ); ok( !GlobalAddAtomA((LPCSTR)i), "succeeded adding %x", i );
ok( !GlobalAddAtomA((LPCSTR)i) && (GetLastError() == ERROR_INVALID_PARAMETER), if (unicode_OS)
"succeeded adding %x", i ); ok( !GlobalAddAtomW((LPCWSTR)i), "succeeded adding %x", i );
SetLastError( 0xdeadbeef );
ok( !GlobalAddAtomW((LPCWSTR)i) && (GetLastError() == ERROR_INVALID_PARAMETER),
"succeeded adding %x", i );
} }
} }
@ -90,7 +107,7 @@ static void test_get_atom_name(void)
char buf[10]; char buf[10];
WCHAR bufW[10]; WCHAR bufW[10];
int i, len; int i, len;
static const char resultW[] = {'f','o','o','b','a','r',0,'.','.','.'}; static const WCHAR resultW[] = {'f','o','o','b','a','r',0,'.','.','.'};
ATOM atom = GlobalAddAtomA( "foobar" ); ATOM atom = GlobalAddAtomA( "foobar" );
@ -99,33 +116,37 @@ static void test_get_atom_name(void)
len = GlobalGetAtomNameA( atom, buf, 10 ); len = GlobalGetAtomNameA( atom, buf, 10 );
ok( len == strlen("foobar"), "bad length %d", len ); ok( len == strlen("foobar"), "bad length %d", len );
ok( !memcmp( buf, "foobar\0...", 10 ), "bad buffer contents" ); ok( !memcmp( buf, "foobar\0...", 10 ), "bad buffer contents" );
ok( !GlobalGetAtomNameA( atom, buf, 3 ), "GlobalGetAtomNameA succeeded on short buffer" );
/* Repeat, unicode-style */ /* Repeat, unicode-style */
for (i = 0; i < 10; i++) bufW[i] = '.'; if (unicode_OS)
len = GlobalGetAtomNameW( atom, bufW, 10 );
ok( len == lstrlenW(foobarW), "bad length %d", len );
todo_wine
{ {
for (i = 0; i < 10; i++) bufW[i] = '.';
SetLastError( 0xdeadbeef );
len = GlobalGetAtomNameW( atom, bufW, 10 );
ok( len && GetLastError() == 0xdeadbeef, "GlobalGetAtomNameW failed" );
ok( len == lstrlenW(foobarW), "bad length %d", len );
ok( !memcmp( bufW, resultW, 10*sizeof(WCHAR) ), "bad buffer contents" ); ok( !memcmp( bufW, resultW, 10*sizeof(WCHAR) ), "bad buffer contents" );
} }
ok( !GlobalGetAtomNameW( atom, bufW, 3 ), "GlobalGetAtomNameW succeeded on short buffer" );
/* Check error code returns */ /* Check error code returns */
SetLastError( 0xdeadbeef ); memset(buf, '.', 10);
ok( !GlobalGetAtomNameA( atom, buf, 0 ) && GetLastError() == ERROR_MORE_DATA, "succeded" ); ok( !GlobalGetAtomNameA( atom, buf, 0 ), "succeded" );
SetLastError( 0xdeadbeef ); ok( !memcmp( buf, "..........", 10 ), "should not touch buffer" );
ok( !GlobalGetAtomNameA( atom, buf, -1 ) && GetLastError() == ERROR_MORE_DATA, "succeded" );
SetLastError( 0xdeadbeef ); if (unicode_OS)
ok( !GlobalGetAtomNameW( atom, bufW, 0 ) && GetLastError() == ERROR_MORE_DATA, "succeded" ); {
SetLastError( 0xdeadbeef ); static const WCHAR sampleW[10] = {'.','.','.','.','.','.','.','.','.','.'};
ok( !GlobalGetAtomNameW( atom, bufW, -1 ) && GetLastError() == ERROR_MORE_DATA, "succeded" );
for (i = 0; i < 10; i++) bufW[i] = '.';
ok( !GlobalGetAtomNameW( atom, bufW, 0 ), "succeded" );
ok( !memcmp( bufW, sampleW, 10 * sizeof(WCHAR) ), "should not touch buffer" );
}
/* Test integer atoms */ /* Test integer atoms */
for (i = 0; i <= 0xbfff; i++) for (i = 0; i <= 0xbfff; i++)
{ {
memset( buf, 'a', 10 ); memset( buf, 'a', 10 );
len = GlobalGetAtomNameA( i, buf, 10 ); len = GlobalGetAtomNameA( (ATOM)i, buf, 10 );
if (i) if (i)
{ {
char res[20]; char res[20];
@ -134,81 +155,34 @@ static void test_get_atom_name(void)
memset( res + strlen(res) + 1, 'a', 10 ); memset( res + strlen(res) + 1, 'a', 10 );
ok( !memcmp( res, buf, 10 ), "bad buffer contents %s", buf ); ok( !memcmp( res, buf, 10 ), "bad buffer contents %s", buf );
} }
else todo_wine else
{ ok( !len, "bad length %d", len );
char res[20];
ok( (len > 1) && (len < 7), "bad length %d", len );
sprintf( res, "#%d", i );
memset( res + strlen(res) + 1, 'a', 10 );
ok( !memcmp( res, buf, 10 ), "bad buffer contents %s", buf );
}
} }
} }
static void test_delete_atom(void)
{
ATOM atom;
int i;
/* First make sure it doesn't exist */
atom = GlobalAddAtomA( "foobar" );
while (!GlobalDeleteAtom( atom ));
/* Now add it a number of times */
for (i = 0; i < 10; i++) atom = GlobalAddAtomA( "foobar" );
/* Make sure it's here */
ok( GlobalFindAtomA( "foobar" ), "foobar not found" );
ok( GlobalFindAtomW( foobarW ), "foobarW not found" );
/* That many deletions should succeed */
for (i = 0; i < 10; i++)
ok( !GlobalDeleteAtom( atom ), "delete atom failed" );
/* It should be gone now */
ok( !GlobalFindAtomA( "foobar" ), "still found it" );
ok( !GlobalFindAtomW( foobarW ), "still found it" );
/* So this one should fail */
SetLastError( 0xdeadbeef );
ok( GlobalDeleteAtom( atom ) == atom && GetLastError() == ERROR_INVALID_HANDLE,
"delete failed" );
}
static void test_error_handling(void) static void test_error_handling(void)
{ {
char buffer[260]; char buffer[260];
WCHAR bufferW[260]; WCHAR bufferW[260];
ATOM atom;
int i; int i;
memset( buffer, 'a', 255 ); memset( buffer, 'a', 256 );
buffer[255] = 0;
ok( atom = GlobalAddAtomA( buffer ), "add failed" );
ok( !GlobalDeleteAtom( atom ), "delete failed" );
buffer[255] = 'a';
buffer[256] = 0; buffer[256] = 0;
SetLastError( 0xdeadbeef ); ok( !GlobalAddAtomA(buffer), "add succeded" );
ok( !GlobalAddAtomA(buffer) && GetLastError() == ERROR_INVALID_PARAMETER, "add succeded" ); ok( !GlobalFindAtomA(buffer), "find succeded" );
SetLastError( 0xdeadbeef );
ok( !GlobalFindAtomA(buffer) && GetLastError() == ERROR_INVALID_PARAMETER, "find succeded" );
for (i = 0; i < 255; i++) bufferW[i] = 'b'; if (unicode_OS)
bufferW[255] = 0; {
ok( atom = GlobalAddAtomW( bufferW ), "add failed" ); for (i = 0; i < 256; i++) bufferW[i] = 'b';
ok( !GlobalDeleteAtom( atom ), "delete failed" ); bufferW[256] = 0;
bufferW[255] = 'b'; ok( !GlobalAddAtomW(bufferW), "add succeded" );
bufferW[256] = 0; ok( !GlobalFindAtomW(bufferW), "find succeded" );
SetLastError( 0xdeadbeef ); }
ok( !GlobalAddAtomW(bufferW) && GetLastError() == ERROR_INVALID_PARAMETER, "add succeded" );
SetLastError( 0xdeadbeef );
ok( !GlobalFindAtomW(bufferW) && GetLastError() == ERROR_INVALID_PARAMETER, "find succeded" );
} }
START_TEST(atom) START_TEST(atom)
{ {
test_add_atom(); test_add_atom();
test_get_atom_name(); test_get_atom_name();
test_delete_atom();
test_error_handling(); test_error_handling();
} }

16
memory/atom.c
View File

@ -131,7 +131,7 @@ static BOOL ATOM_IsIntAtomA(LPCSTR atomstr,WORD *atomid)
} }
if (*atomstr) return FALSE; if (*atomstr) return FALSE;
} }
if (!atom || (atom >= MAXINTATOM)) if (atom >= MAXINTATOM)
{ {
SetLastError( ERROR_INVALID_PARAMETER ); SetLastError( ERROR_INVALID_PARAMETER );
atom = 0; atom = 0;
@ -158,7 +158,7 @@ static BOOL ATOM_IsIntAtomW(LPCWSTR atomstr,WORD *atomid)
} }
if (*atomstr) return FALSE; if (*atomstr) return FALSE;
} }
if (!atom || (atom >= MAXINTATOM)) if (atom >= MAXINTATOM)
{ {
SetLastError( ERROR_INVALID_PARAMETER ); SetLastError( ERROR_INVALID_PARAMETER );
atom = 0; atom = 0;
@ -502,18 +502,17 @@ ATOM WINAPI AddAtomW( LPCWSTR str )
static ATOM ATOM_DeleteAtom( ATOM atom, BOOL local) static ATOM ATOM_DeleteAtom( ATOM atom, BOOL local)
{ {
TRACE( "(%s) %x\n", local ? "local" : "global", atom ); TRACE( "(%s) %x\n", local ? "local" : "global", atom );
if (atom < MAXINTATOM) atom = 0; if (atom >= MAXINTATOM)
else
{ {
SERVER_START_REQ( delete_atom ) SERVER_START_REQ( delete_atom )
{ {
req->atom = atom; req->atom = atom;
req->local = local; req->local = local;
if (!wine_server_call_err( req )) atom = 0; wine_server_call_err( req );
} }
SERVER_END_REQ; SERVER_END_REQ;
} }
return atom; return 0;
} }
@ -775,11 +774,6 @@ static UINT ATOM_GetAtomNameW( ATOM atom, LPWSTR buffer, INT count, BOOL local )
SERVER_END_REQ; SERVER_END_REQ;
if (!len) return 0; if (!len) return 0;
} }
if (count <= len)
{
SetLastError( ERROR_MORE_DATA );
return 0;
}
TRACE( "(%s) %x -> %s\n", local ? "local" : "global", atom, debugstr_w(buffer) ); TRACE( "(%s) %x -> %s\n", local ? "local" : "global", atom, debugstr_w(buffer) );
return len; return len;
} }