Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-29 01:12:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

[VFDLIB] More 64 bit fixes

Browse source
This commit is contained in:
Timo Kreuzer 2018-02-28 07:05:59 +01:00
parent 0182dcd71b
commit 643e6bf382
5 changed files with 33 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
modules/rosapps/lib/vfdlib/vfdguiopen.c
View file

@ -47,7 +47,11 @@
// //
// local functions // local functions
// //
#ifndef __REACTOS__
static INT CALLBACK OpenDialogProc( static INT CALLBACK OpenDialogProc(
#else
static INT_PTR CALLBACK OpenDialogProc(
#endif
HWND hDlg, HWND hDlg,
UINT uMsg, UINT uMsg,
WPARAM wParam, WPARAM wParam,
@ -89,7 +93,11 @@ DWORD WINAPI VfdGuiOpen(
// //
// Open image dialog procedure // Open image dialog procedure
// //
#ifndef __REACTOS__
INT CALLBACK OpenDialogProc( INT CALLBACK OpenDialogProc(
#else
INT_PTR CALLBACK OpenDialogProc(
#endif
HWND hDlg, HWND hDlg,
UINT uMsg, UINT uMsg,
WPARAM wParam, WPARAM wParam,

8
modules/rosapps/lib/vfdlib/vfdguisave.c
View file

@ -35,7 +35,11 @@
// //
// local functions // local functions
// //
#ifndef __REACTOS__
static INT CALLBACK SaveDialogProc( static INT CALLBACK SaveDialogProc(
#else
static INT_PTR CALLBACK SaveDialogProc(
#endif
HWND hDlg, HWND hDlg,
UINT uMsg, UINT uMsg,
WPARAM wParam, WPARAM wParam,
@ -119,7 +123,11 @@ DWORD GuiSaveParam(
// //
// The dialog procedure // The dialog procedure
// //
#ifndef __REACTOS__
INT CALLBACK SaveDialogProc( INT CALLBACK SaveDialogProc(
#else
INT_PTR CALLBACK SaveDialogProc(
#endif
HWND hDlg, HWND hDlg,
UINT uMsg, UINT uMsg,
WPARAM wParam, WPARAM wParam,

4
modules/rosapps/lib/vfdlib/vfdshext.h
View file

@ -67,7 +67,11 @@ public:
LPCMINVOKECOMMANDINFO lpcmi); LPCMINVOKECOMMANDINFO lpcmi);
STDMETHODIMP GetCommandString( STDMETHODIMP GetCommandString(
#ifndef __REACTOS__
UINT idCmd, UINT idCmd,
#else
UINT_PTR idCmd,
#endif
UINT uFlags, UINT uFlags,
UINT *reserved, UINT *reserved,
LPSTR pszName, LPSTR pszName,

4
modules/rosapps/lib/vfdlib/vfdshmenu.cpp
View file

@ -267,7 +267,11 @@ STDMETHODIMP CVfdShExt::QueryContextMenu(
// //
STDMETHODIMP CVfdShExt::GetCommandString( STDMETHODIMP CVfdShExt::GetCommandString(
#ifndef __REACTOS__
UINT idCmd, UINT idCmd,
#else
UINT_PTR idCmd,
#endif
UINT uFlags, UINT uFlags,
UINT *reserved, UINT *reserved,
LPSTR pszName, LPSTR pszName,

9
modules/rosapps/lib/vfdlib/vfdshprop.cpp
View file

@ -237,7 +237,11 @@ void OnControl(
CHAR module_path[MAX_PATH]; CHAR module_path[MAX_PATH];
CHAR full_path[MAX_PATH]; CHAR full_path[MAX_PATH];
PSTR file_name; PSTR file_name;
#ifndef __REACTOS__
DWORD ret; DWORD ret;
#else
DWORD_PTR ret;
#endif
ret = GetModuleFileName( ret = GetModuleFileName(
g_hDllModule, module_path, sizeof(module_path)); g_hDllModule, module_path, sizeof(module_path));
@ -258,8 +262,13 @@ void OnControl(
VFDTRACE(0, ("Starting %s\n", full_path)); VFDTRACE(0, ("Starting %s\n", full_path));
#ifndef __REACTOS__
ret = (DWORD)ShellExecute( ret = (DWORD)ShellExecute(
hDlg, NULL, full_path, NULL, NULL, SW_SHOW); 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) { if (ret > 32) {
PropSheet_PressButton(GetParent(hDlg), PSBTN_CANCEL); PropSheet_PressButton(GetParent(hDlg), PSBTN_CANCEL);