Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cwittich] 32126: always return Request->Status;
by cwittich＠svn.reactos.org 04 Feb '08

04 Feb '08

Author: cwittich Date: Tue Feb 5 01:41:09 2008 New Revision: 32126 URL: http://svn.reactos.org/svn/reactos?rev=32126&view=rev Log: always return Request->Status; Modified: trunk/reactos/subsystems/win32/csrss/api/alias.c Modified: trunk/reactos/subsystems/win32/csrss/api/alias.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/api… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/api/alias.c (original) +++ trunk/reactos/subsystems/win32/csrss/api/alias.c Tue Feb 5 01:41:09 2008 @@ -312,7 +312,7 @@ if (!Header) { Request->Status = STATUS_INSUFFICIENT_RESOURCES; - return STATUS_INSUFFICIENT_RESOURCES; + return Request->Status; } IntInsertAliasHeader(&RootHeader, Header); } @@ -339,7 +339,7 @@ if (!Entry) { Request->Status = STATUS_INSUFFICIENT_RESOURCES; - return STATUS_INSUFFICIENT_RESOURCES; + return Request->Status; } IntInsertAliasEntry(Header, Entry); @@ -365,26 +365,26 @@ if (!Header) { Request->Status = STATUS_INVALID_PARAMETER; - return STATUS_INVALID_PARAMETER; + return Request->Status; } Entry = IntGetAliasEntry(Header, Request->Data.GetConsoleAlias.lpSource); if (!Entry) { Request->Status = STATUS_INVALID_PARAMETER; - return STATUS_INVALID_PARAMETER; + return Request->Status; } Length = (wcslen(Entry->lpTarget)+1) * sizeof(WCHAR); if (Length > Request->Data.GetConsoleAlias.TargetBufferLength) { Request->Status = ERROR_INSUFFICIENT_BUFFER; - return ERROR_INSUFFICIENT_BUFFER; + return Request->Status; } wcscpy(Request->Data.GetConsoleAlias.TargetBuffer, Entry->lpTarget); Request->Data.GetConsoleAlias.BytesWritten = Length; Request->Status = STATUS_SUCCESS; - return STATUS_SUCCESS; + return Request->Status; } CSR_API(CsrGetAllConsoleAliases) @@ -402,13 +402,13 @@ if (!Header) { Request->Status = STATUS_INVALID_PARAMETER; - return STATUS_INVALID_PARAMETER; + return Request->Status; } if (IntGetAllConsoleAliasesLength(Header) > Request->Data.GetAllConsoleAlias.AliasBufferLength) { Request->Status = ERROR_INSUFFICIENT_BUFFER; - return ERROR_INSUFFICIENT_BUFFER; + return Request->Status; } BytesWritten = IntGetAllConsoleAliases(Header, @@ -417,7 +417,7 @@ Request->Data.GetAllConsoleAlias.BytesWritten = BytesWritten; Request->Status = STATUS_SUCCESS; - return STATUS_SUCCESS; + return Request->Status; } CSR_API(CsrGetAllConsoleAliasesLength) @@ -435,13 +435,13 @@ if (!Header) { Request->Status = STATUS_INVALID_PARAMETER; - return STATUS_INVALID_PARAMETER; + return Request->Status; } Length = IntGetAllConsoleAliasesLength(Header); Request->Data.GetAllConsoleAliasesLength.Length = Length; Request->Status = STATUS_SUCCESS; - return STATUS_SUCCESS; + return Request->Status; } @@ -453,7 +453,7 @@ if (ExesLength > Request->Data.GetConsoleAliasesExes.Length) { Request->Status = ERROR_INSUFFICIENT_BUFFER; - return ERROR_INSUFFICIENT_BUFFER; + return Request->Status; } if (Request->Data.GetConsoleAliasesExes.ExeNames == NULL) @@ -475,5 +475,5 @@ { Request->Status = STATUS_SUCCESS; Request->Data.GetConsoleAliasesExesLength.Length = IntGetConsoleAliasesExesLength(RootHeader); - return STATUS_SUCCESS; -} + return Request->Status; +}

1 0

[janderwald] 32125: - remove unused members
by janderwald＠svn.reactos.org 04 Feb '08

04 Feb '08

Author: janderwald Date: Tue Feb 5 01:33:21 2008 New Revision: 32125 URL: http://svn.reactos.org/svn/reactos?rev=32125&view=rev Log: - remove unused members Modified: trunk/reactos/include/reactos/subsys/csrss/csrss.h Modified: trunk/reactos/include/reactos/subsys/csrss/csrss.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/csr… ============================================================================== --- trunk/reactos/include/reactos/subsys/csrss/csrss.h (original) +++ trunk/reactos/include/reactos/subsys/csrss/csrss.h Tue Feb 5 01:33:21 2008 @@ -445,7 +445,6 @@ typedef struct { - BOOL Unicode; DWORD BytesWritten; DWORD Length; LPWSTR ExeNames; @@ -453,7 +452,6 @@ typedef struct { - BOOL Unicode; DWORD Length; } CSRSS_GET_CONSOLE_ALIASES_EXES_LENGTH, *PCSRSS_GET_CONSOLE_ALIASES_EXES_LENGTH;

1 0

[janderwald] 32124: - fix error status
by janderwald＠svn.reactos.org 04 Feb '08

04 Feb '08

Author: janderwald Date: Tue Feb 5 01:32:37 2008 New Revision: 32124 URL: http://svn.reactos.org/svn/reactos?rev=32124&view=rev Log: - fix error status Modified: trunk/reactos/subsystems/win32/csrss/api/alias.c Modified: trunk/reactos/subsystems/win32/csrss/api/alias.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/api… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/api/alias.c (original) +++ trunk/reactos/subsystems/win32/csrss/api/alias.c Tue Feb 5 01:32:37 2008 @@ -364,15 +364,15 @@ Header = IntFindAliasHeader(RootHeader, Request->Data.GetAllConsoleAlias.lpExeName); if (!Header) { - Request->Status = ERROR_NO_DATA; // FIXME - return ERROR_NO_DATA; + Request->Status = STATUS_INVALID_PARAMETER; + return STATUS_INVALID_PARAMETER; } Entry = IntGetAliasEntry(Header, Request->Data.GetConsoleAlias.lpSource); if (!Entry) { - Request->Status = ERROR_NO_DATA; // FIXME - return ERROR_NO_DATA; + Request->Status = STATUS_INVALID_PARAMETER; + return STATUS_INVALID_PARAMETER; } Length = (wcslen(Entry->lpTarget)+1) * sizeof(WCHAR); @@ -401,8 +401,8 @@ Header = IntFindAliasHeader(RootHeader, Request->Data.GetAllConsoleAlias.lpExeName); if (!Header) { - Request->Status = ERROR_NO_DATA; // FIXME - return ERROR_NO_DATA; + Request->Status = STATUS_INVALID_PARAMETER; + return STATUS_INVALID_PARAMETER; } if (IntGetAllConsoleAliasesLength(Header) > Request->Data.GetAllConsoleAlias.AliasBufferLength) @@ -434,8 +434,8 @@ Header = IntFindAliasHeader(RootHeader, Request->Data.GetAllConsoleAliasesLength.lpExeName); if (!Header) { - Request->Status = ERROR_NO_DATA; // FIXME - return ERROR_NO_DATA; + Request->Status = STATUS_INVALID_PARAMETER; + return STATUS_INVALID_PARAMETER; } Length = IntGetAllConsoleAliasesLength(Header);

1 0

[cwittich] 32123: return 0 when type is DWORD remove unused alias struct
by cwittich＠svn.reactos.org 04 Feb '08

04 Feb '08

Author: cwittich Date: Tue Feb 5 01:11:56 2008 New Revision: 32123 URL: http://svn.reactos.org/svn/reactos?rev=32123&view=rev Log: return 0 when type is DWORD remove unused alias struct Modified: trunk/reactos/dll/win32/kernel32/misc/console.c Modified: trunk/reactos/dll/win32/kernel32/misc/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/co… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/console.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/console.c Tue Feb 5 01:11:56 2008 @@ -18,14 +18,6 @@ #define NDEBUG #include <debug.h> - -typedef struct tagALIAS -{ - struct tagALIAS *next; - LPWSTR lpName; - LPWSTR lpSubst; - DWORD dwUsed; -} ALIAS, *LPALIAS; extern BOOL WINAPI DefaultConsoleCtrlHandler(DWORD Event); extern __declspec(noreturn) VOID CALLBACK ConsoleControlDispatcher(DWORD CodeAndFlag); @@ -187,11 +179,11 @@ BOOL STDCALL AddConsoleAliasW (LPCWSTR lpSource, LPCWSTR lpTarget, - LPCWSTR lpExeName /* FIXME: currently ignored */) + LPCWSTR lpExeName) { CSR_API_MESSAGE Request; ULONG CsrRequest; - NTSTATUS Status; + NTSTATUS Status; CsrRequest = MAKE_CSR_API(ADD_CONSOLE_ALIAS, CSR_NATIVE); @@ -308,7 +300,7 @@ { CSR_API_MESSAGE Request; ULONG CsrRequest; - NTSTATUS Status; + NTSTATUS Status; CsrRequest = MAKE_CSR_API(GET_CONSOLE_ALIAS, CSR_NATIVE); @@ -325,7 +317,7 @@ if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request.Status)) { SetLastErrorByStatus(Status); - return FALSE; + return 0; } return Request.Data.GetConsoleAlias.BytesWritten / sizeof(WCHAR); @@ -376,12 +368,12 @@ * @implemented */ DWORD STDCALL -GetConsoleAliasExesW (LPWSTR lpExeNameBuffer, +GetConsoleAliasExesW (LPWSTR lpExeNameBuffer, DWORD ExeNameBufferLength) { CSR_API_MESSAGE Request; ULONG CsrRequest; - NTSTATUS Status; + NTSTATUS Status; CsrRequest = MAKE_CSR_API(GET_CONSOLE_ALIASES_EXES, CSR_NATIVE); Request.Data.GetConsoleAliasesExes.ExeNames = lpExeNameBuffer; @@ -395,7 +387,7 @@ if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request.Status)) { SetLastErrorByStatus(Status); - return FALSE; + return 0; } return Request.Data.GetConsoleAliasesExes.BytesWritten / sizeof(WCHAR); @@ -445,7 +437,7 @@ if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request.Status)) { SetLastErrorByStatus(Status); - return FALSE; + return 0; } return Request.Data.GetConsoleAliasesExesLength.Length; @@ -478,12 +470,12 @@ { CSR_API_MESSAGE Request; ULONG CsrRequest; - NTSTATUS Status; + NTSTATUS Status; DWORD dwLength; dwLength = GetConsoleAliasesLengthW(ExeName); if (!dwLength || dwLength > AliasBufferLength) - return FALSE; + return 0; CsrRequest = MAKE_CSR_API(GET_ALL_CONSOLE_ALIASES, CSR_NATIVE); Request.Data.GetAllConsoleAlias.AliasBuffer = AliasBuffer; @@ -498,7 +490,7 @@ if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request.Status)) { SetLastErrorByStatus(Status); - return FALSE; + return 0; } return Request.Data.GetAllConsoleAlias.BytesWritten / sizeof(WCHAR); @@ -557,7 +549,7 @@ if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request.Status)) { SetLastErrorByStatus(Status); - return FALSE; + return 0; } return Request.Data.GetAllConsoleAliasesLength.Length;

