- Ros-dev - ReactOS.org

I want to develop the kernel of ReactOS, how do i join????
by Xiaoming Gao 18 May '09

18 May '09

Hi guys: I have read the linux kernel code and part of the leaked winnt source code,and i want to join the developing of ReactOS kernel,how can i join??

16 28

Firefox 3 too slow, i think due to log flooding
by Javier Agustìn Fernàndez Arroyo 16 May '09

16 May '09

hi devs, testing FF3 i have noticed that this app has been slowed down a lot And there is a high difference between running it with kdbg enabled, and running without it Also, log is flooded with the following lines: (subsystems/win32/win32k/objects/gdiobj.c:814) Attempted to lock object 0x0 of wrong type (Handle: 0x0, requested: 0x40000) (subsystems/win32/win32k/objects/gdiobj.c:814) Attempted to lock object 0x0 of wrong type (Handle: 0x0, requested: 0x40000) (subsystems/win32/win32k/objects/region.c:2250) NtGdiCombineRgn requires hSrc2 != NULL for combine mode 1!

2 1

Re: [ros-dev] [ros-diffs] [sedwards] 40919: imported the MTsnapshot of the GPL tftp-server for win32 from sourceforge.Minor changes such as formatting and renaming the files, totally untested except for building, will be used later to serve up Reac
by Merlyn Rees 15 May '09

15 May '09

Surely some things really could be split off into separate projects if people felt the urge without causing any real problems. This very ftp server, for instance, or a replacement shell (as in a new explorer.exe). The kind of projects that require more common application developer skills, rather than reproducing Windows internals. ...alright, so the appropriate shell hooks aren't in place at the moment. Bad example. Hopefully you kind of get what I'm referring to though. On May 15, 2009 7:41 PM, "Imre Leber" <imre.leber(a)telenet.be> wrote: Well that is exactly the reason why linux is broken. Completely useless unless you pay someone to make a distro. Please make that kind of crap a thing of the past! Imre > > > On Fri, May 15, 2009 at 3:03 AM, Peter Millerchip < peter.millerchip(a)gmail.com> wrote: >> >> H... ------------------------------ > > _______________________________________________ > Ros-dev mailing list > Ros-dev(a)reactos.org > ... _______________________________________________ Ros-dev mailing list Ros-dev(a)reactos.org http://www.reactos.org/mailman/listinfo/ros-dev

2 1

Re: [ros-dev] [ros-diffs] [sedwards] 40919: imported the MT snapshot of the GPL tftp-server for win32 from sourceforge. Minor changes such as formatting and renaming the files, totally untested except for building, will be used later to serve up ReactOS images to P
by Ged 14 May '09

14 May '09

