[gedmurphy] 51897: [SHELL32_NEW] - Merge 48792 and 49372 - Fix rbuild file, it really will build now.

Author: gedmurphy
Date: Tue May 24 19:14:42 2011
New Revision: 51897

URL: http://svn.reactos.org/svn/reactos?rev=51897&view=rev
Log:
[SHELL32_NEW]
- Merge 48792 and 49372
- Fix rbuild file, it really will build now.

Modified:
    branches/shell32_new-bringup/dll/win32/shell32/drive.cpp
    branches/shell32_new-bringup/dll/win32/shell32/shell32.rbuild
    branches/shell32_new-bringup/dll/win32/shell32/shelllink.cpp
    branches/shell32_new-bringup/dll/win32/shell32/shelllink.h

Modified: branches/shell32_new-bringup/dll/win32/shell32/drive.cpp
URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/sh...
==============================================================================
--- branches/shell32_new-bringup/dll/win32/shell32/drive.cpp [iso-8859-1] (original)
+++ branches/shell32_new-bringup/dll/win32/shell32/drive.cpp [iso-8859-1] Tue May 24 19:14:42 2011
@@ -385,7 +385,6 @@
       {
          WCHAR szResult[128];
          LONGLONG Result;
-#ifdef IOCTL_DISK_GET_LENGTH_INFO_IMPLEMENTED
          HANDLE hVolume;
          DWORD BytesReturned = 0;

@@ -394,16 +393,13 @@
          if (hVolume != INVALID_HANDLE_VALUE)
          {
             ret = DeviceIoControl(hVolume, IOCTL_DISK_GET_LENGTH_INFO, NULL, 0, (LPVOID)&TotalNumberOfBytes, sizeof(ULARGE_INTEGER), &BytesReturned, NULL);
-            if (ret && StrFormatByteSizeW(LengthInformation.Length.QuadPart, szResult, sizeof(szResult) / sizeof(WCHAR)))
+            if (ret && StrFormatByteSizeW(TotalNumberOfBytes.QuadPart, szResult, sizeof(szResult) / sizeof(WCHAR)))
                SendDlgItemMessageW(hwndDlg, 14007, WM_SETTEXT, (WPARAM)NULL, (LPARAM)szResult);

CloseHandle(hVolume);
          }
-         TRACE("szResult %s hVOlume %p ret %d LengthInformation %ul Bytesreturned %d\n", debugstr_w(szResult), hVolume, ret, LengthInformation.Length.QuadPart, BytesReturned);
-#else
-            if (ret && StrFormatByteSizeW(TotalNumberOfBytes.QuadPart, szResult, sizeof(szResult) / sizeof(WCHAR)))
-               SendDlgItemMessageW(hwndDlg, 14007, WM_SETTEXT, (WPARAM)NULL, (LPARAM)szResult);
-#endif
+
+         TRACE("szResult %s hVOlume %p ret %d LengthInformation %ul Bytesreturned %d\n", debugstr_w(szResult), hVolume, ret, TotalNumberOfBytes.QuadPart, BytesReturned);

if (StrFormatByteSizeW(TotalNumberOfBytes.QuadPart - FreeBytesAvailable.QuadPart, szResult, sizeof(szResult) / sizeof(WCHAR)))
              SendDlgItemMessageW(hwndDlg, 14003, WM_SETTEXT, (WPARAM)NULL, (LPARAM)szResult);

Modified: branches/shell32_new-bringup/dll/win32/shell32/shell32.rbuild
URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/sh...
==============================================================================
--- branches/shell32_new-bringup/dll/win32/shell32/shell32.rbuild [iso-8859-1] (original)
+++ branches/shell32_new-bringup/dll/win32/shell32/shell32.rbuild [iso-8859-1] Tue May 24 19:14:42 2011
@@ -1,5 +1,5 @@
 <group>
-<module name="shell32_new" type="win32dll" baseaddress="${BASEADDRESS_SHELL32}" installbase="system32" installname="shell32_new.dll" allowwarnings="true" crt="msvcrt">
+<module name="shell32" type="win32dll" baseaddress="${BASEADDRESS_SHELL32}" installbase="system32" installname="shell32.dll" allowwarnings="true" crt="msvcrt">
    <autoregister infsection="OleControlDlls" type="Both" />
    <importlibrary definition="shell32.spec" />
    <include base="shell32">.</include>

Modified: branches/shell32_new-bringup/dll/win32/shell32/shelllink.cpp
URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/sh...
==============================================================================
--- branches/shell32_new-bringup/dll/win32/shell32/shelllink.cpp [iso-8859-1] (original)
+++ branches/shell32_new-bringup/dll/win32/shell32/shelllink.cpp [iso-8859-1] Tue May 24 19:14:42 2011
@@ -255,14 +255,14 @@

if( SUCCEEDED( r ) )
    	{
-            if ( sCurFile )
+            if ( sLinkPath )
             {
-                HeapFree(GetProcessHeap(), 0, sCurFile);
+                HeapFree(GetProcessHeap(), 0, sLinkPath);
             }
-            sCurFile = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, (wcslen(pszFileName)+1) * sizeof(WCHAR));
-            if ( sCurFile )
+            sLinkPath = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, (wcslen(pszFileName)+1) * sizeof(WCHAR));
+            if ( sLinkPath )
             {
-                wcscpy(sCurFile, pszFileName);
+                wcscpy(sLinkPath, pszFileName);
             }

StartLinkProcessor( pszFileName );
@@ -289,13 +289,13 @@
 {
     *ppszFileName = NULL;

-    if ( !sCurFile)
+    if ( !sLinkPath)
     {
         /* IPersistFile::GetCurFile called before IPersistFile::Save */
         return S_FALSE;
     }

-    *ppszFileName = (LPOLESTR)CoTaskMemAlloc((wcslen(sCurFile)+1) * sizeof(WCHAR));
+    *ppszFileName = (LPOLESTR)CoTaskMemAlloc((wcslen(sLinkPath)+1) * sizeof(WCHAR));
     if (!*ppszFileName)
     {
         /* out of memory */
@@ -303,7 +303,7 @@
     }

/* copy last saved filename */
-    wcscpy(*ppszFileName, sCurFile);
+    wcscpy(*ppszFileName, sLinkPath);

return NOERROR;
 }

Modified: branches/shell32_new-bringup/dll/win32/shell32/shelllink.h
URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/sh...
==============================================================================
--- branches/shell32_new-bringup/dll/win32/shell32/shelllink.h [iso-8859-1] (original)
+++ branches/shell32_new-bringup/dll/win32/shell32/shelllink.h [iso-8859-1] Tue May 24 19:14:42 2011
@@ -71,7 +71,6 @@
    LPWSTR        sComponent;
    volume_info   volume;
     LPWSTR        sLinkPath;
-    LPWSTR        sCurFile;
     BOOL          bRunAs;
    BOOL          bDirty;
    INT           iIdOpen;  /* id of the "Open" entry in the context menu */