r=mkaply, a=blizzard

Code from jkobal - fix dialog sizing problem and trap in dirpicker

widget/src/os2/nsDirPicker.cpp

@@ -208,10 +208,13 @@ struct DirPicker : public FS::ICallbacks
       if( aNode != pMetaNode)
       {
          PTREENODE pNode = DIR2REC(aNode);
-         if( pNode == pCurrRoot)
-            WinSendMsg( hwndCnr, CM_REMOVERECORD,
-                        MPFROMP(&pNode), MPFROM2SHORT(1, 0));
-         WinSendMsg( hwndCnr, CM_FREERECORD, MPFROMP(&pNode), MPFROMSHORT(1));
+         if( pNode)
+         {
+            if( pNode == pCurrRoot)
+               WinSendMsg( hwndCnr, CM_REMOVERECORD,
+                           MPFROMP(&pNode), MPFROM2SHORT(1, 0));
+            WinSendMsg( hwndCnr, CM_FREERECORD, MPFROMP(&pNode), MPFROMSHORT(1));
+         }
       }
    }
 
@@ -231,9 +234,12 @@ struct DirPicker : public FS::ICallbacks
          if( pNode != pCurrRoot->pDir)
          {
             PTREENODE pRecord = DIR2REC(pNode);
-            WinSendMsg( hwndCnr, CM_REMOVERECORD,
-                        MPFROMP(&pRecord), MPFROM2SHORT(1, 0));
-            pRecord->m.flRecordAttr &= ~CRA_FILTERED;
+            if( pRecord)
+            {
+               WinSendMsg( hwndCnr, CM_REMOVERECORD,
+                           MPFROMP(&pRecord), MPFROM2SHORT(1, 0));
+               pRecord->m.flRecordAttr &= ~CRA_FILTERED;
+            }
          }
 
          pNode = pNode->GetNextSibling();

widget/src/os2/nsFrameWindow.cpp

@@ -190,12 +190,19 @@ ULONG nsFrameWindow::GetFCFlags()
                 FCF_CLOSEBUTTON | FCF_NOBYTEALIGN |
                 (gModuleData.bIsDBCS ? FCF_DBE_APPSTAT : 0);
 
-  if (mBorderStyle == eBorderStyle_default) {
-    style |= FCF_DLGBORDER;
-  } else {
+  if (mWindowType == eWindowType_dialog) {
+    style |= FCF_DIALOGBOX;
+    if (mBorderStyle == eBorderStyle_default) {
+      style |= FCF_DLGBORDER;
+    } else {
+      style |= FCF_SIZEBORDER | FCF_MINMAX;
+    }
+  }
+  else {
     style |= FCF_SIZEBORDER | FCF_MINMAX;
   }
 
+
   if (mBorderStyle != eBorderStyle_default && mBorderStyle != eBorderStyle_all) {
     if (mBorderStyle == eBorderStyle_none || !(mBorderStyle & eBorderStyle_resizeh)) {
       style &= ~FCF_SIZEBORDER;

widget/src/os2/nsWidgetDefs.h

@@ -248,6 +248,10 @@ typedef struct _WZDROPXFER
 #define FCF_CLOSEBUTTON 0x04000000L
 #endif
 
+#ifndef FCF_DIALOGBOX
+#define FCF_DIALOGBOX   0x40000000L
+#endif
+
 #ifndef DRT_URL
 #define DRT_URL "UniformResourceLocator"
 #endif