Another unix like addition? Do we really need this and the previous telnet server in our source? We're always discussing ways to get the build time down but constantly adding more and more extras. Ged. -----Original Message----- From: ros-diffs-bounces(a)reactos.org [mailto:ros-diffs-bounces@reactos.org] On Behalf Of sedwards(a)svn.reactos.org Sent: 14 May 2009 15:52 To: ros-diffs(a)reactos.org Subject: [ros-diffs] [sedwards] 40919: imported the MT snapshot of the GPL tftp-server for win32 from sourceforge. Minor changes such as formatting and renaming the files, totally untested except for building, will be used later to serve up ReactOS images to PXE b Author: sedwards Date: Thu May 14 18:52:22 2009 New Revision: 40919 URL: http://svn.reactos.org/svn/reactos?rev=40919&view=rev Log: imported the MT snapshot of the GPL tftp-server for win32 from sourceforge. Minor changes such as formatting and renaming the files, totally untested except for building, will be used later to serve up ReactOS images to PXE boot Added: trunk/reactos/base/services/tftpd/ trunk/reactos/base/services/tftpd/README.txt (with props) trunk/reactos/base/services/tftpd/tftpd.cpp (with props) trunk/reactos/base/services/tftpd/tftpd.h (with props) trunk/reactos/base/services/tftpd/tftpd.rbuild (with props) Modified: trunk/reactos/base/services/services.rbuild Modified: trunk/reactos/base/services/services.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/services.rbu… ============================================================================== --- trunk/reactos/base/services/services.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/services/services.rbuild [iso-8859-1] Thu May 14 18:52:22 2009 @@ -25,6 +25,9 @@ <directory name="telnetd"> <xi:include href="telnetd/telnetd.rbuild" /> </directory> + <directory name="tftpd"> + <xi:include href="tftpd/tftpd.rbuild" /> + </directory> <directory name="umpnpmgr"> <xi:include href="umpnpmgr/umpnpmgr.rbuild" /> </directory> Added: trunk/reactos/base/services/tftpd/README.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/tftpd/README… ============================================================================== --- trunk/reactos/base/services/tftpd/README.txt (added) +++ trunk/reactos/base/services/tftpd/README.txt [iso-8859-1] Thu May 14 18:52:22 2009 @@ -1,0 +1,3 @@ +This is a snapshot from the 1.6 release of tftp-server for win32 from sourceforge. + +http://tftp-server.sourceforge.net Propchange: trunk/reactos/base/services/tftpd/README.txt ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/services/tftpd/README.txt ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: trunk/reactos/base/services/tftpd/tftpd.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/tftpd/tftpd.… ============================================================================== --- trunk/reactos/base/services/tftpd/tftpd.cpp (added) +++ trunk/reactos/base/services/tftpd/tftpd.cpp [iso-8859-1] Thu May 14 18:52:22 2009 @@ -1,0 +1,2245 @@ +/************************************************************************** +* Copyright (C) 2005 by Achal Dhir * +* achaldhir(a)gmail.com * +* * +* 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., * +* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * +***************************************************************************/ +// TFTPServer.cpp + +#include <stdio.h> +#include <winsock2.h> +#include <process.h> +#include <time.h> +#include <tchar.h> +#include <ws2tcpip.h> +#include <limits.h> +#include <iphlpapi.h> +#include "tftpd.h" + +//Global Variables +char serviceName[] = "TFTPServer"; +char displayName[] = "TFTP Server Multithreaded"; +char sVersion[] = "TFTP Server MultiThreaded Version 1.61 Windows Built 1611"; +char iniFile[_MAX_PATH]; +char logFile[_MAX_PATH]; +char tempbuff[256]; +char logBuff[512]; +char fileSep = '\\'; +char notFileSep = '/'; +WORD blksize = 65464; +char verbatim = 0; +WORD timeout = 3; +data2 cfig; +//ThreadPool Variables +HANDLE tEvent; +HANDLE cEvent; +HANDLE sEvent; +HANDLE lEvent; +BYTE currentServer = UCHAR_MAX; +WORD totalThreads=0; +WORD minThreads=1; +WORD activeThreads=0; + +//Service Variables +SERVICE_STATUS serviceStatus; +SERVICE_STATUS_HANDLE serviceStatusHandle = 0; +HANDLE stopServiceEvent = 0; + +void WINAPI ServiceControlHandler(DWORD controlCode) +{ + switch (controlCode) + { + case SERVICE_CONTROL_INTERROGATE: + break; + + case SERVICE_CONTROL_SHUTDOWN: + case SERVICE_CONTROL_STOP: + serviceStatus.dwCurrentState = SERVICE_STOP_PENDING; + SetServiceStatus(serviceStatusHandle, &serviceStatus); + + SetEvent(stopServiceEvent); + return ; + + case SERVICE_CONTROL_PAUSE: + break; + + case SERVICE_CONTROL_CONTINUE: + break; + + default: + if (controlCode >= 128 && controlCode <= 255) + break; + else + break; + } + + SetServiceStatus(serviceStatusHandle, &serviceStatus); +} + +void WINAPI ServiceMain(DWORD /*argc*/, TCHAR* /*argv*/[]) +{ + serviceStatus.dwServiceType = SERVICE_WIN32; + serviceStatus.dwCurrentState = SERVICE_STOPPED; + serviceStatus.dwControlsAccepted = 0; + serviceStatus.dwWin32ExitCode = NO_ERROR; + serviceStatus.dwServiceSpecificExitCode = NO_ERROR; + serviceStatus.dwCheckPoint = 0; + serviceStatus.dwWaitHint = 0; + + serviceStatusHandle = RegisterServiceCtrlHandler(serviceName, ServiceControlHandler); + + if (serviceStatusHandle) + { + serviceStatus.dwCurrentState = SERVICE_START_PENDING; + SetServiceStatus(serviceStatusHandle, &serviceStatus); + + //init + verbatim = false; + init(); + fd_set readfds; + timeval tv; + int fdsReady = 0; + tv.tv_sec = 20; + tv.tv_usec = 0; + + stopServiceEvent = CreateEvent(0, FALSE, FALSE, 0); + + serviceStatus.dwControlsAccepted |= (SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN); + serviceStatus.dwCurrentState = SERVICE_RUNNING; + SetServiceStatus(serviceStatusHandle, &serviceStatus); + + do + { + FD_ZERO(&readfds); + + for (int i = 0; i < MAX_SERVERS && cfig.tftpConn[i].port; i++) + FD_SET(cfig.tftpConn[i].sock, &readfds); + + int fdsReady = select(cfig.maxFD, &readfds, NULL, NULL, &tv); + + for (int i = 0; fdsReady > 0 && i < MAX_SERVERS && cfig.tftpConn[i].port; i++) + { + if (FD_ISSET(cfig.tftpConn[i].sock, &readfds)) + { + WaitForSingleObject(sEvent, INFINITE); + + currentServer = i; + + if (!totalThreads || activeThreads >= totalThreads) + { + _beginthread( + processRequest, // thread function + 0, // default security attributes + NULL); // argument to thread function + + } + + SetEvent(tEvent); + WaitForSingleObject(sEvent, INFINITE); + fdsReady--; + SetEvent(sEvent); + } + } + } + while (WaitForSingleObject(stopServiceEvent, 0) == WAIT_TIMEOUT); + + if (cfig.logfile) + fclose(cfig.logfile); + + serviceStatus.dwCurrentState = SERVICE_STOP_PENDING; + SetServiceStatus(serviceStatusHandle, &serviceStatus); + + sprintf(logBuff, "Closing Network Connections..."); + logMess(logBuff, 1); + + for (int i = 0; i < MAX_SERVERS && cfig.tftpConn[i].port; i++) + closesocket(cfig.tftpConn[i].sock); + + WSACleanup(); + + sprintf(logBuff, "TFTP Server Stopped !"); + logMess(logBuff, 1); + + serviceStatus.dwControlsAccepted &= ~(SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN); + serviceStatus.dwCurrentState = SERVICE_STOPPED; + SetServiceStatus(serviceStatusHandle, &serviceStatus); + CloseHandle(stopServiceEvent); + stopServiceEvent = 0; + } +} + +void runService() +{ + SERVICE_TABLE_ENTRY serviceTable[] = + { + {serviceName, ServiceMain}, + {0, 0} + }; + + StartServiceCtrlDispatcher(serviceTable); +} + +bool stopService(SC_HANDLE service) +{ + if (service) + { + SERVICE_STATUS serviceStatus; + QueryServiceStatus(service, &serviceStatus); + if (serviceStatus.dwCurrentState != SERVICE_STOPPED) + { + ControlService(service, SERVICE_CONTROL_STOP, &serviceStatus); + printf("Stopping Service."); + for (int i = 0; i < 100; i++) + { + QueryServiceStatus(service, &serviceStatus); + if (serviceStatus.dwCurrentState == SERVICE_STOPPED) + { + printf("Stopped\n"); + return true; + } + else + { + Sleep(500); + printf("."); + } + } + printf("Failed\n"); + return false; + } + } + return true; +} + +void installService() +{ + SC_HANDLE serviceControlManager = OpenSCManager(0, 0, SC_MANAGER_CREATE_SERVICE); + + if (serviceControlManager) + { + SC_HANDLE service = OpenService(serviceControlManager, + serviceName, SERVICE_QUERY_STATUS); + if (service) + { + printf("Service Already Exists..\n"); + StartService(service,0,NULL); + CloseServiceHandle(service); + } + else + { + TCHAR path[ _MAX_PATH + 1 ]; + if (GetModuleFileName(0, path, sizeof(path) / sizeof(path[0])) > 0) + { + SC_HANDLE service = CreateService(serviceControlManager, + serviceName, displayName, + SERVICE_ALL_ACCESS, SERVICE_WIN32_OWN_PROCESS, + SERVICE_AUTO_START, SERVICE_ERROR_IGNORE, path, + 0, 0, 0, 0, 0); + if (service) + { + printf("Successfully installed.. !\n"); + StartService(service,0,NULL); + CloseServiceHandle(service); + } + else + printf("Installation Failed..\n"); + } + } + CloseServiceHandle(serviceControlManager); + } + else + printWindowsError(); +} + +void uninstallService() +{ + SC_HANDLE serviceControlManager = OpenSCManager(0, 0, SC_MANAGER_CONNECT); + + if (serviceControlManager) + { + SC_HANDLE service = OpenService(serviceControlManager, + serviceName, SERVICE_QUERY_STATUS | SERVICE_STOP | DELETE); + if (service) + { + if (stopService(service)) + { + DeleteService(service); + printf("Successfully Removed !\n"); + } + else + printf("Failed to Stop Service..\n"); + + CloseServiceHandle(service); + } + + CloseServiceHandle(serviceControlManager); + } + else + printWindowsError(); +} + +void printWindowsError() +{ + DWORD dw = GetLastError(); + + if (dw) + { + LPVOID lpMsgBuf; + LPVOID lpDisplayBuf; + + FormatMessage( + FORMAT_MESSAGE_ALLOCATE_BUFFER | + FORMAT_MESSAGE_FROM_SYSTEM | + FORMAT_MESSAGE_IGNORE_INSERTS, + NULL, + dw, + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + (LPTSTR) &lpMsgBuf, + 0, NULL ); + + printf("Error: %s\nPress Enter..\n", lpMsgBuf); + getchar(); + } +} + +int main(int argc, TCHAR* argv[]) +{ + OSVERSIONINFO osvi; + osvi.dwOSVersionInfoSize = sizeof(osvi); + bool result = GetVersionEx(&osvi); + + if (result && osvi.dwPlatformId >= VER_PLATFORM_WIN32_NT) + { + if (argc > 1 && lstrcmpi(argv[1], TEXT("-i")) == 0) + installService(); + else if (argc > 1 && lstrcmpi(argv[1], TEXT("-u")) == 0) + uninstallService(); + else if (argc > 1 && lstrcmpi(argv[1], TEXT("-v")) == 0) + { + SC_HANDLE serviceControlManager = OpenSCManager(0, 0, SC_MANAGER_CONNECT); + bool serviceStopped = true; + + if (serviceControlManager) + { + SC_HANDLE service = OpenService(serviceControlManager, + serviceName, SERVICE_QUERY_STATUS | SERVICE_STOP); + if (service) + { + serviceStopped = stopService(service); + CloseServiceHandle(service); + } + CloseServiceHandle(serviceControlManager); + } + else + printWindowsError(); + + if (serviceStopped) + runProg(); + else + printf("Failed to Stop Service\n"); + } + else + runService(); + } + else if (argc == 1 || lstrcmpi(argv[1], TEXT("-v")) == 0) + runProg(); + else + printf("This option is not available on Windows95/98/ME\n"); + + return 0; +} + +void runProg() +{ + verbatim = true; + init(); + fd_set readfds; + timeval tv; + int fdsReady = 0; + tv.tv_sec = 20; + tv.tv_usec = 0; + + printf("\naccepting requests..\n"); + + do + { + //printf("Active=%u Total=%u\n",activeThreads, totalThreads); + + FD_ZERO(&readfds); + + for (int i = 0; i < MAX_SERVERS && cfig.tftpConn[i].port; i++) + FD_SET(cfig.tftpConn[i].sock, &readfds); + + fdsReady = select(cfig.maxFD, &readfds, NULL, NULL, &tv); + + //if (errno) + // printf("%s\n", strerror(errno)); + + for (int i = 0; fdsReady > 0 && i < MAX_SERVERS && cfig.tftpConn[i].port; i++) + { + if (FD_ISSET(cfig.tftpConn[i].sock, &readfds)) + { + //printf("Request Waiting\n"); + + WaitForSingleObject(sEvent, INFINITE); + + currentServer = i; + + if (!totalThreads || activeThreads >= totalThreads) + { + _beginthread( + processRequest, // thread function + 0, // default security attributes + NULL); // argument to thread function + } + SetEvent(tEvent); + + //printf("thread signalled=%u\n",SetEvent(tEvent)); + + WaitForSingleObject(sEvent, INFINITE); + fdsReady--; + SetEvent(sEvent); + } + } + } + while (true); + + for (int i = 0; i < MAX_SERVERS && cfig.tftpConn[i].port; i++) + closesocket(cfig.tftpConn[i].sock); + + WSACleanup(); +} + +void processRequest(void *lpParam) +{ + //printf("New Thread %u\n",GetCurrentThreadId()); + + request req; + + WaitForSingleObject(cEvent, INFINITE); + totalThreads++; + SetEvent(cEvent); + + do + { + WaitForSingleObject(tEvent, INFINITE); + //printf("In Thread %u\n",GetCurrentThreadId()); + + WaitForSingleObject(cEvent, INFINITE); + activeThreads++; + SetEvent(cEvent); + + if (currentServer >= MAX_SERVERS || !cfig.tftpConn[currentServer].port) + { + SetEvent(sEvent); + req.attempt = UCHAR_MAX; + continue; + } + + memset(&req, 0, sizeof(request)); + req.sock = INVALID_SOCKET; + + req.clientsize = sizeof(req.client); + req.sockInd = currentServer; + currentServer = UCHAR_MAX; + req.knock = cfig.tftpConn[req.sockInd].sock; + + if (req.knock == INVALID_SOCKET) + { + SetEvent(sEvent); + req.attempt = UCHAR_MAX; + continue; + } + + errno = 0; + req.bytesRecd = recvfrom(req.knock, (char*)&req.mesin, sizeof(message), 0, (sockaddr*)&req.client, &req.clientsize); + errno = WSAGetLastError(); + + //printf("socket Signalled=%u\n",SetEvent(sEvent)); + SetEvent(sEvent); + + if (!errno && req.bytesRecd > 0) + { + if (cfig.hostRanges[0].rangeStart) + { + DWORD iip = ntohl(req.client.sin_addr.s_addr); + bool allowed = false; + + for (int j = 0; j <= 32 && cfig.hostRanges[j].rangeStart; j++) + { + if (iip >= cfig.hostRanges[j].rangeStart && iip <= cfig.hostRanges[j].rangeEnd) + { + allowed = true; + break; + } + } + + if (!allowed) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(2); + strcpy(req.serverError.errormessage, "Access Denied"); + logMess(&req, 1); + sendto(req.knock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0, (sockaddr*)&req.client, req.clientsize); + req.attempt = UCHAR_MAX; + continue; + } + } + + if ((htons(req.mesin.opcode) == 5)) + { + sprintf(req.serverError.errormessage, "Error Code %i at Client, %s", ntohs(req.clientError.errorcode), req.clientError.errormessage); + logMess(&req, 2); + req.attempt = UCHAR_MAX; + continue; + } + else if (htons(req.mesin.opcode) != 1 && htons(req.mesin.opcode) != 2) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(5); + sprintf(req.serverError.errormessage, "Unknown Transfer Id"); + logMess(&req, 2); + sendto(req.knock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0, (sockaddr*)&req.client, req.clientsize); + req.attempt = UCHAR_MAX; + continue; + } + } + else + { + sprintf(req.serverError.errormessage, "Communication Error"); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + continue; + } + + req.blksize = 512; + req.timeout = timeout; + req.expiry = time(NULL) + req.timeout; + bool fetchAck = false; + + req.sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP); + + if (req.sock == INVALID_SOCKET) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(0); + strcpy(req.serverError.errormessage, "Thread Socket Creation Error"); + sendto(req.knock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0, (sockaddr*)&req.client, req.clientsize); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + continue; + } + + sockaddr_in service; + service.sin_family = AF_INET; + service.sin_addr.s_addr = cfig.tftpConn[req.sockInd].server; + + if (cfig.minport) + { + for (WORD comport = cfig.minport; ; comport++) + { + service.sin_port = htons(comport); + + if (comport > cfig.maxport) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(0); + strcpy(req.serverError.errormessage, "No port is free"); + sendto(req.knock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0, (sockaddr*)&req.client, req.clientsize); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + break; + } + else if (bind(req.sock, (sockaddr*) &service, sizeof(service)) == -1) + continue; + else + break; + } + } + else + { + service.sin_port = 0; + + if (bind(req.sock, (sockaddr*) &service, sizeof(service)) == -1) + { + strcpy(req.serverError.errormessage, "Thread failed to bind"); + sendto(req.knock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0, (sockaddr*)&req.client, req.clientsize); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + } + } + + if (req.attempt >= 3) + continue; + + if (connect(req.sock, (sockaddr*)&req.client, req.clientsize) == -1) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(0); + strcpy(req.serverError.errormessage, "Connect Failed"); + sendto(req.knock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0, (sockaddr*)&req.client, req.clientsize); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + continue; + } + + //sprintf(req.serverError.errormessage, "In Temp, Socket"); + //logMess(&req, 1); + + char *inPtr = req.mesin.buffer; + *(inPtr + (req.bytesRecd - 3)) = 0; + req.filename = inPtr; + + if (!strlen(req.filename) || strlen(req.filename) > UCHAR_MAX) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(4); + strcpy(req.serverError.errormessage, "Malformed Request, Invalid/Missing Filename"); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + req.attempt = UCHAR_MAX; + logMess(&req, 1); + continue; + } + + inPtr += strlen(inPtr) + 1; + req.mode = inPtr; + + if (!strlen(req.mode) || strlen(req.mode) > 25) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(4); + strcpy(req.serverError.errormessage, "Malformed Request, Invalid/Missing Mode"); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + req.attempt = UCHAR_MAX; + logMess(&req, 1); + continue; + } + + inPtr += strlen(inPtr) + 1; + + for (DWORD i = 0; i < strlen(req.filename); i++) + if (req.filename[i] == notFileSep) + req.filename[i] = fileSep; + + tempbuff[0] = '.'; + tempbuff[1] = '.'; + tempbuff[2] = fileSep; + tempbuff[3] = 0; + + if (strstr(req.filename, tempbuff)) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(2); + strcpy(req.serverError.errormessage, "Access violation"); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + continue; + } + + if (req.filename[0] == fileSep) + req.filename++; + + if (!cfig.homes[0].alias[0]) + { + if (strlen(cfig.homes[0].target) + strlen(req.filename) >= sizeof(req.path)) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(4); + sprintf(req.serverError.errormessage, "Filename too large"); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + continue; + } + + strcpy(req.path, cfig.homes[0].target); + strcat(req.path, req.filename); + } + else + { + char *bname = strchr(req.filename, fileSep); + + if (bname) + { + *bname = 0; + bname++; + } + else + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(2); + sprintf(req.serverError.errormessage, "Missing directory/alias"); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + continue; + } + + for (int i = 0; i < 8; i++) + { + //printf("%s=%i\n", req.filename, cfig.homes[i].alias[0]); + if (cfig.homes[i].alias[0] && !strcasecmp(req.filename, cfig.homes[i].alias)) + { + if (strlen(cfig.homes[i].target) + strlen(bname) >= sizeof(req.path)) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(4); + sprintf(req.serverError.errormessage, "Filename too large"); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + break; + } + + strcpy(req.path, cfig.homes[i].target); + strcat(req.path, bname); + break; + } + else if (i == 7 || !cfig.homes[i].alias[0]) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(2); + sprintf(req.serverError.errormessage, "No such directory/alias %s", req.filename); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + break; + } + } + } + + if (req.attempt >= 3) + continue; + + if (ntohs(req.mesin.opcode) == 1) + { + if (!cfig.fileRead) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(2); + strcpy(req.serverError.errormessage, "GET Access Denied"); + logMess(&req, 1); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + req.attempt = UCHAR_MAX; + continue; + } + + if (*inPtr) + { + char *tmp = inPtr; + + while (*tmp) + { + if (!strcasecmp(tmp, "blksize")) + { + tmp += strlen(tmp) + 1; + DWORD val = atol(tmp); + + if (val < 512) + val = 512; + else if (val > blksize) + val = blksize; + + req.blksize = val; + break; + } + + tmp += strlen(tmp) + 1; + } + } + + errno = 0; + + if (!strcasecmp(req.mode, "netascii") || !strcasecmp(req.mode, "ascii")) + req.file = fopen(req.path, "rt"); + else + req.file = fopen(req.path, "rb"); + + if (errno || !req.file) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(1); + strcpy(req.serverError.errormessage, "File not found or No Access"); + logMess(&req, 1); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + req.attempt = UCHAR_MAX; + continue; + } + + setvbuf(req.file, NULL, _IOFBF, req.blksize); + } + else + { + if (!cfig.fileWrite && !cfig.fileOverwrite) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(2); + strcpy(req.serverError.errormessage, "PUT Access Denied"); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + continue; + } + + req.file = fopen(req.path, "rb"); + + if (req.file) + { + fclose(req.file); + req.file = NULL; + + if (!cfig.fileOverwrite) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(6); + strcpy(req.serverError.errormessage, "File already exists"); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + continue; + } + } + else if (!cfig.fileWrite) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(2); + strcpy(req.serverError.errormessage, "Create File Access Denied"); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + continue; + } + + errno = 0; + + if (!strcasecmp(req.mode, "netascii") || !strcasecmp(req.mode, "ascii")) + req.file = fopen(req.path, "wt"); + else + req.file = fopen(req.path, "wb"); + + if (errno || !req.file) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(2); + strcpy(req.serverError.errormessage, "Invalid Path or No Access"); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + continue; + } + } + + if (*inPtr) + { + fetchAck = true; + char *outPtr = req.mesout.buffer; + req.mesout.opcode = htons(6); + DWORD val; + while (*inPtr) + { + //printf("%s\n", inPtr); + if (!strcasecmp(inPtr, "blksize")) + { + strcpy(outPtr, inPtr); + outPtr += strlen(outPtr) + 1; + inPtr += strlen(inPtr) + 1; + val = atol(inPtr); + + if (val < 512) + val = 512; + else if (val > blksize) + val = blksize; + + req.blksize = val; + sprintf(outPtr, "%u", val); + outPtr += strlen(outPtr) + 1; + } + else if (!strcasecmp(inPtr, "tsize")) + { + strcpy(outPtr, inPtr); + outPtr += strlen(outPtr) + 1; + inPtr += strlen(inPtr) + 1; + + if (ntohs(req.mesin.opcode) == 1) + { + if (!fseek(req.file, 0, SEEK_END)) + { + if (ftell(req.file) >= 0) + { + req.tsize = ftell(req.file); + sprintf(outPtr, "%u", req.tsize); + outPtr += strlen(outPtr) + 1; + } + else + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(2); + strcpy(req.serverError.errormessage, "Invalid Path or No Access"); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + break; + } + } + else + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(2); + strcpy(req.serverError.errormessage, "Invalid Path or No Access"); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + break; + } + } + else + { + req.tsize = 0; + sprintf(outPtr, "%u", req.tsize); + outPtr += strlen(outPtr) + 1; + } + } + else if (!strcasecmp(inPtr, "timeout")) + { + strcpy(outPtr, inPtr); + outPtr += strlen(outPtr) + 1; + inPtr += strlen(inPtr) + 1; + val = atoi(inPtr); + + if (val < 1) + val = 1; + else if (val > UCHAR_MAX) + val = UCHAR_MAX; + + req.timeout = val; + req.expiry = time(NULL) + req.timeout; + sprintf(outPtr, "%u", val); + outPtr += strlen(outPtr) + 1; + } + + inPtr += strlen(inPtr) + 1; + //printf("=%u\n", val); + } + + if (req.attempt >= 3) + continue; + + errno = 0; + req.bytesReady = (DWORD)outPtr - (DWORD)&req.mesout; + //printf("Bytes Ready=%u\n", req.bytesReady); + send(req.sock, (const char*)&req.mesout, req.bytesReady, 0); + errno = WSAGetLastError(); + } + else if (htons(req.mesin.opcode) == 2) + { + req.acout.opcode = htons(4); + req.acout.block = htons(0); + errno = 0; + req.bytesReady = 4; + send(req.sock, (const char*)&req.mesout, req.bytesReady, 0); + errno = WSAGetLastError(); + } + + if (errno) + { + sprintf(req.serverError.errormessage, "Communication Error"); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + continue; + } + else if (ntohs(req.mesin.opcode) == 1) + { + errno = 0; + req.pkt[0] = (packet*)calloc(1, req.blksize + 4); + req.pkt[1] = (packet*)calloc(1, req.blksize + 4); + + if (errno || !req.pkt[0] || !req.pkt[1]) + { + sprintf(req.serverError.errormessage, "Memory Error"); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + continue; + } + + long ftellLoc = ftell(req.file); + + if (ftellLoc > 0) + { + if (fseek(req.file, 0, SEEK_SET)) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(2); + strcpy(req.serverError.errormessage, "File Access Error"); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + continue; + } + } + else if (ftellLoc < 0) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(2); + strcpy(req.serverError.errormessage, "File Access Error"); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + continue; + } + + errno = 0; + req.pkt[0]->opcode = htons(3); + req.pkt[0]->block = htons(1); + req.bytesRead[0] = fread(&req.pkt[0]->buffer, 1, req.blksize, req.file); + + if (errno) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(2); + strcpy(req.serverError.errormessage, "Invalid Path or No Access"); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + continue; + } + + if (req.bytesRead[0] == req.blksize) + { + req.pkt[1]->opcode = htons(3); + req.pkt[1]->block = htons(2); + req.bytesRead[1] = fread(&req.pkt[1]->buffer, 1, req.blksize, req.file); + if (req.bytesRead[1] < req.blksize) + { + fclose(req.file); + req.file = 0; + } + } + else + { + fclose(req.file); + req.file = 0; + } + + if (errno) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(2); + strcpy(req.serverError.errormessage, "Invalid Path or No Access"); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + continue; + } + + while (req.attempt <= 3) + { + if (fetchAck) + { + FD_ZERO(&req.readfds); + req.tv.tv_sec = 1; + req.tv.tv_usec = 0; + FD_SET(req.sock, &req.readfds); + select(req.sock + 1, &req.readfds, NULL, NULL, &req.tv); + + if (FD_ISSET(req.sock, &req.readfds)) + { + errno = 0; + req.bytesRecd = recv(req.sock, (char*)&req.mesin, sizeof(message), 0); + errno = WSAGetLastError(); + if (req.bytesRecd <= 0 || errno) + { + sprintf(req.serverError.errormessage, "Communication Error"); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + break; + } + else if(req.bytesRecd >= 4 && ntohs(req.mesin.opcode) == 4) + { + if (ntohs(req.acin.block) == req.block) + { + req.block++; + req.fblock++; + req.attempt = 0; + } + else if (req.expiry > time(NULL)) + continue; + else + req.attempt++; + } + else if (ntohs(req.mesin.opcode) == 5) + { + sprintf(req.serverError.errormessage, "Client %s:%u, Error Code %i at Client, %s", inet_ntoa(req.client.sin_addr), ntohs(req.client.sin_port), ntohs(req.clientError.errorcode), req.clientError.errormessage); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + break; + } + else + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(4); + sprintf(req.serverError.errormessage, "Unexpected Option Code %i", ntohs(req.mesin.opcode)); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + break; + } + } + else if (req.expiry > time(NULL)) + continue; + else + req.attempt++; + } + else + { + fetchAck = true; + req.acin.block = 1; + req.block = 1; + req.fblock = 1; + } + + if (req.attempt >= 3) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(0); + + if (req.fblock && !req.block) + strcpy(req.serverError.errormessage, "Large File, Block# Rollover not supported by Client"); + else + strcpy(req.serverError.errormessage, "Timeout"); + + logMess(&req, 1); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + req.attempt = UCHAR_MAX; + break; + } + else if (!req.fblock) + { + errno = 0; + send(req.sock, (const char*)&req.mesout, req.bytesReady, 0); + errno = WSAGetLastError(); + if (errno) + { + sprintf(req.serverError.errormessage, "Communication Error"); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + break; + } + req.expiry = time(NULL) + req.timeout; + } + else if (ntohs(req.pkt[0]->block) == req.block) + { + errno = 0; + send(req.sock, (const char*)req.pkt[0], req.bytesRead[0] + 4, 0); + errno = WSAGetLastError(); + if (errno) + { + sprintf(req.serverError.errormessage, "Communication Error"); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + break; + } + req.expiry = time(NULL) + req.timeout; + + if (req.file) + { + req.tblock = ntohs(req.pkt[1]->block) + 1; + if (req.tblock == req.block) + { + req.pkt[1]->block = htons(++req.tblock); + req.bytesRead[1] = fread(&req.pkt[1]->buffer, 1, req.blksize, req.file); + + if (errno) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(4); + sprintf(req.serverError.errormessage, strerror(errno)); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + break; + } + else if (req.bytesRead[1] < req.blksize) + { + fclose(req.file); + req.file = 0; + } + } + } + } + else if (ntohs(req.pkt[1]->block) == req.block) + { + errno = 0; + send(req.sock, (const char*)req.pkt[1], req.bytesRead[1] + 4, 0); + errno = WSAGetLastError(); + if (errno) + { + sprintf(req.serverError.errormessage, "Communication Error"); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + break; + } + + req.expiry = time(NULL) + req.timeout; + + if (req.file) + { + req.tblock = ntohs(req.pkt[0]->block) + 1; + if (req.tblock == req.block) + { + req.pkt[0]->block = htons(++req.tblock); + req.bytesRead[0] = fread(&req.pkt[0]->buffer, 1, req.blksize, req.file); + if (errno) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(4); + sprintf(req.serverError.errormessage, strerror(errno)); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + break; + } + else if (req.bytesRead[0] < req.blksize) + { + fclose(req.file); + req.file = 0; + } + } + } + } + else + { + sprintf(req.serverError.errormessage, "%u Blocks Served", req.fblock - 1); + logMess(&req, 2); + req.attempt = UCHAR_MAX; + break; + } + } + } + else if (ntohs(req.mesin.opcode) == 2) + { + errno = 0; + req.pkt[0] = (packet*)calloc(1, req.blksize + 4); + + if (errno || !req.pkt[0]) + { + sprintf(req.serverError.errormessage, "Memory Error"); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + continue; + } + + while (req.attempt <= 3) + { + FD_ZERO(&req.readfds); + req.tv.tv_sec = 1; + req.tv.tv_usec = 0; + FD_SET(req.sock, &req.readfds); + select(req.sock + 1, &req.readfds, NULL, NULL, &req.tv); + + if (FD_ISSET(req.sock, &req.readfds)) + { + errno = 0; + req.bytesRecd = recv(req.sock, (char*)req.pkt[0], req.blksize + 4, 0); + errno = WSAGetLastError(); + + if (errno) + { + sprintf(req.serverError.errormessage, "Communication Error"); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + break; + } + } + else + req.bytesRecd = 0; + + if (req.bytesRecd >= 4) + { + if (ntohs(req.pkt[0]->opcode) == 3) + { + req.tblock = req.block + 1; + + if (ntohs(req.pkt[0]->block) == req.tblock) + { + req.acout.opcode = htons(4); + req.acout.block = req.pkt[0]->block; + req.block++; + req.fblock++; + req.bytesReady = 4; + req.expiry = time(NULL) + req.timeout; + + errno = 0; + send(req.sock, (const char*)&req.mesout, req.bytesReady, 0); + errno = WSAGetLastError(); + + if (errno) + { + sprintf(req.serverError.errormessage, "Communication Error"); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + break; + } + + if (req.bytesRecd > 4) + { + errno = 0; + if (fwrite(&req.pkt[0]->buffer, req.bytesRecd - 4, 1, req.file) != 1 || errno) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(3); + strcpy(req.serverError.errormessage, "Disk full or allocation exceeded"); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + break; + } + else + req.attempt = 0; + } + else + req.attempt = 0; + + if ((WORD)req.bytesRecd < req.blksize + 4) + { + fclose(req.file); + req.file = 0; + sprintf(req.serverError.errormessage, "%u Blocks Received", req.fblock); + logMess(&req, 2); + req.attempt = UCHAR_MAX; + break; + } + } + else if (req.expiry > time(NULL)) + continue; + else if (req.attempt >= 3) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(0); + + if (req.fblock && !req.block) + strcpy(req.serverError.errormessage, "Large File, Block# Rollover not supported by Client"); + else + strcpy(req.serverError.errormessage, "Timeout"); + + logMess(&req, 1); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + req.attempt = UCHAR_MAX; + break; + } + else + { + req.expiry = time(NULL) + req.timeout; + errno = 0; + send(req.sock, (const char*)&req.mesout, req.bytesReady, 0); + errno = WSAGetLastError(); + req.attempt++; + + if (errno) + { + sprintf(req.serverError.errormessage, "Communication Error"); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + break; + } + } + } + else if (req.bytesRecd > (int)sizeof(message)) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(4); + sprintf(req.serverError.errormessage, "Error: Incoming Packet too large"); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + break; + } + else if (ntohs(req.pkt[0]->opcode) == 5) + { + sprintf(req.serverError.errormessage, "Error Code %i at Client, %s", ntohs(req.pkt[0]->block), &req.pkt[0]->buffer); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + break; + } + else + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(4); + sprintf(req.serverError.errormessage, "Unexpected Option Code %i", ntohs(req.pkt[0]->opcode)); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + break; + } + } + else if (req.expiry > time(NULL)) + continue; + else if (req.attempt >= 3) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(0); + + if (req.fblock && !req.block) + strcpy(req.serverError.errormessage, "Large File, Block# Rollover not supported by Client"); + else + strcpy(req.serverError.errormessage, "Timeout"); + + logMess(&req, 1); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + req.attempt = UCHAR_MAX; + break; + } + else + { + req.expiry = time(NULL) + req.timeout; + errno = 0; + send(req.sock, (const char*)&req.mesout, req.bytesReady, 0); + errno = WSAGetLastError(); + req.attempt++; + + if (errno) + { + sprintf(req.serverError.errormessage, "Communication Error"); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + break; + } + } + } + } + } + while (cleanReq(&req)); + + WaitForSingleObject(cEvent, INFINITE); + totalThreads--; + SetEvent(cEvent); + + //printf("Thread %u Killed\n",GetCurrentThreadId()); + _endthread(); + return; +} + +bool cleanReq(request* req) +{ + //printf("cleaning\n"); + + if (req->file) + fclose(req->file); + + if (!(req->sock == INVALID_SOCKET)) + { + //printf("Here\n"); + closesocket(req->sock); + } + + if (req->pkt[0]) + free(req->pkt[0]); + + if (req->pkt[1]) + free(req->pkt[1]); + + WaitForSingleObject(cEvent, INFINITE); + activeThreads--; + SetEvent(cEvent); + + //printf("cleaned\n"); + + return (totalThreads <= minThreads); +} + +char* myGetToken(char* buff, BYTE index) +{ + while (*buff) + { + if (index) + index--; + else + break; + + buff += strlen(buff) + 1; + } + + return buff; +} + +WORD myTokenize(char *target, char *source, char *sep, bool whiteSep) +{ + bool found = true; + char *dp = target; + WORD kount = 0; + + while (*source) + { + if (sep && sep[0] && strchr(sep, (*source))) + { + found = true; + source++; + continue; + } + else if (whiteSep && *source <= 32) + { + found = true; + source++; + continue; + } + + if (found) + { + if (target != dp) + { + *dp = 0; + dp++; + } + kount++; + } + + found = false; + *dp = *source; + dp++; + source++; + } + + *dp = 0; + dp++; + *dp = 0; + + //printf("%s\n", target); + + return kount; +} + +char* myTrim(char *target, char *source) +{ + while ((*source) && (*source) <= 32) + source++; + + int i = 0; + + for (; i < 511 && source[i]; i++) + target[i] = source[i]; + + target[i] = source[i]; + i--; + + for (; i >= 0 && target[i] <= 32; i--) + target[i] = 0; + + return target; +} + +void mySplit(char *name, char *value, char *source, char splitChar) +{ + int i = 0; + int j = 0; + int k = 0; + + for (; source[i] && j <= 510 && source[i] != splitChar; i++, j++) + { + name[j] = source[i]; + } + + if (source[i]) + { + i++; + for (; k <= 510 && source[i]; i++, k++) + { + value[k] = source[i]; + } + } + + name[j] = 0; + value[k] = 0; + + myTrim(name, name); + myTrim(value, value); + //printf("%s %s\n", name, value); +} + +bool getSection(char *sectionName, char *buffer, BYTE serial, char *fileName) +{ + //printf("%s=%s\n",fileName,sectionName); + char section[128]; + sprintf(section, "[%s]", sectionName); + myUpper(section); + FILE *f = fopen(fileName, "rt"); + char buff[512]; + BYTE found = 0; + + if (f) + { + while (fgets(buff, 511, f)) + { + myUpper(buff); + myTrim(buff, buff); + + if (strstr(buff, section) == buff) + { + found++; + if (found == serial) + { + //printf("%s=%s\n",fileName,sectionName); + while (fgets(buff, 511, f)) + { + myTrim(buff, buff); + + if (strstr(buff, "[") == buff) + break; + + if ((*buff) >= '0' && (*buff) <= '9' || (*buff) >= 'A' && (*buff) <= 'Z' || (*buff) >= 'a' && (*buff) <= 'z' || ((*buff) && strchr("/\\?*", (*buff)))) + { + buffer += sprintf(buffer, "%s", buff); + buffer++; + } + } + break; + } + } + } + fclose(f); + } + + *buffer = 0; + *(buffer + 1) = 0; + return (found == serial); +} + +char *IP2String(char *target, DWORD ip) +{ + data15 inaddr; + inaddr.ip = ip; + sprintf(target, "%u.%u.%u.%u", inaddr.octate[0], inaddr.octate[1], inaddr.octate[2], inaddr.octate[3]); + return target; +} + +bool isIP(char *string) +{ + int j = 0; + + for (; *string; string++) + { + if (*string == '.' && *(string + 1) != '.') + j++; + else if (*string < '0' || *string > '9') + return 0; + } + + if (j == 3) + return 1; + else + return 0; +} + +char *myUpper(char *string) +{ + char diff = 'a' - 'A'; + WORD len = strlen(string); + for (int i = 0; i < len; i++) + if (string[i] >= 'a' && string[i] <= 'z') + string[i] -= diff; + return string; +} + +char *myLower(char *string) +{ + char diff = 'a' - 'A'; + WORD len = strlen(string); + for (int i = 0; i < len; i++) + if (string[i] >= 'A' && string[i] <= 'Z') + string[i] += diff; + return string; +} + +void init() +{ + memset(&cfig, 0, sizeof(cfig)); + + GetModuleFileName(NULL, iniFile, MAX_PATH); + char *iniFileExt = strrchr(iniFile, '.'); + strcpy(iniFileExt, ".ini"); + GetModuleFileName(NULL, logFile, MAX_PATH); + iniFileExt = strrchr(logFile, '.'); + strcpy(iniFileExt, ".log"); + + char iniStr[4096]; + char name[256]; + char value[256]; + + if (verbatim) + { + cfig.logLevel = 2; + printf("%s\n\n", sVersion); + } + else if (getSection("LOGGING", iniStr, 1, iniFile)) + { + char *iniStrPtr = myGetToken(iniStr, 0); + + if (!iniStrPtr[0] || !strcasecmp(iniStrPtr, "None")) + cfig.logLevel = 0; + else if (!strcasecmp(iniStrPtr, "Errors")) + cfig.logLevel = 1; + else if (!strcasecmp(iniStrPtr, "All")) + cfig.logLevel = 2; + else if (!strcasecmp(iniStrPtr, "Debug")) + cfig.logLevel = 3; + else + cfig.logLevel = UCHAR_MAX; + } + + if (!verbatim && cfig.logLevel) + { + cfig.logfile = fopen(logFile, "wt"); + + if (cfig.logfile) + { + fclose(cfig.logfile); + cfig.logfile = fopen(logFile, "at"); + fprintf(cfig.logfile, "%s\n", sVersion); + } + } + + if (cfig.logLevel == UCHAR_MAX) + { + cfig.logLevel = 1; + sprintf(logBuff, "Section [LOGGING], Invalid Logging Level: %s, ignored", myGetToken(iniStr, 0)); + logMess(logBuff, 1); + } + + WORD wVersionRequested = MAKEWORD(1, 1); + WSAStartup(wVersionRequested, &cfig.wsaData); + + if (cfig.wsaData.wVersion != wVersionRequested) + { + sprintf(logBuff, "WSAStartup Error"); + logMess(logBuff, 1); + } + + if (getSection("LISTEN-ON", iniStr, 1, iniFile)) + { + char *iniStrPtr = myGetToken(iniStr, 0); + + for (int i = 0; i < MAX_SERVERS && iniStrPtr[0]; iniStrPtr = myGetToken(iniStrPtr, 1)) + { + strncpy(name, iniStrPtr, UCHAR_MAX); + WORD port = 69; + char *dp = strchr(name, ':'); + if (dp) + { + *dp = 0; + dp++; + port = atoi(dp); + } + + DWORD ip = my_inet_addr(name); + + if (isIP(name) && ip) + { + for (BYTE j = 0; j < MAX_SERVERS; j++) + { + if (cfig.servers[j] == ip) + break; + else if (!cfig.servers[j]) + { + cfig.servers[j] = ip; + cfig.ports[j] = port; + i++; + break; + } + } + } + else + { + sprintf(logBuff, "Warning: Section [LISTEN-ON], Invalid IP Address %s, ignored", iniStrPtr); + logMess(logBuff, 1); + } + } + } + + if (getSection("HOME", iniStr, 1, iniFile)) + { + char *iniStrPtr = myGetToken(iniStr, 0); + for (; iniStrPtr[0]; iniStrPtr = myGetToken(iniStrPtr, 1)) + { + mySplit(name, value, iniStrPtr, '='); + if (strlen(value)) + { + if (!cfig.homes[0].alias[0] && cfig.homes[0].target[0]) + { + sprintf(logBuff, "Section [HOME], alias and bare path mixup, entry %s ignored", iniStrPtr); + logMess(logBuff, 1); + } + else if (strchr(name, notFileSep) || strchr(name, fileSep) || strchr(name, '>') || strchr(name, '<') || strchr(name, '.')) + { + sprintf(logBuff, "Section [HOME], invalid chars in alias %s, entry ignored", name); + logMess(logBuff, 1); + } + else if (name[0] && strlen(name) < 64 && value[0]) + { + for (int i = 0; i < 8; i++) + { + if (cfig.homes[i].alias[0] && !strcasecmp(name, cfig.homes[i].alias)) + { + sprintf(logBuff, "Section [HOME], Duplicate Entry: %s ignored", iniStrPtr); + logMess(logBuff, 1); + break; + } + else if (!cfig.homes[i].alias[0]) + { + strcpy(cfig.homes[i].alias, name); + strcpy(cfig.homes[i].target, value); + + if (cfig.homes[i].target[strlen(cfig.homes[i].target) - 1] != fileSep) + { + tempbuff[0] = fileSep; + tempbuff[1] = 0; + strcat(cfig.homes[i].target, tempbuff); + } + + break; + } + } + } + else + { + sprintf(logBuff, "Section [HOME], alias name too large", name); + logMess(logBuff, 1); + } + } + else if (!cfig.homes[0].alias[0] && !cfig.homes[0].target[0]) + { + strcpy(cfig.homes[0].target, name); + + if (cfig.homes[0].target[strlen(cfig.homes[0].target) - 1] != fileSep) + { + tempbuff[0] = fileSep; + tempbuff[1] = 0; + strcat(cfig.homes[0].target, tempbuff); + } + } + else if (cfig.homes[0].alias[0]) + { + sprintf(logBuff, "Section [HOME], alias and bare path mixup, entry %s ignored", iniStrPtr); + logMess(logBuff, 1); + } + else if (cfig.homes[0].target[0]) + { + sprintf(logBuff, "Section [HOME], Duplicate Path: %s ignored", iniStrPtr); + logMess(logBuff, 1); + } + else + { + sprintf(logBuff, "Section [HOME], missing = sign, Invalid Entry: %s ignored", iniStrPtr); + logMess(logBuff, 1); + } + } + } + + if (!cfig.homes[0].target[0]) + { + GetModuleFileName(NULL, cfig.homes[0].target, UCHAR_MAX); + char *iniFileExt = strrchr(cfig.homes[0].target, fileSep); + *(++iniFileExt) = 0; + } + + cfig.fileRead = true; + + if (getSection("TFTP-OPTIONS", iniStr, 1, iniFile)) + { + char *iniStrPtr = myGetToken(iniStr, 0); + for (;strlen(iniStrPtr);iniStrPtr = myGetToken(iniStrPtr, 1)) + { + mySplit(name, value, iniStrPtr, '='); + if (strlen(value)) + { + if (!strcasecmp(name, "blksize")) + { + DWORD tblksize = atol(value); + + if (tblksize < 512) + blksize = 512; + else if (tblksize > USHRT_MAX - 32) + blksize = USHRT_MAX - 32; + else + blksize = tblksize; + } + else if (!strcasecmp(name, "threadpoolsize")) + { + minThreads = atol(value); + if (minThreads < 1) + minThreads = 0; + else if (minThreads > 100) + minThreads = 100; + } + else if (!strcasecmp(name, "timeout")) + { + timeout = atol(value); + if (timeout < 1) + timeout = 1; + else if (timeout > UCHAR_MAX) + timeout = UCHAR_MAX; + } + else if (!strcasecmp(name, "Read")) + { + if (strchr("Yy", *value)) + cfig.fileRead = true; + else + cfig.fileRead = false; + } + else if (!strcasecmp(name, "Write")) + { + if (strchr("Yy", *value)) + cfig.fileWrite = true; + else + cfig.fileWrite = false; + } + else if (!strcasecmp(name, "Overwrite")) + { + if (strchr("Yy", *value)) + cfig.fileOverwrite = true; + else + cfig.fileOverwrite = false; + } + else if (!strcasecmp(name, "port-range")) + { + char *ptr = strchr(value, '-'); + if (ptr) + { + *ptr = 0; + cfig.minport = atol(value); + cfig.maxport = atol(++ptr); + + if (cfig.minport < 1024 || cfig.minport >= USHRT_MAX || cfig.maxport < 1024 || cfig.maxport >= USHRT_MAX || cfig.minport > cfig.maxport) + { + cfig.minport = 0; + cfig.maxport = 0; + + sprintf(logBuff, "Invalid port range %s", value); + logMess(logBuff, 1); + } + } + else + { + sprintf(logBuff, "Invalid port range %s", value); + logMess(logBuff, 1); + } + } + else + { + sprintf(logBuff, "Warning: unknown option %s, ignored", name); + logMess(logBuff, 1); + } + } + } + } + + if (getSection("ALLOWED-CLIENTS", iniStr, 1, iniFile)) + { + char *iniStrPtr = myGetToken(iniStr, 0); + for (int i = 0; i < 32 && iniStrPtr[0]; iniStrPtr = myGetToken(iniStrPtr, 1)) + { + DWORD rs = 0; + DWORD re = 0; + mySplit(name, value, iniStrPtr, '-'); + rs = htonl(my_inet_addr(name)); + + if (strlen(value)) + re = htonl(my_inet_addr(value)); + else + re = rs; + + if (rs && rs != INADDR_NONE && re && re != INADDR_NONE && rs <= re) + { + cfig.hostRanges[i].rangeStart = rs; + cfig.hostRanges[i].rangeEnd = re; + i++; + } + else + { + sprintf(logBuff, "Section [ALLOWED-CLIENTS] Invalid entry %s in ini file, ignored", iniStrPtr); + logMess(logBuff, 1); + } + } + } + +// if (!cfig.servers[0]) +// getServ(); + + int i = 0; + + for (int j = 0; j < MAX_SERVERS; j++) + { + if (j && !cfig.servers[j]) + break; + + cfig.tftpConn[i].sock = socket(PF_INET, + SOCK_DGRAM, + IPPROTO_UDP); + + if (cfig.tftpConn[i].sock == INVALID_SOCKET) + { + sprintf(logBuff, "Failed to Create Socket"); + logMess(logBuff, 1); + continue; + } + + cfig.tftpConn[i].addr.sin_family = AF_INET; + + if (!cfig.ports[j]) + cfig.ports[j] = 69; + + cfig.tftpConn[i].addr.sin_addr.s_addr = cfig.servers[j]; + cfig.tftpConn[i].addr.sin_port = htons(cfig.ports[j]); + + socklen_t nRet = bind(cfig.tftpConn[i].sock, + (sockaddr*)&cfig.tftpConn[i].addr, + sizeof(struct sockaddr_in) + ); + + if (nRet == SOCKET_ERROR) + { + closesocket(cfig.tftpConn[i].sock); + sprintf(logBuff, "%s Port %u, bind failed", IP2String(tempbuff, cfig.servers[j]), cfig.ports[j]); + logMess(logBuff, 1); + continue; + } + + if (cfig.maxFD < cfig.tftpConn[i].sock) + cfig.maxFD = cfig.tftpConn[i].sock; + + cfig.tftpConn[i].server = cfig.tftpConn[i].addr.sin_addr.s_addr; + cfig.tftpConn[i].port = htons(cfig.tftpConn[i].addr.sin_port); + i++; + } + + cfig.maxFD++; + + if (!cfig.tftpConn[0].port) + { + sprintf(logBuff, "no listening interfaces available, stopping..\nPress Enter to exit\n"); + logMess(logBuff, 1); + getchar(); + exit(-1); + } + else if (verbatim) + { + printf("starting TFTP...\n"); + } + else + { + sprintf(logBuff, "starting TFTP service"); + logMess(logBuff, 1); + } + + for (int i = 0; i < MAX_SERVERS; i++) + if (cfig.homes[i].target[0]) + { + sprintf(logBuff, "alias /%s is mapped to %s", cfig.homes[i].alias, cfig.homes[i].target); + logMess(logBuff, 1); + } + + if (cfig.hostRanges[0].rangeStart) + { + char temp[128]; + + for (WORD i = 0; i <= sizeof(cfig.hostRanges) && cfig.hostRanges[i].rangeStart; i++) + { + sprintf(logBuff, "%s", "permitted clients: "); + sprintf(temp, "%s-", IP2String(tempbuff, htonl(cfig.hostRanges[i].rangeStart))); + strcat(logBuff, temp); + sprintf(temp, "%s", IP2String(tempbuff, htonl(cfig.hostRanges[i].rangeEnd))); + strcat(logBuff, temp); + logMess(logBuff, 1); + } + } + else + { + sprintf(logBuff, "%s", "permitted clients: all"); + logMess(logBuff, 1); + } + + if (cfig.minport) + { + sprintf(logBuff, "server port range: %u-%u", cfig.minport, cfig.maxport); + logMess(logBuff, 1); + } + else + { + sprintf(logBuff, "server port range: all"); + logMess(logBuff, 1); + } + + sprintf(logBuff, "max blksize: %u", blksize); + logMess(logBuff, 1); + sprintf(logBuff, "default blksize: %u", 512); + logMess(logBuff, 1); + sprintf(logBuff, "default timeout: %u", timeout); + logMess(logBuff, 1); + sprintf(logBuff, "file read allowed: %s", cfig.fileRead ? "Yes" : "No"); + logMess(logBuff, 1); + sprintf(logBuff, "file create allowed: %s", cfig.fileWrite ? "Yes" : "No"); + logMess(logBuff, 1); + sprintf(logBuff, "file overwrite allowed: %s", cfig.fileOverwrite ? "Yes" : "No"); + logMess(logBuff, 1); + + if (!verbatim) + { + sprintf(logBuff, "logging: %s", cfig.logLevel > 1 ? "all" : "errors"); + logMess(logBuff, 1); + } + + lEvent = CreateEvent( + NULL, // default security descriptor + FALSE, // ManualReset + TRUE, // Signalled + TEXT("AchalTFTServerLogEvent")); // object name + + if (lEvent == NULL) + { + printf("CreateEvent error: %d\n", GetLastError()); + exit(-1); + } + else if ( GetLastError() == ERROR_ALREADY_EXISTS ) + { + sprintf(logBuff, "CreateEvent opened an existing Event\nServer May already be Running"); + logMess(logBuff, 0); + exit(-1); + } + + tEvent = CreateEvent( + NULL, // default security descriptor + FALSE, // ManualReset + FALSE, // Signalled + TEXT("AchalTFTServerThreadEvent")); // object name + + if (tEvent == NULL) + { + printf("CreateEvent error: %d\n", GetLastError()); + exit(-1); + } + else if ( GetLastError() == ERROR_ALREADY_EXISTS ) + { + sprintf(logBuff, "CreateEvent opened an existing Event\nServer May already be Running"); + logMess(logBuff, 0); + exit(-1); + } + + sEvent = CreateEvent( + NULL, // default security descriptor + FALSE, // ManualReset + TRUE, // Signalled + TEXT("AchalTFTServerSocketEvent")); // object name + + if (sEvent == NULL) + { + printf("CreateEvent error: %d\n", GetLastError()); + exit(-1); + } + else if ( GetLastError() == ERROR_ALREADY_EXISTS ) + { + sprintf(logBuff, "CreateEvent opened an existing Event\nServer May already be Running"); + logMess(logBuff, 0); + exit(-1); + } + + cEvent = CreateEvent( + NULL, // default security descriptor + FALSE, // ManualReset + TRUE, // Signalled + TEXT("AchalTFTServerCountEvent")); // object name + + if (cEvent == NULL) + { + printf("CreateEvent error: %d\n", GetLastError()); + exit(-1); + } + else if ( GetLastError() == ERROR_ALREADY_EXISTS ) + { + sprintf(logBuff, "CreateEvent opened an existing Event\nServer May already be Running"); + logMess(logBuff, 0); + exit(-1); + } + + if (minThreads) + { + for (int i = 0; i < minThreads; i++) + { + _beginthread( + processRequest, // thread function + 0, // default security attributes + NULL); // argument to thread function + } + + sprintf(logBuff, "thread pool size: %u", minThreads); + logMess(logBuff, 1); + } + + for (int i = 0; i < MAX_SERVERS && cfig.tftpConn[i].port; i++) + { + sprintf(logBuff, "listening on: %s:%i", IP2String(tempbuff, cfig.tftpConn[i].server), cfig.tftpConn[i].port); + logMess(logBuff, 1); + } +} + +void logMess(char *logBuff, BYTE logLevel) +{ + WaitForSingleObject(lEvent, INFINITE); + + char tempbuff[256]; + + if (verbatim) + printf("%s\n", logBuff); + else if (cfig.logfile && logLevel <= cfig.logLevel) + { + char currentTime[32]; + time_t t = time(NULL); + tm *ttm = localtime(&t); + strftime(currentTime, sizeof(currentTime), "%d-%b-%y %X", ttm); + fprintf(cfig.logfile, "[%s] %s\n", currentTime, logBuff); + fflush(cfig.logfile); + } + SetEvent(lEvent); +} + +void logMess(request *req, BYTE logLevel) +{ + WaitForSingleObject(lEvent, INFINITE); + + char tempbuff[256]; + + if (verbatim) + { + if (!req->serverError.errormessage[0]) + sprintf(req->serverError.errormessage, strerror(errno)); + + if (req->path[0]) + printf("Client %s:%u %s, %s\n", IP2String(tempbuff, req->client.sin_addr.s_addr), ntohs(req->client.sin_port), req->path, req->serverError.errormessage); + else + printf("Client %s:%u, %s\n", IP2String(tempbuff, req->client.sin_addr.s_addr), ntohs(req->client.sin_port), req->serverError.errormessage); + } + else if (cfig.logfile && logLevel <= cfig.logLevel) + { + char currentTime[32]; + time_t t = time(NULL); + tm *ttm = localtime(&t); + strftime(currentTime, sizeof(currentTime), "%d-%b-%y %X", ttm); + + if (req->path[0]) + fprintf(cfig.logfile, "[%s] Client %s:%u %s, %s\n", currentTime, IP2String(tempbuff, req->client.sin_addr.s_addr), ntohs(req->client.sin_port), req->path, req->serverError.errormessage); + else + fprintf(cfig.logfile, "[%s] Client %s:%u, %s\n", currentTime, IP2String(tempbuff, req->client.sin_addr.s_addr), ntohs(req->client.sin_port), req->serverError.errormessage); + + fflush(cfig.logfile); + } + SetEvent(lEvent); +} Propchange: trunk/reactos/base/services/tftpd/tftpd.cpp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/services/tftpd/tftpd.cpp ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: trunk/reactos/base/services/tftpd/tftpd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/tftpd/tftpd.… ============================================================================== --- trunk/reactos/base/services/tftpd/tftpd.h (added) +++ trunk/reactos/base/services/tftpd/tftpd.h [iso-8859-1] Thu May 14 18:52:22 2009 @@ -1,0 +1,161 @@ +/************************************************************************** +* Copyright (C) 2005 by Achal Dhir * +* achaldhir(a)gmail.com * +* * +* 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., * +* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * +***************************************************************************/ +// TFTPServer.cpp + +#ifdef _MSC_VER + #define strcasecmp _stricmp + #define _CRT_SECURE_NO_WARNINGS + #pragma comment(lib, "ws2_32.lib") + #pragma comment(lib, "iphlpapi.lib") +#endif + +//Constants +#define my_inet_addr inet_addr +#define MAX_SERVERS 8 + +//Structs +struct home +{ + char alias[64]; + char target[256]; +}; + +struct tftpConnType +{ + SOCKET sock; + sockaddr_in addr; + DWORD server; + WORD port; +}; + +struct acknowledgement +{ + WORD opcode; + WORD block; +}; + +struct message +{ + WORD opcode; + char buffer[514]; +}; + +struct tftperror +{ + WORD opcode; + WORD errorcode; + char errormessage[512]; +}; + +struct packet +{ + WORD opcode; + WORD block; + char buffer; +}; + +struct data12 +{ + DWORD rangeStart; + DWORD rangeEnd; +}; + +struct request +{ + timeval tv; + fd_set readfds; + time_t expiry; + SOCKET sock; + SOCKET knock; + BYTE sockInd; + BYTE attempt; + char path[256]; + FILE *file; + char *filename; + char *mode; + char *alias; + DWORD tsize; + DWORD fblock; + int bytesReady; + int bytesRecd; + int bytesRead[2]; + packet* pkt[2]; + sockaddr_in client; + socklen_t clientsize; + union + { + tftperror serverError; + message mesout; + acknowledgement acout; + }; + union + { + tftperror clientError; + message mesin; + acknowledgement acin; + }; + WORD blksize; + WORD timeout; + WORD block; + WORD tblock; +}; + +struct data2 +{ + WSADATA wsaData; + tftpConnType tftpConn[MAX_SERVERS]; + DWORD servers[MAX_SERVERS]; + WORD ports[MAX_SERVERS]; + home homes[8]; + FILE *logfile; + data12 hostRanges[32]; + char fileRead; + char fileWrite; + char fileOverwrite; + int minport; + int maxport; + SOCKET maxFD; + BYTE logLevel; +}; + +struct data15 +{ + union + { + //DWORD ip; + unsigned ip:32; + BYTE octate[4]; + }; +}; + +//Functions +void runProg(); +void processRequest(LPVOID lpParam); +char* myGetToken(char*, BYTE); +void init(); +bool cleanReq(request*); +bool getSection(char*, char*, BYTE, char*); +bool isIP(char*s); +char* myLower(char*); +char* myUpper(char*); +char* IP2String(char*, DWORD); +void printWindowsError(); +void logMess(request*, BYTE); +void logMess(char*, BYTE); Propchange: trunk/reactos/base/services/tftpd/tftpd.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/services/tftpd/tftpd.h ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: trunk/reactos/base/services/tftpd/tftpd.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/tftpd/tftpd.… ============================================================================== --- trunk/reactos/base/services/tftpd/tftpd.rbuild (added) +++ trunk/reactos/base/services/tftpd/tftpd.rbuild [iso-8859-1] Thu May 14 18:52:22 2009 @@ -1,0 +1,12 @@ +<module name="tftpd" type="win32cui" installbase="system32" installname="tftpd.exe" allowwarnings="true" unicode="no"> + <include base="reactos"></include> + <include base="telnetd">..</include> + + <library>ntdll</library> + <library>kernel32</library> + <library>advapi32</library> + <library>ws2_32</library> + <library>wine</library> + + <file>tftpd.cpp</file> +</module> Propchange: trunk/reactos/base/services/tftpd/tftpd.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/services/tftpd/tftpd.rbuild ------------------------------------------------------------------------------ svn:mime-type = text/plain