1 0

[gbrunmar] 32122: * Implemented IDirect3D9's GetAdapterCount() and GetAdapterIdentifier() * Made d3d9.dll compile with MSVC
by gbrunmar＠svn.reactos.org 04 Feb '08

04 Feb '08

Author: gbrunmar Date: Tue Feb 5 00:33:12 2008 New Revision: 32122 URL: http://svn.reactos.org/svn/reactos?rev=32122&view=rev Log: * Implemented IDirect3D9's GetAdapterCount() and GetAdapterIdentifier() * Made d3d9.dll compile with MSVC Added: trunk/reactos/dll/directx/d3d9/adapter.c (with props) trunk/reactos/dll/directx/d3d9/adapter.h (with props) Modified: trunk/reactos/dll/directx/d3d9/d3d9.rbuild trunk/reactos/dll/directx/d3d9/d3d9_common.h trunk/reactos/dll/directx/d3d9/d3d9_create.c trunk/reactos/dll/directx/d3d9/d3d9_helpers.c trunk/reactos/dll/directx/d3d9/d3d9_helpers.h trunk/reactos/dll/directx/d3d9/d3d9_impl.c trunk/reactos/dll/directx/d3d9/d3d9_private.h Added: trunk/reactos/dll/directx/d3d9/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/adapter.c… ============================================================================== --- trunk/reactos/dll/directx/d3d9/adapter.c (added) +++ trunk/reactos/dll/directx/d3d9/adapter.c Tue Feb 5 00:33:12 2008 @@ -1,0 +1,156 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS ReactX + * FILE: dll/directx/d3d9/adapter.c + * PURPOSE: d3d9.dll adapter info functions + * PROGRAMERS: Gregor Brunmar <gregor (dot) brunmar (at) home (dot) se> + */ + +#include "d3d9_common.h" +#include <d3d9.h> +#include <ddraw.h> +#include <strsafe.h> + +typedef BOOL (WINAPI *LPFN_ISWOW64PROCESS) (HANDLE, PBOOL); +typedef BOOL (WINAPI *LPFN_DISABLEWOW64FSREDIRECTION) (PVOID*); +typedef BOOL (WINAPI *LPFN_REVERTWOW64FSREDIRECTION) (PVOID); + +static BOOL GetDriverName(LPDISPLAY_DEVICEA pDisplayDevice, D3DADAPTER_IDENTIFIER9* pIdentifier) +{ + HKEY hKey; + BOOL bResult = FALSE; + + if (ERROR_SUCCESS == RegOpenKeyExA(HKEY_LOCAL_MACHINE, pDisplayDevice->DeviceKey + strlen("\\Registry\\Machine\\"), 0, KEY_QUERY_VALUE, &hKey)) + { + DWORD DriverNameLength = MAX_DEVICE_IDENTIFIER_STRING - (DWORD)strlen(".dll"); + DWORD Type = 0; + + if (ERROR_SUCCESS == RegQueryValueExA(hKey, "InstalledDisplayDrivers", 0, &Type, (LPBYTE)pIdentifier->Driver, &DriverNameLength)) + { + pIdentifier->Driver[DriverNameLength] = '\0'; + StringCbCatA(pIdentifier->Driver, MAX_DEVICE_IDENTIFIER_STRING, ".dll"); + bResult = TRUE; + } + + RegCloseKey(hKey); + } + + return bResult; +} + +static void GetDriverVersion(LPDISPLAY_DEVICEA pDisplayDevice, D3DADAPTER_IDENTIFIER9* pIdentifier) +{ + HMODULE hModule; + LPFN_ISWOW64PROCESS fnIsWow64Process; + BOOL bIsWow64 = FALSE; + PVOID OldWow64RedirectValue; + UINT DriverFileSize; + + hModule = GetModuleHandleA("KERNEL32"); + fnIsWow64Process = (LPFN_ISWOW64PROCESS)GetProcAddress(hModule, "IsWow64Process"); + if (fnIsWow64Process) + { + fnIsWow64Process(GetCurrentProcess(), &bIsWow64); + if (bIsWow64) + { + LPFN_DISABLEWOW64FSREDIRECTION fnDisableWow64FsRedirection; + fnDisableWow64FsRedirection = (LPFN_DISABLEWOW64FSREDIRECTION)GetProcAddress(hModule, "Wow64DisableWow64FsRedirection"); + fnDisableWow64FsRedirection(&OldWow64RedirectValue); + } + } + + DriverFileSize = GetFileVersionInfoSizeA(pIdentifier->Driver, NULL); + if (DriverFileSize > 0) + { + VS_FIXEDFILEINFO* FixedFileInfo = NULL; + LPVOID pBlock = LocalAlloc(LMEM_ZEROINIT, DriverFileSize); + + if (TRUE == GetFileVersionInfoA(pIdentifier->Driver, 0, DriverFileSize, pBlock)) + { + if (TRUE == VerQueryValueA(pBlock, "\\", (LPVOID*)&FixedFileInfo, &DriverFileSize)) + { + pIdentifier->DriverVersion.HighPart = FixedFileInfo->dwFileVersionMS; + pIdentifier->DriverVersion.LowPart = FixedFileInfo->dwFileVersionLS; + } + } + + LocalFree(pBlock); + } + + if (bIsWow64) + { + LPFN_REVERTWOW64FSREDIRECTION fnRevertWow64FsRedirection; + fnRevertWow64FsRedirection = (LPFN_REVERTWOW64FSREDIRECTION)GetProcAddress(hModule, "Wow64RevertWow64FsRedirection"); + fnRevertWow64FsRedirection(&OldWow64RedirectValue); + } +} + + +static void ParseField(LPCSTR lpszDeviceKey, LPDWORD pField, LPCSTR lpszSubString) +{ + const char* ResultStr; + ResultStr = strstr(lpszDeviceKey, lpszSubString); + if (ResultStr != NULL) + { + *pField = strtol(ResultStr + strlen(lpszSubString), NULL, 16); + } +} + +static void GetDeviceId(LPCSTR lpszDeviceKey, D3DADAPTER_IDENTIFIER9* pIdentifier) +{ + ParseField(lpszDeviceKey, &pIdentifier->VendorId, "VEN_"); + ParseField(lpszDeviceKey, &pIdentifier->DeviceId, "DEV_"); + ParseField(lpszDeviceKey, &pIdentifier->SubSysId, "SUBSYS_"); + ParseField(lpszDeviceKey, &pIdentifier->Revision, "REV_"); +} + +static void GenerateDeviceIdentifier(D3DADAPTER_IDENTIFIER9* pIdentifier) +{ + DWORD* dwIdentifier = (DWORD*)&pIdentifier->DeviceIdentifier; + + pIdentifier->DeviceIdentifier = CLSID_DirectDraw; + + dwIdentifier[0] ^= pIdentifier->VendorId; + dwIdentifier[1] ^= pIdentifier->DeviceId; + dwIdentifier[2] ^= pIdentifier->SubSysId; + dwIdentifier[3] ^= pIdentifier->Revision; + dwIdentifier[2] ^= pIdentifier->DriverVersion.LowPart; + dwIdentifier[3] ^= pIdentifier->DriverVersion.HighPart; +} + +BOOL GetAdapterInfo(LPCSTR lpszDeviceName, D3DADAPTER_IDENTIFIER9* pIdentifier) +{ + DISPLAY_DEVICEA DisplayDevice; + DWORD AdapterIndex; + BOOL FoundDisplayDevice; + + memset(&DisplayDevice, 0, sizeof(DISPLAY_DEVICEA)); + DisplayDevice.cb = sizeof(DISPLAY_DEVICEA); + + AdapterIndex = 0; + FoundDisplayDevice = FALSE; + while (EnumDisplayDevicesA(NULL, AdapterIndex, &DisplayDevice, 0) == TRUE) + { + if (_stricmp(lpszDeviceName, DisplayDevice.DeviceName) == 0) + { + FoundDisplayDevice = TRUE; + break; + } + } + + /* No matching display device found? */ + if (FALSE == FoundDisplayDevice) + return FALSE; + + lstrcpynA(pIdentifier->Description, DisplayDevice.DeviceString, MAX_DEVICE_IDENTIFIER_STRING); + lstrcpynA(pIdentifier->DeviceName, DisplayDevice.DeviceName, CCHDEVICENAME); + + if (GetDriverName(&DisplayDevice, pIdentifier) == TRUE) + GetDriverVersion(&DisplayDevice, pIdentifier); + + GetDeviceId(DisplayDevice.DeviceID, pIdentifier); + + GenerateDeviceIdentifier(pIdentifier); + + return TRUE; +} Propchange: trunk/reactos/dll/directx/d3d9/adapter.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/directx/d3d9/adapter.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/adapter.h… ============================================================================== --- trunk/reactos/dll/directx/d3d9/adapter.h (added) +++ trunk/reactos/dll/directx/d3d9/adapter.h Tue Feb 5 00:33:12 2008 @@ -1,0 +1,14 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS ReactX + * FILE: dll/directx/d3d9/adapter.h + * PURPOSE: d3d9.dll adapter info functions + * PROGRAMERS: Gregor Brunmar <gregor (dot) brunmar (at) home (dot) se> + */ + +#ifndef _ADAPTER_H_ +#define _ADAPTER_H_ + +BOOL GetAdapterInfo(LPCSTR lpszDeviceName, D3DADAPTER_IDENTIFIER9* pIdentifier); + +#endif Propchange: trunk/reactos/dll/directx/d3d9/adapter.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/directx/d3d9/d3d9.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9.rbui… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9.rbuild (original) +++ trunk/reactos/dll/directx/d3d9/d3d9.rbuild Tue Feb 5 00:33:12 2008 @@ -10,10 +10,12 @@ <library>uuid</library> <library>dxguid</library> <library>strsafe</library> + <library>version</library> <file>d3d9.c</file> <file>d3d9_helpers.c</file> <file>d3d9_impl.c</file> <file>d3d9_create.c</file> + <file>adapter.c</file> <file>d3d9.rc</file> </module> Modified: trunk/reactos/dll/directx/d3d9/d3d9_common.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_comm… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_common.h (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_common.h Tue Feb 5 00:33:12 2008 @@ -14,6 +14,6 @@ #define DLLAPI __declspec(dllexport) #define DX_D3D9_DEBUG 0x80000000 -extern const struct IDirect3D9Vtbl Direct3D9_Vtbl; +extern struct IDirect3D9Vtbl Direct3D9_Vtbl; #endif // _D3D9_COMMON_H_ Modified: trunk/reactos/dll/directx/d3d9/d3d9_create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_crea… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_create.c (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_create.c Tue Feb 5 00:33:12 2008 @@ -46,31 +46,46 @@ pDisplayAdapter->bInUseFlag = TRUE; } +static BOOL GetDirect3DAdapterInfo(IN OUT LPDIRECT3D9_DISPLAYADAPTER_INT pDisplayAdapter) +{ + HDC hDC; + + /* Check if minimum DirectDraw is supported */ + if (IsDirectDrawSupported() == FALSE) + return FALSE; + + /* Test DC creation for the display device */ + if (NULL == (hDC = CreateDCA(NULL, pDisplayAdapter->szDeviceName, NULL, NULL))) + return FALSE; + + DeleteDC(hDC); + return TRUE; +} + static BOOL GetDisplayDeviceInfo(IN OUT LPDIRECT3D9_INT pDirect3D9) { DISPLAY_DEVICEA DisplayDevice; DWORD AdapterIndex; - HDC hDC; memset(&DisplayDevice, 0, sizeof(DISPLAY_DEVICEA)); DisplayDevice.cb = sizeof(DISPLAY_DEVICEA); - pDirect3D9->dwNumDisplayAdapters = 0; + pDirect3D9->NumDisplayAdapters = 0; D3D9_PrimaryDeviceName[0] = '\0'; AdapterIndex = 0; while (EnumDisplayDevicesA(NULL, AdapterIndex, &DisplayDevice, 0) == TRUE && - pDirect3D9->dwNumDisplayAdapters < DX_D3D9_MAX_NUM_ADAPTERS) + pDirect3D9->NumDisplayAdapters < DX_D3D9_MAX_NUM_ADAPTERS) { if ((DisplayDevice.StateFlags & (DISPLAY_DEVICE_DISCONNECT | DISPLAY_DEVICE_MIRRORING_DRIVER)) == 0 && (DisplayDevice.StateFlags & (DISPLAY_DEVICE_PRIMARY_DEVICE | DISPLAY_DEVICE_ATTACHED_TO_DESKTOP)) != 0) { - SetAdapterInfo(&pDirect3D9->DisplayAdapters[pDirect3D9->dwNumDisplayAdapters], &DisplayDevice); + SetAdapterInfo(&pDirect3D9->DisplayAdapters[pDirect3D9->NumDisplayAdapters], &DisplayDevice); - if (pDirect3D9->dwNumDisplayAdapters == 0) + if (pDirect3D9->NumDisplayAdapters == 0) lstrcpynA(D3D9_PrimaryDeviceName, DisplayDevice.DeviceName, sizeof(D3D9_PrimaryDeviceName)); - ++pDirect3D9->dwNumDisplayAdapters; + ++pDirect3D9->NumDisplayAdapters; break; } @@ -79,27 +94,22 @@ AdapterIndex = 0; while (EnumDisplayDevicesA(NULL, AdapterIndex, &DisplayDevice, 0) == TRUE && - pDirect3D9->dwNumDisplayAdapters < DX_D3D9_MAX_NUM_ADAPTERS) + pDirect3D9->NumDisplayAdapters < DX_D3D9_MAX_NUM_ADAPTERS) { if ((DisplayDevice.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP) != 0 && (DisplayDevice.StateFlags & (DISPLAY_DEVICE_MIRRORING_DRIVER | DISPLAY_DEVICE_PRIMARY_DEVICE)) == 0) { - SetAdapterInfo(&pDirect3D9->DisplayAdapters[pDirect3D9->dwNumDisplayAdapters], &DisplayDevice); - ++pDirect3D9->dwNumDisplayAdapters; + SetAdapterInfo(&pDirect3D9->DisplayAdapters[pDirect3D9->NumDisplayAdapters], &DisplayDevice); + ++pDirect3D9->NumDisplayAdapters; } ++AdapterIndex; } - /* Check if minimum DirectDraw is supported */ - if (IsDirectDrawSupported() == FALSE) - return FALSE; - - /* Test DC creation for primary display device */ - if (NULL == (hDC = CreateDCA(NULL, D3D9_PrimaryDeviceName, NULL, NULL))) - return FALSE; - - DeleteDC(hDC); + for (AdapterIndex = 0; AdapterIndex < pDirect3D9->NumDisplayAdapters; AdapterIndex++) + { + GetDirect3DAdapterInfo(&pDirect3D9->DisplayAdapters[AdapterIndex]); + } return TRUE; } Modified: trunk/reactos/dll/directx/d3d9/d3d9_helpers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_help… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_helpers.c (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_helpers.c Tue Feb 5 00:33:12 2008 @@ -27,10 +27,10 @@ DWORD Type; LONG Ret; - if (ERROR_SUCCESS != RegOpenKeyEx(HKEY_LOCAL_MACHINE, D3D9_DebugRegPath, 0, KEY_QUERY_VALUE, &hKey)) + if (ERROR_SUCCESS != RegOpenKeyExA(HKEY_LOCAL_MACHINE, D3D9_DebugRegPath, 0, KEY_QUERY_VALUE, &hKey)) return FALSE; - Ret = RegQueryValueEx(hKey, ValueName, 0, &Type, DataBuffer, DataBufferSize); + Ret = RegQueryValueExA(hKey, ValueName, 0, &Type, DataBuffer, DataBufferSize); RegCloseKey(hKey); Modified: trunk/reactos/dll/directx/d3d9/d3d9_helpers.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_help… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_helpers.h (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_helpers.h Tue Feb 5 00:33:12 2008 @@ -10,6 +10,9 @@ #include "d3d9_common.h" #include "d3d9_private.h" + +#define LOCK_D3D9() EnterCriticalSection(&This->d3d9_cs); +#define UNLOCK_D3D9() LeaveCriticalSection(&This->d3d9_cs); /* Convert a IDirect3D9 pointer safely to the internal implementation struct */ LPDIRECT3D9_INT impl_from_IDirect3D9(LPDIRECT3D9 iface); Modified: trunk/reactos/dll/directx/d3d9/d3d9_impl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_impl… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_impl.c (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_impl.c Tue Feb 5 00:33:12 2008 @@ -8,8 +8,9 @@ #include "d3d9_common.h" #include <d3d9.h> +#include <debug.h> #include "d3d9_helpers.h" -#include <debug.h> +#include "adapter.h" /* IDirect3D9: IUnknown implementation */ static HRESULT WINAPI IDirect3D9Impl_QueryInterface(LPDIRECT3D9 iface, REFIID riid, LPVOID* ppvObject) @@ -59,17 +60,93 @@ return D3D_OK; } +/*++ +* @name IDirect3D9::GetAdapterCount +* @implemented +* +* The function IDirect3D9Impl_GetAdapterCount returns the number of adapters +* +* @param LPDIRECT3D iface +* Pointer to the IDirect3D object returned from Direct3DCreate9() +* +* @return +* The number of display adapters on the system when Direct3DCreate9() was called. +* +*/ static UINT WINAPI IDirect3D9Impl_GetAdapterCount(LPDIRECT3D9 iface) { - UNIMPLEMENTED - - return D3D_OK; -} - -static HRESULT WINAPI IDirect3D9Impl_GetAdapterIdentifier(LPDIRECT3D9 iface, UINT Adapter, DWORD Flags, + UINT NumDisplayAdapters; + + LPDIRECT3D9_INT This = impl_from_IDirect3D9(iface); + LOCK_D3D9(); + + NumDisplayAdapters = This->NumDisplayAdapters; + + UNLOCK_D3D9(); + return NumDisplayAdapters; +} + +/*++ +* @name IDirect3D9::GetAdapterIdentifier +* @implemented +* +* The function IDirect3D9Impl_GetAdapterIdentifier gathers information about +* a specified display adapter and fills the pIdentifier argument with the available information. +* +* @param LPDIRECT3D iface +* Pointer to the IDirect3D object returned from Direct3DCreate9() +* +* @param UINT Adapter +* Adapter index to get information about. D3DADAPTER_DEFAULT is the primary display. +* The maximum value for this is the value returned by IDirect3D::GetAdapterCount(). +* +* @param DWORD Flags +* Ignored at the moment, but the only valid flag is D3DENUM_WHQL_LEVEL +* +* @param D3DADAPTER_IDENTIFIER9* pIdentifier +* Pointer to a D3DADAPTER_IDENTIFIER9 structure to be filled with the available information +* about the display adapter. +* +* @return +* If the method successfully fills the pIdentified structure, the return value is D3D_OK. +* If Adapter is out of range, Flags is invalid or pIdentifier is a bad pointer, the return value +* will be D3DERR_INVALIDCALL. +* +*/ +HRESULT WINAPI IDirect3D9Impl_GetAdapterIdentifier(LPDIRECT3D9 iface, UINT Adapter, DWORD Flags, D3DADAPTER_IDENTIFIER9* pIdentifier) { - UNIMPLEMENTED + LPDIRECT3D9_INT This = impl_from_IDirect3D9(iface); + LOCK_D3D9(); + + if (Adapter >= This->NumDisplayAdapters) + { + DPRINT1("Invalid Adapter number specified"); + UNLOCK_D3D9(); + return D3DERR_INVALIDCALL; + } + + if (Flags & ~D3DENUM_WHQL_LEVEL) + { + DPRINT1("Invalid Flags specified"); + UNLOCK_D3D9(); + return D3DERR_INVALIDCALL; + } + + if (IsBadWritePtr(pIdentifier, sizeof(D3DADAPTER_IDENTIFIER9))) + { + UNLOCK_D3D9(); + return D3DERR_INVALIDCALL; + } + + memset(pIdentifier, 0, sizeof(D3DADAPTER_IDENTIFIER9)); + + if (FALSE == GetAdapterInfo(This->DisplayAdapters[Adapter].szDeviceName, pIdentifier)) + { + DPRINT1("Internal error: Couldn't get the adapter info for device (%d): %s", Adapter, This->DisplayAdapters[Adapter].szDeviceName); + UNLOCK_D3D9(); + return D3DERR_INVALIDCALL; + } return D3D_OK; } @@ -150,7 +227,7 @@ { UNIMPLEMENTED - return D3D_OK; + return NULL; } static HRESULT WINAPI IDirect3D9Impl_CreateDevice(LPDIRECT3D9 iface, UINT Adapter, D3DDEVTYPE DeviceType, @@ -163,7 +240,7 @@ return D3D_OK; } -const IDirect3D9Vtbl Direct3D9_Vtbl = +IDirect3D9Vtbl Direct3D9_Vtbl = { /* IUnknown */ IDirect3D9Impl_QueryInterface, Modified: trunk/reactos/dll/directx/d3d9/d3d9_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_priv… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_private.h (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_private.h Tue Feb 5 00:33:12 2008 @@ -26,7 +26,7 @@ /* 0x0130 */ DWORD unknown000007; /* 0x0134 */ DWORD unknown000008; /* 0x0138 */ DWORD unknown000009; -/* 0x013c */ DWORD unknown000010; +/* 0x013c */ DWORD unknown000010; /* D3D9_DRIVERCAPS? */ /* 0x0140 */ DWORD unknown000011; /* 0x0144 */ DWORD unknown000012; /* 0x0148 */ DWORD unknown000013; @@ -126,13 +126,13 @@ typedef struct _tagDIRECT3D9_INT_ { -/* 0x0000 */ const struct IDirect3D9Vtbl *lpVtbl; /* LPDIRECTD3D9 functoions table */ +/* 0x0000 */ struct IDirect3D9Vtbl *lpVtbl; /* LPDIRECTD3D9 functoions table */ /* 0x0004 */ CRITICAL_SECTION d3d9_cs; /* 0x001c */ DWORD unknown000007; /* 0x00000001 */ /* 0x0020 */ DWORD dwProcessId; /* 0x0024 */ struct _tagDIRECT3D9_INT_ *lpInt; /* 0x0028 */ LONG dwRefCnt; /* Increases and decreases by AddRef() and Release() */ -/* 0x002c */ DWORD dwNumDisplayAdapters; +/* 0x002c */ UINT NumDisplayAdapters; /* 0x0030 */ Direct3D9DisplayAdapterInfo_INT DisplayAdapters[DX_D3D9_MAX_NUM_ADAPTERS]; /* 0x2100 */ DWORD unknown002112; /* 0x2104 */ DWORD unknown002113; @@ -2543,7 +2543,7 @@ /* 0x4698 */ DWORD unknown004518; /* 0x469c */ DWORD unknown004519; /* 0x46a0 */ DWORD unknown004520; -/* 0x46a4 */ DWORD unknown004521; +/* 0x46a4 */ DWORD unknown004521; // Software only /* 0x46a8 */ DWORD unknown004522; /* 0x46ac */ DWORD unknown004523; /* 0x46b0 */ DWORD unknown004524;

