December 2013 - Wine-commits

Andrey Gusev : d3dx9_36: Add one more missing f suffix.
by Alexandre Julliard 20 Dec '13

20 Dec '13

Module: wine Branch: master Commit: 9970e29589acfdaafab2f8b64dce1b9c56cfffd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9970e29589acfdaafab2f8b64… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Dec 20 13:28:15 2013 +0200 d3dx9_36: Add one more missing f suffix. --- dlls/d3dx9_36/math.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index c32dfda..b33e062 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -2409,7 +2409,7 @@ FLOAT* WINAPI D3DXSHEvalDirection(FLOAT *out, UINT order, const D3DXVECTOR3 *dir out[20] = 3.0f / (16.0f * sqrtf(D3DX_PI)) * (35.0f * dirzzzz - 30.f * dirzz + 3.0f); out[21] = 0.375f * sqrtf(10.0f / D3DX_PI) * dirxz * (3.0f - 7.0f * dirzz); out[22] = 0.375f * sqrtf(5.0f / D3DX_PI) * (dirxx - diryy) * (7.0f * dirzz - 1.0f); - out[23] = 3.0 * dir->z * out[15]; + out[23] = 3.0f * dir->z * out[15]; out[24] = 3.0f / 16.0f * sqrtf(35.0f / D3DX_PI) * (dirxxxx - 6.0f * dirxyxy + diryyyy); if (order == 5) return out;

1 0

Huw Davies : mshtml: Remove a double-Release.
by Alexandre Julliard 20 Dec '13

20 Dec '13

Module: wine Branch: master Commit: 72297ebfbb31bd8c5848687e915b785d87e44621 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72297ebfbb31bd8c5848687e9… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Dec 20 14:29:34 2013 +0000 mshtml: Remove a double-Release. --- dlls/mshtml/nsio.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index d63e61e..901b5b9 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1518,9 +1518,6 @@ static nsresult NSAPI nsUploadChannel_SetUploadStream(nsIUploadChannel *iface, } } - if(This->post_data_stream) - nsIInputStream_Release(This->post_data_stream); - if(aContentLength != -1) FIXME("Unsupported acontentLength = %s\n", wine_dbgstr_longlong(aContentLength));

1 0

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

20 Dec '13

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

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

20 Dec '13

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 : winetest: Constify a character string.
by Alexandre Julliard 20 Dec '13

20 Dec '13

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 : winefile: Constify some character strings.
by Alexandre Julliard 20 Dec '13

20 Dec '13

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

Scott Ritchie : Update-Ubuntu-download-page-for-newer-versions
by Jeremy Newman 19 Dec '13

19 Dec '13

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

Frédéric Delanoy : xmllite: Constify some character strings.
by Alexandre Julliard 19 Dec '13

19 Dec '13

Module: wine Branch: master Commit: 78cf65abb12f81e00c0ed70c4ae86a2288fef3c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78cf65abb12f81e00c0ed70c4… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Dec 18 23:14:16 2013 +0100 xmllite: Constify some character strings. --- dlls/xmllite/reader.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 9ca7370..0ecb593 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -729,8 +729,8 @@ static void readerinput_grow(xmlreaderinput *readerinput, int length) static inline BOOL readerinput_is_utf8(xmlreaderinput *readerinput) { - static char startA[] = {'<','?'}; - static char commentA[] = {'<','!'}; + static const char startA[] = {'<','?'}; + static const char commentA[] = {'<','!'}; encoded_buffer *buffer = &readerinput->buffer->encoded; unsigned char *ptr = (unsigned char*)buffer->data; @@ -749,10 +749,10 @@ static inline BOOL readerinput_is_utf8(xmlreaderinput *readerinput) static HRESULT readerinput_detectencoding(xmlreaderinput *readerinput, xml_encoding *enc) { encoded_buffer *buffer = &readerinput->buffer->encoded; - static WCHAR startW[] = {'<','?'}; - static WCHAR commentW[] = {'<','!'}; - static char utf8bom[] = {0xef,0xbb,0xbf}; - static char utf16lebom[] = {0xff,0xfe}; + static const WCHAR startW[] = {'<','?'}; + static const WCHAR commentW[] = {'<','!'}; + static const char utf8bom[] = {0xef,0xbb,0xbf}; + static const char utf16lebom[] = {0xff,0xfe}; *enc = XmlEncoding_Unknown;

1 0

Frédéric Delanoy : oleview: Constify a character string.
by Alexandre Julliard 19 Dec '13

19 Dec '13

Module: wine Branch: master Commit: 7bdcd40c08c56906eab7a25d97bb090c0e64b523 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bdcd40c08c56906eab7a25d9… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Dec 18 23:14:17 2013 +0100 oleview: Constify a character string. --- programs/oleview/oleview.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/oleview/oleview.c b/programs/oleview/oleview.c index 9ceaa49..3a379b4 100644 --- a/programs/oleview/oleview.c +++ b/programs/oleview/oleview.c @@ -25,7 +25,7 @@ GLOBALS globals; static const WCHAR wszRegEdit[] = { '\\','r','e','g','e','d','i','t','.','e','x','e','\0' }; -static WCHAR wszFormat[] = { '<','o','b','j','e','c','t','\n',' ',' ',' ', +static const WCHAR wszFormat[] = { '<','o','b','j','e','c','t','\n',' ',' ',' ', 'c','l','a','s','s','i','d','=','\"','c','l','s','i','d',':','%','s','\"','\n', '>','\n','<','/','o','b','j','e','c','t','>','\0' };

1 0

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

19 Dec '13

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