Ros-diffs October 2005

ros-diffs@reactos.org

26 participants
737 discussions

[gedmurphy] 18248: - Don't call winsock initialiser for each seperate server thread

by gedmurphy＠svn.reactos.com

- Don't call winsock initialiser for each seperate server thread - Add more code for tcpsvcs to be controled via services. Still #if 0'd out until fully implemented. - Make server more informative with what is happening. (this info will be output to a log file once implemented as a service. Modified: trunk/reactos/apps/utils/net/tcpsvcs/chargen.c Modified: trunk/reactos/apps/utils/net/tcpsvcs/daytime.c Modified: 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/skelserver.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/chargen.c --- trunk/reactos/apps/utils/net/tcpsvcs/chargen.c 2005-10-03 14:42:34 UTC (rev 18247) +++ trunk/reactos/apps/utils/net/tcpsvcs/chargen.c 2005-10-03 18:32:30 UTC (rev 18248) @@ -22,7 +22,7 @@ _tprintf(_T("Connection shutdown failed\n")); Retval = 3; } - _tprintf(_T("Terminating thread\n")); + _tprintf(_T("Terminating chargen thread\n")); ExitThread(0); return Retval; _____ Modified: trunk/reactos/apps/utils/net/tcpsvcs/daytime.c --- trunk/reactos/apps/utils/net/tcpsvcs/daytime.c 2005-10-03 14:42:34 UTC (rev 18247) +++ trunk/reactos/apps/utils/net/tcpsvcs/daytime.c 2005-10-03 18:32:30 UTC (rev 18248) @@ -26,7 +26,7 @@ _tprintf(_T("Connection shutdown failed\n")); Retval = 3; } - _tprintf(_T("Terminating thread\n")); + _tprintf(_T("Terminating daytime thread\n")); ExitThread(0); return Retval; _____ Modified: trunk/reactos/apps/utils/net/tcpsvcs/discard.c --- trunk/reactos/apps/utils/net/tcpsvcs/discard.c 2005-10-03 14:42:34 UTC (rev 18247) +++ trunk/reactos/apps/utils/net/tcpsvcs/discard.c 2005-10-03 18:32:30 UTC (rev 18248) @@ -24,7 +24,7 @@ _tprintf(_T("Connection shutdown failed\n")); Retval = 3; } - _tprintf(_T("Terminating thread\n")); + _tprintf(_T("Terminating discard thread\n")); ExitThread(0); return Retval; _____ Modified: trunk/reactos/apps/utils/net/tcpsvcs/echo.c --- trunk/reactos/apps/utils/net/tcpsvcs/echo.c 2005-10-03 14:42:34 UTC (rev 18247) +++ trunk/reactos/apps/utils/net/tcpsvcs/echo.c 2005-10-03 18:32:30 UTC (rev 18248) @@ -22,7 +22,7 @@ _tprintf(_T("Connection shutdown failed\n")); Retval = 3; } - _tprintf(_T("Terminating thread\n")); + _tprintf(_T("Terminating echo thread\n")); ExitThread(0); return Retval; _____ Modified: trunk/reactos/apps/utils/net/tcpsvcs/qotd.c --- trunk/reactos/apps/utils/net/tcpsvcs/qotd.c 2005-10-03 14:42:34 UTC (rev 18247) +++ trunk/reactos/apps/utils/net/tcpsvcs/qotd.c 2005-10-03 18:32:30 UTC (rev 18248) @@ -33,7 +33,7 @@ _tprintf(_T("Connection shutdown failed\n")); Retval = 3; } - _tprintf(_T("Terminating thread\n")); + _tprintf(_T("Terminating qotd thread\n")); ExitThread(0); return Retval; _____ Modified: trunk/reactos/apps/utils/net/tcpsvcs/skelserver.c --- trunk/reactos/apps/utils/net/tcpsvcs/skelserver.c 2005-10-03 14:42:34 UTC (rev 18247) +++ trunk/reactos/apps/utils/net/tcpsvcs/skelserver.c 2005-10-03 18:32:30 UTC (rev 18248) @@ -7,18 +7,10 @@ DWORD WINAPI StartServer(LPVOID lpParam) { const TCHAR* HostIP = "127.0.0.1"; - DWORD RetVal; - WSADATA wsaData; PSERVICES pServices; pServices = (PSERVICES)lpParam; - if ((RetVal = WSAStartup(MAKEWORD(2, 2), &wsaData)) != 0) - { - _tprintf(_T("WSAStartup() failed : %lu\n"), RetVal); - return -1; - } - SOCKET ListeningSocket = SetUpListener(HostIP, htons(pServices->Port)); if (ListeningSocket == INVALID_SOCKET) { @@ -26,10 +18,11 @@ return 3; } - _tprintf(_T("Waiting for connections...\n")); + _tprintf(_T("%s is waiting for connections on port %d...\n"), + pServices->Name, pServices->Port); while (1) { - AcceptConnections(ListeningSocket, pServices->Service); + AcceptConnections(ListeningSocket, pServices->Service, pServices->Name); printf("Acceptor restarting...\n"); } @@ -66,7 +59,8 @@ -VOID AcceptConnections(SOCKET ListeningSocket, LPTHREAD_START_ROUTINE Service) +VOID AcceptConnections(SOCKET ListeningSocket, + LPTHREAD_START_ROUTINE Service, TCHAR *Name) { SOCKADDR_IN Client; SOCKET Sock; @@ -78,9 +72,9 @@ Sock = accept(ListeningSocket, (SOCKADDR*)&Client, &nAddrSize); if (Sock != INVALID_SOCKET) { - _tprintf(_T("Accepted connection from %s:%d\n"), - inet_ntoa(Client.sin_addr), ntohs(Client.sin_port)); - _tprintf(_T("About to create thread\n")); + _tprintf(_T("Accepted connection to %s server from %s:%d\n"), + Name, inet_ntoa(Client.sin_addr), ntohs(Client.sin_port)); + _tprintf(_T("Creating new thread for %s\n"), Name); CreateThread(0, 0, Service, (void*)Sock, 0, &ThreadID); } else _____ Modified: trunk/reactos/apps/utils/net/tcpsvcs/tcpsvcs.c --- trunk/reactos/apps/utils/net/tcpsvcs/tcpsvcs.c 2005-10-03 14:42:34 UTC (rev 18247) +++ trunk/reactos/apps/utils/net/tcpsvcs/tcpsvcs.c 2005-10-03 18:32:30 UTC (rev 18248) @@ -3,68 +3,67 @@ #include <tchar.h> #include "tcpsvcs.h" -static -LPTHREAD_START_ROUTINE -ServiceHandler[NUM_SERVICES] = -{ - EchoHandler, - DiscardHandler, - DaytimeHandler, - QotdHandler, - ChargenHandler -}; +#if 0 +/* + * globals + */ +static SERVICE_STATUS hServStatus; +static SERVICE_STATUS_HANDLE hSStat; +FILE *hLogFile; +BOOL bLogEvents = TRUE; +BOOL ShutDown, PauseFlag; +LPTSTR LogFileName = "tcpsvcs_log.txt"; -static int -ServicePort[NUM_SERVICES] = -{ - ECHO_PORT, - DISCARD_PORT, - DAYTIME_PORT, - QOTD_PORT, - CHARGEN_PORT -}; - -#if 0 -static -SERVICE_TABLE_ENTRY +static SERVICE_TABLE_ENTRY ServiceTable[2] = { - {TEXT("tcpsvcs"), ServiceMain}, + {_T("tcpsvcs"), ServiceMain}, {NULL, NULL} }; #endif +static SERVICES +Services[NUM_SERVICES] = +{ + {ECHO_PORT, _T("Echo"), EchoHandler}, + {DISCARD_PORT, _T("Discard"), DiscardHandler}, + {DAYTIME_PORT, _T("Daytime"), DaytimeHandler}, + {QOTD_PORT, _T("QOTD"), QotdHandler}, + {CHARGEN_PORT, _T("Chargen"), ChargenHandler} +}; + + int main(void) { - PSERVICES pServices[NUM_SERVICES]; DWORD dwThreadId[NUM_SERVICES]; HANDLE hThread[NUM_SERVICES]; + WSADATA wsaData; + DWORD RetVal; INT i; + if ((RetVal = WSAStartup(MAKEWORD(2, 2), &wsaData)) != 0) + { + _tprintf(_T("WSAStartup() failed : %lu\n"), RetVal); + return -1; + } + /* 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)); + _tprintf(_T("Starting %s server....\n"), Services[i].Name); - 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 + &Services[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) { + _tprintf(_T("Failed to start %s server....\n"), Services[i].Name); ExitProcess(i); } } @@ -80,39 +79,134 @@ return 0; } + + +/* code to run tcpsvcs as a service */ #if 0 -static VOID CALLBACK -ServiceMain(DWORD argc, LPTSTR *argv) +int +main(int argc, char *argv[]) { - PSERVICES pServices[NUM_SERVICES]; + //DPRINT("tcpsvcs: main() started. See tcpsvcs_log.txt for info\n"); + + if (!StartServiceCtrlDispatcher(ServiceTable)) + _tprintf(_T("failed to start the service control dispatcher\n")); + + //DPRINT("tcpsvcs: main() done\n"); + + return 0; +} + + +static VOID WINAPI +ServiceMain(DWORD argc, LPTSTR argv[]) +{ + DWORD i; + + hLogFile = fopen(LogFileName, _T("w+")); + if (hLogFile == NULL) + return; + + LogEvent(_T("Entering ServiceMain"), 0, FALSE); + + hServStatus.dwServiceType = SERVICE_WIN32_OWN_PROCESS; + hServStatus.dwCurrentState = SERVICE_START_PENDING; + hServStatus.dwControlsAccepted = SERVICE_ACCEPT_STOP | + SERVICE_ACCEPT_SHUTDOWN | SERVICE_ACCEPT_PAUSE_CONTINUE; + hServStatus.dwWin32ExitCode = ERROR_SERVICE_SPECIFIC_ERROR; + hServStatus.dwServiceSpecificExitCode = 0; + hServStatus.dwCheckPoint = 0; + hServStatus.dwWaitHint = 2*CS_TIMEOUT; + + hSStat = RegisterServiceCtrlHandler("tcpsvcs", ServerCtrlHandler); + if (hSStat == 0) + LogEvent(_T("Failed to register service\n"), 100, TRUE); + + LogEvent(_T("Control handler registered successfully"), 0, FALSE); + SetServiceStatus (hSStat, &hServStatus); + LogEvent(_T("Service status set to SERVICE_START_PENDING"), 0, FALSE); + + if (CreateServers() != 0) + { + hServStatus.dwCurrentState = SERVICE_STOPPED; + hServStatus.dwServiceSpecificExitCode = 1; + SetServiceStatus(hSStat, &hServStatus); + return; + } + + LogEvent(_T("Service threads shut down. Set SERVICE_STOPPED status"), 0, FALSE); + /* We will only return here when the ServiceSpecific function + completes, indicating system shutdown. */ + UpdateStatus (SERVICE_STOPPED, 0); + LogEvent(_T("Service status set to SERVICE_STOPPED"), 0, FALSE); + fclose(hLogFile); /* Clean up everything, in general */ + return; + +} + +VOID WINAPI +ServerCtrlHandler(DWORD Control) +{ + switch (Control) + { + case SERVICE_CONTROL_SHUTDOWN: /* fall through */ + case SERVICE_CONTROL_STOP: + ShutDown = TRUE; + UpdateStatus(SERVICE_STOP_PENDING, -1); + break; + case SERVICE_CONTROL_PAUSE: + PauseFlag = TRUE; + break; + case SERVICE_CONTROL_CONTINUE: + PauseFlag = FALSE; + break; + case SERVICE_CONTROL_INTERROGATE: + break; + default: + if (Control > 127 && Control < 256) /* user defined */ + break; + } + UpdateStatus(-1, -1); /* increment checkpoint */ + return; +} + + +void UpdateStatus (int NewStatus, int Check) +/* Set a new service status and checkpoint (either specific value or increment) */ +{ + if (Check < 0 ) hServStatus.dwCheckPoint++; + else hServStatus.dwCheckPoint = Check; + if (NewStatus >= 0) hServStatus.dwCurrentState = NewStatus; + if (!SetServiceStatus (hSStat, &hServStatus)) + LogEvent (_T("Cannot set service status"), 101, TRUE); + return; +} + +INT +CreateServers() +{ DWORD dwThreadId[NUM_SERVICES]; HANDLE hThread[NUM_SERVICES]; INT i; + UpdateStatus(-1, -1); /* increment checkpoint */ + /* 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)); + _tprintf(_T("Starting %s server....\n"), Services[i].Name); - 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 + &Services[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) { + _tprintf(_T("Failed to start %s server....\n"), Services[i].Name); ExitProcess(i); } } @@ -125,20 +219,42 @@ { CloseHandle(hThread[i]); } - + return 0; } -int -main(int argc, char *argv[]) + +/* LogEvent is similar to the ReportError function used elsewhere + For a service, however, we ReportEvent rather than write to standard + error. Eventually, this function should go into the utility + library. */ +VOID +LogEvent (LPCTSTR UserMessage, DWORD ExitCode, BOOL PrintErrorMsg) { - DPRINT("tcpsvcs: main() started\n"); + DWORD eMsgLen, ErrNum = GetLastError (); + LPTSTR lpvSysMsg; + TCHAR MessageBuffer[512]; - StartServiceCtrlDispatcher(ServiceTable); + if (PrintErrorMsg) { + eMsgLen = FormatMessage (FORMAT_MESSAGE_ALLOCATE_BUFFER | + FORMAT_MESSAGE_FROM_SYSTEM, NULL, + ErrNum, MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT), + (LPTSTR)&lpvSysMsg, 0, NULL); - DPRINT("Umpnpmgr: main() done\n"); + _stprintf (MessageBuffer, _T("\n%s %s ErrNum = %d. ExitCode = %d."), + UserMessage, lpvSysMsg, ErrNum, ExitCode); + HeapFree (GetProcessHeap (), 0, lpvSysMsg); + /* Explained in Chapter 6. */ + } else { + _stprintf (MessageBuffer, _T("\n%s ExitCode = %d."), + UserMessage, ExitCode); + } - ExitThread(0); + fputs (MessageBuffer, hLogFile); - return 0; + if (ExitCode > 0) + ExitProcess (ExitCode); + else + return; } + #endif _____ Modified: trunk/reactos/apps/utils/net/tcpsvcs/tcpsvcs.h --- trunk/reactos/apps/utils/net/tcpsvcs/tcpsvcs.h 2005-10-03 14:42:34 UTC (rev 18247) +++ trunk/reactos/apps/utils/net/tcpsvcs/tcpsvcs.h 2005-10-03 18:32:30 UTC (rev 18248) @@ -5,9 +5,10 @@ #define QOTD_PORT 17 #define CHARGEN_PORT 19 -#define NUM_SERVICES 6 +#define NUM_SERVICES 5 #define BUF_SIZE 255 #define BUF 1024 +#define CS_TIMEOUT 1000 /* RFC865 states no more than 512 chars per line */ #define MAX_QUOTE_BUF 512 @@ -22,16 +23,24 @@ /* data structure to pass to threads */ typedef struct _Services { INT Port; + TCHAR *Name; LPTHREAD_START_ROUTINE Service; } SERVICES, *PSERVICES; -/* tcpsvcs functions */ -//static VOID CALLBACK ServiceMain(DWORD argc, LPTSTR *argv); +/* tcpsvcs functions * / +static VOID WINAPI ServiceMain(DWORD argc, LPTSTR argv[]); +VOID WINAPI ServerCtrlHandler(DWORD control); +INT CreateServers(VOID); +VOID LogEvent (LPCTSTR UserMessage, DWORD ExitCode, BOOL PrintErrorMsg); +void UpdateStatus (int NewStatus, int Check); +*/ + /* skelserver functions */ DWORD WINAPI StartServer(LPVOID lpParam); SOCKET SetUpListener(const char* ServAddr, int Port); -VOID AcceptConnections(SOCKET ListeningSocket, LPTHREAD_START_ROUTINE Service); +VOID AcceptConnections(SOCKET ListeningSocket, + LPTHREAD_START_ROUTINE Service, TCHAR *Name); BOOL EchoIncomingPackets(SOCKET sd); BOOL ShutdownConnection(SOCKET Sock, BOOL bRec);

19 years

[weiden] 18247: don't use invalid options in the DSOP_INIT_INFO structure of the computer selection dialog

by weiden＠svn.reactos.com

don't use invalid options in the DSOP_INIT_INFO structure of 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-10-03 13:44:18 UTC (rev 18246) +++ trunk/reactos/subsys/system/regedit/framewnd.c 2005-10-03 14:42:34 UTC (rev 18247) @@ -570,7 +570,7 @@ if (SUCCEEDED(hRet)) { DSOP_INIT_INFO InitInfo; - DSOP_SCOPE_INIT_INFO Scopes[] = + static DSOP_SCOPE_INIT_INFO Scopes[] = { { sizeof(DSOP_SCOPE_INIT_INFO), @@ -597,7 +597,7 @@ InitInfo.pwzTargetComputer = NULL; InitInfo.cDsScopeInfos = sizeof(Scopes) / sizeof(Scopes[0]); InitInfo.aDsScopeInfos = Scopes; - InitInfo.flOptions = DSOP_SCOPE_TYPE_TARGET_COMPUTER; + InitInfo.flOptions = 0; InitInfo.cAttributesToFetch = 0; InitInfo.apwzAttributeNames = NULL;

19 years

[weiden] 18246: build regedit as unicode by default

by weiden＠svn.reactos.com

build regedit as unicode by default Modified: trunk/reactos/subsys/system/regedit/framewnd.c Modified: trunk/reactos/subsys/system/regedit/regedit.xml Modified: trunk/reactos/subsys/system/regedit/regproc.c Modified: trunk/reactos/subsys/system/regedit/treeview.c _____ Modified: trunk/reactos/subsys/system/regedit/framewnd.c --- trunk/reactos/subsys/system/regedit/framewnd.c 2005-10-03 12:57:48 UTC (rev 18245) +++ trunk/reactos/subsys/system/regedit/framewnd.c 2005-10-03 13:44:18 UTC (rev 18246) @@ -263,7 +263,7 @@ /* ofn.lCustData = ;*/ if (GetOpenFileName(&ofn)) { /* FIXME - convert to ascii */ - if (!import_registry_file((LPSTR)ofn.lpstrFile)) { + if (!import_registry_file(ofn.lpstrFile)) { /*printf("Can't open file \"%s\"\n", ofn.lpstrFile);*/ return FALSE; } @@ -617,7 +617,7 @@ static HRESULT InvokeRemoteRegistryPickerDialog(IN IDsObjectPicker *pDsObjectPicker, IN HWND hwndParent OPTIONAL, - OUT LPWSTR lpBuffer, + OUT LPTSTR lpBuffer, IN UINT uSize) { IDataObject *pdo = NULL; @@ -652,10 +652,20 @@ { nlen = uSize - 1; } - +#if UNICODE memcpy(lpBuffer, SelectionList->aDsSelection[0].pwzName, nlen * sizeof(WCHAR)); +#else + WideCharToMultiByte(CP_ACP, + 0, + SelectionList->aDsSelection[0].pwzName, + nlen, + lpBuffer, + uSize, + NULL, + NULL); +#endif lpBuffer[nlen] = L'\0'; } @@ -704,7 +714,7 @@ case ID_REGISTRY_CONNECTNETWORKREGISTRY: { IDsObjectPicker *ObjectPicker; - WCHAR szComputerName[MAX_COMPUTERNAME_LENGTH + 1]; + TCHAR szComputerName[MAX_COMPUTERNAME_LENGTH + 1]; HRESULT hRet; hRet = CoInitialize(NULL); _____ Modified: trunk/reactos/subsys/system/regedit/regedit.xml --- trunk/reactos/subsys/system/regedit/regedit.xml 2005-10-03 12:57:48 UTC (rev 18245) +++ trunk/reactos/subsys/system/regedit/regedit.xml 2005-10-03 13:44:18 UTC (rev 18246) @@ -1,8 +1,10 @@ <module name="regedit" type="win32gui" installname="regedit.exe"> <include base="regedit">.</include> <define name="__USE_W32API" /> + <define name="UNICODE" /> + <define name="_UNICODE" /> <define name="_WIN32_IE">0x0501</define> - <define name="_WIN32_WINNT">0x0501</define> + <define name="_WIN32_WINNT">0x0600</define> <library>uuid</library> <library>kernel32</library> <library>user32</library> _____ Modified: trunk/reactos/subsys/system/regedit/regproc.c --- trunk/reactos/subsys/system/regedit/regproc.c 2005-10-03 12:57:48 UTC (rev 18245) +++ trunk/reactos/subsys/system/regedit/regproc.c 2005-10-03 13:44:18 UTC (rev 18246) @@ -427,7 +427,7 @@ } } - hRes = RegSetValueEx( + hRes = RegSetValueExA( currentKeyHandle, val_name, 0, /* Reserved */ @@ -987,7 +987,7 @@ return; /* Load and register the library, then free it */ - theLib = LoadLibrary(stdInput); + theLib = LoadLibraryA(stdInput); if (theLib) { FARPROC lpfnDLLRegProc = GetProcAddress(theLib, "DllRegisterServer"); if (lpfnDLLRegProc) @@ -1020,7 +1020,7 @@ return; /* Load and unregister the library, then free it */ - theLib = LoadLibrary(stdInput); + theLib = LoadLibraryA(stdInput); if (theLib) { FARPROC lpfnDLLRegProc = GetProcAddress(theLib, "DllUnregisterServer"); if (lpfnDLLRegProc) @@ -1174,8 +1174,8 @@ DWORD value_type; DWORD val_name_len1 = *val_name_len; DWORD val_size1 = *val_size; - ret = RegEnumValue(key, i, *val_name_buf, &val_name_len1, NULL, - &value_type, *val_buf, &val_size1); + ret = RegEnumValueA(key, i, *val_name_buf, &val_name_len1, NULL, + &value_type, *val_buf, &val_size1); if (ret != ERROR_SUCCESS) { more_data = FALSE; if (ret != ERROR_NO_MORE_ITEMS) { @@ -1258,8 +1258,8 @@ while(more_data) { DWORD buf_len = *reg_key_name_len - curr_len; - ret = RegEnumKeyEx(key, i, *reg_key_name_buf + curr_len + 1, &buf_len, - NULL, NULL, NULL, NULL); + ret = RegEnumKeyExA(key, i, *reg_key_name_buf + curr_len + 1, &buf_len, + NULL, NULL, NULL, NULL); if (ret != ERROR_SUCCESS && ret != ERROR_MORE_DATA) { more_data = FALSE; if (ret != ERROR_NO_MORE_ITEMS) { @@ -1269,8 +1269,8 @@ HKEY subkey; i++; - if (RegOpenKey(key, *reg_key_name_buf + curr_len + 1, - &subkey) == ERROR_SUCCESS) { + if (RegOpenKeyA(key, *reg_key_name_buf + curr_len + 1, + &subkey) == ERROR_SUCCESS) { export_hkey(file, subkey, reg_key_name_buf, reg_key_name_len, val_name_buf, val_name_len, val_buf, val_size); RegCloseKey(subkey); @@ -1348,7 +1348,7 @@ &reg_key_name_buf, &reg_key_name_len, &val_name_buf, &val_name_len, &val_buf, &val_size); - } else if (RegOpenKey(reg_key_class, branch_name, &key) == ERROR_SUCCESS) { + } else if (RegOpenKeyA(reg_key_class, branch_name, &key) == ERROR_SUCCESS) { file = REGPROC_open_export_file(file_name); export_hkey(file, key, &reg_key_name_buf, &reg_key_name_len, @@ -1393,7 +1393,7 @@ */ BOOL import_registry_file(LPTSTR filename) { - FILE* reg_file = fopen(filename, "r"); + FILE* reg_file = _tfopen(filename, _T("r")); if (reg_file) { processRegLines(reg_file, doSetValue); @@ -1415,7 +1415,7 @@ LONG ret; long int i; - if (RegOpenKey(key, *reg_key_name_buf, &branch_key) != ERROR_SUCCESS) { + if (RegOpenKeyA(key, *reg_key_name_buf, &branch_key) != ERROR_SUCCESS) { REGPROC_print_error(); } @@ -1434,8 +1434,8 @@ for (i = subkeys - 1; i >= 0; i--) { DWORD buf_len = *reg_key_name_len - curr_len; - ret = RegEnumKeyEx(branch_key, i, *reg_key_name_buf + curr_len + 1, - &buf_len, NULL, NULL, NULL, NULL); + ret = RegEnumKeyExA(branch_key, i, *reg_key_name_buf + curr_len + 1, + &buf_len, NULL, NULL, NULL, NULL); if (ret != ERROR_SUCCESS && ret != ERROR_MORE_DATA && ret != ERROR_NO_MORE_ITEMS) { @@ -1446,7 +1446,7 @@ } (*reg_key_name_buf)[curr_len] = '\0'; RegCloseKey(branch_key); - RegDeleteKey(key, *reg_key_name_buf); + RegDeleteKeyA(key, *reg_key_name_buf); } /*********************************************************************** ******* @@ -1480,7 +1480,7 @@ getAppName(), reg_key_name); exit(1); } - if (RegOpenKey(reg_key_class, branch_name, &branch_key) == ERROR_SUCCESS) { + if (RegOpenKeyA(reg_key_class, branch_name, &branch_key) == ERROR_SUCCESS) { /* check whether the key exists */ RegCloseKey(branch_key); delete_branch(reg_key_class, &branch_name, &branch_name_len); _____ Modified: trunk/reactos/subsys/system/regedit/treeview.c --- trunk/reactos/subsys/system/regedit/treeview.c 2005-10-03 12:57:48 UTC (rev 18245) +++ trunk/reactos/subsys/system/regedit/treeview.c 2005-10-03 13:44:18 UTC (rev 18246) @@ -136,7 +136,7 @@ HTREEITEM childItem; LPCTSTR KeyPath; DWORD dwCount, dwIndex, dwMaxSubKeyLen; - LPSTR Name = NULL; + LPTSTR Name = NULL; TVITEM tvItem; LPTSTR pszNodes = NULL; BOOL bSuccess = FALSE; @@ -235,7 +235,7 @@ /* Check if the node is already in there. */ if (pszNodes) { for (s = pszNodes; *s; s += _tcslen(s) + 1) { - if (!strcmp(s, Name)) { + if (!_tcscmp(s, Name)) { found = TRUE; break; } @@ -616,7 +616,7 @@ if (!TreeView_Expand(hwndTV, hChildItem, TVE_EXPAND)) return FALSE; - keyPath = s ? s + 1 : ""; + keyPath = s ? s + 1 : _T(""); hItem = hChildItem; }

19 years

[hpoussin] 18245: Remove debug output I've incidentally added...

by hpoussin＠svn.reactos.com

Remove debug output I've incidentally added... Modified: trunk/reactos/drivers/bus/acpi/ospm/fdo.c _____ Modified: trunk/reactos/drivers/bus/acpi/ospm/fdo.c --- trunk/reactos/drivers/bus/acpi/ospm/fdo.c 2005-10-03 12:53:31 UTC (rev 18244) +++ trunk/reactos/drivers/bus/acpi/ospm/fdo.c 2005-10-03 12:57:48 UTC (rev 18245) @@ -122,7 +122,6 @@ { PWSTR Buffer; - DPRINT1("'%s', '%s', %ld\n", Node->device.id.hid, "PNP040", RtlCompareMemory(Node->device.id.hid, "PNP040", 6)); if (RtlCompareMemory(Node->device.id.hid, "PNP000", 6) == 6) Buffer = L"Programmable interrupt controller"; else if (RtlCompareMemory(Node->device.id.hid, "PNP010", 6) == 6)

19 years

[hpoussin] 18244: Implement IRP_MJ_PNP / IRP_MN_QUERY_TEXT / DeviceTextDescription for ACPI devices

by hpoussin＠svn.reactos.com

Implement IRP_MJ_PNP / IRP_MN_QUERY_TEXT / DeviceTextDescription for ACPI devices Modified: trunk/reactos/drivers/bus/acpi/ospm/fdo.c Modified: trunk/reactos/drivers/bus/acpi/ospm/include/acpisys.h Modified: trunk/reactos/drivers/bus/acpi/ospm/pdo.c _____ Modified: trunk/reactos/drivers/bus/acpi/ospm/fdo.c --- trunk/reactos/drivers/bus/acpi/ospm/fdo.c 2005-10-03 12:39:50 UTC (rev 18243) +++ trunk/reactos/drivers/bus/acpi/ospm/fdo.c 2005-10-03 12:53:31 UTC (rev 18244) @@ -116,6 +116,52 @@ } +BOOLEAN +AcpiCreateDeviceDescriptionString(PUNICODE_STRING DeviceDescription, + BM_NODE *Node) +{ + PWSTR Buffer; + + DPRINT1("'%s', '%s', %ld\n", Node->device.id.hid, "PNP040", RtlCompareMemory(Node->device.id.hid, "PNP040", 6)); + if (RtlCompareMemory(Node->device.id.hid, "PNP000", 6) == 6) + Buffer = L"Programmable interrupt controller"; + else if (RtlCompareMemory(Node->device.id.hid, "PNP010", 6) == 6) + Buffer = L"System timer"; + else if (RtlCompareMemory(Node->device.id.hid, "PNP020", 6) == 6) + Buffer = L"DMA controller"; + else if (RtlCompareMemory(Node->device.id.hid, "PNP03", 5) == 5) + Buffer = L"Keyboard"; + else if (RtlCompareMemory(Node->device.id.hid, "PNP040", 6) == 6) + Buffer = L"Parallel port"; + else if (RtlCompareMemory(Node->device.id.hid, "PNP05", 5) == 5) + Buffer = L"Serial port"; + else if (RtlCompareMemory(Node->device.id.hid, "PNP06", 5) ==5) + Buffer = L"Disk controller"; + else if (RtlCompareMemory(Node->device.id.hid, "PNP07", 5) == 5) + Buffer = L"Disk controller"; + else if (RtlCompareMemory(Node->device.id.hid, "PNP09", 5) == 5) + Buffer = L"Display adapter"; + else if (RtlCompareMemory(Node->device.id.hid, "PNP0A0", 6) == 6) + Buffer = L"Bus controller"; + else if (RtlCompareMemory(Node->device.id.hid, "PNP0E0", 6) == 6) + Buffer = L"PCMCIA controller"; + else if (RtlCompareMemory(Node->device.id.hid, "PNP0F", 5) == 5) + Buffer = L"Mouse device"; + else if (RtlCompareMemory(Node->device.id.hid, "PNP8", 4) == 4) + Buffer = L"Network adapter"; + else if (RtlCompareMemory(Node->device.id.hid, "PNPA0", 5) == 5) + Buffer = L"SCSI controller"; + else if (RtlCompareMemory(Node->device.id.hid, "PNPB0", 5) == 5) + Buffer = L"Multimedia device"; + else if (RtlCompareMemory(Node->device.id.hid, "PNPC00", 6) == 6) + Buffer = L"Modem"; + else + Buffer = L"Other ACPI device"; + + return AcpiCreateUnicodeString(DeviceDescription, Buffer, PagedPool); +} + + static BOOLEAN AcpiCreateResourceList(PCM_RESOURCE_LIST* pResourceList, PULONG ResourceListSize, @@ -460,6 +506,15 @@ // ErrorOccurred = TRUE; // break; } + + if (!AcpiCreateDeviceDescriptionString(&PdoDeviceExtension->DeviceDescripti on, + Node)) + { + ASSERT(FALSE); +// ErrorStatus = STATUS_INSUFFICIENT_RESOURCES; +// ErrorOccurred = TRUE; +// break; + } } } _____ Modified: trunk/reactos/drivers/bus/acpi/ospm/include/acpisys.h --- trunk/reactos/drivers/bus/acpi/ospm/include/acpisys.h 2005-10-03 12:39:50 UTC (rev 18243) +++ trunk/reactos/drivers/bus/acpi/ospm/include/acpisys.h 2005-10-03 12:53:31 UTC (rev 18244) @@ -47,6 +47,8 @@ UNICODE_STRING InstanceID; // Hardware IDs UNICODE_STRING HardwareIDs; + // Textual description of device + UNICODE_STRING DeviceDescription; // Resource list PCM_RESOURCE_LIST ResourceList; ULONG ResourceListSize; _____ Modified: trunk/reactos/drivers/bus/acpi/ospm/pdo.c --- trunk/reactos/drivers/bus/acpi/ospm/pdo.c 2005-10-03 12:39:50 UTC (rev 18243) +++ trunk/reactos/drivers/bus/acpi/ospm/pdo.c 2005-10-03 12:53:31 UTC (rev 18244) @@ -43,6 +43,46 @@ static NTSTATUS +PdoQueryDeviceText( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + PIO_STACK_LOCATION IrpSp) +{ + PPDO_DEVICE_EXTENSION DeviceExtension; + PWSTR Buffer; + NTSTATUS Status; + + DPRINT("Called\n"); + + DeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + Status = STATUS_SUCCESS; + + switch (IrpSp->Parameters.QueryDeviceText.DeviceTextType) + { + case DeviceTextDescription: + DPRINT("DeviceTextDescription\n"); + Buffer = (PWSTR)ExAllocatePool(PagedPool, DeviceExtension->DeviceDescription.Length + sizeof(UNICODE_NULL)); + if (Buffer == NULL) + Status = STATUS_INSUFFICIENT_RESOURCES; + else + { + RtlCopyMemory(Buffer, DeviceExtension->DeviceDescription.Buffer, DeviceExtension->DeviceDescription.Length); + Buffer[DeviceExtension->DeviceDescription.Length / sizeof(WCHAR)] = UNICODE_NULL; + Irp->IoStatus.Information = (ULONG_PTR)Buffer; + } + break; + + default: + Irp->IoStatus.Information = 0; + Status = STATUS_INVALID_PARAMETER; + } + + return Status; +} + + +static NTSTATUS PdoQueryId( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -241,6 +281,7 @@ break; case IRP_MN_QUERY_DEVICE_TEXT: + Status = PdoQueryDeviceText(DeviceObject, Irp, IrpSp); break; case IRP_MN_QUERY_ID:

19 years

[npwoods] 18243: Regedit: Added a "Goto key" right-click option.

by npwoods＠svn.reactos.com

Regedit: Added a "Goto key" right-click option. This feature allows the user to right click on certain keys that "link" to other keys, Regedit can provide additional "Go to ...." menu items. For example, if you click on a ProgID under HKCR, a "Go to 'HKCR\CLSID\{....}' menu item will appear. Modified: trunk/reactos/subsys/system/regedit/En.rc Modified: trunk/reactos/subsys/system/regedit/childwnd.c Modified: trunk/reactos/subsys/system/regedit/main.h Modified: trunk/reactos/subsys/system/regedit/resource.h Modified: trunk/reactos/subsys/system/regedit/treeview.c _____ Modified: trunk/reactos/subsys/system/regedit/En.rc --- trunk/reactos/subsys/system/regedit/En.rc 2005-10-03 12:12:19 UTC (rev 18242) +++ trunk/reactos/subsys/system/regedit/En.rc 2005-10-03 12:39:50 UTC (rev 18243) @@ -340,6 +340,7 @@ BEGIN IDS_EXPAND "&Expand" IDS_COLLAPSE "&Collapse" + IDS_GOTO_SUGGESTED_KEY "&Go to '%s'" END /*****************************************************************/ _____ Modified: trunk/reactos/subsys/system/regedit/childwnd.c --- trunk/reactos/subsys/system/regedit/childwnd.c 2005-10-03 12:12:19 UTC (rev 18242) +++ trunk/reactos/subsys/system/regedit/childwnd.c 2005-10-03 12:39:50 UTC (rev 18243) @@ -30,6 +30,7 @@ ChildWnd* g_pChildWnd; HBITMAP SizingPattern = 0; HBRUSH SizingBrush = 0; +static TCHAR Suggestions[256]; /*********************************************************************** ******** * Local module support methods @@ -106,11 +107,12 @@ ChildWnd* pChildWnd = g_pChildWnd; HTREEITEM hSelection; HKEY hRootKey; - LPCTSTR keyPath; + LPCTSTR keyPath, s; TCHAR szConfirmTitle[256]; TCHAR szConfirmText[256]; + WORD wID = LOWORD(wParam); - switch (LOWORD(wParam)) { + switch (wID) { /* Parse the menu selections: */ case ID_REGISTRY_EXIT: DestroyWindow(hWnd); @@ -154,6 +156,18 @@ SetFocus(pChildWnd->nFocusPanel? pChildWnd->hListWnd: pChildWnd->hTreeWnd); break; default: + if ((wID >= ID_TREE_SUGGESTION_MIN) && (wID <= ID_TREE_SUGGESTION_MAX)) + { + s = Suggestions; + while(wID > ID_TREE_SUGGESTION_MIN) + { + if (*s) + s += _tcslen(s) + 1; + wID--; + } + SelectNode(pChildWnd->hTreeWnd, s); + break; + } return FALSE; } return TRUE; @@ -161,6 +175,115 @@ /*********************************************************************** ******** * + * Key suggestion + */ + +static LONG RegQueryStringValue(HKEY hKey, LPCTSTR lpSubKey, LPCTSTR lpValueName, + LPTSTR lpDest, DWORD dwDestLength) +{ + LONG lResult; + HKEY hSubKey = NULL; + DWORD cbData, dwType; + + if (lpSubKey) + { + lResult = RegOpenKey(hKey, lpSubKey, &hSubKey); + if (lResult != ERROR_SUCCESS) + goto done; + hKey = hSubKey; + } + + cbData = (dwDestLength - 1) * sizeof(*lpDest); + lResult = RegQueryValueEx(hKey, lpValueName, NULL, &dwType, + (LPBYTE) lpDest, &cbData); + if (lResult != ERROR_SUCCESS) + goto done; + if (dwType != REG_SZ) + { + lResult = -1; + goto done; + } + + lpDest[cbData / sizeof(*lpDest)] = '\0'; + +done: + if (lResult != ERROR_SUCCESS) + lpDest[0] = '\0'; + if (hSubKey) + RegCloseKey(hSubKey); + return lResult; +} + +static void SuggestKeys(HKEY hRootKey, LPCTSTR pszKeyPath, LPTSTR pszSuggestions, + size_t iSuggestionsLength) +{ + TCHAR szBuffer[256]; + TCHAR szLastFound[256]; + size_t i; + HKEY hOtherKey, hSubKey; + BOOL bFound; + + memset(pszSuggestions, 0, iSuggestionsLength * sizeof(*pszSuggestions)); + iSuggestionsLength--; + + /* Are we a root key in HKEY_CLASSES_ROOT? */ + if ((hRootKey == HKEY_CLASSES_ROOT) && pszKeyPath[0] && !_tcschr(pszKeyPath, '\\')) + { + do + { + bFound = FALSE; + + /* Check default key */ + if (RegQueryStringValue(hRootKey, pszKeyPath, NULL, + szBuffer, sizeof(szBuffer) / sizeof(szBuffer[0])) == ERROR_SUCCESS) + { + if (szBuffer[0] != '\0') + { + if (RegOpenKey(hRootKey, szBuffer, &hOtherKey) == ERROR_SUCCESS) + { + lstrcpyn(pszSuggestions, TEXT("HKCR\\"), iSuggestionsLength); + i = _tcslen(pszSuggestions); + pszSuggestions += i; + iSuggestionsLength -= i; + + lstrcpyn(pszSuggestions, szBuffer, iSuggestionsLength); + i = _tcslen(pszSuggestions) + 1; + pszSuggestions += i; + iSuggestionsLength -= i; + RegCloseKey(hOtherKey); + + bFound = TRUE; + _tcscpy(szLastFound, szBuffer); + pszKeyPath = szLastFound; + } + } + } + } + while(bFound); + + /* Check CLSID key */ + if (RegOpenKey(hRootKey, pszKeyPath, &hSubKey) == ERROR_SUCCESS) + { + if (RegQueryStringValue(hSubKey, TEXT("CLSID"), NULL, + szBuffer, sizeof(szBuffer) / sizeof(szBuffer[0])) == ERROR_SUCCESS) + { + lstrcpyn(pszSuggestions, TEXT("HKCR\\CLSID\\"), iSuggestionsLength); + i = _tcslen(pszSuggestions); + pszSuggestions += i; + iSuggestionsLength -= i; + + lstrcpyn(pszSuggestions, szBuffer, iSuggestionsLength); + i = _tcslen(pszSuggestions) + 1; + pszSuggestions += i; + iSuggestionsLength -= i; + } + RegCloseKey(hSubKey); + } + } +} + +/********************************************************************** ********* + * * FUNCTION: ChildWndProc(HWND, unsigned, WORD, LONG) * * PURPOSE: Processes messages for the child windows. @@ -407,8 +530,13 @@ HMENU hContextMenu; TVITEM item; MENUITEMINFO mii; + TCHAR resource[256]; TCHAR buffer[256]; LPTSTR s; + LPCTSTR keyPath; + HKEY hRootKey; + int iLastPos; + WORD wID; pt = MAKEPOINTS(lParam); hti.pt.x = pt.x; @@ -426,17 +554,58 @@ item.hItem = hti.hItem; TreeView_GetItem(pChildWnd->hTreeWnd, &item); + /* Set the Expand/Collapse menu item appropriately */ LoadString(hInst, (item.state & TVIS_EXPANDED) ? IDS_COLLAPSE : IDS_EXPAND, buffer, sizeof(buffer) / sizeof(buffer[0])); - memset(&mii, 0, sizeof(mii)); mii.cbSize = sizeof(mii); mii.fMask = MIIM_STRING | MIIM_STATE | MIIM_ID; mii.fState = (item.cChildren > 0) ? MFS_DEFAULT : MFS_GRAYED; mii.wID = (item.state & TVIS_EXPANDED) ? ID_TREE_COLLAPSEBRANCH : ID_TREE_EXPANDBRANCH; - s = buffer; - memcpy(&mii.dwTypeData, &s, sizeof(mii.dwTypeData)); /* arg MinGW */ + mii.dwTypeData = (LPTSTR) buffer; SetMenuItemInfo(hContextMenu, 0, TRUE, &mii); + /* Remove any existing suggestions */ + memset(&mii, 0, sizeof(mii)); + mii.cbSize = sizeof(mii); + mii.fMask = MIIM_ID; + GetMenuItemInfo(hContextMenu, GetMenuItemCount(hContextMenu) - 1, TRUE, &mii); + if ((mii.wID >= ID_TREE_SUGGESTION_MIN) && (mii.wID <= ID_TREE_SUGGESTION_MAX)) + { + do + { + iLastPos = GetMenuItemCount(hContextMenu) - 1; + GetMenuItemInfo(hContextMenu, iLastPos, TRUE, &mii); + RemoveMenu(hContextMenu, iLastPos, MF_BYPOSITION); + } + while((mii.wID >= ID_TREE_SUGGESTION_MIN) && (mii.wID <= ID_TREE_SUGGESTION_MAX)); + } + + /* Come up with suggestions */ + keyPath = GetItemPath(pChildWnd->hTreeWnd, NULL, &hRootKey); + SuggestKeys(hRootKey, keyPath, Suggestions, sizeof(Suggestions) / sizeof(Suggestions[0])); + if (Suggestions[0]) + { + AppendMenu(hContextMenu, MF_SEPARATOR, 0, NULL); + + LoadString(hInst, IDS_GOTO_SUGGESTED_KEY, resource, sizeof(resource) / sizeof(resource[0])); + + s = Suggestions; + wID = ID_TREE_SUGGESTION_MIN; + while(*s && (wID <= ID_TREE_SUGGESTION_MAX)) + { + _sntprintf(buffer, sizeof(buffer) / sizeof(buffer[0]), resource, s); + + memset(&mii, 0, sizeof(mii)); + mii.cbSize = sizeof(mii); + mii.fMask = MIIM_STRING | MIIM_ID; + mii.wID = wID++; + mii.dwTypeData = buffer; + InsertMenuItem(hContextMenu, GetMenuItemCount(hContextMenu), TRUE, &mii); + + s += _tcslen(s) + 1; + } + } + TrackPopupMenu(hContextMenu, TPM_RIGHTBUTTON, pt.x, pt.y, 0, pChildWnd->hWnd, NULL); } } _____ Modified: trunk/reactos/subsys/system/regedit/main.h --- trunk/reactos/subsys/system/regedit/main.h 2005-10-03 12:12:19 UTC (rev 18242) +++ trunk/reactos/subsys/system/regedit/main.h 2005-10-03 12:39:50 UTC (rev 18243) @@ -105,6 +105,7 @@ extern HTREEITEM InsertNode(HWND hwndTV, HTREEITEM hItem, LPTSTR name); extern HWND StartKeyRename(HWND hwndTV); extern BOOL CreateNewKey(HWND hwndTV, HTREEITEM hItem); +extern BOOL SelectNode(HWND hwndTV, LPCTSTR keyPath); /* edit.c */ extern BOOL ModifyValue(HWND hwnd, HKEY hKey, LPCTSTR valueName, BOOL EditBin); _____ Modified: trunk/reactos/subsys/system/regedit/resource.h --- trunk/reactos/subsys/system/regedit/resource.h 2005-10-03 12:12:19 UTC (rev 18242) +++ trunk/reactos/subsys/system/regedit/resource.h 2005-10-03 12:39:50 UTC (rev 18243) @@ -133,6 +133,8 @@ #define IDS_QUERY_DELETE_KEY_ONE 32875 #define IDS_QUERY_DELETE_KEY_MORE 32876 #define IDS_QUERY_DELETE_KEY_CONFIRM 32877 +#define ID_TREE_SUGGESTION_MIN 32878 +#define ID_TREE_SUGGESTION_MAX 32887 #define IDS_FLT_REGFILES 31001 #define IDS_FLT_REGFILES_FLT 31002 @@ -161,6 +163,7 @@ #define IDS_COLLAPSE 31125 #define IDS_NEW_KEY 31126 #define IDS_NEW_VALUE 31127 +#define IDS_GOTO_SUGGESTED_KEY 31128 #define IDD_EDIT_STRING 2000 _____ Modified: trunk/reactos/subsys/system/regedit/treeview.c --- trunk/reactos/subsys/system/regedit/treeview.c 2005-10-03 12:12:19 UTC (rev 18242) +++ trunk/reactos/subsys/system/regedit/treeview.c 2005-10-03 12:39:50 UTC (rev 18243) @@ -28,6 +28,8 @@ #include <tchar.h> #include <process.h> #include <stdio.h> +#include <string.h> +#include <tchar.h> #include "main.h" @@ -558,3 +560,69 @@ } return hwndTV; } + +BOOL SelectNode(HWND hwndTV, LPCTSTR keyPath) +{ + HTREEITEM hRoot, hItem; + HTREEITEM hChildItem; + TCHAR szPathPart[128]; + TCHAR szBuffer[128]; + LPCTSTR s; + TVITEM tvi; + + hRoot = TreeView_GetRoot(hwndTV); + hItem = hRoot; + + while(keyPath[0]) + { + s = _tcschr(keyPath, '\\'); + lstrcpyn(szPathPart, keyPath, s ? s - keyPath + 1 : _tcslen(keyPath) + 1); + + /* Special case for root to expand root key abbreviations */ + if (hItem == hRoot) + { + if (!_tcscmp(szPathPart, TEXT("HKCR"))) + _tcscpy(szPathPart, TEXT("HKEY_CLASSES_ROOT")); + else if (!_tcscmp(szPathPart, TEXT("HKCU"))) + _tcscpy(szPathPart, TEXT("HKEY_CURRENT_USER")); + else if (!_tcscmp(szPathPart, TEXT("HKLM"))) + _tcscpy(szPathPart, TEXT("HKEY_LOCAL_MACHINE")); + else if (!_tcscmp(szPathPart, TEXT("HKU"))) + _tcscpy(szPathPart, TEXT("HKEY_USERS")); + else if (!_tcscmp(szPathPart, TEXT("HKCC"))) + _tcscpy(szPathPart, TEXT("HKEY_CURRENT_CONFIG")); + else if (!_tcscmp(szPathPart, TEXT("HKDD"))) + _tcscpy(szPathPart, TEXT("HKEY_DYN_DATA")); + } + + for (hChildItem = TreeView_GetChild(hwndTV, hItem); hChildItem; + hChildItem = TreeView_GetNextSibling(hwndTV, hChildItem)) + { + memset(&tvi, 0, sizeof(tvi)); + tvi.hItem = hChildItem; + tvi.mask = TVIF_TEXT; + tvi.pszText = szBuffer; + tvi.cchTextMax = sizeof(szBuffer) / sizeof(szBuffer[0]); + + TreeView_GetItem(hwndTV, &tvi); + + if (!_tcscmp(szBuffer, szPathPart)) + break; + } + + if (!hChildItem) + return FALSE; + + if (!TreeView_Expand(hwndTV, hChildItem, TVE_EXPAND)) + return FALSE; + + keyPath = s ? s + 1 : ""; + hItem = hChildItem; + } + + TreeView_SelectItem(hwndTV, hItem); + TreeView_EnsureVisible(hwndTV, hItem); + + return TRUE; +} +

19 years

[ekohl] 18242: Revert sublang changes.

by ekohl＠svn.reactos.com

Revert sublang changes. Modified: trunk/reactos/lib/cpl/hdwwiz/De.rc Modified: trunk/reactos/lib/cpl/hdwwiz/En.rc Modified: trunk/reactos/lib/cpl/hdwwiz/Fr.rc _____ Modified: trunk/reactos/lib/cpl/hdwwiz/De.rc --- trunk/reactos/lib/cpl/hdwwiz/De.rc 2005-10-03 10:13:28 UTC (rev 18241) +++ trunk/reactos/lib/cpl/hdwwiz/De.rc 2005-10-03 12:12:19 UTC (rev 18242) @@ -1,4 +1,4 @@ -LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE BEGIN _____ Modified: trunk/reactos/lib/cpl/hdwwiz/En.rc --- trunk/reactos/lib/cpl/hdwwiz/En.rc 2005-10-03 10:13:28 UTC (rev 18241) +++ trunk/reactos/lib/cpl/hdwwiz/En.rc 2005-10-03 12:12:19 UTC (rev 18242) @@ -1,4 +1,4 @@ -LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US STRINGTABLE BEGIN _____ Modified: trunk/reactos/lib/cpl/hdwwiz/Fr.rc --- trunk/reactos/lib/cpl/hdwwiz/Fr.rc 2005-10-03 10:13:28 UTC (rev 18241) +++ trunk/reactos/lib/cpl/hdwwiz/Fr.rc 2005-10-03 12:12:19 UTC (rev 18242) @@ -1,4 +1,4 @@ -LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE BEGIN

19 years

[hpoussin] 18241: Reference the PDO before returning it

by hpoussin＠svn.reactos.com

Reference the PDO before returning it Modified: trunk/reactos/ntoskrnl/io/plugplay.c _____ Modified: trunk/reactos/ntoskrnl/io/plugplay.c --- trunk/reactos/ntoskrnl/io/plugplay.c 2005-10-03 09:14:57 UTC (rev 18240) +++ trunk/reactos/ntoskrnl/io/plugplay.c 2005-10-03 10:13:28 UTC (rev 18241) @@ -231,7 +231,10 @@ if (RtlEqualUnicodeString(&Node->InstancePath, DeviceInstance, TRUE)) + { + ObReferenceObject(Node->PhysicalDeviceObject); return Node->PhysicalDeviceObject; + } /* Traversal of all children nodes */ for (ChildNode = Node->Child;

19 years

[ekohl] 18240: - Add german resources.

by ekohl＠svn.reactos.com

- Add german resources. - Use SUBLANG_DEFAULT by default. - Fix control panel description. Added: trunk/reactos/lib/cpl/hdwwiz/De.rc Modified: trunk/reactos/lib/cpl/hdwwiz/En.rc Modified: trunk/reactos/lib/cpl/hdwwiz/Fr.rc Modified: trunk/reactos/lib/cpl/hdwwiz/hdwwiz.rc _____ Added: trunk/reactos/lib/cpl/hdwwiz/De.rc --- trunk/reactos/lib/cpl/hdwwiz/De.rc 2005-10-03 07:48:59 UTC (rev 18239) +++ trunk/reactos/lib/cpl/hdwwiz/De.rc 2005-10-03 09:14:57 UTC (rev 18240) @@ -0,0 +1,7 @@ +LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_CPLNAME "Hardware" + IDS_CPLDESCRIPTION "Installiert neue Hardwarekomponenten." +END _____ Modified: trunk/reactos/lib/cpl/hdwwiz/En.rc --- trunk/reactos/lib/cpl/hdwwiz/En.rc 2005-10-03 07:48:59 UTC (rev 18239) +++ trunk/reactos/lib/cpl/hdwwiz/En.rc 2005-10-03 09:14:57 UTC (rev 18240) @@ -1,4 +1,4 @@ -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE BEGIN _____ Modified: trunk/reactos/lib/cpl/hdwwiz/Fr.rc --- trunk/reactos/lib/cpl/hdwwiz/Fr.rc 2005-10-03 07:48:59 UTC (rev 18239) +++ trunk/reactos/lib/cpl/hdwwiz/Fr.rc 2005-10-03 09:14:57 UTC (rev 18240) @@ -1,4 +1,4 @@ -LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL +LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT STRINGTABLE BEGIN _____ Modified: trunk/reactos/lib/cpl/hdwwiz/hdwwiz.rc --- trunk/reactos/lib/cpl/hdwwiz/hdwwiz.rc 2005-10-03 07:48:59 UTC (rev 18239) +++ trunk/reactos/lib/cpl/hdwwiz/hdwwiz.rc 2005-10-03 09:14:57 UTC (rev 18240) @@ -5,7 +5,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Software Control Panel\0" +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Hardware Control Panel\0" #define REACTOS_STR_INTERNAL_NAME "hdwwiz\0" #define REACTOS_STR_ORIGINAL_FILENAME "hdwwiz.cpl\0" @@ -17,5 +17,6 @@ IDI_CPLICON ICON "resources/applet.ico" +#include "De.rc" #include "En.rc" #include "Fr.rc"

19 years

[hpoussin] 18239: Add "Add hardware" control panel applet.

by hpoussin＠svn.reactos.com

Add "Add hardware" control panel applet. Not added to the build, as InstallNewDevice in newdev.dll is not implemented Modified: trunk/reactos/baseaddress.xml Added: trunk/reactos/lib/cpl/hdwwiz/ Added: trunk/reactos/lib/cpl/hdwwiz/En.rc Added: trunk/reactos/lib/cpl/hdwwiz/Fr.rc Added: trunk/reactos/lib/cpl/hdwwiz/hdwwiz.c Added: trunk/reactos/lib/cpl/hdwwiz/hdwwiz.def Added: trunk/reactos/lib/cpl/hdwwiz/hdwwiz.h Added: trunk/reactos/lib/cpl/hdwwiz/hdwwiz.rc Added: trunk/reactos/lib/cpl/hdwwiz/hdwwiz.xml Added: trunk/reactos/lib/cpl/hdwwiz/resource.h Added: trunk/reactos/lib/cpl/hdwwiz/resources/ Added: trunk/reactos/lib/cpl/hdwwiz/resources/applet.ico _____ Modified: trunk/reactos/baseaddress.xml --- trunk/reactos/baseaddress.xml 2005-10-03 07:26:39 UTC (rev 18238) +++ trunk/reactos/baseaddress.xml 2005-10-03 07:48:59 UTC (rev 18239) @@ -5,6 +5,7 @@ <property name="BASEADDRESS_UXTHEME" value="0x5AD70000" /> <property name="BASEADDRESS_OBJSEL" value="0x5B400000" /> <property name="BASEADDRESS_DINPUT" value="0x5F580000" /> +<property name="BASEADDRESS_HDWWIZ" value="0x64D40000" /> <property name="BASEADDRESS_TIMEDATE" value="0x64DA0000" /> <property name="BASEADDRESS_SYSDM" value="0x64DD0000" /> <property name="BASEADDRESS_MAIN" value="0x64F40000" /> Property changes on: trunk/reactos/lib/cpl/hdwwiz ___________________________________________________________________ Name: svn:ignore + GNUmakefile _____ Added: trunk/reactos/lib/cpl/hdwwiz/En.rc --- trunk/reactos/lib/cpl/hdwwiz/En.rc 2005-10-03 07:26:39 UTC (rev 18238) +++ trunk/reactos/lib/cpl/hdwwiz/En.rc 2005-10-03 07:48:59 UTC (rev 18239) @@ -0,0 +1,7 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +STRINGTABLE +BEGIN + IDS_CPLNAME "Add hardware" + IDS_CPLDESCRIPTION "Add hardware to your computer." +END Property changes on: trunk/reactos/lib/cpl/hdwwiz/En.rc ___________________________________________________________________ Name: svn:keywords + author date revision Name: svn:eol-style + native _____ Added: trunk/reactos/lib/cpl/hdwwiz/Fr.rc --- trunk/reactos/lib/cpl/hdwwiz/Fr.rc 2005-10-03 07:26:39 UTC (rev 18238) +++ trunk/reactos/lib/cpl/hdwwiz/Fr.rc 2005-10-03 07:48:59 UTC (rev 18239) @@ -0,0 +1,7 @@ +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_CPLNAME "Ajout de matÚriel" + IDS_CPLDESCRIPTION "Ajoute un nouveau matÚriel Ó votre ordinateur." +END Property changes on: trunk/reactos/lib/cpl/hdwwiz/Fr.rc ___________________________________________________________________ Name: svn:keywords + author date revision Name: svn:eol-style + native _____ Added: trunk/reactos/lib/cpl/hdwwiz/hdwwiz.c --- trunk/reactos/lib/cpl/hdwwiz/hdwwiz.c 2005-10-03 07:26:39 UTC (rev 18238) +++ trunk/reactos/lib/cpl/hdwwiz/hdwwiz.c 2005-10-03 07:48:59 UTC (rev 18239) @@ -0,0 +1,146 @@ +/* + * ReactOS New devices installation + * Copyright (C) 2005 ReactOS Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * 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 Add hardware control panel + * FILE: lib/cpl/hdwwiz/hdwwiz.c + * PURPOSE: ReactOS Add hardware control panel + * PROGRAMMER: HervÚ Poussineau (hpoussin(a)reactos.org) + */ + +#include <windows.h> +#include <commctrl.h> +#include <setupapi.h> +#include <cpl.h> +#include <tchar.h> +#include <stdio.h> + +#include "resource.h" +#include "hdwwiz.h" + +LONG APIENTRY Applet(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam); +HINSTANCE hApplet = 0; + +/* Applets */ +APPLET Applets[] = +{ + {IDI_CPLICON, IDS_CPLNAME, IDS_CPLDESCRIPTION, Applet} +}; + +typedef BOOL (*PINSTALL_NEW_DEVICE)(HWND, LPGUID, PDWORD); + +LONG APIENTRY +Applet(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam) +{ + HMODULE hNewDev = NULL; + PINSTALL_NEW_DEVICE InstallNewDevice; + DWORD Reboot; + BOOL ret; + LONG rc; + + hNewDev = LoadLibrary(_T("newdev.dll")); + if (!hNewDev) + { + rc = 1; + goto cleanup; + } + + InstallNewDevice = (PINSTALL_NEW_DEVICE)GetProcAddress(hNewDev, (LPCSTR)"InstallNewDevice"); + if (!InstallNewDevice) + { + rc = 2; + goto cleanup; + } + + ret = InstallNewDevice(hwnd, NULL, &Reboot); + if (!ret) + { + rc = 3; + goto cleanup; + } + + if (Reboot != DI_NEEDRESTART && Reboot != DI_NEEDREBOOT) + { + /* We're done with installation */ + rc = 0; + goto cleanup; + } + + /* We need to reboot */ + if (SetupPromptReboot(NULL, hwnd, FALSE) == -1) + { + /* User doesn't want to reboot, or an error occurred */ + rc = 5; + goto cleanup; + } + + rc = 0; + +cleanup: + if (hNewDev != NULL) + FreeLibrary(hNewDev); + return rc; +} + +/* Control Panel Callback */ +LONG CALLBACK +CPlApplet(HWND hwndCpl, + UINT uMsg, + LPARAM lParam1, + LPARAM lParam2) +{ + int i = (int)lParam1; + + switch (uMsg) + { + case CPL_INIT: + return TRUE; + + case CPL_GETCOUNT: + return sizeof(Applets)/sizeof(Applets[0]); + + case CPL_INQUIRE: + { + CPLINFO *CPlInfo = (CPLINFO*)lParam2; + CPlInfo->lData = 0; + CPlInfo->idIcon = Applets[i].idIcon; + CPlInfo->idName = Applets[i].idName; + CPlInfo->idInfo = Applets[i].idDescription; + break; + } + + case CPL_DBLCLK: + { + Applets[i].AppletProc(hwndCpl, uMsg, lParam1, lParam2); + break; + } + } + return FALSE; +} + +BOOL WINAPI +DllMain(HINSTANCE hinstDLL, DWORD dwReason, LPVOID lpvReserved) +{ + switch(dwReason) + { + case DLL_PROCESS_ATTACH: + hApplet = hinstDLL; + break; + } + return TRUE; +} Property changes on: trunk/reactos/lib/cpl/hdwwiz/hdwwiz.c ___________________________________________________________________ Name: svn:keywords + author date revision Name: svn:eol-style + native _____ Added: trunk/reactos/lib/cpl/hdwwiz/hdwwiz.def --- trunk/reactos/lib/cpl/hdwwiz/hdwwiz.def 2005-10-03 07:26:39 UTC (rev 18238) +++ trunk/reactos/lib/cpl/hdwwiz/hdwwiz.def 2005-10-03 07:48:59 UTC (rev 18239) @@ -0,0 +1,6 @@ +LIBRARY hdwwiz.cpl + +EXPORTS +CPlApplet@16 + +; EOF Property changes on: trunk/reactos/lib/cpl/hdwwiz/hdwwiz.def ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/lib/cpl/hdwwiz/hdwwiz.h --- trunk/reactos/lib/cpl/hdwwiz/hdwwiz.h 2005-10-03 07:26:39 UTC (rev 18238) +++ trunk/reactos/lib/cpl/hdwwiz/hdwwiz.h 2005-10-03 07:48:59 UTC (rev 18239) @@ -0,0 +1,16 @@ +#ifndef __CPL_HDWWIZ_H +#define __CPL_HDWWIZ_H + +typedef struct +{ + int idIcon; + int idName; + int idDescription; + APPLET_PROC AppletProc; +} APPLET, *PAPPLET; + +extern HINSTANCE hApplet; + +#endif /* __CPL_HDWWIZ_H */ + +/* EOF */ Property changes on: trunk/reactos/lib/cpl/hdwwiz/hdwwiz.h ___________________________________________________________________ Name: svn:keywords + author date revision Name: svn:eol-style + native _____ Added: trunk/reactos/lib/cpl/hdwwiz/hdwwiz.rc --- trunk/reactos/lib/cpl/hdwwiz/hdwwiz.rc 2005-10-03 07:26:39 UTC (rev 18238) +++ trunk/reactos/lib/cpl/hdwwiz/hdwwiz.rc 2005-10-03 07:48:59 UTC (rev 18239) @@ -0,0 +1,21 @@ +#include <windows.h> + +#include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Software Control Panel\0" +#define REACTOS_STR_INTERNAL_NAME "hdwwiz\0" +#define REACTOS_STR_ORIGINAL_FILENAME "hdwwiz.cpl\0" + +#ifdef _MSC_VER +#include <../../../reactos/version.rc> +#else +#include <reactos/version.rc> +#endif + +IDI_CPLICON ICON "resources/applet.ico" + +#include "En.rc" +#include "Fr.rc" Property changes on: trunk/reactos/lib/cpl/hdwwiz/hdwwiz.rc ___________________________________________________________________ Name: svn:keywords + author date revision Name: svn:eol-style + native _____ Added: trunk/reactos/lib/cpl/hdwwiz/hdwwiz.xml --- trunk/reactos/lib/cpl/hdwwiz/hdwwiz.xml 2005-10-03 07:26:39 UTC (rev 18238) +++ trunk/reactos/lib/cpl/hdwwiz/hdwwiz.xml 2005-10-03 07:48:59 UTC (rev 18239) @@ -0,0 +1,13 @@ +<module name="hdwwiz" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_HDWWIZ}" installbase="system32" installname="hdwwiz.cpl"> + <importlibrary definition="hdwwiz.def" /> + <include base="hdwwiz">.</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <library>setupapi</library> + <file>hdwwiz.c</file> + <file>hdwwiz.rc</file> +</module> Property changes on: trunk/reactos/lib/cpl/hdwwiz/hdwwiz.xml ___________________________________________________________________ Name: svn:keywords + author date revision Name: svn:eol-style + native _____ Added: trunk/reactos/lib/cpl/hdwwiz/resource.h --- trunk/reactos/lib/cpl/hdwwiz/resource.h 2005-10-03 07:26:39 UTC (rev 18238) +++ trunk/reactos/lib/cpl/hdwwiz/resource.h 2005-10-03 07:48:59 UTC (rev 18239) @@ -0,0 +1,12 @@ +#ifndef __CPL_RESOURCE_H +#define __CPL_RESOURCE_H + +/* ids */ + +#define IDI_CPLICON 1 +#define IDS_CPLNAME 2 +#define IDS_CPLDESCRIPTION 3 + +#endif /* __CPL_RESOURCE_H */ + +/* EOF */ Property changes on: trunk/reactos/lib/cpl/hdwwiz/resource.h ___________________________________________________________________ Name: svn:keywords + author date revision Name: svn:eol-style + native _____ Added: trunk/reactos/lib/cpl/hdwwiz/resources/applet.ico (Binary files differ) Property changes on: trunk/reactos/lib/cpl/hdwwiz/resources/applet.ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

19 years

← Newer
1
...
65
66
67
68
69
70
71
...
74
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2005