fixed some more warnings

svn path=/trunk/; revision=15200
This commit is contained in:
Thomas Bluemel 2005-05-10 08:15:08 +00:00
parent e55b576d82
commit fa832dae41
6 changed files with 10 additions and 9 deletions

View file

@ -131,7 +131,7 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
* WM_DESTROY - post a quit message and return
*
*/
INT_PTR CALLBACK
LRESULT CALLBACK
ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
{
static short last_split;

View file

@ -642,7 +642,7 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
*
*/
INT_PTR CALLBACK
LRESULT CALLBACK
FrameWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
{
switch (message) {

View file

@ -21,6 +21,7 @@
#define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from Windows headers */
#include <windows.h>
#include <commctrl.h>
#include <stdio.h>
#include <tchar.h>
#include "hexedit.h"

View file

@ -80,10 +80,10 @@ extern TCHAR szChildClass[];
extern void ShowAboutBox(HWND hWnd);
/* childwnd.c */
extern INT_PTR CALLBACK ChildWndProc(HWND, UINT, WPARAM, LPARAM);
extern LRESULT CALLBACK ChildWndProc(HWND, UINT, WPARAM, LPARAM);
/* framewnd.c */
extern INT_PTR CALLBACK FrameWndProc(HWND, UINT, WPARAM, LPARAM);
extern LRESULT CALLBACK FrameWndProc(HWND, UINT, WPARAM, LPARAM);
extern void SetupStatusBar(HWND hWnd, BOOL bResize);
extern void UpdateStatusBar(void);

View file

@ -231,7 +231,7 @@ char* convertHexToDWORDStr(BYTE *buf, ULONG bufLen)
DWORD convertHexCSVToHex(char *str, BYTE *buf, ULONG bufLen)
{
char *s = str; /* Pointer to current */
char *b = buf; /* Pointer to result */
char *b = (char*)buf; /* Pointer to result */
ULONG strLen = strlen(str);
ULONG strPos = 0;
@ -405,7 +405,7 @@ HRESULT setValue(LPSTR val_name, LPSTR val_data)
}
dwLen++;
REGPROC_unescape_string(val_data);
lpbData = val_data;
lpbData = (LPBYTE)val_data;
} else if (dwParseType == REG_DWORD) /* Convert the dword types */
{
dwLen = convertHexToDWord(val_data, convert);
@ -1195,7 +1195,7 @@ void export_hkey(FILE *file, HKEY key,
case REG_SZ:
case REG_EXPAND_SZ:
fputs("\"", file);
REGPROC_export_string(file, *val_buf);
REGPROC_export_string(file, (CHAR*)*val_buf);
fputs("\"\n", file);
break;

View file

@ -104,7 +104,7 @@ CRegKeySecurity_fnQueryInterface(LPREGKEYSECURITY this,
ULONG STDMETHODCALLTYPE
CRegKeySecurity_fnAddRef(LPREGKEYSECURITY this)
{
return (ULONG)InterlockedIncrement(&this->ref);
return (ULONG)InterlockedIncrement((LONG*)&this->ref);
}
ULONG STDMETHODCALLTYPE
@ -112,7 +112,7 @@ CRegKeySecurity_fnRelease(LPREGKEYSECURITY this)
{
ULONG rfc;
rfc = (ULONG)InterlockedDecrement(&this->ref);
rfc = (ULONG)InterlockedDecrement((LONG*)&this->ref);
if(rfc == 0)
{
HeapFree(GetProcessHeap(), 0, this);