Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 03:45:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Continuing OS/2 wizard work - not part of build

Browse Source
This commit is contained in:
mkaply%us.ibm.com 2002-09-17 20:44:06 +00:00
parent ef494ae99c
commit bcdc13da7b
6 changed files with 76 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

115
xpinstall/wizard/os2/setup/dialogs.c
View File

@ -298,7 +298,6 @@ MRESULT EXPENTRY DirDialogProc( HWND hwndDlg, ULONG msg, MPARAM mp1, MPARAM mp2)
{
SWP swpDlgOrig;
SWP swpDlgNew;
SWP swpFileST;
SWP swpDirST;
SWP swpDirLB;
SWP swpDriveST;
@ -306,7 +305,6 @@ MRESULT EXPENTRY DirDialogProc( HWND hwndDlg, ULONG msg, MPARAM mp1, MPARAM mp2)
SWP swpDriveCBEF;
SWP swpOK;
SWP swpCancel;
HWND hwndFileST;
HWND hwndDirST;
HWND hwndDirLB;
HWND hwndDriveST;
@ -314,10 +312,12 @@ MRESULT EXPENTRY DirDialogProc( HWND hwndDlg, ULONG msg, MPARAM mp1, MPARAM mp2)
HWND hwndOK;
HWND hwndCancel;
HWND hwndEF;
HENUM henum;
HWND hwndNext;
ULONG ulCurY, ulCurX;
WinSetPresParam(hwndDlg, PP_FONTNAMESIZE,
strlen(sgInstallGui.szDefinedFont)+1, sgInstallGui.szDefinedFont);
hwndFileST = WinWindowFromID(hwndDlg, DID_FILENAME_TXT);
WinSetPresParam(hwndDlg, PP_FONTNAMESIZE,
strlen(sgInstallGui.szDefinedFont)+1, sgInstallGui.szDefinedFont);
hwndDirST = WinWindowFromID(hwndDlg, DID_DIRECTORY_TXT);
hwndDirLB = WinWindowFromID(hwndDlg, DID_DIRECTORY_LB);
hwndDriveST = WinWindowFromID(hwndDlg, DID_DRIVE_TXT);
@ -325,68 +325,65 @@ MRESULT EXPENTRY DirDialogProc( HWND hwndDlg, ULONG msg, MPARAM mp1, MPARAM mp2)
hwndOK = WinWindowFromID(hwndDlg, DID_OK);
hwndCancel = WinWindowFromID(hwndDlg, DID_CANCEL);
#define SPACING 10
// Reposition drives combobox
ulCurY = SPACING;
ulCurX = SPACING + gSystemInfo.lDlgFrameX;
WinQueryWindowPos(hwndOK, &swpOK);
WinSetWindowPos(hwndOK, 0, ulCurX, ulCurY, 0, 0, SWP_MOVE);
ulCurY += swpOK.cy + SPACING;
WinQueryWindowPos(hwndCancel, &swpCancel);
WinSetWindowPos(hwndCancel, 0, ulCurX+swpOK.cx+10, SPACING, 0, 0, SWP_MOVE);
WinQueryWindowPos(hwndDirLB, &swpDirLB);
WinSetWindowPos(hwndDirLB, 0, ulCurX, ulCurY, 0, 0, SWP_MOVE);
ulCurY += swpDirLB.cy + SPACING;
WinQueryWindowPos(hwndDirST, &swpDirST);
WinSetWindowPos(hwndDirST, 0, ulCurX, ulCurY, 0, 0, SWP_MOVE);
ulCurY += swpDirST.cy + SPACING;
WinQueryWindowPos(hwndDriveCB, &swpDriveCB);
WinQueryWindowPos(WinWindowFromID(hwndDriveCB, CBID_EDIT), &swpDriveCBEF);
WinSetWindowPos(hwndDriveCB, 0, swpDriveCB.x,
swpOK.y+swpOK.cy+swpDriveCBEF.cy-swpDriveCB.cy+20,
swpCancel.x+swpCancel.cx-swpOK.x, swpDriveCB.cy, SWP_MOVE | SWP_SIZE);
// Reposition drives text
WinQueryWindowPos(hwndDriveCB, &swpDriveCB);
WinSetWindowPos(hwndDriveCB, 0, ulCurX, ulCurY-(swpDriveCB.cy-swpDriveCBEF.cy)+5,
swpDirLB.cx,
swpDriveCB.cy,
SWP_SIZE | SWP_MOVE);
ulCurY += swpDriveCBEF.cy + SPACING;
WinQueryWindowPos(hwndDriveST, &swpDriveST);
WinSetWindowPos(hwndDriveST, 0, swpDriveST.x, swpDriveCB.y+swpDriveCB.cy+5,
swpDriveST.cx*2, swpDriveST.cy, SWP_MOVE | SWP_SIZE);
// Reposition directories listbox
WinQueryWindowPos(hwndDriveST, &swpDriveST);
WinQueryWindowPos(hwndDirLB, &swpDirLB);
WinSetWindowPos(hwndDirLB, 0, swpDirLB.x, swpDriveST.y+swpDriveST.cy+10,
swpDirLB.cx*2, swpDirLB.cy, SWP_MOVE | SWP_SIZE);
// Reposition file text
WinQueryWindowPos(hwndDirLB, &swpDirLB);
WinQueryWindowPos(hwndFileST, &swpFileST);
WinSetWindowPos(hwndFileST, 0, swpFileST.x, swpDirLB.y+swpDirLB.cy+5,
swpFileST.cx*2, swpFileST.cy, SWP_MOVE | SWP_SIZE);
// Begin repositioning dialog
WinQueryWindowPos(hwndDlg, &swpDlgOrig);
swpDlgNew = swpDlgOrig;
swpDlgNew.cy -= swpFileST.y;
// Reposition directory text
WinQueryWindowPos(hwndFileST, &swpFileST);
WinQueryWindowPos(hwndDirST, &swpDirST);
WinSetWindowPos(hwndDirST, 0, swpDirST.x, swpFileST.y+swpFileST.cy+5,
swpDirST.cx*2, swpDirST.cy, SWP_MOVE | SWP_SIZE);
// Size main dialog
swpDlgNew.cy += (swpFileST.y+swpFileST.cy+5);
swpDlgNew.cx = (swpDirLB.x*2)+swpDirLB.cx;
swpDlgNew.x += (swpDlgOrig.cx-swpDlgNew.cx)/2;
swpDlgNew.y += (swpDlgOrig.cy-swpDlgNew.cy)/2;
WinSetWindowPos(hwndDlg, 0, swpDlgNew.x, swpDlgNew.y,
swpDlgNew.cx, swpDlgNew.cy,
SWP_SIZE | SWP_MOVE);
WinSetWindowPos(hwndDriveST, 0, ulCurX, ulCurY, 0, 0, SWP_MOVE);
ulCurY += swpDriveST.cy + SPACING;
// Create an entryfield
hwndEF = WinCreateWindow(hwndDlg, WC_ENTRYFIELD, "", ES_MARGIN | WS_VISIBLE | ES_AUTOSCROLL,
ulCurX+3, ulCurY+3,
swpDirLB.cx-6, swpDriveCBEF.cy, hwndDlg, HWND_TOP, 777, NULL, NULL);
WinSendMsg(hwndEF, EM_SETTEXTLIMIT, CCHMAXPATH, 0);
ulCurY += swpDriveCBEF.cy + SPACING;
// Hide unused stuff
WinShowWindow(WinWindowFromID(hwndDlg,DID_FILES_LB), FALSE);
WinShowWindow(WinWindowFromID(hwndDlg,DID_FILES_TXT), FALSE);
WinShowWindow(WinWindowFromID(hwndDlg,DID_FILTER_CB), FALSE);
WinShowWindow(WinWindowFromID(hwndDlg,DID_FILTER_TXT), FALSE);
WinShowWindow(WinWindowFromID(hwndDlg, DID_FILENAME_ED), FALSE);
WinShowWindow(WinWindowFromID(hwndDlg, 0x503D), FALSE);
// Create an entryfield
hwndEF = WinCreateWindow(hwndDlg, WC_ENTRYFIELD, "", ES_MARGIN | WS_VISIBLE, swpFileST.x, swpFileST.y,
swpFileST.cx, swpFileST.cy, hwndDlg, HWND_TOP, 777, NULL, NULL);
WinSendMsg(hwndEF, EM_SETTEXTLIMIT, MAX_BUF, 0);
WinShowWindow(hwndFileST, FALSE);
henum = WinBeginEnumWindows(hwndDlg);
while ((hwndNext = WinGetNextWindow(henum)) != NULLHANDLE)
{
USHORT usID = WinQueryWindowUShort(hwndNext, QWS_ID);
if (usID != DID_DIRECTORY_TXT &&
usID != DID_DIRECTORY_LB &&
usID != DID_DRIVE_TXT &&
usID != DID_DRIVE_CB &&
usID != DID_OK &&
usID != DID_CANCEL &&
usID != FID_TITLEBAR &&
usID != FID_SYSMENU &&
usID != 777 &&
usID != FID_MINMAX)
{
WinShowWindow(hwndNext, FALSE);
}
}
WinSetWindowPos(hwndDlg,
HWND_TOP,
(gSystemInfo.lScreenX/2)-((swpDirLB.cx+2*SPACING+2*gSystemInfo.lDlgFrameX)/2),
(gSystemInfo.lScreenY/2)-((ulCurY+2*gSystemInfo.lDlgFrameY+gSystemInfo.lTitleBarY)/2),
swpDirLB.cx+2*SPACING+2*gSystemInfo.lDlgFrameX,
ulCurY+2*gSystemInfo.lDlgFrameY+gSystemInfo.lTitleBarY,
SWP_MOVE | SWP_SIZE);
}
break;
case WM_CONTROL:
@ -811,7 +808,7 @@ MRESULT EXPENTRY DlgProcSetupType(HWND hDlg, ULONG msg, MPARAM mp1, MPARAM mp2)
sprintf(szBuf, szECreateDirectory, szBufTemp);
WinMessageBox(HWND_DESKTOP, hDlg, szBuf, "", 0, MB_OK | MB_ERROR);
break;
return (MRESULT)TRUE;
}
if(*sgProduct.szSubPath != '\0')

