Skip to content

Commit 715c125

Browse files
author
Zero3K
authored
Merge pull request #25 from DarkShadow44/master
Build eramui with wdk
2 parents 4c648da + ae957a3 commit 715c125

File tree

3 files changed

+30
-7
lines changed

3 files changed

+30
-7
lines changed

.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
*.log
2+
*.wrn
3+
*.err
4+
*.map
5+
i386/
6+
amd64

eramui/eramui.c

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262
#include <regstr.h>
6363
#include <setupapi.h>
6464
#include <dbt.h>
65+
#include <stdlib.h>
6566
#include "eramui.h"
6667

6768
#define RAMDISK_MEDIA_TYPE 0xf8 /* ERAM.H */
@@ -828,7 +829,7 @@ BOOL WINAPI SetRegOption(LPERAMREGOPT lpEramOpt)
828829
The results.
829830
*/
830831

831-
LONG __declspec(dllexport) CALLBACK CPlApplet(HWND hwndCPL, UINT uMsg, LPARAM lParam1, LPARAM lParam2)
832+
LONG CALLBACK CPlApplet(HWND hwndCPL, UINT uMsg, LPARAM lParam1, LPARAM lParam2)
832833
{
833834
switch (uMsg)
834835
{
@@ -843,7 +844,7 @@ LONG __declspec(dllexport) CALLBACK CPlApplet(HWND hwndCPL, UINT uMsg, LPARAM lP
843844
break;
844845
case CPL_DBLCLK: /* Double-clicked */
845846
/* Display the dialog */
846-
DialogBox(hgInstance, MAKEINTRESOURCE(IDD_SETUP), hwndCPL, StatusDlgProc);
847+
DialogBox(hgInstance, MAKEINTRESOURCE(IDD_SETUP), hwndCPL, (DLGPROC)StatusDlgProc);
847848
break;
848849
case CPL_STOP:
849850
break;
@@ -970,7 +971,7 @@ DWORD WINAPI WmNotify(HWND hDlg, INT idFrom, NMHDR FAR* pnmhdr)
970971
SetWindowLong(hDlg, DWLP_MSGRESULT, PSNRET_NOERROR);
971972
return TRUE;
972973
}
973-
return FORWARD_WM_NOTIFY(hDlg, idFrom, pnmhdr, DefWindowProc);
974+
return (DWORD)FORWARD_WM_NOTIFY(hDlg, idFrom, pnmhdr, DefWindowProc);
974975
}
975976

976977

@@ -1003,7 +1004,7 @@ VOID WINAPI WmDestroy(HWND hDlg)
10031004
The results.
10041005
*/
10051006

1006-
DWORD EXPORT WINAPI EramClassInstall(DI_FUNCTION diFctn, HDEVINFO hDevInfoSet, PSP_DEVINFO_DATA pDevInfoData)
1007+
DWORD WINAPI EramClassInstall(DI_FUNCTION diFctn, HDEVINFO hDevInfoSet, PSP_DEVINFO_DATA pDevInfoData)
10071008
{
10081009
/* Do default */
10091010
return ERROR_DI_DO_DEFAULT;
@@ -1020,7 +1021,7 @@ DWORD EXPORT WINAPI EramClassInstall(DI_FUNCTION diFctn, HDEVINFO hDevInfoSet, P
10201021
The results.
10211022
*/
10221023

1023-
BOOL EXPORT WINAPI EnumPropPages32(PSP_PROPSHEETPAGE_REQUEST pInfo, LPFNADDPROPSHEETPAGE lpfnAddPage, LPARAM lParam)
1024+
BOOL WINAPI EnumPropPages32(PSP_PROPSHEETPAGE_REQUEST pInfo, LPFNADDPROPSHEETPAGE lpfnAddPage, LPARAM lParam)
10241025
{
10251026
/* Local variable(s) */
10261027
PROPSHEETPAGE Setting;
@@ -1065,7 +1066,7 @@ BOOL EXPORT WINAPI EnumPropPages32(PSP_PROPSHEETPAGE_REQUEST pInfo, LPFNADDPROPS
10651066
None.
10661067
*/
10671068

1068-
VOID EXPORT CALLBACK EramUninstall(HWND hWnd, HINSTANCE hInstance, LPSTR lpszCmdLine, INT nCmdShow)
1069+
VOID CALLBACK EramUninstall(HWND hWnd, HINSTANCE hInstance, LPSTR lpszCmdLine, INT nCmdShow)
10691070
{
10701071
/* Local variable(s) */
10711072
SC_HANDLE hScm, hEram;
@@ -1400,7 +1401,7 @@ LPCSTR WINAPI GetEramClass(GUID* pGuid)
14001401
None.
14011402
*/
14021403

1403-
VOID EXPORT CALLBACK StartupFastfat(HWND hWnd, HINSTANCE hInstance, LPSTR lpszCmdLine, INT nCmdShow)
1404+
VOID CALLBACK StartupFastfat(HWND hWnd, HINSTANCE hInstance, LPSTR lpszCmdLine, INT nCmdShow)
14041405
{
14051406
/* Local variable(s) */
14061407
static WORD wTypes[] = {

eramui/sources

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# ERAM for Windows NT/2000/XP sources file
2+
TARGETNAME=eramui
3+
TARGETPATH=.
4+
TARGETTYPE=DYNLINK
5+
UMTYPE=windows
6+
INCLUDES=$(BASEDIR)\inc;$(BASEDIR)\src\storagej\inc
7+
386_WARNING_LEVEL=-W4
8+
USE_LIBCMT=1
9+
TARGETLIBS= \
10+
$(DDK_LIB_PATH)\comctl32.lib \
11+
$(DDK_LIB_PATH)\kernel32.lib \
12+
$(DDK_LIB_PATH)\user32.lib \
13+
$(DDK_LIB_PATH)\advapi32.lib
14+
SOURCES = eramui.c \
15+
eramui.rc
16+
LINKER_FLAGS=-MAP:eram.map

0 commit comments

Comments
 (0)