Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
37c68b47
Commit
37c68b47
authored
Jan 10, 2006
by
Michael Kaufmann
Committed by
Alexandre Julliard
Jan 10, 2006
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
user: The LoadImage resource string may be a numeric string.
parent
ee9b656e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
1 deletion
+13
-1
cursoricon.c
dlls/user/cursoricon.c
+0
-1
resource.c
dlls/user/tests/resource.c
+13
-0
No files found.
dlls/user/cursoricon.c
View file @
37c68b47
...
@@ -2114,7 +2114,6 @@ static HBITMAP BITMAP_Load( HINSTANCE instance, LPCWSTR name,
...
@@ -2114,7 +2114,6 @@ static HBITMAP BITMAP_Load( HINSTANCE instance, LPCWSTR name,
if
(
!
instance
)
if
(
!
instance
)
{
{
/* OEM bitmap: try to load the resource from user32.dll */
/* OEM bitmap: try to load the resource from user32.dll */
if
(
HIWORD
(
name
))
return
0
;
instance
=
user32_module
;
instance
=
user32_module
;
}
}
...
...
dlls/user/tests/resource.c
View file @
37c68b47
...
@@ -283,6 +283,18 @@ static void test_PrivateExtractIcons(void) {
...
@@ -283,6 +283,18 @@ static void test_PrivateExtractIcons(void) {
ok
(
cIcons
==
4
,
"Three icons requested, four expected, got cIcons=%d
\n
"
,
cIcons
);
ok
(
cIcons
==
4
,
"Three icons requested, four expected, got cIcons=%d
\n
"
,
cIcons
);
}
}
static
void
test_LoadImage
(
void
)
{
HBITMAP
bmp
;
bmp
=
LoadBitmapA
(
NULL
,
MAKEINTRESOURCE
(
OBM_CHECK
));
ok
(
bmp
!=
NULL
,
"Could not load the OBM_CHECK bitmap"
);
if
(
bmp
)
DeleteObject
(
bmp
);
bmp
=
LoadBitmapA
(
NULL
,
"#32760"
);
/* Value of OBM_CHECK */
ok
(
bmp
!=
NULL
,
"Could not load the OBM_CHECK bitmap"
);
if
(
bmp
)
DeleteObject
(
bmp
);
}
START_TEST
(
resource
)
START_TEST
(
resource
)
{
{
init_function_pointers
();
init_function_pointers
();
...
@@ -290,4 +302,5 @@ START_TEST(resource)
...
@@ -290,4 +302,5 @@ START_TEST(resource)
test_accel1
();
test_accel1
();
test_accel2
();
test_accel2
();
test_PrivateExtractIcons
();
test_PrivateExtractIcons
();
test_LoadImage
();
}
}
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