Remove some unused headers or parts of headers.
authorFilip Navara <filip.navara@gmail.com>
Thu, 19 Aug 2004 18:12:29 +0000 (18:12 +0000)
committerFilip Navara <filip.navara@gmail.com>
Thu, 19 Aug 2004 18:12:29 +0000 (18:12 +0000)
svn path=/trunk/; revision=10599

16 files changed:
reactos/include/libc/atexit.h [deleted file]
reactos/include/libc/file.h [deleted file]
reactos/include/libc/ieee.h [deleted file]
reactos/include/ntos/disk.h
reactos/include/objbase.h [deleted file]
reactos/include/wine/commctrl.h
reactos/include/wine/ocidl.h
reactos/include/wine/olectl.h [deleted file]
reactos/include/wine/oleidl.h
reactos/include/wine/servprov.h
reactos/include/wine/winbase.h [deleted file]
reactos/include/wine/winerror.h [deleted file]
reactos/include/wine/winnt.h
reactos/include/wine/winspool.h [deleted file]
reactos/include/wine/winuser.h
reactos/include/winuser.h [deleted file]

diff --git a/reactos/include/libc/atexit.h b/reactos/include/libc/atexit.h
deleted file mode 100644 (file)
index 5dbdffe..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */
-#ifndef __dj_include_libc_atexit_h__
-#define __dj_include_libc_atexit_h__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef __dj_ENFORCE_ANSI_FREESTANDING
-
-#ifndef __STRICT_ANSI__
-
-#ifndef _POSIX_SOURCE
-
-struct __atexit {
-  struct __atexit *__next;
-  void (*__function)(void);
-};
-
-extern struct __atexit *__atexit_ptr;
-
-#endif /* !_POSIX_SOURCE */
-#endif /* !__STRICT_ANSI__ */
-#endif /* !__dj_ENFORCE_ANSI_FREESTANDING */
-
-#ifndef __dj_ENFORCE_FUNCTION_CALLS
-#endif /* !__dj_ENFORCE_FUNCTION_CALLS */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __dj_include_libc_atexit_h__ */
diff --git a/reactos/include/libc/file.h b/reactos/include/libc/file.h
deleted file mode 100644 (file)
index c27d89c..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */
-
-#ifndef __dj_include_libc_file_h__
-#define __dj_include_libc_file_h__
-
-#include <stdio.h>
-#include <fcntl.h>
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef __dj_ENFORCE_ANSI_FREESTANDING
-
-#ifndef __STRICT_ANSI__
-
-#ifndef _POSIX_SOURCE
-
-#ifndef _IORMONCL
-#define _IORMONCL 004000  /* remove on close, for temp files */
-#endif
-/* if _flag & _IORMONCL, ._name_to_remove needs freeing */
-
-#ifndef _IOUNGETC
-#define _IOUNGETC 010000  /* there is an ungetc'ed character in the buffer */
-#endif
-
-int __set_errno(int err);
-
-char __is_text_file(FILE *p);
-
-int __fileno_alloc(void *hFile, int mode);
-
-int _doprnt(const char *fmt, va_list args, FILE *f);
-int _doscan(FILE *iop, const char *fmt, void **argp);
-int _dowscan(FILE *iop, const wchar_t *fmt, void **argp);
-
-
-int __fileno_dup2( int handle1, int handle2 );
-int __fileno_setmode(int _fd, int _newmode);
-int __fileno_close(int _fd);
-
-
-#endif /* !_POSIX_SOURCE */
-#endif /* !__STRICT_ANSI__ */
-#endif /* !__dj_ENFORCE_ANSI_FREESTANDING */
-
-#ifndef __dj_ENFORCE_FUNCTION_CALLS
-#endif /* !__dj_ENFORCE_FUNCTION_CALLS */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __dj_include_libc_file_h__ */
diff --git a/reactos/include/libc/ieee.h b/reactos/include/libc/ieee.h
deleted file mode 100644 (file)
index f501b4f..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */
-#ifndef __dj_include_libc_ieee_h__
-#define __dj_include_libc_ieee_h__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef __dj_ENFORCE_ANSI_FREESTANDING
-
-#ifndef __STRICT_ANSI__
-
-#ifndef _POSIX_SOURCE
-
-typedef struct {
-  unsigned mantissa:23;
-  unsigned exponent:8;
-  unsigned sign:1;
-} float_t;
-
-typedef struct {
-  unsigned mantissal:32;
-  unsigned mantissah:20;
-  unsigned exponent:11;
-  unsigned sign:1;
-} double_t;
-
-typedef struct {
-  unsigned mantissal:32;
-  unsigned mantissah:32;
-  unsigned exponent:15;
-  unsigned sign:1;
-} long_double_t;
-
-#endif /* !_POSIX_SOURCE */
-#endif /* !__STRICT_ANSI__ */
-#endif /* !__dj_ENFORCE_ANSI_FREESTANDING */
-
-#ifndef __dj_ENFORCE_FUNCTION_CALLS
-#endif /* !__dj_ENFORCE_FUNCTION_CALLS */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __dj_include_libc_ieee_h__ */
index 40f5834..5b4a5ae 100644 (file)
@@ -1,4 +1,4 @@
-/* $Id: disk.h,v 1.15 2003/08/25 01:37:47 sedwards Exp $
+/* $Id: disk.h,v 1.16 2004/08/19 18:12:28 navaraf Exp $
  *
  * COPYRIGHT:    See COPYING in the top level directory
  * PROJECT:      ReactOS kernel
@@ -65,6 +65,7 @@
 #define PARTITION_PREP                  0x41
 #define PARTITION_LDM                   0x42
 #define PARTITION_UNIX                  0x63
+#define PARTITION_EXT2                  0x83
 
 #define PARTITION_NTFT                  0x80
 #define VALID_NTFT                      0xC0
      (P) == PARTITION_IFS          || \
      (P) == PARTITION_FAT32        || \
      (P) == PARTITION_FAT32_XINT13 || \
-     (P) == PARTITION_XINT13)
+     (P) == PARTITION_XINT13       || \
+     (P) == PARTITION_EXT2)
 
 #define IsContainerPartition(P)  \
     ((P) == PARTITION_EXTENDED || \
diff --git a/reactos/include/objbase.h b/reactos/include/objbase.h
deleted file mode 100644 (file)
index 76ee174..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-/* $Id $
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#if (__W32API_MAJOR_VERSION < 2 || __W32API_MINOR_VERSION < 5)
-#ifdef DBG
-#undef DBG
-#define DBG 1
-#endif /* defined(DBG) */
-#endif /* __W32API_MAJOR_VERSION < 2 || __W32API_MINOR_VERSION < 5 */
-
-#include_next <objbase.h>
index b8ae4a7..fccd779 100644 (file)
@@ -61,58 +61,4 @@ typedef LPFINDINFOW LPLVFINDINFOW;
 
 #define FLATSB_CLASSA         "flatsb_class32"
 
