Robert Shearman : comdlg32: Don't worry if an HGLOBAL passed to printdlg is already locked.

[Alexandre Julliard]

Module: wine
Branch: refs/heads/master
Commit: c75d0cdc8cb0974344c5e9e680a35572c21ffff9
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=c75d0cdc8cb0974344c5e9e6...

Author: Robert Shearman <rob(a)codeweavers.com>
Date:   Thu Dec  8 11:59:36 2005 +0100

comdlg32: Don't worry if an HGLOBAL passed to printdlg is already locked.

---

 dlls/commdlg/printdlg.c |   16 ----------------
 1 files changed, 0 insertions(+), 16 deletions(-)

diff --git a/dlls/commdlg/printdlg.c b/dlls/commdlg/printdlg.c
index cf36ef0..30e769e 100644
--- a/dlls/commdlg/printdlg.c
+++ b/dlls/commdlg/printdlg.c
@@ -2096,14 +2096,6 @@ BOOL WINAPI PrintDlgA(LPPRINTDLGA lppd)
 		lppd->hDevMode = GlobalAlloc(GMEM_MOVEABLE,
 					lpdm->dmSize + lpdm->dmDriverExtra);
 	    } else {
-	        WORD locks;
-		if((locks = (GlobalFlags(lppd->hDevMode) & GMEM_LOCKCOUNT))) {
-		    WARN("hDevMode has %d locks on it. Unlocking it now\n", locks);
-		    while(locks--) {
-		        GlobalUnlock(lppd->hDevMode);
-			TRACE("Now got %d locks\n", locks);
-		    }
-		}
 		lppd->hDevMode = GlobalReAlloc(lppd->hDevMode,
 					       lpdm->dmSize + lpdm->dmDriverExtra,
 					       GMEM_MOVEABLE);
@@ -2111,14 +2103,6 @@ BOOL WINAPI PrintDlgA(LPPRINTDLGA lppd)
 	    lpdmReturn = GlobalLock(lppd->hDevMode);
 	    memcpy(lpdmReturn, lpdm, lpdm->dmSize + lpdm->dmDriverExtra);
 
-	    if (lppd->hDevNames != 0) {
-	        WORD locks;
-		if((locks = (GlobalFlags(lppd->hDevNames) & GMEM_LOCKCOUNT))) {
-		    WARN("hDevNames has %d locks on it. Unlocking it now\n", locks);
-		    while(locks--)
-		        GlobalUnlock(lppd->hDevNames);
-		}
-	    }
 	    PRINTDLG_CreateDevNames(&(lppd->hDevNames),
 		    di->pDriverPath,
 		    pi->pPrinterName,