[MMIXER] Fix additional data size initialization for different audio formats (#6753)

[reactos.git] / base / applications / regedit / hexedit.c

diff --git a/base/applications/regedit/hexedit.c b/base/applications/regedit/hexedit.c
index 209287a..8c63ff7 100644 (file)
--- a/base/applications/regedit/hexedit.c
+++ b/base/applications/regedit/hexedit.c
@@ -18,7 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <regedit.h>
+#include "regedit.h"
+
 typedef struct
 {
     HWND hWndSelf;
@@ -61,7 +62,7 @@ static UINT ClipboardFormatID = 0;
 #define HEHT_ASCIIDUMP      (0x6)
 #define HEHT_RIGHTMARGIN    (0x7)
 
-INT_PTR CALLBACK HexEditWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
+LRESULT CALLBACK HexEditWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
 
 ATOM
 WINAPI
@@ -74,7 +75,7 @@ RegisterHexEditorClass(HINSTANCE hInstance)
     ZeroMemory(&WndClass, sizeof(WNDCLASSEXW));
     WndClass.cbSize = sizeof(WNDCLASSEXW);
     WndClass.style = CS_DBLCLKS;
-    WndClass.lpfnWndProc = (WNDPROC)HexEditWndProc;
+    WndClass.lpfnWndProc = HexEditWndProc;
     WndClass.cbWndExtra = sizeof(PHEXEDIT_DATA);
     WndClass.hInstance = hInstance;
     WndClass.hCursor = LoadCursorW(NULL, IDC_IBEAM);
@@ -1414,13 +1415,13 @@ HEXEDIT_WM_CONTEXTMENU(PHEXEDIT_DATA hed, INT x, INT y)
     PostMessageW(hed->hWndSelf, WM_NULL, 0, 0);
 }
 
-INT_PTR CALLBACK
+LRESULT CALLBACK
 HexEditWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     PHEXEDIT_DATA hed;
     POINTS p;
 
-    hed = (PHEXEDIT_DATA)(LONG_PTR)GetWindowLongPtr(hWnd, (DWORD_PTR)0);
+    hed = (PHEXEDIT_DATA)GetWindowLongPtr(hWnd, (DWORD_PTR)0);
     switch(uMsg)
     {
     case WM_ERASEBKGND:
@@ -1551,4 +1552,3 @@ HexEditWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 
     return DefWindowProcW(hWnd, uMsg, wParam, lParam);
 }
-