-#if (__W32API_MAJOR_VERSION < 2 || __W32API_MINOR_VERSION < 5)
-
-#if (_WIN32_IE >= 0x0500)
-#if (_WIN32_WINNT >= 0x0501)
-#define COMCTL32_VERSION 6
-#else
-#define COMCTL32_VERSION 5
-#endif
-#endif
-
-#define DPAS_SORTED    1
-#define DPAS_INSERTBEFORE      2
-#define DPAS_INSERTAFTER       4
-
-#if (_WIN32_IE >= 0x0400)
-#define TCIS_HIGHLIGHTED 2
-#endif
-
-typedef struct _DSA *HDSA;
-typedef struct _DPA *HDPA;
-typedef INT (CALLBACK *PFNDPAENUMCALLBACK)(PVOID,PVOID);
-typedef INT (CALLBACK *PFNDSAENUMCALLBACK)(PVOID,PVOID);
-typedef INT (CALLBACK *PFNDPACOMPARE)(PVOID,PVOID,LPARAM);
-#if (_WIN32_WINNT >= 0x0501)
-typedef LRESULT (CALLBACK *SUBCLASSPROC)(HWND,UINT,WPARAM,LPARAM,UINT_PTR,DWORD_PTR);
-#endif /* _WIN32_WINNT >= 0x0501 */
-
-HDSA WINAPI DSA_Create(INT,INT);
-BOOL WINAPI DSA_Destroy(HDSA);
-VOID WINAPI DSA_DestroyCallback(HDSA,PFNDSAENUMCALLBACK,PVOID);
-PVOID WINAPI DSA_GetItemPtr(HDSA,INT);
-INT WINAPI DSA_InsertItem(HDSA,INT,PVOID);
-
-HDPA WINAPI DPA_Create(INT);
-BOOL WINAPI DPA_Destroy(HDPA);
-PVOID WINAPI DPA_DeletePtr(HDPA,INT);
-BOOL WINAPI DPA_DeleteAllPtrs(HDPA);
-VOID WINAPI DPA_EnumCallback(HDPA,PFNDPAENUMCALLBACK,PVOID);
-VOID WINAPI DPA_DestroyCallback(HDPA,PFNDPAENUMCALLBACK,PVOID);
-BOOL WINAPI DPA_SetPtr(HDPA,INT,PVOID);
-INT WINAPI DPA_InsertPtr(HDPA,INT,PVOID);
-PVOID WINAPI DPA_GetPtr(HDPA,INT_PTR);
-BOOL WINAPI DPA_Sort(HDPA,PFNDPACOMPARE,LPARAM);
-INT WINAPI DPA_Search(HDPA,PVOID,INT,PFNDPACOMPARE,LPARAM,UINT);
-BOOL WINAPI Str_SetPtrW(LPWSTR*,LPCWSTR);
-
-#if (_WIN32_WINNT >= 0x0501)
-BOOL WINAPI SetWindowSubclass(HWND,SUBCLASSPROC,UINT_PTR,DWORD_PTR);
-BOOL WINAPI RemoveWindowSubclass(HWND,SUBCLASSPROC,UINT_PTR);
-LRESULT WINAPI DefSubclassProc(HWND,UINT,WPARAM,LPARAM);
-#endif /* _WIN32_WINNT >= 0x0501 */
-
-#endif /* __W32API_MAJOR_VERSION < 2 || __W32API_MINOR_VERSION < 5 */
-
 #endif /* __WINE_COMMCTRL_H */