2 1

Stubbing Block w TEB
by James Tabor 12 May '09

12 May '09

This should work! It's just writing zero into a place holder in TEB but it throws a exception and kills boot! Index: win32k/ntuser/misc.c =================================================================== --- win32k/ntuser/misc.c (revision 40892) +++ win32k/ntuser/misc.c (working copy) @@ -550,6 +550,7 @@ // ci->pClientThreadInfo = &ti->ClientThreadInfo; // FIXME! ci->pClientThreadInfo = NULL; ci->ppi = ti->ppi; + ci->pDeskInfo = NULL; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) {

5 6

RosBE 1.4.2 available, update highly recommended!
by Colin Finck 10 May '09

10 May '09

Hi everybody, Daniel and I just released the new version 1.4.2 of the ReactOS Build Environment for Windows and Unix. The most important part of this release is the addition of some environment variables containing the include directories of the host and target compilers as compiler flags. These variables might be required by rbuild in the near future, so the update to the new version is highly recommended. Besides, the GCC in RosBE-Windows 1.4.2 is now compiled for i686 or later CPUs, decreasing the compilation time by 5 minutes for Daniel. Hopefully another reason to make the update more attractive ;-) As always, you can get the latest release from https://sourceforge.net/project/showfiles.php?group_id=6553 Best regards, Colin

5 5

Re: [ros-dev] [ros-diffs] [janderwald] 40823: - Use a spinlock with list functions over interlocked list functions - Use a bitmap for storing reference count of the mappings as mapping are complete async and not very likely in determined order
by Alex Ionescu 07 May '09

07 May '09

RtlBitmap? Best regards, Alex Ionescu On Thu, May 7, 2009 at 12:58 AM, <janderwald(a)svn.reactos.org> wrote: > Author: janderwald > Date: Thu May 7 02:58:57 2009 > New Revision: 40823 > > URL: http://svn.reactos.org/svn/reactos?rev=40823&view=rev > Log: > - Use a spinlock with list functions over interlocked list functions > - Use a bitmap for storing reference count of the mappings as mapping are > complete async and not very likely in determined order > > Modified: > trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c > trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.c > > Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… > > ============================================================================== > --- trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c > [iso-8859-1] (original) > +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c > [iso-8859-1] Thu May 7 02:58:57 2009 > @@ -14,6 +14,7 @@ > KSSTREAM_HEADER *Header; > PIRP Irp; > > + ULONG References; > ULONG NumTags; > PVOID * Tag; > }IRP_MAPPING, *PIRP_MAPPING; > @@ -141,6 +142,7 @@ > IN PIRP Irp) > { > PIRP_MAPPING Mapping; > + ULONG Index; > IIrpQueueImpl * This = (IIrpQueueImpl*)iface; > > Mapping = AllocateItem(NonPagedPool, sizeof(IRP_MAPPING), > TAG_PORTCLASS); > @@ -166,7 +168,6 @@ > { > Mapping->NumTags++; > } > - ASSERT(Mapping->NumTags < 32); > } > } > else > @@ -181,12 +182,18 @@ > FreeItem(Mapping, TAG_PORTCLASS); > return STATUS_UNSUCCESSFUL; > } > + ASSERT(Mapping->NumTags < 32); > + for(Index = 0; Index < Mapping->NumTags; Index++); > + Mapping->References |= (1 << Index); > > This->NumDataAvailable += Mapping->Header->DataUsed; > > - DPRINT("IIrpQueue_fnAddMapping NumMappings %u SizeOfMapping %lu > NumDataAvailable %lu Mapping %p NumTags %u FrameSize %u\n", > This->NumMappings, Mapping->Header->DataUsed, This->NumDataAvailable, > Mapping, Mapping->NumTags, This->MaxFrameSize); > - > - ExInterlockedInsertTailList(&This->ListHead, &Mapping->Entry, > &This->Lock); > + DPRINT("IIrpQueue_fnAddMapping NumMappings %u SizeOfMapping %lu > NumDataAvailable %lu Mapping %p NumTags %u References %x FrameSize %u\n", > This->NumMappings, Mapping->Header->DataUsed, This->NumDataAvailable, > Mapping, Mapping->NumTags, Mapping->References, This->MaxFrameSize); > + > + KeAcquireSpinLockAtDpcLevel(&This->Lock); > + InsertTailList(&This->ListHead, &Mapping->Entry); > + KeReleaseSpinLockFromDpcLevel(&This->Lock); > + > (void)InterlockedIncrement((volatile long*)&This->NumMappings); > > if (Irp) > @@ -253,7 +260,10 @@ > { > This->CurrentOffset = 0; > > - (void)ExInterlockedRemoveHeadList(&This->ListHead, &This->Lock); > + KeAcquireSpinLockAtDpcLevel(&This->Lock); > + RemoveHeadList(&This->ListHead); > + KeReleaseSpinLockFromDpcLevel(&This->Lock); > + > InterlockedDecrement(&This->NumMappings); > FreeMappingRoutine(CurMapping); > } > @@ -339,7 +349,7 @@ > > /* calculate the offset */ > if (Index) > - Offset = (Index + 1) * This->MaxFrameSize; > + Offset = Index * This->MaxFrameSize; > else > Offset = 0; > > @@ -416,6 +426,7 @@ > KeReleaseSpinLockFromDpcLevel(&This->Lock); > This->OutOfMapping = TRUE; > This->StartStream = FALSE; > + DPRINT("No Mapping available\n"); > return STATUS_UNSUCCESSFUL; > } > > @@ -425,9 +436,9 @@ > IN IIrpQueue *iface, > IN PVOID Tag) > { > - PIRP_MAPPING CurMapping; > + PIRP_MAPPING CurMapping = NULL; > PLIST_ENTRY CurEntry; > - ULONG Index; > + ULONG Index = 0; > ULONG Found; > IIrpQueueImpl * This = (IIrpQueueImpl*)iface; > > @@ -440,40 +451,48 @@ > return STATUS_UNSUCCESSFUL; > } > > - CurMapping = CONTAINING_RECORD(CurEntry, IRP_MAPPING, Entry); > Found = FALSE; > - > - for(Index = 0; Index < CurMapping->NumTags; Index++) > - { > - if (CurMapping->Tag[Index] == Tag) > + MapIndex = 0; > + while (CurEntry != &This->ListHead) > + { > + CurMapping = CONTAINING_RECORD(CurEntry, IRP_MAPPING, Entry); > + for(Index = 0; Index < CurMapping->NumTags; Index++) > { > - Found = TRUE; > + if (CurMapping->Tag[Index] == Tag) > + { > + Found = TRUE; > + break; > + } > + } > + if (Found) > break; > - } > - } > - KeReleaseSpinLockFromDpcLevel(&This->Lock); > + > + CurEntry = CurEntry->Flink; > + } > > if (!Found) > { > - DPRINT("Tag %p not in first mapping %p\n", Tag, CurMapping); > - return STATUS_UNSUCCESSFUL; > - } > - > - if (Index != CurMapping->NumTags - 1) > + DPRINT1("Tag %p not found\n", Tag); > + ASSERT(Found); > + } > + DPRINT("References %x\n", CurMapping->References); > + CurMapping->References &= ~(1 << Index); > + > + if (CurMapping->References) > { > /* released mapping is not the last mapping of the irp */ > - DPRINT1("IIrpQueue_fnReleaseMappingWithTag Tag %p Index %u NumTags > %u\n", Tag, Index, CurMapping->NumTags); > + DPRINT1("IIrpQueue_fnReleaseMappingWithTag Tag %p Index %u NumTags > %u Refs %x\n", Tag, Index, CurMapping->NumTags, CurMapping->References); > + KeReleaseSpinLockFromDpcLevel(&This->Lock); > return STATUS_SUCCESS; > } > > - CurEntry = ExInterlockedRemoveHeadList(&This->ListHead, &This->Lock); > - ASSERT(CurEntry); > - CurMapping = CONTAINING_RECORD(CurEntry, IRP_MAPPING, Entry); > + RemoveEntryList(&CurMapping->Entry); > > /* last mapping of the irp, free irp */ > DPRINT("Freeing mapping %p\n", CurMapping); > InterlockedDecrement(&This->NumMappings); > FreeMappingRoutine(CurMapping); > + KeReleaseSpinLockFromDpcLevel(&This->Lock); > > return STATUS_SUCCESS; > } > > Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… > > ============================================================================== > --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.c > [iso-8859-1] (original) > +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.c > [iso-8859-1] Thu May 7 02:58:57 2009 > @@ -636,6 +636,7 @@ > if (This->IrpQueue->lpVtbl->HasLastMappingFailed(This->IrpQueue)) > { > /* notify port driver that new mapping is available */ > + DPRINT("Notifying of new mapping\n"); > This->Stream->lpVtbl->MappingAvailable(This->Stream); > } > > >

1 0

announcing roscms4 beta
by Danny Götte 05 May '09

05 May '09

As some of you already know, the ReactOS web team was working on roscms4 for some time. Now it has reached a point where we feel that it is stable. But before we run it in our production system we want to ensure that it runs correct, so we're starting a beta test. With this mail we'd like to invite everyone who has already worked with RosCMS, to do some testing and helping us to get a stable RosCMS. You can use your normal login data from www.reactos.org, we're using a copy from 5. May 2009. Beta-Test Website: http://backend.reactos.org Beta-Test RosCMS: http://backend.reactos.org/roscms please report bugs to http://roscms.dblounge.org/doku.php?id=bugs Thank you for helping

1 0

Re: [ros-dev] [ros-diffs] [hpoussin] 40710: Remove MachGetMemoryMap() and replace it by ArcGetMemoryDescriptor(). Rework memory initialization to use it. As a bonus, we're not limited anymore to 32 memory descriptors, and having more than 4GB of RAM doesn't lead to out of bounds accesses
by Timo Kreuzer 03 May '09

03 May '09

hpoussin(a)svn.reactos.org schrieb: > Author: hpoussin > Date: Mon Apr 27 00:22:16 2009 > New Revision: 40710 > > [...] > > Modified: > trunk/reactos/boot/freeldr/freeldr/arch/amd64/hwacpi.c > > Author: hpoussin > Date: Sat Apr 25 00:35:11 2009 > New Revision: 40686 > > [...] > > Modified: > trunk/reactos/boot/freeldr/freeldr/arch/amd64/mach.c > trunk/reactos/boot/freeldr/freeldr/arch/amd64/pcrtc.c > Umm, how did you manage to do that? These files don't/shouldn't even exist. Are you using git? Or voodoo? Black magic haxx0ry? ;) Timo

1 0

Bugzilla categories and default CC
by Colin Finck 02 May '09

02 May '09

Hello devs, Cameron just asked whether I could configure Bugzilla to automatically add him to the CC list for "Networking" bugs. This was done now. If you want to be automatically on the CC list for a specific bug category as well, just let me know and I'll add you. Maybe it's even time to rethink our categories and use more practical ones. I'm open for constructive ideas in this direction. Best regards, Colin

1 0

Re : [Qemu-devel] Atheros Wireless Device Emulation
by Sylvain Petreolle 27 Apr '09

27 Apr '09

