Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gedmurphy] 18057: added more functionality to arp
by gedmurphy＠svn.reactos.com 25 Sep '05

25 Sep '05

added more functionality to arp - display correct interface index - delete all hosts with -d * - display informative error messages - better argument control - clean up formatting Modified: trunk/reactos/apps/utils/net/arp/arp.c Deleted: trunk/reactos/apps/utils/net/arp/trace.c Deleted: trunk/reactos/apps/utils/net/arp/trace.h _____ Modified: trunk/reactos/apps/utils/net/arp/arp.c --- trunk/reactos/apps/utils/net/arp/arp.c 2005-09-25 16:56:52 UTC (rev 18056) +++ trunk/reactos/apps/utils/net/arp/arp.c 2005-09-25 17:01:24 UTC (rev 18057) @@ -1,4 +1,23 @@ -/* +/* + * ReactOS Win32 Applications + * Copyright (C) 2005 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS arp utility * FILE: apps/utils/net/arp/arp.c @@ -9,7 +28,6 @@ * */ -#define WIN32_LEAN_AND_MEAN #include <windows.h> #include <stdio.h> #include <stdlib.h> @@ -19,27 +37,102 @@ #include <winsock2.h> #include <iphlpapi.h> - +#define WIN32_LEAN_AND_MEAN +#define UNICODE +#define _UNICODE + /* * Globals - */ + */ const char SEPERATOR = '-'; - - - +int _CRT_glob = 0; // stop * from listing dir files in arp -d * + + /* * function declerations - */ + */ +DWORD DoFormatMessage(DWORD ErrorCode); +INT PrintEntries(PMIB_IPNETROW pIpAddRow); INT DisplayArpEntries(PTCHAR pszInetAddr, PTCHAR pszIfAddr); -INT PrintEntries(PMIB_IPNETROW pIpAddRow); INT Addhost(PTCHAR pszInetAddr, PTCHAR pszEthAddr, PTCHAR pszIfAddr); INT Deletehost(PTCHAR pszInetAddr, PTCHAR pszIfAddr); VOID Usage(VOID); - - - + + /* + * convert error code into meaningful message + */ +DWORD DoFormatMessage(DWORD ErrorCode) +{ + LPVOID lpMsgBuf; + DWORD RetVal; + /* double brackets to silence the assignment warning message */ + if ((RetVal = FormatMessage( + FORMAT_MESSAGE_ALLOCATE_BUFFER | + FORMAT_MESSAGE_FROM_SYSTEM | + FORMAT_MESSAGE_IGNORE_INSERTS, + NULL, + ErrorCode, + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), /* Default language */ + (LPTSTR) &lpMsgBuf, + 0, + NULL ))) { + _tprintf(_T("%s"), (LPTSTR)lpMsgBuf); + + LocalFree(lpMsgBuf); + /* return number of TCHAR's stored in output buffer + * excluding '\0' - as FormatMessage does*/ + return RetVal; + } + else + return 0; +} + + + +/* * + * Takes an ARP entry and prints the IP address, + * the MAC address and the entry type to screen + * + */ +INT PrintEntries(PMIB_IPNETROW pIpAddRow) +{ + IN_ADDR inaddr; + TCHAR cMacAddr[20]; + + /* print IP addresses */ + inaddr.S_un.S_addr = pIpAddRow->dwAddr; + _tprintf(_T(" %-22s"), inet_ntoa(inaddr)); + + /* print MAC address */ + _stprintf(cMacAddr, _T("%02x-%02x-%02x-%02x-%02x-%02x"), + pIpAddRow->bPhysAddr[0], + pIpAddRow->bPhysAddr[1], + pIpAddRow->bPhysAddr[2], + pIpAddRow->bPhysAddr[3], + pIpAddRow->bPhysAddr[4], + pIpAddRow->bPhysAddr[5]); + _tprintf(_T("%-22s"), cMacAddr); + + /* print cache type */ + switch (pIpAddRow->dwType) + { + case MIB_IPNET_TYPE_DYNAMIC : _tprintf(_T("dynamic\n")); + break; + case MIB_IPNET_TYPE_STATIC : _tprintf(_T("static\n")); + break; + case MIB_IPNET_TYPE_INVALID : _tprintf(_T("invalid\n")); + break; + case MIB_IPNET_TYPE_OTHER : _tprintf(_T("other\n")); + break; + } + return EXIT_SUCCESS; +} + + +/* + * * Takes optional parameters of an internet address and interface address. * Retrieve all entries in the ARP cache. If an internet address is * specified, display the ARP entry relating to that address. If an @@ -59,136 +152,99 @@ DWORD dwSize = 0; PTCHAR pszIpAddr; TCHAR szIntIpAddr[20]; - + /* Return required buffer size */ GetIpNetTable(NULL, &ulSize, 0); - + /* allocate memory for ARP address table */ pIpNetTable = (PMIB_IPNETTABLE) malloc(ulSize * sizeof(BYTE)); ZeroMemory(pIpNetTable, sizeof(*pIpNetTable)); - + /* get Arp address table */ - if (pIpNetTable != NULL) { + if (pIpNetTable != NULL) GetIpNetTable(pIpNetTable, &ulSize, TRUE); - } else { + else + { _tprintf(_T("failed to allocate memory for GetIpNetTable\n")); free(pIpNetTable); - return -1; + exit(EXIT_FAILURE); } - - /* check there are entries in the table */ - if (pIpNetTable->dwNumEntries == 0) { + + /* check there are entries in the table */ + if (pIpNetTable->dwNumEntries == 0) + { _tprintf(_T("No ARP entires found\n")); free(pIpNetTable); - return -1; + exit(EXIT_FAILURE); } - - - + + + /* try doing this in the way it's done above, it's clearer */ /* Retrieve the interface-to-ip address mapping - * table to get the IP address for adapter */ + * table to get the IP address for adapter */ pIpAddrTable = (MIB_IPADDRTABLE *) malloc(dwSize); GetIpAddrTable(pIpAddrTable, &dwSize, 0); // NULL ? - + pIpAddrTable = (MIB_IPADDRTABLE *) malloc(dwSize); //ZeroMemory(pIpAddrTable, sizeof(*pIpAddrTable)); - - if ((iRet = GetIpAddrTable(pIpAddrTable, &dwSize, TRUE)) != NO_ERROR) { // NO_ERROR = 0 + + if ((iRet = GetIpAddrTable(pIpAddrTable, &dwSize, TRUE)) != NO_ERROR) + { _tprintf(_T("GetIpAddrTable failed: %d\n"), iRet); _tprintf(_T("error: %d\n"), WSAGetLastError()); } - - - for (k=0; k < pIpAddrTable->dwNumEntries; k++) { - if (pIpNetTable->table[0].dwIndex == pIpAddrTable->table[k].dwIndex) { - //printf("printing pIpAddrTable->table[?].dwIndex = %lx\n", pIpNetTable->table[k].dwIndex); + + + for (k=0; k < pIpAddrTable->dwNumEntries; k++) + { + if (pIpNetTable->table[0].dwIndex == pIpAddrTable->table[k].dwIndex) + { + //printf("debug print: pIpAddrTable->table[?].dwIndex = %lx\n", pIpNetTable->table[k].dwIndex); inaddr2.s_addr = pIpAddrTable->table[k].dwAddr; pszIpAddr = inet_ntoa(inaddr2); strcpy(szIntIpAddr, pszIpAddr); } - } - - + } + + /* print header, including interface IP address and index number */ _tprintf(_T("\nInterface: %s --- 0x%lx \n"), szIntIpAddr, pIpNetTable->table[0].dwIndex); _tprintf(_T(" Internet Address Physical Address Type\n")); - + /* go through all ARP entries */ - for (i=0; i < pIpNetTable->dwNumEntries; i++) { - + for (i=0; i < pIpNetTable->dwNumEntries; i++) + { + /* if the user has supplied their own internet addesss * * only print the arp entry which matches that */ - if (pszInetAddr) { - inaddr.S_un.S_addr = pIpNetTable->table[i].dwAddr; + if (pszInetAddr) + { + inaddr.S_un.S_addr = pIpNetTable->table[i].dwAddr; pszIpAddr = inet_ntoa(inaddr); - + /* check if it matches, print it */ - if (strcmp(pszIpAddr, pszInetAddr) == 0) { + if (strcmp(pszIpAddr, pszInetAddr) == 0) PrintEntries(&pIpNetTable->table[i]); - } - } else { + } + else /* if an address is not supplied, print all entries */ PrintEntries(&pIpNetTable->table[i]); - } - } - + free(pIpNetTable); free(pIpAddrTable); - - return 0; + + return EXIT_SUCCESS; } - - - + + /* * - * Takes an ARP entry and prints the IP address, - * the MAC address and the entry type to screen - * - */ -INT PrintEntries(PMIB_IPNETROW pIpAddRow) -{ - IN_ADDR inaddr; - TCHAR cMacAddr[20]; - - /* print IP addresses */ - inaddr.S_un.S_addr = pIpAddRow->dwAddr; - _tprintf(_T(" %-22s"), inet_ntoa(inaddr)); //error checking - - /* print MAC address */ - _stprintf(cMacAddr, _T("%02x-%02x-%02x-%02x-%02x-%02x"), - pIpAddRow->bPhysAddr[0], - pIpAddRow->bPhysAddr[1], - pIpAddRow->bPhysAddr[2], - pIpAddRow->bPhysAddr[3], - pIpAddRow->bPhysAddr[4], - pIpAddRow->bPhysAddr[5]); - _tprintf(_T("%-22s"), cMacAddr); - - /* print cache type */ - switch (pIpAddRow->dwType) { - case MIB_IPNET_TYPE_DYNAMIC : _tprintf(_T("dynamic\n")); - break; - case MIB_IPNET_TYPE_STATIC : _tprintf(_T("static\n")); - break; - case MIB_IPNET_TYPE_INVALID : _tprintf(_T("invalid\n")); - break; - case MIB_IPNET_TYPE_OTHER : _tprintf(_T("other\n")); - break; - } - return 0; -} - - - -/* - * * Takes an internet address, a MAC address and an optional interface * address as arguments and checks their validity. - * Fill out an MIB_IPNETROW structure and insert the data into the + * Fill out an MIB_IPNETROW structure and insert the data into the * ARP cache as a static entry. * */ @@ -196,73 +252,101 @@ { PMIB_IPNETROW pAddHost; PMIB_IPADDRTABLE pIpAddrTable; + PMIB_IPNETTABLE pIpNetTable; DWORD dwIpAddr; DWORD dwSize = 0; + ULONG ulSize = 0; INT iRet, i, val; TCHAR c; - + /* error checking */ - + /* check IP address */ - if (pszInetAddr != NULL) { - if ((dwIpAddr = inet_addr(pszInetAddr)) == INADDR_NONE) { + if (pszInetAddr != NULL) + { + if ((dwIpAddr = inet_addr(pszInetAddr)) == INADDR_NONE) + { _tprintf(_T("ARP: bad IP address: %s\n"), pszInetAddr); - return -1; + exit(EXIT_FAILURE); } - } else { + } + else + { Usage(); - return -1; + exit(EXIT_FAILURE); } - + /* check MAC address */ - if (strlen(pszEthAddr) != 17) { + if (strlen(pszEthAddr) != 17) + { _tprintf(_T("ARP: bad argument: %s\n"), pszEthAddr); - return -1; + exit(EXIT_FAILURE); } - for (i=0; i<17; i++) { - if (pszEthAddr[i] == SEPERATOR) { + for (i=0; i<17; i++) + { + if (pszEthAddr[i] == SEPERATOR) continue; - } - if (!isxdigit(pszEthAddr[i])) { + + if (!isxdigit(pszEthAddr[i])) + { _tprintf(_T("ARP: bad argument: %s\n"), pszEthAddr); - return -1; + exit(EXIT_FAILURE); } } - + + /* We need the IpNetTable to get the adapter index */ + /* Return required buffer size */ + GetIpNetTable(NULL, &ulSize, 0); + /* allocate memory for ARP address table */ + pIpNetTable = (PMIB_IPNETTABLE) malloc(ulSize * sizeof(BYTE)); + ZeroMemory(pIpNetTable, sizeof(*pIpNetTable)); + /* get Arp address table */ + if (pIpNetTable != NULL) + GetIpNetTable(pIpNetTable, &ulSize, TRUE); + else + { + _tprintf(_T("failed to allocate memory for GetIpNetTable\n")); + free(pIpNetTable); + return -1; + } + + /* reserve memory on heap and zero */ pAddHost = (MIB_IPNETROW *) malloc(sizeof(MIB_IPNETROW)); ZeroMemory(pAddHost, sizeof(MIB_IPNETROW)); - - - - - /* set dwIndex field to the index of a local IP address to + + /* set dwIndex field to the index of a local IP address to * indicate the network on which the ARP entry applies */ - if (pszIfAddr) { + if (pszIfAddr) sscanf(pszIfAddr, "%lx", &pAddHost->dwIndex); - } else { - /* map the IP to the index */ + else + { + /* map the IP to the index */ pIpAddrTable = (MIB_IPADDRTABLE *) malloc(dwSize); GetIpAddrTable(pIpAddrTable, &dwSize, 0); - + pIpAddrTable = (MIB_IPADDRTABLE *) malloc(dwSize); - - if ((iRet = GetIpAddrTable(pIpAddrTable, &dwSize, TRUE)) != NO_ERROR) { // NO_ERROR = 0 + + if ((iRet = GetIpAddrTable(pIpAddrTable, &dwSize, TRUE)) != NO_ERROR) + { _tprintf(_T("GetIpAddrTable failed: %d\n"), iRet); _tprintf(_T("error: %d\n"), WSAGetLastError()); } - printf("printing pIpAddrTable->table[0].dwIndex = %lx\n", pIpAddrTable->table[0].dwIndex); - pAddHost->dwIndex = 4; + //printf("debug print: pIpNetTable->table[0].dwIndex = %lx\n", pIpNetTable->table[0].dwIndex); + /* needs testing. I get the correct index on my machine, but need others + * to test their card index. Any problems and we can use GetAdaptersInfo instead */ + pAddHost->dwIndex = pIpNetTable->table[0].dwIndex; free(pIpAddrTable); } - + /* Set MAC address to 6 bytes (typical) */ pAddHost->dwPhysAddrLen = 6; - - + + /* Encode bPhysAddr into correct byte array */ - for (i=0; i<6; i++) { + for (i=0; i<6; i++) + { val =0; c = toupper(pszEthAddr[i*3]); c = c - (isdigit(c) ? '0' : ('A' - 10)); @@ -272,103 +356,155 @@ c = c - (isdigit(c) ? '0' : ('A' - 10)); val += c; pAddHost->bPhysAddr[i] = val; - } - - + + /* copy converted IP address */ pAddHost->dwAddr = dwIpAddr; - - + + /* set type to static */ pAddHost->dwType = MIB_IPNET_TYPE_STATIC; - - + + /* Add the ARP entry */ - if ((iRet = SetIpNetEntry(pAddHost)) != NO_ERROR) { - _tprintf(_T("The ARP entry addition failed: %d\n"), iRet); - return -1; + if ((iRet = SetIpNetEntry(pAddHost)) != NO_ERROR) + { + DoFormatMessage(iRet); + free(pAddHost); + exit(EXIT_FAILURE); } - + free(pAddHost); - - return 0; + + return EXIT_SUCCESS; } - - - + + /* * - * Takes an internet address and an optional interface address as + * Takes an internet address and an optional interface address as * arguments and checks their validity. - * Add the interface number and IP to an MIB_IPNETROW structure - * and remove the entrty from the ARP cache. + * Add the interface number and IP to an MIB_IPNETROW structure + * and remove the entry from the ARP cache. * */ INT Deletehost(PTCHAR pszInetAddr, PTCHAR pszIfAddr) { PMIB_IPNETROW pDelHost; PMIB_IPADDRTABLE pIpAddrTable; + PMIB_IPNETTABLE pIpNetTable; + ULONG ulSize = 0; DWORD dwIpAddr; DWORD dwSize = 0; - INT iret; - + INT iRet; + BOOL bFlushTable = FALSE; + /* error checking */ - + /* check IP address */ - if (pszInetAddr != NULL) { - if ((dwIpAddr = inet_addr(pszInetAddr)) == INADDR_NONE) { + if (pszInetAddr != NULL) + { + /* if wildcard is given, set flag to delete all hosts */ + if (strncmp(pszInetAddr, "*", 1) == 0) + bFlushTable = TRUE; + else if ((dwIpAddr = inet_addr(pszInetAddr)) == INADDR_NONE) + { _tprintf(_T("ARP: bad IP address: %s\n"), pszInetAddr); - return -1; + exit(EXIT_FAILURE); } - } else { + } + else + { Usage(); + exit(EXIT_FAILURE); + } + + /* We need the IpNetTable to get the adapter index */ + /* Return required buffer size */ + GetIpNetTable(NULL, &ulSize, 0); + /* allocate memory for ARP address table */ + pIpNetTable = (PMIB_IPNETTABLE) malloc(ulSize * sizeof(BYTE)); + ZeroMemory(pIpNetTable, sizeof(*pIpNetTable)); + /* get Arp address table */ + if (pIpNetTable != NULL) + GetIpNetTable(pIpNetTable, &ulSize, TRUE); + else + { + _tprintf(_T("failed to allocate memory for GetIpNetTable\n")); + free(pIpNetTable); return -1; } - - + + pIpAddrTable = (MIB_IPADDRTABLE*) malloc(sizeof(MIB_IPADDRTABLE)); pDelHost = (MIB_IPNETROW *) malloc(sizeof(MIB_IPNETROW)); ZeroMemory(pIpAddrTable, sizeof(MIB_IPADDRTABLE)); ZeroMemory(pDelHost, sizeof(MIB_IPNETROW)); - /* set dwIndex field to the index of a local IP address to + /* set dwIndex field to the index of a local IP address to * indicate the network on which the ARP entry applies */ - if (pszIfAddr) { + if (pszIfAddr) sscanf(pszIfAddr, "%lx", &pDelHost->dwIndex); - } else { + else + { /* map the IP to the index */ - if (GetIpAddrTable(pIpAddrTable, &dwSize, 0) == ERROR_INSUFFICIENT_BUFFER) { + if (GetIpAddrTable(pIpAddrTable, &dwSize, 0) == ERROR_INSUFFICIENT_BUFFER) pIpAddrTable = (MIB_IPADDRTABLE *) malloc(dwSize); - } - if ((iret = GetIpAddrTable(pIpAddrTable, &dwSize, TRUE)) != NO_ERROR) { - _tprintf(_T("GetIpAddrTable failed: %d\n"), iret); + + if ((iRet = GetIpAddrTable(pIpAddrTable, &dwSize, TRUE)) != NO_ERROR) + { + _tprintf(_T("GetIpAddrTable failed: %d\n"), iRet); _tprintf(_T("error: %d\n"), WSAGetLastError()); } - pDelHost->dwIndex = 4; //pIpAddrTable->table[0].dwIndex; - } - - /* copy converted IP address */ - pDelHost->dwAddr = dwIpAddr; - + /* needs testing. I get the correct index on my machine, but need others + * to test their card index. Any problems and we can use GetAdaptersInfo instead */ + pDelHost->dwIndex = pIpNetTable->table[0].dwIndex; + } + + if (bFlushTable == TRUE) + { + /* delete arp cache */ + if ((iRet = FlushIpNetTable(pDelHost->dwIndex)) != NO_ERROR) + { + DoFormatMessage(iRet); + free(pIpAddrTable); + free(pDelHost); + return EXIT_FAILURE; + } + else + { + free(pIpAddrTable); + free(pDelHost); + return EXIT_SUCCESS; + } + } + else + /* copy converted IP address */ + pDelHost->dwAddr = dwIpAddr; + /* Add the ARP entry */ - if ((iret = DeleteIpNetEntry(pDelHost)) != NO_ERROR) { - _tprintf(_T("The ARP entry deletion failed: %d\n"), iret); - return -1; + if ((iRet = DeleteIpNetEntry(pDelHost)) != NO_ERROR) + { + + DoFormatMessage(iRet); + free(pIpAddrTable); + free(pDelHost); + exit(EXIT_FAILURE); } - + free(pIpAddrTable); free(pDelHost); - - return 0; + + return EXIT_SUCCESS; } - - - + + + /* * * print program usage to screen * - */ + */ VOID Usage(VOID) { _tprintf(_T("\nDisplays and modifies the IP-to-Physical address translation tables used by\n" @@ -401,10 +537,10 @@ " > arp -s 157.55.85.212 00-aa-00-62-c6-09 .... Adds a static entry.\n" " > arp -a .... Displays the arp table.\n\n")); } - - - -/* + + + +/* * * Program entry. * Parse command line and call the required function @@ -412,35 +548,37 @@ */ INT main(int argc, char* argv[]) { - const char N[] = "-N"; - - if ((argc < 2) || (argc > 5)) + if ((argc < 2) || (argc > 5)) { Usage(); - return FALSE; + return EXIT_FAILURE; } - - - if (argv[1][0] == '-') { - switch (argv[1][1]) { - /* FIX ME */ - /* need better control for -a, as -N might not be arg 4 */ - case 'a': if (argc == 2) + + if (argv[1][0] == '-') + { + switch (argv[1][1]) + { + case 'a': /* fall through */ + case 'g': + if (argc == 2) DisplayArpEntries(NULL, NULL); else if (argc == 3) DisplayArpEntries(argv[2], NULL); - else if ((argc == 5) && ((strcmp(argv[3], N)) == 0)) + else if ((argc == 4) && ((strcmp(argv[2], "-N")) == 0)) + DisplayArpEntries(NULL, argv[3]); + else if ((argc == 5) && ((strcmp(argv[3], "-N")) == 0)) DisplayArpEntries(argv[2], argv[4]); else Usage(); + return EXIT_FAILURE; break; - case 'g': break; case 'd': if (argc == 3) Deletehost(argv[2], NULL); else if (argc == 4) Deletehost(argv[2], argv[3]); else Usage(); + return EXIT_FAILURE; break; case 's': if (argc == 4) Addhost(argv[2], argv[3], NULL); @@ -448,15 +586,17 @@ Addhost(argv[2], argv[3], argv[4]); else Usage(); + return EXIT_FAILURE; break; default: Usage(); - return -1; + return EXIT_FAILURE; } - } else { + } + else Usage(); - return -1; - } - - return 0; -} + + return EXIT_SUCCESS; +} /* +warning: suggest parentheses around assignment used as truth value +warning: char format, void arg (arg 2)*/ _____ Deleted: trunk/reactos/apps/utils/net/arp/trace.c --- trunk/reactos/apps/utils/net/arp/trace.c 2005-09-25 16:56:52 UTC (rev 18056) +++ trunk/reactos/apps/utils/net/arp/trace.c 2005-09-25 17:01:24 UTC (rev 18057) @@ -1,53 +0,0 @@ -/////////////////////////////////////////////////////////////////////// ////// -// Diagnostic Trace -// -#include <stdio.h> -#include <stdarg.h> -#define WIN32_LEAN_AND_MEAN -#include <windows.h> -#include <tchar.h> -#include "trace.h" - - -#ifdef _DEBUG - -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; - -void _DebugBreak(void) -{ - DebugBreak(); -} - -void Trace(TCHAR* lpszFormat, ...) -{ - va_list args; - int nBuf; - TCHAR szBuffer[512]; - - va_start(args, lpszFormat); - nBuf = _vsntprintf(szBuffer, sizeof(szBuffer)/sizeof(TCHAR), lpszFormat, args); - OutputDebugString(szBuffer); - // was there an error? was the expanded string too long? - //ASSERT(nBuf >= 0); - va_end(args); -} - -void Assert(void* assert, TCHAR* file, int line, void* msg) -{ - if (msg == NULL) { - printf("ASSERT -- %s occured on line %u of file %s.\n", - assert, line, file); - } else { - printf("ASSERT -- %s occured on line %u of file %s: Message = %s.\n", - assert, line, file, msg); - } -} - -#else - -void Trace(TCHAR* lpszFormat, ...) { }; -void Assert(void* assert, TCHAR* file, int line, void* msg) { }; - -#endif //_DEBUG -/////////////////////////////////////////////////////////////////////// ////// _____ Deleted: trunk/reactos/apps/utils/net/arp/trace.h --- trunk/reactos/apps/utils/net/arp/trace.h 2005-09-25 16:56:52 UTC (rev 18056) +++ trunk/reactos/apps/utils/net/arp/trace.h 2005-09-25 17:01:24 UTC (rev 18057) @@ -1,61 +0,0 @@ -/////////////////////////////////////////////////////////////////////// ////// -// Diagnostic Trace -// -#ifndef __TRACE_H__ -#define __TRACE_H__ - -#ifdef _DEBUG - -#ifdef _X86_ -#define BreakPoint() _asm { int 3h } -#else -#define BreakPoint() _DebugBreak() -#endif - -#ifndef ASSERT -#define ASSERT(exp) \ -{ \ - if (!(exp)) { \ - Assert(#exp, __FILE__, __LINE__, NULL); \ - BreakPoint(); \ - } \ -} \ - -#define ASSERTMSG(exp, msg) \ -{ \ - if (!(exp)) { \ - Assert(#exp, __FILE__, __LINE__, msg); \ - BreakPoint(); \ - } \ -} -#endif - -//===================================================================== ======== -// MACRO: TRACE() -//===================================================================== ======== - -#define TRACE Trace - - -#else // _DEBUG - -//===================================================================== ======== -// Define away MACRO's ASSERT() and TRACE() in non debug builds -//===================================================================== ======== - -#ifndef ASSERT -#define ASSERT(exp) -#define ASSERTMSG(exp, msg) -#endif - -#define TRACE 0 ? (void)0 : Trace - -#endif // !_DEBUG - - -void Assert(void* assert, TCHAR* file, int line, void* msg); -void Trace(TCHAR* lpszFormat, ...); - - -#endif // __TRACE_H__ -/////////////////////////////////////////////////////////////////////// //////

