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

user: Fix handling of high bits of resource id in LoadString, reported by Andrey Turkin.

This commit is contained in:
Alexandre Julliard 2006-09-21 20:47:20 +02:00
parent b421b60874
commit dea8c6a9ce
3 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dlls/user/resource.c
View File

@ -364,14 +364,11 @@ INT WINAPI LoadStringW( HINSTANCE instance, UINT resource_id,
int string_num; int string_num;
int i; int i;
if (HIWORD(resource_id)==0xFFFF) /* netscape 3 passes this */
resource_id = (UINT)(-((INT)resource_id));
TRACE("instance = %p, id = %04x, buffer = %p, length = %d\n", TRACE("instance = %p, id = %04x, buffer = %p, length = %d\n",
instance, resource_id, buffer, buflen); instance, resource_id, buffer, buflen);
/* Use bits 4 - 19 (incremented by 1) as resourceid, mask out /* Use loword (incremented by 1) as resourceid */
* 20 - 31. */ hrsrc = FindResourceW( instance, MAKEINTRESOURCEW((LOWORD(resource_id) >> 4) + 1),
hrsrc = FindResourceW( instance, MAKEINTRESOURCEW(((resource_id>>4)&0xffff)+1),
(LPWSTR)RT_STRING ); (LPWSTR)RT_STRING );
if (!hrsrc) return 0; if (!hrsrc) return 0;
hmem = LoadResource( instance, hrsrc ); hmem = LoadResource( instance, hrsrc );
@ -394,9 +391,6 @@ INT WINAPI LoadStringW( HINSTANCE instance, UINT resource_id,
buffer[0] = (WCHAR) 0; buffer[0] = (WCHAR) 0;
return 0; return 0;
} }
#if 0
WARN("Don't know why caller gave buflen=%d *p=%d trying to obtain string '%s'\n", buflen, *p, p + 1);
#endif
} }
TRACE("%s loaded !\n", debugstr_w(buffer)); TRACE("%s loaded !\n", debugstr_w(buffer));

15
dlls/user/tests/resource.c
View File

@ -46,6 +46,7 @@ static void test_LoadStringA (void)
{sizeof str, sizeof str - 1}, {sizeof str, sizeof str - 1},
{sizeof str - 1, sizeof str - 2}}; {sizeof str - 1, sizeof str - 2}};
unsigned int i; unsigned int i;
int ret;
assert (sizeof str < sizeof buf); assert (sizeof str < sizeof buf);
for (i = 0; i < sizeof tests / sizeof tests[0]; i++) { for (i = 0; i < sizeof tests / sizeof tests[0]; i++) {
@ -61,6 +62,20 @@ static void test_LoadStringA (void)
ok (buf[len] == 0, "bufsiz=%d: NUL termination missing\n", ok (buf[len] == 0, "bufsiz=%d: NUL termination missing\n",
bufsiz); bufsiz);
} }
ret = LoadStringA(hInst, 1, buf, sizeof(buf) );
ok( ret > 0, "LoadString failed: ret %d err %ld\n", ret, GetLastError());
ok( LoadStringA( hInst, MAKELONG( 1, 0x8000 ), buf, sizeof(buf)) == ret,
"LoadString failed: ret %d err %ld\n", ret, GetLastError());
ok( LoadStringA( hInst, MAKELONG( 1, 0xffff ), buf, sizeof(buf)) == ret,
"LoadString failed: ret %d err %ld\n", ret, GetLastError());
ret = LoadStringA(hInst, 65534, buf, sizeof(buf) );
ok( ret > 0, "LoadString failed: ret %d err %ld\n", ret, GetLastError());
ok( LoadStringA( hInst, MAKELONG( 65534, 0x8000 ), buf, sizeof(buf)) == ret,
"LoadString failed: ret %d err %ld\n", ret, GetLastError());
ok( LoadStringA( hInst, MAKELONG( 65534, 0xffff ), buf, sizeof(buf)) == ret,
"LoadString failed: ret %d err %ld\n", ret, GetLastError());
} }
static void test_accel1(void) static void test_accel1(void)

2
dlls/user/tests/resource.rc
View File

@ -40,6 +40,8 @@
STRINGTABLE STRINGTABLE
{ {
0 "String resource" 0 "String resource"
1 "Another string resource"
65534 "Test high id"
} }
TEST_DIALOG DIALOG DISCARDABLE 0, 0, 60, 30 TEST_DIALOG DIALOG DISCARDABLE 0, 0, 60, 30