Ros-diffs

ros-diffs@reactos.org

81390 discussions

[weiden] 18167: fixed pointer types differ in signedness warnings
by weiden＠svn.reactos.com 30 Sep '05

30 Sep '05

fixed pointer types differ in signedness warnings Modified: trunk/reactos/subsys/system/notepad/settings.c _____ Modified: trunk/reactos/subsys/system/notepad/settings.c --- trunk/reactos/subsys/system/notepad/settings.c 2005-09-30 11:25:32 UTC (rev 18166) +++ trunk/reactos/subsys/system/notepad/settings.c 2005-09-30 11:57:49 UTC (rev 18167) @@ -132,16 +132,16 @@ { QueryByte(hKey, "lfCharSet", &Globals.lfFont.lfCharSet); QueryByte(hKey, "lfClipPrecision", &Globals.lfFont.lfClipPrecision); - QueryDword(hKey, "lfEscapement", &Globals.lfFont.lfEscapement); + QueryDword(hKey, "lfEscapement", (DWORD*)&Globals.lfFont.lfEscapement); QueryString(hKey, "lfFaceName", Globals.lfFont.lfFaceName, sizeof(Globals.lfFont.lfFaceName) / sizeof(Globals.lfFont.lfFaceName[0])); QueryByte(hKey, "lfItalic", &Globals.lfFont.lfItalic); - QueryDword(hKey, "lfOrientation", &Globals.lfFont.lfOrientation); + QueryDword(hKey, "lfOrientation", (DWORD*)&Globals.lfFont.lfOrientation); QueryByte(hKey, "lfOutPrecision", &Globals.lfFont.lfOutPrecision); QueryByte(hKey, "lfPitchAndFamily", &Globals.lfFont.lfPitchAndFamily); QueryByte(hKey, "lfQuality", &Globals.lfFont.lfQuality); QueryByte(hKey, "lfStrikeOut", &Globals.lfFont.lfStrikeOut); QueryByte(hKey, "lfUnderline", &Globals.lfFont.lfUnderline); - QueryDword(hKey, "lfWeight", &Globals.lfFont.lfWeight); + QueryDword(hKey, "lfWeight", (DWORD*)&Globals.lfFont.lfWeight); QueryDword(hKey, "iPointSize", &dwPointSize); if (dwPointSize != 0)

1 0

[weiden] 18166: set eol-style to native
by weiden＠svn.reactos.com 30 Sep '05

30 Sep '05

set eol-style to native Modified: trunk/reactos/subsys/system/notepad/settings.c _____ Modified: trunk/reactos/subsys/system/notepad/settings.c --- trunk/reactos/subsys/system/notepad/settings.c 2005-09-30 11:07:15 UTC (rev 18165) +++ trunk/reactos/subsys/system/notepad/settings.c 2005-09-30 11:25:32 UTC (rev 18166) @@ -1,217 +1,217 @@ -/* - * Notepad (settings.c) - * - * Copyright 1998,99 Marcel Baur <mbaur(a)g26.ethz.ch> - * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> - * Copyright 2002 Andriy Palamarchuk - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#define UNICODE -#define _UNICODE - -#include <assert.h> -#include <stdio.h> -#include <windows.h> -#include <commdlg.h> -#include <tchar.h> - -#include "main.h" - -static const TCHAR s_szRegistryKey[] = { 'S','o','f','t','w','a','r','e', - '\\','M','i','c','r','o','s','o','f','t', - '\\','N','o','t','e','p','a','d',0 }; - - -static LONG HeightFromPointSize(DWORD dwPointSize) -{ - LONG lHeight; - HDC hDC; - - hDC = GetDC(NULL); - lHeight = -MulDiv(dwPointSize, GetDeviceCaps(hDC, LOGPIXELSY), 720); - ReleaseDC(NULL, hDC); - - return lHeight; -} - -static DWORD PointSizeFromHeight(LONG lHeight) -{ - DWORD dwPointSize; - HDC hDC; - - hDC = GetDC(NULL); - dwPointSize = -MulDiv(lHeight, 720, GetDeviceCaps(hDC, LOGPIXELSY)); - ReleaseDC(NULL, hDC); - - /* round to nearest multiple of 10 */ - dwPointSize += 5; - dwPointSize -= dwPointSize % 10; - - return dwPointSize; -} - -static BOOL QueryGeneric(HKEY hKey, LPCSTR pszValueName, DWORD dwExpectedType, - LPVOID pvResult, DWORD dwResultSize) -{ - WCHAR szValueW[32]; - LPCTSTR pszValueNameT; - DWORD dwType, cbData; - LPVOID *pTemp; - BOOL bSuccess = FALSE; - -#ifdef UNICODE - MultiByteToWideChar(CP_ACP, 0, pszValueName, -1, szValueW, sizeof(szValueW) / sizeof(szValueW[0])); - pszValueNameT = szValueW; -#else - pszValueNameT = pszValueName; -#endif - - pTemp = HeapAlloc(GetProcessHeap(), 0, dwResultSize); - if (!pTemp) - goto done; - memset(pTemp, 0, dwResultSize); - - cbData = dwResultSize; - if (RegQueryValueEx(hKey, pszValueNameT, NULL, &dwType, (LPBYTE) pTemp, &cbData) != ERROR_SUCCESS) - goto done; - - if (dwType != dwExpectedType) - goto done; - - memcpy(pvResult, pTemp, cbData); - bSuccess = TRUE; - -done: - if (pTemp) - HeapFree(GetProcessHeap(), 0, pTemp); - return bSuccess; -} - -static BOOL QueryDword(HKEY hKey, LPCSTR pszValueName, DWORD *pdwResult) -{ - return QueryGeneric(hKey, pszValueName, REG_DWORD, pdwResult, sizeof(*pdwResult)); -} - -static BOOL QueryByte(HKEY hKey, LPCSTR pszValueName, BYTE *pbResult) -{ - DWORD dwResult; - if (!QueryGeneric(hKey, pszValueName, REG_DWORD, &dwResult, sizeof(dwResult))) - return FALSE; - if (dwResult >= 0x100) - return FALSE; - *pbResult = (BYTE) dwResult; - return TRUE; -} - -static BOOL QueryString(HKEY hKey, LPCSTR pszValueName, LPTSTR pszResult, DWORD dwResultSize) -{ - return QueryGeneric(hKey, pszValueName, REG_SZ, pszResult, dwResultSize * sizeof(*pszResult)); -} - -void LoadSettings(void) -{ - HKEY hKey = NULL; - HFONT hFont; - DWORD dwPointSize = 0; - - if (RegOpenKey(HKEY_CURRENT_USER, s_szRegistryKey, &hKey) == ERROR_SUCCESS) - { - QueryByte(hKey, "lfCharSet", &Globals.lfFont.lfCharSet); - QueryByte(hKey, "lfClipPrecision", &Globals.lfFont.lfClipPrecision); - QueryDword(hKey, "lfEscapement", &Globals.lfFont.lfEscapement); - QueryString(hKey, "lfFaceName", Globals.lfFont.lfFaceName, sizeof(Globals.lfFont.lfFaceName) / sizeof(Globals.lfFont.lfFaceName[0])); - QueryByte(hKey, "lfItalic", &Globals.lfFont.lfItalic); - QueryDword(hKey, "lfOrientation", &Globals.lfFont.lfOrientation); - QueryByte(hKey, "lfOutPrecision", &Globals.lfFont.lfOutPrecision); - QueryByte(hKey, "lfPitchAndFamily", &Globals.lfFont.lfPitchAndFamily); - QueryByte(hKey, "lfQuality", &Globals.lfFont.lfQuality); - QueryByte(hKey, "lfStrikeOut", &Globals.lfFont.lfStrikeOut); - QueryByte(hKey, "lfUnderline", &Globals.lfFont.lfUnderline); - QueryDword(hKey, "lfWeight", &Globals.lfFont.lfWeight); - QueryDword(hKey, "iPointSize", &dwPointSize); - - if (dwPointSize != 0) - Globals.lfFont.lfHeight = HeightFromPointSize(dwPointSize); - - hFont = CreateFontIndirect(&Globals.lfFont); - if (hFont) - { - if (Globals.hFont) - DeleteObject(Globals.hFont); - Globals.hFont = hFont; - } - - RegCloseKey(hKey); - } -} - -static BOOL SaveDword(HKEY hKey, LPCSTR pszValueName, DWORD dwValue) -{ - WCHAR szValueW[32]; - LPCTSTR pszValueNameT; - -#ifdef UNICODE - MultiByteToWideChar(CP_ACP, 0, pszValueName, -1, szValueW, sizeof(szValueW) / sizeof(szValueW[0])); - pszValueNameT = szValueW; -#else - pszValueNameT = pszValueName; -#endif - - return RegSetValueEx(hKey, pszValueNameT, 0, REG_DWORD, (LPBYTE) &dwValue, sizeof(dwValue)) == ERROR_SUCCESS; -} - -static BOOL SaveString(HKEY hKey, LPCSTR pszValueName, LPCTSTR pszValue) -{ - WCHAR szValueW[32]; - LPCTSTR pszValueNameT; - -#ifdef UNICODE - MultiByteToWideChar(CP_ACP, 0, pszValueName, -1, szValueW, sizeof(szValueW) / sizeof(szValueW[0])); - pszValueNameT = szValueW; -#else - pszValueNameT = pszValueName; -#endif - - return RegSetValueEx(hKey, pszValueNameT, 0, REG_SZ, (LPBYTE) pszValue, _tcslen(pszValue) * sizeof(*pszValue)) == ERROR_SUCCESS; -} - -void SaveSettings(void) -{ - HKEY hKey; - DWORD dwDisposition; - - if (RegCreateKeyEx(HKEY_CURRENT_USER, s_szRegistryKey, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &hKey, &dwDisposition) - == ERROR_SUCCESS) - { - SaveDword(hKey, "lfCharSet", Globals.lfFont.lfCharSet); - SaveDword(hKey, "lfClipPrecision", Globals.lfFont.lfClipPrecision); - SaveDword(hKey, "lfEscapement", Globals.lfFont.lfEscapement); - SaveString(hKey, "lfFaceName", Globals.lfFont.lfFaceName); - SaveDword(hKey, "lfItalic", Globals.lfFont.lfItalic); - SaveDword(hKey, "lfOrientation", Globals.lfFont.lfOrientation); - SaveDword(hKey, "lfOutPrecision", Globals.lfFont.lfOutPrecision); - SaveDword(hKey, "lfPitchAndFamily", Globals.lfFont.lfPitchAndFamily); - SaveDword(hKey, "lfQuality", Globals.lfFont.lfQuality); - SaveDword(hKey, "lfStrikeOut", Globals.lfFont.lfStrikeOut); - SaveDword(hKey, "lfUnderline", Globals.lfFont.lfUnderline); - SaveDword(hKey, "lfWeight", Globals.lfFont.lfWeight); - SaveDword(hKey, "iPointSize", PointSizeFromHeight(Globals.lfFont.lfHeight)); - - RegCloseKey(hKey); - } - -} +/* + * Notepad (settings.c) + * + * Copyright 1998,99 Marcel Baur <mbaur(a)g26.ethz.ch> + * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> + * Copyright 2002 Andriy Palamarchuk + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#define UNICODE +#define _UNICODE + +#include <assert.h> +#include <stdio.h> +#include <windows.h> +#include <commdlg.h> +#include <tchar.h> + +#include "main.h" + +static const TCHAR s_szRegistryKey[] = { 'S','o','f','t','w','a','r','e', + '\\','M','i','c','r','o','s','o','f','t', + '\\','N','o','t','e','p','a','d',0 }; + + +static LONG HeightFromPointSize(DWORD dwPointSize) +{ + LONG lHeight; + HDC hDC; + + hDC = GetDC(NULL); + lHeight = -MulDiv(dwPointSize, GetDeviceCaps(hDC, LOGPIXELSY), 720); + ReleaseDC(NULL, hDC); + + return lHeight; +} + +static DWORD PointSizeFromHeight(LONG lHeight) +{ + DWORD dwPointSize; + HDC hDC; + + hDC = GetDC(NULL); + dwPointSize = -MulDiv(lHeight, 720, GetDeviceCaps(hDC, LOGPIXELSY)); + ReleaseDC(NULL, hDC); + + /* round to nearest multiple of 10 */ + dwPointSize += 5; + dwPointSize -= dwPointSize % 10; + + return dwPointSize; +} + +static BOOL QueryGeneric(HKEY hKey, LPCSTR pszValueName, DWORD dwExpectedType, + LPVOID pvResult, DWORD dwResultSize) +{ + WCHAR szValueW[32]; + LPCTSTR pszValueNameT; + DWORD dwType, cbData; + LPVOID *pTemp; + BOOL bSuccess = FALSE; + +#ifdef UNICODE + MultiByteToWideChar(CP_ACP, 0, pszValueName, -1, szValueW, sizeof(szValueW) / sizeof(szValueW[0])); + pszValueNameT = szValueW; +#else + pszValueNameT = pszValueName; +#endif + + pTemp = HeapAlloc(GetProcessHeap(), 0, dwResultSize); + if (!pTemp) + goto done; + memset(pTemp, 0, dwResultSize); + + cbData = dwResultSize; + if (RegQueryValueEx(hKey, pszValueNameT, NULL, &dwType, (LPBYTE) pTemp, &cbData) != ERROR_SUCCESS) + goto done; + + if (dwType != dwExpectedType) + goto done; + + memcpy(pvResult, pTemp, cbData); + bSuccess = TRUE; + +done: + if (pTemp) + HeapFree(GetProcessHeap(), 0, pTemp); + return bSuccess; +} + +static BOOL QueryDword(HKEY hKey, LPCSTR pszValueName, DWORD *pdwResult) +{ + return QueryGeneric(hKey, pszValueName, REG_DWORD, pdwResult, sizeof(*pdwResult)); +} + +static BOOL QueryByte(HKEY hKey, LPCSTR pszValueName, BYTE *pbResult) +{ + DWORD dwResult; + if (!QueryGeneric(hKey, pszValueName, REG_DWORD, &dwResult, sizeof(dwResult))) + return FALSE; + if (dwResult >= 0x100) + return FALSE; + *pbResult = (BYTE) dwResult; + return TRUE; +} + +static BOOL QueryString(HKEY hKey, LPCSTR pszValueName, LPTSTR pszResult, DWORD dwResultSize) +{ + return QueryGeneric(hKey, pszValueName, REG_SZ, pszResult, dwResultSize * sizeof(*pszResult)); +} + +void LoadSettings(void) +{ + HKEY hKey = NULL; + HFONT hFont; + DWORD dwPointSize = 0; + + if (RegOpenKey(HKEY_CURRENT_USER, s_szRegistryKey, &hKey) == ERROR_SUCCESS) + { + QueryByte(hKey, "lfCharSet", &Globals.lfFont.lfCharSet); + QueryByte(hKey, "lfClipPrecision", &Globals.lfFont.lfClipPrecision); + QueryDword(hKey, "lfEscapement", &Globals.lfFont.lfEscapement); + QueryString(hKey, "lfFaceName", Globals.lfFont.lfFaceName, sizeof(Globals.lfFont.lfFaceName) / sizeof(Globals.lfFont.lfFaceName[0])); + QueryByte(hKey, "lfItalic", &Globals.lfFont.lfItalic); + QueryDword(hKey, "lfOrientation", &Globals.lfFont.lfOrientation); + QueryByte(hKey, "lfOutPrecision", &Globals.lfFont.lfOutPrecision); + QueryByte(hKey, "lfPitchAndFamily", &Globals.lfFont.lfPitchAndFamily); + QueryByte(hKey, "lfQuality", &Globals.lfFont.lfQuality); + QueryByte(hKey, "lfStrikeOut", &Globals.lfFont.lfStrikeOut); + QueryByte(hKey, "lfUnderline", &Globals.lfFont.lfUnderline); + QueryDword(hKey, "lfWeight", &Globals.lfFont.lfWeight); + QueryDword(hKey, "iPointSize", &dwPointSize); + + if (dwPointSize != 0) + Globals.lfFont.lfHeight = HeightFromPointSize(dwPointSize); + + hFont = CreateFontIndirect(&Globals.lfFont); + if (hFont) + { + if (Globals.hFont) + DeleteObject(Globals.hFont); + Globals.hFont = hFont; + } + + RegCloseKey(hKey); + } +} + +static BOOL SaveDword(HKEY hKey, LPCSTR pszValueName, DWORD dwValue) +{ + WCHAR szValueW[32]; + LPCTSTR pszValueNameT; + +#ifdef UNICODE + MultiByteToWideChar(CP_ACP, 0, pszValueName, -1, szValueW, sizeof(szValueW) / sizeof(szValueW[0])); + pszValueNameT = szValueW; +#else + pszValueNameT = pszValueName; +#endif + + return RegSetValueEx(hKey, pszValueNameT, 0, REG_DWORD, (LPBYTE) &dwValue, sizeof(dwValue)) == ERROR_SUCCESS; +} + +static BOOL SaveString(HKEY hKey, LPCSTR pszValueName, LPCTSTR pszValue) +{ + WCHAR szValueW[32]; + LPCTSTR pszValueNameT; + +#ifdef UNICODE + MultiByteToWideChar(CP_ACP, 0, pszValueName, -1, szValueW, sizeof(szValueW) / sizeof(szValueW[0])); + pszValueNameT = szValueW; +#else + pszValueNameT = pszValueName; +#endif + + return RegSetValueEx(hKey, pszValueNameT, 0, REG_SZ, (LPBYTE) pszValue, _tcslen(pszValue) * sizeof(*pszValue)) == ERROR_SUCCESS; +} + +void SaveSettings(void) +{ + HKEY hKey; + DWORD dwDisposition; + + if (RegCreateKeyEx(HKEY_CURRENT_USER, s_szRegistryKey, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &hKey, &dwDisposition) + == ERROR_SUCCESS) + { + SaveDword(hKey, "lfCharSet", Globals.lfFont.lfCharSet); + SaveDword(hKey, "lfClipPrecision", Globals.lfFont.lfClipPrecision); + SaveDword(hKey, "lfEscapement", Globals.lfFont.lfEscapement); + SaveString(hKey, "lfFaceName", Globals.lfFont.lfFaceName); + SaveDword(hKey, "lfItalic", Globals.lfFont.lfItalic); + SaveDword(hKey, "lfOrientation", Globals.lfFont.lfOrientation); + SaveDword(hKey, "lfOutPrecision", Globals.lfFont.lfOutPrecision); + SaveDword(hKey, "lfPitchAndFamily", Globals.lfFont.lfPitchAndFamily); + SaveDword(hKey, "lfQuality", Globals.lfFont.lfQuality); + SaveDword(hKey, "lfStrikeOut", Globals.lfFont.lfStrikeOut); + SaveDword(hKey, "lfUnderline", Globals.lfFont.lfUnderline); + SaveDword(hKey, "lfWeight", Globals.lfFont.lfWeight); + SaveDword(hKey, "iPointSize", PointSizeFromHeight(Globals.lfFont.lfHeight)); + + RegCloseKey(hKey); + } + +} Property changes on: trunk/reactos/subsys/system/notepad/settings.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native

1 0

[hpoussin] 18165: Add newdev.dll, and implement DevInstallW function.
by hpoussin＠svn.reactos.com 30 Sep '05

30 Sep '05

Add newdev.dll, and implement DevInstallW function. It permits to install devices from command line. ATM, very little functionality is supported. Modified: trunk/reactos/lib/directory.xml Added: trunk/reactos/lib/newdev/ Added: trunk/reactos/lib/newdev/newdev.c Added: trunk/reactos/lib/newdev/newdev.def Added: trunk/reactos/lib/newdev/newdev.xml _____ Modified: trunk/reactos/lib/directory.xml --- trunk/reactos/lib/directory.xml 2005-09-30 02:53:34 UTC (rev 18164) +++ trunk/reactos/lib/directory.xml 2005-09-30 11:07:15 UTC (rev 18165) @@ -164,6 +164,9 @@ <directory name="netapi32"> <xi:include href="netapi32/netapi32.xml" /> </directory> +<directory name="newdev"> + <xi:include href="newdev/newdev.xml" /> +</directory> <directory name="ntdll"> <xi:include href="ntdll/ntdll.xml" /> </directory> Property changes on: trunk/reactos/lib/newdev ___________________________________________________________________ Name: svn:ignore + GNUmakefile _____ Added: trunk/reactos/lib/newdev/newdev.c --- trunk/reactos/lib/newdev/newdev.c 2005-09-30 02:53:34 UTC (rev 18164) +++ trunk/reactos/lib/newdev/newdev.c 2005-09-30 11:07:15 UTC (rev 18165) @@ -0,0 +1,218 @@ +/* + * ReactOS New devices installation + * Copyright (C) 2004 ReactOS Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +/* + * PROJECT: ReactOS New devices installation + * FILE: lib/newdev/newdev.c + * PURPOSE: New devices installation + * PROGRAMMER: HervÚ Poussineau (hpoussin(a)reactos.org) + */ + +#include <windows.h> +#include <setupapi.h> + +ULONG DbgPrint(PCH Format,...); +#define UNIMPLEMENTED \ + DbgPrint("NEWDEV: %s at %s:%d is UNIMPLEMENTED!\n",__FUNCTION__,__FILE__,__LINE__) +#define DPRINT1 DbgPrint("(%s:%d) ", __FILE__, __LINE__), DbgPrint + +BOOL +DevInstallW( + IN HWND Hwnd, + IN HINSTANCE Handle, + IN LPCWSTR InstanceId, + IN INT Show) +{ + HDEVINFO hDevInfo; + SP_DEVINFO_DATA devInfoData; + SP_DRVINFO_DATA_W drvInfoData; + DWORD index; + BOOL ret; + + DbgPrint("OK\n"); + DbgPrint("Installing device %S\n", InstanceId); + + hDevInfo = SetupDiCreateDeviceInfoListExW(NULL, NULL, NULL, NULL); + if (hDevInfo == INVALID_HANDLE_VALUE) + { + DPRINT1("SetupDiCreateDeviceInfoListExW() failed with error 0x%lx\n", GetLastError()); + return FALSE; + } + + devInfoData.cbSize = sizeof(SP_DEVINFO_DATA); + ret = SetupDiOpenDeviceInfoW( + hDevInfo, + InstanceId, + NULL, + 0, /* Open flags */ + &devInfoData); + if (!ret) + { + DPRINT1("SetupDiOpenDeviceInfoW() failed with error 0x%lx\n", GetLastError()); + return FALSE; + } + + ret = SetupDiBuildDriverInfoList(hDevInfo, &devInfoData, SPDIT_COMPATDRIVER); + if (!ret) + { + DPRINT1("SetupDiBuildDriverInfoList() failed with error 0x%lx\n", GetLastError()); + return FALSE; + } + +#ifndef NDEBUG + ret = TRUE; + index = 0; + drvInfoData.cbSize = sizeof(SP_DRVINFO_DATA_W); + while (ret) + { + ret = SetupDiEnumDriverInfoW( + hDevInfo, + &devInfoData, + SPDIT_COMPATDRIVER, + index, + &drvInfoData); + if (!ret) + { + if (GetLastError() != ERROR_NO_MORE_ITEMS) + { + DPRINT1("SetupDiEnumDriverInfoW() failed with error 0x%lx\n", GetLastError()); + return FALSE; + } + break; + } + index++; + DPRINT1("- %S: %S\n", drvInfoData.MfgName, drvInfoData.Description); + } +#endif + + ret = SetupDiCallClassInstaller( + DIF_SELECTBESTCOMPATDRV, + hDevInfo, + &devInfoData); + if (!ret) + { + DPRINT1("SetupDiCallClassInstaller(DIF_SELECTBESTCOMPATDRV) failed with error 0x%lx\n", GetLastError()); + return FALSE; + } + + ret = SetupDiCallClassInstaller( + DIF_ALLOW_INSTALL, + hDevInfo, + &devInfoData); + if (!ret) + { + DPRINT1("SetupDiCallClassInstaller(DIF_ALLOW_INSTALL) failed with error 0x%lx\n", GetLastError()); + return FALSE; + } + + ret = SetupDiCallClassInstaller( + DIF_NEWDEVICEWIZARD_PREANALYZE, + hDevInfo, + &devInfoData); + if (!ret) + { + DPRINT1("SetupDiCallClassInstaller(DIF_NEWDEVICEWIZARD_PREANALYZE) failed with error 0x%lx\n", GetLastError()); + return FALSE; + } + + ret = SetupDiCallClassInstaller( + DIF_NEWDEVICEWIZARD_POSTANALYZE, + hDevInfo, + &devInfoData); + if (!ret) + { + DPRINT1("SetupDiCallClassInstaller(DIF_NEWDEVICEWIZARD_POSTANALYZE) failed with error 0x%lx\n", GetLastError()); + return FALSE; + } + + ret = SetupDiCallClassInstaller( + DIF_INSTALLDEVICEFILES, + hDevInfo, + &devInfoData); + if (!ret) + { + DPRINT1("SetupDiCallClassInstaller(DIF_INSTALLDEVICEFILES) failed with error 0x%lx\n", GetLastError()); + return FALSE; + } + + ret = SetupDiCallClassInstaller( + DIF_REGISTER_COINSTALLERS, + hDevInfo, + &devInfoData); + if (!ret) + { + DPRINT1("SetupDiCallClassInstaller(DIF_REGISTER_COINSTALLERS) failed with error 0x%lx\n", GetLastError()); + return FALSE; + } + + ret = SetupDiCallClassInstaller( + DIF_INSTALLINTERFACES, + hDevInfo, + &devInfoData); + if (!ret) + { + DPRINT1("SetupDiCallClassInstaller(DIF_INSTALLINTERFACES) failed with error 0x%lx\n", GetLastError()); + return FALSE; + } + + ret = SetupDiCallClassInstaller( + DIF_INSTALLDEVICE, + hDevInfo, + &devInfoData); + if (!ret) + { + DPRINT1("SetupDiCallClassInstaller(DIF_INSTALLDEVICE) failed with error 0x%lx\n", GetLastError()); + return FALSE; + } + + ret = SetupDiCallClassInstaller( + DIF_NEWDEVICEWIZARD_FINISHINSTALL, + hDevInfo, + &devInfoData); + if (!ret) + { + DPRINT1("SetupDiCallClassInstaller(DIF_NEWDEVICEWIZARD_FINISHINSTALL) failed with error 0x%lx\n", GetLastError()); + return FALSE; + } + + ret = SetupDiCallClassInstaller( + DIF_DESTROYPRIVATEDATA, + hDevInfo, + &devInfoData); + if (!ret) + { + DPRINT1("SetupDiCallClassInstaller(DIF_DESTROYPRIVATEDATA) failed with error 0x%lx\n", GetLastError()); + return FALSE; + } + + ret = SetupDiDestroyDriverInfoList(hDevInfo, &devInfoData, SPDIT_COMPATDRIVER); + if (!ret) + { + DPRINT1("SetupDiDestroyDriverInfoList() failed with error 0x%lx\n", GetLastError()); + return FALSE; + } + + ret = SetupDiDestroyDeviceInfoList(hDevInfo); + if (!ret) + { + DPRINT1("SetupDiDestroyDeviceInfoList() failed with error 0x%lx\n", GetLastError()); + return FALSE; + } + + return TRUE; +} Property changes on: trunk/reactos/lib/newdev/newdev.c ___________________________________________________________________ Name: svn:keywords + author date revision Name: svn:eol-style + native _____ Added: trunk/reactos/lib/newdev/newdev.def --- trunk/reactos/lib/newdev/newdev.def 2005-09-30 02:53:34 UTC (rev 18164) +++ trunk/reactos/lib/newdev/newdev.def 2005-09-30 11:07:15 UTC (rev 18165) @@ -0,0 +1,16 @@ +LIBRARY newdev.dll + +EXPORTS +DevInstallW +;InstallDevInst +;InstallDevInstEx +;InstallNewDevice +;InstallSelectedDevice +;InstallSelectedDriver +;InstallWindowsUpdateDriver +;RollbackDriver +;UpdateDriverForPlugAndPlayDevicesA +;UpdateDriverForPlugAndPlayDevicesA@20=UpdateDriverForPlugAndPlayDevice sA +;UpdateDriverForPlugAndPlayDevicesW + +;EOF \ No newline at end of file _____ Added: trunk/reactos/lib/newdev/newdev.xml --- trunk/reactos/lib/newdev/newdev.xml 2005-09-30 02:53:34 UTC (rev 18164) +++ trunk/reactos/lib/newdev/newdev.xml 2005-09-30 11:07:15 UTC (rev 18165) @@ -0,0 +1,6 @@ +<module name="newdev" type="win32dll" installbase="system32" installname="newdev.dll"> + <importlibrary definition="newdev.def" /> + <file>newdev.c</file> + <library>ntdll</library> + <library>setupapi</library> +</module> Property changes on: trunk/reactos/lib/newdev/newdev.xml ___________________________________________________________________ Name: svn:keywords + author date revision Name: svn:eol-style + native

1 0

[npwoods] 18164: Notepad:
by npwoods＠svn.reactos.com 30 Sep '05

30 Sep '05

Notepad: 1. Fixed syntax errors in the ES and NL localizations 2. Added code to save and restore settings; just the font for now Modified: trunk/reactos/subsys/system/notepad/Es.rc Modified: trunk/reactos/subsys/system/notepad/Nl.rc Modified: trunk/reactos/subsys/system/notepad/main.c Modified: trunk/reactos/subsys/system/notepad/main.h Modified: trunk/reactos/subsys/system/notepad/notepad.xml Modified: trunk/reactos/subsys/system/notepad/rsrc.rc Added: trunk/reactos/subsys/system/notepad/settings.c _____ Modified: trunk/reactos/subsys/system/notepad/Es.rc --- trunk/reactos/subsys/system/notepad/Es.rc 2005-09-30 01:47:46 UTC (rev 18163) +++ trunk/reactos/subsys/system/notepad/Es.rc 2005-09-30 02:53:34 UTC (rev 18164) @@ -55,8 +55,6 @@ MENUITEM "&Ajuste de lÝnea", CMD_WRAP MENUITEM "Tipo de &letra...", CMD_FONT } -POPUP "&Buscar" { - } POPUP "A&yuda" { MENUITEM "?&ndice", CMD_HELP_CONTENTS MENUITEM "&Buscar...", CMD_HELP_SEARCH _____ Modified: trunk/reactos/subsys/system/notepad/Nl.rc --- trunk/reactos/subsys/system/notepad/Nl.rc 2005-09-30 01:47:46 UTC (rev 18163) +++ trunk/reactos/subsys/system/notepad/Nl.rc 2005-09-30 02:53:34 UTC (rev 18164) @@ -1,4 +1,4 @@ -´??/* +/* * Notepad (Dutch resources) * * Copyright 2003 Hans Leidekker @@ -38,7 +38,7 @@ MENUITEM "&Ongedaan maken\tCtrl+Z", CMD_UNDO MENUITEM SEPARATOR MENUITEM "K&nippen\tCtrl+X", CMD_CUT - MENUITEM "&Kopi?½ren\tCtrl+C", CMD_COPY + MENUITEM "&KopiÙren\tCtrl+C", CMD_COPY MENUITEM "&Plakken\tCtrl+V", CMD_PASTE MENUITEM "&Verwijderen\tDel", CMD_DELETE MENUITEM SEPARATOR _____ Modified: trunk/reactos/subsys/system/notepad/main.c --- trunk/reactos/subsys/system/notepad/main.c 2005-09-30 01:47:46 UTC (rev 18163) +++ trunk/reactos/subsys/system/notepad/main.c 2005-09-30 02:53:34 UTC (rev 18164) @@ -292,6 +292,8 @@ if (!Globals.hEdit) return -1; SendMessage(Globals.hEdit, EM_LIMITTEXT, 0, 0); + if (Globals.hFont) + SendMessage(Globals.hEdit, WM_SETFONT, (WPARAM)Globals.hFont, (LPARAM)TRUE); break; } @@ -492,6 +494,7 @@ ZeroMemory(&Globals, sizeof(Globals)); Globals.hInstance = hInstance; + LoadSettings(); ZeroMemory(&class, sizeof(class)); class.cbSize = sizeof(class); @@ -537,5 +540,6 @@ DispatchMessage(&msg); } } + SaveSettings(); return msg.wParam; } _____ Modified: trunk/reactos/subsys/system/notepad/main.h --- trunk/reactos/subsys/system/notepad/main.h 2005-09-30 01:47:46 UTC (rev 18163) +++ trunk/reactos/subsys/system/notepad/main.h 2005-09-30 02:53:34 UTC (rev 18164) @@ -73,4 +73,8 @@ BOOL ReadText(HANDLE hFile, LPWSTR *ppszText, DWORD *pdwTextLen, int *piEncoding, int *piEoln); BOOL WriteText(HANDLE hFile, LPCWSTR pszText, DWORD dwTextLen, int iEncoding, int iEoln); +/* from settings.c */ +void LoadSettings(void); +void SaveSettings(void); + _____ Modified: trunk/reactos/subsys/system/notepad/notepad.xml --- trunk/reactos/subsys/system/notepad/notepad.xml 2005-09-30 01:47:46 UTC (rev 18163) +++ trunk/reactos/subsys/system/notepad/notepad.xml 2005-09-30 02:53:34 UTC (rev 18164) @@ -11,5 +11,6 @@ <file>license.c</file> <file>main.c</file> <file>text.c</file> + <file>settings.c</file> <file>rsrc.rc</file> </module> _____ Modified: trunk/reactos/subsys/system/notepad/rsrc.rc --- trunk/reactos/subsys/system/notepad/rsrc.rc 2005-09-30 01:47:46 UTC (rev 18163) +++ trunk/reactos/subsys/system/notepad/rsrc.rc 2005-09-30 02:53:34 UTC (rev 18164) @@ -31,7 +31,7 @@ "^C", CMD_COPY "^F", CMD_SEARCH "^G", CMD_GOTO - "^H", CMD_REPLACE + "H", CMD_REPLACE, VIRTKEY, CONTROL "^O", CMD_OPEN "^S", CMD_SAVE "^V", CMD_PASTE _____ Added: trunk/reactos/subsys/system/notepad/settings.c --- trunk/reactos/subsys/system/notepad/settings.c 2005-09-30 01:47:46 UTC (rev 18163) +++ trunk/reactos/subsys/system/notepad/settings.c 2005-09-30 02:53:34 UTC (rev 18164) @@ -0,0 +1,217 @@ +/* + * Notepad (settings.c) + * + * Copyright 1998,99 Marcel Baur <mbaur(a)g26.ethz.ch> + * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> + * Copyright 2002 Andriy Palamarchuk + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#define UNICODE +#define _UNICODE + +#include <assert.h> +#include <stdio.h> +#include <windows.h> +#include <commdlg.h> +#include <tchar.h> + +#include "main.h" + +static const TCHAR s_szRegistryKey[] = { 'S','o','f','t','w','a','r','e', + '\\','M','i','c','r','o','s','o','f','t', + '\\','N','o','t','e','p','a','d',0 }; + + +static LONG HeightFromPointSize(DWORD dwPointSize) +{ + LONG lHeight; + HDC hDC; + + hDC = GetDC(NULL); + lHeight = -MulDiv(dwPointSize, GetDeviceCaps(hDC, LOGPIXELSY), 720); + ReleaseDC(NULL, hDC); + + return lHeight; +} + +static DWORD PointSizeFromHeight(LONG lHeight) +{ + DWORD dwPointSize; + HDC hDC; + + hDC = GetDC(NULL); + dwPointSize = -MulDiv(lHeight, 720, GetDeviceCaps(hDC, LOGPIXELSY)); + ReleaseDC(NULL, hDC); + + /* round to nearest multiple of 10 */ + dwPointSize += 5; + dwPointSize -= dwPointSize % 10; + + return dwPointSize; +} + +static BOOL QueryGeneric(HKEY hKey, LPCSTR pszValueName, DWORD dwExpectedType, + LPVOID pvResult, DWORD dwResultSize) +{ + WCHAR szValueW[32]; + LPCTSTR pszValueNameT; + DWORD dwType, cbData; + LPVOID *pTemp; + BOOL bSuccess = FALSE; + +#ifdef UNICODE + MultiByteToWideChar(CP_ACP, 0, pszValueName, -1, szValueW, sizeof(szValueW) / sizeof(szValueW[0])); + pszValueNameT = szValueW; +#else + pszValueNameT = pszValueName; +#endif + + pTemp = HeapAlloc(GetProcessHeap(), 0, dwResultSize); + if (!pTemp) + goto done; + memset(pTemp, 0, dwResultSize); + + cbData = dwResultSize; + if (RegQueryValueEx(hKey, pszValueNameT, NULL, &dwType, (LPBYTE) pTemp, &cbData) != ERROR_SUCCESS) + goto done; + + if (dwType != dwExpectedType) + goto done; + + memcpy(pvResult, pTemp, cbData); + bSuccess = TRUE; + +done: + if (pTemp) + HeapFree(GetProcessHeap(), 0, pTemp); + return bSuccess; +} + +static BOOL QueryDword(HKEY hKey, LPCSTR pszValueName, DWORD *pdwResult) +{ + return QueryGeneric(hKey, pszValueName, REG_DWORD, pdwResult, sizeof(*pdwResult)); +} + +static BOOL QueryByte(HKEY hKey, LPCSTR pszValueName, BYTE *pbResult) +{ + DWORD dwResult; + if (!QueryGeneric(hKey, pszValueName, REG_DWORD, &dwResult, sizeof(dwResult))) + return FALSE; + if (dwResult >= 0x100) + return FALSE; + *pbResult = (BYTE) dwResult; + return TRUE; +} + +static BOOL QueryString(HKEY hKey, LPCSTR pszValueName, LPTSTR pszResult, DWORD dwResultSize) +{ + return QueryGeneric(hKey, pszValueName, REG_SZ, pszResult, dwResultSize * sizeof(*pszResult)); +} + +void LoadSettings(void) +{ + HKEY hKey = NULL; + HFONT hFont; + DWORD dwPointSize = 0; + + if (RegOpenKey(HKEY_CURRENT_USER, s_szRegistryKey, &hKey) == ERROR_SUCCESS) + { + QueryByte(hKey, "lfCharSet", &Globals.lfFont.lfCharSet); + QueryByte(hKey, "lfClipPrecision", &Globals.lfFont.lfClipPrecision); + QueryDword(hKey, "lfEscapement", &Globals.lfFont.lfEscapement); + QueryString(hKey, "lfFaceName", Globals.lfFont.lfFaceName, sizeof(Globals.lfFont.lfFaceName) / sizeof(Globals.lfFont.lfFaceName[0])); + QueryByte(hKey, "lfItalic", &Globals.lfFont.lfItalic); + QueryDword(hKey, "lfOrientation", &Globals.lfFont.lfOrientation); + QueryByte(hKey, "lfOutPrecision", &Globals.lfFont.lfOutPrecision); + QueryByte(hKey, "lfPitchAndFamily", &Globals.lfFont.lfPitchAndFamily); + QueryByte(hKey, "lfQuality", &Globals.lfFont.lfQuality); + QueryByte(hKey, "lfStrikeOut", &Globals.lfFont.lfStrikeOut); + QueryByte(hKey, "lfUnderline", &Globals.lfFont.lfUnderline); + QueryDword(hKey, "lfWeight", &Globals.lfFont.lfWeight); + QueryDword(hKey, "iPointSize", &dwPointSize); + + if (dwPointSize != 0) + Globals.lfFont.lfHeight = HeightFromPointSize(dwPointSize); + + hFont = CreateFontIndirect(&Globals.lfFont); + if (hFont) + { + if (Globals.hFont) + DeleteObject(Globals.hFont); + Globals.hFont = hFont; + } + + RegCloseKey(hKey); + } +} + +static BOOL SaveDword(HKEY hKey, LPCSTR pszValueName, DWORD dwValue) +{ + WCHAR szValueW[32]; + LPCTSTR pszValueNameT; + +#ifdef UNICODE + MultiByteToWideChar(CP_ACP, 0, pszValueName, -1, szValueW, sizeof(szValueW) / sizeof(szValueW[0])); + pszValueNameT = szValueW; +#else + pszValueNameT = pszValueName; +#endif + + return RegSetValueEx(hKey, pszValueNameT, 0, REG_DWORD, (LPBYTE) &dwValue, sizeof(dwValue)) == ERROR_SUCCESS; +} + +static BOOL SaveString(HKEY hKey, LPCSTR pszValueName, LPCTSTR pszValue) +{ + WCHAR szValueW[32]; + LPCTSTR pszValueNameT; + +#ifdef UNICODE + MultiByteToWideChar(CP_ACP, 0, pszValueName, -1, szValueW, sizeof(szValueW) / sizeof(szValueW[0])); + pszValueNameT = szValueW; +#else + pszValueNameT = pszValueName; +#endif + + return RegSetValueEx(hKey, pszValueNameT, 0, REG_SZ, (LPBYTE) pszValue, _tcslen(pszValue) * sizeof(*pszValue)) == ERROR_SUCCESS; +} + +void SaveSettings(void) +{ + HKEY hKey; + DWORD dwDisposition; + + if (RegCreateKeyEx(HKEY_CURRENT_USER, s_szRegistryKey, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &hKey, &dwDisposition) + == ERROR_SUCCESS) + { + SaveDword(hKey, "lfCharSet", Globals.lfFont.lfCharSet); + SaveDword(hKey, "lfClipPrecision", Globals.lfFont.lfClipPrecision); + SaveDword(hKey, "lfEscapement", Globals.lfFont.lfEscapement); + SaveString(hKey, "lfFaceName", Globals.lfFont.lfFaceName); + SaveDword(hKey, "lfItalic", Globals.lfFont.lfItalic); + SaveDword(hKey, "lfOrientation", Globals.lfFont.lfOrientation); + SaveDword(hKey, "lfOutPrecision", Globals.lfFont.lfOutPrecision); + SaveDword(hKey, "lfPitchAndFamily", Globals.lfFont.lfPitchAndFamily); + SaveDword(hKey, "lfQuality", Globals.lfFont.lfQuality); + SaveDword(hKey, "lfStrikeOut", Globals.lfFont.lfStrikeOut); + SaveDword(hKey, "lfUnderline", Globals.lfFont.lfUnderline); + SaveDword(hKey, "lfWeight", Globals.lfFont.lfWeight); + SaveDword(hKey, "iPointSize", PointSizeFromHeight(Globals.lfFont.lfHeight)); + + RegCloseKey(hKey); + } + +}

1 0

[weiden] 18163: use the correct down-level scope filter flag for the computer selection dialog
by weiden＠svn.reactos.com 30 Sep '05

30 Sep '05

use the correct down-level scope filter flag for the computer selection dialog Modified: trunk/reactos/subsys/system/regedit/framewnd.c _____ Modified: trunk/reactos/subsys/system/regedit/framewnd.c --- trunk/reactos/subsys/system/regedit/framewnd.c 2005-09-30 01:26:02 UTC (rev 18162) +++ trunk/reactos/subsys/system/regedit/framewnd.c 2005-09-30 01:47:46 UTC (rev 18163) @@ -558,8 +558,7 @@ 0, 0 }, - DSOP_DOWNLEVEL_FILTER_COMPUTERS | - DSOP_DOWNLEVEL_FILTER_GLOBAL_GROUPS | DSOP_DOWNLEVEL_FILTER_ALL_WELLKNOWN_SIDS + DSOP_DOWNLEVEL_FILTER_COMPUTERS }, NULL, NULL,

