summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristophe Fergeau <cfergeau@redhat.com>2012-02-21 22:41:17 +0100
committerChristophe Fergeau <cfergeau@redhat.com>2012-02-21 22:41:17 +0100
commit04876e2ccefc6575b828721f293aef8fbbc53934 (patch)
tree275a84370643d2e4381642c0845a082b2a64a0b2
parentc63032b6f054a40e16c0a70a646960b38393e12c (diff)
mingw: adjust Drv* declaration to what mingw expects
It needs an additional APIENTRY in the declaration, hopefully this is valid too with vc++
-rw-r--r--display/driver.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/display/driver.c b/display/driver.c
index c069ad0..7c9e027 100644
--- a/display/driver.c
+++ b/display/driver.c
@@ -237,7 +237,7 @@ static void mspace_abort(void *user_data)
EngDebugBreak();
}
-BOOL DrvEnableDriver(ULONG engine_version, ULONG enable_data_size, PDRVENABLEDATA enable_data)
+BOOL APIENTRY DrvEnableDriver(ULONG engine_version, ULONG enable_data_size, PDRVENABLEDATA enable_data)
{
DEBUG_PRINT((NULL, 1, "%s\n", __FUNCTION__));
enable_data->iDriverVersion = DDI_DRIVER_VERSION_NT5;
@@ -254,7 +254,7 @@ BOOL DrvEnableDriver(ULONG engine_version, ULONG enable_data_size, PDRVENABLEDAT
return TRUE;
}
-VOID DrvDisableDriver(VOID)
+VOID APIENTRY DrvDisableDriver(VOID)
{
DEBUG_PRINT((NULL, 1, "%s\n", __FUNCTION__));
ResetAllDevices();
@@ -478,9 +478,9 @@ BOOL InitPalette(PDev *pdev, DEVINFO *dev_info)
return TRUE;
}
-DHPDEV DrvEnablePDEV(DEVMODEW *dev_mode, PWSTR ignore1, ULONG ignore2, HSURF *ignore3,
- ULONG dev_caps_size, ULONG *dev_caps, ULONG dev_inf_size,
- DEVINFO *in_dev_info, HDEV gdi_dev, PWSTR device_name, HANDLE driver)
+DHPDEV APIENTRY DrvEnablePDEV(DEVMODEW *dev_mode, PWSTR ignore1, ULONG ignore2, HSURF *ignore3,
+ ULONG dev_caps_size, ULONG *dev_caps, ULONG dev_inf_size,
+ DEVINFO *in_dev_info, HDEV gdi_dev, PWSTR device_name, HANDLE driver)
{
PDev *pdev;
GDIINFO gdi_info;
@@ -531,7 +531,7 @@ err1:
return NULL;
}
-VOID DrvDisablePDEV(DHPDEV in_pdev)
+VOID APIENTRY DrvDisablePDEV(DHPDEV in_pdev)
{
PDev* pdev = (PDev*)in_pdev;
@@ -542,7 +542,7 @@ VOID DrvDisablePDEV(DHPDEV in_pdev)
DEBUG_PRINT((NULL, 1, "%s: 0x%lx exit\n", __FUNCTION__, pdev));
}
-VOID DrvCompletePDEV(DHPDEV in_pdev, HDEV gdi_dev)
+VOID APIENTRY DrvCompletePDEV(DHPDEV in_pdev, HDEV gdi_dev)
{
PDev* pdev = (PDev*)in_pdev;
@@ -825,7 +825,7 @@ VOID EnableQXLPrimarySurface(PDev *pdev)
pdev->surf_enable = TRUE;
}
-HSURF DrvEnableSurface(DHPDEV in_pdev)
+HSURF APIENTRY DrvEnableSurface(DHPDEV in_pdev)
{
PDev *pdev;
HSURF surf;
@@ -887,7 +887,7 @@ VOID DisableQXLAllSurfaces(PDev *pdev)
DestroyAllSurfaces(pdev);
}
-VOID DrvDisableSurface(DHPDEV in_pdev)
+VOID APIENTRY DrvDisableSurface(DHPDEV in_pdev)
{
PDev *pdev = (PDev*)in_pdev;
DrawArea drawarea;
@@ -912,7 +912,7 @@ VOID DrvDisableSurface(DHPDEV in_pdev)
DEBUG_PRINT((NULL, 1, "%s: 0x%lx exit\n", __FUNCTION__, pdev));
}
-BOOL DrvAssertMode(DHPDEV in_pdev, BOOL enable)
+BOOL APIENTRY DrvAssertMode(DHPDEV in_pdev, BOOL enable)
{
PDev* pdev = (PDev*)in_pdev;
@@ -929,7 +929,7 @@ BOOL DrvAssertMode(DHPDEV in_pdev, BOOL enable)
return TRUE;
}
-ULONG DrvGetModes(HANDLE driver, ULONG dev_modes_size, DEVMODEW *dev_modes)
+ULONG APIENTRY DrvGetModes(HANDLE driver, ULONG dev_modes_size, DEVMODEW *dev_modes)
{
PVIDEO_MODE_INFORMATION video_modes;
PVIDEO_MODE_INFORMATION curr_video_mode;
@@ -1003,7 +1003,7 @@ ULONG DrvGetModes(HANDLE driver, ULONG dev_modes_size, DEVMODEW *dev_modes)
return output_size;
}
-VOID DrvSynchronize(DHPDEV in_pdev, RECTL *ignored)
+VOID APIENTRY DrvSynchronize(DHPDEV in_pdev, RECTL *ignored)
{
PDev* pdev = (PDev*)in_pdev;
int notify;