index 598c108..ddcbce5 100644 (file)
@@ -9,24 +9,6 @@ DEFINE_GUID(IID_IPicture, 0x7bf80980, 0xbf32, 0x101a, 0x8b,0xbb, 0x00,0xaa,0x00,
 DEFINE_GUID(IID_IPictureDisp, 0x7bf80981, 0xbf32, 0x101a, 0x8b,0xbb, 0x00,0xaa,0x00,0x30,0x0c,0xab);
 DEFINE_GUID(IID_IOleControl, 0xb196b288, 0xbab4, 0x101a, 0xb6,0x9c, 0x00,0xaa,0x00,0x34,0x1d,0x07);
 DEFINE_GUID(IID_IOleControlSite, 0xb196b289, 0xbab4, 0x101a, 0xb6,0x9c, 0x00,0xaa,0x00,0x34,0x1d,0x07);
-
-#if (__W32API_MAJOR_VERSION < 2 || __W32API_MINOR_VERSION < 5)
-
-/*** IUnknown methods ***/
-#define IOleControlSite_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
-#define IOleControlSite_AddRef(p) (p)->lpVtbl->AddRef(p)
-#define IOleControlSite_Release(p) (p)->lpVtbl->Release(p)
-/*** IOleControlSite methods ***/
-#define IOleControlSite_OnControlInfoChanged(p) (p)->lpVtbl->OnControlInfoChanged(p)
-#define IOleControlSite_LockInPlaceActive(p,a) (p)->lpVtbl->LockInPlaceActive(p,a)
-#define IOleControlSite_GetExtendedControl(p,a) (p)->lpVtbl->GetExtendedControl(p,a)
-#define IOleControlSite_TransformCoords(p,a,b,c) (p)->lpVtbl->TransformCoords(p,a,b,c)
-#define IOleControlSite_TranslateAccelerator(p,a,b) (p)->lpVtbl->TranslateAccelerator(p,a,b)
-#define IOleControlSite_OnFocus(p,a) (p)->lpVtbl->OnFocus(p,a)
-#define IOleControlSite_ShowPropertyFrame(p) (p)->lpVtbl->ShowPropertyFrame(p)
-
-#endif /* __W32API_MAJOR_VERSION < 2 || __W32API_MINOR_VERSION < 5 */
-
 DEFINE_GUID(IID_IOleInPlaceSiteEx, 0x9c2cad80, 0x3424, 0x11cf, 0xb6,0x70, 0x00,0xaa,0x00,0x4c,0xd6,0xd8);
 DEFINE_GUID(IID_IOleInPlaceSiteWindowless, 0x922eada0, 0x3424, 0x11cf, 0xb6,0x70, 0x00,0xaa,0x00,0x4c,0xd6,0xd8);
 DEFINE_GUID(IID_IOleInPlaceObjectWindowless, 0x1c2056cc, 0x5ef4, 0x101b, 0x8b,0xc8, 0x00,0xaa,0x00,0x3e,0x3b,0x29);
@@ -35,90 +17,17 @@ DEFINE_GUID(IID_IViewObjectEx, 0x3af24292, 0x0c96, 0x11ce, 0xa0,0xcf, 0x00,0xaa,
 DEFINE_GUID(IID_IProvideClassInfo, 0xb196b283, 0xbab4, 0x101a, 0xb6,0x9c, 0x00,0xaa,0x00,0x34,0x1d,0x07);
 DEFINE_GUID(IID_IProvideClassInfo2, 0xa6bc3ac0, 0xdbaa, 0x11ce, 0x9d,0xe3, 0x00,0xaa,0x00,0x4b,0xb8,0x51);
 DEFINE_GUID(IID_IConnectionPoint, 0xb196b286, 0xbab4, 0x101a, 0xb6,0x9c, 0x00,0xaa,0x00,0x34,0x1d,0x07);
-
-#if (__W32API_MAJOR_VERSION < 2 || __W32API_MINOR_VERSION < 5)
-
-/*** IUnknown methods ***/
-#define IConnectionPoint_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
-#define IConnectionPoint_AddRef(p) (p)->lpVtbl->AddRef(p)
-#define IConnectionPoint_Release(p) (p)->lpVtbl->Release(p)
-/*** IConnectionPoint methods ***/
-#define IConnectionPoint_GetConnectionInterface(p,a) (p)->lpVtbl->GetConnectionInterface(p,a)
-#define IConnectionPoint_GetConnectionPointContainer(p,a) (p)->lpVtbl->GetConnectionPointContainer(p,a)
-#define IConnectionPoint_Advise(p,a,b) (p)->lpVtbl->Advise(p,a,b)
-#define IConnectionPoint_Unadvise(p,a) (p)->lpVtbl->Unadvise(p,a)
-#define IConnectionPoint_EnumConnections(p,a) (p)->lpVtbl->EnumConnections(p,a)
-
-#endif /* __W32API_MAJOR_VERSION < 2 || __W32API_MINOR_VERSION < 5 */
-
 DEFINE_GUID(IID_IConnectionPointContainer, 0xb196b284, 0xbab4, 0x101a, 0xb6,0x9c, 0x00,0xaa,0x00,0x34,0x1d,0x07);
-
-#if (__W32API_MAJOR_VERSION < 2 || __W32API_MINOR_VERSION < 5)
-
-/*** IUnknown methods ***/
-#define IConnectionPointContainer_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
-#define IConnectionPointContainer_AddRef(p) (p)->lpVtbl->AddRef(p)
-#define IConnectionPointContainer_Release(p) (p)->lpVtbl->Release(p)
-/*** IConnectionPointContainer methods ***/
-#define IConnectionPointContainer_EnumConnectionPoints(p,a) (p)->lpVtbl->EnumConnectionPoints(p,a)
-#define IConnectionPointContainer_FindConnectionPoint(p,a,b) (p)->lpVtbl->FindConnectionPoint(p,a,b)
-
-#endif /* __W32API_MAJOR_VERSION < 2 || __W32API_MINOR_VERSION < 5 */
-
 DEFINE_GUID(IID_IEnumConnections, 0xb196b287, 0xbab4, 0x101a, 0xb6,0x9c, 0x00,0xaa,0x00,0x34,0x1d,0x07);
-
-#if (__W32API_MAJOR_VERSION < 2 || __W32API_MINOR_VERSION < 5)
-
-/*** IUnknown methods ***/
-#define IEnumConnections_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
-#define IEnumConnections_AddRef(p) (p)->lpVtbl->AddRef(p)
-#define IEnumConnections_Release(p) (p)->lpVtbl->Release(p)
-/*** IEnumConnections methods ***/
-#define IEnumConnections_Next(p,a,b,c) (p)->lpVtbl->Next(p,a,b,c)
-#define IEnumConnections_Skip(p,a) (p)->lpVtbl->Skip(p,a)
-#define IEnumConnections_Reset(p) (p)->lpVtbl->Reset(p)
-#define IEnumConnections_Clone(p,a) (p)->lpVtbl->Clone(p,a)
-
-#endif /* __W32API_MAJOR_VERSION < 2 || __W32API_MINOR_VERSION < 5 */
-
 DEFINE_GUID(IID_IEnumConnectionPoints, 0xb196b285, 0xbab4, 0x101a, 0xb6,0x9c, 0x00,0xaa,0x00,0x34,0x1d,0x07);
 DEFINE_GUID(IID_IPropertyPage, 0xb196b28d, 0xbab4, 0x101a, 0xb6,0x9c, 0x00,0xaa,0x00,0x34,0x1d,0x07);
 DEFINE_GUID(IID_IPropertyPage2, 0x01e44665, 0x24ac, 0x101b, 0x84,0xed, 0x08,0x00,0x2b,0x2e,0xc7,0x13);
 DEFINE_GUID(IID_IPropertyPageSite, 0xb196b28c, 0xbab4, 0x101a, 0xb6,0x9c, 0x00,0xaa,0x00,0x34,0x1d,0x07);
 DEFINE_GUID(IID_IPropertyNotifySink, 0x9bfbbc02, 0xeff1, 0x101a, 0x84,0xed, 0x00,0xaa,0x00,0x34,0x1d,0x07);
-
-#if (__W32API_MAJOR_VERSION < 2 || __W32API_MINOR_VERSION < 5)
-
-/*** IUnknown methods ***/
-#define IPropertyNotifySink_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
-#define IPropertyNotifySink_AddRef(p) (p)->lpVtbl->AddRef(p)
-#define IPropertyNotifySink_Release(p) (p)->lpVtbl->Release(p)
-/*** IPropertyNotifySink methods ***/
-#define IPropertyNotifySink_OnChanged(p,a) (p)->lpVtbl->OnChanged(p,a)
-#define IPropertyNotifySink_OnRequestEdit(p,a) (p)->lpVtbl->OnRequestEdit(p,a)
-
-#endif /* __W32API_MAJOR_VERSION < 2 || __W32API_MINOR_VERSION < 5 */
-
 DEFINE_GUID(IID_ISimpleFrameSite, 0x742b0e01, 0x14e6, 0x101b, 0x91,0x4e, 0x00,0xaa,0x00,0x30,0x0c,0xab);
 DEFINE_GUID(IID_IPersistStreamInit, 0x7fd52380, 0x4e07, 0x101b, 0xae,0x2d, 0x08,0x00,0x2b,0x2e,0xc7,0x13);
 DEFINE_GUID(IID_IPersistMemory, 0xbd1ae5e0, 0xa6ae, 0x11ce, 0xbd,0x37, 0x50,0x42,0x00,0xc1,0x00,0x00);
 DEFINE_GUID(IID_IPersistPropertyBag, 0x37d84f60, 0x42cb, 0x11ce, 0x81,0x35, 0x00,0xaa,0x00,0x4b,0xb8,0x51);
-
-#if (__W32API_MAJOR_VERSION < 2 || __W32API_MINOR_VERSION < 5)
-
-/*** IUnknown methods ***/
-#define IPersistPropertyBag_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
-#define IPersistPropertyBag_AddRef(p) (p)->lpVtbl->AddRef(p)
-#define IPersistPropertyBag_Release(p) (p)->lpVtbl->Release(p)
-/*** IPersist methods ***/
-#define IPersistPropertyBag_GetClassID(p,a) (p)->lpVtbl->GetClassID(p,a)
-/*** IPersistPropertyBag methods ***/
-#define IPersistPropertyBag_InitNew(p) (p)->lpVtbl->InitNew(p)
-#define IPersistPropertyBag_Load(p,a,b) (p)->lpVtbl->Load(p,a,b)
-#define IPersistPropertyBag_Save(p,a,b,c) (p)->lpVtbl->Save(p,a,b,c)
-
-#endif /* __W32API_MAJOR_VERSION < 2 || __W32API_MINOR_VERSION < 5 */
-
 DEFINE_GUID(IID_IPropertyBag2, 0x22f55882, 0x280b, 0x11d0, 0xa8,0xa9, 0x00,0xa0,0xc9,0x0c,0x20,0x04);
 DEFINE_GUID(IID_IPersistPropertyBag2, 0x22f55881, 0x280b, 0x11d0, 0xa8,0xa9, 0x00,0xa0,0xc9,0x0c,0x20,0x04);
 DEFINE_GUID(IID_ISpecifyPropertyPages, 0xb196b28b, 0xbab4, 0x101a, 0xb6,0x9c, 0x00,0xaa,0x00,0x34,0x1d,0x07);
diff --git a/reactos/include/wine/olectl.h b/reactos/include/wine/olectl.h
deleted file mode 100644 (file)
index 0eeee70..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-/* $Id $
- *
- * Compatibility header
- *
- * This header is wrapper to allow compilation of Wine DLLs under ReactOS
- * build system. It contains definitions commonly refered to as Wineisms
- * and definitions that are missing in w32api.
- */
-
-#include_next <olectl.h>
-
-#ifndef __WINE_OLECTL_H
-#define __WINE_OLECTL_H
-
-#include <w32api.h>
-
-#if (__W32API_MAJOR_VERSION < 2 || __W32API_MINOR_VERSION < 5)
-
-#include <ocidl.h>
-
-#endif /* __W32API_MAJOR_VERSION < 2 || __W32API_MINOR_VERSION < 5 */
-
-
-#endif /* __WINE_GDI_H */
index 5b039b2..177c728 100644 (file)
@@ -1,15 +1,9 @@
 #ifndef __WINE_OLEIDL_H
 #define __WINE_OLEIDL_H
 
-#include <w32api.h>
 #include <unknwn.h>
 #include_next <oleidl.h>
 
-#if ((__W32API_MAJOR_VERSION == 2 && __W32API_MINOR_VERSION >= 5) || __W32API_MAJOR_VERSION > 2)
-#define __IOleCacheControl_INTERFACE_DEFINED__
-#define __IOleCache2_INTERFACE_DEFINED__
-#endif
-
 DEFINE_GUID(IID_IOleWindow, 0x00000114, 0x0000, 0x0000, 0xc0,0x00, 0x00,0x00,0x00,0x00,0x00,0x46);
 
 /*** IUnknown methods ***/
@@ -187,185 +181,6 @@ DEFINE_GUID(IID_IDropTarget, 0x00000122, 0x0000, 0x0000, 0xc0,0x00, 0x00,0x00,0x
 #define IDropTarget_DragLeave(p) (p)->lpVtbl->DragLeave(p)
 #define IDropTarget_Drop(p,a,b,c,d) (p)->lpVtbl->Drop(p,a,b,c,d)
 
-#if (__W32API_MAJOR_VERSION < 2 || __W32API_MINOR_VERSION < 5)
-
-typedef enum tagBINDSPEED {
-    BINDSPEED_INDEFINITE = 1,
-    BINDSPEED_MODERATE = 2,
-    BINDSPEED_IMMEDIATE = 3
-} BINDSPEED;
-
-#endif /* __W32API_MAJOR_VERSION < 2 || __W32API_MINOR_VERSION < 5 */
-
-#ifndef __IOleCache2_FWD_DEFINED__
-#define __IOleCache2_FWD_DEFINED__
-typedef struct IOleCache2 IOleCache2;
-#endif
-
-typedef IOleCache2 *LPOLECACHE2;
-
-#define UPDFCACHE_NODATACACHE (0x1)
-
-#define UPDFCACHE_ONSAVECACHE (0x2)
-
-#define UPDFCACHE_ONSTOPCACHE (0x4)
-
-#define UPDFCACHE_NORMALCACHE (0x8)
-
-#define UPDFCACHE_IFBLANK (0x10)
-
-#define UPDFCACHE_ONLYIFBLANK (0x80000000)
-
-#define UPDFCACHE_IFBLANKORONSAVECACHE (UPDFCACHE_IFBLANK | UPDFCACHE_ONSAVECACHE)
-
-#define UPDFCACHE_ALL ((DWORD)~UPDFCACHE_ONLYIFBLANK)
-
-#define UPDFCACHE_ALLBUTNODATACACHE (UPDFCACHE_ALL & (DWORD)~UPDFCACHE_NODATACACHE)
-
-typedef enum tagDISCARDCACHE {
-    DISCARDCACHE_SAVEIFDIRTY = 0,
-    DISCARDCACHE_NOSAVE = 1
-} DISCARDCACHE;
-
-/*****************************************************************************
- * IOleCache2 interface
- */
-#ifndef __IOleCache2_INTERFACE_DEFINED__
-#define __IOleCache2_INTERFACE_DEFINED__
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-struct IOleCache2 : public IOleCache
-{
-    virtual HRESULT STDMETHODCALLTYPE UpdateCache(
-        LPDATAOBJECT pDataObject,
-        DWORD grfUpdf,
-        LPVOID pReserved) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE DiscardCache(
-        DWORD dwDiscardOptions) = 0;
-
-};
-#else
-typedef struct IOleCache2Vtbl IOleCache2Vtbl;
-struct IOleCache2 {
-    const IOleCache2Vtbl* lpVtbl;
-};
-struct IOleCache2Vtbl {
-    ICOM_MSVTABLE_COMPAT_FIELDS
-
-    /*** IUnknown methods ***/
-    HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IOleCache2* This,
-        REFIID riid,
-        void** ppvObject);
-
-    ULONG (STDMETHODCALLTYPE *AddRef)(
-        IOleCache2* This);
-
-    ULONG (STDMETHODCALLTYPE *Release)(
-        IOleCache2* This);
-
-    /*** IOleCache methods ***/
-    HRESULT (STDMETHODCALLTYPE *Cache)(
-        IOleCache2* This,
-        FORMATETC* pformatetc,
-        DWORD advf,
-        DWORD* pdwConnection);
-
-    HRESULT (STDMETHODCALLTYPE *Uncache)(
-        IOleCache2* This,
-        DWORD dwConnection);
-
-    HRESULT (STDMETHODCALLTYPE *EnumCache)(
-        IOleCache2* This,
-        IEnumSTATDATA** ppenumSTATDATA);
-
-    HRESULT (STDMETHODCALLTYPE *InitCache)(
-        IOleCache2* This,
-        IDataObject* pDataObject);
-
-    HRESULT (STDMETHODCALLTYPE *SetData)(
-        IOleCache2* This,
-        FORMATETC* pformatetc,
-        STGMEDIUM* pmedium,
-        BOOL fRelease);
-
-    /*** IOleCache2 methods ***/
-    HRESULT (STDMETHODCALLTYPE *UpdateCache)(
-        IOleCache2* This,
-        LPDATAOBJECT pDataObject,
-        DWORD grfUpdf,
-        LPVOID pReserved);
-
-    HRESULT (STDMETHODCALLTYPE *DiscardCache)(
-        IOleCache2* This,
-        DWORD dwDiscardOptions);
-
-};
-
-/*** IUnknown methods ***/
-#define IOleCache2_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
-#define IOleCache2_AddRef(p) (p)->lpVtbl->AddRef(p)
-#define IOleCache2_Release(p) (p)->lpVtbl->Release(p)
-/*** IOleCache methods ***/
-#define IOleCache2_Cache(p,a,b,c) (p)->lpVtbl->Cache(p,a,b,c)
-#define IOleCache2_Uncache(p,a) (p)->lpVtbl->Uncache(p,a)
-#define IOleCache2_EnumCache(p,a) (p)->lpVtbl->EnumCache(p,a)
-#define IOleCache2_InitCache(p,a) (p)->lpVtbl->InitCache(p,a)
-#define IOleCache2_SetData(p,a,b,c) (p)->lpVtbl->SetData(p,a,b,c)
-/*** IOleCache2 methods ***/
-#define IOleCache2_UpdateCache(p,a,b,c) (p)->lpVtbl->UpdateCache(p,a,b,c)
-#define IOleCache2_DiscardCache(p,a) (p)->lpVtbl->DiscardCache(p,a)
-
-#endif
-
-#define IOleCache2_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
-    /*** IUnknown methods ***/ \
-    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
-    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
-    STDMETHOD_(ULONG,Release)(THIS) PURE; \
-    /*** IOleCache methods ***/ \
-    STDMETHOD_(HRESULT,Cache)(THIS_ FORMATETC* pformatetc, DWORD advf, DWORD* pdwConnection) PURE; \
-    STDMETHOD_(HRESULT,Uncache)(THIS_ DWORD dwConnection) PURE; \
-    STDMETHOD_(HRESULT,EnumCache)(THIS_ IEnumSTATDATA** ppenumSTATDATA) PURE; \
-    STDMETHOD_(HRESULT,InitCache)(THIS_ IDataObject* pDataObject) PURE; \
-    STDMETHOD_(HRESULT,SetData)(THIS_ FORMATETC* pformatetc, STGMEDIUM* pmedium, BOOL fRelease) PURE; \
-    /*** IOleCache2 methods ***/ \
-    STDMETHOD_(HRESULT,UpdateCache)(THIS_ LPDATAOBJECT pDataObject, DWORD grfUpdf, LPVOID pReserved) PURE; \
-    STDMETHOD_(HRESULT,DiscardCache)(THIS_ DWORD dwDiscardOptions) PURE;
-
-HRESULT CALLBACK IOleCache2_RemoteUpdateCache_Proxy(
-    IOleCache2* This,
-    LPDATAOBJECT pDataObject,
-    DWORD grfUpdf,
-    LONG_PTR pReserved);
-void __RPC_STUB IOleCache2_RemoteUpdateCache_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IOleCache2_UpdateCache_Proxy(
-    IOleCache2* This,
-    LPDATAOBJECT pDataObject,
-    DWORD grfUpdf,
-    LPVOID pReserved);
-HRESULT __RPC_STUB IOleCache2_UpdateCache_Stub(
-    IOleCache2* This,
-    LPDATAOBJECT pDataObject,
-    DWORD grfUpdf,
-    LONG_PTR pReserved);
-HRESULT CALLBACK IOleCache2_DiscardCache_Proxy(
-    IOleCache2* This,
-    DWORD dwDiscardOptions);
-void __RPC_STUB IOleCache2_DiscardCache_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-
-#endif  /* __IOleCache2_INTERFACE_DEFINED__ */
-
 #ifndef __IOleCacheControl_FWD_DEFINED__
 #define __IOleCacheControl_FWD_DEFINED__
 typedef struct IOleCacheControl IOleCacheControl;
@@ -373,89 +188,4 @@ typedef struct IOleCacheControl IOleCacheControl;
 
 typedef IOleCacheControl *LPOLECACHECONTROL;
 
-/*****************************************************************************
- * IOleCacheControl interface
- */
-#ifndef __IOleCacheControl_INTERFACE_DEFINED__
-#define __IOleCacheControl_INTERFACE_DEFINED__
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-struct IOleCacheControl : public IUnknown
-{
-    virtual HRESULT STDMETHODCALLTYPE OnRun(
-        LPDATAOBJECT pDataObject) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE OnStop(
-        ) = 0;
-
-};
-#else
-typedef struct IOleCacheControlVtbl IOleCacheControlVtbl;
-
-struct IOleCacheControl {
-    const IOleCacheControlVtbl* lpVtbl;
-};
-struct IOleCacheControlVtbl {
-    ICOM_MSVTABLE_COMPAT_FIELDS
-
-    /*** IUnknown methods ***/
-    HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IOleCacheControl* This,
-        REFIID riid,
-        void** ppvObject);
-
-    ULONG (STDMETHODCALLTYPE *AddRef)(
-        IOleCacheControl* This);
-
-    ULONG (STDMETHODCALLTYPE *Release)(
-        IOleCacheControl* This);
-
-    /*** IOleCacheControl methods ***/
-    HRESULT (STDMETHODCALLTYPE *OnRun)(
-        IOleCacheControl* This,
-        LPDATAOBJECT pDataObject);
-
-    HRESULT (STDMETHODCALLTYPE *OnStop)(
-        IOleCacheControl* This);
-
-};
-
-/*** IUnknown methods ***/
-#define IOleCacheControl_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
-#define IOleCacheControl_AddRef(p) (p)->lpVtbl->AddRef(p)
-#define IOleCacheControl_Release(p) (p)->lpVtbl->Release(p)
-/*** IOleCacheControl methods ***/
-#define IOleCacheControl_OnRun(p,a) (p)->lpVtbl->OnRun(p,a)
-#define IOleCacheControl_OnStop(p) (p)->lpVtbl->OnStop(p)
-
-#endif
-
-#define IOleCacheControl_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
-    /*** IUnknown methods ***/ \
-    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
-    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
-    STDMETHOD_(ULONG,Release)(THIS) PURE; \
-    /*** IOleCacheControl methods ***/ \
-    STDMETHOD_(HRESULT,OnRun)(THIS_ LPDATAOBJECT pDataObject) PURE; \
-    STDMETHOD_(HRESULT,OnStop)(THIS) PURE;
-
-HRESULT CALLBACK IOleCacheControl_OnRun_Proxy(
-    IOleCacheControl* This,
-    LPDATAOBJECT pDataObject);
-void __RPC_STUB IOleCacheControl_OnRun_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IOleCacheControl_OnStop_Proxy(
-    IOleCacheControl* This);
-void __RPC_STUB IOleCacheControl_OnStop_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-
-#endif  /* __IOleCacheControl_INTERFACE_DEFINED__ */
-
 #endif  /* __WINE_OLEIDL_H */
index 98cf2a5..dd61dbc 100644 (file)
@@ -7,15 +7,4 @@
 
 DEFINE_GUID(IID_IServiceProvider, 0x6d5140c1, 0x7436, 0x11ce, 0x80,0x34, 0x00,0xaa,0x00,0x60,0x09,0xfa);
 
-#if (__W32API_MAJOR_VERSION < 2 || __W32API_MINOR_VERSION < 5)
-
-/*** IUnknown methods ***/
-#define IServiceProvider_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
-#define IServiceProvider_AddRef(p) (p)->lpVtbl->AddRef(p)
-#define IServiceProvider_Release(p) (p)->lpVtbl->Release(p)
-/*** IServiceProvider methods ***/
-#define IServiceProvider_QueryService(p,a,b,c) (p)->lpVtbl->QueryService(p,a,b,c)
-
-#endif /* __W32API_MAJOR_VERSION < 2 || __W32API_MINOR_VERSION < 5 */
-
 #endif  /* __WINE_SERVPROV_H */
diff --git a/reactos/include/wine/winbase.h b/reactos/include/wine/winbase.h
deleted file mode 100644 (file)
index 656ac52..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-/* $Id $
- *
- * Compatibility header
- *
- * This header is wrapper to allow compilation of Wine DLLs under ReactOS
- * build system. It contains definitions commonly refered to as Wineisms
- * and definitions that are missing in w32api.
- */
-
-#include_next <winbase.h>
-
-#ifndef __WINE_WINBASE_H
-#define __WINE_WINBASE_H
-
-#include <w32api.h>
-
-#if (__W32API_MAJOR_VERSION < 2 || __W32API_MINOR_VERSION < 5)
-
-#if (_WIN32_WINNT >= 0x0500)
-UINT WINAPI GetSystemWindowsDirectoryW(LPWSTR,UINT);
-#endif
-
-#endif /* __W32API_MAJOR_VERSION < 2 || __W32API_MINOR_VERSION < 5 */
-
-#endif /* __WINE_WINSPOOL_H */
diff --git a/reactos/include/wine/winerror.h b/reactos/include/wine/winerror.h
deleted file mode 100644 (file)
index b7eaba5..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) the Wine project
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef __WINE_WINERROR_H
-#define __WINE_WINERROR_H
-
-#include_next <winerror.h>
-#include <w32api.h>
-
-#ifdef RC_INVOKED
-#define _HRESULT_TYPEDEF_(x) (x)
-#else
-#define _HRESULT_TYPEDEF_(x) ((HRESULT)x)
-#endif
-
-/* ERROR_UNKNOWN is a placeholder for error conditions which haven't
- * been tested yet so we're not exactly sure what will be returned.
- * All instances of ERROR_UNKNOWN should be tested under Win95/NT
- * and replaced.
- */
-#define ERROR_UNKNOWN                                      99999
-#define E_UNSPEC                                           E_FAIL
-#if (__W32API_MAJOR_VERSION < 2 || __W32API_MINOR_VERSION < 5)
-#define CO_S_NOTALLINTERFACES                              _HRESULT_TYPEDEF_(0x00080012L)
-#endif
-
-#endif  /* __WINE_WINERROR_H */
index 2e92e0d..310c0c6 100644 (file)
 #include_next <winnt.h>
 #include <w32api.h>
 