Hi Clemens, I wonder if you still maintain this code ? Qemu has recently changed the way to manage network devices, and I had to do changes to keep it working. This worked like an charm until today, and is still interesting me as Im beginning tests for wireless nics in ReactOS. CCing ros-dev mailing list in case someone has it already built it in. Kind regards, Sylvain Petreolle ----- Message d'origine ---- > De : Clemens Kolbitsch <clemens.kol(a)gmx.at> > À : qemu-devel(a)nongnu.org > Envoyé le : Jeudi, 28 Février 2008, 15h12mn 09s > Objet : [Qemu-devel] Atheros Wireless Device Emulation > > Hi! > This patch adds virtual wireless networking support to qemu-0.9.1. > Besides being funny having a wireless LAN in Qemu, I guess wireless driver > developers could use this a lot. > > I have 3 screenshots here: > http://stud4.tuwien.ac.at/~e0126605/qemu_atheros/atheros_wlan_hardware.jpg > http://stud4.tuwien.ac.at/~e0126605/qemu_atheros/atheros_wlan_connecting.jpg > http://stud4.tuwien.ac.at/~e0126605/qemu_atheros/atheros_wlan_connected.jpg > > > Some infos about the emulation: > - We simulate an Atheros AR5212 NIC > - Additionally, we have a virutal access point that can > be used to connect to Qemu > - The code is based on ath5k reverse engineering from > about 10 months ago. I did not check what these guys > did since then. > - I added tons of hours doing reverse engineering.. but the > code is still a MESS! I'm sorry, but at least it works ;-) > - We can simulate different network card vendors. I.e. > through an additional model-name, we can specify if the > network card is identified as "Atheros XXXX" or "HP W400", etc. > ---> different drivers are installed automatically by guest system > - The hardware reverse engineering still lacks some stuff. Known > problems: > * Depending on the driver, you have to use a different model > ---> official windows drivers VS. madwifi Linux driver > * Newest madwifi code probably does not work > ---> Use Madwifi 0.9.3. Works just fine ;-) > - The networking-code is still a *little* ugly. Outbound connections > work, but there seem to be problems for inbound connections (e.g. > tcp-redirection, etc.) > - VM Snapshots supported > > Some infos about the patch: > - 2 lines added to pci.c > - added function declaration to pci.h > - patched Makefile.target (2 lines) > - added files qemu/hw/atheros_wlan_.*.[ch] > - took 2 files from wireshark to generate CRC32 checksums > - took 3 files from ath5k > ---> licence people, please have a look if that is ok!! > > Enabling emulation: > > As I wrote above, there are still problems when using the same code for > windows and linux guests. The model parameter helps here. Using the NIC on > windows (that's how I tested): > > qemu ... -net user -net nic,model=atheros_wlan_winxp_HPW400 ... > > and > > qemu ... -net user -net nic,model=atheros_wlan_linux_HPW400 ... > > for Linux systems. > > The "atheros_wlan" is the device itself, "_linux" / "_windows" is necessary > because the reverse engineering is still buggy and "_HPW400" gives the NIC > identification for the guest. HPW400 is the Hewlett-Packard W400 device, but > there are some more (see the atheros_wlan_eeprom.h for details). > > I have used the device on Debian (Kubuntu) Linux. The guests were WinXP-SP2 > and Kubuntu Linux, Kernel 2.6.20, MadWifi 0.9.3. My system is x86, so there > might be problems with big/little endian I am not aware of!! > > Please try the patch and let me know what you think of it!! > > Greets, > Clemens

1 0

Re: [ros-dev] [ros-diffs] [janderwald] 40694: - Fix allocation of CM_RESOURCE_LIST - Might fix bug 4354 See issue #4354 for more details.
by Timo Kreuzer 25 Apr '09

25 Apr '09

Isn't that actually the same? It also ignores the number of full descriptors, which I guess is wrong. And it looks like the whole parsing code is broken. It ignores the number of partial descriptors and does FullList++ Timo janderwald(a)svn.reactos.org schrieb: > Author: janderwald > Date: Sat Apr 25 16:05:08 2009 > New Revision: 40694 > > URL: http://svn.reactos.org/svn/reactos?rev=40694&view=rev > Log: > - Fix allocation of CM_RESOURCE_LIST > - Might fix bug 4354 > See issue #4354 for more details. > > Modified: > trunk/reactos/drivers/video/videoprt/dispatch.c > > Modified: trunk/reactos/drivers/video/videoprt/dispatch.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/dis… > ============================================================================== > --- trunk/reactos/drivers/video/videoprt/dispatch.c [iso-8859-1] (original) > +++ trunk/reactos/drivers/video/videoprt/dispatch.c [iso-8859-1] Sat Apr 25 16:05:08 2009 > @@ -340,9 +340,11 @@ > > /* Save the resource list */ > ResourceCount = AllocatedResources->List[0].PartialResourceList.Count; > - ResourceListSize = > - FIELD_OFFSET(CM_RESOURCE_LIST, List[0].PartialResourceList. > - PartialDescriptors[ResourceCount]); > + ResourceListSize = sizeof(CM_RESOURCE_LIST); > + > + if (ResourceCount > 1) > + ResourceListSize += (ResourceCount-1) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); > + > DeviceExtension->AllocatedResources = ExAllocatePool(PagedPool, ResourceListSize); > if (DeviceExtension->AllocatedResources == NULL) > { > > >

2 2

Release testing apps list issues
by Olaf Siejka 25 Apr '09

25 Apr '09

I feel that some things really need to be clearly explained, regarding apps being use to test releases with. At the moment, despite numerous attempts, i failed to find who (if anyone) is responsible for compiling and maintaining the list of apps used for release version testing. Especially, the non-downloader stuff section is basically changing completely with every release, making those tests virtually pointless, if we cant keep any consistency. On the other hand, looks like no one is responsible for maintaining Downloader app list. Without such responsibilites set, we are slipping into disorganisation, which is both confusing and uproductive. Clear policies should be set and observed in this matter, taking care of such basic thing as adding/linking/opening a bug report for an app that failed in release Test. I feel that testers have more productive things to do, than cleaning up/sorting test entries, incorrectly made up by first timers. Sorry if anyone feels this post to sound harsh, but its still really gentle and kind, compared to obscenities, curses and swears others have to put up, when i vent out after seeing the current state of Release testing wiki.

3 2

Mirroring?
by Administrador 25 Apr '09

25 Apr '09

HI! I was wondering if you people were interested in a new ISO/QUEMU/VMWARE download mirror, I got space and on my server and I would like to help this wonder full project. If the service I'm offering you for free please answer back with the information for starting "mirroring" Here's my server's information: Conection speed: VLAN on 100Mbits Mirroring protocol: HTTP Space reserved for ReactOS: 7GB, Bandwith: Unlimited Bandwith Waiting your answer, Jorge Guerra Kernel Error Administrator Will Rogers <http://www.brainyquote.com/quotes/authors/w/will_rogers.html> - "I don't make jokes. I just watch the government and report the facts."

2 1

Re: [ros-dev] [ros-diffs] [dchapyshev] 40644: - Add Font Embedding Dll (it is necessary for Iron and Chrome)
by Ged 22 Apr '09

22 Apr '09

Wine have been running Google Chrome for a while now. Why don’t they have this dll if it's necessary???? Ged. -----Original Message----- From: ros-diffs-bounces(a)reactos.org [mailto:ros-diffs-bounces@reactos.org] On Behalf Of dchapyshev(a)svn.reactos.org Sent: 22 April 2009 09:51 To: ros-diffs(a)reactos.org Subject: [ros-diffs] [dchapyshev] 40644: - Add Font Embedding Dll (it is necessary for Iron and Chrome) Author: dchapyshev Date: Wed Apr 22 12:51:09 2009 New Revision: 40644 URL: http://svn.reactos.org/svn/reactos?rev=40644&view=rev Log: - Add Font Embedding Dll (it is necessary for Iron and Chrome) Added: trunk/reactos/dll/win32/t2embed/ (with props) trunk/reactos/dll/win32/t2embed/t2embed.c (with props) trunk/reactos/dll/win32/t2embed/t2embed.rbuild (with props) trunk/reactos/dll/win32/t2embed/t2embed.rc (with props) trunk/reactos/dll/win32/t2embed/t2embed.spec (with props) trunk/reactos/include/psdk/t2embapi.h (with props) Modified: trunk/reactos/baseaddress.rbuild trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/win32/win32.rbuild Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=406… ============================================================================== --- trunk/reactos/baseaddress.rbuild [iso-8859-1] (original) +++ trunk/reactos/baseaddress.rbuild [iso-8859-1] Wed Apr 22 12:51:09 2009 @@ -13,6 +13,7 @@ <property name="BASEADDRESS_WLANAPI" value="0x470F0000" /> <property name="BASEADDRESS_PIDGEN" value="0x473e0000" /> <property name="BASEADDRESS_DWMAPI" value="0x4A3F0000" /> + <property name="BASEADDRESS_T2EMBED" value="0x4b310000" /> <property name="BASEADDRESS_LOADPERF" value="0x4B920000" /> <property name="BASEADDRESS_MPRAPI" value="0x4C400000" /> <property name="BASEADDRESS_MSFTEDIT" value="0x4b460000" /> Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Wed Apr 22 12:51:09 2009 @@ -412,6 +412,7 @@ dll\win32\sti\sti.dll 1 dll\win32\sxs\sxs.dll 1 dll\win32\syssetup\syssetup.dll 1 +dll\win32\t2embed\t2embed.dll 1 dll\win32\tapi32\tapi32.dll 1 dll\win32\tapiui\tapiui.dll 1 dll\win32\traffic\traffic.dll 1 Propchange: trunk/reactos/dll/win32/t2embed/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Wed Apr 22 12:51:09 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/t2embed/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/t2embed/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/t2embed/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/t2embed/t2embed.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/t2embed/t2embed.… ============================================================================== --- trunk/reactos/dll/win32/t2embed/t2embed.c (added) +++ trunk/reactos/dll/win32/t2embed/t2embed.c [iso-8859-1] Wed Apr 22 12:51:09 2009 @@ -1,0 +1,205 @@ +/* + * PROJECT: Font Embedding Dll + * FILE: dll\win32\t2embed\t2embed.c + * PURPOSE: Main file + * PROGRAMMERS: Dmitry Chapyshev (dmitry(a)reactos.org) + */ + +#include <windows.h> +#include <t2embapi.h> +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(t2embed); + +LONG +WINAPI +TTCharToUnicode(HDC hDC, + UCHAR* pucCharCodes, + ULONG ulCharCodeSize, + USHORT* pusShortCodes, + ULONG ulShortCodeSize, + ULONG ulFlags) +{ + UNIMPLEMENTED; + return E_NONE; +} + +LONG +WINAPI +TTDeleteEmbeddedFont(HANDLE hFontReference, + ULONG ulFlags, + ULONG* pulStatus) +{ + UNIMPLEMENTED; + return E_NONE; +} + +LONG +WINAPI +TTEmbedFont(HDC hDC, + ULONG ulFlags, + ULONG ulCharSet, + ULONG* pulPrivStatus, + ULONG* pulStatus, + WRITEEMBEDPROC lpfnWriteToStream, + LPVOID lpvWriteStream, + USHORT* pusCharCodeSet, + USHORT usCharCodeCount, + USHORT usLanguage, + TTEMBEDINFO* pTTEmbedInfo) +{ + UNIMPLEMENTED; + return E_NONE; +} + +LONG +WINAPI +TTEmbedFontFromFileA(HDC hDC, + LPCSTR szFontFileName, + USHORT usTTCIndex, + ULONG ulFlags, + ULONG ulCharSet, + ULONG* pulPrivStatus, + ULONG* pulStatus, + WRITEEMBEDPROC lpfnWriteToStream, + LPVOID lpvWriteStream, + USHORT* pusCharCodeSet, + USHORT usCharCodeCount, + USHORT usLanguage, + TTEMBEDINFO* pTTEmbedInfo) +{ + UNIMPLEMENTED; + return E_NONE; +} + +LONG +WINAPI +TTEnableEmbeddingForFacename(LPSTR lpszFacename, + BOOL bEnable) +{ + UNIMPLEMENTED; + return E_NONE; +} + +LONG +WINAPI +TTGetEmbeddedFontInfo(ULONG ulFlags, + ULONG* pulPrivStatus, + ULONG ulPrivs, + ULONG* pulStatus, + READEMBEDPROC lpfnReadFromStream, + LPVOID lpvReadStream, + TTLOADINFO* pTTLoadInfo) +{ + UNIMPLEMENTED; + return E_NONE; +} + +LONG +WINAPI +TTGetEmbeddingType(HDC hDC, + ULONG* pulPrivStatus) +{ + UNIMPLEMENTED; + return E_NONE; +} + +LONG +WINAPI +TTIsEmbeddingEnabled(HDC hDC, + BOOL* pbEnabled) +{ + UNIMPLEMENTED; + return E_NONE; +} + +LONG +WINAPI +TTIsEmbeddingEnabledForFacename(LPSTR lpszFacename, + BOOL* pbEnabled) +{ + UNIMPLEMENTED; + return E_NONE; +} + +LONG +WINAPI +TTLoadEmbeddedFont(HANDLE *phFontReference, + ULONG ulFlags, + ULONG* pulPrivStatus, + ULONG ulPrivs, + ULONG* pulStatus, + READEMBEDPROC lpfnReadFromStream, + LPVOID lpvReadStream, + LPWSTR szWinFamilyName, + LPSTR szMacFamilyName, + TTLOADINFO* pTTLoadInfo) +{ + UNIMPLEMENTED; + return E_NONE; +} + +LONG +WINAPI +TTRunValidationTests(HDC hDC, + TTVALIDATIONTESTPARAMS* pTestParam) +{ + UNIMPLEMENTED; + return E_NONE; +} + +LONG +WINAPI +TTEmbedFontEx(HDC hDC, + ULONG ulFlags, + ULONG ulCharSet, + ULONG* pulPrivStatus, + ULONG* pulStatus, + WRITEEMBEDPROC lpfnWriteToStream, + LPVOID lpvWriteStream, + ULONG* pulCharCodeSet, + USHORT usCharCodeCount, + USHORT usLanguage, + TTEMBEDINFO* pTTEmbedInfo) +{ + UNIMPLEMENTED; + return E_NONE; +} + +LONG +WINAPI +TTRunValidationTestsEx(HDC hDC, + TTVALIDATIONTESTPARAMSEX* pTestParam) +{ + UNIMPLEMENTED; + return E_NONE; +} + +LONG +WINAPI +TTGetNewFontName(HANDLE* phFontReference, + LPWSTR szWinFamilyName, + long cchMaxWinName, + LPSTR szMacFamilyName, + long cchMaxMacName) +{ + UNIMPLEMENTED; + return E_NONE; +} + + +BOOL +WINAPI +DllMain(IN HINSTANCE hinstDLL, + IN DWORD dwReason, + IN LPVOID lpvReserved) +{ + switch (dwReason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + } + + return TRUE; +} Propchange: trunk/reactos/dll/win32/t2embed/t2embed.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/t2embed/t2embed.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/t2embed/t2embed.… ============================================================================== --- trunk/reactos/dll/win32/t2embed/t2embed.rbuild (added) +++ trunk/reactos/dll/win32/t2embed/t2embed.rbuild [iso-8859-1] Wed Apr 22 12:51:09 2009 @@ -1,0 +1,13 @@ +<module name="t2embed" type="win32dll" baseaddress="${BASEADDRESS_T2EMBED}" installbase="system32" installname="t2embed.dll" unicode="yes"> + <importlibrary definition="t2embed.spec" /> + <include base="t2embed">.</include> + <include base="ReactOS">include/reactos/wine</include> + <library>kernel32</library> + <library>gdi32</library> + <library>user32</library> + <library>advapi32</library> + <library>version</library> + <library>wine</library> + <file>t2embed.c</file> + <file>t2embed.rc</file> +</module> Propchange: trunk/reactos/dll/win32/t2embed/t2embed.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/t2embed/t2embed.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/t2embed/t2embed.… ============================================================================== --- trunk/reactos/dll/win32/t2embed/t2embed.rc (added) +++ trunk/reactos/dll/win32/t2embed/t2embed.rc [iso-8859-1] Wed Apr 22 12:51:09 2009 @@ -1,0 +1,7 @@ +#include <windows.h> + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "Font Embedding Dll\0" +#define REACTOS_STR_INTERNAL_NAME "t2embed\0" +#define REACTOS_STR_ORIGINAL_FILENAME "t2embed.dll\0" +#include <reactos/version.rc> Propchange: trunk/reactos/dll/win32/t2embed/t2embed.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/t2embed/t2embed.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/t2embed/t2embed.… ============================================================================== --- trunk/reactos/dll/win32/t2embed/t2embed.spec (added) +++ trunk/reactos/dll/win32/t2embed/t2embed.spec [iso-8859-1] Wed Apr 22 12:51:09 2009 @@ -1,0 +1,25 @@ +@ stdcall TTCharToUnicode(ptr ptr long ptr long long) +@ stdcall TTDeleteEmbeddedFont(ptr long ptr) +@ stdcall TTEmbedFont(ptr long long ptr ptr ptr ptr ptr long long ptr) +@ stdcall TTEmbedFontFromFileA(ptr str long long long ptr ptr ptr ptr ptr long long ptr) +@ stdcall TTEnableEmbeddingForFacename(str long) +@ stdcall TTGetEmbeddedFontInfo(long ptr long ptr ptr ptr ptr) +@ stdcall TTGetEmbeddingType(ptr ptr) +@ stdcall TTIsEmbeddingEnabled(ptr ptr) +@ stdcall TTIsEmbeddingEnabledForFacename(str ptr) +@ stdcall TTLoadEmbeddedFont(ptr long ptr long ptr ptr ptr wstr str ptr) +@ stdcall TTRunValidationTests(ptr ptr) +@ stub _TTCharToUnicode@24 +@ stub _TTDeleteEmbeddedFont@12 +@ stub _TTEmbedFont@44 +@ stub _TTEmbedFontFromFileA@52 +@ stub _TTEnableEmbeddingForFacename@8 +@ stub _TTGetEmbeddedFontInfo@28 +@ stub _TTGetEmbeddingType@8 +@ stub _TTIsEmbeddingEnabled@8 +@ stub _TTIsEmbeddingEnabledForFacename@8 +@ stub _TTLoadEmbeddedFont@40 +@ stub _TTRunValidationTests@8 +@ stdcall TTEmbedFontEx(ptr long long ptr ptr ptr ptr ptr long long ptr) +@ stdcall TTRunValidationTestsEx(ptr ptr) +@ stdcall TTGetNewFontName(ptr wstr long str long) Propchange: trunk/reactos/dll/win32/t2embed/t2embed.spec ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] Wed Apr 22 12:51:09 2009 @@ -511,6 +511,9 @@ <directory name="syssetup"> <xi:include href="syssetup/syssetup.rbuild" /> </directory> +<directory name="t2embed"> + <xi:include href="t2embed/t2embed.rbuild" /> +</directory> <directory name="tapi32"> <xi:include href="tapi32/tapi32.rbuild" /> </directory> Added: trunk/reactos/include/psdk/t2embapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/t2embapi.h?re… ============================================================================== --- trunk/reactos/include/psdk/t2embapi.h (added) +++ trunk/reactos/include/psdk/t2embapi.h [iso-8859-1] Wed Apr 22 12:51:09 2009 @@ -1,0 +1,286 @@ +#ifndef __T2EMBED_API_H +#define __T2EMBED_API_H + +#ifndef CHARSET_UNICODE +#define CHARSET_UNICODE 1 +#define CHARSET_DEFAULT 1 +#define CHARSET_SYMBOL 2 +#define CHARSET_GLYPHIDX 3 +#endif + +#ifndef EMBED_PREVIEWPRINT +#define EMBED_PREVIEWPRINT 1 +#define EMBED_EDITABLE 2 +#define EMBED_INSTALLABLE 3 +#define EMBED_NOEMBEDDING 4 +#endif + +#ifndef LICENSE_INSTALLABLE +#define LICENSE_INSTALLABLE 0x0 +#define LICENSE_DEFAULT 0x0 +#define LICENSE_NOEMBEDDING 0x2 +#define LICENSE_PREVIEWPRINT 0x4 +#define LICENSE_EDITABLE 0x8 +#endif + +#ifndef TTEMBED_RAW +#define TTEMBED_RAW 0x0 +#define TTEMBED_SUBSET 0x1 +#define TTEMBED_TTCOMPRESSED 0x4 +#define TTEMBED_FAILIFVARIATIONSIMULATED 0x10 +#define TTEMBED_EMBEDEUDC 0x20 +#define TTEMBED_VALIDATIONTESTS 0x40 +#define TTEMBED_WEBOBJECT 0x80 +#define TTEMBED_ENCRYPTDATA 0x10000000 +#endif + +#ifndef E_NONE +#define E_NONE 0x0 +#endif + +#ifndef E_CHARCODECOUNTINVALID +#define E_CHARCODECOUNTINVALID 0x2 +#define E_CHARCODESETINVALID 0x3 +#define E_DEVICETRUETYPEFONT 0x4 +#define E_HDCINVALID 0x6 +#define E_NOFREEMEMORY 0x7 +#define E_FONTREFERENCEINVALID 0x8 +#define E_NOTATRUETYPEFONT 0xA +#define E_ERRORACCESSINGFONTDATA 0xC +#define E_ERRORACCESSINGFACENAME 0xD +#define E_ERRORUNICODECONVERSION 0x11 +#define E_ERRORCONVERTINGCHARS 0x12 +#define E_EXCEPTION 0x13 +#define E_RESERVEDPARAMNOTNULL 0x14 +#define E_CHARSETINVALID 0x15 +#define E_WIN32S_NOTSUPPORTED 0x16 +#define E_FILE_NOT_FOUND 0x17 +#define E_TTC_INDEX_OUT_OF_RANGE 0x18 +#define E_INPUTPARAMINVALID 0x19 +#endif + +#ifndef E_ERRORCOMPRESSINGFONTDATA +#define E_ERRORCOMPRESSINGFONTDATA 0x100 +#define E_FONTDATAINVALID 0x102 +#define E_NAMECHANGEFAILED 0x103 +#define E_FONTNOTEMBEDDABLE 0x104 +#define E_PRIVSINVALID 0x105 +#define E_SUBSETTINGFAILED 0x106 +#define E_READFROMSTREAMFAILED 0x107 +#define E_SAVETOSTREAMFAILED 0x108 +#define E_NOOS2 0x109 +#define E_T2NOFREEMEMORY 0x10A +#define E_ERRORREADINGFONTDATA 0x10B +#define E_FLAGSINVALID 0x10C +#define E_ERRORCREATINGFONTFILE 0x10D +#define E_FONTALREADYEXISTS 0x10E +#define E_FONTNAMEALREADYEXISTS 0x10F +#define E_FONTINSTALLFAILED 0x110 +#define E_ERRORDECOMPRESSINGFONTDATA 0x111 +#define E_ERRORACCESSINGEXCLUDELIST 0x112 +#define E_FACENAMEINVALID 0x113 +#define E_STREAMINVALID 0x114 +#define E_STATUSINVALID 0x115 +#define E_PRIVSTATUSINVALID 0x116 +#define E_PERMISSIONSINVALID 0x117 +#define E_PBENABLEDINVALID 0x118 +#define E_SUBSETTINGEXCEPTION 0x119 +#define E_SUBSTRING_TEST_FAIL 0x11A +#define E_FONTVARIATIONSIMULATED 0x11B +#define E_FONTVALIDATEFAIL 0x11C +#define E_FONTFAMILYNAMENOTINFULL 0x11D +#endif + +#ifndef E_ADDFONTFAILED +#define E_ADDFONTFAILED 0x200 +#define E_COULDNTCREATETEMPFILE 0x201 +#define E_FONTFILECREATEFAILED 0x203 +#define E_WINDOWSAPI 0x204 +#define E_FONTFILENOTFOUND 0x205 +#define E_RESOURCEFILECREATEFAILED 0x206 +#define E_ERROREXPANDINGFONTDATA 0x207 +#define E_ERRORGETTINGDC 0x208 +#define E_EXCEPTIONINDECOMPRESSION 0x209 +#define E_EXCEPTIONINCOMPRESSION 0x20A +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +typedef unsigned long(WINAPIV *WRITEEMBEDPROC) +( + void* lpvWriteStream, + const void* lpvBuffer, + const unsigned long cbBuffer +); + +typedef unsigned long(WINAPIV *READEMBEDPROC) +( + void* lpvReadStream, + void* lpvBuffer, + const unsigned long cbBuffer +); + + +typedef struct +{ + unsigned long ulStructSize; + long lTestFromSize; + long lTestToSize; + unsigned long ulCharSet; + unsigned short usReserved1; + unsigned short usCharCodeCount; + unsigned short* pusCharCodeSet; +} TTVALIDATIONTESTPARAMS; + +typedef struct +{ + unsigned long ulStructSize; + long lTestFromSize; + long lTestToSize; + unsigned long ulCharSet; + unsigned short usReserved1; + unsigned short usCharCodeCount; + unsigned long* pulCharCodeSet; +} TTVALIDATIONTESTPARAMSEX; + +typedef struct +{ + unsigned short usStructSize; + unsigned short usRootStrSize; + unsigned short *pusRootStr; +} TTEMBEDINFO; + +typedef struct +{ + unsigned short usStructSize; + unsigned short usRefStrSize; + unsigned short *pusRefStr; +} TTLOADINFO; + +LONG +WINAPI +TTCharToUnicode(HDC hDC, + UCHAR* pucCharCodes, + ULONG ulCharCodeSize, + USHORT* pusShortCodes, + ULONG ulShortCodeSize, + ULONG ulFlags); + +LONG +WINAPI +TTDeleteEmbeddedFont(HANDLE hFontReference, + ULONG ulFlags, + ULONG* pulStatus); + +LONG +WINAPI +TTEmbedFont(HDC hDC, + ULONG ulFlags, + ULONG ulCharSet, + ULONG* pulPrivStatus, + ULONG* pulStatus, + WRITEEMBEDPROC lpfnWriteToStream, + LPVOID lpvWriteStream, + USHORT* pusCharCodeSet, + USHORT usCharCodeCount, + USHORT usLanguage, + TTEMBEDINFO* pTTEmbedInfo); + +LONG +WINAPI +TTEmbedFontFromFileA(HDC hDC, + LPCSTR szFontFileName, + USHORT usTTCIndex, + ULONG ulFlags, + ULONG ulCharSet, + ULONG* pulPrivStatus, + ULONG* pulStatus, + WRITEEMBEDPROC lpfnWriteToStream, + LPVOID lpvWriteStream, + USHORT* pusCharCodeSet, + USHORT usCharCodeCount, + USHORT usLanguage, + TTEMBEDINFO* pTTEmbedInfo); + +LONG +WINAPI +TTEnableEmbeddingForFacename(LPSTR lpszFacename, + BOOL bEnable); + +LONG +WINAPI +TTGetEmbeddedFontInfo(ULONG ulFlags, + ULONG* pulPrivStatus, + ULONG ulPrivs, + ULONG* pulStatus, + READEMBEDPROC lpfnReadFromStream, + LPVOID lpvReadStream, + TTLOADINFO* pTTLoadInfo); + +LONG +WINAPI +TTGetEmbeddingType(HDC hDC, + ULONG* pulPrivStatus); + +LONG +WINAPI +TTIsEmbeddingEnabled(HDC hDC, + BOOL* pbEnabled); + +LONG +WINAPI +TTIsEmbeddingEnabledForFacename(LPSTR lpszFacename, + BOOL* pbEnabled); + +LONG +WINAPI +TTLoadEmbeddedFont(HANDLE *phFontReference, + ULONG ulFlags, + ULONG* pulPrivStatus, + ULONG ulPrivs, + ULONG* pulStatus, + READEMBEDPROC lpfnReadFromStream, + LPVOID lpvReadStream, + LPWSTR szWinFamilyName, + LPSTR szMacFamilyName, + TTLOADINFO* pTTLoadInfo); + +LONG +WINAPI +TTRunValidationTests(HDC hDC, + TTVALIDATIONTESTPARAMS* pTestParam); + +LONG +WINAPI +TTEmbedFontEx(HDC hDC, + ULONG ulFlags, + ULONG ulCharSet, + ULONG* pulPrivStatus, + ULONG* pulStatus, + WRITEEMBEDPROC lpfnWriteToStream, + LPVOID lpvWriteStream, + ULONG* pulCharCodeSet, + USHORT usCharCodeCount, + USHORT usLanguage, + TTEMBEDINFO* pTTEmbedInfo); + +LONG +WINAPI +TTRunValidationTestsEx(HDC hDC, + TTVALIDATIONTESTPARAMSEX* pTestParam); + +LONG +WINAPI +TTGetNewFontName(HANDLE* phFontReference, + LPWSTR szWinFamilyName, + long cchMaxWinName, + LPSTR szMacFamilyName, + long cchMaxMacName); + +#ifdef __cplusplus + } +#endif + +#endif /* __T2EMBED_API_H */ Propchange: trunk/reactos/include/psdk/t2embapi.h ------------------------------------------------------------------------------ svn:eol-style = native

3 3

Re: [ros-dev] [ros-diffs] [mjmartin] 40630: - edit.c: Add TPM_RETURNCMD flag to TrackPopupMenu so that WM_COMMAND messages are not sent to the edit control. Use WM_MENUSELECT vice WM_COMMAND to determine which clipboard message to send. - Fixes vb apps edit context menu and maybe others. Bug #4404
by Timo Kreuzer 22 Apr '09

22 Apr '09

edit.c is shared with wine. Also using a static variable here looks like a bad idea. I would think that the problem is somewhere else. mjmartin(a)svn.reactos.org schrieb: > Author: mjmartin > Date: Tue Apr 21 08:45:08 2009 > New Revision: 40630 > > URL: http://svn.reactos.org/svn/reactos?rev=40630&view=rev > Log: > - edit.c: Add TPM_RETURNCMD flag to TrackPopupMenu so that WM_COMMAND messages are not sent to the edit control. > Use WM_MENUSELECT vice WM_COMMAND to determine which clipboard message to send. > - Fixes vb apps edit context menu and maybe others. Bug #4404 > > Modified: > trunk/reactos/dll/win32/user32/controls/edit.c > > Modified: trunk/reactos/dll/win32/user32/controls/edit.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… > ============================================================================== > --- trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] Tue Apr 21 08:45:08 2009 > @@ -255,7 +255,7 @@ > * WM_XXX message handlers > */ > static LRESULT EDIT_WM_Char(EDITSTATE *es, WCHAR c); > -static void EDIT_WM_Command(EDITSTATE *es, INT code, INT id, HWND conrtol); > +static void EDIT_WM_MenuSelect(EDITSTATE *es, INT code, INT id, HWND conrtol); > static void EDIT_WM_ContextMenu(EDITSTATE *es, INT x, INT y); > static void EDIT_WM_Copy(EDITSTATE *es); > static LRESULT EDIT_WM_Create(EDITSTATE *es, LPCWSTR name); > @@ -947,8 +947,8 @@ > EDIT_WM_Clear(es); > break; > > - case WM_COMMAND: > - EDIT_WM_Command(es, HIWORD(wParam), LOWORD(wParam), (HWND)lParam); > + case WM_MENUSELECT: > + EDIT_WM_MenuSelect(es, HIWORD(wParam), LOWORD(wParam), (HWND)lParam); > break; > > case WM_CONTEXTMENU: > @@ -4224,12 +4224,17 @@ > * WM_COMMAND > * > */ > -static void EDIT_WM_Command(EDITSTATE *es, INT code, INT id, HWND control) > -{ > - if (code || control) > +static void EDIT_WM_MenuSelect(EDITSTATE *es, INT code, INT id, HWND control) > +{ > + > + static INT MenuSelected; > + > + if (id != 0) { > + MenuSelected = id; > return; > - > - switch (id) { > + } > + > + switch (MenuSelected) { > case EM_UNDO: > SendMessageW(es->hwndSelf, WM_UNDO, 0, 0); > break; > @@ -4308,7 +4313,7 @@ > y = rc.top + (rc.bottom - rc.top) / 2; > } > > - TrackPopupMenu(popup, TPM_LEFTALIGN | TPM_RIGHTBUTTON, x, y, 0, es->hwndSelf, NULL); > + TrackPopupMenu(popup, TPM_LEFTALIGN | TPM_RIGHTBUTTON | TPM_RETURNCMD, x, y, 0, es->hwndSelf, NULL); > DestroyMenu(menu); > } > > > >

2 3

Re: [ros-dev] [ros-diffs] [mjmartin] 40557: - Add volatile to variables in OutputDebugStringA. Fix #1 of ? for 3424.
by Timo Kreuzer 21 Apr '09

21 Apr '09

Can you explain, why the variables need to be volatile? This looks like a SEH problem. mjmartin(a)svn.reactos.org schrieb: > Author: mjmartin > Date: Fri Apr 17 13:59:03 2009 > New Revision: 40557 > > URL: http://svn.reactos.org/svn/reactos?rev=40557&view=rev > Log: > - Add volatile to variables in OutputDebugStringA. Fix #1 of ? for 3424. > > Modified: > trunk/reactos/dll/win32/kernel32/debug/output.c > > Modified: trunk/reactos/dll/win32/kernel32/debug/output.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/debug/o… > ============================================================================== > --- trunk/reactos/dll/win32/kernel32/debug/output.c [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/kernel32/debug/output.c [iso-8859-1] Fri Apr 17 13:59:03 2009 > @@ -219,9 +219,9 @@ > static BOOL s_bDBMonMutexTriedOpen = FALSE; > > /* local copy of the mutex handle */ > - HANDLE hDBMonMutex = s_hDBMonMutex; > + volatile HANDLE hDBMonMutex = s_hDBMonMutex; > /* handle to the Section of the shared buffer */ > - HANDLE hDBMonBuffer = NULL; > + volatile HANDLE hDBMonBuffer = NULL; > > /* pointer to the mapped view of the shared buffer. It consist of the current > process id followed by the message string */ > @@ -229,11 +229,11 @@ > > /* event: signaled by the debug message monitor when OutputDebugString can write > to the shared buffer */ > - HANDLE hDBMonBufferReady = NULL; > + volatile HANDLE hDBMonBufferReady = NULL; > > /* event: to be signaled by OutputDebugString when it's done writing to the > shared buffer */ > - HANDLE hDBMonDataReady = NULL; > + volatile HANDLE hDBMonDataReady = NULL; > > /* mutex not opened, and no previous attempts to open/create it */ > if(hDBMonMutex == NULL && !s_bDBMonMutexTriedOpen) > @@ -295,10 +295,10 @@ > _SEH2_TRY > { > /* size of the current output block */ > - SIZE_T nRoundLen; > + volatile SIZE_T nRoundLen; > > /* size of the remainder of the string */ > - SIZE_T nOutputStringLen; > + volatile SIZE_T nOutputStringLen; > > /* output the whole string */ > nOutputStringLen = strlen(_OutputString); > @@ -339,11 +339,12 @@ > else > { > /* output in blocks of 512 characters */ > - CHAR a_cBuffer[512]; > + volatile PCHAR a_cBuffer; > + a_cBuffer = (CHAR*)HeapAlloc(GetProcessHeap(), 0, 512); > > /* write a maximum of 511 bytes */ > - if(nOutputStringLen > (sizeof(a_cBuffer) - 2)) > - nRoundLen = sizeof(a_cBuffer) - 2; > + if(nOutputStringLen > 510) > + nRoundLen = 510; > else > nRoundLen = nOutputStringLen; > > @@ -355,6 +356,8 @@ > > /* send the current block to the kernel debugger */ > DbgPrint("%s", a_cBuffer); > + > + HeapFree(GetProcessHeap(), 0, a_cBuffer); > } > > /* move to the next block */ > > >

4 3

Re: [ros-dev] [ros-diffs] [dreimer] 40619: Hopefully a REAL FIX for our new setlocal eats up vars problem
by Timo Kreuzer 21 Apr '09

21 Apr '09

Nope. I replaced my files with the new ones. Now I don't get any output about the compiler version etc at startup anymore and I cannot compile anything. dreimer(a)svn.reactos.org schrieb: > Author: dreimer > Date: Tue Apr 21 03:30:47 2009 > New Revision: 40619 > > URL: http://svn.reactos.org/svn/reactos?rev=40619&view=rev > Log: > Hopefully a REAL FIX for our new setlocal eats up vars problem > > Added: > trunk/tools/RosBE/RosBE-Windows/Root/setlocal.cmd (with props) > Modified: > trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd > > Modified: trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd > URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/ros… > ============================================================================== > --- trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] (original) > +++ trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] Tue Apr 21 03:30:47 2009 > @@ -33,51 +33,12 @@ > goto :main > ) > > -setlocal enabledelayedexpansion > - > set _ROSBE_OBJPATH=%_ROSBE_i386_OBJPATH% > set _ROSBE_OUTPATH=%_ROSBE_i386_OUTPATH% > - > -if not "!_ROSBE_ARCH!" == "" ( > - set ROS_ARCH=!_ROSBE_ARCH! > - set ROS_PREFIX=!_ROSBE_ARCH!-pc-mingw32 > - set _ROSBE_TARGET_MINGWPATH=!_ROSBE_BASEDIR!\!_ROSBE_ARCH! > - > - REM HAXX > - > - if "!_ROSBE_ARCH!" == "arm" ( > - set _ROSBE_OBJPATH=!_ROSBE_ARM_OBJPATH! > - set _ROSBE_OUTPATH=!_ROSBE_ARM_OUTPATH! > - ) > - if "!_ROSBE_ARCH!" == "ppc" ( > - set _ROSBE_OBJPATH=!_ROSBE_PPC_OBJPATH! > - set _ROSBE_OUTPATH=!_ROSBE_PPC_OUTPATH! > - ) > - if "!_ROSBE_ARCH!" == "amd64" ( > - set _ROSBE_OBJPATH=!_ROSBE_AMD64_OBJPATH! > - set _ROSBE_OUTPATH=!_ROSBE_AMD64_OUTPATH! > - set ROS_PREFIX=x86_64-pc-mingw32 > - set _ROSBE_TARGET_MINGWPATH=!_ROSBE_BASEDIR!\x86_64 > - ) > - > - REM Check if existant arch > - > - if not exist "!_ROSBE_TARGET_MINGWPATH!\." ( > - echo Unsupported arch specified. Fallback to Default. > - pause > - set _ROSBE_OBJPATH=!_ROSBE_i386_OBJPATH! > - set _ROSBE_OUTPATH=!_ROSBE_i386_OUTPATH! > - set ROS_ARCH= > - set ROS_PREFIX= > - set _ROSBE_TARGET_MINGWPATH= > - ) > -) > - > +"%_ROSBE_BASEDIR%\setlocal.cmd" > :: > :: Set up the GCC 4.x.x build environment. > :: > - > -endlocal > > :main > > > Added: trunk/tools/RosBE/RosBE-Windows/Root/setlocal.cmd > URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/set… > ============================================================================== > --- trunk/tools/RosBE/RosBE-Windows/Root/setlocal.cmd (added) > +++ trunk/tools/RosBE/RosBE-Windows/Root/setlocal.cmd [iso-8859-1] Tue Apr 21 03:30:47 2009 > @@ -1,0 +1,49 @@ > +:: > +:: PROJECT: RosBE - ReactOS Build Environment for Windows > +:: LICENSE: GNU General Public License v2. (see LICENSE.txt) > +:: FILE: Root/setlocal.cmd > +:: PURPOSE: Bypass for the stupid setlocal in CMD Batch > +:: COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> > +:: > +:: > +@echo off > +if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 > +if %_ROSBE_DEBUG% == 1 ( > + @echo on > +) > + > + > +if not "%_ROSBE_ARCH%" == "" ( > + set ROS_ARCH=%_ROSBE_ARCH% > + set ROS_PREFIX=%_ROSBE_ARCH%-pc-mingw32 > + set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\%_ROSBE_ARCH% > + > + REM HAXX > + > + if "%_ROSBE_ARCH%" == "arm" ( > + set _ROSBE_OBJPATH=%_ROSBE_ARM_OBJPATH% > + set _ROSBE_OUTPATH=%_ROSBE_ARM_OUTPATH% > + ) > + if "%_ROSBE_ARCH%" == "ppc" ( > + set _ROSBE_OBJPATH=%_ROSBE_PPC_OBJPATH% > + set _ROSBE_OUTPATH=%_ROSBE_PPC_OUTPATH% > + ) > + if "%_ROSBE_ARCH%" == "amd64" ( > + set _ROSBE_OBJPATH=%_ROSBE_AMD64_OBJPATH% > + set _ROSBE_OUTPATH=%_ROSBE_AMD64_OUTPATH% > + set ROS_PREFIX=x86_64-pc-mingw32 > + set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\x86_64 > + ) > + > + REM Check if existant arch > + > + if not exist "%_ROSBE_TARGET_MINGWPATH%\." ( > + echo Unsupported arch specified. Fallback to Default. > + pause > + set _ROSBE_OBJPATH=%_ROSBE_i386_OBJPATH% > + set _ROSBE_OUTPATH=%_ROSBE_i386_OUTPATH% > + set ROS_ARCH= > + set ROS_PREFIX= > + set _ROSBE_TARGET_MINGWPATH= > + ) > +) > > Propchange: trunk/tools/RosBE/RosBE-Windows/Root/setlocal.cmd > ------------------------------------------------------------------------------ > svn:eol-style = native > > >

1 0

0.3.9 Status
by Aleksey Bragin 18 Apr '09

18 Apr '09

Hi, by today most of the bugs which were having 0.3.9 as a milestone are fixed - including fixing 4-months old bug with richedit control, properly trimming DLL names during PE loading so that apps now can find their DLLs (previously that failed in some cases), newest downloader problem introduced yesterday and fixed today (not to speak about yesterday's fixes too!). This is a very good example of team collaboration, team effort aimed at a narrow set of problems. It worked very well, and I think we would utilise such bugfixing sessions in future too. Branching date is now set to tomorrow, 17th of April, 2009 and is not going to be changed anymore. As soon as the 0.3.9 branch is created, feature freeze is considered to be finished. After the release is branched, usual testing will be conducted, actual packages built and released as usual. Thank you for your efforts and for being patient with regards to the feature freeze. WBR, Aleksey Bragin.

2 3

Re: [ros-dev] [ros-diffs] [cfinck] 40579: Hack: Revert the dispatch routine for WM_SETREDRAW to the pre-Wine-1.1.7 version to hackfix mIRC and probably other applications using riched20.
by Aleksey Bragin 18 Apr '09

18 Apr '09

This shouldn't be necessary, it's fixed in trunk by 40545. WBR, Aleksey Bragin. On Apr 18, 2009, at 6:56 PM, cfinck(a)svn.reactos.org wrote: > Author: cfinck > Date: Sat Apr 18 18:56:16 2009 > New Revision: 40579 > > URL: http://svn.reactos.org/svn/reactos?rev=40579&view=rev > Log: > Hack: Revert the dispatch routine for WM_SETREDRAW to the pre- > Wine-1.1.7 version to hackfix mIRC and probably other applications > using riched20. > > Modified: > branches/ros-branch-0_3_9/reactos/dll/win32/riched20/editor.c > > Modified: branches/ros-branch-0_3_9/reactos/dll/win32/riched20/ > editor.c > URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_9/ > reactos/dll/win32/riched20/editor.c? > rev=40579&r1=40578&r2=40579&view=diff > ====================================================================== > ======== > --- branches/ros-branch-0_3_9/reactos/dll/win32/riched20/editor.c > [iso-8859-1] (original) > +++ branches/ros-branch-0_3_9/reactos/dll/win32/riched20/editor.c > [iso-8859-1] Sat Apr 18 18:56:16 2009 > @@ -4162,7 +4162,9 @@ > ME_SendRequestResize(editor, TRUE); > return 0; > case WM_SETREDRAW: > - goto do_default; > + if (wParam) > + ME_RewrapRepaint(editor); > + return 0; > case WM_SIZE: > { > RECT clientRect; >

1 0

Re: [ros-dev] [ros-diffs] [dgorbachev] 40565: Begin Japanese translation of USetup
by Aleksey Bragin 17 Apr '09

17 Apr '09

Dmitry! Please! It's only a few hours left till we create a branch and normal development resumes! WBR, Aleksey Bragin. On Apr 18, 2009, at 1:01 AM, dgorbachev(a)svn.reactos.org wrote: > Author: dgorbachev > Date: Sat Apr 18 01:01:56 2009 > New Revision: 40565 > > URL: http://svn.reactos.org/svn/reactos?rev=40565&view=rev > Log: > Begin Japanese translation of USetup > > Added: > trunk/reactos/media/vgafonts/932-8x8.bin (with props) > Modified: > trunk/reactos/base/setup/usetup/lang/ja-JP.h > trunk/reactos/base/setup/usetup/muifonts.h > trunk/reactos/base/setup/usetup/muilanguages.h > trunk/reactos/media/vgafonts/vgafonts.rbuild

1 0

Re: [ros-dev] [ros-diffs] [hyperion] 40541: This is why we can't have nice things. Reverting r40536, r40537, due to RosBE differences between Windows and Linux hosts (because RosBE sucks)
by Steven Edwards 16 Apr '09

16 Apr '09

On Thu, Apr 16, 2009 at 12:57 AM, <hyperion(a)svn.reactos.org> wrote: > Author: hyperion > Date: Thu Apr 16 08:57:28 2009 > New Revision: 40541 > > URL: http://svn.reactos.org/svn/reactos?rev=40541&view=rev > Log: > This is why we can't have nice things. Reverting r40536, r40537, due to RosBE differences between Windows and Linux hosts (because RosBE sucks) I don't think this is fair to the guys that have put a lot of hard work in to RosBE. -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

2 3

16 Apr '09

I called a feature freeze if you have not noticed. WBR, Aleksey Bragin. On Apr 16, 2009, at 6:27 AM, hyperion(a)svn.reactos.org wrote: > Author: hyperion > Date: Thu Apr 16 06:27:50 2009 > New Revision: 40538 > > URL: http://svn.reactos.org/svn/reactos?rev=40538&view=rev > Log: > Rbuild rationalization commit, umpteenth of infinite

2 1

Re: [ros-dev] [ros-diffs] General speech held by V?\195?\173ctor Mart?\195?\173nez (vicmarcal) and Javier Fernand?\195?\169z (elhoir) at Imagin?\195?\161tica 2009
by Colin Finck 16 Apr '09

16 Apr '09

> trunk/press-media/presentations/Imaginatica 2009/reactos_imaginatica.pptx Could we rather save such files as PPT? As far as I know, there is currently no loss in information if you save a file as PPT instead of PPTX in PowerPoint 2007. Furthermore, this makes it possible to open and edit such files with older PowerPoint versions or OpenOffice. Additionally, neither the PPTX import nor the ODP export (looking at the other Imaginatica presentation) of OpenOffice seem to work as reliable as the PPT import yet. Best regards, Colin

8 16

Re: [ros-dev] [ros-diffs] [sedwards] 40485: add telnet service, enable it by default
by Gabriel ilardi 15 Apr '09

15 Apr '09

This is a really nice feature, but why enabling it by default? XP SP3 default state is disabled. > Date: Mon, 13 Apr 2009 16:26:50 +0000 > To: ros-diffs(a)reactos.org > From: sedwards(a)svn.reactos.org > Subject: [ros-diffs] [sedwards] 40485: add telnet service, enable it by default > > Author: sedwards > Date: Mon Apr 13 20:26:49 2009 > New Revision: 40485 > > URL: http://svn.reactos.org/svn/reactos?rev=40485&view=rev > Log: > add telnet service, enable it by default > > Modified: > trunk/reactos/base/services/services.rbuild > trunk/reactos/base/services/telnetd/serviceentry.c > trunk/reactos/base/services/telnetd/telnetd.c > trunk/reactos/base/services/telnetd/telnetd.rbuild > trunk/reactos/boot/bootdata/hivesys_i386.inf > trunk/reactos/boot/bootdata/packages/reactos.dff > > Modified: trunk/reactos/base/services/services.rbuild > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/services.rbu… > ============================================================================== > --- trunk/reactos/base/services/services.rbuild [iso-8859-1] (original) > +++ trunk/reactos/base/services/services.rbuild [iso-8859-1] Mon Apr 13 20:26:49 2009 > @@ -22,6 +22,9 @@ > <directory name="tcpsvcs"> > <xi:include href="tcpsvcs/tcpsvcs.rbuild" /> > </directory> > + <directory name="telnetd"> > + <xi:include href="telnetd/telnetd.rbuild" /> > + </directory> > <directory name="umpnpmgr"> > <xi:include href="umpnpmgr/umpnpmgr.rbuild" /> > </directory> > > Modified: trunk/reactos/base/services/telnetd/serviceentry.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/telnetd/serv… > ============================================================================== > --- trunk/reactos/base/services/telnetd/serviceentry.c [iso-8859-1] (original) > +++ trunk/reactos/base/services/telnetd/serviceentry.c [iso-8859-1] Mon Apr 13 20:26:49 2009 > @@ -15,19 +15,15 @@ > * License along with this library; if not, write to the Free Software > * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA > */ > -#if 0 > + > #define WIN32_LEAN_AND_MEAN > > #include <windows.h> > +#include "wine/debug.h" > > -#define WINE_FIXME printf > -#define WINE_TRACE printf > +WINE_DEFAULT_DEBUG_CHANNEL(telnetd); > > -//#include "wine/debug.h" > - > -//WINE_DEFAULT_DEBUG_CHANNEL(spoolsv); > - > -static WCHAR telnetdW[] = {'T','e','l','n','e','t','D',0}; > +static WCHAR telnetdW[] = {'t','e','l','n','e','t','d',0}; > > static SERVICE_STATUS_HANDLE service_handle; > static HANDLE stop_event; > @@ -106,6 +102,5 @@ > StartServiceCtrlDispatcherW(servtbl); > return 0; > } > -#endif > /* EOF */ > > > Modified: trunk/reactos/base/services/telnetd/telnetd.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/telnetd/teln… > ============================================================================== > --- trunk/reactos/base/services/telnetd/telnetd.c [iso-8859-1] (original) > +++ trunk/reactos/base/services/telnetd/telnetd.c [iso-8859-1] Mon Apr 13 20:26:49 2009 > @@ -45,7 +45,7 @@ > * rename this function > * int kickoff_telnetd(void) > */ > -int main(int argc, char **argv) > +int kickoff_telnetd(void) > { > printf("Attempting to start Simple TelnetD\n"); > > > Modified: trunk/reactos/base/services/telnetd/telnetd.rbuild > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/telnetd/teln… > ============================================================================== > --- trunk/reactos/base/services/telnetd/telnetd.rbuild [iso-8859-1] (original) > +++ trunk/reactos/base/services/telnetd/telnetd.rbuild [iso-8859-1] Mon Apr 13 20:26:49 2009 > @@ -6,6 +6,7 @@ > <library>kernel32</library> > <library>advapi32</library> > <library>ws2_32</library> > + <library>wine</library> > > <file>telnetd.c</file> > <file>serviceentry.c</file> > > Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386… > ============================================================================== > --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) > +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Mon Apr 13 20:26:49 2009 > @@ -1061,6 +1061,15 @@ > HKLM,"SYSTEM\CurrentControlSet\Services\tcpsvcs","Start",0x00010001,0x00000003 > HKLM,"SYSTEM\CurrentControlSet\Services\tcpsvcs","Type",0x00010001,0x00000020 > > +; ReactOS Telnet Daemon > +HKLM,"SYSTEM\CurrentControlSet\Services\telnetd","Description",0x00000000,"ReactOS Telnet Daemon" > +HKLM,"SYSTEM\CurrentControlSet\Services\telnetd","DisplayName",0x00000000,"ReactOS Telnet Daemon" > +HKLM,"SYSTEM\CurrentControlSet\Services\telnetd","ErrorControl",0x00010001,0x00000001 > +HKLM,"SYSTEM\CurrentControlSet\Services\telnetd","Group",0x00000000,"Network" > +HKLM,"SYSTEM\CurrentControlSet\Services\telnetd","ImagePath",0x00020000,"%SystemRoot%\system32\telnetd.exe" > +HKLM,"SYSTEM\CurrentControlSet\Services\telnetd","Start",0x00010001,0x00000002 > +HKLM,"SYSTEM\CurrentControlSet\Services\telnetd","Type",0x00010001,0x00000020 > + > ; Sound Blaster (NT4) > ;HKLM,"SYSTEM\CurrentControlSet\Services\sndblst","Description",0x00000000,"Sound Blaster (NT4)" > ;HKLM,"SYSTEM\CurrentControlSet\Services\sndblst","ErrorControl",0x00010001,0x00000001 > > Modified: trunk/reactos/boot/bootdata/packages/reactos.dff > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… > ============================================================================== > --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) > +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Mon Apr 13 20:26:49 2009 > @@ -90,6 +90,7 @@ > base\services\rpcss\rpcss.exe 1 > base\services\spoolsv\spoolsv.exe 1 > base\services\tcpsvcs\tcpsvcs.exe 1 > +base\services\telnetd\telnetd.exe 1 > base\services\tcpsvcs\quotes 5 > base\services\umpnpmgr\umpnpmgr.exe 1 > base\services\wlansvc\wlansvc.exe 1 > _________________________________________________________________ Quante ne sai? Scoprilo con CrossWire! http://clk.atdmt.com/GBL/go/140630367/direct/01/

6 12

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-dev