November 2006 - Wine-Commits

Dmitry Timoshkov : winedos: Make some data const.
by Alexandre Julliard Nov. 29, 2006

Nov. 29, 2006

Module: wine Branch: master Commit: c9a57ee1969f1f80095204b9a23e4f13521e3865 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9a57ee1969f1f80095204b9a… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Nov 29 18:03:59 2006 +0800 winedos: Make some data const. --- dlls/winedos/devices.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winedos/devices.c b/dlls/winedos/devices.c index 30aba05..bf6e0ba 100644 --- a/dlls/winedos/devices.c +++ b/dlls/winedos/devices.c @@ -83,7 +83,7 @@ static void WINAPI con_strategy(CONTEXT8 static void WINAPI con_interrupt(CONTEXT86*ctx); /* devices */ -static WINEDEV devs[] = +static const WINEDEV devs[] = { { "NUL ", ATTR_CHAR|ATTR_NUL|ATTR_DEVICE,

1 0

Dmitry Timoshkov : advapi32: Make some data const.
by Alexandre Julliard Nov. 29, 2006

Nov. 29, 2006

Module: wine Branch: master Commit: e5b4b47c16dc57cdae8c82d0eab0198cb0c01395 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5b4b47c16dc57cdae8c82d0e… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Nov 29 18:04:27 2006 +0800 advapi32: Make some data const. --- dlls/advapi32/registry.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 20f6a7c..54b0bfb 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -73,7 +73,7 @@ static const WCHAR name_CURRENT_CONFIG[] static const WCHAR name_DYN_DATA[] = {'D','y','n','D','a','t','a',0}; -static const WCHAR *root_key_names[NB_SPECIAL_ROOT_KEYS] = +static const WCHAR * const root_key_names[NB_SPECIAL_ROOT_KEYS] = { name_CLASSES_ROOT, NULL, /* HKEY_CURRENT_USER is determined dynamically */

1 0

Dmitry Timoshkov : riched20: Make some data const.
by Alexandre Julliard Nov. 29, 2006

Nov. 29, 2006

Module: wine Branch: master Commit: a5992939d49ee3ed54cf3120c729da9ea2a9c665 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5992939d49ee3ed54cf3120c… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Nov 29 18:06:16 2006 +0800 riched20: Make some data const. --- dlls/riched20/writer.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index ab822dc..e964ce7 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -390,7 +390,7 @@ ME_StreamOutRTFParaProps(ME_OutStream *p sprintf(props + strlen(props), "\\s%d", fmt->sStyle); if (fmt->dwMask & PFM_TABSTOPS) { - static const char *leader[6] = { "", "\\tldot", "\\tlhyph", "\\tlul", "\\tlth", "\\tleq" }; + static const char * const leader[6] = { "", "\\tldot", "\\tlhyph", "\\tlul", "\\tlth", "\\tleq" }; for (i = 0; i < fmt->cTabCount; i++) { switch ((fmt->rgxTabs[i] >> 24) & 0xF) { @@ -415,7 +415,7 @@ ME_StreamOutRTFParaProps(ME_OutStream *p if (fmt->dwMask & PFM_SHADING) { - static const char *style[16] = { "", "\\bgdkhoriz", "\\bgdkvert", "\\bgdkfdiag", + static const char * const style[16] = { "", "\\bgdkhoriz", "\\bgdkvert", "\\bgdkfdiag", "\\bgdkbdiag", "\\bgdkcross", "\\bgdkdcross", "\\bghoriz", "\\bgvert", "\\bgfdiag", "\\bgbdiag", "\\bgcross", "\\bgdcross",

1 0

Dmitry Timoshkov : quartz: Make some data const and static.
by Alexandre Julliard Nov. 29, 2006

Nov. 29, 2006

Module: wine Branch: master Commit: c78621eda47671b0420e2c7ab78d4e4ad2488ee1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c78621eda47671b0420e2c7ab… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Nov 29 18:05:43 2006 +0800 quartz: Make some data const and static. --- dlls/quartz/acmwrapper.c | 2 +- dlls/quartz/avidec.c | 2 +- dlls/quartz/main.c | 2 +- dlls/quartz/transform.c | 2 +- dlls/quartz/transform.h | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index 2b25880..62f0020 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -234,7 +234,7 @@ static HRESULT ACMWrapper_Cleanup(Transf return S_OK; } -TransformFuncsTable ACMWrapper_FuncsTable = { +static const TransformFuncsTable ACMWrapper_FuncsTable = { NULL, ACMWrapper_ProcessSampleData, NULL, diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index c4f8c54..a878500 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -257,7 +257,7 @@ static HRESULT AVIDec_Cleanup(TransformF return S_OK; } -TransformFuncsTable AVIDec_FuncsTable = { +static const TransformFuncsTable AVIDec_FuncsTable = { AVIDec_ProcessBegin, AVIDec_ProcessSampleData, AVIDec_ProcessEnd, diff --git a/dlls/quartz/main.c b/dlls/quartz/main.c index def4598..b5e4032 100644 --- a/dlls/quartz/main.c +++ b/dlls/quartz/main.c @@ -209,7 +209,7 @@ HRESULT WINAPI DllCanUnloadNow() #define OUR_GUID_ENTRY(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ { { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } } , #name }, -static struct { +static const struct { const GUID riid; const char *name; } InterfaceDesc[] = diff --git a/dlls/quartz/transform.c b/dlls/quartz/transform.c index 63b6ad5..59c2e3a 100644 --- a/dlls/quartz/transform.c +++ b/dlls/quartz/transform.c @@ -173,7 +173,7 @@ static HRESULT TransformFilter_OutputPin return E_FAIL; } -HRESULT TransformFilter_Create(TransformFilterImpl* pTransformFilter, const CLSID* pClsid, TransformFuncsTable* pFuncsTable) +HRESULT TransformFilter_Create(TransformFilterImpl* pTransformFilter, const CLSID* pClsid, const TransformFuncsTable* pFuncsTable) { HRESULT hr; PIN_INFO piInput; diff --git a/dlls/quartz/transform.h b/dlls/quartz/transform.h index f29ee67..65adad0 100644 --- a/dlls/quartz/transform.h +++ b/dlls/quartz/transform.h @@ -42,7 +42,7 @@ struct TransformFilterImpl IPin ** ppPins; - TransformFuncsTable * pFuncsTable; + const TransformFuncsTable * pFuncsTable; }; -HRESULT TransformFilter_Create(TransformFilterImpl*, const CLSID*, TransformFuncsTable* pFuncsTable); +HRESULT TransformFilter_Create(TransformFilterImpl*, const CLSID*, const TransformFuncsTable* pFuncsTable);

1 0

Dmitry Timoshkov : mshtml: Make some data const.
by Alexandre Julliard Nov. 29, 2006

Nov. 29, 2006

Module: wine Branch: master Commit: b2bffdda833005f3fe7be6549a709742c21cff9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2bffdda833005f3fe7be6549… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Nov 29 18:05:31 2006 +0800 mshtml: Make some data const. --- dlls/mshtml/install.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/install.c b/dlls/mshtml/install.c index 5e2b557..ddc3edc 100644 --- a/dlls/mshtml/install.c +++ b/dlls/mshtml/install.c @@ -263,7 +263,7 @@ static HRESULT WINAPI InstallCallback_On return E_NOTIMPL; } -static IBindStatusCallbackVtbl InstallCallbackVtbl = { +static const IBindStatusCallbackVtbl InstallCallbackVtbl = { InstallCallback_QueryInterface, InstallCallback_AddRef, InstallCallback_Release,

1 0

Dmitry Timoshkov : comctl32: Make some data const.
by Alexandre Julliard Nov. 29, 2006

Nov. 29, 2006

Module: wine Branch: master Commit: bd53138fc8fe6681a1ea9dbe79ea6b0914e3b09c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd53138fc8fe6681a1ea9dbe7… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Nov 29 18:04:40 2006 +0800 comctl32: Make some data const. --- dlls/comctl32/rebar.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 58d573d..b305863 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -295,7 +295,7 @@ static LRESULT REBAR_NotifyFormat(REBAR_ static UINT mindragx = 0; static UINT mindragy = 0; -static const char *band_stylename[] = { +static const char * const band_stylename[] = { "RBBS_BREAK", /* 0001 */ "RBBS_FIXEDSIZE", /* 0002 */ "RBBS_CHILDEDGE", /* 0004 */ @@ -307,7 +307,7 @@ static const char *band_stylename[] = { "RBBS_NOGRIPPER", /* 0100 */ NULL }; -static const char *band_maskname[] = { +static const char * const band_maskname[] = { "RBBIM_STYLE", /* 0x00000001 */ "RBBIM_COLORS", /* 0x00000002 */ "RBBIM_TEXT", /* 0x00000004 */

1 0

Dmitry Timoshkov : winspool.drv: Make some data const.
by Alexandre Julliard Nov. 29, 2006

Nov. 29, 2006

Module: wine Branch: master Commit: 1804900163edd0735c3f8f7c30d25e9bf1c3393b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1804900163edd0735c3f8f7c3… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Nov 29 18:04:13 2006 +0800 winspool.drv: Make some data const. --- dlls/winspool.drv/info.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 2a62883..e1d39ef 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -170,7 +170,7 @@ static const WCHAR PrintersW[] = {'S','y 'P','r','i','n','t','\\', 'P','r','i','n','t','e','r','s',0}; -static WCHAR LocalPortW[] = {'L','o','c','a','l',' ','P','o','r','t',0}; +static const WCHAR LocalPortW[] = {'L','o','c','a','l',' ','P','o','r','t',0}; static const WCHAR user_default_reg_key[] = { 'S','o','f','t','w','a','r','e','\\', 'M','i','c','r','o','s','o','f','t','\\', @@ -940,7 +940,7 @@ static void monitor_unloadall(void) * On failure, SetLastError() is called and NULL is returned */ -static monitor_t * monitor_load(LPWSTR name, LPWSTR dllname) +static monitor_t * monitor_load(LPCWSTR name, LPWSTR dllname) { LPMONITOR2 (WINAPI *pInitializePrintMonitor2) (PMONITORINIT, LPHANDLE); PMONITORUI (WINAPI *pInitializePrintMonitorUI)(VOID);

1 0

Dmitry Timoshkov : urlmon: Make some data const.
by Alexandre Julliard Nov. 29, 2006

Nov. 29, 2006

Module: wine Branch: master Commit: 8b72102bd749a6f3a54c1de53654c22f9e914b03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b72102bd749a6f3a54c1de53… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Nov 29 18:03:44 2006 +0800 urlmon: Make some data const. --- dlls/urlmon/binding.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index d2b3ca9..3da3a5b 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -300,13 +300,13 @@ static void on_progress(Binding *This, U static void dump_BINDINFO(BINDINFO *bi) { - static const char *BINDINFOF_str[] = { + static const char * const BINDINFOF_str[] = { "#0", "BINDINFOF_URLENCODESTGMEDDATA", "BINDINFOF_URLENCODEDEXTRAINFO" }; - static const char *BINDVERB_str[] = { + static const char * const BINDVERB_str[] = { "BINDVERB_GET", "BINDVERB_POST", "BINDVERB_PUT",

1 0

Dmitry Timoshkov : msi: Make some data const and static.
by Alexandre Julliard Nov. 29, 2006

Nov. 29, 2006

Module: wine Branch: master Commit: 1cdf5cddac06e9124d317eca7f798de1dfae2955 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cdf5cddac06e9124d317eca7… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Nov 29 18:03:14 2006 +0800 msi: Make some data const and static. --- dlls/msi/action.c | 4 ++-- dlls/msi/dialog.c | 2 +- dlls/msi/font.c | 2 +- dlls/msi/update.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index c61a70b..9303bcb 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -240,7 +240,7 @@ struct _actions { STANDARDACTIONHANDLER handler; }; -static struct _actions StandardActions[]; +static const struct _actions StandardActions[]; /******************************************************** @@ -4316,7 +4316,7 @@ static UINT ACTION_UnregisterComPlus( MS return msi_unimplemented_action_stub( package, "UnregisterComPlus", table ); } -static struct _actions StandardActions[] = { +static const struct _actions StandardActions[] = { { szAllocateRegistrySpace, ACTION_AllocateRegistrySpace }, { szAppSearch, ACTION_AppSearch }, { szBindImage, ACTION_BindImage }, diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index b050497..e222dcb 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -2399,7 +2399,7 @@ static BOOL str_is_number( LPCWSTR str ) return TRUE; } -WCHAR column_keys[][80] = +static const WCHAR column_keys[][80] = { {'V','o','l','u','m','e','C','o','s','t','V','o','l','u','m','e',0}, {'V','o','l','u','m','e','C','o','s','t','S','i','z','e',0}, diff --git a/dlls/msi/font.c b/dlls/msi/font.c index 32dbbbe..2b08a0f 100644 --- a/dlls/msi/font.c +++ b/dlls/msi/font.c @@ -137,7 +137,7 @@ static LPWSTR load_ttfname_from(LPCWSTR { int nPos; LPSTR buf; - static LPCSTR tt = " (TrueType)"; + static const char tt[] = " (TrueType)"; ttRecord.uStringLength = SWAPWORD(ttRecord.uStringLength); ttRecord.uStringOffset = SWAPWORD(ttRecord.uStringOffset); diff --git a/dlls/msi/update.c b/dlls/msi/update.c index 502af14..a2bcbd0 100644 --- a/dlls/msi/update.c +++ b/dlls/msi/update.c @@ -171,7 +171,7 @@ static UINT UPDATE_find_matching_rows( s } -static MSIVIEWOPS update_ops = +static const MSIVIEWOPS update_ops = { UPDATE_fetch_int, NULL,

1 0

Dmitry Timoshkov : shdocvw: Make some data const.
by Alexandre Julliard Nov. 29, 2006

Nov. 29, 2006

Module: wine Branch: master Commit: 1d5f0f41f04d4c788b2320ea2f98d15d3c38a9ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d5f0f41f04d4c788b2320ea2… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Nov 29 18:03:30 2006 +0800 shdocvw: Make some data const. --- dlls/shdocvw/navigate.c | 4 ++-- dlls/shdocvw/regsvr.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index b57df99..dcbbb24 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -46,13 +46,13 @@ typedef struct { static void dump_BINDINFO(BINDINFO *bi) { - static const char *BINDINFOF_str[] = { + static const char * const BINDINFOF_str[] = { "#0", "BINDINFOF_URLENCODESTGMEDDATA", "BINDINFOF_URLENCODEDEXTRAINFO" }; - static const char *BINDVERB_str[] = { + static const char * const BINDVERB_str[] = { "BINDVERB_GET", "BINDVERB_POST", "BINDVERB_PUT", diff --git a/dlls/shdocvw/regsvr.c b/dlls/shdocvw/regsvr.c index aca0250..c8cd814 100644 --- a/dlls/shdocvw/regsvr.c +++ b/dlls/shdocvw/regsvr.c @@ -731,7 +731,7 @@ static HRESULT register_typelib(void) ITypeLib *typelib; HRESULT hres; - static WCHAR wszSHDocVw[] = {'s','h','d','o','c','v','w','.','d','l','l',0}; + static const WCHAR wszSHDocVw[] = {'s','h','d','o','c','v','w','.','d','l','l',0}; hres = LoadTypeLibEx(wszSHDocVw, REGKIND_REGISTER, &typelib); if(FAILED(hres)) {

1 0