wine-commits December 2018

wine-commits@winehq.org

1 participants
352 discussions

Alex Henrie : cryptui: Have a single empty wide string at the top of main.c.
by Alexandre Julliard 04 Dec '18

04 Dec '18

Module: wine Branch: master Commit: 9b69fe2332e76984929f9aea49bc779035049513 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b69fe2332e76984929f9aea… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Nov 30 00:14:01 2018 -0700 cryptui: Have a single empty wide string at the top of main.c. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cryptui/main.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 1fbe63e..a100419 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -46,6 +46,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(cryptui); static HINSTANCE hInstance; +static const WCHAR empty[] = {0}; + BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); @@ -804,8 +806,6 @@ static LRESULT CALLBACK cert_mgr_advanced_dlg_proc(HWND hwnd, UINT msg, static void cert_mgr_clear_cert_selection(HWND hwnd) { - WCHAR empty[] = { 0 }; - EnableWindow(GetDlgItem(hwnd, IDC_MGR_EXPORT), FALSE); EnableWindow(GetDlgItem(hwnd, IDC_MGR_REMOVE), FALSE); EnableWindow(GetDlgItem(hwnd, IDC_MGR_VIEW), FALSE); @@ -1166,7 +1166,6 @@ static LRESULT CALLBACK cert_mgr_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, break; case LVN_ITEMCHANGED: { - WCHAR empty[] = { 0 }; NMITEMACTIVATE *nm = (NMITEMACTIVATE*)lp; HWND lv = GetDlgItem(hwnd, IDC_MGR_CERTS); int numSelected = SendMessageW(lv, LVM_GETSELECTEDCOUNT, 0, 0);

1 0

Alex Henrie : browseui: Have a single empty wide string at the top of progressdlg.c.
by Alexandre Julliard 04 Dec '18

04 Dec '18

Module: wine Branch: master Commit: be8870d5ea54865ba24a222cd5eec0d548b780cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=be8870d5ea54865ba24a222c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Nov 30 00:14:00 2018 -0700 browseui: Have a single empty wide string at the top of progressdlg.c. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/browseui/progressdlg.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/browseui/progressdlg.c b/dlls/browseui/progressdlg.c index e10d8bd..61078a1 100644 --- a/dlls/browseui/progressdlg.c +++ b/dlls/browseui/progressdlg.c @@ -89,9 +89,10 @@ static inline ProgressDialog *impl_from_IOleWindow(IOleWindow *iface) return CONTAINING_RECORD(iface, ProgressDialog, IOleWindow_iface); } +static const WCHAR empty_string[] = {0}; + static void set_buffer(LPWSTR *buffer, LPCWSTR string) { - static const WCHAR empty_string[] = {0}; IMalloc *malloc; ULONG cb; @@ -132,15 +133,13 @@ static void set_progress_marquee(ProgressDialog *This) static void update_dialog(ProgressDialog *This, DWORD dwUpdate) { - WCHAR empty[] = {0}; - if (dwUpdate & UPDATE_TITLE) SetWindowTextW(This->hwnd, This->title); if (dwUpdate & UPDATE_LINE1) - SetDlgItemTextW(This->hwnd, IDC_TEXT_LINE, (This->isCancelled ? empty : This->lines[0])); + SetDlgItemTextW(This->hwnd, IDC_TEXT_LINE, (This->isCancelled ? empty_string : This->lines[0])); if (dwUpdate & UPDATE_LINE2) - SetDlgItemTextW(This->hwnd, IDC_TEXT_LINE+1, (This->isCancelled ? empty : This->lines[1])); + SetDlgItemTextW(This->hwnd, IDC_TEXT_LINE+1, (This->isCancelled ? empty_string : This->lines[1])); if (dwUpdate & UPDATE_LINE3) SetDlgItemTextW(This->hwnd, IDC_TEXT_LINE+2, (This->isCancelled ? This->cancelMsg : This->lines[2]));

1 0

Alex Henrie : wineandroid.drv: Turn variable 'options' into a static constant.
by Alexandre Julliard 04 Dec '18

04 Dec '18

Module: wine Branch: master Commit: 6367203572458fb5d680a6c298b82e13ff040102 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6367203572458fb5d680a6c2… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Dec 3 21:43:00 2018 -0700 wineandroid.drv: Turn variable 'options' into a static constant. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/mmdevdrv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wineandroid.drv/mmdevdrv.c b/dlls/wineandroid.drv/mmdevdrv.c index 8f428a8..3968536 100644 --- a/dlls/wineandroid.drv/mmdevdrv.c +++ b/dlls/wineandroid.drv/mmdevdrv.c @@ -287,8 +287,8 @@ static SLObjectItf outputmix; HRESULT AUDDRV_Init(void) { + static const SLEngineOption options[] = { {SL_ENGINEOPTION_THREADSAFE, SL_BOOLEAN_TRUE} }; SLresult sr; - SLEngineOption options[] = { {SL_ENGINEOPTION_THREADSAFE, SL_BOOLEAN_TRUE} }; sr = pslCreateEngine(&sl, 1, options, 0, NULL, NULL); if(sr != SL_RESULT_SUCCESS){

1 0

Alex Henrie : uxtheme: Turn a variable and a constant into static constants.
by Alexandre Julliard 04 Dec '18

04 Dec '18

Module: wine Branch: master Commit: 53c8abbf8aecf96ef5d239984c6054a56f5a64cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=53c8abbf8aecf96ef5d23998… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Dec 3 21:42:59 2018 -0700 uxtheme: Turn a variable and a constant into static constants. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/metric.c | 6 +++--- dlls/uxtheme/system.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/uxtheme/metric.c b/dlls/uxtheme/metric.c index 5f6c36f..073422f 100644 --- a/dlls/uxtheme/metric.c +++ b/dlls/uxtheme/metric.c @@ -165,9 +165,7 @@ HRESULT WINAPI GetThemeSysInt(HTHEME hTheme, int iIntID, int *piValue) */ int WINAPI GetThemeSysSize(HTHEME hTheme, int iSizeID) { - PTHEME_PROPERTY tp; - int i, id = -1; - int metricMap[] = { + static const int metricMap[] = { SM_CXVSCROLL, TMT_SCROLLBARWIDTH, SM_CYHSCROLL, TMT_SCROLLBARHEIGHT, SM_CXSIZE, TMT_CAPTIONBARWIDTH, @@ -179,6 +177,8 @@ int WINAPI GetThemeSysSize(HTHEME hTheme, int iSizeID) SM_CXMENUSIZE, TMT_MENUBARWIDTH, SM_CYMENUSIZE, TMT_MENUBARHEIGHT }; + PTHEME_PROPERTY tp; + int i, id = -1; if(hTheme) { for(i=0; i<ARRAY_SIZE(metricMap); i+=2) { diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index db49754..c898ad3 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -813,7 +813,7 @@ HRESULT WINAPI GetThemeDocumentationProperty(LPCWSTR pszThemeName, LPWSTR pszValueBuff, int cchMaxValChars) { - const WORD wDocToRes[] = { + static const WORD wDocToRes[] = { TMT_DISPLAYNAME,5000, TMT_TOOLTIP,5001, TMT_COMPANY,5002,

1 0

Alex Henrie : qcap: Make constants 'msg' and 'VFWIndex' static.
by Alexandre Julliard 04 Dec '18

04 Dec '18

Module: wine Branch: master Commit: 6a1a2e8288be541f906a4b718cca8cf771cbc291 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a1a2e8288be541f906a4b71… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Dec 3 21:42:58 2018 -0700 qcap: Make constants 'msg' and 'VFWIndex' static. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/v4l.c | 2 +- dlls/qcap/vfwcapture.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index b4b7b96..80b0fe8 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -915,7 +915,7 @@ error: Capture * qcap_driver_init( IPin *pOut, USHORT card ) { - const char msg[] = + static const char msg[] = "The v4l headers were not available at compile time,\n" "so video capture support is not available.\n"; MESSAGE(msg); diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index ca804fe..6297a80 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -524,10 +524,10 @@ static HRESULT WINAPI PPB_Load( IPersistPropertyBag * iface, IPropertyBag *pPropBag, IErrorLog *pErrorLog ) { + static const OLECHAR VFWIndex[] = {'V','F','W','I','n','d','e','x',0}; VfwCapture *This = impl_from_IPersistPropertyBag(iface); HRESULT hr; VARIANT var; - const OLECHAR VFWIndex[] = {'V','F','W','I','n','d','e','x',0}; TRACE("%p/%p-> (%p, %p)\n", iface, This, pPropBag, pErrorLog);

1 0

Alex Henrie : oledb32: Make constant 'hexchars' static.
by Alexandre Julliard 04 Dec '18

04 Dec '18

Module: wine Branch: master Commit: a4adc1d7a809edcdea4e282aeb71ed73cf01483f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4adc1d7a809edcdea4e282a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Dec 3 21:42:57 2018 -0700 oledb32: Make constant 'hexchars' static. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/convert.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 971e6d9..f18c756 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -638,7 +638,7 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, hr = E_OUTOFMEMORY; else { - const char hexchars[] = "0123456789ABCDEF"; + static const char hexchars[] = "0123456789ABCDEF"; WCHAR *s = *d; unsigned char *p = src; while (src_len > 0)

1 0

Alex Henrie : inetcomm: Make several constants static.
by Alexandre Julliard 04 Dec '18

04 Dec '18

Module: wine Branch: master Commit: 11f8826c135a220c20900224b00ce3a45f5469f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=11f8826c135a220c20900224… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Dec 3 21:42:54 2018 -0700 inetcomm: Make several constants static. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/smtptransport.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/inetcomm/smtptransport.c b/dlls/inetcomm/smtptransport.c index af11308..d71061e 100644 --- a/dlls/inetcomm/smtptransport.c +++ b/dlls/inetcomm/smtptransport.c @@ -281,7 +281,7 @@ static void SMTPTransport_CallbackSendHello(IInternetTransport *iface, char *pBu HRESULT hr; const char *pszHello; char *pszCommand; - const char szHostName[] = "localhost"; /* FIXME */ + static const char szHostName[] = "localhost"; /* FIXME */ TRACE("\n"); @@ -483,7 +483,7 @@ static void SMTPTransport_CallbackMessageSendTo(IInternetTransport *iface, char if ((This->pending_message.rAddressList.prgAddress[This->ulCurrentAddressIndex].addrtype & ADDR_TOFROM_MASK) == ADDR_TO) { - const char szCommandFormat[] = "RCPT TO: <%s>\n"; + static const char szCommandFormat[] = "RCPT TO: <%s>\n"; char *szCommand; int len = sizeof(szCommandFormat) - 2 /* "%s" */ + strlen(This->pending_message.rAddressList.prgAddress[This->ulCurrentAddressIndex].szEmail); @@ -659,10 +659,10 @@ static HRESULT WINAPI SMTPTransport_InitNew(ISMTPTransport2 *iface, static HRESULT WINAPI SMTPTransport_SendMessage(ISMTPTransport2 *iface, LPSMTPMESSAGE pMessage) { + static const char szCommandFormat[] = "MAIL FROM: <%s>\n"; SMTPTransport *This = (SMTPTransport *)iface; ULONG i, size; LPSTR pszFromAddress = NULL; - const char szCommandFormat[] = "MAIL FROM: <%s>\n"; char *szCommand; int len; HRESULT hr; @@ -723,8 +723,8 @@ static HRESULT WINAPI SMTPTransport_SendMessage(ISMTPTransport2 *iface, static HRESULT WINAPI SMTPTransport_CommandMAIL(ISMTPTransport2 *iface, LPSTR pszEmailFrom) { + static const char szCommandFormat[] = "MAIL FROM: <%s>\n"; SMTPTransport *This = (SMTPTransport *)iface; - const char szCommandFormat[] = "MAIL FROM: <%s>\n"; char *szCommand; int len; HRESULT hr; @@ -750,8 +750,8 @@ static HRESULT WINAPI SMTPTransport_CommandMAIL(ISMTPTransport2 *iface, LPSTR ps static HRESULT WINAPI SMTPTransport_CommandRCPT(ISMTPTransport2 *iface, LPSTR pszEmailTo) { + static const char szCommandFormat[] = "RCPT TO: <%s>\n"; SMTPTransport *This = (SMTPTransport *)iface; - const char szCommandFormat[] = "RCPT TO: <%s>\n"; char *szCommand; int len; HRESULT hr; @@ -777,9 +777,9 @@ static HRESULT WINAPI SMTPTransport_CommandRCPT(ISMTPTransport2 *iface, LPSTR ps static HRESULT WINAPI SMTPTransport_CommandEHLO(ISMTPTransport2 *iface) { + static const char szCommandFormat[] = "EHLO %s\n"; + static const char szHostname[] = "localhost"; /* FIXME */ SMTPTransport *This = (SMTPTransport *)iface; - const char szCommandFormat[] = "EHLO %s\n"; - const char szHostname[] = "localhost"; /* FIXME */ char *szCommand; int len = sizeof(szCommandFormat) - 2 /* "%s" */ + sizeof(szHostname); HRESULT hr; @@ -801,9 +801,9 @@ static HRESULT WINAPI SMTPTransport_CommandEHLO(ISMTPTransport2 *iface) static HRESULT WINAPI SMTPTransport_CommandHELO(ISMTPTransport2 *iface) { + static const char szCommandFormat[] = "HELO %s\n"; + static const char szHostname[] = "localhost"; /* FIXME */ SMTPTransport *This = (SMTPTransport *)iface; - const char szCommandFormat[] = "HELO %s\n"; - const char szHostname[] = "localhost"; /* FIXME */ char *szCommand; int len = sizeof(szCommandFormat) - 2 /* "%s" */ + sizeof(szHostname); HRESULT hr; @@ -826,8 +826,8 @@ static HRESULT WINAPI SMTPTransport_CommandHELO(ISMTPTransport2 *iface) static HRESULT WINAPI SMTPTransport_CommandAUTH(ISMTPTransport2 *iface, LPSTR pszAuthType) { + static const char szCommandFormat[] = "AUTH %s\n"; SMTPTransport *This = (SMTPTransport *)iface; - const char szCommandFormat[] = "AUTH %s\n"; char *szCommand; int len; HRESULT hr;

1 0

Alex Henrie : dinput: Turn two variables into static constants.
by Alexandre Julliard 04 Dec '18

04 Dec '18

Module: wine Branch: master Commit: 2ad7ecc6cdce22c4b4bbeea82fb7ff1f022fbcfb URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ad7ecc6cdce22c4b4bbeea8… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Dec 3 21:42:52 2018 -0700 dinput: Turn two variables into static constants. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 9f426f3..0ec1ceb 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -766,11 +766,11 @@ HRESULT WINAPI JoystickWGenericImpl_BuildActionMap(LPDIRECTINPUTDEVICE8W iface, LPCWSTR lpszUserName, DWORD dwFlags) { + static const DWORD object_types[] = { DIDFT_AXIS, DIDFT_BUTTON }; + static const DWORD type_map[] = { DIDFT_RELAXIS, DIDFT_PSHBUTTON }; JoystickGenericImpl *This = impl_from_IDirectInputDevice8W(iface); unsigned int i, j; BOOL has_actions = FALSE; - DWORD object_types[] = { DIDFT_AXIS, DIDFT_BUTTON }; - DWORD type_map[] = { DIDFT_RELAXIS, DIDFT_PSHBUTTON }; FIXME("(%p)->(%p,%s,%08x): semi-stub !\n", iface, lpdiaf, debugstr_w(lpszUserName), dwFlags);

1 0

Alex Henrie : cryptui: Turn static variable 'import_filters' into a constant.
by Alexandre Julliard 04 Dec '18

04 Dec '18

Module: wine Branch: master Commit: d141f9585abe410156be02ec3f809a2cfaa9feb7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d141f9585abe410156be02ec… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Dec 3 21:42:50 2018 -0700 cryptui: Turn static variable 'import_filters' into a constant. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cryptui/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index b62ce9e..1fbe63e 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -4905,7 +4905,7 @@ static const WCHAR filter_cms[] = { '*','.','s','p','c',';','*','.', 'p','7','b',0 }; static const WCHAR filter_all[] = { '*','.','*',0 }; -static struct StringToFilter +static const struct { int id; DWORD allowFlags;

1 0

Alex Henrie : comdlg32: Turn several variables into static constants.
by Alexandre Julliard 04 Dec '18

04 Dec '18

Module: wine Branch: master Commit: fedd1cb3d31ddd5170073762142f5a6c0220a68f URL: https://source.winehq.org/git/wine.git/?a=commit;h=fedd1cb3d31ddd5170073762… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Dec 3 21:42:49 2018 -0700 comdlg32: Turn several variables into static constants. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/printdlg.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 429903b..69e9aeb 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -2618,9 +2618,9 @@ static WCHAR get_decimal_sep(void) static void size2str(const pagesetup_data *data, DWORD size, LPWSTR strout) { - WCHAR integer_fmt[] = {'%','d',0}; - WCHAR hundredths_fmt[] = {'%','d','%','c','%','0','2','d',0}; - WCHAR thousandths_fmt[] = {'%','d','%','c','%','0','3','d',0}; + static const WCHAR integer_fmt[] = {'%','d',0}; + static const WCHAR hundredths_fmt[] = {'%','d','%','c','%','0','2','d',0}; + static const WCHAR thousandths_fmt[] = {'%','d','%','c','%','0','3','d',0}; /* FIXME use LOCALE_SDECIMAL when the edit parsing code can cope */

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
36
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 December 2018