Modified: trunk/reactos/tools/widl/Makefile
Modified: trunk/reactos/tools/widl/client.c
Modified: trunk/reactos/tools/widl/hash.c
Modified: trunk/reactos/tools/widl/header.c
Modified: trunk/reactos/tools/widl/parser.y
Modified: trunk/reactos/tools/widl/server.c
Modified: trunk/reactos/tools/widl/utils.c
Modified: trunk/reactos/tools/widl/widltypes.h
Added: trunk/reactos/tools/widl/winglue.h
Modified: trunk/reactos/tools/widl/write_msft.c
Modified: trunk/reactos/tools/widl/y.tab.c
--- trunk/reactos/tools/widl/Makefile 2005-02-21 17:42:23 UTC (rev 13705)
+++ trunk/reactos/tools/widl/Makefile 2005-02-21 20:30:10 UTC (rev 13706)
@@ -35,7 +35,8 @@
CLEAN_FILES = *.o $(TARGET)
HOST_CFLAGS = -DYYDEBUG=1 -DINT16=SHORT -D__USE_W32API \
- -I$(LIB_WPP_DIR) -I$(PATH_TO_TOP)/include/wine -I$(PATH_TO_TOP)/include
+ -I$(LIB_WPP_DIR) -I$(PATH_TO_TOP)/include/wine \
+ -I$(PATH_TO_TOP)/include -I$(PATH_TO_TOP)/w32api/include
%.o: %.c
$(HOST_CC) $(HOST_CFLAGS) -c $< -o $@
--- trunk/reactos/tools/widl/client.c 2005-02-21 17:42:23 UTC (rev 13705)
+++ trunk/reactos/tools/widl/client.c 2005-02-21 20:30:10 UTC (rev 13706)
@@ -18,19 +18,14 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "config.h"
-
#include <stdio.h>
#include <stdlib.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
#include <string.h>
#include <assert.h>
#include <ctype.h>
#include <signal.h>
-#include "windef.h"
#include "widl.h"
#include "utils.h"
#include "parser.h"
--- trunk/reactos/tools/widl/hash.c 2005-02-21 17:42:23 UTC (rev 13705)
+++ trunk/reactos/tools/widl/hash.c 2005-02-21 20:30:10 UTC (rev 13706)
@@ -21,10 +21,7 @@
#include <stdio.h>
#include <stdarg.h>
-#include "windef.h"
-#include "winbase.h"
-#include "winnls.h"
-
+#include "widltypes.h"
#include "hash.h"
static const unsigned char Lookup_16[128 * 3] = {
--- trunk/reactos/tools/widl/header.c 2005-02-21 17:42:23 UTC (rev 13705)
+++ trunk/reactos/tools/widl/header.c 2005-02-21 20:30:10 UTC (rev 13706)
@@ -30,7 +30,6 @@
#include <ctype.h>
#include <signal.h>
-#include "windef.h"
#include "widl.h"
#include "utils.h"
#include "parser.h"
--- trunk/reactos/tools/widl/parser.y 2005-02-21 17:42:23 UTC (rev 13705)
+++ trunk/reactos/tools/widl/parser.y 2005-02-21 20:30:10 UTC (rev 13706)
@@ -31,8 +31,6 @@
#include <alloca.h>
#endif
-#include "windef.h"
-
#include "widl.h"
#include "utils.h"
#include "parser.h"
--- trunk/reactos/tools/widl/server.c 2005-02-21 17:42:23 UTC (rev 13705)
+++ trunk/reactos/tools/widl/server.c 2005-02-21 20:30:10 UTC (rev 13706)
@@ -30,7 +30,6 @@
#include <ctype.h>
#include <signal.h>
-#include "windef.h"
#include "widl.h"
#include "utils.h"
#include "parser.h"
--- trunk/reactos/tools/widl/utils.c 2005-02-21 17:42:23 UTC (rev 13705)
+++ trunk/reactos/tools/widl/utils.c 2005-02-21 20:30:10 UTC (rev 13706)
@@ -19,9 +19,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "config.h"
-#include "wine/port.h"
-
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
--- trunk/reactos/tools/widl/widltypes.h 2005-02-21 17:42:23 UTC (rev 13705)
+++ trunk/reactos/tools/widl/widltypes.h 2005-02-21 20:30:10 UTC (rev 13706)
@@ -24,6 +24,7 @@
#include <stdarg.h>
#include "guiddef.h"
#include "wine/rpcfc.h"
+#include "winglue.h"
#ifndef UUID_DEFINED
#define UUID_DEFINED
--- trunk/reactos/tools/widl/winglue.h 2005-02-21 17:42:23 UTC (rev 13705)
+++ trunk/reactos/tools/widl/winglue.h 2005-02-21 20:30:10 UTC (rev 13706)
@@ -0,0 +1,229 @@
+#ifndef _WINGLUE_H
+#define _WINGLUE_H
+
+#define LOWORD(l) ((unsigned short)(l))
+#define HIWORD(l) ((unsigned short)((unsigned long)(l) >> 16))
+#define MAKELONG(low,high) ((unsigned long)(((unsigned short)(low)) | (((unsigned long)((unsigned short)(high))) << 16)))
+
+typedef char CHAR;
+typedef int INT;
+typedef short SHORT;
+typedef unsigned char BYTE;
+typedef unsigned short WORD;
+typedef unsigned int DWORD;
+typedef unsigned int UINT;
+typedef unsigned int ULONG;
+typedef DWORD LCID;
+typedef const unsigned char *LPCSTR;
+typedef int HRESULT;
+typedef GUID *REFGUID;
+
+#define S_OK ((HRESULT)0x00000000L)
+#define S_FALSE ((HRESULT)0x00000001L)
+#define E_OUTOFMEMORY ((HRESULT)0x8007000EL)
+#define TYPE_E_IOERROR ((HRESULT)0x80028CA2L)
+
+#define LANG_NEUTRAL 0x00
+#define LANG_ARABIC 0x01
+#define LANG_BULGARIAN 0x02
+#define LANG_CATALAN 0x03
+#define LANG_CHINESE 0x04
+#define LANG_CZECH 0x05
+#define LANG_DANISH 0x06
+#define LANG_GERMAN 0x07
+#define LANG_GREEK 0x08
+#define LANG_ENGLISH 0x09
+#define LANG_SPANISH 0x0a
+#define LANG_FINNISH 0x0b
+#define LANG_FRENCH 0x0c
+#define LANG_HEBREW 0x0d
+#define LANG_HUNGARIAN 0x0e
+#define LANG_ICELANDIC 0x0f
+#define LANG_ITALIAN 0x10
+#define LANG_JAPANESE 0x11
+#define LANG_KOREAN 0x12
+#define LANG_DUTCH 0x13
+#define LANG_NORWEGIAN 0x14
+#define LANG_POLISH 0x15
+#define LANG_PORTUGUESE 0x16
+#define LANG_ROMANIAN 0x18
+#define LANG_RUSSIAN 0x19
+#define LANG_CROATIAN 0x1a
+#define LANG_SERBIAN 0x1a
+#define LANG_SLOVAK 0x1b
+#define LANG_ALBANIAN 0x1c
+#define LANG_SWEDISH 0x1d
+#define LANG_THAI 0x1e
+#define LANG_TURKISH 0x1f
+#define LANG_URDU 0x20
+#define LANG_INDONESIAN 0x21
+#define LANG_UKRAINIAN 0x22
+#define LANG_BELARUSIAN 0x23
+#define LANG_SLOVENIAN 0x24
+#define LANG_ESTONIAN 0x25
+#define LANG_LATVIAN 0x26
+#define LANG_LITHUANIAN 0x27
+#define LANG_FARSI 0x29
+#define LANG_VIETNAMESE 0x2a
+#define LANG_ARMENIAN 0x2b
+#define LANG_AZERI 0x2c
+#define LANG_BASQUE 0x2d
+#define LANG_MACEDONIAN 0x2f
+#define LANG_AFRIKAANS 0x36
+#define LANG_GEORGIAN 0x37
+#define LANG_FAEROESE 0x38
+#define LANG_HINDI 0x39
+#define LANG_MALAY 0x3e
+#define LANG_KAZAK 0x3f
+#define LANG_KYRGYZ 0x40
+#define LANG_SWAHILI 0x41
+#define LANG_UZBEK 0x43
+#define LANG_TATAR 0x44
+#define LANG_BENGALI 0x45
+#define LANG_PUNJABI 0x46
+#define LANG_GUJARATI 0x47
+#define LANG_ORIYA 0x48
+#define LANG_TAMIL 0x49
+#define LANG_TELUGU 0x4a
+#define LANG_KANNADA 0x4b
+#define LANG_MALAYALAM 0x4c
+#define LANG_ASSAMESE 0x4d
+#define LANG_MARATHI 0x4e
+#define LANG_SANSKRIT 0x4f
+#define LANG_MONGOLIAN 0x50
+#define LANG_GALICIAN 0x56
+#define LANG_KONKANI 0x57
+#define LANG_MANIPURI 0x58
+#define LANG_SINDHI 0x59
+#define LANG_SYRIAC 0x5a
+#define LANG_KASHMIRI 0x60
+#define LANG_NEPALI 0x61
+#define LANG_DIVEHI 0x65
+#define LANG_INVARIANT 0x7f
+#define SUBLANG_NEUTRAL 0x00
+#define SUBLANG_DEFAULT 0x01
+#define SUBLANG_SYS_DEFAULT 0x02
+#define SUBLANG_ARABIC_SAUDI_ARABIA 0x01
+#define SUBLANG_ARABIC_IRAQ 0x02
+#define SUBLANG_ARABIC_EGYPT 0x03
+#define SUBLANG_ARABIC_LIBYA 0x04
+#define SUBLANG_ARABIC_ALGERIA 0x05
+#define SUBLANG_ARABIC_MOROCCO 0x06
+#define SUBLANG_ARABIC_TUNISIA 0x07
+#define SUBLANG_ARABIC_OMAN 0x08
+#define SUBLANG_ARABIC_YEMEN 0x09
+#define SUBLANG_ARABIC_SYRIA 0x0a
+#define SUBLANG_ARABIC_JORDAN 0x0b
+#define SUBLANG_ARABIC_LEBANON 0x0c
+#define SUBLANG_ARABIC_KUWAIT 0x0d
+#define SUBLANG_ARABIC_UAE 0x0e
+#define SUBLANG_ARABIC_BAHRAIN 0x0f
+#define SUBLANG_ARABIC_QATAR 0x10
+#define SUBLANG_AZERI_LATIN 0x01
+#define SUBLANG_AZERI_CYRILLIC 0x02
+#define SUBLANG_CHINESE_TRADITIONAL 0x01
+#define SUBLANG_CHINESE_SIMPLIFIED 0x02
+#define SUBLANG_CHINESE_HONGKONG 0x03
+#define SUBLANG_CHINESE_SINGAPORE 0x04
+#define SUBLANG_CHINESE_MACAU 0x05
+#define SUBLANG_DUTCH 0x01
+#define SUBLANG_DUTCH_BELGIAN 0x02
+#define SUBLANG_ENGLISH_US 0x01
+#define SUBLANG_ENGLISH_UK 0x02
+#define SUBLANG_ENGLISH_AUS 0x03
+#define SUBLANG_ENGLISH_CAN 0x04
+#define SUBLANG_ENGLISH_NZ 0x05
+#define SUBLANG_ENGLISH_EIRE 0x06
+#define SUBLANG_ENGLISH_SOUTH_AFRICA 0x07
+#define SUBLANG_ENGLISH_JAMAICA 0x08
+#define SUBLANG_ENGLISH_CARIBBEAN 0x09
+#define SUBLANG_ENGLISH_BELIZE 0x0a
+#define SUBLANG_ENGLISH_TRINIDAD 0x0b
+#define SUBLANG_ENGLISH_ZIMBABWE 0x0c
+#define SUBLANG_ENGLISH_PHILIPPINES 0x0d
+#define SUBLANG_FRENCH 0x01
+#define SUBLANG_FRENCH_BELGIAN 0x02
+#define SUBLANG_FRENCH_CANADIAN 0x03
+#define SUBLANG_FRENCH_SWISS 0x04
+#define SUBLANG_FRENCH_LUXEMBOURG 0x05
+#define SUBLANG_FRENCH_MONACO 0x06
+#define SUBLANG_GERMAN 0x01
+#define SUBLANG_GERMAN_SWISS 0x02
+#define SUBLANG_GERMAN_AUSTRIAN 0x03
+#define SUBLANG_GERMAN_LUXEMBOURG 0x04
+#define SUBLANG_GERMAN_LIECHTENSTEIN 0x05
+#define SUBLANG_ITALIAN 0x01
+#define SUBLANG_ITALIAN_SWISS 0x02
+#define SUBLANG_KASHMIRI_INDIA 0x02
+#define SUBLANG_KASHMIRI_SASIA 0x02
+#define SUBLANG_KOREAN 0x01
+#define SUBLANG_LITHUANIAN 0x01
+#define SUBLANG_MALAY_MALAYSIA 0x01
+#define SUBLANG_MALAY_BRUNEI_DARUSSALAM 0x02
+#define SUBLANG_NEPALI_INDIA 0x02
+#define SUBLANG_NORWEGIAN_BOKMAL 0x01
+#define SUBLANG_NORWEGIAN_NYNORSK 0x02
+#define SUBLANG_PORTUGUESE 0x01
+#define SUBLANG_PORTUGUESE_BRAZILIAN 0x02
+#define SUBLANG_SERBIAN_LATIN 0x02
+#define SUBLANG_SERBIAN_CYRILLIC 0x03
+#define SUBLANG_SPANISH 0x01
+#define SUBLANG_SPANISH_MEXICAN 0x02
+#define SUBLANG_SPANISH_MODERN 0x03
+#define SUBLANG_SPANISH_GUATEMALA 0x04
+#define SUBLANG_SPANISH_COSTA_RICA 0x05
+#define SUBLANG_SPANISH_PANAMA 0x06
+#define SUBLANG_SPANISH_DOMINICAN_REPUBLIC 0x07
+#define SUBLANG_SPANISH_VENEZUELA 0x08
+#define SUBLANG_SPANISH_COLOMBIA 0x09
+#define SUBLANG_SPANISH_PERU 0x0a
+#define SUBLANG_SPANISH_ARGENTINA 0x0b
+#define SUBLANG_SPANISH_ECUADOR 0x0c
+#define SUBLANG_SPANISH_CHILE 0x0d
+#define SUBLANG_SPANISH_URUGUAY 0x0e
+#define SUBLANG_SPANISH_PARAGUAY 0x0f
+#define SUBLANG_SPANISH_BOLIVIA 0x10
+#define SUBLANG_SPANISH_EL_SALVADOR 0x11
+#define SUBLANG_SPANISH_HONDURAS 0x12
+#define SUBLANG_SPANISH_NICARAGUA 0x13
+#define SUBLANG_SPANISH_PUERTO_RICO 0x14
+#define SUBLANG_SWEDISH 0x01
+#define SUBLANG_SWEDISH_FINLAND 0x02
+#define SUBLANG_URDU_PAKISTAN 0x01
+#define SUBLANG_URDU_INDIA 0x02
+#define SUBLANG_UZBEK_LATIN 0x01
+#define SUBLANG_UZBEK_CYRILLIC 0x02
+
+/* 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 0x3c
+#define LANG_MALTESE 0x3a
+#define LANG_MAORI 0x28
+#define LANG_RHAETO_ROMANCE 0x17
+#define LANG_SAAMI 0x3b
+#define LANG_SORBIAN 0x2e
+#define LANG_SUTU 0x30
+#define LANG_TSONGA 0x31
+#define LANG_TSWANA 0x32
+#define LANG_VENDA 0x33
+#define LANG_XHOSA 0x34
+#define LANG_ZULU 0x35
+
+#define PRIMARYLANGID(l) ((WORD)(l)&0x3ff)
+#define LANGIDFROMLCID(l) ((WORD)(l))
+#define SUBLANGID(l) ((WORD)(l)>>10)
+
+#ifndef max
+#define max(a,b) ((a)>(b)?(a):(b))
+#endif
+#ifndef min
+#define min(a,b) ((a)<(b)?(a):(b))
+#endif
+
+#endif /* _WINGLUE_H */
--- trunk/reactos/tools/widl/write_msft.c 2005-02-21 17:42:23 UTC (rev 13705)
+++ trunk/reactos/tools/widl/write_msft.c 2005-02-21 20:30:10 UTC (rev 13706)
@@ -27,9 +27,6 @@
*
*/
-#include "config.h"
-#include "wine/port.h"
-
#include <stdlib.h>
#include <string.h>
#include <stdarg.h>
@@ -40,13 +37,6 @@
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
-#include "winerror.h"
-#include "windef.h"
-#include "winbase.h"
-#include "winnls.h"
-
-#include "wine/unicode.h"
-
#include "widltypes.h"
#include "typelib.h"
#include "typelib_struct.h"
@@ -87,12 +77,12 @@
char *typelib_segment_data[MSFT_SEG_MAX];
int typelib_segment_block_length[MSFT_SEG_MAX];
- INT typelib_typeinfo_offsets[0x200]; /* Hope that's enough. */
+ int typelib_typeinfo_offsets[0x200]; /* Hope that's enough. */
- INT *typelib_namehash_segment;
- INT *typelib_guidhash_segment;
+ int *typelib_namehash_segment;
+ int *typelib_guidhash_segment;
- INT help_string_dll_offset;
+ int help_string_dll_offset;
struct _msft_typeinfo_t *typeinfos;
struct _msft_typeinfo_t *last_typeinfo;
--- trunk/reactos/tools/widl/y.tab.c 2005-02-21 17:42:23 UTC (rev 13705)
+++ trunk/reactos/tools/widl/y.tab.c 2005-02-21 20:30:10 UTC (rev 13706)
@@ -157,8 +157,6 @@
#include <alloca.h>
#endif
-#include "windef.h"
-
#include "widl.h"
#include "utils.h"
#include "parser.h"