react-native-update 10.34.3 → 10.34.5

package/harmony/pushy/src/main/cpp/lzma/CPP/Windows/CommonDialog.h

@@ -1,42 +1,22 @@
 // Windows/CommonDialog.h
 
-#ifndef ZIP7_INC_WINDOWS_COMMON_DIALOG_H
-#define ZIP7_INC_WINDOWS_COMMON_DIALOG_H
+#ifndef __WINDOWS_COMMON_DIALOG_H
+#define __WINDOWS_COMMON_DIALOG_H
 
 #include "../Common/MyString.h"
 
 namespace NWindows {
 
-struct CCommonDialogInfo
-{
-  /* (FilterIndex == -1) means no selected filter.
-       and (-1) also is reserved for unsupported custom filter.
-     if (FilterIndex >= 0), then FilterIndex is index of filter */
-  int FilterIndex;    // [in / out]
-  bool SaveMode;
- #ifdef UNDER_CE
-  bool OpenFolderMode;
- #endif
-  HWND hwndOwner;
-  // LPCWSTR lpstrInitialDir;
-  LPCWSTR lpstrTitle;
-  UString FilePath;   // [in / out]
-
-  CCommonDialogInfo()
-  {
-    FilterIndex = -1;
-    SaveMode = false;
-   #ifdef UNDER_CE
-    OpenFolderMode = false;
-   #endif
-    hwndOwner = NULL;
-    // lpstrInitialDir = NULL;
-    lpstrTitle = NULL;
-  }
-  
-  /* (filters) : 2 sequential vector strings (Description, Masks) represent each filter */
-  bool CommonDlg_BrowseForFile(LPCWSTR lpstrInitialDir, const UStringVector &filters);
-};
+bool MyGetOpenFileName(HWND hwnd, LPCWSTR title,
+    LPCWSTR initialDir,  // can be NULL, so dir prefix in filePath will be used
+    LPCWSTR filePath,    // full path
+    LPCWSTR filterDescription,  // like "All files (*.*)"
+    LPCWSTR filter,             // like "*.exe"
+    UString &resPath
+    #ifdef UNDER_CE
+    , bool openFolder = false
+    #endif
+);
 
 }
 

package/harmony/pushy/src/main/cpp/lzma/CPP/Windows/Control/ComboBox.cpp

@@ -43,10 +43,10 @@ LRESULT CComboBox::GetLBText(int index, UString &s)
   s.Empty();
   if (g_IsNT)
   {
-    LRESULT len = SendMsgW(CB_GETLBTEXTLEN, MY_int_TO_WPARAM(index), 0);
+    LRESULT len = SendMsgW(CB_GETLBTEXTLEN, index, 0);
     if (len == CB_ERR)
       return len;
-    LRESULT len2 = SendMsgW(CB_GETLBTEXT, MY_int_TO_WPARAM(index), (LPARAM)s.GetBuf((unsigned)len));
+    LRESULT len2 = SendMsgW(CB_GETLBTEXT, index, (LPARAM)s.GetBuf((unsigned)len));
     if (len2 == CB_ERR)
       return len;
     if (len > len2)
@@ -55,11 +55,11 @@ LRESULT CComboBox::GetLBText(int index, UString &s)
     return len;
   }
   AString sa;
-  const LRESULT len = GetLBText(index, sa);
+  LRESULT len = GetLBText(index, sa);
   if (len == CB_ERR)
     return len;
   s = GetUnicodeString(sa);
-  return (LRESULT)s.Len();
+  return s.Len();
 }
 #endif
 

package/harmony/pushy/src/main/cpp/lzma/CPP/Windows/Control/ComboBox.h

@@ -1,11 +1,11 @@
 // Windows/Control/ComboBox.h
 
