Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cwittich] 40134: use ncalrpc instead of a named pipe
by cwittich＠svn.reactos.org 20 Mar '09

20 Mar '09

Author: cwittich Date: Fri Mar 20 16:44:06 2009 New Revision: 40134 URL: http://svn.reactos.org/svn/reactos?rev=40134&view=rev Log: use ncalrpc instead of a named pipe Modified: trunk/reactos/dll/win32/wlanapi/main.c Modified: trunk/reactos/dll/win32/wlanapi/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wlanapi/main.c?r… ============================================================================== --- trunk/reactos/dll/win32/wlanapi/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wlanapi/main.c [iso-8859-1] Fri Mar 20 16:44:06 2009 @@ -20,6 +20,7 @@ /* INCLUDES ****************************************************************/ +#define WIN32_NO_STATUS #include <windows.h> #include "wlansvc_c.h" @@ -37,9 +38,9 @@ TRACE("RPC_SERVICE_STATUS_HANDLE_bind() called\n"); Status = RpcStringBindingComposeW(NULL, - L"ncacn_np", + L"ncalrpc", szMachineName, - L"\\pipe\\trkwks", + L"wlansvc", NULL, &pszStringBinding); if (Status != RPC_S_OK) @@ -102,13 +103,14 @@ OUT HANDLE *phClientHandle) { DWORD dwError = ERROR_SUCCESS; + WCHAR szDummy[] = L"localhost"; if ((pReserved != NULL) || (pdwNegotiatedVersion == NULL) || (phClientHandle == NULL)) return ERROR_INVALID_PARAMETER; RpcTryExcept { - dwError = _RpcOpenHandle(NULL, + dwError = _RpcOpenHandle(szDummy, dwClientVersion, pdwNegotiatedVersion, (WLANSVC_RPC_HANDLE) phClientHandle);

1 0

[cwittich] 40133: -allow to stop the service -listen for rpc calls
by cwittich＠svn.reactos.org 20 Mar '09

20 Mar '09

Author: cwittich Date: Fri Mar 20 16:43:43 2009 New Revision: 40133 URL: http://svn.reactos.org/svn/reactos?rev=40133&view=rev Log: -allow to stop the service -listen for rpc calls Modified: trunk/reactos/base/services/wlansvc/wlansvc.c Modified: trunk/reactos/base/services/wlansvc/wlansvc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/wlansvc/wlan… ============================================================================== --- trunk/reactos/base/services/wlansvc/wlansvc.c [iso-8859-1] (original) +++ trunk/reactos/base/services/wlansvc/wlansvc.c [iso-8859-1] Fri Mar 20 16:43:43 2009 @@ -10,8 +10,9 @@ #define WIN32_NO_STATUS #include <windows.h> +#include "wlansvc_s.h" -#define NDEBUG +//#define NDEBUG #include <debug.h> /* GLOBALS ******************************************************************/ @@ -19,10 +20,47 @@ #define SERVICE_NAME L"WLAN Service" SERVICE_STATUS_HANDLE ServiceStatusHandle; - +SERVICE_STATUS SvcStatus; /* FUNCTIONS *****************************************************************/ +static DWORD WINAPI RpcThreadRoutine(LPVOID lpParameter) +{ + RPC_STATUS Status; + Status = RpcServerUseProtseqEpW(L"ncalrpc", 20, L"wlansvc", NULL); + if (Status != RPC_S_OK) + { + DPRINT("RpcServerUseProtseqEpW() failed (Status %lx)\n", Status); + return 0; + } + + Status = RpcServerRegisterIf(wlansvc_interface_v1_0_s_ifspec, NULL, NULL); + if (Status != RPC_S_OK) + { + DPRINT("RpcServerRegisterIf() failed (Status %lx)\n", Status); + return 0; + } + + Status = RpcServerListen(1, RPC_C_LISTEN_MAX_CALLS_DEFAULT, 0); + if (Status != RPC_S_OK) + { + DPRINT("RpcServerListen() failed (Status %lx)\n", Status); + } + + DPRINT("RpcServerListen finished\n"); + return 0; +} + +static void UpdateServiceStatus(HANDLE hServiceStatus, DWORD NewStatus, DWORD Increment) +{ + if (Increment > 0) + SvcStatus.dwCheckPoint += Increment; + else + SvcStatus.dwCheckPoint = 0; + + SvcStatus.dwCurrentState = NewStatus; + SetServiceStatus(hServiceStatus, &SvcStatus); +} static DWORD WINAPI ServiceControlHandler(DWORD dwControl, @@ -32,34 +70,62 @@ { switch (dwControl) { + case SERVICE_CONTROL_SHUTDOWN: case SERVICE_CONTROL_STOP: - case SERVICE_CONTROL_SHUTDOWN: - return ERROR_SUCCESS; - - default : + UpdateServiceStatus(ServiceStatusHandle, SERVICE_STOP_PENDING, 1); + RpcMgmtStopServerListening(NULL); + break; + case SERVICE_CONTROL_INTERROGATE: + return NO_ERROR; + default: return ERROR_CALL_NOT_IMPLEMENTED; } + return NO_ERROR; } - - static VOID CALLBACK ServiceMain(DWORD argc, LPWSTR *argv) { + HANDLE hThread; + UNREFERENCED_PARAMETER(argc); UNREFERENCED_PARAMETER(argv); DPRINT("ServiceMain() called\n"); + SvcStatus.dwServiceType = SERVICE_WIN32_OWN_PROCESS; + SvcStatus.dwControlsAccepted = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN; + SvcStatus.dwCheckPoint = 0; + SvcStatus.dwWin32ExitCode = 0; + SvcStatus.dwServiceSpecificExitCode = 0; + SvcStatus.dwWaitHint = 4000; + ServiceStatusHandle = RegisterServiceCtrlHandlerExW(SERVICE_NAME, ServiceControlHandler, NULL); + UpdateServiceStatus(ServiceStatusHandle, SERVICE_RUNNING, 0); + hThread = CreateThread(NULL, + 0, + (LPTHREAD_START_ROUTINE) + RpcThreadRoutine, + NULL, + 0, + NULL); + + if (!hThread) + DPRINT("Can't create RpcThread\n"); + else + { + WaitForSingleObject(hThread, INFINITE); + CloseHandle(hThread); + } + + UpdateServiceStatus(ServiceStatusHandle, SERVICE_STOPPED, 0); DPRINT("ServiceMain() done\n"); } - int wmain(int argc, WCHAR *argv[])

1 0

[sserapion] 40132: commit mysteriously missing file.
by sserapion＠svn.reactos.org 20 Mar '09

20 Mar '09

Author: sserapion Date: Fri Mar 20 14:00:23 2009 New Revision: 40132 URL: http://svn.reactos.org/svn/reactos?rev=40132&view=rev Log: commit mysteriously missing file. Added: branches/ros-amd64-bringup/reactos/base/setup/usetup/lang/my-MM.h (with props) Added: branches/ros-amd64-bringup/reactos/base/setup/usetup/lang/my-MM.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/setup/usetup/lang/my-MM.h (added) +++ branches/ros-amd64-bringup/reactos/base/setup/usetup/lang/my-MM.h [iso-8859-1] Fri Mar 20 14:00:23 2009 @@ -1,0 +1,11 @@ +#ifndef LANG_MY_MM_H__ +#define LANG_MY_MM_H__ + +MUI_LAYOUTS myMMLayouts[] = +{ + { L"0455", L"00000455" }, + { L"0409", L"00000409" }, + { NULL, NULL } +}; + +#endif Propchange: branches/ros-amd64-bringup/reactos/base/setup/usetup/lang/my-MM.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[sserapion] 40131: Fix merge artifacts.
by sserapion＠svn.reactos.org 20 Mar '09

20 Mar '09

Author: sserapion Date: Fri Mar 20 13:53:46 2009 New Revision: 40131 URL: http://svn.reactos.org/svn/reactos?rev=40131&view=rev Log: Fix merge artifacts. Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] Fri Mar 20 13:53:46 2009 @@ -544,12 +544,7 @@ fprintf ( fMakefile, "PROJECT_RCFLAGS := $(PROJECT_CINCLUDES) $(PROJECT_CDEFINES)\n" ); fprintf ( fMakefile, "PROJECT_WIDLFLAGS := $(PROJECT_CINCLUDES) $(PROJECT_CDEFINES)\n" ); fprintf ( fMakefile, "PROJECT_LFLAGS := '$(shell ${TARGET_CC} -print-libgcc-file-name)' %s\n", GenerateProjectLFLAGS ().c_str () ); - fprintf ( fMakefile, "PROJECT_LPPFLAGS := '$(shell ${TARGET_CPP} -print-file-name=libstdc++.a)' '$(shell ${TARGET_CPP} -print-file-name=libgcc.a)' '$(shell ${TARGET_CPP} -print-file-name=libmingw32.a)' '$(shell ${TARGET_CPP} -print-file-name=libmingwex.a)'\n" ); - /* hack to get libgcc_eh.a, should check mingw version or something */ - if (Environment::GetArch() == "amd64") - { - fprintf ( fMakefile, "PROJECT_LPPFLAGS += '$(shell ${TARGET_CPP} -print-file-name=libgcc_eh.a)'\n" ); - } + fprintf ( fMakefile, "PROJECT_LPPFLAGS := '$(shell ${TARGET_CPP} -print-file-name=libstdc++.a)' '$(shell ${TARGET_CPP} -print-file-name=libgcc.a)' '$(shell ${TARGET_CPP} -print-file-name=libmingw32.a)' '$(shell ${TARGET_CPP} -print-file-name=libmingwex.a)' '$(shell ${TARGET_CPP} -print-file-name=libcoldname.a)'\n" ); /* hack to get libgcc_eh.a, should check mingw version or something */ if (Environment::GetArch() == "amd64") {

1 0

[sserapion] 40130: If you build it, they will come. The program builds but does not load in windows with error STATUS_INVALID_IMAGE_FORMAT. (Suspect linker).
by sserapion＠svn.reactos.org 20 Mar '09

20 Mar '09

Author: sserapion Date: Fri Mar 20 13:40:44 2009 New Revision: 40130 URL: http://svn.reactos.org/svn/reactos?rev=40130&view=rev Log: If you build it, they will come. The program builds but does not load in windows with error STATUS_INVALID_IMAGE_FORMAT. (Suspect linker). Modified: branches/ros-amd64-bringup/reactos/base/shell/shell.rbuild Modified: branches/ros-amd64-bringup/reactos/base/shell/shell.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/shell/shell.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/shell/shell.rbuild [iso-8859-1] Fri Mar 20 13:40:44 2009 @@ -4,9 +4,9 @@ <directory name="cmd"> <xi:include href="cmd/cmd.rbuild" /> </directory> -  + </directory> <directory name="explorer-new"> <xi:include href="explorer-new/explorer.rbuild" /> </directory>

1 0

[dchapyshev] 40129: - Implement NdisMapFile - Implement NdisUnmapFile
by dchapyshev＠svn.reactos.org 20 Mar '09

20 Mar '09

Author: dchapyshev Date: Fri Mar 20 13:21:17 2009 New Revision: 40129 URL: http://svn.reactos.org/svn/reactos?rev=40129&view=rev Log: - Implement NdisMapFile - Implement NdisUnmapFile Modified: trunk/reactos/drivers/network/ndis/ndis/stubs.c Modified: trunk/reactos/drivers/network/ndis/ndis/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/stubs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/stubs.c [iso-8859-1] Fri Mar 20 13:21:17 2009 @@ -82,20 +82,6 @@ return ExInterlockedRemoveHeadList ( ListHead, (PKSPIN_LOCK)SpinLock ); } - -/* - * @unimplemented - */ -VOID -EXPORT -NdisMapFile( - OUT PNDIS_STATUS Status, - OUT PVOID * MappedBuffer, - IN NDIS_HANDLE FileHandle) -{ - UNIMPLEMENTED -} - typedef struct _NDIS_HANDLE_OBJECT { HANDLE FileHandle; @@ -119,6 +105,34 @@ } const WCHAR* NDIS_FILE_FOLDER = L"\\SystemRoot\\System32\\Drivers\\"; + +/* + * @implemented + */ +VOID +EXPORT +NdisMapFile( + OUT PNDIS_STATUS Status, + OUT PVOID *MappedBuffer, + IN NDIS_HANDLE FileHandle) +{ + PNDIS_HANDLE_OBJECT HandleObject = (PNDIS_HANDLE_OBJECT) FileHandle; + + NDIS_DbgPrint(MAX_TRACE, ("called: FileHandle 0x%x\n", FileHandle)); + + if (HandleObject->Mapped) + { + /* If a file already mapped we will return an error code */ + *Status = NDIS_STATUS_ALREADY_MAPPED; + return; + } + + HandleObject->Mapped = TRUE; + *MappedBuffer = HandleObject->MapBuffer; + + /* Set returned status */ + *Status = STATUS_SUCCESS; +} /* * @implemented @@ -389,14 +403,16 @@ /* - * @unimplemented + * @implemented */ VOID EXPORT NdisUnmapFile( IN NDIS_HANDLE FileHandle) { - UNIMPLEMENTED + PNDIS_HANDLE_OBJECT HandleObject = (PNDIS_HANDLE_OBJECT) FileHandle; + + HandleObject->Mapped = FALSE; }