-#if (__W32API_MAJOR_VERSION < 2 || __W32API_MINOR_VERSION < 5)
-#define LANG_DIVEHI    0x65
-#define LANG_GALICIAN  0x56
-#define LANG_KYRGYZ    0x40
-#define LANG_MONGOLIAN 0x50
-#define LANG_SYRIAC    0x5a
-#endif
-
 /* non standard; keep the number high enough (but < 0xff) */
 #define LANG_ESPERANTO                  0x8f
 #define LANG_WALON                      0x90
 
 #define WINE_UNUSED   __attribute__((unused))
 
-#if (__W32API_MAJOR_VERSION < 2 || __W32API_MINOR_VERSION < 5)
-
-static inline struct _TEB * NtCurrentTeb(void)
-{
- struct _TEB * pTeb;
-
-#if defined(__GNUC__)
- /* FIXME: instead of hardcoded offsets, use offsetof() - if possible */
- __asm__ __volatile__
- (
-  "movl %%fs:0x18, %0\n" /* fs:18h == Teb->Tib.Self */
-  : "=r" (pTeb) /* can't have two memory operands */
-  : /* no inputs */
- );
-#elif defined(_MSC_VER)
- __asm mov eax, fs:0x18
- __asm mov pTeb, eax
-#else
-#error Unknown compiler for inline assembler
-#endif
-
- return pTeb;
-}
-
-#if (_WIN32_WINNT >= 0x0500)
-typedef LONG (WINAPI *PVECTORED_EXCEPTION_HANDLER)(PEXCEPTION_POINTERS);
-#endif
-
-/* Fix buggy definition in w32api 2.4 */
-#undef INVALID_FILE_ATTRIBUTES
-#define INVALID_FILE_ATTRIBUTES ((DWORD) (-1))
-
-#endif /* __W32API_MAJOR_VERSION < 2 || __W32API_MINOR_VERSION < 5 */
-
 #endif  /* __WINE_WINNT_H */
