fixed some more warnings Modified: trunk/reactos/subsys/system/regedit/childwnd.c Modified: trunk/reactos/subsys/system/regedit/framewnd.c Modified: trunk/reactos/subsys/system/regedit/hexedit.c Modified: trunk/reactos/subsys/system/regedit/main.h Modified: trunk/reactos/subsys/system/regedit/regproc.c Modified: trunk/reactos/subsys/system/regedit/security.c _____
Modified: trunk/reactos/subsys/system/regedit/childwnd.c --- trunk/reactos/subsys/system/regedit/childwnd.c 2005-05-10 08:04:08 UTC (rev 15199) +++ trunk/reactos/subsys/system/regedit/childwnd.c 2005-05-10 08:15:08 UTC (rev 15200) @@ -131,7 +131,7 @@
* 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; _____
Modified: trunk/reactos/subsys/system/regedit/framewnd.c --- trunk/reactos/subsys/system/regedit/framewnd.c 2005-05-10 08:04:08 UTC (rev 15199) +++ trunk/reactos/subsys/system/regedit/framewnd.c 2005-05-10 08:15:08 UTC (rev 15200) @@ -642,7 +642,7 @@
* */
-INT_PTR CALLBACK +LRESULT CALLBACK FrameWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { switch (message) { _____
Modified: trunk/reactos/subsys/system/regedit/hexedit.c --- trunk/reactos/subsys/system/regedit/hexedit.c 2005-05-10 08:04:08 UTC (rev 15199) +++ trunk/reactos/subsys/system/regedit/hexedit.c 2005-05-10 08:15:08 UTC (rev 15200) @@ -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" _____
Modified: trunk/reactos/subsys/system/regedit/main.h --- trunk/reactos/subsys/system/regedit/main.h 2005-05-10 08:04:08 UTC (rev 15199) +++ trunk/reactos/subsys/system/regedit/main.h 2005-05-10 08:15:08 UTC (rev 15200) @@ -80,10 +80,10 @@
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);
_____
Modified: trunk/reactos/subsys/system/regedit/regproc.c --- trunk/reactos/subsys/system/regedit/regproc.c 2005-05-10 08:04:08 UTC (rev 15199) +++ trunk/reactos/subsys/system/regedit/regproc.c 2005-05-10 08:15:08 UTC (rev 15200) @@ -231,7 +231,7 @@
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 @@ } 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 @@ 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;
_____
Modified: trunk/reactos/subsys/system/regedit/security.c --- trunk/reactos/subsys/system/regedit/security.c 2005-05-10 08:04:08 UTC (rev 15199) +++ trunk/reactos/subsys/system/regedit/security.c 2005-05-10 08:15:08 UTC (rev 15200) @@ -104,7 +104,7 @@
ULONG STDMETHODCALLTYPE CRegKeySecurity_fnAddRef(LPREGKEYSECURITY this) { - return (ULONG)InterlockedIncrement(&this->ref); + return (ULONG)InterlockedIncrement((LONG*)&this->ref); }
ULONG STDMETHODCALLTYPE @@ -112,7 +112,7 @@ { ULONG rfc;
- rfc = (ULONG)InterlockedDecrement(&this->ref); + rfc = (ULONG)InterlockedDecrement((LONG*)&this->ref); if(rfc == 0) { HeapFree(GetProcessHeap(), 0, this);