setupapi: Enable compilation with long types.

Signed-off-by: Eric Pouech <eric.pouech@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

setupapi: Enable compilation with long types.
e498e0ec · Eric Pouech · Alexandre Julliard · 491ef8f3 · e498e0ec · e498e0ec
Commit e498e0ec authored Feb 17, 2022 by Eric Pouech Committed by Alexandre Julliard Feb 17, 2022
14 changed files
--- a/dlls/setupapi/Makefile.in
+++ b/dlls/setupapi/Makefile.in
-EXTRADEFS = -DWINE_NO_LONG_TYPES -D_SETUPAPI_
+EXTRADEFS = -D_SETUPAPI_
 MODULE    = setupapi.dll
 IMPORTLIB = setupapi
 IMPORTS   = uuid version advapi32 rpcrt4 kernelbase

--- a/dlls/setupapi/devinst.c
+++ b/dlls/setupapi/devinst.c
--- a/dlls/setupapi/dialog.c
+++ b/dlls/setupapi/dialog.c
@@ -101,7 +101,7 @@ static void promptdisk_ok(HWND hwnd, struct promptdisk_params *params)
    if(params->PathRequiredSize)
    {
        *params->PathRequiredSize = requiredSize;
-        TRACE("returning PathRequiredSize=%d\n",*params->PathRequiredSize);
+        TRACE("returning PathRequiredSize=%ld\n",*params->PathRequiredSize);
    }
    if(!params->PathBuffer)
    {
@@ -187,7 +187,7 @@ UINT WINAPI SetupPromptForDiskA(HWND hwndParent, PCSTR DialogTitle, PCSTR DiskNa
    WCHAR *FileSoughtW, *TagFileW, PathBufferW[MAX_PATH];
    UINT ret, length;
-    TRACE("%p, %s, %s, %s, %s, %s, 0x%08x, %p, %d, %p\n", hwndParent, debugstr_a(DialogTitle),
+    TRACE("%p, %s, %s, %s, %s, %s, 0x%08lx, %p, %ld, %p\n", hwndParent, debugstr_a(DialogTitle),
          debugstr_a(DiskName), debugstr_a(PathToSource), debugstr_a(FileSought),
          debugstr_a(TagFile), DiskPromptStyle, PathBuffer, PathBufferSize,
          PathRequiredSize);
@@ -231,7 +231,7 @@ UINT WINAPI SetupPromptForDiskW(HWND hwndParent, PCWSTR DialogTitle, PCWSTR Disk
    struct promptdisk_params params;
    UINT ret;
-    TRACE("%p, %s, %s, %s, %s, %s, 0x%08x, %p, %d, %p\n", hwndParent, debugstr_w(DialogTitle),
+    TRACE("%p, %s, %s, %s, %s, %s, 0x%08lx, %p, %ld, %p\n", hwndParent, debugstr_w(DialogTitle),
          debugstr_w(DiskName), debugstr_w(PathToSource), debugstr_w(FileSought),
          debugstr_w(TagFile), DiskPromptStyle, PathBuffer, PathBufferSize,
          PathRequiredSize);

--- a/dlls/setupapi/dirid.c
+++ b/dlls/setupapi/dirid.c
@@ -180,7 +180,7 @@ static const WCHAR *create_printer_dirid( DWORD dirid )
        return create_system_dirid( DIRID_COLOR );
    case 66004:  /* asp files directory */
    default:
-        FIXME( "unsupported dirid %d\n", dirid );
+        FIXME( "unsupported dirid %ld\n", dirid );
        return get_unknown_dirid();
    }
    len = (lstrlenW(buffer) + 1) * sizeof(WCHAR);
@@ -195,7 +195,7 @@ static const WCHAR *get_csidl_dir( DWORD csidl )
    if (!SHGetSpecialFolderPathW( NULL, buffer, csidl, TRUE ))
    {
-        FIXME( "CSIDL %x not found\n", csidl );
+        FIXME( "CSIDL %lx not found\n", csidl );
        return get_unknown_dirid();
    }
    len = (lstrlenW(buffer) + 1) * sizeof(WCHAR);

--- a/dlls/setupapi/diskspace.c
+++ b/dlls/setupapi/diskspace.c
@@ -53,7 +53,7 @@ HDSKSPC WINAPI SetupCreateDiskSpaceListW(PVOID Reserved1, DWORD Reserved2, UINT 
    WCHAR *ptr;
    LPDISKSPACELIST list=NULL;
-    TRACE("(%p, %u, 0x%08x)\n", Reserved1, Reserved2, Flags);
+    TRACE("(%p, %lu, 0x%08x)\n", Reserved1, Reserved2, Flags);
    if (Reserved1 || Reserved2 || Flags & ~SPDSL_IGNORE_DISK)
    {

--- a/dlls/setupapi/fakedll.c
+++ b/dlls/setupapi/fakedll.c
@@ -395,7 +395,7 @@ static void create_directories( const WCHAR *name )
    {
        *p = 0;
        if (!CreateDirectoryW(path, NULL))
-            TRACE("Couldn't create directory %s - error: %d\n", wine_dbgstr_w(path), GetLastError());
+            TRACE("Couldn't create directory %s - error: %ld\n", wine_dbgstr_w(path), GetLastError());
        *p = '\\';
        p = wcschr(p+1, '\\');
    }
@@ -507,7 +507,7 @@ static HANDLE create_dest_file( const WCHAR *name, BOOL delete )
        h = CreateFileW( name, GENERIC_WRITE, 0, NULL, CREATE_NEW, 0, NULL );
        if (h == INVALID_HANDLE_VALUE)
-            ERR( "failed to create %s (error=%u)\n", debugstr_w(name), GetLastError() );
+            ERR( "failed to create %s (error=%lu)\n", debugstr_w(name), GetLastError() );
    }
    return h;
 }
@@ -697,7 +697,7 @@ static BOOL create_manifest( const xmlstr_t *arch, const xmlstr_t *name, const x
    {
        TRACE( "creating %s\n", debugstr_w(path) );
        ret = (WriteFile( handle, data, len, &written, NULL ) && written == len);
-        if (!ret) ERR( "failed to write to %s (error=%u)\n", debugstr_w(path), GetLastError() );
+        if (!ret) ERR( "failed to write to %s (error=%lu)\n", debugstr_w(path), GetLastError() );
        CloseHandle( handle );
        if (!ret) DeleteFileW( path );
    }
@@ -868,7 +868,7 @@ static void register_fake_dll( const WCHAR *name, const void *data, size_t size,
        if (!registrar)
        {
-            ERR( "failed to create IRegistrar: %x\n", hr );
+            ERR( "failed to create IRegistrar: %lx\n", hr );
            return;
        }
    }
@@ -879,7 +879,7 @@ static void register_fake_dll( const WCHAR *name, const void *data, size_t size,
    GetEnvironmentVariableW( L"SystemRoot", buffer, ARRAY_SIZE(buffer) );
    IRegistrar_AddReplacement( registrar, L"SystemRoot", buffer );
    EnumResourceNamesW( module, L"WINE_REGISTRY", register_resource, (LONG_PTR)&hr );
-    if (FAILED(hr)) ERR( "failed to register %s: %x\n", debugstr_w(name), hr );
+    if (FAILED(hr)) ERR( "failed to register %s: %lx\n", debugstr_w(name), hr );
 }
 /* copy a fake dll file to the dest directory */
@@ -914,7 +914,7 @@ static int install_fake_dll( WCHAR *dest, WCHAR *file, BOOL delete, struct list 
            TRACE( "%s -> %s\n", debugstr_w(file), debugstr_w(dest) );
            ret = (WriteFile( h, data, size, &written, NULL ) && written == size);
-            if (!ret) ERR( "failed to write to %s (error=%u)\n", debugstr_w(dest), GetLastError() );
+            if (!ret) ERR( "failed to write to %s (error=%lu)\n", debugstr_w(dest), GetLastError() );
            CloseHandle( h );
            if (ret) register_fake_dll( dest, data, size, delay_copy );
            else DeleteFileW( dest );
@@ -948,7 +948,7 @@ static void delay_copy_files( struct list *delay_copy )
        if (h && h != INVALID_HANDLE_VALUE)
        {
            ret = (WriteFile( h, data, size, &written, NULL ) && written == size);
-            if (!ret) ERR( "failed to write to %s (error=%u)\n", debugstr_w(copy->dest), GetLastError() );
+            if (!ret) ERR( "failed to write to %s (error=%lu)\n", debugstr_w(copy->dest), GetLastError() );
            CloseHandle( h );
            if (!ret) DeleteFileW( copy->dest );
        }
@@ -1070,7 +1070,7 @@ BOOL create_fake_dll( const WCHAR *name, const WCHAR *source )
        ret = (WriteFile( h, buffer, size, &written, NULL ) && written == size);
        if (ret) register_fake_dll( name, buffer, size, &delay_copy );
-        else ERR( "failed to write to %s (error=%u)\n", debugstr_w(name), GetLastError() );
+        else ERR( "failed to write to %s (error=%lu)\n", debugstr_w(name), GetLastError() );
    }
    else
    {

--- a/dlls/setupapi/install.c
+++ b/dlls/setupapi/install.c
@@ -394,7 +394,7 @@ static BOOL do_reg_operation( HKEY hkey, const WCHAR *value, INFCONTEXT *context
        if (type == REG_DWORD)
        {
            DWORD dw = str ? wcstoul( str, NULL, 0 ) : 0;
-            TRACE( "setting dword %s to %x\n", debugstr_w(value), dw );
+            TRACE( "setting dword %s to %lx\n", debugstr_w(value), dw );
            RegSetValueExW( hkey, value, 0, type, (BYTE *)&dw, sizeof(dw) );
        }
        else
@@ -414,7 +414,7 @@ static BOOL do_reg_operation( HKEY hkey, const WCHAR *value, INFCONTEXT *context
        if (size)
        {
            if (!(data = HeapAlloc( GetProcessHeap(), 0, size ))) return FALSE;
-            TRACE( "setting binary data %s len %d\n", debugstr_w(value), size );
+            TRACE( "setting binary data %s len %ld\n", debugstr_w(value), size );
            SetupGetBinaryField( context, 5, data, size, NULL );
        }
        RegSetValueExW( hkey, value, 0, type, data, size );
@@ -601,7 +601,7 @@ static BOOL do_register_dll( struct register_dll_info *info, const WCHAR *path,
        if (FAILED(res))
        {
-            WARN( "calling %s in %s returned error %x\n", entry_point, debugstr_w(path), res );
+            WARN( "calling %s in %s returned error %lx\n", entry_point, debugstr_w(path), res );
            status.FailureCode = SPREG_REGSVR;
            status.Win32Error = res;
            goto done;
@@ -625,7 +625,7 @@ static BOOL do_register_dll( struct register_dll_info *info, const WCHAR *path,
        if (FAILED(res))
        {
-            WARN( "calling DllInstall in %s returned error %x\n", debugstr_w(path), res );
+            WARN( "calling DllInstall in %s returned error %lx\n", debugstr_w(path), res );
            status.FailureCode = SPREG_REGSVR;
            status.Win32Error = res;
            goto done;
@@ -968,7 +968,7 @@ static BOOL iterate_section_fields( HINF hinf, PCWSTR section, PCWSTR key,
                goto done;
            if (!callback( hinf, buffer, arg ))
            {
-                WARN("callback failed for %s %s err %d\n",
+                WARN("callback failed for %s %s err %ld\n",
                     debugstr_w(section), debugstr_w(buffer), GetLastError() );
                goto done;
            }
@@ -1331,7 +1331,7 @@ static BOOL add_service( SC_HANDLE scm, HINF hinf, const WCHAR *name, const WCHA
    /* FIXME: Dependencies field */
    /* FIXME: Security field */
-    TRACE( "service %s display %s type %x start %x error %x binary %s order %s startname %s flags %x\n",
+    TRACE( "service %s display %s type %x start %x error %x binary %s order %s startname %s flags %lx\n",
           debugstr_w(name), debugstr_w(display_name), service_type, start_type, error_control,
           debugstr_w(binary_path), debugstr_w(load_order), debugstr_w(start_name), flags );
@@ -1406,7 +1406,7 @@ static BOOL add_service( SC_HANDLE scm, HINF hinf, const WCHAR *name, const WCHA
    CloseServiceHandle( service );
 done:
-    if (!service) WARN( "failed err %u\n", GetLastError() );
+    if (!service) WARN( "failed err %lu\n", GetLastError() );
    HeapFree( GetProcessHeap(), 0, binary_path );
    HeapFree( GetProcessHeap(), 0, display_name );
    HeapFree( GetProcessHeap(), 0, start_name );
@@ -1430,7 +1430,7 @@ static BOOL del_service( SC_HANDLE scm, HINF hinf, const WCHAR *name, DWORD flag
    if (!(service = OpenServiceW( scm, name, SERVICE_STOP | DELETE )))
    {
        if (GetLastError() == ERROR_SERVICE_DOES_NOT_EXIST) return TRUE;
-        WARN( "cannot open %s err %u\n", debugstr_w(name), GetLastError() );
+        WARN( "cannot open %s err %lu\n", debugstr_w(name), GetLastError() );
        return FALSE;
    }
    if (flags & SPSVCINST_STOPSERVICE) ControlService( service, SERVICE_CONTROL_STOP, &status );
@@ -1558,7 +1558,7 @@ BOOL WINAPI SetupGetInfFileListW(PCWSTR dir, DWORD style, PWSTR buffer,
    if (style & ~( INF_STYLE_OLDNT | INF_STYLE_WIN4 |
                   INF_STYLE_CACHE_ENABLE | INF_STYLE_CACHE_DISABLE ))
    {
-        FIXME( "unknown inf_style(s) 0x%x\n",
+        FIXME( "unknown inf_style(s) 0x%lx\n",
               style & ~( INF_STYLE_OLDNT | INF_STYLE_WIN4 |
                         INF_STYLE_CACHE_ENABLE | INF_STYLE_CACHE_DISABLE ));
        if( outsize ) *outsize = 1;

--- a/dlls/setupapi/misc.c
+++ b/dlls/setupapi/misc.c
@@ -811,7 +811,7 @@ DWORD WINAPI CMP_WaitNoPendingInstallEvents( DWORD dwTimeout )
    if (!warned)
    {
-        FIXME("%d\n", dwTimeout);
+        FIXME("%ld\n", dwTimeout);
        warned = TRUE;
    }
    return WAIT_OBJECT_0;
@@ -844,7 +844,7 @@ BOOL WINAPI SetupCopyOEMInfA( PCSTR source, PCSTR location,
    LPWSTR destW = NULL, sourceW = NULL, locationW = NULL;
    DWORD size;
-    TRACE("%s, %s, %d, %d, %p, %d, %p, %p\n", debugstr_a(source), debugstr_a(location),
+    TRACE("%s, %s, %ld, %ld, %p, %ld, %p, %p\n", debugstr_a(source), debugstr_a(location),
          media_type, style, dest, buffer_size, required_size, component);
    if (dest && !(destW = MyMalloc( buffer_size * sizeof(WCHAR) ))) return FALSE;
@@ -972,7 +972,7 @@ BOOL WINAPI SetupCopyOEMInfW( PCWSTR source, PCWSTR location,
    DWORD size;
    HINF hinf;
-    TRACE("%s, %s, %d, %d, %p, %d, %p, %p\n", debugstr_w(source), debugstr_w(location),
+    TRACE("%s, %s, %ld, %ld, %p, %ld, %p, %p\n", debugstr_w(source), debugstr_w(location),
          media_type, style, dest, buffer_size, required_size, filepart);
    if (!source)
@@ -1113,7 +1113,7 @@ BOOL WINAPI SetupUninstallOEMInfA( PCSTR inf_file, DWORD flags, PVOID reserved )
    BOOL ret;
    WCHAR *inf_fileW = NULL;
-    TRACE("%s, 0x%08x, %p\n", debugstr_a(inf_file), flags, reserved);
+    TRACE("%s, 0x%08lx, %p\n", debugstr_a(inf_file), flags, reserved);
    if (inf_file && !(inf_fileW = strdupAtoW( inf_file ))) return FALSE;
    ret = SetupUninstallOEMInfW( inf_fileW, flags, reserved );
@@ -1129,7 +1129,7 @@ BOOL WINAPI SetupUninstallOEMInfW( PCWSTR inf_file, DWORD flags, PVOID reserved 
    static const WCHAR infW[] = {'\\','i','n','f','\\',0};
    WCHAR target[MAX_PATH];
-    TRACE("%s, 0x%08x, %p\n", debugstr_w(inf_file), flags, reserved);
+    TRACE("%s, 0x%08lx, %p\n", debugstr_w(inf_file), flags, reserved);
    if (!inf_file)
    {
@@ -1313,7 +1313,7 @@ BOOL WINAPI SetupGetFileCompressionInfoExA( PCSTR source, PSTR name, DWORD len, 
    DWORD nb_chars = 0;
    LPSTR nameA;
-    TRACE("%s, %p, %d, %p, %p, %p, %p\n", debugstr_a(source), name, len, required,
+    TRACE("%s, %p, %ld, %p, %p, %p, %p\n", debugstr_a(source), name, len, required,
          source_size, target_size, type);
    if (!source || !(sourceW = MultiByteToUnicode( source, CP_ACP ))) return FALSE;
@@ -1373,7 +1373,7 @@ BOOL WINAPI SetupGetFileCompressionInfoExW( PCWSTR source, PWSTR name, DWORD len
    BOOL ret = FALSE;
    DWORD source_len;
-    TRACE("%s, %p, %d, %p, %p, %p, %p\n", debugstr_w(source), name, len, required,
+    TRACE("%s, %p, %ld, %p, %p, %p, %p\n", debugstr_w(source), name, len, required,
          source_size, target_size, type);
    if (!source) return FALSE;
@@ -1498,7 +1498,7 @@ static DWORD decompress_file_lz( LPCWSTR source, LPCWSTR target )
    if ((error = LZCopy( src, dst )) >= 0) ret = ERROR_SUCCESS;
    else
    {
-        WARN("failed to decompress file %d\n", error);
+        WARN("failed to decompress file %ld\n", error);
        ret = ERROR_INVALID_DATA;
    }

--- a/dlls/setupapi/parser.c
+++ b/dlls/setupapi/parser.c
@@ -1341,7 +1341,7 @@ LONG WINAPI SetupGetLineCountW( HINF hinf, PCWSTR section )
        if (ret == -1) ret = 0;
        ret += file->sections[section_index]->nb_lines;
    }
-    TRACE( "(%p,%s) returning %d\n", hinf, debugstr_w(section), ret );
+    TRACE( "(%p,%s) returning %ld\n", hinf, debugstr_w(section), ret );
    SetLastError( (ret == -1) ? ERROR_SECTION_NOT_FOUND : 0 );
    return ret;
 }
@@ -1384,7 +1384,7 @@ BOOL WINAPI SetupGetLineByIndexW( HINF hinf, PCWSTR section, DWORD index, INFCON
            context->Section    = section_index;
            context->Line       = index;
            SetLastError( 0 );
-            TRACE( "(%p,%s): returning %d/%d\n",
+            TRACE( "(%p,%s): returning %d/%ld\n",
                   hinf, debugstr_w(section), section_index, index );
            return TRUE;
        }
@@ -1728,7 +1728,7 @@ BOOL WINAPI SetupGetStringFieldA( PINFCONTEXT context, DWORD index, PSTR buffer,
        }
        PARSER_string_substA( file, field->text, buffer, size );
-        TRACE( "context %p/%p/%d/%d index %d returning %s\n",
+        TRACE( "context %p/%p/%d/%d index %ld returning %s\n",
               context->Inf, context->CurrentInf, context->Section, context->Line,
               index, debugstr_a(buffer) );
    }
@@ -1759,7 +1759,7 @@ BOOL WINAPI SetupGetStringFieldW( PINFCONTEXT context, DWORD index, PWSTR buffer
        }
        PARSER_string_substW( file, field->text, buffer, size );
-        TRACE( "context %p/%p/%d/%d index %d returning %s\n",
+        TRACE( "context %p/%p/%d/%d index %ld returning %s\n",
               context->Inf, context->CurrentInf, context->Section, context->Line,
               index, debugstr_w(buffer) );
    }
@@ -1858,7 +1858,7 @@ BOOL WINAPI SetupGetBinaryField( PINFCONTEXT context, DWORD index, BYTE *buffer,
        }
        buffer[i - index] = value;
    }
-    TRACE( "%p/%p/%d/%d index %d\n",
+    TRACE( "%p/%p/%d/%d index %ld\n",
           context->Inf, context->CurrentInf, context->Section, context->Line, index );
    return TRUE;
 }

--- a/dlls/setupapi/query.c
+++ b/dlls/setupapi/query.c
@@ -168,7 +168,7 @@ BOOL WINAPI SetupGetInfInformationW(LPCVOID InfSpec, DWORD SearchControl,
    BOOL ret;
    DWORD infSize;
-    TRACE("(%p, %d, %p, %d, %p)\n", InfSpec, SearchControl, ReturnBuffer,
+    TRACE("(%p, %ld, %p, %ld, %p)\n", InfSpec, SearchControl, ReturnBuffer,
           ReturnBufferSize, RequiredSize);
    if (!InfSpec)
@@ -195,7 +195,7 @@ BOOL WINAPI SetupGetInfInformationW(LPCVOID InfSpec, DWORD SearchControl,
            inf = search_for_inf(InfSpec, SearchControl);
            break;
        case INFINFO_INF_PATH_LIST_SEARCH:
-            FIXME("Unhandled search control: %d\n", SearchControl);
+            FIXME("Unhandled search control: %ld\n", SearchControl);
            if (RequiredSize)
                *RequiredSize = 0;
@@ -289,7 +289,7 @@ BOOL WINAPI SetupQueryInfFileInformationW(PSP_INF_INFORMATION InfInformation,
    DWORD len;
    LPWSTR ptr;
-    TRACE("(%p, %u, %p, %d, %p) Stub!\n", InfInformation, InfIndex,
+    TRACE("(%p, %u, %p, %ld, %p) Stub!\n", InfInformation, InfIndex,
          ReturnBuffer, ReturnBufferSize, RequiredSize);
    if (!InfInformation)
@@ -333,7 +333,7 @@ BOOL WINAPI SetupGetSourceFileLocationA( HINF hinf, PINFCONTEXT context, PCSTR f
    DWORD required;
    INT size;
-    TRACE("%p, %p, %s, %p, %p, 0x%08x, %p\n", hinf, context, debugstr_a(filename), source_id,
+    TRACE("%p, %p, %s, %p, %p, 0x%08lx, %p\n", hinf, context, debugstr_a(filename), source_id,
          buffer, buffer_size, required_size);
    if (filename && *filename && !(filenameW = strdupAtoW( filename )))
@@ -410,7 +410,7 @@ BOOL WINAPI SetupGetSourceFileLocationW( HINF hinf, PINFCONTEXT context, PCWSTR 
    INFCONTEXT ctx;
    WCHAR *end, *source_id_str;
-    TRACE("%p, %p, %s, %p, %p, 0x%08x, %p\n", hinf, context, debugstr_w(filename), source_id,
+    TRACE("%p, %p, %s, %p, %p, 0x%08lx, %p\n", hinf, context, debugstr_w(filename), source_id,
          buffer, buffer_size, required_size);
    if (!context) context = &ctx;
@@ -454,7 +454,7 @@ BOOL WINAPI SetupGetSourceInfoA( HINF hinf, UINT source_id, UINT info,
    DWORD required;
    INT size;
-    TRACE("%p, %d, %d, %p, %d, %p\n", hinf, source_id, info, buffer, buffer_size,
+    TRACE("%p, %d, %d, %p, %ld, %p\n", hinf, source_id, info, buffer, buffer_size,
          required_size);
    if (!SetupGetSourceInfoW( hinf, source_id, info, NULL, 0, &required ))
@@ -498,7 +498,7 @@ BOOL WINAPI SetupGetSourceInfoW( HINF hinf, UINT source_id, UINT info,
    static const WCHAR fmt[] = {'%','d',0};
    DWORD index;
-    TRACE("%p, %d, %d, %p, %d, %p\n", hinf, source_id, info, buffer, buffer_size,
+    TRACE("%p, %d, %d, %p, %ld, %p\n", hinf, source_id, info, buffer, buffer_size,
          required_size);
    swprintf( source_id_str, ARRAY_SIZE(source_id_str), fmt, source_id );
@@ -545,7 +545,7 @@ BOOL WINAPI SetupGetTargetPathA( HINF hinf, PINFCONTEXT context, PCSTR section, 
    DWORD required;
    INT size;
-    TRACE("%p, %p, %s, %p, 0x%08x, %p\n", hinf, context, debugstr_a(section), buffer,
+    TRACE("%p, %p, %s, %p, 0x%08lx, %p\n", hinf, context, debugstr_a(section), buffer,
          buffer_size, required_size);
    if (section && !(sectionW = strdupAtoW( section )))
@@ -598,7 +598,7 @@ BOOL WINAPI SetupGetTargetPathW( HINF hinf, PINFCONTEXT context, PCWSTR section,
    unsigned int size;
    BOOL ret = FALSE;
-    TRACE("%p, %p, %s, %p, 0x%08x, %p\n", hinf, context, debugstr_w(section), buffer,
+    TRACE("%p, %p, %s, %p, 0x%08lx, %p\n", hinf, context, debugstr_w(section), buffer,
          buffer_size, required_size);
    if (context) ret = SetupFindFirstLineW( hinf, destination_dirs, NULL, context );
@@ -646,7 +646,7 @@ BOOL WINAPI SetupQueryInfOriginalFileInformationA(
    if (OriginalFileInfo->cbSize != sizeof(*OriginalFileInfo))
    {
-        WARN("incorrect OriginalFileInfo->cbSize of %d\n", OriginalFileInfo->cbSize);
+        WARN("incorrect OriginalFileInfo->cbSize of %ld\n", OriginalFileInfo->cbSize);
        SetLastError( ERROR_INVALID_USER_BUFFER );
        return FALSE;
    }
@@ -684,7 +684,7 @@ BOOL WINAPI SetupQueryInfOriginalFileInformationW(
    if (OriginalFileInfo->cbSize != sizeof(*OriginalFileInfo))
    {
-        WARN("incorrect OriginalFileInfo->cbSize of %d\n", OriginalFileInfo->cbSize);
+        WARN("incorrect OriginalFileInfo->cbSize of %ld\n", OriginalFileInfo->cbSize);
        SetLastError(ERROR_INVALID_USER_BUFFER);
        return FALSE;
    }
@@ -726,7 +726,7 @@ BOOL WINAPI SetupGetInfDriverStoreLocationW(
    PCWSTR LocaleName, PWSTR ReturnBuffer, DWORD ReturnBufferSize,
    PDWORD RequiredSize)
 {
-    FIXME("stub: %s %p %s %p %u %p\n", debugstr_w(FileName), AlternativePlatformInfo, debugstr_w(LocaleName), ReturnBuffer, ReturnBufferSize, RequiredSize);
+    FIXME("stub: %s %p %s %p %lu %p\n", debugstr_w(FileName), AlternativePlatformInfo, debugstr_w(LocaleName), ReturnBuffer, ReturnBufferSize, RequiredSize);
    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
    return FALSE;

--- a/dlls/setupapi/queue.c
+++ b/dlls/setupapi/queue.c
@@ -792,7 +792,7 @@ BOOL WINAPI SetupQueueCopySectionW( HSPFILEQ queue, PCWSTR src_root, HINF hinf, 
    BOOL ret = FALSE;
    DWORD len;
-    TRACE("queue %p, src_root %s, hinf %p, hlist %p, section %s, style %#x.\n",
+    TRACE("queue %p, src_root %s, hinf %p, hlist %p, section %s, style %#lx.\n",
            queue, debugstr_w(src_root), hinf, hlist, debugstr_w(section), style);
    if (!src_root)
@@ -1068,7 +1068,7 @@ static BOOL do_file_copyW( LPCWSTR source, LPCWSTR target, DWORD style,
    BOOL rc = FALSE;
    BOOL docopy = TRUE;
-    TRACE("copy %s to %s style 0x%x\n",debugstr_w(source),debugstr_w(target),style);
+    TRACE("copy %s to %s style 0x%lx\n",debugstr_w(source),debugstr_w(target),style);
    /* before copy processing */
    if (style & SP_COPY_REPLACEONLY)
@@ -1126,7 +1126,7 @@ static BOOL do_file_copyW( LPCWSTR source, LPCWSTR target, DWORD style,
                {
                    FILEPATHS_W filepaths;
-                    TRACE("Versions: Source %i.%i target %i.%i\n",
+                    TRACE("Versions: Source %li.%li target %li.%li\n",
                      SourceInfo->dwFileVersionMS, SourceInfo->dwFileVersionLS,
                      TargetInfo->dwFileVersionMS, TargetInfo->dwFileVersionLS);
@@ -1179,7 +1179,7 @@ static BOOL do_file_copyW( LPCWSTR source, LPCWSTR target, DWORD style,
    if (style & (SP_COPY_NODECOMP | SP_COPY_LANGUAGEAWARE | SP_COPY_FORCE_IN_USE |
                 SP_COPY_NOSKIP | SP_COPY_WARNIFSKIP))
    {
-        ERR("Unsupported style(s) 0x%x\n",style);
+        ERR("Unsupported style(s) 0x%lx\n",style);
    }
    if (docopy)
@@ -1201,7 +1201,7 @@ static BOOL do_file_copyW( LPCWSTR source, LPCWSTR target, DWORD style,
                    DeleteFileW(temp_file);
            }
        }
-        if (!rc) WARN( "failed to copy, err %u\n", GetLastError() );
+        if (!rc) WARN( "failed to copy, err %lu\n", GetLastError() );
    }
    else
        SetLastError(ERROR_SUCCESS);
@@ -1226,7 +1226,7 @@ BOOL WINAPI SetupInstallFileExA( HINF hinf, PINFCONTEXT inf_context, PCSTR sourc
    struct callback_WtoA_context ctx;
    UNICODE_STRING sourceW, rootW, destW;
-    TRACE("%p %p %s %s %s %x %p %p %p\n", hinf, inf_context, debugstr_a(source), debugstr_a(root),
+    TRACE("%p %p %s %s %s %lx %p %p %p\n", hinf, inf_context, debugstr_a(source), debugstr_a(root),
          debugstr_a(dest), style, handler, context, in_use);
    sourceW.Buffer = rootW.Buffer = destW.Buffer = NULL;
@@ -1277,7 +1277,7 @@ BOOL WINAPI SetupInstallFileExW( HINF hinf, PINFCONTEXT inf_context, PCWSTR sour
    WCHAR *buffer, *p, *inf_source = NULL, dest_path[MAX_PATH];
    DWORD len;
-    TRACE("%p %p %s %s %s %x %p %p %p\n", hinf, inf_context, debugstr_w(source), debugstr_w(root),
+    TRACE("%p %p %s %s %s %lx %p %p %p\n", hinf, inf_context, debugstr_w(source), debugstr_w(root),
          debugstr_w(dest), style, handler, context, in_use);
    if (in_use) FIXME("no file in use support\n");
@@ -1598,7 +1598,7 @@ BOOL WINAPI SetupScanFileQueueA( HSPFILEQ handle, DWORD flags, HWND window,
 {
    struct callback_WtoA_context ctx;
-    TRACE("%p %x %p %p %p %p\n", handle, flags, window, handler, context, result);
+    TRACE("%p %lx %p %p %p %p\n", handle, flags, window, handler, context, result);
    ctx.orig_context = context;
    ctx.orig_handler = handler;
@@ -1619,7 +1619,7 @@ BOOL WINAPI SetupScanFileQueueW( HSPFILEQ handle, DWORD flags, HWND window,
    UINT notification = 0;
    BOOL ret = FALSE;
-    TRACE("%p %x %p %p %p %p\n", handle, flags, window, handler, context, result);
+    TRACE("%p %lx %p %p %p %p\n", handle, flags, window, handler, context, result);
    if (!queue->copy_queue.count) return TRUE;
@@ -1628,7 +1628,7 @@ BOOL WINAPI SetupScanFileQueueW( HSPFILEQ handle, DWORD flags, HWND window,
    if (flags & ~(SPQ_SCAN_USE_CALLBACK | SPQ_SCAN_USE_CALLBACKEX))
    {
-        FIXME("flags %x not fully implemented\n", flags);
+        FIXME("flags %lx not fully implemented\n", flags);
    }
    paths.Source = paths.Target = NULL;
@@ -1780,10 +1780,10 @@ UINT WINAPI SetupDefaultQueueCallbackA( PVOID context, UINT notification,
        TRACE( "end queue\n" );
        return 0;
    case SPFILENOTIFY_STARTSUBQUEUE:
-        TRACE( "start subqueue %ld count %ld\n", param1, param2 );
+        TRACE( "start subqueue %Id count %Id\n", param1, param2 );
        return TRUE;
    case SPFILENOTIFY_ENDSUBQUEUE:
-        TRACE( "end subqueue %ld\n", param1 );
+        TRACE( "end subqueue %Id\n", param1 );
        return 0;
    case SPFILENOTIFY_STARTDELETE:
        TRACE( "start delete %s\n", debugstr_a(paths->Target) );
@@ -1823,7 +1823,7 @@ UINT WINAPI SetupDefaultQueueCallbackA( PVOID context, UINT notification,
        return FILEOP_DOIT;
    }
    default:
-        FIXME( "notification %d params %lx,%lx\n", notification, param1, param2 );
+        FIXME( "notification %d params %Ix,%Ix\n", notification, param1, param2 );
        break;
    }
    return 0;
@@ -1848,10 +1848,10 @@ UINT WINAPI SetupDefaultQueueCallbackW( PVOID context, UINT notification,
        TRACE( "end queue\n" );
        return 0;
    case SPFILENOTIFY_STARTSUBQUEUE:
-        TRACE( "start subqueue %ld count %ld\n", param1, param2 );
+        TRACE( "start subqueue %Id count %Id\n", param1, param2 );
        return TRUE;
    case SPFILENOTIFY_ENDSUBQUEUE:
-        TRACE( "end subqueue %ld\n", param1 );
+        TRACE( "end subqueue %Id\n", param1 );
        return 0;
    case SPFILENOTIFY_STARTDELETE:
        TRACE( "start delete %s\n", debugstr_w(paths->Target) );
@@ -1892,7 +1892,7 @@ UINT WINAPI SetupDefaultQueueCallbackW( PVOID context, UINT notification,
        return FILEOP_DOIT;
    }
    default:
-        FIXME( "notification %d params %lx,%lx\n", notification, param1, param2 );
+        FIXME( "notification %d params %Ix,%Ix\n", notification, param1, param2 );
        break;
    }
    return 0;

--- a/dlls/setupapi/setupcab.c
+++ b/dlls/setupapi/setupcab.c
@@ -180,7 +180,7 @@ static INT_PTR CDECL sc_FNNOTIFY_A(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION p
  case fdintPARTIAL_FILE:
    return 0;
  case fdintCOPY_FILE:
-    TRACE("Copy file %s, length %d, date %#x, time %#x, attributes %#x.\n",
+    TRACE("Copy file %s, length %ld, date %#x, time %#x, attributes %#x.\n",
            debugstr_a(pfdin->psz1), pfdin->cb, pfdin->date, pfdin->time, pfdin->attribs);
    fici.NameInCabinet = pfdin->psz1;
    fici.FileSize = pfdin->cb;
@@ -261,7 +261,7 @@ BOOL WINAPI SetupIterateCabinetA(const char *file, DWORD reserved,
    HFDI hfdi;
    BOOL ret;
-    TRACE("file %s, reserved %#x, callback %p, context %p.\n",
+    TRACE("file %s, reserved %#lx, callback %p, context %p.\n",
            debugstr_a(file), reserved, callback, context);
    if (!file)

--- a/dlls/setupapi/stringtable.c
+++ b/dlls/setupapi/stringtable.c
@@ -132,7 +132,7 @@ HSTRING_TABLE WINAPI StringTableInitializeEx(ULONG max_extra_size, DWORD reserve
 {
    struct stringtable *table;
-    TRACE("(%d %x)\n", max_extra_size, reserved);
+    TRACE("(%ld %lx)\n", max_extra_size, reserved);
    table = MyMalloc(sizeof(*table));
    if (!table) return NULL;
@@ -255,7 +255,7 @@ BOOL WINAPI StringTableGetExtraData(HSTRING_TABLE hTable, ULONG id, void *extra,
    struct stringtable *table = (struct stringtable*)hTable;
    char *extraptr;
-    TRACE("%p %u %p %u\n", table, id, extra, extra_size);
+    TRACE("%p %lu %p %lu\n", table, id, extra, extra_size);
    if (!table)
        return FALSE;
@@ -300,7 +300,7 @@ DWORD WINAPI StringTableLookUpStringEx(HSTRING_TABLE hTable, LPWSTR string, DWOR
    DWORD offset;
    int cmp;
-    TRACE("%p->%p %s %x %p, %x\n", table, table->data, debugstr_w(string), flags, extra, extra_size);
+    TRACE("%p->%p %s %lx %p, %lx\n", table, table->data, debugstr_w(string), flags, extra, extra_size);
    if (!table)
        return -1;
@@ -385,7 +385,7 @@ DWORD WINAPI StringTableAddStringEx(HSTRING_TABLE hTable, LPWSTR string,
    WCHAR *ptrW;
    int len;
-    TRACE("%p %s %x %p, %u\n", hTable, debugstr_w(string), flags, extra, extra_size);
+    TRACE("%p %s %lx %p, %lu\n", hTable, debugstr_w(string), flags, extra, extra_size);
    if (!table)
        return -1;
@@ -476,7 +476,7 @@ BOOL WINAPI StringTableSetExtraData(HSTRING_TABLE hTable, DWORD id, void *extra,
    struct stringtable *table = (struct stringtable*)hTable;
    char *extraptr;
-    TRACE("%p %d %p %u\n", hTable, id, extra, extra_size);
+    TRACE("%p %ld %p %lu\n", hTable, id, extra, extra_size);
    if (!table)
        return FALSE;
@@ -515,7 +515,7 @@ LPWSTR WINAPI StringTableStringFromId(HSTRING_TABLE hTable, ULONG id)
    struct stringtable *table = (struct stringtable*)hTable;
    static WCHAR empty[] = {0};
-    TRACE("%p %d\n", table, id);
+    TRACE("%p %ld\n", table, id);
    if (!table)
        return NULL;
@@ -548,7 +548,7 @@ BOOL WINAPI StringTableStringFromIdEx(HSTRING_TABLE hTable, ULONG id, LPWSTR buf
    WCHAR *ptrW;
    int len;
-    TRACE("%p %x %p %p\n", table, id, buff, buflen);
+    TRACE("%p %lx %p %p\n", table, id, buff, buflen);
    if (!table) {
        *buflen = 0;

--- a/dlls/setupapi/stubs.c
+++ b/dlls/setupapi/stubs.c