Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dchapyshev] 34185: - More implement "Audio" dialog
by dchapyshev＠svn.reactos.org 29 Jun '08

29 Jun '08

Author: dchapyshev Date: Sun Jun 29 07:30:36 2008 New Revision: 34185 URL: http://svn.reactos.org/svn/reactos?rev=34185&view=rev Log: - More implement "Audio" dialog Modified: trunk/reactos/dll/cpl/mmsys/audio.c Modified: trunk/reactos/dll/cpl/mmsys/audio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/audio.c?rev=… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/audio.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/audio.c [iso-8859-1] Sun Jun 29 07:30:36 2008 @@ -43,6 +43,7 @@ if (CB_ERR != Res) { + SendMessage(hCB, CB_SETITEMDATA, Res, (LPARAM) uIndex); // TODO: Getting default device SendMessage(hCB, CB_SETCURSEL, (WPARAM) Res, 0); } @@ -63,6 +64,7 @@ if (CB_ERR != Res) { + SendMessage(hCB, CB_SETITEMDATA, Res, (LPARAM) uIndex); // TODO: Getting default device SendMessage(hCB, CB_SETCURSEL, (WPARAM) Res, 0); } @@ -83,10 +85,32 @@ if (CB_ERR != Res) { + SendMessage(hCB, CB_SETITEMDATA, Res, (LPARAM) uIndex); // TODO: Getting default device SendMessage(hCB, CB_SETCURSEL, (WPARAM) Res, 0); } } +} + +static UINT +GetDevNum(HWND hControl, DWORD Id) +{ + int iCurSel; + UINT DevNum; + + iCurSel = SendMessage(hControl, CB_GETCURSEL, 0, 0); + + if (iCurSel == CB_ERR) + return 0; + + DevNum = (UINT) SendMessage(hControl, CB_GETITEMDATA, iCurSel, 0); + if (DevNum == (UINT) CB_ERR) + return 0; + + if (mixerGetID((HMIXEROBJ) DevNum, &DevNum, Id) != MMSYSERR_NOERROR) + return 0; + + return DevNum; } /* Audio property page dialog callback */ @@ -99,6 +123,7 @@ UNREFERENCED_PARAMETER(lParam); UNREFERENCED_PARAMETER(wParam); UNREFERENCED_PARAMETER(hwndDlg); + switch(uMsg) { case WM_INITDIALOG: @@ -125,6 +150,74 @@ } } break; + + case WM_COMMAND: + { + STARTUPINFO si; + PROCESS_INFORMATION pi; + WCHAR szPath[MAX_PATH]; + + switch(LOWORD(wParam)) + { + case IDC_VOLUME1_BTN: + { + wsprintf(szPath, L"sndvol32.exe -d %d", + GetDevNum(GetDlgItem(hwndDlg, IDC_DEVICE_PLAY_LIST), MIXER_OBJECTF_WAVEOUT)); + + ZeroMemory(&si, sizeof(si)); + si.cb = sizeof(si); + si.wShowWindow = SW_SHOW; + + CreateProcess(NULL, szPath, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + } + break; + + case IDC_ADV2_BTN: + { + + } + break; + + case IDC_VOLUME2_BTN: + { + wsprintf(szPath, L"sndvol32.exe -r -d %d", + GetDevNum(GetDlgItem(hwndDlg, IDC_DEVICE_REC_LIST), MIXER_OBJECTF_WAVEIN)); + + ZeroMemory(&si, sizeof(si)); + si.cb = sizeof(si); + si.wShowWindow = SW_SHOW; + + CreateProcess(NULL, szPath, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + } + break; + + case IDC_ADV1_BTN: + { + + } + break; + + case IDC_VOLUME3_BTN: + { + wsprintf(szPath, L"sndvol32.exe -d %d", + GetDevNum(GetDlgItem(hwndDlg, IDC_DEVICE_MIDI_LIST), MIXER_OBJECTF_MIDIOUT)); + + ZeroMemory(&si, sizeof(si)); + si.cb = sizeof(si); + si.wShowWindow = SW_SHOW; + + CreateProcess(NULL, szPath, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + } + break; + + case IDC_ADV3_BTN: + { + + } + break; + } + } + break; } return FALSE;

1 0

[fireball] 34184: - Revert PCNET hack. - Merge 34154 (a correct fix instead).
by fireball＠svn.reactos.org 29 Jun '08

29 Jun '08

