From 066816ae82c37547bcb01407d8d7f75d43537e29 Mon Sep 17 00:00:00 2001
From: = <e.lombeyda@triagens.de>
Date: Fri, 25 Apr 2014 08:46:57 +0200
Subject: [PATCH] Source and DLL are consistent. Painfull error!!!

---
 .../Plugins/SharedMemory/Contrib/SharedMem.c  |  26 ++++++++++++++----
 .../SharedMemory/Plugins/sharedmem.dll        | Bin 20480 -> 20480 bytes
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/Installation/Windows/Plugins/SharedMemory/Contrib/SharedMem.c b/Installation/Windows/Plugins/SharedMemory/Contrib/SharedMem.c
index 1e5cc90fb0..641b9430a3 100644
--- a/Installation/Windows/Plugins/SharedMemory/Contrib/SharedMem.c
+++ b/Installation/Windows/Plugins/SharedMemory/Contrib/SharedMem.c
@@ -121,9 +121,11 @@ PUBLIC_FUNCTION(CreateSharedMemory)
 
   if (pBuf == NULL)
   {
-    CloseHandle(hMapFile);
-    hMapFile = NULL;
     PushReturnValue(GetLastError());  // Could not map view of file
+
+    CloseHandle(hMapFile);
+
+    hMapFile = NULL;
   }
 
 
@@ -162,7 +164,7 @@ PUBLIC_FUNCTION(WriteIntoSharedMem)
   }
 
   pBuf = (LPTSTR)MapViewOfFile(hMapFile, // handle to map object
-    FILE_MAP_ALL_ACCESS,  // read/write permission
+    FILE_MAP_WRITE,  // read/write permission
     0,
     0,
     BUF_SIZE);
@@ -182,6 +184,9 @@ PUBLIC_FUNCTION(WriteIntoSharedMem)
   // read name for mem segment from stack
   popstring(szMsg);
   CopyMemory((PVOID)pBuf, szMsg, (_tcslen(szMsg) * sizeof(TCHAR)));
+
+  CloseHandle(hMapFile);
+
   PushReturnValue(0);
 }
 PUBLIC_FUNCTION_END
@@ -204,6 +209,9 @@ PUBLIC_FUNCTION(ReadIntoSharedMem)
 
   if (hMapFile == NULL)
   {
+
+    pushstring(TEXT("Could not open file mapping object"));
+
     PushReturnValue(GetLastError());
     // _tprintf(TEXT("Could not open file mapping object (%d).\n"),
     //  GetLastError());
@@ -220,6 +228,7 @@ PUBLIC_FUNCTION(ReadIntoSharedMem)
   {
     // _tprintf(TEXT("Could not map view of file (%d).\n"),
     //   GetLastError());
+    pushstring(TEXT("Could not map view of file"));
 
     PushReturnValue(GetLastError());
 
@@ -229,13 +238,14 @@ PUBLIC_FUNCTION(ReadIntoSharedMem)
   }
 
 
+  pushstring(TEXT(pBuf));
+
+  PushReturnValue(0);
+
   UnmapViewOfFile(pBuf);
 
   CloseHandle(hMapFile);
 
-  PushReturnValue(0);
-
-  pushstring(TEXT(pBuf));
 }
 PUBLIC_FUNCTION_END
 
@@ -255,6 +265,10 @@ PUBLIC_FUNCTION(ExistsSharedMem)
     //  GetLastError());
     return;
   }
+
+  CloseHandle(hMapFile);
+
+  PushReturnValue(1);
 }
 
 PUBLIC_FUNCTION_END
