December 2013 - Wine-Commits

Frédéric Delanoy : widl: Constify a character string.
by Alexandre Julliard Dec. 20, 2013

Dec. 20, 2013

Module: wine Branch: master Commit: 120dac41a1dea9b0929b9dddaa718953f46ceb82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=120dac41a1dea9b0929b9ddda… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Dec 19 22:25:14 2013 +0100 widl: Constify a character string. --- tools/widl/widl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index b37a0f8..b9e1412 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -400,7 +400,7 @@ void write_dlldata(const statement_list_t *stmts) dlldata = fopen(dlldata_name, "r"); if (dlldata) { - static char marker[] = "REFERENCE_PROXY_FILE"; + static const char marker[] = "REFERENCE_PROXY_FILE"; static const char delegation_define[] = "#define PROXY_DELEGATION"; char *line = NULL; size_t len = 0;

1 0

Frédéric Delanoy : advapi32/tests: Constify some character strings.
by Alexandre Julliard Dec. 20, 2013

Dec. 20, 2013

Module: wine Branch: master Commit: 3e9b7b5992920bb8334ca02d9d685e3efd3098b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e9b7b5992920bb8334ca02d9… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Dec 19 22:25:15 2013 +0100 advapi32/tests: Constify some character strings. --- dlls/advapi32/tests/cred.c | 4 ++-- dlls/advapi32/tests/registry.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/cred.c b/dlls/advapi32/tests/cred.c index 229aaaa..59d4bbb 100644 --- a/dlls/advapi32/tests/cred.c +++ b/dlls/advapi32/tests/cred.c @@ -563,8 +563,8 @@ static void test_CredMarshalCredentialA(void) static void test_CredUnmarshalCredentialA(void) { - static WCHAR tW[] = {'t',0}; - static WCHAR testW[] = {'t','e','s','t',0}; + static const WCHAR tW[] = {'t',0}; + static const WCHAR testW[] = {'t','e','s','t',0}; CERT_CREDENTIAL_INFO *cert; USERNAME_TARGET_CREDENTIAL_INFO *username; CRED_MARSHAL_TYPE type; diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 6c3a5f0..3df1cd2 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -1665,7 +1665,7 @@ static void test_rw_order(void) { HKEY hKey; DWORD dw = 0; - static char keyname[] = "test_rw_order"; + static const char keyname[] = "test_rw_order"; char value_buf[2]; DWORD values, value_len, value_name_max_len; LSTATUS ret;

1 0

Frédéric Delanoy : winefile: Constify some character strings.
by Alexandre Julliard Dec. 20, 2013

Dec. 20, 2013

Module: wine Branch: master Commit: 8d8a4c103a8a914c81bbee80c3fc3b9acdcdd684 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d8a4c103a8a914c81bbee80c… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Dec 19 22:25:12 2013 +0100 winefile: Constify some character strings. --- programs/winefile/winefile.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index d2413d1..dee98c9 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -1757,11 +1757,11 @@ static void PropDlg_DisplayValue(HWND hlbox, HWND hedit) static void CheckForFileInfo(struct PropertiesDialog* dlg, HWND hwnd, LPCWSTR strFilename) { - static WCHAR sBackSlash[] = {'\\','\0'}; - static WCHAR sTranslation[] = {'\\','V','a','r','F','i','l','e','I','n','f','o','\\','T','r','a','n','s','l','a','t','i','o','n','\0'}; - static WCHAR sStringFileInfo[] = {'\\','S','t','r','i','n','g','F','i','l','e','I','n','f','o','\\', + static const WCHAR sBackSlash[] = {'\\','\0'}; + static const WCHAR sTranslation[] = {'\\','V','a','r','F','i','l','e','I','n','f','o','\\','T','r','a','n','s','l','a','t','i','o','n','\0'}; + static const WCHAR sStringFileInfo[] = {'\\','S','t','r','i','n','g','F','i','l','e','I','n','f','o','\\', '%','0','4','x','%','0','4','x','\\','%','s','\0'}; - static WCHAR sFmt[] = {'%','d','.','%','d','.','%','d','.','%','d','\0'}; + static const WCHAR sFmt[] = {'%','d','.','%','d','.','%','d','.','%','d','\0'}; DWORD dwVersionDataLen = GetFileVersionInfoSizeW(strFilename, NULL); if (dwVersionDataLen) {

1 0

Frédéric Delanoy : winetest: Constify a character string.
by Alexandre Julliard Dec. 20, 2013

Dec. 20, 2013

Module: wine Branch: master Commit: a2473d2985226ed5205ac3d2c11334d95d1bc132 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2473d2985226ed5205ac3d2c… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Dec 19 22:25:13 2013 +0100 winetest: Constify a character string. --- programs/winetest/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 92a504e..cde618f 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -121,7 +121,7 @@ static char * get_file_version(char * file_name) char * data = heap_alloc(size); if (data) { if (GetFileVersionInfoA(file_name, handle, size, data)) { - static char backslash[] = "\\"; + static const char backslash[] = "\\"; VS_FIXEDFILEINFO *pFixedVersionInfo; UINT len; if (VerQueryValueA(data, backslash, (LPVOID *)&pFixedVersionInfo, &len)) {

1 0

Frédéric Delanoy : winedbg: Constify some character strings.
by Alexandre Julliard Dec. 20, 2013

Dec. 20, 2013

Module: wine Branch: master Commit: 5730f6cf9896b4fa8e94c8dd6895d75e2e72848e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5730f6cf9896b4fa8e94c8dd6… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Dec 19 22:25:11 2013 +0100 winedbg: Constify some character strings. --- programs/winedbg/tgt_active.c | 4 ++-- programs/winedbg/tgt_minidump.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index baf47e9..8cfce32 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -286,8 +286,8 @@ static BOOL tgt_process_active_close_process(struct dbg_process* pcs, BOOL kill) static void fetch_module_name(void* name_addr, BOOL unicode, void* mod_addr, WCHAR* buffer, size_t bufsz, BOOL is_pcs) { - static WCHAR pcspid[] = {'P','r','o','c','e','s','s','_','%','0','8','x',0}; - static WCHAR dlladdr[] = {'D','L','L','_','%','0','8','l','x',0}; + static const WCHAR pcspid[] = {'P','r','o','c','e','s','s','_','%','0','8','x',0}; + static const WCHAR dlladdr[] = {'D','L','L','_','%','0','8','l','x',0}; memory_get_string_indirect(dbg_curr_process, name_addr, unicode, buffer, bufsz); if (!buffer[0] && diff --git a/programs/winedbg/tgt_minidump.c b/programs/winedbg/tgt_minidump.c index 4b12576..e3a823a 100644 --- a/programs/winedbg/tgt_minidump.c +++ b/programs/winedbg/tgt_minidump.c @@ -199,7 +199,7 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) WCHAR exec_name[1024]; WCHAR nameW[1024]; unsigned len; - static WCHAR default_exec_name[] = {'<','m','i','n','i','d','u','m','p','-','e','x','e','c','>',0}; + static const WCHAR default_exec_name[] = {'<','m','i','n','i','d','u','m','p','-','e','x','e','c','>',0}; /* fetch PID */ if (MiniDumpReadDumpStream(data->mapping, MiscInfoStream, NULL, &stream, NULL))

1 0

Frédéric Delanoy : start: Constify a character string.
by Alexandre Julliard Dec. 20, 2013

Dec. 20, 2013

Module: wine Branch: master Commit: a478c108e2f1ff8cb76670af885a825fc0e92378 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a478c108e2f1ff8cb76670af8… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Dec 19 22:25:10 2013 +0100 start: Constify a character string. --- programs/start/start.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/start/start.c b/programs/start/start.c index f1cb26a..a27aad7 100644 --- a/programs/start/start.c +++ b/programs/start/start.c @@ -374,7 +374,7 @@ int wmain (int argc, WCHAR *argv[]) WCHAR *commandline; STARTUPINFOW startup_info; PROCESS_INFORMATION process_information; - static WCHAR commandlineformat[] = {'"','%','s','"','%','s',0}; + static const WCHAR commandlineformat[] = {'"','%','s','"','%','s',0}; /* explorer on windows always quotes the filename when running a binary on windows (see bug 5224) so we have to use CreateProcessW in this case */

1 0

Scott Ritchie : Update-Ubuntu-download-page-for-newer-versions
by Jeremy Newman Dec. 19, 2013

Dec. 19, 2013

Module: website Branch: master Commit: b39d38a9ef4f0d2583201fcb616185a057cd0a1e URL: http://source.winehq.org/git/website.git/?a=commit;h=b39d38a9ef4f0d2583201f… Author: Scott Ritchie <scottritchie(a)ubuntu.com> Date: Wed Dec 18 17:12:44 2013 -0800 Update-Ubuntu-download-page-for-newer-versions --- templates/en/download.template | 2 +- templates/en/download/ubuntu.template | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/templates/en/download.template b/templates/en/download.template index cfdf1bb..ec1f7fa 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -61,7 +61,7 @@ requested in exchange for hosting the Wine web site. <img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu linux" border="0"></a> </td> <td> <a href="{$root}/download/ubuntu">Download Ubuntu packages</a> - - binary and source .debs for Ubuntu Precise (12.04), Quantal (12.10), and Raring (13.04) + - binary and source .debs for Ubuntu Precise (12.04), Quantal (12.10), Raring (13.04), and Saucy (13.10) <td><a href="mailto:scottritchie(a)ubuntu.com">Scott Ritchie</a></td> </tr> diff --git a/templates/en/download/ubuntu.template b/templates/en/download/ubuntu.template index 2a02c90..caee2fd 100644 --- a/templates/en/download/ubuntu.template +++ b/templates/en/download/ubuntu.template @@ -25,25 +25,25 @@ Software tab and click Add. <h2>Warning: Beta packages</h2> -The 1.5 packages here are beta packages. This means they will +The 1.7 packages here are beta packages. This means they will periodically suffer from <a href="http://wiki.winehq.org/Regression">regressions</a>, and as a result an -update may break functionality in Wine. If the stable 1.4 Wine version works +update may break functionality in Wine. If the stable 1.6 Wine version works for you, then you may not want to use these beta packages. <h2>Installing Wine:</h2> Once you have added the WineHQ PPA Repository, you are ready to install. -To get the most recent Wine 1.5 beta, -<a href="apt://wine1.5">click this link to install the wine1.5 package</a>. -To install the older, stable Wine 1.4 version, -<a href="apt://wine1.4">click this link to install the wine1.4 package</a>. +To get the most recent Wine 1.7 beta, +<a href="apt://wine1.7">click this link to install the wine1.7 package</a>. +To install the older, stable Wine 1.6 version, +<a href="apt://wine1.6">click this link to install the wine1.6 package</a>. <h2>Upgrading to a new version of Ubuntu</h2> -If you are upgrading the entire system, such as going from Ubuntu 11.10 to -12.04, you will need to come back to this page and add the repository again. +If you are upgrading the entire system, such as going from Ubuntu 13.10 to +14.04, you will need to come back to this page and add the repository again. The built in update manager will not switch the Wine repository automatically. @@ -56,6 +56,6 @@ may be useful on Kubuntu, Xubuntu, and other Ubuntu derivatives. Then update APT package information by running 'sudo apt-get update'. You can now install Wine by typing 'sudo apt-get -install wine1.5'. +install wine1.7'. If you'd like to browse the PPA manually, you can <a href="https://launchpad.net/~ubuntu-wine/+archive/ppa">visit its Launchpad page</a>.

1 0

Hans Leidekker : msi: Don't add text to the scrollable text control twice.
by Alexandre Julliard Dec. 19, 2013

Dec. 19, 2013

Module: wine Branch: master Commit: f222582af6806bdd0aaab954bc87457b297647db URL: http://source.winehq.org/git/wine.git/?a=commit;h=f222582af6806bdd0aaab954b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Dec 19 13:36:10 2013 +0100 msi: Don't add text to the scrollable text control twice. --- dlls/msi/dialog.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index baa6890..6708f13 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -783,12 +783,13 @@ static msi_control *msi_dialog_add_control( msi_dialog *dialog, MSIRECORD *rec, LPCWSTR szCls, DWORD style ) { DWORD attributes; - LPCWSTR text, name; + const WCHAR *text = NULL, *name, *control_type; DWORD exstyle = 0; name = MSI_RecordGetString( rec, 2 ); + control_type = MSI_RecordGetString( rec, 3 ); attributes = MSI_RecordGetInteger( rec, 8 ); - text = MSI_RecordGetString( rec, 10 ); + if (strcmpW( control_type, szScrollableText )) text = MSI_RecordGetString( rec, 10 ); TRACE("%s, %s, %08x, %s, %08x\n", debugstr_w(szCls), debugstr_w(name), attributes, debugstr_w(text), style);

1 0

Frédéric Delanoy : regedit: Constify a character string.
by Alexandre Julliard Dec. 19, 2013

Dec. 19, 2013

Module: wine Branch: master Commit: 1f3c916f00a798e027841afda2c93265dcb53ce8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f3c916f00a798e027841afda… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Dec 18 23:14:18 2013 +0100 regedit: Constify a character string. --- programs/regedit/framewnd.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index 2e28670..1635b50 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -39,7 +39,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(regedit); * Global and Local Variables: */ -static WCHAR favoritesKey[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','A','p','p','l','e','t','s','\\','R','e','g','E','d','i','t','\\','F','a','v','o','r','i','t','e','s',0}; +static const WCHAR favoritesKey[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','A','p','p','l','e','t','s','\\','R','e','g','E','d','i','t','\\','F','a','v','o','r','i','t','e','s',0}; static BOOL bInMenuLoop = FALSE; /* Tells us if we are in the menu loop */ static WCHAR favoriteName[128]; static WCHAR searchString[128];

1 0

Nikolay Sivov : server: Return key name info for KeyNameInformation class.
by Alexandre Julliard Dec. 19, 2013

Dec. 19, 2013

Module: wine Branch: master Commit: 56aa5d8a5f805fb21c9d91a0cc945351a8b78acf URL: http://source.winehq.org/git/wine.git/?a=commit;h=56aa5d8a5f805fb21c9d91a0c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 19 08:40:49 2013 +0400 server: Return key name info for KeyNameInformation class. --- server/registry.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/server/registry.c b/server/registry.c index fb9c06d..1436bfe 100644 --- a/server/registry.c +++ b/server/registry.c @@ -886,6 +886,7 @@ static void enum_key( const struct key *key, int index, int info_class, switch(info_class) { case KeyBasicInformation: + case KeyNameInformation: classlen = 0; /* only return the name */ /* fall through */ case KeyNodeInformation:

1 0