ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

appwiz.cpl: Enable compilation with long types. 

Signed-off-by: Eric Pouech <eric.pouech@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Eric Pouech 2022-02-07 23:10:58 +01:00 committed by Alexandre Julliard
parent 30dd2c2326
commit e9c84cca2d
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/appwiz.cpl/Makefile.in
View File

@ -1,4 +1,3 @@
EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = appwiz.cpl MODULE = appwiz.cpl
IMPORTS = uuid urlmon advpack comctl32 advapi32 shell32 ole32 user32 comdlg32 bcrypt kernelbase IMPORTS = uuid urlmon advpack comctl32 advapi32 shell32 ole32 user32 comdlg32 bcrypt kernelbase
DELAYIMPORTS = msi DELAYIMPORTS = msi

12
dlls/appwiz.cpl/addons.c
View File

@ -127,7 +127,7 @@ static BOOL sha_check(const WCHAR *file_name)
file = CreateFileW(file_name, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_READONLY, NULL); file = CreateFileW(file_name, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_READONLY, NULL);
if(file == INVALID_HANDLE_VALUE) { if(file == INVALID_HANDLE_VALUE) {
WARN("Could not open file: %u\n", GetLastError()); WARN("Could not open file: %lu\n", GetLastError());
return FALSE; return FALSE;
} }
@ -189,7 +189,7 @@ static enum install_res install_file(const WCHAR *file_name)
if(res == ERROR_PRODUCT_VERSION) if(res == ERROR_PRODUCT_VERSION)
res = MsiInstallProductW(file_name, L"REINSTALL=ALL REINSTALLMODE=vomus"); res = MsiInstallProductW(file_name, L"REINSTALL=ALL REINSTALLMODE=vomus");
if(res != ERROR_SUCCESS) { if(res != ERROR_SUCCESS) {
ERR("MsiInstallProduct failed: %u\n", res); ERR("MsiInstallProduct failed: %lu\n", res);
return INSTALL_FAILED; return INSTALL_FAILED;
} }
@ -218,7 +218,7 @@ static enum install_res install_from_dos_file(const WCHAR *dir, const WCHAR *sub
hr = PathAllocCanonicalize( path, PATHCCH_ALLOW_LONG_PATHS, &canonical_path ); hr = PathAllocCanonicalize( path, PATHCCH_ALLOW_LONG_PATHS, &canonical_path );
if (FAILED( hr )) if (FAILED( hr ))
{ {
ERR( "Failed to canonicalize %s, hr %#x\n", debugstr_w(path), hr ); ERR( "Failed to canonicalize %s, hr %#lx\n", debugstr_w(path), hr );
heap_free( path ); heap_free( path );
return INSTALL_NEXT; return INSTALL_NEXT;
} }
@ -350,7 +350,7 @@ static WCHAR *get_cache_file_name(BOOL ensure_exists)
if (ensure_exists && !CreateDirectoryW( cache_dir, NULL ) && GetLastError() != ERROR_ALREADY_EXISTS) if (ensure_exists && !CreateDirectoryW( cache_dir, NULL ) && GetLastError() != ERROR_ALREADY_EXISTS)
{ {
WARN( "%s does not exist and could not be created (%u)\n", debugstr_w(cache_dir), GetLastError() ); WARN( "%s does not exist and could not be created (%lu)\n", debugstr_w(cache_dir), GetLastError() );
heap_free( cache_dir ); heap_free( cache_dir );
return NULL; return NULL;
} }
@ -367,7 +367,7 @@ static WCHAR *get_cache_file_name(BOOL ensure_exists)
if (ensure_exists && !CreateDirectoryW( ret, NULL ) && GetLastError() != ERROR_ALREADY_EXISTS) if (ensure_exists && !CreateDirectoryW( ret, NULL ) && GetLastError() != ERROR_ALREADY_EXISTS)
{ {
WARN( "%s does not exist and could not be created (%u)\n", debugstr_w(ret), GetLastError() ); WARN( "%s does not exist and could not be created (%lu)\n", debugstr_w(ret), GetLastError() );
heap_free( ret ); heap_free( ret );
return NULL; return NULL;
} }
@ -477,7 +477,7 @@ static HRESULT WINAPI InstallCallback_OnStopBinding(IBindStatusCallback *iface,
if(hresult == E_ABORT) if(hresult == E_ABORT)
TRACE("Binding aborted\n"); TRACE("Binding aborted\n");
else else
ERR("Binding failed %08x\n", hresult); ERR("Binding failed %08lx\n", hresult);
return S_OK; return S_OK;
} }

2
dlls/appwiz.cpl/appwiz.c
View File

@ -89,7 +89,7 @@ static const WCHAR PathUninstallW[] = L"Software\\Microsoft\\Windows\\CurrentVer
BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason,
LPVOID lpvReserved) LPVOID lpvReserved)
{ {
TRACE("(%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); TRACE("(%p, %ld, %p)\n", hinstDLL, fdwReason, lpvReserved);
switch (fdwReason) switch (fdwReason)
{ {