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
d040e9db
Commit
d040e9db
authored
26 years ago
by
Eric Kohl
Committed by
Alexandre Julliard
26 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Added DrawStatusText32AW() and CreateStatusWindow32AW().
parent
12461856
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/commctrl.c
+62
-5
62 additions, 5 deletions
dlls/comctl32/commctrl.c
relay32/comctl32.spec
+2
-2
2 additions, 2 deletions
relay32/comctl32.spec
with
64 additions
and
7 deletions
dlls/comctl32/commctrl.c
+
62
−
5
View file @
d040e9db
...
...
@@ -11,10 +11,12 @@
#include
"commctrl.h"
#include
"animate.h"
#include
"comboex.h"
#include
"datetime.h"
#include
"header.h"
#include
"hotkey.h"
#include
"ipaddress.h"
#include
"listview.h"
#include
"monthcal.h"
#include
"nativefont.h"
#include
"pager.h"
#include
"progress.h"
...
...
@@ -26,6 +28,7 @@
#include
"trackbar.h"
#include
"treeview.h"
#include
"updown.h"
#include
"winversion.h"
#include
"debug.h"
#include
"winerror.h"
...
...
@@ -82,10 +85,12 @@ ComCtl32LibMain (HINSTANCE32 hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
/* unregister all common control classes */
ANIMATE_Unregister
();
COMBOEX_Unregister
();
DATETIME_Unregister
();
HEADER_Unregister
();
HOTKEY_Unregister
();
IPADDRESS_Unregister
();
LISTVIEW_Unregister
();
MONTHCAL_Unregister
();
NATIVEFONT_Unregister
();
PAGER_Unregister
();
PROGRESS_Unregister
();
...
...
@@ -286,7 +291,7 @@ GetEffectiveClientRect (HWND32 hwnd, LPRECT32 lpRect, LPINT32 lpInfo)
/***********************************************************************
* DrawStatusText32A [COMCTL32.5]
[COMCTL32.27]
* DrawStatusText32A [COMCTL32.5]
*
* Draws text with borders, like in a status bar.
*
...
...
@@ -350,7 +355,36 @@ DrawStatusText32W (HDC32 hdc, LPRECT32 lprc, LPCWSTR text, UINT32 style)
/***********************************************************************
* CreateStatusWindow32A [COMCTL32.6][COMCTL32.21] Creates a status bar
* DrawStatusText32AW [COMCTL32.27]
*
* Draws text with borders, like in a status bar.
*
* PARAMS
* hdc [I] handle to the window's display context
* lprc [I] pointer to a rectangle
* text [I] pointer to the text
* style [I]
*
* RETURNS
* No return value.
*
* NOTES
* Calls DrawStatusText32A() or DrawStatusText32W().
*/
VOID
WINAPI
DrawStatusText32AW
(
HDC32
hdc
,
LPRECT32
lprc
,
LPVOID
text
,
UINT32
style
)
{
if
(
VERSION_OsIsUnicode
())
DrawStatusText32W
(
hdc
,
lprc
,
(
LPCWSTR
)
text
,
style
);
DrawStatusText32A
(
hdc
,
lprc
,
(
LPCSTR
)
text
,
style
);
}
/***********************************************************************
* CreateStatusWindow32A [COMCTL32.6]
*
* Creates a status bar
*
* PARAMS
* style [I]
...
...
@@ -390,13 +424,36 @@ CreateStatusWindow32A (INT32 style, LPCSTR text, HWND32 parent, UINT32 wid)
HWND32
WINAPI
CreateStatusWindow32W
(
INT32
style
,
LPCWSTR
text
,
HWND32
parent
,
UINT32
wid
)
{
return
CreateWindow32W
(
(
LPCWSTR
)
STATUSCLASSNAME32W
,
text
,
style
,
return
CreateWindow32W
(
STATUSCLASSNAME32W
,
text
,
style
,
CW_USEDEFAULT32
,
CW_USEDEFAULT32
,
CW_USEDEFAULT32
,
CW_USEDEFAULT32
,
parent
,
wid
,
0
,
0
);
}
/***********************************************************************
* CreateStatusWindow32AW [COMCTL32.21] Creates a status bar control
*
* PARAMS
* style [I]
* text [I]
* parent [I] handle to the parent window
* wid [I] control id of the status bar
*
* RETURNS
* Success: handle to the control
* Failure: 0
*/
HWND32
WINAPI
CreateStatusWindow32AW
(
INT32
style
,
LPVOID
text
,
HWND32
parent
,
UINT32
wid
)
{
if
(
VERSION_OsIsUnicode
())
return
CreateStatusWindow32W
(
style
,
(
LPCWSTR
)
text
,
parent
,
wid
);
return
CreateStatusWindow32A
(
style
,
(
LPCSTR
)
text
,
parent
,
wid
);
}
/***********************************************************************
* CreateUpDownControl [COMCTL32.16] Creates an Up-Down control
*
...
...
@@ -509,8 +566,8 @@ InitCommonControlsEx (LPINITCOMMONCONTROLSEX lpInitCtrls)
/* advanced classes - not included in Win95 */
case
ICC_DATE_CLASSES
:
FIXME
(
commctrl
,
"No month calendar class implemented!
\n
"
);
FIXME
(
commctrl
,
"No date and time picker class implemented!
\n
"
);
MONTHCAL_Register
(
);
DATETIME_Register
(
);
break
;
case
ICC_USEREX_CLASSES
:
...
...
This diff is collapsed.
Click to expand it.
relay32/comctl32.spec
+
2
−
2
View file @
d040e9db
...
...
@@ -26,13 +26,13 @@ init ComCtl32LibMain
18 stub CreatePropertySheetPage
19 stub CreatePropertySheetPageA
20 stub CreatePropertySheetPageW
21 stdcall CreateStatusWindow(long str long long) CreateStatusWindow32A
21 stdcall CreateStatusWindow(long str long long) CreateStatusWindow32A
W
22 stdcall CreateStatusWindowW(long wstr long long) CreateStatusWindow32W
23 stdcall CreateToolbarEx(long long long long long long ptr long long long long long long) CreateToolbarEx
24 stub DestroyPropertySheetPage
25 stdcall DllGetVersion(ptr) COMCTL32_DllGetVersion
26 stub DllInstall
27 stdcall DrawStatusText(long ptr
s
tr long) DrawStatusText32A
27 stdcall DrawStatusText(long ptr
p
tr long) DrawStatusText32A
W
28 stdcall DrawStatusTextW(long ptr wstr long) DrawStatusText32W
29 stub FlatSB_EnableScrollBar
30 stub FlatSB_GetScrollInfo
...
...
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