[ros-diffs] [jgardou] 52337: [SHELL32] - do not include headers that are already in precomp.h This time with necessary changes

[jgardou at svn.reactos.org]

Author: jgardou
Date: Sat Jun 18 14:29:32 2011
New Revision: 52337

URL: http://svn.reactos.org/svn/reactos?rev=52337&view=rev
Log:
[SHELL32]
  - do not include headers that are already in precomp.h
This time with necessary changes

Modified:
    trunk/reactos/dll/win32/shell32/drive.c

Modified: trunk/reactos/dll/win32/shell32/drive.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/drive.c?rev=52337&r1=52336&r2=52337&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/drive.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/drive.c [iso-8859-1] Sat Jun 18 14:29:32 2011
@@ -18,19 +18,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include <precomp.h>
+
 #define MAX_PROPERTY_SHEET_PAGE 32
-
-#define WIN32_NO_STATUS
-#define NTOS_MODE_USER
-#define UNICODE
-#define _UNICODE
-#define COBJMACROS
-#include <windows.h>
-#include <ndk/ntndk.h>
-#include <fmifs/fmifs.h>
-#include <largeint.h>
-
-#include <precomp.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(shell);
 
@@ -668,7 +658,7 @@
     PROPSHEETHEADER *ppsh = (PROPSHEETHEADER *)lParam;
     if (ppsh != NULL && ppsh->nPages < MAX_PROPERTY_SHEET_PAGE)
     {
-        ppsh->phpage[ppsh->nPages++] = hpage;
+        ppsh->u3.phpage[ppsh->nPages++] = hpage;
         return TRUE;
     }
     return FALSE;
@@ -691,8 +681,8 @@
    psh.dwSize = sizeof(PROPSHEETHEADERW);
    //psh.dwFlags = PSH_USECALLBACK | PSH_PROPTITLE;
    psh.hwndParent = NULL;
-   psh.nStartPage = 0;
-   psh.phpage = hpsp;
+   psh.u2.nStartPage = 0;
+   psh.u3.phpage = hpsp;
 
    if (GetVolumeInformationW(drive, szName, sizeof(szName)/sizeof(WCHAR), NULL, &dwMaxComponent,
                              &dwFileSysFlags, NULL, 0))