1 0

[weiden] 18162: display the computer selection dialog for remote registry administration
by weiden＠svn.reactos.com 30 Sep '05

30 Sep '05

display the computer selection dialog for remote registry administration Modified: trunk/reactos/subsys/system/regedit/Cz.rc Modified: trunk/reactos/subsys/system/regedit/De.rc Modified: trunk/reactos/subsys/system/regedit/En.rc Modified: trunk/reactos/subsys/system/regedit/Es.rc Modified: trunk/reactos/subsys/system/regedit/Fr.rc Modified: trunk/reactos/subsys/system/regedit/framewnd.c Modified: trunk/reactos/subsys/system/regedit/main.c _____ Modified: trunk/reactos/subsys/system/regedit/Cz.rc --- trunk/reactos/subsys/system/regedit/Cz.rc 2005-09-29 22:57:42 UTC (rev 18161) +++ trunk/reactos/subsys/system/regedit/Cz.rc 2005-09-30 01:26:02 UTC (rev 18162) @@ -47,7 +47,7 @@ MENUITEM SEPARATOR MENUITEM "&P°ipojit sÝØov² registr...", ID_REGISTRY_CONNECTNETWORKREGISTRY - , GRAYED + MENUITEM "&Odpojit sÝØov² registr...", ID_REGISTRY_DISCONNECTNETWORKREGISTRY , GRAYED _____ Modified: trunk/reactos/subsys/system/regedit/De.rc --- trunk/reactos/subsys/system/regedit/De.rc 2005-09-29 22:57:42 UTC (rev 18161) +++ trunk/reactos/subsys/system/regedit/De.rc 2005-09-30 01:26:02 UTC (rev 18162) @@ -47,7 +47,7 @@ MENUITEM SEPARATOR MENUITEM "&Mit Netzwerkregistry verbinden...", ID_REGISTRY_CONNECTNETWORKREGISTRY - , GRAYED + MENUITEM "&Von Netzwerkregistry trennen...", ID_REGISTRY_DISCONNECTNETWORKREGISTRY , GRAYED _____ Modified: trunk/reactos/subsys/system/regedit/En.rc --- trunk/reactos/subsys/system/regedit/En.rc 2005-09-29 22:57:42 UTC (rev 18161) +++ trunk/reactos/subsys/system/regedit/En.rc 2005-09-30 01:26:02 UTC (rev 18162) @@ -47,7 +47,7 @@ MENUITEM SEPARATOR MENUITEM "&Connect Network Registry...", ID_REGISTRY_CONNECTNETWORKREGISTRY - , GRAYED + MENUITEM "&Disconnect Network Registry...", ID_REGISTRY_DISCONNECTNETWORKREGISTRY , GRAYED _____ Modified: trunk/reactos/subsys/system/regedit/Es.rc --- trunk/reactos/subsys/system/regedit/Es.rc 2005-09-29 22:57:42 UTC (rev 18161) +++ trunk/reactos/subsys/system/regedit/Es.rc 2005-09-30 01:26:02 UTC (rev 18162) @@ -44,7 +44,7 @@ MENUITEM "&Importar archivo de registro...", ID_REGISTRY_IMPORTREGISTRYFILE MENUITEM "&Exportar archivo de registro...", ID_REGISTRY_EXPORTREGISTRYFILE MENUITEM SEPARATOR - MENUITEM "&Conectar registro de red...", ID_REGISTRY_CONNECTNETWORKREGISTRY, GRAYED + MENUITEM "&Conectar registro de red...", ID_REGISTRY_CONNECTNETWORKREGISTRY MENUITEM "&Desconectar registro de red...", ID_REGISTRY_DISCONNECTNETWORKREGISTRY, GRAYED MENUITEM SEPARATOR MENUITEM "Im&primir\tCtrl+P", ID_REGISTRY_PRINT, GRAYED _____ Modified: trunk/reactos/subsys/system/regedit/Fr.rc --- trunk/reactos/subsys/system/regedit/Fr.rc 2005-09-29 22:57:42 UTC (rev 18161) +++ trunk/reactos/subsys/system/regedit/Fr.rc 2005-09-30 01:26:02 UTC (rev 18162) @@ -45,7 +45,7 @@ MENUITEM "&Importer un fichier de registres...", ID_REGISTRY_IMPORTREGISTRYFILE MENUITEM "&Exporter un fichier de registres...", ID_REGISTRY_EXPORTREGISTRYFILE MENUITEM SEPARATOR - MENUITEM "&Connecter Ó des registres via le rÚseau...", ID_REGISTRY_CONNECTNETWORKREGISTRY, GRAYED + MENUITEM "&Connecter Ó des registres via le rÚseau...", ID_REGISTRY_CONNECTNETWORKREGISTRY MENUITEM "&DÚconnecter de registres rÚseau...", ID_REGISTRY_DISCONNECTNETWORKREGISTRY, GRAYED MENUITEM SEPARATOR MENUITEM "Im&primer\tCtrl+P", ID_REGISTRY_PRINT, GRAYED _____ Modified: trunk/reactos/subsys/system/regedit/framewnd.c --- trunk/reactos/subsys/system/regedit/framewnd.c 2005-09-29 22:57:42 UTC (rev 18161) +++ trunk/reactos/subsys/system/regedit/framewnd.c 2005-09-30 01:26:02 UTC (rev 18162) @@ -18,8 +18,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from Windows headers */ - #include <windows.h> #include <tchar.h> #include <commctrl.h> @@ -28,6 +26,7 @@ #include <stdlib.h> #include <stdio.h> #include <shellapi.h> +#include <objsel.h> #include "main.h" #include "regproc.h" @@ -529,6 +528,129 @@ return TRUE; } +static HRESULT +InitializeRemoteRegistryPicker(OUT IDsObjectPicker **pDsObjectPicker) +{ + HRESULT hRet; + + *pDsObjectPicker = NULL; + + hRet = CoCreateInstance(&CLSID_DsObjectPicker, + NULL, + CLSCTX_INPROC_SERVER, + &IID_IDsObjectPicker, + (LPVOID*)pDsObjectPicker); + if (SUCCEEDED(hRet)) + { + DSOP_INIT_INFO InitInfo; + DSOP_SCOPE_INIT_INFO Scopes[] = + { + { + sizeof(DSOP_SCOPE_INIT_INFO), + DSOP_SCOPE_TYPE_USER_ENTERED_UPLEVEL_SCOPE | DSOP_SCOPE_TYPE_USER_ENTERED_DOWNLEVEL_SCOPE | + DSOP_SCOPE_TYPE_GLOBAL_CATALOG | DSOP_SCOPE_TYPE_EXTERNAL_UPLEVEL_DOMAIN | + DSOP_SCOPE_TYPE_EXTERNAL_DOWNLEVEL_DOMAIN | DSOP_SCOPE_TYPE_WORKGROUP | + DSOP_SCOPE_TYPE_UPLEVEL_JOINED_DOMAIN | DSOP_SCOPE_TYPE_DOWNLEVEL_JOINED_DOMAIN, + 0, + { + { + DSOP_FILTER_COMPUTERS, + 0, + 0 + }, + DSOP_DOWNLEVEL_FILTER_COMPUTERS | + DSOP_DOWNLEVEL_FILTER_GLOBAL_GROUPS | DSOP_DOWNLEVEL_FILTER_ALL_WELLKNOWN_SIDS + }, + NULL, + NULL, + S_OK + }, + }; + + InitInfo.cbSize = sizeof(InitInfo); + InitInfo.pwzTargetComputer = NULL; + InitInfo.cDsScopeInfos = sizeof(Scopes) / sizeof(Scopes[0]); + InitInfo.aDsScopeInfos = Scopes; + InitInfo.flOptions = DSOP_SCOPE_TYPE_TARGET_COMPUTER; + InitInfo.cAttributesToFetch = 0; + InitInfo.apwzAttributeNames = NULL; + + hRet = (*pDsObjectPicker)->lpVtbl->Initialize(*pDsObjectPicker, + &InitInfo); + + if (FAILED(hRet)) + { + /* delete the object picker in case initialization failed! */ + (*pDsObjectPicker)->lpVtbl->Release(*pDsObjectPicker); + } + } + + return hRet; +} + +static HRESULT +InvokeRemoteRegistryPickerDialog(IN IDsObjectPicker *pDsObjectPicker, + IN HWND hwndParent OPTIONAL, + OUT LPWSTR lpBuffer, + IN UINT uSize) +{ + IDataObject *pdo = NULL; + HRESULT hRet; + + hRet = pDsObjectPicker->lpVtbl->InvokeDialog(pDsObjectPicker, + hwndParent, + &pdo); + if (hRet == S_OK) + { + STGMEDIUM stm; + FORMATETC fe; + + fe.cfFormat = RegisterClipboardFormat(CFSTR_DSOP_DS_SELECTION_LIST); + fe.ptd = NULL; + fe.dwAspect = DVASPECT_CONTENT; + fe.lindex = -1; + fe.tymed = TYMED_HGLOBAL; + + hRet = pdo->lpVtbl->GetData(pdo, + &fe, + &stm); + if (SUCCEEDED(hRet)) + { + PDS_SELECTION_LIST SelectionList = (PDS_SELECTION_LIST)GlobalLock(stm.hGlobal); + if (SelectionList != NULL) + { + if (SelectionList->cItems == 1) + { + UINT nlen = wcslen(SelectionList->aDsSelection[0].pwzName); + if (nlen >= uSize) + { + nlen = uSize - 1; + } + + memcpy(lpBuffer, + SelectionList->aDsSelection[0].pwzName, + nlen * sizeof(WCHAR)); + lpBuffer[nlen] = L'\0'; + } + + GlobalUnlock(stm.hGlobal); + } + + ReleaseStgMedium(&stm); + } + + pdo->lpVtbl->Release(pdo); + } + + return hRet; +} + +static VOID +FreeObjectPicker(IN IDsObjectPicker *pDsObjectPicker) +{ + pDsObjectPicker->lpVtbl->Release(pDsObjectPicker); +} + /*********************************************************************** ******** * * FUNCTION: _CmdWndProc(HWND, unsigned, WORD, LONG) @@ -554,7 +676,28 @@ ExportRegistryFile(hWnd); return TRUE; case ID_REGISTRY_CONNECTNETWORKREGISTRY: + { + IDsObjectPicker *ObjectPicker; + WCHAR szComputerName[MAX_COMPUTERNAME_LENGTH + 1]; + HRESULT hRet; + + hRet = InitializeRemoteRegistryPicker(&ObjectPicker); + if (SUCCEEDED(hRet)) + { + hRet = InvokeRemoteRegistryPickerDialog(ObjectPicker, + hWnd, + szComputerName, + sizeof(szComputerName) / sizeof(szComputerName[0])); + if (hRet == S_OK) + { + /* FIXME - connect to the registry */ + } + + FreeObjectPicker(ObjectPicker); + } + return TRUE; + } case ID_REGISTRY_DISCONNECTNETWORKREGISTRY: return TRUE; case ID_REGISTRY_PRINT: _____ Modified: trunk/reactos/subsys/system/regedit/main.c --- trunk/reactos/subsys/system/regedit/main.c 2005-09-29 22:57:42 UTC (rev 18161) +++ trunk/reactos/subsys/system/regedit/main.c 2005-09-30 01:26:02 UTC (rev 18162) @@ -30,6 +30,7 @@ #include <fcntl.h> #include <aclui.h> #include <cguid.h> +#include <objbase.h> #include "main.h" #include "hexedit.h" @@ -189,6 +190,7 @@ { MSG msg; HACCEL hAccel; + HRESULT hComInit; /* int hCrt; FILE *hf; @@ -221,6 +223,9 @@ return FALSE; } hAccel = LoadAccelerators(hInstance, (LPCTSTR)IDC_REGEDIT); + + /* initialize the COM library for the remote registry object picker dialog */ + hComInit = CoInitialize(NULL); /* Main message loop */ while (GetMessage(&msg, (HWND)NULL, 0, 0)) { @@ -230,6 +235,12 @@ DispatchMessage(&msg); } } + + if (SUCCEEDED(hComInit)) + { + CoUninitialize(); + } + ExitInstance(hInstance); return msg.wParam; }

1 0

[gedmurphy] 18161: use carrige returns :)
by gedmurphy＠svn.reactos.com 29 Sep '05

29 Sep '05

use carrige returns :) Modified: trunk/reactos/apps/utils/net/tcpsvcs/qotd.c _____ Modified: trunk/reactos/apps/utils/net/tcpsvcs/qotd.c --- trunk/reactos/apps/utils/net/tcpsvcs/qotd.c 2005-09-29 22:36:46 UTC (rev 18160) +++ trunk/reactos/apps/utils/net/tcpsvcs/qotd.c 2005-09-29 22:57:42 UTC (rev 18161) @@ -7,13 +7,13 @@ //these need putting in an RC file. TCHAR Quotes[][MAX_QUOTE_BUF] = { - _T("\"I have a penchant for mischief, property damage, stalking and cheesecake, of course\"\n - kjk hyperion"), + _T("\"I have a penchant for mischief, property damage, stalking and cheesecake, of course\"\r\n - kjk hyperion"), _T("\"Wow! I fixed a setmenu bug.\" - jimtabor"), - _T("\"if the code is broken though, your free to call it ur own\"\n - Alex Ionescu"), - _T("\"i don't know about any bug; none exist; ReactOS is prefect\"\n - filip2307"), - _T("\"if you were kernel code, cutler would rewrite you.\"\n - Alex Ionescu"), - _T("\"Looks like Hartmut is cleaning out his WC. working copy, that is\"\n - WaxDragon") - _T("\"don't question it ... it's clearly an optimization\"\n - arty") + _T("\"if the code is broken though, your free to call it ur own\"\r\n - Alex Ionescu"), + _T("\"i don't know about any bug; none exist; ReactOS is prefect\"\r\n - filip2307"), + _T("\"if you were kernel code, cutler would rewrite you.\"\r\n - Alex Ionescu"), + _T("\"Looks like Hartmut is cleaning out his WC. working copy, that is\"\r\n - WaxDragon") + _T("\"don't question it ... it's clearly an optimization\"\r\n - arty") }; DWORD WINAPI QotdHandler(VOID* Sock_)

