From 0b46759664ec86fa55659a3590b8194e7db9e56a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Gardou?= Date: Sat, 18 Jun 2011 14:29:32 +0000 Subject: [PATCH] [SHELL32] - do not include headers that are already in precomp.h This time with necessary changes svn path=/trunk/; revision=52337 --- reactos/dll/win32/shell32/drive.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/reactos/dll/win32/shell32/drive.c b/reactos/dll/win32/shell32/drive.c index 8f70e74cc7f..240739c6c73 100644 --- a/reactos/dll/win32/shell32/drive.c +++ b/reactos/dll/win32/shell32/drive.c @@ -18,20 +18,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#define MAX_PROPERTY_SHEET_PAGE 32 - -#define WIN32_NO_STATUS -#define NTOS_MODE_USER -#define UNICODE -#define _UNICODE -#define COBJMACROS -#include -#include -#include -#include - #include +#define MAX_PROPERTY_SHEET_PAGE 32 + WINE_DEFAULT_DEBUG_CHANNEL(shell); typedef enum @@ -668,7 +658,7 @@ AddPropSheetPageProc(HPROPSHEETPAGE hpage, LPARAM lParam) 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 @@ SH_ShowDriveProperties(WCHAR * drive, LPCITEMIDLIST pidlFolder, LPCITEMIDLIST * 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))