Skip to content

W
wine-cw
Commit 257c337c authored by Mike McCormack's avatar Mike McCormack Committed by Alexandre Julliard
Browse files
Options

gcc 4.0 -Wpointer-sign fixes (Reg* functions).

parent bb82cbb9
Show whitespace changes
Inline Side-by-side
Showing with 57 additions and 55 deletions
dlls/advapi32/registry.c
View file @ 257c337c
......@@ -694,7 +694,7 @@ DWORD WINAPI RegQueryMultipleValuesA(HKEY hkey, PVALENTA val_list, DWORD num_val
if(lpValueBuf != NULL && *ldwTotsize + val_list[i].ve_valuelen <= maxBytes)
{
status = RegQueryValueExA(hkey, val_list[i].ve_valuename, NULL, &val_list[i].ve_type,
bufptr, &val_list[i].ve_valuelen);
(LPBYTE)bufptr, &val_list[i].ve_valuelen);
if(status != ERROR_SUCCESS)
{
return status;
......@@ -739,7 +739,7 @@ DWORD WINAPI RegQueryMultipleValuesW(HKEY hkey, PVALENTW val_list, DWORD num_val
if(lpValueBuf != NULL && *ldwTotsize + val_list[i].ve_valuelen <= maxBytes)
{
status = RegQueryValueExW(hkey, val_list[i].ve_valuename, NULL, &val_list[i].ve_type,
bufptr, &val_list[i].ve_valuelen);
(LPBYTE)bufptr, &val_list[i].ve_valuelen);
if(status != ERROR_SUCCESS)
{
return status;
......
dlls/advapi32/tests/crypt.c
View file @ 257c337c
......@@ -362,7 +362,7 @@ static BOOL FindProvRegVals(DWORD dwIndex, DWORD *pdwProvType, LPSTR *pszProvNam
(*pcbProvName)++;
RegOpenKey(hKey, *pszProvName, &subkey);
RegQueryValueEx(subkey, "Type", NULL, NULL, (BYTE*)pdwProvType, &size);
RegQueryValueEx(subkey, "Type", NULL, NULL, (LPBYTE)pdwProvType, &size);
RegCloseKey(subkey);
RegCloseKey(hKey);
......@@ -485,7 +485,7 @@ static BOOL FindProvTypesRegVals(DWORD dwIndex, DWORD *pdwProvType, LPSTR *pszTy
if (!(*pszTypeName = ((LPSTR)LocalAlloc(LMEM_ZEROINIT, *pcbTypeName))))
return FALSE;
if (RegQueryValueEx(hSubKey, "TypeName", NULL, NULL, *pszTypeName, pcbTypeName))
if (RegQueryValueEx(hSubKey, "TypeName", NULL, NULL, (LPBYTE)*pszTypeName, pcbTypeName))
return FALSE;
RegCloseKey(hSubKey);
......@@ -612,7 +612,7 @@ static BOOL FindDfltProvRegVals(DWORD dwProvType, DWORD dwFlags, LPSTR *pszProvN
}
LocalFree(keyname);
if (RegQueryValueEx(hKey, "Name", NULL, NULL, *pszProvName, pcbProvName))
if (RegQueryValueEx(hKey, "Name", NULL, NULL, (LPBYTE)*pszProvName, pcbProvName))
{
if (GetLastError() != ERROR_MORE_DATA)
SetLastError(NTE_PROV_TYPE_ENTRY_BAD);
......@@ -622,7 +622,7 @@ static BOOL FindDfltProvRegVals(DWORD dwProvType, DWORD dwFlags, LPSTR *pszProvN
if (!(*pszProvName = LocalAlloc(LMEM_ZEROINIT, *pcbProvName)))
return FALSE;
if (RegQueryValueEx(hKey, "Name", NULL, NULL, *pszProvName, pcbProvName))
if (RegQueryValueEx(hKey, "Name", NULL, NULL, (LPBYTE)*pszProvName, pcbProvName))
{
if (GetLastError() != ERROR_MORE_DATA)
SetLastError(NTE_PROV_TYPE_ENTRY_BAD);
......
dlls/devenum/mediacatenum.c
View file @ 257c337c
......@@ -105,7 +105,7 @@ static HRESULT WINAPI DEVENUM_IPropertyBag_Read(
IErrorLog* pErrorLog)
{
LPVOID pData = NULL;
LONG received;
DWORD received;
DWORD type = 0;
RegPropBagImpl *This = (RegPropBagImpl *)iface;
HRESULT res = S_OK;
......@@ -124,7 +124,7 @@ static HRESULT WINAPI DEVENUM_IPropertyBag_Read(
pData = HeapAlloc(GetProcessHeap(), 0, received);
/* work around a GCC bug that occurs here unless we use the reswin32 variable as well */
reswin32 = RegQueryValueExW(This->hkey, pszPropName, NULL, &type, pData, &received);
reswin32 = RegQueryValueExW(This->hkey, pszPropName, NULL, &type, (LPBYTE)pData, &received);
res = HRESULT_FROM_WIN32(reswin32);
}
......
dlls/dmusic/dmusic.c
View file @ 257c337c
......@@ -214,7 +214,7 @@ HRESULT WINAPI IDirectMusic8Impl_GetDefaultPort (LPDIRECTMUSIC8 iface, LPGUID pg
TRACE("(%p, %p)\n", This, pguidPort);
if ((RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\DirectMusic\\Defaults" , 0, KEY_READ, &hkGUID) != ERROR_SUCCESS) ||
(RegQueryValueExA(hkGUID, "DefaultOutputPort", NULL, &returnTypeGUID, returnBuffer, &sizeOfReturnBuffer) != ERROR_SUCCESS))
(RegQueryValueExA(hkGUID, "DefaultOutputPort", NULL, &returnTypeGUID, (LPBYTE)returnBuffer, &sizeOfReturnBuffer) != ERROR_SUCCESS))
{
WARN(": registry entry missing\n" );
*pguidPort = CLSID_DirectMusicSynth;
......
dlls/dplayx/dplay.c
View file @ 257c337c
......@@ -3707,7 +3707,7 @@ static HRESULT WINAPI DirectPlay3AImpl_EnumConnections
}
if( RegQueryValueExA( hkServiceProvider, guidDataSubKey,
NULL, &returnTypeGUID, returnBuffer,
NULL, &returnTypeGUID, (LPBYTE)returnBuffer,
&sizeOfReturnBuffer ) != ERROR_SUCCESS )
{
ERR(": missing GUID registry data members\n" );
......@@ -3802,7 +3802,7 @@ static HRESULT WINAPI DirectPlay3AImpl_EnumConnections
}
if( RegQueryValueExA( hkServiceProvider, guidDataSubKey,
NULL, &returnTypeGUID, returnBuffer,
NULL, &returnTypeGUID, (LPBYTE)returnBuffer,
&sizeOfReturnBuffer ) != ERROR_SUCCESS )
{
ERR(": missing GUID registry data members\n" );
......@@ -4043,7 +4043,7 @@ static HMODULE DP_LoadSP( LPCGUID lpcGuid, LPSPINITDATA lpSpData, LPBOOL lpbIsDp
}
if( RegQueryValueExA( hkServiceProvider, guidDataSubKey,
NULL, &returnType, returnBuffer,
NULL, &returnType, (LPBYTE)returnBuffer,
&sizeOfReturnBuffer ) != ERROR_SUCCESS )
{
ERR(": missing GUID registry data members\n" );
......@@ -4072,7 +4072,7 @@ static HMODULE DP_LoadSP( LPCGUID lpcGuid, LPSPINITDATA lpSpData, LPBOOL lpbIsDp
/* Get dwReserved1 */
if( RegQueryValueExA( hkServiceProvider, majVerDataSubKey,
NULL, &returnType, returnBuffer,
NULL, &returnType, (LPBYTE)returnBuffer,
&sizeOfReturnBuffer ) != ERROR_SUCCESS )
{
ERR(": missing dwReserved1 registry data members\n") ;
......@@ -4086,7 +4086,7 @@ static HMODULE DP_LoadSP( LPCGUID lpcGuid, LPSPINITDATA lpSpData, LPBOOL lpbIsDp
/* Get dwReserved2 */
if( RegQueryValueExA( hkServiceProvider, minVerDataSubKey,
NULL, &returnType, returnBuffer,
NULL, &returnType, (LPBYTE)returnBuffer,
&sizeOfReturnBuffer ) != ERROR_SUCCESS )
{
ERR(": missing dwReserved1 registry data members\n") ;
......@@ -4100,7 +4100,7 @@ static HMODULE DP_LoadSP( LPCGUID lpcGuid, LPSPINITDATA lpSpData, LPBOOL lpbIsDp
/* Get the path for this service provider */
if( ( dwTemp = RegQueryValueExA( hkServiceProvider, pathSubKey,
NULL, NULL, returnBuffer,
NULL, NULL, (LPBYTE)returnBuffer,
&sizeOfReturnBuffer ) ) != ERROR_SUCCESS )
{
ERR(": missing PATH registry data members: 0x%08lx\n", dwTemp );
......
dlls/dplayx/dplobby.c
View file @ 257c337c
......@@ -783,7 +783,7 @@ static HRESULT WINAPI IDirectPlayLobbyAImpl_EnumAddressTypes
}
if( RegQueryValueExA( hkServiceProvider, guidDataSubKey,
NULL, &returnTypeGUID, returnBuffer,
NULL, &returnTypeGUID, (LPBYTE)returnBuffer,
&sizeOfReturnBuffer ) != ERROR_SUCCESS )
{
ERR(": missing GUID registry data members\n" );
......@@ -928,7 +928,7 @@ static HRESULT WINAPI IDirectPlayLobbyAImpl_EnumLocalApplications
}
if( RegQueryValueExA( hkServiceProvider, guidDataSubKey,
NULL, &returnTypeGUID, returnBuffer,
NULL, &returnTypeGUID, (LPBYTE)returnBuffer,
&sizeOfReturnBuffer ) != ERROR_SUCCESS )
{
ERR(": missing GUID registry data members\n" );
......@@ -1084,7 +1084,7 @@ static BOOL CALLBACK RunApplicationA_EnumLocalApplications
/* Get all the appropriate data from the registry */
if( RegQueryValueExA( lpData->This->dpl->hkCallbackKeyHack, clSubKey,
NULL, &returnType, returnBuffer,
NULL, &returnType, (LPBYTE)returnBuffer,
&sizeOfReturnBuffer ) != ERROR_SUCCESS )
{
ERR( ": missing CommandLine registry data member\n" );
......@@ -1098,7 +1098,7 @@ static BOOL CALLBACK RunApplicationA_EnumLocalApplications
sizeOfReturnBuffer = 200;
if( RegQueryValueExA( lpData->This->dpl->hkCallbackKeyHack, cdSubKey,
NULL, &returnType, returnBuffer,
NULL, &returnType, (LPBYTE)returnBuffer,
&sizeOfReturnBuffer ) != ERROR_SUCCESS )
{
ERR( ": missing CurrentDirectory registry data member\n" );
......@@ -1112,7 +1112,7 @@ static BOOL CALLBACK RunApplicationA_EnumLocalApplications
sizeOfReturnBuffer = 200;
if( RegQueryValueExA( lpData->This->dpl->hkCallbackKeyHack, fileSubKey,
NULL, &returnType, returnBuffer,
NULL, &returnType, (LPBYTE)returnBuffer,
&sizeOfReturnBuffer ) != ERROR_SUCCESS )
{
ERR( ": missing File registry data member\n" );
......@@ -1126,7 +1126,7 @@ static BOOL CALLBACK RunApplicationA_EnumLocalApplications
sizeOfReturnBuffer = 200;
if( RegQueryValueExA( lpData->This->dpl->hkCallbackKeyHack, pathSubKey,
NULL, &returnType, returnBuffer,
NULL, &returnType, (LPBYTE)returnBuffer,
&sizeOfReturnBuffer ) != ERROR_SUCCESS )
{
ERR( ": missing Path registry data member\n" );
......
dlls/dsound/dsound_main.c
View file @ 257c337c
......@@ -115,8 +115,8 @@ int ds_default_capture = 0;
inline static DWORD get_config_key( HKEY defkey, HKEY appkey, const char *name,
char *buffer, DWORD size )
{
if (appkey && !RegQueryValueExA( appkey, name, 0, NULL, buffer, &size )) return 0;
if (defkey && !RegQueryValueExA( defkey, name, 0, NULL, buffer, &size )) return 0;
if (appkey && !RegQueryValueExA( appkey, name, 0, NULL, (LPBYTE)buffer, &size )) return 0;
if (defkey && !RegQueryValueExA( defkey, name, 0, NULL, (LPBYTE)buffer, &size )) return 0;
return ERROR_FILE_NOT_FOUND;
}
......
dlls/iphlpapi/iphlpapi_main.c
View file @ 257c337c
......@@ -625,13 +625,13 @@ DWORD WINAPI GetAdaptersInfo(PIP_ADAPTER_INFO pAdapterInfo, PULONG pOutBufLen)
unsigned long addr;
RegQueryValueExA(hKey, "WinsServer", NULL, NULL,
primaryWINS.String, &size);
(LPBYTE)primaryWINS.String, &size);
addr = inet_addr(primaryWINS.String);
if (addr != INADDR_NONE && addr != INADDR_ANY)
winsEnabled = TRUE;
size = sizeof(secondaryWINS.String);
RegQueryValueExA(hKey, "BackupWinsServer", NULL, NULL,
secondaryWINS.String, &size);
(LPBYTE)secondaryWINS.String, &size);
addr = inet_addr(secondaryWINS.String);
if (addr != INADDR_NONE && addr != INADDR_ANY)
winsEnabled = TRUE;
......@@ -1385,7 +1385,7 @@ DWORD WINAPI GetNetworkParams(PFIXED_INFO pFixedInfo, PULONG pOutBufLen)
{
DWORD size = sizeof(pFixedInfo->ScopeId);
RegQueryValueExA(hKey, "ScopeID", NULL, NULL, pFixedInfo->ScopeId, &size);
RegQueryValueExA(hKey, "ScopeID", NULL, NULL, (LPBYTE)pFixedInfo->ScopeId, &size);
RegCloseKey(hKey);
}
......
dlls/mpr/pwcache.c
View file @ 257c337c
......@@ -108,7 +108,7 @@ DWORD WINAPI WNetCachePassword(
if( valname )
{
r = RegSetValueExA( hkey, valname, 0, REG_BINARY,
pbPassword, cbPassword );
(LPBYTE)pbPassword, cbPassword );
if( r )
r = WN_CANCEL;
else
......@@ -202,7 +202,7 @@ DWORD WINAPI WNetGetCachedPassword(
if( valname )
{
sz = *pcbPassword;
r = RegQueryValueExA( hkey, valname, 0, &type, pbPassword, &sz );
r = RegQueryValueExA( hkey, valname, 0, &type, (LPBYTE)pbPassword, &sz );
*pcbPassword = sz;
if( r )
r = WN_CANCEL;
......
dlls/netapi32/nbt.c
View file @ 257c337c
......@@ -1491,7 +1491,7 @@ void NetBTInit(void)
&& dword <= MAX_QUERY_TIMEOUT)
gWINSQueryTimeout = dword;
size = MAX_DOMAIN_NAME_LEN - 1;
if (RegQueryValueExW(hKey, ScopeIDW, NULL, NULL, gScopeID + 1, &size)
if (RegQueryValueExW(hKey, ScopeIDW, NULL, NULL, (LPBYTE)gScopeID + 1, &size)
== ERROR_SUCCESS)
{
/* convert into L2-encoded version, suitable for use by
......
dlls/oledlg/insobjdlg.c
View file @ 257c337c
......@@ -333,7 +333,8 @@ static void UIINSERTOBJECTDLG_SelectCreateFromFile(InsertObjectDlgInfo* pdlgInfo
*/
static BOOL UIINSERTOBJECTDLG_PopulateObjectTypes(InsertObjectDlgInfo* pdlgInfo)
{
DWORD i, len;
DWORD i;
LONG len;
HKEY hkclsids;
HKEY hkey;
CLSID clsid;
......
dlls/powrprof/powrprof.c
View file @ 257c337c
......@@ -147,7 +147,8 @@ BOOLEAN WINAPI GetPwrDiskSpindownRange(PUINT RangeMax, PUINT RangeMin)
{
HKEY hKey;
BYTE lpValue[40];
LONG cbValue = 40, r;
LONG r;
DWORD cbValue = sizeof(lpValue);
TRACE("(%p, %p)\n", RangeMax, RangeMin);
......@@ -179,7 +180,7 @@ BOOLEAN WINAPI GetPwrDiskSpindownRange(PUINT RangeMax, PUINT RangeMin)
*RangeMax = atoiW((LPCWSTR)lpValue);
}
cbValue = 40;
cbValue = sizeof(lpValue);
r = RegQueryValueExW(hKey, szDiskMin, 0, 0, lpValue, &cbValue);
if (r != ERROR_SUCCESS) {
......@@ -319,7 +320,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
TRACE("Couldn't open registry key HKLM\\%s, using some sane(?) defaults\n", debugstr_w(szPowerCfgSubKey));
} else {
BYTE lpValue[40];
LONG cbValue = 40;
DWORD cbValue = sizeof(lpValue);
r = RegQueryValueExW(hKey, szLastID, 0, 0, lpValue, &cbValue);
if (r != ERROR_SUCCESS) {
TRACE("Couldn't open registry entry HKLM\\%s\\LastID, using some sane(?) defaults\n", debugstr_w(szPowerCfgSubKey));
......
dlls/setupapi/virtcopy.c
View file @ 257c337c
......@@ -719,7 +719,7 @@ static RETERR16 VCP_UI_CopyStart(void)
if (RegSetValueExA(hKeyConflict, "Dirty", 0, REG_BINARY, (LPBYTE)&dirty, 1))
return VCPN_FAIL;
len = 12;
if (!(RegQueryValueExA(hKeyConflict, "BackupDirectory", NULL, 0, BackupDir, &len)))
if (!(RegQueryValueExA(hKeyConflict, "BackupDirectory", NULL, 0, (LPBYTE)BackupDir, &len)))
strcpy(BackupDir, "VCM");
/* create C:\WINDOWS\[BackupDir] and set registry key to it */
......
dlls/shlwapi/reg.c
View file @ 257c337c
......@@ -935,7 +935,7 @@ LONG WINAPI SHRegWriteUSValueA(HUSKEY hUSKey, LPCSTR pszValue, DWORD dwType,
LONG WINAPI SHRegWriteUSValueW(HUSKEY hUSKey, LPCWSTR pszValue, DWORD dwType,
LPVOID pvData, DWORD cbData, DWORD dwFlags)
{
LONG dummy;
DWORD dummy;
LPSHUSKEY hKey = (LPSHUSKEY)hUSKey;
LONG ret = ERROR_SUCCESS;
......
dlls/tapi32/line.c
View file @ 257c337c
......@@ -409,7 +409,7 @@ DWORD WINAPI lineGetCountryA(DWORD dwCountryID, DWORD dwAPIVersion, LPLINECOUNTR
lpLCE[i].dwCountryNameSize = size_name;
lpLCE[i].dwCountryNameOffset = dwOffset;
RegQueryValueExA(hsubkey, "Name", NULL, NULL,
((LPSTR)lpLineCountryList)+dwOffset,
((LPBYTE)lpLineCountryList)+dwOffset,
&size_name);
dwOffset += size_name;
......@@ -417,7 +417,7 @@ DWORD WINAPI lineGetCountryA(DWORD dwCountryID, DWORD dwAPIVersion, LPLINECOUNTR
lpLCE[i].dwSameAreaRuleSize = size_same;
lpLCE[i].dwSameAreaRuleOffset = dwOffset;
RegQueryValueExA(hsubkey, "SameAreaRule", NULL, NULL,
((LPSTR)lpLineCountryList)+dwOffset,
((LPBYTE)lpLineCountryList)+dwOffset,
&size_same);
dwOffset += size_same;
......@@ -425,7 +425,7 @@ DWORD WINAPI lineGetCountryA(DWORD dwCountryID, DWORD dwAPIVersion, LPLINECOUNTR
lpLCE[i].dwLongDistanceRuleSize = size_long;
lpLCE[i].dwLongDistanceRuleOffset = dwOffset;
RegQueryValueExA(hsubkey, "LongDistanceRule", NULL, NULL,
((LPSTR)lpLineCountryList)+dwOffset,
((LPBYTE)lpLineCountryList)+dwOffset,
&size_long);
dwOffset += size_long;
......@@ -433,7 +433,7 @@ DWORD WINAPI lineGetCountryA(DWORD dwCountryID, DWORD dwAPIVersion, LPLINECOUNTR
lpLCE[i].dwInternationalRuleSize = size_int;
lpLCE[i].dwInternationalRuleOffset = dwOffset;
RegQueryValueExA(hsubkey, "InternationalRule", NULL, NULL,
((LPSTR)lpLineCountryList)+dwOffset,
((LPBYTE)lpLineCountryList)+dwOffset,
&size_int);
dwOffset += size_int;
RegCloseKey(hsubkey);
......@@ -665,18 +665,18 @@ DWORD WINAPI lineGetTranslateCapsA(HLINEAPP hLineApp, DWORD dwAPIVersion,
BYTE buf[10];
numlocations = 1;
length += sizeof(LINELOCATIONENTRY) + 20 ;
RegSetValueExA( hsubkey, "AreaCode", 0, REG_SZ, "010", 4);
RegSetValueExA( hsubkey, "AreaCode", 0, REG_SZ, (LPBYTE)"010", 4);
GetLocaleInfoA( LOCALE_SYSTEM_DEFAULT, LOCALE_ICOUNTRY, buf, 8);
dwval = atoi(buf);
RegSetValueExA( hsubkey, "Country", 0, REG_DWORD, (LPBYTE)&dwval,
sizeof(DWORD));
RegSetValueExA( hsubkey, "DisableCallWaiting", 0, REG_SZ, "", 1);
RegSetValueExA( hsubkey, "DisableCallWaiting", 0, REG_SZ, (LPBYTE)"", 1);
dwval = 1;
RegSetValueExA( hsubkey, "Flags", 0, REG_DWORD, (LPBYTE)&dwval,
sizeof(DWORD));
RegSetValueExA( hsubkey, "LongDistanceAccess", 0, REG_SZ, "", 1);
RegSetValueExA( hsubkey, "Name", 0, REG_SZ, "New Location", 13);
RegSetValueExA( hsubkey, "OutsideAccess", 0, REG_SZ, "", 1);
RegSetValueExA( hsubkey, "LongDistanceAccess", 0, REG_SZ, (LPBYTE)"", 1);
RegSetValueExA( hsubkey, "Name", 0, REG_SZ, (LPBYTE)"New Location", 13);
RegSetValueExA( hsubkey, "OutsideAccess", 0, REG_SZ, (LPBYTE)"", 1);
RegCloseKey(hsubkey);
dwval = 1;
RegSetValueExA( hkLocations, "CurrentID", 0, REG_DWORD,
......@@ -723,13 +723,13 @@ DWORD WINAPI lineGetTranslateCapsA(HLINEAPP hLineApp, DWORD dwAPIVersion,
DWORD dwval;
numcards = 1;
length += sizeof(LINECARDENTRY) + 22 ;
RegSetValueExA( hsubkey, "Name", 0, REG_SZ, "None (Direct Call)", 19);
RegSetValueExA( hsubkey, "Name", 0, REG_SZ, (LPBYTE)"None (Direct Call)", 19);
dwval = 1;
RegSetValueExA( hsubkey, "Flags", 0, REG_DWORD, (LPBYTE)&dwval,
sizeof(DWORD));
RegSetValueExA( hsubkey, "InternationalRule", 0, REG_SZ, "", 1);
RegSetValueExA( hsubkey, "LDRule", 0, REG_SZ, "", 1);
RegSetValueExA( hsubkey, "LocalRule", 0, REG_SZ, "", 1);
RegSetValueExA( hsubkey, "InternationalRule", 0, REG_SZ, (LPBYTE)"", 1);
RegSetValueExA( hsubkey, "LDRule", 0, REG_SZ, (LPBYTE)"", 1);
RegSetValueExA( hsubkey, "LocalRule", 0, REG_SZ, (LPBYTE)"", 1);
RegCloseKey(hsubkey);
dwval = 2;
RegSetValueExA( hkCards, "NextID", 0, REG_DWORD, (LPBYTE)&dwval,
......
dlls/uxtheme/system.c
View file @ 257c337c
......@@ -99,7 +99,7 @@ static BOOL CALLBACK UXTHEME_broadcast_msg (HWND hWnd, LPARAM msg)
static void UXTHEME_LoadTheme(void)
{
HKEY hKey;
LONG buffsize;
DWORD buffsize;
HRESULT hr;
WCHAR tmp[10];
PTHEME_FILE pt;
......
dlls/wininet/urlcache.c
View file @ 257c337c
......@@ -2321,7 +2321,7 @@ BOOL WINAPI CommitUrlCacheEntryW(
if (header_info)
WideCharToMultiByte(CP_ACP, 0, lpHeaderInfo, -1, header_info, len, NULL, NULL);
if (CommitUrlCacheEntryInternal(lpszUrlName, lpszLocalFileName, ExpireTime, LastModifiedTime,
CacheEntryType, header_info, len, lpszFileExtension, lpszOriginalUrl))
CacheEntryType, (LPBYTE)header_info, len, lpszFileExtension, lpszOriginalUrl))
{
bSuccess = TRUE;
}
......
dlls/winmm/winealsa/audio.c
View file @ 257c337c
......@@ -438,7 +438,7 @@ static int ALSA_RegGetString(HKEY key, const char *value, char **bufp)
if (! *bufp)
return 1;
rc = RegQueryValueExA(key, value, NULL, NULL, *bufp, &bufsize);
rc = RegQueryValueExA(key, value, NULL, NULL, (LPBYTE)*bufp, &bufsize);
return rc;
}
......
programs/regedit/edit.c
View file @ 257c337c
......@@ -228,7 +228,7 @@ static LPTSTR read_value(HWND hwnd, HKEY hKey, LPCTSTR valueName, DWORD *lpType,
error(hwnd, IDS_TOO_BIG_VALUE, valueDataLen);
goto done;
}
lRet = RegQueryValueEx(hKey, valueName, 0, 0, buffer, &valueDataLen);
lRet = RegQueryValueEx(hKey, valueName, 0, 0, (LPBYTE)buffer, &valueDataLen);
if (lRet != ERROR_SUCCESS) {
error(hwnd, IDS_BAD_VALUE, valueName);
goto done;
......@@ -300,7 +300,7 @@ BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCTSTR keyPath, LPCTSTR valueName)
if ( (type == REG_SZ) || (type == REG_EXPAND_SZ) ) {
if (DialogBox(0, MAKEINTRESOURCE(IDD_EDIT_STRING), hwnd, modify_dlgproc) == IDOK) {
lRet = RegSetValueEx(hKey, valueName, 0, type, stringValueData, lstrlen(stringValueData) + 1);
lRet = RegSetValueEx(hKey, valueName, 0, type, (LPBYTE)stringValueData, lstrlen(stringValueData) + 1);
if (lRet == ERROR_SUCCESS) result = TRUE;
else error_code_messagebox(hwnd, lRet);
}
......
programs/winebrowser/main.c
View file @ 257c337c
......@@ -85,7 +85,7 @@ int main (int argc, char *argv[])
return 1;
}
r = RegQueryValueExA( hkey, "Browsers", 0, &type, szBrowsers, &maxLength);
r = RegQueryValueExA( hkey, "Browsers", 0, &type, (LPBYTE)szBrowsers, &maxLength);
if(r != ERROR_SUCCESS)
{
/* set value to the default */
......
programs/winedbg/winedbg.c
View file @ 257c337c
......@@ -181,7 +181,7 @@ static unsigned dbg_load_internal_vars(void)
if (!dbg_internal_vars[i].pval)
{
if (!RegQueryValueEx(hkey, dbg_internal_vars[i].name, 0,
&type, (LPSTR)&val, &count))
&type, (LPBYTE)&val, &count))
dbg_internal_vars[i].val = val;
dbg_internal_vars[i].pval = &dbg_internal_vars[i].val;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment