November 2018 - Wine-Commits

Alex Henrie : setupapi: Turn several constants and variables into static constants.
by Alexandre Julliard Nov. 30, 2018

Nov. 30, 2018

Module: wine Branch: master Commit: 837b4aa429ea0b7200a56df4f5ed30286e26c75e URL: https://source.winehq.org/git/wine.git/?a=commit;h=837b4aa429ea0b7200a56df4… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Nov 30 00:14:19 2018 -0700 setupapi: Turn several constants and variables into static constants. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 6 +++--- dlls/setupapi/install.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index ae7a575..b3d7099 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -259,7 +259,7 @@ static void SETUPDI_GuidToString(const GUID *guid, LPWSTR guidStr) static WCHAR *get_iface_key_path(struct device_iface *iface) { - const WCHAR slashW[] = {'\\',0}; + static const WCHAR slashW[] = {'\\',0}; WCHAR *path, *ptr; size_t len = strlenW(DeviceClasses) + 1 + 38 + 1 + strlenW(iface->symlink); @@ -286,8 +286,8 @@ static WCHAR *get_iface_key_path(struct device_iface *iface) static WCHAR *get_refstr_key_path(struct device_iface *iface) { - const WCHAR hashW[] = {'#',0}; - const WCHAR slashW[] = {'\\',0}; + static const WCHAR hashW[] = {'#',0}; + static const WCHAR slashW[] = {'\\',0}; WCHAR *path, *ptr; size_t len = strlenW(DeviceClasses) + 1 + 38 + 1 + strlenW(iface->symlink) + 1 + 1; diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index 1453f52..0abd716 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -1598,7 +1598,7 @@ BOOL WINAPI SetupGetInfFileListW(PCWSTR dir, DWORD style, PWSTR buffer, } else { - WCHAR infdir[] = {'\\','i','n','f',0 }; + static const WCHAR infdir[] = {'\\','i','n','f',0}; DWORD msize; dir_len = GetWindowsDirectoryW( NULL, 0 ); msize = ( 7 + 4 + dir_len ) * sizeof( WCHAR );

1 0

Alex Henrie : ntoskrnl.exe: Make several string constants static.
by Alexandre Julliard Nov. 30, 2018

Nov. 30, 2018

Module: wine Branch: master Commit: 2e758ea86c1412be7e99dcfc25eea8796b06f073 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e758ea86c1412be7e99dcfc… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Nov 30 00:14:14 2018 -0700 ntoskrnl.exe: Make several string constants static. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 81731ce..2b3b2ec 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1371,15 +1371,15 @@ static NTSTATUS create_device_symlink( DEVICE_OBJECT *device, UNICODE_STRING *sy */ NTSTATUS WINAPI IoSetDeviceInterfaceState( UNICODE_STRING *name, BOOLEAN enable ) { - const WCHAR DeviceClassesW[] = {'\\','R','E','G','I','S','T','R','Y','\\', + static const WCHAR DeviceClassesW[] = {'\\','R','E','G','I','S','T','R','Y','\\', 'M','a','c','h','i','n','e','\\','S','y','s','t','e','m','\\', 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', 'C','o','n','t','r','o','l','\\', 'D','e','v','i','c','e','C','l','a','s','s','e','s','\\',0}; - const WCHAR controlW[] = {'C','o','n','t','r','o','l',0}; - const WCHAR linkedW[] = {'L','i','n','k','e','d',0}; - const WCHAR slashW[] = {'\\',0}; - const WCHAR hashW[] = {'#',0}; + static const WCHAR controlW[] = {'C','o','n','t','r','o','l',0}; + static const WCHAR linkedW[] = {'L','i','n','k','e','d',0}; + static const WCHAR slashW[] = {'\\',0}; + static const WCHAR hashW[] = {'#',0}; size_t namelen = name->Length / sizeof(WCHAR); DEV_BROADCAST_DEVICEINTERFACE_W *broadcast;

1 0

Alex Henrie : netapi32: Make constant 'admins' static.
by Alexandre Julliard Nov. 30, 2018

Nov. 30, 2018

Module: wine Branch: master Commit: 5ceb740793eb27d3e932a6f5492b0722197ebe2d URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ceb740793eb27d3e932a6f5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Nov 30 00:14:13 2018 -0700 netapi32: Make constant 'admins' static. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netapi32/netapi32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index afeada6..c765f36 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -2298,8 +2298,8 @@ NetUserGetLocalGroups(LPCWSTR servername, LPCWSTR username, DWORD level, DWORD flags, LPBYTE* bufptr, DWORD prefmaxlen, LPDWORD entriesread, LPDWORD totalentries) { + static const WCHAR admins[] = {'A','d','m','i','n','i','s','t','r','a','t','o','r','s',0}; NET_API_STATUS status; - const WCHAR admins[] = {'A','d','m','i','n','i','s','t','r','a','t','o','r','s',0}; LPWSTR currentuser; LOCALGROUP_USERS_INFO_0* info; DWORD size;

1 0

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

Nov. 30, 2018

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 : oleaut32: Make constant 'szAccept' static.
by Alexandre Julliard Nov. 30, 2018

Nov. 30, 2018

Module: wine Branch: master Commit: 77a8872fc9e2e44ec3b502cadcb883577a0b70f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=77a8872fc9e2e44ec3b502ca… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Nov 30 00:14:15 2018 -0700 oleaut32: Make constant 'szAccept' static. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/vartype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index e2df873..067d515 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -6522,7 +6522,7 @@ static HRESULT VARIANT_BstrFromReal(DOUBLE dblIn, LCID lcid, ULONG dwFlags, */ if (buff[0] == '-') { - const WCHAR szAccept[] = {'0', '.', '\0'}; + static const WCHAR szAccept[] = {'0', '.', '\0'}; if (strlenW(buff + 1) == strspnW(buff + 1, szAccept)) { buff[0] = '0'; buff[1] = '\0'; } }

1 0

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

Nov. 30, 2018

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 : advapi32: Turn several string variables into static constants.
by Alexandre Julliard Nov. 30, 2018

Nov. 30, 2018

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

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

Nov. 30, 2018

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

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

Nov. 30, 2018

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 Nov. 30, 2018

Nov. 30, 2018

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