Ros-diffs November 2005

ros-diffs@reactos.org

27 participants
875 discussions

[mbosma] 19152: I hope that this fixes all DDERR_SURFACELOST problems.

by mbosma＠svn.reactos.com

I hope that this fixes all DDERR_SURFACELOST problems. Modified: trunk/reactos/lib/ddraw/hal/ddraw_hal.c _____ Modified: trunk/reactos/lib/ddraw/hal/ddraw_hal.c --- trunk/reactos/lib/ddraw/hal/ddraw_hal.c 2005-11-11 21:50:33 UTC (rev 19151) +++ trunk/reactos/lib/ddraw/hal/ddraw_hal.c 2005-11-11 21:59:28 UTC (rev 19152) @@ -279,6 +279,9 @@ This->DirectDrawGlobal.lpDDCBtmp->HALDDMiscellaneous.GetAvailDriverMemor y(&mem); This->DirectDrawGlobal.ddCaps.dwVidMemFree = mem.dwFree; This->DirectDrawGlobal.ddCaps.dwVidMemTotal = mem.dwTotal; + + BOOL dummy = TRUE; + DdReenableDirectDrawObject(&This->DirectDrawGlobal, &dummy); /* Now all setup for HAL is done */ return DD_OK;

18 years, 10 months

[gedmurphy] 19151: -Start to convert tcpsvcs to a proper NT service. Supports starting and stopping via sc.exe (in windows, not working in ROS yet)

by gedmurphy＠svn.reactos.com

-Start to convert tcpsvcs to a proper NT service. Supports starting and stopping via sc.exe (in windows, not working in ROS yet) - use select to make accept non-blocking - Log all data to a log file in system32. This needs converting to the event logger at some time. - Add more error checking -A few bugs to iron out yet Modified: trunk/reactos/services/tcpsvcs/chargen.c Modified: trunk/reactos/services/tcpsvcs/daytime.c Modified: trunk/reactos/services/tcpsvcs/discard.c Modified: trunk/reactos/services/tcpsvcs/echo.c Modified: trunk/reactos/services/tcpsvcs/qotd.c Modified: trunk/reactos/services/tcpsvcs/skelserver.c Modified: trunk/reactos/services/tcpsvcs/tcpsvcs.c Modified: trunk/reactos/services/tcpsvcs/tcpsvcs.h _____ Modified: trunk/reactos/services/tcpsvcs/chargen.c --- trunk/reactos/services/tcpsvcs/chargen.c 2005-11-11 21:39:57 UTC (rev 19150) +++ trunk/reactos/services/tcpsvcs/chargen.c 2005-11-11 21:50:33 UTC (rev 19151) @@ -24,20 +24,20 @@ if (!GenerateChars(Sock)) { - _tprintf(_T("Char generation failed\n")); + LogEvent(_T("Chargen: Char generation failed\n"), 0, FALSE); RetVal = -1; } - _tprintf(_T("Shutting connection down...\n")); + LogEvent(_T("Chargen: Shutting connection down...\n"), 0, FALSE); if (ShutdownConnection(Sock, FALSE)) - _tprintf(_T("Connection is down.\n")); + LogEvent(_T("Chargen: Connection is down.\n"), 0, FALSE); else { - _tprintf(_T("Connection shutdown failed\n")); + LogEvent(_T("Chargen: Connection shutdown failed\n"), 0, FALSE); RetVal = -1; } - _tprintf(_T("Terminating chargen thread\n")); + LogEvent(_T("Chargen: Terminating thread\n"), 0, FALSE); ExitThread(RetVal); } @@ -108,7 +108,7 @@ { if (RetVal != LineSize) { - _tprintf(("Not sent enough\n")); + LogEvent(_T("Chargen: Not sent enough bytes\n"), 0, FALSE); return FALSE; } SentBytes += RetVal; @@ -116,13 +116,13 @@ } else if (RetVal == SOCKET_ERROR) { - _tprintf(("Socket error\n")); + LogEvent(_T("Chargen: Socket error\n"), 0, FALSE); return FALSE; } else - _tprintf(("unknown error\n")); + LogEvent(_T("Chargen: unknown error\n"), 0, FALSE); //WSAGetLastError() - _tprintf(("Connection closed by peer.\n")); + LogEvent(_T("Chargen: Connection closed by peer.\n"), 0, FALSE); return TRUE; } _____ Modified: trunk/reactos/services/tcpsvcs/daytime.c --- trunk/reactos/services/tcpsvcs/daytime.c 2005-11-11 21:39:57 UTC (rev 19150) +++ trunk/reactos/services/tcpsvcs/daytime.c 2005-11-11 21:50:33 UTC (rev 19151) @@ -32,16 +32,16 @@ SendTime(Sock, pszTime); - _tprintf(_T("Shutting connection down...\n")); + LogEvent(_T("DayTime: Shutting connection down...\n"), 0, FALSE); if (ShutdownConnection(Sock, FALSE)) - _tprintf(_T("Connection is down.\n")); + LogEvent(_T("DayTime: Connection is down.\n"), 0, FALSE); else { - _tprintf(_T("Connection shutdown failed\n")); + LogEvent(_T("DayTime: Connection shutdown failed\n"), 0, FALSE); RetVal = -1; } - _tprintf(_T("Terminating daytime thread\n")); + LogEvent(_T("DayTime: Terminating thread\n"), 0, FALSE); ExitThread(RetVal); } @@ -54,6 +54,6 @@ if (RetVal == SOCKET_ERROR) return FALSE; - _tprintf(("Connection closed by peer.\n")); + LogEvent(_T("DayTime: Connection closed by peer.\n"), 0, FALSE); return TRUE; } _____ Modified: trunk/reactos/services/tcpsvcs/discard.c --- trunk/reactos/services/tcpsvcs/discard.c 2005-11-11 21:39:57 UTC (rev 19150) +++ trunk/reactos/services/tcpsvcs/discard.c 2005-11-11 21:50:33 UTC (rev 19151) @@ -12,9 +12,6 @@ * */ -#include <stdio.h> -#include <winsock2.h> -#include <tchar.h> #include "tcpsvcs.h" DWORD WINAPI DiscardHandler(VOID* Sock_) @@ -24,22 +21,20 @@ if (!RecieveIncomingPackets(Sock)) { - _tprintf(_T("RecieveIncomingPackets failed\n")); + LogEvent(_T("Discard: RecieveIncomingPackets failed\n"), 0, FALSE); RetVal = -1; } - _tprintf(_T("Shutting connection down...\n")); + LogEvent(_T("Discard: Shutting connection down...\n"), 0, FALSE); if (ShutdownConnection(Sock, TRUE)) - { - _tprintf(_T("Connection is down.\n")); - } + LogEvent(_T("Discard: Connection is down.\n"), 0, FALSE); else { - _tprintf(_T("Connection shutdown failed\n")); + LogEvent(_T("Discard: Connection shutdown failed\n"), 0, FALSE); RetVal = -1; } - _tprintf(_T("Terminating discard thread\n")); + LogEvent(_T("Discard: Terminating thread\n"), 0, FALSE); ExitThread(RetVal); } @@ -48,20 +43,25 @@ BOOL RecieveIncomingPackets(SOCKET Sock) { TCHAR ReadBuffer[BUF]; + TCHAR temp[512]; // temp for holding LogEvent text INT ReadBytes; do { ReadBytes = recv(Sock, ReadBuffer, BUF, 0); if (ReadBytes > 0) - _tprintf(_T("Received %d bytes from client\n"), ReadBytes); + { + _stprintf(temp, _T("Received %d bytes from client\n"), ReadBytes); + LogEvent(temp, 0, FALSE); + } else if (ReadBytes == SOCKET_ERROR) { - _tprintf(("Socket Error: %d\n"), WSAGetLastError()); + _stprintf(temp, ("Socket Error: %d\n"), WSAGetLastError()); + LogEvent(temp, 0, TRUE); return FALSE; } } while (ReadBytes > 0); - _tprintf(("Connection closed by peer.\n")); + LogEvent(_T("Discard: Connection closed by peer.\n"), 0, FALSE); return TRUE; } _____ Modified: trunk/reactos/services/tcpsvcs/echo.c --- trunk/reactos/services/tcpsvcs/echo.c 2005-11-11 21:39:57 UTC (rev 19150) +++ trunk/reactos/services/tcpsvcs/echo.c 2005-11-11 21:50:33 UTC (rev 19151) @@ -12,9 +12,6 @@ * */ -#include <stdio.h> -#include <winsock2.h> -#include <tchar.h> #include "tcpsvcs.h" DWORD WINAPI EchoHandler(VOID* Sock_) @@ -23,21 +20,21 @@ SOCKET Sock = (SOCKET)Sock_; if (!EchoIncomingPackets(Sock)) { - _tprintf(_T("Echo incoming packets failed\n")); + LogEvent(_T("Echo: EchoIncomingPackets failed\n"), 0, FALSE); RetVal = -1; } - _tprintf(_T("Shutting connection down...\n")); - if (ShutdownConnection(Sock, TRUE)) { - _tprintf(_T("Connection is down.\n")); - } + LogEvent(_T("Echo: Shutting connection down...\n"), 0, FALSE); + + if (ShutdownConnection(Sock, TRUE)) + LogEvent(_T("Echo: Connection is down\n"), 0, FALSE); else { - _tprintf(_T("Connection shutdown failed\n")); + LogEvent(_T("Echo: Connection shutdown failed\n"), 0, FALSE); RetVal = -1; } - _tprintf(_T("Terminating echo thread\n")); + LogEvent(_T("Echo: Terminating thread\n"), 0, FALSE); ExitThread(RetVal); } @@ -46,6 +43,7 @@ BOOL EchoIncomingPackets(SOCKET Sock) { TCHAR ReadBuffer[BUF]; + TCHAR temp[512]; // temp for holding LogEvent text INT Temp; INT ReadBytes; INT SentBytes; @@ -54,7 +52,8 @@ ReadBytes = recv(Sock, ReadBuffer, BUF, 0); if (ReadBytes > 0) { - _tprintf(_T("Received %d bytes from client\n"), ReadBytes); + _stprintf(temp, _T("Received %d bytes from client\n"), ReadBytes); + LogEvent(temp, 0, FALSE); SentBytes = 0; while (SentBytes < ReadBytes) @@ -63,7 +62,8 @@ ReadBytes - SentBytes, 0); if (Temp > 0) { - _tprintf(_T("Sent %d bytes back to client\n"), Temp); + _stprintf(temp, _T("Sent %d bytes back to client\n"), Temp); + LogEvent(temp, 0, FALSE); SentBytes += Temp; } else if (Temp == SOCKET_ERROR) @@ -72,7 +72,8 @@ { /* Client closed connection before we could reply to all the data it sent, so quit early. */ - _tprintf(_T("Peer unexpectedly dropped connection!\n")); + _stprintf(temp, _T("Peer unexpectedly dropped connection!\n")); + LogEvent(temp, 0, FALSE); return FALSE; } } @@ -82,6 +83,6 @@ } while (ReadBytes != 0); - _tprintf(("Connection closed by peer.\n")); + LogEvent(_T("Echo: Connection closed by peer.\n"), 0, FALSE); return TRUE; } _____ Modified: trunk/reactos/services/tcpsvcs/qotd.c --- trunk/reactos/services/tcpsvcs/qotd.c 2005-11-11 21:39:57 UTC (rev 19150) +++ trunk/reactos/services/tcpsvcs/qotd.c 2005-11-11 21:50:33 UTC (rev 19151) @@ -19,7 +19,6 @@ #include "tcpsvcs.h" #define QBUFSIZ 160 -#define NUMQUOTES 60 LPCTSTR FilePath = _T("\\drivers\\etc\\quotes"); @@ -28,51 +27,55 @@ FILE *fp; SOCKET Sock; TCHAR Sys[MAX_PATH]; - TCHAR Quote[NUMQUOTES][BUFSIZ]; // need to set this dynamically + TCHAR Quote[60][BUFSIZ]; // need to set this dynamically INT QuoteToPrint; - INT i = 0; + INT NumQuotes; Sock = (SOCKET)Sock_; if(! GetSystemDirectory(Sys, MAX_PATH)) - _tprintf(_T("Getting system path failed. Error: %lu\n"), GetLastError()); + { + LogEvent(_T("QOTD: Getting system path failed.\n"), 0, TRUE); + ExitThread(-1); + } _tcscat(Sys, FilePath); - _tprintf(_T("Opening quotes file\n")); + LogEvent(_T("QOTD: Opening quotes file\n"), 0, FALSE); if ((fp = _tfopen(Sys, "r")) == NULL) { - _tprintf(_T("Error opening file: %lu\n"), GetLastError()); - _tprintf(_T("Terminating qotd thread\n")); + LogEvent(_T("QOTD: Error opening quote file\n"), 0, TRUE); + LogEvent(_T("QOTD: Terminating thread\n"), 0, FALSE); ExitThread(-1); } - while (_fgetts(Quote[i], QBUFSIZ, fp) != NULL) - i++; + /* read all quotes in the file into an array */ + NumQuotes = 0; + while (_fgetts(Quote[NumQuotes], QBUFSIZ, fp) != NULL) + NumQuotes++; - _tprintf(_T("Closing quotes file\n")); + LogEvent(_T("QOTD: Closing quotes file\n"), 0, FALSE); fclose(fp); /* randomise the quote */ srand((unsigned int) time(0)); - QuoteToPrint = rand() % NUMQUOTES; + QuoteToPrint = rand() % NumQuotes; if (!SendQuote(Sock, Quote[QuoteToPrint])) - { - _tprintf(_T("Error sending data. Error: %x\n"), WSAGetLastError()); - } + LogEvent(_T("QOTD: Error sending data\n"), 0, TRUE); - _tprintf(_T("Shutting connection down...\n")); + + LogEvent(_T("QOTD: Shutting connection down...\n"), 0, FALSE); if (ShutdownConnection(Sock, FALSE)) - _tprintf(_T("Connection is down.\n")); + LogEvent(_T("QOTD: Connection is down\n"), 0, FALSE); else { - _tprintf(_T("Connection shutdown failed\n")); - _tprintf(_T("Terminating qotd thread\n")); + LogEvent(_T("QOTD: Connection shutdown failed\n"), 0, FALSE); + LogEvent(_T("QOTD: Terminating thread\n"), 0, FALSE); ExitThread(-1); } - _tprintf(_T("Terminating qotd thread\n")); + LogEvent(_T("QOTD: Terminating thread\n"), 0, FALSE); ExitThread(0); //return Retval; @@ -90,6 +93,6 @@ if (RetVal == SOCKET_ERROR) return FALSE; - _tprintf(("Connection closed by peer.\n")); + LogEvent(_T("QOTD: Connection closed by peer\n"), 0, FALSE); return TRUE; } _____ Modified: trunk/reactos/services/tcpsvcs/skelserver.c --- trunk/reactos/services/tcpsvcs/skelserver.c 2005-11-11 21:39:57 UTC (rev 19150) +++ trunk/reactos/services/tcpsvcs/skelserver.c 2005-11-11 21:50:33 UTC (rev 19151) @@ -12,36 +12,35 @@ * */ -#include <stdio.h> -#include <winsock2.h> -#include <tchar.h> #include "tcpsvcs.h" +extern BOOL bShutDownFlag; +extern BOOL bPauseFlag; + DWORD WINAPI StartServer(LPVOID lpParam) { SOCKET ListeningSocket; + PSERVICES pServices; const TCHAR* HostIP = "127.0.0.1"; - PSERVICES pServices; + TCHAR temp[512]; pServices = (PSERVICES)lpParam; - + +//DebugBreak(); ListeningSocket = SetUpListener(HostIP, htons(pServices->Port)); if (ListeningSocket == INVALID_SOCKET) { - _tprintf(_T("error setting up socket\n")); + LogEvent("Socket error when setting up listener", 0, TRUE); return 3; } - _tprintf(_T("%s is waiting for connections on port %d...\n"), + _stprintf(temp, _T("%s is waiting for connections on port %d...\n"), pServices->Name, pServices->Port); - while (1) - { - AcceptConnections(ListeningSocket, pServices->Service, pServices->Name); - printf("Acceptor restarting...\n"); - } + LogEvent(temp, 0, FALSE); - /* won't see this yet as we kill the service with ctrl+c */ - _tprintf(_T("Detaching Winsock2...\n")); + AcceptConnections(ListeningSocket, pServices->Service, pServices->Name); + + LogEvent(_T("Detaching Winsock2...\n"), 0, FALSE); WSACleanup(); return 0; } @@ -64,49 +63,98 @@ return Sock; } else - printf("bind() failed\n"); + LogEvent(_T("bind() failed\n"), 0, TRUE); } return INVALID_SOCKET; } +/* note: consider allowing a maximum number of connections + * A number of threads can be allocated and worker threads will + * only be spawned if a free space is available + +typedef struct _WORKER_THREAD { + DWORD num; + BOOL available; + HANDLE hThread; +} WORKER_THREAD; +*/ - VOID AcceptConnections(SOCKET ListeningSocket, LPTHREAD_START_ROUTINE Service, TCHAR *Name) { SOCKADDR_IN Client; SOCKET Sock; + HANDLE hThread; + TIMEVAL TimeVal; + FD_SET ReadFDS; INT nAddrSize = sizeof(Client); DWORD ThreadID; + TCHAR temp[512]; + INT TimeOut = 2000; // 2 seconds - while (1) +//DebugBreak(); + /* monitor for incomming connections */ + FD_ZERO(&ReadFDS); + + /* set timeout values */ + TimeVal.tv_sec = TimeOut / 1000; + TimeVal.tv_usec = TimeOut % 1000; + + while (! bShutDownFlag) // (i<MAX_CLIENTS && !bShutDownFlag) { - Sock = accept(ListeningSocket, (SOCKADDR*)&Client, &nAddrSize); - if (Sock != INVALID_SOCKET) + FD_SET(ListeningSocket, &ReadFDS); + if (select(0, &ReadFDS, NULL, NULL, &TimeVal) == SOCKET_ERROR) { - _tprintf(_T("Accepted connection to %s server from %s:%d\n"), - Name, inet_ntoa(Client.sin_addr), ntohs(Client.sin_port)); - _tprintf(_T("Creating new thread for %s\n"), Name); - CreateThread(0, 0, Service, (void*)Sock, 0, &ThreadID); + LogEvent(_T("select failed\n"), 0, TRUE); + return; } - else + + if (FD_ISSET(ListeningSocket, &ReadFDS)) { - _tprintf(_T("accept() failed\n")); - return; + Sock = accept(ListeningSocket, (SOCKADDR*)&Client, &nAddrSize); + if (Sock != INVALID_SOCKET) + { + _stprintf(temp, _T("Accepted connection to %s server from %s:%d\n"), + Name, inet_ntoa(Client.sin_addr), ntohs(Client.sin_port)); + LogEvent(temp, 0, FALSE); + _stprintf(temp, _T("Creating new thread for %s\n"), Name); + LogEvent(temp, 0, FALSE); + + hThread = CreateThread(0, 0, Service, (void*)Sock, 0, &ThreadID); + + /* Check the return value for success. */ + if (hThread == NULL) + { + _stprintf(temp, _T("Failed to start worker thread for " + "the %s server....\n"), Name); + LogEvent(temp, 0, TRUE); + } + + //Do we need to wait, or just kill it? + WaitForSingleObject(hThread, INFINITE); + + } + else + { + LogEvent(_T("accept failed\n"), 0, TRUE); + return; + } } } } BOOL ShutdownConnection(SOCKET Sock, BOOL bRec) { + TCHAR temp[512]; + /* Disallow any further data sends. This will tell the other side that we want to go away now. If we skip this step, we don't shut the connection down nicely. */ if (shutdown(Sock, SD_SEND) == SOCKET_ERROR) { - _tprintf(_T("Error in shutdown")); + LogEvent(_T("Error in shutdown()\n"), 0, TRUE); return FALSE; } @@ -122,7 +170,10 @@ if (NewBytes == SOCKET_ERROR) return FALSE; else if (NewBytes != 0) - _tprintf(_T("FYI, received %d unexpected bytes during shutdown\n"), NewBytes); + { + _stprintf(temp, _T("FYI, received %d unexpected bytes during shutdown\n"), NewBytes); + LogEvent(temp, 0, FALSE); + } } /* Close the socket. */ _____ Modified: trunk/reactos/services/tcpsvcs/tcpsvcs.c --- trunk/reactos/services/tcpsvcs/tcpsvcs.c 2005-11-11 21:39:57 UTC (rev 19150) +++ trunk/reactos/services/tcpsvcs/tcpsvcs.c 2005-11-11 21:50:33 UTC (rev 19151) @@ -15,32 +15,31 @@ * TODO: * - Start tcpsvcs as a service. * - write debugging function and print all dbg info via that. - * + * - change 'temp' to something meaningfull */ -#include <stdio.h> -#include <winsock2.h> -#include <tchar.h> + #include "tcpsvcs.h" -#if 0 +//#define NDEBUG +//#include <debug.h> + + /* * globals */ +VOID WINAPI ServiceMain(DWORD argc, LPTSTR argv[]); + static SERVICE_STATUS hServStatus; static SERVICE_STATUS_HANDLE hSStat; + FILE *hLogFile; -BOOL bLogEvents = TRUE; -BOOL ShutDown, PauseFlag; -LPCTSTR LogFileName = "tcpsvcs_log.log"; +BOOL bShutDownFlag = FALSE; +BOOL bPauseFlag = FALSE; -static SERVICE_TABLE_ENTRY -ServiceTable[2] = -{ - {_T("tcpsvcs"), ServiceMain}, - {NULL, NULL} -}; -#endif +LPCTSTR LogFileName = "\\tcpsvcs_log.log"; +LPTSTR ServiceName = _T("Simp Tcp"); +//LPTSTR DisplayName = _T("Simple TCP/IP Services"); static SERVICES Services[NUM_SERVICES] = @@ -53,79 +52,46 @@ }; -int main(void) -{ - DWORD dwThreadId[NUM_SERVICES]; - HANDLE hThread[NUM_SERVICES]; - WSADATA wsaData; - DWORD RetVal; - INT i; - - if ((RetVal = WSAStartup(MAKEWORD(2, 2), &wsaData)) != 0) - { - _tprintf(_T("WSAStartup() failed : %lu\n"), RetVal); - return -1; - } - - /* Create MAX_THREADS worker threads. */ - for( i=0; i<NUM_SERVICES; i++ ) - { - _tprintf(_T("Starting %s server....\n"), Services[i].Name); - - hThread[i] = CreateThread( - NULL, // default security attributes - 0, // use default stack size - StartServer, // thread function - &Services[i], // argument to thread function - 0, // use default creation flags - &dwThreadId[i]); // returns the thread identifier - - /* Check the return value for success. */ - if (hThread[i] == NULL) - { - _tprintf(_T("Failed to start %s server....\n"), Services[i].Name); - //ExitProcess(i); - } - } - - /* Wait until all threads have terminated. */ - WaitForMultipleObjects(NUM_SERVICES, hThread, TRUE, INFINITE); - - /* Close all thread handles upon completion. */ - for(i=0; i<NUM_SERVICES; i++) - { - CloseHandle(hThread[i]); - } - return 0; -} - - - -/* code to run tcpsvcs as a service through services.msc */ -#if 0 int main(int argc, char *argv[]) { - //DPRINT("tcpsvcs: main() started. See tcpsvcs_log.txt for info\n"); + SERVICE_TABLE_ENTRY ServiceTable[] = + { + {ServiceName, ServiceMain}, + {NULL, NULL} + }; + + //DPRINT("Starting tcpsvcs service. See \system32%s for logs\n", LogFileName); - if (!StartServiceCtrlDispatcher(ServiceTable)) - _tprintf(_T("failed to start the service control dispatcher\n")); + if (! StartServiceCtrlDispatcher(ServiceTable)) + LogEvent(_T("failed to start the service control dispatcher\n"), -1, TRUE); - //DPRINT("tcpsvcs: main() done\n"); + //DPRINT("Shutdown tcpsvcs service\n"); return 0; } -static VOID WINAPI +VOID WINAPI ServiceMain(DWORD argc, LPTSTR argv[]) { - DWORD i; + TCHAR LogFilePath[MAX_PATH]; - hLogFile = fopen(LogFileName, _T("w+")); - if (hLogFile == NULL) + if(! GetSystemDirectory(LogFilePath, MAX_PATH)) return; + + _tcscat(LogFilePath, LogFileName); + + hLogFile = fopen(LogFilePath, _T("w")); + if (hLogFile == NULL) + { + TCHAR *temp = NULL; + _stprintf(temp, _T("Could not open log file: %s"), LogFilePath); + MessageBox(NULL, temp, NULL, MB_OK); + return; + } + LogEvent(_T("Entering ServiceMain"), 0, FALSE); hServStatus.dwServiceType = SERVICE_WIN32_OWN_PROCESS; @@ -133,13 +99,13 @@ hServStatus.dwControlsAccepted = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN | SERVICE_ACCEPT_PAUSE_CONTINUE; hServStatus.dwWin32ExitCode = ERROR_SERVICE_SPECIFIC_ERROR; - hServStatus.dwServiceSpecificExitCode = 0; + hServStatus.dwServiceSpecificExitCode = NO_ERROR; hServStatus.dwCheckPoint = 0; hServStatus.dwWaitHint = 2*CS_TIMEOUT; - hSStat = RegisterServiceCtrlHandler("tcpsvcs", ServerCtrlHandler); + hSStat = RegisterServiceCtrlHandler(ServiceName, ServerCtrlHandler); if (hSStat == 0) - LogEvent(_T("Failed to register service\n"), 100, TRUE); + LogEvent(_T("Failed to register service\n"), -1, TRUE); LogEvent(_T("Control handler registered successfully"), 0, FALSE); SetServiceStatus (hSStat, &hServStatus); @@ -158,6 +124,7 @@ completes, indicating system shutdown. */ UpdateStatus (SERVICE_STOPPED, 0); LogEvent(_T("Service status set to SERVICE_STOPPED"), 0, FALSE); + LogEvent(_T("Leaving ServiceMain"), 0, FALSE); fclose(hLogFile); /* Clean up everything, in general */ return; @@ -170,14 +137,14 @@ { case SERVICE_CONTROL_SHUTDOWN: /* fall through */ case SERVICE_CONTROL_STOP: - ShutDown = TRUE; + bShutDownFlag = TRUE; UpdateStatus(SERVICE_STOP_PENDING, -1); break; case SERVICE_CONTROL_PAUSE: - PauseFlag = TRUE; + bPauseFlag = TRUE; break; case SERVICE_CONTROL_CONTINUE: - PauseFlag = FALSE; + bPauseFlag = FALSE; break; case SERVICE_CONTROL_INTERROGATE: break; @@ -193,11 +160,17 @@ void UpdateStatus (int NewStatus, int Check) /* Set a new service status and checkpoint (either specific value or increment) */ { - if (Check < 0 ) hServStatus.dwCheckPoint++; - else hServStatus.dwCheckPoint = Check; - if (NewStatus >= 0) hServStatus.dwCurrentState = NewStatus; - if (!SetServiceStatus (hSStat, &hServStatus)) - LogEvent (_T("Cannot set service status"), 101, TRUE); + if (Check < 0 ) + hServStatus.dwCheckPoint++; + else + hServStatus.dwCheckPoint = Check; + + if (NewStatus >= 0) + hServStatus.dwCurrentState = NewStatus; + + if (! SetServiceStatus (hSStat, &hServStatus)) + LogEvent(_T("Cannot set service status"), -1, TRUE); + return; } @@ -206,14 +179,27 @@ { DWORD dwThreadId[NUM_SERVICES]; HANDLE hThread[NUM_SERVICES]; + WSADATA wsaData; + TCHAR temp[512]; // temp for holding LogEvent text INT i; + DWORD RetVal; + if ((RetVal = WSAStartup(MAKEWORD(2, 2), &wsaData)) != 0) + { + _stprintf(temp, _T("WSAStartup() failed : %lu\n"), RetVal); + LogEvent(temp, RetVal, TRUE); + return -1; + } + UpdateStatus(-1, -1); /* increment checkpoint */ + LogEvent(_T("Creating server Threads\n"), 0, FALSE); + /* Create MAX_THREADS worker threads. */ for( i=0; i<NUM_SERVICES; i++ ) { - _tprintf(_T("Starting %s server....\n"), Services[i].Name); + _stprintf(temp, _T("Starting %s server....\n"), Services[i].Name); + LogEvent(temp, 0, FALSE); hThread[i] = CreateThread( NULL, // default security attributes @@ -226,11 +212,18 @@ /* Check the return value for success. */ if (hThread[i] == NULL) { - _tprintf(_T("Failed to start %s server....\n"), Services[i].Name); + _stprintf(temp, _T("Failed to start %s server....\n"), Services[i].Name); + /* don't exit process via LogEvent. We want to exit via the server + * which failed to start, which could mean i=0 */ + LogEvent(temp, 0, TRUE); ExitProcess(i); } } + + LogEvent(_T("setting service status to running\n"), 0, FALSE); + UpdateStatus(SERVICE_RUNNING, 0); + /* Wait until all threads have terminated. */ WaitForMultipleObjects(NUM_SERVICES, hThread, TRUE, INFINITE); @@ -254,26 +247,27 @@ LPTSTR lpvSysMsg; TCHAR MessageBuffer[512]; - if (PrintErrorMsg) { + if (PrintErrorMsg) + { eMsgLen = FormatMessage (FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL, ErrNum, MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT), (LPTSTR)&lpvSysMsg, 0, NULL); - _stprintf (MessageBuffer, _T("\n%s %s ErrNum = %d. ExitCode = %d."), + _stprintf(MessageBuffer, _T("\n%s %s ErrNum = %lu. ExitCode = %lu."), UserMessage, lpvSysMsg, ErrNum, ExitCode); - HeapFree (GetProcessHeap (), 0, lpvSysMsg); - } else { - _stprintf (MessageBuffer, _T("\n%s ExitCode = %d."), + HeapFree(GetProcessHeap (), 0, lpvSysMsg); + } + else + { + _stprintf(MessageBuffer, _T("\n%s ExitCode = %lu."), UserMessage, ExitCode); } fputs (MessageBuffer, hLogFile); - if (ExitCode > 0) - ExitProcess (ExitCode); + if (ExitCode != 0) + ExitProcess(ExitCode); else return; } - -#endif _____ Modified: trunk/reactos/services/tcpsvcs/tcpsvcs.h --- trunk/reactos/services/tcpsvcs/tcpsvcs.h 2005-11-11 21:39:57 UTC (rev 19150) +++ trunk/reactos/services/tcpsvcs/tcpsvcs.h 2005-11-11 21:50:33 UTC (rev 19151) @@ -12,6 +12,14 @@ * */ +#define WIN32_LEAN_AND_MEAN +#include <stdio.h> +#include <winsock2.h> +#include <tchar.h> + +#define UNICODE +#define _UNICODE + /* default port numbers */ #define ECHO_PORT 7 #define DISCARD_PORT 9 @@ -41,7 +49,6 @@ LPTHREAD_START_ROUTINE Service; } SERVICES, *PSERVICES; - /* tcpsvcs functions */ //static VOID WINAPI ServiceMain(DWORD argc, LPTSTR argv[]); VOID WINAPI ServerCtrlHandler(DWORD control);

