wine-commits November 2018

wine-commits@winehq.org

2 participants
951 discussions

Alex Henrie : msi: Turn several variables and constants into static constants.
by Alexandre Julliard 30 Nov '18

30 Nov '18

Module: wine Branch: master Commit: 6a833ce0b39ae9f57162f6ffd3ff55f19f3ba540 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a833ce0b39ae9f57162f6ff… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Nov 30 00:14:12 2018 -0700 msi: Turn several variables and constants into static constants. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 4 ++-- dlls/msi/database.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 8ae9dce..9407d36 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -160,7 +160,7 @@ static const WCHAR szINSTALL[] = 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; @@ -3546,7 +3546,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/dlls/msi/database.c b/dlls/msi/database.c index c1fb37b..b8ec393 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -1333,7 +1333,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)

1 0

Alex Henrie : mscms: Turn variables 'slash' and 'spec' into static constants.
by Alexandre Julliard 30 Nov '18

30 Nov '18

Module: wine Branch: master Commit: a07e3341252580ca1e5c288755945834479024df URL: https://source.winehq.org/git/wine.git/?a=commit;h=a07e3341252580ca1e5c2887… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Nov 30 00:14:09 2018 -0700 mscms: Turn variables 'slash' and 'spec' into static constants. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscms/profile.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c index 039a271..a0b9d41 100644 --- a/dlls/mscms/profile.c +++ b/dlls/mscms/profile.c @@ -668,9 +668,10 @@ BOOL WINAPI GetStandardColorSpaceProfileW( PCWSTR machine, DWORD id, PWSTR profi static BOOL header_from_file( LPCWSTR file, PPROFILEHEADER header ) { + static const WCHAR slash[] = {'\\',0}; BOOL ret; PROFILE profile; - WCHAR path[MAX_PATH], slash[] = {'\\',0}; + WCHAR path[MAX_PATH]; DWORD size = sizeof(path); HANDLE handle; @@ -953,8 +954,8 @@ exit: BOOL WINAPI EnumColorProfilesW( PCWSTR machine, PENUMTYPEW record, PBYTE buffer, PDWORD size, PDWORD number ) { + static const WCHAR spec[] = {'\\','*','i','c','m',0}; BOOL match, ret = FALSE; - WCHAR spec[] = {'\\','*','i','c','m',0}; WCHAR colordir[MAX_PATH], glob[MAX_PATH], **profiles = NULL; DWORD i, len = sizeof(colordir), count = 0, totalsize = 0; PROFILEHEADER header;

1 0

Alex Henrie : midimap: Turn variable 'throughportW' into a static constant.
by Alexandre Julliard 30 Nov '18

30 Nov '18