1 0

[sserapion] 40128: Fix 64bit build. Dedicated to silverblade (please review).
by sserapion＠svn.reactos.org 20 Mar '09

20 Mar '09

Author: sserapion Date: Fri Mar 20 13:16:44 2009 New Revision: 40128 URL: http://svn.reactos.org/svn/reactos?rev=40128&view=rev Log: Fix 64bit build. Dedicated to silverblade (please review). Modified: branches/ros-amd64-bringup/reactos/dll/win32/beepmidi/beepmidi.c Modified: branches/ros-amd64-bringup/reactos/dll/win32/beepmidi/beepmidi.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/beepmidi/beepmidi.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/beepmidi/beepmidi.c [iso-8859-1] Fri Mar 20 13:16:44 2009 @@ -238,11 +238,11 @@ BOOL CallClient( DeviceInfo* device_info, - DWORD message, - DWORD parameter1, - DWORD parameter2) -{ - DPRINT("Calling client - callback 0x%x mmhandle 0x%x\n", (int) device_info->callback, (int) device_info->mme_handle); + DWORD_PTR message, + DWORD_PTR parameter1, + DWORD_PTR parameter2) +{ + DPRINT("Calling client - callback 0x%x mmhandle 0x%x\n", device_info->callback, device_info->mme_handle); return DriverCallback(device_info->callback, HIWORD(device_info->flags), device_info->mme_handle, @@ -747,7 +747,7 @@ header->dwFlags |= MHDR_DONE; header->dwFlags &= ~ MHDR_INQUEUE; - DPRINT("Success? %d\n", (int) CallClient(the_device, MOM_DONE, (DWORD) header, 0)); + DPRINT("Success? %d\n", CallClient(the_device, MOM_DONE, (DWORD_PTR)header, 0)); return MMSYSERR_NOERROR; } @@ -762,9 +762,9 @@ modMessage( UINT device_id, UINT message, - DWORD private_data, - DWORD parameter1, - DWORD parameter2) + DWORD_PTR private_data, + DWORD_PTR parameter1, + DWORD_PTR parameter2) { switch ( message ) {

1 0

[sserapion] 40127: Fix 64bit build. Dedicated to silverblade (please review).
by sserapion＠svn.reactos.org 20 Mar '09

20 Mar '09

