[ros-diffs] [cwittich] 38889: sync msi to wine 1.1.13

cwittich at svn.reactos.org cwittich at svn.reactos.org
Sun Jan 18 13:52:02 CET 2009


Author: cwittich
Date: Sun Jan 18 06:52:01 2009
New Revision: 38889

URL: http://svn.reactos.org/svn/reactos?rev=38889&view=rev
Log:
sync msi to wine 1.1.13

Modified:
    trunk/reactos/dll/win32/msi/action.c
    trunk/reactos/dll/win32/msi/appsearch.c
    trunk/reactos/dll/win32/msi/automation.c
    trunk/reactos/dll/win32/msi/classes.c
    trunk/reactos/dll/win32/msi/database.c
    trunk/reactos/dll/win32/msi/dialog.c
    trunk/reactos/dll/win32/msi/files.c
    trunk/reactos/dll/win32/msi/font.c
    trunk/reactos/dll/win32/msi/format.c
    trunk/reactos/dll/win32/msi/handle.c
    trunk/reactos/dll/win32/msi/install.c
    trunk/reactos/dll/win32/msi/media.c
    trunk/reactos/dll/win32/msi/msi.c
    trunk/reactos/dll/win32/msi/msi_main.c
    trunk/reactos/dll/win32/msi/msipriv.h
    trunk/reactos/dll/win32/msi/msiquery.c
    trunk/reactos/dll/win32/msi/package.c
    trunk/reactos/dll/win32/msi/preview.c
    trunk/reactos/dll/win32/msi/record.c
    trunk/reactos/dll/win32/msi/registry.c
    trunk/reactos/dll/win32/msi/string.c
    trunk/reactos/dll/win32/msi/suminfo.c
    trunk/reactos/dll/win32/msi/table.c
    trunk/reactos/dll/win32/msi/upgrade.c