-#ifndef ZIP7_INC_WINDOWS_CONTROL_COMBOBOX_H
-#define ZIP7_INC_WINDOWS_CONTROL_COMBOBOX_H
+#ifndef __WINDOWS_CONTROL_COMBOBOX_H
+#define __WINDOWS_CONTROL_COMBOBOX_H
 
 #include "../../Common/MyWindows.h"
 
-#include <CommCtrl.h>
+#include <commctrl.h>
 
 #include "../Window.h"
 
@@ -20,27 +20,19 @@ public:
   #ifndef _UNICODE
   LRESULT AddString(LPCWSTR s);
   #endif
-
-  /* If this parameter is -1, any current selection in the list is removed and the edit control is cleared.*/
-  LRESULT SetCurSel(int index) { return SendMsg(CB_SETCURSEL, MY_int_TO_WPARAM(index), 0); }
-  LRESULT SetCurSel(unsigned index) { return SendMsg(CB_SETCURSEL, index, 0); }
-
-  /* If no item is selected, it returns CB_ERR (-1) */
+  LRESULT SetCurSel(int index) { return SendMsg(CB_SETCURSEL, index, 0); }
   int GetCurSel() { return (int)SendMsg(CB_GETCURSEL, 0, 0); }
-  
-  /*  If an error occurs, it is CB_ERR (-1) */
   int GetCount() { return (int)SendMsg(CB_GETCOUNT, 0, 0); }
   
-  LRESULT GetLBTextLen(int index) { return SendMsg(CB_GETLBTEXTLEN, MY_int_TO_WPARAM(index), 0); }
-  LRESULT GetLBText(int index, LPTSTR s) { return SendMsg(CB_GETLBTEXT, MY_int_TO_WPARAM(index), (LPARAM)s); }
+  LRESULT GetLBTextLen(int index) { return SendMsg(CB_GETLBTEXTLEN, index, 0); }
+  LRESULT GetLBText(int index, LPTSTR s) { return SendMsg(CB_GETLBTEXT, index, (LPARAM)s); }
   LRESULT GetLBText(int index, CSysString &s);
   #ifndef _UNICODE
   LRESULT GetLBText(int index, UString &s);
   #endif
 
-  LRESULT SetItemData(int index, LPARAM lParam) { return SendMsg(CB_SETITEMDATA, MY_int_TO_WPARAM(index), lParam); }
-  LRESULT GetItemData(int index) { return SendMsg(CB_GETITEMDATA, MY_int_TO_WPARAM(index), 0); }
-  LRESULT GetItemData(unsigned index) { return SendMsg(CB_GETITEMDATA, index, 0); }
+  LRESULT SetItemData(int index, LPARAM lParam) { return SendMsg(CB_SETITEMDATA, index, lParam); }
+  LRESULT GetItemData(int index) { return SendMsg(CB_GETITEMDATA, index, 0); }
 
   LRESULT GetItemData_of_CurSel() { return GetItemData(GetCurSel()); }
 
@@ -54,18 +46,14 @@ class CComboBoxEx: public CComboBox
 public:
   bool SetUnicodeFormat(bool fUnicode) { return LRESULTToBool(SendMsg(CBEM_SETUNICODEFORMAT, BOOLToBool(fUnicode), 0)); }
 
-  /* Returns:
-      an INT value that represents the number of items remaining in the control.
-      If (index) is invalid, the message returns CB_ERR. */
-  LRESULT DeleteItem(int index) { return SendMsg(CBEM_DELETEITEM, MY_int_TO_WPARAM(index), 0); }
-
+  LRESULT DeleteItem(int index) { return SendMsg(CBEM_DELETEITEM, index, 0); }
   LRESULT InsertItem(COMBOBOXEXITEM *item) { return SendMsg(CBEM_INSERTITEM, 0, (LPARAM)item); }
   #ifndef _UNICODE
   LRESULT InsertItem(COMBOBOXEXITEMW *item) { return SendMsg(CBEM_INSERTITEMW, 0, (LPARAM)item); }
   #endif
 
   LRESULT SetItem(COMBOBOXEXITEM *item) { return SendMsg(CBEM_SETITEM, 0, (LPARAM)item); }