Author: sserapion Date: Fri Mar 20 12:51:21 2009 New Revision: 40127 URL: http://svn.reactos.org/svn/reactos?rev=40127&view=rev Log: Fix 64bit build. Dedicated to silverblade (please review). Modified: branches/ros-amd64-bringup/reactos/include/reactos/libs/sound/mmebuddy.h branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/auxiliary/auxMessage.c branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/capabilities.c branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/midi/midMessage.c branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/midi/modMessage.c branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/mmewrap.c branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/wave/header.c branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/wave/widMessage.c branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/wave/wodMessage.c Modified: branches/ros-amd64-bringup/reactos/include/reactos/libs/sound/mmebuddy.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/reactos/libs/sound/mmebuddy.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/reactos/libs/sound/mmebuddy.h [iso-8859-1] Fri Mar 20 12:51:21 2009 @@ -160,7 +160,7 @@ IN DWORD CapabilitiesSize); /* This one is for those of us who don't care */ -DEFINE_GETCAPS_FUNCTYPE(MMGETCAPS_FUNC, PVOID); +DEFINE_GETCAPS_FUNCTYPE(MMGETCAPS_FUNC, DWORD_PTR); /* These are for those of us that do */ DEFINE_GETCAPS_FUNCTYPE(MMGETWAVEOUTCAPS_FUNC, LPWAVEOUTCAPS); @@ -355,27 +355,27 @@ VOID NotifyMmeClient( IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, - IN DWORD Message, - IN DWORD Parameter); + IN UINT Message, + IN DWORD_PTR Parameter); MMRESULT MmeGetSoundDeviceCapabilities( IN MMDEVICE_TYPE DeviceType, IN DWORD DeviceId, - IN PVOID Capabilities, + IN DWORD_PTR Capabilities, IN DWORD CapabilitiesSize); MMRESULT MmeOpenWaveDevice( IN MMDEVICE_TYPE DeviceType, - IN DWORD DeviceId, + IN UINT DeviceId, IN LPWAVEOPENDESC OpenParameters, IN DWORD Flags, - OUT DWORD* PrivateHandle); + OUT SIZE_T* PrivateHandle); MMRESULT MmeCloseDevice( - IN DWORD PrivateHandle); + IN DWORD_PTR PrivateHandle); #define MmePrepareWaveHeader(private_handle, header) \ PrepareWaveHeader((PSOUND_DEVICE_INSTANCE)private_handle, (PWAVEHDR)header) @@ -388,7 +388,7 @@ MMRESULT MmeResetWavePlayback( - IN DWORD PrivateHandle); + IN SIZE_T PrivateHandle); /* @@ -398,7 +398,7 @@ MMRESULT GetSoundDeviceCapabilities( IN PSOUND_DEVICE SoundDevice, - OUT PVOID Capabilities, + OUT DWORD_PTR Capabilities, IN DWORD CapabilitiesSize); Modified: branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/auxiliary/auxMessage.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/d… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/auxiliary/auxMessage.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/auxiliary/auxMessage.c [iso-8859-1] Fri Mar 20 12:51:21 2009 @@ -23,11 +23,11 @@ */ APIENTRY DWORD auxMessage( - DWORD DeviceId, - DWORD Message, - DWORD PrivateHandle, - DWORD Parameter1, - DWORD Parameter2) + UINT DeviceId, + UINT Message, + DWORD_PTR PrivateHandle, + DWORD_PTR Parameter1, + DWORD_PTR Parameter2) { MMRESULT Result = MMSYSERR_NOTSUPPORTED; @@ -47,7 +47,7 @@ { Result = MmeGetSoundDeviceCapabilities(AUX_DEVICE_TYPE, DeviceId, - (PVOID) Parameter1, + Parameter1, Parameter2); break; } Modified: branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/capabilities.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/d… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/capabilities.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/capabilities.c [iso-8859-1] Fri Mar 20 12:51:21 2009 @@ -28,7 +28,7 @@ MMRESULT GetSoundDeviceCapabilities( IN PSOUND_DEVICE SoundDevice, - OUT PVOID Capabilities, + OUT DWORD_PTR Capabilities, IN DWORD CapabilitiesSize) { MMDEVICE_TYPE DeviceType; Modified: branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/midi/midMessage.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/d… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/midi/midMessage.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/midi/midMessage.c [iso-8859-1] Fri Mar 20 12:51:21 2009 @@ -23,11 +23,11 @@ */ APIENTRY DWORD midMessage( - DWORD DeviceId, - DWORD Message, - DWORD PrivateHandle, - DWORD Parameter1, - DWORD Parameter2) + UINT DeviceId, + UINT Message, + DWORD_PTR PrivateHandle, + DWORD_PTR Parameter1, + DWORD_PTR Parameter2) { MMRESULT Result = MMSYSERR_NOTSUPPORTED; @@ -47,7 +47,7 @@ { Result = MmeGetSoundDeviceCapabilities(MIDI_IN_DEVICE_TYPE, DeviceId, - (PVOID) Parameter1, + Parameter1, Parameter2); break; } Modified: branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/midi/modMessage.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/d… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/midi/modMessage.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/midi/modMessage.c [iso-8859-1] Fri Mar 20 12:51:21 2009 @@ -23,11 +23,11 @@ */ APIENTRY DWORD modMessage( - DWORD DeviceId, - DWORD Message, - DWORD PrivateHandle, - DWORD Parameter1, - DWORD Parameter2) + UINT DeviceId, + UINT Message, + DWORD_PTR PrivateHandle, + DWORD_PTR Parameter1, + DWORD_PTR Parameter2) { MMRESULT Result = MMSYSERR_NOTSUPPORTED; @@ -47,7 +47,7 @@ { Result = MmeGetSoundDeviceCapabilities(MIDI_OUT_DEVICE_TYPE, DeviceId, - (PVOID) Parameter1, + Parameter1, Parameter2); break; } Modified: branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/d… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c [iso-8859-1] Fri Mar 20 12:51:21 2009 @@ -23,11 +23,11 @@ */ APIENTRY DWORD mxdMessage( - DWORD DeviceId, - DWORD Message, - DWORD PrivateHandle, - DWORD Parameter1, - DWORD Parameter2) + UINT DeviceId, + UINT Message, + DWORD_PTR PrivateHandle, + DWORD_PTR Parameter1, + DWORD_PTR Parameter2) { MMRESULT Result = MMSYSERR_NOTSUPPORTED; @@ -47,7 +47,7 @@ { Result = MmeGetSoundDeviceCapabilities(MIXER_DEVICE_TYPE, DeviceId, - (PVOID) Parameter1, + Parameter1, Parameter2); break; } Modified: branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/mmewrap.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/d… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/mmewrap.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/mmewrap.c [iso-8859-1] Fri Mar 20 12:51:21 2009 @@ -23,8 +23,8 @@ VOID NotifyMmeClient( IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, - IN DWORD Message, - IN DWORD Parameter) + IN UINT Message, + IN DWORD_PTR Parameter) { SND_ASSERT( SoundDeviceInstance ); @@ -52,7 +52,7 @@ MmeGetSoundDeviceCapabilities( IN MMDEVICE_TYPE DeviceType, IN DWORD DeviceId, - IN PVOID Capabilities, + IN DWORD_PTR Capabilities, IN DWORD CapabilitiesSize) { PSOUND_DEVICE SoundDevice; @@ -79,10 +79,10 @@ MMRESULT MmeOpenWaveDevice( IN MMDEVICE_TYPE DeviceType, - IN DWORD DeviceId, + IN UINT DeviceId, IN LPWAVEOPENDESC OpenParameters, IN DWORD Flags, - OUT DWORD* PrivateHandle) + OUT SIZE_T* PrivateHandle) { MMRESULT Result; @@ -128,8 +128,8 @@ return TranslateInternalMmResult(Result); } - /* Store the device instance pointer in the private handle - is DWORD safe here? */ - *PrivateHandle = (DWORD) SoundDeviceInstance; + /* Store the device instance pointer in the private handle */ + *PrivateHandle = (DWORD_PTR)SoundDeviceInstance; /* Store the additional information we were given - FIXME: Need flags! */ SetSoundDeviceInstanceMmeData(SoundDeviceInstance, @@ -153,7 +153,7 @@ MMRESULT MmeCloseDevice( - IN DWORD PrivateHandle) + IN SIZE_T PrivateHandle) { MMRESULT Result; PSOUND_DEVICE_INSTANCE SoundDeviceInstance; @@ -193,7 +193,7 @@ MMRESULT MmeResetWavePlayback( - IN DWORD PrivateHandle) + IN SIZE_T PrivateHandle) { PSOUND_DEVICE_INSTANCE SoundDeviceInstance; Modified: branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/wave/header.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/d… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/wave/header.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/wave/header.c [iso-8859-1] Fri Mar 20 12:51:21 2009 @@ -351,5 +351,5 @@ /* Safe to do this without thread protection, as we're done with the header */ NotifyMmeClient(SoundDeviceInstance, DeviceType == WAVE_OUT_DEVICE_TYPE ? WOM_DONE : WIM_DATA, - (DWORD) Header); -} + (DWORD_PTR)Header); +} Modified: branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/wave/widMessage.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/d… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/wave/widMessage.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/wave/widMessage.c [iso-8859-1] Fri Mar 20 12:51:21 2009 @@ -24,11 +24,11 @@ */ APIENTRY DWORD widMessage( - DWORD DeviceId, - DWORD Message, - DWORD PrivateHandle, - DWORD Parameter1, - DWORD Parameter2) + UINT DeviceId, + UINT Message, + DWORD_PTR PrivateHandle, + DWORD_PTR Parameter1, + DWORD_PTR Parameter2) { MMRESULT Result = MMSYSERR_NOTSUPPORTED; @@ -48,7 +48,7 @@ { Result = MmeGetSoundDeviceCapabilities(WAVE_IN_DEVICE_TYPE, DeviceId, - (PVOID) Parameter1, + Parameter1, Parameter2); break; } Modified: branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/wave/wodMessage.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/d… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/wave/wodMessage.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/wave/wodMessage.c [iso-8859-1] Fri Mar 20 12:51:21 2009 @@ -33,11 +33,11 @@ */ APIENTRY DWORD wodMessage( - DWORD DeviceId, - DWORD Message, - DWORD PrivateHandle, - DWORD Parameter1, - DWORD Parameter2) + UINT DeviceId, + UINT Message, + DWORD_PTR PrivateHandle, + DWORD_PTR Parameter1, + DWORD_PTR Parameter2) { MMRESULT Result = MMSYSERR_NOTSUPPORTED; @@ -57,7 +57,7 @@ { Result = MmeGetSoundDeviceCapabilities(WAVE_OUT_DEVICE_TYPE, DeviceId, - (PVOID) Parameter1, + Parameter1, Parameter2); break; } @@ -68,7 +68,7 @@ DeviceId, (LPWAVEOPENDESC) Parameter1, Parameter2, - (DWORD*) PrivateHandle); + (SIZE_T*)PrivateHandle); break; }

