December 2013 - Wine-Commits

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

Dec. 19, 2013

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

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard Dec. 19, 2013

Dec. 19, 2013

Module: wine Branch: master Commit: a6e621cc4630dd9a47115f9fff4b2e6f2c6fa540 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6e621cc4630dd9a47115f9ff… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Dec 19 17:14:20 2013 +0200 po: Update Finnish translation. --- po/fi.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/fi.po b/po/fi.po index 853e257..709f557 100644 --- a/po/fi.po +++ b/po/fi.po @@ -10056,7 +10056,7 @@ msgstr "Winen komentokehote" #: cmd.rc:351 msgid "Microsoft Windows %1!S!\n" -msgstr "" +msgstr "Microsoft Windows %1!S!\n" #: cmd.rc:352 msgid "More? "

1 0

Detlef Riekenberg : tools: make_authors is no longer used.
by Alexandre Julliard Dec. 19, 2013

Dec. 19, 2013

Module: wine Branch: master Commit: b87b9f04d7b07be6d5715c58ace47b699c5ac30d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b87b9f04d7b07be6d5715c58a… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Dec 19 16:39:44 2013 +0100 tools: make_authors is no longer used. --- tools/make_authors | 51 --------------------------------------------------- 1 files changed, 0 insertions(+), 51 deletions(-) diff --git a/tools/make_authors b/tools/make_authors deleted file mode 100755 index eeaba02..0000000 --- a/tools/make_authors +++ /dev/null @@ -1,51 +0,0 @@ -#! /usr/bin/perl -w -# -# Generate AUTHORS -# -# Copyright 1998 Alexandre Julliard -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA -# -use strict; - -my @authors; -open(AUTHORS,"<AUTHORS") or die "Can't open AUTHORS"; -open(NEWAUTHORS,">AUTHORS.new") or die "Can't open AUTHORS.new"; -while(<AUTHORS>) - { - print NEWAUTHORS; - last if /^$/; - } -while(<AUTHORS>) - { - chop; - push @authors, $_; - } - -# Sort them -sub cmpnames() - { - my @anames = split(" ",$a); - my @bnames = split(" ",$b); - my $ret; - $ret = $anames[-1] cmp $bnames[-1]; - $ret = $anames[0] cmp $bnames[0] unless $ret; - return $ret; - } -(a)authors = sort cmpnames @authors; - -# Print authors -print NEWAUTHORS (join "\n", @authors) . "\n"; -print "Created AUTHORS.new\n";

1 0

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

Dec. 19, 2013

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

Jacek Caban : qcap: Added CLSID_AVICo stub implementation.
by Alexandre Julliard Dec. 19, 2013

Dec. 19, 2013

