Nikolay Sivov : shlwapi: Remove unused fields.

Alexandre Julliard julliard at winehq.org
Thu Dec 6 15:24:58 CST 2018


Module: wine
Branch: master
Commit: 72c28cdb53033805ac4c3c1f3a229900d2ac8014
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=72c28cdb53033805ac4c3c1f3a229900d2ac8014

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Thu Dec  6 08:00:37 2018 +0300

shlwapi: Remove unused fields.

Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/shlwapi/regstream.c | 38 --------------------------------------
 1 file changed, 38 deletions(-)

diff --git a/dlls/shlwapi/regstream.c b/dlls/shlwapi/regstream.c
index 31df82a..decc1f6 100644
--- a/dlls/shlwapi/regstream.c
+++ b/dlls/shlwapi/regstream.c
@@ -39,16 +39,10 @@ typedef struct
 {
 	IStream IStream_iface;
 	LONG   ref;
-	HKEY   hKey;
 	LPBYTE pbBuffer;
 	DWORD  dwLength;
 	DWORD  dwPos;
 	DWORD  dwMode;
-	union {
-	    LPSTR keyNameA;
-	    LPWSTR keyNameW;
-	}u;
-	BOOL   bUnicode;
 } ISHRegStream;
 
 static inline ISHRegStream *impl_from_IStream(IStream *iface)
@@ -105,35 +99,6 @@ static ULONG WINAPI IStream_fnRelease(IStream *iface)
 
 	if (!refCount)
 	{
-	  TRACE(" destroying SHReg IStream (%p)\n",This);
-
-	  if (This->hKey)
-	  {
-	    /* write back data in REG_BINARY */
-	    if (This->dwMode == STGM_READWRITE || This->dwMode == STGM_WRITE)
-	    {
-	      if (This->dwLength)
-	      {
-	        if (This->bUnicode)
-	          RegSetValueExW(This->hKey, This->u.keyNameW, 0, REG_BINARY,
-	                         (const BYTE *) This->pbBuffer, This->dwLength);
-	        else
-	          RegSetValueExA(This->hKey, This->u.keyNameA, 0, REG_BINARY,
-	                        (const BYTE *) This->pbBuffer, This->dwLength);
-	      }
-	      else
-	      {
-	        if (This->bUnicode)
-	          RegDeleteValueW(This->hKey, This->u.keyNameW);
-	        else
-	          RegDeleteValueA(This->hKey, This->u.keyNameA);
-	      }
-	    }
-
-	    RegCloseKey(This->hKey);
-	  }
-
-	  HeapFree(GetProcessHeap(),0,This->u.keyNameA);
 	  HeapFree(GetProcessHeap(),0,This->pbBuffer);
 	  HeapFree(GetProcessHeap(),0,This);
 	  return 0;
@@ -384,13 +349,10 @@ static ISHRegStream *IStream_Create(HKEY hKey, LPBYTE pbBuffer, DWORD dwLength)
  {
    regStream->IStream_iface.lpVtbl = &rstvt;
    regStream->ref = 1;
-   regStream->hKey = hKey;
    regStream->pbBuffer = pbBuffer;
    regStream->dwLength = dwLength;
    regStream->dwPos = 0;
    regStream->dwMode = STGM_READWRITE;
-   regStream->u.keyNameA = NULL;
-   regStream->bUnicode = FALSE;
  }
  TRACE ("Returning %p\n", regStream);
  return regStream;




More information about the wine-cvs mailing list