1 0

[janderwald] 32121: - insert new entry when required - check for null
by janderwald＠svn.reactos.org 04 Feb '08

04 Feb '08

Author: janderwald Date: Tue Feb 5 00:24:09 2008 New Revision: 32121 URL: http://svn.reactos.org/svn/reactos?rev=32121&view=rev Log: - insert new entry when required - check for null Modified: trunk/reactos/subsystems/win32/csrss/api/alias.c Modified: trunk/reactos/subsystems/win32/csrss/api/alias.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/api… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/api/alias.c (original) +++ trunk/reactos/subsystems/win32/csrss/api/alias.c Tue Feb 5 00:24:09 2008 @@ -106,6 +106,9 @@ PALIAS_ENTRY IntGetAliasEntry(PALIAS_HEADER Header, LPCWSTR lpSrcName) { + if (Header == NULL) + return NULL; + PALIAS_ENTRY RootHeader = Header->Data; while(RootHeader) { @@ -303,7 +306,7 @@ } Header = IntFindAliasHeader(RootHeader, Request->Data.AddConsoleAlias.lpExeName); - if (!Header) + if (!Header && Request->Data.AddConsoleAlias.lpTarget != NULL) { Header = IntCreateAliasHeader(Request->Data.AddConsoleAlias.lpExeName); if (!Header) @@ -311,6 +314,7 @@ Request->Status = STATUS_INSUFFICIENT_RESOURCES; return STATUS_INSUFFICIENT_RESOURCES; } + IntInsertAliasHeader(&RootHeader, Header); } if (Request->Data.AddConsoleAlias.lpTarget == NULL) // delete the entry