diff --git a/reactos/include/wine/winspool.h b/reactos/include/wine/winspool.h
deleted file mode 100644 (file)
index 2e1d09e..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-/* $Id $
- *
- * Compatibility header
- *
- * This header is wrapper to allow compilation of Wine DLLs under ReactOS
- * build system. It contains definitions commonly refered to as Wineisms
- * and definitions that are missing in w32api.
- */
-
-#include_next <winspool.h>
-
-#ifndef WINE_WINSPOOL_H
-#define WINE_WINSPOOL_H
-
-#include <w32api.h>
-
-#if (__W32API_MAJOR_VERSION < 2 || __W32API_MINOR_VERSION < 5)
-
-#if _WIN32_WINNT >= 0x0500
-BOOL WINAPI GetDefaultPrinterA(LPSTR,LPDWORD);
-BOOL WINAPI GetDefaultPrinterW(LPWSTR,LPDWORD);
-#endif
-
-#endif /* __W32API_MAJOR_VERSION < 2 || __W32API_MINOR_VERSION < 5 */
-
-#endif /* WINE_WINSPOOL_H */
index 8c953f7..9a4f04b 100644 (file)
@@ -8,16 +8,6 @@
 #include <w32api.h>
 #include <wingdi.h>
 #include_next <winuser.h>
