April 2007 - Wine-Commits - list.winehq.org

Francois Gouget : ole32/tests: Spelling fix.
by Alexandre Julliard April 3, 2007

April 3, 2007

Module: wine Branch: master Commit: f4f4eb24c84fb3bdeac1ae23589eaace4d143a75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4f4eb24c84fb3bdeac1ae235… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Apr 2 19:17:28 2007 +0200 ole32/tests: Spelling fix. --- dlls/ole32/tests/moniker.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 0947b87..0ff8ea1 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -765,7 +765,7 @@ static void test_MkParseDisplayName(void) static const WCHAR wszDisplayName[] = {'c','l','s','i','d',':', '2','0','D','0','4','F','E','0','-','3','A','E','A','-','1','0','6','9','-','A','2','D','8','-','0','8','0','0','2','B','3','0','3','0','9','D',':',0}; static const WCHAR wszDisplayNameClsid[] = {'c','l','s','i','d',':',0}; - static const WCHAR wszNonExistantProgId[] = {'N','o','n','E','x','i','s','t','a','n','t','P','r','o','g','I','d',':',0}; + static const WCHAR wszNonExistentProgId[] = {'N','o','n','E','x','i','s','t','e','n','t','P','r','o','g','I','d',':',0}; static const WCHAR wszDisplayNameRunning[] = {'W','i','n','e','T','e','s','t','R','u','n','n','i','n','g',0}; static const WCHAR wszDisplayNameProgId1[] = {'S','t','d','F','o','n','t',':',0}; static const WCHAR wszDisplayNameProgId2[] = {'@','S','t','d','F','o','n','t',0}; @@ -776,7 +776,7 @@ static void test_MkParseDisplayName(void) hr = CreateBindCtx(0, &pbc); ok_ole_success(hr, CreateBindCtx); - hr = MkParseDisplayName(pbc, wszNonExistantProgId, &eaten, &pmk); + hr = MkParseDisplayName(pbc, wszNonExistentProgId, &eaten, &pmk); ok(hr == MK_E_CANTOPENFILE, "MkParseDisplayName should have failed with MK_E_CANTOPENFILE instead of 0x%08x\n", hr); /* no special handling of "clsid:" without the string form of the clsid

1 0

Andrew Talbot : avifil32: Constify some variables.
by Alexandre Julliard April 3, 2007

April 3, 2007

Module: wine Branch: master Commit: b01c2c8ae524ad04daf90c22a075ade9759b70ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=b01c2c8ae524ad04daf90c22a… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Apr 2 22:50:46 2007 +0100 avifil32: Constify some variables. --- dlls/avifil32/avifile.c | 25 ++++++++++++------------- dlls/avifil32/avifile_private.h | 2 +- dlls/avifil32/extrachunk.c | 4 ++-- dlls/avifil32/extrachunk.h | 4 ++-- dlls/avifil32/tmpfile.c | 2 +- dlls/avifil32/wavfile.c | 4 ++-- 6 files changed, 20 insertions(+), 21 deletions(-) diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c index f989c79..3ed6386 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -210,19 +210,19 @@ static HRESULT AVIFILE_AddFrame(IAVIStreamImpl *This, DWORD ckid, DWORD size, static HRESULT AVIFILE_AddRecord(IAVIFileImpl *This); static DWORD AVIFILE_ComputeMoviStart(IAVIFileImpl *This); static void AVIFILE_ConstructAVIStream(IAVIFileImpl *paf, DWORD nr, - LPAVISTREAMINFOW asi); + const AVISTREAMINFOW *asi); static void AVIFILE_DestructAVIStream(IAVIStreamImpl *This); static HRESULT AVIFILE_LoadFile(IAVIFileImpl *This); -static HRESULT AVIFILE_LoadIndex(IAVIFileImpl *This, DWORD size, DWORD offset); -static HRESULT AVIFILE_ParseIndex(IAVIFileImpl *This, AVIINDEXENTRY *lp, +static HRESULT AVIFILE_LoadIndex(const IAVIFileImpl *This, DWORD size, DWORD offset); +static HRESULT AVIFILE_ParseIndex(const IAVIFileImpl *This, AVIINDEXENTRY *lp, LONG count, DWORD pos, BOOL *bAbsolute); static HRESULT AVIFILE_ReadBlock(IAVIStreamImpl *This, DWORD start, LPVOID buffer, LONG size); -static void AVIFILE_SamplesToBlock(IAVIStreamImpl *This, LPLONG pos, +static void AVIFILE_SamplesToBlock(const IAVIStreamImpl *This, LPLONG pos, LPLONG offset); static HRESULT AVIFILE_SaveFile(IAVIFileImpl *This); -static HRESULT AVIFILE_SaveIndex(IAVIFileImpl *This); -static ULONG AVIFILE_SearchStream(IAVIFileImpl *This, DWORD fccType, +static HRESULT AVIFILE_SaveIndex(const IAVIFileImpl *This); +static ULONG AVIFILE_SearchStream(const IAVIFileImpl *This, DWORD fccType, LONG lSkip); static void AVIFILE_UpdateInfo(IAVIFileImpl *This); static HRESULT AVIFILE_WriteBlock(IAVIStreamImpl *This, DWORD block, @@ -1502,7 +1502,7 @@ static DWORD AVIFILE_ComputeMoviStart(IAVIFileImpl *This) return dwPos; } -static void AVIFILE_ConstructAVIStream(IAVIFileImpl *paf, DWORD nr, LPAVISTREAMINFOW asi) +static void AVIFILE_ConstructAVIStream(IAVIFileImpl *paf, DWORD nr, const AVISTREAMINFOW *asi) { IAVIStreamImpl *pstream; @@ -1902,7 +1902,7 @@ static HRESULT AVIFILE_LoadFile(IAVIFileImpl *This) return AVIERR_OK; } -static HRESULT AVIFILE_LoadIndex(IAVIFileImpl *This, DWORD size, DWORD offset) +static HRESULT AVIFILE_LoadIndex(const IAVIFileImpl *This, DWORD size, DWORD offset) { AVIINDEXENTRY *lp; DWORD pos, n; @@ -1975,7 +1975,7 @@ static HRESULT AVIFILE_LoadIndex(IAVIFileImpl *This, DWORD size, DWORD offset) return hr; } -static HRESULT AVIFILE_ParseIndex(IAVIFileImpl *This, AVIINDEXENTRY *lp, +static HRESULT AVIFILE_ParseIndex(const IAVIFileImpl *This, AVIINDEXENTRY *lp, LONG count, DWORD pos, BOOL *bAbsolute) { if (lp == NULL) @@ -2064,8 +2064,7 @@ static HRESULT AVIFILE_ReadBlock(IAVIStreamImpl *This, DWORD pos, return AVIERR_OK; } -static void AVIFILE_SamplesToBlock(IAVIStreamImpl *This, LPLONG pos, - LPLONG offset) +static void AVIFILE_SamplesToBlock(const IAVIStreamImpl *This, LPLONG pos, LPLONG offset) { LONG block; @@ -2317,7 +2316,7 @@ static HRESULT AVIFILE_SaveFile(IAVIFileImpl *This) return AVIERR_OK; } -static HRESULT AVIFILE_SaveIndex(IAVIFileImpl *This) +static HRESULT AVIFILE_SaveIndex(const IAVIFileImpl *This) { IAVIStreamImpl *pStream; AVIINDEXENTRY idx; @@ -2447,7 +2446,7 @@ static HRESULT AVIFILE_SaveIndex(IAVIFileImpl *This) return AVIERR_OK; } -static ULONG AVIFILE_SearchStream(IAVIFileImpl *This, DWORD fcc, LONG lSkip) +static ULONG AVIFILE_SearchStream(const IAVIFileImpl *This, DWORD fcc, LONG lSkip) { UINT i; UINT nStream; diff --git a/dlls/avifil32/avifile_private.h b/dlls/avifil32/avifile_private.h index 8159e04..e4ee963 100644 --- a/dlls/avifil32/avifile_private.h +++ b/dlls/avifil32/avifile_private.h @@ -63,7 +63,7 @@ extern HRESULT AVIFILE_CreateACMStream(REFIID riid, LPVOID *ppobj); extern HRESULT AVIFILE_CreateICMStream(REFIID riid, LPVOID *ppobj); extern PAVIEDITSTREAM AVIFILE_CreateEditStream(PAVISTREAM pstream); extern PGETFRAME AVIFILE_CreateGetFrame(PAVISTREAM pstream); -extern PAVIFILE AVIFILE_CreateAVITempFile(int nStreams,PAVISTREAM *ppStreams); +extern PAVIFILE AVIFILE_CreateAVITempFile(int nStreams, const PAVISTREAM *ppStreams); extern LPCWSTR AVIFILE_BasenameW(LPCWSTR szFileName); diff --git a/dlls/avifil32/extrachunk.c b/dlls/avifil32/extrachunk.c index 8fad124..45096e8 100644 --- a/dlls/avifil32/extrachunk.c +++ b/dlls/avifil32/extrachunk.c @@ -29,7 +29,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(avifile); /* reads a chunk outof the extrachunk-structure */ -HRESULT ReadExtraChunk(const LPEXTRACHUNKS extra,FOURCC ckid,LPVOID lpData,LPLONG size) +HRESULT ReadExtraChunk(const EXTRACHUNKS *extra,FOURCC ckid,LPVOID lpData,LPLONG size) { LPBYTE lp; DWORD cb; @@ -99,7 +99,7 @@ HRESULT WriteExtraChunk(LPEXTRACHUNKS extra,FOURCC ckid,LPCVOID lpData, LONG siz } /* reads a chunk fomr the HMMIO into the extrachunk-structure */ -HRESULT ReadChunkIntoExtra(LPEXTRACHUNKS extra,HMMIO hmmio,MMCKINFO *lpck) +HRESULT ReadChunkIntoExtra(LPEXTRACHUNKS extra,HMMIO hmmio,const MMCKINFO *lpck) { LPDWORD lp; DWORD cb; diff --git a/dlls/avifil32/extrachunk.h b/dlls/avifil32/extrachunk.h index 981f68e..3e097ba 100644 --- a/dlls/avifil32/extrachunk.h +++ b/dlls/avifil32/extrachunk.h @@ -35,13 +35,13 @@ typedef struct _EXTRACHUNKS { } EXTRACHUNKS, *LPEXTRACHUNKS; /* reads a chunk outof the extrachunk-structure */ -HRESULT ReadExtraChunk(const LPEXTRACHUNKS extra,FOURCC ckid,LPVOID lp,LPLONG size); +HRESULT ReadExtraChunk(const EXTRACHUNKS *extra,FOURCC ckid,LPVOID lp,LPLONG size); /* writes a chunk into the extrachunk-structure */ HRESULT WriteExtraChunk(LPEXTRACHUNKS extra,FOURCC ckid,LPCVOID lp,LONG size); /* reads a chunk fomr the HMMIO into the extrachunk-structure */ -HRESULT ReadChunkIntoExtra(LPEXTRACHUNKS extra,HMMIO hmmio,MMCKINFO *lpck); +HRESULT ReadChunkIntoExtra(LPEXTRACHUNKS extra,HMMIO hmmio,const MMCKINFO *lpck); /* reads all non-junk chunks into the extrachunk-structure until it finds * the given chunk or the optional parent-chunk is at the end */ diff --git a/dlls/avifil32/tmpfile.c b/dlls/avifil32/tmpfile.c index 2dfcc95..424990e 100644 --- a/dlls/avifil32/tmpfile.c +++ b/dlls/avifil32/tmpfile.c @@ -71,7 +71,7 @@ typedef struct _ITmpFileImpl { PAVISTREAM *ppStreams; } ITmpFileImpl; -PAVIFILE AVIFILE_CreateAVITempFile(int nStreams, PAVISTREAM *ppStreams) { +PAVIFILE AVIFILE_CreateAVITempFile(int nStreams, const PAVISTREAM *ppStreams) { ITmpFileImpl *tmpFile; int i; diff --git a/dlls/avifil32/wavfile.c b/dlls/avifil32/wavfile.c index e2f82fe..d3048d6 100644 --- a/dlls/avifil32/wavfile.c +++ b/dlls/avifil32/wavfile.c @@ -212,7 +212,7 @@ struct _IAVIFileImpl { static HRESULT AVIFILE_LoadFile(IAVIFileImpl *This); static HRESULT AVIFILE_LoadSunFile(IAVIFileImpl *This); -static HRESULT AVIFILE_SaveFile(IAVIFileImpl *This); +static HRESULT AVIFILE_SaveFile(const IAVIFileImpl *This); HRESULT AVIFILE_CreateWAVFile(REFIID riid, LPVOID *ppv) { @@ -1248,7 +1248,7 @@ static HRESULT AVIFILE_LoadSunFile(IAVIFileImpl *This) return AVIERR_OK; } -static HRESULT AVIFILE_SaveFile(IAVIFileImpl *This) +static HRESULT AVIFILE_SaveFile(const IAVIFileImpl *This) { MMCKINFO ckRIFF; MMCKINFO ck;

1 0

Andrew Talbot : advpack: Constify some variables.
by Alexandre Julliard April 3, 2007

April 3, 2007

Module: wine Branch: master Commit: 970cfc7485cbc4bac923626d38e7b026f213e605 URL: http://source.winehq.org/git/wine.git/?a=commit;h=970cfc7485cbc4bac923626d3… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Apr 2 22:49:59 2007 +0100 advpack: Constify some variables. --- dlls/advpack/install.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index 3f1b1dd..e2e55ea 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -59,7 +59,7 @@ typedef struct _ADVInfo BOOL need_reboot; } ADVInfo; -typedef HRESULT (*iterate_fields_func)(HINF hinf, PCWSTR field, void *arg); +typedef HRESULT (*iterate_fields_func)(HINF hinf, PCWSTR field, const void *arg); /* Advanced INF commands */ static const WCHAR CheckAdminRights[] = { @@ -76,7 +76,7 @@ static const WCHAR RunPostSetupCommands[] = { }; /* Advanced INF callbacks */ -static HRESULT del_dirs_callback(HINF hinf, PCWSTR field, void *arg) +static HRESULT del_dirs_callback(HINF hinf, PCWSTR field, const void *arg) { INFCONTEXT context; HRESULT hr = S_OK; @@ -99,7 +99,7 @@ static HRESULT del_dirs_callback(HINF hinf, PCWSTR field, void *arg) return hr; } -static HRESULT per_user_install_callback(HINF hinf, PCWSTR field, void *arg) +static HRESULT per_user_install_callback(HINF hinf, PCWSTR field, const void *arg) { PERUSERSECTIONW per_user; INFCONTEXT context; @@ -142,7 +142,7 @@ static HRESULT per_user_install_callback(HINF hinf, PCWSTR field, void *arg) return SetPerUserSecValuesW(&per_user); } -static HRESULT register_ocxs_callback(HINF hinf, PCWSTR field, void *arg) +static HRESULT register_ocxs_callback(HINF hinf, PCWSTR field, const void *arg) { HMODULE hm; INFCONTEXT context; @@ -180,9 +180,9 @@ static HRESULT register_ocxs_callback(HINF hinf, PCWSTR field, void *arg) return hr; } -static HRESULT run_setup_commands_callback(HINF hinf, PCWSTR field, void *arg) +static HRESULT run_setup_commands_callback(HINF hinf, PCWSTR field, const void *arg) { - ADVInfo *info = (ADVInfo *)arg; + const ADVInfo *info = (const ADVInfo *)arg; INFCONTEXT context; HRESULT hr = S_OK; DWORD size; @@ -291,7 +291,7 @@ static HRESULT iterate_section_fields(HINF hinf, PCWSTR section, PCWSTR key, return hr; } -static HRESULT check_admin_rights(ADVInfo *info) +static HRESULT check_admin_rights(const ADVInfo *info) { INT check; INFCONTEXT context; @@ -311,7 +311,7 @@ static HRESULT check_admin_rights(ADVInfo *info) } /* performs a setupapi-level install of the INF file */ -static HRESULT spapi_install(ADVInfo *info) +static HRESULT spapi_install(const ADVInfo *info) { BOOL ret; HRESULT res; @@ -511,7 +511,7 @@ static HRESULT install_init(LPCWSTR inf_filename, LPCWSTR install_sec, } /* release the install instance information */ -static void install_release(ADVInfo *info) +static void install_release(const ADVInfo *info) { if (info->hinf && info->hinf != INVALID_HANDLE_VALUE) SetupCloseInfFile(info->hinf);

1 0

Andrew Talbot : comcat: Constify some variables.
by Alexandre Julliard April 3, 2007

April 3, 2007

Module: wine Branch: master Commit: 8e2bee8cb14ad31253027cd6821cdcc2430ce44f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e2bee8cb14ad31253027cd68… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Apr 2 22:50:58 2007 +0100 comcat: Constify some variables. --- dlls/comcat/information.c | 4 ++-- dlls/comcat/register.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/comcat/information.c b/dlls/comcat/information.c index 0cbe3a8..51032ac 100644 --- a/dlls/comcat/information.c +++ b/dlls/comcat/information.c @@ -35,7 +35,7 @@ struct class_categories { }; static struct class_categories *COMCAT_PrepareClassCategories( - ULONG impl_count, CATID *impl_catids, ULONG req_count, CATID *req_catids); + ULONG impl_count, const CATID *impl_catids, ULONG req_count, const CATID *req_catids); static HRESULT COMCAT_IsClassOfCategories( HKEY key, struct class_categories const* class_categories); static LPENUMGUID COMCAT_CLSID_IEnumGUID_Construct( @@ -513,7 +513,7 @@ static HRESULT COMCAT_GetCategoryDesc(HKEY key, LCID lcid, PWCHAR pszDesc, * COMCAT_PrepareClassCategories */ static struct class_categories *COMCAT_PrepareClassCategories( - ULONG impl_count, CATID *impl_catids, ULONG req_count, CATID *req_catids) + ULONG impl_count, const CATID *impl_catids, ULONG req_count, const CATID *req_catids) { struct class_categories *categories; WCHAR *strings; diff --git a/dlls/comcat/register.c b/dlls/comcat/register.c index 6b1c598..9a46e65 100644 --- a/dlls/comcat/register.c +++ b/dlls/comcat/register.c @@ -41,10 +41,10 @@ static const WCHAR req_keyname[20] = { static HRESULT COMCAT_RegisterClassCategories( REFCLSID rclsid, LPCWSTR type, - ULONG cCategories, CATID *rgcatid); + ULONG cCategories, const CATID *rgcatid); static HRESULT COMCAT_UnRegisterClassCategories( REFCLSID rclsid, LPCWSTR type, - ULONG cCategories, CATID *rgcatid); + ULONG cCategories, const CATID *rgcatid); /********************************************************************** * COMCAT_ICatRegister_QueryInterface @@ -256,7 +256,7 @@ static HRESULT COMCAT_RegisterClassCategories( REFCLSID rclsid, LPCWSTR type, ULONG cCategories, - CATID *rgcatid) + const CATID *rgcatid) { WCHAR keyname[39]; HRESULT res; @@ -309,7 +309,7 @@ static HRESULT COMCAT_UnRegisterClassCategories( REFCLSID rclsid, LPCWSTR type, ULONG cCategories, - CATID *rgcatid) + const CATID *rgcatid) { WCHAR keyname[68] = { 'C', 'L', 'S', 'I', 'D', '\\' }; HRESULT res;

1 0

Andrew Talbot : atl: Constify some variables.
by Alexandre Julliard April 3, 2007

April 3, 2007

Module: wine Branch: master Commit: 51bb7d1522fdc8ce2b606af78a0d5322ce1c561a URL: http://source.winehq.org/git/wine.git/?a=commit;h=51bb7d1522fdc8ce2b606af78… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Apr 2 22:50:14 2007 +0100 atl: Constify some variables. --- dlls/atl/registrar.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/atl/registrar.c b/dlls/atl/registrar.c index f32ebb3..2bc078d 100644 --- a/dlls/atl/registrar.c +++ b/dlls/atl/registrar.c @@ -149,7 +149,7 @@ static HRESULT get_word(LPCOLESTR *str, strbuf *buf) return S_OK; } -static HRESULT do_preprocess(Registrar *This, LPCOLESTR data, strbuf *buf) +static HRESULT do_preprocess(const Registrar *This, LPCOLESTR data, strbuf *buf) { LPCOLESTR iter, iter2 = data; rep_list *rep_iter; @@ -663,7 +663,7 @@ static const IRegistrarVtbl RegistrarVtbl = { Registrar_ResourceUnregister, }; -static HRESULT Registrar_create(LPUNKNOWN pUnkOuter, REFIID riid, void **ppvObject) +static HRESULT Registrar_create(const IUnknown *pUnkOuter, REFIID riid, void **ppvObject) { Registrar *ret;

1 0

Andrew Talbot : comctl32: Constify some variables.
by Alexandre Julliard April 3, 2007

April 3, 2007

Module: wine Branch: master Commit: b84348c4ce2538a0e846e806f257bda0cc943436 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b84348c4ce2538a0e846e806f… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Apr 2 17:51:03 2007 +0100 comctl32: Constify some variables. --- dlls/comctl32/updown.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c index c5801a1..63df9dc 100644 --- a/dlls/comctl32/updown.c +++ b/dlls/comctl32/updown.c @@ -108,7 +108,7 @@ static void UPDOWN_DoAction (UPDOWN_INFO *infoPtr, int delta, int action); * UPDOWN_IsBuddyEdit * Tests if our buddy is an edit control. */ -static inline BOOL UPDOWN_IsBuddyEdit(UPDOWN_INFO *infoPtr) +static inline BOOL UPDOWN_IsBuddyEdit(const UPDOWN_INFO *infoPtr) { return infoPtr->BuddyType == BUDDY_TYPE_EDIT; } @@ -117,7 +117,7 @@ static inline BOOL UPDOWN_IsBuddyEdit(UPDOWN_INFO *infoPtr) * UPDOWN_IsBuddyListbox * Tests if our buddy is a listbox control. */ -static inline BOOL UPDOWN_IsBuddyListbox(UPDOWN_INFO *infoPtr) +static inline BOOL UPDOWN_IsBuddyListbox(const UPDOWN_INFO *infoPtr) { return infoPtr->BuddyType == BUDDY_TYPE_LISTBOX; } @@ -126,7 +126,7 @@ static inline BOOL UPDOWN_IsBuddyListbox(UPDOWN_INFO *infoPtr) * UPDOWN_InBounds * Tests if a given value 'val' is between the Min&Max limits */ -static BOOL UPDOWN_InBounds(UPDOWN_INFO *infoPtr, int val) +static BOOL UPDOWN_InBounds(const UPDOWN_INFO *infoPtr, int val) { if(infoPtr->MaxVal > infoPtr->MinVal) return (infoPtr->MinVal <= val) && (val <= infoPtr->MaxVal); @@ -162,7 +162,7 @@ static BOOL UPDOWN_OffsetVal(UPDOWN_INFO *infoPtr, int delta) * When we have a buddy set and that we are aligned on our buddy, we * want to draw a sunken edge to make like we are part of that control. */ -static BOOL UPDOWN_HasBuddyBorder(UPDOWN_INFO* infoPtr) +static BOOL UPDOWN_HasBuddyBorder(const UPDOWN_INFO *infoPtr) { return ( ((infoPtr->dwStyle & (UDS_ALIGNLEFT | UDS_ALIGNRIGHT)) != 0) && UPDOWN_IsBuddyEdit(infoPtr) ); @@ -176,7 +176,7 @@ static BOOL UPDOWN_HasBuddyBorder(UPDOWN_INFO* infoPtr) * FLAG_DECR to get the "decrement" rect (down or left) * If both flags are pressent, the envelope is returned. */ -static void UPDOWN_GetArrowRect (UPDOWN_INFO* infoPtr, RECT *rect, int arrow) +static void UPDOWN_GetArrowRect (const UPDOWN_INFO* infoPtr, RECT *rect, int arrow) { HTHEME theme = GetWindowTheme (infoPtr->Self); const int border = theme ? DEFAULT_BUDDYBORDER_THEMED : DEFAULT_BUDDYBORDER; @@ -228,7 +228,7 @@ static void UPDOWN_GetArrowRect (UPDOWN_INFO* infoPtr, RECT *rect, int arrow) * If it returns the up rect, it returns FLAG_INCR. * If it returns the down rect, it returns FLAG_DECR. */ -static INT UPDOWN_GetArrowFromPoint (UPDOWN_INFO* infoPtr, RECT *rect, POINT pt) +static INT UPDOWN_GetArrowFromPoint (const UPDOWN_INFO *infoPtr, RECT *rect, POINT pt) { UPDOWN_GetArrowRect (infoPtr, rect, FLAG_INCR); if(PtInRect(rect, pt)) return FLAG_INCR; @@ -306,7 +306,7 @@ static BOOL UPDOWN_GetBuddyInt (UPDOWN_INFO *infoPtr) * TRUE - if it set the caption of the buddy successfully * FALSE - if an error occurred */ -static BOOL UPDOWN_SetBuddyInt (UPDOWN_INFO *infoPtr) +static BOOL UPDOWN_SetBuddyInt (const UPDOWN_INFO *infoPtr) { WCHAR fmt[3] = { '%', 'd', '\0' }; WCHAR txt[20]; @@ -352,7 +352,7 @@ static BOOL UPDOWN_SetBuddyInt (UPDOWN_INFO *infoPtr) * * Draw buddy background for visual integration. */ -static BOOL UPDOWN_DrawBuddyBackground (UPDOWN_INFO *infoPtr, HDC hdc) +static BOOL UPDOWN_DrawBuddyBackground (const UPDOWN_INFO *infoPtr, HDC hdc) { RECT br; HTHEME buddyTheme = GetWindowTheme (infoPtr->Buddy); @@ -370,7 +370,7 @@ static BOOL UPDOWN_DrawBuddyBackground (UPDOWN_INFO *infoPtr, HDC hdc) * * Draw the arrows. The background need not be erased. */ -static LRESULT UPDOWN_Draw (UPDOWN_INFO *infoPtr, HDC hdc) +static LRESULT UPDOWN_Draw (const UPDOWN_INFO *infoPtr, HDC hdc) { BOOL uPressed, uHot, dPressed, dHot; RECT rect; @@ -437,7 +437,7 @@ static LRESULT UPDOWN_Draw (UPDOWN_INFO *infoPtr, HDC hdc) * Asynchronous drawing (must ONLY be used in WM_PAINT). * Calls UPDOWN_Draw. */ -static LRESULT UPDOWN_Paint (UPDOWN_INFO *infoPtr, HDC hdc) +static LRESULT UPDOWN_Paint (const UPDOWN_INFO *infoPtr, HDC hdc) { PAINTSTRUCT ps; if (hdc) return UPDOWN_Draw (infoPtr, hdc); @@ -650,7 +650,7 @@ static void UPDOWN_DoAction (UPDOWN_INFO *infoPtr, int delta, int action) * Returns TRUE if it is enabled as well as its buddy (if any) * FALSE otherwise */ -static BOOL UPDOWN_IsEnabled (UPDOWN_INFO *infoPtr) +static BOOL UPDOWN_IsEnabled (const UPDOWN_INFO *infoPtr) { if (!IsWindowEnabled(infoPtr->Self)) return FALSE;

1 0

Andrew Talbot : comctl32: Constify some variables.
by Alexandre Julliard April 3, 2007

April 3, 2007

Module: wine Branch: master Commit: 3c9f867f7766943ee6b356a82866a8f065022f34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c9f867f7766943ee6b356a82… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Apr 2 17:50:43 2007 +0100 comctl32: Constify some variables. --- dlls/comctl32/treeview.c | 149 +++++++++++++++++++++++----------------------- 1 files changed, 75 insertions(+), 74 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3c9f867f7766943ee6b35…

1 0

Andrew Talbot : comctl32: Constify some variables.
by Alexandre Julliard April 3, 2007

April 3, 2007

Module: wine Branch: master Commit: 58ec9888006ef8f56f494df454d1517b196eb56a URL: http://source.winehq.org/git/wine.git/?a=commit;h=58ec9888006ef8f56f494df45… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Apr 2 17:50:24 2007 +0100 comctl32: Constify some variables. --- dlls/comctl32/trackbar.c | 59 ++++++++++++++++++++++----------------------- 1 files changed, 29 insertions(+), 30 deletions(-) diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index d2c5216..8282e7c 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -103,14 +103,14 @@ typedef struct static const WCHAR themeClass[] = { 'T','r','a','c','k','b','a','r',0 }; static inline int -notify_customdraw(TRACKBAR_INFO *infoPtr, NMCUSTOMDRAW *pnmcd, int stage) +notify_customdraw (const TRACKBAR_INFO *infoPtr, NMCUSTOMDRAW *pnmcd, int stage) { pnmcd->dwDrawStage = stage; return SendMessageW (infoPtr->hwndNotify, WM_NOTIFY, pnmcd->hdr.idFrom, (LPARAM)pnmcd); } -static LRESULT notify_hdr(TRACKBAR_INFO *infoPtr, INT code, LPNMHDR pnmh) +static LRESULT notify_hdr (const TRACKBAR_INFO *infoPtr, INT code, LPNMHDR pnmh) { LRESULT result; @@ -127,14 +127,14 @@ static LRESULT notify_hdr(TRACKBAR_INFO *infoPtr, INT code, LPNMHDR pnmh) return result; } -static inline int notify(TRACKBAR_INFO *infoPtr, INT code) +static inline int notify (const TRACKBAR_INFO *infoPtr, INT code) { NMHDR nmh; return notify_hdr(infoPtr, code, &nmh); } static BOOL -notify_with_scroll (TRACKBAR_INFO *infoPtr, UINT code) +notify_with_scroll (const TRACKBAR_INFO *infoPtr, UINT code) { BOOL bVert = GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_VERT; @@ -179,8 +179,7 @@ static void TRACKBAR_RecalculateTics (TRACKBAR_INFO *infoPtr) (in range of trackbar) */ static inline LONG -TRACKBAR_ConvertPlaceToPosition (TRACKBAR_INFO *infoPtr, int place, - int vertical) +TRACKBAR_ConvertPlaceToPosition (const TRACKBAR_INFO *infoPtr, int place, int vertical) { double range, width, pos, offsetthumb; @@ -207,7 +206,7 @@ TRACKBAR_ConvertPlaceToPosition (TRACKBAR_INFO *infoPtr, int place, /* return: 0> prev, 0 none, >0 next */ static LONG -TRACKBAR_GetAutoPageDirection (TRACKBAR_INFO *infoPtr, POINT clickPoint) +TRACKBAR_GetAutoPageDirection (const TRACKBAR_INFO *infoPtr, POINT clickPoint) { DWORD dwStyle = GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE); RECT pageRect; @@ -334,7 +333,7 @@ TRACKBAR_CalcChannel (TRACKBAR_INFO *infoPtr) } static void -TRACKBAR_CalcThumb (TRACKBAR_INFO *infoPtr, LONG lPos, RECT *thumb) +TRACKBAR_CalcThumb (const TRACKBAR_INFO *infoPtr, LONG lPos, RECT *thumb) { int range, width, height, thumbwidth; DWORD dwStyle = GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE); @@ -381,13 +380,13 @@ TRACKBAR_UpdateThumb (TRACKBAR_INFO *infoPtr) } static inline void -TRACKBAR_InvalidateAll(TRACKBAR_INFO * infoPtr) +TRACKBAR_InvalidateAll (const TRACKBAR_INFO *infoPtr) { InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); } static void -TRACKBAR_InvalidateThumb (TRACKBAR_INFO *infoPtr, LONG thumbPos) +TRACKBAR_InvalidateThumb (const TRACKBAR_INFO *infoPtr, LONG thumbPos) { RECT rcThumb; @@ -397,7 +396,7 @@ TRACKBAR_InvalidateThumb (TRACKBAR_INFO *infoPtr, LONG thumbPos) } static inline void -TRACKBAR_InvalidateThumbMove (TRACKBAR_INFO *infoPtr, LONG oldPos, LONG newPos) +TRACKBAR_InvalidateThumbMove (const TRACKBAR_INFO *infoPtr, LONG oldPos, LONG newPos) { TRACKBAR_InvalidateThumb (infoPtr, oldPos); if (newPos != oldPos) @@ -405,7 +404,7 @@ TRACKBAR_InvalidateThumbMove (TRACKBAR_INFO *infoPtr, LONG oldPos, LONG newPos) } static inline BOOL -TRACKBAR_HasSelection (TRACKBAR_INFO *infoPtr) +TRACKBAR_HasSelection (const TRACKBAR_INFO *infoPtr) { return infoPtr->lSelMin != infoPtr->lSelMax; } @@ -468,7 +467,7 @@ TRACKBAR_AutoPage (TRACKBAR_INFO *infoPtr, POINT clickPoint) /* Trackbar drawing code. I like my spaghetti done milanese. */ static void -TRACKBAR_DrawChannel (TRACKBAR_INFO *infoPtr, HDC hdc, DWORD dwStyle) +TRACKBAR_DrawChannel (const TRACKBAR_INFO *infoPtr, HDC hdc, DWORD dwStyle) { RECT rcChannel = infoPtr->rcChannel; HTHEME theme = GetWindowTheme (infoPtr->hwndSelf); @@ -491,7 +490,7 @@ TRACKBAR_DrawChannel (TRACKBAR_INFO *infoPtr, HDC hdc, DWORD dwStyle) } static void -TRACKBAR_DrawOneTic (TRACKBAR_INFO *infoPtr, HDC hdc, LONG ticPos, int flags) +TRACKBAR_DrawOneTic (const TRACKBAR_INFO *infoPtr, HDC hdc, LONG ticPos, int flags) { int x, y, ox, oy, range, side, indent = 0, len = 3; int offsetthumb; @@ -566,7 +565,7 @@ TRACKBAR_DrawOneTic (TRACKBAR_INFO *infoPtr, HDC hdc, LONG ticPos, int flags) static inline void -TRACKBAR_DrawTic (TRACKBAR_INFO *infoPtr, HDC hdc, LONG ticPos, int flags) +TRACKBAR_DrawTic (const TRACKBAR_INFO *infoPtr, HDC hdc, LONG ticPos, int flags) { if ((flags & (TBS_LEFT | TBS_TOP)) || (flags & TBS_BOTH)) TRACKBAR_DrawOneTic (infoPtr, hdc, ticPos, flags | TBS_LEFT); @@ -576,7 +575,7 @@ TRACKBAR_DrawTic (TRACKBAR_INFO *infoPtr, HDC hdc, LONG ticPos, int flags) } static void -TRACKBAR_DrawTics (TRACKBAR_INFO *infoPtr, HDC hdc, DWORD dwStyle) +TRACKBAR_DrawTics (const TRACKBAR_INFO *infoPtr, HDC hdc, DWORD dwStyle) { unsigned int i; int ticFlags = dwStyle & 0x0f; @@ -615,7 +614,7 @@ TRACKBAR_DrawTics (TRACKBAR_INFO *infoPtr, HDC hdc, DWORD dwStyle) } static void -TRACKBAR_DrawThumb(TRACKBAR_INFO *infoPtr, HDC hdc, DWORD dwStyle) +TRACKBAR_DrawThumb (const TRACKBAR_INFO *infoPtr, HDC hdc, DWORD dwStyle) { HBRUSH oldbr; HPEN oldpen; @@ -758,7 +757,7 @@ TRACKBAR_DrawThumb(TRACKBAR_INFO *infoPtr, HDC hdc, DWORD dwStyle) static inline void -TRACKBAR_ActivateToolTip (TRACKBAR_INFO *infoPtr, BOOL fShow) +TRACKBAR_ActivateToolTip (const TRACKBAR_INFO *infoPtr, BOOL fShow) { TTTOOLINFOW ti; @@ -773,7 +772,7 @@ TRACKBAR_ActivateToolTip (TRACKBAR_INFO *infoPtr, BOOL fShow) static void -TRACKBAR_UpdateToolTip (TRACKBAR_INFO *infoPtr) +TRACKBAR_UpdateToolTip (const TRACKBAR_INFO *infoPtr) { DWORD dwStyle = GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE); WCHAR buf[80]; @@ -942,7 +941,7 @@ cleanup: static void -TRACKBAR_AlignBuddies (TRACKBAR_INFO *infoPtr) +TRACKBAR_AlignBuddies (const TRACKBAR_INFO *infoPtr) { DWORD dwStyle = GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE); HWND hwndParent = GetParent (infoPtr->hwndSelf); @@ -1023,7 +1022,7 @@ TRACKBAR_ClearTics (TRACKBAR_INFO *infoPtr, BOOL fRedraw) static inline LRESULT -TRACKBAR_GetChannelRect (TRACKBAR_INFO *infoPtr, LPRECT lprc) +TRACKBAR_GetChannelRect (const TRACKBAR_INFO *infoPtr, LPRECT lprc) { if (lprc == NULL) return 0; @@ -1037,7 +1036,7 @@ TRACKBAR_GetChannelRect (TRACKBAR_INFO *infoPtr, LPRECT lprc) static inline LONG -TRACKBAR_GetNumTics (TRACKBAR_INFO *infoPtr) +TRACKBAR_GetNumTics (const TRACKBAR_INFO *infoPtr) { if (GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_NOTICKS) return 0; @@ -1049,7 +1048,7 @@ TRACKBAR_GetNumTics (TRACKBAR_INFO *infoPtr) } -static int comp_tics(const void *ap, const void *bp) +static int comp_tics (const void *ap, const void *bp) { const DWORD a = *(const DWORD *)ap; const DWORD b = *(const DWORD *)bp; @@ -1062,7 +1061,7 @@ static int comp_tics(const void *ap, const void *bp) static inline LONG -TRACKBAR_GetTic (TRACKBAR_INFO *infoPtr, INT iTic) +TRACKBAR_GetTic (const TRACKBAR_INFO *infoPtr, INT iTic) { if ((iTic < 0) || (iTic >= infoPtr->uNumTics) || !infoPtr->tics) return -1; @@ -1073,7 +1072,7 @@ TRACKBAR_GetTic (TRACKBAR_INFO *infoPtr, INT iTic) static inline LONG -TRACKBAR_GetTicPos (TRACKBAR_INFO *infoPtr, INT iTic) +TRACKBAR_GetTicPos (const TRACKBAR_INFO *infoPtr, INT iTic) { LONG range, width, pos, tic; int offsetthumb; @@ -1393,7 +1392,7 @@ TRACKBAR_InitializeThumb (TRACKBAR_INFO *infoPtr) static LRESULT -TRACKBAR_Create (HWND hwnd, LPCREATESTRUCTW lpcs) +TRACKBAR_Create (HWND hwnd, const CREATESTRUCTW *lpcs) { TRACKBAR_INFO *infoPtr; DWORD dwStyle; @@ -1525,7 +1524,7 @@ TRACKBAR_LButtonUp (TRACKBAR_INFO *infoPtr, DWORD fwKeys, INT x, INT y) static LRESULT -TRACKBAR_CaptureChanged (TRACKBAR_INFO *infoPtr) +TRACKBAR_CaptureChanged (const TRACKBAR_INFO *infoPtr) { notify_with_scroll (infoPtr, TB_ENDTRACK); return 0; @@ -1570,7 +1569,7 @@ TRACKBAR_Size (TRACKBAR_INFO *infoPtr, DWORD fwSizeType, INT nWidth, INT nHeight static LRESULT -TRACKBAR_Timer (TRACKBAR_INFO *infoPtr, INT wTimerID, TIMERPROC *tmrpc) +TRACKBAR_Timer (TRACKBAR_INFO *infoPtr, INT wTimerID, const TIMERPROC *tmrpc) { if (infoPtr->flags & TB_AUTO_PAGE) { POINT pt; @@ -1583,7 +1582,7 @@ TRACKBAR_Timer (TRACKBAR_INFO *infoPtr, INT wTimerID, TIMERPROC *tmrpc) /* update theme after a WM_THEMECHANGED message */ -static LRESULT theme_changed (TRACKBAR_INFO* infoPtr) +static LRESULT theme_changed (const TRACKBAR_INFO* infoPtr) { HTHEME theme = GetWindowTheme (infoPtr->hwndSelf); CloseThemeData (theme); @@ -1713,7 +1712,7 @@ TRACKBAR_KeyDown (TRACKBAR_INFO *infoPtr, INT nVirtKey, DWORD lKeyData) static inline BOOL -TRACKBAR_KeyUp (TRACKBAR_INFO *infoPtr, INT nVirtKey, DWORD lKeyData) +TRACKBAR_KeyUp (const TRACKBAR_INFO *infoPtr, INT nVirtKey, DWORD lKeyData) { switch (nVirtKey) { case VK_LEFT:

1 0

Andrew Talbot : advapi32: Constify some variables.
by Alexandre Julliard April 3, 2007

April 3, 2007

Module: wine Branch: master Commit: 3c75d9380ac3cb39f5343de19bf0339614506bbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c75d9380ac3cb39f5343de19… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Apr 2 22:49:40 2007 +0100 advapi32: Constify some variables. --- dlls/advapi32/service.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 6077dea..60f8dca 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -249,7 +249,7 @@ static inline void service_set_value( struct reg_value *val, } static inline void service_set_dword( struct reg_value *val, - LPCWSTR name, DWORD *data ) + LPCWSTR name, const DWORD *data ) { service_set_value( val, REG_DWORD, name, data, sizeof (DWORD)); } @@ -488,7 +488,7 @@ static BOOL service_send_start_message(HANDLE pipe, LPCWSTR *argv, DWORD argc) /****************************************************************************** * service_handle_get_status */ -static BOOL service_handle_get_status(HANDLE pipe, service_data *service) +static BOOL service_handle_get_status(HANDLE pipe, const service_data *service) { DWORD count = 0; TRACE("\n"); @@ -545,7 +545,7 @@ static BOOL service_send_control(HANDLE pipe, DWORD dwControl, DWORD *result) /****************************************************************************** * service_accepts_control */ -static BOOL service_accepts_control(service_data *service, DWORD dwControl) +static BOOL service_accepts_control(const service_data *service, DWORD dwControl) { DWORD a = service->status.dwControlsAccepted;

1 0

Andrew Talbot : comctl32: Constify some variables.
by Alexandre Julliard April 3, 2007

April 3, 2007

Module: wine Branch: master Commit: 51ee49717411fa905a027af133f3517ced51532f URL: http://source.winehq.org/git/wine.git/?a=commit;h=51ee49717411fa905a027af13… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Apr 2 17:49:58 2007 +0100 comctl32: Constify some variables. --- dlls/comctl32/toolbar.c | 102 ++++++++++++++++++++++++---------------------- 1 files changed, 53 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=51ee49717411fa905a027…

1 0