1 0

[fireball] 32120: - Build FreeLdr the same way other modules are built, by using gcc -Wl. - This allows us to get rid of the /math directory and use -lgcc instead. - Get rid of -ffreestanding, -fno-builtin and -O2. The former are not needed anymore since we're properly building a "freestanding" image anyway, just like the kernel. The latter is removed since optimization flags come from the project settings. - Update code to fix warnings caused since we've removed -ffreestanding. GCC now warns ab
by fireball＠svn.reactos.org 04 Feb '08

04 Feb '08

Author: fireball Date: Mon Feb 4 23:27:43 2008 New Revision: 32120 URL: http://svn.reactos.org/svn/reactos?rev=32120&view=rev Log: - Build FreeLdr the same way other modules are built, by using gcc -Wl. - This allows us to get rid of the /math directory and use -lgcc instead. - Get rid of -ffreestanding, -fno-builtin and -O2. The former are not needed anymore since we're properly building a "freestanding" image anyway, just like the kernel. The latter is removed since optimization flags come from the project settings. - Update code to fix warnings caused since we've removed -ffreestanding. GCC now warns about printf, sprintf and other C calls (including a change from %wZ to %S in winldr.c's sprintf calls). - Don't use printf anymore -- rename freeldr's implementation to TuiPrintf. Just like in the kernel, you can't use printf in freeldr (since it's not running in a standard/full CRT environment). - 124kb saved! Removed: trunk/reactos/boot/freeldr/freeldr/math/ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c trunk/reactos/boot/freeldr/freeldr/custom.c trunk/reactos/boot/freeldr/freeldr/disk/disk.c trunk/reactos/boot/freeldr/freeldr/disk/partition.c trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild trunk/reactos/boot/freeldr/freeldr/freeldr_base64k.rbuild trunk/reactos/boot/freeldr/freeldr/freeldr_main.rbuild trunk/reactos/boot/freeldr/freeldr/freeldr_startup.rbuild trunk/reactos/boot/freeldr/freeldr/include/freeldr.h trunk/reactos/boot/freeldr/freeldr/include/ui/tui.h trunk/reactos/boot/freeldr/freeldr/rtl/bget.c trunk/reactos/boot/freeldr/freeldr/setupldr.rbuild trunk/reactos/boot/freeldr/freeldr/ui/tui.c trunk/reactos/boot/freeldr/freeldr/windows/winldr.c trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c Mon Feb 4 23:27:43 2008 @@ -579,7 +579,7 @@ MmHeapFree(PartialResourceList); /* Set 'Identifier' value */ - sprintf(Identifier, "FLOPPY%u", FloppyNumber + 1); + sprintf(Identifier, "FLOPPY%ld", FloppyNumber + 1); FldrSetIdentifier(PeripheralKey, Identifier); } } @@ -1218,7 +1218,7 @@ MmHeapFree(PartialResourceList); /* Set 'Identifier' value */ - sprintf(Buffer, "COM%u", i + 1); + sprintf(Buffer, "COM%ld", i + 1); FldrSetIdentifier(ControllerKey, Buffer); DbgPrint((DPRINT_HWDETECT, "Created value: Identifier %s\n", @@ -1323,7 +1323,7 @@ MmHeapFree(PartialResourceList); /* Set 'Identifier' value */ - sprintf(Buffer, "PARALLEL%u", i + 1); + sprintf(Buffer, "PARALLEL%ld", i + 1); FldrSetIdentifier(ControllerKey, Buffer); DbgPrint((DPRINT_HWDETECT, "Created value: Identifier %s\n", Modified: trunk/reactos/boot/freeldr/freeldr/custom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/custo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/custom.c (original) +++ trunk/reactos/boot/freeldr/freeldr/custom.c Mon Feb 4 23:27:43 2008 @@ -91,7 +91,7 @@ // Generate a unique section name MachRTCGetCurrentDateTime(&Year, &Month, &Day, &Hour, &Minute, &Second); - sprintf(SectionName, "CustomBootDisk%d%d%d%d%d%d", Year, Day, Month, Hour, Minute, Second); + sprintf(SectionName, "CustomBootDisk%ld%ld%ld%ld%ld%ld", Year, Day, Month, Hour, Minute, Second); // Add the section if (!IniAddSection(SectionName, &SectionId)) @@ -140,7 +140,7 @@ // Generate a unique section name MachRTCGetCurrentDateTime(&Year, &Month, &Day, &Hour, &Minute, &Second); - sprintf(SectionName, "CustomBootPartition%d%d%d%d%d%d", Year, Day, Month, Hour, Minute, Second); + sprintf(SectionName, "CustomBootPartition%ld%ld%ld%ld%ld%ld", Year, Day, Month, Hour, Minute, Second); // Add the section if (!IniAddSection(SectionName, &SectionId)) @@ -202,7 +202,7 @@ // Generate a unique section name MachRTCGetCurrentDateTime(&Year, &Month, &Day, &Hour, &Minute, &Second); - sprintf(SectionName, "CustomBootSectorFile%d%d%d%d%d%d", Year, Day, Month, Hour, Minute, Second); + sprintf(SectionName, "CustomBootSectorFile%ld%ld%ld%ld%ld%ld", Year, Day, Month, Hour, Minute, Second); // Add the section if (!IniAddSection(SectionName, &SectionId)) @@ -278,7 +278,7 @@ // Generate a unique section name MachRTCGetCurrentDateTime(&Year, &Month, &Day, &Hour, &Minute, &Second); - sprintf(SectionName, "CustomReactOS%d%d%d%d%d%d", Year, Day, Month, Hour, Minute, Second); + sprintf(SectionName, "CustomReactOS%ld%ld%ld%ld%ld%ld", Year, Day, Month, Hour, Minute, Second); // Add the section if (!IniAddSection(SectionName, &SectionId)) @@ -357,7 +357,7 @@ // Generate a unique section name MachRTCGetCurrentDateTime(&Year, &Month, &Day, &Hour, &Minute, &Second); - sprintf(SectionName, "CustomLinux%d%d%d%d%d%d", Year, Day, Month, Hour, Minute, Second); + sprintf(SectionName, "CustomLinux%ld%ld%ld%ld%ld%ld", Year, Day, Month, Hour, Minute, Second); // Add the section if (!IniAddSection(SectionName, &SectionId)) Modified: trunk/reactos/boot/freeldr/freeldr/disk/disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/disk/disk.c (original) +++ trunk/reactos/boot/freeldr/freeldr/disk/disk.c Mon Feb 4 23:27:43 2008 @@ -41,7 +41,7 @@ if (bReportError == FALSE) return; - sprintf(ErrorCodeString, "%s\n\nError Code: 0x%x\nError: %s", ErrorString, ErrorCode, DiskGetErrorCodeString(ErrorCode)); + sprintf(ErrorCodeString, "%s\n\nError Code: 0x%lx\nError: %s", ErrorString, ErrorCode, DiskGetErrorCodeString(ErrorCode)); DbgPrint((DPRINT_DISK, "%s\n", ErrorCodeString)); Modified: trunk/reactos/boot/freeldr/freeldr/disk/partition.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/disk/partition.c (original) +++ trunk/reactos/boot/freeldr/freeldr/disk/partition.c Mon Feb 4 23:27:43 2008 @@ -230,7 +230,7 @@ // Check the partition table magic value if (BootRecord->MasterBootRecordMagic != 0xaa55) { - sprintf(ErrMsg, "Invalid partition table magic 0x%x found on drive 0x%x", + sprintf(ErrMsg, "Invalid partition table magic 0x%x found on drive 0x%lx", BootRecord->MasterBootRecordMagic, DriveNumber); DiskError(ErrMsg, 0); return FALSE; Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild Mon Feb 4 23:27:43 2008 @@ -13,6 +13,9 @@ <library>cmlib</library> <library>rtl</library> <library>libcntpr</library> + <linkerflag>-nostartfiles</linkerflag> + <linkerflag>-nostdlib</linkerflag> + <linkerflag>-lgcc</linkerflag> </module> </if> <if property="ARCH" value="powerpc"> Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild Mon Feb 4 23:27:43 2008 @@ -8,11 +8,8 @@ <include base="freeldr_base">cache</include> <include base="ntoskrnl">include</include> <define name="_NTHAL_" /> - <compilerflag>-ffreestanding</compilerflag> - <compilerflag>-fno-builtin</compilerflag> <compilerflag>-fno-inline</compilerflag> <compilerflag>-fno-zero-initialized-in-bss</compilerflag> - <compilerflag>-Os</compilerflag> <file>_alloca.S</file> <file>archmach.c</file> <file>hardware.c</file> Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild Mon Feb 4 23:27:43 2008 @@ -7,11 +7,8 @@ <include base="ntoskrnl">include</include> <define name="_NTHAL_" /> <define name="_NTSYSTEM_" /> - <compilerflag>-ffreestanding</compilerflag> - <compilerflag>-fno-builtin</compilerflag> <compilerflag>-fno-inline</compilerflag> <compilerflag>-fno-zero-initialized-in-bss</compilerflag> - <compilerflag>-Os</compilerflag> <directory name="cache"> <file>blocklist.c</file> <file>cache.c</file> @@ -35,9 +32,6 @@ <file>ini_init.c</file> <file>inifile.c</file> <file>parse.c</file> - </directory> - <directory name="math"> - <file>libgcc2.c</file> </directory> <directory name="mm"> <file>meminit.c</file> Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_base64k.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr_base64k.rbuild (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_base64k.rbuild Mon Feb 4 23:27:43 2008 @@ -4,11 +4,8 @@ <include base="freeldr_base64k">include</include> <include base="ntoskrnl">include</include> <define name="_NTHAL_" /> - <compilerflag>-ffreestanding</compilerflag> - <compilerflag>-fno-builtin</compilerflag> <compilerflag>-fno-inline</compilerflag> <compilerflag>-fno-zero-initialized-in-bss</compilerflag> - <compilerflag>-Os</compilerflag> <directory name="arch"> <if property="ARCH" value="i386"> <directory name="i386"> Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_main.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr_main.rbuild (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_main.rbuild Mon Feb 4 23:27:43 2008 @@ -4,11 +4,8 @@ <include base="freeldr_main">include</include> <include base="ntoskrnl">include</include> <define name="_NTHAL_" /> - <compilerflag>-ffreestanding</compilerflag> - <compilerflag>-fno-builtin</compilerflag> <compilerflag>-fno-inline</compilerflag> <compilerflag>-fno-zero-initialized-in-bss</compilerflag> - <compilerflag>-Os</compilerflag> <file>bootmgr.c</file> <file>drivemap.c</file> <file>miscboot.c</file> Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_startup.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr_startup.rbuild (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_startup.rbuild Mon Feb 4 23:27:43 2008 @@ -3,8 +3,6 @@ <module name="freeldr_startup" type="objectlibrary"> <include base="freeldr_startup">include</include> <include base="ntoskrnl">include</include> - <compilerflag>-ffreestanding</compilerflag> - <compilerflag>-fno-builtin</compilerflag> <compilerflag>-fno-inline</compilerflag> <compilerflag>-fno-zero-initialized-in-bss</compilerflag> <directory name="arch"> Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/freeldr.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/freeldr.h Mon Feb 4 23:27:43 2008 @@ -26,6 +26,7 @@ #include <stdio.h> #include <ctype.h> #define NTOSAPI +#define printf TuiPrintf #include <ntddk.h> #include <arc/arc.h> #include <ketypes.h> Modified: trunk/reactos/boot/freeldr/freeldr/include/ui/tui.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/ui/tui.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/ui/tui.h Mon Feb 4 23:27:43 2008 @@ -46,7 +46,7 @@ VOID TuiDrawProgressBarCenter(ULONG Position, ULONG Range, PCHAR ProgressText); // Draws the progress bar showing nPos percent filled VOID TuiDrawProgressBar(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, ULONG Position, ULONG Range, PCHAR ProgressText); // Draws the progress bar showing nPos percent filled BOOLEAN TuiEditBox(PCSTR MessageText, PCHAR EditTextBuffer, ULONG Length); - +int TuiPrintf(const char *format, ... ); UCHAR TuiTextToColor(PCSTR ColorText); // Converts the text color into it's equivalent color value UCHAR TuiTextToFillStyle(PCSTR FillStyleText); // Converts the text fill into it's equivalent fill value Modified: trunk/reactos/boot/freeldr/freeldr/rtl/bget.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/rtl/b… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/rtl/bget.c (original) +++ trunk/reactos/boot/freeldr/freeldr/rtl/bget.c Mon Feb 4 23:27:43 2008 @@ -445,6 +445,9 @@ #include <stdio.h> +int TuiPrintf(const char *format, ... ); +#define printf TuiPrintf + #ifdef lint #define NDEBUG /* Exits in asserts confuse lint */ /* LINTLIBRARY */ /* Don't complain about def, no ref */ Modified: trunk/reactos/boot/freeldr/freeldr/setupldr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/setup… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/setupldr.rbuild (original) +++ trunk/reactos/boot/freeldr/freeldr/setupldr.rbuild Mon Feb 4 23:27:43 2008 @@ -11,4 +11,7 @@ <library>cmlib</library> <library>rtl</library> <library>libcntpr</library> + <linkerflag>-nostartfiles</linkerflag> + <linkerflag>-nostdlib</linkerflag> + <linkerflag>-lgcc</linkerflag> </module> Modified: trunk/reactos/boot/freeldr/freeldr/ui/tui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ui/tu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ui/tui.c (original) +++ trunk/reactos/boot/freeldr/freeldr/ui/tui.c Mon Feb 4 23:27:43 2008 @@ -25,7 +25,7 @@ * printf() - prints formatted text to stdout * originally from GRUB */ -int printf(const char *format, ... ) +int TuiPrintf(const char *format, ... ) { va_list ap; va_start(ap,format); Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/winldr.c (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/winldr.c Mon Feb 4 23:27:43 2008 @@ -259,7 +259,7 @@ PVOID DriverBase; // Separate the path to file name and directory path - sprintf(DriverPath, "%wZ", FilePath); + sprintf(DriverPath, "%S", FilePath->Buffer); DriverNamePos = strrchr(DriverPath, '\\'); if (DriverNamePos != NULL) { @@ -282,7 +282,7 @@ } // It's not loaded, we have to load it - sprintf(FullPath,"%s%wZ", BootPath, FilePath); + sprintf(FullPath,"%s%S", BootPath, FilePath->Buffer); Status = WinLdrLoadImage(FullPath, LoaderBootDriver, &DriverBase); if (!Status) return FALSE; @@ -586,3 +586,4 @@ } } + Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Mon Feb 4 23:27:43 2008 @@ -3547,11 +3547,11 @@ fprintf ( fMakefile, "\t$(ECHO_LD)\n" ); fprintf ( fMakefile, - "\t${ld} %s -N -Ttext=0x8000 -o %s %s %s\n", - GetLinkerMacro ().c_str (), + "\t${gcc} -Wl,--subsystem,native -Wl,-Ttext,0x8000 -o %s %s %s %s\n", backend->GetFullName ( junk_tmp ).c_str (), objectsMacro.c_str (), - linkDepsMacro.c_str () ); + linkDepsMacro.c_str (), + GetLinkerMacro ().c_str ()); fprintf ( fMakefile, "\t${objcopy} -O binary %s $@\n", backend->GetFullName ( junk_tmp ).c_str () );