-#if (__W32API_MAJOR_VERSION >= 2) && (__W32API_MINOR_VERSION < 4)
-#ifndef _WINUSER_COMPAT_H
-#define _WINUSER_COMPAT_H
-typedef LPDLGTEMPLATE LPDLGTEMPLATEA, LPDLGTEMPLATEW;
-#if (WINVER >= _W2K)
-#define DFCS_TRANSPARENT 0x800
-#define DFCS_HOT 0x1000
-#endif /* WINVER >= _W2K */
-#endif
-#endif
 
 #define WS_EX_TRAYWINDOW 0x80000000L
 #ifndef MIM_MENUDATA
diff --git a/reactos/include/winuser.h b/reactos/include/winuser.h
deleted file mode 100644 (file)
index 856bbda..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-/* $Id $
- *
- * Compatibility header
- */
-
-#ifndef REACTOS_WINUSER_H
-#define REACTOS_WINUSER_H
-
-#include <w32api.h>
-
-#if (__W32API_MAJOR_VERSION < 2 || __W32API_MINOR_VERSION < 5)
-
-#ifdef WINVER
-#undef WINVER
-#endif
-
-#define WINVER 0x0501
-
-#endif /* __W32API_MAJOR_VERSION < 2 || __W32API_MINOR_VERSION < 5 */
-
-#include_next <winuser.h>
-
-#endif /* REACTOS_WINUSER_H */