Ros-diffs March 2009

ros-diffs@reactos.org

28 participants
483 discussions

[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

[sserapion] 40124: Fix 64bit build. It works too.
by sserapion＠svn.reactos.org 20 Mar '09

20 Mar '09

Author: sserapion Date: Fri Mar 20 12:33:38 2009 New Revision: 40124 URL: http://svn.reactos.org/svn/reactos?rev=40124&view=rev Log: Fix 64bit build. It works too. 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:33:38 2009 @@ -5,6 +5,7 @@ */ #include "mplay32.h" +#include <stdio.h> #define MAIN_WINDOW_HEIGHT 125 #define MAIN_WINDOW_MIN_WIDTH 250 @@ -188,7 +189,7 @@ if (bIsOpened) { - dwError = mciSendCommand(wDeviceId, MCI_CLOSE, MCI_WAIT, (DWORD)(LPMCI_GENERIC_PARMS)&mciGeneric); + dwError = mciSendCommand(wDeviceId, MCI_CLOSE, MCI_WAIT, (DWORD_PTR)&mciGeneric); if (dwError) return dwError; bIsOpened = FALSE; } @@ -203,6 +204,7 @@ MCI_OPEN_PARMS mciOpen; TCHAR szNewTitle[MAX_PATH]; DWORD dwError; + WCHAR doom[260]; if (bIsOpened) { @@ -215,19 +217,21 @@ mciOpen.wDeviceID = 0; mciOpen.lpstrAlias = NULL; - dwError = mciSendCommand(0, MCI_OPEN, MCI_OPEN_TYPE | MCI_OPEN_ELEMENT | MCI_WAIT, (DWORD)(LPVOID)&mciOpen); + dwError = mciSendCommand(0, MCI_OPEN, MCI_OPEN_TYPE | MCI_OPEN_ELEMENT | MCI_WAIT, (DWORD_PTR)&mciOpen); if (dwError != 0) { - MessageBox(0, _T("Can't open device! (1)"), NULL, MB_OK); - return dwError; + mciGetErrorString(dwError,doom,260); + MessageBox(0, doom, NULL, MB_OK); + return dwError; } mciStatus.dwItem = MCI_STATUS_LENGTH; - dwError = mciSendCommand(mciOpen.wDeviceID, MCI_STATUS, MCI_STATUS_ITEM | MCI_WAIT, (DWORD)(LPVOID)&mciStatus); + dwError = mciSendCommand(mciOpen.wDeviceID, MCI_STATUS, MCI_STATUS_ITEM | MCI_WAIT, (DWORD_PTR)&mciStatus); if (dwError != 0) { - MessageBox(0, _T("Can't open device! (2)"), NULL, MB_OK); + mciGetErrorString(dwError,doom,260); + MessageBox(0, doom, NULL, MB_OK); return dwError; } @@ -283,15 +287,15 @@ if (bIsOpened) { - mciSeek.dwTo = dwNewPos; - dwError = mciSendCommand(wDeviceId, MCI_SEEK, MCI_WAIT | MCI_TO, (DWORD)(LPVOID)&mciSeek); + mciSeek.dwTo = (DWORD_PTR)dwNewPos; + dwError = mciSendCommand(wDeviceId, MCI_SEEK, MCI_WAIT | MCI_TO, (DWORD_PTR)&mciSeek); if (dwError != 0) { MessageBox(hwnd, _T("SeekPlayback: Can't seek!"), NULL, MB_OK); } - mciPlay.dwCallback = (DWORD)hwnd; - dwError = mciSendCommand(wDeviceId, MCI_PLAY, MCI_NOTIFY, (DWORD)(LPVOID)&mciPlay); + mciPlay.dwCallback = (DWORD_PTR)hwnd; + dwError = mciSendCommand(wDeviceId, MCI_PLAY, MCI_NOTIFY, (DWORD_PTR)&mciPlay); if (dwError != 0) { MessageBox(hwnd, _T("SeekPlayback: Can't play!"), NULL, MB_OK); @@ -308,7 +312,7 @@ if (!bIsOpened) return; mciStatus.dwItem = MCI_STATUS_POSITION; - mciSendCommand(wDeviceId, MCI_STATUS, MCI_STATUS_ITEM, (DWORD)(LPVOID)&mciStatus); + mciSendCommand(wDeviceId, MCI_STATUS, MCI_STATUS_ITEM, (DWORD_PTR)&mciStatus); dwNewPos = mciStatus.dwReturn - 1; @@ -331,7 +335,7 @@ if (!bIsOpened) return; mciStatus.dwItem = MCI_STATUS_POSITION; - mciSendCommand(wDeviceId, MCI_STATUS, MCI_STATUS_ITEM, (DWORD)(LPVOID)&mciStatus); + mciSendCommand(wDeviceId, MCI_STATUS, MCI_STATUS_ITEM, (DWORD_PTR)&mciStatus); dwNewPos = mciStatus.dwReturn + 1; @@ -353,7 +357,7 @@ if (bIsOpened) { - dwError = mciSendCommand(wDeviceId, MCI_PAUSE, MCI_WAIT, (DWORD)(LPMCI_GENERIC_PARMS)&mciGeneric); + dwError = mciSendCommand(wDeviceId, MCI_PAUSE, MCI_WAIT, (DWORD_PTR)&mciGeneric); if (dwError != 0) { MessageBox(hwnd, _T("Can't pause!"), NULL, MB_OK); @@ -370,7 +374,7 @@ if (bIsPaused) { - dwError = mciSendCommand(wDeviceId, MCI_RESUME, MCI_WAIT, (DWORD)(LPMCI_GENERIC_PARMS)&mciGeneric); + dwError = mciSendCommand(wDeviceId, MCI_RESUME, MCI_WAIT, (DWORD_PTR)&mciGeneric); if (dwError != 0) { MessageBox(hwnd, _T("Can't resume!"), NULL, MB_OK); @@ -388,7 +392,7 @@ if (!bIsOpened) KillTimer(hwnd, IDT_PLAYTIMER); mciStatus.dwItem = MCI_STATUS_POSITION; - mciSendCommand(wDeviceId, MCI_STATUS, MCI_STATUS_ITEM, (DWORD)(LPVOID)&mciStatus); + mciSendCommand(wDeviceId, MCI_STATUS, MCI_STATUS_ITEM, (DWORD_PTR)&mciStatus); dwPos = mciStatus.dwReturn; if((UINT)dwPos >= MaxFilePos) @@ -451,11 +455,11 @@ dwError = mciSendCommand(wDeviceId, MCI_SEEK, MCI_WAIT | MCI_SEEK_TO_START, 0); - mciPlay.dwCallback = (DWORD)hwnd; + mciPlay.dwCallback = (DWORD_PTR)hwnd; mciPlay.dwFrom = 0; mciPlay.dwTo = MaxFilePos; - dwError = mciSendCommand(wDeviceId, MCI_PLAY, MCI_NOTIFY | MCI_FROM | MCI_TO, (DWORD)(LPVOID)&mciPlay); + dwError = mciSendCommand(wDeviceId, MCI_PLAY, MCI_NOTIFY | MCI_FROM | MCI_TO, (DWORD_PTR)&mciPlay); if (dwError != 0) { MessageBox(hwnd, _T("Can't play!"), NULL, MB_OK);

1 0

[sserapion] 40123: Even more 64bit fixes.
by sserapion＠svn.reactos.org 20 Mar '09

20 Mar '09

Author: sserapion Date: Fri Mar 20 12:32:37 2009 New Revision: 40123 URL: http://svn.reactos.org/svn/reactos?rev=40123&view=rev Log: Even more 64bit fixes. Modified: branches/ros-amd64-bringup/reactos/include/psdk/mmsystem.h Modified: branches/ros-amd64-bringup/reactos/include/psdk/mmsystem.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/mmsystem.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/mmsystem.h [iso-8859-1] Fri Mar 20 12:32:37 2009 @@ -1452,7 +1452,7 @@ HPSTR pchEndWrite; LONG lBufOffset; LONG lDiskOffset; - DWORD adwInfo[3]; + DWORD adwInfo[4]; DWORD dwReserved1; DWORD dwReserved2; HMMIO hmmio; @@ -1502,32 +1502,32 @@ } MCI_SEEK_PARMS, *PMCI_SEEK_PARMS,*LPMCI_SEEK_PARMS; typedef struct tagMCI_STATUS_PARMS { - DWORD dwCallback; - DWORD dwReturn; + DWORD_PTR dwCallback; + DWORD_PTR dwReturn; DWORD dwItem; DWORD dwTrack; } MCI_STATUS_PARMS,*PMCI_STATUS_PARMS,*LPMCI_STATUS_PARMS; typedef struct tagMCI_INFO_PARMSA { - DWORD dwCallback; + DWORD_PTR dwCallback; LPSTR lpstrReturn; DWORD dwRetSize; } MCI_INFO_PARMSA,*LPMCI_INFO_PARMSA; typedef struct tagMCI_INFO_PARMSW { - DWORD dwCallback; + DWORD_PTR dwCallback; LPWSTR lpstrReturn; DWORD dwRetSize; } MCI_INFO_PARMSW,*LPMCI_INFO_PARMSW; typedef struct tagMCI_GETDEVCAPS_PARMS { - DWORD dwCallback; + DWORD_PTR dwCallback; DWORD dwReturn; DWORD dwItem; } MCI_GETDEVCAPS_PARMS,*PMCI_GETDEVCAPS_PARMS,*LPMCI_GETDEVCAPS_PARMS; typedef struct tagMCI_SYSINFO_PARMSA { - DWORD dwCallback; + DWORD_PTR dwCallback; LPSTR lpstrReturn; DWORD dwRetSize; DWORD dwNumber; @@ -1535,7 +1535,7 @@ } MCI_SYSINFO_PARMSA,*PMCI_SYSINFO_PARMSA,*LPMCI_SYSINFO_PARMSA; typedef struct tagMCI_SYSINFO_PARMSW { - DWORD dwCallback; + DWORD_PTR dwCallback; LPWSTR lpstrReturn; DWORD dwRetSize; DWORD dwNumber; @@ -1543,67 +1543,67 @@ } MCI_SYSINFO_PARMSW,*PMCI_SYSINFO_PARMSW,*LPMCI_SYSINFO_PARMSW; typedef struct tagMCI_SET_PARMS { - DWORD dwCallback; + DWORD_PTR dwCallback; DWORD dwTimeFormat; DWORD dwAudio; } MCI_SET_PARMS,*PMCI_SET_PARMS,*LPMCI_SET_PARMS; typedef struct tagMCI_BREAK_PARMS { - DWORD dwCallback; + DWORD_PTR dwCallback; int nVirtKey; HWND hwndBreak; } MCI_BREAK_PARMS,*PMCI_BREAK_PARMS,*LPMCI_BREAK_PARMS; typedef struct tagMCI_SAVE_PARMSA { - DWORD dwCallback; + DWORD_PTR dwCallback; LPCSTR lpfilename; } MCI_SAVE_PARMSA,*PMCI_SAVE_PARMSA,*LPMCI_SAVE_PARMSA; typedef struct tagMCI_SAVE_PARMSW { - DWORD dwCallback; + DWORD_PTR dwCallback; LPCWSTR lpfilename; } MCI_SAVE_PARMSW,*PMCI_SAVE_PARMSW,*LPMCI_SAVE_PARMSW; typedef struct tagMCI_LOAD_PARMSA { - DWORD dwCallback; + DWORD_PTR dwCallback; LPCSTR lpfilename; } MCI_LOAD_PARMSA,*PMCI_LOAD_PARMSA,*LPMCI_LOAD_PARMSA; typedef struct tagMCI_LOAD_PARMSW { - DWORD dwCallback; + DWORD_PTR dwCallback; LPCWSTR lpfilename; } MCI_LOAD_PARMSW,*PMCI_LOAD_PARMSW,*LPMCI_LOAD_PARMSW; typedef struct tagMCI_RECORD_PARMS { - DWORD dwCallback; + DWORD_PTR dwCallback; DWORD dwFrom; DWORD dwTo; } MCI_RECORD_PARMS,*LPMCI_RECORD_PARMS; typedef struct tagMCI_VD_PLAY_PARMS { - DWORD dwCallback; + DWORD_PTR dwCallback; DWORD dwFrom; DWORD dwTo; DWORD dwSpeed; } MCI_VD_PLAY_PARMS,*PMCI_VD_PLAY_PARMS,*LPMCI_VD_PLAY_PARMS; typedef struct tagMCI_VD_STEP_PARMS { - DWORD dwCallback; + DWORD_PTR dwCallback; DWORD dwFrames; } MCI_VD_STEP_PARMS,*PMCI_VD_STEP_PARMS,*LPMCI_VD_STEP_PARMS; typedef struct tagMCI_VD_ESCAPE_PARMSA { - DWORD dwCallback; + DWORD_PTR dwCallback; LPCSTR lpstrCommand; } MCI_VD_ESCAPE_PARMSA,*PMCI_VD_ESCAPE_PARMSA,*LPMCI_VD_ESCAPE_PARMSA; typedef struct tagMCI_VD_ESCAPE_PARMSW { - DWORD dwCallback; + DWORD_PTR dwCallback; LPCWSTR lpstrCommand; } MCI_VD_ESCAPE_PARMSW,*PMCI_VD_ESCAPE_PARMSW,*LPMCI_VD_ESCAPE_PARMSW; typedef struct tagMCI_WAVE_OPEN_PARMSA { - DWORD dwCallback; + DWORD_PTR dwCallback; MCIDEVICEID wDeviceID; LPCSTR lpstrDeviceType; LPCSTR lpstrElementName; @@ -1612,7 +1612,7 @@ } MCI_WAVE_OPEN_PARMSA,*PMCI_WAVE_OPEN_PARMSA,*LPMCI_WAVE_OPEN_PARMSA; typedef struct tagMCI_WAVE_OPEN_PARMSW { - DWORD dwCallback; + DWORD_PTR dwCallback; MCIDEVICEID wDeviceID; LPCWSTR lpstrDeviceType; LPCWSTR lpstrElementName; @@ -1621,13 +1621,13 @@ } MCI_WAVE_OPEN_PARMSW,*PMCI_WAVE_OPEN_PARMSW,*LPMCI_WAVE_OPEN_PARMSW; typedef struct tagMCI_WAVE_DELETE_PARMS { - DWORD dwCallback; + DWORD_PTR dwCallback; DWORD dwFrom; DWORD dwTo; } MCI_WAVE_DELETE_PARMS, *PMCI_WAVE_DELETE_PARMS,*LPMCI_WAVE_DELETE_PARMS; typedef struct tagMCI_WAVE_SET_PARMS { - DWORD dwCallback; + DWORD_PTR dwCallback; DWORD dwTimeFormat; DWORD dwAudio; UINT wInput; @@ -1819,8 +1819,8 @@ MMRESULT WINAPI mmioDescend(HMMIO,LPMMCKINFO,const MMCKINFO*,UINT); MMRESULT WINAPI mmioAscend(HMMIO,LPMMCKINFO,UINT); MMRESULT WINAPI mmioCreateChunk(HMMIO,LPMMCKINFO,UINT); -MCIERROR WINAPI mciSendCommandA(MCIDEVICEID,UINT,DWORD,DWORD_PTR); -MCIERROR WINAPI mciSendCommandW(MCIDEVICEID,UINT,DWORD,DWORD_PTR); +MCIERROR WINAPI mciSendCommandA(MCIDEVICEID,UINT,DWORD_PTR,DWORD_PTR); +MCIERROR WINAPI mciSendCommandW(MCIDEVICEID,UINT,DWORD_PTR,DWORD_PTR); MCIERROR WINAPI mciSendStringA(LPCSTR,LPSTR,UINT,HWND); MCIERROR WINAPI mciSendStringW(LPCWSTR,LPWSTR,UINT,HWND); MCIDEVICEID WINAPI mciGetDeviceIDA(LPCSTR); @@ -1834,7 +1834,7 @@ YIELDPROC WINAPI mciGetYieldProc(MCIDEVICEID,PDWORD); typedef struct tagMCI_SEQ_SET_PARMS { - DWORD dwCallback; + DWORD_PTR dwCallback; DWORD dwTimeFormat; DWORD dwAudio; DWORD dwTempo; @@ -1844,7 +1844,7 @@ DWORD dwOffset; } MCI_SEQ_SET_PARMS,*PMCI_SEQ_SET_PARMS,*LPMCI_SEQ_SET_PARMS; typedef struct tagMCI_ANIM_OPEN_PARMSA { - DWORD dwCallback; + DWORD_PTR dwCallback; MCIDEVICEID wDeviceID; LPCSTR lpstrDeviceType; LPCSTR lpstrElementName; @@ -1853,7 +1853,7 @@ HWND hWndParent; } MCI_ANIM_OPEN_PARMSA,*PMCI_ANIM_OPEN_PARMSA,*LPMCI_ANIM_OPEN_PARMSA; typedef struct tagMCI_ANIM_OPEN_PARMSW { - DWORD dwCallback; + DWORD_PTR dwCallback; MCIDEVICEID wDeviceID; LPCWSTR lpstrDeviceType; LPCWSTR lpstrElementName; @@ -1862,29 +1862,29 @@ HWND hWndParent; } MCI_ANIM_OPEN_PARMSW,*PMCI_ANIM_OPEN_PARMSW,*LPMCI_ANIM_OPEN_PARMSW; typedef struct tagMCI_ANIM_PLAY_PARMS { - DWORD dwCallback; + DWORD_PTR dwCallback; DWORD dwFrom; DWORD dwTo; DWORD dwSpeed; } MCI_ANIM_PLAY_PARMS,*PMCI_ANIM_PLAY_PARMS,*LPMCI_ANIM_PLAY_PARMS; typedef struct tagMCI_ANIM_STEP_PARMS { - DWORD dwCallback; + DWORD_PTR dwCallback; DWORD dwFrames; } MCI_ANIM_STEP_PARMS,*PMCI_ANIM_STEP_PARMS,*LPMCI_ANIM_STEP_PARMS; typedef struct tagMCI_ANIM_WINDOW_PARMSA { - DWORD dwCallback; + DWORD_PTR dwCallback; HWND hWnd; UINT nCmdShow; LPCSTR lpstrText; } MCI_ANIM_WINDOW_PARMSA,*PMCI_ANIM_WINDOW_PARMSA,*LPMCI_ANIM_WINDOW_PARMSA; typedef struct tagMCI_ANIM_WINDOW_PARMSW { - DWORD dwCallback; + DWORD_PTR dwCallback; HWND hWnd; UINT nCmdShow; LPCWSTR lpstrText; } MCI_ANIM_WINDOW_PARMSW,*PMCI_ANIM_WINDOW_PARMSW,*LPMCI_ANIM_WINDOW_PARMSW; typedef struct tagMCI_ANIM_RECT_PARMS { - DWORD dwCallback; + DWORD_PTR dwCallback; #ifdef MCI_USE_OFFEXT POINT ptOffset; POINT ptExtent; @@ -1893,12 +1893,12 @@ #endif } MCI_ANIM_RECT_PARMS,*PMCI_ANIM_RECT_PARMS,*LPMCI_ANIM_RECT_PARMS; typedef struct tagMCI_ANIM_UPDATE_PARMS { - DWORD dwCallback; + DWORD_PTR dwCallback; RECT rc; HDC hDC; } MCI_ANIM_UPDATE_PARMS,*PMCI_ANIM_UPDATE_PARMS,*LPMCI_ANIM_UPDATE_PARMS; typedef struct tagMCI_OVLY_OPEN_PARMSA { - DWORD dwCallback; + DWORD_PTR dwCallback; MCIDEVICEID wDeviceID; LPCSTR lpstrDeviceType; LPCSTR lpstrElementName; @@ -1907,7 +1907,7 @@ HWND hWndParent; } MCI_OVLY_OPEN_PARMSA,*PMCI_OVLY_OPEN_PARMSA,*LPMCI_OVLY_OPEN_PARMSA; typedef struct tagMCI_OVLY_OPEN_PARMSW { - DWORD dwCallback; + DWORD_PTR dwCallback; MCIDEVICEID wDeviceID; LPCWSTR lpstrDeviceType; LPCWSTR lpstrElementName; @@ -1916,19 +1916,19 @@ HWND hWndParent; } MCI_OVLY_OPEN_PARMSW,*PMCI_OVLY_OPEN_PARMSW,*LPMCI_OVLY_OPEN_PARMSW; typedef struct tagMCI_OVLY_WINDOW_PARMSA { - DWORD dwCallback; + DWORD_PTR dwCallback; HWND hWnd; UINT nCmdShow; LPCSTR lpstrText; } MCI_OVLY_WINDOW_PARMSA,*PMCI_OVLY_WINDOW_PARMSA,*LPMCI_OVLY_WINDOW_PARMSA; typedef struct tagMCI_OVLY_WINDOW_PARMSW { - DWORD dwCallback; + DWORD_PTR dwCallback; HWND hWnd; UINT nCmdShow; LPCWSTR lpstrText; } MCI_OVLY_WINDOW_PARMSW,*PMCI_OVLY_WINDOW_PARMSW,*LPMCI_OVLY_WINDOW_PARMSW; typedef struct tagMCI_OVLY_RECT_PARMS { - DWORD dwCallback; + DWORD_PTR dwCallback; #ifdef MCI_USE_OFFEXT POINT ptOffset; POINT ptExtent; @@ -1937,22 +1937,22 @@ #endif } MCI_OVLY_RECT_PARMS,*PMCI_OVLY_RECT_PARMS,*LPMCI_OVLY_RECT_PARMS; typedef struct tagMCI_OVLY_SAVE_PARMSA { - DWORD dwCallback; + DWORD_PTR dwCallback; LPCSTR lpfilename; RECT rc; } MCI_OVLY_SAVE_PARMSA,*PMCI_OVLY_SAVE_PARMSA,*LPMCI_OVLY_SAVE_PARMSA; typedef struct tagMCI_OVLY_SAVE_PARMSW { - DWORD dwCallback; + DWORD_PTR dwCallback; LPCWSTR lpfilename; RECT rc; } MCI_OVLY_SAVE_PARMSW,*PMCI_OVLY_SAVE_PARMSW,*LPMCI_OVLY_SAVE_PARMSW; typedef struct tagMCI_OVLY_LOAD_PARMSA { - DWORD dwCallback; + DWORD_PTR dwCallback; LPCSTR lpfilename; RECT rc; } MCI_OVLY_LOAD_PARMSA,*PMCI_OVLY_LOAD_PARMSA,*LPMCI_OVLY_LOAD_PARMSA; typedef struct tagMCI_OVLY_LOAD_PARMSW { - DWORD dwCallback; + DWORD_PTR dwCallback; LPCWSTR lpfilename; RECT rc; } MCI_OVLY_LOAD_PARMSW,*PMCI_OVLY_LOAD_PARMSW,*LPMCI_OVLY_LOAD_PARMSW;

1 0

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

20 Mar '09

Author: sserapion Date: Fri Mar 20 11:04:54 2009 New Revision: 40122 URL: http://svn.reactos.org/svn/reactos?rev=40122&view=rev Log: 64bit build fixes. Modified: branches/ros-amd64-bringup/reactos/include/psdk/mmsystem.h Modified: branches/ros-amd64-bringup/reactos/include/psdk/mmsystem.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/mmsystem.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/mmsystem.h [iso-8859-1] Fri Mar 20 11:04:54 2009 @@ -1343,7 +1343,7 @@ DWORD dwValue; } MIXERCONTROLDETAILS_UNSIGNED,*PMIXERCONTROLDETAILS_UNSIGNED,*LPMIXERCONTROLDETAILS_UNSIGNED; -typedef void(CALLBACK TIMECALLBACK)(UINT,UINT,DWORD,DWORD,DWORD); +typedef void(CALLBACK TIMECALLBACK)(UINT,UINT,DWORD_PTR,DWORD_PTR,DWORD_PTR); typedef TIMECALLBACK *LPTIMECALLBACK; @@ -1471,11 +1471,11 @@ typedef const MMCKINFO *LPCMMCKINFO; typedef struct tagMCI_GENERIC_PARMS { - DWORD dwCallback; + DWORD_PTR dwCallback; } MCI_GENERIC_PARMS,*PMCI_GENERIC_PARMS,*LPMCI_GENERIC_PARMS; typedef struct tagMCI_OPEN_PARMSA { - DWORD dwCallback; + DWORD_PTR dwCallback; MCIDEVICEID wDeviceID; LPCSTR lpstrDeviceType; LPCSTR lpstrElementName; @@ -1483,7 +1483,7 @@ } MCI_OPEN_PARMSA,*PMCI_OPEN_PARMSA,*LPMCI_OPEN_PARMSA; typedef struct tagMCI_OPEN_PARMSW { - DWORD dwCallback; + DWORD_PTR dwCallback; MCIDEVICEID wDeviceID; LPCWSTR lpstrDeviceType; LPCWSTR lpstrElementName; @@ -1491,13 +1491,13 @@ } MCI_OPEN_PARMSW,*PMCI_OPEN_PARMSW,*LPMCI_OPEN_PARMSW; typedef struct tagMCI_PLAY_PARMS { - DWORD dwCallback; + DWORD_PTR dwCallback; DWORD dwFrom; DWORD dwTo; } MCI_PLAY_PARMS,*PMCI_PLAY_PARMS,*LPMCI_PLAY_PARMS; typedef struct tagMCI_SEEK_PARMS { - DWORD dwCallback; + DWORD_PTR dwCallback; DWORD dwTo; } MCI_SEEK_PARMS, *PMCI_SEEK_PARMS,*LPMCI_SEEK_PARMS;

1 0

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

20 Mar '09

Author: sserapion Date: Fri Mar 20 10:34:16 2009 New Revision: 40121 URL: http://svn.reactos.org/svn/reactos?rev=40121&view=rev Log: commit mysteriously missing file. Added: branches/ros-amd64-bringup/reactos/base/applications/shutdown/lang/nl-NL.rc (with props) Added: branches/ros-amd64-bringup/reactos/base/applications/shutdown/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/shutdown/lang/nl-NL.rc (added) +++ branches/ros-amd64-bringup/reactos/base/applications/shutdown/lang/nl-NL.rc [iso-8859-1] Fri Mar 20 10:34:16 2009 @@ -1,0 +1,14 @@ +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +BEGIN + +IDS_USAGE, "Usage: shutdown [-?] [-l | -s | -r] [-f]\n\n\ + No arguments or -?\tDisplay this message\n\ + -l\t\t\tLog off\n\ + -s\t\t\tDe computer afsluiten\n\ + -r\t\t\tOpnieuw opstarten\n\ + -f\t\t\tProgrammas zonder waarschuwing afsluiten\n\ + \t\t\tAls u geen andere optie hebt geselecteerd, dan zal deze functie\n\ + \t\t\tu ook doen afmelden" +END Propchange: branches/ros-amd64-bringup/reactos/base/applications/shutdown/lang/nl-NL.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

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

20 Mar '09

Author: sserapion Date: Fri Mar 20 10:31:50 2009 New Revision: 40120 URL: http://svn.reactos.org/svn/reactos?rev=40120&view=rev Log: Fix 64bit build. Modified: branches/ros-amd64-bringup/reactos/dll/win32/winmm/midimap/midimap.c Modified: branches/ros-amd64-bringup/reactos/dll/win32/winmm/midimap/midimap.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/winmm/midimap/midimap.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/winmm/midimap/midimap.c [iso-8859-1] Fri Mar 20 10:31:50 2009 @@ -270,7 +270,7 @@ if (MIDIMAP_LoadSettings(mom)) { - *lpdwUser = (DWORD)mom; + *lpdwUser = (DWORD_PTR)mom; mom->self = mom; return MMSYSERR_NOERROR; @@ -306,7 +306,7 @@ return ret; } -static DWORD modLongData(MIDIMAPDATA* mom, LPMIDIHDR lpMidiHdr, DWORD dwParam2) +static DWORD modLongData(MIDIMAPDATA* mom, LPMIDIHDR lpMidiHdr, DWORD_PTR dwParam2) { WORD chn; DWORD ret = MMSYSERR_NOERROR; @@ -330,7 +330,7 @@ return ret; } -static DWORD modData(MIDIMAPDATA* mom, DWORD dwParam) +static DWORD modData(MIDIMAPDATA* mom, DWORD_PTR dwParam) { BYTE lb = LOBYTE(LOWORD(dwParam)); WORD chn = lb & 0x0F; @@ -393,7 +393,7 @@ return ret; } -static DWORD modPrepare(MIDIMAPDATA* mom, LPMIDIHDR lpMidiHdr, DWORD dwParam2) +static DWORD modPrepare(MIDIMAPDATA* mom, LPMIDIHDR lpMidiHdr, DWORD_PTR dwParam2) { if (MIDIMAP_IsBadData(mom)) return MMSYSERR_ERROR; if (lpMidiHdr->dwFlags & (MHDR_ISSTRM|MHDR_PREPARED)) @@ -403,7 +403,7 @@ return MMSYSERR_NOERROR; } -static DWORD modUnprepare(MIDIMAPDATA* mom, LPMIDIHDR lpMidiHdr, DWORD dwParam2) +static DWORD modUnprepare(MIDIMAPDATA* mom, LPMIDIHDR lpMidiHdr, DWORD_PTR dwParam2) { if (MIDIMAP_IsBadData(mom)) return MMSYSERR_ERROR; if ((lpMidiHdr->dwFlags & MHDR_ISSTRM) || !(lpMidiHdr->dwFlags & MHDR_PREPARED)) @@ -413,7 +413,7 @@ return MMSYSERR_NOERROR; } -static DWORD modGetDevCaps(UINT wDevID, MIDIMAPDATA* mom, LPMIDIOUTCAPSW lpMidiCaps, DWORD size) +static DWORD modGetDevCaps(UINT wDevID, MIDIMAPDATA* mom, LPMIDIOUTCAPSW lpMidiCaps, DWORD_PTR size) { static const WCHAR name[] = {'W','i','n','e',' ','m','i','d','i',' ','m','a','p','p','e','r',0}; lpMidiCaps->wMid = 0x00FF; @@ -451,8 +451,8 @@ /************************************************************************** * modMessage (MIDIMAP.@) */ -DWORD WINAPI MIDIMAP_modMessage(UINT wDevID, UINT wMsg, DWORD dwUser, - DWORD dwParam1, DWORD dwParam2) +DWORD WINAPI MIDIMAP_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, + DWORD_PTR dwParam1, DWORD_PTR dwParam2) { TRACE("(%u, %04X, %08lX, %08lX, %08lX);\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); @@ -492,7 +492,7 @@ /************************************************************************** * MIDIMAP_drvOpen [internal] */ -static DWORD MIDIMAP_drvOpen(LPSTR str) +static LRESULT MIDIMAP_drvOpen(LPSTR str) { MIDIOUTCAPSW moc; unsigned dev, i; @@ -527,7 +527,7 @@ /************************************************************************** * MIDIMAP_drvClose [internal] */ -static DWORD MIDIMAP_drvClose(DWORD dwDevID) +static LRESULT MIDIMAP_drvClose(DWORD_PTR dwDevID) { if (midiOutPorts) { @@ -541,8 +541,8 @@ /************************************************************************** * DriverProc (MIDIMAP.@) */ -LONG CALLBACK MIDIMAP_DriverProc(DWORD dwDevID, HDRVR hDriv, DWORD wMsg, - DWORD dwParam1, DWORD dwParam2) +LRESULT CALLBACK MIDIMAP_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, + LPARAM dwParam1, LPARAM dwParam2) { /* EPP TRACE("(%08lX, %04X, %08lX, %08lX, %08lX)\n", */ /* EPP dwDevID, hDriv, wMsg, dwParam1, dwParam2); */

1 0

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

20 Mar '09

Author: sserapion Date: Fri Mar 20 10:13:40 2009 New Revision: 40119 URL: http://svn.reactos.org/svn/reactos?rev=40119&view=rev Log: commit mysteriously missing file. Added: branches/ros-amd64-bringup/reactos/base/applications/notepad/lang/hy-AM.rc (with props) Added: branches/ros-amd64-bringup/reactos/base/applications/notepad/lang/hy-AM.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/notepad/lang/hy-AM.rc (added) +++ branches/ros-amd64-bringup/reactos/base/applications/notepad/lang/hy-AM.rc [iso-8859-1] Fri Mar 20 10:13:40 2009 @@ -1,0 +1,192 @@ +/* + * Notepad (Armenian resources) + */ + +#pragma code_page(65001) /* Unicode only */ + +LANGUAGE LANG_ARMENIAN, SUBLANG_DEFAULT + +ID_ACCEL ACCELERATORS +BEGIN + "^A", CMD_SELECT_ALL + "^C", CMD_COPY + "^F", CMD_SEARCH + "^G", CMD_GOTO + "H", CMD_REPLACE, VIRTKEY, CONTROL + "^N", CMD_NEW + "^O", CMD_OPEN + "^P", CMD_PRINT + "^S", CMD_SAVE + "^V", CMD_PASTE + "^X", CMD_CUT + "^Z", CMD_UNDO + VK_F3, CMD_SEARCH_NEXT, VIRTKEY + VK_F5, CMD_TIME_DATE, VIRTKEY +END + +MAIN_MENU MENU +BEGIN + POPUP "&ÕÕ¡ÕµÕ¬" + BEGIN + MENUITEM "&ÕÕ¿Õ¥Õ²Õ®Õ¥Õ¬\tCtrl+N", CMD_NEW + MENUITEM "&Ô²Õ¡ÖÕ¥Õ¬...\tCtrl+O", CMD_OPEN + MENUITEM "&ÕÕ¡Õ°ÕºÕ¡Õ¶Õ¥Õ¬\tCtrl+S", CMD_SAVE + MENUITEM "ÕÕ¡Õ°ÕºÕ¡Õ¶Õ¥Õ¬ &Õ«Õ¶Õ¹ÕºÕ¥Õ½...", CMD_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "Ô·Õ»Õ«& ÕºÕ¡ÖÕ¡Õ´Õ¥Õ¿ÖÕ¥ÖÕ¨...", CMD_PAGE_SETUP + MENUITEM "&ÕÕºÕ¥Õ¬\tCtrl+P", CMD_PRINT + MENUITEM "&ÕÕºÕ«Õ¹Õ« Õ¯Õ¡ÖÕ£Õ¡Õ¾Õ¸ÖÕ¸ÖÕ´...", CMD_PRINTER_SETUP + MENUITEM SEPARATOR + MENUITEM "Ôµ&Õ¬Ö", CMD_EXIT + END + POPUP "&Ô½Õ´Õ¢Õ¡Õ£ÖÕ¥Õ¬" + BEGIN + MENUITEM "&ÕÕ¥ÖÕªÕ¥Õ¬\tCtrl+Z", CMD_UNDO + MENUITEM SEPARATOR + MENUITEM "&Ô¿Õ¿ÖÕ¥Õ¬\tCtrl+X", CMD_CUT + MENUITEM "&ÕÕ¡Õ¿Õ¹Õ³Õ¥Õ¶Õ¡Õ°Õ¡Õ¶Õ¥Õ¬\tCtrl+C", CMD_COPY + MENUITEM "ÕÕ¥Õ²Õ¡&Õ¤ÖÕ¥Õ¬\tCtrl+V", CMD_PASTE + MENUITEM "&ÕÕ¶Õ»Õ¥Õ¬\tDel", CMD_DELETE + MENUITEM SEPARATOR + MENUITEM "&Ô³Õ¿Õ¶Õ¥Õ¬", CMD_SEARCH + MENUITEM "Ô³Õ¿Õ¶Õ¥Õ¬ &Õ°Õ¡Õ»Õ¸ÖÕ¤Õ¨\tF3", CMD_SEARCH_NEXT + MENUITEM "ÕÕ¸ÕÕ¡ÖÕ«Õ¶Õ¥Õ¬\tCtrl+H", CMD_REPLACE + MENUITEM "ÕÕ¥Õ²Õ¡ÖÕ¸ÕÕ¾Õ¥Õ¬...\tCtrl+G", CMD_GOTO + MENUITEM SEPARATOR + MENUITEM "ÕÕ·Õ¥Õ¬ Õ¢Õ¥Õ¬Õ¥ÖÕ¨", CMD_SELECT_ALL + MENUITEM "ÔºÕ¡Õ´Õ¨& Ö Õ¡Õ´Õ½Õ¡Õ©Õ«Õ¾Õ¨\tF5", CMD_TIME_DATE + END + POPUP "ÕÕ¸Ö&Õ´Õ¡Õ¿Õ¡Õ¾Õ¸ÖÕ¸ÖÕ´" + BEGIN + MENUITEM "&ÕÕ¸Õ²Õ¡Õ¤Õ¡ÖÕ± Õ¢Õ¡Õ¼Õ¥ÖÕ¸Õ¾", CMD_WRAP + MENUITEM "&ÕÕ¡Õ¼Õ¡Õ¿Õ¥Õ½Õ¡Õ¯...", CMD_FONT + END + POPUP "&ÕÕ¥Õ½Ö" + BEGIN + MENUITEM "ÕÕ«Õ³Õ¡Õ¯Õ« &Õ¿Õ¥Õ²Õ¥Õ¯Õ¸ÖÕ©ÕµÕ¸ÖÕ¶", CMD_STATUSBAR + END + POPUP "ÕÕ¥Õ²Õ¥&Õ¯Õ¸ÖÕ©ÕµÕ¸ÖÕ¶" + BEGIN + MENUITEM "&Ô²Õ¸Õ¾Õ¡Õ¶Õ¤Õ¡Õ¯Õ¸ÖÕ©ÕµÕ¸ÖÕ¶", CMD_HELP_CONTENTS + MENUITEM "&ÕÕ¶Õ¿ÖÕ¥Õ¬...", CMD_HELP_SEARCH + MENUITEM "&ÕÕ£Õ¶Õ¸ÖÕ©ÕµÕ¸Õ¶ ÖÕ£Õ¿Õ¡Õ£Õ¸ÖÕ®Õ¸ÖÕ´", CMD_HELP_ON_HELP + MENUITEM SEPARATOR + MENUITEM "&Ô¾ÖÕ¡Õ£ÖÕ« Õ´Õ¡Õ½Õ«Õ¶" CMD_ABOUT + MENUITEM "&ÕÕ¥Õ²Õ¥Õ¯Õ¸ÖÕ©ÕµÕ¸ÖÕ¶...", CMD_ABOUT_WINE + END +END + +/* Dialog `Page setup' */ + +DIALOG_PAGESETUP DIALOGEX 0, 0, 225, 95 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Ô·Õ»Õ« ÕºÕ¡ÖÕ¡Õ´Õ¥Õ¿ÖÕ¥ÖÕ¨" +BEGIN +LTEXT "ÕÕ¥ÖÕ¥Õ¾Õ«Ö Õ½Õ¡Õ°Õ´Õ¡Õ¶Õ¡ÖÕ¡Õ¯Õ¸ÖÕ´:", 0x140, 10, 07, 40, 15 +EDITTEXT 0x141, 60, 05, 110, 12, WS_BORDER | WS_TABSTOP +LTEXT "ÕÕ¥ÖÖÖÕ«Ö Õ½Õ¡Õ°Õ´Õ¡Õ¶Õ¡ÖÕ¡Õ¯Õ¸ÖÕ´:", 0x142, 10, 24, 40, 15 +EDITTEXT 0x143, 60, 22, 110, 12, WS_BORDER | WS_TABSTOP + +GROUPBOX "Ô´Õ¡Õ®Õ¿Õ¥Ö:", 0x144, 10, 43,160, 45 +LTEXT "&ÕÕ¡Õ:", 0x145, 20, 55, 30, 10, WS_CHILD +EDITTEXT /*STRING_PAGESETUP_LEFTVALUE,*/ 0x147, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP +LTEXT "&ÕÕ¸ÖÖÕ«:", 0x148, 20, 73, 30, 10, WS_CHILD +EDITTEXT /*STRING_PAGESETUP_TOPVALUE,*/ 0x14A, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP +LTEXT "&Ô±Õ»:", 0x14B, 100, 55, 30, 10, WS_CHILD +EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*/ 0x14D, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP +LTEXT "&ÕÕ¥ÖÖÖÕ«:", 0x14E, 100, 73, 30, 10, WS_CHILD +EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP + +DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15, WS_TABSTOP +PUSHBUTTON "ÕÕ¶Õ¤Õ¸ÖÕ¶Õ¥Õ¬", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP +PUSHBUTTON "&ÕÕ¥Õ²Õ¥Õ¯Õ¸ÖÕ©ÕµÕ¸ÖÕ¶", IDHELP, 180, 39, 40, 15, WS_TABSTOP +END + +/* Dialog `Encoding' */ +DIALOG_ENCODING DIALOGEX 0, 0, 256, 44 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | + WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "ÕÕ«Õ´Õ¾Õ¸Õ¬Õ¶Õ¥ÖÕ« Õ¯Õ¸Õ¤Õ¡Õ¾Õ¸ÖÕ¸ÖÕ´" +BEGIN +COMBOBOX ID_ENCODING,54,0,156,80,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP +LTEXT "Ô¿Õ¸Õ¤Õ¡Õ¾Õ¸ÖÕ¸ÖÕ´:",0x155,5,2,41,12 +COMBOBOX ID_EOLN,54,18,156,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +LTEXT "ÕÕ¡ÖÕ¢Õ¥ÖÕ¡Õ¯Õ¶Õ¥Ö:",0x156,5,20,41,12 +END + +/* Dialog 'Go To' */ +DIALOG_GOTO DIALOGEX 0,0,165,50 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Ô±Õ¶ÖÕ¶Õ¥Õ¬ Õ¿Õ¸Õ²..." +BEGIN +EDITTEXT ID_LINENUMBER,54,10,106,12,WS_CHILD | WS_BORDER | WS_TABSTOP +LTEXT "ÕÕ¸Õ²Õ« Õ°Õ¡Õ´Õ¡ÖÕ¨:",0x155,5,12,41,12,WS_CHILD | WS_TABSTOP | ES_NUMBER +DEFPUSHBUTTON "OK", IDOK, 75, 30, 40, 15, WS_CHILD | WS_TABSTOP +PUSHBUTTON "ÕÕ¶Õ¤Õ¸ÖÕ¶Õ¥Õ¬", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP +END + +IDD_ABOUTBOX DIALOGEX DISCARDABLE 22,16,284,170 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "About ReactOS Notepad" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "ReactOS Notepad v1.0\r\nCopyright 1997,98 Marcel Baur <mbaur(a)g26.ethz.ch>\r\nCopyright 2000 Mike McCormack <Mike_McCormack(a)looksmart.com.au>\r\nCopyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr>\r\nCopyright 2002 Andriy Palamarchuk\r\n", + -1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,46,7,232,39 + CONTROL " ", + -1,"Static",0x50000000,8,48,272,11 + DEFPUSHBUTTON "Ô¾Õ¡Õ®Õ¯Õ¥Õ¬",IDOK,114,149,44,15,WS_GROUP + ICON IDI_NPICON,-1,12,9,20,30 + EDITTEXT IDC_LICENSE,8,64,272,81,ES_MULTILINE | + ES_READONLY | WS_VSCROLL +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_LICENSE, "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." +END + +STRINGTABLE DISCARDABLE +BEGIN +STRING_PAGESETUP_HEADERVALUE, "&n" /* FIXME */ +STRING_PAGESETUP_FOOTERVALUE, "Ô·Õ» &s" /* FIXME */ +STRING_PAGESETUP_LEFTVALUE, "20 mm" /* FIXME */ +STRING_PAGESETUP_RIGHTVALUE, "20 mm" /* FIXME */ +STRING_PAGESETUP_TOPVALUE, "25 mm" /* FIXME */ +STRING_PAGESETUP_BOTTOMVALUE, "25 mm" /* FIXME */ + +STRING_NOTEPAD, "Ô²Õ¬Õ¸Õ¯Õ¶Õ¸Õ¿" +STRING_ERROR, "ÕÔ½Ô±Ô¼" +STRING_WARNING, "ÕÔ»ÕÔ±Ô´ÕÕÕÔ¹ÕÕÕÕ" +STRING_INFO, "ÕÕ¸Õ²Õ¥Õ¯Õ¸ÖÕ©ÕµÕ¸ÖÕ¶" + +STRING_UNTITLED, "(Ô±Õ¼Õ¡Õ¶Ö Õ¾Õ¥ÖÕ¶Õ¡Õ£ÖÕ«)" + +STRING_ALL_FILES, "Ô²Õ¸Õ¬Õ¸Ö ÖÕ¡ÕµÕ¬Õ¥ÖÕ¨ (*.*)" +STRING_TEXT_FILES_TXT, "ÕÕ¥ÖÕ½Õ¿Õ¡ÕµÕ«Õ¶ ÖÕ¡ÕµÕ¬Õ¥ÖÕ¨ (*.txt)" + +STRING_TOOLARGE, "ÕÕ¡ÕµÕ¬Õ¨ '%s' Õ¢Õ¡Õ¾Õ¡Õ¯Õ¡Õ¶Õ«Õ¶ Õ´Õ¥Õ® Õ§ Õ¢Õ¬Õ¸Õ¯Õ¶Õ¸Õ¿Õ« Õ°Õ¡Õ´Õ¡Ö. \n \ +Please use a different editor." +STRING_NOTEXT, "Ô´Õ¸ÖÖ Õ¿Õ¥ÖÕ½Õ¿ Õ¹Õ¥Ö Õ¶Õ¥ÖÕ´Õ¸ÖÕ®Õ¥Õ¬ \ +\nPlease type something and try again" +STRING_DOESNOTEXIST, "ÕÕ¡ÕµÕ¬Õ¨ '%s'\n Õ£Õ¸ÕµÕ¸ÖÕ©Õ¶Õ¸ÖÕ¶ Õ¹Õ¸ÖÕ¶Õ«\n\n \ +Do you want to create a new file ?" +STRING_NOTSAVED, "ÕÕ¡ÕµÕ¬Õ¨ '%s'\n Õ¥Õ¶Õ©Õ¡ÖÕ¯Õ¾Õ¥Õ¬ Õ§ ÖÕ¸ÖÕ¸ÕÕ´Õ¡Õ¶\n\n \ +Would you like to save the changes ?" +STRING_NOTFOUND, "'%s' Õ¹Õ« Õ£Õ¿Õ¶Õ¾Õ¥Õ¬." +STRING_OUT_OF_MEMORY, "Ô¿Õ¡ Õ°Õ«Õ®Õ¸Õ²Õ¸ÖÕ©ÕµÕ¸Õ¶ Õ¡Õ¶Õ¢Õ¡Õ¾Õ¡ÖÕ¡ÖÕ¾Õ¡ÕÕ¸ÖÕµÕ¸ÖÕ¶. \ +\nÕÕ¡Õ¯Õ¥Ö Õ´Õ« Õ¯Õ¡Õ´ Õ´Õ« ÖÕ¡Õ¶Õ« Õ®ÖÕ¡Õ£Õ«Ö." +STRING_CANNOTFIND "ÕÕ« Õ£Õ¿Õ¶Õ¾Õ¥Õ¬ '%s'" +STRING_ANSI, "ANSI" +STRING_UNICODE, "ÕÕ¸ÖÕ¶Õ«Õ¯Õ¸Õ¤" +STRING_UNICODE_BE, "ÕÕ¸ÖÕ¶Õ«Õ¯Õ¸Õ¤ (big endian)" +STRING_UTF8, "UTF-8" +STRING_CRLF, "ÕÕ¡Õ¿ÖÕ¸Õ°Õ¡Õ¶Õ¶Õ¥Ö" +STRING_LF, "ÕÕ¸ÖÕ¶Õ«ÖÕ½" +STRING_CR, "ÕÕ¡Õ¯Õ«Õ¶Õ¿Õ¸Õ·" +STRING_LINE_COLUMN, "Line %d, column %d" +END + +#pragma code_page(default) Propchange: branches/ros-amd64-bringup/reactos/base/applications/notepad/lang/hy-AM.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[sserapion] 40118: %m is a glibc extension, convert it to "%s", strerror(errno). and fix 64bit build of dhcp service
by sserapion＠svn.reactos.org 20 Mar '09

20 Mar '09

Author: sserapion Date: Fri Mar 20 09:33:05 2009 New Revision: 40118 URL: http://svn.reactos.org/svn/reactos?rev=40118&view=rev Log: %m is a glibc extension, convert it to "%s", strerror(errno). and fix 64bit build of dhcp service Modified: branches/ros-amd64-bringup/reactos/base/services/dhcp/dhclient.c branches/ros-amd64-bringup/reactos/base/services/dhcp/dispatch.c Modified: branches/ros-amd64-bringup/reactos/base/services/dhcp/dhclient.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/services/dhcp/dhclient.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/services/dhcp/dhclient.c [iso-8859-1] Fri Mar 20 09:33:05 2009 @@ -606,7 +606,7 @@ note("bound to %s -- renewal in %ld seconds.", piaddr(ip->client->active->address), - ip->client->active->renewal - cur_time); + (long int)(ip->client->active->renewal - cur_time)); ip->client->state = S_BOUND; @@ -1035,7 +1035,7 @@ note("DHCPDISCOVER on %s to %s port %d interval %ld", ip->name, inet_ntoa(sockaddr_broadcast.sin_addr), - ntohs(sockaddr_broadcast.sin_port), ip->client->interval); + ntohs(sockaddr_broadcast.sin_port), (long int)ip->client->interval); /* Send out a packet. */ (void)send_packet(ip, &ip->client->packet, ip->client->packet_length, @@ -1088,8 +1088,8 @@ ip->client->active->renewal) { ip->client->state = S_BOUND; note("bound: renewal in %ld seconds.", - ip->client->active->renewal - - cur_time); + (long int)(ip->client->active->renewal - + cur_time)); add_timeout( ip->client->active->renewal, state_bound, ip); @@ -1563,7 +1563,7 @@ if (!leaseFile) { leaseFile = fopen(path_dhclient_db, "w"); if (!leaseFile) - error("can't create %s: %m", path_dhclient_db); + error("can't create %s: %s", path_dhclient_db, strerror(errno)); } else { fflush(leaseFile); rewind(leaseFile); @@ -1600,7 +1600,7 @@ if (!leaseFile) { /* XXX */ leaseFile = fopen(path_dhclient_db, "w"); if (!leaseFile) - error("can't create %s: %m", path_dhclient_db); + error("can't create %s: %s", path_dhclient_db, strerror(errno)); } fprintf(leaseFile, "lease {\n"); @@ -1655,7 +1655,7 @@ sizeof(size_t) + strlen(reason); if ((buf = buf_open(hdr.len)) == NULL) - error("buf_open: %m"); + error("buf_open: %s", strerror(errno)); errs = 0; errs += buf_add(buf, &hdr, sizeof(hdr)); @@ -1667,10 +1667,10 @@ errs += buf_add(buf, reason, len); if (errs) - error("buf_add: %m"); + error("buf_add: %s", strerror(errno)); if (buf_close(privfd, buf) == -1) - error("buf_close: %m"); + error("buf_close: %s", strerror(errno)); } void @@ -1848,7 +1848,7 @@ scripttime = time(NULL); if ((buf = buf_open(hdr.len)) == NULL) - error("buf_open: %m"); + error("buf_open: %s", strerror(errno)); errs = 0; errs += buf_add(buf, &hdr, sizeof(hdr)); @@ -1868,10 +1868,10 @@ } if (errs) - error("buf_add: %m"); + error("buf_add: %s", strerror(errno)); if (buf_close(privfd, buf) == -1) - error("buf_close: %m"); + error("buf_close: %s", strerror(errno)); } int Modified: branches/ros-amd64-bringup/reactos/base/services/dhcp/dispatch.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/services/dhcp/dispatch.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/services/dhcp/dispatch.c [iso-8859-1] Fri Mar 20 09:33:05 2009 @@ -186,7 +186,7 @@ time(&cur_time); continue; } else { - error("poll: %m"); + error("poll: %s", strerror(errno)); break; } }

1 0

[sserapion] 40117: I'm just looking at ReactOS-i386.rbuild and unbreaking the build.
by sserapion＠svn.reactos.org 20 Mar '09

20 Mar '09

Author: sserapion Date: Fri Mar 20 08:37:12 2009 New Revision: 40117 URL: http://svn.reactos.org/svn/reactos?rev=40117&view=rev Log: I'm just looking at ReactOS-i386.rbuild and unbreaking the build. Modified: branches/ros-amd64-bringup/reactos/include/reactos/windbgkd.h Modified: branches/ros-amd64-bringup/reactos/include/reactos/windbgkd.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/reactos/windbgkd.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/reactos/windbgkd.h [iso-8859-1] Fri Mar 20 08:37:12 2009 @@ -261,7 +261,7 @@ } DBGKD_ANY_CONTROL_SET, *PDBGKD_ANY_CONTROL_SET; #include <poppack.h> -#if defined(_M_X86) +#if defined(_M_IX86) typedef X86_DBGKD_CONTROL_SET DBGKD_CONTROL_SET, *PDBGKD_CONTROL_SET; #elif defined(_M_AMD64) typedef AMD64_DBGKD_CONTROL_SET DBGKD_CONTROL_SET, *PDBGKD_CONTROL_SET; @@ -327,7 +327,7 @@ USHORT SegFs; } AMD64_DBGKD_CONTROL_REPORT, *PAMD64_DBGKD_CONTROL_REPORT; -#if defined(_M_X86) +#if defined(_M_IX86) typedef X86_DBGKD_CONTROL_REPORT DBGKD_CONTROL_REPORT, *PDBGKD_CONTROL_REPORT; #elif defined(_M_AMD64) typedef AMD64_DBGKD_CONTROL_REPORT DBGKD_CONTROL_REPORT, *PDBGKD_CONTROL_REPORT;

1 0

[sserapion] 40116: Clean up merge leftovers.
by sserapion＠svn.reactos.org 20 Mar '09

20 Mar '09

Author: sserapion Date: Fri Mar 20 08:14:39 2009 New Revision: 40116 URL: http://svn.reactos.org/svn/reactos?rev=40116&view=rev Log: Clean up merge leftovers. Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/api/handle.c Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/api/handle.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… ============================================================================== --- branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/api/handle.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/api/handle.c [iso-8859-1] Fri Mar 20 08:14:39 2009 @@ -77,12 +77,8 @@ Object_t **Object, DWORD Access ) { -<<<<<<< .working ULONG_PTR h = (ULONG_PTR)Handle >> 2; DPRINT("CsrGetObject, Object: %x, %x, %x\n", Object, Handle, ProcessData ? ProcessData->HandleTableSize : 0); -======= - ULONG h = (ULONG)Handle >> 2; ->>>>>>> .merge-rechts.r40086 DPRINT("CsrGetObject, Object: %x, %x, %x\n", Object, Handle, ProcessData ? ProcessData->HandleTableSize : 0); @@ -135,13 +131,8 @@ PCSRSS_PROCESS_DATA ProcessData, HANDLE Handle) { -<<<<<<< .working ULONG_PTR h = (ULONG_PTR)Handle >> 2; Object_t *Object; -======= - ULONG h = (ULONG)Handle >> 2; - Object_t *Object; ->>>>>>> .merge-rechts.r40086 RtlEnterCriticalSection(&ProcessData->HandleTableLock); if (h >= ProcessData->HandleTableSize @@ -175,7 +166,6 @@ if (ProcessData->HandleTable[i].Object == NULL) { break; -<<<<<<< .working } } if (i >= ProcessData->HandleTableSize) @@ -202,34 +192,6 @@ _InterlockedIncrement( &Object->ReferenceCount ); RtlLeaveCriticalSection(&ProcessData->HandleTableLock); return(STATUS_SUCCESS); -======= - } - } - if (i >= ProcessData->HandleTableSize) - { - Block = RtlAllocateHeap(CsrssApiHeap, - HEAP_ZERO_MEMORY, - (ProcessData->HandleTableSize + 64) * sizeof(CSRSS_HANDLE)); - if (Block == NULL) - { - RtlLeaveCriticalSection(&ProcessData->HandleTableLock); - return(STATUS_UNSUCCESSFUL); - } - RtlCopyMemory(Block, - ProcessData->HandleTable, - ProcessData->HandleTableSize * sizeof(CSRSS_HANDLE)); - Block = _InterlockedExchangePointer((volatile void*)&ProcessData->HandleTable, Block); - RtlFreeHeap( CsrssApiHeap, 0, Block ); - ProcessData->HandleTableSize += 64; - } - ProcessData->HandleTable[i].Object = Object; - ProcessData->HandleTable[i].Access = Access; - ProcessData->HandleTable[i].Inheritable = Inheritable; - *Handle = (HANDLE)((i << 2) | 0x3); - _InterlockedIncrement( &Object->ReferenceCount ); - RtlLeaveCriticalSection(&ProcessData->HandleTableLock); - return(STATUS_SUCCESS); ->>>>>>> .merge-rechts.r40086 } NTSTATUS @@ -278,11 +240,7 @@ PCSRSS_PROCESS_DATA ProcessData, HANDLE Handle) { -<<<<<<< .working ULONG_PTR h = (ULONG_PTR)Handle >> 2; -======= - ULONG h = (ULONG)Handle >> 2; ->>>>>>> .merge-rechts.r40086 if (h >= ProcessData->HandleTableSize || ProcessData->HandleTable[h].Object == NULL)

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
49
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2009