mirror of
https://github.com/reactos/reactos.git
synced 2024-07-01 18:24:24 +00:00
Autosyncing with Wine HEAD
svn path=/trunk/; revision=29054
This commit is contained in:
parent
fd7b9ad55e
commit
c287f519bf
|
@ -1,4 +1,6 @@
|
|||
<module name="comctl32" type="win32dll" baseaddress="${BASEADDRESS_COMCTL32}" installbase="system32" installname="comctl32.dll" allowwarnings="true" entrypoint="0">
|
||||
<?xml version="1.0"?>
|
||||
<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
|
||||
<module name="comctl32" type="win32dll" baseaddress="${BASEADDRESS_COMCTL32}" installbase="system32" installname="comctl32.dll" allowwarnings="true">
|
||||
<autoregister infsection="OleControlDlls" type="DllInstall" />
|
||||
<importlibrary definition="comctl32.spec.def" />
|
||||
<include base="comctl32">.</include>
|
||||
|
|
|
@ -31,7 +31,7 @@ Index: propsheet.c
|
|||
===================================================================
|
||||
--- propsheet.c (revision 25766)
|
||||
+++ propsheet.c (working copy)
|
||||
@@ -2431,6 +2431,28 @@
|
||||
@@ -2434,6 +2434,28 @@
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
|
@ -60,7 +60,7 @@ Index: propsheet.c
|
|||
/******************************************************************************
|
||||
* PROPSHEET_SetWizButtons
|
||||
*
|
||||
@@ -2453,17 +2475,6 @@
|
||||
@@ -2456,17 +2478,6 @@
|
||||
EnableWindow(hwndNext, FALSE);
|
||||
EnableWindow(hwndFinish, FALSE);
|
||||
|
||||
|
@ -78,7 +78,7 @@ Index: propsheet.c
|
|||
if (dwFlags & PSWIZB_BACK)
|
||||
EnableWindow(hwndBack, TRUE);
|
||||
|
||||
@@ -2493,6 +2504,32 @@
|
||||
@@ -2496,6 +2507,32 @@
|
||||
}
|
||||
else if (!(dwFlags & PSWIZB_DISABLEDFINISH))
|
||||
EnableWindow(hwndFinish, TRUE);
|
||||
|
|
|
@ -402,7 +402,7 @@ static void PROPSHEET_CollectSheetInfoW(LPCPROPSHEETHEADERW lppsh,
|
|||
*/
|
||||
static BOOL PROPSHEET_CollectPageInfo(LPCPROPSHEETPAGEW lppsp,
|
||||
PropSheetInfo * psInfo,
|
||||
int index)
|
||||
int index, BOOL resize)
|
||||
{
|
||||
const DLGTEMPLATE* pTemplate;
|
||||
const WORD* p;
|
||||
|
@ -503,11 +503,14 @@ static BOOL PROPSHEET_CollectPageInfo(LPCPROPSHEETPAGEW lppsp,
|
|||
}
|
||||
|
||||
/* remember the largest width and height */
|
||||
if (width > psInfo->width)
|
||||
psInfo->width = width;
|
||||
if (resize)
|
||||
{
|
||||
if (width > psInfo->width)
|
||||
psInfo->width = width;
|
||||
|
||||
if (height > psInfo->height)
|
||||
psInfo->height = height;
|
||||
if (height > psInfo->height)
|
||||
psInfo->height = height;
|
||||
}
|
||||
|
||||
/* menu */
|
||||
switch ((WORD)*p)
|
||||
|
@ -2284,7 +2287,7 @@ static BOOL PROPSHEET_AddPage(HWND hwndDlg,
|
|||
return FALSE;
|
||||
|
||||
psInfo->proppage = ppi;
|
||||
if (!PROPSHEET_CollectPageInfo(ppsp, psInfo, psInfo->nPages))
|
||||
if (!PROPSHEET_CollectPageInfo(ppsp, psInfo, psInfo->nPages, FALSE))
|
||||
return FALSE;
|
||||
|
||||
psInfo->proppage[psInfo->nPages].hpage = hpage;
|
||||
|
@ -2877,7 +2880,7 @@ INT_PTR WINAPI PropertySheetA(LPCPROPSHEETHEADERA lppsh)
|
|||
}
|
||||
|
||||
if (!PROPSHEET_CollectPageInfo((LPCPROPSHEETPAGEW)psInfo->proppage[n].hpage,
|
||||
psInfo, n))
|
||||
psInfo, n, TRUE))
|
||||
{
|
||||
if (psInfo->usePropPage)
|
||||
DestroyPropertySheetPage(psInfo->proppage[n].hpage);
|
||||
|
@ -2920,7 +2923,7 @@ INT_PTR WINAPI PropertySheetW(LPCPROPSHEETHEADERW lppsh)
|
|||
}
|
||||
|
||||
if (!PROPSHEET_CollectPageInfo((LPCPROPSHEETPAGEW)psInfo->proppage[n].hpage,
|
||||
psInfo, n))
|
||||
psInfo, n, TRUE))
|
||||
{
|
||||
if (psInfo->usePropPage)
|
||||
DestroyPropertySheetPage(psInfo->proppage[n].hpage);
|
||||
|
|
|
@ -3801,6 +3801,7 @@ TREEVIEW_EndEditLabelNow(TREEVIEW_INFO *infoPtr, BOOL bCancel)
|
|||
if (ptr == NULL)
|
||||
{
|
||||
ERR("OutOfMemory, cannot allocate space for label\n");
|
||||
if(newText != tmpText) Free(newText);
|
||||
DestroyWindow(infoPtr->hwndEdit);
|
||||
infoPtr->hwndEdit = 0;
|
||||
return FALSE;
|
||||
|
|
Loading…
Reference in a new issue