Ros-diffs September 2007

ros-diffs@reactos.org

19 participants
589 discussions

[fireball] 29260: - Add uniata.rbuild, adapt .rc to ReactOS - Preliminary compilation fixes. - Remove CrossNt stuff for now.

by fireball＠svn.reactos.org

Author: fireball Date: Fri Sep 28 00:45:13 2007 New Revision: 29260 URL: http://svn.reactos.org/svn/reactos?rev=29260&view=rev Log: - Add uniata.rbuild, adapt .rc to ReactOS - Preliminary compilation fixes. - Remove CrossNt stuff for now. Added: trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild (with props) Modified: trunk/reactos/drivers/storage/ide/uniata/atapi.h trunk/reactos/drivers/storage/ide/uniata/badblock.h trunk/reactos/drivers/storage/ide/uniata/config.h trunk/reactos/drivers/storage/ide/uniata/id_queue.h trunk/reactos/drivers/storage/ide/uniata/id_sata.h trunk/reactos/drivers/storage/ide/uniata/idedma.rc trunk/reactos/drivers/storage/ide/uniata/inc/rwlock.h trunk/reactos/drivers/storage/ide/uniata/stdafx.h Modified: trunk/reactos/drivers/storage/ide/uniata/atapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/atapi.h (original) +++ trunk/reactos/drivers/storage/ide/uniata/atapi.h Fri Sep 28 00:45:13 2007 @@ -95,7 +95,7 @@ ULONG _cdecl DbgPrint( - PCH Format, + const CHAR * Format, ... ); #endif // USE_DBGPRINT_LOGGER Modified: trunk/reactos/drivers/storage/ide/uniata/badblock.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/badblock.h (original) +++ trunk/reactos/drivers/storage/ide/uniata/badblock.h Fri Sep 28 00:45:13 2007 @@ -75,4 +75,4 @@ IN ULONG count ); -#endif // _BADBLOCK_H_INCLUDED_ +#endif // _BADBLOCK_H_INCLUDED_ Modified: trunk/reactos/drivers/storage/ide/uniata/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/config.h (original) +++ trunk/reactos/drivers/storage/ide/uniata/config.h Fri Sep 28 00:45:13 2007 @@ -93,6 +93,7 @@ /* ReactOS-specific defines */ #ifdef USE_REACTOS_DDK + #define DDKFASTAPI __attribute__((fastcall)) #else //USE_REACTOS_DDK #define DDKAPI __attribute__((stdcall)) Modified: trunk/reactos/drivers/storage/ide/uniata/id_queue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_queue.h (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_queue.h Fri Sep 28 00:45:13 2007 @@ -38,4 +38,4 @@ IN PHW_CHANNEL chan ); -#endif __UNIATA_COMMAND_QUEUE_SUPPORT__H__ +#endif __UNIATA_COMMAND_QUEUE_SUPPORT__H__ Modified: trunk/reactos/drivers/storage/ide/uniata/id_sata.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_sata.h (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_sata.h Fri Sep 28 00:45:13 2007 @@ -33,4 +33,4 @@ IN ULONG Action ); -#endif __UNIATA_SATA__H__ +#endif __UNIATA_SATA__H__ Modified: trunk/reactos/drivers/storage/ide/uniata/idedma.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/idedma.rc (original) +++ trunk/reactos/drivers/storage/ide/uniata/idedma.rc Fri Sep 28 00:45:13 2007 @@ -1,8 +1,3 @@ -#include <windows.h> - -#include <ntverp.h> -#include "uniata_ver.h" - #undef VERSION #define VERSION "0." UNIATA_VER_STR #define VER_FILETYPE VFT_DRV @@ -24,4 +19,4 @@ #define VER_LANGNEUTRAL -#include "common.ver" +#include <reactos/version.rc> Modified: trunk/reactos/drivers/storage/ide/uniata/inc/rwlock.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/inc/rwlock.h (original) +++ trunk/reactos/drivers/storage/ide/uniata/inc/rwlock.h Fri Sep 28 00:45:13 2007 @@ -36,4 +36,4 @@ #define RWLOCK_FOR_WRITE TRUE #define RWLOCK_FOR_READ FALSE -#endif __CROSS_NT_RWLOCK__H__ +#endif // __CROSS_NT_RWLOCK__H__ Modified: trunk/reactos/drivers/storage/ide/uniata/stdafx.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/stdafx.h (original) +++ trunk/reactos/drivers/storage/ide/uniata/stdafx.h Fri Sep 28 00:45:13 2007 @@ -6,7 +6,7 @@ #include "stddef.h" #include "stdarg.h" -#include "inc\CrossNt.h" +//#include "inc\CrossNt.h" #include "atapi.h" // includes scsi.h #include "ntdddisk.h" Added: trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild (added) +++ trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild Fri Sep 28 00:45:13 2007 @@ -1,0 +1,21 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> +<module name="uniata" type="kernelmodedriver" installbase="system32/drivers" allowwarnings="true" installname="uniata.sys"> + <bootstrap base="$(CDOUTPUT)" /> + <define name="__USE_W32API" /> + <define name="_DEBUG" /> + <include base="uniata">.</include> + <include base="uniata">inc</include> + <library>ntoskrnl</library> + <library>hal</library> + <library>scsiport</library> + <file>id_ata.cpp</file> + <file>id_badblock.cpp</file> + <file>id_dma.cpp</file> + <file>id_init.cpp</file> + <file>id_probe.cpp</file> + <file>id_queue.cpp</file> + <file>id_sata.cpp</file> + <file>stdafx.cpp</file> + <file>idedma.rc</file> +</module> Propchange: trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild ------------------------------------------------------------------------------ svn:eol-style = native

16 years, 11 months

[fireball] 29259: - Wrong param was being sent to MiSyncThreadProcessViews(), fix that.

by fireball＠svn.reactos.org

Author: fireball Date: Fri Sep 28 00:14:32 2007 New Revision: 29259 URL: http://svn.reactos.org/svn/reactos?rev=29259&view=rev Log: - Wrong param was being sent to MiSyncThreadProcessViews(), fix that. Modified: trunk/reactos/ntoskrnl/ke/thrdobj.c Modified: trunk/reactos/ntoskrnl/ke/thrdobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/thrdobj.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/thrdobj.c (original) +++ trunk/reactos/ntoskrnl/ke/thrdobj.c Fri Sep 28 00:14:32 2007 @@ -812,7 +812,7 @@ /* Make sure that we are in the right page directory */ MiSyncThreadProcessViews(Process, - Thread, + (PVOID)Thread->StackLimit, KERNEL_STACK_SIZE); MiSyncThreadProcessViews(Process, Thread, sizeof(ETHREAD));

16 years, 11 months

[dreimer] 29258: Last try to fix 4 Vista...

by dreimer＠svn.reactos.org

Author: dreimer Date: Thu Sep 27 23:43:48 2007 New Revision: 29258 URL: http://svn.reactos.org/svn/reactos?rev=29258&view=rev Log: Last try to fix 4 Vista... Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/RosBE.cmd (original) +++ trunk/tools/RosBE-Windows/Root/RosBE.cmd Thu Sep 27 23:43:48 2007 @@ -116,7 +116,7 @@ set _MINGWVERSION=4.1.3 set HOST_CFLAGS=-I"%ROSBEBASEDIR%\4.1.3\include" -I"%ROSBEBASEDIR%\4.1.3\lib\gcc\mingw32\4.1.3\include" set HOST_CPPFLAGS=-I"%ROSBEBASEDIR%\4.1.3\include" -I"%ROSBEBASEDIR%\4.1.3\include\c++\4.1.3" -I"%ROSBEBASEDIR%\4.1.3\include\c++\4.1.3\mingw32" -I"%ROSBEBASEDIR%\4.1.3\lib\gcc\mingw32\4.1.3\include" - set HOST_LFLAGS=-L"%ROSBEBASEDIR%\4.1.3\lib" -L"%ROSBEBASEDIR%\4.1.3\lib\gcc\mingw32\4.1.3" + set LIBRARY_PATH=%ROSBEBASEDIR%\4.1.3\lib;%ROSBEBASEDIR%\4.1.3\lib\gcc\mingw32\4.1.3 echo ******************************************************************************* echo * *

16 years, 11 months

[weiden] 29257: Some fixes

by weiden＠svn.reactos.org

Author: weiden Date: Thu Sep 27 23:38:47 2007 New Revision: 29257 URL: http://svn.reactos.org/svn/reactos?rev=29257&view=rev Log: Some fixes Modified: trunk/reactos/dll/win32/shellext/deskmon/deskmon.c Modified: trunk/reactos/dll/win32/shellext/deskmon/deskmon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskmon… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskmon/deskmon.c (original) +++ trunk/reactos/dll/win32/shellext/deskmon/deskmon.c Thu Sep 27 23:38:47 2007 @@ -5,135 +5,83 @@ static HINSTANCE hInstance; -#if 0 #ifdef UNICODE typedef INT_PTR (WINAPI *PDEVICEPROPERTIES)(HWND,LPCWSTR,LPCWSTR,BOOL); #define FUNC_DEVICEPROPERTIES "DevicePropertiesW" #else -typedef INT_PTR (WINAPI *PDEVICEPROPERTIES)(HWND,LPCWSTR,LPCSTR,BOOL); +typedef INT_PTR (WINAPI *PDEVICEPROPERTIES)(HWND,LPCSTR,LPCSTR,BOOL); #define FUNC_DEVICEPROPERTIES "DevicePropertiesA" #endif +static LPTSTR +GetMonitorDevInstID(LPCTSTR lpDeviceID) +{ + /* FIXME: Implement, allocate returned string with LocalAlloc! */ + return NULL; +} + static VOID -ShowMonitorProperties(PDESKMONITOR This, - LPCTSTR lpDevice) +ShowMonitorProperties(PDESKMONITOR This) { HMODULE hDevMgr; PDEVICEPROPERTIES pDeviceProperties; - - hDevMgr = LoadLibrary(TEXT("devmgr.dll")); - if (hDevMgr != NULL) - { - pDeviceProperties = (PDEVICEPROPERTIESW)GetProcAddress(hDevMgr, - FUNC_DEVICEPROPERTIES); - if (pDeviceProperties != NULL) - { - pDeviceProperties(This->hwndDlg, - NULL, - lpDevice, - FALSE); - } - - FreeLibrary(hDevMgr); - } -} -#endif + LPTSTR lpDevInstID; + + if (This->SelMonitor != NULL) + { + lpDevInstID = GetMonitorDevInstID(This->SelMonitor->dd.DeviceID); + if (lpDevInstID != NULL) + { + hDevMgr = LoadLibrary(TEXT("devmgr.dll")); + if (hDevMgr != NULL) + { + pDeviceProperties = (PDEVICEPROPERTIES)GetProcAddress(hDevMgr, + FUNC_DEVICEPROPERTIES); + if (pDeviceProperties != NULL) + { + pDeviceProperties(This->hwndDlg, + NULL, + This->SelMonitor->dd.DeviceID, + FALSE); + } + + FreeLibrary(hDevMgr); + } + + LocalFree((HLOCAL)lpDevInstID); + } + } +} static VOID -UpdateMonitorDialogControls(PDESKMONITOR This) -{ - PDEVMODEW lpCurrentMode, lpMode; - DWORD dwIndex = 0; - TCHAR szBuffer[64]; - BOOL bHasDef = FALSE; +UpdateMonitorSelection(PDESKMONITOR This) +{ INT i; - /* Fill the refresh rate combo box */ - SendDlgItemMessage(This->hwndDlg, - IDC_REFRESHRATE, - CB_RESETCONTENT, - 0, - 0); - - lpCurrentMode = This->DeskExtInterface->GetCurrentMode(This->DeskExtInterface->Context); - - do - { - lpMode = This->DeskExtInterface->EnumAllModes(This->DeskExtInterface->Context, - dwIndex++); - if (lpMode != NULL && - lpMode->dmBitsPerPel == lpCurrentMode->dmBitsPerPel && - lpMode->dmPelsWidth == lpCurrentMode->dmPelsWidth && - lpMode->dmPelsHeight == lpCurrentMode->dmPelsHeight) - { - /* We're only interested in refresh rates for the current resolution and color depth */ - - if (lpMode->dmDisplayFrequency <= 1) - { - /* Default hardware frequency */ - if (bHasDef) - continue; - - bHasDef = TRUE; - - if (!LoadString(hInstance, - IDS_USEDEFFRQUENCY, - szBuffer, - sizeof(szBuffer) / sizeof(szBuffer[0]))) - { - szBuffer[0] = TEXT('\0'); - } - } - else - { - TCHAR szFmt[64]; - - if (!LoadString(hInstance, - IDS_FREQFMT, - szFmt, - sizeof(szFmt) / sizeof(szFmt[0]))) - { - szFmt[0] = TEXT('\0'); - } - - _sntprintf(szBuffer, - sizeof(szBuffer) / sizeof(szBuffer[0]), - szFmt, - lpMode->dmDisplayFrequency); - } - - i = (INT)SendDlgItemMessage(This->hwndDlg, - IDC_REFRESHRATE, - CB_ADDSTRING, - 0, - (LPARAM)szBuffer); - if (i >= 0) - { - SendDlgItemMessage(This->hwndDlg, - IDC_REFRESHRATE, - CB_SETITEMDATA, - (WPARAM)lpMode, - 0); - - if (lpMode->dmDisplayFrequency == lpCurrentMode->dmDisplayFrequency) - { - SendDlgItemMessage(This->hwndDlg, - IDC_REFRESHRATE, - CB_SETCURSEL, - (WPARAM)i, - 0); - } - } - } - - } while (lpMode != NULL); - - /* FIXME: Update pruning mode controls */ - - /* FIXME: Enable/Disable properties button */ + if (This->dwMonitorCount > 1) + { + This->SelMonitor = NULL; + + i = (INT)SendDlgItemMessage(This->hwndDlg, + IDC_MONITORLIST, + LB_GETCURSEL, + 0, + 0); + if (i >= 0) + { + This->SelMonitor = (PDESKMONINFO)SendDlgItemMessage(This->hwndDlg, + IDC_MONITORLIST, + LB_GETITEMDATA, + (WPARAM)i, + 0); + } + } + else + This->SelMonitor = This->Monitors; + EnableWindow(GetDlgItem(This->hwndDlg, IDC_MONITORPROPERTIES), - FALSE); + This->SelMonitor != NULL); } static VOID @@ -143,7 +91,11 @@ DISPLAY_DEVICE dd; BOOL bRet; INT i; - DWORD dwIndex = 0; + DWORD dwIndex; + PDEVMODEW lpCurrentMode, lpMode; + TCHAR szBuffer[64]; + BOOL bHasDef = FALSE; + BOOL bAdded = FALSE; /* Free all allocated monitors */ pmi = This->Monitors; @@ -169,6 +121,7 @@ if (This->lpDisplayDevice != NULL) { /* Enumerate all monitors */ + dwIndex = 0; pmilink = &This->Monitors; do @@ -273,7 +226,102 @@ IDC_MONITORLIST), (This->dwMonitorCount > 1 ? SW_SHOW : SW_HIDE)); - UpdateMonitorDialogControls(This); + /* Fill the refresh rate combo box */ + SendDlgItemMessage(This->hwndDlg, + IDC_REFRESHRATE, + CB_RESETCONTENT, + 0, + 0); + + lpCurrentMode = This->DeskExtInterface->GetCurrentMode(This->DeskExtInterface->Context); + dwIndex = 0; + + do + { + lpMode = This->DeskExtInterface->EnumAllModes(This->DeskExtInterface->Context, + dwIndex++); + if (lpMode != NULL && + lpMode->dmBitsPerPel == lpCurrentMode->dmBitsPerPel && + lpMode->dmPelsWidth == lpCurrentMode->dmPelsWidth && + lpMode->dmPelsHeight == lpCurrentMode->dmPelsHeight) + { + /* We're only interested in refresh rates for the current resolution and color depth */ + + if (lpMode->dmDisplayFrequency <= 1) + { + /* Default hardware frequency */ + if (bHasDef) + continue; + + bHasDef = TRUE; + + if (!LoadString(hInstance, + IDS_USEDEFFRQUENCY, + szBuffer, + sizeof(szBuffer) / sizeof(szBuffer[0]))) + { + szBuffer[0] = TEXT('\0'); + } + } + else + { + TCHAR szFmt[64]; + + if (!LoadString(hInstance, + IDS_FREQFMT, + szFmt, + sizeof(szFmt) / sizeof(szFmt[0]))) + { + szFmt[0] = TEXT('\0'); + } + + _sntprintf(szBuffer, + sizeof(szBuffer) / sizeof(szBuffer[0]), + szFmt, + lpMode->dmDisplayFrequency); + } + + i = (INT)SendDlgItemMessage(This->hwndDlg, + IDC_REFRESHRATE, + CB_ADDSTRING, + 0, + (LPARAM)szBuffer); + if (i >= 0) + { + bAdded = TRUE; + + SendDlgItemMessage(This->hwndDlg, + IDC_REFRESHRATE, + CB_SETITEMDATA, + (WPARAM)lpMode, + 0); + + if (lpMode->dmDisplayFrequency == lpCurrentMode->dmDisplayFrequency) + { + SendDlgItemMessage(This->hwndDlg, + IDC_REFRESHRATE, + CB_SETCURSEL, + (WPARAM)i, + 0); + } + } + } + + } while (lpMode != NULL); + + EnableWindow(GetDlgItem(This->hwndDlg, + IDS_MONITORSETTINGSGROUP), + bAdded); + EnableWindow(GetDlgItem(This->hwndDlg, + IDS_REFRESHRATELABEL), + bAdded); + EnableWindow(GetDlgItem(This->hwndDlg, + IDC_REFRESHRATE), + bAdded); + + /* FIXME: Update pruning mode controls */ + + UpdateMonitorSelection(This); } static LONG @@ -313,33 +361,6 @@ This->DeskExtInterface->SetCurrentMode(This->DeskExtInterface->Context, This->lpDevModeOnInit); } -} - -static BOOL -UpdateMonitorSelection(PDESKMONITOR This) -{ - INT i; - - if (This->dwMonitorCount <= 1) - return FALSE; - - i = (INT)SendDlgItemMessage(This->hwndDlg, - IDC_MONITORLIST, - LB_GETCURSEL, - 0, - 0); - if (i >= 0) - { - This->SelMonitor = (PDESKMONINFO)SendDlgItemMessage(This->hwndDlg, - IDC_MONITORLIST, - LB_GETITEMDATA, - (WPARAM)i, - 0); - } - else - This->SelMonitor = NULL; - - return TRUE; } static INT_PTR CALLBACK @@ -374,14 +395,12 @@ switch (LOWORD(wParam)) { case IDC_MONITORPROPERTIES: + ShowMonitorProperties(This); break; case IDC_MONITORLIST: if (HIWORD(wParam) == LBN_SELCHANGE) - { - if (UpdateMonitorSelection(This)) - UpdateMonitorDialogControls(This); - } + UpdateMonitorSelection(This); break; } break;

16 years, 11 months

[fireball] 29256: - Copy uniata source code to the drivers/storage/ide directory.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Sep 27 22:37:22 2007 New Revision: 29256 URL: http://svn.reactos.org/svn/reactos?rev=29256&view=rev Log: - Copy uniata source code to the drivers/storage/ide directory. Added: trunk/reactos/drivers/storage/ide/uniata/ (with props) trunk/reactos/drivers/storage/ide/uniata/atapi.h - copied unchanged from r29255, vendor/uniata/current/driver/atapi.h trunk/reactos/drivers/storage/ide/uniata/badblock.h - copied unchanged from r29255, vendor/uniata/current/driver/badblock.h trunk/reactos/drivers/storage/ide/uniata/bm_devs.h - copied unchanged from r29255, vendor/uniata/current/driver/bm_devs.h trunk/reactos/drivers/storage/ide/uniata/bsmaster.h - copied unchanged from r29255, vendor/uniata/current/driver/bsmaster.h trunk/reactos/drivers/storage/ide/uniata/config.h - copied unchanged from r29255, vendor/uniata/current/driver/config.h trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp - copied unchanged from r29255, vendor/uniata/current/driver/id_ata.cpp trunk/reactos/drivers/storage/ide/uniata/id_badblock.cpp - copied unchanged from r29255, vendor/uniata/current/driver/id_badblock.cpp trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp - copied unchanged from r29255, vendor/uniata/current/driver/id_dma.cpp trunk/reactos/drivers/storage/ide/uniata/id_init.cpp - copied unchanged from r29255, vendor/uniata/current/driver/id_init.cpp trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp - copied unchanged from r29255, vendor/uniata/current/driver/id_probe.cpp trunk/reactos/drivers/storage/ide/uniata/id_queue.cpp - copied unchanged from r29255, vendor/uniata/current/driver/id_queue.cpp trunk/reactos/drivers/storage/ide/uniata/id_queue.h - copied unchanged from r29255, vendor/uniata/current/driver/id_queue.h trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp - copied unchanged from r29255, vendor/uniata/current/driver/id_sata.cpp trunk/reactos/drivers/storage/ide/uniata/id_sata.h - copied unchanged from r29255, vendor/uniata/current/driver/id_sata.h trunk/reactos/drivers/storage/ide/uniata/idedma.def - copied unchanged from r29255, vendor/uniata/current/driver/idedma.def trunk/reactos/drivers/storage/ide/uniata/idedma.rc - copied unchanged from r29255, vendor/uniata/current/driver/idedma.rc trunk/reactos/drivers/storage/ide/uniata/inc/ (props changed) - copied from r29255, vendor/uniata/current/driver/inc/ trunk/reactos/drivers/storage/ide/uniata/ntddk_ex.h - copied unchanged from r29255, vendor/uniata/current/driver/ntddk_ex.h trunk/reactos/drivers/storage/ide/uniata/ntddscsi.h - copied unchanged from r29255, vendor/uniata/current/driver/ntddscsi.h trunk/reactos/drivers/storage/ide/uniata/scsi.h - copied unchanged from r29255, vendor/uniata/current/driver/scsi.h trunk/reactos/drivers/storage/ide/uniata/srb.h - copied unchanged from r29255, vendor/uniata/current/driver/srb.h trunk/reactos/drivers/storage/ide/uniata/stdafx.cpp - copied unchanged from r29255, vendor/uniata/current/driver/stdafx.cpp trunk/reactos/drivers/storage/ide/uniata/stdafx.h - copied unchanged from r29255, vendor/uniata/current/driver/stdafx.h trunk/reactos/drivers/storage/ide/uniata/tools.h - copied unchanged from r29255, vendor/uniata/current/driver/tools.h trunk/reactos/drivers/storage/ide/uniata/uata_ctl.h - copied unchanged from r29255, vendor/uniata/current/driver/uata_ctl.h trunk/reactos/drivers/storage/ide/uniata/uniata_ver.h - copied unchanged from r29255, vendor/uniata/current/driver/uniata_ver.h Propchange: trunk/reactos/drivers/storage/ide/uniata/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Sep 27 22:37:22 2007 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/drivers/storage/ide/uniata/inc/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Sep 27 22:37:22 2007 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln

16 years, 11 months

[fireball] 29255: - Rename to current.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Sep 27 22:33:45 2007 New Revision: 29255 URL: http://svn.reactos.org/svn/reactos?rev=29255&view=rev Log: - Rename to current. Added: vendor/uniata/current/ - copied from r29254, vendor/uniata/0.38c2/ Removed: vendor/uniata/0.38c2/

16 years, 11 months

[fireball] 29254: - Add missing KERNEL_LARGE_STACK_COMMIT definition to DDK. - Fix typo in MMWSL. - Add RtlRandom to NDK. - Add MEMORY_PRIORITY values to NDK. - Add KeAcquireSpinLockRaiseToSynch to NDK. - Make MmInitializeProcessAddressSpace take two more parameters: one to specify flags, such as large page support, and another one to define the process being cloned, when fork() support will be added. - Add KeInvalidAccessAllowed to deal with page faults in the special S-List code. The assembly

by fireball＠svn.reactos.org

Author: fireball Date: Thu Sep 27 22:07:44 2007 New Revision: 29254 URL: http://svn.reactos.org/svn/reactos?rev=29254&view=rev Log: - Add missing KERNEL_LARGE_STACK_COMMIT definition to DDK. - Fix typo in MMWSL. - Add RtlRandom to NDK. - Add MEMORY_PRIORITY values to NDK. - Add KeAcquireSpinLockRaiseToSynch to NDK. - Make MmInitializeProcessAddressSpace take two more parameters: one to specify flags, such as large page support, and another one to define the process being cloned, when fork() support will be added. - Add KeInvalidAccessAllowed to deal with page faults in the special S-List code. The assembly code currently handles simple faults, but our MmAccessFault handler needs to start verifying the fault too. - Mark LoaderReserve pages as LoaderFree, it seems they end up this way in Windows. - Use MmNumberOfPhysicalPages instead of MmStats.NrTotalPages. All NDK changes are discussed with Alex. Modified: trunk/reactos/include/ddk/winddk.h trunk/reactos/include/ndk/kefuncs.h trunk/reactos/include/ndk/mmtypes.h trunk/reactos/include/ndk/pstypes.h trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/ke/bug.c trunk/reactos/ntoskrnl/ke/freeldr.c trunk/reactos/ntoskrnl/ke/i386/exp.c trunk/reactos/ntoskrnl/ke/i386/ldt.c trunk/reactos/ntoskrnl/mm/mminit.c trunk/reactos/ntoskrnl/mm/procsup.c trunk/reactos/ntoskrnl/ps/process.c (contents, props changed) Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=2… ============================================================================== --- trunk/reactos/include/ddk/winddk.h (original) +++ trunk/reactos/include/ddk/winddk.h Thu Sep 27 22:07:44 2007 @@ -231,7 +231,7 @@ #define KERNEL_STACK_SIZE 12288 #define KERNEL_LARGE_STACK_SIZE 61440 - +#define KERNEL_LARGE_STACK_COMMIT 12288 #define DPFLTR_ERROR_LEVEL 0 #define DPFLTR_WARNING_LEVEL 1 Modified: trunk/reactos/include/ndk/kefuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/kefuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/kefuncs.h (original) +++ trunk/reactos/include/ndk/kefuncs.h Thu Sep 27 22:07:44 2007 @@ -133,6 +133,11 @@ IN PKLOCK_QUEUE_HANDLE LockHandle ); +KIRQL +FASTCALL +KeAcquireSpinLockRaiseToSynch( + IN OUT PKSPIN_LOCK SpinLock +); // // Interrupt Functions Modified: trunk/reactos/include/ndk/mmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/mmtypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/mmtypes.h (original) +++ trunk/reactos/include/ndk/mmtypes.h Thu Sep 27 22:07:44 2007 @@ -548,7 +548,7 @@ ULONG NextSlot; PMMWSLE Wsle; ULONG LastInitializedWsle; - ULONG NonDirectcout; + ULONG NonDirectCount; PMMWSLE_HASH HashTable; ULONG HashTableSize; ULONG NumberOfCommittedPageTables; Modified: trunk/reactos/include/ndk/pstypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/pstypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/pstypes.h (original) +++ trunk/reactos/include/ndk/pstypes.h Thu Sep 27 22:07:44 2007 @@ -97,6 +97,13 @@ #define PROCESS_PRIORITY_IDLE 3 #define PROCESS_PRIORITY_NORMAL 8 #define PROCESS_PRIORITY_NORMAL_FOREGROUND 9 + +// +// Process memory priorities +// +#define MEMORY_PRIORITY_BACKGROUND 0 +#define MEMORY_PRIORITY_UNKNOWN 1 +#define MEMORY_PRIORITY_FOREGROUND 2 // // Process Priority Separation Values (OR) Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h (original) +++ trunk/reactos/include/ndk/rtlfuncs.h Thu Sep 27 22:07:44 2007 @@ -2923,6 +2923,13 @@ NTSYSAPI ULONG NTAPI +RtlRandom( + IN OUT PULONG Seed +); + +NTSYSAPI +ULONG +NTAPI RtlComputeCrc32( IN USHORT PartialCrc, IN PUCHAR Buffer, Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=292… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c (original) +++ trunk/reactos/ntoskrnl/ex/init.c Thu Sep 27 22:07:44 2007 @@ -1483,7 +1483,7 @@ &MsgEntry); /* Get total RAM size */ - Size = MmStats.NrTotalPages * PAGE_SIZE / 1024 / 1024; + Size = MmNumberOfPhysicalPages * PAGE_SIZE / 1024 / 1024; /* Create the string */ StringBuffer = InitBuffer->VersionBuffer; Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h Thu Sep 27 22:07:44 2007 @@ -760,6 +760,10 @@ KeZeroPages(IN PVOID Address, IN ULONG Size); +BOOLEAN +FASTCALL +KeInvalidAccessAllowed(IN PVOID TrapInformation OPTIONAL); + VOID NTAPI KeRosDumpStackFrames( Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h Thu Sep 27 22:07:44 2007 @@ -13,6 +13,7 @@ extern ULONG MmTotalPagedPoolQuota; extern ULONG MmTotalNonPagedPoolQuota; extern PHYSICAL_ADDRESS MmSharedDataPagePhysicalAddress; +extern ULONG MmNumberOfPhysicalPages; extern PVOID MmPagedPoolBase; extern ULONG MmPagedPoolSize; @@ -614,7 +615,9 @@ NTAPI MmInitializeProcessAddressSpace( IN PEPROCESS Process, + IN PEPROCESS Clone OPTIONAL, IN PVOID Section OPTIONAL, + IN OUT PULONG Flags, IN POBJECT_NAME_INFORMATION *AuditName OPTIONAL ); Modified: trunk/reactos/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/bug.c?rev=2925… ============================================================================== --- trunk/reactos/ntoskrnl/ke/bug.c (original) +++ trunk/reactos/ntoskrnl/ke/bug.c Thu Sep 27 22:07:44 2007 @@ -249,7 +249,7 @@ &KeRosBiosVersion, &KeRosVideoBiosDate, &KeRosVideoBiosVersion, - MmStats.NrTotalPages * PAGE_SIZE); + MmNumberOfPhysicalPages * PAGE_SIZE); #endif } @@ -971,12 +971,6 @@ } } - /* ROS HACK: Unlock the Kernel Address Space if we own it */ - if (KernelAddressSpaceLock.Owner == KeGetCurrentThread()) - { - MmUnlockAddressSpace(MmGetKernelAddressSpace()); - } - /* Raise IRQL to HIGH_LEVEL */ _disable(); KfRaiseIrql(HIGH_LEVEL); Modified: trunk/reactos/ntoskrnl/ke/freeldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/freeldr.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/freeldr.c (original) +++ trunk/reactos/ntoskrnl/ke/freeldr.c Thu Sep 27 22:07:44 2007 @@ -427,8 +427,8 @@ { /* It's over 16MB, so that memory gets marked as reserve */ Status = KiRosConfigureArcDescriptor(PageStart, - PageEnd, - LoaderReserve); + PageEnd, + LoaderFree); } else { @@ -448,7 +448,7 @@ /* Any code in the memory hole region ends up as reserve */ Status = KiRosConfigureArcDescriptor(PageStart, PageEnd, - LoaderReserve); + LoaderFree); } /* If we failed, break out, otherwise, go to the next BIOS block */ Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/exp.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/exp.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/exp.c Thu Sep 27 22:07:44 2007 @@ -799,6 +799,45 @@ if (OldIrql < APC_LEVEL) KeLowerIrql(OldIrql); } +BOOLEAN +FASTCALL +KeInvalidAccessAllowed(IN PVOID TrapInformation OPTIONAL) +{ + ULONG Eip; + PKTRAP_FRAME TrapFrame = TrapInformation; + VOID NTAPI ExpInterlockedPopEntrySListFault(VOID); + + /* Don't do anything if we didn't get a trap frame */ + if (!TrapInformation) return FALSE; + + /* Check where we came from */ + switch (TrapFrame->SegCs) + { + /* Kernel mode */ + case KGDT_R0_CODE: + + /* Allow S-LIST Routine to fail */ + Eip = (ULONG)&ExpInterlockedPopEntrySListFault; + break; + + /* User code */ + case KGDT_R3_CODE | RPL_MASK: + + /* Allow S-LIST Routine to fail */ + //Eip = (ULONG)KeUserPopEntrySListFault; + Eip = 0; + break; + + default: + + /* Anything else gets a bugcheck */ + Eip = 0; + } + + /* Return TRUE if we want to keep the system up */ + return (TrapFrame->Eip == Eip) ? TRUE : FALSE; +} + VOID NTAPI KiDispatchException(IN PEXCEPTION_RECORD ExceptionRecord, Modified: trunk/reactos/ntoskrnl/ke/i386/ldt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/ldt.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/ldt.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/ldt.c Thu Sep 27 22:07:44 2007 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/ke/i386/ldt.c @@ -221,3 +220,4 @@ return STATUS_SUCCESS; } + Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c Thu Sep 27 22:07:44 2007 @@ -37,6 +37,8 @@ PVOID MiNonPagedPoolStart; ULONG MiNonPagedPoolLength; + +ULONG MmNumberOfPhysicalPages; VOID INIT_FUNCTION NTAPI MmInitVirtualMemory(ULONG_PTR LastKernelAddress, ULONG KernelLength); @@ -347,6 +349,7 @@ * Free physical memory not used by the kernel */ MmStats.NrTotalPages = MmFreeLdrMemHigher/4; + MmNumberOfPhysicalPages = MmStats.NrTotalPages; if (!MmStats.NrTotalPages) { DbgPrint("Memory not detected, default to 8 MB\n"); @@ -427,13 +430,18 @@ MmInitSystem(IN ULONG Phase, IN PLOADER_PARAMETER_BLOCK LoaderBlock) { + ULONG Flags = 0; if (Phase == 0) { /* Initialize the Loader Lock */ KeInitializeMutant(&MmSystemLoadLock, FALSE); /* Initialize the address space for the system process */ - MmInitializeProcessAddressSpace(PsGetCurrentProcess(), NULL, NULL); + MmInitializeProcessAddressSpace(PsGetCurrentProcess(), + NULL, + NULL, + &Flags, + NULL); /* Reload boot drivers */ MiReloadBootLoadedDrivers(LoaderBlock); Modified: trunk/reactos/ntoskrnl/mm/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/procsup.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/procsup.c (original) +++ trunk/reactos/ntoskrnl/mm/procsup.c Thu Sep 27 22:07:44 2007 @@ -498,7 +498,9 @@ NTSTATUS NTAPI MmInitializeProcessAddressSpace(IN PEPROCESS Process, + IN PEPROCESS ProcessClone OPTIONAL, IN PVOID Section OPTIONAL, + IN OUT PULONG Flags, IN POBJECT_NAME_INFORMATION *AuditName OPTIONAL) { NTSTATUS Status; Modified: trunk/reactos/ntoskrnl/ps/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/process.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ps/process.c (original) +++ trunk/reactos/ntoskrnl/ps/process.c Thu Sep 27 22:07:44 2007 @@ -555,7 +555,7 @@ /* Set default exit code */ Process->ExitStatus = STATUS_TIMEOUT; - + /* Check if this is the initial process being built */ if (Parent) { @@ -576,7 +576,7 @@ Status = MmInitializeHandBuiltProcess(Process, &DirectoryTableBase); if (!NT_SUCCESS(Status)) goto CleanupWithRef; } - + /* We now have an address space */ InterlockedOr((PLONG)&Process->Flags, PSF_HAS_ADDRESS_SPACE_BIT); @@ -596,7 +596,7 @@ /* Set default priority class */ Process->PriorityClass = PROCESS_PRIORITY_CLASS_NORMAL; - + /* Check if we have a parent */ if (Parent) { @@ -628,7 +628,9 @@ { /* Initialize the address space */ Status = MmInitializeProcessAddressSpace(Process, + NULL, SectionObject, + &Flags, &Process-> SeAuditProcessCreationInfo. ImageFileName); @@ -644,13 +646,13 @@ } else { - /* This is a system process other than the boot one (MmInit1) */ + /* This is the initial system process */ Flags &= ~PS_LARGE_PAGES; Status = MmInitializeProcessAddressSpace(Process, NULL, - &Process-> - SeAuditProcessCreationInfo. - ImageFileName); + NULL, + &Flags, + NULL); if (!NT_SUCCESS(Status)) goto CleanupWithRef; /* Create a dummy image file name */ @@ -670,7 +672,7 @@ sizeof(OBJECT_NAME_INFORMATION)); } } - + /* Check if we have a section object and map the system DLL */ if (SectionObject) PspMapSystemDll(Process, NULL, FALSE); @@ -680,6 +682,7 @@ Process->UniqueProcessId = ExCreateHandle(PspCidTable, &CidEntry); if (!Process->UniqueProcessId) { + /* Fail */ Status = STATUS_INSUFFICIENT_RESOURCES; goto CleanupWithRef; } @@ -701,6 +704,7 @@ /* Create PEB only for User-Mode Processes */ if (Parent) { + /* Create it */ Status = MmCreatePeb(Process); if (!NT_SUCCESS(Status)) goto CleanupWithRef; } Propchange: trunk/reactos/ntoskrnl/ps/process.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

16 years, 11 months

[fireball] 29253: - Vendor import uniata 0.38c2. Authorship and license are listed in the header of every source code file.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Sep 27 21:58:24 2007 New Revision: 29253 URL: http://svn.reactos.org/svn/reactos?rev=29253&view=rev Log: - Vendor import uniata 0.38c2. Authorship and license are listed in the header of every source code file. Added: vendor/uniata/ vendor/uniata/0.38c2/ vendor/uniata/0.38c2/atactl/ vendor/uniata/0.38c2/atactl/Makefile (with props) vendor/uniata/0.38c2/atactl/atactl.cpp (with props) vendor/uniata/0.38c2/atactl/atactl.dep (with props) vendor/uniata/0.38c2/atactl/atactl.dsp (with props) vendor/uniata/0.38c2/atactl/atactl.dsw (with props) vendor/uniata/0.38c2/atactl/atactl.mak (with props) vendor/uniata/0.38c2/build_inf/ vendor/uniata/0.38c2/build_inf/Makefile (with props) vendor/uniata/0.38c2/build_inf/build_inf.cpp (with props) vendor/uniata/0.38c2/build_inf/build_inf.dep (with props) vendor/uniata/0.38c2/build_inf/build_inf.dsp (with props) vendor/uniata/0.38c2/build_inf/build_inf.dsw (with props) vendor/uniata/0.38c2/build_inf/build_inf.mak (with props) vendor/uniata/0.38c2/building.txt (with props) vendor/uniata/0.38c2/driver/ vendor/uniata/0.38c2/driver/Dist/ vendor/uniata/0.38c2/driver/Dist/OEMSETUP.INF (with props) vendor/uniata/0.38c2/driver/Dist/PciDumpEx.sys (with props) vendor/uniata/0.38c2/driver/Dist/TXTSETUP.OEM (with props) vendor/uniata/0.38c2/driver/Dist/atactl.exe (with props) vendor/uniata/0.38c2/driver/Dist/build_inf.exe (with props) vendor/uniata/0.38c2/driver/Dist/drv_ctl.exe (with props) vendor/uniata/0.38c2/driver/Dist/fix_dep.bat (with props) vendor/uniata/0.38c2/driver/Dist/readme_nt4.txt (with props) vendor/uniata/0.38c2/driver/Dist/readme_nt4_23c.txt (with props) vendor/uniata/0.38c2/driver/Dist/readme_nt4_old.txt (with props) vendor/uniata/0.38c2/driver/Dist/readme_w2k.txt (with props) vendor/uniata/0.38c2/driver/Dist/readme_xp.txt (with props) vendor/uniata/0.38c2/driver/Dist/rebuild_inf.bat (with props) vendor/uniata/0.38c2/driver/Dist/setup_nt3.bat (with props) vendor/uniata/0.38c2/driver/Dist/setup_w2k.bat (with props) vendor/uniata/0.38c2/driver/Dist/srchrep.exe (with props) vendor/uniata/0.38c2/driver/Dist/uata_2k.in_ (with props) vendor/uniata/0.38c2/driver/Dist/uata_2k.inf (with props) vendor/uniata/0.38c2/driver/Dist/uata_2k3.in_ (with props) vendor/uniata/0.38c2/driver/Dist/uata_2kh.inf (with props) vendor/uniata/0.38c2/driver/Dist/uata_nt4.bkp.inf (with props) vendor/uniata/0.38c2/driver/Dist/uata_nt4.inf (with props) vendor/uniata/0.38c2/driver/Dist/uata_xp.in_ (with props) vendor/uniata/0.38c2/driver/Dist/uata_xp.inf (with props) vendor/uniata/0.38c2/driver/Dist/uata_xph.inf (with props) vendor/uniata/0.38c2/driver/Dist/uniata (with props) vendor/uniata/0.38c2/driver/Dist/uniata_w2k.reg (with props) vendor/uniata/0.38c2/driver/Dist/uniata_w2k_uninst.reg (with props) vendor/uniata/0.38c2/driver/LOAD_S.BAT (with props) vendor/uniata/0.38c2/driver/LOAD_S2.BAT (with props) vendor/uniata/0.38c2/driver/LOAD_S2k.BAT (with props) vendor/uniata/0.38c2/driver/LOAD_S3.BAT (with props) vendor/uniata/0.38c2/driver/Lib/ vendor/uniata/0.38c2/driver/Lib/Debug/ vendor/uniata/0.38c2/driver/Lib/Debug/CrossNtK.lib (with props) vendor/uniata/0.38c2/driver/Lib/Debug/PostDbgMesgK.lib (with props) vendor/uniata/0.38c2/driver/Lib/Release/ vendor/uniata/0.38c2/driver/Lib/Release/CrossNtK.lib (with props) vendor/uniata/0.38c2/driver/Makefile (with props) vendor/uniata/0.38c2/driver/atapi.h (with props) vendor/uniata/0.38c2/driver/badblock.h (with props) vendor/uniata/0.38c2/driver/bm_devs.h (with props) vendor/uniata/0.38c2/driver/bsmaster.h (with props) vendor/uniata/0.38c2/driver/build.mak (with props) vendor/uniata/0.38c2/driver/config.h (with props) vendor/uniata/0.38c2/driver/id_ata.cpp (with props) vendor/uniata/0.38c2/driver/id_badblock.cpp (with props) vendor/uniata/0.38c2/driver/id_dma.cpp (with props) vendor/uniata/0.38c2/driver/id_init.cpp (with props) vendor/uniata/0.38c2/driver/id_probe.cpp (with props) vendor/uniata/0.38c2/driver/id_queue.cpp (with props) vendor/uniata/0.38c2/driver/id_queue.h (with props) vendor/uniata/0.38c2/driver/id_sata.cpp (with props) vendor/uniata/0.38c2/driver/id_sata.h (with props) vendor/uniata/0.38c2/driver/idedma.def (with props) vendor/uniata/0.38c2/driver/idedma.dep (with props) vendor/uniata/0.38c2/driver/idedma.mak (with props) vendor/uniata/0.38c2/driver/idedma.rc (with props) vendor/uniata/0.38c2/driver/inc/ vendor/uniata/0.38c2/driver/inc/CrNtDecl.h (with props) vendor/uniata/0.38c2/driver/inc/CrNtStubs.h (with props) vendor/uniata/0.38c2/driver/inc/CrossNt.h (with props) vendor/uniata/0.38c2/driver/inc/PostDbgMesg.h (with props) vendor/uniata/0.38c2/driver/inc/misc.h (with props) vendor/uniata/0.38c2/driver/inc/rwlock.h (with props) vendor/uniata/0.38c2/driver/ntddk_ex.h (with props) vendor/uniata/0.38c2/driver/ntddscsi.h (with props) vendor/uniata/0.38c2/driver/scsi.h (with props) vendor/uniata/0.38c2/driver/srb.h (with props) vendor/uniata/0.38c2/driver/stdafx.cpp (with props) vendor/uniata/0.38c2/driver/stdafx.h (with props) vendor/uniata/0.38c2/driver/todo.txt (with props) vendor/uniata/0.38c2/driver/tools.h (with props) vendor/uniata/0.38c2/driver/uata_ctl.h (with props) vendor/uniata/0.38c2/driver/uniata.mak (with props) vendor/uniata/0.38c2/driver/uniata_ver.h (with props) vendor/uniata/0.38c2/driver/uniata_ver.h_ (with props) vendor/uniata/0.38c2/pkg_files.dist (with props) vendor/uniata/0.38c2/pkg_files.src (with props) [This mail would be too long, it was shortened to contain the URLs only.] Added: vendor/uniata/0.38c2/atactl/Makefile URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/atactl/Makefile?rev… Added: vendor/uniata/0.38c2/atactl/atactl.cpp URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/atactl/atactl.cpp?r… Added: vendor/uniata/0.38c2/atactl/atactl.dep URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/atactl/atactl.dep?r… Added: vendor/uniata/0.38c2/atactl/atactl.dsp URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/atactl/atactl.dsp?r… Added: vendor/uniata/0.38c2/atactl/atactl.dsw URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/atactl/atactl.dsw?r… Added: vendor/uniata/0.38c2/atactl/atactl.mak URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/atactl/atactl.mak?r… Added: vendor/uniata/0.38c2/build_inf/Makefile URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/build_inf/Makefile?… Added: vendor/uniata/0.38c2/build_inf/build_inf.cpp URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/build_inf/build_inf… Added: vendor/uniata/0.38c2/build_inf/build_inf.dep URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/build_inf/build_inf… Added: vendor/uniata/0.38c2/build_inf/build_inf.dsp URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/build_inf/build_inf… Added: vendor/uniata/0.38c2/build_inf/build_inf.dsw URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/build_inf/build_inf… Added: vendor/uniata/0.38c2/build_inf/build_inf.mak URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/build_inf/build_inf… Added: vendor/uniata/0.38c2/building.txt URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/building.txt?rev=29… Added: vendor/uniata/0.38c2/driver/Dist/OEMSETUP.INF URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/Dist/OEMSETU… Added: vendor/uniata/0.38c2/driver/Dist/PciDumpEx.sys URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/Dist/PciDump… Added: vendor/uniata/0.38c2/driver/Dist/TXTSETUP.OEM URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/Dist/TXTSETU… Added: vendor/uniata/0.38c2/driver/Dist/atactl.exe URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/Dist/atactl.… Added: vendor/uniata/0.38c2/driver/Dist/build_inf.exe URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/Dist/build_i… Added: vendor/uniata/0.38c2/driver/Dist/drv_ctl.exe URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/Dist/drv_ctl… Added: vendor/uniata/0.38c2/driver/Dist/fix_dep.bat URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/Dist/fix_dep… Added: vendor/uniata/0.38c2/driver/Dist/readme_nt4.txt URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/Dist/readme_… Added: vendor/uniata/0.38c2/driver/Dist/readme_nt4_23c.txt URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/Dist/readme_… Added: vendor/uniata/0.38c2/driver/Dist/readme_nt4_old.txt URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/Dist/readme_… Added: vendor/uniata/0.38c2/driver/Dist/readme_w2k.txt URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/Dist/readme_… Added: vendor/uniata/0.38c2/driver/Dist/readme_xp.txt URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/Dist/readme_… Added: vendor/uniata/0.38c2/driver/Dist/rebuild_inf.bat URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/Dist/rebuild… Added: vendor/uniata/0.38c2/driver/Dist/setup_nt3.bat URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/Dist/setup_n… Added: vendor/uniata/0.38c2/driver/Dist/setup_w2k.bat URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/Dist/setup_w… Added: vendor/uniata/0.38c2/driver/Dist/srchrep.exe URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/Dist/srchrep… Added: vendor/uniata/0.38c2/driver/Dist/uata_2k.in_ URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/Dist/uata_2k… Added: vendor/uniata/0.38c2/driver/Dist/uata_2k.inf URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/Dist/uata_2k… Added: vendor/uniata/0.38c2/driver/Dist/uata_2k3.in_ URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/Dist/uata_2k… Added: vendor/uniata/0.38c2/driver/Dist/uata_2kh.inf URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/Dist/uata_2k… Added: vendor/uniata/0.38c2/driver/Dist/uata_nt4.bkp.inf URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/Dist/uata_nt… Added: vendor/uniata/0.38c2/driver/Dist/uata_nt4.inf URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/Dist/uata_nt… Added: vendor/uniata/0.38c2/driver/Dist/uata_xp.in_ URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/Dist/uata_xp… Added: vendor/uniata/0.38c2/driver/Dist/uata_xp.inf URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/Dist/uata_xp… Added: vendor/uniata/0.38c2/driver/Dist/uata_xph.inf URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/Dist/uata_xp… Added: vendor/uniata/0.38c2/driver/Dist/uniata URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/Dist/uniata?… Added: vendor/uniata/0.38c2/driver/Dist/uniata_w2k.reg URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/Dist/uniata_… Added: vendor/uniata/0.38c2/driver/Dist/uniata_w2k_uninst.reg URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/Dist/uniata_… Added: vendor/uniata/0.38c2/driver/LOAD_S.BAT URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/LOAD_S.BAT?r… Added: vendor/uniata/0.38c2/driver/LOAD_S2.BAT URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/LOAD_S2.BAT?… Added: vendor/uniata/0.38c2/driver/LOAD_S2k.BAT URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/LOAD_S2k.BAT… Added: vendor/uniata/0.38c2/driver/LOAD_S3.BAT URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/LOAD_S3.BAT?… Added: vendor/uniata/0.38c2/driver/Lib/Debug/CrossNtK.lib URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/Lib/Debug/Cr… Added: vendor/uniata/0.38c2/driver/Lib/Debug/PostDbgMesgK.lib URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/Lib/Debug/Po… Added: vendor/uniata/0.38c2/driver/Lib/Release/CrossNtK.lib URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/Lib/Release/… Added: vendor/uniata/0.38c2/driver/Makefile URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/Makefile?rev… Added: vendor/uniata/0.38c2/driver/atapi.h URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/atapi.h?rev=… Added: vendor/uniata/0.38c2/driver/badblock.h URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/badblock.h?r… Added: vendor/uniata/0.38c2/driver/bm_devs.h URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/bm_devs.h?re… Added: vendor/uniata/0.38c2/driver/bsmaster.h URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/bsmaster.h?r… Added: vendor/uniata/0.38c2/driver/build.mak URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/build.mak?re… Added: vendor/uniata/0.38c2/driver/config.h URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/config.h?rev… Added: vendor/uniata/0.38c2/driver/id_ata.cpp URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/id_ata.cpp?r… Added: vendor/uniata/0.38c2/driver/id_badblock.cpp URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/id_badblock.… Added: vendor/uniata/0.38c2/driver/id_dma.cpp URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/id_dma.cpp?r… Added: vendor/uniata/0.38c2/driver/id_init.cpp URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/id_init.cpp?… Added: vendor/uniata/0.38c2/driver/id_probe.cpp URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/id_probe.cpp… Added: vendor/uniata/0.38c2/driver/id_queue.cpp URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/id_queue.cpp… Added: vendor/uniata/0.38c2/driver/id_queue.h URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/id_queue.h?r… Added: vendor/uniata/0.38c2/driver/id_sata.cpp URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/id_sata.cpp?… Added: vendor/uniata/0.38c2/driver/id_sata.h URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/id_sata.h?re… Added: vendor/uniata/0.38c2/driver/idedma.def URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/idedma.def?r… Added: vendor/uniata/0.38c2/driver/idedma.dep URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/idedma.dep?r… Added: vendor/uniata/0.38c2/driver/idedma.mak URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/idedma.mak?r… Added: vendor/uniata/0.38c2/driver/idedma.rc URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/idedma.rc?re… Added: vendor/uniata/0.38c2/driver/inc/CrNtDecl.h URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/inc/CrNtDecl… Added: vendor/uniata/0.38c2/driver/inc/CrNtStubs.h URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/inc/CrNtStub… Added: vendor/uniata/0.38c2/driver/inc/CrossNt.h URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/inc/CrossNt.… Added: vendor/uniata/0.38c2/driver/inc/PostDbgMesg.h URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/inc/PostDbgM… Added: vendor/uniata/0.38c2/driver/inc/misc.h URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/inc/misc.h?r… Added: vendor/uniata/0.38c2/driver/inc/rwlock.h URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/inc/rwlock.h… Added: vendor/uniata/0.38c2/driver/ntddk_ex.h URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/ntddk_ex.h?r… Added: vendor/uniata/0.38c2/driver/ntddscsi.h URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/ntddscsi.h?r… Added: vendor/uniata/0.38c2/driver/scsi.h URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/scsi.h?rev=2… Added: vendor/uniata/0.38c2/driver/srb.h URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/srb.h?rev=29… Added: vendor/uniata/0.38c2/driver/stdafx.cpp URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/stdafx.cpp?r… Added: vendor/uniata/0.38c2/driver/stdafx.h URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/stdafx.h?rev… Added: vendor/uniata/0.38c2/driver/todo.txt URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/todo.txt?rev… Added: vendor/uniata/0.38c2/driver/tools.h URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/tools.h?rev=… Added: vendor/uniata/0.38c2/driver/uata_ctl.h URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/uata_ctl.h?r… Added: vendor/uniata/0.38c2/driver/uniata.mak URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/uniata.mak?r… Added: vendor/uniata/0.38c2/driver/uniata_ver.h URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/uniata_ver.h… Added: vendor/uniata/0.38c2/driver/uniata_ver.h_ URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/uniata_ver.h… Added: vendor/uniata/0.38c2/pkg_files.dist URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/pkg_files.dist?rev=… Added: vendor/uniata/0.38c2/pkg_files.src URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/pkg_files.src?rev=2…

16 years, 11 months

[weiden] 29252: - Display a list of monitors if there's more than one monitor - Display a list of available refresh rates for the current mode

by weiden＠svn.reactos.org

Author: weiden Date: Thu Sep 27 21:53:14 2007 New Revision: 29252 URL: http://svn.reactos.org/svn/reactos?rev=29252&view=rev Log: - Display a list of monitors if there's more than one monitor - Display a list of available refresh rates for the current mode Modified: trunk/reactos/dll/win32/shellext/deskmon/deskmon.c trunk/reactos/dll/win32/shellext/deskmon/deskmon.h trunk/reactos/dll/win32/shellext/deskmon/lang/en-US.rc trunk/reactos/dll/win32/shellext/deskmon/resource.h Modified: trunk/reactos/dll/win32/shellext/deskmon/deskmon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskmon… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskmon/deskmon.c (original) +++ trunk/reactos/dll/win32/shellext/deskmon/deskmon.c Thu Sep 27 21:53:14 2007 @@ -5,26 +5,341 @@ static HINSTANCE hInstance; +#if 0 +#ifdef UNICODE +typedef INT_PTR (WINAPI *PDEVICEPROPERTIES)(HWND,LPCWSTR,LPCWSTR,BOOL); +#define FUNC_DEVICEPROPERTIES "DevicePropertiesW" +#else +typedef INT_PTR (WINAPI *PDEVICEPROPERTIES)(HWND,LPCWSTR,LPCSTR,BOOL); +#define FUNC_DEVICEPROPERTIES "DevicePropertiesA" +#endif + +static VOID +ShowMonitorProperties(PDESKMONITOR This, + LPCTSTR lpDevice) +{ + HMODULE hDevMgr; + PDEVICEPROPERTIES pDeviceProperties; + + hDevMgr = LoadLibrary(TEXT("devmgr.dll")); + if (hDevMgr != NULL) + { + pDeviceProperties = (PDEVICEPROPERTIESW)GetProcAddress(hDevMgr, + FUNC_DEVICEPROPERTIES); + if (pDeviceProperties != NULL) + { + pDeviceProperties(This->hwndDlg, + NULL, + lpDevice, + FALSE); + } + + FreeLibrary(hDevMgr); + } +} +#endif + +static VOID +UpdateMonitorDialogControls(PDESKMONITOR This) +{ + PDEVMODEW lpCurrentMode, lpMode; + DWORD dwIndex = 0; + TCHAR szBuffer[64]; + BOOL bHasDef = FALSE; + INT i; + + /* Fill the refresh rate combo box */ + SendDlgItemMessage(This->hwndDlg, + IDC_REFRESHRATE, + CB_RESETCONTENT, + 0, + 0); + + lpCurrentMode = This->DeskExtInterface->GetCurrentMode(This->DeskExtInterface->Context); + + do + { + lpMode = This->DeskExtInterface->EnumAllModes(This->DeskExtInterface->Context, + dwIndex++); + if (lpMode != NULL && + lpMode->dmBitsPerPel == lpCurrentMode->dmBitsPerPel && + lpMode->dmPelsWidth == lpCurrentMode->dmPelsWidth && + lpMode->dmPelsHeight == lpCurrentMode->dmPelsHeight) + { + /* We're only interested in refresh rates for the current resolution and color depth */ + + if (lpMode->dmDisplayFrequency <= 1) + { + /* Default hardware frequency */ + if (bHasDef) + continue; + + bHasDef = TRUE; + + if (!LoadString(hInstance, + IDS_USEDEFFRQUENCY, + szBuffer, + sizeof(szBuffer) / sizeof(szBuffer[0]))) + { + szBuffer[0] = TEXT('\0'); + } + } + else + { + TCHAR szFmt[64]; + + if (!LoadString(hInstance, + IDS_FREQFMT, + szFmt, + sizeof(szFmt) / sizeof(szFmt[0]))) + { + szFmt[0] = TEXT('\0'); + } + + _sntprintf(szBuffer, + sizeof(szBuffer) / sizeof(szBuffer[0]), + szFmt, + lpMode->dmDisplayFrequency); + } + + i = (INT)SendDlgItemMessage(This->hwndDlg, + IDC_REFRESHRATE, + CB_ADDSTRING, + 0, + (LPARAM)szBuffer); + if (i >= 0) + { + SendDlgItemMessage(This->hwndDlg, + IDC_REFRESHRATE, + CB_SETITEMDATA, + (WPARAM)lpMode, + 0); + + if (lpMode->dmDisplayFrequency == lpCurrentMode->dmDisplayFrequency) + { + SendDlgItemMessage(This->hwndDlg, + IDC_REFRESHRATE, + CB_SETCURSEL, + (WPARAM)i, + 0); + } + } + } + + } while (lpMode != NULL); + + /* FIXME: Update pruning mode controls */ + + /* FIXME: Enable/Disable properties button */ + EnableWindow(GetDlgItem(This->hwndDlg, + IDC_MONITORPROPERTIES), + FALSE); +} + static VOID InitMonitorDialog(PDESKMONITOR This) { - LPTSTR lpMonitorName; - - lpMonitorName = QueryDeskCplString(This->pdtobj, - RegisterClipboardFormat(DESK_EXT_MONITORNAME)); - if (lpMonitorName != NULL) - { + PDESKMONINFO pmi, pminext, *pmilink; + DISPLAY_DEVICE dd; + BOOL bRet; + INT i; + DWORD dwIndex = 0; + + /* Free all allocated monitors */ + pmi = This->Monitors; + This->Monitors = NULL; + while (pmi != NULL) + { + pminext = pmi->Next; + LocalFree((HLOCAL)pmi); + pmi = pminext; + } + + This->SelMonitor = NULL; + This->dwMonitorCount = 0; + + if (This->lpDisplayDevice != NULL) + LocalFree((HLOCAL)This->lpDisplayDevice); + + This->lpDisplayDevice = QueryDeskCplString(This->pdtobj, + RegisterClipboardFormat(DESK_EXT_DISPLAYDEVICE)); + + if (This->DeskExtInterface != NULL) + { + if (This->lpDisplayDevice != NULL) + { + /* Enumerate all monitors */ + pmilink = &This->Monitors; + + do + { + dd.cb = sizeof(dd); + bRet = EnumDisplayDevices(This->lpDisplayDevice, + dwIndex++, + &dd, + 0); + if (bRet) + { + pmi = LocalAlloc(LMEM_FIXED, + sizeof(*pmi)); + if (pmi != NULL) + { + CopyMemory(&pmi->dd, + &dd, + sizeof(dd)); + pmi->Next = NULL; + *pmilink = pmi; + pmilink = &pmi->Next; + + This->dwMonitorCount++; + } + } + } while (bRet); + } + + This->lpDevModeOnInit = This->DeskExtInterface->GetCurrentMode(This->DeskExtInterface->Context); + } + else + This->lpDevModeOnInit = NULL; + + /* Setup the UI depending on how many monitors are attached */ + if (This->dwMonitorCount == 0) + { + LPTSTR lpMonitorName; + + /* This is a fallback, let's hope that desk.cpl can provide us with a monitor name */ + lpMonitorName = QueryDeskCplString(This->pdtobj, + RegisterClipboardFormat(DESK_EXT_MONITORNAME)); + SetDlgItemText(This->hwndDlg, IDC_MONITORNAME, lpMonitorName); - LocalFree((HLOCAL)lpMonitorName); - } + if (lpMonitorName != NULL) + LocalFree((HLOCAL)lpMonitorName); + } + else if (This->dwMonitorCount == 1) + { + This->SelMonitor = This->Monitors; + SetDlgItemText(This->hwndDlg, + IDC_MONITORNAME, + This->Monitors->dd.DeviceString); + } + else + { + SendDlgItemMessage(This->hwndDlg, + IDC_MONITORLIST, + LB_RESETCONTENT, + 0, + 0); + + pmi = This->Monitors; + while (pmi != NULL) + { + i = (INT)SendDlgItemMessage(This->hwndDlg, + IDC_MONITORLIST, + LB_ADDSTRING, + 0, + (LPARAM)pmi->dd.DeviceString); + if (i >= 0) + { + SendDlgItemMessage(This->hwndDlg, + IDC_MONITORLIST, + LB_SETITEMDATA, + (WPARAM)i, + (LPARAM)pmi); + + if (This->SelMonitor == NULL) + { + SendDlgItemMessage(This->hwndDlg, + IDC_MONITORLIST, + LB_SETCURSEL, + (WPARAM)i, + 0); + + This->SelMonitor = pmi; + } + } + + pmi = pmi->Next; + } + } + + /* Show/Hide controls */ + ShowWindow(GetDlgItem(This->hwndDlg, + IDC_MONITORNAME), + (This->dwMonitorCount <= 1 ? SW_SHOW : SW_HIDE)); + ShowWindow(GetDlgItem(This->hwndDlg, + IDC_MONITORLIST), + (This->dwMonitorCount > 1 ? SW_SHOW : SW_HIDE)); + + UpdateMonitorDialogControls(This); +} + +static LONG +ApplyMonitorChanges(PDESKMONITOR This) +{ + LONG lChangeRet; if (This->DeskExtInterface != NULL) { - /* FIXME */ - } + /* Change the display settings through desk.cpl */ + lChangeRet = DeskCplExtDisplaySaveSettings(This->DeskExtInterface, + This->hwndDlg); + if (lChangeRet == DISP_CHANGE_SUCCESSFUL) + { + /* Save the new mode */ + This->lpDevModeOnInit = This->DeskExtInterface->GetCurrentMode(This->DeskExtInterface->Context); + return PSNRET_NOERROR; + } + else if (lChangeRet == DISP_CHANGE_RESTART) + { + /* Notify desk.cpl that the user needs to reboot */ + PropSheet_RestartWindows(GetParent(This->hwndDlg)); + return PSNRET_NOERROR; + } + } + + InitMonitorDialog(This); + + return PSNRET_INVALID_NOCHANGEPAGE; +} + +static VOID +ResetMonitorChanges(PDESKMONITOR This) +{ + if (This->DeskExtInterface != NULL && This->lpDevModeOnInit != NULL) + { + This->DeskExtInterface->SetCurrentMode(This->DeskExtInterface->Context, + This->lpDevModeOnInit); + } +} + +static BOOL +UpdateMonitorSelection(PDESKMONITOR This) +{ + INT i; + + if (This->dwMonitorCount <= 1) + return FALSE; + + i = (INT)SendDlgItemMessage(This->hwndDlg, + IDC_MONITORLIST, + LB_GETCURSEL, + 0, + 0); + if (i >= 0) + { + This->SelMonitor = (PDESKMONINFO)SendDlgItemMessage(This->hwndDlg, + IDC_MONITORLIST, + LB_GETITEMDATA, + (WPARAM)i, + 0); + } + else + This->SelMonitor = NULL; + + return TRUE; } static INT_PTR CALLBACK @@ -60,9 +375,37 @@ { case IDC_MONITORPROPERTIES: break; + + case IDC_MONITORLIST: + if (HIWORD(wParam) == LBN_SELCHANGE) + { + if (UpdateMonitorSelection(This)) + UpdateMonitorDialogControls(This); + } + break; } - break; + + case WM_NOTIFY: + { + NMHDR *nmh = (NMHDR *)lParam; + + switch (nmh->code) + { + case PSN_APPLY: + { + SetWindowLong(hwndDlg, + DWL_MSGRESULT, + ApplyMonitorChanges(This)); + break; + } + + case PSN_RESET: + ResetMonitorChanges(This); + break; + } + break; + } } return Ret; @@ -71,6 +414,8 @@ static VOID IDeskMonitor_Destroy(PDESKMONITOR This) { + PDESKMONINFO pmi, pminext; + if (This->pdtobj != NULL) { IDataObject_Release(This->pdtobj); @@ -81,6 +426,22 @@ { LocalFree((HLOCAL)This->DeskExtInterface); This->DeskExtInterface = NULL; + } + + if (This->lpDisplayDevice != NULL) + { + LocalFree((HLOCAL)This->lpDisplayDevice); + This->lpDisplayDevice = NULL; + } + + /* Free all monitors */ + pmi = This->Monitors; + This->Monitors = NULL; + while (pmi != NULL) + { + pminext = pmi->Next; + LocalFree((HLOCAL)pmi); + pmi = pminext; } } Modified: trunk/reactos/dll/win32/shellext/deskmon/deskmon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskmon… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskmon/deskmon.h (original) +++ trunk/reactos/dll/win32/shellext/deskmon/deskmon.h Thu Sep 27 21:53:14 2007 @@ -1,5 +1,11 @@ #ifndef __DESKMON__H #define __DESKMON__H + +typedef struct _DESKMONINFO +{ + DISPLAY_DEVICE dd; + struct _DESKMONINFO *Next; +} DESKMONINFO, *PDESKMONINFO; typedef struct _DESKMONITOR { @@ -11,6 +17,11 @@ HWND hwndDlg; PDESK_EXT_INTERFACE DeskExtInterface; IDataObject *pdtobj; + LPTSTR lpDisplayDevice; + DWORD dwMonitorCount; + PDESKMONINFO Monitors; + PDESKMONINFO SelMonitor; + PDEVMODEW lpDevModeOnInit; } DESKMONITOR, *PDESKMONITOR; extern LONG dll_refs; Modified: trunk/reactos/dll/win32/shellext/deskmon/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskmon… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskmon/lang/en-US.rc (original) +++ trunk/reactos/dll/win32/shellext/deskmon/lang/en-US.rc Thu Sep 27 21:53:14 2007 @@ -7,6 +7,16 @@ BEGIN GROUPBOX "Monitor type", -1, 7, 3, 237, 52 LTEXT "", IDC_MONITORNAME, 40, 17, 190, 20, SS_NOPREFIX + LISTBOX IDC_MONITORLIST, 40, 13, 196, 30, WS_VSCROLL PUSHBUTTON "&Properties", IDC_MONITORPROPERTIES, 177, 35, 59, 14, WS_DISABLED + GROUPBOX "Monitor settings", IDS_MONITORSETTINGSGROUP, 7, 58, 237, 47 + LTEXT "&Screen refresh rate:", IDS_REFRESHRATELABEL, 13, 73, 225, 8 + COMBOBOX IDC_REFRESHRATE, 13, 85, 225, 200, WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT END +STRINGTABLE +BEGIN + IDS_USEDEFFRQUENCY "Use hardware default setting" + IDS_FREQFMT "%u Hertz" +END + Modified: trunk/reactos/dll/win32/shellext/deskmon/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskmon… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskmon/resource.h (original) +++ trunk/reactos/dll/win32/shellext/deskmon/resource.h Thu Sep 27 21:53:14 2007 @@ -4,6 +4,13 @@ #define IDD_MONITOR 100 #define IDC_MONITORNAME 201 -#define IDC_MONITORPROPERTIES 202 +#define IDC_MONITORLIST 202 +#define IDC_MONITORPROPERTIES 203 +#define IDS_MONITORSETTINGSGROUP 204 +#define IDS_REFRESHRATELABEL 205 +#define IDC_REFRESHRATE 206 + +#define IDS_USEDEFFRQUENCY 101 +#define IDS_FREQFMT 102 #endif /* __RESOURCE__H */

16 years, 11 months

[tkreuzer] 29251: probe the pointer and some cleanup simplification

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Sep 27 21:25:40 2007 New Revision: 29251 URL: http://svn.reactos.org/svn/reactos?rev=29251&view=rev Log: probe the pointer and some cleanup simplification Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Thu Sep 27 21:25:40 2007 @@ -335,8 +335,8 @@ INT ret = 0; NTSTATUS Status = STATUS_SUCCESS; PDC pDC; - HBITMAP hSourceBitmap = NULL; - SURFOBJ *pDestSurf = NULL, *pSourceSurf = NULL; + HBITMAP hSourceBitmap; + SURFOBJ *pDestSurf, *pSourceSurf; RECTL rcDest; POINTL ptSource; INT DIBWidth; @@ -377,6 +377,7 @@ /* Enter SEH, as the bits are user mode */ _SEH_TRY { + ProbeForRead(Bits, DIBWidth * abs(bmi->bmiHeader.biHeight), 1); hSourceBitmap = EngCreateBitmap(SourceSize, DIBWidth, BitmapFormat(bmi->bmiHeader.biBitCount, bmi->bmiHeader.biCompression), @@ -392,6 +393,7 @@ pSourceSurf = EngLockSurface((HSURF)hSourceBitmap); if (!pSourceSurf) { + EngDeleteSurface((HSURF)hSourceBitmap); Status = STATUS_UNSUCCESSFUL; _SEH_LEAVE; } @@ -412,6 +414,8 @@ NULL, ROP3_TO_ROP4(SRCCOPY)); + EngUnlockSurface(pSourceSurf); + EngDeleteSurface((HSURF)hSourceBitmap); } _SEH_HANDLE { @@ -425,21 +429,7 @@ ret = ScanLines; } - if (pSourceSurf) - { - EngUnlockSurface(pSourceSurf); - } - - if (hSourceBitmap) - { - EngDeleteSurface((HSURF)hSourceBitmap); - } - - if (pDestSurf) - { - EngUnlockSurface(pDestSurf); - } - + EngUnlockSurface(pDestSurf); DC_UnlockDc(pDC); return ret;

16 years, 11 months

← Newer
1
...
4
5
6
7
8
9
10
...
59
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2007