1 0

[sserapion] 40126: Remove debug code.
by sserapion＠svn.reactos.org 20 Mar '09

20 Mar '09

Author: sserapion Date: Fri Mar 20 12:36:43 2009 New Revision: 40126 URL: http://svn.reactos.org/svn/reactos?rev=40126&view=rev Log: Remove debug code. Modified: branches/ros-amd64-bringup/reactos/base/applications/mplay32/mplay32.c Modified: branches/ros-amd64-bringup/reactos/base/applications/mplay32/mplay32.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/mplay32/mplay32.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/mplay32/mplay32.c [iso-8859-1] Fri Mar 20 12:36:43 2009 @@ -5,7 +5,6 @@ */ #include "mplay32.h" -#include <stdio.h> #define MAIN_WINDOW_HEIGHT 125 #define MAIN_WINDOW_MIN_WIDTH 250 @@ -204,7 +203,6 @@ MCI_OPEN_PARMS mciOpen; TCHAR szNewTitle[MAX_PATH]; DWORD dwError; - WCHAR doom[260]; if (bIsOpened) { @@ -220,9 +218,8 @@ dwError = mciSendCommand(0, MCI_OPEN, MCI_OPEN_TYPE | MCI_OPEN_ELEMENT | MCI_WAIT, (DWORD_PTR)&mciOpen); if (dwError != 0) { - mciGetErrorString(dwError,doom,260); - MessageBox(0, doom, NULL, MB_OK); - return dwError; + MessageBox(0, _T("Can't open device! (1)"), NULL, MB_OK); + return dwError; } mciStatus.dwItem = MCI_STATUS_LENGTH; @@ -230,8 +227,7 @@ dwError = mciSendCommand(mciOpen.wDeviceID, MCI_STATUS, MCI_STATUS_ITEM | MCI_WAIT, (DWORD_PTR)&mciStatus); if (dwError != 0) { - mciGetErrorString(dwError,doom,260); - MessageBox(0, doom, NULL, MB_OK); + MessageBox(0, _T("Can't open device! (2)"), NULL, MB_OK); return dwError; } @@ -713,4 +709,4 @@ } return 0; -} +}

1 0

[sserapion] 40125: Fix 64bit build.
by sserapion＠svn.reactos.org 20 Mar '09

20 Mar '09

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/w… ============================================================================== --- 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/w… ============================================================================== --- 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/w… ============================================================================== --- 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/w… ============================================================================== --- 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/w… ============================================================================== --- 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/w… ============================================================================== --- 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) {

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs