[ros-diffs] 02/02: [VFDLIB] More 64 bit fixes

[Timo Kreuzer]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=643e6bf382c7aa12a6a947...

commit 643e6bf382c7aa12a6a947ee5653e29d6528ffca
Author:     Timo Kreuzer [e-mail]
AuthorDate: Wed Feb 28 07:05:59 2018 +0100
Commit:     Timo Kreuzer [e-mail]
CommitDate: Sun Mar 4 16:27:07 2018 +0100

[VFDLIB] More 64 bit fixes
---
 modules/rosapps/lib/vfdlib/vfdguiopen.c  | 8 ++++++++
 modules/rosapps/lib/vfdlib/vfdguisave.c  | 8 ++++++++
 modules/rosapps/lib/vfdlib/vfdshext.h    | 4 ++++
 modules/rosapps/lib/vfdlib/vfdshmenu.cpp | 4 ++++
 modules/rosapps/lib/vfdlib/vfdshprop.cpp | 9 +++++++++
 5 files changed, 33 insertions(+)

diff --git a/modules/rosapps/lib/vfdlib/vfdguiopen.c b/modules/rosapps/lib/vfdlib/vfdguiopen.c
index d67281c2f4..11d7bab315 100644
--- a/modules/rosapps/lib/vfdlib/vfdguiopen.c
+++ b/modules/rosapps/lib/vfdlib/vfdguiopen.c
@@ -47,7 +47,11 @@
 //
 //	local functions
 //
+#ifndef __REACTOS__
 static INT CALLBACK OpenDialogProc(
+#else
+static INT_PTR CALLBACK OpenDialogProc(
+#endif
    HWND			hDlg,
    UINT			uMsg,
    WPARAM			wParam,
@@ -89,7 +93,11 @@ DWORD WINAPI VfdGuiOpen(
 //
 // Open image dialog procedure
 //
+#ifndef __REACTOS__
 INT CALLBACK OpenDialogProc(
+#else
+INT_PTR CALLBACK OpenDialogProc(
+#endif
    HWND			hDlg,
    UINT			uMsg,
    WPARAM			wParam,
diff --git a/modules/rosapps/lib/vfdlib/vfdguisave.c b/modules/rosapps/lib/vfdlib/vfdguisave.c
index 0a9aa3ae02..ff1d39566f 100644
--- a/modules/rosapps/lib/vfdlib/vfdguisave.c
+++ b/modules/rosapps/lib/vfdlib/vfdguisave.c
@@ -35,7 +35,11 @@
 //
 //	local functions
 //
+#ifndef __REACTOS__
 static INT CALLBACK SaveDialogProc(
+#else
+static INT_PTR CALLBACK SaveDialogProc(
+#endif
    HWND			hDlg,
    UINT			uMsg,
    WPARAM			wParam,
@@ -119,7 +123,11 @@ DWORD GuiSaveParam(
 //
 // The dialog procedure
 //
+#ifndef __REACTOS__
 INT CALLBACK SaveDialogProc(
+#else
+INT_PTR CALLBACK SaveDialogProc(
+#endif
    HWND			hDlg,
    UINT			uMsg,
    WPARAM			wParam,
diff --git a/modules/rosapps/lib/vfdlib/vfdshext.h b/modules/rosapps/lib/vfdlib/vfdshext.h
index 7379cb50cd..728aaec6dc 100644
--- a/modules/rosapps/lib/vfdlib/vfdshext.h
+++ b/modules/rosapps/lib/vfdlib/vfdshext.h
@@ -67,7 +67,11 @@ public:
    	LPCMINVOKECOMMANDINFO lpcmi);

STDMETHODIMP GetCommandString(
+#ifndef __REACTOS__
    	UINT			idCmd,
+#else
+        UINT_PTR		idCmd,
+#endif
    	UINT			uFlags,
    	UINT			*reserved,
    	LPSTR			pszName,
diff --git a/modules/rosapps/lib/vfdlib/vfdshmenu.cpp b/modules/rosapps/lib/vfdlib/vfdshmenu.cpp
index 3bce66a907..005a6e352d 100644
--- a/modules/rosapps/lib/vfdlib/vfdshmenu.cpp
+++ b/modules/rosapps/lib/vfdlib/vfdshmenu.cpp
@@ -267,7 +267,11 @@ STDMETHODIMP CVfdShExt::QueryContextMenu(
 //

STDMETHODIMP CVfdShExt::GetCommandString(
+#ifndef __REACTOS__
    UINT			idCmd,
+#else
+    UINT_PTR		idCmd,
+#endif
    UINT			uFlags,
    UINT			*reserved,
    LPSTR			pszName,
diff --git a/modules/rosapps/lib/vfdlib/vfdshprop.cpp b/modules/rosapps/lib/vfdlib/vfdshprop.cpp
index acb9d0cebe..0fada652b8 100644
--- a/modules/rosapps/lib/vfdlib/vfdshprop.cpp
+++ b/modules/rosapps/lib/vfdlib/vfdshprop.cpp
@@ -237,7 +237,11 @@ void OnControl(
    CHAR			module_path[MAX_PATH];
    CHAR			full_path[MAX_PATH];
    PSTR			file_name;
+#ifndef __REACTOS__
    DWORD			ret;
+#else
+	DWORD_PTR		ret;
+#endif

ret = GetModuleFileName(
    	g_hDllModule, module_path, sizeof(module_path));
@@ -258,8 +262,13 @@ void OnControl(

VFDTRACE(0, ("Starting %s\n", full_path));

+#ifndef __REACTOS__
    ret = (DWORD)ShellExecute(
    	hDlg, NULL, full_path, NULL, NULL, SW_SHOW);
+#else
+	ret = (DWORD_PTR)ShellExecute(
+		hDlg, NULL, full_path, NULL, NULL, SW_SHOW);
+#endif

if (ret > 32) {
    	PropSheet_PressButton(GetParent(hDlg), PSBTN_CANCEL);