diff --git a/Installation/Windows/Plugins/SharedMemory/Plugins/sharedmem.dll b/Installation/Windows/Plugins/SharedMemory/Plugins/sharedmem.dll
index 377f05815d7dbc4d1dca09cc40cc79cf77d9daf7..d97f7d8b5f069d4019ed1a39dea1fb251a1d31ba 100755
GIT binary patch
delta 1332
zcmZ9Me@q)?7{}jhuUTPbIhAI#(CsLlu#Ih{J$iSgcL%x(MA44@aFUUrqx@(nB?!}~
zWW<VbmTKMGITAr?WQG~$NNzD=NX!fiGeM&XahmuCY(Y!<$C#3=%Zl|mx`xCypXYtw
z=lMSG^W4)*2V=xwjEE%FCbH?Hhkg~+h<(JqoEU)+@*u?FWmP%;fhZ-~@jb9nY*398
z&&xBa2EyECKxnn50E})Ym|Kc@TMy<(#gxGjf2J*wpCwt6NXbF%-p7bZe8pfQ|J?zh
zr7|;KGtAOyJ=23IPyEzsIvt!NL++F(t+#?}-kpLb5MD68gJXsqe6Fk(hfO&J?eR@v
zB7aNjBjQKm_!r|L94mZ0FE<CF;G8bx)_OWp_`AZL<W)$4f=`|=da<am<CF(c@ltSQ
zOP}~FbE6-Ro9Ko;9q%cE1URz-V@9x5Fi{$ECq40b@cU5w;h&FMPeSW1XnjivRjV;&
zdMT$iqgfrpt|CjmF>^}1+JRuwKIN;zS4@R<iIx9NA>j<U*FEuENZ8z**rq%j=?OKg
z9|;{#Hpaa$qs^zy&J7y6v;xC;0aufx+_FofI+i?usPxkPc{OPJ_19Nb!Q1NK18wiV
ze=emh7nEouH2<v<4X%>Cy5N#peKTzt(kW?{u=XItVI5X<MPTZHE<8h*5lMWT-UC)!
zY_cfVgzM2=SpEPOfdya=m<6r@Q@FmkK3@@r(#owAPy|>H;xCF@tD=XL!2RE$)?wJf
zW!bJCWV+g~bTtAApisn-N!Tv{>)36k;q7cQ?*$t%S6GxVTu=v#2RI3|03ARN@H!B}
zE9UwqGDRogJO#`GKg%^Gl19F&y+_H@+K&mGTQyc;B$|%Ge2@xwA6SIbqNI2b%EolC
z&j(tL0l3mt`pnaT{;pQKJJ3f5dc56qTW6P-_P^ZI)7jll2VU`cPxmSLna`FM6!e)+
z?`w3RZ8Jq~a`h55*(xoKNO@@x`3Mfqb-+nr7llv>kPB!4ANU4<FfcCbMNANR@@1(&
zB@<7jw~_m8h?19UHwa8TclzvaaN$(tMy1A)=g>P$4y(iOc*`;F_{wqJae!@Ry{w<@
zX9w7GY?S?+{f6Da8M$W8%lWx}Zh(t$pKzDCYuqhvg<Ip)yqPcO2lydA%wOQg_-THI
z|CL|n*Lcdg+i7#QI`25QR~f2qxbC=8F14^-pw0^ULV-{tv<pMRun-ZV!iX>`#Doc9
zQutd)3Mm1Jr05g-#fW%O92H~Ygm^=|D;7&-Qn_T67>ScyQnhqg`ap_GBhsi8Q+^-o
z<{ufdRMb{jZKCbCt;P1CZQZtE)7W?0Mf*{Ev;B;H&>pszT(oyHeasuoAoDIW%$#RN
bm`|Ar=1XRp`I?z!zGrSSKgk0PZ>s(SRvp9J

delta 1211
zcmYL|e@q)?7{}kc9&lx4t4bZEl$272V=Zfsm+Kw7ds`P8K_DJmr(!TJ`;n1_8M3H<
zD7tA~Ozg;*FEjixgvAlJuqBO$i5TKGLuBeqFlwUFEMS(c4gYl6%sL%8pKERS<MX`l
z`+c5!zVG|q-SH{r_!KjmvkW))o&NU-yVOe$GfmcU1|g&&B+(VtPrqXtnR0p;Vw^hJ
zNhYGtu|15p)QM2$?q&!!Gkjo%_Z$#@G{cKNgy=cGUhm?<95bsY_^ppId+BAToBL!V
zq=IfQ%{u2j$=D;!a0G{teKGb3T#@0xu+Y+78N)~{aP&s?`!vOCH0yf2;vXKN#DXmu
z<F$cVx~XO}XQT}SdTpUv%?otOWwoa6<R4qzPm|RiT2pInd#9kR8?81bV>vKYz-L`O
zjMDL9Wll?16dFfql;h}-yU+UB?R?|R$Mj^4D{u8?L0KIvT9J-|vfgwxn2g=m(uY9L
zPj;7?2jH}1&;8!yp4_hVJ~%O)2+VD_=}*<qf!zlEYHbM{9}ghAvHW1s0u`@2u4UN7
zUzWr}{%F&^X~TEM%#J1(zcRCl40qI)ShiTM8@>~l{P37><bs)p(Ql6PprrvDb=Ez_
zjMJTU4G;(F+&;6-NGCc4!!Ym~FbEs~`hhsmO)u7UR+@!L!|a*@=7FUEE%hGQfw!B9
z2fu^Yt>%2Q;;tSRcD2pil>{lMFpEb!U_J<p(P^)T!Sq}2R)|?|$Y-WuH)%*_fgFH9
z;sHBQ1#F|S`pzc`rtPrq2Ks>^{ak&dglaBr!=~aF6#m1!Q9Z?H?eGO<>7gAHG|Rpm
zQk(jA!?ht6_z)O_)mX$-5Gv+uFs}qWae%fejrw_Ih&dhPpDtE-b|GZ`CfxtzdJ*D5
zs{(562-O4SKnc(UnhNv)ujqRSWtdVu6RBchKT)08X_Rq4gpgfdd1j5FO!xj{SE1>p
z*0t6Wu|jl+ZZRkx5r@S|@pJKt7zlqI{ytnGIV88#AO)nT)Fr(ny)B)TCZ!qa3&|}v
z$N{-kR%K1@li!fvl}BY={zm>)PPEOm&9xm=63SWSQ)Na;DYMF#%8F8^HmH6zsA5%8
z6*a21A5%NjkJNGXtU9HhSIdcm1WA}EBud)JL2`;*BiG3dvP6C%zmY%5GPy;XBRC>O
zlt|RP#~?y`VOR*>2`+_hhW-vAVY@IUObFA$72&3EPgoP4Z1J=NTEZ<GaV4(C9=rwn
sv4AB^a65h$yEObf?#KJ^0DcvZ;4^pvPvgsY4lm%J^%FgBvG5}P10;`%1poj5