[PATCH 3/3] comdlg32: Use ReleaseStgMedium() from ole32.

[Nikolay Sivov]

From: Nikolay Sivov <[e-mail]>

Signed-off-by: Nikolay Sivov <[e-mail]>
---
 dlls/comdlg32/filedlg.c | 25 +++----------------------
 1 file changed, 3 insertions(+), 22 deletions(-)

diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c
index eb1b266da8d..286b9f4581e 100644
--- a/dlls/comdlg32/filedlg.c
+++ b/dlls/comdlg32/filedlg.c
@@ -198,7 +198,6 @@ LPITEMIDLIST  GetParentPidl(LPITEMIDLIST pidl);
 static LPITEMIDLIST GetPidlFromName(IShellFolder *psf,LPWSTR lpcstrFileName);
 static BOOL IsPidlFolder (LPSHELLFOLDER psf, LPCITEMIDLIST pidl);
 static UINT GetNumSelected( IDataObject *doSelected );
-static void COMCTL32_ReleaseStgMedium(STGMEDIUM medium);
 
 static INT_PTR CALLBACK FileOpenDlgProc95(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
 static INT_PTR FILEDLG95_HandleCustomDialogMessages(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
@@ -3879,7 +3878,7 @@ void FILEDLG95_FILENAME_FillFromSelection (HWND hwnd)
 
 ret:
     free(lpstrAllFiles);
-    COMCTL32_ReleaseStgMedium(medium);
+    ReleaseStgMedium(&medium);
 }
 
 /***********************************************************************
@@ -3912,24 +3911,6 @@ static int FILEDLG95_FILENAME_GetFileNames (HWND hwnd, LPWSTR * lpstrFileList, U
  * DATAOBJECT Helper functions
  */
 
-/***********************************************************************
- * COMCTL32_ReleaseStgMedium
- *
- * like ReleaseStgMedium from ole32
- */
-static void COMCTL32_ReleaseStgMedium (STGMEDIUM medium)
-{
-      if(medium.pUnkForRelease)
-      {
-        IUnknown_Release(medium.pUnkForRelease);
-      }
-      else
-      {
-        GlobalUnlock(medium.hGlobal);
-        GlobalFree(medium.hGlobal);
-      }
-}
-
 /***********************************************************************
  *          GetPidlFromDataObject
  *
@@ -3957,7 +3938,7 @@ LPITEMIDLIST GetPidlFromDataObject ( IDataObject *doSelected, UINT nPidlIndex)
       {
         pidl = ILClone((LPITEMIDLIST)(&((LPBYTE)cida)[cida->aoffset[nPidlIndex]]));
       }
-      COMCTL32_ReleaseStgMedium(medium);
+      ReleaseStgMedium(&medium);
     }
     return pidl;
 }
@@ -3983,7 +3964,7 @@ static UINT GetNumSelected( IDataObject *doSelected )
     {
       LPIDA cida = GlobalLock(medium.hGlobal);
       retVal = cida->cidl;
-      COMCTL32_ReleaseStgMedium(medium);
+      ReleaseStgMedium(&medium);
       return retVal;
     }
     return 0;
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/11695