Author: fireball Date: Sun Jun 29 06:34:46 2008 New Revision: 34184 URL: http://svn.reactos.org/svn/reactos?rev=34184&view=rev Log: - Revert PCNET hack. - Merge 34154 (a correct fix instead). Modified: branches/ros-branch-0_3_5/reactos/drivers/network/dd/pcnet/pcnet.c branches/ros-branch-0_3_5/reactos/drivers/network/ndis/ndis/miniport.c Modified: branches/ros-branch-0_3_5/reactos/drivers/network/dd/pcnet/pcnet.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_5/reactos/driver… ============================================================================== --- branches/ros-branch-0_3_5/reactos/drivers/network/dd/pcnet/pcnet.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_5/reactos/drivers/network/dd/pcnet/pcnet.c [iso-8859-1] Sun Jun 29 06:34:46 2008 @@ -706,7 +706,7 @@ /* load init block and start the card */ NdisRawWritePortUshort(Adapter->PortOffset + RAP, CSR0); - NdisRawWritePortUshort(Adapter->PortOffset + RDP, CSR0_STRT|CSR0_INIT); + NdisRawWritePortUshort(Adapter->PortOffset + RDP, CSR0_STRT|CSR0_INIT|CSR0_IENA); /* detect the media state */ NdisRawWritePortUshort(Adapter->PortOffset + RAP, BCR4); Modified: branches/ros-branch-0_3_5/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_5/reactos/driver… ============================================================================== --- branches/ros-branch-0_3_5/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_5/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Sun Jun 29 06:34:46 2008 @@ -1418,27 +1418,7 @@ } NdisCloseConfiguration(ConfigHandle); - /* - * Call MiniportInitialize. - */ - - NDIS_DbgPrint(MID_TRACE, ("calling MiniportInitialize\n")); - NdisStatus = (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.InitializeHandler)( - &OpenErrorStatus, &SelectedMediumIndex, &MediaArray[0], - MEDIA_ARRAY_SIZE, Adapter, (NDIS_HANDLE)&WrapperContext); - - ZwClose(WrapperContext.RegistryHandle); - - if (NdisStatus != NDIS_STATUS_SUCCESS || - SelectedMediumIndex >= MEDIA_ARRAY_SIZE) - { - NDIS_DbgPrint(MIN_TRACE, ("MiniportInitialize() failed for an adapter.\n")); - ExInterlockedRemoveEntryList( &Adapter->ListEntry, &AdapterListLock ); - return (NTSTATUS)NdisStatus; - } - /* Set handlers (some NDIS macros require these) */ - Adapter->NdisMiniportBlock.EthRxCompleteHandler = EthFilterDprIndicateReceiveComplete; Adapter->NdisMiniportBlock.EthRxIndicateHandler = EthFilterDprIndicateReceive; Adapter->NdisMiniportBlock.SendCompleteHandler = MiniSendComplete; @@ -1448,6 +1428,25 @@ Adapter->NdisMiniportBlock.PacketIndicateHandler= MiniIndicateReceivePacket; Adapter->NdisMiniportBlock.StatusHandler = MiniStatus; Adapter->NdisMiniportBlock.StatusCompleteHandler= MiniStatusComplete; + + /* + * Call MiniportInitialize. + */ + + NDIS_DbgPrint(MID_TRACE, ("calling MiniportInitialize\n")); + NdisStatus = (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.InitializeHandler)( + &OpenErrorStatus, &SelectedMediumIndex, &MediaArray[0], + MEDIA_ARRAY_SIZE, Adapter, (NDIS_HANDLE)&WrapperContext); + + ZwClose(WrapperContext.RegistryHandle); + + if (NdisStatus != NDIS_STATUS_SUCCESS || + SelectedMediumIndex >= MEDIA_ARRAY_SIZE) + { + NDIS_DbgPrint(MIN_TRACE, ("MiniportInitialize() failed for an adapter.\n")); + ExInterlockedRemoveEntryList( &Adapter->ListEntry, &AdapterListLock ); + return (NTSTATUS)NdisStatus; + } Adapter->NdisMiniportBlock.MediaType = MediaArray[SelectedMediumIndex];

1 0

[dchapyshev] 34183: - Small implement "Audio" dialog - Add setupapi.lib to rbuild-file - Return ERROR_DI_DO_DEFAULT in MediaClassInstaller function
by dchapyshev＠svn.reactos.org 29 Jun '08

29 Jun '08