Module: wine Branch: master Commit: cd485b325226280f1c224b773049a3b66dfe57db URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd485b325226280f1c224b77… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Nov 30 00:14:08 2018 -0700 midimap: Turn variable 'throughportW' into a static constant. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/midimap/midimap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/midimap/midimap.c b/dlls/midimap/midimap.c index 290300a..540dac3 100644 --- a/dlls/midimap/midimap.c +++ b/dlls/midimap/midimap.c @@ -553,9 +553,9 @@ DWORD WINAPI MIDIMAP_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, */ static LRESULT MIDIMAP_drvOpen(void) { + static const WCHAR throughportW[] = {'M','i','d','i',' ','T','h','r','o','u','g','h',0}; MIDIOUTCAPSW moc; unsigned dev, i; - WCHAR throughportW[] = {'M','i','d','i',' ','T','h','r','o','u','g','h',0}; BOOL found_valid_port = FALSE; if (midiOutPorts)

1 0

Alex Henrie : hhctrl.ocx: Make constant 'szHTMext' static.
by Alexandre Julliard 30 Nov '18

30 Nov '18

Module: wine Branch: master Commit: 634637c05766fdec049997c7363f25a22a42caeb URL: https://source.winehq.org/git/wine.git/?a=commit;h=634637c05766fdec049997c7… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Nov 30 00:14:05 2018 -0700 hhctrl.ocx: Make constant 'szHTMext' static. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hhctrl.ocx/search.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hhctrl.ocx/search.c b/dlls/hhctrl.ocx/search.c index d758a1b..0e198b8 100644 --- a/dlls/hhctrl.ocx/search.c +++ b/dlls/hhctrl.ocx/search.c @@ -152,7 +152,7 @@ cleanup: static SearchItem *SearchCHM_Storage(SearchItem *item, IStorage *pStorage, const char *needle) { - const WCHAR szHTMext[] = {'.','h','t','m',0}; + static const WCHAR szHTMext[] = {'.','h','t','m',0}; IEnumSTATSTG *elem = NULL; WCHAR *filename = NULL; STATSTG entries;

1 0

Alex Henrie : atl: Make constants 'AtlAxWinW' and 'AtlAxWinLicW' static.
by Alexandre Julliard 30 Nov '18

30 Nov '18

Module: wine Branch: master Commit: ef7855e1310aed44376ab23890bc4d68dd63d380 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef7855e1310aed44376ab238… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Nov 30 00:13:59 2018 -0700 atl: Make constants 'AtlAxWinW' and 'AtlAxWinLicW' static. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/atl/atl_ax.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/atl/atl_ax.c b/dlls/atl/atl_ax.c index 8121278..ce18044 100644 --- a/dlls/atl/atl_ax.c +++ b/dlls/atl/atl_ax.c @@ -104,7 +104,7 @@ BOOL WINAPI AtlAxWinInit(void) #error Unsupported version #endif - const WCHAR AtlAxWinW[] = {'A','t','l','A','x','W','i','n',ATL_NAME_SUFFIX}; + static const WCHAR AtlAxWinW[] = {'A','t','l','A','x','W','i','n',ATL_NAME_SUFFIX}; FIXME("version %04x semi-stub\n", _ATL_VER); @@ -128,7 +128,7 @@ BOOL WINAPI AtlAxWinInit(void) return FALSE; if(_ATL_VER > _ATL_VER_30) { - const WCHAR AtlAxWinLicW[] = {'A','t','l','A','x','W','i','n','L','i','c',ATL_NAME_SUFFIX}; + static const WCHAR AtlAxWinLicW[] = {'A','t','l','A','x','W','i','n','L','i','c',ATL_NAME_SUFFIX}; wcex.lpszClassName = AtlAxWinLicW; if ( !RegisterClassExW( &wcex ) )

1 0

Alex Henrie : amstream: Make constants 'filternameW' and 'sourceW' static.
by Alexandre Julliard 30 Nov '18

30 Nov '18

Module: wine Branch: master Commit: 3f2a2c05912923fcbe1ddfe23004bdf08343bd82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f2a2c05912923fcbe1ddfe2… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Nov 30 00:13:58 2018 -0700 amstream: Make constants 'filternameW' and 'sourceW' static. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/amstream.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index 3b2f71a..f9c9abf 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -235,9 +235,9 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_GetEndOfStream(IAMMultiMediaStream /*** IAMMultiMediaStream methods ***/ static HRESULT WINAPI IAMMultiMediaStreamImpl_Initialize(IAMMultiMediaStream* iface, STREAM_TYPE StreamType, DWORD dwFlags, IGraphBuilder* pFilterGraph) { + static const WCHAR filternameW[] = {'M','e','d','i','a','S','t','r','e','a','m','F','i','l','t','e','r',0}; IAMMultiMediaStreamImpl *This = impl_from_IAMMultiMediaStream(iface); HRESULT hr = S_OK; - const WCHAR filternameW[] = {'M','e','d','i','a','S','t','r','e','a','m','F','i','l','t','e','r',0}; TRACE("(%p/%p)->(%x,%x,%p)\n", This, iface, (DWORD)StreamType, dwFlags, pFilterGraph); @@ -394,13 +394,13 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_AddMediaStream(IAMMultiMediaStream static HRESULT WINAPI IAMMultiMediaStreamImpl_OpenFile(IAMMultiMediaStream* iface, LPCWSTR filename, DWORD flags) { + static const WCHAR sourceW[] = {'S','o','u','r','c','e',0}; IAMMultiMediaStreamImpl *This = impl_from_IAMMultiMediaStream(iface); HRESULT ret = S_OK; IBaseFilter *BaseFilter = NULL; IEnumPins *EnumPins = NULL; IPin *ipin; PIN_DIRECTION pin_direction; - const WCHAR sourceW[] = {'S','o','u','r','c','e',0}; TRACE("(%p/%p)->(%s,%x)\n", This, iface, debugstr_w(filename), flags);

1 0

Alex Henrie : advpack: Turn variable 'prefix' into a static constant.
by Alexandre Julliard 30 Nov '18

30 Nov '18

Module: wine Branch: master Commit: 07e1d6b081dce5a35f4743051ae87d98931d6f92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=07e1d6b081dce5a35f474305… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Nov 30 00:13:57 2018 -0700 advpack: Turn variable 'prefix' into a static constant. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advpack/reg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advpack/reg.c b/dlls/advpack/reg.c index fd0a199..82c1d2b 100644 --- a/dlls/advpack/reg.c +++ b/dlls/advpack/reg.c @@ -41,8 +41,8 @@ static const WCHAR quote[] = {'\"',0}; static BOOL get_temp_ini_path(LPWSTR name) { + static const WCHAR prefix[] = {'a','v','p',0}; WCHAR tmp_dir[MAX_PATH]; - WCHAR prefix[] = {'a','v','p',0}; if(!GetTempPathW(ARRAY_SIZE(tmp_dir), tmp_dir)) return FALSE;

1 0

Alex Henrie : advapi32: Turn several string variables into static constants.
by Alexandre Julliard 30 Nov '18

30 Nov '18

Module: wine Branch: master Commit: bf413496cd402248b7c849efca739c4246b38f1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf413496cd402248b7c849ef… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Nov 30 00:13:56 2018 -0700 advapi32: Turn several string variables into static constants. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/security.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 16512d0..70e2da4 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -440,10 +440,10 @@ static inline DWORD get_security_service( LPWSTR full_service_name, DWORD access /* helper function for SE_REGISTRY_KEY objects in [Get|Set]NamedSecurityInfo */ static inline DWORD get_security_regkey( LPWSTR full_key_name, DWORD access, HANDLE *key ) { - WCHAR classes_rootW[] = {'C','L','A','S','S','E','S','_','R','O','O','T',0}; - WCHAR current_userW[] = {'C','U','R','R','E','N','T','_','U','S','E','R',0}; - WCHAR machineW[] = {'M','A','C','H','I','N','E',0}; - WCHAR usersW[] = {'U','S','E','R','S',0}; + static const WCHAR classes_rootW[] = {'C','L','A','S','S','E','S','_','R','O','O','T',0}; + static const WCHAR current_userW[] = {'C','U','R','R','E','N','T','_','U','S','E','R',0}; + static const WCHAR machineW[] = {'M','A','C','H','I','N','E',0}; + static const WCHAR usersW[] = {'U','S','E','R','S',0}; LPWSTR p = strchrW(full_key_name, '\\'); int len = p-full_key_name; HKEY hParent; @@ -4997,9 +4997,9 @@ static void DumpString(LPCWSTR string, int cch, WCHAR **pwptr, ULONG *plen) static BOOL DumpSidNumeric(PSID psid, WCHAR **pwptr, ULONG *plen) { + static const WCHAR fmt[] = { 'S','-','%','u','-','%','d',0 }; + static const WCHAR subauthfmt[] = { '-','%','u',0 }; DWORD i; - WCHAR fmt[] = { 'S','-','%','u','-','%','d',0 }; - WCHAR subauthfmt[] = { '-','%','u',0 }; WCHAR buf[26]; SID *pisid = psid;

1 0

Francois Gouget : testbot/web: Simplify FormPage::GetDisplayValue().
by Alexandre Julliard 30 Nov '18

30 Nov '18

Module: tools Branch: master Commit: 15657d233d70b3ff724910b41313a6631b9b6695 URL: https://source.winehq.org/git/tools.git/?a=commit;h=15657d233d70b3ff724910b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Nov 30 12:55:15 2018 +0100 testbot/web: Simplify FormPage::GetDisplayValue(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/FormPage.pm | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index 01f7894..735755f 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -189,12 +189,8 @@ sub GetDisplayValue($$) { my ($self, $PropertyDescriptor) = @_; - my $Value; - if (defined($self->GetParam($PropertyDescriptor->GetName()))) - { - $Value = $self->GetParam($PropertyDescriptor->GetName()); - } - else + my $Value = $self->GetParam($PropertyDescriptor->GetName()); + if (!defined $Value) { $Value = $self->GetPropertyValue($PropertyDescriptor); }

1 0

Francois Gouget : testbot/web: Remove unnecessary LastPage checks in Submit.
by Alexandre Julliard 30 Nov '18

30 Nov '18

Module: tools Branch: master Commit: 0daa015e416346f1b4f5696e629178a2fcc81960 URL: https://source.winehq.org/git/tools.git/?a=commit;h=0daa015e416346f1b4f5696… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Nov 30 12:55:07 2018 +0100 testbot/web: Remove unnecessary LastPage checks in Submit. Only Submit.pl can decide when to call Validate() because only it knows whether this is appropriate for the current action. And this always happens as a check before moving on to the next page which means $self->{Page} is equal to $self->{LastPage}. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Submit.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index a81a954..e0ccda3 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -456,7 +456,7 @@ sub Validate($) { my ($self) = @_; - if ($self->{Page} == 2 && $self->{LastPage} == 2) + if ($self->{Page} == 2) { my $VMSelected = !1; my $VMs = CreateVMs(); @@ -476,7 +476,7 @@ sub Validate($) return !1; } } - elsif ($self->{Page} == 3 && $self->{LastPage} == 3) + elsif ($self->{Page} == 3) { if (($self->GetParam("FileType") eq "patch" && $self->GetParam("TestExecutable") !~ m/^[\w_.]+_test\.exe$/) ||

1 0

← Newer
1
2
3
4
5
6
7
...
96
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2018