Ros-diffs September 2007

ros-diffs@reactos.org

19 participants
589 discussions

[silverblade] 29089: Bare-bones foundations of the ReactOS Audio Service. At present it's nothing more than a "mutex service". Some info on the planned implementation is in the included audiosrv.txt file.

by silverblade＠svn.reactos.org

Author: silverblade Date: Tue Sep 18 06:41:46 2007 New Revision: 29089 URL: http://svn.reactos.org/svn/reactos?rev=29089&view=rev Log: Bare-bones foundations of the ReactOS Audio Service. At present it's nothing more than a "mutex service". Some info on the planned implementation is in the included audiosrv.txt file. Added: trunk/reactos/base/services/audiosrv/ trunk/reactos/base/services/audiosrv/audiosrv.rbuild trunk/reactos/base/services/audiosrv/audiosrv.rc trunk/reactos/base/services/audiosrv/audiosrv.txt trunk/reactos/base/services/audiosrv/main.c Modified: trunk/reactos/base/services/services.rbuild Added: trunk/reactos/base/services/audiosrv/audiosrv.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/audiosrv/aud… ============================================================================== --- trunk/reactos/base/services/audiosrv/audiosrv.rbuild (added) +++ trunk/reactos/base/services/audiosrv/audiosrv.rbuild Tue Sep 18 06:41:46 2007 @@ -1,0 +1,10 @@ +<module name="audiosrv" type="win32cui" installbase="system32" installname="audiosrv.exe" allowwarnings="true"> + <include base="audiosrv">.</include> + <define name="__USE_W32API" /> + <define name="__REACTOS__" /> + <define name="_WIN32_WINNT">0x0501</define> + <library>kernel32</library> + <library>advapi32</library> + <file>main.c</file> + <file>audiosrv.rc</file> +</module> Added: trunk/reactos/base/services/audiosrv/audiosrv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/audiosrv/aud… ============================================================================== --- trunk/reactos/base/services/audiosrv/audiosrv.rc (added) +++ trunk/reactos/base/services/audiosrv/audiosrv.rc Tue Sep 18 06:41:46 2007 @@ -1,0 +1,4 @@ +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Audio Service" +#define REACTOS_STR_INTERNAL_NAME "audiosrv\0" +#define REACTOS_STR_ORIGINAL_FILENAME "audiosrv.dll\0" +#include <reactos/version.rc> Added: trunk/reactos/base/services/audiosrv/audiosrv.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/audiosrv/aud… ============================================================================== --- trunk/reactos/base/services/audiosrv/audiosrv.txt (added) +++ trunk/reactos/base/services/audiosrv/audiosrv.txt Tue Sep 18 06:41:46 2007 @@ -1,0 +1,39 @@ +ReactOS Audio Service (audiosrv.exe) +==================================== + +This is intended to operate in a similar manner to how the Windows Audio +Service does. + +NOTE: The service filename is audiosrv.dll on Windows XP. This shouldn't +have any impact on functionality. + +AudioSrv on Windows creates a mapped file at: +Global\mmGlobalPnpInfo + +This file appears to contain a list of devices that WinMM accesses and +subsequently passes to wdmaud.drv + +It is not necessary to duplicate the exact structure of this mapped +file, since it appears to only be used internally by Windows components. + +The ROS Audio Service (RosAudioSrv) is intended to be able to run +alongside the Windows Audio Service on XP/Vista, so it should be +possible to test in a "known working environment" ;) + +It will create a mutex, to: +1) Allow synchronization when accessing the device list +2) Provide a simple method of identifying if RosAudioSrv is running + +(It might be worth using an event to notify WinMM when things are +happening?) + +The intention is to make RosAudioSrv receive PnP notifications for +relevant audio devices, and also let AudioSrv in Windows do this. Then +it should be possible to create a small application that imitates +WinMM's actions :) + +So far, it doesn't do much... Watch this space! + + +Andrew Greenwood +September 2007 Added: trunk/reactos/base/services/audiosrv/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/audiosrv/mai… ============================================================================== --- trunk/reactos/base/services/audiosrv/main.c (added) +++ trunk/reactos/base/services/audiosrv/main.c Tue Sep 18 06:41:46 2007 @@ -1,0 +1,117 @@ +/* + * PROJECT: ReactOS + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/services/audiosrv/main.c + * PURPOSE: Audio Service + * COPYRIGHT: Copyright 2007 Andrew Greenwood + */ + +#include <windows.h> + +/* This is currently set to avoid conflicting service names in Windows! */ +#define SERVICE_NAME "RosAudioSrv" + +/* A named mutex is used for synchronizing access to the device list. + If this mutex doesn't exist, it means the audio service isn't running. */ +#define DEVICE_LIST_MUTEX_NAME "Global\\AudioDeviceListSync" + +/* ...and this is where the device list will be available */ +#define DEVICE_LIST_MAPPED_FILENAME "Global\\AudioDeviceList" + + + +/* Prototypes */ + +VOID CALLBACK +ServiceMain(DWORD argc, char** argv); + +VOID WINAPI +ServiceControlHandler(DWORD request); + + +/* Service table */ +SERVICE_TABLE_ENTRY service_table[2] = +{ + { "AudioSrv", (LPSERVICE_MAIN_FUNCTION) ServiceMain }, + { NULL, NULL } +}; + +SERVICE_STATUS_HANDLE service_status_handle; +SERVICE_STATUS service_status; + +/* Synchronization of access to the event list */ +HANDLE device_list_mutex = INVALID_HANDLE_VALUE; + + +/* Implementation */ + +VOID WINAPI +ServiceControlHandler(DWORD request) +{ + switch ( request ) + { + case SERVICE_CONTROL_STOP : + case SERVICE_CONTROL_SHUTDOWN : + { + service_status.dwCurrentState = SERVICE_STOP_PENDING; + SetServiceStatus(service_status_handle, &service_status); + + CloseHandle(device_list_mutex); + + service_status.dwWin32ExitCode = 0; + service_status.dwCurrentState = SERVICE_STOPPED; + + SetServiceStatus(service_status_handle, &service_status); + + return; + } + + + default : + break; + }; + + SetServiceStatus(service_status_handle, &service_status); +} + +VOID CALLBACK +ServiceMain(DWORD argc, char** argv) +{ + service_status_handle = RegisterServiceCtrlHandler(SERVICE_NAME, + ServiceControlHandler); + + /* Set these to defaults */ + service_status.dwServiceType = SERVICE_WIN32_OWN_PROCESS; + service_status.dwServiceSpecificExitCode = 0; + service_status.dwWin32ExitCode = NO_ERROR; + service_status.dwWaitHint = 0; + service_status.dwControlsAccepted = 0; + service_status.dwCheckPoint = 0; + + /* Tell SCM we're starting */ + service_status.dwCurrentState = SERVICE_START_PENDING; + SetServiceStatus(service_status_handle, &service_status); + + /* We should create the mapped section here along with the mutex to + sync access to the device list... */ + + device_list_mutex = CreateMutex(NULL, FALSE, DEVICE_LIST_MUTEX_NAME); + + if ( ! device_list_mutex) + { + service_status.dwCurrentState = SERVICE_STOPPED; + service_status.dwWin32ExitCode = -1; // ok? + SetServiceStatus(service_status_handle, &service_status); + return; + } + + /* Tell SCM we are now running, and we may be stopped */ + service_status.dwCurrentState = SERVICE_RUNNING; + service_status.dwControlsAccepted = SERVICE_ACCEPT_STOP; + SetServiceStatus(service_status_handle, &service_status); +} + +int main() +{ + StartServiceCtrlDispatcher(service_table); +} Modified: trunk/reactos/base/services/services.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/services.rbu… ============================================================================== --- trunk/reactos/base/services/services.rbuild (original) +++ trunk/reactos/base/services/services.rbuild Tue Sep 18 06:41:46 2007 @@ -1,6 +1,9 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> +<directory name="audiosrv"> + <xi:include href="audiosrv/audiosrv.rbuild" /> +</directory> <directory name="dhcp"> <xi:include href="dhcp/dhcp.rbuild" /> </directory>

17 years, 3 months

[ekohl] 29088: Merge all settings in a single struct. This is required to implement the administrative options.

by ekohl＠svn.reactos.org