Author: dchapyshev Date: Sun Jun 29 05:13:55 2008 New Revision: 34183 URL: http://svn.reactos.org/svn/reactos?rev=34183&view=rev Log: - Small implement "Audio" dialog - Add setupapi.lib to rbuild-file - Return ERROR_DI_DO_DEFAULT in MediaClassInstaller function Modified: trunk/reactos/dll/cpl/mmsys/audio.c trunk/reactos/dll/cpl/mmsys/mmsys.c trunk/reactos/dll/cpl/mmsys/mmsys.rbuild Modified: trunk/reactos/dll/cpl/mmsys/audio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/audio.c?rev=… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/audio.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/audio.c [iso-8859-1] Sun Jun 29 05:13:55 2008 @@ -15,6 +15,79 @@ #include <stdio.h> #include "mmsys.h" #include "resource.h" + + +VOID +InitAudioDlg(HWND hwnd) +{ + WAVEOUTCAPS waveOutputPaps; + WAVEINCAPS waveInputPaps; + MIDIOUTCAPS midiOutCaps; + UINT DevsNum; + UINT uIndex; + HWND hCB; + LRESULT Res; + + // Init sound playback devices list + hCB = GetDlgItem(hwnd, IDC_DEVICE_PLAY_LIST); + + DevsNum = waveOutGetNumDevs(); + if (DevsNum < 1) return; + + for (uIndex = 0; uIndex < DevsNum; uIndex++) + { + if (waveOutGetDevCaps(uIndex, &waveOutputPaps, sizeof(waveOutputPaps))) + continue; + + Res = SendMessage(hCB, CB_ADDSTRING, 0, (LPARAM) waveOutputPaps.szPname); + + if (CB_ERR != Res) + { + // TODO: Getting default device + SendMessage(hCB, CB_SETCURSEL, (WPARAM) Res, 0); + } + } + + // Init sound recording devices list + hCB = GetDlgItem(hwnd, IDC_DEVICE_REC_LIST); + + DevsNum = waveInGetNumDevs(); + if (DevsNum < 1) return; + + for (uIndex = 0; uIndex < DevsNum; uIndex++) + { + if (waveInGetDevCaps(uIndex, &waveInputPaps, sizeof(waveInputPaps))) + continue; + + Res = SendMessage(hCB, CB_ADDSTRING, 0, (LPARAM) waveInputPaps.szPname); + + if (CB_ERR != Res) + { + // TODO: Getting default device + SendMessage(hCB, CB_SETCURSEL, (WPARAM) Res, 0); + } + } + + // Init MIDI devices list + hCB = GetDlgItem(hwnd, IDC_DEVICE_MIDI_LIST); + + DevsNum = midiOutGetNumDevs(); + if (DevsNum < 1) return; + + for (uIndex = 0; uIndex < DevsNum; uIndex++) + { + if (midiOutGetDevCaps(uIndex, &midiOutCaps, sizeof(midiOutCaps))) + continue; + + Res = SendMessage(hCB, CB_ADDSTRING, 0, (LPARAM) midiOutCaps.szPname); + + if (CB_ERR != Res) + { + // TODO: Getting default device + SendMessage(hCB, CB_SETCURSEL, (WPARAM) Res, 0); + } + } +} /* Audio property page dialog callback */ INT_PTR CALLBACK @@ -46,6 +119,10 @@ EnableWindow(GetDlgItem(hwndDlg, IDC_VOLUME3_BTN), FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_ADV3_BTN), FALSE); } + else + { + InitAudioDlg(hwndDlg); + } } break; } Modified: trunk/reactos/dll/cpl/mmsys/mmsys.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.c?rev=… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/mmsys.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/mmsys.c [iso-8859-1] Sun Jun 29 05:13:55 2008 @@ -16,6 +16,7 @@ #include <setupapi.h> #include <devguid.h> #include <cpl.h> +#include <tchar.h> #include <debug.h> #include "mmsys.h" @@ -34,7 +35,7 @@ UINT uNumberOfGuids, HWPAGE_DISPLAYMODE DisplayMode); -#define NUM_APPLETS (1) +#define NUM_APPLETS (1) HINSTANCE hApplet = 0; @@ -157,43 +158,43 @@ DWORD MMSYS_InstallDevice(HDEVINFO hDevInfo, PSP_DEVINFO_DATA pspDevInfoData) { - return 0x0; + return ERROR_DI_DO_DEFAULT; } DWORD MMSYS_RemoveDevice(HDEVINFO hDevInfo, PSP_DEVINFO_DATA pspDevInfoData) { - return 0x0; + return ERROR_DI_DO_DEFAULT; } DWORD MMSYS_AllowInstallDevice(HDEVINFO hDevInfo, PSP_DEVINFO_DATA pspDevInfoData) { - return 0x0; + return ERROR_DI_DO_DEFAULT; } DWORD MMSYS_SelectDevice(HDEVINFO hDevInfo, PSP_DEVINFO_DATA pspDevInfoData) { - return 0x0; + return ERROR_DI_DO_DEFAULT; } DWORD MMSYS_DetectDevice(HDEVINFO hDevInfo, PSP_DEVINFO_DATA pspDevInfoData) { - return 0x0; + return ERROR_DI_DO_DEFAULT; } DWORD MMSYS_SelectBestCompatDRV(HDEVINFO hDevInfo, PSP_DEVINFO_DATA pspDevInfoData) { - return 0x0; + return ERROR_DI_DO_DEFAULT; } DWORD WINAPI -MediaClassInstaller(DI_FUNCTION diFunction, - HDEVINFO hDevInfo, - PSP_DEVINFO_DATA pspDevInfoData) +MediaClassInstaller(IN DI_FUNCTION diFunction, + IN HDEVINFO hDevInfo, + IN PSP_DEVINFO_DATA pspDevInfoData OPTIONAL) { switch (diFunction) { @@ -210,10 +211,7 @@ case DIF_SELECTBESTCOMPATDRV: return MMSYS_SelectBestCompatDRV(hDevInfo, pspDevInfoData); default: - { - DPRINT1("MediaClassInstaller() not supported function\n"); - return 0x0; - } + return ERROR_DI_DO_DEFAULT; } } Modified: trunk/reactos/dll/cpl/mmsys/mmsys.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.rbuild… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/mmsys.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/mmsys.rbuild [iso-8859-1] Sun Jun 29 05:13:55 2008 @@ -14,6 +14,7 @@ <library>winmm</library> <library>advapi32</library> <library>shell32</library> + <library>setupapi</library> <file>mmsys.c</file> <file>sounds.c</file> <file>volume.c</file>