Modified: trunk/reactos/dll/win32/msi/action.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/action.c?rev=38889&r1=38888&r2=38889&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msi/action.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/action.c [iso-8859-1] Sun Jan 18 06:52:01 2009
@@ -887,7 +887,7 @@
 
 static UINT ITERATE_Actions(MSIRECORD *row, LPVOID param)
 {
-    iterate_action_param *iap= (iterate_action_param*)param;
+    iterate_action_param *iap = param;
     UINT rc;
     LPCWSTR cond, action;
 
@@ -1125,7 +1125,7 @@
 
 static UINT ITERATE_CreateFolders(MSIRECORD *row, LPVOID param)
 {
-    MSIPACKAGE *package = (MSIPACKAGE*)param;
+    MSIPACKAGE *package = param;
     LPCWSTR dir;
     LPWSTR full_path;
     MSIRECORD *uirow;
@@ -1307,7 +1307,7 @@
 
 static UINT iterate_load_featurecomponents(MSIRECORD *row, LPVOID param)
 {
-    _ilfs* ilfs= (_ilfs*)param;
+    _ilfs* ilfs = param;
     LPCWSTR component;
     MSICOMPONENT *comp;
 
@@ -1345,7 +1345,7 @@
 
 static UINT load_feature(MSIRECORD * row, LPVOID param)
 {
-    MSIPACKAGE* package = (MSIPACKAGE*)param;
+    MSIPACKAGE* package = param;
     MSIFEATURE* feature;
     static const WCHAR Query1[] = 
         {'S','E','L','E','C','T',' ',
@@ -1404,7 +1404,7 @@
 
 static UINT find_feature_children(MSIRECORD * row, LPVOID param)
 {
-    MSIPACKAGE* package = (MSIPACKAGE*)param;
+    MSIPACKAGE* package = param;
     MSIFEATURE *parent, *child;
 
     child = find_feature_by_name( package, MSI_RecordGetString( row, 1 ) );
@@ -1497,7 +1497,7 @@
 
 static UINT load_file(MSIRECORD *row, LPVOID param)
 {
-    MSIPACKAGE* package = (MSIPACKAGE*)param;
+    MSIPACKAGE* package = param;
     LPCWSTR component;
     MSIFILE *file;
 
@@ -2033,7 +2033,7 @@
 
 static UINT ITERATE_CostFinalizeDirectories(MSIRECORD *row, LPVOID param)
 {
-    MSIPACKAGE *package = (MSIPACKAGE*)param;
+    MSIPACKAGE *package = param;
     LPCWSTR name;
     LPWSTR path;
     MSIFOLDER *f;
@@ -2058,7 +2058,7 @@
 
 static UINT ITERATE_CostFinalizeConditions(MSIRECORD *row, LPVOID param)
 {
-    MSIPACKAGE *package = (MSIPACKAGE*)param;
+    MSIPACKAGE *package = param;
     LPCWSTR name;
     MSIFEATURE *feature;
 
@@ -2391,7 +2391,7 @@
 
 static UINT ITERATE_WriteRegistryValues(MSIRECORD *row, LPVOID param)
 {
-    MSIPACKAGE *package = (MSIPACKAGE*)param;
+    MSIPACKAGE *package = param;
     static const WCHAR szHCR[] = 
         {'H','K','E','Y','_','C','L','A','S','S','E','S','_',
          'R','O','O','T','\\',0};
@@ -2640,7 +2640,7 @@
 
 static UINT ITERATE_LaunchConditions(MSIRECORD *row, LPVOID param)
 {
-    MSIPACKAGE* package = (MSIPACKAGE*)param;
+    MSIPACKAGE* package = param;
     LPCWSTR cond = NULL; 
     LPCWSTR message = NULL;
     UINT r;
@@ -3052,7 +3052,7 @@
 
 static UINT ITERATE_RegisterTypeLibraries(MSIRECORD *row, LPVOID param)
 {
-    MSIPACKAGE* package = (MSIPACKAGE*)param;
+    MSIPACKAGE* package = param;
     LPCWSTR component;
     MSICOMPONENT *comp;
     MSIFILE *file;
@@ -3168,7 +3168,7 @@
 
 static UINT ITERATE_CreateShortcuts(MSIRECORD *row, LPVOID param)
 {
-    MSIPACKAGE *package = (MSIPACKAGE*)param;
+    MSIPACKAGE *package = param;
     LPWSTR target_file, target_folder, filename;
     LPCWSTR buffer, extension;
     MSICOMPONENT *comp;
@@ -3338,7 +3338,7 @@
 
 static UINT ITERATE_PublishIcon(MSIRECORD *row, LPVOID param)
 {
-    MSIPACKAGE* package = (MSIPACKAGE*)param;
+    MSIPACKAGE* package = param;
     HANDLE the_file;
     LPWSTR FilePath;
     LPCWSTR FileName;
@@ -3708,7 +3708,7 @@
 
 static UINT ITERATE_WriteIniValues(MSIRECORD *row, LPVOID param)
 {
-    MSIPACKAGE *package = (MSIPACKAGE*)param;
+    MSIPACKAGE *package = param;
     LPCWSTR component, section, key, value, identifier, dirproperty;
     LPWSTR deformated_section, deformated_key, deformated_value;
     LPWSTR folder, filename, fullname = NULL;
@@ -3834,7 +3834,7 @@
 
 static UINT ITERATE_SelfRegModules(MSIRECORD *row, LPVOID param)
 {
-    MSIPACKAGE *package = (MSIPACKAGE*)param;
+    MSIPACKAGE *package = param;
     LPCWSTR filename;
     LPWSTR FullName;
     MSIFILE *file;
@@ -4544,7 +4544,7 @@
 
 static UINT ITERATE_PublishComponent(MSIRECORD *rec, LPVOID param)
 {
-    MSIPACKAGE *package = (MSIPACKAGE*)param;
+    MSIPACKAGE *package = param;
     LPCWSTR compgroupid=NULL;
     LPCWSTR feature=NULL;
     LPCWSTR text = NULL;
@@ -4640,7 +4640,7 @@
 
 static UINT ITERATE_InstallService(MSIRECORD *rec, LPVOID param)
 {
-    MSIPACKAGE *package = (MSIPACKAGE*)param;
+    MSIPACKAGE *package = param;
     MSIRECORD *row;
     MSIFILE *file;
     SC_HANDLE hscm, service = NULL;
@@ -4781,7 +4781,7 @@
 
 static UINT ITERATE_StartService(MSIRECORD *rec, LPVOID param)
 {
-    MSIPACKAGE *package = (MSIPACKAGE *)param;
+    MSIPACKAGE *package = param;
     MSICOMPONENT *comp;
     SC_HANDLE scm, service = NULL;
     LPCWSTR name, *vector = NULL;
@@ -4894,7 +4894,7 @@
 
 static UINT ITERATE_StopService(MSIRECORD *rec, LPVOID param)
 {
-    MSIPACKAGE *package = (MSIPACKAGE *)param;
+    MSIPACKAGE *package = param;
     MSICOMPONENT *comp;
     SERVICE_STATUS status;
     SERVICE_STATUS_PROCESS ssp;
@@ -4991,7 +4991,7 @@
 
 static UINT ITERATE_InstallODBCDriver( MSIRECORD *rec, LPVOID param )
 {
-    MSIPACKAGE *package = (MSIPACKAGE*)param;
+    MSIPACKAGE *package = param;
     LPWSTR driver, driver_path, ptr;
     WCHAR outpath[MAX_PATH];
     MSIFILE *driver_file, *setup_file;
@@ -5057,7 +5057,7 @@
 
 static UINT ITERATE_InstallODBCTranslator( MSIRECORD *rec, LPVOID param )
 {
-    MSIPACKAGE *package = (MSIPACKAGE*)param;
+    MSIPACKAGE *package = param;
     LPWSTR translator, translator_path, ptr;
     WCHAR outpath[MAX_PATH];
     MSIFILE *translator_file, *setup_file;
@@ -5606,7 +5606,7 @@
     {
         file = LIST_ENTRY(list_head(&files.entry), FILE_LIST, entry);
 
-        msi_move_file((LPCWSTR)file->source, (LPCWSTR)file->dest, options);
+        msi_move_file(file->source, file->dest, options);
 
         list_remove(&file->entry);
         free_file_entry(file);
@@ -5866,7 +5866,7 @@
 
 static UINT parse_assembly_name(MSIRECORD *rec, LPVOID param)
 {
-    ASSEMBLY_NAME *asmname = (ASSEMBLY_NAME *)param;
+    ASSEMBLY_NAME *asmname = param;
     LPCWSTR name = MSI_RecordGetString(rec, 2);
     LPWSTR val = msi_dup_record_field(rec, 3);
 
@@ -5986,7 +5986,7 @@
 
 static UINT load_assembly(MSIRECORD *rec, LPVOID param)
 {
-    ASSEMBLY_LIST *list = (ASSEMBLY_LIST *)param;
+    ASSEMBLY_LIST *list = param;
     MSIASSEMBLY *assembly;
 
     assembly = msi_alloc_zero(sizeof(MSIASSEMBLY));
@@ -6091,7 +6091,7 @@
 {
     MSIASSEMBLY *assembly;
     WCHAR temppath[MAX_PATH];
-    struct list *assemblies = (struct list *)user;
+    struct list *assemblies = user;
     UINT r;
 
     if (!find_assembly(assemblies, file, &assembly))

Modified: trunk/reactos/dll/win32/msi/appsearch.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/appsearch.c?rev=38889&r1=38888&r2=38889&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msi/appsearch.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/appsearch.c [iso-8859-1] Sun Jan 18 06:52:01 2009
@@ -639,8 +639,7 @@
                     VerQueryValueW(buf, rootW, &subBlock, &versionLen);
                 if (subBlock)
                 {
-                    VS_FIXEDFILEINFO *info =
-                     (VS_FIXEDFILEINFO *)subBlock;
+                    VS_FIXEDFILEINFO *info = subBlock;
 
                     TRACE("Comparing file version %d.%d.%d.%d:\n",
                      HIWORD(info->dwFileVersionMS),

Modified: trunk/reactos/dll/win32/msi/automation.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/automation.c?rev=38889&r1=38888&r2=38889&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msi/automation.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/automation.c [iso-8859-1] Sun Jan 18 06:52:01 2009
@@ -1731,9 +1731,9 @@
 
                 if (V_I4(&varg0) >= REG_INDEX_CLASSES_ROOT &&
                     V_I4(&varg0) <= REG_INDEX_DYN_DATA)
-                    V_I4(&varg0) |= (UINT)HKEY_CLASSES_ROOT;
-
-                ret = RegOpenKeyW((HKEY)V_I4(&varg0), V_BSTR(&varg1), &hkey);
+                    V_I4(&varg0) |= (UINT_PTR)HKEY_CLASSES_ROOT;
+
+                ret = RegOpenKeyW((HKEY)(UINT_PTR)V_I4(&varg0), V_BSTR(&varg1), &hkey);
 
                 /* Third parameter can be VT_EMPTY, VT_I4, or VT_BSTR */
                 switch (V_VT(&varg2))

Modified: trunk/reactos/dll/win32/msi/classes.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/classes.c?rev=38889&r1=38888&r2=38889&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msi/classes.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/classes.c [iso-8859-1] Sun Jan 18 06:52:01 2009
@@ -486,7 +486,7 @@
 
 static UINT iterate_load_verb(MSIRECORD *row, LPVOID param)
 {
-    MSIPACKAGE* package = (MSIPACKAGE*)param;
+    MSIPACKAGE* package = param;
     MSIVERB *verb;
     LPCWSTR buffer;
     MSIEXTENSION *extension;
@@ -527,7 +527,7 @@
     LPCWSTR clsid;
     LPCWSTR context;
     LPCWSTR buffer;
-    MSIPACKAGE* package =(MSIPACKAGE*)param;
+    MSIPACKAGE* package = param;
     MSICLASS *cls;
     BOOL match = FALSE;
 
@@ -577,7 +577,7 @@
     MSICOMPONENT *comp;
     LPCWSTR buffer;
     LPCWSTR extension;
-    MSIPACKAGE* package =(MSIPACKAGE*)param;
+    MSIPACKAGE* package = param;
     BOOL match = FALSE;
     MSIEXTENSION *ext;
 
@@ -622,7 +622,7 @@
 static UINT iterate_all_progids(MSIRECORD *rec, LPVOID param)
 {
     LPCWSTR buffer;
-    MSIPACKAGE* package =(MSIPACKAGE*)param;
+    MSIPACKAGE* package = param;
 
     buffer = MSI_RecordGetString(rec,1);
     load_given_progid(package,buffer);
@@ -666,7 +666,7 @@
 static UINT iterate_all_mimes(MSIRECORD *rec, LPVOID param)
 {
     LPCWSTR buffer;
-    MSIPACKAGE* package =(MSIPACKAGE*)param;
+    MSIPACKAGE* package = param;
 
     buffer = MSI_RecordGetString(rec,1);
     load_given_mime(package,buffer);

Modified: trunk/reactos/dll/win32/msi/database.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/database.c?rev=38889&r1=38888&r2=38889&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msi/database.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/database.c [iso-8859-1] Sun Jan 18 06:52:01 2009
@@ -598,7 +598,7 @@
     return r;
 }
 
-UINT MSI_DatabaseImport(MSIDATABASE *db, LPCWSTR folder, LPCWSTR file)
+static UINT MSI_DatabaseImport(MSIDATABASE *db, LPCWSTR folder, LPCWSTR file)
 {
     UINT r;
     DWORD len, i;
@@ -692,7 +692,7 @@
     MSIDATABASE *db;
     UINT r;
 
-    TRACE("%lx %s %s\n",handle,debugstr_w(szFolder), debugstr_w(szFilename));
+    TRACE("%x %s %s\n",handle,debugstr_w(szFolder), debugstr_w(szFilename));
 
     db = msihandle2msiinfo( handle, MSIHANDLETYPE_DATABASE );
     if( !db )
@@ -720,7 +720,7 @@
     LPWSTR path = NULL, file = NULL;
     UINT r = ERROR_OUTOFMEMORY;
 
-    TRACE("%lx %s %s\n", handle, debugstr_a(szFolder), debugstr_a(szFilename));
+    TRACE("%x %s %s\n", handle, debugstr_a(szFolder), debugstr_a(szFilename));
 
     if( szFolder )
     {
@@ -812,7 +812,7 @@
     return ERROR_SUCCESS;
 }
 
-UINT MSI_DatabaseExport( MSIDATABASE *db, LPCWSTR table,
+static UINT MSI_DatabaseExport( MSIDATABASE *db, LPCWSTR table,
                LPCWSTR folder, LPCWSTR file )
 {
     static const WCHAR query[] = {
@@ -912,7 +912,7 @@
     MSIDATABASE *db;
     UINT r;
 
-    TRACE("%lx %s %s %s\n", handle, debugstr_w(szTable),
+    TRACE("%x %s %s %s\n", handle, debugstr_w(szTable),
           debugstr_w(szFolder), debugstr_w(szFilename));
 
     db = msihandle2msiinfo( handle, MSIHANDLETYPE_DATABASE );
@@ -941,7 +941,7 @@
     LPWSTR path = NULL, file = NULL, table = NULL;
     UINT r = ERROR_OUTOFMEMORY;
 
-    TRACE("%lx %s %s %s\n", handle, debugstr_a(szTable),
+    TRACE("%x %s %s %s\n", handle, debugstr_a(szTable),
           debugstr_a(szFolder), debugstr_a(szFilename));
 
     if( szTable )
@@ -981,7 +981,7 @@
     UINT r;
     LPWSTR table;
 
-    TRACE("(%ld, %ld, %s)\n", hDatabase, hDatabaseMerge,
+    TRACE("(%d, %d, %s)\n", hDatabase, hDatabaseMerge,
           debugstr_a(szTableName));
 
     table = strdupAtoW(szTableName);
@@ -1202,7 +1202,7 @@
 
 static UINT merge_diff_row(MSIRECORD *rec, LPVOID param)
 {
-    MERGEDATA *data = (MERGEDATA *)param;
+    MERGEDATA *data = param;
     MERGETABLE *table = data->curtable;
     MERGEROW *mergerow;
     MSIQUERY *dbview;
@@ -1257,7 +1257,7 @@
 
 static UINT merge_diff_tables(MSIRECORD *rec, LPVOID param)
 {
-    MERGEDATA *data = (MERGEDATA *)param;
+    MERGEDATA *data = param;
     MERGETABLE *table;
     MSIQUERY *dbview;
     MSIQUERY *mergeview = NULL;
@@ -1426,7 +1426,7 @@
     BOOL conflicts;
     UINT r;
 
-    TRACE("(%ld, %ld, %s)\n", hDatabase, hDatabaseMerge,
+    TRACE("(%d, %d, %s)\n", hDatabase, hDatabaseMerge,
           debugstr_w(szTableName));
 
     if (szTableName && !*szTableName)
@@ -1488,7 +1488,7 @@
     MSIDBSTATE ret = MSIDBSTATE_READ;
     MSIDATABASE *db;
 
-    TRACE("%ld\n", handle);
+    TRACE("%d\n", handle);
 
     db = msihandle2msiinfo( handle, MSIHANDLETYPE_DATABASE );
     if( !db )
@@ -1562,7 +1562,7 @@
                                              BSTR table, MSICONDITION *persistent )
 {
     msi_remote_database_impl *This = mrd_from_IWineMsiRemoteDatabase( iface );
-    *persistent = MsiDatabaseIsTablePersistentW(This->database, (LPWSTR)table);
+    *persistent = MsiDatabaseIsTablePersistentW(This->database, table);
     return S_OK;
 }
 
@@ -1570,7 +1570,7 @@
                                           BSTR table, MSIHANDLE *keys )
 {
     msi_remote_database_impl *This = mrd_from_IWineMsiRemoteDatabase( iface );
-    UINT r = MsiDatabaseGetPrimaryKeysW(This->database, (LPWSTR)table, keys);
+    UINT r = MsiDatabaseGetPrimaryKeysW(This->database, table, keys);
     return HRESULT_FROM_WIN32(r);
 }
 
@@ -1586,7 +1586,7 @@
                                     BSTR query, MSIHANDLE *view )
 {
     msi_remote_database_impl *This = mrd_from_IWineMsiRemoteDatabase( iface );
-    UINT r = MsiDatabaseOpenViewW(This->database, (LPWSTR)query, view);
+    UINT r = MsiDatabaseOpenViewW(This->database, query, view);
     return HRESULT_FROM_WIN32(r);
 }
 

Modified: trunk/reactos/dll/win32/msi/dialog.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/dialog.c?rev=38889&r1=38888&r2=38889&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msi/dialog.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/dialog.c [iso-8859-1] Sun Jan 18 06:52:01 2009
@@ -1725,7 +1725,7 @@
 /* radio buttons are a bit different from normal controls */
 static UINT msi_dialog_create_radiobutton( MSIRECORD *rec, LPVOID param )
 {
-    radio_button_group_descr *group = (radio_button_group_descr *)param;
+    radio_button_group_descr *group = param;
     msi_dialog *dialog = group->dialog;
     msi_control *control;
     LPCWSTR prop, text, name;
@@ -3032,7 +3032,7 @@
         'D','e','f','a','u','l','t','U','I','F','o','n','t',0 };
     static const WCHAR dfv[] = {
         'M','S',' ','S','h','e','l','l',' ','D','l','g',0 };
-    msi_dialog *dialog = (msi_dialog*) cs->lpCreateParams;
+    msi_dialog *dialog = cs->lpCreateParams;
     MSIRECORD *rec = NULL;
     LPWSTR title = NULL;
     RECT pos;
@@ -3152,7 +3152,7 @@
 static UINT add_rec_to_list( MSIRECORD *rec, LPVOID param )
 {
     struct rec_list *add_rec;
-    struct list *records = (struct list *)param;
+    struct list *records = param;
 
     msiobj_addref( &rec->hdr );
 
@@ -3478,6 +3478,38 @@
     return DefWindowProcW( hwnd, msg, wParam, lParam );
 }
 
+static BOOL msi_dialog_register_class( void )
+{
+    WNDCLASSW cls;
+
+    ZeroMemory( &cls, sizeof cls );
+    cls.lpfnWndProc   = MSIDialog_WndProc;
+    cls.hInstance     = NULL;
+    cls.hIcon         = LoadIconW(0, (LPWSTR)IDI_APPLICATION);
+    cls.hCursor       = LoadCursorW(0, (LPWSTR)IDC_ARROW);
+    cls.hbrBackground = (HBRUSH)(COLOR_3DFACE + 1);
+    cls.lpszMenuName  = NULL;
+    cls.lpszClassName = szMsiDialogClass;
+
+    if( !RegisterClassW( &cls ) )
+        return FALSE;
+
+    cls.lpfnWndProc   = MSIHiddenWindowProc;
+    cls.lpszClassName = szMsiHiddenWindow;
+
+    if( !RegisterClassW( &cls ) )
+        return FALSE;
+
+    uiThreadId = GetCurrentThreadId();
+
+    hMsiHiddenWindow = CreateWindowW( szMsiHiddenWindow, NULL, WS_OVERLAPPED,
+                                   0, 0, 100, 100, NULL, NULL, NULL, NULL );
+    if( !hMsiHiddenWindow )
+        return FALSE;
+
+    return TRUE;
+}
+
 /* functions that interface to other modules within MSI */
 
 msi_dialog *msi_dialog_create( MSIPACKAGE* package,
@@ -3661,38 +3693,6 @@
     msi_free( dialog );
 }
 
-BOOL msi_dialog_register_class( void )
-{
-    WNDCLASSW cls;
-
-    ZeroMemory( &cls, sizeof cls );
-    cls.lpfnWndProc   = MSIDialog_WndProc;
-    cls.hInstance     = NULL;
-    cls.hIcon         = LoadIconW(0, (LPWSTR)IDI_APPLICATION);
-    cls.hCursor       = LoadCursorW(0, (LPWSTR)IDC_ARROW);
-    cls.hbrBackground = (HBRUSH)(COLOR_3DFACE + 1);
-    cls.lpszMenuName  = NULL;
-    cls.lpszClassName = szMsiDialogClass;
-
-    if( !RegisterClassW( &cls ) )
-        return FALSE;
-
-    cls.lpfnWndProc   = MSIHiddenWindowProc;
-    cls.lpszClassName = szMsiHiddenWindow;
-
-    if( !RegisterClassW( &cls ) )
-        return FALSE;
-
-    uiThreadId = GetCurrentThreadId();
-
-    hMsiHiddenWindow = CreateWindowW( szMsiHiddenWindow, NULL, WS_OVERLAPPED,
-                                   0, 0, 100, 100, NULL, NULL, NULL, NULL );
-    if( !hMsiHiddenWindow )
-        return FALSE;
-
-    return TRUE;
-}
-
 void msi_dialog_unregister_class( void )
 {
     DestroyWindow( hMsiHiddenWindow );

Modified: trunk/reactos/dll/win32/msi/files.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/files.c?rev=38889&r1=38888&r2=38889&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msi/files.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/files.c [iso-8859-1] Sun Jan 18 06:52:01 2009
@@ -323,7 +323,7 @@
 
 static UINT ITERATE_DuplicateFiles(MSIRECORD *row, LPVOID param)
 {
-    MSIPACKAGE *package = (MSIPACKAGE*)param;
+    MSIPACKAGE *package = param;
     WCHAR dest_name[0x100];
     LPWSTR dest_path, dest;
     LPCWSTR file_key, component;
@@ -468,7 +468,7 @@
 
 static UINT ITERATE_RemoveFiles(MSIRECORD *row, LPVOID param)
 {
-    MSIPACKAGE *package = (MSIPACKAGE*)param;
+    MSIPACKAGE *package = param;
     MSICOMPONENT *comp;
     LPCWSTR component, filename, dirprop;
     UINT install_mode;

Modified: trunk/reactos/dll/win32/msi/font.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/font.c?rev=38889&r1=38888&r2=38889&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msi/font.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/font.c [iso-8859-1] Sun Jan 18 06:52:01 2009
@@ -170,7 +170,7 @@
 
 static UINT ITERATE_RegisterFonts(MSIRECORD *row, LPVOID param)
 {
-    MSIPACKAGE *package = (MSIPACKAGE*)param;
+    MSIPACKAGE *package = param;
     LPWSTR name;
     LPCWSTR filename;
     MSIFILE *file;

Modified: trunk/reactos/dll/win32/msi/format.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/format.c?rev=38889&r1=38888&r2=38889&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msi/format.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/format.c [iso-8859-1] Sun Jan 18 06:52:01 2009
@@ -913,7 +913,7 @@
     MSIPACKAGE *package;
     MSIRECORD *record;
 
-    TRACE("%ld %ld %p %p\n", hInstall, hRecord, szResult, sz);
+    TRACE("%d %d %p %p\n", hInstall, hRecord, szResult, sz);
 
     package = msihandle2msiinfo( hInstall, MSIHANDLETYPE_PACKAGE );
     if (!package)
@@ -978,7 +978,7 @@
     DWORD len, save;
     LPWSTR value;
 
-    TRACE("%ld %ld %p %p\n", hInstall, hRecord, szResult, sz);
+    TRACE("%d %d %p %p\n", hInstall, hRecord, szResult, sz);
 
     if (!hRecord)
         return ERROR_INVALID_HANDLE;

Modified: trunk/reactos/dll/win32/msi/handle.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/handle.c?rev=38889&r1=38888&r2=38889&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msi/handle.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/handle.c [iso-8859-1] Sun Jan 18 06:52:01 2009
@@ -123,7 +123,7 @@
 
     LeaveCriticalSection( &MSI_handle_cs );
 
-    TRACE("%p -> %ld\n", obj, ret );
+    TRACE("%p -> %d\n", obj, ret );
 
     return ret;
 }
@@ -147,7 +147,7 @@
 
     LeaveCriticalSection( &MSI_handle_cs );
 
-    TRACE("%p -> %ld\n", unk, ret);
+    TRACE("%p -> %d\n", unk, ret);
 
     return ret;
 }
@@ -174,7 +174,7 @@
 out:
     LeaveCriticalSection( &MSI_handle_cs );
 
-    return (void*) ret;
+    return ret;
 }
 
 IUnknown *msi_get_remote( MSIHANDLE handle )
@@ -270,7 +270,7 @@
     MSIOBJECTHDR *info = NULL;
     UINT ret = ERROR_INVALID_HANDLE;
 
-    TRACE("%lx\n",handle);
+    TRACE("%x\n",handle);
 
     if (!handle)
         return ERROR_SUCCESS;
@@ -304,7 +304,7 @@
 
     ret = ERROR_SUCCESS;
 
-    TRACE("handle %lx destroyed\n", handle+1);
+    TRACE("handle %x destroyed\n", handle+1);
 out:
     LeaveCriticalSection( &MSI_handle_cs );
     if( info )

Modified: trunk/reactos/dll/win32/msi/install.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/install.c?rev=38889&r1=38888&r2=38889&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msi/install.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/install.c [iso-8859-1] Sun Jan 18 06:52:01 2009
@@ -707,7 +707,7 @@
         break;
 
     default:
-        FIXME("%ld %d\n", hInstall, iRunMode);
+        FIXME("%d %d\n", hInstall, iRunMode);
         r = TRUE;
     }
 
@@ -727,7 +727,7 @@
     case MSIRUNMODE_RESERVED15:
         return FALSE;
     default:
-        FIXME("%ld %d %d\n", hInstall, iRunMode, fState);
+        FIXME("%d %d %d\n", hInstall, iRunMode, fState);
     }
     return TRUE;
 }
@@ -886,7 +886,7 @@
     MSIPACKAGE* package;
     UINT ret;
 
-    TRACE("%ld %s %p %p\n", hInstall, debugstr_w(szFeature), piInstalled, piAction);
+    TRACE("%d %s %p %p\n", hInstall, debugstr_w(szFeature), piInstalled, piAction);
 
     package = msihandle2msiinfo(hInstall, MSIHANDLETYPE_PACKAGE);
     if (!package)
@@ -934,7 +934,7 @@
 UINT WINAPI MsiGetFeatureCostA(MSIHANDLE hInstall, LPCSTR szFeature,
                   MSICOSTTREE iCostTree, INSTALLSTATE iState, LPINT piCost)
 {
-    FIXME("(%ld %s %i %i %p): stub\n", hInstall, debugstr_a(szFeature),
+    FIXME("(%d %s %i %i %p): stub\n", hInstall, debugstr_a(szFeature),
           iCostTree, iState, piCost);
     if (piCost) *piCost = 0;
     return ERROR_SUCCESS;
@@ -946,7 +946,7 @@
 UINT WINAPI MsiGetFeatureCostW(MSIHANDLE hInstall, LPCWSTR szFeature,
                   MSICOSTTREE iCostTree, INSTALLSTATE iState, LPINT piCost)
 {
-    FIXME("(%ld %s %i %i %p): stub\n", hInstall, debugstr_w(szFeature),
+    FIXME("(%d %s %i %i %p): stub\n", hInstall, debugstr_w(szFeature),
           iCostTree, iState, piCost);
     if (piCost) *piCost = 0;
     return ERROR_SUCCESS;
@@ -1082,7 +1082,7 @@
     MSIPACKAGE* package;
     UINT ret;
 
-    TRACE("%ld %s %p %p\n", hInstall, debugstr_w(szComponent),
+    TRACE("%d %s %p %p\n", hInstall, debugstr_w(szComponent),
            piInstalled, piAction);
 
     package = msihandle2msiinfo(hInstall, MSIHANDLETYPE_PACKAGE);
@@ -1191,7 +1191,7 @@
     MSIPACKAGE* package;
     UINT r;
 
-    TRACE("%ld %i\n", hInstall, iInstallLevel);
+    TRACE("%d %i\n", hInstall, iInstallLevel);
 
     package = msihandle2msiinfo(hInstall, MSIHANDLETYPE_PACKAGE);
     if (!package)
@@ -1232,7 +1232,7 @@
                   LPDWORD pInstallState)
 {
     if(pInstallState) *pInstallState = 1<<INSTALLSTATE_LOCAL;
-    FIXME("%ld %s %p stub returning %d\n",
+    FIXME("%d %s %p stub returning %d\n",
         hInstall, debugstr_w(szFeature), pInstallState, pInstallState ? *pInstallState : 0);
 
     return ERROR_SUCCESS;

Modified: trunk/reactos/dll/win32/msi/media.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/media.c?rev=38889&r1=38888&r2=38889&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msi/media.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/media.c [iso-8859-1] Sun Jan 18 06:52:01 2009
@@ -145,17 +145,17 @@
     return rc;
 }
 
-static void *cabinet_alloc(ULONG cb)
+static void CDECL *cabinet_alloc(ULONG cb)
 {
     return msi_alloc(cb);
 }
 
-static void cabinet_free(void *pv)
+static void CDECL cabinet_free(void *pv)
 {
     msi_free(pv);
 }
 
-static INT_PTR cabinet_open(char *pszFile, int oflag, int pmode)
+static INT_PTR CDECL cabinet_open(char *pszFile, int oflag, int pmode)
 {
     HANDLE handle;
     DWORD dwAccess = 0;
@@ -191,7 +191,7 @@
     return (INT_PTR)handle;
 }
 
-static UINT cabinet_read(INT_PTR hf, void *pv, UINT cb)
+static UINT CDECL cabinet_read(INT_PTR hf, void *pv, UINT cb)
 {
     HANDLE handle = (HANDLE)hf;
     DWORD read;
@@ -202,7 +202,7 @@
     return 0;
 }
 
-static UINT cabinet_write(INT_PTR hf, void *pv, UINT cb)
+static UINT CDECL cabinet_write(INT_PTR hf, void *pv, UINT cb)
 {
     HANDLE handle = (HANDLE)hf;
     DWORD written;
@@ -213,20 +213,20 @@
     return 0;
 }
 
-static int cabinet_close(INT_PTR hf)
+static int CDECL cabinet_close(INT_PTR hf)
 {
     HANDLE handle = (HANDLE)hf;
     return CloseHandle(handle) ? 0 : -1;
 }
 
-static long cabinet_seek(INT_PTR hf, long dist, int seektype)
+static LONG CDECL cabinet_seek(INT_PTR hf, LONG dist, int seektype)
 {
     HANDLE handle = (HANDLE)hf;
     /* flags are compatible and so are passed straight through */
     return SetFilePointer(handle, dist, NULL, seektype);
 }
 
-static UINT msi_media_get_disk_info(MSIPACKAGE *package, MSIMEDIAINFO *mi)
+static UINT CDECL msi_media_get_disk_info(MSIPACKAGE *package, MSIMEDIAINFO *mi)
 {
     MSIRECORD *row;
     LPWSTR ptr;
@@ -260,7 +260,7 @@
 static INT_PTR cabinet_partial_file(FDINOTIFICATIONTYPE fdint,
                                     PFDINOTIFICATION pfdin)
 {
-    MSICABDATA *data = (MSICABDATA *)pfdin->pv;
+    MSICABDATA *data = pfdin->pv;
     data->mi->is_continuous = FALSE;
     return 0;
 }
@@ -268,7 +268,7 @@
 static INT_PTR cabinet_next_cabinet(FDINOTIFICATIONTYPE fdint,
                                     PFDINOTIFICATION pfdin)
 {
-    MSICABDATA *data = (MSICABDATA *)pfdin->pv;
+    MSICABDATA *data = pfdin->pv;
     MSIMEDIAINFO *mi = data->mi;
     LPWSTR cab = strdupAtoW(pfdin->psz1);
     INT_PTR res = -1;
@@ -314,7 +314,7 @@
 static INT_PTR cabinet_copy_file(FDINOTIFICATIONTYPE fdint,
                                  PFDINOTIFICATION pfdin)
 {
-    MSICABDATA *data = (MSICABDATA*)pfdin->pv;
+    MSICABDATA *data = pfdin->pv;
     HANDLE handle = 0;
     LPWSTR path = NULL;
     DWORD attrs;
@@ -349,7 +349,7 @@
 static INT_PTR cabinet_close_file_info(FDINOTIFICATIONTYPE fdint,
                                        PFDINOTIFICATION pfdin)
 {
-    MSICABDATA *data = (MSICABDATA*)pfdin->pv;
+    MSICABDATA *data = pfdin->pv;
     FILETIME ft;
     FILETIME ftLocal;
     HANDLE handle = (HANDLE)pfdin->hf;
@@ -374,7 +374,7 @@
     return 1;
 }
 
-static INT_PTR cabinet_notify(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pfdin)
+static INT_PTR CDECL cabinet_notify(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pfdin)
 {
     TRACE("(%d)\n", fdint);
 
@@ -455,7 +455,7 @@
     msi_free(mi);
 }
 
-UINT msi_load_media_info(MSIPACKAGE *package, MSIFILE *file, MSIMEDIAINFO *mi)
+static UINT msi_load_media_info(MSIPACKAGE *package, MSIFILE *file, MSIMEDIAINFO *mi)
 {
     MSIRECORD *row;
     LPWSTR source_dir;
@@ -542,7 +542,7 @@
 }
 
 /* FIXME: search NETWORK and URL sources as well */
-UINT find_published_source(MSIPACKAGE *package, MSIMEDIAINFO *mi)
+static UINT find_published_source(MSIPACKAGE *package, MSIMEDIAINFO *mi)
 {
     WCHAR source[MAX_PATH];
     WCHAR volume[MAX_PATH];

Modified: trunk/reactos/dll/win32/msi/msi.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.c?rev=38889&r1=38888&r2=38889&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msi/msi.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/msi.c [iso-8859-1] Sun Jan 18 06:52:01 2009
@@ -1443,7 +1443,7 @@
                                    LPWSTR lpDriveBuf, DWORD *pcchDriveBuf,
                                    int *piCost, int *pTempCost)
 {
-    FIXME("(%ld, %s, %d, %d, %p, %p, %p %p): stub!\n", hInstall,
+    FIXME("(%d, %s, %d, %d, %p, %p, %p %p): stub!\n", hInstall,
           debugstr_w(szComponent), dwIndex, iState, lpDriveBuf,
           pcchDriveBuf, piCost, pTempCost);
 
@@ -1743,10 +1743,10 @@
     LPWSTR p;
     DWORD i, len;
 
-    TRACE("%ld %u %p %d %d\n", handle, id, lpBuffer, nBufferMax, lang);
+    TRACE("%d %u %p %d %d\n", handle, id, lpBuffer, nBufferMax, lang);
 
     if( handle != -1 )
-        FIXME("don't know how to deal with handle = %08lx\n", handle);
+        FIXME("don't know how to deal with handle = %08x\n", handle);
 
     if( !lang )
         lang = GetUserDefaultLangID();
@@ -1903,7 +1903,7 @@
     DWORD len;
     UINT r;
 
-    TRACE("(%ld, %s, %p, %p)\n", hProduct, debugstr_a(szProperty),
+    TRACE("(%d, %s, %p, %p)\n", hProduct, debugstr_a(szProperty),
           szValue, pccbValue);
 
     if (szValue && !pccbValue)
@@ -1972,7 +1972,7 @@
        '`','P','r','o','p','e','r','t','y','`',' ','W','H','E','R','E',' ',
        '`','P','r','o','p','e','r','t','y','`','=','\'','%','s','\'',0};
 
-    TRACE("(%ld, %s, %p, %p)\n", hProduct, debugstr_w(szProperty),
+    TRACE("(%d, %s, %p, %p)\n", hProduct, debugstr_w(szProperty),
           szValue, pccbValue);
 
     if (!szProperty)

Modified: trunk/reactos/dll/win32/msi/msi_main.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi_main.c?rev=38889&r1=38888&r2=38889&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msi/msi_main.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/msi_main.c [iso-8859-1] Sun Jan 18 06:52:01 2009
@@ -201,19 +201,19 @@
 
     if ( IsEqualCLSID (rclsid, &CLSID_IMsiServerX2) )
     {
-        *ppv = (LPVOID) &MsiServer_CF;
+        *ppv = &MsiServer_CF;
         return S_OK;
     }
 
     if ( IsEqualCLSID (rclsid, &CLSID_IWineMsiRemoteCustomAction) )
     {
-        *ppv = (LPVOID) &WineMsiCustomRemote_CF;
+        *ppv = &WineMsiCustomRemote_CF;
         return S_OK;
     }
 
     if ( IsEqualCLSID (rclsid, &CLSID_IWineMsiRemotePackage) )
     {
-        *ppv = (LPVOID) &WineMsiRemotePackage_CF;
+        *ppv = &WineMsiRemotePackage_CF;
         return S_OK;
     }
 

Modified: trunk/reactos/dll/win32/msi/msipriv.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msipriv.h?rev=38889&r1=38888&r2=38889&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msi/msipriv.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/msipriv.h [iso-8859-1] Sun Jan 18 06:52:01 2009
@@ -656,10 +656,8 @@
 
 extern BOOL msi_addstringW( string_table *st, UINT string_no, const WCHAR *data, int len, UINT refcount, enum StringPersistence persistence );
 extern UINT msi_id2stringW( const string_table *st, UINT string_no, LPWSTR buffer, UINT *sz );
-extern UINT msi_id2stringA( const string_table *st, UINT string_no, LPSTR buffer, UINT *sz );
 
 extern UINT msi_string2idW( const string_table *st, LPCWSTR buffer, UINT *id );
-extern UINT msi_string2idA( const string_table *st, LPCSTR str, UINT *id );
 extern VOID msi_destroy_stringtable( string_table *st );
 extern UINT msi_strcmp( const string_table *st, UINT lval, UINT rval, UINT *res );
 extern const WCHAR *msi_string_lookup_id( const string_table *st, UINT id );
@@ -700,15 +698,12 @@
 extern MSIRECORD *MSI_CreateRecord( UINT );
 extern UINT MSI_RecordSetInteger( MSIRECORD *, UINT, int );
 extern UINT MSI_RecordSetStringW( MSIRECORD *, UINT, LPCWSTR );
-extern UINT MSI_RecordSetStringA( MSIRECORD *, UINT, LPCSTR );
 extern BOOL MSI_RecordIsNull( MSIRECORD *, UINT );
 extern UINT MSI_RecordGetStringW( MSIRECORD * , UINT, LPWSTR, LPDWORD);
 extern UINT MSI_RecordGetStringA( MSIRECORD *, UINT, LPSTR, LPDWORD);
 extern int MSI_RecordGetInteger( MSIRECORD *, UINT );
 extern UINT MSI_RecordReadStream( MSIRECORD *, UINT, char *, LPDWORD);
 extern UINT MSI_RecordGetFieldCount( const MSIRECORD *rec );
-extern UINT MSI_RecordSetStream( MSIRECORD *, UINT, IStream * );
-extern UINT MSI_RecordDataSize( MSIRECORD *, UINT );
 extern UINT MSI_RecordStreamToFile( MSIRECORD *, UINT, LPCWSTR );
 extern UINT MSI_RecordCopyField( MSIRECORD *, UINT, MSIRECORD *, UINT );
 extern MSIRECORD *MSI_CloneRecord( MSIRECORD * );
@@ -716,10 +711,8 @@
 
 /* stream internals */
 extern UINT get_raw_stream( MSIHANDLE hdb, LPCWSTR stname, IStream **stm );
-extern UINT db_get_raw_stream( MSIDATABASE *db, LPCWSTR stname, IStream **stm );
 extern void enum_stream_names( IStorage *stg );
 extern BOOL decode_streamname(LPCWSTR in, LPWSTR out);
-extern LPWSTR encode_streamname(BOOL bTable, LPCWSTR in);
 
 /* database internals */
 extern UINT MSI_OpenDatabaseW( LPCWSTR, LPCWSTR, MSIDATABASE ** );
@@ -728,8 +721,6 @@
 typedef UINT (*record_func)( MSIRECORD *, LPVOID );
 extern UINT MSI_IterateRecords( MSIQUERY *, LPDWORD, record_func, LPVOID );
 extern MSIRECORD *MSI_QueryGetRecord( MSIDATABASE *db, LPCWSTR query, ... );
-extern UINT MSI_DatabaseImport( MSIDATABASE *, LPCWSTR, LPCWSTR );
-extern UINT MSI_DatabaseExport( MSIDATABASE *, LPCWSTR, LPCWSTR, LPCWSTR );
 extern UINT MSI_DatabaseGetPrimaryKeys( MSIDATABASE *, LPCWSTR, MSIRECORD ** );
 
 /* view internals */
@@ -776,7 +767,6 @@
 extern UINT MSIREG_OpenFeaturesKey(LPCWSTR szProduct, MSIINSTALLCONTEXT context,
                                    HKEY *key, BOOL create);
 extern UINT MSIREG_OpenUserPatchesKey(LPCWSTR szPatch, HKEY* key, BOOL create);
-extern UINT MSIREG_OpenInstallerFeaturesKey(LPCWSTR szProduct, HKEY* key, BOOL create);
 UINT MSIREG_OpenUserDataFeaturesKey(LPCWSTR szProduct, MSIINSTALLCONTEXT context,
                                     HKEY *key, BOOL create);
 extern UINT MSIREG_OpenUserComponentsKey(LPCWSTR szComponent, HKEY* key, BOOL create);
@@ -820,7 +810,6 @@
 extern void msi_dialog_check_messages( HANDLE );
 extern void msi_dialog_do_preview( msi_dialog* );
 extern void msi_dialog_destroy( msi_dialog* );
-extern BOOL msi_dialog_register_class( void );
 extern void msi_dialog_unregister_class( void );
 extern void msi_dialog_handle_event( msi_dialog*, LPCWSTR, LPCWSTR, MSIRECORD * );
 extern UINT msi_dialog_reset( msi_dialog *dialog );
@@ -828,10 +817,6 @@
 extern msi_dialog *msi_dialog_get_parent( msi_dialog *dialog );
 extern LPWSTR msi_dialog_get_name( msi_dialog *dialog );
 extern UINT msi_spawn_error_dialog( MSIPACKAGE*, LPWSTR, LPWSTR );
-
-/* preview */
-extern MSIPREVIEW *MSI_EnableUIPreview( MSIDATABASE * );
-extern UINT MSI_PreviewDialogW( MSIPREVIEW *, LPCWSTR );
 
 /* summary information */
 extern MSISUMMARYINFO *MSI_GetSummaryInformationW( IStorage *stg, UINT uiUpdateCount );
@@ -1016,10 +1001,8 @@
 } MSICABDATA;
 
 extern UINT ready_media(MSIPACKAGE *package, MSIFILE *file, MSIMEDIAINFO *mi);
-extern UINT msi_load_media_info(MSIPACKAGE *package, MSIFILE *file, MSIMEDIAINFO *mi);
 extern void msi_free_media_info(MSIMEDIAINFO *mi);
 extern BOOL msi_cabextract(MSIPACKAGE* package, MSIMEDIAINFO *mi, LPVOID data);
-extern UINT find_published_source(MSIPACKAGE *package, MSIMEDIAINFO *mi);
 
 /* control event stuff */
 extern VOID ControlEvent_FireSubscribedEvent(MSIPACKAGE *package, LPCWSTR event,

Modified: trunk/reactos/dll/win32/msi/msiquery.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msiquery.c?rev=38889&r1=38888&r2=38889&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msi/msiquery.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/msiquery.c [iso-8859-1] Sun Jan 18 06:52:01 2009
@@ -91,7 +91,7 @@
     UINT r;
     LPWSTR szwQuery;
 
-    TRACE("%ld %s %p\n", hdb, debugstr_a(szQuery), phView);
+    TRACE("%d %s %p\n", hdb, debugstr_a(szQuery), phView);
 
     if( szQuery )
     {
@@ -388,7 +388,7 @@
     MSIRECORD *rec = NULL;
     UINT ret;
 
-    TRACE("%ld %p\n", hView, record);
+    TRACE("%d %p\n", hView, record);
 
     if( !record )
         return ERROR_INVALID_PARAMETER;
@@ -429,7 +429,7 @@
     MSIQUERY *query;
     UINT ret;
 
-    TRACE("%ld\n", hView );
+    TRACE("%d\n", hView );
 
     query = msihandle2msiinfo( hView, MSIHANDLETYPE_VIEW );
     if( !query )
@@ -462,7 +462,7 @@
     MSIRECORD *rec = NULL;
     UINT ret;
     
-    TRACE("%ld %ld\n", hView, hRec);
+    TRACE("%d %d\n", hView, hRec);
 
     query = msihandle2msiinfo( hView, MSIHANDLETYPE_VIEW );
     if( !query )
@@ -559,7 +559,7 @@
     MSIRECORD *rec = NULL;
     UINT r;
 
-    TRACE("%ld %d %p\n", hView, info, hRec);
+    TRACE("%d %d %p\n", hView, info, hRec);
 
     if( !hRec )
         return ERROR_INVALID_PARAMETER;
@@ -611,7 +611,7 @@
     MSIRECORD *rec = NULL;
     UINT r = ERROR_FUNCTION_FAILED;
 
-    TRACE("%ld %x %ld\n", hView, eModifyMode, hRecord);
+    TRACE("%d %x %d\n", hView, eModifyMode, hRecord);
 
     query = msihandle2msiinfo( hView, MSIHANDLETYPE_VIEW );
     if( !query )
@@ -635,7 +635,7 @@
     MSIDBERROR r = MSIDBERROR_NOERROR;
     DWORD len;
 
-    FIXME("%ld %p %p - returns empty error string\n",
+    FIXME("%d %p %p - returns empty error string\n",
           handle, szColumnNameBuffer, pcchBuf );
 
     if( !pcchBuf )
@@ -667,7 +667,7 @@
     MSIDBERROR r = MSIDBERROR_NOERROR;
     DWORD len;
 
-    FIXME("%ld %p %p - returns empty error string\n",
+    FIXME("%d %p %p - returns empty error string\n",
           handle, szColumnNameBuffer, pcchBuf );
 
     if( !pcchBuf )
@@ -764,7 +764,7 @@
     LPWSTR wstr;
     UINT ret;
 
-    TRACE("%ld %s %d\n", hdb, debugstr_a(szTransformFile), iErrorCond);
+    TRACE("%d %s %d\n", hdb, debugstr_a(szTransformFile), iErrorCond);
 
     wstr = strdupAtoW( szTransformFile );
     if( szTransformFile && !wstr )
@@ -780,7 +780,7 @@
 UINT WINAPI MsiDatabaseGenerateTransformA( MSIHANDLE hdb, MSIHANDLE hdbref,
                  LPCSTR szTransformFile, int iReserved1, int iReserved2 )
 {
-    FIXME("%ld %ld %s %d %d\n", hdb, hdbref, 
+    FIXME("%d %d %s %d %d\n", hdb, hdbref,
            debugstr_a(szTransformFile), iReserved1, iReserved2);
     return ERROR_CALL_NOT_IMPLEMENTED;
 }
@@ -788,7 +788,7 @@
 UINT WINAPI MsiDatabaseGenerateTransformW( MSIHANDLE hdb, MSIHANDLE hdbref,
                  LPCWSTR szTransformFile, int iReserved1, int iReserved2 )
 {
-    FIXME("%ld %ld %s %d %d\n", hdb, hdbref, 
+    FIXME("%d %d %s %d %d\n", hdb, hdbref,
            debugstr_w(szTransformFile), iReserved1, iReserved2);
     return ERROR_CALL_NOT_IMPLEMENTED;
 }
@@ -798,7 +798,7 @@
     MSIDATABASE *db;
     UINT r;
 
-    TRACE("%ld\n", hdb);
+    TRACE("%d\n", hdb);
 
     db = msihandle2msiinfo( hdb, MSIHANDLETYPE_DATABASE );
     if( !db )
@@ -904,7 +904,7 @@
     MSIDATABASE *db;
     UINT r;
 
-    TRACE("%ld %s %p\n", hdb, debugstr_w(table), phRec);
+    TRACE("%d %s %p\n", hdb, debugstr_w(table), phRec);
 
     db = msihandle2msiinfo( hdb, MSIHANDLETYPE_DATABASE );
     if( !db )
@@ -949,7 +949,7 @@
     LPWSTR szwTable = NULL;
     UINT r;
 
-    TRACE("%ld %s %p\n", hdb, debugstr_a(table), phRec);
+    TRACE("%d %s %p\n", hdb, debugstr_a(table), phRec);
 
     if( table )
     {
@@ -969,7 +969,7 @@
     LPWSTR szwTableName = NULL;
     MSICONDITION r;
 
-    TRACE("%lx %s\n", hDatabase, debugstr_a(szTableName));
+    TRACE("%x %s\n", hDatabase, debugstr_a(szTableName));
 
     if( szTableName )
     {
@@ -989,7 +989,7 @@
     MSIDATABASE *db;
     MSICONDITION r;
 
-    TRACE("%lx %s\n", hDatabase, debugstr_w(szTableName));
+    TRACE("%x %s\n", hDatabase, debugstr_w(szTableName));
 
     db = msihandle2msiinfo( hDatabase, MSIHANDLETYPE_DATABASE );
     if( !db )

Modified: trunk/reactos/dll/win32/msi/package.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/package.c?rev=38889&r1=38888&r2=38889&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msi/package.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/package.c [iso-8859-1] Sun Jan 18 06:52:01 2009
@@ -1027,7 +1027,7 @@
     MSIHANDLE handle = 0;
     IWineMsiRemotePackage *remote_package;
 
-    TRACE("(%ld)\n",hInstall);
+    TRACE("(%d)\n",hInstall);
 
     package = msihandle2msiinfo( hInstall, MSIHANDLETYPE_PACKAGE);
     if( package)
@@ -1486,7 +1486,7 @@
     UINT r = ERROR_FUNCTION_FAILED;
     LPCWSTR val = NULL;
 
-    TRACE("%lu %s %p %p\n", handle, debugstr_w(name),
+    TRACE("%u %s %p %p\n", handle, debugstr_w(name),
           szValueBuf->str.w, pchValueBuf );
 
     if (!name)
@@ -1692,7 +1692,7 @@
 static HRESULT WINAPI mrp_SetProperty( IWineMsiRemotePackage *iface, BSTR property, BSTR value )
 {
     msi_remote_package_impl* This = mrp_from_IWineMsiRemotePackage( iface );
-    UINT r = MsiSetPropertyW(This->package, (LPWSTR)property, (LPWSTR)value);
+    UINT r = MsiSetPropertyW(This->package, property, value);
     return HRESULT_FROM_WIN32(r);
 }
 
@@ -1706,14 +1706,14 @@
 static HRESULT WINAPI mrp_DoAction( IWineMsiRemotePackage *iface, BSTR action )
 {
     msi_remote_package_impl* This = mrp_from_IWineMsiRemotePackage( iface );
-    UINT r = MsiDoActionW(This->package, (LPWSTR)action);
+    UINT r = MsiDoActionW(This->package, action);
     return HRESULT_FROM_WIN32(r);
 }
 
 static HRESULT WINAPI mrp_Sequence( IWineMsiRemotePackage *iface, BSTR table, int sequence )
 {
     msi_remote_package_impl* This = mrp_from_IWineMsiRemotePackage( iface );
-    UINT r = MsiSequenceW(This->package, (LPWSTR)table, sequence);
+    UINT r = MsiSequenceW(This->package, table, sequence);
     return HRESULT_FROM_WIN32(r);
 }
 
@@ -1727,7 +1727,7 @@
 static HRESULT WINAPI mrp_SetTargetPath( IWineMsiRemotePackage *iface, BSTR folder, BSTR value)
 {
     msi_remote_package_impl* This = mrp_from_IWineMsiRemotePackage( iface );
-    UINT r = MsiSetTargetPathW(This->package, (LPWSTR)folder, (LPWSTR)value);
+    UINT r = MsiSetTargetPathW(This->package, folder, value);
     return HRESULT_FROM_WIN32(r);
 }
 
@@ -1749,14 +1749,14 @@
                                     INSTALLSTATE *installed, INSTALLSTATE *action )
 {
     msi_remote_package_impl* This = mrp_from_IWineMsiRemotePackage( iface );
-    UINT r = MsiGetFeatureStateW(This->package, (LPWSTR)feature, installed, action);
+    UINT r = MsiGetFeatureStateW(This->package, feature, installed, action);
     return HRESULT_FROM_WIN32(r);
 }
 
 static HRESULT WINAPI mrp_SetFeatureState( IWineMsiRemotePackage *iface, BSTR feature, INSTALLSTATE state )
 {
     msi_remote_package_impl* This = mrp_from_IWineMsiRemotePackage( iface );
-    UINT r = MsiSetFeatureStateW(This->package, (LPWSTR)feature, state);
+    UINT r = MsiSetFeatureStateW(This->package, feature, state);
     return HRESULT_FROM_WIN32(r);
 }
 
@@ -1764,14 +1764,14 @@
                                       INSTALLSTATE *installed, INSTALLSTATE *action )
 {
     msi_remote_package_impl* This = mrp_from_IWineMsiRemotePackage( iface );
-    UINT r = MsiGetComponentStateW(This->package, (LPWSTR)component, installed, action);
+    UINT r = MsiGetComponentStateW(This->package, component, installed, action);
     return HRESULT_FROM_WIN32(r);
 }
 
 static HRESULT WINAPI mrp_SetComponentState( IWineMsiRemotePackage *iface, BSTR component, INSTALLSTATE state )
 {
     msi_remote_package_impl* This = mrp_from_IWineMsiRemotePackage( iface );
-    UINT r = MsiSetComponentStateW(This->package, (LPWSTR)component, state);
+    UINT r = MsiSetComponentStateW(This->package, component, state);
     return HRESULT_FROM_WIN32(r);
 }
 
@@ -1809,7 +1809,7 @@
 static HRESULT WINAPI mrp_EvaluateCondition( IWineMsiRemotePackage *iface, BSTR condition )
 {
     msi_remote_package_impl* This = mrp_from_IWineMsiRemotePackage( iface );
-    UINT r = MsiEvaluateConditionW(This->package, (LPWSTR)condition);
+    UINT r = MsiEvaluateConditionW(This->package, condition);
     return HRESULT_FROM_WIN32(r);
 }
 

Modified: trunk/reactos/dll/win32/msi/preview.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/preview.c?rev=38889&r1=38888&r2=38889&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msi/preview.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/preview.c [iso-8859-1] Sun Jan 18 06:52:01 2009
@@ -41,7 +41,7 @@
     msiobj_release( &preview->package->hdr );
 }
 
-MSIPREVIEW *MSI_EnableUIPreview( MSIDATABASE *db )
+static MSIPREVIEW *MSI_EnableUIPreview( MSIDATABASE *db )
 {
     MSIPREVIEW *preview = NULL;
     MSIPACKAGE *package;
@@ -68,7 +68,7 @@
     MSIPREVIEW *preview;
     UINT r = ERROR_FUNCTION_FAILED;
 
-    TRACE("%ld %p\n", hdb, phPreview);
+    TRACE("%d %p\n", hdb, phPreview);
 
     db = msihandle2msiinfo( hdb, MSIHANDLETYPE_DATABASE );
     if( !db )
@@ -109,7 +109,7 @@
     return ERROR_SUCCESS;
 }
 
-UINT MSI_PreviewDialogW( MSIPREVIEW *preview, LPCWSTR szDialogName )
+static UINT MSI_PreviewDialogW( MSIPREVIEW *preview, LPCWSTR szDialogName )
 {
     msi_dialog *dialog = NULL;
     UINT r = ERROR_SUCCESS;
@@ -137,7 +137,7 @@
     MSIPREVIEW *preview;
     UINT r;
 
-    TRACE("%ld %s\n", hPreview, debugstr_w(szDialogName));
+    TRACE("%d %s\n", hPreview, debugstr_w(szDialogName));
 
     preview = msihandle2msiinfo( hPreview, MSIHANDLETYPE_PREVIEW );
     if( !preview )
@@ -155,7 +155,7 @@
     UINT r;
     LPWSTR strW = NULL;
 
-    TRACE("%ld %s\n", hPreview, debugstr_a(szDialogName));
+    TRACE("%d %s\n", hPreview, debugstr_a(szDialogName));
 
     if( szDialogName )
     {
@@ -171,7 +171,7 @@
 UINT WINAPI MsiPreviewBillboardW( MSIHANDLE hPreview, LPCWSTR szControlName,
                                   LPCWSTR szBillboard)
 {
-    FIXME("%ld %s %s\n", hPreview, debugstr_w(szControlName),
+    FIXME("%d %s %s\n", hPreview, debugstr_w(szControlName),
           debugstr_w(szBillboard));
     return ERROR_CALL_NOT_IMPLEMENTED;
 }
@@ -179,7 +179,7 @@
 UINT WINAPI MsiPreviewBillboardA( MSIHANDLE hPreview, LPCSTR szControlName,
                                   LPCSTR szBillboard)
 {
-    FIXME("%ld %s %s\n", hPreview, debugstr_a(szControlName),
+    FIXME("%d %s %s\n", hPreview, debugstr_a(szControlName),
           debugstr_a(szBillboard));
     return ERROR_CALL_NOT_IMPLEMENTED;
 }

Modified: trunk/reactos/dll/win32/msi/record.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/record.c?rev=38889&r1=38888&r2=38889&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msi/record.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/record.c [iso-8859-1] Sun Jan 18 06:52:01 2009
@@ -116,7 +116,7 @@
     MSIRECORD *rec;
     UINT ret;
 
-    TRACE("%ld\n", handle );
+    TRACE("%d\n", handle );
 
     rec = msihandle2msiinfo( handle, MSIHANDLETYPE_RECORD );
     if( !rec )
@@ -229,7 +229,7 @@
     MSIRECORD *rec;
     UINT ret;
 
-    TRACE("%ld %d\n", handle, iField );
+    TRACE("%d %d\n", handle, iField );
 
     rec = msihandle2msiinfo( handle, MSIHANDLETYPE_RECORD );
     if( !rec )
@@ -248,7 +248,7 @@
     MSIRECORD *rec;
     UINT i;
 
-    TRACE("%ld\n", handle );
+    TRACE("%d\n", handle );
 
     rec = msihandle2msiinfo( handle, MSIHANDLETYPE_RECORD );
     if( !rec )
@@ -286,7 +286,7 @@
     MSIRECORD *rec;
     UINT ret;
 
-    TRACE("%ld %u %d\n", handle, iField, iVal);
+    TRACE("%d %u %d\n", handle, iField, iVal);
 
     rec = msihandle2msiinfo( handle, MSIHANDLETYPE_RECORD );
     if( !rec )
@@ -316,7 +316,7 @@
     MSIRECORD *rec;
     UINT ret;
 
-    TRACE("%ld %d\n", handle, iField );
+    TRACE("%d %d\n", handle, iField );
 
     rec = msihandle2msiinfo( handle, MSIHANDLETYPE_RECORD );
     if( !rec )
@@ -388,7 +388,7 @@
     MSIRECORD *rec;
     UINT ret;
 
-    TRACE("%ld %d %p %p\n", handle, iField, szValue, pcchValue);
+    TRACE("%d %d %p %p\n", handle, iField, szValue, pcchValue);
 
     rec = msihandle2msiinfo( handle, MSIHANDLETYPE_RECORD );
     if( !rec )
@@ -464,7 +464,7 @@
     MSIRECORD *rec;
     UINT ret;
 
-    TRACE("%ld %d %p %p\n", handle, iField, szValue, pcchValue);
+    TRACE("%d %d %p %p\n", handle, iField, szValue, pcchValue);
 
     rec = msihandle2msiinfo( handle, MSIHANDLETYPE_RECORD );
     if( !rec )
@@ -488,7 +488,7 @@
     return stat.cbSize.QuadPart;
 }
 
-UINT MSI_RecordDataSize(MSIRECORD *rec, UINT iField)
+static UINT MSI_RecordDataSize(MSIRECORD *rec, UINT iField)
 {
     TRACE("%p %d\n", rec, iField);
 
@@ -514,7 +514,7 @@
     MSIRECORD *rec;
     UINT ret;
 
-    TRACE("%ld %d\n", handle, iField);
+    TRACE("%d %d\n", handle, iField);
 
     rec = msihandle2msiinfo( handle, MSIHANDLETYPE_RECORD );
     if( !rec )
@@ -526,7 +526,7 @@
     return ret;
 }
 
-UINT MSI_RecordSetStringA( MSIRECORD *rec, UINT iField, LPCSTR szValue )
+static UINT MSI_RecordSetStringA( MSIRECORD *rec, UINT iField, LPCSTR szValue )
 {
     LPWSTR str;
 
@@ -556,7 +556,7 @@
     MSIRECORD *rec;
     UINT ret;
 
-    TRACE("%ld %d %s\n", handle, iField, debugstr_a(szValue));
+    TRACE("%d %d %s\n", handle, iField, debugstr_a(szValue));
 
     rec = msihandle2msiinfo( handle, MSIHANDLETYPE_RECORD );
     if( !rec )
@@ -599,7 +599,7 @@
     MSIRECORD *rec;
     UINT ret;
 
-    TRACE("%ld %d %s\n", handle, iField, debugstr_w(szValue));
+    TRACE("%d %d %s\n", handle, iField, debugstr_w(szValue));
 
     rec = msihandle2msiinfo( handle, MSIHANDLETYPE_RECORD );
     if( !rec )
@@ -662,7 +662,7 @@
     return ERROR_SUCCESS;
 }
 
-UINT MSI_RecordSetStream(MSIRECORD *rec, UINT iField, IStream *stream)
+static UINT MSI_RecordSetStream(MSIRECORD *rec, UINT iField, IStream *stream)
 {
     if ( (iField == 0) || (iField > rec->count) )
         return ERROR_INVALID_PARAMETER;
@@ -719,7 +719,7 @@
     LPWSTR wstr = NULL;
     UINT ret;
 
-    TRACE("%ld %d %s\n", hRecord, iField, debugstr_a(szFilename));
+    TRACE("%d %d %s\n", hRecord, iField, debugstr_a(szFilename));
 
     if( szFilename )
     {
@@ -738,7 +738,7 @@
     MSIRECORD *rec;
     UINT ret;
 
-    TRACE("%ld %d %s\n", handle, iField, debugstr_w(szFilename));
+    TRACE("%d %d %s\n", handle, iField, debugstr_w(szFilename));
 
     rec = msihandle2msiinfo( handle, MSIHANDLETYPE_RECORD );
     if( !rec )
@@ -808,7 +808,7 @@
     MSIRECORD *rec;
     UINT ret;
 
-    TRACE("%ld %d %p %p\n", handle, iField, buf, sz);
+    TRACE("%d %d %p %p\n", handle, iField, buf, sz);
 
     rec = msihandle2msiinfo( handle, MSIHANDLETYPE_RECORD );
     if( !rec )

Modified: trunk/reactos/dll/win32/msi/registry.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/registry.c?rev=38889&r1=38888&r2=38889&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msi/registry.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/registry.c [iso-8859-1] Sun Jan 18 06:52:01 2009
@@ -475,7 +475,7 @@
         return ERROR_FUNCTION_FAILED;
 
     size = sizeof(buf);
-    if (!GetTokenInformation(token, TokenUser, (void *)buf, size, &size)) {
+    if (!GetTokenInformation(token, TokenUser, buf, size, &size)) {
         CloseHandle(token);
         return ERROR_FUNCTION_FAILED;
     }
@@ -653,7 +653,7 @@
     return RegDeleteTreeW(HKEY_CURRENT_USER, keypath);
 }
 
-UINT MSIREG_OpenInstallerFeaturesKey(LPCWSTR szProduct, HKEY* key, BOOL create)
+static UINT MSIREG_OpenInstallerFeaturesKey(LPCWSTR szProduct, HKEY* key, BOOL create)
 {
     UINT rc;
     WCHAR squished_pc[GUID_SIZE];

Modified: trunk/reactos/dll/win32/msi/string.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/string.c?rev=38889&r1=38888&r2=38889&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msi/string.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/string.c [iso-8859-1] Sun Jan 18 06:52:01 2009
@@ -179,6 +179,34 @@
         st->freeslot = n + 1;
 }
 
+static UINT msi_string2idA( const string_table *st, LPCSTR buffer, UINT *id )
+{
+    DWORD sz;
+    UINT r = ERROR_INVALID_PARAMETER;
+    LPWSTR str;
+
+    TRACE("Finding string %s in string table\n", debugstr_a(buffer) );
+
+    if( buffer[0] == 0 )
+    {
+        *id = 0;
+        return ERROR_SUCCESS;
+    }
+
+    sz = MultiByteToWideChar( st->codepage, 0, buffer, -1, NULL, 0 );
+    if( sz <= 0 )
+        return r;
+    str = msi_alloc( sz*sizeof(WCHAR) );
+    if( !str )
+        return ERROR_NOT_ENOUGH_MEMORY;
+    MultiByteToWideChar( st->codepage, 0, buffer, -1, str, sz );
+
+    r = msi_string2idW( st, str, id );
+    msi_free( str );
+
+    return r;
+}
+
 static int msi_addstring( string_table *st, UINT n, const CHAR *data, int len, UINT refcount, enum StringPersistence persistence )
 {
     LPWSTR str;
@@ -350,7 +378,7 @@
  *   The size includes the terminating nul character.  Short buffers
  *  will be filled, but not nul terminated.
  */
-UINT msi_id2stringA( const string_table *st, UINT id, LPSTR buffer, UINT *sz )
+static UINT msi_id2stringA( const string_table *st, UINT id, LPSTR buffer, UINT *sz )
 {
     UINT len;
     const WCHAR *str;
@@ -407,34 +435,6 @@
     }
 
     return ERROR_INVALID_PARAMETER;
-}
-
-UINT msi_string2idA( const string_table *st, LPCSTR buffer, UINT *id )
-{
-    DWORD sz;
-    UINT r = ERROR_INVALID_PARAMETER;
-    LPWSTR str;
-
-    TRACE("Finding string %s in string table\n", debugstr_a(buffer) );
-
-    if( buffer[0] == 0 )
-    {
-        *id = 0;
-        return ERROR_SUCCESS;
-    }
-
-    sz = MultiByteToWideChar( st->codepage, 0, buffer, -1, NULL, 0 );
-    if( sz <= 0 )
-        return r;
-    str = msi_alloc( sz*sizeof(WCHAR) );
-    if( !str )
-        return ERROR_NOT_ENOUGH_MEMORY;
-    MultiByteToWideChar( st->codepage, 0, buffer, -1, str, sz );
-
-    r = msi_string2idW( st, str, id );
-    msi_free( str );
-
-    return r;
 }
 
 UINT msi_strcmp( const string_table *st, UINT lval, UINT rval, UINT *res )

Modified: trunk/reactos/dll/win32/msi/suminfo.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/suminfo.c?rev=38889&r1=38888&r2=38889&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msi/suminfo.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/suminfo.c [iso-8859-1] Sun Jan 18 06:52:01 2009
@@ -466,7 +466,7 @@
     MSIDATABASE *db;
     UINT ret = ERROR_FUNCTION_FAILED;
 
-    TRACE("%ld %s %d %p\n", hDatabase, debugstr_w(szDatabase),
+    TRACE("%d %s %d %p\n", hDatabase, debugstr_w(szDatabase),
            uiUpdateCount, pHandle);
 
     if( !pHandle )
@@ -529,7 +529,7 @@
     LPWSTR szwDatabase = NULL;
     UINT ret;
 
-    TRACE("%ld %s %d %p\n", hDatabase, debugstr_a(szDatabase), 
+    TRACE("%d %s %d %p\n", hDatabase, debugstr_a(szDatabase),
           uiUpdateCount, pHandle);
 
     if( szDatabase )
@@ -550,7 +550,7 @@
 {
     MSISUMMARYINFO *si;
 
-    TRACE("%ld %p\n", hSummaryInfo, pCount);
+    TRACE("%d %p\n", hSummaryInfo, pCount);
 
     si = msihandle2msiinfo( hSummaryInfo, MSIHANDLETYPE_SUMMARYINFO );
     if( !si )
@@ -570,7 +570,7 @@
     PROPVARIANT *prop;
     UINT ret = ERROR_SUCCESS;
 
-    TRACE("%ld %d %p %p %p %p %p\n", handle, uiProperty, puiDataType,
+    TRACE("%d %d %p %p %p %p %p\n", handle, uiProperty, puiDataType,
           piValue, pftValue, str, pcchValueBuf);
 
     if ( uiProperty >= MSI_MAX_PROPS )
@@ -668,7 +668,7 @@
 {
     awstring str;
 
-    TRACE("%ld %d %p %p %p %p %p\n", handle, uiProperty, puiDataType,
+    TRACE("%d %d %p %p %p %p %p\n", handle, uiProperty, puiDataType,
           piValue, pftValue, szValueBuf, pcchValueBuf );
 
     str.unicode = FALSE;
@@ -684,7 +684,7 @@
 {
     awstring str;
 
-    TRACE("%ld %d %p %p %p %p %p\n", handle, uiProperty, puiDataType,
+    TRACE("%d %d %p %p %p %p %p\n", handle, uiProperty, puiDataType,
           piValue, pftValue, szValueBuf, pcchValueBuf );
 
     str.unicode = TRUE;
@@ -701,7 +701,7 @@
     PROPVARIANT *prop;
     UINT type, len, ret = ERROR_SUCCESS;
 
-    TRACE("%ld %u %u %i %p %p\n", handle, uiProperty, uiDataType,
+    TRACE("%d %u %u %i %p %p\n", handle, uiProperty, uiDataType,
           iValue, pftValue, str );
 
     type = get_type( uiProperty );
@@ -773,7 +773,7 @@
 {
     awcstring str;
 
-    TRACE("%ld %u %u %i %p %s\n", handle, uiProperty, uiDataType,
+    TRACE("%d %u %u %i %p %s\n", handle, uiProperty, uiDataType,
           iValue, pftValue, debugstr_w(szValue) );
 
     str.unicode = TRUE;
@@ -786,7 +786,7 @@
 {
     awcstring str;
 
-    TRACE("%ld %u %u %i %p %s\n", handle, uiProperty, uiDataType,
+    TRACE("%d %u %u %i %p %s\n", handle, uiProperty, uiDataType,
           iValue, pftValue, debugstr_a(szValue) );
 
     str.unicode = FALSE;
@@ -802,7 +802,7 @@
     HRESULT r;
     UINT ret = ERROR_FUNCTION_FAILED;
 
-    TRACE("%ld\n", handle );
+    TRACE("%d\n", handle );
 
     si = msihandle2msiinfo( handle, MSIHANDLETYPE_SUMMARYINFO );
     if( !si )

Modified: trunk/reactos/dll/win32/msi/table.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/table.c?rev=38889&r1=38888&r2=38889&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msi/table.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/table.c [iso-8859-1] Sun Jan 18 06:52:01 2009
@@ -148,7 +148,7 @@
     return -1;
 }
 
-LPWSTR encode_streamname(BOOL bTable, LPCWSTR in)
+static LPWSTR encode_streamname(BOOL bTable, LPCWSTR in)
 {
     DWORD count = MAX_STREAM_NAME;
     DWORD ch, next;
@@ -326,7 +326,7 @@
     return ret;
 }
 
-UINT db_get_raw_stream( MSIDATABASE *db, LPCWSTR stname, IStream **stm )
+static UINT db_get_raw_stream( MSIDATABASE *db, LPCWSTR stname, IStream **stm )
 {
     LPWSTR encname;
     HRESULT r;

Modified: trunk/reactos/dll/win32/msi/upgrade.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/upgrade.c?rev=38889&r1=38888&r2=38889&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msi/upgrade.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/upgrade.c [iso-8859-1] Sun Jan 18 06:52:01 2009
@@ -101,7 +101,7 @@
 
 static UINT ITERATE_FindRelatedProducts(MSIRECORD *rec, LPVOID param)
 {
-    MSIPACKAGE *package = (MSIPACKAGE*)param;
+    MSIPACKAGE *package = param;
     WCHAR product[GUID_SIZE];
     DWORD index = 0;
     DWORD attributes = 0;



More information about the Ros-diffs mailing list