1 0

[janderwald] 32119: - rename member
by janderwald＠svn.reactos.org 04 Feb '08

04 Feb '08

Author: janderwald Date: Mon Feb 4 21:58:46 2008 New Revision: 32119 URL: http://svn.reactos.org/svn/reactos?rev=32119&view=rev Log: - rename member Modified: trunk/reactos/include/reactos/subsys/csrss/csrss.h Modified: trunk/reactos/include/reactos/subsys/csrss/csrss.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/csr… ============================================================================== --- trunk/reactos/include/reactos/subsys/csrss/csrss.h (original) +++ trunk/reactos/include/reactos/subsys/csrss/csrss.h Mon Feb 4 21:58:46 2008 @@ -435,7 +435,7 @@ DWORD BytesWritten; DWORD AliasBufferLength; LPWSTR AliasBuffer; -} CSRSS_GET_ALL_CONSOLE_ALIAS, *PCSRSS_GET_ALL_CONSOLE_ALIAS; +} CSRSS_GET_ALL_CONSOLE_ALIASES, *PCSRSS_GET_ALL_CONSOLE_ALIAS; typedef struct { @@ -529,7 +529,7 @@ #define START_SCREEN_SAVER (0x37) #define ADD_CONSOLE_ALIAS (0x38) #define GET_CONSOLE_ALIAS (0x39) -#define GET_ALL_CONSOLE_ALIAS (0x3A) +#define GET_ALL_CONSOLE_ALIASES (0x3A) #define GET_ALL_CONSOLE_ALIASES_LENGTH (0x3B) #define GET_CONSOLE_ALIASES_EXES (0x3C) #define GET_CONSOLE_ALIASES_EXES_LENGTH (0x3D) @@ -600,7 +600,7 @@ CSRSS_GET_PROCESS_LIST GetProcessListRequest; CSRSS_ADD_CONSOLE_ALIAS AddConsoleAlias; CSRSS_GET_CONSOLE_ALIAS GetConsoleAlias; - CSRSS_GET_ALL_CONSOLE_ALIAS GetAllConsoleAlias; + CSRSS_GET_ALL_CONSOLE_ALIASES GetAllConsoleAlias; CSRSS_GET_ALL_CONSOLE_ALIASES_LENGTH GetAllConsoleAliasesLength; CSRSS_GET_CONSOLE_ALIASES_EXES GetConsoleAliasesExes; CSRSS_GET_CONSOLE_ALIASES_EXES_LENGTH GetConsoleAliasesExesLength;

1 0

[janderwald] 32118: - call csrss for Console alias related functions
by janderwald＠svn.reactos.org 04 Feb '08

04 Feb '08

