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
b615656f
Commit
b615656f
authored
Dec 22, 2009
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
user32: Get rid of the 16-bit dialog heap.
Edit controls don't allocate memory on the 16-bit heap anyway.
parent
009badeb
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
0 additions
and
25 deletions
+0
-25
controls.h
dlls/user32/controls.h
+0
-1
defdlg.c
dlls/user32/defdlg.c
+0
-7
dialog.c
dlls/user32/dialog.c
+0
-1
dialog16.c
dlls/user32/dialog16.c
+0
-16
No files found.
dlls/user32/controls.h
View file @
b615656f
...
@@ -231,7 +231,6 @@ typedef struct tagDIALOGINFO
...
@@ -231,7 +231,6 @@ typedef struct tagDIALOGINFO
UINT
yBaseUnit
;
UINT
yBaseUnit
;
INT
idResult
;
/* EndDialog() result / default pushbutton ID */
INT
idResult
;
/* EndDialog() result / default pushbutton ID */
UINT
flags
;
/* EndDialog() called for this dialog */
UINT
flags
;
/* EndDialog() called for this dialog */
HGLOBAL16
hDialogHeap
;
}
DIALOGINFO
;
}
DIALOGINFO
;
#define DF_END 0x0001
#define DF_END 0x0001
...
...
dlls/user32/defdlg.c
View file @
b615656f
...
@@ -234,12 +234,6 @@ static LRESULT DEFDLG_Proc( HWND hwnd, UINT msg, WPARAM wParam,
...
@@ -234,12 +234,6 @@ static LRESULT DEFDLG_Proc( HWND hwnd, UINT msg, WPARAM wParam,
{
{
WND
*
wndPtr
;
WND
*
wndPtr
;
/* Free dialog heap (if created) */
if
(
dlgInfo
->
hDialogHeap
)
{
GlobalUnlock16
(
dlgInfo
->
hDialogHeap
);
GlobalFree16
(
dlgInfo
->
hDialogHeap
);
}
if
(
dlgInfo
->
hUserFont
)
DeleteObject
(
dlgInfo
->
hUserFont
);
if
(
dlgInfo
->
hUserFont
)
DeleteObject
(
dlgInfo
->
hUserFont
);
if
(
dlgInfo
->
hMenu
)
DestroyMenu
(
dlgInfo
->
hMenu
);
if
(
dlgInfo
->
hMenu
)
DestroyMenu
(
dlgInfo
->
hMenu
);
HeapFree
(
GetProcessHeap
(),
0
,
dlgInfo
);
HeapFree
(
GetProcessHeap
(),
0
,
dlgInfo
);
...
@@ -347,7 +341,6 @@ DIALOGINFO *DIALOG_get_info( HWND hwnd, BOOL create )
...
@@ -347,7 +341,6 @@ DIALOGINFO *DIALOG_get_info( HWND hwnd, BOOL create )
dlgInfo
->
yBaseUnit
=
0
;
dlgInfo
->
yBaseUnit
=
0
;
dlgInfo
->
idResult
=
0
;
dlgInfo
->
idResult
=
0
;
dlgInfo
->
flags
=
0
;
dlgInfo
->
flags
=
0
;
dlgInfo
->
hDialogHeap
=
0
;
wndPtr
->
dlgInfo
=
dlgInfo
;
wndPtr
->
dlgInfo
=
dlgInfo
;
wndPtr
->
flags
|=
WIN_ISDIALOG
;
wndPtr
->
flags
|=
WIN_ISDIALOG
;
}
}
...
...
dlls/user32/dialog.c
View file @
b615656f
...
@@ -674,7 +674,6 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate,
...
@@ -674,7 +674,6 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate,
dlgInfo
->
yBaseUnit
=
yBaseUnit
;
dlgInfo
->
yBaseUnit
=
yBaseUnit
;
dlgInfo
->
idResult
=
IDOK
;
dlgInfo
->
idResult
=
IDOK
;
dlgInfo
->
flags
=
flags
;
dlgInfo
->
flags
=
flags
;
dlgInfo
->
hDialogHeap
=
0
;
if
(
template
.
helpId
)
SetWindowContextHelpId
(
hwnd
,
template
.
helpId
);
if
(
template
.
helpId
)
SetWindowContextHelpId
(
hwnd
,
template
.
helpId
);
...
...
dlls/user32/dialog16.c
View file @
b615656f
...
@@ -151,22 +151,6 @@ static BOOL DIALOG_CreateControls16( HWND hwnd, LPCSTR template,
...
@@ -151,22 +151,6 @@ static BOOL DIALOG_CreateControls16( HWND hwnd, LPCSTR template,
SEGPTR
segptr
;
SEGPTR
segptr
;
template
=
DIALOG_GetControl16
(
template
,
&
info
);
template
=
DIALOG_GetControl16
(
template
,
&
info
);
if
(
HIWORD
(
info
.
className
)
&&
!
strcmp
(
info
.
className
,
"EDIT"
)
&&
!
(
GetWindowLongW
(
hwnd
,
GWL_STYLE
)
&
DS_LOCALEDIT
))
{
if
(
!
dlgInfo
->
hDialogHeap
)
{
dlgInfo
->
hDialogHeap
=
GlobalAlloc16
(
GMEM_FIXED
,
0x10000
);
if
(
!
dlgInfo
->
hDialogHeap
)
{
ERR
(
"Insufficient memory to create heap for edit control
\n
"
);
continue
;
}
LocalInit16
(
dlgInfo
->
hDialogHeap
,
0
,
0xffff
);
}
instance
=
dlgInfo
->
hDialogHeap
;
}
segptr
=
MapLS
(
info
.
data
);
segptr
=
MapLS
(
info
.
data
);
hwndCtrl
=
WIN_Handle32
(
CreateWindowEx16
(
WS_EX_NOPARENTNOTIFY
,
hwndCtrl
=
WIN_Handle32
(
CreateWindowEx16
(
WS_EX_NOPARENTNOTIFY
,
info
.
className
,
info
.
windowName
,
info
.
className
,
info
.
windowName
,
...
...
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