1 0

[fireball] 34182: - Merge 34180 (RTL sprintf/swprintf fix).
by fireball＠svn.reactos.org 29 Jun '08

29 Jun '08

Author: fireball Date: Sun Jun 29 04:46:01 2008 New Revision: 34182 URL: http://svn.reactos.org/svn/reactos?rev=34182&view=rev Log: - Merge 34180 (RTL sprintf/swprintf fix). Modified: branches/ros-branch-0_3_5/reactos/lib/rtl/sprintf.c branches/ros-branch-0_3_5/reactos/lib/rtl/swprintf.c Modified: branches/ros-branch-0_3_5/reactos/lib/rtl/sprintf.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_5/reactos/lib/rt… ============================================================================== --- branches/ros-branch-0_3_5/reactos/lib/rtl/sprintf.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_5/reactos/lib/rtl/sprintf.c [iso-8859-1] Sun Jun 29 04:46:01 2008 @@ -691,20 +691,8 @@ if (str <= end) *str = '\0'; else if (cnt > 0) - { /* don't write out a null byte if the buf size is zero */ - //*end = '\0'; - if (str-buf >cnt ) - { - *end = '\0'; - } - else - { - end++; - *end = '\0'; - } - - } + *end = '\0'; return str-buf; } Modified: branches/ros-branch-0_3_5/reactos/lib/rtl/swprintf.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_5/reactos/lib/rt… ============================================================================== --- branches/ros-branch-0_3_5/reactos/lib/rtl/swprintf.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_5/reactos/lib/rtl/swprintf.c [iso-8859-1] Sun Jun 29 04:46:01 2008 @@ -689,21 +689,9 @@ } if (str <= end) *str = L'\0'; - else if (cnt > 0) - { + else if (cnt > 0) /* don't write out a null byte if the buf size is zero */ - //*end = '\0'; - if (str-buf >cnt ) - { - *end = L'\0'; - } - else - { - end++; - *end = L'\0'; - } - - } + *end = L'\0'; return str-buf; }

1 0

[cfinck] 34181: Attempt to fix build (broken by hpoussin in r34179)
by cfinck＠svn.reactos.org 29 Jun '08

29 Jun '08

Author: cfinck Date: Sun Jun 29 04:44:46 2008 New Revision: 34181 URL: http://svn.reactos.org/svn/reactos?rev=34181&view=rev Log: Attempt to fix build (broken by hpoussin in r34179) Modified: trunk/reactos/base/shell/explorer/explorer_intres.rc Modified: trunk/reactos/base/shell/explorer/explorer_intres.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer_intres.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer_intres.rc [iso-8859-1] Sun Jun 29 04:44:46 2008 @@ -91,7 +91,7 @@ "IDB_IMAGES BITMAP DISCARDABLE ""res/images.bmp""\r\n" "IDB_TOOLBAR BITMAP DISCARDABLE ""res/toolbar.bmp""\r\n" "#endif\r\n" - "#ifndef _ROS_\r\n" + "#ifndef __REACTOS__\r\n" "LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL\r\n" "STRINGTABLE DISCARDABLE \r\n" "BEGIN\r\n" @@ -199,7 +199,7 @@ IDB_IMAGES BITMAP DISCARDABLE "res/images.bmp" IDB_TOOLBAR BITMAP DISCARDABLE "res/toolbar.bmp" #endif -#ifndef _ROS_ +#ifndef __REACTOS__ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE BEGIN

1 0

[fireball] 34180: - Revert 22081 by Magnus Olsen: "fixing two hiden bug in reactos, null termante the string right at end, code tested in vs, but it seam no affact on wine test mscvrt printf test. What hell is the snprintf function call to ??". Instead of fixing "hidden bugs", it introduced a real very well hidden bug, which was overwriting the target buffer and thus corrupting everything starting from the heap, and ending with pools. It's possible to install and run OO2 Writer now. See issue #3
by fireball＠svn.reactos.org 29 Jun '08

29 Jun '08

Author: fireball Date: Sun Jun 29 04:39:06 2008 New Revision: 34180 URL: http://svn.reactos.org/svn/reactos?rev=34180&view=rev Log: - Revert 22081 by Magnus Olsen: "fixing two hiden bug in reactos, null termante the string right at end, code tested in vs, but it seam no affact on wine test mscvrt printf test. What hell is the snprintf function call to ??". Instead of fixing "hidden bugs", it introduced a real very well hidden bug, which was overwriting the target buffer and thus corrupting everything starting from the heap, and ending with pools. It's possible to install and run OO2 Writer now. See issue #3311 for more details. Modified: trunk/reactos/lib/rtl/sprintf.c trunk/reactos/lib/rtl/swprintf.c Modified: trunk/reactos/lib/rtl/sprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/sprintf.c?rev=3418… ============================================================================== --- trunk/reactos/lib/rtl/sprintf.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/sprintf.c [iso-8859-1] Sun Jun 29 04:39:06 2008 @@ -691,20 +691,8 @@ if (str <= end) *str = '\0'; else if (cnt > 0) - { /* don't write out a null byte if the buf size is zero */ - //*end = '\0'; - if (str-buf >cnt ) - { - *end = '\0'; - } - else - { - end++; - *end = '\0'; - } - - } + *end = '\0'; return str-buf; } Modified: trunk/reactos/lib/rtl/swprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/swprintf.c?rev=341… ============================================================================== --- trunk/reactos/lib/rtl/swprintf.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/swprintf.c [iso-8859-1] Sun Jun 29 04:39:06 2008 @@ -689,21 +689,9 @@ } if (str <= end) *str = L'\0'; - else if (cnt > 0) - { + else if (cnt > 0) /* don't write out a null byte if the buf size is zero */ - //*end = '\0'; - if (str-buf >cnt ) - { - *end = L'\0'; - } - else - { - end++; - *end = L'\0'; - } - - } + *end = L'\0'; return str-buf; }

1 0

[hpoussin] 34179: Use __REACTOS__ define instead of _ROS_ one
by hpoussin＠svn.reactos.org 29 Jun '08

29 Jun '08

Author: hpoussin Date: Sun Jun 29 04:32:30 2008 New Revision: 34179 URL: http://svn.reactos.org/svn/reactos?rev=34179&view=rev Log: Use __REACTOS__ define instead of _ROS_ one Modified: trunk/reactos/base/shell/explorer/explorer.rbuild trunk/reactos/base/shell/explorer/shell/mainframe.cpp trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp trunk/reactos/base/shell/explorer/taskbar/desktopbar.h trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp trunk/reactos/base/shell/explorer/taskbar/taskbar.cpp trunk/reactos/base/shell/explorer/utility/utility.cpp Modified: trunk/reactos/base/shell/explorer/explorer.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer.rbuild [iso-8859-1] Sun Jun 29 04:32:30 2008 @@ -7,7 +7,6 @@ <include base="explorer">.</include> <define name="UNICODE" /> <define name="WIN32" /> - <define name="_ROS_" /> <define name="_WIN32_IE">0x0600</define> <define name="_WIN32_WINNT">0x0501</define> <define name="WINVER">0x0500</define> Modified: trunk/reactos/base/shell/explorer/shell/mainframe.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/shell/… ============================================================================== --- trunk/reactos/base/shell/explorer/shell/mainframe.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/shell/mainframe.cpp [iso-8859-1] Sun Jun 29 04:32:30 2008 @@ -300,7 +300,7 @@ break; case WM_SIZE: { -#ifdef _ROS_ ///@todo Work around to display rebar in ROS (with flickering) as long as the control isn't fixed +#ifdef __REACTOS__ ///@todo Work around to display rebar in ROS (with flickering) as long as the control isn't fixed int height = SendMessage(_hwndrebar, RB_GETBARHEIGHT, 0, 0); MoveWindow(_hwndrebar, 0, 0, LOWORD(lparam), height, TRUE); #else @@ -788,7 +788,7 @@ extraBtns.iBitmap = 8; SendMessage(_hextrabar, TB_INSERTBUTTON, INT_MAX, (LPARAM)&extraBtns); } -#ifndef _ROS_ // don't insert reg button for ROS. Regedit should be used. +#ifndef __REACTOS__ // don't insert reg button for ROS. Regedit should be used. // insert Registry button extraBtns.iString = SendMessage(_hextrabar, TB_ADDSTRING, 0, (LPARAM)TEXT("Reg.\0")); extraBtns.idCommand = ID_DRIVE_REGISTRY; Modified: trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskba… ============================================================================== --- trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp [iso-8859-1] Sun Jun 29 04:32:30 2008 @@ -41,7 +41,7 @@ DesktopBar::DesktopBar(HWND hwnd) : super(hwnd), -#ifdef _ROS_ +#ifdef __REACTOS__ _trayIcon(hwnd, ID_TRAY_VOLUME) #else WM_TASKBARCREATED(RegisterWindowMessage(WINMSG_TASKBARCREATED)) @@ -436,7 +436,7 @@ PostMessage(_hwndQuickLaunch, PM_UPDATE_DESKTOP, desktop_idx, 0); break;} -#ifdef _ROS_ +#ifdef __REACTOS__ case ID_TRAY_VOLUME: launch_file(_hwnd, TEXT("sndvol32.exe"), SW_SHOWNORMAL); // launch volume control application break; @@ -525,7 +525,7 @@ } -#ifdef _ROS_ +#ifdef __REACTOS__ void DesktopBar::AddTrayIcons() { Modified: trunk/reactos/base/shell/explorer/taskbar/desktopbar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskba… ============================================================================== --- trunk/reactos/base/shell/explorer/taskbar/desktopbar.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/taskbar/desktopbar.h [iso-8859-1] Sun Jun 29 04:32:30 2008 @@ -66,14 +66,14 @@ /// desktop bar window, also known as "system tray" struct DesktopBar : public -#ifdef _ROS_ +#ifdef __REACTOS__ TrayIconControllerTemplate< OwnerDrawParent<Window> > #else OwnerDrawParent<Window> #endif { -#ifdef _ROS_ +#ifdef __REACTOS__ typedef TrayIconControllerTemplate< OwnerDrawParent<Window> > super; #else @@ -110,7 +110,7 @@ struct StartMenuRoot* _startMenuRoot; -#ifdef _ROS_ +#ifdef __REACTOS__ TrayIcon _trayIcon; void AddTrayIcons(); Modified: trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskba… ============================================================================== --- trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp [iso-8859-1] Sun Jun 29 04:32:30 2008 @@ -1766,7 +1766,7 @@ #endif AddButton(ResString(IDS_LOGOFF), ICID_LOGOFF, false, IDC_LOGOFF); -#ifdef _ROS_ +#ifdef __REACTOS__ AddButton(ResString(IDS_RESTART), ICID_RESTART, false, IDC_RESTART); #endif @@ -1777,7 +1777,7 @@ #endif AddButton(ResString(IDS_SHUTDOWN), ICID_SHUTDOWN, false, IDC_SHUTDOWN); -#ifndef _ROS_ +#ifndef __REACTOS__ AddButton(ResString(IDS_TERMINATE), ICID_LOGOFF, false, IDC_TERMINATE); #endif @@ -1942,7 +1942,7 @@ ShowLogoffDialog(g_Globals._hwndDesktopBar); break; -#ifndef _ROS_ +#ifndef __REACTOS__ case IDC_TERMINATE: DestroyWindow(GetParent(_hwnd)); break; @@ -2032,7 +2032,7 @@ case IDC_CONNECTIONS: #ifndef ROSSHELL -#ifdef _ROS_ // to be removed when RAS will be implemented +#ifdef __REACTOS__ // to be removed when RAS will be implemented MessageBox(0, TEXT("RAS folder not yet implemented in SHELL32"), ResString(IDS_TITLE), MB_OK); #else CreateSubmenu(id, CSIDL_CONNECTIONS, ResString(IDS_CONNECTIONS)); @@ -2048,7 +2048,7 @@ // browse menu case IDC_NETWORK: -#ifdef _ROS_ ///@todo to be removed when network browsing will be implemented in shell namespace +#ifdef __REACTOS__ ///@todo to be removed when network browsing will be implemented in shell namespace MessageBox(0, TEXT("network not yet implemented"), ResString(IDS_TITLE), MB_OK); #else CreateSubmenu(id, CSIDL_NETWORK, ResString(IDS_NETWORK)); @@ -2089,7 +2089,7 @@ void StartMenuHandler::ShowSearchDialog() { -#ifndef _ROS_ ///@todo to be removed when SHFindFiles() will be implemented in shell32.dll +#ifndef __REACTOS__ ///@todo to be removed when SHFindFiles() will be implemented in shell32.dll static DynamicFct<SHFINDFILES> SHFindFiles(TEXT("SHELL32"), 90); if (SHFindFiles) @@ -2101,7 +2101,7 @@ void StartMenuHandler::ShowSearchComputer() { -#ifndef _ROS_ ///@todo to be removed when SHFindComputer() will be implemented in shell32.dll +#ifndef __REACTOS__ ///@todo to be removed when SHFindComputer() will be implemented in shell32.dll static DynamicFct<SHFINDCOMPUTER> SHFindComputer(TEXT("SHELL32"), 91); if (SHFindComputer) @@ -2160,7 +2160,7 @@ { super::AddEntries(); -#if defined(ROSSHELL) || defined(_ROS_) // _ROS_ to be removed when printer/network will be implemented +#if defined(ROSSHELL) || defined(__REACTOS__) // __REACTOS__ to be removed when printer/network will be implemented //TODO AddButton(ResString(IDS_PRINTERS), ICID_PRINTER, false, IDC_PRINTERS_MENU); AddButton(ResString(IDS_CONNECTIONS), ICID_NETWORK, false, IDC_CONNECTIONS); #else @@ -2191,7 +2191,7 @@ #ifndef __MINGW32__ // SHRestricted() missing in MinGW (as of 29.10.2003) if (!g_Globals._SHRestricted || !SHRestricted(REST_NONETHOOD)) // or REST_NOENTIRENETWORK ? #endif -#if defined(ROSSHELL) || defined(_ROS_) // _ROS_ to be removed when printer/network will be implemented +#if defined(ROSSHELL) || defined(__REACTOS__) // __REACTOS__ to be removed when printer/network will be implemented AddButton(ResString(IDS_NETWORK), ICID_NETWORK, false, IDC_NETWORK); #else AddButton(ResString(IDS_NETWORK), ICID_NETWORK, true, IDC_NETWORK); Modified: trunk/reactos/base/shell/explorer/taskbar/taskbar.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskba… ============================================================================== --- trunk/reactos/base/shell/explorer/taskbar/taskbar.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/taskbar/taskbar.cpp [iso-8859-1] Sun Jun 29 04:32:30 2008 @@ -469,7 +469,7 @@ entry._fsState = btn.fsState; -#ifdef _ROS_ // now handled by activating the ARW_HIDE flag with SystemParametersInfo(SPI_SETMINIMIZEDMETRICS) +#ifdef __REACTOS__ // now handled by activating the ARW_HIDE flag with SystemParametersInfo(SPI_SETMINIMIZEDMETRICS) // move minimized windows out of sight if (IsIconic(hwnd)) { RECT rect; Modified: trunk/reactos/base/shell/explorer/utility/utility.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/utilit… ============================================================================== --- trunk/reactos/base/shell/explorer/utility/utility.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/utility/utility.cpp [iso-8859-1] Sun Jun 29 04:32:30 2008 @@ -260,7 +260,7 @@ switch(osvi.dwPlatformId) { case VER_PLATFORM_WIN32_NT: -#ifdef _ROS_ // This work around can be removed if ReactOS gets a unique version number. +#ifdef __REACTOS__ // This work around can be removed if ReactOS gets a unique version number. str = TEXT("ReactOS"); #else if (osvi.dwMajorVersion <= 4)

1 0

[pschweitzer] 34178: Add ext2 to FS list in fs_rec.sys
by pschweitzer＠svn.reactos.org 29 Jun '08

29 Jun '08

Author: pschweitzer Date: Sun Jun 29 04:31:43 2008 New Revision: 34178 URL: http://svn.reactos.org/svn/reactos?rev=34178&view=rev Log: Add ext2 to FS list in fs_rec.sys Modified: branches/pierre-fsd/drivers/filesystems/fs_rec/fs_rec.c Modified: branches/pierre-fsd/drivers/filesystems/fs_rec/fs_rec.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… ============================================================================== --- branches/pierre-fsd/drivers/filesystems/fs_rec/fs_rec.c [iso-8859-1] (original) +++ branches/pierre-fsd/drivers/filesystems/fs_rec/fs_rec.c [iso-8859-1] Sun Jun 29 04:31:43 2008 @@ -366,14 +366,14 @@ if (NT_SUCCESS(Status)) DeviceCount++; /* Register EXT2 */ - /*Status = FsRecRegisterFs(DriverObject, + Status = FsRecRegisterFs(DriverObject, NULL, NULL, L"\\Ext2", L"\\FileSystem\\Ext2Recognizer", FS_TYPE_EXT2, FILE_DEVICE_DISK_FILE_SYSTEM); - if (NT_SUCCESS(Status)) DeviceCount++;*/ + if (NT_SUCCESS(Status)) DeviceCount++; /* Return appropriate Status */ return (DeviceCount > 0) ? STATUS_SUCCESS : STATUS_IMAGE_ALREADY_LOADED;

1 0

[pschweitzer] 34177: [FORMATTING] Fix indentation
by pschweitzer＠svn.reactos.org 29 Jun '08

29 Jun '08

Author: pschweitzer Date: Sun Jun 29 04:24:25 2008 New Revision: 34177 URL: http://svn.reactos.org/svn/reactos?rev=34177&view=rev Log: [FORMATTING] Fix indentation Modified: branches/pierre-fsd/drivers/filesystems/fs_rec/ext2.c Modified: branches/pierre-fsd/drivers/filesystems/fs_rec/ext2.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… ============================================================================== --- branches/pierre-fsd/drivers/filesystems/fs_rec/ext2.c [iso-8859-1] (original) +++ branches/pierre-fsd/drivers/filesystems/fs_rec/ext2.c [iso-8859-1] Sun Jun 29 04:24:25 2008 @@ -21,10 +21,10 @@ { BOOLEAN Result = TRUE; PAGED_CODE(); - + if (SuperBlock->s_magic != EXT2_SUPER_MAGIC) Result = FALSE; - + return Result; }

1 0

[fireball] 34176: - Merge 34174 (partition table size estimation fix).
by fireball＠svn.reactos.org 29 Jun '08

29 Jun '08

Author: fireball Date: Sun Jun 29 03:37:32 2008 New Revision: 34176 URL: http://svn.reactos.org/svn/reactos?rev=34176&view=rev Log: - Merge 34174 (partition table size estimation fix). Modified: branches/ros-branch-0_3_5/reactos/base/setup/usetup/partlist.c Modified: branches/ros-branch-0_3_5/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_5/reactos/base/s… ============================================================================== --- branches/ros-branch-0_3_5/reactos/base/setup/usetup/partlist.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_5/reactos/base/setup/usetup/partlist.c [iso-8859-1] Sun Jun 29 03:37:32 2008 @@ -406,8 +406,8 @@ { /* Round-down to cylinder size */ LastUnusedPartitionLength = - ROUND_DOWN (DiskEntry->DiskSize - (LastStartingOffset + LastPartitionLength), - DiskEntry->CylinderSize); + (DiskEntry->DiskSize - (LastStartingOffset + LastPartitionLength)) + & ~(DiskEntry->CylinderSize - 1); if (LastUnusedPartitionLength >= DiskEntry->CylinderSize) {

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