Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-20 04:20:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINESYNC] msi: Use a string literal for empty strings.

Browse source 
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Hans Leidekker <hans@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 17c745a9d253b888366831ce4b9e695297f0dac2 by Michael Stefaniuc <mstefani@winehq.org>
This commit is contained in:
winesync 2022-03-13 21:40:14 +01:00 committed by Mark Jansen
parent 9ad17dd7b2
commit 7d95ee4fe9
No known key found for this signature in database
GPG key ID: B39240EE84BEAE8B
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
dll/win32/msi/action.c
View file

@ -1276,7 +1276,7 @@ static UINT load_folder_persistence( MSIPACKAGE *package, MSIFOLDER *folder )
static UINT load_folder( MSIRECORD *row, LPVOID param ) static UINT load_folder( MSIRECORD *row, LPVOID param )
{ {
MSIPACKAGE *package = param; MSIPACKAGE *package = param;
static WCHAR szEmpty[] = {0}; static WCHAR szEmpty[] = L"";
LPWSTR p, tgt_short, tgt_long, src_short, src_long; LPWSTR p, tgt_short, tgt_long, src_short, src_long;
MSIFOLDER *folder; MSIFOLDER *folder;
@ -5268,14 +5268,14 @@ static UINT ACTION_RegisterUser(MSIPACKAGE *package)
L"ProductID", L"ProductID",
L"USERNAME", L"USERNAME",
L"COMPANYNAME", L"COMPANYNAME",
{0}, L"",
}; };
static const WCHAR szRegKeys[][80] = static const WCHAR szRegKeys[][80] =
{ {
L"ProductID", L"ProductID",
L"RegOwner", L"RegOwner",
L"RegCompany", L"RegCompany",
{0}, L"",
}; };
HKEY hkey = 0; HKEY hkey = 0;
LPWSTR buffer, productid = NULL; LPWSTR buffer, productid = NULL;

2
dll/win32/msi/automation.c
View file

@ -781,7 +781,7 @@ static HRESULT summaryinfo_invoke(
DATE date; DATE date;
LPWSTR str; LPWSTR str;
static WCHAR szEmpty[] = {0}; static WCHAR szEmpty[] = L"";
hr = DispGetParam(pDispParams, 0, VT_I4, &varg0, puArgErr); hr = DispGetParam(pDispParams, 0, VT_I4, &varg0, puArgErr);
if (FAILED(hr)) return hr; if (FAILED(hr)) return hr;

4
dll/win32/msi/msi.c
View file

@ -324,7 +324,7 @@ static UINT get_patch_product_codes( LPCWSTR szPatchPackage, WCHAR ***product_co
MSIHANDLE patch, info = 0; MSIHANDLE patch, info = 0;
UINT r, type; UINT r, type;
DWORD size; DWORD size;
static WCHAR empty[] = {0}; static WCHAR empty[] = L"";
WCHAR *codes = NULL; WCHAR *codes = NULL;
r = MsiOpenDatabaseW( szPatchPackage, MSIDBOPEN_READONLY, &patch ); r = MsiOpenDatabaseW( szPatchPackage, MSIDBOPEN_READONLY, &patch );
@ -1096,7 +1096,7 @@ static WCHAR *reg_get_value( HKEY hkey, const WCHAR *name, DWORD *type )
static UINT MSI_GetProductInfo(LPCWSTR szProduct, LPCWSTR szAttribute, static UINT MSI_GetProductInfo(LPCWSTR szProduct, LPCWSTR szAttribute,
awstring *szValue, LPDWORD pcchValueBuf) awstring *szValue, LPDWORD pcchValueBuf)
{ {
static WCHAR empty[] = {0}; static WCHAR empty[] = L"";
MSIINSTALLCONTEXT context = MSIINSTALLCONTEXT_USERUNMANAGED; MSIINSTALLCONTEXT context = MSIINSTALLCONTEXT_USERUNMANAGED;
UINT r = ERROR_UNKNOWN_PROPERTY; UINT r = ERROR_UNKNOWN_PROPERTY;
HKEY prodkey, userdata, source; HKEY prodkey, userdata, source;

2
dll/win32/msi/source.c
View file

@ -585,7 +585,7 @@ UINT WINAPI MsiSourceListGetInfoW( LPCWSTR szProduct, LPCWSTR szUserSid,
0, 0, NULL, &size); 0, 0, NULL, &size);
if (rc != ERROR_SUCCESS) if (rc != ERROR_SUCCESS)
{ {
static WCHAR szEmpty[] = {0}; static WCHAR szEmpty[] = L"";
rc = ERROR_SUCCESS; rc = ERROR_SUCCESS;
source = NULL; source = NULL;
ptr = szEmpty; ptr = szEmpty;