Author: ekohl Date: Tue Sep 18 02:29:35 2007 New Revision: 29088 URL: http://svn.reactos.org/svn/reactos?rev=29088&view=rev Log: Merge all settings in a single struct. This is required to implement the administrative options. Modified: trunk/reactos/dll/cpl/access/access.c trunk/reactos/dll/cpl/access/access.h trunk/reactos/dll/cpl/access/display.c trunk/reactos/dll/cpl/access/general.c trunk/reactos/dll/cpl/access/keyboard.c trunk/reactos/dll/cpl/access/mouse.c trunk/reactos/dll/cpl/access/sound.c Modified: trunk/reactos/dll/cpl/access/access.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/access.c?re… ============================================================================== --- trunk/reactos/dll/cpl/access/access.c (original) +++ trunk/reactos/dll/cpl/access/access.c Tue Sep 18 02:29:35 2007 @@ -26,8 +26,9 @@ {IDI_CPLACCESS, IDS_CPLSYSTEMNAME, IDS_CPLSYSTEMDESCRIPTION, SystemApplet} }; + static VOID -InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc) +InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc, PGLOBAL_DATA pGlobalData) { ZeroMemory(psp, sizeof(PROPSHEETPAGE)); psp->dwSize = sizeof(PROPSHEETPAGE); @@ -35,6 +36,7 @@ psp->hInstance = hApplet; psp->pszTemplate = MAKEINTRESOURCE(idDlg); psp->pfnDlgProc = DlgProc; + psp->lParam = (LPARAM)pGlobalData; } @@ -43,11 +45,17 @@ LONG CALLBACK SystemApplet(VOID) { + PGLOBAL_DATA pGlobalData; PROPSHEETPAGE psp[5]; PROPSHEETHEADER psh; TCHAR Caption[1024]; + INT ret; LoadString(hApplet, IDS_CPLSYSTEMNAME, Caption, sizeof(Caption) / sizeof(TCHAR)); + + pGlobalData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(GLOBAL_DATA)); + if (pGlobalData == NULL) + return 0; ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); psh.dwSize = sizeof(PROPSHEETHEADER); @@ -60,13 +68,17 @@ psh.nStartPage = 0; psh.ppsp = psp; - InitPropSheetPage(&psp[0], IDD_PROPPAGEKEYBOARD, (DLGPROC)KeyboardPageProc); - InitPropSheetPage(&psp[1], IDD_PROPPAGESOUND, (DLGPROC)SoundPageProc); - InitPropSheetPage(&psp[2], IDD_PROPPAGEDISPLAY, (DLGPROC)DisplayPageProc); - InitPropSheetPage(&psp[3], IDD_PROPPAGEMOUSE, (DLGPROC)MousePageProc); - InitPropSheetPage(&psp[4], IDD_PROPPAGEGENERAL, (DLGPROC)GeneralPageProc); + InitPropSheetPage(&psp[0], IDD_PROPPAGEKEYBOARD, (DLGPROC)KeyboardPageProc, pGlobalData); + InitPropSheetPage(&psp[1], IDD_PROPPAGESOUND, (DLGPROC)SoundPageProc, pGlobalData); + InitPropSheetPage(&psp[2], IDD_PROPPAGEDISPLAY, (DLGPROC)DisplayPageProc, pGlobalData); + InitPropSheetPage(&psp[3], IDD_PROPPAGEMOUSE, (DLGPROC)MousePageProc, pGlobalData); + InitPropSheetPage(&psp[4], IDD_PROPPAGEGENERAL, (DLGPROC)GeneralPageProc, pGlobalData); - return (LONG)(PropertySheet(&psh) != -1); + ret = PropertySheet(&psh); + + HeapFree(GetProcessHeap(), 0, pGlobalData); + + return (LONG)(ret != -1); } /* Control Panel Callback */ Modified: trunk/reactos/dll/cpl/access/access.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/access.h?re… ============================================================================== --- trunk/reactos/dll/cpl/access/access.h (original) +++ trunk/reactos/dll/cpl/access/access.h Tue Sep 18 02:29:35 2007 @@ -10,6 +10,44 @@ INT idDescription; APPLET_INITPROC AppletProc; } APPLET, *PAPPLET; + + +typedef struct _GLOBAL_DATA +{ + /* keyboard page */ + STICKYKEYS stickyKeys; + STICKYKEYS oldStickyKeys; + FILTERKEYS filterKeys; + FILTERKEYS oldFilterKeys; + TOGGLEKEYS toggleKeys; + TOGGLEKEYS oldToggleKeys; + BOOL bKeyboardPref; + + /* sound page */ + SOUNDSENTRY ssSoundSentry; + BOOL bShowSounds; + + /* display page */ + HIGHCONTRAST highContrast; + UINT uCaretBlinkTime; + UINT uCaretWidth; + BOOL fShowCaret; + RECT rcCaret; + RECT rcOldCaret; + + /* mouse page */ + MOUSEKEYS mouseKeys; + + /* general page */ + ACCESSTIMEOUT accessTimeout; + SERIALKEYS serialKeys; + TCHAR szActivePort[MAX_PATH]; + TCHAR szPort[MAX_PATH]; + BOOL bWarningSounds; + BOOL bSoundOnActivation; + +} GLOBAL_DATA, *PGLOBAL_DATA; + extern HINSTANCE hApplet; Modified: trunk/reactos/dll/cpl/access/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/display.c?r… ============================================================================== --- trunk/reactos/dll/cpl/access/display.c (original) +++ trunk/reactos/dll/cpl/access/display.c Tue Sep 18 02:29:35 2007 @@ -16,15 +16,6 @@ #include "resource.h" #include "access.h" -typedef struct _GLOBAL_DATA -{ - HIGHCONTRAST highContrast; - UINT uCaretBlinkTime; - UINT uCaretWidth; - BOOL fShowCaret; - RECT rcCaret; - RECT rcOldCaret; -} GLOBAL_DATA, *PGLOBAL_DATA; #define ID_BLINK_TIMER 346 @@ -154,7 +145,7 @@ switch (uMsg) { case WM_INITDIALOG: - pGlobalData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(GLOBAL_DATA)); + pGlobalData = (PGLOBAL_DATA)((LPPROPSHEETPAGE)lParam)->lParam; if (pGlobalData == NULL) return FALSE; @@ -290,7 +281,6 @@ case WM_DESTROY: KillTimer(hwndDlg, ID_BLINK_TIMER); - HeapFree(GetProcessHeap(), 0, pGlobalData); break; } Modified: trunk/reactos/dll/cpl/access/general.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/general.c?r… ============================================================================== --- trunk/reactos/dll/cpl/access/general.c (original) +++ trunk/reactos/dll/cpl/access/general.c Tue Sep 18 02:29:35 2007 @@ -16,17 +16,6 @@ #include <tchar.h> #include "resource.h" #include "access.h" - - -typedef struct _GLOBAL_DATA -{ - ACCESSTIMEOUT accessTimeout; - SERIALKEYS serialKeys; - TCHAR szActivePort[MAX_PATH]; - TCHAR szPort[MAX_PATH]; - BOOL bWarningSounds; - BOOL bSoundOnActivation; -} GLOBAL_DATA, *PGLOBAL_DATA; #define BAUDTICKS 6 @@ -267,7 +256,7 @@ switch (uMsg) { case WM_INITDIALOG: - pGlobalData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(GLOBAL_DATA)); + pGlobalData = (PGLOBAL_DATA)((LPPROPSHEETPAGE)lParam)->lParam; if (pGlobalData == NULL) return FALSE; @@ -367,10 +356,7 @@ return TRUE; } break; - - case WM_DESTROY: - HeapFree(GetProcessHeap(), 0, pGlobalData); - break; } + } return FALSE; } Modified: trunk/reactos/dll/cpl/access/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/keyboard.c?… ============================================================================== --- trunk/reactos/dll/cpl/access/keyboard.c (original) +++ trunk/reactos/dll/cpl/access/keyboard.c Tue Sep 18 02:29:35 2007 @@ -17,17 +17,6 @@ #include "resource.h" #include "access.h" -typedef struct _GLOBAL_DATA -{ - STICKYKEYS stickyKeys; - STICKYKEYS oldStickyKeys; - FILTERKEYS filterKeys; - FILTERKEYS oldFilterKeys; - TOGGLEKEYS toggleKeys; - TOGGLEKEYS oldToggleKeys; - BOOL bKeyboardPref; -} GLOBAL_DATA, *PGLOBAL_DATA; - #define BOUNCETICKS 5 static INT nBounceArray[BOUNCETICKS] = {500, 700, 1000, 1500, 2000}; @@ -666,7 +655,7 @@ switch (uMsg) { case WM_INITDIALOG: - pGlobalData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(GLOBAL_DATA)); + pGlobalData = (PGLOBAL_DATA)((LPPROPSHEETPAGE)lParam)->lParam; if (pGlobalData == NULL) return FALSE; @@ -756,10 +745,6 @@ return TRUE; } break; - - case WM_DESTROY: - HeapFree(GetProcessHeap(), 0, pGlobalData); - break; } return FALSE; Modified: trunk/reactos/dll/cpl/access/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/mouse.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/access/mouse.c (original) +++ trunk/reactos/dll/cpl/access/mouse.c Tue Sep 18 02:29:35 2007 @@ -16,11 +16,6 @@ #include "resource.h" #include "access.h" -typedef struct _GLOBAL_DATA -{ - MOUSEKEYS mouseKeys; -} GLOBAL_DATA, *PGLOBAL_DATA; - #define SPEEDTICKS 9 #define ACCELTICKS 9 @@ -165,7 +160,7 @@ switch (uMsg) { case WM_INITDIALOG: - pGlobalData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(GLOBAL_DATA)); + pGlobalData = (PGLOBAL_DATA)((LPPROPSHEETPAGE)lParam)->lParam; if (pGlobalData == NULL) return FALSE; @@ -218,10 +213,6 @@ return TRUE; } break; - - case WM_DESTROY: - HeapFree(GetProcessHeap(), 0, pGlobalData); - break; } return FALSE; Modified: trunk/reactos/dll/cpl/access/sound.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/sound.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/access/sound.c (original) +++ trunk/reactos/dll/cpl/access/sound.c Tue Sep 18 02:29:35 2007 @@ -16,28 +16,21 @@ #include "access.h" -typedef struct _SOUNDDATA -{ - SOUNDSENTRY ssSoundSentry; - BOOL bShowSounds; -} SOUNDDATA, *PSOUNDDATA; - - static VOID -OnInitDialog(HWND hwndDlg, PSOUNDDATA pSoundData) +OnInitDialog(HWND hwndDlg, PGLOBAL_DATA pGlobalData) { TCHAR szBuffer[256]; UINT i; - pSoundData->ssSoundSentry.cbSize = sizeof(SOUNDSENTRY); + pGlobalData->ssSoundSentry.cbSize = sizeof(SOUNDSENTRY); SystemParametersInfo(SPI_GETSOUNDSENTRY, sizeof(SOUNDSENTRY), - &pSoundData->ssSoundSentry, + &pGlobalData->ssSoundSentry, 0); SystemParametersInfo(SPI_GETSHOWSOUNDS, 0, - &pSoundData->bShowSounds, + &pGlobalData->bShowSounds, 0); /* Add strings to the combo-box */ @@ -48,10 +41,10 @@ } /* Select a combo-box item */ - SendDlgItemMessage(hwndDlg, IDC_SENTRY_COMBO, CB_SETCURSEL, pSoundData->ssSoundSentry.iWindowsEffect, 0); + SendDlgItemMessage(hwndDlg, IDC_SENTRY_COMBO, CB_SETCURSEL, pGlobalData->ssSoundSentry.iWindowsEffect, 0); /* Initialize SoundSentry settings */ - if (!(pSoundData->ssSoundSentry.dwFlags & SSF_AVAILABLE)) + if (!(pGlobalData->ssSoundSentry.dwFlags & SSF_AVAILABLE)) { EnableWindow(GetDlgItem(hwndDlg, IDC_SENTRY_BOX), FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_SENTRY_TEXT), FALSE); @@ -59,7 +52,7 @@ } else { - if (pSoundData->ssSoundSentry.dwFlags & SSF_SOUNDSENTRYON) + if (pGlobalData->ssSoundSentry.dwFlags & SSF_SOUNDSENTRYON) { CheckDlgButton(hwndDlg, IDC_SENTRY_BOX, BST_CHECKED); } @@ -71,7 +64,7 @@ } /* Initialize ShowSounds settings */ - if (pSoundData->bShowSounds) + if (pGlobalData->bShowSounds) CheckDlgButton(hwndDlg, IDC_SSHOW_BOX, BST_CHECKED); } @@ -83,40 +76,41 @@ WPARAM wParam, LPARAM lParam) { - PSOUNDDATA pSoundData; + PGLOBAL_DATA pGlobalData; - pSoundData = (PSOUNDDATA)GetWindowLongPtr(hwndDlg, DWLP_USER); + pGlobalData = (PGLOBAL_DATA)GetWindowLongPtr(hwndDlg, DWLP_USER); switch (uMsg) { case WM_INITDIALOG: - pSoundData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(SOUNDDATA)); - SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pSoundData); + pGlobalData = (PGLOBAL_DATA)((LPPROPSHEETPAGE)lParam)->lParam; - OnInitDialog(hwndDlg, pSoundData); + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pGlobalData); + + OnInitDialog(hwndDlg, pGlobalData); break; case WM_COMMAND: switch (LOWORD(wParam)) { case IDC_SENTRY_BOX: - pSoundData->ssSoundSentry.dwFlags ^= SSF_SOUNDSENTRYON; - EnableWindow(GetDlgItem(hwndDlg, IDC_SENTRY_TEXT), (pSoundData->ssSoundSentry.dwFlags & SSF_SOUNDSENTRYON)?TRUE:FALSE); - EnableWindow(GetDlgItem(hwndDlg, IDC_SENTRY_COMBO), (pSoundData->ssSoundSentry.dwFlags & SSF_SOUNDSENTRYON)?TRUE:FALSE); + pGlobalData->ssSoundSentry.dwFlags ^= SSF_SOUNDSENTRYON; + EnableWindow(GetDlgItem(hwndDlg, IDC_SENTRY_TEXT), (pGlobalData->ssSoundSentry.dwFlags & SSF_SOUNDSENTRYON)?TRUE:FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_SENTRY_COMBO), (pGlobalData->ssSoundSentry.dwFlags & SSF_SOUNDSENTRYON)?TRUE:FALSE); PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; case IDC_SENTRY_COMBO: if (HIWORD(wParam) == CBN_SELENDOK) { - pSoundData->ssSoundSentry.iWindowsEffect = + pGlobalData->ssSoundSentry.iWindowsEffect = (DWORD)SendMessage((HWND)lParam, CB_GETCURSEL, 0, 0); PropSheet_Changed(GetParent(hwndDlg), hwndDlg); } break; case IDC_SSHOW_BOX: - pSoundData->bShowSounds = !pSoundData->bShowSounds; + pGlobalData->bShowSounds = !pGlobalData->bShowSounds; PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; @@ -131,10 +125,10 @@ case PSN_APPLY: SystemParametersInfo(SPI_SETSOUNDSENTRY, sizeof(SOUNDSENTRY), - &pSoundData->ssSoundSentry, + &pGlobalData->ssSoundSentry, SPIF_UPDATEINIFILE | SPIF_SENDCHANGE); SystemParametersInfo(SPI_SETSHOWSOUNDS, - pSoundData->bShowSounds, + pGlobalData->bShowSounds, 0, SPIF_UPDATEINIFILE | SPIF_SENDCHANGE); return TRUE; @@ -143,10 +137,6 @@ break; } break; - - case WM_DESTROY: - HeapFree(GetProcessHeap(), 0, pSoundData); - break; } return FALSE;

17 years, 3 months

[jimtabor] 29087: Init stock object buffer only once.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Tue Sep 18 02:08:14 2007 New Revision: 29087 URL: http://svn.reactos.org/svn/reactos?rev=29087&view=rev Log: Init stock object buffer only once. Modified: trunk/reactos/dll/win32/gdi32/main/dllmain.c Modified: trunk/reactos/dll/win32/gdi32/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/main/dllma… ============================================================================== --- trunk/reactos/dll/win32/gdi32/main/dllmain.c (original) +++ trunk/reactos/dll/win32/gdi32/main/dllmain.c Tue Sep 18 02:08:14 2007 @@ -10,6 +10,7 @@ #include "precomp.h" extern HGDIOBJ stock_objects[]; +BOOL SetStockObjects = FALSE; /* * GDI32.DLL doesn't have an entry point. The initialization is done by a call @@ -70,7 +71,11 @@ NtCurrentTeb()->GdiBatchCount = 0; #endif // Very simple, the list will fill itself as it is needed. - RtlZeroMemory( &stock_objects, NB_STOCK_OBJECTS); //Assume Ros is dirty. + if(!SetStockObjects) + { + RtlZeroMemory( &stock_objects, NB_STOCK_OBJECTS); //Assume Ros is dirty. + SetStockObjects = TRUE; + } return TRUE; }

17 years, 3 months

[jimtabor] 29086: Fixed build.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Tue Sep 18 01:46:30 2007 New Revision: 29086 URL: http://svn.reactos.org/svn/reactos?rev=29086&view=rev Log: Fixed build. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callback.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/callback.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/callback.c Tue Sep 18 01:46:30 2007 @@ -116,7 +116,7 @@ { HWND hWndS = *hWnd; PWINDOW_OBJECT Window = UserGetWindowObject(*hWnd); - PW32CLTINFO_TEB ClientInfo = GetWin32ClientInfo(); + PW32CLIENTINFO ClientInfo = GetWin32ClientInfo(); *hWnd = ClientInfo->hWND; *pWnd = ClientInfo->pvWND; @@ -128,7 +128,7 @@ static VOID IntRestoreTebWndCallback (HWND hWnd, PVOID pWnd) { - PW32CLTINFO_TEB ClientInfo = GetWin32ClientInfo(); + PW32CLIENTINFO ClientInfo = GetWin32ClientInfo(); ClientInfo->hWND = hWnd; ClientInfo->pvWND = pWnd;

17 years, 3 months

[jimtabor] 29085: Fixed Client Info structure. Moved it to the right file so user apps can access it.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Tue Sep 18 01:02:19 2007 New Revision: 29085 URL: http://svn.reactos.org/svn/reactos?rev=29085&view=rev Log: Fixed Client Info structure. Moved it to the right file so user apps can access it. Modified: trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/include/misc.h Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h Tue Sep 18 01:02:19 2007 @@ -72,6 +72,21 @@ PDESKTOP Desktop; ULONG_PTR DesktopHeapDelta; } W32THREADINFO, *PW32THREADINFO; + +/* Window Client Information structure */ +typedef struct _W32CLIENTINFO +{ + ULONG Win32ClientInfo0[2]; + ULONG ulWindowsVersion; + ULONG ulAppCompatFlags; + ULONG ulAppCompatFlags2; + ULONG Win32ClientInfo1[5]; + HWND hWND; + PVOID pvWND; + ULONG Win32ClientInfo2[50]; +} W32CLIENTINFO, *PW32CLIENTINFO; + +#define GetWin32ClientInfo() (PW32CLIENTINFO)(NtCurrentTeb()->Win32ClientInfo) PW32THREADINFO GetW32ThreadInfo(VOID); PW32PROCESSINFO GetW32ProcessInfo(VOID); Modified: trunk/reactos/subsystems/win32/win32k/include/misc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/misc.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/misc.h Tue Sep 18 01:02:19 2007 @@ -8,19 +8,4 @@ ULONG FASTCALL IntSystemParametersInfo(UINT uiAction, UINT uiParam, PVOID pvParam, UINT fWinIni); -/* Window Client Information structure */ -typedef struct _W32CLTINFO_TEB -{ - ULONG Win32ClientInfo0[2]; - ULONG ulWindowsVersion; - ULONG ulAppCompatFlags; - ULONG ulAppCompatFlags2; - ULONG Win32ClientInfo1[5]; - HWND hWND; - PVOID pvWND; - ULONG Win32ClientInfo2[50]; -} W32CLTINFO_TEB, *PW32CLTINFO_TEB; - -#define GetWin32ClientInfo() (PW32CLTINFO_TEB)(NtCurrentTeb()->Win32ClientInfo) - #endif /* __WIN32K_MISC_H */

17 years, 3 months

[fireball] 29084: - Change RtlIsDosDeviceName_U() implementation to a better Wine implementation - Winesync RtlIsNameLegalDOS8Dot3() - "ntdll_winetest.exe path" reduced to 3 failures (which happen on XP too), so considering "path" done 100% now.

by fireball＠svn.reactos.org

Author: fireball Date: Mon Sep 17 23:51:32 2007 New Revision: 29084 URL: http://svn.reactos.org/svn/reactos?rev=29084&view=rev Log: - Change RtlIsDosDeviceName_U() implementation to a better Wine implementation - Winesync RtlIsNameLegalDOS8Dot3() - "ntdll_winetest.exe path" reduced to 3 failures (which happen on XP too), so considering "path" done 100% now. Modified: trunk/reactos/lib/rtl/dos8dot3.c trunk/reactos/lib/rtl/path.c Modified: trunk/reactos/lib/rtl/dos8dot3.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/dos8dot3.c?rev=290… ============================================================================== --- trunk/reactos/lib/rtl/dos8dot3.c (original) +++ trunk/reactos/lib/rtl/dos8dot3.c Mon Sep 17 23:51:32 2007 @@ -238,79 +238,64 @@ IN OUT POEM_STRING AnsiName OPTIONAL, IN OUT PBOOLEAN SpacesFound OPTIONAL) { - PANSI_STRING name = AnsiName; - ANSI_STRING DummyString; - CHAR Buffer[12]; - char *str; - ULONG Length; - ULONG i; - NTSTATUS Status; - BOOLEAN HasSpace = FALSE; - BOOLEAN HasDot = FALSE; - - if (UnicodeName->Length > 24) - { - return(FALSE); /* name too long */ - } - - if (!name) - { - name = &DummyString; - name->Length = 0; - name->MaximumLength = 12; - name->Buffer = Buffer; - } - - Status = RtlUpcaseUnicodeStringToCountedOemString(name, - UnicodeName, - FALSE); - if (!NT_SUCCESS(Status)) - { - return(FALSE); - } - - Length = name->Length; - str = name->Buffer; - - if (!(Length == 1 && *str == '.') && - !(Length == 2 && *str == '.' && *(str + 1) == '.')) - { - for (i = 0; i < Length; i++, str++) - { - switch (*str) - { - case ' ': - HasSpace = TRUE; - break; - - case '.': - if ((HasDot) || /* two or more dots */ - (i == 0) || /* dot is first char */ - (i + 1 == Length) || /* dot is last char */ - (Length - i > 4) || /* more than 3 chars of extension */ - (HasDot == FALSE && i > 8)) /* name is longer than 8 chars */ - return(FALSE); - HasDot = TRUE; - break; - default: - if (RtlpIsShortIllegal(*str)) - { - return(FALSE); - } - } - } - } - - /* Name is longer than 8 chars and does not have an extension */ - if (Length > 8 && HasDot == FALSE) - { - return(FALSE); - } - - if (SpacesFound) - *SpacesFound = HasSpace; - - return(TRUE); + static const char Illegal[] = "*?<>|\"+=,;[]:/\\\345"; + int Dot = -1; + int i; + char Buffer[12]; + OEM_STRING OemString; + BOOLEAN GotSpace = FALSE; + + if (!AnsiName) + { + OemString.Length = sizeof(Buffer); + OemString.MaximumLength = sizeof(Buffer); + OemString.Buffer = Buffer; + AnsiName = &OemString; + } + if (RtlUpcaseUnicodeStringToCountedOemString( AnsiName, UnicodeName, FALSE ) != STATUS_SUCCESS) + return FALSE; + + if (AnsiName->Length > 12) return FALSE; + + /* a starting . is invalid, except for . and .. */ + if (AnsiName->Buffer[0] == '.') + { + if (AnsiName->Length != 1 && (AnsiName->Length != 2 || AnsiName->Buffer[1] != '.')) return FALSE; + if (SpacesFound) *SpacesFound = FALSE; + return TRUE; + } + + for (i = 0; i < AnsiName->Length; i++) + { + switch (AnsiName->Buffer[i]) + { + case ' ': + /* leading/trailing spaces not allowed */ + if (!i || i == AnsiName->Length-1 || AnsiName->Buffer[i+1] == '.') return FALSE; + GotSpace = TRUE; + break; + case '.': + if (Dot != -1) return FALSE; + Dot = i; + break; + default: + if (strchr(Illegal, AnsiName->Buffer[i])) return FALSE; + break; + } + } + /* check file part is shorter than 8, extension shorter than 3 + * dot cannot be last in string + */ + if (Dot == -1) + { + if (AnsiName->Length > 8) return FALSE; + } + else + { + if (Dot > 8 || (AnsiName->Length - Dot > 4) || Dot == AnsiName->Length - 1) return FALSE; + } + if (SpacesFound) *SpacesFound = GotSpace; + return TRUE; } /* Modified: trunk/reactos/lib/rtl/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/path.c?rev=29084&r… ============================================================================== --- trunk/reactos/lib/rtl/path.c (original) +++ trunk/reactos/lib/rtl/path.c Mon Sep 17 23:51:32 2007 @@ -91,92 +91,69 @@ * @implemented */ ULONG NTAPI -RtlIsDosDeviceName_U(PWSTR DeviceName) -{ - ULONG Type; - ULONG Length = 0; - ULONG Offset; - PWCHAR wc; - UNICODE_STRING DeviceNameU; - - if (DeviceName == NULL) - { - return 0; - } - - while (DeviceName[Length]) - { - Length++; - } - - Type = RtlDetermineDosPathNameType_U(DeviceName); - if (Type <= 1) - { - return 0; - } - - if (Type == 6) - { - DeviceNameU.Length = DeviceNameU.MaximumLength = Length * sizeof(WCHAR); - DeviceNameU.Buffer = DeviceName; - if (Length == 7 && - RtlEqualUnicodeString(&DeviceNameU, (PUNICODE_STRING)&_condev, TRUE)) - return 0x00080006; - return 0; - } - - /* name can end with ':' */ - if (Length && DeviceName[Length - 1 ] == L':') - { - Length--; - } - - /* there can be spaces or points at the end of name */ - wc = DeviceName + Length - 1; - while (Length && (*wc == L'.' || *wc == L' ')) - { - Length--; - wc--; - } - - /* let's find a beginning of name */ - wc = DeviceName + Length - 1; - while (wc > DeviceName && !IS_PATH_SEPARATOR(*(wc - 1))) - { - wc--; - } - Offset = wc - DeviceName; - Length -= Offset; - DeviceNameU.Length = DeviceNameU.MaximumLength = 3 * sizeof(WCHAR); - DeviceNameU.Buffer = wc; - - /* check for LPTx or COMx */ - if (Length == 4 && wc[3] >= L'0' && wc[3] <= L'9') - { - if (wc[3] == L'0') - { - return 0; - } - - if (RtlEqualUnicodeString(&DeviceNameU, (PUNICODE_STRING)&_lpt, TRUE) || - RtlEqualUnicodeString(&DeviceNameU, (PUNICODE_STRING)&_com, TRUE)) - { - return ((Offset * 2) << 16 ) | 8; - } - return 0; - } - - /* check for PRN,AUX,NUL or CON */ - if (Length == 3 && - (RtlEqualUnicodeString(&DeviceNameU, (PUNICODE_STRING)&_prn, TRUE) || - RtlEqualUnicodeString(&DeviceNameU, (PUNICODE_STRING)&_aux, TRUE) || - RtlEqualUnicodeString(&DeviceNameU, (PUNICODE_STRING)&_nul, TRUE) || - RtlEqualUnicodeString(&DeviceNameU, (PUNICODE_STRING)&_con, TRUE))) - { - return ((Offset * 2) << 16) | 6; - } - - return 0; +RtlIsDosDeviceName_U(PWSTR dos_name) +{ + static const WCHAR consoleW[] = {'\\','\\','.','\\','C','O','N',0}; + static const WCHAR auxW[3] = {'A','U','X'}; + static const WCHAR comW[3] = {'C','O','M'}; + static const WCHAR conW[3] = {'C','O','N'}; + static const WCHAR lptW[3] = {'L','P','T'}; + static const WCHAR nulW[3] = {'N','U','L'}; + static const WCHAR prnW[3] = {'P','R','N'}; + + const WCHAR *start, *end, *p; + + switch(RtlDetermineDosPathNameType_U( dos_name )) + { + case RtlPathTypeUnknown: + case RtlPathTypeUncAbsolute: + return 0; + case RtlPathTypeLocalDevice: + if (!_wcsicmp( dos_name, consoleW )) + return MAKELONG( sizeof(conW), 4 * sizeof(WCHAR) ); /* 4 is length of \\.\ prefix */ + return 0; + default: + break; + } + + end = dos_name + wcslen(dos_name) - 1; + while (end >= dos_name && *end == ':') end--; /* remove all trailing ':' */ + + /* find start of file name */ + for (start = end; start >= dos_name; start--) + { + if (IS_PATH_SEPARATOR(start[0])) break; + /* check for ':' but ignore if before extension (for things like NUL:.txt) */ + if (start[0] == ':' && start[1] != '.') break; + } + start++; + + /* remove extension */ + if ((p = wcschr( start, '.' ))) + { + end = p - 1; + if (end >= dos_name && *end == ':') end--; /* remove trailing ':' before extension */ + } + /* remove trailing spaces */ + while (end >= dos_name && *end == ' ') end--; + + /* now we have a potential device name between start and end, check it */ + switch(end - start + 1) + { + case 3: + if (_wcsnicmp( start, auxW, 3 ) && + _wcsnicmp( start, conW, 3 ) && + _wcsnicmp( start, nulW, 3 ) && + _wcsnicmp( start, prnW, 3 )) break; + return MAKELONG( 3 * sizeof(WCHAR), (start - dos_name) * sizeof(WCHAR) ); + case 4: + if (_wcsnicmp( start, comW, 3 ) && _wcsnicmp( start, lptW, 3 )) break; + if (*end <= '0' || *end > '9') break; + return MAKELONG( 4 * sizeof(WCHAR), (start - dos_name) * sizeof(WCHAR) ); + default: /* can't match anything */ + break; + } + return 0; } @@ -389,7 +366,12 @@ } /* skip to the next component */ while (*p && *p != '\\') p++; - if (*p == '\\') p++; + if (*p == '\\') + { + /* remove last dot in previous dir name */ + if (p > path + mark && p[-1] == '.') memmove( p-1, p, (wcslen(p) + 1) * sizeof(WCHAR) ); + else p++; + } } /* remove trailing spaces and dots (yes, Windows really does that, don't ask) */ @@ -439,7 +421,8 @@ RtlAcquirePebLock(); - cd = &((PCURDIR)&NtCurrentTeb()->ProcessEnvironmentBlock->ProcessParameters->CurrentDirectory.DosPath)->DosPath; + //cd = &((PCURDIR)&NtCurrentTeb()->ProcessEnvironmentBlock->ProcessParameters->CurrentDirectory.DosPath)->DosPath; + cd = &NtCurrentTeb()->ProcessEnvironmentBlock->ProcessParameters->CurrentDirectory.DosPath; switch (type = RtlDetermineDosPathNameType_U(name)) {

17 years, 3 months

[hpoussin] 29083: Add some missing definitions to PSDK Patch by Samuel Serapion, samdwise51 at gmail dot com

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Mon Sep 17 17:52:44 2007 New Revision: 29083 URL: http://svn.reactos.org/svn/reactos?rev=29083&view=rev Log: Add some missing definitions to PSDK Patch by Samuel Serapion, samdwise51 at gmail dot com Modified: trunk/reactos/include/psdk/ntsecapi.h trunk/reactos/include/psdk/wincrypt.h trunk/reactos/include/psdk/wingdi.h trunk/reactos/include/psdk/winnt.h trunk/reactos/include/psdk/winuser.h Modified: trunk/reactos/include/psdk/ntsecapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntsecapi.h?re… ============================================================================== --- trunk/reactos/include/psdk/ntsecapi.h (original) +++ trunk/reactos/include/psdk/ntsecapi.h Mon Sep 17 17:52:44 2007 @@ -554,7 +554,7 @@ typedef struct _POLICY_DNS_DOMAIN_INFO { LSA_UNICODE_STRING Name; LSA_UNICODE_STRING DnsDomainName; - LSA_UNICODE_STRING DnsTreeName; + LSA_UNICODE_STRING DnsForestName; GUID DomainGuid; PSID Sid; } POLICY_DNS_DOMAIN_INFO, *PPOLICY_DNS_DOMAIN_INFO; Modified: trunk/reactos/include/psdk/wincrypt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wincrypt.h?re… ============================================================================== --- trunk/reactos/include/psdk/wincrypt.h (original) +++ trunk/reactos/include/psdk/wincrypt.h Mon Sep 17 17:52:44 2007 @@ -27,6 +27,7 @@ /* some typedefs for function parameters */ typedef unsigned int ALG_ID; typedef unsigned long HCRYPTPROV; +typedef unsigned long HCRYPTPROV_LEGACY; typedef unsigned long HCRYPTKEY; typedef unsigned long HCRYPTHASH; typedef void *HCERTSTORE; @@ -3004,6 +3005,286 @@ DWORD CycleDetectionModulus; } CERT_CHAIN_ENGINE_CONFIG, *PCERT_CHAIN_ENGINE_CONFIG; +/* message-related definitions */ + +typedef BOOL (WINAPI *PFN_CMSG_STREAM_OUTPUT)(const void *pvArg, BYTE *pbData, + DWORD cbData, BOOL fFinal); + +#define CMSG_INDEFINITE_LENGTH 0xffffffff + +typedef struct _CMSG_STREAM_INFO +{ + DWORD cbContent; + PFN_CMSG_STREAM_OUTPUT pfnStreamOutput; + void *pvArg; +} CMSG_STREAM_INFO, *PCMSG_STREAM_INFO; + +typedef struct _CERT_ISSUER_SERIAL_NUMBER +{ + CERT_NAME_BLOB Issuer; + CRYPT_INTEGER_BLOB SerialNumber; +} CERT_ISSUER_SERIAL_NUMBER, *PCERT_ISSUER_SERIAL_NUMBER; + +typedef struct _CERT_ID +{ + DWORD dwIdChoice; + union { + CERT_ISSUER_SERIAL_NUMBER IssuerSerialNumber; + CRYPT_HASH_BLOB KeyId; + CRYPT_HASH_BLOB HashId; + } DUMMYUNIONNAME; +} CERT_ID, *PCERT_ID; + +#undef CMSG_DATA /* may be defined by sys/socket.h */ +#define CMSG_DATA 1 +#define CMSG_SIGNED 2 +#define CMSG_ENVELOPED 3 +#define CMSG_SIGNED_AND_ENVELOPED 4 +#define CMSG_HASHED 5 +#define CMSG_ENCRYPTED 6 + +#define CMSG_ALL_FLAGS (~0U) +#define CMSG_DATA_FLAG (1 << CMSG_DATA) +#define CMSG_SIGNED_FLAG (1 << CMSG_SIGNED) +#define CMSG_ENVELOPED_FLAG (1 << CMSG_ENVELOPED) +#define CMSG_SIGNED_AND_ENVELOPED_FLAG (1 << CMSG_SIGNED_AND_ENVELOPED) +#define CMSG_HASHED_FLAG (1 << CMSG_HASHED) +#define CMSG_ENCRYPTED_FLAG (1 << CMSG_ENCRYPTED) + +typedef struct _CMSG_SIGNER_ENCODE_INFO +{ + DWORD cbSize; + PCERT_INFO pCertInfo; + HCRYPTPROV hCryptProv; + DWORD dwKeySpec; + CRYPT_ALGORITHM_IDENTIFIER HashAlgorithm; + void *pvHashAuxInfo; + DWORD cAuthAttr; + PCRYPT_ATTRIBUTE rgAuthAttr; + DWORD cUnauthAttr; + PCRYPT_ATTRIBUTE rgUnauthAttr; + CERT_ID SignerId; + CRYPT_ALGORITHM_IDENTIFIER HashEncryptionAlgorithm; + void *pvHashEncryptionAuxInfo; +} CMSG_SIGNER_ENCODE_INFO, *PCMSG_SIGNER_ENCODE_INFO; + +typedef struct _CMSG_RECIPIENT_ENCRYPTED_KEY_ENCODE_INFO +{ + DWORD cbSize; + CRYPT_BIT_BLOB RecipientPublicKey; + CERT_ID RecipientId; + FILETIME Date; + PCRYPT_ATTRIBUTE_TYPE_VALUE pOtherAttr; +} CMSG_RECIPIENT_ENCRYPTED_KEY_ENCODE_INFO, *PCMSG_RECIPIENT_ENCRYPTED_KEY_ENCODE_INFO; + +typedef struct _CMSG_SIGNED_ENCODE_INFO +{ + DWORD cbSize; + DWORD cSigners; + PCMSG_SIGNER_ENCODE_INFO rgSigners; + DWORD cCertEncoded; + PCERT_BLOB rgCertEncoded; + DWORD cCrlEncoded; + PCRL_BLOB rgCrlEncoded; + DWORD cAttrCertEncoded; + PCERT_BLOB rgAttrCertEncoded; +} CMSG_SIGNED_ENCODE_INFO, *PCMSG_SIGNED_ENCODE_INFO; + +typedef struct _CMSG_KEY_TRANS_RECIPIENT_ENCODE_INFO +{ + DWORD cbSize; + CRYPT_ALGORITHM_IDENTIFIER KeyEncryptionAlgorithm; + void* pvKeyEncryptionAuxInfo; + HCRYPTPROV_LEGACY hCryptProv; + CRYPT_BIT_BLOB RecipientPublicKey; + CERT_ID RecipientId; +} CMSG_KEY_TRANS_RECIPIENT_ENCODE_INFO, *PCMSG_KEY_TRANS_RECIPIENT_ENCODE_INFO; + +typedef struct _CMSG_KEY_AGREE_RECIPIENT_ENCODE_INFO +{ + DWORD cbSize; + CRYPT_ALGORITHM_IDENTIFIER KeyEncryptionAlgorithm; + void* pvKeyEncryptionAuxInfo; + CRYPT_ALGORITHM_IDENTIFIER KeyWrapAlgorithm; + void* pvKeyWrapAuxInfo; + HCRYPTPROV_LEGACY hCryptProv; + DWORD dwKeySpec; + DWORD dwKeyChoice; + union + { + PCRYPT_ALGORITHM_IDENTIFIER pEphemeralAlgorithm; + PCERT_ID pSenderId; + } DUMMYUNIONNAME; + CRYPT_DATA_BLOB UserKeyingMaterial; + DWORD cRecipientEncryptedKeys; + PCMSG_RECIPIENT_ENCRYPTED_KEY_ENCODE_INFO* rgpRecipientEncryptedKeys; +} CMSG_KEY_AGREE_RECIPIENT_ENCODE_INFO, *PCMSG_KEY_AGREE_RECIPIENT_ENCODE_INFO; + +typedef struct _CMSG_MAIL_LIST_RECIPIENT_ENCODE_INFO +{ + DWORD cbSize; + CRYPT_ALGORITHM_IDENTIFIER KeyEncryptionAlgorithm; + void* pvKeyEncryptionAuxInfo; + HCRYPTPROV hCryptProv; + DWORD dwKeyChoice; + union + { + HCRYPTKEY hKeyEncryptionKey; + void* pvKeyEncryptionKey; + } DUMMYUNIONNAME; + CRYPT_DATA_BLOB KeyId; + FILETIME Date; + PCRYPT_ATTRIBUTE_TYPE_VALUE pOtherAttr; +} CMSG_MAIL_LIST_RECIPIENT_ENCODE_INFO, *PCMSG_MAIL_LIST_RECIPIENT_ENCODE_INFO; + +typedef struct _CMSG_RECIPIENT_ENCODE_INFO +{ + DWORD dwRecipientChoice; + union + { + PCMSG_KEY_TRANS_RECIPIENT_ENCODE_INFO pKeyTrans; + PCMSG_KEY_AGREE_RECIPIENT_ENCODE_INFO pKeyAgree; + PCMSG_MAIL_LIST_RECIPIENT_ENCODE_INFO pMailList; + } DUMMYUNIONNAME; +} CMSG_RECIPIENT_ENCODE_INFO, PCMSG_RECIPIENT_ENCODE_INFO; + +typedef struct _CMSG_ENVELOPED_ENCODE_INFO +{ + DWORD cbSize; + HCRYPTPROV hCryptProv; + CRYPT_ALGORITHM_IDENTIFIER ContentEncryptionAlgorithm; + void *pvEncryptionAuxInfo; + DWORD cRecipients; + PCERT_INFO *rgpRecipientCert; + PCMSG_RECIPIENT_ENCODE_INFO rgCmsRecipients; + DWORD cCertEncoded; + PCERT_BLOB rgCertEncoded; + DWORD cCrlEncoded; + PCRL_BLOB rgCrlEncoded; + DWORD cAttrCertEncoded; + PCERT_BLOB rgAttrCertEncoded; + DWORD cUnprotectedAttr; + PCRYPT_ATTRIBUTE rgUnprotectedAttr; +} CMSG_ENVELOPED_ENCODE_INFO, *PCMSG_ENVELOPED_ENCODE_INFO; + +typedef struct _CMSG_HASHED_ENCODE_INFO +{ + DWORD cbSize; + HCRYPTPROV hCryptProv; + CRYPT_ALGORITHM_IDENTIFIER HashAlgorithm; + void *pvHashAuxInfo; +} CMSG_HASHED_ENCODE_INFO, *PCMSG_HASHED_ENCODE_INFO; + +#define CMSG_BARE_CONTENT_FLAG 0x00000001 +#define CMSG_LENGTH_ONLY_FLAG 0x00000002 +#define CMSG_DETACHED_FLAG 0x00000004 +#define CMSG_AUTHENTICATED_ATTRIBUTES_FLAG 0x00000008 +#define CMSG_CONTENTS_OCTETS_FLAG 0x00000010 +#define CMSG_MAX_LENGTH_FLAG 0x00000020 +#define CMSG_CMS_ENCAPSULATED_CONTENT_FLAG 0x00000040 +#define CMSG_CRYPT_RELEASE_CONTEXT_FLAG 0x00008000 + +#define CMSG_CTRL_VERIFY_SIGNATURE 1 +#define CMSG_CTRL_DECRYPT 2 +#define CMSG_CTRL_VERIFY_HASH 5 +#define CMSG_CTRL_ADD_SIGNER 6 +#define CMSG_CTRL_DEL_SIGNER 7 +#define CMSG_CTRL_ADD_SIGNER_UNAUTH_ATTR 8 +#define CMSG_CTRL_DEL_SIGNER_UNAUTH_ATTR 9 +#define CMSG_CTRL_ADD_CERT 10 +#define CMSG_CTRL_DEL_CERT 11 +#define CMSG_CTRL_ADD_CRL 12 +#define CMSG_CTRL_DEL_CRL 13 +#define CMSG_CTRL_ADD_ATTR_CERT 14 +#define CMSG_CTRL_DEL_ATTR_CERT 15 +#define CMSG_CTRL_KEY_TRANS_DECRYPT 16 +#define CMSG_CTRL_KEY_AGREE_DECRYPT 17 +#define CMSG_CTRL_MAIL_LIST_DECRYPT 18 +#define CMSG_CTRL_VERIFY_SIGNATURE_EX 19 +#define CMSG_CTRL_ADD_CMS_SIGNER_INFO 20 + +typedef struct _CMSG_CTRL_DECRYPT_PARA +{ + DWORD cbSize; + union + { + HCRYPTPROV hCryptProv; + /*NCRYPT_KEY_HANDLE hNCryptKey;*/ + } DUMMYUNIONNAME; + DWORD dwKeySpec; + DWORD dwRecipientIndex; +} CMSG_CTRL_DECRYPT_PARA, *PCMSG_CTRL_DECRYPT_PARA; + +typedef struct _CMSG_CTRL_ADD_SIGNER_UNAUTH_ATTR_PARA +{ + DWORD cbSize; + DWORD dwSignerIndex; + CRYPT_DATA_BLOB BLOB; +} CMSG_CTRL_ADD_SIGNER_UNAUTH_ATTR_PARA, *PCMSG_CTRL_ADD_SIGNER_UNAUTH_ATTR_PARA; + +typedef struct _CMSG_CTRL_DEL_SIGNER_UNAUTH_ATTR_PARA +{ + DWORD cbSize; + DWORD dwSignerIndex; + DWORD dwUnauthAttrIndex; +} CMSG_CTRL_DEL_SIGNER_UNAUTH_ATTR_PARA, *PCMSG_CTRL_DEL_SIGNER_UNAUTH_ATTR_PARA; + +#define CMSG_TYPE_PARAM 1 +#define CMSG_CONTENT_PARAM 2 +#define CMSG_BARE_CONTENT_PARAM 3 +#define CMSG_INNER_CONTENT_PARAM 4 +#define CMSG_SIGNER_COUNT_PARAM 5 +#define CMSG_SIGNER_INFO_PARAM 6 +#define CMSG_SIGNER_CERT_INFO_PARAM 7 +#define CMSG_SIGNER_HASH_ALGORITHM_PARAM 8 +#define CMSG_SIGNER_AUTH_ATTR_PARAM 9 +#define CMSG_SIGNER_UNAUTH_ATTR_PARAM 10 +#define CMSG_CERT_COUNT_PARAM 11 +#define CMSG_CERT_PARAM 12 +#define CMSG_CRL_COUNT_PARAM 13 +#define CMSG_CRL_PARAM 14 +#define CMSG_ENVELOPE_ALGORITHM_PARAM 15 +#define CMSG_RECIPIENT_COUNT_PARAM 17 +#define CMSG_RECIPIENT_INDEX_PARAM 18 +#define CMSG_RECIPIENT_INFO_PARAM 19 +#define CMSG_HASH_ALGORITHM_PARAM 20 +#define CMSG_HASH_DATA_PARAM 21 +#define CMSG_COMPUTED_HASH_PARAM 22 +#define CMSG_ENCRYPT_PARAM 26 +#define CMSG_ENCRYPTED_DIGEST 27 +#define CMSG_ENCODED_SIGNER 28 +#define CMSG_ENCODED_MESSAGE 29 +#define CMSG_VERSION_PARAM 30 +#define CMSG_ATTR_CERT_COUNT_PARAM 31 +#define CMSG_ATTR_CERT_PARAM 32 +#define CMSG_CMS_RECIPIENT_COUNT_PARAM 33 +#define CMSG_CMS_RECIPIENT_INDEX_PARAM 34 +#define CMSG_CMS_RECIPIENT_ENCRYPTED_KEY_INDEX_PARAM 35 +#define CMSG_CMS_RECIPIENT_INFO_PARAM 36 +#define CMSG_UNPROTECTED_ATTR_PARAM 37 +#define CMSG_SIGNER_CERT_ID_PARAM 38 +#define CMSG_CMS_SIGNER_INFO_PARAM 39 + +#define CMSG_SIGNED_DATA_V1 1 +#define CMSG_SIGNED_DATA_V3 3 +#define CMSG_SIGNED_DATA_PKCS_1_5_VERSION CMSG_SIGNED_DATA_V1 +#define CMSG_SIGNED_DATA_CMS_VERSION CMSG_SIGNED_DATA_V3 + +#define CMSG_SIGNER_INFO_V1 1 +#define CMSG_SIGNER_INFO_V3 3 +#define CMSG_SIGNER_INFO_PKCS_1_5_VERSION CMSG_SIGNER_INFO_V1 +#define CMSG_SIGNER_INFO_CMS_VERSION CMSG_SIGNER_INFO_V3 + +#define CMSG_HASHED_DATA_V0 0 +#define CMSG_HASHED_DATA_V2 2 +#define CMSG_HASHED_DATA_PKCS_1_5_VERSION CMSG_HASHED_DATA_V0 +#define CMSG_HASHED_DATA_CMS_VERSION CMSG_HASHED_DATA_V2 + +#define CMSG_ENVELOPED_DATA_V0 0 +#define CMSG_ENVELOPED_DATA_V2 2 +#define CMSG_ENVELOPED_DATA_PKCS_1_5_VERSION CMSG_ENVELOPED_DATA_V0 +#define CMSG_ENVELOPED_DATA_CMS_VERSION CMSG_ENVELOPED_DATA_V2 + /* function declarations */ /* advapi32.dll */ BOOL WINAPI CryptAcquireContextA(HCRYPTPROV *phProv, LPCSTR pszContainer, Modified: trunk/reactos/include/psdk/wingdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wingdi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/wingdi.h (original) +++ trunk/reactos/include/psdk/wingdi.h Mon Sep 17 17:52:44 2007 @@ -1218,12 +1218,12 @@ int abcA; UINT abcB; int abcC; -} ABC,*LPABC; +} ABC, *PABC, *LPABC; typedef struct _ABCFLOAT { FLOAT abcfA; FLOAT abcfB; FLOAT abcfC; -} ABCFLOAT,*LPABCFLOAT; +} ABCFLOAT, *PABCFLOAT, *LPABCFLOAT; typedef struct tagBITMAP { LONG bmType; LONG bmWidth; @@ -1349,11 +1349,11 @@ DWORD fsUsb[4]; DWORD fsCsb[2]; } FONTSIGNATURE, *PFONTSIGNATURE,*LPFONTSIGNATURE; -typedef struct { +typedef struct tagCHARSETINFO { UINT ciCharset; UINT ciACP; FONTSIGNATURE fs; -} CHARSETINFO,*LPCHARSETINFO; +} CHARSETINFO, *PCHARSETINFO, *LPCHARSETINFO; typedef struct tagCOLORADJUSTMENT { WORD caSize; WORD caFlags; @@ -1476,7 +1476,7 @@ DWORD dsBitfields[3]; HANDLE dshSection; DWORD dsOffset; -} DIBSECTION; +} DIBSECTION,*PDIBSECTION,*LPDIBSECTION; typedef struct _DOCINFOA { int cbSize; LPCSTR lpszDocName; @@ -1497,12 +1497,17 @@ } EMR,*PEMR; #if(WINVER >= 0x0400) -typedef struct tagEMRGLSRECORD -{ - EMR emr; - DWORD cbData; - BYTE Data[1]; +typedef struct tagEMRGLSRECORD { + EMR emr; + DWORD cbData; + BYTE Data[1]; } EMRGLSRECORD, *PEMRGLSRECORD; +typedef struct tagEMRGLSBOUNDEDRECORD { + EMR emr; + RECTL rclBounds; + DWORD cbData; + BYTE Data[1]; +} EMRGLSBOUNDEDRECORD, *PEMRGLSBOUNDEDRECORD; #endif typedef struct tagEMRANGLEARC { EMR emr; @@ -1537,8 +1542,9 @@ LONG ySrc; XFORM xformSrc; COLORREF crBkColorSrc; - DWORD iUsageSrc; + DWORD iUsageSrc; DWORD offBmiSrc; + DWORD cbBmiSrc; DWORD offBitsSrc; DWORD cbBitsSrc; } EMRBITBLT,*PEMRBITBLT; @@ -1548,6 +1554,11 @@ LONG lbHatch; } LOGBRUSH,*PLOGBRUSH,*LPLOGBRUSH; typedef LOGBRUSH PATTERN,*PPATTERN,*LPPATTERN; +typedef struct tagLOGBRUSH32 { + UINT lbStyle; + COLORREF lbColor; + ULONG lbHatch; +} LOGBRUSH32, *PLOGBRUSH32; typedef struct tagEMRCREATEBRUSHINDIRECT { EMR emr; DWORD ihBrush; @@ -1579,6 +1590,14 @@ DWORD lcsGammaBlue; WCHAR lcsFilename[MAX_PATH]; } LOGCOLORSPACEW,*LPLOGCOLORSPACEW; +typedef struct tagEMRCREATECOLORSPACEW { + EMR emr; + DWORD ihCS; + LOGCOLORSPACEW lcs; + DWORD dwFlags; + DWORD cbData; + BYTE Data[1]; +} EMRCREATECOLORSPACEW, *PEMRCREATECOLORSPACEW; typedef struct tagEMRCREATECOLORSPACE { EMR emr; DWORD ihCS; @@ -1662,7 +1681,7 @@ BYTE bLetterform; BYTE bMidline; BYTE bXHeight; -} PANOSE; +} PANOSE, *LPPANOSE;; typedef struct tagLOGFONTA { LONG lfHeight; LONG lfWidth; @@ -1732,7 +1751,7 @@ LONG elpHatch; DWORD elpNumEntries; DWORD elpStyleEntry[1]; -} EXTLOGPEN,*PEXTLOGPEN,*LPEXTLOGPEN; +} EXTLOGPEN,*PEXTLOGPEN,*LPEXTLOGPEN,*NPEXTLOGPEN; typedef struct tagEMREXTCREATEPEN { EMR emr; DWORD ihPen; @@ -1786,7 +1805,7 @@ DWORD nVersion; DWORD cbData; DWORD offData; -} EMRFORMAT; +} EMRFORMAT, *PEMRFORMAT; typedef struct tagEMRSETCOLORSPACE @@ -2175,7 +2194,7 @@ DWORD nCount; DWORD nRgnSize; RECT rcBound; -} RGNDATAHEADER; +} RGNDATAHEADER, *PRGNDATAHEADER; typedef struct _RGNDATA { RGNDATAHEADER rdh; char Buffer[1]; @@ -2622,6 +2641,11 @@ typedef int (CALLBACK *OLDFONTENUMPROCW)(ENUMLOGFONTEXW*,NEWTEXTMETRICEXW*,DWORD,LPARAM); typedef OLDFONTENUMPROCA FONTENUMPROCA; typedef OLDFONTENUMPROCW FONTENUMPROCW; +#ifdef UNICODE +#define OLDFONTENUMPROC OLDFONTENUMPROCW +#else +#define OLDFONTENUMPROC OLDFONTENUMPROCA +#endif typedef int (CALLBACK *ICMENUMPROCA)(LPSTR,LPARAM); typedef int (CALLBACK *ICMENUMPROCW)(LPWSTR,LPARAM); typedef void (CALLBACK *GOBJENUMPROC)(LPVOID,LPARAM); Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=2… ============================================================================== --- trunk/reactos/include/psdk/winnt.h (original) +++ trunk/reactos/include/psdk/winnt.h Mon Sep 17 17:52:44 2007 @@ -601,6 +601,12 @@ #define DOMAIN_GROUP_RID_ADMINS 0x00000200L #define DOMAIN_GROUP_RID_USERS 0x00000201L #define DOMAIN_GROUP_RID_GUESTS 0x00000202L +#define DOMAIN_GROUP_RID_COMPUTERS 0x00000203L +#define DOMAIN_GROUP_RID_CONTROLLERS 0x00000204L +#define DOMAIN_GROUP_RID_CERT_ADMINS 0x00000205L +#define DOMAIN_GROUP_RID_SCHEMA_ADMINS 0x00000206L +#define DOMAIN_GROUP_RID_ENTERPRISE_ADMINS 0x00000207L +#define DOMAIN_GROUP_RID_POLICY_ADMINS 0x00000208L #define DOMAIN_ALIAS_RID_ADMINS 0x00000220L #define DOMAIN_ALIAS_RID_USERS 0x00000221L Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winuser.h (original) +++ trunk/reactos/include/psdk/winuser.h Mon Sep 17 17:52:44 2007 @@ -998,6 +998,7 @@ #if(_WIN32_WINNT >= 0x0501) #define SM_CXFOCUSBORDER 83 #define SM_CYFOCUSBORDER 84 +#define SM_SHUTTINGDOWN 0x2000 #endif /* _WIN32_WINNT >= 0x0501 */ #define SM_REMOTESESSION 0X1000 #define ARW_BOTTOMLEFT 0 @@ -1491,6 +1492,21 @@ #endif #endif + +#define PBT_APMQUERYSUSPEND 0x0000 +#define PBT_APMQUERYSTANDBY 0x0001 +#define PBT_APMQUERYSUSPENDFAILED 0x0002 +#define PBT_APMQUERYSTANDBYFAILED 0x0003 +#define PBT_APMSUSPEND 0x0004 +#define PBT_APMSTANDBY 0x0005 +#define PBT_APMRESUMECRITICAL 0x0006 +#define PBT_APMRESUMESUSPEND 0x0007 +#define PBT_APMRESUMESTANDBY 0x0008 +#define PBTF_APMRESUMEFROMFAILURE 0x00000001 +#define PBT_APMBATTERYLOW 0x0009 +#define PBT_APMPOWERSTATUSCHANGE 0x000A +#define PBT_APMOEMEVENT 0x000B +#define PBT_APMRESUMEAUTOMATIC 0x0012 #define WM_CHAR 258 #define WM_CHARTOITEM 47

17 years, 3 months

[hpoussin] 29082: Add missing svn:eol-style native properties

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Mon Sep 17 17:43:34 2007 New Revision: 29082 URL: http://svn.reactos.org/svn/reactos?rev=29082&view=rev Log: Add missing svn:eol-style native properties Modified: trunk/reactos/include/psdk/activscp.idl (props changed) trunk/reactos/include/psdk/advpub.h (props changed) trunk/reactos/include/psdk/af_irda.h (props changed) trunk/reactos/include/psdk/appmgmt.h (props changed) trunk/reactos/include/psdk/authz.h (props changed) trunk/reactos/include/psdk/axcore.idl (props changed) trunk/reactos/include/psdk/axextend.idl (props changed) trunk/reactos/include/psdk/clusapi.h (contents, props changed) trunk/reactos/include/psdk/comcat.idl (props changed) trunk/reactos/include/psdk/common.ver (contents, props changed) trunk/reactos/include/psdk/control.idl (props changed) trunk/reactos/include/psdk/cryptuiapi.h (contents, props changed) trunk/reactos/include/psdk/cvconst.h (props changed) trunk/reactos/include/psdk/d3d.h (props changed) trunk/reactos/include/psdk/d3drmdef.h (contents, props changed) trunk/reactos/include/psdk/d3dtypes.h (props changed) trunk/reactos/include/psdk/dbghelp.h (props changed) trunk/reactos/include/psdk/dbinit.idl (props changed) trunk/reactos/include/psdk/dbprop.idl (props changed) trunk/reactos/include/psdk/dbs.idl (props changed) trunk/reactos/include/psdk/ddrawgdi.h (props changed) trunk/reactos/include/psdk/devenum.idl (props changed) trunk/reactos/include/psdk/devguid.h (props changed) trunk/reactos/include/psdk/digitalv.h (props changed) trunk/reactos/include/psdk/dinput.h (props changed) trunk/reactos/include/psdk/dsdriver.h (props changed) trunk/reactos/include/psdk/dsgetdc.h (props changed) trunk/reactos/include/psdk/dsound.h (props changed) trunk/reactos/include/psdk/dsrole.h (props changed) trunk/reactos/include/psdk/guiddef.h (props changed) trunk/reactos/include/psdk/htmlhelp.h (props changed) trunk/reactos/include/psdk/intrin_ppc.h (contents, props changed) trunk/reactos/include/psdk/intrin_x86_64.h (contents, props changed) trunk/reactos/include/psdk/ks.h (props changed) trunk/reactos/include/psdk/ksmedia.h (props changed) trunk/reactos/include/psdk/lmjoin.h (props changed) trunk/reactos/include/psdk/mapicode.h (props changed) trunk/reactos/include/psdk/mapidefs.h (props changed) trunk/reactos/include/psdk/mapiguid.h (props changed) trunk/reactos/include/psdk/mapitags.h (props changed) trunk/reactos/include/psdk/mapiutil.h (props changed) trunk/reactos/include/psdk/mapival.h (props changed) trunk/reactos/include/psdk/mapix.h (props changed) trunk/reactos/include/psdk/mmddk.h (props changed) trunk/reactos/include/psdk/mscat.h (props changed) trunk/reactos/include/psdk/mshtmcid.h (props changed) trunk/reactos/include/psdk/mshtmdid.h (props changed) trunk/reactos/include/psdk/msi.h (props changed) trunk/reactos/include/psdk/msidefs.h (props changed) trunk/reactos/include/psdk/msiquery.h (props changed) trunk/reactos/include/psdk/mssip.h (props changed) trunk/reactos/include/psdk/multimon.h (contents, props changed) trunk/reactos/include/psdk/npapi.h (props changed) trunk/reactos/include/psdk/ntstatus.h (props changed) trunk/reactos/include/psdk/ntverp.h (contents, props changed) trunk/reactos/include/psdk/psdk.rbuild (contents, props changed) trunk/reactos/include/psdk/tchar.h (props changed) trunk/reactos/include/psdk/tcpioctl.h (props changed) trunk/reactos/include/psdk/textserv.h (props changed) trunk/reactos/include/psdk/vfwmsgs.h (props changed) trunk/reactos/include/psdk/wdbgexts.h (contents, props changed) trunk/reactos/include/psdk/winternl.h (props changed) trunk/reactos/include/psdk/wintrust.h (props changed) trunk/reactos/include/psdk/wtsapi32.h (props changed) trunk/reactos/include/psdk/xcmc.h (props changed) [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/include/psdk/clusapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/clusapi.h?rev… Modified: trunk/reactos/include/psdk/common.ver URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/common.ver?re… Modified: trunk/reactos/include/psdk/cryptuiapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/cryptuiapi.h?… Modified: trunk/reactos/include/psdk/d3drmdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3drmdef.h?re… Modified: trunk/reactos/include/psdk/intrin_ppc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/intrin_ppc.h?… Modified: trunk/reactos/include/psdk/intrin_x86_64.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/intrin_x86_64… Modified: trunk/reactos/include/psdk/multimon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/multimon.h?re… Modified: trunk/reactos/include/psdk/ntverp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntverp.h?rev=… Modified: trunk/reactos/include/psdk/psdk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/psdk.rbuild?r… Modified: trunk/reactos/include/psdk/wdbgexts.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wdbgexts.h?re…

17 years, 3 months

[dreimer] 29081: Fix my stupidity on two Parameter sets...

by dreimer＠svn.reactos.org

Author: dreimer Date: Mon Sep 17 14:14:13 2007 New Revision: 29081 URL: http://svn.reactos.org/svn/reactos?rev=29081&view=rev Log: Fix my stupidity on two Parameter sets... Modified: trunk/tools/RosBE-Windows/Root/Build-Shared.cmd trunk/tools/RosBE-Windows/Root/reladdr2line.cmd Modified: trunk/tools/RosBE-Windows/Root/Build-Shared.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Build-Sha… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Build-Shared.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Build-Shared.cmd Mon Sep 17 14:14:13 2007 @@ -13,12 +13,13 @@ :: :: Take over the 2nd parameter of Build.cmd, which enables/disables stripping. :: + if "%1" == "strip" ( - set ROS_LEAN_AND_MEAN = yes + set ROS_LEAN_AND_MEAN=yes goto :Build ) if "%1" == "" ( - set ROS_LEAN_AND_MEAN = no + set ROS_LEAN_AND_MEAN=no goto :Build ) Modified: trunk/tools/RosBE-Windows/Root/reladdr2line.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/reladdr2l… ============================================================================== --- trunk/tools/RosBE-Windows/Root/reladdr2line.cmd (original) +++ trunk/tools/RosBE-Windows/Root/reladdr2line.cmd Mon Sep 17 14:14:13 2007 @@ -49,7 +49,7 @@ if %%i LSS %_2% ( raddr2line "%_1%" "%_2%" 2>NUL ) else ( - set /a baseaddr += 0x%_2% + set /a baseaddr+=0x%_2% for /f %%i in ('"echoh %baseaddr%"') do set relbase=%%i raddr2line "%_1%" "%relbase%" 2>NUL )

17 years, 3 months

[frik85] 29080: RosCMS update: * fixed language quick-switch combobox (bug related to the table "pages")

by frik85＠svn.reactos.org

Author: frik85 Date: Mon Sep 17 13:54:31 2007 New Revision: 29080 URL: http://svn.reactos.org/svn/reactos?rev=29080&view=rev Log: RosCMS update: * fixed language quick-switch combobox (bug related to the table "pages") Modified: trunk/web/reactos.org/htdocs/roscms/inc/data_list.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/data_list.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/inc/… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/inc/data_list.php (original) +++ trunk/web/reactos.org/htdocs/roscms/inc/data_list.php Mon Sep 17 13:54:31 2007 @@ -1492,6 +1492,24 @@ load_frametable_cp(tcp); } + + function load_frametable_cp3(tcp) { + if (document.getElementById('frametable').style.display != 'block') { + document.getElementById('frametable').style.display = 'block'; + document.getElementById('frameedit').style.display = 'none'; + } + + window.clearTimeout(alertactiv); /* deactivate alert-timer */ + document.getElementById('alertb').style.visibility = 'hidden'; + document.getElementById('alertbc').innerHTML = ' '; + select_all(0); /* deselect all table entries */ + + + <?php if ($RosCMS_GET_debug) { ?> + debugLog('?page=data_out&d_f=xml&d_u=ptm&d_fl='+roscms_current_page+'&d_filter='+filtstring1+'&d_filter2='+filtstring2); + <?php } ?> + makeRequest('?page=data_out&d_f=xml&d_u=ptm&d_fl='+roscms_current_page+'&d_filter='+filtstring1+'&d_filter2='+filtstring2, 'ptm', 'tablist', 'xml', 'GET', ''); + } function load_frameedit_helper() { if (document.getElementById('frameedit').style.display != 'block') { @@ -2086,7 +2104,7 @@ userlang = favlang; filtpopulate(filtstring2); - load_frametable_cp2(roscms_current_tbl_position); + load_frametable_cp3(roscms_current_tbl_position); } function getlang() {

17 years, 3 months

← Newer
1
...
21
22
23
24
25
26
27
...
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