Fix and add missing files, and will allow the use of bison as an option of choice.

svn path=/trunk/; revision=11907

reactos/lib/msi/Makefile.ros-template

@@ -4,9 +4,9 @@ TARGET_NAME = msi
 
 TARGET_OBJECTS = @C_SRCS@ @EXTRA_OBJS@
 
-TARGET_CFLAGS = -D__REACTOS__ @EXTRADEFS@
+TARGET_CFLAGS = @EXTRADEFS@ -D__REACTOS__
 
-TARGET_SDKLIBS = @IMPORTS@ libwine.a wine_uuid.a ntdll.a
+TARGET_SDKLIBS = @IMPORTS@ winmm.a libwine.a wine_uuid.a libwine_unicode.a ntdll.a
 
 TARGET_BASE = $(TARGET_BASE_LIB_WINMM)
 
@@ -14,7 +14,7 @@ TARGET_RC_SRCS = @RC_SRCS@
 TARGET_RC_BINSRC = @RC_BINSRC@
 TARGET_RC_BINARIES = @RC_BINARIES@
 
-TARGET_CLEAN = *.tab.c *.tab.h
+#TARGET_CLEAN = *.tab.c *.tab.h
 
 default: all
 
@@ -22,14 +22,18 @@ DEP_OBJECTS = $(TARGET_OBJECTS)
 
 include $(TOOLS_PATH)/depend.mk
 
+#
+#	Optional use of bison, this will allow independent building from
+#	Wine.
 #
 #	Bison is requiered for building msi.dll. If MingW32 for windows,
 #	download bison from http://gnuwin32.sourceforge.net/
 #	Make sure bison.exe is placed in your command path for execution.
 #
 #
-sql.tab.c sql.tab.h: sql.y
-	bison -p SQL_ -d ./sql.y -o sql.tab.c
 
-cond.tab.c cond.tab.h: cond.y
-	bison -p COND_ -d ./cond.y -o cond.tab.c
+#sql.tab.c sql.tab.h: sql.y
+#	bison -p SQL_ -d ./sql.y -o sql.tab.c
+
+#cond.tab.c cond.tab.h: cond.y
+#	bison -p COND_ -d ./cond.y -o cond.tab.c

reactos/lib/msi/action.c

@@ -3478,7 +3478,7 @@ static UINT ACTION_RegisterTypeLibraries(MSIPACKAGE *package)
             continue;
         }
 
-//        res = LoadTypeLib(package->files[index].TargetPath,&ptLib);
+        res = LoadTypeLib(package->files[index].TargetPath,&ptLib);
         if (SUCCEEDED(res))
         {
             WCHAR help[MAX_PATH];
@@ -3489,7 +3489,7 @@ static UINT ACTION_RegisterTypeLibraries(MSIPACKAGE *package)
 
             resolve_folder(package,helpid,help,FALSE,FALSE,NULL);
 
-//            res = RegisterTypeLib(ptLib,package->files[index].TargetPath,help);
+            res = RegisterTypeLib(ptLib,package->files[index].TargetPath,help);
             if (!SUCCEEDED(res))
                 ERR("Failed to register type library %s\n",
                      debugstr_w(package->files[index].TargetPath));
@@ -3505,7 +3505,7 @@ static UINT ACTION_RegisterTypeLibraries(MSIPACKAGE *package)
             }
 
             if (ptLib){
-                //ITypeLib_Release(ptLib);
+                ITypeLib_Release(ptLib);
                 }
         }
         else

reactos/lib/msi/cond.tab.h

@@ -0,0 +1,40 @@
+#ifndef BISON_COND_TAB_H
+# define BISON_COND_TAB_H
+
+#ifndef YYSTYPE
+typedef union
+{
+    struct cond_str str;
+    LPWSTR    string;
+    INT       value;
+    comp_int  fn_comp_int;
+    comp_str  fn_comp_str;
+    comp_m1   fn_comp_m1;
+    comp_m2   fn_comp_m2;
+} yystype;
+# define YYSTYPE yystype
+# define YYSTYPE_IS_TRIVIAL 1
+#endif
+# define	COND_SPACE	257
+# define	COND_EOF	258
+# define	COND_OR	259
+# define	COND_AND	260
+# define	COND_NOT	261
+# define	COND_LT	262
+# define	COND_GT	263
+# define	COND_EQ	264
+# define	COND_LPAR	265
+# define	COND_RPAR	266
+# define	COND_TILDA	267
+# define	COND_PERCENT	268
+# define	COND_DOLLARS	269
+# define	COND_QUESTION	270
+# define	COND_AMPER	271
+# define	COND_EXCLAM	272
+# define	COND_IDENT	273
+# define	COND_NUMBER	274
+# define	COND_LITER	275
+# define	COND_ERROR	276
+
+
+#endif /* not BISON_COND_TAB_H */

reactos/lib/msi/msi.c

@@ -40,6 +40,9 @@
 
 #include "initguid.h"
 
+UINT WINAPI MsiGetFileVersionW(LPCWSTR szFilePath, LPWSTR lpVersionBuf, DWORD* pcchVersionBuf, LPWSTR lpLangBuf, DWORD* pcchLangBuf);
+
+
 WINE_DEFAULT_DEBUG_CHANNEL(msi);
 
 /*

reactos/lib/msi/sql.tab.h

@@ -0,0 +1,165 @@
+#ifndef BISON_SQL_TAB_H
+# define BISON_SQL_TAB_H
+
+#ifndef YYSTYPE
+typedef union
+{
+    struct sql_str str;
+    LPWSTR string;
+    string_list *column_list;
+    value_list *val_list;
+    MSIVIEW *query;
+    struct expr *expr;
+    USHORT column_type;
+    create_col_info *column_info;
+    column_assignment update_col_info;
+} yystype;
+# define YYSTYPE yystype
+# define YYSTYPE_IS_TRIVIAL 1
+#endif
+# define	TK_ABORT	257
+# define	TK_AFTER	258
+# define	TK_AGG_FUNCTION	259
+# define	TK_ALL	260
+# define	TK_AND	261
+# define	TK_AS	262
+# define	TK_ASC	263
+# define	TK_BEFORE	264
+# define	TK_BEGIN	265
+# define	TK_BETWEEN	266
+# define	TK_BITAND	267
+# define	TK_BITNOT	268
+# define	TK_BITOR	269
+# define	TK_BY	270
+# define	TK_CASCADE	271
+# define	TK_CASE	272
+# define	TK_CHAR	273
+# define	TK_CHECK	274
+# define	TK_CLUSTER	275
+# define	TK_COLLATE	276
+# define	TK_COLUMN	277
+# define	TK_COMMA	278
+# define	TK_COMMENT	279
+# define	TK_COMMIT	280
+# define	TK_CONCAT	281
+# define	TK_CONFLICT	282
+# define	TK_CONSTRAINT	283
+# define	TK_COPY	284
+# define	TK_CREATE	285
+# define	TK_DEFAULT	286
+# define	TK_DEFERRABLE	287
+# define	TK_DEFERRED	288
+# define	TK_DELETE	289
+# define	TK_DELIMITERS	290
+# define	TK_DESC	291
+# define	TK_DISTINCT	292
+# define	TK_DOT	293
+# define	TK_DROP	294
+# define	TK_EACH	295
+# define	TK_ELSE	296
+# define	TK_END	297
+# define	TK_END_OF_FILE	298
+# define	TK_EQ	299
+# define	TK_EXCEPT	300
+# define	TK_EXPLAIN	301
+# define	TK_FAIL	302
+# define	TK_FLOAT	303
+# define	TK_FOR	304
+# define	TK_FOREIGN	305
+# define	TK_FROM	306
+# define	TK_FUNCTION	307
+# define	TK_GE	308
+# define	TK_GLOB	309
+# define	TK_GROUP	310
+# define	TK_GT	311
+# define	TK_HAVING	312
+# define	TK_HOLD	313
+# define	TK_IGNORE	314
+# define	TK_ILLEGAL	315
+# define	TK_IMMEDIATE	316
+# define	TK_IN	317
+# define	TK_INDEX	318
+# define	TK_INITIALLY	319
+# define	TK_ID	320
+# define	TK_INSERT	321
+# define	TK_INSTEAD	322
+# define	TK_INT	323
+# define	TK_INTEGER	324
+# define	TK_INTERSECT	325
+# define	TK_INTO	326
+# define	TK_IS	327
+# define	TK_ISNULL	328
+# define	TK_JOIN	329
+# define	TK_JOIN_KW	330
+# define	TK_KEY	331
+# define	TK_LE	332
+# define	TK_LIKE	333
+# define	TK_LIMIT	334
+# define	TK_LONG	335
+# define	TK_LONGCHAR	336
+# define	TK_LP	337
+# define	TK_LSHIFT	338
+# define	TK_LT	339
+# define	TK_LOCALIZABLE	340
+# define	TK_MATCH	341
+# define	TK_MINUS	342
+# define	TK_NE	343
+# define	TK_NOT	344
+# define	TK_NOTNULL	345
+# define	TK_NULL	346
+# define	TK_OBJECT	347
+# define	TK_OF	348
+# define	TK_OFFSET	349
+# define	TK_ON	350
+# define	TK_OR	351
+# define	TK_ORACLE_OUTER_JOIN	352
+# define	TK_ORDER	353
+# define	TK_PLUS	354
+# define	TK_PRAGMA	355
+# define	TK_PRIMARY	356
+# define	TK_RAISE	357
+# define	TK_REFERENCES	358
+# define	TK_REM	359
+# define	TK_REPLACE	360
+# define	TK_RESTRICT	361
+# define	TK_ROLLBACK	362
+# define	TK_ROW	363
+# define	TK_RP	364
+# define	TK_RSHIFT	365
+# define	TK_SELECT	366
+# define	TK_SEMI	367
+# define	TK_SET	368
+# define	TK_SHORT	369
+# define	TK_SLASH	370
+# define	TK_SPACE	371
+# define	TK_STAR	372
+# define	TK_STATEMENT	373
+# define	TK_STRING	374
+# define	TK_TABLE	375
+# define	TK_TEMP	376
+# define	TK_THEN	377
+# define	TK_TRANSACTION	378
+# define	TK_TRIGGER	379
+# define	TK_UMINUS	380
+# define	TK_UNCLOSED_STRING	381
+# define	TK_UNION	382
+# define	TK_UNIQUE	383
+# define	TK_UPDATE	384
+# define	TK_UPLUS	385
+# define	TK_USING	386
+# define	TK_VACUUM	387
+# define	TK_VALUES	388
+# define	TK_VIEW	389
+# define	TK_WHEN	390
+# define	TK_WHERE	391
+# define	TK_WILDCARD	392
+# define	END_OF_FILE	393
+# define	ILLEGAL	394
+# define	SPACE	395
+# define	UNCLOSED_STRING	396
+# define	COMMENT	397
+# define	FUNCTION	398
+# define	COLUMN	399
+
+
+#endif /* not BISON_SQL_TAB_H */