wine-commits December 2013

wine-commits@winehq.org

3 participants
462 discussions

Stefan Dösinger : d3dx9_36: Add missing f suffixes.
by Alexandre Julliard 19 Dec '13

19 Dec '13

Module: wine Branch: master Commit: af3a59cbd07d02f307954d4b6951fe41c670b7d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af3a59cbd07d02f307954d4b6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Dec 19 15:11:40 2013 +0100 d3dx9_36: Add missing f suffixes. --- dlls/d3dx9_36/math.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index f6a43a0..c32dfda 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -2394,9 +2394,9 @@ FLOAT* WINAPI D3DXSHEvalDirection(FLOAT *out, UINT order, const D3DXVECTOR3 *dir out[9] = -sqrtf(70.0f / D3DX_PI) / 8.0f * dir->y * (3.0f * dirxx - diryy); out[10] = sqrtf(105.0f / D3DX_PI) / 2.0f * dirxy * dir->z; - out[11] = -sqrtf(42.0 / D3DX_PI) / 8.0f * dir->y * (-1.0f + 5.0f * dirzz); + out[11] = -sqrtf(42.0f / D3DX_PI) / 8.0f * dir->y * (-1.0f + 5.0f * dirzz); out[12] = sqrtf(7.0f / D3DX_PI) / 4.0f * dir->z * (5.0f * dirzz - 3.0f); - out[13] = sqrtf(42.0 / D3DX_PI) / 8.0f * dir->x * (1.0f - 5.0f * dirzz); + out[13] = sqrtf(42.0f / D3DX_PI) / 8.0f * dir->x * (1.0f - 5.0f * dirzz); out[14] = sqrtf(105.0f / D3DX_PI) / 4.0f * dir->z * (dirxx - diryy); out[15] = -sqrtf(70.0f / D3DX_PI) / 8.0f * dir->x * (dirxx - 3.0f * diryy); if (order == 4)

1 0

Stefan Dösinger : tools: Define getopt in make_xftmpl. c.
by Alexandre Julliard 19 Dec '13

19 Dec '13

Module: wine Branch: master Commit: 7db8cf29e95bd68cc879adf2696a312b230d72ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=7db8cf29e95bd68cc879adf26… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Dec 19 15:11:39 2013 +0100 tools: Define getopt in make_xftmpl.c. --- tools/make_xftmpl.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/make_xftmpl.c b/tools/make_xftmpl.c index 1d83498..75b47cc 100644 --- a/tools/make_xftmpl.c +++ b/tools/make_xftmpl.c @@ -99,6 +99,8 @@ static const struct keyword reserved_words[] = { {"WORD", TOKEN_WORD} }; +extern int getopt(int argc, char *const *argv, const char *optstring); + static BOOL option_header; static char *option_inc_var_name = NULL; static char *option_inc_size_name = NULL;

1 0

Stefan Dösinger : libport: Include stdlib. h on MSVC for getenv.
by Alexandre Julliard 19 Dec '13

19 Dec '13

Module: wine Branch: master Commit: 9138dce3671e145d78ba9669a967402882421547 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9138dce3671e145d78ba9669a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Dec 19 15:11:38 2013 +0100 libport: Include stdlib.h on MSVC for getenv. --- libs/port/getopt.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/libs/port/getopt.c b/libs/port/getopt.c index fb1e315..7c97192 100644 --- a/libs/port/getopt.c +++ b/libs/port/getopt.c @@ -73,6 +73,8 @@ contain conflicting prototypes for getopt. */ # include <stdlib.h> # include <unistd.h> +#elif defined _MSC_VER +# include <stdlib.h> #endif /* GNU C library. */ #ifdef VMS

1 0

Hans Leidekker : advapi32: Avoid a crash when storing credentials on MacOS.
by Alexandre Julliard 19 Dec '13

19 Dec '13

Module: wine Branch: master Commit: 2f3c474e413b237271911d615630b7a2be26b7c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f3c474e413b237271911d615… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Dec 19 13:36:47 2013 +0100 advapi32: Avoid a crash when storing credentials on MacOS. --- dlls/advapi32/cred.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/cred.c b/dlls/advapi32/cred.c index 038eefa..218c84f 100644 --- a/dlls/advapi32/cred.c +++ b/dlls/advapi32/cred.c @@ -571,7 +571,7 @@ static DWORD mac_write_credential(const CREDENTIALW *credential, BOOL preserve_b TRACE("adding server %s, domain %s, username %s using Keychain\n", servername, domain, username); status = SecKeychainAddInternetPassword(NULL, strlen(servername), servername, - strlen(domain), domain, strlen(username), + domain ? strlen(domain) : 0, domain, strlen(username), username, 0, NULL, 0, 0 /* no protocol */, kSecAuthenticationTypeDefault, @@ -583,7 +583,7 @@ static DWORD mac_write_credential(const CREDENTIALW *credential, BOOL preserve_b SecKeychainItemRef keychain_item; status = SecKeychainFindInternetPassword(NULL, strlen(servername), servername, - strlen(domain), domain, + domain ? strlen(domain) : 0, domain, strlen(username), username, 0, NULL /* any path */, 0, 0 /* any protocol */,

1 0

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

19 Dec '13

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

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

19 Dec '13

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

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

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

19 Dec '13

Module: wine Branch: master Commit: 43d6a45c4e977edd82d934044d0d777714997ee7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43d6a45c4e977edd82d934044… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Dec 18 23:14:15 2013 +0100 wininet: Constify some character strings. --- dlls/wininet/http.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 817fea1..0186975 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4058,8 +4058,8 @@ static DWORD HTTP_HandleRedirect(http_request_t *request, LPCWSTR lpszUrl) WCHAR userName[INTERNET_MAX_USER_NAME_LENGTH]; BOOL custom_port = FALSE; - static WCHAR httpW[] = {'h','t','t','p',0}; - static WCHAR httpsW[] = {'h','t','t','p','s',0}; + static const WCHAR httpW[] = {'h','t','t','p',0}; + static const WCHAR httpsW[] = {'h','t','t','p','s',0}; userName[0] = 0; hostName[0] = 0;

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
47
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 2013