1 0

[gedmurphy] 18160: randomise the quote sent
by gedmurphy＠svn.reactos.com 29 Sep '05

29 Sep '05

randomise the quote sent Modified: trunk/reactos/apps/utils/net/tcpsvcs/qotd.c _____ Modified: trunk/reactos/apps/utils/net/tcpsvcs/qotd.c --- trunk/reactos/apps/utils/net/tcpsvcs/qotd.c 2005-09-29 20:41:12 UTC (rev 18159) +++ trunk/reactos/apps/utils/net/tcpsvcs/qotd.c 2005-09-29 22:36:46 UTC (rev 18160) @@ -7,13 +7,13 @@ //these need putting in an RC file. TCHAR Quotes[][MAX_QUOTE_BUF] = { - _T("\"I have a penchant for mischief, property damage, stalking and cheesecake, of course\" - kjk hyperion"), + _T("\"I have a penchant for mischief, property damage, stalking and cheesecake, of course\"\n - kjk hyperion"), _T("\"Wow! I fixed a setmenu bug.\" - jimtabor"), - _T("\"if the code is broken though, your free to call it ur own\" - Alex Ionescu"), - _T("\"i don't know about any bug; none exist; ReactOS is prefect\" - filip2307"), - _T("\"if you were kernel code, cutler would rewrite you.\" - Alex Ionescu"), - _T("\"Looks like Hartmut is cleaning out his WC. working copy, that is\" - WaxDragon") - _T("\"don't question it ... it's clearly an optimization\" - arty") + _T("\"if the code is broken though, your free to call it ur own\"\n - Alex Ionescu"), + _T("\"i don't know about any bug; none exist; ReactOS is prefect\"\n - filip2307"), + _T("\"if you were kernel code, cutler would rewrite you.\"\n - Alex Ionescu"), + _T("\"Looks like Hartmut is cleaning out his WC. working copy, that is\"\n - WaxDragon") + _T("\"don't question it ... it's clearly an optimization\"\n - arty") }; DWORD WINAPI QotdHandler(VOID* Sock_) @@ -21,12 +21,17 @@ DWORD Retval = 0; SOCKET Sock; INT NumOfQuotes; + INT QuoteToPrint; Sock = (SOCKET)Sock_; NumOfQuotes = sizeof(Quotes) / MAX_QUOTE_BUF; - SendQuote(Sock, Quotes[1]); + /* randomise the quote */ + srand((unsigned int) time(0)); + QuoteToPrint = rand() % NumOfQuotes; + SendQuote(Sock, Quotes[QuoteToPrint]); + _tprintf(_T("Shutting connection down...\n")); if (ShutdownConnection(Sock, FALSE)) _tprintf(_T("Connection is down.\n"));

1 0

[gedmurphy] 18159: discard.c
by gedmurphy＠svn.reactos.com 29 Sep '05

29 Sep '05

discard.c - implemented discard. chargen.c - improve efficiency sending full line instead of singular chars. TCP will generally wait until the packet is full anyway, so it's pointless to keep calling send for each char. tcpsvcs.c - implement the beginnings of the code to start tcpsvcs as a service. #if 0'd out at the moment. Fix bug from calling non existant DiscardHandler. Surely this is enough info to satisfy lkcl this time :p Modified: trunk/reactos/apps/utils/net/tcpsvcs/chargen.c Added: trunk/reactos/apps/utils/net/tcpsvcs/discard.c Modified: trunk/reactos/apps/utils/net/tcpsvcs/echo.c Modified: trunk/reactos/apps/utils/net/tcpsvcs/qotd.c Modified: trunk/reactos/apps/utils/net/tcpsvcs/tcpsvcs.c Modified: trunk/reactos/apps/utils/net/tcpsvcs/tcpsvcs.h Modified: trunk/reactos/apps/utils/net/tcpsvcs/tcpsvcs.xml _____ Modified: trunk/reactos/apps/utils/net/tcpsvcs/chargen.c --- trunk/reactos/apps/utils/net/tcpsvcs/chargen.c 2005-09-29 19:34:53 UTC (rev 18158) +++ trunk/reactos/apps/utils/net/tcpsvcs/chargen.c 2005-09-29 20:41:12 UTC (rev 18159) @@ -8,15 +8,15 @@ DWORD Retval = 0; SOCKET Sock = (SOCKET)Sock_; - if (!GenerateChars(Sock)) { + if (!GenerateChars(Sock)) + { _tprintf(_T("Char generation failed\n")); Retval = 3; } _tprintf(_T("Shutting connection down...\n")); - if (ShutdownConnection(Sock, FALSE)) { + if (ShutdownConnection(Sock, FALSE)) _tprintf(_T("Connection is down.\n")); - } else { _tprintf(_T("Connection shutdown failed\n")); @@ -31,12 +31,12 @@ BOOL GenerateChars(SOCKET Sock) { - int i, - charIndex, /* internal loop */ - loopIndex; /* line loop */ + int i; + int charIndex; /* internal loop */ + int loopIndex; /* line loop */ char ring[END-START]; char *endring; - BOOL bLoop = TRUE; + char Line[LINESIZ]; /* fill ring with printable characters */ for (charIndex=0, i=START; i<=END; charIndex++, i++) @@ -46,36 +46,31 @@ /* where we will start output from */ loopIndex = 0; - - while (bLoop) + while (1) { - /* if the loop index is equal to number of chars previously - * printed, start the loop from the beginning */ + /* if the loop index is equal to the last char, + * start the loop again from the beginning */ if (loopIndex == END-START) loopIndex = 0; /* start printing from char controled by loopIndex */ charIndex = loopIndex; - for (i=0; i<LINESIZ; i++) + for (i=0; i < LINESIZ - 2; i++) { - /* FIXME: Should send lines instead of chars to improve efficiency - * TCP will wait until it fills a packet anway before putting on - * the wire, so it's pointless to keep polling send */ - if (!SendChar(Sock, ring[charIndex])) - { - return FALSE; - } - /* if current char equal last char, reset */ + Line[i] = ring[charIndex]; + if (ring[charIndex] == *endring) charIndex = 0; else charIndex++; } - if (bLoop) - if ((!SendChar(Sock, L'\r')) || (!SendChar(Sock, L'\n'))) - return FALSE; + Line[LINESIZ - 2] = L'\r'; + Line[LINESIZ - 1] = L'\n'; + if (!SendLine(Sock, Line)) + break; + /* increment loop index to start printing from next char in ring */ loopIndex++; } @@ -83,17 +78,25 @@ return TRUE; } -BOOL SendChar(SOCKET Sock, TCHAR c) +BOOL SendLine(SOCKET Sock, TCHAR* Line) { INT RetVal; INT SentBytes; + INT LineSize; + LineSize = sizeof(TCHAR) * LINESIZ; + SentBytes = 0; - RetVal = send(Sock, &c, sizeof(TCHAR), 0); + RetVal = send(Sock, Line, LineSize, 0); /*FIXME: need to establish if peer closes connection, not just report a socket error */ if (RetVal > 0) { + if (RetVal != LineSize) + { + _tprintf(("Not sent enough\n")); + return FALSE; + } SentBytes += RetVal; return TRUE; } _____ Added: trunk/reactos/apps/utils/net/tcpsvcs/discard.c --- trunk/reactos/apps/utils/net/tcpsvcs/discard.c 2005-09-29 19:34:53 UTC (rev 18158) +++ trunk/reactos/apps/utils/net/tcpsvcs/discard.c 2005-09-29 20:41:12 UTC (rev 18159) @@ -0,0 +1,54 @@ +#include <stdio.h> +#include <winsock2.h> +#include <tchar.h> +#include "tcpsvcs.h" + +DWORD WINAPI DiscardHandler(VOID* Sock_) +{ + DWORD Retval = 0; + SOCKET Sock = (SOCKET)Sock_; + + if (!RecieveIncomingPackets(Sock)) + { + _tprintf(_T("RecieveIncomingPackets failed\n")); + Retval = 3; + } + + _tprintf(_T("Shutting connection down...\n")); + if (ShutdownConnection(Sock, TRUE)) + { + _tprintf(_T("Connection is down.\n")); + } + else + { + _tprintf(_T("Connection shutdown failed\n")); + Retval = 3; + } + _tprintf(_T("Terminating thread\n")); + ExitThread(0); + + return Retval; +} + + + +BOOL RecieveIncomingPackets(SOCKET Sock) +{ + TCHAR ReadBuffer[BUF]; + INT ReadBytes; + + do + { + ReadBytes = recv(Sock, ReadBuffer, BUF, 0); + if (ReadBytes > 0) + _tprintf(_T("Received %d bytes from client\n"), ReadBytes); + else if (ReadBytes == SOCKET_ERROR) + { + _tprintf(("Socket Error: %d\n"), WSAGetLastError()); + return FALSE; + } + } while (ReadBytes > 0); + + _tprintf(("Connection closed by peer.\n")); + return TRUE; +} _____ Modified: trunk/reactos/apps/utils/net/tcpsvcs/echo.c --- trunk/reactos/apps/utils/net/tcpsvcs/echo.c 2005-09-29 19:34:53 UTC (rev 18158) +++ trunk/reactos/apps/utils/net/tcpsvcs/echo.c 2005-09-29 20:41:12 UTC (rev 18159) @@ -39,21 +39,24 @@ do { ReadBytes = recv(Sock, ReadBuffer, BUF, 0); - if (ReadBytes > 0) { + if (ReadBytes > 0) + { _tprintf(_T("Received %d bytes from client\n"), ReadBytes); SentBytes = 0; - while (SentBytes < ReadBytes) { + while (SentBytes < ReadBytes) + { Temp = send(Sock, ReadBuffer + SentBytes, ReadBytes - SentBytes, 0); - if (Temp > 0) { + if (Temp > 0) + { _tprintf(_T("Sent %d bytes back to client\n"), Temp); SentBytes += Temp; } - else if (Temp == SOCKET_ERROR) { + else if (Temp == SOCKET_ERROR) return FALSE; - } - else { + else + { /* Client closed connection before we could reply to all the data it sent, so quit early. */ _tprintf(_T("Peer unexpectedly dropped connection!\n")); @@ -61,9 +64,9 @@ } } } - else if (ReadBytes == SOCKET_ERROR) { + else if (ReadBytes == SOCKET_ERROR) return FALSE; - } + } while (ReadBytes != 0); _tprintf(("Connection closed by peer.\n")); _____ Modified: trunk/reactos/apps/utils/net/tcpsvcs/qotd.c --- trunk/reactos/apps/utils/net/tcpsvcs/qotd.c 2005-09-29 19:34:53 UTC (rev 18158) +++ trunk/reactos/apps/utils/net/tcpsvcs/qotd.c 2005-09-29 20:41:12 UTC (rev 18159) @@ -5,13 +5,15 @@ #include "tcpsvcs.h" //these need putting in an RC file. -TCHAR Quotes[][MAX_QUOTE_BUF] = { +TCHAR Quotes[][MAX_QUOTE_BUF] = +{ _T("\"I have a penchant for mischief, property damage, stalking and cheesecake, of course\" - kjk hyperion"), _T("\"Wow! I fixed a setmenu bug.\" - jimtabor"), _T("\"if the code is broken though, your free to call it ur own\" - Alex Ionescu"), _T("\"i don't know about any bug; none exist; ReactOS is prefect\" - filip2307"), _T("\"if you were kernel code, cutler would rewrite you.\" - Alex Ionescu"), _T("\"Looks like Hartmut is cleaning out his WC. working copy, that is\" - WaxDragon") + _T("\"don't question it ... it's clearly an optimization\" - arty") }; DWORD WINAPI QotdHandler(VOID* Sock_) _____ Modified: trunk/reactos/apps/utils/net/tcpsvcs/tcpsvcs.c --- trunk/reactos/apps/utils/net/tcpsvcs/tcpsvcs.c 2005-09-29 19:34:53 UTC (rev 18158) +++ trunk/reactos/apps/utils/net/tcpsvcs/tcpsvcs.c 2005-09-29 20:41:12 UTC (rev 18159) @@ -3,25 +3,39 @@ #include <tchar.h> #include "tcpsvcs.h" +static LPTHREAD_START_ROUTINE -ServiceHandler[NUM_SERVICES] = { +ServiceHandler[NUM_SERVICES] = +{ EchoHandler, - ChargenHandler, + DiscardHandler, DaytimeHandler, - NULL, - QotdHandler + QotdHandler, + ChargenHandler }; -INT ServicePort[NUM_SERVICES] = { +static int +ServicePort[NUM_SERVICES] = +{ ECHO_PORT, - CHARGEN_PORT, + DISCARD_PORT, DAYTIME_PORT, - DISCARD_PORT, - QOTD_PORT + QOTD_PORT, + CHARGEN_PORT }; -int main(int argc, char *argv[]) +#if 0 +static +SERVICE_TABLE_ENTRY +ServiceTable[2] = { + {TEXT("tcpsvcs"), ServiceMain}, + {NULL, NULL} +}; +#endif + +int main(void) +{ PSERVICES pServices[NUM_SERVICES]; DWORD dwThreadId[NUM_SERVICES]; HANDLE hThread[NUM_SERVICES]; @@ -32,7 +46,7 @@ { /* Allocate memory for thread data. */ pServices[i] = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(SERVICES)); - + if( pServices[i] == NULL ) ExitProcess(2); @@ -63,6 +77,68 @@ { CloseHandle(hThread[i]); } + return 0; +} +#if 0 +static VOID CALLBACK +ServiceMain(DWORD argc, LPTSTR *argv) +{ + PSERVICES pServices[NUM_SERVICES]; + DWORD dwThreadId[NUM_SERVICES]; + HANDLE hThread[NUM_SERVICES]; + INT i; + + /* Create MAX_THREADS worker threads. */ + for( i=0; i<NUM_SERVICES; i++ ) + { + /* Allocate memory for thread data. */ + pServices[i] = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(SERVICES)); + + if( pServices[i] == NULL ) + ExitProcess(2); + + /* Generate unique data for each thread. */ + pServices[i]->Service = ServiceHandler[i]; + pServices[i]->Port = ServicePort[i]; + + hThread[i] = CreateThread( + NULL, // default security attributes + 0, // use default stack size + StartServer, // thread function + pServices[i], // argument to thread function + 0, // use default creation flags + &dwThreadId[i]); // returns the thread identifier + + /* Check the return value for success. */ + if (hThread[i] == NULL) + { + ExitProcess(i); + } + } + + /* Wait until all threads have terminated. */ + WaitForMultipleObjects(NUM_SERVICES, hThread, TRUE, INFINITE); + + /* Close all thread handles upon completion. */ + for(i=0; i<NUM_SERVICES; i++) + { + CloseHandle(hThread[i]); + } + +} + +int +main(int argc, char *argv[]) +{ + DPRINT("tcpsvcs: main() started\n"); + + StartServiceCtrlDispatcher(ServiceTable); + + DPRINT("Umpnpmgr: main() done\n"); + + ExitThread(0); + return 0; } +#endif _____ Modified: trunk/reactos/apps/utils/net/tcpsvcs/tcpsvcs.h --- trunk/reactos/apps/utils/net/tcpsvcs/tcpsvcs.h 2005-09-29 19:34:53 UTC (rev 18158) +++ trunk/reactos/apps/utils/net/tcpsvcs/tcpsvcs.h 2005-09-29 20:41:12 UTC (rev 18159) @@ -1,9 +1,9 @@ /* default port numbers */ #define ECHO_PORT 7 -#define CHARGEN_PORT 19 +#define DISCARD_PORT 9 #define DAYTIME_PORT 13 -#define DISCARD_PORT 9 #define QOTD_PORT 17 +#define CHARGEN_PORT 19 #define NUM_SERVICES 6 #define BUF_SIZE 255 @@ -17,7 +17,7 @@ #define END 126 /* number of chars to put on a line */ -#define LINESIZ 72 +#define LINESIZ 74 // 72 + /r and /n /* data structure to pass to threads */ typedef struct _Services { @@ -25,6 +25,9 @@ LPTHREAD_START_ROUTINE Service; } SERVICES, *PSERVICES; +/* tcpsvcs functions */ +//static VOID CALLBACK ServiceMain(DWORD argc, LPTSTR *argv); + /* skelserver functions */ DWORD WINAPI StartServer(LPVOID lpParam); SOCKET SetUpListener(const char* ServAddr, int Port); @@ -35,7 +38,7 @@ /* chargen functions */ DWORD WINAPI ChargenHandler(VOID* Sock_); BOOL GenerateChars(SOCKET Sock); -BOOL SendChar(SOCKET Sock, CHAR c); +BOOL SendLine(SOCKET Sock, TCHAR* Line); /* daytime functions */ DWORD WINAPI DaytimeHandler(VOID* Sock_); @@ -46,8 +49,9 @@ BOOL EchoIncomingPackets(SOCKET Sock); /* discard functions */ +DWORD WINAPI DiscardHandler(VOID* Sock_); +BOOL RecieveIncomingPackets(SOCKET Sock); - /* qotd functions */ DWORD WINAPI QotdHandler(VOID* Sock_); BOOL SendQuote(SOCKET Sock, TCHAR* Quote); _____ Modified: trunk/reactos/apps/utils/net/tcpsvcs/tcpsvcs.xml --- trunk/reactos/apps/utils/net/tcpsvcs/tcpsvcs.xml 2005-09-29 19:34:53 UTC (rev 18158) +++ trunk/reactos/apps/utils/net/tcpsvcs/tcpsvcs.xml 2005-09-29 20:41:12 UTC (rev 18159) @@ -8,8 +8,9 @@ <file>tcpsvcs.c</file> <file>skelserver.c</file> <file>echo.c</file> - <file>chargen.c</file> + <file>discard.c</file> <file>daytime.c</file> <file>qotd.c</file> + <file>chargen.c</file> + <file>tcpsvcs.rc</file> </module> -

1 0

[weiden] 18158: Some fixes to CreateDirectoryEx:
by weiden＠svn.reactos.com 29 Sep '05

29 Sep '05

Some fixes to CreateDirectoryEx: - properly copy the directory attributes - add basic support to handle reparse points and add fallback code if the file system doesn't support them Modified: trunk/reactos/lib/kernel32/file/dir.c _____ Modified: trunk/reactos/lib/kernel32/file/dir.c --- trunk/reactos/lib/kernel32/file/dir.c 2005-09-29 16:55:59 UTC (rev 18157) +++ trunk/reactos/lib/kernel32/file/dir.c 2005-09-29 19:34:53 UTC (rev 18158) @@ -116,7 +116,8 @@ (lpSecurityAttributes ? lpSecurityAttributes->lpSecurityDescriptor : NULL)); Status = NtCreateFile (&DirectoryHandle, - GENERIC_READ, + FILE_LIST_DIRECTORY | SYNCHRONIZE | + FILE_OPEN_FOR_BACKUP_INTENT, &ObjectAttributes, &IoStatusBlock, NULL, @@ -157,17 +158,28 @@ OBJECT_ATTRIBUTES ObjectAttributes; IO_STATUS_BLOCK IoStatusBlock; UNICODE_STRING NtPathU, NtTemplatePathU; - HANDLE DirectoryHandle, TemplateHandle; + HANDLE DirectoryHandle = NULL; + HANDLE TemplateHandle = NULL; FILE_EA_INFORMATION EaInformation; + FILE_BASIC_INFORMATION FileBasicInfo; NTSTATUS Status; + ULONG OpenOptions, CreateOptions; + ACCESS_MASK DesiredAccess; + BOOLEAN ReparsePoint = FALSE; PVOID EaBuffer = NULL; ULONG EaLength = 0; + + OpenOptions = FILE_DIRECTORY_FILE | FILE_OPEN_REPARSE_POINT | + FILE_OPEN_FOR_BACKUP_INTENT; + CreateOptions = FILE_DIRECTORY_FILE | FILE_OPEN_FOR_BACKUP_INTENT; + DesiredAccess = FILE_LIST_DIRECTORY | SYNCHRONIZE | FILE_WRITE_ATTRIBUTES | + FILE_READ_ATTRIBUTES; - DPRINT ("lpTemplateDirectory %S lpNewDirectory %S lpSecurityAttributes %p\n", + DPRINT ("lpTemplateDirectory %ws lpNewDirectory %ws lpSecurityAttributes %p\n", lpTemplateDirectory, lpNewDirectory, lpSecurityAttributes); /* - * Read the extended attributes from the template directory + * Translate the template directory path */ if (!RtlDosPathNameToNtPathName_U ((LPWSTR)lpTemplateDirectory, @@ -180,31 +192,107 @@ } InitializeObjectAttributes(&ObjectAttributes, + &NtPathU, + OBJ_CASE_INSENSITIVE, + NULL, + (lpSecurityAttributes ? lpSecurityAttributes->lpSecurityDescriptor : NULL)); + + InitializeObjectAttributes(&ObjectAttributes, &NtTemplatePathU, OBJ_CASE_INSENSITIVE, NULL, NULL); - Status = NtCreateFile (&TemplateHandle, - GENERIC_READ, - &ObjectAttributes, - &IoStatusBlock, - NULL, - 0, - FILE_SHARE_READ | FILE_SHARE_WRITE, - FILE_OPEN, - FILE_DIRECTORY_FILE, - NULL, - 0); + /* + * Open the template directory + */ + +OpenTemplateDir: + Status = NtOpenFile (&TemplateHandle, + FILE_LIST_DIRECTORY | FILE_READ_ATTRIBUTES | FILE_READ_EA, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_READ | FILE_SHARE_WRITE, + OpenOptions); if (!NT_SUCCESS(Status)) { - RtlFreeHeap (RtlGetProcessHeap (), - 0, - NtTemplatePathU.Buffer); - SetLastErrorByStatus (Status); - return FALSE; + if (Status == STATUS_INVALID_PARAMETER && + (OpenOptions & FILE_OPEN_REPARSE_POINT)) + { + /* Some FSs (FAT) don't support reparse points, try opening + the directory without FILE_OPEN_REPARSE_POINT */ + OpenOptions &= ~FILE_OPEN_REPARSE_POINT; + + DPRINT("Reparse points not supported, try with less options\n"); + + /* try again */ + goto OpenTemplateDir; + } + else + { + DPRINT1("Failed to open the template directory: 0x%x\n", Status); + goto CleanupNoNtPath; + } } + + /* + * Translate the new directory path and check if they're the same + */ + + if (!RtlDosPathNameToNtPathName_U ((LPWSTR)lpNewDirectory, + &NtPathU, + NULL, + NULL)) + { + Status = STATUS_OBJECT_PATH_NOT_FOUND; + goto CleanupNoNtPath; + } + + if (RtlEqualUnicodeString(&NtPathU, + &NtTemplatePathU, + TRUE)) + { + DPRINT1("Both directory paths are the same!\n"); + Status = STATUS_OBJECT_NAME_INVALID; + goto Cleanup; + } + + /* + * Query the basic file attributes from the template directory + */ + /* Make sure FILE_ATTRIBUTE_NORMAL is used in case the information + isn't set by the FS */ + FileBasicInfo.FileAttributes = FILE_ATTRIBUTE_NORMAL; + Status = NtQueryInformationFile(TemplateHandle, + &IoStatusBlock, + &FileBasicInfo, + sizeof(FILE_BASIC_INFORMATION), + FileBasicInformation); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to query the basic directory attributes\n"); + goto Cleanup; + } + + /* clear the reparse point attribute if present. We're going to set the + reparse point later which will cause the attribute to be set */ + if (FileBasicInfo.FileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) + { + FileBasicInfo.FileAttributes &= ~FILE_ATTRIBUTE_REPARSE_POINT; + + /* writing the extended attributes requires the FILE_WRITE_DATA + access right */ + DesiredAccess |= FILE_WRITE_DATA; + + CreateOptions |= FILE_OPEN_REPARSE_POINT; + ReparsePoint = TRUE; + } + + /* + * Read the Extended Attributes if present + */ + for (;;) { Status = NtQueryInformationFile(TemplateHandle, @@ -261,66 +349,122 @@ } } - NtClose(TemplateHandle); - - RtlFreeHeap (RtlGetProcessHeap (), - 0, - NtTemplatePathU.Buffer); - if (!NT_SUCCESS(Status)) { - /* free the he extended attributes buffer */ - if (EaBuffer != NULL) - { - RtlFreeHeap (RtlGetProcessHeap (), - 0, - EaBuffer); - } - - SetLastErrorByStatus (Status); - return FALSE; + DPRINT1("Querying the EA data failed: 0x%x\n", Status); + goto Cleanup; } /* - * Create the new directory and copy over the extended attributes if - * needed + * Create the new directory */ - - if (!RtlDosPathNameToNtPathName_U ((LPWSTR)lpNewDirectory, - &NtPathU, - NULL, - NULL)) - { - /* free the he extended attributes buffer */ - if (EaBuffer != NULL) - { - RtlFreeHeap (RtlGetProcessHeap (), - 0, - EaBuffer); - } - - SetLastError(ERROR_PATH_NOT_FOUND); - return FALSE; - } - - InitializeObjectAttributes(&ObjectAttributes, - &NtPathU, - OBJ_CASE_INSENSITIVE, - NULL, - (lpSecurityAttributes ? lpSecurityAttributes->lpSecurityDescriptor : NULL)); - Status = NtCreateFile (&DirectoryHandle, - GENERIC_READ, + DesiredAccess, &ObjectAttributes, &IoStatusBlock, NULL, - FILE_ATTRIBUTE_NORMAL, + FileBasicInfo.FileAttributes, FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_CREATE, - FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT, + CreateOptions, EaBuffer, EaLength); + if (!NT_SUCCESS(Status)) + { + if (ReparsePoint && + (Status == STATUS_INVALID_PARAMETER || Status == STATUS_ACCESS_DENIED)) + { + /* The FS doesn't seem to support reparse points... */ + DPRINT1("Cannot copy the hardlink, destination doesn\'t support reparse points!\n"); + } + goto Cleanup; + } + + if (ReparsePoint) + { + /* + * Copy the reparse point + */ + + PREPARSE_GUID_DATA_BUFFER ReparseDataBuffer = + (PREPARSE_GUID_DATA_BUFFER)RtlAllocateHeap(RtlGetProcessHeap(), + 0, + MAXIMUM_REPARSE_DATA_BUFFER_SIZE); + + if (ReparseDataBuffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Cleanup; + } + + /* query the size of the reparse data buffer structure */ + Status = NtFsControlFile(TemplateHandle, + NULL, + NULL, + NULL, + &IoStatusBlock, + FSCTL_GET_REPARSE_POINT, + NULL, + 0, + ReparseDataBuffer, + MAXIMUM_REPARSE_DATA_BUFFER_SIZE); + if (NT_SUCCESS(Status)) + { + /* write the reparse point */ + Status = NtFsControlFile(DirectoryHandle, + NULL, + NULL, + NULL, + &IoStatusBlock, + FSCTL_SET_REPARSE_POINT, + ReparseDataBuffer, + MAXIMUM_REPARSE_DATA_BUFFER_SIZE, + NULL, + 0); + } + + RtlFreeHeap(RtlGetProcessHeap(), + 0, + ReparseDataBuffer); + + if (!NT_SUCCESS(Status)) + { + /* fail, we were unable to read the reparse point data! */ + DPRINT1("Querying or setting the reparse point failed: 0x%x\n", Status); + goto Cleanup; + } + } + else + { + /* + * Copy alternate file streams, if existing + */ + + /* FIXME - enumerate and copy the file streams */ + } + + /* + * We successfully created the directory and copied all information + * from the template directory + */ + Status = STATUS_SUCCESS; + +Cleanup: + RtlFreeHeap (RtlGetProcessHeap (), + 0, + NtPathU.Buffer); + +CleanupNoNtPath: + if (TemplateHandle != NULL) + { + NtClose(TemplateHandle); + } + + RtlFreeHeap (RtlGetProcessHeap (), + 0, + NtTemplatePathU.Buffer); + /* free the he extended attributes buffer */ if (EaBuffer != NULL) { @@ -329,9 +473,10 @@ EaBuffer); } - RtlFreeHeap (RtlGetProcessHeap (), - 0, - NtPathU.Buffer); + if (DirectoryHandle != NULL) + { + NtClose(DirectoryHandle); + } if (!NT_SUCCESS(Status)) { @@ -339,8 +484,6 @@ return FALSE; } - NtClose (DirectoryHandle); - return TRUE; }

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