Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Plan
Wiki
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
Lois Gomez
wine
Commits
b97d45e6
Commit
b97d45e6
authored
3 months ago
by
Alexandre Julliard
Browse files
Options
Downloads
Patches
Plain Diff
wineboot: Resize the wait dialog to accommodate the text size.
parent
f47610fa
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
programs/wineboot/Makefile.in
+1
-1
1 addition, 1 deletion
programs/wineboot/Makefile.in
programs/wineboot/wineboot.c
+23
-1
23 additions, 1 deletion
programs/wineboot/wineboot.c
with
24 additions
and
2 deletions
programs/wineboot/Makefile.in
+
1
−
1
View file @
b97d45e6
MODULE
=
wineboot.exe
IMPORTS
=
uuid advapi32 ws2_32 kernelbase
DELAYIMPORTS
=
shell32 shlwapi version user32 setupapi newdev
DELAYIMPORTS
=
shell32 shlwapi version user32
gdi32
setupapi newdev
EXTRADLLFLAGS
=
-mconsole
...
...
This diff is collapsed.
Click to expand it.
programs/wineboot/wineboot.c
+
23
−
1
View file @
b97d45e6
...
...
@@ -1474,6 +1474,28 @@ static BOOL start_services_process(void)
return
TRUE
;
}
static
void
set_wait_dialog_text
(
HWND
hwnd
,
HWND
text
,
const
WCHAR
*
string
)
{
RECT
win_rect
,
old_rect
,
new_rect
;
HDC
hdc
=
GetDC
(
text
);
GetClientRect
(
text
,
&
old_rect
);
new_rect
=
old_rect
;
SelectObject
(
hdc
,
(
HFONT
)
SendMessageW
(
text
,
WM_GETFONT
,
0
,
0
));
DrawTextW
(
hdc
,
string
,
-
1
,
&
new_rect
,
DT_CALCRECT
|
DT_EDITCONTROL
|
DT_WORDBREAK
|
DT_NOPREFIX
);
ReleaseDC
(
text
,
hdc
);
if
(
new_rect
.
bottom
>
old_rect
.
bottom
)
{
GetWindowRect
(
hwnd
,
&
win_rect
);
win_rect
.
bottom
+=
new_rect
.
bottom
-
old_rect
.
bottom
;
SetWindowPos
(
hwnd
,
0
,
0
,
0
,
win_rect
.
right
-
win_rect
.
left
,
win_rect
.
bottom
-
win_rect
.
top
,
SWP_NOMOVE
|
SWP_NOACTIVATE
|
SWP_NOZORDER
);
SetWindowPos
(
text
,
0
,
0
,
0
,
new_rect
.
right
,
new_rect
.
bottom
,
SWP_NOMOVE
|
SWP_NOACTIVATE
|
SWP_NOZORDER
);
}
SendMessageW
(
text
,
WM_SETTEXT
,
0
,
(
LPARAM
)
string
);
}
static
INT_PTR
CALLBACK
wait_dlgproc
(
HWND
hwnd
,
UINT
msg
,
WPARAM
wp
,
LPARAM
lp
)
{
switch
(
msg
)
...
...
@@ -1489,7 +1511,7 @@ static INT_PTR CALLBACK wait_dlgproc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp
len
=
lstrlenW
(
text
)
+
lstrlenW
(
name
)
+
1
;
buffer
=
malloc
(
len
*
sizeof
(
WCHAR
)
);
swprintf
(
buffer
,
len
,
text
,
name
);
SendDlgItemMessageW
(
hwnd
,
IDC_WAITTEXT
,
WM_SETTEXT
,
0
,
(
LPARAM
)
buffer
);
set_wait_dialog_text
(
hwnd
,
GetDlgItem
(
hwnd
,
IDC_WAITTEXT
),
buffer
);
free
(
buffer
);
}
break
;
...
...
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