diff options
-rw-r--r-- | include/debug.h | 37 | ||||
-rw-r--r-- | libmsi/Makefile.am | 6 | ||||
-rw-r--r-- | libmsi/alter.c | 5 | ||||
-rw-r--r-- | libmsi/create.c | 7 | ||||
-rw-r--r-- | libmsi/database.c | 11 | ||||
-rw-r--r-- | libmsi/delete.c | 6 | ||||
-rw-r--r-- | libmsi/distinct.c | 6 | ||||
-rw-r--r-- | libmsi/drop.c | 5 | ||||
-rw-r--r-- | libmsi/handle.c | 6 | ||||
-rw-r--r-- | libmsi/insert.c | 7 | ||||
-rw-r--r-- | libmsi/msipriv.h | 18 | ||||
-rw-r--r-- | libmsi/msiquery.c | 9 | ||||
-rw-r--r-- | libmsi/query.h | 13 | ||||
-rw-r--r-- | libmsi/record.c | 11 | ||||
-rw-r--r-- | libmsi/select.c | 6 | ||||
-rw-r--r-- | libmsi/sql-parser.y | 9 | ||||
-rw-r--r-- | libmsi/storages.c | 11 | ||||
-rw-r--r-- | libmsi/streams.c | 11 | ||||
-rw-r--r-- | libmsi/string.c | 14 | ||||
-rw-r--r-- | libmsi/suminfo.c | 4 | ||||
-rw-r--r-- | libmsi/table.c | 13 | ||||
-rw-r--r-- | libmsi/tokenize.c | 3 | ||||
-rw-r--r-- | libmsi/unicode.h | 1 | ||||
-rw-r--r-- | libmsi/update.c | 6 | ||||
-rw-r--r-- | libmsi/where.c | 13 | ||||
-rw-r--r-- | libmsi/winstubs/winstubs.h | 473 | ||||
-rw-r--r-- | libmsi/winstubs/winuser.h | 14 | ||||
-rw-r--r-- | tests/test.h | 2 | ||||
-rw-r--r-- | tools/msibuild.c | 1 |
29 files changed, 39 insertions, 689 deletions
diff --git a/include/debug.h b/include/debug.h index b53b0e6..a4393c1 100644 --- a/include/debug.h +++ b/include/debug.h @@ -26,9 +26,7 @@ #include <stdlib.h> #include <string.h> #include <stdio.h> -#include <windef.h> -#include <winbase.h> -#include <winnls.h> +#include <glib.h> #ifdef __cplusplus extern "C" { @@ -71,17 +69,15 @@ static inline const char *wine_dbg_sprintf( const char *format, ...) va_list ap; va_start(ap, format); - len = _vscprintf(format, ap); + ret = g_strdup_vprintf(format, ap); + len = strlen(ret); va_end(ap); i = (i + 1) % 10; - ret = p_ret[i]; - ret = realloc(ret, len + 1); - - va_start(ap, format); - vsprintf(ret, format, ap); - va_end(ap); - return ret; + p_ret[i] = realloc(p_ret[i], len + 1); + strcpy(p_ret[i], ret); + g_free(ret); + return p_ret[i]; } #define wine_dbg_printf(format,...) (printf(format, ## __VA_ARGS__), fflush(stdout)) @@ -100,25 +96,6 @@ static inline const char *wine_dbgstr_guid( const uint8_t *id ) id[8], id[9], id[10], id[11], id[12], id[13], id[14], id[15]); } -static inline const char *wine_dbgstr_point( const POINT *pt ) -{ - if (!pt) return "(null)"; - return wine_dbg_sprintf( "(%d,%d)", pt->x, pt->y ); -} - -static inline const char *wine_dbgstr_size( const SIZE *size ) -{ - if (!size) return "(null)"; - return wine_dbg_sprintf( "(%d,%d)", size->cx, size->cy ); -} - -static inline const char *wine_dbgstr_rect( const RECT *rect ) -{ - if (!rect) return "(null)"; - return wine_dbg_sprintf( "(%d,%d)-(%d,%d)", rect->left, rect->top, - rect->right, rect->bottom ); -} - static inline const char *wine_dbgstr_longlong( unsigned long long ll ) { if (sizeof(ll) > sizeof(unsigned long) && ll >> 32) diff --git a/libmsi/Makefile.am b/libmsi/Makefile.am index 7e38a78..6f2aafa 100644 --- a/libmsi/Makefile.am +++ b/libmsi/Makefile.am @@ -1,7 +1,6 @@ lib_LTLIBRARIES = libmsi.la -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(srcdir) -I. -DUNICODE \ - -I$(srcdir)/winstubs -include $(srcdir)/winstubs/winstubs.h \ +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(srcdir) -I. \ $(GLIB_CFLAGS) $(GSF_CFLAGS) AM_CFLAGS = -Wunused -Wimplicit @@ -11,8 +10,7 @@ BUILT_SOURCES = sql-parser.c sql-parser.h noinst_HEADERS = \ list.h \ msipriv.h \ - query.h \ - unicode.h + query.h libmsi_la_SOURCES = alter.c create.c database.c delete.c distinct.c \ drop.c handle.c insert.c msiquery.c record.c select.c storages.c \ diff --git a/libmsi/alter.c b/libmsi/alter.c index 7110f05..78b3b45 100644 --- a/libmsi/alter.c +++ b/libmsi/alter.c @@ -20,13 +20,8 @@ #include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "winerror.h" #include "debug.h" #include "libmsi.h" -#include "objbase.h" -#include "objidl.h" #include "msipriv.h" #include "query.h" diff --git a/libmsi/create.c b/libmsi/create.c index 567fe77..0fe92d6 100644 --- a/libmsi/create.c +++ b/libmsi/create.c @@ -20,16 +20,9 @@ #include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "winerror.h" #include "debug.h" -#include "unicode.h" #include "libmsi.h" -#include "objbase.h" -#include "objidl.h" #include "msipriv.h" -#include "winnls.h" #include "query.h" diff --git a/libmsi/database.c b/libmsi/database.c index cbb6d7c..18fbc2e 100644 --- a/libmsi/database.c +++ b/libmsi/database.c @@ -24,18 +24,9 @@ #include <fcntl.h> #include <sys/stat.h> -#define COBJMACROS -#define NONAMELESSUNION - -#include "windef.h" -#include "winbase.h" -#include "winnls.h" #include "debug.h" -#include "unicode.h" #include "libmsi.h" #include "msipriv.h" -#include "objidl.h" -#include "objbase.h" #include "query.h" const uint8_t clsid_msi_transform[16] = { 0x82, 0x10, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,0x00, 0x00,0x00,0x00,0x00,0x00,0x46 }; @@ -492,7 +483,7 @@ void append_storage_to_db( LibmsiDatabase *db, GsfInfile *stg ) #endif } -static VOID _libmsi_database_destroy( LibmsiObject *arg ) +static void _libmsi_database_destroy( LibmsiObject *arg ) { LibmsiDatabase *db = (LibmsiDatabase *) arg; diff --git a/libmsi/delete.c b/libmsi/delete.c index 232da77..9972a32 100644 --- a/libmsi/delete.c +++ b/libmsi/delete.c @@ -20,15 +20,9 @@ #include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "winerror.h" #include "debug.h" #include "libmsi.h" -#include "objbase.h" -#include "objidl.h" #include "msipriv.h" -#include "winnls.h" #include "query.h" diff --git a/libmsi/distinct.c b/libmsi/distinct.c index 42b230d..bdc335f 100644 --- a/libmsi/distinct.c +++ b/libmsi/distinct.c @@ -20,15 +20,9 @@ #include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "winerror.h" #include "debug.h" #include "libmsi.h" -#include "objbase.h" -#include "objidl.h" #include "msipriv.h" -#include "winnls.h" #include "query.h" diff --git a/libmsi/drop.c b/libmsi/drop.c index 46303e7..399e431 100644 --- a/libmsi/drop.c +++ b/libmsi/drop.c @@ -20,13 +20,8 @@ #include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "winerror.h" #include "debug.h" #include "libmsi.h" -#include "objbase.h" -#include "objidl.h" #include "msipriv.h" #include "query.h" diff --git a/libmsi/handle.c b/libmsi/handle.c index 42710d2..e1b4494 100644 --- a/libmsi/handle.c +++ b/libmsi/handle.c @@ -18,15 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COBJMACROS - #include <stdarg.h> #include <assert.h> -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "shlwapi.h" #include "debug.h" #include "libmsi.h" #include "msipriv.h" diff --git a/libmsi/insert.c b/libmsi/insert.c index 5f7c422..97238c7 100644 --- a/libmsi/insert.c +++ b/libmsi/insert.c @@ -20,16 +20,9 @@ #include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "winerror.h" #include "debug.h" -#include "unicode.h" #include "libmsi.h" -#include "objbase.h" -#include "objidl.h" #include "msipriv.h" -#include "winnls.h" #include "query.h" diff --git a/libmsi/msipriv.h b/libmsi/msipriv.h index db55a1a..375cc51 100644 --- a/libmsi/msipriv.h +++ b/libmsi/msipriv.h @@ -23,6 +23,8 @@ #define __WINE_MSI_PRIVATE__ #include <stdarg.h> +#include <string.h> +#include <stdlib.h> #include <glib.h> #include <gsf/gsf.h> @@ -37,17 +39,15 @@ #include <gsf/gsf-outfile-msole.h> -#include "unicode.h" -#include "windef.h" -#include "winbase.h" #include "libmsi.h" -#include "objbase.h" -#include "objidl.h" -#include "winnls.h" #include "list.h" #pragma GCC visibility push(hidden) +#ifndef MAX_PATH +#define MAX_PATH PATH_MAX +#endif + #define MSI_DATASIZEMASK 0x00ff #define MSITYPE_VALID 0x0100 #define MSITYPE_LOCALIZABLE 0x200 @@ -71,12 +71,12 @@ typedef struct string_table string_table; struct LibmsiObject; typedef struct LibmsiObject LibmsiObject; -typedef VOID (*msihandledestructor)( LibmsiObject * ); +typedef void (*msihandledestructor)( LibmsiObject * ); struct LibmsiObject { unsigned magic; - LONG refcount; + int refcount; msihandledestructor destructor; }; @@ -343,7 +343,7 @@ enum StringPersistence extern int _libmsi_add_string( string_table *st, const char *data, int len, uint16_t refcount, enum StringPersistence persistence ); extern unsigned _libmsi_id_from_string_utf8( const string_table *st, const char *buffer, unsigned *id ); -extern VOID msi_destroy_stringtable( string_table *st ); +extern void msi_destroy_stringtable( string_table *st ); extern const char *msi_string_lookup_id( const string_table *st, unsigned id ); extern string_table *msi_init_string_table( unsigned *bytes_per_strref ); extern string_table *msi_load_string_table( GsfInfile *stg, unsigned *bytes_per_strref ); diff --git a/libmsi/msiquery.c b/libmsi/msiquery.c index 4a12623..0776beb 100644 --- a/libmsi/msiquery.c +++ b/libmsi/msiquery.c @@ -20,18 +20,9 @@ #include <stdarg.h> -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "winerror.h" #include "debug.h" -#include "unicode.h" #include "libmsi.h" -#include "objbase.h" -#include "objidl.h" #include "msipriv.h" -#include "winnls.h" #include "query.h" diff --git a/libmsi/query.h b/libmsi/query.h index d2c569f..78791fd 100644 --- a/libmsi/query.h +++ b/libmsi/query.h @@ -18,17 +18,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef __WINE_MSI_QUERY_H -#define __WINE_MSI_QUERY_H +#ifndef __LIBMSI_QUERY_H +#define __LIBMSI_QUERY_H #include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "objbase.h" -#include "objidl.h" -#include "msi.h" -#include "msiquery.h" +#include "libmsi.h" #include "msipriv.h" #include "list.h" @@ -141,4 +136,4 @@ unsigned msi_create_table( LibmsiDatabase *db, const char *name, column_info *co #pragma GCC visibility pop -#endif /* __WINE_MSI_QUERY_H */ +#endif /* __LIBMSI_QUERY_H */ diff --git a/libmsi/record.c b/libmsi/record.c index d792f55..df394d4 100644 --- a/libmsi/record.c +++ b/libmsi/record.c @@ -20,20 +20,9 @@ #include <stdarg.h> -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "winerror.h" #include "debug.h" -#include "unicode.h" #include "libmsi.h" #include "msipriv.h" -#include "objidl.h" -#include "winnls.h" -#include "ole2.h" - -#include "shlwapi.h" #include "query.h" diff --git a/libmsi/select.c b/libmsi/select.c index bbcce29..b200fe8 100644 --- a/libmsi/select.c +++ b/libmsi/select.c @@ -20,15 +20,9 @@ #include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "winerror.h" #include "debug.h" #include "libmsi.h" -#include "objbase.h" -#include "objidl.h" #include "msipriv.h" -#include "winnls.h" #include "query.h" diff --git a/libmsi/sql-parser.y b/libmsi/sql-parser.y index 8b76124..bbea5fd 100644 --- a/libmsi/sql-parser.y +++ b/libmsi/sql-parser.y @@ -27,12 +27,9 @@ #include <stdio.h> #include <stdlib.h> -#include "windef.h" -#include "winbase.h" #include "query.h" #include "list.h" #include "debug.h" -#include "unicode.h" #define YYLEX_PARAM info #define YYPARSE_PARAM info @@ -54,7 +51,7 @@ typedef struct LibmsiSQLInput } SQL_input; static unsigned sql_unescape_string( void *info, const struct sql_str *strdata, char **str ); -static INT sql_atoi( void *info ); +static int sql_atoi( void *info ); static int sql_lex( void *SQL_lval, SQL_input *info ); static char *parser_add_table( void *info, const char *list, const char *table ); @@ -848,11 +845,11 @@ unsigned sql_unescape_string( void *info, const struct sql_str *strdata, char ** return LIBMSI_RESULT_SUCCESS; } -INT sql_atoi( void *info ) +int sql_atoi( void *info ) { SQL_input* sql = (SQL_input*) info; const char *p = &sql->command[sql->n]; - INT i, r = 0; + int i, r = 0; for( i=0; i<sql->len; i++ ) { diff --git a/libmsi/storages.c b/libmsi/storages.c index 776ce7d..529653e 100644 --- a/libmsi/storages.c +++ b/libmsi/storages.c @@ -20,14 +20,7 @@ #include <stdarg.h> -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "ole2.h" #include "libmsi.h" -#include "objbase.h" #include "msipriv.h" #include "query.h" @@ -265,7 +258,7 @@ static unsigned storages_view_find_matching_rows(LibmsiView *view, unsigned col, unsigned val, unsigned *row, MSIITERHANDLE *handle) { LibmsiStorageView *sv = (LibmsiStorageView *)view; - unsigned index = PtrToUlong(*handle); + unsigned index = (uintptr_t)*handle; TRACE("(%d, %d): %d\n", *row, col, val); @@ -283,7 +276,7 @@ static unsigned storages_view_find_matching_rows(LibmsiView *view, unsigned col, index++; } - *handle = UlongToPtr(++index); + *handle = (MSIITERHANDLE)(uintptr_t)++index; if (index >= sv->num_rows) return LIBMSI_RESULT_NO_MORE_ITEMS; diff --git a/libmsi/streams.c b/libmsi/streams.c index 1858baf..39e2630 100644 --- a/libmsi/streams.c +++ b/libmsi/streams.c @@ -20,18 +20,11 @@ #include <stdarg.h> -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "winerror.h" #include "libmsi.h" -#include "objbase.h" #include "msipriv.h" #include "query.h" #include "debug.h" -#include "unicode.h" #define NUM_STREAMS_COLS 2 @@ -307,7 +300,7 @@ static unsigned streams_view_find_matching_rows(LibmsiView *view, unsigned col, unsigned val, unsigned *row, MSIITERHANDLE *handle) { LibmsiStreamsView *sv = (LibmsiStreamsView *)view; - unsigned index = PtrToUlong(*handle); + unsigned index = (uintptr_t)(*handle); TRACE("(%p, %d, %d, %p, %p)\n", view, col, val, row, handle); @@ -325,7 +318,7 @@ static unsigned streams_view_find_matching_rows(LibmsiView *view, unsigned col, index++; } - *handle = UlongToPtr(++index); + *handle = (MSIITERHANDLE)(uintptr_t)++index; if (index > sv->num_rows) return LIBMSI_RESULT_NO_MORE_ITEMS; diff --git a/libmsi/string.c b/libmsi/string.c index c894d06..2f3d144 100644 --- a/libmsi/string.c +++ b/libmsi/string.c @@ -20,25 +20,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COBJMACROS - #include <stdarg.h> #include <assert.h> #include <gsf/gsf-msole-utils.h> -#include "windef.h" -#include "winbase.h" -#include "winerror.h" #include "debug.h" -#include "unicode.h" #include "libmsi.h" -#include "objbase.h" -#include "objidl.h" #include "msipriv.h" -#include "winnls.h" #include "query.h" +#define CP_ACP 0 struct msistring { @@ -60,7 +52,7 @@ struct string_table static bool validate_codepage( unsigned codepage ) { switch (codepage) { - case 0: /* CP_ACP */ + case CP_ACP: case 37: case 424: case 437: case 500: case 737: case 775: case 850: case 852: case 855: case 856: case 857: case 860: case 861: case 862: case 863: case 864: case 865: case 866: case 869: case 874: case 875: @@ -115,7 +107,7 @@ static string_table *init_stringtable( int entries, unsigned codepage ) return st; } -VOID msi_destroy_stringtable( string_table *st ) +void msi_destroy_stringtable( string_table *st ) { unsigned i; diff --git a/libmsi/suminfo.c b/libmsi/suminfo.c index cc71ae8..610fb95 100644 --- a/libmsi/suminfo.c +++ b/libmsi/suminfo.c @@ -22,11 +22,7 @@ #include <time.h> #include <assert.h> -#define COBJMACROS -#define NONAMELESSUNION - #include "debug.h" -#include "unicode.h" #include "libmsi.h" #include "msipriv.h" diff --git a/libmsi/table.c b/libmsi/table.c index 4366a9e..d22ecd2 100644 --- a/libmsi/table.c +++ b/libmsi/table.c @@ -21,22 +21,11 @@ #include <stdarg.h> #include <assert.h> -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -#include "windef.h" -#include "winbase.h" -#include "winerror.h" #include "libmsi.h" -#include "objbase.h" -#include "objidl.h" -#include "winnls.h" #include "msipriv.h" #include "query.h" #include "debug.h" -#include "unicode.h" #define LibmsiTable_HASH_TABLE_SIZE 37 @@ -258,7 +247,7 @@ unsigned read_stream_data( GsfInfile *stg, const char *stname, uint8_t **pdata, unsigned *psz ) { unsigned ret = LIBMSI_RESULT_FUNCTION_FAILED; - VOID *data; + void *data; unsigned sz; GsfInput *stm = NULL; char *encname; diff --git a/libmsi/tokenize.c b/libmsi/tokenize.c index c19a9ad..3d95854 100644 --- a/libmsi/tokenize.c +++ b/libmsi/tokenize.c @@ -20,9 +20,6 @@ #include <stdarg.h> #include <stdlib.h> -#include "windef.h" -#include "winbase.h" -#include "unicode.h" #include "query.h" #include "sql-parser.h" diff --git a/libmsi/unicode.h b/libmsi/unicode.h deleted file mode 100644 index d37d6ae..0000000 --- a/libmsi/unicode.h +++ /dev/null @@ -1 +0,0 @@ -/* not used */ diff --git a/libmsi/update.c b/libmsi/update.c index 7310ec4..a6456ce 100644 --- a/libmsi/update.c +++ b/libmsi/update.c @@ -20,15 +20,9 @@ #include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "winerror.h" #include "debug.h" #include "libmsi.h" -#include "objbase.h" -#include "objidl.h" #include "msipriv.h" -#include "winnls.h" #include "query.h" diff --git a/libmsi/where.c b/libmsi/where.c index f389c58..c9231ed 100644 --- a/libmsi/where.c +++ b/libmsi/where.c @@ -22,16 +22,9 @@ #include <stdarg.h> #include <assert.h> -#include "windef.h" -#include "winbase.h" -#include "winerror.h" #include "debug.h" -#include "unicode.h" #include "libmsi.h" -#include "objbase.h" -#include "objidl.h" #include "msipriv.h" -#include "winnls.h" #include "query.h" @@ -139,7 +132,7 @@ static unsigned add_row(LibmsiWhereView *wv, unsigned vals[]) wv->reorder_size = newsize; } - new = msi_alloc(FIELD_OFFSET( LibmsiRowEntry, values[wv->table_count] )); + new = msi_alloc(offsetof( LibmsiRowEntry, values[wv->table_count] )); if (!new) return LIBMSI_RESULT_OUTOFMEMORY; @@ -921,7 +914,7 @@ static unsigned where_view_find_matching_rows( LibmsiView *view, unsigned col, if (col == 0 || col > wv->col_count) return LIBMSI_RESULT_INVALID_PARAMETER; - for (i = PtrToUlong(*handle); i < wv->row_count; i++) + for (i = (uintptr_t)*handle; i < wv->row_count; i++) { if (view->ops->fetch_int( view, i, col, &row_value ) != LIBMSI_RESULT_SUCCESS) continue; @@ -929,7 +922,7 @@ static unsigned where_view_find_matching_rows( LibmsiView *view, unsigned col, if (row_value == val) { *row = i; - *handle = UlongToPtr(i + 1); + *handle = (MSIITERHANDLE)(uintptr_t)(i + 1); return LIBMSI_RESULT_SUCCESS; } } diff --git a/libmsi/winstubs/winstubs.h b/libmsi/winstubs/winstubs.h deleted file mode 100644 index 9f0f51c..0000000 --- a/libmsi/winstubs/winstubs.h +++ /dev/null @@ -1,473 +0,0 @@ -#define __WINE_PROPVARUTIL_H -#define _WINSPOOL_ -#define _WINGDI_ -#define _IMM_ -#define _INC_COMMDLG -#define __servprov_h__ -#define __urlmon_h__ -#define _INC_VIRTDISK -#define _WINIOCTL_ -#define _WINNETWK_ -#define _WINPERF_ -#define _WINREG_ -#define _NTDDSCRD_H2_ -#define _WINSOCKAPI_ -#define _WINSVC_ -#define _WINSCARD_H_ -#define _INC_CDERR -#define _DDEHEADER_INCLUDED_ -#define _INC_DDEMLH -#define _DLGSH_INCLUDED_ -#define _INC_EXCPT -#define INCLUDED_TYPES_FCI_FDI -#define __fusion_h__ -#define _LZEXPAND_ -#define _MCX_H_ -#define _INC_MMSYSTEM -#define __MSIDEFS -#define NCB_INCLUDED -#define _INC_NCRYPT -#define _INC_BCRYPT -#define SAL_HXX -#define _INC_SDKDDKVER -#define _WINCON_ -#define __WINCRYPT_H__ -#define __WINEFS_H__ -#define _MSI_H_ -#define _MSIQUERY_H_ - -typedef struct tagMSG *LPMSG; -typedef struct tagREGSAM REGSAM; - -typedef struct AsyncIAdviseSink AsyncIAdviseSink; -typedef struct AsyncIAdviseSink2 AsyncIAdviseSink2; -typedef struct AsyncIMultiQI AsyncIMultiQI; -typedef struct AsyncIPipeByte AsyncIPipeByte; -typedef struct AsyncIPipeDouble AsyncIPipeDouble; -typedef struct AsyncIPipeLong AsyncIPipeLong; -typedef struct AsyncIUnknown AsyncIUnknown; -typedef struct FolderItem FolderItem; -typedef struct FolderItemVerb FolderItemVerb; -typedef struct FolderItemVerbs FolderItemVerbs; -typedef struct FolderItems FolderItems; -typedef struct IAccessible IAccessible; -typedef struct IActiveScript IActiveScript; -typedef struct IActiveScriptError IActiveScriptError; -typedef struct IActiveScriptParse IActiveScriptParse; -typedef struct IActiveScriptParseProcedure IActiveScriptParseProcedure; -typedef struct IActiveScriptParseProcedureOld IActiveScriptParseProcedureOld; -typedef struct IActiveScriptSite IActiveScriptSite; -typedef struct IActiveScriptSiteInterruptPoll IActiveScriptSiteInterruptPoll; -typedef struct IActiveScriptSiteWindow IActiveScriptSiteWindow; -typedef struct IActiveScriptStats IActiveScriptStats; -typedef struct IAddrExclusionControl IAddrExclusionControl; -typedef struct IAddrTrackingControl IAddrTrackingControl; -typedef struct IAdviseSink IAdviseSink; -typedef struct IAdviseSink2 IAdviseSink2; -typedef struct IAdviseSinkEx IAdviseSinkEx; -typedef struct IAsyncManager IAsyncManager; -typedef struct IAsyncRpcChannelBuffer IAsyncRpcChannelBuffer; -typedef struct IAuthenticate IAuthenticate; -typedef struct IBindCtx IBindCtx; -typedef struct IBindEventHandler IBindEventHandler; -typedef struct IBindHost IBindHost; -typedef struct IBindProtocol IBindProtocol; -typedef struct IBindStatusCallback IBindStatusCallback; -typedef struct IBinding IBinding; -typedef struct IBlockingLock IBlockingLock; -typedef struct ICSSFilter ICSSFilter; -typedef struct ICSSFilterSite ICSSFilterSite; -typedef struct ICallFactory ICallFactory; -typedef struct ICancelMethodCalls ICancelMethodCalls; -typedef struct ICatInformation ICatInformation; -typedef struct ICatRegister ICatRegister; -typedef struct ICatalogFileInfo ICatalogFileInfo; -typedef struct IChannelHook IChannelHook; -typedef struct IChannelMgr IChannelMgr; -typedef struct IClassActivator IClassActivator; -typedef struct IClassFactory IClassFactory; -typedef struct IClassFactory2 IClassFactory2; -typedef struct IClientSecurity IClientSecurity; -typedef struct ICodeInstall ICodeInstall; -typedef struct IConnectionPoint IConnectionPoint; -typedef struct IConnectionPointContainer IConnectionPointContainer; -typedef struct IContinue IContinue; -typedef struct IContinueCallback IContinueCallback; -typedef struct ICreateErrorInfo ICreateErrorInfo; -typedef struct ICreateTypeInfo ICreateTypeInfo; -typedef struct ICreateTypeInfo2 ICreateTypeInfo2; -typedef struct ICreateTypeLib ICreateTypeLib; -typedef struct ICreateTypeLib2 ICreateTypeLib2; -typedef struct ICustomDoc ICustomDoc; -typedef struct IDataAdviseHolder IDataAdviseHolder; -typedef struct IDataFilter IDataFilter; -typedef struct IDataObject IDataObject; -typedef struct IDeskBand IDeskBand; -typedef struct IDirectWriterLock IDirectWriterLock; -typedef struct IDispError IDispError; -typedef struct IDispatch IDispatch; -typedef struct IDispatchEx IDispatchEx; -typedef struct IDocHostShowUI IDocHostShowUI; -typedef struct IDocHostUIHandler IDocHostUIHandler; -typedef struct IDockingWindow IDockingWindow; -typedef struct IDropSource IDropSource; -typedef struct IDropTarget IDropTarget; -typedef struct IDummyHICONIncluder IDummyHICONIncluder; -typedef struct IEncodingFilterFactory IEncodingFilterFactory; -typedef struct IEnumCATEGORYINFO IEnumCATEGORYINFO; -typedef struct IEnumChannels IEnumChannels; -typedef struct IEnumCodePage IEnumCodePage; -typedef struct IEnumConnectionPoints IEnumConnectionPoints; -typedef struct IEnumConnections IEnumConnections; -typedef struct IEnumFORMATETC IEnumFORMATETC; -typedef struct IEnumGUID IEnumGUID; -typedef struct IEnumHLITEM IEnumHLITEM; -typedef struct IEnumIDList IEnumIDList; -typedef struct IEnumMoniker IEnumMoniker; -typedef struct IEnumOLEVERB IEnumOLEVERB; -typedef struct IEnumOleDocumentViews IEnumOleDocumentViews; -typedef struct IEnumOleUndoUnits IEnumOleUndoUnits; -typedef struct IEnumRfc1766 IEnumRfc1766; -typedef struct IEnumSTATDATA IEnumSTATDATA; -typedef struct IEnumSTATPROPSETSTG IEnumSTATPROPSETSTG; -typedef struct IEnumSTATPROPSTG IEnumSTATPROPSTG; -typedef struct IEnumSTATSTG IEnumSTATSTG; -typedef struct IEnumSTATURL IEnumSTATURL; -typedef struct IEnumString IEnumString; -typedef struct IEnumUnknown IEnumUnknown; -typedef struct IEnumVARIANT IEnumVARIANT; -typedef struct IErrorInfo IErrorInfo; -typedef struct IErrorLog IErrorLog; -typedef struct IExtensionServices IExtensionServices; -typedef struct IExternalConnection IExternalConnection; -typedef struct IFillLockBytes IFillLockBytes; -typedef struct IFilter IFilter; -typedef struct IFolderViewOC IFolderViewOC; -typedef struct IFont IFont; -typedef struct IFontDisp IFontDisp; -typedef struct IFontEventsDisp IFontEventsDisp; -typedef struct IForegroundTransfer IForegroundTransfer; -typedef struct IGlobalInterfaceTable IGlobalInterfaceTable; -typedef struct IHTMLAnchorElement IHTMLAnchorElement; -typedef struct IHTMLAreaElement IHTMLAreaElement; -typedef struct IHTMLAreasCollection IHTMLAreasCollection; -typedef struct IHTMLBGsound IHTMLBGsound; -typedef struct IHTMLBRElement IHTMLBRElement; -typedef struct IHTMLBaseElement IHTMLBaseElement; -typedef struct IHTMLBaseFontElement IHTMLBaseFontElement; -typedef struct IHTMLBlockElement IHTMLBlockElement; -typedef struct IHTMLBodyElement IHTMLBodyElement; -typedef struct IHTMLButtonElement IHTMLButtonElement; -typedef struct IHTMLCommentElement IHTMLCommentElement; -typedef struct IHTMLControlElement IHTMLControlElement; -typedef struct IHTMLControlRange IHTMLControlRange; -typedef struct IHTMLDDElement IHTMLDDElement; -typedef struct IHTMLDListElement IHTMLDListElement; -typedef struct IHTMLDTElement IHTMLDTElement; -typedef struct IHTMLDatabinding IHTMLDatabinding; -typedef struct IHTMLDialog IHTMLDialog; -typedef struct IHTMLDivElement IHTMLDivElement; -typedef struct IHTMLDivPosition IHTMLDivPosition; -typedef struct IHTMLDocument IHTMLDocument; -typedef struct IHTMLDocument2 IHTMLDocument2; -typedef struct IHTMLElement IHTMLElement; -typedef struct IHTMLElementCollection IHTMLElementCollection; -typedef struct IHTMLEmbedElement IHTMLEmbedElement; -typedef struct IHTMLEventObj IHTMLEventObj; -typedef struct IHTMLFieldSetElement IHTMLFieldSetElement; -typedef struct IHTMLFiltersCollection IHTMLFiltersCollection; -typedef struct IHTMLFontElement IHTMLFontElement; -typedef struct IHTMLFontNamesCollection IHTMLFontNamesCollection; -typedef struct IHTMLFontSizesCollection IHTMLFontSizesCollection; -typedef struct IHTMLFormElement IHTMLFormElement; -typedef struct IHTMLFrameBase IHTMLFrameBase; -typedef struct IHTMLFrameElement IHTMLFrameElement; -typedef struct IHTMLFrameSetElement IHTMLFrameSetElement; -typedef struct IHTMLFramesCollection2 IHTMLFramesCollection2; -typedef struct IHTMLHRElement IHTMLHRElement; -typedef struct IHTMLHeaderElement IHTMLHeaderElement; -typedef struct IHTMLIFrameElement IHTMLIFrameElement; -typedef struct IHTMLImageElementFactory IHTMLImageElementFactory; -typedef struct IHTMLImgElement IHTMLImgElement; -typedef struct IHTMLInputButtonElement IHTMLInputButtonElement; -typedef struct IHTMLInputFileElement IHTMLInputFileElement; -typedef struct IHTMLInputHiddenElement IHTMLInputHiddenElement; -typedef struct IHTMLInputImage IHTMLInputImage; -typedef struct IHTMLInputTextElement IHTMLInputTextElement; -typedef struct IHTMLIsIndexElement IHTMLIsIndexElement; -typedef struct IHTMLLIElement IHTMLLIElement; -typedef struct IHTMLLabelElement IHTMLLabelElement; -typedef struct IHTMLLegendElement IHTMLLegendElement; -typedef struct IHTMLLinkElement IHTMLLinkElement; -typedef struct IHTMLListElement IHTMLListElement; -typedef struct IHTMLLocation IHTMLLocation; -typedef struct IHTMLMapElement IHTMLMapElement; -typedef struct IHTMLMarqueeElement IHTMLMarqueeElement; -typedef struct IHTMLMetaElement IHTMLMetaElement; -typedef struct IHTMLMimeTypesCollection IHTMLMimeTypesCollection; -typedef struct IHTMLNextIdElement IHTMLNextIdElement; -typedef struct IHTMLNoShowElement IHTMLNoShowElement; -typedef struct IHTMLOListElement IHTMLOListElement; -typedef struct IHTMLObjectElement IHTMLObjectElement; -typedef struct IHTMLOpsProfile IHTMLOpsProfile; -typedef struct IHTMLOptionButtonElement IHTMLOptionButtonElement; -typedef struct IHTMLOptionElement IHTMLOptionElement; -typedef struct IHTMLOptionElementFactory IHTMLOptionElementFactory; -typedef struct IHTMLOptionsHolder IHTMLOptionsHolder; -typedef struct IHTMLParaElement IHTMLParaElement; -typedef struct IHTMLPhraseElement IHTMLPhraseElement; -typedef struct IHTMLPluginsCollection IHTMLPluginsCollection; -typedef struct IHTMLRuleStyle IHTMLRuleStyle; -typedef struct IHTMLScreen IHTMLScreen; -typedef struct IHTMLScriptElement IHTMLScriptElement; -typedef struct IHTMLSelectElement IHTMLSelectElement; -typedef struct IHTMLSelectionObject IHTMLSelectionObject; -typedef struct IHTMLSpanElement IHTMLSpanElement; -typedef struct IHTMLSpanFlow IHTMLSpanFlow; -typedef struct IHTMLStyle IHTMLStyle; -typedef struct IHTMLStyleElement IHTMLStyleElement; -typedef struct IHTMLStyleFontFace IHTMLStyleFontFace; -typedef struct IHTMLStyleSheet IHTMLStyleSheet; -typedef struct IHTMLStyleSheetRule IHTMLStyleSheetRule; -typedef struct IHTMLStyleSheetRulesCollection IHTMLStyleSheetRulesCollection; -typedef struct IHTMLStyleSheetsCollection IHTMLStyleSheetsCollection; -typedef struct IHTMLTable IHTMLTable; -typedef struct IHTMLTableCaption IHTMLTableCaption; -typedef struct IHTMLTableCell IHTMLTableCell; -typedef struct IHTMLTableCol IHTMLTableCol; -typedef struct IHTMLTableRow IHTMLTableRow; -typedef struct IHTMLTableSection IHTMLTableSection; -typedef struct IHTMLTextAreaElement IHTMLTextAreaElement; -typedef struct IHTMLTextContainer IHTMLTextContainer; -typedef struct IHTMLTextElement IHTMLTextElement; -typedef struct IHTMLTitleElement IHTMLTitleElement; -typedef struct IHTMLTxtRange IHTMLTxtRange; -typedef struct IHTMLUListElement IHTMLUListElement; -typedef struct IHTMLUnknownElement IHTMLUnknownElement; -typedef struct IHTMLWindow2 IHTMLWindow2; -typedef struct IHlink IHlink; -typedef struct IHlinkBrowseContext IHlinkBrowseContext; -typedef struct IHlinkFrame IHlinkFrame; -typedef struct IHlinkSite IHlinkSite; -typedef struct IHlinkTarget IHlinkTarget; -typedef struct IHttpNegotiate IHttpNegotiate; -typedef struct IHttpNegotiate2 IHttpNegotiate2; -typedef struct IHttpSecurity IHttpSecurity; -typedef struct IImageDecodeEventSink IImageDecodeEventSink; -typedef struct IImageDecodeFilter IImageDecodeFilter; -typedef struct IInternalUnknown IInternalUnknown; -typedef struct IInternet IInternet; -typedef struct IInternetBindInfo IInternetBindInfo; -typedef struct IInternetHostSecurityManager IInternetHostSecurityManager; -typedef struct IInternetPriority IInternetPriority; -typedef struct IInternetProtocol IInternetProtocol; -typedef struct IInternetProtocolInfo IInternetProtocolInfo; -typedef struct IInternetProtocolRoot IInternetProtocolRoot; -typedef struct IInternetProtocolSink IInternetProtocolSink; -typedef struct IInternetProtocolSinkStackable IInternetProtocolSinkStackable; -typedef struct IInternetSecurityManager IInternetSecurityManager; -typedef struct IInternetSecurityMgrSite IInternetSecurityMgrSite; -typedef struct IInternetSession IInternetSession; -typedef struct IInternetThreadSwitch IInternetThreadSwitch; -typedef struct IInternetZoneManager IInternetZoneManager; -typedef struct ILayoutStorage ILayoutStorage; -typedef struct ILockBytes ILockBytes; -typedef struct IMLangCodePages IMLangCodePages; -typedef struct IMLangConvertCharset IMLangConvertCharset; -typedef struct IMLangFontLink IMLangFontLink; -typedef struct IMLangLineBreakConsole IMLangLineBreakConsole; -typedef struct IMLangString IMLangString; -typedef struct IMLangStringAStr IMLangStringAStr; -typedef struct IMLangStringBufA IMLangStringBufA; -typedef struct IMLangStringBufW IMLangStringBufW; -typedef struct IMLangStringWStr IMLangStringWStr; -typedef struct IMalloc IMalloc; -typedef struct IMallocSpy IMallocSpy; -typedef struct IMapMIMEToCLSID IMapMIMEToCLSID; -typedef struct IMarshal IMarshal; -typedef struct IMarshal2 IMarshal2; -typedef struct IMessageFilter IMessageFilter; -typedef struct IMimeInfo IMimeInfo; -typedef struct IMoniker IMoniker; -typedef struct IMonikerProp IMonikerProp; -typedef struct IMultiLanguage IMultiLanguage; -typedef struct IMultiQI IMultiQI; -typedef struct IObjectIdentity IObjectIdentity; -typedef struct IObjectSafety IObjectSafety; -typedef struct IObjectWithSite IObjectWithSite; -typedef struct IOleAdviseHolder IOleAdviseHolder; -typedef struct IOleCache IOleCache; -typedef struct IOleCache2 IOleCache2; -typedef struct IOleCacheControl IOleCacheControl; -typedef struct IOleClientSite IOleClientSite; -typedef struct IOleCommandTarget IOleCommandTarget; -typedef struct IOleContainer IOleContainer; -typedef struct IOleControl IOleControl; -typedef struct IOleControlSite IOleControlSite; -typedef struct IOleDocument IOleDocument; -typedef struct IOleDocumentSite IOleDocumentSite; -typedef struct IOleDocumentView IOleDocumentView; -typedef struct IOleInPlaceActiveObject IOleInPlaceActiveObject; -typedef struct IOleInPlaceFrame IOleInPlaceFrame; -typedef struct IOleInPlaceObject IOleInPlaceObject; -typedef struct IOleInPlaceObjectWindowless IOleInPlaceObjectWindowless; -typedef struct IOleInPlaceSite IOleInPlaceSite; -typedef struct IOleInPlaceSiteEx IOleInPlaceSiteEx; -typedef struct IOleInPlaceSiteWindowless IOleInPlaceSiteWindowless; -typedef struct IOleInPlaceUIWindow IOleInPlaceUIWindow; -typedef struct IOleItemContainer IOleItemContainer; -typedef struct IOleLink IOleLink; -typedef struct IOleObject IOleObject; -typedef struct IOleParentUndoUnit IOleParentUndoUnit; -typedef struct IOleUndoManager IOleUndoManager; -typedef struct IOleUndoUnit IOleUndoUnit; -typedef struct IOleWindow IOleWindow; -typedef struct IOmHistory IOmHistory; -typedef struct IOmNavigator IOmNavigator; -typedef struct IOplockStorage IOplockStorage; -typedef struct IPSFactoryBuffer IPSFactoryBuffer; -typedef struct IParseDisplayName IParseDisplayName; -typedef struct IPerPropertyBrowsing IPerPropertyBrowsing; -typedef struct IPersist IPersist; -typedef struct IPersistFile IPersistFile; -typedef struct IPersistFolder IPersistFolder; -typedef struct IPersistFolder2 IPersistFolder2; -typedef struct IPersistHistory IPersistHistory; -typedef struct IPersistMemory IPersistMemory; -typedef struct IPersistMoniker IPersistMoniker; -typedef struct IPersistPropertyBag IPersistPropertyBag; -typedef struct IPersistPropertyBag2 IPersistPropertyBag2; -typedef struct IPersistStorage IPersistStorage; -typedef struct IPersistStream IPersistStream; -typedef struct IPersistStreamInit IPersistStreamInit; -typedef struct IPicture IPicture; -typedef struct IPictureDisp IPictureDisp; -typedef struct IPipeByte IPipeByte; -typedef struct IPipeDouble IPipeDouble; -typedef struct IPipeLong IPipeLong; -typedef struct IPointerInactive IPointerInactive; -typedef struct IPrint IPrint; -typedef struct IProgressNotify IProgressNotify; -typedef struct IPropertyBag IPropertyBag; -typedef struct IPropertyBag2 IPropertyBag2; -typedef struct IPropertyNotifySink IPropertyNotifySink; -typedef struct IPropertyPage IPropertyPage; -typedef struct IPropertyPage2 IPropertyPage2; -typedef struct IPropertyPageSite IPropertyPageSite; -typedef struct IPropertySetStorage IPropertySetStorage; -typedef struct IPropertyStorage IPropertyStorage; -typedef struct IProvideClassInfo IProvideClassInfo; -typedef struct IProvideClassInfo2 IProvideClassInfo2; -typedef struct IProvideMultipleClassInfo IProvideMultipleClassInfo; -typedef struct IQuickActivate IQuickActivate; -typedef struct IROTData IROTData; -typedef struct IRecordInfo IRecordInfo; -typedef struct IReleaseMarshalBuffers IReleaseMarshalBuffers; -typedef struct IRootStorage IRootStorage; -typedef struct IRpcChannelBuffer IRpcChannelBuffer; -typedef struct IRpcChannelBuffer2 IRpcChannelBuffer2; -typedef struct IRpcChannelBuffer3 IRpcChannelBuffer3; -typedef struct IRpcHelper IRpcHelper; -typedef struct IRpcOptions IRpcOptions; -typedef struct IRpcProxyBuffer IRpcProxyBuffer; -typedef struct IRpcStubBuffer IRpcStubBuffer; -typedef struct IRpcSyntaxNegotiate IRpcSyntaxNegotiate; -typedef struct IRunnableObject IRunnableObject; -typedef struct IRunningObjectTable IRunningObjectTable; -typedef struct ISequentialStream ISequentialStream; -typedef struct IServerSecurity IServerSecurity; -typedef struct IServiceProvider IServiceProvider; -typedef struct IShellBrowser IShellBrowser; -typedef struct IShellDispatch IShellDispatch; -typedef struct IShellExtInit IShellExtInit; -typedef struct IShellFolder IShellFolder; -typedef struct IShellFolderViewDual IShellFolderViewDual; -typedef struct IShellLinkA IShellLinkA; -typedef struct IShellLinkDual IShellLinkDual; -typedef struct IShellLinkW IShellLinkW; -typedef struct IShellPropSheetExt IShellPropSheetExt; -typedef struct IShellUIHelper IShellUIHelper; -typedef struct IShellView IShellView; -typedef struct IShellView2 IShellView2; -typedef struct IShellWindows IShellWindows; -typedef struct ISimpleFrameSite ISimpleFrameSite; -typedef struct ISoftDistExt ISoftDistExt; -typedef struct ISpecifyPropertyPages ISpecifyPropertyPages; -typedef struct IStdMarshalInfo IStdMarshalInfo; -typedef struct IStorage IStorage; -typedef struct IStream IStream; -typedef struct ISubscriptionMgr ISubscriptionMgr; -typedef struct ISupportErrorInfo ISupportErrorInfo; -typedef struct ISurrogate ISurrogate; -typedef struct ISynchronize ISynchronize; -typedef struct ISynchronizeContainer ISynchronizeContainer; -typedef struct ISynchronizeEvent ISynchronizeEvent; -typedef struct ISynchronizeHandle ISynchronizeHandle; -typedef struct ISynchronizeMutex ISynchronizeMutex; -typedef struct IThumbnailExtractor IThumbnailExtractor; -typedef struct ITimeAndNoticeControl ITimeAndNoticeControl; -typedef struct ITimer ITimer; -typedef struct ITimerService ITimerService; -typedef struct ITimerSink ITimerSink; -typedef struct ITypeChangeEvents ITypeChangeEvents; -typedef struct ITypeComp ITypeComp; -typedef struct ITypeFactory ITypeFactory; -typedef struct ITypeInfo ITypeInfo; -typedef struct ITypeInfo2 ITypeInfo2; -typedef struct ITypeLib ITypeLib; -typedef struct ITypeLib2 ITypeLib2; -typedef struct ITypeMarshal ITypeMarshal; -typedef struct IUnknown IUnknown; -typedef struct IUrlHistoryNotify IUrlHistoryNotify; -typedef struct IUrlHistoryStg IUrlHistoryStg; -typedef struct IUrlHistoryStg2 IUrlHistoryStg2; -typedef struct IUrlMon IUrlMon; -typedef struct IVariantChangeType IVariantChangeType; -typedef struct IViewObject IViewObject; -typedef struct IViewObject2 IViewObject2; -typedef struct IViewObjectEx IViewObjectEx; -typedef struct IWaitMultiple IWaitMultiple; -typedef struct IWebBrowser IWebBrowser; -typedef struct IWebBrowser2 IWebBrowser2; -typedef struct IWebBrowserApp IWebBrowserApp; -typedef struct IWinInetHttpInfo IWinInetHttpInfo; -typedef struct IWinInetInfo IWinInetInfo; -typedef struct IWindowForBindingUI IWindowForBindingUI; -typedef struct IWrappedProtocol IWrappedProtocol; -typedef struct IXMLAttribute IXMLAttribute; -typedef struct IXMLDOMAttribute IXMLDOMAttribute; -typedef struct IXMLDOMCDATASection IXMLDOMCDATASection; -typedef struct IXMLDOMCharacterData IXMLDOMCharacterData; -typedef struct IXMLDOMComment IXMLDOMComment; -typedef struct IXMLDOMDocument IXMLDOMDocument; -typedef struct IXMLDOMDocumentFragment IXMLDOMDocumentFragment; -typedef struct IXMLDOMDocumentType IXMLDOMDocumentType; -typedef struct IXMLDOMElement IXMLDOMElement; -typedef struct IXMLDOMEntity IXMLDOMEntity; -typedef struct IXMLDOMEntityReference IXMLDOMEntityReference; -typedef struct IXMLDOMImplementation IXMLDOMImplementation; -typedef struct IXMLDOMNamedNodeMap IXMLDOMNamedNodeMap; -typedef struct IXMLDOMNode IXMLDOMNode; -typedef struct IXMLDOMNodeList IXMLDOMNodeList; -typedef struct IXMLDOMNotation IXMLDOMNotation; -typedef struct IXMLDOMParseError IXMLDOMParseError; -typedef struct IXMLDOMProcessingInstruction IXMLDOMProcessingInstruction; -typedef struct IXMLDOMText IXMLDOMText; -typedef struct IXMLDSOControl IXMLDSOControl; -typedef struct IXMLDocument IXMLDocument; -typedef struct IXMLDocument2 IXMLDocument2; -typedef struct IXMLElement IXMLElement; -typedef struct IXMLElement2 IXMLElement2; -typedef struct IXMLElementCollection IXMLElementCollection; -typedef struct IXMLError IXMLError; -typedef struct IXMLHttpRequest IXMLHttpRequest; -typedef struct IXTLRuntime IXTLRuntime; -typedef struct OLEDBSimpleProvider OLEDBSimpleProvider; -typedef struct OLEDBSimpleProviderListener OLEDBSimpleProviderListener; -typedef struct XMLDOMDocumentEvents XMLDOMDocumentEvents; - -typedef struct DOMDocument DOMDocument; -typedef struct DOMFreeThreadedDocument DOMFreeThreadedDocument; -typedef struct XMLDSOControl XMLDSOControl; -typedef struct XMLDocument XMLDocument; -typedef struct XMLHTTPRequest XMLHTTPRequest; diff --git a/libmsi/winstubs/winuser.h b/libmsi/winstubs/winuser.h deleted file mode 100644 index 2241efe..0000000 --- a/libmsi/winstubs/winuser.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef _WINUSER_ -#define _WINUSER_ - -#include <_mingw_unicode.h> - -#define wvsprintf __MINGW_NAME_AW(wvsprintf) -#define wsprintf __MINGW_NAME_AW(wsprintf) - -int WINAPI wvsprintfA(LPSTR,LPCSTR,va_list arglist); -int WINAPI wvsprintfW(LPWSTR,LPCWSTR,va_list arglist); -int WINAPIV wsprintfA(LPSTR,LPCSTR,...); -int WINAPIV wsprintfW(LPWSTR,LPCWSTR,...); - -#endif diff --git a/tests/test.h b/tests/test.h index 72234df..3085f89 100644 --- a/tests/test.h +++ b/tests/test.h @@ -1,6 +1,6 @@ #include <stdarg.h> #include <stdbool.h> -#include "debug.h" +#include <stdio.h> #define todo_wine if(0) diff --git a/tools/msibuild.c b/tools/msibuild.c index ce77f96..bc588f4 100644 --- a/tools/msibuild.c +++ b/tools/msibuild.c @@ -24,6 +24,7 @@ #include <unistd.h> #include <sys/stat.h> #include <libmsi.h> +#include <limits.h> #ifdef HAVE_LIBUUID #include <uuid.h> |