Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
ad9303d8
Commit
ad9303d8
authored
Nov 08, 2023
by
Paul Gofman
Committed by
Alexandre Julliard
Nov 09, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
user32: Put 0 to output string even for 1 char buffer in LoadStringW().
parent
726027d6
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
10 deletions
+12
-10
resource.c
dlls/user32/resource.c
+3
-10
resource.c
dlls/user32/tests/resource.c
+9
-0
No files found.
dlls/user32/resource.c
View file @
ad9303d8
...
@@ -185,17 +185,10 @@ INT WINAPI DECLSPEC_HOTPATCH LoadStringW( HINSTANCE instance, UINT resource_id,
...
@@ -185,17 +185,10 @@ INT WINAPI DECLSPEC_HOTPATCH LoadStringW( HINSTANCE instance, UINT resource_id,
}
}
i
=
min
(
buflen
-
1
,
*
p
);
i
=
min
(
buflen
-
1
,
*
p
);
if
(
i
>
0
)
{
memcpy
(
buffer
,
p
+
1
,
i
*
sizeof
(
WCHAR
));
memcpy
(
buffer
,
p
+
1
,
i
*
sizeof
(
WCHAR
));
buffer
[
i
]
=
0
;
buffer
[
i
]
=
0
;
}
else
{
if
(
buflen
>
1
)
{
buffer
[
0
]
=
0
;
return
0
;
}
}
TRACE
(
"
%s loaded !
\n
"
,
debugstr_w
(
buffer
));
TRACE
(
"
returning %s
\n
"
,
debugstr_w
(
buffer
));
return
i
;
return
i
;
}
}
...
...
dlls/user32/tests/resource.c
View file @
ad9303d8
...
@@ -147,6 +147,15 @@ static void test_LoadStringW(void)
...
@@ -147,6 +147,15 @@ static void test_LoadStringW(void)
"got %lu.
\n
"
,
GetLastError
());
"got %lu.
\n
"
,
GetLastError
());
ok
(
!
returnedstringw
[
0
],
"got %#x.
\n
"
,
returnedstringw
[
0
]);
ok
(
!
returnedstringw
[
0
],
"got %#x.
\n
"
,
returnedstringw
[
0
]);
ok
(
returnedstringw
[
1
]
==
0xcccc
,
"got %#x.
\n
"
,
returnedstringw
[
1
]);
ok
(
returnedstringw
[
1
]
==
0xcccc
,
"got %#x.
\n
"
,
returnedstringw
[
1
]);
/* Test short buffer */
SetLastError
(
0xdeadbeef
);
memset
(
returnedstringw
,
0xcc
,
sizeof
(
returnedstringw
));
length1
=
LoadStringW
(
hInst
,
2
,
returnedstringw
,
1
);
/* get resource string */
ok
(
!
length1
,
"got %d.
\n
"
,
length1
);
ok
(
GetLastError
()
==
0xdeadbeef
,
"got %lu.
\n
"
,
GetLastError
());
ok
(
!
returnedstringw
[
0
],
"got %#x.
\n
"
,
returnedstringw
[
0
]);
ok
(
returnedstringw
[
1
]
==
0xcccc
,
"got %#x.
\n
"
,
returnedstringw
[
1
]);
}
}
static
void
test_LoadStringA
(
void
)
static
void
test_LoadStringA
(
void
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment