Ros-diffs

ros-diffs@reactos.org

81390 discussions

[weiden] 18127: some code reformatting
by weiden＠svn.reactos.com 27 Sep '05

27 Sep '05

some code reformatting Modified: trunk/reactos/lib/aclui/misc.c _____ Modified: trunk/reactos/lib/aclui/misc.c --- trunk/reactos/lib/aclui/misc.c 2005-09-27 15:50:49 UTC (rev 18126) +++ trunk/reactos/lib/aclui/misc.c 2005-09-27 18:19:59 UTC (rev 18127) @@ -1,6 +1,6 @@ /* * ReactOS Access Control List Editor - * Copyright (C) 2004 ReactOS Team + * Copyright (C) 2004-2005 ReactOS Team * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -41,36 +41,36 @@ LengthOfStrResource(IN HINSTANCE hInst, IN UINT uID) { - HRSRC hrSrc; - HGLOBAL hRes; - LPWSTR lpName, lpStr; + HRSRC hrSrc; + HGLOBAL hRes; + LPWSTR lpName, lpStr; - if(hInst == NULL) - { - return -1; - } + if (hInst == NULL) + { + return -1; + } - /* There are always blocks of 16 strings */ - lpName = (LPWSTR)MAKEINTRESOURCE((uID >> 4) + 1); + /* There are always blocks of 16 strings */ + lpName = (LPWSTR)MAKEINTRESOURCE((uID >> 4) + 1); - /* Find the string table block */ - if((hrSrc = FindResourceW(hInst, lpName, (LPWSTR)RT_STRING)) && - (hRes = LoadResource(hInst, hrSrc)) && - (lpStr = LockResource(hRes))) - { - UINT x; + /* Find the string table block */ + if ((hrSrc = FindResourceW(hInst, lpName, (LPWSTR)RT_STRING)) && + (hRes = LoadResource(hInst, hrSrc)) && + (lpStr = LockResource(hRes))) + { + UINT x; - /* Find the string we're looking for */ - uID &= 0xF; /* position in the block, same as % 16 */ - for(x = 0; x < uID; x++) - { - lpStr += (*lpStr) + 1; + /* Find the string we're looking for */ + uID &= 0xF; /* position in the block, same as % 16 */ + for (x = 0; x < uID; x++) + { + lpStr += (*lpStr) + 1; + } + + /* Found the string */ + return (int)(*lpStr); } - - /* Found the string */ - return (int)(*lpStr); - } - return -1; + return -1; } static INT @@ -78,25 +78,25 @@ IN HINSTANCE hInst, IN UINT uID) { - INT ln; + INT ln; - ln = LengthOfStrResource(hInst, - uID); - if(ln++ > 0) - { - (*lpTarget) = (LPWSTR)LocalAlloc(LMEM_FIXED, - ln * sizeof(WCHAR)); - if((*lpTarget) != NULL) + ln = LengthOfStrResource(hInst, + uID); + if (ln++ > 0) { - INT Ret; - if(!(Ret = LoadStringW(hInst, uID, *lpTarget, ln))) - { - LocalFree((HLOCAL)(*lpTarget)); - } - return Ret; + (*lpTarget) = (LPWSTR)LocalAlloc(LMEM_FIXED, + ln * sizeof(WCHAR)); + if ((*lpTarget) != NULL) + { + INT Ret; + if (!(Ret = LoadStringW(hInst, uID, *lpTarget, ln))) + { + LocalFree((HLOCAL)(*lpTarget)); + } + return Ret; + } } - } - return 0; + return 0; } DWORD @@ -105,30 +105,30 @@ OUT LPWSTR *lpTarget, ...) { - DWORD Ret = 0; - LPWSTR lpFormat; - va_list lArgs; + DWORD Ret = 0; + LPWSTR lpFormat; + va_list lArgs; - if(AllocAndLoadString(&lpFormat, - hInstance, - uID) > 0) - { - va_start(lArgs, lpTarget); - /* let's use FormatMessage to format it because it has the ability to allocate - memory automatically */ - Ret = FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_STRING, - lpFormat, - 0, - 0, - (LPWSTR)lpTarget, - 0, - &lArgs); - va_end(lArgs); + if (AllocAndLoadString(&lpFormat, + hInstance, + uID) > 0) + { + va_start(lArgs, lpTarget); + /* let's use FormatMessage to format it because it has the ability to allocate + memory automatically */ + Ret = FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_STRING, + lpFormat, + 0, + 0, + (LPWSTR)lpTarget, + 0, + &lArgs); + va_end(lArgs); - LocalFree((HLOCAL)lpFormat); - } + LocalFree((HLOCAL)lpFormat); + } - return Ret; + return Ret; } BOOL

1 0

[weiden] 18126: add hid.dll to the build system
by weiden＠svn.reactos.com 27 Sep '05

27 Sep '05

add hid.dll to the build system Modified: trunk/reactos/bootdata/packages/reactos.dff Modified: trunk/reactos/lib/directory.xml Modified: trunk/reactos/lib/hid/hid.c Added: trunk/reactos/lib/hid/hid.xml Deleted: trunk/reactos/lib/hid/internal.h Added: trunk/reactos/lib/hid/precomp.h Modified: trunk/reactos/lib/hid/stubs.c _____ Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2005-09-27 14:27:14 UTC (rev 18125) +++ trunk/reactos/bootdata/packages/reactos.dff 2005-09-27 15:50:49 UTC (rev 18126) @@ -88,6 +88,7 @@ lib\gdi32\gdi32.dll 1 lib\gdiplus\gdiplus.dll 1 lib\glu32\glu32.dll 1 +lib\hid\hid.dll 1 lib\imagehlp\imagehlp.dll 1 lib\imm32\imm32.dll 1 lib\iphlpapi\iphlpapi.dll 1 _____ Modified: trunk/reactos/lib/directory.xml --- trunk/reactos/lib/directory.xml 2005-09-27 14:27:14 UTC (rev 18125) +++ trunk/reactos/lib/directory.xml 2005-09-27 15:50:49 UTC (rev 18126) @@ -92,6 +92,9 @@ <directory name="glu32"> <xi:include href="glu32/glu32.xml" /> </directory> +<directory name="hid"> + <xi:include href="hid/hid.xml" /> +</directory> <directory name="imagehlp"> <xi:include href="imagehlp/imagehlp.xml" /> </directory> Property changes on: trunk/reactos/lib/hid ___________________________________________________________________ Name: svn:ignore - *.coff *.dll *.d *.a *.o *.sym *.map *.tmp + *.coff *.dll *.d *.a *.o *.sym *.map *.tmp GNUmakefile _____ Modified: trunk/reactos/lib/hid/hid.c --- trunk/reactos/lib/hid/hid.c 2005-09-27 14:27:14 UTC (rev 18125) +++ trunk/reactos/lib/hid/hid.c 2005-09-27 15:50:49 UTC (rev 18126) @@ -1,6 +1,6 @@ /* * ReactOS Hid User Library - * Copyright (C) 2004 ReactOS Team + * Copyright (C) 2004-2005 ReactOS Team * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,15 +21,12 @@ * PROJECT: ReactOS Hid User Library * FILE: lib/hid/hid.c * PURPOSE: ReactOS Hid User Library + * PROGRAMMER: Thomas Weidenmueller <w3seek(a)reactos.com> * * UPDATE HISTORY: * 07/12/2004 Created */ -#include <windows.h> -#include <ddk/hidusage.h> -#include <ddk/hidclass.h> -#include <ddk/hidpi.h> -#include "internal.h" +#include <precomp.h> HINSTANCE hDllInstance; _____ Added: trunk/reactos/lib/hid/hid.xml --- trunk/reactos/lib/hid/hid.xml 2005-09-27 14:27:14 UTC (rev 18125) +++ trunk/reactos/lib/hid/hid.xml 2005-09-27 15:50:49 UTC (rev 18126) @@ -0,0 +1,16 @@ +<module name="hid" type="win32dll" baseaddress="${BASEADDRESS_HID}" installbase="system32" installname="hid.dll"> + <importlibrary definition="hid.def" /> + <include base="hid">.</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x0500</define> + <define name="_WIN32_WINNT">0x0600</define> + <define name="WINVER">0x0600</define> + <library>ntdll</library> + <library>kernel32</library> + <file>hid.c</file> + <file>stubs.c</file> + <file>hid.rc</file> + <pch>precomp.h</pch> +</module> Property changes on: trunk/reactos/lib/hid/hid.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Deleted: trunk/reactos/lib/hid/internal.h --- trunk/reactos/lib/hid/internal.h 2005-09-27 14:27:14 UTC (rev 18125) +++ trunk/reactos/lib/hid/internal.h 2005-09-27 15:50:49 UTC (rev 18126) @@ -1,9 +0,0 @@ -#ifndef __HIDINTERNAL_H -#define __HIDINTERNAL_H - -extern HINSTANCE hDllInstance; -extern const GUID HidClassGuid; - -#endif /* __HIDINTERNAL_H */ - -/* EOF */ _____ Copied: trunk/reactos/lib/hid/precomp.h (from rev 18125, trunk/reactos/lib/hid/internal.h) --- trunk/reactos/lib/hid/internal.h 2005-09-27 14:27:14 UTC (rev 18125) +++ trunk/reactos/lib/hid/precomp.h 2005-09-27 15:50:49 UTC (rev 18126) @@ -0,0 +1,18 @@ +#include <ddk/ntddk.h> +#include <windows.h> + +#define _HIDPI_ +#define _HIDPI_NO_FUNCTION_MACROS_ +#include <ddk/hidusage.h> +#include <ddk/hidclass.h> +#include <ddk/hidpi.h> + +extern HINSTANCE hDllInstance; +extern const GUID HidClassGuid; + +#ifndef UNIMPLEMENTED +#define UNIMPLEMENTED \ + DbgPrint("HID: %s at %s:%d is UNIMPLEMENTED!\n",__FUNCTION__,__FILE__,__LINE__) +#endif + +/* EOF */ _____ Modified: trunk/reactos/lib/hid/stubs.c --- trunk/reactos/lib/hid/stubs.c 2005-09-27 14:27:14 UTC (rev 18125) +++ trunk/reactos/lib/hid/stubs.c 2005-09-27 15:50:49 UTC (rev 18126) @@ -9,14 +9,8 @@ * UPDATE HISTORY: * 07/12/2004 Created */ -#include <windows.h> -#include <ddk/hidpi.h> -#include "internal.h" +#include <precomp.h> -#define UNIMPLEMENTED \ - DbgPrint("HID: %s at %s:%d is UNIMPLEMENTED!\n",__FUNCTION__,__FILE__,__LINE__) - - /* * @unimplemented */

1 0

[hpoussin] 18125: During 2nd stage setup, define also DNS hostname of the computer if possible
by hpoussin＠svn.reactos.com 27 Sep '05

27 Sep '05

During 2nd stage setup, define also DNS hostname of the computer if possible Modified: trunk/reactos/lib/syssetup/wizard.c _____ Modified: trunk/reactos/lib/syssetup/wizard.c --- trunk/reactos/lib/syssetup/wizard.c 2005-09-27 13:47:46 UTC (rev 18124) +++ trunk/reactos/lib/syssetup/wizard.c 2005-09-27 14:27:14 UTC (rev 18125) @@ -480,6 +480,8 @@ SetWindowLong(hwndDlg, DWL_MSGRESULT, -1); return TRUE; } + /* Try to also set DNS hostname */ + SetComputerNameEx(ComputerNamePhysicalDnsHostname, ComputerName); /* Check admin passwords */ GetDlgItemText(hwndDlg, IDC_ADMINPASSWORD1, Password1, 15);

1 0

[npwoods] 18124: Regedit: Optimizations to refreshing; refreshing is still slightly slower than Windows regedit
by npwoods＠svn.reactos.com 27 Sep '05

27 Sep '05

Regedit: Optimizations to refreshing; refreshing is still slightly slower than Windows regedit Modified: trunk/reactos/subsys/system/regedit/treeview.c _____ Modified: trunk/reactos/subsys/system/regedit/treeview.c --- trunk/reactos/subsys/system/regedit/treeview.c 2005-09-27 13:42:20 UTC (rev 18123) +++ trunk/reactos/subsys/system/regedit/treeview.c 2005-09-27 13:47:46 UTC (rev 18124) @@ -134,21 +134,24 @@ HTREEITEM childItem; LPCTSTR KeyPath; DWORD dwCount, dwIndex, dwMaxSubKeyLen; - LPSTR Name; + LPSTR Name = NULL; TVITEM tvItem; - + LPTSTR pszNodes = NULL; + BOOL bSuccess = FALSE; + LPTSTR s; + KeyPath = GetItemPath(hwndTV, hItem, &hRoot); if (*KeyPath) { if (RegOpenKeyEx(hRoot, KeyPath, 0, KEY_READ, &hKey) != ERROR_SUCCESS) { - return FALSE; + goto done; } } else { hKey = hRoot; } if (RegQueryInfoKey(hKey, 0, 0, 0, &dwCount, &dwMaxSubKeyLen, 0, 0, 0, 0, 0, 0) != ERROR_SUCCESS) { - return FALSE; + goto done; } /* Set the number of children again */ @@ -156,24 +159,65 @@ tvItem.hItem = hItem; tvItem.cChildren = dwCount; if (!TreeView_SetItem(hwndTV, &tvItem)) { - return FALSE; + goto done; } /* We don't have to bother with the rest if it's not expanded. */ if (TreeView_GetItemState(hwndTV, hItem, TVIS_EXPANDED) == 0) { RegCloseKey(hKey); - return TRUE; + bSuccess = TRUE; + goto done; } dwMaxSubKeyLen++; /* account for the \0 terminator */ if (!(Name = HeapAlloc(GetProcessHeap(), 0, dwMaxSubKeyLen * sizeof(TCHAR)))) { - return FALSE; + goto done; } tvItem.cchTextMax = dwMaxSubKeyLen; if (!(tvItem.pszText = HeapAlloc(GetProcessHeap(), 0, dwMaxSubKeyLen * sizeof(TCHAR)))) { - return FALSE; + goto done; } + /* Get all of the tree node siblings in one contiguous block of memory */ + { + DWORD dwPhysicalSize = 0; + DWORD dwActualSize = 0; + DWORD dwNewPhysicalSize; + LPTSTR pszNewNodes; + DWORD dwStep = 10000; + + for (childItem = TreeView_GetChild(hwndTV, hItem); childItem; + childItem = TreeView_GetNextSibling(hwndTV, childItem)) { + + if (dwActualSize + dwMaxSubKeyLen + 1 > dwPhysicalSize) + { + dwNewPhysicalSize = dwActualSize + dwMaxSubKeyLen + 1 + dwStep; + + if (pszNodes) + pszNewNodes = (LPTSTR) HeapReAlloc(GetProcessHeap(), 0, pszNodes, dwNewPhysicalSize * sizeof(TCHAR)); + else + pszNewNodes = (LPTSTR) HeapAlloc(GetProcessHeap(), 0, dwNewPhysicalSize * sizeof(TCHAR)); + if (!pszNewNodes) + goto done; + + dwPhysicalSize = dwNewPhysicalSize; + pszNodes = pszNewNodes; + } + + tvItem.mask = TVIF_TEXT; + tvItem.hItem = childItem; + tvItem.pszText = &pszNodes[dwActualSize]; + tvItem.cchTextMax = dwPhysicalSize - dwActualSize; + if (!TreeView_GetItem(hwndTV, &tvItem)) + goto done; + + dwActualSize += _tcslen(&pszNodes[dwActualSize]) + 1; + } + + if (pszNodes) + pszNodes[dwActualSize] = '\0'; + } + /* Now go through all the children in the registry, and check if any have to be added. */ for (dwIndex = 0; dwIndex < dwCount; dwIndex++) { DWORD cName = dwMaxSubKeyLen, dwSubCount; @@ -184,36 +228,29 @@ continue; } - /* Find the number of children of the node. */ - dwSubCount = 0; - if (RegOpenKeyEx(hKey, Name, 0, KEY_QUERY_VALUE, &hSubKey) == ERROR_SUCCESS) { - if (RegQueryInfoKey(hSubKey, 0, 0, 0, &dwSubCount, 0, 0, 0, 0, 0, 0, 0) != ERROR_SUCCESS) { - dwSubCount = 0; + /* Check if the node is already in there. */ + if (pszNodes) { + for (s = pszNodes; *s; s += _tcslen(s) + 1) { + if (!strcmp(s, Name)) { + found = TRUE; + break; + } } - RegCloseKey(hSubKey); } - /* Check if the node is already in there. */ - for (childItem = TreeView_GetChild(hwndTV, hItem); childItem; - childItem = TreeView_GetNextSibling(hwndTV, childItem)) { - tvItem.mask = TVIF_TEXT; - tvItem.hItem = childItem; - if (!TreeView_GetItem(hwndTV, &tvItem)) { - return FALSE; + if (found == FALSE) { + /* Find the number of children of the node. */ + dwSubCount = 0; + if (RegOpenKeyEx(hKey, Name, 0, KEY_QUERY_VALUE, &hSubKey) == ERROR_SUCCESS) { + if (RegQueryInfoKey(hSubKey, 0, 0, 0, &dwSubCount, 0, 0, 0, 0, 0, 0, 0) != ERROR_SUCCESS) { + dwSubCount = 0; + } + RegCloseKey(hSubKey); } - if (!strcmp(tvItem.pszText, Name)) { - found = TRUE; - break; - } - } - - if (found == FALSE) { AddEntryToTree(hwndTV, hItem, Name, NULL, dwSubCount); } } - HeapFree(GetProcessHeap(), 0, Name); - HeapFree(GetProcessHeap(), 0, tvItem.pszText); RegCloseKey(hKey); /* Now go through all the children in the tree, and check if any have to be removed. */ @@ -225,8 +262,14 @@ } childItem = nextItem; } + bSuccess = TRUE; - return TRUE; +done: + if (pszNodes) + HeapFree(GetProcessHeap(), 0, pszNodes); + if (Name) + HeapFree(GetProcessHeap(), 0, Name); + return bSuccess; } BOOL RefreshTreeView(HWND hwndTV)

1 0

[weiden] 18123: load some settings from the registry
by weiden＠svn.reactos.com 27 Sep '05

27 Sep '05

load some settings from the registry Modified: trunk/reactos/subsys/system/sndvol32/misc.c Modified: trunk/reactos/subsys/system/sndvol32/mixer.c Modified: trunk/reactos/subsys/system/sndvol32/sndvol32.c Modified: trunk/reactos/subsys/system/sndvol32/sndvol32.h _____ Modified: trunk/reactos/subsys/system/sndvol32/misc.c --- trunk/reactos/subsys/system/sndvol32/misc.c 2005-09-27 12:43:36 UTC (rev 18122) +++ trunk/reactos/subsys/system/sndvol32/misc.c 2005-09-27 13:42:20 UTC (rev 18123) @@ -127,3 +127,121 @@ return Ret; } +/* NOTE: do NOT modify SNDVOL_REG_LINESTATE for binary compatibility with XP! */ +typedef struct _SNDVOL_REG_LINESTATE +{ + DWORD Flags; + WCHAR LineName[MIXER_LONG_NAME_CHARS]; +} SNDVOL_REG_LINESTATE, *PSNDVOL_REG_LINESTATE; + +static const TCHAR AppRegSettings[] = TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\Volume Control"); +static const TCHAR AppOptionsKey[] = TEXT("Options"); +static const TCHAR LineStatesValue[] = TEXT("LineStates"); +static const TCHAR StyleValue[] = TEXT("Style"); + +HKEY hAppSettingsKey = NULL; + +BOOL +InitAppConfig(VOID) +{ + return RegCreateKeyEx(HKEY_CURRENT_USER, + AppRegSettings, + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_READ | KEY_WRITE, + NULL, + &hAppSettingsKey, + NULL) == ERROR_SUCCESS; +} + +VOID +CloseAppConfig(VOID) +{ + if (hAppSettingsKey != NULL) + { + RegCloseKey(hAppSettingsKey); + hAppSettingsKey = NULL; + } +} + +BOOL +ReadLineConfig(IN LPTSTR szDeviceName, + IN LPTSTR szLineName, + IN LPTSTR szControlName, + OUT DWORD *Flags) +{ + HKEY hLineKey; + DWORD Type; + DWORD i, Size = 0; + PSNDVOL_REG_LINESTATE LineStates = NULL; + TCHAR szDevRegKey[MAX_PATH]; + BOOL Ret = FALSE; + + _stprintf(szDevRegKey, + TEXT("%s\\%s"), + szDeviceName, + szLineName); + + if (RegCreateKeyEx(hAppSettingsKey, + szDevRegKey, + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_READ | KEY_WRITE, + NULL, + &hLineKey, + NULL) == ERROR_SUCCESS) + { + if (RegQueryValueEx(hLineKey, + LineStatesValue, + NULL, + &Type, + NULL, + &Size) != ERROR_SUCCESS || + Type != REG_BINARY || + Size == 0 || (Size % sizeof(SNDVOL_REG_LINESTATE) != 0)) + { + goto ExitClose; + } + + LineStates = HeapAlloc(GetProcessHeap(), + 0, + Size); + + if (LineStates != NULL) + { + if (RegQueryValueEx(hLineKey, + LineStatesValue, + NULL, + &Type, + (LPBYTE)LineStates, + &Size) != ERROR_SUCCESS || + Type != REG_BINARY || + Size == 0 || (Size % sizeof(SNDVOL_REG_LINESTATE) != 0)) + { + goto ExitClose; + } + + /* try to find the control */ + for (i = 0; i < Size / sizeof(SNDVOL_REG_LINESTATE); i++) + { + if (!_tcscmp(szControlName, + LineStates[i].LineName)) + { + *Flags = LineStates[i].Flags; + Ret = TRUE; + break; + } + } + } + +ExitClose: + HeapFree(GetProcessHeap(), + 0, + LineStates); + RegCloseKey(hLineKey); + } + + return Ret; +} _____ Modified: trunk/reactos/subsys/system/sndvol32/mixer.c --- trunk/reactos/subsys/system/sndvol32/mixer.c 2005-09-27 12:43:36 UTC (rev 18122) +++ trunk/reactos/subsys/system/sndvol32/mixer.c 2005-09-27 13:42:20 UTC (rev 18123) @@ -111,6 +111,7 @@ static BOOL SndMixerQueryControls(PSND_MIXER Mixer, + PUINT DisplayControls, LPMIXERLINE LineInfo, LPMIXERCONTROL *Controls) { @@ -138,7 +139,13 @@ { for (j = 0; j < LineControls.cControls; j++) { - DPRINT("Line control: %ws\n", (*Controls)[j].szName); + if (SndMixerIsDisplayControl(Mixer, + &(*Controls)[j])) + { + (*DisplayControls)++; + } + + DPRINT("Line control: %ws (0x%x, 0x%x)\n", (*Controls)[j].szName, (*Controls)[j].fdwControl, (*Controls)[j].dwControlType); } return TRUE; @@ -169,7 +176,7 @@ SndMixerQueryConnections(PSND_MIXER Mixer, PSND_MIXER_DESTINATION Line) { - UINT i; + UINT i, DispControls; MIXERLINE LineInfo; MMRESULT Result; BOOL Ret = TRUE; @@ -188,8 +195,11 @@ PSND_MIXER_CONNECTION Con; DPRINT("++ Source: %ws\n", LineInfo.szName); + + DispControls = 0; if (!SndMixerQueryControls(Mixer, + &DispControls, &LineInfo, &Controls)) { @@ -205,6 +215,7 @@ { Con->Info = LineInfo; Con->Controls = Controls; + Con->DisplayControls = DispControls; Con->Next = Line->Connections; Line->Connections = Con; } @@ -247,15 +258,10 @@ &Line->Info, MIXER_GETLINEINFOF_DESTINATION) == MMSYSERR_NOERROR) { - DPRINT("+ Destination: %ws (%d)\n", Line->Info.szName, Line->Info.dwComponentType); - - if (!SndMixerQueryConnections(Mixer, Line)) - { - DPRINT("Failed to query mixer connections!\n"); - Ret = FALSE; - break; - } + DPRINT("+ Destination: %ws (0x%x, %d)\n", Line->Info.szName, Line->Info.dwLineID, Line->Info.dwComponentType); + if (!SndMixerQueryControls(Mixer, + &Line->DisplayControls, &Line->Info, &Line->Controls)) { @@ -264,6 +270,13 @@ break; } + if (!SndMixerQueryConnections(Mixer, Line)) + { + DPRINT("Failed to query mixer connections!\n"); + Ret = FALSE; + break; + } + Line->Next = Mixer->Lines; Mixer->Lines = Line; } @@ -374,6 +387,47 @@ return -1; } +INT +SndMixerGetLineName(PSND_MIXER Mixer, + DWORD LineID, + LPTSTR lpBuffer, + UINT uSize, + BOOL LongName) +{ + if (Mixer->hmx) + { + int lnsz; + PSND_MIXER_DESTINATION Line; + LPMIXERLINE lpl = NULL; + + for (Line = Mixer->Lines; Line != NULL; Line = Line->Next) + { + if (Line->Info.dwLineID == LineID) + { + lpl = &Line->Info; + break; + } + } + + if (lpl != NULL) + { + lnsz = lstrlen(LongName ? lpl->szName : lpl->szShortName); + if(lnsz + 1 > uSize) + { + return lnsz + 1; + } + else + { + memcpy(lpBuffer, LongName ? lpl->szName : lpl->szShortName, lnsz * sizeof(TCHAR)); + lpBuffer[lnsz] = _T('\0'); + return lnsz; + } + } + } + + return -1; +} + BOOL SndMixerEnumProducts(PSND_MIXER Mixer, PFNSNDMIXENUMPRODUCTS EnumProc, @@ -436,6 +490,7 @@ { if (!EnumProc(Mixer, &Line->Info, + Line->DisplayControls, Context)) { return FALSE; @@ -463,6 +518,17 @@ if (Line->Info.dwLineID == LineID) { PSND_MIXER_CONNECTION Connection; + + if (Line->DisplayControls != 0) + { + if (!EnumProc(Mixer, + LineID, + &Line->Info, + Context)) + { + return FALSE; + } + } for (Connection = Line->Connections; Connection != NULL; Connection = Connection->Next) { @@ -483,3 +549,20 @@ return FALSE; } +BOOL +SndMixerIsDisplayControl(PSND_MIXER Mixer, + LPMIXERCONTROL Control) +{ + if (Mixer->hmx && !(Control->fdwControl & MIXERCONTROL_CONTROLF_DISABLED)) + { + switch (Control->dwControlType & MIXERCONTROL_CT_CLASS_MASK) + { + case MIXERCONTROL_CT_CLASS_FADER: + case MIXERCONTROL_CT_CLASS_SWITCH: + return TRUE; + } + } + + return FALSE; +} + _____ Modified: trunk/reactos/subsys/system/sndvol32/sndvol32.c --- trunk/reactos/subsys/system/sndvol32/sndvol32.c 2005-09-27 12:43:36 UTC (rev 18122) +++ trunk/reactos/subsys/system/sndvol32/sndvol32.c 2005-09-27 13:42:20 UTC (rev 18123) @@ -51,6 +51,7 @@ DWORD PlaybackID; DWORD RecordingID; UINT OtherLines; + TCHAR DeviceName[128]; DWORD tmp; } PREFERENCES_CONTEXT, *PPREFERENCES_CONTEXT; @@ -98,6 +99,7 @@ static BOOL CALLBACK PrefDlgAddLine(PSND_MIXER Mixer, LPMIXERLINE Line, + UINT DisplayControls, PVOID Context) { PPREFERENCES_CONTEXT PrefContext = (PPREFERENCES_CONTEXT)Context; @@ -113,6 +115,8 @@ { PrefContext->SelectedLine = Line->dwLineID; } + + DPRINT("!%ws cControls: %d\n", Line->szName, Line->cControls); } else goto AddToOthersLines; @@ -128,6 +132,7 @@ { PrefContext->SelectedLine = Line->dwLineID; } + DPRINT("!%ws cControls: %d\n", Line->szName, Line->cControls); } else goto AddToOthersLines; @@ -196,10 +201,33 @@ (LPARAM)&lvi); if (i != (UINT)-1) { - /* FIXME - read config from registry */ + TCHAR LineName[MIXER_LONG_NAME_CHARS]; + DWORD Flags; + BOOL SelLine = FALSE; + + if (SndMixerGetLineName(PrefContext->Mixer, + PrefContext->SelectedLine, + LineName, + MIXER_LONG_NAME_CHARS, + FALSE) == -1) + { + LineName[0] = TEXT('\0'); + } + + if (ReadLineConfig(PrefContext->DeviceName, + LineName, + Line->szName, + &Flags)) + { + if (Flags != 0x4) + { + SelLine = TRUE; + } + } + ListView_SetCheckState(hwndControls, i, - FALSE); + SelLine); } } @@ -214,18 +242,18 @@ INT DeviceCbIndex; /* select the mixer */ - DeviceCbIndex = SendMessage(GetDlgItem(Context->hwndDlg, - IDC_MIXERDEVICE), - CB_GETCURSEL, - 0, - 0); + DeviceCbIndex = SendDlgItemMessage(Context->hwndDlg, + IDC_MIXERDEVICE, + CB_GETCURSEL, + 0, + 0); if (DeviceCbIndex != CB_ERR) { - MixerID = SendMessage(GetDlgItem(Context->hwndDlg, - IDC_MIXERDEVICE), - CB_GETITEMDATA, - DeviceCbIndex, - 0); + MixerID = SendDlgItemMessage(Context->hwndDlg, + IDC_MIXERDEVICE, + CB_GETITEMDATA, + DeviceCbIndex, + 0); if (MixerID == CB_ERR) { MixerID = 0; @@ -244,6 +272,10 @@ Context->RecordingID = (DWORD)-1; Context->OtherLines = 0; Context->SelectedLine = (DWORD)-1; + + SndMixerGetProductName(Context->Mixer, + Context->DeviceName, + sizeof(Context->DeviceName) / sizeof(Context->DeviceName[0])); if (SndMixerEnumLines(Context->Mixer, PrefDlgAddLine, @@ -271,11 +303,11 @@ if (Context->OtherLines != 0) { /* select the first item in the other lines combo box by default */ - SendMessage(GetDlgItem(Context->hwndDlg, - IDC_LINE), - CB_SETCURSEL, - 0, - 0); + SendDlgItemMessage(Context->hwndDlg, + IDC_LINE, + CB_SETCURSEL, + 0, + 0); } EnableWindow(GetDlgItem(Context->hwndDlg, IDC_LINE), @@ -349,18 +381,18 @@ DWORD LineID; DWORD Index; - Index = SendMessage(GetDlgItem(hwndDlg, - IDC_LINE), - CB_GETCURSEL, - 0, - 0); + Index = SendDlgItemMessage(hwndDlg, + IDC_LINE, + CB_GETCURSEL, + 0, + 0); if (Index != CB_ERR) { - LineID = SendMessage(GetDlgItem(hwndDlg, - IDC_LINE), - CB_GETITEMDATA, - Index, - 0); + LineID = SendDlgItemMessage(hwndDlg, + IDC_LINE, + CB_GETITEMDATA, + Index, + 0); if (LineID != CB_ERR) { UpdatePrefDlgControls(Context, @@ -769,6 +801,12 @@ hAppInstance = hInstance; hAppHeap = GetProcessHeap(); + if (!InitAppConfig()) + { + DPRINT("Unable to open the Volume Control registry key!\n"); + return 1; + } + /* load the application title */ if (AllocAndLoadString(&lpAppTitle, hAppInstance, @@ -809,6 +847,8 @@ { LocalFree(lpAppTitle); } + + CloseAppConfig(); return 0; } _____ Modified: trunk/reactos/subsys/system/sndvol32/sndvol32.h --- trunk/reactos/subsys/system/sndvol32/sndvol32.h 2005-09-27 12:43:36 UTC (rev 18122) +++ trunk/reactos/subsys/system/sndvol32/sndvol32.h 2005-09-27 13:42:20 UTC (rev 18123) @@ -42,6 +42,7 @@ struct _SND_MIXER_CONNECTION *Next; MIXERLINE Info; LPMIXERCONTROL Controls; + UINT DisplayControls; } SND_MIXER_CONNECTION, *PSND_MIXER_CONNECTION; @@ -50,6 +51,7 @@ struct _SND_MIXER_DESTINATION *Next; MIXERLINE Info; LPMIXERCONTROL Controls; + UINT DisplayControls; PSND_MIXER_CONNECTION Connections; } SND_MIXER_DESTINATION, *PSND_MIXER_DESTINATION; @@ -63,7 +65,7 @@ PSND_MIXER_DESTINATION Lines; } SND_MIXER, *PSND_MIXER; -typedef BOOL (CALLBACK *PFNSNDMIXENUMLINES)(PSND_MIXER Mixer, LPMIXERLINE Line, PVOID Context); +typedef BOOL (CALLBACK *PFNSNDMIXENUMLINES)(PSND_MIXER Mixer, LPMIXERLINE Line, UINT DisplayControls, PVOID Context); typedef BOOL (CALLBACK *PFNSNDMIXENUMCONNECTIONS)(PSND_MIXER Mixer, DWORD LineID, LPMIXERLINE Line, PVOID Context); typedef BOOL (CALLBACK *PFNSNDMIXENUMPRODUCTS)(PSND_MIXER Mixer, UINT Id, LPCTSTR ProductName, PVOID Context); @@ -73,14 +75,25 @@ BOOL SndMixerSelect(PSND_MIXER Mixer, UINT MixerId); UINT SndMixerGetSelection(PSND_MIXER Mixer); INT SndMixerGetProductName(PSND_MIXER Mixer, LPTSTR lpBuffer, UINT uSize); +INT SndMixerGetLineName(PSND_MIXER Mixer, DWORD LineID, LPTSTR lpBuffer, UINT uSize, BOOL LongName); BOOL SndMixerEnumProducts(PSND_MIXER Mixer, PFNSNDMIXENUMPRODUCTS EnumProc, PVOID Context); INT SndMixerGetDestinationCount(PSND_MIXER Mixer); BOOL SndMixerEnumLines(PSND_MIXER Mixer, PFNSNDMIXENUMLINES EnumProc, PVOID Context); BOOL SndMixerEnumConnections(PSND_MIXER Mixer, DWORD LineID, PFNSNDMIXENUMCONNECTIONS EnumProc, PVOID Context); +BOOL SndMixerIsDisplayControl(PSND_MIXER Mixer, LPMIXERCONTROL Control); /* * MISC */ + +extern HKEY hAppSettingsKey; + +BOOL +InitAppConfig(VOID); + +VOID +CloseAppConfig(VOID); + INT AllocAndLoadString(OUT LPWSTR *lpTarget, IN HINSTANCE hInst, @@ -92,4 +105,10 @@ OUT LPWSTR *lpTarget, ...); +BOOL +ReadLineConfig(IN LPTSTR szDeviceName, + IN LPTSTR szLineName, + IN LPTSTR szControlName, + OUT DWORD *Flags); + #endif /* __SNDVOL32_H */

1 0

[hpoussin] 18122: KEBUGCHECK(0) -> KEBUGCHECK(INACCESSIBLE_BOOT_DEVICE)
by hpoussin＠svn.reactos.com 27 Sep '05

27 Sep '05

KEBUGCHECK(0) -> KEBUGCHECK(INACCESSIBLE_BOOT_DEVICE) Modified: trunk/reactos/ntoskrnl/io/driver.c _____ Modified: trunk/reactos/ntoskrnl/io/driver.c --- trunk/reactos/ntoskrnl/io/driver.c 2005-09-27 12:40:20 UTC (rev 18121) +++ trunk/reactos/ntoskrnl/io/driver.c 2005-09-27 12:43:36 UTC (rev 18122) @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/io/driver.c @@ -1352,7 +1351,7 @@ if (BootDriverCount == 0) { DbgPrint("No boot drivers available.\n"); - KEBUGCHECK(0); + KEBUGCHECK(INACCESSIBLE_BOOT_DEVICE); } }

1 0

[hpoussin] 18121: Display status code when the file can't be opened
by hpoussin＠svn.reactos.com 27 Sep '05

27 Sep '05

Display status code when the file can't be opened Modified: trunk/reactos/ntoskrnl/ldr/loader.c _____ Modified: trunk/reactos/ntoskrnl/ldr/loader.c --- trunk/reactos/ntoskrnl/ldr/loader.c 2005-09-27 10:52:10 UTC (rev 18120) +++ trunk/reactos/ntoskrnl/ldr/loader.c 2005-09-27 12:40:20 UTC (rev 18121) @@ -258,7 +258,7 @@ CHECKPOINT; if (!NT_SUCCESS(Status)) { - CPRINT("Could not open module file: %wZ\n", Filename); + CPRINT("Could not open module file: %wZ (Status 0x%08lx)\n", Filename, Status); return(Status); } CHECKPOINT;

1 0

[weiden] 18120: fixed uninitialized variable warnings
by weiden＠svn.reactos.com 27 Sep '05

27 Sep '05

fixed uninitialized variable warnings Modified: trunk/reactos/subsys/win32k/ntuser/cursoricon.c Modified: trunk/reactos/subsys/win32k/ntuser/keyboard.c Modified: trunk/reactos/subsys/win32k/objects/coord.c Modified: trunk/reactos/subsys/win32k/objects/rect.c Modified: trunk/reactos/subsys/win32k/objects/region.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/cursoricon.c --- trunk/reactos/subsys/win32k/ntuser/cursoricon.c 2005-09-27 08:52:17 UTC (rev 18119) +++ trunk/reactos/subsys/win32k/ntuser/cursoricon.c 2005-09-27 10:52:10 UTC (rev 18120) @@ -847,7 +847,7 @@ PSYSTEM_CURSORINFO CurInfo; RECT Rect; PWINDOW_OBJECT DesktopWindow = NULL; - POINT MousePos; + POINT MousePos = {0}; DECLARE_RETURN(BOOL); DPRINT("Enter NtUserClipCursor\n"); _____ Modified: trunk/reactos/subsys/win32k/ntuser/keyboard.c --- trunk/reactos/subsys/win32k/ntuser/keyboard.c 2005-09-27 08:52:17 UTC (rev 18119) +++ trunk/reactos/subsys/win32k/ntuser/keyboard.c 2005-09-27 10:52:10 UTC (rev 18120) @@ -930,7 +930,7 @@ case 2: { - WCHAR wp[2]; + WCHAR wp[2] = {0}; ret = VkToScan( Code, FALSE, keyLayout ); ToUnicodeInner( Code, ret, 0, wp, 2, 0, keyLayout ); _____ Modified: trunk/reactos/subsys/win32k/objects/coord.c --- trunk/reactos/subsys/win32k/objects/coord.c 2005-09-27 08:52:17 UTC (rev 18119) +++ trunk/reactos/subsys/win32k/objects/coord.c 2005-09-27 10:52:10 UTC (rev 18120) @@ -62,7 +62,7 @@ CONST LPXFORM Unsafexform2) { XFORM xformTemp; - XFORM xform1, xform2; + XFORM xform1 = {0}, xform2 = {0}; NTSTATUS Status = STATUS_SUCCESS; BOOL Ret; @@ -425,7 +425,7 @@ DWORD Mode) { PDC dc; - XFORM SafeXForm; + XFORM SafeXForm = {0}; NTSTATUS Status = STATUS_SUCCESS; dc = DC_LockDc(hDC); _____ Modified: trunk/reactos/subsys/win32k/objects/rect.c --- trunk/reactos/subsys/win32k/objects/rect.c 2005-09-27 08:52:17 UTC (rev 18119) +++ trunk/reactos/subsys/win32k/objects/rect.c 2005-09-27 10:52:10 UTC (rev 18120) @@ -106,7 +106,7 @@ BOOL STDCALL NtGdiOffsetRect(LPRECT UnsafeRect, INT x, INT y) { - RECT Rect; + RECT Rect = {0}; NTSTATUS Status = STATUS_SUCCESS; _SEH_TRY @@ -298,7 +298,7 @@ BOOL STDCALL NtGdiIntersectRect(PRECT UnsafeDest, const RECT* UnsafeSrc1, const RECT* UnsafeSrc2) { - RECT Dest, Src1, Src2; + RECT Dest, Src1, Src2 = {0}; NTSTATUS Status = STATUS_SUCCESS; BOOL Ret; _____ Modified: trunk/reactos/subsys/win32k/objects/region.c --- trunk/reactos/subsys/win32k/objects/region.c 2005-09-27 08:52:17 UTC (rev 18119) +++ trunk/reactos/subsys/win32k/objects/region.c 2005-09-27 10:52:10 UTC (rev 18120) @@ -2635,7 +2635,7 @@ CONST LPRECT unsaferc) { PROSRGNDATA Rgn; - RECT rc; + RECT rc = {0}; BOOL Ret; NTSTATUS Status = STATUS_SUCCESS;

1 0

[hpoussin] 18119: Implement SetupInstallServicesFromInfSectionExW
by hpoussin＠svn.reactos.com 27 Sep '05

27 Sep '05

Implement SetupInstallServicesFromInfSectionExW Process {DDInstall}.HW section in SetupDiInstallDevice Modified: trunk/reactos/lib/setupapi/devinst.c Modified: trunk/reactos/lib/setupapi/install.c Modified: trunk/reactos/lib/setupapi/stubs.c _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-09-27 04:53:33 UTC (rev 18118) +++ trunk/reactos/lib/setupapi/devinst.c 2005-09-27 08:52:17 UTC (rev 18119) @@ -4389,9 +4389,12 @@ DWORD RequiredSize; HINF hInf = NULL; LPCWSTR AssociatedService = NULL; + LPWSTR pSectionName = NULL; BOOL RebootRequired = FALSE; HKEY hEnumKey, hKey; LONG rc; + HWND hWnd; + PVOID callback_context; TRACE("%p %p\n", DeviceInfoSet, DeviceInfoData); @@ -4419,9 +4422,15 @@ /* FIXME: If DI_FLAGSEX_SETFAILEDINSTALL is set, set FAILEDINSTALL flag in ConfigFlags registry and exit */ if (DeviceInfoData) + { DriverInfo = ((struct DeviceInfoElement *)DeviceInfoData->Reserved)->SelectedDriver; + hWnd = ((struct DeviceInfoElement *)DeviceInfoData->Reserved)->hwndParent; + } else + { DriverInfo = ((struct DeviceInfoSet *)DeviceInfoSet)->SelectedDriver; + hWnd = ((struct DeviceInfoSet *)DeviceInfoSet)->hwndParent; + } FileTimeToSystemTime(&DriverInfo->Info.DriverDate, &DriverDate); hInf = SetupOpenInfFileW(DriverInfo->InfPath, NULL, INF_STYLE_WIN4, NULL); @@ -4435,6 +4444,7 @@ SetupCloseInfFile(hInf); return FALSE; } + pSectionName = &SectionName[wcslen(SectionName)]; /* Create driver key information */ FIXME("FIXME: Create driver key information\n"); @@ -4442,7 +4452,6 @@ /* Write information to driver key */ FIXME("FIXME: Write information to driver key\n"); FIXME("DriverDate : '%u-%u-%u'\n", 0, DriverDate.wMonth, DriverDate.wDay, DriverDate.wYear); - FIXME("DriverDateData :"); { ULONG i; for (i = 0; i < sizeof(DriverInfo->Info.DriverDate); i++) DbgPrint(" %02x", ((PCHAR)&DriverInfo->Info.DriverDate)[i] & 0xff); } DbgPrint("\n"); FIXME("DriverDesc : '%S'\n", DriverInfo->Info.Description); FIXME("DriverVersion : '%u.%u.%u.%u'\n", DriverInfo->Info.DriverVersion & 0xff, (DriverInfo->Info.DriverVersion >> 8) & 0xff, (DriverInfo->Info.DriverVersion >> 16) & 0xff, (DriverInfo->Info.DriverVersion >> 24) & 0xff); FIXME("InfPath : '%S'\n", DriverInfo->InfPath); @@ -4451,8 +4460,8 @@ FIXME("MatchingDeviceId: '%S'\n", L"???"); /* FIXME */ FIXME("ProviderName : '%S'\n", DriverInfo->Info.ProviderName); - /* Install services */ - wcscat(SectionName, L".Services"); + /* Install .Services section */ + wcscpy(pSectionName, L".Services"); Result = SetupFindFirstLineW(hInf, SectionName, NULL, &ContextService); while (Result) { @@ -4517,7 +4526,7 @@ goto cleanup; } SetLastError(ERROR_SUCCESS); - Result = SetupInstallServicesFromInfSectionExW(hInf, ServiceSection, Flags, DeviceInfoSet, DeviceInfoData, NULL, NULL); + Result = SetupInstallServicesFromInfSectionExW(hInf, ServiceSection, Flags, DeviceInfoSet, DeviceInfoData, ServiceName, NULL); if (Result && (Flags & SPSVCINST_ASSOCSERVICE)) { AssociatedService = ServiceName; @@ -4540,7 +4549,7 @@ /* Copy .inf file to Inf\ directory */ FIXME("FIXME: Copy .inf file to Inf\\ directory\n"); /* SetupCopyOEMInf */ - /* Write information to enum key */ + /* Open enum key */ rc = RegOpenKeyExW(DevInfoSet->HKLM, EnumKeyName, 0, @@ -4567,14 +4576,32 @@ SetupCloseInfFile(hInf); return FALSE; } + + /* Install .HW section */ + wcscpy(pSectionName, L".HW"); + callback_context = SetupInitDefaultQueueCallback(hWnd); + Result = SetupInstallFromInfSectionW(hWnd, hInf, SectionName, + SPINST_REGISTRY, hKey, NULL, 0, + SetupDefaultQueueCallbackW, callback_context, + NULL, NULL); + SetupTermDefaultQueueCallback(callback_context); + if (!Result) + { + RegCloseKey(hKey); + HeapFree(GetProcessHeap(), 0, (LPWSTR)AssociatedService); + SetupCloseInfFile(hInf); + return FALSE; + } + + /* Write information to enum key */ FIXME("FIXME: Write information to enum key\n"); FIXME("ParentIdPrefix : '%S'\n", L"0000"); /* FIXME */ - //FIXME("Service : '%S'\n", AssociatedService); + TRACE("Service : '%S'\n", AssociatedService); FIXME("Class : '%S'\n", L"???"); /* FIXME: SetupDiGetINFClass */ FIXME("ClassGUID : '%S'\n", L"???"); /* FIXME: SetupDiGetINFClass */ - //FIXME("DeviceDesc : '%S'\n", DriverInfo->Info.Description); + TRACE("DeviceDesc : '%S'\n", DriverInfo->Info.Description); FIXME("Driver : '%S'\n", L"???"); /* FIXME: autogenerated key */ - //FIXME("Mfg : '%S'\n", DriverInfo->Info.MfgName); + TRACE("Mfg : '%S'\n", DriverInfo->Info.MfgName); rc = RegSetValueEx(hKey, L"Service", 0, REG_SZ, (const BYTE *)AssociatedService, (wcslen(AssociatedService) + 1) * sizeof(WCHAR)); if (rc == ERROR_SUCCESS) rc = RegSetValueEx(hKey, L"DeviceDesc", 0, REG_SZ, (const BYTE *)DriverInfo->Info.Description, (wcslen(DriverInfo->Info.Description) + 1) * sizeof(WCHAR)); _____ Modified: trunk/reactos/lib/setupapi/install.c --- trunk/reactos/lib/setupapi/install.c 2005-09-27 04:53:33 UTC (rev 18118) +++ trunk/reactos/lib/setupapi/install.c 2005-09-27 08:52:17 UTC (rev 18119) @@ -993,3 +993,136 @@ return ret; } + + +static BOOL GetLineText( HINF hinf, PCWSTR section_name, PCWSTR key_name, PWSTR *value) +{ + DWORD required; + PWSTR buf = NULL; + + *value = NULL; + + if (! SetupGetLineTextW( NULL, hinf, section_name, key_name, NULL, 0, &required ) + && GetLastError() != ERROR_INSUFFICIENT_BUFFER ) + return FALSE; + + buf = HeapAlloc( GetProcessHeap(), 0, required * sizeof(WCHAR) ); + if ( ! buf ) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + if (! SetupGetLineTextW( NULL, hinf, section_name, key_name, buf, required, &required ) ) + { + HeapFree( GetProcessHeap(), 0, buf ); + return FALSE; + } + + *value = buf; + return TRUE; +} + + +static BOOL GetIntField( HINF hinf, PCWSTR section_name, PCWSTR key_name, INT *value) +{ + LPWSTR buffer, end; + INT res; + + if (! GetLineText( hinf, section_name, key_name, &buffer ) ) + return FALSE; + + res = wcstol( buffer, &end, 0 ); + if (end != buffer && !*end) + { + HeapFree(GetProcessHeap(), 0, buffer); + *value = res; + return TRUE; + } + else + { + HeapFree(GetProcessHeap(), 0, buffer); + SetLastError( ERROR_INVALID_DATA ); + return FALSE; + } +} + + +/********************************************************************** * + * SetupInstallServicesFromInfSectionExW (SETUPAPI.@) + */ +BOOL WINAPI SetupInstallServicesFromInfSectionExW( HINF hinf, PCWSTR sectionname, DWORD flags, HDEVINFO devinfo, PSP_DEVINFO_DATA devinfo_data, PVOID reserved1, PVOID reserved2 ) +{ + SC_HANDLE hSCManager, hService; + LPWSTR ServiceBinary, LoadOrderGroup; + LPWSTR DisplayName, Description, Dependencies; + INT ServiceType, StartType, ErrorControl; + + TRACE("%p, %s, 0x%lx, %p, %p, %p, %p\n", hinf, debugstr_w(sectionname), + flags, devinfo, devinfo_data, reserved1, reserved2); + + if (!reserved1) + { + /* FIXME: I don't know how to get the service name. ATM, just fail the call */ + DPRINT1("Service name not specified!\n"); + return FALSE; + } + /* FIXME: use the flags parameters */ + /* FIXME: use DeviceInfoSet, DeviceInfoData parameters */ + + if (!GetIntField(hinf, sectionname, L"ServiceType", &ServiceType)) + return FALSE; + if (!GetIntField(hinf, sectionname, L"StartType", &StartType)) + return FALSE; + if (!GetIntField(hinf, sectionname, L"ErrorControl", &ErrorControl)) + return FALSE; + + hSCManager = OpenSCManagerW(NULL, SERVICES_ACTIVE_DATABASE, SC_MANAGER_CREATE_SERVICE); + if (hSCManager == NULL) + return FALSE; + + if (!GetLineText(hinf, sectionname, L"ServiceBinary", &ServiceBinary)) + { + CloseServiceHandle(hSCManager); + return FALSE; + } + if (!GetLineText(hinf, sectionname, L"LoadOrderGroup", &LoadOrderGroup)) + { + CloseServiceHandle(hSCManager); + HeapFree(GetProcessHeap(), 0, ServiceBinary); + return FALSE; + } + + /* Don't check return value, as these fields are optional and + * GetLineText initialize output parameter even on failure */ + GetLineText(hinf, sectionname, L"DisplayName", &DisplayName); + GetLineText(hinf, sectionname, L"Description", &Description); + GetLineText(hinf, sectionname, L"Dependencies", &Dependencies); + + hService = CreateServiceW( + hSCManager, + reserved1, + Description, + 0, + ServiceType, + StartType, + ErrorControl, + ServiceBinary, + LoadOrderGroup, + NULL, + Dependencies, + NULL, NULL); + HeapFree(GetProcessHeap(), 0, ServiceBinary); + HeapFree(GetProcessHeap(), 0, LoadOrderGroup); + HeapFree(GetProcessHeap(), 0, DisplayName); + HeapFree(GetProcessHeap(), 0, Description); + HeapFree(GetProcessHeap(), 0, Dependencies); + if (hService == NULL) + { + CloseServiceHandle(hSCManager); + return FALSE; + } + CloseServiceHandle(hService); + + return CloseServiceHandle(hSCManager); +} _____ Modified: trunk/reactos/lib/setupapi/stubs.c --- trunk/reactos/lib/setupapi/stubs.c 2005-09-27 04:53:33 UTC (rev 18118) +++ trunk/reactos/lib/setupapi/stubs.c 2005-09-27 08:52:17 UTC (rev 18119) @@ -125,15 +125,6 @@ } /*********************************************************************** - * SetupInstallServicesFromInfSectionExW (SETUPAPI.@) - */ -BOOL WINAPI SetupInstallServicesFromInfSectionExW( HINF hinf, PCWSTR sectionname, DWORD flags, HDEVINFO devinfo, PSP_DEVINFO_DATA devinfo_data, PVOID reserved1, PVOID reserved2 ) -{ - FIXME("Stub %p, %s, 0x%lx, %p, %p, %p, %p\n", hinf, debugstr_w(sectionname), flags, devinfo, devinfo_data, reserved1, reserved2); - return TRUE; -} - -/********************************************************************** * * SetupTerminateFileLog(SETUPAPI.@) */ BOOL WINAPI SetupTerminateFileLog(HANDLE FileLogHandle)

1 0

[ion] 18118: - Some NDK fixes when compiling with PSDK.
by ion＠svn.reactos.com 27 Sep '05

27 Sep '05

- Some NDK fixes when compiling with PSDK. - Commit the new CSR (csrsrv and csrss). Compiles and passes PREfast with msvc 2005. Does not link yet. Is not complete yet (3 missing functions). Does not build with mingw yet. Code is probably still buggy. Work in other areas is needed as well. I'm comitting this under recommendation from Emanuele. See status.h for more info. - Thanks to Emanuele and Filip which have helped with this patch. Modified: trunk/reactos/include/ndk/extypes.h Modified: trunk/reactos/include/ndk/ldrfuncs.h Modified: trunk/reactos/include/ndk/rtltypes.h Deleted: trunk/reactos/include/subsys/csr/protocol.h Modified: trunk/reactos/include/subsys/csr/server.h Deleted: trunk/reactos/subsys/csr/args.c Deleted: trunk/reactos/subsys/csr/csr.h Added: trunk/reactos/subsys/csr/csrsrv/api.c Modified: trunk/reactos/subsys/csr/csrsrv/csrsrv.def Deleted: trunk/reactos/subsys/csr/csrsrv/debug.c Deleted: trunk/reactos/subsys/csr/csrsrv/dllmain.c Modified: trunk/reactos/subsys/csr/csrsrv/init.c Modified: trunk/reactos/subsys/csr/csrsrv/process.c Modified: trunk/reactos/subsys/csr/csrsrv/server.c Modified: trunk/reactos/subsys/csr/csrsrv/session.c Modified: trunk/reactos/subsys/csr/csrsrv/srv.h Added: trunk/reactos/subsys/csr/csrsrv/status.h Modified: trunk/reactos/subsys/csr/csrsrv/thread.c Modified: trunk/reactos/subsys/csr/csrsrv/wait.c Modified: trunk/reactos/subsys/csr/main.c _____ Modified: trunk/reactos/include/ndk/extypes.h --- trunk/reactos/include/ndk/extypes.h 2005-09-27 01:57:27 UTC (rev 18117) +++ trunk/reactos/include/ndk/extypes.h 2005-09-27 04:53:33 UTC (rev 18118) @@ -13,7 +13,7 @@ /* DEPENDENCIES **************************************************************/ #include <cfg.h> /* FIXME: this needs be implemented in the w32api ddk */ -#ifdef _MSC_VER +#if defined(_MSC_VER) && !defined(NTOS_MODE_USER) #include <ntimage.h> #endif #include "cmtypes.h" _____ Modified: trunk/reactos/include/ndk/ldrfuncs.h --- trunk/reactos/include/ndk/ldrfuncs.h 2005-09-27 01:57:27 UTC (rev 18117) +++ trunk/reactos/include/ndk/ldrfuncs.h 2005-09-27 04:53:33 UTC (rev 18118) @@ -12,7 +12,7 @@ /* DEPENDENCIES **************************************************************/ #include "ldrtypes.h" /* FIXME: this needs be implemented in the w32api ddk */ -#ifdef _MSC_VER +#if defined(_MSC_VER) && !defined(NTOS_MODE_USER) #include <ntimage.h> #endif _____ Modified: trunk/reactos/include/ndk/rtltypes.h --- trunk/reactos/include/ndk/rtltypes.h 2005-09-27 01:57:27 UTC (rev 18117) +++ trunk/reactos/include/ndk/rtltypes.h 2005-09-27 04:53:33 UTC (rev 18118) @@ -393,6 +393,14 @@ typedef OSVERSIONINFOEXW RTL_OSVERSIONINFOEXW; typedef LPOSVERSIONINFOEXW PRTL_OSVERSIONINFOEXW; +typedef EXCEPTION_DISPOSITION +(*PEXCEPTION_HANDLER)( + struct _EXCEPTION_RECORD*, + PVOID, + struct _CONTEXT*, + PVOID +); + typedef struct _RTL_HEAP_PARAMETERS { ULONG Length; _____ Deleted: trunk/reactos/include/subsys/csr/protocol.h --- trunk/reactos/include/subsys/csr/protocol.h 2005-09-27 01:57:27 UTC (rev 18117) +++ trunk/reactos/include/subsys/csr/protocol.h 2005-09-27 04:53:33 UTC (rev 18118) @@ -1,37 +0,0 @@ -#ifndef __INCLUDE_CSR_PROTOCOL_H -#define __INCLUDE_CSR_PROTOCOL_H - -typedef ULONG CSR_API_NUMBER; - -#define MAKE_CSR_OPCODE(s,m) ((s) << 16) + (m) - -// -// Shared CSR Message Header for all CSR Servers -// Gary Nebbett - Alex Ionescu -// -typedef struct _CSR_PORT_MESSAGE_HEADER -{ - // - // LPC Header - // - PORT_MESSAGE PortHeader; - - // - // Buffer allocated with CsrAllocateCaptureBuffer. - // Sent as 2nd parameter to CsrClientCallServer. - // - PVOID CsrCaptureData; - - // - // CSR API Message ID and Return Value - // - CSR_API_NUMBER Opcode; - ULONG Status; - ULONG Reserved; - - // - // Server-defined union of supported structures - // -} CSR_PORT_MESSAGE_HEADER, * PCSR_PORT_MESSAGE_HEADER; - -#endif /* ndef __INCLUDE_CSR_PROTOCOL_H */ _____ Modified: trunk/reactos/include/subsys/csr/server.h --- trunk/reactos/include/subsys/csr/server.h 2005-09-27 01:57:27 UTC (rev 18117) +++ trunk/reactos/include/subsys/csr/server.h 2005-09-27 04:53:33 UTC (rev 18118) @@ -1,106 +1,306 @@ -#if !defined(__INCLUDE_CSR_SERVER_H) -#define __INCLUDE_CSR_SERVER_H +#ifndef _CSRSERVER_H +#define _CSRSERVER_H #define CSR_SRV_SERVER 0 -typedef struct _CSR_SESSION +typedef enum _CSR_PROCESS_FLAGS { - ULONG SessionId; - HANDLE Heap; - PVOID ServerData; + CsrProcessTerminating = 0x1, + CsrProcessSkipShutdown = 0x2, + CsrProcessCreateNewGroup = 0x100, + CsrProcessTerminated = 0x200, + CsrProcessLastThreadTerminated = 0x400, + CsrProcessIsConsoleApp = 0x800 +} CSR_PROCESS_FLAGS, *PCSR_PROCESS_FLAGS; -} CSR_SESSION, * PCSR_SESSION; +typedef enum _CSR_THREAD_FLAGS +{ + CsrThreadAltertable = 0x1, + CsrThreadInTermination = 0x2, + CsrThreadTerminated = 0x4, + CsrThreadIsServerThread = 0x10 +} CSR_THREAD_FLAGS, *PCSR_THREAD_FLAGS; +typedef enum _SHUTDOWN_RESULT +{ + CsrShutdownCsrProcess = 1, + CsrShutdownNonCsrProcess, + CsrShutdownCancelled +} SHUTDOWN_RESULT, *PSHUTDOWN_RESULT; +typedef enum _CSR_SHUTDOWN_FLAGS +{ + CsrShutdownSystem = 4, + CsrShutdownOther = 8 +} CSR_SHUTDOWN_FLAGS, *PCSR_SHUTDOWN_FLAGS; + +typedef enum _CSR_DEBUG_FLAGS +{ + CsrDebugOnlyThisProcess = 1, + CsrDebugProcessChildren = 2 +} CSR_PROCESS_DEBUG_FLAGS, *PCSR_PROCESS_DEBUG_FLAGS; + +typedef struct _CSR_NT_SESSION +{ + ULONG ReferenceCount; + LIST_ENTRY SessionList; + ULONG SessionId; +} CSR_NT_SESSION, *PCSR_NT_SESSION; + typedef struct _CSR_PROCESS { - CLIENT_ID ClientId; - LIST_ENTRY ListLink; - LIST_ENTRY ThreadList; - PCSR_SESSION NtSession; - ULONG ExpectedVersion; - HANDLE ClientPort; - ULONG_PTR ClientViewBase; - ULONG_PTR ClientViewBounds; - HANDLE ProcessHandle; - ULONG SequenceNumber; - ULONG Flags; - ULONG DebugFlags; - ULONG ReferenceCount; - ULONG ProcessGroupId; - ULONG ProcessGroupSequence; - ULONG fVDM; - ULONG ThreadCount; - ULONG PriorityClass; - ULONG Reserved; - ULONG ShutdownLevel; - ULONG ShutdownFlags; - PVOID ServerData; - -} CSR_PROCESS, * PCSR_PROCESS; + CLIENT_ID ClientId; + LIST_ENTRY ListLink; + LIST_ENTRY ThreadList; + struct _CSR_PROCESS *Parent; + PCSR_NT_SESSION NtSession; + ULONG ExpectedVersion; + HANDLE ClientPort; + ULONG_PTR ClientViewBase; + ULONG_PTR ClientViewBounds; + HANDLE ProcessHandle; + ULONG SequenceNumber; + ULONG Flags; + ULONG DebugFlags; + CLIENT_ID DebugCid; + ULONG ReferenceCount; + ULONG ProcessGroupId; + ULONG ProcessGroupSequence; + ULONG fVDM; + ULONG ThreadCount; + ULONG PriorityClass; + ULONG Reserved; + ULONG ShutdownLevel; + ULONG ShutdownFlags; + PVOID ServerData[]; +} CSR_PROCESS, *PCSR_PROCESS; -struct _CSR_WAIT; - typedef struct _CSR_THREAD { - LARGE_INTEGER CreateTime; - LIST_ENTRY Link; - LIST_ENTRY HashLinks; - CLIENT_ID ClientId; - PCSR_PROCESS Process; - struct _CSR_WAIT *WaitBlock; - HANDLE ThreadHandle; - ULONG Flags; - ULONG ReferenceCount; - ULONG ImpersonationCount; - -} CSR_THREAD, * PCSR_THREAD; + LARGE_INTEGER CreateTime; + LIST_ENTRY Link; + LIST_ENTRY HashLinks; + CLIENT_ID ClientId; + PCSR_PROCESS Process; + struct _CSR_WAIT_BLOCK *WaitBlock; + HANDLE ThreadHandle; + ULONG Flags; + ULONG ReferenceCount; + ULONG ImpersonationCount; +} CSR_THREAD, *PCSR_THREAD; -typedef struct _CSR_WAIT +typedef +NTSTATUS +(*PCSR_CONNECT_CALLBACK)( + IN PCSR_PROCESS CsrProcess, + IN OUT PVOID ConnectionInfo, + IN OUT PULONG ConnectionInfoLength +); + +typedef +VOID +(*PCSR_DISCONNECT_CALLBACK)(IN PCSR_PROCESS CsrProcess); + +typedef +NTSTATUS +(*PCSR_NEWPROCESS_CALLBACK)( + IN PCSR_PROCESS Parent, + IN PCSR_PROCESS CsrProcess +); + +typedef +VOID +(*PCSR_HARDERROR_CALLBACK)( + IN PCSR_THREAD CsrThread, + IN PHARDERROR_MSG HardErrorMessage +); + +typedef +ULONG +(*PCSR_SHUTDOWNPROCESS_CALLBACK)( + IN PCSR_PROCESS CsrProcess, + IN ULONG Flags, + IN BOOLEAN FirstPhase +); + +/* FIXME: Put into public NDK Header */ +typedef ULONG CSR_API_NUMBER; + +#define CSR_MAKE_OPCODE(s,m) ((s) << 16) | (m) +#define CSR_API_ID_FROM_OPCODE(n) ((ULONG)((USHORT)(n))) +#define CSR_SERVER_ID_FROM_OPCODE(n) (ULONG)((n) >> 16) + +typedef struct _CSR_CONNECTION_INFO { - PCSR_THREAD CsrThread; + ULONG Unknown[2]; + HANDLE ObjectDirectory; + PVOID SharedSectionBase; + PVOID SharedSectionHeap; + PVOID SharedSectionData; + ULONG DebugFlags; + ULONG Unknown2[3]; + HANDLE ProcessId; +} CSR_CONNECTION_INFO, *PCSR_CONNECTION_INFO; -} CSR_WAIT, * PCSR_WAIT; +typedef struct _CSR_CLIENT_CONNECT +{ + ULONG ServerId; + PVOID ConnectionInfo; + ULONG ConnectionInfoSize; +} CSR_CLIENT_CONNECT, *PCSR_CLIENT_CONNECT; +typedef struct _CSR_API_MESSAGE +{ + PORT_MESSAGE Header; + union + { + CSR_CONNECTION_INFO ConnectionInfo; + struct + { + PVOID CsrCaptureData; + CSR_API_NUMBER Opcode; + ULONG Status; + ULONG Reserved; + union + { + CSR_CLIENT_CONNECT CsrClientConnect; + }; + }; + }; +} CSR_API_MESSAGE, *PCSR_API_MESSAGE; -typedef VOID (CALLBACK * CSR_SERVER_THREAD)(PVOID); +typedef struct _CSR_CAPTURE_BUFFER +{ + ULONG Size; + struct _CSR_CAPTURE_BUFFER *PreviousCaptureBuffer; + ULONG PointerCount; + ULONG_PTR BufferEnd; +} CSR_CAPTURE_BUFFER, *PCSR_CAPTURE_BUFFER; -/* symbols exported by native DLL csrsrv.dll */ +/* Private data resumes here */ +typedef +NTSTATUS +(NTAPI *PCSR_API_ROUTINE)( + IN OUT PCSR_API_MESSAGE ApiMessage, + IN OUT PULONG Reply +); -NTSTATUS STDCALL CsrAddStaticServerThread(CSR_SERVER_THREAD); -NTSTATUS STDCALL CsrCallServerFromServer(); -NTSTATUS STDCALL CsrCreateProcess(PCSR_SESSION,PCSR_PROCESS*); -NTSTATUS STDCALL CsrCreateRemoteThread(); -NTSTATUS STDCALL CsrCreateSession(PCSR_SESSION*); -NTSTATUS STDCALL CsrCreateThread(PCSR_PROCESS,PCSR_THREAD*); -NTSTATUS STDCALL CsrCreateWait(PCSR_THREAD,PCSR_WAIT*); -NTSTATUS STDCALL CsrDebugProcess(PCSR_PROCESS); -NTSTATUS STDCALL CsrDebugProcessStop(PCSR_PROCESS); -NTSTATUS STDCALL CsrDereferenceProcess(PCSR_PROCESS); -NTSTATUS STDCALL CsrDereferenceThread(PCSR_THREAD); -NTSTATUS STDCALL CsrDereferenceWait(PCSR_WAIT); -NTSTATUS STDCALL CsrDestroyProcess(PCSR_PROCESS); -NTSTATUS STDCALL CsrDestroySession (PCSR_SESSION); -NTSTATUS STDCALL CsrDestroyThread(PCSR_THREAD); -NTSTATUS STDCALL CsrExecServerThread(); -NTSTATUS STDCALL CsrGetProcessLuid(PCSR_PROCESS,PLUID); -NTSTATUS STDCALL CsrImpersonateClient(); -NTSTATUS STDCALL CsrLockProcessByClientId(); -NTSTATUS STDCALL CsrLockThreadByClientId(); -NTSTATUS STDCALL CsrMoveSatisfiedWait(PCSR_WAIT); -NTSTATUS STDCALL CsrNotifyWait(PCSR_WAIT); -HANDLE STDCALL CsrQueryApiPort(VOID); -NTSTATUS STDCALL CsrReferenceThread(PCSR_THREAD); -NTSTATUS STDCALL CsrRevertToSelf(); -NTSTATUS STDCALL CsrServerInitialization(ULONG,LPWSTR*); -NTSTATUS STDCALL CsrSetBackgroundPriority(); -NTSTATUS STDCALL CsrSetCallingSpooler(); -NTSTATUS STDCALL CsrSetForegroundPriority(); -NTSTATUS STDCALL CsrShutdownProcesses(PCSR_SESSION); -NTSTATUS STDCALL CsrUnhandledExceptionFilter(); -NTSTATUS STDCALL CsrUnlockProcess(PCSR_PROCESS); -NTSTATUS STDCALL CsrUnlockThread(PCSR_THREAD); -NTSTATUS STDCALL CsrValidateMessageBuffer(); -NTSTATUS STDCALL CsrValidateMessageString(); +typedef struct _CSR_SERVER_DLL +{ + ULONG Length; + HANDLE Event; + ANSI_STRING Name; + HANDLE ServerHandle; + ULONG ServerId; + ULONG Unknown; + ULONG ApiBase; + ULONG HighestApiSupported; + PCSR_API_ROUTINE *DispatchTable; + PBOOLEAN ValidTable; + PCHAR *NameTable; + ULONG SizeOfProcessData; + PCSR_CONNECT_CALLBACK ConnectCallback; + PCSR_DISCONNECT_CALLBACK DisconnectCallback; + PCSR_HARDERROR_CALLBACK HardErrorCallback; + PVOID SharedSection; + PCSR_NEWPROCESS_CALLBACK NewProcessCallback; + PCSR_SHUTDOWNPROCESS_CALLBACK ShutdownProcessCallback; + ULONG Unknown2[3]; +} CSR_SERVER_DLL, *PCSR_SERVER_DLL; -#endif /* ndef __INCLUDE_CSR_SERVER_H */ +typedef +NTSTATUS +(NTAPI *PCSR_SERVER_DLL_INIT_CALLBACK)(IN PCSR_SERVER_DLL ServerDll); + +typedef +BOOLEAN +(*CSR_WAIT_FUNCTION)( + IN PLIST_ENTRY WaitList, + IN PCSR_THREAD WaitThread, + IN PCSR_API_MESSAGE WaitApiMessage, + IN PVOID WaitContext, + IN PVOID WaitArgument1, + IN PVOID WaitArgument2, + IN ULONG WaitFlags +); + +typedef struct _CSR_WAIT_BLOCK +{ + ULONG Size; + LIST_ENTRY WaitList; + LIST_ENTRY UserWaitList; + PVOID WaitContext; + PCSR_THREAD WaitThread; + CSR_WAIT_FUNCTION WaitFunction; + CSR_API_MESSAGE WaitApiMessage; +} CSR_WAIT_BLOCK, *PCSR_WAIT_BLOCK; + +/* FIXME: Put into new SM headers */ +typedef struct _SB_CREATE_SESSION +{ + ULONG SessionId; + RTL_USER_PROCESS_INFORMATION ProcessInfo; +} SB_CREATE_SESSION, *PSB_CREATE_SESSION; + +typedef struct _SB_TERMINATE_SESSION +{ + ULONG SessionId; +} SB_TERMINATE_SESSION, *PSB_TERMINATE_SESSION; + +typedef struct _SB_FOREIGN_SESSION_COMPLETE +{ + ULONG SessionId; +} SB_FOREIGN_SESSION_COMPLETE, *PSB_FOREIGN_SESSION_COMPLETE; + +typedef struct _SB_CREATE_PROCESS +{ + ULONG SessionId; +} SB_CREATE_PROCESS, *PSB_CREATE_PROCESS; + +typedef struct _SB_CONNECTION_INFO +{ + ULONG SubsystemId; +} SB_CONNECTION_INFO, *PSB_CONNECTION_INFO; + +typedef struct _SB_API_MESSAGE +{ + PORT_MESSAGE Header; + union + { + SB_CONNECTION_INFO ConnectionInfo; + struct + { + ULONG Opcode; + NTSTATUS Status; + union + { + SB_CREATE_SESSION SbCreateSession; + SB_TERMINATE_SESSION SbTerminateSession; + SB_FOREIGN_SESSION_COMPLETE SbForeignSessionComplete; + SB_CREATE_PROCESS SbCreateProcess; + }; + }; + }; +} SB_API_MESSAGE, *PSB_API_MESSAGE; + +typedef +BOOLEAN +(NTAPI *PSB_API_ROUTINE)(IN PSB_API_MESSAGE ApiMessage); + +NTSTATUS +NTAPI +SmSessionComplete( + IN HANDLE hApiPort, + IN ULONG SessionId, + IN NTSTATUS Status +); + +NTSTATUS +NTAPI +SmConnectToSm( + IN PUNICODE_STRING SbApiPortName OPTIONAL, + IN HANDLE hSbApiPort OPTIONAL, + IN ULONG SubsystemType OPTIONAL, + OUT PHANDLE hSmApiPort +); +#endif _____ Deleted: trunk/reactos/subsys/csr/args.c --- trunk/reactos/subsys/csr/args.c 2005-09-27 01:57:27 UTC (rev 18117) +++ trunk/reactos/subsys/csr/args.c 2005-09-27 04:53:33 UTC (rev 18118) @@ -1,126 +0,0 @@ -/* $Id$ - * - * args.c - Client/Server Runtime - command line parsing - * - * ReactOS Operating System - * - * -------------------------------------------------------------------- - * - * This software is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this software; see the file COPYING.LIB. If not, write - * to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, - * MA 02139, USA. - * - * -------------------------------------------------------------------- - */ -#include "csr.h" - -#define NDEBUG -#include <debug.h> - -/********************************************************************** - * NAME PRIVATE - * CsrParseCommandLine/2 - */ -NTSTATUS FASTCALL CsrParseCommandLine (PPEB Peb, - PCOMMAND_LINE_ARGUMENT Argument) -{ - HANDLE ProcessHeap = Peb->ProcessHeap; - PRTL_USER_PROCESS_PARAMETERS RtlProcessParameters = RtlNormalizeProcessParams (Peb->ProcessParameters); - INT i = 0; - INT afterlastspace = 0; - - - DPRINT("CSR: %s called\n", __FUNCTION__); - - RtlZeroMemory (Argument, sizeof (COMMAND_LINE_ARGUMENT)); - - Argument->Vector = (PWSTR *) RtlAllocateHeap (ProcessHeap, - 0, - (CSRP_MAX_ARGUMENT_COUNT * sizeof Argument->Vector[0])); - if(NULL == Argument->Vector) - { - DPRINT("CSR: %s: no memory for Argument->Vector\n", __FUNCTION__); - return STATUS_NO_MEMORY; - } - - Argument->Buffer.Length = - Argument->Buffer.MaximumLength = - RtlProcessParameters->CommandLine.Length - + sizeof Argument->Buffer.Buffer [0]; /* zero terminated */ - Argument->Buffer.Buffer = - (PWSTR) RtlAllocateHeap (ProcessHeap, - 0, - Argument->Buffer.MaximumLength); - if(NULL == Argument->Buffer.Buffer) - { - DPRINT("CSR: %s: no memory for Argument->Buffer.Buffer\n", __FUNCTION__); - return STATUS_NO_MEMORY; - } - - RtlCopyMemory (Argument->Buffer.Buffer, - RtlProcessParameters->CommandLine.Buffer, - RtlProcessParameters->CommandLine.Length); - - while (Argument->Buffer.Buffer [i]) - { - if (Argument->Buffer.Buffer[i] == L' ') - { - Argument->Count ++; - Argument->Buffer.Buffer [i] = L'\0'; - Argument->Vector [Argument->Count - 1] = & (Argument->Buffer.Buffer [afterlastspace]); - i++; - while (Argument->Buffer.Buffer [i] == L' ') - { - i++; - } - afterlastspace = i; - } - else - { - i++; - } - } - - if (Argument->Buffer.Buffer [afterlastspace] != L'\0') - { - Argument->Count ++; - Argument->Buffer.Buffer [i] = L'\0'; - Argument->Vector [Argument->Count - 1] = & (Argument->Buffer.Buffer [afterlastspace]); - } -#if !defined(NDEBUG) - for (i=0; i<Argument->Count; i++) - { - DPRINT("CSR: Argument[%d] = '%S'\n", i, Argument->Vector [i]); - } -#endif - return STATUS_SUCCESS; -} -/********************************************************************** - * NAME PRIVATE - * CsrFreeCommandLine/2 - */ - -VOID FASTCALL CsrFreeCommandLine (PPEB Peb, - PCOMMAND_LINE_ARGUMENT Argument) -{ - DPRINT("CSR: %s called\n", __FUNCTION__); - - RtlFreeHeap (Peb->ProcessHeap, - 0, - Argument->Vector); - RtlFreeHeap (Peb->ProcessHeap, - 0, - Argument->Buffer.Buffer); -} -/* EOF */ _____ Deleted: trunk/reactos/subsys/csr/csr.h --- trunk/reactos/subsys/csr/csr.h 2005-09-27 01:57:27 UTC (rev 18117) +++ trunk/reactos/subsys/csr/csr.h 2005-09-27 04:53:33 UTC (rev 18118) @@ -1,34 +0,0 @@ -#if !defined(_INCLUDE_CSR_H) -#define _INCLUDE_CSR_H - -/* PSDK/NDK Headers */ -#include <stdio.h> -#include <windows.h> - -#define NTOS_MODE_USER -#include <ndk/ntndk.h> - -#include <csr/server.h> - - -#define CSRSS_ARGUMENT_SIZE 16 - -/* args.c */ -#define CSRP_MAX_ARGUMENT_COUNT 512 - -typedef struct _COMMAND_LINE_ARGUMENT -{ - ULONG Count; - UNICODE_STRING Buffer; - PWSTR * Vector; - -} COMMAND_LINE_ARGUMENT, *PCOMMAND_LINE_ARGUMENT; - -NTSTATUS FASTCALL CsrParseCommandLine (PPEB,PCOMMAND_LINE_ARGUMENT); -VOID FASTCALL CsrFreeCommandLine (PPEB,PCOMMAND_LINE_ARGUMENT); - -/* csrsrv.dll */ -NTSTATUS STDCALL CsrServerInitialization (ULONG,LPWSTR*); - -#endif /* !def _INCLUDE_CSR_H */ - _____ Added: trunk/reactos/subsys/csr/csrsrv/api.c --- trunk/reactos/subsys/csr/csrsrv/api.c 2005-09-27 01:57:27 UTC (rev 18117) +++ trunk/reactos/subsys/csr/csrsrv/api.c 2005-09-27 04:53:33 UTC (rev 18118) @@ -0,0 +1,1412 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS CSR Sub System + * FILE: subsys/csr/csrsrv/api.c + * PURPOSE: CSR Server DLL API LPC Implementation + * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) + */ + +/* INCLUDES ******************************************************************/ + +#include "srv.h" + +#define NDEBUG +#include <debug.h> + +/* DATA **********************************************************************/ +BOOLEAN (*CsrClientThreadSetup)(VOID) = NULL; +ULONG CsrMaxApiRequestThreads; +UNICODE_STRING CsrSbApiPortName; +UNICODE_STRING CsrApiPortName; +HANDLE CsrSbApiPort; +HANDLE CsrApiPort; +PCSR_THREAD CsrSbApiRequestThreadPtr; +ULONG CsrpStaticThreadCount; +ULONG CsrpDynamicThreadTotal; + +/* PRIVATE FUNCTIONS *********************************************************/ + +/*++ + * @name CsrCheckRequestThreads + * + * The CsrCheckRequestThreads routine checks if there are no more threads + * to handle CSR API Requests, and creates a new thread if possible, to + * avoid starvation. + * + * @param None. + * + * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL + * if a new thread couldn't be created. + * + * @remarks None. + * + *--*/ +NTSTATUS +NTAPI +CsrCheckRequestThreads(VOID) +{ + HANDLE hThread; + CLIENT_ID ClientId; + NTSTATUS Status; + + /* Decrease the count, and see if we're out */ + if (!(InterlockedDecrement(&CsrpStaticThreadCount))) + { + /* Check if we've still got space for a Dynamic Thread */ + if (CsrpDynamicThreadTotal < CsrMaxApiRequestThreads) + { + /* Create a new dynamic thread */ + Status = RtlCreateUserThread(NtCurrentProcess(), + NULL, + TRUE, + 0, + 0, + 0, + CsrApiRequestThread, + NULL, + &hThread, + &ClientId); + /* Check success */ + if(NT_SUCCESS(Status)) + { + /* Increase the thread counts */ + CsrpStaticThreadCount++; + CsrpDynamicThreadTotal++; + + /* Add a new server thread */ + if (CsrAddStaticServerThread(hThread, + &ClientId, + CsrThreadIsServerThread)) + { + /* Activate it */ + NtResumeThread(hThread,NULL); + } + else + { + /* Failed to create a new static thread */ + CsrpStaticThreadCount--; + CsrpDynamicThreadTotal--; + + /* Terminate it */ + NtTerminateThread(hThread,0); + NtClose(hThread); + + /* Return */ + return STATUS_UNSUCCESSFUL; + } + } + } + } + + /* Success */ + return STATUS_SUCCESS; +} + +/*++ + * @name CsrSbApiPortInitialize + * + * The CsrSbApiPortInitialize routine initializes the LPC Port used for + * communications with the Session Manager (SM) and initializes the static + * thread that will handle connection requests and APIs. + * + * @param None + * + * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL + * othwerwise. + * + * @remarks None. + * + *--*/ +NTSTATUS +NTAPI +CsrSbApiPortInitialize(VOID) +{ + ULONG Size; + PSECURITY_DESCRIPTOR PortSd; + OBJECT_ATTRIBUTES ObjectAttributes; + NTSTATUS Status; + HANDLE hRequestThread; + CLIENT_ID ClientId; + + /* Calculate how much space we'll need for the Port Name */ + Size = CsrDirectoryName.Length + sizeof(SB_PORT_NAME) + sizeof(WCHAR); + + /* Allocate space for it, and create it */ + CsrSbApiPortName.Buffer = RtlAllocateHeap(CsrHeap, 0, Size); + CsrSbApiPortName.Length = 0; + CsrSbApiPortName.MaximumLength = (USHORT)Size; + RtlAppendUnicodeStringToString(&CsrSbApiPortName, &CsrDirectoryName); + RtlAppendUnicodeToString(&CsrSbApiPortName, UNICODE_PATH_SEP); + RtlAppendUnicodeToString(&CsrSbApiPortName, SB_PORT_NAME); + + /* Create Security Descriptor for this Port */ + CsrCreateLocalSystemSD(&PortSd); + + /* Initialize the Attributes */ + InitializeObjectAttributes(&ObjectAttributes, + &CsrSbApiPortName, + 0, + PortSd, + NULL); + + /* Create the Port Object */ + Status = NtCreatePort(&CsrSbApiPort, + &ObjectAttributes, + sizeof(SB_CONNECTION_INFO), + sizeof(SB_API_MESSAGE), + 32 * sizeof(SB_API_MESSAGE)); + if(!NT_SUCCESS(Status)) + { + + } + + /* Create the Thread to handle the API Requests */ + Status = RtlCreateUserThread(NtCurrentProcess(), + NULL, + TRUE, + 0, + 0, + 0, + (PVOID)CsrSbApiRequestThread, + NULL, + &hRequestThread, + &ClientId); + if(!NT_SUCCESS(Status)) + { + + } + + /* Add it as a Static Server Thread */ + CsrSbApiRequestThreadPtr = CsrAddStaticServerThread(hRequestThread, + &ClientId, + 0); + + /* Activate it */ + return NtResumeThread(hRequestThread, NULL); +} + +/*++ + * @name CsrApiPortInitialize + * + * The CsrApiPortInitialize routine initializes the LPC Port used for + * communications with the Client/Server Runtime (CSR) and initializes the + * static thread that will handle connection requests and APIs. + * + * @param None + * + * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL + * othwerwise. + * + * @remarks None. + * + *--*/ +NTSTATUS +NTAPI +CsrApiPortInitialize(VOID) +{ + ULONG Size; + OBJECT_ATTRIBUTES ObjectAttributes; + NTSTATUS Status; + HANDLE hRequestEvent, hThread; + CLIENT_ID ClientId; + PLIST_ENTRY ListHead, NextEntry; + PCSR_THREAD ServerThread; + + /* Calculate how much space we'll need for the Port Name */ + Size = CsrDirectoryName.Length + sizeof(CSR_PORT_NAME) + sizeof(WCHAR); + + /* Allocate space for it, and create it */ + CsrApiPortName.Buffer = RtlAllocateHeap(CsrHeap, 0, Size); + CsrApiPortName.Length = 0; + CsrApiPortName.MaximumLength = (USHORT)Size; + RtlAppendUnicodeStringToString(&CsrApiPortName, &CsrDirectoryName); + RtlAppendUnicodeToString(&CsrApiPortName, UNICODE_PATH_SEP); + RtlAppendUnicodeToString(&CsrApiPortName, CSR_PORT_NAME); + + /* FIXME: Create a Security Descriptor */ + + /* Initialize the Attributes */ + InitializeObjectAttributes(&ObjectAttributes, + &CsrApiPortName, + 0, + NULL, + NULL /* FIXME*/); + + /* Create the Port Object */ + Status = NtCreatePort(&CsrApiPort, + &ObjectAttributes, + sizeof(CSR_CONNECTION_INFO), + sizeof(CSR_API_MESSAGE), + 16 * PAGE_SIZE); + if(!NT_SUCCESS(Status)) + { + + } + + /* Create the event the Port Thread will use */ + Status = NtCreateEvent(&hRequestEvent, + EVENT_ALL_ACCESS, + NULL, + SynchronizationEvent, + FALSE); + if(!NT_SUCCESS(Status)) + { + + } + + /* Create the Request Thread */ + Status = RtlCreateUserThread(NtCurrentProcess(), + NULL, + TRUE, + 0, + 0, + 0, + (PVOID)CsrApiRequestThread, + (PVOID)hRequestEvent, + &hThread, + &ClientId); + if(!NT_SUCCESS(Status)) + { + + } + + /* Add this as a static thread to CSRSRV */ + CsrAddStaticServerThread(hThread, &ClientId, CsrThreadIsServerThread); + + /* Get the Thread List Pointers */ + ListHead = &CsrRootProcess->ThreadList; + NextEntry = ListHead->Flink; + + /* Start looping the list */ + while (NextEntry != ListHead) + { + /* Get the Thread */ + ServerThread = CONTAINING_RECORD(NextEntry, CSR_THREAD, Link); + + /* Start it up */ + Status = NtResumeThread(ServerThread->ThreadHandle, NULL); + + /* Is this a Server Thread? */ + if (ServerThread->Flags & CsrThreadIsServerThread) + { + /* If so, then wait for it to initialize */ + NtWaitForSingleObject(hRequestEvent, FALSE, NULL); + } + + /* Next thread */ + NextEntry = NextEntry->Flink; + } + + /* We don't need this anymore */ + NtClose(hRequestEvent); + + /* Return */ + return Status; +} + +/*++ + * @name CsrApiRequestThread + * + * The CsrApiRequestThread routine handles incoming messages or connection + * requests on the CSR API LPC Port. + * + * @param Parameter + * System-default user-defined parameter. Unused. + * + * @return The thread exit code, if the thread is terminated. + * + * @remarks Before listening on the port, the routine will first attempt + * to connect to the user subsystem. + * + *--*/ +NTSTATUS +NTAPI +CsrApiRequestThread(IN PVOID Parameter) +{ + PTEB Teb = NtCurrentTeb(); + LARGE_INTEGER TimeOut; + PCSR_THREAD CurrentThread; + NTSTATUS Status; + PCSR_API_MESSAGE ReplyMsg = NULL; + CSR_API_MESSAGE ReceiveMsg; + PCSR_THREAD CsrThread; + PCSR_PROCESS CsrProcess; + PHARDERROR_MSG HardErrorMsg; + PVOID PortContext; + ULONG MessageType; + ULONG i; + PCSR_SERVER_DLL ServerDll; + PCLIENT_DIED_MSG ClientDiedMsg; + PDBGKM_MSG DebugMessage; + ULONG ServerId, ApiId; [truncated at 1000 lines; 8012 more skipped]

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs