msi: Win64 printf format warning fixes.

dlls/msi/Makefile.in

@@ -6,7 +6,6 @@ MODULE    = msi.dll
 IMPORTLIB = libmsi.$(IMPLIBEXT)
 IMPORTS   = urlmon wininet comctl32 shell32 shlwapi cabinet oleaut32 ole32 version user32 gdi32 advapi32 kernel32
 EXTRALIBS = -luuid
-EXTRADEFS = -DWINE_NO_LONG_AS_INT
 
 C_SRCS = \
 	action.c \

dlls/msi/action.c

@@ -2136,7 +2136,7 @@ static LPSTR parse_value(MSIPACKAGE *package, LPCWSTR value, DWORD *type,
             }
             msi_free(deformated);
 
-            TRACE("Data %li bytes(%i)\n",*size,count);
+            TRACE("Data %i bytes(%i)\n",*size,count);
         }
         else
         {
@@ -2162,7 +2162,7 @@ static LPSTR parse_value(MSIPACKAGE *package, LPCWSTR value, DWORD *type,
             if (deformated[0] == '-')
                 d = -d;
             *(LPDWORD)data = d;
-            TRACE("DWORD %li\n",*(LPDWORD)data);
+            TRACE("DWORD %i\n",*(LPDWORD)data);
 
             msi_free(deformated);
         }
@@ -3639,7 +3639,7 @@ static UINT msi_make_package_local( MSIPACKAGE *package, HKEY hkey )
 
     if (!r)
     {
-        ERR("Unable to copy package (%s -> %s) (error %ld)\n",
+        ERR("Unable to copy package (%s -> %s) (error %d)\n",
             debugstr_w(msiFilePath), debugstr_w(packagefile), GetLastError());
         return ERROR_FUNCTION_FAILED;
     }
@@ -4073,7 +4073,7 @@ static UINT msi_unimplemented_action_stub( MSIPACKAGE *package,
     }
 
     if (count)
-        FIXME("%s -> %lu ignored %s table values\n",
+        FIXME("%s -> %u ignored %s table values\n",
               action, count, debugstr_w(table));
 
     return ERROR_SUCCESS;

dlls/msi/appsearch.c

@@ -154,7 +154,7 @@ static UINT ACTION_AppSearchGetSignature(MSIPACKAGE *package, MSISIGNATURE *sig,
         TRACE("MaxVersion is %d.%d.%d.%d\n", HIWORD(sig->MaxVersionMS),
          LOWORD(sig->MaxVersionMS), HIWORD(sig->MaxVersionLS),
          LOWORD(sig->MaxVersionLS));
-        TRACE("MinSize is %ld, MaxSize is %ld;\n", sig->MinSize, sig->MaxSize);
+        TRACE("MinSize is %d, MaxSize is %d;\n", sig->MinSize, sig->MaxSize);
         TRACE("Languages is %s\n", debugstr_w(sig->Languages));
 
 end:
@@ -286,7 +286,7 @@ static void ACTION_ConvertRegValue(DWORD regType, const BYTE *value, DWORD sz,
                 sprintfW(*appValue + i * 3, binFmt, value[i]);
             break;
         default:
-            WARN("unimplemented for values of type %ld\n", regType);
+            WARN("unimplemented for values of type %d\n", regType);
             *appValue = NULL;
     }
 }

dlls/msi/custom.c

@@ -382,7 +382,7 @@ static UINT process_action_return_value(UINT type, HANDLE ThreadHandle)
     case ERROR_NO_MORE_ITEMS:
         return ERROR_SUCCESS;
     default:
-        ERR("Invalid Return Code %ld\n",rc);
+        ERR("Invalid Return Code %d\n",rc);
         return ERROR_INSTALL_FAILURE;
     }
 }
@@ -502,14 +502,13 @@ static DWORD WINAPI DllThread(LPVOID info)
 {
     thread_struct *stuff;
     DWORD rc = 0;
-  
-    TRACE("MSI Thread (0x%lx) started for custom action\n",
-                        GetCurrentThreadId());
-    
+
+    TRACE("MSI Thread (%x) started for custom action\n", GetCurrentThreadId());
+
     stuff = (thread_struct*)info;
     rc = ACTION_CallDllFunction(stuff);
 
-    TRACE("MSI Thread (0x%lx) finished (rc %li)\n",GetCurrentThreadId(), rc);
+    TRACE("MSI Thread (%x) finished (rc %i)\n",GetCurrentThreadId(), rc);
     /* clse all handles for this thread */
     MsiCloseAllHandles();
     return rc;

dlls/msi/database.c

@@ -65,7 +65,7 @@ static VOID MSI_CloseDatabase( MSIOBJECTHDR *arg )
     msi_destroy_stringtable( db->strings );
     r = IStorage_Release( db->storage );
     if( r )
-        ERR("database reference count was not zero (%ld)\n", r);
+        ERR("database reference count was not zero (%d)\n", r);
     if (db->deletefile)
     {
         DeleteFileW( db->deletefile );
@@ -141,7 +141,7 @@ UINT MSI_OpenDatabaseW(LPCWSTR szDBPath, LPCWSTR szPersist, MSIDATABASE **pdb)
 
     if( FAILED( r ) )
     {
-        FIXME("open failed r = %08lx!\n",r);
+        FIXME("open failed r = %08x!\n",r);
         return ERROR_FUNCTION_FAILED;
     }
 

dlls/msi/dialog.c

@@ -579,7 +579,7 @@ void msi_dialog_handle_event( msi_dialog* dialog, LPCWSTR control,
             SendMessageW(ctrl->hwnd, PBM_SETPOS, 100*(ctrl->progress_current/ctrl->progress_max), 0);
             break;
         default:
-            ERR("Unknown progress message %ld\n", func);
+            ERR("Unknown progress message %d\n", func);
             break;
         }
     }
@@ -886,7 +886,7 @@ msi_richedit_stream_in( DWORD_PTR arg, LPBYTE buffer, LONG count, LONG *pcb )
     *pcb = count;
     info->offset += count;
 
-    TRACE("%ld/%ld\n", info->offset, info->length);
+    TRACE("%d/%d\n", info->offset, info->length);
 
     return 0;
 }
@@ -2743,7 +2743,7 @@ static void msi_dialog_adjust_dialog_pos( msi_dialog *dialog, MSIRECORD *rec, LP
     dialog->size.cx = sz.cx;
     dialog->size.cy = sz.cy;
 
-    TRACE("%lu %lu %lu %lu\n", pos->left, pos->top, pos->right, pos->bottom);
+    TRACE("%u %u %u %u\n", pos->left, pos->top, pos->right, pos->bottom);
 
     style = GetWindowLongPtrW( dialog->hwnd, GWL_STYLE );
     AdjustWindowRect( pos, style, FALSE );

dlls/msi/files.c

@@ -96,7 +96,7 @@ static UINT writeout_cabinet_stream(MSIPACKAGE *package, LPCWSTR stream_name,
 
     WriteFile(the_file,data,size,&write,NULL);
     CloseHandle(the_file);
-    TRACE("wrote %li bytes to %s\n",write,debugstr_w(source));
+    TRACE("wrote %i bytes to %s\n",write,debugstr_w(source));
 end:
     msi_free(data);
     return rc;
@@ -242,7 +242,7 @@ static INT_PTR cabinet_notify(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pfdin)
                               NULL, CREATE_ALWAYS, attrs, NULL );
         if ( handle == INVALID_HANDLE_VALUE )
         {
-            ERR("failed to create %s (error %ld)\n",
+            ERR("failed to create %s (error %d)\n",
                 debugstr_w( f->TargetPath ), GetLastError() );
             return 0;
         }
@@ -793,7 +793,7 @@ static UINT ITERATE_DuplicateFiles(MSIRECORD *row, LPVOID param)
         rc = ERROR_SUCCESS;
 
     if (rc != ERROR_SUCCESS)
-        ERR("Failed to copy file %s -> %s, last error %ld\n",
+        ERR("Failed to copy file %s -> %s, last error %d\n",
             debugstr_w(file->TargetPath), debugstr_w(dest_path), GetLastError());
 
     FIXME("We should track these duplicate files as well\n");   

dlls/msi/format.c

@@ -471,7 +471,7 @@ static DWORD deformat_string_internal(MSIPACKAGE *package, LPCWSTR ptr,
             TRACE("after value %s\n", debugstr_wn((LPWSTR)newdata,
                                     size/sizeof(WCHAR)));
             chunk = (len - (progress - ptr)) * sizeof(WCHAR);
-            TRACE("after chunk is %li + %li\n",size,chunk);
+            TRACE("after chunk is %i + %i\n",size,chunk);
             if (size)
                 nd2 = msi_realloc(newdata,(size+chunk));
             else
@@ -583,7 +583,7 @@ static DWORD deformat_string_internal(MSIPACKAGE *package, LPCWSTR ptr,
         if (value!=NULL)
         {
             LPBYTE nd2;
-            TRACE("value %s, chunk %li size %li\n",debugstr_w((LPWSTR)value),
+            TRACE("value %s, chunk %i size %i\n",debugstr_w((LPWSTR)value),
                     chunk, size);
             if (size)
                 nd2= msi_realloc(newdata,(size + chunk));
@@ -616,7 +616,7 @@ UINT MSI_FormatRecordW( MSIPACKAGE* package, MSIRECORD* record, LPWSTR buffer,
     DWORD len;
     UINT rc = ERROR_INVALID_PARAMETER;
 
-    TRACE("%p %p %p %li\n",package, record ,buffer, *size);
+    TRACE("%p %p %p %i\n", package, record ,buffer, *size);
 
     rec = msi_dup_record_field(record,0);
     if (!rec)
@@ -663,7 +663,7 @@ UINT MSI_FormatRecordA( MSIPACKAGE* package, MSIRECORD* record, LPSTR buffer,
     DWORD len,lenA;
     UINT rc = ERROR_INVALID_PARAMETER;
 
-    TRACE("%p %p %p %li\n",package, record ,buffer, *size);
+    TRACE("%p %p %p %i\n", package, record ,buffer, *size);
 
     rec = msi_dup_record_field(record,0);
     if (!rec)

dlls/msi/insert.c

@@ -78,7 +78,7 @@ static MSIRECORD *INSERT_merge_record( UINT fields, column_info *vl, MSIRECORD *
         switch( vl->val->type )
         {
         case EXPR_SVAL:
-            TRACE("field %ld -> %s\n", i, debugstr_w(vl->val->u.sval));
+            TRACE("field %d -> %s\n", i, debugstr_w(vl->val->u.sval));
             MSI_RecordSetStringW( merged, i, vl->val->u.sval );
             break;
         case EXPR_IVAL:

dlls/msi/msiquery.c

@@ -813,7 +813,7 @@ UINT MSI_DatabaseGetPrimaryKeys( MSIDATABASE *db,
     r = MSI_IterateRecords( query, 0, msi_primary_key_iterator, &info );
     if( r == ERROR_SUCCESS )
     {
-        TRACE("Found %ld primary keys\n", info.n );
+        TRACE("Found %d primary keys\n", info.n );
 
         /* allocate a record and fill in the names of the tables */
         info.rec = MSI_CreateRecord( info.n );

dlls/msi/package.c

@@ -576,13 +576,13 @@ UINT WINAPI MsiOpenPackageExW(LPCWSTR szPackage, DWORD dwOptions, MSIHANDLE *phP
     MSIPACKAGE *package = NULL;
     UINT ret;
 
-    TRACE("%s %08lx %p\n", debugstr_w(szPackage), dwOptions, phPackage );
+    TRACE("%s %08x %p\n", debugstr_w(szPackage), dwOptions, phPackage );
 
     if( szPackage == NULL )
         return ERROR_INVALID_PARAMETER;
 
     if( dwOptions )
-        FIXME("dwOptions %08lx not supported\n", dwOptions);
+        FIXME("dwOptions %08x not supported\n", dwOptions);
 
     ret = MSI_OpenPackageW( szPackage, &package );
     if( ret == ERROR_SUCCESS )
@@ -744,7 +744,7 @@ INT MSI_ProcessMessage( MSIPACKAGE *package, INSTALLMESSAGE eMessageType,
         }
     }
 
-    TRACE("(%p %lx %lx %s)\n",gUIHandlerA, gUIFilter, log_type,
+    TRACE("(%p %x %x %s)\n", gUIHandlerA, gUIFilter, log_type,
                              debugstr_w(message));
 
     /* convert it to ASCII */
@@ -1009,7 +1009,7 @@ UINT MSI_GetPropertyW( MSIPACKAGE *package, LPCWSTR szName,
 
     if ( *pchValueBuf <= len )
     {
-        TRACE("have %lu, need %u -> ERROR_MORE_DATA\n", *pchValueBuf, len);
+        TRACE("have %u, need %u -> ERROR_MORE_DATA\n", *pchValueBuf, len);
         r = ERROR_MORE_DATA;
     }
     else

dlls/msi/record.c

@@ -641,7 +641,7 @@ static UINT RECORD_StreamFromFile(LPCWSTR szFile, IStream **pstm)
     ulSize.QuadPart = sz;
     IStream_SetSize(*pstm, ulSize);
 
-    TRACE("read %s, %ld bytes into IStream %p\n", debugstr_w(szFile), sz, *pstm);
+    TRACE("read %s, %d bytes into IStream %p\n", debugstr_w(szFile), sz, *pstm);
 
     return ERROR_SUCCESS;
 }

dlls/msi/registry.c

@@ -686,8 +686,8 @@ UINT WINAPI MsiEnumProductsA(DWORD index, LPSTR lpguid)
     DWORD r;
     WCHAR szwGuid[GUID_SIZE];
 
-    TRACE("%ld %p\n",index,lpguid);
-    
+    TRACE("%d %p\n", index, lpguid);
+
     if (NULL == lpguid)
         return ERROR_INVALID_PARAMETER;
     r = MsiEnumProductsW(index, szwGuid);
@@ -703,7 +703,7 @@ UINT WINAPI MsiEnumProductsW(DWORD index, LPWSTR lpguid)
     DWORD r;
     WCHAR szKeyName[SQUISH_GUID_SIZE];
 
-    TRACE("%ld %p\n",index,lpguid);
+    TRACE("%d %p\n", index, lpguid);
 
     if (NULL == lpguid)
         return ERROR_INVALID_PARAMETER;
@@ -727,7 +727,7 @@ UINT WINAPI MsiEnumFeaturesA(LPCSTR szProduct, DWORD index,
     WCHAR szwFeature[GUID_SIZE], szwParent[GUID_SIZE];
     LPWSTR szwProduct = NULL;
 
-    TRACE("%s %ld %p %p\n",debugstr_a(szProduct),index,szFeature,szParent);
+    TRACE("%s %d %p %p\n", debugstr_a(szProduct), index, szFeature, szParent);
 
     if( szProduct )
     {
@@ -756,7 +756,7 @@ UINT WINAPI MsiEnumFeaturesW(LPCWSTR szProduct, DWORD index,
     HKEY hkeyProduct = 0;
     DWORD r, sz;
 
-    TRACE("%s %ld %p %p\n",debugstr_w(szProduct),index,szFeature,szParent);
+    TRACE("%s %d %p %p\n", debugstr_w(szProduct), index, szFeature, szParent);
 
     if( !szProduct )
         return ERROR_INVALID_PARAMETER;
@@ -777,7 +777,7 @@ UINT WINAPI MsiEnumComponentsA(DWORD index, LPSTR lpguid)
     DWORD r;
     WCHAR szwGuid[GUID_SIZE];
 
-    TRACE("%ld %p\n",index,lpguid);
+    TRACE("%d %p\n", index, lpguid);
 
     r = MsiEnumComponentsW(index, szwGuid);
     if( r == ERROR_SUCCESS )
@@ -792,7 +792,7 @@ UINT WINAPI MsiEnumComponentsW(DWORD index, LPWSTR lpguid)
     DWORD r;
     WCHAR szKeyName[SQUISH_GUID_SIZE];
 
-    TRACE("%ld %p\n",index,lpguid);
+    TRACE("%d %p\n", index, lpguid);
 
     r = MSIREG_OpenComponents(&hkeyComponents);
     if( r != ERROR_SUCCESS )
@@ -812,7 +812,7 @@ UINT WINAPI MsiEnumClientsA(LPCSTR szComponent, DWORD index, LPSTR szProduct)
     WCHAR szwProduct[GUID_SIZE];
     LPWSTR szwComponent = NULL;
 
-    TRACE("%s %ld %p\n",debugstr_a(szComponent),index,szProduct);
+    TRACE("%s %d %p\n", debugstr_a(szComponent), index, szProduct);
 
     if( szComponent )
     {
@@ -839,7 +839,7 @@ UINT WINAPI MsiEnumClientsW(LPCWSTR szComponent, DWORD index, LPWSTR szProduct)
     DWORD r, sz;
     WCHAR szValName[SQUISH_GUID_SIZE];
 
-    TRACE("%s %ld %p\n",debugstr_w(szComponent),index,szProduct);
+    TRACE("%s %d %p\n", debugstr_w(szComponent), index, szProduct);
 
     r = MSIREG_OpenComponentsKey(szComponent,&hkeyComp,FALSE);
     if( r != ERROR_SUCCESS )
@@ -864,7 +864,7 @@ UINT WINAPI MSI_EnumComponentQualifiers( LPCWSTR szComponent, DWORD iIndex,
     UINT r, r2;
     HKEY key;
 
-    TRACE("%s %08lx %p %p %p %p\n", debugstr_w(szComponent), iIndex,
+    TRACE("%s %08x %p %p %p %p\n", debugstr_w(szComponent), iIndex,
           lpQualBuf, pcchQual, lpAppBuf, pcchAppBuf);
 
     if (!szComponent)
@@ -901,7 +901,7 @@ UINT WINAPI MSI_EnumComponentQualifiers( LPCWSTR szComponent, DWORD iIndex,
  
         if (type != REG_MULTI_SZ)
         {
-            ERR("component data has wrong type (%ld)\n", type);
+            ERR("component data has wrong type (%d)\n", type);
             goto end;
         }
 
@@ -924,7 +924,7 @@ UINT WINAPI MSI_EnumComponentQualifiers( LPCWSTR szComponent, DWORD iIndex,
                 goto end;
             continue;
         }
-        ERR("should be enough data, but isn't %ld %ld\n", name_sz, val_sz );
+        ERR("should be enough data, but isn't %d %d\n", name_sz, val_sz );
         goto end;
     }
 
@@ -960,7 +960,7 @@ UINT WINAPI MsiEnumComponentQualifiersA( LPCSTR szComponent, DWORD iIndex,
     LPWSTR comp;
     UINT r;
 
-    TRACE("%s %08lx %p %p %p %p\n", debugstr_a(szComponent), iIndex,
+    TRACE("%s %08x %p %p %p %p\n", debugstr_a(szComponent), iIndex,
           lpQualifierBuf, pcchQualifierBuf, lpApplicationDataBuf,
           pcchApplicationDataBuf);
 
@@ -989,7 +989,7 @@ UINT WINAPI MsiEnumComponentQualifiersW( LPCWSTR szComponent, DWORD iIndex,
 {
     awstring qual, appdata;
 
-    TRACE("%s %08lx %p %p %p %p\n", debugstr_w(szComponent), iIndex,
+    TRACE("%s %08x %p %p %p %p\n", debugstr_w(szComponent), iIndex,
           lpQualifierBuf, pcchQualifierBuf, lpApplicationDataBuf,
           pcchApplicationDataBuf);
 
@@ -1014,7 +1014,7 @@ UINT WINAPI MsiEnumRelatedProductsW(LPCWSTR szUpgradeCode, DWORD dwReserved,
     HKEY hkey;
     WCHAR szKeyName[SQUISH_GUID_SIZE];
 
-    TRACE("%s %lu %lu %p\n", debugstr_w(szUpgradeCode), dwReserved,
+    TRACE("%s %u %u %p\n", debugstr_w(szUpgradeCode), dwReserved,
           iProductIndex, lpProductBuf);
 
     if (NULL == szUpgradeCode)
@@ -1045,7 +1045,7 @@ UINT WINAPI MsiEnumRelatedProductsA(LPCSTR szUpgradeCode, DWORD dwReserved,
     WCHAR productW[GUID_SIZE];
     UINT r;
 
-    TRACE("%s %lu %lu %p\n", debugstr_a(szUpgradeCode), dwReserved,
+    TRACE("%s %u %u %p\n", debugstr_a(szUpgradeCode), dwReserved,
           iProductIndex, lpProductBuf);
 
     if (szUpgradeCode)
@@ -1069,10 +1069,10 @@ UINT WINAPI MsiEnumRelatedProductsA(LPCSTR szUpgradeCode, DWORD dwReserved,
 /***********************************************************************
  * MsiEnumPatchesA            [MSI.@]
  */
-UINT WINAPI MsiEnumPatchesA( LPCSTR szProduct, DWORD iPatchIndex, 
+UINT WINAPI MsiEnumPatchesA( LPCSTR szProduct, DWORD iPatchIndex,
         LPSTR lpPatchBuf, LPSTR lpTransformsBuf, DWORD* pcchTransformsBuf)
 {
-    FIXME("%s %ld %p %p %p\n", debugstr_a(szProduct),
+    FIXME("%s %d %p %p %p\n", debugstr_a(szProduct),
           iPatchIndex, lpPatchBuf, lpTransformsBuf, pcchTransformsBuf);
     return ERROR_NO_MORE_ITEMS;
 }
@@ -1080,10 +1080,10 @@ UINT WINAPI MsiEnumPatchesA( LPCSTR szProduct, DWORD iPatchIndex,
 /***********************************************************************
  * MsiEnumPatchesW            [MSI.@]
  */
-UINT WINAPI MsiEnumPatchesW( LPCWSTR szProduct, DWORD iPatchIndex, 
+UINT WINAPI MsiEnumPatchesW( LPCWSTR szProduct, DWORD iPatchIndex,
         LPWSTR lpPatchBuf, LPWSTR lpTransformsBuf, DWORD* pcchTransformsBuf)
 {
-    FIXME("%s %ld %p %p %p\n", debugstr_w(szProduct),
+    FIXME("%s %d %p %p %p\n", debugstr_w(szProduct),
           iPatchIndex, lpPatchBuf, lpTransformsBuf, pcchTransformsBuf);
     return ERROR_NO_MORE_ITEMS;
 }

dlls/msi/source.c

@@ -299,7 +299,7 @@ UINT WINAPI MsiSourceListSetInfoW( LPCWSTR szProduct, LPCWSTR szUserSid,
     HKEY sourcekey;
     UINT rc;
 
-    TRACE("%s %s %x %lx %s %s\n", debugstr_w(szProduct), debugstr_w(szUserSid), 
+    TRACE("%s %s %x %x %s %s\n", debugstr_w(szProduct), debugstr_w(szUserSid),
             dwContext, dwOptions, debugstr_w(szProperty), debugstr_w(szValue));
 
     if (!szProduct || lstrlenW(szProduct) > 39)
@@ -367,9 +367,9 @@ UINT WINAPI MsiSourceListSetInfoW( LPCWSTR szProduct, LPCWSTR szUserSid,
             typechar = 'u';
         else if (dwOptions & MSISOURCETYPE_MEDIA)
             typechar = 'm';
-        else 
-            ERR("Unknown source type! 0x%lx\n",dwOptions);
-        
+        else
+            ERR("Unknown source type! %x\n", dwOptions);
+
         size = (lstrlenW(szValue)+5)*sizeof(WCHAR);
         buffer = msi_alloc(size);
         sprintfW(buffer, LastUsedSource_Fmt, typechar, 1, szValue);
@@ -465,11 +465,10 @@ UINT WINAPI MsiSourceListAddSourceExW( LPCWSTR szProduct, LPCWSTR szUserSid,
     HKEY typekey;
     UINT rc;
     media_info source_struct;
-   
-    TRACE("%s, %s, %x, %lx, %s, %li\n", debugstr_w(szProduct), 
-            debugstr_w(szUserSid), dwContext, dwOptions, debugstr_w(szSource), 
-            dwIndex);
-    
+
+    TRACE("%s %s %x %x %s %i\n", debugstr_w(szProduct), debugstr_w(szUserSid),
+          dwContext, dwOptions, debugstr_w(szSource), dwIndex);
+
     if (!szProduct)
         return ERROR_INVALID_PARAMETER;
 
@@ -504,7 +503,7 @@ UINT WINAPI MsiSourceListAddSourceExW( LPCWSTR szProduct, LPCWSTR szUserSid,
         rc = OpenMediaSubkey(sourcekey, &typekey, TRUE);
     else
     {
-        ERR("unknown media type: %08lx\n", dwOptions);
+        ERR("unknown media type: %08x\n", dwOptions);
         RegCloseKey(sourcekey);
         return ERROR_FUNCTION_FAILED;
     }
@@ -558,9 +557,9 @@ UINT WINAPI MsiSourceListAddMediaDiskW(LPCWSTR szProduct, LPCWSTR szUserSid,
     LPWSTR buffer;
     DWORD size;
 
-    TRACE("%s %s %x %lx %li %s %s\n", debugstr_w(szProduct), 
-            debugstr_w(szUserSid), dwContext, dwOptions, dwDiskId, 
-            debugstr_w(szVolumeLabel), debugstr_w(szDiskPrompt)); 
+    TRACE("%s %s %x %x %i %s %s\n", debugstr_w(szProduct),
+            debugstr_w(szUserSid), dwContext, dwOptions, dwDiskId,
+            debugstr_w(szVolumeLabel), debugstr_w(szDiskPrompt));
 
     if (!szProduct || lstrlenW(szProduct) > 39)
         return ERROR_INVALID_PARAMETER;
@@ -624,7 +623,7 @@ UINT WINAPI MsiSourceListAddMediaDiskW(LPCWSTR szProduct, LPCWSTR szUserSid,
  */
 UINT WINAPI MsiSourceListClearAllA( LPCSTR szProduct, LPCSTR szUserName, DWORD dwReserved )
 {
-    FIXME("(%s %s %ld) stub\n", debugstr_a(szProduct), debugstr_a(szUserName), dwReserved);
+    FIXME("(%s %s %d)\n", debugstr_a(szProduct), debugstr_a(szUserName), dwReserved);
     return ERROR_SUCCESS;
 }
 
@@ -633,6 +632,6 @@ UINT WINAPI MsiSourceListClearAllA( LPCSTR szProduct, LPCSTR szUserName, DWORD d
  */
 UINT WINAPI MsiSourceListClearAllW( LPCWSTR szProduct, LPCWSTR szUserName, DWORD dwReserved )
 {
-    FIXME("(%s %s %ld) stub\n", debugstr_w(szProduct), debugstr_w(szUserName), dwReserved);
+    FIXME("(%s %s %d)\n", debugstr_w(szProduct), debugstr_w(szUserName), dwReserved);
     return ERROR_SUCCESS;
 }

dlls/msi/suminfo.c

@@ -163,7 +163,7 @@ static void read_properties_from_data( PROPVARIANT *prop, LPBYTE data, DWORD sz
         type = get_type( idofs[i].propid );
         if( type == VT_EMPTY )
         {
-            ERR("propid %ld has unknown type\n", idofs[i].propid);
+            ERR("propid %d has unknown type\n", idofs[i].propid);
             break;
         }
 
@@ -172,7 +172,7 @@ static void read_properties_from_data( PROPVARIANT *prop, LPBYTE data, DWORD sz
         /* check the type is the same as we expect */
         if( type != propdata->type )
         {
-            ERR("wrong type %d != %ld\n", type, propdata->type);
+            ERR("wrong type %d != %d\n", type, propdata->type);
             break;
         }
 
@@ -188,7 +188,7 @@ static void read_properties_from_data( PROPVARIANT *prop, LPBYTE data, DWORD sz
 
         if( idofs[i].propid >= MSI_MAX_PROPS )
         {
-            ERR("Unknown property ID %ld\n", idofs[i].propid );
+            ERR("Unknown property ID %d\n", idofs[i].propid );
             break;
         }
 
@@ -259,7 +259,7 @@ static UINT load_summary_info( MSISUMMARYINFO *si, IStream *stm )
 
     if( section_hdr.cProperties > MSI_MAX_PROPS )
     {
-        ERR("too many properties %ld\n", section_hdr.cProperties);
+        ERR("too many properties %d\n", section_hdr.cProperties);
         return ret;
     }
 
@@ -275,7 +275,7 @@ static UINT load_summary_info( MSISUMMARYINFO *si, IStream *stm )
     if( SUCCEEDED(r) && count == sz )
         read_properties_from_data( si->property, data, sz + SECT_HDR_SIZE );
     else
-        ERR("failed to read properties %ld %ld\n", count, sz);
+        ERR("failed to read properties %d %d\n", count, sz);
 
     msi_free( data );
     return ret;
@@ -506,7 +506,7 @@ UINT WINAPI MsiSummaryInfoGetPropertyCount(MSIHANDLE hSummaryInfo, UINT *pCount)
 {
     MSISUMMARYINFO *si;
 
-    TRACE("%ld %p\n",hSummaryInfo, pCount);
+    TRACE("%ld %p\n", hSummaryInfo, pCount);
 
     si = msihandle2msiinfo( hSummaryInfo, MSIHANDLETYPE_SUMMARYINFO );
     if( !si )

dlls/msi/table.c

@@ -208,7 +208,7 @@ void enum_stream_names( IStorage *stg )
         if( FAILED( r ) || !count )
             break;
         decode_streamname( stat.pwcsName, name );
-        TRACE("stream %2ld -> %s %s\n", n, 
+        TRACE("stream %2d -> %s %s\n", n,
               debugstr_w(stat.pwcsName), debugstr_w(name) );
         n++;
     }
@@ -236,14 +236,14 @@ static UINT read_stream_data( IStorage *stg, LPCWSTR stname,
     msi_free( encname );
     if( FAILED( r ) )
     {
-        WARN("open stream failed r = %08lx - empty table?\n",r);
+        WARN("open stream failed r = %08x - empty table?\n", r);
         return ret;
     }
 
     r = IStream_Stat(stm, &stat, STATFLAG_NONAME );
     if( FAILED( r ) )
     {
-        WARN("open stream failed r = %08lx!\n",r);
+        WARN("open stream failed r = %08x!\n", r);
         goto end;
     }
 
@@ -257,7 +257,7 @@ static UINT read_stream_data( IStorage *stg, LPCWSTR stname,
     data = msi_alloc( sz );
     if( !data )
     {
-        WARN("couldn't allocate memory r=%08lx!\n",r);
+        WARN("couldn't allocate memory r=%08x!\n", r);
         ret = ERROR_NOT_ENOUGH_MEMORY;
         goto end;
     }
@@ -266,7 +266,7 @@ static UINT read_stream_data( IStorage *stg, LPCWSTR stname,
     if( FAILED( r ) || ( count != sz ) )
     {
         msi_free( data );
-        WARN("read stream failed r = %08lx!\n",r);
+        WARN("read stream failed r = %08x!\n", r);
         goto end;
     }
 
@@ -326,7 +326,7 @@ UINT read_raw_stream_data( MSIDATABASE *db, LPCWSTR stname,
     r = IStream_Stat(stm, &stat, STATFLAG_NONAME );
     if( FAILED( r ) )
     {
-        WARN("open stream failed r = %08lx!\n",r);
+        WARN("open stream failed r = %08x!\n", r);
         goto end;
     }
 
@@ -340,7 +340,7 @@ UINT read_raw_stream_data( MSIDATABASE *db, LPCWSTR stname,
     data = msi_alloc( sz );
     if( !data )
     {
-        WARN("couldn't allocate memory r=%08lx!\n",r);
+        WARN("couldn't allocate memory r=%08x!\n", r);
         ret = ERROR_NOT_ENOUGH_MEMORY;
         goto end;
     }
@@ -349,7 +349,7 @@ UINT read_raw_stream_data( MSIDATABASE *db, LPCWSTR stname,
     if( FAILED( r ) || ( count != sz ) )
     {
         msi_free( data );
-        WARN("read stream failed r = %08lx!\n",r);
+        WARN("read stream failed r = %08x!\n", r);
         goto end;
     }
 
@@ -385,7 +385,7 @@ static UINT write_stream_data( IStorage *stg, LPCWSTR stname,
     msi_free( encname );
     if( FAILED( r ) )
     {
-        WARN("open stream failed r = %08lx\n",r);
+        WARN("open stream failed r = %08x\n", r);
         return ret;
     }
 
@@ -746,15 +746,15 @@ string_table *load_string_table( IStorage *stg )
 
         r = msi_addstring( st, n, data+offset, len, refs );
         if( r != n )
-            ERR("Failed to add string %ld\n", n );
+            ERR("Failed to add string %d\n", n );
         n++;
         offset += len;
     }
 
     if ( datasize != offset )
-        ERR("string table load failed! (%08x != %08lx), please report\n", datasize, offset );
+        ERR("string table load failed! (%08x != %08x), please report\n", datasize, offset );
 
-    TRACE("Loaded %ld strings\n", count);
+    TRACE("Loaded %d strings\n", count);
 
 end:
     msi_free( pool );

dlls/msi/upgrade.c

@@ -124,7 +124,7 @@ static UINT ITERATE_FindRelatedProducts(MSIRECORD *rec, LPVOID param)
     while (rc == ERROR_SUCCESS)
     {
         rc = RegEnumValueW(hkey, index, product, &sz, NULL, NULL, NULL, NULL);
-        TRACE("Looking at (%li) %s\n",index,debugstr_w(product));
+        TRACE("Looking at (%i) %s\n",index,debugstr_w(product));
         if (rc == ERROR_SUCCESS)
         {
             WCHAR productid[GUID_SIZE];
@@ -179,7 +179,7 @@ static UINT ITERATE_FindRelatedProducts(MSIRECORD *rec, LPVOID param)
                     (LPBYTE)&check, &sz);
             RegCloseKey(hukey);
             language = MSI_RecordGetString(rec,4);
-            TRACE("Checking languages 0x%lx and %s\n", check, 
+            TRACE("Checking languages %x and %s\n", check, 
                             debugstr_w(language));
             if (!check_language(check, language, attributes))
             {