29 Oct
2008
29 Oct
'08
1:19 p.m.
Author: hyperion
Date: Wed Oct 29 08:19:21 2008
New Revision: 37054
URL: http://svn.reactos.org/svn/reactos?rev=37054&view=rev
Log:
deleted wine/mmsystem.h
deleted wine/prsht.h
deleted wine/winbase.h
deleted wine/winnetwk.h
deleted wine/winnt.h
deleted wine/winuser.h
Our SDK is in good enough shape to compile Wine: drop the #include_next hacks
Wine compatibility fixes should go either in the SDK headers themselves or in the Wine
porting SDK
Removed:
branches/the-real-msvc/include/reactos/wine/mmsystem.h
branches/the-real-msvc/include/reactos/wine/prsht.h
branches/the-real-msvc/include/reactos/wine/winbase.h
branches/the-real-msvc/include/reactos/wine/winnetwk.h
branches/the-real-msvc/include/reactos/wine/winnt.h
branches/the-real-msvc/include/reactos/wine/winuser.h
Removed: branches/the-real-msvc/include/reactos/wine/mmsystem.h
URL:
http://svn.reactos.org/svn/reactos/branches/the-real-msvc/include/reactos/w…
==============================================================================
--- branches/the-real-msvc/include/reactos/wine/mmsystem.h [iso-8859-1] (original)
+++ branches/the-real-msvc/include/reactos/wine/mmsystem.h (removed)
@@ -1,58 +1,0 @@
-/*
- * MMSYSTEM - Multimedia Wine Extension ... :-)
- *
- * 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_MMSYSTEM_H
-#define __WINE_MMSYSTEM_H
-
-#include_next <mmsystem.h>
-
-#define DRV_SUCCESS 0x0001
-#define DRV_FAILURE 0x0000
-#define DRV_EXITAPPLICATION 0x000C
-
-#define MCI_OPEN_DRIVER 0x0801
-#define MCI_CLOSE_DRIVER 0x0802
-#define MCI_SOUND 0x0812
-
-#define MCI_SOUND_NAME 0x00000100L
-
-typedef LPCSTR HPCSTR; /* a huge version of LPCSTR */
-
-typedef struct tagMCI_SOUND_PARMSA {
- DWORD_PTR dwCallback;
- LPCSTR lpstrSoundName;
-} MCI_SOUND_PARMSA, *LPMCI_SOUND_PARMSA;
-
-typedef struct tagMCI_SOUND_PARMSW {
- DWORD_PTR dwCallback;
- LPCWSTR lpstrSoundName;
-} MCI_SOUND_PARMSW, *LPMCI_SOUND_PARMSW;
-
-#ifdef UNICODE
-typedef MCI_SOUND_PARMSW MCI_SOUND_PARMS;
-#else
-typedef MCI_SOUND_PARMSA MCI_SOUND_PARMS;
-#endif
-
-typedef struct midievent_tag *LPMIDIEVENT;
-
-DWORD WINAPI GetDriverFlags(HDRVR hDriver);
-
-#endif /* __WINE_WINNT_H */
Removed: branches/the-real-msvc/include/reactos/wine/prsht.h
URL:
http://svn.reactos.org/svn/reactos/branches/the-real-msvc/include/reactos/w…
==============================================================================
--- branches/the-real-msvc/include/reactos/wine/prsht.h [iso-8859-1] (original)
+++ branches/the-real-msvc/include/reactos/wine/prsht.h (removed)
@@ -1,27 +1,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
- */
-
-#include_next <prsht.h>
-
-#ifndef __WINE_PRSHT_H
-#define __WINE_PRSHT_H
-
-#define PSH_WIZARD97_OLD 0x00002000 /* for IE < 5 */
-#define PSH_WIZARD97_NEW 0x01000000 /* for IE >= 5 */
-
-#endif /* __WINE_PRSHT_H */
Removed: branches/the-real-msvc/include/reactos/wine/winbase.h
URL:
http://svn.reactos.org/svn/reactos/branches/the-real-msvc/include/reactos/w…
==============================================================================
--- branches/the-real-msvc/include/reactos/wine/winbase.h [iso-8859-1] (original)
+++ branches/the-real-msvc/include/reactos/wine/winbase.h (removed)
@@ -1,15 +1,0 @@
-#ifndef __WINE_WINBASE_H
-#define __WINE_WINBASE_H
-
-#include_next <winbase.h>
-
-/* undocumented functions */
-
-typedef struct tagSYSLEVEL
-{
- CRITICAL_SECTION crst;
- INT level;
-} SYSLEVEL;
-
-
-#endif /* __WINE_WINBASE_H */
Removed: branches/the-real-msvc/include/reactos/wine/winnetwk.h
URL:
http://svn.reactos.org/svn/reactos/branches/the-real-msvc/include/reactos/w…
==============================================================================
--- branches/the-real-msvc/include/reactos/wine/winnetwk.h [iso-8859-1] (original)
+++ branches/the-real-msvc/include/reactos/wine/winnetwk.h (removed)
@@ -1,31 +1,0 @@
-/* $Id: winnetwk.h 20909 2006-01-15 22:25:16Z gvg $
- *
- * 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 <winnetwk.h>
-
-#ifndef __WINE_WINNETWK_H
-#define __WINE_WINNETWK_H
-
-/* WNetEnumCachedPasswords */
-typedef struct tagPASSWORD_CACHE_ENTRY
-{
- WORD cbEntry;
- WORD cbResource;
- WORD cbPassword;
- BYTE iEntry;
- BYTE nType;
- BYTE abResource[1];
-} PASSWORD_CACHE_ENTRY;
-
-typedef BOOL (CALLBACK *ENUMPASSWORDPROC)(PASSWORD_CACHE_ENTRY *, DWORD);
-DWORD WINAPI WNetCachePassword( LPSTR, WORD, LPSTR, WORD, BYTE, WORD );
-UINT WINAPI WNetEnumCachedPasswords( LPSTR, WORD, BYTE, ENUMPASSWORDPROC, DWORD);
-DWORD WINAPI WNetGetCachedPassword( LPSTR, WORD, LPSTR, LPWORD, BYTE );
-
-#endif /* __WINE_WINNETWK_H */
Removed: branches/the-real-msvc/include/reactos/wine/winnt.h
URL:
http://svn.reactos.org/svn/reactos/branches/the-real-msvc/include/reactos/w…
==============================================================================
--- branches/the-real-msvc/include/reactos/wine/winnt.h [iso-8859-1] (original)
+++ branches/the-real-msvc/include/reactos/wine/winnt.h (removed)
@@ -1,56 +1,0 @@
-/*
- * Win32 definitions for Windows NT
- *
- * Copyright 1996 Alexandre Julliard
- *
- * 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_WINNT_H
-#define __WINE_WINNT_H
-
-#include_next <winnt.h>
-
-#if defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) &&
(__GNUC_MINOR__ >= 3)))
-#define __WINE_ALLOC_SIZE(x) __attribute__((__alloc_size__(x)))
-#else
-#define __WINE_ALLOC_SIZE(x)
-#endif
-
-/* non standard; keep the number high enough (but < 0xff) */
-#define LANG_ESPERANTO 0x8f
-#define LANG_WALON 0x90
-#define LANG_CORNISH 0x91
-#define LANG_WELSH 0x92
-#define LANG_BRETON 0x93
-
-/* FIXME: these are not in the Windows header */
-#define LANG_GAELIC 0x94
-#define LANG_MALTESE 0x3a
-#define LANG_ROMANSH 0x17
-#define LANG_SAAMI 0x3b
-#define LANG_LOWER_SORBIAN 0x2e
-#define LANG_UPPER_SORBIAN 0x2e
-#define LANG_SUTU 0x30
-#define LANG_TAJIK 0x28
-#define LANG_TSONGA 0x31
-#define LANG_TSWANA 0x32
-#define LANG_VENDA 0x33
-#define LANG_XHOSA 0x34
-#define LANG_ZULU 0x35
-
-#define WINE_UNUSED __attribute__((unused))
-
-#endif /* __WINE_WINNT_H */
Removed: branches/the-real-msvc/include/reactos/wine/winuser.h
URL:
http://svn.reactos.org/svn/reactos/branches/the-real-msvc/include/reactos/w…
==============================================================================
--- branches/the-real-msvc/include/reactos/wine/winuser.h [iso-8859-1] (original)
+++ branches/the-real-msvc/include/reactos/wine/winuser.h (removed)
@@ -1,48 +1,0 @@
-#ifndef __WINE_WINUSER_H
-#define __WINE_WINUSER_H
-
-/*
- * Compatibility header
- */
-
-#include <wingdi.h>
-
-#if !defined(_MSC_VER)
-#include_next "winuser.h"
-#endif
-
-#define WS_EX_TRAYWINDOW 0x80000000L
-#define DCX_USESTYLE 0x00010000
-#define WS_EX_MANAGED 0x40000000L /* Window managed by the window system */
-#define LB_CARETOFF 0x01a4
-
-WINUSERAPI UINT WINAPI PrivateExtractIconsA(LPCSTR,int,int,int,HICON*,UINT*,UINT,UINT);
-WINUSERAPI UINT WINAPI PrivateExtractIconsW(LPCWSTR,int,int,int,HICON*,UINT*,UINT,UINT);
-
-typedef struct tagCWPSTRUCT *LPCWPSTRUCT;
-
-#define WM_ALTTABACTIVE 0x0029
-
-#define UNICODE_NOCHAR 0xFFFF
-
-#ifndef E_PROP_ID_UNSUPPORTED
-#define E_PROP_ID_UNSUPPORTED ((HRESULT)0x80070490)
-#endif
-#ifndef E_PROP_SET_UNSUPPORTED
-#define E_PROP_SET_UNSUPPORTED ((HRESULT)0x80070492)
-#endif
-
-/* MapVirtualKey translation types */
-#if 0
-#define MAPVK_VK_TO_VSC 0
-#define MAPVK_VSC_TO_VK 1
-#define MAPVK_VK_TO_CHAR 2
-#define MAPVK_VSC_TO_VK_EX 3
-#define MAPVK_VK_TO_VSC_EX 4
-#endif
-#define WM_SETVISIBLE 0x0009
-
-#define MAKEINTATOMA(atom) ((LPCSTR)((ULONG_PTR)((WORD)(atom))))
-#define MAKEINTATOMW(atom) ((LPCWSTR)((ULONG_PTR)((WORD)(atom))))
-
-#endif /* __WINE_WINUSER_H */