18 years, 10 months

[gvg] 19150: The GroupOrder registry value should start with a ULONG containing the number

by gvg＠svn.reactos.com

The GroupOrder registry value should start with a ULONG containing the number of entries following it. Modified: trunk/reactos/lib/setupapi/install.c _____ Modified: trunk/reactos/lib/setupapi/install.c --- trunk/reactos/lib/setupapi/install.c 2005-11-11 21:30:55 UTC (rev 19149) +++ trunk/reactos/lib/setupapi/install.c 2005-11-11 21:39:57 UTC (rev 19150) @@ -1212,7 +1212,7 @@ } rc = RegQueryValueExW(hGroupOrderListKey, lpLoadOrderGroup, NULL, &dwRegType, NULL, &bufferSize); if (rc == ERROR_FILE_NOT_FOUND) - bufferSize = 0; + bufferSize = sizeof(DWORD); else if (rc != ERROR_SUCCESS) { SetLastError(rc); @@ -1246,10 +1246,17 @@ goto cleanup; } } + else + { + GroupOrder[0] = 0; + } if (flags & SPSVCINST_TAGTOFRONT) - GroupOrder[0] = tagId; + GroupOrder[1] = tagId; else + { + GroupOrder[0]++; GroupOrder[bufferSize / sizeof(DWORD)] = tagId; + } rc = RegSetValueExW( hGroupOrderListKey,

18 years, 10 months

[sedwards] 19149: add window selection and picking utils from cxtest for Art's regression tests

by sedwards＠svn.reactos.com

add window selection and picking utils from cxtest for Art's regression tests Added: trunk/rosapps/tests/wclickat/ Added: trunk/rosapps/tests/wclickat/wclickat.c Added: trunk/rosapps/tests/wpickclick/ Added: trunk/rosapps/tests/wpickclick/wpickclick.c _____ Added: trunk/rosapps/tests/wclickat/wclickat.c --- trunk/rosapps/tests/wclickat/wclickat.c 2005-11-11 21:12:13 UTC (rev 19148) +++ trunk/rosapps/tests/wclickat/wclickat.c 2005-11-11 21:30:55 UTC (rev 19149) @@ -0,0 +1,686 @@ +/*--------------------------------------------------------------------- ------- +** wclickat.c +** Utilty to send clicks to Wine Windows +** +** See usage() for usage instructions. +** +**--------------------------------------------------------------------- ------ +** Copyright 2004 Jozef Stefanka for CodeWeavers, Inc. +** Copyright 2005 Dmitry Timoshkov for CodeWeavers, Inc. +** Copyright 2005 Francois Gouget for CodeWeavers, Inc. +** +** 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 +** +**--------------------------------------------------------------------- -----*/ + + +#include <windows.h> +#include <windowsx.h> +#include <stdio.h> +#include <ctype.h> + + +#define APP_NAME "wclickat" +#define DEFAULT_DELAY 500 +#define DEFAULT_REPEAT 1000 + +#define ARRAY_LENGTH(array) (sizeof(array)/sizeof((array)[0])) + +static const WCHAR STATIC_CLASS[]={'s','t','a','t','i','c','\0'}; + +/*--------------------------------------------------------------------- ------- +** Global variables +**--------------------------------------------------------------------- -----*/ + +#define RC_RUNNING -1 +#define RC_SUCCESS 0 +#define RC_INVALID_ARGUMENTS 1 +#define RC_NODISPLAY 2 +#define RC_TIMEOUT 3 +static int status; + +typedef enum +{ + ACTION_INVALID, + ACTION_FIND, + ACTION_LCLICK, + ACTION_MCLICK, + ACTION_RCLICK +} action_type; +static action_type g_action = ACTION_INVALID; + +static WCHAR* g_window_class = NULL; +static WCHAR* g_window_title = NULL; +static long g_control_id = 0; +static WCHAR* g_control_class = NULL; +static WCHAR* g_control_caption = NULL; +static long g_x = -1; +static long g_y = -1; +static long g_dragto_x = -1; +static long g_dragto_y = -1; +static long g_disabled = 0; + +static long g_delay = DEFAULT_DELAY; +static long g_timeout = 0; +static long g_repeat = 0; +static long g_untildeath = 0; +static UINT timer_id; + + +/* + * Provide some basic debugging support. + */ +#ifdef __GNUC__ +#define __PRINTF_ATTR(fmt,args) __attribute__((format (printf,fmt,args))) +#else +#define __PRINTF_ATTR(fmt,args) +#endif +static int debug_on=0; +static int init_debug() +{ + char* str=getenv("CXTEST_DEBUG"); + if (str && strstr(str, "+wclickat")) + debug_on=1; + return debug_on; +} + +static void cxlog(const char* format, ...) __PRINTF_ATTR(1,2); +static void cxlog(const char* format, ...) +{ + va_list valist; + + if (debug_on) + { + va_start(valist, format); + vfprintf(stderr, format, valist); + va_end(valist); + } +} + +/*--------------------------------------------------------------------- ------- +** usage +**--------------------------------------------------------------------- -----*/ +static void usage(void) +{ + fprintf(stderr, "%s - Utility to send clicks to Wine Windows.\n", APP_NAME); + fprintf(stderr, "----------------------------------------------\n"); + fprintf(stderr, "Usage:\n"); + fprintf(stderr, " %s action --winclass class --wintitle title [--timeout ms]\n",APP_NAME); + fprintf(stderr, " %*.*s [--ctrlclas class] [--ctrlcaption caption] [--ctrlid id]\n", strlen(APP_NAME) + 3, strlen(APP_NAME) + 3, ""); + fprintf(stderr, " %*.*s [--position XxY] [--delay ms] [--untildeath] [--repeat ms]\n", strlen(APP_NAME) + 3, strlen(APP_NAME) + 3, ""); + fprintf(stderr, "Where action can be one of:\n"); + fprintf(stderr, " find Find the specified window or control\n"); + fprintf(stderr, " button<n> Send a click with the given X button number\n"); + fprintf(stderr, " click|lclick Synonym for button1 (left click)\n"); + fprintf(stderr, " mclick Synonym for button2 (middle click)\n"); + fprintf(stderr, " rclick Synonym for button3 (right click)\n"); + fprintf(stderr, "\n"); + fprintf(stderr, "The options are as follows:\n"); + fprintf(stderr, " --timeout ms How long to wait before failing with a code of %d\n", RC_TIMEOUT); + fprintf(stderr, " --winclass class Class name of the top-level window of interest\n"); + fprintf(stderr, " --wintitle title Title of the top-level window of interest\n"); + fprintf(stderr, " --ctrlclass name Class name of the control of interest, if any\n"); + fprintf(stderr, " --ctrlcaption cap A substring of the control's caption\n"); + fprintf(stderr, " --ctrlid id Id of the control\n"); + fprintf(stderr, " --position XxY Coordinates for the click, relative to the window / control\n"); + fprintf(stderr, " --dragto If given, then position specifies start click, and\n"); + fprintf(stderr, " dragto specifies release coords.\n"); + fprintf(stderr, " --allow-disabled Match the window or control even hidden or disabled\n"); + fprintf(stderr, " --delay ms Wait ms milliseconds before clicking. The default is %d\n", DEFAULT_DELAY); + fprintf(stderr, " --untildeath Wait until the window disappears\n"); + fprintf(stderr, " --repeat ms Click every ms milliseconds. The default is %d\n", DEFAULT_REPEAT); + fprintf(stderr, "\n"); + fprintf(stderr, "%s returns %d on success\n", APP_NAME, RC_SUCCESS); + fprintf(stderr, "\n"); + fprintf(stderr, "Environment variable overrides:\n"); + fprintf(stderr, " CXTEST_TIME_MULTIPLE Specifies a floating multiplier applied to any\n"); + fprintf(stderr, " delay and timeout parameters.\n"); +} + +static const WCHAR* my_strstriW(const WCHAR* haystack, const WCHAR* needle) +{ + const WCHAR *h,*n; + WCHAR first; + + if (!*needle) + return haystack; + + /* Special case the first character because + * we will be doing a lot of comparisons with it. + */ + first=towlower(*needle); + needle++; + while (*haystack) + { + while (towlower(*haystack)!=first && *haystack) + haystack++; + + h=haystack+1; + n=needle; + while (towlower(*h)==towlower(*n) && *h) + { + h++; + n++; + } + if (!*n) + return haystack; + haystack++; + } + return NULL; +} + +static BOOL CALLBACK find_control(HWND hwnd, LPARAM lParam) +{ + WCHAR str[1024]; + HWND* pcontrol; + + if (!GetClassNameW(hwnd, str, ARRAY_LENGTH(str)) || + lstrcmpiW(str, g_control_class)) + return TRUE; + + if (g_control_caption) + { + if (!GetWindowTextW(hwnd, str, ARRAY_LENGTH(str)) || + !my_strstriW(str, g_control_caption)) + return TRUE; + } + if (g_control_id && g_control_id != GetWindowLong(hwnd, GWL_ID)) + return TRUE; + + /* Check that the control is visible and active */ + if (!g_disabled) + { + DWORD style = GetWindowStyle(hwnd); + if (!(style & WS_VISIBLE) || (style & WS_DISABLED)) + return TRUE; + } + + pcontrol = (HWND*)lParam; + *pcontrol = hwnd; + return FALSE; +} + +static BOOL CALLBACK find_top_window(HWND hwnd, LPARAM lParam) +{ + WCHAR str[1024]; + HWND* pwindow; + + if (!GetClassNameW(hwnd, str, ARRAY_LENGTH(str)) || + lstrcmpiW(str, g_window_class)) + return TRUE; + + if (!GetWindowTextW(hwnd, str, ARRAY_LENGTH(str)) || + lstrcmpiW(str, g_window_title)) + return TRUE; + + /* Check that the window is visible and active */ + if (!g_disabled) + { + DWORD style = GetWindowStyle(hwnd); + if (!(style & WS_VISIBLE) || (style & WS_DISABLED)) + return TRUE; + } + + /* See if we find the control we want */ + if (g_control_class) + { + HWND control = NULL; + EnumChildWindows(hwnd, find_control, (LPARAM)&control); + if (!control) + return TRUE; + hwnd=control; + } + + pwindow = (HWND*)lParam; + *pwindow = hwnd; + return FALSE; +} + +static HWND find_window() +{ + HWND hwnd; + + hwnd=NULL; + EnumWindows(find_top_window, (LPARAM)&hwnd); + return hwnd; +} + +static void do_click(HWND window, DWORD down, DWORD up) +{ + WINDOWINFO window_info; + long x, y; + + SetForegroundWindow(GetParent(window)); + window_info.cbSize=sizeof(window_info); + GetWindowInfo(window, &window_info); + + /* The calculations below convert the coordinates so they are absolute + * screen coordinates in 'Mickeys' as required by mouse_event. + * In mickeys the screen size is always 65535x65535. + */ + x=window_info.rcWindow.left+g_x; + if (x<window_info.rcWindow.left || x>=window_info.rcWindow.right) + x=(window_info.rcWindow.right+window_info.rcWindow.left)/2; + x=(x << 16)/GetSystemMetrics(SM_CXSCREEN); + + y=window_info.rcWindow.top+g_y; + if (y<window_info.rcWindow.top || y>=window_info.rcWindow.bottom) + y=(window_info.rcWindow.bottom+window_info.rcWindow.top)/2; + y=(y << 16)/GetSystemMetrics(SM_CYSCREEN); + + mouse_event(MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_MOVE, x, y, 0, 0); + if (down) { + mouse_event(MOUSEEVENTF_ABSOLUTE | down, x, y, 0, 0); + if ((g_dragto_x > 0) && (g_dragto_y > 0)) { + int i; + long dx, dy; + long step_per_x, step_per_y; + long dragto_x, dragto_y; + + dragto_x=window_info.rcWindow.left+g_dragto_x; + if (dragto_x<window_info.rcWindow.left || dragto_x>=window_info.rcWindow.right) + dragto_x=(window_info.rcWindow.right+window_info.rcWindow.left)/2; + dragto_x=(dragto_x << 16)/GetSystemMetrics(SM_CXSCREEN); + + dragto_y=window_info.rcWindow.top+g_dragto_y; + if (dragto_y<window_info.rcWindow.top || dragto_y>=window_info.rcWindow.bottom) + dragto_y=(window_info.rcWindow.bottom+window_info.rcWindow.top)/2; + dragto_y=(dragto_y << 16)/GetSystemMetrics(SM_CYSCREEN); + + dx = g_dragto_x - g_x; + dy = g_dragto_y - g_y; + step_per_x = dx / 4; + step_per_y = dy / 4; + for (i = 0; i < 4; i++) { + mouse_event(MOUSEEVENTF_MOVE, step_per_x, step_per_y, 0, 0); + } + x=dragto_x; + y=dragto_y; + } + } + if (up) + mouse_event(MOUSEEVENTF_ABSOLUTE | up, x, y, 0, 0); +} + +static void CALLBACK ClickProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime) +{ + HWND window = find_window(); + + if (!window) + { + if (g_untildeath) + { + /* FIXME: The window / control might just be disabled and if + * that's the case we should not exit yet. But I don't expect + * --untildeath to be used at all anyway so fixing this can + * wait until it becomes necessary. + */ + status=RC_SUCCESS; + } + else + cxlog("The window has disappeared!\n"); + return; + } + + switch (g_action) + { + case ACTION_FIND: + /* Nothing to do */ + break; + case ACTION_LCLICK: + cxlog("Sending left click\n"); + do_click(window, MOUSEEVENTF_LEFTDOWN, MOUSEEVENTF_LEFTUP); + break; + case ACTION_MCLICK: + cxlog("Sending middle click\n"); + do_click(window, MOUSEEVENTF_MIDDLEDOWN, MOUSEEVENTF_MIDDLEUP); + break; + case ACTION_RCLICK: + cxlog("Sending right click\n"); + do_click(window, MOUSEEVENTF_RIGHTDOWN, MOUSEEVENTF_RIGHTUP); + default: + fprintf(stderr, "error: unknown action %d\n", g_action); + break; + } + if (!g_repeat) + status=RC_SUCCESS; +} + +static void CALLBACK DelayProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime) +{ + KillTimer(NULL, timer_id); + timer_id=0; + if (g_repeat) + { + cxlog("Setting up a timer for --repeat\n"); + timer_id=SetTimer(NULL, 0, g_repeat, ClickProc); + } + + ClickProc(NULL, 0, 0, 0); +} + +static void CALLBACK FindWindowProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime) +{ + HWND window = find_window(); + if (!window) + return; + + cxlog("Found the window\n"); + if (g_delay) + { + cxlog("Waiting for a bit\n"); + KillTimer(NULL, timer_id); + timer_id=SetTimer(NULL, 0, g_delay, DelayProc); + do_click(window, 0,0); + } + else + { + DelayProc(NULL, 0, 0, 0); + } +} + +static void CALLBACK TimeoutProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime) +{ + status = RC_TIMEOUT; +} + +/*--------------------------------------------------------------------- ------- +** parse_arguments +**--------------------------------------------------------------------- -----*/ +static int arg_get_long(const char** *argv, const char* name, long* value) +{ + if (!**argv) + { + fprintf(stderr, "error: missing argument for '%s'\n", name); + return 1; + } + + *value=atol(**argv); + if (*value < 0) + { + fprintf(stderr, "error: invalid argument '%s' for '%s'\n", + **argv, name); + (*argv)++; + return 1; + } + (*argv)++; + return 0; +} + +static int arg_get_utf8(const char** *argv, const char* name, WCHAR* *value) +{ + int len; + + if (!**argv) + { + fprintf(stderr, "error: missing argument for '%s'\n", name); + return 1; + } + + len = MultiByteToWideChar(CP_UTF8, 0, **argv, -1, NULL, 0); + *value = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); + if (!*value) + { + fprintf(stderr, "error: memory allocation error\n"); + (*argv)++; + return 1; + } + MultiByteToWideChar(CP_UTF8, 0, **argv, -1, *value, len); + (*argv)++; + return 0; +} + +static int parse_arguments(int argc, const char** argv) +{ + int rc; + const char* arg; + char* p; + + rc=0; + argv++; + while (*argv) + { + arg=*argv++; + if (*arg!='-') + { + if (g_action != ACTION_INVALID) + { + fprintf(stderr, "error: '%s' an action has already been specified\n", arg); + rc=1; + } + else if (strcmp(arg, "click") == 0 || strcmp(arg, "lclick") == 0) + { + g_action = ACTION_LCLICK; + } + else if (strcmp(arg, "mclick") == 0) + { + g_action = ACTION_MCLICK; + } + else if (strcmp(arg, "rclick") == 0) + { + g_action = ACTION_RCLICK; + } + else if (strncmp(arg, "button", 6) == 0) + { + int button; + char extra='\0'; + int r=sscanf(arg, "button%d%c", &button, &extra); + /* We should always get r==1 but due to a bug in Wine's + * msvcrt.dll implementation (at least up to 20050127) + * we may also get r==2 and extra=='\0'. + */ + if (r!=1 && (r!=2 || extra!='\0')) + { + fprintf(stderr, "error: invalid argument '%s' for '%s'\n", + *argv, arg); + rc=1; + } + else if (button<1 || button>3) + { + fprintf(stderr, "error: unknown button '%s'\n", arg); + rc=1; + } + else + { + /* Just to remain compatible with the enum */ + g_action=button+ACTION_LCLICK-1; + } + } + else if (strcmp(arg, "find") == 0) + { + g_action = ACTION_FIND; + } + else + { + fprintf(stderr, "error: unknown action '%s'\n", arg); + rc=1; + } + } + else if (strcmp(arg, "--winclass") == 0) + { + rc|=arg_get_utf8(&argv, arg, &g_window_class); + } + else if (strcmp(arg, "--wintitle") == 0) + { + rc|=arg_get_utf8(&argv,arg, &g_window_title); + } + else if (strcmp(arg, "--ctrlclass") == 0) + { + rc|=arg_get_utf8(&argv, arg, &g_control_class); + } + else if (strcmp(arg, "--ctrlid") == 0) + { + rc|=arg_get_long(&argv, arg, &g_control_id); + } + else if (strcmp(arg, "--ctrlcaption") == 0) + { + rc|=arg_get_utf8(&argv, arg, &g_control_caption); + } + else if (strcmp(arg, "--position") == 0) + { + if (!*argv) + { + fprintf(stderr, "error: missing argument for '%s'\n", arg); + rc=1; + } + else + { + char extra='\0'; + int r=sscanf(*argv, "%ldx%ld%c", &g_x, &g_y, &extra); + /* We should always get r==2 but due to a bug in Wine's + * msvcrt.dll implementation (at least up to 20050127) + * we may also get r==3 and extra=='\0'. + */ + if (r!=2 && (r!=3 || extra!='\0')) + { + fprintf(stderr, "error: invalid argument '%s' for '%s'\n", + *argv, arg); + rc=1; + } + argv++; + } + } + else if (strcmp(arg, "--dragto") == 0) + { + if (!*argv) + { + fprintf(stderr, "error: missing argument for '%s'\n", arg); + rc=1; + } + else + { + char extra='\0'; + int r=sscanf(*argv, "%ldx%ld%c", &g_dragto_x, &g_dragto_y, &extra); + /* We should always get r==2 but due to a bug in Wine's + * * msvcrt.dll implementation (at least up to 20050127) + * * we may also get r==3 and extra=='\0'. + * */ + if (r!=2 && (r!=3 || extra!='\0')) + { + fprintf(stderr, "error: invalid argument '%s' for '%s'\n", + *argv, arg); + rc=1; + } + argv++; + } + } + else if (strcmp(arg, "--allow-disabled") == 0) + { + g_disabled = 1; + } + else if (strcmp(arg, "--delay") == 0) + { + rc|=arg_get_long(&argv, arg, &g_delay); + } + else if (strcmp(arg, "--timeout") == 0) + { + rc|=arg_get_long(&argv, arg, &g_timeout); + } + else if (strcmp(arg, "--repeat") == 0) + { + rc|=arg_get_long(&argv, arg, &g_repeat); + } + else if (strcmp(arg, "--untildeath") == 0) + { + g_untildeath=1; + } + else if (strcmp(arg, "--help") == 0) + { + rc=2; + } + } + + if (g_action == ACTION_INVALID) + { + fprintf(stderr, "error: you must specify an action type\n"); + rc=1; + } + else + { + /* Adjust the default delay and repeat parameters depending on + * the operating mode so less needs to be specified on the command + * line, and so we can assume them to be set right. + */ + if (g_action == ACTION_FIND) + g_delay=0; + if (!g_untildeath) + g_repeat=0; + else if (!g_repeat) + g_repeat=DEFAULT_REPEAT; + } + + if (!g_window_class) + { + fprintf(stderr, "error: you must specify a --winclass parameter\n"); + rc=1; + } + if (!g_window_title) + { + fprintf(stderr, "error: you must specify a --wintitle parameter\n"); + rc=1; + } + if (g_control_class) + { + if (!g_control_id && !g_control_caption) + { + fprintf(stderr, "error: you must specify either the control id or its caption\n"); + rc=1; + } + } + + /*---------------------------------------------------------------------- -- + ** Process environment variables + **---------------------------------------------------------------------- */ + p = getenv("CXTEST_TIME_MULTIPLE"); + if (p) + { + float g_multiple = atof(p); + g_delay = (long) (((float) g_delay) * g_multiple); + g_timeout = (long) (((float) g_timeout) * g_multiple); + } + + return rc; +} + +int main(int argc, const char** argv) +{ + MSG msg; + + init_debug(); + + status = parse_arguments(argc, argv); + if (status) + { + if (status == 2) + usage(); + else + fprintf(stderr, "Issue %s --help for usage.\n", *argv); + return RC_INVALID_ARGUMENTS; + } + cxlog("Entering message loop. action=%d\n", g_action); + + if (g_timeout>0) + SetTimer(NULL, 0, g_timeout, TimeoutProc); + timer_id=SetTimer(NULL, 0, 100, FindWindowProc); + + status=RC_RUNNING; + while (status==RC_RUNNING && GetMessage(&msg, NULL, 0, 0)!=0) + { + TranslateMessage(&msg); + DispatchMessage(&msg); + } + + return status; +} _____ Added: trunk/rosapps/tests/wpickclick/wpickclick.c --- trunk/rosapps/tests/wpickclick/wpickclick.c 2005-11-11 21:12:13 UTC (rev 19148) +++ trunk/rosapps/tests/wpickclick/wpickclick.c 2005-11-11 21:30:55 UTC (rev 19149) @@ -0,0 +1,219 @@ +/*--------------------------------------------------------------------- ------- +** wpickclick.c +** Utilty to pick clicks posted to Wine Windows +** +** +**--------------------------------------------------------------------- ------ +** Copyright 2004 Jozef Stefanka for CodeWeavers, Inc. +** Copyright 2005 Francois Gouget for CodeWeavers, Inc. +** Copyright 2005 Dmitry Timoshkov for CodeWeavers, Inc. +** +** 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 +** +**--------------------------------------------------------------------- -----*/ +#include <stdio.h> +#include <fcntl.h> +#include <io.h> +#include <windows.h> + +#include "hook.h" + + +#define APP_NAME "wpickclick.exe" + + +static BOOL (WINAPI *pInstallHooks)(HMODULE hdll); +static void (WINAPI *pRemoveHooks)(); +static action_t* (WINAPI *pGetAction)(); +static void (WINAPI *pFreeAction)(action_t* action); + + +/* + * Provide some basic debugging support. + */ +#ifdef __GNUC__ +#define __PRINTF_ATTR(fmt,args) __attribute__((format (printf,fmt,args))) +#else +#define __PRINTF_ATTR(fmt,args) +#endif +static int debug_on=0; +static int init_debug() +{ + char* str=getenv("CXTEST_DEBUG"); + if (str && strstr(str, "+hook")) + debug_on=1; + return debug_on; +} + +static void cxlog(const char* format, ...) __PRINTF_ATTR(1,2); +static void cxlog(const char* format, ...) +{ + va_list valist; + + if (debug_on) + { + va_start(valist, format); + vfprintf(stderr, format, valist); + va_end(valist); + } +} + +static HINSTANCE load_hook_dll() +{ + HINSTANCE hinstDll; + char dllpath[MAX_PATH]; + char* p; + + hinstDll=LoadLibrary("hook.dll"); + if (hinstDll != NULL) + return hinstDll; + + if (!GetModuleFileName(NULL,dllpath,sizeof(dllpath))) + return NULL; + + p=strrchr(dllpath,'\\'); + if (!p) + return NULL; + *p='\0'; + p=strrchr(dllpath,'\\'); + if (!p) + return NULL; + *p='\0'; + strcat(dllpath,"\\hookdll\\hook.dll"); + hinstDll=LoadLibrary(dllpath); + return hinstDll; +} + +char* cleanup(char* str) +{ + char* s; + + while (*str==' ' || *str=='\t' || *str=='\r' || *str=='\n') + str++; + s=strchr(str,'\n'); + if (!s) + s=str+strlen(str)-1; + while (s>str && (*s==' ' || *s=='\t' || *s=='\r' || *s=='\n')) + s--; + *(s+1)='\0'; + return str; +} + +int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, + LPSTR lpCmdLine, int nCmdShow) +{ + HINSTANCE hDll; + action_t* action; + + init_debug(); + + /* Our scripts expect Unix-style line ends */ + _setmode(1,_O_BINARY); + _setmode(2,_O_BINARY); + + if (strstr(lpCmdLine,"--help")) + { + fprintf(stderr,"%s - Utility to print coordinates, component, window title, component class and window class name of a click\n", APP_NAME); + fprintf(stderr,"----------------------------------------------\n"); + fprintf(stderr,"Usage: %s\n",APP_NAME); + fprintf(stderr,"The options are as follows:\n"); + fprintf(stderr,"After starting you can\n"); + fprintf(stderr,"select where to click. If we properly track the click, it will be reported\n"); + fprintf(stderr,"in the following format:\n"); + fprintf(stderr," button-name x y component_name window_name component_class_name window_class_name\n"); + fprintf(stderr,"Note that x and y can be negative; this typically happens if you click within the\n"); + fprintf(stderr,"window manager decorations of a given window.\n"); + fprintf(stderr,"On success, %s returns 0, non zero on some failure\n",APP_NAME); + exit(0); + }; + + /* Load the hook library */ + hDll = load_hook_dll(); + if (!hDll) + { + fprintf(stderr, "Error: Unable to load 'hook.dll'\n"); + printf("failed\n"); + return 1; + } + + pInstallHooks=(void*)GetProcAddress(hDll, "InstallHooks"); + pRemoveHooks=(void*)GetProcAddress(hDll, "RemoveHooks"); + pGetAction=(void*)GetProcAddress(hDll, "GetAction"); + pFreeAction=(void*)GetProcAddress(hDll, "FreeAction"); + if (!pInstallHooks || !pRemoveHooks || !pGetAction) + { + fprintf(stderr, "Error: Unable to get the hook.dll functions (%ld)\n", + GetLastError()); + printf("failed\n"); + return 1; + } + + if (!pInstallHooks(hDll)) + { + fprintf(stderr, "Error: Unable to install the hooks (%ld)\n", + GetLastError()); + printf("failed\n"); + return 1; + } + + fprintf(stderr, "Ready for capture...\n"); + action=pGetAction(); + if (!action) + { + fprintf(stderr, "Error: GetAction() failed\n"); + printf("failed\n"); + return 1; + } + + switch (action->action) + { + case ACTION_FAILED: + printf("failed\n"); + break; + case ACTION_NONE: + printf("none\n"); + break; + case ACTION_FIND: + printf("find\n"); + break; + case ACTION_BUTTON1: + case ACTION_BUTTON2: + case ACTION_BUTTON3: + printf("button%d %ld %ld\n", action->action-ACTION_BUTTON1+1, + action->x, action->y); + break; + default: + fprintf(stderr, "Error: Unknown action %d\n",action->action); + printf("%d\n", action->action); + break; + } + printf("%s\n", action->window_class); + printf("%s\n", action->window_title); + printf("%ld\n", action->control_id); + printf("%s\n", action->control_class); + printf("%s\n", cleanup(action->control_caption)); + + cxlog("\n%s: action=%d x=%ld y=%ld\n", __FILE__, action->action, + action->x, action->y); + cxlog("window_class='%s'\n", action->window_class); + cxlog("window_title='%s'\n", action->window_title); + cxlog("control_id=%ld\n", action->control_id); + cxlog("control_class='%s'\n", action->control_class); + cxlog("control_caption='%s'\n", action->control_caption); + + pFreeAction(action); + pRemoveHooks(); + return 0; +}

18 years, 10 months

[sedwards] 19148: added xml makefiles for each test based on the alphablend makefile. These all need to be corrected and enabled.

by sedwards＠svn.reactos.com

added xml makefiles for each test based on the alphablend makefile. These all need to be corrected and enabled. Added: trunk/rosapps/tests/accelerator/accelerator.xml Added: trunk/rosapps/tests/alive/alive.xml Added: trunk/rosapps/tests/apc/apc.xml Added: trunk/rosapps/tests/apc2/apc2.xml Added: trunk/rosapps/tests/args/args.xml Added: trunk/rosapps/tests/atomtest/atomtest.xml Added: trunk/rosapps/tests/bench/bench.xml Added: trunk/rosapps/tests/bitblt/bitblt.xml Added: trunk/rosapps/tests/button/button.xml Added: trunk/rosapps/tests/button2/accelerator.xml Added: trunk/rosapps/tests/capclock/capclock.xml Added: trunk/rosapps/tests/carets/carets.xml Added: trunk/rosapps/tests/combo/combotst.xml Added: trunk/rosapps/tests/consume/consume.xml Added: trunk/rosapps/tests/copymove/copymove.xml Added: trunk/rosapps/tests/count/count.xml Added: trunk/rosapps/tests/create-links/create-links.xml Added: trunk/rosapps/tests/dibtest/dibtest.xml Added: trunk/rosapps/tests/dirdlg/dirdlg.xml Added: trunk/rosapps/tests/diskspeed/diskspeed.xml Added: trunk/rosapps/tests/dnsapi/dnsapi.xml Added: trunk/rosapps/tests/dnsquery/dnsquery.xml Added: trunk/rosapps/tests/dump_shared_data/dump_shared_data.xml Added: trunk/rosapps/tests/edit/edit.xml Added: trunk/rosapps/tests/enhmetafile/enhmetafile.xml Added: trunk/rosapps/tests/enumfonts/enumfonts.xml Added: trunk/rosapps/tests/enumwnd/enumwnd.xml Added: trunk/rosapps/tests/enumws/enumws.xml Added: trunk/rosapps/tests/event/event.xml Added: trunk/rosapps/tests/eventpair/eventpair.xml Added: trunk/rosapps/tests/fiber/fiber.xml Added: trunk/rosapps/tests/gethostbyname/gethostbyname.xml Added: trunk/rosapps/tests/global_mem/global_mem.xml Added: trunk/rosapps/tests/gradient/gradient.xml Added: trunk/rosapps/tests/guithreadinfo/guithreadinfo.xml Added: trunk/rosapps/tests/hello/hello.xml Added: trunk/rosapps/tests/hivetest/hivetest.xml Added: trunk/rosapps/tests/icontest/icontest.xml Added: trunk/rosapps/tests/iptest/iptest.xml Added: trunk/rosapps/tests/isotest/isotest.xml Added: trunk/rosapps/tests/lan/lantest.xml Added: trunk/rosapps/tests/lineclip/lineclip.xml Added: trunk/rosapps/tests/linetest/linetest.xml Added: trunk/rosapps/tests/lpc/lpctst.xml Added: trunk/rosapps/tests/map_dup_inherit/map_dup_inherit.xml Added: trunk/rosapps/tests/mdi/mdi.xml Added: trunk/rosapps/tests/miditest/miditest.xml Added: trunk/rosapps/tests/mktime/mktime.xml Added: trunk/rosapps/tests/moztest/moztest.xml Added: trunk/rosapps/tests/mstest/mstest.xml Added: trunk/rosapps/tests/multithrdwin/multithrdwin.xml Added: trunk/rosapps/tests/multiwin/multiwin.xml Added: trunk/rosapps/tests/mutex/mutex.xml Added: trunk/rosapps/tests/nameserverlist/nameserverlist.xml Added: trunk/rosapps/tests/noexecute/noexecute.xml Added: trunk/rosapps/tests/nptest/nptest.xml Added: trunk/rosapps/tests/oskittcp/oskittcp.xml Added: trunk/rosapps/tests/p_dup_handle/p_dup_handle.xml Added: trunk/rosapps/tests/palbitblt/palbitblt.xml Added: trunk/rosapps/tests/patblt/patblt.xml Added: trunk/rosapps/tests/polytest/polytest.xml Added: trunk/rosapps/tests/popupmenu/popupmenu.xml Added: trunk/rosapps/tests/primitives/primitives.xml Added: trunk/rosapps/tests/pteb/pteb.xml Added: trunk/rosapps/tests/regdump/regdump.xml Added: trunk/rosapps/tests/regqueryvalue/regqueryvalue.xml Added: trunk/rosapps/tests/regtest/regtest.xml Added: trunk/rosapps/tests/sectest/sectest.xml Added: trunk/rosapps/tests/sertest/sertest.xml Added: trunk/rosapps/tests/shaptest/shaptest.xml Added: trunk/rosapps/tests/shm/shm.xml Added: trunk/rosapps/tests/statst/statst.xml Added: trunk/rosapps/tests/statst2/statst2.xml Added: trunk/rosapps/tests/stretchblt/stretchblt.xml Added: trunk/rosapps/tests/subclass/subclass.xml Added: trunk/rosapps/tests/suspend/suspend.xml Added: trunk/rosapps/tests/tcpsvr/tcpsvr.xml Added: trunk/rosapps/tests/terminate/terminate.xml Added: trunk/rosapps/tests/thread/thread.xml Added: trunk/rosapps/tests/thread_msg/thread_msg.xml Added: trunk/rosapps/tests/threadwait/threadwait.xml Added: trunk/rosapps/tests/tmrqueue/tmrqueue.xml Added: trunk/rosapps/tests/tokentest/tokentest.xml Added: trunk/rosapps/tests/txtscale/txtscale.xml Added: trunk/rosapps/tests/vmtest/vmtest.xml Added: trunk/rosapps/tests/winhello/winhello.xml Added: trunk/rosapps/tests/wm_erasebkgnd/wm_erasebkgnd.xml Added: trunk/rosapps/tests/wm_paint/wm_paint.xml Added: trunk/rosapps/tests/zwcontinue/zwcontinue.xml _____ Added: trunk/rosapps/tests/accelerator/accelerator.xml --- trunk/rosapps/tests/accelerator/accelerator.xml 2005-11-11 20:47:08 UTC (rev 19147) +++ trunk/rosapps/tests/accelerator/accelerator.xml 2005-11-11 21:12:13 UTC (rev 19148) @@ -0,0 +1,10 @@ +<module name="accelerator" type="win32gui" installbase="system32" installname="alphablend.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + + <library>kernel32</library> + <library>gdi32</library> + + <file>accelerator.c</file> +</module> \ No newline at end of file _____ Added: trunk/rosapps/tests/alive/alive.xml --- trunk/rosapps/tests/alive/alive.xml 2005-11-11 20:47:08 UTC (rev 19147) +++ trunk/rosapps/tests/alive/alive.xml 2005-11-11 21:12:13 UTC (rev 19148) @@ -0,0 +1,10 @@ +<module name="alive" type="win32gui" installbase="system32" installname="alphablend.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + + <library>kernel32</library> + <library>gdi32</library> + + <file>alive.c</file> +</module> \ No newline at end of file _____ Added: trunk/rosapps/tests/apc/apc.xml --- trunk/rosapps/tests/apc/apc.xml 2005-11-11 20:47:08 UTC (rev 19147) +++ trunk/rosapps/tests/apc/apc.xml 2005-11-11 21:12:13 UTC (rev 19148) @@ -0,0 +1,10 @@ +<module name="apc" type="win32gui" installbase="system32" installname="alphablend.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + + <library>kernel32</library> + <library>gdi32</library> + + <file>apc.c</file> +</module> \ No newline at end of file _____ Added: trunk/rosapps/tests/apc2/apc2.xml --- trunk/rosapps/tests/apc2/apc2.xml 2005-11-11 20:47:08 UTC (rev 19147) +++ trunk/rosapps/tests/apc2/apc2.xml 2005-11-11 21:12:13 UTC (rev 19148) @@ -0,0 +1,10 @@ +<module name="alphablend" type="win32gui" installbase="system32" installname="alphablend.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + + <library>kernel32</library> + <library>gdi32</library> + + <file>alphablend.c</file> +</module> \ No newline at end of file _____ Added: trunk/rosapps/tests/args/args.xml --- trunk/rosapps/tests/args/args.xml 2005-11-11 20:47:08 UTC (rev 19147) +++ trunk/rosapps/tests/args/args.xml 2005-11-11 21:12:13 UTC (rev 19148) @@ -0,0 +1,10 @@ +<module name="alphablend" type="win32gui" installbase="system32" installname="alphablend.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + + <library>kernel32</library> + <library>gdi32</library> + + <file>alphablend.c</file> +</module> \ No newline at end of file _____ Added: trunk/rosapps/tests/atomtest/atomtest.xml --- trunk/rosapps/tests/atomtest/atomtest.xml 2005-11-11 20:47:08 UTC (rev 19147) +++ trunk/rosapps/tests/atomtest/atomtest.xml 2005-11-11 21:12:13 UTC (rev 19148) @@ -0,0 +1,10 @@ +<module name="alphablend" type="win32gui" installbase="system32" installname="alphablend.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + + <library>kernel32</library> + <library>gdi32</library> + + <file>alphablend.c</file> +</module> \ No newline at end of file _____ Added: trunk/rosapps/tests/bench/bench.xml --- trunk/rosapps/tests/bench/bench.xml 2005-11-11 20:47:08 UTC (rev 19147) +++ trunk/rosapps/tests/bench/bench.xml 2005-11-11 21:12:13 UTC (rev 19148) @@ -0,0 +1,10 @@ +<module name="alphablend" type="win32gui" installbase="system32" installname="alphablend.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + + <library>kernel32</library> + <library>gdi32</library> + + <file>alphablend.c</file> +</module> \ No newline at end of file _____ Added: trunk/rosapps/tests/bitblt/bitblt.xml --- trunk/rosapps/tests/bitblt/bitblt.xml 2005-11-11 20:47:08 UTC (rev 19147) +++ trunk/rosapps/tests/bitblt/bitblt.xml 2005-11-11 21:12:13 UTC (rev 19148) @@ -0,0 +1,10 @@ +<module name="alphablend" type="win32gui" installbase="system32" installname="alphablend.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + + <library>kernel32</library> + <library>gdi32</library> + + <file>alphablend.c</file> +</module> \ No newline at end of file _____ Added: trunk/rosapps/tests/button/button.xml --- trunk/rosapps/tests/button/button.xml 2005-11-11 20:47:08 UTC (rev 19147) +++ trunk/rosapps/tests/button/button.xml 2005-11-11 21:12:13 UTC (rev 19148) @@ -0,0 +1,10 @@ +<module name="alphablend" type="win32gui" installbase="system32" installname="alphablend.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + + <library>kernel32</library> + <library>gdi32</library> + + <file>alphablend.c</file> +</module> \ No newline at end of file _____ Added: trunk/rosapps/tests/button2/accelerator.xml --- trunk/rosapps/tests/button2/accelerator.xml 2005-11-11 20:47:08 UTC (rev 19147) +++ trunk/rosapps/tests/button2/accelerator.xml 2005-11-11 21:12:13 UTC (rev 19148) @@ -0,0 +1,10 @@ +<module name="accelerator" type="win32gui" installbase="system32" installname="alphablend.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + + <library>kernel32</library> + <library>gdi32</library> + + <file>accelerator.c</file> +</module> \ No newline at end of file _____ Added: trunk/rosapps/tests/capclock/capclock.xml --- trunk/rosapps/tests/capclock/capclock.xml 2005-11-11 20:47:08 UTC (rev 19147) +++ trunk/rosapps/tests/capclock/capclock.xml 2005-11-11 21:12:13 UTC (rev 19148) @@ -0,0 +1,10 @@ +<module name="alphablend" type="win32gui" installbase="system32" installname="alphablend.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + + <library>kernel32</library> + <library>gdi32</library> + + <file>alphablend.c</file> +</module> \ No newline at end of file _____ Added: trunk/rosapps/tests/carets/carets.xml --- trunk/rosapps/tests/carets/carets.xml 2005-11-11 20:47:08 UTC (rev 19147) +++ trunk/rosapps/tests/carets/carets.xml 2005-11-11 21:12:13 UTC (rev 19148) @@ -0,0 +1,10 @@ +<module name="alphablend" type="win32gui" installbase="system32" installname="alphablend.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + + <library>kernel32</library> + <library>gdi32</library> + + <file>alphablend.c</file> +</module> \ No newline at end of file _____ Added: trunk/rosapps/tests/combo/combotst.xml --- trunk/rosapps/tests/combo/combotst.xml 2005-11-11 20:47:08 UTC (rev 19147) +++ trunk/rosapps/tests/combo/combotst.xml 2005-11-11 21:12:13 UTC (rev 19148) @@ -0,0 +1,10 @@ +<module name="alphablend" type="win32gui" installbase="system32" installname="alphablend.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + + <library>kernel32</library> + <library>gdi32</library> + + <file>alphablend.c</file> +</module> \ No newline at end of file _____ Added: trunk/rosapps/tests/consume/consume.xml --- trunk/rosapps/tests/consume/consume.xml 2005-11-11 20:47:08 UTC (rev 19147) +++ trunk/rosapps/tests/consume/consume.xml 2005-11-11 21:12:13 UTC (rev 19148) @@ -0,0 +1,10 @@ +<module name="alphablend" type="win32gui" installbase="system32" installname="alphablend.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + + <library>kernel32</library> + <library>gdi32</library> + + <file>alphablend.c</file> +</module> \ No newline at end of file _____ Added: trunk/rosapps/tests/copymove/copymove.xml --- trunk/rosapps/tests/copymove/copymove.xml 2005-11-11 20:47:08 UTC (rev 19147) +++ trunk/rosapps/tests/copymove/copymove.xml 2005-11-11 21:12:13 UTC (rev 19148) @@ -0,0 +1,10 @@ +<module name="alphablend" type="win32gui" installbase="system32" installname="alphablend.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + + <library>kernel32</library> + <library>gdi32</library> + + <file>alphablend.c</file> +</module> \ No newline at end of file _____ Added: trunk/rosapps/tests/count/count.xml --- trunk/rosapps/tests/count/count.xml 2005-11-11 20:47:08 UTC (rev 19147) +++ trunk/rosapps/tests/count/count.xml 2005-11-11 21:12:13 UTC (rev 19148) @@ -0,0 +1,10 @@ +<module name="alphablend" type="win32gui" installbase="system32" installname="alphablend.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + + <library>kernel32</library> + <library>gdi32</library> + + <file>alphablend.c</file> +</module> \ No newline at end of file _____ Added: trunk/rosapps/tests/create-links/create-links.xml --- trunk/rosapps/tests/create-links/create-links.xml 2005-11-11 20:47:08 UTC (rev 19147) +++ trunk/rosapps/tests/create-links/create-links.xml 2005-11-11 21:12:13 UTC (rev 19148) @@ -0,0 +1,10 @@ +<module name="alphablend" type="win32gui" installbase="system32" installname="alphablend.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + + <library>kernel32</library> + <library>gdi32</library> + + <file>alphablend.c</file> +</module> \ No newline at end of file _____ Added: trunk/rosapps/tests/dibtest/dibtest.xml --- trunk/rosapps/tests/dibtest/dibtest.xml 2005-11-11 20:47:08 UTC (rev 19147) +++ trunk/rosapps/tests/dibtest/dibtest.xml 2005-11-11 21:12:13 UTC (rev 19148) @@ -0,0 +1,10 @@ +<module name="alphablend" type="win32gui" installbase="system32" installname="alphablend.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + + <library>kernel32</library> + <library>gdi32</library> + + <file>alphablend.c</file> +</module> \ No newline at end of file _____ Added: trunk/rosapps/tests/dirdlg/dirdlg.xml --- trunk/rosapps/tests/dirdlg/dirdlg.xml 2005-11-11 20:47:08 UTC (rev 19147) +++ trunk/rosapps/tests/dirdlg/dirdlg.xml 2005-11-11 21:12:13 UTC (rev 19148) @@ -0,0 +1,10 @@ +<module name="alphablend" type="win32gui" installbase="system32" installname="alphablend.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + + <library>kernel32</library> + <library>gdi32</library> + + <file>alphablend.c</file> +</module> \ No newline at end of file _____ Added: trunk/rosapps/tests/diskspeed/diskspeed.xml --- trunk/rosapps/tests/diskspeed/diskspeed.xml 2005-11-11 20:47:08 UTC (rev 19147) +++ trunk/rosapps/tests/diskspeed/diskspeed.xml 2005-11-11 21:12:13 UTC (rev 19148) @@ -0,0 +1,10 @@ +<module name="alphablend" type="win32gui" installbase="system32" installname="alphablend.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + + <library>kernel32</library> + <library>gdi32</library> + + <file>alphablend.c</file> +</module> \ No newline at end of file _____ Added: trunk/rosapps/tests/dnsapi/dnsapi.xml --- trunk/rosapps/tests/dnsapi/dnsapi.xml 2005-11-11 20:47:08 UTC (rev 19147) +++ trunk/rosapps/tests/dnsapi/dnsapi.xml 2005-11-11 21:12:13 UTC (rev 19148) @@ -0,0 +1,10 @@ +<module name="alphablend" type="win32gui" installbase="system32" installname="alphablend.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + + <library>kernel32</library> + <library>gdi32</library> + + <file>alphablend.c</file> +</module> \ No newline at end of file _____ Added: trunk/rosapps/tests/dnsquery/dnsquery.xml --- trunk/rosapps/tests/dnsquery/dnsquery.xml 2005-11-11 20:47:08 UTC (rev 19147) +++ trunk/rosapps/tests/dnsquery/dnsquery.xml 2005-11-11 21:12:13 UTC (rev 19148) @@ -0,0 +1,10 @@ +<module name="alphablend" type="win32gui" installbase="system32" installname="alphablend.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + + <library>kernel32</library> + <library>gdi32</library> + + <file>alphablend.c</file> +</module> \ No newline at end of file _____ Added: trunk/rosapps/tests/dump_shared_data/dump_shared_data.xml --- trunk/rosapps/tests/dump_shared_data/dump_shared_data.xml 2005-11-11 20:47:08 UTC (rev 19147) +++ trunk/rosapps/tests/dump_shared_data/dump_shared_data.xml 2005-11-11 21:12:13 UTC (rev 19148) @@ -0,0 +1,10 @@ +<module name="alphablend" type="win32gui" installbase="system32" installname="alphablend.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + + <library>kernel32</library> + <library>gdi32</library> + + <file>alphablend.c</file> +</module> \ No newline at end of file _____ Added: trunk/rosapps/tests/edit/edit.xml --- trunk/rosapps/tests/edit/edit.xml 2005-11-11 20:47:08 UTC (rev 19147) +++ trunk/rosapps/tests/edit/edit.xml 2005-11-11 21:12:13 UTC (rev 19148) @@ -0,0 +1,10 @@ +<module name="alphablend" type="win32gui" installbase="system32" installname="alphablend.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + + <library>kernel32</library> + <library>gdi32</library> + + <file>alphablend.c</file> +</module> \ No newline at end of file _____ Added: trunk/rosapps/tests/enhmetafile/enhmetafile.xml --- trunk/rosapps/tests/enhmetafile/enhmetafile.xml 2005-11-11 20:47:08 UTC (rev 19147) +++ trunk/rosapps/tests/enhmetafile/enhmetafile.xml 2005-11-11 21:12:13 UTC (rev 19148) @@ -0,0 +1,10 @@ +<module name="alphablend" type="win32gui" installbase="system32" installname="alphablend.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + + <library>kernel32</library> + <library>gdi32</library> + + <file>alphablend.c</file> +</module> \ No newline at end of file _____ Added: trunk/rosapps/tests/enumfonts/enumfonts.xml --- trunk/rosapps/tests/enumfonts/enumfonts.xml 2005-11-11 20:47:08 UTC (rev 19147) +++ trunk/rosapps/tests/enumfonts/enumfonts.xml 2005-11-11 21:12:13 UTC (rev 19148) @@ -0,0 +1,10 @@ +<module name="alphablend" type="win32gui" installbase="system32" installname="alphablend.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + + <library>kernel32</library> + <library>gdi32</library> + + <file>alphablend.c</file> +</module> \ No newline at end of file _____ Added: trunk/rosapps/tests/enumwnd/enumwnd.xml --- trunk/rosapps/tests/enumwnd/enumwnd.xml 2005-11-11 20:47:08 UTC (rev 19147) +++ trunk/rosapps/tests/enumwnd/enumwnd.xml 2005-11-11 21:12:13 UTC (rev 19148) @@ -0,0 +1,10 @@ +<module name="alphablend" type="win32gui" installbase="system32" installname="alphablend.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + + <library>kernel32</library> + <library>gdi32</library> + + <file>alphablend.c</file> +</module> \ No newline at end of file _____ Added: trunk/rosapps/tests/enumws/enumws.xml --- trunk/rosapps/tests/enumws/enumws.xml 2005-11-11 20:47:08 UTC (rev 19147) +++ trunk/rosapps/tests/enumws/enumws.xml 2005-11-11 21:12:13 UTC (rev 19148) @@ -0,0 +1,10 @@ +<module name="alphablend" type="win32gui" installbase="system32" installname="alphablend.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + + <library>kernel32</library> + <library>gdi32</library> + + <file>alphablend.c</file> +</module> \ No newline at end of file _____ Added: trunk/rosapps/tests/event/event.xml --- trunk/rosapps/tests/event/event.xml 2005-11-11 20:47:08 UTC (rev 19147) +++ trunk/rosapps/tests/event/event.xml 2005-11-11 21:12:13 UTC (rev 19148) @@ -0,0 +1,10 @@ +<module name="alphablend" type="win32gui" installbase="system32" installname="alphablend.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + + <library>kernel32</library> + <library>gdi32</library> + + <file>alphablend.c</file> +</module> \ No newline at end of file _____ Added: trunk/rosapps/tests/eventpair/eventpair.xml --- trunk/rosapps/tests/eventpair/eventpair.xml 2005-11-11 20:47:08 UTC (rev 19147) +++ trunk/rosapps/tests/eventpair/eventpair.xml 2005-11-11 21:12:13 UTC (rev 19148) @@ -0,0 +1,10 @@ +<module name="alphablend" type="win32gui" installbase="system32" installname="alphablend.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + + <library>kernel32</library> + <library>gdi32</library> + + <file>alphablend.c</file> +</module> \ No newline at end of file _____ Added: trunk/rosapps/tests/fiber/fiber.xml --- trunk/rosapps/tests/fiber/fiber.xml 2005-11-11 20:47:08 UTC (rev 19147) +++ trunk/rosapps/tests/fiber/fiber.xml 2005-11-11 21:12:13 UTC (rev 19148) @@ -0,0 +1,10 @@ +<module name="alphablend" type="win32gui" installbase="system32" installname="alphablend.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + + <library>kernel32</library> + <library>gdi32</library> + + <file>alphablend.c</file> +</module> \ No newline at end of file _____ Added: trunk/rosapps/tests/gethostbyname/gethostbyname.xml --- trunk/rosapps/tests/gethostbyname/gethostbyname.xml 2005-11-11 20:47:08 UTC (rev 19147) +++ trunk/rosapps/tests/gethostbyname/gethostbyname.xml 2005-11-11 21:12:13 UTC (rev 19148) @@ -0,0 +1,10 @@ +<module name="alphablend" type="win32gui" installbase="system32" installname="alphablend.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + + <library>kernel32</library> + <library>gdi32</library> + + <file>alphablend.c</file> +</module> \ No newline at end of file _____ Added: trunk/rosapps/tests/global_mem/global_mem.xml --- trunk/rosapps/tests/global_mem/global_mem.xml 2005-11-11 20:47:08 UTC (rev 19147) +++ trunk/rosapps/tests/global_mem/global_mem.xml 2005-11-11 21:12:13 UTC (rev 19148) @@ -0,0 +1,10 @@ +<module name="alphablend" type="win32gui" installbase="system32" installname="alphablend.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + + <library>kernel32</library> + <library>gdi32</library> + + <file>alphablend.c</file> +</module> \ No newline at end of file _____ Added: trunk/rosapps/tests/gradient/gradient.xml --- trunk/rosapps/tests/gradient/gradient.xml 2005-11-11 20:47:08 UTC (rev 19147) +++ trunk/rosapps/tests/gradient/gradient.xml 2005-11-11 21:12:13 UTC (rev 19148) @@ -0,0 +1,10 @@ +<module name="alphablend" type="win32gui" installbase="system32" installname="alphablend.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + + <library>kernel32</library> + <library>gdi32</library> + + <file>alphablend.c</file> +</module> \ No newline at end of file _____ Added: trunk/rosapps/tests/guithreadinfo/guithreadinfo.xml --- trunk/rosapps/tests/guithreadinfo/guithreadinfo.xml 2005-11-11 20:47:08 UTC (rev 19147) +++ trunk/rosapps/tests/guithreadinfo/guithreadinfo.xml 2005-11-11 21:12:13 UTC (rev 19148) @@ -0,0 +1,10 @@ +<module name="alphablend" type="win32gui" installbase="system32" installname="alphablend.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + + <library>kernel32</library> + <library>gdi32</library> + + <file>alphablend.c</file> +</module> \ No newline at end of file _____ Added: trunk/rosapps/tests/hello/hello.xml --- trunk/rosapps/tests/hello/hello.xml 2005-11-11 20:47:08 UTC (rev 19147) +++ trunk/rosapps/tests/hello/hello.xml 2005-11-11 21:12:13 UTC (rev 19148) @@ -0,0 +1,10 @@ +<module name="alphablend" type="win32gui" installbase="system32" installname="alphablend.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + + <library>kernel32</library> + <library>gdi32</library> + + <file>alphablend.c</file> +</module> \ No newline at end of file _____ Added: trunk/rosapps/tests/hivetest/hivetest.xml --- trunk/rosapps/tests/hivetest/hivetest.xml 2005-11-11 20:47:08 UTC (rev 19147) +++ trunk/rosapps/tests/hivetest/hivetest.xml 2005-11-11 21:12:13 UTC (rev 19148) @@ -0,0 +1,10 @@ +<module name="alphablend" type="win32gui" installbase="system32" installname="alphablend.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + + <library>kernel32</library> + <library>gdi32</library> + + <file>alphablend.c</file> +</module> \ No newline at end of file _____ Added: trunk/rosapps/tests/icontest/icontest.xml --- trunk/rosapps/tests/icontest/icontest.xml 2005-11-11 20:47:08 UTC (rev 19147) +++ trunk/rosapps/tests/icontest/icontest.xml 2005-11-11 21:12:13 UTC (rev 19148) @@ -0,0 +1,10 @@ +<module name="alphablend" type="win32gui" installbase="system32" installname="alphablend.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + + <library>kernel32</library> + <library>gdi32</library> + + <file>alphablend.c</file> +</module> \ No newline at end of file _____ Added: trunk/rosapps/tests/iptest/iptest.xml --- trunk/rosapps/tests/iptest/iptest.xml 2005-11-11 20:47:08 UTC (rev 19147) +++ trunk/rosapps/tests/iptest/iptest.xml 2005-11-11 21:12:13 UTC (rev 19148) @@ -0,0 +1,10 @@ +<module name="alphablend" type="win32gui" installbase="system32" installname="alphablend.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + + <library>kernel32</library> + <library>gdi32</library> + + <file>alphablend.c</file> +</module> \ No newline at end of file _____ Added: trunk/rosapps/tests/isotest/isotest.xml --- trunk/rosapps/tests/isotest/isotest.xml 2005-11-11 20:47:08 UTC (rev 19147) +++ trunk/rosapps/tests/isotest/isotest.xml 2005-11-11 21:12:13 UTC (rev 19148) @@ -0,0 +1,10 @@ +<module name="alphablend" type="win32gui" installbase="system32" installname="alphablend.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + + <library>kernel32</library> + <library>gdi32</library> + + <file>alphablend.c</file> +</module> \ No newline at end of file _____ Added: trunk/rosapps/tests/lan/lantest.xml --- trunk/rosapps/tests/lan/lantest.xml 2005-11-11 20:47:08 UTC (rev 19147) +++ trunk/rosapps/tests/lan/lantest.xml 2005-11-11 21:12:13 UTC (rev 19148) @@ -0,0 +1,10 @@ +<module name="alphablend" type="win32gui" installbase="system32" installname="alphablend.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + + <library>kernel32</library> + <library>gdi32</library> + + <file>alphablend.c</file> +</module> \ No newline at end of file _____ Added: trunk/rosapps/tests/lineclip/lineclip.xml --- trunk/rosapps/tests/lineclip/lineclip.xml 2005-11-11 20:47:08 UTC (rev 19147) +++ trunk/rosapps/tests/lineclip/lineclip.xml 2005-11-11 21:12:13 UTC (rev 19148) @@ -0,0 +1,10 @@ +<module name="alphablend" type="win32gui" installbase="system32" installname="alphablend.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + + <library>kernel32</library> + <library>gdi32</library> + + <file>alphablend.c</file> +</module> \ No newline at end of file _____ Added: trunk/rosapps/tests/linetest/linetest.xml --- trunk/rosapps/tests/linetest/linetest.xml 2005-11-11 20:47:08 UTC (rev 19147) +++ trunk/rosapps/tests/linetest/linetest.xml 2005-11-11 21:12:13 UTC (rev 19148) @@ -0,0 +1,10 @@ +<module name="alphablend" type="win32gui" installbase="system32" installname="alphablend.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + + <library>kernel32</library> + <library>gdi32</library> + + <file>alphablend.c</file> +</module> \ No newline at end of file _____ Added: trunk/rosapps/tests/lpc/lpctst.xml --- trunk/rosapps/tests/lpc/lpctst.xml 2005-11-11 20:47:08 UTC (rev 19147) +++ trunk/rosapps/tests/lpc/lpctst.xml 2005-11-11 21:12:13 UTC (rev 19148) @@ -0,0 +1,10 @@ +<module name="alphablend" type="win32gui" installbase="system32" installname="alphablend.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + + <library>kernel32</library> + <library>gdi32</library> + + <file>alphablend.c</file> +</module> \ No newline at end of file _____ Added: trunk/rosapps/tests/map_dup_inherit/map_dup_inherit.xml --- trunk/rosapps/tests/map_dup_inherit/map_dup_inherit.xml 2005-11-11 20:47:08 UTC (rev 19147) +++ trunk/rosapps/tests/map_dup_inherit/map_dup_inherit.xml 2005-11-11 21:12:13 UTC (rev 19148) @@ -0,0 +1,10 @@ +<module name="alphablend" type="win32gui" installbase="system32" installname="alphablend.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + + <library>kernel32</library> + <library>gdi32</library> + + <file>alphablend.c</file> +</module> \ No newline at end of file _____ Added: trunk/rosapps/tests/mdi/mdi.xml --- trunk/rosapps/tests/mdi/mdi.xml 2005-11-11 20:47:08 UTC (rev 19147) +++ trunk/rosapps/tests/mdi/mdi.xml 2005-11-11 21:12:13 UTC (rev 19148) @@ -0,0 +1,10 @@ +<module name="alphablend" type="win32gui" installbase="system32" installname="alphablend.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + + <library>kernel32</library> + <library>gdi32</library> + + <file>alphablend.c</file> +</module> \ No newline at end of file _____ Added: trunk/rosapps/tests/miditest/miditest.xml --- trunk/rosapps/tests/miditest/miditest.xml 2005-11-11 20:47:08 UTC (rev 19147) +++ trunk/rosapps/tests/miditest/miditest.xml 2005-11-11 21:12:13 UTC (rev 19148) @@ -0,0 +1,10 @@ +<module name="alphablend" type="win32gui" installbase="system32" installname="alphablend.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + + <library>kernel32</library> + <library>gdi32</library> + + <file>alphablend.c</file> +</module> \ No newline at end of file _____ Added: trunk/rosapps/tests/mktime/mktime.xml --- trunk/rosapps/tests/mktime/mktime.xml 2005-11-11 20:47:08 UTC (rev 19147) +++ trunk/rosapps/tests/mktime/mktime.xml 2005-11-11 21:12:13 UTC (rev 19148) @@ -0,0 +1,10 @@ +<module name="alphablend" type="win32gui" installbase="system32" installname="alphablend.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + + <library>kernel32</library> + <library>gdi32</library> + + <file>alphablend.c</file> +</module> \ No newline at end of file _____ Added: trunk/rosapps/tests/moztest/moztest.xml --- trunk/rosapps/tests/moztest/moztest.xml 2005-11-11 20:47:08 UTC (rev 19147) +++ trunk/rosapps/tests/moztest/moztest.xml 2005-11-11 21:12:13 UTC (rev 19148) @@ -0,0 +1,10 @@ +<module name="alphablend" type="win32gui" installbase="system32" installname="alphablend.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + + <library>kernel32</library> + <library>gdi32</library> + + <file>alphablend.c</file> +</module> \ No newline at end of file _____ Added: trunk/rosapps/tests/mstest/mstest.xml --- trunk/rosapps/tests/mstest/mstest.xml 2005-11-11 20:47:08 UTC (rev 19147) +++ trunk/rosapps/tests/mstest/mstest.xml 2005-11-11 21:12:13 UTC (rev 19148) @@ -0,0 +1,10 @@ +<module name="alphablend" type="win32gui" installbase="system32" installname="alphablend.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + + <library>kernel32</library> + <library>gdi32</library> + + <file>alphablend.c</file> +</module> \ No newline at end of file _____ Added: trunk/rosapps/tests/multithrdwin/multithrdwin.xml --- trunk/rosapps/tests/multithrdwin/multithrdwin.xml 2005-11-11 20:47:08 UTC (rev 19147) +++ trunk/rosapps/tests/multithrdwin/multithrdwin.xml 2005-11-11 21:12:13 UTC (rev 19148) @@ -0,0 +1,10 @@ +<module name="alphablend" type="win32gui" installbase="system32" installname="alphablend.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + + <library>kernel32</library> + <library>gdi32</library> + + <file>alphablend.c</file> +</module> \ No newline at end of file _____ Added: trunk/rosapps/tests/multiwin/multiwin.xml --- trunk/rosapps/tests/multiwin/multiwin.xml 2005-11-11 20:47:08 UTC (rev 19147) +++ trunk/rosapps/tests/multiwin/multiwin.xml 2005-11-11 21:12:13 UTC (rev 19148) @@ -0,0 +1,10 @@ +<module name="alphablend" type="win32gui" installbase="system32" installname="alphablend.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + + <library>kernel32</library> + <library>gdi32</library> + + <file>alphablend.c</file> +</module> \ No newline at end of file _____ Added: trunk/rosapps/tests/mutex/mutex.xml --- trunk/rosapps/tests/mutex/mutex.xml 2005-11-11 20:47:08 UTC (rev 19147) +++ trunk/rosapps/tests/mutex/mutex.xml 2005-11-11 21:12:13 UTC (rev 19148) @@ -0,0 +1,10 @@ +<module name="alphablend" type="win32gui" installbase="system32" installname="alphablend.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + + <library>kernel32</library> + <library>gdi32</library> + + <file>alphablend.c</file> +</module> \ No newline at end of file _____ Added: trunk/rosapps/tests/nameserverlist/nameserverlist.xml --- trunk/rosapps/tests/nameserverlist/nameserverlist.xml 2005-11-11 20:47:08 UTC (rev 19147) +++ trunk/rosapps/tests/nameserverlist/nameserverlist.xml 2005-11-11 21:12:13 UTC (rev 19148) @@ -0,0 +1,10 @@ +<module name="alphablend" type="win32gui" installbase="system32" installname="alphablend.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + + <library>kernel32</library> + <library>gdi32</library> + + <file>alphablend.c</file> +</module> \ No newline at end of file _____ Added: trunk/rosapps/tests/noexecute/noexecute.xml --- trunk/rosapps/tests/noexecute/noexecute.xml 2005-11-11 20:47:08 UTC (rev 19147) +++ trunk/rosapps/tests/noexecute/noexecute.xml 2005-11-11 21:12:13 UTC (rev 19148) @@ -0,0 +1,10 @@ +<module name="alphablend" type="win32gui" installbase="system32" installname="alphablend.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + + <library>kernel32</library> + <library>gdi32</library> + + <file>alphablend.c</file> +</module> \ No newline at end of file _____ Added: trunk/rosapps/tests/nptest/nptest.xml --- trunk/rosapps/tests/nptest/nptest.xml 2005-11-11 20:47:08 UTC (rev 19147) +++ trunk/rosapps/tests/nptest/nptest.xml 2005-11-11 21:12:13 UTC (rev 19148) @@ -0,0 +1,10 @@ +<module name="alphablend" type="win32gui" installbase="system32" installname="alphablend.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + + <library>kernel32</library> + <library>gdi32</library> + + <file>alphablend.c</file> +</module> \ No newline at end of file _____ Added: trunk/rosapps/tests/oskittcp/oskittcp.xml --- trunk/rosapps/tests/oskittcp/oskittcp.xml 2005-11-11 20:47:08 UTC (rev 19147) +++ trunk/rosapps/tests/oskittcp/oskittcp.xml 2005-11-11 21:12:13 UTC (rev 19148) @@ -0,0 +1,10 @@ +<module name="alphablend" type="win32gui" installbase="system32" installname="alphablend.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + + <library>kernel32</library> + <library>gdi32</library> + + <file>alphablend.c</file> +</module> \ No newline at end of file _____ Added: trunk/rosapps/tests/p_dup_handle/p_dup_handle.xml --- trunk/rosapps/tests/p_dup_handle/p_dup_handle.xml 2005-11-11 20:47:08 UTC (rev 19147) +++ trunk/rosapps/tests/p_dup_handle/p_dup_handle.xml 2005-11-11 21:12:13 UTC (rev 19148) @@ -0,0 +1,10 @@ +<module name="alphablend" type="win32gui" installbase="system32" installname="alphablend.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + + <library>kernel32</library> + <library>gdi32</library> + + <file>alphablend.c</file> +</module> \ No newline at end of file _____ Added: trunk/rosapps/tests/palbitblt/palbitblt.xml --- trunk/rosapps/tests/palbitblt/palbitblt.xml 2005-11-11 20:47:08 UTC (rev 19147) +++ trunk/rosapps/tests/palbitblt/palbitblt.xml 2005-11-11 21:12:13 UTC (rev 19148) @@ -0,0 +1,10 @@ +<module name="alphablend" type="win32gui" installbase="system32" installname="alphablend.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + + <library>kernel32</library> + <library>gdi32</library> + + <file>alphablend.c</file> +</module> \ No newline at end of file _____ Added: trunk/rosapps/tests/patblt/patblt.xml --- trunk/rosapps/tests/patblt/patblt.xml 2005-11-11 20:47:08 UTC (rev 19147) +++ trunk/rosapps/tests/patblt/patblt.xml 2005-11-11 21:12:13 UTC (rev 19148) @@ -0,0 +1,10 @@ +<module name="alphablend" type="win32gui" installbase="system32" installname="alphablend.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + + <library>kernel32</library> + <library>gdi32</library> + + <file>alphablend.c</file> +</module> \ No newline at end of file _____ Added: trunk/rosapps/tests/polytest/polytest.xml --- trunk/rosapps/tests/polytest/polytest.xml 2005-11-11 20:47:08 UTC (rev 19147) +++ trunk/rosapps/tests/polytest/polytest.xml 2005-11-11 21:12:13 UTC (rev 19148) @@ -0,0 +1,10 @@ +<module name="alphablend" type="win32gui" installbase="system32" installname="alphablend.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + + <library>kernel32</library> + <library>gdi32</library> + + <file>alphablend.c</file> +</module> \ No newline at end of file _____ Added: trunk/rosapps/tests/popupmenu/popupmenu.xml --- trunk/rosapps/tests/popupmenu/popupmenu.xml 2005-11-11 20:47:08 UTC (rev 19147) +++ trunk/rosapps/tests/popupmenu/popupmenu.xml 2005-11-11 21:12:13 UTC (rev 19148) @@ -0,0 +1,10 @@ +<module name="alphablend" type="win32gui" installbase="system32" installname="alphablend.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + + <library>kernel32</library> + <library>gdi32</library> + + <file>alphablend.c</file> +</module> \ No newline at end of file _____ Added: trunk/rosapps/tests/primitives/primitives.xml --- trunk/rosapps/tests/primitives/primitives.xml 2005-11-11 20:47:08 UTC (rev 19147) +++ trunk/rosapps/tests/primitives/primitives.xml 2005-11-11 21:12:13 UTC (rev 19148) @@ -0,0 +1,10 @@ +<module name="alphablend" type="win32gui" installbase="system32" installname="alphablend.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> [truncated at 1000 lines; 424 more skipped]

18 years, 10 months

[sedwards] 19147: remove old makefiles from rosapps tests

by sedwards＠svn.reactos.com

remove old makefiles from rosapps tests Deleted: trunk/rosapps/tests/accelerator/Makefile Deleted: trunk/rosapps/tests/alive/Makefile Modified: trunk/rosapps/tests/alphablend/alphablend.c Deleted: trunk/rosapps/tests/apc/makefile Deleted: trunk/rosapps/tests/apc2/makefile Deleted: trunk/rosapps/tests/args/makefile Deleted: trunk/rosapps/tests/atomtest/makefile Deleted: trunk/rosapps/tests/bench/makefile Deleted: trunk/rosapps/tests/bitblt/makefile Deleted: trunk/rosapps/tests/button/Makefile Deleted: trunk/rosapps/tests/button2/Makefile Deleted: trunk/rosapps/tests/capclock/Makefile Deleted: trunk/rosapps/tests/carets/makefile Deleted: trunk/rosapps/tests/combo/makefile Deleted: trunk/rosapps/tests/consume/Makefile Deleted: trunk/rosapps/tests/copymove/Makefile Deleted: trunk/rosapps/tests/count/Makefile Deleted: trunk/rosapps/tests/create-links/Makefile Deleted: trunk/rosapps/tests/dibtest/makefile Deleted: trunk/rosapps/tests/dirdlg/makefile Modified: trunk/rosapps/tests/directory.xml Deleted: trunk/rosapps/tests/diskspeed/makefile Deleted: trunk/rosapps/tests/dnsapi/makefile Deleted: trunk/rosapps/tests/dnsquery/makefile Deleted: trunk/rosapps/tests/dump_shared_data/makefile Deleted: trunk/rosapps/tests/edit/makefile Deleted: trunk/rosapps/tests/enhmetafile/makefile Deleted: trunk/rosapps/tests/enumfonts/makefile Deleted: trunk/rosapps/tests/enumwnd/makefile Deleted: trunk/rosapps/tests/enumws/makefile Deleted: trunk/rosapps/tests/event/makefile Deleted: trunk/rosapps/tests/eventpair/makefile Deleted: trunk/rosapps/tests/fiber/Makefile Deleted: trunk/rosapps/tests/gethostbyname/makefile Deleted: trunk/rosapps/tests/global_mem/Makefile Deleted: trunk/rosapps/tests/gradient/makefile Deleted: trunk/rosapps/tests/guithreadinfo/makefile Deleted: trunk/rosapps/tests/hello/makefile Deleted: trunk/rosapps/tests/hivetest/makefile Deleted: trunk/rosapps/tests/icontest/makefile Deleted: trunk/rosapps/tests/iptest/makefile Deleted: trunk/rosapps/tests/isotest/makefile Deleted: trunk/rosapps/tests/lan/makefile Deleted: trunk/rosapps/tests/lineclip/makefile Deleted: trunk/rosapps/tests/linetest/makefile Deleted: trunk/rosapps/tests/lpc/makefile Deleted: trunk/rosapps/tests/map_dup_inherit/makefile Deleted: trunk/rosapps/tests/mdi/makefile Deleted: trunk/rosapps/tests/miditest/makefile Deleted: trunk/rosapps/tests/mktime/makefile Deleted: trunk/rosapps/tests/moztest/makefile Deleted: trunk/rosapps/tests/mstest/Makefile Deleted: trunk/rosapps/tests/multithrdwin/makefile Deleted: trunk/rosapps/tests/multiwin/makefile Deleted: trunk/rosapps/tests/mutex/makefile Deleted: trunk/rosapps/tests/nameserverlist/makefile Deleted: trunk/rosapps/tests/noexecute/makefile Deleted: trunk/rosapps/tests/nptest/Makefile Deleted: trunk/rosapps/tests/oskittcp/makefile Deleted: trunk/rosapps/tests/p_dup_handle/makefile Deleted: trunk/rosapps/tests/palbitblt/makefile Deleted: trunk/rosapps/tests/patblt/makefile Deleted: trunk/rosapps/tests/polytest/Makefile Deleted: trunk/rosapps/tests/popupmenu/makefile Deleted: trunk/rosapps/tests/primitives/Makefile Deleted: trunk/rosapps/tests/pteb/Makefile Deleted: trunk/rosapps/tests/regdump/makefile Deleted: trunk/rosapps/tests/regqueryvalue/makefile Deleted: trunk/rosapps/tests/regtest/makefile Deleted: trunk/rosapps/tests/sectest/Makefile Deleted: trunk/rosapps/tests/sertest/makefile Deleted: trunk/rosapps/tests/shaptest/makefile Deleted: trunk/rosapps/tests/shm/makefile Deleted: trunk/rosapps/tests/statst/Makefile Deleted: trunk/rosapps/tests/statst2/Makefile Deleted: trunk/rosapps/tests/stretchblt/makefile Deleted: trunk/rosapps/tests/subclass/makefile Deleted: trunk/rosapps/tests/suspend/Makefile Deleted: trunk/rosapps/tests/tcpsvr/makefile Deleted: trunk/rosapps/tests/terminate/Makefile Deleted: trunk/rosapps/tests/thread/makefile Deleted: trunk/rosapps/tests/thread_msg/makefile Deleted: trunk/rosapps/tests/threadwait/makefile Deleted: trunk/rosapps/tests/tmrqueue/makefile Deleted: trunk/rosapps/tests/tokentest/makefile Deleted: trunk/rosapps/tests/txtscale/Makefile Deleted: trunk/rosapps/tests/vmtest/Makefile Deleted: trunk/rosapps/tests/winhello/makefile Deleted: trunk/rosapps/tests/wm_erasebkgnd/makefile Deleted: trunk/rosapps/tests/wm_paint/makefile Deleted: trunk/rosapps/tests/zwcontinue/Makefile _____ Deleted: trunk/rosapps/tests/accelerator/Makefile --- trunk/rosapps/tests/accelerator/Makefile 2005-11-11 20:15:21 UTC (rev 19146) +++ trunk/rosapps/tests/accelerator/Makefile 2005-11-11 20:47:08 UTC (rev 19147) @@ -1,19 +0,0 @@ -PATH_TO_TOP = ../../../reactos - -TARGET_NORC = yes - -TARGET_TYPE = program - -TARGET_APPTYPE = windows - -TARGET_NAME = accelerator - -#TARGET_SDKLIBS = kernel32.a user32.a - -TARGET_OBJECTS = accelerator.o - -TARGET_CFLAGS = -D__USE_W32API -Wall -Werror - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk _____ Deleted: trunk/rosapps/tests/alive/Makefile --- trunk/rosapps/tests/alive/Makefile 2005-11-11 20:15:21 UTC (rev 19146) +++ trunk/rosapps/tests/alive/Makefile 2005-11-11 20:47:08 UTC (rev 19147) @@ -1,23 +0,0 @@ -# $Id: Makefile,v 1.1 2004/10/21 04:48:44 sedwards Exp $ - -PATH_TO_TOP = ../../../reactos - -TARGET_NORC = yes - -TARGET_TYPE = program - -TARGET_APPTYPE = console - -TARGET_NAME = alive - -TARGET_SDKLIBS = kernel32.a user32.a - -TARGET_OBJECTS = $(TARGET_NAME).o - -TARGET_CFLAGS = -Wall -Werror - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF _____ Modified: trunk/rosapps/tests/alphablend/alphablend.c --- trunk/rosapps/tests/alphablend/alphablend.c 2005-11-11 20:15:21 UTC (rev 19146) +++ trunk/rosapps/tests/alphablend/alphablend.c 2005-11-11 20:47:08 UTC (rev 19147) @@ -10,11 +10,6 @@ LRESULT CALLBACK MainWndProc(HWND HWnd, UINT Msg, WPARAM WParam, LPARAM LParam); -WINBOOL -STDCALL -GdiAlphaBlend(HDC hdcDst,LONG DstX,LONG DstY,LONG DstCx,LONG DstCy,HDC hdcSrc,LONG SrcX,LONG SrcY,LONG SrcCx,LONG SrcCy,BLENDFUNCTION BlendFunction); - - int APIENTRY WinMain(HINSTANCE HInstance, HINSTANCE HPrevInstance, LPTSTR lpCmdLine, int nCmdShow) { _____ Deleted: trunk/rosapps/tests/apc/makefile --- trunk/rosapps/tests/apc/makefile 2005-11-11 20:15:21 UTC (rev 19146) +++ trunk/rosapps/tests/apc/makefile 2005-11-11 20:47:08 UTC (rev 19147) @@ -1,23 +0,0 @@ -# $Id: makefile,v 1.1 2004/10/21 04:48:44 sedwards Exp $ - -PATH_TO_TOP = ../../../reactos - -TARGET_NORC = yes - -TARGET_TYPE = program - -TARGET_APPTYPE = console - -TARGET_NAME = apc - -TARGET_SDKLIBS = ntdll.a kernel32.a - -TARGET_OBJECTS = $(TARGET_NAME).o - -TARGET_CFLAGS = -Wall -Werror - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF _____ Deleted: trunk/rosapps/tests/apc2/makefile --- trunk/rosapps/tests/apc2/makefile 2005-11-11 20:15:21 UTC (rev 19146) +++ trunk/rosapps/tests/apc2/makefile 2005-11-11 20:47:08 UTC (rev 19147) @@ -1,23 +0,0 @@ - - -PATH_TO_TOP = ../../../reactos - -TARGET_NORC = yes - -TARGET_TYPE = program - -TARGET_APPTYPE = console - -TARGET_NAME = apc2 - -TARGET_SDKLIBS = ntdll.a kernel32.a - -TARGET_CFLAGS = -Wall -Werror - -TARGET_OBJECTS = $(TARGET_NAME).o - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF _____ Deleted: trunk/rosapps/tests/args/makefile --- trunk/rosapps/tests/args/makefile 2005-11-11 20:15:21 UTC (rev 19146) +++ trunk/rosapps/tests/args/makefile 2005-11-11 20:47:08 UTC (rev 19147) @@ -1,21 +0,0 @@ -# $Id: makefile,v 1.1 2004/10/21 04:48:44 sedwards Exp $ - -PATH_TO_TOP = ../../../reactos - -TARGET_NORC = yes - -TARGET_TYPE = program - -TARGET_APPTYPE = console - -TARGET_NAME = args - -TARGET_OBJECTS = $(TARGET_NAME).o - -TARGET_CFLAGS = -Wall -Werror - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF _____ Deleted: trunk/rosapps/tests/atomtest/makefile --- trunk/rosapps/tests/atomtest/makefile 2005-11-11 20:15:21 UTC (rev 19146) +++ trunk/rosapps/tests/atomtest/makefile 2005-11-11 20:47:08 UTC (rev 19147) @@ -1,22 +0,0 @@ -# $Id: makefile,v 1.1 2004/10/21 04:48:44 sedwards Exp $ -PATH_TO_TOP = ../../../reactos - -TARGET_NORC = yes - -TARGET_TYPE = program - -TARGET_APPTYPE = console - -TARGET_NAME = atomtest - -TARGET_SDKLIBS = ntdll.a kernel32.a - -TARGET_OBJECTS = $(TARGET_NAME).o - -TARGET_CFLAGS = -Wall -Werror - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF _____ Deleted: trunk/rosapps/tests/bench/makefile --- trunk/rosapps/tests/bench/makefile 2005-11-11 20:15:21 UTC (rev 19146) +++ trunk/rosapps/tests/bench/makefile 2005-11-11 20:47:08 UTC (rev 19147) @@ -1,23 +0,0 @@ -# $Id: makefile,v 1.1 2004/10/21 05:11:58 sedwards Exp $ - -PATH_TO_TOP = ../../../reactos - -TARGET_NORC = yes - -TARGET_TYPE = program - -TARGET_APPTYPE = console - -TARGET_NAME = bench-thread - -TARGET_SDKLIBS = kernel32.a - -TARGET_OBJECTS = $(TARGET_NAME).o - -TARGET_CFLAGS = -Wall -Werror - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF _____ Deleted: trunk/rosapps/tests/bitblt/makefile --- trunk/rosapps/tests/bitblt/makefile 2005-11-11 20:15:21 UTC (rev 19146) +++ trunk/rosapps/tests/bitblt/makefile 2005-11-11 20:47:08 UTC (rev 19147) @@ -1,22 +0,0 @@ - -PATH_TO_TOP = ../../../reactos - -TARGET_NORC = yes - -TARGET_TYPE = program - -TARGET_APPTYPE = windows - -TARGET_NAME = bitblt - -TARGET_SDKLIBS = kernel32.a gdi32.a - -TARGET_OBJECTS = $(TARGET_NAME).o - -TARGET_CFLAGS = -Wall -Werror -D__USE_W32API - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF _____ Deleted: trunk/rosapps/tests/button/Makefile --- trunk/rosapps/tests/button/Makefile 2005-11-11 20:15:21 UTC (rev 19146) +++ trunk/rosapps/tests/button/Makefile 2005-11-11 20:47:08 UTC (rev 19147) @@ -1,22 +0,0 @@ - -PATH_TO_TOP = ../../../reactos - -TARGET_NORC = yes - -TARGET_TYPE = program - -TARGET_APPTYPE = windows - -TARGET_NAME = btntest - -TARGET_SDKLIBS = kernel32.a gdi32.a - -TARGET_OBJECTS = buttontst.o - -TARGET_CFLAGS = -Wall -Werror - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF _____ Deleted: trunk/rosapps/tests/button2/Makefile --- trunk/rosapps/tests/button2/Makefile 2005-11-11 20:15:21 UTC (rev 19146) +++ trunk/rosapps/tests/button2/Makefile 2005-11-11 20:47:08 UTC (rev 19147) @@ -1,22 +0,0 @@ - -PATH_TO_TOP = ../../../reactos - -TARGET_NORC = yes - -TARGET_TYPE = program - -TARGET_APPTYPE = windows - -TARGET_NAME = btntest2 - -TARGET_SDKLIBS = kernel32.a gdi32.a - -TARGET_OBJECTS = buttontst2.o - -TARGET_CFLAGS = -Wall -Werror - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF _____ Deleted: trunk/rosapps/tests/capclock/Makefile --- trunk/rosapps/tests/capclock/Makefile 2005-11-11 20:15:21 UTC (rev 19146) +++ trunk/rosapps/tests/capclock/Makefile 2005-11-11 20:47:08 UTC (rev 19147) @@ -1,20 +0,0 @@ - -PATH_TO_TOP = ../../../reactos - -TARGET_TYPE = program - -TARGET_APPTYPE = windows - -TARGET_NAME = capclock - -TARGET_SDKLIBS = kernel32.a - -TARGET_OBJECTS = capclock.o - -TARGET_CFLAGS = -Wall -Werror - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF _____ Deleted: trunk/rosapps/tests/carets/makefile --- trunk/rosapps/tests/carets/makefile 2005-11-11 20:15:21 UTC (rev 19146) +++ trunk/rosapps/tests/carets/makefile 2005-11-11 20:47:08 UTC (rev 19147) @@ -1,23 +0,0 @@ -# $Id: makefile,v 1.1 2004/10/21 05:11:59 sedwards Exp $ - -PATH_TO_TOP = ../../../reactos - -TARGET_NORC = no - -TARGET_TYPE = program - -TARGET_APPTYPE = windows - -TARGET_NAME = carets - -TARGET_SDKLIBS = kernel32.a gdi32.a ntdll.a - -TARGET_OBJECTS = $(TARGET_NAME).o - -TARGET_CFLAGS = -Wall -Werror - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF _____ Deleted: trunk/rosapps/tests/combo/makefile --- trunk/rosapps/tests/combo/makefile 2005-11-11 20:15:21 UTC (rev 19146) +++ trunk/rosapps/tests/combo/makefile 2005-11-11 20:47:08 UTC (rev 19147) @@ -1,25 +0,0 @@ - -PATH_TO_TOP = ../../../reactos - -TARGET_NORC = yes - -TARGET_TYPE = program - -TARGET_APPTYPE = windows - -TARGET_NAME = combotst - -TARGET_SDKLIBS = kernel32.a gdi32.a - -TARGET_OBJECTS = \ - combotst.o \ - utils.o - -TARGET_CFLAGS = -Wall -Werror - - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF _____ Deleted: trunk/rosapps/tests/consume/Makefile --- trunk/rosapps/tests/consume/Makefile 2005-11-11 20:15:21 UTC (rev 19146) +++ trunk/rosapps/tests/consume/Makefile 2005-11-11 20:47:08 UTC (rev 19147) @@ -1,21 +0,0 @@ -# $Id: Makefile,v 1.1 2004/10/21 05:11:59 sedwards Exp $ - -PATH_TO_TOP = ../../../reactos - -TARGET_NORC = yes - -TARGET_TYPE = program - -TARGET_APPTYPE = console - -TARGET_NAME = consume - -TARGET_OBJECTS = $(TARGET_NAME).o - -TARGET_CFLAGS = -Wall -Werror - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF _____ Deleted: trunk/rosapps/tests/copymove/Makefile --- trunk/rosapps/tests/copymove/Makefile 2005-11-11 20:15:21 UTC (rev 19146) +++ trunk/rosapps/tests/copymove/Makefile 2005-11-11 20:47:08 UTC (rev 19147) @@ -1,21 +0,0 @@ -# $Id: Makefile,v 1.1 2004/10/21 05:12:00 sedwards Exp $ - -PATH_TO_TOP = ../../../reactos - -TARGET_NORC = yes - -TARGET_TYPE = program - -TARGET_APPTYPE = console - -TARGET_NAME = copymove - -TARGET_OBJECTS = $(TARGET_NAME).o - -TARGET_CFLAGS = -Wall -Werror - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF _____ Deleted: trunk/rosapps/tests/count/Makefile --- trunk/rosapps/tests/count/Makefile 2005-11-11 20:15:21 UTC (rev 19146) +++ trunk/rosapps/tests/count/Makefile 2005-11-11 20:47:08 UTC (rev 19147) @@ -1,23 +0,0 @@ -# $Id: Makefile,v 1.1 2004/10/21 05:12:00 sedwards Exp $ - -PATH_TO_TOP = ../../../reactos - -TARGET_NORC = yes - -TARGET_TYPE = program - -TARGET_APPTYPE = console - -TARGET_NAME = count - -TARGET_SDKLIBS = kernel32.a user32.a - -TARGET_OBJECTS = $(TARGET_NAME).o - -TARGET_CFLAGS = -Wall -Werror - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF _____ Deleted: trunk/rosapps/tests/create-links/Makefile --- trunk/rosapps/tests/create-links/Makefile 2005-11-11 20:15:21 UTC (rev 19146) +++ trunk/rosapps/tests/create-links/Makefile 2005-11-11 20:47:08 UTC (rev 19147) @@ -1,25 +0,0 @@ -# $Id: Makefile,v 1.1 2004/10/21 05:12:00 sedwards Exp $ - -PATH_TO_TOP = ../../../reactos - -TARGET_NORC = yes - -TARGET_TYPE = program - -TARGET_APPTYPE = console - -TARGET_NAME = create-links - -TARGET_SDKLIBS = kernel32.a gdi32.a ole32.a shell32.a shlwapi.a - -TARGET_GCCLIBS = uuid - -TARGET_OBJECTS = $(TARGET_NAME).o - -TARGET_CFLAGS = -Wall -Werror -D__USE_W32API -D_WIN32_IE=0x0400 - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF _____ Deleted: trunk/rosapps/tests/dibtest/makefile --- trunk/rosapps/tests/dibtest/makefile 2005-11-11 20:15:21 UTC (rev 19146) +++ trunk/rosapps/tests/dibtest/makefile 2005-11-11 20:47:08 UTC (rev 19147) @@ -1,23 +0,0 @@ -# $Id$ - -PATH_TO_TOP = ../../../reactos - -TARGET_NORC = yes - -TARGET_TYPE = program - -TARGET_APPTYPE = windows - -TARGET_NAME = dibtest - -TARGET_SDKLIBS = kernel32.a gdi32.a - -TARGET_OBJECTS = $(TARGET_NAME).o - -TARGET_CFLAGS = -Wall -Werror - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF _____ Deleted: trunk/rosapps/tests/dirdlg/makefile --- trunk/rosapps/tests/dirdlg/makefile 2005-11-11 20:15:21 UTC (rev 19146) +++ trunk/rosapps/tests/dirdlg/makefile 2005-11-11 20:47:08 UTC (rev 19147) @@ -1,21 +0,0 @@ -PATH_TO_TOP = ../../../reactos - -TARGET_NORC = no - -TARGET_TYPE = program - -TARGET_APPTYPE = windows - -TARGET_NAME = dirdlg - -TARGET_SDKLIBS = ntdll.a kernel32.a gdi32.a - -TARGET_OBJECTS = $(TARGET_NAME).o - -TARGET_CFLAGS = -Wall -Werror - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF _____ Modified: trunk/rosapps/tests/directory.xml --- trunk/rosapps/tests/directory.xml 2005-11-11 20:15:21 UTC (rev 19146) +++ trunk/rosapps/tests/directory.xml 2005-11-11 20:47:08 UTC (rev 19147) @@ -1,3 +1,12 @@ +<directory name="accelerator"> + <xi:include href="accelerator/accelerator.xml" /> +</directory> +<directory name="alive"> + <xi:include href="alive/alive.xml" /> +</directory> <directory name="alphablend"> <xi:include href="alphablend/alphablend.xml" /> -</directory> \ No newline at end of file +</directory> +<directory name="apc"> + <xi:include href="apc/apc.xml" /> +</directory> _____ Deleted: trunk/rosapps/tests/diskspeed/makefile --- trunk/rosapps/tests/diskspeed/makefile 2005-11-11 20:15:21 UTC (rev 19146) +++ trunk/rosapps/tests/diskspeed/makefile 2005-11-11 20:47:08 UTC (rev 19147) @@ -1,23 +0,0 @@ -# $Id: makefile,v 1.1 2004/10/21 05:12:00 sedwards Exp $ - -PATH_TO_TOP = ../../../reactos - -TARGET_NORC = yes - -TARGET_TYPE = program - -TARGET_APPTYPE = console - -TARGET_NAME = diskspeed - -TARGET_SDKLIBS = kernel32.a - -TARGET_OBJECTS = $(TARGET_NAME).o - -TARGET_CFLAGS = -Wall -Werror - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF _____ Deleted: trunk/rosapps/tests/dnsapi/makefile --- trunk/rosapps/tests/dnsapi/makefile 2005-11-11 20:15:21 UTC (rev 19146) +++ trunk/rosapps/tests/dnsapi/makefile 2005-11-11 20:47:08 UTC (rev 19147) @@ -1,22 +0,0 @@ - -PATH_TO_TOP = ../../../reactos - -TARGET_NORC = yes - -TARGET_TYPE = program - -TARGET_APPTYPE = console - -TARGET_NAME = dnsapi - -TARGET_SDKLIBS = dnsapi.a ws2_32.a kernel32.a - -TARGET_OBJECTS = $(TARGET_NAME).o - -TARGET_CFLAGS = -D__USE_W32API -Wall -Werror -g - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF _____ Deleted: trunk/rosapps/tests/dnsquery/makefile --- trunk/rosapps/tests/dnsquery/makefile 2005-11-11 20:15:21 UTC (rev 19146) +++ trunk/rosapps/tests/dnsquery/makefile 2005-11-11 20:47:08 UTC (rev 19147) @@ -1,22 +0,0 @@ - -PATH_TO_TOP = ../../../reactos - -TARGET_NORC = yes - -TARGET_TYPE = program - -TARGET_APPTYPE = console - -TARGET_NAME = dnsquery - -TARGET_SDKLIBS = dnsapi.a ws2_32.a kernel32.a - -TARGET_OBJECTS = $(TARGET_NAME).o - -TARGET_CFLAGS = -D__USE_W32API -Wall -Werror -g - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF _____ Deleted: trunk/rosapps/tests/dump_shared_data/makefile --- trunk/rosapps/tests/dump_shared_data/makefile 2005-11-11 20:15:21 UTC (rev 19146) +++ trunk/rosapps/tests/dump_shared_data/makefile 2005-11-11 20:47:08 UTC (rev 19147) @@ -1,22 +0,0 @@ -# $Id: makefile,v 1.1 2004/10/21 05:12:01 sedwards Exp $ - -PATH_TO_TOP = ../../../reactos - -TARGET_NORC = yes - -TARGET_TYPE = program - -TARGET_APPTYPE = console - -TARGET_NAME = dump_shared_data - -TARGET_OBJECTS = $(TARGET_NAME).o - -TARGET_CFLAGS = -Wall -Werror - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF - _____ Deleted: trunk/rosapps/tests/edit/makefile --- trunk/rosapps/tests/edit/makefile 2005-11-11 20:15:21 UTC (rev 19146) +++ trunk/rosapps/tests/edit/makefile 2005-11-11 20:47:08 UTC (rev 19147) @@ -1,24 +0,0 @@ - -PATH_TO_TOP = ../../../reactos - -TARGET_NORC = yes - -TARGET_TYPE = program - -TARGET_APPTYPE = windows - -TARGET_NAME = edittest - -TARGET_SDKLIBS = kernel32.a gdi32.a - -TARGET_OBJECTS = \ - edittest.o \ - utils.o - -TARGET_CFLAGS = -Wall -Werror -D__USE_W32API - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF _____ Deleted: trunk/rosapps/tests/enhmetafile/makefile --- trunk/rosapps/tests/enhmetafile/makefile 2005-11-11 20:15:21 UTC (rev 19146) +++ trunk/rosapps/tests/enhmetafile/makefile 2005-11-11 20:47:08 UTC (rev 19147) @@ -1,23 +0,0 @@ -# $Id: makefile,v 1.1 2004/10/21 05:12:01 sedwards Exp $ - -PATH_TO_TOP = ../../../reactos - -TARGET_NORC = yes - -TARGET_TYPE = program - -TARGET_APPTYPE = windows - -TARGET_NAME = enhmetafile - -TARGET_SDKLIBS = kernel32.a gdi32.a - -TARGET_OBJECTS = $(TARGET_NAME).o - -TARGET_CFLAGS = -Wall -Werror - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF _____ Deleted: trunk/rosapps/tests/enumfonts/makefile --- trunk/rosapps/tests/enumfonts/makefile 2005-11-11 20:15:21 UTC (rev 19146) +++ trunk/rosapps/tests/enumfonts/makefile 2005-11-11 20:47:08 UTC (rev 19147) @@ -1,24 +0,0 @@ - -PATH_TO_TOP = ../../../reactos - -TARGET_NORC = yes - -TARGET_TYPE = program - -TARGET_APPTYPE = windows - -TARGET_NAME = enumfonts - -TARGET_SDKLIBS = kernel32.a gdi32.a - -TARGET_OBJECTS = $(TARGET_NAME).o - -TARGET_GCCLIBS = stdc++ - -TARGET_CPPFLAGS = -Wall -Werror -D__USE_W32API -DWIN32 -D_WIN32_IE=0x0600 -D_WIN32_WINNT=0x0501 -fexceptions -Wall -I. - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF _____ Deleted: trunk/rosapps/tests/enumwnd/makefile --- trunk/rosapps/tests/enumwnd/makefile 2005-11-11 20:15:21 UTC (rev 19146) +++ trunk/rosapps/tests/enumwnd/makefile 2005-11-11 20:47:08 UTC (rev 19147) @@ -1,23 +0,0 @@ -# $Id: makefile,v 1.1 2004/10/21 05:12:01 sedwards Exp $ - -PATH_TO_TOP = ../../../reactos - -TARGET_NORC = yes - -TARGET_TYPE = program - -TARGET_APPTYPE = windows - -TARGET_NAME = enumwnd - -TARGET_SDKLIBS = kernel32.a gdi32.a - -TARGET_OBJECTS = $(TARGET_NAME).o - -TARGET_CFLAGS = -Wall -Werror - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF _____ Deleted: trunk/rosapps/tests/enumws/makefile --- trunk/rosapps/tests/enumws/makefile 2005-11-11 20:15:21 UTC (rev 19146) +++ trunk/rosapps/tests/enumws/makefile 2005-11-11 20:47:08 UTC (rev 19147) @@ -1,21 +0,0 @@ -PATH_TO_TOP = ../../../reactos - -TARGET_NORC = yes - -TARGET_TYPE = program - -TARGET_APPTYPE = console - -TARGET_NAME = enumws - -TARGET_SDKLIBS = user32.a - -TARGET_OBJECTS = $(TARGET_NAME).o - -TARGET_CFLAGS = -Wall -Werror - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF _____ Deleted: trunk/rosapps/tests/event/makefile --- trunk/rosapps/tests/event/makefile 2005-11-11 20:15:21 UTC (rev 19146) +++ trunk/rosapps/tests/event/makefile 2005-11-11 20:47:08 UTC (rev 19147) @@ -1,23 +0,0 @@ -# $Id: makefile,v 1.1 2004/10/21 05:12:01 sedwards Exp $ - -PATH_TO_TOP = ../../../reactos - -TARGET_NORC = yes - -TARGET_TYPE = program - -TARGET_APPTYPE = console - -TARGET_NAME = event - -TARGET_SDKLIBS = kernel32.a - -TARGET_OBJECTS = $(TARGET_NAME).o - -TARGET_CFLAGS = -Wall -Werror - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF _____ Deleted: trunk/rosapps/tests/eventpair/makefile --- trunk/rosapps/tests/eventpair/makefile 2005-11-11 20:15:21 UTC (rev 19146) +++ trunk/rosapps/tests/eventpair/makefile 2005-11-11 20:47:08 UTC (rev 19147) @@ -1,23 +0,0 @@ -# $Id: makefile,v 1.1 2004/10/21 05:12:01 sedwards Exp $ - -PATH_TO_TOP = ../../../reactos - -TARGET_NORC = yes - -TARGET_TYPE = program - -TARGET_APPTYPE = console - -TARGET_NAME = eventpair - -TARGET_SDKLIBS = ntdll.a - -TARGET_OBJECTS = $(TARGET_NAME).o - -TARGET_CFLAGS = -Wall -Werror - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF _____ Deleted: trunk/rosapps/tests/fiber/Makefile --- trunk/rosapps/tests/fiber/Makefile 2005-11-11 20:15:21 UTC (rev 19146) +++ trunk/rosapps/tests/fiber/Makefile 2005-11-11 20:47:08 UTC (rev 19147) @@ -1,21 +0,0 @@ -# $Id: Makefile,v 1.1 2004/10/21 05:12:02 sedwards Exp $ - -PATH_TO_TOP = ../../../reactos - -TARGET_NORC = yes - -TARGET_TYPE = program - -TARGET_APPTYPE = console - -TARGET_NAME = fiber - -TARGET_OBJECTS = $(TARGET_NAME).o - -TARGET_CFLAGS = -Wall -Werror -D__USE_W32API - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF _____ Deleted: trunk/rosapps/tests/gethostbyname/makefile --- trunk/rosapps/tests/gethostbyname/makefile 2005-11-11 20:15:21 UTC (rev 19146) +++ trunk/rosapps/tests/gethostbyname/makefile 2005-11-11 20:47:08 UTC (rev 19147) @@ -1,22 +0,0 @@ - -PATH_TO_TOP = ../../../reactos - -TARGET_NORC = yes - -TARGET_TYPE = program - -TARGET_APPTYPE = console - -TARGET_NAME = gethostbyname - -TARGET_SDKLIBS = ws2_32.a kernel32.a - -TARGET_OBJECTS = $(TARGET_NAME).o - -TARGET_CFLAGS = -D__USE_W32API -Wall -Werror -g - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF _____ Deleted: trunk/rosapps/tests/global_mem/Makefile --- trunk/rosapps/tests/global_mem/Makefile 2005-11-11 20:15:21 UTC (rev 19146) +++ trunk/rosapps/tests/global_mem/Makefile 2005-11-11 20:47:08 UTC (rev 19147) @@ -1,21 +0,0 @@ -# $Id: Makefile,v 1.1 2004/10/21 05:12:02 sedwards Exp $ - -PATH_TO_TOP = ../../../reactos - -TARGET_NORC = yes - -TARGET_TYPE = program - -TARGET_APPTYPE = console - -TARGET_NAME = global_mem - -TARGET_OBJECTS = $(TARGET_NAME).o - -TARGET_CFLAGS = -Wall -Werror - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF _____ Deleted: trunk/rosapps/tests/gradient/makefile --- trunk/rosapps/tests/gradient/makefile 2005-11-11 20:15:21 UTC (rev 19146) +++ trunk/rosapps/tests/gradient/makefile 2005-11-11 20:47:08 UTC (rev 19147) @@ -1,23 +0,0 @@ -# $Id: makefile,v 1.1 2004/10/21 05:12:02 sedwards Exp $ - -PATH_TO_TOP = ../../../reactos - -TARGET_NORC = yes - -TARGET_TYPE = program - -TARGET_APPTYPE = windows - -TARGET_NAME = gradient - -TARGET_SDKLIBS = gdi32.a - -TARGET_OBJECTS = $(TARGET_NAME).o - -TARGET_CFLAGS = -Wall -Werror - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF _____ Deleted: trunk/rosapps/tests/guithreadinfo/makefile --- trunk/rosapps/tests/guithreadinfo/makefile 2005-11-11 20:15:21 UTC (rev 19146) +++ trunk/rosapps/tests/guithreadinfo/makefile 2005-11-11 20:47:08 UTC (rev 19147) @@ -1,23 +0,0 @@ -# $Id: makefile,v 1.1 2004/10/21 05:12:02 sedwards Exp $ - -PATH_TO_TOP = ../../../reactos - -TARGET_NORC = yes - -TARGET_TYPE = program - -TARGET_APPTYPE = windows - -TARGET_NAME = guithreadinfo - -TARGET_SDKLIBS = kernel32.a gdi32.a user32.a - -TARGET_OBJECTS = $(TARGET_NAME).o - -TARGET_CFLAGS = -Wall -Werror - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF _____ Deleted: trunk/rosapps/tests/hello/makefile --- trunk/rosapps/tests/hello/makefile 2005-11-11 20:15:21 UTC (rev 19146) +++ trunk/rosapps/tests/hello/makefile 2005-11-11 20:47:08 UTC (rev 19147) @@ -1,21 +0,0 @@ -# $Id: makefile,v 1.1 2004/10/21 05:12:02 sedwards Exp $ - -PATH_TO_TOP = ../../../reactos [truncated at 1000 lines; 1676 more skipped]

18 years, 10 months

[hpoussin] 19146: Fix wrong test when checking arguments in SetupDiGetDriverInfoDetailW.

by hpoussin＠svn.reactos.com

Fix wrong test when checking arguments in SetupDiGetDriverInfoDetailW. It was at least preventing install of display drivers Modified: trunk/reactos/lib/setupapi/devinst.c _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-11-11 20:07:05 UTC (rev 19145) +++ trunk/reactos/lib/setupapi/devinst.c 2005-11-11 20:15:21 UTC (rev 19146) @@ -5374,7 +5374,7 @@ SetLastError(ERROR_INVALID_PARAMETER); else if (DriverInfoDetailData && DriverInfoDetailData->cbSize != sizeof(SP_DRVINFO_DETAIL_DATA_W)) SetLastError(ERROR_INVALID_USER_BUFFER); - else if (DriverInfoDetailData && DriverInfoDetailData->Reserved == 0) + else if (DriverInfoData->Reserved == 0) SetLastError(ERROR_NO_DRIVER_SELECTED); else {

18 years, 10 months

[greatlrd] 19145: Add opitopn do not isntall bootloarder as Bug: 961 suggest to make it easy for other people that do not want install freeldr.

by greatlrd＠svn.reactos.com

Add opitopn do not isntall bootloarder as Bug: 961 suggest to make it easy for other people that do not want install freeldr. Modified: trunk/reactos/subsys/system/usetup/usetup.c _____ Modified: trunk/reactos/subsys/system/usetup/usetup.c --- trunk/reactos/subsys/system/usetup/usetup.c 2005-11-11 19:59:38 UTC (rev 19144) +++ trunk/reactos/subsys/system/usetup/usetup.c 2005-11-11 20:07:05 UTC (rev 19145) @@ -3310,6 +3310,7 @@ SetTextXY(8, 12, "Install bootloader on the harddisk (MBR)."); SetTextXY(8, 13, "Install bootloader on a floppy disk."); + SetTextXY(8, 14, "Skip install bootloader."); InvertTextXY (8, Line, 48, 1); SetStatusText(" ENTER = Continue F3 = Quit"); @@ -3322,28 +3323,25 @@ (Ir->Event.KeyEvent.wVirtualKeyCode == VK_DOWN)) /* DOWN */ { NormalTextXY (8, Line, 48, 1); - if (Line == 12) - Line = 13; - else if (Line == 13) - Line = 12; -#if 0 - else - Line++; -#endif + + Line++; + if (Line<12) Line=14; + if (Line>14) Line=12; + + + InvertTextXY (8, Line, 48, 1); } else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_UP)) /* UP */ { NormalTextXY (8, Line, 48, 1); - if (Line == 12) - Line = 13; - else if (Line == 13) - Line = 12; -#if 0 - else - Line--; -#endif + + Line--; + if (Line<12) Line=14; + if (Line>14) Line=12; + + InvertTextXY (8, Line, 48, 1); } else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && @@ -3363,6 +3361,10 @@ { return BOOT_LOADER_FLOPPY_PAGE; } + else if (Line == 14) + { + return SUCCESS_PAGE;; + } return BOOT_LOADER_PAGE; }

18 years, 10 months

[weiden] 19144: fixed some more warnings when compiled with -Wwrite-strings

by weiden＠svn.reactos.com

fixed some more warnings when compiled with -Wwrite-strings Modified: trunk/reactos/boot/freeldr/freeldr/include/inffile.h Modified: trunk/reactos/boot/freeldr/freeldr/inffile/inffile.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c Modified: trunk/reactos/drivers/bus/pci/pci.c Modified: trunk/reactos/drivers/fs/cdfs/cdfs.h Modified: trunk/reactos/drivers/fs/cdfs/fcb.c Modified: trunk/reactos/drivers/fs/fs_rec/fs_rec.c Modified: trunk/reactos/drivers/fs/ntfs/fcb.c Modified: trunk/reactos/drivers/fs/ntfs/ntfs.h Modified: trunk/reactos/drivers/fs/vfat/volume.c Modified: trunk/reactos/drivers/net/ndis/ndis/miniport.c Modified: trunk/reactos/lib/rossym/find.c _____ Modified: trunk/reactos/boot/freeldr/freeldr/include/inffile.h --- trunk/reactos/boot/freeldr/freeldr/include/inffile.h 2005-11-11 19:31:53 UTC (rev 19143) +++ trunk/reactos/boot/freeldr/freeldr/include/inffile.h 2005-11-11 19:59:38 UTC (rev 19144) @@ -51,7 +51,7 @@ BOOLEAN InfOpenFile (PHINF InfHandle, - PCHAR FileName, + PCSTR FileName, PULONG ErrorLine); VOID @@ -60,8 +60,8 @@ BOOLEAN InfFindFirstLine (HINF InfHandle, - PCHAR Section, - PCHAR Key, + PCSTR Section, + PCSTR Key, PINFCONTEXT Context); BOOLEAN @@ -123,7 +123,7 @@ BOOLEAN InfGetDataField (PINFCONTEXT Context, ULONG FieldIndex, - PCHAR *Data); + PCSTR *Data); #endif /* __INFCACHE_H__ */ _____ Modified: trunk/reactos/boot/freeldr/freeldr/inffile/inffile.c --- trunk/reactos/boot/freeldr/freeldr/inffile/inffile.c 2005-11-11 19:31:53 UTC (rev 19143) +++ trunk/reactos/boot/freeldr/freeldr/inffile/inffile.c 2005-11-11 19:59:38 UTC (rev 19144) @@ -210,7 +210,7 @@ static PINFCACHESECTION InfpCacheFindSection (PINFCACHE Cache, - PCHAR Name) + PCSTR Name) { PINFCACHESECTION Section = NULL; @@ -373,7 +373,7 @@ static PINFCACHELINE InfpCacheFindKeyLine (PINFCACHESECTION Section, - PCHAR Key) + PCSTR Key) { PINFCACHELINE Line; @@ -876,7 +876,7 @@ BOOLEAN InfOpenFile(PHINF InfHandle, - PCHAR FileName, + PCSTR FileName, PULONG ErrorLine) { PFILE FileHandle; @@ -991,8 +991,8 @@ BOOLEAN InfFindFirstLine (HINF InfHandle, - PCHAR Section, - PCHAR Key, + PCSTR Section, + PCSTR Key, PINFCONTEXT Context) { PINFCACHE Cache; @@ -1457,7 +1457,7 @@ BOOLEAN InfGetDataField (PINFCONTEXT Context, ULONG FieldIndex, - PCHAR *Data) + PCSTR *Data) { PINFCACHELINE CacheLine; PINFCACHEFIELD CacheField; _____ Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c --- trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c 2005-11-11 19:31:53 UTC (rev 19143) +++ trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c 2005-11-11 19:59:38 UTC (rev 19144) @@ -60,14 +60,14 @@ } static BOOL -LoadKernel(PCHAR szSourcePath, PCHAR szFileName) +LoadKernel(PCSTR szSourcePath, PCSTR szFileName) { CHAR szFullName[256]; #ifdef USE_UI CHAR szBuffer[80]; #endif PFILE FilePointer; - PCHAR szShortName; + PCSTR szShortName; if (szSourcePath[0] != '\\') { @@ -125,7 +125,7 @@ } static BOOL -LoadKernelSymbols(PCHAR szSourcePath, PCHAR szFileName) +LoadKernelSymbols(PCSTR szSourcePath, PCSTR szFileName) { static ROSSYM_CALLBACKS FreeldrCallbacks = { @@ -180,14 +180,14 @@ } static BOOL -LoadDriver(PCHAR szSourcePath, PCHAR szFileName) +LoadDriver(PCSTR szSourcePath, PCSTR szFileName) { CHAR szFullName[256]; #ifdef USE_UI CHAR szBuffer[80]; #endif PFILE FilePointer; - PCHAR szShortName; + PCSTR szShortName; if (szSourcePath[0] != '\\') { @@ -245,14 +245,14 @@ static BOOL -LoadNlsFile(PCHAR szSourcePath, PCHAR szFileName, PCHAR szModuleName) +LoadNlsFile(PCSTR szSourcePath, PCSTR szFileName, PCSTR szModuleName) { CHAR szFullName[256]; #ifdef USE_UI CHAR szBuffer[80]; #endif PFILE FilePointer; - PCHAR szShortName; + PCSTR szShortName; if (szSourcePath[0] != '\\') { @@ -312,8 +312,8 @@ { ULONG_PTR Base; ULONG Size; - char *SourcePath; - char *LoadOptions; + const char *SourcePath; + const char *LoadOptions; UINT i; HINF InfHandle; _____ Modified: trunk/reactos/drivers/bus/pci/pci.c --- trunk/reactos/drivers/bus/pci/pci.c 2005-11-11 19:31:53 UTC (rev 19143) +++ trunk/reactos/drivers/bus/pci/pci.c 2005-11-11 19:59:38 UTC (rev 19144) @@ -342,7 +342,7 @@ PciCreateDeviceDescriptionString(PUNICODE_STRING DeviceDescription, PPCI_DEVICE Device) { - PWSTR Description; + PCWSTR Description; switch (Device->PciConfig.BaseClass) { _____ Modified: trunk/reactos/drivers/fs/cdfs/cdfs.h --- trunk/reactos/drivers/fs/cdfs/cdfs.h 2005-11-11 19:31:53 UTC (rev 19143) +++ trunk/reactos/drivers/fs/cdfs/cdfs.h 2005-11-11 19:59:38 UTC (rev 19144) @@ -288,7 +288,7 @@ /* fcb.c */ PFCB -CdfsCreateFCB(PWCHAR FileName); +CdfsCreateFCB(PCWSTR FileName); VOID CdfsDestroyFCB(PFCB Fcb); _____ Modified: trunk/reactos/drivers/fs/cdfs/fcb.c --- trunk/reactos/drivers/fs/cdfs/fcb.c 2005-11-11 19:31:53 UTC (rev 19143) +++ trunk/reactos/drivers/fs/cdfs/fcb.c 2005-11-11 19:59:38 UTC (rev 19144) @@ -68,7 +68,7 @@ PFCB -CdfsCreateFCB(PWSTR FileName) +CdfsCreateFCB(PCWSTR FileName) { PFCB Fcb; _____ Modified: trunk/reactos/drivers/fs/fs_rec/fs_rec.c --- trunk/reactos/drivers/fs/fs_rec/fs_rec.c 2005-11-11 19:31:53 UTC (rev 19143) +++ trunk/reactos/drivers/fs/fs_rec/fs_rec.c 2005-11-11 19:59:38 UTC (rev 19144) @@ -121,8 +121,8 @@ static NTSTATUS FsRecRegisterFs(PDRIVER_OBJECT DriverObject, - PWSTR FsName, - PWSTR RecognizerName, + PCWSTR FsName, + PCWSTR RecognizerName, ULONG DeviceType, ULONG FsType) { _____ Modified: trunk/reactos/drivers/fs/ntfs/fcb.c --- trunk/reactos/drivers/fs/ntfs/fcb.c 2005-11-11 19:31:53 UTC (rev 19143) +++ trunk/reactos/drivers/fs/ntfs/fcb.c 2005-11-11 19:59:38 UTC (rev 19144) @@ -70,7 +70,7 @@ PFCB -NtfsCreateFCB(PWSTR FileName) +NtfsCreateFCB(PCWSTR FileName) { PFCB Fcb; @@ -180,7 +180,7 @@ PFCB NtfsGrabFCBFromTable(PDEVICE_EXTENSION Vcb, - PWSTR FileName) + PCWSTR FileName) { KIRQL oldIrql; PFCB Fcb; _____ Modified: trunk/reactos/drivers/fs/ntfs/ntfs.h --- trunk/reactos/drivers/fs/ntfs/ntfs.h 2005-11-11 19:31:53 UTC (rev 19143) +++ trunk/reactos/drivers/fs/ntfs/ntfs.h 2005-11-11 19:59:38 UTC (rev 19144) @@ -355,7 +355,7 @@ /* fcb.c */ PFCB -NtfsCreateFCB(PWCHAR FileName); +NtfsCreateFCB(PCWSTR FileName); VOID NtfsDestroyFCB(PFCB Fcb); @@ -380,7 +380,7 @@ PFCB NtfsGrabFCBFromTable(PDEVICE_EXTENSION Vcb, - PWSTR FileName); + PCWSTR FileName); NTSTATUS NtfsFCBInitializeCache(PVCB Vcb, _____ Modified: trunk/reactos/drivers/fs/vfat/volume.c --- trunk/reactos/drivers/fs/vfat/volume.c 2005-11-11 19:31:53 UTC (rev 19143) +++ trunk/reactos/drivers/fs/vfat/volume.c 2005-11-11 19:59:38 UTC (rev 19144) @@ -58,7 +58,7 @@ PFILE_FS_ATTRIBUTE_INFORMATION FsAttributeInfo, PULONG BufferLength) { - WCHAR* pName; ULONG Length; + PCWSTR pName; ULONG Length; DPRINT("FsdGetFsAttributeInformation()\n"); DPRINT("FsAttributeInfo = %p\n", FsAttributeInfo); DPRINT("BufferLength %lu\n", *BufferLength); _____ Modified: trunk/reactos/drivers/net/ndis/ndis/miniport.c --- trunk/reactos/drivers/net/ndis/ndis/miniport.c 2005-11-11 19:31:53 UTC (rev 19143) +++ trunk/reactos/drivers/net/ndis/ndis/miniport.c 2005-11-11 19:59:38 UTC (rev 19144) @@ -1335,7 +1335,7 @@ Status = IoGetDeviceProperty(Adapter->NdisMiniportBlock.PhysicalDeviceObject, DevicePropertyLegacyBusType, Size, &Adapter->NdisMiniportBlock.BusType, &Size); - if (!NT_SUCCESS(Status) || Adapter->NdisMiniportBlock.BusType == InterfaceTypeUndefined) + if (!NT_SUCCESS(Status) || (INTERFACE_TYPE)Adapter->NdisMiniportBlock.BusType == InterfaceTypeUndefined) { NdisInitUnicodeString(&ParamName, L"BusType"); NdisReadConfiguration(&NdisStatus, &ConfigParam, ConfigHandle, _____ Modified: trunk/reactos/lib/rossym/find.c --- trunk/reactos/lib/rossym/find.c 2005-11-11 19:31:53 UTC (rev 19143) +++ trunk/reactos/lib/rossym/find.c 2005-11-11 19:59:38 UTC (rev 19144) @@ -127,7 +127,7 @@ } if (FileName != NULL) { - PCHAR Name = ""; + PCSTR Name = ""; if (RosSymEntry->FileOffset != 0) { Name = (PCHAR) RosSymInfo->Strings + RosSymEntry->FileOffset; @@ -136,7 +136,7 @@ } if (FunctionName != NULL) { - PCHAR Name = ""; + PCSTR Name = ""; if (RosSymEntry->FunctionOffset != 0) { Name = (PCHAR) RosSymInfo->Strings + RosSymEntry->FunctionOffset;

18 years, 10 months

[greatlrd] 19143: Greek translation by Apal (Apostolos Alexiadis grad0621@di.uoa.gr) Bug 967

by greatlrd＠svn.reactos.com

Greek translation by Apal (Apostolos Alexiadis grad0621(a)di.uoa.gr) Bug 967 Added: trunk/reactos/subsys/system/notepad/Gr.rc Modified: trunk/reactos/subsys/system/notepad/rsrc.rc _____ Added: trunk/reactos/subsys/system/notepad/Gr.rc --- trunk/reactos/subsys/system/notepad/Gr.rc 2005-11-11 19:07:27 UTC (rev 19142) +++ trunk/reactos/subsys/system/notepad/Gr.rc 2005-11-11 19:31:53 UTC (rev 19143) @@ -0,0 +1,167 @@ +/* + * Notepad (Greek resources) + * + * Copyright 2005 Apostolos Alexiadis (djapal(a)gmail.com) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_GREEK, SUBLANG_DEFAULT + +MAIN_MENU MENU +BEGIN + POPUP "&?±¸Õ?´" + BEGIN + MENUITEM "&?¦´...", CMD_NEW + MENUITEM "&óÝ´ÚÒýß\tCtrl+O", CMD_OPEN + MENUITEM "?´ÞÌÛÕ§&¾þ\tCtrl+S", CMD_SAVE + MENUITEM "?´ÞÌÛÕ§¾þ &¨?...", CMD_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "?&ÚÙ´Ò¦? ¾ÕÙ?õß?...", CMD_PAGE_SETUP + MENUITEM "&?Û¶²¨¾þ", CMD_PRINT + MENUITEM "?ÚÙ´Ò¦? ÕÛ&¶§¨¶Ì ...", CMD_PRINTER_SETUP + MENUITEM SEPARATOR + MENUITEM "©&¯´õ´?", CMD_EXIT + END + POPUP "&Edit" + BEGIN + MENUITEM "?&Ýß?±Õ¾þ\tCtrl+Z", CMD_UNDO + MENUITEM SEPARATOR + MENUITEM "?´Û´&Ì\tCtrl+X", CMD_CUT + MENUITEM "&?Ý¶ÚÒ±ß÷Ì\tCtrl+C", CMD_COPY + MENUITEM "&?ÚÛ³ÙÙþ¾þ\tCtrl+V", CMD_PASTE + MENUITEM "&?ÚßÒ±ß÷Ì\tDel", CMD_DELETE + MENUITEM SEPARATOR + MENUITEM "&?²±Õ¾þ...\tCtrl+F", CMD_SEARCH + MENUITEM "?²±Õ¾þ Õ&³ýÕÝ´§\tF3", CMD_SEARCH_NEXT + MENUITEM "?Ý¶ÚÛß¶?¾¶ß¾þ\tCtrl+H", CMD_REPLACE + MENUITEM "&?Õ¶?Ôß¾þ ¾¶´...\tCtrl+G", CMD_GOTO + MENUITEM SEPARATOR + MENUITEM "?ÚÙ´ÒÌ &?Ù¨Ý\tCtrl+A", CMD_SELECT_ALL + MENUITEM "&?±ß/ÃýÕ±´ýþÝ?ß\tF5", CMD_TIME_DATE + END + POPUP "Í&´±ý?" + BEGIN + MENUITEM "&?ý÷?ÝÚ¾þ ýÕÒ?Ù¨Ý Ò±ßýý?Ý", CMD_WRAP + MENUITEM "&?±ßýýß¶´¾ÕÚ±?...", CMD_FONT + END + POPUP "&?ý÷?ÝÚ¾þ" + BEGIN + MENUITEM "?±ßýýÌ &Ûß¶?¾¶ß¾þ?", CMD_STATUSBAR + END + POPUP "&?´ÌÞÕÚß" + BEGIN + MENUITEM "&ðÕ±ÚÕ¸³ýÕÝß", CMD_HELP_CONTENTS + MENUITEM "&?ÝßµÌ¶þ¾þ...", CMD_HELP_SEARCH + MENUITEM "&?´ÌÞÕÚß ¾¶þ Ô´ÌÞÕÚß", CMD_HELP_ON_HELP + MENUITEM SEPARATOR + MENUITEM "ó&õÕÚß", CMD_LICENSE + MENUITEM "&NO WARRANTY", CMD_NO_WARRANTY + MENUITEM "ðÙþ±´&÷´±?Õ?", CMD_ABOUT_WINE + END +END + +/* Dialog `Page setup' */ + +DIALOG_PAGESETUP DIALOG 0, 0, 225, 95 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "?ÚÙ´Ò¦? ËÕÙ?õß?" +{ +LTEXT "&?Õ÷ßÙÌ:", 0x140, 10, 07, 40, 15 +EDITTEXT 0x141, 60, 05,110, 12, WS_BORDER | WS_TABSTOP +LTEXT "&i´¾¦ÙÚõ´:", 0x142, 10, 24, 40, 15 +EDITTEXT 0x143, 60, 22,110, 12, WS_BORDER | WS_TABSTOP + +GROUPBOX "&?±Úß:", 0x144, 10, 43,160, 45 +LTEXT "&?±Ú¾¶Õ±?:", 0x145, 20, 55, 30, 10, WS_CHILD +EDITTEXT /*STRING_PAGESETUP_LEFTVALUE,*/ 0x147, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP +LTEXT "&ð?Ý¨:", 0x148, 20, 73, 30, 10, WS_CHILD +EDITTEXT /*STRING_PAGESETUP_TOPVALUE,*/ 0x14A, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP +LTEXT "&?Õ¯Ú?:", 0x14B, 100, 55, 30, 10, WS_CHILD +EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*/ 0x14D, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP +LTEXT "&??¶¨:", 0x14E,100, 73, 30, 10, WS_CHILD +EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP + +DEFPUSHBUTTON "OK", 0x151, 180, 3, 40, 15, WS_TABSTOP +PUSHBUTTON "?Û²±¨¾þ", 0x152, 180, 21, 40, 15, WS_TABSTOP +PUSHBUTTON "&?´ÌÞÕÚß", 0x153, 180, 39, 40, 15, WS_TABSTOP +} + +/* Dialog `Encoding' */ +DIALOG_ENCODING DIALOG 0, 0, 256, 44 +STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | + WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "?¨õÚÛ´´?þ¾þ" +{ +COMBOBOX ID_ENCODING,54,0,156,80,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP +LTEXT "?¨õÚÛ´´?þ¾þ:",0x155,5,2,41,12 +COMBOBOX ID_EOLN,54,18,156,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +LTEXT "Endlines:",0x156,5,20,41,12 +} + +/* Dialog 'Go To' */ +DIALOG_GOTO DIALOG 0,0,165,50 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "?Õ¶?Ôß¾þ ¾¶þ Ò±ßýýÌ" +{ +EDITTEXT ID_LINENUMBER,54,10,106,12,WS_CHILD | WS_BORDER | WS_TABSTOP +LTEXT "?±ÚÞý³? Ò±ßýýÌ?:",0x155,5,12,41,12,WS_CHILD | WS_TABSTOP | ES_NUMBER +DEFPUSHBUTTON "OK", IDOK, 75, 30, 40, 15, WS_CHILD | WS_TABSTOP +PUSHBUTTON "?Û²±¨¾þ", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP +} + +STRINGTABLE DISCARDABLE +{ +STRING_PAGESETUP_HEADERVALUE, "&n" /* FIXME */ +STRING_PAGESETUP_FOOTERVALUE, "ËÕÙ?õß &s" /* FIXME */ +STRING_PAGESETUP_LEFTVALUE, "20 mm" /* FIXME */ +STRING_PAGESETUP_RIGHTVALUE, "20 mm" /* FIXME */ +STRING_PAGESETUP_TOPVALUE, "25 mm" /* FIXME */ +STRING_PAGESETUP_BOTTOMVALUE, "25 mm" /* FIXME */ + +STRING_NOTEPAD, "Notepad" +STRING_ERROR, "ERROR" +STRING_WARNING, "WARNING" +STRING_INFO, "ðÙþ±´÷´±?Õ?" + +STRING_UNTITLED, "(Î¨±?? ¶?¶Ù´)" + +STRING_ALL_FILES, "?Ùß ¶ß ß±¸Õ?ß (*.*)" +STRING_TEXT_FILES_TXT, "?±¸Õ?ß ÛÕÚý¦Ý´§ (*.txt)" + +STRING_TOOLARGE, "È´ ß±¸Õ?´ '%s' Õ?ÝßÚ ´Ù² ýÕÒ?Ù´ ÒÚß ¶´ notepad.\n \ +ðß±ßÛßÙ? ¸±þ¾Úý´´ÚÕ?¾¶Õ ?ÙÙ´ ±³Ò±ßýýß ÕÕ¯Õ±Òß¾?ß? ÛÕÚý¦Ý´§." +STRING_NOTEXT, "?ÕÝ ÙþÛ¶±´Ù´ÒÌ¾ß¶Õ Û? ¶Ú. \ +\nðß±ßÛßÙ? ÙþÛ¶±´Ù´ÒÕ?¾¶Õ Û?¶Ú ÛßÚ ±´¾ßÞÕ?¾¶Õ ¯ßÝ?" +STRING_DOESNOTEXIST, "È´ ß±¸Õ?´ '%s'\nõÕÝ § ?±¸ÕÚ\n\n \ +?¦ÙÕ¶Õ Ýß õþýÚ´§±ÒÌ¾Õ¶Õ ¦Ýß Ý¦´ ß±¸Õ?´;" +STRING_NOTSAVED, "È´ ß±¸Õ?´ '%s'\n¦¸ÕÚ ¶±´´´ÚþÞÕ?\n\n \ +?¦ÙÕ¶Õ Ýß ß´ÞþÛÕ²¾Õ¶Õ ¶Ú? ßÙÙßÒ¦?;" +STRING_NOTFOUND, "È´ ß±¸Õ?´ '%s' õÕ ý´±Õ? Ýß Ô±ÕÞÕ?." +STRING_OUT_OF_MEMORY, "?ÕÝ §?±¸ÕÚ ß±ÛÕ¶Ì ýÝÌýþ ÒÚß Ýß ´Ù´ÛÙþ±¨ÞÕ? ß§¶Ì þ \ +õÚÕ±Òß¾?ß. \n?ÙÕ?¾¶Õ ý?ß Ì Õ±±Ú¾³¶Õ±Õ? Õ÷ß±ý´Ò¦? ÒÚß Ýß ß§¯þÞÕ? þ \nÕÙÕ²ÞÕ±þ \ +ýÝÌýþ." +STRING_CANNOTFIND "?Õ ý´±Õ? Ýß Ô±ÕÞÕ? ¶´ '%s'" +STRING_ANSI, "ANSI" +STRING_UNICODE, "Unicode" +STRING_UNICODE_BE, "Unicode (big endian)" +STRING_UTF8, "UTF-8" +STRING_CRLF, "Windows" +STRING_LF, "Unix" +STRING_CR, "Mac" +} _____ Modified: trunk/reactos/subsys/system/notepad/rsrc.rc --- trunk/reactos/subsys/system/notepad/rsrc.rc 2005-11-11 19:07:27 UTC (rev 19142) +++ trunk/reactos/subsys/system/notepad/rsrc.rc 2005-11-11 19:31:53 UTC (rev 19143) @@ -48,6 +48,7 @@ #include "Es.rc" #include "Fi.rc" #include "Fr.rc" +#include "Gr.rc" #include "Hu.rc" #include "It.rc" #include "Ja.rc"

18 years, 10 months

← Newer
1
...
62
63
64
65
66
67
68
...
88
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2005