1 0

[npwoods] 18056: Lightweight sync with WINE regedit; imported obvious changes such as const correctness, TCHAR string usage etc
by npwoods＠svn.reactos.com 25 Sep '05

25 Sep '05

Lightweight sync with WINE regedit; imported obvious changes such as const correctness, TCHAR string usage etc Modified: trunk/reactos/subsys/system/regedit/childwnd.c Modified: trunk/reactos/subsys/system/regedit/framewnd.c Modified: trunk/reactos/subsys/system/regedit/regedit.c Modified: trunk/reactos/subsys/system/regedit/regproc.c Modified: trunk/reactos/subsys/system/regedit/regproc.h Modified: trunk/reactos/subsys/system/regedit/treeview.c _____ Modified: trunk/reactos/subsys/system/regedit/childwnd.c --- trunk/reactos/subsys/system/regedit/childwnd.c 2005-09-25 15:59:38 UTC (rev 18055) +++ trunk/reactos/subsys/system/regedit/childwnd.c 2005-09-25 16:56:52 UTC (rev 18056) @@ -42,6 +42,7 @@ if (hRootKey == HKEY_LOCAL_MACHINE) return _T("HKEY_LOCAL_MACHINE"); if (hRootKey == HKEY_USERS) return _T("HKEY_USERS"); if (hRootKey == HKEY_CURRENT_CONFIG) return _T("HKEY_CURRENT_CONFIG"); + if (hRootKey == HKEY_DYN_DATA) return _T("HKEY_DYN_DATA"); return _T("UKNOWN HKEY, PLEASE REPORT"); } @@ -169,8 +170,7 @@ * WM_DESTROY - post a quit message and return * */ -LRESULT CALLBACK -ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) +LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { static short last_split; BOOL Result; _____ Modified: trunk/reactos/subsys/system/regedit/framewnd.c --- trunk/reactos/subsys/system/regedit/framewnd.c 2005-09-25 15:59:38 UTC (rev 18055) +++ trunk/reactos/subsys/system/regedit/framewnd.c 2005-09-25 16:56:52 UTC (rev 18056) @@ -61,7 +61,7 @@ MoveWindow(g_pChildWnd->hWnd, prect->left, prect->top, prect->right, prect->bottom, TRUE); } -void resize_frame_client(HWND hWnd) +static void resize_frame_client(HWND hWnd) { RECT rect; @@ -183,7 +183,7 @@ return TRUE; } -UINT_PTR CALLBACK ImportRegistryFile_OFNHookProc(HWND hdlg, UINT uiMsg, WPARAM wParam, LPARAM lParam) +static UINT_PTR CALLBACK ImportRegistryFile_OFNHookProc(HWND hdlg, UINT uiMsg, WPARAM wParam, LPARAM lParam) { OPENFILENAME* pOpenFileName; OFNOTIFY* pOfNotify; @@ -375,7 +375,7 @@ pd.nToPage = 0xFFFF; pd.nMinPage = 1; pd.nMaxPage = 0xFFFF; - if (PrintDlg(&pd) == TRUE) { + if (PrintDlg(&pd)) { /* GDI calls to render output. */ DeleteDC(pd.hDC); /* Delete DC when done.*/ } @@ -424,7 +424,7 @@ return TRUE; } -BOOL CopyKeyName(HWND hWnd, LPTSTR keyName) +static BOOL CopyKeyName(HWND hWnd, LPCTSTR keyName) { BOOL result; @@ -717,8 +717,7 @@ * */ -LRESULT CALLBACK -FrameWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) +LRESULT CALLBACK FrameWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { switch (message) { case WM_CREATE: @@ -730,6 +729,10 @@ if (!_CmdWndProc(hWnd, message, wParam, lParam)) return DefWindowProc(hWnd, message, wParam, lParam); break; + case WM_ACTIVATE: + if (LOWORD(hWnd)) + SetFocus(g_pChildWnd->hWnd); + break; case WM_SIZE: resize_frame_client(hWnd); break; @@ -744,10 +747,6 @@ case WM_MENUSELECT: OnMenuSelect(hWnd, LOWORD(wParam), HIWORD(wParam), (HMENU)lParam); break; - case WM_ACTIVATE: - if (LOWORD(hWnd)) - SetFocus(g_pChildWnd->hWnd); - break; case WM_DESTROY: WinHelp(hWnd, _T("regedit"), HELP_QUIT, 0); PostQuitMessage(0); _____ Modified: trunk/reactos/subsys/system/regedit/regedit.c --- trunk/reactos/subsys/system/regedit/regedit.c 2005-09-25 15:59:38 UTC (rev 18055) +++ trunk/reactos/subsys/system/regedit/regedit.c 2005-09-25 16:56:52 UTC (rev 18056) @@ -23,7 +23,7 @@ #include <windows.h> #include "regproc.h" -static char *usage = +static const char *usage = "Usage:\n" " regedit filename\n" " regedit /E filename [regpath]\n" @@ -52,8 +52,7 @@ "\n" "The switches are case-insensitive, can be prefixed either by '-' or '/'.\n" "This program is command-line compatible with Microsoft Windows\n" - "regedit. The difference with Windows regedit - this application has\n" - "command-line interface only.\n"; + "regedit.\n"; typedef enum { ACTION_UNDEF, ACTION_ADD, ACTION_EXPORT, ACTION_DELETE @@ -68,7 +67,7 @@ * chu - the switch character in upper-case. * s - the command line string where s points to the switch character. */ -void error_unknown_switch(char chu, char *s) +static void error_unknown_switch(char chu, char *s) { if (isalpha(chu)) { fprintf(stderr,"%s: Undefined switch /%c!\n", getAppName(), chu); _____ Modified: trunk/reactos/subsys/system/regedit/regproc.c --- trunk/reactos/subsys/system/regedit/regproc.c 2005-09-25 15:59:38 UTC (rev 18055) +++ trunk/reactos/subsys/system/regedit/regproc.c 2005-09-25 16:56:52 UTC (rev 18056) @@ -46,18 +46,18 @@ static HKEY currentKeyHandle = 0; static BOOL bTheKeyIsOpen = FALSE; -static CHAR *app_name = "UNKNOWN"; +static const CHAR *app_name = "UNKNOWN"; -static CHAR *reg_class_names[] = { +static const CHAR *reg_class_names[] = { "HKEY_LOCAL_MACHINE", "HKEY_USERS", "HKEY_CLASSES_ROOT", - "HKEY_CURRENT_CONFIG", "HKEY_CURRENT_USER" + "HKEY_CURRENT_CONFIG", "HKEY_CURRENT_USER", "HKEY_DYN_DATA" }; #define REG_CLASS_NUMBER (sizeof(reg_class_names) / sizeof(reg_class_names[0])) static HKEY reg_class_keys[REG_CLASS_NUMBER] = { HKEY_LOCAL_MACHINE, HKEY_USERS, HKEY_CLASSES_ROOT, - HKEY_CURRENT_CONFIG, HKEY_CURRENT_USER + HKEY_CURRENT_CONFIG, HKEY_CURRENT_USER, HKEY_DYN_DATA }; /* return values */ @@ -234,7 +234,7 @@ DWORD convertHexCSVToHex(char *str, BYTE *buf, ULONG bufLen) { char *s = str; /* Pointer to current */ - char *b = (char*)buf; /* Pointer to result */ + char *b = (char*) buf; /* Pointer to result */ ULONG strLen = strlen(str); ULONG strPos = 0; @@ -346,7 +346,7 @@ /*********************************************************************** ******* * Replaces escape sequences with the characters. */ -void REGPROC_unescape_string(LPSTR str) +static void REGPROC_unescape_string(LPSTR str) { int str_idx = 0; /* current character under analysis */ int val_idx = 0; /* the last character of the unescaped string */ @@ -427,7 +427,7 @@ } } - hRes = RegSetValueExA( + hRes = RegSetValueEx( currentKeyHandle, val_name, 0, /* Reserved */ @@ -522,14 +522,14 @@ { LPSTR classNameEnd; LPSTR classNameBeg; - UINT i; + unsigned int i; char lpClassCopy[KEY_MAX_LEN]; if (lpClass == NULL) return (HKEY)ERROR_INVALID_PARAMETER; - strncpy(lpClassCopy, lpClass, KEY_MAX_LEN); + lstrcpynA(lpClassCopy, lpClass, KEY_MAX_LEN); classNameEnd = strchr(lpClassCopy, '\\'); /* The class name ends by '\' */ if (!classNameEnd) /* or the whole string */ @@ -558,7 +558,7 @@ /*********************************************************************** ******* * Close the currently opened key. */ -void closeKey() +void closeKey(void) { RegCloseKey(currentKeyHandle); @@ -579,7 +579,7 @@ void doSetValue(LPSTR stdInput) { /* - * We encoutered the end of the file, make sure we + * We encountered the end of the file, make sure we * close the opened key and exit */ if (stdInput == NULL) { @@ -610,14 +610,14 @@ } /*********************************************************************** ******* - * This funtion is the main entry point to the queryValue type of action. It + * This function is the main entry point to the queryValue type of action. It * receives the currently read line and dispatch the work depending on the * context. */ void doQueryValue(LPSTR stdInput) { /* - * We encoutered the end of the file, make sure we + * We encountered the end of the file, make sure we * close the opened key and exit */ if (stdInput == NULL) { @@ -648,7 +648,7 @@ } /*********************************************************************** ******* - * This funtion is the main entry point to the deletetValue type of action. It + * This function is the main entry point to the deleteValue type of action. It * receives the currently read line and dispatch the work depending on the * context. */ @@ -658,7 +658,7 @@ } /*********************************************************************** ******* - * This funtion is the main entry point to the deleteKey type of action. It + * This function is the main entry point to the deleteKey type of action. It * receives the currently read line and dispatch the work depending on the * context. */ @@ -668,7 +668,7 @@ } /*********************************************************************** ******* - * This funtion is the main entry point to the createKey type of action. It + * This function is the main entry point to the createKey type of action. It * receives the currently read line and dispatch the work depending on the * context. */ @@ -793,8 +793,7 @@ if (hRes == ERROR_SUCCESS) { lpsRes = HeapAlloc( GetProcessHeap(), 0, lLen); - strncpy(lpsRes, lpsData, lLen); - lpsRes[lLen-1]='\0'; + lstrcpynA(lpsRes, lpsData, lLen); } } else { DWORD dwLen = KEY_MAX_LEN; @@ -824,8 +823,7 @@ case REG_SZ: case REG_EXPAND_SZ: { lpsRes = HeapAlloc( GetProcessHeap(), 0, dwLen); - strncpy(lpsRes, lpbData, dwLen); - lpsRes[dwLen-1]='\0'; + lstrcpynA(lpsRes, lpbData, dwLen); break; } case REG_DWORD: { @@ -976,7 +974,7 @@ } /*********************************************************************** ******* - * This funtion is the main entry point to the registerDLL action. It + * This function is the main entry point to the registerDLL action. It * receives the currently read line, then loads and registers the requested DLLs */ void doRegisterDLL(LPSTR stdInput) @@ -989,7 +987,7 @@ return; /* Load and register the library, then free it */ - theLib = LoadLibraryA(stdInput); + theLib = LoadLibrary(stdInput); if (theLib) { FARPROC lpfnDLLRegProc = GetProcAddress(theLib, "DllRegisterServer"); if (lpfnDLLRegProc) @@ -1009,7 +1007,7 @@ } /*********************************************************************** ******* - * This funtion is the main entry point to the unregisterDLL action. It + * This function is the main entry point to the unregisterDLL action. It * receives the currently read line, then loads and unregisters the requested DLLs */ void doUnregisterDLL(LPSTR stdInput) @@ -1022,7 +1020,7 @@ return; /* Load and unregister the library, then free it */ - theLib = LoadLibraryA(stdInput); + theLib = LoadLibrary(stdInput); if (theLib) { FARPROC lpfnDLLRegProc = GetProcAddress(theLib, "DllUnregisterServer"); if (lpfnDLLRegProc) @@ -1047,7 +1045,7 @@ * Print the message for GetLastError */ -void REGPROC_print_error() +static void REGPROC_print_error(void) { LPVOID lpMsgBuf; DWORD error_code; @@ -1076,7 +1074,7 @@ * required_len - length of the string to place to the buffer in characters. * The length does not include the terminating null character. */ -void REGPROC_resize_char_buffer(CHAR **buffer, DWORD *len, DWORD required_len) +static void REGPROC_resize_char_buffer(CHAR **buffer, DWORD *len, DWORD required_len) { required_len++; if (required_len > *len) { @@ -1092,7 +1090,7 @@ /*********************************************************************** ******* * Prints string str to file */ -void REGPROC_export_string(FILE *file, CHAR *str) +static void REGPROC_export_string(FILE *file, CHAR *str) { size_t len = strlen(str); size_t i; @@ -1133,7 +1131,7 @@ * Is resized if necessary. * val_size - size of the buffer for storing values in bytes. */ -void export_hkey(FILE *file, HKEY key, +static void export_hkey(FILE *file, HKEY key, CHAR **reg_key_name_buf, DWORD *reg_key_name_len, CHAR **val_name_buf, DWORD *val_name_len, BYTE **val_buf, DWORD *val_size) @@ -1176,8 +1174,8 @@ DWORD value_type; DWORD val_name_len1 = *val_name_len; DWORD val_size1 = *val_size; - ret = RegEnumValueA(key, i, *val_name_buf, &val_name_len1, NULL, - &value_type, *val_buf, &val_size1); + ret = RegEnumValue(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) { @@ -1198,7 +1196,7 @@ case REG_SZ: case REG_EXPAND_SZ: fputs("\"", file); - REGPROC_export_string(file, (CHAR*)*val_buf); + REGPROC_export_string(file, (char*) *val_buf); fputs("\"\n", file); break; @@ -1217,7 +1215,7 @@ /* falls through */ case REG_BINARY: { DWORD i1; - CHAR *hex_prefix; + const CHAR *hex_prefix; CHAR buf[20]; int cur_pos; @@ -1260,8 +1258,8 @@ while(more_data) { DWORD buf_len = *reg_key_name_len - curr_len; - ret = RegEnumKeyExA(key, i, *reg_key_name_buf + curr_len + 1, &buf_len, - NULL, NULL, NULL, NULL); + ret = RegEnumKeyEx(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) { @@ -1271,8 +1269,8 @@ HKEY subkey; i++; - if (RegOpenKeyA(key, *reg_key_name_buf + curr_len + 1, - &subkey) == ERROR_SUCCESS) { + if (RegOpenKey(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); @@ -1287,7 +1285,7 @@ /*********************************************************************** ******* * Open file for export. */ -FILE *REGPROC_open_export_file(CHAR *file_name) +static FILE *REGPROC_open_export_file(CHAR *file_name) { FILE *file = fopen(file_name, "w"); if (!file) { @@ -1350,7 +1348,7 @@ &reg_key_name_buf, &reg_key_name_len, &val_name_buf, &val_name_len, &val_buf, &val_size); - } else if (RegOpenKeyA(reg_key_class, branch_name, &key) == ERROR_SUCCESS) { + } else if (RegOpenKey(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, @@ -1372,7 +1370,8 @@ /* do not export HKEY_CLASSES_ROOT */ if (reg_class_keys[i] != HKEY_CLASSES_ROOT && reg_class_keys[i] != HKEY_CURRENT_USER && - reg_class_keys[i] != HKEY_CURRENT_CONFIG) { + reg_class_keys[i] != HKEY_CURRENT_CONFIG && + reg_class_keys[i] != HKEY_DYN_DATA) { strcpy(reg_key_name_buf, reg_class_names[i]); export_hkey(file, reg_class_keys[i], &reg_key_name_buf, &reg_key_name_len, @@ -1393,7 +1392,7 @@ /*********************************************************************** ******* * Reads contents of the specified file into the registry. */ -BOOL import_registry_file(LPSTR filename) +BOOL import_registry_file(LPTSTR filename) { FILE* reg_file = fopen(filename, "r"); @@ -1407,7 +1406,7 @@ /*********************************************************************** ******* * Recursive function which removes the registry key with all subkeys. */ -void delete_branch(HKEY key, +static void delete_branch(HKEY key, CHAR **reg_key_name_buf, DWORD *reg_key_name_len) { HKEY branch_key; @@ -1417,7 +1416,7 @@ LONG ret; long int i; - if (RegOpenKeyA(key, *reg_key_name_buf, &branch_key) != ERROR_SUCCESS) { + if (RegOpenKey(key, *reg_key_name_buf, &branch_key) != ERROR_SUCCESS) { REGPROC_print_error(); } @@ -1436,8 +1435,8 @@ for (i = subkeys - 1; i >= 0; i--) { DWORD buf_len = *reg_key_name_len - curr_len; - ret = RegEnumKeyExA(branch_key, i, *reg_key_name_buf + curr_len + 1, - &buf_len, NULL, NULL, NULL, NULL); + ret = RegEnumKeyEx(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) { @@ -1448,7 +1447,7 @@ } (*reg_key_name_buf)[curr_len] = '\0'; RegCloseKey(branch_key); - RegDeleteKeyA(key, *reg_key_name_buf); + RegDeleteKey(key, *reg_key_name_buf); } /*********************************************************************** ******* @@ -1482,7 +1481,7 @@ getAppName(), reg_key_name); exit(1); } - if (RegOpenKeyA(reg_key_class, branch_name, &branch_key) == ERROR_SUCCESS) { + if (RegOpenKey(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); @@ -1494,12 +1493,12 @@ * Sets the application name. Then application name is used in the error * reporting. */ -void setAppName(CHAR *name) +void setAppName(const CHAR *name) { app_name = name; } -CHAR *getAppName() +const CHAR *getAppName(void) { return app_name; } _____ Modified: trunk/reactos/subsys/system/regedit/regproc.h --- trunk/reactos/subsys/system/regedit/regproc.h 2005-09-25 15:59:38 UTC (rev 18055) +++ trunk/reactos/subsys/system/regedit/regproc.h 2005-09-25 16:56:52 UTC (rev 18056) @@ -39,11 +39,11 @@ void doUnregisterDLL(LPSTR lpsLine); BOOL export_registry_key(CHAR *file_name, CHAR *reg_key_name); -BOOL import_registry_file(LPSTR filename); +BOOL import_registry_file(LPTSTR filename); void delete_registry_key(CHAR *reg_key_name); -void setAppName(CHAR *name); -CHAR *getAppName(); +void setAppName(const CHAR *name); +const CHAR *getAppName(void); void processRegLines(FILE *in, CommandAPI command); @@ -61,7 +61,7 @@ DWORD getDataType(LPSTR *lpValue, DWORD* parse_type); LPSTR getArg(LPSTR arg); HRESULT openKey(LPSTR stdInput); -void closeKey(); +void closeKey(void); /* * api setValue prototypes _____ Modified: trunk/reactos/subsys/system/regedit/treeview.c --- trunk/reactos/subsys/system/regedit/treeview.c 2005-09-25 15:59:38 UTC (rev 18055) +++ trunk/reactos/subsys/system/regedit/treeview.c 2005-09-25 16:56:52 UTC (rev 18056) @@ -100,7 +100,6 @@ if (!hItem) hItem = TreeView_GetSelection(hwndTV); if (!hItem) return NULL; if (!get_item_path(hwndTV, hItem, phRootKey, &pathBuffer, &pathLen, &maxLen)) return NULL; - /*printf("hRoot=%p, keyPath='%s'\n", *phRootKey, pathBuffer);*/ return pathBuffer; }

1 0

[mf] 18055: try to use IShellFolderViewCB::MessageSFVCB() in order to override explorer context menus
by mf＠svn.reactos.com 25 Sep '05

25 Sep '05

try to use IShellFolderViewCB::MessageSFVCB() in order to override explorer context menus Modified: trunk/reactos/subsys/system/explorer/shell/shellbrowser.cpp Modified: trunk/reactos/subsys/system/explorer/shell/shellbrowser.h Modified: trunk/reactos/subsys/system/explorer/shell/webchild.h Modified: trunk/reactos/subsys/system/explorer/utility/shellclasses.h _____ Modified: trunk/reactos/subsys/system/explorer/shell/shellbrowser.cpp --- trunk/reactos/subsys/system/explorer/shell/shellbrowser.cpp 2005-09-25 13:58:27 UTC (rev 18054) +++ trunk/reactos/subsys/system/explorer/shell/shellbrowser.cpp 2005-09-25 15:59:38 UTC (rev 18055) @@ -33,7 +33,12 @@ ShellBrowser::ShellBrowser(HWND hwnd, HWND left_hwnd, WindowHandle& right_hwnd, ShellPathInfo& create_info, HIMAGELIST himl, BrowserCallback* cb, CtxMenuInterfaces& cm_ifs) - : _hwnd(hwnd), +#ifndef __MINGW32__ // IShellFolderViewCB missing in MinGW (as of 25.09.2005) + : super(IID_IShellFolderViewCB), +#else + : +#endif + _hwnd(hwnd), _left_hwnd(left_hwnd), _right_hwnd(right_hwnd), _create_info(create_info), @@ -357,7 +362,18 @@ fs.fFlags = FWF_NOCLIENTEDGE|FWF_BESTFITWINDOW; } +#ifndef __MINGW32__ // IShellFolderViewCB missing in MinGW (as of 25.09.2005) + SFV_CREATE sfv_create; + + sfv_create.cbSize = sizeof(SFV_CREATE); + sfv_create.pshf = folder; + sfv_create.psvOuter = NULL; + sfv_create.psfvcb = this; + + HRESULT hr = SHCreateShellFolderView(&sfv_create, &_pShellView); +#else HRESULT hr = folder->CreateViewObject(_hwnd, IID_IShellView, (void**)&_pShellView); +#endif if (FAILED(hr)) { _pShellView = NULL; @@ -378,6 +394,23 @@ } +#ifndef __MINGW32__ // IShellFolderViewCB missing in MinGW (as of 25.09.2005) + + /// shell view callback +HRESULT STDMETHODCALLTYPE ShellBrowser::MessageSFVCB(UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + if (uMsg == SFVM_INITMENUPOPUP) { + //@todo never reached + InsertMenu((HMENU)lParam, 0, MF_BYPOSITION, 12345, TEXT("TEST ENTRY")); + return S_OK; + } + + return E_NOTIMPL; +} + +#endif + + HRESULT ShellBrowser::OnDefaultCommand(LPIDA pida) { CONTEXT("ShellBrowser::OnDefaultCommand()"); _____ Modified: trunk/reactos/subsys/system/explorer/shell/shellbrowser.h --- trunk/reactos/subsys/system/explorer/shell/shellbrowser.h 2005-09-25 13:58:27 UTC (rev 18054) +++ trunk/reactos/subsys/system/explorer/shell/shellbrowser.h 2005-09-25 15:59:38 UTC (rev 18055) @@ -57,6 +57,10 @@ /// Implementation of IShellBrowserImpl interface in explorer child windows struct ShellBrowser : public IShellBrowserImpl +#ifndef __MINGW32__ // IShellFolderViewCB missing in MinGW (as of 25.09.2005) + , public IComSrvBase<IShellFolderViewCB, ShellBrowser>, + public SimpleComObject +#endif { ShellBrowser(HWND hwnd, HWND left_hwnd, WindowHandle& right_hwnd, ShellPathInfo& create_info, HIMAGELIST himl, BrowserCallback* cb, CtxMenuInterfaces& cm_ifs); @@ -162,6 +166,13 @@ void InitializeTree(HIMAGELIST himl); bool InitDragDrop(); + +#ifndef __MINGW32__ // IShellFolderViewCB missing in MinGW (as of 25.09.2005) + typedef IComSrvBase<IShellFolderViewCB, ShellBrowser> super; + + // IShellFolderViewCB + virtual HRESULT STDMETHODCALLTYPE MessageSFVCB(UINT uMsg, WPARAM wParam, LPARAM lParam); +#endif }; _____ Modified: trunk/reactos/subsys/system/explorer/shell/webchild.h --- trunk/reactos/subsys/system/explorer/shell/webchild.h 2005-09-25 13:58:27 UTC (rev 18054) +++ trunk/reactos/subsys/system/explorer/shell/webchild.h 2005-09-25 15:59:38 UTC (rev 18055) @@ -79,94 +79,10 @@ #endif #ifdef _MSC_VER -#define NOVTABLE __declspec(novtable) -#else -#define NOVTABLE -#endif -#define ANSUNC - -#ifdef _MSC_VER #pragma warning(disable: 4355) // use of 'this' for initialization of _connector #endif -struct NOVTABLE ComSrvObject // NOVTABLE erlaubt, da protected Destruktor -{ -protected: - ComSrvObject() : _ref(1) {} - virtual ~ComSrvObject() {} - - ULONG _ref; -}; - -struct SimpleComObject : public ComSrvObject -{ - ULONG IncRef() {return ++_ref;} - ULONG DecRef() {ULONG ref=--_ref; if (!ref) {_ref++; delete this;} return ref;} -}; - - - // server object interfaces - -template<typename BASE> struct IComSrvQI : public BASE -{ - IComSrvQI(REFIID uuid_base) - : _uuid_base(uuid_base) - { - } - - STDMETHODIMP QueryInterface(REFIID riid, LPVOID* ppv) - { - *ppv = NULL; - - if (IsEqualIID(riid, _uuid_base) || IsEqualIID(riid, IID_IUnknown)) - {*ppv=static_cast<BASE*>(this); this->AddRef(); return S_OK;} - - return E_NOINTERFACE; - } - -protected: - IComSrvQI() {} - virtual ~IComSrvQI() {} - - REFIID _uuid_base; -}; - -template<> struct IComSrvQI<IUnknown> : public IUnknown -{ - STDMETHODIMP QueryInterface(REFIID riid, LPVOID* ppv) - { - *ppv = NULL; - - if (IsEqualIID(riid, IID_IUnknown)) - {*ppv=this; AddRef(); return S_OK;} - - return E_NOINTERFACE; - } - -protected: - IComSrvQI<IUnknown>() {} - virtual ~IComSrvQI<IUnknown>() {} -}; - - -template<typename BASE, typename OBJ> - class IComSrvBase : public IComSrvQI<BASE> -{ - typedef IComSrvQI<BASE> super; - -protected: - IComSrvBase(REFIID uuid_base) - : super(uuid_base) - { - } - -public: - STDMETHODIMP_(ULONG) AddRef() {return static_cast<OBJ*>(this)->IncRef();} - STDMETHODIMP_(ULONG) Release() {return static_cast<OBJ*>(this)->DecRef();} -}; - - template<typename T> struct ConnectionPoint : public SIfacePtr<T> { ConnectionPoint(IConnectionPointContainer* pCPC, REFIID riid) _____ Modified: trunk/reactos/subsys/system/explorer/utility/shellclasses.h --- trunk/reactos/subsys/system/explorer/utility/shellclasses.h 2005-09-25 13:58:27 UTC (rev 18054) +++ trunk/reactos/subsys/system/explorer/utility/shellclasses.h 2005-09-25 15:59:38 UTC (rev 18055) @@ -52,7 +52,14 @@ #define CFSTR_SHELLIDLIST sCFSTR_SHELLIDLIST #endif +#ifdef _MSC_VER +#define NOVTABLE __declspec(novtable) +#else +#define NOVTABLE +#endif +#define ANSUNC + // Exception Handling #ifndef _NO_COMUTIL @@ -438,7 +445,84 @@ }; +struct NOVTABLE ComSrvObject // NOVTABLE erlaubt, da protected Destruktor +{ +protected: + ComSrvObject() : _ref(1) {} + virtual ~ComSrvObject() {} + ULONG _ref; +}; + +struct SimpleComObject : public ComSrvObject +{ + ULONG IncRef() {return ++_ref;} + ULONG DecRef() {ULONG ref=--_ref; if (!ref) {_ref++; delete this;} return ref;} +}; + + + // server object interfaces + +template<typename BASE> struct IComSrvQI : public BASE +{ + IComSrvQI(REFIID uuid_base) + : _uuid_base(uuid_base) + { + } + + STDMETHODIMP QueryInterface(REFIID riid, LPVOID* ppv) + { + *ppv = NULL; + + if (IsEqualIID(riid, _uuid_base) || IsEqualIID(riid, IID_IUnknown)) + {*ppv=static_cast<BASE*>(this); this->AddRef(); return S_OK;} + + return E_NOINTERFACE; + } + +protected: + IComSrvQI() {} + virtual ~IComSrvQI() {} + + REFIID _uuid_base; +}; + +template<> struct IComSrvQI<IUnknown> : public IUnknown +{ + STDMETHODIMP QueryInterface(REFIID riid, LPVOID* ppv) + { + *ppv = NULL; + + if (IsEqualIID(riid, IID_IUnknown)) + {*ppv=this; AddRef(); return S_OK;} + + return E_NOINTERFACE; + } + +protected: + IComSrvQI<IUnknown>() {} + virtual ~IComSrvQI<IUnknown>() {} +}; + + +template<typename BASE, typename OBJ> + class IComSrvBase : public IComSrvQI<BASE> +{ + typedef IComSrvQI<BASE> super; + +protected: + IComSrvBase(REFIID uuid_base) + : super(uuid_base) + { + } + +public: + STDMETHODIMP_(ULONG) AddRef() {return static_cast<OBJ*>(this)->IncRef();} + STDMETHODIMP_(ULONG) Release() {return static_cast<OBJ*>(this)->DecRef();} +}; + + + struct ShellFolder;

1 0

[ea] 18054: Minor changes. This program does NOT work in ROS.
by ea＠svn.reactos.com 25 Sep '05

25 Sep '05

Minor changes. This program does NOT work in ROS. Modified: trunk/rosapps/sysutils/lsdd/lsdd.c _____ Modified: trunk/rosapps/sysutils/lsdd/lsdd.c --- trunk/rosapps/sysutils/lsdd/lsdd.c 2005-09-25 13:56:45 UTC (rev 18053) +++ trunk/rosapps/sysutils/lsdd/lsdd.c 2005-09-25 13:58:27 UTC (rev 18054) @@ -1,6 +1,6 @@ /* $Id$ * - * FILE : ldd.c + * FILE : lsdd.c * AUTHOR: Emanuele ALIBERTI * DATE : 2000-08-04 * DESC : List DOS devices, i.e. symbolic links created @@ -21,6 +21,8 @@ #define LINKS_SIZE 32768 #define DEVICE_SIZE 8192 +static const LPWSTR error_prefix = L"lsdd: "; + static char SymbolicLinks [LINKS_SIZE]; static char DosDeviceName [DEVICE_SIZE]; @@ -57,7 +59,7 @@ main (int argc, char * argv [] ) { printf ( - "ReactOS %s - List DOS Devices Utility\n" + "ReactOS/Win32 %s - List DOS Devices Utility\n" "Written by E.Aliberti (%s)\n\n", KERNEL_RELEASE_STR, __DATE__ @@ -102,7 +104,7 @@ else { PrintWin32Error ( - L"ldd: ", + error_prefix, GetLastError () ); } @@ -112,7 +114,7 @@ else { PrintWin32Error ( - L"ldd: ", + error_prefix, GetLastError () ); return EXIT_FAILURE;

1 0

[ea] 18053: Fix compiling.
by ea＠svn.reactos.com 25 Sep '05

25 Sep '05

Fix compiling. Modified: trunk/reactos/subsys/system/notepad/text.c _____ Modified: trunk/reactos/subsys/system/notepad/text.c --- trunk/reactos/subsys/system/notepad/text.c 2005-09-25 13:54:19 UTC (rev 18052) +++ trunk/reactos/subsys/system/notepad/text.c 2005-09-25 13:56:45 UTC (rev 18053) @@ -63,7 +63,7 @@ DWORD dwPos, i; DWORD dwCharCount; BOOL bSuccess = FALSE; - BYTE b; + BYTE b = 0; int iEncoding = ENCODING_ANSI; int iCodePage; WCHAR szCrlf[2] = { '\r', '\n' }; @@ -216,14 +216,14 @@ static BOOL WriteEncodedText(HANDLE hFile, LPCWSTR pszText, DWORD dwTextLen, int iEncoding) { - LPBYTE pBytes; + LPBYTE pBytes = NULL; LPBYTE pAllocBuffer = NULL; DWORD dwPos = 0; DWORD dwByteCount; BYTE buffer[1024]; UINT iCodePage; DWORD dwDummy, i; - BOOL bSuccess; + BOOL bSuccess = FALSE; int iBufferSize, iRequiredBytes; BYTE b;

1 0

[greatlrd] 18052: Remove Es.rc from timedate for it is 100% empty. Thx tsk
by greatlrd＠svn.reactos.com 25 Sep '05

25 Sep '05

Remove Es.rc from timedate for it is 100% empty. Thx tsk Deleted: trunk/reactos/lib/cpl/timedate/Es.rc Modified: trunk/reactos/lib/cpl/timedate/timedate.rc _____ Deleted: trunk/reactos/lib/cpl/timedate/Es.rc _____ Modified: trunk/reactos/lib/cpl/timedate/timedate.rc --- trunk/reactos/lib/cpl/timedate/timedate.rc 2005-09-25 13:43:33 UTC (rev 18051) +++ trunk/reactos/lib/cpl/timedate/timedate.rc 2005-09-25 13:54:19 UTC (rev 18052) @@ -19,7 +19,6 @@ #include "Cz.rc" #include "De.rc" #include "Dk.rc" -#include "Es.rc" #include "Fr.rc" #include "Nl.rc" #include "Pl.rc"

1 0

[ea] 18051: svn: eol-style + keywords
by ea＠svn.reactos.com 25 Sep '05

25 Sep '05

svn: eol-style + keywords Modified: trunk/reactos/lib/ntdll/csr/api.c Modified: trunk/reactos/lib/ntdll/csr/capture.c Modified: trunk/reactos/lib/ntdll/csr/connect.c _____ Modified: trunk/reactos/lib/ntdll/csr/api.c --- trunk/reactos/lib/ntdll/csr/api.c 2005-09-25 13:36:27 UTC (rev 18050) +++ trunk/reactos/lib/ntdll/csr/api.c 2005-09-25 13:43:33 UTC (rev 18051) @@ -1,89 +1,90 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: lib/ntdll/csr/api.c - * PURPOSE: CSR APIs exported through NTDLL - * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) - */ - -/* INCLUDES *****************************************************************/ - -#include <ntdll.h> -#define NDEBUG -#include <debug.h> - -/* GLOBALS *******************************************************************/ -extern HANDLE CsrApiPort; - -/* FUNCTIONS *****************************************************************/ - -/* - * @implemented - */ -NTSTATUS -NTAPI -CsrNewThread(VOID) -{ - /* Register the termination port to CSR's */ - return NtRegisterThreadTerminatePort(CsrApiPort); -} - -/* - * @implemented - */ -NTSTATUS -NTAPI -CsrSetPriorityClass(HANDLE hProcess, - PULONG PriorityClass) -{ - NTSTATUS Status; - CSR_API_MESSAGE2 ApiMessage; /* <- Remove the "2" when CSR is commited */ - PCSR_SET_PRIORITY_CLASS SetPriorityClass = &ApiMessage.SetPriorityClass; - - /* Set up the data for CSR */ - DbgBreakPoint(); - SetPriorityClass->hProcess = hProcess; - SetPriorityClass->PriorityClass = *PriorityClass; - - /* Call it */ - Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, - NULL, - CSR_MAKE_OPCODE(CsrSrvSetPriorityClass, - CSR_SRV_SERVER), - sizeof(CSR_SET_PRIORITY_CLASS)); - - /* Return what we got, if requested */ - if (*PriorityClass) *PriorityClass = SetPriorityClass->PriorityClass; - - /* Return to caller */ - return Status; -} - -/* - * @implemented - */ -NTSTATUS -NTAPI -CsrIdentifyAlertableThread (VOID) -{ - NTSTATUS Status; - CSR_API_MESSAGE2 ApiMessage; /* <- Remove the "2" when CSR is commited */ - PCSR_IDENTIFY_ALTERTABLE_THREAD IdentifyAlertableThread; - - /* Set up the data for CSR */ - DbgBreakPoint(); - IdentifyAlertableThread = &ApiMessage.IdentifyAlertableThread; - IdentifyAlertableThread->Cid = NtCurrentTeb()->Cid; - - /* Call it */ - Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, - NULL, - CSR_MAKE_OPCODE(CsrSrvIdentifyAlertableThread, - CSR_SRV_SERVER), - sizeof(CSR_SET_PRIORITY_CLASS)); - - /* Return to caller */ - return Status; -} - -/* EOF */ +/* $Id$ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: lib/ntdll/csr/api.c + * PURPOSE: CSR APIs exported through NTDLL + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) + */ + +/* INCLUDES *****************************************************************/ + +#include <ntdll.h> +#define NDEBUG +#include <debug.h> + +/* GLOBALS *******************************************************************/ +extern HANDLE CsrApiPort; + +/* FUNCTIONS *****************************************************************/ + +/* + * @implemented + */ +NTSTATUS +NTAPI +CsrNewThread(VOID) +{ + /* Register the termination port to CSR's */ + return NtRegisterThreadTerminatePort(CsrApiPort); +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +CsrSetPriorityClass(HANDLE hProcess, + PULONG PriorityClass) +{ + NTSTATUS Status; + CSR_API_MESSAGE2 ApiMessage; /* <- Remove the "2" when CSR is commited */ + PCSR_SET_PRIORITY_CLASS SetPriorityClass = &ApiMessage.SetPriorityClass; + + /* Set up the data for CSR */ + DbgBreakPoint(); + SetPriorityClass->hProcess = hProcess; + SetPriorityClass->PriorityClass = *PriorityClass; + + /* Call it */ + Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, + NULL, + CSR_MAKE_OPCODE(CsrSrvSetPriorityClass, + CSR_SRV_SERVER), + sizeof(CSR_SET_PRIORITY_CLASS)); + + /* Return what we got, if requested */ + if (*PriorityClass) *PriorityClass = SetPriorityClass->PriorityClass; + + /* Return to caller */ + return Status; +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +CsrIdentifyAlertableThread (VOID) +{ + NTSTATUS Status; + CSR_API_MESSAGE2 ApiMessage; /* <- Remove the "2" when CSR is commited */ + PCSR_IDENTIFY_ALTERTABLE_THREAD IdentifyAlertableThread; + + /* Set up the data for CSR */ + DbgBreakPoint(); + IdentifyAlertableThread = &ApiMessage.IdentifyAlertableThread; + IdentifyAlertableThread->Cid = NtCurrentTeb()->Cid; + + /* Call it */ + Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, + NULL, + CSR_MAKE_OPCODE(CsrSrvIdentifyAlertableThread, + CSR_SRV_SERVER), + sizeof(CSR_SET_PRIORITY_CLASS)); + + /* Return to caller */ + return Status; +} + +/* EOF */ Property changes on: trunk/reactos/lib/ntdll/csr/api.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/ntdll/csr/capture.c --- trunk/reactos/lib/ntdll/csr/capture.c 2005-09-25 13:36:27 UTC (rev 18050) +++ trunk/reactos/lib/ntdll/csr/capture.c 2005-09-25 13:43:33 UTC (rev 18051) @@ -1,4 +1,5 @@ -/* +/* $Id$ + * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: lib/ntdll/csr/capture.c _____ Modified: trunk/reactos/lib/ntdll/csr/connect.c --- trunk/reactos/lib/ntdll/csr/connect.c 2005-09-25 13:36:27 UTC (rev 18050) +++ trunk/reactos/lib/ntdll/csr/connect.c 2005-09-25 13:43:33 UTC (rev 18051) @@ -1,437 +1,438 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: lib/ntdll/csr/connect.c - * PURPOSE: Routines for connecting and calling CSR - * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) - */ - -/* INCLUDES *****************************************************************/ - -#include <ntdll.h> -#define NDEBUG -#include <debug.h> - -/* GLOBALS *******************************************************************/ - -HANDLE CsrApiPort; -HANDLE CsrProcessId; -HANDLE CsrPortHeap; -ULONG_PTR CsrPortMemoryDelta; -BOOLEAN InsideCsrProcess = FALSE; -BOOLEAN UsingOldCsr = TRUE; - -typedef NTSTATUS -(NTAPI *PCSR_SERVER_API_ROUTINE)(IN PPORT_MESSAGE Request, - IN PPORT_MESSAGE Reply); - -PCSR_SERVER_API_ROUTINE CsrServerApiRoutine; - -#define UNICODE_PATH_SEP L"\\" -#define CSR_PORT_NAME L"ApiPort" - -/* FUNCTIONS *****************************************************************/ - -/* - * @implemented - */ -HANDLE -NTAPI -CsrGetProcessId(VOID) -{ - return CsrProcessId; -} - -/* - * @implemented - */ -NTSTATUS -NTAPI -CsrClientCallServer(PCSR_API_MESSAGE ApiMessage, - PCSR_CAPTURE_BUFFER CaptureBuffer OPTIONAL, - CSR_API_NUMBER ApiNumber, - ULONG RequestLength) -{ - NTSTATUS Status; - ULONG PointerCount; - PULONG_PTR Pointers; - ULONG_PTR CurrentPointer; - DPRINT("CsrClientCallServer\n"); - - /* Fill out the Port Message Header */ - ApiMessage->Header.u1.s1.DataLength = RequestLength - sizeof(PORT_MESSAGE); - ApiMessage->Header.u1.s1.TotalLength = RequestLength; - - /* Fill out the CSR Header */ - ApiMessage->Type = ApiNumber; - //ApiMessage->Opcode = ApiNumber; <- Activate with new CSR - ApiMessage->CsrCaptureData = NULL; - - DPRINT("API: %x, u1.s1.DataLength: %x, u1.s1.TotalLength: %x\n", - ApiNumber, - ApiMessage->Header.u1.s1.DataLength, - ApiMessage->Header.u1.s1.TotalLength); - - /* Check if we are already inside a CSR Server */ - if (!InsideCsrProcess) - { - /* Check if we got a a Capture Buffer */ - if (CaptureBuffer) - { - /* We have to convert from our local view to the remote view */ - DPRINT1("Converting CaptureBuffer\n"); - ApiMessage->CsrCaptureData = (PVOID)((ULONG_PTR)CaptureBuffer + - CsrPortMemoryDelta); - - /* Lock the buffer */ - CaptureBuffer->BufferEnd = 0; - - /* Get the pointer information */ - PointerCount = CaptureBuffer->PointerCount; - Pointers = CaptureBuffer->PointerArray; - - /* Loop through every pointer and convert it */ - while (PointerCount--) - { - /* Get this pointer and check if it's valid */ - if ((CurrentPointer = *Pointers++)) - { - /* Update it */ - *(PULONG_PTR)CurrentPointer += CsrPortMemoryDelta; - Pointers[-1] = CurrentPointer - (ULONG_PTR)ApiMessage; - } - } - } - - /* Send the LPC Message */ - Status = NtRequestWaitReplyPort(CsrApiPort, - &ApiMessage->Header, - &ApiMessage->Header); - - /* Check if we got a a Capture Buffer */ - if (CaptureBuffer) - { - /* We have to convert from the remote view to our remote view */ - DPRINT1("Reconverting CaptureBuffer\n"); - ApiMessage->CsrCaptureData = (PVOID)((ULONG_PTR) - ApiMessage->CsrCaptureData - - CsrPortMemoryDelta); - - /* Get the pointer information */ - PointerCount = CaptureBuffer->PointerCount; - Pointers = CaptureBuffer->PointerArray; - - /* Loop through every pointer and convert it */ - while (PointerCount--) - { - /* Get this pointer and check if it's valid */ - if ((CurrentPointer = *Pointers++)) - { - /* Update it */ - CurrentPointer += (ULONG_PTR)ApiMessage; - Pointers[-1] = CurrentPointer; - *(PULONG_PTR)CurrentPointer -= CsrPortMemoryDelta; - } - } - } - - /* Check for success */ - if (!NT_SUCCESS(Status)) - { - /* We failed. Overwrite the return value with the failure */ - DPRINT1("LPC Failed: %lx\n", Status); - ApiMessage->Status = Status; - } - } - else - { - /* This is a server-to-server call. Save our CID and do a direct call */ - DbgBreakPoint(); - ApiMessage->Header.ClientId = NtCurrentTeb()->Cid; - Status = CsrServerApiRoutine(&ApiMessage->Header, - &ApiMessage->Header); - - /* Check for success */ - if (!NT_SUCCESS(Status)) - { - /* We failed. Overwrite the return value with the failure */ - ApiMessage->Status = Status; - } - } - - /* Return the CSR Result */ - DPRINT("Got back: %x\n", ApiMessage->Status); - return ApiMessage->Status; -} - -NTSTATUS -NTAPI -CsrConnectToServer(IN PWSTR ObjectDirectory) -{ - ULONG PortNameLength; - UNICODE_STRING PortName; - LARGE_INTEGER CsrSectionViewSize; - NTSTATUS Status; - HANDLE CsrSectionHandle; - PORT_VIEW LpcWrite; - REMOTE_PORT_VIEW LpcRead; - SECURITY_QUALITY_OF_SERVICE SecurityQos; - SID_IDENTIFIER_AUTHORITY NtSidAuthority = {SECURITY_NT_AUTHORITY}; - PSID SystemSid = NULL; - CSR_CONNECTION_INFO ConnectionInfo; - ULONG ConnectionInfoLength = sizeof(CSR_CONNECTION_INFO); - - DPRINT("%s(%S)\n", __FUNCTION__, ObjectDirectory); - - /* Binary compatibility with MS KERNEL32 */ - if (NULL == ObjectDirectory) - { - ObjectDirectory = L"\\Windows"; - } - - /* Calculate the total port name size */ - PortNameLength = ((wcslen(ObjectDirectory) + 1) * sizeof(WCHAR)) + - sizeof(CSR_PORT_NAME); - - /* Set the port name */ - PortName.Length = 0; - PortName.MaximumLength = PortNameLength; - - /* Allocate a buffer for it */ - PortName.Buffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, PortNameLength); - - /* Create the name */ - RtlAppendUnicodeToString(&PortName, ObjectDirectory ); - RtlAppendUnicodeToString(&PortName, UNICODE_PATH_SEP); - RtlAppendUnicodeToString(&PortName, CSR_PORT_NAME); - - /* Create a section for the port memory */ - CsrSectionViewSize.QuadPart = CSR_CSRSS_SECTION_SIZE; - Status = NtCreateSection(&CsrSectionHandle, - SECTION_ALL_ACCESS, - NULL, - &CsrSectionViewSize, - PAGE_READWRITE, - SEC_COMMIT, - NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failure allocating CSR Section\n"); - return Status; - } - - /* Set up the port view structures to match them with the section */ - LpcWrite.Length = sizeof(PORT_VIEW); - LpcWrite.SectionHandle = CsrSectionHandle; - LpcWrite.SectionOffset = 0; - LpcWrite.ViewSize = CsrSectionViewSize.u.LowPart; - LpcWrite.ViewBase = 0; - LpcWrite.ViewRemoteBase = 0; - LpcRead.Length = sizeof(REMOTE_PORT_VIEW); - LpcRead.ViewSize = 0; - LpcRead.ViewBase = 0; - - /* Setup the QoS */ - SecurityQos.ImpersonationLevel = SecurityImpersonation; - SecurityQos.ContextTrackingMode = SECURITY_DYNAMIC_TRACKING; - SecurityQos.EffectiveOnly = TRUE; - - /* Setup the connection info */ - ConnectionInfo.Version = 0x10000; - - /* Create a SID for us */ - Status = RtlAllocateAndInitializeSid(&NtSidAuthority, - 1, - SECURITY_LOCAL_SYSTEM_RID, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - &SystemSid); - - /* Connect to the port */ - Status = NtSecureConnectPort(&CsrApiPort, - &PortName, - &SecurityQos, - &LpcWrite, - SystemSid, - &LpcRead, - NULL, - &ConnectionInfo, - &ConnectionInfoLength); - NtClose(CsrSectionHandle); - if (!NT_SUCCESS(Status)) - { - /* Failure */ - DPRINT1("Couldn't connect to CSR port\n"); - return Status; - } - - /* Save the delta between the sections, for capture usage later */ - CsrPortMemoryDelta = (ULONG_PTR)LpcWrite.ViewRemoteBase - - (ULONG_PTR)LpcWrite.ViewBase; - - /* Save the Process */ - CsrProcessId = ConnectionInfo.ProcessId; - - /* Save CSR Section data */ - NtCurrentPeb()->ReadOnlySharedMemoryBase = ConnectionInfo.SharedSectionBase; - NtCurrentPeb()->ReadOnlySharedMemoryHeap = ConnectionInfo.SharedSectionHeap; - NtCurrentPeb()->ReadOnlyStaticServerData = ConnectionInfo.SharedSectionData; - - /* Create the port heap */ - CsrPortHeap = RtlCreateHeap(0, - LpcWrite.ViewBase, - LpcWrite.ViewSize, - PAGE_SIZE, - 0, - 0); - - /* Return success */ - return STATUS_SUCCESS; -} - -/* - * @implemented - */ -NTSTATUS -NTAPI -CsrClientConnectToServer(PWSTR ObjectDirectory, - ULONG ServerId, - PVOID ConnectionInfo, - PULONG ConnectionInfoSize, - PBOOLEAN ServerToServerCall) -{ - NTSTATUS Status; - PIMAGE_NT_HEADERS NtHeader; - UNICODE_STRING CsrSrvName; - HANDLE hCsrSrv; - ANSI_STRING CsrServerRoutineName; - PCSR_CAPTURE_BUFFER CaptureBuffer; - CSR_API_MESSAGE RosApiMessage; - CSR_API_MESSAGE2 ApiMessage; - PCSR_CLIENT_CONNECT ClientConnect = &ApiMessage.ClientConnect; - - /* Validate the Connection Info */ - DPRINT("CsrClientConnectToServer: %lx %p\n", ServerId, ConnectionInfo); - if (ConnectionInfo && (!ConnectionInfoSize || !*ConnectionInfoSize)) - { - DPRINT1("Connection info given, but no length\n"); - return STATUS_INVALID_PARAMETER; - } - - /* Check if we're inside a CSR Process */ - if (InsideCsrProcess) - { - /* Tell the client that we're already inside CSR */ - if (ServerToServerCall) *ServerToServerCall = TRUE; - return STATUS_SUCCESS; - } - - /* - * We might be in a CSR Process but not know it, if this is the first call. - * So let's find out. - */ - if (!(NtHeader = RtlImageNtHeader(NtCurrentPeb()->ImageBaseAddress))) - { - /* The image isn't valid */ - DPRINT1("Invalid image\n"); - return STATUS_INVALID_IMAGE_FORMAT; - } - InsideCsrProcess = (NtHeader->OptionalHeader.Subsystem == IMAGE_SUBSYSTEM_NATIVE); - - /* Now we can check if we are inside or not */ - if (InsideCsrProcess && !UsingOldCsr) - { - /* We're inside, so let's find csrsrv */ - DbgBreakPoint(); - RtlInitUnicodeString(&CsrSrvName, L"csrsrv"); - Status = LdrGetDllHandle(NULL, - NULL, - &CsrSrvName, - &hCsrSrv); - RtlFreeUnicodeString(&CsrSrvName); - - /* Now get the Server to Server routine */ - RtlInitAnsiString(&CsrServerRoutineName, "CsrCallServerFromServer"); - Status = LdrGetProcedureAddress(hCsrSrv, - &CsrServerRoutineName, - 0L, - (PVOID*)&CsrServerApiRoutine); - - /* Use the local heap as port heap */ - CsrPortHeap = RtlGetProcessHeap(); - - /* Tell the caller we're inside the server */ - *ServerToServerCall = InsideCsrProcess; - return STATUS_SUCCESS; - } - - /* Now check if connection info is given */ - if (ConnectionInfo) - { - /* Well, we're defintely in a client now */ - InsideCsrProcess = FALSE; - - /* Do we have a connection to CSR yet? */ - if (!CsrApiPort) - { - /* No, set it up now */ - if (!NT_SUCCESS(Status = CsrConnectToServer(ObjectDirectory))) - { - /* Failed */ - DPRINT1("Failure to connect to CSR\n"); - return Status; - } - } - - /* Setup the connect message header */ - ClientConnect->ServerId = ServerId; - ClientConnect->ConnectionInfoSize = *ConnectionInfoSize; - - /* Setup a buffer for the connection info */ - CaptureBuffer = CsrAllocateCaptureBuffer(1, - ClientConnect->ConnectionInfoSize); - - /* Allocate a pointer for the connection info*/ - CsrAllocateMessagePointer(CaptureBuffer, - ClientConnect->ConnectionInfoSize, - &ClientConnect->ConnectionInfo); - - /* Copy the data into the buffer */ - RtlMoveMemory(ClientConnect->ConnectionInfo, - ConnectionInfo, - ClientConnect->ConnectionInfoSize); - - /* Return the allocated length */ - *ConnectionInfoSize = ClientConnect->ConnectionInfoSize; - - /* Call CSR */ -#if 0 - Status = CsrClientCallServer(&ApiMessage, - CaptureBuffer, - CSR_MAKE_OPCODE(CsrSrvClientConnect, - CSR_SRV_DLL), - sizeof(CSR_CLIENT_CONNECT)); -#endif - Status = CsrClientCallServer(&RosApiMessage, - NULL, - MAKE_CSR_API(CONNECT_PROCESS, CSR_NATIVE), - sizeof(CSR_API_MESSAGE)); - } - else - { - /* No connection info, just return */ - Status = STATUS_SUCCESS; - } - - /* Let the caller know if this was server to server */ - DPRINT("Status was: %lx. Are we in server: %lx\n", Status, InsideCsrProcess); - if (ServerToServerCall) *ServerToServerCall = InsideCsrProcess; - return Status; -} - -/* EOF */ +/* $Id$ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: lib/ntdll/csr/connect.c + * PURPOSE: Routines for connecting and calling CSR + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) + */ + +/* INCLUDES *****************************************************************/ + +#include <ntdll.h> +#define NDEBUG +#include <debug.h> + +/* GLOBALS *******************************************************************/ + +HANDLE CsrApiPort; +HANDLE CsrProcessId; +HANDLE CsrPortHeap; +ULONG_PTR CsrPortMemoryDelta; +BOOLEAN InsideCsrProcess = FALSE; +BOOLEAN UsingOldCsr = TRUE; + +typedef NTSTATUS +(NTAPI *PCSR_SERVER_API_ROUTINE)(IN PPORT_MESSAGE Request, + IN PPORT_MESSAGE Reply); + +PCSR_SERVER_API_ROUTINE CsrServerApiRoutine; + +#define UNICODE_PATH_SEP L"\\" +#define CSR_PORT_NAME L"ApiPort" + +/* FUNCTIONS *****************************************************************/ + +/* + * @implemented + */ +HANDLE +NTAPI +CsrGetProcessId(VOID) +{ + return CsrProcessId; +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +CsrClientCallServer(PCSR_API_MESSAGE ApiMessage, + PCSR_CAPTURE_BUFFER CaptureBuffer OPTIONAL, + CSR_API_NUMBER ApiNumber, + ULONG RequestLength) +{ + NTSTATUS Status; + ULONG PointerCount; + PULONG_PTR Pointers; + ULONG_PTR CurrentPointer; + DPRINT("CsrClientCallServer\n"); + + /* Fill out the Port Message Header */ + ApiMessage->Header.u1.s1.DataLength = RequestLength - sizeof(PORT_MESSAGE); + ApiMessage->Header.u1.s1.TotalLength = RequestLength; + + /* Fill out the CSR Header */ + ApiMessage->Type = ApiNumber; + //ApiMessage->Opcode = ApiNumber; <- Activate with new CSR + ApiMessage->CsrCaptureData = NULL; + + DPRINT("API: %x, u1.s1.DataLength: %x, u1.s1.TotalLength: %x\n", + ApiNumber, + ApiMessage->Header.u1.s1.DataLength, + ApiMessage->Header.u1.s1.TotalLength); + + /* Check if we are already inside a CSR Server */ + if (!InsideCsrProcess) + { + /* Check if we got a a Capture Buffer */ + if (CaptureBuffer) + { + /* We have to convert from our local view to the remote view */ + DPRINT1("Converting CaptureBuffer\n"); + ApiMessage->CsrCaptureData = (PVOID)((ULONG_PTR)CaptureBuffer + + CsrPortMemoryDelta); + + /* Lock the buffer */ + CaptureBuffer->BufferEnd = 0; + + /* Get the pointer information */ + PointerCount = CaptureBuffer->PointerCount; + Pointers = CaptureBuffer->PointerArray; + + /* Loop through every pointer and convert it */ + while (PointerCount--) + { + /* Get this pointer and check if it's valid */ + if ((CurrentPointer = *Pointers++)) + { + /* Update it */ + *(PULONG_PTR)CurrentPointer += CsrPortMemoryDelta; + Pointers[-1] = CurrentPointer - (ULONG_PTR)ApiMessage; + } + } + } + + /* Send the LPC Message */ + Status = NtRequestWaitReplyPort(CsrApiPort, + &ApiMessage->Header, + &ApiMessage->Header); + + /* Check if we got a a Capture Buffer */ + if (CaptureBuffer) + { + /* We have to convert from the remote view to our remote view */ + DPRINT1("Reconverting CaptureBuffer\n"); + ApiMessage->CsrCaptureData = (PVOID)((ULONG_PTR) + ApiMessage->CsrCaptureData - + CsrPortMemoryDelta); + + /* Get the pointer information */ + PointerCount = CaptureBuffer->PointerCount; + Pointers = CaptureBuffer->PointerArray; + + /* Loop through every pointer and convert it */ + while (PointerCount--) + { + /* Get this pointer and check if it's valid */ + if ((CurrentPointer = *Pointers++)) + { + /* Update it */ + CurrentPointer += (ULONG_PTR)ApiMessage; + Pointers[-1] = CurrentPointer; + *(PULONG_PTR)CurrentPointer -= CsrPortMemoryDelta; + } + } + } + + /* Check for success */ + if (!NT_SUCCESS(Status)) + { + /* We failed. Overwrite the return value with the failure */ + DPRINT1("LPC Failed: %lx\n", Status); + ApiMessage->Status = Status; + } + } + else + { + /* This is a server-to-server call. Save our CID and do a direct call */ + DbgBreakPoint(); + ApiMessage->Header.ClientId = NtCurrentTeb()->Cid; + Status = CsrServerApiRoutine(&ApiMessage->Header, + &ApiMessage->Header); + + /* Check for success */ + if (!NT_SUCCESS(Status)) + { + /* We failed. Overwrite the return value with the failure */ + ApiMessage->Status = Status; + } + } + + /* Return the CSR Result */ + DPRINT("Got back: %x\n", ApiMessage->Status); + return ApiMessage->Status; +} + +NTSTATUS +NTAPI +CsrConnectToServer(IN PWSTR ObjectDirectory) +{ + ULONG PortNameLength; + UNICODE_STRING PortName; + LARGE_INTEGER CsrSectionViewSize; + NTSTATUS Status; + HANDLE CsrSectionHandle; + PORT_VIEW LpcWrite; + REMOTE_PORT_VIEW LpcRead; + SECURITY_QUALITY_OF_SERVICE SecurityQos; + SID_IDENTIFIER_AUTHORITY NtSidAuthority = {SECURITY_NT_AUTHORITY}; + PSID SystemSid = NULL; + CSR_CONNECTION_INFO ConnectionInfo; + ULONG ConnectionInfoLength = sizeof(CSR_CONNECTION_INFO); + + DPRINT("%s(%S)\n", __FUNCTION__, ObjectDirectory); + + /* Binary compatibility with MS KERNEL32 */ + if (NULL == ObjectDirectory) + { + ObjectDirectory = L"\\Windows"; + } + + /* Calculate the total port name size */ + PortNameLength = ((wcslen(ObjectDirectory) + 1) * sizeof(WCHAR)) + + sizeof(CSR_PORT_NAME); + + /* Set the port name */ + PortName.Length = 0; + PortName.MaximumLength = PortNameLength; + + /* Allocate a buffer for it */ + PortName.Buffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, PortNameLength); + + /* Create the name */ + RtlAppendUnicodeToString(&PortName, ObjectDirectory ); + RtlAppendUnicodeToString(&PortName, UNICODE_PATH_SEP); + RtlAppendUnicodeToString(&PortName, CSR_PORT_NAME); + + /* Create a section for the port memory */ + CsrSectionViewSize.QuadPart = CSR_CSRSS_SECTION_SIZE; + Status = NtCreateSection(&CsrSectionHandle, + SECTION_ALL_ACCESS, + NULL, + &CsrSectionViewSize, + PAGE_READWRITE, + SEC_COMMIT, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failure allocating CSR Section\n"); + return Status; + } + + /* Set up the port view structures to match them with the section */ + LpcWrite.Length = sizeof(PORT_VIEW); + LpcWrite.SectionHandle = CsrSectionHandle; + LpcWrite.SectionOffset = 0; + LpcWrite.ViewSize = CsrSectionViewSize.u.LowPart; + LpcWrite.ViewBase = 0; + LpcWrite.ViewRemoteBase = 0; + LpcRead.Length = sizeof(REMOTE_PORT_VIEW); + LpcRead.ViewSize = 0; + LpcRead.ViewBase = 0; + + /* Setup the QoS */ + SecurityQos.ImpersonationLevel = SecurityImpersonation; + SecurityQos.ContextTrackingMode = SECURITY_DYNAMIC_TRACKING; + SecurityQos.EffectiveOnly = TRUE; + + /* Setup the connection info */ + ConnectionInfo.Version = 0x10000; + + /* Create a SID for us */ + Status = RtlAllocateAndInitializeSid(&NtSidAuthority, + 1, + SECURITY_LOCAL_SYSTEM_RID, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + &SystemSid); + + /* Connect to the port */ + Status = NtSecureConnectPort(&CsrApiPort, + &PortName, + &SecurityQos, + &LpcWrite, + SystemSid, + &LpcRead, + NULL, + &ConnectionInfo, + &ConnectionInfoLength); + NtClose(CsrSectionHandle); + if (!NT_SUCCESS(Status)) + { + /* Failure */ + DPRINT1("Couldn't connect to CSR port\n"); + return Status; + } + + /* Save the delta between the sections, for capture usage later */ + CsrPortMemoryDelta = (ULONG_PTR)LpcWrite.ViewRemoteBase - + (ULONG_PTR)LpcWrite.ViewBase; + + /* Save the Process */ + CsrProcessId = ConnectionInfo.ProcessId; + + /* Save CSR Section data */ + NtCurrentPeb()->ReadOnlySharedMemoryBase = ConnectionInfo.SharedSectionBase; + NtCurrentPeb()->ReadOnlySharedMemoryHeap = ConnectionInfo.SharedSectionHeap; + NtCurrentPeb()->ReadOnlyStaticServerData = ConnectionInfo.SharedSectionData; + + /* Create the port heap */ + CsrPortHeap = RtlCreateHeap(0, + LpcWrite.ViewBase, + LpcWrite.ViewSize, + PAGE_SIZE, + 0, + 0); + + /* Return success */ + return STATUS_SUCCESS; +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +CsrClientConnectToServer(PWSTR ObjectDirectory, + ULONG ServerId, + PVOID ConnectionInfo, + PULONG ConnectionInfoSize, + PBOOLEAN ServerToServerCall) +{ + NTSTATUS Status; + PIMAGE_NT_HEADERS NtHeader; + UNICODE_STRING CsrSrvName; + HANDLE hCsrSrv; + ANSI_STRING CsrServerRoutineName; + PCSR_CAPTURE_BUFFER CaptureBuffer; + CSR_API_MESSAGE RosApiMessage; + CSR_API_MESSAGE2 ApiMessage; + PCSR_CLIENT_CONNECT ClientConnect = &ApiMessage.ClientConnect; + + /* Validate the Connection Info */ + DPRINT("CsrClientConnectToServer: %lx %p\n", ServerId, ConnectionInfo); + if (ConnectionInfo && (!ConnectionInfoSize || !*ConnectionInfoSize)) + { + DPRINT1("Connection info given, but no length\n"); + return STATUS_INVALID_PARAMETER; + } + + /* Check if we're inside a CSR Process */ + if (InsideCsrProcess) + { + /* Tell the client that we're already inside CSR */ + if (ServerToServerCall) *ServerToServerCall = TRUE; + return STATUS_SUCCESS; + } + + /* + * We might be in a CSR Process but not know it, if this is the first call. + * So let's find out. + */ + if (!(NtHeader = RtlImageNtHeader(NtCurrentPeb()->ImageBaseAddress))) + { + /* The image isn't valid */ + DPRINT1("Invalid image\n"); + return STATUS_INVALID_IMAGE_FORMAT; + } + InsideCsrProcess = (NtHeader->OptionalHeader.Subsystem == IMAGE_SUBSYSTEM_NATIVE); + + /* Now we can check if we are inside or not */ + if (InsideCsrProcess && !UsingOldCsr) + { + /* We're inside, so let's find csrsrv */ + DbgBreakPoint(); + RtlInitUnicodeString(&CsrSrvName, L"csrsrv"); + Status = LdrGetDllHandle(NULL, + NULL, + &CsrSrvName, + &hCsrSrv); + RtlFreeUnicodeString(&CsrSrvName); [truncated at 1000 lines; 87 more skipped]

1 0

[ea] 18050: Required for binary compatibility with MS KERNEL32.DLL.
by ea＠svn.reactos.com 25 Sep '05

25 Sep '05

Required for binary compatibility with MS KERNEL32.DLL. NOTE Filip and I still don't understand why KERNEL32 calls twice CsrConnectToServer. A possible explanation is because the Win32 server is a dual server: gui+console. This differs with our current implementation in the SM: we accept only console registration requests (see SmpHandleConnectionRequest). Modified: trunk/reactos/lib/ntdll/csr/connect.c _____ Modified: trunk/reactos/lib/ntdll/csr/connect.c --- trunk/reactos/lib/ntdll/csr/connect.c 2005-09-25 12:39:32 UTC (rev 18049) +++ trunk/reactos/lib/ntdll/csr/connect.c 2005-09-25 13:36:27 UTC (rev 18050) @@ -180,8 +180,15 @@ PSID SystemSid = NULL; CSR_CONNECTION_INFO ConnectionInfo; ULONG ConnectionInfoLength = sizeof(CSR_CONNECTION_INFO); - DPRINT("CsrConnectToServer\n"); + DPRINT("%s(%S)\n", __FUNCTION__, ObjectDirectory); + + /* Binary compatibility with MS KERNEL32 */ + if (NULL == ObjectDirectory) + { + ObjectDirectory = L"\\Windows"; + } + /* Calculate the total port name size */ PortNameLength = ((wcslen(ObjectDirectory) + 1) * sizeof(WCHAR)) + sizeof(CSR_PORT_NAME);

1 0

[hbirr] 18049: Let the compiler search for usable register.
by hbirr＠svn.reactos.com 25 Sep '05

25 Sep '05

Let the compiler search for usable register. Modified: trunk/reactos/lib/rtl/heap.c Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c _____ Modified: trunk/reactos/lib/rtl/heap.c --- trunk/reactos/lib/rtl/heap.c 2005-09-25 12:30:51 UTC (rev 18048) +++ trunk/reactos/lib/rtl/heap.c 2005-09-25 12:39:32 UTC (rev 18049) @@ -955,7 +955,7 @@ if ( !Frame ) { #if defined __GNUC__ - __asm__("mov %%ebp, %%ebx" : "=b" (Frame) : ); + __asm__("mov %%ebp, %0" : "=r" (Frame) : ); #elif defined(_MSC_VER) __asm mov [Frame], ebp #endif _____ Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c --- trunk/reactos/ntoskrnl/ke/i386/exp.c 2005-09-25 12:30:51 UTC (rev 18048) +++ trunk/reactos/ntoskrnl/ke/i386/exp.c 2005-09-25 12:39:32 UTC (rev 18049) @@ -988,7 +988,7 @@ if ( !Frame ) { #if defined __GNUC__ - __asm__("mov %%ebp, %%ebx" : "=b" (Frame) : ); + __asm__("mov %%ebp, %0" : "=r" (Frame) : ); #elif defined(_MSC_VER) __asm mov [Frame], ebp #endif @@ -1042,7 +1042,7 @@ _SEH_TRY { #if defined __GNUC__ - __asm__("mov %%ebp, %%ebx" : "=b" (Frame) : ); + __asm__("mov %%ebp, %0" : "=r" (Frame) : ); #elif defined(_MSC_VER) __asm mov [Frame], ebp #endif

1 0

[navaraf] 18048: Use the correct size variables in co_IntCreateWindowEx.
by navaraf＠svn.reactos.com 25 Sep '05

25 Sep '05

Use the correct size variables in co_IntCreateWindowEx. Modified: trunk/reactos/subsys/win32k/ntuser/window.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/window.c --- trunk/reactos/subsys/win32k/ntuser/window.c 2005-09-25 11:52:42 UTC (rev 18047) +++ trunk/reactos/subsys/win32k/ntuser/window.c 2005-09-25 12:30:51 UTC (rev 18048) @@ -1710,18 +1710,18 @@ /* WinPosGetMinMaxInfo sends the WM_GETMINMAXINFO message */ co_WinPosGetMinMaxInfo(Window, &MaxSize, &MaxPos, &MinTrack, &MaxTrack); - if (MaxSize.x < nWidth) - nWidth = MaxSize.x; - if (MaxSize.y < nHeight) - nHeight = MaxSize.y; - if (nWidth < MinTrack.x ) - nWidth = MinTrack.x; - if (nHeight < MinTrack.y ) - nHeight = MinTrack.y; - if (nWidth < 0) - nWidth = 0; - if (nHeight < 0) - nHeight = 0; + if (MaxSize.x < Size.cx) + Size.cx = MaxSize.x; + if (MaxSize.y < Size.cy) + Size.cy = MaxSize.y; + if (Size.cx < MinTrack.x ) + Size.cx = MinTrack.x; + if (Size.cy < MinTrack.y ) + Size.cy = MinTrack.y; + if (Size.cx < 0) + Size.cx = 0; + if (Size.cy < 0) + Size.cy = 0; } Window->WindowRect.left = Pos.x; @@ -1744,7 +1744,7 @@ Cs.y = Pos.y; DPRINT("[win32k.window] IntCreateWindowEx style %d, exstyle %d, parent %d\n", Cs.style, Cs.dwExStyle, Cs.hwndParent); - DPRINT("IntCreateWindowEx(): (%d,%d-%d,%d)\n", x, y, nWidth, nHeight); + DPRINT("IntCreateWindowEx(): (%d,%d-%d,%d)\n", x, y, Size.cx, Size.cy); DPRINT("IntCreateWindowEx(): About to send NCCREATE message.\n"); Result = co_IntSendMessage(Window->hSelf, WM_NCCREATE, 0, (LPARAM) &Cs); if (!Result)

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