[ros-diffs] [sserapion] 40125: Fix 64bit build.
sserapion at svn.reactos.org
sserapion at svn.reactos.org
Fri Mar 20 10:34:47 CET 2009
Author: sserapion
Date: Fri Mar 20 12:34:46 2009
New Revision: 40125
URL: http://svn.reactos.org/svn/reactos?rev=40125&view=rev
Log:
Fix 64bit build.
Modified:
branches/ros-amd64-bringup/reactos/dll/win32/mmdrv/common.c
branches/ros-amd64-bringup/reactos/dll/win32/mmdrv/kernel.c
branches/ros-amd64-bringup/reactos/dll/win32/mmdrv/mmdrv.h
branches/ros-amd64-bringup/reactos/dll/win32/mmdrv/mme.c
branches/ros-amd64-bringup/reactos/dll/win32/mmdrv/session.c
branches/ros-amd64-bringup/reactos/dll/win32/mmdrv/wave.c
Modified: branches/ros-amd64-bringup/reactos/dll/win32/mmdrv/common.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/win32/mmdrv/common.c?rev=40125&r1=40124&r2=40125&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/mmdrv/common.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/mmdrv/common.c [iso-8859-1] Fri Mar 20 12:34:46 2009
@@ -80,8 +80,8 @@
DWORD
GetDeviceCapabilities(
DeviceType device_type,
- DWORD device_id,
- PVOID capabilities,
+ UINT device_id,
+ DWORD_PTR capabilities,
DWORD capabilities_size)
{
MMRESULT result;
@@ -149,10 +149,10 @@
DWORD
OpenDevice(
DeviceType device_type,
- DWORD device_id,
+ UINT device_id,
PVOID open_descriptor,
DWORD flags,
- DWORD private_handle)
+ DWORD_PTR private_handle)
{
SessionInfo* session_info;
MMRESULT result;
@@ -234,7 +234,7 @@
DWORD
CloseDevice(
- DWORD private_handle)
+ DWORD_PTR private_handle)
{
MMRESULT result;
SessionInfo* session_info = (SessionInfo*) private_handle;
Modified: branches/ros-amd64-bringup/reactos/dll/win32/mmdrv/kernel.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/win32/mmdrv/kernel.c?rev=40125&r1=40124&r2=40125&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/mmdrv/kernel.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/mmdrv/kernel.c [iso-8859-1] Fri Mar 20 12:34:46 2009
@@ -22,7 +22,7 @@
MMRESULT
CobbleDeviceName(
DeviceType device_type,
- DWORD device_id,
+ UINT device_id,
PWCHAR out_device_name)
{
WCHAR base_device_name[MAX_DEVICE_NAME_LENGTH];
@@ -78,7 +78,7 @@
MMRESULT
OpenKernelDevice(
DeviceType device_type,
- DWORD device_id,
+ UINT device_id,
DWORD access,
HANDLE* handle)
{
Modified: branches/ros-amd64-bringup/reactos/dll/win32/mmdrv/mmdrv.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/win32/mmdrv/mmdrv.h?rev=40125&r1=40124&r2=40125&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/mmdrv/mmdrv.h [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/mmdrv/mmdrv.h [iso-8859-1] Fri Mar 20 12:34:46 2009
@@ -127,7 +127,7 @@
struct _SessionInfo* next;
DeviceType device_type;
- DWORD device_id;
+ UINT device_id;
HANDLE kernel_device_handle;
@@ -143,8 +143,8 @@
BOOL is_paused;
/* Stuff passed to us from winmm */
- DWORD app_user_data;
- DWORD callback;
+ DWORD_PTR app_user_data;
+ DWORD_PTR callback;
DWORD flags;
@@ -181,8 +181,8 @@
NotifyClient(
SessionInfo* session_info,
DWORD message,
- DWORD parameter1,
- DWORD parameter2);
+ DWORD_PTR parameter1,
+ DWORD_PTR parameter2);
/*
@@ -198,13 +198,13 @@
MMRESULT
CobbleDeviceName(
DeviceType device_type,
- DWORD device_id,
+ UINT device_id,
PWCHAR out_device_name);
MMRESULT
OpenKernelDevice(
DeviceType device_type,
- DWORD device_id,
+ UINT device_id,
DWORD access,
HANDLE* handle);
@@ -231,7 +231,7 @@
MMRESULT
CreateSession(
DeviceType device_type,
- DWORD device_id,
+ UINT device_id,
SessionInfo** session_info);
VOID
@@ -240,7 +240,7 @@
SessionInfo*
GetSession(
DeviceType device_type,
- DWORD device_id);
+ UINT device_id);
MMRESULT
StartSessionThread(SessionInfo* session_info);
@@ -253,9 +253,9 @@
DWORD
HandleBySessionThread(
- DWORD private_handle,
- DWORD message,
- DWORD parameter);
+ DWORD_PTR private_handle,
+ DWORD_PTR message,
+ DWORD_PTR parameter);
/* General */
@@ -266,21 +266,21 @@
DWORD
GetDeviceCapabilities(
DeviceType device_type,
- DWORD device_id,
- PVOID capabilities,
+ UINT device_id,
+ DWORD_PTR capabilities,
DWORD capabilities_size);
DWORD
OpenDevice(
DeviceType device_type,
- DWORD device_id,
+ UINT device_id,
PVOID open_descriptor,
DWORD flags,
- DWORD private_handle);
+ DWORD_PTR private_handle);
DWORD
CloseDevice(
- DWORD private_handle);
+ DWORD_PTR private_handle);
DWORD
PauseDevice(
@@ -310,7 +310,7 @@
DWORD
WriteWaveBuffer(
- DWORD private_handle,
+ DWORD_PTR private_handle,
PWAVEHDR wave_header,
DWORD wave_header_size);
Modified: branches/ros-amd64-bringup/reactos/dll/win32/mmdrv/mme.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/win32/mmdrv/mme.c?rev=40125&r1=40124&r2=40125&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/mmdrv/mme.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/mmdrv/mme.c [iso-8859-1] Fri Mar 20 12:34:46 2009
@@ -22,8 +22,8 @@
NotifyClient(
SessionInfo* session_info,
DWORD message,
- DWORD parameter1,
- DWORD parameter2)
+ DWORD_PTR parameter1,
+ DWORD_PTR parameter2)
{
return DriverCallback(session_info->callback,
HIWORD(session_info->flags),
@@ -43,11 +43,11 @@
APIENTRY DWORD
wodMessage(
- DWORD device_id,
- DWORD message,
- DWORD private_handle,
- DWORD parameter1,
- DWORD parameter2)
+ UINT device_id,
+ UINT message,
+ DWORD_PTR private_handle,
+ DWORD_PTR parameter1,
+ DWORD_PTR parameter2)
{
switch ( message )
{
@@ -61,7 +61,7 @@
DPRINT("WODM_GETDEVCAPS\n");
return GetDeviceCapabilities(WaveOutDevice,
device_id,
- (PVOID) parameter1,
+ parameter1,
parameter2);
/* http://www.osronline.com/ddkx/w98ddk/mmedia_4p85.htm */
Modified: branches/ros-amd64-bringup/reactos/dll/win32/mmdrv/session.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/win32/mmdrv/session.c?rev=40125&r1=40124&r2=40125&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/mmdrv/session.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/mmdrv/session.c [iso-8859-1] Fri Mar 20 12:34:46 2009
@@ -26,7 +26,7 @@
SessionInfo*
GetSession(
DeviceType device_type,
- DWORD device_id)
+ UINT device_id)
{
SessionInfo* session_info;
@@ -59,7 +59,7 @@
MMRESULT
CreateSession(
DeviceType device_type,
- DWORD device_id,
+ UINT device_id,
SessionInfo** session_info)
{
HANDLE heap = GetProcessHeap();
@@ -186,7 +186,7 @@
result = mmTaskCreate(task,
&session_info->thread.handle,
- (DWORD) session_info);
+ (DWORD_PTR)session_info);
if ( result != MMSYSERR_NOERROR )
{
@@ -235,9 +235,9 @@
DWORD
HandleBySessionThread(
- DWORD private_handle,
- DWORD message,
- DWORD parameter)
+ DWORD_PTR private_handle,
+ DWORD_PTR message,
+ DWORD_PTR parameter)
{
return CallSessionThread((SessionInfo*) private_handle,
message,
Modified: branches/ros-amd64-bringup/reactos/dll/win32/mmdrv/wave.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/win32/mmdrv/wave.c?rev=40125&r1=40124&r2=40125&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/mmdrv/wave.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/mmdrv/wave.c [iso-8859-1] Fri Mar 20 12:34:46 2009
@@ -56,7 +56,7 @@
wave_header->dwFlags |= WHDR_INQUEUE;
/* Save our handle in the header */
- wave_header->reserved = (DWORD) session_info;
+ wave_header->reserved = (DWORD_PTR) session_info;
/* Locate the end of the queue */
previous_node = NULL;
@@ -112,10 +112,10 @@
message = (session_info->device_type == WaveOutDevice) ? WOM_DONE :
WIM_DATA;
- DPRINT("Notifying client that buffer 0x%x is done\n", (int) header);
+ DPRINT("Notifying client that buffer 0x%x is done\n", header);
/* Notify the client */
- NotifyClient(session_info, message, (DWORD) header, 0);
+ NotifyClient(session_info, message, (DWORD_PTR) header, 0);
}
}
@@ -369,7 +369,7 @@
DWORD
WriteWaveBuffer(
- DWORD private_handle,
+ DWORD_PTR private_handle,
PWAVEHDR wave_header,
DWORD wave_header_size)
{
More information about the Ros-diffs
mailing list