March 2010 - Wine-commits - list.winehq.org

Mikhail Maroukhine : msxml3: Fix compiler warnings with flag -Wcast-qual.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: 88cca2cf765b38dd762ff180804e02efd805fc7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=88cca2cf765b38dd762ff1808… Author: Mikhail Maroukhine <mikolg(a)yandex.ru> Date: Sat Mar 27 21:19:45 2010 +0600 msxml3: Fix compiler warnings with flag -Wcast-qual. --- dlls/msxml3/dispex.c | 4 ++-- dlls/msxml3/main.c | 2 +- dlls/msxml3/node.c | 16 ++++++++-------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/msxml3/dispex.c b/dlls/msxml3/dispex.c index 529f9a4..09b71fe 100644 --- a/dlls/msxml3/dispex.c +++ b/dlls/msxml3/dispex.c @@ -196,12 +196,12 @@ static void add_func_info(dispex_data_t *data, DWORD *size, tid_t tid, DISPID id static int dispid_cmp(const void *p1, const void *p2) { - return ((func_info_t*)p1)->id - ((func_info_t*)p2)->id; + return ((const func_info_t*)p1)->id - ((const func_info_t*)p2)->id; } static int func_name_cmp(const void *p1, const void *p2) { - return strcmpiW((*(func_info_t**)p1)->name, (*(func_info_t**)p2)->name); + return strcmpiW((*(func_info_t* const*)p1)->name, (*(func_info_t* const*)p2)->name); } static dispex_data_t *preprocess_dispex_data(DispatchEx *This) diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index 9b1eb82..60b0cbd 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -62,7 +62,7 @@ static int wineXmlMatchCallback (char const * filename) static void *wineXmlOpenCallback (char const * filename) { - BSTR sFilename = bstr_from_xmlChar( (xmlChar*)filename); + BSTR sFilename = bstr_from_xmlChar( (const xmlChar*)filename); HANDLE hFile; TRACE("%s\n", debugstr_w(sFilename)); diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index b05f06e..500fb94 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -1190,8 +1190,8 @@ static HRESULT WINAPI xmlnode_get_dataType( switch ( This->node->type ) { case XML_ELEMENT_NODE: - pVal = xmlGetNsProp(This->node, (xmlChar*)"dt", - (xmlChar*)"urn:schemas-microsoft-com:datatypes"); + pVal = xmlGetNsProp(This->node, (const xmlChar*)"dt", + (const xmlChar*)"urn:schemas-microsoft-com:datatypes"); if (pVal) { V_VT(dataTypeName) = VT_BSTR; @@ -1260,20 +1260,20 @@ static HRESULT WINAPI xmlnode_put_dataType( xmlAttrPtr pAttr = NULL; xmlChar* str = xmlChar_from_wchar(dataTypeName); - pAttr = xmlHasNsProp(This->node, (xmlChar*)"dt", - (xmlChar*)"urn:schemas-microsoft-com:datatypes"); + pAttr = xmlHasNsProp(This->node, (const xmlChar*)"dt", + (const xmlChar*)"urn:schemas-microsoft-com:datatypes"); if (pAttr) { - pAttr = xmlSetNsProp(This->node, pAttr->ns, (xmlChar*)"dt", str); + pAttr = xmlSetNsProp(This->node, pAttr->ns, (const xmlChar*)"dt", str); hr = S_OK; } else { - pNS = xmlNewNs(This->node, (xmlChar*)"urn:schemas-microsoft-com:datatypes", (xmlChar*)"dt"); + pNS = xmlNewNs(This->node, (const xmlChar*)"urn:schemas-microsoft-com:datatypes", (const xmlChar*)"dt"); if(pNS) { - pAttr = xmlNewNsProp(This->node, pNS, (xmlChar*)"dt", str); + pAttr = xmlNewNsProp(This->node, pNS, (const xmlChar*)"dt", str); if(pAttr) { xmlAddChild(This->node, (xmlNodePtr)pAttr); @@ -1402,7 +1402,7 @@ static HRESULT WINAPI xmlnode_get_xml( /* Attribute Nodes return a space in front of their name */ pContent = xmlBufferContent(pXmlBuf); - if( ((char*)pContent)[0] == ' ') + if( ((const char*)pContent)[0] == ' ') bstrContent = bstr_from_xmlChar(pContent+1); else bstrContent = bstr_from_xmlChar(pContent);

1 0

Mikhail Maroukhine : d3d10: Fix compiler warnings with flag -Wcast-qual.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: 3d62b870a16afd3ae63c8e86cb5811a5533a1148 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d62b870a16afd3ae63c8e86c… Author: Mikhail Maroukhine <mikolg(a)yandex.ru> Date: Sat Mar 27 15:36:26 2010 +0600 d3d10: Fix compiler warnings with flag -Wcast-qual. --- dlls/d3d10/effect.c | 84 +++++++++++++++++++++++++------------------------- 1 files changed, 42 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3d62b870a16afd3ae63c8…

1 0

Mikhail Maroukhine : d3dx9_36: Fix compiler warnings with flag -Wcast-qual.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: adf09ce66e70a5cc3235d726759f0ea2ef203d13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adf09ce66e70a5cc3235d7267… Author: Mikhail Maroukhine <mikolg(a)yandex.ru> Date: Sat Mar 27 15:55:51 2010 +0600 d3dx9_36: Fix compiler warnings with flag -Wcast-qual. --- dlls/d3dx9_36/mesh.c | 6 +++--- dlls/d3dx9_36/shader.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 91116b2..f90de85 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -117,7 +117,7 @@ HRESULT WINAPI D3DXComputeBoundingBox(CONST D3DXVECTOR3 *pfirstposition, DWORD n for(i=0; i<numvertices; i++) { - vec = *( (D3DXVECTOR3*)((char*)pfirstposition + dwstride * i) ); + vec = *( (const D3DXVECTOR3*)((const char*)pfirstposition + dwstride * i) ); if ( vec.x < pmin->x ) pmin->x = vec.x; if ( vec.x > pmax->x ) pmax->x = vec.x; @@ -152,7 +152,7 @@ HRESULT WINAPI D3DXComputeBoundingSphere(CONST D3DXVECTOR3* pfirstposition, DWOR for(i=0; i<numvertices; i++) { - D3DXVec3Add(&temp1, &temp, (D3DXVECTOR3*)((char*)pfirstposition + dwstride * i)); + D3DXVec3Add(&temp1, &temp, (const D3DXVECTOR3*)((const char*)pfirstposition + dwstride * i)); temp = temp1; } @@ -160,7 +160,7 @@ HRESULT WINAPI D3DXComputeBoundingSphere(CONST D3DXVECTOR3* pfirstposition, DWOR for(i=0; i<numvertices; i++) { - d = D3DXVec3Length(D3DXVec3Subtract(&temp, (D3DXVECTOR3*)((char*)pfirstposition + dwstride * i), pcenter)); + d = D3DXVec3Length(D3DXVec3Subtract(&temp, (const D3DXVECTOR3*)((const char*)pfirstposition + dwstride * i), pcenter)); if ( d > *pradius ) *pradius = d; } return D3D_OK; diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 1b888a7..ab57029 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -608,7 +608,7 @@ HRESULT WINAPI D3DXGetShaderConstantTableEx(CONST DWORD* byte_code, HRESULT hr; LPCVOID data; UINT size; - D3DXSHADER_CONSTANTTABLE* ctab_header; + const D3DXSHADER_CONSTANTTABLE* ctab_header; FIXME("(%p, %x, %p): semi-stub\n", byte_code, flags, constant_table); @@ -642,7 +642,7 @@ HRESULT WINAPI D3DXGetShaderConstantTableEx(CONST DWORD* byte_code, object->size = size; memcpy(object->ctab, data, object->size); - ctab_header = (D3DXSHADER_CONSTANTTABLE*)data; + ctab_header = (const D3DXSHADER_CONSTANTTABLE*)data; if (ctab_header->Size != sizeof(D3DXSHADER_CONSTANTTABLE)) goto error; object->desc.Creator = ctab_header->Creator ? (LPCSTR)object->ctab + ctab_header->Creator : NULL;

1 0

Mikhail Maroukhine : dbghelp: Fix compiler warnings with flag -Wcast-qual.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: 0519c4b68a1b27990b050ae2cf91a837b259a655 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0519c4b68a1b27990b050ae2c… Author: Mikhail Maroukhine <mikolg(a)yandex.ru> Date: Sat Mar 27 16:09:03 2010 +0600 dbghelp: Fix compiler warnings with flag -Wcast-qual. --- dlls/dbghelp/pe_module.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index 61b8c5e..baddaeb 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -377,7 +377,7 @@ static BOOL pe_load_coff_symbol_table(struct module* module) if (!fmap->u.pe.ntheader.FileHeader.PointerToSymbolTable || !numsym) return TRUE; if (!(mapping = pe_map_full(fmap, NULL))) return FALSE; - isym = (const IMAGE_SYMBOL*)((char*)mapping + fmap->u.pe.ntheader.FileHeader.PointerToSymbolTable); + isym = (const IMAGE_SYMBOL*)((const char*)mapping + fmap->u.pe.ntheader.FileHeader.PointerToSymbolTable); /* FIXME: no way to get strtable size */ strtable = (const char*)&isym[numsym]; sect = IMAGE_FIRST_SECTION(&fmap->u.pe.ntheader);

1 0

Mikhail Maroukhine : gdi32: Fix compiler warnings with flag -Wcast-qual.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: 8fd8d9e96a21bc1d006980f23ed7c87721e5da63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fd8d9e96a21bc1d006980f23… Author: Mikhail Maroukhine <mikolg(a)yandex.ru> Date: Sat Mar 27 16:56:11 2010 +0600 gdi32: Fix compiler warnings with flag -Wcast-qual. --- dlls/gdi32/enhmetafile.c | 22 +++++++++++----------- dlls/gdi32/freetype.c | 26 +++++++++++++------------- dlls/gdi32/region.c | 12 ++++++------ 3 files changed, 30 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8fd8d9e96a21bc1d00698…

1 0

Mikhail Maroukhine : gdiplus: Fix compiler warnings with flag -Wcast-qual.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: 818ff38d62fe9c5c5e5837d3932eacc43962af1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=818ff38d62fe9c5c5e5837d39… Author: Mikhail Maroukhine <mikolg(a)yandex.ru> Date: Sat Mar 27 17:58:23 2010 +0600 gdiplus: Fix compiler warnings with flag -Wcast-qual. --- dlls/gdiplus/image.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index bfed433..1af73da 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -122,7 +122,7 @@ static inline void getpixel_16bppGrayScale(BYTE *r, BYTE *g, BYTE *b, BYTE *a, static inline void getpixel_16bppRGB555(BYTE *r, BYTE *g, BYTE *b, BYTE *a, const BYTE *row, UINT x) { - WORD pixel = *((WORD*)(row)+x); + WORD pixel = *((const WORD*)(row)+x); *r = (pixel>>7&0xf8)|(pixel>>12&0x7); *g = (pixel>>2&0xf8)|(pixel>>6&0x7); *b = (pixel<<3&0xf8)|(pixel>>2&0x7); @@ -132,7 +132,7 @@ static inline void getpixel_16bppRGB555(BYTE *r, BYTE *g, BYTE *b, BYTE *a, static inline void getpixel_16bppRGB565(BYTE *r, BYTE *g, BYTE *b, BYTE *a, const BYTE *row, UINT x) { - WORD pixel = *((WORD*)(row)+x); + WORD pixel = *((const WORD*)(row)+x); *r = (pixel>>8&0xf8)|(pixel>>13&0x7); *g = (pixel>>3&0xfc)|(pixel>>9&0x3); *b = (pixel<<3&0xf8)|(pixel>>2&0x7); @@ -142,7 +142,7 @@ static inline void getpixel_16bppRGB565(BYTE *r, BYTE *g, BYTE *b, BYTE *a, static inline void getpixel_16bppARGB1555(BYTE *r, BYTE *g, BYTE *b, BYTE *a, const BYTE *row, UINT x) { - WORD pixel = *((WORD*)(row)+x); + WORD pixel = *((const WORD*)(row)+x); *r = (pixel>>7&0xf8)|(pixel>>12&0x7); *g = (pixel>>2&0xf8)|(pixel>>6&0x7); *b = (pixel<<3&0xf8)|(pixel>>2&0x7);

1 0

Mikhail Maroukhine : localspl: Fix compiler warnings with flag -Wcast-qual.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: 1637d402d91372b3ea83053893e122e2ef0982e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1637d402d91372b3ea8305389… Author: Mikhail Maroukhine <mikolg(a)yandex.ru> Date: Sat Mar 27 18:34:32 2010 +0600 localspl: Fix compiler warnings with flag -Wcast-qual. --- dlls/localspl/provider.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index b17e074..3224188 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -1375,7 +1375,7 @@ static BOOL myAddPrinterDriverEx(DWORD level, LPBYTE pDriverInfo, DWORD dwFileCo } /* Verified with the Adobe PS Driver, that w2k does not use di.Version */ - RegSetValueExW(hdrv, versionW, 0, REG_DWORD, (LPBYTE) &env->driverversion, + RegSetValueExW(hdrv, versionW, 0, REG_DWORD, (const BYTE*) &env->driverversion, sizeof(DWORD)); RegSetValueExW(hdrv, driverW, 0, REG_SZ, (LPBYTE) di.pDriverPath, @@ -1395,7 +1395,7 @@ static BOOL myAddPrinterDriverEx(DWORD level, LPBYTE pDriverInfo, DWORD dwFileCo RegSetValueExW(hdrv, help_fileW, 0, REG_SZ, (LPBYTE) di.pHelpFile, (lstrlenW(di.pHelpFile)+1)* sizeof(WCHAR)); else - RegSetValueExW(hdrv, help_fileW, 0, REG_SZ, (LPBYTE)emptyW, sizeof(emptyW)); + RegSetValueExW(hdrv, help_fileW, 0, REG_SZ, (const BYTE*)emptyW, sizeof(emptyW)); apd_copyfile(di.pHelpFile, &apd); @@ -1404,7 +1404,7 @@ static BOOL myAddPrinterDriverEx(DWORD level, LPBYTE pDriverInfo, DWORD dwFileCo RegSetValueExW(hdrv, dependent_filesW, 0, REG_MULTI_SZ, (LPBYTE) di.pDependentFiles, multi_sz_lenW(di.pDependentFiles)); else - RegSetValueExW(hdrv, dependent_filesW, 0, REG_MULTI_SZ, (LPBYTE)emptyW, sizeof(emptyW)); + RegSetValueExW(hdrv, dependent_filesW, 0, REG_MULTI_SZ, (const BYTE*)emptyW, sizeof(emptyW)); while ((ptr != NULL) && (ptr[0])) { if (apd_copyfile(ptr, &apd)) { ptr += lstrlenW(ptr) + 1; @@ -1420,20 +1420,20 @@ static BOOL myAddPrinterDriverEx(DWORD level, LPBYTE pDriverInfo, DWORD dwFileCo RegSetValueExW(hdrv, monitorW, 0, REG_SZ, (LPBYTE) di.pMonitorName, (lstrlenW(di.pMonitorName)+1)* sizeof(WCHAR)); else - RegSetValueExW(hdrv, monitorW, 0, REG_SZ, (LPBYTE)emptyW, sizeof(emptyW)); + RegSetValueExW(hdrv, monitorW, 0, REG_SZ, (const BYTE*)emptyW, sizeof(emptyW)); if (di.pDefaultDataType) RegSetValueExW(hdrv, datatypeW, 0, REG_SZ, (LPBYTE) di.pDefaultDataType, (lstrlenW(di.pDefaultDataType)+1)* sizeof(WCHAR)); else - RegSetValueExW(hdrv, datatypeW, 0, REG_SZ, (LPBYTE)emptyW, sizeof(emptyW)); + RegSetValueExW(hdrv, datatypeW, 0, REG_SZ, (const BYTE*)emptyW, sizeof(emptyW)); /* settings for level 4 */ if (di.pszzPreviousNames) RegSetValueExW(hdrv, previous_namesW, 0, REG_MULTI_SZ, (LPBYTE) di.pszzPreviousNames, multi_sz_lenW(di.pszzPreviousNames)); else - RegSetValueExW(hdrv, previous_namesW, 0, REG_MULTI_SZ, (LPBYTE)emptyW, sizeof(emptyW)); + RegSetValueExW(hdrv, previous_namesW, 0, REG_MULTI_SZ, (const BYTE*)emptyW, sizeof(emptyW)); if (level > 5) TRACE("level %u for Driver %s is incomplete\n", level, debugstr_w(di.pName));

1 0

Mikhail Maroukhine : mmdevapi: Fix compiler warnings with flag -Wcast-qual.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: 8ca9621ecc45fbdc8fd543912c11a45a93cec0eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ca9621ecc45fbdc8fd543912… Author: Mikhail Maroukhine <mikolg(a)yandex.ru> Date: Sat Mar 27 18:46:35 2010 +0600 mmdevapi: Fix compiler warnings with flag -Wcast-qual. --- dlls/mmdevapi/devenum.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 9d1adb1..62855fa 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -170,8 +170,8 @@ static void MMDevice_Create(WCHAR *name, GUID *id, EDataFlow flow, DWORD state, PROPVARIANT pv; pv.vt = VT_LPWSTR; pv.u.pwszVal = name; - MMDevice_SetPropValue(id, flow, (PROPERTYKEY*)&DEVPKEY_Device_FriendlyName, &pv); - MMDevice_SetPropValue(id, flow, (PROPERTYKEY*)&DEVPKEY_Device_DeviceDesc, &pv); + MMDevice_SetPropValue(id, flow, (const PROPERTYKEY*)&DEVPKEY_Device_FriendlyName, &pv); + MMDevice_SetPropValue(id, flow, (const PROPERTYKEY*)&DEVPKEY_Device_DeviceDesc, &pv); RegCloseKey(keyprop); } RegCloseKey(key); @@ -653,7 +653,7 @@ HRESULT MMDevice_SetPropValue(const GUID *devguid, DWORD flow, REFPROPERTYKEY ke { case VT_UI4: { - ret = RegSetValueExW(regkey, buffer, 0, REG_DWORD, (BYTE*)&pv->u.ulVal, sizeof(DWORD)); + ret = RegSetValueExW(regkey, buffer, 0, REG_DWORD, (const BYTE*)&pv->u.ulVal, sizeof(DWORD)); break; } case VT_BLOB: @@ -665,7 +665,7 @@ HRESULT MMDevice_SetPropValue(const GUID *devguid, DWORD flow, REFPROPERTYKEY ke } case VT_LPWSTR: { - ret = RegSetValueExW(regkey, buffer, 0, REG_SZ, (BYTE*)pv->u.pwszVal, sizeof(WCHAR)*(1+lstrlenW(pv->u.pwszVal))); + ret = RegSetValueExW(regkey, buffer, 0, REG_SZ, (const BYTE*)pv->u.pwszVal, sizeof(WCHAR)*(1+lstrlenW(pv->u.pwszVal))); break; } default: @@ -735,7 +735,7 @@ HRESULT MMDevEnum_Create(REFIID riid, void **ppv) if (ret != ERROR_SUCCESS) continue; if (SUCCEEDED(CLSIDFromString(guidvalue, &guid)) - && SUCCEEDED(MMDevice_GetPropValue(&guid, curflow, (PROPERTYKEY*)&DEVPKEY_Device_FriendlyName, &pv)) + && SUCCEEDED(MMDevice_GetPropValue(&guid, curflow, (const PROPERTYKEY*)&DEVPKEY_Device_FriendlyName, &pv)) && pv.vt == VT_LPWSTR) { MMDevice_Create(pv.u.pwszVal, &guid, curflow,

1 0

Mikhail Maroukhine : advapi32: Fix compiler warnings with flag -Wcast-qual.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: 0490131783475e2575b766a9a76157d9e78406a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0490131783475e2575b766a9a… Author: Mikhail Maroukhine <mikolg(a)yandex.ru> Date: Fri Mar 26 21:50:51 2010 +0600 advapi32: Fix compiler warnings with flag -Wcast-qual. --- dlls/advapi32/service.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 7fea937..cce2af4 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -933,8 +933,8 @@ CreateServiceW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, { err = svcctl_CreateServiceW(hSCManager, lpServiceName, lpDisplayName, dwDesiredAccess, dwServiceType, dwStartType, dwErrorControl, - lpBinaryPathName, lpLoadOrderGroup, lpdwTagId, (LPBYTE)lpDependencies, - multisz_cb(lpDependencies), lpServiceStartName, (LPBYTE)lpPassword, passwdlen, + lpBinaryPathName, lpLoadOrderGroup, lpdwTagId, (const BYTE*)lpDependencies, + multisz_cb(lpDependencies), lpServiceStartName, (const BYTE*)lpPassword, passwdlen, (SC_RPC_HANDLE *)&handle); } __EXCEPT(rpc_filter)

1 0

Mikhail Maroukhine : appwiz.cpl: Fix compiler warnings with flag -Wcast-qual.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: 503563c950c94b305581bc9e8cf253960aacbcec URL: http://source.winehq.org/git/wine.git/?a=commit;h=503563c950c94b305581bc9e8… Author: Mikhail Maroukhine <mikolg(a)yandex.ru> Date: Fri Mar 26 22:17:28 2010 +0600 appwiz.cpl: Fix compiler warnings with flag -Wcast-qual. --- dlls/appwiz.cpl/appwiz.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/appwiz.cpl/appwiz.c b/dlls/appwiz.cpl/appwiz.c index bafd319..98b1019 100644 --- a/dlls/appwiz.cpl/appwiz.c +++ b/dlls/appwiz.cpl/appwiz.c @@ -556,7 +556,7 @@ static void UninstallProgram(int id, DWORD button) * hWnd - handle of dialog box * iDlgItem - ID of label in dialog box */ -static void SetInfoDialogText(HKEY hKey, LPWSTR lpKeyName, LPWSTR lpAltMessage, +static void SetInfoDialogText(HKEY hKey, LPCWSTR lpKeyName, LPCWSTR lpAltMessage, HWND hWnd, int iDlgItem) { WCHAR buf[MAX_STRING_LEN]; @@ -628,17 +628,17 @@ static BOOL CALLBACK SupportInfoDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPAR IDC_INFO_VERSION); /* And now update the data for those items in the registry */ - SetInfoDialogText(hkey, (LPWSTR) ContactW, notfound, hWnd, + SetInfoDialogText(hkey, ContactW, notfound, hWnd, IDC_INFO_CONTACT); - SetInfoDialogText(hkey, (LPWSTR) HelpLinkW, notfound, hWnd, + SetInfoDialogText(hkey, HelpLinkW, notfound, hWnd, IDC_INFO_SUPPORT); - SetInfoDialogText(hkey, (LPWSTR) HelpTelephoneW, notfound, hWnd, + SetInfoDialogText(hkey, HelpTelephoneW, notfound, hWnd, IDC_INFO_PHONE); - SetInfoDialogText(hkey, (LPWSTR) ReadmeW, notfound, hWnd, + SetInfoDialogText(hkey, ReadmeW, notfound, hWnd, IDC_INFO_README); - SetInfoDialogText(hkey, (LPWSTR) URLUpdateInfoW, notfound, hWnd, + SetInfoDialogText(hkey, URLUpdateInfoW, notfound, hWnd, IDC_INFO_UPDATES); - SetInfoDialogText(hkey, (LPWSTR) CommentsW, notfound, hWnd, + SetInfoDialogText(hkey, CommentsW, notfound, hWnd, IDC_INFO_COMMENTS); /* Update the main label with the app name */

1 0