Module: wine Branch: master Commit: 99c96b0f0154a220abd38da0c51e0268b1467017 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99c96b0f0154a220abd38da0c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 19 15:31:52 2013 +0100 qcap: Added CLSID_AVICo stub implementation. --- dlls/qcap/Makefile.in | 1 + dlls/qcap/avico.c | 184 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/qcap/qcap_main.c | 2 +- dlls/qcap/qcap_main.h | 16 ++++ dlls/qcap/tests/qcap.c | 17 +++++ 5 files changed, 219 insertions(+), 1 deletions(-) diff --git a/dlls/qcap/Makefile.in b/dlls/qcap/Makefile.in index ebb432d..41871e3 100644 --- a/dlls/qcap/Makefile.in +++ b/dlls/qcap/Makefile.in @@ -2,6 +2,7 @@ MODULE = qcap.dll IMPORTS = strmiids strmbase uuid ole32 gdi32 advapi32 C_SRCS = \ + avico.c \ avimux.c \ capturegraph.c \ enummedia.c \ diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c new file mode 100644 index 0000000..a24a1c3 --- /dev/null +++ b/dlls/qcap/avico.c @@ -0,0 +1,184 @@ +/* + * Copyright 2013 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "dshow.h" + +#include "qcap_main.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(qcap); + +typedef struct { + BaseFilter filter; +} AVICompressor; + +static inline AVICompressor *impl_from_BaseFilter(BaseFilter *filter) +{ + return CONTAINING_RECORD(filter, AVICompressor, filter); +} + +static inline AVICompressor *impl_from_IBaseFilter(IBaseFilter *iface) +{ + BaseFilter *filter = CONTAINING_RECORD(iface, BaseFilter, IBaseFilter_iface); + return impl_from_BaseFilter(filter); +} + +static HRESULT WINAPI AVICompressor_QueryInterface(IBaseFilter *iface, REFIID riid, void **ppv) +{ + AVICompressor *This = impl_from_IBaseFilter(iface); + + if(IsEqualIID(riid, &IID_IUnknown)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = &This->filter.IBaseFilter_iface; + }else if(IsEqualIID(riid, &IID_IPersist)) { + TRACE("(%p)->(IID_IPersist %p)\n", This, ppv); + *ppv = &This->filter.IBaseFilter_iface; + }else if(IsEqualIID(riid, &IID_IMediaFilter)) { + TRACE("(%p)->(IID_IMediaFilter %p)\n", This, ppv); + *ppv = &This->filter.IBaseFilter_iface; + }else if(IsEqualIID(riid, &IID_IBaseFilter)) { + TRACE("(%p)->(IID_IBaseFilter %p)\n", This, ppv); + *ppv = &This->filter.IBaseFilter_iface; + }else { + FIXME("no interface for %s\n", debugstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; + +} + +static ULONG WINAPI AVICompressor_Release(IBaseFilter *iface) +{ + AVICompressor *This = impl_from_IBaseFilter(iface); + ULONG ref = BaseFilterImpl_Release(&This->filter.IBaseFilter_iface); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) + heap_free(This); + + return ref; +} + +static HRESULT WINAPI AVICompressor_Stop(IBaseFilter *iface) +{ + AVICompressor *This = impl_from_IBaseFilter(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI AVICompressor_Pause(IBaseFilter *iface) +{ + AVICompressor *This = impl_from_IBaseFilter(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI AVICompressor_Run(IBaseFilter *iface, REFERENCE_TIME tStart) +{ + AVICompressor *This = impl_from_IBaseFilter(iface); + FIXME("(%p)->(%s)\n", This, wine_dbgstr_longlong(tStart)); + return E_NOTIMPL; +} + +static HRESULT WINAPI AVICompressor_FindPin(IBaseFilter *iface, LPCWSTR Id, IPin **ppPin) +{ + AVICompressor *This = impl_from_IBaseFilter(iface); + FIXME("(%p)->(%s %p)\n", This, debugstr_w(Id), ppPin); + return VFW_E_NOT_FOUND; +} + +static HRESULT WINAPI AVICompressor_QueryFilterInfo(IBaseFilter *iface, FILTER_INFO *pInfo) +{ + AVICompressor *This = impl_from_IBaseFilter(iface); + FIXME("(%p)->(%p)\n", This, pInfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI AVICompressor_QueryVendorInfo(IBaseFilter *iface, LPWSTR *pVendorInfo) +{ + AVICompressor *This = impl_from_IBaseFilter(iface); + FIXME("(%p)->(%p)\n", This, pVendorInfo); + return E_NOTIMPL; +} + +static const IBaseFilterVtbl AVICompressorVtbl = { + AVICompressor_QueryInterface, + BaseFilterImpl_AddRef, + AVICompressor_Release, + BaseFilterImpl_GetClassID, + AVICompressor_Stop, + AVICompressor_Pause, + AVICompressor_Run, + BaseFilterImpl_GetState, + BaseFilterImpl_SetSyncSource, + BaseFilterImpl_GetSyncSource, + BaseFilterImpl_EnumPins, + AVICompressor_FindPin, + AVICompressor_QueryFilterInfo, + BaseFilterImpl_JoinFilterGraph, + AVICompressor_QueryVendorInfo +}; + +static IPin* WINAPI AVICompressor_GetPin(BaseFilter *iface, int pos) +{ + AVICompressor *This = impl_from_BaseFilter(iface); + FIXME("(%p)->(%d)\n", This, pos); + return NULL; +} + +static LONG WINAPI AVICompressor_GetPinCount(BaseFilter *iface) +{ + AVICompressor *This = impl_from_BaseFilter(iface); + FIXME("(%p)\n", This); + return 0; +} + +static const BaseFilterFuncTable filter_func_table = { + AVICompressor_GetPin, + AVICompressor_GetPinCount +}; + +IUnknown* WINAPI QCAP_createAVICompressor(IUnknown *outer, HRESULT *phr) +{ + AVICompressor *compressor; + + TRACE("\n"); + + compressor = heap_alloc_zero(sizeof(*compressor)); + if(!compressor) { + *phr = E_NOINTERFACE; + return NULL; + } + + BaseFilter_Init(&compressor->filter, &AVICompressorVtbl, &CLSID_AVICo, + (DWORD_PTR)(__FILE__ ": AVICompressor.csFilter"), &filter_func_table); + + *phr = S_OK; + return (IUnknown*)&compressor->filter.IBaseFilter_iface; +} diff --git a/dlls/qcap/qcap_main.c b/dlls/qcap/qcap_main.c index e0cd43d..0f9ed14 100644 --- a/dlls/qcap/qcap_main.c +++ b/dlls/qcap/qcap_main.c @@ -84,7 +84,7 @@ FactoryTemplate const g_Templates[] = { },{ wAVICompressor, &CLSID_AVICo, - NULL, /* FIXME: Implement QCAP_createAVICompressor */ + QCAP_createAVICompressor, NULL },{ wVFWCaptFilter, diff --git a/dlls/qcap/qcap_main.h b/dlls/qcap/qcap_main.h index 15449a3..f4684c1 100644 --- a/dlls/qcap/qcap_main.h +++ b/dlls/qcap/qcap_main.h @@ -28,6 +28,7 @@ extern IUnknown * WINAPI QCAP_createAudioCaptureFilter(IUnknown *pUnkOuter, HRES extern IUnknown * WINAPI QCAP_createAVICompressor(IUnknown *pUnkOuter, HRESULT *phr) DECLSPEC_HIDDEN; extern IUnknown * WINAPI QCAP_createVFWCaptureFilter(IUnknown *pUnkOuter, HRESULT *phr) DECLSPEC_HIDDEN; extern IUnknown * WINAPI QCAP_createVFWCaptureFilterPropertyPage(IUnknown *pUnkOuter, HRESULT *phr) DECLSPEC_HIDDEN; +extern IUnknown * WINAPI QCAP_createAVICompressor(IUnknown*,HRESULT*) DECLSPEC_HIDDEN; extern IUnknown * WINAPI QCAP_createAVIMux(IUnknown *pUnkOuter, HRESULT *phr) DECLSPEC_HIDDEN; extern IUnknown * WINAPI QCAP_createAVIMuxPropertyPage(IUnknown *pUnkOuter, HRESULT *phr) DECLSPEC_HIDDEN; extern IUnknown * WINAPI QCAP_createAVIMuxPropertyPage1(IUnknown *pUnkOuter, HRESULT *phr) DECLSPEC_HIDDEN; @@ -58,4 +59,19 @@ enum YUV_Format { void YUV_Init(void) DECLSPEC_HIDDEN; void YUV_To_RGB24(enum YUV_Format format, unsigned char *target, const unsigned char *source, int width, int height) DECLSPEC_HIDDEN; +static inline void * __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) +{ + return HeapAlloc(GetProcessHeap(), 0, len); +} + +static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t len) +{ + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); +} + +static inline BOOL heap_free(void *mem) +{ + return HeapFree(GetProcessHeap(), 0, mem); +} + #endif /* _QCAP_MAIN_H_DEFINED */ diff --git a/dlls/qcap/tests/qcap.c b/dlls/qcap/tests/qcap.c index 86beda7..014a763 100644 --- a/dlls/qcap/tests/qcap.c +++ b/dlls/qcap/tests/qcap.c @@ -1333,6 +1333,21 @@ static void test_AviMux(void) IBaseFilter_Release(avimux); } +static void test_AviCo(void) +{ + IBaseFilter *avico; + HRESULT hres; + + hres = CoCreateInstance(&CLSID_AVICo, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (void**)&avico); + if(hres == REGDB_E_CLASSNOTREG) { + win_skip("CLSID_AVICo not restered\n"); + return; + } + ok(hres == S_OK, "Could not create CLSID_AVICo class: %08x\n", hres); + + IBaseFilter_Release(avico); +} + START_TEST(qcap) { if (SUCCEEDED(CoInitialize(NULL))) @@ -1341,6 +1356,8 @@ START_TEST(qcap) test_CaptureGraphBuilder_RenderStream(); test_AviMux_QueryInterface(); test_AviMux(); + test_AviCo(); + CoUninitialize(); } else

1 0

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

Dec. 19, 2013

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

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

Dec. 19, 2013

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

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

Dec. 19, 2013

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

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

Dec. 19, 2013

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 Dec. 19, 2013

Dec. 19, 2013

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