-  DWORD SetExtendedStyle(DWORD exMask, DWORD exStyle) { return (DWORD)SendMsg(CBEM_SETEXTENDEDSTYLE, exMask, (LPARAM)exStyle); }
+  DWORD SetExtendedStyle(DWORD exMask, DWORD exStyle) { return (DWORD)SendMsg(CBEM_SETEXTENDEDSTYLE, exMask, exStyle); }
   HWND GetEditControl() { return (HWND)SendMsg(CBEM_GETEDITCONTROL, 0, 0); }
   HIMAGELIST SetImageList(HIMAGELIST imageList) { return (HIMAGELIST)SendMsg(CBEM_SETIMAGELIST, 0, (LPARAM)imageList); }
 };

package/harmony/pushy/src/main/cpp/lzma/CPP/Windows/Control/CommandBar.h

@@ -1,7 +1,7 @@
 // Windows/Control/CommandBar.h
   
-#ifndef ZIP7_INC_WINDOWS_CONTROL_COMMANDBAR_H
-#define ZIP7_INC_WINDOWS_CONTROL_COMMANDBAR_H
+#ifndef __WINDOWS_CONTROL_COMMANDBAR_H
+#define __WINDOWS_CONTROL_COMMANDBAR_H
 
 #ifdef UNDER_CE
 
@@ -26,12 +26,12 @@ public:
   // Macros
   // void Destroy() { CommandBar_Destroy(_window); }
   // bool AddButtons(UINT numButtons, LPTBBUTTON buttons) { return BOOLToBool(SendMsg(TB_ADDBUTTONS, (WPARAM)numButtons, (LPARAM)buttons)); }
-  // bool InsertButton(unsigned iButton, LPTBBUTTON button) { return BOOLToBool(SendMsg(TB_INSERTBUTTON, (WPARAM)iButton, (LPARAM)button)); }
-  // BOOL AddToolTips(UINT numToolTips, LPTSTR toolTips) { return BOOLToBool(SendMsg(TB_SETTOOLTIPS, (WPARAM)numToolTips, (LPARAM)toolTips)); }
+  bool InsertButton(int iButton, LPTBBUTTON button) { return BOOLToBool(SendMsg(TB_INSERTBUTTON, (WPARAM)iButton, (LPARAM)button)); }
+  BOOL AddToolTips(UINT numToolTips, LPTSTR toolTips) { return BOOLToBool(SendMsg(TB_SETTOOLTIPS, (WPARAM)numToolTips, (LPARAM)toolTips)); }
   void AutoSize() { SendMsg(TB_AUTOSIZE, 0, 0); }
 
-  // bool AddAdornments(DWORD dwFlags) { return BOOLToBool(::CommandBar_AddAdornments(_window, dwFlags, 0)); }
-  // int AddBitmap(HINSTANCE hInst, int idBitmap, int iNumImages, int iImageWidth, int iImageHeight) { return ::CommandBar_AddBitmap(_window, hInst, idBitmap, iNumImages, iImageWidth, iImageHeight); }
+  bool AddAdornments(DWORD dwFlags) { return BOOLToBool(::CommandBar_AddAdornments(_window, dwFlags, 0)); }
+  int AddBitmap(HINSTANCE hInst, int idBitmap, int iNumImages, int iImageWidth, int iImageHeight) { return ::CommandBar_AddBitmap(_window, hInst, idBitmap, iNumImages, iImageWidth, iImageHeight); }
   bool DrawMenuBar(WORD iButton) { return BOOLToBool(::CommandBar_DrawMenuBar(_window, iButton)); }
   HMENU GetMenu(WORD iButton) { return ::CommandBar_GetMenu(_window, iButton); }
   int Height() { return CommandBar_Height(_window); }

package/harmony/pushy/src/main/cpp/lzma/CPP/Windows/Control/Dialog.cpp

@@ -2,8 +2,6 @@
 
 #include "StdAfx.h"
 
-// #include "../../Windows/DLL.h"
-
 #ifndef _UNICODE
 #include "../../Common/StringConvert.h"
 #endif
@@ -18,14 +16,7 @@ extern bool g_IsNT;
 namespace NWindows {
 namespace NControl {
 
-static
-#ifdef Z7_OLD_WIN_SDK
-  BOOL
-#else
-  INT_PTR
-#endif
-APIENTRY
-DialogProcedure(HWND dialogHWND, UINT message, WPARAM wParam, LPARAM lParam)
+static INT_PTR APIENTRY DialogProcedure(HWND dialogHWND, UINT message, WPARAM wParam, LPARAM lParam)
 {
   CWindow tempDialog(dialogHWND);
   if (message == WM_INITDIALOG)
@@ -35,14 +26,6 @@ DialogProcedure(HWND dialogHWND, UINT message, WPARAM wParam, LPARAM lParam)
     return FALSE;
   if (message == WM_INITDIALOG)
     dialog->Attach(dialogHWND);
-
-  /* MSDN: The dialog box procedure should return
-       TRUE  - if it processed the message
-       FALSE - if it did not process the message
-     If the dialog box procedure returns FALSE,
-     the dialog manager performs the default dialog operation in response to the message.
-  */
-
   try { return BoolToBOOL(dialog->OnMessage(message, wParam, lParam)); }
   catch(...) { return TRUE; }
 }
@@ -52,11 +35,10 @@ bool CDialog::OnMessage(UINT message, WPARAM wParam, LPARAM lParam)
   switch (message)
   {
     case WM_INITDIALOG: return OnInit();
-    case WM_COMMAND: return OnCommand(HIWORD(wParam), LOWORD(wParam), lParam);
+    case WM_COMMAND: return OnCommand(wParam, lParam);
     case WM_NOTIFY: return OnNotify((UINT)wParam, (LPNMHDR) lParam);
     case WM_TIMER: return OnTimer(wParam, lParam);
     case WM_SIZE: return OnSize(wParam, LOWORD(lParam), HIWORD(lParam));
-    case WM_DESTROY: return OnDestroy();
     case WM_HELP: OnHelp(); return true;
     /*
         OnHelp(
@@ -72,105 +54,48 @@ bool CDialog::OnMessage(UINT message, WPARAM wParam, LPARAM lParam)
   }
 }
 
-/*
-bool CDialog::OnCommand2(WPARAM wParam, LPARAM lParam)
+bool CDialog::OnCommand(WPARAM wParam, LPARAM lParam)
 {
   return OnCommand(HIWORD(wParam), LOWORD(wParam), lParam);
 }
-*/
 
-bool CDialog::OnCommand(unsigned code, unsigned itemID, LPARAM lParam)
+bool CDialog::OnCommand(int code, int itemID, LPARAM lParam)
 {
   if (code == BN_CLICKED)
     return OnButtonClicked(itemID, (HWND)lParam);
   return false;
 }
 
-bool CDialog::OnButtonClicked(unsigned buttonID, HWND /* buttonHWND */)
+bool CDialog::OnButtonClicked(int buttonID, HWND /* buttonHWND */)
 {
   switch (buttonID)
   {
     case IDOK: OnOK(); break;
     case IDCANCEL: OnCancel(); break;
     case IDCLOSE: OnClose(); break;
-    case IDCONTINUE: OnContinue(); break;
     case IDHELP: OnHelp(); break;
     default: return false;
   }
   return true;
 }
 
-#ifndef UNDER_CE
-/* in win2000/win98 : monitor functions are supported.
-   We need dynamic linking, if we want nt4/win95 support in program.
-   Even if we compile the code with low (WINVER) value, we still
-   want to use monitor functions. So we declare missing functions here */
-// #if (WINVER < 0x0500)
-#ifndef MONITOR_DEFAULTTOPRIMARY
-extern "C" {
-DECLARE_HANDLE(HMONITOR);
-#define MONITOR_DEFAULTTOPRIMARY    0x00000001
-typedef struct tagMONITORINFO
-{
-    DWORD   cbSize;
-    RECT    rcMonitor;
-    RECT    rcWork;
-    DWORD   dwFlags;
-} MONITORINFO, *LPMONITORINFO;
-WINUSERAPI HMONITOR WINAPI MonitorFromWindow(HWND hwnd, DWORD dwFlags);
-WINUSERAPI BOOL WINAPI GetMonitorInfoA(HMONITOR hMonitor, LPMONITORINFO lpmi);
-}
-#endif
-#endif
-
-static bool GetWorkAreaRect(RECT *rect, HWND hwnd)
+static bool GetWorkAreaRect(RECT *rect)
 {
-  if (hwnd)
-  {
-    #ifndef UNDER_CE
-    /* MonitorFromWindow() is supported in Win2000+
-       MonitorFromWindow() : retrieves a handle to the display monitor that has the
-         largest area of intersection with the bounding rectangle of a specified window.
-       dwFlags: Determines the function's return value if the window does not intersect any display monitor.
-         MONITOR_DEFAULTTONEAREST : Returns display that is nearest to the window.
-         MONITOR_DEFAULTTONULL    : Returns NULL.
-         MONITOR_DEFAULTTOPRIMARY : Returns the primary display monitor.
-    */
-    const HMONITOR hmon = MonitorFromWindow(hwnd, MONITOR_DEFAULTTOPRIMARY);
-    if (hmon)
-    {
-      MONITORINFO mi;
-      memset(&mi, 0, sizeof(mi));
-      mi.cbSize = sizeof(mi);
-      if (GetMonitorInfoA(hmon, &mi))
-      {
-        *rect = mi.rcWork;
-        return true;
-      }
-    }
-    #endif
-  }
-
-  /* Retrieves the size of the work area on the primary display monitor.
-     The work area is the portion of the screen not obscured
-     by the system taskbar or by application desktop toolbars.
-     Any DPI virtualization mode of the caller has no effect on this output. */
-
+  // use another function for multi-monitor.
   return BOOLToBool(::SystemParametersInfo(SPI_GETWORKAREA, 0, rect, 0));
 }
 
-
-bool IsDialogSizeOK(int xSize, int ySize, HWND hwnd)
+bool IsDialogSizeOK(int xSize, int ySize)
 {
   // it returns for system font. Real font uses another values
-  const LONG v = GetDialogBaseUnits();
-  const int x = LOWORD(v);
-  const int y = HIWORD(v);
+  LONG v = GetDialogBaseUnits();
+  int x = LOWORD(v);
+  int y = HIWORD(v);
 
   RECT rect;
-  GetWorkAreaRect(&rect, hwnd);
-  const int wx = RECT_SIZE_X(rect);
-  const int wy = RECT_SIZE_Y(rect);
+  GetWorkAreaRect(&rect);
+  int wx = RECT_SIZE_X(rect);
+  int wy = RECT_SIZE_Y(rect);
   return
     xSize / 4 * x <= wx &&
     ySize / 8 * y <= wy;
@@ -204,7 +129,7 @@ int CDialog::Units_To_Pixels_X(int units)
   return rect.right - rect.left;
 }
 
-bool CDialog::GetItemSizes(unsigned id, int &x, int &y)
+bool CDialog::GetItemSizes(int id, int &x, int &y)
 {
   RECT rect;
   if (!::GetWindowRect(GetItem(id), &rect))
@@ -214,182 +139,62 @@ bool CDialog::GetItemSizes(unsigned id, int &x, int &y)
   return true;
 }
 
-void CDialog::GetClientRectOfItem(unsigned id, RECT &rect)
+void CDialog::GetClientRectOfItem(int id, RECT &rect)
 {
   ::GetWindowRect(GetItem(id), &rect);
   ScreenToClient(&rect);
 }
 
-bool CDialog::MoveItem(unsigned id, int x, int y, int width, int height, bool repaint)
+bool CDialog::MoveItem(int id, int x, int y, int width, int height, bool repaint)
 {
   return BOOLToBool(::MoveWindow(GetItem(id), x, y, width, height, BoolToBOOL(repaint)));
 }
 
-
-/*
-typedef BOOL (WINAPI * Func_DwmGetWindowAttribute)(
-    HWND hwnd, DWORD dwAttribute, PVOID pvAttribute, DWORD cbAttribute);
-
-static bool GetWindowsRect_DWM(HWND hwnd, RECT *rect)
-{
-  // dll load and free is too slow : 300 calls in second.
-  NDLL::CLibrary dll;
-  if (!dll.Load(FTEXT("dwmapi.dll")))
-    return false;
-  Func_DwmGetWindowAttribute f = (Func_DwmGetWindowAttribute)dll.GetProc("DwmGetWindowAttribute" );
-  if (f)
-  {
-    #define MY__DWMWA_EXTENDED_FRAME_BOUNDS 9
-    // 30000 per second
-    RECT r;
-    if (f(hwnd, MY__DWMWA_EXTENDED_FRAME_BOUNDS, &r, sizeof(RECT)) == S_OK)
-    {
-      *rect = r;
-      return true;
-    }
-  }
-  return false;
-}
-*/
-
-
-static bool IsRect_Small_Inside_Big(const RECT &sm, const RECT &big)
-{
-  return sm.left   >= big.left
-      && sm.right  <= big.right
-      && sm.top    >= big.top
-      && sm.bottom <= big.bottom;
-}
-
-
-static bool AreRectsOverlapped(const RECT &r1, const RECT &r2)
-{
-  return r1.left   < r2.right
-      && r1.right  > r2.left
-      && r1.top    < r2.bottom
-      && r1.bottom > r2.top;
-}
-
-
-static bool AreRectsEqual(const RECT &r1, const RECT &r2)
-{
-  return r1.left   == r2.left
-      && r1.right  == r2.right
-      && r1.top    == r2.top
-      && r1.bottom == r2.bottom;
-}
-
-
 void CDialog::NormalizeSize(bool fullNormalize)
 {
   RECT workRect;
-  if (!GetWorkAreaRect(&workRect, *this))
-    return;
+  GetWorkAreaRect(&workRect);
+  int xSize = RECT_SIZE_X(workRect);
+  int ySize = RECT_SIZE_Y(workRect);
   RECT rect;
-  if (!GetWindowRect(&rect))
-    return;
-  int xs = RECT_SIZE_X(rect);
-  int ys = RECT_SIZE_Y(rect);
-
-  // we don't want to change size using workRect, if window is outside of WorkArea
-  if (!AreRectsOverlapped(rect, workRect))
-    return;
-
-  /* here rect and workRect are overlapped, but it can be false
-     overlapping of small shadow when window in another display. */
-
-  const int xsW = RECT_SIZE_X(workRect);
-  const int ysW = RECT_SIZE_Y(workRect);
-  if (xs <= xsW && ys <= ysW)
-    return; // size of window is OK
-  if (fullNormalize)
-  {
-    Show(SW_SHOWMAXIMIZED);
-    return;
-  }
-  int x = workRect.left;
-  int y = workRect.top;
-  if (xs < xsW)  x += (xsW - xs) / 2;  else xs = xsW;
-  if (ys < ysW)  y += (ysW - ys) / 2;  else ys = ysW;
-  Move(x, y, xs, ys, true);
-}
-
-
-void CDialog::NormalizePosition()
-{
-  RECT workRect;
-  if (!GetWorkAreaRect(&workRect, *this))
-    return;
-
-  RECT rect2 = workRect;
-  bool useWorkArea = true;
-  const HWND parentHWND = GetParent();
-
-  if (parentHWND)
+  GetWindowRect(&rect);
+  int xSize2 = RECT_SIZE_X(rect);
+  int ySize2 = RECT_SIZE_Y(rect);
+  bool needMove = (xSize2 > xSize || ySize2 > ySize);
+  if (xSize2 > xSize || (needMove && fullNormalize))
   {
-    RECT workRectParent;
-    if (!GetWorkAreaRect(&workRectParent, parentHWND))
-      return;
-
-    // if windows are in different monitors, we use only workArea of current window
-
-    if (AreRectsEqual(workRectParent, workRect))
-    {
-      // RECT rect3; if (GetWindowsRect_DWM(parentHWND, &rect3)) {}
-      CWindow wnd(parentHWND);
-      if (wnd.GetWindowRect(&rect2))
-      {
-        // it's same monitor. So we try to use parentHWND rect.
-        /* we don't want to change position, if parent window is not inside work area.
-           In Win10 : parent window rect is 8 pixels larger for each corner than window size for shadow.
-           In maximize mode : window is outside of workRect.
-           if parent window is inside workRect, we will use parent window instead of workRect */
-        if (IsRect_Small_Inside_Big(rect2, workRect))
-          useWorkArea = false;
-      }
-    }
+    rect.left = workRect.left;
+    rect.right = workRect.right;
+    xSize2 = xSize;
   }
-
-  RECT rect;
-  if (!GetWindowRect(&rect))
-    return;
-
-  if (useWorkArea)
+  if (ySize2 > ySize || (needMove && fullNormalize))
   {
-    // we don't want to move window, if it's already inside.
-    if (IsRect_Small_Inside_Big(rect, workRect))
-      return;
-    // we don't want to move window, if it's outside of workArea
-    if (!AreRectsOverlapped(rect, workRect))
-      return;
-    rect2 = workRect;
+    rect.top = workRect.top;
+    rect.bottom = workRect.bottom;
+    ySize2 = ySize;
   }
-
+  if (needMove)
   {
-    const int xs = RECT_SIZE_X(rect);
-    const int ys = RECT_SIZE_Y(rect);
-    const int xs2 = RECT_SIZE_X(rect2);
-    const int ys2 = RECT_SIZE_Y(rect2);
-    // we don't want to change position if parent is smaller.
-    if (xs <= xs2 && ys <= ys2)
-    {
-      const int x = rect2.left + (xs2 - xs) / 2;
-      const int y = rect2.top  + (ys2 - ys) / 2;
-
-      if (x != rect.left || y != rect.top)
-        Move(x, y, xs, ys, true);
-      // SetWindowPos(*this, HWND_TOP, x, y, 0, 0, SWP_NOSIZE);
-      return;
-    }
+    if (fullNormalize)
+      Show(SW_SHOWMAXIMIZED);
+    else
+      Move(rect.left, rect.top, xSize2, ySize2, true);
   }
 }
 
-
+void CDialog::NormalizePosition()
+{
+  RECT workRect, rect;
+  GetWorkAreaRect(&workRect);
+  GetWindowRect(&rect);
+  if (rect.bottom > workRect.bottom && rect.top > workRect.top)
+    Move(rect.left, workRect.top, RECT_SIZE_X(rect), RECT_SIZE_Y(rect), true);
+}
 
 bool CModelessDialog::Create(LPCTSTR templateName, HWND parentWindow)
 {
-  const HWND aHWND = CreateDialogParam(g_hInstance, templateName, parentWindow, DialogProcedure, (LPARAM)this);
-  if (!aHWND)
+  HWND aHWND = CreateDialogParam(g_hInstance, templateName, parentWindow, DialogProcedure, (LPARAM)this);
+  if (aHWND == 0)
     return false;
   Attach(aHWND);
   return true;