https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d5012ca368144ac91ac608...
commit d5012ca368144ac91ac608cc8880eee3db6fb8a8 Author: winesync ros-dev@reactos.org AuthorDate: Sun Mar 13 00:16:18 2022 +0100 Commit: Mark Jansen mark.jansen@reactos.org CommitDate: Sun Mar 20 19:28:06 2022 +0100
[WINESYNC] msi: Turn several variables and constants into static constants.
Signed-off-by: Alex Henrie alexhenrie24@gmail.com Signed-off-by: Hans Leidekker hans@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
wine commit id 6a833ce0b39ae9f57162f6ffd3ff55f19f3ba540 by Alex Henrie alexhenrie24@gmail.com --- dll/win32/msi/action.c | 4 ++-- dll/win32/msi/database.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dll/win32/msi/action.c b/dll/win32/msi/action.c index 1be0a4ce52c..ad2f40cd78f 100644 --- a/dll/win32/msi/action.c +++ b/dll/win32/msi/action.c @@ -167,7 +167,7 @@ struct dummy_thread
static INT ui_actionstart(MSIPACKAGE *package, LPCWSTR action, LPCWSTR description, LPCWSTR template) { - WCHAR query[] = {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', + static const WCHAR query[] = {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', '`','A','c','t','i','o','n','T','e','x','t','`',' ','W','H','E','R','E',' ', '`','A','c','t','i','o','n','`',' ','=',' ',''','%','s',''',0}; MSIRECORD *row, *textrow; @@ -3553,7 +3553,7 @@ static WCHAR *build_full_keypath( MSIPACKAGE *package, MSICOMPONENT *comp ) { if (comp->assembly) { - const WCHAR prefixW[] = {'<','\',0}; + static const WCHAR prefixW[] = {'<','\',0}; DWORD len = strlenW( prefixW ) + strlenW( comp->assembly->display_name ); WCHAR *keypath = msi_alloc( (len + 1) * sizeof(WCHAR) );
diff --git a/dll/win32/msi/database.c b/dll/win32/msi/database.c index 91e5e96832b..49fa16c5d81 100644 --- a/dll/win32/msi/database.c +++ b/dll/win32/msi/database.c @@ -1445,7 +1445,7 @@ static LPWSTR get_key_value(MSIQUERY *view, LPCWSTR key, MSIRECORD *rec) if (MSI_RecordGetString(rec, i)) /* check record field is a string */ { /* quote string record fields */ - const WCHAR szQuote[] = {''', 0}; + static const WCHAR szQuote[] = {''', 0}; sz += 2; val = msi_alloc(sz*sizeof(WCHAR)); if (!val)