5
xpinstall/wizard/os2/setup/extra.c
View File

@ -1472,7 +1472,8 @@ void RemoveBackSlash(PSZ szInput)
{
ULONG ulInputLen;
BOOL bDone;
char *ptrChar = NULL;
/* Workaround for compiler optimization bug */
volatile char *ptrChar = NULL;
if(szInput)
{
@ -4565,8 +4566,6 @@ void GetAlternateArchiveSearchPath(LPSTR lpszCmdLine)
BOOL CheckForProcess(LPSTR szProcessName, DWORD dwProcessName)
{
#ifdef OLDCODE /* @MAK need to write */
#endif
}
int PreCheckInstance(char *szSection, char *szIniFile)

3
xpinstall/wizard/os2/setup/setup.c
View File

@ -189,5 +189,8 @@ int main(int argc, char *argv[], char *envp[])
WinDestroyMsgQueue( hmq );
WinTerminate( hab );
/* Unset LIBPATHSTRICT just in case it didn't get unset elsewhere */
DosSetExtLIBPATH("F", LIBPATHSTRICT);
}

6
xpinstall/wizard/os2/setup/winforos2.h
View File

@ -38,3 +38,9 @@ typedef CHAR TCHAR;
#include "nsINIParser.h"
#ifndef LIBPATHSTRICT
#define LIBPATHSTRICT 3
#endif

12
xpinstall/wizard/os2/setup/xpi.c
View File

@ -63,6 +63,7 @@ HRESULT InitializeXPIStub()
char szBuf[MAX_BUF];
char szXPIStubFile[MAX_BUF];
char szEDosQueryProcAddr[MAX_BUF];
APIRET rc;
hXPIStubInst = NULL;
@ -76,7 +77,10 @@ HRESULT InitializeXPIStub()
strcat(szBuf, "bin");
chdir(szBuf);
/* Add it to LIBPATH just in case */
/* Set LIBPATHSTRICT */
DosSetExtLIBPATH("T", LIBPATHSTRICT);
/* Add it to LIBPATH */
DosSetExtLIBPATH(szBuf, BEGIN_LIBPATH);
/* build full path to xpistub.dll */
@ -88,7 +92,7 @@ HRESULT InitializeXPIStub()
return(2);
/* load xpistub.dll */
if(DosLoadModule(NULL, 0, szXPIStubFile, &hXPIStubInst) != NO_ERROR)
if (DosLoadModule(NULL, 0, szXPIStubFile, &hXPIStubInst) != NO_ERROR)
{
sprintf(szBuf, szEDllLoad, szXPIStubFile);
PrintError(szBuf, ERROR_CODE_SHOW);
@ -209,6 +213,9 @@ HRESULT SmartUpdateJars()
}
hrResult = pfnXpiInit(szBuf, FILE_INSTALL_LOG, cbXPIProgress);
/* Unset LIBPATHSTRICT */
DosSetExtLIBPATH("F", LIBPATHSTRICT);
ShowMessage(szMsgSmartUpdateStart, FALSE);
InitProgressDlg();
GetTotalArchivesToInstall();
@ -396,7 +403,6 @@ static void
UpdateGaugeArchiveProgressBar(unsigned value)
{
if(sgProduct.ulMode != SILENT) {
printf("value=%d\n");
WinSendMsg(WinWindowFromID(dlgInfo.hWndDlg, IDC_GAUGE_ARCHIVE), SLM_SETSLIDERINFO,
MPFROM2SHORT(SMA_SLIDERARMPOSITION, SMA_INCREMENTVALUE),
(MPARAM)(value-1));

1
xpinstall/wizard/os2/setup/xpnetHook.cpp
View File

@ -1359,7 +1359,6 @@ UpdateGaugeFileProgressBar(double value)
if(sgProduct.ulMode != SILENT)
{
ULONG ulPercentage = 100*value/100;
printf("ulp = %d\n", ulPercentage);
WinSendMsg(WinWindowFromID(dlgInfo.hWndDlg, IDC_GAUGE_FILE), SLM_SETSLIDERINFO,
MPFROM2SHORT(SMA_SLIDERARMPOSITION, SMA_INCREMENTVALUE),
(MPARAM)(ulPercentage-1));