Author: janderwald Date: Mon Feb 4 21:58:17 2008 New Revision: 32118 URL: http://svn.reactos.org/svn/reactos?rev=32118&view=rev Log: - call csrss for Console alias related functions Modified: trunk/reactos/dll/win32/kernel32/misc/console.c Modified: trunk/reactos/dll/win32/kernel32/misc/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/co… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/console.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/console.c Mon Feb 4 21:58:17 2008 @@ -27,14 +27,10 @@ DWORD dwUsed; } ALIAS, *LPALIAS; -static LPALIAS lpFirst = NULL; -static LPALIAS lpLast = NULL; - extern BOOL WINAPI DefaultConsoleCtrlHandler(DWORD Event); extern __declspec(noreturn) VOID CALLBACK ConsoleControlDispatcher(DWORD CodeAndFlag); extern RTL_CRITICAL_SECTION ConsoleLock; extern BOOL WINAPI IsDebuggerPresent(VOID); -static VOID partstrlwr (LPWSTR str); /* GLOBALS *******************************************************************/ @@ -43,19 +39,6 @@ static PHANDLER_ROUTINE* CtrlHandlers = NULL; static ULONG NrCtrlHandlers = 0; static WCHAR InputExeName[MAX_PATH + 1] = L""; - -/* module internal functions */ -/* strlwr only for first word in string */ -static VOID -partstrlwr (LPWSTR str) -{ - LPWSTR c = str; - while (*c && !iswspace (*c) && *c != L'=') - { - *c = towlower (*c); - c++; - } -} /* Default Console Control Handler *******************************************/ @@ -206,125 +189,28 @@ LPCWSTR lpTarget, LPCWSTR lpExeName /* FIXME: currently ignored */) { - LPALIAS ptr = lpFirst; - LPALIAS prev = NULL; - LPALIAS entry = NULL; - LPWSTR s; - - if (!lpTarget) - { - /* delete */ - while (ptr) - { - if (!wcsicmp (ptr->lpName, lpSource)) - { - if (prev) - prev->next = ptr->next; - else - lpFirst = ptr->next; - RtlFreeHeap (GetProcessHeap(), 0, ptr->lpName); - RtlFreeHeap (GetProcessHeap(), 0, ptr->lpSubst); - RtlFreeHeap (GetProcessHeap(), 0, ptr); - return TRUE; - } - prev = ptr; - ptr = ptr->next; - } - } - else - { - /* add */ - while (ptr) - { - if (!wcsicmp (ptr->lpName, lpSource)) - { - s = (LPWSTR) RtlAllocateHeap (GetProcessHeap(), 0, ((wcslen (lpTarget) + 1) * sizeof(WCHAR))); - if (!s) - { - return FALSE; - } - - RtlFreeHeap (GetProcessHeap(), 0, ptr->lpSubst); - ptr->lpSubst = s; - wcscpy (ptr->lpSubst, lpTarget); - return TRUE; - } - ptr = ptr->next; - } - - ptr = (LPALIAS) RtlAllocateHeap (GetProcessHeap(), 0, sizeof(ALIAS)); - if (!ptr) - return FALSE; - - ptr->next = 0; - - ptr->lpName = (LPWSTR) RtlAllocateHeap (GetProcessHeap(), 0, ((wcslen (lpSource) + 1) * sizeof(WCHAR))); - if (!ptr->lpName) - { - RtlFreeHeap (GetProcessHeap(), 0, ptr); - return FALSE; - } - wcscpy (ptr->lpName, lpSource); - - ptr->lpSubst = (LPWSTR) RtlAllocateHeap (GetProcessHeap(), 0, ((wcslen (lpTarget) + 1) * sizeof(WCHAR))); - if (!ptr->lpSubst) - { - RtlFreeHeap (GetProcessHeap(), 0, ptr->lpName); - RtlFreeHeap (GetProcessHeap(), 0, ptr); - return FALSE; - } - wcscpy (ptr->lpSubst, lpTarget); - - /* it's necessary for recursive substitution */ - partstrlwr (ptr->lpSubst); - - ptr->dwUsed = 0; - - /* Alias table must be sorted! - * Here a little example: - * command line = "ls -c" - * If the entries are - * ls=dir - * ls -c=ls /w - * command line will be expanded to "dir -c" which is not correct. - * If the entries are sortet as - * ls -c=ls /w - * ls=dir - * it will be expanded to "dir /w" which is a valid DOS command. - */ - entry = lpFirst; - prev = 0; - while (entry) - { - if (wcsicmp (ptr->lpName, entry->lpName) > 0) - - { - if (prev) - { - prev->next = ptr; - ptr->next = entry; - } - else - { - ptr->next = entry; - lpFirst = ptr; - } - return TRUE; - } - prev = entry; - entry = entry->next; - } - - /* The new entry is the smallest (or the first) and must be - * added to the end of the list. - */ - if (!lpFirst) - lpFirst = ptr; - else - lpLast->next = ptr; - lpLast = ptr; - } - return TRUE; + CSR_API_MESSAGE Request; + ULONG CsrRequest; + NTSTATUS Status; + + CsrRequest = MAKE_CSR_API(ADD_CONSOLE_ALIAS, CSR_NATIVE); + + Request.Data.AddConsoleAlias.lpExeName = lpExeName; + Request.Data.AddConsoleAlias.lpTarget = lpTarget; + Request.Data.AddConsoleAlias.lpSource = lpSource; + + Status = CsrClientCallServer(& Request, + NULL, + CsrRequest, + sizeof(CSR_API_MESSAGE)); + + if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request.Status)) + { + SetLastErrorByStatus(Status); + return FALSE; + } + + return TRUE; } @@ -418,38 +304,36 @@ GetConsoleAliasW (LPWSTR lpSource, LPWSTR lpTargetBuffer, DWORD TargetBufferLength, - LPWSTR lpExeName) /* FIXME: currently ignored */ -{ - DWORD dwRet = 0; - - if (!lpTargetBuffer) - return 0; - - LPALIAS ptr = lpFirst; - while (ptr) - { - if (wcscmp(ptr->lpName, lpSource) == 0) - { - if (TargetBufferLength >= wcslen(ptr->lpSubst) +1) - { - wcscpy(lpTargetBuffer, ptr->lpSubst); - dwRet = wcslen(ptr->lpSubst); - break; - } - else - { - return 0; - } - } - ptr = ptr->next; - } - - return dwRet; -} - - -/* - * @unimplemented + LPWSTR lpExeName) +{ + CSR_API_MESSAGE Request; + ULONG CsrRequest; + NTSTATUS Status; + + CsrRequest = MAKE_CSR_API(GET_CONSOLE_ALIAS, CSR_NATIVE); + + Request.Data.GetConsoleAlias.lpExeName = lpExeName; + Request.Data.GetConsoleAlias.lpSource = lpSource; + Request.Data.GetConsoleAlias.TargetBuffer = lpTargetBuffer; + Request.Data.GetConsoleAlias.TargetBufferLength = TargetBufferLength; + + Status = CsrClientCallServer(& Request, + NULL, + CsrRequest, + sizeof(CSR_API_MESSAGE)); + + if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request.Status)) + { + SetLastErrorByStatus(Status); + return FALSE; + } + + return Request.Data.GetConsoleAlias.BytesWritten / sizeof(WCHAR); +} + + +/* + * @implemented */ DWORD STDCALL GetConsoleAliasA (LPSTR lpSource, @@ -457,59 +341,130 @@ DWORD TargetBufferLength, LPSTR lpExeName) { - DPRINT1("GetConsoleAliasA(0x%p, 0x%p, 0x%x, 0x%p) UNIMPLEMENTED!\n", lpSource, lpTargetBuffer, TargetBufferLength, lpExeName); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - -/* - * @unimplemented + LPWSTR lpwSource; + LPWSTR lpwExeName; + LPWSTR lpwTargetBuffer; + UINT dwSourceSize; + UINT dwExeNameSize; + UINT dwResult; + + dwSourceSize = (strlen(lpSource)+1) * sizeof(WCHAR); + lpwSource = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwSourceSize); + MultiByteToWideChar(CP_ACP, 0, lpSource, -1, lpwSource, dwSourceSize); + + dwExeNameSize = (strlen(lpExeName)+1) * sizeof(WCHAR); + lpwExeName = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwExeNameSize); + MultiByteToWideChar(CP_ACP, 0, lpExeName, -1, lpwExeName, dwExeNameSize); + + lpwTargetBuffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, TargetBufferLength * sizeof(WCHAR)); + + dwResult = GetConsoleAliasW(lpwSource, lpwTargetBuffer, TargetBufferLength, lpwExeName); + + HeapFree(GetProcessHeap(), 0, lpwSource); + HeapFree(GetProcessHeap(), 0, lpwExeName); + + if (dwResult) + dwResult = WideCharToMultiByte(CP_ACP, 0, lpwTargetBuffer, dwResult, lpTargetBuffer, TargetBufferLength, NULL, NULL); + + HeapFree(GetProcessHeap(), 0, lpwTargetBuffer); + + return dwResult; +} + + +/* + * @implemented */ DWORD STDCALL GetConsoleAliasExesW (LPWSTR lpExeNameBuffer, DWORD ExeNameBufferLength) { - DPRINT1("GetConsoleAliasExesW(0x%p, 0x%x) UNIMPLEMENTED!\n", lpExeNameBuffer, ExeNameBufferLength); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - -/* - * @unimplemented + CSR_API_MESSAGE Request; + ULONG CsrRequest; + NTSTATUS Status; + + CsrRequest = MAKE_CSR_API(GET_CONSOLE_ALIASES_EXES, CSR_NATIVE); + Request.Data.GetConsoleAliasesExes.ExeNames = lpExeNameBuffer; + Request.Data.GetConsoleAliasesExes.Length = ExeNameBufferLength; + + Status = CsrClientCallServer(& Request, + NULL, + CsrRequest, + sizeof(CSR_API_MESSAGE)); + + if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request.Status)) + { + SetLastErrorByStatus(Status); + return FALSE; + } + + return Request.Data.GetConsoleAliasesExes.BytesWritten / sizeof(WCHAR); +} + + +/* + * @implemented */ DWORD STDCALL GetConsoleAliasExesA (LPSTR lpExeNameBuffer, DWORD ExeNameBufferLength) { - DPRINT1("GetConsoleAliasExesA(0x%p, 0x%x) UNIMPLEMENTED!\n", lpExeNameBuffer, ExeNameBufferLength); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - -/* - * @unimplemented + LPWSTR lpwExeNameBuffer; + DWORD dwResult; + + lpwExeNameBuffer = HeapAlloc(GetProcessHeap(), 0, ExeNameBufferLength * sizeof(WCHAR)); + + dwResult = GetConsoleAliasExesW(lpwExeNameBuffer, ExeNameBufferLength); + + if (dwResult) + dwResult = WideCharToMultiByte(CP_ACP, 0, lpwExeNameBuffer, dwResult, lpExeNameBuffer, ExeNameBufferLength, NULL, NULL); + + HeapFree(GetProcessHeap(), 0, lpwExeNameBuffer); + return dwResult; +} + +/* + * @implemented + */ +DWORD STDCALL +GetConsoleAliasExesLengthW (VOID) +{ + CSR_API_MESSAGE Request; + ULONG CsrRequest; + NTSTATUS Status; + + CsrRequest = MAKE_CSR_API(GET_CONSOLE_ALIASES_EXES_LENGTH, CSR_NATIVE); + Request.Data.GetConsoleAliasesExesLength.Length = 0; + + + Status = CsrClientCallServer(& Request, + NULL, + CsrRequest, + sizeof(CSR_API_MESSAGE)); + + if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request.Status)) + { + SetLastErrorByStatus(Status); + return FALSE; + } + + return Request.Data.GetConsoleAliasesExesLength.Length; +} + +/* + * @implemented */ DWORD STDCALL GetConsoleAliasExesLengthA (VOID) { - DPRINT1("GetConsoleAliasExesLengthA() UNIMPLEMENTED!\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - -/* - * @unimplemented - */ -DWORD STDCALL -GetConsoleAliasExesLengthW (VOID) -{ - DPRINT1("GetConsoleAliasExesLengthW() UNIMPLEMENTED!\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + DWORD dwLength; + + dwLength = GetConsoleAliasExesLengthW(); + + if (dwLength) + dwLength /= sizeof(WCHAR); + + return dwLength; } @@ -519,47 +474,64 @@ DWORD STDCALL GetConsoleAliasesW (LPWSTR AliasBuffer, DWORD AliasBufferLength, - LPWSTR ExeName) /* FIXME: currently ignored */ -{ - DWORD len; - WCHAR Buffer[MAX_PATH]; - LPWSTR AliasPtr; - - if (!AliasBuffer) - return 0; - - AliasPtr = AliasBuffer; - len = GetConsoleAliasesLengthW (ExeName); - if (len > AliasBufferLength) - return 0; - - LPALIAS ptr = lpFirst; - while (ptr) - { - swprintf(Buffer, L"%s=%s" , ptr->lpName, ptr->lpSubst); - wcscpy(AliasBuffer, Buffer); - AliasBuffer += wcslen(Buffer) + 1; - ptr = ptr->next; - } - - return (INT) (AliasBuffer - AliasPtr); -} - - -/* - * @unimplemented + LPWSTR ExeName) +{ + CSR_API_MESSAGE Request; + ULONG CsrRequest; + NTSTATUS Status; + DWORD dwLength; + + dwLength = GetConsoleAliasesLengthW(ExeName); + if (!dwLength || dwLength > AliasBufferLength) + return FALSE; + + CsrRequest = MAKE_CSR_API(GET_ALL_CONSOLE_ALIASES, CSR_NATIVE); + Request.Data.GetAllConsoleAlias.AliasBuffer = AliasBuffer; + Request.Data.GetAllConsoleAlias.AliasBufferLength = AliasBufferLength; + Request.Data.GetAllConsoleAlias.lpExeName = ExeName; + + Status = CsrClientCallServer(& Request, + NULL, + CsrRequest, + sizeof(CSR_API_MESSAGE)); + + if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request.Status)) + { + SetLastErrorByStatus(Status); + return FALSE; + } + + return Request.Data.GetAllConsoleAlias.BytesWritten / sizeof(WCHAR); +} + + +/* + * @implemented */ DWORD STDCALL GetConsoleAliasesA (LPSTR AliasBuffer, DWORD AliasBufferLength, LPSTR ExeName) - /* - * Undocumented - */ -{ - DPRINT1("GetConsoleAliasesA(0x%p, 0x%x, 0x%p) UNIMPLEMENTED!\n", AliasBuffer, AliasBufferLength, ExeName); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; +{ + DWORD dwRetVal = 0; + LPWSTR lpwExeName = NULL; + LPWSTR lpwAliasBuffer; + + if (ExeName) + BasepAnsiStringToHeapUnicodeString(ExeName, (LPWSTR*) &lpwExeName); + + lpwAliasBuffer = HeapAlloc(GetProcessHeap(), 0, AliasBufferLength * sizeof(WCHAR)); + + dwRetVal = GetConsoleAliasesW(lpwAliasBuffer, AliasBufferLength, lpwExeName); + + if (lpwExeName) + RtlFreeHeap(GetProcessHeap(), 0, (LPWSTR*) lpwExeName); + + if (dwRetVal) + dwRetVal = WideCharToMultiByte(CP_ACP, 0, lpwAliasBuffer, dwRetVal, AliasBuffer, AliasBufferLength, NULL, NULL); + + HeapFree(GetProcessHeap(), 0, lpwAliasBuffer); + return dwRetVal; } @@ -567,18 +539,28 @@ * @implemented */ DWORD STDCALL -GetConsoleAliasesLengthW (LPWSTR lpExeName /* FIXME: currently ignored */) -{ - DWORD len = 0; - LPALIAS ptr = lpFirst; - while (ptr) - { - len += wcslen(ptr->lpName) * sizeof(WCHAR); - len += wcslen(ptr->lpSubst) * sizeof(WCHAR); - len += 2 * sizeof(WCHAR); /* '=' + '\0' */ - ptr = ptr->next; - } - return len; +GetConsoleAliasesLengthW (LPWSTR lpExeName) +{ + CSR_API_MESSAGE Request; + ULONG CsrRequest; + NTSTATUS Status; + + CsrRequest = MAKE_CSR_API(GET_ALL_CONSOLE_ALIASES_LENGTH, CSR_NATIVE); + Request.Data.GetAllConsoleAliasesLength.lpExeName = lpExeName; + Request.Data.GetAllConsoleAliasesLength.Length = 0; + + Status = CsrClientCallServer(&Request, + NULL, + CsrRequest, + sizeof(CSR_API_MESSAGE)); + + if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request.Status)) + { + SetLastErrorByStatus(Status); + return FALSE; + } + + return Request.Data.GetAllConsoleAliasesLength.Length; } @@ -594,7 +576,9 @@ if (lpExeName) BasepAnsiStringToHeapUnicodeString(lpExeName, (LPWSTR*) &lpExeNameW); - dwRetVal = (GetConsoleAliasesLengthW(lpExeNameW) / sizeof(WCHAR)); + dwRetVal = GetConsoleAliasesLengthW(lpExeNameW); + if (dwRetVal) + dwRetVal /= sizeof(WCHAR); /* Clean up */ if (lpExeNameW)

1 0

[janderwald] 32117: - implement GetConsoleAlias* AddConsoleAlias function in csrss -
by janderwald＠svn.reactos.org 04 Feb '08

04 Feb '08

Author: janderwald Date: Mon Feb 4 21:57:19 2008 New Revision: 32117 URL: http://svn.reactos.org/svn/reactos?rev=32117&view=rev Log: - implement GetConsoleAlias* AddConsoleAlias function in csrss - Added: trunk/reactos/subsystems/win32/csrss/api/alias.c (with props) Modified: trunk/reactos/subsystems/win32/csrss/csrss.rbuild trunk/reactos/subsystems/win32/csrss/include/api.h trunk/reactos/subsystems/win32/csrss/init.c Added: trunk/reactos/subsystems/win32/csrss/api/alias.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/api… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/api/alias.c (added) +++ trunk/reactos/subsystems/win32/csrss/api/alias.c Mon Feb 4 21:57:19 2008 @@ -1,0 +1,475 @@ +/* $Id: init.c 31400 2007-12-22 17:18:32Z fireball $ + * PROJECT: ReactOS CSRSS + * LICENSE: GPL - See COPYING in the top level directory + * FILE: subsystems/win32/csrss/api/alias.c + * PURPOSE: CSRSS alias support functions + * COPYRIGHT: Christoph Wittich + * Johannes Anderwald + * + */ + + +/* INCLUDES ******************************************************************/ + +#include <csrss.h> + +#define NDEBUG +#include <debug.h> + +typedef struct tagALIAS_ENTRY +{ + LPCWSTR lpSource; + LPCWSTR lpTarget; + struct tagALIAS_ENTRY * Next; +}ALIAS_ENTRY, *PALIAS_ENTRY; + + +typedef struct tagALIAS_HEADER +{ + LPCWSTR lpExeName; + PALIAS_ENTRY Data; + struct tagALIAS_HEADER * Next; + +}ALIAS_HEADER, *PALIAS_HEADER; + +static PALIAS_HEADER RootHeader = NULL; + +static +PALIAS_HEADER +IntFindAliasHeader(PALIAS_HEADER RootHeader, LPCWSTR lpExeName) +{ + while(RootHeader) + { + INT diff = _wcsicmp(RootHeader->lpExeName, lpExeName); + if (!diff) + return RootHeader; + + if (diff < 0) + break; + + RootHeader = RootHeader->Next; + } + return NULL; +} + +PALIAS_HEADER +IntCreateAliasHeader(LPCWSTR lpExeName) +{ + PALIAS_HEADER Entry; + UINT dwLength = wcslen(lpExeName) + 1; + + Entry = RtlAllocateHeap(CsrssApiHeap, 0, sizeof(ALIAS_HEADER) + sizeof(WCHAR) * dwLength); + if (!Entry) + return Entry; + + Entry->lpExeName = (LPCWSTR)(Entry + sizeof(ALIAS_HEADER)); + wcscpy((WCHAR*)Entry->lpExeName, lpExeName); + Entry->Next = NULL; + return Entry; +} + +VOID +IntInsertAliasHeader(PALIAS_HEADER * RootHeader, PALIAS_HEADER NewHeader) +{ + PALIAS_HEADER CurrentHeader; + PALIAS_HEADER LastHeader = NULL; + + if (*RootHeader == 0) + { + *RootHeader = NewHeader; + return; + } + + CurrentHeader = *RootHeader; + + while(CurrentHeader) + { + INT Diff = _wcsicmp(NewHeader->lpExeName, CurrentHeader->lpExeName); + if (Diff < 0) + { + if (!LastHeader) + *RootHeader = NewHeader; + else + LastHeader->Next = NewHeader; + + NewHeader->Next = CurrentHeader; + return; + } + LastHeader = CurrentHeader; + CurrentHeader = CurrentHeader->Next; + } + + LastHeader->Next = NewHeader; + NewHeader->Next = NULL; +} + +PALIAS_ENTRY +IntGetAliasEntry(PALIAS_HEADER Header, LPCWSTR lpSrcName) +{ + PALIAS_ENTRY RootHeader = Header->Data; + while(RootHeader) + { + INT diff = _wcsicmp(RootHeader->lpSource, lpSrcName); + if (!diff) + return RootHeader; + + if (diff < 0) + break; + + RootHeader = RootHeader->Next; + } + return NULL; +} + + +VOID +IntInsertAliasEntry(PALIAS_HEADER Header, PALIAS_ENTRY NewEntry) +{ + PALIAS_ENTRY CurrentEntry; + PALIAS_ENTRY LastEntry = NULL; + + CurrentEntry = Header->Data; + + if (!CurrentEntry) + { + Header->Data = NewEntry; + return; + } + + while(CurrentEntry) + { + INT Diff = _wcsicmp(NewEntry->lpSource, CurrentEntry->lpSource); + if (Diff < 0) + { + if (!LastEntry) + Header->Data = NewEntry; + else + LastEntry->Next = NewEntry; + NewEntry->Next = CurrentEntry; + return; + } + LastEntry = CurrentEntry; + CurrentEntry = CurrentEntry->Next; + } + + LastEntry->Next = NewEntry; + NewEntry->Next = NULL; +} + +PALIAS_ENTRY +IntCreateAliasEntry(LPCWSTR lpSource, LPCWSTR lpTarget) +{ + UINT dwSource; + UINT dwTarget; + PALIAS_ENTRY Entry; + + dwSource = wcslen(lpSource) + 1; + dwTarget = wcslen(lpTarget) + 1; + + Entry = RtlAllocateHeap(CsrssApiHeap, 0, sizeof(ALIAS_ENTRY) + sizeof(WCHAR) * (dwSource + dwTarget)); + if (!Entry) + return Entry; + + Entry->lpSource = (LPCWSTR)(Entry + sizeof(ALIAS_ENTRY)); + wcscpy((LPWSTR)Entry->lpSource, lpSource); + Entry->lpTarget = Entry->lpSource + dwSource; + wcscpy((LPWSTR)Entry->lpTarget, lpTarget); + Entry->Next = NULL; + + return Entry; +} + +UINT +IntGetConsoleAliasesExesLength(PALIAS_HEADER RootHeader) +{ + UINT length = 0; + + while(RootHeader) + { + length += (wcslen(RootHeader->lpExeName) + 1) * sizeof(WCHAR); + } + if (length) + length++; // last entry entry is terminated with 2 zero bytes + + return length; +} + +UINT +IntGetConsoleAliasesExes(PALIAS_HEADER RootHeader, LPWSTR TargetBuffer, UINT TargetBufferSize) +{ + UINT Offset = 0; + UINT Length; + + TargetBufferSize /= sizeof(WCHAR); + while(RootHeader) + { + Length = wcslen(RootHeader->lpExeName) + 1; + if (TargetBufferSize > Offset + Length) + { + wcscpy(&TargetBuffer[Offset], RootHeader->lpExeName); + Offset += Length; + } + else + { + break; + } + RootHeader = RootHeader->Next; + } + Length = min(Offset+1, TargetBufferSize); + TargetBuffer[Length] = L'\0'; + return Length * sizeof(WCHAR); +} + +UINT +IntGetAllConsoleAliasesLength(PALIAS_HEADER Header) +{ + UINT Length = 0; + PALIAS_ENTRY CurEntry = Header->Data; + + while(CurEntry) + { + Length += wcslen(CurEntry->lpSource); + Length += wcslen(CurEntry->lpTarget); + Length += 2; // zero byte and '=' + } + if (Length) + Length++; // extra zero + + return sizeof(WCHAR) * Length; +} +UINT +IntGetAllConsoleAliases(PALIAS_HEADER Header, LPWSTR TargetBuffer, UINT TargetBufferLength) +{ + PALIAS_ENTRY CurEntry = Header->Data; + UINT Offset = 0; + UINT SrcLength, TargetLength; + + TargetBufferLength /= sizeof(WCHAR); + while(CurEntry) + { + SrcLength = wcslen(CurEntry->lpSource) + 1; + TargetLength = wcslen(CurEntry->lpTarget) + 1; + if (Offset + TargetLength + SrcLength >= TargetBufferLength) + break; + + wcscpy(&TargetBuffer[Offset], CurEntry->lpSource); + Offset += SrcLength; + TargetBuffer[Offset] = L'='; + wcscpy(&TargetBuffer[Offset], CurEntry->lpTarget); + Offset += TargetLength; + + CurEntry = CurEntry->Next; + } + TargetBuffer[Offset] = L'\0'; + return Offset * sizeof(WCHAR); +} +VOID +IntDeleteAliasEntry(PALIAS_HEADER Header, PALIAS_ENTRY Entry) +{ + PALIAS_ENTRY LastEntry; + PALIAS_ENTRY CurEntry; + + if (Header->Data == Entry) + { + Header->Data = Entry->Next; + RtlFreeHeap(CsrssApiHeap, 0, Entry); + return; + } + LastEntry = Header->Data; + CurEntry = LastEntry->Next; + + while(CurEntry) + { + if (CurEntry == Entry) + { + LastEntry->Next = Entry->Next; + RtlFreeHeap(CsrssApiHeap, 0, Entry); + return; + } + LastEntry = CurEntry; + CurEntry = CurEntry->Next; + } +} + +CSR_API(CsrAddConsoleAlias) +{ + PALIAS_HEADER Header; + PALIAS_ENTRY Entry; + + if (Request->Data.AddConsoleAlias.lpExeName == NULL || Request->Data.AddConsoleAlias.lpSource == NULL) + { + Request->Status = STATUS_INVALID_PARAMETER; + return Request->Status; + } + + Header = IntFindAliasHeader(RootHeader, Request->Data.AddConsoleAlias.lpExeName); + if (!Header) + { + Header = IntCreateAliasHeader(Request->Data.AddConsoleAlias.lpExeName); + if (!Header) + { + Request->Status = STATUS_INSUFFICIENT_RESOURCES; + return STATUS_INSUFFICIENT_RESOURCES; + } + } + + if (Request->Data.AddConsoleAlias.lpTarget == NULL) // delete the entry + { + Entry = IntGetAliasEntry(Header, Request->Data.AddConsoleAlias.lpSource); + if (Entry) + { + IntDeleteAliasEntry(Header, Entry); + Request->Status = STATUS_SUCCESS; + } + else + { + Request->Status = STATUS_INVALID_PARAMETER; + } + + return Request->Status; + } + + Entry = IntCreateAliasEntry(Request->Data.AddConsoleAlias.lpSource, + Request->Data.AddConsoleAlias.lpTarget); + + if (!Entry) + { + Request->Status = STATUS_INSUFFICIENT_RESOURCES; + return STATUS_INSUFFICIENT_RESOURCES; + } + + IntInsertAliasEntry(Header, Entry); + + Request->Status = STATUS_SUCCESS; + return Request->Status; +} + +CSR_API(CsrGetConsoleAlias) +{ + PALIAS_HEADER Header; + PALIAS_ENTRY Entry; + UINT Length; + + if (Request->Data.GetConsoleAlias.lpExeName == NULL || Request->Data.GetConsoleAlias.TargetBuffer == NULL || + Request->Data.GetConsoleAlias.TargetBufferLength == 0 || Request->Data.GetConsoleAlias.lpSource == NULL) + { + Request->Status = STATUS_INVALID_PARAMETER; + return Request->Status; + } + + Header = IntFindAliasHeader(RootHeader, Request->Data.GetAllConsoleAlias.lpExeName); + if (!Header) + { + Request->Status = ERROR_NO_DATA; // FIXME + return ERROR_NO_DATA; + } + + Entry = IntGetAliasEntry(Header, Request->Data.GetConsoleAlias.lpSource); + if (!Entry) + { + Request->Status = ERROR_NO_DATA; // FIXME + return ERROR_NO_DATA; + } + + Length = (wcslen(Entry->lpTarget)+1) * sizeof(WCHAR); + if (Length > Request->Data.GetConsoleAlias.TargetBufferLength) + { + Request->Status = ERROR_INSUFFICIENT_BUFFER; + return ERROR_INSUFFICIENT_BUFFER; + } + wcscpy(Request->Data.GetConsoleAlias.TargetBuffer, Entry->lpTarget); + Request->Data.GetConsoleAlias.BytesWritten = Length; + Request->Status = STATUS_SUCCESS; + return STATUS_SUCCESS; +} + +CSR_API(CsrGetAllConsoleAliases) +{ + ULONG BytesWritten; + PALIAS_HEADER Header; + + if (Request->Data.GetAllConsoleAlias.lpExeName == NULL) + { + Request->Status = STATUS_INVALID_PARAMETER; + return Request->Status; + } + + Header = IntFindAliasHeader(RootHeader, Request->Data.GetAllConsoleAlias.lpExeName); + if (!Header) + { + Request->Status = ERROR_NO_DATA; // FIXME + return ERROR_NO_DATA; + } + + if (IntGetAllConsoleAliasesLength(Header) > Request->Data.GetAllConsoleAlias.AliasBufferLength) + { + Request->Status = ERROR_INSUFFICIENT_BUFFER; + return ERROR_INSUFFICIENT_BUFFER; + } + + BytesWritten = IntGetAllConsoleAliases(Header, + Request->Data.GetAllConsoleAlias.AliasBuffer, + Request->Data.GetAllConsoleAlias.AliasBufferLength); + + Request->Data.GetAllConsoleAlias.BytesWritten = BytesWritten; + Request->Status = STATUS_SUCCESS; + return STATUS_SUCCESS; +} + +CSR_API(CsrGetAllConsoleAliasesLength) +{ + PALIAS_HEADER Header; + UINT Length; + + if (Request->Data.GetAllConsoleAliasesLength.lpExeName == NULL) + { + Request->Status = STATUS_INVALID_PARAMETER; + return Request->Status; + } + + Header = IntFindAliasHeader(RootHeader, Request->Data.GetAllConsoleAliasesLength.lpExeName); + if (!Header) + { + Request->Status = ERROR_NO_DATA; // FIXME + return ERROR_NO_DATA; + } + + Length = IntGetAllConsoleAliasesLength(Header); + Request->Data.GetAllConsoleAliasesLength.Length = Length; + Request->Status = STATUS_SUCCESS; + return STATUS_SUCCESS; + +} + +CSR_API(CsrGetConsoleAliasesExes) +{ + UINT BytesWritten; + UINT ExesLength = IntGetConsoleAliasesExesLength(RootHeader); + + if (ExesLength > Request->Data.GetConsoleAliasesExes.Length) + { + Request->Status = ERROR_INSUFFICIENT_BUFFER; + return ERROR_INSUFFICIENT_BUFFER; + } + + if (Request->Data.GetConsoleAliasesExes.ExeNames == NULL) + { + Request->Status = STATUS_INVALID_PARAMETER; + return Request->Status; + } + + BytesWritten = IntGetConsoleAliasesExes(RootHeader, + Request->Data.GetConsoleAliasesExes.ExeNames, + Request->Data.GetConsoleAliasesExes.Length); + + Request->Data.GetConsoleAliasesExes.BytesWritten = BytesWritten; + Request->Status = STATUS_SUCCESS; + return Request->Status; +} + +CSR_API(CsrGetConsoleAliasesExesLength) +{ + Request->Status = STATUS_SUCCESS; + Request->Data.GetConsoleAliasesExesLength.Length = IntGetConsoleAliasesExesLength(RootHeader); + return STATUS_SUCCESS; +} Propchange: trunk/reactos/subsystems/win32/csrss/api/alias.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/subsystems/win32/csrss/csrss.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrss.rbuild (original) +++ trunk/reactos/subsystems/win32/csrss/csrss.rbuild Mon Feb 4 21:57:19 2008 @@ -11,11 +11,13 @@ <library>nt</library> <library>ntdll</library> <library>smdll</library> + <library>msvcrt</library> <directory name="api"> <file>handle.c</file> <file>process.c</file> <file>user.c</file> <file>wapi.c</file> + <file>alias.c</file> </directory> <pch>csrss.h</pch> <file>csrss.c</file> Modified: trunk/reactos/subsystems/win32/csrss/include/api.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/inc… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/include/api.h (original) +++ trunk/reactos/subsystems/win32/csrss/include/api.h Mon Feb 4 21:57:19 2008 @@ -149,6 +149,14 @@ CSR_API(CsrSetLogonNotifyWindow); CSR_API(CsrRegisterLogonProcess); +CSR_API(CsrAddConsoleAlias); +CSR_API(CsrGetConsoleAlias); +CSR_API(CsrGetAllConsoleAliases); +CSR_API(CsrGetAllConsoleAliasesLength); +CSR_API(CsrGetConsoleAliasesExes); +CSR_API(CsrGetConsoleAliasesExesLength); + + #endif /* ndef API_H_INCLUDED */ /* EOF */ Modified: trunk/reactos/subsystems/win32/csrss/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/ini… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/init.c (original) +++ trunk/reactos/subsystems/win32/csrss/init.c Mon Feb 4 21:57:19 2008 @@ -293,6 +293,12 @@ CSRSS_DEFINE_API(VERIFY_HANDLE, CsrVerifyHandle), CSRSS_DEFINE_API(DUPLICATE_HANDLE, CsrDuplicateHandle), CSRSS_DEFINE_API(GET_INPUT_WAIT_HANDLE, CsrGetInputWaitHandle), + CSRSS_DEFINE_API(ADD_CONSOLE_ALIAS, CsrAddConsoleAlias), + CSRSS_DEFINE_API(GET_CONSOLE_ALIAS, CsrGetConsoleAlias), + CSRSS_DEFINE_API(GET_ALL_CONSOLE_ALIASES, CsrGetAllConsoleAliases), + CSRSS_DEFINE_API(GET_ALL_CONSOLE_ALIASES_LENGTH, CsrGetAllConsoleAliasesLength), + CSRSS_DEFINE_API(GET_CONSOLE_ALIASES_EXES, CsrGetConsoleAliasesExes), + CSRSS_DEFINE_API(GET_CONSOLE_ALIASES_EXES_LENGTH, CsrGetConsoleAliasesExesLength), { 0, 0, NULL } };

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