Review fix: self-assignment check

Prevent from freeing memory with CoTaskMemFree twice

src/java.desktop/windows/native/libawt/windows/awt_FileDialog.cpp

@@ -58,7 +58,13 @@ class CoTaskStringHolder {
 public:
     CoTaskStringHolder() : m_str(NULL) {}
 
+    CoTaskStringHolder(CoTaskStringHolder& other) {
+        m_str = other.m_str;
+        other.m_str = NULL;
+    }
+
     CoTaskStringHolder& operator=(CoTaskStringHolder& other) {
+        if (m_str == other.m_str) return *this;
         Clean();
         m_str = other.m_str;
         other.m_str = NULL;
@@ -84,8 +90,10 @@ private:
     LPTSTR m_str;
 
     void Clean() {
-        if (m_str)
+        if (m_str) {
             ::CoTaskMemFree(m_str);
+            m_str = NULL;
+        }
     }
 };
 
@@ -97,6 +105,7 @@ public:
     SmartHolderBase& operator=(const SmartHolderBase&) = delete;
 
     void Attach(T* other) {
+        if (m_pointer == other) return;
         Clean();
         m_pointer = other;
     }
@@ -116,8 +125,10 @@ protected:
     T* m_pointer;
 
     virtual void Clean() {
-        if (m_pointer)
+        if (m_pointer) {
             delete m_pointer;
+            m_pointer = NULL;
+        }
     }
 };
 
@@ -128,8 +139,10 @@ class SmartHolder : public SmartHolderBase<T> {
 template <typename T>
 class SmartHolder<T[]> : public SmartHolderBase<T> {
     virtual void Clean() {
-        if (m_pointer)
+        if (m_pointer) {
             delete [] m_pointer;
+            m_pointer = NULL;
+        }
     }
 };
 
@@ -525,10 +538,9 @@ private:
         HWND hdlg;
         OLE_HRT(pWindow->GetWindow(&hdlg));
 
-        HWND parent = ::GetParent(hdlg);
         jobject peer = data->peer;
-        env->CallVoidMethod(peer, AwtFileDialog::setHWndMID, (jlong)parent);
+        env->CallVoidMethod(peer, AwtFileDialog::setHWndMID, (jlong)hdlg);
-        ::SetProp(parent, ModalDialogPeerProp, reinterpret_cast<HANDLE>(peer));
+        ::SetProp(hdlg, ModalDialogPeerProp, reinterpret_cast<HANDLE>(peer));
 
         // fix for 4508670 - disable CS_SAVEBITS
         DWORD style = ::GetClassLong(hdlg, GCL_STYLE);
@@ -537,13 +549,13 @@ private:
         // set appropriate icon for parentless dialogs
         jobject awtParent = env->GetObjectField(peer, AwtFileDialog::parentID);
         if (awtParent == NULL) {
-            ::SendMessage(parent, WM_SETICON, (WPARAM)ICON_BIG,
+            ::SendMessage(hdlg, WM_SETICON, (WPARAM)ICON_BIG,
                           (LPARAM)AwtToolkit::GetInstance().GetAwtIcon());
         } else {
             AwtWindow *awtWindow = (AwtWindow *)JNI_GET_PDATA(awtParent);
-            ::SendMessage(parent, WM_SETICON, (WPARAM)ICON_BIG,
+            ::SendMessage(hdlg, WM_SETICON, (WPARAM)ICON_BIG,
                           (LPARAM)(awtWindow->GetHIcon()));
-            ::SendMessage(parent, WM_SETICON, (WPARAM)ICON_SMALL,
+            ::SendMessage(hdlg, WM_SETICON, (WPARAM)ICON_SMALL,
                           (LPARAM)(awtWindow->GetHIconSm()));
             env->DeleteLocalRef(awtParent);
         }
@@ -634,7 +646,12 @@ AwtFileDialog::Show(void *p)
               parentless dialogs we use NULL to show them in the taskbar,
               and for all other dialogs AwtToolkit's HWND is used.
             */
-        HWND hwndOwner = awtParent ? AwtToolkit::GetInstance().GetHWnd() : NULL;
+        /* [moklev] This fix does not needed anymore
+         * Tested on Windows 10 with example from JDK-4080029
+         * Revert the fix and set the proper parent to keep correct position of modal dialogs
+         */
+//        HWND hwndOwner = awtParent ? AwtToolkit::GetInstance().GetHWnd() : NULL;
+        HWND hwndOwner = awtParent ? awtParent->GetHWnd() : NULL;
 
         if (title == NULL || env->GetStringLength(title)==0) {
             title = JNU_NewStringPlatform(env, L" ");
@@ -725,16 +742,23 @@ AwtFileDialog::Show(void *p)
             OLE_HRT(pfd->SetFileTypes(s_fileFilterCount, s_fileFilterSpec));
             OLE_HRT(pfd->SetFileTypeIndex(1));
 
-            IShellItemPtr directoryItem;
+            {
-            OLE_NEXT_TRY
+                IShellItemPtr directoryItem;
-            OLE_HRT(CreateShellItem(directoryBuffer, directoryItem));
+                OLE_TRY
-            OLE_HRT(pfd->SetFolder(directoryItem));
+                OLE_HRT(CreateShellItem(directoryBuffer, directoryItem));
-            OLE_CATCH
+                OLE_HRT(pfd->SetFolder(directoryItem));
-
+                OLE_CATCH
-            CoTaskStringHolder shortName = GetShortName(fileBuffer);
-            if (shortName) {
-                OLE_HRT(pfd->SetFileName(shortName));
             }
+
+            {
+                CoTaskStringHolder shortName = GetShortName(fileBuffer);
+                if (shortName) {
+                    OLE_TRY
+                    OLE_HRT(pfd->SetFileName(shortName));
+                    OLE_CATCH
+                }
+            }
+
             OLE_CATCH
         }
 
@@ -795,7 +819,7 @@ AwtFileDialog::Show(void *p)
 
         AwtDialog::ModalActivateNextWindow(NULL, target, peer);
 
-        if (useCommonItemDialog) {
+        if (!useCommonItemDialog) {
             VERIFY(::SetCurrentDirectory(currentDirectory));
         }