Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Johnny Cai
wine
Commits
437449fb
Commit
437449fb
authored
26 years ago
by
Eric Kohl
Committed by
Alexandre Julliard
26 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fixed ImageList_LoadImage().
parent
66ef011c
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
dlls/comctl32/imagelist.c
+37
-1
37 additions, 1 deletion
dlls/comctl32/imagelist.c
relay32/comctl32.spec
+9
-9
9 additions, 9 deletions
relay32/comctl32.spec
with
46 additions
and
10 deletions
dlls/comctl32/imagelist.c
+
37
−
1
View file @
437449fb
...
...
@@ -31,6 +31,7 @@
#include
"windows.h"
#include
"winversion.h"
#include
"compobj.h"
#include
"storage.h"
#include
"imagelist.h"
...
...
@@ -1383,7 +1384,7 @@ ImageList_GetImageRect (HIMAGELIST himl, INT32 i, LPRECT32 lpRect)
/*************************************************************************
* ImageList_LoadImage32A
[COMCTL32.62]
[COMCTL32.63]
* ImageList_LoadImage32A [COMCTL32.63]
*
* Creates an image list from a bitmap, icon or cursor.
*
...
...
@@ -1510,6 +1511,41 @@ ImageList_LoadImage32W (HINSTANCE32 hi, LPCWSTR lpbmp, INT32 cx, INT32 cGrow,
}
/*************************************************************************
* ImageList_LoadImage32AW [COMCTL32.62]
*
* Creates an image list from a bitmap, icon or cursor.
*
* PARAMS
* hi [I] instance handle
* lpbmp [I] name or id of the image
* cx [I] width of each image
* cGrow [I] number of images to expand
* clrMask [I] mask color
* uType [I] type of image to load
* uFlags [I] loading flags
*
* RETURNS
* Success: handle to image list
* Failure: NULL
*
* SEE
* LoadImage ()
*/
HIMAGELIST
WINAPI
ImageList_LoadImage32AW
(
HINSTANCE32
hi
,
const
LPVOID
lpbmp
,
INT32
cx
,
INT32
cGrow
,
COLORREF
clrMask
,
UINT32
uType
,
UINT32
uFlags
)
{
if
(
VERSION_OsIsUnicode
())
return
ImageList_LoadImage32W
(
hi
,
(
LPCWSTR
)
lpbmp
,
cx
,
cGrow
,
clrMask
,
uType
,
uFlags
);
return
ImageList_LoadImage32A
(
hi
,
(
LPCSTR
)
lpbmp
,
cx
,
cGrow
,
clrMask
,
uType
,
uFlags
);
}
/*************************************************************************
* ImageList_Merge [COMCTL32.65]
*
...
...
This diff is collapsed.
Click to expand it.
relay32/comctl32.spec
+
9
−
9
View file @
437449fb
name comctl32
type win32
init C
omCtl
32LibMain
init C
OMCTL
32
_
LibMain
# Functions exported by the Win95 comctl32.dll
# (these need to have these exact ordinals, because some win95 dlls
...
...
@@ -16,7 +16,7 @@ init ComCtl32LibMain
8 stdcall CreateMappedBitmap(long long long ptr long) CreateMappedBitmap
9 stub COMCTL32_9
10 stub COMCTL32_10
11 stdcall
COMCTL32_11
(ptr ptr long
long long long) COMCTL32_11
11 stdcall
DPA_Merge
(ptr ptr long
ptr ptr long) DPA_Merge
#12 stub Cctl1632_ThunkData32
13 stub MakeDragList
14 stub LBItemFromPt
...
...
@@ -67,7 +67,7 @@ init ComCtl32LibMain
59 stdcall ImageList_GetImageCount(ptr) ImageList_GetImageCount
60 stdcall ImageList_GetImageInfo(ptr long ptr) ImageList_GetImageInfo
61 stdcall ImageList_GetImageRect(ptr long ptr) ImageList_GetImageRect
6
3
stdcall ImageList_LoadImage(long str long long long long long) ImageList_LoadImage32A
6
2
stdcall ImageList_LoadImage(long str long long long long long) ImageList_LoadImage32A
W
63 stdcall ImageList_LoadImageA(long str long long long long long) ImageList_LoadImage32A
64 stdcall ImageList_LoadImageW(long wstr long long long long long) ImageList_LoadImage32W
65 stdcall ImageList_Merge(ptr long ptr long long long) ImageList_Merge
...
...
@@ -100,7 +100,7 @@ init ComCtl32LibMain
154 stub EnumMRUListA@16
155 stub FindMRUStringA@12
156 stub DelMRUString@8
157 stdcall C
OMCTL32_157
(ptr long long long) CreateMRUList
Ex
32A
157 stdcall C
reateMRUListLazyA
(ptr long long long) CreateMRUList
Lazy
32A
163 stub CreatePage
164 stub CreateProxyPage
...
...
@@ -168,10 +168,10 @@ init ComCtl32LibMain
382 stub SmoothScrollWindow@4
383 stub DoReaderMode@4
384 stub SetPathWordBreakProc@8
385 stdcall
COMCTL32_385
(long long long)
COMCTL32_385
386 stdcall
COMCTL32_386(long long long) COMCTL32_386
387 stdcall
COMCTL32_387(long long long) COMCTL32_387
388 stdcall
COMCTL32_388(long long long) COMCTL32_388
385 stdcall
DPA_EnumCallback
(long long long)
DPA_EnumCallback
386 stdcall
DPA_DestroyCallback(ptr ptr long) DPA_DestroyCallback
387 stdcall
DSA_EnumCallback(ptr ptr long) DSA_EnumCallback
388 stdcall
DSA_DestroyCallback(ptr ptr long) DSA_DestroyCallback
389 stub COMCTL32_389
390 stub COMCTL32_390
...
...
@@ -179,7 +179,7 @@ init ComCtl32LibMain
401 stub AddMRUStringW@8
402 stub FindMRUStringW@12
403 stub EnumMRUListW@16
404 stub C
OMCTL32_404
404 stub C
reateMRUListLazyW@16
410 stub COMCTL32_410
411 stub COMCTL32_411
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment